diff --git a/.gitignore b/.gitignore index c1d900f232..fea8427ec4 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,7 @@ postBuild.inc.cmd postBuild.cmd svnrev.h -build +/build .DS_Store Thumbs.db @@ -83,6 +83,8 @@ oprofile_data/ /3rdparty/wxWidgets/lib/vc_lib/msw/wx/setup.h /3rdparty/wxWidgets/lib/vc_lib/mswd/wx/setup.h /3rdparty/wxWidgets/lib/vc_lib/mswd/wx/msw/rcdefs.h +/3rdparty/wxwidgets3.0/include/wx/setup.h +/3rdparty/wxwidgets3.0/include/wx/msw/rcdefs.h /3rdparty/zlib/Win32 /common/deps /common/build/Utilities/Win32 diff --git a/3rdparty/libpng/ANNOUNCE b/3rdparty/libpng/ANNOUNCE new file mode 100644 index 0000000000..131e0aa369 --- /dev/null +++ b/3rdparty/libpng/ANNOUNCE @@ -0,0 +1,72 @@ +Libpng 1.6.17 - March 26, 2015 + +This is a public release of libpng, intended for use in production codes. + +Files available for download: + +Source files with LF line endings (for Unix/Linux) and with a +"configure" script + + libpng-1.6.17.tar.xz (LZMA-compressed, recommended) + libpng-1.6.17.tar.gz + +Source files with CRLF line endings (for Windows), without the +"configure" script + + lpng1617.7z (LZMA-compressed, recommended) + lpng1617.zip + +Other information: + + libpng-1.6.17-README.txt + libpng-1.6.17-LICENSE.txt + libpng-1.6.17-*.asc (armored detached GPG signatures) + +Changes since the last public release (1.6.16): + + Removed duplicate PNG_SAFE_LIMITS_SUPPORTED handling from pngconf.h + Corrected the width limit calculation in png_check_IHDR(). + Removed user limits from pngfix. Also pass NULL pointers to + png_read_row to skip the unnecessary row de-interlace stuff. + Added testing of png_set_packing() to pngvalid.c + Regenerated configure scripts in the *.tar distributions with libtool-2.4.4 + Implement previously untested cases of libpng transforms in pngvalid.c + Fixed byte order in 2-byte filler, in png_do_read_filler(). + Made the check for out-of-range values in png_set_tRNS() detect + values that are exactly 2^bit_depth, and work on 16-bit platforms. + Merged some parts of libpng-1.6.17beta01 and libpng-1.7.0beta47. + Added #ifndef __COVERITY__ where needed in png.c, pngrutil.c and + pngset.c to avoid warnings about dead code. + Do not build png_product2() when it is unused. + Display user limits in the output from pngtest. + Eliminated the PNG_SAFE_LIMITS macro and restored the 1-million-column + and 1-million-row default limits in pnglibconf.dfa, that can be reset + by the user at build time or run time. This provides a more robust + defense against DOS and as-yet undiscovered overflows. + Added PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED macro, on by default. + Allow user to call png_get_IHDR() with NULL arguments (Reuben Hawkins). + Rebuilt configure scripts with automake-1.15 and libtool-2.4.6 + Moved png_set_filter() prototype into a PNG_WRITE_SUPPORTED block + of png.h. + Avoid runtime checks when converting integer to png_byte with + Visual Studio (Sergey Kosarevsky) + Removed some comments that the configure script did not handle + properly from scripts/pnglibconf.dfa and pnglibconf.h.prebuilt. + Free the unknown_chunks structure even when it contains no data. + Updated CMakeLists.txt to add OSX framework, change YES/NO to ON/OFF + for consistency, and remove some useless tests (Alexey Petruchik). + Remove pnglibconf.h, pnglibconf.c, pnglibconf.pre, pnglibconf.dfn, + and pnglibconf.out instead of pnglibconf.* in "make clean" (Cosmin). + Fixed simplified 8-bit-linear to sRGB alpha. The calculated alpha + value was wrong. It's not clear if this affected the final stored + value; in the obvious code path the upper and lower 8-bits of the + alpha value were identical and the alpha was truncated to 8-bits + rather than dividing by 257 (John Bowler). + +Send comments/corrections/commendations to png-mng-implement at lists.sf.net +(subscription required; visit +https://lists.sourceforge.net/lists/listinfo/png-mng-implement +to subscribe) +or to glennrp at users.sourceforge.net + +Glenn R-P diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/CHANGES b/3rdparty/libpng/CHANGES similarity index 86% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/CHANGES rename to 3rdparty/libpng/CHANGES index 4d55fc03c1..1be09e9385 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/CHANGES +++ b/3rdparty/libpng/CHANGES @@ -1,4 +1,4 @@ -#if 0 + CHANGES - changes for libpng Version 0.2 @@ -2102,7 +2102,7 @@ Version 1.4.0beta24 [July 25, 2008] png_decompress_chunk(), and remove "chunkdata" from parameter list. Put a call to png_check_chunk_name() in png_read_chunk_header(). Revised png_check_chunk_name() to reject a name with a lowercase 3rd byte. - Removed two calls to png_check_chunk_name() occuring later in the process. + Removed two calls to png_check_chunk_name() occurring later in the process. Define PNG_NO_ERROR_NUMBERS by default in pngconf.h Version 1.4.0beta25 [July 30, 2008] @@ -4047,7 +4047,9 @@ Version 1.6.0beta17 [March 10, 2012] Deflate/inflate was reworked to move common zlib calls into single functions [rw]util.c. A new shared keyword check routine was also added and the 'zbuf' is no longer allocated on progressive read. It is now - possible to call png_inflate() incrementally. + possible to call png_inflate() incrementally. A warning is no longer + issued if the language tag or translated keyword in the iTXt chunk + has zero length. If benign errors are disabled use maximum window on ancilliary inflate. This works round a bug introduced in 1.5.4 where compressed ancillary chunks could end up with a too-small windowBits value in the deflate @@ -4343,8 +4345,9 @@ Version 1.6.0beta37 [January 10, 2013] programs to generate and test a PNG which should have the problem. Version 1.6.0beta39 [January 19, 2013] - Again corrected attempt at overflow detection in png_set_unknown_chunks(). - Added overflow detection in png_set_sPLT() and png_set_text_2(). + Again corrected attempt at overflow detection in png_set_unknown_chunks() + (CVE-2013-7353). Added overflow detection in png_set_sPLT() and + png_set_text_2() (CVE-2013-7354). Version 1.6.0beta40 [January 20, 2013] Use consistent handling of overflows in text, sPLT and unknown png_set_* APIs @@ -4427,7 +4430,7 @@ Version 1.6.1beta05 [March 1, 2013] Version 1.6.1beta06 [March 4, 2013] Better documentation of unknown handling API interactions. Corrected Android builds and corrected libpng.vers with symbol - prefixing This adds an API to set optimization options externally, + prefixing. This adds an API to set optimization options externally, providing an alternative and general solution for the non-portable run-time tests used by the ARM Neon code. It also makes those tests compile and link on Android. @@ -4485,6 +4488,7 @@ Version 1.6.2beta01 [April 14, 2013] Corrected a misplaced closing bracket in contrib/libtests/pngvalid.c (Flavio Medeiros). Corrected length written to uncompressed iTXt chunks (Samuli Suominen). + Bug was introduced in libpng-1.6.0. Version 1.6.2rc01 [April 18, 2013] Added contrib/tools/fixitxt.c, to repair the erroneous iTXt chunk length @@ -4505,6 +4509,701 @@ Version 1.6.2rc06 [April 24, 2013] 1.6.3beta01. Version 1.6.2 [April 25, 2013] + No changes. + +Version 1.6.3beta01 [April 25, 2013] + Revised stack marking in arm/filter_neon.S and configure.ac. + Ensure that NEON filter stuff is completely disabled when switched 'off'. + Previously the ARM NEON specific files were still built if the option + was switched 'off' as opposed to being explicitly disabled. + +Version 1.6.3beta02 [April 26, 2013] + Test for 'arm*' not just 'arm' in the host_cpu configure variable. + Rebuilt the configure scripts. + +Version 1.6.3beta03 [April 30, 2013] + Expanded manual paragraph about writing private chunks, particularly + the need to call png_set_keep_unknown_chunks() when writing them. + Avoid dereferencing NULL pointer possibly returned from + png_create_write_struct() (Andrew Church). + +Version 1.6.3beta05 [May 9, 2013] + Calculate our own zlib windowBits when decoding rather than trusting the + CMF bytes in the PNG datastream. + Added an option to force maximum window size for inflating, which was + the behavior of libpng15 and earlier. + Added png-fix-itxt and png-fix-too-far-back to the built programs and + removed warnings from the source code and timepng that are revealed as + a result. + Detect wrong libpng versions linked to png-fix-too-far-back, which currently + only works with libpng versions that can be made to reliably fail when + the deflate data contains an out-of-window reference. This means only + 1.6 and later. + Fixed gnu issues: g++ needs a static_cast, gcc 4.4.7 has a broken warning + message which it is easier to work round than ignore. + Updated contrib/pngminus/pnm2png.c (Paul Stewart): + Check for EOF + Ignore "#" delimited comments in input file to pnm2png.c. + Fixed whitespace handling + Added a call to png_set_packing() + Initialize dimension values so if sscanf fails at least we have known + invalid values. + Attempt to detect configuration issues with png-fix-too-far-back, which + requires both the correct libpng and the correct zlib to function + correctly. + Check ZLIB_VERNUM for mismatches, enclose #error in quotes + Added information in the documentation about problems with and fixes for + the bad CRC and bad iTXt chunk situations. + +Version 1.6.3beta06 [May 12, 2013] + Allow contrib/pngminus/pnm2png.c to compile without WRITE_INVERT and + WRITE_PACK supported (writes error message that it can't read P1 or + P4 PBM files). + Improved png-fix-too-far-back usage message, added --suffix option. + Revised contrib/pngminim/*/makefile to generate pnglibconf.h with the + right zlib header files. + Separated CPPFLAGS and CFLAGS in contrib/pngminim/*/makefile + +Version 1.6.3beta07 [June 8, 2013] + Removed a redundant test in png_set_IHDR(). + Added set(CMAKE_CONFIGURATION_TYPES ...) to CMakeLists.txt (Andrew Hundt) + Deleted set(CMAKE_BUILD_TYPE) block from CMakeLists.txt + Enclose the prototypes for the simplified write API in + #ifdef PNG_STDIO_SUPPORTED/#endif + Make ARM NEON support work at compile time (not just configure time). + This moves the test on __ARM_NEON__ into pngconf.h to avoid issues when + using a compiler that compiles for multiple architectures at one time. + Removed PNG_FILTER_OPTIMIZATIONS and PNG_ARM_NEON_SUPPORTED from + pnglibconf.h, allowing more of the decisions to be made internally + (pngpriv.h) during the compile. Without this, symbol prefixing is broken + under certain circumstances on ARM platforms. Now only the API parts of + the optimizations ('check' vs 'api') are exposed in the public header files + except that the new setting PNG_ARM_NEON_OPT documents how libpng makes the + decision about whether or not to use the optimizations. + Protect symbol prefixing against CC/CPPFLAGS/CFLAGS useage. + Previous iOS/Xcode fixes for the ARM NEON optimizations moved the test + on __ARM_NEON__ from configure time to compile time. This breaks symbol + prefixing because the definition of the special png_init_filter_functions + call was hidden at configure time if the relevant compiler arguments are + passed in CFLAGS as opposed to CC. This change attempts to avoid all + the confusion that would result by declaring the init function even when + it is not used, so that it will always get prefixed. + +Version 1.6.3beta08 [June 18, 2013] + Revised libpng.3 so that "doclifter" can process it. + +Version 1.6.3beta09 [June 27, 2013] + Revised example.c to illustrate use of PNG_DEFAULT_sRGB and PNG_GAMMA_MAC_18 + as parameters for png_set_gamma(). These have been available since + libpng-1.5.4. + Renamed contrib/tools/png-fix-too-far-back.c to pngfix.c and revised it + to check all compressed chunks known to libpng. + +Version 1.6.3beta10 [July 5, 2013] + Updated documentation to show default behavior of benign errors correctly. + Only compile ARM code when PNG_READ_SUPPORTED is defined. + Fixed undefined behavior in contrib/tools/pngfix.c and added new strip + option. pngfix relied on undefined behavior and even a simple change from + gcc to g++ caused it to fail. The new strip option 'unsafe' has been + implemented and is the default if --max is given. Option names have + been clarified, with --strip=transform now stripping the bKGD chunk, + which was stripped previously with --strip=unused. + Added all documented chunk types to pngpriv.h + Unified pngfix.c source with libpng17. + +Version 1.6.3rc01 [July 11, 2013] + No changes. + +Version 1.6.3 [July 18, 2013] + Revised manual about changes in iTXt chunk handling made in libpng-1.6.0. + Added "/* SAFE */" comments in pngrutil.c and pngrtran.c where warnings + may be erroneously issued by code-checking applications. + +Version 1.6.4beta01 [August 21, 2013] + Added information about png_set_options() to the manual. + Delay calling png_init_filter_functions() until a row with nonzero filter + is found. + +Version 1.6.4beta02 [August 30, 2013] + Fixed inconsistent conditional compilation of png_chunk_unknown_handling() + prototype, definition, and usage. Made it depend on + PNG_HANDLE_AS_UNKNOWN_SUPPORTED everywhere. + +Version 1.6.4rc01 [September 5, 2013] + No changes. + +Version 1.6.4 [September 12, 2013] + No changes. + +Version 1.6.5 [September 14, 2013] + Removed two stray lines of code from arm/arm_init.c. + +Version 1.6.6 [September 16, 2013] + Removed two stray lines of code from arm/arm_init.c, again. + +Version 1.6.7beta01 [September 30, 2013] + Revised unknown chunk code to correct several bugs in the NO_SAVE_/NO_WRITE + combination + Allow HANDLE_AS_UNKNOWN to work when other options are configured off. Also + fixed the pngminim makefiles to work when $(MAKEFLAGS) contains stuff + which terminates the make options (as by default in recent versions of + Gentoo). + Avoid up-cast warnings in pngvalid.c. On ARM the alignment requirements of + png_modifier are greater than that of png_store and as a consequence + compilation of pngvalid.c results in a warning about increased alignment + requirements because of the bare cast to (png_modifier*). The code is safe, + because the pointer is known to point to a stack allocated png_modifier, + but this change avoids the warning. + Fixed default behavior of ARM_NEON_API. If the ARM NEON API option was + compiled without the CHECK option it defaulted to on, not off. + Check user callback behavior in pngunknown.c. Previous versions compiled + if SAVE_UNKNOWN was not available but did nothing since the callback + was never implemented. + Merged pngunknown.c with 1.7 version and back ported 1.7 improvements/fixes + +Version 1.6.7beta02 [October 12, 2013] + Made changes for compatibility with automake 1.14: + 1) Added the 'compile' program to the list of programs that must be cleaned + in autogen.sh + 2) Added 'subdir-objects' which causes .c files in sub-directories to be + compiled such that the corresponding .o files are also in the + sub-directory. This is because automake 1.14 warns that the + current behavior of compiling to the top level directory may be removed + in the future. + 3) Updated dependencies on pnglibconf.h to match the new .o locations and + added all the files in contrib/libtests and contrib/tools that depend + on pnglibconf.h + 4) Added 'BUILD_SOURCES = pnglibconf.h'; this is the automake recommended + way of handling the dependencies of sources that are machine generated; + unfortunately it only works if the user does 'make all' or 'make check', + so the dependencies (3) are still required. + Cleaned up (char*) casts of zlib messages. The latest version of the Intel C + compiler complains about casting a string literal as (char*), so copied the + treatment of z_const from the library code into pngfix.c + Simplified error message code in pngunknown. The simplification has the + useful side effect of avoiding a bogus warning generated by the latest + version of the Intel C compiler (it objects to + condition ? string-literal : string-literal). + Make autogen.sh work with automake 1.13 as well as 1.14. Do this by always + removing the 1.14 'compile' script but never checking for it. + +Version 1.6.7beta03 [October 19, 2013] + Added ARMv8 support (James Yu ). Added file + arm/filter_neon_intrinsics.c; enable with -mfpu=neon. + Revised pngvalid to generate size images with as many filters as it can + manage, limited by the number of rows. + Cleaned up ARM NEON compilation handling. The tests are now in pngpriv.h + and detect the broken GCC compilers. + +Version 1.6.7beta04 [October 26, 2013] + Allow clang derived from older GCC versions to use ARM intrinsics. This + causes all clang builds that use -mfpu=neon to use the intrinsics code, + not the assembler code. This has only been tested on iOS 7. It may be + necessary to exclude some earlier clang versions but this seems unlikely. + Changed NEON implementation selection mechanism. This allows assembler + or intrinsics to be turned on at compile time during the build by defining + PNG_ARM_NEON_IMPLEMENTATION to the correct value (2 or 1). This macro + is undefined by default and the build type is selected in pngpriv.h. + +Version 1.6.7rc01 [November 2, 2013] + No changes. + +Version 1.6.7rc02 [November 7, 2013] + Fixed #include in filter_neon_intrinsics.c and ctype macros. The ctype char + checking macros take an unsigned char argument, not a signed char. + +Version 1.6.7 [November 14, 2013] + No changes. + +Version 1.6.8beta01 [November 24, 2013] + Moved prototype for png_handle_unknown() in pngpriv.h outside of + the #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED/#endif block. + Added "-Wall" to CFLAGS in contrib/pngminim/*/makefile + Conditionally compile some unused functions reported by -Wall in + pngminim. + Fixed 'minimal' builds. Various obviously useful minimal configurations + don't build because of missing contrib/libtests test programs and + overly complex dependencies in scripts/pnglibconf.dfa. This change + adds contrib/conftest/*.dfa files that can be used in automatic build + scripts to ensure that these configurations continue to build. + Enabled WRITE_INVERT and WRITE_PACK in contrib/pngminim/encoder. + Fixed pngvalid 'fail' function declaration on the Intel C Compiler. + This reverts to the previous 'static' implementation and works round + the 'unused static function' warning by using PNG_UNUSED(). + +Version 1.6.8beta02 [November 30, 2013] + Removed or marked PNG_UNUSED some harmless "dead assignments" reported + by clang scan-build. + Changed tabs to 3 spaces in png_debug macros and changed '"%s"m' + to '"%s" m' to improve portability among compilers. + Changed png_free_default() to free() in pngtest.c + +Version 1.6.8rc01 [December 12, 2013] + Tidied up pngfix inits and fixed pngtest no-write builds. + +Version 1.6.8rc02 [December 14, 2013] + Handle zero-length PLTE chunk or NULL palette with png_error() + instead of png_chunk_report(), which by default issues a warning + rather than an error, leading to later reading from a NULL pointer + (png_ptr->palette) in png_do_expand_palette(). This is CVE-2013-6954 + and VU#650142. Libpng-1.6.1 through 1.6.7 are vulnerable. + Libpng-1.6.0 and earlier do not have this bug. + +Version 1.6.8 [December 19, 2013] + No changes. + +Version 1.6.9beta01 [December 26, 2013] + Bookkeeping: Moved functions around (no changes). Moved transform + function definitions before the place where they are called so that + they can be made static. Move the intrapixel functions and the + grayscale palette builder out of the png?tran.c files. The latter + isn't a transform function and is no longer used internally, and the + former MNG specific functions are better placed in pngread/pngwrite.c + Made transform implementation functions static. This makes the internal + functions called by png_do_{read|write}_transformations static. On an + x86-64 DLL build (Gentoo Linux) this reduces the size of the text + segment of the DLL by 1208 bytes, about 0.6%. It also simplifies + maintenance by removing the declarations from pngpriv.h and allowing + easier changes to the internal interfaces. + Rebuilt configure scripts with automake-1.14.1 and autoconf-2.69 + in the tar distributions. + +Version 1.6.9beta02 [January 1, 2014] + Added checks for libpng 1.5 to pngvalid.c. This supports the use of + this version of pngvalid in libpng 1.5 + Merged with pngvalid.c from libpng-1.7 changes to create a single + pngvalid.c + Removed #error macro from contrib/tools/pngfix.c (Thomas Klausner). + Merged pngrio.c, pngtrans.c, pngwio.c, and pngerror.c with libpng-1.7.0 + Merged libpng-1.7.0 changes to make no-interlace configurations work + with test programs. + Revised pngvalid.c to support libpng 1.5, which does not support the + PNG_MAXIMUM_INFLATE_WINDOW option, so #define it out when appropriate in + pngvalid.c + Allow unversioned links created on install to be disabled in configure. + In configure builds 'make install' changes/adds links like png.h + and libpng.a to point to the newly installed, versioned, files (e.g. + libpng17/png.h and libpng17.a). Three new configure options and some + rearrangement of Makefile.am allow creation of these links to be disabled. + +Version 1.6.9beta03 [January 10, 2014] + Removed potentially misleading warning from png_check_IHDR(). + +Version 1.6.9beta04 [January 20, 2014] + Updated scripts/makefile.* to use CPPFLAGS (Cosmin). + Added clang attribute support (Cosmin). + +Version 1.6.9rc01 [January 28, 2014] + No changes. + +Version 1.6.9rc02 [January 30, 2014] + Quiet an uninitialized memory warning from VC2013 in png_get_png(). + +Version 1.6.9 [February 6, 2014] + +Version 1.6.10beta01 [February 9, 2014] + Backported changes from libpng-1.7.0beta30 and beta31: + Fixed a large number of instances where PNGCBAPI was omitted from + function definitions. + Added pngimage test program for png_read_png() and png_write_png() + with two new test scripts. + Removed dependence on !PNG_READ_EXPAND_SUPPORTED for calling + png_set_packing() in png_read_png(). + Fixed combination of ~alpha with shift. On read invert alpha, processing + occurred after shift processing, which causes the final values to be + outside the range that should be produced by the shift. Reversing the + order on read makes the two transforms work together correctly and mirrors + the order used on write. + Do not read invalid sBIT chunks. Previously libpng only checked sBIT + values on write, so a malicious PNG writer could therefore cause + the read code to return an invalid sBIT chunk, which might lead to + application errors or crashes. Such chunks are now skipped (with + chunk_benign_error). + Make png_read_png() and png_write_png() prototypes in png.h depend + upon PNG_READ_SUPPORTED and PNG_WRITE_SUPPORTED. + Support builds with unsupported PNG_TRANSFORM_* values. All of the + PNG_TRANSFORM_* values are always defined in png.h and, because they + are used for both read and write in some cases, it is not reliable + to #if out ones that are totally unsupported. This change adds error + detection in png_read_image() and png_write_image() to do a + png_app_error() if the app requests something that cannot be done + and it adds corresponding code to pngimage.c to handle such options + by not attempting to test them. + +Version 1.6.10beta02 [February 23, 2014] + Moved redefines of png_error(), png_warning(), png_chunk_error(), + and png_chunk_warning() from pngpriv.h to png.h to make them visible + to libpng-calling applications. + Moved OS dependent code from arm/arm_init.c, to allow the included + implementation of the ARM NEON discovery function to be set at + build-time and provide sample implementations from the current code in the + contrib/arm-neon subdirectory. The __linux__ code has also been changed to + compile and link on Android by using /proc/cpuinfo, and the old linux code + is in contrib/arm-neon/linux-auxv.c. The new code avoids POSIX and Linux + dependencies apart from opening /proc/cpuinfo and is C90 compliant. + Check for info_ptr == NULL early in png_read_end() so we don't need to + run all the png_handle_*() and depend on them to return if info_ptr == NULL. + This improves the performance of png_read_end(png_ptr, NULL) and makes + it more robust against future programming errors. + Check for __has_extension before using it in pngconf.h, to + support older Clang versions (Jeremy Sequoia). + Treat CRC error handling with png_set_crc_action(), instead of with + png_set_benign_errors(), which has been the case since libpng-1.6.0beta18. + Use a user warning handler in contrib/gregbook/readpng2.c instead of default, + so warnings will be put on stderr even if libpng has CONSOLE_IO disabled. + Added png_ptr->process_mode = PNG_READ_IDAT_MODE in png_push_read_chunk + after recognizing the IDAT chunk, which avoids an infinite loop while + reading a datastream whose first IDAT chunk is of zero-length. + This fixes CERT VU#684412 and CVE-2014-0333. + Don't recognize known sRGB profiles as sRGB if they have been hacked, + but don't reject them and don't issue a copyright violation warning. + +Version 1.6.10beta03 [February 25, 2014] + Moved some documentation from png.h to libpng.3 and libpng-manual.txt + Minor editing of contrib/arm-neon/README and contrib/examples/*.c + +Version 1.6.10rc01 [February 27, 2014] + Fixed typos in the manual and in scripts/pnglibconf.dfa (CFLAGS -> CPPFLAGS + and PNG_USR_CONFIG -> PNG_USER_CONFIG). + +Version 1.6.10rc02 [February 28, 2014] + Removed unreachable return statement after png_chunk_error() + in pngrutil.c + +Version 1.6.10rc03 [March 4, 2014] + Un-deprecated png_data_freer(). + +Version 1.6.10 [March 6, 2014] + No changes. + +Version 1.6.11beta01 [March 17, 2014] + Use "if (value != 0)" instead of "if (value)" consistently. + Changed ZlibSrcDir from 1.2.5 to 1.2.8 in projects/vstudio. + Moved configuration information from the manual to the INSTALL file. + +Version 1.6.11beta02 [April 6, 2014] + Removed #if/#else/#endif from inside two pow() calls in pngvalid.c because + they were handled improperly by Portland Group's PGI-14.1 - PGI-14.3 + when using its "__builtin_pow()" function. + Silence 'unused parameter' build warnings (Cosmin Truta). + $(CP) is now used alongside $(RM_F). Also, use 'copy' instead of 'cp' + where applicable, and applied other minor makefile changes (Cosmin). + Don't warn about invalid dimensions exceeding user limits (Cosmin). + Allow an easy replacement of the default pre-built configuration + header with a custom header, via the make PNGLIBCONF_H_PREBUILT + macro (Cosmin). + +Version 1.6.11beta03 [April 6, 2014] + Fixed a typo in pngrutil.c, introduced in libpng-1.5.6, that interferes + with "blocky" expansion of sub-8-bit interlaced PNG files (Eric Huss). + Optionally use __builtin_bswap16() in png_do_swap(). + +Version 1.6.11beta04 [April 19, 2014] + Made progressive reading of interlaced images consistent with the + behavior of the sequential reader and consistent with the manual, by + moving some code out of the PNG_READ_INTERLACING_SUPPORTED blocks. The + row_callback now receives the proper pass number and unexpanded rows, when + png_combine_row() isn't built or used, and png_set_interlace_handling() + is not called. + Allow PNG_sRGB_PROFILE_CHECKING = (-1) to mean no sRGB profile checking. + +Version 1.6.11beta05 [April 26, 2014] + Do not reject ICC V2 profiles that lack padding (Kai-Uwe Behrmann). + Relocated closing bracket of the sRGB profile test loop to avoid getting + "Not recognizing known sRGB profile that has been edited" warning for + ICC V2 profiles that lack the MD5 signature in the profile header. + +Version 1.6.11beta06 [May 19, 2014] + Added PNG_SKIP_sRGB_CHECK_PROFILE choice for png_set_option(). + +Version 1.6.11rc01 [May 27, 2014] + No changes. + +Version 1.6.11rc02 [June 3, 2014] + Test ZLIB_VERNUM instead of PNG_ZLIB_VERNUM in contrib/tools/pngfix.c + +Version 1.6.11 [June 5, 2014] + No changes. + +Version 1.6.12rc01 [June 6, 2014] + Relocated new code from 1.6.11beta06 in png.c to a point after the + declarations (Max Stepin). + +Version 1.6.12rc02 [June 7, 2014] + Changed file permissions of contrib/tools/intgamma.sh, + test-driver, and compile from 0644 to 0755 (Cosmin). + +Version 1.6.12rc03 [June 8, 2014] + Ensure "__has_attribute()" macro exists before trying to use it with + old clang compilers (MacPorts Ticket #43939). + +Version 1.6.12 [June 12, 2014] + No changes. + +Version 1.6.13beta01 [July 4, 2014] + Quieted -Wsign-compare and -Wclobber compiler warnings in + contrib/pngminus/*.c + Added "(void) png_ptr;" where needed in contrib/gregbook to quiet + compiler complaints about unused pointers. + Split a long output string in contrib/gregbook/rpng2-x.c. + Added "PNG_SET_OPTION" requirement for sRGB chunk support to pnglibconf.dfa, + Needed for write-only support (John Bowler). + Changed "if defined(__ARM_NEON__)" to + "if (defined(__ARM_NEON__) || defined(__ARM_NEON))" (James Wu). + Fixed clang no-warning builds: png_digit was defined but never used. + +Version 1.6.13beta02 [July 21, 2014] + Fixed an incorrect separator ("/" should be "\") in scripts/makefile.vcwin32 + (bug report from Wolfgang S. Kechel). Bug was introduced in libpng-1.6.11. + Also fixed makefile.bc32, makefile.bor, makefile.msc, makefile.intel, and + makefile.tc3 similarly. + +Version 1.6.13beta03 [August 3, 2014] + Removed scripts/makefile.elf. It has not worked since libpng-1.5.0beta14 + due to elimination of the PNG_FUNCTION_EXPORT and PNG_DATA_EXPORT + definitions from pngconf.h. + Ensure that CMakeLists.txt makes the target "lib" directory before making + symbolic link into it (SourceForge bug report #226 by Rolf Timmermans). + +Version 1.6.13beta04 [August 8, 2014] + Added opinion that the ECCN (Export Control Classification Number) for + libpng is EAR99 to the README file. + Eliminated use of "$<" in makefile explicit rules, when copying + $PNGLIBCONF_H_PREBUILT. This does not work on some versions of make; + bug introduced in libpng version 1.6.11. + +Version 1.6.13rc01 [August 14, 2014] + Made "ccopts" agree with "CFLAGS" in scripts/makefile.hp* and makefile.*sunu + +Version 1.6.13 [August 21, 2014] + No changes. + +Version 1.6.14beta01 [September 14, 2014] + Guard usage of png_ptr->options with #ifdef PNG_SET_OPTION_SUPPORTED. + Do not build contrib/tools/pngfix.c when PNG_SETJMP_NOT_SUPPORTED, + to allow "make" to complete without setjmp support (bug report by + Claudio Fontana) + Add "#include " to contrib/tools/pngfix.c (John Bowler) + +Version 1.6.14beta02 [September 18, 2014] + Use nanosleep() instead of usleep() in contrib/gregbook/rpng2-x.c + because usleep() is deprecated. + Define usleep() in contrib/gregbook/rpng2-x.c if not already defined + in unistd.h and nanosleep() is not available; fixes error introduced + in libpng-1.6.13. + Disable floating point exception handling in pngvalid.c when + PNG_FLOATING_ARITHMETIC is not supported (bug report by "zootus + at users.sourceforge.net"). + +Version 1.6.14beta03 [September 19, 2014] + Define FE_DIVBYZERO, FE_INVALID, and FE_OVERFLOW in pngvalid.c if not + already defined. Revert floating point exception handling in pngvalid.c + to version 1.6.14beta01 behavior. + +Version 1.6.14beta04 [September 27, 2014] + Fixed incorrect handling of the iTXt compression flag in pngrutil.c + (bug report by Shunsaku Hirata). Bug was introduced in libpng-1.6.0. + +Version 1.6.14beta05 [October 1, 2014] + Added "option READ_iCCP enables READ_COMPRESSED_TEXT" to pnglibconf.dfa + +Version 1.6.14beta06 [October 5, 2014] + Removed unused "text_len" parameter from private function png_write_zTXt(). + Conditionally compile some code in png_deflate_claim(), when + PNG_WARNINGS_SUPPORTED and PNG_ERROR_TEXT_SUPPORTED are disabled. + Replaced repeated code in pngpread.c with PNG_PUSH_SAVE_BUFFER_IF_FULL. + Added "chunk iTXt enables TEXT" and "chunk zTXt enables TEXT" + to pnglibconf.dfa. + Removed "option READ_COMPRESSED_TEXT enables READ_TEXT" from pnglibconf.dfa, + to make it possible to configure a libpng that supports iCCP but not TEXT. + +Version 1.6.14beta07 [October 7, 2014] + Removed "option WRITE_COMPRESSED_TEXT enables WRITE_TEXT" from pnglibconf.dfa + Only mark text chunks as written after successfully writing them. + +Version 1.6.14rc01 [October 15, 2014] + Fixed some typos in comments. + +Version 1.6.14rc02 [October 17, 2014] + Changed png_convert_to_rfc_1123() to png_convert_to_rfc_1123_buffer() + in the manual, to reflect the change made in libpng-1.6.0. + Updated README file to explain that direct access to the png_struct + and info_struct members has not been permitted since libpng-1.5.0. + +Version 1.6.14 [October 23, 2014] + No changes. + +Version 1.6.15beta01 [October 29, 2014] + Changed "if (!x)" to "if (x == 0)" and "if (x)" to "if (x != 0)" + Simplified png_free_data(). + Added missing "ptr = NULL" after some instances of png_free(). + +Version 1.6.15beta02 [November 1, 2014] + Changed remaining "if (!x)" to "if (x == 0)" and "if (x)" to "if (x != 0)" + +Version 1.6.15beta03 [November 3, 2014] + Added PNG_USE_ARM_NEON configuration flag (Marcin Juszkiewicz). + +Version 1.6.15beta04 [November 4, 2014] + Removed new PNG_USE_ARM_NEON configuration flag and made a one-line + revision to configure.ac to support ARM on aarch64 instead (John Bowler). + +Version 1.6.15beta05 [November 5, 2014] + Use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING in + example.c, pngtest.c, and applications in the contrib directory. + Avoid out-of-bounds memory access in png_user_version_check(). + Simplified and future-proofed png_user_version_check(). + Fixed GCC unsigned int->float warnings. Various versions of GCC + seem to generate warnings when an unsigned value is implicitly + converted to double. This is probably a GCC bug but this change + avoids the issue by explicitly converting to (int) where safe. + Free all allocated memory in pngimage. The file buffer cache was left + allocated at the end of the program, harmless but it causes memory + leak reports from clang. + Fixed array size calculations to avoid warnings. At various points + in the code the number of elements in an array is calculated using + sizeof. This generates a compile time constant of type (size_t) which + is then typically assigned to an (unsigned int) or (int). Some versions + of GCC on 64-bit systems warn about the apparent narrowing, even though + the same compiler does apparently generate the correct, in-range, + numeric constant. This adds appropriate, safe, casts to make the + warnings go away. + +Version 1.6.15beta06 [November 6, 2014] + Reverted use png_get_libpng_ver(NULL) instead of PNG_LIBPNG_VER_STRING + in the manual, example.c, pngtest.c, and applications in the contrib + directory. It was incorrect advice. + +Version 1.6.15beta07 [November 7, 2014] + Removed #ifdef PNG_16BIT_SUPPORTED/#endif around png_product2(); it is + needed by png_reciprocal2(). + Added #ifdef PNG_16BIT_SUPPORTED/#endif around png_log16bit() and + png_do_swap(). + Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */" + +Version 1.6.15beta08 [November 8, 2014] + More housecleaning in *.h + +Version 1.6.15rc01 [November 13, 2014] + +Version 1.6.15rc02 [November 14, 2014] + The macros passed in the command line to Borland make were ignored if + similarly-named macros were already defined in makefiles. This behavior + is different from POSIX make and other make programs. Surround the + macro definitions with ifndef guards (Cosmin). + +Version 1.6.15rc03 [November 16, 2014] + Added "-D_CRT_SECURE_NO_WARNINGS" to CFLAGS in scripts/makefile.vcwin32. + Removed the obsolete $ARCH variable from scripts/makefile.darwin. + +Version 1.6.15 [November 20, 2014] + No changes. + +Version 1.6.16beta01 [December 14, 2014] + Added ".align 2" to arm/filter_neon.S to support old GAS assemblers that + don't do alignment correctly. + Revised Makefile.am and scripts/symbols.dfn to work with MinGW/MSYS + (Bob Friesenhahn). + +Version 1.6.16beta02 [December 15, 2014] + Revised Makefile.am and scripts/*.dfn again to work with MinGW/MSYS; + renamed scripts/*.dfn to scripts/*.c (John Bowler). + +Version 1.6.16beta03 [December 21, 2014] + Quiet a "comparison always true" warning in pngstest.c (John Bowler). + +Version 1.6.16rc01 [December 21, 2014] + Restored a test on width that was removed from png.c at libpng-1.6.9 + (Bug report by Alex Eubanks, CVE-2015-0973). + +Version 1.6.16rc02 [December 21, 2014] + Undid the update to pngrutil.c in 1.6.16rc01. + +Version 1.6.16rc03 [December 21, 2014] + Fixed an overflow in png_combine_row() with very wide interlaced images + (Bug report and fix by John Bowler, CVE-2014-9495). + +Version 1.6.16 [December 22, 2014] + No changes. + +Version 1.6.17beta01 [January 29, 2015] + Removed duplicate PNG_SAFE_LIMITS_SUPPORTED handling from pngconf.h + Corrected the width limit calculation in png_check_IHDR(). + Removed user limits from pngfix. Also pass NULL pointers to + png_read_row to skip the unnecessary row de-interlace stuff. + Added testing of png_set_packing() to pngvalid.c + Regenerated configure scripts in the *.tar distributions with libtool-2.4.4 + Implement previously untested cases of libpng transforms in pngvalid.c + Fixed byte order in 2-byte filler, in png_do_read_filler(). + Made the check for out-of-range values in png_set_tRNS() detect + values that are exactly 2^bit_depth, and work on 16-bit platforms. + Merged some parts of libpng-1.6.17beta01 and libpng-1.7.0beta47. + Added #ifndef __COVERITY__ where needed in png.c, pngrutil.c and + pngset.c to avoid warnings about dead code. + Added "& 0xff" to many instances of expressions that are typecast + to (png_byte), to avoid Coverity gripes. + +Version 1.6.17beta02 [February 7, 2015] + Work around one more Coverity-scan dead-code warning. + Do not build png_product2() when it is unused. + +Version 1.6.17beta03 [February 17, 2015] + Display user limits in the output from pngtest. + Eliminated the PNG_SAFE_LIMITS macro and restored the 1-million-column + and 1-million-row default limits in pnglibconf.dfa, that can be reset + by the user at build time or run time. This provides a more robust + defense against DOS and as-yet undiscovered overflows. + +Version 1.6.17beta04 [February 21, 2015] + Added PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED macro, on by default. + Allow user to call png_get_IHDR() with NULL arguments (Reuben Hawkins). + Rebuilt configure scripts with automake-1.15 and libtool-2.4.6 + +Version 1.6.17beta05 [February 25, 2015] + Restored compiling of png_reciprocal2 with PNG_NO_16BIT. + +Version 1.6.17beta06 [February 27, 2015] + Moved png_set_filter() prototype into a PNG_WRITE_SUPPORTED block + of png.h. + Avoid runtime checks when converting integer to png_byte with + Visual Studio (Sergey Kosarevsky) + +Version 1.6.17rc01 [March 4, 2015] + No changes. + +Version 1.6.17rc02 [March 9, 2015] + Removed some comments that the configure script did not handle + properly from scripts/pnglibconf.dfa and pnglibconf.h.prebuilt. + Free the unknown_chunks structure even when it contains no data. + +Version 1.6.17rc03 [March 12, 2015] + Updated CMakeLists.txt to add OSX framework, change YES/NO to ON/OFF + for consistency, and remove some useless tests (Alexey Petruchik). + +Version 1.6.17rc04 [March 16, 2015] + Remove pnglibconf.h, pnglibconf.c, and pnglibconf.out instead of + pnglibconf.* in "make clean" (Cosmin). + Fix bug in calculation of maxbits, in png_write_sBIT, introduced + in libpng-1.6.17beta01 (John Bowler). + +Version 1.6.17rc05 [March 21, 2015] + Define PNG_FILTER_* and PNG_FILTER_VALUE_* in png.h even when WRITE + is not supported (John Bowler). This fixes an error introduced in + libpng-1.6.17beta06. + Reverted "& 0xff" additions of version 1.6.17beta01. Libpng passes + the Coverity scan without them. + +Version 1.6.17rc06 [March 23, 2015] + Remove pnglibconf.dfn and pnglibconf.pre with "make clean". + Reformatted some "&0xff" instances to "& 0xff". + Fixed simplified 8-bit-linear to sRGB alpha. The calculated alpha + value was wrong. It's not clear if this affected the final stored + value; in the obvious code path the upper and lower 8-bits of the + alpha value were identical and the alpha was truncated to 8-bits + rather than dividing by 257 (John Bowler). + +Version 1.6.17 [March 26, 2015] + No changes. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -4513,4 +5212,3 @@ to subscribe) or to glennrp at users.sourceforge.net Glenn R-P -#endif diff --git a/3rdparty/libpng/INSTALL b/3rdparty/libpng/INSTALL new file mode 100644 index 0000000000..531652abe0 --- /dev/null +++ b/3rdparty/libpng/INSTALL @@ -0,0 +1,387 @@ + +Installing libpng + +Contents + + I. Simple installation + II. Rebuilding the configure scripts + III. Using scripts/makefile* + IV. Using cmake + V. Directory structure + VI. Building with project files + VII. Building with makefiles +VIII. Configuring libpng for 16-bit platforms + IX. Configuring for DOS + X. Configuring for Medium Model + XI. Prepending a prefix to exported symbols + XII. Configuring for compiler xxx: +XIII. Removing unwanted object code + XIV. Changes to the build and configuration of libpng in libpng-1.5.x + XV. Setjmp/longjmp issues + XVI. Other sources of information about libpng + +I. Simple installation + +On Unix/Linux and similar systems, you can simply type + + ./configure [--prefix=/path] + make check + make install + +and ignore the rest of this document. "/path" is the path to the directory +where you want to install the libpng "lib", "include", and "bin" +subdirectories. + +If you downloaded a GIT clone, you will need to run ./autogen.sh before +running ./configure, to create "configure" and "Makefile.in" which are +not included in the GIT repository. + +Note that "configure" is only included in the "*.tar" distributions and not +in the "*.zip" or "*.7z" distributions. If you downloaded one of those +distributions, see "Building with project files" or "Building with makefiles", +below. + +II. Rebuilding the configure scripts + +If configure does not work on your system, or if you have a need to +change configure.ac or Makefile.am, and you have a reasonably +up-to-date set of tools, running ./autogen.sh in a git clone before +running ./configure may fix the problem. To be really sure that you +aren't using any of the included pre-built scripts, you can do this: + + ./configure --enable-maintainer-mode + make maintainer-clean + ./autogen.sh --maintainer --clean + ./autogen.sh --maintainer + ./configure [--prefix=/path] [other options] + make + make install + make check + +III. Using scripts/makefile* + +Instead, you can use one of the custom-built makefiles in the +"scripts" directory + + cp scripts/pnglibconf.h.prebuilt pnglibconf.h + cp scripts/makefile.system makefile + make test + make install + +The files that are presently available in the scripts directory +are listed and described in scripts/README.txt. + +Or you can use one of the "projects" in the "projects" directory. + +Before installing libpng, you must first install zlib, if it +is not already on your system. zlib can usually be found +wherever you got libpng; otherwise go to http://zlib.net. You can place +zlib in in the same directory as libpng or in another directory. + +If your system already has a preinstalled zlib you will still need +to have access to the zlib.h and zconf.h include files that +correspond to the version of zlib that's installed. + +If you wish to test with a particular zlib that is not first in the +standard library search path, put ZLIBLIB, ZLIBINC, CPPFLAGS, LDFLAGS, +and LD_LIBRARY_PATH in your environment before running "make test" +or "make distcheck": + +ZLIBLIB=/path/to/lib export ZLIBLIB +ZLIBINC=/path/to/include export ZLIBINC +CPPFLAGS="-I$ZLIBINC" export CPPFLAGS +LDFLAGS="-L$ZLIBLIB" export LDFLAGS +LD_LIBRARY_PATH="$ZLIBLIB:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH + +If you are using one of the makefile scripts, put ZLIBLIB and ZLIBINC +in your environment and type "make ZLIBLIB=$ZLIBLIB ZLIBINC=$ZLIBINC test". + +IV. Using cmake + +If you want to use "cmake" (see www.cmake.org), type + + cmake . -DCMAKE_INSTALL_PREFIX=/path + make + make install + +As when using the simple configure method described above, "/path" points to +the installation directory where you want to put the libpng "lib", "include", +and "bin" subdirectories. + +V. Directory structure + +You can rename the directories that you downloaded (they +might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.8" +or "zlib128") so that you have directories called "zlib" and "libpng". + +Your directory structure should look like this: + + .. (the parent directory) + libpng (this directory) + INSTALL (this file) + README + *.h, *.c => libpng source files + CMakeLists.txt => "cmake" script + configuration files: + configure.ac, configure, Makefile.am, Makefile.in, + autogen.sh, config.guess, ltmain.sh, missing, libpng.pc.in, + libpng-config.in, aclocal.m4, config.h.in, config.sub, + depcomp, install-sh, mkinstalldirs, test-pngtest.sh + contrib + arm-neon, conftest, examples, gregbook, libtests, pngminim, + pngminus, pngsuite, tools, visupng + projects + cbuilder5, owatcom, visualc71, vstudio, xcode + scripts + makefile.* + *.def (module definition files) + etc. + pngtest.png + etc. + zlib + README, *.h, *.c contrib, etc. + +If the line endings in the files look funny, you may wish to get the other +distribution of libpng. It is available in both tar.gz (UNIX style line +endings) and zip (DOS style line endings) formats. + +VI. Building with project files + +If you are building libpng with MSVC, you can enter the +libpng projects\visualc71 or vstudio directory and follow the instructions +in README.txt. + +Otherwise enter the zlib directory and follow the instructions in zlib/README, +then come back here and run "configure" or choose the appropriate +makefile.sys in the scripts directory. + +VII. Building with makefiles + +Copy the file (or files) that you need from the +scripts directory into this directory, for example + + MSDOS example: copy scripts\makefile.msc makefile + copy scripts\pnglibconf.h.prebuilt pnglibconf.h + UNIX example: cp scripts/makefile.std makefile + cp scripts/pnglibconf.h.prebuilt pnglibconf.h + +Read the makefile to see if you need to change any source or +target directories to match your preferences. + +Then read pnglibconf.dfa to see if you want to make any configuration +changes. + +Then just run "make" which will create the libpng library in +this directory and "make test" which will run a quick test that reads +the "pngtest.png" file and writes a "pngout.png" file that should be +identical to it. Look for "9782 zero samples" in the output of the +test. For more confidence, you can run another test by typing +"pngtest pngnow.png" and looking for "289 zero samples" in the output. +Also, you can run "pngtest -m contrib/pngsuite/*.png" and compare +your output with the result shown in contrib/pngsuite/README. + +Most of the makefiles will allow you to run "make install" to +put the library in its final resting place (if you want to +do that, run "make install" in the zlib directory first if necessary). +Some also allow you to run "make test-installed" after you have +run "make install". + +VIII. Configuring libpng for 16-bit platforms + +You will want to look into zconf.h to tell zlib (and thus libpng) that +it cannot allocate more than 64K at a time. Even if you can, the memory +won't be accessible. So limit zlib and libpng to 64K by defining MAXSEG_64K. + +IX. Configuring for DOS + +For DOS users who only have access to the lower 640K, you will +have to limit zlib's memory usage via a png_set_compression_mem_level() +call. See zlib.h or zconf.h in the zlib library for more information. + +X. Configuring for Medium Model + +Libpng's support for medium model has been tested on most of the popular +compilers. Make sure MAXSEG_64K gets defined, USE_FAR_KEYWORD gets +defined, and FAR gets defined to far in pngconf.h, and you should be +all set. Everything in the library (except for zlib's structure) is +expecting far data. You must use the typedefs with the p or pp on +the end for pointers (or at least look at them and be careful). Make +note that the rows of data are defined as png_bytepp, which is +an "unsigned char far * far *". + +XI. Prepending a prefix to exported symbols + +Starting with libpng-1.6.0, you can configure libpng (when using the +"configure" script) to prefix all exported symbols by means of the +configuration option "--with-libpng-prefix=FOO_", where FOO_ can be any +string beginning with a letter and containing only uppercase +and lowercase letters, digits, and the underscore (i.e., a C language +identifier). This creates a set of macros in pnglibconf.h, so this is +transparent to applications; their function calls get transformed by +the macros to use the modified names. + +XII. Configuring for compiler xxx: + +All includes for libpng are in pngconf.h. If you need to add, change +or delete an include, this is the place to do it. +The includes that are not needed outside libpng are placed in pngpriv.h, +which is only used by the routines inside libpng itself. +The files in libpng proper only include pngpriv.h and png.h, which +in turn includes pngconf.h and, as of libpng-1.5.0, pnglibconf.h. +As of libpng-1.5.0, pngpriv.h also includes three other private header +files, pngstruct.h, pnginfo.h, and pngdebug.h, which contain material +that previously appeared in the public headers. + +XIII. Removing unwanted object code + +There are a bunch of #define's in pngconf.h that control what parts of +libpng are compiled. All the defines end in _SUPPORTED. If you are +never going to use a capability, you can change the #define to #undef +before recompiling libpng and save yourself code and data space, or +you can turn off individual capabilities with defines that begin with +PNG_NO_. + +In libpng-1.5.0 and later, the #define's are in pnglibconf.h instead. + +You can also turn all of the transforms and ancillary chunk capabilities +off en masse with compiler directives that define +PNG_NO_READ[or WRITE]_TRANSFORMS, or PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS, +or all four, along with directives to turn on any of the capabilities that +you do want. The PNG_NO_READ[or WRITE]_TRANSFORMS directives disable the +extra transformations but still leave the library fully capable of reading +and writing PNG files with all known public chunks. Use of the +PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS directive produces a library +that is incapable of reading or writing ancillary chunks. If you are +not using the progressive reading capability, you can turn that off +with PNG_NO_PROGRESSIVE_READ (don't confuse this with the INTERLACING +capability, which you'll still have). + +All the reading and writing specific code are in separate files, so the +linker should only grab the files it needs. However, if you want to +make sure, or if you are building a stand alone library, all the +reading files start with "pngr" and all the writing files start with "pngw". +The files that don't match either (like png.c, pngtrans.c, etc.) +are used for both reading and writing, and always need to be included. +The progressive reader is in pngpread.c + +If you are creating or distributing a dynamically linked library (a .so +or DLL file), you should not remove or disable any parts of the library, +as this will cause applications linked with different versions of the +library to fail if they call functions not available in your library. +The size of the library itself should not be an issue, because only +those sections that are actually used will be loaded into memory. + +XIV. Changes to the build and configuration of libpng in libpng-1.5.x + +Details of internal changes to the library code can be found in the CHANGES +file and in the GIT repository logs. These will be of no concern to the vast +majority of library users or builders; however, the few who configure libpng +to a non-default feature set may need to change how this is done. + +There should be no need for library builders to alter build scripts if +these use the distributed build support - configure or the makefiles - +however, users of the makefiles may care to update their build scripts +to build pnglibconf.h where the corresponding makefile does not do so. + +Building libpng with a non-default configuration has changed completely. +The old method using pngusr.h should still work correctly even though the +way pngusr.h is used in the build has been changed; however, library +builders will probably want to examine the changes to take advantage of +new capabilities and to simplify their build system. + +A. Specific changes to library configuration capabilities + +The exact mechanism used to control attributes of API functions has +changed. A single set of operating system independent macro definitions +is used and operating system specific directives are defined in +pnglibconf.h + +As part of this the mechanism used to choose procedure call standards on +those systems that allow a choice has been changed. At present this only +affects certain Microsoft (DOS, Windows) and IBM (OS/2) operating systems +running on Intel processors. As before, PNGAPI is defined where required +to control the exported API functions; however, two new macros, PNGCBAPI +and PNGCAPI, are used instead for callback functions (PNGCBAPI) and +(PNGCAPI) for functions that must match a C library prototype (currently +only png_longjmp_ptr, which must match the C longjmp function.) The new +approach is documented in pngconf.h + +Despite these changes, libpng 1.5.0 only supports the native C function +calling standard on those platforms tested so far (__cdecl on Microsoft +Windows). This is because the support requirements for alternative +calling conventions seem to no longer exist. Developers who find it +necessary to set PNG_API_RULE to 1 should advise the mailing list +(png-mng-implement) of this and library builders who use Openwatcom and +therefore set PNG_API_RULE to 2 should also contact the mailing list. + +B. Changes to the configuration mechanism + +Prior to libpng-1.5.0 library builders who needed to configure libpng +had either to modify the exported pngconf.h header file to add system +specific configuration or had to write feature selection macros into +pngusr.h and cause this to be included into pngconf.h by defining +PNG_USER_CONFIG. The latter mechanism had the disadvantage that an +application built without PNG_USER_CONFIG defined would see the +unmodified, default, libpng API and thus would probably fail to link. + +These mechanisms still work in the configure build and in any makefile +build that builds pnglibconf.h, although the feature selection macros +have changed somewhat as described above. In 1.5.0, however, pngusr.h is +processed only once, at the time the exported header file pnglibconf.h is +built. pngconf.h no longer includes pngusr.h; therefore, pngusr.h is ignored +after the build of pnglibconf.h and it is never included in an application +build. + +The formerly used alternative of adding a list of feature macros to the +CPPFLAGS setting in the build also still works; however, the macros will be +copied to pnglibconf.h and this may produce macro redefinition warnings +when the individual C files are compiled. + +All configuration now only works if pnglibconf.h is built from +scripts/pnglibconf.dfa. This requires the program awk. Brian Kernighan +(the original author of awk) maintains C source code of that awk and this +and all known later implementations (often called by subtly different +names - nawk and gawk for example) are adequate to build pnglibconf.h. +The Sun Microsystems (now Oracle) program 'awk' is an earlier version +and does not work; this may also apply to other systems that have a +functioning awk called 'nawk'. + +Configuration options are now documented in scripts/pnglibconf.dfa. This +file also includes dependency information that ensures a configuration is +consistent; that is, if a feature is switched off, dependent features are +also switched off. As a recommended alternative to using feature macros in +pngusr.h a system builder may also define equivalent options in pngusr.dfa +(or, indeed, any file) and add that to the configuration by setting +DFA_XTRA to the file name. The makefiles in contrib/pngminim illustrate +how to do this, and also illustrate a case where pngusr.h is still required. + +After you have built libpng, the definitions that were recorded in +pnglibconf.h are available to your application (pnglibconf.h is included +in png.h and gets installed alongside png.h and pngconf.h in your +$PREFIX/include directory). Do not edit pnglibconf.h after you have built +libpng, because than the settings would not accurately reflect the settings +that were used to build libpng. + +XV. Setjmp/longjmp issues + +Libpng uses setjmp()/longjmp() for error handling. Unfortunately setjmp() +is known to be not thread-safe on some platforms and we don't know of +any platform where it is guaranteed to be thread-safe. Therefore, if +your application is going to be using multiple threads, you should +configure libpng with PNG_NO_SETJMP in your pngusr.dfa file, with +-DPNG_NO_SETJMP on your compile line, or with + + #undef PNG_SETJMP_SUPPORTED + +in your pnglibconf.h or pngusr.h. + +Starting with libpng-1.6.0, the library included a "simplified API". +This requires setjmp/longjmp, so you must either build the library +with PNG_SETJMP_SUPPORTED defined, or with PNG_SIMPLIFIED_READ_SUPPORTED +and PNG_SIMPLIFIED_WRITE_SUPPORTED undefined. + +XVI. Other sources of information about libpng: + +Further information can be found in the README and libpng-manual.txt +files, in the individual makefiles, in png.h, and the manual pages +libpng.3 and png.5. diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/LICENSE b/3rdparty/libpng/LICENSE similarity index 96% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/LICENSE rename to 3rdparty/libpng/LICENSE index acb4e1781b..eb4a9a9da4 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/LICENSE +++ b/3rdparty/libpng/LICENSE @@ -10,8 +10,8 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.2, April 25, 2013, are -Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are +libpng versions 1.2.6, August 15, 2004, through 1.6.17, March 26, 2015, are +Copyright (c) 2004, 2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 25, 2013 +March 26, 2015 diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/README b/3rdparty/libpng/README similarity index 80% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/README rename to 3rdparty/libpng/README index 26301a5aa8..a158ea8a77 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/README +++ b/3rdparty/libpng/README @@ -1,11 +1,11 @@ -README for libpng version 1.6.2 - April 25, 2013 (shared library 16.0) +README for libpng version 1.6.17 - March 26, 2015 (shared library 16.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. -Libpng comes in several distribution formats. Get libpng-*.tar.gz, -libpng-*.tar.xz or libpng-*.tar.bz2 if you want UNIX-style line endings -in the text files, or lpng*.zip if you want DOS-style line endings. +Libpng comes in several distribution formats. Get libpng-*.tar.gz or +libpng-*.tar.xz or if you want UNIX-style line endings in the text files, +or lpng*.7z or lpng*.zip if you want DOS-style line endings. Version 0.89 was the first official release of libpng. Don't let the fact that it's the first release fool you. The libpng library has been in @@ -23,18 +23,25 @@ earlier versions if you are using a shared library. The type of the png_uint_32, which will affect shared-library applications that use this function. -To avoid problems with changes to the internals of png_info_struct, +To avoid problems with changes to the internals of png info_struct, new APIs have been made available in 0.95 to avoid direct application access to info_ptr. These functions are the png_set_ and png_get_ functions. These functions should be used when accessing/storing the info_struct data, rather than manipulating it directly, to avoid such problems in the future. -It is important to note that the APIs do not make current programs +It is important to note that the APIs did not make current programs that access the info struct directly incompatible with the new -library. However, it is strongly suggested that new programs use -the new APIs (as shown in example.c and pngtest.c), and older programs -be converted to the new format, to facilitate upgrades in the future. +library, through libpng-1.2.x. In libpng-1.4.x, which was meant to +be a transitional release, members of the png_struct and the +info_struct can still be accessed, but the compiler will issue a +warning about deprecated usage. Since libpng-1.5.0, direct access +to these structs is not allowed, and the definitions of the structs +reside in private pngstruct.h and pnginfo.h header files that are not +accessible to applications. It is strongly suggested that new +programs use the new APIs (as shown in example.c and pngtest.c), and +older programs be converted to the new format, to facilitate upgrades +in the future. **** Additions since 0.90 include the ability to compile libpng as a @@ -77,17 +84,21 @@ compression library that is useful for more things than just PNG files. You can use zlib as a drop-in replacement for fread() and fwrite() if you are so inclined. -zlib should be available at the same place that libpng is, or at. -ftp://ftp.info-zip.org/pub/infozip/zlib +zlib should be available at the same place that libpng is, or at zlib.net. You may also want a copy of the PNG specification. It is available as an RFC, a W3C Recommendation, and an ISO/IEC Standard. You can find these at http://www.libpng.org/pub/png/documents/ This code is currently being archived at libpng.sf.net in the -[DOWNLOAD] area, and on CompuServe, Lib 20 (PNG SUPPORT) -at GO GRAPHSUP. If you can't find it in any of those places, -e-mail me, and I'll help you find it. +[DOWNLOAD] area, and at ftp://ftp.simplesystems.org. If you can't find it +in any of those places, e-mail me, and I'll help you find it. + +I am not a lawyer, but I believe that the Export Control Classification +Number (ECCN) for libpng is EAR99, which means not subject to export +controls or International Traffic in Arms Regulations (ITAR) because it +is open source, publicly available software, that does not contain any +encryption software. See the EAR, paragraphs 734.3(b)(3) and 734.7(b). If you have any code changes, requests, problems, etc., please e-mail them to me. Also, I'd appreciate any make files or project files, @@ -123,7 +134,7 @@ and ...". If in doubt, send questions to me. I'll bounce them to others, if necessary. Please do not send suggestions on how to change PNG. We have -been discussing PNG for sixteen years now, and it is official and +been discussing PNG for nineteen years now, and it is official and finished. If you have suggestions for libpng, however, I'll gladly listen. Even if your suggestion is not used immediately, it may be used later. @@ -167,23 +178,25 @@ Files in this distribution: pngwrite.c => High-level write functions pngwtran.c => Write data transformations pngwutil.c => Write utility functions + arm => Contains optimized code for the ARM platform contrib => Contributions + examples => Example programs gregbook => source code for PNG reading and writing, from Greg Roelofs' "PNG: The Definitive Guide", O'Reilly, 1999 - msvctest => Builds and runs pngtest using a MSVC workspace - pngminus => Simple pnm2png and png2pnm programs - pngsuite => Test images - visupng => Contains a MSVC workspace for VisualPng + libtests => Test programs + pngminim => Minimal decoder, encoder, and progressive decoder + programs demonstrating use of pngusr.dfa + pngminus => Simple pnm2png and png2pnm programs + pngsuite => Test images + tools => Various tools + visupng => Contains a MSVC workspace for VisualPng projects => Contains project files and workspaces for building a DLL - cbuilder5 => Contains a Borland workspace for building - libpng and zlib - visualc6 => Contains a Microsoft Visual C++ (MSVC) - workspace for building libpng and zlib + owatcom => Contains a WATCOM project for building libpng visualc71 => Contains a Microsoft Visual C++ (MSVC) workspace for building libpng and zlib - xcode => Contains an Apple xcode + vstudio => Contains a Microsoft Visual C++ (MSVC) workspace for building libpng and zlib scripts => Directory containing scripts for building libpng: (see scripts/README.txt for the list of scripts) diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/TODO b/3rdparty/libpng/TODO similarity index 93% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/TODO rename to 3rdparty/libpng/TODO index 6e1f028bd7..72633774ff 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/TODO +++ b/3rdparty/libpng/TODO @@ -6,10 +6,12 @@ Better C++ wrapper/full C++ implementation? Fix problem with C++ and EXTERN "C". cHRM transformation. Remove setjmp/longjmp usage in favor of returning error codes. +Palette creation. Add "grayscale->palette" transformation and "palette->grayscale" detection. Improved dithering. Multi-lingual error and warning message support. Complete sRGB transformation (presently it simply uses gamma=0.45455). +Make profile checking optional via a png_set_something() call. Man pages for function calls. Better documentation. Better filter selection diff --git a/3rdparty/libpng/configure b/3rdparty/libpng/configure new file mode 100755 index 0000000000..b3fc4ed81e --- /dev/null +++ b/3rdparty/libpng/configure @@ -0,0 +1,19 @@ + +echo " + There is no \"configure\" script in this distribution (*.zip or *.7z) of + libpng-1.6.17. + + Instead, please copy the appropriate makefile for your system from the + \"scripts\" directory. Read the INSTALL file for more details. + + Update, July 2004: you can get a \"configure\" based distribution + from the libpng distribution sites. Download the file + libpng-1.6.17.tar.gz or libpng-1.6.17.tar.xz. + + If the line endings in the files look funny, which is likely to be the + case if you were trying to run \"configure\" on a Linux machine, you may + wish to get the other distribution of libpng. It is available in both + tar.gz/tar.xz (UNIX style line endings, with \"configure\") and .7z/.zip + (DOS style line endings, without \"configure\") formats. +" + diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/example.c b/3rdparty/libpng/example.c similarity index 96% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/example.c rename to 3rdparty/libpng/example.c index ee4e227bcf..945546c259 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/example.c +++ b/3rdparty/libpng/example.c @@ -2,8 +2,8 @@ #if 0 /* in case someone actually tries to compile this */ /* example.c - an example of using libpng - * Last changed in libpng 1.6.0 [February 14, 2013] - * Maintained 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.15 [November 20, 2014] + * Maintained 1998-2014 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * To the extent possible under law, the authors have waived @@ -52,7 +52,7 @@ int main(int argc, const char **argv) image.version = PNG_IMAGE_VERSION; /* The first argument is the file to read: */ - if (png_image_begin_read_from_file(&image, argv[1])) + if (png_image_begin_read_from_file(&image, argv[1]) != 0) { png_bytep buffer; @@ -97,7 +97,7 @@ int main(int argc, const char **argv) */ if (buffer != NULL && png_image_finish_read(&image, NULL/*background*/, buffer, - 0/*row_stride*/, NULL/*colormap*/)) + 0/*row_stride*/, NULL/*colormap*/) != 0) { /* Now write the image out to the second argument. In the write * call 'convert_to_8bit' allows 16-bit data to be squashed down to @@ -105,7 +105,7 @@ int main(int argc, const char **argv) * to the 8-bit format. */ if (png_image_write_to_file(&image, argv[2], 0/*convert_to_8bit*/, - buffer, 0/*row_stride*/, NULL/*colormap*/)) + buffer, 0/*row_stride*/, NULL/*colormap*/) != 0) { /* The image has been written successfully. */ exit(0); @@ -188,13 +188,13 @@ int main(int argc, const char **argv) * * Don't repeatedly convert between the 8-bit and 16-bit forms. There is * significant data loss when 16-bit data is converted to the 8-bit encoding and - * the current libpng implementation of convertion to 16-bit is also + * the current libpng implementation of conversion to 16-bit is also * significantly lossy. The latter will be fixed in the future, but the former * is unavoidable - the 8-bit format just doesn't have enough resolution. */ /* If your program needs more information from the PNG data it reads, or if you - * need to do more complex transformations, or minimise transformations, on the + * need to do more complex transformations, or minimize transformations, on the * data you read, then you must use one of the several lower level libpng * interfaces. * @@ -405,7 +405,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */ /* Expand paletted or RGB images with transparency to full alpha channels * so the data will be available as RGBA quartets. */ - if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) != 0) png_set_tRNS_to_alpha(png_ptr); /* Set the background color to draw transparent and alpha images over. @@ -417,7 +417,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */ png_color_16 my_background, *image_background; - if (png_get_bKGD(png_ptr, info_ptr, &image_background)) + if (png_get_bKGD(png_ptr, info_ptr, &image_background) != 0) png_set_background(png_ptr, image_background, PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); else @@ -441,9 +441,9 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */ /* If we don't have another value */ else { - screen_gamma = 2.2; /* A good guess for a PC monitor in a dimly - lit room */ - screen_gamma = 1.7 or 1.0; /* A good guess for Mac systems */ + screen_gamma = PNG_DEFAULT_sRGB; /* A good guess for a PC monitor + in a dimly lit room */ + screen_gamma = PNG_GAMMA_MAC_18 or 1.0; /* Good guesses for Mac systems */ } /* Tell libpng to handle the gamma conversion for you. The final call @@ -454,12 +454,12 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */ int intent; - if (png_get_sRGB(png_ptr, info_ptr, &intent)) - png_set_gamma(png_ptr, screen_gamma, 0.45455); + if (png_get_sRGB(png_ptr, info_ptr, &intent) != 0) + png_set_gamma(png_ptr, screen_gamma, PNG_DEFAULT_sRGB); else { double image_gamma; - if (png_get_gAMA(png_ptr, info_ptr, &image_gamma)) + if (png_get_gAMA(png_ptr, info_ptr, &image_gamma) != 0) png_set_gamma(png_ptr, screen_gamma, image_gamma); else png_set_gamma(png_ptr, screen_gamma, 0.45455); @@ -469,7 +469,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */ /* Quantize RGB files down to 8 bit palette or reduce palettes * to the number of colors available on your screen. */ - if (color_type & PNG_COLOR_MASK_COLOR) + if ((color_type & PNG_COLOR_MASK_COLOR) != 0) { int num_palette; png_colorp palette; @@ -484,7 +484,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */ MAX_SCREEN_COLORS, NULL, 0); } /* This reduces the image to the palette supplied in the file */ - else if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) + else if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette) != 0) { png_uint_16p histogram = NULL; @@ -494,7 +494,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */ max_screen_colors, histogram, 0); } } -#endif /* PNG_READ_QUANTIZE_SUPPORTED */ +#endif /* READ_QUANTIZE */ /* Invert monochrome files to have 0 as white and 1 as black */ png_set_invert_mono(png_ptr); @@ -503,7 +503,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */ * [0,65535] to the original [0,7] or [0,31], or whatever range the * colors were originally in: */ - if (png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT)) + if (png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT) != 0) { png_color_8p sig_bit_p; @@ -512,7 +512,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */ } /* Flip the RGB pixels to BGR (or RGBA to BGRA) */ - if (color_type & PNG_COLOR_MASK_COLOR) + if ((color_type & PNG_COLOR_MASK_COLOR) != 0) png_set_bgr(png_ptr); /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */ @@ -532,7 +532,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* File is already open */ number_passes = png_set_interlace_handling(png_ptr); #else number_passes = 1; -#endif /* PNG_READ_INTERLACING_SUPPORTED */ +#endif /* READ_INTERLACING */ /* Optional call to gamma correct and add the background to the palette @@ -744,7 +744,7 @@ row_callback(png_structp png_ptr, png_bytep new_row, * to pass the current row as new_row, and the function will combine * the old row and the new row. */ -#endif /* PNG_READ_INTERLACING_SUPPORTED */ +#endif /* READ_INTERLACING */ } end_callback(png_structp png_ptr, png_infop info) @@ -932,7 +932,7 @@ void write_png(char *file_name /* , ... other image information ... */) */ /* Once we write out the header, the compression type on the text - * chunks gets changed to PNG_TEXT_COMPRESSION_NONE_WR or + * chunk gets changed to PNG_TEXT_COMPRESSION_NONE_WR or * PNG_TEXT_COMPRESSION_zTXt_WR, so it doesn't get written out again * at the end. */ @@ -970,7 +970,7 @@ void write_png(char *file_name /* , ... other image information ... */) png_set_packswap(png_ptr); /* Turn on interlace handling if you are not using png_write_image() */ - if (interlacing) + if (interlacing != 0) number_passes = png_set_interlace_handling(png_ptr); else diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/libpng-config.in b/3rdparty/libpng/libpng-config.in similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/libpng-config.in rename to 3rdparty/libpng/libpng-config.in diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/libpng-manual.txt b/3rdparty/libpng/libpng-manual.txt similarity index 90% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/libpng-manual.txt rename to 3rdparty/libpng/libpng-manual.txt index 53829be397..f0dae987f9 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/libpng-manual.txt +++ b/3rdparty/libpng/libpng-manual.txt @@ -1,9 +1,9 @@ libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.6.2 - April 25, 2013 + libpng version 1.6.17 - March 26, 2015 Updated and distributed by Glenn Randers-Pehrson - Copyright (c) 1998-2013 Glenn Randers-Pehrson + Copyright (c) 1998-2015 Glenn Randers-Pehrson This document is released under the libpng license. For conditions of distribution and use, see the disclaimer @@ -11,15 +11,15 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.2 - April 25, 2013 + libpng versions 0.97, January 1998, through 1.6.17 - March 26, 2015 Updated and distributed by Glenn Randers-Pehrson - Copyright (c) 1998-2013 Glenn Randers-Pehrson + Copyright (c) 1998-2015 Glenn Randers-Pehrson - libpng 1.0 beta 6 version 0.96 May 28, 1997 + libpng 1.0 beta 6 - version 0.96 - May 28, 1997 Updated and distributed by Andreas Dilger Copyright (c) 1996, 1997 Andreas Dilger - libpng 1.0 beta 2 - version 0.88 January 26, 1996 + libpng 1.0 beta 2 - version 0.88 - January 26, 1996 For conditions of distribution and use, see copyright notice in png.h. Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. @@ -50,13 +50,11 @@ libpng-manual.txt - A description on how to use and modify libpng I. Introduction This file describes how to use and modify the PNG reference library -(known as libpng) for your own use. There are five sections to this -file: introduction, structures, reading, writing, and modification and -configuration notes for various special platforms. In addition to this +(known as libpng) for your own use. In addition to this file, example.c is a good starting point for using the library, as it is heavily commented and should include everything most people will need. We assume that libpng is already installed; see the -INSTALL file for instructions on how to install libpng. +INSTALL file for instructions on how to configure and install libpng. For examples of libpng usage, see the files "example.c", "pngtest.c", and the files in the "contrib" directory, all of which are included in @@ -276,10 +274,10 @@ This method of building a customized pnglibconf.h is illustrated in contrib/pngminim/*. See the "$(PNGCONF):" target in the makefile and pngusr.dfa in these directories. -C. Configuration using PNG_USR_CONFIG +C. Configuration using PNG_USER_CONFIG -If -DPNG_USR_CONFIG is added to the CFLAGS when pnglibconf.h is built the file -pngusr.h will automatically be included before the options in +If -DPNG_USER_CONFIG is added to the CPPFLAGS when pnglibconf.h is built, +the file pngusr.h will automatically be included before the options in scripts/pnglibconf.dfa are processed. Your pngusr.h file should contain only macro definitions turning features on or off or setting settings. @@ -338,7 +336,7 @@ prediction. If you are intending to keep the file pointer open for use in libpng, you must ensure you don't read more than 8 bytes from the beginning -of the file, and you also have to make a call to png_set_sig_bytes_read() +of the file, and you also have to make a call to png_set_sig_bytes() with the number of bytes you read from the beginning. Libpng will then only check the bytes (if any) that your program didn't read. @@ -346,22 +344,23 @@ then only check the bytes (if any) that your program didn't read. to replace them with custom functions. See the discussion under Customizing libpng. - FILE *fp = fopen(file_name, "rb"); if (!fp) { return (ERROR); } - fread(header, 1, number, fp); - is_png = !png_sig_cmp(header, 0, number); + if (fread(header, 1, number, fp) != number) + { + return (ERROR); + } + is_png = !png_sig_cmp(header, 0, number); if (!is_png) { return (NOT_PNG); } - Next, png_struct and png_info need to be allocated and initialized. In order to ensure that the size of these structures is correct even with a dynamically linked libpng, there are functions to initialize and @@ -650,15 +649,12 @@ User limits The PNG specification allows the width and height of an image to be as large as 2^31-1 (0x7fffffff), or about 2.147 billion rows and columns. -Since very few applications really need to process such large images, -we have imposed an arbitrary 1-million limit on rows and columns. Larger images will be rejected immediately with a png_error() call. If -you wish to change this limit, you can use +you wish to change these limits, you can use png_set_user_limits(png_ptr, width_max, height_max); -to set your own limits, or use width_max = height_max = 0x7fffffffL -to allow all valid dimensions (libpng may reject some very large images +to set your own limits (libpng may reject some very wide images anyway because of potential buffer overflow conditions). You should put this statement after you create the PNG structure and @@ -714,12 +710,12 @@ value. You can also specify a default encoding for the PNG file in case the required information is missing from the file. By default libpng assumes that the PNG data matches your system, to keep this default call: - png_set_gamma(png_ptr, screen_gamma, 1/screen_gamma/*file gamma*/); + png_set_gamma(png_ptr, screen_gamma, output_gamma); or you can use the fixed point equivalent: png_set_gamma_fixed(png_ptr, PNG_FP_1*screen_gamma, - PNG_FP_1/screen_gamma); + PNG_FP_1*output_gamma); If you don't know the gamma for your system it is probably 2.2 - a good approximation to the IEC standard for display systems (sRGB). If images are @@ -742,11 +738,75 @@ situations: encoding. You would use the linear (unencoded) value if you need to process the pixel -values further because this avoids the need to decode and reencode each +values further because this avoids the need to decode and re-encode each component value whenever arithmetic is performed. A lot of graphics software uses linear values for this reason, often with higher precision component values to preserve overall accuracy. + +The output_gamma value expresses how to decode the output values, not how +they are encoded. The values used correspond to the normal numbers used to +describe the overall gamma of a computer display system; for example 2.2 for +an sRGB conformant system. The values are scaled by 100000 in the _fixed +version of the API (so 220000 for sRGB.) + +The inverse of the value is always used to provide a default for the PNG file +encoding if it has no gAMA chunk and if png_set_gamma() has not been called +to override the PNG gamma information. + +When the ALPHA_OPTIMIZED mode is selected the output gamma is used to encode +opaque pixels however pixels with lower alpha values are not encoded, +regardless of the output gamma setting. + +When the standard Porter Duff handling is requested with mode 1 the output +encoding is set to be linear and the output_gamma value is only relevant +as a default for input data that has no gamma information. The linear output +encoding will be overridden if png_set_gamma() is called - the results may be +highly unexpected! + +The following numbers are derived from the sRGB standard and the research +behind it. sRGB is defined to be approximated by a PNG gAMA chunk value of +0.45455 (1/2.2) for PNG. The value implicitly includes any viewing +correction required to take account of any differences in the color +environment of the original scene and the intended display environment; the +value expresses how to *decode* the image for display, not how the original +data was *encoded*. + +sRGB provides a peg for the PNG standard by defining a viewing environment. +sRGB itself, and earlier TV standards, actually use a more complex transform +(a linear portion then a gamma 2.4 power law) than PNG can express. (PNG is +limited to simple power laws.) By saying that an image for direct display on +an sRGB conformant system should be stored with a gAMA chunk value of 45455 +(11.3.3.2 and 11.3.3.5 of the ISO PNG specification) the PNG specification +makes it possible to derive values for other display systems and +environments. + +The Mac value is deduced from the sRGB based on an assumption that the actual +extra viewing correction used in early Mac display systems was implemented as +a power 1.45 lookup table. + +Any system where a programmable lookup table is used or where the behavior of +the final display device characteristics can be changed requires system +specific code to obtain the current characteristic. However this can be +difficult and most PNG gamma correction only requires an approximate value. + +By default, if png_set_alpha_mode() is not called, libpng assumes that all +values are unencoded, linear, values and that the output device also has a +linear characteristic. This is only very rarely correct - it is invariably +better to call png_set_alpha_mode() with PNG_DEFAULT_sRGB than rely on the +default if you don't know what the right answer is! + +The special value PNG_GAMMA_MAC_18 indicates an older Mac system (pre Mac OS +10.6) which used a correction table to implement a somewhat lower gamma on an +otherwise sRGB system. + +Both these values are reserved (not simple gamma values) in order to allow +more precise correction internally in the future. + +NOTE: the values can be passed to either the fixed or floating +point APIs, but the floating point API will also accept floating point +values. + The second thing you may need to tell libpng about is how your system handles alpha channel information. Some, but not all, PNG files contain an alpha channel. To display these files correctly you need to compose the data onto a @@ -771,11 +831,11 @@ by png_set_alpha_mode(). The mode is as follows: - PNG_ALPHA_PNG: The data is encoded according to the PNG specification. Red, -green and blue, or gray, components are gamma encoded color -values and are not premultiplied by the alpha value. The -alpha value is a linear measure of the contribution of the -pixel to the corresponding final output pixel. + PNG_ALPHA_PNG: The data is encoded according to the PNG +specification. Red, green and blue, or gray, components are +gamma encoded color values and are not premultiplied by the +alpha value. The alpha value is a linear measure of the +contribution of the pixel to the corresponding final output pixel. You should normally use this format if you intend to perform color correction on the color values; most, maybe all, color @@ -792,11 +852,35 @@ be used! The remaining modes assume you don't need to do any further color correction or that if you do, your color correction software knows all about alpha (it -probably doesn't!) +probably doesn't!). They 'associate' the alpha with the color information by +storing color channel values that have been scaled by the alpha. The +advantage is that the color channels can be resampled (the image can be +scaled) in this form. The disadvantage is that normal practice is to store +linear, not (gamma) encoded, values and this requires 16-bit channels for +still images rather than the 8-bit channels that are just about sufficient if +gamma encoding is used. In addition all non-transparent pixel values, +including completely opaque ones, must be gamma encoded to produce the final +image. These are the 'STANDARD', 'ASSOCIATED' or 'PREMULTIPLIED' modes +described below (the latter being the two common names for associated alpha +color channels). Note that PNG files always contain non-associated color +channels; png_set_alpha_mode() with one of the modes causes the decoder to +convert the pixels to an associated form before returning them to your +application. - PNG_ALPHA_STANDARD: The data libpng produces -is encoded in the standard way -assumed by most correctly written graphics software. +Since it is not necessary to perform arithmetic on opaque color values so +long as they are not to be resampled and are in the final color space it is +possible to optimize the handling of alpha by storing the opaque pixels in +the PNG format (adjusted for the output color space) while storing partially +opaque pixels in the standard, linear, format. The accuracy required for +standard alpha composition is relatively low, because the pixels are +isolated, therefore typically the accuracy loss in storing 8-bit linear +values is acceptable. (This is not true if the alpha channel is used to +simulate transparency over large areas - use 16 bits or the PNG mode in +this case!) This is the 'OPTIMIZED' mode. For this mode a pixel is +treated as opaque only if the alpha value is equal to the maximum value. + + PNG_ALPHA_STANDARD: The data libpng produces is encoded in the +standard way assumed by most correctly written graphics software. The gamma encoding will be removed by libpng and the linear component values will be pre-multiplied by the alpha channel. @@ -825,9 +909,8 @@ dynamic range. To avoid problems, and if your software supports it, use png_set_expand_16() to force all components to 16 bits. - PNG_ALPHA_OPTIMIZED: This mode is the same -as PNG_ALPHA_STANDARD except that -completely opaque pixels are gamma encoded according to + PNG_ALPHA_OPTIMIZED: This mode is the same as PNG_ALPHA_STANDARD +except that completely opaque pixels are gamma encoded according to the screen_gamma value. Pixels with alpha less than 1.0 will still have linear components. @@ -846,18 +929,16 @@ representation of non-opaque pixels are irrelevant. You can also try this format if your software is broken; it might look better. - PNG_ALPHA_BROKEN: This is PNG_ALPHA_STANDARD; -however, all component values, -including the alpha channel are gamma encoded. This is -an appropriate format to try if your software, or more -likely hardware, is totally broken, i.e., if it performs -linear arithmetic directly on gamma encoded values. - -In most cases of broken software or hardware the bug in the final display -manifests as a subtle halo around composited parts of the image. You may not -even perceive this as a halo; the composited part of the image may simply appear -separate from the background, as though it had been cut out of paper and pasted -on afterward. + PNG_ALPHA_BROKEN: This is PNG_ALPHA_STANDARD; however, all component +values, including the alpha channel are gamma encoded. This is +broken because, in practice, no implementation that uses this choice +correctly undoes the encoding before handling alpha composition. Use this +choice only if other serious errors in the software or hardware you use +mandate it. In most cases of broken software or hardware the bug in the +final display manifests as a subtle halo around composited parts of the +image. You may not even perceive this as a halo; the composited part of +the image may simply appear separate from the background, as though it had +been cut out of paper and pasted on afterward. If you don't have to deal with bugs in software or hardware, or if you can fix them, there are three recommended ways of using png_set_alpha_mode(): @@ -888,6 +969,89 @@ All you can do is compose the result onto a matching output. Since this mode is libpng-specific you also need to write your own composition software. +The following are examples of calls to png_set_alpha_mode to achieve the +required overall gamma correction and, where necessary, alpha +premultiplication. + + png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB); + +This is the default libpng handling of the alpha channel - it is not +pre-multiplied into the color components. In addition the call states +that the output is for a sRGB system and causes all PNG files without gAMA +chunks to be assumed to be encoded using sRGB. + + png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC); + +In this case the output is assumed to be something like an sRGB conformant +display preceeded by a power-law lookup table of power 1.45. This is how +early Mac systems behaved. + + png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_GAMMA_LINEAR); + +This is the classic Jim Blinn approach and will work in academic +environments where everything is done by the book. It has the shortcoming +of assuming that input PNG data with no gamma information is linear - this +is unlikely to be correct unless the PNG files where generated locally. +Most of the time the output precision will be so low as to show +significant banding in dark areas of the image. + + png_set_expand_16(pp); + png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_DEFAULT_sRGB); + +This is a somewhat more realistic Jim Blinn inspired approach. PNG files +are assumed to have the sRGB encoding if not marked with a gamma value and +the output is always 16 bits per component. This permits accurate scaling +and processing of the data. If you know that your input PNG files were +generated locally you might need to replace PNG_DEFAULT_sRGB with the +correct value for your system. + + png_set_alpha_mode(pp, PNG_ALPHA_OPTIMIZED, PNG_DEFAULT_sRGB); + +If you just need to composite the PNG image onto an existing background +and if you control the code that does this you can use the optimization +setting. In this case you just copy completely opaque pixels to the +output. For pixels that are not completely transparent (you just skip +those) you do the composition math using png_composite or png_composite_16 +below then encode the resultant 8-bit or 16-bit values to match the output +encoding. + + Other cases + +If neither the PNG nor the standard linear encoding work for you because +of the software or hardware you use then you have a big problem. The PNG +case will probably result in halos around the image. The linear encoding +will probably result in a washed out, too bright, image (it's actually too +contrasty.) Try the ALPHA_OPTIMIZED mode above - this will probably +substantially reduce the halos. Alternatively try: + + png_set_alpha_mode(pp, PNG_ALPHA_BROKEN, PNG_DEFAULT_sRGB); + +This option will also reduce the halos, but there will be slight dark +halos round the opaque parts of the image where the background is light. +In the OPTIMIZED mode the halos will be light halos where the background +is dark. Take your pick - the halos are unavoidable unless you can get +your hardware/software fixed! (The OPTIMIZED approach is slightly +faster.) + +When the default gamma of PNG files doesn't match the output gamma. +If you have PNG files with no gamma information png_set_alpha_mode allows +you to provide a default gamma, but it also sets the ouput gamma to the +matching value. If you know your PNG files have a gamma that doesn't +match the output you can take advantage of the fact that +png_set_alpha_mode always sets the output gamma but only sets the PNG +default if it is not already set: + + png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB); + png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC); + +The first call sets both the default and the output gamma values, the +second call overrides the output gamma without changing the default. This +is easier than achieving the same effect with png_set_gamma. You must use +PNG_ALPHA_PNG for the first call - internal checking in png_set_alpha will +fire if more than one call to png_set_alpha_mode and png_set_background is +made in the same read operation, however multiple calls with PNG_ALPHA_PNG +are ignored. + If you don't need, or can't handle, the alpha channel you can call png_set_background() to remove it by compositing against a fixed color. Don't call png_set_strip_alpha() to do this - it will leave spurious pixel values in @@ -1101,13 +1265,13 @@ in until png_read_end() has read the chunk data following the image. the PNG datastream is embedded in a MNG-1.0 datastream) - Any or all of interlace_type, compression_type, or - filter_method can be NULL if you are - not interested in their values. + Any of width, height, color_type, bit_depth, + interlace_type, compression_type, or filter_method can + be NULL if you are not interested in their values. Note that png_get_IHDR() returns 32-bit data into the application's width and height variables. - This is an unsafe situation if these are 16-bit + This is an unsafe situation if these are not png_uint_32 variables. In such situations, the png_get_image_width() and png_get_image_height() functions described below are safer. @@ -1218,7 +1382,7 @@ png_set_rgb_to_gray()). png_get_sRGB(png_ptr, info_ptr, &srgb_intent); - file_srgb_intent - the rendering intent (PNG_INFO_sRGB) + srgb_intent - the rendering intent (PNG_INFO_sRGB) The presence of the sRGB chunk means that the pixel data is in the sRGB color space. This chunk also @@ -1830,7 +1994,7 @@ value when you call it in this position: png_set_gamma(png_ptr, screen_gamma, 0.45455); If you need to reduce an RGB file to a paletted file, or if a paletted -file has more entries then will fit on your screen, png_set_quantize() +file has more entries than will fit on your screen, png_set_quantize() will do that. Note that this is a simple match quantization that merely finds the closest color available. This should work fairly well with optimized palettes, but fairly badly with linear color cubes. If you @@ -2168,10 +2332,15 @@ how pngvalid.c does it. Finishing a sequential read After you are finished reading the image through the -low-level interface, you can finish reading the file. If you are -interested in comments or time, which may be stored either before or -after the image data, you should pass the separate png_info struct if -you want to keep the comments from before and after the image +low-level interface, you can finish reading the file. + +If you want to use a different crc action for handling CRC errors in +chunks after the image data, you can call png_set_crc_action() +again at this point. + +If you are interested in comments or time, which may be stored either +before or after the image data, you should pass the separate png_info +struct if you want to keep the comments from before and after the image separate. png_infop end_info = png_create_info_struct(png_ptr); @@ -2187,6 +2356,9 @@ separate. If you are not interested, you should still call png_read_end() but you can pass NULL, avoiding the need to create an end_info structure. +If you do this, libpng will not process any chunks after IDAT other than +skipping over them and perhaps (depending on whether you have called +png_set_crc_action) checking their CRCs while looking for the IEND chunk. png_read_end(png_ptr, (png_infop)NULL); @@ -2291,7 +2463,7 @@ For a more compact example of reading a PNG image, see the file example.c. Reading PNG files progressively -The progressive reader is slightly different then the non-progressive +The progressive reader is slightly different from the non-progressive reader. Instead of calling png_read_info(), png_read_rows(), and png_read_end(), you make one call to png_process_data(), which calls callbacks when it has the info, a row, or the end of the image. You @@ -2375,7 +2547,7 @@ png_infop info_ptr; 64K. The library seems to run fine with sizes of 4K. Although you can give it much less if necessary (I assume you can give it chunks of - 1 byte, I haven't tried less then 256 bytes + 1 byte, I haven't tried less than 256 bytes yet). When this function returns, you may want to display any rows that were generated in the row callback if you don't already do @@ -2462,7 +2634,7 @@ png_infop info_ptr; png_progressive_combine_row(png_ptr, old_row, new_row); - /* where old_row is what was displayed for + /* where old_row is what was displayed previously for the row. Note that the first pass (pass == 0, really) will completely cover the old row, so the rows do not have to be @@ -3087,19 +3259,53 @@ tEXt chunk use RFC 1123 format dates (e.g. "22 May 1997 18:07:10 GMT"), although this isn't a requirement. Unlike the tIME chunk, the "Creation Time" tEXt chunk is not expected to be automatically changed by the software. To facilitate the use of RFC 1123 dates, a function -png_convert_to_rfc1123_buffer(png_ptr, buffer, png_timep) is provided to +png_convert_to_rfc1123_buffer(buffer, png_timep) is provided to convert from PNG time to an RFC 1123 format string. The caller must provide a writeable buffer of at least 29 bytes. Writing unknown chunks -You can use the png_set_unknown_chunks function to queue up chunks -for writing. You give it a chunk name, raw data, and a size; that's -all there is to it. The chunks will be written by the next following -png_write_info_before_PLTE, png_write_info, or png_write_end function. -Any chunks previously read into the info structure's unknown-chunk -list will also be written out in a sequence that satisfies the PNG -specification's ordering rules. +You can use the png_set_unknown_chunks function to queue up private chunks +for writing. You give it a chunk name, location, raw data, and a size. You +also must use png_set_keep_unknown_chunks() to ensure that libpng will +handle them. That's all there is to it. The chunks will be written by the +next following png_write_info_before_PLTE, png_write_info, or png_write_end +function, depending upon the specified location. Any chunks previously +read into the info structure's unknown-chunk list will also be written out +in a sequence that satisfies the PNG specification's ordering rules. + +Here is an example of writing two private chunks, prVt and miNE: + + #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED + /* Set unknown chunk data */ + png_unknown_chunk unk_chunk[2]; + strcpy((char *) unk_chunk[0].name, "prVt"; + unk_chunk[0].data = (unsigned char *) "PRIVATE DATA"; + unk_chunk[0].size = strlen(unk_chunk[0].data)+1; + unk_chunk[0].location = PNG_HAVE_IHDR; + strcpy((char *) unk_chunk[1].name, "miNE"; + unk_chunk[1].data = (unsigned char *) "MY CHUNK DATA"; + unk_chunk[1].size = strlen(unk_chunk[0].data)+1; + unk_chunk[1].location = PNG_AFTER_IDAT; + png_set_unknown_chunks(write_ptr, write_info_ptr, + unk_chunk, 2); + /* Needed because miNE is not safe-to-copy */ + png_set_keep_unknown_chunks(png, PNG_HANDLE_CHUNK_ALWAYS, + (png_bytep) "miNE", 1); + # if PNG_LIBPNG_VER < 10600 + /* Deal with unknown chunk location bug in 1.5.x and earlier */ + png_set_unknown_chunk_location(png, info, 0, PNG_HAVE_IHDR); + png_set_unknown_chunk_location(png, info, 1, PNG_AFTER_IDAT); + # endif + # if PNG_LIBPNG_VER < 10500 + /* PNG_AFTER_IDAT writes two copies of the chunk prior to libpng-1.5.0, + * one before IDAT and another after IDAT, so don't use it; only use + * PNG_HAVE_IHDR location. This call resets the location previously + * set by assignment and png_set_unknown_chunk_location() for chunk 1. + */ + png_set_unknown_chunk_location(png, info, 1, PNG_HAVE_IHDR); + # endif + #endif The high-level write interface @@ -3503,7 +3709,7 @@ The simplified API, which became available in libpng-1.6.0, hides the details of both libpng and the PNG file format itself. It allows PNG files to be read into a very limited number of in-memory bitmap formats or to be written from the same formats. If these -formats do not accomodate your needs then you can, and should, use the more +formats do not accommodate your needs then you can, and should, use the more sophisticated APIs above - these support a wide variety of in-memory formats and a wide variety of sophisticated transformations to those formats as well as a wide variety of APIs to manipulate ancilliary information. @@ -3585,8 +3791,9 @@ and matches the 8-bit format expected by typical display devices. The color/gray channels are not scaled (pre-multiplied) by the alpha channel and are suitable for passing to color management software. - b) As a value in the range 0..65535, contained in a 2-byte integer. All -channels can be converted to the original value by dividing by 65535; all + b) As a value in the range 0..65535, contained in a 2-byte integer, in +the native byte order of the platform on which the application is running. +All channels can be converted to the original value by dividing by 65535; all channels are linear. Color channels use the RGB encoding (RGB end-points) of the sRGB specification. This encoding is identified by the PNG_FORMAT_FLAG_LINEAR flag below. @@ -3653,7 +3860,9 @@ First the single byte formats: Then the linear 2-byte formats. When naming these "Y" is used to indicate a luminance (gray) channel. The component order within the pixel is always the same - there is no provision for swapping the order of the -components in the linear format. +components in the linear format. The components are 16-bit integers in +the native byte order for your platform, and there is no provision for +swapping the bytes to a different endian condition. PNG_FORMAT_LINEAR_Y PNG_FORMAT_FLAG_LINEAR PNG_FORMAT_LINEAR_Y_ALPHA @@ -3718,7 +3927,7 @@ First the information about the samples. * * png_byte colormap[PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(sRGB_fmt)]; * - * Alternatively use the PNG_IMAGE_COLORMAP_SIZE macro below to use the + * Alternatively, use the PNG_IMAGE_COLORMAP_SIZE macro below to use the * information from one of the png_image_begin_read_ APIs and dynamically * allocate the required memory. */ @@ -3747,9 +3956,16 @@ Information about the whole row, or whole image row. For a color-mapped image this is the minimum number of bytes in a row. + If you need the stride measured in bytes, row_stride_bytes is + PNG_IMAGE_ROW_STRIDE(image) * PNG_IMAGE_PIXEL_COMPONENT_SIZE(fmt) + plus any padding bytes that your application might need, for example + to start the next row on a 4-byte boundary. + PNG_IMAGE_BUFFER_SIZE(image, row_stride) Returns the size, in bytes, of an image buffer given a png_image and a row - stride - the number of components to leave space for in each row. + stride - the number of components to leave space for in each row. This + macro takes care of multiplying row_stride by PNG_IMAGE_PIXEL_COMONENT_SIZE + when the image has 2-byte components. PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB == 0x01 This indicates the the RGB values of the in-memory bitmap do not @@ -3878,14 +4094,11 @@ clears the newly allocated memory to zero; note that png_calloc(png_ptr, size) is not the same as the calloc(number, size) function provided by stdlib.h. There is limited support for certain systems with segmented memory architectures and the types of pointers declared by png.h match this; you -will have to use appropriate pointers in your application. Since it is -unlikely that the method of handling memory allocation on a platform -will change between applications, these functions must be modified in -the library at compile time. If you prefer to use a different method -of allocating and freeing data, you can use png_create_read_struct_2() or -png_create_write_struct_2() to register your own functions as described -above. These functions also provide a void pointer that can be retrieved -via +will have to use appropriate pointers in your application. If you prefer +to use a different method of allocating and freeing data, you can use +png_create_read_struct_2() or png_create_write_struct_2() to register your +own functions as described above. These functions also provide a void +pointer that can be retrieved via mem_ptr=png_get_mem_ptr(png_ptr); @@ -3994,9 +4207,12 @@ as warnings. png_set_benign_errors (png_ptr, int allowed); - allowed: 0: (default) treat png_benign_error() an error. + allowed: 0: treat png_benign_error() as an error. 1: treat png_benign_error() as a warning. +As of libpng-1.6.0, the default condition is to treat benign errors as +warnings while reading and as errors while writing. + Custom chunks If you need to read or write custom chunks, you may need to get deeper @@ -4025,29 +4241,6 @@ the simpler ones to get an idea of how they work. Try to find a similar transformation to the one you want to add and copy off of it. More details can be found in the comments inside the code itself. -Configuring for 16-bit platforms - -You will want to look into zconf.h to tell zlib (and thus libpng) that -it cannot allocate more then 64K at a time. Even if you can, the memory -won't be accessible. So limit zlib and libpng to 64K by defining MAXSEG_64K. - -Configuring for DOS - -For DOS users who only have access to the lower 640K, you will -have to limit zlib's memory usage via a png_set_compression_mem_level() -call. See zlib.h or zconf.h in the zlib library for more information. - -Configuring for Medium Model - -Libpng's support for medium model has been tested on most of the popular -compilers. Make sure MAXSEG_64K gets defined, USE_FAR_KEYWORD gets -defined, and FAR gets defined to far in pngconf.h, and you should be -all set. Everything in the library (except for zlib's structure) is -expecting far data. You must use the typedefs with the p or pp on -the end for pointers (or at least look at them and be careful). Make -note that the rows of data are defined as png_bytepp, which is -an "unsigned char far * far *". - Configuring for gui/windowing platforms: You will need to write new error and warning functions that use the GUI @@ -4057,18 +4250,6 @@ in order to have them available during the structure initialization. They can be changed later via png_set_error_fn(). On some compilers, you may also have to change the memory allocators (png_malloc, etc.). -Configuring for compiler xxx: - -All includes for libpng are in pngconf.h. If you need to add, change -or delete an include, this is the place to do it. -The includes that are not needed outside libpng are placed in pngpriv.h, -which is only used by the routines inside libpng itself. -The files in libpng proper only include pngpriv.h and png.h, which -in turn includes pngconf.h and, as of libpng-1.5.0, pnglibconf.h. -As of libpng-1.5.0, pngpriv.h also includes three other private header -files, pngstruct.h, pnginfo.h, and pngdebug.h, which contain material -that previously appeared in the public headers. - Configuring zlib: There are special functions to configure the compression. Perhaps the @@ -4110,6 +4291,8 @@ zlib.h for more information on what these mean. png_set_compression_method(png_ptr, method); +This controls the size of the IDAT chunks (default 8192): + png_set_compression_buffer_size(png_ptr, size); As of libpng version 1.5.4, additional APIs became @@ -4208,46 +4391,6 @@ Note that the numbers above were invented purely for this example and are given only to help explain the function usage. Little testing has been done to find optimum values for either the costs or the weights. -Removing unwanted object code - -There are a bunch of #define's in pngconf.h that control what parts of -libpng are compiled. All the defines end in _SUPPORTED. If you are -never going to use a capability, you can change the #define to #undef -before recompiling libpng and save yourself code and data space, or -you can turn off individual capabilities with defines that begin with -PNG_NO_. - -In libpng-1.5.0 and later, the #define's are in pnglibconf.h instead. - -You can also turn all of the transforms and ancillary chunk capabilities -off en masse with compiler directives that define -PNG_NO_READ[or WRITE]_TRANSFORMS, or PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS, -or all four, -along with directives to turn on any of the capabilities that you do -want. The PNG_NO_READ[or WRITE]_TRANSFORMS directives disable the extra -transformations but still leave the library fully capable of reading -and writing PNG files with all known public chunks. Use of the -PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS directive produces a library -that is incapable of reading or writing ancillary chunks. If you are -not using the progressive reading capability, you can turn that off -with PNG_NO_PROGRESSIVE_READ (don't confuse this with the INTERLACING -capability, which you'll still have). - -All the reading and writing specific code are in separate files, so the -linker should only grab the files it needs. However, if you want to -make sure, or if you are building a stand alone library, all the -reading files start with "pngr" and all the writing files start with "pngw". -The files that don't match either (like png.c, pngtrans.c, etc.) -are used for both reading and writing, and always need to be included. -The progressive reader is in pngpread.c - -If you are creating or distributing a dynamically linked library (a .so -or DLL file), you should not remove or disable any parts of the library, -as this will cause applications linked with different versions of the -library to fail if they call functions not available in your library. -The size of the library itself should not be an issue, because only -those sections that are actually used will be loaded into memory. - Requesting debug printout The macro definition PNG_DEBUG can be used to request debugging @@ -4267,7 +4410,7 @@ the message, "message" is the formatted string to be printed, and p1 and p2 are parameters that are to be embedded in the string according to printf-style formatting directives. For example, - png_debug1(2, "foo=%d\n", foo); + png_debug1(2, "foo=%d", foo); is expanded to @@ -4285,17 +4428,6 @@ When PNG_DEBUG = 1, the macros are defined, but only png_debug statements having level = 0 will be printed. There aren't any such statements in this version of libpng, but if you insert some they will be printed. -Prepending a prefix to exported symbols - -Starting with libpng-1.6.0, you can configure libpng (when using the -"configure" script) to prefix all exported symbols by means of the -configuration option "--with-libpng-prefix=FOO_", where FOO_ can be any -string beginning with a letter and containing only uppercase -and lowercase letters, digits, and the underscore (i.e., a C language -identifier). This creates a set of macros in pnglibconf.h, so this is -transparent to applications; their function calls get transformed by -the macros to use the modified names. - VII. MNG support The MNG specification (available at http://www.libpng.org/pub/mng) allows @@ -4358,6 +4490,9 @@ png_set_error_fn(), which is essentially the same function, but with a new name to force compilation errors with applications that try to use the old method. +Support for the sCAL, iCCP, iTXt, and sPLT chunks was added at libpng-1.0.6; +however, iTXt support was not enabled by default. + Starting with version 1.0.7, you can find out which version of the library you are using at run-time: @@ -4574,7 +4709,7 @@ it has not been well tested and doesn't actually "dither". The code was not removed, however, and could be enabled by building libpng with PNG_READ_DITHER_SUPPORTED defined. In libpng-1.4.2, this support -was reenabled, but the function was renamed png_set_quantize() to +was re-enabled, but the function was renamed png_set_quantize() to reflect more accurately what it actually does. At the same time, the PNG_DITHER_[RED,GREEN_BLUE]_BITS macros were also renamed to PNG_QUANTIZE_[RED,GREEN,BLUE]_BITS, and PNG_READ_DITHER_SUPPORTED @@ -4586,12 +4721,13 @@ XI. Changes to Libpng from version 1.4.x to 1.5.x From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the function) incorrectly returned a value of type png_uint_32. +The incorrect macro was removed from libpng-1.4.5. -Checking for invalid palette index on read or write was added at libpng -1.5.10. When an invalid index is found, libpng issues a benign error. -This is enabled by default because this condition is an error according -to the PNG specification, Clause 11.3.2, but the error can be ignored in -each png_ptr with +Checking for invalid palette index on write was added at libpng +1.5.10. If a pixel contains an invalid (out-of-range) index libpng issues +a benign error. This is enabled by default because this condition is an +error according to the PNG specification, Clause 11.3.2, but the error can +be ignored in each png_ptr with png_set_check_for_invalid_index(png_ptr, allowed); @@ -4618,8 +4754,6 @@ does not account for any palette index used by ancillary chunks such as the bKGD chunk; you must check those separately to determine the maximum palette index actually used. -A. Changes that affect users of libpng - There are no substantial API changes between the non-deprecated parts of the 1.4.5 API and the 1.5.0 API; however, the ability to directly access members of the main libpng control structures, png_struct and png_info, @@ -4690,7 +4824,10 @@ and the accuracy of PNG fixed point values is insufficient for representation of these values. Consequently a "string" API (png_get_sCAL_s and png_set_sCAL_s) is the only reliable way of reading arbitrary sCAL chunks in the absence of either the floating point API or -internal floating point calculations. +internal floating point calculations. Starting with libpng-1.5.0, both +of these functions are present when PNG_sCAL_SUPPORTED is defined. Prior +to libpng-1.5.0, their presence also depended upon PNG_FIXED_POINT_SUPPORTED +being defined and PNG_FLOATING_POINT_SUPPORTED not being defined. Applications no longer need to include the optional distribution header file pngusr.h or define the corresponding macros during application @@ -4710,15 +4847,10 @@ reset by pngusr.h or by explicit settings on the compiler command line. These settings may produce compiler warnings or errors in 1.5.0 because of macro redefinition. -From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the -function) incorrectly returned a value of type png_uint_32. libpng 1.5.0 -is consistent with the implementation in 1.4.5 and 1.2.x (where the macro -did not exist.) - Applications can now choose whether to use these macros or to call the corresponding function by defining PNG_USE_READ_MACROS or PNG_NO_USE_READ_MACROS before including png.h. Notice that this is -only supported from 1.5.0 -defining PNG_NO_USE_READ_MACROS prior to 1.5.0 +only supported from 1.5.0; defining PNG_NO_USE_READ_MACROS prior to 1.5.0 will lead to a link failure. Prior to libpng-1.5.4, the zlib compressor used the same set of parameters @@ -4732,7 +4864,10 @@ option was off by default, and slightly inaccurate scaling occurred. This option can no longer be turned off, and the choice of accurate or inaccurate 16-to-8 scaling is by using the new png_set_scale_16_to_8() API for accurate scaling or the old png_set_strip_16_to_8() API for simple -chopping. +chopping. In libpng-1.5.4, the PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED +macro became PNG_READ_SCALE_16_TO_8_SUPPORTED, and the PNG_READ_16_TO_8 +macro became PNG_READ_STRIP_16_TO_8_SUPPORTED, to enable the two +png_set_*_16_to_8() functions separately. Prior to libpng-1.5.4, the png_set_user_limits() function could only be used to reduce the width and height limits from the value of @@ -4754,25 +4889,8 @@ limits are now png_user_chunk_cache_max 0 (unlimited) 128 png_user_chunk_malloc_max 0 (unlimited) 8,000,000 -B. Changes to the build and configuration of libpng - -Details of internal changes to the library code can be found in the CHANGES -file and in the GIT repository logs. These will be of no concern to the vast -majority of library users or builders; however, the few who configure libpng -to a non-default feature set may need to change how this is done. - -There should be no need for library builders to alter build scripts if -these use the distributed build support - configure or the makefiles - -however, users of the makefiles may care to update their build scripts -to build pnglibconf.h where the corresponding makefile does not do so. - -Building libpng with a non-default configuration has changed completely. -The old method using pngusr.h should still work correctly even though the -way pngusr.h is used in the build has been changed; however, library -builders will probably want to examine the changes to take advantage of -new capabilities and to simplify their build system. - -B.1 Specific changes to library configuration capabilities +The png_set_option() function (and the "options" member of the png struct) was +added to libpng-1.5.15. The library now supports a complete fixed point implementation and can thus be used on systems that have no floating point support or very @@ -4784,27 +4902,7 @@ independent of the choice of fixed versus floating point APIs and all the missing fixed point APIs have been implemented. The exact mechanism used to control attributes of API functions has -changed. A single set of operating system independent macro definitions -is used and operating system specific directives are defined in -pnglibconf.h - -As part of this the mechanism used to choose procedure call standards on -those systems that allow a choice has been changed. At present this only -affects certain Microsoft (DOS, Windows) and IBM (OS/2) operating systems -running on Intel processors. As before, PNGAPI is defined where required -to control the exported API functions; however, two new macros, PNGCBAPI -and PNGCAPI, are used instead for callback functions (PNGCBAPI) and -(PNGCAPI) for functions that must match a C library prototype (currently -only png_longjmp_ptr, which must match the C longjmp function.) The new -approach is documented in pngconf.h - -Despite these changes, libpng 1.5.0 only supports the native C function -calling standard on those platforms tested so far (__cdecl on Microsoft -Windows). This is because the support requirements for alternative -calling conventions seem to no longer exist. Developers who find it -necessary to set PNG_API_RULE to 1 should advise the mailing list -(png-mng-implement) of this and library builders who use Openwatcom and -therefore set PNG_API_RULE to 2 should also contact the mailing list. +changed, as described in the INSTALL file. A new test program, pngvalid, is provided in addition to pngtest. pngvalid validates the arithmetic accuracy of the gamma correction @@ -4880,46 +4978,6 @@ even though the default is to use the macros - this allows applications to choose at app buildtime whether or not to use macros (previously impossible because the functions weren't in the default build.) -B.2 Changes to the configuration mechanism - -Prior to libpng-1.5.0 library builders who needed to configure libpng -had either to modify the exported pngconf.h header file to add system -specific configuration or had to write feature selection macros into -pngusr.h and cause this to be included into pngconf.h by defining -PNG_USER_CONFIG. The latter mechanism had the disadvantage that an -application built without PNG_USER_CONFIG defined would see the -unmodified, default, libpng API and thus would probably fail to link. - -These mechanisms still work in the configure build and in any makefile -build that builds pnglibconf.h, although the feature selection macros -have changed somewhat as described above. In 1.5.0, however, pngusr.h is -processed only once, when the exported header file pnglibconf.h is built. -pngconf.h no longer includes pngusr.h, therefore pngusr.h is ignored after the -build of pnglibconf.h and it is never included in an application build. - -The rarely used alternative of adding a list of feature macros to the -CFLAGS setting in the build also still works; however, the macros will be -copied to pnglibconf.h and this may produce macro redefinition warnings -when the individual C files are compiled. - -All configuration now only works if pnglibconf.h is built from -scripts/pnglibconf.dfa. This requires the program awk. Brian Kernighan -(the original author of awk) maintains C source code of that awk and this -and all known later implementations (often called by subtly different -names - nawk and gawk for example) are adequate to build pnglibconf.h. -The Sun Microsystems (now Oracle) program 'awk' is an earlier version -and does not work; this may also apply to other systems that have a -functioning awk called 'nawk'. - -Configuration options are now documented in scripts/pnglibconf.dfa. This -file also includes dependency information that ensures a configuration is -consistent; that is, if a feature is switched off dependent features are -also removed. As a recommended alternative to using feature macros in -pngusr.h a system builder may also define equivalent options in pngusr.dfa -(or, indeed, any file) and add that to the configuration by setting -DFA_XTRA to the file name. The makefiles in contrib/pngminim illustrate -how to do this, and a case where pngusr.h is still required. - XII. Changes to Libpng from version 1.5.x to 1.6.x A "simplified API" has been added (see documentation in png.h and a simple @@ -4947,15 +5005,14 @@ symbols, using the PNG_PREFIX macro. We no longer include string.h in png.h. The include statement has been moved to pngpriv.h, where it is not accessible by applications. Applications that -need access to information in string.h must add an '#include "string.h"' +need access to information in string.h must add an '#include ' directive. It does not matter whether this is placed prior to or after -the '"#include png.h"' directive. +the '#include "png.h"' directive. The following API are now DEPRECATED: png_info_init_3() png_convert_to_rfc1123() which has been replaced with png_convert_to_rfc1123_buffer() - png_data_freer() png_malloc_default() png_free_default() png_reset_zstream() @@ -4975,17 +5032,46 @@ The signatures of many exported functions were changed, such that png_infop became png_inforp or png_const_inforp where "rp" indicates a "restricted pointer". +The support for FAR/far types has been eliminated and the definition of +png_alloc_size_t is now controlled by a flag so that 'small size_t' systems +can select it if necessary. + Error detection in some chunks has improved; in particular the iCCP chunk reader now does pretty complete validation of the basic format. Some bad -profiles that were previously accepted are now rejected, in particular the -very old broken Microsoft/HP sRGB profile. The PNG spec requirement that -only grayscale profiles may appear in images with color type 0 or 4 and that -even if the image only contains gray pixels, only RGB profiles may appear -in images with color type 2, 3, or 6, is now enforced. The sRGB chunk -is allowed to appear in images with any color type. +profiles that were previously accepted are now accepted with a warning or +rejected, depending upon the png_set_benign_errors() setting, in particular +the very old broken Microsoft/HP 3144-byte sRGB profile. Starting with +libpng-1.6.11, recognizing and checking sRGB profiles can be avoided by +means of + + #if defined(PNG_SKIP_sRGB_CHECK_PROFILE) && \ + defined(PNG_SET_OPTION_SUPPORTED) + png_set_option(png_ptr, PNG_SKIP_sRGB_CHECK_PROFILE, + PNG_OPTION_ON); + #endif + +It's not a good idea to do this if you are using the "simplified API", +which needs to be able to recognize sRGB profiles conveyed via the iCCP +chunk. + +The PNG spec requirement that only grayscale profiles may appear in images +with color type 0 or 4 and that even if the image only contains gray pixels, +only RGB profiles may appear in images with color type 2, 3, or 6, is now +enforced. The sRGB chunk is allowed to appear in images with any color type +and is interpreted by libpng to convey a one-tracer-curve gray profile or a +three-tracer-curve RGB profile as appropriate. + +Prior to libpng-1.6.0 a warning would be issued if the iTXt chunk contained +an empty language field or an empty translated keyword. Both of these +are allowed by the PNG specification, so these warnings are no longer issued. The library now issues an error if the application attempts to set a -transform after it calls png_read_update_info(). +transform after it calls png_read_update_info() or if it attempts to call +both png_read_update_info() and png_start_read_image() or to call either +of them more than once. + +The default condition for benign_errors is now to treat benign errors as +warnings while reading and as errors while writing. The library now issues a warning if both background processing and RGB to gray are used when gamma correction happens. As with previous versions of @@ -5003,6 +5089,26 @@ The machine-generated configure files are no longer included in branches libpng16 and later of the GIT repository. They continue to be included in the tarball releases, however. +Libpng-1.6.0 through 1.6.2 used the CMF bytes at the beginning of the IDAT +stream to set the size of the sliding window for reading instead of using the +default 32-kbyte sliding window size. It was discovered that there are +hundreds of PNG files in the wild that have incorrect CMF bytes that caused +zlib to issue the "invalid distance too far back" error and reject the file. +Libpng-1.6.3 and later calculate their own safe CMF from the image dimensions, +provide a way to revert to the libpng-1.5.x behavior (ignoring the CMF bytes +and using a 32-kbyte sliding window), by using + + png_set_option(png_ptr, PNG_MAXIMUM_INFLATE_WINDOW, + PNG_OPTION_ON); + +and provide a tool (contrib/tools/pngfix) for rewriting a PNG file while +optimizing the CMF bytes in its IDAT chunk correctly. + +Libpng-1.6.0 and libpng-1.6.1 wrote uncompressed iTXt chunks with the wrong +length, which resulted in PNG files that cannot be read beyond the bad iTXt +chunk. This error was fixed in libpng-1.6.3, and a tool (called +contrib/tools/png-fix-itxt) has been added to the libpng distribution. + XIII. Detecting libpng The png_get_io_ptr() function has been present since libpng-0.88, has never @@ -5038,7 +5144,8 @@ mailing list, or directly to glennrp. XV. Coding style -Our coding style is similar to the "Allman" style, with curly +Our coding style is similar to the "Allman" style +(See http://en.wikipedia.org/wiki/Indent_style#Allman_style), with curly braces on separate lines: if (condition) @@ -5101,6 +5208,9 @@ exported functions are marked with PNGAPI: body; } +The return type and decorations are placed on a separate line +ahead of the function name, as illustrated above. + The prototypes for all exported functions appear in png.h, above the comment that says @@ -5115,12 +5225,15 @@ We mark all non-exported functions with "/* PRIVATE */"": } The prototypes for non-exported functions (except for those in -pngtest) appear in -pngpriv.h -above the comment that says +pngtest) appear in pngpriv.h above the comment that says /* Maintainer: Put new private prototypes here ^ */ +To avoid polluting the global namespace, the names of all exported +functions and variables begin with "png_", and all publicly visible C +preprocessor macros begin with "PNG". We request that applications that +use libpng *not* begin any of their own symbols with either of these strings. + We put a space after the "sizeof" operator and we omit the optional parentheses around its argument when the argument is an expression, not a type name, and we always enclose the @@ -5132,10 +5245,8 @@ sizeof operator, with its argument, in parentheses: Prior to libpng-1.6.0 we used a "png_sizeof()" macro, formatted as though it were a function. -To avoid polluting the global namespace, the names of all exported -functions and variables begin with "png_", and all publicly visible C -preprocessor macros begin with "PNG". We request that applications that -use libpng *not* begin any of their own symbols with either of these strings. +Control keywords if, for, while, and switch are always followed by a space +to distinguish them from function calls, which have no trailing space. We put a space after each comma and after each semicolon in "for" statements, and we put spaces before and after each @@ -5157,6 +5268,9 @@ with an even number of lower-case hex digits (e.g., 0x00, 0xff, 0x0100). We prefer to use underscores in variable names rather than camelCase, except for a few type names that we inherit from zlib.h. +We prefer "if (something != 0)" and "if (something == 0)" +over "if (something)" and if "(!something)", respectively. + We do not use the TAB character for indentation in the C sources. Lines do not exceed 80 characters. @@ -5165,13 +5279,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -April 25, 2013 +March 26, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.6.2 are Y2K compliant. It is my belief that earlier +upward through 1.6.17 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer @@ -5187,8 +5301,9 @@ in libpng-1.6.x and will be removed from libpng-1.7.0. There are seven time-related functions: - png_convert_to_rfc_1123() in png.c - (formerly png_convert_to_rfc_1152() in error) + png_convert_to_rfc_1123_buffer() in png.c + (formerly png_convert_to_rfc_1152() in error, and + also formerly png_convert_to_rfc_1123()) png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c png_convert_from_time_t() in pngwrite.c diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/libpng.3 b/3rdparty/libpng/libpng.3 similarity index 91% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/libpng.3 rename to 3rdparty/libpng/libpng.3 index bbf2eaaa81..dfc4484c3d 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/libpng.3 +++ b/3rdparty/libpng/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "April 25, 2013" +.TH LIBPNG 3 "March 26, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.2 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.17 .SH SYNOPSIS \fB #include \fP @@ -504,10 +504,10 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.6.2 - April 25, 2013 + libpng version 1.6.17 - March 26, 2015 Updated and distributed by Glenn Randers-Pehrson - Copyright (c) 1998-2013 Glenn Randers-Pehrson + Copyright (c) 1998-2015 Glenn Randers-Pehrson This document is released under the libpng license. For conditions of distribution and use, see the disclaimer @@ -515,15 +515,15 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.2 - April 25, 2013 + libpng versions 0.97, January 1998, through 1.6.17 - March 26, 2015 Updated and distributed by Glenn Randers-Pehrson - Copyright (c) 1998-2013 Glenn Randers-Pehrson + Copyright (c) 1998-2015 Glenn Randers-Pehrson - libpng 1.0 beta 6 version 0.96 May 28, 1997 + libpng 1.0 beta 6 - version 0.96 - May 28, 1997 Updated and distributed by Andreas Dilger Copyright (c) 1996, 1997 Andreas Dilger - libpng 1.0 beta 2 - version 0.88 January 26, 1996 + libpng 1.0 beta 2 - version 0.88 - January 26, 1996 For conditions of distribution and use, see copyright notice in png.h. Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. @@ -554,13 +554,11 @@ libpng-manual.txt - A description on how to use and modify libpng .SH I. Introduction This file describes how to use and modify the PNG reference library -(known as libpng) for your own use. There are five sections to this -file: introduction, structures, reading, writing, and modification and -configuration notes for various special platforms. In addition to this +(known as libpng) for your own use. In addition to this file, example.c is a good starting point for using the library, as it is heavily commented and should include everything most people will need. We assume that libpng is already installed; see the -INSTALL file for instructions on how to install libpng. +INSTALL file for instructions on how to configure and install libpng. For examples of libpng usage, see the files "example.c", "pngtest.c", and the files in the "contrib" directory, all of which are included in @@ -674,7 +672,7 @@ All APIs that take (double) arguments also have a matching API that takes the corresponding fixed point integer arguments. The fixed point API has the same name as the floating point one with "_fixed" appended. The actual range of values permitted in the APIs is frequently less than -the full range of (png_fixed_point) (-21474 to +21474). When APIs require +the full range of (png_fixed_point) (\-21474 to +21474). When APIs require a non-negative argument the type is recorded as png_uint_32 above. Consult the header file and the text below for more information. @@ -715,7 +713,7 @@ The easiest way to make minor changes to the libpng configuration when auto-configuration is supported is to add definitions to the command line using (typically) CPPFLAGS. For example: -CPPFLAGS=-DPNG_NO_FLOATING_ARITHMETIC +CPPFLAGS=\-DPNG_NO_FLOATING_ARITHMETIC will change the internal libpng math implementation for gamma correction and other arithmetic calculations to fixed point, avoiding the need for fast @@ -723,7 +721,7 @@ floating point support. The result can be seen in the generated pnglibconf.h - make sure it contains the changed feature macro setting. If you need to make more extensive configuration changes - more than one or two -feature macro settings - you can either add -DPNG_USER_CONFIG to the build +feature macro settings - you can either add \-DPNG_USER_CONFIG to the build command line and put a list of feature macro settings in pngusr.h or you can set DFA_XTRA (a makefile variable) to a file containing the same information in the form of 'option' settings. @@ -780,10 +778,10 @@ This method of building a customized pnglibconf.h is illustrated in contrib/pngminim/*. See the "$(PNGCONF):" target in the makefile and pngusr.dfa in these directories. -C. Configuration using PNG_USR_CONFIG +C. Configuration using PNG_USER_CONFIG -If -DPNG_USR_CONFIG is added to the CFLAGS when pnglibconf.h is built the file -pngusr.h will automatically be included before the options in +If \-DPNG_USER_CONFIG is added to the CPPFLAGS when pnglibconf.h is built, +the file pngusr.h will automatically be included before the options in scripts/pnglibconf.dfa are processed. Your pngusr.h file should contain only macro definitions turning features on or off or setting settings. @@ -842,7 +840,7 @@ prediction. If you are intending to keep the file pointer open for use in libpng, you must ensure you don't read more than 8 bytes from the beginning -of the file, and you also have to make a call to png_set_sig_bytes_read() +of the file, and you also have to make a call to png_set_sig_bytes() with the number of bytes you read from the beginning. Libpng will then only check the bytes (if any) that your program didn't read. @@ -850,22 +848,23 @@ then only check the bytes (if any) that your program didn't read. to replace them with custom functions. See the discussion under Customizing libpng. - FILE *fp = fopen(file_name, "rb"); if (!fp) { return (ERROR); } - fread(header, 1, number, fp); - is_png = !png_sig_cmp(header, 0, number); + if (fread(header, 1, number, fp) != number) + { + return (ERROR); + } + is_png = !png_sig_cmp(header, 0, number); if (!is_png) { return (NOT_PNG); } - Next, png_struct and png_info need to be allocated and initialized. In order to ensure that the size of these structures is correct even with a dynamically linked libpng, there are functions to initialize and @@ -1012,7 +1011,7 @@ input stream. You must supply the function unknown chunk structure, process it, and return one of the following: */ - return (-n); /* chunk had an error */ + return (\-n); /* chunk had an error */ return (0); /* did not recognize */ return (n); /* success */ } @@ -1063,7 +1062,7 @@ non-interlaced case the row that was just handled is simply one less than the passed in row number, and pass will always be 0. For the interlaced case the same applies unless the row value is 0, in which case the row just handled was the last one from one of the preceding passes. Because interlacing may skip a -pass you cannot be sure that the preceding pass is just 'pass-1', if you really +pass you cannot be sure that the preceding pass is just 'pass\-1', if you really need to know what the last pass is record (row,pass) from the callback and use the last recorded value each time. @@ -1153,16 +1152,13 @@ callback function: .SS User limits The PNG specification allows the width and height of an image to be as -large as 2^31-1 (0x7fffffff), or about 2.147 billion rows and columns. -Since very few applications really need to process such large images, -we have imposed an arbitrary 1-million limit on rows and columns. +large as 2^(31\-1 (0x7fffffff), or about 2.147 billion rows and columns. Larger images will be rejected immediately with a png_error() call. If -you wish to change this limit, you can use +you wish to change these limits, you can use png_set_user_limits(png_ptr, width_max, height_max); -to set your own limits, or use width_max = height_max = 0x7fffffffL -to allow all valid dimensions (libpng may reject some very large images +to set your own limits (libpng may reject some very wide images anyway because of potential buffer overflow conditions). You should put this statement after you create the PNG structure and @@ -1218,12 +1214,12 @@ value. You can also specify a default encoding for the PNG file in case the required information is missing from the file. By default libpng assumes that the PNG data matches your system, to keep this default call: - png_set_gamma(png_ptr, screen_gamma, 1/screen_gamma/*file gamma*/); + png_set_gamma(png_ptr, screen_gamma, output_gamma); or you can use the fixed point equivalent: png_set_gamma_fixed(png_ptr, PNG_FP_1*screen_gamma, - PNG_FP_1/screen_gamma); + PNG_FP_1*output_gamma); If you don't know the gamma for your system it is probably 2.2 - a good approximation to the IEC standard for display systems (sRGB). If images are @@ -1246,11 +1242,75 @@ situations: encoding. You would use the linear (unencoded) value if you need to process the pixel -values further because this avoids the need to decode and reencode each +values further because this avoids the need to decode and re-encode each component value whenever arithmetic is performed. A lot of graphics software uses linear values for this reason, often with higher precision component values to preserve overall accuracy. + +The output_gamma value expresses how to decode the output values, not how +they are encoded. The values used correspond to the normal numbers used to +describe the overall gamma of a computer display system; for example 2.2 for +an sRGB conformant system. The values are scaled by 100000 in the _fixed +version of the API (so 220000 for sRGB.) + +The inverse of the value is always used to provide a default for the PNG file +encoding if it has no gAMA chunk and if png_set_gamma() has not been called +to override the PNG gamma information. + +When the ALPHA_OPTIMIZED mode is selected the output gamma is used to encode +opaque pixels however pixels with lower alpha values are not encoded, +regardless of the output gamma setting. + +When the standard Porter Duff handling is requested with mode 1 the output +encoding is set to be linear and the output_gamma value is only relevant +as a default for input data that has no gamma information. The linear output +encoding will be overridden if png_set_gamma() is called - the results may be +highly unexpected! + +The following numbers are derived from the sRGB standard and the research +behind it. sRGB is defined to be approximated by a PNG gAMA chunk value of +0.45455 (1/2.2) for PNG. The value implicitly includes any viewing +correction required to take account of any differences in the color +environment of the original scene and the intended display environment; the +value expresses how to *decode* the image for display, not how the original +data was *encoded*. + +sRGB provides a peg for the PNG standard by defining a viewing environment. +sRGB itself, and earlier TV standards, actually use a more complex transform +(a linear portion then a gamma 2.4 power law) than PNG can express. (PNG is +limited to simple power laws.) By saying that an image for direct display on +an sRGB conformant system should be stored with a gAMA chunk value of 45455 +(11.3.3.2 and 11.3.3.5 of the ISO PNG specification) the PNG specification +makes it possible to derive values for other display systems and +environments. + +The Mac value is deduced from the sRGB based on an assumption that the actual +extra viewing correction used in early Mac display systems was implemented as +a power 1.45 lookup table. + +Any system where a programmable lookup table is used or where the behavior of +the final display device characteristics can be changed requires system +specific code to obtain the current characteristic. However this can be +difficult and most PNG gamma correction only requires an approximate value. + +By default, if png_set_alpha_mode() is not called, libpng assumes that all +values are unencoded, linear, values and that the output device also has a +linear characteristic. This is only very rarely correct - it is invariably +better to call png_set_alpha_mode() with PNG_DEFAULT_sRGB than rely on the +default if you don't know what the right answer is! + +The special value PNG_GAMMA_MAC_18 indicates an older Mac system (pre Mac OS +10.6) which used a correction table to implement a somewhat lower gamma on an +otherwise sRGB system. + +Both these values are reserved (not simple gamma values) in order to allow +more precise correction internally in the future. + +NOTE: the values can be passed to either the fixed or floating +point APIs, but the floating point API will also accept floating point +values. + The second thing you may need to tell libpng about is how your system handles alpha channel information. Some, but not all, PNG files contain an alpha channel. To display these files correctly you need to compose the data onto a @@ -1275,11 +1335,11 @@ by png_set_alpha_mode(). The mode is as follows: - PNG_ALPHA_PNG: The data is encoded according to the PNG specification. Red, -green and blue, or gray, components are gamma encoded color -values and are not premultiplied by the alpha value. The -alpha value is a linear measure of the contribution of the -pixel to the corresponding final output pixel. + PNG_ALPHA_PNG: The data is encoded according to the PNG +specification. Red, green and blue, or gray, components are +gamma encoded color values and are not premultiplied by the +alpha value. The alpha value is a linear measure of the +contribution of the pixel to the corresponding final output pixel. You should normally use this format if you intend to perform color correction on the color values; most, maybe all, color @@ -1296,11 +1356,35 @@ be used! The remaining modes assume you don't need to do any further color correction or that if you do, your color correction software knows all about alpha (it -probably doesn't!) +probably doesn't!). They 'associate' the alpha with the color information by +storing color channel values that have been scaled by the alpha. The +advantage is that the color channels can be resampled (the image can be +scaled) in this form. The disadvantage is that normal practice is to store +linear, not (gamma) encoded, values and this requires 16-bit channels for +still images rather than the 8-bit channels that are just about sufficient if +gamma encoding is used. In addition all non-transparent pixel values, +including completely opaque ones, must be gamma encoded to produce the final +image. These are the 'STANDARD', 'ASSOCIATED' or 'PREMULTIPLIED' modes +described below (the latter being the two common names for associated alpha +color channels). Note that PNG files always contain non-associated color +channels; png_set_alpha_mode() with one of the modes causes the decoder to +convert the pixels to an associated form before returning them to your +application. - PNG_ALPHA_STANDARD: The data libpng produces -is encoded in the standard way -assumed by most correctly written graphics software. +Since it is not necessary to perform arithmetic on opaque color values so +long as they are not to be resampled and are in the final color space it is +possible to optimize the handling of alpha by storing the opaque pixels in +the PNG format (adjusted for the output color space) while storing partially +opaque pixels in the standard, linear, format. The accuracy required for +standard alpha composition is relatively low, because the pixels are +isolated, therefore typically the accuracy loss in storing 8-bit linear +values is acceptable. (This is not true if the alpha channel is used to +simulate transparency over large areas - use 16 bits or the PNG mode in +this case!) This is the 'OPTIMIZED' mode. For this mode a pixel is +treated as opaque only if the alpha value is equal to the maximum value. + + PNG_ALPHA_STANDARD: The data libpng produces is encoded in the +standard way assumed by most correctly written graphics software. The gamma encoding will be removed by libpng and the linear component values will be pre-multiplied by the alpha channel. @@ -1329,9 +1413,8 @@ dynamic range. To avoid problems, and if your software supports it, use png_set_expand_16() to force all components to 16 bits. - PNG_ALPHA_OPTIMIZED: This mode is the same -as PNG_ALPHA_STANDARD except that -completely opaque pixels are gamma encoded according to + PNG_ALPHA_OPTIMIZED: This mode is the same as PNG_ALPHA_STANDARD +except that completely opaque pixels are gamma encoded according to the screen_gamma value. Pixels with alpha less than 1.0 will still have linear components. @@ -1350,18 +1433,16 @@ representation of non-opaque pixels are irrelevant. You can also try this format if your software is broken; it might look better. - PNG_ALPHA_BROKEN: This is PNG_ALPHA_STANDARD; -however, all component values, -including the alpha channel are gamma encoded. This is -an appropriate format to try if your software, or more -likely hardware, is totally broken, i.e., if it performs -linear arithmetic directly on gamma encoded values. - -In most cases of broken software or hardware the bug in the final display -manifests as a subtle halo around composited parts of the image. You may not -even perceive this as a halo; the composited part of the image may simply appear -separate from the background, as though it had been cut out of paper and pasted -on afterward. + PNG_ALPHA_BROKEN: This is PNG_ALPHA_STANDARD; however, all component +values, including the alpha channel are gamma encoded. This is +broken because, in practice, no implementation that uses this choice +correctly undoes the encoding before handling alpha composition. Use this +choice only if other serious errors in the software or hardware you use +mandate it. In most cases of broken software or hardware the bug in the +final display manifests as a subtle halo around composited parts of the +image. You may not even perceive this as a halo; the composited part of +the image may simply appear separate from the background, as though it had +been cut out of paper and pasted on afterward. If you don't have to deal with bugs in software or hardware, or if you can fix them, there are three recommended ways of using png_set_alpha_mode(): @@ -1392,6 +1473,89 @@ All you can do is compose the result onto a matching output. Since this mode is libpng-specific you also need to write your own composition software. +The following are examples of calls to png_set_alpha_mode to achieve the +required overall gamma correction and, where necessary, alpha +premultiplication. + + png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB); + +This is the default libpng handling of the alpha channel - it is not +pre-multiplied into the color components. In addition the call states +that the output is for a sRGB system and causes all PNG files without gAMA +chunks to be assumed to be encoded using sRGB. + + png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC); + +In this case the output is assumed to be something like an sRGB conformant +display preceeded by a power-law lookup table of power 1.45. This is how +early Mac systems behaved. + + png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_GAMMA_LINEAR); + +This is the classic Jim Blinn approach and will work in academic +environments where everything is done by the book. It has the shortcoming +of assuming that input PNG data with no gamma information is linear - this +is unlikely to be correct unless the PNG files where generated locally. +Most of the time the output precision will be so low as to show +significant banding in dark areas of the image. + + png_set_expand_16(pp); + png_set_alpha_mode(pp, PNG_ALPHA_STANDARD, PNG_DEFAULT_sRGB); + +This is a somewhat more realistic Jim Blinn inspired approach. PNG files +are assumed to have the sRGB encoding if not marked with a gamma value and +the output is always 16 bits per component. This permits accurate scaling +and processing of the data. If you know that your input PNG files were +generated locally you might need to replace PNG_DEFAULT_sRGB with the +correct value for your system. + + png_set_alpha_mode(pp, PNG_ALPHA_OPTIMIZED, PNG_DEFAULT_sRGB); + +If you just need to composite the PNG image onto an existing background +and if you control the code that does this you can use the optimization +setting. In this case you just copy completely opaque pixels to the +output. For pixels that are not completely transparent (you just skip +those) you do the composition math using png_composite or png_composite_16 +below then encode the resultant 8-bit or 16-bit values to match the output +encoding. + + Other cases + +If neither the PNG nor the standard linear encoding work for you because +of the software or hardware you use then you have a big problem. The PNG +case will probably result in halos around the image. The linear encoding +will probably result in a washed out, too bright, image (it's actually too +contrasty.) Try the ALPHA_OPTIMIZED mode above - this will probably +substantially reduce the halos. Alternatively try: + + png_set_alpha_mode(pp, PNG_ALPHA_BROKEN, PNG_DEFAULT_sRGB); + +This option will also reduce the halos, but there will be slight dark +halos round the opaque parts of the image where the background is light. +In the OPTIMIZED mode the halos will be light halos where the background +is dark. Take your pick - the halos are unavoidable unless you can get +your hardware/software fixed! (The OPTIMIZED approach is slightly +faster.) + +When the default gamma of PNG files doesn't match the output gamma. +If you have PNG files with no gamma information png_set_alpha_mode allows +you to provide a default gamma, but it also sets the ouput gamma to the +matching value. If you know your PNG files have a gamma that doesn't +match the output you can take advantage of the fact that +png_set_alpha_mode always sets the output gamma but only sets the PNG +default if it is not already set: + + png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_DEFAULT_sRGB); + png_set_alpha_mode(pp, PNG_ALPHA_PNG, PNG_GAMMA_MAC); + +The first call sets both the default and the output gamma values, the +second call overrides the output gamma without changing the default. This +is easier than achieving the same effect with png_set_gamma. You must use +PNG_ALPHA_PNG for the first call - internal checking in png_set_alpha will +fire if more than one call to png_set_alpha_mode and png_set_background is +made in the same read operation, however multiple calls with PNG_ALPHA_PNG +are ignored. + If you don't need, or can't handle, the alpha channel you can call png_set_background() to remove it by compositing against a fixed color. Don't call png_set_strip_alpha() to do this - it will leave spurious pixel values in @@ -1605,13 +1769,13 @@ in until png_read_end() has read the chunk data following the image. the PNG datastream is embedded in a MNG-1.0 datastream) - Any or all of interlace_type, compression_type, or - filter_method can be NULL if you are - not interested in their values. + Any of width, height, color_type, bit_depth, + interlace_type, compression_type, or filter_method can + be NULL if you are not interested in their values. Note that png_get_IHDR() returns 32-bit data into the application's width and height variables. - This is an unsafe situation if these are 16-bit + This is an unsafe situation if these are not png_uint_32 variables. In such situations, the png_get_image_width() and png_get_image_height() functions described below are safer. @@ -1722,7 +1886,7 @@ png_set_rgb_to_gray()). png_get_sRGB(png_ptr, info_ptr, &srgb_intent); - file_srgb_intent - the rendering intent (PNG_INFO_sRGB) + srgb_intent - the rendering intent (PNG_INFO_sRGB) The presence of the sRGB chunk means that the pixel data is in the sRGB color space. This chunk also @@ -2334,7 +2498,7 @@ value when you call it in this position: png_set_gamma(png_ptr, screen_gamma, 0.45455); If you need to reduce an RGB file to a paletted file, or if a paletted -file has more entries then will fit on your screen, png_set_quantize() +file has more entries than will fit on your screen, png_set_quantize() will do that. Note that this is a simple match quantization that merely finds the closest color available. This should work fairly well with optimized palettes, but fairly badly with linear color cubes. If you @@ -2672,10 +2836,15 @@ how pngvalid.c does it. .SS Finishing a sequential read After you are finished reading the image through the -low-level interface, you can finish reading the file. If you are -interested in comments or time, which may be stored either before or -after the image data, you should pass the separate png_info struct if -you want to keep the comments from before and after the image +low-level interface, you can finish reading the file. + +If you want to use a different crc action for handling CRC errors in +chunks after the image data, you can call png_set_crc_action() +again at this point. + +If you are interested in comments or time, which may be stored either +before or after the image data, you should pass the separate png_info +struct if you want to keep the comments from before and after the image separate. png_infop end_info = png_create_info_struct(png_ptr); @@ -2691,6 +2860,9 @@ separate. If you are not interested, you should still call png_read_end() but you can pass NULL, avoiding the need to create an end_info structure. +If you do this, libpng will not process any chunks after IDAT other than +skipping over them and perhaps (depending on whether you have called +png_set_crc_action) checking their CRCs while looking for the IEND chunk. png_read_end(png_ptr, (png_infop)NULL); @@ -2725,13 +2897,13 @@ point to libpng-allocated storage with the following function: or simply PNG_FREE_ALL seq - sequence number of item to be freed - (-1 for all items) + (\-1 for all items) This function may be safely called when the relevant storage has already been freed, or has not yet been allocated, or was allocated by the user and not by libpng, and will in those cases do nothing. The "seq" parameter is ignored if only one item of the selected data -type, such as PLTE, is allowed. If "seq" is not -1, and multiple items +type, such as PLTE, is allowed. If "seq" is not \-1, and multiple items are allowed for the data type identified in the mask, such as text or sPLT, only the n'th item in the structure is freed, where n is "seq". @@ -2795,7 +2967,7 @@ For a more compact example of reading a PNG image, see the file example.c. .SS Reading PNG files progressively -The progressive reader is slightly different then the non-progressive +The progressive reader is slightly different from the non-progressive reader. Instead of calling png_read_info(), png_read_rows(), and png_read_end(), you make one call to png_process_data(), which calls callbacks when it has the info, a row, or the end of the image. You @@ -2879,7 +3051,7 @@ png_infop info_ptr; 64K. The library seems to run fine with sizes of 4K. Although you can give it much less if necessary (I assume you can give it chunks of - 1 byte, I haven't tried less then 256 bytes + 1 byte, I haven't tried less than 256 bytes yet). When this function returns, you may want to display any rows that were generated in the row callback if you don't already do @@ -2966,7 +3138,7 @@ png_infop info_ptr; png_progressive_combine_row(png_ptr, old_row, new_row); - /* where old_row is what was displayed for + /* where old_row is what was displayed previously for the row. Note that the first pass (pass == 0, really) will completely cover the old row, so the rows do not have to be @@ -3132,7 +3304,7 @@ non-interlaced case the row that was just handled is simply one less than the passed in row number, and pass will always be 0. For the interlaced case the same applies unless the row value is 0, in which case the row just handled was the last one from one of the preceding passes. Because interlacing may skip a -pass you cannot be sure that the preceding pass is just 'pass-1', if you really +pass you cannot be sure that the preceding pass is just 'pass\-1', if you really need to know what the last pass is record (row,pass) from the callback and use the last recorded value each time. @@ -3591,19 +3763,53 @@ tEXt chunk use RFC 1123 format dates (e.g. "22 May 1997 18:07:10 GMT"), although this isn't a requirement. Unlike the tIME chunk, the "Creation Time" tEXt chunk is not expected to be automatically changed by the software. To facilitate the use of RFC 1123 dates, a function -png_convert_to_rfc1123_buffer(png_ptr, buffer, png_timep) is provided to +png_convert_to_rfc1123_buffer(buffer, png_timep) is provided to convert from PNG time to an RFC 1123 format string. The caller must provide a writeable buffer of at least 29 bytes. .SS Writing unknown chunks -You can use the png_set_unknown_chunks function to queue up chunks -for writing. You give it a chunk name, raw data, and a size; that's -all there is to it. The chunks will be written by the next following -png_write_info_before_PLTE, png_write_info, or png_write_end function. -Any chunks previously read into the info structure's unknown-chunk -list will also be written out in a sequence that satisfies the PNG -specification's ordering rules. +You can use the png_set_unknown_chunks function to queue up private chunks +for writing. You give it a chunk name, location, raw data, and a size. You +also must use png_set_keep_unknown_chunks() to ensure that libpng will +handle them. That's all there is to it. The chunks will be written by the +next following png_write_info_before_PLTE, png_write_info, or png_write_end +function, depending upon the specified location. Any chunks previously +read into the info structure's unknown-chunk list will also be written out +in a sequence that satisfies the PNG specification's ordering rules. + +Here is an example of writing two private chunks, prVt and miNE: + + #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED + /* Set unknown chunk data */ + png_unknown_chunk unk_chunk[2]; + strcpy((char *) unk_chunk[0].name, "prVt"; + unk_chunk[0].data = (unsigned char *) "PRIVATE DATA"; + unk_chunk[0].size = strlen(unk_chunk[0].data)+1; + unk_chunk[0].location = PNG_HAVE_IHDR; + strcpy((char *) unk_chunk[1].name, "miNE"; + unk_chunk[1].data = (unsigned char *) "MY CHUNK DATA"; + unk_chunk[1].size = strlen(unk_chunk[0].data)+1; + unk_chunk[1].location = PNG_AFTER_IDAT; + png_set_unknown_chunks(write_ptr, write_info_ptr, + unk_chunk, 2); + /* Needed because miNE is not safe-to-copy */ + png_set_keep_unknown_chunks(png, PNG_HANDLE_CHUNK_ALWAYS, + (png_bytep) "miNE", 1); + # if PNG_LIBPNG_VER < 10600 + /* Deal with unknown chunk location bug in 1.5.x and earlier */ + png_set_unknown_chunk_location(png, info, 0, PNG_HAVE_IHDR); + png_set_unknown_chunk_location(png, info, 1, PNG_AFTER_IDAT); + # endif + # if PNG_LIBPNG_VER < 10500 + /* PNG_AFTER_IDAT writes two copies of the chunk prior to libpng-1.5.0, + * one before IDAT and another after IDAT, so don't use it; only use + * PNG_HAVE_IHDR location. This call resets the location previously + * set by assignment and png_set_unknown_chunk_location() for chunk 1. + */ + png_set_unknown_chunk_location(png, info, 1, PNG_HAVE_IHDR); + # endif + #endif .SS The high-level write interface @@ -3938,13 +4144,13 @@ point to libpng-allocated storage with the following function: or simply PNG_FREE_ALL seq - sequence number of item to be freed - (-1 for all items) + (\-1 for all items) This function may be safely called when the relevant storage has already been freed, or has not yet been allocated, or was allocated by the user and not by libpng, and will in those cases do nothing. The "seq" parameter is ignored if only one item of the selected data -type, such as PLTE, is allowed. If "seq" is not -1, and multiple items +type, such as PLTE, is allowed. If "seq" is not \-1, and multiple items are allowed for the data type identified in the mask, such as text or sPLT, only the n'th item in the structure is freed, where n is "seq". @@ -4007,7 +4213,7 @@ The simplified API, which became available in libpng-1.6.0, hides the details of both libpng and the PNG file format itself. It allows PNG files to be read into a very limited number of in-memory bitmap formats or to be written from the same formats. If these -formats do not accomodate your needs then you can, and should, use the more +formats do not accommodate your needs then you can, and should, use the more sophisticated APIs above - these support a wide variety of in-memory formats and a wide variety of sophisticated transformations to those formats as well as a wide variety of APIs to manipulate ancilliary information. @@ -4089,8 +4295,9 @@ and matches the 8-bit format expected by typical display devices. The color/gray channels are not scaled (pre-multiplied) by the alpha channel and are suitable for passing to color management software. - b) As a value in the range 0..65535, contained in a 2-byte integer. All -channels can be converted to the original value by dividing by 65535; all + b) As a value in the range 0..65535, contained in a 2-byte integer, in +the native byte order of the platform on which the application is running. +All channels can be converted to the original value by dividing by 65535; all channels are linear. Color channels use the RGB encoding (RGB end-points) of the sRGB specification. This encoding is identified by the PNG_FORMAT_FLAG_LINEAR flag below. @@ -4157,7 +4364,9 @@ First the single byte formats: Then the linear 2-byte formats. When naming these "Y" is used to indicate a luminance (gray) channel. The component order within the pixel is always the same - there is no provision for swapping the order of the -components in the linear format. +components in the linear format. The components are 16-bit integers in +the native byte order for your platform, and there is no provision for +swapping the bytes to a different endian condition. PNG_FORMAT_LINEAR_Y PNG_FORMAT_FLAG_LINEAR PNG_FORMAT_LINEAR_Y_ALPHA @@ -4222,7 +4431,7 @@ First the information about the samples. * * png_byte colormap[PNG_IMAGE_MAXIMUM_COLORMAP_COMPONENTS(sRGB_fmt)]; * - * Alternatively use the PNG_IMAGE_COLORMAP_SIZE macro below to use the + * Alternatively, use the PNG_IMAGE_COLORMAP_SIZE macro below to use the * information from one of the png_image_begin_read_ APIs and dynamically * allocate the required memory. */ @@ -4251,9 +4460,16 @@ Information about the whole row, or whole image row. For a color-mapped image this is the minimum number of bytes in a row. + If you need the stride measured in bytes, row_stride_bytes is + PNG_IMAGE_ROW_STRIDE(image) * PNG_IMAGE_PIXEL_COMPONENT_SIZE(fmt) + plus any padding bytes that your application might need, for example + to start the next row on a 4-byte boundary. + PNG_IMAGE_BUFFER_SIZE(image, row_stride) Returns the size, in bytes, of an image buffer given a png_image and a row - stride - the number of components to leave space for in each row. + stride - the number of components to leave space for in each row. This + macro takes care of multiplying row_stride by PNG_IMAGE_PIXEL_COMONENT_SIZE + when the image has 2-byte components. PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB == 0x01 This indicates the the RGB values of the in-memory bitmap do not @@ -4382,14 +4598,11 @@ clears the newly allocated memory to zero; note that png_calloc(png_ptr, size) is not the same as the calloc(number, size) function provided by stdlib.h. There is limited support for certain systems with segmented memory architectures and the types of pointers declared by png.h match this; you -will have to use appropriate pointers in your application. Since it is -unlikely that the method of handling memory allocation on a platform -will change between applications, these functions must be modified in -the library at compile time. If you prefer to use a different method -of allocating and freeing data, you can use png_create_read_struct_2() or -png_create_write_struct_2() to register your own functions as described -above. These functions also provide a void pointer that can be retrieved -via +will have to use appropriate pointers in your application. If you prefer +to use a different method of allocating and freeing data, you can use +png_create_read_struct_2() or png_create_write_struct_2() to register your +own functions as described above. These functions also provide a void +pointer that can be retrieved via mem_ptr=png_get_mem_ptr(png_ptr); @@ -4498,9 +4711,12 @@ as warnings. png_set_benign_errors (png_ptr, int allowed); - allowed: 0: (default) treat png_benign_error() an error. + allowed: 0: treat png_benign_error() as an error. 1: treat png_benign_error() as a warning. +As of libpng-1.6.0, the default condition is to treat benign errors as +warnings while reading and as errors while writing. + .SS Custom chunks If you need to read or write custom chunks, you may need to get deeper @@ -4529,29 +4745,6 @@ the simpler ones to get an idea of how they work. Try to find a similar transformation to the one you want to add and copy off of it. More details can be found in the comments inside the code itself. -.SS Configuring for 16-bit platforms - -You will want to look into zconf.h to tell zlib (and thus libpng) that -it cannot allocate more then 64K at a time. Even if you can, the memory -won't be accessible. So limit zlib and libpng to 64K by defining MAXSEG_64K. - -.SS Configuring for DOS - -For DOS users who only have access to the lower 640K, you will -have to limit zlib's memory usage via a png_set_compression_mem_level() -call. See zlib.h or zconf.h in the zlib library for more information. - -.SS Configuring for Medium Model - -Libpng's support for medium model has been tested on most of the popular -compilers. Make sure MAXSEG_64K gets defined, USE_FAR_KEYWORD gets -defined, and FAR gets defined to far in pngconf.h, and you should be -all set. Everything in the library (except for zlib's structure) is -expecting far data. You must use the typedefs with the p or pp on -the end for pointers (or at least look at them and be careful). Make -note that the rows of data are defined as png_bytepp, which is -an "unsigned char far * far *". - .SS Configuring for gui/windowing platforms: You will need to write new error and warning functions that use the GUI @@ -4561,19 +4754,6 @@ in order to have them available during the structure initialization. They can be changed later via png_set_error_fn(). On some compilers, you may also have to change the memory allocators (png_malloc, etc.). -.SS Configuring for compiler xxx: - -All includes for libpng are in pngconf.h. If you need to add, change -or delete an include, this is the place to do it. -The includes that are not needed outside libpng are placed in pngpriv.h, -which is only used by the routines inside libpng itself. -The files in libpng proper only include pngpriv.h and png.h, which -%14%in turn includes pngconf.h. -in turn includes pngconf.h and, as of libpng-1.5.0, pnglibconf.h. -As of libpng-1.5.0, pngpriv.h also includes three other private header -files, pngstruct.h, pnginfo.h, and pngdebug.h, which contain material -that previously appeared in the public headers. - .SS Configuring zlib: There are special functions to configure the compression. Perhaps the @@ -4615,6 +4795,8 @@ zlib.h for more information on what these mean. png_set_compression_method(png_ptr, method); +This controls the size of the IDAT chunks (default 8192): + png_set_compression_buffer_size(png_ptr, size); As of libpng version 1.5.4, additional APIs became @@ -4713,46 +4895,6 @@ Note that the numbers above were invented purely for this example and are given only to help explain the function usage. Little testing has been done to find optimum values for either the costs or the weights. -.SS Removing unwanted object code - -There are a bunch of #define's in pngconf.h that control what parts of -libpng are compiled. All the defines end in _SUPPORTED. If you are -never going to use a capability, you can change the #define to #undef -before recompiling libpng and save yourself code and data space, or -you can turn off individual capabilities with defines that begin with -PNG_NO_. - -In libpng-1.5.0 and later, the #define's are in pnglibconf.h instead. - -You can also turn all of the transforms and ancillary chunk capabilities -off en masse with compiler directives that define -PNG_NO_READ[or WRITE]_TRANSFORMS, or PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS, -or all four, -along with directives to turn on any of the capabilities that you do -want. The PNG_NO_READ[or WRITE]_TRANSFORMS directives disable the extra -transformations but still leave the library fully capable of reading -and writing PNG files with all known public chunks. Use of the -PNG_NO_READ[or WRITE]_ANCILLARY_CHUNKS directive produces a library -that is incapable of reading or writing ancillary chunks. If you are -not using the progressive reading capability, you can turn that off -with PNG_NO_PROGRESSIVE_READ (don't confuse this with the INTERLACING -capability, which you'll still have). - -All the reading and writing specific code are in separate files, so the -linker should only grab the files it needs. However, if you want to -make sure, or if you are building a stand alone library, all the -reading files start with "pngr" and all the writing files start with "pngw". -The files that don't match either (like png.c, pngtrans.c, etc.) -are used for both reading and writing, and always need to be included. -The progressive reader is in pngpread.c - -If you are creating or distributing a dynamically linked library (a .so -or DLL file), you should not remove or disable any parts of the library, -as this will cause applications linked with different versions of the -library to fail if they call functions not available in your library. -The size of the library itself should not be an issue, because only -those sections that are actually used will be loaded into memory. - .SS Requesting debug printout The macro definition PNG_DEBUG can be used to request debugging @@ -4772,12 +4914,12 @@ the message, "message" is the formatted string to be printed, and p1 and p2 are parameters that are to be embedded in the string according to printf-style formatting directives. For example, - png_debug1(2, "foo=%d\n", foo); + png_debug1(2, "foo=%d", foo); is expanded to if (PNG_DEBUG > 2) - fprintf(PNG_DEBUG_FILE, "foo=%d\n", foo); + fprintf(PNG_DEBUG_FILE, "foo=%d\en", foo); When PNG_DEBUG is defined but is zero, the macros aren't defined, but you can still use PNG_DEBUG to control your own debugging: @@ -4790,17 +4932,6 @@ When PNG_DEBUG = 1, the macros are defined, but only png_debug statements having level = 0 will be printed. There aren't any such statements in this version of libpng, but if you insert some they will be printed. -.SS Prepending a prefix to exported symbols - -Starting with libpng-1.6.0, you can configure libpng (when using the -"configure" script) to prefix all exported symbols by means of the -configuration option "--with-libpng-prefix=FOO_", where FOO_ can be any -string beginning with a letter and containing only uppercase -and lowercase letters, digits, and the underscore (i.e., a C language -identifier). This creates a set of macros in pnglibconf.h, so this is -transparent to applications; their function calls get transformed by -the macros to use the modified names. - .SH VII. MNG support The MNG specification (available at http://www.libpng.org/pub/mng) allows @@ -4863,6 +4994,9 @@ png_set_error_fn(), which is essentially the same function, but with a new name to force compilation errors with applications that try to use the old method. +Support for the sCAL, iCCP, iTXt, and sPLT chunks was added at libpng-1.0.6; +however, iTXt support was not enabled by default. + Starting with version 1.0.7, you can find out which version of the library you are using at run-time: @@ -5079,7 +5213,7 @@ it has not been well tested and doesn't actually "dither". The code was not removed, however, and could be enabled by building libpng with PNG_READ_DITHER_SUPPORTED defined. In libpng-1.4.2, this support -was reenabled, but the function was renamed png_set_quantize() to +was re-enabled, but the function was renamed png_set_quantize() to reflect more accurately what it actually does. At the same time, the PNG_DITHER_[RED,GREEN_BLUE]_BITS macros were also renamed to PNG_QUANTIZE_[RED,GREEN,BLUE]_BITS, and PNG_READ_DITHER_SUPPORTED @@ -5091,12 +5225,13 @@ We removed the trailing '.' from the warning and error messages. From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the function) incorrectly returned a value of type png_uint_32. +The incorrect macro was removed from libpng-1.4.5. -Checking for invalid palette index on read or write was added at libpng -1.5.10. When an invalid index is found, libpng issues a benign error. -This is enabled by default because this condition is an error according -to the PNG specification, Clause 11.3.2, but the error can be ignored in -each png_ptr with +Checking for invalid palette index on write was added at libpng +1.5.10. If a pixel contains an invalid (out-of-range) index libpng issues +a benign error. This is enabled by default because this condition is an +error according to the PNG specification, Clause 11.3.2, but the error can +be ignored in each png_ptr with png_set_check_for_invalid_index(png_ptr, allowed); @@ -5117,14 +5252,12 @@ reading, and after png_write_png() or png_write_image() while writing. int max_palette = png_get_palette_max(png_ptr, info_ptr); -This will return the maximum palette index found in the image, or "-1" if +This will return the maximum palette index found in the image, or "\-1" if the palette was not checked, or "0" if no palette was found. Note that this does not account for any palette index used by ancillary chunks such as the bKGD chunk; you must check those separately to determine the maximum palette index actually used. -A. Changes that affect users of libpng - There are no substantial API changes between the non-deprecated parts of the 1.4.5 API and the 1.5.0 API; however, the ability to directly access members of the main libpng control structures, png_struct and png_info, @@ -5195,7 +5328,10 @@ and the accuracy of PNG fixed point values is insufficient for representation of these values. Consequently a "string" API (png_get_sCAL_s and png_set_sCAL_s) is the only reliable way of reading arbitrary sCAL chunks in the absence of either the floating point API or -internal floating point calculations. +internal floating point calculations. Starting with libpng-1.5.0, both +of these functions are present when PNG_sCAL_SUPPORTED is defined. Prior +to libpng-1.5.0, their presence also depended upon PNG_FIXED_POINT_SUPPORTED +being defined and PNG_FLOATING_POINT_SUPPORTED not being defined. Applications no longer need to include the optional distribution header file pngusr.h or define the corresponding macros during application @@ -5215,15 +5351,10 @@ reset by pngusr.h or by explicit settings on the compiler command line. These settings may produce compiler warnings or errors in 1.5.0 because of macro redefinition. -From libpng-1.4.0 until 1.4.4, the png_get_uint_16 macro (but not the -function) incorrectly returned a value of type png_uint_32. libpng 1.5.0 -is consistent with the implementation in 1.4.5 and 1.2.x (where the macro -did not exist.) - Applications can now choose whether to use these macros or to call the corresponding function by defining PNG_USE_READ_MACROS or PNG_NO_USE_READ_MACROS before including png.h. Notice that this is -only supported from 1.5.0 -defining PNG_NO_USE_READ_MACROS prior to 1.5.0 +only supported from 1.5.0; defining PNG_NO_USE_READ_MACROS prior to 1.5.0 will lead to a link failure. Prior to libpng-1.5.4, the zlib compressor used the same set of parameters @@ -5237,7 +5368,10 @@ option was off by default, and slightly inaccurate scaling occurred. This option can no longer be turned off, and the choice of accurate or inaccurate 16-to-8 scaling is by using the new png_set_scale_16_to_8() API for accurate scaling or the old png_set_strip_16_to_8() API for simple -chopping. +chopping. In libpng-1.5.4, the PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED +macro became PNG_READ_SCALE_16_TO_8_SUPPORTED, and the PNG_READ_16_TO_8 +macro became PNG_READ_STRIP_16_TO_8_SUPPORTED, to enable the two +png_set_*_16_to_8() functions separately. Prior to libpng-1.5.4, the png_set_user_limits() function could only be used to reduce the width and height limits from the value of @@ -5259,25 +5393,8 @@ limits are now png_user_chunk_cache_max 0 (unlimited) 128 png_user_chunk_malloc_max 0 (unlimited) 8,000,000 -B. Changes to the build and configuration of libpng - -Details of internal changes to the library code can be found in the CHANGES -file and in the GIT repository logs. These will be of no concern to the vast -majority of library users or builders; however, the few who configure libpng -to a non-default feature set may need to change how this is done. - -There should be no need for library builders to alter build scripts if -these use the distributed build support - configure or the makefiles - -however, users of the makefiles may care to update their build scripts -to build pnglibconf.h where the corresponding makefile does not do so. - -Building libpng with a non-default configuration has changed completely. -The old method using pngusr.h should still work correctly even though the -way pngusr.h is used in the build has been changed; however, library -builders will probably want to examine the changes to take advantage of -new capabilities and to simplify their build system. - -B.1 Specific changes to library configuration capabilities +The png_set_option() function (and the "options" member of the png struct) was +added to libpng-1.5.15. The library now supports a complete fixed point implementation and can thus be used on systems that have no floating point support or very @@ -5289,27 +5406,7 @@ independent of the choice of fixed versus floating point APIs and all the missing fixed point APIs have been implemented. The exact mechanism used to control attributes of API functions has -changed. A single set of operating system independent macro definitions -is used and operating system specific directives are defined in -pnglibconf.h - -As part of this the mechanism used to choose procedure call standards on -those systems that allow a choice has been changed. At present this only -affects certain Microsoft (DOS, Windows) and IBM (OS/2) operating systems -running on Intel processors. As before, PNGAPI is defined where required -to control the exported API functions; however, two new macros, PNGCBAPI -and PNGCAPI, are used instead for callback functions (PNGCBAPI) and -(PNGCAPI) for functions that must match a C library prototype (currently -only png_longjmp_ptr, which must match the C longjmp function.) The new -approach is documented in pngconf.h - -Despite these changes, libpng 1.5.0 only supports the native C function -calling standard on those platforms tested so far (__cdecl on Microsoft -Windows). This is because the support requirements for alternative -calling conventions seem to no longer exist. Developers who find it -necessary to set PNG_API_RULE to 1 should advise the mailing list -(png-mng-implement) of this and library builders who use Openwatcom and -therefore set PNG_API_RULE to 2 should also contact the mailing list. +changed, as described in the INSTALL file. A new test program, pngvalid, is provided in addition to pngtest. pngvalid validates the arithmetic accuracy of the gamma correction @@ -5385,46 +5482,6 @@ even though the default is to use the macros - this allows applications to choose at app buildtime whether or not to use macros (previously impossible because the functions weren't in the default build.) -B.2 Changes to the configuration mechanism - -Prior to libpng-1.5.0 library builders who needed to configure libpng -had either to modify the exported pngconf.h header file to add system -specific configuration or had to write feature selection macros into -pngusr.h and cause this to be included into pngconf.h by defining -PNG_USER_CONFIG. The latter mechanism had the disadvantage that an -application built without PNG_USER_CONFIG defined would see the -unmodified, default, libpng API and thus would probably fail to link. - -These mechanisms still work in the configure build and in any makefile -build that builds pnglibconf.h, although the feature selection macros -have changed somewhat as described above. In 1.5.0, however, pngusr.h is -processed only once, when the exported header file pnglibconf.h is built. -pngconf.h no longer includes pngusr.h, therefore pngusr.h is ignored after the -build of pnglibconf.h and it is never included in an application build. - -The rarely used alternative of adding a list of feature macros to the -CFLAGS setting in the build also still works; however, the macros will be -copied to pnglibconf.h and this may produce macro redefinition warnings -when the individual C files are compiled. - -All configuration now only works if pnglibconf.h is built from -scripts/pnglibconf.dfa. This requires the program awk. Brian Kernighan -(the original author of awk) maintains C source code of that awk and this -and all known later implementations (often called by subtly different -names - nawk and gawk for example) are adequate to build pnglibconf.h. -The Sun Microsystems (now Oracle) program 'awk' is an earlier version -and does not work; this may also apply to other systems that have a -functioning awk called 'nawk'. - -Configuration options are now documented in scripts/pnglibconf.dfa. This -file also includes dependency information that ensures a configuration is -consistent; that is, if a feature is switched off dependent features are -also removed. As a recommended alternative to using feature macros in -pngusr.h a system builder may also define equivalent options in pngusr.dfa -(or, indeed, any file) and add that to the configuration by setting -DFA_XTRA to the file name. The makefiles in contrib/pngminim illustrate -how to do this, and a case where pngusr.h is still required. - .SH XII. Changes to Libpng from version 1.5.x to 1.6.x A "simplified API" has been added (see documentation in png.h and a simple @@ -5452,15 +5509,14 @@ symbols, using the PNG_PREFIX macro. We no longer include string.h in png.h. The include statement has been moved to pngpriv.h, where it is not accessible by applications. Applications that -need access to information in string.h must add an '#include "string.h"' +need access to information in string.h must add an '#include ' directive. It does not matter whether this is placed prior to or after -the '"#include png.h"' directive. +the '#include "png.h"' directive. The following API are now DEPRECATED: png_info_init_3() png_convert_to_rfc1123() which has been replaced with png_convert_to_rfc1123_buffer() - png_data_freer() png_malloc_default() png_free_default() png_reset_zstream() @@ -5480,17 +5536,46 @@ The signatures of many exported functions were changed, such that png_infop became png_inforp or png_const_inforp where "rp" indicates a "restricted pointer". +The support for FAR/far types has been eliminated and the definition of +png_alloc_size_t is now controlled by a flag so that 'small size_t' systems +can select it if necessary. + Error detection in some chunks has improved; in particular the iCCP chunk reader now does pretty complete validation of the basic format. Some bad -profiles that were previously accepted are now rejected, in particular the -very old broken Microsoft/HP sRGB profile. The PNG spec requirement that -only grayscale profiles may appear in images with color type 0 or 4 and that -even if the image only contains gray pixels, only RGB profiles may appear -in images with color type 2, 3, or 6, is now enforced. The sRGB chunk -is allowed to appear in images with any color type. +profiles that were previously accepted are now accepted with a warning or +rejected, depending upon the png_set_benign_errors() setting, in particular +the very old broken Microsoft/HP 3144-byte sRGB profile. Starting with +libpng-1.6.11, recognizing and checking sRGB profiles can be avoided by +means of + + #if defined(PNG_SKIP_sRGB_CHECK_PROFILE) && \ + defined(PNG_SET_OPTION_SUPPORTED) + png_set_option(png_ptr, PNG_SKIP_sRGB_CHECK_PROFILE, + PNG_OPTION_ON); + #endif + +It's not a good idea to do this if you are using the "simplified API", +which needs to be able to recognize sRGB profiles conveyed via the iCCP +chunk. + +The PNG spec requirement that only grayscale profiles may appear in images +with color type 0 or 4 and that even if the image only contains gray pixels, +only RGB profiles may appear in images with color type 2, 3, or 6, is now +enforced. The sRGB chunk is allowed to appear in images with any color type +and is interpreted by libpng to convey a one-tracer-curve gray profile or a +three-tracer-curve RGB profile as appropriate. + +Prior to libpng-1.6.0 a warning would be issued if the iTXt chunk contained +an empty language field or an empty translated keyword. Both of these +are allowed by the PNG specification, so these warnings are no longer issued. The library now issues an error if the application attempts to set a -transform after it calls png_read_update_info(). +transform after it calls png_read_update_info() or if it attempts to call +both png_read_update_info() and png_start_read_image() or to call either +of them more than once. + +The default condition for benign_errors is now to treat benign errors as +warnings while reading and as errors while writing. The library now issues a warning if both background processing and RGB to gray are used when gamma correction happens. As with previous versions of @@ -5508,6 +5593,26 @@ The machine-generated configure files are no longer included in branches libpng16 and later of the GIT repository. They continue to be included in the tarball releases, however. +Libpng-1.6.0 through 1.6.2 used the CMF bytes at the beginning of the IDAT +stream to set the size of the sliding window for reading instead of using the +default 32-kbyte sliding window size. It was discovered that there are +hundreds of PNG files in the wild that have incorrect CMF bytes that caused +zlib to issue the "invalid distance too far back" error and reject the file. +Libpng-1.6.3 and later calculate their own safe CMF from the image dimensions, +provide a way to revert to the libpng-1.5.x behavior (ignoring the CMF bytes +and using a 32-kbyte sliding window), by using + + png_set_option(png_ptr, PNG_MAXIMUM_INFLATE_WINDOW, + PNG_OPTION_ON); + +and provide a tool (contrib/tools/pngfix) for rewriting a PNG file while +optimizing the CMF bytes in its IDAT chunk correctly. + +Libpng-1.6.0 and libpng-1.6.1 wrote uncompressed iTXt chunks with the wrong +length, which resulted in PNG files that cannot be read beyond the bad iTXt +chunk. This error was fixed in libpng-1.6.3, and a tool (called +contrib/tools/png-fix-itxt) has been added to the libpng distribution. + .SH XIII. Detecting libpng The png_get_io_ptr() function has been present since libpng-0.88, has never @@ -5543,7 +5648,8 @@ mailing list, or directly to glennrp. .SH XV. Coding style -Our coding style is similar to the "Allman" style, with curly +Our coding style is similar to the "Allman" style +(See http://en.wikipedia.org/wiki/Indent_style#Allman_style), with curly braces on separate lines: if (condition) @@ -5606,6 +5712,9 @@ exported functions are marked with PNGAPI: body; } +The return type and decorations are placed on a separate line +ahead of the function name, as illustrated above. + The prototypes for all exported functions appear in png.h, above the comment that says @@ -5620,12 +5729,15 @@ We mark all non-exported functions with "/* PRIVATE */"": } The prototypes for non-exported functions (except for those in -pngtest) appear in -pngpriv.h -above the comment that says +pngtest) appear in pngpriv.h above the comment that says /* Maintainer: Put new private prototypes here ^ */ +To avoid polluting the global namespace, the names of all exported +functions and variables begin with "png_", and all publicly visible C +preprocessor macros begin with "PNG". We request that applications that +use libpng *not* begin any of their own symbols with either of these strings. + We put a space after the "sizeof" operator and we omit the optional parentheses around its argument when the argument is an expression, not a type name, and we always enclose the @@ -5637,10 +5749,8 @@ sizeof operator, with its argument, in parentheses: Prior to libpng-1.6.0 we used a "png_sizeof()" macro, formatted as though it were a function. -To avoid polluting the global namespace, the names of all exported -functions and variables begin with "png_", and all publicly visible C -preprocessor macros begin with "PNG". We request that applications that -use libpng *not* begin any of their own symbols with either of these strings. +Control keywords if, for, while, and switch are always followed by a space +to distinguish them from function calls, which have no trailing space. We put a space after each comma and after each semicolon in "for" statements, and we put spaces before and after each @@ -5649,7 +5759,7 @@ C binary operator and after "for" or "while", and before being cast, nor do we put one between a function name and the left parenthesis that follows it: - for (i = 2; i > 0; --i) + for (i = 2; i > 0; \-\-i) y[i] = a(x) + (int)b; We prefer #ifdef and #ifndef to #if defined() and #if !defined() @@ -5662,6 +5772,9 @@ with an even number of lower-case hex digits (e.g., 0x00, 0xff, 0x0100). We prefer to use underscores in variable names rather than camelCase, except for a few type names that we inherit from zlib.h. +We prefer "if (something != 0)" and "if (something == 0)" +over "if (something)" and if "(!something)", respectively. + We do not use the TAB character for indentation in the C sources. Lines do not exceed 80 characters. @@ -5670,13 +5783,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -April 25, 2013 +March 26, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.6.2 are Y2K compliant. It is my belief that earlier +upward through 1.6.17 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer @@ -5692,8 +5805,9 @@ in libpng-1.6.x and will be removed from libpng-1.7.0. There are seven time-related functions: - png_convert_to_rfc_1123() in png.c - (formerly png_convert_to_rfc_1152() in error) + png_convert_to_rfc_1123_buffer() in png.c + (formerly png_convert_to_rfc_1152() in error, and + also formerly png_convert_to_rfc_1123()) png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c png_convert_from_time_t() in pngwrite.c @@ -5890,6 +6004,46 @@ the first widely used release: 1.6.2beta01 16 10602 16.so.16.2[.0] 1.6.2rc01-06 16 10602 16.so.16.2[.0] 1.6.2 16 10602 16.so.16.2[.0] + 1.6.3beta01-11 16 10603 16.so.16.3[.0] + 1.6.3rc01 16 10603 16.so.16.3[.0] + 1.6.3 16 10603 16.so.16.3[.0] + 1.6.4beta01-02 16 10604 16.so.16.4[.0] + 1.6.4rc01 16 10604 16.so.16.4[.0] + 1.6.4 16 10604 16.so.16.4[.0] + 1.6.5 16 10605 16.so.16.5[.0] + 1.6.6 16 10606 16.so.16.6[.0] + 1.6.7beta01-04 16 10607 16.so.16.7[.0] + 1.6.7rc01-02 16 10607 16.so.16.7[.0] + 1.6.7 16 10607 16.so.16.7[.0] + 1.6.8beta01-02 16 10608 16.so.16.8[.0] + 1.6.8rc01-02 16 10608 16.so.16.8[.0] + 1.6.8 16 10608 16.so.16.8[.0] + 1.6.9beta01-04 16 10609 16.so.16.9[.0] + 1.6.9rc01-02 16 10609 16.so.16.9[.0] + 1.6.9 16 10609 16.so.16.9[.0] + 1.6.10beta01-03 16 10610 16.so.16.10[.0] + 1.6.10rc01-03 16 10610 16.so.16.10[.0] + 1.6.10 16 10610 16.so.16.10[.0] + 1.6.11beta01-06 16 10611 16.so.16.11[.0] + 1.6.11rc01-02 16 10611 16.so.16.11[.0] + 1.6.11 16 10611 16.so.16.11[.0] + 1.6.12rc01 16 10612 16.so.16.12[.0] + 1.6.12 16 10612 16.so.16.12[.0] + 1.6.13beta01-04 16 10613 16.so.16.13[.0] + 1.6.13rc01-02 16 10613 16.so.16.13[.0] + 1.6.13 16 10613 16.so.16.13[.0] + 1.6.14beta01-07 16 10614 16.so.16.14[.0] + 1.6.14rc01-02 16 10614 16.so.16.14[.0] + 1.6.14 16 10614 16.so.16.14[.0] + 1.6.15beta01-08 16 10615 16.so.16.15[.0] + 1.6.15rc01-03 16 10615 16.so.16.15[.0] + 1.6.15 16 10615 16.so.16.15[.0] + 1.6.16beta01-03 16 10616 16.so.16.16[.0] + 1.6.16rc01-02 16 10616 16.so.16.16[.0] + 1.6.16 16 10616 16.so.16.16[.0] + 1.6.17beta01-06 16 10617 16.so.16.17[.0] + 1.6.17rc01-06 16 10617 16.so.16.17[.0] + 1.6.17 16 10617 16.so.16.17[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5946,7 +6100,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.2 - April 25, 2013: +Libpng version 1.6.17 - March 26, 2015: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5969,8 +6123,8 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.2, April 25, 2013, are -Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are +libpng versions 1.2.6, August 15, 2004, through 1.6.17, March 26, 2015, are +Copyright (c) 2004,2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -6068,7 +6222,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 25, 2013 +March 26, 2015 .\" end of man page diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/libpng.pc.in b/3rdparty/libpng/libpng.pc.in similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/libpng.pc.in rename to 3rdparty/libpng/libpng.pc.in diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/libpngpf.3 b/3rdparty/libpng/libpngpf.3 similarity index 95% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/libpngpf.3 rename to 3rdparty/libpng/libpngpf.3 index 7baaa22d24..d0dd5be57f 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/libpngpf.3 +++ b/3rdparty/libpng/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "April 25, 2013" +.TH LIBPNGPF 3 "March 26, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.2 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.17 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/png.5 b/3rdparty/libpng/png.5 similarity index 98% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/png.5 rename to 3rdparty/libpng/png.5 index e14e7da414..10c4c3cb17 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/png.5 +++ b/3rdparty/libpng/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "April 25, 2013" +.TH PNG 5 "March 26, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/png.c b/3rdparty/libpng/png.c similarity index 87% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/png.c rename to 3rdparty/libpng/png.c index d429c527c3..7575ede97b 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/png.c +++ b/3rdparty/libpng/png.c @@ -1,8 +1,8 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.6.2 [April 25, 2013] - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.17 [March 26, 2015] + * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_2 Your_png_h_is_not_version_1_6_2; +typedef png_libpng_version_1_6_17 Your_png_h_is_not_version_1_6_17; /* Tells libpng that we have already handled the first "num_bytes" bytes * of the PNG file signature. If the PNG data is embedded into another @@ -34,7 +34,7 @@ png_set_sig_bytes(png_structrp png_ptr, int num_bytes) if (num_bytes > 8) png_error(png_ptr, "Too many bytes for PNG signature"); - png_ptr->sig_bytes = (png_byte)(num_bytes < 0 ? 0 : num_bytes); + png_ptr->sig_bytes = (png_byte)((num_bytes < 0 ? 0 : num_bytes) & 0xff); } /* Checks whether the supplied bytes match the PNG signature. We allow @@ -65,7 +65,7 @@ png_sig_cmp(png_const_bytep sig, png_size_t start, png_size_t num_to_check) return ((int)(memcmp(&sig[start], &png_signature[start], num_to_check))); } -#endif /* PNG_READ_SUPPORTED */ +#endif /* READ */ #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) /* Function to allocate memory for zlib */ @@ -115,7 +115,7 @@ png_calculate_crc(png_structrp png_ptr, png_const_bytep ptr, png_size_t length) { int need_crc = 1; - if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name)) + if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0) { if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) == (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN)) @@ -124,7 +124,7 @@ png_calculate_crc(png_structrp png_ptr, png_const_bytep ptr, png_size_t length) else /* critical */ { - if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) + if ((png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) != 0) need_crc = 0; } @@ -133,15 +133,17 @@ png_calculate_crc(png_structrp png_ptr, png_const_bytep ptr, png_size_t length) * following cast is safe. 'uInt' may be no more than 16 bits, so it is * necessary to perform a loop here. */ - if (need_crc && length > 0) + if (need_crc != 0 && length > 0) { uLong crc = png_ptr->crc; /* Should never issue a warning */ do { uInt safe_length = (uInt)length; +#ifndef __COVERITY__ if (safe_length == 0) safe_length = (uInt)-1; /* evil, but safe */ +#endif crc = crc32(crc, ptr, safe_length); @@ -165,52 +167,51 @@ png_calculate_crc(png_structrp png_ptr, png_const_bytep ptr, png_size_t length) int png_user_version_check(png_structrp png_ptr, png_const_charp user_png_ver) { - if (user_png_ver) + /* Libpng versions 1.0.0 and later are binary compatible if the version + * string matches through the second '.'; we must recompile any + * applications that use any older library version. + */ + + if (user_png_ver != NULL) { - int i = 0; + int i = -1; + int found_dots = 0; do { - if (user_png_ver[i] != png_libpng_ver[i]) + i++; + if (user_png_ver[i] != PNG_LIBPNG_VER_STRING[i]) png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH; - } while (png_libpng_ver[i++]); + if (user_png_ver[i] == '.') + found_dots++; + } while (found_dots < 2 && user_png_ver[i] != 0 && + PNG_LIBPNG_VER_STRING[i] != 0); } else png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH; - if (png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH) + if ((png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH) != 0) { - /* Libpng 0.90 and later are binary incompatible with libpng 0.89, so - * we must recompile any applications that use any older library version. - * For versions after libpng 1.0, we will be compatible, so we need - * only check the first and third digits (note that when we reach version - * 1.10 we will need to check the fourth symbol, namely user_png_ver[3]). - */ - if (user_png_ver == NULL || user_png_ver[0] != png_libpng_ver[0] || - (user_png_ver[0] == '1' && (user_png_ver[2] != png_libpng_ver[2] || - user_png_ver[3] != png_libpng_ver[3])) || - (user_png_ver[0] == '0' && user_png_ver[2] < '9')) - { #ifdef PNG_WARNINGS_SUPPORTED - size_t pos = 0; - char m[128]; + size_t pos = 0; + char m[128]; - pos = png_safecat(m, (sizeof m), pos, - "Application built with libpng-"); - pos = png_safecat(m, (sizeof m), pos, user_png_ver); - pos = png_safecat(m, (sizeof m), pos, " but running with "); - pos = png_safecat(m, (sizeof m), pos, png_libpng_ver); + pos = png_safecat(m, (sizeof m), pos, + "Application built with libpng-"); + pos = png_safecat(m, (sizeof m), pos, user_png_ver); + pos = png_safecat(m, (sizeof m), pos, " but running with "); + pos = png_safecat(m, (sizeof m), pos, PNG_LIBPNG_VER_STRING); + PNG_UNUSED(pos) - png_warning(png_ptr, m); + png_warning(png_ptr, m); #endif #ifdef PNG_ERROR_NUMBERS_SUPPORTED - png_ptr->flags = 0; + png_ptr->flags = 0; #endif - return 0; - } + return 0; } /* Success return. */ @@ -259,6 +260,10 @@ png_create_png_struct,(png_const_charp user_png_ver, png_voidp error_ptr, */ # ifdef PNG_USER_MEM_SUPPORTED png_set_mem_fn(&create_struct, mem_ptr, malloc_fn, free_fn); +# else + PNG_UNUSED(mem_ptr) + PNG_UNUSED(malloc_fn) + PNG_UNUSED(free_fn) # endif /* (*error_fn) can return control to the caller after the error_ptr is set, @@ -284,7 +289,7 @@ png_create_png_struct,(png_const_charp user_png_ver, png_voidp error_ptr, # endif /* Call the general version checker (shared with read and write code): */ - if (png_user_version_check(&create_struct, user_png_ver)) + if (png_user_version_check(&create_struct, user_png_ver) != 0) { png_structrp png_ptr = png_voidcast(png_structrp, png_malloc_warn(&create_struct, (sizeof *png_ptr))); @@ -446,42 +451,43 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask, #ifdef PNG_TEXT_SUPPORTED /* Free text item num or (if num == -1) all text items */ - if ((mask & PNG_FREE_TEXT) & info_ptr->free_me) + if (info_ptr->text != 0 && + ((mask & PNG_FREE_TEXT) & info_ptr->free_me) != 0) { if (num != -1) { - if (info_ptr->text && info_ptr->text[num].key) - { - png_free(png_ptr, info_ptr->text[num].key); - info_ptr->text[num].key = NULL; - } + png_free(png_ptr, info_ptr->text[num].key); + info_ptr->text[num].key = NULL; } else { int i; + for (i = 0; i < info_ptr->num_text; i++) - png_free_data(png_ptr, info_ptr, PNG_FREE_TEXT, i); + png_free(png_ptr, info_ptr->text[i].key); + png_free(png_ptr, info_ptr->text); info_ptr->text = NULL; - info_ptr->num_text=0; + info_ptr->num_text = 0; } } #endif #ifdef PNG_tRNS_SUPPORTED /* Free any tRNS entry */ - if ((mask & PNG_FREE_TRNS) & info_ptr->free_me) + if (((mask & PNG_FREE_TRNS) & info_ptr->free_me) != 0) { + info_ptr->valid &= ~PNG_INFO_tRNS; png_free(png_ptr, info_ptr->trans_alpha); info_ptr->trans_alpha = NULL; - info_ptr->valid &= ~PNG_INFO_tRNS; + info_ptr->num_trans = 0; } #endif #ifdef PNG_sCAL_SUPPORTED /* Free any sCAL entry */ - if ((mask & PNG_FREE_SCAL) & info_ptr->free_me) + if (((mask & PNG_FREE_SCAL) & info_ptr->free_me) != 0) { png_free(png_ptr, info_ptr->scal_s_width); png_free(png_ptr, info_ptr->scal_s_height); @@ -493,20 +499,20 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask, #ifdef PNG_pCAL_SUPPORTED /* Free any pCAL entry */ - if ((mask & PNG_FREE_PCAL) & info_ptr->free_me) + if (((mask & PNG_FREE_PCAL) & info_ptr->free_me) != 0) { png_free(png_ptr, info_ptr->pcal_purpose); png_free(png_ptr, info_ptr->pcal_units); info_ptr->pcal_purpose = NULL; info_ptr->pcal_units = NULL; + if (info_ptr->pcal_params != NULL) { - unsigned int i; + int i; + for (i = 0; i < info_ptr->pcal_nparams; i++) - { png_free(png_ptr, info_ptr->pcal_params[i]); - info_ptr->pcal_params[i] = NULL; - } + png_free(png_ptr, info_ptr->pcal_params); info_ptr->pcal_params = NULL; } @@ -516,7 +522,7 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask, #ifdef PNG_iCCP_SUPPORTED /* Free any profile entry */ - if ((mask & PNG_FREE_ICCP) & info_ptr->free_me) + if (((mask & PNG_FREE_ICCP) & info_ptr->free_me) != 0) { png_free(png_ptr, info_ptr->iccp_name); png_free(png_ptr, info_ptr->iccp_profile); @@ -528,68 +534,62 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask, #ifdef PNG_sPLT_SUPPORTED /* Free a given sPLT entry, or (if num == -1) all sPLT entries */ - if ((mask & PNG_FREE_SPLT) & info_ptr->free_me) + if (info_ptr->splt_palettes != 0 && + ((mask & PNG_FREE_SPLT) & info_ptr->free_me) != 0) { if (num != -1) { - if (info_ptr->splt_palettes) - { - png_free(png_ptr, info_ptr->splt_palettes[num].name); - png_free(png_ptr, info_ptr->splt_palettes[num].entries); - info_ptr->splt_palettes[num].name = NULL; - info_ptr->splt_palettes[num].entries = NULL; - } - } - - else - { - if (info_ptr->splt_palettes_num) - { - int i; - for (i = 0; i < info_ptr->splt_palettes_num; i++) - png_free_data(png_ptr, info_ptr, PNG_FREE_SPLT, (int)i); - - png_free(png_ptr, info_ptr->splt_palettes); - info_ptr->splt_palettes = NULL; - info_ptr->splt_palettes_num = 0; - } - info_ptr->valid &= ~PNG_INFO_sPLT; - } - } -#endif - -#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED - if ((mask & PNG_FREE_UNKN) & info_ptr->free_me) - { - if (num != -1) - { - if (info_ptr->unknown_chunks) - { - png_free(png_ptr, info_ptr->unknown_chunks[num].data); - info_ptr->unknown_chunks[num].data = NULL; - } + png_free(png_ptr, info_ptr->splt_palettes[num].name); + png_free(png_ptr, info_ptr->splt_palettes[num].entries); + info_ptr->splt_palettes[num].name = NULL; + info_ptr->splt_palettes[num].entries = NULL; } else { int i; - if (info_ptr->unknown_chunks_num) + for (i = 0; i < info_ptr->splt_palettes_num; i++) { - for (i = 0; i < info_ptr->unknown_chunks_num; i++) - png_free_data(png_ptr, info_ptr, PNG_FREE_UNKN, (int)i); - - png_free(png_ptr, info_ptr->unknown_chunks); - info_ptr->unknown_chunks = NULL; - info_ptr->unknown_chunks_num = 0; + png_free(png_ptr, info_ptr->splt_palettes[i].name); + png_free(png_ptr, info_ptr->splt_palettes[i].entries); } + + png_free(png_ptr, info_ptr->splt_palettes); + info_ptr->splt_palettes = NULL; + info_ptr->splt_palettes_num = 0; + info_ptr->valid &= ~PNG_INFO_sPLT; + } + } +#endif + +#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED + if (info_ptr->unknown_chunks != 0 && + ((mask & PNG_FREE_UNKN) & info_ptr->free_me) != 0) + { + if (num != -1) + { + png_free(png_ptr, info_ptr->unknown_chunks[num].data); + info_ptr->unknown_chunks[num].data = NULL; + } + + else + { + int i; + + for (i = 0; i < info_ptr->unknown_chunks_num; i++) + png_free(png_ptr, info_ptr->unknown_chunks[i].data); + + png_free(png_ptr, info_ptr->unknown_chunks); + info_ptr->unknown_chunks = NULL; + info_ptr->unknown_chunks_num = 0; } } #endif #ifdef PNG_hIST_SUPPORTED /* Free any hIST entry */ - if ((mask & PNG_FREE_HIST) & info_ptr->free_me) + if (((mask & PNG_FREE_HIST) & info_ptr->free_me) != 0) { png_free(png_ptr, info_ptr->hist); info_ptr->hist = NULL; @@ -598,7 +598,7 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask, #endif /* Free any PLTE entry that was internally allocated */ - if ((mask & PNG_FREE_PLTE) & info_ptr->free_me) + if (((mask & PNG_FREE_PLTE) & info_ptr->free_me) != 0) { png_free(png_ptr, info_ptr->palette); info_ptr->palette = NULL; @@ -608,16 +608,14 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask, #ifdef PNG_INFO_IMAGE_SUPPORTED /* Free any image bits attached to the info structure */ - if ((mask & PNG_FREE_ROWS) & info_ptr->free_me) + if (((mask & PNG_FREE_ROWS) & info_ptr->free_me) != 0) { - if (info_ptr->row_pointers) + if (info_ptr->row_pointers != 0) { png_uint_32 row; for (row = 0; row < info_ptr->height; row++) - { png_free(png_ptr, info_ptr->row_pointers[row]); - info_ptr->row_pointers[row] = NULL; - } + png_free(png_ptr, info_ptr->row_pointers); info_ptr->row_pointers = NULL; } @@ -630,7 +628,7 @@ png_free_data(png_const_structrp png_ptr, png_inforp info_ptr, png_uint_32 mask, info_ptr->free_me &= ~mask; } -#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */ +#endif /* READ || WRITE */ /* This function returns a pointer to the io_ptr associated with the user * functions. The application should free any memory associated with this @@ -665,7 +663,7 @@ png_init_io(png_structrp png_ptr, png_FILE_p fp) } # endif -#ifdef PNG_SAVE_INT_32_SUPPORTED +# ifdef PNG_SAVE_INT_32_SUPPORTED /* The png_save_int_32 function assumes integers are stored in two's * complement format. If this isn't the case, then this routine needs to * be modified to write data in two's complement format. Note that, @@ -680,7 +678,7 @@ png_save_int_32(png_bytep buf, png_int_32 i) buf[2] = (png_byte)((i >> 8) & 0xff); buf[3] = (png_byte)(i & 0xff); } -#endif +# endif # ifdef PNG_TIME_RFC1123_SUPPORTED /* Convert the supplied time into an RFC 1123 string suitable for use in @@ -733,7 +731,7 @@ png_convert_to_rfc1123_buffer(char out[29], png_const_timep ptime) return 1; } -# if PNG_LIBPNG_VER < 10700 +# if PNG_LIBPNG_VER < 10700 /* To do: remove the following from libpng-1.7 */ /* Original API that uses a private buffer in png_struct. * Deprecated because it causes png_struct to carry a spurious temporary @@ -745,7 +743,7 @@ png_convert_to_rfc1123(png_structrp png_ptr, png_const_timep ptime) if (png_ptr != NULL) { /* The only failure above if png_ptr != NULL is from an invalid ptime */ - if (!png_convert_to_rfc1123_buffer(png_ptr->time_buffer, ptime)) + if (png_convert_to_rfc1123_buffer(png_ptr->time_buffer, ptime) == 0) png_warning(png_ptr, "Ignoring invalid time value"); else @@ -754,10 +752,10 @@ png_convert_to_rfc1123(png_structrp png_ptr, png_const_timep ptime) return NULL; } -# endif -# endif /* PNG_TIME_RFC1123_SUPPORTED */ +# endif /* LIBPNG_VER < 10700 */ +# endif /* TIME_RFC1123 */ -#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */ +#endif /* READ || WRITE */ png_const_charp PNGAPI png_get_copyright(png_const_structrp png_ptr) @@ -768,14 +766,14 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.2 - April 25, 2013" PNG_STRING_NEWLINE \ - "Copyright (c) 1998-2013 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ + "libpng version 1.6.17 - March 26, 2015" PNG_STRING_NEWLINE \ + "Copyright (c) 1998-2015 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE; # else - return "libpng version 1.6.2 - April 25, 2013\ - Copyright (c) 1998-2013 Glenn Randers-Pehrson\ + return "libpng version 1.6.17 - March 26, 2015\ + Copyright (c) 1998-2015 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; # endif @@ -821,6 +819,63 @@ png_get_header_version(png_const_structrp png_ptr) #endif } +#ifdef PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED +/* NOTE: this routine is not used internally! */ +/* Build a grayscale palette. Palette is assumed to be 1 << bit_depth + * large of png_color. This lets grayscale images be treated as + * paletted. Most useful for gamma correction and simplification + * of code. This API is not used internally. + */ +void PNGAPI +png_build_grayscale_palette(int bit_depth, png_colorp palette) +{ + int num_palette; + int color_inc; + int i; + int v; + + png_debug(1, "in png_do_build_grayscale_palette"); + + if (palette == NULL) + return; + + switch (bit_depth) + { + case 1: + num_palette = 2; + color_inc = 0xff; + break; + + case 2: + num_palette = 4; + color_inc = 0x55; + break; + + case 4: + num_palette = 16; + color_inc = 0x11; + break; + + case 8: + num_palette = 256; + color_inc = 1; + break; + + default: + num_palette = 0; + color_inc = 0; + break; + } + + for (i = 0, v = 0; i < num_palette; i++, v += color_inc) + { + palette[i].red = (png_byte)(v & 0xff); + palette[i].green = (png_byte)(v & 0xff); + palette[i].blue = (png_byte)(v & 0xff); + } +} +#endif + #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED int PNGAPI png_handle_as_unknown(png_const_structrp png_ptr, png_const_bytep chunk_name) @@ -842,7 +897,7 @@ png_handle_as_unknown(png_const_structrp png_ptr, png_const_bytep chunk_name) { p -= 5; - if (!memcmp(chunk_name, p, 4)) + if (memcmp(chunk_name, p, 4) == 0) return p[4]; } while (p > p_end); @@ -855,7 +910,8 @@ png_handle_as_unknown(png_const_structrp png_ptr, png_const_bytep chunk_name) return PNG_HANDLE_CHUNK_AS_DEFAULT; } -#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED +#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) ||\ + defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED) int /* PRIVATE */ png_chunk_unknown_handling(png_const_structrp png_ptr, png_uint_32 chunk_name) { @@ -864,7 +920,7 @@ png_chunk_unknown_handling(png_const_structrp png_ptr, png_uint_32 chunk_name) PNG_CSTRING_FROM_CHUNK(chunk_string, chunk_name); return png_handle_as_unknown(png_ptr, chunk_string); } -#endif /* READ_UNKNOWN_CHUNKS */ +#endif /* READ_UNKNOWN_CHUNKS || HANDLE_AS_UNKNOWN */ #endif /* SET_UNKNOWN_CHUNKS */ #ifdef PNG_READ_SUPPORTED @@ -878,7 +934,7 @@ png_reset_zstream(png_structrp png_ptr) /* WARNING: this resets the window bits to the maximum! */ return (inflateReset(&png_ptr->zstream)); } -#endif /* PNG_READ_SUPPORTED */ +#endif /* READ */ /* This function was added to libpng-1.0.7 */ png_uint_32 PNGAPI @@ -888,8 +944,6 @@ png_access_version_number(void) return((png_uint_32)PNG_LIBPNG_VER); } - - #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) /* Ensure that png_ptr->zstream.msg holds some appropriate error message string. * If it doesn't 'ret' is used to set it to something appropriate, even in cases @@ -983,8 +1037,8 @@ png_colorspace_check_gamma(png_const_structrp png_ptr, png_fixed_point gtest; if ((colorspace->flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 && - (!png_muldiv(>est, colorspace->gamma, PNG_FP_1, gAMA) || - png_gamma_significant(gtest))) + (png_muldiv(>est, colorspace->gamma, PNG_FP_1, gAMA) == 0 || + png_gamma_significant(gtest) != 0)) { /* Either this is an sRGB image, in which case the calculated gamma * approximation should match, or this is an image with a profile and the @@ -1016,7 +1070,7 @@ png_colorspace_set_gamma(png_const_structrp png_ptr, png_colorspacerp colorspace, png_fixed_point gAMA) { /* Changed in libpng-1.5.4 to limit the values to ensure overflow can't - * occur. Since the fixed point representation is assymetrical it is + * occur. Since the fixed point representation is asymetrical it is * possible for 1/gamma to overflow the limit of 21474 and this means the * gamma value must be at least 5/100000 and hence at most 20000.0. For * safety the limits here are a little narrower. The values are 0.00016 to @@ -1039,12 +1093,13 @@ png_colorspace_set_gamma(png_const_structrp png_ptr, # endif /* Do nothing if the colorspace is already invalid */ - else if (colorspace->flags & PNG_COLORSPACE_INVALID) + else if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0) return; else { - if (png_colorspace_check_gamma(png_ptr, colorspace, gAMA, 1/*from gAMA*/)) + if (png_colorspace_check_gamma(png_ptr, colorspace, gAMA, + 1/*from gAMA*/) != 0) { /* Store this gamma value. */ colorspace->gamma = gAMA; @@ -1068,7 +1123,7 @@ png_colorspace_set_gamma(png_const_structrp png_ptr, void /* PRIVATE */ png_colorspace_sync_info(png_const_structrp png_ptr, png_inforp info_ptr) { - if (info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) + if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0) { /* Everything is invalid */ info_ptr->valid &= ~(PNG_INFO_gAMA|PNG_INFO_cHRM|PNG_INFO_sRGB| @@ -1089,20 +1144,20 @@ png_colorspace_sync_info(png_const_structrp png_ptr, png_inforp info_ptr) * it; this allows a PNG to contain a profile which matches sRGB and * yet still have that profile retrievable by the application. */ - if (info_ptr->colorspace.flags & PNG_COLORSPACE_MATCHES_sRGB) + if ((info_ptr->colorspace.flags & PNG_COLORSPACE_MATCHES_sRGB) != 0) info_ptr->valid |= PNG_INFO_sRGB; else info_ptr->valid &= ~PNG_INFO_sRGB; - if (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) + if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0) info_ptr->valid |= PNG_INFO_cHRM; else info_ptr->valid &= ~PNG_INFO_cHRM; # endif - if (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) + if ((info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0) info_ptr->valid |= PNG_INFO_gAMA; else @@ -1121,7 +1176,7 @@ png_colorspace_sync(png_const_structrp png_ptr, png_inforp info_ptr) png_colorspace_sync_info(png_ptr, info_ptr); } #endif -#endif +#endif /* GAMMA */ #ifdef PNG_COLORSPACE_SUPPORTED /* Added at libpng-1.5.5 to support read and write of true CIEXYZ values for @@ -1135,22 +1190,28 @@ png_xy_from_XYZ(png_xy *xy, const png_XYZ *XYZ) png_int_32 d, dwhite, whiteX, whiteY; d = XYZ->red_X + XYZ->red_Y + XYZ->red_Z; - if (!png_muldiv(&xy->redx, XYZ->red_X, PNG_FP_1, d)) return 1; - if (!png_muldiv(&xy->redy, XYZ->red_Y, PNG_FP_1, d)) return 1; + if (png_muldiv(&xy->redx, XYZ->red_X, PNG_FP_1, d) == 0) + return 1; + if (png_muldiv(&xy->redy, XYZ->red_Y, PNG_FP_1, d) == 0) + return 1; dwhite = d; whiteX = XYZ->red_X; whiteY = XYZ->red_Y; d = XYZ->green_X + XYZ->green_Y + XYZ->green_Z; - if (!png_muldiv(&xy->greenx, XYZ->green_X, PNG_FP_1, d)) return 1; - if (!png_muldiv(&xy->greeny, XYZ->green_Y, PNG_FP_1, d)) return 1; + if (png_muldiv(&xy->greenx, XYZ->green_X, PNG_FP_1, d) == 0) + return 1; + if (png_muldiv(&xy->greeny, XYZ->green_Y, PNG_FP_1, d) == 0) + return 1; dwhite += d; whiteX += XYZ->green_X; whiteY += XYZ->green_Y; d = XYZ->blue_X + XYZ->blue_Y + XYZ->blue_Z; - if (!png_muldiv(&xy->bluex, XYZ->blue_X, PNG_FP_1, d)) return 1; - if (!png_muldiv(&xy->bluey, XYZ->blue_Y, PNG_FP_1, d)) return 1; + if (png_muldiv(&xy->bluex, XYZ->blue_X, PNG_FP_1, d) == 0) + return 1; + if (png_muldiv(&xy->bluey, XYZ->blue_Y, PNG_FP_1, d) == 0) + return 1; dwhite += d; whiteX += XYZ->blue_X; whiteY += XYZ->blue_Y; @@ -1158,8 +1219,10 @@ png_xy_from_XYZ(png_xy *xy, const png_XYZ *XYZ) /* The reference white is simply the sum of the end-point (X,Y,Z) vectors, * thus: */ - if (!png_muldiv(&xy->whitex, whiteX, PNG_FP_1, dwhite)) return 1; - if (!png_muldiv(&xy->whitey, whiteY, PNG_FP_1, dwhite)) return 1; + if (png_muldiv(&xy->whitex, whiteX, PNG_FP_1, dwhite) == 0) + return 1; + if (png_muldiv(&xy->whitey, whiteY, PNG_FP_1, dwhite) == 0) + return 1; return 0; } @@ -1256,7 +1319,7 @@ png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy) * (1/white-y), so we can immediately see that as white-y approaches 0 the * accuracy inherent in the cHRM chunk drops off substantially. * - * libpng arithmetic: a simple invertion of the above equations + * libpng arithmetic: a simple inversion of the above equations * ------------------------------------------------------------ * * white_scale = 1/white-y @@ -1362,16 +1425,16 @@ png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy) /* By the argument, above overflow should be impossible here. The return * value of 2 indicates an internal error to the caller. */ - if (!png_muldiv(&left, xy->greenx-xy->bluex, xy->redy - xy->bluey, 7)) + if (png_muldiv(&left, xy->greenx-xy->bluex, xy->redy - xy->bluey, 7) == 0) return 2; - if (!png_muldiv(&right, xy->greeny-xy->bluey, xy->redx - xy->bluex, 7)) + if (png_muldiv(&right, xy->greeny-xy->bluey, xy->redx - xy->bluex, 7) == 0) return 2; denominator = left - right; /* Now find the red numerator. */ - if (!png_muldiv(&left, xy->greenx-xy->bluex, xy->whitey-xy->bluey, 7)) + if (png_muldiv(&left, xy->greenx-xy->bluex, xy->whitey-xy->bluey, 7) == 0) return 2; - if (!png_muldiv(&right, xy->greeny-xy->bluey, xy->whitex-xy->bluex, 7)) + if (png_muldiv(&right, xy->greeny-xy->bluey, xy->whitex-xy->bluex, 7) == 0) return 2; /* Overflow is possible here and it indicates an extreme set of PNG cHRM @@ -1379,16 +1442,16 @@ png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy) * scale value because this allows us to delay the multiplication of white-y * into the denominator, which tends to produce a small number. */ - if (!png_muldiv(&red_inverse, xy->whitey, denominator, left-right) || + if (png_muldiv(&red_inverse, xy->whitey, denominator, left-right) == 0 || red_inverse <= xy->whitey /* r+g+b scales = white scale */) return 1; /* Similarly for green_inverse: */ - if (!png_muldiv(&left, xy->redy-xy->bluey, xy->whitex-xy->bluex, 7)) + if (png_muldiv(&left, xy->redy-xy->bluey, xy->whitex-xy->bluex, 7) == 0) return 2; - if (!png_muldiv(&right, xy->redx-xy->bluex, xy->whitey-xy->bluey, 7)) + if (png_muldiv(&right, xy->redx-xy->bluex, xy->whitey-xy->bluey, 7) == 0) return 2; - if (!png_muldiv(&green_inverse, xy->whitey, denominator, left-right) || + if (png_muldiv(&green_inverse, xy->whitey, denominator, left-right) == 0 || green_inverse <= xy->whitey) return 1; @@ -1396,29 +1459,34 @@ png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy) * can still produce 0 for extreme cHRM values. */ blue_scale = png_reciprocal(xy->whitey) - png_reciprocal(red_inverse) - - png_reciprocal(green_inverse); - if (blue_scale <= 0) return 1; + png_reciprocal(green_inverse); + if (blue_scale <= 0) + return 1; /* And fill in the png_XYZ: */ - if (!png_muldiv(&XYZ->red_X, xy->redx, PNG_FP_1, red_inverse)) return 1; - if (!png_muldiv(&XYZ->red_Y, xy->redy, PNG_FP_1, red_inverse)) return 1; - if (!png_muldiv(&XYZ->red_Z, PNG_FP_1 - xy->redx - xy->redy, PNG_FP_1, - red_inverse)) + if (png_muldiv(&XYZ->red_X, xy->redx, PNG_FP_1, red_inverse) == 0) + return 1; + if (png_muldiv(&XYZ->red_Y, xy->redy, PNG_FP_1, red_inverse) == 0) + return 1; + if (png_muldiv(&XYZ->red_Z, PNG_FP_1 - xy->redx - xy->redy, PNG_FP_1, + red_inverse) == 0) return 1; - if (!png_muldiv(&XYZ->green_X, xy->greenx, PNG_FP_1, green_inverse)) + if (png_muldiv(&XYZ->green_X, xy->greenx, PNG_FP_1, green_inverse) == 0) return 1; - if (!png_muldiv(&XYZ->green_Y, xy->greeny, PNG_FP_1, green_inverse)) + if (png_muldiv(&XYZ->green_Y, xy->greeny, PNG_FP_1, green_inverse) == 0) return 1; - if (!png_muldiv(&XYZ->green_Z, PNG_FP_1 - xy->greenx - xy->greeny, PNG_FP_1, - green_inverse)) + if (png_muldiv(&XYZ->green_Z, PNG_FP_1 - xy->greenx - xy->greeny, PNG_FP_1, + green_inverse) == 0) return 1; - if (!png_muldiv(&XYZ->blue_X, xy->bluex, blue_scale, PNG_FP_1)) return 1; - if (!png_muldiv(&XYZ->blue_Y, xy->bluey, blue_scale, PNG_FP_1)) return 1; - if (!png_muldiv(&XYZ->blue_Z, PNG_FP_1 - xy->bluex - xy->bluey, blue_scale, - PNG_FP_1)) + if (png_muldiv(&XYZ->blue_X, xy->bluex, blue_scale, PNG_FP_1) == 0) + return 1; + if (png_muldiv(&XYZ->blue_Y, xy->bluey, blue_scale, PNG_FP_1) == 0) + return 1; + if (png_muldiv(&XYZ->blue_Z, PNG_FP_1 - xy->bluex - xy->bluey, blue_scale, + PNG_FP_1) == 0) return 1; return 0; /*success*/ @@ -1440,24 +1508,35 @@ png_XYZ_normalize(png_XYZ *XYZ) * safe. */ Y = XYZ->red_Y; - if (0x7fffffff - Y < XYZ->green_X) return 1; + if (0x7fffffff - Y < XYZ->green_X) + return 1; Y += XYZ->green_Y; - if (0x7fffffff - Y < XYZ->blue_X) return 1; + if (0x7fffffff - Y < XYZ->blue_X) + return 1; Y += XYZ->blue_Y; if (Y != PNG_FP_1) { - if (!png_muldiv(&XYZ->red_X, XYZ->red_X, PNG_FP_1, Y)) return 1; - if (!png_muldiv(&XYZ->red_Y, XYZ->red_Y, PNG_FP_1, Y)) return 1; - if (!png_muldiv(&XYZ->red_Z, XYZ->red_Z, PNG_FP_1, Y)) return 1; + if (png_muldiv(&XYZ->red_X, XYZ->red_X, PNG_FP_1, Y) == 0) + return 1; + if (png_muldiv(&XYZ->red_Y, XYZ->red_Y, PNG_FP_1, Y) == 0) + return 1; + if (png_muldiv(&XYZ->red_Z, XYZ->red_Z, PNG_FP_1, Y) == 0) + return 1; - if (!png_muldiv(&XYZ->green_X, XYZ->green_X, PNG_FP_1, Y)) return 1; - if (!png_muldiv(&XYZ->green_Y, XYZ->green_Y, PNG_FP_1, Y)) return 1; - if (!png_muldiv(&XYZ->green_Z, XYZ->green_Z, PNG_FP_1, Y)) return 1; + if (png_muldiv(&XYZ->green_X, XYZ->green_X, PNG_FP_1, Y) == 0) + return 1; + if (png_muldiv(&XYZ->green_Y, XYZ->green_Y, PNG_FP_1, Y) == 0) + return 1; + if (png_muldiv(&XYZ->green_Z, XYZ->green_Z, PNG_FP_1, Y) == 0) + return 1; - if (!png_muldiv(&XYZ->blue_X, XYZ->blue_X, PNG_FP_1, Y)) return 1; - if (!png_muldiv(&XYZ->blue_Y, XYZ->blue_Y, PNG_FP_1, Y)) return 1; - if (!png_muldiv(&XYZ->blue_Z, XYZ->blue_Z, PNG_FP_1, Y)) return 1; + if (png_muldiv(&XYZ->blue_X, XYZ->blue_X, PNG_FP_1, Y) == 0) + return 1; + if (png_muldiv(&XYZ->blue_Y, XYZ->blue_Y, PNG_FP_1, Y) == 0) + return 1; + if (png_muldiv(&XYZ->blue_Z, XYZ->blue_Z, PNG_FP_1, Y) == 0) + return 1; } return 0; @@ -1467,14 +1546,16 @@ static int png_colorspace_endpoints_match(const png_xy *xy1, const png_xy *xy2, int delta) { /* Allow an error of +/-0.01 (absolute value) on each chromaticity */ - return !(PNG_OUT_OF_RANGE(xy1->whitex, xy2->whitex,delta) || - PNG_OUT_OF_RANGE(xy1->whitey, xy2->whitey,delta) || - PNG_OUT_OF_RANGE(xy1->redx, xy2->redx, delta) || - PNG_OUT_OF_RANGE(xy1->redy, xy2->redy, delta) || - PNG_OUT_OF_RANGE(xy1->greenx, xy2->greenx,delta) || - PNG_OUT_OF_RANGE(xy1->greeny, xy2->greeny,delta) || - PNG_OUT_OF_RANGE(xy1->bluex, xy2->bluex, delta) || - PNG_OUT_OF_RANGE(xy1->bluey, xy2->bluey, delta)); + if (PNG_OUT_OF_RANGE(xy1->whitex, xy2->whitex,delta) || + PNG_OUT_OF_RANGE(xy1->whitey, xy2->whitey,delta) || + PNG_OUT_OF_RANGE(xy1->redx, xy2->redx, delta) || + PNG_OUT_OF_RANGE(xy1->redy, xy2->redy, delta) || + PNG_OUT_OF_RANGE(xy1->greenx, xy2->greenx,delta) || + PNG_OUT_OF_RANGE(xy1->greeny, xy2->greeny,delta) || + PNG_OUT_OF_RANGE(xy1->bluex, xy2->bluex, delta) || + PNG_OUT_OF_RANGE(xy1->bluey, xy2->bluey, delta)) + return 0; + return 1; } /* Added in libpng-1.6.0, a different check for the validity of a set of cHRM @@ -1495,13 +1576,15 @@ png_colorspace_check_xy(png_XYZ *XYZ, const png_xy *xy) /* As a side-effect this routine also returns the XYZ endpoints. */ result = png_XYZ_from_xy(XYZ, xy); - if (result) return result; + if (result != 0) + return result; result = png_xy_from_XYZ(&xy_test, XYZ); - if (result) return result; + if (result != 0) + return result; if (png_colorspace_endpoints_match(xy, &xy_test, - 5/*actually, the math is pretty accurate*/)) + 5/*actually, the math is pretty accurate*/) != 0) return 0; /* Too much slip */ @@ -1518,10 +1601,12 @@ png_colorspace_check_XYZ(png_xy *xy, png_XYZ *XYZ) png_XYZ XYZtemp; result = png_XYZ_normalize(XYZ); - if (result) return result; + if (result != 0) + return result; result = png_xy_from_XYZ(xy, XYZ); - if (result) return result; + if (result != 0) + return result; XYZtemp = *XYZ; return png_colorspace_check_xy(&XYZtemp, xy); @@ -1542,19 +1627,21 @@ png_colorspace_set_xy_and_XYZ(png_const_structrp png_ptr, png_colorspacerp colorspace, const png_xy *xy, const png_XYZ *XYZ, int preferred) { - if (colorspace->flags & PNG_COLORSPACE_INVALID) + if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0) return 0; /* The consistency check is performed on the chromaticities; this factors out * variations because of the normalization (or not) of the end point Y * values. */ - if (preferred < 2 && (colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS)) + if (preferred < 2 && + (colorspace->flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0) { /* The end points must be reasonably close to any we already have. The * following allows an error of up to +/-.001 */ - if (!png_colorspace_endpoints_match(xy, &colorspace->end_points_xy, 100)) + if (png_colorspace_endpoints_match(xy, &colorspace->end_points_xy, + 100) == 0) { colorspace->flags |= PNG_COLORSPACE_INVALID; png_benign_error(png_ptr, "inconsistent chromaticities"); @@ -1562,7 +1649,7 @@ png_colorspace_set_xy_and_XYZ(png_const_structrp png_ptr, } /* Only overwrite with preferred values */ - if (!preferred) + if (preferred == 0) return 1; /* ok, but no change */ } @@ -1573,7 +1660,7 @@ png_colorspace_set_xy_and_XYZ(png_const_structrp png_ptr, /* The end points are normally quoted to two decimal digits, so allow +/-0.01 * on this test. */ - if (png_colorspace_endpoints_match(xy, &sRGB_xy, 1000)) + if (png_colorspace_endpoints_match(xy, &sRGB_xy, 1000) != 0) colorspace->flags |= PNG_COLORSPACE_ENDPOINTS_MATCH_sRGB; else @@ -1679,7 +1766,8 @@ is_ICC_signature_char(png_alloc_size_t it) (it >= 97 && it <= 122); } -static int is_ICC_signature(png_alloc_size_t it) +static int +is_ICC_signature(png_alloc_size_t it) { return is_ICC_signature_char(it >> 24) /* checks all the top bits */ && is_ICC_signature_char((it >> 16) & 0xff) && @@ -1700,7 +1788,7 @@ png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace, pos = png_safecat(message, (sizeof message), 0, "profile '"); /* 9 chars */ pos = png_safecat(message, pos+79, pos, name); /* Truncate to 79 chars */ pos = png_safecat(message, (sizeof message), pos, "': "); /* +2 = 90 */ - if (is_ICC_signature(value)) + if (is_ICC_signature(value) != 0) { /* So 'value' is at most 4 bytes and the following cast is safe */ png_icc_tag_name(message+pos, (png_uint_32)value); @@ -1721,9 +1809,10 @@ png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace, # endif /* The 'reason' is an arbitrary message, allow +79 maximum 195 */ pos = png_safecat(message, (sizeof message), pos, reason); + PNG_UNUSED(pos) /* This is recoverable, but make it unconditionally an app_error on write to - * avoid writing invalid ICC profiles into PNG files. (I.e. we handle them + * avoid writing invalid ICC profiles into PNG files (i.e., we handle them * on read, with a warning, but on write unless the app turns off * application errors the PNG won't be written.) */ @@ -1742,7 +1831,7 @@ png_colorspace_set_sRGB(png_const_structrp png_ptr, png_colorspacerp colorspace, /* sRGB sets known gamma, end points and (from the chunk) intent. */ /* IMPORTANT: these are not necessarily the values found in an ICC profile * because ICC profiles store values adapted to a D50 environment; it is - * expected that the ICC profile mediaWhitePointTag will be D50, see the + * expected that the ICC profile mediaWhitePointTag will be D50; see the * checks and code elsewhere to understand this better. * * These XYZ values, which are accurate to 5dp, produce rgb to gray @@ -1760,7 +1849,7 @@ png_colorspace_set_sRGB(png_const_structrp png_ptr, png_colorspacerp colorspace, }; /* Do nothing if the colorspace is already invalidated. */ - if (colorspace->flags & PNG_COLORSPACE_INVALID) + if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0) return 0; /* Check the intent, then check for existing settings. It is valid for the @@ -1841,10 +1930,6 @@ png_icc_check_length(png_const_structrp png_ptr, png_colorspacerp colorspace, return png_icc_profile_error(png_ptr, colorspace, name, profile_length, "too short"); - if (profile_length & 3) - return png_icc_profile_error(png_ptr, colorspace, name, profile_length, - "invalid length"); - return 1; } @@ -1865,6 +1950,11 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace, return png_icc_profile_error(png_ptr, colorspace, name, temp, "length does not match profile"); + temp = (png_uint_32) (*(profile+8)); + if (temp > 3 && (profile_length & 3)) + return png_icc_profile_error(png_ptr, colorspace, name, profile_length, + "invalid length"); + temp = png_get_uint_32(profile+128); /* tag count: 12 bytes/tag */ if (temp > 357913930 || /* (2^32-4-132)/12: maximum possible tag count */ profile_length < 132+12*temp) /* truncated tag table */ @@ -1938,13 +2028,13 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace, switch (temp) { case 0x52474220: /* 'RGB ' */ - if (!(color_type & PNG_COLOR_MASK_COLOR)) + if ((color_type & PNG_COLOR_MASK_COLOR) == 0) return png_icc_profile_error(png_ptr, colorspace, name, temp, "RGB color space not permitted on grayscale PNG"); break; case 0x47524159: /* 'GRAY' */ - if (color_type & PNG_COLOR_MASK_COLOR) + if ((color_type & PNG_COLOR_MASK_COLOR) != 0) return png_icc_profile_error(png_ptr, colorspace, name, temp, "Gray color space not permitted on RGB PNG"); break; @@ -1979,7 +2069,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace, "invalid embedded Abstract ICC profile"); case 0x6C696E6B: /* 'link' */ - /* DeviceLink profiles cannnot be interpreted in a non-device specific + /* DeviceLink profiles cannot be interpreted in a non-device specific * fashion, if an app uses the AToB0Tag in the profile the results are * undefined unless the result is sent to the intended device, * therefore a DeviceLink profile should not be found embedded in a @@ -1990,7 +2080,7 @@ png_icc_check_header(png_const_structrp png_ptr, png_colorspacerp colorspace, case 0x6E6D636C: /* 'nmcl' */ /* A NamedColor profile is also device specific, however it doesn't - * contain an AToB0 tag that is open to misintrepretation. Almost + * contain an AToB0 tag that is open to misinterpretation. Almost * certainly it will fail the tests below. */ (void)png_icc_profile_error(png_ptr, NULL, name, temp, @@ -2072,6 +2162,7 @@ png_icc_check_tag_table(png_const_structrp png_ptr, png_colorspacerp colorspace, } #ifdef PNG_sRGB_SUPPORTED +#if PNG_sRGB_PROFILE_CHECKS >= 0 /* Information about the known ICC sRGB profiles */ static const struct { @@ -2145,6 +2236,7 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr, * by sRGB (but maybe defined by a later ICC specification) the read of * the profile will fail at that point. */ + png_uint_32 length = 0; png_uint_32 intent = 0x10000; /* invalid */ #if PNG_sRGB_PROFILE_CHECKS > 1 @@ -2152,6 +2244,13 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr, #endif unsigned int i; +#ifdef PNG_SET_OPTION_SUPPORTED + /* First see if PNG_SKIP_sRGB_CHECK_PROFILE has been set to "on" */ + if (((png_ptr->options >> PNG_SKIP_sRGB_CHECK_PROFILE) & 3) == + PNG_OPTION_ON) + return 0; +#endif + for (i=0; i < (sizeof png_sRGB_checks) / (sizeof png_sRGB_checks[0]); ++i) { if (png_get_uint_32(profile+84) == png_sRGB_checks[i].md5[0] && @@ -2164,7 +2263,7 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr, * are not used by default if there is an MD5!) */ # if PNG_sRGB_PROFILE_CHECKS == 0 - if (png_sRGB_checks[i].have_md5) + if (png_sRGB_checks[i].have_md5 != 0) return 1+png_sRGB_checks[i].is_broken; # endif @@ -2204,7 +2303,7 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr, if (crc == png_sRGB_checks[i].crc) # endif { - if (png_sRGB_checks[i].is_broken) + if (png_sRGB_checks[i].is_broken != 0) { /* These profiles are known to have bad data that may cause * problems if they are used, therefore attempt to @@ -2219,7 +2318,7 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr, * the profile is perfectly valid, but it would be nice if * people used the up-to-date ones. */ - else if (!png_sRGB_checks[i].have_md5) + else if (png_sRGB_checks[i].have_md5 == 0) { png_chunk_report(png_ptr, "out-of-date sRGB profile with no signature", @@ -2229,25 +2328,25 @@ png_compare_ICC_profile_with_sRGB(png_const_structrp png_ptr, return 1+png_sRGB_checks[i].is_broken; } } - } -# if PNG_sRGB_PROFILE_CHECKS > 0 - /* The signature matched, but the profile had been changed in some - * way. This is an apparent violation of the ICC terms of use and, - * anyway, probably indicates a data error or uninformed hacking. - */ - if (png_sRGB_checks[i].have_md5) - png_benign_error(png_ptr, - "copyright violation: edited ICC profile ignored"); -# endif +# if PNG_sRGB_PROFILE_CHECKS > 0 + /* The signature matched, but the profile had been changed in some + * way. This probably indicates a data error or uninformed hacking. + * Fall through to "no match". + */ + png_chunk_report(png_ptr, + "Not recognizing known sRGB profile that has been edited", + PNG_CHUNK_WARNING); + break; +# endif + } } } return 0; /* no match */ } -#endif +#endif /* PNG_sRGB_PROFILE_CHECKS >= 0 */ -#ifdef PNG_sRGB_SUPPORTED void /* PRIVATE */ png_icc_set_sRGB(png_const_structrp png_ptr, png_colorspacerp colorspace, png_const_bytep profile, uLong adler) @@ -2255,25 +2354,27 @@ png_icc_set_sRGB(png_const_structrp png_ptr, /* Is this profile one of the known ICC sRGB profiles? If it is, just set * the sRGB information. */ - if (png_compare_ICC_profile_with_sRGB(png_ptr, profile, adler)) +#if PNG_sRGB_PROFILE_CHECKS >= 0 + if (png_compare_ICC_profile_with_sRGB(png_ptr, profile, adler) != 0) +#endif (void)png_colorspace_set_sRGB(png_ptr, colorspace, (int)/*already checked*/png_get_uint_32(profile+64)); } -#endif /* PNG_READ_sRGB_SUPPORTED */ +#endif /* sRGB */ int /* PRIVATE */ png_colorspace_set_ICC(png_const_structrp png_ptr, png_colorspacerp colorspace, png_const_charp name, png_uint_32 profile_length, png_const_bytep profile, int color_type) { - if (colorspace->flags & PNG_COLORSPACE_INVALID) + if ((colorspace->flags & PNG_COLORSPACE_INVALID) != 0) return 0; - if (png_icc_check_length(png_ptr, colorspace, name, profile_length) && - png_icc_check_header(png_ptr, colorspace, name, profile_length, profile, - color_type) && - png_icc_check_tag_table(png_ptr, colorspace, name, profile_length, - profile)) + if (png_icc_check_length(png_ptr, colorspace, name, profile_length) != 0 && + png_icc_check_header(png_ptr, colorspace, name, profile_length, profile, + color_type) != 0 && + png_icc_check_tag_table(png_ptr, colorspace, name, profile_length, + profile) != 0) { # ifdef PNG_sRGB_SUPPORTED /* If no sRGB support, don't try storing sRGB information */ @@ -2292,7 +2393,7 @@ void /* PRIVATE */ png_colorspace_set_rgb_coefficients(png_structrp png_ptr) { /* Set the rgb_to_gray coefficients from the colorspace. */ - if (!png_ptr->rgb_to_gray_coefficients_set && + if (png_ptr->rgb_to_gray_coefficients_set == 0 && (png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0) { /* png_set_background has not been called, get the coefficients from the Y @@ -2351,10 +2452,21 @@ png_colorspace_set_rgb_coefficients(png_structrp png_ptr) png_error(png_ptr, "internal error handling cHRM->XYZ"); } } -#endif +#endif /* READ_RGB_TO_GRAY */ #endif /* COLORSPACE */ +#ifdef __GNUC__ +/* This exists solely to work round a warning from GNU C. */ +static int /* PRIVATE */ +png_gt(size_t a, size_t b) +{ + return a > b; +} +#else +# define png_gt(a,b) ((a) > (b)) +#endif + void /* PRIVATE */ png_check_IHDR(png_const_structrp png_ptr, png_uint_32 width, png_uint_32 height, int bit_depth, @@ -2370,36 +2482,47 @@ png_check_IHDR(png_const_structrp png_ptr, error = 1; } - if (height == 0) + if (width > PNG_UINT_31_MAX) { - png_warning(png_ptr, "Image height is zero in IHDR"); + png_warning(png_ptr, "Invalid image width in IHDR"); error = 1; } -# ifdef PNG_SET_USER_LIMITS_SUPPORTED - if (width > png_ptr->user_width_max) + if (png_gt(((width + 7) & (~7)), + ((PNG_SIZE_MAX + - 48 /* big_row_buf hack */ + - 1) /* filter byte */ + / 8) /* 8-byte RGBA pixels */ + - 1)) /* extra max_pixel_depth pad */ + { + /* The size of the row must be within the limits of this architecture. + * Because the read code can perform arbitrary transformations the + * maximum size is checked here. Because the code in png_read_start_row + * adds extra space "for safety's sake" in several places a conservative + * limit is used here. + * + * NOTE: it would be far better to check the size that is actually used, + * but the effect in the real world is minor and the changes are more + * extensive, therefore much more dangerous and much more difficult to + * write in a way that avoids compiler warnings. + */ + png_warning(png_ptr, "Image width is too large for this architecture"); + error = 1; + } -# else +#ifdef PNG_SET_USER_LIMITS_SUPPORTED + if (width > png_ptr->user_width_max) +#else if (width > PNG_USER_WIDTH_MAX) -# endif +#endif { png_warning(png_ptr, "Image width exceeds user limit in IHDR"); error = 1; } -# ifdef PNG_SET_USER_LIMITS_SUPPORTED - if (height > png_ptr->user_height_max) -# else - if (height > PNG_USER_HEIGHT_MAX) -# endif + if (height == 0) { - png_warning(png_ptr, "Image height exceeds user limit in IHDR"); - error = 1; - } - - if (width > PNG_UINT_31_MAX) - { - png_warning(png_ptr, "Invalid image width in IHDR"); + png_warning(png_ptr, "Image height is zero in IHDR"); error = 1; } @@ -2409,13 +2532,15 @@ png_check_IHDR(png_const_structrp png_ptr, error = 1; } - if (width > (PNG_UINT_32_MAX - >> 3) /* 8-byte RGBA pixels */ - - 48 /* bigrowbuf hack */ - - 1 /* filter byte */ - - 7*8 /* rounding of width to multiple of 8 pixels */ - - 8) /* extra max_pixel_depth pad */ - png_warning(png_ptr, "Width is too large for libpng to process pixels"); +#ifdef PNG_SET_USER_LIMITS_SUPPORTED + if (height > png_ptr->user_height_max) +#else + if (height > PNG_USER_HEIGHT_MAX) +#endif + { + png_warning(png_ptr, "Image height exceeds user limit in IHDR"); + error = 1; + } /* Check other values */ if (bit_depth != 1 && bit_depth != 2 && bit_depth != 4 && @@ -2453,7 +2578,7 @@ png_check_IHDR(png_const_structrp png_ptr, error = 1; } -# ifdef PNG_MNG_FEATURES_SUPPORTED +#ifdef PNG_MNG_FEATURES_SUPPORTED /* Accept filter_method 64 (intrapixel differencing) only if * 1. Libpng was compiled with PNG_MNG_FEATURES_SUPPORTED and * 2. Libpng did not read a PNG signature (this filter_method is only @@ -2463,13 +2588,13 @@ png_check_IHDR(png_const_structrp png_ptr, * 4. The filter_method is 64 and * 5. The color_type is RGB or RGBA */ - if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) && - png_ptr->mng_features_permitted) + if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0 && + png_ptr->mng_features_permitted != 0) png_warning(png_ptr, "MNG features are not allowed in a PNG datastream"); if (filter_type != PNG_FILTER_TYPE_BASE) { - if (!((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) && + if (!((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 && (filter_type == PNG_INTRAPIXEL_DIFFERENCING) && ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) == 0) && (color_type == PNG_COLOR_TYPE_RGB || @@ -2479,20 +2604,20 @@ png_check_IHDR(png_const_structrp png_ptr, error = 1; } - if (png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) + if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0) { png_warning(png_ptr, "Invalid filter method in IHDR"); error = 1; } } -# else +#else if (filter_type != PNG_FILTER_TYPE_BASE) { png_warning(png_ptr, "Unknown filter method in IHDR"); error = 1; } -# endif +#endif if (error == 1) png_error(png_ptr, "Invalid IHDR data"); @@ -2539,7 +2664,7 @@ png_check_fp_number(png_const_charp string, png_size_t size, int *statep, switch ((state & PNG_FP_STATE) + (type & PNG_FP_SAW_ANY)) { case PNG_FP_INTEGER + PNG_FP_SAW_SIGN: - if (state & PNG_FP_SAW_ANY) + if ((state & PNG_FP_SAW_ANY) != 0) goto PNG_FP_End; /* not a part of the number */ png_fp_add(state, type); @@ -2547,10 +2672,10 @@ png_check_fp_number(png_const_charp string, png_size_t size, int *statep, case PNG_FP_INTEGER + PNG_FP_SAW_DOT: /* Ok as trailer, ok as lead of fraction. */ - if (state & PNG_FP_SAW_DOT) /* two dots */ + if ((state & PNG_FP_SAW_DOT) != 0) /* two dots */ goto PNG_FP_End; - else if (state & PNG_FP_SAW_DIGIT) /* trailing dot? */ + else if ((state & PNG_FP_SAW_DIGIT) != 0) /* trailing dot? */ png_fp_add(state, type); else @@ -2559,7 +2684,7 @@ png_check_fp_number(png_const_charp string, png_size_t size, int *statep, break; case PNG_FP_INTEGER + PNG_FP_SAW_DIGIT: - if (state & PNG_FP_SAW_DOT) /* delayed fraction */ + if ((state & PNG_FP_SAW_DOT) != 0) /* delayed fraction */ png_fp_set(state, PNG_FP_FRACTION | PNG_FP_SAW_DOT); png_fp_add(state, type | PNG_FP_WAS_VALID); @@ -2597,7 +2722,7 @@ png_check_fp_number(png_const_charp string, png_size_t size, int *statep, break; case PNG_FP_EXPONENT + PNG_FP_SAW_SIGN: - if (state & PNG_FP_SAW_ANY) + if ((state & PNG_FP_SAW_ANY) != 0) goto PNG_FP_End; /* not a part of the number */ png_fp_add(state, PNG_FP_SAW_SIGN); @@ -2640,13 +2765,13 @@ png_check_fp_string(png_const_charp string, png_size_t size) int state=0; png_size_t char_index=0; - if (png_check_fp_number(string, size, &state, &char_index) && + if (png_check_fp_number(string, size, &state, &char_index) != 0 && (char_index == size || string[char_index] == 0)) return state /* must be non-zero - see above */; return 0; /* i.e. fail */ } -#endif /* pCAL or sCAL */ +#endif /* pCAL || sCAL */ #ifdef PNG_sCAL_SUPPORTED # ifdef PNG_FLOATING_POINT_SUPPORTED @@ -2680,7 +2805,7 @@ png_pow10(int power) } while (power > 0); - if (recip) d = 1/d; + if (recip != 0) d = 1/d; } /* else power is 0 and d is 1 */ @@ -2894,8 +3019,9 @@ png_ascii_from_fp(png_const_structrp png_ptr, png_charp ascii, png_size_t size, if (exp_b10 != (-1)) { - if (exp_b10 == 0) *ascii++ = 46, --size; /* counted - above */ + if (exp_b10 == 0) + *ascii++ = 46, --size; /* counted above */ + --exp_b10; } *ascii++ = (char)(48 + (int)d), ++cdigits; @@ -2908,7 +3034,7 @@ png_ascii_from_fp(png_const_structrp png_ptr, png_charp ascii, png_size_t size, /* Check for an exponent, if we don't need one we are * done and just need to terminate the string. At * this point exp_b10==(-1) is effectively if flag - it got - * to '-1' because of the decrement after outputing + * to '-1' because of the decrement after outputting * the decimal point above (the exponent required is * *not* -1!) */ @@ -2916,7 +3042,7 @@ png_ascii_from_fp(png_const_structrp png_ptr, png_charp ascii, png_size_t size, { /* The following only happens if we didn't output the * leading zeros above for negative exponent, so this - * doest add to the digit requirement. Note that the + * doesn't add to the digit requirement. Note that the * two zeros here can only be output if the two leading * zeros were *not* output, so this doesn't increase * the output count. @@ -3073,7 +3199,7 @@ png_ascii_from_fixed(png_const_structrp png_ptr, png_charp ascii, png_error(png_ptr, "ASCII conversion buffer too small"); } # endif /* FIXED_POINT */ -#endif /* READ_SCAL */ +#endif /* SCAL */ #if defined(PNG_FLOATING_POINT_SUPPORTED) && \ !defined(PNG_FIXED_POINT_MACRO_SUPPORTED) && \ @@ -3090,11 +3216,15 @@ png_fixed(png_const_structrp png_ptr, double fp, png_const_charp text) if (r > 2147483647. || r < -2147483648.) png_fixed_error(png_ptr, text); +# ifndef PNG_ERROR_TEXT_SUPPORTED + PNG_UNUSED(text) +# endif + return (png_fixed_point)r; } #endif -#if defined(PNG_READ_GAMMA_SUPPORTED) || \ +#if defined(PNG_GAMMA_SUPPORTED) || defined(PNG_COLORSPACE_SUPPORTED) ||\ defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED) /* muldiv functions */ /* This API takes signed arguments and rounds the result to the nearest @@ -3199,11 +3329,12 @@ png_muldiv(png_fixed_point_p res, png_fixed_point a, png_int_32 times, if (s00 >= (D >> 1)) ++result; - if (negative) + if (negative != 0) result = -result; /* Check for overflow. */ - if ((negative && result <= 0) || (!negative && result >= 0)) + if ((negative != 0 && result <= 0) || + (negative == 0 && result >= 0)) { *res = result; return 1; @@ -3227,7 +3358,7 @@ png_muldiv_warn(png_const_structrp png_ptr, png_fixed_point a, png_int_32 times, { png_fixed_point result; - if (png_muldiv(&result, a, times, divisor)) + if (png_muldiv(&result, a, times, divisor) != 0) return result; png_warning(png_ptr, "fixed point overflow ignored"); @@ -3248,7 +3379,7 @@ png_reciprocal(png_fixed_point a) #else png_fixed_point res; - if (png_muldiv(&res, 100000, 100000, a)) + if (png_muldiv(&res, 100000, 100000, a) != 0) return res; #endif @@ -3267,6 +3398,7 @@ png_gamma_significant(png_fixed_point gamma_val) #endif #ifdef PNG_READ_GAMMA_SUPPORTED +#ifdef PNG_16BIT_SUPPORTED /* A local convenience routine. */ static png_fixed_point png_product2(png_fixed_point a, png_fixed_point b) @@ -3282,12 +3414,13 @@ png_product2(png_fixed_point a, png_fixed_point b) #else png_fixed_point res; - if (png_muldiv(&res, a, b, 100000)) + if (png_muldiv(&res, a, b, 100000) != 0) return res; #endif return 0; /* overflow */ } +#endif /* 16BIT */ /* The inverse of the above. */ png_fixed_point @@ -3295,12 +3428,15 @@ png_reciprocal2(png_fixed_point a, png_fixed_point b) { /* The required result is 1/a * 1/b; the following preserves accuracy. */ #ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED - double r = 1E15/a; - r /= b; - r = floor(r+.5); + if (a != 0 && b != 0) + { + double r = 1E15/a; + r /= b; + r = floor(r+.5); - if (r <= 2147483647. && r >= -2147483648.) - return (png_fixed_point)r; + if (r <= 2147483647. && r >= -2147483648.) + return (png_fixed_point)r; + } #else /* This may overflow because the range of png_fixed_point isn't symmetric, * but this API is only used for the product of file and screen gamma so it @@ -3439,6 +3575,7 @@ png_log8bit(unsigned int x) * Zero (257): 0 * End (258): 23499 */ +#ifdef PNG_16BIT_SUPPORTED static png_int_32 png_log16bit(png_uint_32 x) { @@ -3489,14 +3626,15 @@ png_log16bit(png_uint_32 x) /* Safe, because the result can't have more than 20 bits: */ return (png_int_32)((lg2 + 2048) >> 12); } +#endif /* 16BIT */ /* The 'exp()' case must invert the above, taking a 20-bit fixed point * logarithmic value and returning a 16 or 8-bit number as appropriate. In * each case only the low 16 bits are relevant - the fraction - since the * integer bits (the top 4) simply determine a shift. * - * The worst case is the 16-bit distinction between 65535 and 65534, this - * requires perhaps spurious accuracty in the decoding of the logarithm to + * The worst case is the 16-bit distinction between 65535 and 65534. This + * requires perhaps spurious accuracy in the decoding of the logarithm to * distinguish log2(65535/65534.5) - 10^-5 or 17 bits. There is little chance * of getting this accuracy in practice. * @@ -3584,14 +3722,15 @@ png_exp8bit(png_fixed_point lg2) /* Get a 32-bit value: */ png_uint_32 x = png_exp(lg2); - /* Convert the 32-bit value to 0..255 by multiplying by 256-1, note that the + /* Convert the 32-bit value to 0..255 by multiplying by 256-1. Note that the * second, rounding, step can't overflow because of the first, subtraction, * step. */ x -= x >> 8; - return (png_byte)((x + 0x7fffffU) >> 24); + return (png_byte)(((x + 0x7fffffU) >> 24) & 0xff); } +#ifdef PNG_16BIT_SUPPORTED static png_uint_16 png_exp16bit(png_fixed_point lg2) { @@ -3602,6 +3741,7 @@ png_exp16bit(png_fixed_point lg2) x -= x >> 16; return (png_uint_16)((x + 32767U) >> 16); } +#endif /* 16BIT */ #endif /* FLOATING_ARITHMETIC */ png_byte @@ -3610,13 +3750,37 @@ png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma_val) if (value > 0 && value < 255) { # ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED - double r = floor(255*pow(value/255.,gamma_val*.00001)+.5); + /* 'value' is unsigned, ANSI-C90 requires the compiler to correctly + * convert this to a floating point value. This includes values that + * would overflow if 'value' were to be converted to 'int'. + * + * Apparently GCC, however, does an intermediate conversion to (int) + * on some (ARM) but not all (x86) platforms, possibly because of + * hardware FP limitations. (E.g. if the hardware conversion always + * assumes the integer register contains a signed value.) This results + * in ANSI-C undefined behavior for large values. + * + * Other implementations on the same machine might actually be ANSI-C90 + * conformant and therefore compile spurious extra code for the large + * values. + * + * We can be reasonably sure that an unsigned to float conversion + * won't be faster than an int to float one. Therefore this code + * assumes responsibility for the undefined behavior, which it knows + * can't happen because of the check above. + * + * Note the argument to this routine is an (unsigned int) because, on + * 16-bit platforms, it is assigned a value which might be out of + * range for an (int); that would result in undefined behavior in the + * caller if the *argument* ('value') were to be declared (int). + */ + double r = floor(255*pow((int)/*SAFE*/value/255.,gamma_val*.00001)+.5); return (png_byte)r; # else png_int_32 lg2 = png_log8bit(value); png_fixed_point res; - if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1)) + if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1) != 0) return png_exp8bit(res); /* Overflow. */ @@ -3624,22 +3788,29 @@ png_gamma_8bit_correct(unsigned int value, png_fixed_point gamma_val) # endif } - return (png_byte)value; + return (png_byte)(value & 0xff); } +#ifdef PNG_16BIT_SUPPORTED png_uint_16 png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma_val) { if (value > 0 && value < 65535) { # ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED - double r = floor(65535*pow(value/65535.,gamma_val*.00001)+.5); + /* The same (unsigned int)->(double) constraints apply here as above, + * however in this case the (unsigned int) to (int) conversion can + * overflow on an ANSI-C90 compliant system so the cast needs to ensure + * that this is not possible. + */ + double r = floor(65535*pow((png_int_32)value/65535., + gamma_val*.00001)+.5); return (png_uint_16)r; # else png_int_32 lg2 = png_log16bit(value); png_fixed_point res; - if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1)) + if (png_muldiv(&res, gamma_val, lg2, PNG_FP_1) != 0) return png_exp16bit(res); /* Overflow. */ @@ -3649,6 +3820,7 @@ png_gamma_16bit_correct(unsigned int value, png_fixed_point gamma_val) return (png_uint_16)value; } +#endif /* 16BIT */ /* This does the right thing based on the bit_depth field of the * png_struct, interpreting values as 8-bit or 16-bit. While the result @@ -3662,10 +3834,16 @@ png_gamma_correct(png_structrp png_ptr, unsigned int value, if (png_ptr->bit_depth == 8) return png_gamma_8bit_correct(value, gamma_val); +#ifdef PNG_16BIT_SUPPORTED else return png_gamma_16bit_correct(value, gamma_val); +#else + /* should not reach this */ + return 0; +#endif /* 16BIT */ } +#ifdef PNG_16BIT_SUPPORTED /* Internal function to build a single 16-bit table - the table consists of * 'num' 256 entry subtables, where 'num' is determined by 'shift' - the amount * to shift the input values right (or 16-number_of_signifiant_bits). @@ -3680,6 +3858,12 @@ png_build_16bit_table(png_structrp png_ptr, png_uint_16pp *ptable, { /* Various values derived from 'shift': */ PNG_CONST unsigned int num = 1U << (8U - shift); +#ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED + /* CSE the division and work round wacky GCC warnings (see the comments + * in png_gamma_8bit_correct for where these come from.) + */ + PNG_CONST double fmax = 1./(((png_int_32)1 << (16U - shift))-1); +#endif PNG_CONST unsigned int max = (1U << (16U - shift))-1U; PNG_CONST unsigned int max_by_2 = 1U << (15U-shift); unsigned int i; @@ -3695,7 +3879,7 @@ png_build_16bit_table(png_structrp png_ptr, png_uint_16pp *ptable, /* The 'threshold' test is repeated here because it can arise for one of * the 16-bit tables even if the others don't hit it. */ - if (png_gamma_significant(gamma_val)) + if (png_gamma_significant(gamma_val) != 0) { /* The old code would overflow at the end and this would cause the * 'pow' function to return a result >1, resulting in an @@ -3711,10 +3895,13 @@ png_build_16bit_table(png_structrp png_ptr, png_uint_16pp *ptable, png_uint_32 ig = (j << (8-shift)) + i; # ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED /* Inline the 'max' scaling operation: */ - double d = floor(65535*pow(ig/(double)max, gamma_val*.00001)+.5); + /* See png_gamma_8bit_correct for why the cast to (int) is + * required here. + */ + double d = floor(65535.*pow(ig*fmax, gamma_val*.00001)+.5); sub_table[j] = (png_uint_16)d; # else - if (shift) + if (shift != 0) ig = (ig * 65535U + max_by_2)/max; sub_table[j] = png_gamma_16bit_correct(ig, gamma_val); @@ -3730,7 +3917,7 @@ png_build_16bit_table(png_structrp png_ptr, png_uint_16pp *ptable, { png_uint_32 ig = (j << (8-shift)) + i; - if (shift) + if (shift != 0) ig = (ig * 65535U + max_by_2)/max; sub_table[j] = (png_uint_16)ig; @@ -3756,7 +3943,7 @@ png_build_16to8_table(png_structrp png_ptr, png_uint_16pp *ptable, /* 'num' is the number of tables and also the number of low bits of low * bits of the input 16-bit value used to select a table. Each table is - * itself index by the high 8 bits of the value. + * itself indexed by the high 8 bits of the value. */ for (i = 0; i < num; i++) table[i] = (png_uint_16p)png_malloc(png_ptr, @@ -3804,10 +3991,11 @@ png_build_16to8_table(png_structrp png_ptr, png_uint_16pp *ptable, last++; } } +#endif /* 16BIT */ /* Build a single 8-bit table: same as the 16-bit case but much simpler (and * typically much faster). Note that libpng currently does no sBIT processing - * (apparently contrary to the spec) so a 256 entry table is always generated. + * (apparently contrary to the spec) so a 256-entry table is always generated. */ static void png_build_8bit_table(png_structrp png_ptr, png_bytepp ptable, @@ -3816,11 +4004,13 @@ png_build_8bit_table(png_structrp png_ptr, png_bytepp ptable, unsigned int i; png_bytep table = *ptable = (png_bytep)png_malloc(png_ptr, 256); - if (png_gamma_significant(gamma_val)) for (i=0; i<256; i++) - table[i] = png_gamma_8bit_correct(i, gamma_val); + if (png_gamma_significant(gamma_val) != 0) + for (i=0; i<256; i++) + table[i] = png_gamma_8bit_correct(i, gamma_val); - else for (i=0; i<256; ++i) - table[i] = (png_byte)i; + else + for (i=0; i<256; ++i) + table[i] = (png_byte)(i & 0xff); } /* Used from png_read_destroy and below to release the memory used by the gamma @@ -3832,6 +4022,7 @@ png_destroy_gamma_table(png_structrp png_ptr) png_free(png_ptr, png_ptr->gamma_table); png_ptr->gamma_table = NULL; +#ifdef PNG_16BIT_SUPPORTED if (png_ptr->gamma_16_table != NULL) { int i; @@ -3843,6 +4034,7 @@ png_destroy_gamma_table(png_structrp png_ptr) png_free(png_ptr, png_ptr->gamma_16_table); png_ptr->gamma_16_table = NULL; } +#endif /* 16BIT */ #if defined(PNG_READ_BACKGROUND_SUPPORTED) || \ defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \ @@ -3852,6 +4044,7 @@ png_destroy_gamma_table(png_structrp png_ptr) png_free(png_ptr, png_ptr->gamma_to_1); png_ptr->gamma_to_1 = NULL; +#ifdef PNG_16BIT_SUPPORTED if (png_ptr->gamma_16_from_1 != NULL) { int i; @@ -3874,6 +4067,7 @@ png_destroy_gamma_table(png_structrp png_ptr) png_free(png_ptr, png_ptr->gamma_16_to_1); png_ptr->gamma_16_to_1 = NULL; } +#endif /* 16BIT */ #endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */ } @@ -3908,7 +4102,7 @@ png_build_gamma_table(png_structrp png_ptr, int bit_depth) #if defined(PNG_READ_BACKGROUND_SUPPORTED) || \ defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \ defined(PNG_READ_RGB_TO_GRAY_SUPPORTED) - if (png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) + if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0) { png_build_8bit_table(png_ptr, &png_ptr->gamma_to_1, png_reciprocal(png_ptr->colorspace.gamma)); @@ -3919,11 +4113,12 @@ png_build_gamma_table(png_structrp png_ptr, int bit_depth) } #endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */ } +#ifdef PNG_16BIT_SUPPORTED else { png_byte shift, sig_bit; - if (png_ptr->color_type & PNG_COLOR_MASK_COLOR) + if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0) { sig_bit = png_ptr->sig_bit.red; @@ -3943,7 +4138,7 @@ png_build_gamma_table(png_structrp png_ptr, int bit_depth) * Where 'iv' is the input color value and 'ov' is the output value - * pow(iv, gamma). * - * Thus the gamma table consists of up to 256 256 entry tables. The table + * Thus the gamma table consists of up to 256 256-entry tables. The table * is selected by the (8-gamma_shift) most significant of the low 8 bits of * the color value then indexed by the upper 8 bits: * @@ -3955,12 +4150,13 @@ png_build_gamma_table(png_structrp png_ptr, int bit_depth) * */ if (sig_bit > 0 && sig_bit < 16U) - shift = (png_byte)(16U - sig_bit); /* shift == insignificant bits */ + /* shift == insignificant bits */ + shift = (png_byte)((16U - sig_bit) & 0xff); else shift = 0; /* keep all 16 bits */ - if (png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) + if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0) { /* PNG_MAX_GAMMA_8 is the number of bits to keep - effectively * the significant bits in the *input* when the output will @@ -3975,29 +4171,25 @@ png_build_gamma_table(png_structrp png_ptr, int bit_depth) png_ptr->gamma_shift = shift; -#ifdef PNG_16BIT_SUPPORTED /* NOTE: prior to 1.5.4 this test used to include PNG_BACKGROUND (now * PNG_COMPOSE). This effectively smashed the background calculation for * 16-bit output because the 8-bit table assumes the result will be reduced * to 8 bits. */ - if (png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) -#endif + if ((png_ptr->transformations & (PNG_16_TO_8 | PNG_SCALE_16_TO_8)) != 0) png_build_16to8_table(png_ptr, &png_ptr->gamma_16_table, shift, png_ptr->screen_gamma > 0 ? png_product2(png_ptr->colorspace.gamma, png_ptr->screen_gamma) : PNG_FP_1); -#ifdef PNG_16BIT_SUPPORTED else png_build_16bit_table(png_ptr, &png_ptr->gamma_16_table, shift, png_ptr->screen_gamma > 0 ? png_reciprocal2(png_ptr->colorspace.gamma, png_ptr->screen_gamma) : PNG_FP_1); -#endif #if defined(PNG_READ_BACKGROUND_SUPPORTED) || \ defined(PNG_READ_ALPHA_MODE_SUPPORTED) || \ defined(PNG_READ_RGB_TO_GRAY_SUPPORTED) - if (png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) + if ((png_ptr->transformations & (PNG_COMPOSE | PNG_RGB_TO_GRAY)) != 0) { png_build_16bit_table(png_ptr, &png_ptr->gamma_16_to_1, shift, png_reciprocal(png_ptr->colorspace.gamma)); @@ -4012,10 +4204,11 @@ png_build_gamma_table(png_structrp png_ptr, int bit_depth) } #endif /* READ_BACKGROUND || READ_ALPHA_MODE || RGB_TO_GRAY */ } +#endif /* 16BIT */ } #endif /* READ_GAMMA */ -/* HARDWARE OPTION SUPPORT */ +/* HARDWARE OR SOFTWARE OPTION SUPPORT */ #ifdef PNG_SET_OPTION_SUPPORTED int PNGAPI png_set_option(png_structrp png_ptr, int option, int onoff) @@ -4027,7 +4220,7 @@ png_set_option(png_structrp png_ptr, int option, int onoff) int setting = (2 + (onoff != 0)) << option; int current = png_ptr->options; - png_ptr->options = (png_byte)((current & ~mask) | setting); + png_ptr->options = (png_byte)(((current & ~mask) | setting) & 0xff); return (current & mask) >> option; } @@ -4054,7 +4247,7 @@ png_set_option(png_structrp png_ptr, int option, int onoff) * * error: -0.513727 - 0.607759, 308 (0.469978%) of readings inexact * - * In all cases the inexact readings are off by one. + * In all cases the inexact readings are only off by one. */ #ifdef PNG_SIMPLIFIED_READ_SUPPORTED @@ -4094,8 +4287,7 @@ const png_uint_16 png_sRGB_table[256] = 57105,57646,58190,58737,59287,59840,60396,60955, 61517,62082,62650,63221,63795,64372,64952,65535 }; - -#endif /* simplified read only */ +#endif /* SIMPLIFIED_READ */ /* The base/delta tables are required for both read and write (but currently * only the simplified versions.) @@ -4223,7 +4415,7 @@ png_image_free_function(png_voidp argument) /* First free any data held in the control structure. */ # ifdef PNG_STDIO_SUPPORTED - if (cp->owned_file) + if (cp->owned_file != 0) { FILE *fp = png_voidcast(FILE*, cp->png_ptr->io_ptr); cp->owned_file = 0; @@ -4247,7 +4439,7 @@ png_image_free_function(png_voidp argument) png_free(c.png_ptr, cp); /* Then the structures, calling the correct API. */ - if (c.for_write) + if (c.for_write != 0) { # ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED png_destroy_write_struct(&c.png_ptr, &c.info_ptr); @@ -4295,4 +4487,4 @@ png_image_error(png_imagep image, png_const_charp error_message) } #endif /* SIMPLIFIED READ/WRITE */ -#endif /* defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) */ +#endif /* READ || WRITE */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/png.h b/3rdparty/libpng/png.h similarity index 94% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/png.h rename to 3rdparty/libpng/png.h index 0b5053fcff..372599bfb4 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/png.h +++ b/3rdparty/libpng/png.h @@ -1,8 +1,9 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.2 - April 25, 2013 - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * libpng version 1.6.17, March 26, 2015 + * + * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -11,7 +12,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.2 - April 25, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.17, March 26, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -175,6 +176,46 @@ * 1.6.2beta01 16 10602 16.so.16.2[.0] * 1.6.2rc01-06 16 10602 16.so.16.2[.0] * 1.6.2 16 10602 16.so.16.2[.0] + * 1.6.3beta01-11 16 10603 16.so.16.3[.0] + * 1.6.3rc01 16 10603 16.so.16.3[.0] + * 1.6.3 16 10603 16.so.16.3[.0] + * 1.6.4beta01-02 16 10604 16.so.16.4[.0] + * 1.6.4rc01 16 10604 16.so.16.4[.0] + * 1.6.4 16 10604 16.so.16.4[.0] + * 1.6.5 16 10605 16.so.16.5[.0] + * 1.6.6 16 10606 16.so.16.6[.0] + * 1.6.7beta01-04 16 10607 16.so.16.7[.0] + * 1.6.7rc01-03 16 10607 16.so.16.7[.0] + * 1.6.7 16 10607 16.so.16.7[.0] + * 1.6.8beta01-02 16 10608 16.so.16.8[.0] + * 1.6.8rc01-02 16 10608 16.so.16.8[.0] + * 1.6.8 16 10608 16.so.16.8[.0] + * 1.6.9beta01-04 16 10609 16.so.16.9[.0] + * 1.6.9rc01-02 16 10609 16.so.16.9[.0] + * 1.6.9 16 10609 16.so.16.9[.0] + * 1.6.10beta01-03 16 10610 16.so.16.10[.0] + * 1.6.10rc01-03 16 10610 16.so.16.10[.0] + * 1.6.10 16 10610 16.so.16.10[.0] + * 1.6.11beta01-06 16 10611 16.so.16.11[.0] + * 1.6.11rc01-02 16 10611 16.so.16.11[.0] + * 1.6.11 16 10611 16.so.16.11[.0] + * 1.6.12rc01-03 16 10612 16.so.16.12[.0] + * 1.6.12 16 10612 16.so.16.12[.0] + * 1.6.13beta01-04 16 10613 16.so.16.13[.0] + * 1.6.13rc01-02 16 10613 16.so.16.13[.0] + * 1.6.13 16 10613 16.so.16.13[.0] + * 1.6.14beta01-07 16 10614 16.so.16.14[.0] + * 1.6.14rc01-02 16 10614 16.so.16.14[.0] + * 1.6.14 16 10614 16.so.16.14[.0] + * 1.6.15beta01-08 16 10615 16.so.16.15[.0] + * 1.6.15rc01-03 16 10615 16.so.16.15[.0] + * 1.6.15 16 10615 16.so.16.15[.0] + * 1.6.16beta01-03 16 10616 16.so.16.16[.0] + * 1.6.16rc01-02 16 10616 16.so.16.16[.0] + * 1.6.16 16 10616 16.so.16.16[.0] + * 1.6.17beta01-06 16 10617 16.so.16.17[.0] + * 1.6.17rc01-06 16 10617 16.so.16.17[.0] + * 1.6.17 16 10617 16.so.16.17[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -206,8 +247,8 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.2, April 25, 2013, are - * Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are + * libpng versions 1.2.6, August 15, 2004, through 1.6.17, March 26, 2015, are + * Copyright (c) 2004, 2006-2015 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: * @@ -318,13 +359,13 @@ * Y2K compliance in libpng: * ========================= * - * April 25, 2013 + * March 26, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.2 are Y2K compliant. It is my belief that + * upward through 1.6.17 are Y2K compliant. It is my belief that * earlier versions were also Y2K compliant. * * Libpng only has two year fields. One is a 2-byte unsigned integer @@ -377,16 +418,18 @@ /* This is not the place to learn how to use libpng. The file libpng-manual.txt * describes how to use libpng, and the file example.c summarizes it * with some code on which to build. This file is useful for looking - * at the actual function definitions and structure components. + * at the actual function definitions and structure components. If that + * file has been stripped from your copy of libpng, you can find it at + * * * If you just need to read a PNG file and don't want to read the documentation * skip to the end of this file and read the section entitled 'simplified API'. */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.2" +#define PNG_LIBPNG_VER_STRING "1.6.17" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.2 - April 25, 2013\n" + " libpng version 1.6.17 - March 26, 2015\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -394,7 +437,7 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 6 -#define PNG_LIBPNG_VER_RELEASE 2 +#define PNG_LIBPNG_VER_RELEASE 17 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: @@ -425,7 +468,7 @@ * version 1.0.0 was mis-numbered 100 instead of 10000). From * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */ -#define PNG_LIBPNG_VER 10602 /* 1.6.2 */ +#define PNG_LIBPNG_VER 10617 /* 1.6.17 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -530,7 +573,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_6_2; +typedef char* png_libpng_version_1_6_17; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * @@ -712,7 +755,8 @@ typedef png_time * png_timep; typedef const png_time * png_const_timep; typedef png_time * * png_timepp; -#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED +#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) ||\ + defined(PNG_USER_CHUNKS_SUPPORTED) /* png_unknown_chunk is a structure to hold queued chunks for which there is * no specific support. The idea is that we can use this to queue * up private chunks for output even though the library doesn't actually @@ -1142,7 +1186,7 @@ PNG_EXPORT(24, void, png_convert_from_struct_tm, (png_timep ptime, /* Convert from time_t to png_time. Uses gmtime() */ PNG_EXPORT(25, void, png_convert_from_time_t, (png_timep ptime, time_t ttime)); -#endif /* PNG_CONVERT_tIME_SUPPORTED */ +#endif /* CONVERT_tIME */ #ifdef PNG_READ_EXPAND_SUPPORTED /* Expand data to 24-bit RGB, or 8-bit grayscale, with alpha if available. */ @@ -1191,9 +1235,9 @@ PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth, #endif #ifdef PNG_READ_ALPHA_MODE_SUPPORTED -/* How the alpha channel is interpreted - this affects how the color channels of - * a PNG file are returned when an alpha channel, or tRNS chunk in a palette - * file, is present. +/* How the alpha channel is interpreted - this affects how the color channels + * of a PNG file are returned to the calling application when an alpha channel, + * or a tRNS chunk in a palette file, is present. * * This has no effect on the way pixels are written into a PNG output * datastream. The color samples in a PNG datastream are never premultiplied @@ -1201,33 +1245,19 @@ PNG_EXPORT(35, void, png_build_grayscale_palette, (int bit_depth, * * The default is to return data according to the PNG specification: the alpha * channel is a linear measure of the contribution of the pixel to the - * corresponding composited pixel. The gamma encoded color channels must be - * scaled according to the contribution and to do this it is necessary to undo + * corresponding composited pixel, and the color channels are unassociated + * (not premultiplied). The gamma encoded color channels must be scaled + * according to the contribution and to do this it is necessary to undo * the encoding, scale the color values, perform the composition and reencode * the values. This is the 'PNG' mode. * * The alternative is to 'associate' the alpha with the color information by - * storing color channel values that have been scaled by the alpha. The - * advantage is that the color channels can be resampled (the image can be - * scaled) in this form. The disadvantage is that normal practice is to store - * linear, not (gamma) encoded, values and this requires 16-bit channels for - * still images rather than the 8-bit channels that are just about sufficient if - * gamma encoding is used. In addition all non-transparent pixel values, - * including completely opaque ones, must be gamma encoded to produce the final - * image. This is the 'STANDARD', 'ASSOCIATED' or 'PREMULTIPLIED' mode (the - * latter being the two common names for associated alpha color channels.) + * storing color channel values that have been scaled by the alpha. + * image. These are the 'STANDARD', 'ASSOCIATED' or 'PREMULTIPLIED' modes + * (the latter being the two common names for associated alpha color channels). * - * Since it is not necessary to perform arithmetic on opaque color values so - * long as they are not to be resampled and are in the final color space it is - * possible to optimize the handling of alpha by storing the opaque pixels in - * the PNG format (adjusted for the output color space) while storing partially - * opaque pixels in the standard, linear, format. The accuracy required for - * standard alpha composition is relatively low, because the pixels are - * isolated, therefore typically the accuracy loss in storing 8-bit linear - * values is acceptable. (This is not true if the alpha channel is used to - * simulate transparency over large areas - use 16 bits or the PNG mode in - * this case!) This is the 'OPTIMIZED' mode. For this mode a pixel is - * treated as opaque only if the alpha value is equal to the maximum value. + * For the 'OPTIMIZED' mode, a pixel is treated as opaque only if the alpha + * value is equal to the maximum value. * * The final choice is to gamma encode the alpha channel as well. This is * broken because, in practice, no implementation that uses this choice @@ -1254,68 +1284,7 @@ PNG_FIXED_EXPORT(228, void, png_set_alpha_mode_fixed, (png_structrp png_ptr, #if defined(PNG_GAMMA_SUPPORTED) || defined(PNG_READ_ALPHA_MODE_SUPPORTED) /* The output_gamma value is a screen gamma in libpng terminology: it expresses - * how to decode the output values, not how they are encoded. The values used - * correspond to the normal numbers used to describe the overall gamma of a - * computer display system; for example 2.2 for an sRGB conformant system. The - * values are scaled by 100000 in the _fixed version of the API (so 220000 for - * sRGB.) - * - * The inverse of the value is always used to provide a default for the PNG file - * encoding if it has no gAMA chunk and if png_set_gamma() has not been called - * to override the PNG gamma information. - * - * When the ALPHA_OPTIMIZED mode is selected the output gamma is used to encode - * opaque pixels however pixels with lower alpha values are not encoded, - * regardless of the output gamma setting. - * - * When the standard Porter Duff handling is requested with mode 1 the output - * encoding is set to be linear and the output_gamma value is only relevant - * as a default for input data that has no gamma information. The linear output - * encoding will be overridden if png_set_gamma() is called - the results may be - * highly unexpected! - * - * The following numbers are derived from the sRGB standard and the research - * behind it. sRGB is defined to be approximated by a PNG gAMA chunk value of - * 0.45455 (1/2.2) for PNG. The value implicitly includes any viewing - * correction required to take account of any differences in the color - * environment of the original scene and the intended display environment; the - * value expresses how to *decode* the image for display, not how the original - * data was *encoded*. - * - * sRGB provides a peg for the PNG standard by defining a viewing environment. - * sRGB itself, and earlier TV standards, actually use a more complex transform - * (a linear portion then a gamma 2.4 power law) than PNG can express. (PNG is - * limited to simple power laws.) By saying that an image for direct display on - * an sRGB conformant system should be stored with a gAMA chunk value of 45455 - * (11.3.3.2 and 11.3.3.5 of the ISO PNG specification) the PNG specification - * makes it possible to derive values for other display systems and - * environments. - * - * The Mac value is deduced from the sRGB based on an assumption that the actual - * extra viewing correction used in early Mac display systems was implemented as - * a power 1.45 lookup table. - * - * Any system where a programmable lookup table is used or where the behavior of - * the final display device characteristics can be changed requires system - * specific code to obtain the current characteristic. However this can be - * difficult and most PNG gamma correction only requires an approximate value. - * - * By default, if png_set_alpha_mode() is not called, libpng assumes that all - * values are unencoded, linear, values and that the output device also has a - * linear characteristic. This is only very rarely correct - it is invariably - * better to call png_set_alpha_mode() with PNG_DEFAULT_sRGB than rely on the - * default if you don't know what the right answer is! - * - * The special value PNG_GAMMA_MAC_18 indicates an older Mac system (pre Mac OS - * 10.6) which used a correction table to implement a somewhat lower gamma on an - * otherwise sRGB system. - * - * Both these values are reserved (not simple gamma values) in order to allow - * more precise correction internally in the future. - * - * NOTE: the following values can be passed to either the fixed or floating - * point APIs, but the floating point API will also accept floating point - * values. + * how to decode the output values, not how they are encoded. */ #define PNG_DEFAULT_sRGB -1 /* sRGB gamma and color space */ #define PNG_GAMMA_MAC_18 -2 /* Old Mac '1.8' gamma and color space */ @@ -1423,7 +1392,7 @@ PNG_EXPORT(39, void, png_set_filler, (png_structrp png_ptr, png_uint_32 filler, /* Add an alpha byte to 8-bit Gray or 24-bit RGB images. */ PNG_EXPORT(40, void, png_set_add_alpha, (png_structrp png_ptr, png_uint_32 filler, int flags)); -#endif /* PNG_READ_FILLER_SUPPORTED || PNG_WRITE_FILLER_SUPPORTED */ +#endif /* READ_FILLER || WRITE_FILLER */ #if defined(PNG_READ_SWAP_SUPPORTED) || defined(PNG_WRITE_SWAP_SUPPORTED) /* Swap bytes in 16-bit depth files. */ @@ -1613,6 +1582,7 @@ PNG_EXPORT(66, void, png_set_crc_action, (png_structrp png_ptr, int crit_action, #define PNG_CRC_QUIET_USE 4 /* quiet/use data quiet/use data */ #define PNG_CRC_NO_CHANGE 5 /* use current value use current value */ +#ifdef PNG_WRITE_SUPPORTED /* These functions give the user control over the scan-line filtering in * libpng and the compression methods used by zlib. These functions are * mainly useful for testing, as the defaults should work with most users. @@ -1626,6 +1596,7 @@ PNG_EXPORT(66, void, png_set_crc_action, (png_structrp png_ptr, int crit_action, */ PNG_EXPORT(67, void, png_set_filter, (png_structrp png_ptr, int method, int filters)); +#endif /* WRITE */ /* Flags for png_set_filter() to say which filters to use. The flags * are chosen so that they don't conflict with real filter types @@ -1651,6 +1622,7 @@ PNG_EXPORT(67, void, png_set_filter, (png_structrp png_ptr, int method, #define PNG_FILTER_VALUE_PAETH 4 #define PNG_FILTER_VALUE_LAST 5 +#ifdef PNG_WRITE_SUPPORTED #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED /* EXPERIMENTAL */ /* The "heuristic_method" is given by one of the PNG_FILTER_HEURISTIC_ * defines, either the default (minimum-sum-of-absolute-differences), or @@ -1687,7 +1659,7 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed, (png_structrp png_ptr, int heuristic_method, int num_weights, png_const_fixed_point_p filter_weights, png_const_fixed_point_p filter_costs)) -#endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */ +#endif /* WRITE_WEIGHTED_FILTER */ /* Heuristic used for row filter selection. These defines should NOT be * changed. @@ -1697,7 +1669,6 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed, #define PNG_FILTER_HEURISTIC_WEIGHTED 2 /* Experimental feature */ #define PNG_FILTER_HEURISTIC_LAST 3 /* Not a valid value */ -#ifdef PNG_WRITE_SUPPORTED /* Set the library compression level. Currently, valid values range from * 0 - 9, corresponding directly to the zlib compression levels 0 - 9 * (0 - no compression, 9 - "maximal" compression). Note that tests have @@ -1705,6 +1676,7 @@ PNG_FIXED_EXPORT(209, void, png_set_filter_heuristics_fixed, * for PNG images, and do considerably fewer caclulations. In the future, * these values may not correspond directly to the zlib compression levels. */ +#ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED PNG_EXPORT(69, void, png_set_compression_level, (png_structrp png_ptr, int level)); @@ -1722,7 +1694,7 @@ PNG_EXPORT(72, void, png_set_compression_window_bits, (png_structrp png_ptr, PNG_EXPORT(73, void, png_set_compression_method, (png_structrp png_ptr, int method)); -#endif +#endif /* WRITE_CUSTOMIZE_COMPRESSION */ #ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED /* Also set zlib parameters for compressing non-IDAT chunks */ @@ -1743,7 +1715,8 @@ PNG_EXPORT(225, void, png_set_text_compression_window_bits, PNG_EXPORT(226, void, png_set_text_compression_method, (png_structrp png_ptr, int method)); -#endif /* PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED */ +#endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */ +#endif /* WRITE */ /* These next functions are called for input/output, memory, and error * handling. They are in the file pngrio.c, pngwio.c, and pngerror.c, @@ -1854,7 +1827,7 @@ PNG_EXPORT(218, png_byte, png_get_current_pass_number, (png_const_structrp)); * * The integer return from the callback function is interpreted thus: * - * negative: An error occured, png_chunk_error will be called. + * negative: An error occurred; png_chunk_error will be called. * zero: The chunk was not handled, the chunk will be saved. A critical * chunk will cause an error at this point unless it is to be saved. * positive: The chunk was handled, libpng will ignore/discard it. @@ -1903,7 +1876,6 @@ PNG_EXPORT(219, png_size_t, png_process_data_pause, (png_structrp, int save)); */ PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp)); -#ifdef PNG_READ_INTERLACING_SUPPORTED /* Function that combines rows. 'new_row' is a flag that should come from * the callback and be non-NULL if anything needs to be done; the library * stores its own version of the new data internally and ignores the passed @@ -1911,8 +1883,7 @@ PNG_EXPORT(220, png_uint_32, png_process_data_skip, (png_structrp)); */ PNG_EXPORT(93, void, png_progressive_combine_row, (png_const_structrp png_ptr, png_bytep old_row, png_const_bytep new_row)); -#endif /* PNG_READ_INTERLACING_SUPPORTED */ -#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PROGRESSIVE_READ */ PNG_EXPORTA(94, png_voidp, png_malloc, (png_const_structrp png_ptr, png_alloc_size_t size), PNG_ALLOCATED); @@ -1938,8 +1909,8 @@ PNG_EXPORT(98, void, png_free_data, (png_const_structrp png_ptr, * It is unlikely that this function works correctly as of 1.6.0 and using it * may result either in memory leaks or double free of allocated data. */ -PNG_EXPORTA(99, void, png_data_freer, (png_const_structrp png_ptr, - png_inforp info_ptr, int freer, png_uint_32 mask), PNG_DEPRECATED); +PNG_EXPORT(99, void, png_data_freer, (png_const_structrp png_ptr, + png_inforp info_ptr, int freer, png_uint_32 mask)); /* Assignments for png_data_freer */ #define PNG_DESTROY_WILL_FREE_DATA 1 @@ -1981,6 +1952,8 @@ PNG_EXPORTA(103, void, png_chunk_error, (png_const_structrp png_ptr, #else /* Fatal error in PNG image of libpng - can't continue */ PNG_EXPORTA(104, void, png_err, (png_const_structrp png_ptr), PNG_NORETURN); +# define png_error(s1,s2) png_err(s1) +# define png_chunk_error(s1,s2) png_err(s1) #endif #ifdef PNG_WARNINGS_SUPPORTED @@ -1991,6 +1964,9 @@ PNG_EXPORT(105, void, png_warning, (png_const_structrp png_ptr, /* Non-fatal error in libpng, chunk name is prepended to message. */ PNG_EXPORT(106, void, png_chunk_warning, (png_const_structrp png_ptr, png_const_charp warning_message)); +#else +# define png_warning(s1,s2) ((void)(s1)) +# define png_chunk_warning(s1,s2) ((void)(s1)) #endif #ifdef PNG_BENIGN_ERRORS_SUPPORTED @@ -2108,7 +2084,7 @@ PNG_EXPORT(128, png_int_32, png_get_x_offset_microns, PNG_EXPORT(129, png_int_32, png_get_y_offset_microns, (png_const_structrp png_ptr, png_const_inforp info_ptr)); -#endif /* PNG_EASY_ACCESS_SUPPORTED */ +#endif /* EASY_ACCESS */ #ifdef PNG_READ_SUPPORTED /* Returns pointer to signature string read from PNG header */ @@ -2360,7 +2336,7 @@ PNG_FIXED_EXPORT(213, void, png_set_sCAL_fixed, (png_const_structrp png_ptr, PNG_EXPORT(171, void, png_set_sCAL_s, (png_const_structrp png_ptr, png_inforp info_ptr, int unit, png_const_charp swidth, png_const_charp sheight)); -#endif /* PNG_sCAL_SUPPORTED */ +#endif /* sCAL */ #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED /* Provide the default handling for all unknown chunks or, optionally, for @@ -2501,11 +2477,15 @@ PNG_EXPORT(177, void, png_set_invalid, (png_const_structrp png_ptr, #ifdef PNG_INFO_IMAGE_SUPPORTED /* The "params" pointer is currently not used and is for future expansion. */ +#ifdef PNG_SEQUENTIAL_READ_SUPPORTED PNG_EXPORT(178, void, png_read_png, (png_structrp png_ptr, png_inforp info_ptr, int transforms, png_voidp params)); +#endif +#ifdef PNG_WRITE_SUPPORTED PNG_EXPORT(179, void, png_write_png, (png_structrp png_ptr, png_inforp info_ptr, int transforms, png_voidp params)); #endif +#endif PNG_EXPORT(180, png_const_charp, png_get_copyright, (png_const_structrp png_ptr)); @@ -2584,8 +2564,8 @@ PNG_FIXED_EXPORT(212, png_fixed_point, png_get_y_offset_inches_fixed, PNG_EXPORT(198, png_uint_32, png_get_pHYs_dpi, (png_const_structrp png_ptr, png_const_inforp info_ptr, png_uint_32 *res_x, png_uint_32 *res_y, int *unit_type)); -# endif /* PNG_pHYs_SUPPORTED */ -#endif /* PNG_INCH_CONVERSIONS_SUPPORTED */ +# endif /* pHYs */ +#endif /* INCH_CONVERSIONS */ /* Added in libpng-1.4.0 */ #ifdef PNG_IO_STATE_SUPPORTED @@ -2608,7 +2588,7 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type, # define PNG_IO_CHUNK_CRC 0x0080 /* currently at the chunk crc */ # define PNG_IO_MASK_OP 0x000f /* current operation: reading/writing */ # define PNG_IO_MASK_LOC 0x00f0 /* current location: sig/hdr/data/crc */ -#endif /* ?PNG_IO_STATE_SUPPORTED */ +#endif /* IO_STATE */ /* Interlace support. The following macros are always defined so that if * libpng interlace handling is turned off the macros may be used to handle @@ -2692,27 +2672,29 @@ PNG_EXPORT(216, png_uint_32, png_get_io_chunk_type, * (png_uint_16)(alpha) \ + (png_uint_16)(bg)*(png_uint_16)(255 \ - (png_uint_16)(alpha)) + 128); \ - (composite) = (png_byte)((temp + (temp >> 8)) >> 8); } + (composite) = (png_byte)(((temp + (temp >> 8)) >> 8) & 0xff); } # define png_composite_16(composite, fg, alpha, bg) \ { png_uint_32 temp = (png_uint_32)((png_uint_32)(fg) \ * (png_uint_32)(alpha) \ + (png_uint_32)(bg)*(65535 \ - (png_uint_32)(alpha)) + 32768); \ - (composite) = (png_uint_16)((temp + (temp >> 16)) >> 16); } + (composite) = (png_uint_16)(0xffff & ((temp + (temp >> 16)) >> 16)); } #else /* Standard method using integer division */ -# define png_composite(composite, fg, alpha, bg) \ - (composite) = (png_byte)(((png_uint_16)(fg) * (png_uint_16)(alpha) + \ - (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) + \ - 127) / 255) +# define png_composite(composite, fg, alpha, bg) \ + (composite) = \ + (png_byte)(0xff & (((png_uint_16)(fg) * (png_uint_16)(alpha) + \ + (png_uint_16)(bg) * (png_uint_16)(255 - (png_uint_16)(alpha)) + \ + 127) / 255)) # define png_composite_16(composite, fg, alpha, bg) \ - (composite) = (png_uint_16)(((png_uint_32)(fg) * (png_uint_32)(alpha) + \ - (png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) + \ - 32767) / 65535) -#endif /* PNG_READ_COMPOSITE_NODIV_SUPPORTED */ + (composite) = \ + (png_uint_16)(0xffff & (((png_uint_32)(fg) * (png_uint_32)(alpha) + \ + (png_uint_32)(bg)*(png_uint_32)(65535 - (png_uint_32)(alpha)) + \ + 32767) / 65535)) +#endif /* READ_COMPOSITE_NODIV */ #ifdef PNG_READ_INT_FUNCTIONS_SUPPORTED PNG_EXPORT(201, png_uint_32, png_get_uint_32, (png_const_bytep buf)); @@ -2782,6 +2764,8 @@ PNG_EXPORT(207, void, png_save_uint_16, (png_bytep buf, unsigned int i)); # endif #endif +#if defined(PNG_SIMPLIFIED_READ_SUPPORTED) || \ + defined(PNG_SIMPLIFIED_WRITE_SUPPORTED) /******************************************************************************* * SIMPLIFIED API ******************************************************************************* @@ -2853,7 +2837,7 @@ typedef struct # define PNG_IMAGE_WARNING 1 # define PNG_IMAGE_ERROR 2 /* - * The result is a two bit code such that a value more than 1 indicates + * The result is a two-bit code such that a value more than 1 indicates * a failure in the API just called: * * 0 - no warning or error @@ -3138,7 +3122,7 @@ PNG_EXPORT(234, int, png_image_begin_read_from_file, (png_imagep image, PNG_EXPORT(235, int, png_image_begin_read_from_stdio, (png_imagep image, FILE* file)); /* The PNG header is read from the stdio FILE object. */ -#endif /* PNG_STDIO_SUPPORTED */ +#endif /* STDIO */ PNG_EXPORT(236, int, png_image_begin_read_from_memory, (png_imagep image, png_const_voidp memory, png_size_t size)); @@ -3183,9 +3167,10 @@ PNG_EXPORT(238, void, png_image_free, (png_imagep image)); /* Free any data allocated by libpng in image->opaque, setting the pointer to * NULL. May be called at any time after the structure is initialized. */ -#endif /* PNG_SIMPLIFIED_READ_SUPPORTED */ +#endif /* SIMPLIFIED_READ */ #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED +#ifdef PNG_STDIO_SUPPORTED /* WRITE APIS * ---------- * For write you must initialize a png_image structure to describe the image to @@ -3228,10 +3213,12 @@ PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file, * * Note that the write API does not support interlacing or sub-8-bit pixels. */ -#endif /* PNG_SIMPLIFIED_WRITE_SUPPORTED */ +#endif /* STDIO */ +#endif /* SIMPLIFIED_WRITE */ /******************************************************************************* * END OF SIMPLIFIED API ******************************************************************************/ +#endif /* SIMPLIFIED_{READ|WRITE} */ #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED PNG_EXPORT(242, void, png_set_check_for_invalid_index, @@ -3267,7 +3254,9 @@ PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr, #ifdef PNG_ARM_NEON_API_SUPPORTED # define PNG_ARM_NEON 0 /* HARDWARE: ARM Neon SIMD instructions supported */ #endif -#define PNG_OPTION_NEXT 2 /* Next option - numbers must be even */ +#define PNG_MAXIMUM_INFLATE_WINDOW 2 /* SOFTWARE: force maximum window */ +#define PNG_SKIP_sRGB_CHECK_PROFILE 4 /* SOFTWARE: Check ICC profile for sRGB */ +#define PNG_OPTION_NEXT 6 /* Next option - numbers must be even */ /* Return values: NOTE: there are four values and 'off' is *not* zero */ #define PNG_OPTION_UNSET 0 /* Unset - defaults to off */ @@ -3277,19 +3266,18 @@ PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr, PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option, int onoff)); -#endif +#endif /* SET_OPTION */ /******************************************************************************* - * END OF HARDWARE OPTIONS + * END OF HARDWARE AND SOFTWARE OPTIONS ******************************************************************************/ -/* Maintainer: Put new public prototypes here ^, in libpng.3, and project - * defs, scripts/pnglibconf.h, and scripts/pnglibconf.h.prebuilt +/* Maintainer: Put new public prototypes here ^, in libpng.3, in project + * defs, and in scripts/symbols.def. */ /* The last ordinal number (this is the *last* one already used; the next - * one to use is one more than this.) Maintainer, remember to add an entry to - * scripts/symbols.def as well. + * one to use is one more than this.) */ #ifdef PNG_EXPORT_LAST_ORDINAL PNG_EXPORT_LAST_ORDINAL(244); diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngbar.jpg b/3rdparty/libpng/pngbar.jpg similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngbar.jpg rename to 3rdparty/libpng/pngbar.jpg diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngbar.png b/3rdparty/libpng/pngbar.png similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngbar.png rename to 3rdparty/libpng/pngbar.png diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngconf.h b/3rdparty/libpng/pngconf.h similarity index 93% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngconf.h rename to 3rdparty/libpng/pngconf.h index 31f996757b..3f9493e438 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngconf.h +++ b/3rdparty/libpng/pngconf.h @@ -1,9 +1,9 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.2 - April 25, 2013 + * libpng version 1.6.17, March 26, 2015 * - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -11,9 +11,7 @@ * For conditions of distribution and use, see the disclaimer * and license in png.h * - */ - -/* Any machine specific code is near the front of this file, so if you + * Any machine specific code is near the front of this file, so if you * are configuring libpng for a machine, you may want to read the section * starting here down to where it starts to typedef png_color, png_text, * and png_info. @@ -22,26 +20,6 @@ #ifndef PNGCONF_H #define PNGCONF_H -/* To do: Do all of this in scripts/pnglibconf.dfa */ -#ifdef PNG_SAFE_LIMITS_SUPPORTED -# ifdef PNG_USER_WIDTH_MAX -# undef PNG_USER_WIDTH_MAX -# define PNG_USER_WIDTH_MAX 1000000L -# endif -# ifdef PNG_USER_HEIGHT_MAX -# undef PNG_USER_HEIGHT_MAX -# define PNG_USER_HEIGHT_MAX 1000000L -# endif -# ifdef PNG_USER_CHUNK_MALLOC_MAX -# undef PNG_USER_CHUNK_MALLOC_MAX -# define PNG_USER_CHUNK_MALLOC_MAX 4000000L -# endif -# ifdef PNG_USER_CHUNK_CACHE_MAX -# undef PNG_USER_CHUNK_CACHE_MAX -# define PNG_USER_CHUNK_CACHE_MAX 128 -# endif -#endif - #ifndef PNG_BUILDING_SYMBOL_TABLE /* else includes may cause problems */ /* From libpng 1.6.0 libpng requires an ANSI X3.159-1989 ("ISOC90") compliant C @@ -238,6 +216,7 @@ # define PNGAPI _stdcall # endif # endif /* compiler/api */ + /* NOTE: PNGCBAPI always defaults to PNGCAPI. */ # if defined(PNGAPI) && !defined(PNG_USER_PRIVATEBUILD) @@ -360,7 +339,33 @@ * version 1.2.41. Disabling these removes the warnings but may also produce * less efficient code. */ -# if defined(__GNUC__) +# if defined(__clang__) && defined(__has_attribute) + /* Clang defines both __clang__ and __GNUC__. Check __clang__ first. */ +# if !defined(PNG_USE_RESULT) && __has_attribute(__warn_unused_result__) +# define PNG_USE_RESULT __attribute__((__warn_unused_result__)) +# endif +# if !defined(PNG_NORETURN) && __has_attribute(__noreturn__) +# define PNG_NORETURN __attribute__((__noreturn__)) +# endif +# if !defined(PNG_ALLOCATED) && __has_attribute(__malloc__) +# define PNG_ALLOCATED __attribute__((__malloc__)) +# endif +# if !defined(PNG_DEPRECATED) && __has_attribute(__deprecated__) +# define PNG_DEPRECATED __attribute__((__deprecated__)) +# endif +# if !defined(PNG_PRIVATE) +# ifdef __has_extension +# if __has_extension(attribute_unavailable_with_message) +# define PNG_PRIVATE __attribute__((__unavailable__(\ + "This function is not exported by libpng."))) +# endif +# endif +# endif +# ifndef PNG_RESTRICT +# define PNG_RESTRICT __restrict +# endif + +# elif defined(__GNUC__) # ifndef PNG_USE_RESULT # define PNG_USE_RESULT __attribute__((__warn_unused_result__)) # endif @@ -383,12 +388,12 @@ __attribute__((__deprecated__)) # endif # endif -# if ((__GNUC__ != 3) || !defined(__GNUC_MINOR__) || (__GNUC_MINOR__ >= 1)) +# if ((__GNUC__ > 3) || !defined(__GNUC_MINOR__) || (__GNUC_MINOR__ >= 1)) # ifndef PNG_RESTRICT # define PNG_RESTRICT __restrict # endif -# endif /* __GNUC__ == 3.0 */ -# endif /* __GNUC__ >= 3 */ +# endif /* __GNUC__.__GNUC_MINOR__ > 3.0 */ +# endif /* __GNUC__ >= 3 */ # elif defined(_MSC_VER) && (_MSC_VER >= 1300) # ifndef PNG_USE_RESULT @@ -418,7 +423,7 @@ # ifndef PNG_RESTRICT # define PNG_RESTRICT __restrict # endif -# endif /* _MSC_VER */ +# endif #endif /* PNG_PEDANTIC_WARNINGS */ #ifndef PNG_DEPRECATED @@ -439,6 +444,7 @@ #ifndef PNG_RESTRICT # define PNG_RESTRICT /* The C99 "restrict" feature */ #endif + #ifndef PNG_FP_EXPORT /* A floating point API. */ # ifdef PNG_FLOATING_POINT_SUPPORTED # define PNG_FP_EXPORT(ordinal, type, name, args)\ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngdebug.h b/3rdparty/libpng/pngdebug.h similarity index 87% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngdebug.h rename to 3rdparty/libpng/pngdebug.h index 16f81fdd14..6a01b106ed 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngdebug.h +++ b/3rdparty/libpng/pngdebug.h @@ -1,12 +1,11 @@ /* pngdebug.h - Debugging macros for libpng, also used in pngtest.c * - * Copyright (c) 1998-2011 Glenn Randers-Pehrson + * Last changed in libpng 1.6.8 [December 19, 2013] + * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * Last changed in libpng 1.5.0 [January 6, 2011] - * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer * and license in png.h @@ -25,7 +24,7 @@ * (actually ((void)0)). * * level: level of detail of message, starting at 0. A level 'n' - * message is preceded by 'n' tab characters (not implemented + * message is preceded by 'n' 3-space indentations (not implemented * on Microsoft compilers unless PNG_DEBUG_FILE is also * defined, to allow debug DLL compilation with no standard IO). * message: a printf(3) style text string. A trailing '\n' is added @@ -77,32 +76,29 @@ # endif /* PNG_DEBUG_FILE */ # if (PNG_DEBUG > 1) -/* Note: ["%s"m PNG_STRING_NEWLINE] probably does not work on - * non-ISO compilers - */ # ifdef __STDC__ # ifndef png_debug # define png_debug(l,m) \ do { \ int num_tabs=l; \ - fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \ - (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":"")))); \ + fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? " " : \ + (num_tabs==2 ? " " : (num_tabs>2 ? " " : "")))); \ } while (0) # endif # ifndef png_debug1 # define png_debug1(l,m,p1) \ do { \ int num_tabs=l; \ - fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \ - (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1); \ + fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? " " : \ + (num_tabs==2 ? " " : (num_tabs>2 ? " " : ""))),p1); \ } while (0) # endif # ifndef png_debug2 # define png_debug2(l,m,p1,p2) \ do { \ int num_tabs=l; \ - fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \ - (num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1,p2); \ + fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? " " : \ + (num_tabs==2 ? " " : (num_tabs>2 ? " " : ""))),p1,p2);\ } while (0) # endif # else /* __STDC __ */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngerror.c b/3rdparty/libpng/pngerror.c similarity index 91% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngerror.c rename to 3rdparty/libpng/pngerror.c index f469206ee4..0781866a89 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngerror.c +++ b/3rdparty/libpng/pngerror.c @@ -1,8 +1,8 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.6.1 [March 28, 2013] - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.15 [November 20, 2014] + * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -27,7 +27,7 @@ static PNG_FUNCTION(void, png_default_error,PNGARG((png_const_structrp png_ptr, static void /* PRIVATE */ png_default_warning PNGARG((png_const_structrp png_ptr, png_const_charp warning_message)); -#endif /* PNG_WARNINGS_SUPPORTED */ +#endif /* WARNINGS */ /* This function is called whenever there is a fatal error. This function * should not be changed. If there is a need to handle errors differently, @@ -43,8 +43,8 @@ png_error,(png_const_structrp png_ptr, png_const_charp error_message), char msg[16]; if (png_ptr != NULL) { - if (png_ptr->flags& - (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) + if ((png_ptr->flags & + (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0 { if (*error_message == PNG_LITERAL_SHARP) { @@ -54,7 +54,7 @@ png_error,(png_const_structrp png_ptr, png_const_charp error_message), if (error_message[offset] == ' ') break; - if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT) + if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0) { int i; for (i = 0; i < offset - 1; i++) @@ -69,7 +69,7 @@ png_error,(png_const_structrp png_ptr, png_const_charp error_message), else { - if (png_ptr->flags&PNG_FLAG_STRIP_ERROR_TEXT) + if ((png_ptr->flags & PNG_FLAG_STRIP_ERROR_TEXT) != 0) { msg[0] = '0'; msg[1] = '\0'; @@ -103,7 +103,7 @@ png_err,(png_const_structrp png_ptr),PNG_NORETURN) use the default handler, which will not return. */ png_default_error(png_ptr, ""); } -#endif /* PNG_ERROR_TEXT_SUPPORTED */ +#endif /* ERROR_TEXT */ /* Utility to safely appends strings to a buffer. This never errors out so * error checking is not required in the caller. @@ -152,7 +152,7 @@ png_format_number(png_const_charp start, png_charp end, int format, case PNG_NUMBER_FORMAT_fixed: /* Needs five digits (the fraction) */ mincount = 5; - if (output || number % 10 != 0) + if (output != 0 || number % 10 != 0) { *--end = digits[number % 10]; output = 1; @@ -189,13 +189,13 @@ png_format_number(png_const_charp start, png_charp end, int format, ++count; /* Float a fixed number here: */ - if (format == PNG_NUMBER_FORMAT_fixed) if (count == 5) if (end > start) + if ((format == PNG_NUMBER_FORMAT_fixed) && (count == 5) && (end > start)) { /* End of the fraction, but maybe nothing was output? In that case * drop the decimal point. If the number is a true zero handle that * here. */ - if (output) + if (output != 0) *--end = '.'; else if (number == 0) /* and !output */ *--end = '0'; @@ -219,8 +219,8 @@ png_warning(png_const_structrp png_ptr, png_const_charp warning_message) if (png_ptr != NULL) { #ifdef PNG_ERROR_NUMBERS_SUPPORTED - if (png_ptr->flags& - (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) + if ((png_ptr->flags & + (PNG_FLAG_STRIP_ERROR_NUMBERS|PNG_FLAG_STRIP_ERROR_TEXT)) != 0) #endif { if (*warning_message == PNG_LITERAL_SHARP) @@ -355,13 +355,13 @@ png_formatted_warning(png_const_structrp png_ptr, png_warning_parameters p, */ png_warning(png_ptr, msg); } -#endif /* PNG_WARNINGS_SUPPORTED */ +#endif /* WARNINGS */ #ifdef PNG_BENIGN_ERRORS_SUPPORTED void PNGAPI png_benign_error(png_const_structrp png_ptr, png_const_charp error_message) { - if (png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN) + if ((png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN) != 0) { # ifdef PNG_READ_SUPPORTED if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0 && @@ -382,31 +382,46 @@ png_benign_error(png_const_structrp png_ptr, png_const_charp error_message) # endif png_error(png_ptr, error_message); } + +# ifndef PNG_ERROR_TEXT_SUPPORTED + PNG_UNUSED(error_message) +# endif } void /* PRIVATE */ png_app_warning(png_const_structrp png_ptr, png_const_charp error_message) { - if (png_ptr->flags & PNG_FLAG_APP_WARNINGS_WARN) + if ((png_ptr->flags & PNG_FLAG_APP_WARNINGS_WARN) != 0) png_warning(png_ptr, error_message); else png_error(png_ptr, error_message); + +# ifndef PNG_ERROR_TEXT_SUPPORTED + PNG_UNUSED(error_message) +# endif } void /* PRIVATE */ png_app_error(png_const_structrp png_ptr, png_const_charp error_message) { - if (png_ptr->flags & PNG_FLAG_APP_ERRORS_WARN) + if ((png_ptr->flags & PNG_FLAG_APP_ERRORS_WARN) != 0) png_warning(png_ptr, error_message); else png_error(png_ptr, error_message); + +# ifndef PNG_ERROR_TEXT_SUPPORTED + PNG_UNUSED(error_message) +# endif } #endif /* BENIGN_ERRORS */ +#define PNG_MAX_ERROR_TEXT 196 /* Currently limited by profile_error in png.c */ +#if defined(PNG_WARNINGS_SUPPORTED) || \ + (defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED)) /* These utilities are used internally to build an error message that relates * to the current chunk. The chunk name comes from png_ptr->chunk_name, - * this is used to prefix the message. The message is limited in length - * to 63 bytes, the name characters are output as hex digits wrapped in [] + * which is used to prefix the message. The message is limited in length + * to 63 bytes. The name characters are output as hex digits wrapped in [] * if the character is invalid. */ #define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97)) @@ -415,8 +430,6 @@ static PNG_CONST char png_digit[16] = { 'A', 'B', 'C', 'D', 'E', 'F' }; -#define PNG_MAX_ERROR_TEXT 196 /* Currently limited be profile_error in png.c */ -#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_ERROR_TEXT_SUPPORTED) static void /* PRIVATE */ png_format_buffer(png_const_structrp png_ptr, png_charp buffer, png_const_charp error_message) @@ -429,7 +442,7 @@ png_format_buffer(png_const_structrp png_ptr, png_charp buffer, png_const_charp int c = (int)(chunk_name >> ishift) & 0xff; ishift -= 8; - if (isnonalpha(c)) + if (isnonalpha(c) != 0) { buffer[iout++] = PNG_LITERAL_LEFT_SQUARE_BRACKET; buffer[iout++] = png_digit[(c & 0xf0) >> 4]; @@ -460,7 +473,7 @@ png_format_buffer(png_const_structrp png_ptr, png_charp buffer, png_const_charp buffer[iout] = '\0'; } } -#endif /* PNG_WARNINGS_SUPPORTED || PNG_ERROR_TEXT_SUPPORTED */ +#endif /* WARNINGS || ERROR_TEXT */ #if defined(PNG_READ_SUPPORTED) && defined(PNG_ERROR_TEXT_SUPPORTED) PNG_FUNCTION(void,PNGAPI @@ -477,7 +490,7 @@ png_chunk_error,(png_const_structrp png_ptr, png_const_charp error_message), png_error(png_ptr, msg); } } -#endif /* PNG_READ_SUPPORTED && PNG_ERROR_TEXT_SUPPORTED */ +#endif /* READ && ERROR_TEXT */ #ifdef PNG_WARNINGS_SUPPORTED void PNGAPI @@ -493,7 +506,7 @@ png_chunk_warning(png_const_structrp png_ptr, png_const_charp warning_message) png_warning(png_ptr, msg); } } -#endif /* PNG_WARNINGS_SUPPORTED */ +#endif /* WARNINGS */ #ifdef PNG_READ_SUPPORTED #ifdef PNG_BENIGN_ERRORS_SUPPORTED @@ -501,23 +514,31 @@ void PNGAPI png_chunk_benign_error(png_const_structrp png_ptr, png_const_charp error_message) { - if (png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN) + if ((png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN) != 0) png_chunk_warning(png_ptr, error_message); else png_chunk_error(png_ptr, error_message); + +# ifndef PNG_ERROR_TEXT_SUPPORTED + PNG_UNUSED(error_message) +# endif } #endif -#endif /* PNG_READ_SUPPORTED */ +#endif /* READ */ void /* PRIVATE */ png_chunk_report(png_const_structrp png_ptr, png_const_charp message, int error) { +# ifndef PNG_WARNINGS_SUPPORTED + PNG_UNUSED(message) +# endif + /* This is always supported, but for just read or just write it * unconditionally does the right thing. */ # if defined(PNG_READ_SUPPORTED) && defined(PNG_WRITE_SUPPORTED) - if (png_ptr->mode & PNG_IS_READ_STRUCT) + if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0) # endif # ifdef PNG_READ_SUPPORTED @@ -531,7 +552,7 @@ png_chunk_report(png_const_structrp png_ptr, png_const_charp message, int error) # endif # if defined(PNG_READ_SUPPORTED) && defined(PNG_WRITE_SUPPORTED) - else if (!(png_ptr->mode & PNG_IS_READ_STRUCT)) + else if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0) # endif # ifdef PNG_WRITE_SUPPORTED @@ -556,11 +577,12 @@ png_fixed_error,(png_const_structrp png_ptr, png_const_charp name),PNG_NORETURN) char msg[fixed_message_ln+PNG_MAX_ERROR_TEXT]; memcpy(msg, fixed_message, fixed_message_ln); iin = 0; - if (name != NULL) while (iin < (PNG_MAX_ERROR_TEXT-1) && name[iin] != 0) - { - msg[fixed_message_ln + iin] = name[iin]; - ++iin; - } + if (name != NULL) + while (iin < (PNG_MAX_ERROR_TEXT-1) && name[iin] != 0) + { + msg[fixed_message_ln + iin] = name[iin]; + ++iin; + } msg[fixed_message_ln + iin] = 0; png_error(png_ptr, msg); } @@ -736,11 +758,20 @@ PNG_FUNCTION(void,PNGAPI png_longjmp,(png_const_structrp png_ptr, int val),PNG_NORETURN) { #ifdef PNG_SETJMP_SUPPORTED - if (png_ptr && png_ptr->longjmp_fn && png_ptr->jmp_buf_ptr) + if (png_ptr != NULL && png_ptr->longjmp_fn != NULL && + png_ptr->jmp_buf_ptr != NULL) png_ptr->longjmp_fn(*png_ptr->jmp_buf_ptr, val); +#else + PNG_UNUSED(png_ptr) + PNG_UNUSED(val) #endif - /* Here if not setjmp support or if png_ptr is null. */ + /* If control reaches this point, png_longjmp() must not return. The only + * choice is to terminate the whole process (or maybe the thread); to do + * this the ANSI-C abort() function is used unless a different method is + * implemented by overriding the default configuration setting for + * PNG_ABORT(). + */ PNG_ABORT(); } @@ -793,7 +824,7 @@ png_default_warning(png_const_structrp png_ptr, png_const_charp warning_message) #endif PNG_UNUSED(png_ptr) /* Make compiler happy */ } -#endif /* PNG_WARNINGS_SUPPORTED */ +#endif /* WARNINGS */ /* This function is called when the application wants to use another method * of handling errors and warnings. Note that the error function MUST NOT @@ -850,8 +881,8 @@ png_set_strip_error_numbers(png_structrp png_ptr, png_uint_32 strip_mode) * possible to implement without setjmp support just so long as there is some * way to handle the error return here: */ -PNG_FUNCTION(void /* PRIVATE */, -png_safe_error,(png_structp png_nonconst_ptr, png_const_charp error_message), +PNG_FUNCTION(void /* PRIVATE */, (PNGCBAPI +png_safe_error),(png_structp png_nonconst_ptr, png_const_charp error_message), PNG_NORETURN) { const png_const_structrp png_ptr = png_nonconst_ptr; @@ -886,7 +917,7 @@ png_safe_error,(png_structp png_nonconst_ptr, png_const_charp error_message), } #ifdef PNG_WARNINGS_SUPPORTED -void /* PRIVATE */ +void /* PRIVATE */ PNGCBAPI png_safe_warning(png_structp png_nonconst_ptr, png_const_charp warning_message) { const png_const_structrp png_ptr = png_nonconst_ptr; @@ -913,7 +944,7 @@ png_safe_execute(png_imagep image_in, int (*function)(png_voidp), png_voidp arg) saved_error_buf = image->opaque->error_buf; result = setjmp(safe_jmpbuf) == 0; - if (result) + if (result != 0) { image->opaque->error_buf = safe_jmpbuf; @@ -923,10 +954,10 @@ png_safe_execute(png_imagep image_in, int (*function)(png_voidp), png_voidp arg) image->opaque->error_buf = saved_error_buf; /* And do the cleanup prior to any failure return. */ - if (!result) + if (result == 0) png_image_free(image); return result; } -#endif /* SIMPLIFIED READ/WRITE */ -#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ +#endif /* SIMPLIFIED READ || SIMPLIFIED_WRITE */ +#endif /* READ || WRITE */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngget.c b/3rdparty/libpng/pngget.c similarity index 88% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngget.c rename to 3rdparty/libpng/pngget.c index aca63a9589..743a6a9bbc 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngget.c +++ b/3rdparty/libpng/pngget.c @@ -1,8 +1,8 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.6.1 [March 28, 2013] - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.17 [March 26, 2015] + * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -116,7 +116,8 @@ png_get_x_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp info_ptr) { #ifdef PNG_pHYs_SUPPORTED - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs)) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_pHYs) != 0) { png_debug1(1, "in %s retrieval function", "png_get_x_pixels_per_meter"); @@ -124,6 +125,9 @@ png_get_x_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER) return (info_ptr->x_pixels_per_unit); } +#else + PNG_UNUSED(png_ptr) + PNG_UNUSED(info_ptr) #endif return (0); @@ -134,7 +138,8 @@ png_get_y_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp info_ptr) { #ifdef PNG_pHYs_SUPPORTED - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs)) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_pHYs) != 0) { png_debug1(1, "in %s retrieval function", "png_get_y_pixels_per_meter"); @@ -142,6 +147,9 @@ png_get_y_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp if (info_ptr->phys_unit_type == PNG_RESOLUTION_METER) return (info_ptr->y_pixels_per_unit); } +#else + PNG_UNUSED(png_ptr) + PNG_UNUSED(info_ptr) #endif return (0); @@ -151,7 +159,8 @@ png_uint_32 PNGAPI png_get_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp info_ptr) { #ifdef PNG_pHYs_SUPPORTED - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs)) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_pHYs) != 0) { png_debug1(1, "in %s retrieval function", "png_get_pixels_per_meter"); @@ -159,6 +168,9 @@ png_get_pixels_per_meter(png_const_structrp png_ptr, png_const_inforp info_ptr) info_ptr->x_pixels_per_unit == info_ptr->y_pixels_per_unit) return (info_ptr->x_pixels_per_unit); } +#else + PNG_UNUSED(png_ptr) + PNG_UNUSED(info_ptr) #endif return (0); @@ -170,7 +182,8 @@ png_get_pixel_aspect_ratio(png_const_structrp png_ptr, png_const_inforp info_ptr) { #ifdef PNG_READ_pHYs_SUPPORTED - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs)) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_pHYs) != 0) { png_debug1(1, "in %s retrieval function", "png_get_aspect_ratio"); @@ -193,10 +206,11 @@ png_get_pixel_aspect_ratio_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr) { #ifdef PNG_READ_pHYs_SUPPORTED - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs) - && info_ptr->x_pixels_per_unit > 0 && info_ptr->y_pixels_per_unit > 0 - && info_ptr->x_pixels_per_unit <= PNG_UINT_31_MAX - && info_ptr->y_pixels_per_unit <= PNG_UINT_31_MAX) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_pHYs) != 0 && + info_ptr->x_pixels_per_unit > 0 && info_ptr->y_pixels_per_unit > 0 && + info_ptr->x_pixels_per_unit <= PNG_UINT_31_MAX && + info_ptr->y_pixels_per_unit <= PNG_UINT_31_MAX) { png_fixed_point res; @@ -206,7 +220,7 @@ png_get_pixel_aspect_ratio_fixed(png_const_structrp png_ptr, * range of 0..2^31-1; otherwise the cast might overflow. */ if (png_muldiv(&res, (png_int_32)info_ptr->y_pixels_per_unit, PNG_FP_1, - (png_int_32)info_ptr->x_pixels_per_unit)) + (png_int_32)info_ptr->x_pixels_per_unit) != 0) return res; } #else @@ -222,13 +236,17 @@ png_int_32 PNGAPI png_get_x_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr) { #ifdef PNG_oFFs_SUPPORTED - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs)) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_oFFs) != 0) { png_debug1(1, "in %s retrieval function", "png_get_x_offset_microns"); if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER) return (info_ptr->x_offset); } +#else + PNG_UNUSED(png_ptr) + PNG_UNUSED(info_ptr) #endif return (0); @@ -238,13 +256,17 @@ png_int_32 PNGAPI png_get_y_offset_microns(png_const_structrp png_ptr, png_const_inforp info_ptr) { #ifdef PNG_oFFs_SUPPORTED - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs)) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_oFFs) != 0) { png_debug1(1, "in %s retrieval function", "png_get_y_offset_microns"); if (info_ptr->offset_unit_type == PNG_OFFSET_MICROMETER) return (info_ptr->y_offset); } +#else + PNG_UNUSED(png_ptr) + PNG_UNUSED(info_ptr) #endif return (0); @@ -254,13 +276,17 @@ png_int_32 PNGAPI png_get_x_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr) { #ifdef PNG_oFFs_SUPPORTED - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs)) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_oFFs) != 0) { png_debug1(1, "in %s retrieval function", "png_get_x_offset_pixels"); if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL) return (info_ptr->x_offset); } +#else + PNG_UNUSED(png_ptr) + PNG_UNUSED(info_ptr) #endif return (0); @@ -270,13 +296,17 @@ png_int_32 PNGAPI png_get_y_offset_pixels(png_const_structrp png_ptr, png_const_inforp info_ptr) { #ifdef PNG_oFFs_SUPPORTED - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs)) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_oFFs) != 0) { png_debug1(1, "in %s retrieval function", "png_get_y_offset_pixels"); if (info_ptr->offset_unit_type == PNG_OFFSET_PIXEL) return (info_ptr->y_offset); } +#else + PNG_UNUSED(png_ptr) + PNG_UNUSED(info_ptr) #endif return (0); @@ -307,7 +337,7 @@ ppi_from_ppm(png_uint_32 ppm) */ png_fixed_point result; if (ppm <= PNG_UINT_31_MAX && png_muldiv(&result, (png_int_32)ppm, 127, - 5000)) + 5000) != 0) return result; /* Overflow. */ @@ -393,7 +423,8 @@ png_get_pHYs_dpi(png_const_structrp png_ptr, png_const_inforp info_ptr, { png_uint_32 retval = 0; - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs)) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_pHYs) != 0) { png_debug1(1, "in %s retrieval function", "pHYs"); @@ -424,12 +455,12 @@ png_get_pHYs_dpi(png_const_structrp png_ptr, png_const_inforp info_ptr, return (retval); } -#endif /* PNG_pHYs_SUPPORTED */ -#endif /* PNG_INCH_CONVERSIONS_SUPPORTED */ +#endif /* pHYs */ +#endif /* INCH_CONVERSIONS */ /* png_get_channels really belongs in here, too, but it's been around longer */ -#endif /* PNG_EASY_ACCESS_SUPPORTED */ +#endif /* EASY_ACCESS */ png_byte PNGAPI @@ -457,8 +488,9 @@ png_uint_32 PNGAPI png_get_bKGD(png_const_structrp png_ptr, png_inforp info_ptr, png_color_16p *background) { - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD) - && background != NULL) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_bKGD) != 0 && + background != NULL) { png_debug1(1, "in %s retrieval function", "bKGD"); @@ -488,7 +520,7 @@ png_get_cHRM(png_const_structrp png_ptr, png_const_inforp info_ptr, * consistent. */ if (png_ptr != NULL && info_ptr != NULL && - (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS)) + (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0) { png_debug1(1, "in %s retrieval function", "cHRM"); @@ -529,7 +561,7 @@ png_get_cHRM_XYZ(png_const_structrp png_ptr, png_const_inforp info_ptr, double *blue_Z) { if (png_ptr != NULL && info_ptr != NULL && - (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS)) + (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0) { png_debug1(1, "in %s retrieval function", "cHRM_XYZ(float)"); @@ -577,7 +609,7 @@ png_get_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr, png_fixed_point *int_blue_Z) { if (png_ptr != NULL && info_ptr != NULL && - (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS)) + (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0) { png_debug1(1, "in %s retrieval function", "cHRM_XYZ"); @@ -614,7 +646,7 @@ png_get_cHRM_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr, png_debug1(1, "in %s retrieval function", "cHRM"); if (png_ptr != NULL && info_ptr != NULL && - (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS)) + (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_ENDPOINTS) != 0) { if (white_x != NULL) *white_x = info_ptr->colorspace.end_points_xy.whitex; @@ -649,7 +681,7 @@ png_get_gAMA_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr, png_debug1(1, "in %s retrieval function", "gAMA"); if (png_ptr != NULL && info_ptr != NULL && - (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) && + (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 && file_gamma != NULL) { *file_gamma = info_ptr->colorspace.gamma; @@ -668,7 +700,7 @@ png_get_gAMA(png_const_structrp png_ptr, png_const_inforp info_ptr, png_debug1(1, "in %s retrieval function", "gAMA(float)"); if (png_ptr != NULL && info_ptr != NULL && - (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) && + (info_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_GAMMA) != 0 && file_gamma != NULL) { *file_gamma = png_float(png_ptr, info_ptr->colorspace.gamma, @@ -688,8 +720,8 @@ png_get_sRGB(png_const_structrp png_ptr, png_const_inforp info_ptr, { png_debug1(1, "in %s retrieval function", "sRGB"); - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sRGB) - && file_srgb_intent != NULL) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_sRGB) != 0 && file_srgb_intent != NULL) { *file_srgb_intent = info_ptr->colorspace.rendering_intent; return (PNG_INFO_sRGB); @@ -707,9 +739,10 @@ png_get_iCCP(png_const_structrp png_ptr, png_inforp info_ptr, { png_debug1(1, "in %s retrieval function", "iCCP"); - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_iCCP) - && name != NULL && compression_type != NULL && profile != NULL && - proflen != NULL) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_iCCP) != 0 && + name != NULL && compression_type != NULL && profile != NULL && + proflen != NULL) { *name = info_ptr->iccp_name; *profile = info_ptr->iccp_profile; @@ -747,8 +780,8 @@ png_get_hIST(png_const_structrp png_ptr, png_inforp info_ptr, { png_debug1(1, "in %s retrieval function", "hIST"); - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST) - && hist != NULL) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_hIST) != 0 && hist != NULL) { *hist = info_ptr->hist; return (PNG_INFO_hIST); @@ -766,14 +799,20 @@ png_get_IHDR(png_const_structrp png_ptr, png_const_inforp info_ptr, { png_debug1(1, "in %s retrieval function", "IHDR"); - if (png_ptr == NULL || info_ptr == NULL || width == NULL || - height == NULL || bit_depth == NULL || color_type == NULL) + if (png_ptr == NULL || info_ptr == NULL) return (0); - *width = info_ptr->width; - *height = info_ptr->height; - *bit_depth = info_ptr->bit_depth; - *color_type = info_ptr->color_type; + if (width != NULL) + *width = info_ptr->width; + + if (height != NULL) + *height = info_ptr->height; + + if (bit_depth != NULL) + *bit_depth = info_ptr->bit_depth; + + if (color_type != NULL) + *color_type = info_ptr->color_type; if (compression_type != NULL) *compression_type = info_ptr->compression_type; @@ -803,8 +842,9 @@ png_get_oFFs(png_const_structrp png_ptr, png_const_inforp info_ptr, { png_debug1(1, "in %s retrieval function", "oFFs"); - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs) - && offset_x != NULL && offset_y != NULL && unit_type != NULL) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_oFFs) != 0 && + offset_x != NULL && offset_y != NULL && unit_type != NULL) { *offset_x = info_ptr->x_offset; *offset_y = info_ptr->y_offset; @@ -824,8 +864,9 @@ png_get_pCAL(png_const_structrp png_ptr, png_inforp info_ptr, { png_debug1(1, "in %s retrieval function", "pCAL"); - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL) - && purpose != NULL && X0 != NULL && X1 != NULL && type != NULL && + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_pCAL) != 0 && + purpose != NULL && X0 != NULL && X1 != NULL && type != NULL && nparams != NULL && units != NULL && params != NULL) { *purpose = info_ptr->pcal_purpose; @@ -851,7 +892,7 @@ png_get_sCAL_fixed(png_const_structrp png_ptr, png_const_inforp info_ptr, int *unit, png_fixed_point *width, png_fixed_point *height) { if (png_ptr != NULL && info_ptr != NULL && - (info_ptr->valid & PNG_INFO_sCAL)) + (info_ptr->valid & PNG_INFO_sCAL) != 0) { *unit = info_ptr->scal_unit; /*TODO: make this work without FP support; the API is currently eliminated @@ -874,7 +915,7 @@ png_get_sCAL(png_const_structrp png_ptr, png_const_inforp info_ptr, int *unit, double *width, double *height) { if (png_ptr != NULL && info_ptr != NULL && - (info_ptr->valid & PNG_INFO_sCAL)) + (info_ptr->valid & PNG_INFO_sCAL) != 0) { *unit = info_ptr->scal_unit; *width = atof(info_ptr->scal_s_width); @@ -890,7 +931,7 @@ png_get_sCAL_s(png_const_structrp png_ptr, png_const_inforp info_ptr, int *unit, png_charpp width, png_charpp height) { if (png_ptr != NULL && info_ptr != NULL && - (info_ptr->valid & PNG_INFO_sCAL)) + (info_ptr->valid & PNG_INFO_sCAL) != 0) { *unit = info_ptr->scal_unit; *width = info_ptr->scal_s_width; @@ -912,7 +953,7 @@ png_get_pHYs(png_const_structrp png_ptr, png_const_inforp info_ptr, png_debug1(1, "in %s retrieval function", "pHYs"); if (png_ptr != NULL && info_ptr != NULL && - (info_ptr->valid & PNG_INFO_pHYs)) + (info_ptr->valid & PNG_INFO_pHYs) != 0) { if (res_x != NULL) { @@ -943,8 +984,8 @@ png_get_PLTE(png_const_structrp png_ptr, png_inforp info_ptr, { png_debug1(1, "in %s retrieval function", "PLTE"); - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_PLTE) - && palette != NULL) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_PLTE) != 0 && palette != NULL) { *palette = info_ptr->palette; *num_palette = info_ptr->num_palette; @@ -962,8 +1003,8 @@ png_get_sBIT(png_const_structrp png_ptr, png_inforp info_ptr, { png_debug1(1, "in %s retrieval function", "sBIT"); - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT) - && sig_bit != NULL) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_sBIT) != 0 && sig_bit != NULL) { *sig_bit = &(info_ptr->sig_bit); return (PNG_INFO_sBIT); @@ -1006,8 +1047,8 @@ png_get_tIME(png_const_structrp png_ptr, png_inforp info_ptr, { png_debug1(1, "in %s retrieval function", "tIME"); - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME) - && mod_time != NULL) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_tIME) != 0 && mod_time != NULL) { *mod_time = &(info_ptr->mod_time); return (PNG_INFO_tIME); @@ -1023,7 +1064,8 @@ png_get_tRNS(png_const_structrp png_ptr, png_inforp info_ptr, png_bytep *trans_alpha, int *num_trans, png_color_16p *trans_color) { png_uint_32 retval = 0; - if (png_ptr != NULL && info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS)) + if (png_ptr != NULL && info_ptr != NULL && + (info_ptr->valid & PNG_INFO_tRNS) != 0) { png_debug1(1, "in %s retrieval function", "tRNS"); @@ -1099,21 +1141,21 @@ png_get_compression_buffer_size(png_const_structrp png_ptr) if (png_ptr == NULL) return 0; -# ifdef PNG_WRITE_SUPPORTED - if (png_ptr->mode & PNG_IS_READ_STRUCT) -# endif +#ifdef PNG_WRITE_SUPPORTED + if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0) +#endif { -# ifdef PNG_SEQUENTIAL_READ_SUPPORTED +#ifdef PNG_SEQUENTIAL_READ_SUPPORTED return png_ptr->IDAT_read_size; -# else +#else return PNG_IDAT_READ_SIZE; -# endif +#endif } -# ifdef PNG_WRITE_SUPPORTED +#ifdef PNG_WRITE_SUPPORTED else return png_ptr->zbuffer_size; -# endif +#endif } #ifdef PNG_SET_USER_LIMITS_SUPPORTED @@ -1144,7 +1186,7 @@ png_get_chunk_malloc_max (png_const_structrp png_ptr) { return (png_ptr ? png_ptr->user_chunk_malloc_max : 0); } -#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */ +#endif /* SET_USER_LIMITS */ /* These functions were added to libpng 1.4.0 */ #ifdef PNG_IO_STATE_SUPPORTED @@ -1159,7 +1201,7 @@ png_get_io_chunk_type (png_const_structrp png_ptr) { return png_ptr->chunk_name; } -#endif /* ?PNG_IO_STATE_SUPPORTED */ +#endif /* IO_STATE */ #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED # ifdef PNG_GET_PALETTE_MAX_SUPPORTED @@ -1174,4 +1216,4 @@ png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr) # endif #endif -#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ +#endif /* READ || WRITE */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pnginfo.h b/3rdparty/libpng/pnginfo.h similarity index 99% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pnginfo.h rename to 3rdparty/libpng/pnginfo.h index 26bf26502c..c8c874dd1e 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pnginfo.h +++ b/3rdparty/libpng/pnginfo.h @@ -1,12 +1,11 @@ /* pnginfo.h - header file for PNG reference library * + * Last changed in libpng 1.6.1 [March 28, 2013] * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * Last changed in libpng 1.6.1 [March 28, 2013] - * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer * and license in png.h @@ -121,7 +120,7 @@ struct png_info_def int num_text; /* number of comments read or comments to write */ int max_text; /* current size of text array */ png_textp text; /* array of comments read or comments to write */ -#endif /* PNG_TEXT_SUPPORTED */ +#endif /* TEXT */ #ifdef PNG_tIME_SUPPORTED /* The tIME chunk holds the last time the displayed image data was diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/pnglibconf.h.prebuilt b/3rdparty/libpng/pnglibconf.h similarity index 94% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/pnglibconf.h.prebuilt rename to 3rdparty/libpng/pnglibconf.h index 16ad5c9f02..b4ec3c31e8 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/pnglibconf.h.prebuilt +++ b/3rdparty/libpng/pnglibconf.h @@ -1,10 +1,10 @@ -/* libpng 1.6.2 STANDARD API DEFINITION */ +/* libpng 1.6.17 STANDARD API DEFINITION */ /* pnglibconf.h - library build configuration */ -/* Libpng version 1.6.2 - April 25, 2013 */ +/* Libpng version 1.6.17 - March 26, 2015 */ -/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */ +/* Copyright (c) 1998-2014 Glenn Randers-Pehrson */ /* This code is released under the libpng license. */ /* For conditions of distribution and use, see the disclaimer */ @@ -20,7 +20,6 @@ #define PNG_ALIGNED_MEMORY_SUPPORTED /*#undef PNG_ARM_NEON_API_SUPPORTED*/ /*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/ -/*#undef PNG_ARM_NEON_SUPPORTED*/ #define PNG_BENIGN_ERRORS_SUPPORTED #define PNG_BENIGN_READ_ERRORS_SUPPORTED /*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/ @@ -98,14 +97,13 @@ #define PNG_READ_tIME_SUPPORTED #define PNG_READ_tRNS_SUPPORTED #define PNG_READ_zTXt_SUPPORTED -/*#undef PNG_SAFE_LIMITS_SUPPORTED*/ #define PNG_SAVE_INT_32_SUPPORTED #define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED #define PNG_SEQUENTIAL_READ_SUPPORTED #define PNG_SETJMP_SUPPORTED #define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED #define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED -/*#undef PNG_SET_OPTION_SUPPORTED*/ +#define PNG_SET_OPTION_SUPPORTED #define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED #define PNG_SET_USER_LIMITS_SUPPORTED #define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED @@ -130,6 +128,7 @@ #define PNG_WRITE_BGR_SUPPORTED #define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED #define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED +#define PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED #define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED #define PNG_WRITE_FILLER_SUPPORTED #define PNG_WRITE_FILTER_SUPPORTED @@ -188,7 +187,6 @@ /* end of options */ /* settings */ #define PNG_API_RULE 0 -#define PNG_CALLOC_SUPPORTED #define PNG_COST_SHIFT 3 #define PNG_DEFAULT_READ_MACROS 1 #define PNG_GAMMA_THRESHOLD_FIXED 5000 @@ -200,8 +198,13 @@ #define PNG_QUANTIZE_RED_BITS 5 #define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1) #define PNG_TEXT_Z_DEFAULT_STRATEGY 0 +#define PNG_USER_CHUNK_CACHE_MAX 1000 +#define PNG_USER_CHUNK_MALLOC_MAX 8000000 +#define PNG_USER_HEIGHT_MAX 1000000 +#define PNG_USER_WIDTH_MAX 1000000 #define PNG_WEIGHT_SHIFT 8 #define PNG_ZBUF_SIZE 8192 +#define PNG_ZLIB_VERNUM 0 /* unknown */ #define PNG_Z_DEFAULT_COMPRESSION (-1) #define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0 #define PNG_Z_DEFAULT_STRATEGY 1 diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngmem.c b/3rdparty/libpng/pngmem.c similarity index 94% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngmem.c rename to 3rdparty/libpng/pngmem.c index b9b3efb442..8b157e54d2 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngmem.c +++ b/3rdparty/libpng/pngmem.c @@ -1,8 +1,8 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.6.0 [February 14, 2013] - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.15 [November 20, 2014] + * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -41,7 +41,7 @@ png_destroy_png_struct(png_structrp png_ptr) } /* Allocate memory. For reasonable files, size should never exceed - * 64K. However, zlib may allocate more then 64K if you don't tell + * 64K. However, zlib may allocate more than 64K if you don't tell * it not to. See zconf.h and png.h for more information. zlib does * need to allocate exactly 64K, so whatever you call here must * have the ability to do that. @@ -73,9 +73,10 @@ png_malloc_base,(png_const_structrp png_ptr, png_alloc_size_t size), * to implement a user memory handler. This checks to be sure it isn't * called with big numbers. */ -#ifdef PNG_USER_MEM_SUPPORTED +#ifndef PNG_USER_MEM_SUPPORTED PNG_UNUSED(png_ptr) #endif + if (size > 0 && size <= PNG_SIZE_MAX # ifdef PNG_MAX_MALLOC_64K && size <= 65536U @@ -95,6 +96,8 @@ png_malloc_base,(png_const_structrp png_ptr, png_alloc_size_t size), return NULL; } +#if defined(PNG_TEXT_SUPPORTED) || defined(PNG_sPLT_SUPPORTED) ||\ + defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) /* This is really here only to work round a spurious warning in GCC 4.6 and 4.7 * that arises because of the checks in png_realloc_array that are repeated in * png_malloc_array. @@ -156,6 +159,7 @@ png_realloc_array,(png_const_structrp png_ptr, png_const_voidp old_array, return NULL; /* error */ } +#endif /* TEXT || sPLT || STORE_UNKNOWN_CHUNKS */ /* Various functions that have different error handling are derived from this. * png_malloc always exists, but if PNG_USER_MEM_SUPPORTED is defined a separate @@ -195,7 +199,7 @@ png_malloc_default,(png_const_structrp png_ptr, png_alloc_size_t size), return ret; } -#endif /* PNG_USER_MEM_SUPPORTED */ +#endif /* USER_MEM */ /* This function was added at libpng version 1.2.3. The png_malloc_warn() * function will issue a png_warning and return NULL instead of issuing a @@ -240,7 +244,7 @@ png_free_default,(png_const_structrp png_ptr, png_voidp ptr),PNG_DEPRECATED) { if (png_ptr == NULL || ptr == NULL) return; -#endif /* PNG_USER_MEM_SUPPORTED */ +#endif /* USER_MEM */ free(ptr); } @@ -273,5 +277,5 @@ png_get_mem_ptr(png_const_structrp png_ptr) return png_ptr->mem_ptr; } -#endif /* PNG_USER_MEM_SUPPORTED */ -#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ +#endif /* USER_MEM */ +#endif /* READ || WRITE */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngnow.png b/3rdparty/libpng/pngnow.png similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngnow.png rename to 3rdparty/libpng/pngnow.png diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngpread.c b/3rdparty/libpng/pngpread.c similarity index 86% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngpread.c rename to 3rdparty/libpng/pngpread.c index f132ce6004..823dcad8c0 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngpread.c +++ b/3rdparty/libpng/pngpread.c @@ -1,8 +1,8 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.6.0 [February 14, 2013] - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.17 [March 26, 2015] + * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -26,6 +26,13 @@ #define PNG_READ_iTXt_MODE 7 #define PNG_ERROR_MODE 8 +#define PNG_PUSH_SAVE_BUFFER_IF_FULL \ +if (png_ptr->push_length + 4 > png_ptr->buffer_size) \ + { png_push_save_buffer(png_ptr); return; } +#define PNG_PUSH_SAVE_BUFFER_IF_LT(N) \ +if (png_ptr->buffer_size < N) \ + { png_push_save_buffer(png_ptr); return; } + void PNGAPI png_process_data(png_structrp png_ptr, png_inforp info_ptr, png_bytep buffer, png_size_t buffer_size) @@ -46,10 +53,10 @@ png_process_data_pause(png_structrp png_ptr, int save) { if (png_ptr != NULL) { - /* It's easiest for the caller if we do the save, then the caller doesn't + /* It's easiest for the caller if we do the save; then the caller doesn't * have to supply the same data again: */ - if (save) + if (save != 0) png_push_save_buffer(png_ptr); else { @@ -151,7 +158,7 @@ png_process_some_data(png_structrp png_ptr, png_inforp info_ptr) void /* PRIVATE */ png_push_read_sig(png_structrp png_ptr, png_inforp info_ptr) { - png_size_t num_checked = png_ptr->sig_bytes, + png_size_t num_checked = png_ptr->sig_bytes, /* SAFE, does not exceed 8 */ num_to_check = 8 - num_checked; if (png_ptr->buffer_size < num_to_check) @@ -189,23 +196,18 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) int keep; /* unknown handling method */ #endif - /* First we make sure we have enough data for the 4 byte chunk name - * and the 4 byte chunk length before proceeding with decoding the + /* First we make sure we have enough data for the 4-byte chunk name + * and the 4-byte chunk length before proceeding with decoding the * chunk data. To fully decode each of these chunks, we also make - * sure we have enough data in the buffer for the 4 byte CRC at the + * sure we have enough data in the buffer for the 4-byte CRC at the * end of every chunk (except IDAT, which is handled separately). */ - if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER)) + if ((png_ptr->mode & PNG_HAVE_CHUNK_HEADER) == 0) { png_byte chunk_length[4]; png_byte chunk_tag[4]; - if (png_ptr->buffer_size < 8) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_LT(8) png_push_fill_buffer(png_ptr, chunk_length, 4); png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length); png_reset_crc(png_ptr); @@ -219,27 +221,28 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) if (chunk_name == png_IDAT) { - if (png_ptr->mode & PNG_AFTER_IDAT) + if ((png_ptr->mode & PNG_AFTER_IDAT) != 0) png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT; /* If we reach an IDAT chunk, this means we have read all of the * header chunks, and we can start reading the image (or if this * is called after the image has been read - we have an error). */ - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_error(png_ptr, "Missing IHDR before IDAT"); else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE && - !(png_ptr->mode & PNG_HAVE_PLTE)) + (png_ptr->mode & PNG_HAVE_PLTE) == 0) png_error(png_ptr, "Missing PLTE before IDAT"); png_ptr->mode |= PNG_HAVE_IDAT; + png_ptr->process_mode = PNG_READ_IDAT_MODE; - if (!(png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT)) + if ((png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) == 0) if (png_ptr->push_length == 0) return; - if (png_ptr->mode & PNG_AFTER_IDAT) + if ((png_ptr->mode & PNG_AFTER_IDAT) != 0) png_benign_error(png_ptr, "Too many IDATs found"); } @@ -248,23 +251,13 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) if (png_ptr->push_length != 13) png_error(png_ptr, "Invalid IHDR length"); - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_IHDR(png_ptr, info_ptr, png_ptr->push_length); } else if (chunk_name == png_IEND) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_IEND(png_ptr, info_ptr, png_ptr->push_length); png_ptr->process_mode = PNG_READ_DONE_MODE; @@ -274,26 +267,17 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED else if ((keep = png_chunk_unknown_handling(png_ptr, chunk_name)) != 0) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length, keep); if (chunk_name == png_PLTE) png_ptr->mode |= PNG_HAVE_PLTE; } - #endif + else if (chunk_name == png_PLTE) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_PLTE(png_ptr, info_ptr, png_ptr->push_length); } @@ -312,12 +296,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_READ_gAMA_SUPPORTED else if (png_ptr->chunk_name == png_gAMA) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_gAMA(png_ptr, info_ptr, png_ptr->push_length); } @@ -325,12 +304,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_READ_sBIT_SUPPORTED else if (png_ptr->chunk_name == png_sBIT) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_sBIT(png_ptr, info_ptr, png_ptr->push_length); } @@ -338,12 +312,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_READ_cHRM_SUPPORTED else if (png_ptr->chunk_name == png_cHRM) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_cHRM(png_ptr, info_ptr, png_ptr->push_length); } @@ -351,12 +320,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_READ_sRGB_SUPPORTED else if (chunk_name == png_sRGB) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_sRGB(png_ptr, info_ptr, png_ptr->push_length); } @@ -364,12 +328,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_READ_iCCP_SUPPORTED else if (png_ptr->chunk_name == png_iCCP) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_iCCP(png_ptr, info_ptr, png_ptr->push_length); } @@ -377,12 +336,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_READ_sPLT_SUPPORTED else if (chunk_name == png_sPLT) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_sPLT(png_ptr, info_ptr, png_ptr->push_length); } @@ -390,12 +344,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_READ_tRNS_SUPPORTED else if (chunk_name == png_tRNS) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_tRNS(png_ptr, info_ptr, png_ptr->push_length); } @@ -403,12 +352,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_READ_bKGD_SUPPORTED else if (chunk_name == png_bKGD) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_bKGD(png_ptr, info_ptr, png_ptr->push_length); } @@ -416,12 +360,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_READ_hIST_SUPPORTED else if (chunk_name == png_hIST) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_hIST(png_ptr, info_ptr, png_ptr->push_length); } @@ -429,12 +368,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_READ_pHYs_SUPPORTED else if (chunk_name == png_pHYs) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_pHYs(png_ptr, info_ptr, png_ptr->push_length); } @@ -442,12 +376,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_READ_oFFs_SUPPORTED else if (chunk_name == png_oFFs) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_oFFs(png_ptr, info_ptr, png_ptr->push_length); } #endif @@ -455,12 +384,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_READ_pCAL_SUPPORTED else if (chunk_name == png_pCAL) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_pCAL(png_ptr, info_ptr, png_ptr->push_length); } @@ -468,12 +392,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_READ_sCAL_SUPPORTED else if (chunk_name == png_sCAL) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_sCAL(png_ptr, info_ptr, png_ptr->push_length); } @@ -481,12 +400,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_READ_tIME_SUPPORTED else if (chunk_name == png_tIME) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_tIME(png_ptr, info_ptr, png_ptr->push_length); } @@ -494,12 +408,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_READ_tEXt_SUPPORTED else if (chunk_name == png_tEXt) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_tEXt(png_ptr, info_ptr, png_ptr->push_length); } @@ -507,12 +416,7 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_READ_zTXt_SUPPORTED else if (chunk_name == png_zTXt) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_zTXt(png_ptr, info_ptr, png_ptr->push_length); } @@ -520,23 +424,14 @@ png_push_read_chunk(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_READ_iTXt_SUPPORTED else if (chunk_name == png_iTXt) { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length); } - #endif + else { - if (png_ptr->push_length + 4 > png_ptr->buffer_size) - { - png_push_save_buffer(png_ptr); - return; - } + PNG_PUSH_SAVE_BUFFER_IF_FULL png_handle_unknown(png_ptr, info_ptr, png_ptr->push_length, PNG_HANDLE_CHUNK_AS_DEFAULT); } @@ -554,7 +449,7 @@ png_push_crc_skip(png_structrp png_ptr, png_uint_32 skip) void /* PRIVATE */ png_push_crc_finish(png_structrp png_ptr) { - if (png_ptr->skip_length && png_ptr->save_buffer_size) + if (png_ptr->skip_length != 0 && png_ptr->save_buffer_size != 0) { png_size_t save_size = png_ptr->save_buffer_size; png_uint_32 skip_length = png_ptr->skip_length; @@ -578,7 +473,7 @@ png_push_crc_finish(png_structrp png_ptr) png_ptr->save_buffer_size -= save_size; png_ptr->save_buffer_ptr += save_size; } - if (png_ptr->skip_length && png_ptr->current_buffer_size) + if (png_ptr->skip_length != 0 && png_ptr->current_buffer_size != 0) { png_size_t save_size = png_ptr->current_buffer_size; png_uint_32 skip_length = png_ptr->skip_length; @@ -599,14 +494,9 @@ png_push_crc_finish(png_structrp png_ptr) png_ptr->current_buffer_size -= save_size; png_ptr->current_buffer_ptr += save_size; } - if (!png_ptr->skip_length) + if (png_ptr->skip_length == 0) { - if (png_ptr->buffer_size < 4) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_LT(4) png_crc_finish(png_ptr, 0); png_ptr->process_mode = PNG_READ_CHUNK_MODE; } @@ -621,7 +511,7 @@ png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length) return; ptr = buffer; - if (png_ptr->save_buffer_size) + if (png_ptr->save_buffer_size != 0) { png_size_t save_size; @@ -638,7 +528,7 @@ png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length) png_ptr->save_buffer_size -= save_size; png_ptr->save_buffer_ptr += save_size; } - if (length && png_ptr->current_buffer_size) + if (length != 0 && png_ptr->current_buffer_size != 0) { png_size_t save_size; @@ -658,7 +548,7 @@ png_push_fill_buffer(png_structp png_ptr, png_bytep buffer, png_size_t length) void /* PRIVATE */ png_push_save_buffer(png_structrp png_ptr) { - if (png_ptr->save_buffer_size) + if (png_ptr->save_buffer_size != 0) { if (png_ptr->save_buffer_ptr != png_ptr->save_buffer) { @@ -694,11 +584,13 @@ png_push_save_buffer(png_structrp png_ptr) if (png_ptr->save_buffer == NULL) { png_free(png_ptr, old_buffer); + old_buffer = NULL; png_error(png_ptr, "Insufficient memory for save_buffer"); } memcpy(png_ptr->save_buffer, old_buffer, png_ptr->save_buffer_size); png_free(png_ptr, old_buffer); + old_buffer = NULL; png_ptr->save_buffer_max = new_max; } if (png_ptr->current_buffer_size) @@ -725,18 +617,13 @@ png_push_restore_buffer(png_structrp png_ptr, png_bytep buffer, void /* PRIVATE */ png_push_read_IDAT(png_structrp png_ptr) { - if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER)) + if ((png_ptr->mode & PNG_HAVE_CHUNK_HEADER) == 0) { png_byte chunk_length[4]; png_byte chunk_tag[4]; /* TODO: this code can be commoned up with the same code in push_read */ - if (png_ptr->buffer_size < 8) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_LT(8) png_push_fill_buffer(png_ptr, chunk_length, 4); png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length); png_reset_crc(png_ptr); @@ -748,7 +635,7 @@ png_push_read_IDAT(png_structrp png_ptr) { png_ptr->process_mode = PNG_READ_CHUNK_MODE; - if (!(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED)) + if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0) png_error(png_ptr, "Not enough compressed data"); return; @@ -757,7 +644,7 @@ png_push_read_IDAT(png_structrp png_ptr) png_ptr->idat_size = png_ptr->push_length; } - if (png_ptr->idat_size && png_ptr->save_buffer_size) + if (png_ptr->idat_size != 0 && png_ptr->save_buffer_size != 0) { png_size_t save_size = png_ptr->save_buffer_size; png_uint_32 idat_size = png_ptr->idat_size; @@ -784,7 +671,7 @@ png_push_read_IDAT(png_structrp png_ptr) png_ptr->save_buffer_ptr += save_size; } - if (png_ptr->idat_size && png_ptr->current_buffer_size) + if (png_ptr->idat_size != 0 && png_ptr->current_buffer_size != 0) { png_size_t save_size = png_ptr->current_buffer_size; png_uint_32 idat_size = png_ptr->idat_size; @@ -809,14 +696,9 @@ png_push_read_IDAT(png_structrp png_ptr) png_ptr->current_buffer_size -= save_size; png_ptr->current_buffer_ptr += save_size; } - if (!png_ptr->idat_size) + if (png_ptr->idat_size == 0) { - if (png_ptr->buffer_size < 4) - { - png_push_save_buffer(png_ptr); - return; - } - + PNG_PUSH_SAVE_BUFFER_IF_LT(4) png_crc_finish(png_ptr, 0); png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER; png_ptr->mode |= PNG_AFTER_IDAT; @@ -844,7 +726,7 @@ png_process_IDAT_data(png_structrp png_ptr, png_bytep buffer, * or the stream marked as finished. */ while (png_ptr->zstream.avail_in > 0 && - !(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED)) + (png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0) { int ret; @@ -961,7 +843,7 @@ png_push_process_row(png_structrp png_ptr) memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1); #ifdef PNG_READ_TRANSFORMS_SUPPORTED - if (png_ptr->transformations) + if (png_ptr->transformations != 0) png_do_read_transformations(png_ptr, &row_info); #endif @@ -978,15 +860,16 @@ png_push_process_row(png_structrp png_ptr) #ifdef PNG_READ_INTERLACING_SUPPORTED - /* Blow up interlaced rows to full size */ - if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE)) + /* Expand interlaced rows to full size */ + if (png_ptr->interlaced != 0 && + (png_ptr->transformations & PNG_INTERLACE) != 0) { if (png_ptr->pass < 6) png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations); - switch (png_ptr->pass) - { + switch (png_ptr->pass) + { case 0: { int i; @@ -1189,7 +1072,7 @@ png_read_push_finish_row(png_structrp png_ptr) return; #ifdef PNG_READ_INTERLACING_SUPPORTED - if (png_ptr->interlaced) + if (png_ptr->interlaced != 0) { png_ptr->row_number = 0; memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1); @@ -1213,7 +1096,7 @@ png_read_push_finish_row(png_structrp png_ptr) png_pass_start[png_ptr->pass]) / png_pass_inc[png_ptr->pass]; - if (png_ptr->transformations & PNG_INTERLACE) + if ((png_ptr->transformations & PNG_INTERLACE) != 0) break; png_ptr->num_rows = (png_ptr->height + @@ -1223,7 +1106,7 @@ png_read_push_finish_row(png_structrp png_ptr) } while (png_ptr->iwidth == 0 || png_ptr->num_rows == 0); } -#endif /* PNG_READ_INTERLACING_SUPPORTED */ +#endif /* READ_INTERLACING */ } void /* PRIVATE */ @@ -1261,9 +1144,9 @@ png_progressive_combine_row(png_const_structrp png_ptr, png_bytep old_row, * it must be png_ptr->row_buf+1 */ if (new_row != NULL) - png_combine_row(png_ptr, old_row, 1/*display*/); + png_combine_row(png_ptr, old_row, 1/*blocky display*/); } -#endif /* PNG_READ_INTERLACING_SUPPORTED */ +#endif /* READ_INTERLACING */ void PNGAPI png_set_progressive_read_fn(png_structrp png_ptr, png_voidp progressive_ptr, @@ -1288,4 +1171,4 @@ png_get_progressive_ptr(png_const_structrp png_ptr) return png_ptr->io_ptr; } -#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PROGRESSIVE_READ */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngpriv.h b/3rdparty/libpng/pngpriv.h similarity index 86% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngpriv.h rename to 3rdparty/libpng/pngpriv.h index 1813e5a152..5980a3fc3c 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngpriv.h +++ b/3rdparty/libpng/pngpriv.h @@ -1,12 +1,11 @@ + /* pngpriv.h - private declarations for use inside libpng * - * For conditions of distribution and use, see copyright notice in png.h - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.17 [March 26, 2015] + * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * Last changed in libpng 1.6.2 [April 25, 2013] - * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer * and license in png.h @@ -87,6 +86,98 @@ # endif #endif +/* Compile time options. + * ===================== + * In a multi-arch build the compiler may compile the code several times for the + * same object module, producing different binaries for different architectures. + * When this happens configure-time setting of the target host options cannot be + * done and this interferes with the handling of the ARM NEON optimizations, and + * possibly other similar optimizations. Put additional tests here; in general + * this is needed when the same option can be changed at both compile time and + * run time depending on the target OS (i.e. iOS vs Android.) + * + * NOTE: symbol prefixing does not pass $(CFLAGS) to the preprocessor, because + * this is not possible with certain compilers (Oracle SUN OS CC), as a result + * it is necessary to ensure that all extern functions that *might* be used + * regardless of $(CFLAGS) get declared in this file. The test on __ARM_NEON__ + * below is one example of this behavior because it is controlled by the + * presence or not of -mfpu=neon on the GCC command line, it is possible to do + * this in $(CC), e.g. "CC=gcc -mfpu=neon", but people who build libpng rarely + * do this. + */ +#ifndef PNG_ARM_NEON_OPT + /* ARM NEON optimizations are being controlled by the compiler settings, + * typically the target FPU. If the FPU has been set to NEON (-mfpu=neon + * with GCC) then the compiler will define __ARM_NEON__ and we can rely + * unconditionally on NEON instructions not crashing, otherwise we must + * disable use of NEON instructions. + * + * NOTE: at present these optimizations depend on 'ALIGNED_MEMORY', so they + * can only be turned on automatically if that is supported too. If + * PNG_ARM_NEON_OPT is set in CPPFLAGS (to >0) then arm/arm_init.c will fail + * to compile with an appropriate #error if ALIGNED_MEMORY has been turned + * off. + * + * Note that gcc-4.9 defines __ARM_NEON instead of __ARM_NEON__, so we + * check both variants. + */ +# if (defined(__ARM_NEON__) || defined(__ARM_NEON)) && \ + defined(PNG_ALIGNED_MEMORY_SUPPORTED) +# define PNG_ARM_NEON_OPT 2 +# else +# define PNG_ARM_NEON_OPT 0 +# endif +#endif + +#if PNG_ARM_NEON_OPT > 0 + /* NEON optimizations are to be at least considered by libpng, so enable the + * callbacks to do this. + */ +# define PNG_FILTER_OPTIMIZATIONS png_init_filter_functions_neon + + /* By default the 'intrinsics' code in arm/filter_neon_intrinsics.c is used + * if possible - if __ARM_NEON__ is set and the compiler version is not known + * to be broken. This is controlled by PNG_ARM_NEON_IMPLEMENTATION which can + * be: + * + * 1 The intrinsics code (the default with __ARM_NEON__) + * 2 The hand coded assembler (the default without __ARM_NEON__) + * + * It is possible to set PNG_ARM_NEON_IMPLEMENTATION in CPPFLAGS, however + * this is *NOT* supported and may cease to work even after a minor revision + * to libpng. It *is* valid to do this for testing purposes, e.g. speed + * testing or a new compiler, but the results should be communicated to the + * libpng implementation list for incorporation in the next minor release. + */ +# ifndef PNG_ARM_NEON_IMPLEMENTATION +# if defined(__ARM_NEON__) || defined(__ARM_NEON) +# if defined(__clang__) + /* At present it is unknown by the libpng developers which versions + * of clang support the intrinsics, however some or perhaps all + * versions do not work with the assembler so this may be + * irrelevant, so just use the default (do nothing here.) + */ +# elif defined(__GNUC__) + /* GCC 4.5.4 NEON support is known to be broken. 4.6.3 is known to + * work, so if this *is* GCC, or G++, look for a version >4.5 + */ +# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6) +# define PNG_ARM_NEON_IMPLEMENTATION 2 +# endif /* no GNUC support */ +# endif /* __GNUC__ */ +# else /* !defined __ARM_NEON__ */ + /* The 'intrinsics' code simply won't compile without this -mfpu=neon: + */ +# define PNG_ARM_NEON_IMPLEMENTATION 2 +# endif /* __ARM_NEON__ */ +# endif /* !PNG_ARM_NEON_IMPLEMENTATION */ + +# ifndef PNG_ARM_NEON_IMPLEMENTATION + /* Use the intrinsics code by default. */ +# define PNG_ARM_NEON_IMPLEMENTATION 1 +# endif +#endif /* PNG_ARM_NEON_OPT > 0 */ + /* Is this a build of a DLL where compilation of the object modules requires * different preprocessor settings to those required for a simple library? If * so PNG_BUILD_DLL must be set. @@ -165,6 +256,11 @@ extern PNG_FUNCTION(type, name, args, PNG_EMPTY attributes) #endif +#ifndef PNG_INTERNAL_CALLBACK +# define PNG_INTERNAL_CALLBACK(type, name, args, attributes)\ + extern PNG_FUNCTION(type, (PNGCBAPI name), args, PNG_EMPTY attributes) +#endif + /* If floating or fixed point APIs are disabled they may still be compiled * internally. To handle this make sure they are declared as the appropriate * internal extern function (otherwise the symbol prefixing stuff won't work and @@ -202,46 +298,9 @@ /* SECURITY and SAFETY: * - * By default libpng is built without any internal limits on image size, - * individual heap (png_malloc) allocations or the total amount of memory used. - * If PNG_SAFE_LIMITS_SUPPORTED is defined, however, the limits below are used - * (unless individually overridden). These limits are believed to be fairly - * safe, but builders of secure systems should verify the values against the - * real system capabilities. - */ -#ifdef PNG_SAFE_LIMITS_SUPPORTED - /* 'safe' limits */ -# ifndef PNG_USER_WIDTH_MAX -# define PNG_USER_WIDTH_MAX 1000000 -# endif -# ifndef PNG_USER_HEIGHT_MAX -# define PNG_USER_HEIGHT_MAX 1000000 -# endif -# ifndef PNG_USER_CHUNK_CACHE_MAX -# define PNG_USER_CHUNK_CACHE_MAX 128 -# endif -# ifndef PNG_USER_CHUNK_MALLOC_MAX -# define PNG_USER_CHUNK_MALLOC_MAX 8000000 -# endif -#else - /* values for no limits */ -# ifndef PNG_USER_WIDTH_MAX -# define PNG_USER_WIDTH_MAX 0x7fffffff -# endif -# ifndef PNG_USER_HEIGHT_MAX -# define PNG_USER_HEIGHT_MAX 0x7fffffff -# endif -# ifndef PNG_USER_CHUNK_CACHE_MAX -# define PNG_USER_CHUNK_CACHE_MAX 0 -# endif -# ifndef PNG_USER_CHUNK_MALLOC_MAX -# define PNG_USER_CHUNK_MALLOC_MAX 0 -# endif -#endif - -/* Moved to pngpriv.h at libpng-1.5.0 */ -/* NOTE: some of these may have been used in external applications as - * these definitions were exposed in pngconf.h prior to 1.5. + * libpng is built with support for internal limits on image dimensions and + * memory usage. These are documented in scripts/pnglibconf.dfa of the + * source and recorded in the machine generated header file pnglibconf.h. */ /* If you are running on a machine where you cannot allocate more @@ -284,8 +343,6 @@ #ifdef PNG_WARNINGS_SUPPORTED # define PNG_WARNING_PARAMETERS(p) png_warning_parameters p; #else -# define png_warning(s1,s2) ((void)(s1)) -# define png_chunk_warning(s1,s2) ((void)(s1)) # define png_warning_parameter(p,number,string) ((void)0) # define png_warning_parameter_unsigned(p,number,format,value) ((void)0) # define png_warning_parameter_signed(p,number,format,value) ((void)0) @@ -293,8 +350,6 @@ # define PNG_WARNING_PARAMETERS(p) #endif #ifndef PNG_ERROR_TEXT_SUPPORTED -# define png_error(s1,s2) png_err(s1) -# define png_chunk_error(s1,s2) png_err(s1) # define png_fixed_error(s1,s2) png_err(s1) #endif @@ -342,8 +397,8 @@ */ # include -# if ( ( (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \ - defined(THINK_C) || defined(TARGET_OS_MAC) ) && !wxOSX_USE_IPHONE ) || defined(__SC__) +# if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \ + defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC) /* We need to check that hasn't already been included earlier * as it seems it doesn't agree with , yet we should really use * if possible. @@ -488,13 +543,13 @@ #define PNG_RGB_TO_GRAY_WARN 0x400000 #define PNG_RGB_TO_GRAY 0x600000 /* two bits, RGB_TO_GRAY_ERR|WARN */ #define PNG_ENCODE_ALPHA 0x800000 /* Added to libpng-1.5.4 */ -#define PNG_ADD_ALPHA 0x1000000 /* Added to libpng-1.2.7 */ -#define PNG_EXPAND_tRNS 0x2000000 /* Added to libpng-1.2.9 */ -#define PNG_SCALE_16_TO_8 0x4000000 /* Added to libpng-1.5.4 */ - /* 0x8000000 unused */ - /* 0x10000000 unused */ - /* 0x20000000 unused */ - /* 0x40000000 unused */ +#define PNG_ADD_ALPHA 0x1000000 /* Added to libpng-1.2.7 */ +#define PNG_EXPAND_tRNS 0x2000000 /* Added to libpng-1.2.9 */ +#define PNG_SCALE_16_TO_8 0x4000000 /* Added to libpng-1.5.4 */ + /* 0x8000000 unused */ + /* 0x10000000 unused */ + /* 0x20000000 unused */ + /* 0x40000000 unused */ /* Flags for png_create_struct */ #define PNG_STRUCT_PNG 0x0001 #define PNG_STRUCT_INFO 0x0002 @@ -629,45 +684,74 @@ * architectures where (int) is only 16 bits. */ #define PNG_32b(b,s) ((png_uint_32)(b) << (s)) -#define PNG_CHUNK(b1,b2,b3,b4) \ +#define PNG_U32(b1,b2,b3,b4) \ (PNG_32b(b1,24) | PNG_32b(b2,16) | PNG_32b(b3,8) | PNG_32b(b4,0)) -#define png_IHDR PNG_CHUNK( 73, 72, 68, 82) -#define png_IDAT PNG_CHUNK( 73, 68, 65, 84) -#define png_IEND PNG_CHUNK( 73, 69, 78, 68) -#define png_PLTE PNG_CHUNK( 80, 76, 84, 69) -#define png_bKGD PNG_CHUNK( 98, 75, 71, 68) -#define png_cHRM PNG_CHUNK( 99, 72, 82, 77) -#define png_gAMA PNG_CHUNK(103, 65, 77, 65) -#define png_hIST PNG_CHUNK(104, 73, 83, 84) -#define png_iCCP PNG_CHUNK(105, 67, 67, 80) -#define png_iTXt PNG_CHUNK(105, 84, 88, 116) -#define png_oFFs PNG_CHUNK(111, 70, 70, 115) -#define png_pCAL PNG_CHUNK(112, 67, 65, 76) -#define png_sCAL PNG_CHUNK(115, 67, 65, 76) -#define png_pHYs PNG_CHUNK(112, 72, 89, 115) -#define png_sBIT PNG_CHUNK(115, 66, 73, 84) -#define png_sPLT PNG_CHUNK(115, 80, 76, 84) -#define png_sRGB PNG_CHUNK(115, 82, 71, 66) -#define png_sTER PNG_CHUNK(115, 84, 69, 82) -#define png_tEXt PNG_CHUNK(116, 69, 88, 116) -#define png_tIME PNG_CHUNK(116, 73, 77, 69) -#define png_tRNS PNG_CHUNK(116, 82, 78, 83) -#define png_zTXt PNG_CHUNK(122, 84, 88, 116) +/* Constants for known chunk types. + * + * MAINTAINERS: If you need to add a chunk, define the name here. + * For historical reasons these constants have the form png_; i.e. + * the prefix is lower case. Please use decimal values as the parameters to + * match the ISO PNG specification and to avoid relying on the C locale + * interpretation of character values. Please keep the list sorted. + * + * Notice that PNG_U32 is used to define a 32-bit value for the 4 byte chunk + * type. In fact the specification does not express chunk types this way, + * however using a 32-bit value means that the chunk type can be read from the + * stream using exactly the same code as used for a 32-bit unsigned value and + * can be examined far more efficiently (using one arithmetic compare). + * + * Prior to 1.5.6 the chunk type constants were expressed as C strings. The + * libpng API still uses strings for 'unknown' chunks and a macro, + * PNG_STRING_FROM_CHUNK, allows a string to be generated if required. Notice + * that for portable code numeric values must still be used; the string "IHDR" + * is not portable and neither is PNG_U32('I', 'H', 'D', 'R'). + * + * In 1.7.0 the definitions will be made public in png.h to avoid having to + * duplicate the same definitions in application code. + */ +#define png_IDAT PNG_U32( 73, 68, 65, 84) +#define png_IEND PNG_U32( 73, 69, 78, 68) +#define png_IHDR PNG_U32( 73, 72, 68, 82) +#define png_PLTE PNG_U32( 80, 76, 84, 69) +#define png_bKGD PNG_U32( 98, 75, 71, 68) +#define png_cHRM PNG_U32( 99, 72, 82, 77) +#define png_fRAc PNG_U32(102, 82, 65, 99) /* registered, not defined */ +#define png_gAMA PNG_U32(103, 65, 77, 65) +#define png_gIFg PNG_U32(103, 73, 70, 103) +#define png_gIFt PNG_U32(103, 73, 70, 116) /* deprecated */ +#define png_gIFx PNG_U32(103, 73, 70, 120) +#define png_hIST PNG_U32(104, 73, 83, 84) +#define png_iCCP PNG_U32(105, 67, 67, 80) +#define png_iTXt PNG_U32(105, 84, 88, 116) +#define png_oFFs PNG_U32(111, 70, 70, 115) +#define png_pCAL PNG_U32(112, 67, 65, 76) +#define png_pHYs PNG_U32(112, 72, 89, 115) +#define png_sBIT PNG_U32(115, 66, 73, 84) +#define png_sCAL PNG_U32(115, 67, 65, 76) +#define png_sPLT PNG_U32(115, 80, 76, 84) +#define png_sRGB PNG_U32(115, 82, 71, 66) +#define png_sTER PNG_U32(115, 84, 69, 82) +#define png_tEXt PNG_U32(116, 69, 88, 116) +#define png_tIME PNG_U32(116, 73, 77, 69) +#define png_tRNS PNG_U32(116, 82, 78, 83) +#define png_zTXt PNG_U32(122, 84, 88, 116) /* The following will work on (signed char*) strings, whereas the get_uint_32 * macro will fail on top-bit-set values because of the sign extension. */ #define PNG_CHUNK_FROM_STRING(s)\ - PNG_CHUNK(0xff&(s)[0], 0xff&(s)[1], 0xff&(s)[2], 0xff&(s)[3]) + PNG_U32(0xff & (s)[0], 0xff & (s)[1], 0xff & (s)[2], 0xff & (s)[3]) /* This uses (char), not (png_byte) to avoid warnings on systems where (char) is * signed and the argument is a (char[]) This macro will fail miserably on * systems where (char) is more than 8 bits. */ #define PNG_STRING_FROM_CHUNK(s,c)\ - (void)(((char*)(s))[0]=(char)((c)>>24), ((char*)(s))[1]=(char)((c)>>16),\ - ((char*)(s))[2]=(char)((c)>>8), ((char*)(s))[3]=(char)((c))) + (void)(((char*)(s))[0]=(char)(((c)>>24) & 0xff), \ + ((char*)(s))[1]=(char)(((c)>>16) & 0xff),\ + ((char*)(s))[2]=(char)(((c)>>8) & 0xff), \ + ((char*)(s))[3]=(char)((c & 0xff))) /* Do the same but terminate with a null character. */ #define PNG_CSTRING_FROM_CHUNK(s,c)\ @@ -693,6 +777,24 @@ #include "pngstruct.h" #include "pnginfo.h" +/* Validate the include paths - the include path used to generate pnglibconf.h + * must match that used in the build, or we must be using pnglibconf.h.prebuilt: + */ +#if PNG_ZLIB_VERNUM != 0 && PNG_ZLIB_VERNUM != ZLIB_VERNUM +# error ZLIB_VERNUM != PNG_ZLIB_VERNUM \ + "-I (include path) error: see the notes in pngpriv.h" + /* This means that when pnglibconf.h was built the copy of zlib.h that it + * used is not the same as the one being used here. Because the build of + * libpng makes decisions to use inflateInit2 and inflateReset2 based on the + * zlib version number and because this affects handling of certain broken + * PNG files the -I directives must match. + * + * The most likely explanation is that you passed a -I in CFLAGS. This will + * not work; all the preprocessor directories and in particular all the -I + * directives must be in CPPFLAGS. + */ +#endif + /* This is used for 16 bit gamma tables -- only the top level pointers are * const; this could be changed: */ @@ -711,12 +813,13 @@ PNG_INTERNAL_DATA(const png_uint_16, png_sRGB_table, [256]); PNG_INTERNAL_DATA(const png_uint_16, png_sRGB_base, [512]); PNG_INTERNAL_DATA(const png_byte, png_sRGB_delta, [512]); -#define PNG_sRGB_FROM_LINEAR(linear) ((png_byte)((png_sRGB_base[(linear)>>15] +\ - ((((linear)&0x7fff)*png_sRGB_delta[(linear)>>15])>>12)) >> 8)) +#define PNG_sRGB_FROM_LINEAR(linear) \ + ((png_byte)(0xff & ((png_sRGB_base[(linear)>>15] \ + + ((((linear) & 0x7fff)*png_sRGB_delta[(linear)>>15])>>12)) >> 8))) /* Given a value 'linear' in the range 0..255*65535 calculate the 8-bit sRGB * encoded value with maximum error 0.646365. Note that the input is not a * 16-bit value; it has been multiplied by 255! */ -#endif /* PNG_SIMPLIFIED_READ/WRITE */ +#endif /* SIMPLIFIED_READ/WRITE */ /* Inhibit C++ name-mangling for libpng functions but not for system calls. */ @@ -771,7 +874,7 @@ PNG_INTERNAL_FUNCTION(png_voidp,png_malloc_base,(png_const_structrp png_ptr, #if defined(PNG_TEXT_SUPPORTED) || defined(PNG_sPLT_SUPPORTED) ||\ defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) /* Internal array allocator, outputs no error or warning messages on failure, - * just returns NULL. + * just returns NULL. */ PNG_INTERNAL_FUNCTION(png_voidp,png_malloc_array,(png_const_structrp png_ptr, int nelements, size_t element_size),PNG_ALLOCATED); @@ -951,7 +1054,7 @@ PNG_INTERNAL_FUNCTION(void,png_write_tEXt,(png_structrp png_ptr, #ifdef PNG_WRITE_zTXt_SUPPORTED PNG_INTERNAL_FUNCTION(void,png_write_zTXt,(png_structrp png_ptr, png_const_charp - key, png_const_charp text, png_size_t text_len, int compression),PNG_EMPTY); + key, png_const_charp text, int compression),PNG_EMPTY); #endif #ifdef PNG_WRITE_iTXt_SUPPORTED @@ -1090,7 +1193,7 @@ PNG_INTERNAL_FUNCTION(void,png_read_finish_IDAT,(png_structrp png_ptr), PNG_INTERNAL_FUNCTION(void,png_read_finish_row,(png_structrp png_ptr), PNG_EMPTY); /* Finish a row while reading, dealing with interlacing passes, etc. */ -#endif +#endif /* SEQUENTIAL_READ */ /* Initialize the row buffers, etc. */ PNG_INTERNAL_FUNCTION(void,png_read_start_row,(png_structrp png_ptr),PNG_EMPTY); @@ -1101,32 +1204,7 @@ PNG_INTERNAL_FUNCTION(void,png_read_transform_info,(png_structrp png_ptr, png_inforp info_ptr),PNG_EMPTY); #endif -/* These are the functions that do the transformations */ -#ifdef PNG_READ_FILLER_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_read_filler,(png_row_infop row_info, - png_bytep row, png_uint_32 filler, png_uint_32 flags),PNG_EMPTY); -#endif - -#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_read_swap_alpha,(png_row_infop row_info, - png_bytep row),PNG_EMPTY); -#endif - -#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_write_swap_alpha,(png_row_infop row_info, - png_bytep row),PNG_EMPTY); -#endif - -#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_read_invert_alpha,(png_row_infop row_info, - png_bytep row),PNG_EMPTY); -#endif - -#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_write_invert_alpha,(png_row_infop row_info, - png_bytep row),PNG_EMPTY); -#endif - +/* Shared transform functions, defined in pngtran.c */ #if defined(PNG_WRITE_FILLER_SUPPORTED) || \ defined(PNG_READ_STRIP_ALPHA_SUPPORTED) PNG_INTERNAL_FUNCTION(void,png_do_strip_channel,(png_row_infop row_info, @@ -1146,96 +1224,16 @@ PNG_INTERNAL_FUNCTION(void,png_do_packswap,(png_row_infop row_info, png_bytep row),PNG_EMPTY); #endif -#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED -PNG_INTERNAL_FUNCTION(int,png_do_rgb_to_gray,(png_structrp png_ptr, - png_row_infop row_info, png_bytep row),PNG_EMPTY); -#endif - -#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_gray_to_rgb,(png_row_infop row_info, - png_bytep row),PNG_EMPTY); -#endif - -#ifdef PNG_READ_PACK_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_unpack,(png_row_infop row_info, - png_bytep row),PNG_EMPTY); -#endif - -#ifdef PNG_READ_SHIFT_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_unshift,(png_row_infop row_info, - png_bytep row, png_const_color_8p sig_bits),PNG_EMPTY); -#endif - #if defined(PNG_READ_INVERT_SUPPORTED) || defined(PNG_WRITE_INVERT_SUPPORTED) PNG_INTERNAL_FUNCTION(void,png_do_invert,(png_row_infop row_info, png_bytep row),PNG_EMPTY); #endif -#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_scale_16_to_8,(png_row_infop row_info, - png_bytep row),PNG_EMPTY); -#endif - -#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_chop,(png_row_infop row_info, - png_bytep row),PNG_EMPTY); -#endif - -#ifdef PNG_READ_QUANTIZE_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_quantize,(png_row_infop row_info, - png_bytep row, png_const_bytep palette_lookup, - png_const_bytep quantize_lookup),PNG_EMPTY); - -# ifdef PNG_CORRECT_PALETTE_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_correct_palette,(png_structrp png_ptr, - png_colorp palette, int num_palette),PNG_EMPTY); -# endif -#endif - #if defined(PNG_READ_BGR_SUPPORTED) || defined(PNG_WRITE_BGR_SUPPORTED) PNG_INTERNAL_FUNCTION(void,png_do_bgr,(png_row_infop row_info, png_bytep row),PNG_EMPTY); #endif -#ifdef PNG_WRITE_PACK_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_pack,(png_row_infop row_info, - png_bytep row, png_uint_32 bit_depth),PNG_EMPTY); -#endif - -#ifdef PNG_WRITE_SHIFT_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_shift,(png_row_infop row_info, - png_bytep row, png_const_color_8p bit_depth),PNG_EMPTY); -#endif - -#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\ - defined(PNG_READ_ALPHA_MODE_SUPPORTED) -PNG_INTERNAL_FUNCTION(void,png_do_compose,(png_row_infop row_info, - png_bytep row, png_structrp png_ptr),PNG_EMPTY); -#endif - -#ifdef PNG_READ_GAMMA_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_gamma,(png_row_infop row_info, - png_bytep row, png_structrp png_ptr),PNG_EMPTY); -#endif - -#ifdef PNG_READ_ALPHA_MODE_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_encode_alpha,(png_row_infop row_info, - png_bytep row, png_structrp png_ptr),PNG_EMPTY); -#endif - -#ifdef PNG_READ_EXPAND_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_expand_palette,(png_row_infop row_info, - png_bytep row, png_const_colorp palette, png_const_bytep trans, - int num_trans),PNG_EMPTY); -PNG_INTERNAL_FUNCTION(void,png_do_expand,(png_row_infop row_info, - png_bytep row, png_const_color_16p trans_color),PNG_EMPTY); -#endif - -#ifdef PNG_READ_EXPAND_16_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_expand_16,(png_row_infop row_info, - png_bytep row),PNG_EMPTY); -#endif - /* The following decodes the appropriate chunks, and does error correction, * then calls the appropriate callback for the chunk if it is valid. */ @@ -1271,7 +1269,7 @@ PNG_INTERNAL_FUNCTION(void,png_handle_hIST,(png_structrp png_ptr, #ifdef PNG_READ_iCCP_SUPPORTED PNG_INTERNAL_FUNCTION(void,png_handle_iCCP,(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length),PNG_EMPTY); -#endif /* PNG_READ_iCCP_SUPPORTED */ +#endif /* READ_iCCP */ #ifdef PNG_READ_iTXt_SUPPORTED PNG_INTERNAL_FUNCTION(void,png_handle_iTXt,(png_structrp png_ptr, @@ -1306,7 +1304,7 @@ PNG_INTERNAL_FUNCTION(void,png_handle_sCAL,(png_structrp png_ptr, #ifdef PNG_READ_sPLT_SUPPORTED PNG_INTERNAL_FUNCTION(void,png_handle_sPLT,(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length),PNG_EMPTY); -#endif /* PNG_READ_sPLT_SUPPORTED */ +#endif /* READ_sPLT */ #ifdef PNG_READ_sRGB_SUPPORTED PNG_INTERNAL_FUNCTION(void,png_handle_sRGB,(png_structrp png_ptr, @@ -1336,7 +1334,6 @@ PNG_INTERNAL_FUNCTION(void,png_handle_zTXt,(png_structrp png_ptr, PNG_INTERNAL_FUNCTION(void,png_check_chunk_name,(png_structrp png_ptr, png_uint_32 chunk_name),PNG_EMPTY); -#ifdef PNG_READ_SUPPORTED PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length, int keep),PNG_EMPTY); /* This is the function that gets called for unknown chunks. The 'keep' @@ -1345,16 +1342,14 @@ PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr, * just skips the chunk or errors out if it is critical. */ -#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED -#ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED +#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) ||\ + defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED) PNG_INTERNAL_FUNCTION(int,png_chunk_unknown_handling, (png_const_structrp png_ptr, png_uint_32 chunk_name),PNG_EMPTY); /* Exactly as the API png_handle_as_unknown() except that the argument is a * 32-bit chunk name, not a string. */ -#endif -#endif /* PNG_READ_UNKNOWN_CHUNKS_SUPPORTED */ -#endif /* PNG_READ_SUPPORTED */ +#endif /* READ_UNKNOWN_CHUNKS || HANDLE_AS_UNKNOWN */ /* Handle the transformations for reading and writing */ #ifdef PNG_READ_TRANSFORMS_SUPPORTED @@ -1423,14 +1418,7 @@ PNG_INTERNAL_FUNCTION(void,png_push_read_iTXt,(png_structrp png_ptr, png_inforp info_ptr),PNG_EMPTY); # endif -#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ - -#ifdef PNG_MNG_FEATURES_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_do_read_intrapixel,(png_row_infop row_info, - png_bytep row),PNG_EMPTY); -PNG_INTERNAL_FUNCTION(void,png_do_write_intrapixel,(png_row_infop row_info, - png_bytep row),PNG_EMPTY); -#endif +#endif /* PROGRESSIVE_READ */ /* Added at libpng version 1.6.0 */ #ifdef PNG_GAMMA_SUPPORTED @@ -1773,7 +1761,7 @@ PNG_INTERNAL_FUNCTION(int,png_check_fp_string,(png_const_charp string, png_size_t size),PNG_EMPTY); #endif /* pCAL || sCAL */ -#if defined(PNG_READ_GAMMA_SUPPORTED) ||\ +#if defined(PNG_GAMMA_SUPPORTED) ||\ defined(PNG_INCH_CONVERSIONS_SUPPORTED) || defined(PNG_READ_pHYs_SUPPORTED) /* Added at libpng version 1.5.0 */ /* This is a utility to provide a*times/div (rounded) and indicate @@ -1864,11 +1852,11 @@ typedef struct png_control * errors that might occur. Returns true on success, false on failure (either * of the function or as a result of a png_error.) */ -PNG_INTERNAL_FUNCTION(void,png_safe_error,(png_structp png_ptr, +PNG_INTERNAL_CALLBACK(void,png_safe_error,(png_structp png_ptr, png_const_charp error_message),PNG_NORETURN); #ifdef PNG_WARNINGS_SUPPORTED -PNG_INTERNAL_FUNCTION(void,png_safe_warning,(png_structp png_ptr, +PNG_INTERNAL_CALLBACK(void,png_safe_warning,(png_structp png_ptr, png_const_charp warning_message),PNG_EMPTY); #else # define png_safe_warning 0/*dummy argument*/ @@ -1890,14 +1878,22 @@ PNG_INTERNAL_FUNCTION(void, png_image_free, (png_imagep image), PNG_EMPTY); #endif /* SIMPLIFIED READ/WRITE */ +/* These are initialization functions for hardware specific PNG filter + * optimizations; list these here then select the appropriate one at compile + * time using the macro PNG_FILTER_OPTIMIZATIONS. If the macro is not defined + * the generic code is used. + */ #ifdef PNG_FILTER_OPTIMIZATIONS PNG_INTERNAL_FUNCTION(void, PNG_FILTER_OPTIMIZATIONS, (png_structp png_ptr, - unsigned int bpp), PNG_EMPTY); - /* This is the initialization function for hardware specific optimizations, - * one implementation (for ARM NEON machines) is contained in - * arm/filter_neon.c. It need not be defined - the generic code will be used - * if not. + unsigned int bpp), PNG_EMPTY); + /* Just declare the optimization that will be used */ +#else + /* List *all* the possible optimizations here - this branch is required if + * the builder of libpng passes the definition of PNG_FILTER_OPTIMIZATIONS in + * CFLAGS in place of CPPFLAGS *and* uses symbol prefixing. */ +PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_neon, + (png_structp png_ptr, unsigned int bpp), PNG_EMPTY); #endif /* Maintainer: Put new private prototypes here ^ */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngread.c b/3rdparty/libpng/pngread.c similarity index 88% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngread.c rename to 3rdparty/libpng/pngread.c index e32f31d541..6764dbe561 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngread.c +++ b/3rdparty/libpng/pngread.c @@ -1,8 +1,8 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.6.1 [March 28, 2013] - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.17 [March 26, 2015] + * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -44,7 +44,7 @@ png_create_read_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr, { png_structp png_ptr = png_create_png_struct(user_png_ver, error_ptr, error_fn, warn_fn, mem_ptr, malloc_fn, free_fn); -#endif /* PNG_USER_MEM_SUPPORTED */ +#endif /* USER_MEM */ if (png_ptr != NULL) { @@ -113,20 +113,20 @@ png_read_info(png_structrp png_ptr, png_inforp info_ptr) */ if (chunk_name == png_IDAT) { - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "Missing IHDR before IDAT"); else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE && - !(png_ptr->mode & PNG_HAVE_PLTE)) + (png_ptr->mode & PNG_HAVE_PLTE) == 0) png_chunk_error(png_ptr, "Missing PLTE before IDAT"); - else if (png_ptr->mode & PNG_AFTER_IDAT) + else if ((png_ptr->mode & PNG_AFTER_IDAT) != 0) png_chunk_benign_error(png_ptr, "Too many IDATs found"); png_ptr->mode |= PNG_HAVE_IDAT; } - else if (png_ptr->mode & PNG_HAVE_IDAT) + else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0) png_ptr->mode |= PNG_AFTER_IDAT; /* This should be a binary subdivision search or a hash for @@ -252,7 +252,7 @@ png_read_info(png_structrp png_ptr, png_inforp info_ptr) PNG_HANDLE_CHUNK_AS_DEFAULT); } } -#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */ +#endif /* SEQUENTIAL_READ */ /* Optional call to update the users info_ptr structure */ void PNGAPI @@ -302,9 +302,75 @@ png_start_read_image(png_structrp png_ptr) "png_start_read_image/png_read_update_info: duplicate call"); } } -#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */ +#endif /* SEQUENTIAL_READ */ #ifdef PNG_SEQUENTIAL_READ_SUPPORTED +#ifdef PNG_MNG_FEATURES_SUPPORTED +/* Undoes intrapixel differencing, + * NOTE: this is apparently only supported in the 'sequential' reader. + */ +static void +png_do_read_intrapixel(png_row_infop row_info, png_bytep row) +{ + png_debug(1, "in png_do_read_intrapixel"); + + if ( + (row_info->color_type & PNG_COLOR_MASK_COLOR) != 0) + { + int bytes_per_pixel; + png_uint_32 row_width = row_info->width; + + if (row_info->bit_depth == 8) + { + png_bytep rp; + png_uint_32 i; + + if (row_info->color_type == PNG_COLOR_TYPE_RGB) + bytes_per_pixel = 3; + + else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) + bytes_per_pixel = 4; + + else + return; + + for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel) + { + *(rp) = (png_byte)((256 + *rp + *(rp + 1)) & 0xff); + *(rp+2) = (png_byte)((256 + *(rp + 2) + *(rp + 1)) & 0xff); + } + } + else if (row_info->bit_depth == 16) + { + png_bytep rp; + png_uint_32 i; + + if (row_info->color_type == PNG_COLOR_TYPE_RGB) + bytes_per_pixel = 6; + + else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) + bytes_per_pixel = 8; + + else + return; + + for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel) + { + png_uint_32 s0 = (*(rp ) << 8) | *(rp + 1); + png_uint_32 s1 = (*(rp + 2) << 8) | *(rp + 3); + png_uint_32 s2 = (*(rp + 4) << 8) | *(rp + 5); + png_uint_32 red = (s0 + s1 + 65536) & 0xffff; + png_uint_32 blue = (s2 + s1 + 65536) & 0xffff; + *(rp ) = (png_byte)((red >> 8) & 0xff); + *(rp + 1) = (png_byte)(red & 0xff); + *(rp + 4) = (png_byte)((blue >> 8) & 0xff); + *(rp + 5) = (png_byte)(blue & 0xff); + } + } + } +} +#endif /* MNG_FEATURES */ + void PNGAPI png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row) { @@ -319,7 +385,7 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row) /* png_read_start_row sets the information (in particular iwidth) for this * interlace pass. */ - if (!(png_ptr->flags & PNG_FLAG_ROW_INIT)) + if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0) png_read_start_row(png_ptr); /* 1.5.6: row_info moved out of png_struct to a local here. */ @@ -330,45 +396,47 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row) row_info.pixel_depth = png_ptr->pixel_depth; row_info.rowbytes = PNG_ROWBYTES(row_info.pixel_depth, row_info.width); +#ifdef PNG_WARNINGS_SUPPORTED if (png_ptr->row_number == 0 && png_ptr->pass == 0) { /* Check for transforms that have been set but were defined out */ #if defined(PNG_WRITE_INVERT_SUPPORTED) && !defined(PNG_READ_INVERT_SUPPORTED) - if (png_ptr->transformations & PNG_INVERT_MONO) + if ((png_ptr->transformations & PNG_INVERT_MONO) != 0) png_warning(png_ptr, "PNG_READ_INVERT_SUPPORTED is not defined"); #endif #if defined(PNG_WRITE_FILLER_SUPPORTED) && !defined(PNG_READ_FILLER_SUPPORTED) - if (png_ptr->transformations & PNG_FILLER) + if ((png_ptr->transformations & PNG_FILLER) != 0) png_warning(png_ptr, "PNG_READ_FILLER_SUPPORTED is not defined"); #endif #if defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \ !defined(PNG_READ_PACKSWAP_SUPPORTED) - if (png_ptr->transformations & PNG_PACKSWAP) + if ((png_ptr->transformations & PNG_PACKSWAP) != 0) png_warning(png_ptr, "PNG_READ_PACKSWAP_SUPPORTED is not defined"); #endif #if defined(PNG_WRITE_PACK_SUPPORTED) && !defined(PNG_READ_PACK_SUPPORTED) - if (png_ptr->transformations & PNG_PACK) + if ((png_ptr->transformations & PNG_PACK) != 0) png_warning(png_ptr, "PNG_READ_PACK_SUPPORTED is not defined"); #endif #if defined(PNG_WRITE_SHIFT_SUPPORTED) && !defined(PNG_READ_SHIFT_SUPPORTED) - if (png_ptr->transformations & PNG_SHIFT) + if ((png_ptr->transformations & PNG_SHIFT) != 0) png_warning(png_ptr, "PNG_READ_SHIFT_SUPPORTED is not defined"); #endif #if defined(PNG_WRITE_BGR_SUPPORTED) && !defined(PNG_READ_BGR_SUPPORTED) - if (png_ptr->transformations & PNG_BGR) + if ((png_ptr->transformations & PNG_BGR) != 0) png_warning(png_ptr, "PNG_READ_BGR_SUPPORTED is not defined"); #endif #if defined(PNG_WRITE_SWAP_SUPPORTED) && !defined(PNG_READ_SWAP_SUPPORTED) - if (png_ptr->transformations & PNG_SWAP_BYTES) + if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0) png_warning(png_ptr, "PNG_READ_SWAP_SUPPORTED is not defined"); #endif } +#endif /* WARNINGS */ #ifdef PNG_READ_INTERLACING_SUPPORTED /* If interlaced and we do not need a new row, combine row and return. @@ -377,7 +445,8 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row) * untransformed) and, because of the libpng API for interlaced images, this * means we must transform before de-interlacing. */ - if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE)) + if (png_ptr->interlaced != 0 && + (png_ptr->transformations & PNG_INTERLACE) != 0) { switch (png_ptr->pass) { @@ -448,7 +517,7 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row) default: case 6: - if (!(png_ptr->row_number & 1)) + if ((png_ptr->row_number & 1) == 0) { png_read_finish_row(png_ptr); return; @@ -458,7 +527,7 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row) } #endif - if (!(png_ptr->mode & PNG_HAVE_IDAT)) + if ((png_ptr->mode & PNG_HAVE_IDAT) == 0) png_error(png_ptr, "Invalid attempt to read row data"); /* Fill the row with IDAT data: */ @@ -481,7 +550,7 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row) memcpy(png_ptr->prev_row, png_ptr->row_buf, row_info.rowbytes + 1); #ifdef PNG_MNG_FEATURES_SUPPORTED - if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) && + if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 && (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING)) { /* Intrapixel differencing */ @@ -489,7 +558,6 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row) } #endif - #ifdef PNG_READ_TRANSFORMS_SUPPORTED if (png_ptr->transformations) png_do_read_transformations(png_ptr, &row_info); @@ -507,9 +575,9 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row) png_error(png_ptr, "internal sequential row size calculation error"); #ifdef PNG_READ_INTERLACING_SUPPORTED - /* Blow up interlaced rows to full size */ - if (png_ptr->interlaced && - (png_ptr->transformations & PNG_INTERLACE)) + /* Expand interlaced rows to full size */ + if (png_ptr->interlaced != 0 && + (png_ptr->transformations & PNG_INTERLACE) != 0) { if (png_ptr->pass < 6) png_do_read_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass, @@ -537,7 +605,7 @@ png_read_row(png_structrp png_ptr, png_bytep row, png_bytep dsp_row) (*(png_ptr->read_row_fn))(png_ptr, png_ptr->row_number, png_ptr->pass); } -#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */ +#endif /* SEQUENTIAL_READ */ #ifdef PNG_SEQUENTIAL_READ_SUPPORTED /* Read one or more rows of image data. If the image is interlaced, @@ -604,7 +672,7 @@ png_read_rows(png_structrp png_ptr, png_bytepp row, dp++; } } -#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */ +#endif /* SEQUENTIAL_READ */ #ifdef PNG_SEQUENTIAL_READ_SUPPORTED /* Read the entire image. If the image has an alpha channel or a tRNS @@ -632,7 +700,7 @@ png_read_image(png_structrp png_ptr, png_bytepp image) return; #ifdef PNG_READ_INTERLACING_SUPPORTED - if (!(png_ptr->flags & PNG_FLAG_ROW_INIT)) + if ((png_ptr->flags & PNG_FLAG_ROW_INIT) == 0) { pass = png_set_interlace_handling(png_ptr); /* And make sure transforms are initialized. */ @@ -640,7 +708,8 @@ png_read_image(png_structrp png_ptr, png_bytepp image) } else { - if (png_ptr->interlaced && !(png_ptr->transformations & PNG_INTERLACE)) + if (png_ptr->interlaced != 0 && + (png_ptr->transformations & PNG_INTERLACE) == 0) { /* Caller called png_start_read_image or png_read_update_info without * first turning on the PNG_INTERLACE transform. We can fix this here, @@ -677,7 +746,7 @@ png_read_image(png_structrp png_ptr, png_bytepp image) } } } -#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */ +#endif /* SEQUENTIAL_READ */ #ifdef PNG_SEQUENTIAL_READ_SUPPORTED /* Read the end of the PNG file. Will not read past the end of the @@ -700,7 +769,7 @@ png_read_end(png_structrp png_ptr, png_inforp info_ptr) * still be pending IDAT data and an owned zstream. Deal with this here. */ #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED - if (!png_chunk_unknown_handling(png_ptr, png_IDAT)) + if (png_chunk_unknown_handling(png_ptr, png_IDAT) == 0) #endif png_read_finish_IDAT(png_ptr); @@ -716,18 +785,22 @@ png_read_end(png_structrp png_ptr, png_inforp info_ptr) png_uint_32 length = png_read_chunk_header(png_ptr); png_uint_32 chunk_name = png_ptr->chunk_name; - if (chunk_name == png_IHDR) + if (chunk_name == png_IEND) + png_handle_IEND(png_ptr, info_ptr, length); + + else if (chunk_name == png_IHDR) png_handle_IHDR(png_ptr, info_ptr, length); - else if (chunk_name == png_IEND) - png_handle_IEND(png_ptr, info_ptr, length); + else if (info_ptr == NULL) + png_crc_finish(png_ptr, length); #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED else if ((keep = png_chunk_unknown_handling(png_ptr, chunk_name)) != 0) { if (chunk_name == png_IDAT) { - if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT)) + if ((length > 0) || + (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) != 0) png_benign_error(png_ptr, "Too many IDATs found"); } png_handle_unknown(png_ptr, info_ptr, length, keep); @@ -741,7 +814,7 @@ png_read_end(png_structrp png_ptr, png_inforp info_ptr) /* Zero length IDATs are legal after the last IDAT has been * read, but not after other chunks have been read. */ - if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT)) + if ((length > 0) || (png_ptr->mode & PNG_HAVE_CHUNK_AFTER_IDAT) != 0) png_benign_error(png_ptr, "Too many IDATs found"); png_crc_finish(png_ptr, length); @@ -837,9 +910,9 @@ png_read_end(png_structrp png_ptr, png_inforp info_ptr) else png_handle_unknown(png_ptr, info_ptr, length, PNG_HANDLE_CHUNK_AS_DEFAULT); - } while (!(png_ptr->mode & PNG_HAVE_IEND)); + } while ((png_ptr->mode & PNG_HAVE_IEND) == 0); } -#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */ +#endif /* SEQUENTIAL_READ */ /* Free all memory used in the read struct */ static void @@ -852,22 +925,33 @@ png_read_destroy(png_structrp png_ptr) #endif png_free(png_ptr, png_ptr->big_row_buf); + png_ptr->big_row_buf = NULL; png_free(png_ptr, png_ptr->big_prev_row); + png_ptr->big_prev_row = NULL; png_free(png_ptr, png_ptr->read_buffer); + png_ptr->read_buffer = NULL; #ifdef PNG_READ_QUANTIZE_SUPPORTED png_free(png_ptr, png_ptr->palette_lookup); + png_ptr->palette_lookup = NULL; png_free(png_ptr, png_ptr->quantize_index); + png_ptr->quantize_index = NULL; #endif - if (png_ptr->free_me & PNG_FREE_PLTE) + if ((png_ptr->free_me & PNG_FREE_PLTE) != 0) + { png_zfree(png_ptr, png_ptr->palette); + png_ptr->palette = NULL; + } png_ptr->free_me &= ~PNG_FREE_PLTE; #if defined(PNG_tRNS_SUPPORTED) || \ defined(PNG_READ_EXPAND_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) - if (png_ptr->free_me & PNG_FREE_TRNS) + if ((png_ptr->free_me & PNG_FREE_TRNS) != 0) + { png_free(png_ptr, png_ptr->trans_alpha); + png_ptr->trans_alpha = NULL; + } png_ptr->free_me &= ~PNG_FREE_TRNS; #endif @@ -875,15 +959,18 @@ png_read_destroy(png_structrp png_ptr) #ifdef PNG_PROGRESSIVE_READ_SUPPORTED png_free(png_ptr, png_ptr->save_buffer); + png_ptr->save_buffer = NULL; #endif -#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) &&\ +#if defined(PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED) && \ defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) png_free(png_ptr, png_ptr->unknown_chunk.data); + png_ptr->unknown_chunk.data = NULL; #endif #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED png_free(png_ptr, png_ptr->chunk_list); + png_ptr->chunk_list = NULL; #endif /* NOTE: the 'setjmp' buffer may still be allocated and the memory and error @@ -936,8 +1023,6 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr, int transforms, voidp params) { - int row; - if (png_ptr == NULL || info_ptr == NULL) return; @@ -949,126 +1034,149 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr, png_error(png_ptr, "Image is too high to process with png_read_png()"); /* -------------- image transformations start here ------------------- */ + /* libpng 1.6.10: add code to cause a png_app_error if a selected TRANSFORM + * is not implemented. This will only happen in de-configured (non-default) + * libpng builds. The results can be unexpected - png_read_png may return + * short or mal-formed rows because the transform is skipped. + */ -#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED /* Tell libpng to strip 16-bit/color files down to 8 bits per color. */ - if (transforms & PNG_TRANSFORM_SCALE_16) - { + if ((transforms & PNG_TRANSFORM_SCALE_16) != 0) /* Added at libpng-1.5.4. "strip_16" produces the same result that it * did in earlier versions, while "scale_16" is now more accurate. */ +#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED png_set_scale_16(png_ptr); - } +#else + png_app_error(png_ptr, "PNG_TRANSFORM_SCALE_16 not supported"); #endif -#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED /* If both SCALE and STRIP are required pngrtran will effectively cancel the * latter by doing SCALE first. This is ok and allows apps not to check for * which is supported to get the right answer. */ - if (transforms & PNG_TRANSFORM_STRIP_16) + if ((transforms & PNG_TRANSFORM_STRIP_16) != 0) +#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED png_set_strip_16(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_STRIP_16 not supported"); #endif -#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED /* Strip alpha bytes from the input data without combining with * the background (not recommended). */ - if (transforms & PNG_TRANSFORM_STRIP_ALPHA) + if ((transforms & PNG_TRANSFORM_STRIP_ALPHA) != 0) +#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED png_set_strip_alpha(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_STRIP_ALPHA not supported"); #endif -#if defined(PNG_READ_PACK_SUPPORTED) && !defined(PNG_READ_EXPAND_SUPPORTED) /* Extract multiple pixels with bit depths of 1, 2, or 4 from a single * byte into separate bytes (useful for paletted and grayscale images). */ - if (transforms & PNG_TRANSFORM_PACKING) + if ((transforms & PNG_TRANSFORM_PACKING) != 0) +#ifdef PNG_READ_PACK_SUPPORTED png_set_packing(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_PACKING not supported"); #endif -#ifdef PNG_READ_PACKSWAP_SUPPORTED /* Change the order of packed pixels to least significant bit first * (not useful if you are using png_set_packing). */ - if (transforms & PNG_TRANSFORM_PACKSWAP) + if ((transforms & PNG_TRANSFORM_PACKSWAP) != 0) +#ifdef PNG_READ_PACKSWAP_SUPPORTED png_set_packswap(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_PACKSWAP not supported"); #endif -#ifdef PNG_READ_EXPAND_SUPPORTED /* Expand paletted colors into true RGB triplets * Expand grayscale images to full 8 bits from 1, 2, or 4 bits/pixel * Expand paletted or RGB images with transparency to full alpha * channels so the data will be available as RGBA quartets. */ - if (transforms & PNG_TRANSFORM_EXPAND) - if ((png_ptr->bit_depth < 8) || - (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) || - (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))) - png_set_expand(png_ptr); + if ((transforms & PNG_TRANSFORM_EXPAND) != 0) +#ifdef PNG_READ_EXPAND_SUPPORTED + png_set_expand(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_EXPAND not supported"); #endif /* We don't handle background color or gamma transformation or quantizing. */ -#ifdef PNG_READ_INVERT_SUPPORTED /* Invert monochrome files to have 0 as white and 1 as black */ - if (transforms & PNG_TRANSFORM_INVERT_MONO) + if ((transforms & PNG_TRANSFORM_INVERT_MONO) != 0) +#ifdef PNG_READ_INVERT_SUPPORTED png_set_invert_mono(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_MONO not supported"); #endif -#ifdef PNG_READ_SHIFT_SUPPORTED /* If you want to shift the pixel values from the range [0,255] or * [0,65535] to the original [0,7] or [0,31], or whatever range the * colors were originally in: */ - if ((transforms & PNG_TRANSFORM_SHIFT) - && png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT)) - { - png_color_8p sig_bit; - - png_get_sBIT(png_ptr, info_ptr, &sig_bit); - png_set_shift(png_ptr, sig_bit); - } + if ((transforms & PNG_TRANSFORM_SHIFT) != 0) +#ifdef PNG_READ_SHIFT_SUPPORTED + if ((info_ptr->valid & PNG_INFO_sBIT) != 0) + png_set_shift(png_ptr, &info_ptr->sig_bit); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_SHIFT not supported"); #endif -#ifdef PNG_READ_BGR_SUPPORTED /* Flip the RGB pixels to BGR (or RGBA to BGRA) */ - if (transforms & PNG_TRANSFORM_BGR) + if ((transforms & PNG_TRANSFORM_BGR) != 0) +#ifdef PNG_READ_BGR_SUPPORTED png_set_bgr(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_BGR not supported"); #endif -#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */ - if (transforms & PNG_TRANSFORM_SWAP_ALPHA) + if ((transforms & PNG_TRANSFORM_SWAP_ALPHA) != 0) +#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED png_set_swap_alpha(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ALPHA not supported"); #endif -#ifdef PNG_READ_SWAP_SUPPORTED /* Swap bytes of 16-bit files to least significant byte first */ - if (transforms & PNG_TRANSFORM_SWAP_ENDIAN) + if ((transforms & PNG_TRANSFORM_SWAP_ENDIAN) != 0) +#ifdef PNG_READ_SWAP_SUPPORTED png_set_swap(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ENDIAN not supported"); #endif /* Added at libpng-1.2.41 */ -#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED /* Invert the alpha channel from opacity to transparency */ - if (transforms & PNG_TRANSFORM_INVERT_ALPHA) + if ((transforms & PNG_TRANSFORM_INVERT_ALPHA) != 0) +#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED png_set_invert_alpha(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_ALPHA not supported"); #endif /* Added at libpng-1.2.41 */ -#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED /* Expand grayscale image to RGB */ - if (transforms & PNG_TRANSFORM_GRAY_TO_RGB) + if ((transforms & PNG_TRANSFORM_GRAY_TO_RGB) != 0) +#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED png_set_gray_to_rgb(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_GRAY_TO_RGB not supported"); #endif /* Added at libpng-1.5.4 */ + if ((transforms & PNG_TRANSFORM_EXPAND_16) != 0) #ifdef PNG_READ_EXPAND_16_SUPPORTED - if (transforms & PNG_TRANSFORM_EXPAND_16) png_set_expand_16(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_EXPAND_16 not supported"); #endif /* We don't handle adding filler bytes */ @@ -1091,16 +1199,17 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr, { png_uint_32 iptr; - info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr, - info_ptr->height * (sizeof (png_bytep))); + info_ptr->row_pointers = png_voidcast(png_bytepp, png_malloc(png_ptr, + info_ptr->height * (sizeof (png_bytep)))); + for (iptr=0; iptrheight; iptr++) info_ptr->row_pointers[iptr] = NULL; info_ptr->free_me |= PNG_FREE_ROWS; - for (row = 0; row < (int)info_ptr->height; row++) - info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr, - png_get_rowbytes(png_ptr, info_ptr)); + for (iptr = 0; iptr < info_ptr->height; iptr++) + info_ptr->row_pointers[iptr] = png_voidcast(png_bytep, + png_malloc(png_ptr, info_ptr->rowbytes)); } png_read_image(png_ptr, info_ptr->row_pointers); @@ -1109,12 +1218,10 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr, /* Read rest of file, and get additional chunks in info_ptr - REQUIRED */ png_read_end(png_ptr, info_ptr); - PNG_UNUSED(transforms) /* Quiet compiler warnings */ PNG_UNUSED(params) - } -#endif /* PNG_INFO_IMAGE_SUPPORTED */ -#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */ +#endif /* INFO_IMAGE */ +#endif /* SEQUENTIAL_READ */ #ifdef PNG_SIMPLIFIED_READ_SUPPORTED /* SIMPLIFIED READ @@ -1125,15 +1232,14 @@ png_read_png(png_structrp png_ptr, png_inforp info_ptr, /* Arguments to png_image_finish_read: */ /* Encoding of PNG data (used by the color-map code) */ -/* TODO: change these, dang, ANSI-C reserves the 'E' namespace. */ -# define E_NOTSET 0 /* File encoding not yet known */ -# define E_sRGB 1 /* 8-bit encoded to sRGB gamma */ -# define E_LINEAR 2 /* 16-bit linear: not encoded, NOT pre-multiplied! */ -# define E_FILE 3 /* 8-bit encoded to file gamma, not sRGB or linear */ -# define E_LINEAR8 4 /* 8-bit linear: only from a file value */ +# define P_NOTSET 0 /* File encoding not yet known */ +# define P_sRGB 1 /* 8-bit encoded to sRGB gamma */ +# define P_LINEAR 2 /* 16-bit linear: not encoded, NOT pre-multiplied! */ +# define P_FILE 3 /* 8-bit encoded to file gamma, not sRGB or linear */ +# define P_LINEAR8 4 /* 8-bit linear: only from a file value */ /* Color-map processing: after libpng has run on the PNG image further - * processing may be needed to conver the data to color-map indicies. + * processing may be needed to convert the data to color-map indices. */ #define PNG_CMAP_NONE 0 #define PNG_CMAP_GA 1 /* Process GA data to a color-map with alpha */ @@ -1161,7 +1267,7 @@ typedef struct png_voidp first_row; ptrdiff_t row_bytes; /* step between rows */ int file_encoding; /* E_ values above */ - png_fixed_point gamma_to_linear; /* For E_FILE, reciprocal of gamma */ + png_fixed_point gamma_to_linear; /* For P_FILE, reciprocal of gamma */ int colormap_processing; /* PNG_CMAP_ values above */ } png_image_read_control; @@ -1224,10 +1330,10 @@ png_image_format(png_structrp png_ptr) { png_uint_32 format = 0; - if (png_ptr->color_type & PNG_COLOR_MASK_COLOR) + if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0) format |= PNG_FORMAT_FLAG_COLOR; - if (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) + if ((png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0) format |= PNG_FORMAT_FLAG_ALPHA; /* Use png_ptr here, not info_ptr, because by examination png_handle_tRNS @@ -1241,7 +1347,7 @@ png_image_format(png_structrp png_ptr) if (png_ptr->bit_depth == 16) format |= PNG_FORMAT_FLAG_LINEAR; - if (png_ptr->color_type & PNG_COLOR_MASK_PALETTE) + if ((png_ptr->color_type & PNG_COLOR_MASK_PALETTE) != 0) format |= PNG_FORMAT_FLAG_COLORMAP; return format; @@ -1293,7 +1399,7 @@ png_image_read_header(png_voidp argument) #ifdef PNG_COLORSPACE_SUPPORTED /* Does the colorspace match sRGB? If there is no color endpoint * (colorant) information assume yes, otherwise require the - * 'ENDPOINTS_MATCHE_sRGB' colorspace flag to have been set. If the + * 'ENDPOINTS_MATCHP_sRGB' colorspace flag to have been set. If the * colorspace has been determined to be invalid ignore it. */ if ((format & PNG_FORMAT_FLAG_COLOR) != 0 && ((png_ptr->colorspace.flags @@ -1341,7 +1447,7 @@ png_image_begin_read_from_stdio(png_imagep image, FILE* file) { if (file != NULL) { - if (png_image_read_init(image)) + if (png_image_read_init(image) != 0) { /* This is slightly evil, but png_init_io doesn't do anything other * than this and we haven't changed the standard IO functions so @@ -1375,7 +1481,7 @@ png_image_begin_read_from_file(png_imagep image, const char *file_name) if (fp != NULL) { - if (png_image_read_init(image)) + if (png_image_read_init(image) != 0) { image->opaque->png_ptr->io_ptr = fp; image->opaque->owned_file = 1; @@ -1401,7 +1507,7 @@ png_image_begin_read_from_file(png_imagep image, const char *file_name) return 0; } -#endif /* PNG_STDIO_SUPPORTED */ +#endif /* STDIO */ static void PNGCBAPI png_image_memory_read(png_structp png_ptr, png_bytep out, png_size_t need) @@ -1440,7 +1546,7 @@ int PNGAPI png_image_begin_read_from_memory(png_imagep image, { if (memory != NULL && size > 0) { - if (png_image_read_init(image)) + if (png_image_read_init(image) != 0) { /* Now set the IO functions to read from the memory buffer and * store it into io_ptr. Again do this in-place to avoid calling a @@ -1482,17 +1588,24 @@ png_image_skip_unused_chunks(png_structrp png_ptr) * * Or image data handling: * - * tRNS, bKGD, gAMA, cHRM, sRGB, iCCP and sBIT. + * tRNS, bKGD, gAMA, cHRM, sRGB, [iCCP] and sBIT. * * This provides a small performance improvement and eliminates any * potential vulnerability to security problems in the unused chunks. + * + * At present the iCCP chunk data isn't used, so iCCP chunk can be ignored + * too. This allows the simplified API to be compiled without iCCP support, + * however if the support is there the chunk is still checked to detect + * errors (which are unfortunately quite common.) */ { static PNG_CONST png_byte chunks_to_process[] = { 98, 75, 71, 68, '\0', /* bKGD */ 99, 72, 82, 77, '\0', /* cHRM */ 103, 65, 77, 65, '\0', /* gAMA */ +# ifdef PNG_READ_iCCP_SUPPORTED 105, 67, 67, 80, '\0', /* iCCP */ +# endif 115, 66, 73, 84, '\0', /* sBIT */ 115, 82, 71, 66, '\0', /* sRGB */ }; @@ -1505,14 +1618,14 @@ png_image_skip_unused_chunks(png_structrp png_ptr) /* But do not ignore image data handling chunks */ png_set_keep_unknown_chunks(png_ptr, PNG_HANDLE_CHUNK_AS_DEFAULT, - chunks_to_process, (sizeof chunks_to_process)/5); + chunks_to_process, (int)/*SAFE*/(sizeof chunks_to_process)/5); } } # define PNG_SKIP_CHUNKS(p) png_image_skip_unused_chunks(p) #else # define PNG_SKIP_CHUNKS(p) ((void)0) -#endif /* PNG_HANDLE_AS_UNKNOWN_SUPPORTED */ +#endif /* HANDLE_AS_UNKNOWN */ /* The following macro gives the exact rounded answer for all values in the * range 0..255 (it actually divides by 51.2, but the rounding still generates @@ -1525,29 +1638,29 @@ static void set_file_encoding(png_image_read_control *display) { png_fixed_point g = display->image->opaque->png_ptr->colorspace.gamma; - if (png_gamma_significant(g)) + if (png_gamma_significant(g) != 0) { - if (png_gamma_not_sRGB(g)) + if (png_gamma_not_sRGB(g) != 0) { - display->file_encoding = E_FILE; + display->file_encoding = P_FILE; display->gamma_to_linear = png_reciprocal(g); } else - display->file_encoding = E_sRGB; + display->file_encoding = P_sRGB; } else - display->file_encoding = E_LINEAR8; + display->file_encoding = P_LINEAR8; } static unsigned int decode_gamma(png_image_read_control *display, png_uint_32 value, int encoding) { - if (encoding == E_FILE) /* double check */ + if (encoding == P_FILE) /* double check */ encoding = display->file_encoding; - if (encoding == E_NOTSET) /* must be the file encoding */ + if (encoding == P_NOTSET) /* must be the file encoding */ { set_file_encoding(display); encoding = display->file_encoding; @@ -1555,18 +1668,18 @@ decode_gamma(png_image_read_control *display, png_uint_32 value, int encoding) switch (encoding) { - case E_FILE: + case P_FILE: value = png_gamma_16bit_correct(value*257, display->gamma_to_linear); break; - case E_sRGB: + case P_sRGB: value = png_sRGB_table[value]; break; - case E_LINEAR: + case P_LINEAR: break; - case E_LINEAR8: + case P_LINEAR8: value *= 257; break; @@ -1585,9 +1698,9 @@ png_colormap_compose(png_image_read_control *display, png_uint_32 background, int encoding) { /* The file value is composed on the background, the background has the given - * encoding and so does the result, the file is encoded with E_FILE and the + * encoding and so does the result, the file is encoded with P_FILE and the * file and alpha are 8-bit values. The (output) encoding will always be - * E_LINEAR or E_sRGB. + * P_LINEAR or P_sRGB. */ png_uint_32 f = decode_gamma(display, foreground, foreground_encoding); png_uint_32 b = decode_gamma(display, background, encoding); @@ -1597,7 +1710,7 @@ png_colormap_compose(png_image_read_control *display, */ f = f * alpha + b * (255-alpha); - if (encoding == E_LINEAR) + if (encoding == P_LINEAR) { /* Scale to 65535; divide by 255, approximately (in fact this is extremely * accurate, it divides by 255.00000005937181414556, with no overflow.) @@ -1607,13 +1720,13 @@ png_colormap_compose(png_image_read_control *display, f = (f+32768) >> 16; } - else /* E_sRGB */ + else /* P_sRGB */ f = PNG_sRGB_FROM_LINEAR(f); return f; } -/* NOTE: E_LINEAR values to this routine must be 16-bit, but E_FILE values must +/* NOTE: P_LINEAR values to this routine must be 16-bit, but P_FILE values must * be 8-bit. */ static void @@ -1622,8 +1735,8 @@ png_create_colormap_entry(png_image_read_control *display, png_uint_32 alpha, int encoding) { png_imagep image = display->image; - const int output_encoding = (image->format & PNG_FORMAT_FLAG_LINEAR) ? - E_LINEAR : E_sRGB; + const int output_encoding = (image->format & PNG_FORMAT_FLAG_LINEAR) != 0 ? + P_LINEAR : P_sRGB; const int convert_to_Y = (image->format & PNG_FORMAT_FLAG_COLOR) == 0 && (red != green || green != blue); @@ -1633,18 +1746,18 @@ png_create_colormap_entry(png_image_read_control *display, /* Update the cache with whether the file gamma is significantly different * from sRGB. */ - if (encoding == E_FILE) + if (encoding == P_FILE) { - if (display->file_encoding == E_NOTSET) + if (display->file_encoding == P_NOTSET) set_file_encoding(display); - /* Note that the cached value may be E_FILE too, but if it is then the + /* Note that the cached value may be P_FILE too, but if it is then the * gamma_to_linear member has been set. */ encoding = display->file_encoding; } - if (encoding == E_FILE) + if (encoding == P_FILE) { png_fixed_point g = display->gamma_to_linear; @@ -1652,10 +1765,10 @@ png_create_colormap_entry(png_image_read_control *display, green = png_gamma_16bit_correct(green*257, g); blue = png_gamma_16bit_correct(blue*257, g); - if (convert_to_Y || output_encoding == E_LINEAR) + if (convert_to_Y != 0 || output_encoding == P_LINEAR) { alpha *= 257; - encoding = E_LINEAR; + encoding = P_LINEAR; } else @@ -1663,11 +1776,11 @@ png_create_colormap_entry(png_image_read_control *display, red = PNG_sRGB_FROM_LINEAR(red * 255); green = PNG_sRGB_FROM_LINEAR(green * 255); blue = PNG_sRGB_FROM_LINEAR(blue * 255); - encoding = E_sRGB; + encoding = P_sRGB; } } - else if (encoding == E_LINEAR8) + else if (encoding == P_LINEAR8) { /* This encoding occurs quite frequently in test cases because PngSuite * includes a gAMA 1.0 chunk with most images. @@ -1676,10 +1789,11 @@ png_create_colormap_entry(png_image_read_control *display, green *= 257; blue *= 257; alpha *= 257; - encoding = E_LINEAR; + encoding = P_LINEAR; } - else if (encoding == E_sRGB && (convert_to_Y || output_encoding == E_LINEAR)) + else if (encoding == P_sRGB && + (convert_to_Y != 0 || output_encoding == P_LINEAR)) { /* The values are 8-bit sRGB values, but must be converted to 16-bit * linear. @@ -1688,19 +1802,19 @@ png_create_colormap_entry(png_image_read_control *display, green = png_sRGB_table[green]; blue = png_sRGB_table[blue]; alpha *= 257; - encoding = E_LINEAR; + encoding = P_LINEAR; } /* This is set if the color isn't gray but the output is. */ - if (encoding == E_LINEAR) + if (encoding == P_LINEAR) { - if (convert_to_Y) + if (convert_to_Y != 0) { /* NOTE: these values are copied from png_do_rgb_to_gray */ png_uint_32 y = (png_uint_32)6968 * red + (png_uint_32)23434 * green + (png_uint_32)2366 * blue; - if (output_encoding == E_LINEAR) + if (output_encoding == P_LINEAR) y = (y + 16384) >> 15; else @@ -1709,19 +1823,20 @@ png_create_colormap_entry(png_image_read_control *display, y = (y + 128) >> 8; y *= 255; y = PNG_sRGB_FROM_LINEAR((y + 64) >> 7); - encoding = E_sRGB; + alpha = PNG_DIV257(alpha); + encoding = P_sRGB; } blue = red = green = y; } - else if (output_encoding == E_sRGB) + else if (output_encoding == P_sRGB) { red = PNG_sRGB_FROM_LINEAR(red * 255); green = PNG_sRGB_FROM_LINEAR(green * 255); blue = PNG_sRGB_FROM_LINEAR(blue * 255); alpha = PNG_DIV257(alpha); - encoding = E_sRGB; + encoding = P_sRGB; } } @@ -1730,19 +1845,19 @@ png_create_colormap_entry(png_image_read_control *display, /* Store the value. */ { -# ifdef PNG_FORMAT_BGR_SUPPORTED +# ifdef PNG_FORMAT_AFIRST_SUPPORTED const int afirst = (image->format & PNG_FORMAT_FLAG_AFIRST) != 0 && (image->format & PNG_FORMAT_FLAG_ALPHA) != 0; # else # define afirst 0 # endif # ifdef PNG_FORMAT_BGR_SUPPORTED - const int bgr = (image->format & PNG_FORMAT_FLAG_BGR) ? 2 : 0; + const int bgr = (image->format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0; # else # define bgr 0 # endif - if (output_encoding == E_LINEAR) + if (output_encoding == P_LINEAR) { png_uint_16p entry = png_voidcast(png_uint_16p, display->colormap); @@ -1797,7 +1912,7 @@ png_create_colormap_entry(png_image_read_control *display, } } - else /* output encoding is E_sRGB */ + else /* output encoding is P_sRGB */ { png_bytep entry = png_voidcast(png_bytep, display->colormap); @@ -1839,7 +1954,7 @@ make_gray_file_colormap(png_image_read_control *display) unsigned int i; for (i=0; i<256; ++i) - png_create_colormap_entry(display, i, i, i, i, 255, E_FILE); + png_create_colormap_entry(display, i, i, i, i, 255, P_FILE); return i; } @@ -1850,7 +1965,7 @@ make_gray_colormap(png_image_read_control *display) unsigned int i; for (i=0; i<256; ++i) - png_create_colormap_entry(display, i, i, i, i, 255, E_sRGB); + png_create_colormap_entry(display, i, i, i, i, 255, P_sRGB); return i; } @@ -1889,13 +2004,13 @@ make_ga_colormap(png_image_read_control *display) while (i < 231) { unsigned int gray = (i * 256 + 115) / 231; - png_create_colormap_entry(display, i++, gray, gray, gray, 255, E_sRGB); + png_create_colormap_entry(display, i++, gray, gray, gray, 255, P_sRGB); } /* 255 is used here for the component values for consistency with the code * that undoes premultiplication in pngwrite.c. */ - png_create_colormap_entry(display, i++, 255, 255, 255, 0, E_sRGB); + png_create_colormap_entry(display, i++, 255, 255, 255, 0, P_sRGB); for (a=1; a<5; ++a) { @@ -1903,7 +2018,7 @@ make_ga_colormap(png_image_read_control *display) for (g=0; g<6; ++g) png_create_colormap_entry(display, i++, g*51, g*51, g*51, a*51, - E_sRGB); + P_sRGB); } return i; @@ -1927,7 +2042,7 @@ make_rgb_colormap(png_image_read_control *display) for (b=0; b<6; ++b) png_create_colormap_entry(display, i++, r*51, g*51, b*51, 255, - E_sRGB); + P_sRGB); } } @@ -1949,12 +2064,12 @@ png_image_read_colormap(png_voidp argument) const png_structrp png_ptr = image->opaque->png_ptr; const png_uint_32 output_format = image->format; - const int output_encoding = (output_format & PNG_FORMAT_FLAG_LINEAR) ? - E_LINEAR : E_sRGB; + const int output_encoding = (output_format & PNG_FORMAT_FLAG_LINEAR) != 0 ? + P_LINEAR : P_sRGB; unsigned int cmap_entries; unsigned int output_processing; /* Output processing option */ - unsigned int data_encoding = E_NOTSET; /* Encoding libpng must produce */ + unsigned int data_encoding = P_NOTSET; /* Encoding libpng must produce */ /* Background information; the background color and the index of this color * in the color-map if it exists (else 256). @@ -1974,7 +2089,7 @@ png_image_read_colormap(png_voidp argument) png_ptr->num_trans > 0) /* alpha in input */ && ((output_format & PNG_FORMAT_FLAG_ALPHA) == 0) /* no alpha in output */) { - if (output_encoding == E_LINEAR) /* compose on black */ + if (output_encoding == P_LINEAR) /* compose on black */ back_b = back_g = back_r = 0; else if (display->background == NULL /* no way to remove it */) @@ -1988,7 +2103,7 @@ png_image_read_colormap(png_voidp argument) else { back_g = display->background->green; - if (output_format & PNG_FORMAT_FLAG_COLOR) + if ((output_format & PNG_FORMAT_FLAG_COLOR) != 0) { back_r = display->background->red; back_b = display->background->blue; @@ -1998,7 +2113,7 @@ png_image_read_colormap(png_voidp argument) } } - else if (output_encoding == E_LINEAR) + else if (output_encoding == P_LINEAR) back_b = back_r = back_g = 65535; else @@ -2056,7 +2171,7 @@ png_image_read_colormap(png_voidp argument) trans = png_ptr->trans_color.gray; if ((output_format & PNG_FORMAT_FLAG_ALPHA) == 0) - back_alpha = output_encoding == E_LINEAR ? 65535 : 255; + back_alpha = output_encoding == P_LINEAR ? 65535 : 255; } /* png_create_colormap_entry just takes an RGBA and writes the @@ -2074,7 +2189,7 @@ png_image_read_colormap(png_voidp argument) */ if (i != trans) png_create_colormap_entry(display, i, val, val, val, 255, - E_FILE/*8-bit with file gamma*/); + P_FILE/*8-bit with file gamma*/); /* Else this entry is transparent. The colors don't matter if * there is an alpha channel (back_alpha == 0), but it does no @@ -2090,10 +2205,10 @@ png_image_read_colormap(png_voidp argument) } /* We need libpng to preserve the original encoding. */ - data_encoding = E_FILE; + data_encoding = P_FILE; /* The rows from libpng, while technically gray values, are now also - * color-map indicies; however, they may need to be expanded to 1 + * color-map indices; however, they may need to be expanded to 1 * byte per pixel. This is what png_set_packing does (i.e., it * unpacks the bit values into bytes.) */ @@ -2119,7 +2234,7 @@ png_image_read_colormap(png_voidp argument) * ensuring that the corresponding gray level matches the background * color exactly. */ - data_encoding = E_sRGB; + data_encoding = P_sRGB; if (PNG_GRAY_COLORMAP_ENTRIES > image->colormap_entries) png_error(png_ptr, "gray[16] color-map: too few entries"); @@ -2130,7 +2245,7 @@ png_image_read_colormap(png_voidp argument) { unsigned int back_alpha; - if (output_format & PNG_FORMAT_FLAG_ALPHA) + if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0) back_alpha = 0; else @@ -2143,7 +2258,7 @@ png_image_read_colormap(png_voidp argument) png_color_16 c; png_uint_32 gray = back_g; - if (output_encoding == E_LINEAR) + if (output_encoding == P_LINEAR) { gray = PNG_sRGB_FROM_LINEAR(gray * 255); @@ -2151,7 +2266,7 @@ png_image_read_colormap(png_voidp argument) * matches. */ png_create_colormap_entry(display, gray, back_g, back_g, - back_g, 65535, E_LINEAR); + back_g, 65535, P_LINEAR); } /* The background passed to libpng, however, must be the @@ -2171,16 +2286,22 @@ png_image_read_colormap(png_voidp argument) output_processing = PNG_CMAP_NONE; break; } - - back_alpha = output_encoding == E_LINEAR ? 65535 : 255; +#ifdef __COVERITY__ + /* Coverity claims that output_encoding cannot be 2 (P_LINEAR) + * here. + */ + back_alpha = 255; +#else + back_alpha = output_encoding == P_LINEAR ? 65535 : 255; +#endif } /* output_processing means that the libpng-processed row will be * 8-bit GA and it has to be processing to single byte color-map * values. Entry 254 is replaced by either a completely * transparent entry or by the background color at full - * precision (and the background color is not a simple gray leve - * in this case.) + * precision (and the background color is not a simple gray + * level in this case.) */ expand_tRNS = 1; output_processing = PNG_CMAP_TRANS; @@ -2209,9 +2330,9 @@ png_image_read_colormap(png_voidp argument) * worry about tRNS matching - tRNS is ignored if there is an alpha * channel. */ - data_encoding = E_sRGB; + data_encoding = P_sRGB; - if (output_format & PNG_FORMAT_FLAG_ALPHA) + if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0) { if (PNG_GA_COLORMAP_ENTRIES > image->colormap_entries) png_error(png_ptr, "gray+alpha color-map: too few entries"); @@ -2252,13 +2373,13 @@ png_image_read_colormap(png_voidp argument) cmap_entries = make_gray_colormap(display); - if (output_encoding == E_LINEAR) + if (output_encoding == P_LINEAR) { gray = PNG_sRGB_FROM_LINEAR(gray * 255); /* And make sure the corresponding palette entry matches. */ png_create_colormap_entry(display, gray, back_g, back_g, - back_g, 65535, E_LINEAR); + back_g, 65535, P_LINEAR); } /* The background passed to libpng, however, must be the sRGB @@ -2289,7 +2410,7 @@ png_image_read_colormap(png_voidp argument) { png_uint_32 gray = (i * 256 + 115) / 231; png_create_colormap_entry(display, i++, gray, gray, gray, - 255, E_sRGB); + 255, P_sRGB); } /* NOTE: this preserves the full precision of the application @@ -2297,7 +2418,14 @@ png_image_read_colormap(png_voidp argument) */ background_index = i; png_create_colormap_entry(display, i++, back_r, back_g, back_b, - output_encoding == E_LINEAR ? 65535U : 255U, output_encoding); +#ifdef __COVERITY__ + /* Coverity claims that output_encoding cannot be 2 (P_LINEAR) + * here. + */ 255U, +#else + output_encoding == P_LINEAR ? 65535U : 255U, +#endif + output_encoding); /* For non-opaque input composite on the sRGB background - this * requires inverting the encoding for each component. The input @@ -2307,7 +2435,7 @@ png_image_read_colormap(png_voidp argument) * represents. Consequently 'G' is always sRGB encoded, while * 'A' is linear. We need the linear background colors. */ - if (output_encoding == E_sRGB) /* else already linear */ + if (output_encoding == P_sRGB) /* else already linear */ { /* This may produce a value not exactly matching the * background, but that's ok because these numbers are only @@ -2337,7 +2465,7 @@ png_image_read_colormap(png_voidp argument) png_create_colormap_entry(display, i++, PNG_sRGB_FROM_LINEAR(gray + back_rx), PNG_sRGB_FROM_LINEAR(gray + back_gx), - PNG_sRGB_FROM_LINEAR(gray + back_bx), 255, E_sRGB); + PNG_sRGB_FROM_LINEAR(gray + back_bx), 255, P_sRGB); } } @@ -2364,7 +2492,7 @@ png_image_read_colormap(png_voidp argument) */ png_set_rgb_to_gray_fixed(png_ptr, PNG_ERROR_ACTION_NONE, -1, -1); - data_encoding = E_sRGB; + data_encoding = P_sRGB; /* The output will now be one or two 8-bit gray or gray+alpha * channels. The more complex case arises when the input has alpha. @@ -2406,10 +2534,10 @@ png_image_read_colormap(png_voidp argument) */ if ((png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA || png_ptr->num_trans > 0) && - png_gamma_not_sRGB(png_ptr->colorspace.gamma)) + png_gamma_not_sRGB(png_ptr->colorspace.gamma) != 0) { cmap_entries = make_gray_file_colormap(display); - data_encoding = E_FILE; + data_encoding = P_FILE; } else @@ -2428,18 +2556,18 @@ png_image_read_colormap(png_voidp argument) * it. Achieve this simply by ensuring that the entry * selected for the background really is the background color. */ - if (data_encoding == E_FILE) /* from the fixup above */ + if (data_encoding == P_FILE) /* from the fixup above */ { /* The app supplied a gray which is in output_encoding, we - * need to convert it to a value of the input (E_FILE) + * need to convert it to a value of the input (P_FILE) * encoding then set this palette entry to the required * output encoding. */ - if (output_encoding == E_sRGB) - gray = png_sRGB_table[gray]; /* now E_LINEAR */ + if (output_encoding == P_sRGB) + gray = png_sRGB_table[gray]; /* now P_LINEAR */ gray = PNG_DIV257(png_gamma_16bit_correct(gray, - png_ptr->colorspace.gamma)); /* now E_FILE */ + png_ptr->colorspace.gamma)); /* now P_FILE */ /* And make sure the corresponding palette entry contains * exactly the required sRGB value. @@ -2448,14 +2576,14 @@ png_image_read_colormap(png_voidp argument) back_g, 0/*unused*/, output_encoding); } - else if (output_encoding == E_LINEAR) + else if (output_encoding == P_LINEAR) { gray = PNG_sRGB_FROM_LINEAR(gray * 255); /* And make sure the corresponding palette entry matches. */ png_create_colormap_entry(display, gray, back_g, back_g, - back_g, 0/*unused*/, E_LINEAR); + back_g, 0/*unused*/, P_LINEAR); } /* The background passed to libpng, however, must be the @@ -2485,7 +2613,7 @@ png_image_read_colormap(png_voidp argument) * to do it once and using PNG_DIV51 on the 6x6x6 reduced RGB cube. * Consequently we always want libpng to produce sRGB data. */ - data_encoding = E_sRGB; + data_encoding = P_sRGB; /* Is there any transparency or alpha? */ if (png_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA || @@ -2494,7 +2622,7 @@ png_image_read_colormap(png_voidp argument) /* Is there alpha in the output too? If so all four channels are * processed into a special RGB cube with alpha support. */ - if (output_format & PNG_FORMAT_FLAG_ALPHA) + if ((output_format & PNG_FORMAT_FLAG_ALPHA) != 0) { png_uint_32 r; @@ -2505,7 +2633,7 @@ png_image_read_colormap(png_voidp argument) /* Add a transparent entry. */ png_create_colormap_entry(display, cmap_entries, 255, 255, - 255, 0, E_sRGB); + 255, 0, P_sRGB); /* This is stored as the background index for the processing * algorithm. @@ -2526,7 +2654,7 @@ png_image_read_colormap(png_voidp argument) */ for (b=0; b<256; b = (b << 1) | 0x7f) png_create_colormap_entry(display, cmap_entries++, - r, g, b, 128, E_sRGB); + r, g, b, 128, P_sRGB); } } @@ -2555,7 +2683,7 @@ png_image_read_colormap(png_voidp argument) png_create_colormap_entry(display, cmap_entries, back_r, back_g, back_b, 0/*unused*/, output_encoding); - if (output_encoding == E_LINEAR) + if (output_encoding == P_LINEAR) { r = PNG_sRGB_FROM_LINEAR(back_r * 255); g = PNG_sRGB_FROM_LINEAR(back_g * 255); @@ -2595,11 +2723,11 @@ png_image_read_colormap(png_voidp argument) */ for (b=0; b<256; b = (b << 1) | 0x7f) png_create_colormap_entry(display, cmap_entries++, - png_colormap_compose(display, r, E_sRGB, 128, + png_colormap_compose(display, r, P_sRGB, 128, back_r, output_encoding), - png_colormap_compose(display, g, E_sRGB, 128, + png_colormap_compose(display, g, P_sRGB, 128, back_g, output_encoding), - png_colormap_compose(display, b, E_sRGB, 128, + png_colormap_compose(display, b, P_sRGB, 128, back_b, output_encoding), 0/*unused*/, output_encoding); } @@ -2658,7 +2786,7 @@ png_image_read_colormap(png_voidp argument) num_trans = 0; output_processing = PNG_CMAP_NONE; - data_encoding = E_FILE; /* Don't change from color-map indicies */ + data_encoding = P_FILE; /* Don't change from color-map indices */ cmap_entries = png_ptr->num_palette; if (cmap_entries > 256) cmap_entries = 256; @@ -2668,7 +2796,7 @@ png_image_read_colormap(png_voidp argument) for (i=0; i < cmap_entries; ++i) { - if (do_background && i < num_trans && trans[i] < 255) + if (do_background != 0 && i < num_trans && trans[i] < 255) { if (trans[i] == 0) png_create_colormap_entry(display, i, back_r, back_g, @@ -2680,13 +2808,13 @@ png_image_read_colormap(png_voidp argument) * on the sRGB color in 'back'. */ png_create_colormap_entry(display, i, - png_colormap_compose(display, colormap[i].red, E_FILE, + png_colormap_compose(display, colormap[i].red, P_FILE, trans[i], back_r, output_encoding), - png_colormap_compose(display, colormap[i].green, E_FILE, + png_colormap_compose(display, colormap[i].green, P_FILE, trans[i], back_g, output_encoding), - png_colormap_compose(display, colormap[i].blue, E_FILE, + png_colormap_compose(display, colormap[i].blue, P_FILE, trans[i], back_b, output_encoding), - output_encoding == E_LINEAR ? trans[i] * 257U : + output_encoding == P_LINEAR ? trans[i] * 257U : trans[i], output_encoding); } @@ -2695,10 +2823,10 @@ png_image_read_colormap(png_voidp argument) else png_create_colormap_entry(display, i, colormap[i].red, colormap[i].green, colormap[i].blue, - i < num_trans ? trans[i] : 255U, E_FILE/*8-bit*/); + i < num_trans ? trans[i] : 255U, P_FILE/*8-bit*/); } - /* The PNG data may have indicies packed in fewer than 8 bits, it + /* The PNG data may have indices packed in fewer than 8 bits, it * must be expanded if so. */ if (png_ptr->bit_depth < 8) @@ -2713,8 +2841,8 @@ png_image_read_colormap(png_voidp argument) } /* Now deal with the output processing */ - if (expand_tRNS && png_ptr->num_trans > 0 && - (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) == 0) + if (expand_tRNS != 0 && png_ptr->num_trans > 0 && + (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) == 0) png_set_tRNS_to_alpha(png_ptr); switch (data_encoding) @@ -2723,12 +2851,12 @@ png_image_read_colormap(png_voidp argument) png_error(png_ptr, "bad data option (internal error)"); break; - case E_sRGB: + case P_sRGB: /* Change to 8-bit sRGB */ png_set_alpha_mode_fixed(png_ptr, PNG_ALPHA_PNG, PNG_GAMMA_sRGB); /* FALL THROUGH */ - case E_FILE: + case P_FILE: if (png_ptr->bit_depth > 8) png_set_scale_16(png_ptr); break; @@ -2805,7 +2933,6 @@ png_image_read_and_map(png_voidp argument) break; default: - passes = 0; png_error(png_ptr, "unknown interlace type"); } @@ -3124,7 +3251,6 @@ png_image_read_composite(png_voidp argument) break; default: - passes = 0; png_error(png_ptr, "unknown interlace type"); } @@ -3132,7 +3258,8 @@ png_image_read_composite(png_voidp argument) png_uint_32 height = image->height; png_uint_32 width = image->width; ptrdiff_t step_row = display->row_bytes; - unsigned int channels = (image->format & PNG_FORMAT_FLAG_COLOR) ? 3 : 1; + unsigned int channels = + (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1; int pass; for (pass = 0; pass < passes; ++pass) @@ -3225,11 +3352,11 @@ png_image_read_composite(png_voidp argument) * PNG_COMPOSITE * PNG_GAMMA * - * This is a work-round for the fact that both the PNG_RGB_TO_GRAY and + * This is a work-around for the fact that both the PNG_RGB_TO_GRAY and * PNG_COMPOSITE code performs gamma correction, so we get double gamma - * correction. The fix-up is to prevent the PNG_COMPOSITE operation happening - * inside libpng, so this routine sees an 8 or 16-bit gray+alpha row and handles - * the removal or pre-multiplication of the alpha channel. + * correction. The fix-up is to prevent the PNG_COMPOSITE operation from + * happening inside libpng, so this routine sees an 8 or 16-bit gray+alpha + * row and handles the removal or pre-multiplication of the alpha channel. */ static int png_image_read_background(png_voidp argument) @@ -3273,11 +3400,15 @@ png_image_read_background(png_voidp argument) break; default: - passes = 0; png_error(png_ptr, "unknown interlace type"); } - switch (png_get_bit_depth(png_ptr, info_ptr)) + /* Use direct access to info_ptr here because otherwise the simplified API + * would require PNG_EASY_ACCESS_SUPPORTED (just for this.) Note this is + * checking the value after libpng expansions, not the original value in the + * PNG. + */ + switch (info_ptr->bit_depth) { default: png_error(png_ptr, "unexpected bit depth"); @@ -3285,7 +3416,7 @@ png_image_read_background(png_voidp argument) case 8: /* 8-bit sRGB gray values with an alpha channel; the alpha channel is - * to be removed by composing on a backgroundi: either the row if + * to be removed by composing on a background: either the row if * display->background is NULL or display->background->green if not. * Unlike the code above ALPHA_OPTIMIZED has *not* been done. */ @@ -3425,8 +3556,11 @@ png_image_read_background(png_voidp argument) unsigned int outchannels = 1+preserve_alpha; int swap_alpha = 0; - if (preserve_alpha && (image->format & PNG_FORMAT_FLAG_AFIRST)) - swap_alpha = 1; +# ifdef PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED + if (preserve_alpha != 0 && + (image->format & PNG_FORMAT_FLAG_AFIRST) != 0) + swap_alpha = 1; +# endif for (pass = 0; pass < passes; ++pass) { @@ -3488,7 +3622,7 @@ png_image_read_background(png_voidp argument) component = 0; outrow[swap_alpha] = (png_uint_16)component; - if (preserve_alpha) + if (preserve_alpha != 0) outrow[1 ^ swap_alpha] = alpha; inrow += 2; /* components and alpha channel */ @@ -3533,10 +3667,10 @@ png_image_read_direct(png_voidp argument) int mode; /* alpha mode */ /* Do this first so that we have a record if rgb to gray is happening. */ - if (change & PNG_FORMAT_FLAG_COLOR) + if ((change & PNG_FORMAT_FLAG_COLOR) != 0) { /* gray<->color transformation required. */ - if (format & PNG_FORMAT_FLAG_COLOR) + if ((format & PNG_FORMAT_FLAG_COLOR) != 0) png_set_gray_to_rgb(png_ptr); else @@ -3554,7 +3688,7 @@ png_image_read_direct(png_voidp argument) * enormous change) 'do_local_background' is used to indicate that * the problem exists. */ - if (base_format & PNG_FORMAT_FLAG_ALPHA) + if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0) do_local_background = 1/*maybe*/; png_set_rgb_to_gray_fixed(png_ptr, PNG_ERROR_ACTION_NONE, @@ -3569,8 +3703,8 @@ png_image_read_direct(png_voidp argument) { png_fixed_point input_gamma_default; - if ((base_format & PNG_FORMAT_FLAG_LINEAR) && - (image->flags & PNG_IMAGE_FLAG_16BIT_sRGB) == 0) + if ((base_format & PNG_FORMAT_FLAG_LINEAR) != 0 && + (image->flags & PNG_IMAGE_FLAG_16BIT_sRGB) == 0) input_gamma_default = PNG_GAMMA_LINEAR; else input_gamma_default = PNG_DEFAULT_sRGB; @@ -3581,12 +3715,12 @@ png_image_read_direct(png_voidp argument) png_set_alpha_mode_fixed(png_ptr, PNG_ALPHA_PNG, input_gamma_default); } - if (linear) + if (linear != 0) { /* If there *is* an alpha channel in the input it must be multiplied * out; use PNG_ALPHA_STANDARD, otherwise just use PNG_ALPHA_PNG. */ - if (base_format & PNG_FORMAT_FLAG_ALPHA) + if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0) mode = PNG_ALPHA_STANDARD; /* associated alpha */ else @@ -3607,7 +3741,7 @@ png_image_read_direct(png_voidp argument) * * TODO: fix libpng and remove this. */ - if (do_local_background) + if (do_local_background != 0) { png_fixed_point gtest; @@ -3617,7 +3751,7 @@ png_image_read_direct(png_voidp argument) * final value. */ if (png_muldiv(>est, output_gamma, png_ptr->colorspace.gamma, - PNG_FP_1) && !png_gamma_significant(gtest)) + PNG_FP_1) != 0 && png_gamma_significant(gtest) == 0) do_local_background = 0; else if (mode == PNG_ALPHA_STANDARD) @@ -3630,9 +3764,9 @@ png_image_read_direct(png_voidp argument) } /* If the bit-depth changes then handle that here. */ - if (change & PNG_FORMAT_FLAG_LINEAR) + if ((change & PNG_FORMAT_FLAG_LINEAR) != 0) { - if (linear /*16-bit output*/) + if (linear != 0 /*16-bit output*/) png_set_expand_16(png_ptr); else /* 8-bit output */ @@ -3642,24 +3776,24 @@ png_image_read_direct(png_voidp argument) } /* Now the background/alpha channel changes. */ - if (change & PNG_FORMAT_FLAG_ALPHA) + if ((change & PNG_FORMAT_FLAG_ALPHA) != 0) { /* Removing an alpha channel requires composition for the 8-bit * formats; for the 16-bit it is already done, above, by the * pre-multiplication and the channel just needs to be stripped. */ - if (base_format & PNG_FORMAT_FLAG_ALPHA) + if ((base_format & PNG_FORMAT_FLAG_ALPHA) != 0) { /* If RGB->gray is happening the alpha channel must be left and the * operation completed locally. * * TODO: fix libpng and remove this. */ - if (do_local_background) + if (do_local_background != 0) do_local_background = 2/*required*/; /* 16-bit output: just remove the channel */ - else if (linear) /* compose on black (well, pre-multiply) */ + else if (linear != 0) /* compose on black (well, pre-multiply) */ png_set_strip_alpha(png_ptr); /* 8-bit output: do an appropriate compose */ @@ -3706,14 +3840,14 @@ png_image_read_direct(png_voidp argument) png_uint_32 filler; /* opaque filler */ int where; - if (linear) + if (linear != 0) filler = 65535; else filler = 255; # ifdef PNG_FORMAT_AFIRST_SUPPORTED - if (format & PNG_FORMAT_FLAG_AFIRST) + if ((format & PNG_FORMAT_FLAG_AFIRST) != 0) { where = PNG_FILLER_BEFORE; change &= ~PNG_FORMAT_FLAG_AFIRST; @@ -3737,12 +3871,12 @@ png_image_read_direct(png_voidp argument) png_set_alpha_mode_fixed(png_ptr, mode, output_gamma); # ifdef PNG_FORMAT_BGR_SUPPORTED - if (change & PNG_FORMAT_FLAG_BGR) + if ((change & PNG_FORMAT_FLAG_BGR) != 0) { /* Check only the output format; PNG is never BGR; don't do this if * the output is gray, but fix up the 'format' value in that case. */ - if (format & PNG_FORMAT_FLAG_COLOR) + if ((format & PNG_FORMAT_FLAG_COLOR) != 0) png_set_bgr(png_ptr); else @@ -3753,14 +3887,14 @@ png_image_read_direct(png_voidp argument) # endif # ifdef PNG_FORMAT_AFIRST_SUPPORTED - if (change & PNG_FORMAT_FLAG_AFIRST) + if ((change & PNG_FORMAT_FLAG_AFIRST) != 0) { /* Only relevant if there is an alpha channel - it's particularly * important to handle this correctly because do_local_compose may * be set above and then libpng will keep the alpha channel for this * code to remove. */ - if (format & PNG_FORMAT_FLAG_ALPHA) + if ((format & PNG_FORMAT_FLAG_ALPHA) != 0) { /* Disable this if doing a local background, * TODO: remove this when local background is no longer required. @@ -3779,16 +3913,16 @@ png_image_read_direct(png_voidp argument) /* If the *output* is 16-bit then we need to check for a byte-swap on this * architecture. */ - if (linear) + if (linear != 0) { PNG_CONST png_uint_16 le = 0x0001; - if (*(png_const_bytep)&le) + if ((*(png_const_bytep) & le) != 0) png_set_swap(png_ptr); } /* If change is not now 0 some transformation is missing - error out. */ - if (change) + if (change != 0) png_error(png_ptr, "png_read_image: unsupported transformation"); } @@ -3800,7 +3934,7 @@ png_image_read_direct(png_voidp argument) * * TODO: remove the do_local_background fixup below. */ - if (!do_local_compose && do_local_background != 2) + if (do_local_compose == 0 && do_local_background != 2) passes = png_set_interlace_handling(png_ptr); png_read_update_info(png_ptr, info_ptr); @@ -3808,13 +3942,13 @@ png_image_read_direct(png_voidp argument) { png_uint_32 info_format = 0; - if (info_ptr->color_type & PNG_COLOR_MASK_COLOR) + if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0) info_format |= PNG_FORMAT_FLAG_COLOR; - if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) + if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0) { /* do_local_compose removes this channel below. */ - if (!do_local_compose) + if (do_local_compose == 0) { /* do_local_background does the same if required. */ if (do_local_background != 2 || @@ -3823,21 +3957,21 @@ png_image_read_direct(png_voidp argument) } } - else if (do_local_compose) /* internal error */ + else if (do_local_compose != 0) /* internal error */ png_error(png_ptr, "png_image_read: alpha channel lost"); if (info_ptr->bit_depth == 16) info_format |= PNG_FORMAT_FLAG_LINEAR; # ifdef PNG_FORMAT_BGR_SUPPORTED - if (png_ptr->transformations & PNG_BGR) + if ((png_ptr->transformations & PNG_BGR) != 0) info_format |= PNG_FORMAT_FLAG_BGR; # endif # ifdef PNG_FORMAT_AFIRST_SUPPORTED if (do_local_background == 2) { - if (format & PNG_FORMAT_FLAG_AFIRST) + if ((format & PNG_FORMAT_FLAG_AFIRST) != 0) info_format |= PNG_FORMAT_FLAG_AFIRST; } @@ -3866,7 +4000,7 @@ png_image_read_direct(png_voidp argument) png_voidp first_row = display->buffer; ptrdiff_t row_bytes = display->row_stride; - if (linear) + if (linear != 0) row_bytes *= 2; /* The following expression is designed to work correctly whether it gives @@ -3883,7 +4017,7 @@ png_image_read_direct(png_voidp argument) display->row_bytes = row_bytes; } - if (do_local_compose) + if (do_local_compose != 0) { int result; png_voidp row = png_malloc(png_ptr, png_get_rowbytes(png_ptr, info_ptr)); @@ -3966,7 +4100,7 @@ png_image_finish_read(png_imagep image, png_const_colorp background, /* Choose the correct 'end' routine; for the color-map case all the * setup has already been done. */ - if (image->format & PNG_FORMAT_FLAG_COLORMAP) + if ((image->format & PNG_FORMAT_FLAG_COLORMAP) != 0) result = png_safe_execute(image, png_image_read_colormap, &display) && png_safe_execute(image, png_image_read_colormapped, &display); @@ -3996,5 +4130,5 @@ png_image_finish_read(png_imagep image, png_const_colorp background, return 0; } -#endif /* PNG_SIMPLIFIED_READ_SUPPORTED */ -#endif /* PNG_READ_SUPPORTED */ +#endif /* SIMPLIFIED_READ */ +#endif /* READ */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngrio.c b/3rdparty/libpng/pngrio.c similarity index 95% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngrio.c rename to 3rdparty/libpng/pngrio.c index d7864407bd..bb5c825109 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngrio.c +++ b/3rdparty/libpng/pngrio.c @@ -1,8 +1,8 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.6.0 [February 14, 2013] - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.17 [March 26, 2015] + * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -26,7 +26,7 @@ * reads from a file pointer. Note that this routine sometimes gets called * with very small lengths, so you should implement some kind of simple * buffering if you are using unbuffered reads. This should never be asked - * to read more then 64K on a 16 bit machine. + * to read more than 64K on a 16 bit machine. */ void /* PRIVATE */ png_read_data(png_structrp png_ptr, png_bytep data, png_size_t length) @@ -102,6 +102,7 @@ png_set_read_fn(png_structrp png_ptr, png_voidp io_ptr, png_ptr->read_data_fn = read_data_fn; #endif +#ifdef PNG_WRITE_SUPPORTED /* It is an error to write to a read device */ if (png_ptr->write_data_fn != NULL) { @@ -110,9 +111,10 @@ png_set_read_fn(png_structrp png_ptr, png_voidp io_ptr, "Can't set both read_data_fn and write_data_fn in the" " same structure"); } +#endif #ifdef PNG_WRITE_FLUSH_SUPPORTED png_ptr->output_flush_fn = NULL; #endif } -#endif /* PNG_READ_SUPPORTED */ +#endif /* READ */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngrtran.c b/3rdparty/libpng/pngrtran.c similarity index 91% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngrtran.c rename to 3rdparty/libpng/pngrtran.c index e378ceba4e..cad7a8daa5 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngrtran.c +++ b/3rdparty/libpng/pngrtran.c @@ -1,8 +1,8 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.6.2 [April 25, 2013] - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.17 [March 26, 2015] + * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -91,14 +91,15 @@ png_set_crc_action(png_structrp png_ptr, int crit_action, int ancil_action) #ifdef PNG_READ_TRANSFORMS_SUPPORTED /* Is it OK to set a transformation now? Only if png_start_read_image or * png_read_update_info have not been called. It is not necessary for the IHDR - * to have been read in all cases, the parameter allows for this check too. + * to have been read in all cases; the need_IHDR parameter allows for this + * check too. */ static int png_rtran_ok(png_structrp png_ptr, int need_IHDR) { if (png_ptr != NULL) { - if (png_ptr->flags & PNG_FLAG_ROW_INIT) + if ((png_ptr->flags & PNG_FLAG_ROW_INIT) != 0) png_app_error(png_ptr, "invalid after png_start_read_image or png_read_update_info"); @@ -127,7 +128,7 @@ png_set_background_fixed(png_structrp png_ptr, { png_debug(1, "in png_set_background_fixed"); - if (!png_rtran_ok(png_ptr, 0) || background_color == NULL) + if (png_rtran_ok(png_ptr, 0) == 0 || background_color == NULL) return; if (background_gamma_code == PNG_BACKGROUND_GAMMA_UNKNOWN) @@ -143,7 +144,7 @@ png_set_background_fixed(png_structrp png_ptr, png_ptr->background = *background_color; png_ptr->background_gamma = background_gamma; png_ptr->background_gamma_type = (png_byte)(background_gamma_code); - if (need_expand) + if (need_expand != 0) png_ptr->transformations |= PNG_BACKGROUND_EXPAND; else png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND; @@ -171,7 +172,7 @@ png_set_scale_16(png_structrp png_ptr) { png_debug(1, "in png_set_scale_16"); - if (!png_rtran_ok(png_ptr, 0)) + if (png_rtran_ok(png_ptr, 0) == 0) return; png_ptr->transformations |= PNG_SCALE_16_TO_8; @@ -185,7 +186,7 @@ png_set_strip_16(png_structrp png_ptr) { png_debug(1, "in png_set_strip_16"); - if (!png_rtran_ok(png_ptr, 0)) + if (png_rtran_ok(png_ptr, 0) == 0) return; png_ptr->transformations |= PNG_16_TO_8; @@ -198,7 +199,7 @@ png_set_strip_alpha(png_structrp png_ptr) { png_debug(1, "in png_set_strip_alpha"); - if (!png_rtran_ok(png_ptr, 0)) + if (png_rtran_ok(png_ptr, 0) == 0) return; png_ptr->transformations |= PNG_STRIP_ALPHA; @@ -226,7 +227,7 @@ translate_gamma_flags(png_structrp png_ptr, png_fixed_point output_gamma, # else PNG_UNUSED(png_ptr) # endif - if (is_screen) + if (is_screen != 0) output_gamma = PNG_GAMMA_sRGB; else output_gamma = PNG_GAMMA_sRGB_INVERSE; @@ -235,7 +236,7 @@ translate_gamma_flags(png_structrp png_ptr, png_fixed_point output_gamma, else if (output_gamma == PNG_GAMMA_MAC_18 || output_gamma == PNG_FP_1 / PNG_GAMMA_MAC_18) { - if (is_screen) + if (is_screen != 0) output_gamma = PNG_GAMMA_MAC_OLD; else output_gamma = PNG_GAMMA_MAC_INVERSE; @@ -279,7 +280,7 @@ png_set_alpha_mode_fixed(png_structrp png_ptr, int mode, png_debug(1, "in png_set_alpha_mode"); - if (!png_rtran_ok(png_ptr, 0)) + if (png_rtran_ok(png_ptr, 0) == 0) return; output_gamma = translate_gamma_flags(png_ptr, output_gamma, 1/*screen*/); @@ -363,7 +364,7 @@ png_set_alpha_mode_fixed(png_structrp png_ptr, int mode, /* Finally, if pre-multiplying, set the background fields to achieve the * desired result. */ - if (compose) + if (compose != 0) { /* And obtain alpha pre-multiplication by composing on black: */ memset(&png_ptr->background, 0, (sizeof png_ptr->background)); @@ -371,7 +372,7 @@ png_set_alpha_mode_fixed(png_structrp png_ptr, int mode, png_ptr->background_gamma_type = PNG_BACKGROUND_GAMMA_FILE; png_ptr->transformations &= ~PNG_BACKGROUND_EXPAND; - if (png_ptr->transformations & PNG_COMPOSE) + if ((png_ptr->transformations & PNG_COMPOSE) != 0) png_error(png_ptr, "conflicting calls to set alpha mode and background"); @@ -393,7 +394,7 @@ png_set_alpha_mode(png_structrp png_ptr, int mode, double output_gamma) /* Dither file to 8-bit. Supply a palette, the current number * of elements in the palette, the maximum number of elements * allowed, and a histogram if possible. If the current number - * of colors is greater then the maximum number, the palette will be + * of colors is greater than the maximum number, the palette will be * modified to fit in the maximum number. "full_quantize" indicates * whether we need a quantizing cube set up for RGB images, or if we * simply are reducing the number of colors in a paletted image. @@ -415,12 +416,12 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette, { png_debug(1, "in png_set_quantize"); - if (!png_rtran_ok(png_ptr, 0)) + if (png_rtran_ok(png_ptr, 0) == 0) return; png_ptr->transformations |= PNG_QUANTIZE; - if (!full_quantize) + if (full_quantize == 0) { int i; @@ -475,12 +476,12 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette, } } - if (done) + if (done != 0) break; } /* Swap the palette around, and set up a table, if necessary */ - if (full_quantize) + if (full_quantize != 0) { int j = num_palette; @@ -663,7 +664,7 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette, num_new_palette--; palette[png_ptr->index_to_palette[j]] = palette[num_new_palette]; - if (!full_quantize) + if (full_quantize == 0) { int k; @@ -731,7 +732,7 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette, } png_ptr->num_palette = (png_uint_16)num_palette; - if (full_quantize) + if (full_quantize != 0) { int i; png_bytep distance; @@ -793,7 +794,7 @@ png_set_quantize(png_structrp png_ptr, png_colorp palette, png_free(png_ptr, distance); } } -#endif /* PNG_READ_QUANTIZE_SUPPORTED */ +#endif /* READ_QUANTIZE */ #ifdef PNG_READ_GAMMA_SUPPORTED void PNGFAPI @@ -802,7 +803,7 @@ png_set_gamma_fixed(png_structrp png_ptr, png_fixed_point scrn_gamma, { png_debug(1, "in png_set_gamma_fixed"); - if (!png_rtran_ok(png_ptr, 0)) + if (png_rtran_ok(png_ptr, 0) == 0) return; /* New in libpng-1.5.4 - reserve particular negative values as flags. */ @@ -842,7 +843,7 @@ png_set_gamma(png_structrp png_ptr, double scrn_gamma, double file_gamma) png_set_gamma_fixed(png_ptr, convert_gamma_value(png_ptr, scrn_gamma), convert_gamma_value(png_ptr, file_gamma)); } -# endif /* FLOATING_POINT_SUPPORTED */ +# endif /* FLOATING_POINT */ #endif /* READ_GAMMA */ #ifdef PNG_READ_EXPAND_SUPPORTED @@ -855,7 +856,7 @@ png_set_expand(png_structrp png_ptr) { png_debug(1, "in png_set_expand"); - if (!png_rtran_ok(png_ptr, 0)) + if (png_rtran_ok(png_ptr, 0) == 0) return; png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS); @@ -885,7 +886,7 @@ png_set_palette_to_rgb(png_structrp png_ptr) { png_debug(1, "in png_set_palette_to_rgb"); - if (!png_rtran_ok(png_ptr, 0)) + if (png_rtran_ok(png_ptr, 0) == 0) return; png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS); @@ -897,7 +898,7 @@ png_set_expand_gray_1_2_4_to_8(png_structrp png_ptr) { png_debug(1, "in png_set_expand_gray_1_2_4_to_8"); - if (!png_rtran_ok(png_ptr, 0)) + if (png_rtran_ok(png_ptr, 0) == 0) return; png_ptr->transformations |= PNG_EXPAND; @@ -909,12 +910,12 @@ png_set_tRNS_to_alpha(png_structrp png_ptr) { png_debug(1, "in png_set_tRNS_to_alpha"); - if (!png_rtran_ok(png_ptr, 0)) + if (png_rtran_ok(png_ptr, 0) == 0) return; png_ptr->transformations |= (PNG_EXPAND | PNG_EXPAND_tRNS); } -#endif /* defined(PNG_READ_EXPAND_SUPPORTED) */ +#endif /* READ_EXPAND */ #ifdef PNG_READ_EXPAND_16_SUPPORTED /* Expand to 16-bit channels, expand the tRNS chunk too (because otherwise @@ -925,7 +926,7 @@ png_set_expand_16(png_structrp png_ptr) { png_debug(1, "in png_set_expand_16"); - if (!png_rtran_ok(png_ptr, 0)) + if (png_rtran_ok(png_ptr, 0) == 0) return; png_ptr->transformations |= (PNG_EXPAND_16 | PNG_EXPAND | PNG_EXPAND_tRNS); @@ -938,7 +939,7 @@ png_set_gray_to_rgb(png_structrp png_ptr) { png_debug(1, "in png_set_gray_to_rgb"); - if (!png_rtran_ok(png_ptr, 0)) + if (png_rtran_ok(png_ptr, 0) == 0) return; /* Because rgb must be 8 bits or more: */ @@ -956,10 +957,10 @@ png_set_rgb_to_gray_fixed(png_structrp png_ptr, int error_action, /* Need the IHDR here because of the check on color_type below. */ /* TODO: fix this */ - if (!png_rtran_ok(png_ptr, 1)) + if (png_rtran_ok(png_ptr, 1) == 0) return; - switch(error_action) + switch (error_action) { case PNG_ERROR_ACTION_NONE: png_ptr->transformations |= PNG_RGB_TO_GRAY; @@ -998,7 +999,7 @@ png_set_rgb_to_gray_fixed(png_structrp png_ptr, int error_action, png_uint_16 red_int, green_int; /* NOTE: this calculation does not round, but this behavior is retained - * for consistency, the inaccuracy is very small. The code here always + * for consistency; the inaccuracy is very small. The code here always * overwrites the coefficients, regardless of whether they have been * defaulted or set already. */ @@ -1091,7 +1092,7 @@ png_gamma_threshold(png_fixed_point screen_gamma, png_fixed_point file_gamma) * the palette. */ -/*For the moment 'png_init_palette_transformations' and +/* For the moment 'png_init_palette_transformations' and * 'png_init_rgb_transformations' only do some flag canceling optimizations. * The intent is that these two routines should have palette or rgb operations * extracted from 'png_init_read_transformations'. @@ -1116,25 +1117,31 @@ png_init_palette_transformations(png_structrp png_ptr) /* Ignore if all the entries are opaque (unlikely!) */ for (i=0; inum_trans; ++i) + { if (png_ptr->trans_alpha[i] == 255) continue; else if (png_ptr->trans_alpha[i] == 0) input_has_transparency = 1; else + { + input_has_transparency = 1; input_has_alpha = 1; + break; + } + } } /* If no alpha we can optimize. */ - if (!input_has_alpha) + if (input_has_alpha == 0) { /* Any alpha means background and associative alpha processing is - * required, however if the alpha is 0 or 1 throughout OPTIIMIZE_ALPHA + * required, however if the alpha is 0 or 1 throughout OPTIMIZE_ALPHA * and ENCODE_ALPHA are irrelevant. */ png_ptr->transformations &= ~PNG_ENCODE_ALPHA; png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; - if (!input_has_transparency) + if (input_has_transparency == 0) png_ptr->transformations &= ~(PNG_COMPOSE | PNG_BACKGROUND_EXPAND); } @@ -1147,8 +1154,8 @@ png_init_palette_transformations(png_structrp png_ptr) /* The following code cannot be entered in the alpha pre-multiplication case * because PNG_BACKGROUND_EXPAND is cancelled below. */ - if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) && - (png_ptr->transformations & PNG_EXPAND)) + if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0 && + (png_ptr->transformations & PNG_EXPAND) != 0) { { png_ptr->background.red = @@ -1159,9 +1166,9 @@ png_init_palette_transformations(png_structrp png_ptr) png_ptr->palette[png_ptr->background.index].blue; #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED - if (png_ptr->transformations & PNG_INVERT_ALPHA) + if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0) { - if (!(png_ptr->transformations & PNG_EXPAND_tRNS)) + if ((png_ptr->transformations & PNG_EXPAND_tRNS) == 0) { /* Invert the alpha channel (in tRNS) unless the pixels are * going to be expanded, in which case leave it for later @@ -1173,10 +1180,10 @@ png_init_palette_transformations(png_structrp png_ptr) png_ptr->trans_alpha[i]); } } -#endif /* PNG_READ_INVERT_ALPHA_SUPPORTED */ +#endif /* READ_INVERT_ALPHA */ } } /* background expand and (therefore) no alpha association. */ -#endif /* PNG_READ_EXPAND_SUPPORTED && PNG_READ_BACKGROUND_SUPPORTED */ +#endif /* READ_EXPAND && READ_BACKGROUND */ } static void /* PRIVATE */ @@ -1190,10 +1197,10 @@ png_init_rgb_transformations(png_structrp png_ptr) int input_has_transparency = png_ptr->num_trans > 0; /* If no alpha we can optimize. */ - if (!input_has_alpha) + if (input_has_alpha == 0) { /* Any alpha means background and associative alpha processing is - * required, however if the alpha is 0 or 1 throughout OPTIIMIZE_ALPHA + * required, however if the alpha is 0 or 1 throughout OPTIMIZE_ALPHA * and ENCODE_ALPHA are irrelevant. */ # ifdef PNG_READ_ALPHA_MODE_SUPPORTED @@ -1201,7 +1208,7 @@ png_init_rgb_transformations(png_structrp png_ptr) png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; # endif - if (!input_has_transparency) + if (input_has_transparency == 0) png_ptr->transformations &= ~(PNG_COMPOSE | PNG_BACKGROUND_EXPAND); } @@ -1214,9 +1221,9 @@ png_init_rgb_transformations(png_structrp png_ptr) /* The following code cannot be entered in the alpha pre-multiplication case * because PNG_BACKGROUND_EXPAND is cancelled below. */ - if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) && - (png_ptr->transformations & PNG_EXPAND) && - !(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) + if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0 && + (png_ptr->transformations & PNG_EXPAND) != 0 && + (png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0) /* i.e., GRAY or GRAY_ALPHA */ { { @@ -1254,14 +1261,14 @@ png_init_rgb_transformations(png_structrp png_ptr) png_ptr->background.red = png_ptr->background.green = png_ptr->background.blue = (png_uint_16)gray; - if (!(png_ptr->transformations & PNG_EXPAND_tRNS)) + if ((png_ptr->transformations & PNG_EXPAND_tRNS) == 0) { png_ptr->trans_color.red = png_ptr->trans_color.green = png_ptr->trans_color.blue = (png_uint_16)trans_gray; } } } /* background expand and (therefore) no alpha association. */ -#endif /* PNG_READ_EXPAND_SUPPORTED && PNG_READ_BACKGROUND_SUPPORTED */ +#endif /* READ_EXPAND && READ_BACKGROUND */ } void /* PRIVATE */ @@ -1330,7 +1337,7 @@ png_init_read_transformations(png_structrp png_ptr) * the code immediately below if the transform can be handled outside the * row loop. */ - if (gamma_correction) + if (gamma_correction != 0) png_ptr->transformations |= PNG_GAMMA; else @@ -1339,7 +1346,7 @@ png_init_read_transformations(png_structrp png_ptr) #endif /* Certain transformations have the effect of preventing other - * transformations that happen afterward in png_do_read_transformations, + * transformations that happen afterward in png_do_read_transformations; * resolve the interdependencies here. From the code of * png_do_read_transformations the order is: * @@ -1357,19 +1364,19 @@ png_init_read_transformations(png_structrp png_ptr) * 12) PNG_EXPAND_16 * 13) PNG_GRAY_TO_RGB iff PNG_BACKGROUND_IS_GRAY * 14) PNG_INVERT_MONO - * 15) PNG_SHIFT - * 16) PNG_PACK - * 17) PNG_BGR - * 18) PNG_PACKSWAP - * 19) PNG_FILLER (includes PNG_ADD_ALPHA) - * 20) PNG_INVERT_ALPHA + * 15) PNG_INVERT_ALPHA + * 16) PNG_SHIFT + * 17) PNG_PACK + * 18) PNG_BGR + * 19) PNG_PACKSWAP + * 20) PNG_FILLER (includes PNG_ADD_ALPHA) * 21) PNG_SWAP_ALPHA * 22) PNG_SWAP_BYTES * 23) PNG_USER_TRANSFORM [must be last] */ #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED - if ((png_ptr->transformations & PNG_STRIP_ALPHA) && - !(png_ptr->transformations & PNG_COMPOSE)) + if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 && + (png_ptr->transformations & PNG_COMPOSE) == 0) { /* Stripping the alpha channel happens immediately after the 'expand' * transformations, before all other transformation, so it cancels out @@ -1395,7 +1402,7 @@ png_init_read_transformations(png_structrp png_ptr) /* If the screen gamma is about 1.0 then the OPTIMIZE_ALPHA and ENCODE_ALPHA * settings will have no effect. */ - if (!png_gamma_significant(png_ptr->screen_gamma)) + if (png_gamma_significant(png_ptr->screen_gamma) == 0) { png_ptr->transformations &= ~PNG_ENCODE_ALPHA; png_ptr->flags &= ~PNG_FLAG_OPTIMIZE_ALPHA; @@ -1406,7 +1413,7 @@ png_init_read_transformations(png_structrp png_ptr) /* Make sure the coefficients for the rgb to gray conversion are set * appropriately. */ - if (png_ptr->transformations & PNG_RGB_TO_GRAY) + if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0) png_colorspace_set_rgb_coefficients(png_ptr); #endif @@ -1427,23 +1434,23 @@ png_init_read_transformations(png_structrp png_ptr) * png_set_background, along with the bit depth, then the code has a record * of exactly what color space the background is currently in. */ - if (png_ptr->transformations & PNG_BACKGROUND_EXPAND) + if ((png_ptr->transformations & PNG_BACKGROUND_EXPAND) != 0) { /* PNG_BACKGROUND_EXPAND: the background is in the file color space, so if * the file was grayscale the background value is gray. */ - if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) + if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0) png_ptr->mode |= PNG_BACKGROUND_IS_GRAY; } - else if (png_ptr->transformations & PNG_COMPOSE) + else if ((png_ptr->transformations & PNG_COMPOSE) != 0) { /* PNG_COMPOSE: png_set_background was called with need_expand false, * so the color is in the color space of the output or png_set_alpha_mode * was called and the color is black. Ignore RGB_TO_GRAY because that * happens before GRAY_TO_RGB. */ - if (png_ptr->transformations & PNG_GRAY_TO_RGB) + if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0) { if (png_ptr->background.red == png_ptr->background.green && png_ptr->background.red == png_ptr->background.blue) @@ -1453,8 +1460,8 @@ png_init_read_transformations(png_structrp png_ptr) } } } -#endif /* PNG_READ_EXPAND_SUPPORTED && PNG_READ_BACKGROUND_SUPPORTED */ -#endif /* PNG_READ_GRAY_TO_RGB_SUPPORTED */ +#endif /* READ_EXPAND && READ_BACKGROUND */ +#endif /* READ_GRAY_TO_RGB */ /* For indexed PNG data (PNG_COLOR_TYPE_PALETTE) many of the transformations * can be performed directly on the palette, and some (such as rgb to gray) @@ -1475,10 +1482,10 @@ png_init_read_transformations(png_structrp png_ptr) #if defined(PNG_READ_BACKGROUND_SUPPORTED) && \ defined(PNG_READ_EXPAND_16_SUPPORTED) - if ((png_ptr->transformations & PNG_EXPAND_16) && - (png_ptr->transformations & PNG_COMPOSE) && - !(png_ptr->transformations & PNG_BACKGROUND_EXPAND) && - png_ptr->bit_depth != 16) + if ((png_ptr->transformations & PNG_EXPAND_16) != 0 && + (png_ptr->transformations & PNG_COMPOSE) != 0 && + (png_ptr->transformations & PNG_BACKGROUND_EXPAND) == 0 && + png_ptr->bit_depth != 16) { /* TODO: fix this. Because the expand_16 operation is after the compose * handling the background color must be 8, not 16, bits deep, but the @@ -1497,15 +1504,15 @@ png_init_read_transformations(png_structrp png_ptr) CHOP(png_ptr->background.gray); # undef CHOP } -#endif /* PNG_READ_BACKGROUND_SUPPORTED && PNG_READ_EXPAND_16_SUPPORTED */ +#endif /* READ_BACKGROUND && READ_EXPAND_16 */ #if defined(PNG_READ_BACKGROUND_SUPPORTED) && \ (defined(PNG_READ_SCALE_16_TO_8_SUPPORTED) || \ defined(PNG_READ_STRIP_16_TO_8_SUPPORTED)) - if ((png_ptr->transformations & (PNG_16_TO_8|PNG_SCALE_16_TO_8)) && - (png_ptr->transformations & PNG_COMPOSE) && - !(png_ptr->transformations & PNG_BACKGROUND_EXPAND) && - png_ptr->bit_depth == 16) + if ((png_ptr->transformations & (PNG_16_TO_8|PNG_SCALE_16_TO_8)) != 0 && + (png_ptr->transformations & PNG_COMPOSE) != 0 && + (png_ptr->transformations & PNG_BACKGROUND_EXPAND) == 0 && + png_ptr->bit_depth == 16) { /* On the other hand, if a 16-bit file is to be reduced to 8-bits per * component this will also happen after PNG_COMPOSE and so the background @@ -1548,25 +1555,24 @@ png_init_read_transformations(png_structrp png_ptr) * file gamma - if it is not 1.0 both RGB_TO_GRAY and COMPOSE need the * tables. */ - if ((png_ptr->transformations & PNG_GAMMA) - || ((png_ptr->transformations & PNG_RGB_TO_GRAY) - && (png_gamma_significant(png_ptr->colorspace.gamma) || - png_gamma_significant(png_ptr->screen_gamma))) - || ((png_ptr->transformations & PNG_COMPOSE) - && (png_gamma_significant(png_ptr->colorspace.gamma) - || png_gamma_significant(png_ptr->screen_gamma) + if ((png_ptr->transformations & PNG_GAMMA) != 0 || + ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0 && + (png_gamma_significant(png_ptr->colorspace.gamma) != 0 || + png_gamma_significant(png_ptr->screen_gamma) != 0)) || + ((png_ptr->transformations & PNG_COMPOSE) != 0 && + (png_gamma_significant(png_ptr->colorspace.gamma) != 0 || + png_gamma_significant(png_ptr->screen_gamma) != 0 # ifdef PNG_READ_BACKGROUND_SUPPORTED - || (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE - && png_gamma_significant(png_ptr->background_gamma)) + || (png_ptr->background_gamma_type == PNG_BACKGROUND_GAMMA_UNIQUE && + png_gamma_significant(png_ptr->background_gamma) != 0) # endif - )) || ((png_ptr->transformations & PNG_ENCODE_ALPHA) - && png_gamma_significant(png_ptr->screen_gamma)) - ) + )) || ((png_ptr->transformations & PNG_ENCODE_ALPHA) != 0 && + png_gamma_significant(png_ptr->screen_gamma) != 0)) { png_build_gamma_table(png_ptr, png_ptr->bit_depth); #ifdef PNG_READ_BACKGROUND_SUPPORTED - if (png_ptr->transformations & PNG_COMPOSE) + if ((png_ptr->transformations & PNG_COMPOSE) != 0) { /* Issue a warning about this combination: because RGB_TO_GRAY is * optimized to do the gamma transform if present yet do_background has @@ -1574,11 +1580,11 @@ png_init_read_transformations(png_structrp png_ptr) * double-gamma-correction happens. This is true in all versions of * libpng to date. */ - if (png_ptr->transformations & PNG_RGB_TO_GRAY) + if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0) png_warning(png_ptr, "libpng does not support gamma+background+rgb_to_gray"); - if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) + if ((png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) != 0) { /* We don't get to here unless there is a tRNS chunk with non-opaque * entries - see the checking code at the start of this function. @@ -1626,7 +1632,7 @@ png_init_read_transformations(png_structrp png_ptr) break; } - if (png_gamma_significant(gs)) + if (png_gamma_significant(gs) != 0) { back.red = png_gamma_8bit_correct(png_ptr->background.red, gs); @@ -1643,7 +1649,7 @@ png_init_read_transformations(png_structrp png_ptr) back.blue = (png_byte)png_ptr->background.blue; } - if (png_gamma_significant(g)) + if (png_gamma_significant(g) != 0) { back_1.red = png_gamma_8bit_correct(png_ptr->background.red, g); @@ -1737,11 +1743,11 @@ png_init_read_transformations(png_structrp png_ptr) g_sig = png_gamma_significant(g); gs_sig = png_gamma_significant(gs); - if (g_sig) + if (g_sig != 0) png_ptr->background_1.gray = png_gamma_correct(png_ptr, png_ptr->background.gray, g); - if (gs_sig) + if (gs_sig != 0) png_ptr->background.gray = png_gamma_correct(png_ptr, png_ptr->background.gray, gs); @@ -1750,7 +1756,7 @@ png_init_read_transformations(png_structrp png_ptr) (png_ptr->background.red != png_ptr->background.gray)) { /* RGB or RGBA with color background */ - if (g_sig) + if (g_sig != 0) { png_ptr->background_1.red = png_gamma_correct(png_ptr, png_ptr->background.red, g); @@ -1762,7 +1768,7 @@ png_init_read_transformations(png_structrp png_ptr) png_ptr->background.blue, g); } - if (gs_sig) + if (gs_sig != 0) { png_ptr->background.red = png_gamma_correct(png_ptr, png_ptr->background.red, gs); @@ -1792,7 +1798,7 @@ png_init_read_transformations(png_structrp png_ptr) else /* Transformation does not include PNG_BACKGROUND */ -#endif /* PNG_READ_BACKGROUND_SUPPORTED */ +#endif /* READ_BACKGROUND */ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED /* RGB_TO_GRAY needs to have non-gamma-corrected values! */ @@ -1822,11 +1828,11 @@ png_init_read_transformations(png_structrp png_ptr) #ifdef PNG_READ_BACKGROUND_SUPPORTED else #endif -#endif /* PNG_READ_GAMMA_SUPPORTED */ +#endif /* READ_GAMMA */ #ifdef PNG_READ_BACKGROUND_SUPPORTED /* No GAMMA transformation (see the hanging else 4 lines above) */ - if ((png_ptr->transformations & PNG_COMPOSE) && + if ((png_ptr->transformations & PNG_COMPOSE) != 0 && (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)) { int i; @@ -1861,11 +1867,11 @@ png_init_read_transformations(png_structrp png_ptr) png_ptr->transformations &= ~PNG_COMPOSE; } -#endif /* PNG_READ_BACKGROUND_SUPPORTED */ +#endif /* READ_BACKGROUND */ #ifdef PNG_READ_SHIFT_SUPPORTED - if ((png_ptr->transformations & PNG_SHIFT) && - !(png_ptr->transformations & PNG_EXPAND) && + if ((png_ptr->transformations & PNG_SHIFT) != 0 && + (png_ptr->transformations & PNG_EXPAND) == 0 && (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)) { int i; @@ -1878,33 +1884,36 @@ png_init_read_transformations(png_structrp png_ptr) * the number of significant bits is 0 then no shift is done (this is an * error condition which is silently ignored.) */ - if (shift > 0 && shift < 8) for (i=0; ipalette[i].red; + if (shift > 0 && shift < 8) + for (i=0; ipalette[i].red; - component >>= shift; - png_ptr->palette[i].red = (png_byte)component; - } + component >>= shift; + png_ptr->palette[i].red = (png_byte)component; + } shift = 8 - png_ptr->sig_bit.green; - if (shift > 0 && shift < 8) for (i=0; ipalette[i].green; + if (shift > 0 && shift < 8) + for (i=0; ipalette[i].green; - component >>= shift; - png_ptr->palette[i].green = (png_byte)component; - } + component >>= shift; + png_ptr->palette[i].green = (png_byte)component; + } shift = 8 - png_ptr->sig_bit.blue; - if (shift > 0 && shift < 8) for (i=0; ipalette[i].blue; + if (shift > 0 && shift < 8) + for (i=0; ipalette[i].blue; - component >>= shift; - png_ptr->palette[i].blue = (png_byte)component; - } + component >>= shift; + png_ptr->palette[i].blue = (png_byte)component; + } } -#endif /* PNG_READ_SHIFT_SUPPORTED */ +#endif /* READ_SHIFT */ } /* Modify the info structure to reflect the transformations. The @@ -1917,7 +1926,7 @@ png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr) png_debug(1, "in png_read_transform_info"); #ifdef PNG_READ_EXPAND_SUPPORTED - if (png_ptr->transformations & PNG_EXPAND) + if ((png_ptr->transformations & PNG_EXPAND) != 0) { if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) { @@ -1933,12 +1942,15 @@ png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr) info_ptr->bit_depth = 8; info_ptr->num_trans = 0; + + if (png_ptr->palette == NULL) + png_error (png_ptr, "Palette is NULL in indexed image"); } else { - if (png_ptr->num_trans) + if (png_ptr->num_trans != 0) { - if (png_ptr->transformations & PNG_EXPAND_tRNS) + if ((png_ptr->transformations & PNG_EXPAND_tRNS) != 0) info_ptr->color_type |= PNG_COLOR_MASK_ALPHA; } if (info_ptr->bit_depth < 8) @@ -1954,7 +1966,7 @@ png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr) /* The following is almost certainly wrong unless the background value is in * the screen space! */ - if (png_ptr->transformations & PNG_COMPOSE) + if ((png_ptr->transformations & PNG_COMPOSE) != 0) info_ptr->background = png_ptr->background; #endif @@ -1975,12 +1987,12 @@ png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr) { # ifdef PNG_READ_16BIT_SUPPORTED # ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED - if (png_ptr->transformations & PNG_SCALE_16_TO_8) + if ((png_ptr->transformations & PNG_SCALE_16_TO_8) != 0) info_ptr->bit_depth = 8; # endif # ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED - if (png_ptr->transformations & PNG_16_TO_8) + if ((png_ptr->transformations & PNG_16_TO_8) != 0) info_ptr->bit_depth = 8; # endif @@ -2006,27 +2018,27 @@ png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr) CONFIGURATION ERROR: you must enable at least one 16 to 8 method # endif # endif -#endif /* !READ_16BIT_SUPPORTED */ +#endif /* !READ_16BIT */ } #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED - if (png_ptr->transformations & PNG_GRAY_TO_RGB) + if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0) info_ptr->color_type = (png_byte)(info_ptr->color_type | PNG_COLOR_MASK_COLOR); #endif #ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED - if (png_ptr->transformations & PNG_RGB_TO_GRAY) + if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0) info_ptr->color_type = (png_byte)(info_ptr->color_type & ~PNG_COLOR_MASK_COLOR); #endif #ifdef PNG_READ_QUANTIZE_SUPPORTED - if (png_ptr->transformations & PNG_QUANTIZE) + if ((png_ptr->transformations & PNG_QUANTIZE) != 0) { if (((info_ptr->color_type == PNG_COLOR_TYPE_RGB) || (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA)) && - png_ptr->palette_lookup && info_ptr->bit_depth == 8) + png_ptr->palette_lookup != 0 && info_ptr->bit_depth == 8) { info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; } @@ -2034,29 +2046,31 @@ png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr) #endif #ifdef PNG_READ_EXPAND_16_SUPPORTED - if (png_ptr->transformations & PNG_EXPAND_16 && info_ptr->bit_depth == 8 && - info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) + if ((png_ptr->transformations & PNG_EXPAND_16) != 0 && + info_ptr->bit_depth == 8 && + info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) { info_ptr->bit_depth = 16; } #endif #ifdef PNG_READ_PACK_SUPPORTED - if ((png_ptr->transformations & PNG_PACK) && (info_ptr->bit_depth < 8)) + if ((png_ptr->transformations & PNG_PACK) != 0 && + (info_ptr->bit_depth < 8)) info_ptr->bit_depth = 8; #endif if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) info_ptr->channels = 1; - else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR) + else if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0) info_ptr->channels = 3; else info_ptr->channels = 1; #ifdef PNG_READ_STRIP_ALPHA_SUPPORTED - if (png_ptr->transformations & PNG_STRIP_ALPHA) + if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0) { info_ptr->color_type = (png_byte)(info_ptr->color_type & ~PNG_COLOR_MASK_ALPHA); @@ -2064,25 +2078,25 @@ png_read_transform_info(png_structrp png_ptr, png_inforp info_ptr) } #endif - if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) + if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0) info_ptr->channels++; #ifdef PNG_READ_FILLER_SUPPORTED /* STRIP_ALPHA and FILLER allowed: MASK_ALPHA bit stripped above */ - if ((png_ptr->transformations & PNG_FILLER) && - ((info_ptr->color_type == PNG_COLOR_TYPE_RGB) || - (info_ptr->color_type == PNG_COLOR_TYPE_GRAY))) + if ((png_ptr->transformations & PNG_FILLER) != 0 && + (info_ptr->color_type == PNG_COLOR_TYPE_RGB || + info_ptr->color_type == PNG_COLOR_TYPE_GRAY)) { info_ptr->channels++; /* If adding a true alpha channel not just filler */ - if (png_ptr->transformations & PNG_ADD_ALPHA) + if ((png_ptr->transformations & PNG_ADD_ALPHA) != 0) info_ptr->color_type |= PNG_COLOR_MASK_ALPHA; } #endif #if defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) && \ defined(PNG_READ_USER_TRANSFORM_SUPPORTED) - if (png_ptr->transformations & PNG_USER_TRANSFORM) + if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0) { if (info_ptr->bit_depth < png_ptr->user_transform_depth) info_ptr->bit_depth = png_ptr->user_transform_depth; @@ -2106,308 +2120,11 @@ defined(PNG_READ_USER_TRANSFORM_SUPPORTED) png_ptr->info_rowbytes = info_ptr->rowbytes; #ifndef PNG_READ_EXPAND_SUPPORTED - if (png_ptr) + if (png_ptr != NULL) return; #endif } -/* Transform the row. The order of transformations is significant, - * and is very touchy. If you add a transformation, take care to - * decide how it fits in with the other transformations here. - */ -void /* PRIVATE */ -png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info) -{ - png_debug(1, "in png_do_read_transformations"); - - if (png_ptr->row_buf == NULL) - { - /* Prior to 1.5.4 this output row/pass where the NULL pointer is, but this - * error is incredibly rare and incredibly easy to debug without this - * information. - */ - png_error(png_ptr, "NULL row buffer"); - } - - /* The following is debugging; prior to 1.5.4 the code was never compiled in; - * in 1.5.4 PNG_FLAG_DETECT_UNINITIALIZED was added and the macro - * PNG_WARN_UNINITIALIZED_ROW removed. In 1.6 the new flag is set only for - * all transformations, however in practice the ROW_INIT always gets done on - * demand, if necessary. - */ - if ((png_ptr->flags & PNG_FLAG_DETECT_UNINITIALIZED) != 0 && - !(png_ptr->flags & PNG_FLAG_ROW_INIT)) - { - /* Application has failed to call either png_read_start_image() or - * png_read_update_info() after setting transforms that expand pixels. - * This check added to libpng-1.2.19 (but not enabled until 1.5.4). - */ - png_error(png_ptr, "Uninitialized row"); - } - -#ifdef PNG_READ_EXPAND_SUPPORTED - if (png_ptr->transformations & PNG_EXPAND) - { - if (row_info->color_type == PNG_COLOR_TYPE_PALETTE) - { - png_do_expand_palette(row_info, png_ptr->row_buf + 1, - png_ptr->palette, png_ptr->trans_alpha, png_ptr->num_trans); - } - - else - { - if (png_ptr->num_trans && - (png_ptr->transformations & PNG_EXPAND_tRNS)) - png_do_expand(row_info, png_ptr->row_buf + 1, - &(png_ptr->trans_color)); - - else - png_do_expand(row_info, png_ptr->row_buf + 1, - NULL); - } - } -#endif - -#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED - if ((png_ptr->transformations & PNG_STRIP_ALPHA) && - !(png_ptr->transformations & PNG_COMPOSE) && - (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA || - row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)) - png_do_strip_channel(row_info, png_ptr->row_buf + 1, - 0 /* at_start == false, because SWAP_ALPHA happens later */); -#endif - -#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED - if (png_ptr->transformations & PNG_RGB_TO_GRAY) - { - int rgb_error = - png_do_rgb_to_gray(png_ptr, row_info, - png_ptr->row_buf + 1); - - if (rgb_error) - { - png_ptr->rgb_to_gray_status=1; - if ((png_ptr->transformations & PNG_RGB_TO_GRAY) == - PNG_RGB_TO_GRAY_WARN) - png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel"); - - if ((png_ptr->transformations & PNG_RGB_TO_GRAY) == - PNG_RGB_TO_GRAY_ERR) - png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel"); - } - } -#endif - -/* From Andreas Dilger e-mail to png-implement, 26 March 1998: - * - * In most cases, the "simple transparency" should be done prior to doing - * gray-to-RGB, or you will have to test 3x as many bytes to check if a - * pixel is transparent. You would also need to make sure that the - * transparency information is upgraded to RGB. - * - * To summarize, the current flow is: - * - Gray + simple transparency -> compare 1 or 2 gray bytes and composite - * with background "in place" if transparent, - * convert to RGB if necessary - * - Gray + alpha -> composite with gray background and remove alpha bytes, - * convert to RGB if necessary - * - * To support RGB backgrounds for gray images we need: - * - Gray + simple transparency -> convert to RGB + simple transparency, - * compare 3 or 6 bytes and composite with - * background "in place" if transparent - * (3x compare/pixel compared to doing - * composite with gray bkgrnd) - * - Gray + alpha -> convert to RGB + alpha, composite with background and - * remove alpha bytes (3x float - * operations/pixel compared with composite - * on gray background) - * - * Greg's change will do this. The reason it wasn't done before is for - * performance, as this increases the per-pixel operations. If we would check - * in advance if the background was gray or RGB, and position the gray-to-RGB - * transform appropriately, then it would save a lot of work/time. - */ - -#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED - /* If gray -> RGB, do so now only if background is non-gray; else do later - * for performance reasons - */ - if ((png_ptr->transformations & PNG_GRAY_TO_RGB) && - !(png_ptr->mode & PNG_BACKGROUND_IS_GRAY)) - png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1); -#endif - -#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\ - defined(PNG_READ_ALPHA_MODE_SUPPORTED) - if (png_ptr->transformations & PNG_COMPOSE) - png_do_compose(row_info, png_ptr->row_buf + 1, png_ptr); -#endif - -#ifdef PNG_READ_GAMMA_SUPPORTED - if ((png_ptr->transformations & PNG_GAMMA) && -#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED - /* Because RGB_TO_GRAY does the gamma transform. */ - !(png_ptr->transformations & PNG_RGB_TO_GRAY) && -#endif -#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\ - defined(PNG_READ_ALPHA_MODE_SUPPORTED) - /* Because PNG_COMPOSE does the gamma transform if there is something to - * do (if there is an alpha channel or transparency.) - */ - !((png_ptr->transformations & PNG_COMPOSE) && - ((png_ptr->num_trans != 0) || - (png_ptr->color_type & PNG_COLOR_MASK_ALPHA))) && -#endif - /* Because png_init_read_transformations transforms the palette, unless - * RGB_TO_GRAY will do the transform. - */ - (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)) - png_do_gamma(row_info, png_ptr->row_buf + 1, png_ptr); -#endif - -#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED - if ((png_ptr->transformations & PNG_STRIP_ALPHA) && - (png_ptr->transformations & PNG_COMPOSE) && - (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA || - row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)) - png_do_strip_channel(row_info, png_ptr->row_buf + 1, - 0 /* at_start == false, because SWAP_ALPHA happens later */); -#endif - -#ifdef PNG_READ_ALPHA_MODE_SUPPORTED - if ((png_ptr->transformations & PNG_ENCODE_ALPHA) && - (row_info->color_type & PNG_COLOR_MASK_ALPHA)) - png_do_encode_alpha(row_info, png_ptr->row_buf + 1, png_ptr); -#endif - -#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED - if (png_ptr->transformations & PNG_SCALE_16_TO_8) - png_do_scale_16_to_8(row_info, png_ptr->row_buf + 1); -#endif - -#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED - /* There is no harm in doing both of these because only one has any effect, - * by putting the 'scale' option first if the app asks for scale (either by - * calling the API or in a TRANSFORM flag) this is what happens. - */ - if (png_ptr->transformations & PNG_16_TO_8) - png_do_chop(row_info, png_ptr->row_buf + 1); -#endif - -#ifdef PNG_READ_QUANTIZE_SUPPORTED - if (png_ptr->transformations & PNG_QUANTIZE) - { - png_do_quantize(row_info, png_ptr->row_buf + 1, - png_ptr->palette_lookup, png_ptr->quantize_index); - - if (row_info->rowbytes == 0) - png_error(png_ptr, "png_do_quantize returned rowbytes=0"); - } -#endif /* PNG_READ_QUANTIZE_SUPPORTED */ - -#ifdef PNG_READ_EXPAND_16_SUPPORTED - /* Do the expansion now, after all the arithmetic has been done. Notice - * that previous transformations can handle the PNG_EXPAND_16 flag if this - * is efficient (particularly true in the case of gamma correction, where - * better accuracy results faster!) - */ - if (png_ptr->transformations & PNG_EXPAND_16) - png_do_expand_16(row_info, png_ptr->row_buf + 1); -#endif - -#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED - /* NOTE: moved here in 1.5.4 (from much later in this list.) */ - if ((png_ptr->transformations & PNG_GRAY_TO_RGB) && - (png_ptr->mode & PNG_BACKGROUND_IS_GRAY)) - png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1); -#endif - -#ifdef PNG_READ_INVERT_SUPPORTED - if (png_ptr->transformations & PNG_INVERT_MONO) - png_do_invert(row_info, png_ptr->row_buf + 1); -#endif - -#ifdef PNG_READ_SHIFT_SUPPORTED - if (png_ptr->transformations & PNG_SHIFT) - png_do_unshift(row_info, png_ptr->row_buf + 1, - &(png_ptr->shift)); -#endif - -#ifdef PNG_READ_PACK_SUPPORTED - if (png_ptr->transformations & PNG_PACK) - png_do_unpack(row_info, png_ptr->row_buf + 1); -#endif - -#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED - /* Added at libpng-1.5.10 */ - if (row_info->color_type == PNG_COLOR_TYPE_PALETTE && - png_ptr->num_palette_max >= 0) - png_do_check_palette_indexes(png_ptr, row_info); -#endif - -#ifdef PNG_READ_BGR_SUPPORTED - if (png_ptr->transformations & PNG_BGR) - png_do_bgr(row_info, png_ptr->row_buf + 1); -#endif - -#ifdef PNG_READ_PACKSWAP_SUPPORTED - if (png_ptr->transformations & PNG_PACKSWAP) - png_do_packswap(row_info, png_ptr->row_buf + 1); -#endif - -#ifdef PNG_READ_FILLER_SUPPORTED - if (png_ptr->transformations & PNG_FILLER) - png_do_read_filler(row_info, png_ptr->row_buf + 1, - (png_uint_32)png_ptr->filler, png_ptr->flags); -#endif - -#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED - if (png_ptr->transformations & PNG_INVERT_ALPHA) - png_do_read_invert_alpha(row_info, png_ptr->row_buf + 1); -#endif - -#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED - if (png_ptr->transformations & PNG_SWAP_ALPHA) - png_do_read_swap_alpha(row_info, png_ptr->row_buf + 1); -#endif - -#ifdef PNG_READ_16BIT_SUPPORTED -#ifdef PNG_READ_SWAP_SUPPORTED - if (png_ptr->transformations & PNG_SWAP_BYTES) - png_do_swap(row_info, png_ptr->row_buf + 1); -#endif -#endif - -#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED - if (png_ptr->transformations & PNG_USER_TRANSFORM) - { - if (png_ptr->read_user_transform_fn != NULL) - (*(png_ptr->read_user_transform_fn)) /* User read transform function */ - (png_ptr, /* png_ptr */ - row_info, /* row_info: */ - /* png_uint_32 width; width of row */ - /* png_size_t rowbytes; number of bytes in row */ - /* png_byte color_type; color type of pixels */ - /* png_byte bit_depth; bit depth of samples */ - /* png_byte channels; number of channels (1-4) */ - /* png_byte pixel_depth; bits per pixel (depth*channels) */ - png_ptr->row_buf + 1); /* start of pixel data for row */ -#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED - if (png_ptr->user_transform_depth) - row_info->bit_depth = png_ptr->user_transform_depth; - - if (png_ptr->user_transform_channels) - row_info->channels = png_ptr->user_transform_channels; -#endif - row_info->pixel_depth = (png_byte)(row_info->bit_depth * - row_info->channels); - - row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_info->width); - } -#endif -} - #ifdef PNG_READ_PACK_SUPPORTED /* Unpack pixels of 1, 2, or 4 bits per pixel into 1 byte per pixel, * without changing the actual values. Thus, if you had a row with @@ -2415,7 +2132,7 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info) * the numbers 0 or 1. If you would rather they contain 0 and 255, use * png_do_shift() after this. */ -void /* PRIVATE */ +static void png_do_unpack(png_row_infop row_info, png_bytep row) { png_debug(1, "in png_do_unpack"); @@ -2513,7 +2230,7 @@ png_do_unpack(png_row_infop row_info, png_bytep row) * a row of bit depth 8, but only 5 are significant, this will shift * the values back to 0 through 31. */ -void /* PRIVATE */ +static void png_do_unshift(png_row_infop row_info, png_bytep row, png_const_color_8p sig_bits) { @@ -2530,7 +2247,7 @@ png_do_unshift(png_row_infop row_info, png_bytep row, int channels = 0; int bit_depth = row_info->bit_depth; - if (color_type & PNG_COLOR_MASK_COLOR) + if ((color_type & PNG_COLOR_MASK_COLOR) != 0) { shift[channels++] = bit_depth - sig_bits->red; shift[channels++] = bit_depth - sig_bits->green; @@ -2542,7 +2259,7 @@ png_do_unshift(png_row_infop row_info, png_bytep row, shift[channels++] = bit_depth - sig_bits->gray; } - if (color_type & PNG_COLOR_MASK_ALPHA) + if ((color_type & PNG_COLOR_MASK_ALPHA) != 0) { shift[channels++] = bit_depth - sig_bits->alpha; } @@ -2562,7 +2279,7 @@ png_do_unshift(png_row_infop row_info, png_bytep row, have_shift = 1; } - if (!have_shift) + if (have_shift == 0) return; } @@ -2640,7 +2357,7 @@ png_do_unshift(png_row_infop row_info, png_bytep row, if (++channel >= channels) channel = 0; *bp++ = (png_byte)(value >> 8); - *bp++ = (png_byte)(value & 0xff); + *bp++ = (png_byte)value; } break; } @@ -2652,7 +2369,7 @@ png_do_unshift(png_row_infop row_info, png_bytep row, #ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED /* Scale rows of bit depth 16 down to 8 accurately */ -void /* PRIVATE */ +static void png_do_scale_16_to_8(png_row_infop row_info, png_bytep row) { png_debug(1, "in png_do_scale_16_to_8"); @@ -2710,7 +2427,7 @@ png_do_scale_16_to_8(png_row_infop row_info, png_bytep row) #endif #ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED -void /* PRIVATE */ +static void /* Simply discard the low byte. This was the default behavior prior * to libpng-1.5.4. */ @@ -2738,7 +2455,7 @@ png_do_chop(png_row_infop row_info, png_bytep row) #endif #ifdef PNG_READ_SWAP_ALPHA_SUPPORTED -void /* PRIVATE */ +static void png_do_read_swap_alpha(png_row_infop row_info, png_bytep row) { png_debug(1, "in png_do_read_swap_alpha"); @@ -2835,7 +2552,7 @@ png_do_read_swap_alpha(png_row_infop row_info, png_bytep row) #endif #ifdef PNG_READ_INVERT_ALPHA_SUPPORTED -void /* PRIVATE */ +static void png_do_read_invert_alpha(png_row_infop row_info, png_bytep row) { png_uint_32 row_width; @@ -2937,7 +2654,7 @@ png_do_read_invert_alpha(png_row_infop row_info, png_bytep row) #ifdef PNG_READ_FILLER_SUPPORTED /* Add filler channel if we have RGB color */ -void /* PRIVATE */ +static void png_do_read_filler(png_row_infop row_info, png_bytep row, png_uint_32 filler, png_uint_32 flags) { @@ -2945,9 +2662,9 @@ png_do_read_filler(png_row_infop row_info, png_bytep row, png_uint_32 row_width = row_info->width; #ifdef PNG_READ_16BIT_SUPPORTED - png_byte hi_filler = (png_byte)((filler>>8) & 0xff); + png_byte hi_filler = (png_byte)(filler>>8); #endif - png_byte lo_filler = (png_byte)(filler & 0xff); + png_byte lo_filler = (png_byte)filler; png_debug(1, "in png_do_read_filler"); @@ -2956,7 +2673,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row, { if (row_info->bit_depth == 8) { - if (flags & PNG_FLAG_FILLER_AFTER) + if ((flags & PNG_FLAG_FILLER_AFTER) != 0) { /* This changes the data from G to GX */ png_bytep sp = row + (png_size_t)row_width; @@ -2991,20 +2708,20 @@ png_do_read_filler(png_row_infop row_info, png_bytep row, #ifdef PNG_READ_16BIT_SUPPORTED else if (row_info->bit_depth == 16) { - if (flags & PNG_FLAG_FILLER_AFTER) + if ((flags & PNG_FLAG_FILLER_AFTER) != 0) { /* This changes the data from GG to GGXX */ png_bytep sp = row + (png_size_t)row_width * 2; png_bytep dp = sp + (png_size_t)row_width * 2; for (i = 1; i < row_width; i++) { - *(--dp) = hi_filler; *(--dp) = lo_filler; + *(--dp) = hi_filler; *(--dp) = *(--sp); *(--dp) = *(--sp); } - *(--dp) = hi_filler; *(--dp) = lo_filler; + *(--dp) = hi_filler; row_info->channels = 2; row_info->pixel_depth = 32; row_info->rowbytes = row_width * 4; @@ -3019,8 +2736,8 @@ png_do_read_filler(png_row_infop row_info, png_bytep row, { *(--dp) = *(--sp); *(--dp) = *(--sp); - *(--dp) = hi_filler; *(--dp) = lo_filler; + *(--dp) = hi_filler; } row_info->channels = 2; row_info->pixel_depth = 32; @@ -3033,7 +2750,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row, { if (row_info->bit_depth == 8) { - if (flags & PNG_FLAG_FILLER_AFTER) + if ((flags & PNG_FLAG_FILLER_AFTER) != 0) { /* This changes the data from RGB to RGBX */ png_bytep sp = row + (png_size_t)row_width * 3; @@ -3072,15 +2789,15 @@ png_do_read_filler(png_row_infop row_info, png_bytep row, #ifdef PNG_READ_16BIT_SUPPORTED else if (row_info->bit_depth == 16) { - if (flags & PNG_FLAG_FILLER_AFTER) + if ((flags & PNG_FLAG_FILLER_AFTER) != 0) { /* This changes the data from RRGGBB to RRGGBBXX */ png_bytep sp = row + (png_size_t)row_width * 6; png_bytep dp = sp + (png_size_t)row_width * 2; for (i = 1; i < row_width; i++) { - *(--dp) = hi_filler; *(--dp) = lo_filler; + *(--dp) = hi_filler; *(--dp) = *(--sp); *(--dp) = *(--sp); *(--dp) = *(--sp); @@ -3088,8 +2805,8 @@ png_do_read_filler(png_row_infop row_info, png_bytep row, *(--dp) = *(--sp); *(--dp) = *(--sp); } - *(--dp) = hi_filler; *(--dp) = lo_filler; + *(--dp) = hi_filler; row_info->channels = 4; row_info->pixel_depth = 64; row_info->rowbytes = row_width * 8; @@ -3108,8 +2825,8 @@ png_do_read_filler(png_row_infop row_info, png_bytep row, *(--dp) = *(--sp); *(--dp) = *(--sp); *(--dp) = *(--sp); - *(--dp) = hi_filler; *(--dp) = lo_filler; + *(--dp) = hi_filler; } row_info->channels = 4; @@ -3124,7 +2841,7 @@ png_do_read_filler(png_row_infop row_info, png_bytep row, #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED /* Expand grayscale files to RGB, with or without alpha */ -void /* PRIVATE */ +static void png_do_gray_to_rgb(png_row_infop row_info, png_bytep row) { png_uint_32 i; @@ -3133,7 +2850,7 @@ png_do_gray_to_rgb(png_row_infop row_info, png_bytep row) png_debug(1, "in png_do_gray_to_rgb"); if (row_info->bit_depth >= 8 && - !(row_info->color_type & PNG_COLOR_MASK_COLOR)) + (row_info->color_type & PNG_COLOR_MASK_COLOR) == 0) { if (row_info->color_type == PNG_COLOR_TYPE_GRAY) { @@ -3263,7 +2980,7 @@ png_do_gray_to_rgb(png_row_infop row_info, png_bytep row) * calculated to make the sum 32768. This will result in different rounding * to that used above. */ -int /* PRIVATE */ +static int png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row) { @@ -3271,8 +2988,8 @@ png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row) png_debug(1, "in png_do_rgb_to_gray"); - if (!(row_info->color_type & PNG_COLOR_MASK_PALETTE) && - (row_info->color_type & PNG_COLOR_MASK_COLOR)) + if ((row_info->color_type & PNG_COLOR_MASK_PALETTE) == 0 && + (row_info->color_type & PNG_COLOR_MASK_COLOR) != 0) { PNG_CONST png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff; PNG_CONST png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff; @@ -3323,7 +3040,7 @@ png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row) *(dp++) = red; } - if (have_alpha) + if (have_alpha != 0) *(dp++) = *(sp++); } } @@ -3352,7 +3069,7 @@ png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row) else *(dp++) = red; - if (have_alpha) + if (have_alpha != 0) *(dp++) = *(sp++); } } @@ -3370,16 +3087,17 @@ png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row) for (i = 0; i < row_width; i++) { png_uint_16 red, green, blue, w; + png_byte hi,lo; - red = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; - green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; - blue = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; + hi=*(sp)++; lo=*(sp)++; red = (png_uint_16)((hi << 8) | (lo)); + hi=*(sp)++; lo=*(sp)++; green = (png_uint_16)((hi << 8) | (lo)); + hi=*(sp)++; lo=*(sp)++; blue = (png_uint_16)((hi << 8) | (lo)); if (red == green && red == blue) { if (png_ptr->gamma_16_table != NULL) - w = png_ptr->gamma_16_table[(red&0xff) - >> png_ptr->gamma_shift][red>>8]; + w = png_ptr->gamma_16_table[(red & 0xff) + >> png_ptr->gamma_shift][red >> 8]; else w = red; @@ -3387,16 +3105,16 @@ png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row) else { - png_uint_16 red_1 = png_ptr->gamma_16_to_1[(red&0xff) + png_uint_16 red_1 = png_ptr->gamma_16_to_1[(red & 0xff) >> png_ptr->gamma_shift][red>>8]; png_uint_16 green_1 = - png_ptr->gamma_16_to_1[(green&0xff) >> + png_ptr->gamma_16_to_1[(green & 0xff) >> png_ptr->gamma_shift][green>>8]; - png_uint_16 blue_1 = png_ptr->gamma_16_to_1[(blue&0xff) + png_uint_16 blue_1 = png_ptr->gamma_16_to_1[(blue & 0xff) >> png_ptr->gamma_shift][blue>>8]; png_uint_16 gray16 = (png_uint_16)((rc*red_1 + gc*green_1 + bc*blue_1 + 16384)>>15); - w = png_ptr->gamma_16_from_1[(gray16&0xff) >> + w = png_ptr->gamma_16_from_1[(gray16 & 0xff) >> png_ptr->gamma_shift][gray16 >> 8]; rgb_error |= 1; } @@ -3404,7 +3122,7 @@ png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row) *(dp++) = (png_byte)((w>>8) & 0xff); *(dp++) = (png_byte)(w & 0xff); - if (have_alpha) + if (have_alpha != 0) { *(dp++) = *(sp++); *(dp++) = *(sp++); @@ -3421,10 +3139,11 @@ png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row) for (i = 0; i < row_width; i++) { png_uint_16 red, green, blue, gray16; + png_byte hi,lo; - red = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; - green = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; - blue = (png_uint_16)(((*(sp))<<8) | *(sp + 1)); sp += 2; + hi=*(sp)++; lo=*(sp)++; red = (png_uint_16)((hi << 8) | (lo)); + hi=*(sp)++; lo=*(sp)++; green = (png_uint_16)((hi << 8) | (lo)); + hi=*(sp)++; lo=*(sp)++; blue = (png_uint_16)((hi << 8) | (lo)); if (red != green || red != blue) rgb_error |= 1; @@ -3435,10 +3154,10 @@ png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row) */ gray16 = (png_uint_16)((rc*red + gc*green + bc*blue + 16384) >> 15); - *(dp++) = (png_byte)((gray16>>8) & 0xff); + *(dp++) = (png_byte)((gray16 >> 8) & 0xff); *(dp++) = (png_byte)(gray16 & 0xff); - if (have_alpha) + if (have_alpha != 0) { *(dp++) = *(sp++); *(dp++) = *(sp++); @@ -3457,73 +3176,14 @@ png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row) return rgb_error; } #endif -#endif /* PNG_READ_TRANSFORMS_SUPPORTED */ -#ifdef PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED -/* Build a grayscale palette. Palette is assumed to be 1 << bit_depth - * large of png_color. This lets grayscale images be treated as - * paletted. Most useful for gamma correction and simplification - * of code. This API is not used internally. - */ -void PNGAPI -png_build_grayscale_palette(int bit_depth, png_colorp palette) -{ - int num_palette; - int color_inc; - int i; - int v; - - png_debug(1, "in png_do_build_grayscale_palette"); - - if (palette == NULL) - return; - - switch (bit_depth) - { - case 1: - num_palette = 2; - color_inc = 0xff; - break; - - case 2: - num_palette = 4; - color_inc = 0x55; - break; - - case 4: - num_palette = 16; - color_inc = 0x11; - break; - - case 8: - num_palette = 256; - color_inc = 1; - break; - - default: - num_palette = 0; - color_inc = 0; - break; - } - - for (i = 0, v = 0; i < num_palette; i++, v += color_inc) - { - palette[i].red = (png_byte)v; - palette[i].green = (png_byte)v; - palette[i].blue = (png_byte)v; - } -} -#endif - - -#ifdef PNG_READ_TRANSFORMS_SUPPORTED #if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\ defined(PNG_READ_ALPHA_MODE_SUPPORTED) /* Replace any alpha or transparency with the supplied background color. * "background" is already in the screen gamma, while "background_1" is * at a gamma of 1.0. Paletted files have already been taken care of. */ -void /* PRIVATE */ +static void png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) { #ifdef PNG_READ_GAMMA_SUPPORTED @@ -3565,7 +3225,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) *sp = (png_byte)(tmp & 0xff); } - if (!shift) + if (shift == 0) { shift = 7; sp++; @@ -3604,7 +3264,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) *sp = (png_byte)(tmp & 0xff); } - if (!shift) + if (shift == 0) { shift = 6; sp++; @@ -3630,7 +3290,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) *sp = (png_byte)(tmp & 0xff); } - if (!shift) + if (shift == 0) { shift = 6; sp++; @@ -3670,7 +3330,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) *sp = (png_byte)(tmp & 0xff); } - if (!shift) + if (shift == 0) { shift = 4; sp++; @@ -3696,7 +3356,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) *sp = (png_byte)(tmp & 0xff); } - if (!shift) + if (shift == 0) { shift = 4; sp++; @@ -3949,7 +3609,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) v = gamma_to_1[*sp]; png_composite(w, v, a, png_ptr->background_1.gray); - if (!optimize) + if (optimize == 0) w = gamma_from_1[w]; *sp = w; } @@ -4006,10 +3666,11 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) g = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp]; png_composite_16(v, g, a, png_ptr->background_1.gray); - if (optimize) + if (optimize != 0) w = v; else - w = gamma_16_from_1[(v&0xff) >> gamma_shift][v >> 8]; + w = gamma_16_from_1[(v & 0xff) >> + gamma_shift][v >> 8]; *sp = (png_byte)((w >> 8) & 0xff); *(sp + 1) = (png_byte)(w & 0xff); } @@ -4080,17 +3741,17 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) v = gamma_to_1[*sp]; png_composite(w, v, a, png_ptr->background_1.red); - if (!optimize) w = gamma_from_1[w]; + if (optimize == 0) w = gamma_from_1[w]; *sp = w; v = gamma_to_1[*(sp + 1)]; png_composite(w, v, a, png_ptr->background_1.green); - if (!optimize) w = gamma_from_1[w]; + if (optimize == 0) w = gamma_from_1[w]; *(sp + 1) = w; v = gamma_to_1[*(sp + 2)]; png_composite(w, v, a, png_ptr->background_1.blue); - if (!optimize) w = gamma_from_1[w]; + if (optimize == 0) w = gamma_from_1[w]; *(sp + 2) = w; } } @@ -4172,16 +3833,16 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) v = gamma_16_to_1[*(sp + 1) >> gamma_shift][*sp]; png_composite_16(w, v, a, png_ptr->background_1.red); - if (!optimize) - w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> + if (optimize == 0) + w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >> 8]; *sp = (png_byte)((w >> 8) & 0xff); *(sp + 1) = (png_byte)(w & 0xff); v = gamma_16_to_1[*(sp + 3) >> gamma_shift][*(sp + 2)]; png_composite_16(w, v, a, png_ptr->background_1.green); - if (!optimize) - w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> + if (optimize == 0) + w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >> 8]; *(sp + 2) = (png_byte)((w >> 8) & 0xff); @@ -4189,8 +3850,8 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) v = gamma_16_to_1[*(sp + 5) >> gamma_shift][*(sp + 4)]; png_composite_16(w, v, a, png_ptr->background_1.blue); - if (!optimize) - w = gamma_16_from_1[((w&0xff) >> gamma_shift)][w >> + if (optimize == 0) + w = gamma_16_from_1[((w & 0xff) >> gamma_shift)][w >> 8]; *(sp + 4) = (png_byte)((w >> 8) & 0xff); @@ -4254,7 +3915,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) } } } -#endif /* PNG_READ_BACKGROUND_SUPPORTED || PNG_READ_ALPHA_MODE_SUPPORTED */ +#endif /* READ_BACKGROUND || READ_ALPHA_MODE */ #ifdef PNG_READ_GAMMA_SUPPORTED /* Gamma correct the image, avoiding the alpha channel. Make sure @@ -4263,7 +3924,7 @@ png_do_compose(png_row_infop row_info, png_bytep row, png_structrp png_ptr) * is 16, use gamma_16_table and gamma_shift. Build these with * build_gamma_table(). */ -void /* PRIVATE */ +static void png_do_gamma(png_row_infop row_info, png_bytep row, png_structrp png_ptr) { png_const_bytep gamma_table = png_ptr->gamma_table; @@ -4464,14 +4125,14 @@ png_do_gamma(png_row_infop row_info, png_bytep row, png_structrp png_ptr) * linear.) Called only with color types that have an alpha channel. Needs the * from_1 tables. */ -void /* PRIVATE */ +static void png_do_encode_alpha(png_row_infop row_info, png_bytep row, png_structrp png_ptr) { png_uint_32 row_width = row_info->width; png_debug(1, "in png_do_encode_alpha"); - if (row_info->color_type & PNG_COLOR_MASK_ALPHA) + if ((row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0) { if (row_info->bit_depth == 8) { @@ -4530,7 +4191,7 @@ png_do_encode_alpha(png_row_infop row_info, png_bytep row, png_structrp png_ptr) /* Expands a palette row to an RGB or RGBA row depending * upon whether you supply trans and num_trans. */ -void /* PRIVATE */ +static void png_do_expand_palette(png_row_infop row_info, png_bytep row, png_const_colorp palette, png_const_bytep trans_alpha, int num_trans) { @@ -4683,7 +4344,7 @@ png_do_expand_palette(png_row_infop row_info, png_bytep row, /* If the bit depth < 8, it is expanded to 8. Also, if the already * expanded transparency value is supplied, an alpha channel is built. */ -void /* PRIVATE */ +static void png_do_expand(png_row_infop row_info, png_bytep row, png_const_color_16p trans_color) { @@ -4697,7 +4358,7 @@ png_do_expand(png_row_infop row_info, png_bytep row, { if (row_info->color_type == PNG_COLOR_TYPE_GRAY) { - unsigned int gray = trans_color ? trans_color->gray : 0; + unsigned int gray = trans_color != NULL ? trans_color->gray : 0; if (row_info->bit_depth < 8) { @@ -4841,7 +4502,8 @@ png_do_expand(png_row_infop row_info, png_bytep row, row_width); } } - else if (row_info->color_type == PNG_COLOR_TYPE_RGB && trans_color) + else if (row_info->color_type == PNG_COLOR_TYPE_RGB && + trans_color != NULL) { if (row_info->bit_depth == 8) { @@ -4913,7 +4575,7 @@ png_do_expand(png_row_infop row_info, png_bytep row, /* If the bit depth is 8 and the color type is not a palette type expand the * whole row to 16 bits. Has no effect otherwise. */ -void /* PRIVATE */ +static void png_do_expand_16(png_row_infop row_info, png_bytep row) { if (row_info->bit_depth == 8 && @@ -4941,7 +4603,7 @@ png_do_expand_16(png_row_infop row_info, png_bytep row) #endif #ifdef PNG_READ_QUANTIZE_SUPPORTED -void /* PRIVATE */ +static void png_do_quantize(png_row_infop row_info, png_bytep row, png_const_bytep palette_lookup, png_const_bytep quantize_lookup) { @@ -5032,70 +4694,304 @@ png_do_quantize(png_row_infop row_info, png_bytep row, } } } -#endif /* PNG_READ_QUANTIZE_SUPPORTED */ -#endif /* PNG_READ_TRANSFORMS_SUPPORTED */ +#endif /* READ_QUANTIZE */ -#ifdef PNG_MNG_FEATURES_SUPPORTED -/* Undoes intrapixel differencing */ +/* Transform the row. The order of transformations is significant, + * and is very touchy. If you add a transformation, take care to + * decide how it fits in with the other transformations here. + */ void /* PRIVATE */ -png_do_read_intrapixel(png_row_infop row_info, png_bytep row) +png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info) { - png_debug(1, "in png_do_read_intrapixel"); + png_debug(1, "in png_do_read_transformations"); - if ( - (row_info->color_type & PNG_COLOR_MASK_COLOR)) + if (png_ptr->row_buf == NULL) { - int bytes_per_pixel; - png_uint_32 row_width = row_info->width; + /* Prior to 1.5.4 this output row/pass where the NULL pointer is, but this + * error is incredibly rare and incredibly easy to debug without this + * information. + */ + png_error(png_ptr, "NULL row buffer"); + } - if (row_info->bit_depth == 8) + /* The following is debugging; prior to 1.5.4 the code was never compiled in; + * in 1.5.4 PNG_FLAG_DETECT_UNINITIALIZED was added and the macro + * PNG_WARN_UNINITIALIZED_ROW removed. In 1.6 the new flag is set only for + * all transformations, however in practice the ROW_INIT always gets done on + * demand, if necessary. + */ + if ((png_ptr->flags & PNG_FLAG_DETECT_UNINITIALIZED) != 0 && + (png_ptr->flags & PNG_FLAG_ROW_INIT) == 0) + { + /* Application has failed to call either png_read_start_image() or + * png_read_update_info() after setting transforms that expand pixels. + * This check added to libpng-1.2.19 (but not enabled until 1.5.4). + */ + png_error(png_ptr, "Uninitialized row"); + } + +#ifdef PNG_READ_EXPAND_SUPPORTED + if ((png_ptr->transformations & PNG_EXPAND) != 0) + { + if (row_info->color_type == PNG_COLOR_TYPE_PALETTE) { - png_bytep rp; - png_uint_32 i; - - if (row_info->color_type == PNG_COLOR_TYPE_RGB) - bytes_per_pixel = 3; - - else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) - bytes_per_pixel = 4; - - else - return; - - for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel) - { - *(rp) = (png_byte)((256 + *rp + *(rp + 1)) & 0xff); - *(rp+2) = (png_byte)((256 + *(rp + 2) + *(rp + 1)) & 0xff); - } + png_do_expand_palette(row_info, png_ptr->row_buf + 1, + png_ptr->palette, png_ptr->trans_alpha, png_ptr->num_trans); } - else if (row_info->bit_depth == 16) + + else { - png_bytep rp; - png_uint_32 i; - - if (row_info->color_type == PNG_COLOR_TYPE_RGB) - bytes_per_pixel = 6; - - else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) - bytes_per_pixel = 8; + if (png_ptr->num_trans != 0 && + (png_ptr->transformations & PNG_EXPAND_tRNS) != 0) + png_do_expand(row_info, png_ptr->row_buf + 1, + &(png_ptr->trans_color)); else - return; - - for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel) - { - png_uint_32 s0 = (*(rp ) << 8) | *(rp + 1); - png_uint_32 s1 = (*(rp + 2) << 8) | *(rp + 3); - png_uint_32 s2 = (*(rp + 4) << 8) | *(rp + 5); - png_uint_32 red = (s0 + s1 + 65536) & 0xffff; - png_uint_32 blue = (s2 + s1 + 65536) & 0xffff; - *(rp ) = (png_byte)((red >> 8) & 0xff); - *(rp + 1) = (png_byte)(red & 0xff); - *(rp + 4) = (png_byte)((blue >> 8) & 0xff); - *(rp + 5) = (png_byte)(blue & 0xff); - } + png_do_expand(row_info, png_ptr->row_buf + 1, + NULL); } } +#endif + +#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED + if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 && + (png_ptr->transformations & PNG_COMPOSE) == 0 && + (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA || + row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)) + png_do_strip_channel(row_info, png_ptr->row_buf + 1, + 0 /* at_start == false, because SWAP_ALPHA happens later */); +#endif + +#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED + if ((png_ptr->transformations & PNG_RGB_TO_GRAY) != 0) + { + int rgb_error = + png_do_rgb_to_gray(png_ptr, row_info, + png_ptr->row_buf + 1); + + if (rgb_error != 0) + { + png_ptr->rgb_to_gray_status=1; + if ((png_ptr->transformations & PNG_RGB_TO_GRAY) == + PNG_RGB_TO_GRAY_WARN) + png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel"); + + if ((png_ptr->transformations & PNG_RGB_TO_GRAY) == + PNG_RGB_TO_GRAY_ERR) + png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel"); + } + } +#endif + +/* From Andreas Dilger e-mail to png-implement, 26 March 1998: + * + * In most cases, the "simple transparency" should be done prior to doing + * gray-to-RGB, or you will have to test 3x as many bytes to check if a + * pixel is transparent. You would also need to make sure that the + * transparency information is upgraded to RGB. + * + * To summarize, the current flow is: + * - Gray + simple transparency -> compare 1 or 2 gray bytes and composite + * with background "in place" if transparent, + * convert to RGB if necessary + * - Gray + alpha -> composite with gray background and remove alpha bytes, + * convert to RGB if necessary + * + * To support RGB backgrounds for gray images we need: + * - Gray + simple transparency -> convert to RGB + simple transparency, + * compare 3 or 6 bytes and composite with + * background "in place" if transparent + * (3x compare/pixel compared to doing + * composite with gray bkgrnd) + * - Gray + alpha -> convert to RGB + alpha, composite with background and + * remove alpha bytes (3x float + * operations/pixel compared with composite + * on gray background) + * + * Greg's change will do this. The reason it wasn't done before is for + * performance, as this increases the per-pixel operations. If we would check + * in advance if the background was gray or RGB, and position the gray-to-RGB + * transform appropriately, then it would save a lot of work/time. + */ + +#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED + /* If gray -> RGB, do so now only if background is non-gray; else do later + * for performance reasons + */ + if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0 && + (png_ptr->mode & PNG_BACKGROUND_IS_GRAY) == 0) + png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1); +#endif + +#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\ + defined(PNG_READ_ALPHA_MODE_SUPPORTED) + if ((png_ptr->transformations & PNG_COMPOSE) != 0) + png_do_compose(row_info, png_ptr->row_buf + 1, png_ptr); +#endif + +#ifdef PNG_READ_GAMMA_SUPPORTED + if ((png_ptr->transformations & PNG_GAMMA) != 0 && +#ifdef PNG_READ_RGB_TO_GRAY_SUPPORTED + /* Because RGB_TO_GRAY does the gamma transform. */ + (png_ptr->transformations & PNG_RGB_TO_GRAY) == 0 && +#endif +#if defined(PNG_READ_BACKGROUND_SUPPORTED) ||\ + defined(PNG_READ_ALPHA_MODE_SUPPORTED) + /* Because PNG_COMPOSE does the gamma transform if there is something to + * do (if there is an alpha channel or transparency.) + */ + !((png_ptr->transformations & PNG_COMPOSE) != 0 && + ((png_ptr->num_trans != 0) || + (png_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0)) && +#endif + /* Because png_init_read_transformations transforms the palette, unless + * RGB_TO_GRAY will do the transform. + */ + (png_ptr->color_type != PNG_COLOR_TYPE_PALETTE)) + png_do_gamma(row_info, png_ptr->row_buf + 1, png_ptr); +#endif + +#ifdef PNG_READ_STRIP_ALPHA_SUPPORTED + if ((png_ptr->transformations & PNG_STRIP_ALPHA) != 0 && + (png_ptr->transformations & PNG_COMPOSE) != 0 && + (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA || + row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)) + png_do_strip_channel(row_info, png_ptr->row_buf + 1, + 0 /* at_start == false, because SWAP_ALPHA happens later */); +#endif + +#ifdef PNG_READ_ALPHA_MODE_SUPPORTED + if ((png_ptr->transformations & PNG_ENCODE_ALPHA) != 0 && + (row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0) + png_do_encode_alpha(row_info, png_ptr->row_buf + 1, png_ptr); +#endif + +#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED + if ((png_ptr->transformations & PNG_SCALE_16_TO_8) != 0) + png_do_scale_16_to_8(row_info, png_ptr->row_buf + 1); +#endif + +#ifdef PNG_READ_STRIP_16_TO_8_SUPPORTED + /* There is no harm in doing both of these because only one has any effect, + * by putting the 'scale' option first if the app asks for scale (either by + * calling the API or in a TRANSFORM flag) this is what happens. + */ + if ((png_ptr->transformations & PNG_16_TO_8) != 0) + png_do_chop(row_info, png_ptr->row_buf + 1); +#endif + +#ifdef PNG_READ_QUANTIZE_SUPPORTED + if ((png_ptr->transformations & PNG_QUANTIZE) != 0) + { + png_do_quantize(row_info, png_ptr->row_buf + 1, + png_ptr->palette_lookup, png_ptr->quantize_index); + + if (row_info->rowbytes == 0) + png_error(png_ptr, "png_do_quantize returned rowbytes=0"); + } +#endif /* READ_QUANTIZE */ + +#ifdef PNG_READ_EXPAND_16_SUPPORTED + /* Do the expansion now, after all the arithmetic has been done. Notice + * that previous transformations can handle the PNG_EXPAND_16 flag if this + * is efficient (particularly true in the case of gamma correction, where + * better accuracy results faster!) + */ + if ((png_ptr->transformations & PNG_EXPAND_16) != 0) + png_do_expand_16(row_info, png_ptr->row_buf + 1); +#endif + +#ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED + /* NOTE: moved here in 1.5.4 (from much later in this list.) */ + if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0 && + (png_ptr->mode & PNG_BACKGROUND_IS_GRAY) != 0) + png_do_gray_to_rgb(row_info, png_ptr->row_buf + 1); +#endif + +#ifdef PNG_READ_INVERT_SUPPORTED + if ((png_ptr->transformations & PNG_INVERT_MONO) != 0) + png_do_invert(row_info, png_ptr->row_buf + 1); +#endif + +#ifdef PNG_READ_INVERT_ALPHA_SUPPORTED + if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0) + png_do_read_invert_alpha(row_info, png_ptr->row_buf + 1); +#endif + +#ifdef PNG_READ_SHIFT_SUPPORTED + if ((png_ptr->transformations & PNG_SHIFT) != 0) + png_do_unshift(row_info, png_ptr->row_buf + 1, + &(png_ptr->shift)); +#endif + +#ifdef PNG_READ_PACK_SUPPORTED + if ((png_ptr->transformations & PNG_PACK) != 0) + png_do_unpack(row_info, png_ptr->row_buf + 1); +#endif + +#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED + /* Added at libpng-1.5.10 */ + if (row_info->color_type == PNG_COLOR_TYPE_PALETTE && + png_ptr->num_palette_max >= 0) + png_do_check_palette_indexes(png_ptr, row_info); +#endif + +#ifdef PNG_READ_BGR_SUPPORTED + if ((png_ptr->transformations & PNG_BGR) != 0) + png_do_bgr(row_info, png_ptr->row_buf + 1); +#endif + +#ifdef PNG_READ_PACKSWAP_SUPPORTED + if ((png_ptr->transformations & PNG_PACKSWAP) != 0) + png_do_packswap(row_info, png_ptr->row_buf + 1); +#endif + +#ifdef PNG_READ_FILLER_SUPPORTED + if ((png_ptr->transformations & PNG_FILLER) != 0) + png_do_read_filler(row_info, png_ptr->row_buf + 1, + (png_uint_32)png_ptr->filler, png_ptr->flags); +#endif + +#ifdef PNG_READ_SWAP_ALPHA_SUPPORTED + if ((png_ptr->transformations & PNG_SWAP_ALPHA) != 0) + png_do_read_swap_alpha(row_info, png_ptr->row_buf + 1); +#endif + +#ifdef PNG_READ_16BIT_SUPPORTED +#ifdef PNG_READ_SWAP_SUPPORTED + if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0) + png_do_swap(row_info, png_ptr->row_buf + 1); +#endif +#endif + +#ifdef PNG_READ_USER_TRANSFORM_SUPPORTED + if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0) + { + if (png_ptr->read_user_transform_fn != NULL) + (*(png_ptr->read_user_transform_fn)) /* User read transform function */ + (png_ptr, /* png_ptr */ + row_info, /* row_info: */ + /* png_uint_32 width; width of row */ + /* png_size_t rowbytes; number of bytes in row */ + /* png_byte color_type; color type of pixels */ + /* png_byte bit_depth; bit depth of samples */ + /* png_byte channels; number of channels (1-4) */ + /* png_byte pixel_depth; bits per pixel (depth*channels) */ + png_ptr->row_buf + 1); /* start of pixel data for row */ +#ifdef PNG_USER_TRANSFORM_PTR_SUPPORTED + if (png_ptr->user_transform_depth != 0) + row_info->bit_depth = png_ptr->user_transform_depth; + + if (png_ptr->user_transform_channels != 0) + row_info->channels = png_ptr->user_transform_channels; +#endif + row_info->pixel_depth = (png_byte)(row_info->bit_depth * + row_info->channels); + + row_info->rowbytes = PNG_ROWBYTES(row_info->pixel_depth, row_info->width); + } +#endif } -#endif /* PNG_MNG_FEATURES_SUPPORTED */ -#endif /* PNG_READ_SUPPORTED */ + +#endif /* READ_TRANSFORMS */ +#endif /* READ */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngrutil.c b/3rdparty/libpng/pngrutil.c similarity index 91% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngrutil.c rename to 3rdparty/libpng/pngrutil.c index 01c3679dff..6c5c37526b 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngrutil.c +++ b/3rdparty/libpng/pngrutil.c @@ -1,8 +1,8 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.6.2 [April 25, 2013] - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.17 [March 26, 2015] + * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -18,8 +18,6 @@ #ifdef PNG_READ_SUPPORTED -#define png_strtod(p,a,b) strtod(a,b) - png_uint_32 PNGAPI png_get_uint_31(png_const_structrp png_ptr, png_const_bytep buf) { @@ -110,7 +108,7 @@ png_get_uint_16)(png_const_bytep buf) return (png_uint_16)val; } -#endif /* PNG_READ_INT_FUNCTIONS_SUPPORTED */ +#endif /* READ_INT_FUNCTIONS */ /* Read and check the PNG file signature */ void /* PRIVATE */ @@ -133,7 +131,7 @@ png_read_sig(png_structrp png_ptr, png_inforp info_ptr) png_read_data(png_ptr, &(info_ptr->signature[num_checked]), num_to_check); png_ptr->sig_bytes = 8; - if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check)) + if (png_sig_cmp(info_ptr->signature, num_checked, num_to_check) != 0) { if (num_checked < 4 && png_sig_cmp(info_ptr->signature, num_checked, num_to_check - 4)) @@ -219,20 +217,17 @@ png_crc_finish(png_structrp png_ptr, png_uint_32 skip) png_crc_read(png_ptr, tmpbuf, len); } - if (png_crc_error(png_ptr)) + if (png_crc_error(png_ptr) != 0) { - if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) ? - !(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) : - (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE)) + if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0 ? + (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0 : + (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_USE) != 0) { png_chunk_warning(png_ptr, "CRC error"); } else - { - png_chunk_benign_error(png_ptr, "CRC error"); - return (0); - } + png_chunk_error(png_ptr, "CRC error"); return (1); } @@ -250,7 +245,7 @@ png_crc_error(png_structrp png_ptr) png_uint_32 crc; int need_crc = 1; - if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name)) + if (PNG_CHUNK_ANCILLARY(png_ptr->chunk_name) != 0) { if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_MASK) == (PNG_FLAG_CRC_ANCILLARY_USE | PNG_FLAG_CRC_ANCILLARY_NOWARN)) @@ -259,7 +254,7 @@ png_crc_error(png_structrp png_ptr) else /* critical */ { - if (png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) + if ((png_ptr->flags & PNG_FLAG_CRC_CRITICAL_IGNORE) != 0) need_crc = 0; } @@ -270,7 +265,7 @@ png_crc_error(png_structrp png_ptr) /* The chunk CRC must be serialized in a single I/O call. */ png_read_data(png_ptr, crc_bytes, 4); - if (need_crc) + if (need_crc != 0) { crc = png_get_uint_32(crc_bytes); return ((int)(crc != png_ptr->crc)); @@ -280,6 +275,10 @@ png_crc_error(png_structrp png_ptr) return (0); } +#if defined(PNG_READ_iCCP_SUPPORTED) || defined(PNG_READ_iTXt_SUPPORTED) ||\ + defined(PNG_READ_pCAL_SUPPORTED) || defined(PNG_READ_sCAL_SUPPORTED) ||\ + defined(PNG_READ_sPLT_SUPPORTED) || defined(PNG_READ_tEXt_SUPPORTED) ||\ + defined(PNG_READ_zTXt_SUPPORTED) || defined(PNG_SEQUENTIAL_READ_SUPPORTED) /* Manage the read buffer; this simply reallocates the buffer if it is not small * enough (or if it is not allocated). The routine returns a pointer to the * buffer; if an error occurs and 'warn' is set the routine returns NULL, else @@ -312,21 +311,17 @@ png_read_buffer(png_structrp png_ptr, png_alloc_size_t new_size, int warn) else if (warn < 2) /* else silent */ { -#ifdef PNG_WARNINGS_SUPPORTED - if (warn) + if (warn != 0) png_chunk_warning(png_ptr, "insufficient memory to read chunk"); + else -#endif - { -#ifdef PNG_ERROR_TEXT_SUPPORTED png_chunk_error(png_ptr, "insufficient memory to read chunk"); -#endif - } } } return buffer; } +#endif /* READ_iCCP|iTXt|pCAL|sCAL|sPLT|tEXt|zTXt|SEQUENTIAL_READ */ /* png_inflate_claim: claim the zstream for some nefarious purpose that involves * decompression. Returns Z_OK on success, else a zlib error code. It checks @@ -334,7 +329,7 @@ png_read_buffer(png_structrp png_ptr, png_alloc_size_t new_size, int warn) * chunk apparently owns the stream. Prior to release it does a png_error. */ static int -png_inflate_claim(png_structrp png_ptr, png_uint_32 owner, int window_bits) +png_inflate_claim(png_structrp png_ptr, png_uint_32 owner) { if (png_ptr->zowner != 0) { @@ -346,12 +341,12 @@ png_inflate_claim(png_structrp png_ptr, png_uint_32 owner, int window_bits) * are minimal. */ (void)png_safecat(msg, (sizeof msg), 4, " using zstream"); -# if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC - png_chunk_warning(png_ptr, msg); - png_ptr->zowner = 0; -# else - png_chunk_error(png_ptr, msg); -# endif +#if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC + png_chunk_warning(png_ptr, msg); + png_ptr->zowner = 0; +#else + png_chunk_error(png_ptr, msg); +#endif } /* Implementation note: unlike 'png_deflate_claim' this internal function @@ -369,6 +364,21 @@ png_inflate_claim(png_structrp png_ptr, png_uint_32 owner, int window_bits) */ { int ret; /* zlib return code */ +#if PNG_ZLIB_VERNUM >= 0x1240 + +# if defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_MAXIMUM_INFLATE_WINDOW) + int window_bits; + + if (((png_ptr->options >> PNG_MAXIMUM_INFLATE_WINDOW) & 3) == + PNG_OPTION_ON) + window_bits = 15; + + else + window_bits = 0; +# else +# define window_bits 0 +# endif +#endif /* Set this for safety, just in case the previous owner left pointers to * memory allocations. @@ -378,23 +388,22 @@ png_inflate_claim(png_structrp png_ptr, png_uint_32 owner, int window_bits) png_ptr->zstream.next_out = NULL; png_ptr->zstream.avail_out = 0; - if (png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) + if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0) { -# if ZLIB_VERNUM < 0x1240 - PNG_UNUSED(window_bits) - ret = inflateReset(&png_ptr->zstream); -# else - ret = inflateReset2(&png_ptr->zstream, window_bits); -# endif +#if PNG_ZLIB_VERNUM < 0x1240 + ret = inflateReset(&png_ptr->zstream); +#else + ret = inflateReset2(&png_ptr->zstream, window_bits); +#endif } else { -# if ZLIB_VERNUM < 0x1240 - ret = inflateInit(&png_ptr->zstream); -# else - ret = inflateInit2(&png_ptr->zstream, window_bits); -# endif +#if PNG_ZLIB_VERNUM < 0x1240 + ret = inflateInit(&png_ptr->zstream); +#else + ret = inflateInit2(&png_ptr->zstream, window_bits); +#endif if (ret == Z_OK) png_ptr->flags |= PNG_FLAG_ZSTREAM_INITIALIZED; @@ -408,6 +417,10 @@ png_inflate_claim(png_structrp png_ptr, png_uint_32 owner, int window_bits) return ret; } + +#ifdef window_bits +# undef window_bits +#endif } #ifdef PNG_READ_COMPRESSED_TEXT_SUPPORTED @@ -504,7 +517,7 @@ png_inflate(png_structrp png_ptr, png_uint_32 owner, int finish, * end of the output buffer. */ ret = inflate(&png_ptr->zstream, avail_out > 0 ? Z_NO_FLUSH : - (finish ? Z_FINISH : Z_SYNC_FLUSH)); + (finish ? Z_FINISH : Z_SYNC_FLUSH)); } while (ret == Z_OK); /* For safety kill the local buffer pointer now */ @@ -562,14 +575,14 @@ png_decompress_chunk(png_structrp png_ptr, */ png_alloc_size_t limit = PNG_SIZE_MAX; -# ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED - if (png_ptr->user_chunk_malloc_max > 0 && - png_ptr->user_chunk_malloc_max < limit) - limit = png_ptr->user_chunk_malloc_max; -# elif PNG_USER_CHUNK_MALLOC_MAX > 0 - if (PNG_USER_CHUNK_MALLOC_MAX < limit) - limit = PNG_USER_CHUNK_MALLOC_MAX; -# endif +# ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED + if (png_ptr->user_chunk_malloc_max > 0 && + png_ptr->user_chunk_malloc_max < limit) + limit = png_ptr->user_chunk_malloc_max; +# elif PNG_USER_CHUNK_MALLOC_MAX > 0 + if (PNG_USER_CHUNK_MALLOC_MAX < limit) + limit = PNG_USER_CHUNK_MALLOC_MAX; +# endif if (limit >= prefix_size + (terminate != 0)) { @@ -580,14 +593,8 @@ png_decompress_chunk(png_structrp png_ptr, if (limit < *newlength) *newlength = limit; - /* Now try to claim the stream; the 'warn' setting causes zlib to be told - * to use the maximum window size during inflate; this hides errors in the - * deflate header window bits value which is used if '0' is passed. In - * fact this only has an effect with zlib versions 1.2.4 and later - see - * the comments in png_inflate_claim above. - */ - ret = png_inflate_claim(png_ptr, png_ptr->chunk_name, - png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN ? 15 : 0); + /* Now try to claim the stream. */ + ret = png_inflate_claim(png_ptr, png_ptr->chunk_name); if (ret == Z_OK) { @@ -629,7 +636,7 @@ png_decompress_chunk(png_structrp png_ptr, { if (new_size == *newlength) { - if (terminate) + if (terminate != 0) text[prefix_size + *newlength] = 0; if (prefix_size > 0) @@ -663,6 +670,7 @@ png_decompress_chunk(png_structrp png_ptr, * success) */ png_free(png_ptr, text); + text = NULL; /* This really is very benign, but it's still an error because * the extra space may otherwise be used as a Trojan Horse. @@ -710,7 +718,7 @@ png_decompress_chunk(png_structrp png_ptr, return Z_MEM_ERROR; } } -#endif /* PNG_READ_COMPRESSED_TEXT_SUPPORTED */ +#endif /* READ_COMPRESSED_TEXT */ #ifdef PNG_READ_iCCP_SUPPORTED /* Perform a partial read and decompress, producing 'avail_out' bytes and @@ -780,6 +788,7 @@ png_inflate_read(png_structrp png_ptr, png_bytep read_buffer, uInt read_size, #endif /* Read and check the IDHR chunk */ + void /* PRIVATE */ png_handle_IHDR(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) { @@ -790,7 +799,7 @@ png_handle_IHDR(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_debug(1, "in png_handle_IHDR"); - if (png_ptr->mode & PNG_HAVE_IHDR) + if ((png_ptr->mode & PNG_HAVE_IHDR) != 0) png_chunk_error(png_ptr, "out of place"); /* Check the length */ @@ -844,8 +853,7 @@ png_handle_IHDR(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) } /* Set up other useful info */ - png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth * - png_ptr->channels); + png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth * png_ptr->channels); png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->width); png_debug1(3, "bit_depth = %d", png_ptr->bit_depth); png_debug1(3, "channels = %d", png_ptr->channels); @@ -866,7 +874,7 @@ png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_debug(1, "in png_handle_PLTE"); - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); /* Moved to before the 'after IDAT' check below because otherwise duplicate @@ -874,10 +882,10 @@ png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) * than one PLTE, the error is not treated as benign, so this check trumps * the requirement that PLTE appears before IDAT.) */ - else if (png_ptr->mode & PNG_HAVE_PLTE) + else if ((png_ptr->mode & PNG_HAVE_PLTE) != 0) png_chunk_error(png_ptr, "duplicate"); - else if (png_ptr->mode & PNG_HAVE_IDAT) + else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0) { /* This is benign because the non-benign error happened before, when an * IDAT was encountered in a color-mapped image with no PLTE. @@ -889,7 +897,7 @@ png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_ptr->mode |= PNG_HAVE_PLTE; - if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) + if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "ignored in grayscale PNG"); @@ -956,7 +964,7 @@ png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) } #ifndef PNG_READ_OPT_PLTE_SUPPORTED - else if (png_crc_error(png_ptr)) /* Only if we have a CRC error */ + else if (png_crc_error(png_ptr) != 0) /* Only if we have a CRC error */ { /* If we don't want to use the data from an ancillary chunk, * we have two options: an error abort, or a warning and we @@ -967,25 +975,18 @@ png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) * chunk type to determine whether to check the ancillary or the critical * flags. */ - if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE)) + if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_USE) == 0) { - if (png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) - { - png_chunk_benign_error(png_ptr, "CRC error"); - } + if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) != 0) + return; else - { - png_chunk_warning(png_ptr, "CRC error"); - return; - } + png_chunk_error(png_ptr, "CRC error"); } /* Otherwise, we (optionally) emit a warning and use the chunk. */ - else if (!(png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN)) - { + else if ((png_ptr->flags & PNG_FLAG_CRC_ANCILLARY_NOWARN) == 0) png_chunk_warning(png_ptr, "CRC error"); - } } #endif @@ -1010,7 +1011,7 @@ png_handle_PLTE(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) */ #ifdef PNG_READ_tRNS_SUPPORTED if (png_ptr->num_trans > 0 || - (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0)) + (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0)) { /* Cancel this because otherwise it would be used if the transforms * require it. Don't cancel the 'valid' flag because this would prevent @@ -1041,7 +1042,8 @@ png_handle_IEND(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) { png_debug(1, "in png_handle_IEND"); - if (!(png_ptr->mode & PNG_HAVE_IHDR) || !(png_ptr->mode & PNG_HAVE_IDAT)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0 || + (png_ptr->mode & PNG_HAVE_IDAT) == 0) png_chunk_error(png_ptr, "out of place"); png_ptr->mode |= (PNG_AFTER_IDAT | PNG_HAVE_IEND); @@ -1063,10 +1065,10 @@ png_handle_gAMA(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_debug(1, "in png_handle_gAMA"); - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); - else if (png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) + else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "out of place"); @@ -1082,7 +1084,7 @@ png_handle_gAMA(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_crc_read(png_ptr, buf, 4); - if (png_crc_finish(png_ptr, 0)) + if (png_crc_finish(png_ptr, 0) != 0) return; igamma = png_get_fixed_point(NULL, buf); @@ -1096,24 +1098,23 @@ png_handle_gAMA(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) void /* PRIVATE */ png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) { - unsigned int truelen; + unsigned int truelen, i; + png_byte sample_depth; png_byte buf[4]; png_debug(1, "in png_handle_sBIT"); - buf[0] = buf[1] = buf[2] = buf[3] = 0; - - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); - else if (png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) + else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "out of place"); return; } - if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT)) + if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sBIT) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "duplicate"); @@ -1121,10 +1122,16 @@ png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) } if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) + { truelen = 3; + sample_depth = 8; + } else + { truelen = png_ptr->channels; + sample_depth = png_ptr->bit_depth; + } if (length != truelen || length > 4) { @@ -1133,12 +1140,20 @@ png_handle_sBIT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) return; } + buf[0] = buf[1] = buf[2] = buf[3] = sample_depth; png_crc_read(png_ptr, buf, truelen); - if (png_crc_finish(png_ptr, 0)) + if (png_crc_finish(png_ptr, 0) != 0) return; - if (png_ptr->color_type & PNG_COLOR_MASK_COLOR) + for (i=0; i sample_depth) + { + png_chunk_benign_error(png_ptr, "invalid"); + return; + } + + if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0) { png_ptr->sig_bit.red = buf[0]; png_ptr->sig_bit.green = buf[1]; @@ -1168,10 +1183,10 @@ png_handle_cHRM(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_debug(1, "in png_handle_cHRM"); - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); - else if (png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) + else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "out of place"); @@ -1187,7 +1202,7 @@ png_handle_cHRM(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_crc_read(png_ptr, buf, 32); - if (png_crc_finish(png_ptr, 0)) + if (png_crc_finish(png_ptr, 0) != 0) return; xy.whitex = png_get_fixed_point(NULL, buf); @@ -1213,10 +1228,10 @@ png_handle_cHRM(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) } /* If a colorspace error has already been output skip this chunk */ - if (png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) + if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0) return; - if (png_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) + if ((png_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) != 0) { png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID; png_colorspace_sync(png_ptr, info_ptr); @@ -1239,10 +1254,10 @@ png_handle_sRGB(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_debug(1, "in png_handle_sRGB"); - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); - else if (png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) + else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "out of place"); @@ -1258,17 +1273,17 @@ png_handle_sRGB(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_crc_read(png_ptr, &intent, 1); - if (png_crc_finish(png_ptr, 0)) + if (png_crc_finish(png_ptr, 0) != 0) return; /* If a colorspace error has already been output skip this chunk */ - if (png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) + if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0) return; /* Only one sRGB or iCCP chunk is allowed, use the HAVE_INTENT flag to detect * this. */ - if (png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_INTENT) + if ((png_ptr->colorspace.flags & PNG_COLORSPACE_HAVE_INTENT) != 0) { png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID; png_colorspace_sync(png_ptr, info_ptr); @@ -1279,7 +1294,7 @@ png_handle_sRGB(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) (void)png_colorspace_set_sRGB(png_ptr, &png_ptr->colorspace, intent); png_colorspace_sync(png_ptr, info_ptr); } -#endif /* PNG_READ_sRGB_SUPPORTED */ +#endif /* READ_sRGB */ #ifdef PNG_READ_iCCP_SUPPORTED void /* PRIVATE */ @@ -1291,10 +1306,10 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_debug(1, "in png_handle_iCCP"); - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); - else if (png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) + else if ((png_ptr->mode & (PNG_HAVE_IDAT|PNG_HAVE_PLTE)) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "out of place"); @@ -1305,9 +1320,9 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) * chunk is just ignored, so does not invalidate the color space. An * alternative is to set the 'invalid' flags at the start of this routine * and only clear them in they were not set before and all the tests pass. - * The minimum 'deflate' stream is assumed to be just the 2 byte header and 4 - * byte checksum. The keyword must be one character and there is a - * terminator (0) byte and the compression method. + * The minimum 'deflate' stream is assumed to be just the 2 byte header and + * 4 byte checksum. The keyword must be at least one character and there is + * a terminator (0) byte and the compression method. */ if (length < 9) { @@ -1317,7 +1332,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) } /* If a colorspace error has already been output skip this chunk */ - if (png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) + if ((png_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) != 0) { png_crc_finish(png_ptr, length); return; @@ -1357,8 +1372,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) { read_length -= keyword_length+2; - if (png_inflate_claim(png_ptr, png_iCCP, - png_ptr->flags & PNG_FLAG_BENIGN_ERRORS_WARN ? 15 : 0) == Z_OK) + if (png_inflate_claim(png_ptr, png_iCCP) == Z_OK) { Byte profile_header[132]; Byte local_buffer[PNG_INFLATE_BUF_SIZE]; @@ -1378,14 +1392,14 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_get_uint_32(profile_header); if (png_icc_check_length(png_ptr, &png_ptr->colorspace, - keyword, profile_length)) + keyword, profile_length) != 0) { /* The length is apparently ok, so we can check the 132 * byte header. */ if (png_icc_check_header(png_ptr, &png_ptr->colorspace, keyword, profile_length, profile_header, - png_ptr->color_type)) + png_ptr->color_type) != 0) { /* Now read the tag table; a variable size buffer is * needed at this point, allocate one for the whole @@ -1408,14 +1422,14 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) (sizeof local_buffer), &length, profile + (sizeof profile_header), &size, 0); - /* Still expect a a buffer error because we expect + /* Still expect a buffer error because we expect * there to be some tag data! */ if (size == 0) { if (png_icc_check_tag_table(png_ptr, &png_ptr->colorspace, keyword, profile_length, - profile)) + profile) != 0) { /* The profile has been validated for basic * security issues, so read the whole thing in. @@ -1501,8 +1515,10 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) else if (size > 0) errmsg = "truncated"; +#ifndef __COVERITY__ else errmsg = png_ptr->zstream.msg; +#endif } /* else png_icc_check_tag_table output an error */ @@ -1545,7 +1561,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) errmsg = "too many profiles"; /* Failure: the reason is in 'errmsg' */ - if (!finished) + if (finished == 0) png_crc_finish(png_ptr, length); png_ptr->colorspace.flags |= PNG_COLORSPACE_INVALID; @@ -1553,7 +1569,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) if (errmsg != NULL) /* else already output */ png_chunk_benign_error(png_ptr, errmsg); } -#endif /* PNG_READ_iCCP_SUPPORTED */ +#endif /* READ_iCCP */ #ifdef PNG_READ_sPLT_SUPPORTED void /* PRIVATE */ @@ -1589,10 +1605,10 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) } #endif - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); - else if (png_ptr->mode & PNG_HAVE_IDAT) + else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "out of place"); @@ -1623,7 +1639,7 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) */ png_crc_read(png_ptr, buffer, length); - if (png_crc_finish(png_ptr, skip)) + if (png_crc_finish(png_ptr, skip) != 0) return; buffer[length] = 0; @@ -1648,7 +1664,7 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) data_length = length - (png_uint_32)(entry_start - buffer); /* Integrity-check the data length */ - if (data_length % entry_size) + if ((data_length % entry_size) != 0) { png_warning(png_ptr, "sPLT chunk has bad length"); return; @@ -1730,7 +1746,7 @@ png_handle_sPLT(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_free(png_ptr, new_palette.entries); } -#endif /* PNG_READ_sPLT_SUPPORTED */ +#endif /* READ_sPLT */ #ifdef PNG_READ_tRNS_SUPPORTED void /* PRIVATE */ @@ -1740,17 +1756,17 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_debug(1, "in png_handle_tRNS"); - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); - else if (png_ptr->mode & PNG_HAVE_IDAT) + else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "out of place"); return; } - else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS)) + else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tRNS) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "duplicate"); @@ -1793,7 +1809,7 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) else if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) { - if (!(png_ptr->mode & PNG_HAVE_PLTE)) + if ((png_ptr->mode & PNG_HAVE_PLTE) == 0) { /* TODO: is this actually an error in the ISO spec? */ png_crc_finish(png_ptr, length); @@ -1820,7 +1836,7 @@ png_handle_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) return; } - if (png_crc_finish(png_ptr, 0)) + if (png_crc_finish(png_ptr, 0) != 0) { png_ptr->num_trans = 0; return; @@ -1845,19 +1861,19 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_debug(1, "in png_handle_bKGD"); - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); - else if ((png_ptr->mode & PNG_HAVE_IDAT) || - (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE && - !(png_ptr->mode & PNG_HAVE_PLTE))) + else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0 || + (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE && + (png_ptr->mode & PNG_HAVE_PLTE) == 0)) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "out of place"); return; } - else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD)) + else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_bKGD) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "duplicate"); @@ -1867,7 +1883,7 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) truelen = 1; - else if (png_ptr->color_type & PNG_COLOR_MASK_COLOR) + else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0) truelen = 6; else @@ -1882,7 +1898,7 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_crc_read(png_ptr, buf, truelen); - if (png_crc_finish(png_ptr, 0)) + if (png_crc_finish(png_ptr, 0) != 0) return; /* We convert the index value into RGB components so that we can allow @@ -1894,7 +1910,7 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) { background.index = buf[0]; - if (info_ptr && info_ptr->num_palette) + if (info_ptr != NULL && info_ptr->num_palette != 0) { if (buf[0] >= info_ptr->num_palette) { @@ -1913,7 +1929,7 @@ png_handle_bKGD(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) background.gray = 0; } - else if (!(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) /* GRAY */ + else if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0) /* GRAY */ { background.index = 0; background.red = @@ -1944,17 +1960,18 @@ png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_debug(1, "in png_handle_hIST"); - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); - else if ((png_ptr->mode & PNG_HAVE_IDAT) || !(png_ptr->mode & PNG_HAVE_PLTE)) + else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0 || + (png_ptr->mode & PNG_HAVE_PLTE) == 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "out of place"); return; } - else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST)) + else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_hIST) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "duplicate"); @@ -1978,7 +1995,7 @@ png_handle_hIST(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) readbuf[i] = png_get_uint_16(buf); } - if (png_crc_finish(png_ptr, 0)) + if (png_crc_finish(png_ptr, 0) != 0) return; png_set_hIST(png_ptr, info_ptr, readbuf); @@ -1995,17 +2012,17 @@ png_handle_pHYs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_debug(1, "in png_handle_pHYs"); - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); - else if (png_ptr->mode & PNG_HAVE_IDAT) + else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "out of place"); return; } - else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs)) + else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pHYs) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "duplicate"); @@ -2021,7 +2038,7 @@ png_handle_pHYs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_crc_read(png_ptr, buf, 9); - if (png_crc_finish(png_ptr, 0)) + if (png_crc_finish(png_ptr, 0) != 0) return; res_x = png_get_uint_32(buf); @@ -2041,17 +2058,17 @@ png_handle_oFFs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_debug(1, "in png_handle_oFFs"); - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); - else if (png_ptr->mode & PNG_HAVE_IDAT) + else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "out of place"); return; } - else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs)) + else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_oFFs) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "duplicate"); @@ -2067,7 +2084,7 @@ png_handle_oFFs(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_crc_read(png_ptr, buf, 9); - if (png_crc_finish(png_ptr, 0)) + if (png_crc_finish(png_ptr, 0) != 0) return; offset_x = png_get_int_32(buf); @@ -2090,17 +2107,17 @@ png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_debug(1, "in png_handle_pCAL"); - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); - else if (png_ptr->mode & PNG_HAVE_IDAT) + else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "out of place"); return; } - else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL)) + else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_pCAL) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "duplicate"); @@ -2121,7 +2138,7 @@ png_handle_pCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_crc_read(png_ptr, buffer, length); - if (png_crc_finish(png_ptr, 0)) + if (png_crc_finish(png_ptr, 0) != 0) return; buffer[length] = 0; /* Null terminate the last string */ @@ -2217,17 +2234,17 @@ png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_debug(1, "in png_handle_sCAL"); - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); - else if (png_ptr->mode & PNG_HAVE_IDAT) + else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "out of place"); return; } - else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL)) + else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_sCAL) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "duplicate"); @@ -2257,7 +2274,7 @@ png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_crc_read(png_ptr, buffer, length); buffer[length] = 0; /* Null terminate the last string */ - if (png_crc_finish(png_ptr, 0)) + if (png_crc_finish(png_ptr, 0) != 0) return; /* Validate the unit. */ @@ -2273,11 +2290,11 @@ png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) i = 1; state = 0; - if (!png_check_fp_number((png_const_charp)buffer, length, &state, &i) || + if (png_check_fp_number((png_const_charp)buffer, length, &state, &i) == 0 || i >= length || buffer[i++] != 0) png_chunk_benign_error(png_ptr, "bad width format"); - else if (!PNG_FP_IS_POSITIVE(state)) + else if (PNG_FP_IS_POSITIVE(state) == 0) png_chunk_benign_error(png_ptr, "non-positive width"); else @@ -2285,11 +2302,11 @@ png_handle_sCAL(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_size_t heighti = i; state = 0; - if (!png_check_fp_number((png_const_charp)buffer, length, &state, &i) || - i != length) + if (png_check_fp_number((png_const_charp)buffer, length, + &state, &i) == 0 || i != length) png_chunk_benign_error(png_ptr, "bad height format"); - else if (!PNG_FP_IS_POSITIVE(state)) + else if (PNG_FP_IS_POSITIVE(state) == 0) png_chunk_benign_error(png_ptr, "non-positive height"); else @@ -2309,17 +2326,17 @@ png_handle_tIME(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_debug(1, "in png_handle_tIME"); - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); - else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME)) + else if (info_ptr != NULL && (info_ptr->valid & PNG_INFO_tIME) != 0) { png_crc_finish(png_ptr, length); png_chunk_benign_error(png_ptr, "duplicate"); return; } - if (png_ptr->mode & PNG_HAVE_IDAT) + if ((png_ptr->mode & PNG_HAVE_IDAT) != 0) png_ptr->mode |= PNG_AFTER_IDAT; if (length != 7) @@ -2331,7 +2348,7 @@ png_handle_tIME(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_crc_read(png_ptr, buf, 7); - if (png_crc_finish(png_ptr, 0)) + if (png_crc_finish(png_ptr, 0) != 0) return; mod_time.second = buf[6]; @@ -2376,10 +2393,10 @@ png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) } #endif - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); - if (png_ptr->mode & PNG_HAVE_IDAT) + if ((png_ptr->mode & PNG_HAVE_IDAT) != 0) png_ptr->mode |= PNG_AFTER_IDAT; #ifdef PNG_MAX_MALLOC_64K @@ -2401,7 +2418,7 @@ png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_crc_read(png_ptr, buffer, length); - if (png_crc_finish(png_ptr, skip)) + if (png_crc_finish(png_ptr, skip) != 0) return; key = (png_charp)buffer; @@ -2421,7 +2438,7 @@ png_handle_tEXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) text_info.text = text; text_info.text_length = strlen(text); - if (png_set_text_2(png_ptr, info_ptr, &text_info, 1)) + if (png_set_text_2(png_ptr, info_ptr, &text_info, 1) != 0) png_warning(png_ptr, "Insufficient memory to process text chunk"); } #endif @@ -2455,10 +2472,10 @@ png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) } #endif - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); - if (png_ptr->mode & PNG_HAVE_IDAT) + if ((png_ptr->mode & PNG_HAVE_IDAT) != 0) png_ptr->mode |= PNG_AFTER_IDAT; buffer = png_read_buffer(png_ptr, length, 2/*silent*/); @@ -2472,7 +2489,7 @@ png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_crc_read(png_ptr, buffer, length); - if (png_crc_finish(png_ptr, 0)) + if (png_crc_finish(png_ptr, 0) != 0) return; /* TODO: also check that the keyword contents match the spec! */ @@ -2522,7 +2539,7 @@ png_handle_zTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) text.lang = NULL; text.lang_key = NULL; - if (png_set_text_2(png_ptr, info_ptr, &text, 1)) + if (png_set_text_2(png_ptr, info_ptr, &text, 1) != 0) errmsg = "insufficient memory"; } @@ -2564,10 +2581,10 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) } #endif - if (!(png_ptr->mode & PNG_HAVE_IHDR)) + if ((png_ptr->mode & PNG_HAVE_IHDR) == 0) png_chunk_error(png_ptr, "missing IHDR"); - if (png_ptr->mode & PNG_HAVE_IDAT) + if ((png_ptr->mode & PNG_HAVE_IDAT) != 0) png_ptr->mode |= PNG_AFTER_IDAT; buffer = png_read_buffer(png_ptr, length+1, 1/*warn*/); @@ -2581,7 +2598,7 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) png_crc_read(png_ptr, buffer, length); - if (png_crc_finish(png_ptr, 0)) + if (png_crc_finish(png_ptr, 0) != 0) return; /* First the keyword. */ @@ -2627,14 +2644,14 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) /* prefix_length should now be at the trailing '\0' of the translated * keyword, but it may already be over the end. None of this arithmetic * can overflow because chunks are at most 2^31 bytes long, but on 16-bit - * systems the available allocaton may overflow. + * systems the available allocation may overflow. */ ++prefix_length; - if (!compressed && prefix_length <= length) + if (compressed == 0 && prefix_length <= length) uncompressed_length = length - prefix_length; - else if (compressed && prefix_length < length) + else if (compressed != 0 && prefix_length < length) { uncompressed_length = PNG_SIZE_MAX; @@ -2659,7 +2676,7 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) buffer[uncompressed_length+prefix_length] = 0; - if (compressed) + if (compressed == 0) text.compression = PNG_ITXT_COMPRESSION_NONE; else @@ -2672,7 +2689,7 @@ png_handle_iTXt(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) text.text_length = 0; text.itxt_length = uncompressed_length; - if (png_set_text_2(png_ptr, info_ptr, &text, 1)) + if (png_set_text_2(png_ptr, info_ptr, &text, 1) != 0) errmsg = "insufficient memory"; } } @@ -2700,7 +2717,7 @@ png_cache_unknown_chunk(png_structrp png_ptr, png_uint_32 length) # ifdef PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED if (png_ptr->user_chunk_malloc_max > 0 && - png_ptr->user_chunk_malloc_max < limit) + png_ptr->user_chunk_malloc_max < limit) limit = png_ptr->user_chunk_malloc_max; # elif PNG_USER_CHUNK_MALLOC_MAX > 0 @@ -2743,7 +2760,7 @@ png_cache_unknown_chunk(png_structrp png_ptr, png_uint_32 length) return 1; } } -#endif /* PNG_READ_UNKNOWN_CHUNKS_SUPPORTED */ +#endif /* READ_UNKNOWN_CHUNKS */ /* Handle an unknown, or known but disabled, chunk */ void /* PRIVATE */ @@ -2782,14 +2799,14 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr, */ if (png_ptr->read_user_chunk_fn != NULL) { - if (png_cache_unknown_chunk(png_ptr, length)) + if (png_cache_unknown_chunk(png_ptr, length) != 0) { /* Callback to user unknown chunk handler */ int ret = (*(png_ptr->read_user_chunk_fn))(png_ptr, &png_ptr->unknown_chunk); /* ret is: - * negative: An error occured, png_chunk_error will be called. + * negative: An error occurred; png_chunk_error will be called. * zero: The chunk was not handled, the chunk will be discarded * unless png_set_keep_unknown_chunks has been used to set * a 'keep' behavior for this particular chunk, in which @@ -2843,7 +2860,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr, else /* Use the SAVE_UNKNOWN_CHUNKS code or skip the chunk */ -# endif /* PNG_READ_USER_CHUNKS_SUPPORTED */ +# endif /* READ_USER_CHUNKS */ # ifdef PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED { @@ -2859,7 +2876,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr, (keep == PNG_HANDLE_CHUNK_IF_SAFE && PNG_CHUNK_ANCILLARY(png_ptr->chunk_name))) { - if (!png_cache_unknown_chunk(png_ptr, length)) + if (png_cache_unknown_chunk(png_ptr, length) == 0) keep = PNG_HANDLE_CHUNK_NEVER; } @@ -2910,7 +2927,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr, --(png_ptr->user_chunk_cache_max); /* FALL THROUGH */ case 0: /* no limit */ -# endif /* PNG_USER_LIMITS_SUPPORTED */ +# endif /* USER_LIMITS */ /* Here when the limit isn't reached or when limits are compiled * out; store the chunk. */ @@ -2922,9 +2939,8 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr, } # endif } -# else /* no store support! */ +# else /* no store support: the chunk must be handled by the user callback */ PNG_UNUSED(info_ptr) -# error untested code (reading unknown chunks with no store support) # endif /* Regardless of the error handling below the cached data (if any) can be @@ -2940,10 +2956,10 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr, png_crc_finish(png_ptr, length); PNG_UNUSED(info_ptr) PNG_UNUSED(keep) -#endif /* !PNG_READ_UNKNOWN_CHUNKS_SUPPORTED */ +#endif /* !READ_UNKNOWN_CHUNKS */ /* Check for unhandled critical chunks */ - if (!handled && PNG_CHUNK_CRITICAL(png_ptr->chunk_name)) + if (handled == 0 && PNG_CHUNK_CRITICAL(png_ptr->chunk_name)) png_chunk_error(png_ptr, "unhandled critical chunk"); } @@ -2989,7 +3005,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) { unsigned int pixel_depth = png_ptr->transformed_pixel_depth; png_const_bytep sp = png_ptr->row_buf + 1; - png_uint_32 row_width = png_ptr->width; + png_alloc_size_t row_width = png_ptr->width; unsigned int pass = png_ptr->pass; png_bytep end_ptr = 0; png_byte end_byte = 0; @@ -3026,7 +3042,8 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) end_ptr = dp + PNG_ROWBYTES(pixel_depth, row_width) - 1; end_byte = *end_ptr; # ifdef PNG_READ_PACKSWAP_SUPPORTED - if (png_ptr->transformations & PNG_PACKSWAP) /* little-endian byte */ + if ((png_ptr->transformations & PNG_PACKSWAP) != 0) + /* little-endian byte */ end_mask = 0xff << end_mask; else /* big-endian byte */ @@ -3042,10 +3059,11 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) * pass. */ #ifdef PNG_READ_INTERLACING_SUPPORTED - if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE) && - pass < 6 && (display == 0 || - /* The following copies everything for 'display' on passes 0, 2 and 4. */ - (display == 1 && (pass & 1) != 0))) + if (png_ptr->interlaced != 0 && + (png_ptr->transformations & PNG_INTERLACE) != 0 && + pass < 6 && (display == 0 || + /* The following copies everything for 'display' on passes 0, 2 and 4. */ + (display == 1 && (pass & 1) != 0))) { /* Narrow images may have no bits in a pass; the caller should handle * this, but this test is cheap: @@ -3141,7 +3159,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) # define S_MASKS(d,s) { S_MASK(0,d,s), S_MASK(1,d,s), S_MASK(2,d,s),\ S_MASK(3,d,s), S_MASK(4,d,s), S_MASK(5,d,s) } -# define B_MASKS(d,s) { B_MASK(1,d,s), S_MASK(3,d,s), S_MASK(5,d,s) } +# define B_MASKS(d,s) { B_MASK(1,d,s), B_MASK(3,d,s), B_MASK(5,d,s) } # define DEPTH_INDEX(d) ((d)==1?0:((d)==2?1:2)) @@ -3177,10 +3195,10 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) */ # define MASK(pass,depth,display,png)\ ((display)?B_MASK(pass,depth,png):S_MASK(pass,depth,png)) -#endif /* !PNG_USE_COMPILE_TIME_MASKS */ +#endif /* !USE_COMPILE_TIME_MASKS */ /* Use the appropriate mask to copy the required bits. In some cases - * the byte mask will be 0 or 0xff, optimize these cases. row_width is + * the byte mask will be 0 or 0xff; optimize these cases. row_width is * the number of pixels, but the code copies bytes, so it is necessary * to special case the end. */ @@ -3188,7 +3206,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) png_uint_32 mask; # ifdef PNG_READ_PACKSWAP_SUPPORTED - if (png_ptr->transformations & PNG_PACKSWAP) + if ((png_ptr->transformations & PNG_PACKSWAP) != 0) mask = MASK(pass, pixel_depth, display, 0); else @@ -3252,7 +3270,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) } /* Work out the bytes to copy. */ - if (display) + if (display != 0) { /* When doing the 'block' algorithm the pixel in the pass gets * replicated to adjacent pixels. This is why the even (0,2,4,6) @@ -3262,7 +3280,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) /* But don't allow this number to exceed the actual row width. */ if (bytes_to_copy > row_width) - bytes_to_copy = row_width; + bytes_to_copy = (unsigned int)/*SAFE*/row_width; } else /* normal row; Adam7 only ever gives us one pixel to copy. */ @@ -3319,7 +3337,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) /* This can only be the RGB case, so each copy is exactly one * pixel and it is not necessary to check for a partial copy. */ - for(;;) + for (;;) { dp[0] = sp[0], dp[1] = sp[1], dp[2] = sp[2]; @@ -3339,24 +3357,24 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) * wide bytes_to_copy either - use the memcpy there. */ if (bytes_to_copy < 16 /*else use memcpy*/ && - png_isaligned(dp, png_uint_16) && - png_isaligned(sp, png_uint_16) && - bytes_to_copy % (sizeof (png_uint_16)) == 0 && - bytes_to_jump % (sizeof (png_uint_16)) == 0) + png_isaligned(dp, png_uint_16) && + png_isaligned(sp, png_uint_16) && + bytes_to_copy % (sizeof (png_uint_16)) == 0 && + bytes_to_jump % (sizeof (png_uint_16)) == 0) { /* Everything is aligned for png_uint_16 copies, but try for * png_uint_32 first. */ - if (png_isaligned(dp, png_uint_32) && - png_isaligned(sp, png_uint_32) && - bytes_to_copy % (sizeof (png_uint_32)) == 0 && - bytes_to_jump % (sizeof (png_uint_32)) == 0) + if (png_isaligned(dp, png_uint_32) != 0 && + png_isaligned(sp, png_uint_32) != 0 && + bytes_to_copy % (sizeof (png_uint_32)) == 0 && + bytes_to_jump % (sizeof (png_uint_32)) == 0) { png_uint_32p dp32 = png_aligncast(png_uint_32p,dp); png_const_uint_32p sp32 = png_aligncastconst( - png_const_uint_32p, sp); + png_const_uint_32p, sp); size_t skip = (bytes_to_jump-bytes_to_copy) / - (sizeof (png_uint_32)); + (sizeof (png_uint_32)); do { @@ -3428,7 +3446,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) return; } } -#endif /* PNG_ALIGN_ code */ +#endif /* ALIGN_TYPE code */ /* The true default - use a memcpy: */ for (;;) @@ -3442,7 +3460,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) dp += bytes_to_jump; row_width -= bytes_to_jump; if (bytes_to_copy > row_width) - bytes_to_copy = row_width; + bytes_to_copy = (unsigned int)/*SAFE*/row_width; } } @@ -3452,7 +3470,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) /* Here if pixel_depth < 8 to check 'end_ptr' below. */ } else -#endif +#endif /* READ_INTERLACING */ /* If here then the switch above wasn't used so just memcpy the whole row * from the temporary row buffer (notice that this overwrites the end of the @@ -3495,7 +3513,7 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass, int j; #ifdef PNG_READ_PACKSWAP_SUPPORTED - if (transformations & PNG_PACKSWAP) + if ((transformations & PNG_PACKSWAP) != 0) { sshift = (int)((row_info->width + 7) & 0x07); dshift = (int)((final_width + 7) & 0x07); @@ -3555,7 +3573,7 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass, png_uint_32 i; #ifdef PNG_READ_PACKSWAP_SUPPORTED - if (transformations & PNG_PACKSWAP) + if ((transformations & PNG_PACKSWAP) != 0) { sshift = (int)(((row_info->width + 3) & 0x03) << 1); dshift = (int)(((final_width + 3) & 0x03) << 1); @@ -3618,7 +3636,7 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass, int jstop = png_pass_inc[pass]; #ifdef PNG_READ_PACKSWAP_SUPPORTED - if (transformations & PNG_PACKSWAP) + if ((transformations & PNG_PACKSWAP) != 0) { sshift = (int)(((row_info->width + 1) & 0x01) << 2); dshift = (int)(((final_width + 1) & 0x01) << 2); @@ -3684,7 +3702,7 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass, for (i = 0; i < row_info->width; i++) { - png_byte v[8]; + png_byte v[8]; /* SAFE; pixel_depth does not exceed 64 */ int j; memcpy(v, sp, pixel_bytes); @@ -3708,7 +3726,7 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass, PNG_UNUSED(transformations) /* Silence compiler warning */ #endif } -#endif /* PNG_READ_INTERLACING_SUPPORTED */ +#endif /* READ_INTERLACING */ static void png_read_filter_row_sub(png_row_infop row_info, png_bytep row, @@ -3862,7 +3880,6 @@ png_read_filter_row_paeth_multibyte_pixel(png_row_infop row_info, png_bytep row, if (pb < pa) pa = pb, a = b; if (pc < pa) a = c; - c = b; a += *row; *row++ = (png_byte)a; } @@ -3870,7 +3887,8 @@ png_read_filter_row_paeth_multibyte_pixel(png_row_infop row_info, png_bytep row, static void png_init_filter_functions(png_structrp pp) - /* This function is called once for every PNG image to set the + /* This function is called once for every PNG image (except for PNG images + * that only use PNG_FILTER_VALUE_NONE for all rows) to set the * implementations required to reverse the filtering of PNG rows. Reversing * the filter is the first transformation performed on the row data. It is * performed in place, therefore an implementation can be selected based on @@ -3912,10 +3930,13 @@ png_read_filter_row(png_structrp pp, png_row_infop row_info, png_bytep row, * PNG_FILTER_OPTIMIZATIONS to a function that overrides the generic * implementations. See png_init_filter_functions above. */ - if (pp->read_filter[0] == NULL) - png_init_filter_functions(pp); if (filter > PNG_FILTER_VALUE_NONE && filter < PNG_FILTER_VALUE_LAST) + { + if (pp->read_filter[0] == NULL) + png_init_filter_functions(pp); + pp->read_filter[filter-1](row_info, row, prev_row); + } } #ifdef PNG_SEQUENTIAL_READ_SUPPORTED @@ -4056,7 +4077,7 @@ png_read_finish_IDAT(png_structrp png_ptr) * read it otherwise stray unread IDAT data or, more likely, an IDAT chunk * may still remain to be consumed. */ - if (!(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED)) + if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0) { /* The NULL causes png_read_IDAT_data to swallow any remaining bytes in * the compressed stream, but the stream may be damaged too, so even after @@ -4068,7 +4089,7 @@ png_read_finish_IDAT(png_structrp png_ptr) /* Now clear everything out for safety; the following may not have been * done. */ - if (!(png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED)) + if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) == 0) { png_ptr->mode |= PNG_AFTER_IDAT; png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED; @@ -4099,7 +4120,6 @@ png_read_finish_IDAT(png_structrp png_ptr) void /* PRIVATE */ png_read_finish_row(png_structrp png_ptr) { -#ifdef PNG_READ_INTERLACING_SUPPORTED /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */ /* Start of interlace block */ @@ -4113,15 +4133,13 @@ png_read_finish_row(png_structrp png_ptr) /* Offset to next interlace block in the y direction */ static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2}; -#endif /* PNG_READ_INTERLACING_SUPPORTED */ png_debug(1, "in png_read_finish_row"); png_ptr->row_number++; if (png_ptr->row_number < png_ptr->num_rows) return; -#ifdef PNG_READ_INTERLACING_SUPPORTED - if (png_ptr->interlaced) + if (png_ptr->interlaced != 0) { png_ptr->row_number = 0; @@ -4142,7 +4160,7 @@ png_read_finish_row(png_structrp png_ptr) png_pass_start[png_ptr->pass]) / png_pass_inc[png_ptr->pass]; - if (!(png_ptr->transformations & PNG_INTERLACE)) + if ((png_ptr->transformations & PNG_INTERLACE) == 0) { png_ptr->num_rows = (png_ptr->height + png_pass_yinc[png_ptr->pass] - 1 - @@ -4158,17 +4176,15 @@ png_read_finish_row(png_structrp png_ptr) if (png_ptr->pass < 7) return; } -#endif /* PNG_READ_INTERLACING_SUPPORTED */ /* Here after at the end of the last row of the last pass. */ png_read_finish_IDAT(png_ptr); } -#endif /* PNG_SEQUENTIAL_READ_SUPPORTED */ +#endif /* SEQUENTIAL_READ */ void /* PRIVATE */ png_read_start_row(png_structrp png_ptr) { -#ifdef PNG_READ_INTERLACING_SUPPORTED /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */ /* Start of interlace block */ @@ -4182,7 +4198,6 @@ png_read_start_row(png_structrp png_ptr) /* Offset to next interlace block in the y direction */ static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2}; -#endif int max_pixel_depth; png_size_t row_bytes; @@ -4192,10 +4207,9 @@ png_read_start_row(png_structrp png_ptr) #ifdef PNG_READ_TRANSFORMS_SUPPORTED png_init_read_transformations(png_ptr); #endif -#ifdef PNG_READ_INTERLACING_SUPPORTED - if (png_ptr->interlaced) + if (png_ptr->interlaced != 0) { - if (!(png_ptr->transformations & PNG_INTERLACE)) + if ((png_ptr->transformations & PNG_INTERLACE) == 0) png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 - png_pass_ystart[0]) / png_pass_yinc[0]; @@ -4209,7 +4223,6 @@ png_read_start_row(png_structrp png_ptr) } else -#endif /* PNG_READ_INTERLACING_SUPPORTED */ { png_ptr->num_rows = png_ptr->height; png_ptr->iwidth = png_ptr->width; @@ -4217,7 +4230,7 @@ png_read_start_row(png_structrp png_ptr) max_pixel_depth = png_ptr->pixel_depth; - /* WARNING: * png_read_transform_info (pngrtran.c) performs a simpliar set of + /* WARNING: * png_read_transform_info (pngrtran.c) performs a simpler set of * calculations to calculate the final pixel depth, then * png_do_read_transforms actually does the transforms. This means that the * code which effectively calculates this value is actually repeated in three @@ -4228,16 +4241,16 @@ png_read_start_row(png_structrp png_ptr) * TODO: fix this. */ #ifdef PNG_READ_PACK_SUPPORTED - if ((png_ptr->transformations & PNG_PACK) && png_ptr->bit_depth < 8) + if ((png_ptr->transformations & PNG_PACK) != 0 && png_ptr->bit_depth < 8) max_pixel_depth = 8; #endif #ifdef PNG_READ_EXPAND_SUPPORTED - if (png_ptr->transformations & PNG_EXPAND) + if ((png_ptr->transformations & PNG_EXPAND) != 0) { if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) { - if (png_ptr->num_trans) + if (png_ptr->num_trans != 0) max_pixel_depth = 32; else @@ -4249,13 +4262,13 @@ png_read_start_row(png_structrp png_ptr) if (max_pixel_depth < 8) max_pixel_depth = 8; - if (png_ptr->num_trans) + if (png_ptr->num_trans != 0) max_pixel_depth *= 2; } else if (png_ptr->color_type == PNG_COLOR_TYPE_RGB) { - if (png_ptr->num_trans) + if (png_ptr->num_trans != 0) { max_pixel_depth *= 4; max_pixel_depth /= 3; @@ -4265,13 +4278,13 @@ png_read_start_row(png_structrp png_ptr) #endif #ifdef PNG_READ_EXPAND_16_SUPPORTED - if (png_ptr->transformations & PNG_EXPAND_16) + if ((png_ptr->transformations & PNG_EXPAND_16) != 0) { # ifdef PNG_READ_EXPAND_SUPPORTED /* In fact it is an error if it isn't supported, but checking is * the safe way. */ - if (png_ptr->transformations & PNG_EXPAND) + if ((png_ptr->transformations & PNG_EXPAND) != 0) { if (png_ptr->bit_depth < 16) max_pixel_depth *= 2; @@ -4283,7 +4296,7 @@ png_read_start_row(png_structrp png_ptr) #endif #ifdef PNG_READ_FILLER_SUPPORTED - if (png_ptr->transformations & (PNG_FILLER)) + if ((png_ptr->transformations & (PNG_FILLER)) != 0) { if (png_ptr->color_type == PNG_COLOR_TYPE_GRAY) { @@ -4307,14 +4320,15 @@ png_read_start_row(png_structrp png_ptr) #endif #ifdef PNG_READ_GRAY_TO_RGB_SUPPORTED - if (png_ptr->transformations & PNG_GRAY_TO_RGB) + if ((png_ptr->transformations & PNG_GRAY_TO_RGB) != 0) { if ( #ifdef PNG_READ_EXPAND_SUPPORTED - (png_ptr->num_trans && (png_ptr->transformations & PNG_EXPAND)) || + (png_ptr->num_trans != 0 && + (png_ptr->transformations & PNG_EXPAND) != 0) || #endif #ifdef PNG_READ_FILLER_SUPPORTED - (png_ptr->transformations & (PNG_FILLER)) || + (png_ptr->transformations & (PNG_FILLER)) != 0 || #endif png_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { @@ -4347,7 +4361,7 @@ png_read_start_row(png_structrp png_ptr) #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) && \ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) - if (png_ptr->transformations & PNG_USER_TRANSFORM) + if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0) { int user_pixel_depth = png_ptr->user_transform_depth * png_ptr->user_transform_channels; @@ -4383,7 +4397,7 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) png_free(png_ptr, png_ptr->big_row_buf); png_free(png_ptr, png_ptr->big_prev_row); - if (png_ptr->interlaced) + if (png_ptr->interlaced != 0) png_ptr->big_row_buf = (png_bytep)png_calloc(png_ptr, row_bytes + 48); @@ -4440,7 +4454,7 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) * does not, so free the read buffer now regardless; the sequential reader * reallocates it on demand. */ - if (png_ptr->read_buffer) + if (png_ptr->read_buffer != 0) { png_bytep buffer = png_ptr->read_buffer; @@ -4454,9 +4468,9 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) * IDAT stream has a bogus deflate header window_bits value, but this should * not be happening any longer!) */ - if (png_inflate_claim(png_ptr, png_IDAT, 0) != Z_OK) + if (png_inflate_claim(png_ptr, png_IDAT) != Z_OK) png_error(png_ptr, png_ptr->zstream.msg); png_ptr->flags |= PNG_FLAG_ROW_INIT; } -#endif /* PNG_READ_SUPPORTED */ +#endif /* READ */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngset.c b/3rdparty/libpng/pngset.c similarity index 93% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngset.c rename to 3rdparty/libpng/pngset.c index fcb0779131..fce3039168 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngset.c +++ b/3rdparty/libpng/pngset.c @@ -1,8 +1,8 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.6.2 [April 25, 2013] - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.17 [March 26, 2015] + * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -59,7 +59,7 @@ png_set_cHRM_fixed(png_const_structrp png_ptr, png_inforp info_ptr, xy.whitey = white_y; if (png_colorspace_set_chromaticities(png_ptr, &info_ptr->colorspace, &xy, - 2/* override with app values*/)) + 2/* override with app values*/) != 0) info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM; png_colorspace_sync_info(png_ptr, info_ptr); @@ -90,7 +90,8 @@ png_set_cHRM_XYZ_fixed(png_const_structrp png_ptr, png_inforp info_ptr, XYZ.blue_Y = int_blue_Y; XYZ.blue_Z = int_blue_Z; - if (png_colorspace_set_endpoints(png_ptr, &info_ptr->colorspace, &XYZ, 2)) + if (png_colorspace_set_endpoints(png_ptr, &info_ptr->colorspace, + &XYZ, 2) != 0) info_ptr->colorspace.flags |= PNG_COLORSPACE_FROM_cHRM; png_colorspace_sync_info(png_ptr, info_ptr); @@ -129,9 +130,9 @@ png_set_cHRM_XYZ(png_const_structrp png_ptr, png_inforp info_ptr, double red_X, png_fixed(png_ptr, blue_Y, "cHRM Red Y"), png_fixed(png_ptr, blue_Z, "cHRM Red Z")); } -# endif /* PNG_FLOATING_POINT_SUPPORTED */ +# endif /* FLOATING_POINT */ -#endif /* PNG_cHRM_SUPPORTED */ +#endif /* cHRM */ #ifdef PNG_gAMA_SUPPORTED void PNGFAPI @@ -189,6 +190,7 @@ png_set_hIST(png_const_structrp png_ptr, png_inforp info_ptr, if (info_ptr->hist == NULL) { png_warning(png_ptr, "Insufficient memory for hIST chunk data"); + return; } @@ -227,27 +229,18 @@ png_set_IHDR(png_const_structrp png_ptr, png_inforp info_ptr, if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) info_ptr->channels = 1; - else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR) + else if ((info_ptr->color_type & PNG_COLOR_MASK_COLOR) != 0) info_ptr->channels = 3; else info_ptr->channels = 1; - if (info_ptr->color_type & PNG_COLOR_MASK_ALPHA) + if ((info_ptr->color_type & PNG_COLOR_MASK_ALPHA) != 0) info_ptr->channels++; info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth); - /* Check for potential overflow */ - if (width > - (PNG_UINT_32_MAX >> 3) /* 8-byte RRGGBBAA pixels */ - - 48 /* bigrowbuf hack */ - - 1 /* filter byte */ - - 7*8 /* rounding of width to multiple of 8 pixels */ - - 8) /* extra max_pixel_depth pad */ - info_ptr->rowbytes = 0; - else - info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width); + info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width); } #ifdef PNG_oFFs_SUPPORTED @@ -279,7 +272,7 @@ png_set_pCAL(png_const_structrp png_ptr, png_inforp info_ptr, png_debug1(1, "in %s storage function", "pCAL"); if (png_ptr == NULL || info_ptr == NULL || purpose == NULL || units == NULL - || (nparams > 0 && params == NULL)) + || (nparams > 0 && params == NULL)) return; length = strlen(purpose) + 1; @@ -297,16 +290,19 @@ png_set_pCAL(png_const_structrp png_ptr, png_inforp info_ptr, /* Validate params[nparams] */ for (i=0; ipcal_purpose = png_voidcast(png_charp, - png_malloc_warn(png_ptr, length)); + png_malloc_warn(png_ptr, length)); if (info_ptr->pcal_purpose == NULL) { png_warning(png_ptr, "Insufficient memory for pCAL purpose"); + return; } @@ -328,6 +324,7 @@ png_set_pCAL(png_const_structrp png_ptr, png_inforp info_ptr, if (info_ptr->pcal_units == NULL) { png_warning(png_ptr, "Insufficient memory for pCAL units"); + return; } @@ -339,6 +336,7 @@ png_set_pCAL(png_const_structrp png_ptr, png_inforp info_ptr, if (info_ptr->pcal_params == NULL) { png_warning(png_ptr, "Insufficient memory for pCAL params"); + return; } @@ -355,6 +353,7 @@ png_set_pCAL(png_const_structrp png_ptr, png_inforp info_ptr, if (info_ptr->pcal_params[i] == NULL) { png_warning(png_ptr, "Insufficient memory for pCAL parameter"); + return; } @@ -404,6 +403,7 @@ png_set_sCAL_s(png_const_structrp png_ptr, png_inforp info_ptr, if (info_ptr->scal_s_width == NULL) { png_warning(png_ptr, "Memory allocation failed while processing sCAL"); + return; } @@ -422,6 +422,7 @@ png_set_sCAL_s(png_const_structrp png_ptr, png_inforp info_ptr, info_ptr->scal_s_width = NULL; png_warning(png_ptr, "Memory allocation failed while processing sCAL"); + return; } @@ -525,6 +526,7 @@ png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr, else { png_warning(png_ptr, "Invalid palette length"); + return; } } @@ -536,8 +538,7 @@ png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr, # endif )) { - png_chunk_report(png_ptr, "Invalid palette", PNG_CHUNK_ERROR); - return; + png_error(png_ptr, "Invalid palette"); } /* It may not actually be necessary to set png_ptr->palette here; @@ -603,7 +604,8 @@ png_set_sRGB_gAMA_and_cHRM(png_const_structrp png_ptr, png_inforp info_ptr, if (png_ptr == NULL || info_ptr == NULL) return; - if (png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace, srgb_intent)) + if (png_colorspace_set_sRGB(png_ptr, &info_ptr->colorspace, + srgb_intent) != 0) { /* This causes the gAMA and cHRM to be written too */ info_ptr->colorspace.flags |= @@ -646,7 +648,7 @@ png_set_iCCP(png_const_structrp png_ptr, png_inforp info_ptr, png_colorspace_sync_info(png_ptr, info_ptr); /* Don't do any of the copying if the profile was bad, or inconsistent. */ - if (!result) + if (result == 0) return; /* But do write the gAMA and cHRM chunks from the profile. */ @@ -660,6 +662,7 @@ png_set_iCCP(png_const_structrp png_ptr, png_inforp info_ptr, if (new_iccp_name == NULL) { png_benign_error(png_ptr, "Insufficient memory to process iCCP chunk"); + return; } @@ -670,8 +673,10 @@ png_set_iCCP(png_const_structrp png_ptr, png_inforp info_ptr, if (new_iccp_profile == NULL) { png_free(png_ptr, new_iccp_name); + new_iccp_name = NULL; png_benign_error(png_ptr, "Insufficient memory to process iCCP profile"); + return; } @@ -695,7 +700,7 @@ png_set_text(png_const_structrp png_ptr, png_inforp info_ptr, int ret; ret = png_set_text_2(png_ptr, info_ptr, text_ptr, num_text); - if (ret) + if (ret != 0) png_error(png_ptr, "Insufficient memory to store text"); } @@ -735,7 +740,7 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr, else max_text = INT_MAX; - /* Now allocate a new array and copy the old members in, this does all + /* Now allocate a new array and copy the old members in; this does all * the overflow checks. */ new_text = png_voidcast(png_textp,png_realloc_array(png_ptr, @@ -747,6 +752,7 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr, { png_chunk_report(png_ptr, "too many text chunks", PNG_CHUNK_WRITE_ERROR); + return 1; } @@ -802,7 +808,7 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr, else lang_key_len = 0; } -# else /* PNG_iTXt_SUPPORTED */ +# else /* iTXt */ { png_chunk_report(png_ptr, "iTXt chunk not supported", PNG_CHUNK_WRITE_ERROR); @@ -835,6 +841,7 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr, { png_chunk_report(png_ptr, "text chunk: out of memory", PNG_CHUNK_WRITE_ERROR); + return 1; } @@ -864,7 +871,7 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr, textp->text = textp->key + key_len + 1; } - if (text_length) + if (text_length != 0) memcpy(textp->text, text_ptr[i].text, text_length); *(textp->text + text_length) = '\0'; @@ -899,7 +906,7 @@ png_set_tIME(png_const_structrp png_ptr, png_inforp info_ptr, png_debug1(1, "in %s storage function", "tIME"); if (png_ptr == NULL || info_ptr == NULL || mod_time == NULL || - (png_ptr->mode & PNG_WROTE_tIME)) + (png_ptr->mode & PNG_WROTE_tIME) != 0) return; if (mod_time->month == 0 || mod_time->month > 12 || @@ -908,6 +915,7 @@ png_set_tIME(png_const_structrp png_ptr, png_inforp info_ptr, mod_time->second > 60) { png_warning(png_ptr, "Ignoring invalid time value"); + return; } @@ -924,6 +932,7 @@ png_set_tRNS(png_structrp png_ptr, png_inforp info_ptr, png_debug1(1, "in %s storage function", "tRNS"); if (png_ptr == NULL || info_ptr == NULL) + return; if (trans_alpha != NULL) @@ -949,16 +958,21 @@ png_set_tRNS(png_structrp png_ptr, png_inforp info_ptr, if (trans_color != NULL) { - int sample_max = (1 << info_ptr->bit_depth); +#ifdef PNG_WARNINGS_SUPPORTED + if (info_ptr->bit_depth < 16) + { + int sample_max = (1 << info_ptr->bit_depth) - 1; - if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY && - trans_color->gray > sample_max) || - (info_ptr->color_type == PNG_COLOR_TYPE_RGB && - (trans_color->red > sample_max || - trans_color->green > sample_max || - trans_color->blue > sample_max))) - png_warning(png_ptr, - "tRNS chunk has out-of-range samples for bit_depth"); + if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY && + trans_color->gray > sample_max) || + (info_ptr->color_type == PNG_COLOR_TYPE_RGB && + (trans_color->red > sample_max || + trans_color->green > sample_max || + trans_color->blue > sample_max))) + png_warning(png_ptr, + "tRNS chunk has out-of-range samples for bit_depth"); + } +#endif info_ptr->trans_color = *trans_color; @@ -1005,6 +1019,7 @@ png_set_sPLT(png_const_structrp png_ptr, { /* Out of memory or too many chunks */ png_chunk_report(png_ptr, "too many sPLT chunks", PNG_CHUNK_WRITE_ERROR); + return; } @@ -1029,8 +1044,8 @@ png_set_sPLT(png_const_structrp png_ptr, np->depth = entries->depth; - /* In the even of out-of-memory just return - there's no point keeping on - * trying to add sPLT chunks. + /* In the event of out-of-memory just return - there's no point keeping + * on trying to add sPLT chunks. */ length = strlen(entries->name) + 1; np->name = png_voidcast(png_charp, png_malloc_base(png_ptr, length)); @@ -1041,8 +1056,8 @@ png_set_sPLT(png_const_structrp png_ptr, memcpy(np->name, entries->name, length); /* IMPORTANT: we have memory now that won't get freed if something else - * goes wrong, this code must free it. png_malloc_array produces no - * warnings, use a png_chunk_report (below) if there is an error. + * goes wrong; this code must free it. png_malloc_array produces no + * warnings; use a png_chunk_report (below) if there is an error. */ np->entries = png_voidcast(png_sPLT_entryp, png_malloc_array(png_ptr, entries->nentries, sizeof (png_sPLT_entry))); @@ -1050,6 +1065,7 @@ png_set_sPLT(png_const_structrp png_ptr, if (np->entries == NULL) { png_free(png_ptr, np->name); + np->name = NULL; break; } @@ -1072,7 +1088,7 @@ png_set_sPLT(png_const_structrp png_ptr, if (nentries > 0) png_chunk_report(png_ptr, "sPLT out of memory", PNG_CHUNK_WRITE_ERROR); } -#endif /* PNG_sPLT_SUPPORTED */ +#endif /* sPLT */ #ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED static png_byte @@ -1081,10 +1097,10 @@ check_location(png_const_structrp png_ptr, int location) location &= (PNG_HAVE_IHDR|PNG_HAVE_PLTE|PNG_AFTER_IDAT); /* New in 1.6.0; copy the location and check it. This is an API - * change, previously the app had to use the + * change; previously the app had to use the * png_set_unknown_chunk_location API below for each chunk. */ - if (location == 0 && !(png_ptr->mode & PNG_IS_READ_STRUCT)) + if (location == 0 && (png_ptr->mode & PNG_IS_READ_STRUCT) == 0) { /* Write struct, so unknown chunks come from the app */ png_app_warning(png_ptr, @@ -1119,7 +1135,7 @@ png_set_unknown_chunks(png_const_structrp png_ptr, png_unknown_chunkp np; if (png_ptr == NULL || info_ptr == NULL || num_unknowns <= 0 || - unknowns == NULL) + unknowns == NULL) return; /* Check for the failure cases where support has been disabled at compile @@ -1130,17 +1146,19 @@ png_set_unknown_chunks(png_const_structrp png_ptr, */ # if !defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED) && \ defined(PNG_READ_SUPPORTED) - if (png_ptr->mode & PNG_IS_READ_STRUCT) + if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0) { png_app_error(png_ptr, "no unknown chunk support on read"); + return; } # endif # if !defined(PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED) && \ defined(PNG_WRITE_SUPPORTED) - if (!(png_ptr->mode & PNG_IS_READ_STRUCT)) + if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0) { png_app_error(png_ptr, "no unknown chunk support on write"); + return; } # endif @@ -1158,6 +1176,7 @@ png_set_unknown_chunks(png_const_structrp png_ptr, { png_chunk_report(png_ptr, "too many unknown chunks", PNG_CHUNK_WRITE_ERROR); + return; } @@ -1224,7 +1243,7 @@ png_set_unknown_chunk_location(png_const_structrp png_ptr, png_inforp info_ptr, { png_app_error(png_ptr, "invalid unknown chunk location"); /* Fake out the pre 1.6.0 behavior: */ - if ((location & PNG_HAVE_IDAT)) /* undocumented! */ + if ((location & PNG_HAVE_IDAT) != 0) /* undocumented! */ location = PNG_AFTER_IDAT; else @@ -1235,8 +1254,7 @@ png_set_unknown_chunk_location(png_const_structrp png_ptr, png_inforp info_ptr, check_location(png_ptr, location); } } -#endif - +#endif /* STORE_UNKNOWN_CHUNKS */ #ifdef PNG_MNG_FEATURES_SUPPORTED png_uint_32 PNGAPI @@ -1262,10 +1280,14 @@ add_one_chunk(png_bytep list, unsigned int count, png_const_bytep add, int keep) /* Utility function: update the 'keep' state of a chunk if it is already in * the list, otherwise add it to the list. */ - for (i=0; i= PNG_HANDLE_CHUNK_LAST) { png_app_error(png_ptr, "png_set_keep_unknown_chunks: invalid keep"); + return; } @@ -1329,7 +1352,7 @@ png_set_keep_unknown_chunks(png_structrp png_ptr, int keep, }; chunk_list = chunks_to_ignore; - num_chunks = (sizeof chunks_to_ignore)/5; + num_chunks = (unsigned int)/*SAFE*/(sizeof chunks_to_ignore)/5U; } else /* num_chunks_in > 0 */ @@ -1340,6 +1363,7 @@ png_set_keep_unknown_chunks(png_structrp png_ptr, int keep, * which can be switched off. */ png_app_error(png_ptr, "png_set_keep_unknown_chunks: no chunk list"); + return; } @@ -1355,6 +1379,7 @@ png_set_keep_unknown_chunks(png_structrp png_ptr, int keep, if (num_chunks + old_num_chunks > UINT_MAX/5) { png_app_error(png_ptr, "png_set_keep_unknown_chunks: too many chunks"); + return; } @@ -1362,7 +1387,7 @@ png_set_keep_unknown_chunks(png_structrp png_ptr, int keep, * required because add_one_chunk above doesn't extend the list if the 'keep' * parameter is the default. */ - if (keep) + if (keep != 0) { new_list = png_voidcast(png_bytep, png_malloc(png_ptr, 5 * (num_chunks + old_num_chunks))); @@ -1389,12 +1414,15 @@ png_set_keep_unknown_chunks(png_structrp png_ptr, int keep, unsigned int i; for (i=0; irow_pointers && (info_ptr->row_pointers != row_pointers)) + if (info_ptr->row_pointers != NULL && + (info_ptr->row_pointers != row_pointers)) png_free_data(png_ptr, info_ptr, PNG_FREE_ROWS, 0); info_ptr->row_pointers = row_pointers; - if (row_pointers) + if (row_pointers != NULL) info_ptr->valid |= PNG_INFO_IDAT; } #endif @@ -1473,7 +1503,7 @@ png_set_compression_buffer_size(png_structrp png_ptr, png_size_t size) png_error(png_ptr, "invalid compression buffer size"); # ifdef PNG_SEQUENTIAL_READ_SUPPORTED - if (png_ptr->mode & PNG_IS_READ_STRUCT) + if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0) { png_ptr->IDAT_read_size = (png_uint_32)size; /* checked above */ return; @@ -1481,29 +1511,33 @@ png_set_compression_buffer_size(png_structrp png_ptr, png_size_t size) # endif # ifdef PNG_WRITE_SUPPORTED - if (!(png_ptr->mode & PNG_IS_READ_STRUCT)) + if ((png_ptr->mode & PNG_IS_READ_STRUCT) == 0) { if (png_ptr->zowner != 0) { png_warning(png_ptr, "Compression buffer size cannot be changed because it is in use"); + return; } +#ifndef __COVERITY__ if (size > ZLIB_IO_MAX) { png_warning(png_ptr, "Compression buffer size limited to system maximum"); size = ZLIB_IO_MAX; /* must fit */ } +#endif - else if (size < 6) + if (size < 6) { /* Deflate will potentially go into an infinite loop on a SYNC_FLUSH * if this is permitted. */ png_warning(png_ptr, "Compression buffer size cannot be reduced below 6"); + return; } @@ -1519,7 +1553,7 @@ png_set_compression_buffer_size(png_structrp png_ptr, png_size_t size) void PNGAPI png_set_invalid(png_const_structrp png_ptr, png_inforp info_ptr, int mask) { - if (png_ptr && info_ptr) + if (png_ptr != NULL && info_ptr != NULL) info_ptr->valid &= ~mask; } @@ -1545,8 +1579,8 @@ png_set_user_limits (png_structrp png_ptr, png_uint_32 user_width_max, void PNGAPI png_set_chunk_cache_max (png_structrp png_ptr, png_uint_32 user_chunk_cache_max) { - if (png_ptr) - png_ptr->user_chunk_cache_max = user_chunk_cache_max; + if (png_ptr != NULL) + png_ptr->user_chunk_cache_max = user_chunk_cache_max; } /* This function was added to libpng 1.4.1 */ @@ -1554,10 +1588,10 @@ void PNGAPI png_set_chunk_malloc_max (png_structrp png_ptr, png_alloc_size_t user_chunk_malloc_max) { - if (png_ptr) + if (png_ptr != NULL) png_ptr->user_chunk_malloc_max = user_chunk_malloc_max; } -#endif /* ?PNG_SET_USER_LIMITS_SUPPORTED */ +#endif /* ?SET_USER_LIMITS */ #ifdef PNG_BENIGN_ERRORS_SUPPORTED @@ -1572,7 +1606,7 @@ png_set_benign_errors(png_structrp png_ptr, int allowed) * is the default behavior if png_set_benign_errors() is not called). */ - if (allowed) + if (allowed != 0) png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN | PNG_FLAG_APP_WARNINGS_WARN | PNG_FLAG_APP_ERRORS_WARN; @@ -1580,14 +1614,14 @@ png_set_benign_errors(png_structrp png_ptr, int allowed) png_ptr->flags &= ~(PNG_FLAG_BENIGN_ERRORS_WARN | PNG_FLAG_APP_WARNINGS_WARN | PNG_FLAG_APP_ERRORS_WARN); } -#endif /* PNG_BENIGN_ERRORS_SUPPORTED */ +#endif /* BENIGN_ERRORS */ #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED /* Whether to report invalid palette index; added at libng-1.5.10. * It is possible for an indexed (color-type==3) PNG file to contain * pixels with invalid (out-of-range) indexes if the PLTE chunk has * fewer entries than the image's bit-depth would allow. We recover - * from this gracefully by filling any incomplete palette with zeroes + * from this gracefully by filling any incomplete palette with zeros * (opaque black). By default, when this occurs libpng will issue * a benign error. This API can be used to override that behavior. */ @@ -1603,4 +1637,4 @@ png_set_check_for_invalid_index(png_structrp png_ptr, int allowed) png_ptr->num_palette_max = -1; } #endif -#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ +#endif /* READ || WRITE */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngstruct.h b/3rdparty/libpng/pngstruct.h similarity index 99% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngstruct.h rename to 3rdparty/libpng/pngstruct.h index d58c028844..8420d09972 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngstruct.h +++ b/3rdparty/libpng/pngstruct.h @@ -1,12 +1,11 @@ /* pngstruct.h - header file for PNG reference library * + * Last changed in libpng 1.6.1 [March 28, 2013] * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * Last changed in libpng 1.6.1 [March 28, 2013] - * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer * and license in png.h @@ -101,7 +100,7 @@ typedef struct png_XYZ #endif /* COLORSPACE */ #if defined(PNG_COLORSPACE_SUPPORTED) || defined(PNG_GAMMA_SUPPORTED) -/* A colorspace is all the above plus, potentially, profile information, +/* A colorspace is all the above plus, potentially, profile information; * however at present libpng does not use the profile internally so it is only * stored in the png_info struct (if iCCP is supported.) The rendering intent * is retained here and is checked. @@ -274,7 +273,7 @@ struct png_struct_def #ifdef PNG_READ_GAMMA_SUPPORTED png_color_16 background_1; /* background normalized to gamma 1.0 */ #endif -#endif /* PNG_bKGD_SUPPORTED */ +#endif /* bKGD */ #ifdef PNG_WRITE_FLUSH_SUPPORTED png_flush_ptr output_flush_fn; /* Function for flushing output */ @@ -331,7 +330,7 @@ struct png_struct_def int process_mode; /* what push library is currently doing */ int cur_palette; /* current push library palette index */ -#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PROGRESSIVE_READ */ #if defined(__TURBOC__) && !defined(_Windows) && !defined(__FLAT__) /* For the Borland special 64K segment handler */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngtest.c b/3rdparty/libpng/pngtest.c similarity index 89% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngtest.c rename to 3rdparty/libpng/pngtest.c index 144f2db35d..2c3e04d2d7 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngtest.c +++ b/3rdparty/libpng/pngtest.c @@ -1,8 +1,8 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.6.2 [April 25, 2013] - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.17 [March 26, 2015] + * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -45,6 +45,11 @@ /* Known chunks that exist in pngtest.png must be supported or pngtest will fail * simply as a result of re-ordering them. This may be fixed in 1.7 + * + * pngtest allocates a single row buffer for each row and overwrites it, + * therefore if the write side doesn't support the writing of interlaced images + * nothing can be done for an interlaced image (and the code below will fail + * horribly trying to write extra data after writing garbage). */ #if defined PNG_READ_SUPPORTED && /* else nothing can be done */\ defined PNG_READ_bKGD_SUPPORTED &&\ @@ -58,9 +63,15 @@ defined PNG_READ_sRGB_SUPPORTED &&\ defined PNG_READ_tEXt_SUPPORTED &&\ defined PNG_READ_tIME_SUPPORTED &&\ - defined PNG_READ_zTXt_SUPPORTED + defined PNG_READ_zTXt_SUPPORTED &&\ + defined PNG_WRITE_INTERLACING_SUPPORTED + +#ifdef PNG_ZLIB_HEADER +# include PNG_ZLIB_HEADER /* defined by pnglibconf.h from 1.7 */ +#else +# include "zlib.h" +#endif -#include "zlib.h" /* Copied from pngpriv.h but only used in error messages below. */ #ifndef PNG_ZBUF_SIZE # define PNG_ZBUF_SIZE 8192 @@ -116,10 +127,6 @@ static int unsupported_chunks = 0; /* chunk unsupported by libpng in input */ static int error_count = 0; /* count calls to png_error */ static int warning_count = 0; /* count calls to png_warning */ -#ifdef __TURBOC__ -#include -#endif - /* Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng */ #ifndef png_jmpbuf # define png_jmpbuf(png_ptr) png_ptr->jmpbuf @@ -276,7 +283,8 @@ count_zero_samples(png_structp png_ptr, png_row_infop row_info, png_bytep data) png_uint_32 n, nstop; int channel; int color_channels = row_info->channels; - if (row_info->color_type > 3)color_channels--; + if (row_info->color_type > 3) + color_channels--; for (n = 0, nstop=row_info->width; npointer, 0xdd, pinfo->size); - if (verbose) + if (verbose != 0) printf("png_malloc %lu bytes at %p\n", (unsigned long)size, pinfo->pointer); @@ -573,14 +581,15 @@ png_debug_free(png_structp png_ptr, png_voidp ptr) /* We must free the list element too, but first kill the memory that is to be freed. */ memset(ptr, 0x55, pinfo->size); - png_free_default(png_ptr, pinfo); + if (pinfo != NULL) + free(pinfo); pinfo = NULL; break; } if (pinfo->next == NULL) { - fprintf(STDERR, "Pointer %x not found\n", (unsigned int)ptr); + fprintf(STDERR, "Pointer %p not found\n", ptr); break; } @@ -589,13 +598,14 @@ png_debug_free(png_structp png_ptr, png_voidp ptr) } /* Finally free the data. */ - if (verbose) + if (verbose != 0) printf("Freeing %p\n", ptr); - png_free_default(png_ptr, ptr); + if (ptr != NULL) + free(ptr); ptr = NULL; } -#endif /* PNG_USER_MEM_SUPPORTED && PNG_DEBUG */ +#endif /* USER_MEM && DEBUG */ /* END of code to test memory allocation/deallocation */ @@ -634,16 +644,16 @@ set_location(png_structp png_ptr, struct user_chunk_data *data, int what) { int location; - if ((data->location[0] & what) || (data->location[1] & what)) + if ((data->location[0] & what) != 0 || (data->location[1] & what) != 0) return 0; /* already have one of these */ - /* Find where we are (the code below zeros info_ptr to indicate that the + /* Find where we are (the code below zeroes info_ptr to indicate that the * chunks before the first IDAT have been read.) */ if (data->info_ptr == NULL) /* after IDAT */ location = what | after_IDAT; - else if (png_get_valid(png_ptr, data->info_ptr, PNG_INFO_PLTE)) + else if (png_get_valid(png_ptr, data->info_ptr, PNG_INFO_PLTE) != 0) location = what | before_IDAT; else @@ -658,8 +668,8 @@ set_location(png_structp png_ptr, struct user_chunk_data *data, int what) return 1; /* handled */ } -static int PNGCBAPI read_user_chunk_callback(png_struct *png_ptr, - png_unknown_chunkp chunk) +static int PNGCBAPI +read_user_chunk_callback(png_struct *png_ptr, png_unknown_chunkp chunk) { struct user_chunk_data *my_user_chunk_data = (struct user_chunk_data*)png_get_user_chunk_ptr(png_ptr); @@ -690,7 +700,7 @@ static int PNGCBAPI read_user_chunk_callback(png_struct *png_ptr, if (chunk->data[0] != 0 && chunk->data[0] != 1) return (-1); /* Invalid mode */ - if (set_location(png_ptr, my_user_chunk_data, have_sTER)) + if (set_location(png_ptr, my_user_chunk_data, have_sTER) != 0) { my_user_chunk_data->sTER_mode=chunk->data[0]; return (1); @@ -709,7 +719,7 @@ static int PNGCBAPI read_user_chunk_callback(png_struct *png_ptr, if (chunk->size != 9) return (-1); /* Error return */ - if (!set_location(png_ptr, my_user_chunk_data, have_vpAg)) + if (set_location(png_ptr, my_user_chunk_data, have_vpAg) == 0) return (0); /* duplicate vpAg */ my_user_chunk_data->vpAg_width = png_get_uint_31(png_ptr, chunk->data); @@ -723,22 +733,22 @@ static int PNGCBAPI read_user_chunk_callback(png_struct *png_ptr, static void write_sTER_chunk(png_structp write_ptr) { - png_byte png_sTER[5] = {115, 84, 69, 82, '\0'}; + png_byte sTER[5] = {115, 84, 69, 82, '\0'}; - if (verbose) + if (verbose != 0) fprintf(STDERR, "\n stereo mode = %d\n", user_chunk_data.sTER_mode); - png_write_chunk(write_ptr, png_sTER, &user_chunk_data.sTER_mode, 1); + png_write_chunk(write_ptr, sTER, &user_chunk_data.sTER_mode, 1); } static void write_vpAg_chunk(png_structp write_ptr) { - png_byte png_vpAg[5] = {118, 112, 65, 103, '\0'}; + png_byte vpAg[5] = {118, 112, 65, 103, '\0'}; png_byte vpag_chunk_data[9]; - if (verbose) + if (verbose != 0) fprintf(STDERR, " vpAg = %lu x %lu, units = %d\n", (unsigned long)user_chunk_data.vpAg_width, (unsigned long)user_chunk_data.vpAg_height, @@ -747,7 +757,7 @@ write_vpAg_chunk(png_structp write_ptr) png_save_uint_32(vpag_chunk_data, user_chunk_data.vpAg_width); png_save_uint_32(vpag_chunk_data + 4, user_chunk_data.vpAg_height); vpag_chunk_data[8] = user_chunk_data.vpAg_units; - png_write_chunk(write_ptr, png_vpAg, vpag_chunk_data, 9); + png_write_chunk(write_ptr, vpAg, vpag_chunk_data, 9); } static void @@ -770,8 +780,8 @@ write_chunks(png_structp write_ptr, int location) write_vpAg_chunk(write_ptr); } } -#endif /* PNG_WRITE_SUPPORTED */ -#else /* !PNG_READ_USER_CHUNKS_SUPPORTED */ +#endif /* WRITE */ +#else /* !READ_USER_CHUNKS */ # define write_chunks(pp,loc) ((void)0) #endif /* END of code to demonstrate user chunk support */ @@ -828,6 +838,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) png_structp write_ptr; png_infop write_info_ptr; png_infop write_end_info_ptr; + int interlace_preserved = 1; #else png_structp write_ptr = NULL; png_infop write_info_ptr = NULL; @@ -836,7 +847,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) png_bytep row_buf; png_uint_32 y; png_uint_32 width, height; - int num_pass, pass; + int num_pass = 1, pass; int bit_depth, color_type; row_buf = NULL; @@ -928,7 +939,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) #endif #endif - if (strict) + if (strict != 0) { /* Treat png_benign_error() as errors on read */ png_set_benign_errors(read_ptr, 0); @@ -944,7 +955,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) */ } - else if (relaxed) + else if (relaxed != 0) { /* Allow application (pngtest) errors and warnings to pass */ png_set_benign_errors(read_ptr, 1); @@ -1039,13 +1050,29 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) int interlace_type, compression_type, filter_type; if (png_get_IHDR(read_ptr, read_info_ptr, &width, &height, &bit_depth, - &color_type, &interlace_type, &compression_type, &filter_type)) + &color_type, &interlace_type, &compression_type, &filter_type) != 0) { png_set_IHDR(write_ptr, write_info_ptr, width, height, bit_depth, -#ifdef PNG_WRITE_INTERLACING_SUPPORTED color_type, interlace_type, compression_type, filter_type); -#else - color_type, PNG_INTERLACE_NONE, compression_type, filter_type); +#ifndef PNG_READ_INTERLACING_SUPPORTED + /* num_pass will not be set below, set it here if the image is + * interlaced: what happens is that write interlacing is *not* turned + * on an the partial interlaced rows are written directly. + */ + switch (interlace_type) + { + case PNG_INTERLACE_NONE: + num_pass = 1; + break; + + case PNG_INTERLACE_ADAM7: + num_pass = 7; + break; + + default: + png_error(read_ptr, "invalid interlace type"); + /*NOT REACHED*/ + } #endif } } @@ -1056,7 +1083,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) blue_y; if (png_get_cHRM_fixed(read_ptr, read_info_ptr, &white_x, &white_y, - &red_x, &red_y, &green_x, &green_y, &blue_x, &blue_y)) + &red_x, &red_y, &green_x, &green_y, &blue_x, &blue_y) != 0) { png_set_cHRM_fixed(write_ptr, write_info_ptr, white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y); @@ -1067,7 +1094,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) { png_fixed_point gamma; - if (png_get_gAMA_fixed(read_ptr, read_info_ptr, &gamma)) + if (png_get_gAMA_fixed(read_ptr, read_info_ptr, &gamma) != 0) png_set_gAMA_fixed(write_ptr, write_info_ptr, gamma); } #endif @@ -1079,7 +1106,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) blue_y; if (png_get_cHRM(read_ptr, read_info_ptr, &white_x, &white_y, &red_x, - &red_y, &green_x, &green_y, &blue_x, &blue_y)) + &red_y, &green_x, &green_y, &blue_x, &blue_y) != 0) { png_set_cHRM(write_ptr, write_info_ptr, white_x, white_y, red_x, red_y, green_x, green_y, blue_x, blue_y); @@ -1090,7 +1117,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) { double gamma; - if (png_get_gAMA(read_ptr, read_info_ptr, &gamma)) + if (png_get_gAMA(read_ptr, read_info_ptr, &gamma) != 0) png_set_gAMA(write_ptr, write_info_ptr, gamma); } #endif @@ -1104,7 +1131,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) int compression_type; if (png_get_iCCP(read_ptr, read_info_ptr, &name, &compression_type, - &profile, &proflen)) + &profile, &proflen) != 0) { png_set_iCCP(write_ptr, write_info_ptr, name, compression_type, profile, proflen); @@ -1115,7 +1142,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) { int intent; - if (png_get_sRGB(read_ptr, read_info_ptr, &intent)) + if (png_get_sRGB(read_ptr, read_info_ptr, &intent) != 0) png_set_sRGB(write_ptr, write_info_ptr, intent); } #endif @@ -1123,14 +1150,14 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) png_colorp palette; int num_palette; - if (png_get_PLTE(read_ptr, read_info_ptr, &palette, &num_palette)) + if (png_get_PLTE(read_ptr, read_info_ptr, &palette, &num_palette) != 0) png_set_PLTE(write_ptr, write_info_ptr, palette, num_palette); } #ifdef PNG_bKGD_SUPPORTED { png_color_16p background; - if (png_get_bKGD(read_ptr, read_info_ptr, &background)) + if (png_get_bKGD(read_ptr, read_info_ptr, &background) != 0) { png_set_bKGD(write_ptr, write_info_ptr, background); } @@ -1140,7 +1167,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) { png_uint_16p hist; - if (png_get_hIST(read_ptr, read_info_ptr, &hist)) + if (png_get_hIST(read_ptr, read_info_ptr, &hist) != 0) png_set_hIST(write_ptr, write_info_ptr, hist); } #endif @@ -1150,7 +1177,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) int unit_type; if (png_get_oFFs(read_ptr, read_info_ptr, &offset_x, &offset_y, - &unit_type)) + &unit_type) != 0) { png_set_oFFs(write_ptr, write_info_ptr, offset_x, offset_y, unit_type); } @@ -1164,7 +1191,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) int type, nparams; if (png_get_pCAL(read_ptr, read_info_ptr, &purpose, &X0, &X1, &type, - &nparams, &units, ¶ms)) + &nparams, &units, ¶ms) != 0) { png_set_pCAL(write_ptr, write_info_ptr, purpose, X0, X1, type, nparams, units, params); @@ -1176,7 +1203,8 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) png_uint_32 res_x, res_y; int unit_type; - if (png_get_pHYs(read_ptr, read_info_ptr, &res_x, &res_y, &unit_type)) + if (png_get_pHYs(read_ptr, read_info_ptr, &res_x, &res_y, + &unit_type) != 0) png_set_pHYs(write_ptr, write_info_ptr, res_x, res_y, unit_type); } #endif @@ -1184,7 +1212,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) { png_color_8p sig_bit; - if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit)) + if (png_get_sBIT(read_ptr, read_info_ptr, &sig_bit) != 0) png_set_sBIT(write_ptr, write_info_ptr, sig_bit); } #endif @@ -1196,7 +1224,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) double scal_width, scal_height; if (png_get_sCAL(read_ptr, read_info_ptr, &unit, &scal_width, - &scal_height)) + &scal_height) != 0) { png_set_sCAL(write_ptr, write_info_ptr, unit, scal_width, scal_height); } @@ -1208,7 +1236,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) png_charp scal_width, scal_height; if (png_get_sCAL_s(read_ptr, read_info_ptr, &unit, &scal_width, - &scal_height)) + &scal_height) != 0) { png_set_sCAL_s(write_ptr, write_info_ptr, unit, scal_width, scal_height); @@ -1228,7 +1256,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) pngtest_check_text_support(read_ptr, text_ptr, num_text); - if (verbose) + if (verbose != 0) { int i; @@ -1248,11 +1276,11 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) { png_timep mod_time; - if (png_get_tIME(read_ptr, read_info_ptr, &mod_time)) + if (png_get_tIME(read_ptr, read_info_ptr, &mod_time) != 0) { png_set_tIME(write_ptr, write_info_ptr, mod_time); #ifdef PNG_TIME_RFC1123_SUPPORTED - if (png_convert_to_rfc1123_buffer(tIME_string, mod_time)) + if (png_convert_to_rfc1123_buffer(tIME_string, mod_time) != 0) tIME_string[(sizeof tIME_string) - 1] = '\0'; else @@ -1262,7 +1290,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) } tIME_chunk_present++; -#endif /* PNG_TIME_RFC1123_SUPPORTED */ +#endif /* TIME_RFC1123 */ } } #endif @@ -1273,7 +1301,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) png_color_16p trans_color; if (png_get_tRNS(read_ptr, read_info_ptr, &trans_alpha, &num_trans, - &trans_color)) + &trans_color) != 0) { int sample_max = (1 << bit_depth); /* libpng doesn't reject a tRNS chunk with out-of-range samples */ @@ -1294,7 +1322,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) int num_unknowns = png_get_unknown_chunks(read_ptr, read_info_ptr, &unknowns); - if (num_unknowns) + if (num_unknowns != 0) { png_set_unknown_chunks(write_ptr, write_info_ptr, unknowns, num_unknowns); @@ -1338,14 +1366,10 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) #endif /* SINGLE_ROWBUF_ALLOC */ pngtest_debug("Writing row data"); -#if defined(PNG_READ_INTERLACING_SUPPORTED) || \ - defined(PNG_WRITE_INTERLACING_SUPPORTED) +#ifdef PNG_READ_INTERLACING_SUPPORTED num_pass = png_set_interlace_handling(read_ptr); -# ifdef PNG_WRITE_SUPPORTED - png_set_interlace_handling(write_ptr); -# endif -#else - num_pass = 1; + if (png_set_interlace_handling(write_ptr) != num_pass) + png_error(write_ptr, "png_set_interlace_handling: inconsistent num_pass"); #endif #ifdef PNGTEST_TIMING @@ -1360,11 +1384,12 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) { #ifndef SINGLE_ROWBUF_ALLOC pngtest_debug2("Allocating row buffer (pass %d, y = %u)...", pass, y); + row_buf = (png_bytep)png_malloc(read_ptr, png_get_rowbytes(read_ptr, read_info_ptr)); - pngtest_debug2("\t0x%08lx (%u bytes)", (unsigned long)row_buf, - png_get_rowbytes(read_ptr, read_info_ptr)); + pngtest_debug2("\t0x%08lx (%lu bytes)", (unsigned long)row_buf, + (unsigned long)png_get_rowbytes(read_ptr, read_info_ptr)); #endif /* !SINGLE_ROWBUF_ALLOC */ png_read_rows(read_ptr, (png_bytepp)&row_buf, NULL, 1); @@ -1381,7 +1406,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) t_encode += (t_stop - t_start); t_start = t_stop; #endif -#endif /* PNG_WRITE_SUPPORTED */ +#endif /* WRITE */ #ifndef SINGLE_ROWBUF_ALLOC pngtest_debug2("Freeing row buffer (pass %d, y = %u)", pass, y); @@ -1391,11 +1416,13 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) } } -#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED - png_free_data(read_ptr, read_info_ptr, PNG_FREE_UNKN, -1); -#endif -#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED - png_free_data(write_ptr, write_info_ptr, PNG_FREE_UNKN, -1); +#ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED +# ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED + png_free_data(read_ptr, read_info_ptr, PNG_FREE_UNKN, -1); +# endif +# ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED + png_free_data(write_ptr, write_info_ptr, PNG_FREE_UNKN, -1); +# endif #endif pngtest_debug("Reading and writing end_info data"); @@ -1412,7 +1439,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) pngtest_check_text_support(read_ptr, text_ptr, num_text); - if (verbose) + if (verbose != 0) { int i; @@ -1432,11 +1459,11 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) { png_timep mod_time; - if (png_get_tIME(read_ptr, end_info_ptr, &mod_time)) + if (png_get_tIME(read_ptr, end_info_ptr, &mod_time) != 0) { png_set_tIME(write_ptr, write_end_info_ptr, mod_time); #ifdef PNG_TIME_RFC1123_SUPPORTED - if (png_convert_to_rfc1123_buffer(tIME_string, mod_time)) + if (png_convert_to_rfc1123_buffer(tIME_string, mod_time) != 0) tIME_string[(sizeof tIME_string) - 1] = '\0'; else @@ -1446,7 +1473,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) } tIME_chunk_present++; -#endif /* PNG_TIME_RFC1123_SUPPORTED */ +#endif /* TIME_RFC1123 */ } } #endif @@ -1456,7 +1483,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) int num_unknowns = png_get_unknown_chunks(read_ptr, end_info_ptr, &unknowns); - if (num_unknowns) + if (num_unknowns != 0) { png_set_unknown_chunks(write_ptr, write_end_info_ptr, unknowns, num_unknowns); @@ -1497,7 +1524,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) #endif #ifdef PNG_EASY_ACCESS_SUPPORTED - if (verbose) + if (verbose != 0) { png_uint_32 iwidth, iheight; iwidth = png_get_image_width(write_ptr, write_info_ptr); @@ -1575,15 +1602,14 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) } #ifdef PNG_WRITE_SUPPORTED /* else nothing was written */ + if (interlace_preserved != 0) /* else the files will be changed */ { - int wrote_question = 0; - for (;;) { + static int wrote_question = 0; png_size_t num_in, num_out; char inbuf[256], outbuf[256]; - num_in = fread(inbuf, 1, sizeof inbuf, fpin); num_out = fread(outbuf, 1, sizeof outbuf, fpout); @@ -1615,7 +1641,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) return (0); } - if (!num_in) + if (num_in == 0) break; if (memcmp(inbuf, outbuf, num_in)) @@ -1652,7 +1678,7 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname) } } } -#endif /* PNG_WRITE_SUPPORTED */ +#endif /* WRITE */ FCLOSE(fpin); FCLOSE(fpout); @@ -1675,6 +1701,8 @@ main(int argc, char *argv[]) int multiple = 0; int ierror = 0; + png_structp dummy_ptr; + fprintf(STDERR, "\n Testing libpng version %s\n", PNG_LIBPNG_VER_STRING); fprintf(STDERR, " with zlib version %s\n", ZLIB_VERSION); fprintf(STDERR, "%s", png_get_copyright(NULL)); @@ -1757,10 +1785,11 @@ main(int argc, char *argv[]) } } - if (!multiple && argc == 3 + verbose) + if (multiple == 0 && argc == 3 + verbose) outname = argv[2 + verbose]; - if ((!multiple && argc > 3 + verbose) || (multiple && argc < 2)) + if ((multiple == 0 && argc > 3 + verbose) || + (multiple != 0 && argc < 2)) { fprintf(STDERR, "usage: %s [infile.png] [outfile.png]\n\t%s -m {infile.png}\n", @@ -1772,7 +1801,7 @@ main(int argc, char *argv[]) exit(1); } - if (multiple) + if (multiple != 0) { int i; #if defined(PNG_USER_MEM_SUPPORTED) && PNG_DEBUG @@ -1782,6 +1811,9 @@ main(int argc, char *argv[]) { int kerror; fprintf(STDERR, "\n Testing %s:", argv[i]); +#if PNG_DEBUG > 0 + fprintf(STDERR, "\n"); +#endif kerror = test_one_file(argv[i], outname); if (kerror == 0) { @@ -1796,7 +1828,7 @@ main(int argc, char *argv[]) #endif #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED for (k = 0; k<256; k++) - if (filters_used[k]) + if (filters_used[k] != 0) fprintf(STDERR, " Filter %d was used %lu times\n", k, (unsigned long)filters_used[k]); #endif @@ -1805,7 +1837,7 @@ main(int argc, char *argv[]) fprintf(STDERR, " tIME = %s\n", tIME_string); tIME_chunk_present = 0; -#endif /* PNG_TIME_RFC1123_SUPPORTED */ +#endif /* TIME_RFC1123 */ } else @@ -1827,9 +1859,9 @@ main(int argc, char *argv[]) while (pinfo != NULL) { - fprintf(STDERR, " %lu bytes at %x\n", + fprintf(STDERR, " %lu bytes at %p\n", (unsigned long)pinfo->size, - (unsigned int)pinfo->pointer); + pinfo->pointer); pinfo = pinfo->next; } } @@ -1863,7 +1895,12 @@ main(int argc, char *argv[]) status_dots_requested = 0; if (i == 0 || verbose == 1 || ierror != 0) + { fprintf(STDERR, "\n Testing %s:", inname); +#if PNG_DEBUG > 0 + fprintf(STDERR, "\n"); +#endif + } kerror = test_one_file(inname, outname); @@ -1882,21 +1919,26 @@ main(int argc, char *argv[]) #endif #ifdef PNG_READ_USER_TRANSFORM_SUPPORTED for (k = 0; k<256; k++) - if (filters_used[k]) + if (filters_used[k] != 0) fprintf(STDERR, " Filter %d was used %lu times\n", k, (unsigned long)filters_used[k]); #endif #ifdef PNG_TIME_RFC1123_SUPPORTED if (tIME_chunk_present != 0) fprintf(STDERR, " tIME = %s\n", tIME_string); -#endif /* PNG_TIME_RFC1123_SUPPORTED */ +#endif /* TIME_RFC1123 */ } } else { if (verbose == 0 && i != 2) + { fprintf(STDERR, "\n Testing %s:", inname); +#if PNG_DEBUG > 0 + fprintf(STDERR, "\n"); +#endif + } fprintf(STDERR, " FAIL\n"); ierror += kerror; @@ -1915,8 +1957,8 @@ main(int argc, char *argv[]) while (pinfo != NULL) { - fprintf(STDERR, " %lu bytes at %x\n", - (unsigned long)pinfo->size, (unsigned int)pinfo->pointer); + fprintf(STDERR, " %lu bytes at %p\n", + (unsigned long)pinfo->size, pinfo->pointer); pinfo = pinfo->next; } } @@ -1954,6 +1996,24 @@ main(int argc, char *argv[]) else fprintf(STDERR, " libpng FAILS test\n"); + dummy_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + fprintf(STDERR, " Default limits:\n"); + fprintf(STDERR, " width_max = %lu\n", + (unsigned long) png_get_user_width_max(dummy_ptr)); + fprintf(STDERR, " height_max = %lu\n", + (unsigned long) png_get_user_height_max(dummy_ptr)); + if (png_get_chunk_cache_max(dummy_ptr) == 0) + fprintf(STDERR, " cache_max = unlimited\n"); + else + fprintf(STDERR, " cache_max = %lu\n", + (unsigned long) png_get_chunk_cache_max(dummy_ptr)); + if (png_get_chunk_malloc_max(dummy_ptr) == 0) + fprintf(STDERR, " malloc_max = unlimited\n"); + else + fprintf(STDERR, " malloc_max = %lu\n", + (unsigned long) png_get_chunk_malloc_max(dummy_ptr)); + png_destroy_read_struct(&dummy_ptr, NULL, NULL); + return (int)(ierror != 0); } #else @@ -1963,9 +2023,9 @@ main(void) fprintf(STDERR, " test ignored because libpng was not built with read support\n"); /* And skip this test */ - return 77; + return PNG_LIBPNG_VER < 10600 ? 0 : 77; } #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_2 Your_png_h_is_not_version_1_6_2; +typedef png_libpng_version_1_6_17 Your_png_h_is_not_version_1_6_17; diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngtest.png b/3rdparty/libpng/pngtest.png similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngtest.png rename to 3rdparty/libpng/pngtest.png diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngtrans.c b/3rdparty/libpng/pngtrans.c similarity index 95% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngtrans.c rename to 3rdparty/libpng/pngtrans.c index 8f8bc5d9e7..cd3a79b6fa 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngtrans.c +++ b/3rdparty/libpng/pngtrans.c @@ -1,8 +1,8 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.6.2 [April 25, 2013] - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.17 [March 26, 2015] + * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -57,7 +57,9 @@ png_set_packing(png_structrp png_ptr) if (png_ptr->bit_depth < 8) { png_ptr->transformations |= PNG_PACK; - png_ptr->usr_bit_depth = 8; +# ifdef PNG_WRITE_SUPPORTED + png_ptr->usr_bit_depth = 8; +# endif } } #endif @@ -98,7 +100,7 @@ png_set_interlace_handling(png_structrp png_ptr) { png_debug(1, "in png_set_interlace handling"); - if (png_ptr && png_ptr->interlaced) + if (png_ptr != 0 && png_ptr->interlaced != 0) { png_ptr->transformations |= PNG_INTERLACE; return (7); @@ -125,7 +127,7 @@ png_set_filler(png_structrp png_ptr, png_uint_32 filler, int filler_loc) /* In libpng 1.6 it is possible to determine whether this is a read or write * operation and therefore to do more checking here for a valid call. */ - if (png_ptr->mode & PNG_IS_READ_STRUCT) + if ((png_ptr->mode & PNG_IS_READ_STRUCT) != 0) { # ifdef PNG_READ_FILLER_SUPPORTED /* On read png_set_filler is always valid, regardless of the base PNG @@ -208,7 +210,7 @@ png_set_add_alpha(png_structrp png_ptr, png_uint_32 filler, int filler_loc) png_set_filler(png_ptr, filler, filler_loc); /* The above may fail to do anything. */ - if (png_ptr->transformations & PNG_FILLER) + if ((png_ptr->transformations & PNG_FILLER) != 0) png_ptr->transformations |= PNG_ADD_ALPHA; } @@ -325,9 +327,16 @@ png_do_swap(png_row_infop row_info, png_bytep row) for (i = 0; i < istop; i++, rp += 2) { +#ifdef PNG_BUILTIN_BSWAP16_SUPPORTED + /* Feature added to libpng-1.6.11 for testing purposes, not + * enabled by default. + */ + *(png_uint_16*)rp = __builtin_bswap16(*(png_uint_16*)rp); +#else png_byte t = *rp; *rp = *(rp + 1); *(rp + 1) = t; +#endif } } } @@ -469,7 +478,7 @@ png_do_packswap(png_row_infop row_info, png_bytep row) *rp = table[*rp]; } } -#endif /* PNG_READ_PACKSWAP_SUPPORTED or PNG_WRITE_PACKSWAP_SUPPORTED */ +#endif /* PACKSWAP || WRITE_PACKSWAP */ #if defined(PNG_WRITE_FILLER_SUPPORTED) || \ defined(PNG_READ_STRIP_ALPHA_SUPPORTED) @@ -501,7 +510,7 @@ png_do_strip_channel(png_row_infop row_info, png_bytep row, int at_start) { if (row_info->bit_depth == 8) { - if (at_start) /* Skip initial filler */ + if (at_start != 0) /* Skip initial filler */ ++sp; else /* Skip initial channel and, for sp, the filler */ sp += 2, ++dp; @@ -515,7 +524,7 @@ png_do_strip_channel(png_row_infop row_info, png_bytep row, int at_start) else if (row_info->bit_depth == 16) { - if (at_start) /* Skip initial filler */ + if (at_start != 0) /* Skip initial filler */ sp += 2; else /* Skip initial channel and, for sp, the filler */ sp += 4, dp += 2; @@ -541,7 +550,7 @@ png_do_strip_channel(png_row_infop row_info, png_bytep row, int at_start) { if (row_info->bit_depth == 8) { - if (at_start) /* Skip initial filler */ + if (at_start != 0) /* Skip initial filler */ ++sp; else /* Skip initial channels and, for sp, the filler */ sp += 4, dp += 3; @@ -555,7 +564,7 @@ png_do_strip_channel(png_row_infop row_info, png_bytep row, int at_start) else if (row_info->bit_depth == 16) { - if (at_start) /* Skip initial filler */ + if (at_start != 0) /* Skip initial filler */ sp += 2; else /* Skip initial channels and, for sp, the filler */ sp += 8, dp += 6; @@ -596,7 +605,7 @@ png_do_bgr(png_row_infop row_info, png_bytep row) { png_debug(1, "in png_do_bgr"); - if ((row_info->color_type & PNG_COLOR_MASK_COLOR)) + if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0) { png_uint_32 row_width = row_info->width; if (row_info->bit_depth == 8) @@ -666,7 +675,7 @@ png_do_bgr(png_row_infop row_info, png_bytep row) #endif } } -#endif /* PNG_READ_BGR_SUPPORTED or PNG_WRITE_BGR_SUPPORTED */ +#endif /* READ_BGR || WRITE_BGR */ #if defined(PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \ defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED) @@ -769,7 +778,7 @@ png_do_check_palette_indexes(png_structrp png_ptr, png_row_infop row_info) } } } -#endif /* PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED */ +#endif /* CHECK_FOR_INVALID_INDEX */ #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \ defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) @@ -819,7 +828,7 @@ png_get_user_transform_ptr(png_const_structrp png_ptr) png_uint_32 PNGAPI png_get_current_row_number(png_const_structrp png_ptr) { - /* See the comments in png.h - this is the sub-image row when reading and + /* See the comments in png.h - this is the sub-image row when reading an * interlaced image. */ if (png_ptr != NULL) @@ -835,7 +844,6 @@ png_get_current_pass_number(png_const_structrp png_ptr) return png_ptr->pass; return 8; /* invalid */ } -#endif /* PNG_USER_TRANSFORM_INFO_SUPPORTED */ -#endif /* PNG_READ_USER_TRANSFORM_SUPPORTED || - PNG_WRITE_USER_TRANSFORM_SUPPORTED */ -#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ +#endif /* USER_TRANSFORM_INFO */ +#endif /* READ_USER_TRANSFORM || WRITE_USER_TRANSFORM */ +#endif /* READ || WRITE */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngwio.c b/3rdparty/libpng/pngwio.c similarity index 96% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngwio.c rename to 3rdparty/libpng/pngwio.c index e3289dfe4a..0a40948aab 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngwio.c +++ b/3rdparty/libpng/pngwio.c @@ -1,8 +1,8 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.6.0 [February 14, 2013] - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.15 [November 20, 2014] + * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -149,8 +149,11 @@ png_set_write_fn(png_structrp png_ptr, png_voidp io_ptr, # else png_ptr->output_flush_fn = output_flush_fn; # endif -#endif /* PNG_WRITE_FLUSH_SUPPORTED */ +#else + PNG_UNUSED(output_flush_fn) +#endif /* WRITE_FLUSH */ +#ifdef PNG_READ_SUPPORTED /* It is an error to read while writing a png file */ if (png_ptr->read_data_fn != NULL) { @@ -160,5 +163,6 @@ png_set_write_fn(png_structrp png_ptr, png_voidp io_ptr, "Can't set both read_data_fn and write_data_fn in the" " same structure"); } +#endif } -#endif /* PNG_WRITE_SUPPORTED */ +#endif /* WRITE */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngwrite.c b/3rdparty/libpng/pngwrite.c similarity index 84% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngwrite.c rename to 3rdparty/libpng/pngwrite.c index 33924aac0c..e3c203496e 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngwrite.c +++ b/3rdparty/libpng/pngwrite.c @@ -1,8 +1,8 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.6.2 [April 25, 2013] - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.17 [March 26, 2015] + * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -24,7 +24,7 @@ static void write_unknown_chunks(png_structrp png_ptr, png_const_inforp info_ptr, unsigned int where) { - if (info_ptr->unknown_chunks_num) + if (info_ptr->unknown_chunks_num != 0) { png_const_unknown_chunkp up; @@ -33,7 +33,7 @@ write_unknown_chunks(png_structrp png_ptr, png_const_inforp info_ptr, for (up = info_ptr->unknown_chunks; up < info_ptr->unknown_chunks + info_ptr->unknown_chunks_num; ++up) - if (up->location & where) + if ((up->location & where) != 0) { /* If per-chunk unknown chunk handling is enabled use it, otherwise * just write the chunks the application has set. @@ -69,7 +69,7 @@ write_unknown_chunks(png_structrp png_ptr, png_const_inforp info_ptr, } } } -#endif /* PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED */ +#endif /* WRITE_UNKNOWN_CHUNKS */ /* Writes all the PNG information. This is the suggested way to use the * library. If you have a new chunk to add, make a function to write it, @@ -88,14 +88,14 @@ png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr) if (png_ptr == NULL || info_ptr == NULL) return; - if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE)) + if ((png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE) == 0) { /* Write PNG signature */ png_write_sig(png_ptr); #ifdef PNG_MNG_FEATURES_SUPPORTED - if ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) && \ - (png_ptr->mng_features_permitted)) + if ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) != 0 && \ + png_ptr->mng_features_permitted != 0) { png_warning(png_ptr, "MNG features are not allowed in a PNG datastream"); png_ptr->mng_features_permitted = 0; @@ -129,9 +129,9 @@ png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr) */ #ifdef PNG_GAMMA_SUPPORTED # ifdef PNG_WRITE_gAMA_SUPPORTED - if (!(info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) && - (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_gAMA) && - (info_ptr->valid & PNG_INFO_gAMA)) + if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 && + (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_gAMA) != 0 && + (info_ptr->valid & PNG_INFO_gAMA) != 0) png_write_gAMA_fixed(png_ptr, info_ptr->colorspace.gamma); # endif #endif @@ -141,11 +141,11 @@ png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr) * and it matches one of the known sRGB ones issue a warning. */ # ifdef PNG_WRITE_iCCP_SUPPORTED - if (!(info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) && - (info_ptr->valid & PNG_INFO_iCCP)) + if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 && + (info_ptr->valid & PNG_INFO_iCCP) != 0) { # ifdef PNG_WRITE_sRGB_SUPPORTED - if (info_ptr->valid & PNG_INFO_sRGB) + if ((info_ptr->valid & PNG_INFO_sRGB) != 0) png_app_warning(png_ptr, "profile matches sRGB but writing iCCP instead"); # endif @@ -159,22 +159,22 @@ png_write_info_before_PLTE(png_structrp png_ptr, png_const_inforp info_ptr) # endif # ifdef PNG_WRITE_sRGB_SUPPORTED - if (!(info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) && - (info_ptr->valid & PNG_INFO_sRGB)) + if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 && + (info_ptr->valid & PNG_INFO_sRGB) != 0) png_write_sRGB(png_ptr, info_ptr->colorspace.rendering_intent); # endif /* WRITE_sRGB */ #endif /* COLORSPACE */ #ifdef PNG_WRITE_sBIT_SUPPORTED - if (info_ptr->valid & PNG_INFO_sBIT) + if ((info_ptr->valid & PNG_INFO_sBIT) != 0) png_write_sBIT(png_ptr, &(info_ptr->sig_bit), info_ptr->color_type); #endif #ifdef PNG_COLORSPACE_SUPPORTED # ifdef PNG_WRITE_cHRM_SUPPORTED - if (!(info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) && - (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) && - (info_ptr->valid & PNG_INFO_cHRM)) + if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 && + (info_ptr->colorspace.flags & PNG_COLORSPACE_FROM_cHRM) != 0 && + (info_ptr->valid & PNG_INFO_cHRM) != 0) png_write_cHRM_fixed(png_ptr, &info_ptr->colorspace.end_points_xy); # endif #endif @@ -201,19 +201,19 @@ png_write_info(png_structrp png_ptr, png_const_inforp info_ptr) png_write_info_before_PLTE(png_ptr, info_ptr); - if (info_ptr->valid & PNG_INFO_PLTE) + if ((info_ptr->valid & PNG_INFO_PLTE) != 0) png_write_PLTE(png_ptr, info_ptr->palette, (png_uint_32)info_ptr->num_palette); - else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) + else if ((info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) !=0) png_error(png_ptr, "Valid palette required for paletted images"); #ifdef PNG_WRITE_tRNS_SUPPORTED - if (info_ptr->valid & PNG_INFO_tRNS) + if ((info_ptr->valid & PNG_INFO_tRNS) !=0) { #ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED /* Invert the alpha channel (in tRNS) */ - if ((png_ptr->transformations & PNG_INVERT_ALPHA) && + if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0 && info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) { int j; @@ -227,42 +227,42 @@ png_write_info(png_structrp png_ptr, png_const_inforp info_ptr) } #endif #ifdef PNG_WRITE_bKGD_SUPPORTED - if (info_ptr->valid & PNG_INFO_bKGD) + if ((info_ptr->valid & PNG_INFO_bKGD) != 0) png_write_bKGD(png_ptr, &(info_ptr->background), info_ptr->color_type); #endif #ifdef PNG_WRITE_hIST_SUPPORTED - if (info_ptr->valid & PNG_INFO_hIST) + if ((info_ptr->valid & PNG_INFO_hIST) != 0) png_write_hIST(png_ptr, info_ptr->hist, info_ptr->num_palette); #endif #ifdef PNG_WRITE_oFFs_SUPPORTED - if (info_ptr->valid & PNG_INFO_oFFs) + if ((info_ptr->valid & PNG_INFO_oFFs) != 0) png_write_oFFs(png_ptr, info_ptr->x_offset, info_ptr->y_offset, info_ptr->offset_unit_type); #endif #ifdef PNG_WRITE_pCAL_SUPPORTED - if (info_ptr->valid & PNG_INFO_pCAL) + if ((info_ptr->valid & PNG_INFO_pCAL) != 0) png_write_pCAL(png_ptr, info_ptr->pcal_purpose, info_ptr->pcal_X0, info_ptr->pcal_X1, info_ptr->pcal_type, info_ptr->pcal_nparams, info_ptr->pcal_units, info_ptr->pcal_params); #endif #ifdef PNG_WRITE_sCAL_SUPPORTED - if (info_ptr->valid & PNG_INFO_sCAL) + if ((info_ptr->valid & PNG_INFO_sCAL) != 0) png_write_sCAL_s(png_ptr, (int)info_ptr->scal_unit, info_ptr->scal_s_width, info_ptr->scal_s_height); #endif /* sCAL */ #ifdef PNG_WRITE_pHYs_SUPPORTED - if (info_ptr->valid & PNG_INFO_pHYs) + if ((info_ptr->valid & PNG_INFO_pHYs) != 0) png_write_pHYs(png_ptr, info_ptr->x_pixels_per_unit, info_ptr->y_pixels_per_unit, info_ptr->phys_unit_type); #endif /* pHYs */ #ifdef PNG_WRITE_tIME_SUPPORTED - if (info_ptr->valid & PNG_INFO_tIME) + if ((info_ptr->valid & PNG_INFO_tIME) != 0) { png_write_tIME(png_ptr, &(info_ptr->mod_time)); png_ptr->mode |= PNG_WROTE_tIME; @@ -270,7 +270,7 @@ png_write_info(png_structrp png_ptr, png_const_inforp info_ptr) #endif /* tIME */ #ifdef PNG_WRITE_sPLT_SUPPORTED - if (info_ptr->valid & PNG_INFO_sPLT) + if ((info_ptr->valid & PNG_INFO_sPLT) != 0) for (i = 0; i < (int)info_ptr->splt_palettes_num; i++) png_write_sPLT(png_ptr, info_ptr->splt_palettes + i); #endif /* sPLT */ @@ -292,11 +292,14 @@ png_write_info(png_structrp png_ptr, png_const_inforp info_ptr) info_ptr->text[i].lang, info_ptr->text[i].lang_key, info_ptr->text[i].text); + /* Mark this chunk as written */ + if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE) + info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR; + else + info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR; #else - png_warning(png_ptr, "Unable to write international text"); + png_warning(png_ptr, "Unable to write international text"); #endif - /* Mark this chunk as written */ - info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR; } /* If we want a compressed text chunk */ @@ -305,13 +308,12 @@ png_write_info(png_structrp png_ptr, png_const_inforp info_ptr) #ifdef PNG_WRITE_zTXt_SUPPORTED /* Write compressed chunk */ png_write_zTXt(png_ptr, info_ptr->text[i].key, - info_ptr->text[i].text, 0, - info_ptr->text[i].compression); + info_ptr->text[i].text, info_ptr->text[i].compression); + /* Mark this chunk as written */ + info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR; #else png_warning(png_ptr, "Unable to write compressed text"); #endif - /* Mark this chunk as written */ - info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR; } else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE) @@ -349,7 +351,7 @@ png_write_end(png_structrp png_ptr, png_inforp info_ptr) if (png_ptr == NULL) return; - if (!(png_ptr->mode & PNG_HAVE_IDAT)) + if ((png_ptr->mode & PNG_HAVE_IDAT) == 0) png_error(png_ptr, "No IDATs written into file"); #ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED @@ -365,8 +367,8 @@ png_write_end(png_structrp png_ptr, png_inforp info_ptr) #endif #ifdef PNG_WRITE_tIME_SUPPORTED /* Check to see if user has supplied a time chunk */ - if ((info_ptr->valid & PNG_INFO_tIME) && - !(png_ptr->mode & PNG_WROTE_tIME)) + if ((info_ptr->valid & PNG_INFO_tIME) != 0 && + (png_ptr->mode & PNG_WROTE_tIME) == 0) png_write_tIME(png_ptr, &(info_ptr->mod_time)); #endif @@ -387,11 +389,14 @@ png_write_end(png_structrp png_ptr, png_inforp info_ptr) info_ptr->text[i].lang, info_ptr->text[i].lang_key, info_ptr->text[i].text); + /* Mark this chunk as written */ + if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE) + info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR; + else + info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR; #else png_warning(png_ptr, "Unable to write international text"); #endif - /* Mark this chunk as written */ - info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR; } else if (info_ptr->text[i].compression >= PNG_TEXT_COMPRESSION_zTXt) @@ -399,13 +404,12 @@ png_write_end(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_WRITE_zTXt_SUPPORTED /* Write compressed chunk */ png_write_zTXt(png_ptr, info_ptr->text[i].key, - info_ptr->text[i].text, 0, - info_ptr->text[i].compression); + info_ptr->text[i].text, info_ptr->text[i].compression); + /* Mark this chunk as written */ + info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR; #else png_warning(png_ptr, "Unable to write compressed text"); #endif - /* Mark this chunk as written */ - info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_zTXt_WR; } else if (info_ptr->text[i].compression == PNG_TEXT_COMPRESSION_NONE) @@ -414,12 +418,11 @@ png_write_end(png_structrp png_ptr, png_inforp info_ptr) /* Write uncompressed chunk */ png_write_tEXt(png_ptr, info_ptr->text[i].key, info_ptr->text[i].text, 0); + /* Mark this chunk as written */ + info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR; #else png_warning(png_ptr, "Unable to write uncompressed text"); #endif - - /* Mark this chunk as written */ - info_ptr->text[i].compression = PNG_TEXT_COMPRESSION_NONE_WR; } } #endif @@ -432,6 +435,7 @@ png_write_end(png_structrp png_ptr, png_inforp info_ptr) /* Write end of PNG file */ png_write_IEND(png_ptr); + /* This flush, added in libpng-1.0.8, removed from libpng-1.0.9beta03, * and restored again in libpng-1.2.30, may cause some applications that * do not set png_ptr->output_flush_fn to crash. If your application @@ -479,7 +483,7 @@ png_create_write_struct,(png_const_charp user_png_ver, png_voidp error_ptr, { #ifndef PNG_USER_MEM_SUPPORTED png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr, - error_fn, warn_fn, NULL, NULL, NULL); + error_fn, warn_fn, NULL, NULL, NULL); #else return png_create_write_struct_2(user_png_ver, error_ptr, error_fn, warn_fn, NULL, NULL, NULL); @@ -492,53 +496,52 @@ png_create_write_struct_2,(png_const_charp user_png_ver, png_voidp error_ptr, png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED) { png_structrp png_ptr = png_create_png_struct(user_png_ver, error_ptr, - error_fn, warn_fn, mem_ptr, malloc_fn, free_fn); -#endif /* PNG_USER_MEM_SUPPORTED */ + error_fn, warn_fn, mem_ptr, malloc_fn, free_fn); +#endif /* USER_MEM */ + if (png_ptr != NULL) + { + /* Set the zlib control values to defaults; they can be overridden by the + * application after the struct has been created. + */ + png_ptr->zbuffer_size = PNG_ZBUF_SIZE; - /* Set the zlib control values to defaults; they can be overridden by the - * application after the struct has been created. - */ - png_ptr->zbuffer_size = PNG_ZBUF_SIZE; - - /* The 'zlib_strategy' setting is irrelevant because png_default_claim in - * pngwutil.c defaults it according to whether or not filters will be used, - * and ignores this setting. - */ - png_ptr->zlib_strategy = PNG_Z_DEFAULT_STRATEGY; - png_ptr->zlib_level = PNG_Z_DEFAULT_COMPRESSION; - png_ptr->zlib_mem_level = 8; - png_ptr->zlib_window_bits = 15; - png_ptr->zlib_method = 8; + /* The 'zlib_strategy' setting is irrelevant because png_default_claim in + * pngwutil.c defaults it according to whether or not filters will be + * used, and ignores this setting. + */ + png_ptr->zlib_strategy = PNG_Z_DEFAULT_STRATEGY; + png_ptr->zlib_level = PNG_Z_DEFAULT_COMPRESSION; + png_ptr->zlib_mem_level = 8; + png_ptr->zlib_window_bits = 15; + png_ptr->zlib_method = 8; #ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED - png_ptr->zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY; - png_ptr->zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION; - png_ptr->zlib_text_mem_level = 8; - png_ptr->zlib_text_window_bits = 15; - png_ptr->zlib_text_method = 8; -#endif /* PNG_WRITE_COMPRESSED_TEXT_SUPPORTED */ + png_ptr->zlib_text_strategy = PNG_TEXT_Z_DEFAULT_STRATEGY; + png_ptr->zlib_text_level = PNG_TEXT_Z_DEFAULT_COMPRESSION; + png_ptr->zlib_text_mem_level = 8; + png_ptr->zlib_text_window_bits = 15; + png_ptr->zlib_text_method = 8; +#endif /* WRITE_COMPRESSED_TEXT */ - /* This is a highly dubious configuration option; by default it is off, but - * it may be appropriate for private builds that are testing extensions not - * conformant to the current specification, or of applications that must not - * fail to write at all costs! - */ -# ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED - png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN; + /* This is a highly dubious configuration option; by default it is off, + * but it may be appropriate for private builds that are testing + * extensions not conformant to the current specification, or of + * applications that must not fail to write at all costs! + */ +#ifdef PNG_BENIGN_WRITE_ERRORS_SUPPORTED /* In stable builds only warn if an application error can be completely * handled. */ -# endif + png_ptr->flags |= PNG_FLAG_BENIGN_ERRORS_WARN; +#endif - /* App warnings are warnings in release (or release candidate) builds but - * are errors during development. - */ -# if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC + /* App warnings are warnings in release (or release candidate) builds but + * are errors during development. + */ +#if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC png_ptr->flags |= PNG_FLAG_APP_WARNINGS_WARN; -# endif +#endif - if (png_ptr != NULL) - { /* TODO: delay this, it can be done in png_init_io() (if the app doesn't * do it itself) avoiding setting the default function if it is not * required. @@ -608,6 +611,71 @@ png_write_image(png_structrp png_ptr, png_bytepp image) } } +#ifdef PNG_MNG_FEATURES_SUPPORTED +/* Performs intrapixel differencing */ +static void +png_do_write_intrapixel(png_row_infop row_info, png_bytep row) +{ + png_debug(1, "in png_do_write_intrapixel"); + + if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0) + { + int bytes_per_pixel; + png_uint_32 row_width = row_info->width; + if (row_info->bit_depth == 8) + { + png_bytep rp; + png_uint_32 i; + + if (row_info->color_type == PNG_COLOR_TYPE_RGB) + bytes_per_pixel = 3; + + else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) + bytes_per_pixel = 4; + + else + return; + + for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel) + { + *(rp) = (png_byte)(*rp - *(rp + 1)); + *(rp + 2) = (png_byte)(*(rp + 2) - *(rp + 1)); + } + } + +#ifdef PNG_WRITE_16BIT_SUPPORTED + else if (row_info->bit_depth == 16) + { + png_bytep rp; + png_uint_32 i; + + if (row_info->color_type == PNG_COLOR_TYPE_RGB) + bytes_per_pixel = 6; + + else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) + bytes_per_pixel = 8; + + else + return; + + for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel) + { + png_uint_32 s0 = (*(rp ) << 8) | *(rp + 1); + png_uint_32 s1 = (*(rp + 2) << 8) | *(rp + 3); + png_uint_32 s2 = (*(rp + 4) << 8) | *(rp + 5); + png_uint_32 red = (png_uint_32)((s0 - s1) & 0xffffL); + png_uint_32 blue = (png_uint_32)((s2 - s1) & 0xffffL); + *(rp ) = (png_byte)(red >> 8); + *(rp + 1) = (png_byte)red; + *(rp + 4) = (png_byte)(blue >> 8); + *(rp + 5) = (png_byte)blue; + } + } +#endif /* WRITE_16BIT */ + } +} +#endif /* MNG_FEATURES */ + /* Called by user to write a row of image data */ void PNGAPI png_write_row(png_structrp png_ptr, png_const_bytep row) @@ -625,44 +693,44 @@ png_write_row(png_structrp png_ptr, png_const_bytep row) if (png_ptr->row_number == 0 && png_ptr->pass == 0) { /* Make sure we wrote the header info */ - if (!(png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE)) + if ((png_ptr->mode & PNG_WROTE_INFO_BEFORE_PLTE) == 0) png_error(png_ptr, "png_write_info was never called before png_write_row"); /* Check for transforms that have been set but were defined out */ #if !defined(PNG_WRITE_INVERT_SUPPORTED) && defined(PNG_READ_INVERT_SUPPORTED) - if (png_ptr->transformations & PNG_INVERT_MONO) + if ((png_ptr->transformations & PNG_INVERT_MONO) != 0) png_warning(png_ptr, "PNG_WRITE_INVERT_SUPPORTED is not defined"); #endif #if !defined(PNG_WRITE_FILLER_SUPPORTED) && defined(PNG_READ_FILLER_SUPPORTED) - if (png_ptr->transformations & PNG_FILLER) + if ((png_ptr->transformations & PNG_FILLER) != 0) png_warning(png_ptr, "PNG_WRITE_FILLER_SUPPORTED is not defined"); #endif #if !defined(PNG_WRITE_PACKSWAP_SUPPORTED) && \ defined(PNG_READ_PACKSWAP_SUPPORTED) - if (png_ptr->transformations & PNG_PACKSWAP) + if ((png_ptr->transformations & PNG_PACKSWAP) != 0) png_warning(png_ptr, "PNG_WRITE_PACKSWAP_SUPPORTED is not defined"); #endif #if !defined(PNG_WRITE_PACK_SUPPORTED) && defined(PNG_READ_PACK_SUPPORTED) - if (png_ptr->transformations & PNG_PACK) + if ((png_ptr->transformations & PNG_PACK) != 0) png_warning(png_ptr, "PNG_WRITE_PACK_SUPPORTED is not defined"); #endif #if !defined(PNG_WRITE_SHIFT_SUPPORTED) && defined(PNG_READ_SHIFT_SUPPORTED) - if (png_ptr->transformations & PNG_SHIFT) + if ((png_ptr->transformations & PNG_SHIFT) != 0) png_warning(png_ptr, "PNG_WRITE_SHIFT_SUPPORTED is not defined"); #endif #if !defined(PNG_WRITE_BGR_SUPPORTED) && defined(PNG_READ_BGR_SUPPORTED) - if (png_ptr->transformations & PNG_BGR) + if ((png_ptr->transformations & PNG_BGR) != 0) png_warning(png_ptr, "PNG_WRITE_BGR_SUPPORTED is not defined"); #endif #if !defined(PNG_WRITE_SWAP_SUPPORTED) && defined(PNG_READ_SWAP_SUPPORTED) - if (png_ptr->transformations & PNG_SWAP_BYTES) + if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0) png_warning(png_ptr, "PNG_WRITE_SWAP_SUPPORTED is not defined"); #endif @@ -671,12 +739,13 @@ png_write_row(png_structrp png_ptr, png_const_bytep row) #ifdef PNG_WRITE_INTERLACING_SUPPORTED /* If interlaced and not interested in row, return */ - if (png_ptr->interlaced && (png_ptr->transformations & PNG_INTERLACE)) + if (png_ptr->interlaced != 0 && + (png_ptr->transformations & PNG_INTERLACE) != 0) { switch (png_ptr->pass) { case 0: - if (png_ptr->row_number & 0x07) + if ((png_ptr->row_number & 0x07) != 0) { png_write_finish_row(png_ptr); return; @@ -684,7 +753,7 @@ png_write_row(png_structrp png_ptr, png_const_bytep row) break; case 1: - if ((png_ptr->row_number & 0x07) || png_ptr->width < 5) + if ((png_ptr->row_number & 0x07) != 0 || png_ptr->width < 5) { png_write_finish_row(png_ptr); return; @@ -700,7 +769,7 @@ png_write_row(png_structrp png_ptr, png_const_bytep row) break; case 3: - if ((png_ptr->row_number & 0x03) || png_ptr->width < 3) + if ((png_ptr->row_number & 0x03) != 0 || png_ptr->width < 3) { png_write_finish_row(png_ptr); return; @@ -716,7 +785,7 @@ png_write_row(png_structrp png_ptr, png_const_bytep row) break; case 5: - if ((png_ptr->row_number & 0x01) || png_ptr->width < 2) + if ((png_ptr->row_number & 0x01) != 0 || png_ptr->width < 2) { png_write_finish_row(png_ptr); return; @@ -724,7 +793,7 @@ png_write_row(png_structrp png_ptr, png_const_bytep row) break; case 6: - if (!(png_ptr->row_number & 0x01)) + if ((png_ptr->row_number & 0x01) == 0) { png_write_finish_row(png_ptr); return; @@ -758,11 +827,11 @@ png_write_row(png_structrp png_ptr, png_const_bytep row) #ifdef PNG_WRITE_INTERLACING_SUPPORTED /* Handle interlacing */ if (png_ptr->interlaced && png_ptr->pass < 6 && - (png_ptr->transformations & PNG_INTERLACE)) + (png_ptr->transformations & PNG_INTERLACE) != 0) { png_do_write_interlace(&row_info, png_ptr->row_buf + 1, png_ptr->pass); /* This should always get caught above, but still ... */ - if (!(row_info.width)) + if (row_info.width == 0) { png_write_finish_row(png_ptr); return; @@ -772,7 +841,7 @@ png_write_row(png_structrp png_ptr, png_const_bytep row) #ifdef PNG_WRITE_TRANSFORMS_SUPPORTED /* Handle other transformations */ - if (png_ptr->transformations) + if (png_ptr->transformations != 0) png_do_write_transformations(png_ptr, &row_info); #endif @@ -793,7 +862,7 @@ png_write_row(png_structrp png_ptr, png_const_bytep row) * 4. The filter_method is 64 and * 5. The color_type is RGB or RGBA */ - if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) && + if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 && (png_ptr->filter_type == PNG_INTRAPIXEL_DIFFERENCING)) { /* Intrapixel differencing */ @@ -846,7 +915,7 @@ png_write_flush(png_structrp png_ptr) png_ptr->flush_rows = 0; png_flush(png_ptr); } -#endif /* PNG_WRITE_FLUSH_SUPPORTED */ +#endif /* WRITE_FLUSH */ #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED static void png_reset_filter_heuristics(png_structrp png_ptr);/* forward decl */ @@ -859,18 +928,24 @@ png_write_destroy(png_structrp png_ptr) png_debug(1, "in png_write_destroy"); /* Free any memory zlib uses */ - if (png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) + if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0) deflateEnd(&png_ptr->zstream); /* Free our memory. png_free checks NULL for us. */ png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list); png_free(png_ptr, png_ptr->row_buf); + png_ptr->row_buf = NULL; #ifdef PNG_WRITE_FILTER_SUPPORTED png_free(png_ptr, png_ptr->prev_row); png_free(png_ptr, png_ptr->sub_row); png_free(png_ptr, png_ptr->up_row); png_free(png_ptr, png_ptr->avg_row); png_free(png_ptr, png_ptr->paeth_row); + png_ptr->prev_row = NULL; + png_ptr->sub_row = NULL; + png_ptr->up_row = NULL; + png_ptr->avg_row = NULL; + png_ptr->paeth_row = NULL; #endif #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED @@ -878,10 +953,13 @@ png_write_destroy(png_structrp png_ptr) png_reset_filter_heuristics(png_ptr); png_free(png_ptr, png_ptr->filter_costs); png_free(png_ptr, png_ptr->inv_filter_costs); + png_ptr->filter_costs = NULL; + png_ptr->inv_filter_costs = NULL; #endif #ifdef PNG_SET_UNKNOWN_CHUNKS_SUPPORTED png_free(png_ptr, png_ptr->chunk_list); + png_ptr->chunk_list = NULL; #endif /* The error handling and memory handling information is left intact at this @@ -927,7 +1005,7 @@ png_set_filter(png_structrp png_ptr, int method, int filters) return; #ifdef PNG_MNG_FEATURES_SUPPORTED - if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) && + if ((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 && (method == PNG_INTRAPIXEL_DIFFERENCING)) method = PNG_FILTER_TYPE_BASE; @@ -941,7 +1019,7 @@ png_set_filter(png_structrp png_ptr, int method, int filters) case 6: case 7: png_app_error(png_ptr, "Unknown row filter for method 0"); /* FALL THROUGH */ -#endif /* PNG_WRITE_FILTER_SUPPORTED */ +#endif /* WRITE_FILTER */ case PNG_FILTER_VALUE_NONE: png_ptr->do_filter = PNG_FILTER_NONE; break; @@ -963,7 +1041,7 @@ png_set_filter(png_structrp png_ptr, int method, int filters) #else default: png_app_error(png_ptr, "Unknown row filter for method 0"); -#endif /* PNG_WRITE_FILTER_SUPPORTED */ +#endif /* WRITE_FILTER */ } /* If we have allocated the row_buf, this means we have already started @@ -972,20 +1050,22 @@ png_set_filter(png_structrp png_ptr, int method, int filters) * it is too late to start using the filters that need it, since we * will be missing the data in the previous row. If an application * wants to start and stop using particular filters during compression, - * it should start out with all of the filters, and then add and - * remove them after the start of compression. + * it should start out with all of the filters, and then remove them + * or add them back after the start of compression. */ if (png_ptr->row_buf != NULL) { #ifdef PNG_WRITE_FILTER_SUPPORTED - if ((png_ptr->do_filter & PNG_FILTER_SUB) && png_ptr->sub_row == NULL) + if ((png_ptr->do_filter & PNG_FILTER_SUB) != 0 && + png_ptr->sub_row == NULL) { png_ptr->sub_row = (png_bytep)png_malloc(png_ptr, (png_ptr->rowbytes + 1)); png_ptr->sub_row[0] = PNG_FILTER_VALUE_SUB; } - if ((png_ptr->do_filter & PNG_FILTER_UP) && png_ptr->up_row == NULL) + if ((png_ptr->do_filter & PNG_FILTER_UP) != 0 && + png_ptr->up_row == NULL) { if (png_ptr->prev_row == NULL) { @@ -1002,7 +1082,8 @@ png_set_filter(png_structrp png_ptr, int method, int filters) } } - if ((png_ptr->do_filter & PNG_FILTER_AVG) && png_ptr->avg_row == NULL) + if ((png_ptr->do_filter & PNG_FILTER_AVG) != 0 && + png_ptr->avg_row == NULL) { if (png_ptr->prev_row == NULL) { @@ -1019,7 +1100,7 @@ png_set_filter(png_structrp png_ptr, int method, int filters) } } - if ((png_ptr->do_filter & PNG_FILTER_PAETH) && + if ((png_ptr->do_filter & PNG_FILTER_PAETH) != 0 && png_ptr->paeth_row == NULL) { if (png_ptr->prev_row == NULL) @@ -1037,7 +1118,7 @@ png_set_filter(png_structrp png_ptr, int method, int filters) } if (png_ptr->do_filter == PNG_NO_FILTERS) -#endif /* PNG_WRITE_FILTER_SUPPORTED */ +#endif /* WRITE_FILTER */ png_ptr->do_filter = PNG_FILTER_NONE; } } @@ -1180,7 +1261,7 @@ png_set_filter_heuristics(png_structrp png_ptr, int heuristic_method, /* The internal API allocates all the arrays and ensures that the elements of * those arrays are set to the default value. */ - if (!png_init_filter_heuristics(png_ptr, heuristic_method, num_weights)) + if (png_init_filter_heuristics(png_ptr, heuristic_method, num_weights) == 0) return; /* If using the weighted method copy in the weights. */ @@ -1235,7 +1316,7 @@ png_set_filter_heuristics_fixed(png_structrp png_ptr, int heuristic_method, /* The internal API allocates all the arrays and ensures that the elements of * those arrays are set to the default value. */ - if (!png_init_filter_heuristics(png_ptr, heuristic_method, num_weights)) + if (png_init_filter_heuristics(png_ptr, heuristic_method, num_weights) == 0) return; /* If using the weighted method copy in the weights. */ @@ -1289,8 +1370,9 @@ png_set_filter_heuristics_fixed(png_structrp png_ptr, int heuristic_method, } } #endif /* FIXED_POINT */ -#endif /* PNG_WRITE_WEIGHTED_FILTER_SUPPORTED */ +#endif /* WRITE_WEIGHTED_FILTER */ +#ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED void PNGAPI png_set_compression_level(png_structrp png_ptr, int level) { @@ -1336,8 +1418,8 @@ png_set_compression_window_bits(png_structrp png_ptr, int window_bits) if (png_ptr == NULL) return; - /* Prior to 1.6.0 this would warn but then set the window_bits value, this - * meant that negative window bits values could be selected which would cause + /* Prior to 1.6.0 this would warn but then set the window_bits value. This + * meant that negative window bits values could be selected that would cause * libpng to write a non-standard PNG file with raw deflate or gzip * compressed IDAT or ancillary chunks. Such files can be read and there is * no warning on read, so this seems like a very bad idea. @@ -1373,6 +1455,7 @@ png_set_compression_method(png_structrp png_ptr, int method) png_ptr->zlib_method = method; } +#endif /* WRITE_CUSTOMIZE_COMPRESSION */ /* The following were added to libpng-1.5.4 */ #ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED @@ -1446,7 +1529,7 @@ png_set_text_compression_method(png_structrp png_ptr, int method) png_ptr->zlib_text_method = method; } -#endif /* PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED */ +#endif /* WRITE_CUSTOMIZE_ZTXT_COMPRESSION */ /* end of API added to libpng-1.5.4 */ void PNGAPI @@ -1482,81 +1565,117 @@ png_write_png(png_structrp png_ptr, png_inforp info_ptr, if (png_ptr == NULL || info_ptr == NULL) return; + if ((info_ptr->valid & PNG_INFO_IDAT) == 0) + { + png_app_error(png_ptr, "no rows for png_write_image to write"); + return; + } + /* Write the file header information. */ png_write_info(png_ptr, info_ptr); /* ------ these transformations don't touch the info structure ------- */ -#ifdef PNG_WRITE_INVERT_SUPPORTED /* Invert monochrome pixels */ - if (transforms & PNG_TRANSFORM_INVERT_MONO) + if ((transforms & PNG_TRANSFORM_INVERT_MONO) != 0) +#ifdef PNG_WRITE_INVERT_SUPPORTED png_set_invert_mono(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_MONO not supported"); #endif -#ifdef PNG_WRITE_SHIFT_SUPPORTED /* Shift the pixels up to a legal bit depth and fill in * as appropriate to correctly scale the image. */ - if ((transforms & PNG_TRANSFORM_SHIFT) - && (info_ptr->valid & PNG_INFO_sBIT)) - png_set_shift(png_ptr, &info_ptr->sig_bit); + if ((transforms & PNG_TRANSFORM_SHIFT) != 0) +#ifdef PNG_WRITE_SHIFT_SUPPORTED + if ((info_ptr->valid & PNG_INFO_sBIT) != 0) + png_set_shift(png_ptr, &info_ptr->sig_bit); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_SHIFT not supported"); #endif -#ifdef PNG_WRITE_PACK_SUPPORTED /* Pack pixels into bytes */ - if (transforms & PNG_TRANSFORM_PACKING) - png_set_packing(png_ptr); + if ((transforms & PNG_TRANSFORM_PACKING) != 0) +#ifdef PNG_WRITE_PACK_SUPPORTED + png_set_packing(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_PACKING not supported"); #endif -#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED /* Swap location of alpha bytes from ARGB to RGBA */ - if (transforms & PNG_TRANSFORM_SWAP_ALPHA) + if ((transforms & PNG_TRANSFORM_SWAP_ALPHA) != 0) +#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED png_set_swap_alpha(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ALPHA not supported"); #endif + /* Remove a filler (X) from XRGB/RGBX/AG/GA into to convert it into + * RGB, note that the code expects the input color type to be G or RGB; no + * alpha channel. + */ + if ((transforms & (PNG_TRANSFORM_STRIP_FILLER_AFTER| + PNG_TRANSFORM_STRIP_FILLER_BEFORE)) != 0) + { #ifdef PNG_WRITE_FILLER_SUPPORTED - /* Pack XRGB/RGBX/ARGB/RGBA into RGB (4 channels -> 3 channels) */ - if (transforms & PNG_TRANSFORM_STRIP_FILLER_AFTER) - png_set_filler(png_ptr, 0, PNG_FILLER_AFTER); + if ((transforms & PNG_TRANSFORM_STRIP_FILLER_AFTER) != 0) + { + if ((transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE) != 0) + png_app_error(png_ptr, + "PNG_TRANSFORM_STRIP_FILLER: BEFORE+AFTER not supported"); - else if (transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE) - png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE); + /* Continue if ignored - this is the pre-1.6.10 behavior */ + png_set_filler(png_ptr, 0, PNG_FILLER_AFTER); + } + + else if ((transforms & PNG_TRANSFORM_STRIP_FILLER_BEFORE) != 0) + png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_STRIP_FILLER not supported"); #endif + } -#ifdef PNG_WRITE_BGR_SUPPORTED /* Flip BGR pixels to RGB */ - if (transforms & PNG_TRANSFORM_BGR) + if ((transforms & PNG_TRANSFORM_BGR) != 0) +#ifdef PNG_WRITE_BGR_SUPPORTED png_set_bgr(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_BGR not supported"); #endif -#ifdef PNG_WRITE_SWAP_SUPPORTED /* Swap bytes of 16-bit files to most significant byte first */ - if (transforms & PNG_TRANSFORM_SWAP_ENDIAN) + if ((transforms & PNG_TRANSFORM_SWAP_ENDIAN) != 0) +#ifdef PNG_WRITE_SWAP_SUPPORTED png_set_swap(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_SWAP_ENDIAN not supported"); #endif -#ifdef PNG_WRITE_PACKSWAP_SUPPORTED /* Swap bits of 1, 2, 4 bit packed pixel formats */ - if (transforms & PNG_TRANSFORM_PACKSWAP) + if ((transforms & PNG_TRANSFORM_PACKSWAP) != 0) +#ifdef PNG_WRITE_PACKSWAP_SUPPORTED png_set_packswap(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_PACKSWAP not supported"); #endif -#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED /* Invert the alpha channel from opacity to transparency */ - if (transforms & PNG_TRANSFORM_INVERT_ALPHA) + if ((transforms & PNG_TRANSFORM_INVERT_ALPHA) != 0) +#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED png_set_invert_alpha(png_ptr); +#else + png_app_error(png_ptr, "PNG_TRANSFORM_INVERT_ALPHA not supported"); #endif /* ----------------------- end of transformations ------------------- */ /* Write the bits */ - if (info_ptr->valid & PNG_INFO_IDAT) - png_write_image(png_ptr, info_ptr->row_pointers); + png_write_image(png_ptr, info_ptr->row_pointers); /* It is REQUIRED to call this to finish writing the rest of the file */ png_write_end(png_ptr, info_ptr); - PNG_UNUSED(transforms) /* Quiet compiler warnings */ PNG_UNUSED(params) } #endif @@ -1633,20 +1752,22 @@ png_write_image_16bit(png_voidp argument) display->first_row); png_uint_16p output_row = png_voidcast(png_uint_16p, display->local_row); png_uint_16p row_end; - const int channels = (image->format & PNG_FORMAT_FLAG_COLOR) ? 3 : 1; + const int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1; int aindex = 0; png_uint_32 y = image->height; - if (image->format & PNG_FORMAT_FLAG_ALPHA) + if ((image->format & PNG_FORMAT_FLAG_ALPHA) != 0) { - if (image->format & PNG_FORMAT_FLAG_AFIRST) - { - aindex = -1; - ++input_row; /* To point to the first component */ - ++output_row; - } +# ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED + if ((image->format & PNG_FORMAT_FLAG_AFIRST) != 0) + { + aindex = -1; + ++input_row; /* To point to the first component */ + ++output_row; + } - else + else +# endif aindex = channels; } @@ -1788,21 +1909,23 @@ png_write_image_8bit(png_voidp argument) display->first_row); png_bytep output_row = png_voidcast(png_bytep, display->local_row); png_uint_32 y = image->height; - const int channels = (image->format & PNG_FORMAT_FLAG_COLOR) ? 3 : 1; + const int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1; - if (image->format & PNG_FORMAT_FLAG_ALPHA) + if ((image->format & PNG_FORMAT_FLAG_ALPHA) != 0) { png_bytep row_end; int aindex; - if (image->format & PNG_FORMAT_FLAG_AFIRST) - { - aindex = -1; - ++input_row; /* To point to the first component */ - ++output_row; - } +# ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED + if ((image->format & PNG_FORMAT_FLAG_AFIRST) != 0) + { + aindex = -1; + ++input_row; /* To point to the first component */ + ++output_row; + } - else + else +# endif aindex = channels; /* Use row_end in place of a loop counter: */ @@ -1882,7 +2005,8 @@ png_image_set_PLTE(png_image_write_control *display) const png_uint_32 format = image->format; const int channels = PNG_IMAGE_SAMPLE_CHANNELS(format); -# ifdef PNG_FORMAT_BGR_SUPPORTED +# if defined(PNG_FORMAT_BGR_SUPPORTED) &&\ + defined(PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED) const int afirst = (format & PNG_FORMAT_FLAG_AFIRST) != 0 && (format & PNG_FORMAT_FLAG_ALPHA) != 0; # else @@ -1890,7 +2014,7 @@ png_image_set_PLTE(png_image_write_control *display) # endif # ifdef PNG_FORMAT_BGR_SUPPORTED - const int bgr = (format & PNG_FORMAT_FLAG_BGR) ? 2 : 0; + const int bgr = (format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0; # else # define bgr 0 # endif @@ -1907,13 +2031,13 @@ png_image_set_PLTE(png_image_write_control *display) /* This gets automatically converted to sRGB with reversal of the * pre-multiplication if the color-map has an alpha channel. */ - if (format & PNG_FORMAT_FLAG_LINEAR) + if ((format & PNG_FORMAT_FLAG_LINEAR) != 0) { png_const_uint_16p entry = png_voidcast(png_const_uint_16p, cmap); entry += i * channels; - if (channels & 1) /* no alpha */ + if ((channels & 1) != 0) /* no alpha */ { if (channels >= 3) /* RGB */ { @@ -2025,10 +2149,11 @@ png_image_write_main(png_voidp argument) png_inforp info_ptr = image->opaque->info_ptr; png_uint_32 format = image->format; - int colormap = (format & PNG_FORMAT_FLAG_COLORMAP) != 0; - int linear = !colormap && (format & PNG_FORMAT_FLAG_LINEAR) != 0; /* input */ - int alpha = !colormap && (format & PNG_FORMAT_FLAG_ALPHA) != 0; - int write_16bit = linear && !colormap && !display->convert_to_8bit; + /* The following four ints are actually booleans */ + int colormap = (format & PNG_FORMAT_FLAG_COLORMAP); + int linear = !colormap && (format & PNG_FORMAT_FLAG_LINEAR); /* input */ + int alpha = !colormap && (format & PNG_FORMAT_FLAG_ALPHA); + int write_16bit = linear && !colormap && (display->convert_to_8bit == 0); # ifdef PNG_BENIGN_ERRORS_SUPPORTED /* Make sure we error out on any bad situation */ @@ -2040,7 +2165,7 @@ png_image_write_main(png_voidp argument) display->row_stride = PNG_IMAGE_ROW_STRIDE(*image); /* Set the required transforms then write the rows in the correct order. */ - if (format & PNG_FORMAT_FLAG_COLORMAP) + if ((format & PNG_FORMAT_FLAG_COLORMAP) != 0) { if (display->colormap != NULL && image->colormap_entries > 0) { @@ -2072,12 +2197,12 @@ png_image_write_main(png_voidp argument) * write an interlaced image. */ - if (write_16bit) + if (write_16bit != 0) { /* The gamma here is 1.0 (linear) and the cHRM chunk matches sRGB. */ png_set_gAMA_fixed(png_ptr, info_ptr, PNG_GAMMA_LINEAR); - if (!(image->flags & PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB)) + if ((image->flags & PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB) == 0) png_set_cHRM_fixed(png_ptr, info_ptr, /* color x y */ /* white */ 31270, 32900, @@ -2087,7 +2212,7 @@ png_image_write_main(png_voidp argument) ); } - else if (!(image->flags & PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB)) + else if ((image->flags & PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB) == 0) png_set_sRGB(png_ptr, info_ptr, PNG_sRGB_INTENT_PERCEPTUAL); /* Else writing an 8-bit file and the *colors* aren't sRGB, but the 8-bit @@ -2104,27 +2229,27 @@ png_image_write_main(png_voidp argument) * * First check for a little endian system if writing 16 bit files. */ - if (write_16bit) + if (write_16bit != 0) { PNG_CONST png_uint_16 le = 0x0001; - if (*(png_const_bytep)&le) + if ((*(png_const_bytep) & le) != 0) png_set_swap(png_ptr); } # ifdef PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED - if (format & PNG_FORMAT_FLAG_BGR) + if ((format & PNG_FORMAT_FLAG_BGR) != 0) { - if (!colormap && (format & PNG_FORMAT_FLAG_COLOR) != 0) + if (colormap == 0 && (format & PNG_FORMAT_FLAG_COLOR) != 0) png_set_bgr(png_ptr); format &= ~PNG_FORMAT_FLAG_BGR; } # endif # ifdef PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED - if (format & PNG_FORMAT_FLAG_AFIRST) + if ((format & PNG_FORMAT_FLAG_AFIRST) != 0) { - if (!colormap && (format & PNG_FORMAT_FLAG_ALPHA) != 0) + if (colormap == 0 && (format & PNG_FORMAT_FLAG_ALPHA) != 0) png_set_swap_alpha(png_ptr); format &= ~PNG_FORMAT_FLAG_AFIRST; } @@ -2133,7 +2258,7 @@ png_image_write_main(png_voidp argument) /* If there are 16 or fewer color-map entries we wrote a lower bit depth * above, but the application data is still byte packed. */ - if (colormap && image->colormap_entries <= 16) + if (colormap != 0 && image->colormap_entries <= 16) png_set_packing(png_ptr); /* That should have handled all (both) the transforms. */ @@ -2145,7 +2270,7 @@ png_image_write_main(png_voidp argument) png_const_bytep row = png_voidcast(png_const_bytep, display->buffer); ptrdiff_t row_bytes = display->row_stride; - if (linear) + if (linear != 0) row_bytes *= (sizeof (png_uint_16)); if (row_bytes < 0) @@ -2164,21 +2289,24 @@ png_image_write_main(png_voidp argument) * it about 50 times. The speed-up in pngstest was about 10-20% of the * total (user) time on a heavily loaded system. */ +#ifdef PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED png_set_compression_level(png_ptr, 3); +#endif } /* Check for the cases that currently require a pre-transform on the row * before it is written. This only applies when the input is 16-bit and * either there is an alpha channel or it is converted to 8-bit. */ - if ((linear && alpha) || (!colormap && display->convert_to_8bit)) + if ((linear != 0 && alpha != 0 ) || + (colormap == 0 && display->convert_to_8bit != 0)) { png_bytep row = png_voidcast(png_bytep, png_malloc(png_ptr, png_get_rowbytes(png_ptr, info_ptr))); int result; display->local_row = row; - if (write_16bit) + if (write_16bit != 0) result = png_safe_execute(image, png_write_image_16bit, display); else result = png_safe_execute(image, png_write_image_8bit, display); @@ -2187,7 +2315,7 @@ png_image_write_main(png_voidp argument) png_free(png_ptr, row); /* Skip the 'write_end' on error: */ - if (!result) + if (result == 0) return 0; } @@ -2220,7 +2348,7 @@ png_image_write_to_stdio(png_imagep image, FILE *file, int convert_to_8bit, { if (file != NULL) { - if (png_image_write_init(image)) + if (png_image_write_init(image) != 0) { png_image_write_control display; int result; @@ -2275,7 +2403,7 @@ png_image_write_to_file(png_imagep image, const char *file_name, if (fp != NULL) { if (png_image_write_to_stdio(image, fp, convert_to_8bit, buffer, - row_stride, colormap)) + row_stride, colormap) != 0) { int error; /* from fflush/fclose */ @@ -2326,6 +2454,6 @@ png_image_write_to_file(png_imagep image, const char *file_name, else return 0; } -#endif /* PNG_STDIO_SUPPORTED */ +#endif /* STDIO */ #endif /* SIMPLIFIED_WRITE */ -#endif /* PNG_WRITE_SUPPORTED */ +#endif /* WRITE */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngwtran.c b/3rdparty/libpng/pngwtran.c similarity index 82% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngwtran.c rename to 3rdparty/libpng/pngwtran.c index 98703f8c81..db82e27bce 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngwtran.c +++ b/3rdparty/libpng/pngwtran.c @@ -1,8 +1,8 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * Last changed in libpng 1.6.0 [February 14, 2013] - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.17 [March 26, 2015] + * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -14,90 +14,14 @@ #include "pngpriv.h" #ifdef PNG_WRITE_SUPPORTED - #ifdef PNG_WRITE_TRANSFORMS_SUPPORTED -/* Transform the data according to the user's wishes. The order of - * transformations is significant. - */ -void /* PRIVATE */ -png_do_write_transformations(png_structrp png_ptr, png_row_infop row_info) -{ - png_debug(1, "in png_do_write_transformations"); - - if (png_ptr == NULL) - return; - -#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED - if (png_ptr->transformations & PNG_USER_TRANSFORM) - if (png_ptr->write_user_transform_fn != NULL) - (*(png_ptr->write_user_transform_fn)) /* User write transform - function */ - (png_ptr, /* png_ptr */ - row_info, /* row_info: */ - /* png_uint_32 width; width of row */ - /* png_size_t rowbytes; number of bytes in row */ - /* png_byte color_type; color type of pixels */ - /* png_byte bit_depth; bit depth of samples */ - /* png_byte channels; number of channels (1-4) */ - /* png_byte pixel_depth; bits per pixel (depth*channels) */ - png_ptr->row_buf + 1); /* start of pixel data for row */ -#endif - -#ifdef PNG_WRITE_FILLER_SUPPORTED - if (png_ptr->transformations & PNG_FILLER) - png_do_strip_channel(row_info, png_ptr->row_buf + 1, - !(png_ptr->flags & PNG_FLAG_FILLER_AFTER)); -#endif - -#ifdef PNG_WRITE_PACKSWAP_SUPPORTED - if (png_ptr->transformations & PNG_PACKSWAP) - png_do_packswap(row_info, png_ptr->row_buf + 1); -#endif - -#ifdef PNG_WRITE_PACK_SUPPORTED - if (png_ptr->transformations & PNG_PACK) - png_do_pack(row_info, png_ptr->row_buf + 1, - (png_uint_32)png_ptr->bit_depth); -#endif - -#ifdef PNG_WRITE_SWAP_SUPPORTED - if (png_ptr->transformations & PNG_SWAP_BYTES) - png_do_swap(row_info, png_ptr->row_buf + 1); -#endif - -#ifdef PNG_WRITE_SHIFT_SUPPORTED - if (png_ptr->transformations & PNG_SHIFT) - png_do_shift(row_info, png_ptr->row_buf + 1, - &(png_ptr->shift)); -#endif - -#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED - if (png_ptr->transformations & PNG_SWAP_ALPHA) - png_do_write_swap_alpha(row_info, png_ptr->row_buf + 1); -#endif - -#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED - if (png_ptr->transformations & PNG_INVERT_ALPHA) - png_do_write_invert_alpha(row_info, png_ptr->row_buf + 1); -#endif - -#ifdef PNG_WRITE_BGR_SUPPORTED - if (png_ptr->transformations & PNG_BGR) - png_do_bgr(row_info, png_ptr->row_buf + 1); -#endif - -#ifdef PNG_WRITE_INVERT_SUPPORTED - if (png_ptr->transformations & PNG_INVERT_MONO) - png_do_invert(row_info, png_ptr->row_buf + 1); -#endif -} #ifdef PNG_WRITE_PACK_SUPPORTED /* Pack pixels into bytes. Pass the true bit depth in bit_depth. The * row_info bit depth should be 8 (one pixel per byte). The channels * should be 1 (this only happens on grayscale and paletted images). */ -void /* PRIVATE */ +static void png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth) { png_debug(1, "in png_do_pack"); @@ -242,7 +166,7 @@ png_do_pack(png_row_infop row_info, png_bytep row, png_uint_32 bit_depth) * would pass 3 as bit_depth, and this routine would translate the * data to 0 to 15. */ -void /* PRIVATE */ +static void png_do_shift(png_row_infop row_info, png_bytep row, png_const_color_8p bit_depth) { @@ -253,7 +177,7 @@ png_do_shift(png_row_infop row_info, png_bytep row, int shift_start[4], shift_dec[4]; int channels = 0; - if (row_info->color_type & PNG_COLOR_MASK_COLOR) + if ((row_info->color_type & PNG_COLOR_MASK_COLOR) != 0) { shift_start[channels] = row_info->bit_depth - bit_depth->red; shift_dec[channels] = bit_depth->red; @@ -275,7 +199,7 @@ png_do_shift(png_row_infop row_info, png_bytep row, channels++; } - if (row_info->color_type & PNG_COLOR_MASK_ALPHA) + if ((row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0) { shift_start[channels] = row_info->bit_depth - bit_depth->alpha; shift_dec[channels] = bit_depth->alpha; @@ -381,7 +305,7 @@ png_do_shift(png_row_infop row_info, png_bytep row, #endif #ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED -void /* PRIVATE */ +static void png_do_write_swap_alpha(png_row_infop row_info, png_bytep row) { png_debug(1, "in png_do_write_swap_alpha"); @@ -429,7 +353,7 @@ png_do_write_swap_alpha(png_row_infop row_info, png_bytep row) *(dp++) = save[1]; } } -#endif /* PNG_WRITE_16BIT_SUPPORTED */ +#endif /* WRITE_16BIT */ } else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) @@ -468,14 +392,14 @@ png_do_write_swap_alpha(png_row_infop row_info, png_bytep row) *(dp++) = save[1]; } } -#endif /* PNG_WRITE_16BIT_SUPPORTED */ +#endif /* WRITE_16BIT */ } } } #endif #ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED -void /* PRIVATE */ +static void png_do_write_invert_alpha(png_row_infop row_info, png_bytep row) { png_debug(1, "in png_do_write_invert_alpha"); @@ -525,7 +449,7 @@ png_do_write_invert_alpha(png_row_infop row_info, png_bytep row) *(dp++) = (png_byte)(255 - *(sp++)); } } -#endif /* PNG_WRITE_16BIT_SUPPORTED */ +#endif /* WRITE_16BIT */ } else if (row_info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) @@ -563,75 +487,88 @@ png_do_write_invert_alpha(png_row_infop row_info, png_bytep row) *(dp++) = (png_byte)(255 - *(sp++)); } } -#endif /* PNG_WRITE_16BIT_SUPPORTED */ +#endif /* WRITE_16BIT */ } } } #endif -#endif /* PNG_WRITE_TRANSFORMS_SUPPORTED */ -#ifdef PNG_MNG_FEATURES_SUPPORTED -/* Undoes intrapixel differencing */ +/* Transform the data according to the user's wishes. The order of + * transformations is significant. + */ void /* PRIVATE */ -png_do_write_intrapixel(png_row_infop row_info, png_bytep row) +png_do_write_transformations(png_structrp png_ptr, png_row_infop row_info) { - png_debug(1, "in png_do_write_intrapixel"); + png_debug(1, "in png_do_write_transformations"); - if ((row_info->color_type & PNG_COLOR_MASK_COLOR)) - { - int bytes_per_pixel; - png_uint_32 row_width = row_info->width; - if (row_info->bit_depth == 8) - { - png_bytep rp; - png_uint_32 i; + if (png_ptr == NULL) + return; - if (row_info->color_type == PNG_COLOR_TYPE_RGB) - bytes_per_pixel = 3; +#ifdef PNG_WRITE_USER_TRANSFORM_SUPPORTED + if ((png_ptr->transformations & PNG_USER_TRANSFORM) != 0) + if (png_ptr->write_user_transform_fn != NULL) + (*(png_ptr->write_user_transform_fn)) /* User write transform + function */ + (png_ptr, /* png_ptr */ + row_info, /* row_info: */ + /* png_uint_32 width; width of row */ + /* png_size_t rowbytes; number of bytes in row */ + /* png_byte color_type; color type of pixels */ + /* png_byte bit_depth; bit depth of samples */ + /* png_byte channels; number of channels (1-4) */ + /* png_byte pixel_depth; bits per pixel (depth*channels) */ + png_ptr->row_buf + 1); /* start of pixel data for row */ +#endif - else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) - bytes_per_pixel = 4; +#ifdef PNG_WRITE_FILLER_SUPPORTED + if ((png_ptr->transformations & PNG_FILLER) != 0) + png_do_strip_channel(row_info, png_ptr->row_buf + 1, + !(png_ptr->flags & PNG_FLAG_FILLER_AFTER)); +#endif - else - return; +#ifdef PNG_WRITE_PACKSWAP_SUPPORTED + if ((png_ptr->transformations & PNG_PACKSWAP) != 0) + png_do_packswap(row_info, png_ptr->row_buf + 1); +#endif - for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel) - { - *(rp) = (png_byte)((*rp - *(rp + 1)) & 0xff); - *(rp + 2) = (png_byte)((*(rp + 2) - *(rp + 1)) & 0xff); - } - } +#ifdef PNG_WRITE_PACK_SUPPORTED + if ((png_ptr->transformations & PNG_PACK) != 0) + png_do_pack(row_info, png_ptr->row_buf + 1, + (png_uint_32)png_ptr->bit_depth); +#endif -#ifdef PNG_WRITE_16BIT_SUPPORTED - else if (row_info->bit_depth == 16) - { - png_bytep rp; - png_uint_32 i; +#ifdef PNG_WRITE_SWAP_SUPPORTED +# ifdef PNG_16BIT_SUPPORTED + if ((png_ptr->transformations & PNG_SWAP_BYTES) != 0) + png_do_swap(row_info, png_ptr->row_buf + 1); +# endif +#endif - if (row_info->color_type == PNG_COLOR_TYPE_RGB) - bytes_per_pixel = 6; +#ifdef PNG_WRITE_SHIFT_SUPPORTED + if ((png_ptr->transformations & PNG_SHIFT) != 0) + png_do_shift(row_info, png_ptr->row_buf + 1, + &(png_ptr->shift)); +#endif - else if (row_info->color_type == PNG_COLOR_TYPE_RGB_ALPHA) - bytes_per_pixel = 8; +#ifdef PNG_WRITE_SWAP_ALPHA_SUPPORTED + if ((png_ptr->transformations & PNG_SWAP_ALPHA) != 0) + png_do_write_swap_alpha(row_info, png_ptr->row_buf + 1); +#endif - else - return; +#ifdef PNG_WRITE_INVERT_ALPHA_SUPPORTED + if ((png_ptr->transformations & PNG_INVERT_ALPHA) != 0) + png_do_write_invert_alpha(row_info, png_ptr->row_buf + 1); +#endif - for (i = 0, rp = row; i < row_width; i++, rp += bytes_per_pixel) - { - png_uint_32 s0 = (*(rp ) << 8) | *(rp + 1); - png_uint_32 s1 = (*(rp + 2) << 8) | *(rp + 3); - png_uint_32 s2 = (*(rp + 4) << 8) | *(rp + 5); - png_uint_32 red = (png_uint_32)((s0 - s1) & 0xffffL); - png_uint_32 blue = (png_uint_32)((s2 - s1) & 0xffffL); - *(rp ) = (png_byte)((red >> 8) & 0xff); - *(rp + 1) = (png_byte)(red & 0xff); - *(rp + 4) = (png_byte)((blue >> 8) & 0xff); - *(rp + 5) = (png_byte)(blue & 0xff); - } - } -#endif /* PNG_WRITE_16BIT_SUPPORTED */ - } +#ifdef PNG_WRITE_BGR_SUPPORTED + if ((png_ptr->transformations & PNG_BGR) != 0) + png_do_bgr(row_info, png_ptr->row_buf + 1); +#endif + +#ifdef PNG_WRITE_INVERT_SUPPORTED + if ((png_ptr->transformations & PNG_INVERT_MONO) != 0) + png_do_invert(row_info, png_ptr->row_buf + 1); +#endif } -#endif /* PNG_MNG_FEATURES_SUPPORTED */ -#endif /* PNG_WRITE_SUPPORTED */ +#endif /* WRITE_TRANSFORMS */ +#endif /* WRITE */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngwutil.c b/3rdparty/libpng/pngwutil.c similarity index 94% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/pngwutil.c rename to 3rdparty/libpng/pngwutil.c index 49e6a2d213..b289671d12 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngwutil.c +++ b/3rdparty/libpng/pngwutil.c @@ -1,8 +1,8 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.6.2 [April 25, 2013] - * Copyright (c) 1998-2013 Glenn Randers-Pehrson + * Last changed in libpng 1.6.17 [March 26, 2015] + * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -23,10 +23,10 @@ void PNGAPI png_save_uint_32(png_bytep buf, png_uint_32 i) { - buf[0] = (png_byte)((i >> 24) & 0xff); - buf[1] = (png_byte)((i >> 16) & 0xff); - buf[2] = (png_byte)((i >> 8) & 0xff); - buf[3] = (png_byte)(i & 0xff); + buf[0] = (png_byte)(i >> 24); + buf[1] = (png_byte)(i >> 16); + buf[2] = (png_byte)(i >> 8); + buf[3] = (png_byte)(i ); } /* Place a 16-bit number into a buffer in PNG byte order. @@ -36,8 +36,8 @@ png_save_uint_32(png_bytep buf, png_uint_32 i) void PNGAPI png_save_uint_16(png_bytep buf, unsigned int i) { - buf[0] = (png_byte)((i >> 8) & 0xff); - buf[1] = (png_byte)(i & 0xff); + buf[0] = (png_byte)(i >> 8); + buf[1] = (png_byte)(i ); } #endif @@ -136,7 +136,7 @@ png_write_chunk_data(png_structrp png_ptr, png_const_bytep data, png_write_data(png_ptr, data, length); /* Update the CRC after writing the data, - * in case that the user I/O routine alters it. + * in case the user I/O routine alters it. */ png_calculate_crc(png_ptr, data, length); } @@ -181,7 +181,7 @@ png_write_complete_chunk(png_structrp png_ptr, png_uint_32 chunk_name, /* On 64 bit architectures 'length' may not fit in a png_uint_32. */ if (length > PNG_UINT_31_MAX) - png_error(png_ptr, "length exceeds PNG maxima"); + png_error(png_ptr, "length exceeds PNG maximum"); png_write_chunk_header(png_ptr, chunk_name, (png_uint_32)length); png_write_chunk_data(png_ptr, data, length); @@ -204,14 +204,14 @@ png_write_chunk(png_structrp png_ptr, png_const_bytep chunk_string, static png_alloc_size_t png_image_size(png_structrp png_ptr) { - /* Only return sizes up to the maximum of a png_uint_32, do this by limiting + /* Only return sizes up to the maximum of a png_uint_32; do this by limiting * the width and height used to 15 bits. */ png_uint_32 h = png_ptr->height; if (png_ptr->rowbytes < 32768 && h < 32768) { - if (png_ptr->interlaced) + if (png_ptr->interlaced != 0) { /* Interlacing makes the image larger because of the replication of * both the filter byte and the padding to a byte boundary. @@ -286,9 +286,7 @@ optimize_cmf(png_bytep data, png_alloc_size_t data_size) } } } -#else -# define optimize_cmf(dp,dl) ((void)0) -#endif /* PNG_WRITE_OPTIMIZE_CMF_SUPPORTED */ +#endif /* WRITE_OPTIMIZE_CMF */ /* Initialize the compressor for the appropriate type of compression. */ static int @@ -297,6 +295,7 @@ png_deflate_claim(png_structrp png_ptr, png_uint_32 owner, { if (png_ptr->zowner != 0) { +#if defined(PNG_WARNINGS_SUPPORTED) || defined(PNG_ERROR_TEXT_SUPPORTED) char msg[64]; PNG_STRING_FROM_CHUNK(msg, owner); @@ -308,7 +307,8 @@ png_deflate_claim(png_structrp png_ptr, png_uint_32 owner, * are minimal. */ (void)png_safecat(msg, (sizeof msg), 10, " using zstream"); -# if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC +#endif +#if PNG_LIBPNG_BUILD_BASE_TYPE >= PNG_LIBPNG_BUILD_RC png_warning(png_ptr, msg); /* Attempt sane error recovery */ @@ -319,9 +319,9 @@ png_deflate_claim(png_structrp png_ptr, png_uint_32 owner, } png_ptr->zowner = 0; -# else +#else png_error(png_ptr, msg); -# endif +#endif } { @@ -334,7 +334,7 @@ png_deflate_claim(png_structrp png_ptr, png_uint_32 owner, if (owner == png_IDAT) { - if (png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY) + if ((png_ptr->flags & PNG_FLAG_ZLIB_CUSTOM_STRATEGY) != 0) strategy = png_ptr->zlib_strategy; else if (png_ptr->do_filter != PNG_FILTER_NONE) @@ -346,20 +346,20 @@ png_deflate_claim(png_structrp png_ptr, png_uint_32 owner, else { -# ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED +#ifdef PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED level = png_ptr->zlib_text_level; method = png_ptr->zlib_text_method; windowBits = png_ptr->zlib_text_window_bits; memLevel = png_ptr->zlib_text_mem_level; strategy = png_ptr->zlib_text_strategy; -# else +#else /* If customization is not supported the values all come from the * IDAT values except for the strategy, which is fixed to the * default. (This is the pre-1.6.0 behavior too, although it was * implemented in a very different way.) */ strategy = Z_DEFAULT_STRATEGY; -# endif +#endif } /* Adjust 'windowBits' down if larger than 'data_size'; to stop this @@ -386,7 +386,7 @@ png_deflate_claim(png_structrp png_ptr, png_uint_32 owner, } /* Check against the previous initialized values, if any. */ - if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) && + if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0 && (png_ptr->zlib_set_level != level || png_ptr->zlib_set_method != method || png_ptr->zlib_set_window_bits != windowBits || @@ -410,7 +410,7 @@ png_deflate_claim(png_structrp png_ptr, png_uint_32 owner, /* Now initialize if required, setting the new parameters, otherwise just * to a simple reset to the previous parameters. */ - if (png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) + if ((png_ptr->flags & PNG_FLAG_ZSTREAM_INITIALIZED) != 0) ret = deflateReset(&png_ptr->zstream); else @@ -492,7 +492,7 @@ png_text_compress(png_structrp png_ptr, png_uint_32 chunk_name, int ret; /* To find the length of the output it is necessary to first compress the - * input, the result is buffered rather than using the two-pass algorithm + * input. The result is buffered rather than using the two-pass algorithm * that is used on the inflate side; deflate is assumed to be slower and a * PNG writer is assumed to have more memory available than a PNG reader. * @@ -589,7 +589,7 @@ png_text_compress(png_structrp png_ptr, png_uint_32 chunk_name, } while (ret == Z_OK); - /* There may be some space left in the last output buffer, this needs to + /* There may be some space left in the last output buffer. This needs to * be subtracted from output_len. */ output_len -= png_ptr->zstream.avail_out; @@ -612,14 +612,15 @@ png_text_compress(png_structrp png_ptr, png_uint_32 chunk_name, /* Reset zlib for another zTXt/iTXt or image data */ png_ptr->zowner = 0; - /* The only success case is Z_STREAM_END, input_len must be 0, if not this + /* The only success case is Z_STREAM_END, input_len must be 0; if not this * is an internal error. */ if (ret == Z_STREAM_END && input_len == 0) { +#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED /* Fix up the deflate header, if required */ optimize_cmf(comp->output, comp->input_len); - +#endif /* But Z_OK is returned, not Z_STREAM_END; this allows the claim * function above to return Z_STREAM_END on an error (though it never * does in the current versions of zlib.) @@ -662,7 +663,7 @@ png_write_compressed_data_out(png_structrp png_ptr, compression_state *comp) if (output_len > 0) png_error(png_ptr, "error writing ancillary chunked compressed data"); } -#endif /* PNG_WRITE_COMPRESSED_TEXT_SUPPORTED */ +#endif /* WRITE_COMPRESSED_TEXT */ #if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \ defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED) @@ -694,12 +695,12 @@ png_check_keyword(png_structrp png_ptr, png_const_charp key, png_bytep new_key) while (*key && key_len < 79) { - png_byte ch = (png_byte)(0xff & *key++); + png_byte ch = (png_byte)*key++; if ((ch > 32 && ch <= 126) || (ch >= 161 /*&& ch <= 255*/)) *new_key++ = ch, ++key_len, space = 0; - else if (!space) + else if (space == 0) { /* A space or an invalid character when one wasn't seen immediately * before; output just a space. @@ -711,14 +712,14 @@ png_check_keyword(png_structrp png_ptr, png_const_charp key, png_bytep new_key) bad_character = ch; } - else if (!bad_character) + else if (bad_character == 0) bad_character = ch; /* just skip it, record the first error */ } - if (key_len > 0 && space) /* trailing space */ + if (key_len > 0 && space != 0) /* trailing space */ { --key_len, --new_key; - if (!bad_character) + if (bad_character == 0) bad_character = 32; } @@ -728,11 +729,12 @@ png_check_keyword(png_structrp png_ptr, png_const_charp key, png_bytep new_key) if (key_len == 0) return 0; +#ifdef PNG_WARNINGS_SUPPORTED /* Try to only output one warning per keyword: */ - if (*key) /* keyword too long */ + if (*key != 0) /* keyword too long */ png_warning(png_ptr, "keyword truncated"); - else if (bad_character) + else if (bad_character != 0) { PNG_WARNING_PARAMETERS(p) @@ -741,10 +743,11 @@ png_check_keyword(png_structrp png_ptr, png_const_charp key, png_bytep new_key) png_formatted_warning(png_ptr, p, "keyword \"@1\": bad character '0x@2'"); } +#endif /* WARNINGS */ return key_len; } -#endif +#endif /* WRITE_TEXT || WRITE_pCAL || WRITE_iCCP || WRITE_sPLT */ /* Write the IHDR chunk, and update the png_struct with the necessary * information. Note that the rest of this code depends upon this @@ -845,8 +848,8 @@ png_write_IHDR(png_structrp png_ptr, png_uint_32 width, png_uint_32 height, */ if ( #ifdef PNG_MNG_FEATURES_SUPPORTED - !((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) && - ((png_ptr->mode&PNG_HAVE_PNG_SIGNATURE) == 0) && + !((png_ptr->mng_features_permitted & PNG_FLAG_MNG_FILTER_64) != 0 && + ((png_ptr->mode & PNG_HAVE_PNG_SIGNATURE) == 0) && (color_type == PNG_COLOR_TYPE_RGB || color_type == PNG_COLOR_TYPE_RGB_ALPHA) && (filter_type == PNG_INTRAPIXEL_DIFFERENCING)) && @@ -868,7 +871,7 @@ png_write_IHDR(png_structrp png_ptr, png_uint_32 width, png_uint_32 height, interlace_type=PNG_INTERLACE_NONE; #endif - /* Save the relevent information */ + /* Save the relevant information */ png_ptr->bit_depth = (png_byte)bit_depth; png_ptr->color_type = (png_byte)color_type; png_ptr->interlaced = (png_byte)interlace_type; @@ -898,7 +901,7 @@ png_write_IHDR(png_structrp png_ptr, png_uint_32 width, png_uint_32 height, /* Write the chunk */ png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13); - if (!(png_ptr->do_filter)) + if ((png_ptr->do_filter) == PNG_NO_FILTERS) { if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE || png_ptr->bit_depth < 8) @@ -927,7 +930,7 @@ png_write_PLTE(png_structrp png_ptr, png_const_colorp palette, if (( #ifdef PNG_MNG_FEATURES_SUPPORTED - !(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) && + (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0 && #endif num_pal == 0) || num_pal > 256) { @@ -943,7 +946,7 @@ png_write_PLTE(png_structrp png_ptr, png_const_colorp palette, } } - if (!(png_ptr->color_type&PNG_COLOR_MASK_COLOR)) + if ((png_ptr->color_type & PNG_COLOR_MASK_COLOR) == 0) { png_warning(png_ptr, "Ignoring request to write a PLTE chunk in grayscale PNG"); @@ -998,7 +1001,7 @@ png_write_PLTE(png_structrp png_ptr, png_const_colorp palette, * Z_FINISH: this is the end of the input, do a Z_FINISH and clean up * * The routine manages the acquire and release of the png_ptr->zstream by - * checking and (at the end) clearing png_ptr->zowner, it does some sanity + * checking and (at the end) clearing png_ptr->zowner; it does some sanity * checks on the 'mode' flags while doing this. */ void /* PRIVATE */ @@ -1058,7 +1061,7 @@ png_compress_IDAT(png_structrp png_ptr, png_const_bytep input, input_len += png_ptr->zstream.avail_in; png_ptr->zstream.avail_in = 0; - /* OUTPUT: write complete IDAT chunks when avail_out drops to zero, note + /* OUTPUT: write complete IDAT chunks when avail_out drops to zero. Note * that these two zstream fields are preserved across the calls, therefore * there is no need to set these up on entry to the loop. */ @@ -1070,11 +1073,11 @@ png_compress_IDAT(png_structrp png_ptr, png_const_bytep input, /* Write an IDAT containing the data then reset the buffer. The * first IDAT may need deflate header optimization. */ -# ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED - if (!(png_ptr->mode & PNG_HAVE_IDAT) && - png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE) +#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED + if ((png_ptr->mode & PNG_HAVE_IDAT) == 0 && + png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE) optimize_cmf(data, png_image_size(png_ptr)); -# endif +#endif png_write_complete_chunk(png_ptr, png_IDAT, data, size); png_ptr->mode |= PNG_HAVE_IDAT; @@ -1090,7 +1093,7 @@ png_compress_IDAT(png_structrp png_ptr, png_const_bytep input, continue; } - /* The order of these checks doesn't matter much; it just effect which + /* The order of these checks doesn't matter much; it just affects which * possible error might be detected if multiple things go wrong at once. */ if (ret == Z_OK) /* most likely return code! */ @@ -1116,11 +1119,11 @@ png_compress_IDAT(png_structrp png_ptr, png_const_bytep input, png_bytep data = png_ptr->zbuffer_list->output; uInt size = png_ptr->zbuffer_size - png_ptr->zstream.avail_out; -# ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED - if (!(png_ptr->mode & PNG_HAVE_IDAT) && - png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE) - optimize_cmf(data, png_image_size(png_ptr)); -# endif +#ifdef PNG_WRITE_OPTIMIZE_CMF_SUPPORTED + if ((png_ptr->mode & PNG_HAVE_IDAT) == 0 && + png_ptr->compression_type == PNG_COMPRESSION_TYPE_BASE) + optimize_cmf(data, png_image_size(png_ptr)); +#endif png_write_complete_chunk(png_ptr, png_IDAT, data, size); png_ptr->zstream.avail_out = 0; @@ -1193,6 +1196,7 @@ png_write_iCCP(png_structrp png_ptr, png_const_charp name, png_uint_32 profile_len; png_byte new_name[81]; /* 1 byte for the compression byte */ compression_state comp; + png_uint_32 temp; png_debug(1, "in png_write_iCCP"); @@ -1207,7 +1211,8 @@ png_write_iCCP(png_structrp png_ptr, png_const_charp name, if (profile_len < 132) png_error(png_ptr, "ICC profile too short"); - if (profile_len & 0x03) + temp = (png_uint_32) (*(profile+8)); + if (temp > 3 && (profile_len & 0x03)) png_error(png_ptr, "ICC profile length invalid (not a multiple of 4)"); { @@ -1339,7 +1344,7 @@ png_write_sBIT(png_structrp png_ptr, png_const_color_8p sbit, int color_type) png_debug(1, "in png_write_sBIT"); /* Make sure we don't depend upon the order of PNG_COLOR_8 */ - if (color_type & PNG_COLOR_MASK_COLOR) + if ((color_type & PNG_COLOR_MASK_COLOR) != 0) { png_byte maxbits; @@ -1372,7 +1377,7 @@ png_write_sBIT(png_structrp png_ptr, png_const_color_8p sbit, int color_type) size = 1; } - if (color_type & PNG_COLOR_MASK_ALPHA) + if ((color_type & PNG_COLOR_MASK_ALPHA) != 0) { if (sbit->alpha == 0 || sbit->alpha > png_ptr->usr_bit_depth) { @@ -1459,9 +1464,9 @@ png_write_tRNS(png_structrp png_ptr, png_const_bytep trans_alpha, png_save_uint_16(buf + 2, tran->green); png_save_uint_16(buf + 4, tran->blue); #ifdef PNG_WRITE_16BIT_SUPPORTED - if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4])) + if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]) != 0) #else - if (buf[0] | buf[2] | buf[4]) + if ((buf[0] | buf[2] | buf[4]) != 0) #endif { png_app_warning(png_ptr, @@ -1492,8 +1497,8 @@ png_write_bKGD(png_structrp png_ptr, png_const_color_16p back, int color_type) { if ( #ifdef PNG_MNG_FEATURES_SUPPORTED - (png_ptr->num_palette || - (!(png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE))) && + (png_ptr->num_palette != 0 || + (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0) && #endif back->index >= png_ptr->num_palette) { @@ -1505,15 +1510,15 @@ png_write_bKGD(png_structrp png_ptr, png_const_color_16p back, int color_type) png_write_complete_chunk(png_ptr, png_bKGD, buf, (png_size_t)1); } - else if (color_type & PNG_COLOR_MASK_COLOR) + else if ((color_type & PNG_COLOR_MASK_COLOR) != 0) { png_save_uint_16(buf, back->red); png_save_uint_16(buf + 2, back->green); png_save_uint_16(buf + 4, back->blue); #ifdef PNG_WRITE_16BIT_SUPPORTED - if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4])) + if (png_ptr->bit_depth == 8 && (buf[0] | buf[2] | buf[4]) != 0) #else - if (buf[0] | buf[2] | buf[4]) + if ((buf[0] | buf[2] | buf[4]) != 0) #endif { png_warning(png_ptr, @@ -1608,7 +1613,7 @@ png_write_tEXt(png_structrp png_ptr, png_const_charp key, png_const_charp text, */ png_write_chunk_data(png_ptr, new_key, key_len + 1); - if (text_len) + if (text_len != 0) png_write_chunk_data(png_ptr, (png_const_bytep)text, text_len); png_write_chunk_end(png_ptr); @@ -1619,14 +1624,13 @@ png_write_tEXt(png_structrp png_ptr, png_const_charp key, png_const_charp text, /* Write a compressed text chunk */ void /* PRIVATE */ png_write_zTXt(png_structrp png_ptr, png_const_charp key, png_const_charp text, - png_size_t text_len, int compression) + int compression) { png_uint_32 key_len; png_byte new_key[81]; compression_state comp; png_debug(1, "in png_write_zTXt"); - PNG_UNUSED(text_len) /* Always use strlen */ if (compression == PNG_TEXT_COMPRESSION_NONE) { @@ -1734,7 +1738,7 @@ png_write_iTXt(png_structrp png_ptr, int compression, png_const_charp key, png_text_compress_init(&comp, (png_const_bytep)text, strlen(text)); - if (compression) + if (compression != 0) { if (png_text_compress(png_ptr, png_iTXt, &comp, prefix_len) != Z_OK) png_error(png_ptr, png_ptr->zstream.msg); @@ -1757,11 +1761,11 @@ png_write_iTXt(png_structrp png_ptr, int compression, png_const_charp key, png_write_chunk_data(png_ptr, (png_const_bytep)lang_key, lang_key_len); - if (compression) + if (compression != 0) png_write_compressed_data_out(png_ptr, &comp); else - png_write_chunk_data(png_ptr, (png_const_bytep)text, comp.input_len); + png_write_chunk_data(png_ptr, (png_const_bytep)text, comp.output_len); png_write_chunk_end(png_ptr); } @@ -1981,12 +1985,13 @@ png_write_start_row(png_structrp png_ptr) } /* We only need to keep the previous row if we are using one of these. */ - if (png_ptr->do_filter & (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH)) + if ((png_ptr->do_filter & + (PNG_FILTER_AVG | PNG_FILTER_UP | PNG_FILTER_PAETH)) != 0) { /* Set up previous row buffer */ png_ptr->prev_row = (png_bytep)png_calloc(png_ptr, buf_size); - if (png_ptr->do_filter & PNG_FILTER_UP) + if ((png_ptr->do_filter & PNG_FILTER_UP) != 0) { png_ptr->up_row = (png_bytep)png_malloc(png_ptr, png_ptr->rowbytes + 1); @@ -1994,7 +1999,7 @@ png_write_start_row(png_structrp png_ptr) png_ptr->up_row[0] = PNG_FILTER_VALUE_UP; } - if (png_ptr->do_filter & PNG_FILTER_AVG) + if ((png_ptr->do_filter & PNG_FILTER_AVG) != 0) { png_ptr->avg_row = (png_bytep)png_malloc(png_ptr, png_ptr->rowbytes + 1); @@ -2002,7 +2007,7 @@ png_write_start_row(png_structrp png_ptr) png_ptr->avg_row[0] = PNG_FILTER_VALUE_AVG; } - if (png_ptr->do_filter & PNG_FILTER_PAETH) + if ((png_ptr->do_filter & PNG_FILTER_PAETH) != 0) { png_ptr->paeth_row = (png_bytep)png_malloc(png_ptr, png_ptr->rowbytes + 1); @@ -2010,13 +2015,13 @@ png_write_start_row(png_structrp png_ptr) png_ptr->paeth_row[0] = PNG_FILTER_VALUE_PAETH; } } -#endif /* PNG_WRITE_FILTER_SUPPORTED */ +#endif /* WRITE_FILTER */ #ifdef PNG_WRITE_INTERLACING_SUPPORTED /* If interlaced, we need to set up width and height of pass */ - if (png_ptr->interlaced) + if (png_ptr->interlaced != 0) { - if (!(png_ptr->transformations & PNG_INTERLACE)) + if ((png_ptr->transformations & PNG_INTERLACE) == 0) { png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 - png_pass_ystart[0]) / png_pass_yinc[0]; @@ -2071,10 +2076,10 @@ png_write_finish_row(png_structrp png_ptr) #ifdef PNG_WRITE_INTERLACING_SUPPORTED /* If interlaced, go to next pass */ - if (png_ptr->interlaced) + if (png_ptr->interlaced != 0) { png_ptr->row_number = 0; - if (png_ptr->transformations & PNG_INTERLACE) + if ((png_ptr->transformations & PNG_INTERLACE) != 0) { png_ptr->pass++; } @@ -2099,7 +2104,7 @@ png_write_finish_row(png_structrp png_ptr) png_pass_ystart[png_ptr->pass]) / png_pass_yinc[png_ptr->pass]; - if (png_ptr->transformations & PNG_INTERLACE) + if ((png_ptr->transformations & PNG_INTERLACE) != 0) break; } while (png_ptr->usr_width == 0 || png_ptr->num_rows == 0); @@ -2309,7 +2314,8 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass) * been specified by the application, and then writes the row out with the * chosen filter. */ -static void png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row, +static void /* PRIVATE */ +png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row, png_size_t row_bytes); #define PNG_MAXSUM (((png_uint_32)(-1)) >> 1) @@ -2377,7 +2383,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) /* We don't need to test the 'no filter' case if this is the only filter * that has been chosen, as it doesn't actually do anything to the data. */ - if ((filter_to_do & PNG_FILTER_NONE) && filter_to_do != PNG_FILTER_NONE) + if ((filter_to_do & PNG_FILTER_NONE) != 0 && filter_to_do != PNG_FILTER_NONE) { png_bytep rp; png_uint_32 sum = 0; @@ -2447,13 +2453,13 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) for (lp = row_buf + 1; i < row_bytes; i++, rp++, lp++, dp++) { - *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff); + *dp = (png_byte)((int)*rp - (int)*lp); } best_row = png_ptr->sub_row; } - else if (filter_to_do & PNG_FILTER_SUB) + else if ((filter_to_do & PNG_FILTER_SUB) != 0) { png_bytep rp, dp, lp; png_uint_32 sum = 0, lmins = mins; @@ -2509,7 +2515,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) for (lp = row_buf + 1; i < row_bytes; i++, rp++, lp++, dp++) { - v = *dp = (png_byte)(((int)*rp - (int)*lp) & 0xff); + v = *dp = (png_byte)((int)*rp - (int)*lp); sum += (v < 128) ? v : 256 - v; @@ -2568,13 +2574,13 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) pp = prev_row + 1; i < row_bytes; i++, rp++, pp++, dp++) { - *dp = (png_byte)(((int)*rp - (int)*pp) & 0xff); + *dp = (png_byte)((int)*rp - (int)*pp); } best_row = png_ptr->up_row; } - else if (filter_to_do & PNG_FILTER_UP) + else if ((filter_to_do & PNG_FILTER_UP) != 0) { png_bytep rp, dp, pp; png_uint_32 sum = 0, lmins = mins; @@ -2619,7 +2625,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) for (i = 0, rp = row_buf + 1, dp = png_ptr->up_row + 1, pp = prev_row + 1; i < row_bytes; i++) { - v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff); + v = *dp++ = (png_byte)((int)*rp++ - (int)*pp++); sum += (v < 128) ? v : 256 - v; @@ -2677,18 +2683,18 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1, pp = prev_row + 1; i < bpp; i++) { - *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff); + *dp++ = (png_byte)((int)*rp++ - ((int)*pp++ / 2)); } for (lp = row_buf + 1; i < row_bytes; i++) { - *dp++ = (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2)) - & 0xff); + *dp++ = + (png_byte)((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2)); } best_row = png_ptr->avg_row; } - else if (filter_to_do & PNG_FILTER_AVG) + else if ((filter_to_do & PNG_FILTER_AVG) != 0) { png_bytep rp, dp, pp, lp; png_uint_32 sum = 0, lmins = mins; @@ -2732,7 +2738,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) for (i = 0, rp = row_buf + 1, dp = png_ptr->avg_row + 1, pp = prev_row + 1; i < bpp; i++) { - v = *dp++ = (png_byte)(((int)*rp++ - ((int)*pp++ / 2)) & 0xff); + v = *dp++ = (png_byte)((int)*rp++ - ((int)*pp++ / 2)); sum += (v < 128) ? v : 256 - v; } @@ -2740,7 +2746,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) for (lp = row_buf + 1; i < row_bytes; i++) { v = *dp++ = - (png_byte)(((int)*rp++ - (((int)*pp++ + (int)*lp++) / 2)) & 0xff); + (png_byte)(((int)*rp++ - ((int)*pp++ + (int)*lp++) / 2)); sum += (v < 128) ? v : 256 - v; @@ -2790,7 +2796,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) } /* Paeth filter */ - if (filter_to_do == PNG_FILTER_PAETH) + if ((filter_to_do == PNG_FILTER_PAETH) != 0) { png_bytep rp, dp, pp, cp, lp; png_size_t i; @@ -2798,7 +2804,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1, pp = prev_row + 1; i < bpp; i++) { - *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff); + *dp++ = (png_byte)((int)*rp++ - (int)*pp++); } for (lp = row_buf + 1, cp = prev_row + 1; i < row_bytes; i++) @@ -2824,12 +2830,12 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c; - *dp++ = (png_byte)(((int)*rp++ - p) & 0xff); + *dp++ = (png_byte)((int)*rp++ - p); } best_row = png_ptr->paeth_row; } - else if (filter_to_do & PNG_FILTER_PAETH) + else if ((filter_to_do & PNG_FILTER_PAETH) != 0) { png_bytep rp, dp, pp, cp, lp; png_uint_32 sum = 0, lmins = mins; @@ -2873,7 +2879,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) for (i = 0, rp = row_buf + 1, dp = png_ptr->paeth_row + 1, pp = prev_row + 1; i < bpp; i++) { - v = *dp++ = (png_byte)(((int)*rp++ - (int)*pp++) & 0xff); + v = *dp++ = (png_byte)((int)*rp++ - (int)*pp++); sum += (v < 128) ? v : 256 - v; } @@ -2899,7 +2905,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) pc = (p + pc) < 0 ? -(p + pc) : p + pc; #endif p = (pa <= pb && pa <=pc) ? a : (pb <= pc) ? b : c; -#else /* PNG_SLOW_PAETH */ +#else /* SLOW_PAETH */ p = a + b - c; pa = abs(p - a); pb = abs(p - b); @@ -2913,9 +2919,9 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) else p = c; -#endif /* PNG_SLOW_PAETH */ +#endif /* SLOW_PAETH */ - v = *dp++ = (png_byte)(((int)*rp++ - p) & 0xff); + v = *dp++ = (png_byte)((int)*rp++ - p); sum += (v < 128) ? v : 256 - v; @@ -2962,7 +2968,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) best_row = png_ptr->paeth_row; } } -#endif /* PNG_WRITE_FILTER_SUPPORTED */ +#endif /* WRITE_FILTER */ /* Do the actual writing of the filtered row data from the chosen filter. */ png_write_filtered_row(png_ptr, best_row, row_info->rowbytes+1); @@ -2982,7 +2988,7 @@ png_write_find_filter(png_structrp png_ptr, png_row_infop row_info) png_ptr->prev_filters[j] = best_row[0]; } #endif -#endif /* PNG_WRITE_FILTER_SUPPORTED */ +#endif /* WRITE_FILTER */ } @@ -2997,6 +3003,7 @@ png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row, png_compress_IDAT(png_ptr, filtered_row, full_row_length, Z_NO_FLUSH); +#ifdef PNG_WRITE_FILTER_SUPPORTED /* Swap the current and previous rows */ if (png_ptr->prev_row != NULL) { @@ -3006,6 +3013,7 @@ png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row, png_ptr->prev_row = png_ptr->row_buf; png_ptr->row_buf = tptr; } +#endif /* WRITE_FILTER */ /* Finish row - updates counters and flushes zlib if last row */ png_write_finish_row(png_ptr); @@ -3018,6 +3026,6 @@ png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row, { png_write_flush(png_ptr); } -#endif +#endif /* WRITE_FLUSH */ } -#endif /* PNG_WRITE_SUPPORTED */ +#endif /* WRITE */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/owatcom/libpng.tgt b/3rdparty/libpng/projects/owatcom/libpng.tgt similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/owatcom/libpng.tgt rename to 3rdparty/libpng/projects/owatcom/libpng.tgt diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/owatcom/libpng.wpj b/3rdparty/libpng/projects/owatcom/libpng.wpj similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/owatcom/libpng.wpj rename to 3rdparty/libpng/projects/owatcom/libpng.wpj diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/owatcom/pngconfig.mak b/3rdparty/libpng/projects/owatcom/pngconfig.mak similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/owatcom/pngconfig.mak rename to 3rdparty/libpng/projects/owatcom/pngconfig.mak diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/owatcom/pngstest.tgt b/3rdparty/libpng/projects/owatcom/pngstest.tgt similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/owatcom/pngstest.tgt rename to 3rdparty/libpng/projects/owatcom/pngstest.tgt diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/owatcom/pngtest.tgt b/3rdparty/libpng/projects/owatcom/pngtest.tgt similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/owatcom/pngtest.tgt rename to 3rdparty/libpng/projects/owatcom/pngtest.tgt diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/owatcom/pngvalid.tgt b/3rdparty/libpng/projects/owatcom/pngvalid.tgt similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/owatcom/pngvalid.tgt rename to 3rdparty/libpng/projects/owatcom/pngvalid.tgt diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/visualc71/PRJ0041.mak b/3rdparty/libpng/projects/visualc71/PRJ0041.mak similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/visualc71/PRJ0041.mak rename to 3rdparty/libpng/projects/visualc71/PRJ0041.mak diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/visualc71/README.txt b/3rdparty/libpng/projects/visualc71/README.txt similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/visualc71/README.txt rename to 3rdparty/libpng/projects/visualc71/README.txt diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/visualc71/README_zlib.txt b/3rdparty/libpng/projects/visualc71/README_zlib.txt similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/visualc71/README_zlib.txt rename to 3rdparty/libpng/projects/visualc71/README_zlib.txt diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/visualc71/libpng.sln b/3rdparty/libpng/projects/visualc71/libpng.sln similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/visualc71/libpng.sln rename to 3rdparty/libpng/projects/visualc71/libpng.sln diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/visualc71/libpng.vcproj b/3rdparty/libpng/projects/visualc71/libpng.vcproj similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/visualc71/libpng.vcproj rename to 3rdparty/libpng/projects/visualc71/libpng.vcproj diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/visualc71/pngtest.vcproj b/3rdparty/libpng/projects/visualc71/pngtest.vcproj similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/visualc71/pngtest.vcproj rename to 3rdparty/libpng/projects/visualc71/pngtest.vcproj diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/visualc71/zlib.vcproj b/3rdparty/libpng/projects/visualc71/zlib.vcproj similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/visualc71/zlib.vcproj rename to 3rdparty/libpng/projects/visualc71/zlib.vcproj diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/WARNING b/3rdparty/libpng/projects/vstudio/WARNING similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/WARNING rename to 3rdparty/libpng/projects/vstudio/WARNING diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/libpng/libpng.vcxproj b/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2012.vcxproj similarity index 55% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/libpng/libpng.vcxproj rename to 3rdparty/libpng/projects/vstudio/libpng/libpng_vs2012.vcxproj index 42195b5e85..42b48a81dc 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/libpng/libpng.vcxproj +++ b/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2012.vcxproj @@ -1,234 +1,176 @@ - - - - - Debug Library - Win32 - - - Debug - Win32 - - - Release Library - Win32 - - - Release - Win32 - - - - {D6973076-9317-4EF2-A0B8-B7A18AC0713E} - Win32Proj - libpng - - - - - DynamicLibrary - MultiByte - true - - - StaticLibrary - MultiByte - - - DynamicLibrary - true - MultiByte - - - StaticLibrary - MultiByte - - - - - - - - - - - - - - - - - - - false - - - $(ProjectName)16 - - - false - - $(ProjectName)16 - - - false - - - $(ProjectName)16 - - - false - - $(ProjectName)16 - - - - Use - Level4 - false - ProgramDatabase - EnableFastChecks - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - true - false - false - pngpriv.h - true - CompileAsC - true - 4996;4127 - $(ZLibSrcDir);%(AdditionalIncludeDirectories) - true - Disabled - MultiThreadedDebugDLL - - - Windows - true - zlib.lib - 16 - $(OutDir) - - - - - Use - Level4 - false - ProgramDatabase - Disabled - EnableFastChecks - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - true - false - false - pngpriv.h - true - CompileAsC - true - 4996;4127 - $(ZLibSrcDir);%(AdditionalIncludeDirectories) - true - MultiThreadedDebug - - - Windows - true - - - - - Level4 - Use - ProgramDatabase - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - false - false - pngpriv.h - true - CompileAsC - true - false - 4996;4127 - $(ZLibSrcDir);%(AdditionalIncludeDirectories) - true - Full - - - Windows - true - true - true - zlib.lib - 16 - $(OutDir) - - - - - Level4 - Use - ProgramDatabase - MultiThreaded - true - true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - false - false - pngpriv.h - true - CompileAsC - true - false - 4996;4127 - $(ZLibSrcDir);%(AdditionalIncludeDirectories) - true - Full - true - - - Windows - true - true - true - - - true - - - - - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - true - true - - - - - - + + + + + Debug + Win32 + + + Devel + Win32 + + + Release + Win32 + + + + libpng + {D6973076-9317-4EF2-A0B8-B7A18AC0713E} + + + + StaticLibrary + Unicode + false + v110_xp + + + StaticLibrary + true + Unicode + v110_xp + + + StaticLibrary + true + Unicode + v110_xp + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + false + + + + + false + + + + + Use + Level4 + ProgramDatabase + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + false + pngpriv.h + true + CompileAsC + 4996;4127 + $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) + true + Disabled + + + Windows + true + zlib.lib + 16 + $(OutDir) + + + + + Level4 + Use + ProgramDatabase + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + pngpriv.h + true + CompileAsC + 4996;4127 + $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) + true + Full + + + Windows + true + true + true + zlib.lib + 16 + $(OutDir) + + + + + Level4 + Use + ProgramDatabase + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + pngpriv.h + true + CompileAsC + 4996;4127 + $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) + true + Full + + + Windows + true + true + true + zlib.lib + 16 + $(OutDir) + + + + + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + diff --git a/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2013.vcxproj b/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2013.vcxproj new file mode 100644 index 0000000000..5efcfd2bd4 --- /dev/null +++ b/3rdparty/libpng/projects/vstudio/libpng/libpng_vs2013.vcxproj @@ -0,0 +1,176 @@ + + + + + Debug + Win32 + + + Devel + Win32 + + + Release + Win32 + + + + libpng + {D6973076-9317-4EF2-A0B8-B7A18AC0713E} + + + + StaticLibrary + Unicode + false + v120_xp + + + StaticLibrary + true + Unicode + v120_xp + + + StaticLibrary + true + Unicode + v120_xp + + + + + + + + + + + + + + + + + + + + + + + + false + + + + + false + + + + + false + + + + + Use + Level4 + ProgramDatabase + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + false + pngpriv.h + true + CompileAsC + 4996;4127 + $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) + true + Disabled + + + Windows + true + zlib.lib + 16 + $(OutDir) + + + + + Level4 + Use + ProgramDatabase + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + pngpriv.h + true + CompileAsC + 4996;4127 + $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) + true + Full + + + Windows + true + true + true + zlib.lib + 16 + $(OutDir) + + + + + Level4 + Use + ProgramDatabase + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + false + pngpriv.h + true + CompileAsC + 4996;4127 + $(SolutionDir)\3rdparty\zlib;%(AdditionalIncludeDirectories) + true + Full + + + Windows + true + true + true + zlib.lib + 16 + $(OutDir) + + + + + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/pnglibconf/pnglibconf.vcxproj b/3rdparty/libpng/projects/vstudio/pnglibconf/pnglibconf.vcxproj similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/pnglibconf/pnglibconf.vcxproj rename to 3rdparty/libpng/projects/vstudio/pnglibconf/pnglibconf.vcxproj diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/pngstest/pngstest.vcxproj b/3rdparty/libpng/projects/vstudio/pngstest/pngstest.vcxproj similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/pngstest/pngstest.vcxproj rename to 3rdparty/libpng/projects/vstudio/pngstest/pngstest.vcxproj diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/pngtest/pngtest.vcxproj b/3rdparty/libpng/projects/vstudio/pngtest/pngtest.vcxproj similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/pngtest/pngtest.vcxproj rename to 3rdparty/libpng/projects/vstudio/pngtest/pngtest.vcxproj diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/pngunknown/pngunknown.vcxproj b/3rdparty/libpng/projects/vstudio/pngunknown/pngunknown.vcxproj similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/pngunknown/pngunknown.vcxproj rename to 3rdparty/libpng/projects/vstudio/pngunknown/pngunknown.vcxproj diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/pngvalid/pngvalid.vcxproj b/3rdparty/libpng/projects/vstudio/pngvalid/pngvalid.vcxproj similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/pngvalid/pngvalid.vcxproj rename to 3rdparty/libpng/projects/vstudio/pngvalid/pngvalid.vcxproj diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/readme.txt b/3rdparty/libpng/projects/vstudio/readme.txt similarity index 98% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/readme.txt rename to 3rdparty/libpng/projects/vstudio/readme.txt index 1af61c9a41..a2521f2057 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/readme.txt +++ b/3rdparty/libpng/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.2 - April 25, 2013 +libpng version 1.6.17 - March 26, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/vstudio.sln b/3rdparty/libpng/projects/vstudio/vstudio.sln similarity index 100% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/vstudio.sln rename to 3rdparty/libpng/projects/vstudio/vstudio.sln diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/zlib.props b/3rdparty/libpng/projects/vstudio/zlib.props similarity index 93% rename from 3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/zlib.props rename to 3rdparty/libpng/projects/vstudio/zlib.props index c73bf08964..5d6d69b726 100644 --- a/3rdparty/wxwidgets3.0-3.0.1/src/png/projects/vstudio/zlib.props +++ b/3rdparty/libpng/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ - ..\..\..\..\zlib-1.2.5 + ..\..\..\..\zlib-1.2.8 unbound options: $*" - fi - - for i do - - if [ "x$WXDEBUG" = "xverbose" ]; then - decho " ${_fbd_indent}binding '$i' with '`remove_field $i $*`' still free" - [ -z "$_pruned" ] || decho " ${_fbd_indent} --- pruned: $_pruned ---" - fi - - if ( - eval m_$i=\$this_$i - _mask="^`get_mask`$" - - if [ "x$WXDEBUG" = "xverbose" ]; then - decho " ${_fbd_indent} checking: $_mask" - count_delegates "$_mask" - decho " $_fbd_indent $? eligible delegates" - for d in `find_eligible_delegates "$_mask"`; do - decho " ${_fbd_indent} $d" - done - fi - - count_delegates "$_mask" - _still_eligible=$? - - if [ $_still_eligible -eq 1 ]; then - echo `find_eligible_delegates "$_mask"` - return - fi - - [ "x$WXDEBUG" != "xfindprogress" ] || printf "." 1>&2 - - [ $_still_eligible -gt 1 ] && [ $# -gt 1 ] && - do_find_best_delegate `remove_field $i $*` - ) - then - - return - - elif [ $# -gt 1 ]; then - - if [ "x$WXDEBUG" = "xverbose" ]; then - decho " ${_fbd_indent}pruning: $i" - _pruned="${_pruned:+$_pruned }$i" - fi - set `remove_field $i $*` - - fi - - done - false - ) -} - -# find_best_delegate -# A simple wrapper around do_find_best_delegate that first determines -# the unbound options (ie. the ones that the user did not explicitly -# declare a preference for on the command line) -find_best_delegate() -{ - for _fbdi in $wxconfig_schema; do - is_set input_option_$_fbdi || - _unbound_options="${_unbound_options:+$_unbound_options }$_fbdi" - done - do_find_best_delegate $_unbound_options -} - - -# Legacy wx-config helpers. -# ------------------------- - -# get_legacy_mask -# Returns a mask in the format used by wx2.4. -get_legacy_mask() -{ - [ $# -gt 0 ] || set m - eval [ "x\${$1_chartype}" != "xunicode" ] || _unicode_flag=u - eval echo "wx\${$1_toolkit}${_unicode_flag}-\${$1_version}\${$1_host}-config" -} - -# find_legacy_configs -# Returns a list of configs installed by wx2.4 releases. -find_legacy_configs() -{ - ( - cd "$prefix/bin" && - { - ls wx*-2.4-config | grep -v ^wxbase - ls wx*-2.4-config | grep ^wxbase - } - ) 2> /dev/null -} - -# find_best_legacy_config -# Returns the best legacy config for a given specification. -# This assumes no matching new style config has been found. -find_best_legacy_config() -{ - _legacy_configs=`find_legacy_configs` - if [ -n "$_legacy_configs" ]; then - _legacy_mask=`get_legacy_mask` - for d in $_legacy_configs; do - if echo $d | $EGREP $_legacy_mask > /dev/null 2>&1 ; then - echo "$d" - return - fi - done - fi - false -} - - - -# The only action we can perform authoritatively prior to delegation -# is to list all the possible delegates. -# -------------------------------------------------------------- - -config_spec="$0 $*" -[ -z "$WXDEBUG" ] || config_spec=$configmask - -# Next chance for another satisfied customer then -# -# If we want to get really polished here we can do plural checking, -# but we should probably leave that until the day we gettextise it. -if [ -n "$output_option_list" ]; then - - _remains_in_prefix=$installed_configs - _delegates=`find_eligible_delegates $configmask` - _best_delegate=`find_best_delegate` - - if [ "x$WXDEBUG" = "xverbose" ]; then - decho - decho " all = $_remains_in_prefix" - decho " matching = $_delegates" - decho " best = $_best_delegate" - decho " this = $this_config" - fi - - for d in $_delegates; do - _remains_in_prefix=`remove_field $d $_remains_in_prefix` - done - - echo - echo " Default config is $this_config" - echo - - if user_mask_fits "$this_config" ; then - - echo " Default config ${this_exec_prefix+in $this_exec_prefix }will be used for output" - - if match_field "$this_config" $_delegates ; then - _delegates=`remove_field $this_config $_delegates` - else - echo " though it is not installed in: $prefix" - if [ -n "$_best_delegate" ] && [ "x$_best_delegate" != "x$this_config" ]; then - echo - echo " Best alternate in $prefix:" - echo " $_best_delegate" - fi - fi - - elif [ -n "$_best_delegate" ]; then - - echo " Specification best match: $_best_delegate" - - elif [ -z "$_delegates" ]; then - - _last_chance=`find_best_legacy_config` - if [ -n "$_last_chance" ]; then - - echo " Specification matches legacy config: $_last_chance" - - else - - cat <<-EOF - No config found to match: $config_spec - in $wxconfdir - - Please install the desired library build, or specify a different - prefix where it may be found. If the library is not installed - you may call its wx-config directly by specifying its full path. - -EOF - - fi - - else - echo " Specification was ambiguous. Use additional feature options" - echo " to choose between alternate matches." - fi - - _delegates=`remove_field "$_best_delegate" $_delegates` - - if [ -n "$_delegates" ]; then - echo - echo " Alternate matches:" - for d in $_delegates; do - echo " $d" - done - fi - if [ -n "$_remains_in_prefix" ]; then - echo - echo " Also available in $prefix:" - for d in $_remains_in_prefix; do - echo " $d" - done - fi - - _legacy_configs=`find_legacy_configs` - if [ -n "$_legacy_configs" ]; then - echo - echo " Legacy configs available in $prefix:" - for d in $_legacy_configs; do - echo " $d" | sed 's/-config$//' - done - fi - - echo - exit -fi - - - -# ... so if that wasn't what they wanted, then we need to know for -# certain, can this config satisfy the user specification? -# -------------------------------------------------------------- - -if not user_mask_fits "$this_config" ; then - - # No? Then let's see if it knows anybody who can. - # But first, just be sure someone hasn't typo'd us into a loop. - # In present day wx, correct delegation should never need more - # than one hop so this is trivial to detect. - - if [ -n "$WXCONFIG_DELEGATED" ]; then - decho - decho " *** Error: Bad config delegation" - decho - decho " to: $0" - decho " ($this_config) cannot satisfy:" - decho " $config_spec" - decho " Someone has been terribly careless." - decho - exit 1 - fi - - count_delegates "$configmask" - _numdelegates=$? - - if [ -n "$WXDEBUG" ]; then - decho " must delegate to an alternate config" - decho " potential delegates ($_numdelegates):" - for i in `find_eligible_delegates "$configmask"`; do - decho " $i" - done - fi - - if [ $_numdelegates -eq 0 ]; then - - _last_chance=`find_best_legacy_config` - if [ -n "$_last_chance" ]; then - - for arg do - case "$arg" in - --prefix*|--exec-prefix*| \ - --version|--release|--basename| \ - --static|--libs|--gl_libs| \ - --cppflags|--cflags|--cxxflags| \ - --cc|--cxx|--ld| \ - --rezflags|--inplace) - _legacy_args="$_legacy_args $arg" - ;; - - --static|--static=y*|--static=Y*) - _legacy_args="$_legacy_args --static" - ;; - esac - done - - if [ -n "$WXDEBUG" ]; then - decho " found a suitable legacy delegate: $_last_chance" - decho "--> $prefix/bin/$_last_chance $_legacy_args" - fi - - WXCONFIG_DELEGATED=yes - export WXCONFIG_DELEGATED - $prefix/bin/$_last_chance $_legacy_args - exit - - else - - cat 1>&2 <<-EOF - - Warning: No config found to match: $config_spec - in $wxconfdir - If you require this configuration, please install the desired - library build. If this is part of an automated configuration - test and no other errors occur, you may safely ignore it. - You may use wx-config --list to see all configs available in - the default prefix. - -EOF - - # PIPEDREAM: from here we are actually just a teensy step - # from simply building the missing config for the user - # on the fly if this is an in tree wx-config. - - exit 1 - fi - fi - - if [ $_numdelegates -gt 1 ]; then - - [ -z "$WXDEBUG" ] || decho " must prune the list of eligible delegates" - - best_delegate=`find_best_delegate` - - if [ -n "$best_delegate" ]; then - - if [ -n "$WXDEBUG" ]; then - decho " found a suitable delegate: $best_delegate" - decho "--> $wxconfdir/$best_delegate $*" - fi - - WXCONFIG_DELEGATED=yes - export WXCONFIG_DELEGATED - $wxconfdir/$best_delegate $* - exit - fi - - decho - decho " *** Error: Specification is ambiguous" - decho " as $config_spec" - decho " Use additional feature options to choose between:" - for i in `find_eligible_delegates "$configmask"`; do - decho " $i" - done - decho - - exit 1 - fi - - if [ -n "$WXDEBUG" ]; then - decho " using the only suitable delegate" - decho "--> $wxconfdir/`find_eligible_delegates $configmask` $*" - fi - - WXCONFIG_DELEGATED=yes - export WXCONFIG_DELEGATED - $wxconfdir/`find_eligible_delegates $configmask` $* - exit -fi - - - -# If we are still here, then from now on we are responsible for -# all the user's needs. Time to rustle up some output for them. -# -------------------------------------------------------------- - -[ -z "$WXDEBUG" ] || decho " using this config" - -# If the user supplied a prefix, and the in tree config did not -# delegate out to anything in that prefix, then reset the build -# tree prefix to provide the correct output for using this -# uninstalled wx build. Or put more simply: -prefix=${this_prefix-$prefix} -exec_prefix=${this_exec_prefix-$exec_prefix} - -includedir="@includedir@" -libdir="@libdir@" -bindir="@bindir@" - -# Trivial queries we can answer now. -[ -z "$output_option_prefix" ] || echo $prefix -[ -z "$output_option_exec_prefix" ] || echo $exec_prefix -[ -z "$output_option_release" ] || echo "@WX_RELEASE@" -[ -z "$output_option_version" ] || echo "@WX_VERSION@" -[ -z "$output_option_version_full" ] || echo "@WX_SUBVERSION@" -[ -z "$output_option_basename" ] || echo "@WX_LIBRARY_BASENAME_GUI@" -[ -z "$output_option_cc" ] || echo "@CC@" -[ -z "$output_option_cxx" ] || echo "@CXX@" -[ -z "$output_option_ld" ] || echo "@CXX@ -o" -[ -z "$flag_option_selected_config" ] || echo "$this_config" - -for q in $query_options; do - eval echo "\$this_$q" -done - -# --rezflags is deprecated and disabled (2005/11/29) -if [ -n "$output_option_rezflags" ]; then - echo "@true" - decho "Warning: --rezflags, along with Mac OS classic resource building" \ - "is deprecated. You should remove this from your Makefile and" \ - "build .app bundles instead." -fi - - -# The rest are going to need a little more work. -# -------------------------------------------------------------- - -is_monolithic() { [ "x@MONOLITHIC@" = "x1" ]; } -is_static() { [ -n "$this_linkage" ]; } -is_installed() { [ -z "$this_prefix" ]; } - - -# Is the user after a support utility? -# If this is a cross build, we need to find and return a suitable -# native utility for the job, so we search: -# -# 1. local build dir (for native uninstalled builds only). -# 2. (optional) user supplied prefix. -# 3. configured install prefix. -# 4. environment $PATH. -# -# and if such a thing still cannot be found, exit signalling an error. -if [ -n "$input_option_utility" ]; then - - # This is dumb, in tree binaries should be in a standard location - # like the libs, but work with what we've got for now. - is_cross || _util="$exec_prefix/utils/$input_option_utility/$input_option_utility" - - if not is_installed && [ -x "$_util" ]; then - is_static || _preload="eval LD_LIBRARY_PATH=$exec_prefix/lib" - echo $_preload $_util - exit - fi - - IFS=':' - _user_prefix=${input_option_exec_prefix:-$input_option_prefix} - - for _util in "${input_option_utility}-@WX_RELEASE@@WX_FLAVOUR@" \ - "${input_option_utility}-@WX_RELEASE@" \ - "${input_option_utility}" - do - for p in ${_user_prefix:+$_user_prefix/bin} $bindir $PATH; do - - [ -z "$WXDEBUG" ] || decho " checking for: '$p/$_util'" - - if [ -x "$p/$_util" ]; then - echo "$p/$_util" - exit - fi - - done - done - exit 1 - -fi - - -# Still here? Then get the options together for building an app. -# ---------------------------------------------------------------- - -# Additional configuration for individual library components. -ldflags_gl="@LDFLAGS_GL@" - -ldlibs_base="@WXCONFIG_LIBS@" -ldlibs_core="@EXTRALIBS_GUI@" -ldlibs_gl="@OPENGL_LIBS@" -ldlibs_html="@EXTRALIBS_HTML@" -ldlibs_xml="@EXTRALIBS_XML@" -ldlibs_adv="@EXTRALIBS_SDL@" -ldlibs_stc="@EXTRALIBS_STC@" - - -# Order the libraries passed to us correctly for static linking. -# -# While the libraries order doesn't matter when linking dynamically, we must -# put the libraries depending on other libraries in front of their dependencies -# when linking statically or the dependencies wouldn't be resolved by the -# standard UNIX linkers. -order_libs() -{ - if is_static; then - for lib do - # Distinguish between the libraries that may need to be moved to - # the end of the list (because other ones may depend on them) and - # those that can be output immediately because no other libraries - # depend on them. - case "$lib" in - base|core|html|xml|adv) eval "use_$lib=1" ;; - *) libs="$libs $lib" ;; - esac - done - - # Add the libraries that we postponed adding above. - # Order of the checks here is important. - [ -z "$use_html" ] || libs="$libs html" - [ -z "$use_adv" ] || libs="$libs adv" - [ -z "$use_core" ] || libs="$libs core" - [ -z "$use_xml" ] || libs="$libs xml" - [ -z "$use_base" ] || libs="$libs base" - else - # No need to order them. - libs="$@" - fi - - echo $libs -} - -# lib_flags_for _liblist -# This function returns a list of flags suitable to return with the -# output of --libs for all of the libraries in _liblist. You can -# add support for a new library by adding an entry for it in the -# psuedo-hashes above if it requires additional linker options. -lib_flags_for() -{ - [ -z "$WXDEBUG" ] || decho " fetching lib flags for: '$*'" - - _all_ldflags='' - _all_libs='' - _wxlibs='' - - is_cross && _target="-${target}" - - for lib do - - # We evidently can't trust people not to duplicate things in - # configure, or to keep them in any sort of sane order overall, - # so only add unique new fields here even if it takes us a while. - # In the case of libs, we bubble any duplicates to the end, - # because if multiple libs require it, static linking at least - # will require it to come after all of them. So long as local - # order is ok in configure then we should always be able to - # massage a correct result here like this. - # - # FIXME: ldlibs_core is totally bogus. Fix the duplication - # there independently of this. This covers for it, but we - # want to do this anyway because some libs may share common - # deps without a common ancestor in wx. This is not a licence - # for sloppy work elsewhere though and @GUI_TK_LIBRARY should - # be fixed. - - for f in `eval echo \"\\\$ldflags_$lib\"`; do - match_field "$f" $_all_ldflags || _all_ldflags="$_all_ldflags $f" - done - - if match_field "$lib" @STD_BASE_LIBS@ ; then - _libname="@WX_LIBRARY_BASENAME_NOGUI@" - else - _libname="@WX_LIBRARY_BASENAME_GUI@" - fi - [ $lib = base ] || _libname="${_libname}_$lib" - _libname="${_libname}-@WX_RELEASE@$_target" - - if is_static; then - _wxlibs="$_wxlibs ${libdir}/lib${_libname}.a" - for f in `eval echo \"\\\$ldlibs_$lib\"`; do - - # Only propagate duplicate -libraries to their latest - # possible position. Do not eliminate any other - # duplicates that might occur. They should be fixed - # in configure long before they get here. - # This started as a workaround for Mac -framework, - # but it seems like a better policy in general, which - # will let the more heinous bugs in configure shake out. - # We should maybe filter *.a here too, but not unless - # we have to. - case "$f" in - -l*) _all_libs="`remove_field $f $_all_libs` $f" ;; - *) _all_libs="$_all_libs $f" ;; - esac - - done - else - _wxlibs="$_wxlibs -l${_libname}" - fi - - done - - if [ -n "$WXDEBUG" ]; then - decho " retrieved: ldflags = $_all_ldflags" - decho " wxlibs = $_wxlibs" - decho " alllibs = $_all_libs" - fi - - echo $_all_ldflags $_wxlibs $_all_libs -} - -# this is the strict subset of the above function which returns only the -# (static) libraries themselves: this is used for linkdeps output which should -# output the list of libraries the main program should depend on -# -# of course, this duplication is bad but I'll leave to somebody else the care -# of refactoring this as I don't see any way to do it - VZ. - -# This (and the other cruft to support it) should be removed with -# reference to the FIXME above when configure stops piping us a slurry -# of options that need to be decomposed again for most practical uses - RL. -link_deps_for() -{ - _wxlibs='' - - is_cross && _target="-${target}" - - for lib do - if match_field "$lib" @STD_BASE_LIBS@ ; then - _libname="@WX_LIBRARY_BASENAME_NOGUI@" - else - _libname="@WX_LIBRARY_BASENAME_GUI@" - fi - [ $lib = base ] || _libname="${_libname}_$lib" - _libname="${_libname}-@WX_RELEASE@$_target" - - _wxlibs="$_wxlibs ${libdir}/lib${_libname}.a" - done - - echo $_wxlibs -} - -# Sanity check the list of libs the user provided us, if any. -# -------------------------------------------------------------- - -wx_libs=`echo "$libs_parameters" | tr ',' ' '` -wx_optional_libs=`echo "$optional_libs_parameters" | tr ',' ' '` - -# Add the --optional-libs, if they've been compiled and aren't already added -for i in $wx_optional_libs; do - if match_field $i @BUILT_WX_LIBS@; then - if not match_field $i $wx_libs; then - wx_libs="${wx_libs:+$wx_libs }$i" - fi - fi -done - -[ -z "$WXDEBUG" ] || decho " user supplied libs: '$wx_libs'" - -# Assume we are using the GUI, unless --libs was specified with no GUI libs -using_gui=yes - -if is_monolithic; then - - # Only add additional info if --libs was specified and not just --optional-libs - if [ -n "$output_option_libs" ]; then - # The only library we need to add when using monolithic build is the gl - # one as all the others are already included into the main one. - if match_field gl $wx_libs; then - wx_libs=gl - else - wx_libs= - fi - - wx_libs="@WXCONFIG_LDFLAGS_GUI@ `lib_flags_for $wx_libs`" - - # We still need the core lib deps for a static build though - if is_static; then - link_deps="${libdir}/libwx_@TOOLCHAIN_NAME@.a" - wx_libs="$wx_libs $link_deps $ldlibs_core $ldlibs_base" - else - wx_libs="$wx_libs -lwx_@TOOLCHAIN_NAME@" - fi - fi -else # MONOLITHIC = 0 - - # Import core libs by default, expand std if specified, or add base if omitted. - if [ -n "$output_option_libs" ] && [ -z "$libs_parameters" ]; then - wx_libs="@STD_GUI_LIBS@ @STD_BASE_LIBS@" - elif match_field all $wx_libs; then - wx_libs="@BUILT_WX_LIBS@" - elif match_field std $wx_libs; then - # Bubble any libs that were already specified to the end - # of the list and ensure static linking order is retained. - wx_libs=`remove_field std $wx_libs` - for i in @STD_GUI_LIBS@ @STD_BASE_LIBS@; do - wx_libs="`remove_field $i $wx_libs` $i" - done - elif not match_field base $wx_libs ; then - # Only add base if --libs was specified and not just --optional-libs - if [ -n "$output_option_libs" ]; then - wx_libs="$wx_libs base" - fi - fi - - if [ -n "$output_option_libs" ]; then - using_gui=no - for i in $wx_libs ; do - if match_field "$i" @STD_GUI_LIBS@; then - _guildflags="@WXCONFIG_LDFLAGS_GUI@" - using_gui=yes - break - fi - match_field "$i" @STD_BASE_LIBS@ || using_gui=yes - done - fi - - if is_static; then - link_deps=`link_deps_for $wx_libs` - fi - wx_libs=`order_libs $wx_libs` - wx_libs="$_guildflags `lib_flags_for $wx_libs`" -fi - - -# If they explicitly set "--cxx(pp)flags base" then they don't want the GUI -if [ "$cxx_parameters" = "base" ]; then - using_gui=no -fi - - -if [ -n "$WXDEBUG" ]; then - decho - decho " using libs: '$wx_libs'" - decho " using_gui = $using_gui" - decho -fi - - -# Endgame. Nothing left to discover now. -# -------------------------------------------------------------- - -[ "$using_gui" = "yes" ] || _gui_cppflags="-DwxUSE_GUI=0" - -if is_installed; then - _include_cppflags="-I${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@" -else - _include_cppflags="-I${includedir}" -fi - -_cppflags=`echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXCONFIG_CPPFLAGS@" $_gui_cppflags` - -# now without further ado, we can answer these too. -[ -z "$output_option_cppflags" ] || echo $_cppflags -[ -z "$output_option_cflags" ] || echo $_cppflags "@WXCONFIG_CFLAGS@" -[ -z "$output_option_cxxflags" ] || echo $_cppflags "@WXCONFIG_CXXFLAGS@" -[ -z "$output_option_gl_libs" ] || echo `lib_flags_for gl` -[ -z "$output_option_linkdeps" ] || echo $link_deps - -if [ -n "$output_option_libs" ]; then - # if --libs [--optional-libs] then output the full linker information - - is_cross && - [ "x$libdir" = "x/usr/${target}/lib" ] || - [ "x$libdir" = "x/usr/lib" ] || - _ldflags="-L$libdir" - - if [ -n "$MAC_FRAMEWORK" ]; then - wx_libs="-framework $MAC_FRAMEWORK" - if [ -n "$MAC_FRAMEWORK_PREFIX" ]; then - _ldflags="-F$MAC_FRAMEWORK_PREFIX" - else - _ldflags="" - fi - fi - - is_installed || [ -n "$flag_option_no_rpath" ] || _rpath="@WXCONFIG_RPATH@" - - echo $_ldflags "@WXCONFIG_LDFLAGS@" $_rpath $wx_libs "@DMALLOC_LIBS@" - -elif [ -n "$output_option_optional_libs" ]; then - # if only --optional-libs then output just the libs - - echo $wx_libs -fi - - -# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -# -# Beyond here reside only machine or tool specific workarounds -# that require knowlege not obtainable prior to this comment. -# -# Please. Avoid addding things here, wx-config should avoid -# hard coding tool specific details. Do not use things here -# as an example of other things that should be here, These -# shouldn't be here either. This is a place of last resort -# for interim workarounds. I can but stress as strongly as -# the censor will allow, there are only bad examples of things -# that belong at this level of abstraction to follow. It is -# a limbo for glitches awaiting the Next Design Repair. Ok. -# -# With that firmly in mind, our debut dilemma is: - -# Resource compilers. An elusive term that covers some pretty -# dissimilar concepts on various platforms. The good news is, -# each platform has only one definition of 'resource', compiled -# or not, and so we can abstract that neatly to return a platform -# specific invocation of the appropriate tool. The bad news is, -# windres (at least) requires knowledge of the wx header files -# location(s) that cannot be predicted reliably before the call to -# wx-config is made. Currently for all known resource compilers, -# we can simply return a command and some salient configuration -# options in response to a request for --rescomp. So here we -# top up the options for any tools that may require information -# that was only just determined in the last few machine cycles, -# then output the necessary incantation for the platform. -# -# Most things should already be constant by the time configure -# has run. Do not add anything here that is already known there. - -if [ -n "$output_option_rescomp" ]; then - - case "@RESCOMP@" in - *windres|wrc) - # Note that with late model windres, we could just insert - # _include_cppflags here, but use the old notation for now - # as it is more universally accepted. - if is_installed; then - echo "@RESCOMP@ --include-dir" \ - "${includedir}/wx-@WX_RELEASE@@WX_FLAVOUR@" \ - "@WXCONFIG_RESFLAGS@" - else - echo "@RESCOMP@ --include-dir ${includedir}" \ - "@WXCONFIG_RESFLAGS@" - fi - ;; - - # neither rez not emxbind have any specific needs from - # us, so just output what was determined by configure. - *) - echo @RESCOMP@ @WXCONFIG_RESFLAGS@ - ;; - esac - -fi - -# -# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - -# And so that's it, we're done. Have a nice build. - -exit 0 diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/config.bcc b/3rdparty/wxwidgets3.0-3.0.1/build/msw/config.bcc deleted file mode 100644 index b2307a8591..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/config.bcc +++ /dev/null @@ -1,222 +0,0 @@ -# ========================================================================= -# This configuration file was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) -# Beware that all changes made to this file will be overwritten next -# time you run Bakefile! -# ========================================================================= - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# C compiler -!ifndef CC -CC = bcc32 -!endif - -# C++ compiler -!ifndef CXX -CXX = bcc32 -!endif - -# Standard flags for CC -!ifndef CFLAGS -CFLAGS = -!endif - -# Standard flags for C++ -!ifndef CXXFLAGS -CXXFLAGS = -!endif - -# Standard preprocessor flags (common for CC and CXX) -!ifndef CPPFLAGS -CPPFLAGS = -a8 -g0 -!endif - -# Standard linker flags -!ifndef LDFLAGS -LDFLAGS = -!endif - -# The C preprocessor -!ifndef CPP -CPP = cpp32 -Sr -oCON -!endif - -# What type of library to build? [0,1] -!ifndef SHARED -SHARED = 0 -!endif - -# GTK+ toolkit version [,2] -!ifndef TOOLKIT_VERSION -TOOLKIT_VERSION = -!endif - -# Build wxUniversal instead of native port? [0,1] -!ifndef WXUNIV -WXUNIV = 0 -!endif - -# Compile Unicode build of wxWidgets? [0,1] -!ifndef UNICODE -UNICODE = 1 -!endif - -# Use MSLU library when building Unicode version. [0,1] -!ifndef MSLU -MSLU = 0 -!endif - -# Type of compiled binaries [debug,release] -!ifndef BUILD -BUILD = debug -!endif - -# Should debugging info be included in the executables? The default value -# "default" means that debug info will be included if BUILD=debug -# and not included if BUILD=release. [0,1,default] -!ifndef DEBUG_INFO -DEBUG_INFO = default -!endif - -# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all -# but expensive assert checks are enabled, use 0 to completely remove debugging -# code. [0,1,default] -!ifndef DEBUG_FLAG -DEBUG_FLAG = 1 -!endif - -# Multiple libraries or single huge monolithic one? [0,1] -!ifndef MONOLITHIC -MONOLITHIC = 0 -!endif - -# Build GUI libraries? [0,1] -!ifndef USE_GUI -USE_GUI = 1 -!endif - -# Build wxHTML library (USE_GUI must be 1)? [0,1] -!ifndef USE_HTML -USE_HTML = 1 -!endif - -# Build wxWebView library (USE_GUI must be 1)? [0,1] -!ifndef USE_WEBVIEW -USE_WEBVIEW = 1 -!endif - -# Build multimedia library (USE_GUI must be 1)? [0,1] -!ifndef USE_MEDIA -USE_MEDIA = 1 -!endif - -# Build wxXRC library (USE_GUI must be 1)? [0,1] -!ifndef USE_XRC -USE_XRC = 1 -!endif - -# Build wxAUI library (USE_GUI must be 1)? [0,1] -!ifndef USE_AUI -USE_AUI = 1 -!endif - -# Build wxRibbon library (USE_GUI must be 1)? [0,1] -!ifndef USE_RIBBON -USE_RIBBON = 1 -!endif - -# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] -!ifndef USE_PROPGRID -USE_PROPGRID = 1 -!endif - -# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] -!ifndef USE_RICHTEXT -USE_RICHTEXT = 1 -!endif - -# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] -!ifndef USE_STC -USE_STC = 1 -!endif - -# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] -!ifndef USE_OPENGL -USE_OPENGL = 1 -!endif - -# Build quality assurance classes library (USE_GUI must be 1)? [0,1] -!ifndef USE_QA -USE_QA = 0 -!endif - -# Enable exceptions in compiled code. [0,1] -!ifndef USE_EXCEPTIONS -USE_EXCEPTIONS = 1 -!endif - -# Enable run-time type information (RTTI) in compiled code. [0,1] -!ifndef USE_RTTI -USE_RTTI = 1 -!endif - -# Enable threading in compiled code. [0,1] -!ifndef USE_THREADS -USE_THREADS = 1 -!endif - -# Enable wxCairoContext for platforms other than Linux/GTK. [0,1] -!ifndef USE_CAIRO -USE_CAIRO = 0 -!endif - -# Is this official build by wxWidgets developers? [0,1] -!ifndef OFFICIAL_BUILD -OFFICIAL_BUILD = 0 -!endif - -# Use this to name your customized DLLs differently -!ifndef VENDOR -VENDOR = custom -!endif - -# -!ifndef WX_FLAVOUR -WX_FLAVOUR = -!endif - -# -!ifndef WX_LIB_FLAVOUR -WX_LIB_FLAVOUR = -!endif - -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -!ifndef CFG -CFG = -!endif - -# Compiler flags needed to compile test suite in tests directory. If you want -# to run the tests, set it so that the compiler can find CppUnit headers. -!ifndef CPPUNIT_CFLAGS -CPPUNIT_CFLAGS = -!endif - -# Linker flags needed to link test suite in tests directory. If you want -# to run the tests, include CppUnit library here. -!ifndef CPPUNIT_LIBS -CPPUNIT_LIBS = -!endif - -# Version of C runtime library to use. You can change this to -# static if SHARED=0, but it is highly recommended to not do -# it if SHARED=1 unless you know what you are doing. [dynamic,static] -!ifndef RUNTIME_LIBS -RUNTIME_LIBS = dynamic -!endif - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/config.gcc b/3rdparty/wxwidgets3.0-3.0.1/build/msw/config.gcc deleted file mode 100644 index f744f795d7..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/config.gcc +++ /dev/null @@ -1,157 +0,0 @@ -# ========================================================================= -# This configuration file was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) -# Beware that all changes made to this file will be overwritten next -# time you run Bakefile! -# ========================================================================= - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# Compiler flags to link shared library -LINK_DLL_FLAGS ?= -shared - -# Compiler flags to link loadable module -LINK_MODULE_FLAGS ?= -shared - -# C compiler -CC = gcc - -# C++ compiler -CXX = g++ - -# Standard flags for CC -CFLAGS ?= - -# Standard flags for C++ -CXXFLAGS ?= - -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS ?= - -# Standard linker flags -LDFLAGS ?= - -# The C preprocessor -CPP ?= $(CC) -E - -# What type of library to build? [0,1] -SHARED ?= 0 - -# GTK+ toolkit version [,2] -TOOLKIT_VERSION ?= - -# Build wxUniversal instead of native port? [0,1] -WXUNIV ?= 0 - -# Compile Unicode build of wxWidgets? [0,1] -UNICODE ?= 1 - -# Use MSLU library when building Unicode version. [0,1] -MSLU ?= 0 - -# Type of compiled binaries [debug,release] -BUILD ?= debug - -# Should debugging info be included in the executables? The default value -# "default" means that debug info will be included if BUILD=debug -# and not included if BUILD=release. [0,1,default] -DEBUG_INFO ?= default - -# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all -# but expensive assert checks are enabled, use 0 to completely remove debugging -# code. [0,1,default] -DEBUG_FLAG ?= 1 - -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC ?= 0 - -# Build GUI libraries? [0,1] -USE_GUI ?= 1 - -# Build wxHTML library (USE_GUI must be 1)? [0,1] -USE_HTML ?= 1 - -# Build wxWebView library (USE_GUI must be 1)? [0,1] -USE_WEBVIEW ?= 1 - -# Build multimedia library (USE_GUI must be 1)? [0,1] -USE_MEDIA ?= 1 - -# Build wxXRC library (USE_GUI must be 1)? [0,1] -USE_XRC ?= 1 - -# Build wxAUI library (USE_GUI must be 1)? [0,1] -USE_AUI ?= 1 - -# Build wxRibbon library (USE_GUI must be 1)? [0,1] -USE_RIBBON ?= 1 - -# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] -USE_PROPGRID ?= 1 - -# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] -USE_RICHTEXT ?= 1 - -# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] -USE_STC ?= 1 - -# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] -USE_OPENGL ?= 1 - -# Build quality assurance classes library (USE_GUI must be 1)? [0,1] -USE_QA ?= 0 - -# Enable exceptions in compiled code. [0,1] -USE_EXCEPTIONS ?= 1 - -# Enable run-time type information (RTTI) in compiled code. [0,1] -USE_RTTI ?= 1 - -# Enable threading in compiled code. [0,1] -USE_THREADS ?= 1 - -# Enable wxCairoContext for platforms other than Linux/GTK. [0,1] -USE_CAIRO ?= 0 - -# Is this official build by wxWidgets developers? [0,1] -OFFICIAL_BUILD ?= 0 - -# Use this to name your customized DLLs differently -VENDOR ?= custom - -# -WX_FLAVOUR ?= - -# -WX_LIB_FLAVOUR ?= - -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG ?= - -# Compiler flags needed to compile test suite in tests directory. If you want -# to run the tests, set it so that the compiler can find CppUnit headers. -CPPUNIT_CFLAGS ?= - -# Linker flags needed to link test suite in tests directory. If you want -# to run the tests, include CppUnit library here. -CPPUNIT_LIBS ?= - -# Version of C runtime library to use. You can change this to -# static if SHARED=0, but it is highly recommended to not do -# it if SHARED=1 unless you know what you are doing. [dynamic,static] -RUNTIME_LIBS ?= dynamic - -# Set the version of your Mingw installation here. -# "3" ...... this is for Mingw 2.0 or newer (comes with gcc3) -# "2.95" ... for Mingw 1.1 or any of the older versions [3,2.95] -GCC_VERSION ?= 3 - -# Windows resource compiler to use, possibly including extra options. -# For example, add "-F pe-i386" here if using 64 bit windres for 32 bit build. -WINDRES ?= windres --use-temp-file - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/config.vc b/3rdparty/wxwidgets3.0-3.0.1/build/msw/config.vc deleted file mode 100644 index c254e8e0d4..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/config.vc +++ /dev/null @@ -1,156 +0,0 @@ -# ========================================================================= -# This configuration file was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) -# Beware that all changes made to this file will be overwritten next -# time you run Bakefile! -# ========================================================================= - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# C compiler -CC = cl - -# C++ compiler -CXX = cl - -# Standard flags for CC -CFLAGS = - -# Standard flags for C++ -CXXFLAGS = - -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = - -# Standard linker flags -LDFLAGS = - -# The C preprocessor -CPP = $(CC) /EP /nologo - -# What type of library to build? [0,1] -SHARED = 0 - -# GTK+ toolkit version [,2] -TOOLKIT_VERSION = - -# Build wxUniversal instead of native port? [0,1] -WXUNIV = 0 - -# Compile Unicode build of wxWidgets? [0,1] -UNICODE = 1 - -# Use MSLU library when building Unicode version. [0,1] -MSLU = 0 - -# Type of compiled binaries [debug,release] -BUILD = debug - -# The target processor architecture must be specified when it is not X86. -# This does not affect the compiler output, so you still need to make sure -# your environment is set up appropriately with the correct compiler in the -# PATH. Rather it affects some options passed to some of the common build -# utilities such as the resource compiler and the linker. -# -# Accepted values: IA64, X64 -# (AMD64 accepted as synonym for X64 but should not be used any more). -TARGET_CPU = $(CPU) - -# Should debugging info be included in the executables? The default value -# "default" means that debug info will be included if BUILD=debug -# and not included if BUILD=release. [0,1,default] -DEBUG_INFO = 1 - -# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all -# but expensive assert checks are enabled, use 0 to completely remove debugging -# code. [0,1,default] -DEBUG_FLAG = 1 - -# Link against debug (e.g. msvcrtd.dll) or release (msvcrt.dll) RTL? -# Default is to use debug CRT if and only if BUILD==debug. [0,1,default] -DEBUG_RUNTIME_LIBS = default - -# Multiple libraries or single huge monolithic one? [0,1] -MONOLITHIC = 0 - -# Build GUI libraries? [0,1] -USE_GUI = 1 - -# Build wxHTML library (USE_GUI must be 1)? [0,1] -USE_HTML = 1 - -# Build wxWebView library (USE_GUI must be 1)? [0,1] -USE_WEBVIEW = 1 - -# Build multimedia library (USE_GUI must be 1)? [0,1] -USE_MEDIA = 1 - -# Build wxXRC library (USE_GUI must be 1)? [0,1] -USE_XRC = 1 - -# Build wxAUI library (USE_GUI must be 1)? [0,1] -USE_AUI = 1 - -# Build wxRibbon library (USE_GUI must be 1)? [0,1] -USE_RIBBON = 1 - -# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] -USE_PROPGRID = 1 - -# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] -USE_RICHTEXT = 1 - -# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] -USE_STC = 1 - -# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] -USE_OPENGL = 1 - -# Build quality assurance classes library (USE_GUI must be 1)? [0,1] -USE_QA = 1 - -# Enable exceptions in compiled code. [0,1] -USE_EXCEPTIONS = 1 - -# Enable run-time type information (RTTI) in compiled code. [0,1] -USE_RTTI = 1 - -# Enable threading in compiled code. [0,1] -USE_THREADS = 1 - -# Enable wxCairoContext for platforms other than Linux/GTK. [0,1] -USE_CAIRO = 0 - -# Is this official build by wxWidgets developers? [0,1] -OFFICIAL_BUILD = 0 - -# Use this to name your customized DLLs differently -VENDOR = custom - -# -WX_FLAVOUR = - -# -WX_LIB_FLAVOUR = - -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = - -# Compiler flags needed to compile test suite in tests directory. If you want -# to run the tests, set it so that the compiler can find CppUnit headers. -CPPUNIT_CFLAGS = - -# Linker flags needed to link test suite in tests directory. If you want -# to run the tests, include CppUnit library here. -CPPUNIT_LIBS = - -# Version of C runtime library to use. You can change this to -# static if SHARED=0, but it is highly recommended to not do -# it if SHARED=1 unless you know what you are doing. [dynamic,static] -RUNTIME_LIBS = dynamic - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/config.wat b/3rdparty/wxwidgets3.0-3.0.1/build/msw/config.wat deleted file mode 100644 index 95493b4a85..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/config.wat +++ /dev/null @@ -1,146 +0,0 @@ -# ========================================================================= -# This configuration file was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) -# Beware that all changes made to this file will be overwritten next -# time you run Bakefile! -# ========================================================================= - - -# ------------------------------------------------------------------------- -# These are configurable options: -# ------------------------------------------------------------------------- - -# C compiler -CC = wcc386 - -# C++ compiler -CXX = wpp386 - -# Standard flags for CC -CFLAGS = - -# Standard flags for C++ -CXXFLAGS = - -# Standard preprocessor flags (common for CC and CXX) -CPPFLAGS = - -# Standard linker flags -LDFLAGS = - -# The C preprocessor -CPP = $(CC) -p - -# What type of library to build? [0,1] -# 1 - DLL -SHARED = 0 - -# GTK+ toolkit version [,2] -TOOLKIT_VERSION = - -# Build wxUniversal instead of native port? [0,1] -# 1 - Universal -WXUNIV = 0 - -# Compile Unicode build of wxWidgets? [0,1] -# 1 - Unicode -UNICODE = 1 - -# Type of compiled binaries [debug,release] -BUILD = debug - -# Should debugging info be included in the executables? The default value -# "default" means that debug info will be included if BUILD=debug -# and not included if BUILD=release. [0,1,default] -DEBUG_INFO = default - -# Value of wxDEBUG_LEVEL. The default value is the same as 1 and means that all -# but expensive assert checks are enabled, use 0 to completely remove debugging -# code. [0,1,default] -DEBUG_FLAG = 1 - -# Multiple libraries or single huge monolithic one? [0,1] -# 0 - Multilib -# 1 - Monolithic -MONOLITHIC = 1 - -# Build GUI libraries? [0,1] -# 0 - Base -# 1 - GUI -USE_GUI = 1 - -# Build wxHTML library (USE_GUI must be 1)? [0,1] -USE_HTML = 1 - -# Build wxWebView library (USE_GUI must be 1)? [0,1] -USE_WEBVIEW = 1 - -# Build multimedia library (USE_GUI must be 1)? [0,1] -USE_MEDIA = 1 - -# Build wxXRC library (USE_GUI must be 1)? [0,1] -USE_XRC = 1 - -# Build wxAUI library (USE_GUI must be 1)? [0,1] -USE_AUI = 1 - -# Build wxRibbon library (USE_GUI must be 1)? [0,1] -USE_RIBBON = 1 - -# Build wxPropertyGrid library (USE_GUI must be 1)? [0,1] -USE_PROPGRID = 1 - -# Build wxRichTextCtrl library (USE_GUI must be 1)? [0,1] -USE_RICHTEXT = 1 - -# Build wxStyledTextCtrl library (USE_GUI must be 1)? [0,1] -USE_STC = 1 - -# Build OpenGL canvas library (USE_GUI must be 1)? [0,1] -USE_OPENGL = 1 - -# Build quality assurance classes library (USE_GUI must be 1)? [0,1] -USE_QA = 0 - -# Enable exceptions in compiled code. [0,1] -USE_EXCEPTIONS = 1 - -# Enable run-time type information (RTTI) in compiled code. [0,1] -USE_RTTI = 1 - -# Enable threading in compiled code. [0,1] -USE_THREADS = 1 - -# Enable wxCairoContext for platforms other than Linux/GTK. [0,1] -USE_CAIRO = 0 - -# Is this official build by wxWidgets developers? [0,1] -OFFICIAL_BUILD = 0 - -# Use this to name your customized DLLs differently -VENDOR = custom - -# -WX_FLAVOUR = - -# -WX_LIB_FLAVOUR = - -# Name of your custom configuration. This affects directory -# where object files are stored as well as the location of -# compiled .lib files and setup.h under the lib/ toplevel directory. -CFG = - -# Compiler flags needed to compile test suite in tests directory. If you want -# to run the tests, set it so that the compiler can find CppUnit headers. -CPPUNIT_CFLAGS = - -# Linker flags needed to link test suite in tests directory. If you want -# to run the tests, include CppUnit library here. -CPPUNIT_LIBS = - -# Version of C runtime library to use. You can change this to -# static if SHARED=0, but it is highly recommended to not do -# it if SHARED=1 unless you know what you are doing. [dynamic,static] -RUNTIME_LIBS = dynamic - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/makefile.bcc b/3rdparty/wxwidgets3.0-3.0.1/build/msw/makefile.bcc deleted file mode 100644 index 7205b12f0d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/makefile.bcc +++ /dev/null @@ -1,16139 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -.autodepend - -!ifndef BCCDIR -!ifndef MAKEDIR -!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4 -!endif -BCCDIR = $(MAKEDIR)\.. -!endif - -!include config.bcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ - -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \ - -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DTOOLKIT_VERSION="$(TOOLKIT_VERSION)" \ - -DWXUNIV="$(WXUNIV)" -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" \ - -DBUILD="$(BUILD)" -DDEBUG_INFO="$(DEBUG_INFO)" \ - -DDEBUG_FLAG="$(DEBUG_FLAG)" -DMONOLITHIC="$(MONOLITHIC)" \ - -DUSE_GUI="$(USE_GUI)" -DUSE_HTML="$(USE_HTML)" \ - -DUSE_WEBVIEW="$(USE_WEBVIEW)" -DUSE_MEDIA="$(USE_MEDIA)" \ - -DUSE_XRC="$(USE_XRC)" -DUSE_AUI="$(USE_AUI)" -DUSE_RIBBON="$(USE_RIBBON)" \ - -DUSE_PROPGRID="$(USE_PROPGRID)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \ - -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \ - -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \ - -DUSE_THREADS="$(USE_THREADS)" -DUSE_CAIRO="$(USE_CAIRO)" \ - -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \ - -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \ - -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \ - -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" -WX_RELEASE_NODOT = 30 -COMPILER_PREFIX = bcc -OBJS = \ - $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = \ - ..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXREGEX_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG -I..\..\include -I$(SETUPHDIR) \ - -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__UNICODE_DEFINE_p) -w-8008 -w-8012 \ - -w-8057 -w-8064 -w-8066 -w-8070 $(CPPFLAGS) $(CFLAGS) -WXREGEX_OBJECTS = \ - $(OBJS)\wxregex_regcomp.obj \ - $(OBJS)\wxregex_regexec.obj \ - $(OBJS)\wxregex_regerror.obj \ - $(OBJS)\wxregex_regfree.obj -WXZLIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG -w-8004 -w-8008 -w-8012 -w-8057 \ - -w-8066 $(CPPFLAGS) $(CFLAGS) -WXZLIB_OBJECTS = \ - $(OBJS)\wxzlib_adler32.obj \ - $(OBJS)\wxzlib_compress.obj \ - $(OBJS)\wxzlib_crc32.obj \ - $(OBJS)\wxzlib_deflate.obj \ - $(OBJS)\wxzlib_gzclose.obj \ - $(OBJS)\wxzlib_gzlib.obj \ - $(OBJS)\wxzlib_gzread.obj \ - $(OBJS)\wxzlib_gzwrite.obj \ - $(OBJS)\wxzlib_infback.obj \ - $(OBJS)\wxzlib_inffast.obj \ - $(OBJS)\wxzlib_inflate.obj \ - $(OBJS)\wxzlib_inftrees.obj \ - $(OBJS)\wxzlib_trees.obj \ - $(OBJS)\wxzlib_uncompr.obj \ - $(OBJS)\wxzlib_zutil.obj -WXPNG_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG -I..\..\src\zlib -w-8004 \ - $(CPPFLAGS) $(CFLAGS) -WXPNG_OBJECTS = \ - $(OBJS)\wxpng_png.obj \ - $(OBJS)\wxpng_pngerror.obj \ - $(OBJS)\wxpng_pngget.obj \ - $(OBJS)\wxpng_pngmem.obj \ - $(OBJS)\wxpng_pngpread.obj \ - $(OBJS)\wxpng_pngread.obj \ - $(OBJS)\wxpng_pngrio.obj \ - $(OBJS)\wxpng_pngrtran.obj \ - $(OBJS)\wxpng_pngrutil.obj \ - $(OBJS)\wxpng_pngset.obj \ - $(OBJS)\wxpng_pngtrans.obj \ - $(OBJS)\wxpng_pngwio.obj \ - $(OBJS)\wxpng_pngwrite.obj \ - $(OBJS)\wxpng_pngwtran.obj \ - $(OBJS)\wxpng_pngwutil.obj -WXJPEG_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG -I$(SETUPHDIR) -w-8004 -w-8008 \ - -w-8057 -w-8066 $(CPPFLAGS) $(CFLAGS) -WXJPEG_OBJECTS = \ - $(OBJS)\wxjpeg_jcomapi.obj \ - $(OBJS)\wxjpeg_jutils.obj \ - $(OBJS)\wxjpeg_jerror.obj \ - $(OBJS)\wxjpeg_jmemmgr.obj \ - $(OBJS)\wxjpeg_jmemnobs.obj \ - $(OBJS)\wxjpeg_jcapimin.obj \ - $(OBJS)\wxjpeg_jcapistd.obj \ - $(OBJS)\wxjpeg_jctrans.obj \ - $(OBJS)\wxjpeg_jcparam.obj \ - $(OBJS)\wxjpeg_jdatadst.obj \ - $(OBJS)\wxjpeg_jcinit.obj \ - $(OBJS)\wxjpeg_jcmaster.obj \ - $(OBJS)\wxjpeg_jcmarker.obj \ - $(OBJS)\wxjpeg_jcmainct.obj \ - $(OBJS)\wxjpeg_jcprepct.obj \ - $(OBJS)\wxjpeg_jccoefct.obj \ - $(OBJS)\wxjpeg_jccolor.obj \ - $(OBJS)\wxjpeg_jcsample.obj \ - $(OBJS)\wxjpeg_jchuff.obj \ - $(OBJS)\wxjpeg_jcphuff.obj \ - $(OBJS)\wxjpeg_jcdctmgr.obj \ - $(OBJS)\wxjpeg_jfdctfst.obj \ - $(OBJS)\wxjpeg_jfdctflt.obj \ - $(OBJS)\wxjpeg_jfdctint.obj \ - $(OBJS)\wxjpeg_jdapimin.obj \ - $(OBJS)\wxjpeg_jdapistd.obj \ - $(OBJS)\wxjpeg_jdtrans.obj \ - $(OBJS)\wxjpeg_jdatasrc.obj \ - $(OBJS)\wxjpeg_jdmaster.obj \ - $(OBJS)\wxjpeg_jdinput.obj \ - $(OBJS)\wxjpeg_jdmarker.obj \ - $(OBJS)\wxjpeg_jdhuff.obj \ - $(OBJS)\wxjpeg_jdphuff.obj \ - $(OBJS)\wxjpeg_jdmainct.obj \ - $(OBJS)\wxjpeg_jdcoefct.obj \ - $(OBJS)\wxjpeg_jdpostct.obj \ - $(OBJS)\wxjpeg_jddctmgr.obj \ - $(OBJS)\wxjpeg_jidctfst.obj \ - $(OBJS)\wxjpeg_jidctflt.obj \ - $(OBJS)\wxjpeg_jidctint.obj \ - $(OBJS)\wxjpeg_jidctred.obj \ - $(OBJS)\wxjpeg_jdsample.obj \ - $(OBJS)\wxjpeg_jdcolor.obj \ - $(OBJS)\wxjpeg_jquant1.obj \ - $(OBJS)\wxjpeg_jquant2.obj \ - $(OBJS)\wxjpeg_jdmerge.obj -WXTIFF_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG -I..\..\src\zlib \ - -I..\..\src\jpeg -I..\..\src\tiff\libtiff -w-8004 -w-8012 -w-8057 -w-8060 \ - -w-8066 $(CPPFLAGS) $(CFLAGS) -WXTIFF_OBJECTS = \ - $(OBJS)\wxtiff_tif_win32.obj \ - $(OBJS)\wxtiff_tif_aux.obj \ - $(OBJS)\wxtiff_tif_close.obj \ - $(OBJS)\wxtiff_tif_codec.obj \ - $(OBJS)\wxtiff_tif_color.obj \ - $(OBJS)\wxtiff_tif_compress.obj \ - $(OBJS)\wxtiff_tif_dir.obj \ - $(OBJS)\wxtiff_tif_dirinfo.obj \ - $(OBJS)\wxtiff_tif_dirread.obj \ - $(OBJS)\wxtiff_tif_dirwrite.obj \ - $(OBJS)\wxtiff_tif_dumpmode.obj \ - $(OBJS)\wxtiff_tif_error.obj \ - $(OBJS)\wxtiff_tif_extension.obj \ - $(OBJS)\wxtiff_tif_fax3.obj \ - $(OBJS)\wxtiff_tif_fax3sm.obj \ - $(OBJS)\wxtiff_tif_flush.obj \ - $(OBJS)\wxtiff_tif_getimage.obj \ - $(OBJS)\wxtiff_tif_jbig.obj \ - $(OBJS)\wxtiff_tif_jpeg.obj \ - $(OBJS)\wxtiff_tif_jpeg_12.obj \ - $(OBJS)\wxtiff_tif_luv.obj \ - $(OBJS)\wxtiff_tif_lzma.obj \ - $(OBJS)\wxtiff_tif_lzw.obj \ - $(OBJS)\wxtiff_tif_next.obj \ - $(OBJS)\wxtiff_tif_ojpeg.obj \ - $(OBJS)\wxtiff_tif_open.obj \ - $(OBJS)\wxtiff_tif_packbits.obj \ - $(OBJS)\wxtiff_tif_pixarlog.obj \ - $(OBJS)\wxtiff_tif_predict.obj \ - $(OBJS)\wxtiff_tif_print.obj \ - $(OBJS)\wxtiff_tif_read.obj \ - $(OBJS)\wxtiff_tif_strip.obj \ - $(OBJS)\wxtiff_tif_swab.obj \ - $(OBJS)\wxtiff_tif_thunder.obj \ - $(OBJS)\wxtiff_tif_tile.obj \ - $(OBJS)\wxtiff_tif_version.obj \ - $(OBJS)\wxtiff_tif_warning.obj \ - $(OBJS)\wxtiff_tif_write.obj \ - $(OBJS)\wxtiff_tif_zip.obj -WXEXPAT_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG -I$(LIBDIRNAME) \ - -DCOMPILED_FROM_DSP -w-8004 -w-8008 -w-8012 -w-8057 -w-8066 $(CPPFLAGS) \ - $(CFLAGS) -WXEXPAT_OBJECTS = \ - $(OBJS)\wxexpat_xmlparse.obj \ - $(OBJS)\wxexpat_xmlrole.obj \ - $(OBJS)\wxexpat_xmltok.obj -WXSCINTILLA_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -DNDEBUG \ - -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\lexlib \ - -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS -w-8027 \ - -I$(SETUPHDIR) -I..\..\include $(__wxscintilla_usingdll_p) -D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) $(CPPFLAGS) \ - $(CXXFLAGS) -WXSCINTILLA_OBJECTS = \ - $(OBJS)\wxscintilla_LexA68k.obj \ - $(OBJS)\wxscintilla_LexAbaqus.obj \ - $(OBJS)\wxscintilla_LexAda.obj \ - $(OBJS)\wxscintilla_LexAPDL.obj \ - $(OBJS)\wxscintilla_LexAsm.obj \ - $(OBJS)\wxscintilla_LexAsn1.obj \ - $(OBJS)\wxscintilla_LexASY.obj \ - $(OBJS)\wxscintilla_LexAU3.obj \ - $(OBJS)\wxscintilla_LexAVE.obj \ - $(OBJS)\wxscintilla_LexAVS.obj \ - $(OBJS)\wxscintilla_LexBaan.obj \ - $(OBJS)\wxscintilla_LexBash.obj \ - $(OBJS)\wxscintilla_LexBasic.obj \ - $(OBJS)\wxscintilla_LexBullant.obj \ - $(OBJS)\wxscintilla_LexCaml.obj \ - $(OBJS)\wxscintilla_LexCLW.obj \ - $(OBJS)\wxscintilla_LexCmake.obj \ - $(OBJS)\wxscintilla_LexCOBOL.obj \ - $(OBJS)\wxscintilla_LexCoffeeScript.obj \ - $(OBJS)\wxscintilla_LexConf.obj \ - $(OBJS)\wxscintilla_LexCPP.obj \ - $(OBJS)\wxscintilla_LexCrontab.obj \ - $(OBJS)\wxscintilla_LexCsound.obj \ - $(OBJS)\wxscintilla_LexCSS.obj \ - $(OBJS)\wxscintilla_LexD.obj \ - $(OBJS)\wxscintilla_LexECL.obj \ - $(OBJS)\wxscintilla_LexEiffel.obj \ - $(OBJS)\wxscintilla_LexErlang.obj \ - $(OBJS)\wxscintilla_LexEScript.obj \ - $(OBJS)\wxscintilla_LexFlagship.obj \ - $(OBJS)\wxscintilla_LexForth.obj \ - $(OBJS)\wxscintilla_LexFortran.obj \ - $(OBJS)\wxscintilla_LexGAP.obj \ - $(OBJS)\wxscintilla_LexGui4Cli.obj \ - $(OBJS)\wxscintilla_LexHaskell.obj \ - $(OBJS)\wxscintilla_LexHTML.obj \ - $(OBJS)\wxscintilla_LexInno.obj \ - $(OBJS)\wxscintilla_LexKix.obj \ - $(OBJS)\wxscintilla_LexLisp.obj \ - $(OBJS)\wxscintilla_LexLout.obj \ - $(OBJS)\wxscintilla_LexLua.obj \ - $(OBJS)\wxscintilla_LexMagik.obj \ - $(OBJS)\wxscintilla_LexMarkdown.obj \ - $(OBJS)\wxscintilla_LexMatlab.obj \ - $(OBJS)\wxscintilla_LexMetapost.obj \ - $(OBJS)\wxscintilla_LexMMIXAL.obj \ - $(OBJS)\wxscintilla_LexModula.obj \ - $(OBJS)\wxscintilla_LexMPT.obj \ - $(OBJS)\wxscintilla_LexMSSQL.obj \ - $(OBJS)\wxscintilla_LexMySQL.obj \ - $(OBJS)\wxscintilla_LexNimrod.obj \ - $(OBJS)\wxscintilla_LexNsis.obj \ - $(OBJS)\wxscintilla_LexOpal.obj \ - $(OBJS)\wxscintilla_LexOScript.obj \ - $(OBJS)\wxscintilla_LexOthers.obj \ - $(OBJS)\wxscintilla_LexPascal.obj \ - $(OBJS)\wxscintilla_LexPB.obj \ - $(OBJS)\wxscintilla_LexPerl.obj \ - $(OBJS)\wxscintilla_LexPLM.obj \ - $(OBJS)\wxscintilla_LexPOV.obj \ - $(OBJS)\wxscintilla_LexPowerPro.obj \ - $(OBJS)\wxscintilla_LexPowerShell.obj \ - $(OBJS)\wxscintilla_LexProgress.obj \ - $(OBJS)\wxscintilla_LexPS.obj \ - $(OBJS)\wxscintilla_LexPython.obj \ - $(OBJS)\wxscintilla_LexR.obj \ - $(OBJS)\wxscintilla_LexRebol.obj \ - $(OBJS)\wxscintilla_LexRuby.obj \ - $(OBJS)\wxscintilla_LexScriptol.obj \ - $(OBJS)\wxscintilla_LexSmalltalk.obj \ - $(OBJS)\wxscintilla_LexSML.obj \ - $(OBJS)\wxscintilla_LexSorcus.obj \ - $(OBJS)\wxscintilla_LexSpecman.obj \ - $(OBJS)\wxscintilla_LexSpice.obj \ - $(OBJS)\wxscintilla_LexSQL.obj \ - $(OBJS)\wxscintilla_LexTACL.obj \ - $(OBJS)\wxscintilla_LexTADS3.obj \ - $(OBJS)\wxscintilla_LexTAL.obj \ - $(OBJS)\wxscintilla_LexTCL.obj \ - $(OBJS)\wxscintilla_LexTCMD.obj \ - $(OBJS)\wxscintilla_LexTeX.obj \ - $(OBJS)\wxscintilla_LexTxt2tags.obj \ - $(OBJS)\wxscintilla_LexVB.obj \ - $(OBJS)\wxscintilla_LexVerilog.obj \ - $(OBJS)\wxscintilla_LexVHDL.obj \ - $(OBJS)\wxscintilla_LexVisualProlog.obj \ - $(OBJS)\wxscintilla_LexYAML.obj \ - $(OBJS)\wxscintilla_Accessor.obj \ - $(OBJS)\wxscintilla_CharacterSet.obj \ - $(OBJS)\wxscintilla_LexerBase.obj \ - $(OBJS)\wxscintilla_LexerModule.obj \ - $(OBJS)\wxscintilla_LexerNoExceptions.obj \ - $(OBJS)\wxscintilla_LexerSimple.obj \ - $(OBJS)\wxscintilla_PropSetSimple.obj \ - $(OBJS)\wxscintilla_StyleContext.obj \ - $(OBJS)\wxscintilla_WordList.obj \ - $(OBJS)\wxscintilla_AutoComplete.obj \ - $(OBJS)\wxscintilla_CallTip.obj \ - $(OBJS)\wxscintilla_Catalogue.obj \ - $(OBJS)\wxscintilla_CellBuffer.obj \ - $(OBJS)\wxscintilla_CharClassify.obj \ - $(OBJS)\wxscintilla_ContractionState.obj \ - $(OBJS)\wxscintilla_Decoration.obj \ - $(OBJS)\wxscintilla_Document.obj \ - $(OBJS)\wxscintilla_Editor.obj \ - $(OBJS)\wxscintilla_ExternalLexer.obj \ - $(OBJS)\wxscintilla_Indicator.obj \ - $(OBJS)\wxscintilla_KeyMap.obj \ - $(OBJS)\wxscintilla_LineMarker.obj \ - $(OBJS)\wxscintilla_PerLine.obj \ - $(OBJS)\wxscintilla_PositionCache.obj \ - $(OBJS)\wxscintilla_RESearch.obj \ - $(OBJS)\wxscintilla_RunStyles.obj \ - $(OBJS)\wxscintilla_ScintillaBase.obj \ - $(OBJS)\wxscintilla_Selection.obj \ - $(OBJS)\wxscintilla_Style.obj \ - $(OBJS)\wxscintilla_UniConversion.obj \ - $(OBJS)\wxscintilla_ViewStyle.obj \ - $(OBJS)\wxscintilla_XPM.obj -MONODLL_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -I..\..\src\stc\scintilla\include \ - -I..\..\src\stc\scintilla\lexlib -I..\..\src\stc\scintilla\src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS -w-8027 -DwxUSE_BASE=1 -DWXMAKINGDLL $(CPPFLAGS) \ - $(CFLAGS) -MONODLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -I..\..\src\stc\scintilla\include \ - -I..\..\src\stc\scintilla\lexlib -I..\..\src\stc\scintilla\src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS -w-8027 -DwxUSE_BASE=1 -DWXMAKINGDLL -Hu \ - -H=$(OBJS)\wxprec_monodll.csm $(CPPFLAGS) $(CXXFLAGS) -MONODLL_OBJECTS = \ - $(OBJS)\monodll_dummy.obj \ - $(OBJS)\monodll_any.obj \ - $(OBJS)\monodll_appbase.obj \ - $(OBJS)\monodll_arcall.obj \ - $(OBJS)\monodll_arcfind.obj \ - $(OBJS)\monodll_archive.obj \ - $(OBJS)\monodll_arrstr.obj \ - $(OBJS)\monodll_base64.obj \ - $(OBJS)\monodll_clntdata.obj \ - $(OBJS)\monodll_cmdline.obj \ - $(OBJS)\monodll_config.obj \ - $(OBJS)\monodll_convauto.obj \ - $(OBJS)\monodll_datetime.obj \ - $(OBJS)\monodll_datetimefmt.obj \ - $(OBJS)\monodll_datstrm.obj \ - $(OBJS)\monodll_dircmn.obj \ - $(OBJS)\monodll_dynarray.obj \ - $(OBJS)\monodll_dynlib.obj \ - $(OBJS)\monodll_dynload.obj \ - $(OBJS)\monodll_encconv.obj \ - $(OBJS)\monodll_evtloopcmn.obj \ - $(OBJS)\monodll_extended.obj \ - $(OBJS)\monodll_ffile.obj \ - $(OBJS)\monodll_file.obj \ - $(OBJS)\monodll_fileback.obj \ - $(OBJS)\monodll_fileconf.obj \ - $(OBJS)\monodll_filefn.obj \ - $(OBJS)\monodll_filename.obj \ - $(OBJS)\monodll_filesys.obj \ - $(OBJS)\monodll_filtall.obj \ - $(OBJS)\monodll_filtfind.obj \ - $(OBJS)\monodll_fmapbase.obj \ - $(OBJS)\monodll_fs_arc.obj \ - $(OBJS)\monodll_fs_filter.obj \ - $(OBJS)\monodll_hash.obj \ - $(OBJS)\monodll_hashmap.obj \ - $(OBJS)\monodll_init.obj \ - $(OBJS)\monodll_intl.obj \ - $(OBJS)\monodll_ipcbase.obj \ - $(OBJS)\monodll_languageinfo.obj \ - $(OBJS)\monodll_list.obj \ - $(OBJS)\monodll_log.obj \ - $(OBJS)\monodll_longlong.obj \ - $(OBJS)\monodll_memory.obj \ - $(OBJS)\monodll_mimecmn.obj \ - $(OBJS)\monodll_module.obj \ - $(OBJS)\monodll_mstream.obj \ - $(OBJS)\monodll_numformatter.obj \ - $(OBJS)\monodll_object.obj \ - $(OBJS)\monodll_platinfo.obj \ - $(OBJS)\monodll_powercmn.obj \ - $(OBJS)\monodll_process.obj \ - $(OBJS)\monodll_regex.obj \ - $(OBJS)\monodll_stdpbase.obj \ - $(OBJS)\monodll_sstream.obj \ - $(OBJS)\monodll_stdstream.obj \ - $(OBJS)\monodll_stopwatch.obj \ - $(OBJS)\monodll_strconv.obj \ - $(OBJS)\monodll_stream.obj \ - $(OBJS)\monodll_string.obj \ - $(OBJS)\monodll_stringimpl.obj \ - $(OBJS)\monodll_stringops.obj \ - $(OBJS)\monodll_strvararg.obj \ - $(OBJS)\monodll_sysopt.obj \ - $(OBJS)\monodll_tarstrm.obj \ - $(OBJS)\monodll_textbuf.obj \ - $(OBJS)\monodll_textfile.obj \ - $(OBJS)\monodll_threadinfo.obj \ - $(OBJS)\monodll_time.obj \ - $(OBJS)\monodll_timercmn.obj \ - $(OBJS)\monodll_timerimpl.obj \ - $(OBJS)\monodll_tokenzr.obj \ - $(OBJS)\monodll_translation.obj \ - $(OBJS)\monodll_txtstrm.obj \ - $(OBJS)\monodll_unichar.obj \ - $(OBJS)\monodll_uri.obj \ - $(OBJS)\monodll_ustring.obj \ - $(OBJS)\monodll_variant.obj \ - $(OBJS)\monodll_wfstream.obj \ - $(OBJS)\monodll_wxcrt.obj \ - $(OBJS)\monodll_wxprintf.obj \ - $(OBJS)\monodll_xlocale.obj \ - $(OBJS)\monodll_xti.obj \ - $(OBJS)\monodll_xtistrm.obj \ - $(OBJS)\monodll_zipstrm.obj \ - $(OBJS)\monodll_zstream.obj \ - $(OBJS)\monodll_fswatchercmn.obj \ - $(OBJS)\monodll_fswatcherg.obj \ - $(OBJS)\monodll_basemsw.obj \ - $(OBJS)\monodll_crashrpt.obj \ - $(OBJS)\monodll_debughlp.obj \ - $(OBJS)\monodll_dde.obj \ - $(OBJS)\monodll_dir.obj \ - $(OBJS)\monodll_dlmsw.obj \ - $(OBJS)\monodll_evtloopconsole.obj \ - $(OBJS)\monodll_mimetype.obj \ - $(OBJS)\monodll_power.obj \ - $(OBJS)\monodll_regconf.obj \ - $(OBJS)\monodll_registry.obj \ - $(OBJS)\monodll_snglinst.obj \ - $(OBJS)\monodll_stackwalk.obj \ - $(OBJS)\monodll_stdpaths.obj \ - $(OBJS)\monodll_thread.obj \ - $(OBJS)\monodll_timer.obj \ - $(OBJS)\monodll_utils.obj \ - $(OBJS)\monodll_utilsexc.obj \ - $(OBJS)\monodll_fswatcher.obj \ - $(OBJS)\monodll_event.obj \ - $(OBJS)\monodll_fs_mem.obj \ - $(OBJS)\monodll_msgout.obj \ - $(OBJS)\monodll_utilscmn.obj \ - $(OBJS)\monodll_main.obj \ - $(OBJS)\monodll_mslu.obj \ - $(OBJS)\monodll_volume.obj \ - $(OBJS)\monodll_fs_inet.obj \ - $(OBJS)\monodll_ftp.obj \ - $(OBJS)\monodll_http.obj \ - $(OBJS)\monodll_protocol.obj \ - $(OBJS)\monodll_sckaddr.obj \ - $(OBJS)\monodll_sckfile.obj \ - $(OBJS)\monodll_sckipc.obj \ - $(OBJS)\monodll_sckstrm.obj \ - $(OBJS)\monodll_socket.obj \ - $(OBJS)\monodll_url.obj \ - $(OBJS)\monodll_sockmsw.obj \ - $(OBJS)\monodll_urlmsw.obj \ - $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \ - $(OBJS)\monodll_xml.obj \ - $(OBJS)\monodll_xtixml.obj -MONOLIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -I..\..\src\stc\scintilla\include \ - -I..\..\src\stc\scintilla\lexlib -I..\..\src\stc\scintilla\src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS -w-8027 -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) -MONOLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -I..\..\src\stc\scintilla\include \ - -I..\..\src\stc\scintilla\lexlib -I..\..\src\stc\scintilla\src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS -w-8027 -DwxUSE_BASE=1 -Hu \ - -H=$(OBJS)\wxprec_monolib.csm $(CPPFLAGS) $(CXXFLAGS) -MONOLIB_OBJECTS = \ - $(OBJS)\monolib_dummy.obj \ - $(OBJS)\monolib_any.obj \ - $(OBJS)\monolib_appbase.obj \ - $(OBJS)\monolib_arcall.obj \ - $(OBJS)\monolib_arcfind.obj \ - $(OBJS)\monolib_archive.obj \ - $(OBJS)\monolib_arrstr.obj \ - $(OBJS)\monolib_base64.obj \ - $(OBJS)\monolib_clntdata.obj \ - $(OBJS)\monolib_cmdline.obj \ - $(OBJS)\monolib_config.obj \ - $(OBJS)\monolib_convauto.obj \ - $(OBJS)\monolib_datetime.obj \ - $(OBJS)\monolib_datetimefmt.obj \ - $(OBJS)\monolib_datstrm.obj \ - $(OBJS)\monolib_dircmn.obj \ - $(OBJS)\monolib_dynarray.obj \ - $(OBJS)\monolib_dynlib.obj \ - $(OBJS)\monolib_dynload.obj \ - $(OBJS)\monolib_encconv.obj \ - $(OBJS)\monolib_evtloopcmn.obj \ - $(OBJS)\monolib_extended.obj \ - $(OBJS)\monolib_ffile.obj \ - $(OBJS)\monolib_file.obj \ - $(OBJS)\monolib_fileback.obj \ - $(OBJS)\monolib_fileconf.obj \ - $(OBJS)\monolib_filefn.obj \ - $(OBJS)\monolib_filename.obj \ - $(OBJS)\monolib_filesys.obj \ - $(OBJS)\monolib_filtall.obj \ - $(OBJS)\monolib_filtfind.obj \ - $(OBJS)\monolib_fmapbase.obj \ - $(OBJS)\monolib_fs_arc.obj \ - $(OBJS)\monolib_fs_filter.obj \ - $(OBJS)\monolib_hash.obj \ - $(OBJS)\monolib_hashmap.obj \ - $(OBJS)\monolib_init.obj \ - $(OBJS)\monolib_intl.obj \ - $(OBJS)\monolib_ipcbase.obj \ - $(OBJS)\monolib_languageinfo.obj \ - $(OBJS)\monolib_list.obj \ - $(OBJS)\monolib_log.obj \ - $(OBJS)\monolib_longlong.obj \ - $(OBJS)\monolib_memory.obj \ - $(OBJS)\monolib_mimecmn.obj \ - $(OBJS)\monolib_module.obj \ - $(OBJS)\monolib_mstream.obj \ - $(OBJS)\monolib_numformatter.obj \ - $(OBJS)\monolib_object.obj \ - $(OBJS)\monolib_platinfo.obj \ - $(OBJS)\monolib_powercmn.obj \ - $(OBJS)\monolib_process.obj \ - $(OBJS)\monolib_regex.obj \ - $(OBJS)\monolib_stdpbase.obj \ - $(OBJS)\monolib_sstream.obj \ - $(OBJS)\monolib_stdstream.obj \ - $(OBJS)\monolib_stopwatch.obj \ - $(OBJS)\monolib_strconv.obj \ - $(OBJS)\monolib_stream.obj \ - $(OBJS)\monolib_string.obj \ - $(OBJS)\monolib_stringimpl.obj \ - $(OBJS)\monolib_stringops.obj \ - $(OBJS)\monolib_strvararg.obj \ - $(OBJS)\monolib_sysopt.obj \ - $(OBJS)\monolib_tarstrm.obj \ - $(OBJS)\monolib_textbuf.obj \ - $(OBJS)\monolib_textfile.obj \ - $(OBJS)\monolib_threadinfo.obj \ - $(OBJS)\monolib_time.obj \ - $(OBJS)\monolib_timercmn.obj \ - $(OBJS)\monolib_timerimpl.obj \ - $(OBJS)\monolib_tokenzr.obj \ - $(OBJS)\monolib_translation.obj \ - $(OBJS)\monolib_txtstrm.obj \ - $(OBJS)\monolib_unichar.obj \ - $(OBJS)\monolib_uri.obj \ - $(OBJS)\monolib_ustring.obj \ - $(OBJS)\monolib_variant.obj \ - $(OBJS)\monolib_wfstream.obj \ - $(OBJS)\monolib_wxcrt.obj \ - $(OBJS)\monolib_wxprintf.obj \ - $(OBJS)\monolib_xlocale.obj \ - $(OBJS)\monolib_xti.obj \ - $(OBJS)\monolib_xtistrm.obj \ - $(OBJS)\monolib_zipstrm.obj \ - $(OBJS)\monolib_zstream.obj \ - $(OBJS)\monolib_fswatchercmn.obj \ - $(OBJS)\monolib_fswatcherg.obj \ - $(OBJS)\monolib_basemsw.obj \ - $(OBJS)\monolib_crashrpt.obj \ - $(OBJS)\monolib_debughlp.obj \ - $(OBJS)\monolib_dde.obj \ - $(OBJS)\monolib_dir.obj \ - $(OBJS)\monolib_dlmsw.obj \ - $(OBJS)\monolib_evtloopconsole.obj \ - $(OBJS)\monolib_mimetype.obj \ - $(OBJS)\monolib_power.obj \ - $(OBJS)\monolib_regconf.obj \ - $(OBJS)\monolib_registry.obj \ - $(OBJS)\monolib_snglinst.obj \ - $(OBJS)\monolib_stackwalk.obj \ - $(OBJS)\monolib_stdpaths.obj \ - $(OBJS)\monolib_thread.obj \ - $(OBJS)\monolib_timer.obj \ - $(OBJS)\monolib_utils.obj \ - $(OBJS)\monolib_utilsexc.obj \ - $(OBJS)\monolib_fswatcher.obj \ - $(OBJS)\monolib_event.obj \ - $(OBJS)\monolib_fs_mem.obj \ - $(OBJS)\monolib_msgout.obj \ - $(OBJS)\monolib_utilscmn.obj \ - $(OBJS)\monolib_main.obj \ - $(OBJS)\monolib_mslu.obj \ - $(OBJS)\monolib_volume.obj \ - $(OBJS)\monolib_fs_inet.obj \ - $(OBJS)\monolib_ftp.obj \ - $(OBJS)\monolib_http.obj \ - $(OBJS)\monolib_protocol.obj \ - $(OBJS)\monolib_sckaddr.obj \ - $(OBJS)\monolib_sckfile.obj \ - $(OBJS)\monolib_sckipc.obj \ - $(OBJS)\monolib_sckstrm.obj \ - $(OBJS)\monolib_socket.obj \ - $(OBJS)\monolib_url.obj \ - $(OBJS)\monolib_sockmsw.obj \ - $(OBJS)\monolib_urlmsw.obj \ - $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \ - $(OBJS)\monolib_xml.obj \ - $(OBJS)\monolib_xtixml.obj -BASEDLL_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 \ - $(CPPFLAGS) $(CFLAGS) -BASEDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 -Hu \ - -H=$(OBJS)\wxprec_basedll.csm $(CPPFLAGS) $(CXXFLAGS) -BASEDLL_OBJECTS = \ - $(OBJS)\basedll_dummy.obj \ - $(OBJS)\basedll_any.obj \ - $(OBJS)\basedll_appbase.obj \ - $(OBJS)\basedll_arcall.obj \ - $(OBJS)\basedll_arcfind.obj \ - $(OBJS)\basedll_archive.obj \ - $(OBJS)\basedll_arrstr.obj \ - $(OBJS)\basedll_base64.obj \ - $(OBJS)\basedll_clntdata.obj \ - $(OBJS)\basedll_cmdline.obj \ - $(OBJS)\basedll_config.obj \ - $(OBJS)\basedll_convauto.obj \ - $(OBJS)\basedll_datetime.obj \ - $(OBJS)\basedll_datetimefmt.obj \ - $(OBJS)\basedll_datstrm.obj \ - $(OBJS)\basedll_dircmn.obj \ - $(OBJS)\basedll_dynarray.obj \ - $(OBJS)\basedll_dynlib.obj \ - $(OBJS)\basedll_dynload.obj \ - $(OBJS)\basedll_encconv.obj \ - $(OBJS)\basedll_evtloopcmn.obj \ - $(OBJS)\basedll_extended.obj \ - $(OBJS)\basedll_ffile.obj \ - $(OBJS)\basedll_file.obj \ - $(OBJS)\basedll_fileback.obj \ - $(OBJS)\basedll_fileconf.obj \ - $(OBJS)\basedll_filefn.obj \ - $(OBJS)\basedll_filename.obj \ - $(OBJS)\basedll_filesys.obj \ - $(OBJS)\basedll_filtall.obj \ - $(OBJS)\basedll_filtfind.obj \ - $(OBJS)\basedll_fmapbase.obj \ - $(OBJS)\basedll_fs_arc.obj \ - $(OBJS)\basedll_fs_filter.obj \ - $(OBJS)\basedll_hash.obj \ - $(OBJS)\basedll_hashmap.obj \ - $(OBJS)\basedll_init.obj \ - $(OBJS)\basedll_intl.obj \ - $(OBJS)\basedll_ipcbase.obj \ - $(OBJS)\basedll_languageinfo.obj \ - $(OBJS)\basedll_list.obj \ - $(OBJS)\basedll_log.obj \ - $(OBJS)\basedll_longlong.obj \ - $(OBJS)\basedll_memory.obj \ - $(OBJS)\basedll_mimecmn.obj \ - $(OBJS)\basedll_module.obj \ - $(OBJS)\basedll_mstream.obj \ - $(OBJS)\basedll_numformatter.obj \ - $(OBJS)\basedll_object.obj \ - $(OBJS)\basedll_platinfo.obj \ - $(OBJS)\basedll_powercmn.obj \ - $(OBJS)\basedll_process.obj \ - $(OBJS)\basedll_regex.obj \ - $(OBJS)\basedll_stdpbase.obj \ - $(OBJS)\basedll_sstream.obj \ - $(OBJS)\basedll_stdstream.obj \ - $(OBJS)\basedll_stopwatch.obj \ - $(OBJS)\basedll_strconv.obj \ - $(OBJS)\basedll_stream.obj \ - $(OBJS)\basedll_string.obj \ - $(OBJS)\basedll_stringimpl.obj \ - $(OBJS)\basedll_stringops.obj \ - $(OBJS)\basedll_strvararg.obj \ - $(OBJS)\basedll_sysopt.obj \ - $(OBJS)\basedll_tarstrm.obj \ - $(OBJS)\basedll_textbuf.obj \ - $(OBJS)\basedll_textfile.obj \ - $(OBJS)\basedll_threadinfo.obj \ - $(OBJS)\basedll_time.obj \ - $(OBJS)\basedll_timercmn.obj \ - $(OBJS)\basedll_timerimpl.obj \ - $(OBJS)\basedll_tokenzr.obj \ - $(OBJS)\basedll_translation.obj \ - $(OBJS)\basedll_txtstrm.obj \ - $(OBJS)\basedll_unichar.obj \ - $(OBJS)\basedll_uri.obj \ - $(OBJS)\basedll_ustring.obj \ - $(OBJS)\basedll_variant.obj \ - $(OBJS)\basedll_wfstream.obj \ - $(OBJS)\basedll_wxcrt.obj \ - $(OBJS)\basedll_wxprintf.obj \ - $(OBJS)\basedll_xlocale.obj \ - $(OBJS)\basedll_xti.obj \ - $(OBJS)\basedll_xtistrm.obj \ - $(OBJS)\basedll_zipstrm.obj \ - $(OBJS)\basedll_zstream.obj \ - $(OBJS)\basedll_fswatchercmn.obj \ - $(OBJS)\basedll_fswatcherg.obj \ - $(OBJS)\basedll_basemsw.obj \ - $(OBJS)\basedll_crashrpt.obj \ - $(OBJS)\basedll_debughlp.obj \ - $(OBJS)\basedll_dde.obj \ - $(OBJS)\basedll_dir.obj \ - $(OBJS)\basedll_dlmsw.obj \ - $(OBJS)\basedll_evtloopconsole.obj \ - $(OBJS)\basedll_mimetype.obj \ - $(OBJS)\basedll_power.obj \ - $(OBJS)\basedll_regconf.obj \ - $(OBJS)\basedll_registry.obj \ - $(OBJS)\basedll_snglinst.obj \ - $(OBJS)\basedll_stackwalk.obj \ - $(OBJS)\basedll_stdpaths.obj \ - $(OBJS)\basedll_thread.obj \ - $(OBJS)\basedll_timer.obj \ - $(OBJS)\basedll_utils.obj \ - $(OBJS)\basedll_utilsexc.obj \ - $(OBJS)\basedll_fswatcher.obj \ - $(OBJS)\basedll_event.obj \ - $(OBJS)\basedll_fs_mem.obj \ - $(OBJS)\basedll_msgout.obj \ - $(OBJS)\basedll_utilscmn.obj \ - $(OBJS)\basedll_main.obj \ - $(OBJS)\basedll_mslu.obj \ - $(OBJS)\basedll_volume.obj -BASELIB_CFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) -BASELIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 -Hu \ - -H=$(OBJS)\wxprec_baselib.csm $(CPPFLAGS) $(CXXFLAGS) -BASELIB_OBJECTS = \ - $(OBJS)\baselib_dummy.obj \ - $(OBJS)\baselib_any.obj \ - $(OBJS)\baselib_appbase.obj \ - $(OBJS)\baselib_arcall.obj \ - $(OBJS)\baselib_arcfind.obj \ - $(OBJS)\baselib_archive.obj \ - $(OBJS)\baselib_arrstr.obj \ - $(OBJS)\baselib_base64.obj \ - $(OBJS)\baselib_clntdata.obj \ - $(OBJS)\baselib_cmdline.obj \ - $(OBJS)\baselib_config.obj \ - $(OBJS)\baselib_convauto.obj \ - $(OBJS)\baselib_datetime.obj \ - $(OBJS)\baselib_datetimefmt.obj \ - $(OBJS)\baselib_datstrm.obj \ - $(OBJS)\baselib_dircmn.obj \ - $(OBJS)\baselib_dynarray.obj \ - $(OBJS)\baselib_dynlib.obj \ - $(OBJS)\baselib_dynload.obj \ - $(OBJS)\baselib_encconv.obj \ - $(OBJS)\baselib_evtloopcmn.obj \ - $(OBJS)\baselib_extended.obj \ - $(OBJS)\baselib_ffile.obj \ - $(OBJS)\baselib_file.obj \ - $(OBJS)\baselib_fileback.obj \ - $(OBJS)\baselib_fileconf.obj \ - $(OBJS)\baselib_filefn.obj \ - $(OBJS)\baselib_filename.obj \ - $(OBJS)\baselib_filesys.obj \ - $(OBJS)\baselib_filtall.obj \ - $(OBJS)\baselib_filtfind.obj \ - $(OBJS)\baselib_fmapbase.obj \ - $(OBJS)\baselib_fs_arc.obj \ - $(OBJS)\baselib_fs_filter.obj \ - $(OBJS)\baselib_hash.obj \ - $(OBJS)\baselib_hashmap.obj \ - $(OBJS)\baselib_init.obj \ - $(OBJS)\baselib_intl.obj \ - $(OBJS)\baselib_ipcbase.obj \ - $(OBJS)\baselib_languageinfo.obj \ - $(OBJS)\baselib_list.obj \ - $(OBJS)\baselib_log.obj \ - $(OBJS)\baselib_longlong.obj \ - $(OBJS)\baselib_memory.obj \ - $(OBJS)\baselib_mimecmn.obj \ - $(OBJS)\baselib_module.obj \ - $(OBJS)\baselib_mstream.obj \ - $(OBJS)\baselib_numformatter.obj \ - $(OBJS)\baselib_object.obj \ - $(OBJS)\baselib_platinfo.obj \ - $(OBJS)\baselib_powercmn.obj \ - $(OBJS)\baselib_process.obj \ - $(OBJS)\baselib_regex.obj \ - $(OBJS)\baselib_stdpbase.obj \ - $(OBJS)\baselib_sstream.obj \ - $(OBJS)\baselib_stdstream.obj \ - $(OBJS)\baselib_stopwatch.obj \ - $(OBJS)\baselib_strconv.obj \ - $(OBJS)\baselib_stream.obj \ - $(OBJS)\baselib_string.obj \ - $(OBJS)\baselib_stringimpl.obj \ - $(OBJS)\baselib_stringops.obj \ - $(OBJS)\baselib_strvararg.obj \ - $(OBJS)\baselib_sysopt.obj \ - $(OBJS)\baselib_tarstrm.obj \ - $(OBJS)\baselib_textbuf.obj \ - $(OBJS)\baselib_textfile.obj \ - $(OBJS)\baselib_threadinfo.obj \ - $(OBJS)\baselib_time.obj \ - $(OBJS)\baselib_timercmn.obj \ - $(OBJS)\baselib_timerimpl.obj \ - $(OBJS)\baselib_tokenzr.obj \ - $(OBJS)\baselib_translation.obj \ - $(OBJS)\baselib_txtstrm.obj \ - $(OBJS)\baselib_unichar.obj \ - $(OBJS)\baselib_uri.obj \ - $(OBJS)\baselib_ustring.obj \ - $(OBJS)\baselib_variant.obj \ - $(OBJS)\baselib_wfstream.obj \ - $(OBJS)\baselib_wxcrt.obj \ - $(OBJS)\baselib_wxprintf.obj \ - $(OBJS)\baselib_xlocale.obj \ - $(OBJS)\baselib_xti.obj \ - $(OBJS)\baselib_xtistrm.obj \ - $(OBJS)\baselib_zipstrm.obj \ - $(OBJS)\baselib_zstream.obj \ - $(OBJS)\baselib_fswatchercmn.obj \ - $(OBJS)\baselib_fswatcherg.obj \ - $(OBJS)\baselib_basemsw.obj \ - $(OBJS)\baselib_crashrpt.obj \ - $(OBJS)\baselib_debughlp.obj \ - $(OBJS)\baselib_dde.obj \ - $(OBJS)\baselib_dir.obj \ - $(OBJS)\baselib_dlmsw.obj \ - $(OBJS)\baselib_evtloopconsole.obj \ - $(OBJS)\baselib_mimetype.obj \ - $(OBJS)\baselib_power.obj \ - $(OBJS)\baselib_regconf.obj \ - $(OBJS)\baselib_registry.obj \ - $(OBJS)\baselib_snglinst.obj \ - $(OBJS)\baselib_stackwalk.obj \ - $(OBJS)\baselib_stdpaths.obj \ - $(OBJS)\baselib_thread.obj \ - $(OBJS)\baselib_timer.obj \ - $(OBJS)\baselib_utils.obj \ - $(OBJS)\baselib_utilsexc.obj \ - $(OBJS)\baselib_fswatcher.obj \ - $(OBJS)\baselib_event.obj \ - $(OBJS)\baselib_fs_mem.obj \ - $(OBJS)\baselib_msgout.obj \ - $(OBJS)\baselib_utilscmn.obj \ - $(OBJS)\baselib_main.obj \ - $(OBJS)\baselib_mslu.obj \ - $(OBJS)\baselib_volume.obj -NETDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_NET -Hu \ - -H=$(OBJS)\wxprec_netdll.csm $(CPPFLAGS) $(CXXFLAGS) -NETDLL_OBJECTS = \ - $(OBJS)\netdll_dummy.obj \ - $(OBJS)\netdll_fs_inet.obj \ - $(OBJS)\netdll_ftp.obj \ - $(OBJS)\netdll_http.obj \ - $(OBJS)\netdll_protocol.obj \ - $(OBJS)\netdll_sckaddr.obj \ - $(OBJS)\netdll_sckfile.obj \ - $(OBJS)\netdll_sckipc.obj \ - $(OBJS)\netdll_sckstrm.obj \ - $(OBJS)\netdll_socket.obj \ - $(OBJS)\netdll_url.obj \ - $(OBJS)\netdll_sockmsw.obj \ - $(OBJS)\netdll_urlmsw.obj -NETLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -Hu -H=$(OBJS)\wxprec_netlib.csm \ - $(CPPFLAGS) $(CXXFLAGS) -NETLIB_OBJECTS = \ - $(OBJS)\netlib_dummy.obj \ - $(OBJS)\netlib_fs_inet.obj \ - $(OBJS)\netlib_ftp.obj \ - $(OBJS)\netlib_http.obj \ - $(OBJS)\netlib_protocol.obj \ - $(OBJS)\netlib_sckaddr.obj \ - $(OBJS)\netlib_sckfile.obj \ - $(OBJS)\netlib_sckipc.obj \ - $(OBJS)\netlib_sckstrm.obj \ - $(OBJS)\netlib_socket.obj \ - $(OBJS)\netlib_url.obj \ - $(OBJS)\netlib_sockmsw.obj \ - $(OBJS)\netlib_urlmsw.obj -COREDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_CORE -DwxUSE_BASE=0 -Hu \ - -H=$(OBJS)\wxprec_coredll.csm $(CPPFLAGS) $(CXXFLAGS) -COREDLL_OBJECTS = \ - $(OBJS)\coredll_dummy.obj \ - $(OBJS)\coredll_event.obj \ - $(OBJS)\coredll_fs_mem.obj \ - $(OBJS)\coredll_msgout.obj \ - $(OBJS)\coredll_utilscmn.obj \ - $(OBJS)\coredll_main.obj \ - $(OBJS)\coredll_mslu.obj \ - $(OBJS)\coredll_volume.obj \ - $(____CORE_SRC_FILENAMES_2_OBJECTS) -CORELIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_BASE=0 -Hu -H=$(OBJS)\wxprec_corelib.csm \ - $(CPPFLAGS) $(CXXFLAGS) -CORELIB_OBJECTS = \ - $(OBJS)\corelib_dummy.obj \ - $(OBJS)\corelib_event.obj \ - $(OBJS)\corelib_fs_mem.obj \ - $(OBJS)\corelib_msgout.obj \ - $(OBJS)\corelib_utilscmn.obj \ - $(OBJS)\corelib_main.obj \ - $(OBJS)\corelib_mslu.obj \ - $(OBJS)\corelib_volume.obj \ - $(____CORE_SRC_FILENAMES_3_OBJECTS) -ADVDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_ADV -Hu \ - -H=$(OBJS)\wxprec_advdll.csm $(CPPFLAGS) $(CXXFLAGS) -ADVDLL_OBJECTS = \ - $(OBJS)\advdll_dummy.obj \ - $(____ADVANCED_SRC_FILENAMES_2_OBJECTS) -ADVLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_advlib.csm $(CPPFLAGS) \ - $(CXXFLAGS) -ADVLIB_OBJECTS = \ - $(OBJS)\advlib_dummy.obj \ - $(____ADVANCED_SRC_FILENAMES_3_OBJECTS) -MEDIADLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_MEDIA -Hu \ - -H=$(OBJS)\wxprec_mediadll.csm $(CPPFLAGS) $(CXXFLAGS) -MEDIADLL_OBJECTS = \ - $(OBJS)\mediadll_dummy.obj \ - $(OBJS)\mediadll_mediactrlcmn.obj \ - $(OBJS)\mediadll_mediactrl_am.obj \ - $(OBJS)\mediadll_mediactrl_wmp10.obj \ - $(OBJS)\mediadll_mediactrl_qt.obj -MEDIALIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_medialib.csm $(CPPFLAGS) \ - $(CXXFLAGS) -MEDIALIB_OBJECTS = \ - $(OBJS)\medialib_dummy.obj \ - $(OBJS)\medialib_mediactrlcmn.obj \ - $(OBJS)\medialib_mediactrl_am.obj \ - $(OBJS)\medialib_mediactrl_wmp10.obj \ - $(OBJS)\medialib_mediactrl_qt.obj -HTMLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_HTML -Hu \ - -H=$(OBJS)\wxprec_htmldll.csm $(CPPFLAGS) $(CXXFLAGS) -HTMLDLL_OBJECTS = \ - $(OBJS)\htmldll_dummy.obj \ - $(OBJS)\htmldll_helpbest.obj \ - $(OBJS)\htmldll_helpctrl.obj \ - $(OBJS)\htmldll_helpdata.obj \ - $(OBJS)\htmldll_helpdlg.obj \ - $(OBJS)\htmldll_helpfrm.obj \ - $(OBJS)\htmldll_helpwnd.obj \ - $(OBJS)\htmldll_htmlcell.obj \ - $(OBJS)\htmldll_htmlfilt.obj \ - $(OBJS)\htmldll_htmlpars.obj \ - $(OBJS)\htmldll_htmltag.obj \ - $(OBJS)\htmldll_htmlwin.obj \ - $(OBJS)\htmldll_htmprint.obj \ - $(OBJS)\htmldll_m_dflist.obj \ - $(OBJS)\htmldll_m_fonts.obj \ - $(OBJS)\htmldll_m_hline.obj \ - $(OBJS)\htmldll_m_image.obj \ - $(OBJS)\htmldll_m_layout.obj \ - $(OBJS)\htmldll_m_links.obj \ - $(OBJS)\htmldll_m_list.obj \ - $(OBJS)\htmldll_m_pre.obj \ - $(OBJS)\htmldll_m_span.obj \ - $(OBJS)\htmldll_m_style.obj \ - $(OBJS)\htmldll_m_tables.obj \ - $(OBJS)\htmldll_styleparams.obj \ - $(OBJS)\htmldll_winpars.obj \ - $(OBJS)\htmldll_htmllbox.obj -HTMLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_htmllib.csm $(CPPFLAGS) \ - $(CXXFLAGS) -HTMLLIB_OBJECTS = \ - $(OBJS)\htmllib_dummy.obj \ - $(OBJS)\htmllib_helpbest.obj \ - $(OBJS)\htmllib_helpctrl.obj \ - $(OBJS)\htmllib_helpdata.obj \ - $(OBJS)\htmllib_helpdlg.obj \ - $(OBJS)\htmllib_helpfrm.obj \ - $(OBJS)\htmllib_helpwnd.obj \ - $(OBJS)\htmllib_htmlcell.obj \ - $(OBJS)\htmllib_htmlfilt.obj \ - $(OBJS)\htmllib_htmlpars.obj \ - $(OBJS)\htmllib_htmltag.obj \ - $(OBJS)\htmllib_htmlwin.obj \ - $(OBJS)\htmllib_htmprint.obj \ - $(OBJS)\htmllib_m_dflist.obj \ - $(OBJS)\htmllib_m_fonts.obj \ - $(OBJS)\htmllib_m_hline.obj \ - $(OBJS)\htmllib_m_image.obj \ - $(OBJS)\htmllib_m_layout.obj \ - $(OBJS)\htmllib_m_links.obj \ - $(OBJS)\htmllib_m_list.obj \ - $(OBJS)\htmllib_m_pre.obj \ - $(OBJS)\htmllib_m_span.obj \ - $(OBJS)\htmllib_m_style.obj \ - $(OBJS)\htmllib_m_tables.obj \ - $(OBJS)\htmllib_styleparams.obj \ - $(OBJS)\htmllib_winpars.obj \ - $(OBJS)\htmllib_htmllbox.obj -WEBVIEWDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW -Hu \ - -H=$(OBJS)\wxprec_webviewdll.csm $(CPPFLAGS) $(CXXFLAGS) -WEBVIEWDLL_OBJECTS = \ - $(OBJS)\webviewdll_dummy.obj \ - $(OBJS)\webviewdll_webview_ie.obj \ - $(OBJS)\webviewdll_webview.obj \ - $(OBJS)\webviewdll_webviewarchivehandler.obj \ - $(OBJS)\webviewdll_webviewfshandler.obj -WEBVIEWLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_webviewlib.csm $(CPPFLAGS) \ - $(CXXFLAGS) -WEBVIEWLIB_OBJECTS = \ - $(OBJS)\webviewlib_dummy.obj \ - $(OBJS)\webviewlib_webview_ie.obj \ - $(OBJS)\webviewlib_webview.obj \ - $(OBJS)\webviewlib_webviewarchivehandler.obj \ - $(OBJS)\webviewlib_webviewfshandler.obj -QADLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_QA -Hu \ - -H=$(OBJS)\wxprec_qadll.csm $(CPPFLAGS) $(CXXFLAGS) -QADLL_OBJECTS = \ - $(OBJS)\qadll_dummy.obj \ - $(OBJS)\qadll_debugrpt.obj \ - $(OBJS)\qadll_dbgrptg.obj -QALIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_qalib.csm $(CPPFLAGS) \ - $(CXXFLAGS) -QALIB_OBJECTS = \ - $(OBJS)\qalib_dummy.obj \ - $(OBJS)\qalib_debugrpt.obj \ - $(OBJS)\qalib_dbgrptg.obj -XMLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_XML -Hu \ - -H=$(OBJS)\wxprec_xmldll.csm $(CPPFLAGS) $(CXXFLAGS) -XMLDLL_OBJECTS = \ - $(OBJS)\xmldll_dummy.obj \ - $(OBJS)\xmldll_xml.obj \ - $(OBJS)\xmldll_xtixml.obj -XMLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DwxUSE_GUI=0 -Hu -H=$(OBJS)\wxprec_xmllib.csm \ - $(CPPFLAGS) $(CXXFLAGS) -XMLLIB_OBJECTS = \ - $(OBJS)\xmllib_dummy.obj \ - $(OBJS)\xmllib_xml.obj \ - $(OBJS)\xmllib_xtixml.obj -XRCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_XRC -Hu \ - -H=$(OBJS)\wxprec_xrcdll.csm $(CPPFLAGS) $(CXXFLAGS) -XRCDLL_OBJECTS = \ - $(OBJS)\xrcdll_dummy.obj \ - $(OBJS)\xrcdll_xh_animatctrl.obj \ - $(OBJS)\xrcdll_xh_bannerwindow.obj \ - $(OBJS)\xrcdll_xh_bmp.obj \ - $(OBJS)\xrcdll_xh_bmpcbox.obj \ - $(OBJS)\xrcdll_xh_bmpbt.obj \ - $(OBJS)\xrcdll_xh_bttn.obj \ - $(OBJS)\xrcdll_xh_cald.obj \ - $(OBJS)\xrcdll_xh_chckb.obj \ - $(OBJS)\xrcdll_xh_chckl.obj \ - $(OBJS)\xrcdll_xh_choic.obj \ - $(OBJS)\xrcdll_xh_choicbk.obj \ - $(OBJS)\xrcdll_xh_clrpicker.obj \ - $(OBJS)\xrcdll_xh_cmdlinkbn.obj \ - $(OBJS)\xrcdll_xh_collpane.obj \ - $(OBJS)\xrcdll_xh_combo.obj \ - $(OBJS)\xrcdll_xh_comboctrl.obj \ - $(OBJS)\xrcdll_xh_datectrl.obj \ - $(OBJS)\xrcdll_xh_dirpicker.obj \ - $(OBJS)\xrcdll_xh_dlg.obj \ - $(OBJS)\xrcdll_xh_editlbox.obj \ - $(OBJS)\xrcdll_xh_filectrl.obj \ - $(OBJS)\xrcdll_xh_filepicker.obj \ - $(OBJS)\xrcdll_xh_fontpicker.obj \ - $(OBJS)\xrcdll_xh_frame.obj \ - $(OBJS)\xrcdll_xh_gauge.obj \ - $(OBJS)\xrcdll_xh_gdctl.obj \ - $(OBJS)\xrcdll_xh_grid.obj \ - $(OBJS)\xrcdll_xh_html.obj \ - $(OBJS)\xrcdll_xh_hyperlink.obj \ - $(OBJS)\xrcdll_xh_listb.obj \ - $(OBJS)\xrcdll_xh_listbk.obj \ - $(OBJS)\xrcdll_xh_listc.obj \ - $(OBJS)\xrcdll_xh_mdi.obj \ - $(OBJS)\xrcdll_xh_menu.obj \ - $(OBJS)\xrcdll_xh_notbk.obj \ - $(OBJS)\xrcdll_xh_odcombo.obj \ - $(OBJS)\xrcdll_xh_panel.obj \ - $(OBJS)\xrcdll_xh_propdlg.obj \ - $(OBJS)\xrcdll_xh_radbt.obj \ - $(OBJS)\xrcdll_xh_radbx.obj \ - $(OBJS)\xrcdll_xh_scrol.obj \ - $(OBJS)\xrcdll_xh_scwin.obj \ - $(OBJS)\xrcdll_xh_htmllbox.obj \ - $(OBJS)\xrcdll_xh_sizer.obj \ - $(OBJS)\xrcdll_xh_slidr.obj \ - $(OBJS)\xrcdll_xh_spin.obj \ - $(OBJS)\xrcdll_xh_split.obj \ - $(OBJS)\xrcdll_xh_srchctrl.obj \ - $(OBJS)\xrcdll_xh_statbar.obj \ - $(OBJS)\xrcdll_xh_stbmp.obj \ - $(OBJS)\xrcdll_xh_stbox.obj \ - $(OBJS)\xrcdll_xh_stlin.obj \ - $(OBJS)\xrcdll_xh_sttxt.obj \ - $(OBJS)\xrcdll_xh_text.obj \ - $(OBJS)\xrcdll_xh_tglbtn.obj \ - $(OBJS)\xrcdll_xh_timectrl.obj \ - $(OBJS)\xrcdll_xh_toolb.obj \ - $(OBJS)\xrcdll_xh_toolbk.obj \ - $(OBJS)\xrcdll_xh_tree.obj \ - $(OBJS)\xrcdll_xh_treebk.obj \ - $(OBJS)\xrcdll_xh_unkwn.obj \ - $(OBJS)\xrcdll_xh_wizrd.obj \ - $(OBJS)\xrcdll_xmlres.obj \ - $(OBJS)\xrcdll_xmladv.obj \ - $(OBJS)\xrcdll_xmlrsall.obj -XRCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_xrclib.csm $(CPPFLAGS) \ - $(CXXFLAGS) -XRCLIB_OBJECTS = \ - $(OBJS)\xrclib_dummy.obj \ - $(OBJS)\xrclib_xh_animatctrl.obj \ - $(OBJS)\xrclib_xh_bannerwindow.obj \ - $(OBJS)\xrclib_xh_bmp.obj \ - $(OBJS)\xrclib_xh_bmpcbox.obj \ - $(OBJS)\xrclib_xh_bmpbt.obj \ - $(OBJS)\xrclib_xh_bttn.obj \ - $(OBJS)\xrclib_xh_cald.obj \ - $(OBJS)\xrclib_xh_chckb.obj \ - $(OBJS)\xrclib_xh_chckl.obj \ - $(OBJS)\xrclib_xh_choic.obj \ - $(OBJS)\xrclib_xh_choicbk.obj \ - $(OBJS)\xrclib_xh_clrpicker.obj \ - $(OBJS)\xrclib_xh_cmdlinkbn.obj \ - $(OBJS)\xrclib_xh_collpane.obj \ - $(OBJS)\xrclib_xh_combo.obj \ - $(OBJS)\xrclib_xh_comboctrl.obj \ - $(OBJS)\xrclib_xh_datectrl.obj \ - $(OBJS)\xrclib_xh_dirpicker.obj \ - $(OBJS)\xrclib_xh_dlg.obj \ - $(OBJS)\xrclib_xh_editlbox.obj \ - $(OBJS)\xrclib_xh_filectrl.obj \ - $(OBJS)\xrclib_xh_filepicker.obj \ - $(OBJS)\xrclib_xh_fontpicker.obj \ - $(OBJS)\xrclib_xh_frame.obj \ - $(OBJS)\xrclib_xh_gauge.obj \ - $(OBJS)\xrclib_xh_gdctl.obj \ - $(OBJS)\xrclib_xh_grid.obj \ - $(OBJS)\xrclib_xh_html.obj \ - $(OBJS)\xrclib_xh_hyperlink.obj \ - $(OBJS)\xrclib_xh_listb.obj \ - $(OBJS)\xrclib_xh_listbk.obj \ - $(OBJS)\xrclib_xh_listc.obj \ - $(OBJS)\xrclib_xh_mdi.obj \ - $(OBJS)\xrclib_xh_menu.obj \ - $(OBJS)\xrclib_xh_notbk.obj \ - $(OBJS)\xrclib_xh_odcombo.obj \ - $(OBJS)\xrclib_xh_panel.obj \ - $(OBJS)\xrclib_xh_propdlg.obj \ - $(OBJS)\xrclib_xh_radbt.obj \ - $(OBJS)\xrclib_xh_radbx.obj \ - $(OBJS)\xrclib_xh_scrol.obj \ - $(OBJS)\xrclib_xh_scwin.obj \ - $(OBJS)\xrclib_xh_htmllbox.obj \ - $(OBJS)\xrclib_xh_sizer.obj \ - $(OBJS)\xrclib_xh_slidr.obj \ - $(OBJS)\xrclib_xh_spin.obj \ - $(OBJS)\xrclib_xh_split.obj \ - $(OBJS)\xrclib_xh_srchctrl.obj \ - $(OBJS)\xrclib_xh_statbar.obj \ - $(OBJS)\xrclib_xh_stbmp.obj \ - $(OBJS)\xrclib_xh_stbox.obj \ - $(OBJS)\xrclib_xh_stlin.obj \ - $(OBJS)\xrclib_xh_sttxt.obj \ - $(OBJS)\xrclib_xh_text.obj \ - $(OBJS)\xrclib_xh_tglbtn.obj \ - $(OBJS)\xrclib_xh_timectrl.obj \ - $(OBJS)\xrclib_xh_toolb.obj \ - $(OBJS)\xrclib_xh_toolbk.obj \ - $(OBJS)\xrclib_xh_tree.obj \ - $(OBJS)\xrclib_xh_treebk.obj \ - $(OBJS)\xrclib_xh_unkwn.obj \ - $(OBJS)\xrclib_xh_wizrd.obj \ - $(OBJS)\xrclib_xmlres.obj \ - $(OBJS)\xrclib_xmladv.obj \ - $(OBJS)\xrclib_xmlrsall.obj -AUIDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_AUI -Hu \ - -H=$(OBJS)\wxprec_auidll.csm $(CPPFLAGS) $(CXXFLAGS) -AUIDLL_OBJECTS = \ - $(OBJS)\auidll_dummy.obj \ - $(OBJS)\auidll_framemanager.obj \ - $(OBJS)\auidll_dockart.obj \ - $(OBJS)\auidll_floatpane.obj \ - $(OBJS)\auidll_auibook.obj \ - $(OBJS)\auidll_auibar.obj \ - $(OBJS)\auidll_tabmdi.obj \ - $(OBJS)\auidll_tabart.obj \ - $(OBJS)\auidll_xh_auinotbk.obj -AUILIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_auilib.csm $(CPPFLAGS) \ - $(CXXFLAGS) -AUILIB_OBJECTS = \ - $(OBJS)\auilib_dummy.obj \ - $(OBJS)\auilib_framemanager.obj \ - $(OBJS)\auilib_dockart.obj \ - $(OBJS)\auilib_floatpane.obj \ - $(OBJS)\auilib_auibook.obj \ - $(OBJS)\auilib_auibar.obj \ - $(OBJS)\auilib_tabmdi.obj \ - $(OBJS)\auilib_tabart.obj \ - $(OBJS)\auilib_xh_auinotbk.obj -RIBBONDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_RIBBON -Hu \ - -H=$(OBJS)\wxprec_ribbondll.csm $(CPPFLAGS) $(CXXFLAGS) -RIBBONDLL_OBJECTS = \ - $(OBJS)\ribbondll_dummy.obj \ - $(OBJS)\ribbondll_art_internal.obj \ - $(OBJS)\ribbondll_art_msw.obj \ - $(OBJS)\ribbondll_art_aui.obj \ - $(OBJS)\ribbondll_bar.obj \ - $(OBJS)\ribbondll_buttonbar.obj \ - $(OBJS)\ribbondll_control.obj \ - $(OBJS)\ribbondll_gallery.obj \ - $(OBJS)\ribbondll_page.obj \ - $(OBJS)\ribbondll_panel.obj \ - $(OBJS)\ribbondll_toolbar.obj \ - $(OBJS)\ribbondll_xh_ribbon.obj -RIBBONLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_ribbonlib.csm $(CPPFLAGS) \ - $(CXXFLAGS) -RIBBONLIB_OBJECTS = \ - $(OBJS)\ribbonlib_dummy.obj \ - $(OBJS)\ribbonlib_art_internal.obj \ - $(OBJS)\ribbonlib_art_msw.obj \ - $(OBJS)\ribbonlib_art_aui.obj \ - $(OBJS)\ribbonlib_bar.obj \ - $(OBJS)\ribbonlib_buttonbar.obj \ - $(OBJS)\ribbonlib_control.obj \ - $(OBJS)\ribbonlib_gallery.obj \ - $(OBJS)\ribbonlib_page.obj \ - $(OBJS)\ribbonlib_panel.obj \ - $(OBJS)\ribbonlib_toolbar.obj \ - $(OBJS)\ribbonlib_xh_ribbon.obj -PROPGRIDDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_PROPGRID -Hu \ - -H=$(OBJS)\wxprec_propgriddll.csm $(CPPFLAGS) $(CXXFLAGS) -PROPGRIDDLL_OBJECTS = \ - $(OBJS)\propgriddll_dummy.obj \ - $(OBJS)\propgriddll_advprops.obj \ - $(OBJS)\propgriddll_editors.obj \ - $(OBJS)\propgriddll_manager.obj \ - $(OBJS)\propgriddll_property.obj \ - $(OBJS)\propgriddll_propgrid.obj \ - $(OBJS)\propgriddll_propgridiface.obj \ - $(OBJS)\propgriddll_propgridpagestate.obj \ - $(OBJS)\propgriddll_props.obj -PROPGRIDLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_propgridlib.csm $(CPPFLAGS) \ - $(CXXFLAGS) -PROPGRIDLIB_OBJECTS = \ - $(OBJS)\propgridlib_dummy.obj \ - $(OBJS)\propgridlib_advprops.obj \ - $(OBJS)\propgridlib_editors.obj \ - $(OBJS)\propgridlib_manager.obj \ - $(OBJS)\propgridlib_property.obj \ - $(OBJS)\propgridlib_propgrid.obj \ - $(OBJS)\propgridlib_propgridiface.obj \ - $(OBJS)\propgridlib_propgridpagestate.obj \ - $(OBJS)\propgridlib_props.obj -RICHTEXTDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_RICHTEXT -Hu \ - -H=$(OBJS)\wxprec_richtextdll.csm $(CPPFLAGS) $(CXXFLAGS) -RICHTEXTDLL_OBJECTS = \ - $(OBJS)\richtextdll_dummy.obj \ - $(OBJS)\richtextdll_richtextbuffer.obj \ - $(OBJS)\richtextdll_richtextctrl.obj \ - $(OBJS)\richtextdll_richtextformatdlg.obj \ - $(OBJS)\richtextdll_richtexthtml.obj \ - $(OBJS)\richtextdll_richtextimagedlg.obj \ - $(OBJS)\richtextdll_richtextprint.obj \ - $(OBJS)\richtextdll_richtextstyledlg.obj \ - $(OBJS)\richtextdll_richtextstyles.obj \ - $(OBJS)\richtextdll_richtextsymboldlg.obj \ - $(OBJS)\richtextdll_richtextxml.obj \ - $(OBJS)\richtextdll_xh_richtext.obj -RICHTEXTLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_richtextlib.csm $(CPPFLAGS) \ - $(CXXFLAGS) -RICHTEXTLIB_OBJECTS = \ - $(OBJS)\richtextlib_dummy.obj \ - $(OBJS)\richtextlib_richtextbuffer.obj \ - $(OBJS)\richtextlib_richtextctrl.obj \ - $(OBJS)\richtextlib_richtextformatdlg.obj \ - $(OBJS)\richtextlib_richtexthtml.obj \ - $(OBJS)\richtextlib_richtextimagedlg.obj \ - $(OBJS)\richtextlib_richtextprint.obj \ - $(OBJS)\richtextlib_richtextstyledlg.obj \ - $(OBJS)\richtextlib_richtextstyles.obj \ - $(OBJS)\richtextlib_richtextsymboldlg.obj \ - $(OBJS)\richtextlib_richtextxml.obj \ - $(OBJS)\richtextlib_xh_richtext.obj -STCDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -I..\..\src\stc\scintilla\include \ - -I..\..\src\stc\scintilla\lexlib -I..\..\src\stc\scintilla\src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS -w-8027 -DWXUSINGDLL -DWXMAKINGDLL_STC -Hu \ - -H=$(OBJS)\wxprec_stcdll.csm $(CPPFLAGS) $(CXXFLAGS) -STCDLL_OBJECTS = \ - $(OBJS)\stcdll_dummy.obj \ - $(OBJS)\stcdll_stc.obj \ - $(OBJS)\stcdll_PlatWX.obj \ - $(OBJS)\stcdll_ScintillaWX.obj -STCLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -I..\..\src\stc\scintilla\include \ - -I..\..\src\stc\scintilla\lexlib -I..\..\src\stc\scintilla\src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS -w-8027 -Hu -H=$(OBJS)\wxprec_stclib.csm \ - $(CPPFLAGS) $(CXXFLAGS) -STCLIB_OBJECTS = \ - $(OBJS)\stclib_dummy.obj \ - $(OBJS)\stclib_stc.obj \ - $(OBJS)\stclib_PlatWX.obj \ - $(OBJS)\stclib_ScintillaWX.obj -GLDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_GL -Hu \ - -H=$(OBJS)\wxprec_gldll.csm $(CPPFLAGS) $(CXXFLAGS) -GLDLL_OBJECTS = \ - $(OBJS)\gldll_dummy.obj \ - $(OBJS)\gldll_glcmn.obj \ - $(OBJS)\gldll_glcanvas.obj -GLLIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -DWXBUILDING -I..\..\src\tiff\libtiff \ - -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib -I..\..\src\regex \ - -I..\..\src\expat\lib -Hu -H=$(OBJS)\wxprec_gllib.csm $(CPPFLAGS) \ - $(CXXFLAGS) -GLLIB_OBJECTS = \ - $(OBJS)\gllib_dummy.obj \ - $(OBJS)\gllib_glcmn.obj \ - $(OBJS)\gllib_glcanvas.obj -BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg - -### Conditionally set variables: ### - -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw$(TOOLKIT_VERSION) -!endif -!if "$(OFFICIAL_BUILD)" == "1" -COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD -!endif -!if "$(OFFICIAL_BUILD)" == "0" -WXCOMPILER = _bcc -!endif -!if "$(OFFICIAL_BUILD)" == "1" -WXCOMPILER = _bcc$(COMPILER_VERSION) -!endif -!if "$(OFFICIAL_BUILD)" == "0" -VENDORTAG = _$(VENDOR) -!endif -!if "$(OFFICIAL_BUILD)" == "1" -VENDORTAG = -!endif -!if "$(BUILD)" == "debug" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(USE_GUI)" == "1" -__wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -__wxscintilla_usingdll_p = -DWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" -__monodll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(USE_GUI)" == "1" -____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ - $(____CORE_SRC_FILENAMES_OBJECTS) \ - $(____ADVANCED_SRC_FILENAMES_OBJECTS) \ - $(OBJS)\monodll_mediactrlcmn.obj \ - $(OBJS)\monodll_mediactrl_am.obj \ - $(OBJS)\monodll_mediactrl_wmp10.obj \ - $(OBJS)\monodll_mediactrl_qt.obj \ - $(OBJS)\monodll_helpbest.obj \ - $(OBJS)\monodll_helpctrl.obj \ - $(OBJS)\monodll_helpdata.obj \ - $(OBJS)\monodll_helpdlg.obj \ - $(OBJS)\monodll_helpfrm.obj \ - $(OBJS)\monodll_helpwnd.obj \ - $(OBJS)\monodll_htmlcell.obj \ - $(OBJS)\monodll_htmlfilt.obj \ - $(OBJS)\monodll_htmlpars.obj \ - $(OBJS)\monodll_htmltag.obj \ - $(OBJS)\monodll_htmlwin.obj \ - $(OBJS)\monodll_htmprint.obj \ - $(OBJS)\monodll_m_dflist.obj \ - $(OBJS)\monodll_m_fonts.obj \ - $(OBJS)\monodll_m_hline.obj \ - $(OBJS)\monodll_m_image.obj \ - $(OBJS)\monodll_m_layout.obj \ - $(OBJS)\monodll_m_links.obj \ - $(OBJS)\monodll_m_list.obj \ - $(OBJS)\monodll_m_pre.obj \ - $(OBJS)\monodll_m_span.obj \ - $(OBJS)\monodll_m_style.obj \ - $(OBJS)\monodll_m_tables.obj \ - $(OBJS)\monodll_styleparams.obj \ - $(OBJS)\monodll_winpars.obj \ - $(OBJS)\monodll_htmllbox.obj \ - $(OBJS)\monodll_webview_ie.obj \ - $(OBJS)\monodll_webview.obj \ - $(OBJS)\monodll_webviewarchivehandler.obj \ - $(OBJS)\monodll_webviewfshandler.obj \ - $(OBJS)\monodll_debugrpt.obj \ - $(OBJS)\monodll_dbgrptg.obj \ - $(OBJS)\monodll_xh_animatctrl.obj \ - $(OBJS)\monodll_xh_bannerwindow.obj \ - $(OBJS)\monodll_xh_bmp.obj \ - $(OBJS)\monodll_xh_bmpcbox.obj \ - $(OBJS)\monodll_xh_bmpbt.obj \ - $(OBJS)\monodll_xh_bttn.obj \ - $(OBJS)\monodll_xh_cald.obj \ - $(OBJS)\monodll_xh_chckb.obj \ - $(OBJS)\monodll_xh_chckl.obj \ - $(OBJS)\monodll_xh_choic.obj \ - $(OBJS)\monodll_xh_choicbk.obj \ - $(OBJS)\monodll_xh_clrpicker.obj \ - $(OBJS)\monodll_xh_cmdlinkbn.obj \ - $(OBJS)\monodll_xh_collpane.obj \ - $(OBJS)\monodll_xh_combo.obj \ - $(OBJS)\monodll_xh_comboctrl.obj \ - $(OBJS)\monodll_xh_datectrl.obj \ - $(OBJS)\monodll_xh_dirpicker.obj \ - $(OBJS)\monodll_xh_dlg.obj \ - $(OBJS)\monodll_xh_editlbox.obj \ - $(OBJS)\monodll_xh_filectrl.obj \ - $(OBJS)\monodll_xh_filepicker.obj \ - $(OBJS)\monodll_xh_fontpicker.obj \ - $(OBJS)\monodll_xh_frame.obj \ - $(OBJS)\monodll_xh_gauge.obj \ - $(OBJS)\monodll_xh_gdctl.obj \ - $(OBJS)\monodll_xh_grid.obj \ - $(OBJS)\monodll_xh_html.obj \ - $(OBJS)\monodll_xh_hyperlink.obj \ - $(OBJS)\monodll_xh_listb.obj \ - $(OBJS)\monodll_xh_listbk.obj \ - $(OBJS)\monodll_xh_listc.obj \ - $(OBJS)\monodll_xh_mdi.obj \ - $(OBJS)\monodll_xh_menu.obj \ - $(OBJS)\monodll_xh_notbk.obj \ - $(OBJS)\monodll_xh_odcombo.obj \ - $(OBJS)\monodll_xh_panel.obj \ - $(OBJS)\monodll_xh_propdlg.obj \ - $(OBJS)\monodll_xh_radbt.obj \ - $(OBJS)\monodll_xh_radbx.obj \ - $(OBJS)\monodll_xh_scrol.obj \ - $(OBJS)\monodll_xh_scwin.obj \ - $(OBJS)\monodll_xh_htmllbox.obj \ - $(OBJS)\monodll_xh_sizer.obj \ - $(OBJS)\monodll_xh_slidr.obj \ - $(OBJS)\monodll_xh_spin.obj \ - $(OBJS)\monodll_xh_split.obj \ - $(OBJS)\monodll_xh_srchctrl.obj \ - $(OBJS)\monodll_xh_statbar.obj \ - $(OBJS)\monodll_xh_stbmp.obj \ - $(OBJS)\monodll_xh_stbox.obj \ - $(OBJS)\monodll_xh_stlin.obj \ - $(OBJS)\monodll_xh_sttxt.obj \ - $(OBJS)\monodll_xh_text.obj \ - $(OBJS)\monodll_xh_tglbtn.obj \ - $(OBJS)\monodll_xh_timectrl.obj \ - $(OBJS)\monodll_xh_toolb.obj \ - $(OBJS)\monodll_xh_toolbk.obj \ - $(OBJS)\monodll_xh_tree.obj \ - $(OBJS)\monodll_xh_treebk.obj \ - $(OBJS)\monodll_xh_unkwn.obj \ - $(OBJS)\monodll_xh_wizrd.obj \ - $(OBJS)\monodll_xmlres.obj \ - $(OBJS)\monodll_xmladv.obj \ - $(OBJS)\monodll_xmlrsall.obj \ - $(OBJS)\monodll_framemanager.obj \ - $(OBJS)\monodll_dockart.obj \ - $(OBJS)\monodll_floatpane.obj \ - $(OBJS)\monodll_auibook.obj \ - $(OBJS)\monodll_auibar.obj \ - $(OBJS)\monodll_tabmdi.obj \ - $(OBJS)\monodll_tabart.obj \ - $(OBJS)\monodll_xh_auinotbk.obj \ - $(OBJS)\monodll_advprops.obj \ - $(OBJS)\monodll_editors.obj \ - $(OBJS)\monodll_manager.obj \ - $(OBJS)\monodll_property.obj \ - $(OBJS)\monodll_propgrid.obj \ - $(OBJS)\monodll_propgridiface.obj \ - $(OBJS)\monodll_propgridpagestate.obj \ - $(OBJS)\monodll_props.obj \ - $(OBJS)\monodll_art_internal.obj \ - $(OBJS)\monodll_art_msw.obj \ - $(OBJS)\monodll_art_aui.obj \ - $(OBJS)\monodll_bar.obj \ - $(OBJS)\monodll_ribbon_buttonbar.obj \ - $(OBJS)\monodll_ribbon_control.obj \ - $(OBJS)\monodll_gallery.obj \ - $(OBJS)\monodll_page.obj \ - $(OBJS)\monodll_ribbon_panel.obj \ - $(OBJS)\monodll_ribbon_toolbar.obj \ - $(OBJS)\monodll_xh_ribbon.obj \ - $(OBJS)\monodll_richtextbuffer.obj \ - $(OBJS)\monodll_richtextctrl.obj \ - $(OBJS)\monodll_richtextformatdlg.obj \ - $(OBJS)\monodll_richtexthtml.obj \ - $(OBJS)\monodll_richtextimagedlg.obj \ - $(OBJS)\monodll_richtextprint.obj \ - $(OBJS)\monodll_richtextstyledlg.obj \ - $(OBJS)\monodll_richtextstyles.obj \ - $(OBJS)\monodll_richtextsymboldlg.obj \ - $(OBJS)\monodll_richtextxml.obj \ - $(OBJS)\monodll_xh_richtext.obj \ - $(OBJS)\monodll_stc.obj \ - $(OBJS)\monodll_PlatWX.obj \ - $(OBJS)\monodll_ScintillaWX.obj -!endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -____CORE_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_activex.obj \ - $(OBJS)\monodll_app.obj \ - $(OBJS)\monodll_bitmap.obj \ - $(OBJS)\monodll_brush.obj \ - $(OBJS)\monodll_caret.obj \ - $(OBJS)\monodll_clipbrd.obj \ - $(OBJS)\monodll_colour.obj \ - $(OBJS)\monodll_cursor.obj \ - $(OBJS)\monodll_data.obj \ - $(OBJS)\monodll_dc.obj \ - $(OBJS)\monodll_dcclient.obj \ - $(OBJS)\monodll_dcmemory.obj \ - $(OBJS)\monodll_dcprint.obj \ - $(OBJS)\monodll_dcscreen.obj \ - $(OBJS)\monodll_dialup.obj \ - $(OBJS)\monodll_dib.obj \ - $(OBJS)\monodll_display.obj \ - $(OBJS)\monodll_enhmeta.obj \ - $(OBJS)\monodll_font.obj \ - $(OBJS)\monodll_fontenum.obj \ - $(OBJS)\monodll_fontutil.obj \ - $(OBJS)\monodll_gdiimage.obj \ - $(OBJS)\monodll_gdiobj.obj \ - $(OBJS)\monodll_gdiplus.obj \ - $(OBJS)\monodll_graphics.obj \ - $(OBJS)\monodll_icon.obj \ - $(OBJS)\monodll_imaglist.obj \ - $(OBJS)\monodll_minifram.obj \ - $(OBJS)\monodll_nonownedwnd.obj \ - $(OBJS)\monodll_dataobj.obj \ - $(OBJS)\monodll_dropsrc.obj \ - $(OBJS)\monodll_droptgt.obj \ - $(OBJS)\monodll_oleutils.obj \ - $(OBJS)\monodll_safearray.obj \ - $(OBJS)\monodll_palette.obj \ - $(OBJS)\monodll_pen.obj \ - $(OBJS)\monodll_popupwin.obj \ - $(OBJS)\monodll_printdlg.obj \ - $(OBJS)\monodll_printwin.obj \ - $(OBJS)\monodll_region.obj \ - $(OBJS)\monodll_renderer.obj \ - $(OBJS)\monodll_settings.obj \ - $(OBJS)\monodll_textmeasure.obj \ - $(OBJS)\monodll_tooltip.obj \ - $(OBJS)\monodll_toplevel.obj \ - $(OBJS)\monodll_uiaction.obj \ - $(OBJS)\monodll_utilsgui.obj \ - $(OBJS)\monodll_utilswin.obj \ - $(OBJS)\monodll_uxtheme.obj \ - $(OBJS)\monodll_window.obj \ - $(OBJS)\monodll_helpchm.obj \ - $(OBJS)\monodll_helpwin.obj \ - $(OBJS)\monodll_automtn.obj \ - $(OBJS)\monodll_uuid.obj \ - $(OBJS)\monodll_clrpickerg.obj \ - $(OBJS)\monodll_collpaneg.obj \ - $(OBJS)\monodll_filepickerg.obj \ - $(OBJS)\monodll_fontpickerg.obj \ - $(OBJS)\monodll_generic_statusbr.obj \ - $(OBJS)\monodll_prntdlgg.obj \ - $(OBJS)\monodll_msw_accel.obj \ - $(OBJS)\monodll_anybutton.obj \ - $(OBJS)\monodll_artmsw.obj \ - $(OBJS)\monodll_msw_bmpbuttn.obj \ - $(OBJS)\monodll_msw_button.obj \ - $(OBJS)\monodll_msw_checkbox.obj \ - $(OBJS)\monodll_msw_choice.obj \ - $(OBJS)\monodll_colordlg.obj \ - $(OBJS)\monodll_combo.obj \ - $(OBJS)\monodll_msw_combobox.obj \ - $(OBJS)\monodll_msw_control.obj \ - $(OBJS)\monodll_msw_dialog.obj \ - $(OBJS)\monodll_dirdlg.obj \ - $(OBJS)\monodll_dragimag.obj \ - $(OBJS)\monodll_evtloop.obj \ - $(OBJS)\monodll_filedlg.obj \ - $(OBJS)\monodll_frame.obj \ - $(OBJS)\monodll_msw_gauge.obj \ - $(OBJS)\monodll_headerctrl.obj \ - $(OBJS)\monodll_iniconf.obj \ - $(OBJS)\monodll_msw_listbox.obj \ - $(OBJS)\monodll_msw_listctrl.obj \ - $(OBJS)\monodll_mdi.obj \ - $(OBJS)\monodll_msw_menu.obj \ - $(OBJS)\monodll_menuitem.obj \ - $(OBJS)\monodll_metafile.obj \ - $(OBJS)\monodll_msgdlg.obj \ - $(OBJS)\monodll_nativdlg.obj \ - $(OBJS)\monodll_nativewin.obj \ - $(OBJS)\monodll_msw_notebook.obj \ - $(OBJS)\monodll_access.obj \ - $(OBJS)\monodll_ownerdrw.obj \ - $(OBJS)\monodll_msw_panel.obj \ - $(OBJS)\monodll_progdlg.obj \ - $(OBJS)\monodll_msw_radiobox.obj \ - $(OBJS)\monodll_msw_radiobut.obj \ - $(OBJS)\monodll_richmsgdlg.obj \ - $(OBJS)\monodll_msw_scrolbar.obj \ - $(OBJS)\monodll_msw_slider.obj \ - $(OBJS)\monodll_msw_spinbutt.obj \ - $(OBJS)\monodll_spinctrl.obj \ - $(OBJS)\monodll_msw_statbmp.obj \ - $(OBJS)\monodll_msw_statbox.obj \ - $(OBJS)\monodll_statusbar.obj \ - $(OBJS)\monodll_msw_statline.obj \ - $(OBJS)\monodll_msw_stattext.obj \ - $(OBJS)\monodll_msw_toolbar.obj \ - $(OBJS)\monodll_msw_textctrl.obj \ - $(OBJS)\monodll_textentry.obj \ - $(OBJS)\monodll_msw_tglbtn.obj \ - $(OBJS)\monodll_treectrl.obj \ - $(OBJS)\monodll_msw_checklst.obj \ - $(OBJS)\monodll_msw_fdrepdlg.obj \ - $(OBJS)\monodll_fontdlg.obj \ - $(OBJS)\monodll_accelcmn.obj \ - $(OBJS)\monodll_accesscmn.obj \ - $(OBJS)\monodll_anidecod.obj \ - $(OBJS)\monodll_affinematrix2d.obj \ - $(OBJS)\monodll_appcmn.obj \ - $(OBJS)\monodll_artprov.obj \ - $(OBJS)\monodll_artstd.obj \ - $(OBJS)\monodll_arttango.obj \ - $(OBJS)\monodll_bmpbase.obj \ - $(OBJS)\monodll_bmpbtncmn.obj \ - $(OBJS)\monodll_bookctrl.obj \ - $(OBJS)\monodll_btncmn.obj \ - $(OBJS)\monodll_cairo.obj \ - $(OBJS)\monodll_checkboxcmn.obj \ - $(OBJS)\monodll_checklstcmn.obj \ - $(OBJS)\monodll_choiccmn.obj \ - $(OBJS)\monodll_clipcmn.obj \ - $(OBJS)\monodll_clrpickercmn.obj \ - $(OBJS)\monodll_colourcmn.obj \ - $(OBJS)\monodll_colourdata.obj \ - $(OBJS)\monodll_combocmn.obj \ - $(OBJS)\monodll_cmdproc.obj \ - $(OBJS)\monodll_cmndata.obj \ - $(OBJS)\monodll_containr.obj \ - $(OBJS)\monodll_cshelp.obj \ - $(OBJS)\monodll_ctrlcmn.obj \ - $(OBJS)\monodll_ctrlsub.obj \ - $(OBJS)\monodll_dcbase.obj \ - $(OBJS)\monodll_dcbufcmn.obj \ - $(OBJS)\monodll_dcgraph.obj \ - $(OBJS)\monodll_dcsvg.obj \ - $(OBJS)\monodll_dirctrlcmn.obj \ - $(OBJS)\monodll_dlgcmn.obj \ - $(OBJS)\monodll_dndcmn.obj \ - $(OBJS)\monodll_dobjcmn.obj \ - $(OBJS)\monodll_docmdi.obj \ - $(OBJS)\monodll_docview.obj \ - $(OBJS)\monodll_dpycmn.obj \ - $(OBJS)\monodll_dseldlg.obj \ - $(OBJS)\monodll_effects.obj \ - $(OBJS)\monodll_fddlgcmn.obj \ - $(OBJS)\monodll_filectrlcmn.obj \ - $(OBJS)\monodll_filehistorycmn.obj \ - $(OBJS)\monodll_filepickercmn.obj \ - $(OBJS)\monodll_fontpickercmn.obj \ - $(OBJS)\monodll_fldlgcmn.obj \ - $(OBJS)\monodll_fontcmn.obj \ - $(OBJS)\monodll_fontdata.obj \ - $(OBJS)\monodll_graphicc.obj \ - $(OBJS)\monodll_fontenumcmn.obj \ - $(OBJS)\monodll_fontmap.obj \ - $(OBJS)\monodll_fontutilcmn.obj \ - $(OBJS)\monodll_framecmn.obj \ - $(OBJS)\monodll_gaugecmn.obj \ - $(OBJS)\monodll_gbsizer.obj \ - $(OBJS)\monodll_gdicmn.obj \ - $(OBJS)\monodll_geometry.obj \ - $(OBJS)\monodll_gifdecod.obj \ - $(OBJS)\monodll_graphcmn.obj \ - $(OBJS)\monodll_headercolcmn.obj \ - $(OBJS)\monodll_headerctrlcmn.obj \ - $(OBJS)\monodll_helpbase.obj \ - $(OBJS)\monodll_iconbndl.obj \ - $(OBJS)\monodll_imagall.obj \ - $(OBJS)\monodll_imagbmp.obj \ - $(OBJS)\monodll_image.obj \ - $(OBJS)\monodll_imagfill.obj \ - $(OBJS)\monodll_imaggif.obj \ - $(OBJS)\monodll_imagiff.obj \ - $(OBJS)\monodll_imagjpeg.obj \ - $(OBJS)\monodll_imagpcx.obj \ - $(OBJS)\monodll_imagpng.obj \ - $(OBJS)\monodll_imagpnm.obj \ - $(OBJS)\monodll_imagtga.obj \ - $(OBJS)\monodll_imagtiff.obj \ - $(OBJS)\monodll_imagxpm.obj \ - $(OBJS)\monodll_layout.obj \ - $(OBJS)\monodll_lboxcmn.obj \ - $(OBJS)\monodll_listctrlcmn.obj \ - $(OBJS)\monodll_markupparser.obj \ - $(OBJS)\monodll_matrix.obj \ - $(OBJS)\monodll_menucmn.obj \ - $(OBJS)\monodll_modalhook.obj \ - $(OBJS)\monodll_mousemanager.obj \ - $(OBJS)\monodll_nbkbase.obj \ - $(OBJS)\monodll_overlaycmn.obj \ - $(OBJS)\monodll_ownerdrwcmn.obj \ - $(OBJS)\monodll_paper.obj \ - $(OBJS)\monodll_panelcmn.obj \ - $(OBJS)\monodll_persist.obj \ - $(OBJS)\monodll_pickerbase.obj \ - $(OBJS)\monodll_popupcmn.obj \ - $(OBJS)\monodll_preferencescmn.obj \ - $(OBJS)\monodll_prntbase.obj \ - $(OBJS)\monodll_quantize.obj \ - $(OBJS)\monodll_radiobtncmn.obj \ - $(OBJS)\monodll_radiocmn.obj \ - $(OBJS)\monodll_rearrangectrl.obj \ - $(OBJS)\monodll_rendcmn.obj \ - $(OBJS)\monodll_rgncmn.obj \ - $(OBJS)\monodll_scrolbarcmn.obj \ - $(OBJS)\monodll_settcmn.obj \ - $(OBJS)\monodll_sizer.obj \ - $(OBJS)\monodll_slidercmn.obj \ - $(OBJS)\monodll_spinbtncmn.obj \ - $(OBJS)\monodll_spinctrlcmn.obj \ - $(OBJS)\monodll_srchcmn.obj \ - $(OBJS)\monodll_statbar.obj \ - $(OBJS)\monodll_statbmpcmn.obj \ - $(OBJS)\monodll_statboxcmn.obj \ - $(OBJS)\monodll_statlinecmn.obj \ - $(OBJS)\monodll_stattextcmn.obj \ - $(OBJS)\monodll_stockitem.obj \ - $(OBJS)\monodll_tbarbase.obj \ - $(OBJS)\monodll_textcmn.obj \ - $(OBJS)\monodll_textentrycmn.obj \ - $(OBJS)\monodll_textmeasurecmn.obj \ - $(OBJS)\monodll_toplvcmn.obj \ - $(OBJS)\monodll_treebase.obj \ - $(OBJS)\monodll_uiactioncmn.obj \ - $(OBJS)\monodll_valgen.obj \ - $(OBJS)\monodll_validate.obj \ - $(OBJS)\monodll_valtext.obj \ - $(OBJS)\monodll_valnum.obj \ - $(OBJS)\monodll_wincmn.obj \ - $(OBJS)\monodll_windowid.obj \ - $(OBJS)\monodll_wrapsizer.obj \ - $(OBJS)\monodll_xpmdecod.obj \ - $(OBJS)\monodll_busyinfo.obj \ - $(OBJS)\monodll_generic_buttonbar.obj \ - $(OBJS)\monodll_choicdgg.obj \ - $(OBJS)\monodll_choicbkg.obj \ - $(OBJS)\monodll_combog.obj \ - $(OBJS)\monodll_dcpsg.obj \ - $(OBJS)\monodll_dirctrlg.obj \ - $(OBJS)\monodll_dragimgg.obj \ - $(OBJS)\monodll_filectrlg.obj \ - $(OBJS)\monodll_headerctrlg.obj \ - $(OBJS)\monodll_infobar.obj \ - $(OBJS)\monodll_listbkg.obj \ - $(OBJS)\monodll_logg.obj \ - $(OBJS)\monodll_markuptext.obj \ - $(OBJS)\monodll_msgdlgg.obj \ - $(OBJS)\monodll_numdlgg.obj \ - $(OBJS)\monodll_progdlgg.obj \ - $(OBJS)\monodll_preferencesg.obj \ - $(OBJS)\monodll_printps.obj \ - $(OBJS)\monodll_renderg.obj \ - $(OBJS)\monodll_richmsgdlgg.obj \ - $(OBJS)\monodll_scrlwing.obj \ - $(OBJS)\monodll_selstore.obj \ - $(OBJS)\monodll_spinctlg.obj \ - $(OBJS)\monodll_splitter.obj \ - $(OBJS)\monodll_srchctlg.obj \ - $(OBJS)\monodll_statbmpg.obj \ - $(OBJS)\monodll_stattextg.obj \ - $(OBJS)\monodll_textdlgg.obj \ - $(OBJS)\monodll_tipwin.obj \ - $(OBJS)\monodll_toolbkg.obj \ - $(OBJS)\monodll_treectlg.obj \ - $(OBJS)\monodll_treebkg.obj \ - $(OBJS)\monodll_vlbox.obj \ - $(OBJS)\monodll_vscroll.obj \ - $(OBJS)\monodll_xmlreshandler.obj -!endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -____CORE_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_activex.obj \ - $(OBJS)\monodll_app.obj \ - $(OBJS)\monodll_bitmap.obj \ - $(OBJS)\monodll_brush.obj \ - $(OBJS)\monodll_caret.obj \ - $(OBJS)\monodll_clipbrd.obj \ - $(OBJS)\monodll_colour.obj \ - $(OBJS)\monodll_cursor.obj \ - $(OBJS)\monodll_data.obj \ - $(OBJS)\monodll_dc.obj \ - $(OBJS)\monodll_dcclient.obj \ - $(OBJS)\monodll_dcmemory.obj \ - $(OBJS)\monodll_dcprint.obj \ - $(OBJS)\monodll_dcscreen.obj \ - $(OBJS)\monodll_dialup.obj \ - $(OBJS)\monodll_dib.obj \ - $(OBJS)\monodll_display.obj \ - $(OBJS)\monodll_enhmeta.obj \ - $(OBJS)\monodll_font.obj \ - $(OBJS)\monodll_fontenum.obj \ - $(OBJS)\monodll_fontutil.obj \ - $(OBJS)\monodll_gdiimage.obj \ - $(OBJS)\monodll_gdiobj.obj \ - $(OBJS)\monodll_gdiplus.obj \ - $(OBJS)\monodll_graphics.obj \ - $(OBJS)\monodll_icon.obj \ - $(OBJS)\monodll_imaglist.obj \ - $(OBJS)\monodll_minifram.obj \ - $(OBJS)\monodll_nonownedwnd.obj \ - $(OBJS)\monodll_dataobj.obj \ - $(OBJS)\monodll_dropsrc.obj \ - $(OBJS)\monodll_droptgt.obj \ - $(OBJS)\monodll_oleutils.obj \ - $(OBJS)\monodll_safearray.obj \ - $(OBJS)\monodll_palette.obj \ - $(OBJS)\monodll_pen.obj \ - $(OBJS)\monodll_popupwin.obj \ - $(OBJS)\monodll_printdlg.obj \ - $(OBJS)\monodll_printwin.obj \ - $(OBJS)\monodll_region.obj \ - $(OBJS)\monodll_renderer.obj \ - $(OBJS)\monodll_settings.obj \ - $(OBJS)\monodll_textmeasure.obj \ - $(OBJS)\monodll_tooltip.obj \ - $(OBJS)\monodll_toplevel.obj \ - $(OBJS)\monodll_uiaction.obj \ - $(OBJS)\monodll_utilsgui.obj \ - $(OBJS)\monodll_utilswin.obj \ - $(OBJS)\monodll_uxtheme.obj \ - $(OBJS)\monodll_window.obj \ - $(OBJS)\monodll_helpchm.obj \ - $(OBJS)\monodll_helpwin.obj \ - $(OBJS)\monodll_automtn.obj \ - $(OBJS)\monodll_uuid.obj \ - $(OBJS)\monodll_evtloop.obj \ - $(OBJS)\monodll_generic_accel.obj \ - $(OBJS)\monodll_clrpickerg.obj \ - $(OBJS)\monodll_collpaneg.obj \ - $(OBJS)\monodll_colrdlgg.obj \ - $(OBJS)\monodll_dirdlgg.obj \ - $(OBJS)\monodll_generic_fdrepdlg.obj \ - $(OBJS)\monodll_filedlgg.obj \ - $(OBJS)\monodll_filepickerg.obj \ - $(OBJS)\monodll_fontdlgg.obj \ - $(OBJS)\monodll_fontpickerg.obj \ - $(OBJS)\monodll_generic_listctrl.obj \ - $(OBJS)\monodll_mdig.obj \ - $(OBJS)\monodll_prntdlgg.obj \ - $(OBJS)\monodll_univ_bmpbuttn.obj \ - $(OBJS)\monodll_univ_button.obj \ - $(OBJS)\monodll_univ_checkbox.obj \ - $(OBJS)\monodll_univ_checklst.obj \ - $(OBJS)\monodll_univ_choice.obj \ - $(OBJS)\monodll_univ_combobox.obj \ - $(OBJS)\monodll_univ_control.obj \ - $(OBJS)\monodll_ctrlrend.obj \ - $(OBJS)\monodll_univ_dialog.obj \ - $(OBJS)\monodll_framuniv.obj \ - $(OBJS)\monodll_univ_gauge.obj \ - $(OBJS)\monodll_inpcons.obj \ - $(OBJS)\monodll_inphand.obj \ - $(OBJS)\monodll_univ_listbox.obj \ - $(OBJS)\monodll_univ_menu.obj \ - $(OBJS)\monodll_univ_notebook.obj \ - $(OBJS)\monodll_univ_radiobox.obj \ - $(OBJS)\monodll_univ_radiobut.obj \ - $(OBJS)\monodll_scrarrow.obj \ - $(OBJS)\monodll_univ_scrolbar.obj \ - $(OBJS)\monodll_scrthumb.obj \ - $(OBJS)\monodll_settingsuniv.obj \ - $(OBJS)\monodll_univ_slider.obj \ - $(OBJS)\monodll_univ_spinbutt.obj \ - $(OBJS)\monodll_univ_statbmp.obj \ - $(OBJS)\monodll_univ_statbox.obj \ - $(OBJS)\monodll_univ_statline.obj \ - $(OBJS)\monodll_univ_stattext.obj \ - $(OBJS)\monodll_univ_statusbr.obj \ - $(OBJS)\monodll_stdrend.obj \ - $(OBJS)\monodll_univ_textctrl.obj \ - $(OBJS)\monodll_univ_tglbtn.obj \ - $(OBJS)\monodll_theme.obj \ - $(OBJS)\monodll_univ_toolbar.obj \ - $(OBJS)\monodll_topluniv.obj \ - $(OBJS)\monodll_winuniv.obj \ - $(OBJS)\monodll_gtk.obj \ - $(OBJS)\monodll_metal.obj \ - $(OBJS)\monodll_mono.obj \ - $(OBJS)\monodll_win32.obj \ - $(OBJS)\monodll_accelcmn.obj \ - $(OBJS)\monodll_accesscmn.obj \ - $(OBJS)\monodll_anidecod.obj \ - $(OBJS)\monodll_affinematrix2d.obj \ - $(OBJS)\monodll_appcmn.obj \ - $(OBJS)\monodll_artprov.obj \ - $(OBJS)\monodll_artstd.obj \ - $(OBJS)\monodll_arttango.obj \ - $(OBJS)\monodll_bmpbase.obj \ - $(OBJS)\monodll_bmpbtncmn.obj \ - $(OBJS)\monodll_bookctrl.obj \ - $(OBJS)\monodll_btncmn.obj \ - $(OBJS)\monodll_cairo.obj \ - $(OBJS)\monodll_checkboxcmn.obj \ - $(OBJS)\monodll_checklstcmn.obj \ - $(OBJS)\monodll_choiccmn.obj \ - $(OBJS)\monodll_clipcmn.obj \ - $(OBJS)\monodll_clrpickercmn.obj \ - $(OBJS)\monodll_colourcmn.obj \ - $(OBJS)\monodll_colourdata.obj \ - $(OBJS)\monodll_combocmn.obj \ - $(OBJS)\monodll_cmdproc.obj \ - $(OBJS)\monodll_cmndata.obj \ - $(OBJS)\monodll_containr.obj \ - $(OBJS)\monodll_cshelp.obj \ - $(OBJS)\monodll_ctrlcmn.obj \ - $(OBJS)\monodll_ctrlsub.obj \ - $(OBJS)\monodll_dcbase.obj \ - $(OBJS)\monodll_dcbufcmn.obj \ - $(OBJS)\monodll_dcgraph.obj \ - $(OBJS)\monodll_dcsvg.obj \ - $(OBJS)\monodll_dirctrlcmn.obj \ - $(OBJS)\monodll_dlgcmn.obj \ - $(OBJS)\monodll_dndcmn.obj \ - $(OBJS)\monodll_dobjcmn.obj \ - $(OBJS)\monodll_docmdi.obj \ - $(OBJS)\monodll_docview.obj \ - $(OBJS)\monodll_dpycmn.obj \ - $(OBJS)\monodll_dseldlg.obj \ - $(OBJS)\monodll_effects.obj \ - $(OBJS)\monodll_fddlgcmn.obj \ - $(OBJS)\monodll_filectrlcmn.obj \ - $(OBJS)\monodll_filehistorycmn.obj \ - $(OBJS)\monodll_filepickercmn.obj \ - $(OBJS)\monodll_fontpickercmn.obj \ - $(OBJS)\monodll_fldlgcmn.obj \ - $(OBJS)\monodll_fontcmn.obj \ - $(OBJS)\monodll_fontdata.obj \ - $(OBJS)\monodll_graphicc.obj \ - $(OBJS)\monodll_fontenumcmn.obj \ - $(OBJS)\monodll_fontmap.obj \ - $(OBJS)\monodll_fontutilcmn.obj \ - $(OBJS)\monodll_framecmn.obj \ - $(OBJS)\monodll_gaugecmn.obj \ - $(OBJS)\monodll_gbsizer.obj \ - $(OBJS)\monodll_gdicmn.obj \ - $(OBJS)\monodll_geometry.obj \ - $(OBJS)\monodll_gifdecod.obj \ - $(OBJS)\monodll_graphcmn.obj \ - $(OBJS)\monodll_headercolcmn.obj \ - $(OBJS)\monodll_headerctrlcmn.obj \ - $(OBJS)\monodll_helpbase.obj \ - $(OBJS)\monodll_iconbndl.obj \ - $(OBJS)\monodll_imagall.obj \ - $(OBJS)\monodll_imagbmp.obj \ - $(OBJS)\monodll_image.obj \ - $(OBJS)\monodll_imagfill.obj \ - $(OBJS)\monodll_imaggif.obj \ - $(OBJS)\monodll_imagiff.obj \ - $(OBJS)\monodll_imagjpeg.obj \ - $(OBJS)\monodll_imagpcx.obj \ - $(OBJS)\monodll_imagpng.obj \ - $(OBJS)\monodll_imagpnm.obj \ - $(OBJS)\monodll_imagtga.obj \ - $(OBJS)\monodll_imagtiff.obj \ - $(OBJS)\monodll_imagxpm.obj \ - $(OBJS)\monodll_layout.obj \ - $(OBJS)\monodll_lboxcmn.obj \ - $(OBJS)\monodll_listctrlcmn.obj \ - $(OBJS)\monodll_markupparser.obj \ - $(OBJS)\monodll_matrix.obj \ - $(OBJS)\monodll_menucmn.obj \ - $(OBJS)\monodll_modalhook.obj \ - $(OBJS)\monodll_mousemanager.obj \ - $(OBJS)\monodll_nbkbase.obj \ - $(OBJS)\monodll_overlaycmn.obj \ - $(OBJS)\monodll_ownerdrwcmn.obj \ - $(OBJS)\monodll_paper.obj \ - $(OBJS)\monodll_panelcmn.obj \ - $(OBJS)\monodll_persist.obj \ - $(OBJS)\monodll_pickerbase.obj \ - $(OBJS)\monodll_popupcmn.obj \ - $(OBJS)\monodll_preferencescmn.obj \ - $(OBJS)\monodll_prntbase.obj \ - $(OBJS)\monodll_quantize.obj \ - $(OBJS)\monodll_radiobtncmn.obj \ - $(OBJS)\monodll_radiocmn.obj \ - $(OBJS)\monodll_rearrangectrl.obj \ - $(OBJS)\monodll_rendcmn.obj \ - $(OBJS)\monodll_rgncmn.obj \ - $(OBJS)\monodll_scrolbarcmn.obj \ - $(OBJS)\monodll_settcmn.obj \ - $(OBJS)\monodll_sizer.obj \ - $(OBJS)\monodll_slidercmn.obj \ - $(OBJS)\monodll_spinbtncmn.obj \ - $(OBJS)\monodll_spinctrlcmn.obj \ - $(OBJS)\monodll_srchcmn.obj \ - $(OBJS)\monodll_statbar.obj \ - $(OBJS)\monodll_statbmpcmn.obj \ - $(OBJS)\monodll_statboxcmn.obj \ - $(OBJS)\monodll_statlinecmn.obj \ - $(OBJS)\monodll_stattextcmn.obj \ - $(OBJS)\monodll_stockitem.obj \ - $(OBJS)\monodll_tbarbase.obj \ - $(OBJS)\monodll_textcmn.obj \ - $(OBJS)\monodll_textentrycmn.obj \ - $(OBJS)\monodll_textmeasurecmn.obj \ - $(OBJS)\monodll_toplvcmn.obj \ - $(OBJS)\monodll_treebase.obj \ - $(OBJS)\monodll_uiactioncmn.obj \ - $(OBJS)\monodll_valgen.obj \ - $(OBJS)\monodll_validate.obj \ - $(OBJS)\monodll_valtext.obj \ - $(OBJS)\monodll_valnum.obj \ - $(OBJS)\monodll_wincmn.obj \ - $(OBJS)\monodll_windowid.obj \ - $(OBJS)\monodll_wrapsizer.obj \ - $(OBJS)\monodll_xpmdecod.obj \ - $(OBJS)\monodll_busyinfo.obj \ - $(OBJS)\monodll_generic_buttonbar.obj \ - $(OBJS)\monodll_choicdgg.obj \ - $(OBJS)\monodll_choicbkg.obj \ - $(OBJS)\monodll_combog.obj \ - $(OBJS)\monodll_dcpsg.obj \ - $(OBJS)\monodll_dirctrlg.obj \ - $(OBJS)\monodll_dragimgg.obj \ - $(OBJS)\monodll_filectrlg.obj \ - $(OBJS)\monodll_headerctrlg.obj \ - $(OBJS)\monodll_infobar.obj \ - $(OBJS)\monodll_listbkg.obj \ - $(OBJS)\monodll_logg.obj \ - $(OBJS)\monodll_markuptext.obj \ - $(OBJS)\monodll_msgdlgg.obj \ - $(OBJS)\monodll_numdlgg.obj \ - $(OBJS)\monodll_progdlgg.obj \ - $(OBJS)\monodll_preferencesg.obj \ - $(OBJS)\monodll_printps.obj \ - $(OBJS)\monodll_renderg.obj \ - $(OBJS)\monodll_richmsgdlgg.obj \ - $(OBJS)\monodll_scrlwing.obj \ - $(OBJS)\monodll_selstore.obj \ - $(OBJS)\monodll_spinctlg.obj \ - $(OBJS)\monodll_splitter.obj \ - $(OBJS)\monodll_srchctlg.obj \ - $(OBJS)\monodll_statbmpg.obj \ - $(OBJS)\monodll_stattextg.obj \ - $(OBJS)\monodll_textdlgg.obj \ - $(OBJS)\monodll_tipwin.obj \ - $(OBJS)\monodll_toolbkg.obj \ - $(OBJS)\monodll_treectlg.obj \ - $(OBJS)\monodll_treebkg.obj \ - $(OBJS)\monodll_vlbox.obj \ - $(OBJS)\monodll_vscroll.obj \ - $(OBJS)\monodll_xmlreshandler.obj -!endif -!if "$(WXUNIV)" == "0" -____ADVANCED_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_animatecmn.obj \ - $(OBJS)\monodll_bmpcboxcmn.obj \ - $(OBJS)\monodll_calctrlcmn.obj \ - $(OBJS)\monodll_datavcmn.obj \ - $(OBJS)\monodll_gridcmn.obj \ - $(OBJS)\monodll_hyperlnkcmn.obj \ - $(OBJS)\monodll_odcombocmn.obj \ - $(OBJS)\monodll_richtooltipcmn.obj \ - $(OBJS)\monodll_aboutdlgg.obj \ - $(OBJS)\monodll_bannerwindow.obj \ - $(OBJS)\monodll_bmpcboxg.obj \ - $(OBJS)\monodll_calctrlg.obj \ - $(OBJS)\monodll_commandlinkbuttong.obj \ - $(OBJS)\monodll_datavgen.obj \ - $(OBJS)\monodll_datectlg.obj \ - $(OBJS)\monodll_editlbox.obj \ - $(OBJS)\monodll_grid.obj \ - $(OBJS)\monodll_gridctrl.obj \ - $(OBJS)\monodll_grideditors.obj \ - $(OBJS)\monodll_gridsel.obj \ - $(OBJS)\monodll_helpext.obj \ - $(OBJS)\monodll_hyperlinkg.obj \ - $(OBJS)\monodll_laywin.obj \ - $(OBJS)\monodll_notifmsgg.obj \ - $(OBJS)\monodll_odcombo.obj \ - $(OBJS)\monodll_propdlg.obj \ - $(OBJS)\monodll_richtooltipg.obj \ - $(OBJS)\monodll_sashwin.obj \ - $(OBJS)\monodll_splash.obj \ - $(OBJS)\monodll_timectrlg.obj \ - $(OBJS)\monodll_tipdlg.obj \ - $(OBJS)\monodll_treelist.obj \ - $(OBJS)\monodll_wizard.obj \ - $(OBJS)\monodll_taskbarcmn.obj \ - $(OBJS)\monodll_aboutdlg.obj \ - $(OBJS)\monodll_notifmsg.obj \ - $(OBJS)\monodll_richtooltip.obj \ - $(OBJS)\monodll_sound.obj \ - $(OBJS)\monodll_taskbar.obj \ - $(OBJS)\monodll_joystick.obj \ - $(OBJS)\monodll_animateg.obj \ - $(OBJS)\monodll_bmpcbox.obj \ - $(OBJS)\monodll_calctrl.obj \ - $(OBJS)\monodll_commandlinkbutton.obj \ - $(OBJS)\monodll_datecontrols.obj \ - $(OBJS)\monodll_datectrl.obj \ - $(OBJS)\monodll_datetimectrl.obj \ - $(OBJS)\monodll_hyperlink.obj \ - $(OBJS)\monodll_timectrl.obj -!endif -!if "$(WXUNIV)" == "1" -____ADVANCED_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_animatecmn.obj \ - $(OBJS)\monodll_bmpcboxcmn.obj \ - $(OBJS)\monodll_calctrlcmn.obj \ - $(OBJS)\monodll_datavcmn.obj \ - $(OBJS)\monodll_gridcmn.obj \ - $(OBJS)\monodll_hyperlnkcmn.obj \ - $(OBJS)\monodll_odcombocmn.obj \ - $(OBJS)\monodll_richtooltipcmn.obj \ - $(OBJS)\monodll_aboutdlgg.obj \ - $(OBJS)\monodll_bannerwindow.obj \ - $(OBJS)\monodll_bmpcboxg.obj \ - $(OBJS)\monodll_calctrlg.obj \ - $(OBJS)\monodll_commandlinkbuttong.obj \ - $(OBJS)\monodll_datavgen.obj \ - $(OBJS)\monodll_datectlg.obj \ - $(OBJS)\monodll_editlbox.obj \ - $(OBJS)\monodll_grid.obj \ - $(OBJS)\monodll_gridctrl.obj \ - $(OBJS)\monodll_grideditors.obj \ - $(OBJS)\monodll_gridsel.obj \ - $(OBJS)\monodll_helpext.obj \ - $(OBJS)\monodll_hyperlinkg.obj \ - $(OBJS)\monodll_laywin.obj \ - $(OBJS)\monodll_notifmsgg.obj \ - $(OBJS)\monodll_odcombo.obj \ - $(OBJS)\monodll_propdlg.obj \ - $(OBJS)\monodll_richtooltipg.obj \ - $(OBJS)\monodll_sashwin.obj \ - $(OBJS)\monodll_splash.obj \ - $(OBJS)\monodll_timectrlg.obj \ - $(OBJS)\monodll_tipdlg.obj \ - $(OBJS)\monodll_treelist.obj \ - $(OBJS)\monodll_wizard.obj \ - $(OBJS)\monodll_taskbarcmn.obj \ - $(OBJS)\monodll_aboutdlg.obj \ - $(OBJS)\monodll_notifmsg.obj \ - $(OBJS)\monodll_richtooltip.obj \ - $(OBJS)\monodll_sound.obj \ - $(OBJS)\monodll_taskbar.obj \ - $(OBJS)\monodll_joystick.obj \ - $(OBJS)\monodll_animateg.obj -!endif -!if "$(USE_STC)" == "1" -__wxscintilla_library_link_DEP = $(__wxscintilla) -!endif -!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" -__monolib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(USE_GUI)" == "1" -____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ - $(____CORE_SRC_FILENAMES_1_OBJECTS) \ - $(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \ - $(OBJS)\monolib_mediactrlcmn.obj \ - $(OBJS)\monolib_mediactrl_am.obj \ - $(OBJS)\monolib_mediactrl_wmp10.obj \ - $(OBJS)\monolib_mediactrl_qt.obj \ - $(OBJS)\monolib_helpbest.obj \ - $(OBJS)\monolib_helpctrl.obj \ - $(OBJS)\monolib_helpdata.obj \ - $(OBJS)\monolib_helpdlg.obj \ - $(OBJS)\monolib_helpfrm.obj \ - $(OBJS)\monolib_helpwnd.obj \ - $(OBJS)\monolib_htmlcell.obj \ - $(OBJS)\monolib_htmlfilt.obj \ - $(OBJS)\monolib_htmlpars.obj \ - $(OBJS)\monolib_htmltag.obj \ - $(OBJS)\monolib_htmlwin.obj \ - $(OBJS)\monolib_htmprint.obj \ - $(OBJS)\monolib_m_dflist.obj \ - $(OBJS)\monolib_m_fonts.obj \ - $(OBJS)\monolib_m_hline.obj \ - $(OBJS)\monolib_m_image.obj \ - $(OBJS)\monolib_m_layout.obj \ - $(OBJS)\monolib_m_links.obj \ - $(OBJS)\monolib_m_list.obj \ - $(OBJS)\monolib_m_pre.obj \ - $(OBJS)\monolib_m_span.obj \ - $(OBJS)\monolib_m_style.obj \ - $(OBJS)\monolib_m_tables.obj \ - $(OBJS)\monolib_styleparams.obj \ - $(OBJS)\monolib_winpars.obj \ - $(OBJS)\monolib_htmllbox.obj \ - $(OBJS)\monolib_webview_ie.obj \ - $(OBJS)\monolib_webview.obj \ - $(OBJS)\monolib_webviewarchivehandler.obj \ - $(OBJS)\monolib_webviewfshandler.obj \ - $(OBJS)\monolib_debugrpt.obj \ - $(OBJS)\monolib_dbgrptg.obj \ - $(OBJS)\monolib_xh_animatctrl.obj \ - $(OBJS)\monolib_xh_bannerwindow.obj \ - $(OBJS)\monolib_xh_bmp.obj \ - $(OBJS)\monolib_xh_bmpcbox.obj \ - $(OBJS)\monolib_xh_bmpbt.obj \ - $(OBJS)\monolib_xh_bttn.obj \ - $(OBJS)\monolib_xh_cald.obj \ - $(OBJS)\monolib_xh_chckb.obj \ - $(OBJS)\monolib_xh_chckl.obj \ - $(OBJS)\monolib_xh_choic.obj \ - $(OBJS)\monolib_xh_choicbk.obj \ - $(OBJS)\monolib_xh_clrpicker.obj \ - $(OBJS)\monolib_xh_cmdlinkbn.obj \ - $(OBJS)\monolib_xh_collpane.obj \ - $(OBJS)\monolib_xh_combo.obj \ - $(OBJS)\monolib_xh_comboctrl.obj \ - $(OBJS)\monolib_xh_datectrl.obj \ - $(OBJS)\monolib_xh_dirpicker.obj \ - $(OBJS)\monolib_xh_dlg.obj \ - $(OBJS)\monolib_xh_editlbox.obj \ - $(OBJS)\monolib_xh_filectrl.obj \ - $(OBJS)\monolib_xh_filepicker.obj \ - $(OBJS)\monolib_xh_fontpicker.obj \ - $(OBJS)\monolib_xh_frame.obj \ - $(OBJS)\monolib_xh_gauge.obj \ - $(OBJS)\monolib_xh_gdctl.obj \ - $(OBJS)\monolib_xh_grid.obj \ - $(OBJS)\monolib_xh_html.obj \ - $(OBJS)\monolib_xh_hyperlink.obj \ - $(OBJS)\monolib_xh_listb.obj \ - $(OBJS)\monolib_xh_listbk.obj \ - $(OBJS)\monolib_xh_listc.obj \ - $(OBJS)\monolib_xh_mdi.obj \ - $(OBJS)\monolib_xh_menu.obj \ - $(OBJS)\monolib_xh_notbk.obj \ - $(OBJS)\monolib_xh_odcombo.obj \ - $(OBJS)\monolib_xh_panel.obj \ - $(OBJS)\monolib_xh_propdlg.obj \ - $(OBJS)\monolib_xh_radbt.obj \ - $(OBJS)\monolib_xh_radbx.obj \ - $(OBJS)\monolib_xh_scrol.obj \ - $(OBJS)\monolib_xh_scwin.obj \ - $(OBJS)\monolib_xh_htmllbox.obj \ - $(OBJS)\monolib_xh_sizer.obj \ - $(OBJS)\monolib_xh_slidr.obj \ - $(OBJS)\monolib_xh_spin.obj \ - $(OBJS)\monolib_xh_split.obj \ - $(OBJS)\monolib_xh_srchctrl.obj \ - $(OBJS)\monolib_xh_statbar.obj \ - $(OBJS)\monolib_xh_stbmp.obj \ - $(OBJS)\monolib_xh_stbox.obj \ - $(OBJS)\monolib_xh_stlin.obj \ - $(OBJS)\monolib_xh_sttxt.obj \ - $(OBJS)\monolib_xh_text.obj \ - $(OBJS)\monolib_xh_tglbtn.obj \ - $(OBJS)\monolib_xh_timectrl.obj \ - $(OBJS)\monolib_xh_toolb.obj \ - $(OBJS)\monolib_xh_toolbk.obj \ - $(OBJS)\monolib_xh_tree.obj \ - $(OBJS)\monolib_xh_treebk.obj \ - $(OBJS)\monolib_xh_unkwn.obj \ - $(OBJS)\monolib_xh_wizrd.obj \ - $(OBJS)\monolib_xmlres.obj \ - $(OBJS)\monolib_xmladv.obj \ - $(OBJS)\monolib_xmlrsall.obj \ - $(OBJS)\monolib_framemanager.obj \ - $(OBJS)\monolib_dockart.obj \ - $(OBJS)\monolib_floatpane.obj \ - $(OBJS)\monolib_auibook.obj \ - $(OBJS)\monolib_auibar.obj \ - $(OBJS)\monolib_tabmdi.obj \ - $(OBJS)\monolib_tabart.obj \ - $(OBJS)\monolib_xh_auinotbk.obj \ - $(OBJS)\monolib_advprops.obj \ - $(OBJS)\monolib_editors.obj \ - $(OBJS)\monolib_manager.obj \ - $(OBJS)\monolib_property.obj \ - $(OBJS)\monolib_propgrid.obj \ - $(OBJS)\monolib_propgridiface.obj \ - $(OBJS)\monolib_propgridpagestate.obj \ - $(OBJS)\monolib_props.obj \ - $(OBJS)\monolib_art_internal.obj \ - $(OBJS)\monolib_art_msw.obj \ - $(OBJS)\monolib_art_aui.obj \ - $(OBJS)\monolib_bar.obj \ - $(OBJS)\monolib_ribbon_buttonbar.obj \ - $(OBJS)\monolib_ribbon_control.obj \ - $(OBJS)\monolib_gallery.obj \ - $(OBJS)\monolib_page.obj \ - $(OBJS)\monolib_ribbon_panel.obj \ - $(OBJS)\monolib_ribbon_toolbar.obj \ - $(OBJS)\monolib_xh_ribbon.obj \ - $(OBJS)\monolib_richtextbuffer.obj \ - $(OBJS)\monolib_richtextctrl.obj \ - $(OBJS)\monolib_richtextformatdlg.obj \ - $(OBJS)\monolib_richtexthtml.obj \ - $(OBJS)\monolib_richtextimagedlg.obj \ - $(OBJS)\monolib_richtextprint.obj \ - $(OBJS)\monolib_richtextstyledlg.obj \ - $(OBJS)\monolib_richtextstyles.obj \ - $(OBJS)\monolib_richtextsymboldlg.obj \ - $(OBJS)\monolib_richtextxml.obj \ - $(OBJS)\monolib_xh_richtext.obj \ - $(OBJS)\monolib_stc.obj \ - $(OBJS)\monolib_PlatWX.obj \ - $(OBJS)\monolib_ScintillaWX.obj -!endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -____CORE_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_activex.obj \ - $(OBJS)\monolib_app.obj \ - $(OBJS)\monolib_bitmap.obj \ - $(OBJS)\monolib_brush.obj \ - $(OBJS)\monolib_caret.obj \ - $(OBJS)\monolib_clipbrd.obj \ - $(OBJS)\monolib_colour.obj \ - $(OBJS)\monolib_cursor.obj \ - $(OBJS)\monolib_data.obj \ - $(OBJS)\monolib_dc.obj \ - $(OBJS)\monolib_dcclient.obj \ - $(OBJS)\monolib_dcmemory.obj \ - $(OBJS)\monolib_dcprint.obj \ - $(OBJS)\monolib_dcscreen.obj \ - $(OBJS)\monolib_dialup.obj \ - $(OBJS)\monolib_dib.obj \ - $(OBJS)\monolib_display.obj \ - $(OBJS)\monolib_enhmeta.obj \ - $(OBJS)\monolib_font.obj \ - $(OBJS)\monolib_fontenum.obj \ - $(OBJS)\monolib_fontutil.obj \ - $(OBJS)\monolib_gdiimage.obj \ - $(OBJS)\monolib_gdiobj.obj \ - $(OBJS)\monolib_gdiplus.obj \ - $(OBJS)\monolib_graphics.obj \ - $(OBJS)\monolib_icon.obj \ - $(OBJS)\monolib_imaglist.obj \ - $(OBJS)\monolib_minifram.obj \ - $(OBJS)\monolib_nonownedwnd.obj \ - $(OBJS)\monolib_dataobj.obj \ - $(OBJS)\monolib_dropsrc.obj \ - $(OBJS)\monolib_droptgt.obj \ - $(OBJS)\monolib_oleutils.obj \ - $(OBJS)\monolib_safearray.obj \ - $(OBJS)\monolib_palette.obj \ - $(OBJS)\monolib_pen.obj \ - $(OBJS)\monolib_popupwin.obj \ - $(OBJS)\monolib_printdlg.obj \ - $(OBJS)\monolib_printwin.obj \ - $(OBJS)\monolib_region.obj \ - $(OBJS)\monolib_renderer.obj \ - $(OBJS)\monolib_settings.obj \ - $(OBJS)\monolib_textmeasure.obj \ - $(OBJS)\monolib_tooltip.obj \ - $(OBJS)\monolib_toplevel.obj \ - $(OBJS)\monolib_uiaction.obj \ - $(OBJS)\monolib_utilsgui.obj \ - $(OBJS)\monolib_utilswin.obj \ - $(OBJS)\monolib_uxtheme.obj \ - $(OBJS)\monolib_window.obj \ - $(OBJS)\monolib_helpchm.obj \ - $(OBJS)\monolib_helpwin.obj \ - $(OBJS)\monolib_automtn.obj \ - $(OBJS)\monolib_uuid.obj \ - $(OBJS)\monolib_clrpickerg.obj \ - $(OBJS)\monolib_collpaneg.obj \ - $(OBJS)\monolib_filepickerg.obj \ - $(OBJS)\monolib_fontpickerg.obj \ - $(OBJS)\monolib_generic_statusbr.obj \ - $(OBJS)\monolib_prntdlgg.obj \ - $(OBJS)\monolib_msw_accel.obj \ - $(OBJS)\monolib_anybutton.obj \ - $(OBJS)\monolib_artmsw.obj \ - $(OBJS)\monolib_msw_bmpbuttn.obj \ - $(OBJS)\monolib_msw_button.obj \ - $(OBJS)\monolib_msw_checkbox.obj \ - $(OBJS)\monolib_msw_choice.obj \ - $(OBJS)\monolib_colordlg.obj \ - $(OBJS)\monolib_combo.obj \ - $(OBJS)\monolib_msw_combobox.obj \ - $(OBJS)\monolib_msw_control.obj \ - $(OBJS)\monolib_msw_dialog.obj \ - $(OBJS)\monolib_dirdlg.obj \ - $(OBJS)\monolib_dragimag.obj \ - $(OBJS)\monolib_evtloop.obj \ - $(OBJS)\monolib_filedlg.obj \ - $(OBJS)\monolib_frame.obj \ - $(OBJS)\monolib_msw_gauge.obj \ - $(OBJS)\monolib_headerctrl.obj \ - $(OBJS)\monolib_iniconf.obj \ - $(OBJS)\monolib_msw_listbox.obj \ - $(OBJS)\monolib_msw_listctrl.obj \ - $(OBJS)\monolib_mdi.obj \ - $(OBJS)\monolib_msw_menu.obj \ - $(OBJS)\monolib_menuitem.obj \ - $(OBJS)\monolib_metafile.obj \ - $(OBJS)\monolib_msgdlg.obj \ - $(OBJS)\monolib_nativdlg.obj \ - $(OBJS)\monolib_nativewin.obj \ - $(OBJS)\monolib_msw_notebook.obj \ - $(OBJS)\monolib_access.obj \ - $(OBJS)\monolib_ownerdrw.obj \ - $(OBJS)\monolib_msw_panel.obj \ - $(OBJS)\monolib_progdlg.obj \ - $(OBJS)\monolib_msw_radiobox.obj \ - $(OBJS)\monolib_msw_radiobut.obj \ - $(OBJS)\monolib_richmsgdlg.obj \ - $(OBJS)\monolib_msw_scrolbar.obj \ - $(OBJS)\monolib_msw_slider.obj \ - $(OBJS)\monolib_msw_spinbutt.obj \ - $(OBJS)\monolib_spinctrl.obj \ - $(OBJS)\monolib_msw_statbmp.obj \ - $(OBJS)\monolib_msw_statbox.obj \ - $(OBJS)\monolib_statusbar.obj \ - $(OBJS)\monolib_msw_statline.obj \ - $(OBJS)\monolib_msw_stattext.obj \ - $(OBJS)\monolib_msw_toolbar.obj \ - $(OBJS)\monolib_msw_textctrl.obj \ - $(OBJS)\monolib_textentry.obj \ - $(OBJS)\monolib_msw_tglbtn.obj \ - $(OBJS)\monolib_treectrl.obj \ - $(OBJS)\monolib_msw_checklst.obj \ - $(OBJS)\monolib_msw_fdrepdlg.obj \ - $(OBJS)\monolib_fontdlg.obj \ - $(OBJS)\monolib_accelcmn.obj \ - $(OBJS)\monolib_accesscmn.obj \ - $(OBJS)\monolib_anidecod.obj \ - $(OBJS)\monolib_affinematrix2d.obj \ - $(OBJS)\monolib_appcmn.obj \ - $(OBJS)\monolib_artprov.obj \ - $(OBJS)\monolib_artstd.obj \ - $(OBJS)\monolib_arttango.obj \ - $(OBJS)\monolib_bmpbase.obj \ - $(OBJS)\monolib_bmpbtncmn.obj \ - $(OBJS)\monolib_bookctrl.obj \ - $(OBJS)\monolib_btncmn.obj \ - $(OBJS)\monolib_cairo.obj \ - $(OBJS)\monolib_checkboxcmn.obj \ - $(OBJS)\monolib_checklstcmn.obj \ - $(OBJS)\monolib_choiccmn.obj \ - $(OBJS)\monolib_clipcmn.obj \ - $(OBJS)\monolib_clrpickercmn.obj \ - $(OBJS)\monolib_colourcmn.obj \ - $(OBJS)\monolib_colourdata.obj \ - $(OBJS)\monolib_combocmn.obj \ - $(OBJS)\monolib_cmdproc.obj \ - $(OBJS)\monolib_cmndata.obj \ - $(OBJS)\monolib_containr.obj \ - $(OBJS)\monolib_cshelp.obj \ - $(OBJS)\monolib_ctrlcmn.obj \ - $(OBJS)\monolib_ctrlsub.obj \ - $(OBJS)\monolib_dcbase.obj \ - $(OBJS)\monolib_dcbufcmn.obj \ - $(OBJS)\monolib_dcgraph.obj \ - $(OBJS)\monolib_dcsvg.obj \ - $(OBJS)\monolib_dirctrlcmn.obj \ - $(OBJS)\monolib_dlgcmn.obj \ - $(OBJS)\monolib_dndcmn.obj \ - $(OBJS)\monolib_dobjcmn.obj \ - $(OBJS)\monolib_docmdi.obj \ - $(OBJS)\monolib_docview.obj \ - $(OBJS)\monolib_dpycmn.obj \ - $(OBJS)\monolib_dseldlg.obj \ - $(OBJS)\monolib_effects.obj \ - $(OBJS)\monolib_fddlgcmn.obj \ - $(OBJS)\monolib_filectrlcmn.obj \ - $(OBJS)\monolib_filehistorycmn.obj \ - $(OBJS)\monolib_filepickercmn.obj \ - $(OBJS)\monolib_fontpickercmn.obj \ - $(OBJS)\monolib_fldlgcmn.obj \ - $(OBJS)\monolib_fontcmn.obj \ - $(OBJS)\monolib_fontdata.obj \ - $(OBJS)\monolib_graphicc.obj \ - $(OBJS)\monolib_fontenumcmn.obj \ - $(OBJS)\monolib_fontmap.obj \ - $(OBJS)\monolib_fontutilcmn.obj \ - $(OBJS)\monolib_framecmn.obj \ - $(OBJS)\monolib_gaugecmn.obj \ - $(OBJS)\monolib_gbsizer.obj \ - $(OBJS)\monolib_gdicmn.obj \ - $(OBJS)\monolib_geometry.obj \ - $(OBJS)\monolib_gifdecod.obj \ - $(OBJS)\monolib_graphcmn.obj \ - $(OBJS)\monolib_headercolcmn.obj \ - $(OBJS)\monolib_headerctrlcmn.obj \ - $(OBJS)\monolib_helpbase.obj \ - $(OBJS)\monolib_iconbndl.obj \ - $(OBJS)\monolib_imagall.obj \ - $(OBJS)\monolib_imagbmp.obj \ - $(OBJS)\monolib_image.obj \ - $(OBJS)\monolib_imagfill.obj \ - $(OBJS)\monolib_imaggif.obj \ - $(OBJS)\monolib_imagiff.obj \ - $(OBJS)\monolib_imagjpeg.obj \ - $(OBJS)\monolib_imagpcx.obj \ - $(OBJS)\monolib_imagpng.obj \ - $(OBJS)\monolib_imagpnm.obj \ - $(OBJS)\monolib_imagtga.obj \ - $(OBJS)\monolib_imagtiff.obj \ - $(OBJS)\monolib_imagxpm.obj \ - $(OBJS)\monolib_layout.obj \ - $(OBJS)\monolib_lboxcmn.obj \ - $(OBJS)\monolib_listctrlcmn.obj \ - $(OBJS)\monolib_markupparser.obj \ - $(OBJS)\monolib_matrix.obj \ - $(OBJS)\monolib_menucmn.obj \ - $(OBJS)\monolib_modalhook.obj \ - $(OBJS)\monolib_mousemanager.obj \ - $(OBJS)\monolib_nbkbase.obj \ - $(OBJS)\monolib_overlaycmn.obj \ - $(OBJS)\monolib_ownerdrwcmn.obj \ - $(OBJS)\monolib_paper.obj \ - $(OBJS)\monolib_panelcmn.obj \ - $(OBJS)\monolib_persist.obj \ - $(OBJS)\monolib_pickerbase.obj \ - $(OBJS)\monolib_popupcmn.obj \ - $(OBJS)\monolib_preferencescmn.obj \ - $(OBJS)\monolib_prntbase.obj \ - $(OBJS)\monolib_quantize.obj \ - $(OBJS)\monolib_radiobtncmn.obj \ - $(OBJS)\monolib_radiocmn.obj \ - $(OBJS)\monolib_rearrangectrl.obj \ - $(OBJS)\monolib_rendcmn.obj \ - $(OBJS)\monolib_rgncmn.obj \ - $(OBJS)\monolib_scrolbarcmn.obj \ - $(OBJS)\monolib_settcmn.obj \ - $(OBJS)\monolib_sizer.obj \ - $(OBJS)\monolib_slidercmn.obj \ - $(OBJS)\monolib_spinbtncmn.obj \ - $(OBJS)\monolib_spinctrlcmn.obj \ - $(OBJS)\monolib_srchcmn.obj \ - $(OBJS)\monolib_statbar.obj \ - $(OBJS)\monolib_statbmpcmn.obj \ - $(OBJS)\monolib_statboxcmn.obj \ - $(OBJS)\monolib_statlinecmn.obj \ - $(OBJS)\monolib_stattextcmn.obj \ - $(OBJS)\monolib_stockitem.obj \ - $(OBJS)\monolib_tbarbase.obj \ - $(OBJS)\monolib_textcmn.obj \ - $(OBJS)\monolib_textentrycmn.obj \ - $(OBJS)\monolib_textmeasurecmn.obj \ - $(OBJS)\monolib_toplvcmn.obj \ - $(OBJS)\monolib_treebase.obj \ - $(OBJS)\monolib_uiactioncmn.obj \ - $(OBJS)\monolib_valgen.obj \ - $(OBJS)\monolib_validate.obj \ - $(OBJS)\monolib_valtext.obj \ - $(OBJS)\monolib_valnum.obj \ - $(OBJS)\monolib_wincmn.obj \ - $(OBJS)\monolib_windowid.obj \ - $(OBJS)\monolib_wrapsizer.obj \ - $(OBJS)\monolib_xpmdecod.obj \ - $(OBJS)\monolib_busyinfo.obj \ - $(OBJS)\monolib_generic_buttonbar.obj \ - $(OBJS)\monolib_choicdgg.obj \ - $(OBJS)\monolib_choicbkg.obj \ - $(OBJS)\monolib_combog.obj \ - $(OBJS)\monolib_dcpsg.obj \ - $(OBJS)\monolib_dirctrlg.obj \ - $(OBJS)\monolib_dragimgg.obj \ - $(OBJS)\monolib_filectrlg.obj \ - $(OBJS)\monolib_headerctrlg.obj \ - $(OBJS)\monolib_infobar.obj \ - $(OBJS)\monolib_listbkg.obj \ - $(OBJS)\monolib_logg.obj \ - $(OBJS)\monolib_markuptext.obj \ - $(OBJS)\monolib_msgdlgg.obj \ - $(OBJS)\monolib_numdlgg.obj \ - $(OBJS)\monolib_progdlgg.obj \ - $(OBJS)\monolib_preferencesg.obj \ - $(OBJS)\monolib_printps.obj \ - $(OBJS)\monolib_renderg.obj \ - $(OBJS)\monolib_richmsgdlgg.obj \ - $(OBJS)\monolib_scrlwing.obj \ - $(OBJS)\monolib_selstore.obj \ - $(OBJS)\monolib_spinctlg.obj \ - $(OBJS)\monolib_splitter.obj \ - $(OBJS)\monolib_srchctlg.obj \ - $(OBJS)\monolib_statbmpg.obj \ - $(OBJS)\monolib_stattextg.obj \ - $(OBJS)\monolib_textdlgg.obj \ - $(OBJS)\monolib_tipwin.obj \ - $(OBJS)\monolib_toolbkg.obj \ - $(OBJS)\monolib_treectlg.obj \ - $(OBJS)\monolib_treebkg.obj \ - $(OBJS)\monolib_vlbox.obj \ - $(OBJS)\monolib_vscroll.obj \ - $(OBJS)\monolib_xmlreshandler.obj -!endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -____CORE_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_activex.obj \ - $(OBJS)\monolib_app.obj \ - $(OBJS)\monolib_bitmap.obj \ - $(OBJS)\monolib_brush.obj \ - $(OBJS)\monolib_caret.obj \ - $(OBJS)\monolib_clipbrd.obj \ - $(OBJS)\monolib_colour.obj \ - $(OBJS)\monolib_cursor.obj \ - $(OBJS)\monolib_data.obj \ - $(OBJS)\monolib_dc.obj \ - $(OBJS)\monolib_dcclient.obj \ - $(OBJS)\monolib_dcmemory.obj \ - $(OBJS)\monolib_dcprint.obj \ - $(OBJS)\monolib_dcscreen.obj \ - $(OBJS)\monolib_dialup.obj \ - $(OBJS)\monolib_dib.obj \ - $(OBJS)\monolib_display.obj \ - $(OBJS)\monolib_enhmeta.obj \ - $(OBJS)\monolib_font.obj \ - $(OBJS)\monolib_fontenum.obj \ - $(OBJS)\monolib_fontutil.obj \ - $(OBJS)\monolib_gdiimage.obj \ - $(OBJS)\monolib_gdiobj.obj \ - $(OBJS)\monolib_gdiplus.obj \ - $(OBJS)\monolib_graphics.obj \ - $(OBJS)\monolib_icon.obj \ - $(OBJS)\monolib_imaglist.obj \ - $(OBJS)\monolib_minifram.obj \ - $(OBJS)\monolib_nonownedwnd.obj \ - $(OBJS)\monolib_dataobj.obj \ - $(OBJS)\monolib_dropsrc.obj \ - $(OBJS)\monolib_droptgt.obj \ - $(OBJS)\monolib_oleutils.obj \ - $(OBJS)\monolib_safearray.obj \ - $(OBJS)\monolib_palette.obj \ - $(OBJS)\monolib_pen.obj \ - $(OBJS)\monolib_popupwin.obj \ - $(OBJS)\monolib_printdlg.obj \ - $(OBJS)\monolib_printwin.obj \ - $(OBJS)\monolib_region.obj \ - $(OBJS)\monolib_renderer.obj \ - $(OBJS)\monolib_settings.obj \ - $(OBJS)\monolib_textmeasure.obj \ - $(OBJS)\monolib_tooltip.obj \ - $(OBJS)\monolib_toplevel.obj \ - $(OBJS)\monolib_uiaction.obj \ - $(OBJS)\monolib_utilsgui.obj \ - $(OBJS)\monolib_utilswin.obj \ - $(OBJS)\monolib_uxtheme.obj \ - $(OBJS)\monolib_window.obj \ - $(OBJS)\monolib_helpchm.obj \ - $(OBJS)\monolib_helpwin.obj \ - $(OBJS)\monolib_automtn.obj \ - $(OBJS)\monolib_uuid.obj \ - $(OBJS)\monolib_evtloop.obj \ - $(OBJS)\monolib_generic_accel.obj \ - $(OBJS)\monolib_clrpickerg.obj \ - $(OBJS)\monolib_collpaneg.obj \ - $(OBJS)\monolib_colrdlgg.obj \ - $(OBJS)\monolib_dirdlgg.obj \ - $(OBJS)\monolib_generic_fdrepdlg.obj \ - $(OBJS)\monolib_filedlgg.obj \ - $(OBJS)\monolib_filepickerg.obj \ - $(OBJS)\monolib_fontdlgg.obj \ - $(OBJS)\monolib_fontpickerg.obj \ - $(OBJS)\monolib_generic_listctrl.obj \ - $(OBJS)\monolib_mdig.obj \ - $(OBJS)\monolib_prntdlgg.obj \ - $(OBJS)\monolib_univ_bmpbuttn.obj \ - $(OBJS)\monolib_univ_button.obj \ - $(OBJS)\monolib_univ_checkbox.obj \ - $(OBJS)\monolib_univ_checklst.obj \ - $(OBJS)\monolib_univ_choice.obj \ - $(OBJS)\monolib_univ_combobox.obj \ - $(OBJS)\monolib_univ_control.obj \ - $(OBJS)\monolib_ctrlrend.obj \ - $(OBJS)\monolib_univ_dialog.obj \ - $(OBJS)\monolib_framuniv.obj \ - $(OBJS)\monolib_univ_gauge.obj \ - $(OBJS)\monolib_inpcons.obj \ - $(OBJS)\monolib_inphand.obj \ - $(OBJS)\monolib_univ_listbox.obj \ - $(OBJS)\monolib_univ_menu.obj \ - $(OBJS)\monolib_univ_notebook.obj \ - $(OBJS)\monolib_univ_radiobox.obj \ - $(OBJS)\monolib_univ_radiobut.obj \ - $(OBJS)\monolib_scrarrow.obj \ - $(OBJS)\monolib_univ_scrolbar.obj \ - $(OBJS)\monolib_scrthumb.obj \ - $(OBJS)\monolib_settingsuniv.obj \ - $(OBJS)\monolib_univ_slider.obj \ - $(OBJS)\monolib_univ_spinbutt.obj \ - $(OBJS)\monolib_univ_statbmp.obj \ - $(OBJS)\monolib_univ_statbox.obj \ - $(OBJS)\monolib_univ_statline.obj \ - $(OBJS)\monolib_univ_stattext.obj \ - $(OBJS)\monolib_univ_statusbr.obj \ - $(OBJS)\monolib_stdrend.obj \ - $(OBJS)\monolib_univ_textctrl.obj \ - $(OBJS)\monolib_univ_tglbtn.obj \ - $(OBJS)\monolib_theme.obj \ - $(OBJS)\monolib_univ_toolbar.obj \ - $(OBJS)\monolib_topluniv.obj \ - $(OBJS)\monolib_winuniv.obj \ - $(OBJS)\monolib_gtk.obj \ - $(OBJS)\monolib_metal.obj \ - $(OBJS)\monolib_mono.obj \ - $(OBJS)\monolib_win32.obj \ - $(OBJS)\monolib_accelcmn.obj \ - $(OBJS)\monolib_accesscmn.obj \ - $(OBJS)\monolib_anidecod.obj \ - $(OBJS)\monolib_affinematrix2d.obj \ - $(OBJS)\monolib_appcmn.obj \ - $(OBJS)\monolib_artprov.obj \ - $(OBJS)\monolib_artstd.obj \ - $(OBJS)\monolib_arttango.obj \ - $(OBJS)\monolib_bmpbase.obj \ - $(OBJS)\monolib_bmpbtncmn.obj \ - $(OBJS)\monolib_bookctrl.obj \ - $(OBJS)\monolib_btncmn.obj \ - $(OBJS)\monolib_cairo.obj \ - $(OBJS)\monolib_checkboxcmn.obj \ - $(OBJS)\monolib_checklstcmn.obj \ - $(OBJS)\monolib_choiccmn.obj \ - $(OBJS)\monolib_clipcmn.obj \ - $(OBJS)\monolib_clrpickercmn.obj \ - $(OBJS)\monolib_colourcmn.obj \ - $(OBJS)\monolib_colourdata.obj \ - $(OBJS)\monolib_combocmn.obj \ - $(OBJS)\monolib_cmdproc.obj \ - $(OBJS)\monolib_cmndata.obj \ - $(OBJS)\monolib_containr.obj \ - $(OBJS)\monolib_cshelp.obj \ - $(OBJS)\monolib_ctrlcmn.obj \ - $(OBJS)\monolib_ctrlsub.obj \ - $(OBJS)\monolib_dcbase.obj \ - $(OBJS)\monolib_dcbufcmn.obj \ - $(OBJS)\monolib_dcgraph.obj \ - $(OBJS)\monolib_dcsvg.obj \ - $(OBJS)\monolib_dirctrlcmn.obj \ - $(OBJS)\monolib_dlgcmn.obj \ - $(OBJS)\monolib_dndcmn.obj \ - $(OBJS)\monolib_dobjcmn.obj \ - $(OBJS)\monolib_docmdi.obj \ - $(OBJS)\monolib_docview.obj \ - $(OBJS)\monolib_dpycmn.obj \ - $(OBJS)\monolib_dseldlg.obj \ - $(OBJS)\monolib_effects.obj \ - $(OBJS)\monolib_fddlgcmn.obj \ - $(OBJS)\monolib_filectrlcmn.obj \ - $(OBJS)\monolib_filehistorycmn.obj \ - $(OBJS)\monolib_filepickercmn.obj \ - $(OBJS)\monolib_fontpickercmn.obj \ - $(OBJS)\monolib_fldlgcmn.obj \ - $(OBJS)\monolib_fontcmn.obj \ - $(OBJS)\monolib_fontdata.obj \ - $(OBJS)\monolib_graphicc.obj \ - $(OBJS)\monolib_fontenumcmn.obj \ - $(OBJS)\monolib_fontmap.obj \ - $(OBJS)\monolib_fontutilcmn.obj \ - $(OBJS)\monolib_framecmn.obj \ - $(OBJS)\monolib_gaugecmn.obj \ - $(OBJS)\monolib_gbsizer.obj \ - $(OBJS)\monolib_gdicmn.obj \ - $(OBJS)\monolib_geometry.obj \ - $(OBJS)\monolib_gifdecod.obj \ - $(OBJS)\monolib_graphcmn.obj \ - $(OBJS)\monolib_headercolcmn.obj \ - $(OBJS)\monolib_headerctrlcmn.obj \ - $(OBJS)\monolib_helpbase.obj \ - $(OBJS)\monolib_iconbndl.obj \ - $(OBJS)\monolib_imagall.obj \ - $(OBJS)\monolib_imagbmp.obj \ - $(OBJS)\monolib_image.obj \ - $(OBJS)\monolib_imagfill.obj \ - $(OBJS)\monolib_imaggif.obj \ - $(OBJS)\monolib_imagiff.obj \ - $(OBJS)\monolib_imagjpeg.obj \ - $(OBJS)\monolib_imagpcx.obj \ - $(OBJS)\monolib_imagpng.obj \ - $(OBJS)\monolib_imagpnm.obj \ - $(OBJS)\monolib_imagtga.obj \ - $(OBJS)\monolib_imagtiff.obj \ - $(OBJS)\monolib_imagxpm.obj \ - $(OBJS)\monolib_layout.obj \ - $(OBJS)\monolib_lboxcmn.obj \ - $(OBJS)\monolib_listctrlcmn.obj \ - $(OBJS)\monolib_markupparser.obj \ - $(OBJS)\monolib_matrix.obj \ - $(OBJS)\monolib_menucmn.obj \ - $(OBJS)\monolib_modalhook.obj \ - $(OBJS)\monolib_mousemanager.obj \ - $(OBJS)\monolib_nbkbase.obj \ - $(OBJS)\monolib_overlaycmn.obj \ - $(OBJS)\monolib_ownerdrwcmn.obj \ - $(OBJS)\monolib_paper.obj \ - $(OBJS)\monolib_panelcmn.obj \ - $(OBJS)\monolib_persist.obj \ - $(OBJS)\monolib_pickerbase.obj \ - $(OBJS)\monolib_popupcmn.obj \ - $(OBJS)\monolib_preferencescmn.obj \ - $(OBJS)\monolib_prntbase.obj \ - $(OBJS)\monolib_quantize.obj \ - $(OBJS)\monolib_radiobtncmn.obj \ - $(OBJS)\monolib_radiocmn.obj \ - $(OBJS)\monolib_rearrangectrl.obj \ - $(OBJS)\monolib_rendcmn.obj \ - $(OBJS)\monolib_rgncmn.obj \ - $(OBJS)\monolib_scrolbarcmn.obj \ - $(OBJS)\monolib_settcmn.obj \ - $(OBJS)\monolib_sizer.obj \ - $(OBJS)\monolib_slidercmn.obj \ - $(OBJS)\monolib_spinbtncmn.obj \ - $(OBJS)\monolib_spinctrlcmn.obj \ - $(OBJS)\monolib_srchcmn.obj \ - $(OBJS)\monolib_statbar.obj \ - $(OBJS)\monolib_statbmpcmn.obj \ - $(OBJS)\monolib_statboxcmn.obj \ - $(OBJS)\monolib_statlinecmn.obj \ - $(OBJS)\monolib_stattextcmn.obj \ - $(OBJS)\monolib_stockitem.obj \ - $(OBJS)\monolib_tbarbase.obj \ - $(OBJS)\monolib_textcmn.obj \ - $(OBJS)\monolib_textentrycmn.obj \ - $(OBJS)\monolib_textmeasurecmn.obj \ - $(OBJS)\monolib_toplvcmn.obj \ - $(OBJS)\monolib_treebase.obj \ - $(OBJS)\monolib_uiactioncmn.obj \ - $(OBJS)\monolib_valgen.obj \ - $(OBJS)\monolib_validate.obj \ - $(OBJS)\monolib_valtext.obj \ - $(OBJS)\monolib_valnum.obj \ - $(OBJS)\monolib_wincmn.obj \ - $(OBJS)\monolib_windowid.obj \ - $(OBJS)\monolib_wrapsizer.obj \ - $(OBJS)\monolib_xpmdecod.obj \ - $(OBJS)\monolib_busyinfo.obj \ - $(OBJS)\monolib_generic_buttonbar.obj \ - $(OBJS)\monolib_choicdgg.obj \ - $(OBJS)\monolib_choicbkg.obj \ - $(OBJS)\monolib_combog.obj \ - $(OBJS)\monolib_dcpsg.obj \ - $(OBJS)\monolib_dirctrlg.obj \ - $(OBJS)\monolib_dragimgg.obj \ - $(OBJS)\monolib_filectrlg.obj \ - $(OBJS)\monolib_headerctrlg.obj \ - $(OBJS)\monolib_infobar.obj \ - $(OBJS)\monolib_listbkg.obj \ - $(OBJS)\monolib_logg.obj \ - $(OBJS)\monolib_markuptext.obj \ - $(OBJS)\monolib_msgdlgg.obj \ - $(OBJS)\monolib_numdlgg.obj \ - $(OBJS)\monolib_progdlgg.obj \ - $(OBJS)\monolib_preferencesg.obj \ - $(OBJS)\monolib_printps.obj \ - $(OBJS)\monolib_renderg.obj \ - $(OBJS)\monolib_richmsgdlgg.obj \ - $(OBJS)\monolib_scrlwing.obj \ - $(OBJS)\monolib_selstore.obj \ - $(OBJS)\monolib_spinctlg.obj \ - $(OBJS)\monolib_splitter.obj \ - $(OBJS)\monolib_srchctlg.obj \ - $(OBJS)\monolib_statbmpg.obj \ - $(OBJS)\monolib_stattextg.obj \ - $(OBJS)\monolib_textdlgg.obj \ - $(OBJS)\monolib_tipwin.obj \ - $(OBJS)\monolib_toolbkg.obj \ - $(OBJS)\monolib_treectlg.obj \ - $(OBJS)\monolib_treebkg.obj \ - $(OBJS)\monolib_vlbox.obj \ - $(OBJS)\monolib_vscroll.obj \ - $(OBJS)\monolib_xmlreshandler.obj -!endif -!if "$(WXUNIV)" == "0" -____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_animatecmn.obj \ - $(OBJS)\monolib_bmpcboxcmn.obj \ - $(OBJS)\monolib_calctrlcmn.obj \ - $(OBJS)\monolib_datavcmn.obj \ - $(OBJS)\monolib_gridcmn.obj \ - $(OBJS)\monolib_hyperlnkcmn.obj \ - $(OBJS)\monolib_odcombocmn.obj \ - $(OBJS)\monolib_richtooltipcmn.obj \ - $(OBJS)\monolib_aboutdlgg.obj \ - $(OBJS)\monolib_bannerwindow.obj \ - $(OBJS)\monolib_bmpcboxg.obj \ - $(OBJS)\monolib_calctrlg.obj \ - $(OBJS)\monolib_commandlinkbuttong.obj \ - $(OBJS)\monolib_datavgen.obj \ - $(OBJS)\monolib_datectlg.obj \ - $(OBJS)\monolib_editlbox.obj \ - $(OBJS)\monolib_grid.obj \ - $(OBJS)\monolib_gridctrl.obj \ - $(OBJS)\monolib_grideditors.obj \ - $(OBJS)\monolib_gridsel.obj \ - $(OBJS)\monolib_helpext.obj \ - $(OBJS)\monolib_hyperlinkg.obj \ - $(OBJS)\monolib_laywin.obj \ - $(OBJS)\monolib_notifmsgg.obj \ - $(OBJS)\monolib_odcombo.obj \ - $(OBJS)\monolib_propdlg.obj \ - $(OBJS)\monolib_richtooltipg.obj \ - $(OBJS)\monolib_sashwin.obj \ - $(OBJS)\monolib_splash.obj \ - $(OBJS)\monolib_timectrlg.obj \ - $(OBJS)\monolib_tipdlg.obj \ - $(OBJS)\monolib_treelist.obj \ - $(OBJS)\monolib_wizard.obj \ - $(OBJS)\monolib_taskbarcmn.obj \ - $(OBJS)\monolib_aboutdlg.obj \ - $(OBJS)\monolib_notifmsg.obj \ - $(OBJS)\monolib_richtooltip.obj \ - $(OBJS)\monolib_sound.obj \ - $(OBJS)\monolib_taskbar.obj \ - $(OBJS)\monolib_joystick.obj \ - $(OBJS)\monolib_animateg.obj \ - $(OBJS)\monolib_bmpcbox.obj \ - $(OBJS)\monolib_calctrl.obj \ - $(OBJS)\monolib_commandlinkbutton.obj \ - $(OBJS)\monolib_datecontrols.obj \ - $(OBJS)\monolib_datectrl.obj \ - $(OBJS)\monolib_datetimectrl.obj \ - $(OBJS)\monolib_hyperlink.obj \ - $(OBJS)\monolib_timectrl.obj -!endif -!if "$(WXUNIV)" == "1" -____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_animatecmn.obj \ - $(OBJS)\monolib_bmpcboxcmn.obj \ - $(OBJS)\monolib_calctrlcmn.obj \ - $(OBJS)\monolib_datavcmn.obj \ - $(OBJS)\monolib_gridcmn.obj \ - $(OBJS)\monolib_hyperlnkcmn.obj \ - $(OBJS)\monolib_odcombocmn.obj \ - $(OBJS)\monolib_richtooltipcmn.obj \ - $(OBJS)\monolib_aboutdlgg.obj \ - $(OBJS)\monolib_bannerwindow.obj \ - $(OBJS)\monolib_bmpcboxg.obj \ - $(OBJS)\monolib_calctrlg.obj \ - $(OBJS)\monolib_commandlinkbuttong.obj \ - $(OBJS)\monolib_datavgen.obj \ - $(OBJS)\monolib_datectlg.obj \ - $(OBJS)\monolib_editlbox.obj \ - $(OBJS)\monolib_grid.obj \ - $(OBJS)\monolib_gridctrl.obj \ - $(OBJS)\monolib_grideditors.obj \ - $(OBJS)\monolib_gridsel.obj \ - $(OBJS)\monolib_helpext.obj \ - $(OBJS)\monolib_hyperlinkg.obj \ - $(OBJS)\monolib_laywin.obj \ - $(OBJS)\monolib_notifmsgg.obj \ - $(OBJS)\monolib_odcombo.obj \ - $(OBJS)\monolib_propdlg.obj \ - $(OBJS)\monolib_richtooltipg.obj \ - $(OBJS)\monolib_sashwin.obj \ - $(OBJS)\monolib_splash.obj \ - $(OBJS)\monolib_timectrlg.obj \ - $(OBJS)\monolib_tipdlg.obj \ - $(OBJS)\monolib_treelist.obj \ - $(OBJS)\monolib_wizard.obj \ - $(OBJS)\monolib_taskbarcmn.obj \ - $(OBJS)\monolib_aboutdlg.obj \ - $(OBJS)\monolib_notifmsg.obj \ - $(OBJS)\monolib_richtooltip.obj \ - $(OBJS)\monolib_sound.obj \ - $(OBJS)\monolib_taskbar.obj \ - $(OBJS)\monolib_joystick.obj \ - $(OBJS)\monolib_animateg.obj -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -__basedll___depname = \ - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -__baselib___depname = \ - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(SHARED)" == "1" -____wxbase_namedll_DEP = $(__basedll___depname) -!endif -!if "$(SHARED)" == "0" -____wxbase_namelib_DEP = $(__baselib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -__netdll___depname = \ - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -__netlib___depname = \ - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -!if "$(SHARED)" == "1" -____wxnet_namedll_DEP = $(__netdll___depname) -!endif -!if "$(SHARED)" == "0" -____wxnet_namelib_DEP = $(__netlib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" -__coredll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -____CORE_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\coredll_activex.obj \ - $(OBJS)\coredll_app.obj \ - $(OBJS)\coredll_bitmap.obj \ - $(OBJS)\coredll_brush.obj \ - $(OBJS)\coredll_caret.obj \ - $(OBJS)\coredll_clipbrd.obj \ - $(OBJS)\coredll_colour.obj \ - $(OBJS)\coredll_cursor.obj \ - $(OBJS)\coredll_data.obj \ - $(OBJS)\coredll_dc.obj \ - $(OBJS)\coredll_dcclient.obj \ - $(OBJS)\coredll_dcmemory.obj \ - $(OBJS)\coredll_dcprint.obj \ - $(OBJS)\coredll_dcscreen.obj \ - $(OBJS)\coredll_dialup.obj \ - $(OBJS)\coredll_dib.obj \ - $(OBJS)\coredll_display.obj \ - $(OBJS)\coredll_enhmeta.obj \ - $(OBJS)\coredll_font.obj \ - $(OBJS)\coredll_fontenum.obj \ - $(OBJS)\coredll_fontutil.obj \ - $(OBJS)\coredll_gdiimage.obj \ - $(OBJS)\coredll_gdiobj.obj \ - $(OBJS)\coredll_gdiplus.obj \ - $(OBJS)\coredll_graphics.obj \ - $(OBJS)\coredll_icon.obj \ - $(OBJS)\coredll_imaglist.obj \ - $(OBJS)\coredll_minifram.obj \ - $(OBJS)\coredll_nonownedwnd.obj \ - $(OBJS)\coredll_dataobj.obj \ - $(OBJS)\coredll_dropsrc.obj \ - $(OBJS)\coredll_droptgt.obj \ - $(OBJS)\coredll_oleutils.obj \ - $(OBJS)\coredll_safearray.obj \ - $(OBJS)\coredll_palette.obj \ - $(OBJS)\coredll_pen.obj \ - $(OBJS)\coredll_popupwin.obj \ - $(OBJS)\coredll_printdlg.obj \ - $(OBJS)\coredll_printwin.obj \ - $(OBJS)\coredll_region.obj \ - $(OBJS)\coredll_renderer.obj \ - $(OBJS)\coredll_settings.obj \ - $(OBJS)\coredll_textmeasure.obj \ - $(OBJS)\coredll_tooltip.obj \ - $(OBJS)\coredll_toplevel.obj \ - $(OBJS)\coredll_uiaction.obj \ - $(OBJS)\coredll_utilsgui.obj \ - $(OBJS)\coredll_utilswin.obj \ - $(OBJS)\coredll_uxtheme.obj \ - $(OBJS)\coredll_window.obj \ - $(OBJS)\coredll_helpchm.obj \ - $(OBJS)\coredll_helpwin.obj \ - $(OBJS)\coredll_automtn.obj \ - $(OBJS)\coredll_uuid.obj \ - $(OBJS)\coredll_clrpickerg.obj \ - $(OBJS)\coredll_collpaneg.obj \ - $(OBJS)\coredll_filepickerg.obj \ - $(OBJS)\coredll_fontpickerg.obj \ - $(OBJS)\coredll_generic_statusbr.obj \ - $(OBJS)\coredll_prntdlgg.obj \ - $(OBJS)\coredll_msw_accel.obj \ - $(OBJS)\coredll_anybutton.obj \ - $(OBJS)\coredll_artmsw.obj \ - $(OBJS)\coredll_msw_bmpbuttn.obj \ - $(OBJS)\coredll_msw_button.obj \ - $(OBJS)\coredll_msw_checkbox.obj \ - $(OBJS)\coredll_msw_choice.obj \ - $(OBJS)\coredll_colordlg.obj \ - $(OBJS)\coredll_combo.obj \ - $(OBJS)\coredll_msw_combobox.obj \ - $(OBJS)\coredll_msw_control.obj \ - $(OBJS)\coredll_msw_dialog.obj \ - $(OBJS)\coredll_dirdlg.obj \ - $(OBJS)\coredll_dragimag.obj \ - $(OBJS)\coredll_evtloop.obj \ - $(OBJS)\coredll_filedlg.obj \ - $(OBJS)\coredll_frame.obj \ - $(OBJS)\coredll_msw_gauge.obj \ - $(OBJS)\coredll_headerctrl.obj \ - $(OBJS)\coredll_iniconf.obj \ - $(OBJS)\coredll_msw_listbox.obj \ - $(OBJS)\coredll_msw_listctrl.obj \ - $(OBJS)\coredll_mdi.obj \ - $(OBJS)\coredll_msw_menu.obj \ - $(OBJS)\coredll_menuitem.obj \ - $(OBJS)\coredll_metafile.obj \ - $(OBJS)\coredll_msgdlg.obj \ - $(OBJS)\coredll_nativdlg.obj \ - $(OBJS)\coredll_nativewin.obj \ - $(OBJS)\coredll_msw_notebook.obj \ - $(OBJS)\coredll_access.obj \ - $(OBJS)\coredll_ownerdrw.obj \ - $(OBJS)\coredll_panel.obj \ - $(OBJS)\coredll_progdlg.obj \ - $(OBJS)\coredll_msw_radiobox.obj \ - $(OBJS)\coredll_msw_radiobut.obj \ - $(OBJS)\coredll_richmsgdlg.obj \ - $(OBJS)\coredll_msw_scrolbar.obj \ - $(OBJS)\coredll_msw_slider.obj \ - $(OBJS)\coredll_msw_spinbutt.obj \ - $(OBJS)\coredll_spinctrl.obj \ - $(OBJS)\coredll_msw_statbmp.obj \ - $(OBJS)\coredll_msw_statbox.obj \ - $(OBJS)\coredll_statusbar.obj \ - $(OBJS)\coredll_msw_statline.obj \ - $(OBJS)\coredll_msw_stattext.obj \ - $(OBJS)\coredll_msw_toolbar.obj \ - $(OBJS)\coredll_msw_textctrl.obj \ - $(OBJS)\coredll_textentry.obj \ - $(OBJS)\coredll_msw_tglbtn.obj \ - $(OBJS)\coredll_treectrl.obj \ - $(OBJS)\coredll_msw_checklst.obj \ - $(OBJS)\coredll_msw_fdrepdlg.obj \ - $(OBJS)\coredll_fontdlg.obj \ - $(OBJS)\coredll_accelcmn.obj \ - $(OBJS)\coredll_accesscmn.obj \ - $(OBJS)\coredll_anidecod.obj \ - $(OBJS)\coredll_affinematrix2d.obj \ - $(OBJS)\coredll_appcmn.obj \ - $(OBJS)\coredll_artprov.obj \ - $(OBJS)\coredll_artstd.obj \ - $(OBJS)\coredll_arttango.obj \ - $(OBJS)\coredll_bmpbase.obj \ - $(OBJS)\coredll_bmpbtncmn.obj \ - $(OBJS)\coredll_bookctrl.obj \ - $(OBJS)\coredll_btncmn.obj \ - $(OBJS)\coredll_cairo.obj \ - $(OBJS)\coredll_checkboxcmn.obj \ - $(OBJS)\coredll_checklstcmn.obj \ - $(OBJS)\coredll_choiccmn.obj \ - $(OBJS)\coredll_clipcmn.obj \ - $(OBJS)\coredll_clrpickercmn.obj \ - $(OBJS)\coredll_colourcmn.obj \ - $(OBJS)\coredll_colourdata.obj \ - $(OBJS)\coredll_combocmn.obj \ - $(OBJS)\coredll_cmdproc.obj \ - $(OBJS)\coredll_cmndata.obj \ - $(OBJS)\coredll_containr.obj \ - $(OBJS)\coredll_cshelp.obj \ - $(OBJS)\coredll_ctrlcmn.obj \ - $(OBJS)\coredll_ctrlsub.obj \ - $(OBJS)\coredll_dcbase.obj \ - $(OBJS)\coredll_dcbufcmn.obj \ - $(OBJS)\coredll_dcgraph.obj \ - $(OBJS)\coredll_dcsvg.obj \ - $(OBJS)\coredll_dirctrlcmn.obj \ - $(OBJS)\coredll_dlgcmn.obj \ - $(OBJS)\coredll_dndcmn.obj \ - $(OBJS)\coredll_dobjcmn.obj \ - $(OBJS)\coredll_docmdi.obj \ - $(OBJS)\coredll_docview.obj \ - $(OBJS)\coredll_dpycmn.obj \ - $(OBJS)\coredll_dseldlg.obj \ - $(OBJS)\coredll_effects.obj \ - $(OBJS)\coredll_fddlgcmn.obj \ - $(OBJS)\coredll_filectrlcmn.obj \ - $(OBJS)\coredll_filehistorycmn.obj \ - $(OBJS)\coredll_filepickercmn.obj \ - $(OBJS)\coredll_fontpickercmn.obj \ - $(OBJS)\coredll_fldlgcmn.obj \ - $(OBJS)\coredll_fontcmn.obj \ - $(OBJS)\coredll_fontdata.obj \ - $(OBJS)\coredll_graphicc.obj \ - $(OBJS)\coredll_fontenumcmn.obj \ - $(OBJS)\coredll_fontmap.obj \ - $(OBJS)\coredll_fontutilcmn.obj \ - $(OBJS)\coredll_framecmn.obj \ - $(OBJS)\coredll_gaugecmn.obj \ - $(OBJS)\coredll_gbsizer.obj \ - $(OBJS)\coredll_gdicmn.obj \ - $(OBJS)\coredll_geometry.obj \ - $(OBJS)\coredll_gifdecod.obj \ - $(OBJS)\coredll_graphcmn.obj \ - $(OBJS)\coredll_headercolcmn.obj \ - $(OBJS)\coredll_headerctrlcmn.obj \ - $(OBJS)\coredll_helpbase.obj \ - $(OBJS)\coredll_iconbndl.obj \ - $(OBJS)\coredll_imagall.obj \ - $(OBJS)\coredll_imagbmp.obj \ - $(OBJS)\coredll_image.obj \ - $(OBJS)\coredll_imagfill.obj \ - $(OBJS)\coredll_imaggif.obj \ - $(OBJS)\coredll_imagiff.obj \ - $(OBJS)\coredll_imagjpeg.obj \ - $(OBJS)\coredll_imagpcx.obj \ - $(OBJS)\coredll_imagpng.obj \ - $(OBJS)\coredll_imagpnm.obj \ - $(OBJS)\coredll_imagtga.obj \ - $(OBJS)\coredll_imagtiff.obj \ - $(OBJS)\coredll_imagxpm.obj \ - $(OBJS)\coredll_layout.obj \ - $(OBJS)\coredll_lboxcmn.obj \ - $(OBJS)\coredll_listctrlcmn.obj \ - $(OBJS)\coredll_markupparser.obj \ - $(OBJS)\coredll_matrix.obj \ - $(OBJS)\coredll_menucmn.obj \ - $(OBJS)\coredll_modalhook.obj \ - $(OBJS)\coredll_mousemanager.obj \ - $(OBJS)\coredll_nbkbase.obj \ - $(OBJS)\coredll_overlaycmn.obj \ - $(OBJS)\coredll_ownerdrwcmn.obj \ - $(OBJS)\coredll_paper.obj \ - $(OBJS)\coredll_panelcmn.obj \ - $(OBJS)\coredll_persist.obj \ - $(OBJS)\coredll_pickerbase.obj \ - $(OBJS)\coredll_popupcmn.obj \ - $(OBJS)\coredll_preferencescmn.obj \ - $(OBJS)\coredll_prntbase.obj \ - $(OBJS)\coredll_quantize.obj \ - $(OBJS)\coredll_radiobtncmn.obj \ - $(OBJS)\coredll_radiocmn.obj \ - $(OBJS)\coredll_rearrangectrl.obj \ - $(OBJS)\coredll_rendcmn.obj \ - $(OBJS)\coredll_rgncmn.obj \ - $(OBJS)\coredll_scrolbarcmn.obj \ - $(OBJS)\coredll_settcmn.obj \ - $(OBJS)\coredll_sizer.obj \ - $(OBJS)\coredll_slidercmn.obj \ - $(OBJS)\coredll_spinbtncmn.obj \ - $(OBJS)\coredll_spinctrlcmn.obj \ - $(OBJS)\coredll_srchcmn.obj \ - $(OBJS)\coredll_statbar.obj \ - $(OBJS)\coredll_statbmpcmn.obj \ - $(OBJS)\coredll_statboxcmn.obj \ - $(OBJS)\coredll_statlinecmn.obj \ - $(OBJS)\coredll_stattextcmn.obj \ - $(OBJS)\coredll_stockitem.obj \ - $(OBJS)\coredll_tbarbase.obj \ - $(OBJS)\coredll_textcmn.obj \ - $(OBJS)\coredll_textentrycmn.obj \ - $(OBJS)\coredll_textmeasurecmn.obj \ - $(OBJS)\coredll_toplvcmn.obj \ - $(OBJS)\coredll_treebase.obj \ - $(OBJS)\coredll_uiactioncmn.obj \ - $(OBJS)\coredll_valgen.obj \ - $(OBJS)\coredll_validate.obj \ - $(OBJS)\coredll_valtext.obj \ - $(OBJS)\coredll_valnum.obj \ - $(OBJS)\coredll_wincmn.obj \ - $(OBJS)\coredll_windowid.obj \ - $(OBJS)\coredll_wrapsizer.obj \ - $(OBJS)\coredll_xpmdecod.obj \ - $(OBJS)\coredll_busyinfo.obj \ - $(OBJS)\coredll_buttonbar.obj \ - $(OBJS)\coredll_choicdgg.obj \ - $(OBJS)\coredll_choicbkg.obj \ - $(OBJS)\coredll_combog.obj \ - $(OBJS)\coredll_dcpsg.obj \ - $(OBJS)\coredll_dirctrlg.obj \ - $(OBJS)\coredll_dragimgg.obj \ - $(OBJS)\coredll_filectrlg.obj \ - $(OBJS)\coredll_headerctrlg.obj \ - $(OBJS)\coredll_infobar.obj \ - $(OBJS)\coredll_listbkg.obj \ - $(OBJS)\coredll_logg.obj \ - $(OBJS)\coredll_markuptext.obj \ - $(OBJS)\coredll_msgdlgg.obj \ - $(OBJS)\coredll_numdlgg.obj \ - $(OBJS)\coredll_progdlgg.obj \ - $(OBJS)\coredll_preferencesg.obj \ - $(OBJS)\coredll_printps.obj \ - $(OBJS)\coredll_renderg.obj \ - $(OBJS)\coredll_richmsgdlgg.obj \ - $(OBJS)\coredll_scrlwing.obj \ - $(OBJS)\coredll_selstore.obj \ - $(OBJS)\coredll_spinctlg.obj \ - $(OBJS)\coredll_splitter.obj \ - $(OBJS)\coredll_srchctlg.obj \ - $(OBJS)\coredll_statbmpg.obj \ - $(OBJS)\coredll_stattextg.obj \ - $(OBJS)\coredll_textdlgg.obj \ - $(OBJS)\coredll_tipwin.obj \ - $(OBJS)\coredll_toolbkg.obj \ - $(OBJS)\coredll_treectlg.obj \ - $(OBJS)\coredll_treebkg.obj \ - $(OBJS)\coredll_vlbox.obj \ - $(OBJS)\coredll_vscroll.obj \ - $(OBJS)\coredll_xmlreshandler.obj -!endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -____CORE_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\coredll_activex.obj \ - $(OBJS)\coredll_app.obj \ - $(OBJS)\coredll_bitmap.obj \ - $(OBJS)\coredll_brush.obj \ - $(OBJS)\coredll_caret.obj \ - $(OBJS)\coredll_clipbrd.obj \ - $(OBJS)\coredll_colour.obj \ - $(OBJS)\coredll_cursor.obj \ - $(OBJS)\coredll_data.obj \ - $(OBJS)\coredll_dc.obj \ - $(OBJS)\coredll_dcclient.obj \ - $(OBJS)\coredll_dcmemory.obj \ - $(OBJS)\coredll_dcprint.obj \ - $(OBJS)\coredll_dcscreen.obj \ - $(OBJS)\coredll_dialup.obj \ - $(OBJS)\coredll_dib.obj \ - $(OBJS)\coredll_display.obj \ - $(OBJS)\coredll_enhmeta.obj \ - $(OBJS)\coredll_font.obj \ - $(OBJS)\coredll_fontenum.obj \ - $(OBJS)\coredll_fontutil.obj \ - $(OBJS)\coredll_gdiimage.obj \ - $(OBJS)\coredll_gdiobj.obj \ - $(OBJS)\coredll_gdiplus.obj \ - $(OBJS)\coredll_graphics.obj \ - $(OBJS)\coredll_icon.obj \ - $(OBJS)\coredll_imaglist.obj \ - $(OBJS)\coredll_minifram.obj \ - $(OBJS)\coredll_nonownedwnd.obj \ - $(OBJS)\coredll_dataobj.obj \ - $(OBJS)\coredll_dropsrc.obj \ - $(OBJS)\coredll_droptgt.obj \ - $(OBJS)\coredll_oleutils.obj \ - $(OBJS)\coredll_safearray.obj \ - $(OBJS)\coredll_palette.obj \ - $(OBJS)\coredll_pen.obj \ - $(OBJS)\coredll_popupwin.obj \ - $(OBJS)\coredll_printdlg.obj \ - $(OBJS)\coredll_printwin.obj \ - $(OBJS)\coredll_region.obj \ - $(OBJS)\coredll_renderer.obj \ - $(OBJS)\coredll_settings.obj \ - $(OBJS)\coredll_textmeasure.obj \ - $(OBJS)\coredll_tooltip.obj \ - $(OBJS)\coredll_toplevel.obj \ - $(OBJS)\coredll_uiaction.obj \ - $(OBJS)\coredll_utilsgui.obj \ - $(OBJS)\coredll_utilswin.obj \ - $(OBJS)\coredll_uxtheme.obj \ - $(OBJS)\coredll_window.obj \ - $(OBJS)\coredll_helpchm.obj \ - $(OBJS)\coredll_helpwin.obj \ - $(OBJS)\coredll_automtn.obj \ - $(OBJS)\coredll_uuid.obj \ - $(OBJS)\coredll_evtloop.obj \ - $(OBJS)\coredll_generic_accel.obj \ - $(OBJS)\coredll_clrpickerg.obj \ - $(OBJS)\coredll_collpaneg.obj \ - $(OBJS)\coredll_colrdlgg.obj \ - $(OBJS)\coredll_dirdlgg.obj \ - $(OBJS)\coredll_generic_fdrepdlg.obj \ - $(OBJS)\coredll_filedlgg.obj \ - $(OBJS)\coredll_filepickerg.obj \ - $(OBJS)\coredll_fontdlgg.obj \ - $(OBJS)\coredll_fontpickerg.obj \ - $(OBJS)\coredll_generic_listctrl.obj \ - $(OBJS)\coredll_mdig.obj \ - $(OBJS)\coredll_prntdlgg.obj \ - $(OBJS)\coredll_univ_bmpbuttn.obj \ - $(OBJS)\coredll_univ_button.obj \ - $(OBJS)\coredll_univ_checkbox.obj \ - $(OBJS)\coredll_univ_checklst.obj \ - $(OBJS)\coredll_univ_choice.obj \ - $(OBJS)\coredll_univ_combobox.obj \ - $(OBJS)\coredll_univ_control.obj \ - $(OBJS)\coredll_ctrlrend.obj \ - $(OBJS)\coredll_univ_dialog.obj \ - $(OBJS)\coredll_framuniv.obj \ - $(OBJS)\coredll_univ_gauge.obj \ - $(OBJS)\coredll_inpcons.obj \ - $(OBJS)\coredll_inphand.obj \ - $(OBJS)\coredll_univ_listbox.obj \ - $(OBJS)\coredll_univ_menu.obj \ - $(OBJS)\coredll_univ_notebook.obj \ - $(OBJS)\coredll_univ_radiobox.obj \ - $(OBJS)\coredll_univ_radiobut.obj \ - $(OBJS)\coredll_scrarrow.obj \ - $(OBJS)\coredll_univ_scrolbar.obj \ - $(OBJS)\coredll_scrthumb.obj \ - $(OBJS)\coredll_settingsuniv.obj \ - $(OBJS)\coredll_univ_slider.obj \ - $(OBJS)\coredll_univ_spinbutt.obj \ - $(OBJS)\coredll_univ_statbmp.obj \ - $(OBJS)\coredll_univ_statbox.obj \ - $(OBJS)\coredll_univ_statline.obj \ - $(OBJS)\coredll_univ_stattext.obj \ - $(OBJS)\coredll_univ_statusbr.obj \ - $(OBJS)\coredll_stdrend.obj \ - $(OBJS)\coredll_univ_textctrl.obj \ - $(OBJS)\coredll_univ_tglbtn.obj \ - $(OBJS)\coredll_theme.obj \ - $(OBJS)\coredll_univ_toolbar.obj \ - $(OBJS)\coredll_topluniv.obj \ - $(OBJS)\coredll_winuniv.obj \ - $(OBJS)\coredll_gtk.obj \ - $(OBJS)\coredll_metal.obj \ - $(OBJS)\coredll_mono.obj \ - $(OBJS)\coredll_win32.obj \ - $(OBJS)\coredll_accelcmn.obj \ - $(OBJS)\coredll_accesscmn.obj \ - $(OBJS)\coredll_anidecod.obj \ - $(OBJS)\coredll_affinematrix2d.obj \ - $(OBJS)\coredll_appcmn.obj \ - $(OBJS)\coredll_artprov.obj \ - $(OBJS)\coredll_artstd.obj \ - $(OBJS)\coredll_arttango.obj \ - $(OBJS)\coredll_bmpbase.obj \ - $(OBJS)\coredll_bmpbtncmn.obj \ - $(OBJS)\coredll_bookctrl.obj \ - $(OBJS)\coredll_btncmn.obj \ - $(OBJS)\coredll_cairo.obj \ - $(OBJS)\coredll_checkboxcmn.obj \ - $(OBJS)\coredll_checklstcmn.obj \ - $(OBJS)\coredll_choiccmn.obj \ - $(OBJS)\coredll_clipcmn.obj \ - $(OBJS)\coredll_clrpickercmn.obj \ - $(OBJS)\coredll_colourcmn.obj \ - $(OBJS)\coredll_colourdata.obj \ - $(OBJS)\coredll_combocmn.obj \ - $(OBJS)\coredll_cmdproc.obj \ - $(OBJS)\coredll_cmndata.obj \ - $(OBJS)\coredll_containr.obj \ - $(OBJS)\coredll_cshelp.obj \ - $(OBJS)\coredll_ctrlcmn.obj \ - $(OBJS)\coredll_ctrlsub.obj \ - $(OBJS)\coredll_dcbase.obj \ - $(OBJS)\coredll_dcbufcmn.obj \ - $(OBJS)\coredll_dcgraph.obj \ - $(OBJS)\coredll_dcsvg.obj \ - $(OBJS)\coredll_dirctrlcmn.obj \ - $(OBJS)\coredll_dlgcmn.obj \ - $(OBJS)\coredll_dndcmn.obj \ - $(OBJS)\coredll_dobjcmn.obj \ - $(OBJS)\coredll_docmdi.obj \ - $(OBJS)\coredll_docview.obj \ - $(OBJS)\coredll_dpycmn.obj \ - $(OBJS)\coredll_dseldlg.obj \ - $(OBJS)\coredll_effects.obj \ - $(OBJS)\coredll_fddlgcmn.obj \ - $(OBJS)\coredll_filectrlcmn.obj \ - $(OBJS)\coredll_filehistorycmn.obj \ - $(OBJS)\coredll_filepickercmn.obj \ - $(OBJS)\coredll_fontpickercmn.obj \ - $(OBJS)\coredll_fldlgcmn.obj \ - $(OBJS)\coredll_fontcmn.obj \ - $(OBJS)\coredll_fontdata.obj \ - $(OBJS)\coredll_graphicc.obj \ - $(OBJS)\coredll_fontenumcmn.obj \ - $(OBJS)\coredll_fontmap.obj \ - $(OBJS)\coredll_fontutilcmn.obj \ - $(OBJS)\coredll_framecmn.obj \ - $(OBJS)\coredll_gaugecmn.obj \ - $(OBJS)\coredll_gbsizer.obj \ - $(OBJS)\coredll_gdicmn.obj \ - $(OBJS)\coredll_geometry.obj \ - $(OBJS)\coredll_gifdecod.obj \ - $(OBJS)\coredll_graphcmn.obj \ - $(OBJS)\coredll_headercolcmn.obj \ - $(OBJS)\coredll_headerctrlcmn.obj \ - $(OBJS)\coredll_helpbase.obj \ - $(OBJS)\coredll_iconbndl.obj \ - $(OBJS)\coredll_imagall.obj \ - $(OBJS)\coredll_imagbmp.obj \ - $(OBJS)\coredll_image.obj \ - $(OBJS)\coredll_imagfill.obj \ - $(OBJS)\coredll_imaggif.obj \ - $(OBJS)\coredll_imagiff.obj \ - $(OBJS)\coredll_imagjpeg.obj \ - $(OBJS)\coredll_imagpcx.obj \ - $(OBJS)\coredll_imagpng.obj \ - $(OBJS)\coredll_imagpnm.obj \ - $(OBJS)\coredll_imagtga.obj \ - $(OBJS)\coredll_imagtiff.obj \ - $(OBJS)\coredll_imagxpm.obj \ - $(OBJS)\coredll_layout.obj \ - $(OBJS)\coredll_lboxcmn.obj \ - $(OBJS)\coredll_listctrlcmn.obj \ - $(OBJS)\coredll_markupparser.obj \ - $(OBJS)\coredll_matrix.obj \ - $(OBJS)\coredll_menucmn.obj \ - $(OBJS)\coredll_modalhook.obj \ - $(OBJS)\coredll_mousemanager.obj \ - $(OBJS)\coredll_nbkbase.obj \ - $(OBJS)\coredll_overlaycmn.obj \ - $(OBJS)\coredll_ownerdrwcmn.obj \ - $(OBJS)\coredll_paper.obj \ - $(OBJS)\coredll_panelcmn.obj \ - $(OBJS)\coredll_persist.obj \ - $(OBJS)\coredll_pickerbase.obj \ - $(OBJS)\coredll_popupcmn.obj \ - $(OBJS)\coredll_preferencescmn.obj \ - $(OBJS)\coredll_prntbase.obj \ - $(OBJS)\coredll_quantize.obj \ - $(OBJS)\coredll_radiobtncmn.obj \ - $(OBJS)\coredll_radiocmn.obj \ - $(OBJS)\coredll_rearrangectrl.obj \ - $(OBJS)\coredll_rendcmn.obj \ - $(OBJS)\coredll_rgncmn.obj \ - $(OBJS)\coredll_scrolbarcmn.obj \ - $(OBJS)\coredll_settcmn.obj \ - $(OBJS)\coredll_sizer.obj \ - $(OBJS)\coredll_slidercmn.obj \ - $(OBJS)\coredll_spinbtncmn.obj \ - $(OBJS)\coredll_spinctrlcmn.obj \ - $(OBJS)\coredll_srchcmn.obj \ - $(OBJS)\coredll_statbar.obj \ - $(OBJS)\coredll_statbmpcmn.obj \ - $(OBJS)\coredll_statboxcmn.obj \ - $(OBJS)\coredll_statlinecmn.obj \ - $(OBJS)\coredll_stattextcmn.obj \ - $(OBJS)\coredll_stockitem.obj \ - $(OBJS)\coredll_tbarbase.obj \ - $(OBJS)\coredll_textcmn.obj \ - $(OBJS)\coredll_textentrycmn.obj \ - $(OBJS)\coredll_textmeasurecmn.obj \ - $(OBJS)\coredll_toplvcmn.obj \ - $(OBJS)\coredll_treebase.obj \ - $(OBJS)\coredll_uiactioncmn.obj \ - $(OBJS)\coredll_valgen.obj \ - $(OBJS)\coredll_validate.obj \ - $(OBJS)\coredll_valtext.obj \ - $(OBJS)\coredll_valnum.obj \ - $(OBJS)\coredll_wincmn.obj \ - $(OBJS)\coredll_windowid.obj \ - $(OBJS)\coredll_wrapsizer.obj \ - $(OBJS)\coredll_xpmdecod.obj \ - $(OBJS)\coredll_busyinfo.obj \ - $(OBJS)\coredll_buttonbar.obj \ - $(OBJS)\coredll_choicdgg.obj \ - $(OBJS)\coredll_choicbkg.obj \ - $(OBJS)\coredll_combog.obj \ - $(OBJS)\coredll_dcpsg.obj \ - $(OBJS)\coredll_dirctrlg.obj \ - $(OBJS)\coredll_dragimgg.obj \ - $(OBJS)\coredll_filectrlg.obj \ - $(OBJS)\coredll_headerctrlg.obj \ - $(OBJS)\coredll_infobar.obj \ - $(OBJS)\coredll_listbkg.obj \ - $(OBJS)\coredll_logg.obj \ - $(OBJS)\coredll_markuptext.obj \ - $(OBJS)\coredll_msgdlgg.obj \ - $(OBJS)\coredll_numdlgg.obj \ - $(OBJS)\coredll_progdlgg.obj \ - $(OBJS)\coredll_preferencesg.obj \ - $(OBJS)\coredll_printps.obj \ - $(OBJS)\coredll_renderg.obj \ - $(OBJS)\coredll_richmsgdlgg.obj \ - $(OBJS)\coredll_scrlwing.obj \ - $(OBJS)\coredll_selstore.obj \ - $(OBJS)\coredll_spinctlg.obj \ - $(OBJS)\coredll_splitter.obj \ - $(OBJS)\coredll_srchctlg.obj \ - $(OBJS)\coredll_statbmpg.obj \ - $(OBJS)\coredll_stattextg.obj \ - $(OBJS)\coredll_textdlgg.obj \ - $(OBJS)\coredll_tipwin.obj \ - $(OBJS)\coredll_toolbkg.obj \ - $(OBJS)\coredll_treectlg.obj \ - $(OBJS)\coredll_treebkg.obj \ - $(OBJS)\coredll_vlbox.obj \ - $(OBJS)\coredll_vscroll.obj \ - $(OBJS)\coredll_xmlreshandler.obj -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" -__corelib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -____CORE_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\corelib_activex.obj \ - $(OBJS)\corelib_app.obj \ - $(OBJS)\corelib_bitmap.obj \ - $(OBJS)\corelib_brush.obj \ - $(OBJS)\corelib_caret.obj \ - $(OBJS)\corelib_clipbrd.obj \ - $(OBJS)\corelib_colour.obj \ - $(OBJS)\corelib_cursor.obj \ - $(OBJS)\corelib_data.obj \ - $(OBJS)\corelib_dc.obj \ - $(OBJS)\corelib_dcclient.obj \ - $(OBJS)\corelib_dcmemory.obj \ - $(OBJS)\corelib_dcprint.obj \ - $(OBJS)\corelib_dcscreen.obj \ - $(OBJS)\corelib_dialup.obj \ - $(OBJS)\corelib_dib.obj \ - $(OBJS)\corelib_display.obj \ - $(OBJS)\corelib_enhmeta.obj \ - $(OBJS)\corelib_font.obj \ - $(OBJS)\corelib_fontenum.obj \ - $(OBJS)\corelib_fontutil.obj \ - $(OBJS)\corelib_gdiimage.obj \ - $(OBJS)\corelib_gdiobj.obj \ - $(OBJS)\corelib_gdiplus.obj \ - $(OBJS)\corelib_graphics.obj \ - $(OBJS)\corelib_icon.obj \ - $(OBJS)\corelib_imaglist.obj \ - $(OBJS)\corelib_minifram.obj \ - $(OBJS)\corelib_nonownedwnd.obj \ - $(OBJS)\corelib_dataobj.obj \ - $(OBJS)\corelib_dropsrc.obj \ - $(OBJS)\corelib_droptgt.obj \ - $(OBJS)\corelib_oleutils.obj \ - $(OBJS)\corelib_safearray.obj \ - $(OBJS)\corelib_palette.obj \ - $(OBJS)\corelib_pen.obj \ - $(OBJS)\corelib_popupwin.obj \ - $(OBJS)\corelib_printdlg.obj \ - $(OBJS)\corelib_printwin.obj \ - $(OBJS)\corelib_region.obj \ - $(OBJS)\corelib_renderer.obj \ - $(OBJS)\corelib_settings.obj \ - $(OBJS)\corelib_textmeasure.obj \ - $(OBJS)\corelib_tooltip.obj \ - $(OBJS)\corelib_toplevel.obj \ - $(OBJS)\corelib_uiaction.obj \ - $(OBJS)\corelib_utilsgui.obj \ - $(OBJS)\corelib_utilswin.obj \ - $(OBJS)\corelib_uxtheme.obj \ - $(OBJS)\corelib_window.obj \ - $(OBJS)\corelib_helpchm.obj \ - $(OBJS)\corelib_helpwin.obj \ - $(OBJS)\corelib_automtn.obj \ - $(OBJS)\corelib_uuid.obj \ - $(OBJS)\corelib_clrpickerg.obj \ - $(OBJS)\corelib_collpaneg.obj \ - $(OBJS)\corelib_filepickerg.obj \ - $(OBJS)\corelib_fontpickerg.obj \ - $(OBJS)\corelib_generic_statusbr.obj \ - $(OBJS)\corelib_prntdlgg.obj \ - $(OBJS)\corelib_msw_accel.obj \ - $(OBJS)\corelib_anybutton.obj \ - $(OBJS)\corelib_artmsw.obj \ - $(OBJS)\corelib_msw_bmpbuttn.obj \ - $(OBJS)\corelib_msw_button.obj \ - $(OBJS)\corelib_msw_checkbox.obj \ - $(OBJS)\corelib_msw_choice.obj \ - $(OBJS)\corelib_colordlg.obj \ - $(OBJS)\corelib_combo.obj \ - $(OBJS)\corelib_msw_combobox.obj \ - $(OBJS)\corelib_msw_control.obj \ - $(OBJS)\corelib_msw_dialog.obj \ - $(OBJS)\corelib_dirdlg.obj \ - $(OBJS)\corelib_dragimag.obj \ - $(OBJS)\corelib_evtloop.obj \ - $(OBJS)\corelib_filedlg.obj \ - $(OBJS)\corelib_frame.obj \ - $(OBJS)\corelib_msw_gauge.obj \ - $(OBJS)\corelib_headerctrl.obj \ - $(OBJS)\corelib_iniconf.obj \ - $(OBJS)\corelib_msw_listbox.obj \ - $(OBJS)\corelib_msw_listctrl.obj \ - $(OBJS)\corelib_mdi.obj \ - $(OBJS)\corelib_msw_menu.obj \ - $(OBJS)\corelib_menuitem.obj \ - $(OBJS)\corelib_metafile.obj \ - $(OBJS)\corelib_msgdlg.obj \ - $(OBJS)\corelib_nativdlg.obj \ - $(OBJS)\corelib_nativewin.obj \ - $(OBJS)\corelib_msw_notebook.obj \ - $(OBJS)\corelib_access.obj \ - $(OBJS)\corelib_ownerdrw.obj \ - $(OBJS)\corelib_panel.obj \ - $(OBJS)\corelib_progdlg.obj \ - $(OBJS)\corelib_msw_radiobox.obj \ - $(OBJS)\corelib_msw_radiobut.obj \ - $(OBJS)\corelib_richmsgdlg.obj \ - $(OBJS)\corelib_msw_scrolbar.obj \ - $(OBJS)\corelib_msw_slider.obj \ - $(OBJS)\corelib_msw_spinbutt.obj \ - $(OBJS)\corelib_spinctrl.obj \ - $(OBJS)\corelib_msw_statbmp.obj \ - $(OBJS)\corelib_msw_statbox.obj \ - $(OBJS)\corelib_statusbar.obj \ - $(OBJS)\corelib_msw_statline.obj \ - $(OBJS)\corelib_msw_stattext.obj \ - $(OBJS)\corelib_msw_toolbar.obj \ - $(OBJS)\corelib_msw_textctrl.obj \ - $(OBJS)\corelib_textentry.obj \ - $(OBJS)\corelib_msw_tglbtn.obj \ - $(OBJS)\corelib_treectrl.obj \ - $(OBJS)\corelib_msw_checklst.obj \ - $(OBJS)\corelib_msw_fdrepdlg.obj \ - $(OBJS)\corelib_fontdlg.obj \ - $(OBJS)\corelib_accelcmn.obj \ - $(OBJS)\corelib_accesscmn.obj \ - $(OBJS)\corelib_anidecod.obj \ - $(OBJS)\corelib_affinematrix2d.obj \ - $(OBJS)\corelib_appcmn.obj \ - $(OBJS)\corelib_artprov.obj \ - $(OBJS)\corelib_artstd.obj \ - $(OBJS)\corelib_arttango.obj \ - $(OBJS)\corelib_bmpbase.obj \ - $(OBJS)\corelib_bmpbtncmn.obj \ - $(OBJS)\corelib_bookctrl.obj \ - $(OBJS)\corelib_btncmn.obj \ - $(OBJS)\corelib_cairo.obj \ - $(OBJS)\corelib_checkboxcmn.obj \ - $(OBJS)\corelib_checklstcmn.obj \ - $(OBJS)\corelib_choiccmn.obj \ - $(OBJS)\corelib_clipcmn.obj \ - $(OBJS)\corelib_clrpickercmn.obj \ - $(OBJS)\corelib_colourcmn.obj \ - $(OBJS)\corelib_colourdata.obj \ - $(OBJS)\corelib_combocmn.obj \ - $(OBJS)\corelib_cmdproc.obj \ - $(OBJS)\corelib_cmndata.obj \ - $(OBJS)\corelib_containr.obj \ - $(OBJS)\corelib_cshelp.obj \ - $(OBJS)\corelib_ctrlcmn.obj \ - $(OBJS)\corelib_ctrlsub.obj \ - $(OBJS)\corelib_dcbase.obj \ - $(OBJS)\corelib_dcbufcmn.obj \ - $(OBJS)\corelib_dcgraph.obj \ - $(OBJS)\corelib_dcsvg.obj \ - $(OBJS)\corelib_dirctrlcmn.obj \ - $(OBJS)\corelib_dlgcmn.obj \ - $(OBJS)\corelib_dndcmn.obj \ - $(OBJS)\corelib_dobjcmn.obj \ - $(OBJS)\corelib_docmdi.obj \ - $(OBJS)\corelib_docview.obj \ - $(OBJS)\corelib_dpycmn.obj \ - $(OBJS)\corelib_dseldlg.obj \ - $(OBJS)\corelib_effects.obj \ - $(OBJS)\corelib_fddlgcmn.obj \ - $(OBJS)\corelib_filectrlcmn.obj \ - $(OBJS)\corelib_filehistorycmn.obj \ - $(OBJS)\corelib_filepickercmn.obj \ - $(OBJS)\corelib_fontpickercmn.obj \ - $(OBJS)\corelib_fldlgcmn.obj \ - $(OBJS)\corelib_fontcmn.obj \ - $(OBJS)\corelib_fontdata.obj \ - $(OBJS)\corelib_graphicc.obj \ - $(OBJS)\corelib_fontenumcmn.obj \ - $(OBJS)\corelib_fontmap.obj \ - $(OBJS)\corelib_fontutilcmn.obj \ - $(OBJS)\corelib_framecmn.obj \ - $(OBJS)\corelib_gaugecmn.obj \ - $(OBJS)\corelib_gbsizer.obj \ - $(OBJS)\corelib_gdicmn.obj \ - $(OBJS)\corelib_geometry.obj \ - $(OBJS)\corelib_gifdecod.obj \ - $(OBJS)\corelib_graphcmn.obj \ - $(OBJS)\corelib_headercolcmn.obj \ - $(OBJS)\corelib_headerctrlcmn.obj \ - $(OBJS)\corelib_helpbase.obj \ - $(OBJS)\corelib_iconbndl.obj \ - $(OBJS)\corelib_imagall.obj \ - $(OBJS)\corelib_imagbmp.obj \ - $(OBJS)\corelib_image.obj \ - $(OBJS)\corelib_imagfill.obj \ - $(OBJS)\corelib_imaggif.obj \ - $(OBJS)\corelib_imagiff.obj \ - $(OBJS)\corelib_imagjpeg.obj \ - $(OBJS)\corelib_imagpcx.obj \ - $(OBJS)\corelib_imagpng.obj \ - $(OBJS)\corelib_imagpnm.obj \ - $(OBJS)\corelib_imagtga.obj \ - $(OBJS)\corelib_imagtiff.obj \ - $(OBJS)\corelib_imagxpm.obj \ - $(OBJS)\corelib_layout.obj \ - $(OBJS)\corelib_lboxcmn.obj \ - $(OBJS)\corelib_listctrlcmn.obj \ - $(OBJS)\corelib_markupparser.obj \ - $(OBJS)\corelib_matrix.obj \ - $(OBJS)\corelib_menucmn.obj \ - $(OBJS)\corelib_modalhook.obj \ - $(OBJS)\corelib_mousemanager.obj \ - $(OBJS)\corelib_nbkbase.obj \ - $(OBJS)\corelib_overlaycmn.obj \ - $(OBJS)\corelib_ownerdrwcmn.obj \ - $(OBJS)\corelib_paper.obj \ - $(OBJS)\corelib_panelcmn.obj \ - $(OBJS)\corelib_persist.obj \ - $(OBJS)\corelib_pickerbase.obj \ - $(OBJS)\corelib_popupcmn.obj \ - $(OBJS)\corelib_preferencescmn.obj \ - $(OBJS)\corelib_prntbase.obj \ - $(OBJS)\corelib_quantize.obj \ - $(OBJS)\corelib_radiobtncmn.obj \ - $(OBJS)\corelib_radiocmn.obj \ - $(OBJS)\corelib_rearrangectrl.obj \ - $(OBJS)\corelib_rendcmn.obj \ - $(OBJS)\corelib_rgncmn.obj \ - $(OBJS)\corelib_scrolbarcmn.obj \ - $(OBJS)\corelib_settcmn.obj \ - $(OBJS)\corelib_sizer.obj \ - $(OBJS)\corelib_slidercmn.obj \ - $(OBJS)\corelib_spinbtncmn.obj \ - $(OBJS)\corelib_spinctrlcmn.obj \ - $(OBJS)\corelib_srchcmn.obj \ - $(OBJS)\corelib_statbar.obj \ - $(OBJS)\corelib_statbmpcmn.obj \ - $(OBJS)\corelib_statboxcmn.obj \ - $(OBJS)\corelib_statlinecmn.obj \ - $(OBJS)\corelib_stattextcmn.obj \ - $(OBJS)\corelib_stockitem.obj \ - $(OBJS)\corelib_tbarbase.obj \ - $(OBJS)\corelib_textcmn.obj \ - $(OBJS)\corelib_textentrycmn.obj \ - $(OBJS)\corelib_textmeasurecmn.obj \ - $(OBJS)\corelib_toplvcmn.obj \ - $(OBJS)\corelib_treebase.obj \ - $(OBJS)\corelib_uiactioncmn.obj \ - $(OBJS)\corelib_valgen.obj \ - $(OBJS)\corelib_validate.obj \ - $(OBJS)\corelib_valtext.obj \ - $(OBJS)\corelib_valnum.obj \ - $(OBJS)\corelib_wincmn.obj \ - $(OBJS)\corelib_windowid.obj \ - $(OBJS)\corelib_wrapsizer.obj \ - $(OBJS)\corelib_xpmdecod.obj \ - $(OBJS)\corelib_busyinfo.obj \ - $(OBJS)\corelib_buttonbar.obj \ - $(OBJS)\corelib_choicdgg.obj \ - $(OBJS)\corelib_choicbkg.obj \ - $(OBJS)\corelib_combog.obj \ - $(OBJS)\corelib_dcpsg.obj \ - $(OBJS)\corelib_dirctrlg.obj \ - $(OBJS)\corelib_dragimgg.obj \ - $(OBJS)\corelib_filectrlg.obj \ - $(OBJS)\corelib_headerctrlg.obj \ - $(OBJS)\corelib_infobar.obj \ - $(OBJS)\corelib_listbkg.obj \ - $(OBJS)\corelib_logg.obj \ - $(OBJS)\corelib_markuptext.obj \ - $(OBJS)\corelib_msgdlgg.obj \ - $(OBJS)\corelib_numdlgg.obj \ - $(OBJS)\corelib_progdlgg.obj \ - $(OBJS)\corelib_preferencesg.obj \ - $(OBJS)\corelib_printps.obj \ - $(OBJS)\corelib_renderg.obj \ - $(OBJS)\corelib_richmsgdlgg.obj \ - $(OBJS)\corelib_scrlwing.obj \ - $(OBJS)\corelib_selstore.obj \ - $(OBJS)\corelib_spinctlg.obj \ - $(OBJS)\corelib_splitter.obj \ - $(OBJS)\corelib_srchctlg.obj \ - $(OBJS)\corelib_statbmpg.obj \ - $(OBJS)\corelib_stattextg.obj \ - $(OBJS)\corelib_textdlgg.obj \ - $(OBJS)\corelib_tipwin.obj \ - $(OBJS)\corelib_toolbkg.obj \ - $(OBJS)\corelib_treectlg.obj \ - $(OBJS)\corelib_treebkg.obj \ - $(OBJS)\corelib_vlbox.obj \ - $(OBJS)\corelib_vscroll.obj \ - $(OBJS)\corelib_xmlreshandler.obj -!endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -____CORE_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\corelib_activex.obj \ - $(OBJS)\corelib_app.obj \ - $(OBJS)\corelib_bitmap.obj \ - $(OBJS)\corelib_brush.obj \ - $(OBJS)\corelib_caret.obj \ - $(OBJS)\corelib_clipbrd.obj \ - $(OBJS)\corelib_colour.obj \ - $(OBJS)\corelib_cursor.obj \ - $(OBJS)\corelib_data.obj \ - $(OBJS)\corelib_dc.obj \ - $(OBJS)\corelib_dcclient.obj \ - $(OBJS)\corelib_dcmemory.obj \ - $(OBJS)\corelib_dcprint.obj \ - $(OBJS)\corelib_dcscreen.obj \ - $(OBJS)\corelib_dialup.obj \ - $(OBJS)\corelib_dib.obj \ - $(OBJS)\corelib_display.obj \ - $(OBJS)\corelib_enhmeta.obj \ - $(OBJS)\corelib_font.obj \ - $(OBJS)\corelib_fontenum.obj \ - $(OBJS)\corelib_fontutil.obj \ - $(OBJS)\corelib_gdiimage.obj \ - $(OBJS)\corelib_gdiobj.obj \ - $(OBJS)\corelib_gdiplus.obj \ - $(OBJS)\corelib_graphics.obj \ - $(OBJS)\corelib_icon.obj \ - $(OBJS)\corelib_imaglist.obj \ - $(OBJS)\corelib_minifram.obj \ - $(OBJS)\corelib_nonownedwnd.obj \ - $(OBJS)\corelib_dataobj.obj \ - $(OBJS)\corelib_dropsrc.obj \ - $(OBJS)\corelib_droptgt.obj \ - $(OBJS)\corelib_oleutils.obj \ - $(OBJS)\corelib_safearray.obj \ - $(OBJS)\corelib_palette.obj \ - $(OBJS)\corelib_pen.obj \ - $(OBJS)\corelib_popupwin.obj \ - $(OBJS)\corelib_printdlg.obj \ - $(OBJS)\corelib_printwin.obj \ - $(OBJS)\corelib_region.obj \ - $(OBJS)\corelib_renderer.obj \ - $(OBJS)\corelib_settings.obj \ - $(OBJS)\corelib_textmeasure.obj \ - $(OBJS)\corelib_tooltip.obj \ - $(OBJS)\corelib_toplevel.obj \ - $(OBJS)\corelib_uiaction.obj \ - $(OBJS)\corelib_utilsgui.obj \ - $(OBJS)\corelib_utilswin.obj \ - $(OBJS)\corelib_uxtheme.obj \ - $(OBJS)\corelib_window.obj \ - $(OBJS)\corelib_helpchm.obj \ - $(OBJS)\corelib_helpwin.obj \ - $(OBJS)\corelib_automtn.obj \ - $(OBJS)\corelib_uuid.obj \ - $(OBJS)\corelib_evtloop.obj \ - $(OBJS)\corelib_generic_accel.obj \ - $(OBJS)\corelib_clrpickerg.obj \ - $(OBJS)\corelib_collpaneg.obj \ - $(OBJS)\corelib_colrdlgg.obj \ - $(OBJS)\corelib_dirdlgg.obj \ - $(OBJS)\corelib_generic_fdrepdlg.obj \ - $(OBJS)\corelib_filedlgg.obj \ - $(OBJS)\corelib_filepickerg.obj \ - $(OBJS)\corelib_fontdlgg.obj \ - $(OBJS)\corelib_fontpickerg.obj \ - $(OBJS)\corelib_generic_listctrl.obj \ - $(OBJS)\corelib_mdig.obj \ - $(OBJS)\corelib_prntdlgg.obj \ - $(OBJS)\corelib_univ_bmpbuttn.obj \ - $(OBJS)\corelib_univ_button.obj \ - $(OBJS)\corelib_univ_checkbox.obj \ - $(OBJS)\corelib_univ_checklst.obj \ - $(OBJS)\corelib_univ_choice.obj \ - $(OBJS)\corelib_univ_combobox.obj \ - $(OBJS)\corelib_univ_control.obj \ - $(OBJS)\corelib_ctrlrend.obj \ - $(OBJS)\corelib_univ_dialog.obj \ - $(OBJS)\corelib_framuniv.obj \ - $(OBJS)\corelib_univ_gauge.obj \ - $(OBJS)\corelib_inpcons.obj \ - $(OBJS)\corelib_inphand.obj \ - $(OBJS)\corelib_univ_listbox.obj \ - $(OBJS)\corelib_univ_menu.obj \ - $(OBJS)\corelib_univ_notebook.obj \ - $(OBJS)\corelib_univ_radiobox.obj \ - $(OBJS)\corelib_univ_radiobut.obj \ - $(OBJS)\corelib_scrarrow.obj \ - $(OBJS)\corelib_univ_scrolbar.obj \ - $(OBJS)\corelib_scrthumb.obj \ - $(OBJS)\corelib_settingsuniv.obj \ - $(OBJS)\corelib_univ_slider.obj \ - $(OBJS)\corelib_univ_spinbutt.obj \ - $(OBJS)\corelib_univ_statbmp.obj \ - $(OBJS)\corelib_univ_statbox.obj \ - $(OBJS)\corelib_univ_statline.obj \ - $(OBJS)\corelib_univ_stattext.obj \ - $(OBJS)\corelib_univ_statusbr.obj \ - $(OBJS)\corelib_stdrend.obj \ - $(OBJS)\corelib_univ_textctrl.obj \ - $(OBJS)\corelib_univ_tglbtn.obj \ - $(OBJS)\corelib_theme.obj \ - $(OBJS)\corelib_univ_toolbar.obj \ - $(OBJS)\corelib_topluniv.obj \ - $(OBJS)\corelib_winuniv.obj \ - $(OBJS)\corelib_gtk.obj \ - $(OBJS)\corelib_metal.obj \ - $(OBJS)\corelib_mono.obj \ - $(OBJS)\corelib_win32.obj \ - $(OBJS)\corelib_accelcmn.obj \ - $(OBJS)\corelib_accesscmn.obj \ - $(OBJS)\corelib_anidecod.obj \ - $(OBJS)\corelib_affinematrix2d.obj \ - $(OBJS)\corelib_appcmn.obj \ - $(OBJS)\corelib_artprov.obj \ - $(OBJS)\corelib_artstd.obj \ - $(OBJS)\corelib_arttango.obj \ - $(OBJS)\corelib_bmpbase.obj \ - $(OBJS)\corelib_bmpbtncmn.obj \ - $(OBJS)\corelib_bookctrl.obj \ - $(OBJS)\corelib_btncmn.obj \ - $(OBJS)\corelib_cairo.obj \ - $(OBJS)\corelib_checkboxcmn.obj \ - $(OBJS)\corelib_checklstcmn.obj \ - $(OBJS)\corelib_choiccmn.obj \ - $(OBJS)\corelib_clipcmn.obj \ - $(OBJS)\corelib_clrpickercmn.obj \ - $(OBJS)\corelib_colourcmn.obj \ - $(OBJS)\corelib_colourdata.obj \ - $(OBJS)\corelib_combocmn.obj \ - $(OBJS)\corelib_cmdproc.obj \ - $(OBJS)\corelib_cmndata.obj \ - $(OBJS)\corelib_containr.obj \ - $(OBJS)\corelib_cshelp.obj \ - $(OBJS)\corelib_ctrlcmn.obj \ - $(OBJS)\corelib_ctrlsub.obj \ - $(OBJS)\corelib_dcbase.obj \ - $(OBJS)\corelib_dcbufcmn.obj \ - $(OBJS)\corelib_dcgraph.obj \ - $(OBJS)\corelib_dcsvg.obj \ - $(OBJS)\corelib_dirctrlcmn.obj \ - $(OBJS)\corelib_dlgcmn.obj \ - $(OBJS)\corelib_dndcmn.obj \ - $(OBJS)\corelib_dobjcmn.obj \ - $(OBJS)\corelib_docmdi.obj \ - $(OBJS)\corelib_docview.obj \ - $(OBJS)\corelib_dpycmn.obj \ - $(OBJS)\corelib_dseldlg.obj \ - $(OBJS)\corelib_effects.obj \ - $(OBJS)\corelib_fddlgcmn.obj \ - $(OBJS)\corelib_filectrlcmn.obj \ - $(OBJS)\corelib_filehistorycmn.obj \ - $(OBJS)\corelib_filepickercmn.obj \ - $(OBJS)\corelib_fontpickercmn.obj \ - $(OBJS)\corelib_fldlgcmn.obj \ - $(OBJS)\corelib_fontcmn.obj \ - $(OBJS)\corelib_fontdata.obj \ - $(OBJS)\corelib_graphicc.obj \ - $(OBJS)\corelib_fontenumcmn.obj \ - $(OBJS)\corelib_fontmap.obj \ - $(OBJS)\corelib_fontutilcmn.obj \ - $(OBJS)\corelib_framecmn.obj \ - $(OBJS)\corelib_gaugecmn.obj \ - $(OBJS)\corelib_gbsizer.obj \ - $(OBJS)\corelib_gdicmn.obj \ - $(OBJS)\corelib_geometry.obj \ - $(OBJS)\corelib_gifdecod.obj \ - $(OBJS)\corelib_graphcmn.obj \ - $(OBJS)\corelib_headercolcmn.obj \ - $(OBJS)\corelib_headerctrlcmn.obj \ - $(OBJS)\corelib_helpbase.obj \ - $(OBJS)\corelib_iconbndl.obj \ - $(OBJS)\corelib_imagall.obj \ - $(OBJS)\corelib_imagbmp.obj \ - $(OBJS)\corelib_image.obj \ - $(OBJS)\corelib_imagfill.obj \ - $(OBJS)\corelib_imaggif.obj \ - $(OBJS)\corelib_imagiff.obj \ - $(OBJS)\corelib_imagjpeg.obj \ - $(OBJS)\corelib_imagpcx.obj \ - $(OBJS)\corelib_imagpng.obj \ - $(OBJS)\corelib_imagpnm.obj \ - $(OBJS)\corelib_imagtga.obj \ - $(OBJS)\corelib_imagtiff.obj \ - $(OBJS)\corelib_imagxpm.obj \ - $(OBJS)\corelib_layout.obj \ - $(OBJS)\corelib_lboxcmn.obj \ - $(OBJS)\corelib_listctrlcmn.obj \ - $(OBJS)\corelib_markupparser.obj \ - $(OBJS)\corelib_matrix.obj \ - $(OBJS)\corelib_menucmn.obj \ - $(OBJS)\corelib_modalhook.obj \ - $(OBJS)\corelib_mousemanager.obj \ - $(OBJS)\corelib_nbkbase.obj \ - $(OBJS)\corelib_overlaycmn.obj \ - $(OBJS)\corelib_ownerdrwcmn.obj \ - $(OBJS)\corelib_paper.obj \ - $(OBJS)\corelib_panelcmn.obj \ - $(OBJS)\corelib_persist.obj \ - $(OBJS)\corelib_pickerbase.obj \ - $(OBJS)\corelib_popupcmn.obj \ - $(OBJS)\corelib_preferencescmn.obj \ - $(OBJS)\corelib_prntbase.obj \ - $(OBJS)\corelib_quantize.obj \ - $(OBJS)\corelib_radiobtncmn.obj \ - $(OBJS)\corelib_radiocmn.obj \ - $(OBJS)\corelib_rearrangectrl.obj \ - $(OBJS)\corelib_rendcmn.obj \ - $(OBJS)\corelib_rgncmn.obj \ - $(OBJS)\corelib_scrolbarcmn.obj \ - $(OBJS)\corelib_settcmn.obj \ - $(OBJS)\corelib_sizer.obj \ - $(OBJS)\corelib_slidercmn.obj \ - $(OBJS)\corelib_spinbtncmn.obj \ - $(OBJS)\corelib_spinctrlcmn.obj \ - $(OBJS)\corelib_srchcmn.obj \ - $(OBJS)\corelib_statbar.obj \ - $(OBJS)\corelib_statbmpcmn.obj \ - $(OBJS)\corelib_statboxcmn.obj \ - $(OBJS)\corelib_statlinecmn.obj \ - $(OBJS)\corelib_stattextcmn.obj \ - $(OBJS)\corelib_stockitem.obj \ - $(OBJS)\corelib_tbarbase.obj \ - $(OBJS)\corelib_textcmn.obj \ - $(OBJS)\corelib_textentrycmn.obj \ - $(OBJS)\corelib_textmeasurecmn.obj \ - $(OBJS)\corelib_toplvcmn.obj \ - $(OBJS)\corelib_treebase.obj \ - $(OBJS)\corelib_uiactioncmn.obj \ - $(OBJS)\corelib_valgen.obj \ - $(OBJS)\corelib_validate.obj \ - $(OBJS)\corelib_valtext.obj \ - $(OBJS)\corelib_valnum.obj \ - $(OBJS)\corelib_wincmn.obj \ - $(OBJS)\corelib_windowid.obj \ - $(OBJS)\corelib_wrapsizer.obj \ - $(OBJS)\corelib_xpmdecod.obj \ - $(OBJS)\corelib_busyinfo.obj \ - $(OBJS)\corelib_buttonbar.obj \ - $(OBJS)\corelib_choicdgg.obj \ - $(OBJS)\corelib_choicbkg.obj \ - $(OBJS)\corelib_combog.obj \ - $(OBJS)\corelib_dcpsg.obj \ - $(OBJS)\corelib_dirctrlg.obj \ - $(OBJS)\corelib_dragimgg.obj \ - $(OBJS)\corelib_filectrlg.obj \ - $(OBJS)\corelib_headerctrlg.obj \ - $(OBJS)\corelib_infobar.obj \ - $(OBJS)\corelib_listbkg.obj \ - $(OBJS)\corelib_logg.obj \ - $(OBJS)\corelib_markuptext.obj \ - $(OBJS)\corelib_msgdlgg.obj \ - $(OBJS)\corelib_numdlgg.obj \ - $(OBJS)\corelib_progdlgg.obj \ - $(OBJS)\corelib_preferencesg.obj \ - $(OBJS)\corelib_printps.obj \ - $(OBJS)\corelib_renderg.obj \ - $(OBJS)\corelib_richmsgdlgg.obj \ - $(OBJS)\corelib_scrlwing.obj \ - $(OBJS)\corelib_selstore.obj \ - $(OBJS)\corelib_spinctlg.obj \ - $(OBJS)\corelib_splitter.obj \ - $(OBJS)\corelib_srchctlg.obj \ - $(OBJS)\corelib_statbmpg.obj \ - $(OBJS)\corelib_stattextg.obj \ - $(OBJS)\corelib_textdlgg.obj \ - $(OBJS)\corelib_tipwin.obj \ - $(OBJS)\corelib_toolbkg.obj \ - $(OBJS)\corelib_treectlg.obj \ - $(OBJS)\corelib_treebkg.obj \ - $(OBJS)\corelib_vlbox.obj \ - $(OBJS)\corelib_vscroll.obj \ - $(OBJS)\corelib_xmlreshandler.obj -!endif -!if "$(SHARED)" == "1" -____wxcore_namedll_DEP = $(__coredll___depname) -!endif -!if "$(SHARED)" == "0" -____wxcore_namelib_DEP = $(__corelib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" -__advdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(WXUNIV)" == "0" -____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\advdll_animatecmn.obj \ - $(OBJS)\advdll_bmpcboxcmn.obj \ - $(OBJS)\advdll_calctrlcmn.obj \ - $(OBJS)\advdll_datavcmn.obj \ - $(OBJS)\advdll_gridcmn.obj \ - $(OBJS)\advdll_hyperlnkcmn.obj \ - $(OBJS)\advdll_odcombocmn.obj \ - $(OBJS)\advdll_richtooltipcmn.obj \ - $(OBJS)\advdll_aboutdlgg.obj \ - $(OBJS)\advdll_bannerwindow.obj \ - $(OBJS)\advdll_bmpcboxg.obj \ - $(OBJS)\advdll_calctrlg.obj \ - $(OBJS)\advdll_commandlinkbuttong.obj \ - $(OBJS)\advdll_datavgen.obj \ - $(OBJS)\advdll_datectlg.obj \ - $(OBJS)\advdll_editlbox.obj \ - $(OBJS)\advdll_grid.obj \ - $(OBJS)\advdll_gridctrl.obj \ - $(OBJS)\advdll_grideditors.obj \ - $(OBJS)\advdll_gridsel.obj \ - $(OBJS)\advdll_helpext.obj \ - $(OBJS)\advdll_hyperlinkg.obj \ - $(OBJS)\advdll_laywin.obj \ - $(OBJS)\advdll_notifmsgg.obj \ - $(OBJS)\advdll_odcombo.obj \ - $(OBJS)\advdll_propdlg.obj \ - $(OBJS)\advdll_richtooltipg.obj \ - $(OBJS)\advdll_sashwin.obj \ - $(OBJS)\advdll_splash.obj \ - $(OBJS)\advdll_timectrlg.obj \ - $(OBJS)\advdll_tipdlg.obj \ - $(OBJS)\advdll_treelist.obj \ - $(OBJS)\advdll_wizard.obj \ - $(OBJS)\advdll_taskbarcmn.obj \ - $(OBJS)\advdll_aboutdlg.obj \ - $(OBJS)\advdll_notifmsg.obj \ - $(OBJS)\advdll_richtooltip.obj \ - $(OBJS)\advdll_sound.obj \ - $(OBJS)\advdll_taskbar.obj \ - $(OBJS)\advdll_joystick.obj \ - $(OBJS)\advdll_animateg.obj \ - $(OBJS)\advdll_bmpcbox.obj \ - $(OBJS)\advdll_calctrl.obj \ - $(OBJS)\advdll_commandlinkbutton.obj \ - $(OBJS)\advdll_datecontrols.obj \ - $(OBJS)\advdll_datectrl.obj \ - $(OBJS)\advdll_datetimectrl.obj \ - $(OBJS)\advdll_hyperlink.obj \ - $(OBJS)\advdll_timectrl.obj -!endif -!if "$(WXUNIV)" == "1" -____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\advdll_animatecmn.obj \ - $(OBJS)\advdll_bmpcboxcmn.obj \ - $(OBJS)\advdll_calctrlcmn.obj \ - $(OBJS)\advdll_datavcmn.obj \ - $(OBJS)\advdll_gridcmn.obj \ - $(OBJS)\advdll_hyperlnkcmn.obj \ - $(OBJS)\advdll_odcombocmn.obj \ - $(OBJS)\advdll_richtooltipcmn.obj \ - $(OBJS)\advdll_aboutdlgg.obj \ - $(OBJS)\advdll_bannerwindow.obj \ - $(OBJS)\advdll_bmpcboxg.obj \ - $(OBJS)\advdll_calctrlg.obj \ - $(OBJS)\advdll_commandlinkbuttong.obj \ - $(OBJS)\advdll_datavgen.obj \ - $(OBJS)\advdll_datectlg.obj \ - $(OBJS)\advdll_editlbox.obj \ - $(OBJS)\advdll_grid.obj \ - $(OBJS)\advdll_gridctrl.obj \ - $(OBJS)\advdll_grideditors.obj \ - $(OBJS)\advdll_gridsel.obj \ - $(OBJS)\advdll_helpext.obj \ - $(OBJS)\advdll_hyperlinkg.obj \ - $(OBJS)\advdll_laywin.obj \ - $(OBJS)\advdll_notifmsgg.obj \ - $(OBJS)\advdll_odcombo.obj \ - $(OBJS)\advdll_propdlg.obj \ - $(OBJS)\advdll_richtooltipg.obj \ - $(OBJS)\advdll_sashwin.obj \ - $(OBJS)\advdll_splash.obj \ - $(OBJS)\advdll_timectrlg.obj \ - $(OBJS)\advdll_tipdlg.obj \ - $(OBJS)\advdll_treelist.obj \ - $(OBJS)\advdll_wizard.obj \ - $(OBJS)\advdll_taskbarcmn.obj \ - $(OBJS)\advdll_aboutdlg.obj \ - $(OBJS)\advdll_notifmsg.obj \ - $(OBJS)\advdll_richtooltip.obj \ - $(OBJS)\advdll_sound.obj \ - $(OBJS)\advdll_taskbar.obj \ - $(OBJS)\advdll_joystick.obj \ - $(OBJS)\advdll_animateg.obj -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" -__advlib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(WXUNIV)" == "0" -____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\advlib_animatecmn.obj \ - $(OBJS)\advlib_bmpcboxcmn.obj \ - $(OBJS)\advlib_calctrlcmn.obj \ - $(OBJS)\advlib_datavcmn.obj \ - $(OBJS)\advlib_gridcmn.obj \ - $(OBJS)\advlib_hyperlnkcmn.obj \ - $(OBJS)\advlib_odcombocmn.obj \ - $(OBJS)\advlib_richtooltipcmn.obj \ - $(OBJS)\advlib_aboutdlgg.obj \ - $(OBJS)\advlib_bannerwindow.obj \ - $(OBJS)\advlib_bmpcboxg.obj \ - $(OBJS)\advlib_calctrlg.obj \ - $(OBJS)\advlib_commandlinkbuttong.obj \ - $(OBJS)\advlib_datavgen.obj \ - $(OBJS)\advlib_datectlg.obj \ - $(OBJS)\advlib_editlbox.obj \ - $(OBJS)\advlib_grid.obj \ - $(OBJS)\advlib_gridctrl.obj \ - $(OBJS)\advlib_grideditors.obj \ - $(OBJS)\advlib_gridsel.obj \ - $(OBJS)\advlib_helpext.obj \ - $(OBJS)\advlib_hyperlinkg.obj \ - $(OBJS)\advlib_laywin.obj \ - $(OBJS)\advlib_notifmsgg.obj \ - $(OBJS)\advlib_odcombo.obj \ - $(OBJS)\advlib_propdlg.obj \ - $(OBJS)\advlib_richtooltipg.obj \ - $(OBJS)\advlib_sashwin.obj \ - $(OBJS)\advlib_splash.obj \ - $(OBJS)\advlib_timectrlg.obj \ - $(OBJS)\advlib_tipdlg.obj \ - $(OBJS)\advlib_treelist.obj \ - $(OBJS)\advlib_wizard.obj \ - $(OBJS)\advlib_taskbarcmn.obj \ - $(OBJS)\advlib_aboutdlg.obj \ - $(OBJS)\advlib_notifmsg.obj \ - $(OBJS)\advlib_richtooltip.obj \ - $(OBJS)\advlib_sound.obj \ - $(OBJS)\advlib_taskbar.obj \ - $(OBJS)\advlib_joystick.obj \ - $(OBJS)\advlib_animateg.obj \ - $(OBJS)\advlib_bmpcbox.obj \ - $(OBJS)\advlib_calctrl.obj \ - $(OBJS)\advlib_commandlinkbutton.obj \ - $(OBJS)\advlib_datecontrols.obj \ - $(OBJS)\advlib_datectrl.obj \ - $(OBJS)\advlib_datetimectrl.obj \ - $(OBJS)\advlib_hyperlink.obj \ - $(OBJS)\advlib_timectrl.obj -!endif -!if "$(WXUNIV)" == "1" -____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\advlib_animatecmn.obj \ - $(OBJS)\advlib_bmpcboxcmn.obj \ - $(OBJS)\advlib_calctrlcmn.obj \ - $(OBJS)\advlib_datavcmn.obj \ - $(OBJS)\advlib_gridcmn.obj \ - $(OBJS)\advlib_hyperlnkcmn.obj \ - $(OBJS)\advlib_odcombocmn.obj \ - $(OBJS)\advlib_richtooltipcmn.obj \ - $(OBJS)\advlib_aboutdlgg.obj \ - $(OBJS)\advlib_bannerwindow.obj \ - $(OBJS)\advlib_bmpcboxg.obj \ - $(OBJS)\advlib_calctrlg.obj \ - $(OBJS)\advlib_commandlinkbuttong.obj \ - $(OBJS)\advlib_datavgen.obj \ - $(OBJS)\advlib_datectlg.obj \ - $(OBJS)\advlib_editlbox.obj \ - $(OBJS)\advlib_grid.obj \ - $(OBJS)\advlib_gridctrl.obj \ - $(OBJS)\advlib_grideditors.obj \ - $(OBJS)\advlib_gridsel.obj \ - $(OBJS)\advlib_helpext.obj \ - $(OBJS)\advlib_hyperlinkg.obj \ - $(OBJS)\advlib_laywin.obj \ - $(OBJS)\advlib_notifmsgg.obj \ - $(OBJS)\advlib_odcombo.obj \ - $(OBJS)\advlib_propdlg.obj \ - $(OBJS)\advlib_richtooltipg.obj \ - $(OBJS)\advlib_sashwin.obj \ - $(OBJS)\advlib_splash.obj \ - $(OBJS)\advlib_timectrlg.obj \ - $(OBJS)\advlib_tipdlg.obj \ - $(OBJS)\advlib_treelist.obj \ - $(OBJS)\advlib_wizard.obj \ - $(OBJS)\advlib_taskbarcmn.obj \ - $(OBJS)\advlib_aboutdlg.obj \ - $(OBJS)\advlib_notifmsg.obj \ - $(OBJS)\advlib_richtooltip.obj \ - $(OBJS)\advlib_sound.obj \ - $(OBJS)\advlib_taskbar.obj \ - $(OBJS)\advlib_joystick.obj \ - $(OBJS)\advlib_animateg.obj -!endif -!if "$(SHARED)" == "1" -____wxadv_namedll_DEP = $(__advdll___depname) -!endif -!if "$(SHARED)" == "0" -____wxadv_namelib_DEP = $(__advlib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" -__mediadll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" -__medialib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib -!endif -!if "$(SHARED)" == "1" -____wxmedia_namedll_DEP = $(__mediadll___depname) -!endif -!if "$(SHARED)" == "0" -____wxmedia_namelib_DEP = $(__medialib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" -__htmldll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" -__htmllib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(SHARED)" == "1" -____wxhtml_namedll_DEP = $(__htmldll___depname) -!endif -!if "$(SHARED)" == "0" -____wxhtml_namelib_DEP = $(__htmllib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1" -__webviewdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1" -__webviewlib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib -!endif -!if "$(SHARED)" == "1" -____wxwebview_namedll_DEP = $(__webviewdll___depname) -!endif -!if "$(SHARED)" == "0" -____wxwebview_namelib_DEP = $(__webviewlib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1" -__qadll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1" -__qalib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib -!endif -!if "$(SHARED)" == "1" -____wxqa_namedll_DEP = $(__qadll___depname) -!endif -!if "$(SHARED)" == "0" -____wxqa_namelib_DEP = $(__qalib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -__xmldll___depname = \ - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -__xmllib___depname = \ - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -!if "$(SHARED)" == "1" -____wxxml_namedll_DEP = $(__xmldll___depname) -!endif -!if "$(SHARED)" == "0" -____wxxml_namelib_DEP = $(__xmllib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1" -__xrcdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1" -__xrclib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib -!endif -!if "$(SHARED)" == "1" -____wxxrc_namedll_DEP = $(__xrcdll___depname) -!endif -!if "$(SHARED)" == "0" -____wxxrc_namelib_DEP = $(__xrclib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1" -__auidll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1" -__auilib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib -!endif -!if "$(SHARED)" == "1" -____wxaui_namedll_DEP = $(__auidll___depname) -!endif -!if "$(SHARED)" == "0" -____wxaui_namelib_DEP = $(__auilib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1" -__ribbondll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RIBBON)" == "1" -__ribbonlib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib -!endif -!if "$(SHARED)" == "1" -____wxribbon_namedll_DEP = $(__ribbondll___depname) -!endif -!if "$(SHARED)" == "0" -____wxribbon_namelib_DEP = $(__ribbonlib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1" -__propgriddll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_PROPGRID)" == "1" -__propgridlib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib -!endif -!if "$(SHARED)" == "1" -____wxpropgrid_namedll_DEP = $(__propgriddll___depname) -!endif -!if "$(SHARED)" == "0" -____wxpropgrid_namelib_DEP = $(__propgridlib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1" -__richtextdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RICHTEXT)" == "1" -__richtextlib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib -!endif -!if "$(SHARED)" == "1" -____wxrichtext_namedll_DEP = $(__richtextdll___depname) -!endif -!if "$(SHARED)" == "0" -____wxrichtext_namelib_DEP = $(__richtextlib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1" -__stcdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_STC)" == "1" -__stclib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib -!endif -!if "$(SHARED)" == "1" -____wxstc_namedll_DEP = $(__stcdll___depname) -!endif -!if "$(SHARED)" == "0" -____wxstc_namelib_DEP = $(__stclib___depname) -!endif -!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -__gldll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIBGLDEP_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIBGLDEP_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -__gllib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib -!endif -!if "$(SHARED)" == "1" -____wxgl_namedll_DEP = $(__gldll___depname) -!endif -!if "$(SHARED)" == "0" -____wxgl_namelib_DEP = $(__gllib___depname) -!endif -!if "$(USE_STC)" == "1" -__wxscintilla = $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" -__htmldll_library_link_DEP = $(__htmldll___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" -__htmldll_library_link_LIBR = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG_14 = -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG_14 = mt -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_5 = i -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_5 = -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_67 = -d__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_66 = -dwxDEBUG_LEVEL=0 -!endif -!if "$(BUILD)" == "release" -__NDEBUG_DEFINE_p_65 = -dNDEBUG -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_65 = -dwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_65 = -dwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_65 = -dwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_67 = -dwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_67 = -d_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_65 = -dwxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_INCLUDEDIR_FILENAMES_4 = -i$(CAIRO_ROOT)\include\cairo -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_CAIRO)" == "1" -__CAIRO_LIB_p = cairo.lib -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_LIBDIR_FILENAMES = -L$(CAIRO_ROOT)\lib -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO = -v- -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO = -v -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG = -Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG = -O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG = -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG = -tWM -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS = -tWR -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS = -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -!endif -!if "$(BUILD)" == "release" -__NDEBUG_DEFINE_p = -DNDEBUG -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = -DwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = -DwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = -D_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo -!endif -!if "$(WXUNIV)" == "0" -__SETUP_H_SUBDIR_FILENAMES = msw -!endif -!if "$(WXUNIV)" == "1" -__SETUP_H_SUBDIR_FILENAMES = univ -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.csm del $(OBJS)\*.csm - -if exist $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).tds del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilc del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ild del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilf del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ils del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).tds del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).ilc del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).ild del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).ilf del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).ils del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).tds del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).ilc del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).ild del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).ilf del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).ils del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).tds del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).tds - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).ilc del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).ilc - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).ild del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).ild - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).ilf del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).ilf - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).ils del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).ils - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib - @echo cd ..\..\samples >$(OBJS)\samples.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>$(OBJS)\samples.bat - call $(OBJS)\samples.bat - @del $(OBJS)\samples.bat - -setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h - -$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(WXREGEX_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(WXREGEX_OBJECTS) -| - -$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(WXZLIB_OBJECTS) -| - -!if "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib: $(WXPNG_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(WXPNG_OBJECTS) -| -!endif - -!if "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib: $(WXJPEG_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(WXJPEG_OBJECTS) -| -!endif - -!if "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib: $(WXTIFF_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(WXTIFF_OBJECTS) -| -!endif - -$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(WXEXPAT_OBJECTS) -| - -!if "$(USE_STC)" == "1" -$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib: $(WXSCINTILLA_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(WXSCINTILLA_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP) - ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0d32.obj $(MONODLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(__wxscintilla) import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\monodll_version.res -| - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@ -!endif - -!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\monolib_dummy.obj $(MONOLIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(MONOLIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\basedll_version.res - ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0d32.obj $(BASEDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\basedll_version.res -| - implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) $@ -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\baselib_dummy.obj $(BASELIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(BASELIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" -wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname) - ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0d32.obj $(NETDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\netdll_version.res -| - implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net $@ -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib: $(OBJS)\netlib_dummy.obj $(NETLIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(NETLIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" -wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname) - ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0d32.obj $(COREDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\coredll_version.res -| - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core $@ -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib: $(OBJS)\corelib_dummy.obj $(CORELIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(CORELIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1" -wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname) - ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0d32.obj $(ADVDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\advdll_version.res -| - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv $@ -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib: $(OBJS)\advlib_dummy.obj $(ADVLIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(ADVLIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1" -wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname) - ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0d32.obj $(MEDIADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\mediadll_version.res -| - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media $@ -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib: $(OBJS)\medialib_dummy.obj $(MEDIALIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(MEDIALIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" -wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname) - ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0d32.obj $(HTMLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\htmldll_version.res -| - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html $@ -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib: $(OBJS)\htmllib_dummy.obj $(HTMLLIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(HTMLLIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_HTML)" == "1" -wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\webviewdll_dummy.obj $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\webviewdll_version.res $(__coredll___depname) $(__basedll___depname) - ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0d32.obj $(WEBVIEWDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\webviewdll_version.res -| - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview $@ -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib: $(OBJS)\webviewlib_dummy.obj $(WEBVIEWLIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(WEBVIEWLIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1" -wxwebview: $(____wxwebview_namedll_DEP) $(____wxwebview_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname) - ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0d32.obj $(QADLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\qadll_version.res -| - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa $@ -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib: $(OBJS)\qalib_dummy.obj $(QALIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(QALIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_QA)" == "1" -wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname) - ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0d32.obj $(XMLDLL_OBJECTS),$@,, wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\xmldll_version.res -| - implib -f $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml $@ -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib: $(OBJS)\xmllib_dummy.obj $(XMLLIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(XMLLIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" -wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) - ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0d32.obj $(XRCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\xrcdll_version.res -| - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc $@ -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib: $(OBJS)\xrclib_dummy.obj $(XRCLIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(XRCLIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_XRC)" == "1" -wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0d32.obj $(AUIDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\auidll_version.res -| - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui $@ -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib: $(OBJS)\auilib_dummy.obj $(AUILIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(AUILIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_AUI)" == "1" -wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\ribbondll_dummy.obj $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\ribbondll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0d32.obj $(RIBBONDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\ribbondll_version.res -| - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon $@ -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RIBBON)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib: $(OBJS)\ribbonlib_dummy.obj $(RIBBONLIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(RIBBONLIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_RIBBON)" == "1" -wxribbon: $(____wxribbon_namedll_DEP) $(____wxribbon_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\propgriddll_dummy.obj $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\propgriddll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0d32.obj $(PROPGRIDDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\propgriddll_version.res -| - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid $@ -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_PROPGRID)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib: $(OBJS)\propgridlib_dummy.obj $(PROPGRIDLIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(PROPGRIDLIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_PROPGRID)" == "1" -wxpropgrid: $(____wxpropgrid_namedll_DEP) $(____wxpropgrid_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) - ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0d32.obj $(RICHTEXTDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\richtextdll_version.res -| - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext $@ -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RICHTEXT)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib: $(OBJS)\richtextlib_dummy.obj $(RICHTEXTLIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(RICHTEXTLIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_RICHTEXT)" == "1" -wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla) $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname) - ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0d32.obj $(STCDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\stcdll_version.res -| - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc $@ -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_STC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib: $(OBJS)\stclib_dummy.obj $(STCLIB_OBJECTS) $(__wxscintilla) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(STCLIB_OBJECTS) -| -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_STC)" == "1" -wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP) -!endif - -!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname) - ilink32 -Tpd -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&| - c0d32.obj $(GLDLL_OBJECTS),$@,, $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) import32.lib cw32$(__THREADSFLAG_14)$(__RUNTIME_LIBS_5).lib,, $(OBJS)\gldll_version.res -| - implib -f $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl $@ -!endif - -!if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib: $(OBJS)\gllib_dummy.obj $(GLLIB_OBJECTS) - if exist $@ del $@ - tlib /a /p4096 $@ @&&| - $(GLLIB_OBJECTS) -| -!endif - -!if "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP) -!endif - -samples: - @echo cd ..\..\samples >$(OBJS)\samples.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>$(OBJS)\samples.bat - call $(OBJS)\samples.bat - @del $(OBJS)\samples.bat - -$(LIBDIRNAME): - if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME) - -$(SETUPHDIR): $(LIBDIRNAME) - if not exist $(SETUPHDIR) mkdir $(SETUPHDIR) - -$(SETUPHDIR)\wx: $(SETUPHDIR) - if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx - -..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h: - if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h - -$(SETUPHDIR)\wx\setup.h: - if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h - -$(SETUPHDIR)\wx\msw: $(SETUPHDIR)\wx - if not exist $(SETUPHDIR)\wx\msw mkdir $(SETUPHDIR)\wx\msw - -$(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs.h - $(CPP) "..\..\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h" - -build_cfg_file: $(SETUPHDIR) - @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) - @echo WXVER_MINOR=0 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE) - @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) - @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) - @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) - @echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE) - @echo TOOLKIT=MSW >>$(BUILD_CFG_FILE) - @echo TOOLKIT_VERSION=$(TOOLKIT_VERSION) >>$(BUILD_CFG_FILE) - @echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE) - @echo CFG=$(CFG) >>$(BUILD_CFG_FILE) - @echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE) - @echo OFFICIAL_BUILD=$(OFFICIAL_BUILD) >>$(BUILD_CFG_FILE) - @echo DEBUG_FLAG=$(DEBUG_FLAG) >>$(BUILD_CFG_FILE) - @echo DEBUG_INFO=$(DEBUG_INFO) >>$(BUILD_CFG_FILE) - @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE) - @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE) - @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE) - @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE) - @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE) - @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE) - @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE) - @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE) - @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE) - @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE) - @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE) - @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE) - @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE) - @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE) - @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE) - @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE) - @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE) - @echo COMPILER=bcc >>$(BUILD_CFG_FILE) - @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE) - @echo CC=$(CC) >>$(BUILD_CFG_FILE) - @echo CXX=$(CXX) >>$(BUILD_CFG_FILE) - @echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE) - @echo CPPFLAGS=$(CPPFLAGS) >>$(BUILD_CFG_FILE) - @echo CXXFLAGS=$(CXXFLAGS) >>$(BUILD_CFG_FILE) - @echo LDFLAGS=$(LDFLAGS) >>$(BUILD_CFG_FILE) - -$(OBJS)\wxregex_regcomp.obj: ..\..\src\regex\regcomp.c - $(CC) -q -c -P- -o$@ $(WXREGEX_CFLAGS) ..\..\src\regex\regcomp.c - -$(OBJS)\wxregex_regexec.obj: ..\..\src\regex\regexec.c - $(CC) -q -c -P- -o$@ $(WXREGEX_CFLAGS) ..\..\src\regex\regexec.c - -$(OBJS)\wxregex_regerror.obj: ..\..\src\regex\regerror.c - $(CC) -q -c -P- -o$@ $(WXREGEX_CFLAGS) ..\..\src\regex\regerror.c - -$(OBJS)\wxregex_regfree.obj: ..\..\src\regex\regfree.c - $(CC) -q -c -P- -o$@ $(WXREGEX_CFLAGS) ..\..\src\regex\regfree.c - -$(OBJS)\wxzlib_adler32.obj: ..\..\src\zlib\adler32.c - $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\adler32.c - -$(OBJS)\wxzlib_compress.obj: ..\..\src\zlib\compress.c - $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\compress.c - -$(OBJS)\wxzlib_crc32.obj: ..\..\src\zlib\crc32.c - $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\crc32.c - -$(OBJS)\wxzlib_deflate.obj: ..\..\src\zlib\deflate.c - $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\deflate.c - -$(OBJS)\wxzlib_gzclose.obj: ..\..\src\zlib\gzclose.c - $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\gzclose.c - -$(OBJS)\wxzlib_gzlib.obj: ..\..\src\zlib\gzlib.c - $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\gzlib.c - -$(OBJS)\wxzlib_gzread.obj: ..\..\src\zlib\gzread.c - $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\gzread.c - -$(OBJS)\wxzlib_gzwrite.obj: ..\..\src\zlib\gzwrite.c - $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\gzwrite.c - -$(OBJS)\wxzlib_infback.obj: ..\..\src\zlib\infback.c - $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\infback.c - -$(OBJS)\wxzlib_inffast.obj: ..\..\src\zlib\inffast.c - $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\inffast.c - -$(OBJS)\wxzlib_inflate.obj: ..\..\src\zlib\inflate.c - $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\inflate.c - -$(OBJS)\wxzlib_inftrees.obj: ..\..\src\zlib\inftrees.c - $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\inftrees.c - -$(OBJS)\wxzlib_trees.obj: ..\..\src\zlib\trees.c - $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\trees.c - -$(OBJS)\wxzlib_uncompr.obj: ..\..\src\zlib\uncompr.c - $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\uncompr.c - -$(OBJS)\wxzlib_zutil.obj: ..\..\src\zlib\zutil.c - $(CC) -q -c -P- -o$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\zutil.c - -$(OBJS)\wxpng_png.obj: ..\..\src\png\png.c - $(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\png.c - -$(OBJS)\wxpng_pngerror.obj: ..\..\src\png\pngerror.c - $(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngerror.c - -$(OBJS)\wxpng_pngget.obj: ..\..\src\png\pngget.c - $(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngget.c - -$(OBJS)\wxpng_pngmem.obj: ..\..\src\png\pngmem.c - $(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngmem.c - -$(OBJS)\wxpng_pngpread.obj: ..\..\src\png\pngpread.c - $(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngpread.c - -$(OBJS)\wxpng_pngread.obj: ..\..\src\png\pngread.c - $(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngread.c - -$(OBJS)\wxpng_pngrio.obj: ..\..\src\png\pngrio.c - $(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngrio.c - -$(OBJS)\wxpng_pngrtran.obj: ..\..\src\png\pngrtran.c - $(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngrtran.c - -$(OBJS)\wxpng_pngrutil.obj: ..\..\src\png\pngrutil.c - $(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngrutil.c - -$(OBJS)\wxpng_pngset.obj: ..\..\src\png\pngset.c - $(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngset.c - -$(OBJS)\wxpng_pngtrans.obj: ..\..\src\png\pngtrans.c - $(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngtrans.c - -$(OBJS)\wxpng_pngwio.obj: ..\..\src\png\pngwio.c - $(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngwio.c - -$(OBJS)\wxpng_pngwrite.obj: ..\..\src\png\pngwrite.c - $(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngwrite.c - -$(OBJS)\wxpng_pngwtran.obj: ..\..\src\png\pngwtran.c - $(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngwtran.c - -$(OBJS)\wxpng_pngwutil.obj: ..\..\src\png\pngwutil.c - $(CC) -q -c -P- -o$@ $(WXPNG_CFLAGS) ..\..\src\png\pngwutil.c - -$(OBJS)\wxjpeg_jcomapi.obj: ..\..\src\jpeg\jcomapi.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcomapi.c - -$(OBJS)\wxjpeg_jutils.obj: ..\..\src\jpeg\jutils.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jutils.c - -$(OBJS)\wxjpeg_jerror.obj: ..\..\src\jpeg\jerror.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jerror.c - -$(OBJS)\wxjpeg_jmemmgr.obj: ..\..\src\jpeg\jmemmgr.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jmemmgr.c - -$(OBJS)\wxjpeg_jmemnobs.obj: ..\..\src\jpeg\jmemnobs.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jmemnobs.c - -$(OBJS)\wxjpeg_jcapimin.obj: ..\..\src\jpeg\jcapimin.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcapimin.c - -$(OBJS)\wxjpeg_jcapistd.obj: ..\..\src\jpeg\jcapistd.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcapistd.c - -$(OBJS)\wxjpeg_jctrans.obj: ..\..\src\jpeg\jctrans.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jctrans.c - -$(OBJS)\wxjpeg_jcparam.obj: ..\..\src\jpeg\jcparam.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcparam.c - -$(OBJS)\wxjpeg_jdatadst.obj: ..\..\src\jpeg\jdatadst.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdatadst.c - -$(OBJS)\wxjpeg_jcinit.obj: ..\..\src\jpeg\jcinit.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcinit.c - -$(OBJS)\wxjpeg_jcmaster.obj: ..\..\src\jpeg\jcmaster.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcmaster.c - -$(OBJS)\wxjpeg_jcmarker.obj: ..\..\src\jpeg\jcmarker.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcmarker.c - -$(OBJS)\wxjpeg_jcmainct.obj: ..\..\src\jpeg\jcmainct.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcmainct.c - -$(OBJS)\wxjpeg_jcprepct.obj: ..\..\src\jpeg\jcprepct.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcprepct.c - -$(OBJS)\wxjpeg_jccoefct.obj: ..\..\src\jpeg\jccoefct.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jccoefct.c - -$(OBJS)\wxjpeg_jccolor.obj: ..\..\src\jpeg\jccolor.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jccolor.c - -$(OBJS)\wxjpeg_jcsample.obj: ..\..\src\jpeg\jcsample.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcsample.c - -$(OBJS)\wxjpeg_jchuff.obj: ..\..\src\jpeg\jchuff.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jchuff.c - -$(OBJS)\wxjpeg_jcphuff.obj: ..\..\src\jpeg\jcphuff.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcphuff.c - -$(OBJS)\wxjpeg_jcdctmgr.obj: ..\..\src\jpeg\jcdctmgr.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcdctmgr.c - -$(OBJS)\wxjpeg_jfdctfst.obj: ..\..\src\jpeg\jfdctfst.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jfdctfst.c - -$(OBJS)\wxjpeg_jfdctflt.obj: ..\..\src\jpeg\jfdctflt.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jfdctflt.c - -$(OBJS)\wxjpeg_jfdctint.obj: ..\..\src\jpeg\jfdctint.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jfdctint.c - -$(OBJS)\wxjpeg_jdapimin.obj: ..\..\src\jpeg\jdapimin.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdapimin.c - -$(OBJS)\wxjpeg_jdapistd.obj: ..\..\src\jpeg\jdapistd.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdapistd.c - -$(OBJS)\wxjpeg_jdtrans.obj: ..\..\src\jpeg\jdtrans.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdtrans.c - -$(OBJS)\wxjpeg_jdatasrc.obj: ..\..\src\jpeg\jdatasrc.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdatasrc.c - -$(OBJS)\wxjpeg_jdmaster.obj: ..\..\src\jpeg\jdmaster.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdmaster.c - -$(OBJS)\wxjpeg_jdinput.obj: ..\..\src\jpeg\jdinput.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdinput.c - -$(OBJS)\wxjpeg_jdmarker.obj: ..\..\src\jpeg\jdmarker.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdmarker.c - -$(OBJS)\wxjpeg_jdhuff.obj: ..\..\src\jpeg\jdhuff.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdhuff.c - -$(OBJS)\wxjpeg_jdphuff.obj: ..\..\src\jpeg\jdphuff.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdphuff.c - -$(OBJS)\wxjpeg_jdmainct.obj: ..\..\src\jpeg\jdmainct.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdmainct.c - -$(OBJS)\wxjpeg_jdcoefct.obj: ..\..\src\jpeg\jdcoefct.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdcoefct.c - -$(OBJS)\wxjpeg_jdpostct.obj: ..\..\src\jpeg\jdpostct.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdpostct.c - -$(OBJS)\wxjpeg_jddctmgr.obj: ..\..\src\jpeg\jddctmgr.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jddctmgr.c - -$(OBJS)\wxjpeg_jidctfst.obj: ..\..\src\jpeg\jidctfst.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jidctfst.c - -$(OBJS)\wxjpeg_jidctflt.obj: ..\..\src\jpeg\jidctflt.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jidctflt.c - -$(OBJS)\wxjpeg_jidctint.obj: ..\..\src\jpeg\jidctint.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jidctint.c - -$(OBJS)\wxjpeg_jidctred.obj: ..\..\src\jpeg\jidctred.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jidctred.c - -$(OBJS)\wxjpeg_jdsample.obj: ..\..\src\jpeg\jdsample.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdsample.c - -$(OBJS)\wxjpeg_jdcolor.obj: ..\..\src\jpeg\jdcolor.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdcolor.c - -$(OBJS)\wxjpeg_jquant1.obj: ..\..\src\jpeg\jquant1.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jquant1.c - -$(OBJS)\wxjpeg_jquant2.obj: ..\..\src\jpeg\jquant2.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jquant2.c - -$(OBJS)\wxjpeg_jdmerge.obj: ..\..\src\jpeg\jdmerge.c - $(CC) -q -c -P- -o$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdmerge.c - -$(OBJS)\wxtiff_tif_win32.obj: ..\..\src\tiff\libtiff\tif_win32.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_win32.c - -$(OBJS)\wxtiff_tif_aux.obj: ..\..\src\tiff\libtiff\tif_aux.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_aux.c - -$(OBJS)\wxtiff_tif_close.obj: ..\..\src\tiff\libtiff\tif_close.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_close.c - -$(OBJS)\wxtiff_tif_codec.obj: ..\..\src\tiff\libtiff\tif_codec.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_codec.c - -$(OBJS)\wxtiff_tif_color.obj: ..\..\src\tiff\libtiff\tif_color.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_color.c - -$(OBJS)\wxtiff_tif_compress.obj: ..\..\src\tiff\libtiff\tif_compress.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_compress.c - -$(OBJS)\wxtiff_tif_dir.obj: ..\..\src\tiff\libtiff\tif_dir.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_dir.c - -$(OBJS)\wxtiff_tif_dirinfo.obj: ..\..\src\tiff\libtiff\tif_dirinfo.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_dirinfo.c - -$(OBJS)\wxtiff_tif_dirread.obj: ..\..\src\tiff\libtiff\tif_dirread.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_dirread.c - -$(OBJS)\wxtiff_tif_dirwrite.obj: ..\..\src\tiff\libtiff\tif_dirwrite.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_dirwrite.c - -$(OBJS)\wxtiff_tif_dumpmode.obj: ..\..\src\tiff\libtiff\tif_dumpmode.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_dumpmode.c - -$(OBJS)\wxtiff_tif_error.obj: ..\..\src\tiff\libtiff\tif_error.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_error.c - -$(OBJS)\wxtiff_tif_extension.obj: ..\..\src\tiff\libtiff\tif_extension.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_extension.c - -$(OBJS)\wxtiff_tif_fax3.obj: ..\..\src\tiff\libtiff\tif_fax3.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_fax3.c - -$(OBJS)\wxtiff_tif_fax3sm.obj: ..\..\src\tiff\libtiff\tif_fax3sm.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_fax3sm.c - -$(OBJS)\wxtiff_tif_flush.obj: ..\..\src\tiff\libtiff\tif_flush.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_flush.c - -$(OBJS)\wxtiff_tif_getimage.obj: ..\..\src\tiff\libtiff\tif_getimage.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_getimage.c - -$(OBJS)\wxtiff_tif_jbig.obj: ..\..\src\tiff\libtiff\tif_jbig.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jbig.c - -$(OBJS)\wxtiff_tif_jpeg.obj: ..\..\src\tiff\libtiff\tif_jpeg.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jpeg.c - -$(OBJS)\wxtiff_tif_jpeg_12.obj: ..\..\src\tiff\libtiff\tif_jpeg_12.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jpeg_12.c - -$(OBJS)\wxtiff_tif_luv.obj: ..\..\src\tiff\libtiff\tif_luv.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_luv.c - -$(OBJS)\wxtiff_tif_lzma.obj: ..\..\src\tiff\libtiff\tif_lzma.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_lzma.c - -$(OBJS)\wxtiff_tif_lzw.obj: ..\..\src\tiff\libtiff\tif_lzw.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_lzw.c - -$(OBJS)\wxtiff_tif_next.obj: ..\..\src\tiff\libtiff\tif_next.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_next.c - -$(OBJS)\wxtiff_tif_ojpeg.obj: ..\..\src\tiff\libtiff\tif_ojpeg.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_ojpeg.c - -$(OBJS)\wxtiff_tif_open.obj: ..\..\src\tiff\libtiff\tif_open.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_open.c - -$(OBJS)\wxtiff_tif_packbits.obj: ..\..\src\tiff\libtiff\tif_packbits.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_packbits.c - -$(OBJS)\wxtiff_tif_pixarlog.obj: ..\..\src\tiff\libtiff\tif_pixarlog.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_pixarlog.c - -$(OBJS)\wxtiff_tif_predict.obj: ..\..\src\tiff\libtiff\tif_predict.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_predict.c - -$(OBJS)\wxtiff_tif_print.obj: ..\..\src\tiff\libtiff\tif_print.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_print.c - -$(OBJS)\wxtiff_tif_read.obj: ..\..\src\tiff\libtiff\tif_read.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_read.c - -$(OBJS)\wxtiff_tif_strip.obj: ..\..\src\tiff\libtiff\tif_strip.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_strip.c - -$(OBJS)\wxtiff_tif_swab.obj: ..\..\src\tiff\libtiff\tif_swab.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_swab.c - -$(OBJS)\wxtiff_tif_thunder.obj: ..\..\src\tiff\libtiff\tif_thunder.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_thunder.c - -$(OBJS)\wxtiff_tif_tile.obj: ..\..\src\tiff\libtiff\tif_tile.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_tile.c - -$(OBJS)\wxtiff_tif_version.obj: ..\..\src\tiff\libtiff\tif_version.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_version.c - -$(OBJS)\wxtiff_tif_warning.obj: ..\..\src\tiff\libtiff\tif_warning.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_warning.c - -$(OBJS)\wxtiff_tif_write.obj: ..\..\src\tiff\libtiff\tif_write.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_write.c - -$(OBJS)\wxtiff_tif_zip.obj: ..\..\src\tiff\libtiff\tif_zip.c - $(CC) -q -c -P- -o$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_zip.c - -$(OBJS)\wxexpat_xmlparse.obj: ..\..\src\expat\lib\xmlparse.c - $(CC) -q -c -P- -o$@ $(WXEXPAT_CFLAGS) ..\..\src\expat\lib\xmlparse.c - -$(OBJS)\wxexpat_xmlrole.obj: ..\..\src\expat\lib\xmlrole.c - $(CC) -q -c -P- -o$@ $(WXEXPAT_CFLAGS) ..\..\src\expat\lib\xmlrole.c - -$(OBJS)\wxexpat_xmltok.obj: ..\..\src\expat\lib\xmltok.c - $(CC) -q -c -P- -o$@ $(WXEXPAT_CFLAGS) ..\..\src\expat\lib\xmltok.c - -$(OBJS)\wxscintilla_LexA68k.obj: ..\..\src\stc\scintilla\lexers\LexA68k.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexA68k.cxx - -$(OBJS)\wxscintilla_LexAbaqus.obj: ..\..\src\stc\scintilla\lexers\LexAbaqus.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAbaqus.cxx - -$(OBJS)\wxscintilla_LexAda.obj: ..\..\src\stc\scintilla\lexers\LexAda.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAda.cxx - -$(OBJS)\wxscintilla_LexAPDL.obj: ..\..\src\stc\scintilla\lexers\LexAPDL.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAPDL.cxx - -$(OBJS)\wxscintilla_LexAsm.obj: ..\..\src\stc\scintilla\lexers\LexAsm.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAsm.cxx - -$(OBJS)\wxscintilla_LexAsn1.obj: ..\..\src\stc\scintilla\lexers\LexAsn1.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAsn1.cxx - -$(OBJS)\wxscintilla_LexASY.obj: ..\..\src\stc\scintilla\lexers\LexASY.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexASY.cxx - -$(OBJS)\wxscintilla_LexAU3.obj: ..\..\src\stc\scintilla\lexers\LexAU3.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAU3.cxx - -$(OBJS)\wxscintilla_LexAVE.obj: ..\..\src\stc\scintilla\lexers\LexAVE.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAVE.cxx - -$(OBJS)\wxscintilla_LexAVS.obj: ..\..\src\stc\scintilla\lexers\LexAVS.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAVS.cxx - -$(OBJS)\wxscintilla_LexBaan.obj: ..\..\src\stc\scintilla\lexers\LexBaan.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexBaan.cxx - -$(OBJS)\wxscintilla_LexBash.obj: ..\..\src\stc\scintilla\lexers\LexBash.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexBash.cxx - -$(OBJS)\wxscintilla_LexBasic.obj: ..\..\src\stc\scintilla\lexers\LexBasic.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexBasic.cxx - -$(OBJS)\wxscintilla_LexBullant.obj: ..\..\src\stc\scintilla\lexers\LexBullant.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexBullant.cxx - -$(OBJS)\wxscintilla_LexCaml.obj: ..\..\src\stc\scintilla\lexers\LexCaml.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCaml.cxx - -$(OBJS)\wxscintilla_LexCLW.obj: ..\..\src\stc\scintilla\lexers\LexCLW.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCLW.cxx - -$(OBJS)\wxscintilla_LexCmake.obj: ..\..\src\stc\scintilla\lexers\LexCmake.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCmake.cxx - -$(OBJS)\wxscintilla_LexCOBOL.obj: ..\..\src\stc\scintilla\lexers\LexCOBOL.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCOBOL.cxx - -$(OBJS)\wxscintilla_LexCoffeeScript.obj: ..\..\src\stc\scintilla\lexers\LexCoffeeScript.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCoffeeScript.cxx - -$(OBJS)\wxscintilla_LexConf.obj: ..\..\src\stc\scintilla\lexers\LexConf.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexConf.cxx - -$(OBJS)\wxscintilla_LexCPP.obj: ..\..\src\stc\scintilla\lexers\LexCPP.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCPP.cxx - -$(OBJS)\wxscintilla_LexCrontab.obj: ..\..\src\stc\scintilla\lexers\LexCrontab.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCrontab.cxx - -$(OBJS)\wxscintilla_LexCsound.obj: ..\..\src\stc\scintilla\lexers\LexCsound.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCsound.cxx - -$(OBJS)\wxscintilla_LexCSS.obj: ..\..\src\stc\scintilla\lexers\LexCSS.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCSS.cxx - -$(OBJS)\wxscintilla_LexD.obj: ..\..\src\stc\scintilla\lexers\LexD.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexD.cxx - -$(OBJS)\wxscintilla_LexECL.obj: ..\..\src\stc\scintilla\lexers\LexECL.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexECL.cxx - -$(OBJS)\wxscintilla_LexEiffel.obj: ..\..\src\stc\scintilla\lexers\LexEiffel.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexEiffel.cxx - -$(OBJS)\wxscintilla_LexErlang.obj: ..\..\src\stc\scintilla\lexers\LexErlang.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexErlang.cxx - -$(OBJS)\wxscintilla_LexEScript.obj: ..\..\src\stc\scintilla\lexers\LexEScript.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexEScript.cxx - -$(OBJS)\wxscintilla_LexFlagship.obj: ..\..\src\stc\scintilla\lexers\LexFlagship.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexFlagship.cxx - -$(OBJS)\wxscintilla_LexForth.obj: ..\..\src\stc\scintilla\lexers\LexForth.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexForth.cxx - -$(OBJS)\wxscintilla_LexFortran.obj: ..\..\src\stc\scintilla\lexers\LexFortran.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexFortran.cxx - -$(OBJS)\wxscintilla_LexGAP.obj: ..\..\src\stc\scintilla\lexers\LexGAP.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexGAP.cxx - -$(OBJS)\wxscintilla_LexGui4Cli.obj: ..\..\src\stc\scintilla\lexers\LexGui4Cli.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexGui4Cli.cxx - -$(OBJS)\wxscintilla_LexHaskell.obj: ..\..\src\stc\scintilla\lexers\LexHaskell.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexHaskell.cxx - -$(OBJS)\wxscintilla_LexHTML.obj: ..\..\src\stc\scintilla\lexers\LexHTML.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexHTML.cxx - -$(OBJS)\wxscintilla_LexInno.obj: ..\..\src\stc\scintilla\lexers\LexInno.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexInno.cxx - -$(OBJS)\wxscintilla_LexKix.obj: ..\..\src\stc\scintilla\lexers\LexKix.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexKix.cxx - -$(OBJS)\wxscintilla_LexLisp.obj: ..\..\src\stc\scintilla\lexers\LexLisp.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexLisp.cxx - -$(OBJS)\wxscintilla_LexLout.obj: ..\..\src\stc\scintilla\lexers\LexLout.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexLout.cxx - -$(OBJS)\wxscintilla_LexLua.obj: ..\..\src\stc\scintilla\lexers\LexLua.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexLua.cxx - -$(OBJS)\wxscintilla_LexMagik.obj: ..\..\src\stc\scintilla\lexers\LexMagik.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMagik.cxx - -$(OBJS)\wxscintilla_LexMarkdown.obj: ..\..\src\stc\scintilla\lexers\LexMarkdown.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMarkdown.cxx - -$(OBJS)\wxscintilla_LexMatlab.obj: ..\..\src\stc\scintilla\lexers\LexMatlab.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMatlab.cxx - -$(OBJS)\wxscintilla_LexMetapost.obj: ..\..\src\stc\scintilla\lexers\LexMetapost.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMetapost.cxx - -$(OBJS)\wxscintilla_LexMMIXAL.obj: ..\..\src\stc\scintilla\lexers\LexMMIXAL.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMMIXAL.cxx - -$(OBJS)\wxscintilla_LexModula.obj: ..\..\src\stc\scintilla\lexers\LexModula.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexModula.cxx - -$(OBJS)\wxscintilla_LexMPT.obj: ..\..\src\stc\scintilla\lexers\LexMPT.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMPT.cxx - -$(OBJS)\wxscintilla_LexMSSQL.obj: ..\..\src\stc\scintilla\lexers\LexMSSQL.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMSSQL.cxx - -$(OBJS)\wxscintilla_LexMySQL.obj: ..\..\src\stc\scintilla\lexers\LexMySQL.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMySQL.cxx - -$(OBJS)\wxscintilla_LexNimrod.obj: ..\..\src\stc\scintilla\lexers\LexNimrod.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexNimrod.cxx - -$(OBJS)\wxscintilla_LexNsis.obj: ..\..\src\stc\scintilla\lexers\LexNsis.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexNsis.cxx - -$(OBJS)\wxscintilla_LexOpal.obj: ..\..\src\stc\scintilla\lexers\LexOpal.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexOpal.cxx - -$(OBJS)\wxscintilla_LexOScript.obj: ..\..\src\stc\scintilla\lexers\LexOScript.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexOScript.cxx - -$(OBJS)\wxscintilla_LexOthers.obj: ..\..\src\stc\scintilla\lexers\LexOthers.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexOthers.cxx - -$(OBJS)\wxscintilla_LexPascal.obj: ..\..\src\stc\scintilla\lexers\LexPascal.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPascal.cxx - -$(OBJS)\wxscintilla_LexPB.obj: ..\..\src\stc\scintilla\lexers\LexPB.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPB.cxx - -$(OBJS)\wxscintilla_LexPerl.obj: ..\..\src\stc\scintilla\lexers\LexPerl.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPerl.cxx - -$(OBJS)\wxscintilla_LexPLM.obj: ..\..\src\stc\scintilla\lexers\LexPLM.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPLM.cxx - -$(OBJS)\wxscintilla_LexPOV.obj: ..\..\src\stc\scintilla\lexers\LexPOV.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPOV.cxx - -$(OBJS)\wxscintilla_LexPowerPro.obj: ..\..\src\stc\scintilla\lexers\LexPowerPro.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPowerPro.cxx - -$(OBJS)\wxscintilla_LexPowerShell.obj: ..\..\src\stc\scintilla\lexers\LexPowerShell.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPowerShell.cxx - -$(OBJS)\wxscintilla_LexProgress.obj: ..\..\src\stc\scintilla\lexers\LexProgress.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexProgress.cxx - -$(OBJS)\wxscintilla_LexPS.obj: ..\..\src\stc\scintilla\lexers\LexPS.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPS.cxx - -$(OBJS)\wxscintilla_LexPython.obj: ..\..\src\stc\scintilla\lexers\LexPython.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPython.cxx - -$(OBJS)\wxscintilla_LexR.obj: ..\..\src\stc\scintilla\lexers\LexR.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexR.cxx - -$(OBJS)\wxscintilla_LexRebol.obj: ..\..\src\stc\scintilla\lexers\LexRebol.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexRebol.cxx - -$(OBJS)\wxscintilla_LexRuby.obj: ..\..\src\stc\scintilla\lexers\LexRuby.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexRuby.cxx - -$(OBJS)\wxscintilla_LexScriptol.obj: ..\..\src\stc\scintilla\lexers\LexScriptol.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexScriptol.cxx - -$(OBJS)\wxscintilla_LexSmalltalk.obj: ..\..\src\stc\scintilla\lexers\LexSmalltalk.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSmalltalk.cxx - -$(OBJS)\wxscintilla_LexSML.obj: ..\..\src\stc\scintilla\lexers\LexSML.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSML.cxx - -$(OBJS)\wxscintilla_LexSorcus.obj: ..\..\src\stc\scintilla\lexers\LexSorcus.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSorcus.cxx - -$(OBJS)\wxscintilla_LexSpecman.obj: ..\..\src\stc\scintilla\lexers\LexSpecman.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSpecman.cxx - -$(OBJS)\wxscintilla_LexSpice.obj: ..\..\src\stc\scintilla\lexers\LexSpice.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSpice.cxx - -$(OBJS)\wxscintilla_LexSQL.obj: ..\..\src\stc\scintilla\lexers\LexSQL.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSQL.cxx - -$(OBJS)\wxscintilla_LexTACL.obj: ..\..\src\stc\scintilla\lexers\LexTACL.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTACL.cxx - -$(OBJS)\wxscintilla_LexTADS3.obj: ..\..\src\stc\scintilla\lexers\LexTADS3.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTADS3.cxx - -$(OBJS)\wxscintilla_LexTAL.obj: ..\..\src\stc\scintilla\lexers\LexTAL.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTAL.cxx - -$(OBJS)\wxscintilla_LexTCL.obj: ..\..\src\stc\scintilla\lexers\LexTCL.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTCL.cxx - -$(OBJS)\wxscintilla_LexTCMD.obj: ..\..\src\stc\scintilla\lexers\LexTCMD.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTCMD.cxx - -$(OBJS)\wxscintilla_LexTeX.obj: ..\..\src\stc\scintilla\lexers\LexTeX.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTeX.cxx - -$(OBJS)\wxscintilla_LexTxt2tags.obj: ..\..\src\stc\scintilla\lexers\LexTxt2tags.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTxt2tags.cxx - -$(OBJS)\wxscintilla_LexVB.obj: ..\..\src\stc\scintilla\lexers\LexVB.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexVB.cxx - -$(OBJS)\wxscintilla_LexVerilog.obj: ..\..\src\stc\scintilla\lexers\LexVerilog.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexVerilog.cxx - -$(OBJS)\wxscintilla_LexVHDL.obj: ..\..\src\stc\scintilla\lexers\LexVHDL.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexVHDL.cxx - -$(OBJS)\wxscintilla_LexVisualProlog.obj: ..\..\src\stc\scintilla\lexers\LexVisualProlog.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexVisualProlog.cxx - -$(OBJS)\wxscintilla_LexYAML.obj: ..\..\src\stc\scintilla\lexers\LexYAML.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexYAML.cxx - -$(OBJS)\wxscintilla_Accessor.obj: ..\..\src\stc\scintilla\lexlib\Accessor.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\Accessor.cxx - -$(OBJS)\wxscintilla_CharacterSet.obj: ..\..\src\stc\scintilla\lexlib\CharacterSet.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\CharacterSet.cxx - -$(OBJS)\wxscintilla_LexerBase.obj: ..\..\src\stc\scintilla\lexlib\LexerBase.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\LexerBase.cxx - -$(OBJS)\wxscintilla_LexerModule.obj: ..\..\src\stc\scintilla\lexlib\LexerModule.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\LexerModule.cxx - -$(OBJS)\wxscintilla_LexerNoExceptions.obj: ..\..\src\stc\scintilla\lexlib\LexerNoExceptions.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\LexerNoExceptions.cxx - -$(OBJS)\wxscintilla_LexerSimple.obj: ..\..\src\stc\scintilla\lexlib\LexerSimple.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\LexerSimple.cxx - -$(OBJS)\wxscintilla_PropSetSimple.obj: ..\..\src\stc\scintilla\lexlib\PropSetSimple.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\PropSetSimple.cxx - -$(OBJS)\wxscintilla_StyleContext.obj: ..\..\src\stc\scintilla\lexlib\StyleContext.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\StyleContext.cxx - -$(OBJS)\wxscintilla_WordList.obj: ..\..\src\stc\scintilla\lexlib\WordList.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\WordList.cxx - -$(OBJS)\wxscintilla_AutoComplete.obj: ..\..\src\stc\scintilla\src\AutoComplete.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\AutoComplete.cxx - -$(OBJS)\wxscintilla_CallTip.obj: ..\..\src\stc\scintilla\src\CallTip.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\CallTip.cxx - -$(OBJS)\wxscintilla_Catalogue.obj: ..\..\src\stc\scintilla\src\Catalogue.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Catalogue.cxx - -$(OBJS)\wxscintilla_CellBuffer.obj: ..\..\src\stc\scintilla\src\CellBuffer.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\CellBuffer.cxx - -$(OBJS)\wxscintilla_CharClassify.obj: ..\..\src\stc\scintilla\src\CharClassify.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\CharClassify.cxx - -$(OBJS)\wxscintilla_ContractionState.obj: ..\..\src\stc\scintilla\src\ContractionState.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ContractionState.cxx - -$(OBJS)\wxscintilla_Decoration.obj: ..\..\src\stc\scintilla\src\Decoration.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Decoration.cxx - -$(OBJS)\wxscintilla_Document.obj: ..\..\src\stc\scintilla\src\Document.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Document.cxx - -$(OBJS)\wxscintilla_Editor.obj: ..\..\src\stc\scintilla\src\Editor.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Editor.cxx - -$(OBJS)\wxscintilla_ExternalLexer.obj: ..\..\src\stc\scintilla\src\ExternalLexer.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ExternalLexer.cxx - -$(OBJS)\wxscintilla_Indicator.obj: ..\..\src\stc\scintilla\src\Indicator.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Indicator.cxx - -$(OBJS)\wxscintilla_KeyMap.obj: ..\..\src\stc\scintilla\src\KeyMap.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\KeyMap.cxx - -$(OBJS)\wxscintilla_LineMarker.obj: ..\..\src\stc\scintilla\src\LineMarker.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LineMarker.cxx - -$(OBJS)\wxscintilla_PerLine.obj: ..\..\src\stc\scintilla\src\PerLine.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\PerLine.cxx - -$(OBJS)\wxscintilla_PositionCache.obj: ..\..\src\stc\scintilla\src\PositionCache.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\PositionCache.cxx - -$(OBJS)\wxscintilla_RESearch.obj: ..\..\src\stc\scintilla\src\RESearch.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\RESearch.cxx - -$(OBJS)\wxscintilla_RunStyles.obj: ..\..\src\stc\scintilla\src\RunStyles.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\RunStyles.cxx - -$(OBJS)\wxscintilla_ScintillaBase.obj: ..\..\src\stc\scintilla\src\ScintillaBase.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ScintillaBase.cxx - -$(OBJS)\wxscintilla_Selection.obj: ..\..\src\stc\scintilla\src\Selection.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Selection.cxx - -$(OBJS)\wxscintilla_Style.obj: ..\..\src\stc\scintilla\src\Style.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Style.cxx - -$(OBJS)\wxscintilla_UniConversion.obj: ..\..\src\stc\scintilla\src\UniConversion.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\UniConversion.cxx - -$(OBJS)\wxscintilla_ViewStyle.obj: ..\..\src\stc\scintilla\src\ViewStyle.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ViewStyle.cxx - -$(OBJS)\wxscintilla_XPM.obj: ..\..\src\stc\scintilla\src\XPM.cxx - $(CXX) -q -c -P -o$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\XPM.cxx - -$(OBJS)\monodll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\monodll_any.obj: ..\..\src\common\any.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\any.cpp - -$(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appbase.cpp - -$(OBJS)\monodll_arcall.obj: ..\..\src\common\arcall.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arcall.cpp - -$(OBJS)\monodll_arcfind.obj: ..\..\src\common\arcfind.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arcfind.cpp - -$(OBJS)\monodll_archive.obj: ..\..\src\common\archive.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\archive.cpp - -$(OBJS)\monodll_arrstr.obj: ..\..\src\common\arrstr.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arrstr.cpp - -$(OBJS)\monodll_base64.obj: ..\..\src\common\base64.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\base64.cpp - -$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clntdata.cpp - -$(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cmdline.cpp - -$(OBJS)\monodll_config.obj: ..\..\src\common\config.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\config.cpp - -$(OBJS)\monodll_convauto.obj: ..\..\src\common\convauto.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\convauto.cpp - -$(OBJS)\monodll_datetime.obj: ..\..\src\common\datetime.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datetime.cpp - -$(OBJS)\monodll_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datetimefmt.cpp - -$(OBJS)\monodll_datstrm.obj: ..\..\src\common\datstrm.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datstrm.cpp - -$(OBJS)\monodll_dircmn.obj: ..\..\src\common\dircmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dircmn.cpp - -$(OBJS)\monodll_dynarray.obj: ..\..\src\common\dynarray.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dynarray.cpp - -$(OBJS)\monodll_dynlib.obj: ..\..\src\common\dynlib.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dynlib.cpp - -$(OBJS)\monodll_dynload.obj: ..\..\src\common\dynload.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dynload.cpp - -$(OBJS)\monodll_encconv.obj: ..\..\src\common\encconv.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\encconv.cpp - -$(OBJS)\monodll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp - -$(OBJS)\monodll_extended.obj: ..\..\src\common\extended.c - $(CC) -q -c -P- -o$@ $(MONODLL_CFLAGS) ..\..\src\common\extended.c - -$(OBJS)\monodll_ffile.obj: ..\..\src\common\ffile.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ffile.cpp - -$(OBJS)\monodll_file.obj: ..\..\src\common\file.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\file.cpp - -$(OBJS)\monodll_fileback.obj: ..\..\src\common\fileback.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fileback.cpp - -$(OBJS)\monodll_fileconf.obj: ..\..\src\common\fileconf.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fileconf.cpp - -$(OBJS)\monodll_filefn.obj: ..\..\src\common\filefn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filefn.cpp - -$(OBJS)\monodll_filename.obj: ..\..\src\common\filename.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filename.cpp - -$(OBJS)\monodll_filesys.obj: ..\..\src\common\filesys.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filesys.cpp - -$(OBJS)\monodll_filtall.obj: ..\..\src\common\filtall.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filtall.cpp - -$(OBJS)\monodll_filtfind.obj: ..\..\src\common\filtfind.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filtfind.cpp - -$(OBJS)\monodll_fmapbase.obj: ..\..\src\common\fmapbase.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fmapbase.cpp - -$(OBJS)\monodll_fs_arc.obj: ..\..\src\common\fs_arc.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fs_arc.cpp - -$(OBJS)\monodll_fs_filter.obj: ..\..\src\common\fs_filter.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fs_filter.cpp - -$(OBJS)\monodll_hash.obj: ..\..\src\common\hash.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hash.cpp - -$(OBJS)\monodll_hashmap.obj: ..\..\src\common\hashmap.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hashmap.cpp - -$(OBJS)\monodll_init.obj: ..\..\src\common\init.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\init.cpp - -$(OBJS)\monodll_intl.obj: ..\..\src\common\intl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\intl.cpp - -$(OBJS)\monodll_ipcbase.obj: ..\..\src\common\ipcbase.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ipcbase.cpp - -$(OBJS)\monodll_languageinfo.obj: ..\..\src\common\languageinfo.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\languageinfo.cpp - -$(OBJS)\monodll_list.obj: ..\..\src\common\list.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\list.cpp - -$(OBJS)\monodll_log.obj: ..\..\src\common\log.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\log.cpp - -$(OBJS)\monodll_longlong.obj: ..\..\src\common\longlong.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\longlong.cpp - -$(OBJS)\monodll_memory.obj: ..\..\src\common\memory.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\memory.cpp - -$(OBJS)\monodll_mimecmn.obj: ..\..\src\common\mimecmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mimecmn.cpp - -$(OBJS)\monodll_module.obj: ..\..\src\common\module.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\module.cpp - -$(OBJS)\monodll_mstream.obj: ..\..\src\common\mstream.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mstream.cpp - -$(OBJS)\monodll_numformatter.obj: ..\..\src\common\numformatter.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\numformatter.cpp - -$(OBJS)\monodll_object.obj: ..\..\src\common\object.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\object.cpp - -$(OBJS)\monodll_platinfo.obj: ..\..\src\common\platinfo.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\platinfo.cpp - -$(OBJS)\monodll_powercmn.obj: ..\..\src\common\powercmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\powercmn.cpp - -$(OBJS)\monodll_process.obj: ..\..\src\common\process.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\process.cpp - -$(OBJS)\monodll_regex.obj: ..\..\src\common\regex.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\regex.cpp - -$(OBJS)\monodll_stdpbase.obj: ..\..\src\common\stdpbase.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stdpbase.cpp - -$(OBJS)\monodll_sstream.obj: ..\..\src\common\sstream.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sstream.cpp - -$(OBJS)\monodll_stdstream.obj: ..\..\src\common\stdstream.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stdstream.cpp - -$(OBJS)\monodll_stopwatch.obj: ..\..\src\common\stopwatch.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp - -$(OBJS)\monodll_strconv.obj: ..\..\src\common\strconv.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\strconv.cpp - -$(OBJS)\monodll_stream.obj: ..\..\src\common\stream.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stream.cpp - -$(OBJS)\monodll_string.obj: ..\..\src\common\string.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\string.cpp - -$(OBJS)\monodll_stringimpl.obj: ..\..\src\common\stringimpl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stringimpl.cpp - -$(OBJS)\monodll_stringops.obj: ..\..\src\common\stringops.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stringops.cpp - -$(OBJS)\monodll_strvararg.obj: ..\..\src\common\strvararg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\strvararg.cpp - -$(OBJS)\monodll_sysopt.obj: ..\..\src\common\sysopt.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sysopt.cpp - -$(OBJS)\monodll_tarstrm.obj: ..\..\src\common\tarstrm.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\tarstrm.cpp - -$(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textbuf.cpp - -$(OBJS)\monodll_textfile.obj: ..\..\src\common\textfile.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textfile.cpp - -$(OBJS)\monodll_threadinfo.obj: ..\..\src\common\threadinfo.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\threadinfo.cpp - -$(OBJS)\monodll_time.obj: ..\..\src\common\time.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\time.cpp - -$(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timercmn.cpp - -$(OBJS)\monodll_timerimpl.obj: ..\..\src\common\timerimpl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timerimpl.cpp - -$(OBJS)\monodll_tokenzr.obj: ..\..\src\common\tokenzr.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\tokenzr.cpp - -$(OBJS)\monodll_translation.obj: ..\..\src\common\translation.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\translation.cpp - -$(OBJS)\monodll_txtstrm.obj: ..\..\src\common\txtstrm.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\txtstrm.cpp - -$(OBJS)\monodll_unichar.obj: ..\..\src\common\unichar.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\unichar.cpp - -$(OBJS)\monodll_uri.obj: ..\..\src\common\uri.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\uri.cpp - -$(OBJS)\monodll_ustring.obj: ..\..\src\common\ustring.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ustring.cpp - -$(OBJS)\monodll_variant.obj: ..\..\src\common\variant.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\variant.cpp - -$(OBJS)\monodll_wfstream.obj: ..\..\src\common\wfstream.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wfstream.cpp - -$(OBJS)\monodll_wxcrt.obj: ..\..\src\common\wxcrt.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wxcrt.cpp - -$(OBJS)\monodll_wxprintf.obj: ..\..\src\common\wxprintf.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wxprintf.cpp - -$(OBJS)\monodll_xlocale.obj: ..\..\src\common\xlocale.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xlocale.cpp - -$(OBJS)\monodll_xti.obj: ..\..\src\common\xti.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xti.cpp - -$(OBJS)\monodll_xtistrm.obj: ..\..\src\common\xtistrm.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xtistrm.cpp - -$(OBJS)\monodll_zipstrm.obj: ..\..\src\common\zipstrm.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\zipstrm.cpp - -$(OBJS)\monodll_zstream.obj: ..\..\src\common\zstream.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\zstream.cpp - -$(OBJS)\monodll_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp - -$(OBJS)\monodll_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp - -$(OBJS)\monodll_basemsw.obj: ..\..\src\msw\basemsw.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp - -$(OBJS)\monodll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\crashrpt.cpp - -$(OBJS)\monodll_debughlp.obj: ..\..\src\msw\debughlp.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\debughlp.cpp - -$(OBJS)\monodll_dde.obj: ..\..\src\msw\dde.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dde.cpp - -$(OBJS)\monodll_dir.obj: ..\..\src\msw\dir.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dir.cpp - -$(OBJS)\monodll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dlmsw.cpp - -$(OBJS)\monodll_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp - -$(OBJS)\monodll_mimetype.obj: ..\..\src\msw\mimetype.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mimetype.cpp - -$(OBJS)\monodll_power.obj: ..\..\src\msw\power.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\power.cpp - -$(OBJS)\monodll_regconf.obj: ..\..\src\msw\regconf.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\regconf.cpp - -$(OBJS)\monodll_registry.obj: ..\..\src\msw\registry.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\registry.cpp - -$(OBJS)\monodll_snglinst.obj: ..\..\src\msw\snglinst.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\snglinst.cpp - -$(OBJS)\monodll_stackwalk.obj: ..\..\src\msw\stackwalk.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stackwalk.cpp - -$(OBJS)\monodll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stdpaths.cpp - -$(OBJS)\monodll_thread.obj: ..\..\src\msw\thread.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\thread.cpp - -$(OBJS)\monodll_timer.obj: ..\..\src\msw\timer.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timer.cpp - -$(OBJS)\monodll_utils.obj: ..\..\src\msw\utils.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utils.cpp - -$(OBJS)\monodll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsexc.cpp - -$(OBJS)\monodll_fswatcher.obj: ..\..\src\msw\fswatcher.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fswatcher.cpp - -$(OBJS)\monodll_event.obj: ..\..\src\common\event.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\event.cpp - -$(OBJS)\monodll_fs_mem.obj: ..\..\src\common\fs_mem.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fs_mem.cpp - -$(OBJS)\monodll_msgout.obj: ..\..\src\common\msgout.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\msgout.cpp - -$(OBJS)\monodll_utilscmn.obj: ..\..\src\common\utilscmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp - -$(OBJS)\monodll_main.obj: ..\..\src\msw\main.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\main.cpp - -$(OBJS)\monodll_mslu.obj: ..\..\src\msw\mslu.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mslu.cpp - -$(OBJS)\monodll_volume.obj: ..\..\src\msw\volume.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\volume.cpp - -$(OBJS)\monodll_fs_inet.obj: ..\..\src\common\fs_inet.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp - -$(OBJS)\monodll_ftp.obj: ..\..\src\common\ftp.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ftp.cpp - -$(OBJS)\monodll_http.obj: ..\..\src\common\http.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\http.cpp - -$(OBJS)\monodll_protocol.obj: ..\..\src\common\protocol.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\protocol.cpp - -$(OBJS)\monodll_sckaddr.obj: ..\..\src\common\sckaddr.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sckaddr.cpp - -$(OBJS)\monodll_sckfile.obj: ..\..\src\common\sckfile.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sckfile.cpp - -$(OBJS)\monodll_sckipc.obj: ..\..\src\common\sckipc.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sckipc.cpp - -$(OBJS)\monodll_sckstrm.obj: ..\..\src\common\sckstrm.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sckstrm.cpp - -$(OBJS)\monodll_socket.obj: ..\..\src\common\socket.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\socket.cpp - -$(OBJS)\monodll_url.obj: ..\..\src\common\url.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\url.cpp - -$(OBJS)\monodll_sockmsw.obj: ..\..\src\msw\sockmsw.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sockmsw.cpp - -$(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\urlmsw.cpp - -$(OBJS)\monodll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp - -$(OBJS)\monodll_msw_accel.obj: ..\..\src\msw\accel.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\accel.cpp - -$(OBJS)\monodll_anybutton.obj: ..\..\src\msw\anybutton.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp - -$(OBJS)\monodll_artmsw.obj: ..\..\src\msw\artmsw.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp - -$(OBJS)\monodll_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp - -$(OBJS)\monodll_msw_button.obj: ..\..\src\msw\button.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\button.cpp - -$(OBJS)\monodll_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp - -$(OBJS)\monodll_msw_choice.obj: ..\..\src\msw\choice.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\choice.cpp - -$(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp - -$(OBJS)\monodll_combo.obj: ..\..\src\msw\combo.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combo.cpp - -$(OBJS)\monodll_msw_combobox.obj: ..\..\src\msw\combobox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combobox.cpp - -$(OBJS)\monodll_msw_control.obj: ..\..\src\msw\control.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\control.cpp - -$(OBJS)\monodll_msw_dialog.obj: ..\..\src\msw\dialog.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialog.cpp - -$(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp - -$(OBJS)\monodll_dragimag.obj: ..\..\src\msw\dragimag.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp - -$(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\filedlg.cpp - -$(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\frame.cpp - -$(OBJS)\monodll_msw_gauge.obj: ..\..\src\msw\gauge.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge.cpp - -$(OBJS)\monodll_headerctrl.obj: ..\..\src\msw\headerctrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\headerctrl.cpp - -$(OBJS)\monodll_iniconf.obj: ..\..\src\msw\iniconf.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp - -$(OBJS)\monodll_msw_listbox.obj: ..\..\src\msw\listbox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listbox.cpp - -$(OBJS)\monodll_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp - -$(OBJS)\monodll_mdi.obj: ..\..\src\msw\mdi.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mdi.cpp - -$(OBJS)\monodll_msw_menu.obj: ..\..\src\msw\menu.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menu.cpp - -$(OBJS)\monodll_menuitem.obj: ..\..\src\msw\menuitem.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp - -$(OBJS)\monodll_metafile.obj: ..\..\src\msw\metafile.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\metafile.cpp - -$(OBJS)\monodll_msgdlg.obj: ..\..\src\msw\msgdlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\msgdlg.cpp - -$(OBJS)\monodll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativdlg.cpp - -$(OBJS)\monodll_nativewin.obj: ..\..\src\msw\nativewin.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp - -$(OBJS)\monodll_msw_notebook.obj: ..\..\src\msw\notebook.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notebook.cpp - -$(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp - -$(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp - -$(OBJS)\monodll_msw_panel.obj: ..\..\src\msw\panel.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\panel.cpp - -$(OBJS)\monodll_progdlg.obj: ..\..\src\msw\progdlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp - -$(OBJS)\monodll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp - -$(OBJS)\monodll_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp - -$(OBJS)\monodll_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp - -$(OBJS)\monodll_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp - -$(OBJS)\monodll_msw_slider.obj: ..\..\src\msw\slider.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider.cpp - -$(OBJS)\monodll_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp - -$(OBJS)\monodll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp - -$(OBJS)\monodll_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp - -$(OBJS)\monodll_msw_statbox.obj: ..\..\src\msw\statbox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbox.cpp - -$(OBJS)\monodll_statusbar.obj: ..\..\src\msw\statusbar.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp - -$(OBJS)\monodll_msw_statline.obj: ..\..\src\msw\statline.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statline.cpp - -$(OBJS)\monodll_msw_stattext.obj: ..\..\src\msw\stattext.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stattext.cpp - -$(OBJS)\monodll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp - -$(OBJS)\monodll_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp - -$(OBJS)\monodll_textentry.obj: ..\..\src\msw\textentry.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textentry.cpp - -$(OBJS)\monodll_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp - -$(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp - -$(OBJS)\monodll_msw_checklst.obj: ..\..\src\msw\checklst.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checklst.cpp - -$(OBJS)\monodll_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp - -$(OBJS)\monodll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp - -$(OBJS)\monodll_generic_accel.obj: ..\..\src\generic\accel.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\accel.cpp - -$(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp - -$(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp - -$(OBJS)\monodll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp - -$(OBJS)\monodll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp - -$(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp - -$(OBJS)\monodll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp - -$(OBJS)\monodll_mdig.obj: ..\..\src\generic\mdig.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\mdig.cpp - -$(OBJS)\monodll_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp - -$(OBJS)\monodll_univ_button.obj: ..\..\src\univ\button.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\button.cpp - -$(OBJS)\monodll_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp - -$(OBJS)\monodll_univ_checklst.obj: ..\..\src\univ\checklst.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checklst.cpp - -$(OBJS)\monodll_univ_choice.obj: ..\..\src\univ\choice.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\choice.cpp - -$(OBJS)\monodll_univ_combobox.obj: ..\..\src\univ\combobox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\combobox.cpp - -$(OBJS)\monodll_univ_control.obj: ..\..\src\univ\control.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\control.cpp - -$(OBJS)\monodll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp - -$(OBJS)\monodll_univ_dialog.obj: ..\..\src\univ\dialog.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\dialog.cpp - -$(OBJS)\monodll_framuniv.obj: ..\..\src\univ\framuniv.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp - -$(OBJS)\monodll_univ_gauge.obj: ..\..\src\univ\gauge.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp - -$(OBJS)\monodll_inpcons.obj: ..\..\src\univ\inpcons.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp - -$(OBJS)\monodll_inphand.obj: ..\..\src\univ\inphand.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inphand.cpp - -$(OBJS)\monodll_univ_listbox.obj: ..\..\src\univ\listbox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\listbox.cpp - -$(OBJS)\monodll_univ_menu.obj: ..\..\src\univ\menu.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\menu.cpp - -$(OBJS)\monodll_univ_notebook.obj: ..\..\src\univ\notebook.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\notebook.cpp - -$(OBJS)\monodll_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp - -$(OBJS)\monodll_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp - -$(OBJS)\monodll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp - -$(OBJS)\monodll_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp - -$(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp - -$(OBJS)\monodll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp - -$(OBJS)\monodll_univ_slider.obj: ..\..\src\univ\slider.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp - -$(OBJS)\monodll_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp - -$(OBJS)\monodll_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp - -$(OBJS)\monodll_univ_statbox.obj: ..\..\src\univ\statbox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbox.cpp - -$(OBJS)\monodll_univ_statline.obj: ..\..\src\univ\statline.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statline.cpp - -$(OBJS)\monodll_univ_stattext.obj: ..\..\src\univ\stattext.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stattext.cpp - -$(OBJS)\monodll_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp - -$(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp - -$(OBJS)\monodll_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp - -$(OBJS)\monodll_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp - -$(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\theme.cpp - -$(OBJS)\monodll_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp - -$(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp - -$(OBJS)\monodll_winuniv.obj: ..\..\src\univ\winuniv.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\winuniv.cpp - -$(OBJS)\monodll_gtk.obj: ..\..\src\univ\themes\gtk.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp - -$(OBJS)\monodll_metal.obj: ..\..\src\univ\themes\metal.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\metal.cpp - -$(OBJS)\monodll_mono.obj: ..\..\src\univ\themes\mono.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\mono.cpp - -$(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp - -$(OBJS)\monodll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp - -$(OBJS)\monodll_calctrl.obj: ..\..\src\msw\calctrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp - -$(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp - -$(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp - -$(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp - -$(OBJS)\monodll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp - -$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp - -$(OBJS)\monodll_timectrl.obj: ..\..\src\msw\timectrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp - -$(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp - -$(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp - -$(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp - -$(OBJS)\monodll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp - -$(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp - -$(OBJS)\monodll_helpctrl.obj: ..\..\src\html\helpctrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpctrl.cpp - -$(OBJS)\monodll_helpdata.obj: ..\..\src\html\helpdata.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpdata.cpp - -$(OBJS)\monodll_helpdlg.obj: ..\..\src\html\helpdlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpdlg.cpp - -$(OBJS)\monodll_helpfrm.obj: ..\..\src\html\helpfrm.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpfrm.cpp - -$(OBJS)\monodll_helpwnd.obj: ..\..\src\html\helpwnd.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpwnd.cpp - -$(OBJS)\monodll_htmlcell.obj: ..\..\src\html\htmlcell.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlcell.cpp - -$(OBJS)\monodll_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlfilt.cpp - -$(OBJS)\monodll_htmlpars.obj: ..\..\src\html\htmlpars.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlpars.cpp - -$(OBJS)\monodll_htmltag.obj: ..\..\src\html\htmltag.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmltag.cpp - -$(OBJS)\monodll_htmlwin.obj: ..\..\src\html\htmlwin.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlwin.cpp - -$(OBJS)\monodll_htmprint.obj: ..\..\src\html\htmprint.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmprint.cpp - -$(OBJS)\monodll_m_dflist.obj: ..\..\src\html\m_dflist.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_dflist.cpp - -$(OBJS)\monodll_m_fonts.obj: ..\..\src\html\m_fonts.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_fonts.cpp - -$(OBJS)\monodll_m_hline.obj: ..\..\src\html\m_hline.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_hline.cpp - -$(OBJS)\monodll_m_image.obj: ..\..\src\html\m_image.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_image.cpp - -$(OBJS)\monodll_m_layout.obj: ..\..\src\html\m_layout.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_layout.cpp - -$(OBJS)\monodll_m_links.obj: ..\..\src\html\m_links.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_links.cpp - -$(OBJS)\monodll_m_list.obj: ..\..\src\html\m_list.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_list.cpp - -$(OBJS)\monodll_m_pre.obj: ..\..\src\html\m_pre.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_pre.cpp - -$(OBJS)\monodll_m_span.obj: ..\..\src\html\m_span.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_span.cpp - -$(OBJS)\monodll_m_style.obj: ..\..\src\html\m_style.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_style.cpp - -$(OBJS)\monodll_m_tables.obj: ..\..\src\html\m_tables.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_tables.cpp - -$(OBJS)\monodll_styleparams.obj: ..\..\src\html\styleparams.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\styleparams.cpp - -$(OBJS)\monodll_winpars.obj: ..\..\src\html\winpars.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\html\winpars.cpp - -$(OBJS)\monodll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\htmllbox.cpp - -$(OBJS)\monodll_webview_ie.obj: ..\..\src\msw\webview_ie.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\webview_ie.cpp - -$(OBJS)\monodll_webview.obj: ..\..\src\common\webview.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webview.cpp - -$(OBJS)\monodll_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp - -$(OBJS)\monodll_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp - -$(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp - -$(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp - -$(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp - -$(OBJS)\monodll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp - -$(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp - -$(OBJS)\monodll_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp - -$(OBJS)\monodll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp - -$(OBJS)\monodll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp - -$(OBJS)\monodll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp - -$(OBJS)\monodll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp - -$(OBJS)\monodll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp - -$(OBJS)\monodll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp - -$(OBJS)\monodll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp - -$(OBJS)\monodll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp - -$(OBJS)\monodll_xh_cmdlinkbn.obj: ..\..\src\xrc\xh_cmdlinkbn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_cmdlinkbn.cpp - -$(OBJS)\monodll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp - -$(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp - -$(OBJS)\monodll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp - -$(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp - -$(OBJS)\monodll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp - -$(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp - -$(OBJS)\monodll_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp - -$(OBJS)\monodll_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp - -$(OBJS)\monodll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp - -$(OBJS)\monodll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp - -$(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp - -$(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp - -$(OBJS)\monodll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp - -$(OBJS)\monodll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp - -$(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_html.cpp - -$(OBJS)\monodll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp - -$(OBJS)\monodll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp - -$(OBJS)\monodll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp - -$(OBJS)\monodll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp - -$(OBJS)\monodll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp - -$(OBJS)\monodll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp - -$(OBJS)\monodll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp - -$(OBJS)\monodll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp - -$(OBJS)\monodll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp - -$(OBJS)\monodll_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp - -$(OBJS)\monodll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp - -$(OBJS)\monodll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp - -$(OBJS)\monodll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp - -$(OBJS)\monodll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp - -$(OBJS)\monodll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp - -$(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp - -$(OBJS)\monodll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp - -$(OBJS)\monodll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp - -$(OBJS)\monodll_xh_split.obj: ..\..\src\xrc\xh_split.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_split.cpp - -$(OBJS)\monodll_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp - -$(OBJS)\monodll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp - -$(OBJS)\monodll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp - -$(OBJS)\monodll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp - -$(OBJS)\monodll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp - -$(OBJS)\monodll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp - -$(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp - -$(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp - -$(OBJS)\monodll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp - -$(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp - -$(OBJS)\monodll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp - -$(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp - -$(OBJS)\monodll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp - -$(OBJS)\monodll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp - -$(OBJS)\monodll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp - -$(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp - -$(OBJS)\monodll_xmladv.obj: ..\..\src\xrc\xmladv.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmladv.cpp - -$(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp - -$(OBJS)\monodll_framemanager.obj: ..\..\src\aui\framemanager.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp - -$(OBJS)\monodll_dockart.obj: ..\..\src\aui\dockart.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\dockart.cpp - -$(OBJS)\monodll_floatpane.obj: ..\..\src\aui\floatpane.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\floatpane.cpp - -$(OBJS)\monodll_auibook.obj: ..\..\src\aui\auibook.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\auibook.cpp - -$(OBJS)\monodll_auibar.obj: ..\..\src\aui\auibar.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\auibar.cpp - -$(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp - -$(OBJS)\monodll_tabart.obj: ..\..\src\aui\tabart.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabart.cpp - -$(OBJS)\monodll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp - -$(OBJS)\monodll_advprops.obj: ..\..\src\propgrid\advprops.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp - -$(OBJS)\monodll_editors.obj: ..\..\src\propgrid\editors.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\editors.cpp - -$(OBJS)\monodll_manager.obj: ..\..\src\propgrid\manager.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\manager.cpp - -$(OBJS)\monodll_property.obj: ..\..\src\propgrid\property.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\property.cpp - -$(OBJS)\monodll_propgrid.obj: ..\..\src\propgrid\propgrid.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp - -$(OBJS)\monodll_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp - -$(OBJS)\monodll_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp - -$(OBJS)\monodll_props.obj: ..\..\src\propgrid\props.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\props.cpp - -$(OBJS)\monodll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp - -$(OBJS)\monodll_art_msw.obj: ..\..\src\ribbon\art_msw.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp - -$(OBJS)\monodll_art_aui.obj: ..\..\src\ribbon\art_aui.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp - -$(OBJS)\monodll_bar.obj: ..\..\src\ribbon\bar.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\bar.cpp - -$(OBJS)\monodll_ribbon_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp - -$(OBJS)\monodll_ribbon_control.obj: ..\..\src\ribbon\control.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\control.cpp - -$(OBJS)\monodll_gallery.obj: ..\..\src\ribbon\gallery.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\gallery.cpp - -$(OBJS)\monodll_page.obj: ..\..\src\ribbon\page.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\page.cpp - -$(OBJS)\monodll_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp - -$(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp - -$(OBJS)\monodll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp - -$(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp - -$(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp - -$(OBJS)\monodll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp - -$(OBJS)\monodll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp - -$(OBJS)\monodll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp - -$(OBJS)\monodll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp - -$(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp - -$(OBJS)\monodll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp - -$(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp - -$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp - -$(OBJS)\monodll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp - -$(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp - -$(OBJS)\monodll_PlatWX.obj: ..\..\src\stc\PlatWX.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\PlatWX.cpp - -$(OBJS)\monodll_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp - -$(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xml\xml.cpp - -$(OBJS)\monodll_xtixml.obj: ..\..\src\common\xtixml.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xtixml.cpp - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_app.obj: ..\..\src\msw\app.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\app.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bitmap.obj: ..\..\src\msw\bitmap.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bitmap.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_brush.obj: ..\..\src\msw\brush.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\brush.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_caret.obj: ..\..\src\msw\caret.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\caret.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_clipbrd.obj: ..\..\src\msw\clipbrd.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\clipbrd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_colour.obj: ..\..\src\msw\colour.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\colour.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_cursor.obj: ..\..\src\msw\cursor.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\cursor.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_data.obj: ..\..\src\msw\data.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\data.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dc.obj: ..\..\src\msw\dc.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcclient.obj: ..\..\src\msw\dcclient.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcclient.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcmemory.obj: ..\..\src\msw\dcmemory.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcmemory.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcprint.obj: ..\..\src\msw\dcprint.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcprint.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcscreen.obj: ..\..\src\msw\dcscreen.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcscreen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dialup.obj: ..\..\src\msw\dialup.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialup.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dib.obj: ..\..\src\msw\dib.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dib.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_display.obj: ..\..\src\msw\display.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\display.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\enhmeta.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_font.obj: ..\..\src\msw\font.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\font.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontenum.obj: ..\..\src\msw\fontenum.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontenum.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontutil.obj: ..\..\src\msw\fontutil.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontutil.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiimage.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiobj.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiplus.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_graphics.obj: ..\..\src\msw\graphics.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\graphics.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_icon.obj: ..\..\src\msw\icon.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\icon.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imaglist.obj: ..\..\src\msw\imaglist.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\minifram.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_safearray.obj: ..\..\src\msw\ole\safearray.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_palette.obj: ..\..\src\msw\palette.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\palette.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_pen.obj: ..\..\src\msw\pen.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\pen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_popupwin.obj: ..\..\src\msw\popupwin.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\popupwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_printdlg.obj: ..\..\src\msw\printdlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\printdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_printwin.obj: ..\..\src\msw\printwin.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\printwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_region.obj: ..\..\src\msw\region.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\region.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_renderer.obj: ..\..\src\msw\renderer.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\renderer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_settings.obj: ..\..\src\msw\settings.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\settings.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_toplevel.obj: ..\..\src\msw\toplevel.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_uiaction.obj: ..\..\src\msw\uiaction.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_utilswin.obj: ..\..\src\msw\utilswin.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilswin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_window.obj: ..\..\src\msw\window.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\window.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpchm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_automtn.obj: ..\..\src\msw\ole\automtn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\collpaneg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filepickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_accesscmn.obj: ..\..\src\common\accesscmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accesscmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_anidecod.obj: ..\..\src\common\anidecod.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\anidecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_appcmn.obj: ..\..\src\common\appcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_artprov.obj: ..\..\src\common\artprov.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artprov.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_artstd.obj: ..\..\src\common\artstd.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artstd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_arttango.obj: ..\..\src\common\arttango.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arttango.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_btncmn.obj: ..\..\src\common\btncmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\btncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_cairo.obj: ..\..\src\common\cairo.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cairo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clipcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_colourcmn.obj: ..\..\src\common\colourcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_colourdata.obj: ..\..\src\common\colourdata.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourdata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\combocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cmdproc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_cmndata.obj: ..\..\src\common\cmndata.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cmndata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_containr.obj: ..\..\src\common\containr.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\containr.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_cshelp.obj: ..\..\src\common\cshelp.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cshelp.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcbase.obj: ..\..\src\common\dcbase.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcgraph.obj: ..\..\src\common\dcgraph.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcgraph.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcsvg.obj: ..\..\src\common\dcsvg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dndcmn.obj: ..\..\src\common\dndcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dndcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dobjcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_docmdi.obj: ..\..\src\common\docmdi.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\docmdi.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_docview.obj: ..\..\src\common\docview.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\docview.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dpycmn.obj: ..\..\src\common\dpycmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dpycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dseldlg.obj: ..\..\src\common\dseldlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dseldlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_effects.obj: ..\..\src\common\effects.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\effects.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_filehistorycmn.obj: ..\..\src\common\filehistorycmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filehistorycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filepickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontcmn.obj: ..\..\src\common\fontcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontdata.obj: ..\..\src\common\fontdata.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontdata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_graphicc.obj: ..\..\src\generic\graphicc.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\graphicc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontmap.obj: ..\..\src\common\fontmap.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontmap.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_framecmn.obj: ..\..\src\common\framecmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\framecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gaugecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gbsizer.obj: ..\..\src\common\gbsizer.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gbsizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gdicmn.obj: ..\..\src\common\gdicmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gdicmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_geometry.obj: ..\..\src\common\geometry.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\geometry.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gifdecod.obj: ..\..\src\common\gifdecod.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gifdecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_graphcmn.obj: ..\..\src\common\graphcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_helpbase.obj: ..\..\src\common\helpbase.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\helpbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_iconbndl.obj: ..\..\src\common\iconbndl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\iconbndl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagall.obj: ..\..\src\common\imagall.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagall.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagbmp.obj: ..\..\src\common\imagbmp.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagbmp.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_image.obj: ..\..\src\common\image.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\image.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagfill.obj: ..\..\src\common\imagfill.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagfill.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imaggif.obj: ..\..\src\common\imaggif.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imaggif.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagiff.obj: ..\..\src\common\imagiff.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagiff.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagjpeg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagpcx.obj: ..\..\src\common\imagpcx.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagpcx.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagpng.obj: ..\..\src\common\imagpng.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagpng.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagpnm.obj: ..\..\src\common\imagpnm.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagpnm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagtga.obj: ..\..\src\common\imagtga.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagtga.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagtiff.obj: ..\..\src\common\imagtiff.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagtiff.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagxpm.obj: ..\..\src\common\imagxpm.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagxpm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_layout.obj: ..\..\src\common\layout.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\layout.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\lboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_markupparser.obj: ..\..\src\common\markupparser.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\markupparser.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_matrix.obj: ..\..\src\common\matrix.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\matrix.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_menucmn.obj: ..\..\src\common\menucmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\menucmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_modalhook.obj: ..\..\src\common\modalhook.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\modalhook.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_mousemanager.obj: ..\..\src\common\mousemanager.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_panelcmn.obj: ..\..\src\common\panelcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_pickerbase.obj: ..\..\src\common\pickerbase.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\preferencescmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_prntbase.obj: ..\..\src\common\prntbase.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\prntbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_quantize.obj: ..\..\src\common\quantize.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\quantize.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_radiocmn.obj: ..\..\src\common\radiocmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_rendcmn.obj: ..\..\src\common\rendcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rendcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_rgncmn.obj: ..\..\src\common\rgncmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_settcmn.obj: ..\..\src\common\settcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\settcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_slidercmn.obj: ..\..\src\common\slidercmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_srchcmn.obj: ..\..\src\common\srchcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\srchcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_stockitem.obj: ..\..\src\common\stockitem.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stockitem.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_tbarbase.obj: ..\..\src\common\tbarbase.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\tbarbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_textcmn.obj: ..\..\src\common\textcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_treebase.obj: ..\..\src\common\treebase.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\treebase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_uiactioncmn.obj: ..\..\src\common\uiactioncmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\uiactioncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_valgen.obj: ..\..\src\common\valgen.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valgen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_validate.obj: ..\..\src\common\validate.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\validate.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_valtext.obj: ..\..\src\common\valtext.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valtext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_valnum.obj: ..\..\src\common\valnum.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valnum.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_wincmn.obj: ..\..\src\common\wincmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wincmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_windowid.obj: ..\..\src\common\windowid.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\windowid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\busyinfo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_generic_buttonbar.obj: ..\..\src\generic\buttonbar.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\buttonbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\choicdgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\choicbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\combog.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dcpsg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dragimgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_filectrlg.obj: ..\..\src\generic\filectrlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filectrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_infobar.obj: ..\..\src\generic\infobar.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\infobar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_logg.obj: ..\..\src\generic\logg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\logg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_markuptext.obj: ..\..\src\generic\markuptext.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\markuptext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\numdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_preferencesg.obj: ..\..\src\generic\preferencesg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\preferencesg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_printps.obj: ..\..\src\generic\printps.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\printps.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_renderg.obj: ..\..\src\generic\renderg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\renderg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\scrlwing.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_selstore.obj: ..\..\src\generic\selstore.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\selstore.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_spinctlg.obj: ..\..\src\generic\spinctlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\spinctlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_splitter.obj: ..\..\src\generic\splitter.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splitter.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\srchctlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_statbmpg.obj: ..\..\src\generic\statbmpg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statbmpg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_stattextg.obj: ..\..\src\generic\stattextg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_treebkg.obj: ..\..\src\generic\treebkg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_vlbox.obj: ..\..\src\generic\vlbox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vlbox.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gridcmn.obj: ..\..\src\common\gridcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_datavgen.obj: ..\..\src\generic\datavgen.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\datavgen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\datectlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_editlbox.obj: ..\..\src\generic\editlbox.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\editlbox.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\grid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\gridctrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_grideditors.obj: ..\..\src\generic\grideditors.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\grideditors.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\gridsel.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\helpext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\laywin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_odcombo.obj: ..\..\src\generic\odcombo.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splash.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_timectrlg.obj: ..\..\src\generic\timectrlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timectrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_treelist.obj: ..\..\src\generic\treelist.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treelist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\wizard.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sound.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\joystick.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp -!endif - -$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\lexlib -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dwxUSE_BASE=1 -dWXMAKINGDLL ..\..\src\msw\version.rc - -$(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\monolib_any.obj: ..\..\src\common\any.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\any.cpp - -$(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appbase.cpp - -$(OBJS)\monolib_arcall.obj: ..\..\src\common\arcall.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arcall.cpp - -$(OBJS)\monolib_arcfind.obj: ..\..\src\common\arcfind.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arcfind.cpp - -$(OBJS)\monolib_archive.obj: ..\..\src\common\archive.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\archive.cpp - -$(OBJS)\monolib_arrstr.obj: ..\..\src\common\arrstr.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arrstr.cpp - -$(OBJS)\monolib_base64.obj: ..\..\src\common\base64.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\base64.cpp - -$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clntdata.cpp - -$(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmdline.cpp - -$(OBJS)\monolib_config.obj: ..\..\src\common\config.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\config.cpp - -$(OBJS)\monolib_convauto.obj: ..\..\src\common\convauto.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\convauto.cpp - -$(OBJS)\monolib_datetime.obj: ..\..\src\common\datetime.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datetime.cpp - -$(OBJS)\monolib_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datetimefmt.cpp - -$(OBJS)\monolib_datstrm.obj: ..\..\src\common\datstrm.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datstrm.cpp - -$(OBJS)\monolib_dircmn.obj: ..\..\src\common\dircmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dircmn.cpp - -$(OBJS)\monolib_dynarray.obj: ..\..\src\common\dynarray.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynarray.cpp - -$(OBJS)\monolib_dynlib.obj: ..\..\src\common\dynlib.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynlib.cpp - -$(OBJS)\monolib_dynload.obj: ..\..\src\common\dynload.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynload.cpp - -$(OBJS)\monolib_encconv.obj: ..\..\src\common\encconv.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\encconv.cpp - -$(OBJS)\monolib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp - -$(OBJS)\monolib_extended.obj: ..\..\src\common\extended.c - $(CC) -q -c -P- -o$@ $(MONOLIB_CFLAGS) ..\..\src\common\extended.c - -$(OBJS)\monolib_ffile.obj: ..\..\src\common\ffile.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ffile.cpp - -$(OBJS)\monolib_file.obj: ..\..\src\common\file.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\file.cpp - -$(OBJS)\monolib_fileback.obj: ..\..\src\common\fileback.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fileback.cpp - -$(OBJS)\monolib_fileconf.obj: ..\..\src\common\fileconf.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fileconf.cpp - -$(OBJS)\monolib_filefn.obj: ..\..\src\common\filefn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filefn.cpp - -$(OBJS)\monolib_filename.obj: ..\..\src\common\filename.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filename.cpp - -$(OBJS)\monolib_filesys.obj: ..\..\src\common\filesys.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filesys.cpp - -$(OBJS)\monolib_filtall.obj: ..\..\src\common\filtall.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filtall.cpp - -$(OBJS)\monolib_filtfind.obj: ..\..\src\common\filtfind.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filtfind.cpp - -$(OBJS)\monolib_fmapbase.obj: ..\..\src\common\fmapbase.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fmapbase.cpp - -$(OBJS)\monolib_fs_arc.obj: ..\..\src\common\fs_arc.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_arc.cpp - -$(OBJS)\monolib_fs_filter.obj: ..\..\src\common\fs_filter.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_filter.cpp - -$(OBJS)\monolib_hash.obj: ..\..\src\common\hash.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hash.cpp - -$(OBJS)\monolib_hashmap.obj: ..\..\src\common\hashmap.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hashmap.cpp - -$(OBJS)\monolib_init.obj: ..\..\src\common\init.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\init.cpp - -$(OBJS)\monolib_intl.obj: ..\..\src\common\intl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\intl.cpp - -$(OBJS)\monolib_ipcbase.obj: ..\..\src\common\ipcbase.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ipcbase.cpp - -$(OBJS)\monolib_languageinfo.obj: ..\..\src\common\languageinfo.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\languageinfo.cpp - -$(OBJS)\monolib_list.obj: ..\..\src\common\list.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\list.cpp - -$(OBJS)\monolib_log.obj: ..\..\src\common\log.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\log.cpp - -$(OBJS)\monolib_longlong.obj: ..\..\src\common\longlong.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\longlong.cpp - -$(OBJS)\monolib_memory.obj: ..\..\src\common\memory.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\memory.cpp - -$(OBJS)\monolib_mimecmn.obj: ..\..\src\common\mimecmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mimecmn.cpp - -$(OBJS)\monolib_module.obj: ..\..\src\common\module.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\module.cpp - -$(OBJS)\monolib_mstream.obj: ..\..\src\common\mstream.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mstream.cpp - -$(OBJS)\monolib_numformatter.obj: ..\..\src\common\numformatter.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\numformatter.cpp - -$(OBJS)\monolib_object.obj: ..\..\src\common\object.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\object.cpp - -$(OBJS)\monolib_platinfo.obj: ..\..\src\common\platinfo.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\platinfo.cpp - -$(OBJS)\monolib_powercmn.obj: ..\..\src\common\powercmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\powercmn.cpp - -$(OBJS)\monolib_process.obj: ..\..\src\common\process.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\process.cpp - -$(OBJS)\monolib_regex.obj: ..\..\src\common\regex.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\regex.cpp - -$(OBJS)\monolib_stdpbase.obj: ..\..\src\common\stdpbase.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stdpbase.cpp - -$(OBJS)\monolib_sstream.obj: ..\..\src\common\sstream.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sstream.cpp - -$(OBJS)\monolib_stdstream.obj: ..\..\src\common\stdstream.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stdstream.cpp - -$(OBJS)\monolib_stopwatch.obj: ..\..\src\common\stopwatch.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp - -$(OBJS)\monolib_strconv.obj: ..\..\src\common\strconv.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\strconv.cpp - -$(OBJS)\monolib_stream.obj: ..\..\src\common\stream.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stream.cpp - -$(OBJS)\monolib_string.obj: ..\..\src\common\string.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\string.cpp - -$(OBJS)\monolib_stringimpl.obj: ..\..\src\common\stringimpl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stringimpl.cpp - -$(OBJS)\monolib_stringops.obj: ..\..\src\common\stringops.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stringops.cpp - -$(OBJS)\monolib_strvararg.obj: ..\..\src\common\strvararg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\strvararg.cpp - -$(OBJS)\monolib_sysopt.obj: ..\..\src\common\sysopt.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sysopt.cpp - -$(OBJS)\monolib_tarstrm.obj: ..\..\src\common\tarstrm.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\tarstrm.cpp - -$(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textbuf.cpp - -$(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textfile.cpp - -$(OBJS)\monolib_threadinfo.obj: ..\..\src\common\threadinfo.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\threadinfo.cpp - -$(OBJS)\monolib_time.obj: ..\..\src\common\time.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\time.cpp - -$(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timercmn.cpp - -$(OBJS)\monolib_timerimpl.obj: ..\..\src\common\timerimpl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timerimpl.cpp - -$(OBJS)\monolib_tokenzr.obj: ..\..\src\common\tokenzr.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\tokenzr.cpp - -$(OBJS)\monolib_translation.obj: ..\..\src\common\translation.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\translation.cpp - -$(OBJS)\monolib_txtstrm.obj: ..\..\src\common\txtstrm.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\txtstrm.cpp - -$(OBJS)\monolib_unichar.obj: ..\..\src\common\unichar.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\unichar.cpp - -$(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\uri.cpp - -$(OBJS)\monolib_ustring.obj: ..\..\src\common\ustring.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ustring.cpp - -$(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\variant.cpp - -$(OBJS)\monolib_wfstream.obj: ..\..\src\common\wfstream.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wfstream.cpp - -$(OBJS)\monolib_wxcrt.obj: ..\..\src\common\wxcrt.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wxcrt.cpp - -$(OBJS)\monolib_wxprintf.obj: ..\..\src\common\wxprintf.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wxprintf.cpp - -$(OBJS)\monolib_xlocale.obj: ..\..\src\common\xlocale.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xlocale.cpp - -$(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xti.cpp - -$(OBJS)\monolib_xtistrm.obj: ..\..\src\common\xtistrm.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xtistrm.cpp - -$(OBJS)\monolib_zipstrm.obj: ..\..\src\common\zipstrm.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\zipstrm.cpp - -$(OBJS)\monolib_zstream.obj: ..\..\src\common\zstream.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\zstream.cpp - -$(OBJS)\monolib_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp - -$(OBJS)\monolib_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp - -$(OBJS)\monolib_basemsw.obj: ..\..\src\msw\basemsw.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp - -$(OBJS)\monolib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\crashrpt.cpp - -$(OBJS)\monolib_debughlp.obj: ..\..\src\msw\debughlp.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\debughlp.cpp - -$(OBJS)\monolib_dde.obj: ..\..\src\msw\dde.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dde.cpp - -$(OBJS)\monolib_dir.obj: ..\..\src\msw\dir.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dir.cpp - -$(OBJS)\monolib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp - -$(OBJS)\monolib_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp - -$(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp - -$(OBJS)\monolib_power.obj: ..\..\src\msw\power.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\power.cpp - -$(OBJS)\monolib_regconf.obj: ..\..\src\msw\regconf.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\regconf.cpp - -$(OBJS)\monolib_registry.obj: ..\..\src\msw\registry.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\registry.cpp - -$(OBJS)\monolib_snglinst.obj: ..\..\src\msw\snglinst.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\snglinst.cpp - -$(OBJS)\monolib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stackwalk.cpp - -$(OBJS)\monolib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stdpaths.cpp - -$(OBJS)\monolib_thread.obj: ..\..\src\msw\thread.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\thread.cpp - -$(OBJS)\monolib_timer.obj: ..\..\src\msw\timer.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timer.cpp - -$(OBJS)\monolib_utils.obj: ..\..\src\msw\utils.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utils.cpp - -$(OBJS)\monolib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp - -$(OBJS)\monolib_fswatcher.obj: ..\..\src\msw\fswatcher.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fswatcher.cpp - -$(OBJS)\monolib_event.obj: ..\..\src\common\event.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\event.cpp - -$(OBJS)\monolib_fs_mem.obj: ..\..\src\common\fs_mem.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_mem.cpp - -$(OBJS)\monolib_msgout.obj: ..\..\src\common\msgout.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\msgout.cpp - -$(OBJS)\monolib_utilscmn.obj: ..\..\src\common\utilscmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp - -$(OBJS)\monolib_main.obj: ..\..\src\msw\main.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\main.cpp - -$(OBJS)\monolib_mslu.obj: ..\..\src\msw\mslu.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mslu.cpp - -$(OBJS)\monolib_volume.obj: ..\..\src\msw\volume.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\volume.cpp - -$(OBJS)\monolib_fs_inet.obj: ..\..\src\common\fs_inet.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_inet.cpp - -$(OBJS)\monolib_ftp.obj: ..\..\src\common\ftp.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ftp.cpp - -$(OBJS)\monolib_http.obj: ..\..\src\common\http.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\http.cpp - -$(OBJS)\monolib_protocol.obj: ..\..\src\common\protocol.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\protocol.cpp - -$(OBJS)\monolib_sckaddr.obj: ..\..\src\common\sckaddr.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckaddr.cpp - -$(OBJS)\monolib_sckfile.obj: ..\..\src\common\sckfile.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckfile.cpp - -$(OBJS)\monolib_sckipc.obj: ..\..\src\common\sckipc.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckipc.cpp - -$(OBJS)\monolib_sckstrm.obj: ..\..\src\common\sckstrm.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckstrm.cpp - -$(OBJS)\monolib_socket.obj: ..\..\src\common\socket.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\socket.cpp - -$(OBJS)\monolib_url.obj: ..\..\src\common\url.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\url.cpp - -$(OBJS)\monolib_sockmsw.obj: ..\..\src\msw\sockmsw.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sockmsw.cpp - -$(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\urlmsw.cpp - -$(OBJS)\monolib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp - -$(OBJS)\monolib_msw_accel.obj: ..\..\src\msw\accel.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\accel.cpp - -$(OBJS)\monolib_anybutton.obj: ..\..\src\msw\anybutton.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp - -$(OBJS)\monolib_artmsw.obj: ..\..\src\msw\artmsw.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp - -$(OBJS)\monolib_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp - -$(OBJS)\monolib_msw_button.obj: ..\..\src\msw\button.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\button.cpp - -$(OBJS)\monolib_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp - -$(OBJS)\monolib_msw_choice.obj: ..\..\src\msw\choice.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\choice.cpp - -$(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp - -$(OBJS)\monolib_combo.obj: ..\..\src\msw\combo.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combo.cpp - -$(OBJS)\monolib_msw_combobox.obj: ..\..\src\msw\combobox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combobox.cpp - -$(OBJS)\monolib_msw_control.obj: ..\..\src\msw\control.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\control.cpp - -$(OBJS)\monolib_msw_dialog.obj: ..\..\src\msw\dialog.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialog.cpp - -$(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp - -$(OBJS)\monolib_dragimag.obj: ..\..\src\msw\dragimag.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp - -$(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp - -$(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\frame.cpp - -$(OBJS)\monolib_msw_gauge.obj: ..\..\src\msw\gauge.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge.cpp - -$(OBJS)\monolib_headerctrl.obj: ..\..\src\msw\headerctrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\headerctrl.cpp - -$(OBJS)\monolib_iniconf.obj: ..\..\src\msw\iniconf.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp - -$(OBJS)\monolib_msw_listbox.obj: ..\..\src\msw\listbox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listbox.cpp - -$(OBJS)\monolib_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp - -$(OBJS)\monolib_mdi.obj: ..\..\src\msw\mdi.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mdi.cpp - -$(OBJS)\monolib_msw_menu.obj: ..\..\src\msw\menu.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menu.cpp - -$(OBJS)\monolib_menuitem.obj: ..\..\src\msw\menuitem.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp - -$(OBJS)\monolib_metafile.obj: ..\..\src\msw\metafile.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\metafile.cpp - -$(OBJS)\monolib_msgdlg.obj: ..\..\src\msw\msgdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\msgdlg.cpp - -$(OBJS)\monolib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativdlg.cpp - -$(OBJS)\monolib_nativewin.obj: ..\..\src\msw\nativewin.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp - -$(OBJS)\monolib_msw_notebook.obj: ..\..\src\msw\notebook.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notebook.cpp - -$(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp - -$(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp - -$(OBJS)\monolib_msw_panel.obj: ..\..\src\msw\panel.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\panel.cpp - -$(OBJS)\monolib_progdlg.obj: ..\..\src\msw\progdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp - -$(OBJS)\monolib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp - -$(OBJS)\monolib_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp - -$(OBJS)\monolib_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp - -$(OBJS)\monolib_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp - -$(OBJS)\monolib_msw_slider.obj: ..\..\src\msw\slider.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider.cpp - -$(OBJS)\monolib_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp - -$(OBJS)\monolib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp - -$(OBJS)\monolib_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp - -$(OBJS)\monolib_msw_statbox.obj: ..\..\src\msw\statbox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbox.cpp - -$(OBJS)\monolib_statusbar.obj: ..\..\src\msw\statusbar.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp - -$(OBJS)\monolib_msw_statline.obj: ..\..\src\msw\statline.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statline.cpp - -$(OBJS)\monolib_msw_stattext.obj: ..\..\src\msw\stattext.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stattext.cpp - -$(OBJS)\monolib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp - -$(OBJS)\monolib_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp - -$(OBJS)\monolib_textentry.obj: ..\..\src\msw\textentry.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textentry.cpp - -$(OBJS)\monolib_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp - -$(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp - -$(OBJS)\monolib_msw_checklst.obj: ..\..\src\msw\checklst.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checklst.cpp - -$(OBJS)\monolib_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp - -$(OBJS)\monolib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp - -$(OBJS)\monolib_generic_accel.obj: ..\..\src\generic\accel.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\accel.cpp - -$(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp - -$(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp - -$(OBJS)\monolib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp - -$(OBJS)\monolib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp - -$(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp - -$(OBJS)\monolib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp - -$(OBJS)\monolib_mdig.obj: ..\..\src\generic\mdig.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\mdig.cpp - -$(OBJS)\monolib_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp - -$(OBJS)\monolib_univ_button.obj: ..\..\src\univ\button.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\button.cpp - -$(OBJS)\monolib_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp - -$(OBJS)\monolib_univ_checklst.obj: ..\..\src\univ\checklst.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checklst.cpp - -$(OBJS)\monolib_univ_choice.obj: ..\..\src\univ\choice.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\choice.cpp - -$(OBJS)\monolib_univ_combobox.obj: ..\..\src\univ\combobox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\combobox.cpp - -$(OBJS)\monolib_univ_control.obj: ..\..\src\univ\control.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\control.cpp - -$(OBJS)\monolib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp - -$(OBJS)\monolib_univ_dialog.obj: ..\..\src\univ\dialog.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\dialog.cpp - -$(OBJS)\monolib_framuniv.obj: ..\..\src\univ\framuniv.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp - -$(OBJS)\monolib_univ_gauge.obj: ..\..\src\univ\gauge.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp - -$(OBJS)\monolib_inpcons.obj: ..\..\src\univ\inpcons.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp - -$(OBJS)\monolib_inphand.obj: ..\..\src\univ\inphand.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inphand.cpp - -$(OBJS)\monolib_univ_listbox.obj: ..\..\src\univ\listbox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\listbox.cpp - -$(OBJS)\monolib_univ_menu.obj: ..\..\src\univ\menu.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\menu.cpp - -$(OBJS)\monolib_univ_notebook.obj: ..\..\src\univ\notebook.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\notebook.cpp - -$(OBJS)\monolib_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp - -$(OBJS)\monolib_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp - -$(OBJS)\monolib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp - -$(OBJS)\monolib_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp - -$(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp - -$(OBJS)\monolib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp - -$(OBJS)\monolib_univ_slider.obj: ..\..\src\univ\slider.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp - -$(OBJS)\monolib_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp - -$(OBJS)\monolib_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp - -$(OBJS)\monolib_univ_statbox.obj: ..\..\src\univ\statbox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbox.cpp - -$(OBJS)\monolib_univ_statline.obj: ..\..\src\univ\statline.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statline.cpp - -$(OBJS)\monolib_univ_stattext.obj: ..\..\src\univ\stattext.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stattext.cpp - -$(OBJS)\monolib_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp - -$(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp - -$(OBJS)\monolib_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp - -$(OBJS)\monolib_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp - -$(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\theme.cpp - -$(OBJS)\monolib_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp - -$(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp - -$(OBJS)\monolib_winuniv.obj: ..\..\src\univ\winuniv.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\winuniv.cpp - -$(OBJS)\monolib_gtk.obj: ..\..\src\univ\themes\gtk.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp - -$(OBJS)\monolib_metal.obj: ..\..\src\univ\themes\metal.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\metal.cpp - -$(OBJS)\monolib_mono.obj: ..\..\src\univ\themes\mono.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\mono.cpp - -$(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp - -$(OBJS)\monolib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp - -$(OBJS)\monolib_calctrl.obj: ..\..\src\msw\calctrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp - -$(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp - -$(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp - -$(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp - -$(OBJS)\monolib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp - -$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp - -$(OBJS)\monolib_timectrl.obj: ..\..\src\msw\timectrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp - -$(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp - -$(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp - -$(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp - -$(OBJS)\monolib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp - -$(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp - -$(OBJS)\monolib_helpctrl.obj: ..\..\src\html\helpctrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpctrl.cpp - -$(OBJS)\monolib_helpdata.obj: ..\..\src\html\helpdata.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpdata.cpp - -$(OBJS)\monolib_helpdlg.obj: ..\..\src\html\helpdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpdlg.cpp - -$(OBJS)\monolib_helpfrm.obj: ..\..\src\html\helpfrm.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpfrm.cpp - -$(OBJS)\monolib_helpwnd.obj: ..\..\src\html\helpwnd.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpwnd.cpp - -$(OBJS)\monolib_htmlcell.obj: ..\..\src\html\htmlcell.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlcell.cpp - -$(OBJS)\monolib_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlfilt.cpp - -$(OBJS)\monolib_htmlpars.obj: ..\..\src\html\htmlpars.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlpars.cpp - -$(OBJS)\monolib_htmltag.obj: ..\..\src\html\htmltag.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmltag.cpp - -$(OBJS)\monolib_htmlwin.obj: ..\..\src\html\htmlwin.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlwin.cpp - -$(OBJS)\monolib_htmprint.obj: ..\..\src\html\htmprint.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmprint.cpp - -$(OBJS)\monolib_m_dflist.obj: ..\..\src\html\m_dflist.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_dflist.cpp - -$(OBJS)\monolib_m_fonts.obj: ..\..\src\html\m_fonts.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_fonts.cpp - -$(OBJS)\monolib_m_hline.obj: ..\..\src\html\m_hline.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_hline.cpp - -$(OBJS)\monolib_m_image.obj: ..\..\src\html\m_image.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_image.cpp - -$(OBJS)\monolib_m_layout.obj: ..\..\src\html\m_layout.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_layout.cpp - -$(OBJS)\monolib_m_links.obj: ..\..\src\html\m_links.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_links.cpp - -$(OBJS)\monolib_m_list.obj: ..\..\src\html\m_list.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_list.cpp - -$(OBJS)\monolib_m_pre.obj: ..\..\src\html\m_pre.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp - -$(OBJS)\monolib_m_span.obj: ..\..\src\html\m_span.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_span.cpp - -$(OBJS)\monolib_m_style.obj: ..\..\src\html\m_style.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_style.cpp - -$(OBJS)\monolib_m_tables.obj: ..\..\src\html\m_tables.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp - -$(OBJS)\monolib_styleparams.obj: ..\..\src\html\styleparams.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp - -$(OBJS)\monolib_winpars.obj: ..\..\src\html\winpars.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\winpars.cpp - -$(OBJS)\monolib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\htmllbox.cpp - -$(OBJS)\monolib_webview_ie.obj: ..\..\src\msw\webview_ie.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\webview_ie.cpp - -$(OBJS)\monolib_webview.obj: ..\..\src\common\webview.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webview.cpp - -$(OBJS)\monolib_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp - -$(OBJS)\monolib_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp - -$(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\debugrpt.cpp - -$(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp - -$(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp - -$(OBJS)\monolib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp - -$(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp - -$(OBJS)\monolib_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp - -$(OBJS)\monolib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp - -$(OBJS)\monolib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp - -$(OBJS)\monolib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp - -$(OBJS)\monolib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp - -$(OBJS)\monolib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp - -$(OBJS)\monolib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp - -$(OBJS)\monolib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp - -$(OBJS)\monolib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp - -$(OBJS)\monolib_xh_cmdlinkbn.obj: ..\..\src\xrc\xh_cmdlinkbn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_cmdlinkbn.cpp - -$(OBJS)\monolib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp - -$(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp - -$(OBJS)\monolib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp - -$(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp - -$(OBJS)\monolib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp - -$(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp - -$(OBJS)\monolib_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp - -$(OBJS)\monolib_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp - -$(OBJS)\monolib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp - -$(OBJS)\monolib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp - -$(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp - -$(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp - -$(OBJS)\monolib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp - -$(OBJS)\monolib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp - -$(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_html.cpp - -$(OBJS)\monolib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp - -$(OBJS)\monolib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp - -$(OBJS)\monolib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp - -$(OBJS)\monolib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp - -$(OBJS)\monolib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp - -$(OBJS)\monolib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp - -$(OBJS)\monolib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp - -$(OBJS)\monolib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp - -$(OBJS)\monolib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp - -$(OBJS)\monolib_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp - -$(OBJS)\monolib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp - -$(OBJS)\monolib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp - -$(OBJS)\monolib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp - -$(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp - -$(OBJS)\monolib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp - -$(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp - -$(OBJS)\monolib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp - -$(OBJS)\monolib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp - -$(OBJS)\monolib_xh_split.obj: ..\..\src\xrc\xh_split.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_split.cpp - -$(OBJS)\monolib_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp - -$(OBJS)\monolib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp - -$(OBJS)\monolib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp - -$(OBJS)\monolib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp - -$(OBJS)\monolib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp - -$(OBJS)\monolib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp - -$(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp - -$(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp - -$(OBJS)\monolib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp - -$(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp - -$(OBJS)\monolib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp - -$(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp - -$(OBJS)\monolib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp - -$(OBJS)\monolib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp - -$(OBJS)\monolib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp - -$(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp - -$(OBJS)\monolib_xmladv.obj: ..\..\src\xrc\xmladv.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmladv.cpp - -$(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp - -$(OBJS)\monolib_framemanager.obj: ..\..\src\aui\framemanager.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\framemanager.cpp - -$(OBJS)\monolib_dockart.obj: ..\..\src\aui\dockart.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\dockart.cpp - -$(OBJS)\monolib_floatpane.obj: ..\..\src\aui\floatpane.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\floatpane.cpp - -$(OBJS)\monolib_auibook.obj: ..\..\src\aui\auibook.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\auibook.cpp - -$(OBJS)\monolib_auibar.obj: ..\..\src\aui\auibar.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\auibar.cpp - -$(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp - -$(OBJS)\monolib_tabart.obj: ..\..\src\aui\tabart.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabart.cpp - -$(OBJS)\monolib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp - -$(OBJS)\monolib_advprops.obj: ..\..\src\propgrid\advprops.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp - -$(OBJS)\monolib_editors.obj: ..\..\src\propgrid\editors.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\editors.cpp - -$(OBJS)\monolib_manager.obj: ..\..\src\propgrid\manager.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\manager.cpp - -$(OBJS)\monolib_property.obj: ..\..\src\propgrid\property.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\property.cpp - -$(OBJS)\monolib_propgrid.obj: ..\..\src\propgrid\propgrid.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp - -$(OBJS)\monolib_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp - -$(OBJS)\monolib_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp - -$(OBJS)\monolib_props.obj: ..\..\src\propgrid\props.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp - -$(OBJS)\monolib_art_internal.obj: ..\..\src\ribbon\art_internal.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp - -$(OBJS)\monolib_art_msw.obj: ..\..\src\ribbon\art_msw.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp - -$(OBJS)\monolib_art_aui.obj: ..\..\src\ribbon\art_aui.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp - -$(OBJS)\monolib_bar.obj: ..\..\src\ribbon\bar.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\bar.cpp - -$(OBJS)\monolib_ribbon_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp - -$(OBJS)\monolib_ribbon_control.obj: ..\..\src\ribbon\control.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\control.cpp - -$(OBJS)\monolib_gallery.obj: ..\..\src\ribbon\gallery.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\gallery.cpp - -$(OBJS)\monolib_page.obj: ..\..\src\ribbon\page.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp - -$(OBJS)\monolib_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp - -$(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp - -$(OBJS)\monolib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp - -$(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp - -$(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp - -$(OBJS)\monolib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp - -$(OBJS)\monolib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp - -$(OBJS)\monolib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp - -$(OBJS)\monolib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp - -$(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp - -$(OBJS)\monolib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp - -$(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp - -$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp - -$(OBJS)\monolib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp - -$(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp - -$(OBJS)\monolib_PlatWX.obj: ..\..\src\stc\PlatWX.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\PlatWX.cpp - -$(OBJS)\monolib_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp - -$(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xml\xml.cpp - -$(OBJS)\monolib_xtixml.obj: ..\..\src\common\xtixml.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xtixml.cpp - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_app.obj: ..\..\src\msw\app.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\app.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_bitmap.obj: ..\..\src\msw\bitmap.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bitmap.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_brush.obj: ..\..\src\msw\brush.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\brush.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_caret.obj: ..\..\src\msw\caret.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\caret.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_clipbrd.obj: ..\..\src\msw\clipbrd.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\clipbrd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_colour.obj: ..\..\src\msw\colour.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\colour.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_cursor.obj: ..\..\src\msw\cursor.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\cursor.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_data.obj: ..\..\src\msw\data.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\data.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dc.obj: ..\..\src\msw\dc.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcclient.obj: ..\..\src\msw\dcclient.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcclient.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcmemory.obj: ..\..\src\msw\dcmemory.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcmemory.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcprint.obj: ..\..\src\msw\dcprint.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcprint.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcscreen.obj: ..\..\src\msw\dcscreen.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcscreen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dialup.obj: ..\..\src\msw\dialup.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialup.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dib.obj: ..\..\src\msw\dib.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dib.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_display.obj: ..\..\src\msw\display.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\display.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_enhmeta.obj: ..\..\src\msw\enhmeta.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\enhmeta.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_font.obj: ..\..\src\msw\font.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\font.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontenum.obj: ..\..\src\msw\fontenum.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontenum.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontutil.obj: ..\..\src\msw\fontutil.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontutil.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gdiimage.obj: ..\..\src\msw\gdiimage.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiimage.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiobj.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiplus.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_graphics.obj: ..\..\src\msw\graphics.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\graphics.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_icon.obj: ..\..\src\msw\icon.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\icon.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imaglist.obj: ..\..\src\msw\imaglist.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\minifram.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_safearray.obj: ..\..\src\msw\ole\safearray.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_palette.obj: ..\..\src\msw\palette.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\palette.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_pen.obj: ..\..\src\msw\pen.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\pen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_popupwin.obj: ..\..\src\msw\popupwin.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\popupwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_printdlg.obj: ..\..\src\msw\printdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\printdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_printwin.obj: ..\..\src\msw\printwin.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\printwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_region.obj: ..\..\src\msw\region.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\region.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_renderer.obj: ..\..\src\msw\renderer.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\renderer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_settings.obj: ..\..\src\msw\settings.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\settings.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_toplevel.obj: ..\..\src\msw\toplevel.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_uiaction.obj: ..\..\src\msw\uiaction.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_utilswin.obj: ..\..\src\msw\utilswin.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilswin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_window.obj: ..\..\src\msw\window.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\window.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpchm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_automtn.obj: ..\..\src\msw\ole\automtn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\collpaneg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filepickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_accesscmn.obj: ..\..\src\common\accesscmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accesscmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_anidecod.obj: ..\..\src\common\anidecod.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\anidecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_appcmn.obj: ..\..\src\common\appcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_artprov.obj: ..\..\src\common\artprov.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artprov.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_artstd.obj: ..\..\src\common\artstd.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artstd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_arttango.obj: ..\..\src\common\arttango.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arttango.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_btncmn.obj: ..\..\src\common\btncmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\btncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_cairo.obj: ..\..\src\common\cairo.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cairo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clipcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_colourdata.obj: ..\..\src\common\colourdata.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourdata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\combocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmdproc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_cmndata.obj: ..\..\src\common\cmndata.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmndata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_containr.obj: ..\..\src\common\containr.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\containr.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_cshelp.obj: ..\..\src\common\cshelp.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cshelp.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcbase.obj: ..\..\src\common\dcbase.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcgraph.obj: ..\..\src\common\dcgraph.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcgraph.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcsvg.obj: ..\..\src\common\dcsvg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dndcmn.obj: ..\..\src\common\dndcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dndcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dobjcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_docmdi.obj: ..\..\src\common\docmdi.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\docmdi.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_docview.obj: ..\..\src\common\docview.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\docview.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dpycmn.obj: ..\..\src\common\dpycmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dpycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dseldlg.obj: ..\..\src\common\dseldlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dseldlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_effects.obj: ..\..\src\common\effects.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\effects.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_filehistorycmn.obj: ..\..\src\common\filehistorycmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filehistorycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filepickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontcmn.obj: ..\..\src\common\fontcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontdata.obj: ..\..\src\common\fontdata.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontdata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_graphicc.obj: ..\..\src\generic\graphicc.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontmap.obj: ..\..\src\common\fontmap.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontmap.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_framecmn.obj: ..\..\src\common\framecmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\framecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gaugecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gbsizer.obj: ..\..\src\common\gbsizer.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gbsizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gdicmn.obj: ..\..\src\common\gdicmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gdicmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_geometry.obj: ..\..\src\common\geometry.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\geometry.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gifdecod.obj: ..\..\src\common\gifdecod.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gifdecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_graphcmn.obj: ..\..\src\common\graphcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_helpbase.obj: ..\..\src\common\helpbase.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\helpbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_iconbndl.obj: ..\..\src\common\iconbndl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\iconbndl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagall.obj: ..\..\src\common\imagall.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagall.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagbmp.obj: ..\..\src\common\imagbmp.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagbmp.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_image.obj: ..\..\src\common\image.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\image.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagfill.obj: ..\..\src\common\imagfill.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagfill.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imaggif.obj: ..\..\src\common\imaggif.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imaggif.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagiff.obj: ..\..\src\common\imagiff.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagiff.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagjpeg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagpcx.obj: ..\..\src\common\imagpcx.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagpcx.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagpng.obj: ..\..\src\common\imagpng.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagpng.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagpnm.obj: ..\..\src\common\imagpnm.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagpnm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagtga.obj: ..\..\src\common\imagtga.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagtga.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagtiff.obj: ..\..\src\common\imagtiff.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagtiff.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagxpm.obj: ..\..\src\common\imagxpm.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagxpm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_layout.obj: ..\..\src\common\layout.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\layout.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\lboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_markupparser.obj: ..\..\src\common\markupparser.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\markupparser.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_matrix.obj: ..\..\src\common\matrix.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\matrix.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_menucmn.obj: ..\..\src\common\menucmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\menucmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_modalhook.obj: ..\..\src\common\modalhook.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\modalhook.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_mousemanager.obj: ..\..\src\common\mousemanager.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_panelcmn.obj: ..\..\src\common\panelcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_pickerbase.obj: ..\..\src\common\pickerbase.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\preferencescmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_prntbase.obj: ..\..\src\common\prntbase.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\prntbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_quantize.obj: ..\..\src\common\quantize.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\quantize.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_radiocmn.obj: ..\..\src\common\radiocmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_rendcmn.obj: ..\..\src\common\rendcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rendcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_rgncmn.obj: ..\..\src\common\rgncmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_settcmn.obj: ..\..\src\common\settcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\settcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_slidercmn.obj: ..\..\src\common\slidercmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_srchcmn.obj: ..\..\src\common\srchcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\srchcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_stockitem.obj: ..\..\src\common\stockitem.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stockitem.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_tbarbase.obj: ..\..\src\common\tbarbase.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\tbarbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_textcmn.obj: ..\..\src\common\textcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_treebase.obj: ..\..\src\common\treebase.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\treebase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_uiactioncmn.obj: ..\..\src\common\uiactioncmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\uiactioncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_valgen.obj: ..\..\src\common\valgen.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valgen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_validate.obj: ..\..\src\common\validate.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\validate.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_valtext.obj: ..\..\src\common\valtext.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valtext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_valnum.obj: ..\..\src\common\valnum.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valnum.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_wincmn.obj: ..\..\src\common\wincmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wincmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_windowid.obj: ..\..\src\common\windowid.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\windowid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\busyinfo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_generic_buttonbar.obj: ..\..\src\generic\buttonbar.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\buttonbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\choicdgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\choicbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\combog.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dcpsg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dragimgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_filectrlg.obj: ..\..\src\generic\filectrlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filectrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_infobar.obj: ..\..\src\generic\infobar.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_logg.obj: ..\..\src\generic\logg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\logg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_markuptext.obj: ..\..\src\generic\markuptext.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\numdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_preferencesg.obj: ..\..\src\generic\preferencesg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\preferencesg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_printps.obj: ..\..\src\generic\printps.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\printps.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_renderg.obj: ..\..\src\generic\renderg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\renderg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_scrlwing.obj: ..\..\src\generic\scrlwing.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\scrlwing.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_selstore.obj: ..\..\src\generic\selstore.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\selstore.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_spinctlg.obj: ..\..\src\generic\spinctlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\spinctlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_splitter.obj: ..\..\src\generic\splitter.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splitter.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\srchctlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_statbmpg.obj: ..\..\src\generic\statbmpg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statbmpg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_stattextg.obj: ..\..\src\generic\stattextg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_tipwin.obj: ..\..\src\generic\tipwin.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_treebkg.obj: ..\..\src\generic\treebkg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_vlbox.obj: ..\..\src\generic\vlbox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vlbox.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gridcmn.obj: ..\..\src\common\gridcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_datavgen.obj: ..\..\src\generic\datavgen.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\datavgen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\datectlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_editlbox.obj: ..\..\src\generic\editlbox.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\editlbox.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\grid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\gridctrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_grideditors.obj: ..\..\src\generic\grideditors.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\grideditors.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\gridsel.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\helpext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_odcombo.obj: ..\..\src\generic\odcombo.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splash.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_timectrlg.obj: ..\..\src\generic\timectrlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sound.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp -!endif - -$(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\basedll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 ..\..\src\msw\version.rc - -$(OBJS)\basedll_any.obj: ..\..\src\common\any.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\any.cpp - -$(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\appbase.cpp - -$(OBJS)\basedll_arcall.obj: ..\..\src\common\arcall.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\arcall.cpp - -$(OBJS)\basedll_arcfind.obj: ..\..\src\common\arcfind.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\arcfind.cpp - -$(OBJS)\basedll_archive.obj: ..\..\src\common\archive.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\archive.cpp - -$(OBJS)\basedll_arrstr.obj: ..\..\src\common\arrstr.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\arrstr.cpp - -$(OBJS)\basedll_base64.obj: ..\..\src\common\base64.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\base64.cpp - -$(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\clntdata.cpp - -$(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\cmdline.cpp - -$(OBJS)\basedll_config.obj: ..\..\src\common\config.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\config.cpp - -$(OBJS)\basedll_convauto.obj: ..\..\src\common\convauto.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\convauto.cpp - -$(OBJS)\basedll_datetime.obj: ..\..\src\common\datetime.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datetime.cpp - -$(OBJS)\basedll_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datetimefmt.cpp - -$(OBJS)\basedll_datstrm.obj: ..\..\src\common\datstrm.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datstrm.cpp - -$(OBJS)\basedll_dircmn.obj: ..\..\src\common\dircmn.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dircmn.cpp - -$(OBJS)\basedll_dynarray.obj: ..\..\src\common\dynarray.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynarray.cpp - -$(OBJS)\basedll_dynlib.obj: ..\..\src\common\dynlib.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynlib.cpp - -$(OBJS)\basedll_dynload.obj: ..\..\src\common\dynload.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynload.cpp - -$(OBJS)\basedll_encconv.obj: ..\..\src\common\encconv.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\encconv.cpp - -$(OBJS)\basedll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp - -$(OBJS)\basedll_extended.obj: ..\..\src\common\extended.c - $(CC) -q -c -P- -o$@ $(BASEDLL_CFLAGS) ..\..\src\common\extended.c - -$(OBJS)\basedll_ffile.obj: ..\..\src\common\ffile.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ffile.cpp - -$(OBJS)\basedll_file.obj: ..\..\src\common\file.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\file.cpp - -$(OBJS)\basedll_fileback.obj: ..\..\src\common\fileback.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fileback.cpp - -$(OBJS)\basedll_fileconf.obj: ..\..\src\common\fileconf.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fileconf.cpp - -$(OBJS)\basedll_filefn.obj: ..\..\src\common\filefn.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filefn.cpp - -$(OBJS)\basedll_filename.obj: ..\..\src\common\filename.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filename.cpp - -$(OBJS)\basedll_filesys.obj: ..\..\src\common\filesys.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filesys.cpp - -$(OBJS)\basedll_filtall.obj: ..\..\src\common\filtall.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filtall.cpp - -$(OBJS)\basedll_filtfind.obj: ..\..\src\common\filtfind.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filtfind.cpp - -$(OBJS)\basedll_fmapbase.obj: ..\..\src\common\fmapbase.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fmapbase.cpp - -$(OBJS)\basedll_fs_arc.obj: ..\..\src\common\fs_arc.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fs_arc.cpp - -$(OBJS)\basedll_fs_filter.obj: ..\..\src\common\fs_filter.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fs_filter.cpp - -$(OBJS)\basedll_hash.obj: ..\..\src\common\hash.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\hash.cpp - -$(OBJS)\basedll_hashmap.obj: ..\..\src\common\hashmap.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\hashmap.cpp - -$(OBJS)\basedll_init.obj: ..\..\src\common\init.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\init.cpp - -$(OBJS)\basedll_intl.obj: ..\..\src\common\intl.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\intl.cpp - -$(OBJS)\basedll_ipcbase.obj: ..\..\src\common\ipcbase.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ipcbase.cpp - -$(OBJS)\basedll_languageinfo.obj: ..\..\src\common\languageinfo.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\languageinfo.cpp - -$(OBJS)\basedll_list.obj: ..\..\src\common\list.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\list.cpp - -$(OBJS)\basedll_log.obj: ..\..\src\common\log.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\log.cpp - -$(OBJS)\basedll_longlong.obj: ..\..\src\common\longlong.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\longlong.cpp - -$(OBJS)\basedll_memory.obj: ..\..\src\common\memory.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\memory.cpp - -$(OBJS)\basedll_mimecmn.obj: ..\..\src\common\mimecmn.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\mimecmn.cpp - -$(OBJS)\basedll_module.obj: ..\..\src\common\module.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\module.cpp - -$(OBJS)\basedll_mstream.obj: ..\..\src\common\mstream.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\mstream.cpp - -$(OBJS)\basedll_numformatter.obj: ..\..\src\common\numformatter.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\numformatter.cpp - -$(OBJS)\basedll_object.obj: ..\..\src\common\object.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\object.cpp - -$(OBJS)\basedll_platinfo.obj: ..\..\src\common\platinfo.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\platinfo.cpp - -$(OBJS)\basedll_powercmn.obj: ..\..\src\common\powercmn.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\powercmn.cpp - -$(OBJS)\basedll_process.obj: ..\..\src\common\process.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\process.cpp - -$(OBJS)\basedll_regex.obj: ..\..\src\common\regex.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\regex.cpp - -$(OBJS)\basedll_stdpbase.obj: ..\..\src\common\stdpbase.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stdpbase.cpp - -$(OBJS)\basedll_sstream.obj: ..\..\src\common\sstream.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\sstream.cpp - -$(OBJS)\basedll_stdstream.obj: ..\..\src\common\stdstream.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stdstream.cpp - -$(OBJS)\basedll_stopwatch.obj: ..\..\src\common\stopwatch.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp - -$(OBJS)\basedll_strconv.obj: ..\..\src\common\strconv.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\strconv.cpp - -$(OBJS)\basedll_stream.obj: ..\..\src\common\stream.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stream.cpp - -$(OBJS)\basedll_string.obj: ..\..\src\common\string.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\string.cpp - -$(OBJS)\basedll_stringimpl.obj: ..\..\src\common\stringimpl.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stringimpl.cpp - -$(OBJS)\basedll_stringops.obj: ..\..\src\common\stringops.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stringops.cpp - -$(OBJS)\basedll_strvararg.obj: ..\..\src\common\strvararg.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\strvararg.cpp - -$(OBJS)\basedll_sysopt.obj: ..\..\src\common\sysopt.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\sysopt.cpp - -$(OBJS)\basedll_tarstrm.obj: ..\..\src\common\tarstrm.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\tarstrm.cpp - -$(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textbuf.cpp - -$(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textfile.cpp - -$(OBJS)\basedll_threadinfo.obj: ..\..\src\common\threadinfo.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\threadinfo.cpp - -$(OBJS)\basedll_time.obj: ..\..\src\common\time.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\time.cpp - -$(OBJS)\basedll_timercmn.obj: ..\..\src\common\timercmn.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timercmn.cpp - -$(OBJS)\basedll_timerimpl.obj: ..\..\src\common\timerimpl.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timerimpl.cpp - -$(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\tokenzr.cpp - -$(OBJS)\basedll_translation.obj: ..\..\src\common\translation.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\translation.cpp - -$(OBJS)\basedll_txtstrm.obj: ..\..\src\common\txtstrm.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\txtstrm.cpp - -$(OBJS)\basedll_unichar.obj: ..\..\src\common\unichar.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\unichar.cpp - -$(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\uri.cpp - -$(OBJS)\basedll_ustring.obj: ..\..\src\common\ustring.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ustring.cpp - -$(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\variant.cpp - -$(OBJS)\basedll_wfstream.obj: ..\..\src\common\wfstream.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wfstream.cpp - -$(OBJS)\basedll_wxcrt.obj: ..\..\src\common\wxcrt.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wxcrt.cpp - -$(OBJS)\basedll_wxprintf.obj: ..\..\src\common\wxprintf.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wxprintf.cpp - -$(OBJS)\basedll_xlocale.obj: ..\..\src\common\xlocale.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xlocale.cpp - -$(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xti.cpp - -$(OBJS)\basedll_xtistrm.obj: ..\..\src\common\xtistrm.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xtistrm.cpp - -$(OBJS)\basedll_zipstrm.obj: ..\..\src\common\zipstrm.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\zipstrm.cpp - -$(OBJS)\basedll_zstream.obj: ..\..\src\common\zstream.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\zstream.cpp - -$(OBJS)\basedll_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp - -$(OBJS)\basedll_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp - -$(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp - -$(OBJS)\basedll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\crashrpt.cpp - -$(OBJS)\basedll_debughlp.obj: ..\..\src\msw\debughlp.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\debughlp.cpp - -$(OBJS)\basedll_dde.obj: ..\..\src\msw\dde.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dde.cpp - -$(OBJS)\basedll_dir.obj: ..\..\src\msw\dir.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dir.cpp - -$(OBJS)\basedll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dlmsw.cpp - -$(OBJS)\basedll_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp - -$(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\mimetype.cpp - -$(OBJS)\basedll_power.obj: ..\..\src\msw\power.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\power.cpp - -$(OBJS)\basedll_regconf.obj: ..\..\src\msw\regconf.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\regconf.cpp - -$(OBJS)\basedll_registry.obj: ..\..\src\msw\registry.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\registry.cpp - -$(OBJS)\basedll_snglinst.obj: ..\..\src\msw\snglinst.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\snglinst.cpp - -$(OBJS)\basedll_stackwalk.obj: ..\..\src\msw\stackwalk.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\stackwalk.cpp - -$(OBJS)\basedll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\stdpaths.cpp - -$(OBJS)\basedll_thread.obj: ..\..\src\msw\thread.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\thread.cpp - -$(OBJS)\basedll_timer.obj: ..\..\src\msw\timer.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\timer.cpp - -$(OBJS)\basedll_utils.obj: ..\..\src\msw\utils.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\utils.cpp - -$(OBJS)\basedll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\utilsexc.cpp - -$(OBJS)\basedll_fswatcher.obj: ..\..\src\msw\fswatcher.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\fswatcher.cpp - -$(OBJS)\basedll_event.obj: ..\..\src\common\event.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\event.cpp - -$(OBJS)\basedll_fs_mem.obj: ..\..\src\common\fs_mem.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fs_mem.cpp - -$(OBJS)\basedll_msgout.obj: ..\..\src\common\msgout.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\msgout.cpp - -$(OBJS)\basedll_utilscmn.obj: ..\..\src\common\utilscmn.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp - -$(OBJS)\basedll_main.obj: ..\..\src\msw\main.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\main.cpp - -$(OBJS)\basedll_mslu.obj: ..\..\src\msw\mslu.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\mslu.cpp - -$(OBJS)\basedll_volume.obj: ..\..\src\msw\volume.cpp - $(CXX) -q -c -P -o$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\volume.cpp - -$(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\baselib_any.obj: ..\..\src\common\any.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\any.cpp - -$(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\appbase.cpp - -$(OBJS)\baselib_arcall.obj: ..\..\src\common\arcall.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\arcall.cpp - -$(OBJS)\baselib_arcfind.obj: ..\..\src\common\arcfind.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\arcfind.cpp - -$(OBJS)\baselib_archive.obj: ..\..\src\common\archive.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\archive.cpp - -$(OBJS)\baselib_arrstr.obj: ..\..\src\common\arrstr.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\arrstr.cpp - -$(OBJS)\baselib_base64.obj: ..\..\src\common\base64.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\base64.cpp - -$(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\clntdata.cpp - -$(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\cmdline.cpp - -$(OBJS)\baselib_config.obj: ..\..\src\common\config.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\config.cpp - -$(OBJS)\baselib_convauto.obj: ..\..\src\common\convauto.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\convauto.cpp - -$(OBJS)\baselib_datetime.obj: ..\..\src\common\datetime.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datetime.cpp - -$(OBJS)\baselib_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datetimefmt.cpp - -$(OBJS)\baselib_datstrm.obj: ..\..\src\common\datstrm.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datstrm.cpp - -$(OBJS)\baselib_dircmn.obj: ..\..\src\common\dircmn.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dircmn.cpp - -$(OBJS)\baselib_dynarray.obj: ..\..\src\common\dynarray.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynarray.cpp - -$(OBJS)\baselib_dynlib.obj: ..\..\src\common\dynlib.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynlib.cpp - -$(OBJS)\baselib_dynload.obj: ..\..\src\common\dynload.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynload.cpp - -$(OBJS)\baselib_encconv.obj: ..\..\src\common\encconv.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\encconv.cpp - -$(OBJS)\baselib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp - -$(OBJS)\baselib_extended.obj: ..\..\src\common\extended.c - $(CC) -q -c -P- -o$@ $(BASELIB_CFLAGS) ..\..\src\common\extended.c - -$(OBJS)\baselib_ffile.obj: ..\..\src\common\ffile.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ffile.cpp - -$(OBJS)\baselib_file.obj: ..\..\src\common\file.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\file.cpp - -$(OBJS)\baselib_fileback.obj: ..\..\src\common\fileback.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fileback.cpp - -$(OBJS)\baselib_fileconf.obj: ..\..\src\common\fileconf.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fileconf.cpp - -$(OBJS)\baselib_filefn.obj: ..\..\src\common\filefn.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filefn.cpp - -$(OBJS)\baselib_filename.obj: ..\..\src\common\filename.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filename.cpp - -$(OBJS)\baselib_filesys.obj: ..\..\src\common\filesys.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filesys.cpp - -$(OBJS)\baselib_filtall.obj: ..\..\src\common\filtall.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filtall.cpp - -$(OBJS)\baselib_filtfind.obj: ..\..\src\common\filtfind.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filtfind.cpp - -$(OBJS)\baselib_fmapbase.obj: ..\..\src\common\fmapbase.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fmapbase.cpp - -$(OBJS)\baselib_fs_arc.obj: ..\..\src\common\fs_arc.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fs_arc.cpp - -$(OBJS)\baselib_fs_filter.obj: ..\..\src\common\fs_filter.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fs_filter.cpp - -$(OBJS)\baselib_hash.obj: ..\..\src\common\hash.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\hash.cpp - -$(OBJS)\baselib_hashmap.obj: ..\..\src\common\hashmap.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\hashmap.cpp - -$(OBJS)\baselib_init.obj: ..\..\src\common\init.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\init.cpp - -$(OBJS)\baselib_intl.obj: ..\..\src\common\intl.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\intl.cpp - -$(OBJS)\baselib_ipcbase.obj: ..\..\src\common\ipcbase.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ipcbase.cpp - -$(OBJS)\baselib_languageinfo.obj: ..\..\src\common\languageinfo.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\languageinfo.cpp - -$(OBJS)\baselib_list.obj: ..\..\src\common\list.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\list.cpp - -$(OBJS)\baselib_log.obj: ..\..\src\common\log.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\log.cpp - -$(OBJS)\baselib_longlong.obj: ..\..\src\common\longlong.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\longlong.cpp - -$(OBJS)\baselib_memory.obj: ..\..\src\common\memory.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\memory.cpp - -$(OBJS)\baselib_mimecmn.obj: ..\..\src\common\mimecmn.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\mimecmn.cpp - -$(OBJS)\baselib_module.obj: ..\..\src\common\module.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\module.cpp - -$(OBJS)\baselib_mstream.obj: ..\..\src\common\mstream.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\mstream.cpp - -$(OBJS)\baselib_numformatter.obj: ..\..\src\common\numformatter.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\numformatter.cpp - -$(OBJS)\baselib_object.obj: ..\..\src\common\object.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\object.cpp - -$(OBJS)\baselib_platinfo.obj: ..\..\src\common\platinfo.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\platinfo.cpp - -$(OBJS)\baselib_powercmn.obj: ..\..\src\common\powercmn.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\powercmn.cpp - -$(OBJS)\baselib_process.obj: ..\..\src\common\process.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\process.cpp - -$(OBJS)\baselib_regex.obj: ..\..\src\common\regex.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\regex.cpp - -$(OBJS)\baselib_stdpbase.obj: ..\..\src\common\stdpbase.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stdpbase.cpp - -$(OBJS)\baselib_sstream.obj: ..\..\src\common\sstream.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\sstream.cpp - -$(OBJS)\baselib_stdstream.obj: ..\..\src\common\stdstream.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stdstream.cpp - -$(OBJS)\baselib_stopwatch.obj: ..\..\src\common\stopwatch.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp - -$(OBJS)\baselib_strconv.obj: ..\..\src\common\strconv.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\strconv.cpp - -$(OBJS)\baselib_stream.obj: ..\..\src\common\stream.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stream.cpp - -$(OBJS)\baselib_string.obj: ..\..\src\common\string.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\string.cpp - -$(OBJS)\baselib_stringimpl.obj: ..\..\src\common\stringimpl.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stringimpl.cpp - -$(OBJS)\baselib_stringops.obj: ..\..\src\common\stringops.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stringops.cpp - -$(OBJS)\baselib_strvararg.obj: ..\..\src\common\strvararg.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\strvararg.cpp - -$(OBJS)\baselib_sysopt.obj: ..\..\src\common\sysopt.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\sysopt.cpp - -$(OBJS)\baselib_tarstrm.obj: ..\..\src\common\tarstrm.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\tarstrm.cpp - -$(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textbuf.cpp - -$(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textfile.cpp - -$(OBJS)\baselib_threadinfo.obj: ..\..\src\common\threadinfo.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\threadinfo.cpp - -$(OBJS)\baselib_time.obj: ..\..\src\common\time.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\time.cpp - -$(OBJS)\baselib_timercmn.obj: ..\..\src\common\timercmn.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timercmn.cpp - -$(OBJS)\baselib_timerimpl.obj: ..\..\src\common\timerimpl.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timerimpl.cpp - -$(OBJS)\baselib_tokenzr.obj: ..\..\src\common\tokenzr.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\tokenzr.cpp - -$(OBJS)\baselib_translation.obj: ..\..\src\common\translation.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\translation.cpp - -$(OBJS)\baselib_txtstrm.obj: ..\..\src\common\txtstrm.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\txtstrm.cpp - -$(OBJS)\baselib_unichar.obj: ..\..\src\common\unichar.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\unichar.cpp - -$(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\uri.cpp - -$(OBJS)\baselib_ustring.obj: ..\..\src\common\ustring.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ustring.cpp - -$(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\variant.cpp - -$(OBJS)\baselib_wfstream.obj: ..\..\src\common\wfstream.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wfstream.cpp - -$(OBJS)\baselib_wxcrt.obj: ..\..\src\common\wxcrt.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wxcrt.cpp - -$(OBJS)\baselib_wxprintf.obj: ..\..\src\common\wxprintf.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wxprintf.cpp - -$(OBJS)\baselib_xlocale.obj: ..\..\src\common\xlocale.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xlocale.cpp - -$(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xti.cpp - -$(OBJS)\baselib_xtistrm.obj: ..\..\src\common\xtistrm.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xtistrm.cpp - -$(OBJS)\baselib_zipstrm.obj: ..\..\src\common\zipstrm.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\zipstrm.cpp - -$(OBJS)\baselib_zstream.obj: ..\..\src\common\zstream.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\zstream.cpp - -$(OBJS)\baselib_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp - -$(OBJS)\baselib_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp - -$(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp - -$(OBJS)\baselib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\crashrpt.cpp - -$(OBJS)\baselib_debughlp.obj: ..\..\src\msw\debughlp.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\debughlp.cpp - -$(OBJS)\baselib_dde.obj: ..\..\src\msw\dde.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dde.cpp - -$(OBJS)\baselib_dir.obj: ..\..\src\msw\dir.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dir.cpp - -$(OBJS)\baselib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp - -$(OBJS)\baselib_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp - -$(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp - -$(OBJS)\baselib_power.obj: ..\..\src\msw\power.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\power.cpp - -$(OBJS)\baselib_regconf.obj: ..\..\src\msw\regconf.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\regconf.cpp - -$(OBJS)\baselib_registry.obj: ..\..\src\msw\registry.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\registry.cpp - -$(OBJS)\baselib_snglinst.obj: ..\..\src\msw\snglinst.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\snglinst.cpp - -$(OBJS)\baselib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\stackwalk.cpp - -$(OBJS)\baselib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\stdpaths.cpp - -$(OBJS)\baselib_thread.obj: ..\..\src\msw\thread.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\thread.cpp - -$(OBJS)\baselib_timer.obj: ..\..\src\msw\timer.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\timer.cpp - -$(OBJS)\baselib_utils.obj: ..\..\src\msw\utils.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\utils.cpp - -$(OBJS)\baselib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp - -$(OBJS)\baselib_fswatcher.obj: ..\..\src\msw\fswatcher.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\fswatcher.cpp - -$(OBJS)\baselib_event.obj: ..\..\src\common\event.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\event.cpp - -$(OBJS)\baselib_fs_mem.obj: ..\..\src\common\fs_mem.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fs_mem.cpp - -$(OBJS)\baselib_msgout.obj: ..\..\src\common\msgout.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\msgout.cpp - -$(OBJS)\baselib_utilscmn.obj: ..\..\src\common\utilscmn.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp - -$(OBJS)\baselib_main.obj: ..\..\src\msw\main.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\main.cpp - -$(OBJS)\baselib_mslu.obj: ..\..\src\msw\mslu.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\mslu.cpp - -$(OBJS)\baselib_volume.obj: ..\..\src\msw\volume.cpp - $(CXX) -q -c -P -o$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\volume.cpp - -$(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\netdll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET ..\..\src\msw\version.rc - -$(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp - $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp - -$(OBJS)\netdll_ftp.obj: ..\..\src\common\ftp.cpp - $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) ..\..\src\common\ftp.cpp - -$(OBJS)\netdll_http.obj: ..\..\src\common\http.cpp - $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) ..\..\src\common\http.cpp - -$(OBJS)\netdll_protocol.obj: ..\..\src\common\protocol.cpp - $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) ..\..\src\common\protocol.cpp - -$(OBJS)\netdll_sckaddr.obj: ..\..\src\common\sckaddr.cpp - $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckaddr.cpp - -$(OBJS)\netdll_sckfile.obj: ..\..\src\common\sckfile.cpp - $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckfile.cpp - -$(OBJS)\netdll_sckipc.obj: ..\..\src\common\sckipc.cpp - $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckipc.cpp - -$(OBJS)\netdll_sckstrm.obj: ..\..\src\common\sckstrm.cpp - $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckstrm.cpp - -$(OBJS)\netdll_socket.obj: ..\..\src\common\socket.cpp - $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) ..\..\src\common\socket.cpp - -$(OBJS)\netdll_url.obj: ..\..\src\common\url.cpp - $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) ..\..\src\common\url.cpp - -$(OBJS)\netdll_sockmsw.obj: ..\..\src\msw\sockmsw.cpp - $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) ..\..\src\msw\sockmsw.cpp - -$(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp - $(CXX) -q -c -P -o$@ $(NETDLL_CXXFLAGS) ..\..\src\msw\urlmsw.cpp - -$(OBJS)\netlib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\netlib_fs_inet.obj: ..\..\src\common\fs_inet.cpp - $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) ..\..\src\common\fs_inet.cpp - -$(OBJS)\netlib_ftp.obj: ..\..\src\common\ftp.cpp - $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) ..\..\src\common\ftp.cpp - -$(OBJS)\netlib_http.obj: ..\..\src\common\http.cpp - $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) ..\..\src\common\http.cpp - -$(OBJS)\netlib_protocol.obj: ..\..\src\common\protocol.cpp - $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) ..\..\src\common\protocol.cpp - -$(OBJS)\netlib_sckaddr.obj: ..\..\src\common\sckaddr.cpp - $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckaddr.cpp - -$(OBJS)\netlib_sckfile.obj: ..\..\src\common\sckfile.cpp - $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckfile.cpp - -$(OBJS)\netlib_sckipc.obj: ..\..\src\common\sckipc.cpp - $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckipc.cpp - -$(OBJS)\netlib_sckstrm.obj: ..\..\src\common\sckstrm.cpp - $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckstrm.cpp - -$(OBJS)\netlib_socket.obj: ..\..\src\common\socket.cpp - $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) ..\..\src\common\socket.cpp - -$(OBJS)\netlib_url.obj: ..\..\src\common\url.cpp - $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) ..\..\src\common\url.cpp - -$(OBJS)\netlib_sockmsw.obj: ..\..\src\msw\sockmsw.cpp - $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) ..\..\src\msw\sockmsw.cpp - -$(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp - $(CXX) -q -c -P -o$@ $(NETLIB_CXXFLAGS) ..\..\src\msw\urlmsw.cpp - -$(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\coredll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 ..\..\src\msw\version.rc - -$(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\event.cpp - -$(OBJS)\coredll_fs_mem.obj: ..\..\src\common\fs_mem.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fs_mem.cpp - -$(OBJS)\coredll_msgout.obj: ..\..\src\common\msgout.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\msgout.cpp - -$(OBJS)\coredll_utilscmn.obj: ..\..\src\common\utilscmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp - -$(OBJS)\coredll_main.obj: ..\..\src\msw\main.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\main.cpp - -$(OBJS)\coredll_mslu.obj: ..\..\src\msw\mslu.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\mslu.cpp - -$(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\volume.cpp - -$(OBJS)\coredll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp - -$(OBJS)\coredll_msw_accel.obj: ..\..\src\msw\accel.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\accel.cpp - -$(OBJS)\coredll_anybutton.obj: ..\..\src\msw\anybutton.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp - -$(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp - -$(OBJS)\coredll_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp - -$(OBJS)\coredll_msw_button.obj: ..\..\src\msw\button.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\button.cpp - -$(OBJS)\coredll_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp - -$(OBJS)\coredll_msw_choice.obj: ..\..\src\msw\choice.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\choice.cpp - -$(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp - -$(OBJS)\coredll_combo.obj: ..\..\src\msw\combo.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combo.cpp - -$(OBJS)\coredll_msw_combobox.obj: ..\..\src\msw\combobox.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combobox.cpp - -$(OBJS)\coredll_msw_control.obj: ..\..\src\msw\control.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\control.cpp - -$(OBJS)\coredll_msw_dialog.obj: ..\..\src\msw\dialog.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dialog.cpp - -$(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp - -$(OBJS)\coredll_dragimag.obj: ..\..\src\msw\dragimag.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp - -$(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\filedlg.cpp - -$(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\frame.cpp - -$(OBJS)\coredll_msw_gauge.obj: ..\..\src\msw\gauge.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge.cpp - -$(OBJS)\coredll_headerctrl.obj: ..\..\src\msw\headerctrl.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\headerctrl.cpp - -$(OBJS)\coredll_iniconf.obj: ..\..\src\msw\iniconf.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp - -$(OBJS)\coredll_msw_listbox.obj: ..\..\src\msw\listbox.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listbox.cpp - -$(OBJS)\coredll_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp - -$(OBJS)\coredll_mdi.obj: ..\..\src\msw\mdi.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\mdi.cpp - -$(OBJS)\coredll_msw_menu.obj: ..\..\src\msw\menu.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menu.cpp - -$(OBJS)\coredll_menuitem.obj: ..\..\src\msw\menuitem.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp - -$(OBJS)\coredll_metafile.obj: ..\..\src\msw\metafile.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\metafile.cpp - -$(OBJS)\coredll_msgdlg.obj: ..\..\src\msw\msgdlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\msgdlg.cpp - -$(OBJS)\coredll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativdlg.cpp - -$(OBJS)\coredll_nativewin.obj: ..\..\src\msw\nativewin.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp - -$(OBJS)\coredll_msw_notebook.obj: ..\..\src\msw\notebook.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\notebook.cpp - -$(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp - -$(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp - -$(OBJS)\coredll_panel.obj: ..\..\src\msw\panel.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\panel.cpp - -$(OBJS)\coredll_progdlg.obj: ..\..\src\msw\progdlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp - -$(OBJS)\coredll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp - -$(OBJS)\coredll_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp - -$(OBJS)\coredll_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp - -$(OBJS)\coredll_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp - -$(OBJS)\coredll_msw_slider.obj: ..\..\src\msw\slider.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider.cpp - -$(OBJS)\coredll_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp - -$(OBJS)\coredll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp - -$(OBJS)\coredll_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp - -$(OBJS)\coredll_msw_statbox.obj: ..\..\src\msw\statbox.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbox.cpp - -$(OBJS)\coredll_statusbar.obj: ..\..\src\msw\statusbar.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp - -$(OBJS)\coredll_msw_statline.obj: ..\..\src\msw\statline.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statline.cpp - -$(OBJS)\coredll_msw_stattext.obj: ..\..\src\msw\stattext.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\stattext.cpp - -$(OBJS)\coredll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp - -$(OBJS)\coredll_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp - -$(OBJS)\coredll_textentry.obj: ..\..\src\msw\textentry.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textentry.cpp - -$(OBJS)\coredll_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp - -$(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp - -$(OBJS)\coredll_msw_checklst.obj: ..\..\src\msw\checklst.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checklst.cpp - -$(OBJS)\coredll_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp - -$(OBJS)\coredll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp - -$(OBJS)\coredll_generic_accel.obj: ..\..\src\generic\accel.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\accel.cpp - -$(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp - -$(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp - -$(OBJS)\coredll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp - -$(OBJS)\coredll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp - -$(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp - -$(OBJS)\coredll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp - -$(OBJS)\coredll_mdig.obj: ..\..\src\generic\mdig.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\mdig.cpp - -$(OBJS)\coredll_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp - -$(OBJS)\coredll_univ_button.obj: ..\..\src\univ\button.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\button.cpp - -$(OBJS)\coredll_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp - -$(OBJS)\coredll_univ_checklst.obj: ..\..\src\univ\checklst.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checklst.cpp - -$(OBJS)\coredll_univ_choice.obj: ..\..\src\univ\choice.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\choice.cpp - -$(OBJS)\coredll_univ_combobox.obj: ..\..\src\univ\combobox.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\combobox.cpp - -$(OBJS)\coredll_univ_control.obj: ..\..\src\univ\control.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\control.cpp - -$(OBJS)\coredll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp - -$(OBJS)\coredll_univ_dialog.obj: ..\..\src\univ\dialog.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\dialog.cpp - -$(OBJS)\coredll_framuniv.obj: ..\..\src\univ\framuniv.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp - -$(OBJS)\coredll_univ_gauge.obj: ..\..\src\univ\gauge.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp - -$(OBJS)\coredll_inpcons.obj: ..\..\src\univ\inpcons.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp - -$(OBJS)\coredll_inphand.obj: ..\..\src\univ\inphand.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inphand.cpp - -$(OBJS)\coredll_univ_listbox.obj: ..\..\src\univ\listbox.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\listbox.cpp - -$(OBJS)\coredll_univ_menu.obj: ..\..\src\univ\menu.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\menu.cpp - -$(OBJS)\coredll_univ_notebook.obj: ..\..\src\univ\notebook.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\notebook.cpp - -$(OBJS)\coredll_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp - -$(OBJS)\coredll_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp - -$(OBJS)\coredll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp - -$(OBJS)\coredll_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp - -$(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp - -$(OBJS)\coredll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp - -$(OBJS)\coredll_univ_slider.obj: ..\..\src\univ\slider.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp - -$(OBJS)\coredll_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp - -$(OBJS)\coredll_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp - -$(OBJS)\coredll_univ_statbox.obj: ..\..\src\univ\statbox.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbox.cpp - -$(OBJS)\coredll_univ_statline.obj: ..\..\src\univ\statline.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statline.cpp - -$(OBJS)\coredll_univ_stattext.obj: ..\..\src\univ\stattext.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stattext.cpp - -$(OBJS)\coredll_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp - -$(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp - -$(OBJS)\coredll_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp - -$(OBJS)\coredll_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp - -$(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\theme.cpp - -$(OBJS)\coredll_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp - -$(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp - -$(OBJS)\coredll_winuniv.obj: ..\..\src\univ\winuniv.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\winuniv.cpp - -$(OBJS)\coredll_gtk.obj: ..\..\src\univ\themes\gtk.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp - -$(OBJS)\coredll_metal.obj: ..\..\src\univ\themes\metal.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\metal.cpp - -$(OBJS)\coredll_mono.obj: ..\..\src\univ\themes\mono.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\mono.cpp - -$(OBJS)\coredll_win32.obj: ..\..\src\univ\themes\win32.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_activex.obj: ..\..\src\msw\ole\activex.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_app.obj: ..\..\src\msw\app.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\app.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_bitmap.obj: ..\..\src\msw\bitmap.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\bitmap.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_brush.obj: ..\..\src\msw\brush.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\brush.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_caret.obj: ..\..\src\msw\caret.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\caret.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_clipbrd.obj: ..\..\src\msw\clipbrd.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\clipbrd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_colour.obj: ..\..\src\msw\colour.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\colour.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_cursor.obj: ..\..\src\msw\cursor.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\cursor.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_data.obj: ..\..\src\msw\data.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\data.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dc.obj: ..\..\src\msw\dc.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcclient.obj: ..\..\src\msw\dcclient.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcclient.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcmemory.obj: ..\..\src\msw\dcmemory.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcmemory.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcprint.obj: ..\..\src\msw\dcprint.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcprint.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcscreen.obj: ..\..\src\msw\dcscreen.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcscreen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dialup.obj: ..\..\src\msw\dialup.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dialup.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dib.obj: ..\..\src\msw\dib.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dib.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_display.obj: ..\..\src\msw\display.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\display.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\enhmeta.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_font.obj: ..\..\src\msw\font.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\font.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontenum.obj: ..\..\src\msw\fontenum.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontenum.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontutil.obj: ..\..\src\msw\fontutil.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontutil.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiimage.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiobj.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiplus.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_graphics.obj: ..\..\src\msw\graphics.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\graphics.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_icon.obj: ..\..\src\msw\icon.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\icon.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_safearray.obj: ..\..\src\msw\ole\safearray.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_palette.obj: ..\..\src\msw\palette.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\palette.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_pen.obj: ..\..\src\msw\pen.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\pen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_popupwin.obj: ..\..\src\msw\popupwin.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\popupwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_printdlg.obj: ..\..\src\msw\printdlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\printdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_printwin.obj: ..\..\src\msw\printwin.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\printwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_region.obj: ..\..\src\msw\region.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\region.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_renderer.obj: ..\..\src\msw\renderer.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\renderer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_settings.obj: ..\..\src\msw\settings.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\settings.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_toplevel.obj: ..\..\src\msw\toplevel.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_uiaction.obj: ..\..\src\msw\uiaction.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_utilswin.obj: ..\..\src\msw\utilswin.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilswin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_window.obj: ..\..\src\msw\window.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\window.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\helpchm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\helpwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_automtn.obj: ..\..\src\msw\ole\automtn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\collpaneg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filepickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_accesscmn.obj: ..\..\src\common\accesscmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accesscmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_anidecod.obj: ..\..\src\common\anidecod.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\anidecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_appcmn.obj: ..\..\src\common\appcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\appcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_artprov.obj: ..\..\src\common\artprov.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\artprov.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_artstd.obj: ..\..\src\common\artstd.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\artstd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_arttango.obj: ..\..\src\common\arttango.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\arttango.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_btncmn.obj: ..\..\src\common\btncmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\btncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_cairo.obj: ..\..\src\common\cairo.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cairo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_choiccmn.obj: ..\..\src\common\choiccmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\clipcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_colourcmn.obj: ..\..\src\common\colourcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_colourdata.obj: ..\..\src\common\colourdata.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourdata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\combocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cmdproc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_cmndata.obj: ..\..\src\common\cmndata.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cmndata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_containr.obj: ..\..\src\common\containr.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\containr.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_cshelp.obj: ..\..\src\common\cshelp.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cshelp.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcbase.obj: ..\..\src\common\dcbase.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcgraph.obj: ..\..\src\common\dcgraph.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcgraph.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcsvg.obj: ..\..\src\common\dcsvg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dndcmn.obj: ..\..\src\common\dndcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dndcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dobjcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_docmdi.obj: ..\..\src\common\docmdi.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\docmdi.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_docview.obj: ..\..\src\common\docview.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\docview.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dpycmn.obj: ..\..\src\common\dpycmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dpycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dseldlg.obj: ..\..\src\common\dseldlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dseldlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_effects.obj: ..\..\src\common\effects.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\effects.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_filehistorycmn.obj: ..\..\src\common\filehistorycmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\filehistorycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\filepickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontcmn.obj: ..\..\src\common\fontcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontdata.obj: ..\..\src\common\fontdata.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontdata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_graphicc.obj: ..\..\src\generic\graphicc.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\graphicc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontmap.obj: ..\..\src\common\fontmap.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontmap.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_framecmn.obj: ..\..\src\common\framecmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\framecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gaugecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gbsizer.obj: ..\..\src\common\gbsizer.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gbsizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gdicmn.obj: ..\..\src\common\gdicmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gdicmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_geometry.obj: ..\..\src\common\geometry.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\geometry.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gifdecod.obj: ..\..\src\common\gifdecod.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gifdecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_graphcmn.obj: ..\..\src\common\graphcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_helpbase.obj: ..\..\src\common\helpbase.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\helpbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_iconbndl.obj: ..\..\src\common\iconbndl.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\iconbndl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagall.obj: ..\..\src\common\imagall.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagall.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagbmp.obj: ..\..\src\common\imagbmp.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagbmp.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_image.obj: ..\..\src\common\image.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\image.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagfill.obj: ..\..\src\common\imagfill.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagfill.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imaggif.obj: ..\..\src\common\imaggif.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imaggif.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagiff.obj: ..\..\src\common\imagiff.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagiff.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagjpeg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagpcx.obj: ..\..\src\common\imagpcx.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagpcx.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagpng.obj: ..\..\src\common\imagpng.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagpng.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagpnm.obj: ..\..\src\common\imagpnm.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagpnm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagtga.obj: ..\..\src\common\imagtga.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagtga.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagtiff.obj: ..\..\src\common\imagtiff.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagtiff.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagxpm.obj: ..\..\src\common\imagxpm.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagxpm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_layout.obj: ..\..\src\common\layout.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\layout.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\lboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_markupparser.obj: ..\..\src\common\markupparser.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\markupparser.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_matrix.obj: ..\..\src\common\matrix.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\matrix.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_menucmn.obj: ..\..\src\common\menucmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\menucmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_modalhook.obj: ..\..\src\common\modalhook.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\modalhook.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_mousemanager.obj: ..\..\src\common\mousemanager.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_panelcmn.obj: ..\..\src\common\panelcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_pickerbase.obj: ..\..\src\common\pickerbase.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\preferencescmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_prntbase.obj: ..\..\src\common\prntbase.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\prntbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_quantize.obj: ..\..\src\common\quantize.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\quantize.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_radiocmn.obj: ..\..\src\common\radiocmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_rendcmn.obj: ..\..\src\common\rendcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rendcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_rgncmn.obj: ..\..\src\common\rgncmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_settcmn.obj: ..\..\src\common\settcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\settcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\sizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_slidercmn.obj: ..\..\src\common\slidercmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_srchcmn.obj: ..\..\src\common\srchcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\srchcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_stockitem.obj: ..\..\src\common\stockitem.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\stockitem.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_tbarbase.obj: ..\..\src\common\tbarbase.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\tbarbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_treebase.obj: ..\..\src\common\treebase.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\treebase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_uiactioncmn.obj: ..\..\src\common\uiactioncmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\uiactioncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_valgen.obj: ..\..\src\common\valgen.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valgen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_validate.obj: ..\..\src\common\validate.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\validate.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_valtext.obj: ..\..\src\common\valtext.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valtext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_valnum.obj: ..\..\src\common\valnum.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valnum.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_wincmn.obj: ..\..\src\common\wincmn.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\wincmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_windowid.obj: ..\..\src\common\windowid.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\windowid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\busyinfo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\buttonbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\choicdgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\choicbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\combog.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dcpsg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dragimgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_filectrlg.obj: ..\..\src\generic\filectrlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filectrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_infobar.obj: ..\..\src\generic\infobar.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\infobar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_logg.obj: ..\..\src\generic\logg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\logg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_markuptext.obj: ..\..\src\generic\markuptext.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\markuptext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\numdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_preferencesg.obj: ..\..\src\generic\preferencesg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\preferencesg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_printps.obj: ..\..\src\generic\printps.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\printps.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_renderg.obj: ..\..\src\generic\renderg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\renderg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\scrlwing.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_selstore.obj: ..\..\src\generic\selstore.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\selstore.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_spinctlg.obj: ..\..\src\generic\spinctlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\spinctlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_splitter.obj: ..\..\src\generic\splitter.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\splitter.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\srchctlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_statbmpg.obj: ..\..\src\generic\statbmpg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statbmpg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_stattextg.obj: ..\..\src\generic\stattextg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_tipwin.obj: ..\..\src\generic\tipwin.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_treebkg.obj: ..\..\src\generic\treebkg.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_vlbox.obj: ..\..\src\generic\vlbox.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vlbox.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_vscroll.obj: ..\..\src\generic\vscroll.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp - $(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp -!endif - -$(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\corelib_event.obj: ..\..\src\common\event.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\event.cpp - -$(OBJS)\corelib_fs_mem.obj: ..\..\src\common\fs_mem.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fs_mem.cpp - -$(OBJS)\corelib_msgout.obj: ..\..\src\common\msgout.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\msgout.cpp - -$(OBJS)\corelib_utilscmn.obj: ..\..\src\common\utilscmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp - -$(OBJS)\corelib_main.obj: ..\..\src\msw\main.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\main.cpp - -$(OBJS)\corelib_mslu.obj: ..\..\src\msw\mslu.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\mslu.cpp - -$(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\volume.cpp - -$(OBJS)\corelib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp - -$(OBJS)\corelib_msw_accel.obj: ..\..\src\msw\accel.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\accel.cpp - -$(OBJS)\corelib_anybutton.obj: ..\..\src\msw\anybutton.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp - -$(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp - -$(OBJS)\corelib_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp - -$(OBJS)\corelib_msw_button.obj: ..\..\src\msw\button.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\button.cpp - -$(OBJS)\corelib_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp - -$(OBJS)\corelib_msw_choice.obj: ..\..\src\msw\choice.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\choice.cpp - -$(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp - -$(OBJS)\corelib_combo.obj: ..\..\src\msw\combo.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combo.cpp - -$(OBJS)\corelib_msw_combobox.obj: ..\..\src\msw\combobox.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combobox.cpp - -$(OBJS)\corelib_msw_control.obj: ..\..\src\msw\control.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\control.cpp - -$(OBJS)\corelib_msw_dialog.obj: ..\..\src\msw\dialog.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dialog.cpp - -$(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp - -$(OBJS)\corelib_dragimag.obj: ..\..\src\msw\dragimag.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp - -$(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp - -$(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\frame.cpp - -$(OBJS)\corelib_msw_gauge.obj: ..\..\src\msw\gauge.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge.cpp - -$(OBJS)\corelib_headerctrl.obj: ..\..\src\msw\headerctrl.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\headerctrl.cpp - -$(OBJS)\corelib_iniconf.obj: ..\..\src\msw\iniconf.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp - -$(OBJS)\corelib_msw_listbox.obj: ..\..\src\msw\listbox.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listbox.cpp - -$(OBJS)\corelib_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp - -$(OBJS)\corelib_mdi.obj: ..\..\src\msw\mdi.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\mdi.cpp - -$(OBJS)\corelib_msw_menu.obj: ..\..\src\msw\menu.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menu.cpp - -$(OBJS)\corelib_menuitem.obj: ..\..\src\msw\menuitem.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp - -$(OBJS)\corelib_metafile.obj: ..\..\src\msw\metafile.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\metafile.cpp - -$(OBJS)\corelib_msgdlg.obj: ..\..\src\msw\msgdlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\msgdlg.cpp - -$(OBJS)\corelib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativdlg.cpp - -$(OBJS)\corelib_nativewin.obj: ..\..\src\msw\nativewin.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp - -$(OBJS)\corelib_msw_notebook.obj: ..\..\src\msw\notebook.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\notebook.cpp - -$(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp - -$(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp - -$(OBJS)\corelib_panel.obj: ..\..\src\msw\panel.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\panel.cpp - -$(OBJS)\corelib_progdlg.obj: ..\..\src\msw\progdlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp - -$(OBJS)\corelib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp - -$(OBJS)\corelib_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp - -$(OBJS)\corelib_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp - -$(OBJS)\corelib_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp - -$(OBJS)\corelib_msw_slider.obj: ..\..\src\msw\slider.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider.cpp - -$(OBJS)\corelib_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp - -$(OBJS)\corelib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp - -$(OBJS)\corelib_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp - -$(OBJS)\corelib_msw_statbox.obj: ..\..\src\msw\statbox.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbox.cpp - -$(OBJS)\corelib_statusbar.obj: ..\..\src\msw\statusbar.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp - -$(OBJS)\corelib_msw_statline.obj: ..\..\src\msw\statline.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statline.cpp - -$(OBJS)\corelib_msw_stattext.obj: ..\..\src\msw\stattext.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\stattext.cpp - -$(OBJS)\corelib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp - -$(OBJS)\corelib_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp - -$(OBJS)\corelib_textentry.obj: ..\..\src\msw\textentry.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textentry.cpp - -$(OBJS)\corelib_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp - -$(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp - -$(OBJS)\corelib_msw_checklst.obj: ..\..\src\msw\checklst.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checklst.cpp - -$(OBJS)\corelib_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp - -$(OBJS)\corelib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp - -$(OBJS)\corelib_generic_accel.obj: ..\..\src\generic\accel.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\accel.cpp - -$(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp - -$(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp - -$(OBJS)\corelib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp - -$(OBJS)\corelib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp - -$(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp - -$(OBJS)\corelib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp - -$(OBJS)\corelib_mdig.obj: ..\..\src\generic\mdig.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\mdig.cpp - -$(OBJS)\corelib_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp - -$(OBJS)\corelib_univ_button.obj: ..\..\src\univ\button.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\button.cpp - -$(OBJS)\corelib_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp - -$(OBJS)\corelib_univ_checklst.obj: ..\..\src\univ\checklst.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checklst.cpp - -$(OBJS)\corelib_univ_choice.obj: ..\..\src\univ\choice.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\choice.cpp - -$(OBJS)\corelib_univ_combobox.obj: ..\..\src\univ\combobox.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\combobox.cpp - -$(OBJS)\corelib_univ_control.obj: ..\..\src\univ\control.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\control.cpp - -$(OBJS)\corelib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp - -$(OBJS)\corelib_univ_dialog.obj: ..\..\src\univ\dialog.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\dialog.cpp - -$(OBJS)\corelib_framuniv.obj: ..\..\src\univ\framuniv.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp - -$(OBJS)\corelib_univ_gauge.obj: ..\..\src\univ\gauge.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp - -$(OBJS)\corelib_inpcons.obj: ..\..\src\univ\inpcons.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp - -$(OBJS)\corelib_inphand.obj: ..\..\src\univ\inphand.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inphand.cpp - -$(OBJS)\corelib_univ_listbox.obj: ..\..\src\univ\listbox.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\listbox.cpp - -$(OBJS)\corelib_univ_menu.obj: ..\..\src\univ\menu.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\menu.cpp - -$(OBJS)\corelib_univ_notebook.obj: ..\..\src\univ\notebook.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\notebook.cpp - -$(OBJS)\corelib_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp - -$(OBJS)\corelib_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp - -$(OBJS)\corelib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp - -$(OBJS)\corelib_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp - -$(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp - -$(OBJS)\corelib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp - -$(OBJS)\corelib_univ_slider.obj: ..\..\src\univ\slider.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp - -$(OBJS)\corelib_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp - -$(OBJS)\corelib_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp - -$(OBJS)\corelib_univ_statbox.obj: ..\..\src\univ\statbox.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbox.cpp - -$(OBJS)\corelib_univ_statline.obj: ..\..\src\univ\statline.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statline.cpp - -$(OBJS)\corelib_univ_stattext.obj: ..\..\src\univ\stattext.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stattext.cpp - -$(OBJS)\corelib_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp - -$(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp - -$(OBJS)\corelib_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp - -$(OBJS)\corelib_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp - -$(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\theme.cpp - -$(OBJS)\corelib_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp - -$(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp - -$(OBJS)\corelib_winuniv.obj: ..\..\src\univ\winuniv.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\winuniv.cpp - -$(OBJS)\corelib_gtk.obj: ..\..\src\univ\themes\gtk.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp - -$(OBJS)\corelib_metal.obj: ..\..\src\univ\themes\metal.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\metal.cpp - -$(OBJS)\corelib_mono.obj: ..\..\src\univ\themes\mono.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\mono.cpp - -$(OBJS)\corelib_win32.obj: ..\..\src\univ\themes\win32.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_activex.obj: ..\..\src\msw\ole\activex.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_app.obj: ..\..\src\msw\app.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\app.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_bitmap.obj: ..\..\src\msw\bitmap.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\bitmap.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_brush.obj: ..\..\src\msw\brush.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\brush.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_caret.obj: ..\..\src\msw\caret.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\caret.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_clipbrd.obj: ..\..\src\msw\clipbrd.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\clipbrd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_colour.obj: ..\..\src\msw\colour.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\colour.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_cursor.obj: ..\..\src\msw\cursor.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\cursor.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_data.obj: ..\..\src\msw\data.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\data.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dc.obj: ..\..\src\msw\dc.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcclient.obj: ..\..\src\msw\dcclient.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcclient.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcmemory.obj: ..\..\src\msw\dcmemory.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcmemory.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcprint.obj: ..\..\src\msw\dcprint.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcprint.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcscreen.obj: ..\..\src\msw\dcscreen.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcscreen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dialup.obj: ..\..\src\msw\dialup.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dialup.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dib.obj: ..\..\src\msw\dib.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dib.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_display.obj: ..\..\src\msw\display.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\display.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_enhmeta.obj: ..\..\src\msw\enhmeta.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\enhmeta.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_font.obj: ..\..\src\msw\font.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\font.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontenum.obj: ..\..\src\msw\fontenum.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontenum.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontutil.obj: ..\..\src\msw\fontutil.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontutil.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gdiimage.obj: ..\..\src\msw\gdiimage.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiimage.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiobj.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiplus.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_graphics.obj: ..\..\src\msw\graphics.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\graphics.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_icon.obj: ..\..\src\msw\icon.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\icon.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imaglist.obj: ..\..\src\msw\imaglist.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\minifram.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_safearray.obj: ..\..\src\msw\ole\safearray.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_palette.obj: ..\..\src\msw\palette.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\palette.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_pen.obj: ..\..\src\msw\pen.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\pen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_popupwin.obj: ..\..\src\msw\popupwin.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\popupwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_printdlg.obj: ..\..\src\msw\printdlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\printdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_printwin.obj: ..\..\src\msw\printwin.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\printwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_region.obj: ..\..\src\msw\region.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\region.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_renderer.obj: ..\..\src\msw\renderer.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\renderer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_settings.obj: ..\..\src\msw\settings.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\settings.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_toplevel.obj: ..\..\src\msw\toplevel.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_uiaction.obj: ..\..\src\msw\uiaction.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_utilswin.obj: ..\..\src\msw\utilswin.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilswin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_window.obj: ..\..\src\msw\window.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\window.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\helpchm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\helpwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_automtn.obj: ..\..\src\msw\ole\automtn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\collpaneg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filepickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_accesscmn.obj: ..\..\src\common\accesscmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accesscmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_anidecod.obj: ..\..\src\common\anidecod.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\anidecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_appcmn.obj: ..\..\src\common\appcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\appcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_artprov.obj: ..\..\src\common\artprov.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\artprov.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_artstd.obj: ..\..\src\common\artstd.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\artstd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_arttango.obj: ..\..\src\common\arttango.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\arttango.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_btncmn.obj: ..\..\src\common\btncmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\btncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_cairo.obj: ..\..\src\common\cairo.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cairo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_choiccmn.obj: ..\..\src\common\choiccmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_clipcmn.obj: ..\..\src\common\clipcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\clipcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_colourcmn.obj: ..\..\src\common\colourcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_colourdata.obj: ..\..\src\common\colourdata.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourdata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_combocmn.obj: ..\..\src\common\combocmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\combocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cmdproc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_cmndata.obj: ..\..\src\common\cmndata.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cmndata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_containr.obj: ..\..\src\common\containr.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\containr.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_cshelp.obj: ..\..\src\common\cshelp.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cshelp.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcbase.obj: ..\..\src\common\dcbase.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcgraph.obj: ..\..\src\common\dcgraph.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcgraph.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcsvg.obj: ..\..\src\common\dcsvg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dndcmn.obj: ..\..\src\common\dndcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dndcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dobjcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_docmdi.obj: ..\..\src\common\docmdi.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\docmdi.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_docview.obj: ..\..\src\common\docview.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\docview.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dpycmn.obj: ..\..\src\common\dpycmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dpycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dseldlg.obj: ..\..\src\common\dseldlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dseldlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_effects.obj: ..\..\src\common\effects.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\effects.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_filehistorycmn.obj: ..\..\src\common\filehistorycmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\filehistorycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\filepickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontcmn.obj: ..\..\src\common\fontcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontdata.obj: ..\..\src\common\fontdata.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontdata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_graphicc.obj: ..\..\src\generic\graphicc.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontmap.obj: ..\..\src\common\fontmap.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontmap.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_framecmn.obj: ..\..\src\common\framecmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\framecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gaugecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gbsizer.obj: ..\..\src\common\gbsizer.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gbsizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gdicmn.obj: ..\..\src\common\gdicmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gdicmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_geometry.obj: ..\..\src\common\geometry.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\geometry.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gifdecod.obj: ..\..\src\common\gifdecod.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gifdecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_graphcmn.obj: ..\..\src\common\graphcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_helpbase.obj: ..\..\src\common\helpbase.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\helpbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_iconbndl.obj: ..\..\src\common\iconbndl.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\iconbndl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagall.obj: ..\..\src\common\imagall.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagall.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagbmp.obj: ..\..\src\common\imagbmp.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagbmp.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_image.obj: ..\..\src\common\image.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\image.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagfill.obj: ..\..\src\common\imagfill.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagfill.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imaggif.obj: ..\..\src\common\imaggif.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imaggif.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagiff.obj: ..\..\src\common\imagiff.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagiff.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagjpeg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagpcx.obj: ..\..\src\common\imagpcx.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagpcx.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagpng.obj: ..\..\src\common\imagpng.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagpng.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagpnm.obj: ..\..\src\common\imagpnm.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagpnm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagtga.obj: ..\..\src\common\imagtga.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagtga.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagtiff.obj: ..\..\src\common\imagtiff.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagtiff.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagxpm.obj: ..\..\src\common\imagxpm.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagxpm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_layout.obj: ..\..\src\common\layout.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\layout.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\lboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_markupparser.obj: ..\..\src\common\markupparser.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\markupparser.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_matrix.obj: ..\..\src\common\matrix.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\matrix.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_menucmn.obj: ..\..\src\common\menucmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\menucmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_modalhook.obj: ..\..\src\common\modalhook.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\modalhook.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_mousemanager.obj: ..\..\src\common\mousemanager.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_panelcmn.obj: ..\..\src\common\panelcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_pickerbase.obj: ..\..\src\common\pickerbase.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\preferencescmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_prntbase.obj: ..\..\src\common\prntbase.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\prntbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_quantize.obj: ..\..\src\common\quantize.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\quantize.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_radiocmn.obj: ..\..\src\common\radiocmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_rendcmn.obj: ..\..\src\common\rendcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rendcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_rgncmn.obj: ..\..\src\common\rgncmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_settcmn.obj: ..\..\src\common\settcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\settcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\sizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_slidercmn.obj: ..\..\src\common\slidercmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_srchcmn.obj: ..\..\src\common\srchcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\srchcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_stockitem.obj: ..\..\src\common\stockitem.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\stockitem.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_tbarbase.obj: ..\..\src\common\tbarbase.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\tbarbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_treebase.obj: ..\..\src\common\treebase.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\treebase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_uiactioncmn.obj: ..\..\src\common\uiactioncmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\uiactioncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_valgen.obj: ..\..\src\common\valgen.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valgen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_validate.obj: ..\..\src\common\validate.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\validate.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_valtext.obj: ..\..\src\common\valtext.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valtext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_valnum.obj: ..\..\src\common\valnum.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valnum.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_wincmn.obj: ..\..\src\common\wincmn.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\wincmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_windowid.obj: ..\..\src\common\windowid.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\windowid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\busyinfo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\buttonbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\choicdgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\choicbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\combog.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dcpsg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dragimgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_filectrlg.obj: ..\..\src\generic\filectrlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filectrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_infobar.obj: ..\..\src\generic\infobar.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\infobar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_logg.obj: ..\..\src\generic\logg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\logg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_markuptext.obj: ..\..\src\generic\markuptext.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\numdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_preferencesg.obj: ..\..\src\generic\preferencesg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\preferencesg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_printps.obj: ..\..\src\generic\printps.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\printps.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_renderg.obj: ..\..\src\generic\renderg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\renderg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_scrlwing.obj: ..\..\src\generic\scrlwing.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\scrlwing.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_selstore.obj: ..\..\src\generic\selstore.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\selstore.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_spinctlg.obj: ..\..\src\generic\spinctlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\spinctlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_splitter.obj: ..\..\src\generic\splitter.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\splitter.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\srchctlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_statbmpg.obj: ..\..\src\generic\statbmpg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statbmpg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_stattextg.obj: ..\..\src\generic\stattextg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_tipwin.obj: ..\..\src\generic\tipwin.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_treebkg.obj: ..\..\src\generic\treebkg.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_vlbox.obj: ..\..\src\generic\vlbox.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vlbox.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp - $(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp -!endif - -$(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\advdll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV ..\..\src\msw\version.rc - -$(OBJS)\advdll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp - -$(OBJS)\advdll_calctrl.obj: ..\..\src\msw\calctrl.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp - -$(OBJS)\advdll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp - -$(OBJS)\advdll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp - -$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp - -$(OBJS)\advdll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp - -$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp - -$(OBJS)\advdll_timectrl.obj: ..\..\src\msw\timectrl.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp - -$(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp - -$(OBJS)\advdll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp - -$(OBJS)\advdll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp - -$(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp - -$(OBJS)\advdll_gridcmn.obj: ..\..\src\common\gridcmn.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp - -$(OBJS)\advdll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp - -$(OBJS)\advdll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp - -$(OBJS)\advdll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp - -$(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp - -$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp - -$(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp - -$(OBJS)\advdll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp - -$(OBJS)\advdll_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp - -$(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\datavgen.cpp - -$(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\datectlg.cpp - -$(OBJS)\advdll_editlbox.obj: ..\..\src\generic\editlbox.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\editlbox.cpp - -$(OBJS)\advdll_grid.obj: ..\..\src\generic\grid.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\grid.cpp - -$(OBJS)\advdll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\gridctrl.cpp - -$(OBJS)\advdll_grideditors.obj: ..\..\src\generic\grideditors.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\grideditors.cpp - -$(OBJS)\advdll_gridsel.obj: ..\..\src\generic\gridsel.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\gridsel.cpp - -$(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\helpext.cpp - -$(OBJS)\advdll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp - -$(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\laywin.cpp - -$(OBJS)\advdll_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp - -$(OBJS)\advdll_odcombo.obj: ..\..\src\generic\odcombo.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp - -$(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp - -$(OBJS)\advdll_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp - -$(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp - -$(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\splash.cpp - -$(OBJS)\advdll_timectrlg.obj: ..\..\src\generic\timectrlg.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrlg.cpp - -$(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp - -$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp - -$(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\wizard.cpp - -$(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp - -$(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp - -$(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp - -$(OBJS)\advdll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp - -$(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp - -$(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp - -$(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp - -$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp - -$(OBJS)\advlib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\advlib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp - -$(OBJS)\advlib_calctrl.obj: ..\..\src\msw\calctrl.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp - -$(OBJS)\advlib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp - -$(OBJS)\advlib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp - -$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp - -$(OBJS)\advlib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp - -$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp - -$(OBJS)\advlib_timectrl.obj: ..\..\src\msw\timectrl.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp - -$(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp - -$(OBJS)\advlib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp - -$(OBJS)\advlib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp - -$(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp - -$(OBJS)\advlib_gridcmn.obj: ..\..\src\common\gridcmn.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp - -$(OBJS)\advlib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp - -$(OBJS)\advlib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp - -$(OBJS)\advlib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp - -$(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp - -$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp - -$(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp - -$(OBJS)\advlib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp - -$(OBJS)\advlib_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp - -$(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\datavgen.cpp - -$(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\datectlg.cpp - -$(OBJS)\advlib_editlbox.obj: ..\..\src\generic\editlbox.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\editlbox.cpp - -$(OBJS)\advlib_grid.obj: ..\..\src\generic\grid.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\grid.cpp - -$(OBJS)\advlib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\gridctrl.cpp - -$(OBJS)\advlib_grideditors.obj: ..\..\src\generic\grideditors.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\grideditors.cpp - -$(OBJS)\advlib_gridsel.obj: ..\..\src\generic\gridsel.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\gridsel.cpp - -$(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\helpext.cpp - -$(OBJS)\advlib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp - -$(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp - -$(OBJS)\advlib_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp - -$(OBJS)\advlib_odcombo.obj: ..\..\src\generic\odcombo.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp - -$(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp - -$(OBJS)\advlib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp - -$(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp - -$(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\splash.cpp - -$(OBJS)\advlib_timectrlg.obj: ..\..\src\generic\timectrlg.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrlg.cpp - -$(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp - -$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp - -$(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp - -$(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp - -$(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp - -$(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp - -$(OBJS)\advlib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp - -$(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp - -$(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp - -$(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp - -$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp - -$(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA ..\..\src\msw\version.rc - -$(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp - -$(OBJS)\mediadll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp - $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp - -$(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp - $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp - -$(OBJS)\mediadll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp - $(CXX) -q -c -P -o$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp - -$(OBJS)\medialib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\medialib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp - $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp - -$(OBJS)\medialib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp - $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp - -$(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp - $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp - -$(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp - $(CXX) -q -c -P -o$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp - -$(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML ..\..\src\msw\version.rc - -$(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp - -$(OBJS)\htmldll_helpctrl.obj: ..\..\src\html\helpctrl.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpctrl.cpp - -$(OBJS)\htmldll_helpdata.obj: ..\..\src\html\helpdata.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpdata.cpp - -$(OBJS)\htmldll_helpdlg.obj: ..\..\src\html\helpdlg.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpdlg.cpp - -$(OBJS)\htmldll_helpfrm.obj: ..\..\src\html\helpfrm.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpfrm.cpp - -$(OBJS)\htmldll_helpwnd.obj: ..\..\src\html\helpwnd.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpwnd.cpp - -$(OBJS)\htmldll_htmlcell.obj: ..\..\src\html\htmlcell.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlcell.cpp - -$(OBJS)\htmldll_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlfilt.cpp - -$(OBJS)\htmldll_htmlpars.obj: ..\..\src\html\htmlpars.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlpars.cpp - -$(OBJS)\htmldll_htmltag.obj: ..\..\src\html\htmltag.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmltag.cpp - -$(OBJS)\htmldll_htmlwin.obj: ..\..\src\html\htmlwin.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlwin.cpp - -$(OBJS)\htmldll_htmprint.obj: ..\..\src\html\htmprint.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmprint.cpp - -$(OBJS)\htmldll_m_dflist.obj: ..\..\src\html\m_dflist.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_dflist.cpp - -$(OBJS)\htmldll_m_fonts.obj: ..\..\src\html\m_fonts.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_fonts.cpp - -$(OBJS)\htmldll_m_hline.obj: ..\..\src\html\m_hline.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_hline.cpp - -$(OBJS)\htmldll_m_image.obj: ..\..\src\html\m_image.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_image.cpp - -$(OBJS)\htmldll_m_layout.obj: ..\..\src\html\m_layout.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_layout.cpp - -$(OBJS)\htmldll_m_links.obj: ..\..\src\html\m_links.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_links.cpp - -$(OBJS)\htmldll_m_list.obj: ..\..\src\html\m_list.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_list.cpp - -$(OBJS)\htmldll_m_pre.obj: ..\..\src\html\m_pre.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_pre.cpp - -$(OBJS)\htmldll_m_span.obj: ..\..\src\html\m_span.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_span.cpp - -$(OBJS)\htmldll_m_style.obj: ..\..\src\html\m_style.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_style.cpp - -$(OBJS)\htmldll_m_tables.obj: ..\..\src\html\m_tables.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_tables.cpp - -$(OBJS)\htmldll_styleparams.obj: ..\..\src\html\styleparams.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\styleparams.cpp - -$(OBJS)\htmldll_winpars.obj: ..\..\src\html\winpars.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\winpars.cpp - -$(OBJS)\htmldll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp - $(CXX) -q -c -P -o$@ $(HTMLDLL_CXXFLAGS) ..\..\src\generic\htmllbox.cpp - -$(OBJS)\htmllib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\htmllib_helpbest.obj: ..\..\src\msw\helpbest.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp - -$(OBJS)\htmllib_helpctrl.obj: ..\..\src\html\helpctrl.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpctrl.cpp - -$(OBJS)\htmllib_helpdata.obj: ..\..\src\html\helpdata.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpdata.cpp - -$(OBJS)\htmllib_helpdlg.obj: ..\..\src\html\helpdlg.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpdlg.cpp - -$(OBJS)\htmllib_helpfrm.obj: ..\..\src\html\helpfrm.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpfrm.cpp - -$(OBJS)\htmllib_helpwnd.obj: ..\..\src\html\helpwnd.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpwnd.cpp - -$(OBJS)\htmllib_htmlcell.obj: ..\..\src\html\htmlcell.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlcell.cpp - -$(OBJS)\htmllib_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlfilt.cpp - -$(OBJS)\htmllib_htmlpars.obj: ..\..\src\html\htmlpars.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlpars.cpp - -$(OBJS)\htmllib_htmltag.obj: ..\..\src\html\htmltag.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmltag.cpp - -$(OBJS)\htmllib_htmlwin.obj: ..\..\src\html\htmlwin.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlwin.cpp - -$(OBJS)\htmllib_htmprint.obj: ..\..\src\html\htmprint.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmprint.cpp - -$(OBJS)\htmllib_m_dflist.obj: ..\..\src\html\m_dflist.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_dflist.cpp - -$(OBJS)\htmllib_m_fonts.obj: ..\..\src\html\m_fonts.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_fonts.cpp - -$(OBJS)\htmllib_m_hline.obj: ..\..\src\html\m_hline.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_hline.cpp - -$(OBJS)\htmllib_m_image.obj: ..\..\src\html\m_image.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_image.cpp - -$(OBJS)\htmllib_m_layout.obj: ..\..\src\html\m_layout.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_layout.cpp - -$(OBJS)\htmllib_m_links.obj: ..\..\src\html\m_links.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_links.cpp - -$(OBJS)\htmllib_m_list.obj: ..\..\src\html\m_list.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_list.cpp - -$(OBJS)\htmllib_m_pre.obj: ..\..\src\html\m_pre.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp - -$(OBJS)\htmllib_m_span.obj: ..\..\src\html\m_span.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_span.cpp - -$(OBJS)\htmllib_m_style.obj: ..\..\src\html\m_style.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_style.cpp - -$(OBJS)\htmllib_m_tables.obj: ..\..\src\html\m_tables.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp - -$(OBJS)\htmllib_styleparams.obj: ..\..\src\html\styleparams.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp - -$(OBJS)\htmllib_winpars.obj: ..\..\src\html\winpars.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\winpars.cpp - -$(OBJS)\htmllib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp - $(CXX) -q -c -P -o$@ $(HTMLLIB_CXXFLAGS) ..\..\src\generic\htmllbox.cpp - -$(OBJS)\webviewdll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(WEBVIEWDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\webviewdll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_WEBVIEW ..\..\src\msw\version.rc - -$(OBJS)\webviewdll_webview_ie.obj: ..\..\src\msw\webview_ie.cpp - $(CXX) -q -c -P -o$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\msw\webview_ie.cpp - -$(OBJS)\webviewdll_webview.obj: ..\..\src\common\webview.cpp - $(CXX) -q -c -P -o$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webview.cpp - -$(OBJS)\webviewdll_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp - $(CXX) -q -c -P -o$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp - -$(OBJS)\webviewdll_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp - $(CXX) -q -c -P -o$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp - -$(OBJS)\webviewlib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(WEBVIEWLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\webviewlib_webview_ie.obj: ..\..\src\msw\webview_ie.cpp - $(CXX) -q -c -P -o$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\msw\webview_ie.cpp - -$(OBJS)\webviewlib_webview.obj: ..\..\src\common\webview.cpp - $(CXX) -q -c -P -o$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webview.cpp - -$(OBJS)\webviewlib_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp - $(CXX) -q -c -P -o$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp - -$(OBJS)\webviewlib_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp - $(CXX) -q -c -P -o$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp - -$(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\qadll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA ..\..\src\msw\version.rc - -$(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp - $(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp - -$(OBJS)\qadll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp - $(CXX) -q -c -P -o$@ $(QADLL_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp - -$(OBJS)\qalib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(QALIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\qalib_debugrpt.obj: ..\..\src\common\debugrpt.cpp - $(CXX) -q -c -P -o$@ $(QALIB_CXXFLAGS) ..\..\src\common\debugrpt.cpp - -$(OBJS)\qalib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp - $(CXX) -q -c -P -o$@ $(QALIB_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp - -$(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML ..\..\src\msw\version.rc - -$(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp - $(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) ..\..\src\xml\xml.cpp - -$(OBJS)\xmldll_xtixml.obj: ..\..\src\common\xtixml.cpp - $(CXX) -q -c -P -o$@ $(XMLDLL_CXXFLAGS) ..\..\src\common\xtixml.cpp - -$(OBJS)\xmllib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(XMLLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp - $(CXX) -q -c -P -o$@ $(XMLLIB_CXXFLAGS) ..\..\src\xml\xml.cpp - -$(OBJS)\xmllib_xtixml.obj: ..\..\src\common\xtixml.cpp - $(CXX) -q -c -P -o$@ $(XMLLIB_CXXFLAGS) ..\..\src\common\xtixml.cpp - -$(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC ..\..\src\msw\version.rc - -$(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp - -$(OBJS)\xrcdll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp - -$(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp - -$(OBJS)\xrcdll_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp - -$(OBJS)\xrcdll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp - -$(OBJS)\xrcdll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp - -$(OBJS)\xrcdll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp - -$(OBJS)\xrcdll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp - -$(OBJS)\xrcdll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp - -$(OBJS)\xrcdll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp - -$(OBJS)\xrcdll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp - -$(OBJS)\xrcdll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp - -$(OBJS)\xrcdll_xh_cmdlinkbn.obj: ..\..\src\xrc\xh_cmdlinkbn.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_cmdlinkbn.cpp - -$(OBJS)\xrcdll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp - -$(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp - -$(OBJS)\xrcdll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp - -$(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp - -$(OBJS)\xrcdll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp - -$(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp - -$(OBJS)\xrcdll_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp - -$(OBJS)\xrcdll_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp - -$(OBJS)\xrcdll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp - -$(OBJS)\xrcdll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp - -$(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp - -$(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp - -$(OBJS)\xrcdll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp - -$(OBJS)\xrcdll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp - -$(OBJS)\xrcdll_xh_html.obj: ..\..\src\xrc\xh_html.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_html.cpp - -$(OBJS)\xrcdll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp - -$(OBJS)\xrcdll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp - -$(OBJS)\xrcdll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp - -$(OBJS)\xrcdll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp - -$(OBJS)\xrcdll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp - -$(OBJS)\xrcdll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp - -$(OBJS)\xrcdll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp - -$(OBJS)\xrcdll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp - -$(OBJS)\xrcdll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp - -$(OBJS)\xrcdll_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp - -$(OBJS)\xrcdll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp - -$(OBJS)\xrcdll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp - -$(OBJS)\xrcdll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp - -$(OBJS)\xrcdll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp - -$(OBJS)\xrcdll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp - -$(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp - -$(OBJS)\xrcdll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp - -$(OBJS)\xrcdll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp - -$(OBJS)\xrcdll_xh_split.obj: ..\..\src\xrc\xh_split.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_split.cpp - -$(OBJS)\xrcdll_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp - -$(OBJS)\xrcdll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp - -$(OBJS)\xrcdll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp - -$(OBJS)\xrcdll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp - -$(OBJS)\xrcdll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp - -$(OBJS)\xrcdll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp - -$(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp - -$(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp - -$(OBJS)\xrcdll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp - -$(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp - -$(OBJS)\xrcdll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp - -$(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp - -$(OBJS)\xrcdll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp - -$(OBJS)\xrcdll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp - -$(OBJS)\xrcdll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp - -$(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp - -$(OBJS)\xrcdll_xmladv.obj: ..\..\src\xrc\xmladv.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmladv.cpp - -$(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp - $(CXX) -q -c -P -o$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp - -$(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp - -$(OBJS)\xrclib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp - -$(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp - -$(OBJS)\xrclib_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp - -$(OBJS)\xrclib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp - -$(OBJS)\xrclib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp - -$(OBJS)\xrclib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp - -$(OBJS)\xrclib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp - -$(OBJS)\xrclib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp - -$(OBJS)\xrclib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp - -$(OBJS)\xrclib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp - -$(OBJS)\xrclib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp - -$(OBJS)\xrclib_xh_cmdlinkbn.obj: ..\..\src\xrc\xh_cmdlinkbn.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_cmdlinkbn.cpp - -$(OBJS)\xrclib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp - -$(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp - -$(OBJS)\xrclib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp - -$(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp - -$(OBJS)\xrclib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp - -$(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp - -$(OBJS)\xrclib_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp - -$(OBJS)\xrclib_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp - -$(OBJS)\xrclib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp - -$(OBJS)\xrclib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp - -$(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp - -$(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp - -$(OBJS)\xrclib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp - -$(OBJS)\xrclib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp - -$(OBJS)\xrclib_xh_html.obj: ..\..\src\xrc\xh_html.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_html.cpp - -$(OBJS)\xrclib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp - -$(OBJS)\xrclib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp - -$(OBJS)\xrclib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp - -$(OBJS)\xrclib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp - -$(OBJS)\xrclib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp - -$(OBJS)\xrclib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp - -$(OBJS)\xrclib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp - -$(OBJS)\xrclib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp - -$(OBJS)\xrclib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp - -$(OBJS)\xrclib_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp - -$(OBJS)\xrclib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp - -$(OBJS)\xrclib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp - -$(OBJS)\xrclib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp - -$(OBJS)\xrclib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp - -$(OBJS)\xrclib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp - -$(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp - -$(OBJS)\xrclib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp - -$(OBJS)\xrclib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp - -$(OBJS)\xrclib_xh_split.obj: ..\..\src\xrc\xh_split.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_split.cpp - -$(OBJS)\xrclib_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp - -$(OBJS)\xrclib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp - -$(OBJS)\xrclib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp - -$(OBJS)\xrclib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp - -$(OBJS)\xrclib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp - -$(OBJS)\xrclib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp - -$(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp - -$(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp - -$(OBJS)\xrclib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp - -$(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp - -$(OBJS)\xrclib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp - -$(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp - -$(OBJS)\xrclib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp - -$(OBJS)\xrclib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp - -$(OBJS)\xrclib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp - -$(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp - -$(OBJS)\xrclib_xmladv.obj: ..\..\src\xrc\xmladv.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmladv.cpp - -$(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp - $(CXX) -q -c -P -o$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp - -$(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\auidll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI ..\..\src\msw\version.rc - -$(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp - $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp - -$(OBJS)\auidll_dockart.obj: ..\..\src\aui\dockart.cpp - $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\dockart.cpp - -$(OBJS)\auidll_floatpane.obj: ..\..\src\aui\floatpane.cpp - $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\floatpane.cpp - -$(OBJS)\auidll_auibook.obj: ..\..\src\aui\auibook.cpp - $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\auibook.cpp - -$(OBJS)\auidll_auibar.obj: ..\..\src\aui\auibar.cpp - $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\auibar.cpp - -$(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp - $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp - -$(OBJS)\auidll_tabart.obj: ..\..\src\aui\tabart.cpp - $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabart.cpp - -$(OBJS)\auidll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp - $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp - -$(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\auilib_framemanager.obj: ..\..\src\aui\framemanager.cpp - $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\framemanager.cpp - -$(OBJS)\auilib_dockart.obj: ..\..\src\aui\dockart.cpp - $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\dockart.cpp - -$(OBJS)\auilib_floatpane.obj: ..\..\src\aui\floatpane.cpp - $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\floatpane.cpp - -$(OBJS)\auilib_auibook.obj: ..\..\src\aui\auibook.cpp - $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\auibook.cpp - -$(OBJS)\auilib_auibar.obj: ..\..\src\aui\auibar.cpp - $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\auibar.cpp - -$(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp - $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp - -$(OBJS)\auilib_tabart.obj: ..\..\src\aui\tabart.cpp - $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabart.cpp - -$(OBJS)\auilib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp - $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp - -$(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\ribbondll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RIBBON ..\..\src\msw\version.rc - -$(OBJS)\ribbondll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp - $(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp - -$(OBJS)\ribbondll_art_msw.obj: ..\..\src\ribbon\art_msw.cpp - $(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp - -$(OBJS)\ribbondll_art_aui.obj: ..\..\src\ribbon\art_aui.cpp - $(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp - -$(OBJS)\ribbondll_bar.obj: ..\..\src\ribbon\bar.cpp - $(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\bar.cpp - -$(OBJS)\ribbondll_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp - $(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp - -$(OBJS)\ribbondll_control.obj: ..\..\src\ribbon\control.cpp - $(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\control.cpp - -$(OBJS)\ribbondll_gallery.obj: ..\..\src\ribbon\gallery.cpp - $(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\gallery.cpp - -$(OBJS)\ribbondll_page.obj: ..\..\src\ribbon\page.cpp - $(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\page.cpp - -$(OBJS)\ribbondll_panel.obj: ..\..\src\ribbon\panel.cpp - $(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp - -$(OBJS)\ribbondll_toolbar.obj: ..\..\src\ribbon\toolbar.cpp - $(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp - -$(OBJS)\ribbondll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp - $(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp - -$(OBJS)\ribbonlib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\ribbonlib_art_internal.obj: ..\..\src\ribbon\art_internal.cpp - $(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp - -$(OBJS)\ribbonlib_art_msw.obj: ..\..\src\ribbon\art_msw.cpp - $(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp - -$(OBJS)\ribbonlib_art_aui.obj: ..\..\src\ribbon\art_aui.cpp - $(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp - -$(OBJS)\ribbonlib_bar.obj: ..\..\src\ribbon\bar.cpp - $(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\bar.cpp - -$(OBJS)\ribbonlib_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp - $(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp - -$(OBJS)\ribbonlib_control.obj: ..\..\src\ribbon\control.cpp - $(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\control.cpp - -$(OBJS)\ribbonlib_gallery.obj: ..\..\src\ribbon\gallery.cpp - $(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\gallery.cpp - -$(OBJS)\ribbonlib_page.obj: ..\..\src\ribbon\page.cpp - $(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp - -$(OBJS)\ribbonlib_panel.obj: ..\..\src\ribbon\panel.cpp - $(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp - -$(OBJS)\ribbonlib_toolbar.obj: ..\..\src\ribbon\toolbar.cpp - $(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp - -$(OBJS)\ribbonlib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp - $(CXX) -q -c -P -o$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp - -$(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\propgriddll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_PROPGRID ..\..\src\msw\version.rc - -$(OBJS)\propgriddll_advprops.obj: ..\..\src\propgrid\advprops.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp - -$(OBJS)\propgriddll_editors.obj: ..\..\src\propgrid\editors.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\editors.cpp - -$(OBJS)\propgriddll_manager.obj: ..\..\src\propgrid\manager.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\manager.cpp - -$(OBJS)\propgriddll_property.obj: ..\..\src\propgrid\property.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\property.cpp - -$(OBJS)\propgriddll_propgrid.obj: ..\..\src\propgrid\propgrid.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp - -$(OBJS)\propgriddll_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp - -$(OBJS)\propgriddll_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp - -$(OBJS)\propgriddll_props.obj: ..\..\src\propgrid\props.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\props.cpp - -$(OBJS)\propgridlib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\propgridlib_advprops.obj: ..\..\src\propgrid\advprops.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp - -$(OBJS)\propgridlib_editors.obj: ..\..\src\propgrid\editors.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\editors.cpp - -$(OBJS)\propgridlib_manager.obj: ..\..\src\propgrid\manager.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\manager.cpp - -$(OBJS)\propgridlib_property.obj: ..\..\src\propgrid\property.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\property.cpp - -$(OBJS)\propgridlib_propgrid.obj: ..\..\src\propgrid\propgrid.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp - -$(OBJS)\propgridlib_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp - -$(OBJS)\propgridlib_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp - -$(OBJS)\propgridlib_props.obj: ..\..\src\propgrid\props.cpp - $(CXX) -q -c -P -o$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp - -$(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc - -$(OBJS)\richtextdll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp - -$(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp - -$(OBJS)\richtextdll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp - -$(OBJS)\richtextdll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp - -$(OBJS)\richtextdll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp - -$(OBJS)\richtextdll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp - -$(OBJS)\richtextdll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp - -$(OBJS)\richtextdll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp - -$(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp - -$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp - -$(OBJS)\richtextdll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp - -$(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\richtextlib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp - -$(OBJS)\richtextlib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp - -$(OBJS)\richtextlib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp - -$(OBJS)\richtextlib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp - -$(OBJS)\richtextlib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp - -$(OBJS)\richtextlib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp - -$(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp - -$(OBJS)\richtextlib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp - -$(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp - -$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp - -$(OBJS)\richtextlib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp - $(CXX) -q -c -P -o$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp - -$(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -i..\..\src\stc\scintilla\include -i..\..\src\stc\scintilla\lexlib -i..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dWXUSINGDLL -dWXMAKINGDLL_STC ..\..\src\msw\version.rc - -$(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp - $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\stc.cpp - -$(OBJS)\stcdll_PlatWX.obj: ..\..\src\stc\PlatWX.cpp - $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\PlatWX.cpp - -$(OBJS)\stcdll_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp - $(CXX) -q -c -P -o$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp - -$(OBJS)\stclib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\stclib_stc.obj: ..\..\src\stc\stc.cpp - $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) ..\..\src\stc\stc.cpp - -$(OBJS)\stclib_PlatWX.obj: ..\..\src\stc\PlatWX.cpp - $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) ..\..\src\stc\PlatWX.cpp - -$(OBJS)\stclib_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp - $(CXX) -q -c -P -o$@ $(STCLIB_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp - -$(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\gldll_version.res: ..\..\src\msw\version.rc - brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) -i$(SETUPHDIR) -i..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG) -i..\..\src\tiff\libtiff -i..\..\src\jpeg -i..\..\src\png -i..\..\src\zlib -i..\..\src\regex -i..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL ..\..\src\msw\version.rc - -$(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp - $(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp - -$(OBJS)\gldll_glcanvas.obj: ..\..\src\msw\glcanvas.cpp - $(CXX) -q -c -P -o$@ $(GLDLL_CXXFLAGS) ..\..\src\msw\glcanvas.cpp - -$(OBJS)\gllib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) -q -c -P -o$@ $(GLLIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp - -$(OBJS)\gllib_glcmn.obj: ..\..\src\common\glcmn.cpp - $(CXX) -q -c -P -o$@ $(GLLIB_CXXFLAGS) ..\..\src\common\glcmn.cpp - -$(OBJS)\gllib_glcanvas.obj: ..\..\src\msw\glcanvas.cpp - $(CXX) -q -c -P -o$@ $(GLLIB_CXXFLAGS) ..\..\src\msw\glcanvas.cpp - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/makefile.gcc b/3rdparty/wxwidgets3.0-3.0.1/build/msw/makefile.gcc deleted file mode 100644 index 79202fd5f7..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/makefile.gcc +++ /dev/null @@ -1,16319 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -include config.gcc - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ - LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \ - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ - LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \ - TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \ - UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ - DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \ - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ - USE_WEBVIEW="$(USE_WEBVIEW)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" \ - USE_AUI="$(USE_AUI)" USE_RIBBON="$(USE_RIBBON)" \ - USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \ - USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ - USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \ - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ - RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)" \ - WINDRES="$(WINDRES)" -CPPDEPS = -MT$@ -MF$@.d -MD -MP -WX_RELEASE_NODOT = 30 -COMPILER_PREFIX = gcc -OBJS = \ - $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = \ - ..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -DNDEBUG -I..\..\include -I$(SETUPHDIR) -D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS) -WXREGEX_OBJECTS = \ - $(OBJS)\wxregex_regcomp.o \ - $(OBJS)\wxregex_regexec.o \ - $(OBJS)\wxregex_regerror.o \ - $(OBJS)\wxregex_regfree.o -WXZLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -DNDEBUG $(CPPFLAGS) $(CFLAGS) -WXZLIB_OBJECTS = \ - $(OBJS)\wxzlib_adler32.o \ - $(OBJS)\wxzlib_compress.o \ - $(OBJS)\wxzlib_crc32.o \ - $(OBJS)\wxzlib_deflate.o \ - $(OBJS)\wxzlib_gzclose.o \ - $(OBJS)\wxzlib_gzlib.o \ - $(OBJS)\wxzlib_gzread.o \ - $(OBJS)\wxzlib_gzwrite.o \ - $(OBJS)\wxzlib_infback.o \ - $(OBJS)\wxzlib_inffast.o \ - $(OBJS)\wxzlib_inflate.o \ - $(OBJS)\wxzlib_inftrees.o \ - $(OBJS)\wxzlib_trees.o \ - $(OBJS)\wxzlib_uncompr.o \ - $(OBJS)\wxzlib_zutil.o -WXPNG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -DNDEBUG -I..\..\src\zlib $(CPPFLAGS) $(CFLAGS) -WXPNG_OBJECTS = \ - $(OBJS)\wxpng_png.o \ - $(OBJS)\wxpng_pngerror.o \ - $(OBJS)\wxpng_pngget.o \ - $(OBJS)\wxpng_pngmem.o \ - $(OBJS)\wxpng_pngpread.o \ - $(OBJS)\wxpng_pngread.o \ - $(OBJS)\wxpng_pngrio.o \ - $(OBJS)\wxpng_pngrtran.o \ - $(OBJS)\wxpng_pngrutil.o \ - $(OBJS)\wxpng_pngset.o \ - $(OBJS)\wxpng_pngtrans.o \ - $(OBJS)\wxpng_pngwio.o \ - $(OBJS)\wxpng_pngwrite.o \ - $(OBJS)\wxpng_pngwtran.o \ - $(OBJS)\wxpng_pngwutil.o -WXJPEG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -DNDEBUG -I$(SETUPHDIR) $(CPPFLAGS) $(CFLAGS) -WXJPEG_OBJECTS = \ - $(OBJS)\wxjpeg_jcomapi.o \ - $(OBJS)\wxjpeg_jutils.o \ - $(OBJS)\wxjpeg_jerror.o \ - $(OBJS)\wxjpeg_jmemmgr.o \ - $(OBJS)\wxjpeg_jmemnobs.o \ - $(OBJS)\wxjpeg_jcapimin.o \ - $(OBJS)\wxjpeg_jcapistd.o \ - $(OBJS)\wxjpeg_jctrans.o \ - $(OBJS)\wxjpeg_jcparam.o \ - $(OBJS)\wxjpeg_jdatadst.o \ - $(OBJS)\wxjpeg_jcinit.o \ - $(OBJS)\wxjpeg_jcmaster.o \ - $(OBJS)\wxjpeg_jcmarker.o \ - $(OBJS)\wxjpeg_jcmainct.o \ - $(OBJS)\wxjpeg_jcprepct.o \ - $(OBJS)\wxjpeg_jccoefct.o \ - $(OBJS)\wxjpeg_jccolor.o \ - $(OBJS)\wxjpeg_jcsample.o \ - $(OBJS)\wxjpeg_jchuff.o \ - $(OBJS)\wxjpeg_jcphuff.o \ - $(OBJS)\wxjpeg_jcdctmgr.o \ - $(OBJS)\wxjpeg_jfdctfst.o \ - $(OBJS)\wxjpeg_jfdctflt.o \ - $(OBJS)\wxjpeg_jfdctint.o \ - $(OBJS)\wxjpeg_jdapimin.o \ - $(OBJS)\wxjpeg_jdapistd.o \ - $(OBJS)\wxjpeg_jdtrans.o \ - $(OBJS)\wxjpeg_jdatasrc.o \ - $(OBJS)\wxjpeg_jdmaster.o \ - $(OBJS)\wxjpeg_jdinput.o \ - $(OBJS)\wxjpeg_jdmarker.o \ - $(OBJS)\wxjpeg_jdhuff.o \ - $(OBJS)\wxjpeg_jdphuff.o \ - $(OBJS)\wxjpeg_jdmainct.o \ - $(OBJS)\wxjpeg_jdcoefct.o \ - $(OBJS)\wxjpeg_jdpostct.o \ - $(OBJS)\wxjpeg_jddctmgr.o \ - $(OBJS)\wxjpeg_jidctfst.o \ - $(OBJS)\wxjpeg_jidctflt.o \ - $(OBJS)\wxjpeg_jidctint.o \ - $(OBJS)\wxjpeg_jidctred.o \ - $(OBJS)\wxjpeg_jdsample.o \ - $(OBJS)\wxjpeg_jdcolor.o \ - $(OBJS)\wxjpeg_jquant1.o \ - $(OBJS)\wxjpeg_jquant2.o \ - $(OBJS)\wxjpeg_jdmerge.o -WXTIFF_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -DNDEBUG -I..\..\src\zlib -I..\..\src\jpeg \ - -I..\..\src\tiff\libtiff $(CPPFLAGS) $(CFLAGS) -WXTIFF_OBJECTS = \ - $(OBJS)\wxtiff_tif_win32.o \ - $(OBJS)\wxtiff_tif_aux.o \ - $(OBJS)\wxtiff_tif_close.o \ - $(OBJS)\wxtiff_tif_codec.o \ - $(OBJS)\wxtiff_tif_color.o \ - $(OBJS)\wxtiff_tif_compress.o \ - $(OBJS)\wxtiff_tif_dir.o \ - $(OBJS)\wxtiff_tif_dirinfo.o \ - $(OBJS)\wxtiff_tif_dirread.o \ - $(OBJS)\wxtiff_tif_dirwrite.o \ - $(OBJS)\wxtiff_tif_dumpmode.o \ - $(OBJS)\wxtiff_tif_error.o \ - $(OBJS)\wxtiff_tif_extension.o \ - $(OBJS)\wxtiff_tif_fax3.o \ - $(OBJS)\wxtiff_tif_fax3sm.o \ - $(OBJS)\wxtiff_tif_flush.o \ - $(OBJS)\wxtiff_tif_getimage.o \ - $(OBJS)\wxtiff_tif_jbig.o \ - $(OBJS)\wxtiff_tif_jpeg.o \ - $(OBJS)\wxtiff_tif_jpeg_12.o \ - $(OBJS)\wxtiff_tif_luv.o \ - $(OBJS)\wxtiff_tif_lzma.o \ - $(OBJS)\wxtiff_tif_lzw.o \ - $(OBJS)\wxtiff_tif_next.o \ - $(OBJS)\wxtiff_tif_ojpeg.o \ - $(OBJS)\wxtiff_tif_open.o \ - $(OBJS)\wxtiff_tif_packbits.o \ - $(OBJS)\wxtiff_tif_pixarlog.o \ - $(OBJS)\wxtiff_tif_predict.o \ - $(OBJS)\wxtiff_tif_print.o \ - $(OBJS)\wxtiff_tif_read.o \ - $(OBJS)\wxtiff_tif_strip.o \ - $(OBJS)\wxtiff_tif_swab.o \ - $(OBJS)\wxtiff_tif_thunder.o \ - $(OBJS)\wxtiff_tif_tile.o \ - $(OBJS)\wxtiff_tif_version.o \ - $(OBJS)\wxtiff_tif_warning.o \ - $(OBJS)\wxtiff_tif_write.o \ - $(OBJS)\wxtiff_tif_zip.o -WXEXPAT_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -DNDEBUG -I$(LIBDIRNAME) -DCOMPILED_FROM_DSP $(CPPFLAGS) \ - $(CFLAGS) -WXEXPAT_OBJECTS = \ - $(OBJS)\wxexpat_xmlparse.o \ - $(OBJS)\wxexpat_xmlrole.o \ - $(OBJS)\wxexpat_xmltok.o -WXSCINTILLA_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -DNDEBUG -I..\..\src\stc\scintilla\include \ - -I..\..\src\stc\scintilla\lexlib -I..\..\src\stc\scintilla\src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS -I$(SETUPHDIR) -I..\..\include \ - $(__wxscintilla_usingdll_p) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - $(CPPFLAGS) $(CXXFLAGS) -WXSCINTILLA_OBJECTS = \ - $(OBJS)\wxscintilla_LexA68k.o \ - $(OBJS)\wxscintilla_LexAbaqus.o \ - $(OBJS)\wxscintilla_LexAda.o \ - $(OBJS)\wxscintilla_LexAPDL.o \ - $(OBJS)\wxscintilla_LexAsm.o \ - $(OBJS)\wxscintilla_LexAsn1.o \ - $(OBJS)\wxscintilla_LexASY.o \ - $(OBJS)\wxscintilla_LexAU3.o \ - $(OBJS)\wxscintilla_LexAVE.o \ - $(OBJS)\wxscintilla_LexAVS.o \ - $(OBJS)\wxscintilla_LexBaan.o \ - $(OBJS)\wxscintilla_LexBash.o \ - $(OBJS)\wxscintilla_LexBasic.o \ - $(OBJS)\wxscintilla_LexBullant.o \ - $(OBJS)\wxscintilla_LexCaml.o \ - $(OBJS)\wxscintilla_LexCLW.o \ - $(OBJS)\wxscintilla_LexCmake.o \ - $(OBJS)\wxscintilla_LexCOBOL.o \ - $(OBJS)\wxscintilla_LexCoffeeScript.o \ - $(OBJS)\wxscintilla_LexConf.o \ - $(OBJS)\wxscintilla_LexCPP.o \ - $(OBJS)\wxscintilla_LexCrontab.o \ - $(OBJS)\wxscintilla_LexCsound.o \ - $(OBJS)\wxscintilla_LexCSS.o \ - $(OBJS)\wxscintilla_LexD.o \ - $(OBJS)\wxscintilla_LexECL.o \ - $(OBJS)\wxscintilla_LexEiffel.o \ - $(OBJS)\wxscintilla_LexErlang.o \ - $(OBJS)\wxscintilla_LexEScript.o \ - $(OBJS)\wxscintilla_LexFlagship.o \ - $(OBJS)\wxscintilla_LexForth.o \ - $(OBJS)\wxscintilla_LexFortran.o \ - $(OBJS)\wxscintilla_LexGAP.o \ - $(OBJS)\wxscintilla_LexGui4Cli.o \ - $(OBJS)\wxscintilla_LexHaskell.o \ - $(OBJS)\wxscintilla_LexHTML.o \ - $(OBJS)\wxscintilla_LexInno.o \ - $(OBJS)\wxscintilla_LexKix.o \ - $(OBJS)\wxscintilla_LexLisp.o \ - $(OBJS)\wxscintilla_LexLout.o \ - $(OBJS)\wxscintilla_LexLua.o \ - $(OBJS)\wxscintilla_LexMagik.o \ - $(OBJS)\wxscintilla_LexMarkdown.o \ - $(OBJS)\wxscintilla_LexMatlab.o \ - $(OBJS)\wxscintilla_LexMetapost.o \ - $(OBJS)\wxscintilla_LexMMIXAL.o \ - $(OBJS)\wxscintilla_LexModula.o \ - $(OBJS)\wxscintilla_LexMPT.o \ - $(OBJS)\wxscintilla_LexMSSQL.o \ - $(OBJS)\wxscintilla_LexMySQL.o \ - $(OBJS)\wxscintilla_LexNimrod.o \ - $(OBJS)\wxscintilla_LexNsis.o \ - $(OBJS)\wxscintilla_LexOpal.o \ - $(OBJS)\wxscintilla_LexOScript.o \ - $(OBJS)\wxscintilla_LexOthers.o \ - $(OBJS)\wxscintilla_LexPascal.o \ - $(OBJS)\wxscintilla_LexPB.o \ - $(OBJS)\wxscintilla_LexPerl.o \ - $(OBJS)\wxscintilla_LexPLM.o \ - $(OBJS)\wxscintilla_LexPOV.o \ - $(OBJS)\wxscintilla_LexPowerPro.o \ - $(OBJS)\wxscintilla_LexPowerShell.o \ - $(OBJS)\wxscintilla_LexProgress.o \ - $(OBJS)\wxscintilla_LexPS.o \ - $(OBJS)\wxscintilla_LexPython.o \ - $(OBJS)\wxscintilla_LexR.o \ - $(OBJS)\wxscintilla_LexRebol.o \ - $(OBJS)\wxscintilla_LexRuby.o \ - $(OBJS)\wxscintilla_LexScriptol.o \ - $(OBJS)\wxscintilla_LexSmalltalk.o \ - $(OBJS)\wxscintilla_LexSML.o \ - $(OBJS)\wxscintilla_LexSorcus.o \ - $(OBJS)\wxscintilla_LexSpecman.o \ - $(OBJS)\wxscintilla_LexSpice.o \ - $(OBJS)\wxscintilla_LexSQL.o \ - $(OBJS)\wxscintilla_LexTACL.o \ - $(OBJS)\wxscintilla_LexTADS3.o \ - $(OBJS)\wxscintilla_LexTAL.o \ - $(OBJS)\wxscintilla_LexTCL.o \ - $(OBJS)\wxscintilla_LexTCMD.o \ - $(OBJS)\wxscintilla_LexTeX.o \ - $(OBJS)\wxscintilla_LexTxt2tags.o \ - $(OBJS)\wxscintilla_LexVB.o \ - $(OBJS)\wxscintilla_LexVerilog.o \ - $(OBJS)\wxscintilla_LexVHDL.o \ - $(OBJS)\wxscintilla_LexVisualProlog.o \ - $(OBJS)\wxscintilla_LexYAML.o \ - $(OBJS)\wxscintilla_Accessor.o \ - $(OBJS)\wxscintilla_CharacterSet.o \ - $(OBJS)\wxscintilla_LexerBase.o \ - $(OBJS)\wxscintilla_LexerModule.o \ - $(OBJS)\wxscintilla_LexerNoExceptions.o \ - $(OBJS)\wxscintilla_LexerSimple.o \ - $(OBJS)\wxscintilla_PropSetSimple.o \ - $(OBJS)\wxscintilla_StyleContext.o \ - $(OBJS)\wxscintilla_WordList.o \ - $(OBJS)\wxscintilla_AutoComplete.o \ - $(OBJS)\wxscintilla_CallTip.o \ - $(OBJS)\wxscintilla_Catalogue.o \ - $(OBJS)\wxscintilla_CellBuffer.o \ - $(OBJS)\wxscintilla_CharClassify.o \ - $(OBJS)\wxscintilla_ContractionState.o \ - $(OBJS)\wxscintilla_Decoration.o \ - $(OBJS)\wxscintilla_Document.o \ - $(OBJS)\wxscintilla_Editor.o \ - $(OBJS)\wxscintilla_ExternalLexer.o \ - $(OBJS)\wxscintilla_Indicator.o \ - $(OBJS)\wxscintilla_KeyMap.o \ - $(OBJS)\wxscintilla_LineMarker.o \ - $(OBJS)\wxscintilla_PerLine.o \ - $(OBJS)\wxscintilla_PositionCache.o \ - $(OBJS)\wxscintilla_RESearch.o \ - $(OBJS)\wxscintilla_RunStyles.o \ - $(OBJS)\wxscintilla_ScintillaBase.o \ - $(OBJS)\wxscintilla_Selection.o \ - $(OBJS)\wxscintilla_Style.o \ - $(OBJS)\wxscintilla_UniConversion.o \ - $(OBJS)\wxscintilla_ViewStyle.o \ - $(OBJS)\wxscintilla_XPM.o -MONODLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\lexlib \ - -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ - -DwxUSE_BASE=1 -DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS) -MONODLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib -I..\..\src\stc\scintilla\include \ - -I..\..\src\stc\scintilla\lexlib -I..\..\src\stc\scintilla\src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS -DwxUSE_BASE=1 -DWXMAKINGDLL $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -MONODLL_OBJECTS = \ - $(OBJS)\monodll_dummy.o \ - $(OBJS)\monodll_any.o \ - $(OBJS)\monodll_appbase.o \ - $(OBJS)\monodll_arcall.o \ - $(OBJS)\monodll_arcfind.o \ - $(OBJS)\monodll_archive.o \ - $(OBJS)\monodll_arrstr.o \ - $(OBJS)\monodll_base64.o \ - $(OBJS)\monodll_clntdata.o \ - $(OBJS)\monodll_cmdline.o \ - $(OBJS)\monodll_config.o \ - $(OBJS)\monodll_convauto.o \ - $(OBJS)\monodll_datetime.o \ - $(OBJS)\monodll_datetimefmt.o \ - $(OBJS)\monodll_datstrm.o \ - $(OBJS)\monodll_dircmn.o \ - $(OBJS)\monodll_dynarray.o \ - $(OBJS)\monodll_dynlib.o \ - $(OBJS)\monodll_dynload.o \ - $(OBJS)\monodll_encconv.o \ - $(OBJS)\monodll_evtloopcmn.o \ - $(OBJS)\monodll_extended.o \ - $(OBJS)\monodll_ffile.o \ - $(OBJS)\monodll_file.o \ - $(OBJS)\monodll_fileback.o \ - $(OBJS)\monodll_fileconf.o \ - $(OBJS)\monodll_filefn.o \ - $(OBJS)\monodll_filename.o \ - $(OBJS)\monodll_filesys.o \ - $(OBJS)\monodll_filtall.o \ - $(OBJS)\monodll_filtfind.o \ - $(OBJS)\monodll_fmapbase.o \ - $(OBJS)\monodll_fs_arc.o \ - $(OBJS)\monodll_fs_filter.o \ - $(OBJS)\monodll_hash.o \ - $(OBJS)\monodll_hashmap.o \ - $(OBJS)\monodll_init.o \ - $(OBJS)\monodll_intl.o \ - $(OBJS)\monodll_ipcbase.o \ - $(OBJS)\monodll_languageinfo.o \ - $(OBJS)\monodll_list.o \ - $(OBJS)\monodll_log.o \ - $(OBJS)\monodll_longlong.o \ - $(OBJS)\monodll_memory.o \ - $(OBJS)\monodll_mimecmn.o \ - $(OBJS)\monodll_module.o \ - $(OBJS)\monodll_mstream.o \ - $(OBJS)\monodll_numformatter.o \ - $(OBJS)\monodll_object.o \ - $(OBJS)\monodll_platinfo.o \ - $(OBJS)\monodll_powercmn.o \ - $(OBJS)\monodll_process.o \ - $(OBJS)\monodll_regex.o \ - $(OBJS)\monodll_stdpbase.o \ - $(OBJS)\monodll_sstream.o \ - $(OBJS)\monodll_stdstream.o \ - $(OBJS)\monodll_stopwatch.o \ - $(OBJS)\monodll_strconv.o \ - $(OBJS)\monodll_stream.o \ - $(OBJS)\monodll_string.o \ - $(OBJS)\monodll_stringimpl.o \ - $(OBJS)\monodll_stringops.o \ - $(OBJS)\monodll_strvararg.o \ - $(OBJS)\monodll_sysopt.o \ - $(OBJS)\monodll_tarstrm.o \ - $(OBJS)\monodll_textbuf.o \ - $(OBJS)\monodll_textfile.o \ - $(OBJS)\monodll_threadinfo.o \ - $(OBJS)\monodll_time.o \ - $(OBJS)\monodll_timercmn.o \ - $(OBJS)\monodll_timerimpl.o \ - $(OBJS)\monodll_tokenzr.o \ - $(OBJS)\monodll_translation.o \ - $(OBJS)\monodll_txtstrm.o \ - $(OBJS)\monodll_unichar.o \ - $(OBJS)\monodll_uri.o \ - $(OBJS)\monodll_ustring.o \ - $(OBJS)\monodll_variant.o \ - $(OBJS)\monodll_wfstream.o \ - $(OBJS)\monodll_wxcrt.o \ - $(OBJS)\monodll_wxprintf.o \ - $(OBJS)\monodll_xlocale.o \ - $(OBJS)\monodll_xti.o \ - $(OBJS)\monodll_xtistrm.o \ - $(OBJS)\monodll_zipstrm.o \ - $(OBJS)\monodll_zstream.o \ - $(OBJS)\monodll_fswatchercmn.o \ - $(OBJS)\monodll_fswatcherg.o \ - $(OBJS)\monodll_basemsw.o \ - $(OBJS)\monodll_crashrpt.o \ - $(OBJS)\monodll_debughlp.o \ - $(OBJS)\monodll_dde.o \ - $(OBJS)\monodll_dir.o \ - $(OBJS)\monodll_dlmsw.o \ - $(OBJS)\monodll_evtloopconsole.o \ - $(OBJS)\monodll_mimetype.o \ - $(OBJS)\monodll_power.o \ - $(OBJS)\monodll_regconf.o \ - $(OBJS)\monodll_registry.o \ - $(OBJS)\monodll_snglinst.o \ - $(OBJS)\monodll_stackwalk.o \ - $(OBJS)\monodll_stdpaths.o \ - $(OBJS)\monodll_thread.o \ - $(OBJS)\monodll_timer.o \ - $(OBJS)\monodll_utils.o \ - $(OBJS)\monodll_utilsexc.o \ - $(OBJS)\monodll_fswatcher.o \ - $(OBJS)\monodll_event.o \ - $(OBJS)\monodll_fs_mem.o \ - $(OBJS)\monodll_msgout.o \ - $(OBJS)\monodll_utilscmn.o \ - $(OBJS)\monodll_main.o \ - $(OBJS)\monodll_mslu.o \ - $(OBJS)\monodll_volume.o \ - $(OBJS)\monodll_fs_inet.o \ - $(OBJS)\monodll_ftp.o \ - $(OBJS)\monodll_http.o \ - $(OBJS)\monodll_protocol.o \ - $(OBJS)\monodll_sckaddr.o \ - $(OBJS)\monodll_sckfile.o \ - $(OBJS)\monodll_sckipc.o \ - $(OBJS)\monodll_sckstrm.o \ - $(OBJS)\monodll_socket.o \ - $(OBJS)\monodll_url.o \ - $(OBJS)\monodll_sockmsw.o \ - $(OBJS)\monodll_urlmsw.o \ - $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \ - $(OBJS)\monodll_xml.o \ - $(OBJS)\monodll_xtixml.o \ - $(OBJS)\monodll_version_rc.o -MONOLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\lexlib \ - -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ - -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) -MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib -I..\..\src\stc\scintilla\include \ - -I..\..\src\stc\scintilla\lexlib -I..\..\src\stc\scintilla\src -D__WX__ \ - -DSCI_LEXER -DLINK_LEXERS -DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -MONOLIB_OBJECTS = \ - $(OBJS)\monolib_dummy.o \ - $(OBJS)\monolib_any.o \ - $(OBJS)\monolib_appbase.o \ - $(OBJS)\monolib_arcall.o \ - $(OBJS)\monolib_arcfind.o \ - $(OBJS)\monolib_archive.o \ - $(OBJS)\monolib_arrstr.o \ - $(OBJS)\monolib_base64.o \ - $(OBJS)\monolib_clntdata.o \ - $(OBJS)\monolib_cmdline.o \ - $(OBJS)\monolib_config.o \ - $(OBJS)\monolib_convauto.o \ - $(OBJS)\monolib_datetime.o \ - $(OBJS)\monolib_datetimefmt.o \ - $(OBJS)\monolib_datstrm.o \ - $(OBJS)\monolib_dircmn.o \ - $(OBJS)\monolib_dynarray.o \ - $(OBJS)\monolib_dynlib.o \ - $(OBJS)\monolib_dynload.o \ - $(OBJS)\monolib_encconv.o \ - $(OBJS)\monolib_evtloopcmn.o \ - $(OBJS)\monolib_extended.o \ - $(OBJS)\monolib_ffile.o \ - $(OBJS)\monolib_file.o \ - $(OBJS)\monolib_fileback.o \ - $(OBJS)\monolib_fileconf.o \ - $(OBJS)\monolib_filefn.o \ - $(OBJS)\monolib_filename.o \ - $(OBJS)\monolib_filesys.o \ - $(OBJS)\monolib_filtall.o \ - $(OBJS)\monolib_filtfind.o \ - $(OBJS)\monolib_fmapbase.o \ - $(OBJS)\monolib_fs_arc.o \ - $(OBJS)\monolib_fs_filter.o \ - $(OBJS)\monolib_hash.o \ - $(OBJS)\monolib_hashmap.o \ - $(OBJS)\monolib_init.o \ - $(OBJS)\monolib_intl.o \ - $(OBJS)\monolib_ipcbase.o \ - $(OBJS)\monolib_languageinfo.o \ - $(OBJS)\monolib_list.o \ - $(OBJS)\monolib_log.o \ - $(OBJS)\monolib_longlong.o \ - $(OBJS)\monolib_memory.o \ - $(OBJS)\monolib_mimecmn.o \ - $(OBJS)\monolib_module.o \ - $(OBJS)\monolib_mstream.o \ - $(OBJS)\monolib_numformatter.o \ - $(OBJS)\monolib_object.o \ - $(OBJS)\monolib_platinfo.o \ - $(OBJS)\monolib_powercmn.o \ - $(OBJS)\monolib_process.o \ - $(OBJS)\monolib_regex.o \ - $(OBJS)\monolib_stdpbase.o \ - $(OBJS)\monolib_sstream.o \ - $(OBJS)\monolib_stdstream.o \ - $(OBJS)\monolib_stopwatch.o \ - $(OBJS)\monolib_strconv.o \ - $(OBJS)\monolib_stream.o \ - $(OBJS)\monolib_string.o \ - $(OBJS)\monolib_stringimpl.o \ - $(OBJS)\monolib_stringops.o \ - $(OBJS)\monolib_strvararg.o \ - $(OBJS)\monolib_sysopt.o \ - $(OBJS)\monolib_tarstrm.o \ - $(OBJS)\monolib_textbuf.o \ - $(OBJS)\monolib_textfile.o \ - $(OBJS)\monolib_threadinfo.o \ - $(OBJS)\monolib_time.o \ - $(OBJS)\monolib_timercmn.o \ - $(OBJS)\monolib_timerimpl.o \ - $(OBJS)\monolib_tokenzr.o \ - $(OBJS)\monolib_translation.o \ - $(OBJS)\monolib_txtstrm.o \ - $(OBJS)\monolib_unichar.o \ - $(OBJS)\monolib_uri.o \ - $(OBJS)\monolib_ustring.o \ - $(OBJS)\monolib_variant.o \ - $(OBJS)\monolib_wfstream.o \ - $(OBJS)\monolib_wxcrt.o \ - $(OBJS)\monolib_wxprintf.o \ - $(OBJS)\monolib_xlocale.o \ - $(OBJS)\monolib_xti.o \ - $(OBJS)\monolib_xtistrm.o \ - $(OBJS)\monolib_zipstrm.o \ - $(OBJS)\monolib_zstream.o \ - $(OBJS)\monolib_fswatchercmn.o \ - $(OBJS)\monolib_fswatcherg.o \ - $(OBJS)\monolib_basemsw.o \ - $(OBJS)\monolib_crashrpt.o \ - $(OBJS)\monolib_debughlp.o \ - $(OBJS)\monolib_dde.o \ - $(OBJS)\monolib_dir.o \ - $(OBJS)\monolib_dlmsw.o \ - $(OBJS)\monolib_evtloopconsole.o \ - $(OBJS)\monolib_mimetype.o \ - $(OBJS)\monolib_power.o \ - $(OBJS)\monolib_regconf.o \ - $(OBJS)\monolib_registry.o \ - $(OBJS)\monolib_snglinst.o \ - $(OBJS)\monolib_stackwalk.o \ - $(OBJS)\monolib_stdpaths.o \ - $(OBJS)\monolib_thread.o \ - $(OBJS)\monolib_timer.o \ - $(OBJS)\monolib_utils.o \ - $(OBJS)\monolib_utilsexc.o \ - $(OBJS)\monolib_fswatcher.o \ - $(OBJS)\monolib_event.o \ - $(OBJS)\monolib_fs_mem.o \ - $(OBJS)\monolib_msgout.o \ - $(OBJS)\monolib_utilscmn.o \ - $(OBJS)\monolib_main.o \ - $(OBJS)\monolib_mslu.o \ - $(OBJS)\monolib_volume.o \ - $(OBJS)\monolib_fs_inet.o \ - $(OBJS)\monolib_ftp.o \ - $(OBJS)\monolib_http.o \ - $(OBJS)\monolib_protocol.o \ - $(OBJS)\monolib_sckaddr.o \ - $(OBJS)\monolib_sckfile.o \ - $(OBJS)\monolib_sckipc.o \ - $(OBJS)\monolib_sckstrm.o \ - $(OBJS)\monolib_socket.o \ - $(OBJS)\monolib_url.o \ - $(OBJS)\monolib_sockmsw.o \ - $(OBJS)\monolib_urlmsw.o \ - $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \ - $(OBJS)\monolib_xml.o \ - $(OBJS)\monolib_xtixml.o -BASEDLL_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 \ - -DWXMAKINGDLL_BASE -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) -BASEDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DWXMAKINGDLL_BASE \ - -DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ - $(CPPFLAGS) $(CXXFLAGS) -BASEDLL_OBJECTS = \ - $(OBJS)\basedll_dummy.o \ - $(OBJS)\basedll_version_rc.o \ - $(OBJS)\basedll_any.o \ - $(OBJS)\basedll_appbase.o \ - $(OBJS)\basedll_arcall.o \ - $(OBJS)\basedll_arcfind.o \ - $(OBJS)\basedll_archive.o \ - $(OBJS)\basedll_arrstr.o \ - $(OBJS)\basedll_base64.o \ - $(OBJS)\basedll_clntdata.o \ - $(OBJS)\basedll_cmdline.o \ - $(OBJS)\basedll_config.o \ - $(OBJS)\basedll_convauto.o \ - $(OBJS)\basedll_datetime.o \ - $(OBJS)\basedll_datetimefmt.o \ - $(OBJS)\basedll_datstrm.o \ - $(OBJS)\basedll_dircmn.o \ - $(OBJS)\basedll_dynarray.o \ - $(OBJS)\basedll_dynlib.o \ - $(OBJS)\basedll_dynload.o \ - $(OBJS)\basedll_encconv.o \ - $(OBJS)\basedll_evtloopcmn.o \ - $(OBJS)\basedll_extended.o \ - $(OBJS)\basedll_ffile.o \ - $(OBJS)\basedll_file.o \ - $(OBJS)\basedll_fileback.o \ - $(OBJS)\basedll_fileconf.o \ - $(OBJS)\basedll_filefn.o \ - $(OBJS)\basedll_filename.o \ - $(OBJS)\basedll_filesys.o \ - $(OBJS)\basedll_filtall.o \ - $(OBJS)\basedll_filtfind.o \ - $(OBJS)\basedll_fmapbase.o \ - $(OBJS)\basedll_fs_arc.o \ - $(OBJS)\basedll_fs_filter.o \ - $(OBJS)\basedll_hash.o \ - $(OBJS)\basedll_hashmap.o \ - $(OBJS)\basedll_init.o \ - $(OBJS)\basedll_intl.o \ - $(OBJS)\basedll_ipcbase.o \ - $(OBJS)\basedll_languageinfo.o \ - $(OBJS)\basedll_list.o \ - $(OBJS)\basedll_log.o \ - $(OBJS)\basedll_longlong.o \ - $(OBJS)\basedll_memory.o \ - $(OBJS)\basedll_mimecmn.o \ - $(OBJS)\basedll_module.o \ - $(OBJS)\basedll_mstream.o \ - $(OBJS)\basedll_numformatter.o \ - $(OBJS)\basedll_object.o \ - $(OBJS)\basedll_platinfo.o \ - $(OBJS)\basedll_powercmn.o \ - $(OBJS)\basedll_process.o \ - $(OBJS)\basedll_regex.o \ - $(OBJS)\basedll_stdpbase.o \ - $(OBJS)\basedll_sstream.o \ - $(OBJS)\basedll_stdstream.o \ - $(OBJS)\basedll_stopwatch.o \ - $(OBJS)\basedll_strconv.o \ - $(OBJS)\basedll_stream.o \ - $(OBJS)\basedll_string.o \ - $(OBJS)\basedll_stringimpl.o \ - $(OBJS)\basedll_stringops.o \ - $(OBJS)\basedll_strvararg.o \ - $(OBJS)\basedll_sysopt.o \ - $(OBJS)\basedll_tarstrm.o \ - $(OBJS)\basedll_textbuf.o \ - $(OBJS)\basedll_textfile.o \ - $(OBJS)\basedll_threadinfo.o \ - $(OBJS)\basedll_time.o \ - $(OBJS)\basedll_timercmn.o \ - $(OBJS)\basedll_timerimpl.o \ - $(OBJS)\basedll_tokenzr.o \ - $(OBJS)\basedll_translation.o \ - $(OBJS)\basedll_txtstrm.o \ - $(OBJS)\basedll_unichar.o \ - $(OBJS)\basedll_uri.o \ - $(OBJS)\basedll_ustring.o \ - $(OBJS)\basedll_variant.o \ - $(OBJS)\basedll_wfstream.o \ - $(OBJS)\basedll_wxcrt.o \ - $(OBJS)\basedll_wxprintf.o \ - $(OBJS)\basedll_xlocale.o \ - $(OBJS)\basedll_xti.o \ - $(OBJS)\basedll_xtistrm.o \ - $(OBJS)\basedll_zipstrm.o \ - $(OBJS)\basedll_zstream.o \ - $(OBJS)\basedll_fswatchercmn.o \ - $(OBJS)\basedll_fswatcherg.o \ - $(OBJS)\basedll_basemsw.o \ - $(OBJS)\basedll_crashrpt.o \ - $(OBJS)\basedll_debughlp.o \ - $(OBJS)\basedll_dde.o \ - $(OBJS)\basedll_dir.o \ - $(OBJS)\basedll_dlmsw.o \ - $(OBJS)\basedll_evtloopconsole.o \ - $(OBJS)\basedll_mimetype.o \ - $(OBJS)\basedll_power.o \ - $(OBJS)\basedll_regconf.o \ - $(OBJS)\basedll_registry.o \ - $(OBJS)\basedll_snglinst.o \ - $(OBJS)\basedll_stackwalk.o \ - $(OBJS)\basedll_stdpaths.o \ - $(OBJS)\basedll_thread.o \ - $(OBJS)\basedll_timer.o \ - $(OBJS)\basedll_utils.o \ - $(OBJS)\basedll_utilsexc.o \ - $(OBJS)\basedll_fswatcher.o \ - $(OBJS)\basedll_event.o \ - $(OBJS)\basedll_fs_mem.o \ - $(OBJS)\basedll_msgout.o \ - $(OBJS)\basedll_utilscmn.o \ - $(OBJS)\basedll_main.o \ - $(OBJS)\basedll_mslu.o \ - $(OBJS)\basedll_volume.o -BASELIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 \ - -DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) -BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 -DwxUSE_BASE=1 \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ - $(CXXFLAGS) -BASELIB_OBJECTS = \ - $(OBJS)\baselib_dummy.o \ - $(OBJS)\baselib_any.o \ - $(OBJS)\baselib_appbase.o \ - $(OBJS)\baselib_arcall.o \ - $(OBJS)\baselib_arcfind.o \ - $(OBJS)\baselib_archive.o \ - $(OBJS)\baselib_arrstr.o \ - $(OBJS)\baselib_base64.o \ - $(OBJS)\baselib_clntdata.o \ - $(OBJS)\baselib_cmdline.o \ - $(OBJS)\baselib_config.o \ - $(OBJS)\baselib_convauto.o \ - $(OBJS)\baselib_datetime.o \ - $(OBJS)\baselib_datetimefmt.o \ - $(OBJS)\baselib_datstrm.o \ - $(OBJS)\baselib_dircmn.o \ - $(OBJS)\baselib_dynarray.o \ - $(OBJS)\baselib_dynlib.o \ - $(OBJS)\baselib_dynload.o \ - $(OBJS)\baselib_encconv.o \ - $(OBJS)\baselib_evtloopcmn.o \ - $(OBJS)\baselib_extended.o \ - $(OBJS)\baselib_ffile.o \ - $(OBJS)\baselib_file.o \ - $(OBJS)\baselib_fileback.o \ - $(OBJS)\baselib_fileconf.o \ - $(OBJS)\baselib_filefn.o \ - $(OBJS)\baselib_filename.o \ - $(OBJS)\baselib_filesys.o \ - $(OBJS)\baselib_filtall.o \ - $(OBJS)\baselib_filtfind.o \ - $(OBJS)\baselib_fmapbase.o \ - $(OBJS)\baselib_fs_arc.o \ - $(OBJS)\baselib_fs_filter.o \ - $(OBJS)\baselib_hash.o \ - $(OBJS)\baselib_hashmap.o \ - $(OBJS)\baselib_init.o \ - $(OBJS)\baselib_intl.o \ - $(OBJS)\baselib_ipcbase.o \ - $(OBJS)\baselib_languageinfo.o \ - $(OBJS)\baselib_list.o \ - $(OBJS)\baselib_log.o \ - $(OBJS)\baselib_longlong.o \ - $(OBJS)\baselib_memory.o \ - $(OBJS)\baselib_mimecmn.o \ - $(OBJS)\baselib_module.o \ - $(OBJS)\baselib_mstream.o \ - $(OBJS)\baselib_numformatter.o \ - $(OBJS)\baselib_object.o \ - $(OBJS)\baselib_platinfo.o \ - $(OBJS)\baselib_powercmn.o \ - $(OBJS)\baselib_process.o \ - $(OBJS)\baselib_regex.o \ - $(OBJS)\baselib_stdpbase.o \ - $(OBJS)\baselib_sstream.o \ - $(OBJS)\baselib_stdstream.o \ - $(OBJS)\baselib_stopwatch.o \ - $(OBJS)\baselib_strconv.o \ - $(OBJS)\baselib_stream.o \ - $(OBJS)\baselib_string.o \ - $(OBJS)\baselib_stringimpl.o \ - $(OBJS)\baselib_stringops.o \ - $(OBJS)\baselib_strvararg.o \ - $(OBJS)\baselib_sysopt.o \ - $(OBJS)\baselib_tarstrm.o \ - $(OBJS)\baselib_textbuf.o \ - $(OBJS)\baselib_textfile.o \ - $(OBJS)\baselib_threadinfo.o \ - $(OBJS)\baselib_time.o \ - $(OBJS)\baselib_timercmn.o \ - $(OBJS)\baselib_timerimpl.o \ - $(OBJS)\baselib_tokenzr.o \ - $(OBJS)\baselib_translation.o \ - $(OBJS)\baselib_txtstrm.o \ - $(OBJS)\baselib_unichar.o \ - $(OBJS)\baselib_uri.o \ - $(OBJS)\baselib_ustring.o \ - $(OBJS)\baselib_variant.o \ - $(OBJS)\baselib_wfstream.o \ - $(OBJS)\baselib_wxcrt.o \ - $(OBJS)\baselib_wxprintf.o \ - $(OBJS)\baselib_xlocale.o \ - $(OBJS)\baselib_xti.o \ - $(OBJS)\baselib_xtistrm.o \ - $(OBJS)\baselib_zipstrm.o \ - $(OBJS)\baselib_zstream.o \ - $(OBJS)\baselib_fswatchercmn.o \ - $(OBJS)\baselib_fswatcherg.o \ - $(OBJS)\baselib_basemsw.o \ - $(OBJS)\baselib_crashrpt.o \ - $(OBJS)\baselib_debughlp.o \ - $(OBJS)\baselib_dde.o \ - $(OBJS)\baselib_dir.o \ - $(OBJS)\baselib_dlmsw.o \ - $(OBJS)\baselib_evtloopconsole.o \ - $(OBJS)\baselib_mimetype.o \ - $(OBJS)\baselib_power.o \ - $(OBJS)\baselib_regconf.o \ - $(OBJS)\baselib_registry.o \ - $(OBJS)\baselib_snglinst.o \ - $(OBJS)\baselib_stackwalk.o \ - $(OBJS)\baselib_stdpaths.o \ - $(OBJS)\baselib_thread.o \ - $(OBJS)\baselib_timer.o \ - $(OBJS)\baselib_utils.o \ - $(OBJS)\baselib_utilsexc.o \ - $(OBJS)\baselib_fswatcher.o \ - $(OBJS)\baselib_event.o \ - $(OBJS)\baselib_fs_mem.o \ - $(OBJS)\baselib_msgout.o \ - $(OBJS)\baselib_utilscmn.o \ - $(OBJS)\baselib_main.o \ - $(OBJS)\baselib_mslu.o \ - $(OBJS)\baselib_volume.o -NETDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 \ - -DWXUSINGDLL -DWXMAKINGDLL_NET $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -NETDLL_OBJECTS = \ - $(OBJS)\netdll_dummy.o \ - $(OBJS)\netdll_version_rc.o \ - $(OBJS)\netdll_fs_inet.o \ - $(OBJS)\netdll_ftp.o \ - $(OBJS)\netdll_http.o \ - $(OBJS)\netdll_protocol.o \ - $(OBJS)\netdll_sckaddr.o \ - $(OBJS)\netdll_sckfile.o \ - $(OBJS)\netdll_sckipc.o \ - $(OBJS)\netdll_sckstrm.o \ - $(OBJS)\netdll_socket.o \ - $(OBJS)\netdll_url.o \ - $(OBJS)\netdll_sockmsw.o \ - $(OBJS)\netdll_urlmsw.o -NETLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ - $(CXXFLAGS) -NETLIB_OBJECTS = \ - $(OBJS)\netlib_dummy.o \ - $(OBJS)\netlib_fs_inet.o \ - $(OBJS)\netlib_ftp.o \ - $(OBJS)\netlib_http.o \ - $(OBJS)\netlib_protocol.o \ - $(OBJS)\netlib_sckaddr.o \ - $(OBJS)\netlib_sckfile.o \ - $(OBJS)\netlib_sckipc.o \ - $(OBJS)\netlib_sckstrm.o \ - $(OBJS)\netlib_socket.o \ - $(OBJS)\netlib_url.o \ - $(OBJS)\netlib_sockmsw.o \ - $(OBJS)\netlib_urlmsw.o -COREDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_CORE \ - -DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ - $(CPPFLAGS) $(CXXFLAGS) -COREDLL_OBJECTS = \ - $(OBJS)\coredll_dummy.o \ - $(OBJS)\coredll_version_rc.o \ - $(OBJS)\coredll_event.o \ - $(OBJS)\coredll_fs_mem.o \ - $(OBJS)\coredll_msgout.o \ - $(OBJS)\coredll_utilscmn.o \ - $(OBJS)\coredll_main.o \ - $(OBJS)\coredll_mslu.o \ - $(OBJS)\coredll_volume.o \ - $(____CORE_SRC_FILENAMES_2_OBJECTS) -CORELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_BASE=0 $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -CORELIB_OBJECTS = \ - $(OBJS)\corelib_dummy.o \ - $(OBJS)\corelib_event.o \ - $(OBJS)\corelib_fs_mem.o \ - $(OBJS)\corelib_msgout.o \ - $(OBJS)\corelib_utilscmn.o \ - $(OBJS)\corelib_main.o \ - $(OBJS)\corelib_mslu.o \ - $(OBJS)\corelib_volume.o \ - $(____CORE_SRC_FILENAMES_3_OBJECTS) -ADVDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL \ - -DWXMAKINGDLL_ADV $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ - $(CPPFLAGS) $(CXXFLAGS) -ADVDLL_OBJECTS = \ - $(OBJS)\advdll_dummy.o \ - $(OBJS)\advdll_version_rc.o \ - $(____ADVANCED_SRC_FILENAMES_2_OBJECTS) -ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -ADVLIB_OBJECTS = \ - $(OBJS)\advlib_dummy.o \ - $(____ADVANCED_SRC_FILENAMES_3_OBJECTS) -MEDIADLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_MEDIA \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ - $(CXXFLAGS) -MEDIADLL_OBJECTS = \ - $(OBJS)\mediadll_dummy.o \ - $(OBJS)\mediadll_version_rc.o \ - $(OBJS)\mediadll_mediactrlcmn.o \ - $(OBJS)\mediadll_mediactrl_am.o \ - $(OBJS)\mediadll_mediactrl_wmp10.o \ - $(OBJS)\mediadll_mediactrl_qt.o -MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -MEDIALIB_OBJECTS = \ - $(OBJS)\medialib_dummy.o \ - $(OBJS)\medialib_mediactrlcmn.o \ - $(OBJS)\medialib_mediactrl_am.o \ - $(OBJS)\medialib_mediactrl_wmp10.o \ - $(OBJS)\medialib_mediactrl_qt.o -HTMLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_HTML \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ - $(CXXFLAGS) -HTMLDLL_OBJECTS = \ - $(OBJS)\htmldll_dummy.o \ - $(OBJS)\htmldll_version_rc.o \ - $(OBJS)\htmldll_helpbest.o \ - $(OBJS)\htmldll_helpctrl.o \ - $(OBJS)\htmldll_helpdata.o \ - $(OBJS)\htmldll_helpdlg.o \ - $(OBJS)\htmldll_helpfrm.o \ - $(OBJS)\htmldll_helpwnd.o \ - $(OBJS)\htmldll_htmlcell.o \ - $(OBJS)\htmldll_htmlfilt.o \ - $(OBJS)\htmldll_htmlpars.o \ - $(OBJS)\htmldll_htmltag.o \ - $(OBJS)\htmldll_htmlwin.o \ - $(OBJS)\htmldll_htmprint.o \ - $(OBJS)\htmldll_m_dflist.o \ - $(OBJS)\htmldll_m_fonts.o \ - $(OBJS)\htmldll_m_hline.o \ - $(OBJS)\htmldll_m_image.o \ - $(OBJS)\htmldll_m_layout.o \ - $(OBJS)\htmldll_m_links.o \ - $(OBJS)\htmldll_m_list.o \ - $(OBJS)\htmldll_m_pre.o \ - $(OBJS)\htmldll_m_span.o \ - $(OBJS)\htmldll_m_style.o \ - $(OBJS)\htmldll_m_tables.o \ - $(OBJS)\htmldll_styleparams.o \ - $(OBJS)\htmldll_winpars.o \ - $(OBJS)\htmldll_htmllbox.o -HTMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -HTMLLIB_OBJECTS = \ - $(OBJS)\htmllib_dummy.o \ - $(OBJS)\htmllib_helpbest.o \ - $(OBJS)\htmllib_helpctrl.o \ - $(OBJS)\htmllib_helpdata.o \ - $(OBJS)\htmllib_helpdlg.o \ - $(OBJS)\htmllib_helpfrm.o \ - $(OBJS)\htmllib_helpwnd.o \ - $(OBJS)\htmllib_htmlcell.o \ - $(OBJS)\htmllib_htmlfilt.o \ - $(OBJS)\htmllib_htmlpars.o \ - $(OBJS)\htmllib_htmltag.o \ - $(OBJS)\htmllib_htmlwin.o \ - $(OBJS)\htmllib_htmprint.o \ - $(OBJS)\htmllib_m_dflist.o \ - $(OBJS)\htmllib_m_fonts.o \ - $(OBJS)\htmllib_m_hline.o \ - $(OBJS)\htmllib_m_image.o \ - $(OBJS)\htmllib_m_layout.o \ - $(OBJS)\htmllib_m_links.o \ - $(OBJS)\htmllib_m_list.o \ - $(OBJS)\htmllib_m_pre.o \ - $(OBJS)\htmllib_m_span.o \ - $(OBJS)\htmllib_m_style.o \ - $(OBJS)\htmllib_m_tables.o \ - $(OBJS)\htmllib_styleparams.o \ - $(OBJS)\htmllib_winpars.o \ - $(OBJS)\htmllib_htmllbox.o -WEBVIEWDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_WEBVIEW \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ - $(CXXFLAGS) -WEBVIEWDLL_OBJECTS = \ - $(OBJS)\webviewdll_dummy.o \ - $(OBJS)\webviewdll_version_rc.o \ - $(OBJS)\webviewdll_webview_ie.o \ - $(OBJS)\webviewdll_webview.o \ - $(OBJS)\webviewdll_webviewarchivehandler.o \ - $(OBJS)\webviewdll_webviewfshandler.o -WEBVIEWLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -WEBVIEWLIB_OBJECTS = \ - $(OBJS)\webviewlib_dummy.o \ - $(OBJS)\webviewlib_webview_ie.o \ - $(OBJS)\webviewlib_webview.o \ - $(OBJS)\webviewlib_webviewarchivehandler.o \ - $(OBJS)\webviewlib_webviewfshandler.o -QADLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL \ - -DWXMAKINGDLL_QA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ - $(CPPFLAGS) $(CXXFLAGS) -QADLL_OBJECTS = \ - $(OBJS)\qadll_dummy.o \ - $(OBJS)\qadll_version_rc.o \ - $(OBJS)\qadll_debugrpt.o \ - $(OBJS)\qadll_dbgrptg.o -QALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -QALIB_OBJECTS = \ - $(OBJS)\qalib_dummy.o \ - $(OBJS)\qalib_debugrpt.o \ - $(OBJS)\qalib_dbgrptg.o -XMLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 \ - -DWXUSINGDLL -DWXMAKINGDLL_XML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -XMLDLL_OBJECTS = \ - $(OBJS)\xmldll_dummy.o \ - $(OBJS)\xmldll_version_rc.o \ - $(OBJS)\xmldll_xml.o \ - $(OBJS)\xmldll_xtixml.o -XMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -DwxUSE_GUI=0 \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ - $(CXXFLAGS) -XMLLIB_OBJECTS = \ - $(OBJS)\xmllib_dummy.o \ - $(OBJS)\xmllib_xml.o \ - $(OBJS)\xmllib_xtixml.o -XRCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL \ - -DWXMAKINGDLL_XRC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ - $(CPPFLAGS) $(CXXFLAGS) -XRCDLL_OBJECTS = \ - $(OBJS)\xrcdll_dummy.o \ - $(OBJS)\xrcdll_version_rc.o \ - $(OBJS)\xrcdll_xh_animatctrl.o \ - $(OBJS)\xrcdll_xh_bannerwindow.o \ - $(OBJS)\xrcdll_xh_bmp.o \ - $(OBJS)\xrcdll_xh_bmpcbox.o \ - $(OBJS)\xrcdll_xh_bmpbt.o \ - $(OBJS)\xrcdll_xh_bttn.o \ - $(OBJS)\xrcdll_xh_cald.o \ - $(OBJS)\xrcdll_xh_chckb.o \ - $(OBJS)\xrcdll_xh_chckl.o \ - $(OBJS)\xrcdll_xh_choic.o \ - $(OBJS)\xrcdll_xh_choicbk.o \ - $(OBJS)\xrcdll_xh_clrpicker.o \ - $(OBJS)\xrcdll_xh_cmdlinkbn.o \ - $(OBJS)\xrcdll_xh_collpane.o \ - $(OBJS)\xrcdll_xh_combo.o \ - $(OBJS)\xrcdll_xh_comboctrl.o \ - $(OBJS)\xrcdll_xh_datectrl.o \ - $(OBJS)\xrcdll_xh_dirpicker.o \ - $(OBJS)\xrcdll_xh_dlg.o \ - $(OBJS)\xrcdll_xh_editlbox.o \ - $(OBJS)\xrcdll_xh_filectrl.o \ - $(OBJS)\xrcdll_xh_filepicker.o \ - $(OBJS)\xrcdll_xh_fontpicker.o \ - $(OBJS)\xrcdll_xh_frame.o \ - $(OBJS)\xrcdll_xh_gauge.o \ - $(OBJS)\xrcdll_xh_gdctl.o \ - $(OBJS)\xrcdll_xh_grid.o \ - $(OBJS)\xrcdll_xh_html.o \ - $(OBJS)\xrcdll_xh_hyperlink.o \ - $(OBJS)\xrcdll_xh_listb.o \ - $(OBJS)\xrcdll_xh_listbk.o \ - $(OBJS)\xrcdll_xh_listc.o \ - $(OBJS)\xrcdll_xh_mdi.o \ - $(OBJS)\xrcdll_xh_menu.o \ - $(OBJS)\xrcdll_xh_notbk.o \ - $(OBJS)\xrcdll_xh_odcombo.o \ - $(OBJS)\xrcdll_xh_panel.o \ - $(OBJS)\xrcdll_xh_propdlg.o \ - $(OBJS)\xrcdll_xh_radbt.o \ - $(OBJS)\xrcdll_xh_radbx.o \ - $(OBJS)\xrcdll_xh_scrol.o \ - $(OBJS)\xrcdll_xh_scwin.o \ - $(OBJS)\xrcdll_xh_htmllbox.o \ - $(OBJS)\xrcdll_xh_sizer.o \ - $(OBJS)\xrcdll_xh_slidr.o \ - $(OBJS)\xrcdll_xh_spin.o \ - $(OBJS)\xrcdll_xh_split.o \ - $(OBJS)\xrcdll_xh_srchctrl.o \ - $(OBJS)\xrcdll_xh_statbar.o \ - $(OBJS)\xrcdll_xh_stbmp.o \ - $(OBJS)\xrcdll_xh_stbox.o \ - $(OBJS)\xrcdll_xh_stlin.o \ - $(OBJS)\xrcdll_xh_sttxt.o \ - $(OBJS)\xrcdll_xh_text.o \ - $(OBJS)\xrcdll_xh_tglbtn.o \ - $(OBJS)\xrcdll_xh_timectrl.o \ - $(OBJS)\xrcdll_xh_toolb.o \ - $(OBJS)\xrcdll_xh_toolbk.o \ - $(OBJS)\xrcdll_xh_tree.o \ - $(OBJS)\xrcdll_xh_treebk.o \ - $(OBJS)\xrcdll_xh_unkwn.o \ - $(OBJS)\xrcdll_xh_wizrd.o \ - $(OBJS)\xrcdll_xmlres.o \ - $(OBJS)\xrcdll_xmladv.o \ - $(OBJS)\xrcdll_xmlrsall.o -XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -XRCLIB_OBJECTS = \ - $(OBJS)\xrclib_dummy.o \ - $(OBJS)\xrclib_xh_animatctrl.o \ - $(OBJS)\xrclib_xh_bannerwindow.o \ - $(OBJS)\xrclib_xh_bmp.o \ - $(OBJS)\xrclib_xh_bmpcbox.o \ - $(OBJS)\xrclib_xh_bmpbt.o \ - $(OBJS)\xrclib_xh_bttn.o \ - $(OBJS)\xrclib_xh_cald.o \ - $(OBJS)\xrclib_xh_chckb.o \ - $(OBJS)\xrclib_xh_chckl.o \ - $(OBJS)\xrclib_xh_choic.o \ - $(OBJS)\xrclib_xh_choicbk.o \ - $(OBJS)\xrclib_xh_clrpicker.o \ - $(OBJS)\xrclib_xh_cmdlinkbn.o \ - $(OBJS)\xrclib_xh_collpane.o \ - $(OBJS)\xrclib_xh_combo.o \ - $(OBJS)\xrclib_xh_comboctrl.o \ - $(OBJS)\xrclib_xh_datectrl.o \ - $(OBJS)\xrclib_xh_dirpicker.o \ - $(OBJS)\xrclib_xh_dlg.o \ - $(OBJS)\xrclib_xh_editlbox.o \ - $(OBJS)\xrclib_xh_filectrl.o \ - $(OBJS)\xrclib_xh_filepicker.o \ - $(OBJS)\xrclib_xh_fontpicker.o \ - $(OBJS)\xrclib_xh_frame.o \ - $(OBJS)\xrclib_xh_gauge.o \ - $(OBJS)\xrclib_xh_gdctl.o \ - $(OBJS)\xrclib_xh_grid.o \ - $(OBJS)\xrclib_xh_html.o \ - $(OBJS)\xrclib_xh_hyperlink.o \ - $(OBJS)\xrclib_xh_listb.o \ - $(OBJS)\xrclib_xh_listbk.o \ - $(OBJS)\xrclib_xh_listc.o \ - $(OBJS)\xrclib_xh_mdi.o \ - $(OBJS)\xrclib_xh_menu.o \ - $(OBJS)\xrclib_xh_notbk.o \ - $(OBJS)\xrclib_xh_odcombo.o \ - $(OBJS)\xrclib_xh_panel.o \ - $(OBJS)\xrclib_xh_propdlg.o \ - $(OBJS)\xrclib_xh_radbt.o \ - $(OBJS)\xrclib_xh_radbx.o \ - $(OBJS)\xrclib_xh_scrol.o \ - $(OBJS)\xrclib_xh_scwin.o \ - $(OBJS)\xrclib_xh_htmllbox.o \ - $(OBJS)\xrclib_xh_sizer.o \ - $(OBJS)\xrclib_xh_slidr.o \ - $(OBJS)\xrclib_xh_spin.o \ - $(OBJS)\xrclib_xh_split.o \ - $(OBJS)\xrclib_xh_srchctrl.o \ - $(OBJS)\xrclib_xh_statbar.o \ - $(OBJS)\xrclib_xh_stbmp.o \ - $(OBJS)\xrclib_xh_stbox.o \ - $(OBJS)\xrclib_xh_stlin.o \ - $(OBJS)\xrclib_xh_sttxt.o \ - $(OBJS)\xrclib_xh_text.o \ - $(OBJS)\xrclib_xh_tglbtn.o \ - $(OBJS)\xrclib_xh_timectrl.o \ - $(OBJS)\xrclib_xh_toolb.o \ - $(OBJS)\xrclib_xh_toolbk.o \ - $(OBJS)\xrclib_xh_tree.o \ - $(OBJS)\xrclib_xh_treebk.o \ - $(OBJS)\xrclib_xh_unkwn.o \ - $(OBJS)\xrclib_xh_wizrd.o \ - $(OBJS)\xrclib_xmlres.o \ - $(OBJS)\xrclib_xmladv.o \ - $(OBJS)\xrclib_xmlrsall.o -AUIDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL \ - -DWXMAKINGDLL_AUI $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ - $(CPPFLAGS) $(CXXFLAGS) -AUIDLL_OBJECTS = \ - $(OBJS)\auidll_dummy.o \ - $(OBJS)\auidll_version_rc.o \ - $(OBJS)\auidll_framemanager.o \ - $(OBJS)\auidll_dockart.o \ - $(OBJS)\auidll_floatpane.o \ - $(OBJS)\auidll_auibook.o \ - $(OBJS)\auidll_auibar.o \ - $(OBJS)\auidll_tabmdi.o \ - $(OBJS)\auidll_tabart.o \ - $(OBJS)\auidll_xh_auinotbk.o -AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -AUILIB_OBJECTS = \ - $(OBJS)\auilib_dummy.o \ - $(OBJS)\auilib_framemanager.o \ - $(OBJS)\auilib_dockart.o \ - $(OBJS)\auilib_floatpane.o \ - $(OBJS)\auilib_auibook.o \ - $(OBJS)\auilib_auibar.o \ - $(OBJS)\auilib_tabmdi.o \ - $(OBJS)\auilib_tabart.o \ - $(OBJS)\auilib_xh_auinotbk.o -RIBBONDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_RIBBON \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ - $(CXXFLAGS) -RIBBONDLL_OBJECTS = \ - $(OBJS)\ribbondll_dummy.o \ - $(OBJS)\ribbondll_version_rc.o \ - $(OBJS)\ribbondll_art_internal.o \ - $(OBJS)\ribbondll_art_msw.o \ - $(OBJS)\ribbondll_art_aui.o \ - $(OBJS)\ribbondll_bar.o \ - $(OBJS)\ribbondll_buttonbar.o \ - $(OBJS)\ribbondll_control.o \ - $(OBJS)\ribbondll_gallery.o \ - $(OBJS)\ribbondll_page.o \ - $(OBJS)\ribbondll_panel.o \ - $(OBJS)\ribbondll_toolbar.o \ - $(OBJS)\ribbondll_xh_ribbon.o -RIBBONLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -RIBBONLIB_OBJECTS = \ - $(OBJS)\ribbonlib_dummy.o \ - $(OBJS)\ribbonlib_art_internal.o \ - $(OBJS)\ribbonlib_art_msw.o \ - $(OBJS)\ribbonlib_art_aui.o \ - $(OBJS)\ribbonlib_bar.o \ - $(OBJS)\ribbonlib_buttonbar.o \ - $(OBJS)\ribbonlib_control.o \ - $(OBJS)\ribbonlib_gallery.o \ - $(OBJS)\ribbonlib_page.o \ - $(OBJS)\ribbonlib_panel.o \ - $(OBJS)\ribbonlib_toolbar.o \ - $(OBJS)\ribbonlib_xh_ribbon.o -PROPGRIDDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_PROPGRID \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ - $(CXXFLAGS) -PROPGRIDDLL_OBJECTS = \ - $(OBJS)\propgriddll_dummy.o \ - $(OBJS)\propgriddll_version_rc.o \ - $(OBJS)\propgriddll_advprops.o \ - $(OBJS)\propgriddll_editors.o \ - $(OBJS)\propgriddll_manager.o \ - $(OBJS)\propgriddll_property.o \ - $(OBJS)\propgriddll_propgrid.o \ - $(OBJS)\propgriddll_propgridiface.o \ - $(OBJS)\propgriddll_propgridpagestate.o \ - $(OBJS)\propgriddll_props.o -PROPGRIDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -PROPGRIDLIB_OBJECTS = \ - $(OBJS)\propgridlib_dummy.o \ - $(OBJS)\propgridlib_advprops.o \ - $(OBJS)\propgridlib_editors.o \ - $(OBJS)\propgridlib_manager.o \ - $(OBJS)\propgridlib_property.o \ - $(OBJS)\propgridlib_propgrid.o \ - $(OBJS)\propgridlib_propgridiface.o \ - $(OBJS)\propgridlib_propgridpagestate.o \ - $(OBJS)\propgridlib_props.o -RICHTEXTDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL -DWXMAKINGDLL_RICHTEXT \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ - $(CXXFLAGS) -RICHTEXTDLL_OBJECTS = \ - $(OBJS)\richtextdll_dummy.o \ - $(OBJS)\richtextdll_version_rc.o \ - $(OBJS)\richtextdll_richtextbuffer.o \ - $(OBJS)\richtextdll_richtextctrl.o \ - $(OBJS)\richtextdll_richtextformatdlg.o \ - $(OBJS)\richtextdll_richtexthtml.o \ - $(OBJS)\richtextdll_richtextimagedlg.o \ - $(OBJS)\richtextdll_richtextprint.o \ - $(OBJS)\richtextdll_richtextstyledlg.o \ - $(OBJS)\richtextdll_richtextstyles.o \ - $(OBJS)\richtextdll_richtextsymboldlg.o \ - $(OBJS)\richtextdll_richtextxml.o \ - $(OBJS)\richtextdll_xh_richtext.o -RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ - $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ - $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I..\..\include \ - $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall -DWXBUILDING \ - -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png -I..\..\src\zlib \ - -I..\..\src\regex -I..\..\src\expat\lib $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -RICHTEXTLIB_OBJECTS = \ - $(OBJS)\richtextlib_dummy.o \ - $(OBJS)\richtextlib_richtextbuffer.o \ - $(OBJS)\richtextlib_richtextctrl.o \ - $(OBJS)\richtextlib_richtextformatdlg.o \ - $(OBJS)\richtextlib_richtexthtml.o \ - $(OBJS)\richtextlib_richtextimagedlg.o \ - $(OBJS)\richtextlib_richtextprint.o \ - $(OBJS)\richtextlib_richtextstyledlg.o \ - $(OBJS)\richtextlib_richtextstyles.o \ - $(OBJS)\richtextlib_richtextsymboldlg.o \ - $(OBJS)\richtextlib_richtextxml.o \ - $(OBJS)\richtextlib_xh_richtext.o -STCDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\lexlib \ - -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ - -DWXUSINGDLL -DWXMAKINGDLL_STC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -STCDLL_OBJECTS = \ - $(OBJS)\stcdll_dummy.o \ - $(OBJS)\stcdll_version_rc.o \ - $(OBJS)\stcdll_stc.o \ - $(OBJS)\stcdll_PlatWX.o \ - $(OBJS)\stcdll_ScintillaWX.o -STCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib \ - -I..\..\src\stc\scintilla\include -I..\..\src\stc\scintilla\lexlib \ - -I..\..\src\stc\scintilla\src -D__WX__ -DSCI_LEXER -DLINK_LEXERS \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \ - $(CXXFLAGS) -STCLIB_OBJECTS = \ - $(OBJS)\stclib_dummy.o \ - $(OBJS)\stclib_stc.o \ - $(OBJS)\stclib_PlatWX.o \ - $(OBJS)\stclib_ScintillaWX.o -GLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib -DWXUSINGDLL \ - -DWXMAKINGDLL_GL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \ - $(CPPFLAGS) $(CXXFLAGS) -GLDLL_OBJECTS = \ - $(OBJS)\gldll_dummy.o \ - $(OBJS)\gldll_version_rc.o \ - $(OBJS)\gldll_glcmn.o \ - $(OBJS)\gldll_glcanvas.o -GLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - -I$(SETUPHDIR) -I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \ - -DWXBUILDING -I..\..\src\tiff\libtiff -I..\..\src\jpeg -I..\..\src\png \ - -I..\..\src\zlib -I..\..\src\regex -I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) -GLLIB_OBJECTS = \ - $(OBJS)\gllib_dummy.o \ - $(OBJS)\gllib_glcmn.o \ - $(OBJS)\gllib_glcanvas.o -BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg - -### Conditionally set variables: ### - -ifeq ($(GCC_VERSION),2.95) -GCCFLAGS = -fvtable-thunks -endif -ifeq ($(USE_GUI),0) -PORTNAME = base -endif -ifeq ($(USE_GUI),1) -PORTNAME = msw$(TOOLKIT_VERSION) -endif -ifeq ($(OFFICIAL_BUILD),1) -COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD -endif -ifeq ($(OFFICIAL_BUILD),0) -WXCOMPILER = _gcc -endif -ifeq ($(OFFICIAL_BUILD),1) -WXCOMPILER = _gcc$(COMPILER_VERSION) -endif -ifeq ($(OFFICIAL_BUILD),0) -VENDORTAG = _$(VENDOR) -endif -ifeq ($(OFFICIAL_BUILD),1) -VENDORTAG = -endif -ifeq ($(BUILD),debug) -WXDEBUGFLAG = d -endif -ifeq ($(UNICODE),1) -WXUNICODEFLAG = u -endif -ifeq ($(WXUNIV),1) -WXUNIVNAME = univ -endif -ifeq ($(SHARED),1) -WXDLLFLAG = dll -endif -ifeq ($(SHARED),0) -LIBTYPE_SUFFIX = lib -endif -ifeq ($(SHARED),1) -LIBTYPE_SUFFIX = dll -endif -ifeq ($(USE_GUI),1) -__wxpng___depname = $(LIBDIRNAME)\libwxpng$(WXDEBUGFLAG).a -endif -ifeq ($(USE_GUI),1) -__wxjpeg___depname = $(LIBDIRNAME)\libwxjpeg$(WXDEBUGFLAG).a -endif -ifeq ($(USE_GUI),1) -__wxtiff___depname = $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -__wxscintilla_usingdll_p = -DWXUSINGDLL -endif -endif -ifeq ($(MONOLITHIC),0) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(MONOLITHIC),1) -EXTRALIBS_FOR_BASE = -endif -ifeq ($(MONOLITHIC),1) -ifeq ($(SHARED),1) -__monodll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll -endif -endif -ifeq ($(USE_GUI),1) -____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ - $(____CORE_SRC_FILENAMES_OBJECTS) \ - $(____ADVANCED_SRC_FILENAMES_OBJECTS) \ - $(OBJS)\monodll_mediactrlcmn.o \ - $(OBJS)\monodll_mediactrl_am.o \ - $(OBJS)\monodll_mediactrl_wmp10.o \ - $(OBJS)\monodll_mediactrl_qt.o \ - $(OBJS)\monodll_helpbest.o \ - $(OBJS)\monodll_helpctrl.o \ - $(OBJS)\monodll_helpdata.o \ - $(OBJS)\monodll_helpdlg.o \ - $(OBJS)\monodll_helpfrm.o \ - $(OBJS)\monodll_helpwnd.o \ - $(OBJS)\monodll_htmlcell.o \ - $(OBJS)\monodll_htmlfilt.o \ - $(OBJS)\monodll_htmlpars.o \ - $(OBJS)\monodll_htmltag.o \ - $(OBJS)\monodll_htmlwin.o \ - $(OBJS)\monodll_htmprint.o \ - $(OBJS)\monodll_m_dflist.o \ - $(OBJS)\monodll_m_fonts.o \ - $(OBJS)\monodll_m_hline.o \ - $(OBJS)\monodll_m_image.o \ - $(OBJS)\monodll_m_layout.o \ - $(OBJS)\monodll_m_links.o \ - $(OBJS)\monodll_m_list.o \ - $(OBJS)\monodll_m_pre.o \ - $(OBJS)\monodll_m_span.o \ - $(OBJS)\monodll_m_style.o \ - $(OBJS)\monodll_m_tables.o \ - $(OBJS)\monodll_styleparams.o \ - $(OBJS)\monodll_winpars.o \ - $(OBJS)\monodll_htmllbox.o \ - $(OBJS)\monodll_webview_ie.o \ - $(OBJS)\monodll_webview.o \ - $(OBJS)\monodll_webviewarchivehandler.o \ - $(OBJS)\monodll_webviewfshandler.o \ - $(OBJS)\monodll_debugrpt.o \ - $(OBJS)\monodll_dbgrptg.o \ - $(OBJS)\monodll_xh_animatctrl.o \ - $(OBJS)\monodll_xh_bannerwindow.o \ - $(OBJS)\monodll_xh_bmp.o \ - $(OBJS)\monodll_xh_bmpcbox.o \ - $(OBJS)\monodll_xh_bmpbt.o \ - $(OBJS)\monodll_xh_bttn.o \ - $(OBJS)\monodll_xh_cald.o \ - $(OBJS)\monodll_xh_chckb.o \ - $(OBJS)\monodll_xh_chckl.o \ - $(OBJS)\monodll_xh_choic.o \ - $(OBJS)\monodll_xh_choicbk.o \ - $(OBJS)\monodll_xh_clrpicker.o \ - $(OBJS)\monodll_xh_cmdlinkbn.o \ - $(OBJS)\monodll_xh_collpane.o \ - $(OBJS)\monodll_xh_combo.o \ - $(OBJS)\monodll_xh_comboctrl.o \ - $(OBJS)\monodll_xh_datectrl.o \ - $(OBJS)\monodll_xh_dirpicker.o \ - $(OBJS)\monodll_xh_dlg.o \ - $(OBJS)\monodll_xh_editlbox.o \ - $(OBJS)\monodll_xh_filectrl.o \ - $(OBJS)\monodll_xh_filepicker.o \ - $(OBJS)\monodll_xh_fontpicker.o \ - $(OBJS)\monodll_xh_frame.o \ - $(OBJS)\monodll_xh_gauge.o \ - $(OBJS)\monodll_xh_gdctl.o \ - $(OBJS)\monodll_xh_grid.o \ - $(OBJS)\monodll_xh_html.o \ - $(OBJS)\monodll_xh_hyperlink.o \ - $(OBJS)\monodll_xh_listb.o \ - $(OBJS)\monodll_xh_listbk.o \ - $(OBJS)\monodll_xh_listc.o \ - $(OBJS)\monodll_xh_mdi.o \ - $(OBJS)\monodll_xh_menu.o \ - $(OBJS)\monodll_xh_notbk.o \ - $(OBJS)\monodll_xh_odcombo.o \ - $(OBJS)\monodll_xh_panel.o \ - $(OBJS)\monodll_xh_propdlg.o \ - $(OBJS)\monodll_xh_radbt.o \ - $(OBJS)\monodll_xh_radbx.o \ - $(OBJS)\monodll_xh_scrol.o \ - $(OBJS)\monodll_xh_scwin.o \ - $(OBJS)\monodll_xh_htmllbox.o \ - $(OBJS)\monodll_xh_sizer.o \ - $(OBJS)\monodll_xh_slidr.o \ - $(OBJS)\monodll_xh_spin.o \ - $(OBJS)\monodll_xh_split.o \ - $(OBJS)\monodll_xh_srchctrl.o \ - $(OBJS)\monodll_xh_statbar.o \ - $(OBJS)\monodll_xh_stbmp.o \ - $(OBJS)\monodll_xh_stbox.o \ - $(OBJS)\monodll_xh_stlin.o \ - $(OBJS)\monodll_xh_sttxt.o \ - $(OBJS)\monodll_xh_text.o \ - $(OBJS)\monodll_xh_tglbtn.o \ - $(OBJS)\monodll_xh_timectrl.o \ - $(OBJS)\monodll_xh_toolb.o \ - $(OBJS)\monodll_xh_toolbk.o \ - $(OBJS)\monodll_xh_tree.o \ - $(OBJS)\monodll_xh_treebk.o \ - $(OBJS)\monodll_xh_unkwn.o \ - $(OBJS)\monodll_xh_wizrd.o \ - $(OBJS)\monodll_xmlres.o \ - $(OBJS)\monodll_xmladv.o \ - $(OBJS)\monodll_xmlrsall.o \ - $(OBJS)\monodll_framemanager.o \ - $(OBJS)\monodll_dockart.o \ - $(OBJS)\monodll_floatpane.o \ - $(OBJS)\monodll_auibook.o \ - $(OBJS)\monodll_auibar.o \ - $(OBJS)\monodll_tabmdi.o \ - $(OBJS)\monodll_tabart.o \ - $(OBJS)\monodll_xh_auinotbk.o \ - $(OBJS)\monodll_advprops.o \ - $(OBJS)\monodll_editors.o \ - $(OBJS)\monodll_manager.o \ - $(OBJS)\monodll_property.o \ - $(OBJS)\monodll_propgrid.o \ - $(OBJS)\monodll_propgridiface.o \ - $(OBJS)\monodll_propgridpagestate.o \ - $(OBJS)\monodll_props.o \ - $(OBJS)\monodll_art_internal.o \ - $(OBJS)\monodll_art_msw.o \ - $(OBJS)\monodll_art_aui.o \ - $(OBJS)\monodll_bar.o \ - $(OBJS)\monodll_ribbon_buttonbar.o \ - $(OBJS)\monodll_ribbon_control.o \ - $(OBJS)\monodll_gallery.o \ - $(OBJS)\monodll_page.o \ - $(OBJS)\monodll_ribbon_panel.o \ - $(OBJS)\monodll_ribbon_toolbar.o \ - $(OBJS)\monodll_xh_ribbon.o \ - $(OBJS)\monodll_richtextbuffer.o \ - $(OBJS)\monodll_richtextctrl.o \ - $(OBJS)\monodll_richtextformatdlg.o \ - $(OBJS)\monodll_richtexthtml.o \ - $(OBJS)\monodll_richtextimagedlg.o \ - $(OBJS)\monodll_richtextprint.o \ - $(OBJS)\monodll_richtextstyledlg.o \ - $(OBJS)\monodll_richtextstyles.o \ - $(OBJS)\monodll_richtextsymboldlg.o \ - $(OBJS)\monodll_richtextxml.o \ - $(OBJS)\monodll_xh_richtext.o \ - $(OBJS)\monodll_stc.o \ - $(OBJS)\monodll_PlatWX.o \ - $(OBJS)\monodll_ScintillaWX.o -endif -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),0) -____CORE_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_activex.o \ - $(OBJS)\monodll_app.o \ - $(OBJS)\monodll_bitmap.o \ - $(OBJS)\monodll_brush.o \ - $(OBJS)\monodll_caret.o \ - $(OBJS)\monodll_clipbrd.o \ - $(OBJS)\monodll_colour.o \ - $(OBJS)\monodll_cursor.o \ - $(OBJS)\monodll_data.o \ - $(OBJS)\monodll_dc.o \ - $(OBJS)\monodll_dcclient.o \ - $(OBJS)\monodll_dcmemory.o \ - $(OBJS)\monodll_dcprint.o \ - $(OBJS)\monodll_dcscreen.o \ - $(OBJS)\monodll_dialup.o \ - $(OBJS)\monodll_dib.o \ - $(OBJS)\monodll_display.o \ - $(OBJS)\monodll_enhmeta.o \ - $(OBJS)\monodll_font.o \ - $(OBJS)\monodll_fontenum.o \ - $(OBJS)\monodll_fontutil.o \ - $(OBJS)\monodll_gdiimage.o \ - $(OBJS)\monodll_gdiobj.o \ - $(OBJS)\monodll_gdiplus.o \ - $(OBJS)\monodll_graphics.o \ - $(OBJS)\monodll_icon.o \ - $(OBJS)\monodll_imaglist.o \ - $(OBJS)\monodll_minifram.o \ - $(OBJS)\monodll_nonownedwnd.o \ - $(OBJS)\monodll_dataobj.o \ - $(OBJS)\monodll_dropsrc.o \ - $(OBJS)\monodll_droptgt.o \ - $(OBJS)\monodll_oleutils.o \ - $(OBJS)\monodll_safearray.o \ - $(OBJS)\monodll_palette.o \ - $(OBJS)\monodll_pen.o \ - $(OBJS)\monodll_popupwin.o \ - $(OBJS)\monodll_printdlg.o \ - $(OBJS)\monodll_printwin.o \ - $(OBJS)\monodll_region.o \ - $(OBJS)\monodll_renderer.o \ - $(OBJS)\monodll_settings.o \ - $(OBJS)\monodll_textmeasure.o \ - $(OBJS)\monodll_tooltip.o \ - $(OBJS)\monodll_toplevel.o \ - $(OBJS)\monodll_uiaction.o \ - $(OBJS)\monodll_utilsgui.o \ - $(OBJS)\monodll_utilswin.o \ - $(OBJS)\monodll_uxtheme.o \ - $(OBJS)\monodll_window.o \ - $(OBJS)\monodll_helpchm.o \ - $(OBJS)\monodll_helpwin.o \ - $(OBJS)\monodll_automtn.o \ - $(OBJS)\monodll_uuid.o \ - $(OBJS)\monodll_clrpickerg.o \ - $(OBJS)\monodll_collpaneg.o \ - $(OBJS)\monodll_filepickerg.o \ - $(OBJS)\monodll_fontpickerg.o \ - $(OBJS)\monodll_generic_statusbr.o \ - $(OBJS)\monodll_prntdlgg.o \ - $(OBJS)\monodll_msw_accel.o \ - $(OBJS)\monodll_anybutton.o \ - $(OBJS)\monodll_artmsw.o \ - $(OBJS)\monodll_msw_bmpbuttn.o \ - $(OBJS)\monodll_msw_button.o \ - $(OBJS)\monodll_msw_checkbox.o \ - $(OBJS)\monodll_msw_choice.o \ - $(OBJS)\monodll_colordlg.o \ - $(OBJS)\monodll_combo.o \ - $(OBJS)\monodll_msw_combobox.o \ - $(OBJS)\monodll_msw_control.o \ - $(OBJS)\monodll_msw_dialog.o \ - $(OBJS)\monodll_dirdlg.o \ - $(OBJS)\monodll_dragimag.o \ - $(OBJS)\monodll_evtloop.o \ - $(OBJS)\monodll_filedlg.o \ - $(OBJS)\monodll_frame.o \ - $(OBJS)\monodll_msw_gauge.o \ - $(OBJS)\monodll_headerctrl.o \ - $(OBJS)\monodll_iniconf.o \ - $(OBJS)\monodll_msw_listbox.o \ - $(OBJS)\monodll_msw_listctrl.o \ - $(OBJS)\monodll_mdi.o \ - $(OBJS)\monodll_msw_menu.o \ - $(OBJS)\monodll_menuitem.o \ - $(OBJS)\monodll_metafile.o \ - $(OBJS)\monodll_msgdlg.o \ - $(OBJS)\monodll_nativdlg.o \ - $(OBJS)\monodll_nativewin.o \ - $(OBJS)\monodll_msw_notebook.o \ - $(OBJS)\monodll_access.o \ - $(OBJS)\monodll_ownerdrw.o \ - $(OBJS)\monodll_msw_panel.o \ - $(OBJS)\monodll_progdlg.o \ - $(OBJS)\monodll_msw_radiobox.o \ - $(OBJS)\monodll_msw_radiobut.o \ - $(OBJS)\monodll_richmsgdlg.o \ - $(OBJS)\monodll_msw_scrolbar.o \ - $(OBJS)\monodll_msw_slider.o \ - $(OBJS)\monodll_msw_spinbutt.o \ - $(OBJS)\monodll_spinctrl.o \ - $(OBJS)\monodll_msw_statbmp.o \ - $(OBJS)\monodll_msw_statbox.o \ - $(OBJS)\monodll_statusbar.o \ - $(OBJS)\monodll_msw_statline.o \ - $(OBJS)\monodll_msw_stattext.o \ - $(OBJS)\monodll_msw_toolbar.o \ - $(OBJS)\monodll_msw_textctrl.o \ - $(OBJS)\monodll_textentry.o \ - $(OBJS)\monodll_msw_tglbtn.o \ - $(OBJS)\monodll_treectrl.o \ - $(OBJS)\monodll_msw_checklst.o \ - $(OBJS)\monodll_msw_fdrepdlg.o \ - $(OBJS)\monodll_fontdlg.o \ - $(OBJS)\monodll_accelcmn.o \ - $(OBJS)\monodll_accesscmn.o \ - $(OBJS)\monodll_anidecod.o \ - $(OBJS)\monodll_affinematrix2d.o \ - $(OBJS)\monodll_appcmn.o \ - $(OBJS)\monodll_artprov.o \ - $(OBJS)\monodll_artstd.o \ - $(OBJS)\monodll_arttango.o \ - $(OBJS)\monodll_bmpbase.o \ - $(OBJS)\monodll_bmpbtncmn.o \ - $(OBJS)\monodll_bookctrl.o \ - $(OBJS)\monodll_btncmn.o \ - $(OBJS)\monodll_cairo.o \ - $(OBJS)\monodll_checkboxcmn.o \ - $(OBJS)\monodll_checklstcmn.o \ - $(OBJS)\monodll_choiccmn.o \ - $(OBJS)\monodll_clipcmn.o \ - $(OBJS)\monodll_clrpickercmn.o \ - $(OBJS)\monodll_colourcmn.o \ - $(OBJS)\monodll_colourdata.o \ - $(OBJS)\monodll_combocmn.o \ - $(OBJS)\monodll_cmdproc.o \ - $(OBJS)\monodll_cmndata.o \ - $(OBJS)\monodll_containr.o \ - $(OBJS)\monodll_cshelp.o \ - $(OBJS)\monodll_ctrlcmn.o \ - $(OBJS)\monodll_ctrlsub.o \ - $(OBJS)\monodll_dcbase.o \ - $(OBJS)\monodll_dcbufcmn.o \ - $(OBJS)\monodll_dcgraph.o \ - $(OBJS)\monodll_dcsvg.o \ - $(OBJS)\monodll_dirctrlcmn.o \ - $(OBJS)\monodll_dlgcmn.o \ - $(OBJS)\monodll_dndcmn.o \ - $(OBJS)\monodll_dobjcmn.o \ - $(OBJS)\monodll_docmdi.o \ - $(OBJS)\monodll_docview.o \ - $(OBJS)\monodll_dpycmn.o \ - $(OBJS)\monodll_dseldlg.o \ - $(OBJS)\monodll_effects.o \ - $(OBJS)\monodll_fddlgcmn.o \ - $(OBJS)\monodll_filectrlcmn.o \ - $(OBJS)\monodll_filehistorycmn.o \ - $(OBJS)\monodll_filepickercmn.o \ - $(OBJS)\monodll_fontpickercmn.o \ - $(OBJS)\monodll_fldlgcmn.o \ - $(OBJS)\monodll_fontcmn.o \ - $(OBJS)\monodll_fontdata.o \ - $(OBJS)\monodll_graphicc.o \ - $(OBJS)\monodll_fontenumcmn.o \ - $(OBJS)\monodll_fontmap.o \ - $(OBJS)\monodll_fontutilcmn.o \ - $(OBJS)\monodll_framecmn.o \ - $(OBJS)\monodll_gaugecmn.o \ - $(OBJS)\monodll_gbsizer.o \ - $(OBJS)\monodll_gdicmn.o \ - $(OBJS)\monodll_geometry.o \ - $(OBJS)\monodll_gifdecod.o \ - $(OBJS)\monodll_graphcmn.o \ - $(OBJS)\monodll_headercolcmn.o \ - $(OBJS)\monodll_headerctrlcmn.o \ - $(OBJS)\monodll_helpbase.o \ - $(OBJS)\monodll_iconbndl.o \ - $(OBJS)\monodll_imagall.o \ - $(OBJS)\monodll_imagbmp.o \ - $(OBJS)\monodll_image.o \ - $(OBJS)\monodll_imagfill.o \ - $(OBJS)\monodll_imaggif.o \ - $(OBJS)\monodll_imagiff.o \ - $(OBJS)\monodll_imagjpeg.o \ - $(OBJS)\monodll_imagpcx.o \ - $(OBJS)\monodll_imagpng.o \ - $(OBJS)\monodll_imagpnm.o \ - $(OBJS)\monodll_imagtga.o \ - $(OBJS)\monodll_imagtiff.o \ - $(OBJS)\monodll_imagxpm.o \ - $(OBJS)\monodll_layout.o \ - $(OBJS)\monodll_lboxcmn.o \ - $(OBJS)\monodll_listctrlcmn.o \ - $(OBJS)\monodll_markupparser.o \ - $(OBJS)\monodll_matrix.o \ - $(OBJS)\monodll_menucmn.o \ - $(OBJS)\monodll_modalhook.o \ - $(OBJS)\monodll_mousemanager.o \ - $(OBJS)\monodll_nbkbase.o \ - $(OBJS)\monodll_overlaycmn.o \ - $(OBJS)\monodll_ownerdrwcmn.o \ - $(OBJS)\monodll_paper.o \ - $(OBJS)\monodll_panelcmn.o \ - $(OBJS)\monodll_persist.o \ - $(OBJS)\monodll_pickerbase.o \ - $(OBJS)\monodll_popupcmn.o \ - $(OBJS)\monodll_preferencescmn.o \ - $(OBJS)\monodll_prntbase.o \ - $(OBJS)\monodll_quantize.o \ - $(OBJS)\monodll_radiobtncmn.o \ - $(OBJS)\monodll_radiocmn.o \ - $(OBJS)\monodll_rearrangectrl.o \ - $(OBJS)\monodll_rendcmn.o \ - $(OBJS)\monodll_rgncmn.o \ - $(OBJS)\monodll_scrolbarcmn.o \ - $(OBJS)\monodll_settcmn.o \ - $(OBJS)\monodll_sizer.o \ - $(OBJS)\monodll_slidercmn.o \ - $(OBJS)\monodll_spinbtncmn.o \ - $(OBJS)\monodll_spinctrlcmn.o \ - $(OBJS)\monodll_srchcmn.o \ - $(OBJS)\monodll_statbar.o \ - $(OBJS)\monodll_statbmpcmn.o \ - $(OBJS)\monodll_statboxcmn.o \ - $(OBJS)\monodll_statlinecmn.o \ - $(OBJS)\monodll_stattextcmn.o \ - $(OBJS)\monodll_stockitem.o \ - $(OBJS)\monodll_tbarbase.o \ - $(OBJS)\monodll_textcmn.o \ - $(OBJS)\monodll_textentrycmn.o \ - $(OBJS)\monodll_textmeasurecmn.o \ - $(OBJS)\monodll_toplvcmn.o \ - $(OBJS)\monodll_treebase.o \ - $(OBJS)\monodll_uiactioncmn.o \ - $(OBJS)\monodll_valgen.o \ - $(OBJS)\monodll_validate.o \ - $(OBJS)\monodll_valtext.o \ - $(OBJS)\monodll_valnum.o \ - $(OBJS)\monodll_wincmn.o \ - $(OBJS)\monodll_windowid.o \ - $(OBJS)\monodll_wrapsizer.o \ - $(OBJS)\monodll_xpmdecod.o \ - $(OBJS)\monodll_busyinfo.o \ - $(OBJS)\monodll_generic_buttonbar.o \ - $(OBJS)\monodll_choicdgg.o \ - $(OBJS)\monodll_choicbkg.o \ - $(OBJS)\monodll_combog.o \ - $(OBJS)\monodll_dcpsg.o \ - $(OBJS)\monodll_dirctrlg.o \ - $(OBJS)\monodll_dragimgg.o \ - $(OBJS)\monodll_filectrlg.o \ - $(OBJS)\monodll_headerctrlg.o \ - $(OBJS)\monodll_infobar.o \ - $(OBJS)\monodll_listbkg.o \ - $(OBJS)\monodll_logg.o \ - $(OBJS)\monodll_markuptext.o \ - $(OBJS)\monodll_msgdlgg.o \ - $(OBJS)\monodll_numdlgg.o \ - $(OBJS)\monodll_progdlgg.o \ - $(OBJS)\monodll_preferencesg.o \ - $(OBJS)\monodll_printps.o \ - $(OBJS)\monodll_renderg.o \ - $(OBJS)\monodll_richmsgdlgg.o \ - $(OBJS)\monodll_scrlwing.o \ - $(OBJS)\monodll_selstore.o \ - $(OBJS)\monodll_spinctlg.o \ - $(OBJS)\monodll_splitter.o \ - $(OBJS)\monodll_srchctlg.o \ - $(OBJS)\monodll_statbmpg.o \ - $(OBJS)\monodll_stattextg.o \ - $(OBJS)\monodll_textdlgg.o \ - $(OBJS)\monodll_tipwin.o \ - $(OBJS)\monodll_toolbkg.o \ - $(OBJS)\monodll_treectlg.o \ - $(OBJS)\monodll_treebkg.o \ - $(OBJS)\monodll_vlbox.o \ - $(OBJS)\monodll_vscroll.o \ - $(OBJS)\monodll_xmlreshandler.o -endif -endif -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),1) -____CORE_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_activex.o \ - $(OBJS)\monodll_app.o \ - $(OBJS)\monodll_bitmap.o \ - $(OBJS)\monodll_brush.o \ - $(OBJS)\monodll_caret.o \ - $(OBJS)\monodll_clipbrd.o \ - $(OBJS)\monodll_colour.o \ - $(OBJS)\monodll_cursor.o \ - $(OBJS)\monodll_data.o \ - $(OBJS)\monodll_dc.o \ - $(OBJS)\monodll_dcclient.o \ - $(OBJS)\monodll_dcmemory.o \ - $(OBJS)\monodll_dcprint.o \ - $(OBJS)\monodll_dcscreen.o \ - $(OBJS)\monodll_dialup.o \ - $(OBJS)\monodll_dib.o \ - $(OBJS)\monodll_display.o \ - $(OBJS)\monodll_enhmeta.o \ - $(OBJS)\monodll_font.o \ - $(OBJS)\monodll_fontenum.o \ - $(OBJS)\monodll_fontutil.o \ - $(OBJS)\monodll_gdiimage.o \ - $(OBJS)\monodll_gdiobj.o \ - $(OBJS)\monodll_gdiplus.o \ - $(OBJS)\monodll_graphics.o \ - $(OBJS)\monodll_icon.o \ - $(OBJS)\monodll_imaglist.o \ - $(OBJS)\monodll_minifram.o \ - $(OBJS)\monodll_nonownedwnd.o \ - $(OBJS)\monodll_dataobj.o \ - $(OBJS)\monodll_dropsrc.o \ - $(OBJS)\monodll_droptgt.o \ - $(OBJS)\monodll_oleutils.o \ - $(OBJS)\monodll_safearray.o \ - $(OBJS)\monodll_palette.o \ - $(OBJS)\monodll_pen.o \ - $(OBJS)\monodll_popupwin.o \ - $(OBJS)\monodll_printdlg.o \ - $(OBJS)\monodll_printwin.o \ - $(OBJS)\monodll_region.o \ - $(OBJS)\monodll_renderer.o \ - $(OBJS)\monodll_settings.o \ - $(OBJS)\monodll_textmeasure.o \ - $(OBJS)\monodll_tooltip.o \ - $(OBJS)\monodll_toplevel.o \ - $(OBJS)\monodll_uiaction.o \ - $(OBJS)\monodll_utilsgui.o \ - $(OBJS)\monodll_utilswin.o \ - $(OBJS)\monodll_uxtheme.o \ - $(OBJS)\monodll_window.o \ - $(OBJS)\monodll_helpchm.o \ - $(OBJS)\monodll_helpwin.o \ - $(OBJS)\monodll_automtn.o \ - $(OBJS)\monodll_uuid.o \ - $(OBJS)\monodll_evtloop.o \ - $(OBJS)\monodll_generic_accel.o \ - $(OBJS)\monodll_clrpickerg.o \ - $(OBJS)\monodll_collpaneg.o \ - $(OBJS)\monodll_colrdlgg.o \ - $(OBJS)\monodll_dirdlgg.o \ - $(OBJS)\monodll_generic_fdrepdlg.o \ - $(OBJS)\monodll_filedlgg.o \ - $(OBJS)\monodll_filepickerg.o \ - $(OBJS)\monodll_fontdlgg.o \ - $(OBJS)\monodll_fontpickerg.o \ - $(OBJS)\monodll_generic_listctrl.o \ - $(OBJS)\monodll_mdig.o \ - $(OBJS)\monodll_prntdlgg.o \ - $(OBJS)\monodll_univ_bmpbuttn.o \ - $(OBJS)\monodll_univ_button.o \ - $(OBJS)\monodll_univ_checkbox.o \ - $(OBJS)\monodll_univ_checklst.o \ - $(OBJS)\monodll_univ_choice.o \ - $(OBJS)\monodll_univ_combobox.o \ - $(OBJS)\monodll_univ_control.o \ - $(OBJS)\monodll_ctrlrend.o \ - $(OBJS)\monodll_univ_dialog.o \ - $(OBJS)\monodll_framuniv.o \ - $(OBJS)\monodll_univ_gauge.o \ - $(OBJS)\monodll_inpcons.o \ - $(OBJS)\monodll_inphand.o \ - $(OBJS)\monodll_univ_listbox.o \ - $(OBJS)\monodll_univ_menu.o \ - $(OBJS)\monodll_univ_notebook.o \ - $(OBJS)\monodll_univ_radiobox.o \ - $(OBJS)\monodll_univ_radiobut.o \ - $(OBJS)\monodll_scrarrow.o \ - $(OBJS)\monodll_univ_scrolbar.o \ - $(OBJS)\monodll_scrthumb.o \ - $(OBJS)\monodll_settingsuniv.o \ - $(OBJS)\monodll_univ_slider.o \ - $(OBJS)\monodll_univ_spinbutt.o \ - $(OBJS)\monodll_univ_statbmp.o \ - $(OBJS)\monodll_univ_statbox.o \ - $(OBJS)\monodll_univ_statline.o \ - $(OBJS)\monodll_univ_stattext.o \ - $(OBJS)\monodll_univ_statusbr.o \ - $(OBJS)\monodll_stdrend.o \ - $(OBJS)\monodll_univ_textctrl.o \ - $(OBJS)\monodll_univ_tglbtn.o \ - $(OBJS)\monodll_theme.o \ - $(OBJS)\monodll_univ_toolbar.o \ - $(OBJS)\monodll_topluniv.o \ - $(OBJS)\monodll_winuniv.o \ - $(OBJS)\monodll_gtk.o \ - $(OBJS)\monodll_metal.o \ - $(OBJS)\monodll_mono.o \ - $(OBJS)\monodll_win32.o \ - $(OBJS)\monodll_accelcmn.o \ - $(OBJS)\monodll_accesscmn.o \ - $(OBJS)\monodll_anidecod.o \ - $(OBJS)\monodll_affinematrix2d.o \ - $(OBJS)\monodll_appcmn.o \ - $(OBJS)\monodll_artprov.o \ - $(OBJS)\monodll_artstd.o \ - $(OBJS)\monodll_arttango.o \ - $(OBJS)\monodll_bmpbase.o \ - $(OBJS)\monodll_bmpbtncmn.o \ - $(OBJS)\monodll_bookctrl.o \ - $(OBJS)\monodll_btncmn.o \ - $(OBJS)\monodll_cairo.o \ - $(OBJS)\monodll_checkboxcmn.o \ - $(OBJS)\monodll_checklstcmn.o \ - $(OBJS)\monodll_choiccmn.o \ - $(OBJS)\monodll_clipcmn.o \ - $(OBJS)\monodll_clrpickercmn.o \ - $(OBJS)\monodll_colourcmn.o \ - $(OBJS)\monodll_colourdata.o \ - $(OBJS)\monodll_combocmn.o \ - $(OBJS)\monodll_cmdproc.o \ - $(OBJS)\monodll_cmndata.o \ - $(OBJS)\monodll_containr.o \ - $(OBJS)\monodll_cshelp.o \ - $(OBJS)\monodll_ctrlcmn.o \ - $(OBJS)\monodll_ctrlsub.o \ - $(OBJS)\monodll_dcbase.o \ - $(OBJS)\monodll_dcbufcmn.o \ - $(OBJS)\monodll_dcgraph.o \ - $(OBJS)\monodll_dcsvg.o \ - $(OBJS)\monodll_dirctrlcmn.o \ - $(OBJS)\monodll_dlgcmn.o \ - $(OBJS)\monodll_dndcmn.o \ - $(OBJS)\monodll_dobjcmn.o \ - $(OBJS)\monodll_docmdi.o \ - $(OBJS)\monodll_docview.o \ - $(OBJS)\monodll_dpycmn.o \ - $(OBJS)\monodll_dseldlg.o \ - $(OBJS)\monodll_effects.o \ - $(OBJS)\monodll_fddlgcmn.o \ - $(OBJS)\monodll_filectrlcmn.o \ - $(OBJS)\monodll_filehistorycmn.o \ - $(OBJS)\monodll_filepickercmn.o \ - $(OBJS)\monodll_fontpickercmn.o \ - $(OBJS)\monodll_fldlgcmn.o \ - $(OBJS)\monodll_fontcmn.o \ - $(OBJS)\monodll_fontdata.o \ - $(OBJS)\monodll_graphicc.o \ - $(OBJS)\monodll_fontenumcmn.o \ - $(OBJS)\monodll_fontmap.o \ - $(OBJS)\monodll_fontutilcmn.o \ - $(OBJS)\monodll_framecmn.o \ - $(OBJS)\monodll_gaugecmn.o \ - $(OBJS)\monodll_gbsizer.o \ - $(OBJS)\monodll_gdicmn.o \ - $(OBJS)\monodll_geometry.o \ - $(OBJS)\monodll_gifdecod.o \ - $(OBJS)\monodll_graphcmn.o \ - $(OBJS)\monodll_headercolcmn.o \ - $(OBJS)\monodll_headerctrlcmn.o \ - $(OBJS)\monodll_helpbase.o \ - $(OBJS)\monodll_iconbndl.o \ - $(OBJS)\monodll_imagall.o \ - $(OBJS)\monodll_imagbmp.o \ - $(OBJS)\monodll_image.o \ - $(OBJS)\monodll_imagfill.o \ - $(OBJS)\monodll_imaggif.o \ - $(OBJS)\monodll_imagiff.o \ - $(OBJS)\monodll_imagjpeg.o \ - $(OBJS)\monodll_imagpcx.o \ - $(OBJS)\monodll_imagpng.o \ - $(OBJS)\monodll_imagpnm.o \ - $(OBJS)\monodll_imagtga.o \ - $(OBJS)\monodll_imagtiff.o \ - $(OBJS)\monodll_imagxpm.o \ - $(OBJS)\monodll_layout.o \ - $(OBJS)\monodll_lboxcmn.o \ - $(OBJS)\monodll_listctrlcmn.o \ - $(OBJS)\monodll_markupparser.o \ - $(OBJS)\monodll_matrix.o \ - $(OBJS)\monodll_menucmn.o \ - $(OBJS)\monodll_modalhook.o \ - $(OBJS)\monodll_mousemanager.o \ - $(OBJS)\monodll_nbkbase.o \ - $(OBJS)\monodll_overlaycmn.o \ - $(OBJS)\monodll_ownerdrwcmn.o \ - $(OBJS)\monodll_paper.o \ - $(OBJS)\monodll_panelcmn.o \ - $(OBJS)\monodll_persist.o \ - $(OBJS)\monodll_pickerbase.o \ - $(OBJS)\monodll_popupcmn.o \ - $(OBJS)\monodll_preferencescmn.o \ - $(OBJS)\monodll_prntbase.o \ - $(OBJS)\monodll_quantize.o \ - $(OBJS)\monodll_radiobtncmn.o \ - $(OBJS)\monodll_radiocmn.o \ - $(OBJS)\monodll_rearrangectrl.o \ - $(OBJS)\monodll_rendcmn.o \ - $(OBJS)\monodll_rgncmn.o \ - $(OBJS)\monodll_scrolbarcmn.o \ - $(OBJS)\monodll_settcmn.o \ - $(OBJS)\monodll_sizer.o \ - $(OBJS)\monodll_slidercmn.o \ - $(OBJS)\monodll_spinbtncmn.o \ - $(OBJS)\monodll_spinctrlcmn.o \ - $(OBJS)\monodll_srchcmn.o \ - $(OBJS)\monodll_statbar.o \ - $(OBJS)\monodll_statbmpcmn.o \ - $(OBJS)\monodll_statboxcmn.o \ - $(OBJS)\monodll_statlinecmn.o \ - $(OBJS)\monodll_stattextcmn.o \ - $(OBJS)\monodll_stockitem.o \ - $(OBJS)\monodll_tbarbase.o \ - $(OBJS)\monodll_textcmn.o \ - $(OBJS)\monodll_textentrycmn.o \ - $(OBJS)\monodll_textmeasurecmn.o \ - $(OBJS)\monodll_toplvcmn.o \ - $(OBJS)\monodll_treebase.o \ - $(OBJS)\monodll_uiactioncmn.o \ - $(OBJS)\monodll_valgen.o \ - $(OBJS)\monodll_validate.o \ - $(OBJS)\monodll_valtext.o \ - $(OBJS)\monodll_valnum.o \ - $(OBJS)\monodll_wincmn.o \ - $(OBJS)\monodll_windowid.o \ - $(OBJS)\monodll_wrapsizer.o \ - $(OBJS)\monodll_xpmdecod.o \ - $(OBJS)\monodll_busyinfo.o \ - $(OBJS)\monodll_generic_buttonbar.o \ - $(OBJS)\monodll_choicdgg.o \ - $(OBJS)\monodll_choicbkg.o \ - $(OBJS)\monodll_combog.o \ - $(OBJS)\monodll_dcpsg.o \ - $(OBJS)\monodll_dirctrlg.o \ - $(OBJS)\monodll_dragimgg.o \ - $(OBJS)\monodll_filectrlg.o \ - $(OBJS)\monodll_headerctrlg.o \ - $(OBJS)\monodll_infobar.o \ - $(OBJS)\monodll_listbkg.o \ - $(OBJS)\monodll_logg.o \ - $(OBJS)\monodll_markuptext.o \ - $(OBJS)\monodll_msgdlgg.o \ - $(OBJS)\monodll_numdlgg.o \ - $(OBJS)\monodll_progdlgg.o \ - $(OBJS)\monodll_preferencesg.o \ - $(OBJS)\monodll_printps.o \ - $(OBJS)\monodll_renderg.o \ - $(OBJS)\monodll_richmsgdlgg.o \ - $(OBJS)\monodll_scrlwing.o \ - $(OBJS)\monodll_selstore.o \ - $(OBJS)\monodll_spinctlg.o \ - $(OBJS)\monodll_splitter.o \ - $(OBJS)\monodll_srchctlg.o \ - $(OBJS)\monodll_statbmpg.o \ - $(OBJS)\monodll_stattextg.o \ - $(OBJS)\monodll_textdlgg.o \ - $(OBJS)\monodll_tipwin.o \ - $(OBJS)\monodll_toolbkg.o \ - $(OBJS)\monodll_treectlg.o \ - $(OBJS)\monodll_treebkg.o \ - $(OBJS)\monodll_vlbox.o \ - $(OBJS)\monodll_vscroll.o \ - $(OBJS)\monodll_xmlreshandler.o -endif -endif -ifeq ($(WXUNIV),0) -____ADVANCED_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_animatecmn.o \ - $(OBJS)\monodll_bmpcboxcmn.o \ - $(OBJS)\monodll_calctrlcmn.o \ - $(OBJS)\monodll_datavcmn.o \ - $(OBJS)\monodll_gridcmn.o \ - $(OBJS)\monodll_hyperlnkcmn.o \ - $(OBJS)\monodll_odcombocmn.o \ - $(OBJS)\monodll_richtooltipcmn.o \ - $(OBJS)\monodll_aboutdlgg.o \ - $(OBJS)\monodll_bannerwindow.o \ - $(OBJS)\monodll_bmpcboxg.o \ - $(OBJS)\monodll_calctrlg.o \ - $(OBJS)\monodll_commandlinkbuttong.o \ - $(OBJS)\monodll_datavgen.o \ - $(OBJS)\monodll_datectlg.o \ - $(OBJS)\monodll_editlbox.o \ - $(OBJS)\monodll_grid.o \ - $(OBJS)\monodll_gridctrl.o \ - $(OBJS)\monodll_grideditors.o \ - $(OBJS)\monodll_gridsel.o \ - $(OBJS)\monodll_helpext.o \ - $(OBJS)\monodll_hyperlinkg.o \ - $(OBJS)\monodll_laywin.o \ - $(OBJS)\monodll_notifmsgg.o \ - $(OBJS)\monodll_odcombo.o \ - $(OBJS)\monodll_propdlg.o \ - $(OBJS)\monodll_richtooltipg.o \ - $(OBJS)\monodll_sashwin.o \ - $(OBJS)\monodll_splash.o \ - $(OBJS)\monodll_timectrlg.o \ - $(OBJS)\monodll_tipdlg.o \ - $(OBJS)\monodll_treelist.o \ - $(OBJS)\monodll_wizard.o \ - $(OBJS)\monodll_taskbarcmn.o \ - $(OBJS)\monodll_aboutdlg.o \ - $(OBJS)\monodll_notifmsg.o \ - $(OBJS)\monodll_richtooltip.o \ - $(OBJS)\monodll_sound.o \ - $(OBJS)\monodll_taskbar.o \ - $(OBJS)\monodll_joystick.o \ - $(OBJS)\monodll_animateg.o \ - $(OBJS)\monodll_bmpcbox.o \ - $(OBJS)\monodll_calctrl.o \ - $(OBJS)\monodll_commandlinkbutton.o \ - $(OBJS)\monodll_datecontrols.o \ - $(OBJS)\monodll_datectrl.o \ - $(OBJS)\monodll_datetimectrl.o \ - $(OBJS)\monodll_hyperlink.o \ - $(OBJS)\monodll_timectrl.o -endif -ifeq ($(WXUNIV),1) -____ADVANCED_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_animatecmn.o \ - $(OBJS)\monodll_bmpcboxcmn.o \ - $(OBJS)\monodll_calctrlcmn.o \ - $(OBJS)\monodll_datavcmn.o \ - $(OBJS)\monodll_gridcmn.o \ - $(OBJS)\monodll_hyperlnkcmn.o \ - $(OBJS)\monodll_odcombocmn.o \ - $(OBJS)\monodll_richtooltipcmn.o \ - $(OBJS)\monodll_aboutdlgg.o \ - $(OBJS)\monodll_bannerwindow.o \ - $(OBJS)\monodll_bmpcboxg.o \ - $(OBJS)\monodll_calctrlg.o \ - $(OBJS)\monodll_commandlinkbuttong.o \ - $(OBJS)\monodll_datavgen.o \ - $(OBJS)\monodll_datectlg.o \ - $(OBJS)\monodll_editlbox.o \ - $(OBJS)\monodll_grid.o \ - $(OBJS)\monodll_gridctrl.o \ - $(OBJS)\monodll_grideditors.o \ - $(OBJS)\monodll_gridsel.o \ - $(OBJS)\monodll_helpext.o \ - $(OBJS)\monodll_hyperlinkg.o \ - $(OBJS)\monodll_laywin.o \ - $(OBJS)\monodll_notifmsgg.o \ - $(OBJS)\monodll_odcombo.o \ - $(OBJS)\monodll_propdlg.o \ - $(OBJS)\monodll_richtooltipg.o \ - $(OBJS)\monodll_sashwin.o \ - $(OBJS)\monodll_splash.o \ - $(OBJS)\monodll_timectrlg.o \ - $(OBJS)\monodll_tipdlg.o \ - $(OBJS)\monodll_treelist.o \ - $(OBJS)\monodll_wizard.o \ - $(OBJS)\monodll_taskbarcmn.o \ - $(OBJS)\monodll_aboutdlg.o \ - $(OBJS)\monodll_notifmsg.o \ - $(OBJS)\monodll_richtooltip.o \ - $(OBJS)\monodll_sound.o \ - $(OBJS)\monodll_taskbar.o \ - $(OBJS)\monodll_joystick.o \ - $(OBJS)\monodll_animateg.o -endif -ifeq ($(USE_STC),1) -__wxscintilla_library_link_DEP = $(__wxscintilla) -endif -ifeq ($(MONOLITHIC),1) -ifeq ($(SHARED),0) -__monolib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -endif -endif -ifeq ($(USE_GUI),1) -____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ - $(____CORE_SRC_FILENAMES_1_OBJECTS) \ - $(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \ - $(OBJS)\monolib_mediactrlcmn.o \ - $(OBJS)\monolib_mediactrl_am.o \ - $(OBJS)\monolib_mediactrl_wmp10.o \ - $(OBJS)\monolib_mediactrl_qt.o \ - $(OBJS)\monolib_helpbest.o \ - $(OBJS)\monolib_helpctrl.o \ - $(OBJS)\monolib_helpdata.o \ - $(OBJS)\monolib_helpdlg.o \ - $(OBJS)\monolib_helpfrm.o \ - $(OBJS)\monolib_helpwnd.o \ - $(OBJS)\monolib_htmlcell.o \ - $(OBJS)\monolib_htmlfilt.o \ - $(OBJS)\monolib_htmlpars.o \ - $(OBJS)\monolib_htmltag.o \ - $(OBJS)\monolib_htmlwin.o \ - $(OBJS)\monolib_htmprint.o \ - $(OBJS)\monolib_m_dflist.o \ - $(OBJS)\monolib_m_fonts.o \ - $(OBJS)\monolib_m_hline.o \ - $(OBJS)\monolib_m_image.o \ - $(OBJS)\monolib_m_layout.o \ - $(OBJS)\monolib_m_links.o \ - $(OBJS)\monolib_m_list.o \ - $(OBJS)\monolib_m_pre.o \ - $(OBJS)\monolib_m_span.o \ - $(OBJS)\monolib_m_style.o \ - $(OBJS)\monolib_m_tables.o \ - $(OBJS)\monolib_styleparams.o \ - $(OBJS)\monolib_winpars.o \ - $(OBJS)\monolib_htmllbox.o \ - $(OBJS)\monolib_webview_ie.o \ - $(OBJS)\monolib_webview.o \ - $(OBJS)\monolib_webviewarchivehandler.o \ - $(OBJS)\monolib_webviewfshandler.o \ - $(OBJS)\monolib_debugrpt.o \ - $(OBJS)\monolib_dbgrptg.o \ - $(OBJS)\monolib_xh_animatctrl.o \ - $(OBJS)\monolib_xh_bannerwindow.o \ - $(OBJS)\monolib_xh_bmp.o \ - $(OBJS)\monolib_xh_bmpcbox.o \ - $(OBJS)\monolib_xh_bmpbt.o \ - $(OBJS)\monolib_xh_bttn.o \ - $(OBJS)\monolib_xh_cald.o \ - $(OBJS)\monolib_xh_chckb.o \ - $(OBJS)\monolib_xh_chckl.o \ - $(OBJS)\monolib_xh_choic.o \ - $(OBJS)\monolib_xh_choicbk.o \ - $(OBJS)\monolib_xh_clrpicker.o \ - $(OBJS)\monolib_xh_cmdlinkbn.o \ - $(OBJS)\monolib_xh_collpane.o \ - $(OBJS)\monolib_xh_combo.o \ - $(OBJS)\monolib_xh_comboctrl.o \ - $(OBJS)\monolib_xh_datectrl.o \ - $(OBJS)\monolib_xh_dirpicker.o \ - $(OBJS)\monolib_xh_dlg.o \ - $(OBJS)\monolib_xh_editlbox.o \ - $(OBJS)\monolib_xh_filectrl.o \ - $(OBJS)\monolib_xh_filepicker.o \ - $(OBJS)\monolib_xh_fontpicker.o \ - $(OBJS)\monolib_xh_frame.o \ - $(OBJS)\monolib_xh_gauge.o \ - $(OBJS)\monolib_xh_gdctl.o \ - $(OBJS)\monolib_xh_grid.o \ - $(OBJS)\monolib_xh_html.o \ - $(OBJS)\monolib_xh_hyperlink.o \ - $(OBJS)\monolib_xh_listb.o \ - $(OBJS)\monolib_xh_listbk.o \ - $(OBJS)\monolib_xh_listc.o \ - $(OBJS)\monolib_xh_mdi.o \ - $(OBJS)\monolib_xh_menu.o \ - $(OBJS)\monolib_xh_notbk.o \ - $(OBJS)\monolib_xh_odcombo.o \ - $(OBJS)\monolib_xh_panel.o \ - $(OBJS)\monolib_xh_propdlg.o \ - $(OBJS)\monolib_xh_radbt.o \ - $(OBJS)\monolib_xh_radbx.o \ - $(OBJS)\monolib_xh_scrol.o \ - $(OBJS)\monolib_xh_scwin.o \ - $(OBJS)\monolib_xh_htmllbox.o \ - $(OBJS)\monolib_xh_sizer.o \ - $(OBJS)\monolib_xh_slidr.o \ - $(OBJS)\monolib_xh_spin.o \ - $(OBJS)\monolib_xh_split.o \ - $(OBJS)\monolib_xh_srchctrl.o \ - $(OBJS)\monolib_xh_statbar.o \ - $(OBJS)\monolib_xh_stbmp.o \ - $(OBJS)\monolib_xh_stbox.o \ - $(OBJS)\monolib_xh_stlin.o \ - $(OBJS)\monolib_xh_sttxt.o \ - $(OBJS)\monolib_xh_text.o \ - $(OBJS)\monolib_xh_tglbtn.o \ - $(OBJS)\monolib_xh_timectrl.o \ - $(OBJS)\monolib_xh_toolb.o \ - $(OBJS)\monolib_xh_toolbk.o \ - $(OBJS)\monolib_xh_tree.o \ - $(OBJS)\monolib_xh_treebk.o \ - $(OBJS)\monolib_xh_unkwn.o \ - $(OBJS)\monolib_xh_wizrd.o \ - $(OBJS)\monolib_xmlres.o \ - $(OBJS)\monolib_xmladv.o \ - $(OBJS)\monolib_xmlrsall.o \ - $(OBJS)\monolib_framemanager.o \ - $(OBJS)\monolib_dockart.o \ - $(OBJS)\monolib_floatpane.o \ - $(OBJS)\monolib_auibook.o \ - $(OBJS)\monolib_auibar.o \ - $(OBJS)\monolib_tabmdi.o \ - $(OBJS)\monolib_tabart.o \ - $(OBJS)\monolib_xh_auinotbk.o \ - $(OBJS)\monolib_advprops.o \ - $(OBJS)\monolib_editors.o \ - $(OBJS)\monolib_manager.o \ - $(OBJS)\monolib_property.o \ - $(OBJS)\monolib_propgrid.o \ - $(OBJS)\monolib_propgridiface.o \ - $(OBJS)\monolib_propgridpagestate.o \ - $(OBJS)\monolib_props.o \ - $(OBJS)\monolib_art_internal.o \ - $(OBJS)\monolib_art_msw.o \ - $(OBJS)\monolib_art_aui.o \ - $(OBJS)\monolib_bar.o \ - $(OBJS)\monolib_ribbon_buttonbar.o \ - $(OBJS)\monolib_ribbon_control.o \ - $(OBJS)\monolib_gallery.o \ - $(OBJS)\monolib_page.o \ - $(OBJS)\monolib_ribbon_panel.o \ - $(OBJS)\monolib_ribbon_toolbar.o \ - $(OBJS)\monolib_xh_ribbon.o \ - $(OBJS)\monolib_richtextbuffer.o \ - $(OBJS)\monolib_richtextctrl.o \ - $(OBJS)\monolib_richtextformatdlg.o \ - $(OBJS)\monolib_richtexthtml.o \ - $(OBJS)\monolib_richtextimagedlg.o \ - $(OBJS)\monolib_richtextprint.o \ - $(OBJS)\monolib_richtextstyledlg.o \ - $(OBJS)\monolib_richtextstyles.o \ - $(OBJS)\monolib_richtextsymboldlg.o \ - $(OBJS)\monolib_richtextxml.o \ - $(OBJS)\monolib_xh_richtext.o \ - $(OBJS)\monolib_stc.o \ - $(OBJS)\monolib_PlatWX.o \ - $(OBJS)\monolib_ScintillaWX.o -endif -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),0) -____CORE_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_activex.o \ - $(OBJS)\monolib_app.o \ - $(OBJS)\monolib_bitmap.o \ - $(OBJS)\monolib_brush.o \ - $(OBJS)\monolib_caret.o \ - $(OBJS)\monolib_clipbrd.o \ - $(OBJS)\monolib_colour.o \ - $(OBJS)\monolib_cursor.o \ - $(OBJS)\monolib_data.o \ - $(OBJS)\monolib_dc.o \ - $(OBJS)\monolib_dcclient.o \ - $(OBJS)\monolib_dcmemory.o \ - $(OBJS)\monolib_dcprint.o \ - $(OBJS)\monolib_dcscreen.o \ - $(OBJS)\monolib_dialup.o \ - $(OBJS)\monolib_dib.o \ - $(OBJS)\monolib_display.o \ - $(OBJS)\monolib_enhmeta.o \ - $(OBJS)\monolib_font.o \ - $(OBJS)\monolib_fontenum.o \ - $(OBJS)\monolib_fontutil.o \ - $(OBJS)\monolib_gdiimage.o \ - $(OBJS)\monolib_gdiobj.o \ - $(OBJS)\monolib_gdiplus.o \ - $(OBJS)\monolib_graphics.o \ - $(OBJS)\monolib_icon.o \ - $(OBJS)\monolib_imaglist.o \ - $(OBJS)\monolib_minifram.o \ - $(OBJS)\monolib_nonownedwnd.o \ - $(OBJS)\monolib_dataobj.o \ - $(OBJS)\monolib_dropsrc.o \ - $(OBJS)\monolib_droptgt.o \ - $(OBJS)\monolib_oleutils.o \ - $(OBJS)\monolib_safearray.o \ - $(OBJS)\monolib_palette.o \ - $(OBJS)\monolib_pen.o \ - $(OBJS)\monolib_popupwin.o \ - $(OBJS)\monolib_printdlg.o \ - $(OBJS)\monolib_printwin.o \ - $(OBJS)\monolib_region.o \ - $(OBJS)\monolib_renderer.o \ - $(OBJS)\monolib_settings.o \ - $(OBJS)\monolib_textmeasure.o \ - $(OBJS)\monolib_tooltip.o \ - $(OBJS)\monolib_toplevel.o \ - $(OBJS)\monolib_uiaction.o \ - $(OBJS)\monolib_utilsgui.o \ - $(OBJS)\monolib_utilswin.o \ - $(OBJS)\monolib_uxtheme.o \ - $(OBJS)\monolib_window.o \ - $(OBJS)\monolib_helpchm.o \ - $(OBJS)\monolib_helpwin.o \ - $(OBJS)\monolib_automtn.o \ - $(OBJS)\monolib_uuid.o \ - $(OBJS)\monolib_clrpickerg.o \ - $(OBJS)\monolib_collpaneg.o \ - $(OBJS)\monolib_filepickerg.o \ - $(OBJS)\monolib_fontpickerg.o \ - $(OBJS)\monolib_generic_statusbr.o \ - $(OBJS)\monolib_prntdlgg.o \ - $(OBJS)\monolib_msw_accel.o \ - $(OBJS)\monolib_anybutton.o \ - $(OBJS)\monolib_artmsw.o \ - $(OBJS)\monolib_msw_bmpbuttn.o \ - $(OBJS)\monolib_msw_button.o \ - $(OBJS)\monolib_msw_checkbox.o \ - $(OBJS)\monolib_msw_choice.o \ - $(OBJS)\monolib_colordlg.o \ - $(OBJS)\monolib_combo.o \ - $(OBJS)\monolib_msw_combobox.o \ - $(OBJS)\monolib_msw_control.o \ - $(OBJS)\monolib_msw_dialog.o \ - $(OBJS)\monolib_dirdlg.o \ - $(OBJS)\monolib_dragimag.o \ - $(OBJS)\monolib_evtloop.o \ - $(OBJS)\monolib_filedlg.o \ - $(OBJS)\monolib_frame.o \ - $(OBJS)\monolib_msw_gauge.o \ - $(OBJS)\monolib_headerctrl.o \ - $(OBJS)\monolib_iniconf.o \ - $(OBJS)\monolib_msw_listbox.o \ - $(OBJS)\monolib_msw_listctrl.o \ - $(OBJS)\monolib_mdi.o \ - $(OBJS)\monolib_msw_menu.o \ - $(OBJS)\monolib_menuitem.o \ - $(OBJS)\monolib_metafile.o \ - $(OBJS)\monolib_msgdlg.o \ - $(OBJS)\monolib_nativdlg.o \ - $(OBJS)\monolib_nativewin.o \ - $(OBJS)\monolib_msw_notebook.o \ - $(OBJS)\monolib_access.o \ - $(OBJS)\monolib_ownerdrw.o \ - $(OBJS)\monolib_msw_panel.o \ - $(OBJS)\monolib_progdlg.o \ - $(OBJS)\monolib_msw_radiobox.o \ - $(OBJS)\monolib_msw_radiobut.o \ - $(OBJS)\monolib_richmsgdlg.o \ - $(OBJS)\monolib_msw_scrolbar.o \ - $(OBJS)\monolib_msw_slider.o \ - $(OBJS)\monolib_msw_spinbutt.o \ - $(OBJS)\monolib_spinctrl.o \ - $(OBJS)\monolib_msw_statbmp.o \ - $(OBJS)\monolib_msw_statbox.o \ - $(OBJS)\monolib_statusbar.o \ - $(OBJS)\monolib_msw_statline.o \ - $(OBJS)\monolib_msw_stattext.o \ - $(OBJS)\monolib_msw_toolbar.o \ - $(OBJS)\monolib_msw_textctrl.o \ - $(OBJS)\monolib_textentry.o \ - $(OBJS)\monolib_msw_tglbtn.o \ - $(OBJS)\monolib_treectrl.o \ - $(OBJS)\monolib_msw_checklst.o \ - $(OBJS)\monolib_msw_fdrepdlg.o \ - $(OBJS)\monolib_fontdlg.o \ - $(OBJS)\monolib_accelcmn.o \ - $(OBJS)\monolib_accesscmn.o \ - $(OBJS)\monolib_anidecod.o \ - $(OBJS)\monolib_affinematrix2d.o \ - $(OBJS)\monolib_appcmn.o \ - $(OBJS)\monolib_artprov.o \ - $(OBJS)\monolib_artstd.o \ - $(OBJS)\monolib_arttango.o \ - $(OBJS)\monolib_bmpbase.o \ - $(OBJS)\monolib_bmpbtncmn.o \ - $(OBJS)\monolib_bookctrl.o \ - $(OBJS)\monolib_btncmn.o \ - $(OBJS)\monolib_cairo.o \ - $(OBJS)\monolib_checkboxcmn.o \ - $(OBJS)\monolib_checklstcmn.o \ - $(OBJS)\monolib_choiccmn.o \ - $(OBJS)\monolib_clipcmn.o \ - $(OBJS)\monolib_clrpickercmn.o \ - $(OBJS)\monolib_colourcmn.o \ - $(OBJS)\monolib_colourdata.o \ - $(OBJS)\monolib_combocmn.o \ - $(OBJS)\monolib_cmdproc.o \ - $(OBJS)\monolib_cmndata.o \ - $(OBJS)\monolib_containr.o \ - $(OBJS)\monolib_cshelp.o \ - $(OBJS)\monolib_ctrlcmn.o \ - $(OBJS)\monolib_ctrlsub.o \ - $(OBJS)\monolib_dcbase.o \ - $(OBJS)\monolib_dcbufcmn.o \ - $(OBJS)\monolib_dcgraph.o \ - $(OBJS)\monolib_dcsvg.o \ - $(OBJS)\monolib_dirctrlcmn.o \ - $(OBJS)\monolib_dlgcmn.o \ - $(OBJS)\monolib_dndcmn.o \ - $(OBJS)\monolib_dobjcmn.o \ - $(OBJS)\monolib_docmdi.o \ - $(OBJS)\monolib_docview.o \ - $(OBJS)\monolib_dpycmn.o \ - $(OBJS)\monolib_dseldlg.o \ - $(OBJS)\monolib_effects.o \ - $(OBJS)\monolib_fddlgcmn.o \ - $(OBJS)\monolib_filectrlcmn.o \ - $(OBJS)\monolib_filehistorycmn.o \ - $(OBJS)\monolib_filepickercmn.o \ - $(OBJS)\monolib_fontpickercmn.o \ - $(OBJS)\monolib_fldlgcmn.o \ - $(OBJS)\monolib_fontcmn.o \ - $(OBJS)\monolib_fontdata.o \ - $(OBJS)\monolib_graphicc.o \ - $(OBJS)\monolib_fontenumcmn.o \ - $(OBJS)\monolib_fontmap.o \ - $(OBJS)\monolib_fontutilcmn.o \ - $(OBJS)\monolib_framecmn.o \ - $(OBJS)\monolib_gaugecmn.o \ - $(OBJS)\monolib_gbsizer.o \ - $(OBJS)\monolib_gdicmn.o \ - $(OBJS)\monolib_geometry.o \ - $(OBJS)\monolib_gifdecod.o \ - $(OBJS)\monolib_graphcmn.o \ - $(OBJS)\monolib_headercolcmn.o \ - $(OBJS)\monolib_headerctrlcmn.o \ - $(OBJS)\monolib_helpbase.o \ - $(OBJS)\monolib_iconbndl.o \ - $(OBJS)\monolib_imagall.o \ - $(OBJS)\monolib_imagbmp.o \ - $(OBJS)\monolib_image.o \ - $(OBJS)\monolib_imagfill.o \ - $(OBJS)\monolib_imaggif.o \ - $(OBJS)\monolib_imagiff.o \ - $(OBJS)\monolib_imagjpeg.o \ - $(OBJS)\monolib_imagpcx.o \ - $(OBJS)\monolib_imagpng.o \ - $(OBJS)\monolib_imagpnm.o \ - $(OBJS)\monolib_imagtga.o \ - $(OBJS)\monolib_imagtiff.o \ - $(OBJS)\monolib_imagxpm.o \ - $(OBJS)\monolib_layout.o \ - $(OBJS)\monolib_lboxcmn.o \ - $(OBJS)\monolib_listctrlcmn.o \ - $(OBJS)\monolib_markupparser.o \ - $(OBJS)\monolib_matrix.o \ - $(OBJS)\monolib_menucmn.o \ - $(OBJS)\monolib_modalhook.o \ - $(OBJS)\monolib_mousemanager.o \ - $(OBJS)\monolib_nbkbase.o \ - $(OBJS)\monolib_overlaycmn.o \ - $(OBJS)\monolib_ownerdrwcmn.o \ - $(OBJS)\monolib_paper.o \ - $(OBJS)\monolib_panelcmn.o \ - $(OBJS)\monolib_persist.o \ - $(OBJS)\monolib_pickerbase.o \ - $(OBJS)\monolib_popupcmn.o \ - $(OBJS)\monolib_preferencescmn.o \ - $(OBJS)\monolib_prntbase.o \ - $(OBJS)\monolib_quantize.o \ - $(OBJS)\monolib_radiobtncmn.o \ - $(OBJS)\monolib_radiocmn.o \ - $(OBJS)\monolib_rearrangectrl.o \ - $(OBJS)\monolib_rendcmn.o \ - $(OBJS)\monolib_rgncmn.o \ - $(OBJS)\monolib_scrolbarcmn.o \ - $(OBJS)\monolib_settcmn.o \ - $(OBJS)\monolib_sizer.o \ - $(OBJS)\monolib_slidercmn.o \ - $(OBJS)\monolib_spinbtncmn.o \ - $(OBJS)\monolib_spinctrlcmn.o \ - $(OBJS)\monolib_srchcmn.o \ - $(OBJS)\monolib_statbar.o \ - $(OBJS)\monolib_statbmpcmn.o \ - $(OBJS)\monolib_statboxcmn.o \ - $(OBJS)\monolib_statlinecmn.o \ - $(OBJS)\monolib_stattextcmn.o \ - $(OBJS)\monolib_stockitem.o \ - $(OBJS)\monolib_tbarbase.o \ - $(OBJS)\monolib_textcmn.o \ - $(OBJS)\monolib_textentrycmn.o \ - $(OBJS)\monolib_textmeasurecmn.o \ - $(OBJS)\monolib_toplvcmn.o \ - $(OBJS)\monolib_treebase.o \ - $(OBJS)\monolib_uiactioncmn.o \ - $(OBJS)\monolib_valgen.o \ - $(OBJS)\monolib_validate.o \ - $(OBJS)\monolib_valtext.o \ - $(OBJS)\monolib_valnum.o \ - $(OBJS)\monolib_wincmn.o \ - $(OBJS)\monolib_windowid.o \ - $(OBJS)\monolib_wrapsizer.o \ - $(OBJS)\monolib_xpmdecod.o \ - $(OBJS)\monolib_busyinfo.o \ - $(OBJS)\monolib_generic_buttonbar.o \ - $(OBJS)\monolib_choicdgg.o \ - $(OBJS)\monolib_choicbkg.o \ - $(OBJS)\monolib_combog.o \ - $(OBJS)\monolib_dcpsg.o \ - $(OBJS)\monolib_dirctrlg.o \ - $(OBJS)\monolib_dragimgg.o \ - $(OBJS)\monolib_filectrlg.o \ - $(OBJS)\monolib_headerctrlg.o \ - $(OBJS)\monolib_infobar.o \ - $(OBJS)\monolib_listbkg.o \ - $(OBJS)\monolib_logg.o \ - $(OBJS)\monolib_markuptext.o \ - $(OBJS)\monolib_msgdlgg.o \ - $(OBJS)\monolib_numdlgg.o \ - $(OBJS)\monolib_progdlgg.o \ - $(OBJS)\monolib_preferencesg.o \ - $(OBJS)\monolib_printps.o \ - $(OBJS)\monolib_renderg.o \ - $(OBJS)\monolib_richmsgdlgg.o \ - $(OBJS)\monolib_scrlwing.o \ - $(OBJS)\monolib_selstore.o \ - $(OBJS)\monolib_spinctlg.o \ - $(OBJS)\monolib_splitter.o \ - $(OBJS)\monolib_srchctlg.o \ - $(OBJS)\monolib_statbmpg.o \ - $(OBJS)\monolib_stattextg.o \ - $(OBJS)\monolib_textdlgg.o \ - $(OBJS)\monolib_tipwin.o \ - $(OBJS)\monolib_toolbkg.o \ - $(OBJS)\monolib_treectlg.o \ - $(OBJS)\monolib_treebkg.o \ - $(OBJS)\monolib_vlbox.o \ - $(OBJS)\monolib_vscroll.o \ - $(OBJS)\monolib_xmlreshandler.o -endif -endif -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),1) -____CORE_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_activex.o \ - $(OBJS)\monolib_app.o \ - $(OBJS)\monolib_bitmap.o \ - $(OBJS)\monolib_brush.o \ - $(OBJS)\monolib_caret.o \ - $(OBJS)\monolib_clipbrd.o \ - $(OBJS)\monolib_colour.o \ - $(OBJS)\monolib_cursor.o \ - $(OBJS)\monolib_data.o \ - $(OBJS)\monolib_dc.o \ - $(OBJS)\monolib_dcclient.o \ - $(OBJS)\monolib_dcmemory.o \ - $(OBJS)\monolib_dcprint.o \ - $(OBJS)\monolib_dcscreen.o \ - $(OBJS)\monolib_dialup.o \ - $(OBJS)\monolib_dib.o \ - $(OBJS)\monolib_display.o \ - $(OBJS)\monolib_enhmeta.o \ - $(OBJS)\monolib_font.o \ - $(OBJS)\monolib_fontenum.o \ - $(OBJS)\monolib_fontutil.o \ - $(OBJS)\monolib_gdiimage.o \ - $(OBJS)\monolib_gdiobj.o \ - $(OBJS)\monolib_gdiplus.o \ - $(OBJS)\monolib_graphics.o \ - $(OBJS)\monolib_icon.o \ - $(OBJS)\monolib_imaglist.o \ - $(OBJS)\monolib_minifram.o \ - $(OBJS)\monolib_nonownedwnd.o \ - $(OBJS)\monolib_dataobj.o \ - $(OBJS)\monolib_dropsrc.o \ - $(OBJS)\monolib_droptgt.o \ - $(OBJS)\monolib_oleutils.o \ - $(OBJS)\monolib_safearray.o \ - $(OBJS)\monolib_palette.o \ - $(OBJS)\monolib_pen.o \ - $(OBJS)\monolib_popupwin.o \ - $(OBJS)\monolib_printdlg.o \ - $(OBJS)\monolib_printwin.o \ - $(OBJS)\monolib_region.o \ - $(OBJS)\monolib_renderer.o \ - $(OBJS)\monolib_settings.o \ - $(OBJS)\monolib_textmeasure.o \ - $(OBJS)\monolib_tooltip.o \ - $(OBJS)\monolib_toplevel.o \ - $(OBJS)\monolib_uiaction.o \ - $(OBJS)\monolib_utilsgui.o \ - $(OBJS)\monolib_utilswin.o \ - $(OBJS)\monolib_uxtheme.o \ - $(OBJS)\monolib_window.o \ - $(OBJS)\monolib_helpchm.o \ - $(OBJS)\monolib_helpwin.o \ - $(OBJS)\monolib_automtn.o \ - $(OBJS)\monolib_uuid.o \ - $(OBJS)\monolib_evtloop.o \ - $(OBJS)\monolib_generic_accel.o \ - $(OBJS)\monolib_clrpickerg.o \ - $(OBJS)\monolib_collpaneg.o \ - $(OBJS)\monolib_colrdlgg.o \ - $(OBJS)\monolib_dirdlgg.o \ - $(OBJS)\monolib_generic_fdrepdlg.o \ - $(OBJS)\monolib_filedlgg.o \ - $(OBJS)\monolib_filepickerg.o \ - $(OBJS)\monolib_fontdlgg.o \ - $(OBJS)\monolib_fontpickerg.o \ - $(OBJS)\monolib_generic_listctrl.o \ - $(OBJS)\monolib_mdig.o \ - $(OBJS)\monolib_prntdlgg.o \ - $(OBJS)\monolib_univ_bmpbuttn.o \ - $(OBJS)\monolib_univ_button.o \ - $(OBJS)\monolib_univ_checkbox.o \ - $(OBJS)\monolib_univ_checklst.o \ - $(OBJS)\monolib_univ_choice.o \ - $(OBJS)\monolib_univ_combobox.o \ - $(OBJS)\monolib_univ_control.o \ - $(OBJS)\monolib_ctrlrend.o \ - $(OBJS)\monolib_univ_dialog.o \ - $(OBJS)\monolib_framuniv.o \ - $(OBJS)\monolib_univ_gauge.o \ - $(OBJS)\monolib_inpcons.o \ - $(OBJS)\monolib_inphand.o \ - $(OBJS)\monolib_univ_listbox.o \ - $(OBJS)\monolib_univ_menu.o \ - $(OBJS)\monolib_univ_notebook.o \ - $(OBJS)\monolib_univ_radiobox.o \ - $(OBJS)\monolib_univ_radiobut.o \ - $(OBJS)\monolib_scrarrow.o \ - $(OBJS)\monolib_univ_scrolbar.o \ - $(OBJS)\monolib_scrthumb.o \ - $(OBJS)\monolib_settingsuniv.o \ - $(OBJS)\monolib_univ_slider.o \ - $(OBJS)\monolib_univ_spinbutt.o \ - $(OBJS)\monolib_univ_statbmp.o \ - $(OBJS)\monolib_univ_statbox.o \ - $(OBJS)\monolib_univ_statline.o \ - $(OBJS)\monolib_univ_stattext.o \ - $(OBJS)\monolib_univ_statusbr.o \ - $(OBJS)\monolib_stdrend.o \ - $(OBJS)\monolib_univ_textctrl.o \ - $(OBJS)\monolib_univ_tglbtn.o \ - $(OBJS)\monolib_theme.o \ - $(OBJS)\monolib_univ_toolbar.o \ - $(OBJS)\monolib_topluniv.o \ - $(OBJS)\monolib_winuniv.o \ - $(OBJS)\monolib_gtk.o \ - $(OBJS)\monolib_metal.o \ - $(OBJS)\monolib_mono.o \ - $(OBJS)\monolib_win32.o \ - $(OBJS)\monolib_accelcmn.o \ - $(OBJS)\monolib_accesscmn.o \ - $(OBJS)\monolib_anidecod.o \ - $(OBJS)\monolib_affinematrix2d.o \ - $(OBJS)\monolib_appcmn.o \ - $(OBJS)\monolib_artprov.o \ - $(OBJS)\monolib_artstd.o \ - $(OBJS)\monolib_arttango.o \ - $(OBJS)\monolib_bmpbase.o \ - $(OBJS)\monolib_bmpbtncmn.o \ - $(OBJS)\monolib_bookctrl.o \ - $(OBJS)\monolib_btncmn.o \ - $(OBJS)\monolib_cairo.o \ - $(OBJS)\monolib_checkboxcmn.o \ - $(OBJS)\monolib_checklstcmn.o \ - $(OBJS)\monolib_choiccmn.o \ - $(OBJS)\monolib_clipcmn.o \ - $(OBJS)\monolib_clrpickercmn.o \ - $(OBJS)\monolib_colourcmn.o \ - $(OBJS)\monolib_colourdata.o \ - $(OBJS)\monolib_combocmn.o \ - $(OBJS)\monolib_cmdproc.o \ - $(OBJS)\monolib_cmndata.o \ - $(OBJS)\monolib_containr.o \ - $(OBJS)\monolib_cshelp.o \ - $(OBJS)\monolib_ctrlcmn.o \ - $(OBJS)\monolib_ctrlsub.o \ - $(OBJS)\monolib_dcbase.o \ - $(OBJS)\monolib_dcbufcmn.o \ - $(OBJS)\monolib_dcgraph.o \ - $(OBJS)\monolib_dcsvg.o \ - $(OBJS)\monolib_dirctrlcmn.o \ - $(OBJS)\monolib_dlgcmn.o \ - $(OBJS)\monolib_dndcmn.o \ - $(OBJS)\monolib_dobjcmn.o \ - $(OBJS)\monolib_docmdi.o \ - $(OBJS)\monolib_docview.o \ - $(OBJS)\monolib_dpycmn.o \ - $(OBJS)\monolib_dseldlg.o \ - $(OBJS)\monolib_effects.o \ - $(OBJS)\monolib_fddlgcmn.o \ - $(OBJS)\monolib_filectrlcmn.o \ - $(OBJS)\monolib_filehistorycmn.o \ - $(OBJS)\monolib_filepickercmn.o \ - $(OBJS)\monolib_fontpickercmn.o \ - $(OBJS)\monolib_fldlgcmn.o \ - $(OBJS)\monolib_fontcmn.o \ - $(OBJS)\monolib_fontdata.o \ - $(OBJS)\monolib_graphicc.o \ - $(OBJS)\monolib_fontenumcmn.o \ - $(OBJS)\monolib_fontmap.o \ - $(OBJS)\monolib_fontutilcmn.o \ - $(OBJS)\monolib_framecmn.o \ - $(OBJS)\monolib_gaugecmn.o \ - $(OBJS)\monolib_gbsizer.o \ - $(OBJS)\monolib_gdicmn.o \ - $(OBJS)\monolib_geometry.o \ - $(OBJS)\monolib_gifdecod.o \ - $(OBJS)\monolib_graphcmn.o \ - $(OBJS)\monolib_headercolcmn.o \ - $(OBJS)\monolib_headerctrlcmn.o \ - $(OBJS)\monolib_helpbase.o \ - $(OBJS)\monolib_iconbndl.o \ - $(OBJS)\monolib_imagall.o \ - $(OBJS)\monolib_imagbmp.o \ - $(OBJS)\monolib_image.o \ - $(OBJS)\monolib_imagfill.o \ - $(OBJS)\monolib_imaggif.o \ - $(OBJS)\monolib_imagiff.o \ - $(OBJS)\monolib_imagjpeg.o \ - $(OBJS)\monolib_imagpcx.o \ - $(OBJS)\monolib_imagpng.o \ - $(OBJS)\monolib_imagpnm.o \ - $(OBJS)\monolib_imagtga.o \ - $(OBJS)\monolib_imagtiff.o \ - $(OBJS)\monolib_imagxpm.o \ - $(OBJS)\monolib_layout.o \ - $(OBJS)\monolib_lboxcmn.o \ - $(OBJS)\monolib_listctrlcmn.o \ - $(OBJS)\monolib_markupparser.o \ - $(OBJS)\monolib_matrix.o \ - $(OBJS)\monolib_menucmn.o \ - $(OBJS)\monolib_modalhook.o \ - $(OBJS)\monolib_mousemanager.o \ - $(OBJS)\monolib_nbkbase.o \ - $(OBJS)\monolib_overlaycmn.o \ - $(OBJS)\monolib_ownerdrwcmn.o \ - $(OBJS)\monolib_paper.o \ - $(OBJS)\monolib_panelcmn.o \ - $(OBJS)\monolib_persist.o \ - $(OBJS)\monolib_pickerbase.o \ - $(OBJS)\monolib_popupcmn.o \ - $(OBJS)\monolib_preferencescmn.o \ - $(OBJS)\monolib_prntbase.o \ - $(OBJS)\monolib_quantize.o \ - $(OBJS)\monolib_radiobtncmn.o \ - $(OBJS)\monolib_radiocmn.o \ - $(OBJS)\monolib_rearrangectrl.o \ - $(OBJS)\monolib_rendcmn.o \ - $(OBJS)\monolib_rgncmn.o \ - $(OBJS)\monolib_scrolbarcmn.o \ - $(OBJS)\monolib_settcmn.o \ - $(OBJS)\monolib_sizer.o \ - $(OBJS)\monolib_slidercmn.o \ - $(OBJS)\monolib_spinbtncmn.o \ - $(OBJS)\monolib_spinctrlcmn.o \ - $(OBJS)\monolib_srchcmn.o \ - $(OBJS)\monolib_statbar.o \ - $(OBJS)\monolib_statbmpcmn.o \ - $(OBJS)\monolib_statboxcmn.o \ - $(OBJS)\monolib_statlinecmn.o \ - $(OBJS)\monolib_stattextcmn.o \ - $(OBJS)\monolib_stockitem.o \ - $(OBJS)\monolib_tbarbase.o \ - $(OBJS)\monolib_textcmn.o \ - $(OBJS)\monolib_textentrycmn.o \ - $(OBJS)\monolib_textmeasurecmn.o \ - $(OBJS)\monolib_toplvcmn.o \ - $(OBJS)\monolib_treebase.o \ - $(OBJS)\monolib_uiactioncmn.o \ - $(OBJS)\monolib_valgen.o \ - $(OBJS)\monolib_validate.o \ - $(OBJS)\monolib_valtext.o \ - $(OBJS)\monolib_valnum.o \ - $(OBJS)\monolib_wincmn.o \ - $(OBJS)\monolib_windowid.o \ - $(OBJS)\monolib_wrapsizer.o \ - $(OBJS)\monolib_xpmdecod.o \ - $(OBJS)\monolib_busyinfo.o \ - $(OBJS)\monolib_generic_buttonbar.o \ - $(OBJS)\monolib_choicdgg.o \ - $(OBJS)\monolib_choicbkg.o \ - $(OBJS)\monolib_combog.o \ - $(OBJS)\monolib_dcpsg.o \ - $(OBJS)\monolib_dirctrlg.o \ - $(OBJS)\monolib_dragimgg.o \ - $(OBJS)\monolib_filectrlg.o \ - $(OBJS)\monolib_headerctrlg.o \ - $(OBJS)\monolib_infobar.o \ - $(OBJS)\monolib_listbkg.o \ - $(OBJS)\monolib_logg.o \ - $(OBJS)\monolib_markuptext.o \ - $(OBJS)\monolib_msgdlgg.o \ - $(OBJS)\monolib_numdlgg.o \ - $(OBJS)\monolib_progdlgg.o \ - $(OBJS)\monolib_preferencesg.o \ - $(OBJS)\monolib_printps.o \ - $(OBJS)\monolib_renderg.o \ - $(OBJS)\monolib_richmsgdlgg.o \ - $(OBJS)\monolib_scrlwing.o \ - $(OBJS)\monolib_selstore.o \ - $(OBJS)\monolib_spinctlg.o \ - $(OBJS)\monolib_splitter.o \ - $(OBJS)\monolib_srchctlg.o \ - $(OBJS)\monolib_statbmpg.o \ - $(OBJS)\monolib_stattextg.o \ - $(OBJS)\monolib_textdlgg.o \ - $(OBJS)\monolib_tipwin.o \ - $(OBJS)\monolib_toolbkg.o \ - $(OBJS)\monolib_treectlg.o \ - $(OBJS)\monolib_treebkg.o \ - $(OBJS)\monolib_vlbox.o \ - $(OBJS)\monolib_vscroll.o \ - $(OBJS)\monolib_xmlreshandler.o -endif -endif -ifeq ($(WXUNIV),0) -____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_animatecmn.o \ - $(OBJS)\monolib_bmpcboxcmn.o \ - $(OBJS)\monolib_calctrlcmn.o \ - $(OBJS)\monolib_datavcmn.o \ - $(OBJS)\monolib_gridcmn.o \ - $(OBJS)\monolib_hyperlnkcmn.o \ - $(OBJS)\monolib_odcombocmn.o \ - $(OBJS)\monolib_richtooltipcmn.o \ - $(OBJS)\monolib_aboutdlgg.o \ - $(OBJS)\monolib_bannerwindow.o \ - $(OBJS)\monolib_bmpcboxg.o \ - $(OBJS)\monolib_calctrlg.o \ - $(OBJS)\monolib_commandlinkbuttong.o \ - $(OBJS)\monolib_datavgen.o \ - $(OBJS)\monolib_datectlg.o \ - $(OBJS)\monolib_editlbox.o \ - $(OBJS)\monolib_grid.o \ - $(OBJS)\monolib_gridctrl.o \ - $(OBJS)\monolib_grideditors.o \ - $(OBJS)\monolib_gridsel.o \ - $(OBJS)\monolib_helpext.o \ - $(OBJS)\monolib_hyperlinkg.o \ - $(OBJS)\monolib_laywin.o \ - $(OBJS)\monolib_notifmsgg.o \ - $(OBJS)\monolib_odcombo.o \ - $(OBJS)\monolib_propdlg.o \ - $(OBJS)\monolib_richtooltipg.o \ - $(OBJS)\monolib_sashwin.o \ - $(OBJS)\monolib_splash.o \ - $(OBJS)\monolib_timectrlg.o \ - $(OBJS)\monolib_tipdlg.o \ - $(OBJS)\monolib_treelist.o \ - $(OBJS)\monolib_wizard.o \ - $(OBJS)\monolib_taskbarcmn.o \ - $(OBJS)\monolib_aboutdlg.o \ - $(OBJS)\monolib_notifmsg.o \ - $(OBJS)\monolib_richtooltip.o \ - $(OBJS)\monolib_sound.o \ - $(OBJS)\monolib_taskbar.o \ - $(OBJS)\monolib_joystick.o \ - $(OBJS)\monolib_animateg.o \ - $(OBJS)\monolib_bmpcbox.o \ - $(OBJS)\monolib_calctrl.o \ - $(OBJS)\monolib_commandlinkbutton.o \ - $(OBJS)\monolib_datecontrols.o \ - $(OBJS)\monolib_datectrl.o \ - $(OBJS)\monolib_datetimectrl.o \ - $(OBJS)\monolib_hyperlink.o \ - $(OBJS)\monolib_timectrl.o -endif -ifeq ($(WXUNIV),1) -____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_animatecmn.o \ - $(OBJS)\monolib_bmpcboxcmn.o \ - $(OBJS)\monolib_calctrlcmn.o \ - $(OBJS)\monolib_datavcmn.o \ - $(OBJS)\monolib_gridcmn.o \ - $(OBJS)\monolib_hyperlnkcmn.o \ - $(OBJS)\monolib_odcombocmn.o \ - $(OBJS)\monolib_richtooltipcmn.o \ - $(OBJS)\monolib_aboutdlgg.o \ - $(OBJS)\monolib_bannerwindow.o \ - $(OBJS)\monolib_bmpcboxg.o \ - $(OBJS)\monolib_calctrlg.o \ - $(OBJS)\monolib_commandlinkbuttong.o \ - $(OBJS)\monolib_datavgen.o \ - $(OBJS)\monolib_datectlg.o \ - $(OBJS)\monolib_editlbox.o \ - $(OBJS)\monolib_grid.o \ - $(OBJS)\monolib_gridctrl.o \ - $(OBJS)\monolib_grideditors.o \ - $(OBJS)\monolib_gridsel.o \ - $(OBJS)\monolib_helpext.o \ - $(OBJS)\monolib_hyperlinkg.o \ - $(OBJS)\monolib_laywin.o \ - $(OBJS)\monolib_notifmsgg.o \ - $(OBJS)\monolib_odcombo.o \ - $(OBJS)\monolib_propdlg.o \ - $(OBJS)\monolib_richtooltipg.o \ - $(OBJS)\monolib_sashwin.o \ - $(OBJS)\monolib_splash.o \ - $(OBJS)\monolib_timectrlg.o \ - $(OBJS)\monolib_tipdlg.o \ - $(OBJS)\monolib_treelist.o \ - $(OBJS)\monolib_wizard.o \ - $(OBJS)\monolib_taskbarcmn.o \ - $(OBJS)\monolib_aboutdlg.o \ - $(OBJS)\monolib_notifmsg.o \ - $(OBJS)\monolib_richtooltip.o \ - $(OBJS)\monolib_sound.o \ - $(OBJS)\monolib_taskbar.o \ - $(OBJS)\monolib_joystick.o \ - $(OBJS)\monolib_animateg.o -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -__basedll___depname = \ - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll -endif -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -__baselib___depname = \ - $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -endif -endif -ifeq ($(SHARED),1) -____wxbase_namedll_DEP = $(__basedll___depname) -endif -ifeq ($(SHARED),0) -____wxbase_namelib_DEP = $(__baselib___depname) -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -__netdll___depname = \ - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll -endif -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -__netlib___depname = \ - $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a -endif -endif -ifeq ($(SHARED),1) -____wxnet_namedll_DEP = $(__netdll___depname) -endif -ifeq ($(SHARED),0) -____wxnet_namelib_DEP = $(__netlib___depname) -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_GUI),1) -__coredll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll -endif -endif -endif -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),0) -____CORE_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\coredll_activex.o \ - $(OBJS)\coredll_app.o \ - $(OBJS)\coredll_bitmap.o \ - $(OBJS)\coredll_brush.o \ - $(OBJS)\coredll_caret.o \ - $(OBJS)\coredll_clipbrd.o \ - $(OBJS)\coredll_colour.o \ - $(OBJS)\coredll_cursor.o \ - $(OBJS)\coredll_data.o \ - $(OBJS)\coredll_dc.o \ - $(OBJS)\coredll_dcclient.o \ - $(OBJS)\coredll_dcmemory.o \ - $(OBJS)\coredll_dcprint.o \ - $(OBJS)\coredll_dcscreen.o \ - $(OBJS)\coredll_dialup.o \ - $(OBJS)\coredll_dib.o \ - $(OBJS)\coredll_display.o \ - $(OBJS)\coredll_enhmeta.o \ - $(OBJS)\coredll_font.o \ - $(OBJS)\coredll_fontenum.o \ - $(OBJS)\coredll_fontutil.o \ - $(OBJS)\coredll_gdiimage.o \ - $(OBJS)\coredll_gdiobj.o \ - $(OBJS)\coredll_gdiplus.o \ - $(OBJS)\coredll_graphics.o \ - $(OBJS)\coredll_icon.o \ - $(OBJS)\coredll_imaglist.o \ - $(OBJS)\coredll_minifram.o \ - $(OBJS)\coredll_nonownedwnd.o \ - $(OBJS)\coredll_dataobj.o \ - $(OBJS)\coredll_dropsrc.o \ - $(OBJS)\coredll_droptgt.o \ - $(OBJS)\coredll_oleutils.o \ - $(OBJS)\coredll_safearray.o \ - $(OBJS)\coredll_palette.o \ - $(OBJS)\coredll_pen.o \ - $(OBJS)\coredll_popupwin.o \ - $(OBJS)\coredll_printdlg.o \ - $(OBJS)\coredll_printwin.o \ - $(OBJS)\coredll_region.o \ - $(OBJS)\coredll_renderer.o \ - $(OBJS)\coredll_settings.o \ - $(OBJS)\coredll_textmeasure.o \ - $(OBJS)\coredll_tooltip.o \ - $(OBJS)\coredll_toplevel.o \ - $(OBJS)\coredll_uiaction.o \ - $(OBJS)\coredll_utilsgui.o \ - $(OBJS)\coredll_utilswin.o \ - $(OBJS)\coredll_uxtheme.o \ - $(OBJS)\coredll_window.o \ - $(OBJS)\coredll_helpchm.o \ - $(OBJS)\coredll_helpwin.o \ - $(OBJS)\coredll_automtn.o \ - $(OBJS)\coredll_uuid.o \ - $(OBJS)\coredll_clrpickerg.o \ - $(OBJS)\coredll_collpaneg.o \ - $(OBJS)\coredll_filepickerg.o \ - $(OBJS)\coredll_fontpickerg.o \ - $(OBJS)\coredll_generic_statusbr.o \ - $(OBJS)\coredll_prntdlgg.o \ - $(OBJS)\coredll_msw_accel.o \ - $(OBJS)\coredll_anybutton.o \ - $(OBJS)\coredll_artmsw.o \ - $(OBJS)\coredll_msw_bmpbuttn.o \ - $(OBJS)\coredll_msw_button.o \ - $(OBJS)\coredll_msw_checkbox.o \ - $(OBJS)\coredll_msw_choice.o \ - $(OBJS)\coredll_colordlg.o \ - $(OBJS)\coredll_combo.o \ - $(OBJS)\coredll_msw_combobox.o \ - $(OBJS)\coredll_msw_control.o \ - $(OBJS)\coredll_msw_dialog.o \ - $(OBJS)\coredll_dirdlg.o \ - $(OBJS)\coredll_dragimag.o \ - $(OBJS)\coredll_evtloop.o \ - $(OBJS)\coredll_filedlg.o \ - $(OBJS)\coredll_frame.o \ - $(OBJS)\coredll_msw_gauge.o \ - $(OBJS)\coredll_headerctrl.o \ - $(OBJS)\coredll_iniconf.o \ - $(OBJS)\coredll_msw_listbox.o \ - $(OBJS)\coredll_msw_listctrl.o \ - $(OBJS)\coredll_mdi.o \ - $(OBJS)\coredll_msw_menu.o \ - $(OBJS)\coredll_menuitem.o \ - $(OBJS)\coredll_metafile.o \ - $(OBJS)\coredll_msgdlg.o \ - $(OBJS)\coredll_nativdlg.o \ - $(OBJS)\coredll_nativewin.o \ - $(OBJS)\coredll_msw_notebook.o \ - $(OBJS)\coredll_access.o \ - $(OBJS)\coredll_ownerdrw.o \ - $(OBJS)\coredll_panel.o \ - $(OBJS)\coredll_progdlg.o \ - $(OBJS)\coredll_msw_radiobox.o \ - $(OBJS)\coredll_msw_radiobut.o \ - $(OBJS)\coredll_richmsgdlg.o \ - $(OBJS)\coredll_msw_scrolbar.o \ - $(OBJS)\coredll_msw_slider.o \ - $(OBJS)\coredll_msw_spinbutt.o \ - $(OBJS)\coredll_spinctrl.o \ - $(OBJS)\coredll_msw_statbmp.o \ - $(OBJS)\coredll_msw_statbox.o \ - $(OBJS)\coredll_statusbar.o \ - $(OBJS)\coredll_msw_statline.o \ - $(OBJS)\coredll_msw_stattext.o \ - $(OBJS)\coredll_msw_toolbar.o \ - $(OBJS)\coredll_msw_textctrl.o \ - $(OBJS)\coredll_textentry.o \ - $(OBJS)\coredll_msw_tglbtn.o \ - $(OBJS)\coredll_treectrl.o \ - $(OBJS)\coredll_msw_checklst.o \ - $(OBJS)\coredll_msw_fdrepdlg.o \ - $(OBJS)\coredll_fontdlg.o \ - $(OBJS)\coredll_accelcmn.o \ - $(OBJS)\coredll_accesscmn.o \ - $(OBJS)\coredll_anidecod.o \ - $(OBJS)\coredll_affinematrix2d.o \ - $(OBJS)\coredll_appcmn.o \ - $(OBJS)\coredll_artprov.o \ - $(OBJS)\coredll_artstd.o \ - $(OBJS)\coredll_arttango.o \ - $(OBJS)\coredll_bmpbase.o \ - $(OBJS)\coredll_bmpbtncmn.o \ - $(OBJS)\coredll_bookctrl.o \ - $(OBJS)\coredll_btncmn.o \ - $(OBJS)\coredll_cairo.o \ - $(OBJS)\coredll_checkboxcmn.o \ - $(OBJS)\coredll_checklstcmn.o \ - $(OBJS)\coredll_choiccmn.o \ - $(OBJS)\coredll_clipcmn.o \ - $(OBJS)\coredll_clrpickercmn.o \ - $(OBJS)\coredll_colourcmn.o \ - $(OBJS)\coredll_colourdata.o \ - $(OBJS)\coredll_combocmn.o \ - $(OBJS)\coredll_cmdproc.o \ - $(OBJS)\coredll_cmndata.o \ - $(OBJS)\coredll_containr.o \ - $(OBJS)\coredll_cshelp.o \ - $(OBJS)\coredll_ctrlcmn.o \ - $(OBJS)\coredll_ctrlsub.o \ - $(OBJS)\coredll_dcbase.o \ - $(OBJS)\coredll_dcbufcmn.o \ - $(OBJS)\coredll_dcgraph.o \ - $(OBJS)\coredll_dcsvg.o \ - $(OBJS)\coredll_dirctrlcmn.o \ - $(OBJS)\coredll_dlgcmn.o \ - $(OBJS)\coredll_dndcmn.o \ - $(OBJS)\coredll_dobjcmn.o \ - $(OBJS)\coredll_docmdi.o \ - $(OBJS)\coredll_docview.o \ - $(OBJS)\coredll_dpycmn.o \ - $(OBJS)\coredll_dseldlg.o \ - $(OBJS)\coredll_effects.o \ - $(OBJS)\coredll_fddlgcmn.o \ - $(OBJS)\coredll_filectrlcmn.o \ - $(OBJS)\coredll_filehistorycmn.o \ - $(OBJS)\coredll_filepickercmn.o \ - $(OBJS)\coredll_fontpickercmn.o \ - $(OBJS)\coredll_fldlgcmn.o \ - $(OBJS)\coredll_fontcmn.o \ - $(OBJS)\coredll_fontdata.o \ - $(OBJS)\coredll_graphicc.o \ - $(OBJS)\coredll_fontenumcmn.o \ - $(OBJS)\coredll_fontmap.o \ - $(OBJS)\coredll_fontutilcmn.o \ - $(OBJS)\coredll_framecmn.o \ - $(OBJS)\coredll_gaugecmn.o \ - $(OBJS)\coredll_gbsizer.o \ - $(OBJS)\coredll_gdicmn.o \ - $(OBJS)\coredll_geometry.o \ - $(OBJS)\coredll_gifdecod.o \ - $(OBJS)\coredll_graphcmn.o \ - $(OBJS)\coredll_headercolcmn.o \ - $(OBJS)\coredll_headerctrlcmn.o \ - $(OBJS)\coredll_helpbase.o \ - $(OBJS)\coredll_iconbndl.o \ - $(OBJS)\coredll_imagall.o \ - $(OBJS)\coredll_imagbmp.o \ - $(OBJS)\coredll_image.o \ - $(OBJS)\coredll_imagfill.o \ - $(OBJS)\coredll_imaggif.o \ - $(OBJS)\coredll_imagiff.o \ - $(OBJS)\coredll_imagjpeg.o \ - $(OBJS)\coredll_imagpcx.o \ - $(OBJS)\coredll_imagpng.o \ - $(OBJS)\coredll_imagpnm.o \ - $(OBJS)\coredll_imagtga.o \ - $(OBJS)\coredll_imagtiff.o \ - $(OBJS)\coredll_imagxpm.o \ - $(OBJS)\coredll_layout.o \ - $(OBJS)\coredll_lboxcmn.o \ - $(OBJS)\coredll_listctrlcmn.o \ - $(OBJS)\coredll_markupparser.o \ - $(OBJS)\coredll_matrix.o \ - $(OBJS)\coredll_menucmn.o \ - $(OBJS)\coredll_modalhook.o \ - $(OBJS)\coredll_mousemanager.o \ - $(OBJS)\coredll_nbkbase.o \ - $(OBJS)\coredll_overlaycmn.o \ - $(OBJS)\coredll_ownerdrwcmn.o \ - $(OBJS)\coredll_paper.o \ - $(OBJS)\coredll_panelcmn.o \ - $(OBJS)\coredll_persist.o \ - $(OBJS)\coredll_pickerbase.o \ - $(OBJS)\coredll_popupcmn.o \ - $(OBJS)\coredll_preferencescmn.o \ - $(OBJS)\coredll_prntbase.o \ - $(OBJS)\coredll_quantize.o \ - $(OBJS)\coredll_radiobtncmn.o \ - $(OBJS)\coredll_radiocmn.o \ - $(OBJS)\coredll_rearrangectrl.o \ - $(OBJS)\coredll_rendcmn.o \ - $(OBJS)\coredll_rgncmn.o \ - $(OBJS)\coredll_scrolbarcmn.o \ - $(OBJS)\coredll_settcmn.o \ - $(OBJS)\coredll_sizer.o \ - $(OBJS)\coredll_slidercmn.o \ - $(OBJS)\coredll_spinbtncmn.o \ - $(OBJS)\coredll_spinctrlcmn.o \ - $(OBJS)\coredll_srchcmn.o \ - $(OBJS)\coredll_statbar.o \ - $(OBJS)\coredll_statbmpcmn.o \ - $(OBJS)\coredll_statboxcmn.o \ - $(OBJS)\coredll_statlinecmn.o \ - $(OBJS)\coredll_stattextcmn.o \ - $(OBJS)\coredll_stockitem.o \ - $(OBJS)\coredll_tbarbase.o \ - $(OBJS)\coredll_textcmn.o \ - $(OBJS)\coredll_textentrycmn.o \ - $(OBJS)\coredll_textmeasurecmn.o \ - $(OBJS)\coredll_toplvcmn.o \ - $(OBJS)\coredll_treebase.o \ - $(OBJS)\coredll_uiactioncmn.o \ - $(OBJS)\coredll_valgen.o \ - $(OBJS)\coredll_validate.o \ - $(OBJS)\coredll_valtext.o \ - $(OBJS)\coredll_valnum.o \ - $(OBJS)\coredll_wincmn.o \ - $(OBJS)\coredll_windowid.o \ - $(OBJS)\coredll_wrapsizer.o \ - $(OBJS)\coredll_xpmdecod.o \ - $(OBJS)\coredll_busyinfo.o \ - $(OBJS)\coredll_buttonbar.o \ - $(OBJS)\coredll_choicdgg.o \ - $(OBJS)\coredll_choicbkg.o \ - $(OBJS)\coredll_combog.o \ - $(OBJS)\coredll_dcpsg.o \ - $(OBJS)\coredll_dirctrlg.o \ - $(OBJS)\coredll_dragimgg.o \ - $(OBJS)\coredll_filectrlg.o \ - $(OBJS)\coredll_headerctrlg.o \ - $(OBJS)\coredll_infobar.o \ - $(OBJS)\coredll_listbkg.o \ - $(OBJS)\coredll_logg.o \ - $(OBJS)\coredll_markuptext.o \ - $(OBJS)\coredll_msgdlgg.o \ - $(OBJS)\coredll_numdlgg.o \ - $(OBJS)\coredll_progdlgg.o \ - $(OBJS)\coredll_preferencesg.o \ - $(OBJS)\coredll_printps.o \ - $(OBJS)\coredll_renderg.o \ - $(OBJS)\coredll_richmsgdlgg.o \ - $(OBJS)\coredll_scrlwing.o \ - $(OBJS)\coredll_selstore.o \ - $(OBJS)\coredll_spinctlg.o \ - $(OBJS)\coredll_splitter.o \ - $(OBJS)\coredll_srchctlg.o \ - $(OBJS)\coredll_statbmpg.o \ - $(OBJS)\coredll_stattextg.o \ - $(OBJS)\coredll_textdlgg.o \ - $(OBJS)\coredll_tipwin.o \ - $(OBJS)\coredll_toolbkg.o \ - $(OBJS)\coredll_treectlg.o \ - $(OBJS)\coredll_treebkg.o \ - $(OBJS)\coredll_vlbox.o \ - $(OBJS)\coredll_vscroll.o \ - $(OBJS)\coredll_xmlreshandler.o -endif -endif -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),1) -____CORE_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\coredll_activex.o \ - $(OBJS)\coredll_app.o \ - $(OBJS)\coredll_bitmap.o \ - $(OBJS)\coredll_brush.o \ - $(OBJS)\coredll_caret.o \ - $(OBJS)\coredll_clipbrd.o \ - $(OBJS)\coredll_colour.o \ - $(OBJS)\coredll_cursor.o \ - $(OBJS)\coredll_data.o \ - $(OBJS)\coredll_dc.o \ - $(OBJS)\coredll_dcclient.o \ - $(OBJS)\coredll_dcmemory.o \ - $(OBJS)\coredll_dcprint.o \ - $(OBJS)\coredll_dcscreen.o \ - $(OBJS)\coredll_dialup.o \ - $(OBJS)\coredll_dib.o \ - $(OBJS)\coredll_display.o \ - $(OBJS)\coredll_enhmeta.o \ - $(OBJS)\coredll_font.o \ - $(OBJS)\coredll_fontenum.o \ - $(OBJS)\coredll_fontutil.o \ - $(OBJS)\coredll_gdiimage.o \ - $(OBJS)\coredll_gdiobj.o \ - $(OBJS)\coredll_gdiplus.o \ - $(OBJS)\coredll_graphics.o \ - $(OBJS)\coredll_icon.o \ - $(OBJS)\coredll_imaglist.o \ - $(OBJS)\coredll_minifram.o \ - $(OBJS)\coredll_nonownedwnd.o \ - $(OBJS)\coredll_dataobj.o \ - $(OBJS)\coredll_dropsrc.o \ - $(OBJS)\coredll_droptgt.o \ - $(OBJS)\coredll_oleutils.o \ - $(OBJS)\coredll_safearray.o \ - $(OBJS)\coredll_palette.o \ - $(OBJS)\coredll_pen.o \ - $(OBJS)\coredll_popupwin.o \ - $(OBJS)\coredll_printdlg.o \ - $(OBJS)\coredll_printwin.o \ - $(OBJS)\coredll_region.o \ - $(OBJS)\coredll_renderer.o \ - $(OBJS)\coredll_settings.o \ - $(OBJS)\coredll_textmeasure.o \ - $(OBJS)\coredll_tooltip.o \ - $(OBJS)\coredll_toplevel.o \ - $(OBJS)\coredll_uiaction.o \ - $(OBJS)\coredll_utilsgui.o \ - $(OBJS)\coredll_utilswin.o \ - $(OBJS)\coredll_uxtheme.o \ - $(OBJS)\coredll_window.o \ - $(OBJS)\coredll_helpchm.o \ - $(OBJS)\coredll_helpwin.o \ - $(OBJS)\coredll_automtn.o \ - $(OBJS)\coredll_uuid.o \ - $(OBJS)\coredll_evtloop.o \ - $(OBJS)\coredll_generic_accel.o \ - $(OBJS)\coredll_clrpickerg.o \ - $(OBJS)\coredll_collpaneg.o \ - $(OBJS)\coredll_colrdlgg.o \ - $(OBJS)\coredll_dirdlgg.o \ - $(OBJS)\coredll_generic_fdrepdlg.o \ - $(OBJS)\coredll_filedlgg.o \ - $(OBJS)\coredll_filepickerg.o \ - $(OBJS)\coredll_fontdlgg.o \ - $(OBJS)\coredll_fontpickerg.o \ - $(OBJS)\coredll_generic_listctrl.o \ - $(OBJS)\coredll_mdig.o \ - $(OBJS)\coredll_prntdlgg.o \ - $(OBJS)\coredll_univ_bmpbuttn.o \ - $(OBJS)\coredll_univ_button.o \ - $(OBJS)\coredll_univ_checkbox.o \ - $(OBJS)\coredll_univ_checklst.o \ - $(OBJS)\coredll_univ_choice.o \ - $(OBJS)\coredll_univ_combobox.o \ - $(OBJS)\coredll_univ_control.o \ - $(OBJS)\coredll_ctrlrend.o \ - $(OBJS)\coredll_univ_dialog.o \ - $(OBJS)\coredll_framuniv.o \ - $(OBJS)\coredll_univ_gauge.o \ - $(OBJS)\coredll_inpcons.o \ - $(OBJS)\coredll_inphand.o \ - $(OBJS)\coredll_univ_listbox.o \ - $(OBJS)\coredll_univ_menu.o \ - $(OBJS)\coredll_univ_notebook.o \ - $(OBJS)\coredll_univ_radiobox.o \ - $(OBJS)\coredll_univ_radiobut.o \ - $(OBJS)\coredll_scrarrow.o \ - $(OBJS)\coredll_univ_scrolbar.o \ - $(OBJS)\coredll_scrthumb.o \ - $(OBJS)\coredll_settingsuniv.o \ - $(OBJS)\coredll_univ_slider.o \ - $(OBJS)\coredll_univ_spinbutt.o \ - $(OBJS)\coredll_univ_statbmp.o \ - $(OBJS)\coredll_univ_statbox.o \ - $(OBJS)\coredll_univ_statline.o \ - $(OBJS)\coredll_univ_stattext.o \ - $(OBJS)\coredll_univ_statusbr.o \ - $(OBJS)\coredll_stdrend.o \ - $(OBJS)\coredll_univ_textctrl.o \ - $(OBJS)\coredll_univ_tglbtn.o \ - $(OBJS)\coredll_theme.o \ - $(OBJS)\coredll_univ_toolbar.o \ - $(OBJS)\coredll_topluniv.o \ - $(OBJS)\coredll_winuniv.o \ - $(OBJS)\coredll_gtk.o \ - $(OBJS)\coredll_metal.o \ - $(OBJS)\coredll_mono.o \ - $(OBJS)\coredll_win32.o \ - $(OBJS)\coredll_accelcmn.o \ - $(OBJS)\coredll_accesscmn.o \ - $(OBJS)\coredll_anidecod.o \ - $(OBJS)\coredll_affinematrix2d.o \ - $(OBJS)\coredll_appcmn.o \ - $(OBJS)\coredll_artprov.o \ - $(OBJS)\coredll_artstd.o \ - $(OBJS)\coredll_arttango.o \ - $(OBJS)\coredll_bmpbase.o \ - $(OBJS)\coredll_bmpbtncmn.o \ - $(OBJS)\coredll_bookctrl.o \ - $(OBJS)\coredll_btncmn.o \ - $(OBJS)\coredll_cairo.o \ - $(OBJS)\coredll_checkboxcmn.o \ - $(OBJS)\coredll_checklstcmn.o \ - $(OBJS)\coredll_choiccmn.o \ - $(OBJS)\coredll_clipcmn.o \ - $(OBJS)\coredll_clrpickercmn.o \ - $(OBJS)\coredll_colourcmn.o \ - $(OBJS)\coredll_colourdata.o \ - $(OBJS)\coredll_combocmn.o \ - $(OBJS)\coredll_cmdproc.o \ - $(OBJS)\coredll_cmndata.o \ - $(OBJS)\coredll_containr.o \ - $(OBJS)\coredll_cshelp.o \ - $(OBJS)\coredll_ctrlcmn.o \ - $(OBJS)\coredll_ctrlsub.o \ - $(OBJS)\coredll_dcbase.o \ - $(OBJS)\coredll_dcbufcmn.o \ - $(OBJS)\coredll_dcgraph.o \ - $(OBJS)\coredll_dcsvg.o \ - $(OBJS)\coredll_dirctrlcmn.o \ - $(OBJS)\coredll_dlgcmn.o \ - $(OBJS)\coredll_dndcmn.o \ - $(OBJS)\coredll_dobjcmn.o \ - $(OBJS)\coredll_docmdi.o \ - $(OBJS)\coredll_docview.o \ - $(OBJS)\coredll_dpycmn.o \ - $(OBJS)\coredll_dseldlg.o \ - $(OBJS)\coredll_effects.o \ - $(OBJS)\coredll_fddlgcmn.o \ - $(OBJS)\coredll_filectrlcmn.o \ - $(OBJS)\coredll_filehistorycmn.o \ - $(OBJS)\coredll_filepickercmn.o \ - $(OBJS)\coredll_fontpickercmn.o \ - $(OBJS)\coredll_fldlgcmn.o \ - $(OBJS)\coredll_fontcmn.o \ - $(OBJS)\coredll_fontdata.o \ - $(OBJS)\coredll_graphicc.o \ - $(OBJS)\coredll_fontenumcmn.o \ - $(OBJS)\coredll_fontmap.o \ - $(OBJS)\coredll_fontutilcmn.o \ - $(OBJS)\coredll_framecmn.o \ - $(OBJS)\coredll_gaugecmn.o \ - $(OBJS)\coredll_gbsizer.o \ - $(OBJS)\coredll_gdicmn.o \ - $(OBJS)\coredll_geometry.o \ - $(OBJS)\coredll_gifdecod.o \ - $(OBJS)\coredll_graphcmn.o \ - $(OBJS)\coredll_headercolcmn.o \ - $(OBJS)\coredll_headerctrlcmn.o \ - $(OBJS)\coredll_helpbase.o \ - $(OBJS)\coredll_iconbndl.o \ - $(OBJS)\coredll_imagall.o \ - $(OBJS)\coredll_imagbmp.o \ - $(OBJS)\coredll_image.o \ - $(OBJS)\coredll_imagfill.o \ - $(OBJS)\coredll_imaggif.o \ - $(OBJS)\coredll_imagiff.o \ - $(OBJS)\coredll_imagjpeg.o \ - $(OBJS)\coredll_imagpcx.o \ - $(OBJS)\coredll_imagpng.o \ - $(OBJS)\coredll_imagpnm.o \ - $(OBJS)\coredll_imagtga.o \ - $(OBJS)\coredll_imagtiff.o \ - $(OBJS)\coredll_imagxpm.o \ - $(OBJS)\coredll_layout.o \ - $(OBJS)\coredll_lboxcmn.o \ - $(OBJS)\coredll_listctrlcmn.o \ - $(OBJS)\coredll_markupparser.o \ - $(OBJS)\coredll_matrix.o \ - $(OBJS)\coredll_menucmn.o \ - $(OBJS)\coredll_modalhook.o \ - $(OBJS)\coredll_mousemanager.o \ - $(OBJS)\coredll_nbkbase.o \ - $(OBJS)\coredll_overlaycmn.o \ - $(OBJS)\coredll_ownerdrwcmn.o \ - $(OBJS)\coredll_paper.o \ - $(OBJS)\coredll_panelcmn.o \ - $(OBJS)\coredll_persist.o \ - $(OBJS)\coredll_pickerbase.o \ - $(OBJS)\coredll_popupcmn.o \ - $(OBJS)\coredll_preferencescmn.o \ - $(OBJS)\coredll_prntbase.o \ - $(OBJS)\coredll_quantize.o \ - $(OBJS)\coredll_radiobtncmn.o \ - $(OBJS)\coredll_radiocmn.o \ - $(OBJS)\coredll_rearrangectrl.o \ - $(OBJS)\coredll_rendcmn.o \ - $(OBJS)\coredll_rgncmn.o \ - $(OBJS)\coredll_scrolbarcmn.o \ - $(OBJS)\coredll_settcmn.o \ - $(OBJS)\coredll_sizer.o \ - $(OBJS)\coredll_slidercmn.o \ - $(OBJS)\coredll_spinbtncmn.o \ - $(OBJS)\coredll_spinctrlcmn.o \ - $(OBJS)\coredll_srchcmn.o \ - $(OBJS)\coredll_statbar.o \ - $(OBJS)\coredll_statbmpcmn.o \ - $(OBJS)\coredll_statboxcmn.o \ - $(OBJS)\coredll_statlinecmn.o \ - $(OBJS)\coredll_stattextcmn.o \ - $(OBJS)\coredll_stockitem.o \ - $(OBJS)\coredll_tbarbase.o \ - $(OBJS)\coredll_textcmn.o \ - $(OBJS)\coredll_textentrycmn.o \ - $(OBJS)\coredll_textmeasurecmn.o \ - $(OBJS)\coredll_toplvcmn.o \ - $(OBJS)\coredll_treebase.o \ - $(OBJS)\coredll_uiactioncmn.o \ - $(OBJS)\coredll_valgen.o \ - $(OBJS)\coredll_validate.o \ - $(OBJS)\coredll_valtext.o \ - $(OBJS)\coredll_valnum.o \ - $(OBJS)\coredll_wincmn.o \ - $(OBJS)\coredll_windowid.o \ - $(OBJS)\coredll_wrapsizer.o \ - $(OBJS)\coredll_xpmdecod.o \ - $(OBJS)\coredll_busyinfo.o \ - $(OBJS)\coredll_buttonbar.o \ - $(OBJS)\coredll_choicdgg.o \ - $(OBJS)\coredll_choicbkg.o \ - $(OBJS)\coredll_combog.o \ - $(OBJS)\coredll_dcpsg.o \ - $(OBJS)\coredll_dirctrlg.o \ - $(OBJS)\coredll_dragimgg.o \ - $(OBJS)\coredll_filectrlg.o \ - $(OBJS)\coredll_headerctrlg.o \ - $(OBJS)\coredll_infobar.o \ - $(OBJS)\coredll_listbkg.o \ - $(OBJS)\coredll_logg.o \ - $(OBJS)\coredll_markuptext.o \ - $(OBJS)\coredll_msgdlgg.o \ - $(OBJS)\coredll_numdlgg.o \ - $(OBJS)\coredll_progdlgg.o \ - $(OBJS)\coredll_preferencesg.o \ - $(OBJS)\coredll_printps.o \ - $(OBJS)\coredll_renderg.o \ - $(OBJS)\coredll_richmsgdlgg.o \ - $(OBJS)\coredll_scrlwing.o \ - $(OBJS)\coredll_selstore.o \ - $(OBJS)\coredll_spinctlg.o \ - $(OBJS)\coredll_splitter.o \ - $(OBJS)\coredll_srchctlg.o \ - $(OBJS)\coredll_statbmpg.o \ - $(OBJS)\coredll_stattextg.o \ - $(OBJS)\coredll_textdlgg.o \ - $(OBJS)\coredll_tipwin.o \ - $(OBJS)\coredll_toolbkg.o \ - $(OBJS)\coredll_treectlg.o \ - $(OBJS)\coredll_treebkg.o \ - $(OBJS)\coredll_vlbox.o \ - $(OBJS)\coredll_vscroll.o \ - $(OBJS)\coredll_xmlreshandler.o -endif -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_GUI),1) -__corelib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a -endif -endif -endif -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),0) -____CORE_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\corelib_activex.o \ - $(OBJS)\corelib_app.o \ - $(OBJS)\corelib_bitmap.o \ - $(OBJS)\corelib_brush.o \ - $(OBJS)\corelib_caret.o \ - $(OBJS)\corelib_clipbrd.o \ - $(OBJS)\corelib_colour.o \ - $(OBJS)\corelib_cursor.o \ - $(OBJS)\corelib_data.o \ - $(OBJS)\corelib_dc.o \ - $(OBJS)\corelib_dcclient.o \ - $(OBJS)\corelib_dcmemory.o \ - $(OBJS)\corelib_dcprint.o \ - $(OBJS)\corelib_dcscreen.o \ - $(OBJS)\corelib_dialup.o \ - $(OBJS)\corelib_dib.o \ - $(OBJS)\corelib_display.o \ - $(OBJS)\corelib_enhmeta.o \ - $(OBJS)\corelib_font.o \ - $(OBJS)\corelib_fontenum.o \ - $(OBJS)\corelib_fontutil.o \ - $(OBJS)\corelib_gdiimage.o \ - $(OBJS)\corelib_gdiobj.o \ - $(OBJS)\corelib_gdiplus.o \ - $(OBJS)\corelib_graphics.o \ - $(OBJS)\corelib_icon.o \ - $(OBJS)\corelib_imaglist.o \ - $(OBJS)\corelib_minifram.o \ - $(OBJS)\corelib_nonownedwnd.o \ - $(OBJS)\corelib_dataobj.o \ - $(OBJS)\corelib_dropsrc.o \ - $(OBJS)\corelib_droptgt.o \ - $(OBJS)\corelib_oleutils.o \ - $(OBJS)\corelib_safearray.o \ - $(OBJS)\corelib_palette.o \ - $(OBJS)\corelib_pen.o \ - $(OBJS)\corelib_popupwin.o \ - $(OBJS)\corelib_printdlg.o \ - $(OBJS)\corelib_printwin.o \ - $(OBJS)\corelib_region.o \ - $(OBJS)\corelib_renderer.o \ - $(OBJS)\corelib_settings.o \ - $(OBJS)\corelib_textmeasure.o \ - $(OBJS)\corelib_tooltip.o \ - $(OBJS)\corelib_toplevel.o \ - $(OBJS)\corelib_uiaction.o \ - $(OBJS)\corelib_utilsgui.o \ - $(OBJS)\corelib_utilswin.o \ - $(OBJS)\corelib_uxtheme.o \ - $(OBJS)\corelib_window.o \ - $(OBJS)\corelib_helpchm.o \ - $(OBJS)\corelib_helpwin.o \ - $(OBJS)\corelib_automtn.o \ - $(OBJS)\corelib_uuid.o \ - $(OBJS)\corelib_clrpickerg.o \ - $(OBJS)\corelib_collpaneg.o \ - $(OBJS)\corelib_filepickerg.o \ - $(OBJS)\corelib_fontpickerg.o \ - $(OBJS)\corelib_generic_statusbr.o \ - $(OBJS)\corelib_prntdlgg.o \ - $(OBJS)\corelib_msw_accel.o \ - $(OBJS)\corelib_anybutton.o \ - $(OBJS)\corelib_artmsw.o \ - $(OBJS)\corelib_msw_bmpbuttn.o \ - $(OBJS)\corelib_msw_button.o \ - $(OBJS)\corelib_msw_checkbox.o \ - $(OBJS)\corelib_msw_choice.o \ - $(OBJS)\corelib_colordlg.o \ - $(OBJS)\corelib_combo.o \ - $(OBJS)\corelib_msw_combobox.o \ - $(OBJS)\corelib_msw_control.o \ - $(OBJS)\corelib_msw_dialog.o \ - $(OBJS)\corelib_dirdlg.o \ - $(OBJS)\corelib_dragimag.o \ - $(OBJS)\corelib_evtloop.o \ - $(OBJS)\corelib_filedlg.o \ - $(OBJS)\corelib_frame.o \ - $(OBJS)\corelib_msw_gauge.o \ - $(OBJS)\corelib_headerctrl.o \ - $(OBJS)\corelib_iniconf.o \ - $(OBJS)\corelib_msw_listbox.o \ - $(OBJS)\corelib_msw_listctrl.o \ - $(OBJS)\corelib_mdi.o \ - $(OBJS)\corelib_msw_menu.o \ - $(OBJS)\corelib_menuitem.o \ - $(OBJS)\corelib_metafile.o \ - $(OBJS)\corelib_msgdlg.o \ - $(OBJS)\corelib_nativdlg.o \ - $(OBJS)\corelib_nativewin.o \ - $(OBJS)\corelib_msw_notebook.o \ - $(OBJS)\corelib_access.o \ - $(OBJS)\corelib_ownerdrw.o \ - $(OBJS)\corelib_panel.o \ - $(OBJS)\corelib_progdlg.o \ - $(OBJS)\corelib_msw_radiobox.o \ - $(OBJS)\corelib_msw_radiobut.o \ - $(OBJS)\corelib_richmsgdlg.o \ - $(OBJS)\corelib_msw_scrolbar.o \ - $(OBJS)\corelib_msw_slider.o \ - $(OBJS)\corelib_msw_spinbutt.o \ - $(OBJS)\corelib_spinctrl.o \ - $(OBJS)\corelib_msw_statbmp.o \ - $(OBJS)\corelib_msw_statbox.o \ - $(OBJS)\corelib_statusbar.o \ - $(OBJS)\corelib_msw_statline.o \ - $(OBJS)\corelib_msw_stattext.o \ - $(OBJS)\corelib_msw_toolbar.o \ - $(OBJS)\corelib_msw_textctrl.o \ - $(OBJS)\corelib_textentry.o \ - $(OBJS)\corelib_msw_tglbtn.o \ - $(OBJS)\corelib_treectrl.o \ - $(OBJS)\corelib_msw_checklst.o \ - $(OBJS)\corelib_msw_fdrepdlg.o \ - $(OBJS)\corelib_fontdlg.o \ - $(OBJS)\corelib_accelcmn.o \ - $(OBJS)\corelib_accesscmn.o \ - $(OBJS)\corelib_anidecod.o \ - $(OBJS)\corelib_affinematrix2d.o \ - $(OBJS)\corelib_appcmn.o \ - $(OBJS)\corelib_artprov.o \ - $(OBJS)\corelib_artstd.o \ - $(OBJS)\corelib_arttango.o \ - $(OBJS)\corelib_bmpbase.o \ - $(OBJS)\corelib_bmpbtncmn.o \ - $(OBJS)\corelib_bookctrl.o \ - $(OBJS)\corelib_btncmn.o \ - $(OBJS)\corelib_cairo.o \ - $(OBJS)\corelib_checkboxcmn.o \ - $(OBJS)\corelib_checklstcmn.o \ - $(OBJS)\corelib_choiccmn.o \ - $(OBJS)\corelib_clipcmn.o \ - $(OBJS)\corelib_clrpickercmn.o \ - $(OBJS)\corelib_colourcmn.o \ - $(OBJS)\corelib_colourdata.o \ - $(OBJS)\corelib_combocmn.o \ - $(OBJS)\corelib_cmdproc.o \ - $(OBJS)\corelib_cmndata.o \ - $(OBJS)\corelib_containr.o \ - $(OBJS)\corelib_cshelp.o \ - $(OBJS)\corelib_ctrlcmn.o \ - $(OBJS)\corelib_ctrlsub.o \ - $(OBJS)\corelib_dcbase.o \ - $(OBJS)\corelib_dcbufcmn.o \ - $(OBJS)\corelib_dcgraph.o \ - $(OBJS)\corelib_dcsvg.o \ - $(OBJS)\corelib_dirctrlcmn.o \ - $(OBJS)\corelib_dlgcmn.o \ - $(OBJS)\corelib_dndcmn.o \ - $(OBJS)\corelib_dobjcmn.o \ - $(OBJS)\corelib_docmdi.o \ - $(OBJS)\corelib_docview.o \ - $(OBJS)\corelib_dpycmn.o \ - $(OBJS)\corelib_dseldlg.o \ - $(OBJS)\corelib_effects.o \ - $(OBJS)\corelib_fddlgcmn.o \ - $(OBJS)\corelib_filectrlcmn.o \ - $(OBJS)\corelib_filehistorycmn.o \ - $(OBJS)\corelib_filepickercmn.o \ - $(OBJS)\corelib_fontpickercmn.o \ - $(OBJS)\corelib_fldlgcmn.o \ - $(OBJS)\corelib_fontcmn.o \ - $(OBJS)\corelib_fontdata.o \ - $(OBJS)\corelib_graphicc.o \ - $(OBJS)\corelib_fontenumcmn.o \ - $(OBJS)\corelib_fontmap.o \ - $(OBJS)\corelib_fontutilcmn.o \ - $(OBJS)\corelib_framecmn.o \ - $(OBJS)\corelib_gaugecmn.o \ - $(OBJS)\corelib_gbsizer.o \ - $(OBJS)\corelib_gdicmn.o \ - $(OBJS)\corelib_geometry.o \ - $(OBJS)\corelib_gifdecod.o \ - $(OBJS)\corelib_graphcmn.o \ - $(OBJS)\corelib_headercolcmn.o \ - $(OBJS)\corelib_headerctrlcmn.o \ - $(OBJS)\corelib_helpbase.o \ - $(OBJS)\corelib_iconbndl.o \ - $(OBJS)\corelib_imagall.o \ - $(OBJS)\corelib_imagbmp.o \ - $(OBJS)\corelib_image.o \ - $(OBJS)\corelib_imagfill.o \ - $(OBJS)\corelib_imaggif.o \ - $(OBJS)\corelib_imagiff.o \ - $(OBJS)\corelib_imagjpeg.o \ - $(OBJS)\corelib_imagpcx.o \ - $(OBJS)\corelib_imagpng.o \ - $(OBJS)\corelib_imagpnm.o \ - $(OBJS)\corelib_imagtga.o \ - $(OBJS)\corelib_imagtiff.o \ - $(OBJS)\corelib_imagxpm.o \ - $(OBJS)\corelib_layout.o \ - $(OBJS)\corelib_lboxcmn.o \ - $(OBJS)\corelib_listctrlcmn.o \ - $(OBJS)\corelib_markupparser.o \ - $(OBJS)\corelib_matrix.o \ - $(OBJS)\corelib_menucmn.o \ - $(OBJS)\corelib_modalhook.o \ - $(OBJS)\corelib_mousemanager.o \ - $(OBJS)\corelib_nbkbase.o \ - $(OBJS)\corelib_overlaycmn.o \ - $(OBJS)\corelib_ownerdrwcmn.o \ - $(OBJS)\corelib_paper.o \ - $(OBJS)\corelib_panelcmn.o \ - $(OBJS)\corelib_persist.o \ - $(OBJS)\corelib_pickerbase.o \ - $(OBJS)\corelib_popupcmn.o \ - $(OBJS)\corelib_preferencescmn.o \ - $(OBJS)\corelib_prntbase.o \ - $(OBJS)\corelib_quantize.o \ - $(OBJS)\corelib_radiobtncmn.o \ - $(OBJS)\corelib_radiocmn.o \ - $(OBJS)\corelib_rearrangectrl.o \ - $(OBJS)\corelib_rendcmn.o \ - $(OBJS)\corelib_rgncmn.o \ - $(OBJS)\corelib_scrolbarcmn.o \ - $(OBJS)\corelib_settcmn.o \ - $(OBJS)\corelib_sizer.o \ - $(OBJS)\corelib_slidercmn.o \ - $(OBJS)\corelib_spinbtncmn.o \ - $(OBJS)\corelib_spinctrlcmn.o \ - $(OBJS)\corelib_srchcmn.o \ - $(OBJS)\corelib_statbar.o \ - $(OBJS)\corelib_statbmpcmn.o \ - $(OBJS)\corelib_statboxcmn.o \ - $(OBJS)\corelib_statlinecmn.o \ - $(OBJS)\corelib_stattextcmn.o \ - $(OBJS)\corelib_stockitem.o \ - $(OBJS)\corelib_tbarbase.o \ - $(OBJS)\corelib_textcmn.o \ - $(OBJS)\corelib_textentrycmn.o \ - $(OBJS)\corelib_textmeasurecmn.o \ - $(OBJS)\corelib_toplvcmn.o \ - $(OBJS)\corelib_treebase.o \ - $(OBJS)\corelib_uiactioncmn.o \ - $(OBJS)\corelib_valgen.o \ - $(OBJS)\corelib_validate.o \ - $(OBJS)\corelib_valtext.o \ - $(OBJS)\corelib_valnum.o \ - $(OBJS)\corelib_wincmn.o \ - $(OBJS)\corelib_windowid.o \ - $(OBJS)\corelib_wrapsizer.o \ - $(OBJS)\corelib_xpmdecod.o \ - $(OBJS)\corelib_busyinfo.o \ - $(OBJS)\corelib_buttonbar.o \ - $(OBJS)\corelib_choicdgg.o \ - $(OBJS)\corelib_choicbkg.o \ - $(OBJS)\corelib_combog.o \ - $(OBJS)\corelib_dcpsg.o \ - $(OBJS)\corelib_dirctrlg.o \ - $(OBJS)\corelib_dragimgg.o \ - $(OBJS)\corelib_filectrlg.o \ - $(OBJS)\corelib_headerctrlg.o \ - $(OBJS)\corelib_infobar.o \ - $(OBJS)\corelib_listbkg.o \ - $(OBJS)\corelib_logg.o \ - $(OBJS)\corelib_markuptext.o \ - $(OBJS)\corelib_msgdlgg.o \ - $(OBJS)\corelib_numdlgg.o \ - $(OBJS)\corelib_progdlgg.o \ - $(OBJS)\corelib_preferencesg.o \ - $(OBJS)\corelib_printps.o \ - $(OBJS)\corelib_renderg.o \ - $(OBJS)\corelib_richmsgdlgg.o \ - $(OBJS)\corelib_scrlwing.o \ - $(OBJS)\corelib_selstore.o \ - $(OBJS)\corelib_spinctlg.o \ - $(OBJS)\corelib_splitter.o \ - $(OBJS)\corelib_srchctlg.o \ - $(OBJS)\corelib_statbmpg.o \ - $(OBJS)\corelib_stattextg.o \ - $(OBJS)\corelib_textdlgg.o \ - $(OBJS)\corelib_tipwin.o \ - $(OBJS)\corelib_toolbkg.o \ - $(OBJS)\corelib_treectlg.o \ - $(OBJS)\corelib_treebkg.o \ - $(OBJS)\corelib_vlbox.o \ - $(OBJS)\corelib_vscroll.o \ - $(OBJS)\corelib_xmlreshandler.o -endif -endif -ifeq ($(USE_GUI),1) -ifeq ($(WXUNIV),1) -____CORE_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\corelib_activex.o \ - $(OBJS)\corelib_app.o \ - $(OBJS)\corelib_bitmap.o \ - $(OBJS)\corelib_brush.o \ - $(OBJS)\corelib_caret.o \ - $(OBJS)\corelib_clipbrd.o \ - $(OBJS)\corelib_colour.o \ - $(OBJS)\corelib_cursor.o \ - $(OBJS)\corelib_data.o \ - $(OBJS)\corelib_dc.o \ - $(OBJS)\corelib_dcclient.o \ - $(OBJS)\corelib_dcmemory.o \ - $(OBJS)\corelib_dcprint.o \ - $(OBJS)\corelib_dcscreen.o \ - $(OBJS)\corelib_dialup.o \ - $(OBJS)\corelib_dib.o \ - $(OBJS)\corelib_display.o \ - $(OBJS)\corelib_enhmeta.o \ - $(OBJS)\corelib_font.o \ - $(OBJS)\corelib_fontenum.o \ - $(OBJS)\corelib_fontutil.o \ - $(OBJS)\corelib_gdiimage.o \ - $(OBJS)\corelib_gdiobj.o \ - $(OBJS)\corelib_gdiplus.o \ - $(OBJS)\corelib_graphics.o \ - $(OBJS)\corelib_icon.o \ - $(OBJS)\corelib_imaglist.o \ - $(OBJS)\corelib_minifram.o \ - $(OBJS)\corelib_nonownedwnd.o \ - $(OBJS)\corelib_dataobj.o \ - $(OBJS)\corelib_dropsrc.o \ - $(OBJS)\corelib_droptgt.o \ - $(OBJS)\corelib_oleutils.o \ - $(OBJS)\corelib_safearray.o \ - $(OBJS)\corelib_palette.o \ - $(OBJS)\corelib_pen.o \ - $(OBJS)\corelib_popupwin.o \ - $(OBJS)\corelib_printdlg.o \ - $(OBJS)\corelib_printwin.o \ - $(OBJS)\corelib_region.o \ - $(OBJS)\corelib_renderer.o \ - $(OBJS)\corelib_settings.o \ - $(OBJS)\corelib_textmeasure.o \ - $(OBJS)\corelib_tooltip.o \ - $(OBJS)\corelib_toplevel.o \ - $(OBJS)\corelib_uiaction.o \ - $(OBJS)\corelib_utilsgui.o \ - $(OBJS)\corelib_utilswin.o \ - $(OBJS)\corelib_uxtheme.o \ - $(OBJS)\corelib_window.o \ - $(OBJS)\corelib_helpchm.o \ - $(OBJS)\corelib_helpwin.o \ - $(OBJS)\corelib_automtn.o \ - $(OBJS)\corelib_uuid.o \ - $(OBJS)\corelib_evtloop.o \ - $(OBJS)\corelib_generic_accel.o \ - $(OBJS)\corelib_clrpickerg.o \ - $(OBJS)\corelib_collpaneg.o \ - $(OBJS)\corelib_colrdlgg.o \ - $(OBJS)\corelib_dirdlgg.o \ - $(OBJS)\corelib_generic_fdrepdlg.o \ - $(OBJS)\corelib_filedlgg.o \ - $(OBJS)\corelib_filepickerg.o \ - $(OBJS)\corelib_fontdlgg.o \ - $(OBJS)\corelib_fontpickerg.o \ - $(OBJS)\corelib_generic_listctrl.o \ - $(OBJS)\corelib_mdig.o \ - $(OBJS)\corelib_prntdlgg.o \ - $(OBJS)\corelib_univ_bmpbuttn.o \ - $(OBJS)\corelib_univ_button.o \ - $(OBJS)\corelib_univ_checkbox.o \ - $(OBJS)\corelib_univ_checklst.o \ - $(OBJS)\corelib_univ_choice.o \ - $(OBJS)\corelib_univ_combobox.o \ - $(OBJS)\corelib_univ_control.o \ - $(OBJS)\corelib_ctrlrend.o \ - $(OBJS)\corelib_univ_dialog.o \ - $(OBJS)\corelib_framuniv.o \ - $(OBJS)\corelib_univ_gauge.o \ - $(OBJS)\corelib_inpcons.o \ - $(OBJS)\corelib_inphand.o \ - $(OBJS)\corelib_univ_listbox.o \ - $(OBJS)\corelib_univ_menu.o \ - $(OBJS)\corelib_univ_notebook.o \ - $(OBJS)\corelib_univ_radiobox.o \ - $(OBJS)\corelib_univ_radiobut.o \ - $(OBJS)\corelib_scrarrow.o \ - $(OBJS)\corelib_univ_scrolbar.o \ - $(OBJS)\corelib_scrthumb.o \ - $(OBJS)\corelib_settingsuniv.o \ - $(OBJS)\corelib_univ_slider.o \ - $(OBJS)\corelib_univ_spinbutt.o \ - $(OBJS)\corelib_univ_statbmp.o \ - $(OBJS)\corelib_univ_statbox.o \ - $(OBJS)\corelib_univ_statline.o \ - $(OBJS)\corelib_univ_stattext.o \ - $(OBJS)\corelib_univ_statusbr.o \ - $(OBJS)\corelib_stdrend.o \ - $(OBJS)\corelib_univ_textctrl.o \ - $(OBJS)\corelib_univ_tglbtn.o \ - $(OBJS)\corelib_theme.o \ - $(OBJS)\corelib_univ_toolbar.o \ - $(OBJS)\corelib_topluniv.o \ - $(OBJS)\corelib_winuniv.o \ - $(OBJS)\corelib_gtk.o \ - $(OBJS)\corelib_metal.o \ - $(OBJS)\corelib_mono.o \ - $(OBJS)\corelib_win32.o \ - $(OBJS)\corelib_accelcmn.o \ - $(OBJS)\corelib_accesscmn.o \ - $(OBJS)\corelib_anidecod.o \ - $(OBJS)\corelib_affinematrix2d.o \ - $(OBJS)\corelib_appcmn.o \ - $(OBJS)\corelib_artprov.o \ - $(OBJS)\corelib_artstd.o \ - $(OBJS)\corelib_arttango.o \ - $(OBJS)\corelib_bmpbase.o \ - $(OBJS)\corelib_bmpbtncmn.o \ - $(OBJS)\corelib_bookctrl.o \ - $(OBJS)\corelib_btncmn.o \ - $(OBJS)\corelib_cairo.o \ - $(OBJS)\corelib_checkboxcmn.o \ - $(OBJS)\corelib_checklstcmn.o \ - $(OBJS)\corelib_choiccmn.o \ - $(OBJS)\corelib_clipcmn.o \ - $(OBJS)\corelib_clrpickercmn.o \ - $(OBJS)\corelib_colourcmn.o \ - $(OBJS)\corelib_colourdata.o \ - $(OBJS)\corelib_combocmn.o \ - $(OBJS)\corelib_cmdproc.o \ - $(OBJS)\corelib_cmndata.o \ - $(OBJS)\corelib_containr.o \ - $(OBJS)\corelib_cshelp.o \ - $(OBJS)\corelib_ctrlcmn.o \ - $(OBJS)\corelib_ctrlsub.o \ - $(OBJS)\corelib_dcbase.o \ - $(OBJS)\corelib_dcbufcmn.o \ - $(OBJS)\corelib_dcgraph.o \ - $(OBJS)\corelib_dcsvg.o \ - $(OBJS)\corelib_dirctrlcmn.o \ - $(OBJS)\corelib_dlgcmn.o \ - $(OBJS)\corelib_dndcmn.o \ - $(OBJS)\corelib_dobjcmn.o \ - $(OBJS)\corelib_docmdi.o \ - $(OBJS)\corelib_docview.o \ - $(OBJS)\corelib_dpycmn.o \ - $(OBJS)\corelib_dseldlg.o \ - $(OBJS)\corelib_effects.o \ - $(OBJS)\corelib_fddlgcmn.o \ - $(OBJS)\corelib_filectrlcmn.o \ - $(OBJS)\corelib_filehistorycmn.o \ - $(OBJS)\corelib_filepickercmn.o \ - $(OBJS)\corelib_fontpickercmn.o \ - $(OBJS)\corelib_fldlgcmn.o \ - $(OBJS)\corelib_fontcmn.o \ - $(OBJS)\corelib_fontdata.o \ - $(OBJS)\corelib_graphicc.o \ - $(OBJS)\corelib_fontenumcmn.o \ - $(OBJS)\corelib_fontmap.o \ - $(OBJS)\corelib_fontutilcmn.o \ - $(OBJS)\corelib_framecmn.o \ - $(OBJS)\corelib_gaugecmn.o \ - $(OBJS)\corelib_gbsizer.o \ - $(OBJS)\corelib_gdicmn.o \ - $(OBJS)\corelib_geometry.o \ - $(OBJS)\corelib_gifdecod.o \ - $(OBJS)\corelib_graphcmn.o \ - $(OBJS)\corelib_headercolcmn.o \ - $(OBJS)\corelib_headerctrlcmn.o \ - $(OBJS)\corelib_helpbase.o \ - $(OBJS)\corelib_iconbndl.o \ - $(OBJS)\corelib_imagall.o \ - $(OBJS)\corelib_imagbmp.o \ - $(OBJS)\corelib_image.o \ - $(OBJS)\corelib_imagfill.o \ - $(OBJS)\corelib_imaggif.o \ - $(OBJS)\corelib_imagiff.o \ - $(OBJS)\corelib_imagjpeg.o \ - $(OBJS)\corelib_imagpcx.o \ - $(OBJS)\corelib_imagpng.o \ - $(OBJS)\corelib_imagpnm.o \ - $(OBJS)\corelib_imagtga.o \ - $(OBJS)\corelib_imagtiff.o \ - $(OBJS)\corelib_imagxpm.o \ - $(OBJS)\corelib_layout.o \ - $(OBJS)\corelib_lboxcmn.o \ - $(OBJS)\corelib_listctrlcmn.o \ - $(OBJS)\corelib_markupparser.o \ - $(OBJS)\corelib_matrix.o \ - $(OBJS)\corelib_menucmn.o \ - $(OBJS)\corelib_modalhook.o \ - $(OBJS)\corelib_mousemanager.o \ - $(OBJS)\corelib_nbkbase.o \ - $(OBJS)\corelib_overlaycmn.o \ - $(OBJS)\corelib_ownerdrwcmn.o \ - $(OBJS)\corelib_paper.o \ - $(OBJS)\corelib_panelcmn.o \ - $(OBJS)\corelib_persist.o \ - $(OBJS)\corelib_pickerbase.o \ - $(OBJS)\corelib_popupcmn.o \ - $(OBJS)\corelib_preferencescmn.o \ - $(OBJS)\corelib_prntbase.o \ - $(OBJS)\corelib_quantize.o \ - $(OBJS)\corelib_radiobtncmn.o \ - $(OBJS)\corelib_radiocmn.o \ - $(OBJS)\corelib_rearrangectrl.o \ - $(OBJS)\corelib_rendcmn.o \ - $(OBJS)\corelib_rgncmn.o \ - $(OBJS)\corelib_scrolbarcmn.o \ - $(OBJS)\corelib_settcmn.o \ - $(OBJS)\corelib_sizer.o \ - $(OBJS)\corelib_slidercmn.o \ - $(OBJS)\corelib_spinbtncmn.o \ - $(OBJS)\corelib_spinctrlcmn.o \ - $(OBJS)\corelib_srchcmn.o \ - $(OBJS)\corelib_statbar.o \ - $(OBJS)\corelib_statbmpcmn.o \ - $(OBJS)\corelib_statboxcmn.o \ - $(OBJS)\corelib_statlinecmn.o \ - $(OBJS)\corelib_stattextcmn.o \ - $(OBJS)\corelib_stockitem.o \ - $(OBJS)\corelib_tbarbase.o \ - $(OBJS)\corelib_textcmn.o \ - $(OBJS)\corelib_textentrycmn.o \ - $(OBJS)\corelib_textmeasurecmn.o \ - $(OBJS)\corelib_toplvcmn.o \ - $(OBJS)\corelib_treebase.o \ - $(OBJS)\corelib_uiactioncmn.o \ - $(OBJS)\corelib_valgen.o \ - $(OBJS)\corelib_validate.o \ - $(OBJS)\corelib_valtext.o \ - $(OBJS)\corelib_valnum.o \ - $(OBJS)\corelib_wincmn.o \ - $(OBJS)\corelib_windowid.o \ - $(OBJS)\corelib_wrapsizer.o \ - $(OBJS)\corelib_xpmdecod.o \ - $(OBJS)\corelib_busyinfo.o \ - $(OBJS)\corelib_buttonbar.o \ - $(OBJS)\corelib_choicdgg.o \ - $(OBJS)\corelib_choicbkg.o \ - $(OBJS)\corelib_combog.o \ - $(OBJS)\corelib_dcpsg.o \ - $(OBJS)\corelib_dirctrlg.o \ - $(OBJS)\corelib_dragimgg.o \ - $(OBJS)\corelib_filectrlg.o \ - $(OBJS)\corelib_headerctrlg.o \ - $(OBJS)\corelib_infobar.o \ - $(OBJS)\corelib_listbkg.o \ - $(OBJS)\corelib_logg.o \ - $(OBJS)\corelib_markuptext.o \ - $(OBJS)\corelib_msgdlgg.o \ - $(OBJS)\corelib_numdlgg.o \ - $(OBJS)\corelib_progdlgg.o \ - $(OBJS)\corelib_preferencesg.o \ - $(OBJS)\corelib_printps.o \ - $(OBJS)\corelib_renderg.o \ - $(OBJS)\corelib_richmsgdlgg.o \ - $(OBJS)\corelib_scrlwing.o \ - $(OBJS)\corelib_selstore.o \ - $(OBJS)\corelib_spinctlg.o \ - $(OBJS)\corelib_splitter.o \ - $(OBJS)\corelib_srchctlg.o \ - $(OBJS)\corelib_statbmpg.o \ - $(OBJS)\corelib_stattextg.o \ - $(OBJS)\corelib_textdlgg.o \ - $(OBJS)\corelib_tipwin.o \ - $(OBJS)\corelib_toolbkg.o \ - $(OBJS)\corelib_treectlg.o \ - $(OBJS)\corelib_treebkg.o \ - $(OBJS)\corelib_vlbox.o \ - $(OBJS)\corelib_vscroll.o \ - $(OBJS)\corelib_xmlreshandler.o -endif -endif -ifeq ($(SHARED),1) -____wxcore_namedll_DEP = $(__coredll___depname) -endif -ifeq ($(SHARED),0) -____wxcore_namelib_DEP = $(__corelib___depname) -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_GUI),1) -__advdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll -endif -endif -endif -ifeq ($(WXUNIV),0) -____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\advdll_animatecmn.o \ - $(OBJS)\advdll_bmpcboxcmn.o \ - $(OBJS)\advdll_calctrlcmn.o \ - $(OBJS)\advdll_datavcmn.o \ - $(OBJS)\advdll_gridcmn.o \ - $(OBJS)\advdll_hyperlnkcmn.o \ - $(OBJS)\advdll_odcombocmn.o \ - $(OBJS)\advdll_richtooltipcmn.o \ - $(OBJS)\advdll_aboutdlgg.o \ - $(OBJS)\advdll_bannerwindow.o \ - $(OBJS)\advdll_bmpcboxg.o \ - $(OBJS)\advdll_calctrlg.o \ - $(OBJS)\advdll_commandlinkbuttong.o \ - $(OBJS)\advdll_datavgen.o \ - $(OBJS)\advdll_datectlg.o \ - $(OBJS)\advdll_editlbox.o \ - $(OBJS)\advdll_grid.o \ - $(OBJS)\advdll_gridctrl.o \ - $(OBJS)\advdll_grideditors.o \ - $(OBJS)\advdll_gridsel.o \ - $(OBJS)\advdll_helpext.o \ - $(OBJS)\advdll_hyperlinkg.o \ - $(OBJS)\advdll_laywin.o \ - $(OBJS)\advdll_notifmsgg.o \ - $(OBJS)\advdll_odcombo.o \ - $(OBJS)\advdll_propdlg.o \ - $(OBJS)\advdll_richtooltipg.o \ - $(OBJS)\advdll_sashwin.o \ - $(OBJS)\advdll_splash.o \ - $(OBJS)\advdll_timectrlg.o \ - $(OBJS)\advdll_tipdlg.o \ - $(OBJS)\advdll_treelist.o \ - $(OBJS)\advdll_wizard.o \ - $(OBJS)\advdll_taskbarcmn.o \ - $(OBJS)\advdll_aboutdlg.o \ - $(OBJS)\advdll_notifmsg.o \ - $(OBJS)\advdll_richtooltip.o \ - $(OBJS)\advdll_sound.o \ - $(OBJS)\advdll_taskbar.o \ - $(OBJS)\advdll_joystick.o \ - $(OBJS)\advdll_animateg.o \ - $(OBJS)\advdll_bmpcbox.o \ - $(OBJS)\advdll_calctrl.o \ - $(OBJS)\advdll_commandlinkbutton.o \ - $(OBJS)\advdll_datecontrols.o \ - $(OBJS)\advdll_datectrl.o \ - $(OBJS)\advdll_datetimectrl.o \ - $(OBJS)\advdll_hyperlink.o \ - $(OBJS)\advdll_timectrl.o -endif -ifeq ($(WXUNIV),1) -____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\advdll_animatecmn.o \ - $(OBJS)\advdll_bmpcboxcmn.o \ - $(OBJS)\advdll_calctrlcmn.o \ - $(OBJS)\advdll_datavcmn.o \ - $(OBJS)\advdll_gridcmn.o \ - $(OBJS)\advdll_hyperlnkcmn.o \ - $(OBJS)\advdll_odcombocmn.o \ - $(OBJS)\advdll_richtooltipcmn.o \ - $(OBJS)\advdll_aboutdlgg.o \ - $(OBJS)\advdll_bannerwindow.o \ - $(OBJS)\advdll_bmpcboxg.o \ - $(OBJS)\advdll_calctrlg.o \ - $(OBJS)\advdll_commandlinkbuttong.o \ - $(OBJS)\advdll_datavgen.o \ - $(OBJS)\advdll_datectlg.o \ - $(OBJS)\advdll_editlbox.o \ - $(OBJS)\advdll_grid.o \ - $(OBJS)\advdll_gridctrl.o \ - $(OBJS)\advdll_grideditors.o \ - $(OBJS)\advdll_gridsel.o \ - $(OBJS)\advdll_helpext.o \ - $(OBJS)\advdll_hyperlinkg.o \ - $(OBJS)\advdll_laywin.o \ - $(OBJS)\advdll_notifmsgg.o \ - $(OBJS)\advdll_odcombo.o \ - $(OBJS)\advdll_propdlg.o \ - $(OBJS)\advdll_richtooltipg.o \ - $(OBJS)\advdll_sashwin.o \ - $(OBJS)\advdll_splash.o \ - $(OBJS)\advdll_timectrlg.o \ - $(OBJS)\advdll_tipdlg.o \ - $(OBJS)\advdll_treelist.o \ - $(OBJS)\advdll_wizard.o \ - $(OBJS)\advdll_taskbarcmn.o \ - $(OBJS)\advdll_aboutdlg.o \ - $(OBJS)\advdll_notifmsg.o \ - $(OBJS)\advdll_richtooltip.o \ - $(OBJS)\advdll_sound.o \ - $(OBJS)\advdll_taskbar.o \ - $(OBJS)\advdll_joystick.o \ - $(OBJS)\advdll_animateg.o -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_GUI),1) -__advlib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a -endif -endif -endif -ifeq ($(WXUNIV),0) -____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\advlib_animatecmn.o \ - $(OBJS)\advlib_bmpcboxcmn.o \ - $(OBJS)\advlib_calctrlcmn.o \ - $(OBJS)\advlib_datavcmn.o \ - $(OBJS)\advlib_gridcmn.o \ - $(OBJS)\advlib_hyperlnkcmn.o \ - $(OBJS)\advlib_odcombocmn.o \ - $(OBJS)\advlib_richtooltipcmn.o \ - $(OBJS)\advlib_aboutdlgg.o \ - $(OBJS)\advlib_bannerwindow.o \ - $(OBJS)\advlib_bmpcboxg.o \ - $(OBJS)\advlib_calctrlg.o \ - $(OBJS)\advlib_commandlinkbuttong.o \ - $(OBJS)\advlib_datavgen.o \ - $(OBJS)\advlib_datectlg.o \ - $(OBJS)\advlib_editlbox.o \ - $(OBJS)\advlib_grid.o \ - $(OBJS)\advlib_gridctrl.o \ - $(OBJS)\advlib_grideditors.o \ - $(OBJS)\advlib_gridsel.o \ - $(OBJS)\advlib_helpext.o \ - $(OBJS)\advlib_hyperlinkg.o \ - $(OBJS)\advlib_laywin.o \ - $(OBJS)\advlib_notifmsgg.o \ - $(OBJS)\advlib_odcombo.o \ - $(OBJS)\advlib_propdlg.o \ - $(OBJS)\advlib_richtooltipg.o \ - $(OBJS)\advlib_sashwin.o \ - $(OBJS)\advlib_splash.o \ - $(OBJS)\advlib_timectrlg.o \ - $(OBJS)\advlib_tipdlg.o \ - $(OBJS)\advlib_treelist.o \ - $(OBJS)\advlib_wizard.o \ - $(OBJS)\advlib_taskbarcmn.o \ - $(OBJS)\advlib_aboutdlg.o \ - $(OBJS)\advlib_notifmsg.o \ - $(OBJS)\advlib_richtooltip.o \ - $(OBJS)\advlib_sound.o \ - $(OBJS)\advlib_taskbar.o \ - $(OBJS)\advlib_joystick.o \ - $(OBJS)\advlib_animateg.o \ - $(OBJS)\advlib_bmpcbox.o \ - $(OBJS)\advlib_calctrl.o \ - $(OBJS)\advlib_commandlinkbutton.o \ - $(OBJS)\advlib_datecontrols.o \ - $(OBJS)\advlib_datectrl.o \ - $(OBJS)\advlib_datetimectrl.o \ - $(OBJS)\advlib_hyperlink.o \ - $(OBJS)\advlib_timectrl.o -endif -ifeq ($(WXUNIV),1) -____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\advlib_animatecmn.o \ - $(OBJS)\advlib_bmpcboxcmn.o \ - $(OBJS)\advlib_calctrlcmn.o \ - $(OBJS)\advlib_datavcmn.o \ - $(OBJS)\advlib_gridcmn.o \ - $(OBJS)\advlib_hyperlnkcmn.o \ - $(OBJS)\advlib_odcombocmn.o \ - $(OBJS)\advlib_richtooltipcmn.o \ - $(OBJS)\advlib_aboutdlgg.o \ - $(OBJS)\advlib_bannerwindow.o \ - $(OBJS)\advlib_bmpcboxg.o \ - $(OBJS)\advlib_calctrlg.o \ - $(OBJS)\advlib_commandlinkbuttong.o \ - $(OBJS)\advlib_datavgen.o \ - $(OBJS)\advlib_datectlg.o \ - $(OBJS)\advlib_editlbox.o \ - $(OBJS)\advlib_grid.o \ - $(OBJS)\advlib_gridctrl.o \ - $(OBJS)\advlib_grideditors.o \ - $(OBJS)\advlib_gridsel.o \ - $(OBJS)\advlib_helpext.o \ - $(OBJS)\advlib_hyperlinkg.o \ - $(OBJS)\advlib_laywin.o \ - $(OBJS)\advlib_notifmsgg.o \ - $(OBJS)\advlib_odcombo.o \ - $(OBJS)\advlib_propdlg.o \ - $(OBJS)\advlib_richtooltipg.o \ - $(OBJS)\advlib_sashwin.o \ - $(OBJS)\advlib_splash.o \ - $(OBJS)\advlib_timectrlg.o \ - $(OBJS)\advlib_tipdlg.o \ - $(OBJS)\advlib_treelist.o \ - $(OBJS)\advlib_wizard.o \ - $(OBJS)\advlib_taskbarcmn.o \ - $(OBJS)\advlib_aboutdlg.o \ - $(OBJS)\advlib_notifmsg.o \ - $(OBJS)\advlib_richtooltip.o \ - $(OBJS)\advlib_sound.o \ - $(OBJS)\advlib_taskbar.o \ - $(OBJS)\advlib_joystick.o \ - $(OBJS)\advlib_animateg.o -endif -ifeq ($(SHARED),1) -____wxadv_namedll_DEP = $(__advdll___depname) -endif -ifeq ($(SHARED),0) -____wxadv_namelib_DEP = $(__advlib___depname) -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_GUI),1) -ifeq ($(USE_MEDIA),1) -__mediadll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll -endif -endif -endif -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_GUI),1) -ifeq ($(USE_MEDIA),1) -__medialib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a -endif -endif -endif -endif -ifeq ($(SHARED),1) -____wxmedia_namedll_DEP = $(__mediadll___depname) -endif -ifeq ($(SHARED),0) -____wxmedia_namelib_DEP = $(__medialib___depname) -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_GUI),1) -ifeq ($(USE_HTML),1) -__htmldll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll -endif -endif -endif -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_GUI),1) -ifeq ($(USE_HTML),1) -__htmllib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a -endif -endif -endif -endif -ifeq ($(SHARED),1) -____wxhtml_namedll_DEP = $(__htmldll___depname) -endif -ifeq ($(SHARED),0) -____wxhtml_namelib_DEP = $(__htmllib___depname) -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_GUI),1) -ifeq ($(USE_WEBVIEW),1) -__webviewdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll -endif -endif -endif -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_GUI),1) -ifeq ($(USE_WEBVIEW),1) -__webviewlib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.a -endif -endif -endif -endif -ifeq ($(SHARED),1) -____wxwebview_namedll_DEP = $(__webviewdll___depname) -endif -ifeq ($(SHARED),0) -____wxwebview_namelib_DEP = $(__webviewlib___depname) -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_GUI),1) -ifeq ($(USE_QA),1) -__qadll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll -endif -endif -endif -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_GUI),1) -ifeq ($(USE_QA),1) -__qalib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a -endif -endif -endif -endif -ifeq ($(SHARED),1) -____wxqa_namedll_DEP = $(__qadll___depname) -endif -ifeq ($(SHARED),0) -____wxqa_namelib_DEP = $(__qalib___depname) -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -__xmldll___depname = \ - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll -endif -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -__xmllib___depname = \ - $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a -endif -endif -ifeq ($(SHARED),1) -____wxxml_namedll_DEP = $(__xmldll___depname) -endif -ifeq ($(SHARED),0) -____wxxml_namelib_DEP = $(__xmllib___depname) -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_XRC),1) -__xrcdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll -endif -endif -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_XRC),1) -__xrclib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a -endif -endif -endif -ifeq ($(SHARED),1) -____wxxrc_namedll_DEP = $(__xrcdll___depname) -endif -ifeq ($(SHARED),0) -____wxxrc_namelib_DEP = $(__xrclib___depname) -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_AUI),1) -__auidll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll -endif -endif -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_AUI),1) -__auilib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a -endif -endif -endif -ifeq ($(SHARED),1) -____wxaui_namedll_DEP = $(__auidll___depname) -endif -ifeq ($(SHARED),0) -____wxaui_namelib_DEP = $(__auilib___depname) -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_RIBBON),1) -__ribbondll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll -endif -endif -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_RIBBON),1) -__ribbonlib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.a -endif -endif -endif -ifeq ($(SHARED),1) -____wxribbon_namedll_DEP = $(__ribbondll___depname) -endif -ifeq ($(SHARED),0) -____wxribbon_namelib_DEP = $(__ribbonlib___depname) -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_PROPGRID),1) -__propgriddll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll -endif -endif -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_PROPGRID),1) -__propgridlib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.a -endif -endif -endif -ifeq ($(SHARED),1) -____wxpropgrid_namedll_DEP = $(__propgriddll___depname) -endif -ifeq ($(SHARED),0) -____wxpropgrid_namelib_DEP = $(__propgridlib___depname) -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_RICHTEXT),1) -__richtextdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll -endif -endif -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_RICHTEXT),1) -__richtextlib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a -endif -endif -endif -ifeq ($(SHARED),1) -____wxrichtext_namedll_DEP = $(__richtextdll___depname) -endif -ifeq ($(SHARED),0) -____wxrichtext_namelib_DEP = $(__richtextlib___depname) -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_STC),1) -__stcdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll -endif -endif -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_STC),1) -__stclib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a -endif -endif -endif -ifeq ($(SHARED),1) -____wxstc_namedll_DEP = $(__stcdll___depname) -endif -ifeq ($(SHARED),0) -____wxstc_namelib_DEP = $(__stclib___depname) -endif -ifeq ($(SHARED),1) -ifeq ($(USE_GUI),1) -ifeq ($(USE_OPENGL),1) -__gldll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll -endif -endif -endif -ifeq ($(MONOLITHIC),0) -__WXLIBGLDEP_CORE_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core -endif -ifeq ($(MONOLITHIC),0) -__WXLIBGLDEP_BASE_p = \ - -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(MONOLITHIC),1) -__WXLIB_MONO_p = \ - -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR) -endif -ifeq ($(SHARED),0) -ifeq ($(USE_GUI),1) -ifeq ($(USE_OPENGL),1) -__gllib___depname = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a -endif -endif -endif -ifeq ($(SHARED),1) -____wxgl_namedll_DEP = $(__gldll___depname) -endif -ifeq ($(SHARED),0) -____wxgl_namelib_DEP = $(__gllib___depname) -endif -ifeq ($(USE_STC),1) -__wxscintilla = $(LIBDIRNAME)\libwxscintilla$(WXDEBUGFLAG).a -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_GUI),1) -ifeq ($(USE_HTML),1) -__htmldll_library_link_DEP = $(__htmldll___depname) -endif -endif -endif -endif -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_GUI),1) -ifeq ($(USE_HTML),1) -__htmldll_library_link_LIBR = \ - $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a -endif -endif -endif -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p_67 = --define __WXUNIVERSAL__ -endif -ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p_66 = --define wxDEBUG_LEVEL=0 -endif -ifeq ($(BUILD),release) -__NDEBUG_DEFINE_p_65 = --define NDEBUG -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p_65 = --define wxNO_EXCEPTIONS -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p_65 = --define wxNO_RTTI -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p_65 = --define wxNO_THREADS -endif -ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p_67 = --define wxUSE_UNICODE=0 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p_67 = --define _UNICODE -endif -ifeq ($(MSLU),1) -__MSLU_DEFINE_p_65 = --define wxUSE_UNICODE_MSLU=1 -endif -ifeq ($(USE_CAIRO),1) -__CAIRO_INCLUDEDIR_p = --include-dir $(CAIRO_ROOT)/include/cairo -endif -ifeq ($(USE_GUI),1) -__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) -endif -ifeq ($(USE_GUI),1) -__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG) -endif -ifeq ($(MSLU),1) -__UNICOWS_LIB_p = -lunicows -endif -ifeq ($(USE_CAIRO),1) -__CAIRO_LIB_p = -lcairo -endif -ifeq ($(USE_CAIRO),1) -____CAIRO_LIBDIR_FILENAMES = -L$(CAIRO_ROOT)\lib -endif -ifeq ($(BUILD),debug) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -g -endif -endif -ifeq ($(BUILD),release) -ifeq ($(DEBUG_INFO),default) -__DEBUGINFO = -endif -endif -ifeq ($(DEBUG_INFO),0) -__DEBUGINFO = -endif -ifeq ($(DEBUG_INFO),1) -__DEBUGINFO = -g -endif -ifeq ($(BUILD),debug) -__OPTIMIZEFLAG = -O0 -endif -ifeq ($(BUILD),release) -__OPTIMIZEFLAG = -O2 -endif -ifeq ($(USE_THREADS),0) -__THREADSFLAG = -endif -ifeq ($(USE_THREADS),1) -__THREADSFLAG = -mthreads -endif -ifeq ($(USE_RTTI),0) -__RTTIFLAG = -fno-rtti -endif -ifeq ($(USE_RTTI),1) -__RTTIFLAG = -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG = -fno-exceptions -endif -ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG = -endif -ifeq ($(WXUNIV),1) -__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -endif -ifeq ($(DEBUG_FLAG),0) -__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0 -endif -ifeq ($(BUILD),release) -__NDEBUG_DEFINE_p = -DNDEBUG -endif -ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS -endif -ifeq ($(USE_RTTI),0) -__RTTI_DEFINE_p = -DwxNO_RTTI -endif -ifeq ($(USE_THREADS),0) -__THREAD_DEFINE_p = -DwxNO_THREADS -endif -ifeq ($(UNICODE),0) -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=0 -endif -ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p = -D_UNICODE -endif -ifeq ($(MSLU),1) -__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 -endif -ifeq ($(USE_CAIRO),1) -____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo -endif -ifeq ($(WXUNIV),0) -__SETUP_H_SUBDIR_FILENAMES = msw -endif -ifeq ($(WXUNIV),1) -__SETUP_H_SUBDIR_FILENAMES = univ -endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: setup_h $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file - -clean: - -if exist $(OBJS)\*.o del $(OBJS)\*.o - -if exist $(OBJS)\*.d del $(OBJS)\*.d - -if exist $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a - -if exist $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a - -if exist $(LIBDIRNAME)\libwxpng$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxpng$(WXDEBUGFLAG).a - -if exist $(LIBDIRNAME)\libwxjpeg$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxjpeg$(WXDEBUGFLAG).a - -if exist $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a - -if exist $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a - -if exist $(LIBDIRNAME)\libwxscintilla$(WXDEBUGFLAG).a del $(LIBDIRNAME)\libwxscintilla$(WXDEBUGFLAG).a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a - -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a - -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a - -if exist $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a del $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a - -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a - $(MAKE) -C ..\..\samples -f makefile.gcc $(MAKEARGS) clean - -setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h - -$(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a: $(WXREGEX_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(WXREGEX_OBJECTS) - ranlib $@ - -$(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a: $(WXZLIB_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(WXZLIB_OBJECTS) - ranlib $@ - -ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\libwxpng$(WXDEBUGFLAG).a: $(WXPNG_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(WXPNG_OBJECTS) - ranlib $@ -endif - -ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\libwxjpeg$(WXDEBUGFLAG).a: $(WXJPEG_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(WXJPEG_OBJECTS) - ranlib $@ -endif - -ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\libwxtiff$(WXDEBUGFLAG).a: $(WXTIFF_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(WXTIFF_OBJECTS) - ranlib $@ -endif - -$(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a: $(WXEXPAT_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(WXEXPAT_OBJECTS) - ranlib $@ - -ifeq ($(USE_STC),1) -$(LIBDIRNAME)\libwxscintilla$(WXDEBUGFLAG).a: $(WXSCINTILLA_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(WXSCINTILLA_OBJECTS) - ranlib $@ -endif - -ifeq ($(MONOLITHIC),1) -ifeq ($(SHARED),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll: $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\monodll_version_rc.o $(__wxscintilla_library_link_DEP) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MONODLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(__wxscintilla) -endif -endif - -ifeq ($(MONOLITHIC),1) -ifeq ($(SHARED),0) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a: $(MONOLIB_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(MONOLIB_OBJECTS) - ranlib $@ -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll: $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\basedll_version_rc.o - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(BASEDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a: $(BASELIB_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(BASELIB_OBJECTS) - ranlib $@ -endif -endif - -ifeq ($(MONOLITHIC),0) -wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP) -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll: $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\netdll_version_rc.o $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(NETDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.a: $(NETLIB_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(NETLIB_OBJECTS) - ranlib $@ -endif -endif - -ifeq ($(MONOLITHIC),0) -wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP) -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll: $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\coredll_version_rc.o $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(COREDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a: $(CORELIB_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(CORELIB_OBJECTS) - ranlib $@ -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(USE_GUI),1) -wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP) -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll: $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\advdll_version_rc.o $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(ADVDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_GUI),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a: $(ADVLIB_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(ADVLIB_OBJECTS) - ranlib $@ -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(USE_GUI),1) -wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP) -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_GUI),1) -ifeq ($(USE_MEDIA),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll: $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\mediadll_version_rc.o $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(MEDIADLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -endif -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_GUI),1) -ifeq ($(USE_MEDIA),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.a: $(MEDIALIB_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(MEDIALIB_OBJECTS) - ranlib $@ -endif -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(USE_GUI),1) -ifeq ($(USE_MEDIA),1) -wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP) -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_GUI),1) -ifeq ($(USE_HTML),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll: $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\htmldll_version_rc.o $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(HTMLDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -endif -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_GUI),1) -ifeq ($(USE_HTML),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.a: $(HTMLLIB_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(HTMLLIB_OBJECTS) - ranlib $@ -endif -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(USE_HTML),1) -wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP) -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_GUI),1) -ifeq ($(USE_WEBVIEW),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll: $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\webviewdll_version_rc.o $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(WEBVIEWDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -endif -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_GUI),1) -ifeq ($(USE_WEBVIEW),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.a: $(WEBVIEWLIB_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(WEBVIEWLIB_OBJECTS) - ranlib $@ -endif -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(USE_WEBVIEW),1) -wxwebview: $(____wxwebview_namedll_DEP) $(____wxwebview_namelib_DEP) -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_GUI),1) -ifeq ($(USE_QA),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll: $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\qadll_version_rc.o $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(QADLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a -endif -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_GUI),1) -ifeq ($(USE_QA),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.a: $(QALIB_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(QALIB_OBJECTS) - ranlib $@ -endif -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(USE_QA),1) -wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP) -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll: $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\xmldll_version_rc.o $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(XMLDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -$(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a: $(XMLLIB_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(XMLLIB_OBJECTS) - ranlib $@ -endif -endif - -ifeq ($(MONOLITHIC),0) -wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP) -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_XRC),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll: $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\xrcdll_version_rc.o $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(XRCDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_XRC),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.a: $(XRCLIB_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(XRCLIB_OBJECTS) - ranlib $@ -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(USE_XRC),1) -wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP) -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_AUI),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll: $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\auidll_version_rc.o $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(AUIDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_AUI),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.a: $(AUILIB_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(AUILIB_OBJECTS) - ranlib $@ -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(USE_AUI),1) -wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP) -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_RIBBON),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll: $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\ribbondll_version_rc.o $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(RIBBONDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_RIBBON),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.a: $(RIBBONLIB_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(RIBBONLIB_OBJECTS) - ranlib $@ -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(USE_RIBBON),1) -wxribbon: $(____wxribbon_namedll_DEP) $(____wxribbon_namelib_DEP) -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_PROPGRID),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll: $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\propgriddll_version_rc.o $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(PROPGRIDDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_PROPGRID),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.a: $(PROPGRIDLIB_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(PROPGRIDLIB_OBJECTS) - ranlib $@ -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(USE_PROPGRID),1) -wxpropgrid: $(____wxpropgrid_namedll_DEP) $(____wxpropgrid_namelib_DEP) -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_RICHTEXT),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll: $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\richtextdll_version_rc.o $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(RICHTEXTDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.a $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_RICHTEXT),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.a: $(RICHTEXTLIB_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(RICHTEXTLIB_OBJECTS) - ranlib $@ -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(USE_RICHTEXT),1) -wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP) -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),1) -ifeq ($(USE_STC),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll: $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(__wxscintilla) $(OBJS)\stcdll_version_rc.o $(__coredll___depname) $(__basedll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(STCDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(LIBDIRNAME)\libwxscintilla$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.a $(LIBDIRNAME)\libwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).a -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(SHARED),0) -ifeq ($(USE_STC),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.a: $(STCLIB_OBJECTS) $(__wxscintilla) - if exist $@ del $@ - ar rcu $@ $(STCLIB_OBJECTS) - ranlib $@ -endif -endif -endif - -ifeq ($(MONOLITHIC),0) -ifeq ($(USE_STC),1) -wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP) -endif -endif - -ifeq ($(SHARED),1) -ifeq ($(USE_GUI),1) -ifeq ($(USE_OPENGL),1) -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll: $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\libwxexpat$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxzlib$(WXDEBUGFLAG).a $(LIBDIRNAME)\libwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).a $(OBJS)\gldll_version_rc.o $(__basedll___depname) $(__coredll___depname) $(__monodll___depname) - $(CXX) $(LINK_DLL_FLAGS) -fPIC -o $@ $(GLDLL_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib=$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) -lopengl32 -lglu32 -endif -endif -endif - -ifeq ($(SHARED),0) -ifeq ($(USE_GUI),1) -ifeq ($(USE_OPENGL),1) -$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.a: $(GLLIB_OBJECTS) - if exist $@ del $@ - ar rcu $@ $(GLLIB_OBJECTS) - ranlib $@ -endif -endif -endif - -ifeq ($(USE_GUI),1) -ifeq ($(USE_OPENGL),1) -wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP) -endif -endif - -samples: - $(MAKE) -C ..\..\samples -f makefile.gcc $(MAKEARGS) all - -$(LIBDIRNAME): - if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME) - -$(SETUPHDIR): $(LIBDIRNAME) - if not exist $(SETUPHDIR) mkdir $(SETUPHDIR) - -$(SETUPHDIR)\wx: $(SETUPHDIR) - if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx - -..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h: - if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h - -$(SETUPHDIR)\wx\setup.h: - if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h - -$(SETUPHDIR)\wx\msw: $(SETUPHDIR)\wx - if not exist $(SETUPHDIR)\wx\msw mkdir $(SETUPHDIR)\wx\msw - -$(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs.h - $(CPP) "..\..\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h" - -build_cfg_file: $(SETUPHDIR) - @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) - @echo WXVER_MINOR=0 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE) - @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) - @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) - @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) - @echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE) - @echo TOOLKIT=MSW >>$(BUILD_CFG_FILE) - @echo TOOLKIT_VERSION=$(TOOLKIT_VERSION) >>$(BUILD_CFG_FILE) - @echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE) - @echo CFG=$(CFG) >>$(BUILD_CFG_FILE) - @echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE) - @echo OFFICIAL_BUILD=$(OFFICIAL_BUILD) >>$(BUILD_CFG_FILE) - @echo DEBUG_FLAG=$(DEBUG_FLAG) >>$(BUILD_CFG_FILE) - @echo DEBUG_INFO=$(DEBUG_INFO) >>$(BUILD_CFG_FILE) - @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE) - @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE) - @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE) - @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE) - @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE) - @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE) - @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE) - @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE) - @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE) - @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE) - @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE) - @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE) - @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE) - @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE) - @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE) - @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE) - @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE) - @echo COMPILER=gcc >>$(BUILD_CFG_FILE) - @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE) - @echo CC=$(CC) >>$(BUILD_CFG_FILE) - @echo CXX=$(CXX) >>$(BUILD_CFG_FILE) - @echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE) - @echo CPPFLAGS=$(CPPFLAGS) >>$(BUILD_CFG_FILE) - @echo CXXFLAGS=$(CXXFLAGS) >>$(BUILD_CFG_FILE) - @echo LDFLAGS=$(LDFLAGS) >>$(BUILD_CFG_FILE) - -$(OBJS)\wxregex_regcomp.o: ../../src/regex/regcomp.c - $(CC) -c -o $@ $(WXREGEX_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxregex_regexec.o: ../../src/regex/regexec.c - $(CC) -c -o $@ $(WXREGEX_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxregex_regerror.o: ../../src/regex/regerror.c - $(CC) -c -o $@ $(WXREGEX_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxregex_regfree.o: ../../src/regex/regfree.c - $(CC) -c -o $@ $(WXREGEX_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxzlib_adler32.o: ../../src/zlib/adler32.c - $(CC) -c -o $@ $(WXZLIB_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxzlib_compress.o: ../../src/zlib/compress.c - $(CC) -c -o $@ $(WXZLIB_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxzlib_crc32.o: ../../src/zlib/crc32.c - $(CC) -c -o $@ $(WXZLIB_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxzlib_deflate.o: ../../src/zlib/deflate.c - $(CC) -c -o $@ $(WXZLIB_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxzlib_gzclose.o: ../../src/zlib/gzclose.c - $(CC) -c -o $@ $(WXZLIB_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxzlib_gzlib.o: ../../src/zlib/gzlib.c - $(CC) -c -o $@ $(WXZLIB_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxzlib_gzread.o: ../../src/zlib/gzread.c - $(CC) -c -o $@ $(WXZLIB_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxzlib_gzwrite.o: ../../src/zlib/gzwrite.c - $(CC) -c -o $@ $(WXZLIB_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxzlib_infback.o: ../../src/zlib/infback.c - $(CC) -c -o $@ $(WXZLIB_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxzlib_inffast.o: ../../src/zlib/inffast.c - $(CC) -c -o $@ $(WXZLIB_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxzlib_inflate.o: ../../src/zlib/inflate.c - $(CC) -c -o $@ $(WXZLIB_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxzlib_inftrees.o: ../../src/zlib/inftrees.c - $(CC) -c -o $@ $(WXZLIB_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxzlib_trees.o: ../../src/zlib/trees.c - $(CC) -c -o $@ $(WXZLIB_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxzlib_uncompr.o: ../../src/zlib/uncompr.c - $(CC) -c -o $@ $(WXZLIB_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxzlib_zutil.o: ../../src/zlib/zutil.c - $(CC) -c -o $@ $(WXZLIB_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxpng_png.o: ../../src/png/png.c - $(CC) -c -o $@ $(WXPNG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxpng_pngerror.o: ../../src/png/pngerror.c - $(CC) -c -o $@ $(WXPNG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxpng_pngget.o: ../../src/png/pngget.c - $(CC) -c -o $@ $(WXPNG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxpng_pngmem.o: ../../src/png/pngmem.c - $(CC) -c -o $@ $(WXPNG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxpng_pngpread.o: ../../src/png/pngpread.c - $(CC) -c -o $@ $(WXPNG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxpng_pngread.o: ../../src/png/pngread.c - $(CC) -c -o $@ $(WXPNG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxpng_pngrio.o: ../../src/png/pngrio.c - $(CC) -c -o $@ $(WXPNG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxpng_pngrtran.o: ../../src/png/pngrtran.c - $(CC) -c -o $@ $(WXPNG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxpng_pngrutil.o: ../../src/png/pngrutil.c - $(CC) -c -o $@ $(WXPNG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxpng_pngset.o: ../../src/png/pngset.c - $(CC) -c -o $@ $(WXPNG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxpng_pngtrans.o: ../../src/png/pngtrans.c - $(CC) -c -o $@ $(WXPNG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxpng_pngwio.o: ../../src/png/pngwio.c - $(CC) -c -o $@ $(WXPNG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxpng_pngwrite.o: ../../src/png/pngwrite.c - $(CC) -c -o $@ $(WXPNG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxpng_pngwtran.o: ../../src/png/pngwtran.c - $(CC) -c -o $@ $(WXPNG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxpng_pngwutil.o: ../../src/png/pngwutil.c - $(CC) -c -o $@ $(WXPNG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jcomapi.o: ../../src/jpeg/jcomapi.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jutils.o: ../../src/jpeg/jutils.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jerror.o: ../../src/jpeg/jerror.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jmemmgr.o: ../../src/jpeg/jmemmgr.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jmemnobs.o: ../../src/jpeg/jmemnobs.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jcapimin.o: ../../src/jpeg/jcapimin.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jcapistd.o: ../../src/jpeg/jcapistd.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jctrans.o: ../../src/jpeg/jctrans.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jcparam.o: ../../src/jpeg/jcparam.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jdatadst.o: ../../src/jpeg/jdatadst.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jcinit.o: ../../src/jpeg/jcinit.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jcmaster.o: ../../src/jpeg/jcmaster.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jcmarker.o: ../../src/jpeg/jcmarker.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jcmainct.o: ../../src/jpeg/jcmainct.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jcprepct.o: ../../src/jpeg/jcprepct.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jccoefct.o: ../../src/jpeg/jccoefct.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jccolor.o: ../../src/jpeg/jccolor.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jcsample.o: ../../src/jpeg/jcsample.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jchuff.o: ../../src/jpeg/jchuff.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jcphuff.o: ../../src/jpeg/jcphuff.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jcdctmgr.o: ../../src/jpeg/jcdctmgr.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jfdctfst.o: ../../src/jpeg/jfdctfst.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jfdctflt.o: ../../src/jpeg/jfdctflt.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jfdctint.o: ../../src/jpeg/jfdctint.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jdapimin.o: ../../src/jpeg/jdapimin.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jdapistd.o: ../../src/jpeg/jdapistd.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jdtrans.o: ../../src/jpeg/jdtrans.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jdatasrc.o: ../../src/jpeg/jdatasrc.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jdmaster.o: ../../src/jpeg/jdmaster.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jdinput.o: ../../src/jpeg/jdinput.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jdmarker.o: ../../src/jpeg/jdmarker.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jdhuff.o: ../../src/jpeg/jdhuff.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jdphuff.o: ../../src/jpeg/jdphuff.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jdmainct.o: ../../src/jpeg/jdmainct.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jdcoefct.o: ../../src/jpeg/jdcoefct.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jdpostct.o: ../../src/jpeg/jdpostct.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jddctmgr.o: ../../src/jpeg/jddctmgr.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jidctfst.o: ../../src/jpeg/jidctfst.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jidctflt.o: ../../src/jpeg/jidctflt.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jidctint.o: ../../src/jpeg/jidctint.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jidctred.o: ../../src/jpeg/jidctred.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jdsample.o: ../../src/jpeg/jdsample.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jdcolor.o: ../../src/jpeg/jdcolor.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jquant1.o: ../../src/jpeg/jquant1.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jquant2.o: ../../src/jpeg/jquant2.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxjpeg_jdmerge.o: ../../src/jpeg/jdmerge.c - $(CC) -c -o $@ $(WXJPEG_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_win32.o: ../../src/tiff/libtiff/tif_win32.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_aux.o: ../../src/tiff/libtiff/tif_aux.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_close.o: ../../src/tiff/libtiff/tif_close.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_codec.o: ../../src/tiff/libtiff/tif_codec.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_color.o: ../../src/tiff/libtiff/tif_color.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_compress.o: ../../src/tiff/libtiff/tif_compress.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_dir.o: ../../src/tiff/libtiff/tif_dir.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_dirinfo.o: ../../src/tiff/libtiff/tif_dirinfo.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_dirread.o: ../../src/tiff/libtiff/tif_dirread.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_dirwrite.o: ../../src/tiff/libtiff/tif_dirwrite.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_dumpmode.o: ../../src/tiff/libtiff/tif_dumpmode.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_error.o: ../../src/tiff/libtiff/tif_error.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_extension.o: ../../src/tiff/libtiff/tif_extension.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_fax3.o: ../../src/tiff/libtiff/tif_fax3.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_fax3sm.o: ../../src/tiff/libtiff/tif_fax3sm.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_flush.o: ../../src/tiff/libtiff/tif_flush.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_getimage.o: ../../src/tiff/libtiff/tif_getimage.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_jbig.o: ../../src/tiff/libtiff/tif_jbig.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_jpeg.o: ../../src/tiff/libtiff/tif_jpeg.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_jpeg_12.o: ../../src/tiff/libtiff/tif_jpeg_12.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_luv.o: ../../src/tiff/libtiff/tif_luv.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_lzma.o: ../../src/tiff/libtiff/tif_lzma.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_lzw.o: ../../src/tiff/libtiff/tif_lzw.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_next.o: ../../src/tiff/libtiff/tif_next.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_ojpeg.o: ../../src/tiff/libtiff/tif_ojpeg.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_open.o: ../../src/tiff/libtiff/tif_open.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_packbits.o: ../../src/tiff/libtiff/tif_packbits.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_pixarlog.o: ../../src/tiff/libtiff/tif_pixarlog.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_predict.o: ../../src/tiff/libtiff/tif_predict.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_print.o: ../../src/tiff/libtiff/tif_print.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_read.o: ../../src/tiff/libtiff/tif_read.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_strip.o: ../../src/tiff/libtiff/tif_strip.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_swab.o: ../../src/tiff/libtiff/tif_swab.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_thunder.o: ../../src/tiff/libtiff/tif_thunder.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_tile.o: ../../src/tiff/libtiff/tif_tile.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_version.o: ../../src/tiff/libtiff/tif_version.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_warning.o: ../../src/tiff/libtiff/tif_warning.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_write.o: ../../src/tiff/libtiff/tif_write.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxtiff_tif_zip.o: ../../src/tiff/libtiff/tif_zip.c - $(CC) -c -o $@ $(WXTIFF_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxexpat_xmlparse.o: ../../src/expat/lib/xmlparse.c - $(CC) -c -o $@ $(WXEXPAT_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxexpat_xmlrole.o: ../../src/expat/lib/xmlrole.c - $(CC) -c -o $@ $(WXEXPAT_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxexpat_xmltok.o: ../../src/expat/lib/xmltok.c - $(CC) -c -o $@ $(WXEXPAT_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexA68k.o: ../../src/stc/scintilla/lexers/LexA68k.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexAbaqus.o: ../../src/stc/scintilla/lexers/LexAbaqus.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexAda.o: ../../src/stc/scintilla/lexers/LexAda.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexAPDL.o: ../../src/stc/scintilla/lexers/LexAPDL.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexAsm.o: ../../src/stc/scintilla/lexers/LexAsm.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexAsn1.o: ../../src/stc/scintilla/lexers/LexAsn1.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexASY.o: ../../src/stc/scintilla/lexers/LexASY.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexAU3.o: ../../src/stc/scintilla/lexers/LexAU3.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexAVE.o: ../../src/stc/scintilla/lexers/LexAVE.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexAVS.o: ../../src/stc/scintilla/lexers/LexAVS.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexBaan.o: ../../src/stc/scintilla/lexers/LexBaan.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexBash.o: ../../src/stc/scintilla/lexers/LexBash.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexBasic.o: ../../src/stc/scintilla/lexers/LexBasic.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexBullant.o: ../../src/stc/scintilla/lexers/LexBullant.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexCaml.o: ../../src/stc/scintilla/lexers/LexCaml.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexCLW.o: ../../src/stc/scintilla/lexers/LexCLW.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexCmake.o: ../../src/stc/scintilla/lexers/LexCmake.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexCOBOL.o: ../../src/stc/scintilla/lexers/LexCOBOL.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexCoffeeScript.o: ../../src/stc/scintilla/lexers/LexCoffeeScript.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexConf.o: ../../src/stc/scintilla/lexers/LexConf.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexCPP.o: ../../src/stc/scintilla/lexers/LexCPP.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexCrontab.o: ../../src/stc/scintilla/lexers/LexCrontab.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexCsound.o: ../../src/stc/scintilla/lexers/LexCsound.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexCSS.o: ../../src/stc/scintilla/lexers/LexCSS.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexD.o: ../../src/stc/scintilla/lexers/LexD.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexECL.o: ../../src/stc/scintilla/lexers/LexECL.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexEiffel.o: ../../src/stc/scintilla/lexers/LexEiffel.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexErlang.o: ../../src/stc/scintilla/lexers/LexErlang.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexEScript.o: ../../src/stc/scintilla/lexers/LexEScript.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexFlagship.o: ../../src/stc/scintilla/lexers/LexFlagship.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexForth.o: ../../src/stc/scintilla/lexers/LexForth.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexFortran.o: ../../src/stc/scintilla/lexers/LexFortran.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexGAP.o: ../../src/stc/scintilla/lexers/LexGAP.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexGui4Cli.o: ../../src/stc/scintilla/lexers/LexGui4Cli.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexHaskell.o: ../../src/stc/scintilla/lexers/LexHaskell.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexHTML.o: ../../src/stc/scintilla/lexers/LexHTML.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexInno.o: ../../src/stc/scintilla/lexers/LexInno.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexKix.o: ../../src/stc/scintilla/lexers/LexKix.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexLisp.o: ../../src/stc/scintilla/lexers/LexLisp.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexLout.o: ../../src/stc/scintilla/lexers/LexLout.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexLua.o: ../../src/stc/scintilla/lexers/LexLua.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexMagik.o: ../../src/stc/scintilla/lexers/LexMagik.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexMarkdown.o: ../../src/stc/scintilla/lexers/LexMarkdown.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexMatlab.o: ../../src/stc/scintilla/lexers/LexMatlab.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexMetapost.o: ../../src/stc/scintilla/lexers/LexMetapost.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexMMIXAL.o: ../../src/stc/scintilla/lexers/LexMMIXAL.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexModula.o: ../../src/stc/scintilla/lexers/LexModula.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexMPT.o: ../../src/stc/scintilla/lexers/LexMPT.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexMSSQL.o: ../../src/stc/scintilla/lexers/LexMSSQL.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexMySQL.o: ../../src/stc/scintilla/lexers/LexMySQL.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexNimrod.o: ../../src/stc/scintilla/lexers/LexNimrod.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexNsis.o: ../../src/stc/scintilla/lexers/LexNsis.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexOpal.o: ../../src/stc/scintilla/lexers/LexOpal.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexOScript.o: ../../src/stc/scintilla/lexers/LexOScript.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexOthers.o: ../../src/stc/scintilla/lexers/LexOthers.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexPascal.o: ../../src/stc/scintilla/lexers/LexPascal.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexPB.o: ../../src/stc/scintilla/lexers/LexPB.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexPerl.o: ../../src/stc/scintilla/lexers/LexPerl.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexPLM.o: ../../src/stc/scintilla/lexers/LexPLM.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexPOV.o: ../../src/stc/scintilla/lexers/LexPOV.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexPowerPro.o: ../../src/stc/scintilla/lexers/LexPowerPro.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexPowerShell.o: ../../src/stc/scintilla/lexers/LexPowerShell.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexProgress.o: ../../src/stc/scintilla/lexers/LexProgress.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexPS.o: ../../src/stc/scintilla/lexers/LexPS.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexPython.o: ../../src/stc/scintilla/lexers/LexPython.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexR.o: ../../src/stc/scintilla/lexers/LexR.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexRebol.o: ../../src/stc/scintilla/lexers/LexRebol.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexRuby.o: ../../src/stc/scintilla/lexers/LexRuby.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexScriptol.o: ../../src/stc/scintilla/lexers/LexScriptol.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexSmalltalk.o: ../../src/stc/scintilla/lexers/LexSmalltalk.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexSML.o: ../../src/stc/scintilla/lexers/LexSML.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexSorcus.o: ../../src/stc/scintilla/lexers/LexSorcus.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexSpecman.o: ../../src/stc/scintilla/lexers/LexSpecman.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexSpice.o: ../../src/stc/scintilla/lexers/LexSpice.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexSQL.o: ../../src/stc/scintilla/lexers/LexSQL.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexTACL.o: ../../src/stc/scintilla/lexers/LexTACL.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexTADS3.o: ../../src/stc/scintilla/lexers/LexTADS3.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexTAL.o: ../../src/stc/scintilla/lexers/LexTAL.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexTCL.o: ../../src/stc/scintilla/lexers/LexTCL.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexTCMD.o: ../../src/stc/scintilla/lexers/LexTCMD.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexTeX.o: ../../src/stc/scintilla/lexers/LexTeX.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexTxt2tags.o: ../../src/stc/scintilla/lexers/LexTxt2tags.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexVB.o: ../../src/stc/scintilla/lexers/LexVB.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexVerilog.o: ../../src/stc/scintilla/lexers/LexVerilog.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexVHDL.o: ../../src/stc/scintilla/lexers/LexVHDL.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexVisualProlog.o: ../../src/stc/scintilla/lexers/LexVisualProlog.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexYAML.o: ../../src/stc/scintilla/lexers/LexYAML.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_Accessor.o: ../../src/stc/scintilla/lexlib/Accessor.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_CharacterSet.o: ../../src/stc/scintilla/lexlib/CharacterSet.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexerBase.o: ../../src/stc/scintilla/lexlib/LexerBase.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexerModule.o: ../../src/stc/scintilla/lexlib/LexerModule.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexerNoExceptions.o: ../../src/stc/scintilla/lexlib/LexerNoExceptions.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LexerSimple.o: ../../src/stc/scintilla/lexlib/LexerSimple.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_PropSetSimple.o: ../../src/stc/scintilla/lexlib/PropSetSimple.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_StyleContext.o: ../../src/stc/scintilla/lexlib/StyleContext.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_WordList.o: ../../src/stc/scintilla/lexlib/WordList.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_AutoComplete.o: ../../src/stc/scintilla/src/AutoComplete.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_CallTip.o: ../../src/stc/scintilla/src/CallTip.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_Catalogue.o: ../../src/stc/scintilla/src/Catalogue.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_CellBuffer.o: ../../src/stc/scintilla/src/CellBuffer.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_CharClassify.o: ../../src/stc/scintilla/src/CharClassify.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_ContractionState.o: ../../src/stc/scintilla/src/ContractionState.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_Decoration.o: ../../src/stc/scintilla/src/Decoration.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_Document.o: ../../src/stc/scintilla/src/Document.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_Editor.o: ../../src/stc/scintilla/src/Editor.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_ExternalLexer.o: ../../src/stc/scintilla/src/ExternalLexer.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_Indicator.o: ../../src/stc/scintilla/src/Indicator.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_KeyMap.o: ../../src/stc/scintilla/src/KeyMap.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_LineMarker.o: ../../src/stc/scintilla/src/LineMarker.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_PerLine.o: ../../src/stc/scintilla/src/PerLine.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_PositionCache.o: ../../src/stc/scintilla/src/PositionCache.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_RESearch.o: ../../src/stc/scintilla/src/RESearch.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_RunStyles.o: ../../src/stc/scintilla/src/RunStyles.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_ScintillaBase.o: ../../src/stc/scintilla/src/ScintillaBase.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_Selection.o: ../../src/stc/scintilla/src/Selection.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_Style.o: ../../src/stc/scintilla/src/Style.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_UniConversion.o: ../../src/stc/scintilla/src/UniConversion.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_ViewStyle.o: ../../src/stc/scintilla/src/ViewStyle.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\wxscintilla_XPM.o: ../../src/stc/scintilla/src/XPM.cxx - $(CXX) -c -o $@ $(WXSCINTILLA_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_any.o: ../../src/common/any.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_appbase.o: ../../src/common/appbase.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_arcall.o: ../../src/common/arcall.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_arcfind.o: ../../src/common/arcfind.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_archive.o: ../../src/common/archive.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_arrstr.o: ../../src/common/arrstr.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_base64.o: ../../src/common/base64.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_clntdata.o: ../../src/common/clntdata.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_cmdline.o: ../../src/common/cmdline.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_config.o: ../../src/common/config.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_convauto.o: ../../src/common/convauto.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_datetime.o: ../../src/common/datetime.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_datetimefmt.o: ../../src/common/datetimefmt.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_datstrm.o: ../../src/common/datstrm.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_dircmn.o: ../../src/common/dircmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_dynarray.o: ../../src/common/dynarray.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_dynlib.o: ../../src/common/dynlib.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_dynload.o: ../../src/common/dynload.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_encconv.o: ../../src/common/encconv.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_evtloopcmn.o: ../../src/common/evtloopcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_extended.o: ../../src/common/extended.c - $(CC) -c -o $@ $(MONODLL_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_ffile.o: ../../src/common/ffile.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_file.o: ../../src/common/file.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_fileback.o: ../../src/common/fileback.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_fileconf.o: ../../src/common/fileconf.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_filefn.o: ../../src/common/filefn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_filename.o: ../../src/common/filename.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_filesys.o: ../../src/common/filesys.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_filtall.o: ../../src/common/filtall.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_filtfind.o: ../../src/common/filtfind.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_fmapbase.o: ../../src/common/fmapbase.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_fs_arc.o: ../../src/common/fs_arc.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_fs_filter.o: ../../src/common/fs_filter.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_hash.o: ../../src/common/hash.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_hashmap.o: ../../src/common/hashmap.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_init.o: ../../src/common/init.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_intl.o: ../../src/common/intl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_ipcbase.o: ../../src/common/ipcbase.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_languageinfo.o: ../../src/common/languageinfo.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_list.o: ../../src/common/list.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_log.o: ../../src/common/log.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_longlong.o: ../../src/common/longlong.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_memory.o: ../../src/common/memory.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_mimecmn.o: ../../src/common/mimecmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_module.o: ../../src/common/module.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_mstream.o: ../../src/common/mstream.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_numformatter.o: ../../src/common/numformatter.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_object.o: ../../src/common/object.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_platinfo.o: ../../src/common/platinfo.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_powercmn.o: ../../src/common/powercmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_process.o: ../../src/common/process.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_regex.o: ../../src/common/regex.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_stdpbase.o: ../../src/common/stdpbase.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_sstream.o: ../../src/common/sstream.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_stdstream.o: ../../src/common/stdstream.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_stopwatch.o: ../../src/common/stopwatch.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_strconv.o: ../../src/common/strconv.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_stream.o: ../../src/common/stream.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_string.o: ../../src/common/string.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_stringimpl.o: ../../src/common/stringimpl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_stringops.o: ../../src/common/stringops.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_strvararg.o: ../../src/common/strvararg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_sysopt.o: ../../src/common/sysopt.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_tarstrm.o: ../../src/common/tarstrm.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_textbuf.o: ../../src/common/textbuf.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_textfile.o: ../../src/common/textfile.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_threadinfo.o: ../../src/common/threadinfo.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_time.o: ../../src/common/time.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_timercmn.o: ../../src/common/timercmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_timerimpl.o: ../../src/common/timerimpl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_tokenzr.o: ../../src/common/tokenzr.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_translation.o: ../../src/common/translation.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_txtstrm.o: ../../src/common/txtstrm.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_unichar.o: ../../src/common/unichar.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_uri.o: ../../src/common/uri.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_ustring.o: ../../src/common/ustring.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_variant.o: ../../src/common/variant.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_wfstream.o: ../../src/common/wfstream.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_wxcrt.o: ../../src/common/wxcrt.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_wxprintf.o: ../../src/common/wxprintf.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xlocale.o: ../../src/common/xlocale.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xti.o: ../../src/common/xti.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xtistrm.o: ../../src/common/xtistrm.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_zipstrm.o: ../../src/common/zipstrm.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_zstream.o: ../../src/common/zstream.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_fswatchercmn.o: ../../src/common/fswatchercmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_fswatcherg.o: ../../src/generic/fswatcherg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_basemsw.o: ../../src/msw/basemsw.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_crashrpt.o: ../../src/msw/crashrpt.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_debughlp.o: ../../src/msw/debughlp.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_dde.o: ../../src/msw/dde.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_dir.o: ../../src/msw/dir.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_dlmsw.o: ../../src/msw/dlmsw.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_evtloopconsole.o: ../../src/msw/evtloopconsole.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_mimetype.o: ../../src/msw/mimetype.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_power.o: ../../src/msw/power.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_regconf.o: ../../src/msw/regconf.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_registry.o: ../../src/msw/registry.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_snglinst.o: ../../src/msw/snglinst.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_stackwalk.o: ../../src/msw/stackwalk.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_stdpaths.o: ../../src/msw/stdpaths.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_thread.o: ../../src/msw/thread.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_timer.o: ../../src/msw/timer.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_utils.o: ../../src/msw/utils.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_utilsexc.o: ../../src/msw/utilsexc.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_fswatcher.o: ../../src/msw/fswatcher.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_event.o: ../../src/common/event.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_fs_mem.o: ../../src/common/fs_mem.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msgout.o: ../../src/common/msgout.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_utilscmn.o: ../../src/common/utilscmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_main.o: ../../src/msw/main.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_mslu.o: ../../src/msw/mslu.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_volume.o: ../../src/msw/volume.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_fs_inet.o: ../../src/common/fs_inet.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_ftp.o: ../../src/common/ftp.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_http.o: ../../src/common/http.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_protocol.o: ../../src/common/protocol.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_sckaddr.o: ../../src/common/sckaddr.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_sckfile.o: ../../src/common/sckfile.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_sckipc.o: ../../src/common/sckipc.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_sckstrm.o: ../../src/common/sckstrm.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_socket.o: ../../src/common/socket.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_url.o: ../../src/common/url.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_sockmsw.o: ../../src/msw/sockmsw.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_urlmsw.o: ../../src/msw/urlmsw.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_generic_statusbr.o: ../../src/generic/statusbr.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_accel.o: ../../src/msw/accel.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_anybutton.o: ../../src/msw/anybutton.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_artmsw.o: ../../src/msw/artmsw.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_bmpbuttn.o: ../../src/msw/bmpbuttn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_button.o: ../../src/msw/button.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_checkbox.o: ../../src/msw/checkbox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_choice.o: ../../src/msw/choice.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_colordlg.o: ../../src/msw/colordlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_combo.o: ../../src/msw/combo.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_combobox.o: ../../src/msw/combobox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_control.o: ../../src/msw/control.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_dialog.o: ../../src/msw/dialog.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_dirdlg.o: ../../src/msw/dirdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_dragimag.o: ../../src/msw/dragimag.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_filedlg.o: ../../src/msw/filedlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_frame.o: ../../src/msw/frame.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_gauge.o: ../../src/msw/gauge.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_headerctrl.o: ../../src/msw/headerctrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_iniconf.o: ../../src/msw/iniconf.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_listbox.o: ../../src/msw/listbox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_listctrl.o: ../../src/msw/listctrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_mdi.o: ../../src/msw/mdi.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_menu.o: ../../src/msw/menu.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_menuitem.o: ../../src/msw/menuitem.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_metafile.o: ../../src/msw/metafile.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msgdlg.o: ../../src/msw/msgdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_nativdlg.o: ../../src/msw/nativdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_nativewin.o: ../../src/msw/nativewin.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_notebook.o: ../../src/msw/notebook.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_access.o: ../../src/msw/ole/access.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_ownerdrw.o: ../../src/msw/ownerdrw.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_panel.o: ../../src/msw/panel.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_progdlg.o: ../../src/msw/progdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_radiobox.o: ../../src/msw/radiobox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_radiobut.o: ../../src/msw/radiobut.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_richmsgdlg.o: ../../src/msw/richmsgdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_scrolbar.o: ../../src/msw/scrolbar.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_slider.o: ../../src/msw/slider.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_spinbutt.o: ../../src/msw/spinbutt.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_spinctrl.o: ../../src/msw/spinctrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_statbmp.o: ../../src/msw/statbmp.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_statbox.o: ../../src/msw/statbox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_statusbar.o: ../../src/msw/statusbar.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_statline.o: ../../src/msw/statline.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_stattext.o: ../../src/msw/stattext.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_toolbar.o: ../../src/msw/toolbar.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_textctrl.o: ../../src/msw/textctrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_textentry.o: ../../src/msw/textentry.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_tglbtn.o: ../../src/msw/tglbtn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_treectrl.o: ../../src/msw/treectrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_checklst.o: ../../src/msw/checklst.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_msw_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_fontdlg.o: ../../src/msw/fontdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_generic_accel.o: ../../src/generic/accel.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_colrdlgg.o: ../../src/generic/colrdlgg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_dirdlgg.o: ../../src/generic/dirdlgg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_generic_fdrepdlg.o: ../../src/generic/fdrepdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_filedlgg.o: ../../src/generic/filedlgg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_fontdlgg.o: ../../src/generic/fontdlgg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_generic_listctrl.o: ../../src/generic/listctrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_mdig.o: ../../src/generic/mdig.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_bmpbuttn.o: ../../src/univ/bmpbuttn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_button.o: ../../src/univ/button.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_checkbox.o: ../../src/univ/checkbox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_checklst.o: ../../src/univ/checklst.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_choice.o: ../../src/univ/choice.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_combobox.o: ../../src/univ/combobox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_control.o: ../../src/univ/control.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_ctrlrend.o: ../../src/univ/ctrlrend.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_dialog.o: ../../src/univ/dialog.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_framuniv.o: ../../src/univ/framuniv.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_gauge.o: ../../src/univ/gauge.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_inpcons.o: ../../src/univ/inpcons.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_inphand.o: ../../src/univ/inphand.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_listbox.o: ../../src/univ/listbox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_menu.o: ../../src/univ/menu.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_notebook.o: ../../src/univ/notebook.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_radiobox.o: ../../src/univ/radiobox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_radiobut.o: ../../src/univ/radiobut.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_scrarrow.o: ../../src/univ/scrarrow.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_scrolbar.o: ../../src/univ/scrolbar.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_scrthumb.o: ../../src/univ/scrthumb.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_settingsuniv.o: ../../src/univ/settingsuniv.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_slider.o: ../../src/univ/slider.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_spinbutt.o: ../../src/univ/spinbutt.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_statbmp.o: ../../src/univ/statbmp.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_statbox.o: ../../src/univ/statbox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_statline.o: ../../src/univ/statline.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_stattext.o: ../../src/univ/stattext.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_statusbr.o: ../../src/univ/statusbr.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_stdrend.o: ../../src/univ/stdrend.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_textctrl.o: ../../src/univ/textctrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_tglbtn.o: ../../src/univ/tglbtn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_theme.o: ../../src/univ/theme.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_univ_toolbar.o: ../../src/univ/toolbar.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_topluniv.o: ../../src/univ/topluniv.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_winuniv.o: ../../src/univ/winuniv.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_gtk.o: ../../src/univ/themes/gtk.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_metal.o: ../../src/univ/themes/metal.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_mono.o: ../../src/univ/themes/mono.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_win32.o: ../../src/univ/themes/win32.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_bmpcbox.o: ../../src/msw/bmpcbox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_calctrl.o: ../../src/msw/calctrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_datecontrols.o: ../../src/msw/datecontrols.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_datectrl.o: ../../src/msw/datectrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_datetimectrl.o: ../../src/msw/datetimectrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_hyperlink.o: ../../src/msw/hyperlink.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_timectrl.o: ../../src/msw/timectrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_mediactrl_am.o: ../../src/msw/mediactrl_am.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_mediactrl_qt.o: ../../src/msw/mediactrl_qt.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_helpbest.o: ../../src/msw/helpbest.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_helpctrl.o: ../../src/html/helpctrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_helpdata.o: ../../src/html/helpdata.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_helpdlg.o: ../../src/html/helpdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_helpfrm.o: ../../src/html/helpfrm.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_helpwnd.o: ../../src/html/helpwnd.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_htmlcell.o: ../../src/html/htmlcell.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_htmlfilt.o: ../../src/html/htmlfilt.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_htmlpars.o: ../../src/html/htmlpars.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_htmltag.o: ../../src/html/htmltag.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_htmlwin.o: ../../src/html/htmlwin.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_htmprint.o: ../../src/html/htmprint.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_m_dflist.o: ../../src/html/m_dflist.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_m_fonts.o: ../../src/html/m_fonts.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_m_hline.o: ../../src/html/m_hline.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_m_image.o: ../../src/html/m_image.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_m_layout.o: ../../src/html/m_layout.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_m_links.o: ../../src/html/m_links.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_m_list.o: ../../src/html/m_list.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_m_pre.o: ../../src/html/m_pre.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_m_span.o: ../../src/html/m_span.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_m_style.o: ../../src/html/m_style.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_m_tables.o: ../../src/html/m_tables.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_styleparams.o: ../../src/html/styleparams.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_winpars.o: ../../src/html/winpars.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_htmllbox.o: ../../src/generic/htmllbox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_webview_ie.o: ../../src/msw/webview_ie.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_webview.o: ../../src/common/webview.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_webviewarchivehandler.o: ../../src/common/webviewarchivehandler.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_webviewfshandler.o: ../../src/common/webviewfshandler.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_debugrpt.o: ../../src/common/debugrpt.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_dbgrptg.o: ../../src/generic/dbgrptg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_bmp.o: ../../src/xrc/xh_bmp.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_bmpcbox.o: ../../src/xrc/xh_bmpcbox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_bmpbt.o: ../../src/xrc/xh_bmpbt.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_bttn.o: ../../src/xrc/xh_bttn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_cald.o: ../../src/xrc/xh_cald.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_chckb.o: ../../src/xrc/xh_chckb.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_chckl.o: ../../src/xrc/xh_chckl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_choic.o: ../../src/xrc/xh_choic.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_choicbk.o: ../../src/xrc/xh_choicbk.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_clrpicker.o: ../../src/xrc/xh_clrpicker.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_cmdlinkbn.o: ../../src/xrc/xh_cmdlinkbn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_collpane.o: ../../src/xrc/xh_collpane.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_combo.o: ../../src/xrc/xh_combo.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_comboctrl.o: ../../src/xrc/xh_comboctrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_dirpicker.o: ../../src/xrc/xh_dirpicker.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_dlg.o: ../../src/xrc/xh_dlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_editlbox.o: ../../src/xrc/xh_editlbox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_filectrl.o: ../../src/xrc/xh_filectrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_filepicker.o: ../../src/xrc/xh_filepicker.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_fontpicker.o: ../../src/xrc/xh_fontpicker.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_frame.o: ../../src/xrc/xh_frame.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_gauge.o: ../../src/xrc/xh_gauge.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_gdctl.o: ../../src/xrc/xh_gdctl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_grid.o: ../../src/xrc/xh_grid.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_html.o: ../../src/xrc/xh_html.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_hyperlink.o: ../../src/xrc/xh_hyperlink.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_listb.o: ../../src/xrc/xh_listb.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_listbk.o: ../../src/xrc/xh_listbk.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_listc.o: ../../src/xrc/xh_listc.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_mdi.o: ../../src/xrc/xh_mdi.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_menu.o: ../../src/xrc/xh_menu.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_notbk.o: ../../src/xrc/xh_notbk.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_odcombo.o: ../../src/xrc/xh_odcombo.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_panel.o: ../../src/xrc/xh_panel.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_propdlg.o: ../../src/xrc/xh_propdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_radbt.o: ../../src/xrc/xh_radbt.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_radbx.o: ../../src/xrc/xh_radbx.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_scrol.o: ../../src/xrc/xh_scrol.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_scwin.o: ../../src/xrc/xh_scwin.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_sizer.o: ../../src/xrc/xh_sizer.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_slidr.o: ../../src/xrc/xh_slidr.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_spin.o: ../../src/xrc/xh_spin.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_split.o: ../../src/xrc/xh_split.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_srchctrl.o: ../../src/xrc/xh_srchctrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_statbar.o: ../../src/xrc/xh_statbar.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_stbmp.o: ../../src/xrc/xh_stbmp.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_stbox.o: ../../src/xrc/xh_stbox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_stlin.o: ../../src/xrc/xh_stlin.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_text.o: ../../src/xrc/xh_text.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_tree.o: ../../src/xrc/xh_tree.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_treebk.o: ../../src/xrc/xh_treebk.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_unkwn.o: ../../src/xrc/xh_unkwn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_wizrd.o: ../../src/xrc/xh_wizrd.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xmlres.o: ../../src/xrc/xmlres.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xmladv.o: ../../src/xrc/xmladv.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xmlrsall.o: ../../src/xrc/xmlrsall.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_framemanager.o: ../../src/aui/framemanager.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_dockart.o: ../../src/aui/dockart.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_floatpane.o: ../../src/aui/floatpane.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_auibook.o: ../../src/aui/auibook.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_auibar.o: ../../src/aui/auibar.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_tabmdi.o: ../../src/aui/tabmdi.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_tabart.o: ../../src/aui/tabart.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_auinotbk.o: ../../src/xrc/xh_auinotbk.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_advprops.o: ../../src/propgrid/advprops.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_editors.o: ../../src/propgrid/editors.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_manager.o: ../../src/propgrid/manager.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_property.o: ../../src/propgrid/property.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_propgrid.o: ../../src/propgrid/propgrid.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_propgridiface.o: ../../src/propgrid/propgridiface.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_propgridpagestate.o: ../../src/propgrid/propgridpagestate.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_props.o: ../../src/propgrid/props.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_art_internal.o: ../../src/ribbon/art_internal.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_art_msw.o: ../../src/ribbon/art_msw.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_art_aui.o: ../../src/ribbon/art_aui.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_bar.o: ../../src/ribbon/bar.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_ribbon_buttonbar.o: ../../src/ribbon/buttonbar.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_ribbon_control.o: ../../src/ribbon/control.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_gallery.o: ../../src/ribbon/gallery.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_page.o: ../../src/ribbon/page.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_ribbon_panel.o: ../../src/ribbon/panel.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_ribbon_toolbar.o: ../../src/ribbon/toolbar.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_ribbon.o: ../../src/xrc/xh_ribbon.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_richtextbuffer.o: ../../src/richtext/richtextbuffer.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_richtextctrl.o: ../../src/richtext/richtextctrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_richtextformatdlg.o: ../../src/richtext/richtextformatdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_richtexthtml.o: ../../src/richtext/richtexthtml.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_richtextimagedlg.o: ../../src/richtext/richtextimagedlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_richtextprint.o: ../../src/richtext/richtextprint.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_richtextstyles.o: ../../src/richtext/richtextstyles.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_richtextxml.o: ../../src/richtext/richtextxml.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xh_richtext.o: ../../src/xrc/xh_richtext.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_stc.o: ../../src/stc/stc.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_PlatWX.o: ../../src/stc/PlatWX.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_ScintillaWX.o: ../../src/stc/ScintillaWX.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xml.o: ../../src/xml/xml.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monodll_xtixml.o: ../../src/common/xtixml.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_activex.o: ../../src/msw/ole/activex.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_app.o: ../../src/msw/app.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_bitmap.o: ../../src/msw/bitmap.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_brush.o: ../../src/msw/brush.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_caret.o: ../../src/msw/caret.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_clipbrd.o: ../../src/msw/clipbrd.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_colour.o: ../../src/msw/colour.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_cursor.o: ../../src/msw/cursor.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_data.o: ../../src/msw/data.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dc.o: ../../src/msw/dc.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dcclient.o: ../../src/msw/dcclient.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dcmemory.o: ../../src/msw/dcmemory.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dcprint.o: ../../src/msw/dcprint.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dcscreen.o: ../../src/msw/dcscreen.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dialup.o: ../../src/msw/dialup.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dib.o: ../../src/msw/dib.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_display.o: ../../src/msw/display.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_enhmeta.o: ../../src/msw/enhmeta.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_font.o: ../../src/msw/font.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_fontenum.o: ../../src/msw/fontenum.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_fontutil.o: ../../src/msw/fontutil.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_gdiimage.o: ../../src/msw/gdiimage.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_gdiobj.o: ../../src/msw/gdiobj.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_gdiplus.o: ../../src/msw/gdiplus.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_graphics.o: ../../src/msw/graphics.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_icon.o: ../../src/msw/icon.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_imaglist.o: ../../src/msw/imaglist.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_minifram.o: ../../src/msw/minifram.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dataobj.o: ../../src/msw/ole/dataobj.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dropsrc.o: ../../src/msw/ole/dropsrc.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_droptgt.o: ../../src/msw/ole/droptgt.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_oleutils.o: ../../src/msw/ole/oleutils.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_safearray.o: ../../src/msw/ole/safearray.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_palette.o: ../../src/msw/palette.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_pen.o: ../../src/msw/pen.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_popupwin.o: ../../src/msw/popupwin.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_printdlg.o: ../../src/msw/printdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_printwin.o: ../../src/msw/printwin.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_region.o: ../../src/msw/region.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_renderer.o: ../../src/msw/renderer.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_settings.o: ../../src/msw/settings.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_textmeasure.o: ../../src/msw/textmeasure.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_tooltip.o: ../../src/msw/tooltip.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_toplevel.o: ../../src/msw/toplevel.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_uiaction.o: ../../src/msw/uiaction.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_utilsgui.o: ../../src/msw/utilsgui.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_utilswin.o: ../../src/msw/utilswin.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_uxtheme.o: ../../src/msw/uxtheme.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_window.o: ../../src/msw/window.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_helpchm.o: ../../src/msw/helpchm.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_helpwin.o: ../../src/msw/helpwin.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_automtn.o: ../../src/msw/ole/automtn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_uuid.o: ../../src/msw/ole/uuid.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_clrpickerg.o: ../../src/generic/clrpickerg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_collpaneg.o: ../../src/generic/collpaneg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_filepickerg.o: ../../src/generic/filepickerg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_fontpickerg.o: ../../src/generic/fontpickerg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_prntdlgg.o: ../../src/generic/prntdlgg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_evtloop.o: ../../src/msw/evtloop.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_accelcmn.o: ../../src/common/accelcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_accesscmn.o: ../../src/common/accesscmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_anidecod.o: ../../src/common/anidecod.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_affinematrix2d.o: ../../src/common/affinematrix2d.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_appcmn.o: ../../src/common/appcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_artprov.o: ../../src/common/artprov.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_artstd.o: ../../src/common/artstd.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_arttango.o: ../../src/common/arttango.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_bmpbase.o: ../../src/common/bmpbase.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_bmpbtncmn.o: ../../src/common/bmpbtncmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_bookctrl.o: ../../src/common/bookctrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_btncmn.o: ../../src/common/btncmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_cairo.o: ../../src/common/cairo.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_checkboxcmn.o: ../../src/common/checkboxcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_checklstcmn.o: ../../src/common/checklstcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_choiccmn.o: ../../src/common/choiccmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_clipcmn.o: ../../src/common/clipcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_clrpickercmn.o: ../../src/common/clrpickercmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_colourcmn.o: ../../src/common/colourcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_colourdata.o: ../../src/common/colourdata.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_combocmn.o: ../../src/common/combocmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_cmdproc.o: ../../src/common/cmdproc.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_cmndata.o: ../../src/common/cmndata.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_containr.o: ../../src/common/containr.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_cshelp.o: ../../src/common/cshelp.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_ctrlcmn.o: ../../src/common/ctrlcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_ctrlsub.o: ../../src/common/ctrlsub.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dcbase.o: ../../src/common/dcbase.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dcbufcmn.o: ../../src/common/dcbufcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dcgraph.o: ../../src/common/dcgraph.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dcsvg.o: ../../src/common/dcsvg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dirctrlcmn.o: ../../src/common/dirctrlcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dlgcmn.o: ../../src/common/dlgcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dndcmn.o: ../../src/common/dndcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dobjcmn.o: ../../src/common/dobjcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_docmdi.o: ../../src/common/docmdi.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_docview.o: ../../src/common/docview.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dpycmn.o: ../../src/common/dpycmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dseldlg.o: ../../src/common/dseldlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_effects.o: ../../src/common/effects.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_fddlgcmn.o: ../../src/common/fddlgcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_filectrlcmn.o: ../../src/common/filectrlcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_filehistorycmn.o: ../../src/common/filehistorycmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_filepickercmn.o: ../../src/common/filepickercmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_fontpickercmn.o: ../../src/common/fontpickercmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_fldlgcmn.o: ../../src/common/fldlgcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_fontcmn.o: ../../src/common/fontcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_fontdata.o: ../../src/common/fontdata.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_graphicc.o: ../../src/generic/graphicc.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_fontenumcmn.o: ../../src/common/fontenumcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_fontmap.o: ../../src/common/fontmap.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_fontutilcmn.o: ../../src/common/fontutilcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_framecmn.o: ../../src/common/framecmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_gaugecmn.o: ../../src/common/gaugecmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_gbsizer.o: ../../src/common/gbsizer.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_gdicmn.o: ../../src/common/gdicmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_geometry.o: ../../src/common/geometry.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_gifdecod.o: ../../src/common/gifdecod.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_graphcmn.o: ../../src/common/graphcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_headercolcmn.o: ../../src/common/headercolcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_headerctrlcmn.o: ../../src/common/headerctrlcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_helpbase.o: ../../src/common/helpbase.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_iconbndl.o: ../../src/common/iconbndl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_imagall.o: ../../src/common/imagall.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_imagbmp.o: ../../src/common/imagbmp.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_image.o: ../../src/common/image.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_imagfill.o: ../../src/common/imagfill.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_imaggif.o: ../../src/common/imaggif.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_imagiff.o: ../../src/common/imagiff.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_imagjpeg.o: ../../src/common/imagjpeg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_imagpcx.o: ../../src/common/imagpcx.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_imagpng.o: ../../src/common/imagpng.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_imagpnm.o: ../../src/common/imagpnm.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_imagtga.o: ../../src/common/imagtga.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_imagtiff.o: ../../src/common/imagtiff.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_imagxpm.o: ../../src/common/imagxpm.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_layout.o: ../../src/common/layout.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_lboxcmn.o: ../../src/common/lboxcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_listctrlcmn.o: ../../src/common/listctrlcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_markupparser.o: ../../src/common/markupparser.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_matrix.o: ../../src/common/matrix.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_menucmn.o: ../../src/common/menucmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_modalhook.o: ../../src/common/modalhook.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_mousemanager.o: ../../src/common/mousemanager.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_nbkbase.o: ../../src/common/nbkbase.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_overlaycmn.o: ../../src/common/overlaycmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_paper.o: ../../src/common/paper.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_panelcmn.o: ../../src/common/panelcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_persist.o: ../../src/common/persist.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_pickerbase.o: ../../src/common/pickerbase.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_popupcmn.o: ../../src/common/popupcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_preferencescmn.o: ../../src/common/preferencescmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_prntbase.o: ../../src/common/prntbase.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_quantize.o: ../../src/common/quantize.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_radiobtncmn.o: ../../src/common/radiobtncmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_radiocmn.o: ../../src/common/radiocmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_rearrangectrl.o: ../../src/common/rearrangectrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_rendcmn.o: ../../src/common/rendcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_rgncmn.o: ../../src/common/rgncmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_scrolbarcmn.o: ../../src/common/scrolbarcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_settcmn.o: ../../src/common/settcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_sizer.o: ../../src/common/sizer.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_slidercmn.o: ../../src/common/slidercmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_spinbtncmn.o: ../../src/common/spinbtncmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_spinctrlcmn.o: ../../src/common/spinctrlcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_srchcmn.o: ../../src/common/srchcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_statbar.o: ../../src/common/statbar.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_statbmpcmn.o: ../../src/common/statbmpcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_statboxcmn.o: ../../src/common/statboxcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_statlinecmn.o: ../../src/common/statlinecmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_stattextcmn.o: ../../src/common/stattextcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_stockitem.o: ../../src/common/stockitem.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_tbarbase.o: ../../src/common/tbarbase.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_textcmn.o: ../../src/common/textcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_textentrycmn.o: ../../src/common/textentrycmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_toplvcmn.o: ../../src/common/toplvcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_treebase.o: ../../src/common/treebase.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_uiactioncmn.o: ../../src/common/uiactioncmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_valgen.o: ../../src/common/valgen.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_validate.o: ../../src/common/validate.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_valtext.o: ../../src/common/valtext.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_valnum.o: ../../src/common/valnum.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_wincmn.o: ../../src/common/wincmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_windowid.o: ../../src/common/windowid.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_wrapsizer.o: ../../src/common/wrapsizer.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_xpmdecod.o: ../../src/common/xpmdecod.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_busyinfo.o: ../../src/generic/busyinfo.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_generic_buttonbar.o: ../../src/generic/buttonbar.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_choicdgg.o: ../../src/generic/choicdgg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_choicbkg.o: ../../src/generic/choicbkg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_combog.o: ../../src/generic/combog.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dcpsg.o: ../../src/generic/dcpsg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dirctrlg.o: ../../src/generic/dirctrlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_dragimgg.o: ../../src/generic/dragimgg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_filectrlg.o: ../../src/generic/filectrlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_headerctrlg.o: ../../src/generic/headerctrlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_infobar.o: ../../src/generic/infobar.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_listbkg.o: ../../src/generic/listbkg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_logg.o: ../../src/generic/logg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_markuptext.o: ../../src/generic/markuptext.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_msgdlgg.o: ../../src/generic/msgdlgg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_numdlgg.o: ../../src/generic/numdlgg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_progdlgg.o: ../../src/generic/progdlgg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_preferencesg.o: ../../src/generic/preferencesg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_printps.o: ../../src/generic/printps.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_renderg.o: ../../src/generic/renderg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_richmsgdlgg.o: ../../src/generic/richmsgdlgg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_scrlwing.o: ../../src/generic/scrlwing.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_selstore.o: ../../src/generic/selstore.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_spinctlg.o: ../../src/generic/spinctlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_splitter.o: ../../src/generic/splitter.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_srchctlg.o: ../../src/generic/srchctlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_statbmpg.o: ../../src/generic/statbmpg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_stattextg.o: ../../src/generic/stattextg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_textdlgg.o: ../../src/generic/textdlgg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_tipwin.o: ../../src/generic/tipwin.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_toolbkg.o: ../../src/generic/toolbkg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_treectlg.o: ../../src/generic/treectlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_treebkg.o: ../../src/generic/treebkg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_vlbox.o: ../../src/generic/vlbox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_vscroll.o: ../../src/generic/vscroll.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_animatecmn.o: ../../src/common/animatecmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_datavcmn.o: ../../src/common/datavcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_gridcmn.o: ../../src/common/gridcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_odcombocmn.o: ../../src/common/odcombocmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_bannerwindow.o: ../../src/generic/bannerwindow.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_calctrlg.o: ../../src/generic/calctrlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_commandlinkbuttong.o: ../../src/generic/commandlinkbuttong.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_datavgen.o: ../../src/generic/datavgen.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_datectlg.o: ../../src/generic/datectlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_editlbox.o: ../../src/generic/editlbox.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_grid.o: ../../src/generic/grid.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_gridctrl.o: ../../src/generic/gridctrl.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_grideditors.o: ../../src/generic/grideditors.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_gridsel.o: ../../src/generic/gridsel.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_helpext.o: ../../src/generic/helpext.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_hyperlinkg.o: ../../src/generic/hyperlinkg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_laywin.o: ../../src/generic/laywin.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_notifmsgg.o: ../../src/generic/notifmsgg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_odcombo.o: ../../src/generic/odcombo.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_propdlg.o: ../../src/generic/propdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_richtooltipg.o: ../../src/generic/richtooltipg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_sashwin.o: ../../src/generic/sashwin.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_splash.o: ../../src/generic/splash.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_timectrlg.o: ../../src/generic/timectrlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_tipdlg.o: ../../src/generic/tipdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_treelist.o: ../../src/generic/treelist.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_wizard.o: ../../src/generic/wizard.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_aboutdlg.o: ../../src/msw/aboutdlg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_notifmsg.o: ../../src/msw/notifmsg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_richtooltip.o: ../../src/msw/richtooltip.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_sound.o: ../../src/msw/sound.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_taskbar.o: ../../src/msw/taskbar.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_joystick.o: ../../src/msw/joystick.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monodll_animateg.o: ../../src/generic/animateg.cpp - $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< -endif - -$(OBJS)\monodll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --include-dir ../../src/stc/scintilla/include --include-dir ../../src/stc/scintilla/lexlib --include-dir ../../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define wxUSE_BASE=1 --define WXMAKINGDLL - -$(OBJS)\monolib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_any.o: ../../src/common/any.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_appbase.o: ../../src/common/appbase.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_arcall.o: ../../src/common/arcall.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_arcfind.o: ../../src/common/arcfind.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_archive.o: ../../src/common/archive.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_arrstr.o: ../../src/common/arrstr.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_base64.o: ../../src/common/base64.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_clntdata.o: ../../src/common/clntdata.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_cmdline.o: ../../src/common/cmdline.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_config.o: ../../src/common/config.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_convauto.o: ../../src/common/convauto.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_datetime.o: ../../src/common/datetime.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_datetimefmt.o: ../../src/common/datetimefmt.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_datstrm.o: ../../src/common/datstrm.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_dircmn.o: ../../src/common/dircmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_dynarray.o: ../../src/common/dynarray.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_dynlib.o: ../../src/common/dynlib.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_dynload.o: ../../src/common/dynload.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_encconv.o: ../../src/common/encconv.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_evtloopcmn.o: ../../src/common/evtloopcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_extended.o: ../../src/common/extended.c - $(CC) -c -o $@ $(MONOLIB_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_ffile.o: ../../src/common/ffile.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_file.o: ../../src/common/file.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_fileback.o: ../../src/common/fileback.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_fileconf.o: ../../src/common/fileconf.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_filefn.o: ../../src/common/filefn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_filename.o: ../../src/common/filename.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_filesys.o: ../../src/common/filesys.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_filtall.o: ../../src/common/filtall.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_filtfind.o: ../../src/common/filtfind.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_fmapbase.o: ../../src/common/fmapbase.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_fs_arc.o: ../../src/common/fs_arc.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_fs_filter.o: ../../src/common/fs_filter.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_hash.o: ../../src/common/hash.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_hashmap.o: ../../src/common/hashmap.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_init.o: ../../src/common/init.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_intl.o: ../../src/common/intl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_ipcbase.o: ../../src/common/ipcbase.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_languageinfo.o: ../../src/common/languageinfo.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_list.o: ../../src/common/list.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_log.o: ../../src/common/log.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_longlong.o: ../../src/common/longlong.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_memory.o: ../../src/common/memory.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_mimecmn.o: ../../src/common/mimecmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_module.o: ../../src/common/module.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_mstream.o: ../../src/common/mstream.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_numformatter.o: ../../src/common/numformatter.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_object.o: ../../src/common/object.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_platinfo.o: ../../src/common/platinfo.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_powercmn.o: ../../src/common/powercmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_process.o: ../../src/common/process.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_regex.o: ../../src/common/regex.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_stdpbase.o: ../../src/common/stdpbase.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_sstream.o: ../../src/common/sstream.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_stdstream.o: ../../src/common/stdstream.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_stopwatch.o: ../../src/common/stopwatch.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_strconv.o: ../../src/common/strconv.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_stream.o: ../../src/common/stream.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_string.o: ../../src/common/string.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_stringimpl.o: ../../src/common/stringimpl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_stringops.o: ../../src/common/stringops.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_strvararg.o: ../../src/common/strvararg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_sysopt.o: ../../src/common/sysopt.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_tarstrm.o: ../../src/common/tarstrm.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_textbuf.o: ../../src/common/textbuf.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_textfile.o: ../../src/common/textfile.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_threadinfo.o: ../../src/common/threadinfo.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_time.o: ../../src/common/time.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_timercmn.o: ../../src/common/timercmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_timerimpl.o: ../../src/common/timerimpl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_tokenzr.o: ../../src/common/tokenzr.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_translation.o: ../../src/common/translation.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_txtstrm.o: ../../src/common/txtstrm.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_unichar.o: ../../src/common/unichar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_uri.o: ../../src/common/uri.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_ustring.o: ../../src/common/ustring.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_variant.o: ../../src/common/variant.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_wfstream.o: ../../src/common/wfstream.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_wxcrt.o: ../../src/common/wxcrt.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_wxprintf.o: ../../src/common/wxprintf.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xlocale.o: ../../src/common/xlocale.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xti.o: ../../src/common/xti.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xtistrm.o: ../../src/common/xtistrm.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_zipstrm.o: ../../src/common/zipstrm.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_zstream.o: ../../src/common/zstream.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_fswatchercmn.o: ../../src/common/fswatchercmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_fswatcherg.o: ../../src/generic/fswatcherg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_basemsw.o: ../../src/msw/basemsw.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_crashrpt.o: ../../src/msw/crashrpt.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_debughlp.o: ../../src/msw/debughlp.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_dde.o: ../../src/msw/dde.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_dir.o: ../../src/msw/dir.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_dlmsw.o: ../../src/msw/dlmsw.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_evtloopconsole.o: ../../src/msw/evtloopconsole.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_mimetype.o: ../../src/msw/mimetype.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_power.o: ../../src/msw/power.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_regconf.o: ../../src/msw/regconf.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_registry.o: ../../src/msw/registry.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_snglinst.o: ../../src/msw/snglinst.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_stackwalk.o: ../../src/msw/stackwalk.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_stdpaths.o: ../../src/msw/stdpaths.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_thread.o: ../../src/msw/thread.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_timer.o: ../../src/msw/timer.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_utils.o: ../../src/msw/utils.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_utilsexc.o: ../../src/msw/utilsexc.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_fswatcher.o: ../../src/msw/fswatcher.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_event.o: ../../src/common/event.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_fs_mem.o: ../../src/common/fs_mem.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msgout.o: ../../src/common/msgout.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_utilscmn.o: ../../src/common/utilscmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_main.o: ../../src/msw/main.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_mslu.o: ../../src/msw/mslu.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_volume.o: ../../src/msw/volume.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_fs_inet.o: ../../src/common/fs_inet.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_ftp.o: ../../src/common/ftp.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_http.o: ../../src/common/http.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_protocol.o: ../../src/common/protocol.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_sckaddr.o: ../../src/common/sckaddr.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_sckfile.o: ../../src/common/sckfile.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_sckipc.o: ../../src/common/sckipc.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_sckstrm.o: ../../src/common/sckstrm.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_socket.o: ../../src/common/socket.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_url.o: ../../src/common/url.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_sockmsw.o: ../../src/msw/sockmsw.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_urlmsw.o: ../../src/msw/urlmsw.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_generic_statusbr.o: ../../src/generic/statusbr.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_accel.o: ../../src/msw/accel.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_anybutton.o: ../../src/msw/anybutton.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_artmsw.o: ../../src/msw/artmsw.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_bmpbuttn.o: ../../src/msw/bmpbuttn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_button.o: ../../src/msw/button.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_checkbox.o: ../../src/msw/checkbox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_choice.o: ../../src/msw/choice.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_colordlg.o: ../../src/msw/colordlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_combo.o: ../../src/msw/combo.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_combobox.o: ../../src/msw/combobox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_control.o: ../../src/msw/control.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_dialog.o: ../../src/msw/dialog.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_dirdlg.o: ../../src/msw/dirdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_dragimag.o: ../../src/msw/dragimag.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_filedlg.o: ../../src/msw/filedlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_frame.o: ../../src/msw/frame.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_gauge.o: ../../src/msw/gauge.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_headerctrl.o: ../../src/msw/headerctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_iniconf.o: ../../src/msw/iniconf.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_listbox.o: ../../src/msw/listbox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_listctrl.o: ../../src/msw/listctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_mdi.o: ../../src/msw/mdi.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_menu.o: ../../src/msw/menu.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_menuitem.o: ../../src/msw/menuitem.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_metafile.o: ../../src/msw/metafile.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msgdlg.o: ../../src/msw/msgdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_nativdlg.o: ../../src/msw/nativdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_nativewin.o: ../../src/msw/nativewin.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_notebook.o: ../../src/msw/notebook.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_access.o: ../../src/msw/ole/access.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_ownerdrw.o: ../../src/msw/ownerdrw.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_panel.o: ../../src/msw/panel.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_progdlg.o: ../../src/msw/progdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_radiobox.o: ../../src/msw/radiobox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_radiobut.o: ../../src/msw/radiobut.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_richmsgdlg.o: ../../src/msw/richmsgdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_scrolbar.o: ../../src/msw/scrolbar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_slider.o: ../../src/msw/slider.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_spinbutt.o: ../../src/msw/spinbutt.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_spinctrl.o: ../../src/msw/spinctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_statbmp.o: ../../src/msw/statbmp.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_statbox.o: ../../src/msw/statbox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_statusbar.o: ../../src/msw/statusbar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_statline.o: ../../src/msw/statline.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_stattext.o: ../../src/msw/stattext.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_toolbar.o: ../../src/msw/toolbar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_textctrl.o: ../../src/msw/textctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_textentry.o: ../../src/msw/textentry.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_tglbtn.o: ../../src/msw/tglbtn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_treectrl.o: ../../src/msw/treectrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_checklst.o: ../../src/msw/checklst.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_msw_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_fontdlg.o: ../../src/msw/fontdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_generic_accel.o: ../../src/generic/accel.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_colrdlgg.o: ../../src/generic/colrdlgg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_dirdlgg.o: ../../src/generic/dirdlgg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_generic_fdrepdlg.o: ../../src/generic/fdrepdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_filedlgg.o: ../../src/generic/filedlgg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_fontdlgg.o: ../../src/generic/fontdlgg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_generic_listctrl.o: ../../src/generic/listctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_mdig.o: ../../src/generic/mdig.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_bmpbuttn.o: ../../src/univ/bmpbuttn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_button.o: ../../src/univ/button.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_checkbox.o: ../../src/univ/checkbox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_checklst.o: ../../src/univ/checklst.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_choice.o: ../../src/univ/choice.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_combobox.o: ../../src/univ/combobox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_control.o: ../../src/univ/control.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_ctrlrend.o: ../../src/univ/ctrlrend.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_dialog.o: ../../src/univ/dialog.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_framuniv.o: ../../src/univ/framuniv.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_gauge.o: ../../src/univ/gauge.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_inpcons.o: ../../src/univ/inpcons.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_inphand.o: ../../src/univ/inphand.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_listbox.o: ../../src/univ/listbox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_menu.o: ../../src/univ/menu.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_notebook.o: ../../src/univ/notebook.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_radiobox.o: ../../src/univ/radiobox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_radiobut.o: ../../src/univ/radiobut.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_scrarrow.o: ../../src/univ/scrarrow.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_scrolbar.o: ../../src/univ/scrolbar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_scrthumb.o: ../../src/univ/scrthumb.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_settingsuniv.o: ../../src/univ/settingsuniv.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_slider.o: ../../src/univ/slider.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_spinbutt.o: ../../src/univ/spinbutt.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_statbmp.o: ../../src/univ/statbmp.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_statbox.o: ../../src/univ/statbox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_statline.o: ../../src/univ/statline.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_stattext.o: ../../src/univ/stattext.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_statusbr.o: ../../src/univ/statusbr.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_stdrend.o: ../../src/univ/stdrend.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_textctrl.o: ../../src/univ/textctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_tglbtn.o: ../../src/univ/tglbtn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_theme.o: ../../src/univ/theme.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_univ_toolbar.o: ../../src/univ/toolbar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_topluniv.o: ../../src/univ/topluniv.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_winuniv.o: ../../src/univ/winuniv.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_gtk.o: ../../src/univ/themes/gtk.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_metal.o: ../../src/univ/themes/metal.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_mono.o: ../../src/univ/themes/mono.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_win32.o: ../../src/univ/themes/win32.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_bmpcbox.o: ../../src/msw/bmpcbox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_calctrl.o: ../../src/msw/calctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_datecontrols.o: ../../src/msw/datecontrols.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_datectrl.o: ../../src/msw/datectrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_datetimectrl.o: ../../src/msw/datetimectrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_hyperlink.o: ../../src/msw/hyperlink.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_timectrl.o: ../../src/msw/timectrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_mediactrl_am.o: ../../src/msw/mediactrl_am.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_mediactrl_qt.o: ../../src/msw/mediactrl_qt.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_helpbest.o: ../../src/msw/helpbest.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_helpctrl.o: ../../src/html/helpctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_helpdata.o: ../../src/html/helpdata.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_helpdlg.o: ../../src/html/helpdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_helpfrm.o: ../../src/html/helpfrm.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_helpwnd.o: ../../src/html/helpwnd.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_htmlcell.o: ../../src/html/htmlcell.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_htmlfilt.o: ../../src/html/htmlfilt.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_htmlpars.o: ../../src/html/htmlpars.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_htmltag.o: ../../src/html/htmltag.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_htmlwin.o: ../../src/html/htmlwin.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_htmprint.o: ../../src/html/htmprint.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_m_dflist.o: ../../src/html/m_dflist.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_m_fonts.o: ../../src/html/m_fonts.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_m_hline.o: ../../src/html/m_hline.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_m_image.o: ../../src/html/m_image.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_m_layout.o: ../../src/html/m_layout.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_m_links.o: ../../src/html/m_links.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_m_list.o: ../../src/html/m_list.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_m_pre.o: ../../src/html/m_pre.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_m_span.o: ../../src/html/m_span.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_m_style.o: ../../src/html/m_style.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_m_tables.o: ../../src/html/m_tables.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_styleparams.o: ../../src/html/styleparams.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_winpars.o: ../../src/html/winpars.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_htmllbox.o: ../../src/generic/htmllbox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_webview_ie.o: ../../src/msw/webview_ie.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_webview.o: ../../src/common/webview.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_webviewarchivehandler.o: ../../src/common/webviewarchivehandler.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_webviewfshandler.o: ../../src/common/webviewfshandler.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_debugrpt.o: ../../src/common/debugrpt.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_dbgrptg.o: ../../src/generic/dbgrptg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_bmp.o: ../../src/xrc/xh_bmp.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_bmpcbox.o: ../../src/xrc/xh_bmpcbox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_bmpbt.o: ../../src/xrc/xh_bmpbt.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_bttn.o: ../../src/xrc/xh_bttn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_cald.o: ../../src/xrc/xh_cald.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_chckb.o: ../../src/xrc/xh_chckb.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_chckl.o: ../../src/xrc/xh_chckl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_choic.o: ../../src/xrc/xh_choic.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_choicbk.o: ../../src/xrc/xh_choicbk.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_clrpicker.o: ../../src/xrc/xh_clrpicker.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_cmdlinkbn.o: ../../src/xrc/xh_cmdlinkbn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_collpane.o: ../../src/xrc/xh_collpane.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_combo.o: ../../src/xrc/xh_combo.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_comboctrl.o: ../../src/xrc/xh_comboctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_dirpicker.o: ../../src/xrc/xh_dirpicker.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_dlg.o: ../../src/xrc/xh_dlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_editlbox.o: ../../src/xrc/xh_editlbox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_filectrl.o: ../../src/xrc/xh_filectrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_filepicker.o: ../../src/xrc/xh_filepicker.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_fontpicker.o: ../../src/xrc/xh_fontpicker.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_frame.o: ../../src/xrc/xh_frame.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_gauge.o: ../../src/xrc/xh_gauge.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_gdctl.o: ../../src/xrc/xh_gdctl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_grid.o: ../../src/xrc/xh_grid.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_html.o: ../../src/xrc/xh_html.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_hyperlink.o: ../../src/xrc/xh_hyperlink.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_listb.o: ../../src/xrc/xh_listb.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_listbk.o: ../../src/xrc/xh_listbk.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_listc.o: ../../src/xrc/xh_listc.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_mdi.o: ../../src/xrc/xh_mdi.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_menu.o: ../../src/xrc/xh_menu.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_notbk.o: ../../src/xrc/xh_notbk.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_odcombo.o: ../../src/xrc/xh_odcombo.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_panel.o: ../../src/xrc/xh_panel.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_propdlg.o: ../../src/xrc/xh_propdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_radbt.o: ../../src/xrc/xh_radbt.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_radbx.o: ../../src/xrc/xh_radbx.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_scrol.o: ../../src/xrc/xh_scrol.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_scwin.o: ../../src/xrc/xh_scwin.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_sizer.o: ../../src/xrc/xh_sizer.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_slidr.o: ../../src/xrc/xh_slidr.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_spin.o: ../../src/xrc/xh_spin.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_split.o: ../../src/xrc/xh_split.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_srchctrl.o: ../../src/xrc/xh_srchctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_statbar.o: ../../src/xrc/xh_statbar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_stbmp.o: ../../src/xrc/xh_stbmp.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_stbox.o: ../../src/xrc/xh_stbox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_stlin.o: ../../src/xrc/xh_stlin.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_text.o: ../../src/xrc/xh_text.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_tree.o: ../../src/xrc/xh_tree.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_treebk.o: ../../src/xrc/xh_treebk.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_unkwn.o: ../../src/xrc/xh_unkwn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_wizrd.o: ../../src/xrc/xh_wizrd.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xmlres.o: ../../src/xrc/xmlres.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xmladv.o: ../../src/xrc/xmladv.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xmlrsall.o: ../../src/xrc/xmlrsall.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_framemanager.o: ../../src/aui/framemanager.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_dockart.o: ../../src/aui/dockart.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_floatpane.o: ../../src/aui/floatpane.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_auibook.o: ../../src/aui/auibook.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_auibar.o: ../../src/aui/auibar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_tabmdi.o: ../../src/aui/tabmdi.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_tabart.o: ../../src/aui/tabart.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_auinotbk.o: ../../src/xrc/xh_auinotbk.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_advprops.o: ../../src/propgrid/advprops.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_editors.o: ../../src/propgrid/editors.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_manager.o: ../../src/propgrid/manager.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_property.o: ../../src/propgrid/property.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_propgrid.o: ../../src/propgrid/propgrid.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_propgridiface.o: ../../src/propgrid/propgridiface.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_propgridpagestate.o: ../../src/propgrid/propgridpagestate.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_props.o: ../../src/propgrid/props.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_art_internal.o: ../../src/ribbon/art_internal.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_art_msw.o: ../../src/ribbon/art_msw.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_art_aui.o: ../../src/ribbon/art_aui.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_bar.o: ../../src/ribbon/bar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_ribbon_buttonbar.o: ../../src/ribbon/buttonbar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_ribbon_control.o: ../../src/ribbon/control.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_gallery.o: ../../src/ribbon/gallery.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_page.o: ../../src/ribbon/page.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_ribbon_panel.o: ../../src/ribbon/panel.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_ribbon_toolbar.o: ../../src/ribbon/toolbar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_ribbon.o: ../../src/xrc/xh_ribbon.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_richtextbuffer.o: ../../src/richtext/richtextbuffer.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_richtextctrl.o: ../../src/richtext/richtextctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_richtextformatdlg.o: ../../src/richtext/richtextformatdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_richtexthtml.o: ../../src/richtext/richtexthtml.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_richtextimagedlg.o: ../../src/richtext/richtextimagedlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_richtextprint.o: ../../src/richtext/richtextprint.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_richtextstyles.o: ../../src/richtext/richtextstyles.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_richtextxml.o: ../../src/richtext/richtextxml.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xh_richtext.o: ../../src/xrc/xh_richtext.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_stc.o: ../../src/stc/stc.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_PlatWX.o: ../../src/stc/PlatWX.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_ScintillaWX.o: ../../src/stc/ScintillaWX.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xml.o: ../../src/xml/xml.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\monolib_xtixml.o: ../../src/common/xtixml.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_activex.o: ../../src/msw/ole/activex.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_app.o: ../../src/msw/app.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_bitmap.o: ../../src/msw/bitmap.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_brush.o: ../../src/msw/brush.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_caret.o: ../../src/msw/caret.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_clipbrd.o: ../../src/msw/clipbrd.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_colour.o: ../../src/msw/colour.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_cursor.o: ../../src/msw/cursor.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_data.o: ../../src/msw/data.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dc.o: ../../src/msw/dc.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dcclient.o: ../../src/msw/dcclient.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dcmemory.o: ../../src/msw/dcmemory.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dcprint.o: ../../src/msw/dcprint.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dcscreen.o: ../../src/msw/dcscreen.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dialup.o: ../../src/msw/dialup.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dib.o: ../../src/msw/dib.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_display.o: ../../src/msw/display.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_enhmeta.o: ../../src/msw/enhmeta.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_font.o: ../../src/msw/font.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_fontenum.o: ../../src/msw/fontenum.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_fontutil.o: ../../src/msw/fontutil.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_gdiimage.o: ../../src/msw/gdiimage.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_gdiobj.o: ../../src/msw/gdiobj.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_gdiplus.o: ../../src/msw/gdiplus.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_graphics.o: ../../src/msw/graphics.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_icon.o: ../../src/msw/icon.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_imaglist.o: ../../src/msw/imaglist.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_minifram.o: ../../src/msw/minifram.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dataobj.o: ../../src/msw/ole/dataobj.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dropsrc.o: ../../src/msw/ole/dropsrc.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_droptgt.o: ../../src/msw/ole/droptgt.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_oleutils.o: ../../src/msw/ole/oleutils.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_safearray.o: ../../src/msw/ole/safearray.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_palette.o: ../../src/msw/palette.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_pen.o: ../../src/msw/pen.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_popupwin.o: ../../src/msw/popupwin.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_printdlg.o: ../../src/msw/printdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_printwin.o: ../../src/msw/printwin.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_region.o: ../../src/msw/region.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_renderer.o: ../../src/msw/renderer.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_settings.o: ../../src/msw/settings.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_textmeasure.o: ../../src/msw/textmeasure.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_tooltip.o: ../../src/msw/tooltip.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_toplevel.o: ../../src/msw/toplevel.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_uiaction.o: ../../src/msw/uiaction.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_utilsgui.o: ../../src/msw/utilsgui.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_utilswin.o: ../../src/msw/utilswin.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_uxtheme.o: ../../src/msw/uxtheme.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_window.o: ../../src/msw/window.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_helpchm.o: ../../src/msw/helpchm.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_helpwin.o: ../../src/msw/helpwin.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_automtn.o: ../../src/msw/ole/automtn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_uuid.o: ../../src/msw/ole/uuid.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_clrpickerg.o: ../../src/generic/clrpickerg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_collpaneg.o: ../../src/generic/collpaneg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_filepickerg.o: ../../src/generic/filepickerg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_fontpickerg.o: ../../src/generic/fontpickerg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_prntdlgg.o: ../../src/generic/prntdlgg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_evtloop.o: ../../src/msw/evtloop.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_accelcmn.o: ../../src/common/accelcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_accesscmn.o: ../../src/common/accesscmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_anidecod.o: ../../src/common/anidecod.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_affinematrix2d.o: ../../src/common/affinematrix2d.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_appcmn.o: ../../src/common/appcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_artprov.o: ../../src/common/artprov.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_artstd.o: ../../src/common/artstd.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_arttango.o: ../../src/common/arttango.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_bmpbase.o: ../../src/common/bmpbase.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_bmpbtncmn.o: ../../src/common/bmpbtncmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_bookctrl.o: ../../src/common/bookctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_btncmn.o: ../../src/common/btncmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_cairo.o: ../../src/common/cairo.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_checkboxcmn.o: ../../src/common/checkboxcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_checklstcmn.o: ../../src/common/checklstcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_choiccmn.o: ../../src/common/choiccmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_clipcmn.o: ../../src/common/clipcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_clrpickercmn.o: ../../src/common/clrpickercmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_colourcmn.o: ../../src/common/colourcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_colourdata.o: ../../src/common/colourdata.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_combocmn.o: ../../src/common/combocmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_cmdproc.o: ../../src/common/cmdproc.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_cmndata.o: ../../src/common/cmndata.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_containr.o: ../../src/common/containr.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_cshelp.o: ../../src/common/cshelp.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_ctrlcmn.o: ../../src/common/ctrlcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_ctrlsub.o: ../../src/common/ctrlsub.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dcbase.o: ../../src/common/dcbase.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dcbufcmn.o: ../../src/common/dcbufcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dcgraph.o: ../../src/common/dcgraph.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dcsvg.o: ../../src/common/dcsvg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dirctrlcmn.o: ../../src/common/dirctrlcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dlgcmn.o: ../../src/common/dlgcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dndcmn.o: ../../src/common/dndcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dobjcmn.o: ../../src/common/dobjcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_docmdi.o: ../../src/common/docmdi.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_docview.o: ../../src/common/docview.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dpycmn.o: ../../src/common/dpycmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dseldlg.o: ../../src/common/dseldlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_effects.o: ../../src/common/effects.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_fddlgcmn.o: ../../src/common/fddlgcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_filectrlcmn.o: ../../src/common/filectrlcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_filehistorycmn.o: ../../src/common/filehistorycmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_filepickercmn.o: ../../src/common/filepickercmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_fontpickercmn.o: ../../src/common/fontpickercmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_fldlgcmn.o: ../../src/common/fldlgcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_fontcmn.o: ../../src/common/fontcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_fontdata.o: ../../src/common/fontdata.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_graphicc.o: ../../src/generic/graphicc.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_fontenumcmn.o: ../../src/common/fontenumcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_fontmap.o: ../../src/common/fontmap.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_fontutilcmn.o: ../../src/common/fontutilcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_framecmn.o: ../../src/common/framecmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_gaugecmn.o: ../../src/common/gaugecmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_gbsizer.o: ../../src/common/gbsizer.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_gdicmn.o: ../../src/common/gdicmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_geometry.o: ../../src/common/geometry.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_gifdecod.o: ../../src/common/gifdecod.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_graphcmn.o: ../../src/common/graphcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_headercolcmn.o: ../../src/common/headercolcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_headerctrlcmn.o: ../../src/common/headerctrlcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_helpbase.o: ../../src/common/helpbase.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_iconbndl.o: ../../src/common/iconbndl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_imagall.o: ../../src/common/imagall.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_imagbmp.o: ../../src/common/imagbmp.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_image.o: ../../src/common/image.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_imagfill.o: ../../src/common/imagfill.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_imaggif.o: ../../src/common/imaggif.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_imagiff.o: ../../src/common/imagiff.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_imagjpeg.o: ../../src/common/imagjpeg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_imagpcx.o: ../../src/common/imagpcx.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_imagpng.o: ../../src/common/imagpng.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_imagpnm.o: ../../src/common/imagpnm.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_imagtga.o: ../../src/common/imagtga.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_imagtiff.o: ../../src/common/imagtiff.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_imagxpm.o: ../../src/common/imagxpm.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_layout.o: ../../src/common/layout.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_lboxcmn.o: ../../src/common/lboxcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_listctrlcmn.o: ../../src/common/listctrlcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_markupparser.o: ../../src/common/markupparser.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_matrix.o: ../../src/common/matrix.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_menucmn.o: ../../src/common/menucmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_modalhook.o: ../../src/common/modalhook.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_mousemanager.o: ../../src/common/mousemanager.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_nbkbase.o: ../../src/common/nbkbase.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_overlaycmn.o: ../../src/common/overlaycmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_paper.o: ../../src/common/paper.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_panelcmn.o: ../../src/common/panelcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_persist.o: ../../src/common/persist.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_pickerbase.o: ../../src/common/pickerbase.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_popupcmn.o: ../../src/common/popupcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_preferencescmn.o: ../../src/common/preferencescmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_prntbase.o: ../../src/common/prntbase.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_quantize.o: ../../src/common/quantize.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_radiobtncmn.o: ../../src/common/radiobtncmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_radiocmn.o: ../../src/common/radiocmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_rearrangectrl.o: ../../src/common/rearrangectrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_rendcmn.o: ../../src/common/rendcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_rgncmn.o: ../../src/common/rgncmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_scrolbarcmn.o: ../../src/common/scrolbarcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_settcmn.o: ../../src/common/settcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_sizer.o: ../../src/common/sizer.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_slidercmn.o: ../../src/common/slidercmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_spinbtncmn.o: ../../src/common/spinbtncmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_spinctrlcmn.o: ../../src/common/spinctrlcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_srchcmn.o: ../../src/common/srchcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_statbar.o: ../../src/common/statbar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_statbmpcmn.o: ../../src/common/statbmpcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_statboxcmn.o: ../../src/common/statboxcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_statlinecmn.o: ../../src/common/statlinecmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_stattextcmn.o: ../../src/common/stattextcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_stockitem.o: ../../src/common/stockitem.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_tbarbase.o: ../../src/common/tbarbase.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_textcmn.o: ../../src/common/textcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_textentrycmn.o: ../../src/common/textentrycmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_toplvcmn.o: ../../src/common/toplvcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_treebase.o: ../../src/common/treebase.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_uiactioncmn.o: ../../src/common/uiactioncmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_valgen.o: ../../src/common/valgen.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_validate.o: ../../src/common/validate.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_valtext.o: ../../src/common/valtext.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_valnum.o: ../../src/common/valnum.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_wincmn.o: ../../src/common/wincmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_windowid.o: ../../src/common/windowid.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_wrapsizer.o: ../../src/common/wrapsizer.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_xpmdecod.o: ../../src/common/xpmdecod.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_busyinfo.o: ../../src/generic/busyinfo.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_generic_buttonbar.o: ../../src/generic/buttonbar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_choicdgg.o: ../../src/generic/choicdgg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_choicbkg.o: ../../src/generic/choicbkg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_combog.o: ../../src/generic/combog.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dcpsg.o: ../../src/generic/dcpsg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dirctrlg.o: ../../src/generic/dirctrlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_dragimgg.o: ../../src/generic/dragimgg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_filectrlg.o: ../../src/generic/filectrlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_headerctrlg.o: ../../src/generic/headerctrlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_infobar.o: ../../src/generic/infobar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_listbkg.o: ../../src/generic/listbkg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_logg.o: ../../src/generic/logg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_markuptext.o: ../../src/generic/markuptext.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_msgdlgg.o: ../../src/generic/msgdlgg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_numdlgg.o: ../../src/generic/numdlgg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_progdlgg.o: ../../src/generic/progdlgg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_preferencesg.o: ../../src/generic/preferencesg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_printps.o: ../../src/generic/printps.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_renderg.o: ../../src/generic/renderg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_richmsgdlgg.o: ../../src/generic/richmsgdlgg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_scrlwing.o: ../../src/generic/scrlwing.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_selstore.o: ../../src/generic/selstore.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_spinctlg.o: ../../src/generic/spinctlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_splitter.o: ../../src/generic/splitter.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_srchctlg.o: ../../src/generic/srchctlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_statbmpg.o: ../../src/generic/statbmpg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_stattextg.o: ../../src/generic/stattextg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_textdlgg.o: ../../src/generic/textdlgg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_tipwin.o: ../../src/generic/tipwin.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_toolbkg.o: ../../src/generic/toolbkg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_treectlg.o: ../../src/generic/treectlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_treebkg.o: ../../src/generic/treebkg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_vlbox.o: ../../src/generic/vlbox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_vscroll.o: ../../src/generic/vscroll.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_animatecmn.o: ../../src/common/animatecmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_datavcmn.o: ../../src/common/datavcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_gridcmn.o: ../../src/common/gridcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_odcombocmn.o: ../../src/common/odcombocmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_bannerwindow.o: ../../src/generic/bannerwindow.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_calctrlg.o: ../../src/generic/calctrlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_commandlinkbuttong.o: ../../src/generic/commandlinkbuttong.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_datavgen.o: ../../src/generic/datavgen.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_datectlg.o: ../../src/generic/datectlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_editlbox.o: ../../src/generic/editlbox.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_grid.o: ../../src/generic/grid.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_gridctrl.o: ../../src/generic/gridctrl.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_grideditors.o: ../../src/generic/grideditors.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_gridsel.o: ../../src/generic/gridsel.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_helpext.o: ../../src/generic/helpext.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_hyperlinkg.o: ../../src/generic/hyperlinkg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_laywin.o: ../../src/generic/laywin.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_notifmsgg.o: ../../src/generic/notifmsgg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_odcombo.o: ../../src/generic/odcombo.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_propdlg.o: ../../src/generic/propdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_richtooltipg.o: ../../src/generic/richtooltipg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_sashwin.o: ../../src/generic/sashwin.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_splash.o: ../../src/generic/splash.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_timectrlg.o: ../../src/generic/timectrlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_tipdlg.o: ../../src/generic/tipdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_treelist.o: ../../src/generic/treelist.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_wizard.o: ../../src/generic/wizard.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_aboutdlg.o: ../../src/msw/aboutdlg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_notifmsg.o: ../../src/msw/notifmsg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_richtooltip.o: ../../src/msw/richtooltip.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_sound.o: ../../src/msw/sound.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_taskbar.o: ../../src/msw/taskbar.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_joystick.o: ../../src/msw/joystick.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\monolib_animateg.o: ../../src/generic/animateg.cpp - $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< -endif - -$(OBJS)\basedll_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define wxUSE_GUI=0 --define WXMAKINGDLL_BASE --define wxUSE_BASE=1 - -$(OBJS)\basedll_any.o: ../../src/common/any.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_appbase.o: ../../src/common/appbase.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_arcall.o: ../../src/common/arcall.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_arcfind.o: ../../src/common/arcfind.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_archive.o: ../../src/common/archive.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_arrstr.o: ../../src/common/arrstr.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_base64.o: ../../src/common/base64.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_clntdata.o: ../../src/common/clntdata.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_cmdline.o: ../../src/common/cmdline.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_config.o: ../../src/common/config.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_convauto.o: ../../src/common/convauto.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_datetime.o: ../../src/common/datetime.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_datetimefmt.o: ../../src/common/datetimefmt.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_datstrm.o: ../../src/common/datstrm.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_dircmn.o: ../../src/common/dircmn.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_dynarray.o: ../../src/common/dynarray.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_dynlib.o: ../../src/common/dynlib.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_dynload.o: ../../src/common/dynload.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_encconv.o: ../../src/common/encconv.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_evtloopcmn.o: ../../src/common/evtloopcmn.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_extended.o: ../../src/common/extended.c - $(CC) -c -o $@ $(BASEDLL_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_ffile.o: ../../src/common/ffile.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_file.o: ../../src/common/file.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_fileback.o: ../../src/common/fileback.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_fileconf.o: ../../src/common/fileconf.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_filefn.o: ../../src/common/filefn.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_filename.o: ../../src/common/filename.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_filesys.o: ../../src/common/filesys.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_filtall.o: ../../src/common/filtall.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_filtfind.o: ../../src/common/filtfind.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_fmapbase.o: ../../src/common/fmapbase.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_fs_arc.o: ../../src/common/fs_arc.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_fs_filter.o: ../../src/common/fs_filter.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_hash.o: ../../src/common/hash.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_hashmap.o: ../../src/common/hashmap.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_init.o: ../../src/common/init.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_intl.o: ../../src/common/intl.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_ipcbase.o: ../../src/common/ipcbase.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_languageinfo.o: ../../src/common/languageinfo.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_list.o: ../../src/common/list.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_log.o: ../../src/common/log.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_longlong.o: ../../src/common/longlong.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_memory.o: ../../src/common/memory.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_mimecmn.o: ../../src/common/mimecmn.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_module.o: ../../src/common/module.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_mstream.o: ../../src/common/mstream.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_numformatter.o: ../../src/common/numformatter.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_object.o: ../../src/common/object.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_platinfo.o: ../../src/common/platinfo.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_powercmn.o: ../../src/common/powercmn.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_process.o: ../../src/common/process.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_regex.o: ../../src/common/regex.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_stdpbase.o: ../../src/common/stdpbase.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_sstream.o: ../../src/common/sstream.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_stdstream.o: ../../src/common/stdstream.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_stopwatch.o: ../../src/common/stopwatch.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_strconv.o: ../../src/common/strconv.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_stream.o: ../../src/common/stream.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_string.o: ../../src/common/string.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_stringimpl.o: ../../src/common/stringimpl.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_stringops.o: ../../src/common/stringops.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_strvararg.o: ../../src/common/strvararg.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_sysopt.o: ../../src/common/sysopt.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_tarstrm.o: ../../src/common/tarstrm.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_textbuf.o: ../../src/common/textbuf.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_textfile.o: ../../src/common/textfile.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_threadinfo.o: ../../src/common/threadinfo.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_time.o: ../../src/common/time.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_timercmn.o: ../../src/common/timercmn.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_timerimpl.o: ../../src/common/timerimpl.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_tokenzr.o: ../../src/common/tokenzr.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_translation.o: ../../src/common/translation.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_txtstrm.o: ../../src/common/txtstrm.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_unichar.o: ../../src/common/unichar.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_uri.o: ../../src/common/uri.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_ustring.o: ../../src/common/ustring.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_variant.o: ../../src/common/variant.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_wfstream.o: ../../src/common/wfstream.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_wxcrt.o: ../../src/common/wxcrt.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_wxprintf.o: ../../src/common/wxprintf.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_xlocale.o: ../../src/common/xlocale.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_xti.o: ../../src/common/xti.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_xtistrm.o: ../../src/common/xtistrm.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_zipstrm.o: ../../src/common/zipstrm.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_zstream.o: ../../src/common/zstream.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_fswatchercmn.o: ../../src/common/fswatchercmn.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_fswatcherg.o: ../../src/generic/fswatcherg.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_basemsw.o: ../../src/msw/basemsw.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_crashrpt.o: ../../src/msw/crashrpt.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_debughlp.o: ../../src/msw/debughlp.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_dde.o: ../../src/msw/dde.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_dir.o: ../../src/msw/dir.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_dlmsw.o: ../../src/msw/dlmsw.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_evtloopconsole.o: ../../src/msw/evtloopconsole.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_mimetype.o: ../../src/msw/mimetype.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_power.o: ../../src/msw/power.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_regconf.o: ../../src/msw/regconf.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_registry.o: ../../src/msw/registry.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_snglinst.o: ../../src/msw/snglinst.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_stackwalk.o: ../../src/msw/stackwalk.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_stdpaths.o: ../../src/msw/stdpaths.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_thread.o: ../../src/msw/thread.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_timer.o: ../../src/msw/timer.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_utils.o: ../../src/msw/utils.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_utilsexc.o: ../../src/msw/utilsexc.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_fswatcher.o: ../../src/msw/fswatcher.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_event.o: ../../src/common/event.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_fs_mem.o: ../../src/common/fs_mem.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_msgout.o: ../../src/common/msgout.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_utilscmn.o: ../../src/common/utilscmn.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_main.o: ../../src/msw/main.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_mslu.o: ../../src/msw/mslu.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\basedll_volume.o: ../../src/msw/volume.cpp - $(CXX) -c -o $@ $(BASEDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_any.o: ../../src/common/any.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_appbase.o: ../../src/common/appbase.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_arcall.o: ../../src/common/arcall.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_arcfind.o: ../../src/common/arcfind.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_archive.o: ../../src/common/archive.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_arrstr.o: ../../src/common/arrstr.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_base64.o: ../../src/common/base64.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_clntdata.o: ../../src/common/clntdata.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_cmdline.o: ../../src/common/cmdline.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_config.o: ../../src/common/config.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_convauto.o: ../../src/common/convauto.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_datetime.o: ../../src/common/datetime.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_datetimefmt.o: ../../src/common/datetimefmt.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_datstrm.o: ../../src/common/datstrm.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_dircmn.o: ../../src/common/dircmn.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_dynarray.o: ../../src/common/dynarray.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_dynlib.o: ../../src/common/dynlib.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_dynload.o: ../../src/common/dynload.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_encconv.o: ../../src/common/encconv.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_evtloopcmn.o: ../../src/common/evtloopcmn.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_extended.o: ../../src/common/extended.c - $(CC) -c -o $@ $(BASELIB_CFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_ffile.o: ../../src/common/ffile.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_file.o: ../../src/common/file.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_fileback.o: ../../src/common/fileback.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_fileconf.o: ../../src/common/fileconf.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_filefn.o: ../../src/common/filefn.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_filename.o: ../../src/common/filename.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_filesys.o: ../../src/common/filesys.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_filtall.o: ../../src/common/filtall.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_filtfind.o: ../../src/common/filtfind.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_fmapbase.o: ../../src/common/fmapbase.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_fs_arc.o: ../../src/common/fs_arc.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_fs_filter.o: ../../src/common/fs_filter.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_hash.o: ../../src/common/hash.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_hashmap.o: ../../src/common/hashmap.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_init.o: ../../src/common/init.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_intl.o: ../../src/common/intl.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_ipcbase.o: ../../src/common/ipcbase.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_languageinfo.o: ../../src/common/languageinfo.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_list.o: ../../src/common/list.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_log.o: ../../src/common/log.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_longlong.o: ../../src/common/longlong.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_memory.o: ../../src/common/memory.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_mimecmn.o: ../../src/common/mimecmn.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_module.o: ../../src/common/module.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_mstream.o: ../../src/common/mstream.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_numformatter.o: ../../src/common/numformatter.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_object.o: ../../src/common/object.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_platinfo.o: ../../src/common/platinfo.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_powercmn.o: ../../src/common/powercmn.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_process.o: ../../src/common/process.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_regex.o: ../../src/common/regex.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_stdpbase.o: ../../src/common/stdpbase.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_sstream.o: ../../src/common/sstream.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_stdstream.o: ../../src/common/stdstream.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_stopwatch.o: ../../src/common/stopwatch.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_strconv.o: ../../src/common/strconv.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_stream.o: ../../src/common/stream.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_string.o: ../../src/common/string.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_stringimpl.o: ../../src/common/stringimpl.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_stringops.o: ../../src/common/stringops.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_strvararg.o: ../../src/common/strvararg.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_sysopt.o: ../../src/common/sysopt.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_tarstrm.o: ../../src/common/tarstrm.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_textbuf.o: ../../src/common/textbuf.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_textfile.o: ../../src/common/textfile.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_threadinfo.o: ../../src/common/threadinfo.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_time.o: ../../src/common/time.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_timercmn.o: ../../src/common/timercmn.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_timerimpl.o: ../../src/common/timerimpl.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_tokenzr.o: ../../src/common/tokenzr.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_translation.o: ../../src/common/translation.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_txtstrm.o: ../../src/common/txtstrm.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_unichar.o: ../../src/common/unichar.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_uri.o: ../../src/common/uri.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_ustring.o: ../../src/common/ustring.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_variant.o: ../../src/common/variant.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_wfstream.o: ../../src/common/wfstream.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_wxcrt.o: ../../src/common/wxcrt.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_wxprintf.o: ../../src/common/wxprintf.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_xlocale.o: ../../src/common/xlocale.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_xti.o: ../../src/common/xti.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_xtistrm.o: ../../src/common/xtistrm.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_zipstrm.o: ../../src/common/zipstrm.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_zstream.o: ../../src/common/zstream.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_fswatchercmn.o: ../../src/common/fswatchercmn.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_fswatcherg.o: ../../src/generic/fswatcherg.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_basemsw.o: ../../src/msw/basemsw.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_crashrpt.o: ../../src/msw/crashrpt.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_debughlp.o: ../../src/msw/debughlp.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_dde.o: ../../src/msw/dde.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_dir.o: ../../src/msw/dir.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_dlmsw.o: ../../src/msw/dlmsw.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_evtloopconsole.o: ../../src/msw/evtloopconsole.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_mimetype.o: ../../src/msw/mimetype.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_power.o: ../../src/msw/power.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_regconf.o: ../../src/msw/regconf.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_registry.o: ../../src/msw/registry.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_snglinst.o: ../../src/msw/snglinst.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_stackwalk.o: ../../src/msw/stackwalk.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_stdpaths.o: ../../src/msw/stdpaths.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_thread.o: ../../src/msw/thread.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_timer.o: ../../src/msw/timer.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_utils.o: ../../src/msw/utils.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_utilsexc.o: ../../src/msw/utilsexc.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_fswatcher.o: ../../src/msw/fswatcher.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_event.o: ../../src/common/event.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_fs_mem.o: ../../src/common/fs_mem.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_msgout.o: ../../src/common/msgout.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_utilscmn.o: ../../src/common/utilscmn.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_main.o: ../../src/msw/main.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_mslu.o: ../../src/msw/mslu.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\baselib_volume.o: ../../src/msw/volume.cpp - $(CXX) -c -o $@ $(BASELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netdll_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netdll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_NET - -$(OBJS)\netdll_fs_inet.o: ../../src/common/fs_inet.cpp - $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netdll_ftp.o: ../../src/common/ftp.cpp - $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netdll_http.o: ../../src/common/http.cpp - $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netdll_protocol.o: ../../src/common/protocol.cpp - $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netdll_sckaddr.o: ../../src/common/sckaddr.cpp - $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netdll_sckfile.o: ../../src/common/sckfile.cpp - $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netdll_sckipc.o: ../../src/common/sckipc.cpp - $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netdll_sckstrm.o: ../../src/common/sckstrm.cpp - $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netdll_socket.o: ../../src/common/socket.cpp - $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netdll_url.o: ../../src/common/url.cpp - $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netdll_sockmsw.o: ../../src/msw/sockmsw.cpp - $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netdll_urlmsw.o: ../../src/msw/urlmsw.cpp - $(CXX) -c -o $@ $(NETDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netlib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netlib_fs_inet.o: ../../src/common/fs_inet.cpp - $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netlib_ftp.o: ../../src/common/ftp.cpp - $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netlib_http.o: ../../src/common/http.cpp - $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netlib_protocol.o: ../../src/common/protocol.cpp - $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netlib_sckaddr.o: ../../src/common/sckaddr.cpp - $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netlib_sckfile.o: ../../src/common/sckfile.cpp - $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netlib_sckipc.o: ../../src/common/sckipc.cpp - $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netlib_sckstrm.o: ../../src/common/sckstrm.cpp - $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netlib_socket.o: ../../src/common/socket.cpp - $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netlib_url.o: ../../src/common/url.cpp - $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netlib_sockmsw.o: ../../src/msw/sockmsw.cpp - $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\netlib_urlmsw.o: ../../src/msw/urlmsw.cpp - $(CXX) -c -o $@ $(NETLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_CORE --define wxUSE_BASE=0 - -$(OBJS)\coredll_event.o: ../../src/common/event.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_fs_mem.o: ../../src/common/fs_mem.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msgout.o: ../../src/common/msgout.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_utilscmn.o: ../../src/common/utilscmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_main.o: ../../src/msw/main.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_mslu.o: ../../src/msw/mslu.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_volume.o: ../../src/msw/volume.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_generic_statusbr.o: ../../src/generic/statusbr.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_accel.o: ../../src/msw/accel.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_anybutton.o: ../../src/msw/anybutton.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_artmsw.o: ../../src/msw/artmsw.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_bmpbuttn.o: ../../src/msw/bmpbuttn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_button.o: ../../src/msw/button.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_checkbox.o: ../../src/msw/checkbox.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_choice.o: ../../src/msw/choice.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_colordlg.o: ../../src/msw/colordlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_combo.o: ../../src/msw/combo.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_combobox.o: ../../src/msw/combobox.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_control.o: ../../src/msw/control.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_dialog.o: ../../src/msw/dialog.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_dirdlg.o: ../../src/msw/dirdlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_dragimag.o: ../../src/msw/dragimag.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_filedlg.o: ../../src/msw/filedlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_frame.o: ../../src/msw/frame.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_gauge.o: ../../src/msw/gauge.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_headerctrl.o: ../../src/msw/headerctrl.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_iniconf.o: ../../src/msw/iniconf.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_listbox.o: ../../src/msw/listbox.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_listctrl.o: ../../src/msw/listctrl.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_mdi.o: ../../src/msw/mdi.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_menu.o: ../../src/msw/menu.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_menuitem.o: ../../src/msw/menuitem.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_metafile.o: ../../src/msw/metafile.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msgdlg.o: ../../src/msw/msgdlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_nativdlg.o: ../../src/msw/nativdlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_nativewin.o: ../../src/msw/nativewin.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_notebook.o: ../../src/msw/notebook.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_access.o: ../../src/msw/ole/access.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_ownerdrw.o: ../../src/msw/ownerdrw.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_panel.o: ../../src/msw/panel.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_progdlg.o: ../../src/msw/progdlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_radiobox.o: ../../src/msw/radiobox.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_radiobut.o: ../../src/msw/radiobut.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_richmsgdlg.o: ../../src/msw/richmsgdlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_scrolbar.o: ../../src/msw/scrolbar.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_slider.o: ../../src/msw/slider.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_spinbutt.o: ../../src/msw/spinbutt.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_spinctrl.o: ../../src/msw/spinctrl.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_statbmp.o: ../../src/msw/statbmp.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_statbox.o: ../../src/msw/statbox.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_statusbar.o: ../../src/msw/statusbar.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_statline.o: ../../src/msw/statline.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_stattext.o: ../../src/msw/stattext.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_toolbar.o: ../../src/msw/toolbar.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_textctrl.o: ../../src/msw/textctrl.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_textentry.o: ../../src/msw/textentry.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_tglbtn.o: ../../src/msw/tglbtn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_treectrl.o: ../../src/msw/treectrl.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_checklst.o: ../../src/msw/checklst.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_msw_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_fontdlg.o: ../../src/msw/fontdlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_generic_accel.o: ../../src/generic/accel.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_colrdlgg.o: ../../src/generic/colrdlgg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_dirdlgg.o: ../../src/generic/dirdlgg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_generic_fdrepdlg.o: ../../src/generic/fdrepdlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_filedlgg.o: ../../src/generic/filedlgg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_fontdlgg.o: ../../src/generic/fontdlgg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_generic_listctrl.o: ../../src/generic/listctrl.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_mdig.o: ../../src/generic/mdig.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_bmpbuttn.o: ../../src/univ/bmpbuttn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_button.o: ../../src/univ/button.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_checkbox.o: ../../src/univ/checkbox.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_checklst.o: ../../src/univ/checklst.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_choice.o: ../../src/univ/choice.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_combobox.o: ../../src/univ/combobox.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_control.o: ../../src/univ/control.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_ctrlrend.o: ../../src/univ/ctrlrend.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_dialog.o: ../../src/univ/dialog.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_framuniv.o: ../../src/univ/framuniv.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_gauge.o: ../../src/univ/gauge.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_inpcons.o: ../../src/univ/inpcons.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_inphand.o: ../../src/univ/inphand.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_listbox.o: ../../src/univ/listbox.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_menu.o: ../../src/univ/menu.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_notebook.o: ../../src/univ/notebook.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_radiobox.o: ../../src/univ/radiobox.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_radiobut.o: ../../src/univ/radiobut.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_scrarrow.o: ../../src/univ/scrarrow.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_scrolbar.o: ../../src/univ/scrolbar.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_scrthumb.o: ../../src/univ/scrthumb.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_settingsuniv.o: ../../src/univ/settingsuniv.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_slider.o: ../../src/univ/slider.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_spinbutt.o: ../../src/univ/spinbutt.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_statbmp.o: ../../src/univ/statbmp.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_statbox.o: ../../src/univ/statbox.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_statline.o: ../../src/univ/statline.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_stattext.o: ../../src/univ/stattext.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_statusbr.o: ../../src/univ/statusbr.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_stdrend.o: ../../src/univ/stdrend.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_textctrl.o: ../../src/univ/textctrl.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_tglbtn.o: ../../src/univ/tglbtn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_theme.o: ../../src/univ/theme.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_univ_toolbar.o: ../../src/univ/toolbar.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_topluniv.o: ../../src/univ/topluniv.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_winuniv.o: ../../src/univ/winuniv.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_gtk.o: ../../src/univ/themes/gtk.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_metal.o: ../../src/univ/themes/metal.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_mono.o: ../../src/univ/themes/mono.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\coredll_win32.o: ../../src/univ/themes/win32.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_activex.o: ../../src/msw/ole/activex.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_app.o: ../../src/msw/app.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_bitmap.o: ../../src/msw/bitmap.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_brush.o: ../../src/msw/brush.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_caret.o: ../../src/msw/caret.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_clipbrd.o: ../../src/msw/clipbrd.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_colour.o: ../../src/msw/colour.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_cursor.o: ../../src/msw/cursor.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_data.o: ../../src/msw/data.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dc.o: ../../src/msw/dc.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dcclient.o: ../../src/msw/dcclient.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dcmemory.o: ../../src/msw/dcmemory.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dcprint.o: ../../src/msw/dcprint.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dcscreen.o: ../../src/msw/dcscreen.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dialup.o: ../../src/msw/dialup.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dib.o: ../../src/msw/dib.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_display.o: ../../src/msw/display.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_enhmeta.o: ../../src/msw/enhmeta.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_font.o: ../../src/msw/font.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_fontenum.o: ../../src/msw/fontenum.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_fontutil.o: ../../src/msw/fontutil.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_gdiimage.o: ../../src/msw/gdiimage.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_gdiobj.o: ../../src/msw/gdiobj.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_gdiplus.o: ../../src/msw/gdiplus.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_graphics.o: ../../src/msw/graphics.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_icon.o: ../../src/msw/icon.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_imaglist.o: ../../src/msw/imaglist.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_minifram.o: ../../src/msw/minifram.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dataobj.o: ../../src/msw/ole/dataobj.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dropsrc.o: ../../src/msw/ole/dropsrc.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_droptgt.o: ../../src/msw/ole/droptgt.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_oleutils.o: ../../src/msw/ole/oleutils.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_safearray.o: ../../src/msw/ole/safearray.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_palette.o: ../../src/msw/palette.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_pen.o: ../../src/msw/pen.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_popupwin.o: ../../src/msw/popupwin.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_printdlg.o: ../../src/msw/printdlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_printwin.o: ../../src/msw/printwin.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_region.o: ../../src/msw/region.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_renderer.o: ../../src/msw/renderer.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_settings.o: ../../src/msw/settings.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_textmeasure.o: ../../src/msw/textmeasure.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_tooltip.o: ../../src/msw/tooltip.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_toplevel.o: ../../src/msw/toplevel.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_uiaction.o: ../../src/msw/uiaction.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_utilsgui.o: ../../src/msw/utilsgui.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_utilswin.o: ../../src/msw/utilswin.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_uxtheme.o: ../../src/msw/uxtheme.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_window.o: ../../src/msw/window.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_helpchm.o: ../../src/msw/helpchm.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_helpwin.o: ../../src/msw/helpwin.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_automtn.o: ../../src/msw/ole/automtn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_uuid.o: ../../src/msw/ole/uuid.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_clrpickerg.o: ../../src/generic/clrpickerg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_collpaneg.o: ../../src/generic/collpaneg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_filepickerg.o: ../../src/generic/filepickerg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_fontpickerg.o: ../../src/generic/fontpickerg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_prntdlgg.o: ../../src/generic/prntdlgg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_evtloop.o: ../../src/msw/evtloop.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_accelcmn.o: ../../src/common/accelcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_accesscmn.o: ../../src/common/accesscmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_anidecod.o: ../../src/common/anidecod.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_affinematrix2d.o: ../../src/common/affinematrix2d.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_appcmn.o: ../../src/common/appcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_artprov.o: ../../src/common/artprov.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_artstd.o: ../../src/common/artstd.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_arttango.o: ../../src/common/arttango.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_bmpbase.o: ../../src/common/bmpbase.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_bmpbtncmn.o: ../../src/common/bmpbtncmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_bookctrl.o: ../../src/common/bookctrl.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_btncmn.o: ../../src/common/btncmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_cairo.o: ../../src/common/cairo.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_checkboxcmn.o: ../../src/common/checkboxcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_checklstcmn.o: ../../src/common/checklstcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_choiccmn.o: ../../src/common/choiccmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_clipcmn.o: ../../src/common/clipcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_clrpickercmn.o: ../../src/common/clrpickercmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_colourcmn.o: ../../src/common/colourcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_colourdata.o: ../../src/common/colourdata.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_combocmn.o: ../../src/common/combocmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_cmdproc.o: ../../src/common/cmdproc.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_cmndata.o: ../../src/common/cmndata.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_containr.o: ../../src/common/containr.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_cshelp.o: ../../src/common/cshelp.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_ctrlcmn.o: ../../src/common/ctrlcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_ctrlsub.o: ../../src/common/ctrlsub.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dcbase.o: ../../src/common/dcbase.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dcbufcmn.o: ../../src/common/dcbufcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dcgraph.o: ../../src/common/dcgraph.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dcsvg.o: ../../src/common/dcsvg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dirctrlcmn.o: ../../src/common/dirctrlcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dlgcmn.o: ../../src/common/dlgcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dndcmn.o: ../../src/common/dndcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dobjcmn.o: ../../src/common/dobjcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_docmdi.o: ../../src/common/docmdi.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_docview.o: ../../src/common/docview.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dpycmn.o: ../../src/common/dpycmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dseldlg.o: ../../src/common/dseldlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_effects.o: ../../src/common/effects.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_fddlgcmn.o: ../../src/common/fddlgcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_filectrlcmn.o: ../../src/common/filectrlcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_filehistorycmn.o: ../../src/common/filehistorycmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_filepickercmn.o: ../../src/common/filepickercmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_fontpickercmn.o: ../../src/common/fontpickercmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_fldlgcmn.o: ../../src/common/fldlgcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_fontcmn.o: ../../src/common/fontcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_fontdata.o: ../../src/common/fontdata.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_graphicc.o: ../../src/generic/graphicc.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_fontenumcmn.o: ../../src/common/fontenumcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_fontmap.o: ../../src/common/fontmap.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_fontutilcmn.o: ../../src/common/fontutilcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_framecmn.o: ../../src/common/framecmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_gaugecmn.o: ../../src/common/gaugecmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_gbsizer.o: ../../src/common/gbsizer.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_gdicmn.o: ../../src/common/gdicmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_geometry.o: ../../src/common/geometry.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_gifdecod.o: ../../src/common/gifdecod.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_graphcmn.o: ../../src/common/graphcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_headercolcmn.o: ../../src/common/headercolcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_headerctrlcmn.o: ../../src/common/headerctrlcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_helpbase.o: ../../src/common/helpbase.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_iconbndl.o: ../../src/common/iconbndl.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_imagall.o: ../../src/common/imagall.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_imagbmp.o: ../../src/common/imagbmp.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_image.o: ../../src/common/image.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_imagfill.o: ../../src/common/imagfill.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_imaggif.o: ../../src/common/imaggif.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_imagiff.o: ../../src/common/imagiff.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_imagjpeg.o: ../../src/common/imagjpeg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_imagpcx.o: ../../src/common/imagpcx.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_imagpng.o: ../../src/common/imagpng.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_imagpnm.o: ../../src/common/imagpnm.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_imagtga.o: ../../src/common/imagtga.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_imagtiff.o: ../../src/common/imagtiff.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_imagxpm.o: ../../src/common/imagxpm.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_layout.o: ../../src/common/layout.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_lboxcmn.o: ../../src/common/lboxcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_listctrlcmn.o: ../../src/common/listctrlcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_markupparser.o: ../../src/common/markupparser.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_matrix.o: ../../src/common/matrix.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_menucmn.o: ../../src/common/menucmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_modalhook.o: ../../src/common/modalhook.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_mousemanager.o: ../../src/common/mousemanager.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_nbkbase.o: ../../src/common/nbkbase.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_overlaycmn.o: ../../src/common/overlaycmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_paper.o: ../../src/common/paper.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_panelcmn.o: ../../src/common/panelcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_persist.o: ../../src/common/persist.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_pickerbase.o: ../../src/common/pickerbase.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_popupcmn.o: ../../src/common/popupcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_preferencescmn.o: ../../src/common/preferencescmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_prntbase.o: ../../src/common/prntbase.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_quantize.o: ../../src/common/quantize.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_radiobtncmn.o: ../../src/common/radiobtncmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_radiocmn.o: ../../src/common/radiocmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_rearrangectrl.o: ../../src/common/rearrangectrl.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_rendcmn.o: ../../src/common/rendcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_rgncmn.o: ../../src/common/rgncmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_scrolbarcmn.o: ../../src/common/scrolbarcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_settcmn.o: ../../src/common/settcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_sizer.o: ../../src/common/sizer.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_slidercmn.o: ../../src/common/slidercmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_spinbtncmn.o: ../../src/common/spinbtncmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_spinctrlcmn.o: ../../src/common/spinctrlcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_srchcmn.o: ../../src/common/srchcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_statbar.o: ../../src/common/statbar.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_statbmpcmn.o: ../../src/common/statbmpcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_statboxcmn.o: ../../src/common/statboxcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_statlinecmn.o: ../../src/common/statlinecmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_stattextcmn.o: ../../src/common/stattextcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_stockitem.o: ../../src/common/stockitem.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_tbarbase.o: ../../src/common/tbarbase.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_textcmn.o: ../../src/common/textcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_textentrycmn.o: ../../src/common/textentrycmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_toplvcmn.o: ../../src/common/toplvcmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_treebase.o: ../../src/common/treebase.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_uiactioncmn.o: ../../src/common/uiactioncmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_valgen.o: ../../src/common/valgen.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_validate.o: ../../src/common/validate.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_valtext.o: ../../src/common/valtext.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_valnum.o: ../../src/common/valnum.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_wincmn.o: ../../src/common/wincmn.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_windowid.o: ../../src/common/windowid.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_wrapsizer.o: ../../src/common/wrapsizer.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_xpmdecod.o: ../../src/common/xpmdecod.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_busyinfo.o: ../../src/generic/busyinfo.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_buttonbar.o: ../../src/generic/buttonbar.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_choicdgg.o: ../../src/generic/choicdgg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_choicbkg.o: ../../src/generic/choicbkg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_combog.o: ../../src/generic/combog.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dcpsg.o: ../../src/generic/dcpsg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dirctrlg.o: ../../src/generic/dirctrlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_dragimgg.o: ../../src/generic/dragimgg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_filectrlg.o: ../../src/generic/filectrlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_headerctrlg.o: ../../src/generic/headerctrlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_infobar.o: ../../src/generic/infobar.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_listbkg.o: ../../src/generic/listbkg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_logg.o: ../../src/generic/logg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_markuptext.o: ../../src/generic/markuptext.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_msgdlgg.o: ../../src/generic/msgdlgg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_numdlgg.o: ../../src/generic/numdlgg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_progdlgg.o: ../../src/generic/progdlgg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_preferencesg.o: ../../src/generic/preferencesg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_printps.o: ../../src/generic/printps.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_renderg.o: ../../src/generic/renderg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_richmsgdlgg.o: ../../src/generic/richmsgdlgg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_scrlwing.o: ../../src/generic/scrlwing.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_selstore.o: ../../src/generic/selstore.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_spinctlg.o: ../../src/generic/spinctlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_splitter.o: ../../src/generic/splitter.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_srchctlg.o: ../../src/generic/srchctlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_statbmpg.o: ../../src/generic/statbmpg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_stattextg.o: ../../src/generic/stattextg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_textdlgg.o: ../../src/generic/textdlgg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_tipwin.o: ../../src/generic/tipwin.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_toolbkg.o: ../../src/generic/toolbkg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_treectlg.o: ../../src/generic/treectlg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_treebkg.o: ../../src/generic/treebkg.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_vlbox.o: ../../src/generic/vlbox.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_vscroll.o: ../../src/generic/vscroll.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\coredll_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp - $(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $< -endif - -$(OBJS)\corelib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_event.o: ../../src/common/event.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_fs_mem.o: ../../src/common/fs_mem.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msgout.o: ../../src/common/msgout.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_utilscmn.o: ../../src/common/utilscmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_main.o: ../../src/msw/main.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_mslu.o: ../../src/msw/mslu.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_volume.o: ../../src/msw/volume.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_generic_statusbr.o: ../../src/generic/statusbr.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_accel.o: ../../src/msw/accel.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_anybutton.o: ../../src/msw/anybutton.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_artmsw.o: ../../src/msw/artmsw.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_bmpbuttn.o: ../../src/msw/bmpbuttn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_button.o: ../../src/msw/button.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_checkbox.o: ../../src/msw/checkbox.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_choice.o: ../../src/msw/choice.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_colordlg.o: ../../src/msw/colordlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_combo.o: ../../src/msw/combo.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_combobox.o: ../../src/msw/combobox.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_control.o: ../../src/msw/control.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_dialog.o: ../../src/msw/dialog.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_dirdlg.o: ../../src/msw/dirdlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_dragimag.o: ../../src/msw/dragimag.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_filedlg.o: ../../src/msw/filedlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_frame.o: ../../src/msw/frame.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_gauge.o: ../../src/msw/gauge.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_headerctrl.o: ../../src/msw/headerctrl.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_iniconf.o: ../../src/msw/iniconf.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_listbox.o: ../../src/msw/listbox.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_listctrl.o: ../../src/msw/listctrl.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_mdi.o: ../../src/msw/mdi.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_menu.o: ../../src/msw/menu.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_menuitem.o: ../../src/msw/menuitem.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_metafile.o: ../../src/msw/metafile.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msgdlg.o: ../../src/msw/msgdlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_nativdlg.o: ../../src/msw/nativdlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_nativewin.o: ../../src/msw/nativewin.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_notebook.o: ../../src/msw/notebook.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_access.o: ../../src/msw/ole/access.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_ownerdrw.o: ../../src/msw/ownerdrw.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_panel.o: ../../src/msw/panel.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_progdlg.o: ../../src/msw/progdlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_radiobox.o: ../../src/msw/radiobox.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_radiobut.o: ../../src/msw/radiobut.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_richmsgdlg.o: ../../src/msw/richmsgdlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_scrolbar.o: ../../src/msw/scrolbar.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_slider.o: ../../src/msw/slider.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_spinbutt.o: ../../src/msw/spinbutt.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_spinctrl.o: ../../src/msw/spinctrl.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_statbmp.o: ../../src/msw/statbmp.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_statbox.o: ../../src/msw/statbox.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_statusbar.o: ../../src/msw/statusbar.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_statline.o: ../../src/msw/statline.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_stattext.o: ../../src/msw/stattext.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_toolbar.o: ../../src/msw/toolbar.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_textctrl.o: ../../src/msw/textctrl.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_textentry.o: ../../src/msw/textentry.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_tglbtn.o: ../../src/msw/tglbtn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_treectrl.o: ../../src/msw/treectrl.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_checklst.o: ../../src/msw/checklst.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_msw_fdrepdlg.o: ../../src/msw/fdrepdlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_fontdlg.o: ../../src/msw/fontdlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_generic_accel.o: ../../src/generic/accel.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_colrdlgg.o: ../../src/generic/colrdlgg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_dirdlgg.o: ../../src/generic/dirdlgg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_generic_fdrepdlg.o: ../../src/generic/fdrepdlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_filedlgg.o: ../../src/generic/filedlgg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_fontdlgg.o: ../../src/generic/fontdlgg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_generic_listctrl.o: ../../src/generic/listctrl.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_mdig.o: ../../src/generic/mdig.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_bmpbuttn.o: ../../src/univ/bmpbuttn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_button.o: ../../src/univ/button.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_checkbox.o: ../../src/univ/checkbox.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_checklst.o: ../../src/univ/checklst.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_choice.o: ../../src/univ/choice.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_combobox.o: ../../src/univ/combobox.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_control.o: ../../src/univ/control.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_ctrlrend.o: ../../src/univ/ctrlrend.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_dialog.o: ../../src/univ/dialog.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_framuniv.o: ../../src/univ/framuniv.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_gauge.o: ../../src/univ/gauge.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_inpcons.o: ../../src/univ/inpcons.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_inphand.o: ../../src/univ/inphand.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_listbox.o: ../../src/univ/listbox.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_menu.o: ../../src/univ/menu.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_notebook.o: ../../src/univ/notebook.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_radiobox.o: ../../src/univ/radiobox.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_radiobut.o: ../../src/univ/radiobut.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_scrarrow.o: ../../src/univ/scrarrow.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_scrolbar.o: ../../src/univ/scrolbar.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_scrthumb.o: ../../src/univ/scrthumb.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_settingsuniv.o: ../../src/univ/settingsuniv.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_slider.o: ../../src/univ/slider.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_spinbutt.o: ../../src/univ/spinbutt.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_statbmp.o: ../../src/univ/statbmp.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_statbox.o: ../../src/univ/statbox.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_statline.o: ../../src/univ/statline.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_stattext.o: ../../src/univ/stattext.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_statusbr.o: ../../src/univ/statusbr.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_stdrend.o: ../../src/univ/stdrend.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_textctrl.o: ../../src/univ/textctrl.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_tglbtn.o: ../../src/univ/tglbtn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_theme.o: ../../src/univ/theme.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_univ_toolbar.o: ../../src/univ/toolbar.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_topluniv.o: ../../src/univ/topluniv.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_winuniv.o: ../../src/univ/winuniv.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_gtk.o: ../../src/univ/themes/gtk.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_metal.o: ../../src/univ/themes/metal.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_mono.o: ../../src/univ/themes/mono.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\corelib_win32.o: ../../src/univ/themes/win32.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_activex.o: ../../src/msw/ole/activex.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_app.o: ../../src/msw/app.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_bitmap.o: ../../src/msw/bitmap.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_brush.o: ../../src/msw/brush.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_caret.o: ../../src/msw/caret.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_clipbrd.o: ../../src/msw/clipbrd.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_colour.o: ../../src/msw/colour.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_cursor.o: ../../src/msw/cursor.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_data.o: ../../src/msw/data.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dc.o: ../../src/msw/dc.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dcclient.o: ../../src/msw/dcclient.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dcmemory.o: ../../src/msw/dcmemory.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dcprint.o: ../../src/msw/dcprint.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dcscreen.o: ../../src/msw/dcscreen.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dialup.o: ../../src/msw/dialup.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dib.o: ../../src/msw/dib.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_display.o: ../../src/msw/display.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_enhmeta.o: ../../src/msw/enhmeta.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_font.o: ../../src/msw/font.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_fontenum.o: ../../src/msw/fontenum.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_fontutil.o: ../../src/msw/fontutil.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_gdiimage.o: ../../src/msw/gdiimage.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_gdiobj.o: ../../src/msw/gdiobj.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_gdiplus.o: ../../src/msw/gdiplus.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_graphics.o: ../../src/msw/graphics.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_icon.o: ../../src/msw/icon.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_imaglist.o: ../../src/msw/imaglist.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_minifram.o: ../../src/msw/minifram.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_nonownedwnd.o: ../../src/msw/nonownedwnd.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dataobj.o: ../../src/msw/ole/dataobj.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dropsrc.o: ../../src/msw/ole/dropsrc.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_droptgt.o: ../../src/msw/ole/droptgt.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_oleutils.o: ../../src/msw/ole/oleutils.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_safearray.o: ../../src/msw/ole/safearray.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_palette.o: ../../src/msw/palette.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_pen.o: ../../src/msw/pen.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_popupwin.o: ../../src/msw/popupwin.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_printdlg.o: ../../src/msw/printdlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_printwin.o: ../../src/msw/printwin.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_region.o: ../../src/msw/region.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_renderer.o: ../../src/msw/renderer.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_settings.o: ../../src/msw/settings.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_textmeasure.o: ../../src/msw/textmeasure.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_tooltip.o: ../../src/msw/tooltip.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_toplevel.o: ../../src/msw/toplevel.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_uiaction.o: ../../src/msw/uiaction.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_utilsgui.o: ../../src/msw/utilsgui.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_utilswin.o: ../../src/msw/utilswin.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_uxtheme.o: ../../src/msw/uxtheme.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_window.o: ../../src/msw/window.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_helpchm.o: ../../src/msw/helpchm.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_helpwin.o: ../../src/msw/helpwin.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_automtn.o: ../../src/msw/ole/automtn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_uuid.o: ../../src/msw/ole/uuid.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_clrpickerg.o: ../../src/generic/clrpickerg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_collpaneg.o: ../../src/generic/collpaneg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_filepickerg.o: ../../src/generic/filepickerg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_fontpickerg.o: ../../src/generic/fontpickerg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_prntdlgg.o: ../../src/generic/prntdlgg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_evtloop.o: ../../src/msw/evtloop.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_accelcmn.o: ../../src/common/accelcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_accesscmn.o: ../../src/common/accesscmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_anidecod.o: ../../src/common/anidecod.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_affinematrix2d.o: ../../src/common/affinematrix2d.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_appcmn.o: ../../src/common/appcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_artprov.o: ../../src/common/artprov.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_artstd.o: ../../src/common/artstd.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_arttango.o: ../../src/common/arttango.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_bmpbase.o: ../../src/common/bmpbase.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_bmpbtncmn.o: ../../src/common/bmpbtncmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_bookctrl.o: ../../src/common/bookctrl.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_btncmn.o: ../../src/common/btncmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_cairo.o: ../../src/common/cairo.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_checkboxcmn.o: ../../src/common/checkboxcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_checklstcmn.o: ../../src/common/checklstcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_choiccmn.o: ../../src/common/choiccmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_clipcmn.o: ../../src/common/clipcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_clrpickercmn.o: ../../src/common/clrpickercmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_colourcmn.o: ../../src/common/colourcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_colourdata.o: ../../src/common/colourdata.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_combocmn.o: ../../src/common/combocmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_cmdproc.o: ../../src/common/cmdproc.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_cmndata.o: ../../src/common/cmndata.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_containr.o: ../../src/common/containr.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_cshelp.o: ../../src/common/cshelp.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_ctrlcmn.o: ../../src/common/ctrlcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_ctrlsub.o: ../../src/common/ctrlsub.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dcbase.o: ../../src/common/dcbase.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dcbufcmn.o: ../../src/common/dcbufcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dcgraph.o: ../../src/common/dcgraph.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dcsvg.o: ../../src/common/dcsvg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dirctrlcmn.o: ../../src/common/dirctrlcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dlgcmn.o: ../../src/common/dlgcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dndcmn.o: ../../src/common/dndcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dobjcmn.o: ../../src/common/dobjcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_docmdi.o: ../../src/common/docmdi.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_docview.o: ../../src/common/docview.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dpycmn.o: ../../src/common/dpycmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dseldlg.o: ../../src/common/dseldlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_effects.o: ../../src/common/effects.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_fddlgcmn.o: ../../src/common/fddlgcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_filectrlcmn.o: ../../src/common/filectrlcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_filehistorycmn.o: ../../src/common/filehistorycmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_filepickercmn.o: ../../src/common/filepickercmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_fontpickercmn.o: ../../src/common/fontpickercmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_fldlgcmn.o: ../../src/common/fldlgcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_fontcmn.o: ../../src/common/fontcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_fontdata.o: ../../src/common/fontdata.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_graphicc.o: ../../src/generic/graphicc.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_fontenumcmn.o: ../../src/common/fontenumcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_fontmap.o: ../../src/common/fontmap.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_fontutilcmn.o: ../../src/common/fontutilcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_framecmn.o: ../../src/common/framecmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_gaugecmn.o: ../../src/common/gaugecmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_gbsizer.o: ../../src/common/gbsizer.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_gdicmn.o: ../../src/common/gdicmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_geometry.o: ../../src/common/geometry.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_gifdecod.o: ../../src/common/gifdecod.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_graphcmn.o: ../../src/common/graphcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_headercolcmn.o: ../../src/common/headercolcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_headerctrlcmn.o: ../../src/common/headerctrlcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_helpbase.o: ../../src/common/helpbase.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_iconbndl.o: ../../src/common/iconbndl.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_imagall.o: ../../src/common/imagall.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_imagbmp.o: ../../src/common/imagbmp.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_image.o: ../../src/common/image.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_imagfill.o: ../../src/common/imagfill.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_imaggif.o: ../../src/common/imaggif.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_imagiff.o: ../../src/common/imagiff.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_imagjpeg.o: ../../src/common/imagjpeg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_imagpcx.o: ../../src/common/imagpcx.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_imagpng.o: ../../src/common/imagpng.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_imagpnm.o: ../../src/common/imagpnm.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_imagtga.o: ../../src/common/imagtga.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_imagtiff.o: ../../src/common/imagtiff.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_imagxpm.o: ../../src/common/imagxpm.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_layout.o: ../../src/common/layout.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_lboxcmn.o: ../../src/common/lboxcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_listctrlcmn.o: ../../src/common/listctrlcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_markupparser.o: ../../src/common/markupparser.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_matrix.o: ../../src/common/matrix.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_menucmn.o: ../../src/common/menucmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_modalhook.o: ../../src/common/modalhook.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_mousemanager.o: ../../src/common/mousemanager.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_nbkbase.o: ../../src/common/nbkbase.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_overlaycmn.o: ../../src/common/overlaycmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_paper.o: ../../src/common/paper.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_panelcmn.o: ../../src/common/panelcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_persist.o: ../../src/common/persist.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_pickerbase.o: ../../src/common/pickerbase.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_popupcmn.o: ../../src/common/popupcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_preferencescmn.o: ../../src/common/preferencescmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_prntbase.o: ../../src/common/prntbase.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_quantize.o: ../../src/common/quantize.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_radiobtncmn.o: ../../src/common/radiobtncmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_radiocmn.o: ../../src/common/radiocmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_rearrangectrl.o: ../../src/common/rearrangectrl.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_rendcmn.o: ../../src/common/rendcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_rgncmn.o: ../../src/common/rgncmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_scrolbarcmn.o: ../../src/common/scrolbarcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_settcmn.o: ../../src/common/settcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_sizer.o: ../../src/common/sizer.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_slidercmn.o: ../../src/common/slidercmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_spinbtncmn.o: ../../src/common/spinbtncmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_spinctrlcmn.o: ../../src/common/spinctrlcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_srchcmn.o: ../../src/common/srchcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_statbar.o: ../../src/common/statbar.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_statbmpcmn.o: ../../src/common/statbmpcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_statboxcmn.o: ../../src/common/statboxcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_statlinecmn.o: ../../src/common/statlinecmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_stattextcmn.o: ../../src/common/stattextcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_stockitem.o: ../../src/common/stockitem.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_tbarbase.o: ../../src/common/tbarbase.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_textcmn.o: ../../src/common/textcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_textentrycmn.o: ../../src/common/textentrycmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_textmeasurecmn.o: ../../src/common/textmeasurecmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_toplvcmn.o: ../../src/common/toplvcmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_treebase.o: ../../src/common/treebase.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_uiactioncmn.o: ../../src/common/uiactioncmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_valgen.o: ../../src/common/valgen.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_validate.o: ../../src/common/validate.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_valtext.o: ../../src/common/valtext.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_valnum.o: ../../src/common/valnum.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_wincmn.o: ../../src/common/wincmn.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_windowid.o: ../../src/common/windowid.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_wrapsizer.o: ../../src/common/wrapsizer.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_xpmdecod.o: ../../src/common/xpmdecod.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_busyinfo.o: ../../src/generic/busyinfo.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_buttonbar.o: ../../src/generic/buttonbar.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_choicdgg.o: ../../src/generic/choicdgg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_choicbkg.o: ../../src/generic/choicbkg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_combog.o: ../../src/generic/combog.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dcpsg.o: ../../src/generic/dcpsg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dirctrlg.o: ../../src/generic/dirctrlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_dragimgg.o: ../../src/generic/dragimgg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_filectrlg.o: ../../src/generic/filectrlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_headerctrlg.o: ../../src/generic/headerctrlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_infobar.o: ../../src/generic/infobar.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_listbkg.o: ../../src/generic/listbkg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_logg.o: ../../src/generic/logg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_markuptext.o: ../../src/generic/markuptext.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_msgdlgg.o: ../../src/generic/msgdlgg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_numdlgg.o: ../../src/generic/numdlgg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_progdlgg.o: ../../src/generic/progdlgg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_preferencesg.o: ../../src/generic/preferencesg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_printps.o: ../../src/generic/printps.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_renderg.o: ../../src/generic/renderg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_richmsgdlgg.o: ../../src/generic/richmsgdlgg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_scrlwing.o: ../../src/generic/scrlwing.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_selstore.o: ../../src/generic/selstore.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_spinctlg.o: ../../src/generic/spinctlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_splitter.o: ../../src/generic/splitter.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_srchctlg.o: ../../src/generic/srchctlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_statbmpg.o: ../../src/generic/statbmpg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_stattextg.o: ../../src/generic/stattextg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_textdlgg.o: ../../src/generic/textdlgg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_tipwin.o: ../../src/generic/tipwin.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_toolbkg.o: ../../src/generic/toolbkg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_treectlg.o: ../../src/generic/treectlg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_treebkg.o: ../../src/generic/treebkg.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_vlbox.o: ../../src/generic/vlbox.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_vscroll.o: ../../src/generic/vscroll.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -ifeq ($(USE_GUI),1) -$(OBJS)\corelib_xmlreshandler.o: ../../src/xrc/xmlreshandler.cpp - $(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $< -endif - -$(OBJS)\advdll_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_ADV - -$(OBJS)\advdll_bmpcbox.o: ../../src/msw/bmpcbox.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_calctrl.o: ../../src/msw/calctrl.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_datecontrols.o: ../../src/msw/datecontrols.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_datectrl.o: ../../src/msw/datectrl.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_datetimectrl.o: ../../src/msw/datetimectrl.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_hyperlink.o: ../../src/msw/hyperlink.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_timectrl.o: ../../src/msw/timectrl.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_animatecmn.o: ../../src/common/animatecmn.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_calctrlcmn.o: ../../src/common/calctrlcmn.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_datavcmn.o: ../../src/common/datavcmn.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_gridcmn.o: ../../src/common/gridcmn.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_odcombocmn.o: ../../src/common/odcombocmn.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_bannerwindow.o: ../../src/generic/bannerwindow.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_calctrlg.o: ../../src/generic/calctrlg.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_commandlinkbuttong.o: ../../src/generic/commandlinkbuttong.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_datavgen.o: ../../src/generic/datavgen.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_datectlg.o: ../../src/generic/datectlg.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_editlbox.o: ../../src/generic/editlbox.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_grid.o: ../../src/generic/grid.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_gridctrl.o: ../../src/generic/gridctrl.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_grideditors.o: ../../src/generic/grideditors.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_gridsel.o: ../../src/generic/gridsel.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_helpext.o: ../../src/generic/helpext.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_hyperlinkg.o: ../../src/generic/hyperlinkg.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_laywin.o: ../../src/generic/laywin.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_notifmsgg.o: ../../src/generic/notifmsgg.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_odcombo.o: ../../src/generic/odcombo.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_propdlg.o: ../../src/generic/propdlg.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_richtooltipg.o: ../../src/generic/richtooltipg.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_sashwin.o: ../../src/generic/sashwin.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_splash.o: ../../src/generic/splash.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_timectrlg.o: ../../src/generic/timectrlg.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_tipdlg.o: ../../src/generic/tipdlg.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_treelist.o: ../../src/generic/treelist.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_wizard.o: ../../src/generic/wizard.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_taskbarcmn.o: ../../src/common/taskbarcmn.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_aboutdlg.o: ../../src/msw/aboutdlg.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_notifmsg.o: ../../src/msw/notifmsg.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_richtooltip.o: ../../src/msw/richtooltip.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_sound.o: ../../src/msw/sound.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_taskbar.o: ../../src/msw/taskbar.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_joystick.o: ../../src/msw/joystick.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advdll_animateg.o: ../../src/generic/animateg.cpp - $(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_bmpcbox.o: ../../src/msw/bmpcbox.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_calctrl.o: ../../src/msw/calctrl.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_commandlinkbutton.o: ../../src/msw/commandlinkbutton.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_datecontrols.o: ../../src/msw/datecontrols.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_datectrl.o: ../../src/msw/datectrl.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_datetimectrl.o: ../../src/msw/datetimectrl.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_hyperlink.o: ../../src/msw/hyperlink.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_timectrl.o: ../../src/msw/timectrl.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_animatecmn.o: ../../src/common/animatecmn.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_bmpcboxcmn.o: ../../src/common/bmpcboxcmn.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_calctrlcmn.o: ../../src/common/calctrlcmn.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_datavcmn.o: ../../src/common/datavcmn.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_gridcmn.o: ../../src/common/gridcmn.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_hyperlnkcmn.o: ../../src/common/hyperlnkcmn.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_odcombocmn.o: ../../src/common/odcombocmn.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_richtooltipcmn.o: ../../src/common/richtooltipcmn.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_aboutdlgg.o: ../../src/generic/aboutdlgg.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_bannerwindow.o: ../../src/generic/bannerwindow.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_bmpcboxg.o: ../../src/generic/bmpcboxg.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_calctrlg.o: ../../src/generic/calctrlg.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_commandlinkbuttong.o: ../../src/generic/commandlinkbuttong.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_datavgen.o: ../../src/generic/datavgen.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_datectlg.o: ../../src/generic/datectlg.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_editlbox.o: ../../src/generic/editlbox.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_grid.o: ../../src/generic/grid.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_gridctrl.o: ../../src/generic/gridctrl.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_grideditors.o: ../../src/generic/grideditors.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_gridsel.o: ../../src/generic/gridsel.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_helpext.o: ../../src/generic/helpext.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_hyperlinkg.o: ../../src/generic/hyperlinkg.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_laywin.o: ../../src/generic/laywin.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_notifmsgg.o: ../../src/generic/notifmsgg.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_odcombo.o: ../../src/generic/odcombo.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_propdlg.o: ../../src/generic/propdlg.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_richtooltipg.o: ../../src/generic/richtooltipg.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_sashwin.o: ../../src/generic/sashwin.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_splash.o: ../../src/generic/splash.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_timectrlg.o: ../../src/generic/timectrlg.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_tipdlg.o: ../../src/generic/tipdlg.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_treelist.o: ../../src/generic/treelist.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_wizard.o: ../../src/generic/wizard.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_taskbarcmn.o: ../../src/common/taskbarcmn.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_aboutdlg.o: ../../src/msw/aboutdlg.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_notifmsg.o: ../../src/msw/notifmsg.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_richtooltip.o: ../../src/msw/richtooltip.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_sound.o: ../../src/msw/sound.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_taskbar.o: ../../src/msw/taskbar.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_joystick.o: ../../src/msw/joystick.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\advlib_animateg.o: ../../src/generic/animateg.cpp - $(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\mediadll_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\mediadll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_MEDIA - -$(OBJS)\mediadll_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp - $(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\mediadll_mediactrl_am.o: ../../src/msw/mediactrl_am.cpp - $(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\mediadll_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp - $(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\mediadll_mediactrl_qt.o: ../../src/msw/mediactrl_qt.cpp - $(CXX) -c -o $@ $(MEDIADLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\medialib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(MEDIALIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\medialib_mediactrlcmn.o: ../../src/common/mediactrlcmn.cpp - $(CXX) -c -o $@ $(MEDIALIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\medialib_mediactrl_am.o: ../../src/msw/mediactrl_am.cpp - $(CXX) -c -o $@ $(MEDIALIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\medialib_mediactrl_wmp10.o: ../../src/msw/mediactrl_wmp10.cpp - $(CXX) -c -o $@ $(MEDIALIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\medialib_mediactrl_qt.o: ../../src/msw/mediactrl_qt.cpp - $(CXX) -c -o $@ $(MEDIALIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_HTML - -$(OBJS)\htmldll_helpbest.o: ../../src/msw/helpbest.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_helpctrl.o: ../../src/html/helpctrl.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_helpdata.o: ../../src/html/helpdata.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_helpdlg.o: ../../src/html/helpdlg.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_helpfrm.o: ../../src/html/helpfrm.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_helpwnd.o: ../../src/html/helpwnd.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_htmlcell.o: ../../src/html/htmlcell.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_htmlfilt.o: ../../src/html/htmlfilt.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_htmlpars.o: ../../src/html/htmlpars.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_htmltag.o: ../../src/html/htmltag.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_htmlwin.o: ../../src/html/htmlwin.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_htmprint.o: ../../src/html/htmprint.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_m_dflist.o: ../../src/html/m_dflist.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_m_fonts.o: ../../src/html/m_fonts.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_m_hline.o: ../../src/html/m_hline.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_m_image.o: ../../src/html/m_image.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_m_layout.o: ../../src/html/m_layout.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_m_links.o: ../../src/html/m_links.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_m_list.o: ../../src/html/m_list.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_m_pre.o: ../../src/html/m_pre.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_m_span.o: ../../src/html/m_span.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_m_style.o: ../../src/html/m_style.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_m_tables.o: ../../src/html/m_tables.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_styleparams.o: ../../src/html/styleparams.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_winpars.o: ../../src/html/winpars.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmldll_htmllbox.o: ../../src/generic/htmllbox.cpp - $(CXX) -c -o $@ $(HTMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_helpbest.o: ../../src/msw/helpbest.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_helpctrl.o: ../../src/html/helpctrl.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_helpdata.o: ../../src/html/helpdata.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_helpdlg.o: ../../src/html/helpdlg.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_helpfrm.o: ../../src/html/helpfrm.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_helpwnd.o: ../../src/html/helpwnd.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_htmlcell.o: ../../src/html/htmlcell.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_htmlfilt.o: ../../src/html/htmlfilt.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_htmlpars.o: ../../src/html/htmlpars.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_htmltag.o: ../../src/html/htmltag.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_htmlwin.o: ../../src/html/htmlwin.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_htmprint.o: ../../src/html/htmprint.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_m_dflist.o: ../../src/html/m_dflist.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_m_fonts.o: ../../src/html/m_fonts.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_m_hline.o: ../../src/html/m_hline.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_m_image.o: ../../src/html/m_image.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_m_layout.o: ../../src/html/m_layout.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_m_links.o: ../../src/html/m_links.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_m_list.o: ../../src/html/m_list.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_m_pre.o: ../../src/html/m_pre.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_m_span.o: ../../src/html/m_span.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_m_style.o: ../../src/html/m_style.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_m_tables.o: ../../src/html/m_tables.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_styleparams.o: ../../src/html/styleparams.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_winpars.o: ../../src/html/winpars.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\htmllib_htmllbox.o: ../../src/generic/htmllbox.cpp - $(CXX) -c -o $@ $(HTMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\webviewdll_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\webviewdll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_WEBVIEW - -$(OBJS)\webviewdll_webview_ie.o: ../../src/msw/webview_ie.cpp - $(CXX) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\webviewdll_webview.o: ../../src/common/webview.cpp - $(CXX) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\webviewdll_webviewarchivehandler.o: ../../src/common/webviewarchivehandler.cpp - $(CXX) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\webviewdll_webviewfshandler.o: ../../src/common/webviewfshandler.cpp - $(CXX) -c -o $@ $(WEBVIEWDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\webviewlib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\webviewlib_webview_ie.o: ../../src/msw/webview_ie.cpp - $(CXX) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\webviewlib_webview.o: ../../src/common/webview.cpp - $(CXX) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\webviewlib_webviewarchivehandler.o: ../../src/common/webviewarchivehandler.cpp - $(CXX) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\webviewlib_webviewfshandler.o: ../../src/common/webviewfshandler.cpp - $(CXX) -c -o $@ $(WEBVIEWLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\qadll_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(QADLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\qadll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_QA - -$(OBJS)\qadll_debugrpt.o: ../../src/common/debugrpt.cpp - $(CXX) -c -o $@ $(QADLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\qadll_dbgrptg.o: ../../src/generic/dbgrptg.cpp - $(CXX) -c -o $@ $(QADLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\qalib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(QALIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\qalib_debugrpt.o: ../../src/common/debugrpt.cpp - $(CXX) -c -o $@ $(QALIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\qalib_dbgrptg.o: ../../src/generic/dbgrptg.cpp - $(CXX) -c -o $@ $(QALIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xmldll_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xmldll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define wxUSE_GUI=0 --define WXUSINGDLL --define WXMAKINGDLL_XML - -$(OBJS)\xmldll_xml.o: ../../src/xml/xml.cpp - $(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xmldll_xtixml.o: ../../src/common/xtixml.cpp - $(CXX) -c -o $@ $(XMLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xmllib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(XMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xmllib_xml.o: ../../src/xml/xml.cpp - $(CXX) -c -o $@ $(XMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xmllib_xtixml.o: ../../src/common/xtixml.cpp - $(CXX) -c -o $@ $(XMLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_XRC - -$(OBJS)\xrcdll_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_bmp.o: ../../src/xrc/xh_bmp.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_bmpcbox.o: ../../src/xrc/xh_bmpcbox.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_bmpbt.o: ../../src/xrc/xh_bmpbt.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_bttn.o: ../../src/xrc/xh_bttn.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_cald.o: ../../src/xrc/xh_cald.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_chckb.o: ../../src/xrc/xh_chckb.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_chckl.o: ../../src/xrc/xh_chckl.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_choic.o: ../../src/xrc/xh_choic.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_choicbk.o: ../../src/xrc/xh_choicbk.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_clrpicker.o: ../../src/xrc/xh_clrpicker.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_cmdlinkbn.o: ../../src/xrc/xh_cmdlinkbn.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_collpane.o: ../../src/xrc/xh_collpane.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_combo.o: ../../src/xrc/xh_combo.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_comboctrl.o: ../../src/xrc/xh_comboctrl.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_dirpicker.o: ../../src/xrc/xh_dirpicker.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_dlg.o: ../../src/xrc/xh_dlg.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_editlbox.o: ../../src/xrc/xh_editlbox.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_filectrl.o: ../../src/xrc/xh_filectrl.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_filepicker.o: ../../src/xrc/xh_filepicker.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_fontpicker.o: ../../src/xrc/xh_fontpicker.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_frame.o: ../../src/xrc/xh_frame.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_gauge.o: ../../src/xrc/xh_gauge.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_gdctl.o: ../../src/xrc/xh_gdctl.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_grid.o: ../../src/xrc/xh_grid.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_html.o: ../../src/xrc/xh_html.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_hyperlink.o: ../../src/xrc/xh_hyperlink.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_listb.o: ../../src/xrc/xh_listb.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_listbk.o: ../../src/xrc/xh_listbk.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_listc.o: ../../src/xrc/xh_listc.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_mdi.o: ../../src/xrc/xh_mdi.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_menu.o: ../../src/xrc/xh_menu.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_notbk.o: ../../src/xrc/xh_notbk.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_odcombo.o: ../../src/xrc/xh_odcombo.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_panel.o: ../../src/xrc/xh_panel.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_propdlg.o: ../../src/xrc/xh_propdlg.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_radbt.o: ../../src/xrc/xh_radbt.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_radbx.o: ../../src/xrc/xh_radbx.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_scrol.o: ../../src/xrc/xh_scrol.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_scwin.o: ../../src/xrc/xh_scwin.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_sizer.o: ../../src/xrc/xh_sizer.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_slidr.o: ../../src/xrc/xh_slidr.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_spin.o: ../../src/xrc/xh_spin.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_split.o: ../../src/xrc/xh_split.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_srchctrl.o: ../../src/xrc/xh_srchctrl.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_statbar.o: ../../src/xrc/xh_statbar.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_stbmp.o: ../../src/xrc/xh_stbmp.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_stbox.o: ../../src/xrc/xh_stbox.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_stlin.o: ../../src/xrc/xh_stlin.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_text.o: ../../src/xrc/xh_text.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_toolb.o: ../../src/xrc/xh_toolb.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_tree.o: ../../src/xrc/xh_tree.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_treebk.o: ../../src/xrc/xh_treebk.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_unkwn.o: ../../src/xrc/xh_unkwn.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xh_wizrd.o: ../../src/xrc/xh_wizrd.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xmlres.o: ../../src/xrc/xmlres.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xmladv.o: ../../src/xrc/xmladv.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrcdll_xmlrsall.o: ../../src/xrc/xmlrsall.cpp - $(CXX) -c -o $@ $(XRCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_animatctrl.o: ../../src/xrc/xh_animatctrl.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_bannerwindow.o: ../../src/xrc/xh_bannerwindow.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_bmp.o: ../../src/xrc/xh_bmp.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_bmpcbox.o: ../../src/xrc/xh_bmpcbox.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_bmpbt.o: ../../src/xrc/xh_bmpbt.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_bttn.o: ../../src/xrc/xh_bttn.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_cald.o: ../../src/xrc/xh_cald.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_chckb.o: ../../src/xrc/xh_chckb.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_chckl.o: ../../src/xrc/xh_chckl.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_choic.o: ../../src/xrc/xh_choic.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_choicbk.o: ../../src/xrc/xh_choicbk.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_clrpicker.o: ../../src/xrc/xh_clrpicker.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_cmdlinkbn.o: ../../src/xrc/xh_cmdlinkbn.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_collpane.o: ../../src/xrc/xh_collpane.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_combo.o: ../../src/xrc/xh_combo.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_comboctrl.o: ../../src/xrc/xh_comboctrl.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_datectrl.o: ../../src/xrc/xh_datectrl.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_dirpicker.o: ../../src/xrc/xh_dirpicker.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_dlg.o: ../../src/xrc/xh_dlg.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_editlbox.o: ../../src/xrc/xh_editlbox.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_filectrl.o: ../../src/xrc/xh_filectrl.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_filepicker.o: ../../src/xrc/xh_filepicker.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_fontpicker.o: ../../src/xrc/xh_fontpicker.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_frame.o: ../../src/xrc/xh_frame.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_gauge.o: ../../src/xrc/xh_gauge.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_gdctl.o: ../../src/xrc/xh_gdctl.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_grid.o: ../../src/xrc/xh_grid.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_html.o: ../../src/xrc/xh_html.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_hyperlink.o: ../../src/xrc/xh_hyperlink.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_listb.o: ../../src/xrc/xh_listb.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_listbk.o: ../../src/xrc/xh_listbk.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_listc.o: ../../src/xrc/xh_listc.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_mdi.o: ../../src/xrc/xh_mdi.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_menu.o: ../../src/xrc/xh_menu.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_notbk.o: ../../src/xrc/xh_notbk.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_odcombo.o: ../../src/xrc/xh_odcombo.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_panel.o: ../../src/xrc/xh_panel.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_propdlg.o: ../../src/xrc/xh_propdlg.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_radbt.o: ../../src/xrc/xh_radbt.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_radbx.o: ../../src/xrc/xh_radbx.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_scrol.o: ../../src/xrc/xh_scrol.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_scwin.o: ../../src/xrc/xh_scwin.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_htmllbox.o: ../../src/xrc/xh_htmllbox.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_sizer.o: ../../src/xrc/xh_sizer.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_slidr.o: ../../src/xrc/xh_slidr.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_spin.o: ../../src/xrc/xh_spin.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_split.o: ../../src/xrc/xh_split.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_srchctrl.o: ../../src/xrc/xh_srchctrl.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_statbar.o: ../../src/xrc/xh_statbar.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_stbmp.o: ../../src/xrc/xh_stbmp.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_stbox.o: ../../src/xrc/xh_stbox.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_stlin.o: ../../src/xrc/xh_stlin.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_sttxt.o: ../../src/xrc/xh_sttxt.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_text.o: ../../src/xrc/xh_text.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_tglbtn.o: ../../src/xrc/xh_tglbtn.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_timectrl.o: ../../src/xrc/xh_timectrl.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_toolb.o: ../../src/xrc/xh_toolb.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_toolbk.o: ../../src/xrc/xh_toolbk.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_tree.o: ../../src/xrc/xh_tree.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_treebk.o: ../../src/xrc/xh_treebk.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_unkwn.o: ../../src/xrc/xh_unkwn.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xh_wizrd.o: ../../src/xrc/xh_wizrd.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xmlres.o: ../../src/xrc/xmlres.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xmladv.o: ../../src/xrc/xmladv.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\xrclib_xmlrsall.o: ../../src/xrc/xmlrsall.cpp - $(CXX) -c -o $@ $(XRCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auidll_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auidll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_AUI - -$(OBJS)\auidll_framemanager.o: ../../src/aui/framemanager.cpp - $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auidll_dockart.o: ../../src/aui/dockart.cpp - $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auidll_floatpane.o: ../../src/aui/floatpane.cpp - $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auidll_auibook.o: ../../src/aui/auibook.cpp - $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auidll_auibar.o: ../../src/aui/auibar.cpp - $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auidll_tabmdi.o: ../../src/aui/tabmdi.cpp - $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auidll_tabart.o: ../../src/aui/tabart.cpp - $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auidll_xh_auinotbk.o: ../../src/xrc/xh_auinotbk.cpp - $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auilib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auilib_framemanager.o: ../../src/aui/framemanager.cpp - $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auilib_dockart.o: ../../src/aui/dockart.cpp - $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auilib_floatpane.o: ../../src/aui/floatpane.cpp - $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auilib_auibook.o: ../../src/aui/auibook.cpp - $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auilib_auibar.o: ../../src/aui/auibar.cpp - $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auilib_tabmdi.o: ../../src/aui/tabmdi.cpp - $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auilib_tabart.o: ../../src/aui/tabart.cpp - $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\auilib_xh_auinotbk.o: ../../src/xrc/xh_auinotbk.cpp - $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbondll_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbondll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_RIBBON - -$(OBJS)\ribbondll_art_internal.o: ../../src/ribbon/art_internal.cpp - $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbondll_art_msw.o: ../../src/ribbon/art_msw.cpp - $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbondll_art_aui.o: ../../src/ribbon/art_aui.cpp - $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbondll_bar.o: ../../src/ribbon/bar.cpp - $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbondll_buttonbar.o: ../../src/ribbon/buttonbar.cpp - $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbondll_control.o: ../../src/ribbon/control.cpp - $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbondll_gallery.o: ../../src/ribbon/gallery.cpp - $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbondll_page.o: ../../src/ribbon/page.cpp - $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbondll_panel.o: ../../src/ribbon/panel.cpp - $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbondll_toolbar.o: ../../src/ribbon/toolbar.cpp - $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbondll_xh_ribbon.o: ../../src/xrc/xh_ribbon.cpp - $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbonlib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbonlib_art_internal.o: ../../src/ribbon/art_internal.cpp - $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbonlib_art_msw.o: ../../src/ribbon/art_msw.cpp - $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbonlib_art_aui.o: ../../src/ribbon/art_aui.cpp - $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbonlib_bar.o: ../../src/ribbon/bar.cpp - $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbonlib_buttonbar.o: ../../src/ribbon/buttonbar.cpp - $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbonlib_control.o: ../../src/ribbon/control.cpp - $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbonlib_gallery.o: ../../src/ribbon/gallery.cpp - $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbonlib_page.o: ../../src/ribbon/page.cpp - $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbonlib_panel.o: ../../src/ribbon/panel.cpp - $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbonlib_toolbar.o: ../../src/ribbon/toolbar.cpp - $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\ribbonlib_xh_ribbon.o: ../../src/xrc/xh_ribbon.cpp - $(CXX) -c -o $@ $(RIBBONLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgriddll_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgriddll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_PROPGRID - -$(OBJS)\propgriddll_advprops.o: ../../src/propgrid/advprops.cpp - $(CXX) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgriddll_editors.o: ../../src/propgrid/editors.cpp - $(CXX) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgriddll_manager.o: ../../src/propgrid/manager.cpp - $(CXX) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgriddll_property.o: ../../src/propgrid/property.cpp - $(CXX) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgriddll_propgrid.o: ../../src/propgrid/propgrid.cpp - $(CXX) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgriddll_propgridiface.o: ../../src/propgrid/propgridiface.cpp - $(CXX) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgriddll_propgridpagestate.o: ../../src/propgrid/propgridpagestate.cpp - $(CXX) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgriddll_props.o: ../../src/propgrid/props.cpp - $(CXX) -c -o $@ $(PROPGRIDDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgridlib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgridlib_advprops.o: ../../src/propgrid/advprops.cpp - $(CXX) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgridlib_editors.o: ../../src/propgrid/editors.cpp - $(CXX) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgridlib_manager.o: ../../src/propgrid/manager.cpp - $(CXX) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgridlib_property.o: ../../src/propgrid/property.cpp - $(CXX) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgridlib_propgrid.o: ../../src/propgrid/propgrid.cpp - $(CXX) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgridlib_propgridiface.o: ../../src/propgrid/propgridiface.cpp - $(CXX) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgridlib_propgridpagestate.o: ../../src/propgrid/propgridpagestate.cpp - $(CXX) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\propgridlib_props.o: ../../src/propgrid/props.cpp - $(CXX) -c -o $@ $(PROPGRIDLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextdll_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextdll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_RICHTEXT - -$(OBJS)\richtextdll_richtextbuffer.o: ../../src/richtext/richtextbuffer.cpp - $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextdll_richtextctrl.o: ../../src/richtext/richtextctrl.cpp - $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextdll_richtextformatdlg.o: ../../src/richtext/richtextformatdlg.cpp - $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextdll_richtexthtml.o: ../../src/richtext/richtexthtml.cpp - $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextdll_richtextimagedlg.o: ../../src/richtext/richtextimagedlg.cpp - $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextdll_richtextprint.o: ../../src/richtext/richtextprint.cpp - $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextdll_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp - $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextdll_richtextstyles.o: ../../src/richtext/richtextstyles.cpp - $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextdll_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp - $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextdll_richtextxml.o: ../../src/richtext/richtextxml.cpp - $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextdll_xh_richtext.o: ../../src/xrc/xh_richtext.cpp - $(CXX) -c -o $@ $(RICHTEXTDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextlib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextlib_richtextbuffer.o: ../../src/richtext/richtextbuffer.cpp - $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextlib_richtextctrl.o: ../../src/richtext/richtextctrl.cpp - $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextlib_richtextformatdlg.o: ../../src/richtext/richtextformatdlg.cpp - $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextlib_richtexthtml.o: ../../src/richtext/richtexthtml.cpp - $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextlib_richtextimagedlg.o: ../../src/richtext/richtextimagedlg.cpp - $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextlib_richtextprint.o: ../../src/richtext/richtextprint.cpp - $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextlib_richtextstyledlg.o: ../../src/richtext/richtextstyledlg.cpp - $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextlib_richtextstyles.o: ../../src/richtext/richtextstyles.cpp - $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextlib_richtextsymboldlg.o: ../../src/richtext/richtextsymboldlg.cpp - $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextlib_richtextxml.o: ../../src/richtext/richtextxml.cpp - $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\richtextlib_xh_richtext.o: ../../src/xrc/xh_richtext.cpp - $(CXX) -c -o $@ $(RICHTEXTLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\stcdll_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\stcdll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --include-dir ../../src/stc/scintilla/include --include-dir ../../src/stc/scintilla/lexlib --include-dir ../../src/stc/scintilla/src --define __WX__ --define SCI_LEXER --define LINK_LEXERS --define WXUSINGDLL --define WXMAKINGDLL_STC - -$(OBJS)\stcdll_stc.o: ../../src/stc/stc.cpp - $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\stcdll_PlatWX.o: ../../src/stc/PlatWX.cpp - $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\stcdll_ScintillaWX.o: ../../src/stc/ScintillaWX.cpp - $(CXX) -c -o $@ $(STCDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\stclib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\stclib_stc.o: ../../src/stc/stc.cpp - $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\stclib_PlatWX.o: ../../src/stc/PlatWX.cpp - $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\stclib_ScintillaWX.o: ../../src/stc/ScintillaWX.cpp - $(CXX) -c -o $@ $(STCLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\gldll_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\gldll_version_rc.o: ../../src/msw/version.rc - $(WINDRES) -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) --include-dir $(SETUPHDIR) --include-dir ../../include $(__CAIRO_INCLUDEDIR_p) --define WXBUILDING --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG) --include-dir ../../src/tiff/libtiff --include-dir ../../src/jpeg --include-dir ../../src/png --include-dir ../../src/zlib --include-dir ../../src/regex --include-dir ../../src/expat/lib --define WXUSINGDLL --define WXMAKINGDLL_GL - -$(OBJS)\gldll_glcmn.o: ../../src/common/glcmn.cpp - $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\gldll_glcanvas.o: ../../src/msw/glcanvas.cpp - $(CXX) -c -o $@ $(GLDLL_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\gllib_dummy.o: ../../src/common/dummy.cpp - $(CXX) -c -o $@ $(GLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\gllib_glcmn.o: ../../src/common/glcmn.cpp - $(CXX) -c -o $@ $(GLLIB_CXXFLAGS) $(CPPDEPS) $< - -$(OBJS)\gllib_glcanvas.o: ../../src/msw/glcanvas.cpp - $(CXX) -c -o $@ $(GLLIB_CXXFLAGS) $(CPPDEPS) $< - -.PHONY: all clean setup_h wxbase wxnet wxcore wxadv wxmedia wxhtml wxwebview wxqa \ - wxxml wxxrc wxaui wxribbon wxpropgrid wxrichtext wxstc wxgl samples \ - build_cfg_file - - -SHELL := $(COMSPEC) - -# Dependencies tracking: --include $(OBJS)/*.d diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/makefile.vc b/3rdparty/wxwidgets3.0-3.0.1/build/msw/makefile.vc deleted file mode 100644 index 0ce50ebcf5..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/makefile.vc +++ /dev/null @@ -1,16825 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -### Variables: ### - -MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ - CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \ - TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \ - UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \ - TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \ - DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \ - MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ - USE_WEBVIEW="$(USE_WEBVIEW)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" \ - USE_AUI="$(USE_AUI)" USE_RIBBON="$(USE_RIBBON)" \ - USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \ - USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ - USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \ - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \ - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \ - RUNTIME_LIBS="$(RUNTIME_LIBS)" -WX_RELEASE_NODOT = 30 -COMPILER_PREFIX = vc -OBJS = \ - $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)$(ARCH_SUFFIX) -LIBDIRNAME = \ - ..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)$(ARCH_SUFFIX)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = \ - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXREGEX_CFLAGS = /M$(__RUNTIME_LIBS_10)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /I..\..\include \ - /I$(SETUPHDIR) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(CPPFLAGS) $(CFLAGS) -WXREGEX_OBJECTS = \ - $(OBJS)\wxregex_regcomp.obj \ - $(OBJS)\wxregex_regexec.obj \ - $(OBJS)\wxregex_regerror.obj \ - $(OBJS)\wxregex_regfree.obj -WXZLIB_CFLAGS = /M$(__RUNTIME_LIBS_25)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS \ - /D_CRT_NONSTDC_NO_WARNINGS $(CPPFLAGS) $(CFLAGS) -WXZLIB_OBJECTS = \ - $(OBJS)\wxzlib_adler32.obj \ - $(OBJS)\wxzlib_compress.obj \ - $(OBJS)\wxzlib_crc32.obj \ - $(OBJS)\wxzlib_deflate.obj \ - $(OBJS)\wxzlib_gzclose.obj \ - $(OBJS)\wxzlib_gzlib.obj \ - $(OBJS)\wxzlib_gzread.obj \ - $(OBJS)\wxzlib_gzwrite.obj \ - $(OBJS)\wxzlib_infback.obj \ - $(OBJS)\wxzlib_inffast.obj \ - $(OBJS)\wxzlib_inflate.obj \ - $(OBJS)\wxzlib_inftrees.obj \ - $(OBJS)\wxzlib_trees.obj \ - $(OBJS)\wxzlib_uncompr.obj \ - $(OBJS)\wxzlib_zutil.obj -WXPNG_CFLAGS = /M$(__RUNTIME_LIBS_40)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /I..\..\src\zlib \ - $(CPPFLAGS) $(CFLAGS) -WXPNG_OBJECTS = \ - $(OBJS)\wxpng_png.obj \ - $(OBJS)\wxpng_pngerror.obj \ - $(OBJS)\wxpng_pngget.obj \ - $(OBJS)\wxpng_pngmem.obj \ - $(OBJS)\wxpng_pngpread.obj \ - $(OBJS)\wxpng_pngread.obj \ - $(OBJS)\wxpng_pngrio.obj \ - $(OBJS)\wxpng_pngrtran.obj \ - $(OBJS)\wxpng_pngrutil.obj \ - $(OBJS)\wxpng_pngset.obj \ - $(OBJS)\wxpng_pngtrans.obj \ - $(OBJS)\wxpng_pngwio.obj \ - $(OBJS)\wxpng_pngwrite.obj \ - $(OBJS)\wxpng_pngwtran.obj \ - $(OBJS)\wxpng_pngwutil.obj -WXJPEG_CFLAGS = /M$(__RUNTIME_LIBS_55)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /I$(SETUPHDIR) \ - $(CPPFLAGS) $(CFLAGS) -WXJPEG_OBJECTS = \ - $(OBJS)\wxjpeg_jcomapi.obj \ - $(OBJS)\wxjpeg_jutils.obj \ - $(OBJS)\wxjpeg_jerror.obj \ - $(OBJS)\wxjpeg_jmemmgr.obj \ - $(OBJS)\wxjpeg_jmemnobs.obj \ - $(OBJS)\wxjpeg_jcapimin.obj \ - $(OBJS)\wxjpeg_jcapistd.obj \ - $(OBJS)\wxjpeg_jctrans.obj \ - $(OBJS)\wxjpeg_jcparam.obj \ - $(OBJS)\wxjpeg_jdatadst.obj \ - $(OBJS)\wxjpeg_jcinit.obj \ - $(OBJS)\wxjpeg_jcmaster.obj \ - $(OBJS)\wxjpeg_jcmarker.obj \ - $(OBJS)\wxjpeg_jcmainct.obj \ - $(OBJS)\wxjpeg_jcprepct.obj \ - $(OBJS)\wxjpeg_jccoefct.obj \ - $(OBJS)\wxjpeg_jccolor.obj \ - $(OBJS)\wxjpeg_jcsample.obj \ - $(OBJS)\wxjpeg_jchuff.obj \ - $(OBJS)\wxjpeg_jcphuff.obj \ - $(OBJS)\wxjpeg_jcdctmgr.obj \ - $(OBJS)\wxjpeg_jfdctfst.obj \ - $(OBJS)\wxjpeg_jfdctflt.obj \ - $(OBJS)\wxjpeg_jfdctint.obj \ - $(OBJS)\wxjpeg_jdapimin.obj \ - $(OBJS)\wxjpeg_jdapistd.obj \ - $(OBJS)\wxjpeg_jdtrans.obj \ - $(OBJS)\wxjpeg_jdatasrc.obj \ - $(OBJS)\wxjpeg_jdmaster.obj \ - $(OBJS)\wxjpeg_jdinput.obj \ - $(OBJS)\wxjpeg_jdmarker.obj \ - $(OBJS)\wxjpeg_jdhuff.obj \ - $(OBJS)\wxjpeg_jdphuff.obj \ - $(OBJS)\wxjpeg_jdmainct.obj \ - $(OBJS)\wxjpeg_jdcoefct.obj \ - $(OBJS)\wxjpeg_jdpostct.obj \ - $(OBJS)\wxjpeg_jddctmgr.obj \ - $(OBJS)\wxjpeg_jidctfst.obj \ - $(OBJS)\wxjpeg_jidctflt.obj \ - $(OBJS)\wxjpeg_jidctint.obj \ - $(OBJS)\wxjpeg_jidctred.obj \ - $(OBJS)\wxjpeg_jdsample.obj \ - $(OBJS)\wxjpeg_jdcolor.obj \ - $(OBJS)\wxjpeg_jquant1.obj \ - $(OBJS)\wxjpeg_jquant2.obj \ - $(OBJS)\wxjpeg_jdmerge.obj -WXTIFF_CFLAGS = /M$(__RUNTIME_LIBS_70)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).pdb $(____DEBUGRUNTIME) \ - $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /I..\..\src\zlib \ - /I..\..\src\jpeg /I..\..\src\tiff\libtiff /D_CRT_NONSTDC_NO_WARNINGS \ - $(CPPFLAGS) $(CFLAGS) -WXTIFF_OBJECTS = \ - $(OBJS)\wxtiff_tif_win32.obj \ - $(OBJS)\wxtiff_tif_aux.obj \ - $(OBJS)\wxtiff_tif_close.obj \ - $(OBJS)\wxtiff_tif_codec.obj \ - $(OBJS)\wxtiff_tif_color.obj \ - $(OBJS)\wxtiff_tif_compress.obj \ - $(OBJS)\wxtiff_tif_dir.obj \ - $(OBJS)\wxtiff_tif_dirinfo.obj \ - $(OBJS)\wxtiff_tif_dirread.obj \ - $(OBJS)\wxtiff_tif_dirwrite.obj \ - $(OBJS)\wxtiff_tif_dumpmode.obj \ - $(OBJS)\wxtiff_tif_error.obj \ - $(OBJS)\wxtiff_tif_extension.obj \ - $(OBJS)\wxtiff_tif_fax3.obj \ - $(OBJS)\wxtiff_tif_fax3sm.obj \ - $(OBJS)\wxtiff_tif_flush.obj \ - $(OBJS)\wxtiff_tif_getimage.obj \ - $(OBJS)\wxtiff_tif_jbig.obj \ - $(OBJS)\wxtiff_tif_jpeg.obj \ - $(OBJS)\wxtiff_tif_jpeg_12.obj \ - $(OBJS)\wxtiff_tif_luv.obj \ - $(OBJS)\wxtiff_tif_lzma.obj \ - $(OBJS)\wxtiff_tif_lzw.obj \ - $(OBJS)\wxtiff_tif_next.obj \ - $(OBJS)\wxtiff_tif_ojpeg.obj \ - $(OBJS)\wxtiff_tif_open.obj \ - $(OBJS)\wxtiff_tif_packbits.obj \ - $(OBJS)\wxtiff_tif_pixarlog.obj \ - $(OBJS)\wxtiff_tif_predict.obj \ - $(OBJS)\wxtiff_tif_print.obj \ - $(OBJS)\wxtiff_tif_read.obj \ - $(OBJS)\wxtiff_tif_strip.obj \ - $(OBJS)\wxtiff_tif_swab.obj \ - $(OBJS)\wxtiff_tif_thunder.obj \ - $(OBJS)\wxtiff_tif_tile.obj \ - $(OBJS)\wxtiff_tif_version.obj \ - $(OBJS)\wxtiff_tif_warning.obj \ - $(OBJS)\wxtiff_tif_write.obj \ - $(OBJS)\wxtiff_tif_zip.obj -WXEXPAT_CFLAGS = /M$(__RUNTIME_LIBS_85)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS /I$(LIBDIRNAME) \ - /DCOMPILED_FROM_DSP $(CPPFLAGS) $(CFLAGS) -WXEXPAT_OBJECTS = \ - $(OBJS)\wxexpat_xmlparse.obj \ - $(OBJS)\wxexpat_xmlrole.obj \ - $(OBJS)\wxexpat_xmltok.obj -WXSCINTILLA_CXXFLAGS = /M$(__RUNTIME_LIBS_100)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) /Fd$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /DNDEBUG /D_CRT_SECURE_NO_WARNINGS \ - /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ - /I$(SETUPHDIR) /I..\..\include $(__wxscintilla_usingdll_p) /D__WXMSW__ \ - $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -WXSCINTILLA_OBJECTS = \ - $(OBJS)\wxscintilla_LexA68k.obj \ - $(OBJS)\wxscintilla_LexAbaqus.obj \ - $(OBJS)\wxscintilla_LexAda.obj \ - $(OBJS)\wxscintilla_LexAPDL.obj \ - $(OBJS)\wxscintilla_LexAsm.obj \ - $(OBJS)\wxscintilla_LexAsn1.obj \ - $(OBJS)\wxscintilla_LexASY.obj \ - $(OBJS)\wxscintilla_LexAU3.obj \ - $(OBJS)\wxscintilla_LexAVE.obj \ - $(OBJS)\wxscintilla_LexAVS.obj \ - $(OBJS)\wxscintilla_LexBaan.obj \ - $(OBJS)\wxscintilla_LexBash.obj \ - $(OBJS)\wxscintilla_LexBasic.obj \ - $(OBJS)\wxscintilla_LexBullant.obj \ - $(OBJS)\wxscintilla_LexCaml.obj \ - $(OBJS)\wxscintilla_LexCLW.obj \ - $(OBJS)\wxscintilla_LexCmake.obj \ - $(OBJS)\wxscintilla_LexCOBOL.obj \ - $(OBJS)\wxscintilla_LexCoffeeScript.obj \ - $(OBJS)\wxscintilla_LexConf.obj \ - $(OBJS)\wxscintilla_LexCPP.obj \ - $(OBJS)\wxscintilla_LexCrontab.obj \ - $(OBJS)\wxscintilla_LexCsound.obj \ - $(OBJS)\wxscintilla_LexCSS.obj \ - $(OBJS)\wxscintilla_LexD.obj \ - $(OBJS)\wxscintilla_LexECL.obj \ - $(OBJS)\wxscintilla_LexEiffel.obj \ - $(OBJS)\wxscintilla_LexErlang.obj \ - $(OBJS)\wxscintilla_LexEScript.obj \ - $(OBJS)\wxscintilla_LexFlagship.obj \ - $(OBJS)\wxscintilla_LexForth.obj \ - $(OBJS)\wxscintilla_LexFortran.obj \ - $(OBJS)\wxscintilla_LexGAP.obj \ - $(OBJS)\wxscintilla_LexGui4Cli.obj \ - $(OBJS)\wxscintilla_LexHaskell.obj \ - $(OBJS)\wxscintilla_LexHTML.obj \ - $(OBJS)\wxscintilla_LexInno.obj \ - $(OBJS)\wxscintilla_LexKix.obj \ - $(OBJS)\wxscintilla_LexLisp.obj \ - $(OBJS)\wxscintilla_LexLout.obj \ - $(OBJS)\wxscintilla_LexLua.obj \ - $(OBJS)\wxscintilla_LexMagik.obj \ - $(OBJS)\wxscintilla_LexMarkdown.obj \ - $(OBJS)\wxscintilla_LexMatlab.obj \ - $(OBJS)\wxscintilla_LexMetapost.obj \ - $(OBJS)\wxscintilla_LexMMIXAL.obj \ - $(OBJS)\wxscintilla_LexModula.obj \ - $(OBJS)\wxscintilla_LexMPT.obj \ - $(OBJS)\wxscintilla_LexMSSQL.obj \ - $(OBJS)\wxscintilla_LexMySQL.obj \ - $(OBJS)\wxscintilla_LexNimrod.obj \ - $(OBJS)\wxscintilla_LexNsis.obj \ - $(OBJS)\wxscintilla_LexOpal.obj \ - $(OBJS)\wxscintilla_LexOScript.obj \ - $(OBJS)\wxscintilla_LexOthers.obj \ - $(OBJS)\wxscintilla_LexPascal.obj \ - $(OBJS)\wxscintilla_LexPB.obj \ - $(OBJS)\wxscintilla_LexPerl.obj \ - $(OBJS)\wxscintilla_LexPLM.obj \ - $(OBJS)\wxscintilla_LexPOV.obj \ - $(OBJS)\wxscintilla_LexPowerPro.obj \ - $(OBJS)\wxscintilla_LexPowerShell.obj \ - $(OBJS)\wxscintilla_LexProgress.obj \ - $(OBJS)\wxscintilla_LexPS.obj \ - $(OBJS)\wxscintilla_LexPython.obj \ - $(OBJS)\wxscintilla_LexR.obj \ - $(OBJS)\wxscintilla_LexRebol.obj \ - $(OBJS)\wxscintilla_LexRuby.obj \ - $(OBJS)\wxscintilla_LexScriptol.obj \ - $(OBJS)\wxscintilla_LexSmalltalk.obj \ - $(OBJS)\wxscintilla_LexSML.obj \ - $(OBJS)\wxscintilla_LexSorcus.obj \ - $(OBJS)\wxscintilla_LexSpecman.obj \ - $(OBJS)\wxscintilla_LexSpice.obj \ - $(OBJS)\wxscintilla_LexSQL.obj \ - $(OBJS)\wxscintilla_LexTACL.obj \ - $(OBJS)\wxscintilla_LexTADS3.obj \ - $(OBJS)\wxscintilla_LexTAL.obj \ - $(OBJS)\wxscintilla_LexTCL.obj \ - $(OBJS)\wxscintilla_LexTCMD.obj \ - $(OBJS)\wxscintilla_LexTeX.obj \ - $(OBJS)\wxscintilla_LexTxt2tags.obj \ - $(OBJS)\wxscintilla_LexVB.obj \ - $(OBJS)\wxscintilla_LexVerilog.obj \ - $(OBJS)\wxscintilla_LexVHDL.obj \ - $(OBJS)\wxscintilla_LexVisualProlog.obj \ - $(OBJS)\wxscintilla_LexYAML.obj \ - $(OBJS)\wxscintilla_Accessor.obj \ - $(OBJS)\wxscintilla_CharacterSet.obj \ - $(OBJS)\wxscintilla_LexerBase.obj \ - $(OBJS)\wxscintilla_LexerModule.obj \ - $(OBJS)\wxscintilla_LexerNoExceptions.obj \ - $(OBJS)\wxscintilla_LexerSimple.obj \ - $(OBJS)\wxscintilla_PropSetSimple.obj \ - $(OBJS)\wxscintilla_StyleContext.obj \ - $(OBJS)\wxscintilla_WordList.obj \ - $(OBJS)\wxscintilla_AutoComplete.obj \ - $(OBJS)\wxscintilla_CallTip.obj \ - $(OBJS)\wxscintilla_Catalogue.obj \ - $(OBJS)\wxscintilla_CellBuffer.obj \ - $(OBJS)\wxscintilla_CharClassify.obj \ - $(OBJS)\wxscintilla_ContractionState.obj \ - $(OBJS)\wxscintilla_Decoration.obj \ - $(OBJS)\wxscintilla_Document.obj \ - $(OBJS)\wxscintilla_Editor.obj \ - $(OBJS)\wxscintilla_ExternalLexer.obj \ - $(OBJS)\wxscintilla_Indicator.obj \ - $(OBJS)\wxscintilla_KeyMap.obj \ - $(OBJS)\wxscintilla_LineMarker.obj \ - $(OBJS)\wxscintilla_PerLine.obj \ - $(OBJS)\wxscintilla_PositionCache.obj \ - $(OBJS)\wxscintilla_RESearch.obj \ - $(OBJS)\wxscintilla_RunStyles.obj \ - $(OBJS)\wxscintilla_ScintillaBase.obj \ - $(OBJS)\wxscintilla_Selection.obj \ - $(OBJS)\wxscintilla_Style.obj \ - $(OBJS)\wxscintilla_UniConversion.obj \ - $(OBJS)\wxscintilla_ViewStyle.obj \ - $(OBJS)\wxscintilla_XPM.obj -MONODLL_CFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ - /DwxUSE_BASE=1 /DWXMAKINGDLL $(CPPFLAGS) $(CFLAGS) -MONODLL_CXXFLAGS = /M$(__RUNTIME_LIBS_116)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ - /DwxUSE_BASE=1 /DWXMAKINGDLL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_monodll.pch" $(CPPFLAGS) $(CXXFLAGS) -MONODLL_OBJECTS = \ - $(OBJS)\monodll_dummy.obj \ - $(OBJS)\monodll_any.obj \ - $(OBJS)\monodll_appbase.obj \ - $(OBJS)\monodll_arcall.obj \ - $(OBJS)\monodll_arcfind.obj \ - $(OBJS)\monodll_archive.obj \ - $(OBJS)\monodll_arrstr.obj \ - $(OBJS)\monodll_base64.obj \ - $(OBJS)\monodll_clntdata.obj \ - $(OBJS)\monodll_cmdline.obj \ - $(OBJS)\monodll_config.obj \ - $(OBJS)\monodll_convauto.obj \ - $(OBJS)\monodll_datetime.obj \ - $(OBJS)\monodll_datetimefmt.obj \ - $(OBJS)\monodll_datstrm.obj \ - $(OBJS)\monodll_dircmn.obj \ - $(OBJS)\monodll_dynarray.obj \ - $(OBJS)\monodll_dynlib.obj \ - $(OBJS)\monodll_dynload.obj \ - $(OBJS)\monodll_encconv.obj \ - $(OBJS)\monodll_evtloopcmn.obj \ - $(OBJS)\monodll_extended.obj \ - $(OBJS)\monodll_ffile.obj \ - $(OBJS)\monodll_file.obj \ - $(OBJS)\monodll_fileback.obj \ - $(OBJS)\monodll_fileconf.obj \ - $(OBJS)\monodll_filefn.obj \ - $(OBJS)\monodll_filename.obj \ - $(OBJS)\monodll_filesys.obj \ - $(OBJS)\monodll_filtall.obj \ - $(OBJS)\monodll_filtfind.obj \ - $(OBJS)\monodll_fmapbase.obj \ - $(OBJS)\monodll_fs_arc.obj \ - $(OBJS)\monodll_fs_filter.obj \ - $(OBJS)\monodll_hash.obj \ - $(OBJS)\monodll_hashmap.obj \ - $(OBJS)\monodll_init.obj \ - $(OBJS)\monodll_intl.obj \ - $(OBJS)\monodll_ipcbase.obj \ - $(OBJS)\monodll_languageinfo.obj \ - $(OBJS)\monodll_list.obj \ - $(OBJS)\monodll_log.obj \ - $(OBJS)\monodll_longlong.obj \ - $(OBJS)\monodll_memory.obj \ - $(OBJS)\monodll_mimecmn.obj \ - $(OBJS)\monodll_module.obj \ - $(OBJS)\monodll_mstream.obj \ - $(OBJS)\monodll_numformatter.obj \ - $(OBJS)\monodll_object.obj \ - $(OBJS)\monodll_platinfo.obj \ - $(OBJS)\monodll_powercmn.obj \ - $(OBJS)\monodll_process.obj \ - $(OBJS)\monodll_regex.obj \ - $(OBJS)\monodll_stdpbase.obj \ - $(OBJS)\monodll_sstream.obj \ - $(OBJS)\monodll_stdstream.obj \ - $(OBJS)\monodll_stopwatch.obj \ - $(OBJS)\monodll_strconv.obj \ - $(OBJS)\monodll_stream.obj \ - $(OBJS)\monodll_string.obj \ - $(OBJS)\monodll_stringimpl.obj \ - $(OBJS)\monodll_stringops.obj \ - $(OBJS)\monodll_strvararg.obj \ - $(OBJS)\monodll_sysopt.obj \ - $(OBJS)\monodll_tarstrm.obj \ - $(OBJS)\monodll_textbuf.obj \ - $(OBJS)\monodll_textfile.obj \ - $(OBJS)\monodll_threadinfo.obj \ - $(OBJS)\monodll_time.obj \ - $(OBJS)\monodll_timercmn.obj \ - $(OBJS)\monodll_timerimpl.obj \ - $(OBJS)\monodll_tokenzr.obj \ - $(OBJS)\monodll_translation.obj \ - $(OBJS)\monodll_txtstrm.obj \ - $(OBJS)\monodll_unichar.obj \ - $(OBJS)\monodll_uri.obj \ - $(OBJS)\monodll_ustring.obj \ - $(OBJS)\monodll_variant.obj \ - $(OBJS)\monodll_wfstream.obj \ - $(OBJS)\monodll_wxcrt.obj \ - $(OBJS)\monodll_wxprintf.obj \ - $(OBJS)\monodll_xlocale.obj \ - $(OBJS)\monodll_xti.obj \ - $(OBJS)\monodll_xtistrm.obj \ - $(OBJS)\monodll_zipstrm.obj \ - $(OBJS)\monodll_zstream.obj \ - $(OBJS)\monodll_fswatchercmn.obj \ - $(OBJS)\monodll_fswatcherg.obj \ - $(OBJS)\monodll_basemsw.obj \ - $(OBJS)\monodll_crashrpt.obj \ - $(OBJS)\monodll_debughlp.obj \ - $(OBJS)\monodll_dde.obj \ - $(OBJS)\monodll_dir.obj \ - $(OBJS)\monodll_dlmsw.obj \ - $(OBJS)\monodll_evtloopconsole.obj \ - $(OBJS)\monodll_mimetype.obj \ - $(OBJS)\monodll_power.obj \ - $(OBJS)\monodll_regconf.obj \ - $(OBJS)\monodll_registry.obj \ - $(OBJS)\monodll_snglinst.obj \ - $(OBJS)\monodll_stackwalk.obj \ - $(OBJS)\monodll_stdpaths.obj \ - $(OBJS)\monodll_thread.obj \ - $(OBJS)\monodll_timer.obj \ - $(OBJS)\monodll_utils.obj \ - $(OBJS)\monodll_utilsexc.obj \ - $(OBJS)\monodll_fswatcher.obj \ - $(OBJS)\monodll_event.obj \ - $(OBJS)\monodll_fs_mem.obj \ - $(OBJS)\monodll_msgout.obj \ - $(OBJS)\monodll_utilscmn.obj \ - $(OBJS)\monodll_main.obj \ - $(OBJS)\monodll_mslu.obj \ - $(OBJS)\monodll_volume.obj \ - $(OBJS)\monodll_fs_inet.obj \ - $(OBJS)\monodll_ftp.obj \ - $(OBJS)\monodll_http.obj \ - $(OBJS)\monodll_protocol.obj \ - $(OBJS)\monodll_sckaddr.obj \ - $(OBJS)\monodll_sckfile.obj \ - $(OBJS)\monodll_sckipc.obj \ - $(OBJS)\monodll_sckstrm.obj \ - $(OBJS)\monodll_socket.obj \ - $(OBJS)\monodll_url.obj \ - $(OBJS)\monodll_sockmsw.obj \ - $(OBJS)\monodll_urlmsw.obj \ - $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) \ - $(OBJS)\monodll_xml.obj \ - $(OBJS)\monodll_xtixml.obj -MONODLL_RESOURCES = \ - $(OBJS)\monodll_version.res -MONOLIB_CFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ - /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) -MONOLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_131)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ - /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_monolib.pch" $(CPPFLAGS) $(CXXFLAGS) -MONOLIB_OBJECTS = \ - $(OBJS)\monolib_dummy.obj \ - $(OBJS)\monolib_any.obj \ - $(OBJS)\monolib_appbase.obj \ - $(OBJS)\monolib_arcall.obj \ - $(OBJS)\monolib_arcfind.obj \ - $(OBJS)\monolib_archive.obj \ - $(OBJS)\monolib_arrstr.obj \ - $(OBJS)\monolib_base64.obj \ - $(OBJS)\monolib_clntdata.obj \ - $(OBJS)\monolib_cmdline.obj \ - $(OBJS)\monolib_config.obj \ - $(OBJS)\monolib_convauto.obj \ - $(OBJS)\monolib_datetime.obj \ - $(OBJS)\monolib_datetimefmt.obj \ - $(OBJS)\monolib_datstrm.obj \ - $(OBJS)\monolib_dircmn.obj \ - $(OBJS)\monolib_dynarray.obj \ - $(OBJS)\monolib_dynlib.obj \ - $(OBJS)\monolib_dynload.obj \ - $(OBJS)\monolib_encconv.obj \ - $(OBJS)\monolib_evtloopcmn.obj \ - $(OBJS)\monolib_extended.obj \ - $(OBJS)\monolib_ffile.obj \ - $(OBJS)\monolib_file.obj \ - $(OBJS)\monolib_fileback.obj \ - $(OBJS)\monolib_fileconf.obj \ - $(OBJS)\monolib_filefn.obj \ - $(OBJS)\monolib_filename.obj \ - $(OBJS)\monolib_filesys.obj \ - $(OBJS)\monolib_filtall.obj \ - $(OBJS)\monolib_filtfind.obj \ - $(OBJS)\monolib_fmapbase.obj \ - $(OBJS)\monolib_fs_arc.obj \ - $(OBJS)\monolib_fs_filter.obj \ - $(OBJS)\monolib_hash.obj \ - $(OBJS)\monolib_hashmap.obj \ - $(OBJS)\monolib_init.obj \ - $(OBJS)\monolib_intl.obj \ - $(OBJS)\monolib_ipcbase.obj \ - $(OBJS)\monolib_languageinfo.obj \ - $(OBJS)\monolib_list.obj \ - $(OBJS)\monolib_log.obj \ - $(OBJS)\monolib_longlong.obj \ - $(OBJS)\monolib_memory.obj \ - $(OBJS)\monolib_mimecmn.obj \ - $(OBJS)\monolib_module.obj \ - $(OBJS)\monolib_mstream.obj \ - $(OBJS)\monolib_numformatter.obj \ - $(OBJS)\monolib_object.obj \ - $(OBJS)\monolib_platinfo.obj \ - $(OBJS)\monolib_powercmn.obj \ - $(OBJS)\monolib_process.obj \ - $(OBJS)\monolib_regex.obj \ - $(OBJS)\monolib_stdpbase.obj \ - $(OBJS)\monolib_sstream.obj \ - $(OBJS)\monolib_stdstream.obj \ - $(OBJS)\monolib_stopwatch.obj \ - $(OBJS)\monolib_strconv.obj \ - $(OBJS)\monolib_stream.obj \ - $(OBJS)\monolib_string.obj \ - $(OBJS)\monolib_stringimpl.obj \ - $(OBJS)\monolib_stringops.obj \ - $(OBJS)\monolib_strvararg.obj \ - $(OBJS)\monolib_sysopt.obj \ - $(OBJS)\monolib_tarstrm.obj \ - $(OBJS)\monolib_textbuf.obj \ - $(OBJS)\monolib_textfile.obj \ - $(OBJS)\monolib_threadinfo.obj \ - $(OBJS)\monolib_time.obj \ - $(OBJS)\monolib_timercmn.obj \ - $(OBJS)\monolib_timerimpl.obj \ - $(OBJS)\monolib_tokenzr.obj \ - $(OBJS)\monolib_translation.obj \ - $(OBJS)\monolib_txtstrm.obj \ - $(OBJS)\monolib_unichar.obj \ - $(OBJS)\monolib_uri.obj \ - $(OBJS)\monolib_ustring.obj \ - $(OBJS)\monolib_variant.obj \ - $(OBJS)\monolib_wfstream.obj \ - $(OBJS)\monolib_wxcrt.obj \ - $(OBJS)\monolib_wxprintf.obj \ - $(OBJS)\monolib_xlocale.obj \ - $(OBJS)\monolib_xti.obj \ - $(OBJS)\monolib_xtistrm.obj \ - $(OBJS)\monolib_zipstrm.obj \ - $(OBJS)\monolib_zstream.obj \ - $(OBJS)\monolib_fswatchercmn.obj \ - $(OBJS)\monolib_fswatcherg.obj \ - $(OBJS)\monolib_basemsw.obj \ - $(OBJS)\monolib_crashrpt.obj \ - $(OBJS)\monolib_debughlp.obj \ - $(OBJS)\monolib_dde.obj \ - $(OBJS)\monolib_dir.obj \ - $(OBJS)\monolib_dlmsw.obj \ - $(OBJS)\monolib_evtloopconsole.obj \ - $(OBJS)\monolib_mimetype.obj \ - $(OBJS)\monolib_power.obj \ - $(OBJS)\monolib_regconf.obj \ - $(OBJS)\monolib_registry.obj \ - $(OBJS)\monolib_snglinst.obj \ - $(OBJS)\monolib_stackwalk.obj \ - $(OBJS)\monolib_stdpaths.obj \ - $(OBJS)\monolib_thread.obj \ - $(OBJS)\monolib_timer.obj \ - $(OBJS)\monolib_utils.obj \ - $(OBJS)\monolib_utilsexc.obj \ - $(OBJS)\monolib_fswatcher.obj \ - $(OBJS)\monolib_event.obj \ - $(OBJS)\monolib_fs_mem.obj \ - $(OBJS)\monolib_msgout.obj \ - $(OBJS)\monolib_utilscmn.obj \ - $(OBJS)\monolib_main.obj \ - $(OBJS)\monolib_mslu.obj \ - $(OBJS)\monolib_volume.obj \ - $(OBJS)\monolib_fs_inet.obj \ - $(OBJS)\monolib_ftp.obj \ - $(OBJS)\monolib_http.obj \ - $(OBJS)\monolib_protocol.obj \ - $(OBJS)\monolib_sckaddr.obj \ - $(OBJS)\monolib_sckfile.obj \ - $(OBJS)\monolib_sckipc.obj \ - $(OBJS)\monolib_sckstrm.obj \ - $(OBJS)\monolib_socket.obj \ - $(OBJS)\monolib_url.obj \ - $(OBJS)\monolib_sockmsw.obj \ - $(OBJS)\monolib_urlmsw.obj \ - $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) \ - $(OBJS)\monolib_xml.obj \ - $(OBJS)\monolib_xtixml.obj -BASEDLL_CFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ - /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) -BASEDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_147)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ - /DWXMAKINGDLL_BASE /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_basedll.pch" $(CPPFLAGS) $(CXXFLAGS) -BASEDLL_OBJECTS = \ - $(OBJS)\basedll_dummy.obj \ - $(OBJS)\basedll_any.obj \ - $(OBJS)\basedll_appbase.obj \ - $(OBJS)\basedll_arcall.obj \ - $(OBJS)\basedll_arcfind.obj \ - $(OBJS)\basedll_archive.obj \ - $(OBJS)\basedll_arrstr.obj \ - $(OBJS)\basedll_base64.obj \ - $(OBJS)\basedll_clntdata.obj \ - $(OBJS)\basedll_cmdline.obj \ - $(OBJS)\basedll_config.obj \ - $(OBJS)\basedll_convauto.obj \ - $(OBJS)\basedll_datetime.obj \ - $(OBJS)\basedll_datetimefmt.obj \ - $(OBJS)\basedll_datstrm.obj \ - $(OBJS)\basedll_dircmn.obj \ - $(OBJS)\basedll_dynarray.obj \ - $(OBJS)\basedll_dynlib.obj \ - $(OBJS)\basedll_dynload.obj \ - $(OBJS)\basedll_encconv.obj \ - $(OBJS)\basedll_evtloopcmn.obj \ - $(OBJS)\basedll_extended.obj \ - $(OBJS)\basedll_ffile.obj \ - $(OBJS)\basedll_file.obj \ - $(OBJS)\basedll_fileback.obj \ - $(OBJS)\basedll_fileconf.obj \ - $(OBJS)\basedll_filefn.obj \ - $(OBJS)\basedll_filename.obj \ - $(OBJS)\basedll_filesys.obj \ - $(OBJS)\basedll_filtall.obj \ - $(OBJS)\basedll_filtfind.obj \ - $(OBJS)\basedll_fmapbase.obj \ - $(OBJS)\basedll_fs_arc.obj \ - $(OBJS)\basedll_fs_filter.obj \ - $(OBJS)\basedll_hash.obj \ - $(OBJS)\basedll_hashmap.obj \ - $(OBJS)\basedll_init.obj \ - $(OBJS)\basedll_intl.obj \ - $(OBJS)\basedll_ipcbase.obj \ - $(OBJS)\basedll_languageinfo.obj \ - $(OBJS)\basedll_list.obj \ - $(OBJS)\basedll_log.obj \ - $(OBJS)\basedll_longlong.obj \ - $(OBJS)\basedll_memory.obj \ - $(OBJS)\basedll_mimecmn.obj \ - $(OBJS)\basedll_module.obj \ - $(OBJS)\basedll_mstream.obj \ - $(OBJS)\basedll_numformatter.obj \ - $(OBJS)\basedll_object.obj \ - $(OBJS)\basedll_platinfo.obj \ - $(OBJS)\basedll_powercmn.obj \ - $(OBJS)\basedll_process.obj \ - $(OBJS)\basedll_regex.obj \ - $(OBJS)\basedll_stdpbase.obj \ - $(OBJS)\basedll_sstream.obj \ - $(OBJS)\basedll_stdstream.obj \ - $(OBJS)\basedll_stopwatch.obj \ - $(OBJS)\basedll_strconv.obj \ - $(OBJS)\basedll_stream.obj \ - $(OBJS)\basedll_string.obj \ - $(OBJS)\basedll_stringimpl.obj \ - $(OBJS)\basedll_stringops.obj \ - $(OBJS)\basedll_strvararg.obj \ - $(OBJS)\basedll_sysopt.obj \ - $(OBJS)\basedll_tarstrm.obj \ - $(OBJS)\basedll_textbuf.obj \ - $(OBJS)\basedll_textfile.obj \ - $(OBJS)\basedll_threadinfo.obj \ - $(OBJS)\basedll_time.obj \ - $(OBJS)\basedll_timercmn.obj \ - $(OBJS)\basedll_timerimpl.obj \ - $(OBJS)\basedll_tokenzr.obj \ - $(OBJS)\basedll_translation.obj \ - $(OBJS)\basedll_txtstrm.obj \ - $(OBJS)\basedll_unichar.obj \ - $(OBJS)\basedll_uri.obj \ - $(OBJS)\basedll_ustring.obj \ - $(OBJS)\basedll_variant.obj \ - $(OBJS)\basedll_wfstream.obj \ - $(OBJS)\basedll_wxcrt.obj \ - $(OBJS)\basedll_wxprintf.obj \ - $(OBJS)\basedll_xlocale.obj \ - $(OBJS)\basedll_xti.obj \ - $(OBJS)\basedll_xtistrm.obj \ - $(OBJS)\basedll_zipstrm.obj \ - $(OBJS)\basedll_zstream.obj \ - $(OBJS)\basedll_fswatchercmn.obj \ - $(OBJS)\basedll_fswatcherg.obj \ - $(OBJS)\basedll_basemsw.obj \ - $(OBJS)\basedll_crashrpt.obj \ - $(OBJS)\basedll_debughlp.obj \ - $(OBJS)\basedll_dde.obj \ - $(OBJS)\basedll_dir.obj \ - $(OBJS)\basedll_dlmsw.obj \ - $(OBJS)\basedll_evtloopconsole.obj \ - $(OBJS)\basedll_mimetype.obj \ - $(OBJS)\basedll_power.obj \ - $(OBJS)\basedll_regconf.obj \ - $(OBJS)\basedll_registry.obj \ - $(OBJS)\basedll_snglinst.obj \ - $(OBJS)\basedll_stackwalk.obj \ - $(OBJS)\basedll_stdpaths.obj \ - $(OBJS)\basedll_thread.obj \ - $(OBJS)\basedll_timer.obj \ - $(OBJS)\basedll_utils.obj \ - $(OBJS)\basedll_utilsexc.obj \ - $(OBJS)\basedll_fswatcher.obj \ - $(OBJS)\basedll_event.obj \ - $(OBJS)\basedll_fs_mem.obj \ - $(OBJS)\basedll_msgout.obj \ - $(OBJS)\basedll_utilscmn.obj \ - $(OBJS)\basedll_main.obj \ - $(OBJS)\basedll_mslu.obj \ - $(OBJS)\basedll_volume.obj -BASEDLL_RESOURCES = \ - $(OBJS)\basedll_version.res -BASELIB_CFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ - /DwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) -BASELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_162)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ - /DwxUSE_BASE=1 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_baselib.pch" $(CPPFLAGS) $(CXXFLAGS) -BASELIB_OBJECTS = \ - $(OBJS)\baselib_dummy.obj \ - $(OBJS)\baselib_any.obj \ - $(OBJS)\baselib_appbase.obj \ - $(OBJS)\baselib_arcall.obj \ - $(OBJS)\baselib_arcfind.obj \ - $(OBJS)\baselib_archive.obj \ - $(OBJS)\baselib_arrstr.obj \ - $(OBJS)\baselib_base64.obj \ - $(OBJS)\baselib_clntdata.obj \ - $(OBJS)\baselib_cmdline.obj \ - $(OBJS)\baselib_config.obj \ - $(OBJS)\baselib_convauto.obj \ - $(OBJS)\baselib_datetime.obj \ - $(OBJS)\baselib_datetimefmt.obj \ - $(OBJS)\baselib_datstrm.obj \ - $(OBJS)\baselib_dircmn.obj \ - $(OBJS)\baselib_dynarray.obj \ - $(OBJS)\baselib_dynlib.obj \ - $(OBJS)\baselib_dynload.obj \ - $(OBJS)\baselib_encconv.obj \ - $(OBJS)\baselib_evtloopcmn.obj \ - $(OBJS)\baselib_extended.obj \ - $(OBJS)\baselib_ffile.obj \ - $(OBJS)\baselib_file.obj \ - $(OBJS)\baselib_fileback.obj \ - $(OBJS)\baselib_fileconf.obj \ - $(OBJS)\baselib_filefn.obj \ - $(OBJS)\baselib_filename.obj \ - $(OBJS)\baselib_filesys.obj \ - $(OBJS)\baselib_filtall.obj \ - $(OBJS)\baselib_filtfind.obj \ - $(OBJS)\baselib_fmapbase.obj \ - $(OBJS)\baselib_fs_arc.obj \ - $(OBJS)\baselib_fs_filter.obj \ - $(OBJS)\baselib_hash.obj \ - $(OBJS)\baselib_hashmap.obj \ - $(OBJS)\baselib_init.obj \ - $(OBJS)\baselib_intl.obj \ - $(OBJS)\baselib_ipcbase.obj \ - $(OBJS)\baselib_languageinfo.obj \ - $(OBJS)\baselib_list.obj \ - $(OBJS)\baselib_log.obj \ - $(OBJS)\baselib_longlong.obj \ - $(OBJS)\baselib_memory.obj \ - $(OBJS)\baselib_mimecmn.obj \ - $(OBJS)\baselib_module.obj \ - $(OBJS)\baselib_mstream.obj \ - $(OBJS)\baselib_numformatter.obj \ - $(OBJS)\baselib_object.obj \ - $(OBJS)\baselib_platinfo.obj \ - $(OBJS)\baselib_powercmn.obj \ - $(OBJS)\baselib_process.obj \ - $(OBJS)\baselib_regex.obj \ - $(OBJS)\baselib_stdpbase.obj \ - $(OBJS)\baselib_sstream.obj \ - $(OBJS)\baselib_stdstream.obj \ - $(OBJS)\baselib_stopwatch.obj \ - $(OBJS)\baselib_strconv.obj \ - $(OBJS)\baselib_stream.obj \ - $(OBJS)\baselib_string.obj \ - $(OBJS)\baselib_stringimpl.obj \ - $(OBJS)\baselib_stringops.obj \ - $(OBJS)\baselib_strvararg.obj \ - $(OBJS)\baselib_sysopt.obj \ - $(OBJS)\baselib_tarstrm.obj \ - $(OBJS)\baselib_textbuf.obj \ - $(OBJS)\baselib_textfile.obj \ - $(OBJS)\baselib_threadinfo.obj \ - $(OBJS)\baselib_time.obj \ - $(OBJS)\baselib_timercmn.obj \ - $(OBJS)\baselib_timerimpl.obj \ - $(OBJS)\baselib_tokenzr.obj \ - $(OBJS)\baselib_translation.obj \ - $(OBJS)\baselib_txtstrm.obj \ - $(OBJS)\baselib_unichar.obj \ - $(OBJS)\baselib_uri.obj \ - $(OBJS)\baselib_ustring.obj \ - $(OBJS)\baselib_variant.obj \ - $(OBJS)\baselib_wfstream.obj \ - $(OBJS)\baselib_wxcrt.obj \ - $(OBJS)\baselib_wxprintf.obj \ - $(OBJS)\baselib_xlocale.obj \ - $(OBJS)\baselib_xti.obj \ - $(OBJS)\baselib_xtistrm.obj \ - $(OBJS)\baselib_zipstrm.obj \ - $(OBJS)\baselib_zstream.obj \ - $(OBJS)\baselib_fswatchercmn.obj \ - $(OBJS)\baselib_fswatcherg.obj \ - $(OBJS)\baselib_basemsw.obj \ - $(OBJS)\baselib_crashrpt.obj \ - $(OBJS)\baselib_debughlp.obj \ - $(OBJS)\baselib_dde.obj \ - $(OBJS)\baselib_dir.obj \ - $(OBJS)\baselib_dlmsw.obj \ - $(OBJS)\baselib_evtloopconsole.obj \ - $(OBJS)\baselib_mimetype.obj \ - $(OBJS)\baselib_power.obj \ - $(OBJS)\baselib_regconf.obj \ - $(OBJS)\baselib_registry.obj \ - $(OBJS)\baselib_snglinst.obj \ - $(OBJS)\baselib_stackwalk.obj \ - $(OBJS)\baselib_stdpaths.obj \ - $(OBJS)\baselib_thread.obj \ - $(OBJS)\baselib_timer.obj \ - $(OBJS)\baselib_utils.obj \ - $(OBJS)\baselib_utilsexc.obj \ - $(OBJS)\baselib_fswatcher.obj \ - $(OBJS)\baselib_event.obj \ - $(OBJS)\baselib_fs_mem.obj \ - $(OBJS)\baselib_msgout.obj \ - $(OBJS)\baselib_utilscmn.obj \ - $(OBJS)\baselib_main.obj \ - $(OBJS)\baselib_mslu.obj \ - $(OBJS)\baselib_volume.obj -NETDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_178)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ - /DWXUSINGDLL /DWXMAKINGDLL_NET $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_netdll.pch" $(CPPFLAGS) $(CXXFLAGS) -NETDLL_OBJECTS = \ - $(OBJS)\netdll_dummy.obj \ - $(OBJS)\netdll_fs_inet.obj \ - $(OBJS)\netdll_ftp.obj \ - $(OBJS)\netdll_http.obj \ - $(OBJS)\netdll_protocol.obj \ - $(OBJS)\netdll_sckaddr.obj \ - $(OBJS)\netdll_sckfile.obj \ - $(OBJS)\netdll_sckipc.obj \ - $(OBJS)\netdll_sckstrm.obj \ - $(OBJS)\netdll_socket.obj \ - $(OBJS)\netdll_url.obj \ - $(OBJS)\netdll_sockmsw.obj \ - $(OBJS)\netdll_urlmsw.obj -NETDLL_RESOURCES = \ - $(OBJS)\netdll_version.res -NETLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_193)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_netlib.pch" $(CPPFLAGS) $(CXXFLAGS) -NETLIB_OBJECTS = \ - $(OBJS)\netlib_dummy.obj \ - $(OBJS)\netlib_fs_inet.obj \ - $(OBJS)\netlib_ftp.obj \ - $(OBJS)\netlib_http.obj \ - $(OBJS)\netlib_protocol.obj \ - $(OBJS)\netlib_sckaddr.obj \ - $(OBJS)\netlib_sckfile.obj \ - $(OBJS)\netlib_sckipc.obj \ - $(OBJS)\netlib_sckstrm.obj \ - $(OBJS)\netlib_socket.obj \ - $(OBJS)\netlib_url.obj \ - $(OBJS)\netlib_sockmsw.obj \ - $(OBJS)\netlib_urlmsw.obj -COREDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_209)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_CORE /DwxUSE_BASE=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_coredll.pch" $(CPPFLAGS) $(CXXFLAGS) -COREDLL_OBJECTS = \ - $(OBJS)\coredll_dummy.obj \ - $(OBJS)\coredll_event.obj \ - $(OBJS)\coredll_fs_mem.obj \ - $(OBJS)\coredll_msgout.obj \ - $(OBJS)\coredll_utilscmn.obj \ - $(OBJS)\coredll_main.obj \ - $(OBJS)\coredll_mslu.obj \ - $(OBJS)\coredll_volume.obj \ - $(____CORE_SRC_FILENAMES_2_OBJECTS) -COREDLL_RESOURCES = \ - $(OBJS)\coredll_version.res -CORELIB_CXXFLAGS = /M$(__RUNTIME_LIBS_224)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_BASE=0 \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_corelib.pch" $(CPPFLAGS) $(CXXFLAGS) -CORELIB_OBJECTS = \ - $(OBJS)\corelib_dummy.obj \ - $(OBJS)\corelib_event.obj \ - $(OBJS)\corelib_fs_mem.obj \ - $(OBJS)\corelib_msgout.obj \ - $(OBJS)\corelib_utilscmn.obj \ - $(OBJS)\corelib_main.obj \ - $(OBJS)\corelib_mslu.obj \ - $(OBJS)\corelib_volume.obj \ - $(____CORE_SRC_FILENAMES_3_OBJECTS) -ADVDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_240)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_ADV $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_advdll.pch" $(CPPFLAGS) $(CXXFLAGS) -ADVDLL_OBJECTS = \ - $(OBJS)\advdll_dummy.obj \ - $(____ADVANCED_SRC_FILENAMES_2_OBJECTS) -ADVDLL_RESOURCES = \ - $(OBJS)\advdll_version.res -ADVLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_255)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_advlib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) -ADVLIB_OBJECTS = \ - $(OBJS)\advlib_dummy.obj \ - $(____ADVANCED_SRC_FILENAMES_3_OBJECTS) -MEDIADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_271)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_MEDIA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_mediadll.pch" $(CPPFLAGS) $(CXXFLAGS) -MEDIADLL_OBJECTS = \ - $(OBJS)\mediadll_dummy.obj \ - $(OBJS)\mediadll_mediactrlcmn.obj \ - $(OBJS)\mediadll_mediactrl_am.obj \ - $(OBJS)\mediadll_mediactrl_wmp10.obj \ - $(OBJS)\mediadll_mediactrl_qt.obj -MEDIADLL_RESOURCES = \ - $(OBJS)\mediadll_version.res -MEDIALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_286)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_medialib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) -MEDIALIB_OBJECTS = \ - $(OBJS)\medialib_dummy.obj \ - $(OBJS)\medialib_mediactrlcmn.obj \ - $(OBJS)\medialib_mediactrl_am.obj \ - $(OBJS)\medialib_mediactrl_wmp10.obj \ - $(OBJS)\medialib_mediactrl_qt.obj -HTMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_302)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_HTML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_htmldll.pch" $(CPPFLAGS) $(CXXFLAGS) -HTMLDLL_OBJECTS = \ - $(OBJS)\htmldll_dummy.obj \ - $(OBJS)\htmldll_helpbest.obj \ - $(OBJS)\htmldll_helpctrl.obj \ - $(OBJS)\htmldll_helpdata.obj \ - $(OBJS)\htmldll_helpdlg.obj \ - $(OBJS)\htmldll_helpfrm.obj \ - $(OBJS)\htmldll_helpwnd.obj \ - $(OBJS)\htmldll_htmlcell.obj \ - $(OBJS)\htmldll_htmlfilt.obj \ - $(OBJS)\htmldll_htmlpars.obj \ - $(OBJS)\htmldll_htmltag.obj \ - $(OBJS)\htmldll_htmlwin.obj \ - $(OBJS)\htmldll_htmprint.obj \ - $(OBJS)\htmldll_m_dflist.obj \ - $(OBJS)\htmldll_m_fonts.obj \ - $(OBJS)\htmldll_m_hline.obj \ - $(OBJS)\htmldll_m_image.obj \ - $(OBJS)\htmldll_m_layout.obj \ - $(OBJS)\htmldll_m_links.obj \ - $(OBJS)\htmldll_m_list.obj \ - $(OBJS)\htmldll_m_pre.obj \ - $(OBJS)\htmldll_m_span.obj \ - $(OBJS)\htmldll_m_style.obj \ - $(OBJS)\htmldll_m_tables.obj \ - $(OBJS)\htmldll_styleparams.obj \ - $(OBJS)\htmldll_winpars.obj \ - $(OBJS)\htmldll_htmllbox.obj -HTMLDLL_RESOURCES = \ - $(OBJS)\htmldll_version.res -HTMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_317)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_htmllib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) -HTMLLIB_OBJECTS = \ - $(OBJS)\htmllib_dummy.obj \ - $(OBJS)\htmllib_helpbest.obj \ - $(OBJS)\htmllib_helpctrl.obj \ - $(OBJS)\htmllib_helpdata.obj \ - $(OBJS)\htmllib_helpdlg.obj \ - $(OBJS)\htmllib_helpfrm.obj \ - $(OBJS)\htmllib_helpwnd.obj \ - $(OBJS)\htmllib_htmlcell.obj \ - $(OBJS)\htmllib_htmlfilt.obj \ - $(OBJS)\htmllib_htmlpars.obj \ - $(OBJS)\htmllib_htmltag.obj \ - $(OBJS)\htmllib_htmlwin.obj \ - $(OBJS)\htmllib_htmprint.obj \ - $(OBJS)\htmllib_m_dflist.obj \ - $(OBJS)\htmllib_m_fonts.obj \ - $(OBJS)\htmllib_m_hline.obj \ - $(OBJS)\htmllib_m_image.obj \ - $(OBJS)\htmllib_m_layout.obj \ - $(OBJS)\htmllib_m_links.obj \ - $(OBJS)\htmllib_m_list.obj \ - $(OBJS)\htmllib_m_pre.obj \ - $(OBJS)\htmllib_m_span.obj \ - $(OBJS)\htmllib_m_style.obj \ - $(OBJS)\htmllib_m_tables.obj \ - $(OBJS)\htmllib_styleparams.obj \ - $(OBJS)\htmllib_winpars.obj \ - $(OBJS)\htmllib_htmllbox.obj -WEBVIEWDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_333)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_WEBVIEW $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_webviewdll.pch" $(CPPFLAGS) $(CXXFLAGS) -WEBVIEWDLL_OBJECTS = \ - $(OBJS)\webviewdll_dummy.obj \ - $(OBJS)\webviewdll_webview_ie.obj \ - $(OBJS)\webviewdll_webview.obj \ - $(OBJS)\webviewdll_webviewarchivehandler.obj \ - $(OBJS)\webviewdll_webviewfshandler.obj -WEBVIEWDLL_RESOURCES = \ - $(OBJS)\webviewdll_version.res -WEBVIEWLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_348)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_webviewlib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) -WEBVIEWLIB_OBJECTS = \ - $(OBJS)\webviewlib_dummy.obj \ - $(OBJS)\webviewlib_webview_ie.obj \ - $(OBJS)\webviewlib_webview.obj \ - $(OBJS)\webviewlib_webviewarchivehandler.obj \ - $(OBJS)\webviewlib_webviewfshandler.obj -QADLL_CXXFLAGS = /M$(__RUNTIME_LIBS_364)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_QA $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_qadll.pch" $(CPPFLAGS) $(CXXFLAGS) -QADLL_OBJECTS = \ - $(OBJS)\qadll_dummy.obj \ - $(OBJS)\qadll_debugrpt.obj \ - $(OBJS)\qadll_dbgrptg.obj -QADLL_RESOURCES = \ - $(OBJS)\qadll_version.res -QALIB_CXXFLAGS = /M$(__RUNTIME_LIBS_379)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_qalib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) -QALIB_OBJECTS = \ - $(OBJS)\qalib_dummy.obj \ - $(OBJS)\qalib_debugrpt.obj \ - $(OBJS)\qalib_dbgrptg.obj -XMLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_395)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ - /DWXUSINGDLL /DWXMAKINGDLL_XML $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xmldll.pch" $(CPPFLAGS) $(CXXFLAGS) -XMLDLL_OBJECTS = \ - $(OBJS)\xmldll_dummy.obj \ - $(OBJS)\xmldll_xml.obj \ - $(OBJS)\xmldll_xtixml.obj -XMLDLL_RESOURCES = \ - $(OBJS)\xmldll_version.res -XMLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_410)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DwxUSE_GUI=0 \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_xmllib.pch" $(CPPFLAGS) $(CXXFLAGS) -XMLLIB_OBJECTS = \ - $(OBJS)\xmllib_dummy.obj \ - $(OBJS)\xmllib_xml.obj \ - $(OBJS)\xmllib_xtixml.obj -XRCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_426)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_XRC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_xrcdll.pch" $(CPPFLAGS) $(CXXFLAGS) -XRCDLL_OBJECTS = \ - $(OBJS)\xrcdll_dummy.obj \ - $(OBJS)\xrcdll_xh_animatctrl.obj \ - $(OBJS)\xrcdll_xh_bannerwindow.obj \ - $(OBJS)\xrcdll_xh_bmp.obj \ - $(OBJS)\xrcdll_xh_bmpcbox.obj \ - $(OBJS)\xrcdll_xh_bmpbt.obj \ - $(OBJS)\xrcdll_xh_bttn.obj \ - $(OBJS)\xrcdll_xh_cald.obj \ - $(OBJS)\xrcdll_xh_chckb.obj \ - $(OBJS)\xrcdll_xh_chckl.obj \ - $(OBJS)\xrcdll_xh_choic.obj \ - $(OBJS)\xrcdll_xh_choicbk.obj \ - $(OBJS)\xrcdll_xh_clrpicker.obj \ - $(OBJS)\xrcdll_xh_cmdlinkbn.obj \ - $(OBJS)\xrcdll_xh_collpane.obj \ - $(OBJS)\xrcdll_xh_combo.obj \ - $(OBJS)\xrcdll_xh_comboctrl.obj \ - $(OBJS)\xrcdll_xh_datectrl.obj \ - $(OBJS)\xrcdll_xh_dirpicker.obj \ - $(OBJS)\xrcdll_xh_dlg.obj \ - $(OBJS)\xrcdll_xh_editlbox.obj \ - $(OBJS)\xrcdll_xh_filectrl.obj \ - $(OBJS)\xrcdll_xh_filepicker.obj \ - $(OBJS)\xrcdll_xh_fontpicker.obj \ - $(OBJS)\xrcdll_xh_frame.obj \ - $(OBJS)\xrcdll_xh_gauge.obj \ - $(OBJS)\xrcdll_xh_gdctl.obj \ - $(OBJS)\xrcdll_xh_grid.obj \ - $(OBJS)\xrcdll_xh_html.obj \ - $(OBJS)\xrcdll_xh_hyperlink.obj \ - $(OBJS)\xrcdll_xh_listb.obj \ - $(OBJS)\xrcdll_xh_listbk.obj \ - $(OBJS)\xrcdll_xh_listc.obj \ - $(OBJS)\xrcdll_xh_mdi.obj \ - $(OBJS)\xrcdll_xh_menu.obj \ - $(OBJS)\xrcdll_xh_notbk.obj \ - $(OBJS)\xrcdll_xh_odcombo.obj \ - $(OBJS)\xrcdll_xh_panel.obj \ - $(OBJS)\xrcdll_xh_propdlg.obj \ - $(OBJS)\xrcdll_xh_radbt.obj \ - $(OBJS)\xrcdll_xh_radbx.obj \ - $(OBJS)\xrcdll_xh_scrol.obj \ - $(OBJS)\xrcdll_xh_scwin.obj \ - $(OBJS)\xrcdll_xh_htmllbox.obj \ - $(OBJS)\xrcdll_xh_sizer.obj \ - $(OBJS)\xrcdll_xh_slidr.obj \ - $(OBJS)\xrcdll_xh_spin.obj \ - $(OBJS)\xrcdll_xh_split.obj \ - $(OBJS)\xrcdll_xh_srchctrl.obj \ - $(OBJS)\xrcdll_xh_statbar.obj \ - $(OBJS)\xrcdll_xh_stbmp.obj \ - $(OBJS)\xrcdll_xh_stbox.obj \ - $(OBJS)\xrcdll_xh_stlin.obj \ - $(OBJS)\xrcdll_xh_sttxt.obj \ - $(OBJS)\xrcdll_xh_text.obj \ - $(OBJS)\xrcdll_xh_tglbtn.obj \ - $(OBJS)\xrcdll_xh_timectrl.obj \ - $(OBJS)\xrcdll_xh_toolb.obj \ - $(OBJS)\xrcdll_xh_toolbk.obj \ - $(OBJS)\xrcdll_xh_tree.obj \ - $(OBJS)\xrcdll_xh_treebk.obj \ - $(OBJS)\xrcdll_xh_unkwn.obj \ - $(OBJS)\xrcdll_xh_wizrd.obj \ - $(OBJS)\xrcdll_xmlres.obj \ - $(OBJS)\xrcdll_xmladv.obj \ - $(OBJS)\xrcdll_xmlrsall.obj -XRCDLL_RESOURCES = \ - $(OBJS)\xrcdll_version.res -XRCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_441)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_xrclib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) -XRCLIB_OBJECTS = \ - $(OBJS)\xrclib_dummy.obj \ - $(OBJS)\xrclib_xh_animatctrl.obj \ - $(OBJS)\xrclib_xh_bannerwindow.obj \ - $(OBJS)\xrclib_xh_bmp.obj \ - $(OBJS)\xrclib_xh_bmpcbox.obj \ - $(OBJS)\xrclib_xh_bmpbt.obj \ - $(OBJS)\xrclib_xh_bttn.obj \ - $(OBJS)\xrclib_xh_cald.obj \ - $(OBJS)\xrclib_xh_chckb.obj \ - $(OBJS)\xrclib_xh_chckl.obj \ - $(OBJS)\xrclib_xh_choic.obj \ - $(OBJS)\xrclib_xh_choicbk.obj \ - $(OBJS)\xrclib_xh_clrpicker.obj \ - $(OBJS)\xrclib_xh_cmdlinkbn.obj \ - $(OBJS)\xrclib_xh_collpane.obj \ - $(OBJS)\xrclib_xh_combo.obj \ - $(OBJS)\xrclib_xh_comboctrl.obj \ - $(OBJS)\xrclib_xh_datectrl.obj \ - $(OBJS)\xrclib_xh_dirpicker.obj \ - $(OBJS)\xrclib_xh_dlg.obj \ - $(OBJS)\xrclib_xh_editlbox.obj \ - $(OBJS)\xrclib_xh_filectrl.obj \ - $(OBJS)\xrclib_xh_filepicker.obj \ - $(OBJS)\xrclib_xh_fontpicker.obj \ - $(OBJS)\xrclib_xh_frame.obj \ - $(OBJS)\xrclib_xh_gauge.obj \ - $(OBJS)\xrclib_xh_gdctl.obj \ - $(OBJS)\xrclib_xh_grid.obj \ - $(OBJS)\xrclib_xh_html.obj \ - $(OBJS)\xrclib_xh_hyperlink.obj \ - $(OBJS)\xrclib_xh_listb.obj \ - $(OBJS)\xrclib_xh_listbk.obj \ - $(OBJS)\xrclib_xh_listc.obj \ - $(OBJS)\xrclib_xh_mdi.obj \ - $(OBJS)\xrclib_xh_menu.obj \ - $(OBJS)\xrclib_xh_notbk.obj \ - $(OBJS)\xrclib_xh_odcombo.obj \ - $(OBJS)\xrclib_xh_panel.obj \ - $(OBJS)\xrclib_xh_propdlg.obj \ - $(OBJS)\xrclib_xh_radbt.obj \ - $(OBJS)\xrclib_xh_radbx.obj \ - $(OBJS)\xrclib_xh_scrol.obj \ - $(OBJS)\xrclib_xh_scwin.obj \ - $(OBJS)\xrclib_xh_htmllbox.obj \ - $(OBJS)\xrclib_xh_sizer.obj \ - $(OBJS)\xrclib_xh_slidr.obj \ - $(OBJS)\xrclib_xh_spin.obj \ - $(OBJS)\xrclib_xh_split.obj \ - $(OBJS)\xrclib_xh_srchctrl.obj \ - $(OBJS)\xrclib_xh_statbar.obj \ - $(OBJS)\xrclib_xh_stbmp.obj \ - $(OBJS)\xrclib_xh_stbox.obj \ - $(OBJS)\xrclib_xh_stlin.obj \ - $(OBJS)\xrclib_xh_sttxt.obj \ - $(OBJS)\xrclib_xh_text.obj \ - $(OBJS)\xrclib_xh_tglbtn.obj \ - $(OBJS)\xrclib_xh_timectrl.obj \ - $(OBJS)\xrclib_xh_toolb.obj \ - $(OBJS)\xrclib_xh_toolbk.obj \ - $(OBJS)\xrclib_xh_tree.obj \ - $(OBJS)\xrclib_xh_treebk.obj \ - $(OBJS)\xrclib_xh_unkwn.obj \ - $(OBJS)\xrclib_xh_wizrd.obj \ - $(OBJS)\xrclib_xmlres.obj \ - $(OBJS)\xrclib_xmladv.obj \ - $(OBJS)\xrclib_xmlrsall.obj -AUIDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_457)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_AUI $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_auidll.pch" $(CPPFLAGS) $(CXXFLAGS) -AUIDLL_OBJECTS = \ - $(OBJS)\auidll_dummy.obj \ - $(OBJS)\auidll_framemanager.obj \ - $(OBJS)\auidll_dockart.obj \ - $(OBJS)\auidll_floatpane.obj \ - $(OBJS)\auidll_auibook.obj \ - $(OBJS)\auidll_auibar.obj \ - $(OBJS)\auidll_tabmdi.obj \ - $(OBJS)\auidll_tabart.obj \ - $(OBJS)\auidll_xh_auinotbk.obj -AUIDLL_RESOURCES = \ - $(OBJS)\auidll_version.res -AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_472)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_auilib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) -AUILIB_OBJECTS = \ - $(OBJS)\auilib_dummy.obj \ - $(OBJS)\auilib_framemanager.obj \ - $(OBJS)\auilib_dockart.obj \ - $(OBJS)\auilib_floatpane.obj \ - $(OBJS)\auilib_auibook.obj \ - $(OBJS)\auilib_auibar.obj \ - $(OBJS)\auilib_tabmdi.obj \ - $(OBJS)\auilib_tabart.obj \ - $(OBJS)\auilib_xh_auinotbk.obj -RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_488)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_RIBBON $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_ribbondll.pch" $(CPPFLAGS) $(CXXFLAGS) -RIBBONDLL_OBJECTS = \ - $(OBJS)\ribbondll_dummy.obj \ - $(OBJS)\ribbondll_art_internal.obj \ - $(OBJS)\ribbondll_art_msw.obj \ - $(OBJS)\ribbondll_art_aui.obj \ - $(OBJS)\ribbondll_bar.obj \ - $(OBJS)\ribbondll_buttonbar.obj \ - $(OBJS)\ribbondll_control.obj \ - $(OBJS)\ribbondll_gallery.obj \ - $(OBJS)\ribbondll_page.obj \ - $(OBJS)\ribbondll_panel.obj \ - $(OBJS)\ribbondll_toolbar.obj \ - $(OBJS)\ribbondll_xh_ribbon.obj -RIBBONDLL_RESOURCES = \ - $(OBJS)\ribbondll_version.res -RIBBONLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_503)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_ribbonlib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) -RIBBONLIB_OBJECTS = \ - $(OBJS)\ribbonlib_dummy.obj \ - $(OBJS)\ribbonlib_art_internal.obj \ - $(OBJS)\ribbonlib_art_msw.obj \ - $(OBJS)\ribbonlib_art_aui.obj \ - $(OBJS)\ribbonlib_bar.obj \ - $(OBJS)\ribbonlib_buttonbar.obj \ - $(OBJS)\ribbonlib_control.obj \ - $(OBJS)\ribbonlib_gallery.obj \ - $(OBJS)\ribbonlib_page.obj \ - $(OBJS)\ribbonlib_panel.obj \ - $(OBJS)\ribbonlib_toolbar.obj \ - $(OBJS)\ribbonlib_xh_ribbon.obj -PROPGRIDDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_519)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_PROPGRID $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_propgriddll.pch" $(CPPFLAGS) $(CXXFLAGS) -PROPGRIDDLL_OBJECTS = \ - $(OBJS)\propgriddll_dummy.obj \ - $(OBJS)\propgriddll_advprops.obj \ - $(OBJS)\propgriddll_editors.obj \ - $(OBJS)\propgriddll_manager.obj \ - $(OBJS)\propgriddll_property.obj \ - $(OBJS)\propgriddll_propgrid.obj \ - $(OBJS)\propgriddll_propgridiface.obj \ - $(OBJS)\propgriddll_propgridpagestate.obj \ - $(OBJS)\propgriddll_props.obj -PROPGRIDDLL_RESOURCES = \ - $(OBJS)\propgriddll_version.res -PROPGRIDLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_534)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_propgridlib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) -PROPGRIDLIB_OBJECTS = \ - $(OBJS)\propgridlib_dummy.obj \ - $(OBJS)\propgridlib_advprops.obj \ - $(OBJS)\propgridlib_editors.obj \ - $(OBJS)\propgridlib_manager.obj \ - $(OBJS)\propgridlib_property.obj \ - $(OBJS)\propgridlib_propgrid.obj \ - $(OBJS)\propgridlib_propgridiface.obj \ - $(OBJS)\propgridlib_propgridpagestate.obj \ - $(OBJS)\propgridlib_props.obj -RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_550)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_RICHTEXT $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_richtextdll.pch" $(CPPFLAGS) $(CXXFLAGS) -RICHTEXTDLL_OBJECTS = \ - $(OBJS)\richtextdll_dummy.obj \ - $(OBJS)\richtextdll_richtextbuffer.obj \ - $(OBJS)\richtextdll_richtextctrl.obj \ - $(OBJS)\richtextdll_richtextformatdlg.obj \ - $(OBJS)\richtextdll_richtexthtml.obj \ - $(OBJS)\richtextdll_richtextimagedlg.obj \ - $(OBJS)\richtextdll_richtextprint.obj \ - $(OBJS)\richtextdll_richtextstyledlg.obj \ - $(OBJS)\richtextdll_richtextstyles.obj \ - $(OBJS)\richtextdll_richtextsymboldlg.obj \ - $(OBJS)\richtextdll_richtextxml.obj \ - $(OBJS)\richtextdll_xh_richtext.obj -RICHTEXTDLL_RESOURCES = \ - $(OBJS)\richtextdll_version.res -RICHTEXTLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_565)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_richtextlib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) -RICHTEXTLIB_OBJECTS = \ - $(OBJS)\richtextlib_dummy.obj \ - $(OBJS)\richtextlib_richtextbuffer.obj \ - $(OBJS)\richtextlib_richtextctrl.obj \ - $(OBJS)\richtextlib_richtextformatdlg.obj \ - $(OBJS)\richtextlib_richtexthtml.obj \ - $(OBJS)\richtextlib_richtextimagedlg.obj \ - $(OBJS)\richtextlib_richtextprint.obj \ - $(OBJS)\richtextlib_richtextstyledlg.obj \ - $(OBJS)\richtextlib_richtextstyles.obj \ - $(OBJS)\richtextlib_richtextsymboldlg.obj \ - $(OBJS)\richtextlib_richtextxml.obj \ - $(OBJS)\richtextlib_xh_richtext.obj -STCDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_581)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ - /DWXUSINGDLL /DWXMAKINGDLL_STC $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \ - /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_stcdll.pch" $(CPPFLAGS) $(CXXFLAGS) -STCDLL_OBJECTS = \ - $(OBJS)\stcdll_dummy.obj \ - $(OBJS)\stcdll_stc.obj \ - $(OBJS)\stcdll_PlatWX.obj \ - $(OBJS)\stcdll_ScintillaWX.obj -STCDLL_RESOURCES = \ - $(OBJS)\stcdll_version.res -STCLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_596)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib \ - /I..\..\src\stc\scintilla\include /I..\..\src\stc\scintilla\lexlib \ - /I..\..\src\stc\scintilla\src /D__WX__ /DSCI_LEXER /DLINK_LEXERS \ - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_stclib.pch" $(CPPFLAGS) $(CXXFLAGS) -STCLIB_OBJECTS = \ - $(OBJS)\stclib_dummy.obj \ - $(OBJS)\stclib_stc.obj \ - $(OBJS)\stclib_PlatWX.obj \ - $(OBJS)\stclib_ScintillaWX.obj -GLDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_612)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib /DWXUSINGDLL \ - /DWXMAKINGDLL_GL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" \ - /Fp"$(OBJS)\wxprec_gldll.pch" $(CPPFLAGS) $(CXXFLAGS) -GLDLL_OBJECTS = \ - $(OBJS)\gldll_dummy.obj \ - $(OBJS)\gldll_glcmn.obj \ - $(OBJS)\gldll_glcanvas.obj -GLDLL_RESOURCES = \ - $(OBJS)\gldll_version.res -GLLIB_CXXFLAGS = /M$(__RUNTIME_LIBS_627)$(__DEBUGRUNTIME) /DWIN32 \ - $(__DEBUGINFO) \ - /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.pdb \ - $(____DEBUGRUNTIME) $(__OPTIMIZEFLAG) /D_CRT_SECURE_NO_DEPRECATE=1 \ - /D_CRT_NON_CONFORMING_SWPRINTFS=1 /D_SCL_SECURE_NO_WARNINGS=1 \ - $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ - /I$(SETUPHDIR) /I..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) /W4 \ - /DWXBUILDING /I..\..\src\tiff\libtiff /I..\..\src\jpeg /I..\..\src\png \ - /I..\..\src\zlib /I..\..\src\regex /I..\..\src\expat\lib $(__RTTIFLAG) \ - $(__EXCEPTIONSFLAG) /Yu"wx/wxprec.h" /Fp"$(OBJS)\wxprec_gllib.pch" \ - $(CPPFLAGS) $(CXXFLAGS) -GLLIB_OBJECTS = \ - $(OBJS)\gllib_dummy.obj \ - $(OBJS)\gllib_glcmn.obj \ - $(OBJS)\gllib_glcanvas.obj -BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg - -### Conditionally set variables: ### - -!if "$(TARGET_CPU)" == "AMD64" -ARCH_SUFFIX = _x64 -!endif -!if "$(TARGET_CPU)" == "IA64" -ARCH_SUFFIX = _ia64 -!endif -!if "$(TARGET_CPU)" == "X64" -ARCH_SUFFIX = _x64 -!endif -!if "$(TARGET_CPU)" == "amd64" -ARCH_SUFFIX = _x64 -!endif -!if "$(TARGET_CPU)" == "ia64" -ARCH_SUFFIX = _ia64 -!endif -!if "$(TARGET_CPU)" == "x64" -ARCH_SUFFIX = _x64 -!endif -!if "$(USE_GUI)" == "0" -PORTNAME = base -!endif -!if "$(USE_GUI)" == "1" -PORTNAME = msw$(TOOLKIT_VERSION) -!endif -!if "$(OFFICIAL_BUILD)" == "1" -COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD -!endif -!if "$(OFFICIAL_BUILD)" == "0" -WXCOMPILER = _vc -!endif -!if "$(OFFICIAL_BUILD)" == "1" -WXCOMPILER = _vc$(COMPILER_VERSION)$(ARCH_SUFFIX) -!endif -!if "$(OFFICIAL_BUILD)" == "0" -VENDORTAG = _$(VENDOR) -!endif -!if "$(OFFICIAL_BUILD)" == "1" -VENDORTAG = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -WXDEBUGFLAG = d -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -WXDEBUGFLAG = d -!endif -!if "$(UNICODE)" == "1" -WXUNICODEFLAG = u -!endif -!if "$(WXUNIV)" == "1" -WXUNIVNAME = univ -!endif -!if "$(SHARED)" == "1" -WXDLLFLAG = dll -!endif -!if "$(SHARED)" == "0" -LIBTYPE_SUFFIX = lib -!endif -!if "$(SHARED)" == "1" -LIBTYPE_SUFFIX = dll -!endif -!if "$(TARGET_CPU)" == "AMD64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(TARGET_CPU)" == "IA64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "X64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(TARGET_CPU)" == "amd64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(TARGET_CPU)" == "ia64" -LINK_TARGET_CPU = /MACHINE:IA64 -!endif -!if "$(TARGET_CPU)" == "x64" -LINK_TARGET_CPU = /MACHINE:X64 -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_10 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_10 = $(__THREADSFLAG) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_25 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_25 = $(__THREADSFLAG) -!endif -!if "$(USE_GUI)" == "1" -__wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_40 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_40 = $(__THREADSFLAG) -!endif -!if "$(USE_GUI)" == "1" -__wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_55 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_55 = $(__THREADSFLAG) -!endif -!if "$(USE_GUI)" == "1" -__wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_70 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_70 = $(__THREADSFLAG) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_85 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_85 = $(__THREADSFLAG) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_100 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_100 = $(__THREADSFLAG) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -__wxscintilla_usingdll_p = /DWXUSINGDLL -!endif -!if "$(MONOLITHIC)" == "0" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" -EXTRALIBS_FOR_BASE = -!endif -!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" -__monodll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_108 = $(__DEBUGRUNTIME_11) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_108 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_108 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_108 = $(__DEBUGRUNTIME_11) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_116 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_116 = $(__THREADSFLAG) -!endif -!if "$(USE_GUI)" == "1" -____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \ - $(____CORE_SRC_FILENAMES_OBJECTS) \ - $(____ADVANCED_SRC_FILENAMES_OBJECTS) \ - $(OBJS)\monodll_mediactrlcmn.obj \ - $(OBJS)\monodll_mediactrl_am.obj \ - $(OBJS)\monodll_mediactrl_wmp10.obj \ - $(OBJS)\monodll_mediactrl_qt.obj \ - $(OBJS)\monodll_helpbest.obj \ - $(OBJS)\monodll_helpctrl.obj \ - $(OBJS)\monodll_helpdata.obj \ - $(OBJS)\monodll_helpdlg.obj \ - $(OBJS)\monodll_helpfrm.obj \ - $(OBJS)\monodll_helpwnd.obj \ - $(OBJS)\monodll_htmlcell.obj \ - $(OBJS)\monodll_htmlfilt.obj \ - $(OBJS)\monodll_htmlpars.obj \ - $(OBJS)\monodll_htmltag.obj \ - $(OBJS)\monodll_htmlwin.obj \ - $(OBJS)\monodll_htmprint.obj \ - $(OBJS)\monodll_m_dflist.obj \ - $(OBJS)\monodll_m_fonts.obj \ - $(OBJS)\monodll_m_hline.obj \ - $(OBJS)\monodll_m_image.obj \ - $(OBJS)\monodll_m_layout.obj \ - $(OBJS)\monodll_m_links.obj \ - $(OBJS)\monodll_m_list.obj \ - $(OBJS)\monodll_m_pre.obj \ - $(OBJS)\monodll_m_span.obj \ - $(OBJS)\monodll_m_style.obj \ - $(OBJS)\monodll_m_tables.obj \ - $(OBJS)\monodll_styleparams.obj \ - $(OBJS)\monodll_winpars.obj \ - $(OBJS)\monodll_htmllbox.obj \ - $(OBJS)\monodll_webview_ie.obj \ - $(OBJS)\monodll_webview.obj \ - $(OBJS)\monodll_webviewarchivehandler.obj \ - $(OBJS)\monodll_webviewfshandler.obj \ - $(OBJS)\monodll_debugrpt.obj \ - $(OBJS)\monodll_dbgrptg.obj \ - $(OBJS)\monodll_xh_animatctrl.obj \ - $(OBJS)\monodll_xh_bannerwindow.obj \ - $(OBJS)\monodll_xh_bmp.obj \ - $(OBJS)\monodll_xh_bmpcbox.obj \ - $(OBJS)\monodll_xh_bmpbt.obj \ - $(OBJS)\monodll_xh_bttn.obj \ - $(OBJS)\monodll_xh_cald.obj \ - $(OBJS)\monodll_xh_chckb.obj \ - $(OBJS)\monodll_xh_chckl.obj \ - $(OBJS)\monodll_xh_choic.obj \ - $(OBJS)\monodll_xh_choicbk.obj \ - $(OBJS)\monodll_xh_clrpicker.obj \ - $(OBJS)\monodll_xh_cmdlinkbn.obj \ - $(OBJS)\monodll_xh_collpane.obj \ - $(OBJS)\monodll_xh_combo.obj \ - $(OBJS)\monodll_xh_comboctrl.obj \ - $(OBJS)\monodll_xh_datectrl.obj \ - $(OBJS)\monodll_xh_dirpicker.obj \ - $(OBJS)\monodll_xh_dlg.obj \ - $(OBJS)\monodll_xh_editlbox.obj \ - $(OBJS)\monodll_xh_filectrl.obj \ - $(OBJS)\monodll_xh_filepicker.obj \ - $(OBJS)\monodll_xh_fontpicker.obj \ - $(OBJS)\monodll_xh_frame.obj \ - $(OBJS)\monodll_xh_gauge.obj \ - $(OBJS)\monodll_xh_gdctl.obj \ - $(OBJS)\monodll_xh_grid.obj \ - $(OBJS)\monodll_xh_html.obj \ - $(OBJS)\monodll_xh_hyperlink.obj \ - $(OBJS)\monodll_xh_listb.obj \ - $(OBJS)\monodll_xh_listbk.obj \ - $(OBJS)\monodll_xh_listc.obj \ - $(OBJS)\monodll_xh_mdi.obj \ - $(OBJS)\monodll_xh_menu.obj \ - $(OBJS)\monodll_xh_notbk.obj \ - $(OBJS)\monodll_xh_odcombo.obj \ - $(OBJS)\monodll_xh_panel.obj \ - $(OBJS)\monodll_xh_propdlg.obj \ - $(OBJS)\monodll_xh_radbt.obj \ - $(OBJS)\monodll_xh_radbx.obj \ - $(OBJS)\monodll_xh_scrol.obj \ - $(OBJS)\monodll_xh_scwin.obj \ - $(OBJS)\monodll_xh_htmllbox.obj \ - $(OBJS)\monodll_xh_sizer.obj \ - $(OBJS)\monodll_xh_slidr.obj \ - $(OBJS)\monodll_xh_spin.obj \ - $(OBJS)\monodll_xh_split.obj \ - $(OBJS)\monodll_xh_srchctrl.obj \ - $(OBJS)\monodll_xh_statbar.obj \ - $(OBJS)\monodll_xh_stbmp.obj \ - $(OBJS)\monodll_xh_stbox.obj \ - $(OBJS)\monodll_xh_stlin.obj \ - $(OBJS)\monodll_xh_sttxt.obj \ - $(OBJS)\monodll_xh_text.obj \ - $(OBJS)\monodll_xh_tglbtn.obj \ - $(OBJS)\monodll_xh_timectrl.obj \ - $(OBJS)\monodll_xh_toolb.obj \ - $(OBJS)\monodll_xh_toolbk.obj \ - $(OBJS)\monodll_xh_tree.obj \ - $(OBJS)\monodll_xh_treebk.obj \ - $(OBJS)\monodll_xh_unkwn.obj \ - $(OBJS)\monodll_xh_wizrd.obj \ - $(OBJS)\monodll_xmlres.obj \ - $(OBJS)\monodll_xmladv.obj \ - $(OBJS)\monodll_xmlrsall.obj \ - $(OBJS)\monodll_framemanager.obj \ - $(OBJS)\monodll_dockart.obj \ - $(OBJS)\monodll_floatpane.obj \ - $(OBJS)\monodll_auibook.obj \ - $(OBJS)\monodll_auibar.obj \ - $(OBJS)\monodll_tabmdi.obj \ - $(OBJS)\monodll_tabart.obj \ - $(OBJS)\monodll_xh_auinotbk.obj \ - $(OBJS)\monodll_advprops.obj \ - $(OBJS)\monodll_editors.obj \ - $(OBJS)\monodll_manager.obj \ - $(OBJS)\monodll_property.obj \ - $(OBJS)\monodll_propgrid.obj \ - $(OBJS)\monodll_propgridiface.obj \ - $(OBJS)\monodll_propgridpagestate.obj \ - $(OBJS)\monodll_props.obj \ - $(OBJS)\monodll_art_internal.obj \ - $(OBJS)\monodll_art_msw.obj \ - $(OBJS)\monodll_art_aui.obj \ - $(OBJS)\monodll_bar.obj \ - $(OBJS)\monodll_ribbon_buttonbar.obj \ - $(OBJS)\monodll_ribbon_control.obj \ - $(OBJS)\monodll_gallery.obj \ - $(OBJS)\monodll_page.obj \ - $(OBJS)\monodll_ribbon_panel.obj \ - $(OBJS)\monodll_ribbon_toolbar.obj \ - $(OBJS)\monodll_xh_ribbon.obj \ - $(OBJS)\monodll_richtextbuffer.obj \ - $(OBJS)\monodll_richtextctrl.obj \ - $(OBJS)\monodll_richtextformatdlg.obj \ - $(OBJS)\monodll_richtexthtml.obj \ - $(OBJS)\monodll_richtextimagedlg.obj \ - $(OBJS)\monodll_richtextprint.obj \ - $(OBJS)\monodll_richtextstyledlg.obj \ - $(OBJS)\monodll_richtextstyles.obj \ - $(OBJS)\monodll_richtextsymboldlg.obj \ - $(OBJS)\monodll_richtextxml.obj \ - $(OBJS)\monodll_xh_richtext.obj \ - $(OBJS)\monodll_stc.obj \ - $(OBJS)\monodll_PlatWX.obj \ - $(OBJS)\monodll_ScintillaWX.obj -!endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -____CORE_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_activex.obj \ - $(OBJS)\monodll_app.obj \ - $(OBJS)\monodll_bitmap.obj \ - $(OBJS)\monodll_brush.obj \ - $(OBJS)\monodll_caret.obj \ - $(OBJS)\monodll_clipbrd.obj \ - $(OBJS)\monodll_colour.obj \ - $(OBJS)\monodll_cursor.obj \ - $(OBJS)\monodll_data.obj \ - $(OBJS)\monodll_dc.obj \ - $(OBJS)\monodll_dcclient.obj \ - $(OBJS)\monodll_dcmemory.obj \ - $(OBJS)\monodll_dcprint.obj \ - $(OBJS)\monodll_dcscreen.obj \ - $(OBJS)\monodll_dialup.obj \ - $(OBJS)\monodll_dib.obj \ - $(OBJS)\monodll_display.obj \ - $(OBJS)\monodll_enhmeta.obj \ - $(OBJS)\monodll_font.obj \ - $(OBJS)\monodll_fontenum.obj \ - $(OBJS)\monodll_fontutil.obj \ - $(OBJS)\monodll_gdiimage.obj \ - $(OBJS)\monodll_gdiobj.obj \ - $(OBJS)\monodll_gdiplus.obj \ - $(OBJS)\monodll_graphics.obj \ - $(OBJS)\monodll_icon.obj \ - $(OBJS)\monodll_imaglist.obj \ - $(OBJS)\monodll_minifram.obj \ - $(OBJS)\monodll_nonownedwnd.obj \ - $(OBJS)\monodll_dataobj.obj \ - $(OBJS)\monodll_dropsrc.obj \ - $(OBJS)\monodll_droptgt.obj \ - $(OBJS)\monodll_oleutils.obj \ - $(OBJS)\monodll_safearray.obj \ - $(OBJS)\monodll_palette.obj \ - $(OBJS)\monodll_pen.obj \ - $(OBJS)\monodll_popupwin.obj \ - $(OBJS)\monodll_printdlg.obj \ - $(OBJS)\monodll_printwin.obj \ - $(OBJS)\monodll_region.obj \ - $(OBJS)\monodll_renderer.obj \ - $(OBJS)\monodll_settings.obj \ - $(OBJS)\monodll_textmeasure.obj \ - $(OBJS)\monodll_tooltip.obj \ - $(OBJS)\monodll_toplevel.obj \ - $(OBJS)\monodll_uiaction.obj \ - $(OBJS)\monodll_utilsgui.obj \ - $(OBJS)\monodll_utilswin.obj \ - $(OBJS)\monodll_uxtheme.obj \ - $(OBJS)\monodll_window.obj \ - $(OBJS)\monodll_helpchm.obj \ - $(OBJS)\monodll_helpwin.obj \ - $(OBJS)\monodll_automtn.obj \ - $(OBJS)\monodll_uuid.obj \ - $(OBJS)\monodll_clrpickerg.obj \ - $(OBJS)\monodll_collpaneg.obj \ - $(OBJS)\monodll_filepickerg.obj \ - $(OBJS)\monodll_fontpickerg.obj \ - $(OBJS)\monodll_generic_statusbr.obj \ - $(OBJS)\monodll_prntdlgg.obj \ - $(OBJS)\monodll_msw_accel.obj \ - $(OBJS)\monodll_anybutton.obj \ - $(OBJS)\monodll_artmsw.obj \ - $(OBJS)\monodll_msw_bmpbuttn.obj \ - $(OBJS)\monodll_msw_button.obj \ - $(OBJS)\monodll_msw_checkbox.obj \ - $(OBJS)\monodll_msw_choice.obj \ - $(OBJS)\monodll_colordlg.obj \ - $(OBJS)\monodll_combo.obj \ - $(OBJS)\monodll_msw_combobox.obj \ - $(OBJS)\monodll_msw_control.obj \ - $(OBJS)\monodll_msw_dialog.obj \ - $(OBJS)\monodll_dirdlg.obj \ - $(OBJS)\monodll_dragimag.obj \ - $(OBJS)\monodll_evtloop.obj \ - $(OBJS)\monodll_filedlg.obj \ - $(OBJS)\monodll_frame.obj \ - $(OBJS)\monodll_msw_gauge.obj \ - $(OBJS)\monodll_headerctrl.obj \ - $(OBJS)\monodll_iniconf.obj \ - $(OBJS)\monodll_msw_listbox.obj \ - $(OBJS)\monodll_msw_listctrl.obj \ - $(OBJS)\monodll_mdi.obj \ - $(OBJS)\monodll_msw_menu.obj \ - $(OBJS)\monodll_menuitem.obj \ - $(OBJS)\monodll_metafile.obj \ - $(OBJS)\monodll_msgdlg.obj \ - $(OBJS)\monodll_nativdlg.obj \ - $(OBJS)\monodll_nativewin.obj \ - $(OBJS)\monodll_msw_notebook.obj \ - $(OBJS)\monodll_access.obj \ - $(OBJS)\monodll_ownerdrw.obj \ - $(OBJS)\monodll_msw_panel.obj \ - $(OBJS)\monodll_progdlg.obj \ - $(OBJS)\monodll_msw_radiobox.obj \ - $(OBJS)\monodll_msw_radiobut.obj \ - $(OBJS)\monodll_richmsgdlg.obj \ - $(OBJS)\monodll_msw_scrolbar.obj \ - $(OBJS)\monodll_msw_slider.obj \ - $(OBJS)\monodll_msw_spinbutt.obj \ - $(OBJS)\monodll_spinctrl.obj \ - $(OBJS)\monodll_msw_statbmp.obj \ - $(OBJS)\monodll_msw_statbox.obj \ - $(OBJS)\monodll_statusbar.obj \ - $(OBJS)\monodll_msw_statline.obj \ - $(OBJS)\monodll_msw_stattext.obj \ - $(OBJS)\monodll_msw_toolbar.obj \ - $(OBJS)\monodll_msw_textctrl.obj \ - $(OBJS)\monodll_textentry.obj \ - $(OBJS)\monodll_msw_tglbtn.obj \ - $(OBJS)\monodll_treectrl.obj \ - $(OBJS)\monodll_msw_checklst.obj \ - $(OBJS)\monodll_msw_fdrepdlg.obj \ - $(OBJS)\monodll_fontdlg.obj \ - $(OBJS)\monodll_accelcmn.obj \ - $(OBJS)\monodll_accesscmn.obj \ - $(OBJS)\monodll_anidecod.obj \ - $(OBJS)\monodll_affinematrix2d.obj \ - $(OBJS)\monodll_appcmn.obj \ - $(OBJS)\monodll_artprov.obj \ - $(OBJS)\monodll_artstd.obj \ - $(OBJS)\monodll_arttango.obj \ - $(OBJS)\monodll_bmpbase.obj \ - $(OBJS)\monodll_bmpbtncmn.obj \ - $(OBJS)\monodll_bookctrl.obj \ - $(OBJS)\monodll_btncmn.obj \ - $(OBJS)\monodll_cairo.obj \ - $(OBJS)\monodll_checkboxcmn.obj \ - $(OBJS)\monodll_checklstcmn.obj \ - $(OBJS)\monodll_choiccmn.obj \ - $(OBJS)\monodll_clipcmn.obj \ - $(OBJS)\monodll_clrpickercmn.obj \ - $(OBJS)\monodll_colourcmn.obj \ - $(OBJS)\monodll_colourdata.obj \ - $(OBJS)\monodll_combocmn.obj \ - $(OBJS)\monodll_cmdproc.obj \ - $(OBJS)\monodll_cmndata.obj \ - $(OBJS)\monodll_containr.obj \ - $(OBJS)\monodll_cshelp.obj \ - $(OBJS)\monodll_ctrlcmn.obj \ - $(OBJS)\monodll_ctrlsub.obj \ - $(OBJS)\monodll_dcbase.obj \ - $(OBJS)\monodll_dcbufcmn.obj \ - $(OBJS)\monodll_dcgraph.obj \ - $(OBJS)\monodll_dcsvg.obj \ - $(OBJS)\monodll_dirctrlcmn.obj \ - $(OBJS)\monodll_dlgcmn.obj \ - $(OBJS)\monodll_dndcmn.obj \ - $(OBJS)\monodll_dobjcmn.obj \ - $(OBJS)\monodll_docmdi.obj \ - $(OBJS)\monodll_docview.obj \ - $(OBJS)\monodll_dpycmn.obj \ - $(OBJS)\monodll_dseldlg.obj \ - $(OBJS)\monodll_effects.obj \ - $(OBJS)\monodll_fddlgcmn.obj \ - $(OBJS)\monodll_filectrlcmn.obj \ - $(OBJS)\monodll_filehistorycmn.obj \ - $(OBJS)\monodll_filepickercmn.obj \ - $(OBJS)\monodll_fontpickercmn.obj \ - $(OBJS)\monodll_fldlgcmn.obj \ - $(OBJS)\monodll_fontcmn.obj \ - $(OBJS)\monodll_fontdata.obj \ - $(OBJS)\monodll_graphicc.obj \ - $(OBJS)\monodll_fontenumcmn.obj \ - $(OBJS)\monodll_fontmap.obj \ - $(OBJS)\monodll_fontutilcmn.obj \ - $(OBJS)\monodll_framecmn.obj \ - $(OBJS)\monodll_gaugecmn.obj \ - $(OBJS)\monodll_gbsizer.obj \ - $(OBJS)\monodll_gdicmn.obj \ - $(OBJS)\monodll_geometry.obj \ - $(OBJS)\monodll_gifdecod.obj \ - $(OBJS)\monodll_graphcmn.obj \ - $(OBJS)\monodll_headercolcmn.obj \ - $(OBJS)\monodll_headerctrlcmn.obj \ - $(OBJS)\monodll_helpbase.obj \ - $(OBJS)\monodll_iconbndl.obj \ - $(OBJS)\monodll_imagall.obj \ - $(OBJS)\monodll_imagbmp.obj \ - $(OBJS)\monodll_image.obj \ - $(OBJS)\monodll_imagfill.obj \ - $(OBJS)\monodll_imaggif.obj \ - $(OBJS)\monodll_imagiff.obj \ - $(OBJS)\monodll_imagjpeg.obj \ - $(OBJS)\monodll_imagpcx.obj \ - $(OBJS)\monodll_imagpng.obj \ - $(OBJS)\monodll_imagpnm.obj \ - $(OBJS)\monodll_imagtga.obj \ - $(OBJS)\monodll_imagtiff.obj \ - $(OBJS)\monodll_imagxpm.obj \ - $(OBJS)\monodll_layout.obj \ - $(OBJS)\monodll_lboxcmn.obj \ - $(OBJS)\monodll_listctrlcmn.obj \ - $(OBJS)\monodll_markupparser.obj \ - $(OBJS)\monodll_matrix.obj \ - $(OBJS)\monodll_menucmn.obj \ - $(OBJS)\monodll_modalhook.obj \ - $(OBJS)\monodll_mousemanager.obj \ - $(OBJS)\monodll_nbkbase.obj \ - $(OBJS)\monodll_overlaycmn.obj \ - $(OBJS)\monodll_ownerdrwcmn.obj \ - $(OBJS)\monodll_paper.obj \ - $(OBJS)\monodll_panelcmn.obj \ - $(OBJS)\monodll_persist.obj \ - $(OBJS)\monodll_pickerbase.obj \ - $(OBJS)\monodll_popupcmn.obj \ - $(OBJS)\monodll_preferencescmn.obj \ - $(OBJS)\monodll_prntbase.obj \ - $(OBJS)\monodll_quantize.obj \ - $(OBJS)\monodll_radiobtncmn.obj \ - $(OBJS)\monodll_radiocmn.obj \ - $(OBJS)\monodll_rearrangectrl.obj \ - $(OBJS)\monodll_rendcmn.obj \ - $(OBJS)\monodll_rgncmn.obj \ - $(OBJS)\monodll_scrolbarcmn.obj \ - $(OBJS)\monodll_settcmn.obj \ - $(OBJS)\monodll_sizer.obj \ - $(OBJS)\monodll_slidercmn.obj \ - $(OBJS)\monodll_spinbtncmn.obj \ - $(OBJS)\monodll_spinctrlcmn.obj \ - $(OBJS)\monodll_srchcmn.obj \ - $(OBJS)\monodll_statbar.obj \ - $(OBJS)\monodll_statbmpcmn.obj \ - $(OBJS)\monodll_statboxcmn.obj \ - $(OBJS)\monodll_statlinecmn.obj \ - $(OBJS)\monodll_stattextcmn.obj \ - $(OBJS)\monodll_stockitem.obj \ - $(OBJS)\monodll_tbarbase.obj \ - $(OBJS)\monodll_textcmn.obj \ - $(OBJS)\monodll_textentrycmn.obj \ - $(OBJS)\monodll_textmeasurecmn.obj \ - $(OBJS)\monodll_toplvcmn.obj \ - $(OBJS)\monodll_treebase.obj \ - $(OBJS)\monodll_uiactioncmn.obj \ - $(OBJS)\monodll_valgen.obj \ - $(OBJS)\monodll_validate.obj \ - $(OBJS)\monodll_valtext.obj \ - $(OBJS)\monodll_valnum.obj \ - $(OBJS)\monodll_wincmn.obj \ - $(OBJS)\monodll_windowid.obj \ - $(OBJS)\monodll_wrapsizer.obj \ - $(OBJS)\monodll_xpmdecod.obj \ - $(OBJS)\monodll_busyinfo.obj \ - $(OBJS)\monodll_generic_buttonbar.obj \ - $(OBJS)\monodll_choicdgg.obj \ - $(OBJS)\monodll_choicbkg.obj \ - $(OBJS)\monodll_combog.obj \ - $(OBJS)\monodll_dcpsg.obj \ - $(OBJS)\monodll_dirctrlg.obj \ - $(OBJS)\monodll_dragimgg.obj \ - $(OBJS)\monodll_filectrlg.obj \ - $(OBJS)\monodll_headerctrlg.obj \ - $(OBJS)\monodll_infobar.obj \ - $(OBJS)\monodll_listbkg.obj \ - $(OBJS)\monodll_logg.obj \ - $(OBJS)\monodll_markuptext.obj \ - $(OBJS)\monodll_msgdlgg.obj \ - $(OBJS)\monodll_numdlgg.obj \ - $(OBJS)\monodll_progdlgg.obj \ - $(OBJS)\monodll_preferencesg.obj \ - $(OBJS)\monodll_printps.obj \ - $(OBJS)\monodll_renderg.obj \ - $(OBJS)\monodll_richmsgdlgg.obj \ - $(OBJS)\monodll_scrlwing.obj \ - $(OBJS)\monodll_selstore.obj \ - $(OBJS)\monodll_spinctlg.obj \ - $(OBJS)\monodll_splitter.obj \ - $(OBJS)\monodll_srchctlg.obj \ - $(OBJS)\monodll_statbmpg.obj \ - $(OBJS)\monodll_stattextg.obj \ - $(OBJS)\monodll_textdlgg.obj \ - $(OBJS)\monodll_tipwin.obj \ - $(OBJS)\monodll_toolbkg.obj \ - $(OBJS)\monodll_treectlg.obj \ - $(OBJS)\monodll_treebkg.obj \ - $(OBJS)\monodll_vlbox.obj \ - $(OBJS)\monodll_vscroll.obj \ - $(OBJS)\monodll_xmlreshandler.obj -!endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -____CORE_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_activex.obj \ - $(OBJS)\monodll_app.obj \ - $(OBJS)\monodll_bitmap.obj \ - $(OBJS)\monodll_brush.obj \ - $(OBJS)\monodll_caret.obj \ - $(OBJS)\monodll_clipbrd.obj \ - $(OBJS)\monodll_colour.obj \ - $(OBJS)\monodll_cursor.obj \ - $(OBJS)\monodll_data.obj \ - $(OBJS)\monodll_dc.obj \ - $(OBJS)\monodll_dcclient.obj \ - $(OBJS)\monodll_dcmemory.obj \ - $(OBJS)\monodll_dcprint.obj \ - $(OBJS)\monodll_dcscreen.obj \ - $(OBJS)\monodll_dialup.obj \ - $(OBJS)\monodll_dib.obj \ - $(OBJS)\monodll_display.obj \ - $(OBJS)\monodll_enhmeta.obj \ - $(OBJS)\monodll_font.obj \ - $(OBJS)\monodll_fontenum.obj \ - $(OBJS)\monodll_fontutil.obj \ - $(OBJS)\monodll_gdiimage.obj \ - $(OBJS)\monodll_gdiobj.obj \ - $(OBJS)\monodll_gdiplus.obj \ - $(OBJS)\monodll_graphics.obj \ - $(OBJS)\monodll_icon.obj \ - $(OBJS)\monodll_imaglist.obj \ - $(OBJS)\monodll_minifram.obj \ - $(OBJS)\monodll_nonownedwnd.obj \ - $(OBJS)\monodll_dataobj.obj \ - $(OBJS)\monodll_dropsrc.obj \ - $(OBJS)\monodll_droptgt.obj \ - $(OBJS)\monodll_oleutils.obj \ - $(OBJS)\monodll_safearray.obj \ - $(OBJS)\monodll_palette.obj \ - $(OBJS)\monodll_pen.obj \ - $(OBJS)\monodll_popupwin.obj \ - $(OBJS)\monodll_printdlg.obj \ - $(OBJS)\monodll_printwin.obj \ - $(OBJS)\monodll_region.obj \ - $(OBJS)\monodll_renderer.obj \ - $(OBJS)\monodll_settings.obj \ - $(OBJS)\monodll_textmeasure.obj \ - $(OBJS)\monodll_tooltip.obj \ - $(OBJS)\monodll_toplevel.obj \ - $(OBJS)\monodll_uiaction.obj \ - $(OBJS)\monodll_utilsgui.obj \ - $(OBJS)\monodll_utilswin.obj \ - $(OBJS)\monodll_uxtheme.obj \ - $(OBJS)\monodll_window.obj \ - $(OBJS)\monodll_helpchm.obj \ - $(OBJS)\monodll_helpwin.obj \ - $(OBJS)\monodll_automtn.obj \ - $(OBJS)\monodll_uuid.obj \ - $(OBJS)\monodll_evtloop.obj \ - $(OBJS)\monodll_generic_accel.obj \ - $(OBJS)\monodll_clrpickerg.obj \ - $(OBJS)\monodll_collpaneg.obj \ - $(OBJS)\monodll_colrdlgg.obj \ - $(OBJS)\monodll_dirdlgg.obj \ - $(OBJS)\monodll_generic_fdrepdlg.obj \ - $(OBJS)\monodll_filedlgg.obj \ - $(OBJS)\monodll_filepickerg.obj \ - $(OBJS)\monodll_fontdlgg.obj \ - $(OBJS)\monodll_fontpickerg.obj \ - $(OBJS)\monodll_generic_listctrl.obj \ - $(OBJS)\monodll_mdig.obj \ - $(OBJS)\monodll_prntdlgg.obj \ - $(OBJS)\monodll_univ_bmpbuttn.obj \ - $(OBJS)\monodll_univ_button.obj \ - $(OBJS)\monodll_univ_checkbox.obj \ - $(OBJS)\monodll_univ_checklst.obj \ - $(OBJS)\monodll_univ_choice.obj \ - $(OBJS)\monodll_univ_combobox.obj \ - $(OBJS)\monodll_univ_control.obj \ - $(OBJS)\monodll_ctrlrend.obj \ - $(OBJS)\monodll_univ_dialog.obj \ - $(OBJS)\monodll_framuniv.obj \ - $(OBJS)\monodll_univ_gauge.obj \ - $(OBJS)\monodll_inpcons.obj \ - $(OBJS)\monodll_inphand.obj \ - $(OBJS)\monodll_univ_listbox.obj \ - $(OBJS)\monodll_univ_menu.obj \ - $(OBJS)\monodll_univ_notebook.obj \ - $(OBJS)\monodll_univ_radiobox.obj \ - $(OBJS)\monodll_univ_radiobut.obj \ - $(OBJS)\monodll_scrarrow.obj \ - $(OBJS)\monodll_univ_scrolbar.obj \ - $(OBJS)\monodll_scrthumb.obj \ - $(OBJS)\monodll_settingsuniv.obj \ - $(OBJS)\monodll_univ_slider.obj \ - $(OBJS)\monodll_univ_spinbutt.obj \ - $(OBJS)\monodll_univ_statbmp.obj \ - $(OBJS)\monodll_univ_statbox.obj \ - $(OBJS)\monodll_univ_statline.obj \ - $(OBJS)\monodll_univ_stattext.obj \ - $(OBJS)\monodll_univ_statusbr.obj \ - $(OBJS)\monodll_stdrend.obj \ - $(OBJS)\monodll_univ_textctrl.obj \ - $(OBJS)\monodll_univ_tglbtn.obj \ - $(OBJS)\monodll_theme.obj \ - $(OBJS)\monodll_univ_toolbar.obj \ - $(OBJS)\monodll_topluniv.obj \ - $(OBJS)\monodll_winuniv.obj \ - $(OBJS)\monodll_gtk.obj \ - $(OBJS)\monodll_metal.obj \ - $(OBJS)\monodll_mono.obj \ - $(OBJS)\monodll_win32.obj \ - $(OBJS)\monodll_accelcmn.obj \ - $(OBJS)\monodll_accesscmn.obj \ - $(OBJS)\monodll_anidecod.obj \ - $(OBJS)\monodll_affinematrix2d.obj \ - $(OBJS)\monodll_appcmn.obj \ - $(OBJS)\monodll_artprov.obj \ - $(OBJS)\monodll_artstd.obj \ - $(OBJS)\monodll_arttango.obj \ - $(OBJS)\monodll_bmpbase.obj \ - $(OBJS)\monodll_bmpbtncmn.obj \ - $(OBJS)\monodll_bookctrl.obj \ - $(OBJS)\monodll_btncmn.obj \ - $(OBJS)\monodll_cairo.obj \ - $(OBJS)\monodll_checkboxcmn.obj \ - $(OBJS)\monodll_checklstcmn.obj \ - $(OBJS)\monodll_choiccmn.obj \ - $(OBJS)\monodll_clipcmn.obj \ - $(OBJS)\monodll_clrpickercmn.obj \ - $(OBJS)\monodll_colourcmn.obj \ - $(OBJS)\monodll_colourdata.obj \ - $(OBJS)\monodll_combocmn.obj \ - $(OBJS)\monodll_cmdproc.obj \ - $(OBJS)\monodll_cmndata.obj \ - $(OBJS)\monodll_containr.obj \ - $(OBJS)\monodll_cshelp.obj \ - $(OBJS)\monodll_ctrlcmn.obj \ - $(OBJS)\monodll_ctrlsub.obj \ - $(OBJS)\monodll_dcbase.obj \ - $(OBJS)\monodll_dcbufcmn.obj \ - $(OBJS)\monodll_dcgraph.obj \ - $(OBJS)\monodll_dcsvg.obj \ - $(OBJS)\monodll_dirctrlcmn.obj \ - $(OBJS)\monodll_dlgcmn.obj \ - $(OBJS)\monodll_dndcmn.obj \ - $(OBJS)\monodll_dobjcmn.obj \ - $(OBJS)\monodll_docmdi.obj \ - $(OBJS)\monodll_docview.obj \ - $(OBJS)\monodll_dpycmn.obj \ - $(OBJS)\monodll_dseldlg.obj \ - $(OBJS)\monodll_effects.obj \ - $(OBJS)\monodll_fddlgcmn.obj \ - $(OBJS)\monodll_filectrlcmn.obj \ - $(OBJS)\monodll_filehistorycmn.obj \ - $(OBJS)\monodll_filepickercmn.obj \ - $(OBJS)\monodll_fontpickercmn.obj \ - $(OBJS)\monodll_fldlgcmn.obj \ - $(OBJS)\monodll_fontcmn.obj \ - $(OBJS)\monodll_fontdata.obj \ - $(OBJS)\monodll_graphicc.obj \ - $(OBJS)\monodll_fontenumcmn.obj \ - $(OBJS)\monodll_fontmap.obj \ - $(OBJS)\monodll_fontutilcmn.obj \ - $(OBJS)\monodll_framecmn.obj \ - $(OBJS)\monodll_gaugecmn.obj \ - $(OBJS)\monodll_gbsizer.obj \ - $(OBJS)\monodll_gdicmn.obj \ - $(OBJS)\monodll_geometry.obj \ - $(OBJS)\monodll_gifdecod.obj \ - $(OBJS)\monodll_graphcmn.obj \ - $(OBJS)\monodll_headercolcmn.obj \ - $(OBJS)\monodll_headerctrlcmn.obj \ - $(OBJS)\monodll_helpbase.obj \ - $(OBJS)\monodll_iconbndl.obj \ - $(OBJS)\monodll_imagall.obj \ - $(OBJS)\monodll_imagbmp.obj \ - $(OBJS)\monodll_image.obj \ - $(OBJS)\monodll_imagfill.obj \ - $(OBJS)\monodll_imaggif.obj \ - $(OBJS)\monodll_imagiff.obj \ - $(OBJS)\monodll_imagjpeg.obj \ - $(OBJS)\monodll_imagpcx.obj \ - $(OBJS)\monodll_imagpng.obj \ - $(OBJS)\monodll_imagpnm.obj \ - $(OBJS)\monodll_imagtga.obj \ - $(OBJS)\monodll_imagtiff.obj \ - $(OBJS)\monodll_imagxpm.obj \ - $(OBJS)\monodll_layout.obj \ - $(OBJS)\monodll_lboxcmn.obj \ - $(OBJS)\monodll_listctrlcmn.obj \ - $(OBJS)\monodll_markupparser.obj \ - $(OBJS)\monodll_matrix.obj \ - $(OBJS)\monodll_menucmn.obj \ - $(OBJS)\monodll_modalhook.obj \ - $(OBJS)\monodll_mousemanager.obj \ - $(OBJS)\monodll_nbkbase.obj \ - $(OBJS)\monodll_overlaycmn.obj \ - $(OBJS)\monodll_ownerdrwcmn.obj \ - $(OBJS)\monodll_paper.obj \ - $(OBJS)\monodll_panelcmn.obj \ - $(OBJS)\monodll_persist.obj \ - $(OBJS)\monodll_pickerbase.obj \ - $(OBJS)\monodll_popupcmn.obj \ - $(OBJS)\monodll_preferencescmn.obj \ - $(OBJS)\monodll_prntbase.obj \ - $(OBJS)\monodll_quantize.obj \ - $(OBJS)\monodll_radiobtncmn.obj \ - $(OBJS)\monodll_radiocmn.obj \ - $(OBJS)\monodll_rearrangectrl.obj \ - $(OBJS)\monodll_rendcmn.obj \ - $(OBJS)\monodll_rgncmn.obj \ - $(OBJS)\monodll_scrolbarcmn.obj \ - $(OBJS)\monodll_settcmn.obj \ - $(OBJS)\monodll_sizer.obj \ - $(OBJS)\monodll_slidercmn.obj \ - $(OBJS)\monodll_spinbtncmn.obj \ - $(OBJS)\monodll_spinctrlcmn.obj \ - $(OBJS)\monodll_srchcmn.obj \ - $(OBJS)\monodll_statbar.obj \ - $(OBJS)\monodll_statbmpcmn.obj \ - $(OBJS)\monodll_statboxcmn.obj \ - $(OBJS)\monodll_statlinecmn.obj \ - $(OBJS)\monodll_stattextcmn.obj \ - $(OBJS)\monodll_stockitem.obj \ - $(OBJS)\monodll_tbarbase.obj \ - $(OBJS)\monodll_textcmn.obj \ - $(OBJS)\monodll_textentrycmn.obj \ - $(OBJS)\monodll_textmeasurecmn.obj \ - $(OBJS)\monodll_toplvcmn.obj \ - $(OBJS)\monodll_treebase.obj \ - $(OBJS)\monodll_uiactioncmn.obj \ - $(OBJS)\monodll_valgen.obj \ - $(OBJS)\monodll_validate.obj \ - $(OBJS)\monodll_valtext.obj \ - $(OBJS)\monodll_valnum.obj \ - $(OBJS)\monodll_wincmn.obj \ - $(OBJS)\monodll_windowid.obj \ - $(OBJS)\monodll_wrapsizer.obj \ - $(OBJS)\monodll_xpmdecod.obj \ - $(OBJS)\monodll_busyinfo.obj \ - $(OBJS)\monodll_generic_buttonbar.obj \ - $(OBJS)\monodll_choicdgg.obj \ - $(OBJS)\monodll_choicbkg.obj \ - $(OBJS)\monodll_combog.obj \ - $(OBJS)\monodll_dcpsg.obj \ - $(OBJS)\monodll_dirctrlg.obj \ - $(OBJS)\monodll_dragimgg.obj \ - $(OBJS)\monodll_filectrlg.obj \ - $(OBJS)\monodll_headerctrlg.obj \ - $(OBJS)\monodll_infobar.obj \ - $(OBJS)\monodll_listbkg.obj \ - $(OBJS)\monodll_logg.obj \ - $(OBJS)\monodll_markuptext.obj \ - $(OBJS)\monodll_msgdlgg.obj \ - $(OBJS)\monodll_numdlgg.obj \ - $(OBJS)\monodll_progdlgg.obj \ - $(OBJS)\monodll_preferencesg.obj \ - $(OBJS)\monodll_printps.obj \ - $(OBJS)\monodll_renderg.obj \ - $(OBJS)\monodll_richmsgdlgg.obj \ - $(OBJS)\monodll_scrlwing.obj \ - $(OBJS)\monodll_selstore.obj \ - $(OBJS)\monodll_spinctlg.obj \ - $(OBJS)\monodll_splitter.obj \ - $(OBJS)\monodll_srchctlg.obj \ - $(OBJS)\monodll_statbmpg.obj \ - $(OBJS)\monodll_stattextg.obj \ - $(OBJS)\monodll_textdlgg.obj \ - $(OBJS)\monodll_tipwin.obj \ - $(OBJS)\monodll_toolbkg.obj \ - $(OBJS)\monodll_treectlg.obj \ - $(OBJS)\monodll_treebkg.obj \ - $(OBJS)\monodll_vlbox.obj \ - $(OBJS)\monodll_vscroll.obj \ - $(OBJS)\monodll_xmlreshandler.obj -!endif -!if "$(WXUNIV)" == "0" -____ADVANCED_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_animatecmn.obj \ - $(OBJS)\monodll_bmpcboxcmn.obj \ - $(OBJS)\monodll_calctrlcmn.obj \ - $(OBJS)\monodll_datavcmn.obj \ - $(OBJS)\monodll_gridcmn.obj \ - $(OBJS)\monodll_hyperlnkcmn.obj \ - $(OBJS)\monodll_odcombocmn.obj \ - $(OBJS)\monodll_richtooltipcmn.obj \ - $(OBJS)\monodll_aboutdlgg.obj \ - $(OBJS)\monodll_bannerwindow.obj \ - $(OBJS)\monodll_bmpcboxg.obj \ - $(OBJS)\monodll_calctrlg.obj \ - $(OBJS)\monodll_commandlinkbuttong.obj \ - $(OBJS)\monodll_datavgen.obj \ - $(OBJS)\monodll_datectlg.obj \ - $(OBJS)\monodll_editlbox.obj \ - $(OBJS)\monodll_grid.obj \ - $(OBJS)\monodll_gridctrl.obj \ - $(OBJS)\monodll_grideditors.obj \ - $(OBJS)\monodll_gridsel.obj \ - $(OBJS)\monodll_helpext.obj \ - $(OBJS)\monodll_hyperlinkg.obj \ - $(OBJS)\monodll_laywin.obj \ - $(OBJS)\monodll_notifmsgg.obj \ - $(OBJS)\monodll_odcombo.obj \ - $(OBJS)\monodll_propdlg.obj \ - $(OBJS)\monodll_richtooltipg.obj \ - $(OBJS)\monodll_sashwin.obj \ - $(OBJS)\monodll_splash.obj \ - $(OBJS)\monodll_timectrlg.obj \ - $(OBJS)\monodll_tipdlg.obj \ - $(OBJS)\monodll_treelist.obj \ - $(OBJS)\monodll_wizard.obj \ - $(OBJS)\monodll_taskbarcmn.obj \ - $(OBJS)\monodll_aboutdlg.obj \ - $(OBJS)\monodll_notifmsg.obj \ - $(OBJS)\monodll_richtooltip.obj \ - $(OBJS)\monodll_sound.obj \ - $(OBJS)\monodll_taskbar.obj \ - $(OBJS)\monodll_joystick.obj \ - $(OBJS)\monodll_animateg.obj \ - $(OBJS)\monodll_bmpcbox.obj \ - $(OBJS)\monodll_calctrl.obj \ - $(OBJS)\monodll_commandlinkbutton.obj \ - $(OBJS)\monodll_datecontrols.obj \ - $(OBJS)\monodll_datectrl.obj \ - $(OBJS)\monodll_datetimectrl.obj \ - $(OBJS)\monodll_hyperlink.obj \ - $(OBJS)\monodll_timectrl.obj -!endif -!if "$(WXUNIV)" == "1" -____ADVANCED_SRC_FILENAMES_OBJECTS = \ - $(OBJS)\monodll_animatecmn.obj \ - $(OBJS)\monodll_bmpcboxcmn.obj \ - $(OBJS)\monodll_calctrlcmn.obj \ - $(OBJS)\monodll_datavcmn.obj \ - $(OBJS)\monodll_gridcmn.obj \ - $(OBJS)\monodll_hyperlnkcmn.obj \ - $(OBJS)\monodll_odcombocmn.obj \ - $(OBJS)\monodll_richtooltipcmn.obj \ - $(OBJS)\monodll_aboutdlgg.obj \ - $(OBJS)\monodll_bannerwindow.obj \ - $(OBJS)\monodll_bmpcboxg.obj \ - $(OBJS)\monodll_calctrlg.obj \ - $(OBJS)\monodll_commandlinkbuttong.obj \ - $(OBJS)\monodll_datavgen.obj \ - $(OBJS)\monodll_datectlg.obj \ - $(OBJS)\monodll_editlbox.obj \ - $(OBJS)\monodll_grid.obj \ - $(OBJS)\monodll_gridctrl.obj \ - $(OBJS)\monodll_grideditors.obj \ - $(OBJS)\monodll_gridsel.obj \ - $(OBJS)\monodll_helpext.obj \ - $(OBJS)\monodll_hyperlinkg.obj \ - $(OBJS)\monodll_laywin.obj \ - $(OBJS)\monodll_notifmsgg.obj \ - $(OBJS)\monodll_odcombo.obj \ - $(OBJS)\monodll_propdlg.obj \ - $(OBJS)\monodll_richtooltipg.obj \ - $(OBJS)\monodll_sashwin.obj \ - $(OBJS)\monodll_splash.obj \ - $(OBJS)\monodll_timectrlg.obj \ - $(OBJS)\monodll_tipdlg.obj \ - $(OBJS)\monodll_treelist.obj \ - $(OBJS)\monodll_wizard.obj \ - $(OBJS)\monodll_taskbarcmn.obj \ - $(OBJS)\monodll_aboutdlg.obj \ - $(OBJS)\monodll_notifmsg.obj \ - $(OBJS)\monodll_richtooltip.obj \ - $(OBJS)\monodll_sound.obj \ - $(OBJS)\monodll_taskbar.obj \ - $(OBJS)\monodll_joystick.obj \ - $(OBJS)\monodll_animateg.obj -!endif -!if "$(USE_STC)" == "1" -__wxscintilla_library_link_DEP = $(__wxscintilla) -!endif -!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" -__monolib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_131 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_131 = $(__THREADSFLAG) -!endif -!if "$(USE_GUI)" == "1" -____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \ - $(____CORE_SRC_FILENAMES_1_OBJECTS) \ - $(____ADVANCED_SRC_FILENAMES_1_OBJECTS) \ - $(OBJS)\monolib_mediactrlcmn.obj \ - $(OBJS)\monolib_mediactrl_am.obj \ - $(OBJS)\monolib_mediactrl_wmp10.obj \ - $(OBJS)\monolib_mediactrl_qt.obj \ - $(OBJS)\monolib_helpbest.obj \ - $(OBJS)\monolib_helpctrl.obj \ - $(OBJS)\monolib_helpdata.obj \ - $(OBJS)\monolib_helpdlg.obj \ - $(OBJS)\monolib_helpfrm.obj \ - $(OBJS)\monolib_helpwnd.obj \ - $(OBJS)\monolib_htmlcell.obj \ - $(OBJS)\monolib_htmlfilt.obj \ - $(OBJS)\monolib_htmlpars.obj \ - $(OBJS)\monolib_htmltag.obj \ - $(OBJS)\monolib_htmlwin.obj \ - $(OBJS)\monolib_htmprint.obj \ - $(OBJS)\monolib_m_dflist.obj \ - $(OBJS)\monolib_m_fonts.obj \ - $(OBJS)\monolib_m_hline.obj \ - $(OBJS)\monolib_m_image.obj \ - $(OBJS)\monolib_m_layout.obj \ - $(OBJS)\monolib_m_links.obj \ - $(OBJS)\monolib_m_list.obj \ - $(OBJS)\monolib_m_pre.obj \ - $(OBJS)\monolib_m_span.obj \ - $(OBJS)\monolib_m_style.obj \ - $(OBJS)\monolib_m_tables.obj \ - $(OBJS)\monolib_styleparams.obj \ - $(OBJS)\monolib_winpars.obj \ - $(OBJS)\monolib_htmllbox.obj \ - $(OBJS)\monolib_webview_ie.obj \ - $(OBJS)\monolib_webview.obj \ - $(OBJS)\monolib_webviewarchivehandler.obj \ - $(OBJS)\monolib_webviewfshandler.obj \ - $(OBJS)\monolib_debugrpt.obj \ - $(OBJS)\monolib_dbgrptg.obj \ - $(OBJS)\monolib_xh_animatctrl.obj \ - $(OBJS)\monolib_xh_bannerwindow.obj \ - $(OBJS)\monolib_xh_bmp.obj \ - $(OBJS)\monolib_xh_bmpcbox.obj \ - $(OBJS)\monolib_xh_bmpbt.obj \ - $(OBJS)\monolib_xh_bttn.obj \ - $(OBJS)\monolib_xh_cald.obj \ - $(OBJS)\monolib_xh_chckb.obj \ - $(OBJS)\monolib_xh_chckl.obj \ - $(OBJS)\monolib_xh_choic.obj \ - $(OBJS)\monolib_xh_choicbk.obj \ - $(OBJS)\monolib_xh_clrpicker.obj \ - $(OBJS)\monolib_xh_cmdlinkbn.obj \ - $(OBJS)\monolib_xh_collpane.obj \ - $(OBJS)\monolib_xh_combo.obj \ - $(OBJS)\monolib_xh_comboctrl.obj \ - $(OBJS)\monolib_xh_datectrl.obj \ - $(OBJS)\monolib_xh_dirpicker.obj \ - $(OBJS)\monolib_xh_dlg.obj \ - $(OBJS)\monolib_xh_editlbox.obj \ - $(OBJS)\monolib_xh_filectrl.obj \ - $(OBJS)\monolib_xh_filepicker.obj \ - $(OBJS)\monolib_xh_fontpicker.obj \ - $(OBJS)\monolib_xh_frame.obj \ - $(OBJS)\monolib_xh_gauge.obj \ - $(OBJS)\monolib_xh_gdctl.obj \ - $(OBJS)\monolib_xh_grid.obj \ - $(OBJS)\monolib_xh_html.obj \ - $(OBJS)\monolib_xh_hyperlink.obj \ - $(OBJS)\monolib_xh_listb.obj \ - $(OBJS)\monolib_xh_listbk.obj \ - $(OBJS)\monolib_xh_listc.obj \ - $(OBJS)\monolib_xh_mdi.obj \ - $(OBJS)\monolib_xh_menu.obj \ - $(OBJS)\monolib_xh_notbk.obj \ - $(OBJS)\monolib_xh_odcombo.obj \ - $(OBJS)\monolib_xh_panel.obj \ - $(OBJS)\monolib_xh_propdlg.obj \ - $(OBJS)\monolib_xh_radbt.obj \ - $(OBJS)\monolib_xh_radbx.obj \ - $(OBJS)\monolib_xh_scrol.obj \ - $(OBJS)\monolib_xh_scwin.obj \ - $(OBJS)\monolib_xh_htmllbox.obj \ - $(OBJS)\monolib_xh_sizer.obj \ - $(OBJS)\monolib_xh_slidr.obj \ - $(OBJS)\monolib_xh_spin.obj \ - $(OBJS)\monolib_xh_split.obj \ - $(OBJS)\monolib_xh_srchctrl.obj \ - $(OBJS)\monolib_xh_statbar.obj \ - $(OBJS)\monolib_xh_stbmp.obj \ - $(OBJS)\monolib_xh_stbox.obj \ - $(OBJS)\monolib_xh_stlin.obj \ - $(OBJS)\monolib_xh_sttxt.obj \ - $(OBJS)\monolib_xh_text.obj \ - $(OBJS)\monolib_xh_tglbtn.obj \ - $(OBJS)\monolib_xh_timectrl.obj \ - $(OBJS)\monolib_xh_toolb.obj \ - $(OBJS)\monolib_xh_toolbk.obj \ - $(OBJS)\monolib_xh_tree.obj \ - $(OBJS)\monolib_xh_treebk.obj \ - $(OBJS)\monolib_xh_unkwn.obj \ - $(OBJS)\monolib_xh_wizrd.obj \ - $(OBJS)\monolib_xmlres.obj \ - $(OBJS)\monolib_xmladv.obj \ - $(OBJS)\monolib_xmlrsall.obj \ - $(OBJS)\monolib_framemanager.obj \ - $(OBJS)\monolib_dockart.obj \ - $(OBJS)\monolib_floatpane.obj \ - $(OBJS)\monolib_auibook.obj \ - $(OBJS)\monolib_auibar.obj \ - $(OBJS)\monolib_tabmdi.obj \ - $(OBJS)\monolib_tabart.obj \ - $(OBJS)\monolib_xh_auinotbk.obj \ - $(OBJS)\monolib_advprops.obj \ - $(OBJS)\monolib_editors.obj \ - $(OBJS)\monolib_manager.obj \ - $(OBJS)\monolib_property.obj \ - $(OBJS)\monolib_propgrid.obj \ - $(OBJS)\monolib_propgridiface.obj \ - $(OBJS)\monolib_propgridpagestate.obj \ - $(OBJS)\monolib_props.obj \ - $(OBJS)\monolib_art_internal.obj \ - $(OBJS)\monolib_art_msw.obj \ - $(OBJS)\monolib_art_aui.obj \ - $(OBJS)\monolib_bar.obj \ - $(OBJS)\monolib_ribbon_buttonbar.obj \ - $(OBJS)\monolib_ribbon_control.obj \ - $(OBJS)\monolib_gallery.obj \ - $(OBJS)\monolib_page.obj \ - $(OBJS)\monolib_ribbon_panel.obj \ - $(OBJS)\monolib_ribbon_toolbar.obj \ - $(OBJS)\monolib_xh_ribbon.obj \ - $(OBJS)\monolib_richtextbuffer.obj \ - $(OBJS)\monolib_richtextctrl.obj \ - $(OBJS)\monolib_richtextformatdlg.obj \ - $(OBJS)\monolib_richtexthtml.obj \ - $(OBJS)\monolib_richtextimagedlg.obj \ - $(OBJS)\monolib_richtextprint.obj \ - $(OBJS)\monolib_richtextstyledlg.obj \ - $(OBJS)\monolib_richtextstyles.obj \ - $(OBJS)\monolib_richtextsymboldlg.obj \ - $(OBJS)\monolib_richtextxml.obj \ - $(OBJS)\monolib_xh_richtext.obj \ - $(OBJS)\monolib_stc.obj \ - $(OBJS)\monolib_PlatWX.obj \ - $(OBJS)\monolib_ScintillaWX.obj -!endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -____CORE_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_activex.obj \ - $(OBJS)\monolib_app.obj \ - $(OBJS)\monolib_bitmap.obj \ - $(OBJS)\monolib_brush.obj \ - $(OBJS)\monolib_caret.obj \ - $(OBJS)\monolib_clipbrd.obj \ - $(OBJS)\monolib_colour.obj \ - $(OBJS)\monolib_cursor.obj \ - $(OBJS)\monolib_data.obj \ - $(OBJS)\monolib_dc.obj \ - $(OBJS)\monolib_dcclient.obj \ - $(OBJS)\monolib_dcmemory.obj \ - $(OBJS)\monolib_dcprint.obj \ - $(OBJS)\monolib_dcscreen.obj \ - $(OBJS)\monolib_dialup.obj \ - $(OBJS)\monolib_dib.obj \ - $(OBJS)\monolib_display.obj \ - $(OBJS)\monolib_enhmeta.obj \ - $(OBJS)\monolib_font.obj \ - $(OBJS)\monolib_fontenum.obj \ - $(OBJS)\monolib_fontutil.obj \ - $(OBJS)\monolib_gdiimage.obj \ - $(OBJS)\monolib_gdiobj.obj \ - $(OBJS)\monolib_gdiplus.obj \ - $(OBJS)\monolib_graphics.obj \ - $(OBJS)\monolib_icon.obj \ - $(OBJS)\monolib_imaglist.obj \ - $(OBJS)\monolib_minifram.obj \ - $(OBJS)\monolib_nonownedwnd.obj \ - $(OBJS)\monolib_dataobj.obj \ - $(OBJS)\monolib_dropsrc.obj \ - $(OBJS)\monolib_droptgt.obj \ - $(OBJS)\monolib_oleutils.obj \ - $(OBJS)\monolib_safearray.obj \ - $(OBJS)\monolib_palette.obj \ - $(OBJS)\monolib_pen.obj \ - $(OBJS)\monolib_popupwin.obj \ - $(OBJS)\monolib_printdlg.obj \ - $(OBJS)\monolib_printwin.obj \ - $(OBJS)\monolib_region.obj \ - $(OBJS)\monolib_renderer.obj \ - $(OBJS)\monolib_settings.obj \ - $(OBJS)\monolib_textmeasure.obj \ - $(OBJS)\monolib_tooltip.obj \ - $(OBJS)\monolib_toplevel.obj \ - $(OBJS)\monolib_uiaction.obj \ - $(OBJS)\monolib_utilsgui.obj \ - $(OBJS)\monolib_utilswin.obj \ - $(OBJS)\monolib_uxtheme.obj \ - $(OBJS)\monolib_window.obj \ - $(OBJS)\monolib_helpchm.obj \ - $(OBJS)\monolib_helpwin.obj \ - $(OBJS)\monolib_automtn.obj \ - $(OBJS)\monolib_uuid.obj \ - $(OBJS)\monolib_clrpickerg.obj \ - $(OBJS)\monolib_collpaneg.obj \ - $(OBJS)\monolib_filepickerg.obj \ - $(OBJS)\monolib_fontpickerg.obj \ - $(OBJS)\monolib_generic_statusbr.obj \ - $(OBJS)\monolib_prntdlgg.obj \ - $(OBJS)\monolib_msw_accel.obj \ - $(OBJS)\monolib_anybutton.obj \ - $(OBJS)\monolib_artmsw.obj \ - $(OBJS)\monolib_msw_bmpbuttn.obj \ - $(OBJS)\monolib_msw_button.obj \ - $(OBJS)\monolib_msw_checkbox.obj \ - $(OBJS)\monolib_msw_choice.obj \ - $(OBJS)\monolib_colordlg.obj \ - $(OBJS)\monolib_combo.obj \ - $(OBJS)\monolib_msw_combobox.obj \ - $(OBJS)\monolib_msw_control.obj \ - $(OBJS)\monolib_msw_dialog.obj \ - $(OBJS)\monolib_dirdlg.obj \ - $(OBJS)\monolib_dragimag.obj \ - $(OBJS)\monolib_evtloop.obj \ - $(OBJS)\monolib_filedlg.obj \ - $(OBJS)\monolib_frame.obj \ - $(OBJS)\monolib_msw_gauge.obj \ - $(OBJS)\monolib_headerctrl.obj \ - $(OBJS)\monolib_iniconf.obj \ - $(OBJS)\monolib_msw_listbox.obj \ - $(OBJS)\monolib_msw_listctrl.obj \ - $(OBJS)\monolib_mdi.obj \ - $(OBJS)\monolib_msw_menu.obj \ - $(OBJS)\monolib_menuitem.obj \ - $(OBJS)\monolib_metafile.obj \ - $(OBJS)\monolib_msgdlg.obj \ - $(OBJS)\monolib_nativdlg.obj \ - $(OBJS)\monolib_nativewin.obj \ - $(OBJS)\monolib_msw_notebook.obj \ - $(OBJS)\monolib_access.obj \ - $(OBJS)\monolib_ownerdrw.obj \ - $(OBJS)\monolib_msw_panel.obj \ - $(OBJS)\monolib_progdlg.obj \ - $(OBJS)\monolib_msw_radiobox.obj \ - $(OBJS)\monolib_msw_radiobut.obj \ - $(OBJS)\monolib_richmsgdlg.obj \ - $(OBJS)\monolib_msw_scrolbar.obj \ - $(OBJS)\monolib_msw_slider.obj \ - $(OBJS)\monolib_msw_spinbutt.obj \ - $(OBJS)\monolib_spinctrl.obj \ - $(OBJS)\monolib_msw_statbmp.obj \ - $(OBJS)\monolib_msw_statbox.obj \ - $(OBJS)\monolib_statusbar.obj \ - $(OBJS)\monolib_msw_statline.obj \ - $(OBJS)\monolib_msw_stattext.obj \ - $(OBJS)\monolib_msw_toolbar.obj \ - $(OBJS)\monolib_msw_textctrl.obj \ - $(OBJS)\monolib_textentry.obj \ - $(OBJS)\monolib_msw_tglbtn.obj \ - $(OBJS)\monolib_treectrl.obj \ - $(OBJS)\monolib_msw_checklst.obj \ - $(OBJS)\monolib_msw_fdrepdlg.obj \ - $(OBJS)\monolib_fontdlg.obj \ - $(OBJS)\monolib_accelcmn.obj \ - $(OBJS)\monolib_accesscmn.obj \ - $(OBJS)\monolib_anidecod.obj \ - $(OBJS)\monolib_affinematrix2d.obj \ - $(OBJS)\monolib_appcmn.obj \ - $(OBJS)\monolib_artprov.obj \ - $(OBJS)\monolib_artstd.obj \ - $(OBJS)\monolib_arttango.obj \ - $(OBJS)\monolib_bmpbase.obj \ - $(OBJS)\monolib_bmpbtncmn.obj \ - $(OBJS)\monolib_bookctrl.obj \ - $(OBJS)\monolib_btncmn.obj \ - $(OBJS)\monolib_cairo.obj \ - $(OBJS)\monolib_checkboxcmn.obj \ - $(OBJS)\monolib_checklstcmn.obj \ - $(OBJS)\monolib_choiccmn.obj \ - $(OBJS)\monolib_clipcmn.obj \ - $(OBJS)\monolib_clrpickercmn.obj \ - $(OBJS)\monolib_colourcmn.obj \ - $(OBJS)\monolib_colourdata.obj \ - $(OBJS)\monolib_combocmn.obj \ - $(OBJS)\monolib_cmdproc.obj \ - $(OBJS)\monolib_cmndata.obj \ - $(OBJS)\monolib_containr.obj \ - $(OBJS)\monolib_cshelp.obj \ - $(OBJS)\monolib_ctrlcmn.obj \ - $(OBJS)\monolib_ctrlsub.obj \ - $(OBJS)\monolib_dcbase.obj \ - $(OBJS)\monolib_dcbufcmn.obj \ - $(OBJS)\monolib_dcgraph.obj \ - $(OBJS)\monolib_dcsvg.obj \ - $(OBJS)\monolib_dirctrlcmn.obj \ - $(OBJS)\monolib_dlgcmn.obj \ - $(OBJS)\monolib_dndcmn.obj \ - $(OBJS)\monolib_dobjcmn.obj \ - $(OBJS)\monolib_docmdi.obj \ - $(OBJS)\monolib_docview.obj \ - $(OBJS)\monolib_dpycmn.obj \ - $(OBJS)\monolib_dseldlg.obj \ - $(OBJS)\monolib_effects.obj \ - $(OBJS)\monolib_fddlgcmn.obj \ - $(OBJS)\monolib_filectrlcmn.obj \ - $(OBJS)\monolib_filehistorycmn.obj \ - $(OBJS)\monolib_filepickercmn.obj \ - $(OBJS)\monolib_fontpickercmn.obj \ - $(OBJS)\monolib_fldlgcmn.obj \ - $(OBJS)\monolib_fontcmn.obj \ - $(OBJS)\monolib_fontdata.obj \ - $(OBJS)\monolib_graphicc.obj \ - $(OBJS)\monolib_fontenumcmn.obj \ - $(OBJS)\monolib_fontmap.obj \ - $(OBJS)\monolib_fontutilcmn.obj \ - $(OBJS)\monolib_framecmn.obj \ - $(OBJS)\monolib_gaugecmn.obj \ - $(OBJS)\monolib_gbsizer.obj \ - $(OBJS)\monolib_gdicmn.obj \ - $(OBJS)\monolib_geometry.obj \ - $(OBJS)\monolib_gifdecod.obj \ - $(OBJS)\monolib_graphcmn.obj \ - $(OBJS)\monolib_headercolcmn.obj \ - $(OBJS)\monolib_headerctrlcmn.obj \ - $(OBJS)\monolib_helpbase.obj \ - $(OBJS)\monolib_iconbndl.obj \ - $(OBJS)\monolib_imagall.obj \ - $(OBJS)\monolib_imagbmp.obj \ - $(OBJS)\monolib_image.obj \ - $(OBJS)\monolib_imagfill.obj \ - $(OBJS)\monolib_imaggif.obj \ - $(OBJS)\monolib_imagiff.obj \ - $(OBJS)\monolib_imagjpeg.obj \ - $(OBJS)\monolib_imagpcx.obj \ - $(OBJS)\monolib_imagpng.obj \ - $(OBJS)\monolib_imagpnm.obj \ - $(OBJS)\monolib_imagtga.obj \ - $(OBJS)\monolib_imagtiff.obj \ - $(OBJS)\monolib_imagxpm.obj \ - $(OBJS)\monolib_layout.obj \ - $(OBJS)\monolib_lboxcmn.obj \ - $(OBJS)\monolib_listctrlcmn.obj \ - $(OBJS)\monolib_markupparser.obj \ - $(OBJS)\monolib_matrix.obj \ - $(OBJS)\monolib_menucmn.obj \ - $(OBJS)\monolib_modalhook.obj \ - $(OBJS)\monolib_mousemanager.obj \ - $(OBJS)\monolib_nbkbase.obj \ - $(OBJS)\monolib_overlaycmn.obj \ - $(OBJS)\monolib_ownerdrwcmn.obj \ - $(OBJS)\monolib_paper.obj \ - $(OBJS)\monolib_panelcmn.obj \ - $(OBJS)\monolib_persist.obj \ - $(OBJS)\monolib_pickerbase.obj \ - $(OBJS)\monolib_popupcmn.obj \ - $(OBJS)\monolib_preferencescmn.obj \ - $(OBJS)\monolib_prntbase.obj \ - $(OBJS)\monolib_quantize.obj \ - $(OBJS)\monolib_radiobtncmn.obj \ - $(OBJS)\monolib_radiocmn.obj \ - $(OBJS)\monolib_rearrangectrl.obj \ - $(OBJS)\monolib_rendcmn.obj \ - $(OBJS)\monolib_rgncmn.obj \ - $(OBJS)\monolib_scrolbarcmn.obj \ - $(OBJS)\monolib_settcmn.obj \ - $(OBJS)\monolib_sizer.obj \ - $(OBJS)\monolib_slidercmn.obj \ - $(OBJS)\monolib_spinbtncmn.obj \ - $(OBJS)\monolib_spinctrlcmn.obj \ - $(OBJS)\monolib_srchcmn.obj \ - $(OBJS)\monolib_statbar.obj \ - $(OBJS)\monolib_statbmpcmn.obj \ - $(OBJS)\monolib_statboxcmn.obj \ - $(OBJS)\monolib_statlinecmn.obj \ - $(OBJS)\monolib_stattextcmn.obj \ - $(OBJS)\monolib_stockitem.obj \ - $(OBJS)\monolib_tbarbase.obj \ - $(OBJS)\monolib_textcmn.obj \ - $(OBJS)\monolib_textentrycmn.obj \ - $(OBJS)\monolib_textmeasurecmn.obj \ - $(OBJS)\monolib_toplvcmn.obj \ - $(OBJS)\monolib_treebase.obj \ - $(OBJS)\monolib_uiactioncmn.obj \ - $(OBJS)\monolib_valgen.obj \ - $(OBJS)\monolib_validate.obj \ - $(OBJS)\monolib_valtext.obj \ - $(OBJS)\monolib_valnum.obj \ - $(OBJS)\monolib_wincmn.obj \ - $(OBJS)\monolib_windowid.obj \ - $(OBJS)\monolib_wrapsizer.obj \ - $(OBJS)\monolib_xpmdecod.obj \ - $(OBJS)\monolib_busyinfo.obj \ - $(OBJS)\monolib_generic_buttonbar.obj \ - $(OBJS)\monolib_choicdgg.obj \ - $(OBJS)\monolib_choicbkg.obj \ - $(OBJS)\monolib_combog.obj \ - $(OBJS)\monolib_dcpsg.obj \ - $(OBJS)\monolib_dirctrlg.obj \ - $(OBJS)\monolib_dragimgg.obj \ - $(OBJS)\monolib_filectrlg.obj \ - $(OBJS)\monolib_headerctrlg.obj \ - $(OBJS)\monolib_infobar.obj \ - $(OBJS)\monolib_listbkg.obj \ - $(OBJS)\monolib_logg.obj \ - $(OBJS)\monolib_markuptext.obj \ - $(OBJS)\monolib_msgdlgg.obj \ - $(OBJS)\monolib_numdlgg.obj \ - $(OBJS)\monolib_progdlgg.obj \ - $(OBJS)\monolib_preferencesg.obj \ - $(OBJS)\monolib_printps.obj \ - $(OBJS)\monolib_renderg.obj \ - $(OBJS)\monolib_richmsgdlgg.obj \ - $(OBJS)\monolib_scrlwing.obj \ - $(OBJS)\monolib_selstore.obj \ - $(OBJS)\monolib_spinctlg.obj \ - $(OBJS)\monolib_splitter.obj \ - $(OBJS)\monolib_srchctlg.obj \ - $(OBJS)\monolib_statbmpg.obj \ - $(OBJS)\monolib_stattextg.obj \ - $(OBJS)\monolib_textdlgg.obj \ - $(OBJS)\monolib_tipwin.obj \ - $(OBJS)\monolib_toolbkg.obj \ - $(OBJS)\monolib_treectlg.obj \ - $(OBJS)\monolib_treebkg.obj \ - $(OBJS)\monolib_vlbox.obj \ - $(OBJS)\monolib_vscroll.obj \ - $(OBJS)\monolib_xmlreshandler.obj -!endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -____CORE_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_activex.obj \ - $(OBJS)\monolib_app.obj \ - $(OBJS)\monolib_bitmap.obj \ - $(OBJS)\monolib_brush.obj \ - $(OBJS)\monolib_caret.obj \ - $(OBJS)\monolib_clipbrd.obj \ - $(OBJS)\monolib_colour.obj \ - $(OBJS)\monolib_cursor.obj \ - $(OBJS)\monolib_data.obj \ - $(OBJS)\monolib_dc.obj \ - $(OBJS)\monolib_dcclient.obj \ - $(OBJS)\monolib_dcmemory.obj \ - $(OBJS)\monolib_dcprint.obj \ - $(OBJS)\monolib_dcscreen.obj \ - $(OBJS)\monolib_dialup.obj \ - $(OBJS)\monolib_dib.obj \ - $(OBJS)\monolib_display.obj \ - $(OBJS)\monolib_enhmeta.obj \ - $(OBJS)\monolib_font.obj \ - $(OBJS)\monolib_fontenum.obj \ - $(OBJS)\monolib_fontutil.obj \ - $(OBJS)\monolib_gdiimage.obj \ - $(OBJS)\monolib_gdiobj.obj \ - $(OBJS)\monolib_gdiplus.obj \ - $(OBJS)\monolib_graphics.obj \ - $(OBJS)\monolib_icon.obj \ - $(OBJS)\monolib_imaglist.obj \ - $(OBJS)\monolib_minifram.obj \ - $(OBJS)\monolib_nonownedwnd.obj \ - $(OBJS)\monolib_dataobj.obj \ - $(OBJS)\monolib_dropsrc.obj \ - $(OBJS)\monolib_droptgt.obj \ - $(OBJS)\monolib_oleutils.obj \ - $(OBJS)\monolib_safearray.obj \ - $(OBJS)\monolib_palette.obj \ - $(OBJS)\monolib_pen.obj \ - $(OBJS)\monolib_popupwin.obj \ - $(OBJS)\monolib_printdlg.obj \ - $(OBJS)\monolib_printwin.obj \ - $(OBJS)\monolib_region.obj \ - $(OBJS)\monolib_renderer.obj \ - $(OBJS)\monolib_settings.obj \ - $(OBJS)\monolib_textmeasure.obj \ - $(OBJS)\monolib_tooltip.obj \ - $(OBJS)\monolib_toplevel.obj \ - $(OBJS)\monolib_uiaction.obj \ - $(OBJS)\monolib_utilsgui.obj \ - $(OBJS)\monolib_utilswin.obj \ - $(OBJS)\monolib_uxtheme.obj \ - $(OBJS)\monolib_window.obj \ - $(OBJS)\monolib_helpchm.obj \ - $(OBJS)\monolib_helpwin.obj \ - $(OBJS)\monolib_automtn.obj \ - $(OBJS)\monolib_uuid.obj \ - $(OBJS)\monolib_evtloop.obj \ - $(OBJS)\monolib_generic_accel.obj \ - $(OBJS)\monolib_clrpickerg.obj \ - $(OBJS)\monolib_collpaneg.obj \ - $(OBJS)\monolib_colrdlgg.obj \ - $(OBJS)\monolib_dirdlgg.obj \ - $(OBJS)\monolib_generic_fdrepdlg.obj \ - $(OBJS)\monolib_filedlgg.obj \ - $(OBJS)\monolib_filepickerg.obj \ - $(OBJS)\monolib_fontdlgg.obj \ - $(OBJS)\monolib_fontpickerg.obj \ - $(OBJS)\monolib_generic_listctrl.obj \ - $(OBJS)\monolib_mdig.obj \ - $(OBJS)\monolib_prntdlgg.obj \ - $(OBJS)\monolib_univ_bmpbuttn.obj \ - $(OBJS)\monolib_univ_button.obj \ - $(OBJS)\monolib_univ_checkbox.obj \ - $(OBJS)\monolib_univ_checklst.obj \ - $(OBJS)\monolib_univ_choice.obj \ - $(OBJS)\monolib_univ_combobox.obj \ - $(OBJS)\monolib_univ_control.obj \ - $(OBJS)\monolib_ctrlrend.obj \ - $(OBJS)\monolib_univ_dialog.obj \ - $(OBJS)\monolib_framuniv.obj \ - $(OBJS)\monolib_univ_gauge.obj \ - $(OBJS)\monolib_inpcons.obj \ - $(OBJS)\monolib_inphand.obj \ - $(OBJS)\monolib_univ_listbox.obj \ - $(OBJS)\monolib_univ_menu.obj \ - $(OBJS)\monolib_univ_notebook.obj \ - $(OBJS)\monolib_univ_radiobox.obj \ - $(OBJS)\monolib_univ_radiobut.obj \ - $(OBJS)\monolib_scrarrow.obj \ - $(OBJS)\monolib_univ_scrolbar.obj \ - $(OBJS)\monolib_scrthumb.obj \ - $(OBJS)\monolib_settingsuniv.obj \ - $(OBJS)\monolib_univ_slider.obj \ - $(OBJS)\monolib_univ_spinbutt.obj \ - $(OBJS)\monolib_univ_statbmp.obj \ - $(OBJS)\monolib_univ_statbox.obj \ - $(OBJS)\monolib_univ_statline.obj \ - $(OBJS)\monolib_univ_stattext.obj \ - $(OBJS)\monolib_univ_statusbr.obj \ - $(OBJS)\monolib_stdrend.obj \ - $(OBJS)\monolib_univ_textctrl.obj \ - $(OBJS)\monolib_univ_tglbtn.obj \ - $(OBJS)\monolib_theme.obj \ - $(OBJS)\monolib_univ_toolbar.obj \ - $(OBJS)\monolib_topluniv.obj \ - $(OBJS)\monolib_winuniv.obj \ - $(OBJS)\monolib_gtk.obj \ - $(OBJS)\monolib_metal.obj \ - $(OBJS)\monolib_mono.obj \ - $(OBJS)\monolib_win32.obj \ - $(OBJS)\monolib_accelcmn.obj \ - $(OBJS)\monolib_accesscmn.obj \ - $(OBJS)\monolib_anidecod.obj \ - $(OBJS)\monolib_affinematrix2d.obj \ - $(OBJS)\monolib_appcmn.obj \ - $(OBJS)\monolib_artprov.obj \ - $(OBJS)\monolib_artstd.obj \ - $(OBJS)\monolib_arttango.obj \ - $(OBJS)\monolib_bmpbase.obj \ - $(OBJS)\monolib_bmpbtncmn.obj \ - $(OBJS)\monolib_bookctrl.obj \ - $(OBJS)\monolib_btncmn.obj \ - $(OBJS)\monolib_cairo.obj \ - $(OBJS)\monolib_checkboxcmn.obj \ - $(OBJS)\monolib_checklstcmn.obj \ - $(OBJS)\monolib_choiccmn.obj \ - $(OBJS)\monolib_clipcmn.obj \ - $(OBJS)\monolib_clrpickercmn.obj \ - $(OBJS)\monolib_colourcmn.obj \ - $(OBJS)\monolib_colourdata.obj \ - $(OBJS)\monolib_combocmn.obj \ - $(OBJS)\monolib_cmdproc.obj \ - $(OBJS)\monolib_cmndata.obj \ - $(OBJS)\monolib_containr.obj \ - $(OBJS)\monolib_cshelp.obj \ - $(OBJS)\monolib_ctrlcmn.obj \ - $(OBJS)\monolib_ctrlsub.obj \ - $(OBJS)\monolib_dcbase.obj \ - $(OBJS)\monolib_dcbufcmn.obj \ - $(OBJS)\monolib_dcgraph.obj \ - $(OBJS)\monolib_dcsvg.obj \ - $(OBJS)\monolib_dirctrlcmn.obj \ - $(OBJS)\monolib_dlgcmn.obj \ - $(OBJS)\monolib_dndcmn.obj \ - $(OBJS)\monolib_dobjcmn.obj \ - $(OBJS)\monolib_docmdi.obj \ - $(OBJS)\monolib_docview.obj \ - $(OBJS)\monolib_dpycmn.obj \ - $(OBJS)\monolib_dseldlg.obj \ - $(OBJS)\monolib_effects.obj \ - $(OBJS)\monolib_fddlgcmn.obj \ - $(OBJS)\monolib_filectrlcmn.obj \ - $(OBJS)\monolib_filehistorycmn.obj \ - $(OBJS)\monolib_filepickercmn.obj \ - $(OBJS)\monolib_fontpickercmn.obj \ - $(OBJS)\monolib_fldlgcmn.obj \ - $(OBJS)\monolib_fontcmn.obj \ - $(OBJS)\monolib_fontdata.obj \ - $(OBJS)\monolib_graphicc.obj \ - $(OBJS)\monolib_fontenumcmn.obj \ - $(OBJS)\monolib_fontmap.obj \ - $(OBJS)\monolib_fontutilcmn.obj \ - $(OBJS)\monolib_framecmn.obj \ - $(OBJS)\monolib_gaugecmn.obj \ - $(OBJS)\monolib_gbsizer.obj \ - $(OBJS)\monolib_gdicmn.obj \ - $(OBJS)\monolib_geometry.obj \ - $(OBJS)\monolib_gifdecod.obj \ - $(OBJS)\monolib_graphcmn.obj \ - $(OBJS)\monolib_headercolcmn.obj \ - $(OBJS)\monolib_headerctrlcmn.obj \ - $(OBJS)\monolib_helpbase.obj \ - $(OBJS)\monolib_iconbndl.obj \ - $(OBJS)\monolib_imagall.obj \ - $(OBJS)\monolib_imagbmp.obj \ - $(OBJS)\monolib_image.obj \ - $(OBJS)\monolib_imagfill.obj \ - $(OBJS)\monolib_imaggif.obj \ - $(OBJS)\monolib_imagiff.obj \ - $(OBJS)\monolib_imagjpeg.obj \ - $(OBJS)\monolib_imagpcx.obj \ - $(OBJS)\monolib_imagpng.obj \ - $(OBJS)\monolib_imagpnm.obj \ - $(OBJS)\monolib_imagtga.obj \ - $(OBJS)\monolib_imagtiff.obj \ - $(OBJS)\monolib_imagxpm.obj \ - $(OBJS)\monolib_layout.obj \ - $(OBJS)\monolib_lboxcmn.obj \ - $(OBJS)\monolib_listctrlcmn.obj \ - $(OBJS)\monolib_markupparser.obj \ - $(OBJS)\monolib_matrix.obj \ - $(OBJS)\monolib_menucmn.obj \ - $(OBJS)\monolib_modalhook.obj \ - $(OBJS)\monolib_mousemanager.obj \ - $(OBJS)\monolib_nbkbase.obj \ - $(OBJS)\monolib_overlaycmn.obj \ - $(OBJS)\monolib_ownerdrwcmn.obj \ - $(OBJS)\monolib_paper.obj \ - $(OBJS)\monolib_panelcmn.obj \ - $(OBJS)\monolib_persist.obj \ - $(OBJS)\monolib_pickerbase.obj \ - $(OBJS)\monolib_popupcmn.obj \ - $(OBJS)\monolib_preferencescmn.obj \ - $(OBJS)\monolib_prntbase.obj \ - $(OBJS)\monolib_quantize.obj \ - $(OBJS)\monolib_radiobtncmn.obj \ - $(OBJS)\monolib_radiocmn.obj \ - $(OBJS)\monolib_rearrangectrl.obj \ - $(OBJS)\monolib_rendcmn.obj \ - $(OBJS)\monolib_rgncmn.obj \ - $(OBJS)\monolib_scrolbarcmn.obj \ - $(OBJS)\monolib_settcmn.obj \ - $(OBJS)\monolib_sizer.obj \ - $(OBJS)\monolib_slidercmn.obj \ - $(OBJS)\monolib_spinbtncmn.obj \ - $(OBJS)\monolib_spinctrlcmn.obj \ - $(OBJS)\monolib_srchcmn.obj \ - $(OBJS)\monolib_statbar.obj \ - $(OBJS)\monolib_statbmpcmn.obj \ - $(OBJS)\monolib_statboxcmn.obj \ - $(OBJS)\monolib_statlinecmn.obj \ - $(OBJS)\monolib_stattextcmn.obj \ - $(OBJS)\monolib_stockitem.obj \ - $(OBJS)\monolib_tbarbase.obj \ - $(OBJS)\monolib_textcmn.obj \ - $(OBJS)\monolib_textentrycmn.obj \ - $(OBJS)\monolib_textmeasurecmn.obj \ - $(OBJS)\monolib_toplvcmn.obj \ - $(OBJS)\monolib_treebase.obj \ - $(OBJS)\monolib_uiactioncmn.obj \ - $(OBJS)\monolib_valgen.obj \ - $(OBJS)\monolib_validate.obj \ - $(OBJS)\monolib_valtext.obj \ - $(OBJS)\monolib_valnum.obj \ - $(OBJS)\monolib_wincmn.obj \ - $(OBJS)\monolib_windowid.obj \ - $(OBJS)\monolib_wrapsizer.obj \ - $(OBJS)\monolib_xpmdecod.obj \ - $(OBJS)\monolib_busyinfo.obj \ - $(OBJS)\monolib_generic_buttonbar.obj \ - $(OBJS)\monolib_choicdgg.obj \ - $(OBJS)\monolib_choicbkg.obj \ - $(OBJS)\monolib_combog.obj \ - $(OBJS)\monolib_dcpsg.obj \ - $(OBJS)\monolib_dirctrlg.obj \ - $(OBJS)\monolib_dragimgg.obj \ - $(OBJS)\monolib_filectrlg.obj \ - $(OBJS)\monolib_headerctrlg.obj \ - $(OBJS)\monolib_infobar.obj \ - $(OBJS)\monolib_listbkg.obj \ - $(OBJS)\monolib_logg.obj \ - $(OBJS)\monolib_markuptext.obj \ - $(OBJS)\monolib_msgdlgg.obj \ - $(OBJS)\monolib_numdlgg.obj \ - $(OBJS)\monolib_progdlgg.obj \ - $(OBJS)\monolib_preferencesg.obj \ - $(OBJS)\monolib_printps.obj \ - $(OBJS)\monolib_renderg.obj \ - $(OBJS)\monolib_richmsgdlgg.obj \ - $(OBJS)\monolib_scrlwing.obj \ - $(OBJS)\monolib_selstore.obj \ - $(OBJS)\monolib_spinctlg.obj \ - $(OBJS)\monolib_splitter.obj \ - $(OBJS)\monolib_srchctlg.obj \ - $(OBJS)\monolib_statbmpg.obj \ - $(OBJS)\monolib_stattextg.obj \ - $(OBJS)\monolib_textdlgg.obj \ - $(OBJS)\monolib_tipwin.obj \ - $(OBJS)\monolib_toolbkg.obj \ - $(OBJS)\monolib_treectlg.obj \ - $(OBJS)\monolib_treebkg.obj \ - $(OBJS)\monolib_vlbox.obj \ - $(OBJS)\monolib_vscroll.obj \ - $(OBJS)\monolib_xmlreshandler.obj -!endif -!if "$(WXUNIV)" == "0" -____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_animatecmn.obj \ - $(OBJS)\monolib_bmpcboxcmn.obj \ - $(OBJS)\monolib_calctrlcmn.obj \ - $(OBJS)\monolib_datavcmn.obj \ - $(OBJS)\monolib_gridcmn.obj \ - $(OBJS)\monolib_hyperlnkcmn.obj \ - $(OBJS)\monolib_odcombocmn.obj \ - $(OBJS)\monolib_richtooltipcmn.obj \ - $(OBJS)\monolib_aboutdlgg.obj \ - $(OBJS)\monolib_bannerwindow.obj \ - $(OBJS)\monolib_bmpcboxg.obj \ - $(OBJS)\monolib_calctrlg.obj \ - $(OBJS)\monolib_commandlinkbuttong.obj \ - $(OBJS)\monolib_datavgen.obj \ - $(OBJS)\monolib_datectlg.obj \ - $(OBJS)\monolib_editlbox.obj \ - $(OBJS)\monolib_grid.obj \ - $(OBJS)\monolib_gridctrl.obj \ - $(OBJS)\monolib_grideditors.obj \ - $(OBJS)\monolib_gridsel.obj \ - $(OBJS)\monolib_helpext.obj \ - $(OBJS)\monolib_hyperlinkg.obj \ - $(OBJS)\monolib_laywin.obj \ - $(OBJS)\monolib_notifmsgg.obj \ - $(OBJS)\monolib_odcombo.obj \ - $(OBJS)\monolib_propdlg.obj \ - $(OBJS)\monolib_richtooltipg.obj \ - $(OBJS)\monolib_sashwin.obj \ - $(OBJS)\monolib_splash.obj \ - $(OBJS)\monolib_timectrlg.obj \ - $(OBJS)\monolib_tipdlg.obj \ - $(OBJS)\monolib_treelist.obj \ - $(OBJS)\monolib_wizard.obj \ - $(OBJS)\monolib_taskbarcmn.obj \ - $(OBJS)\monolib_aboutdlg.obj \ - $(OBJS)\monolib_notifmsg.obj \ - $(OBJS)\monolib_richtooltip.obj \ - $(OBJS)\monolib_sound.obj \ - $(OBJS)\monolib_taskbar.obj \ - $(OBJS)\monolib_joystick.obj \ - $(OBJS)\monolib_animateg.obj \ - $(OBJS)\monolib_bmpcbox.obj \ - $(OBJS)\monolib_calctrl.obj \ - $(OBJS)\monolib_commandlinkbutton.obj \ - $(OBJS)\monolib_datecontrols.obj \ - $(OBJS)\monolib_datectrl.obj \ - $(OBJS)\monolib_datetimectrl.obj \ - $(OBJS)\monolib_hyperlink.obj \ - $(OBJS)\monolib_timectrl.obj -!endif -!if "$(WXUNIV)" == "1" -____ADVANCED_SRC_FILENAMES_1_OBJECTS = \ - $(OBJS)\monolib_animatecmn.obj \ - $(OBJS)\monolib_bmpcboxcmn.obj \ - $(OBJS)\monolib_calctrlcmn.obj \ - $(OBJS)\monolib_datavcmn.obj \ - $(OBJS)\monolib_gridcmn.obj \ - $(OBJS)\monolib_hyperlnkcmn.obj \ - $(OBJS)\monolib_odcombocmn.obj \ - $(OBJS)\monolib_richtooltipcmn.obj \ - $(OBJS)\monolib_aboutdlgg.obj \ - $(OBJS)\monolib_bannerwindow.obj \ - $(OBJS)\monolib_bmpcboxg.obj \ - $(OBJS)\monolib_calctrlg.obj \ - $(OBJS)\monolib_commandlinkbuttong.obj \ - $(OBJS)\monolib_datavgen.obj \ - $(OBJS)\monolib_datectlg.obj \ - $(OBJS)\monolib_editlbox.obj \ - $(OBJS)\monolib_grid.obj \ - $(OBJS)\monolib_gridctrl.obj \ - $(OBJS)\monolib_grideditors.obj \ - $(OBJS)\monolib_gridsel.obj \ - $(OBJS)\monolib_helpext.obj \ - $(OBJS)\monolib_hyperlinkg.obj \ - $(OBJS)\monolib_laywin.obj \ - $(OBJS)\monolib_notifmsgg.obj \ - $(OBJS)\monolib_odcombo.obj \ - $(OBJS)\monolib_propdlg.obj \ - $(OBJS)\monolib_richtooltipg.obj \ - $(OBJS)\monolib_sashwin.obj \ - $(OBJS)\monolib_splash.obj \ - $(OBJS)\monolib_timectrlg.obj \ - $(OBJS)\monolib_tipdlg.obj \ - $(OBJS)\monolib_treelist.obj \ - $(OBJS)\monolib_wizard.obj \ - $(OBJS)\monolib_taskbarcmn.obj \ - $(OBJS)\monolib_aboutdlg.obj \ - $(OBJS)\monolib_notifmsg.obj \ - $(OBJS)\monolib_richtooltip.obj \ - $(OBJS)\monolib_sound.obj \ - $(OBJS)\monolib_taskbar.obj \ - $(OBJS)\monolib_joystick.obj \ - $(OBJS)\monolib_animateg.obj -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -__basedll___depname = \ - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_139 = $(__DEBUGRUNTIME_11) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_139 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_139 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_139 = $(__DEBUGRUNTIME_11) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_147 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_147 = $(__THREADSFLAG) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -__baselib___depname = \ - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_162 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_162 = $(__THREADSFLAG) -!endif -!if "$(SHARED)" == "1" -____wxbase_namedll_DEP = $(__basedll___depname) -!endif -!if "$(SHARED)" == "0" -____wxbase_namelib_DEP = $(__baselib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -__netdll___depname = \ - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_170 = $(__DEBUGRUNTIME_11) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_170 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_170 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_170 = $(__DEBUGRUNTIME_11) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_178 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_178 = $(__THREADSFLAG) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -__netlib___depname = \ - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_193 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_193 = $(__THREADSFLAG) -!endif -!if "$(SHARED)" == "1" -____wxnet_namedll_DEP = $(__netdll___depname) -!endif -!if "$(SHARED)" == "0" -____wxnet_namelib_DEP = $(__netlib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" -__coredll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_201 = $(__DEBUGRUNTIME_11) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_201 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_201 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_201 = $(__DEBUGRUNTIME_11) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_209 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_209 = $(__THREADSFLAG) -!endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -____CORE_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\coredll_activex.obj \ - $(OBJS)\coredll_app.obj \ - $(OBJS)\coredll_bitmap.obj \ - $(OBJS)\coredll_brush.obj \ - $(OBJS)\coredll_caret.obj \ - $(OBJS)\coredll_clipbrd.obj \ - $(OBJS)\coredll_colour.obj \ - $(OBJS)\coredll_cursor.obj \ - $(OBJS)\coredll_data.obj \ - $(OBJS)\coredll_dc.obj \ - $(OBJS)\coredll_dcclient.obj \ - $(OBJS)\coredll_dcmemory.obj \ - $(OBJS)\coredll_dcprint.obj \ - $(OBJS)\coredll_dcscreen.obj \ - $(OBJS)\coredll_dialup.obj \ - $(OBJS)\coredll_dib.obj \ - $(OBJS)\coredll_display.obj \ - $(OBJS)\coredll_enhmeta.obj \ - $(OBJS)\coredll_font.obj \ - $(OBJS)\coredll_fontenum.obj \ - $(OBJS)\coredll_fontutil.obj \ - $(OBJS)\coredll_gdiimage.obj \ - $(OBJS)\coredll_gdiobj.obj \ - $(OBJS)\coredll_gdiplus.obj \ - $(OBJS)\coredll_graphics.obj \ - $(OBJS)\coredll_icon.obj \ - $(OBJS)\coredll_imaglist.obj \ - $(OBJS)\coredll_minifram.obj \ - $(OBJS)\coredll_nonownedwnd.obj \ - $(OBJS)\coredll_dataobj.obj \ - $(OBJS)\coredll_dropsrc.obj \ - $(OBJS)\coredll_droptgt.obj \ - $(OBJS)\coredll_oleutils.obj \ - $(OBJS)\coredll_safearray.obj \ - $(OBJS)\coredll_palette.obj \ - $(OBJS)\coredll_pen.obj \ - $(OBJS)\coredll_popupwin.obj \ - $(OBJS)\coredll_printdlg.obj \ - $(OBJS)\coredll_printwin.obj \ - $(OBJS)\coredll_region.obj \ - $(OBJS)\coredll_renderer.obj \ - $(OBJS)\coredll_settings.obj \ - $(OBJS)\coredll_textmeasure.obj \ - $(OBJS)\coredll_tooltip.obj \ - $(OBJS)\coredll_toplevel.obj \ - $(OBJS)\coredll_uiaction.obj \ - $(OBJS)\coredll_utilsgui.obj \ - $(OBJS)\coredll_utilswin.obj \ - $(OBJS)\coredll_uxtheme.obj \ - $(OBJS)\coredll_window.obj \ - $(OBJS)\coredll_helpchm.obj \ - $(OBJS)\coredll_helpwin.obj \ - $(OBJS)\coredll_automtn.obj \ - $(OBJS)\coredll_uuid.obj \ - $(OBJS)\coredll_clrpickerg.obj \ - $(OBJS)\coredll_collpaneg.obj \ - $(OBJS)\coredll_filepickerg.obj \ - $(OBJS)\coredll_fontpickerg.obj \ - $(OBJS)\coredll_generic_statusbr.obj \ - $(OBJS)\coredll_prntdlgg.obj \ - $(OBJS)\coredll_msw_accel.obj \ - $(OBJS)\coredll_anybutton.obj \ - $(OBJS)\coredll_artmsw.obj \ - $(OBJS)\coredll_msw_bmpbuttn.obj \ - $(OBJS)\coredll_msw_button.obj \ - $(OBJS)\coredll_msw_checkbox.obj \ - $(OBJS)\coredll_msw_choice.obj \ - $(OBJS)\coredll_colordlg.obj \ - $(OBJS)\coredll_combo.obj \ - $(OBJS)\coredll_msw_combobox.obj \ - $(OBJS)\coredll_msw_control.obj \ - $(OBJS)\coredll_msw_dialog.obj \ - $(OBJS)\coredll_dirdlg.obj \ - $(OBJS)\coredll_dragimag.obj \ - $(OBJS)\coredll_evtloop.obj \ - $(OBJS)\coredll_filedlg.obj \ - $(OBJS)\coredll_frame.obj \ - $(OBJS)\coredll_msw_gauge.obj \ - $(OBJS)\coredll_headerctrl.obj \ - $(OBJS)\coredll_iniconf.obj \ - $(OBJS)\coredll_msw_listbox.obj \ - $(OBJS)\coredll_msw_listctrl.obj \ - $(OBJS)\coredll_mdi.obj \ - $(OBJS)\coredll_msw_menu.obj \ - $(OBJS)\coredll_menuitem.obj \ - $(OBJS)\coredll_metafile.obj \ - $(OBJS)\coredll_msgdlg.obj \ - $(OBJS)\coredll_nativdlg.obj \ - $(OBJS)\coredll_nativewin.obj \ - $(OBJS)\coredll_msw_notebook.obj \ - $(OBJS)\coredll_access.obj \ - $(OBJS)\coredll_ownerdrw.obj \ - $(OBJS)\coredll_panel.obj \ - $(OBJS)\coredll_progdlg.obj \ - $(OBJS)\coredll_msw_radiobox.obj \ - $(OBJS)\coredll_msw_radiobut.obj \ - $(OBJS)\coredll_richmsgdlg.obj \ - $(OBJS)\coredll_msw_scrolbar.obj \ - $(OBJS)\coredll_msw_slider.obj \ - $(OBJS)\coredll_msw_spinbutt.obj \ - $(OBJS)\coredll_spinctrl.obj \ - $(OBJS)\coredll_msw_statbmp.obj \ - $(OBJS)\coredll_msw_statbox.obj \ - $(OBJS)\coredll_statusbar.obj \ - $(OBJS)\coredll_msw_statline.obj \ - $(OBJS)\coredll_msw_stattext.obj \ - $(OBJS)\coredll_msw_toolbar.obj \ - $(OBJS)\coredll_msw_textctrl.obj \ - $(OBJS)\coredll_textentry.obj \ - $(OBJS)\coredll_msw_tglbtn.obj \ - $(OBJS)\coredll_treectrl.obj \ - $(OBJS)\coredll_msw_checklst.obj \ - $(OBJS)\coredll_msw_fdrepdlg.obj \ - $(OBJS)\coredll_fontdlg.obj \ - $(OBJS)\coredll_accelcmn.obj \ - $(OBJS)\coredll_accesscmn.obj \ - $(OBJS)\coredll_anidecod.obj \ - $(OBJS)\coredll_affinematrix2d.obj \ - $(OBJS)\coredll_appcmn.obj \ - $(OBJS)\coredll_artprov.obj \ - $(OBJS)\coredll_artstd.obj \ - $(OBJS)\coredll_arttango.obj \ - $(OBJS)\coredll_bmpbase.obj \ - $(OBJS)\coredll_bmpbtncmn.obj \ - $(OBJS)\coredll_bookctrl.obj \ - $(OBJS)\coredll_btncmn.obj \ - $(OBJS)\coredll_cairo.obj \ - $(OBJS)\coredll_checkboxcmn.obj \ - $(OBJS)\coredll_checklstcmn.obj \ - $(OBJS)\coredll_choiccmn.obj \ - $(OBJS)\coredll_clipcmn.obj \ - $(OBJS)\coredll_clrpickercmn.obj \ - $(OBJS)\coredll_colourcmn.obj \ - $(OBJS)\coredll_colourdata.obj \ - $(OBJS)\coredll_combocmn.obj \ - $(OBJS)\coredll_cmdproc.obj \ - $(OBJS)\coredll_cmndata.obj \ - $(OBJS)\coredll_containr.obj \ - $(OBJS)\coredll_cshelp.obj \ - $(OBJS)\coredll_ctrlcmn.obj \ - $(OBJS)\coredll_ctrlsub.obj \ - $(OBJS)\coredll_dcbase.obj \ - $(OBJS)\coredll_dcbufcmn.obj \ - $(OBJS)\coredll_dcgraph.obj \ - $(OBJS)\coredll_dcsvg.obj \ - $(OBJS)\coredll_dirctrlcmn.obj \ - $(OBJS)\coredll_dlgcmn.obj \ - $(OBJS)\coredll_dndcmn.obj \ - $(OBJS)\coredll_dobjcmn.obj \ - $(OBJS)\coredll_docmdi.obj \ - $(OBJS)\coredll_docview.obj \ - $(OBJS)\coredll_dpycmn.obj \ - $(OBJS)\coredll_dseldlg.obj \ - $(OBJS)\coredll_effects.obj \ - $(OBJS)\coredll_fddlgcmn.obj \ - $(OBJS)\coredll_filectrlcmn.obj \ - $(OBJS)\coredll_filehistorycmn.obj \ - $(OBJS)\coredll_filepickercmn.obj \ - $(OBJS)\coredll_fontpickercmn.obj \ - $(OBJS)\coredll_fldlgcmn.obj \ - $(OBJS)\coredll_fontcmn.obj \ - $(OBJS)\coredll_fontdata.obj \ - $(OBJS)\coredll_graphicc.obj \ - $(OBJS)\coredll_fontenumcmn.obj \ - $(OBJS)\coredll_fontmap.obj \ - $(OBJS)\coredll_fontutilcmn.obj \ - $(OBJS)\coredll_framecmn.obj \ - $(OBJS)\coredll_gaugecmn.obj \ - $(OBJS)\coredll_gbsizer.obj \ - $(OBJS)\coredll_gdicmn.obj \ - $(OBJS)\coredll_geometry.obj \ - $(OBJS)\coredll_gifdecod.obj \ - $(OBJS)\coredll_graphcmn.obj \ - $(OBJS)\coredll_headercolcmn.obj \ - $(OBJS)\coredll_headerctrlcmn.obj \ - $(OBJS)\coredll_helpbase.obj \ - $(OBJS)\coredll_iconbndl.obj \ - $(OBJS)\coredll_imagall.obj \ - $(OBJS)\coredll_imagbmp.obj \ - $(OBJS)\coredll_image.obj \ - $(OBJS)\coredll_imagfill.obj \ - $(OBJS)\coredll_imaggif.obj \ - $(OBJS)\coredll_imagiff.obj \ - $(OBJS)\coredll_imagjpeg.obj \ - $(OBJS)\coredll_imagpcx.obj \ - $(OBJS)\coredll_imagpng.obj \ - $(OBJS)\coredll_imagpnm.obj \ - $(OBJS)\coredll_imagtga.obj \ - $(OBJS)\coredll_imagtiff.obj \ - $(OBJS)\coredll_imagxpm.obj \ - $(OBJS)\coredll_layout.obj \ - $(OBJS)\coredll_lboxcmn.obj \ - $(OBJS)\coredll_listctrlcmn.obj \ - $(OBJS)\coredll_markupparser.obj \ - $(OBJS)\coredll_matrix.obj \ - $(OBJS)\coredll_menucmn.obj \ - $(OBJS)\coredll_modalhook.obj \ - $(OBJS)\coredll_mousemanager.obj \ - $(OBJS)\coredll_nbkbase.obj \ - $(OBJS)\coredll_overlaycmn.obj \ - $(OBJS)\coredll_ownerdrwcmn.obj \ - $(OBJS)\coredll_paper.obj \ - $(OBJS)\coredll_panelcmn.obj \ - $(OBJS)\coredll_persist.obj \ - $(OBJS)\coredll_pickerbase.obj \ - $(OBJS)\coredll_popupcmn.obj \ - $(OBJS)\coredll_preferencescmn.obj \ - $(OBJS)\coredll_prntbase.obj \ - $(OBJS)\coredll_quantize.obj \ - $(OBJS)\coredll_radiobtncmn.obj \ - $(OBJS)\coredll_radiocmn.obj \ - $(OBJS)\coredll_rearrangectrl.obj \ - $(OBJS)\coredll_rendcmn.obj \ - $(OBJS)\coredll_rgncmn.obj \ - $(OBJS)\coredll_scrolbarcmn.obj \ - $(OBJS)\coredll_settcmn.obj \ - $(OBJS)\coredll_sizer.obj \ - $(OBJS)\coredll_slidercmn.obj \ - $(OBJS)\coredll_spinbtncmn.obj \ - $(OBJS)\coredll_spinctrlcmn.obj \ - $(OBJS)\coredll_srchcmn.obj \ - $(OBJS)\coredll_statbar.obj \ - $(OBJS)\coredll_statbmpcmn.obj \ - $(OBJS)\coredll_statboxcmn.obj \ - $(OBJS)\coredll_statlinecmn.obj \ - $(OBJS)\coredll_stattextcmn.obj \ - $(OBJS)\coredll_stockitem.obj \ - $(OBJS)\coredll_tbarbase.obj \ - $(OBJS)\coredll_textcmn.obj \ - $(OBJS)\coredll_textentrycmn.obj \ - $(OBJS)\coredll_textmeasurecmn.obj \ - $(OBJS)\coredll_toplvcmn.obj \ - $(OBJS)\coredll_treebase.obj \ - $(OBJS)\coredll_uiactioncmn.obj \ - $(OBJS)\coredll_valgen.obj \ - $(OBJS)\coredll_validate.obj \ - $(OBJS)\coredll_valtext.obj \ - $(OBJS)\coredll_valnum.obj \ - $(OBJS)\coredll_wincmn.obj \ - $(OBJS)\coredll_windowid.obj \ - $(OBJS)\coredll_wrapsizer.obj \ - $(OBJS)\coredll_xpmdecod.obj \ - $(OBJS)\coredll_busyinfo.obj \ - $(OBJS)\coredll_buttonbar.obj \ - $(OBJS)\coredll_choicdgg.obj \ - $(OBJS)\coredll_choicbkg.obj \ - $(OBJS)\coredll_combog.obj \ - $(OBJS)\coredll_dcpsg.obj \ - $(OBJS)\coredll_dirctrlg.obj \ - $(OBJS)\coredll_dragimgg.obj \ - $(OBJS)\coredll_filectrlg.obj \ - $(OBJS)\coredll_headerctrlg.obj \ - $(OBJS)\coredll_infobar.obj \ - $(OBJS)\coredll_listbkg.obj \ - $(OBJS)\coredll_logg.obj \ - $(OBJS)\coredll_markuptext.obj \ - $(OBJS)\coredll_msgdlgg.obj \ - $(OBJS)\coredll_numdlgg.obj \ - $(OBJS)\coredll_progdlgg.obj \ - $(OBJS)\coredll_preferencesg.obj \ - $(OBJS)\coredll_printps.obj \ - $(OBJS)\coredll_renderg.obj \ - $(OBJS)\coredll_richmsgdlgg.obj \ - $(OBJS)\coredll_scrlwing.obj \ - $(OBJS)\coredll_selstore.obj \ - $(OBJS)\coredll_spinctlg.obj \ - $(OBJS)\coredll_splitter.obj \ - $(OBJS)\coredll_srchctlg.obj \ - $(OBJS)\coredll_statbmpg.obj \ - $(OBJS)\coredll_stattextg.obj \ - $(OBJS)\coredll_textdlgg.obj \ - $(OBJS)\coredll_tipwin.obj \ - $(OBJS)\coredll_toolbkg.obj \ - $(OBJS)\coredll_treectlg.obj \ - $(OBJS)\coredll_treebkg.obj \ - $(OBJS)\coredll_vlbox.obj \ - $(OBJS)\coredll_vscroll.obj \ - $(OBJS)\coredll_xmlreshandler.obj -!endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -____CORE_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\coredll_activex.obj \ - $(OBJS)\coredll_app.obj \ - $(OBJS)\coredll_bitmap.obj \ - $(OBJS)\coredll_brush.obj \ - $(OBJS)\coredll_caret.obj \ - $(OBJS)\coredll_clipbrd.obj \ - $(OBJS)\coredll_colour.obj \ - $(OBJS)\coredll_cursor.obj \ - $(OBJS)\coredll_data.obj \ - $(OBJS)\coredll_dc.obj \ - $(OBJS)\coredll_dcclient.obj \ - $(OBJS)\coredll_dcmemory.obj \ - $(OBJS)\coredll_dcprint.obj \ - $(OBJS)\coredll_dcscreen.obj \ - $(OBJS)\coredll_dialup.obj \ - $(OBJS)\coredll_dib.obj \ - $(OBJS)\coredll_display.obj \ - $(OBJS)\coredll_enhmeta.obj \ - $(OBJS)\coredll_font.obj \ - $(OBJS)\coredll_fontenum.obj \ - $(OBJS)\coredll_fontutil.obj \ - $(OBJS)\coredll_gdiimage.obj \ - $(OBJS)\coredll_gdiobj.obj \ - $(OBJS)\coredll_gdiplus.obj \ - $(OBJS)\coredll_graphics.obj \ - $(OBJS)\coredll_icon.obj \ - $(OBJS)\coredll_imaglist.obj \ - $(OBJS)\coredll_minifram.obj \ - $(OBJS)\coredll_nonownedwnd.obj \ - $(OBJS)\coredll_dataobj.obj \ - $(OBJS)\coredll_dropsrc.obj \ - $(OBJS)\coredll_droptgt.obj \ - $(OBJS)\coredll_oleutils.obj \ - $(OBJS)\coredll_safearray.obj \ - $(OBJS)\coredll_palette.obj \ - $(OBJS)\coredll_pen.obj \ - $(OBJS)\coredll_popupwin.obj \ - $(OBJS)\coredll_printdlg.obj \ - $(OBJS)\coredll_printwin.obj \ - $(OBJS)\coredll_region.obj \ - $(OBJS)\coredll_renderer.obj \ - $(OBJS)\coredll_settings.obj \ - $(OBJS)\coredll_textmeasure.obj \ - $(OBJS)\coredll_tooltip.obj \ - $(OBJS)\coredll_toplevel.obj \ - $(OBJS)\coredll_uiaction.obj \ - $(OBJS)\coredll_utilsgui.obj \ - $(OBJS)\coredll_utilswin.obj \ - $(OBJS)\coredll_uxtheme.obj \ - $(OBJS)\coredll_window.obj \ - $(OBJS)\coredll_helpchm.obj \ - $(OBJS)\coredll_helpwin.obj \ - $(OBJS)\coredll_automtn.obj \ - $(OBJS)\coredll_uuid.obj \ - $(OBJS)\coredll_evtloop.obj \ - $(OBJS)\coredll_generic_accel.obj \ - $(OBJS)\coredll_clrpickerg.obj \ - $(OBJS)\coredll_collpaneg.obj \ - $(OBJS)\coredll_colrdlgg.obj \ - $(OBJS)\coredll_dirdlgg.obj \ - $(OBJS)\coredll_generic_fdrepdlg.obj \ - $(OBJS)\coredll_filedlgg.obj \ - $(OBJS)\coredll_filepickerg.obj \ - $(OBJS)\coredll_fontdlgg.obj \ - $(OBJS)\coredll_fontpickerg.obj \ - $(OBJS)\coredll_generic_listctrl.obj \ - $(OBJS)\coredll_mdig.obj \ - $(OBJS)\coredll_prntdlgg.obj \ - $(OBJS)\coredll_univ_bmpbuttn.obj \ - $(OBJS)\coredll_univ_button.obj \ - $(OBJS)\coredll_univ_checkbox.obj \ - $(OBJS)\coredll_univ_checklst.obj \ - $(OBJS)\coredll_univ_choice.obj \ - $(OBJS)\coredll_univ_combobox.obj \ - $(OBJS)\coredll_univ_control.obj \ - $(OBJS)\coredll_ctrlrend.obj \ - $(OBJS)\coredll_univ_dialog.obj \ - $(OBJS)\coredll_framuniv.obj \ - $(OBJS)\coredll_univ_gauge.obj \ - $(OBJS)\coredll_inpcons.obj \ - $(OBJS)\coredll_inphand.obj \ - $(OBJS)\coredll_univ_listbox.obj \ - $(OBJS)\coredll_univ_menu.obj \ - $(OBJS)\coredll_univ_notebook.obj \ - $(OBJS)\coredll_univ_radiobox.obj \ - $(OBJS)\coredll_univ_radiobut.obj \ - $(OBJS)\coredll_scrarrow.obj \ - $(OBJS)\coredll_univ_scrolbar.obj \ - $(OBJS)\coredll_scrthumb.obj \ - $(OBJS)\coredll_settingsuniv.obj \ - $(OBJS)\coredll_univ_slider.obj \ - $(OBJS)\coredll_univ_spinbutt.obj \ - $(OBJS)\coredll_univ_statbmp.obj \ - $(OBJS)\coredll_univ_statbox.obj \ - $(OBJS)\coredll_univ_statline.obj \ - $(OBJS)\coredll_univ_stattext.obj \ - $(OBJS)\coredll_univ_statusbr.obj \ - $(OBJS)\coredll_stdrend.obj \ - $(OBJS)\coredll_univ_textctrl.obj \ - $(OBJS)\coredll_univ_tglbtn.obj \ - $(OBJS)\coredll_theme.obj \ - $(OBJS)\coredll_univ_toolbar.obj \ - $(OBJS)\coredll_topluniv.obj \ - $(OBJS)\coredll_winuniv.obj \ - $(OBJS)\coredll_gtk.obj \ - $(OBJS)\coredll_metal.obj \ - $(OBJS)\coredll_mono.obj \ - $(OBJS)\coredll_win32.obj \ - $(OBJS)\coredll_accelcmn.obj \ - $(OBJS)\coredll_accesscmn.obj \ - $(OBJS)\coredll_anidecod.obj \ - $(OBJS)\coredll_affinematrix2d.obj \ - $(OBJS)\coredll_appcmn.obj \ - $(OBJS)\coredll_artprov.obj \ - $(OBJS)\coredll_artstd.obj \ - $(OBJS)\coredll_arttango.obj \ - $(OBJS)\coredll_bmpbase.obj \ - $(OBJS)\coredll_bmpbtncmn.obj \ - $(OBJS)\coredll_bookctrl.obj \ - $(OBJS)\coredll_btncmn.obj \ - $(OBJS)\coredll_cairo.obj \ - $(OBJS)\coredll_checkboxcmn.obj \ - $(OBJS)\coredll_checklstcmn.obj \ - $(OBJS)\coredll_choiccmn.obj \ - $(OBJS)\coredll_clipcmn.obj \ - $(OBJS)\coredll_clrpickercmn.obj \ - $(OBJS)\coredll_colourcmn.obj \ - $(OBJS)\coredll_colourdata.obj \ - $(OBJS)\coredll_combocmn.obj \ - $(OBJS)\coredll_cmdproc.obj \ - $(OBJS)\coredll_cmndata.obj \ - $(OBJS)\coredll_containr.obj \ - $(OBJS)\coredll_cshelp.obj \ - $(OBJS)\coredll_ctrlcmn.obj \ - $(OBJS)\coredll_ctrlsub.obj \ - $(OBJS)\coredll_dcbase.obj \ - $(OBJS)\coredll_dcbufcmn.obj \ - $(OBJS)\coredll_dcgraph.obj \ - $(OBJS)\coredll_dcsvg.obj \ - $(OBJS)\coredll_dirctrlcmn.obj \ - $(OBJS)\coredll_dlgcmn.obj \ - $(OBJS)\coredll_dndcmn.obj \ - $(OBJS)\coredll_dobjcmn.obj \ - $(OBJS)\coredll_docmdi.obj \ - $(OBJS)\coredll_docview.obj \ - $(OBJS)\coredll_dpycmn.obj \ - $(OBJS)\coredll_dseldlg.obj \ - $(OBJS)\coredll_effects.obj \ - $(OBJS)\coredll_fddlgcmn.obj \ - $(OBJS)\coredll_filectrlcmn.obj \ - $(OBJS)\coredll_filehistorycmn.obj \ - $(OBJS)\coredll_filepickercmn.obj \ - $(OBJS)\coredll_fontpickercmn.obj \ - $(OBJS)\coredll_fldlgcmn.obj \ - $(OBJS)\coredll_fontcmn.obj \ - $(OBJS)\coredll_fontdata.obj \ - $(OBJS)\coredll_graphicc.obj \ - $(OBJS)\coredll_fontenumcmn.obj \ - $(OBJS)\coredll_fontmap.obj \ - $(OBJS)\coredll_fontutilcmn.obj \ - $(OBJS)\coredll_framecmn.obj \ - $(OBJS)\coredll_gaugecmn.obj \ - $(OBJS)\coredll_gbsizer.obj \ - $(OBJS)\coredll_gdicmn.obj \ - $(OBJS)\coredll_geometry.obj \ - $(OBJS)\coredll_gifdecod.obj \ - $(OBJS)\coredll_graphcmn.obj \ - $(OBJS)\coredll_headercolcmn.obj \ - $(OBJS)\coredll_headerctrlcmn.obj \ - $(OBJS)\coredll_helpbase.obj \ - $(OBJS)\coredll_iconbndl.obj \ - $(OBJS)\coredll_imagall.obj \ - $(OBJS)\coredll_imagbmp.obj \ - $(OBJS)\coredll_image.obj \ - $(OBJS)\coredll_imagfill.obj \ - $(OBJS)\coredll_imaggif.obj \ - $(OBJS)\coredll_imagiff.obj \ - $(OBJS)\coredll_imagjpeg.obj \ - $(OBJS)\coredll_imagpcx.obj \ - $(OBJS)\coredll_imagpng.obj \ - $(OBJS)\coredll_imagpnm.obj \ - $(OBJS)\coredll_imagtga.obj \ - $(OBJS)\coredll_imagtiff.obj \ - $(OBJS)\coredll_imagxpm.obj \ - $(OBJS)\coredll_layout.obj \ - $(OBJS)\coredll_lboxcmn.obj \ - $(OBJS)\coredll_listctrlcmn.obj \ - $(OBJS)\coredll_markupparser.obj \ - $(OBJS)\coredll_matrix.obj \ - $(OBJS)\coredll_menucmn.obj \ - $(OBJS)\coredll_modalhook.obj \ - $(OBJS)\coredll_mousemanager.obj \ - $(OBJS)\coredll_nbkbase.obj \ - $(OBJS)\coredll_overlaycmn.obj \ - $(OBJS)\coredll_ownerdrwcmn.obj \ - $(OBJS)\coredll_paper.obj \ - $(OBJS)\coredll_panelcmn.obj \ - $(OBJS)\coredll_persist.obj \ - $(OBJS)\coredll_pickerbase.obj \ - $(OBJS)\coredll_popupcmn.obj \ - $(OBJS)\coredll_preferencescmn.obj \ - $(OBJS)\coredll_prntbase.obj \ - $(OBJS)\coredll_quantize.obj \ - $(OBJS)\coredll_radiobtncmn.obj \ - $(OBJS)\coredll_radiocmn.obj \ - $(OBJS)\coredll_rearrangectrl.obj \ - $(OBJS)\coredll_rendcmn.obj \ - $(OBJS)\coredll_rgncmn.obj \ - $(OBJS)\coredll_scrolbarcmn.obj \ - $(OBJS)\coredll_settcmn.obj \ - $(OBJS)\coredll_sizer.obj \ - $(OBJS)\coredll_slidercmn.obj \ - $(OBJS)\coredll_spinbtncmn.obj \ - $(OBJS)\coredll_spinctrlcmn.obj \ - $(OBJS)\coredll_srchcmn.obj \ - $(OBJS)\coredll_statbar.obj \ - $(OBJS)\coredll_statbmpcmn.obj \ - $(OBJS)\coredll_statboxcmn.obj \ - $(OBJS)\coredll_statlinecmn.obj \ - $(OBJS)\coredll_stattextcmn.obj \ - $(OBJS)\coredll_stockitem.obj \ - $(OBJS)\coredll_tbarbase.obj \ - $(OBJS)\coredll_textcmn.obj \ - $(OBJS)\coredll_textentrycmn.obj \ - $(OBJS)\coredll_textmeasurecmn.obj \ - $(OBJS)\coredll_toplvcmn.obj \ - $(OBJS)\coredll_treebase.obj \ - $(OBJS)\coredll_uiactioncmn.obj \ - $(OBJS)\coredll_valgen.obj \ - $(OBJS)\coredll_validate.obj \ - $(OBJS)\coredll_valtext.obj \ - $(OBJS)\coredll_valnum.obj \ - $(OBJS)\coredll_wincmn.obj \ - $(OBJS)\coredll_windowid.obj \ - $(OBJS)\coredll_wrapsizer.obj \ - $(OBJS)\coredll_xpmdecod.obj \ - $(OBJS)\coredll_busyinfo.obj \ - $(OBJS)\coredll_buttonbar.obj \ - $(OBJS)\coredll_choicdgg.obj \ - $(OBJS)\coredll_choicbkg.obj \ - $(OBJS)\coredll_combog.obj \ - $(OBJS)\coredll_dcpsg.obj \ - $(OBJS)\coredll_dirctrlg.obj \ - $(OBJS)\coredll_dragimgg.obj \ - $(OBJS)\coredll_filectrlg.obj \ - $(OBJS)\coredll_headerctrlg.obj \ - $(OBJS)\coredll_infobar.obj \ - $(OBJS)\coredll_listbkg.obj \ - $(OBJS)\coredll_logg.obj \ - $(OBJS)\coredll_markuptext.obj \ - $(OBJS)\coredll_msgdlgg.obj \ - $(OBJS)\coredll_numdlgg.obj \ - $(OBJS)\coredll_progdlgg.obj \ - $(OBJS)\coredll_preferencesg.obj \ - $(OBJS)\coredll_printps.obj \ - $(OBJS)\coredll_renderg.obj \ - $(OBJS)\coredll_richmsgdlgg.obj \ - $(OBJS)\coredll_scrlwing.obj \ - $(OBJS)\coredll_selstore.obj \ - $(OBJS)\coredll_spinctlg.obj \ - $(OBJS)\coredll_splitter.obj \ - $(OBJS)\coredll_srchctlg.obj \ - $(OBJS)\coredll_statbmpg.obj \ - $(OBJS)\coredll_stattextg.obj \ - $(OBJS)\coredll_textdlgg.obj \ - $(OBJS)\coredll_tipwin.obj \ - $(OBJS)\coredll_toolbkg.obj \ - $(OBJS)\coredll_treectlg.obj \ - $(OBJS)\coredll_treebkg.obj \ - $(OBJS)\coredll_vlbox.obj \ - $(OBJS)\coredll_vscroll.obj \ - $(OBJS)\coredll_xmlreshandler.obj -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" -__corelib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_224 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_224 = $(__THREADSFLAG) -!endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "0" -____CORE_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\corelib_activex.obj \ - $(OBJS)\corelib_app.obj \ - $(OBJS)\corelib_bitmap.obj \ - $(OBJS)\corelib_brush.obj \ - $(OBJS)\corelib_caret.obj \ - $(OBJS)\corelib_clipbrd.obj \ - $(OBJS)\corelib_colour.obj \ - $(OBJS)\corelib_cursor.obj \ - $(OBJS)\corelib_data.obj \ - $(OBJS)\corelib_dc.obj \ - $(OBJS)\corelib_dcclient.obj \ - $(OBJS)\corelib_dcmemory.obj \ - $(OBJS)\corelib_dcprint.obj \ - $(OBJS)\corelib_dcscreen.obj \ - $(OBJS)\corelib_dialup.obj \ - $(OBJS)\corelib_dib.obj \ - $(OBJS)\corelib_display.obj \ - $(OBJS)\corelib_enhmeta.obj \ - $(OBJS)\corelib_font.obj \ - $(OBJS)\corelib_fontenum.obj \ - $(OBJS)\corelib_fontutil.obj \ - $(OBJS)\corelib_gdiimage.obj \ - $(OBJS)\corelib_gdiobj.obj \ - $(OBJS)\corelib_gdiplus.obj \ - $(OBJS)\corelib_graphics.obj \ - $(OBJS)\corelib_icon.obj \ - $(OBJS)\corelib_imaglist.obj \ - $(OBJS)\corelib_minifram.obj \ - $(OBJS)\corelib_nonownedwnd.obj \ - $(OBJS)\corelib_dataobj.obj \ - $(OBJS)\corelib_dropsrc.obj \ - $(OBJS)\corelib_droptgt.obj \ - $(OBJS)\corelib_oleutils.obj \ - $(OBJS)\corelib_safearray.obj \ - $(OBJS)\corelib_palette.obj \ - $(OBJS)\corelib_pen.obj \ - $(OBJS)\corelib_popupwin.obj \ - $(OBJS)\corelib_printdlg.obj \ - $(OBJS)\corelib_printwin.obj \ - $(OBJS)\corelib_region.obj \ - $(OBJS)\corelib_renderer.obj \ - $(OBJS)\corelib_settings.obj \ - $(OBJS)\corelib_textmeasure.obj \ - $(OBJS)\corelib_tooltip.obj \ - $(OBJS)\corelib_toplevel.obj \ - $(OBJS)\corelib_uiaction.obj \ - $(OBJS)\corelib_utilsgui.obj \ - $(OBJS)\corelib_utilswin.obj \ - $(OBJS)\corelib_uxtheme.obj \ - $(OBJS)\corelib_window.obj \ - $(OBJS)\corelib_helpchm.obj \ - $(OBJS)\corelib_helpwin.obj \ - $(OBJS)\corelib_automtn.obj \ - $(OBJS)\corelib_uuid.obj \ - $(OBJS)\corelib_clrpickerg.obj \ - $(OBJS)\corelib_collpaneg.obj \ - $(OBJS)\corelib_filepickerg.obj \ - $(OBJS)\corelib_fontpickerg.obj \ - $(OBJS)\corelib_generic_statusbr.obj \ - $(OBJS)\corelib_prntdlgg.obj \ - $(OBJS)\corelib_msw_accel.obj \ - $(OBJS)\corelib_anybutton.obj \ - $(OBJS)\corelib_artmsw.obj \ - $(OBJS)\corelib_msw_bmpbuttn.obj \ - $(OBJS)\corelib_msw_button.obj \ - $(OBJS)\corelib_msw_checkbox.obj \ - $(OBJS)\corelib_msw_choice.obj \ - $(OBJS)\corelib_colordlg.obj \ - $(OBJS)\corelib_combo.obj \ - $(OBJS)\corelib_msw_combobox.obj \ - $(OBJS)\corelib_msw_control.obj \ - $(OBJS)\corelib_msw_dialog.obj \ - $(OBJS)\corelib_dirdlg.obj \ - $(OBJS)\corelib_dragimag.obj \ - $(OBJS)\corelib_evtloop.obj \ - $(OBJS)\corelib_filedlg.obj \ - $(OBJS)\corelib_frame.obj \ - $(OBJS)\corelib_msw_gauge.obj \ - $(OBJS)\corelib_headerctrl.obj \ - $(OBJS)\corelib_iniconf.obj \ - $(OBJS)\corelib_msw_listbox.obj \ - $(OBJS)\corelib_msw_listctrl.obj \ - $(OBJS)\corelib_mdi.obj \ - $(OBJS)\corelib_msw_menu.obj \ - $(OBJS)\corelib_menuitem.obj \ - $(OBJS)\corelib_metafile.obj \ - $(OBJS)\corelib_msgdlg.obj \ - $(OBJS)\corelib_nativdlg.obj \ - $(OBJS)\corelib_nativewin.obj \ - $(OBJS)\corelib_msw_notebook.obj \ - $(OBJS)\corelib_access.obj \ - $(OBJS)\corelib_ownerdrw.obj \ - $(OBJS)\corelib_panel.obj \ - $(OBJS)\corelib_progdlg.obj \ - $(OBJS)\corelib_msw_radiobox.obj \ - $(OBJS)\corelib_msw_radiobut.obj \ - $(OBJS)\corelib_richmsgdlg.obj \ - $(OBJS)\corelib_msw_scrolbar.obj \ - $(OBJS)\corelib_msw_slider.obj \ - $(OBJS)\corelib_msw_spinbutt.obj \ - $(OBJS)\corelib_spinctrl.obj \ - $(OBJS)\corelib_msw_statbmp.obj \ - $(OBJS)\corelib_msw_statbox.obj \ - $(OBJS)\corelib_statusbar.obj \ - $(OBJS)\corelib_msw_statline.obj \ - $(OBJS)\corelib_msw_stattext.obj \ - $(OBJS)\corelib_msw_toolbar.obj \ - $(OBJS)\corelib_msw_textctrl.obj \ - $(OBJS)\corelib_textentry.obj \ - $(OBJS)\corelib_msw_tglbtn.obj \ - $(OBJS)\corelib_treectrl.obj \ - $(OBJS)\corelib_msw_checklst.obj \ - $(OBJS)\corelib_msw_fdrepdlg.obj \ - $(OBJS)\corelib_fontdlg.obj \ - $(OBJS)\corelib_accelcmn.obj \ - $(OBJS)\corelib_accesscmn.obj \ - $(OBJS)\corelib_anidecod.obj \ - $(OBJS)\corelib_affinematrix2d.obj \ - $(OBJS)\corelib_appcmn.obj \ - $(OBJS)\corelib_artprov.obj \ - $(OBJS)\corelib_artstd.obj \ - $(OBJS)\corelib_arttango.obj \ - $(OBJS)\corelib_bmpbase.obj \ - $(OBJS)\corelib_bmpbtncmn.obj \ - $(OBJS)\corelib_bookctrl.obj \ - $(OBJS)\corelib_btncmn.obj \ - $(OBJS)\corelib_cairo.obj \ - $(OBJS)\corelib_checkboxcmn.obj \ - $(OBJS)\corelib_checklstcmn.obj \ - $(OBJS)\corelib_choiccmn.obj \ - $(OBJS)\corelib_clipcmn.obj \ - $(OBJS)\corelib_clrpickercmn.obj \ - $(OBJS)\corelib_colourcmn.obj \ - $(OBJS)\corelib_colourdata.obj \ - $(OBJS)\corelib_combocmn.obj \ - $(OBJS)\corelib_cmdproc.obj \ - $(OBJS)\corelib_cmndata.obj \ - $(OBJS)\corelib_containr.obj \ - $(OBJS)\corelib_cshelp.obj \ - $(OBJS)\corelib_ctrlcmn.obj \ - $(OBJS)\corelib_ctrlsub.obj \ - $(OBJS)\corelib_dcbase.obj \ - $(OBJS)\corelib_dcbufcmn.obj \ - $(OBJS)\corelib_dcgraph.obj \ - $(OBJS)\corelib_dcsvg.obj \ - $(OBJS)\corelib_dirctrlcmn.obj \ - $(OBJS)\corelib_dlgcmn.obj \ - $(OBJS)\corelib_dndcmn.obj \ - $(OBJS)\corelib_dobjcmn.obj \ - $(OBJS)\corelib_docmdi.obj \ - $(OBJS)\corelib_docview.obj \ - $(OBJS)\corelib_dpycmn.obj \ - $(OBJS)\corelib_dseldlg.obj \ - $(OBJS)\corelib_effects.obj \ - $(OBJS)\corelib_fddlgcmn.obj \ - $(OBJS)\corelib_filectrlcmn.obj \ - $(OBJS)\corelib_filehistorycmn.obj \ - $(OBJS)\corelib_filepickercmn.obj \ - $(OBJS)\corelib_fontpickercmn.obj \ - $(OBJS)\corelib_fldlgcmn.obj \ - $(OBJS)\corelib_fontcmn.obj \ - $(OBJS)\corelib_fontdata.obj \ - $(OBJS)\corelib_graphicc.obj \ - $(OBJS)\corelib_fontenumcmn.obj \ - $(OBJS)\corelib_fontmap.obj \ - $(OBJS)\corelib_fontutilcmn.obj \ - $(OBJS)\corelib_framecmn.obj \ - $(OBJS)\corelib_gaugecmn.obj \ - $(OBJS)\corelib_gbsizer.obj \ - $(OBJS)\corelib_gdicmn.obj \ - $(OBJS)\corelib_geometry.obj \ - $(OBJS)\corelib_gifdecod.obj \ - $(OBJS)\corelib_graphcmn.obj \ - $(OBJS)\corelib_headercolcmn.obj \ - $(OBJS)\corelib_headerctrlcmn.obj \ - $(OBJS)\corelib_helpbase.obj \ - $(OBJS)\corelib_iconbndl.obj \ - $(OBJS)\corelib_imagall.obj \ - $(OBJS)\corelib_imagbmp.obj \ - $(OBJS)\corelib_image.obj \ - $(OBJS)\corelib_imagfill.obj \ - $(OBJS)\corelib_imaggif.obj \ - $(OBJS)\corelib_imagiff.obj \ - $(OBJS)\corelib_imagjpeg.obj \ - $(OBJS)\corelib_imagpcx.obj \ - $(OBJS)\corelib_imagpng.obj \ - $(OBJS)\corelib_imagpnm.obj \ - $(OBJS)\corelib_imagtga.obj \ - $(OBJS)\corelib_imagtiff.obj \ - $(OBJS)\corelib_imagxpm.obj \ - $(OBJS)\corelib_layout.obj \ - $(OBJS)\corelib_lboxcmn.obj \ - $(OBJS)\corelib_listctrlcmn.obj \ - $(OBJS)\corelib_markupparser.obj \ - $(OBJS)\corelib_matrix.obj \ - $(OBJS)\corelib_menucmn.obj \ - $(OBJS)\corelib_modalhook.obj \ - $(OBJS)\corelib_mousemanager.obj \ - $(OBJS)\corelib_nbkbase.obj \ - $(OBJS)\corelib_overlaycmn.obj \ - $(OBJS)\corelib_ownerdrwcmn.obj \ - $(OBJS)\corelib_paper.obj \ - $(OBJS)\corelib_panelcmn.obj \ - $(OBJS)\corelib_persist.obj \ - $(OBJS)\corelib_pickerbase.obj \ - $(OBJS)\corelib_popupcmn.obj \ - $(OBJS)\corelib_preferencescmn.obj \ - $(OBJS)\corelib_prntbase.obj \ - $(OBJS)\corelib_quantize.obj \ - $(OBJS)\corelib_radiobtncmn.obj \ - $(OBJS)\corelib_radiocmn.obj \ - $(OBJS)\corelib_rearrangectrl.obj \ - $(OBJS)\corelib_rendcmn.obj \ - $(OBJS)\corelib_rgncmn.obj \ - $(OBJS)\corelib_scrolbarcmn.obj \ - $(OBJS)\corelib_settcmn.obj \ - $(OBJS)\corelib_sizer.obj \ - $(OBJS)\corelib_slidercmn.obj \ - $(OBJS)\corelib_spinbtncmn.obj \ - $(OBJS)\corelib_spinctrlcmn.obj \ - $(OBJS)\corelib_srchcmn.obj \ - $(OBJS)\corelib_statbar.obj \ - $(OBJS)\corelib_statbmpcmn.obj \ - $(OBJS)\corelib_statboxcmn.obj \ - $(OBJS)\corelib_statlinecmn.obj \ - $(OBJS)\corelib_stattextcmn.obj \ - $(OBJS)\corelib_stockitem.obj \ - $(OBJS)\corelib_tbarbase.obj \ - $(OBJS)\corelib_textcmn.obj \ - $(OBJS)\corelib_textentrycmn.obj \ - $(OBJS)\corelib_textmeasurecmn.obj \ - $(OBJS)\corelib_toplvcmn.obj \ - $(OBJS)\corelib_treebase.obj \ - $(OBJS)\corelib_uiactioncmn.obj \ - $(OBJS)\corelib_valgen.obj \ - $(OBJS)\corelib_validate.obj \ - $(OBJS)\corelib_valtext.obj \ - $(OBJS)\corelib_valnum.obj \ - $(OBJS)\corelib_wincmn.obj \ - $(OBJS)\corelib_windowid.obj \ - $(OBJS)\corelib_wrapsizer.obj \ - $(OBJS)\corelib_xpmdecod.obj \ - $(OBJS)\corelib_busyinfo.obj \ - $(OBJS)\corelib_buttonbar.obj \ - $(OBJS)\corelib_choicdgg.obj \ - $(OBJS)\corelib_choicbkg.obj \ - $(OBJS)\corelib_combog.obj \ - $(OBJS)\corelib_dcpsg.obj \ - $(OBJS)\corelib_dirctrlg.obj \ - $(OBJS)\corelib_dragimgg.obj \ - $(OBJS)\corelib_filectrlg.obj \ - $(OBJS)\corelib_headerctrlg.obj \ - $(OBJS)\corelib_infobar.obj \ - $(OBJS)\corelib_listbkg.obj \ - $(OBJS)\corelib_logg.obj \ - $(OBJS)\corelib_markuptext.obj \ - $(OBJS)\corelib_msgdlgg.obj \ - $(OBJS)\corelib_numdlgg.obj \ - $(OBJS)\corelib_progdlgg.obj \ - $(OBJS)\corelib_preferencesg.obj \ - $(OBJS)\corelib_printps.obj \ - $(OBJS)\corelib_renderg.obj \ - $(OBJS)\corelib_richmsgdlgg.obj \ - $(OBJS)\corelib_scrlwing.obj \ - $(OBJS)\corelib_selstore.obj \ - $(OBJS)\corelib_spinctlg.obj \ - $(OBJS)\corelib_splitter.obj \ - $(OBJS)\corelib_srchctlg.obj \ - $(OBJS)\corelib_statbmpg.obj \ - $(OBJS)\corelib_stattextg.obj \ - $(OBJS)\corelib_textdlgg.obj \ - $(OBJS)\corelib_tipwin.obj \ - $(OBJS)\corelib_toolbkg.obj \ - $(OBJS)\corelib_treectlg.obj \ - $(OBJS)\corelib_treebkg.obj \ - $(OBJS)\corelib_vlbox.obj \ - $(OBJS)\corelib_vscroll.obj \ - $(OBJS)\corelib_xmlreshandler.obj -!endif -!if "$(USE_GUI)" == "1" && "$(WXUNIV)" == "1" -____CORE_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\corelib_activex.obj \ - $(OBJS)\corelib_app.obj \ - $(OBJS)\corelib_bitmap.obj \ - $(OBJS)\corelib_brush.obj \ - $(OBJS)\corelib_caret.obj \ - $(OBJS)\corelib_clipbrd.obj \ - $(OBJS)\corelib_colour.obj \ - $(OBJS)\corelib_cursor.obj \ - $(OBJS)\corelib_data.obj \ - $(OBJS)\corelib_dc.obj \ - $(OBJS)\corelib_dcclient.obj \ - $(OBJS)\corelib_dcmemory.obj \ - $(OBJS)\corelib_dcprint.obj \ - $(OBJS)\corelib_dcscreen.obj \ - $(OBJS)\corelib_dialup.obj \ - $(OBJS)\corelib_dib.obj \ - $(OBJS)\corelib_display.obj \ - $(OBJS)\corelib_enhmeta.obj \ - $(OBJS)\corelib_font.obj \ - $(OBJS)\corelib_fontenum.obj \ - $(OBJS)\corelib_fontutil.obj \ - $(OBJS)\corelib_gdiimage.obj \ - $(OBJS)\corelib_gdiobj.obj \ - $(OBJS)\corelib_gdiplus.obj \ - $(OBJS)\corelib_graphics.obj \ - $(OBJS)\corelib_icon.obj \ - $(OBJS)\corelib_imaglist.obj \ - $(OBJS)\corelib_minifram.obj \ - $(OBJS)\corelib_nonownedwnd.obj \ - $(OBJS)\corelib_dataobj.obj \ - $(OBJS)\corelib_dropsrc.obj \ - $(OBJS)\corelib_droptgt.obj \ - $(OBJS)\corelib_oleutils.obj \ - $(OBJS)\corelib_safearray.obj \ - $(OBJS)\corelib_palette.obj \ - $(OBJS)\corelib_pen.obj \ - $(OBJS)\corelib_popupwin.obj \ - $(OBJS)\corelib_printdlg.obj \ - $(OBJS)\corelib_printwin.obj \ - $(OBJS)\corelib_region.obj \ - $(OBJS)\corelib_renderer.obj \ - $(OBJS)\corelib_settings.obj \ - $(OBJS)\corelib_textmeasure.obj \ - $(OBJS)\corelib_tooltip.obj \ - $(OBJS)\corelib_toplevel.obj \ - $(OBJS)\corelib_uiaction.obj \ - $(OBJS)\corelib_utilsgui.obj \ - $(OBJS)\corelib_utilswin.obj \ - $(OBJS)\corelib_uxtheme.obj \ - $(OBJS)\corelib_window.obj \ - $(OBJS)\corelib_helpchm.obj \ - $(OBJS)\corelib_helpwin.obj \ - $(OBJS)\corelib_automtn.obj \ - $(OBJS)\corelib_uuid.obj \ - $(OBJS)\corelib_evtloop.obj \ - $(OBJS)\corelib_generic_accel.obj \ - $(OBJS)\corelib_clrpickerg.obj \ - $(OBJS)\corelib_collpaneg.obj \ - $(OBJS)\corelib_colrdlgg.obj \ - $(OBJS)\corelib_dirdlgg.obj \ - $(OBJS)\corelib_generic_fdrepdlg.obj \ - $(OBJS)\corelib_filedlgg.obj \ - $(OBJS)\corelib_filepickerg.obj \ - $(OBJS)\corelib_fontdlgg.obj \ - $(OBJS)\corelib_fontpickerg.obj \ - $(OBJS)\corelib_generic_listctrl.obj \ - $(OBJS)\corelib_mdig.obj \ - $(OBJS)\corelib_prntdlgg.obj \ - $(OBJS)\corelib_univ_bmpbuttn.obj \ - $(OBJS)\corelib_univ_button.obj \ - $(OBJS)\corelib_univ_checkbox.obj \ - $(OBJS)\corelib_univ_checklst.obj \ - $(OBJS)\corelib_univ_choice.obj \ - $(OBJS)\corelib_univ_combobox.obj \ - $(OBJS)\corelib_univ_control.obj \ - $(OBJS)\corelib_ctrlrend.obj \ - $(OBJS)\corelib_univ_dialog.obj \ - $(OBJS)\corelib_framuniv.obj \ - $(OBJS)\corelib_univ_gauge.obj \ - $(OBJS)\corelib_inpcons.obj \ - $(OBJS)\corelib_inphand.obj \ - $(OBJS)\corelib_univ_listbox.obj \ - $(OBJS)\corelib_univ_menu.obj \ - $(OBJS)\corelib_univ_notebook.obj \ - $(OBJS)\corelib_univ_radiobox.obj \ - $(OBJS)\corelib_univ_radiobut.obj \ - $(OBJS)\corelib_scrarrow.obj \ - $(OBJS)\corelib_univ_scrolbar.obj \ - $(OBJS)\corelib_scrthumb.obj \ - $(OBJS)\corelib_settingsuniv.obj \ - $(OBJS)\corelib_univ_slider.obj \ - $(OBJS)\corelib_univ_spinbutt.obj \ - $(OBJS)\corelib_univ_statbmp.obj \ - $(OBJS)\corelib_univ_statbox.obj \ - $(OBJS)\corelib_univ_statline.obj \ - $(OBJS)\corelib_univ_stattext.obj \ - $(OBJS)\corelib_univ_statusbr.obj \ - $(OBJS)\corelib_stdrend.obj \ - $(OBJS)\corelib_univ_textctrl.obj \ - $(OBJS)\corelib_univ_tglbtn.obj \ - $(OBJS)\corelib_theme.obj \ - $(OBJS)\corelib_univ_toolbar.obj \ - $(OBJS)\corelib_topluniv.obj \ - $(OBJS)\corelib_winuniv.obj \ - $(OBJS)\corelib_gtk.obj \ - $(OBJS)\corelib_metal.obj \ - $(OBJS)\corelib_mono.obj \ - $(OBJS)\corelib_win32.obj \ - $(OBJS)\corelib_accelcmn.obj \ - $(OBJS)\corelib_accesscmn.obj \ - $(OBJS)\corelib_anidecod.obj \ - $(OBJS)\corelib_affinematrix2d.obj \ - $(OBJS)\corelib_appcmn.obj \ - $(OBJS)\corelib_artprov.obj \ - $(OBJS)\corelib_artstd.obj \ - $(OBJS)\corelib_arttango.obj \ - $(OBJS)\corelib_bmpbase.obj \ - $(OBJS)\corelib_bmpbtncmn.obj \ - $(OBJS)\corelib_bookctrl.obj \ - $(OBJS)\corelib_btncmn.obj \ - $(OBJS)\corelib_cairo.obj \ - $(OBJS)\corelib_checkboxcmn.obj \ - $(OBJS)\corelib_checklstcmn.obj \ - $(OBJS)\corelib_choiccmn.obj \ - $(OBJS)\corelib_clipcmn.obj \ - $(OBJS)\corelib_clrpickercmn.obj \ - $(OBJS)\corelib_colourcmn.obj \ - $(OBJS)\corelib_colourdata.obj \ - $(OBJS)\corelib_combocmn.obj \ - $(OBJS)\corelib_cmdproc.obj \ - $(OBJS)\corelib_cmndata.obj \ - $(OBJS)\corelib_containr.obj \ - $(OBJS)\corelib_cshelp.obj \ - $(OBJS)\corelib_ctrlcmn.obj \ - $(OBJS)\corelib_ctrlsub.obj \ - $(OBJS)\corelib_dcbase.obj \ - $(OBJS)\corelib_dcbufcmn.obj \ - $(OBJS)\corelib_dcgraph.obj \ - $(OBJS)\corelib_dcsvg.obj \ - $(OBJS)\corelib_dirctrlcmn.obj \ - $(OBJS)\corelib_dlgcmn.obj \ - $(OBJS)\corelib_dndcmn.obj \ - $(OBJS)\corelib_dobjcmn.obj \ - $(OBJS)\corelib_docmdi.obj \ - $(OBJS)\corelib_docview.obj \ - $(OBJS)\corelib_dpycmn.obj \ - $(OBJS)\corelib_dseldlg.obj \ - $(OBJS)\corelib_effects.obj \ - $(OBJS)\corelib_fddlgcmn.obj \ - $(OBJS)\corelib_filectrlcmn.obj \ - $(OBJS)\corelib_filehistorycmn.obj \ - $(OBJS)\corelib_filepickercmn.obj \ - $(OBJS)\corelib_fontpickercmn.obj \ - $(OBJS)\corelib_fldlgcmn.obj \ - $(OBJS)\corelib_fontcmn.obj \ - $(OBJS)\corelib_fontdata.obj \ - $(OBJS)\corelib_graphicc.obj \ - $(OBJS)\corelib_fontenumcmn.obj \ - $(OBJS)\corelib_fontmap.obj \ - $(OBJS)\corelib_fontutilcmn.obj \ - $(OBJS)\corelib_framecmn.obj \ - $(OBJS)\corelib_gaugecmn.obj \ - $(OBJS)\corelib_gbsizer.obj \ - $(OBJS)\corelib_gdicmn.obj \ - $(OBJS)\corelib_geometry.obj \ - $(OBJS)\corelib_gifdecod.obj \ - $(OBJS)\corelib_graphcmn.obj \ - $(OBJS)\corelib_headercolcmn.obj \ - $(OBJS)\corelib_headerctrlcmn.obj \ - $(OBJS)\corelib_helpbase.obj \ - $(OBJS)\corelib_iconbndl.obj \ - $(OBJS)\corelib_imagall.obj \ - $(OBJS)\corelib_imagbmp.obj \ - $(OBJS)\corelib_image.obj \ - $(OBJS)\corelib_imagfill.obj \ - $(OBJS)\corelib_imaggif.obj \ - $(OBJS)\corelib_imagiff.obj \ - $(OBJS)\corelib_imagjpeg.obj \ - $(OBJS)\corelib_imagpcx.obj \ - $(OBJS)\corelib_imagpng.obj \ - $(OBJS)\corelib_imagpnm.obj \ - $(OBJS)\corelib_imagtga.obj \ - $(OBJS)\corelib_imagtiff.obj \ - $(OBJS)\corelib_imagxpm.obj \ - $(OBJS)\corelib_layout.obj \ - $(OBJS)\corelib_lboxcmn.obj \ - $(OBJS)\corelib_listctrlcmn.obj \ - $(OBJS)\corelib_markupparser.obj \ - $(OBJS)\corelib_matrix.obj \ - $(OBJS)\corelib_menucmn.obj \ - $(OBJS)\corelib_modalhook.obj \ - $(OBJS)\corelib_mousemanager.obj \ - $(OBJS)\corelib_nbkbase.obj \ - $(OBJS)\corelib_overlaycmn.obj \ - $(OBJS)\corelib_ownerdrwcmn.obj \ - $(OBJS)\corelib_paper.obj \ - $(OBJS)\corelib_panelcmn.obj \ - $(OBJS)\corelib_persist.obj \ - $(OBJS)\corelib_pickerbase.obj \ - $(OBJS)\corelib_popupcmn.obj \ - $(OBJS)\corelib_preferencescmn.obj \ - $(OBJS)\corelib_prntbase.obj \ - $(OBJS)\corelib_quantize.obj \ - $(OBJS)\corelib_radiobtncmn.obj \ - $(OBJS)\corelib_radiocmn.obj \ - $(OBJS)\corelib_rearrangectrl.obj \ - $(OBJS)\corelib_rendcmn.obj \ - $(OBJS)\corelib_rgncmn.obj \ - $(OBJS)\corelib_scrolbarcmn.obj \ - $(OBJS)\corelib_settcmn.obj \ - $(OBJS)\corelib_sizer.obj \ - $(OBJS)\corelib_slidercmn.obj \ - $(OBJS)\corelib_spinbtncmn.obj \ - $(OBJS)\corelib_spinctrlcmn.obj \ - $(OBJS)\corelib_srchcmn.obj \ - $(OBJS)\corelib_statbar.obj \ - $(OBJS)\corelib_statbmpcmn.obj \ - $(OBJS)\corelib_statboxcmn.obj \ - $(OBJS)\corelib_statlinecmn.obj \ - $(OBJS)\corelib_stattextcmn.obj \ - $(OBJS)\corelib_stockitem.obj \ - $(OBJS)\corelib_tbarbase.obj \ - $(OBJS)\corelib_textcmn.obj \ - $(OBJS)\corelib_textentrycmn.obj \ - $(OBJS)\corelib_textmeasurecmn.obj \ - $(OBJS)\corelib_toplvcmn.obj \ - $(OBJS)\corelib_treebase.obj \ - $(OBJS)\corelib_uiactioncmn.obj \ - $(OBJS)\corelib_valgen.obj \ - $(OBJS)\corelib_validate.obj \ - $(OBJS)\corelib_valtext.obj \ - $(OBJS)\corelib_valnum.obj \ - $(OBJS)\corelib_wincmn.obj \ - $(OBJS)\corelib_windowid.obj \ - $(OBJS)\corelib_wrapsizer.obj \ - $(OBJS)\corelib_xpmdecod.obj \ - $(OBJS)\corelib_busyinfo.obj \ - $(OBJS)\corelib_buttonbar.obj \ - $(OBJS)\corelib_choicdgg.obj \ - $(OBJS)\corelib_choicbkg.obj \ - $(OBJS)\corelib_combog.obj \ - $(OBJS)\corelib_dcpsg.obj \ - $(OBJS)\corelib_dirctrlg.obj \ - $(OBJS)\corelib_dragimgg.obj \ - $(OBJS)\corelib_filectrlg.obj \ - $(OBJS)\corelib_headerctrlg.obj \ - $(OBJS)\corelib_infobar.obj \ - $(OBJS)\corelib_listbkg.obj \ - $(OBJS)\corelib_logg.obj \ - $(OBJS)\corelib_markuptext.obj \ - $(OBJS)\corelib_msgdlgg.obj \ - $(OBJS)\corelib_numdlgg.obj \ - $(OBJS)\corelib_progdlgg.obj \ - $(OBJS)\corelib_preferencesg.obj \ - $(OBJS)\corelib_printps.obj \ - $(OBJS)\corelib_renderg.obj \ - $(OBJS)\corelib_richmsgdlgg.obj \ - $(OBJS)\corelib_scrlwing.obj \ - $(OBJS)\corelib_selstore.obj \ - $(OBJS)\corelib_spinctlg.obj \ - $(OBJS)\corelib_splitter.obj \ - $(OBJS)\corelib_srchctlg.obj \ - $(OBJS)\corelib_statbmpg.obj \ - $(OBJS)\corelib_stattextg.obj \ - $(OBJS)\corelib_textdlgg.obj \ - $(OBJS)\corelib_tipwin.obj \ - $(OBJS)\corelib_toolbkg.obj \ - $(OBJS)\corelib_treectlg.obj \ - $(OBJS)\corelib_treebkg.obj \ - $(OBJS)\corelib_vlbox.obj \ - $(OBJS)\corelib_vscroll.obj \ - $(OBJS)\corelib_xmlreshandler.obj -!endif -!if "$(SHARED)" == "1" -____wxcore_namedll_DEP = $(__coredll___depname) -!endif -!if "$(SHARED)" == "0" -____wxcore_namelib_DEP = $(__corelib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" -__advdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_232 = $(__DEBUGRUNTIME_11) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_232 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_232 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_232 = $(__DEBUGRUNTIME_11) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_240 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_240 = $(__THREADSFLAG) -!endif -!if "$(WXUNIV)" == "0" -____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\advdll_animatecmn.obj \ - $(OBJS)\advdll_bmpcboxcmn.obj \ - $(OBJS)\advdll_calctrlcmn.obj \ - $(OBJS)\advdll_datavcmn.obj \ - $(OBJS)\advdll_gridcmn.obj \ - $(OBJS)\advdll_hyperlnkcmn.obj \ - $(OBJS)\advdll_odcombocmn.obj \ - $(OBJS)\advdll_richtooltipcmn.obj \ - $(OBJS)\advdll_aboutdlgg.obj \ - $(OBJS)\advdll_bannerwindow.obj \ - $(OBJS)\advdll_bmpcboxg.obj \ - $(OBJS)\advdll_calctrlg.obj \ - $(OBJS)\advdll_commandlinkbuttong.obj \ - $(OBJS)\advdll_datavgen.obj \ - $(OBJS)\advdll_datectlg.obj \ - $(OBJS)\advdll_editlbox.obj \ - $(OBJS)\advdll_grid.obj \ - $(OBJS)\advdll_gridctrl.obj \ - $(OBJS)\advdll_grideditors.obj \ - $(OBJS)\advdll_gridsel.obj \ - $(OBJS)\advdll_helpext.obj \ - $(OBJS)\advdll_hyperlinkg.obj \ - $(OBJS)\advdll_laywin.obj \ - $(OBJS)\advdll_notifmsgg.obj \ - $(OBJS)\advdll_odcombo.obj \ - $(OBJS)\advdll_propdlg.obj \ - $(OBJS)\advdll_richtooltipg.obj \ - $(OBJS)\advdll_sashwin.obj \ - $(OBJS)\advdll_splash.obj \ - $(OBJS)\advdll_timectrlg.obj \ - $(OBJS)\advdll_tipdlg.obj \ - $(OBJS)\advdll_treelist.obj \ - $(OBJS)\advdll_wizard.obj \ - $(OBJS)\advdll_taskbarcmn.obj \ - $(OBJS)\advdll_aboutdlg.obj \ - $(OBJS)\advdll_notifmsg.obj \ - $(OBJS)\advdll_richtooltip.obj \ - $(OBJS)\advdll_sound.obj \ - $(OBJS)\advdll_taskbar.obj \ - $(OBJS)\advdll_joystick.obj \ - $(OBJS)\advdll_animateg.obj \ - $(OBJS)\advdll_bmpcbox.obj \ - $(OBJS)\advdll_calctrl.obj \ - $(OBJS)\advdll_commandlinkbutton.obj \ - $(OBJS)\advdll_datecontrols.obj \ - $(OBJS)\advdll_datectrl.obj \ - $(OBJS)\advdll_datetimectrl.obj \ - $(OBJS)\advdll_hyperlink.obj \ - $(OBJS)\advdll_timectrl.obj -!endif -!if "$(WXUNIV)" == "1" -____ADVANCED_SRC_FILENAMES_2_OBJECTS = \ - $(OBJS)\advdll_animatecmn.obj \ - $(OBJS)\advdll_bmpcboxcmn.obj \ - $(OBJS)\advdll_calctrlcmn.obj \ - $(OBJS)\advdll_datavcmn.obj \ - $(OBJS)\advdll_gridcmn.obj \ - $(OBJS)\advdll_hyperlnkcmn.obj \ - $(OBJS)\advdll_odcombocmn.obj \ - $(OBJS)\advdll_richtooltipcmn.obj \ - $(OBJS)\advdll_aboutdlgg.obj \ - $(OBJS)\advdll_bannerwindow.obj \ - $(OBJS)\advdll_bmpcboxg.obj \ - $(OBJS)\advdll_calctrlg.obj \ - $(OBJS)\advdll_commandlinkbuttong.obj \ - $(OBJS)\advdll_datavgen.obj \ - $(OBJS)\advdll_datectlg.obj \ - $(OBJS)\advdll_editlbox.obj \ - $(OBJS)\advdll_grid.obj \ - $(OBJS)\advdll_gridctrl.obj \ - $(OBJS)\advdll_grideditors.obj \ - $(OBJS)\advdll_gridsel.obj \ - $(OBJS)\advdll_helpext.obj \ - $(OBJS)\advdll_hyperlinkg.obj \ - $(OBJS)\advdll_laywin.obj \ - $(OBJS)\advdll_notifmsgg.obj \ - $(OBJS)\advdll_odcombo.obj \ - $(OBJS)\advdll_propdlg.obj \ - $(OBJS)\advdll_richtooltipg.obj \ - $(OBJS)\advdll_sashwin.obj \ - $(OBJS)\advdll_splash.obj \ - $(OBJS)\advdll_timectrlg.obj \ - $(OBJS)\advdll_tipdlg.obj \ - $(OBJS)\advdll_treelist.obj \ - $(OBJS)\advdll_wizard.obj \ - $(OBJS)\advdll_taskbarcmn.obj \ - $(OBJS)\advdll_aboutdlg.obj \ - $(OBJS)\advdll_notifmsg.obj \ - $(OBJS)\advdll_richtooltip.obj \ - $(OBJS)\advdll_sound.obj \ - $(OBJS)\advdll_taskbar.obj \ - $(OBJS)\advdll_joystick.obj \ - $(OBJS)\advdll_animateg.obj -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" -__advlib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_255 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_255 = $(__THREADSFLAG) -!endif -!if "$(WXUNIV)" == "0" -____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\advlib_animatecmn.obj \ - $(OBJS)\advlib_bmpcboxcmn.obj \ - $(OBJS)\advlib_calctrlcmn.obj \ - $(OBJS)\advlib_datavcmn.obj \ - $(OBJS)\advlib_gridcmn.obj \ - $(OBJS)\advlib_hyperlnkcmn.obj \ - $(OBJS)\advlib_odcombocmn.obj \ - $(OBJS)\advlib_richtooltipcmn.obj \ - $(OBJS)\advlib_aboutdlgg.obj \ - $(OBJS)\advlib_bannerwindow.obj \ - $(OBJS)\advlib_bmpcboxg.obj \ - $(OBJS)\advlib_calctrlg.obj \ - $(OBJS)\advlib_commandlinkbuttong.obj \ - $(OBJS)\advlib_datavgen.obj \ - $(OBJS)\advlib_datectlg.obj \ - $(OBJS)\advlib_editlbox.obj \ - $(OBJS)\advlib_grid.obj \ - $(OBJS)\advlib_gridctrl.obj \ - $(OBJS)\advlib_grideditors.obj \ - $(OBJS)\advlib_gridsel.obj \ - $(OBJS)\advlib_helpext.obj \ - $(OBJS)\advlib_hyperlinkg.obj \ - $(OBJS)\advlib_laywin.obj \ - $(OBJS)\advlib_notifmsgg.obj \ - $(OBJS)\advlib_odcombo.obj \ - $(OBJS)\advlib_propdlg.obj \ - $(OBJS)\advlib_richtooltipg.obj \ - $(OBJS)\advlib_sashwin.obj \ - $(OBJS)\advlib_splash.obj \ - $(OBJS)\advlib_timectrlg.obj \ - $(OBJS)\advlib_tipdlg.obj \ - $(OBJS)\advlib_treelist.obj \ - $(OBJS)\advlib_wizard.obj \ - $(OBJS)\advlib_taskbarcmn.obj \ - $(OBJS)\advlib_aboutdlg.obj \ - $(OBJS)\advlib_notifmsg.obj \ - $(OBJS)\advlib_richtooltip.obj \ - $(OBJS)\advlib_sound.obj \ - $(OBJS)\advlib_taskbar.obj \ - $(OBJS)\advlib_joystick.obj \ - $(OBJS)\advlib_animateg.obj \ - $(OBJS)\advlib_bmpcbox.obj \ - $(OBJS)\advlib_calctrl.obj \ - $(OBJS)\advlib_commandlinkbutton.obj \ - $(OBJS)\advlib_datecontrols.obj \ - $(OBJS)\advlib_datectrl.obj \ - $(OBJS)\advlib_datetimectrl.obj \ - $(OBJS)\advlib_hyperlink.obj \ - $(OBJS)\advlib_timectrl.obj -!endif -!if "$(WXUNIV)" == "1" -____ADVANCED_SRC_FILENAMES_3_OBJECTS = \ - $(OBJS)\advlib_animatecmn.obj \ - $(OBJS)\advlib_bmpcboxcmn.obj \ - $(OBJS)\advlib_calctrlcmn.obj \ - $(OBJS)\advlib_datavcmn.obj \ - $(OBJS)\advlib_gridcmn.obj \ - $(OBJS)\advlib_hyperlnkcmn.obj \ - $(OBJS)\advlib_odcombocmn.obj \ - $(OBJS)\advlib_richtooltipcmn.obj \ - $(OBJS)\advlib_aboutdlgg.obj \ - $(OBJS)\advlib_bannerwindow.obj \ - $(OBJS)\advlib_bmpcboxg.obj \ - $(OBJS)\advlib_calctrlg.obj \ - $(OBJS)\advlib_commandlinkbuttong.obj \ - $(OBJS)\advlib_datavgen.obj \ - $(OBJS)\advlib_datectlg.obj \ - $(OBJS)\advlib_editlbox.obj \ - $(OBJS)\advlib_grid.obj \ - $(OBJS)\advlib_gridctrl.obj \ - $(OBJS)\advlib_grideditors.obj \ - $(OBJS)\advlib_gridsel.obj \ - $(OBJS)\advlib_helpext.obj \ - $(OBJS)\advlib_hyperlinkg.obj \ - $(OBJS)\advlib_laywin.obj \ - $(OBJS)\advlib_notifmsgg.obj \ - $(OBJS)\advlib_odcombo.obj \ - $(OBJS)\advlib_propdlg.obj \ - $(OBJS)\advlib_richtooltipg.obj \ - $(OBJS)\advlib_sashwin.obj \ - $(OBJS)\advlib_splash.obj \ - $(OBJS)\advlib_timectrlg.obj \ - $(OBJS)\advlib_tipdlg.obj \ - $(OBJS)\advlib_treelist.obj \ - $(OBJS)\advlib_wizard.obj \ - $(OBJS)\advlib_taskbarcmn.obj \ - $(OBJS)\advlib_aboutdlg.obj \ - $(OBJS)\advlib_notifmsg.obj \ - $(OBJS)\advlib_richtooltip.obj \ - $(OBJS)\advlib_sound.obj \ - $(OBJS)\advlib_taskbar.obj \ - $(OBJS)\advlib_joystick.obj \ - $(OBJS)\advlib_animateg.obj -!endif -!if "$(SHARED)" == "1" -____wxadv_namedll_DEP = $(__advdll___depname) -!endif -!if "$(SHARED)" == "0" -____wxadv_namelib_DEP = $(__advlib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" -__mediadll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_263 = $(__DEBUGRUNTIME_11) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_263 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_263 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_263 = $(__DEBUGRUNTIME_11) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_271 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_271 = $(__THREADSFLAG) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" -__medialib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_286 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_286 = $(__THREADSFLAG) -!endif -!if "$(SHARED)" == "1" -____wxmedia_namedll_DEP = $(__mediadll___depname) -!endif -!if "$(SHARED)" == "0" -____wxmedia_namelib_DEP = $(__medialib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" -__htmldll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_294 = $(__DEBUGRUNTIME_11) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_294 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_294 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_294 = $(__DEBUGRUNTIME_11) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_302 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_302 = $(__THREADSFLAG) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" -__htmllib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_317 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_317 = $(__THREADSFLAG) -!endif -!if "$(SHARED)" == "1" -____wxhtml_namedll_DEP = $(__htmldll___depname) -!endif -!if "$(SHARED)" == "0" -____wxhtml_namelib_DEP = $(__htmllib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1" -__webviewdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_325 = $(__DEBUGRUNTIME_11) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_325 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_325 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_325 = $(__DEBUGRUNTIME_11) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_333 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_333 = $(__THREADSFLAG) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1" -__webviewlib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_348 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_348 = $(__THREADSFLAG) -!endif -!if "$(SHARED)" == "1" -____wxwebview_namedll_DEP = $(__webviewdll___depname) -!endif -!if "$(SHARED)" == "0" -____wxwebview_namelib_DEP = $(__webviewlib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1" -__qadll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_356 = $(__DEBUGRUNTIME_11) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_356 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_356 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_356 = $(__DEBUGRUNTIME_11) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_364 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_364 = $(__THREADSFLAG) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1" -__qalib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_379 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_379 = $(__THREADSFLAG) -!endif -!if "$(SHARED)" == "1" -____wxqa_namedll_DEP = $(__qadll___depname) -!endif -!if "$(SHARED)" == "0" -____wxqa_namelib_DEP = $(__qalib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -__xmldll___depname = \ - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_387 = $(__DEBUGRUNTIME_11) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_387 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_387 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_387 = $(__DEBUGRUNTIME_11) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_395 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_395 = $(__THREADSFLAG) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -__xmllib___depname = \ - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_410 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_410 = $(__THREADSFLAG) -!endif -!if "$(SHARED)" == "1" -____wxxml_namedll_DEP = $(__xmldll___depname) -!endif -!if "$(SHARED)" == "0" -____wxxml_namelib_DEP = $(__xmllib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1" -__xrcdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_418 = $(__DEBUGRUNTIME_11) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_418 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_418 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_418 = $(__DEBUGRUNTIME_11) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_426 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_426 = $(__THREADSFLAG) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1" -__xrclib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_441 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_441 = $(__THREADSFLAG) -!endif -!if "$(SHARED)" == "1" -____wxxrc_namedll_DEP = $(__xrcdll___depname) -!endif -!if "$(SHARED)" == "0" -____wxxrc_namelib_DEP = $(__xrclib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1" -__auidll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_449 = $(__DEBUGRUNTIME_11) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_449 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_449 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_449 = $(__DEBUGRUNTIME_11) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_457 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_457 = $(__THREADSFLAG) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1" -__auilib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_472 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_472 = $(__THREADSFLAG) -!endif -!if "$(SHARED)" == "1" -____wxaui_namedll_DEP = $(__auidll___depname) -!endif -!if "$(SHARED)" == "0" -____wxaui_namelib_DEP = $(__auilib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1" -__ribbondll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_480 = $(__DEBUGRUNTIME_11) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_480 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_480 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_480 = $(__DEBUGRUNTIME_11) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_488 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_488 = $(__THREADSFLAG) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RIBBON)" == "1" -__ribbonlib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_503 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_503 = $(__THREADSFLAG) -!endif -!if "$(SHARED)" == "1" -____wxribbon_namedll_DEP = $(__ribbondll___depname) -!endif -!if "$(SHARED)" == "0" -____wxribbon_namelib_DEP = $(__ribbonlib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1" -__propgriddll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_511 = $(__DEBUGRUNTIME_11) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_511 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_511 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_511 = $(__DEBUGRUNTIME_11) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_519 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_519 = $(__THREADSFLAG) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_PROPGRID)" == "1" -__propgridlib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_534 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_534 = $(__THREADSFLAG) -!endif -!if "$(SHARED)" == "1" -____wxpropgrid_namedll_DEP = $(__propgriddll___depname) -!endif -!if "$(SHARED)" == "0" -____wxpropgrid_namelib_DEP = $(__propgridlib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1" -__richtextdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_542 = $(__DEBUGRUNTIME_11) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_542 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_542 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_542 = $(__DEBUGRUNTIME_11) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_550 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_550 = $(__THREADSFLAG) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RICHTEXT)" == "1" -__richtextlib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_565 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_565 = $(__THREADSFLAG) -!endif -!if "$(SHARED)" == "1" -____wxrichtext_namedll_DEP = $(__richtextdll___depname) -!endif -!if "$(SHARED)" == "0" -____wxrichtext_namelib_DEP = $(__richtextlib___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1" -__stcdll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_573 = $(__DEBUGRUNTIME_11) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_573 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_573 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_573 = $(__DEBUGRUNTIME_11) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_581 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_581 = $(__THREADSFLAG) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_STC)" == "1" -__stclib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_596 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_596 = $(__THREADSFLAG) -!endif -!if "$(SHARED)" == "1" -____wxstc_namedll_DEP = $(__stcdll___depname) -!endif -!if "$(SHARED)" == "0" -____wxstc_namelib_DEP = $(__stclib___depname) -!endif -!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -__gldll___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_604 = $(__DEBUGRUNTIME_11) -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_604 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_604 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_604 = $(__DEBUGRUNTIME_11) -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_612 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_612 = $(__THREADSFLAG) -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIBGLDEP_CORE_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!if "$(MONOLITHIC)" == "0" -__WXLIBGLDEP_BASE_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(MONOLITHIC)" == "1" -__WXLIB_MONO_p = \ - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -__gllib___depname = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib -!endif -!if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_627 = D -!endif -!if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_627 = $(__THREADSFLAG) -!endif -!if "$(SHARED)" == "1" -____wxgl_namedll_DEP = $(__gldll___depname) -!endif -!if "$(SHARED)" == "0" -____wxgl_namelib_DEP = $(__gllib___depname) -!endif -!if "$(USE_STC)" == "1" -__wxscintilla = $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" -__htmldll_library_link_DEP = $(__htmldll___depname) -!endif -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" -__htmldll_library_link_LIBR = \ - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_6 = /DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_6 = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_6 = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_6 = /DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_6 = /d _DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_6 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_6 = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_6 = /d _DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_11 = -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_11 = /opt:ref /opt:icf -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_11 = /opt:ref /opt:icf -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_11 = -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p_72 = /d __NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p_72 = /d __NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p_67 = /d __WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p_66 = /d wxDEBUG_LEVEL=0 -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__NDEBUG_DEFINE_p_65 = /d NDEBUG -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__NDEBUG_DEFINE_p_65 = /d NDEBUG -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p_65 = /d wxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p_65 = /d wxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p_65 = /d wxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p_67 = /d wxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p_67 = /d _UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p_65 = /d wxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_INCLUDEDIR_FILENAMES_4 = /i $(CAIRO_ROOT)\include\cairo -!endif -!if "$(USE_GUI)" == "1" -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -!if "$(USE_GUI)" == "1" -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -!if "$(MSLU)" == "1" -__UNICOWS_LIB_p = unicows.lib -!endif -!if "$(USE_CAIRO)" == "1" -__CAIRO_LIB_p = cairo.lib -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_LIBDIR_FILENAMES = /LIBPATH:$(CAIRO_ROOT)\lib -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = /Zi -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO = -!endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO = -!endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO = /Zi -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME = /D_DEBUG -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME = /D_DEBUG -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME = d -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME = -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME = d -!endif -!if "$(BUILD)" == "debug" -__OPTIMIZEFLAG = /Od -!endif -!if "$(BUILD)" == "release" -__OPTIMIZEFLAG = /O2 -!endif -!if "$(USE_THREADS)" == "0" -__THREADSFLAG = L -!endif -!if "$(USE_THREADS)" == "1" -__THREADSFLAG = T -!endif -!if "$(USE_RTTI)" == "0" -__RTTIFLAG = -!endif -!if "$(USE_RTTI)" == "1" -__RTTIFLAG = /GR -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG = -!endif -!if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG = /EHsc -!endif -!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" -__NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ -!endif -!if "$(WXUNIV)" == "1" -__WXUNIV_DEFINE_p = /D__WXUNIVERSAL__ -!endif -!if "$(DEBUG_FLAG)" == "0" -__DEBUG_DEFINE_p = /DwxDEBUG_LEVEL=0 -!endif -!if "$(BUILD)" == "release" && "$(DEBUG_RUNTIME_LIBS)" == "default" -__NDEBUG_DEFINE_p = /DNDEBUG -!endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__NDEBUG_DEFINE_p = /DNDEBUG -!endif -!if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONS_DEFINE_p = /DwxNO_EXCEPTIONS -!endif -!if "$(USE_RTTI)" == "0" -__RTTI_DEFINE_p = /DwxNO_RTTI -!endif -!if "$(USE_THREADS)" == "0" -__THREAD_DEFINE_p = /DwxNO_THREADS -!endif -!if "$(UNICODE)" == "0" -__UNICODE_DEFINE_p = /DwxUSE_UNICODE=0 -!endif -!if "$(UNICODE)" == "1" -__UNICODE_DEFINE_p = /D_UNICODE -!endif -!if "$(MSLU)" == "1" -__MSLU_DEFINE_p = /DwxUSE_UNICODE_MSLU=1 -!endif -!if "$(USE_CAIRO)" == "1" -____CAIRO_INCLUDEDIR_FILENAMES = /I$(CAIRO_ROOT)\include\cairo -!endif -!if "$(WXUNIV)" == "0" -__SETUP_H_SUBDIR_FILENAMES = msw -!endif -!if "$(WXUNIV)" == "1" -__SETUP_H_SUBDIR_FILENAMES = univ -!endif - - -all: $(OBJS) -$(OBJS): - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all: setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file - -clean: - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).ilk del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).ilk - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).pdb del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).pdb - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib - cd ..\..\samples - $(MAKE) -f makefile.vc $(MAKEARGS) clean - cd "$(MAKEDIR)" - -setup_h: $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h - -$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib: $(WXREGEX_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(WXREGEX_OBJECTS) -<< - -$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib: $(WXZLIB_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(WXZLIB_OBJECTS) -<< - -!if "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib: $(WXPNG_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(WXPNG_OBJECTS) -<< -!endif - -!if "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib: $(WXJPEG_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(WXJPEG_OBJECTS) -<< -!endif - -!if "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib: $(WXTIFF_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(WXTIFF_OBJECTS) -<< -!endif - -$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib: $(WXEXPAT_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(WXEXPAT_OBJECTS) -<< - -!if "$(USE_STC)" == "1" -$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib: $(WXSCINTILLA_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(WXSCINTILLA_OBJECTS) -<< -!endif - -!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\monodll_dummy.obj $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_108) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(MONODLL_OBJECTS) $(MONODLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__wxscintilla) /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -<< -!endif - -!if "$(MONOLITHIC)" == "1" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\monolib_dummy.obj $(MONOLIB_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(MONOLIB_OBJECTS) -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\basedll_dummy.obj $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\basedll_version.res - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_139) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(BASEDLL_OBJECTS) $(BASEDLL_RESOURCES) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib: $(OBJS)\baselib_dummy.obj $(BASELIB_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(BASELIB_OBJECTS) -<< -!endif - -!if "$(MONOLITHIC)" == "0" -wxbase: $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\netdll_dummy.obj $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_170) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(NETDLL_OBJECTS) $(NETDLL_RESOURCES) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib: $(OBJS)\netlib_dummy.obj $(NETLIB_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(NETLIB_OBJECTS) -<< -!endif - -!if "$(MONOLITHIC)" == "0" -wxnet: $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\coredll_dummy.obj $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_201) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(COREDLL_OBJECTS) $(COREDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib: $(OBJS)\corelib_dummy.obj $(CORELIB_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(CORELIB_OBJECTS) -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1" -wxcore: $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\advdll_dummy.obj $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_232) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(ADVDLL_OBJECTS) $(ADVDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib: $(OBJS)\advlib_dummy.obj $(ADVLIB_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(ADVLIB_OBJECTS) -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1" -wxadv: $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\mediadll_dummy.obj $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_263) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(MEDIADLL_OBJECTS) $(MEDIADLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib: $(OBJS)\medialib_dummy.obj $(MEDIALIB_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(MEDIALIB_OBJECTS) -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_GUI)" == "1" && "$(USE_MEDIA)" == "1" -wxmedia: $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\htmldll_dummy.obj $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_294) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(HTMLDLL_OBJECTS) $(HTMLDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_HTML)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib: $(OBJS)\htmllib_dummy.obj $(HTMLLIB_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(HTMLLIB_OBJECTS) -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_HTML)" == "1" -wxhtml: $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\webviewdll_dummy.obj $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\webviewdll_version.res $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_325) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(WEBVIEWDLL_OBJECTS) $(WEBVIEWDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_WEBVIEW)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib: $(OBJS)\webviewlib_dummy.obj $(WEBVIEWLIB_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(WEBVIEWLIB_OBJECTS) -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_WEBVIEW)" == "1" -wxwebview: $(____wxwebview_namedll_DEP) $(____wxwebview_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\qadll_dummy.obj $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_356) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(QADLL_OBJECTS) $(QADLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_QA)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib: $(OBJS)\qalib_dummy.obj $(QALIB_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(QALIB_OBJECTS) -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_QA)" == "1" -wxqa: $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\xmldll_dummy.obj $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_387) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(XMLDLL_OBJECTS) $(XMLDLL_RESOURCES) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib: $(OBJS)\xmllib_dummy.obj $(XMLLIB_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(XMLLIB_OBJECTS) -<< -!endif - -!if "$(MONOLITHIC)" == "0" -wxxml: $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_XRC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\xrcdll_dummy.obj $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_418) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(XRCDLL_OBJECTS) $(XRCDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_XRC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib: $(OBJS)\xrclib_dummy.obj $(XRCLIB_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(XRCLIB_OBJECTS) -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_XRC)" == "1" -wxxrc: $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_AUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\auidll_dummy.obj $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_449) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(AUIDLL_OBJECTS) $(AUIDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_AUI)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib: $(OBJS)\auilib_dummy.obj $(AUILIB_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(AUILIB_OBJECTS) -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_AUI)" == "1" -wxaui: $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RIBBON)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\ribbondll_dummy.obj $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\ribbondll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_480) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(RIBBONDLL_OBJECTS) $(RIBBONDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RIBBON)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib: $(OBJS)\ribbonlib_dummy.obj $(RIBBONLIB_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(RIBBONLIB_OBJECTS) -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_RIBBON)" == "1" -wxribbon: $(____wxribbon_namedll_DEP) $(____wxribbon_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_PROPGRID)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\propgriddll_dummy.obj $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\propgriddll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_511) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(PROPGRIDDLL_OBJECTS) $(PROPGRIDDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_PROPGRID)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib: $(OBJS)\propgridlib_dummy.obj $(PROPGRIDLIB_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(PROPGRIDLIB_OBJECTS) -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_PROPGRID)" == "1" -wxpropgrid: $(____wxpropgrid_namedll_DEP) $(____wxpropgrid_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_RICHTEXT)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\richtextdll_dummy.obj $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_542) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(RICHTEXTDLL_OBJECTS) $(RICHTEXTDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_RICHTEXT)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib: $(OBJS)\richtextlib_dummy.obj $(RICHTEXTLIB_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(RICHTEXTLIB_OBJECTS) -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_RICHTEXT)" == "1" -wxrichtext: $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP) -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "1" && "$(USE_STC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\stcdll_dummy.obj $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla) $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_573) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(STCDLL_OBJECTS) $(STCDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(SHARED)" == "0" && "$(USE_STC)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib: $(OBJS)\stclib_dummy.obj $(STCLIB_OBJECTS) $(__wxscintilla) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(STCLIB_OBJECTS) -<< -!endif - -!if "$(MONOLITHIC)" == "0" && "$(USE_STC)" == "1" -wxstc: $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP) -!endif - -!if "$(SHARED)" == "1" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll: $(OBJS)\gldll_dummy.obj $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname) - link /DLL /NOLOGO /OUT:$@ $(__DEBUGINFO_6) /pdb:"$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).pdb" $(__DEBUGINFO_604) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @<< - $(GLDLL_OBJECTS) $(GLDLL_RESOURCES) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib /IMPLIB:$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib -<< -!endif - -!if "$(SHARED)" == "0" && "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib: $(OBJS)\gllib_dummy.obj $(GLLIB_OBJECTS) - if exist $@ del $@ - link /LIB /NOLOGO /OUT:$@ @<< - $(GLLIB_OBJECTS) -<< -!endif - -!if "$(USE_GUI)" == "1" && "$(USE_OPENGL)" == "1" -wxgl: $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP) -!endif - -sub_samples: - cd ..\..\samples - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - -$(LIBDIRNAME): - if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME) - -$(SETUPHDIR): $(LIBDIRNAME) - if not exist $(SETUPHDIR) mkdir $(SETUPHDIR) - -$(SETUPHDIR)\wx: $(SETUPHDIR) - if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx - -..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h: - if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h - -$(SETUPHDIR)\wx\setup.h: - if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h - -$(SETUPHDIR)\wx\msw: $(SETUPHDIR)\wx - if not exist $(SETUPHDIR)\wx\msw mkdir $(SETUPHDIR)\wx\msw - -$(SETUPHDIR)\wx\msw\rcdefs.h: $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs.h - $(CPP) "..\..\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h" - -build_cfg_file: $(SETUPHDIR) - @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) - @echo WXVER_MINOR=0 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE) - @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) - @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) - @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) - @echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE) - @echo TOOLKIT=MSW >>$(BUILD_CFG_FILE) - @echo TOOLKIT_VERSION=$(TOOLKIT_VERSION) >>$(BUILD_CFG_FILE) - @echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE) - @echo CFG=$(CFG) >>$(BUILD_CFG_FILE) - @echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE) - @echo OFFICIAL_BUILD=$(OFFICIAL_BUILD) >>$(BUILD_CFG_FILE) - @echo DEBUG_FLAG=$(DEBUG_FLAG) >>$(BUILD_CFG_FILE) - @echo DEBUG_INFO=$(DEBUG_INFO) >>$(BUILD_CFG_FILE) - @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE) - @echo MSLU=$(MSLU) >>$(BUILD_CFG_FILE) - @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE) - @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE) - @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE) - @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE) - @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE) - @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE) - @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE) - @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE) - @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE) - @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE) - @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE) - @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE) - @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE) - @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE) - @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE) - @echo COMPILER=vc >>$(BUILD_CFG_FILE) - @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE) - @echo CC=$(CC) >>$(BUILD_CFG_FILE) - @echo CXX=$(CXX) >>$(BUILD_CFG_FILE) - @echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE) - @echo CPPFLAGS=$(CPPFLAGS) >>$(BUILD_CFG_FILE) - @echo CXXFLAGS=$(CXXFLAGS) >>$(BUILD_CFG_FILE) - @echo LDFLAGS=$(LDFLAGS) >>$(BUILD_CFG_FILE) - -$(OBJS)\wxregex_regcomp.obj: ..\..\src\regex\regcomp.c - $(CC) /c /nologo /TC /Fo$@ $(WXREGEX_CFLAGS) ..\..\src\regex\regcomp.c - -$(OBJS)\wxregex_regexec.obj: ..\..\src\regex\regexec.c - $(CC) /c /nologo /TC /Fo$@ $(WXREGEX_CFLAGS) ..\..\src\regex\regexec.c - -$(OBJS)\wxregex_regerror.obj: ..\..\src\regex\regerror.c - $(CC) /c /nologo /TC /Fo$@ $(WXREGEX_CFLAGS) ..\..\src\regex\regerror.c - -$(OBJS)\wxregex_regfree.obj: ..\..\src\regex\regfree.c - $(CC) /c /nologo /TC /Fo$@ $(WXREGEX_CFLAGS) ..\..\src\regex\regfree.c - -$(OBJS)\wxzlib_adler32.obj: ..\..\src\zlib\adler32.c - $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\adler32.c - -$(OBJS)\wxzlib_compress.obj: ..\..\src\zlib\compress.c - $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\compress.c - -$(OBJS)\wxzlib_crc32.obj: ..\..\src\zlib\crc32.c - $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\crc32.c - -$(OBJS)\wxzlib_deflate.obj: ..\..\src\zlib\deflate.c - $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\deflate.c - -$(OBJS)\wxzlib_gzclose.obj: ..\..\src\zlib\gzclose.c - $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\gzclose.c - -$(OBJS)\wxzlib_gzlib.obj: ..\..\src\zlib\gzlib.c - $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\gzlib.c - -$(OBJS)\wxzlib_gzread.obj: ..\..\src\zlib\gzread.c - $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\gzread.c - -$(OBJS)\wxzlib_gzwrite.obj: ..\..\src\zlib\gzwrite.c - $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\gzwrite.c - -$(OBJS)\wxzlib_infback.obj: ..\..\src\zlib\infback.c - $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\infback.c - -$(OBJS)\wxzlib_inffast.obj: ..\..\src\zlib\inffast.c - $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\inffast.c - -$(OBJS)\wxzlib_inflate.obj: ..\..\src\zlib\inflate.c - $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\inflate.c - -$(OBJS)\wxzlib_inftrees.obj: ..\..\src\zlib\inftrees.c - $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\inftrees.c - -$(OBJS)\wxzlib_trees.obj: ..\..\src\zlib\trees.c - $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\trees.c - -$(OBJS)\wxzlib_uncompr.obj: ..\..\src\zlib\uncompr.c - $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\uncompr.c - -$(OBJS)\wxzlib_zutil.obj: ..\..\src\zlib\zutil.c - $(CC) /c /nologo /TC /Fo$@ $(WXZLIB_CFLAGS) ..\..\src\zlib\zutil.c - -$(OBJS)\wxpng_png.obj: ..\..\src\png\png.c - $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\png.c - -$(OBJS)\wxpng_pngerror.obj: ..\..\src\png\pngerror.c - $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngerror.c - -$(OBJS)\wxpng_pngget.obj: ..\..\src\png\pngget.c - $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngget.c - -$(OBJS)\wxpng_pngmem.obj: ..\..\src\png\pngmem.c - $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngmem.c - -$(OBJS)\wxpng_pngpread.obj: ..\..\src\png\pngpread.c - $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngpread.c - -$(OBJS)\wxpng_pngread.obj: ..\..\src\png\pngread.c - $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngread.c - -$(OBJS)\wxpng_pngrio.obj: ..\..\src\png\pngrio.c - $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngrio.c - -$(OBJS)\wxpng_pngrtran.obj: ..\..\src\png\pngrtran.c - $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngrtran.c - -$(OBJS)\wxpng_pngrutil.obj: ..\..\src\png\pngrutil.c - $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngrutil.c - -$(OBJS)\wxpng_pngset.obj: ..\..\src\png\pngset.c - $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngset.c - -$(OBJS)\wxpng_pngtrans.obj: ..\..\src\png\pngtrans.c - $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngtrans.c - -$(OBJS)\wxpng_pngwio.obj: ..\..\src\png\pngwio.c - $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngwio.c - -$(OBJS)\wxpng_pngwrite.obj: ..\..\src\png\pngwrite.c - $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngwrite.c - -$(OBJS)\wxpng_pngwtran.obj: ..\..\src\png\pngwtran.c - $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngwtran.c - -$(OBJS)\wxpng_pngwutil.obj: ..\..\src\png\pngwutil.c - $(CC) /c /nologo /TC /Fo$@ $(WXPNG_CFLAGS) ..\..\src\png\pngwutil.c - -$(OBJS)\wxjpeg_jcomapi.obj: ..\..\src\jpeg\jcomapi.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcomapi.c - -$(OBJS)\wxjpeg_jutils.obj: ..\..\src\jpeg\jutils.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jutils.c - -$(OBJS)\wxjpeg_jerror.obj: ..\..\src\jpeg\jerror.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jerror.c - -$(OBJS)\wxjpeg_jmemmgr.obj: ..\..\src\jpeg\jmemmgr.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jmemmgr.c - -$(OBJS)\wxjpeg_jmemnobs.obj: ..\..\src\jpeg\jmemnobs.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jmemnobs.c - -$(OBJS)\wxjpeg_jcapimin.obj: ..\..\src\jpeg\jcapimin.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcapimin.c - -$(OBJS)\wxjpeg_jcapistd.obj: ..\..\src\jpeg\jcapistd.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcapistd.c - -$(OBJS)\wxjpeg_jctrans.obj: ..\..\src\jpeg\jctrans.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jctrans.c - -$(OBJS)\wxjpeg_jcparam.obj: ..\..\src\jpeg\jcparam.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcparam.c - -$(OBJS)\wxjpeg_jdatadst.obj: ..\..\src\jpeg\jdatadst.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdatadst.c - -$(OBJS)\wxjpeg_jcinit.obj: ..\..\src\jpeg\jcinit.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcinit.c - -$(OBJS)\wxjpeg_jcmaster.obj: ..\..\src\jpeg\jcmaster.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcmaster.c - -$(OBJS)\wxjpeg_jcmarker.obj: ..\..\src\jpeg\jcmarker.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcmarker.c - -$(OBJS)\wxjpeg_jcmainct.obj: ..\..\src\jpeg\jcmainct.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcmainct.c - -$(OBJS)\wxjpeg_jcprepct.obj: ..\..\src\jpeg\jcprepct.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcprepct.c - -$(OBJS)\wxjpeg_jccoefct.obj: ..\..\src\jpeg\jccoefct.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jccoefct.c - -$(OBJS)\wxjpeg_jccolor.obj: ..\..\src\jpeg\jccolor.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jccolor.c - -$(OBJS)\wxjpeg_jcsample.obj: ..\..\src\jpeg\jcsample.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcsample.c - -$(OBJS)\wxjpeg_jchuff.obj: ..\..\src\jpeg\jchuff.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jchuff.c - -$(OBJS)\wxjpeg_jcphuff.obj: ..\..\src\jpeg\jcphuff.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcphuff.c - -$(OBJS)\wxjpeg_jcdctmgr.obj: ..\..\src\jpeg\jcdctmgr.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jcdctmgr.c - -$(OBJS)\wxjpeg_jfdctfst.obj: ..\..\src\jpeg\jfdctfst.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jfdctfst.c - -$(OBJS)\wxjpeg_jfdctflt.obj: ..\..\src\jpeg\jfdctflt.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jfdctflt.c - -$(OBJS)\wxjpeg_jfdctint.obj: ..\..\src\jpeg\jfdctint.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jfdctint.c - -$(OBJS)\wxjpeg_jdapimin.obj: ..\..\src\jpeg\jdapimin.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdapimin.c - -$(OBJS)\wxjpeg_jdapistd.obj: ..\..\src\jpeg\jdapistd.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdapistd.c - -$(OBJS)\wxjpeg_jdtrans.obj: ..\..\src\jpeg\jdtrans.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdtrans.c - -$(OBJS)\wxjpeg_jdatasrc.obj: ..\..\src\jpeg\jdatasrc.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdatasrc.c - -$(OBJS)\wxjpeg_jdmaster.obj: ..\..\src\jpeg\jdmaster.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdmaster.c - -$(OBJS)\wxjpeg_jdinput.obj: ..\..\src\jpeg\jdinput.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdinput.c - -$(OBJS)\wxjpeg_jdmarker.obj: ..\..\src\jpeg\jdmarker.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdmarker.c - -$(OBJS)\wxjpeg_jdhuff.obj: ..\..\src\jpeg\jdhuff.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdhuff.c - -$(OBJS)\wxjpeg_jdphuff.obj: ..\..\src\jpeg\jdphuff.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdphuff.c - -$(OBJS)\wxjpeg_jdmainct.obj: ..\..\src\jpeg\jdmainct.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdmainct.c - -$(OBJS)\wxjpeg_jdcoefct.obj: ..\..\src\jpeg\jdcoefct.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdcoefct.c - -$(OBJS)\wxjpeg_jdpostct.obj: ..\..\src\jpeg\jdpostct.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdpostct.c - -$(OBJS)\wxjpeg_jddctmgr.obj: ..\..\src\jpeg\jddctmgr.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jddctmgr.c - -$(OBJS)\wxjpeg_jidctfst.obj: ..\..\src\jpeg\jidctfst.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jidctfst.c - -$(OBJS)\wxjpeg_jidctflt.obj: ..\..\src\jpeg\jidctflt.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jidctflt.c - -$(OBJS)\wxjpeg_jidctint.obj: ..\..\src\jpeg\jidctint.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jidctint.c - -$(OBJS)\wxjpeg_jidctred.obj: ..\..\src\jpeg\jidctred.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jidctred.c - -$(OBJS)\wxjpeg_jdsample.obj: ..\..\src\jpeg\jdsample.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdsample.c - -$(OBJS)\wxjpeg_jdcolor.obj: ..\..\src\jpeg\jdcolor.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdcolor.c - -$(OBJS)\wxjpeg_jquant1.obj: ..\..\src\jpeg\jquant1.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jquant1.c - -$(OBJS)\wxjpeg_jquant2.obj: ..\..\src\jpeg\jquant2.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jquant2.c - -$(OBJS)\wxjpeg_jdmerge.obj: ..\..\src\jpeg\jdmerge.c - $(CC) /c /nologo /TC /Fo$@ $(WXJPEG_CFLAGS) ..\..\src\jpeg\jdmerge.c - -$(OBJS)\wxtiff_tif_win32.obj: ..\..\src\tiff\libtiff\tif_win32.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_win32.c - -$(OBJS)\wxtiff_tif_aux.obj: ..\..\src\tiff\libtiff\tif_aux.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_aux.c - -$(OBJS)\wxtiff_tif_close.obj: ..\..\src\tiff\libtiff\tif_close.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_close.c - -$(OBJS)\wxtiff_tif_codec.obj: ..\..\src\tiff\libtiff\tif_codec.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_codec.c - -$(OBJS)\wxtiff_tif_color.obj: ..\..\src\tiff\libtiff\tif_color.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_color.c - -$(OBJS)\wxtiff_tif_compress.obj: ..\..\src\tiff\libtiff\tif_compress.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_compress.c - -$(OBJS)\wxtiff_tif_dir.obj: ..\..\src\tiff\libtiff\tif_dir.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_dir.c - -$(OBJS)\wxtiff_tif_dirinfo.obj: ..\..\src\tiff\libtiff\tif_dirinfo.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_dirinfo.c - -$(OBJS)\wxtiff_tif_dirread.obj: ..\..\src\tiff\libtiff\tif_dirread.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_dirread.c - -$(OBJS)\wxtiff_tif_dirwrite.obj: ..\..\src\tiff\libtiff\tif_dirwrite.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_dirwrite.c - -$(OBJS)\wxtiff_tif_dumpmode.obj: ..\..\src\tiff\libtiff\tif_dumpmode.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_dumpmode.c - -$(OBJS)\wxtiff_tif_error.obj: ..\..\src\tiff\libtiff\tif_error.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_error.c - -$(OBJS)\wxtiff_tif_extension.obj: ..\..\src\tiff\libtiff\tif_extension.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_extension.c - -$(OBJS)\wxtiff_tif_fax3.obj: ..\..\src\tiff\libtiff\tif_fax3.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_fax3.c - -$(OBJS)\wxtiff_tif_fax3sm.obj: ..\..\src\tiff\libtiff\tif_fax3sm.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_fax3sm.c - -$(OBJS)\wxtiff_tif_flush.obj: ..\..\src\tiff\libtiff\tif_flush.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_flush.c - -$(OBJS)\wxtiff_tif_getimage.obj: ..\..\src\tiff\libtiff\tif_getimage.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_getimage.c - -$(OBJS)\wxtiff_tif_jbig.obj: ..\..\src\tiff\libtiff\tif_jbig.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jbig.c - -$(OBJS)\wxtiff_tif_jpeg.obj: ..\..\src\tiff\libtiff\tif_jpeg.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jpeg.c - -$(OBJS)\wxtiff_tif_jpeg_12.obj: ..\..\src\tiff\libtiff\tif_jpeg_12.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_jpeg_12.c - -$(OBJS)\wxtiff_tif_luv.obj: ..\..\src\tiff\libtiff\tif_luv.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_luv.c - -$(OBJS)\wxtiff_tif_lzma.obj: ..\..\src\tiff\libtiff\tif_lzma.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_lzma.c - -$(OBJS)\wxtiff_tif_lzw.obj: ..\..\src\tiff\libtiff\tif_lzw.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_lzw.c - -$(OBJS)\wxtiff_tif_next.obj: ..\..\src\tiff\libtiff\tif_next.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_next.c - -$(OBJS)\wxtiff_tif_ojpeg.obj: ..\..\src\tiff\libtiff\tif_ojpeg.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_ojpeg.c - -$(OBJS)\wxtiff_tif_open.obj: ..\..\src\tiff\libtiff\tif_open.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_open.c - -$(OBJS)\wxtiff_tif_packbits.obj: ..\..\src\tiff\libtiff\tif_packbits.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_packbits.c - -$(OBJS)\wxtiff_tif_pixarlog.obj: ..\..\src\tiff\libtiff\tif_pixarlog.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_pixarlog.c - -$(OBJS)\wxtiff_tif_predict.obj: ..\..\src\tiff\libtiff\tif_predict.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_predict.c - -$(OBJS)\wxtiff_tif_print.obj: ..\..\src\tiff\libtiff\tif_print.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_print.c - -$(OBJS)\wxtiff_tif_read.obj: ..\..\src\tiff\libtiff\tif_read.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_read.c - -$(OBJS)\wxtiff_tif_strip.obj: ..\..\src\tiff\libtiff\tif_strip.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_strip.c - -$(OBJS)\wxtiff_tif_swab.obj: ..\..\src\tiff\libtiff\tif_swab.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_swab.c - -$(OBJS)\wxtiff_tif_thunder.obj: ..\..\src\tiff\libtiff\tif_thunder.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_thunder.c - -$(OBJS)\wxtiff_tif_tile.obj: ..\..\src\tiff\libtiff\tif_tile.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_tile.c - -$(OBJS)\wxtiff_tif_version.obj: ..\..\src\tiff\libtiff\tif_version.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_version.c - -$(OBJS)\wxtiff_tif_warning.obj: ..\..\src\tiff\libtiff\tif_warning.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_warning.c - -$(OBJS)\wxtiff_tif_write.obj: ..\..\src\tiff\libtiff\tif_write.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_write.c - -$(OBJS)\wxtiff_tif_zip.obj: ..\..\src\tiff\libtiff\tif_zip.c - $(CC) /c /nologo /TC /Fo$@ $(WXTIFF_CFLAGS) ..\..\src\tiff\libtiff\tif_zip.c - -$(OBJS)\wxexpat_xmlparse.obj: ..\..\src\expat\lib\xmlparse.c - $(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) ..\..\src\expat\lib\xmlparse.c - -$(OBJS)\wxexpat_xmlrole.obj: ..\..\src\expat\lib\xmlrole.c - $(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) ..\..\src\expat\lib\xmlrole.c - -$(OBJS)\wxexpat_xmltok.obj: ..\..\src\expat\lib\xmltok.c - $(CC) /c /nologo /TC /Fo$@ $(WXEXPAT_CFLAGS) ..\..\src\expat\lib\xmltok.c - -$(OBJS)\wxscintilla_LexA68k.obj: ..\..\src\stc\scintilla\lexers\LexA68k.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexA68k.cxx - -$(OBJS)\wxscintilla_LexAbaqus.obj: ..\..\src\stc\scintilla\lexers\LexAbaqus.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAbaqus.cxx - -$(OBJS)\wxscintilla_LexAda.obj: ..\..\src\stc\scintilla\lexers\LexAda.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAda.cxx - -$(OBJS)\wxscintilla_LexAPDL.obj: ..\..\src\stc\scintilla\lexers\LexAPDL.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAPDL.cxx - -$(OBJS)\wxscintilla_LexAsm.obj: ..\..\src\stc\scintilla\lexers\LexAsm.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAsm.cxx - -$(OBJS)\wxscintilla_LexAsn1.obj: ..\..\src\stc\scintilla\lexers\LexAsn1.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAsn1.cxx - -$(OBJS)\wxscintilla_LexASY.obj: ..\..\src\stc\scintilla\lexers\LexASY.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexASY.cxx - -$(OBJS)\wxscintilla_LexAU3.obj: ..\..\src\stc\scintilla\lexers\LexAU3.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAU3.cxx - -$(OBJS)\wxscintilla_LexAVE.obj: ..\..\src\stc\scintilla\lexers\LexAVE.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAVE.cxx - -$(OBJS)\wxscintilla_LexAVS.obj: ..\..\src\stc\scintilla\lexers\LexAVS.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexAVS.cxx - -$(OBJS)\wxscintilla_LexBaan.obj: ..\..\src\stc\scintilla\lexers\LexBaan.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexBaan.cxx - -$(OBJS)\wxscintilla_LexBash.obj: ..\..\src\stc\scintilla\lexers\LexBash.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexBash.cxx - -$(OBJS)\wxscintilla_LexBasic.obj: ..\..\src\stc\scintilla\lexers\LexBasic.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexBasic.cxx - -$(OBJS)\wxscintilla_LexBullant.obj: ..\..\src\stc\scintilla\lexers\LexBullant.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexBullant.cxx - -$(OBJS)\wxscintilla_LexCaml.obj: ..\..\src\stc\scintilla\lexers\LexCaml.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCaml.cxx - -$(OBJS)\wxscintilla_LexCLW.obj: ..\..\src\stc\scintilla\lexers\LexCLW.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCLW.cxx - -$(OBJS)\wxscintilla_LexCmake.obj: ..\..\src\stc\scintilla\lexers\LexCmake.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCmake.cxx - -$(OBJS)\wxscintilla_LexCOBOL.obj: ..\..\src\stc\scintilla\lexers\LexCOBOL.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCOBOL.cxx - -$(OBJS)\wxscintilla_LexCoffeeScript.obj: ..\..\src\stc\scintilla\lexers\LexCoffeeScript.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCoffeeScript.cxx - -$(OBJS)\wxscintilla_LexConf.obj: ..\..\src\stc\scintilla\lexers\LexConf.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexConf.cxx - -$(OBJS)\wxscintilla_LexCPP.obj: ..\..\src\stc\scintilla\lexers\LexCPP.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCPP.cxx - -$(OBJS)\wxscintilla_LexCrontab.obj: ..\..\src\stc\scintilla\lexers\LexCrontab.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCrontab.cxx - -$(OBJS)\wxscintilla_LexCsound.obj: ..\..\src\stc\scintilla\lexers\LexCsound.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCsound.cxx - -$(OBJS)\wxscintilla_LexCSS.obj: ..\..\src\stc\scintilla\lexers\LexCSS.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexCSS.cxx - -$(OBJS)\wxscintilla_LexD.obj: ..\..\src\stc\scintilla\lexers\LexD.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexD.cxx - -$(OBJS)\wxscintilla_LexECL.obj: ..\..\src\stc\scintilla\lexers\LexECL.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexECL.cxx - -$(OBJS)\wxscintilla_LexEiffel.obj: ..\..\src\stc\scintilla\lexers\LexEiffel.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexEiffel.cxx - -$(OBJS)\wxscintilla_LexErlang.obj: ..\..\src\stc\scintilla\lexers\LexErlang.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexErlang.cxx - -$(OBJS)\wxscintilla_LexEScript.obj: ..\..\src\stc\scintilla\lexers\LexEScript.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexEScript.cxx - -$(OBJS)\wxscintilla_LexFlagship.obj: ..\..\src\stc\scintilla\lexers\LexFlagship.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexFlagship.cxx - -$(OBJS)\wxscintilla_LexForth.obj: ..\..\src\stc\scintilla\lexers\LexForth.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexForth.cxx - -$(OBJS)\wxscintilla_LexFortran.obj: ..\..\src\stc\scintilla\lexers\LexFortran.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexFortran.cxx - -$(OBJS)\wxscintilla_LexGAP.obj: ..\..\src\stc\scintilla\lexers\LexGAP.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexGAP.cxx - -$(OBJS)\wxscintilla_LexGui4Cli.obj: ..\..\src\stc\scintilla\lexers\LexGui4Cli.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexGui4Cli.cxx - -$(OBJS)\wxscintilla_LexHaskell.obj: ..\..\src\stc\scintilla\lexers\LexHaskell.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexHaskell.cxx - -$(OBJS)\wxscintilla_LexHTML.obj: ..\..\src\stc\scintilla\lexers\LexHTML.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexHTML.cxx - -$(OBJS)\wxscintilla_LexInno.obj: ..\..\src\stc\scintilla\lexers\LexInno.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexInno.cxx - -$(OBJS)\wxscintilla_LexKix.obj: ..\..\src\stc\scintilla\lexers\LexKix.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexKix.cxx - -$(OBJS)\wxscintilla_LexLisp.obj: ..\..\src\stc\scintilla\lexers\LexLisp.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexLisp.cxx - -$(OBJS)\wxscintilla_LexLout.obj: ..\..\src\stc\scintilla\lexers\LexLout.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexLout.cxx - -$(OBJS)\wxscintilla_LexLua.obj: ..\..\src\stc\scintilla\lexers\LexLua.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexLua.cxx - -$(OBJS)\wxscintilla_LexMagik.obj: ..\..\src\stc\scintilla\lexers\LexMagik.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMagik.cxx - -$(OBJS)\wxscintilla_LexMarkdown.obj: ..\..\src\stc\scintilla\lexers\LexMarkdown.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMarkdown.cxx - -$(OBJS)\wxscintilla_LexMatlab.obj: ..\..\src\stc\scintilla\lexers\LexMatlab.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMatlab.cxx - -$(OBJS)\wxscintilla_LexMetapost.obj: ..\..\src\stc\scintilla\lexers\LexMetapost.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMetapost.cxx - -$(OBJS)\wxscintilla_LexMMIXAL.obj: ..\..\src\stc\scintilla\lexers\LexMMIXAL.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMMIXAL.cxx - -$(OBJS)\wxscintilla_LexModula.obj: ..\..\src\stc\scintilla\lexers\LexModula.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexModula.cxx - -$(OBJS)\wxscintilla_LexMPT.obj: ..\..\src\stc\scintilla\lexers\LexMPT.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMPT.cxx - -$(OBJS)\wxscintilla_LexMSSQL.obj: ..\..\src\stc\scintilla\lexers\LexMSSQL.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMSSQL.cxx - -$(OBJS)\wxscintilla_LexMySQL.obj: ..\..\src\stc\scintilla\lexers\LexMySQL.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexMySQL.cxx - -$(OBJS)\wxscintilla_LexNimrod.obj: ..\..\src\stc\scintilla\lexers\LexNimrod.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexNimrod.cxx - -$(OBJS)\wxscintilla_LexNsis.obj: ..\..\src\stc\scintilla\lexers\LexNsis.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexNsis.cxx - -$(OBJS)\wxscintilla_LexOpal.obj: ..\..\src\stc\scintilla\lexers\LexOpal.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexOpal.cxx - -$(OBJS)\wxscintilla_LexOScript.obj: ..\..\src\stc\scintilla\lexers\LexOScript.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexOScript.cxx - -$(OBJS)\wxscintilla_LexOthers.obj: ..\..\src\stc\scintilla\lexers\LexOthers.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexOthers.cxx - -$(OBJS)\wxscintilla_LexPascal.obj: ..\..\src\stc\scintilla\lexers\LexPascal.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPascal.cxx - -$(OBJS)\wxscintilla_LexPB.obj: ..\..\src\stc\scintilla\lexers\LexPB.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPB.cxx - -$(OBJS)\wxscintilla_LexPerl.obj: ..\..\src\stc\scintilla\lexers\LexPerl.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPerl.cxx - -$(OBJS)\wxscintilla_LexPLM.obj: ..\..\src\stc\scintilla\lexers\LexPLM.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPLM.cxx - -$(OBJS)\wxscintilla_LexPOV.obj: ..\..\src\stc\scintilla\lexers\LexPOV.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPOV.cxx - -$(OBJS)\wxscintilla_LexPowerPro.obj: ..\..\src\stc\scintilla\lexers\LexPowerPro.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPowerPro.cxx - -$(OBJS)\wxscintilla_LexPowerShell.obj: ..\..\src\stc\scintilla\lexers\LexPowerShell.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPowerShell.cxx - -$(OBJS)\wxscintilla_LexProgress.obj: ..\..\src\stc\scintilla\lexers\LexProgress.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexProgress.cxx - -$(OBJS)\wxscintilla_LexPS.obj: ..\..\src\stc\scintilla\lexers\LexPS.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPS.cxx - -$(OBJS)\wxscintilla_LexPython.obj: ..\..\src\stc\scintilla\lexers\LexPython.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexPython.cxx - -$(OBJS)\wxscintilla_LexR.obj: ..\..\src\stc\scintilla\lexers\LexR.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexR.cxx - -$(OBJS)\wxscintilla_LexRebol.obj: ..\..\src\stc\scintilla\lexers\LexRebol.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexRebol.cxx - -$(OBJS)\wxscintilla_LexRuby.obj: ..\..\src\stc\scintilla\lexers\LexRuby.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexRuby.cxx - -$(OBJS)\wxscintilla_LexScriptol.obj: ..\..\src\stc\scintilla\lexers\LexScriptol.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexScriptol.cxx - -$(OBJS)\wxscintilla_LexSmalltalk.obj: ..\..\src\stc\scintilla\lexers\LexSmalltalk.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSmalltalk.cxx - -$(OBJS)\wxscintilla_LexSML.obj: ..\..\src\stc\scintilla\lexers\LexSML.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSML.cxx - -$(OBJS)\wxscintilla_LexSorcus.obj: ..\..\src\stc\scintilla\lexers\LexSorcus.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSorcus.cxx - -$(OBJS)\wxscintilla_LexSpecman.obj: ..\..\src\stc\scintilla\lexers\LexSpecman.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSpecman.cxx - -$(OBJS)\wxscintilla_LexSpice.obj: ..\..\src\stc\scintilla\lexers\LexSpice.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSpice.cxx - -$(OBJS)\wxscintilla_LexSQL.obj: ..\..\src\stc\scintilla\lexers\LexSQL.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexSQL.cxx - -$(OBJS)\wxscintilla_LexTACL.obj: ..\..\src\stc\scintilla\lexers\LexTACL.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTACL.cxx - -$(OBJS)\wxscintilla_LexTADS3.obj: ..\..\src\stc\scintilla\lexers\LexTADS3.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTADS3.cxx - -$(OBJS)\wxscintilla_LexTAL.obj: ..\..\src\stc\scintilla\lexers\LexTAL.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTAL.cxx - -$(OBJS)\wxscintilla_LexTCL.obj: ..\..\src\stc\scintilla\lexers\LexTCL.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTCL.cxx - -$(OBJS)\wxscintilla_LexTCMD.obj: ..\..\src\stc\scintilla\lexers\LexTCMD.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTCMD.cxx - -$(OBJS)\wxscintilla_LexTeX.obj: ..\..\src\stc\scintilla\lexers\LexTeX.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTeX.cxx - -$(OBJS)\wxscintilla_LexTxt2tags.obj: ..\..\src\stc\scintilla\lexers\LexTxt2tags.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexTxt2tags.cxx - -$(OBJS)\wxscintilla_LexVB.obj: ..\..\src\stc\scintilla\lexers\LexVB.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexVB.cxx - -$(OBJS)\wxscintilla_LexVerilog.obj: ..\..\src\stc\scintilla\lexers\LexVerilog.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexVerilog.cxx - -$(OBJS)\wxscintilla_LexVHDL.obj: ..\..\src\stc\scintilla\lexers\LexVHDL.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexVHDL.cxx - -$(OBJS)\wxscintilla_LexVisualProlog.obj: ..\..\src\stc\scintilla\lexers\LexVisualProlog.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexVisualProlog.cxx - -$(OBJS)\wxscintilla_LexYAML.obj: ..\..\src\stc\scintilla\lexers\LexYAML.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexers\LexYAML.cxx - -$(OBJS)\wxscintilla_Accessor.obj: ..\..\src\stc\scintilla\lexlib\Accessor.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\Accessor.cxx - -$(OBJS)\wxscintilla_CharacterSet.obj: ..\..\src\stc\scintilla\lexlib\CharacterSet.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\CharacterSet.cxx - -$(OBJS)\wxscintilla_LexerBase.obj: ..\..\src\stc\scintilla\lexlib\LexerBase.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\LexerBase.cxx - -$(OBJS)\wxscintilla_LexerModule.obj: ..\..\src\stc\scintilla\lexlib\LexerModule.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\LexerModule.cxx - -$(OBJS)\wxscintilla_LexerNoExceptions.obj: ..\..\src\stc\scintilla\lexlib\LexerNoExceptions.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\LexerNoExceptions.cxx - -$(OBJS)\wxscintilla_LexerSimple.obj: ..\..\src\stc\scintilla\lexlib\LexerSimple.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\LexerSimple.cxx - -$(OBJS)\wxscintilla_PropSetSimple.obj: ..\..\src\stc\scintilla\lexlib\PropSetSimple.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\PropSetSimple.cxx - -$(OBJS)\wxscintilla_StyleContext.obj: ..\..\src\stc\scintilla\lexlib\StyleContext.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\StyleContext.cxx - -$(OBJS)\wxscintilla_WordList.obj: ..\..\src\stc\scintilla\lexlib\WordList.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\lexlib\WordList.cxx - -$(OBJS)\wxscintilla_AutoComplete.obj: ..\..\src\stc\scintilla\src\AutoComplete.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\AutoComplete.cxx - -$(OBJS)\wxscintilla_CallTip.obj: ..\..\src\stc\scintilla\src\CallTip.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\CallTip.cxx - -$(OBJS)\wxscintilla_Catalogue.obj: ..\..\src\stc\scintilla\src\Catalogue.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Catalogue.cxx - -$(OBJS)\wxscintilla_CellBuffer.obj: ..\..\src\stc\scintilla\src\CellBuffer.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\CellBuffer.cxx - -$(OBJS)\wxscintilla_CharClassify.obj: ..\..\src\stc\scintilla\src\CharClassify.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\CharClassify.cxx - -$(OBJS)\wxscintilla_ContractionState.obj: ..\..\src\stc\scintilla\src\ContractionState.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ContractionState.cxx - -$(OBJS)\wxscintilla_Decoration.obj: ..\..\src\stc\scintilla\src\Decoration.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Decoration.cxx - -$(OBJS)\wxscintilla_Document.obj: ..\..\src\stc\scintilla\src\Document.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Document.cxx - -$(OBJS)\wxscintilla_Editor.obj: ..\..\src\stc\scintilla\src\Editor.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Editor.cxx - -$(OBJS)\wxscintilla_ExternalLexer.obj: ..\..\src\stc\scintilla\src\ExternalLexer.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ExternalLexer.cxx - -$(OBJS)\wxscintilla_Indicator.obj: ..\..\src\stc\scintilla\src\Indicator.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Indicator.cxx - -$(OBJS)\wxscintilla_KeyMap.obj: ..\..\src\stc\scintilla\src\KeyMap.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\KeyMap.cxx - -$(OBJS)\wxscintilla_LineMarker.obj: ..\..\src\stc\scintilla\src\LineMarker.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\LineMarker.cxx - -$(OBJS)\wxscintilla_PerLine.obj: ..\..\src\stc\scintilla\src\PerLine.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\PerLine.cxx - -$(OBJS)\wxscintilla_PositionCache.obj: ..\..\src\stc\scintilla\src\PositionCache.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\PositionCache.cxx - -$(OBJS)\wxscintilla_RESearch.obj: ..\..\src\stc\scintilla\src\RESearch.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\RESearch.cxx - -$(OBJS)\wxscintilla_RunStyles.obj: ..\..\src\stc\scintilla\src\RunStyles.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\RunStyles.cxx - -$(OBJS)\wxscintilla_ScintillaBase.obj: ..\..\src\stc\scintilla\src\ScintillaBase.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ScintillaBase.cxx - -$(OBJS)\wxscintilla_Selection.obj: ..\..\src\stc\scintilla\src\Selection.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Selection.cxx - -$(OBJS)\wxscintilla_Style.obj: ..\..\src\stc\scintilla\src\Style.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\Style.cxx - -$(OBJS)\wxscintilla_UniConversion.obj: ..\..\src\stc\scintilla\src\UniConversion.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\UniConversion.cxx - -$(OBJS)\wxscintilla_ViewStyle.obj: ..\..\src\stc\scintilla\src\ViewStyle.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\ViewStyle.cxx - -$(OBJS)\wxscintilla_XPM.obj: ..\..\src\stc\scintilla\src\XPM.cxx - $(CXX) /c /nologo /TP /Fo$@ $(WXSCINTILLA_CXXFLAGS) ..\..\src\stc\scintilla\src\XPM.cxx - -$(OBJS)\monodll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\monodll_any.obj: ..\..\src\common\any.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\any.cpp - -$(OBJS)\monodll_appbase.obj: ..\..\src\common\appbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appbase.cpp - -$(OBJS)\monodll_arcall.obj: ..\..\src\common\arcall.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arcall.cpp - -$(OBJS)\monodll_arcfind.obj: ..\..\src\common\arcfind.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arcfind.cpp - -$(OBJS)\monodll_archive.obj: ..\..\src\common\archive.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\archive.cpp - -$(OBJS)\monodll_arrstr.obj: ..\..\src\common\arrstr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arrstr.cpp - -$(OBJS)\monodll_base64.obj: ..\..\src\common\base64.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\base64.cpp - -$(OBJS)\monodll_clntdata.obj: ..\..\src\common\clntdata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clntdata.cpp - -$(OBJS)\monodll_cmdline.obj: ..\..\src\common\cmdline.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cmdline.cpp - -$(OBJS)\monodll_config.obj: ..\..\src\common\config.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\config.cpp - -$(OBJS)\monodll_convauto.obj: ..\..\src\common\convauto.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\convauto.cpp - -$(OBJS)\monodll_datetime.obj: ..\..\src\common\datetime.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datetime.cpp - -$(OBJS)\monodll_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datetimefmt.cpp - -$(OBJS)\monodll_datstrm.obj: ..\..\src\common\datstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datstrm.cpp - -$(OBJS)\monodll_dircmn.obj: ..\..\src\common\dircmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dircmn.cpp - -$(OBJS)\monodll_dynarray.obj: ..\..\src\common\dynarray.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dynarray.cpp - -$(OBJS)\monodll_dynlib.obj: ..\..\src\common\dynlib.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dynlib.cpp - -$(OBJS)\monodll_dynload.obj: ..\..\src\common\dynload.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dynload.cpp - -$(OBJS)\monodll_encconv.obj: ..\..\src\common\encconv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\encconv.cpp - -$(OBJS)\monodll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp - -$(OBJS)\monodll_extended.obj: ..\..\src\common\extended.c - $(CC) /c /nologo /TC /Fo$@ $(MONODLL_CFLAGS) ..\..\src\common\extended.c - -$(OBJS)\monodll_ffile.obj: ..\..\src\common\ffile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ffile.cpp - -$(OBJS)\monodll_file.obj: ..\..\src\common\file.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\file.cpp - -$(OBJS)\monodll_fileback.obj: ..\..\src\common\fileback.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fileback.cpp - -$(OBJS)\monodll_fileconf.obj: ..\..\src\common\fileconf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fileconf.cpp - -$(OBJS)\monodll_filefn.obj: ..\..\src\common\filefn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filefn.cpp - -$(OBJS)\monodll_filename.obj: ..\..\src\common\filename.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filename.cpp - -$(OBJS)\monodll_filesys.obj: ..\..\src\common\filesys.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filesys.cpp - -$(OBJS)\monodll_filtall.obj: ..\..\src\common\filtall.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filtall.cpp - -$(OBJS)\monodll_filtfind.obj: ..\..\src\common\filtfind.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filtfind.cpp - -$(OBJS)\monodll_fmapbase.obj: ..\..\src\common\fmapbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fmapbase.cpp - -$(OBJS)\monodll_fs_arc.obj: ..\..\src\common\fs_arc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fs_arc.cpp - -$(OBJS)\monodll_fs_filter.obj: ..\..\src\common\fs_filter.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fs_filter.cpp - -$(OBJS)\monodll_hash.obj: ..\..\src\common\hash.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hash.cpp - -$(OBJS)\monodll_hashmap.obj: ..\..\src\common\hashmap.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hashmap.cpp - -$(OBJS)\monodll_init.obj: ..\..\src\common\init.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\init.cpp - -$(OBJS)\monodll_intl.obj: ..\..\src\common\intl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\intl.cpp - -$(OBJS)\monodll_ipcbase.obj: ..\..\src\common\ipcbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ipcbase.cpp - -$(OBJS)\monodll_languageinfo.obj: ..\..\src\common\languageinfo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\languageinfo.cpp - -$(OBJS)\monodll_list.obj: ..\..\src\common\list.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\list.cpp - -$(OBJS)\monodll_log.obj: ..\..\src\common\log.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\log.cpp - -$(OBJS)\monodll_longlong.obj: ..\..\src\common\longlong.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\longlong.cpp - -$(OBJS)\monodll_memory.obj: ..\..\src\common\memory.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\memory.cpp - -$(OBJS)\monodll_mimecmn.obj: ..\..\src\common\mimecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mimecmn.cpp - -$(OBJS)\monodll_module.obj: ..\..\src\common\module.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\module.cpp - -$(OBJS)\monodll_mstream.obj: ..\..\src\common\mstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mstream.cpp - -$(OBJS)\monodll_numformatter.obj: ..\..\src\common\numformatter.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\numformatter.cpp - -$(OBJS)\monodll_object.obj: ..\..\src\common\object.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\object.cpp - -$(OBJS)\monodll_platinfo.obj: ..\..\src\common\platinfo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\platinfo.cpp - -$(OBJS)\monodll_powercmn.obj: ..\..\src\common\powercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\powercmn.cpp - -$(OBJS)\monodll_process.obj: ..\..\src\common\process.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\process.cpp - -$(OBJS)\monodll_regex.obj: ..\..\src\common\regex.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\regex.cpp - -$(OBJS)\monodll_stdpbase.obj: ..\..\src\common\stdpbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stdpbase.cpp - -$(OBJS)\monodll_sstream.obj: ..\..\src\common\sstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sstream.cpp - -$(OBJS)\monodll_stdstream.obj: ..\..\src\common\stdstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stdstream.cpp - -$(OBJS)\monodll_stopwatch.obj: ..\..\src\common\stopwatch.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp - -$(OBJS)\monodll_strconv.obj: ..\..\src\common\strconv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\strconv.cpp - -$(OBJS)\monodll_stream.obj: ..\..\src\common\stream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stream.cpp - -$(OBJS)\monodll_string.obj: ..\..\src\common\string.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\string.cpp - -$(OBJS)\monodll_stringimpl.obj: ..\..\src\common\stringimpl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stringimpl.cpp - -$(OBJS)\monodll_stringops.obj: ..\..\src\common\stringops.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stringops.cpp - -$(OBJS)\monodll_strvararg.obj: ..\..\src\common\strvararg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\strvararg.cpp - -$(OBJS)\monodll_sysopt.obj: ..\..\src\common\sysopt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sysopt.cpp - -$(OBJS)\monodll_tarstrm.obj: ..\..\src\common\tarstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\tarstrm.cpp - -$(OBJS)\monodll_textbuf.obj: ..\..\src\common\textbuf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textbuf.cpp - -$(OBJS)\monodll_textfile.obj: ..\..\src\common\textfile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textfile.cpp - -$(OBJS)\monodll_threadinfo.obj: ..\..\src\common\threadinfo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\threadinfo.cpp - -$(OBJS)\monodll_time.obj: ..\..\src\common\time.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\time.cpp - -$(OBJS)\monodll_timercmn.obj: ..\..\src\common\timercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timercmn.cpp - -$(OBJS)\monodll_timerimpl.obj: ..\..\src\common\timerimpl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\timerimpl.cpp - -$(OBJS)\monodll_tokenzr.obj: ..\..\src\common\tokenzr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\tokenzr.cpp - -$(OBJS)\monodll_translation.obj: ..\..\src\common\translation.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\translation.cpp - -$(OBJS)\monodll_txtstrm.obj: ..\..\src\common\txtstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\txtstrm.cpp - -$(OBJS)\monodll_unichar.obj: ..\..\src\common\unichar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\unichar.cpp - -$(OBJS)\monodll_uri.obj: ..\..\src\common\uri.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\uri.cpp - -$(OBJS)\monodll_ustring.obj: ..\..\src\common\ustring.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ustring.cpp - -$(OBJS)\monodll_variant.obj: ..\..\src\common\variant.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\variant.cpp - -$(OBJS)\monodll_wfstream.obj: ..\..\src\common\wfstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wfstream.cpp - -$(OBJS)\monodll_wxcrt.obj: ..\..\src\common\wxcrt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wxcrt.cpp - -$(OBJS)\monodll_wxprintf.obj: ..\..\src\common\wxprintf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wxprintf.cpp - -$(OBJS)\monodll_xlocale.obj: ..\..\src\common\xlocale.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xlocale.cpp - -$(OBJS)\monodll_xti.obj: ..\..\src\common\xti.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xti.cpp - -$(OBJS)\monodll_xtistrm.obj: ..\..\src\common\xtistrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xtistrm.cpp - -$(OBJS)\monodll_zipstrm.obj: ..\..\src\common\zipstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\zipstrm.cpp - -$(OBJS)\monodll_zstream.obj: ..\..\src\common\zstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\zstream.cpp - -$(OBJS)\monodll_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp - -$(OBJS)\monodll_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp - -$(OBJS)\monodll_basemsw.obj: ..\..\src\msw\basemsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp - -$(OBJS)\monodll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\crashrpt.cpp - -$(OBJS)\monodll_debughlp.obj: ..\..\src\msw\debughlp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\debughlp.cpp - -$(OBJS)\monodll_dde.obj: ..\..\src\msw\dde.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dde.cpp - -$(OBJS)\monodll_dir.obj: ..\..\src\msw\dir.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dir.cpp - -$(OBJS)\monodll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dlmsw.cpp - -$(OBJS)\monodll_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp - -$(OBJS)\monodll_mimetype.obj: ..\..\src\msw\mimetype.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mimetype.cpp - -$(OBJS)\monodll_power.obj: ..\..\src\msw\power.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\power.cpp - -$(OBJS)\monodll_regconf.obj: ..\..\src\msw\regconf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\regconf.cpp - -$(OBJS)\monodll_registry.obj: ..\..\src\msw\registry.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\registry.cpp - -$(OBJS)\monodll_snglinst.obj: ..\..\src\msw\snglinst.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\snglinst.cpp - -$(OBJS)\monodll_stackwalk.obj: ..\..\src\msw\stackwalk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stackwalk.cpp - -$(OBJS)\monodll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stdpaths.cpp - -$(OBJS)\monodll_thread.obj: ..\..\src\msw\thread.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\thread.cpp - -$(OBJS)\monodll_timer.obj: ..\..\src\msw\timer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timer.cpp - -$(OBJS)\monodll_utils.obj: ..\..\src\msw\utils.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utils.cpp - -$(OBJS)\monodll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsexc.cpp - -$(OBJS)\monodll_fswatcher.obj: ..\..\src\msw\fswatcher.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fswatcher.cpp - -$(OBJS)\monodll_event.obj: ..\..\src\common\event.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\event.cpp - -$(OBJS)\monodll_fs_mem.obj: ..\..\src\common\fs_mem.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fs_mem.cpp - -$(OBJS)\monodll_msgout.obj: ..\..\src\common\msgout.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\msgout.cpp - -$(OBJS)\monodll_utilscmn.obj: ..\..\src\common\utilscmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp - -$(OBJS)\monodll_main.obj: ..\..\src\msw\main.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\main.cpp - -$(OBJS)\monodll_mslu.obj: ..\..\src\msw\mslu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mslu.cpp - -$(OBJS)\monodll_volume.obj: ..\..\src\msw\volume.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\volume.cpp - -$(OBJS)\monodll_fs_inet.obj: ..\..\src\common\fs_inet.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp - -$(OBJS)\monodll_ftp.obj: ..\..\src\common\ftp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ftp.cpp - -$(OBJS)\monodll_http.obj: ..\..\src\common\http.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\http.cpp - -$(OBJS)\monodll_protocol.obj: ..\..\src\common\protocol.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\protocol.cpp - -$(OBJS)\monodll_sckaddr.obj: ..\..\src\common\sckaddr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sckaddr.cpp - -$(OBJS)\monodll_sckfile.obj: ..\..\src\common\sckfile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sckfile.cpp - -$(OBJS)\monodll_sckipc.obj: ..\..\src\common\sckipc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sckipc.cpp - -$(OBJS)\monodll_sckstrm.obj: ..\..\src\common\sckstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sckstrm.cpp - -$(OBJS)\monodll_socket.obj: ..\..\src\common\socket.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\socket.cpp - -$(OBJS)\monodll_url.obj: ..\..\src\common\url.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\url.cpp - -$(OBJS)\monodll_sockmsw.obj: ..\..\src\msw\sockmsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sockmsw.cpp - -$(OBJS)\monodll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\urlmsw.cpp - -$(OBJS)\monodll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp - -$(OBJS)\monodll_msw_accel.obj: ..\..\src\msw\accel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\accel.cpp - -$(OBJS)\monodll_anybutton.obj: ..\..\src\msw\anybutton.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp - -$(OBJS)\monodll_artmsw.obj: ..\..\src\msw\artmsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp - -$(OBJS)\monodll_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp - -$(OBJS)\monodll_msw_button.obj: ..\..\src\msw\button.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\button.cpp - -$(OBJS)\monodll_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp - -$(OBJS)\monodll_msw_choice.obj: ..\..\src\msw\choice.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\choice.cpp - -$(OBJS)\monodll_colordlg.obj: ..\..\src\msw\colordlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp - -$(OBJS)\monodll_combo.obj: ..\..\src\msw\combo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combo.cpp - -$(OBJS)\monodll_msw_combobox.obj: ..\..\src\msw\combobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\combobox.cpp - -$(OBJS)\monodll_msw_control.obj: ..\..\src\msw\control.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\control.cpp - -$(OBJS)\monodll_msw_dialog.obj: ..\..\src\msw\dialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialog.cpp - -$(OBJS)\monodll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp - -$(OBJS)\monodll_dragimag.obj: ..\..\src\msw\dragimag.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp - -$(OBJS)\monodll_filedlg.obj: ..\..\src\msw\filedlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\filedlg.cpp - -$(OBJS)\monodll_frame.obj: ..\..\src\msw\frame.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\frame.cpp - -$(OBJS)\monodll_msw_gauge.obj: ..\..\src\msw\gauge.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gauge.cpp - -$(OBJS)\monodll_headerctrl.obj: ..\..\src\msw\headerctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\headerctrl.cpp - -$(OBJS)\monodll_iniconf.obj: ..\..\src\msw\iniconf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp - -$(OBJS)\monodll_msw_listbox.obj: ..\..\src\msw\listbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listbox.cpp - -$(OBJS)\monodll_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp - -$(OBJS)\monodll_mdi.obj: ..\..\src\msw\mdi.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mdi.cpp - -$(OBJS)\monodll_msw_menu.obj: ..\..\src\msw\menu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menu.cpp - -$(OBJS)\monodll_menuitem.obj: ..\..\src\msw\menuitem.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp - -$(OBJS)\monodll_metafile.obj: ..\..\src\msw\metafile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\metafile.cpp - -$(OBJS)\monodll_msgdlg.obj: ..\..\src\msw\msgdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\msgdlg.cpp - -$(OBJS)\monodll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativdlg.cpp - -$(OBJS)\monodll_nativewin.obj: ..\..\src\msw\nativewin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp - -$(OBJS)\monodll_msw_notebook.obj: ..\..\src\msw\notebook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notebook.cpp - -$(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp - -$(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp - -$(OBJS)\monodll_msw_panel.obj: ..\..\src\msw\panel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\panel.cpp - -$(OBJS)\monodll_progdlg.obj: ..\..\src\msw\progdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp - -$(OBJS)\monodll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp - -$(OBJS)\monodll_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp - -$(OBJS)\monodll_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp - -$(OBJS)\monodll_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp - -$(OBJS)\monodll_msw_slider.obj: ..\..\src\msw\slider.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\slider.cpp - -$(OBJS)\monodll_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp - -$(OBJS)\monodll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp - -$(OBJS)\monodll_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp - -$(OBJS)\monodll_msw_statbox.obj: ..\..\src\msw\statbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statbox.cpp - -$(OBJS)\monodll_statusbar.obj: ..\..\src\msw\statusbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp - -$(OBJS)\monodll_msw_statline.obj: ..\..\src\msw\statline.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\statline.cpp - -$(OBJS)\monodll_msw_stattext.obj: ..\..\src\msw\stattext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\stattext.cpp - -$(OBJS)\monodll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp - -$(OBJS)\monodll_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp - -$(OBJS)\monodll_textentry.obj: ..\..\src\msw\textentry.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textentry.cpp - -$(OBJS)\monodll_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp - -$(OBJS)\monodll_treectrl.obj: ..\..\src\msw\treectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp - -$(OBJS)\monodll_msw_checklst.obj: ..\..\src\msw\checklst.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\checklst.cpp - -$(OBJS)\monodll_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp - -$(OBJS)\monodll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp - -$(OBJS)\monodll_generic_accel.obj: ..\..\src\generic\accel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\accel.cpp - -$(OBJS)\monodll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp - -$(OBJS)\monodll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp - -$(OBJS)\monodll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp - -$(OBJS)\monodll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp - -$(OBJS)\monodll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp - -$(OBJS)\monodll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp - -$(OBJS)\monodll_mdig.obj: ..\..\src\generic\mdig.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\mdig.cpp - -$(OBJS)\monodll_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp - -$(OBJS)\monodll_univ_button.obj: ..\..\src\univ\button.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\button.cpp - -$(OBJS)\monodll_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp - -$(OBJS)\monodll_univ_checklst.obj: ..\..\src\univ\checklst.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\checklst.cpp - -$(OBJS)\monodll_univ_choice.obj: ..\..\src\univ\choice.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\choice.cpp - -$(OBJS)\monodll_univ_combobox.obj: ..\..\src\univ\combobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\combobox.cpp - -$(OBJS)\monodll_univ_control.obj: ..\..\src\univ\control.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\control.cpp - -$(OBJS)\monodll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp - -$(OBJS)\monodll_univ_dialog.obj: ..\..\src\univ\dialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\dialog.cpp - -$(OBJS)\monodll_framuniv.obj: ..\..\src\univ\framuniv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp - -$(OBJS)\monodll_univ_gauge.obj: ..\..\src\univ\gauge.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\gauge.cpp - -$(OBJS)\monodll_inpcons.obj: ..\..\src\univ\inpcons.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp - -$(OBJS)\monodll_inphand.obj: ..\..\src\univ\inphand.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\inphand.cpp - -$(OBJS)\monodll_univ_listbox.obj: ..\..\src\univ\listbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\listbox.cpp - -$(OBJS)\monodll_univ_menu.obj: ..\..\src\univ\menu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\menu.cpp - -$(OBJS)\monodll_univ_notebook.obj: ..\..\src\univ\notebook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\notebook.cpp - -$(OBJS)\monodll_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp - -$(OBJS)\monodll_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp - -$(OBJS)\monodll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp - -$(OBJS)\monodll_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp - -$(OBJS)\monodll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp - -$(OBJS)\monodll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp - -$(OBJS)\monodll_univ_slider.obj: ..\..\src\univ\slider.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\slider.cpp - -$(OBJS)\monodll_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp - -$(OBJS)\monodll_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp - -$(OBJS)\monodll_univ_statbox.obj: ..\..\src\univ\statbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statbox.cpp - -$(OBJS)\monodll_univ_statline.obj: ..\..\src\univ\statline.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statline.cpp - -$(OBJS)\monodll_univ_stattext.obj: ..\..\src\univ\stattext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stattext.cpp - -$(OBJS)\monodll_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp - -$(OBJS)\monodll_stdrend.obj: ..\..\src\univ\stdrend.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp - -$(OBJS)\monodll_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp - -$(OBJS)\monodll_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp - -$(OBJS)\monodll_theme.obj: ..\..\src\univ\theme.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\theme.cpp - -$(OBJS)\monodll_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp - -$(OBJS)\monodll_topluniv.obj: ..\..\src\univ\topluniv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp - -$(OBJS)\monodll_winuniv.obj: ..\..\src\univ\winuniv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\winuniv.cpp - -$(OBJS)\monodll_gtk.obj: ..\..\src\univ\themes\gtk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp - -$(OBJS)\monodll_metal.obj: ..\..\src\univ\themes\metal.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\metal.cpp - -$(OBJS)\monodll_mono.obj: ..\..\src\univ\themes\mono.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\mono.cpp - -$(OBJS)\monodll_win32.obj: ..\..\src\univ\themes\win32.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp - -$(OBJS)\monodll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp - -$(OBJS)\monodll_calctrl.obj: ..\..\src\msw\calctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp - -$(OBJS)\monodll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp - -$(OBJS)\monodll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp - -$(OBJS)\monodll_datectrl.obj: ..\..\src\msw\datectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp - -$(OBJS)\monodll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp - -$(OBJS)\monodll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp - -$(OBJS)\monodll_timectrl.obj: ..\..\src\msw\timectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp - -$(OBJS)\monodll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp - -$(OBJS)\monodll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp - -$(OBJS)\monodll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp - -$(OBJS)\monodll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp - -$(OBJS)\monodll_helpbest.obj: ..\..\src\msw\helpbest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp - -$(OBJS)\monodll_helpctrl.obj: ..\..\src\html\helpctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpctrl.cpp - -$(OBJS)\monodll_helpdata.obj: ..\..\src\html\helpdata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpdata.cpp - -$(OBJS)\monodll_helpdlg.obj: ..\..\src\html\helpdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpdlg.cpp - -$(OBJS)\monodll_helpfrm.obj: ..\..\src\html\helpfrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpfrm.cpp - -$(OBJS)\monodll_helpwnd.obj: ..\..\src\html\helpwnd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\helpwnd.cpp - -$(OBJS)\monodll_htmlcell.obj: ..\..\src\html\htmlcell.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlcell.cpp - -$(OBJS)\monodll_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlfilt.cpp - -$(OBJS)\monodll_htmlpars.obj: ..\..\src\html\htmlpars.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlpars.cpp - -$(OBJS)\monodll_htmltag.obj: ..\..\src\html\htmltag.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmltag.cpp - -$(OBJS)\monodll_htmlwin.obj: ..\..\src\html\htmlwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmlwin.cpp - -$(OBJS)\monodll_htmprint.obj: ..\..\src\html\htmprint.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\htmprint.cpp - -$(OBJS)\monodll_m_dflist.obj: ..\..\src\html\m_dflist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_dflist.cpp - -$(OBJS)\monodll_m_fonts.obj: ..\..\src\html\m_fonts.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_fonts.cpp - -$(OBJS)\monodll_m_hline.obj: ..\..\src\html\m_hline.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_hline.cpp - -$(OBJS)\monodll_m_image.obj: ..\..\src\html\m_image.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_image.cpp - -$(OBJS)\monodll_m_layout.obj: ..\..\src\html\m_layout.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_layout.cpp - -$(OBJS)\monodll_m_links.obj: ..\..\src\html\m_links.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_links.cpp - -$(OBJS)\monodll_m_list.obj: ..\..\src\html\m_list.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_list.cpp - -$(OBJS)\monodll_m_pre.obj: ..\..\src\html\m_pre.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_pre.cpp - -$(OBJS)\monodll_m_span.obj: ..\..\src\html\m_span.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_span.cpp - -$(OBJS)\monodll_m_style.obj: ..\..\src\html\m_style.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_style.cpp - -$(OBJS)\monodll_m_tables.obj: ..\..\src\html\m_tables.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\m_tables.cpp - -$(OBJS)\monodll_styleparams.obj: ..\..\src\html\styleparams.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\styleparams.cpp - -$(OBJS)\monodll_winpars.obj: ..\..\src\html\winpars.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\html\winpars.cpp - -$(OBJS)\monodll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\htmllbox.cpp - -$(OBJS)\monodll_webview_ie.obj: ..\..\src\msw\webview_ie.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\webview_ie.cpp - -$(OBJS)\monodll_webview.obj: ..\..\src\common\webview.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webview.cpp - -$(OBJS)\monodll_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp - -$(OBJS)\monodll_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp - -$(OBJS)\monodll_debugrpt.obj: ..\..\src\common\debugrpt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp - -$(OBJS)\monodll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp - -$(OBJS)\monodll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp - -$(OBJS)\monodll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp - -$(OBJS)\monodll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp - -$(OBJS)\monodll_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp - -$(OBJS)\monodll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp - -$(OBJS)\monodll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp - -$(OBJS)\monodll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp - -$(OBJS)\monodll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp - -$(OBJS)\monodll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp - -$(OBJS)\monodll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp - -$(OBJS)\monodll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp - -$(OBJS)\monodll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp - -$(OBJS)\monodll_xh_cmdlinkbn.obj: ..\..\src\xrc\xh_cmdlinkbn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_cmdlinkbn.cpp - -$(OBJS)\monodll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp - -$(OBJS)\monodll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp - -$(OBJS)\monodll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp - -$(OBJS)\monodll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp - -$(OBJS)\monodll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp - -$(OBJS)\monodll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp - -$(OBJS)\monodll_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp - -$(OBJS)\monodll_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp - -$(OBJS)\monodll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp - -$(OBJS)\monodll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp - -$(OBJS)\monodll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp - -$(OBJS)\monodll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp - -$(OBJS)\monodll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp - -$(OBJS)\monodll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp - -$(OBJS)\monodll_xh_html.obj: ..\..\src\xrc\xh_html.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_html.cpp - -$(OBJS)\monodll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp - -$(OBJS)\monodll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp - -$(OBJS)\monodll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp - -$(OBJS)\monodll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp - -$(OBJS)\monodll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp - -$(OBJS)\monodll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp - -$(OBJS)\monodll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp - -$(OBJS)\monodll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp - -$(OBJS)\monodll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp - -$(OBJS)\monodll_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp - -$(OBJS)\monodll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp - -$(OBJS)\monodll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp - -$(OBJS)\monodll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp - -$(OBJS)\monodll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp - -$(OBJS)\monodll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp - -$(OBJS)\monodll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp - -$(OBJS)\monodll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp - -$(OBJS)\monodll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp - -$(OBJS)\monodll_xh_split.obj: ..\..\src\xrc\xh_split.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_split.cpp - -$(OBJS)\monodll_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp - -$(OBJS)\monodll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp - -$(OBJS)\monodll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp - -$(OBJS)\monodll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp - -$(OBJS)\monodll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp - -$(OBJS)\monodll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp - -$(OBJS)\monodll_xh_text.obj: ..\..\src\xrc\xh_text.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp - -$(OBJS)\monodll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp - -$(OBJS)\monodll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp - -$(OBJS)\monodll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp - -$(OBJS)\monodll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp - -$(OBJS)\monodll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp - -$(OBJS)\monodll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp - -$(OBJS)\monodll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp - -$(OBJS)\monodll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp - -$(OBJS)\monodll_xmlres.obj: ..\..\src\xrc\xmlres.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp - -$(OBJS)\monodll_xmladv.obj: ..\..\src\xrc\xmladv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmladv.cpp - -$(OBJS)\monodll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp - -$(OBJS)\monodll_framemanager.obj: ..\..\src\aui\framemanager.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp - -$(OBJS)\monodll_dockart.obj: ..\..\src\aui\dockart.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\dockart.cpp - -$(OBJS)\monodll_floatpane.obj: ..\..\src\aui\floatpane.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\floatpane.cpp - -$(OBJS)\monodll_auibook.obj: ..\..\src\aui\auibook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\auibook.cpp - -$(OBJS)\monodll_auibar.obj: ..\..\src\aui\auibar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\auibar.cpp - -$(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp - -$(OBJS)\monodll_tabart.obj: ..\..\src\aui\tabart.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabart.cpp - -$(OBJS)\monodll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp - -$(OBJS)\monodll_advprops.obj: ..\..\src\propgrid\advprops.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp - -$(OBJS)\monodll_editors.obj: ..\..\src\propgrid\editors.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\editors.cpp - -$(OBJS)\monodll_manager.obj: ..\..\src\propgrid\manager.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\manager.cpp - -$(OBJS)\monodll_property.obj: ..\..\src\propgrid\property.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\property.cpp - -$(OBJS)\monodll_propgrid.obj: ..\..\src\propgrid\propgrid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp - -$(OBJS)\monodll_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp - -$(OBJS)\monodll_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp - -$(OBJS)\monodll_props.obj: ..\..\src\propgrid\props.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\props.cpp - -$(OBJS)\monodll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp - -$(OBJS)\monodll_art_msw.obj: ..\..\src\ribbon\art_msw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp - -$(OBJS)\monodll_art_aui.obj: ..\..\src\ribbon\art_aui.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp - -$(OBJS)\monodll_bar.obj: ..\..\src\ribbon\bar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\bar.cpp - -$(OBJS)\monodll_ribbon_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp - -$(OBJS)\monodll_ribbon_control.obj: ..\..\src\ribbon\control.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\control.cpp - -$(OBJS)\monodll_gallery.obj: ..\..\src\ribbon\gallery.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\gallery.cpp - -$(OBJS)\monodll_page.obj: ..\..\src\ribbon\page.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\page.cpp - -$(OBJS)\monodll_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp - -$(OBJS)\monodll_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp - -$(OBJS)\monodll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp - -$(OBJS)\monodll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp - -$(OBJS)\monodll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp - -$(OBJS)\monodll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp - -$(OBJS)\monodll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp - -$(OBJS)\monodll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp - -$(OBJS)\monodll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp - -$(OBJS)\monodll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp - -$(OBJS)\monodll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp - -$(OBJS)\monodll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp - -$(OBJS)\monodll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp - -$(OBJS)\monodll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp - -$(OBJS)\monodll_stc.obj: ..\..\src\stc\stc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\stc.cpp - -$(OBJS)\monodll_PlatWX.obj: ..\..\src\stc\PlatWX.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\PlatWX.cpp - -$(OBJS)\monodll_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp - -$(OBJS)\monodll_xml.obj: ..\..\src\xml\xml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xml\xml.cpp - -$(OBJS)\monodll_xtixml.obj: ..\..\src\common\xtixml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xtixml.cpp - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_activex.obj: ..\..\src\msw\ole\activex.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_app.obj: ..\..\src\msw\app.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\app.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bitmap.obj: ..\..\src\msw\bitmap.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\bitmap.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_brush.obj: ..\..\src\msw\brush.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\brush.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_caret.obj: ..\..\src\msw\caret.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\caret.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_clipbrd.obj: ..\..\src\msw\clipbrd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\clipbrd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_colour.obj: ..\..\src\msw\colour.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\colour.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_cursor.obj: ..\..\src\msw\cursor.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\cursor.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_data.obj: ..\..\src\msw\data.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\data.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dc.obj: ..\..\src\msw\dc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcclient.obj: ..\..\src\msw\dcclient.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcclient.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcmemory.obj: ..\..\src\msw\dcmemory.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcmemory.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcprint.obj: ..\..\src\msw\dcprint.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcprint.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcscreen.obj: ..\..\src\msw\dcscreen.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dcscreen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dialup.obj: ..\..\src\msw\dialup.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dialup.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dib.obj: ..\..\src\msw\dib.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\dib.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_display.obj: ..\..\src\msw\display.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\display.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\enhmeta.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_font.obj: ..\..\src\msw\font.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\font.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontenum.obj: ..\..\src\msw\fontenum.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontenum.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontutil.obj: ..\..\src\msw\fontutil.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\fontutil.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiimage.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiobj.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\gdiplus.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_graphics.obj: ..\..\src\msw\graphics.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\graphics.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_icon.obj: ..\..\src\msw\icon.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\icon.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imaglist.obj: ..\..\src\msw\imaglist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_minifram.obj: ..\..\src\msw\minifram.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\minifram.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_safearray.obj: ..\..\src\msw\ole\safearray.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_palette.obj: ..\..\src\msw\palette.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\palette.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_pen.obj: ..\..\src\msw\pen.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\pen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_popupwin.obj: ..\..\src\msw\popupwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\popupwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_printdlg.obj: ..\..\src\msw\printdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\printdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_printwin.obj: ..\..\src\msw\printwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\printwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_region.obj: ..\..\src\msw\region.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\region.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_renderer.obj: ..\..\src\msw\renderer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\renderer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_settings.obj: ..\..\src\msw\settings.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\settings.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_tooltip.obj: ..\..\src\msw\tooltip.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_toplevel.obj: ..\..\src\msw\toplevel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_uiaction.obj: ..\..\src\msw\uiaction.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_utilswin.obj: ..\..\src\msw\utilswin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\utilswin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_window.obj: ..\..\src\msw\window.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\window.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_helpchm.obj: ..\..\src\msw\helpchm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpchm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_helpwin.obj: ..\..\src\msw\helpwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\helpwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_automtn.obj: ..\..\src\msw\ole\automtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\collpaneg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filepickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_accesscmn.obj: ..\..\src\common\accesscmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accesscmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_anidecod.obj: ..\..\src\common\anidecod.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\anidecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_appcmn.obj: ..\..\src\common\appcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\appcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_artprov.obj: ..\..\src\common\artprov.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artprov.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_artstd.obj: ..\..\src\common\artstd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\artstd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_arttango.obj: ..\..\src\common\arttango.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\arttango.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bmpbase.obj: ..\..\src\common\bmpbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_btncmn.obj: ..\..\src\common\btncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\btncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_cairo.obj: ..\..\src\common\cairo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cairo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_clipcmn.obj: ..\..\src\common\clipcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clipcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_colourcmn.obj: ..\..\src\common\colourcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_colourdata.obj: ..\..\src\common\colourdata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\colourdata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_combocmn.obj: ..\..\src\common\combocmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\combocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_cmdproc.obj: ..\..\src\common\cmdproc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cmdproc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_cmndata.obj: ..\..\src\common\cmndata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cmndata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_containr.obj: ..\..\src\common\containr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\containr.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_cshelp.obj: ..\..\src\common\cshelp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\cshelp.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcbase.obj: ..\..\src\common\dcbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcgraph.obj: ..\..\src\common\dcgraph.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcgraph.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcsvg.obj: ..\..\src\common\dcsvg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dndcmn.obj: ..\..\src\common\dndcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dndcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dobjcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_docmdi.obj: ..\..\src\common\docmdi.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\docmdi.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_docview.obj: ..\..\src\common\docview.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\docview.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dpycmn.obj: ..\..\src\common\dpycmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dpycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dseldlg.obj: ..\..\src\common\dseldlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\dseldlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_effects.obj: ..\..\src\common\effects.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\effects.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_filehistorycmn.obj: ..\..\src\common\filehistorycmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filehistorycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\filepickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontcmn.obj: ..\..\src\common\fontcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontdata.obj: ..\..\src\common\fontdata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontdata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_graphicc.obj: ..\..\src\generic\graphicc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\graphicc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontmap.obj: ..\..\src\common\fontmap.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontmap.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_framecmn.obj: ..\..\src\common\framecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\framecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gaugecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gbsizer.obj: ..\..\src\common\gbsizer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gbsizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gdicmn.obj: ..\..\src\common\gdicmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gdicmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_geometry.obj: ..\..\src\common\geometry.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\geometry.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gifdecod.obj: ..\..\src\common\gifdecod.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gifdecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_graphcmn.obj: ..\..\src\common\graphcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_helpbase.obj: ..\..\src\common\helpbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\helpbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_iconbndl.obj: ..\..\src\common\iconbndl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\iconbndl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagall.obj: ..\..\src\common\imagall.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagall.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagbmp.obj: ..\..\src\common\imagbmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagbmp.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_image.obj: ..\..\src\common\image.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\image.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagfill.obj: ..\..\src\common\imagfill.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagfill.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imaggif.obj: ..\..\src\common\imaggif.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imaggif.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagiff.obj: ..\..\src\common\imagiff.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagiff.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagjpeg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagpcx.obj: ..\..\src\common\imagpcx.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagpcx.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagpng.obj: ..\..\src\common\imagpng.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagpng.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagpnm.obj: ..\..\src\common\imagpnm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagpnm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagtga.obj: ..\..\src\common\imagtga.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagtga.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagtiff.obj: ..\..\src\common\imagtiff.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagtiff.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_imagxpm.obj: ..\..\src\common\imagxpm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\imagxpm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_layout.obj: ..\..\src\common\layout.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\layout.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\lboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_markupparser.obj: ..\..\src\common\markupparser.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\markupparser.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_matrix.obj: ..\..\src\common\matrix.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\matrix.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_menucmn.obj: ..\..\src\common\menucmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\menucmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_modalhook.obj: ..\..\src\common\modalhook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\modalhook.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_mousemanager.obj: ..\..\src\common\mousemanager.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_panelcmn.obj: ..\..\src\common\panelcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\persist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_pickerbase.obj: ..\..\src\common\pickerbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\preferencescmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_prntbase.obj: ..\..\src\common\prntbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\prntbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_quantize.obj: ..\..\src\common\quantize.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\quantize.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_radiocmn.obj: ..\..\src\common\radiocmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_rendcmn.obj: ..\..\src\common\rendcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rendcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_rgncmn.obj: ..\..\src\common\rgncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_settcmn.obj: ..\..\src\common\settcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\settcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_sizer.obj: ..\..\src\common\sizer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\sizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_slidercmn.obj: ..\..\src\common\slidercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_srchcmn.obj: ..\..\src\common\srchcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\srchcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_statbar.obj: ..\..\src\common\statbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_stockitem.obj: ..\..\src\common\stockitem.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\stockitem.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_tbarbase.obj: ..\..\src\common\tbarbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\tbarbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_textcmn.obj: ..\..\src\common\textcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_treebase.obj: ..\..\src\common\treebase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\treebase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_uiactioncmn.obj: ..\..\src\common\uiactioncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\uiactioncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_valgen.obj: ..\..\src\common\valgen.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valgen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_validate.obj: ..\..\src\common\validate.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\validate.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_valtext.obj: ..\..\src\common\valtext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valtext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_valnum.obj: ..\..\src\common\valnum.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\valnum.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_wincmn.obj: ..\..\src\common\wincmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wincmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_windowid.obj: ..\..\src\common\windowid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\windowid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\busyinfo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_generic_buttonbar.obj: ..\..\src\generic\buttonbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\buttonbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\choicdgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\choicbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\combog.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dcpsg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\dragimgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_filectrlg.obj: ..\..\src\generic\filectrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\filectrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_infobar.obj: ..\..\src\generic\infobar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\infobar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_listbkg.obj: ..\..\src\generic\listbkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_logg.obj: ..\..\src\generic\logg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\logg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_markuptext.obj: ..\..\src\generic\markuptext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\markuptext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\numdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_preferencesg.obj: ..\..\src\generic\preferencesg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\preferencesg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_printps.obj: ..\..\src\generic\printps.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\printps.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_renderg.obj: ..\..\src\generic\renderg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\renderg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\scrlwing.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_selstore.obj: ..\..\src\generic\selstore.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\selstore.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_spinctlg.obj: ..\..\src\generic\spinctlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\spinctlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_splitter.obj: ..\..\src\generic\splitter.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splitter.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\srchctlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_statbmpg.obj: ..\..\src\generic\statbmpg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\statbmpg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_stattextg.obj: ..\..\src\generic\stattextg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_tipwin.obj: ..\..\src\generic\tipwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_treectlg.obj: ..\..\src\generic\treectlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_treebkg.obj: ..\..\src\generic\treebkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_vlbox.obj: ..\..\src\generic\vlbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vlbox.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_vscroll.obj: ..\..\src\generic\vscroll.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_animatecmn.obj: ..\..\src\common\animatecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gridcmn.obj: ..\..\src\common\gridcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_datavgen.obj: ..\..\src\generic\datavgen.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\datavgen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_datectlg.obj: ..\..\src\generic\datectlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\datectlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_editlbox.obj: ..\..\src\generic\editlbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\editlbox.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_grid.obj: ..\..\src\generic\grid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\grid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\gridctrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_grideditors.obj: ..\..\src\generic\grideditors.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\grideditors.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_gridsel.obj: ..\..\src\generic\gridsel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\gridsel.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_helpext.obj: ..\..\src\generic\helpext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\helpext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_laywin.obj: ..\..\src\generic\laywin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\laywin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_odcombo.obj: ..\..\src\generic\odcombo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_propdlg.obj: ..\..\src\generic\propdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_sashwin.obj: ..\..\src\generic\sashwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_splash.obj: ..\..\src\generic\splash.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\splash.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_timectrlg.obj: ..\..\src\generic\timectrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\timectrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_treelist.obj: ..\..\src\generic\treelist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\treelist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_wizard.obj: ..\..\src\generic\wizard.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\wizard.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_sound.obj: ..\..\src\msw\sound.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\sound.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_taskbar.obj: ..\..\src\msw\taskbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_joystick.obj: ..\..\src\msw\joystick.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\joystick.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monodll_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\animateg.cpp -!endif - -$(OBJS)\monodll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\lexlib /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d wxUSE_BASE=1 /d WXMAKINGDLL ..\..\src\msw\version.rc - -$(OBJS)\monolib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\monolib_any.obj: ..\..\src\common\any.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\any.cpp - -$(OBJS)\monolib_appbase.obj: ..\..\src\common\appbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appbase.cpp - -$(OBJS)\monolib_arcall.obj: ..\..\src\common\arcall.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arcall.cpp - -$(OBJS)\monolib_arcfind.obj: ..\..\src\common\arcfind.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arcfind.cpp - -$(OBJS)\monolib_archive.obj: ..\..\src\common\archive.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\archive.cpp - -$(OBJS)\monolib_arrstr.obj: ..\..\src\common\arrstr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arrstr.cpp - -$(OBJS)\monolib_base64.obj: ..\..\src\common\base64.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\base64.cpp - -$(OBJS)\monolib_clntdata.obj: ..\..\src\common\clntdata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clntdata.cpp - -$(OBJS)\monolib_cmdline.obj: ..\..\src\common\cmdline.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmdline.cpp - -$(OBJS)\monolib_config.obj: ..\..\src\common\config.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\config.cpp - -$(OBJS)\monolib_convauto.obj: ..\..\src\common\convauto.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\convauto.cpp - -$(OBJS)\monolib_datetime.obj: ..\..\src\common\datetime.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datetime.cpp - -$(OBJS)\monolib_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datetimefmt.cpp - -$(OBJS)\monolib_datstrm.obj: ..\..\src\common\datstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datstrm.cpp - -$(OBJS)\monolib_dircmn.obj: ..\..\src\common\dircmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dircmn.cpp - -$(OBJS)\monolib_dynarray.obj: ..\..\src\common\dynarray.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynarray.cpp - -$(OBJS)\monolib_dynlib.obj: ..\..\src\common\dynlib.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynlib.cpp - -$(OBJS)\monolib_dynload.obj: ..\..\src\common\dynload.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dynload.cpp - -$(OBJS)\monolib_encconv.obj: ..\..\src\common\encconv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\encconv.cpp - -$(OBJS)\monolib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp - -$(OBJS)\monolib_extended.obj: ..\..\src\common\extended.c - $(CC) /c /nologo /TC /Fo$@ $(MONOLIB_CFLAGS) ..\..\src\common\extended.c - -$(OBJS)\monolib_ffile.obj: ..\..\src\common\ffile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ffile.cpp - -$(OBJS)\monolib_file.obj: ..\..\src\common\file.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\file.cpp - -$(OBJS)\monolib_fileback.obj: ..\..\src\common\fileback.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fileback.cpp - -$(OBJS)\monolib_fileconf.obj: ..\..\src\common\fileconf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fileconf.cpp - -$(OBJS)\monolib_filefn.obj: ..\..\src\common\filefn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filefn.cpp - -$(OBJS)\monolib_filename.obj: ..\..\src\common\filename.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filename.cpp - -$(OBJS)\monolib_filesys.obj: ..\..\src\common\filesys.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filesys.cpp - -$(OBJS)\monolib_filtall.obj: ..\..\src\common\filtall.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filtall.cpp - -$(OBJS)\monolib_filtfind.obj: ..\..\src\common\filtfind.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filtfind.cpp - -$(OBJS)\monolib_fmapbase.obj: ..\..\src\common\fmapbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fmapbase.cpp - -$(OBJS)\monolib_fs_arc.obj: ..\..\src\common\fs_arc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_arc.cpp - -$(OBJS)\monolib_fs_filter.obj: ..\..\src\common\fs_filter.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_filter.cpp - -$(OBJS)\monolib_hash.obj: ..\..\src\common\hash.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hash.cpp - -$(OBJS)\monolib_hashmap.obj: ..\..\src\common\hashmap.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hashmap.cpp - -$(OBJS)\monolib_init.obj: ..\..\src\common\init.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\init.cpp - -$(OBJS)\monolib_intl.obj: ..\..\src\common\intl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\intl.cpp - -$(OBJS)\monolib_ipcbase.obj: ..\..\src\common\ipcbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ipcbase.cpp - -$(OBJS)\monolib_languageinfo.obj: ..\..\src\common\languageinfo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\languageinfo.cpp - -$(OBJS)\monolib_list.obj: ..\..\src\common\list.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\list.cpp - -$(OBJS)\monolib_log.obj: ..\..\src\common\log.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\log.cpp - -$(OBJS)\monolib_longlong.obj: ..\..\src\common\longlong.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\longlong.cpp - -$(OBJS)\monolib_memory.obj: ..\..\src\common\memory.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\memory.cpp - -$(OBJS)\monolib_mimecmn.obj: ..\..\src\common\mimecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mimecmn.cpp - -$(OBJS)\monolib_module.obj: ..\..\src\common\module.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\module.cpp - -$(OBJS)\monolib_mstream.obj: ..\..\src\common\mstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mstream.cpp - -$(OBJS)\monolib_numformatter.obj: ..\..\src\common\numformatter.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\numformatter.cpp - -$(OBJS)\monolib_object.obj: ..\..\src\common\object.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\object.cpp - -$(OBJS)\monolib_platinfo.obj: ..\..\src\common\platinfo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\platinfo.cpp - -$(OBJS)\monolib_powercmn.obj: ..\..\src\common\powercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\powercmn.cpp - -$(OBJS)\monolib_process.obj: ..\..\src\common\process.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\process.cpp - -$(OBJS)\monolib_regex.obj: ..\..\src\common\regex.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\regex.cpp - -$(OBJS)\monolib_stdpbase.obj: ..\..\src\common\stdpbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stdpbase.cpp - -$(OBJS)\monolib_sstream.obj: ..\..\src\common\sstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sstream.cpp - -$(OBJS)\monolib_stdstream.obj: ..\..\src\common\stdstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stdstream.cpp - -$(OBJS)\monolib_stopwatch.obj: ..\..\src\common\stopwatch.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp - -$(OBJS)\monolib_strconv.obj: ..\..\src\common\strconv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\strconv.cpp - -$(OBJS)\monolib_stream.obj: ..\..\src\common\stream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stream.cpp - -$(OBJS)\monolib_string.obj: ..\..\src\common\string.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\string.cpp - -$(OBJS)\monolib_stringimpl.obj: ..\..\src\common\stringimpl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stringimpl.cpp - -$(OBJS)\monolib_stringops.obj: ..\..\src\common\stringops.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stringops.cpp - -$(OBJS)\monolib_strvararg.obj: ..\..\src\common\strvararg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\strvararg.cpp - -$(OBJS)\monolib_sysopt.obj: ..\..\src\common\sysopt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sysopt.cpp - -$(OBJS)\monolib_tarstrm.obj: ..\..\src\common\tarstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\tarstrm.cpp - -$(OBJS)\monolib_textbuf.obj: ..\..\src\common\textbuf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textbuf.cpp - -$(OBJS)\monolib_textfile.obj: ..\..\src\common\textfile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textfile.cpp - -$(OBJS)\monolib_threadinfo.obj: ..\..\src\common\threadinfo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\threadinfo.cpp - -$(OBJS)\monolib_time.obj: ..\..\src\common\time.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\time.cpp - -$(OBJS)\monolib_timercmn.obj: ..\..\src\common\timercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timercmn.cpp - -$(OBJS)\monolib_timerimpl.obj: ..\..\src\common\timerimpl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\timerimpl.cpp - -$(OBJS)\monolib_tokenzr.obj: ..\..\src\common\tokenzr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\tokenzr.cpp - -$(OBJS)\monolib_translation.obj: ..\..\src\common\translation.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\translation.cpp - -$(OBJS)\monolib_txtstrm.obj: ..\..\src\common\txtstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\txtstrm.cpp - -$(OBJS)\monolib_unichar.obj: ..\..\src\common\unichar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\unichar.cpp - -$(OBJS)\monolib_uri.obj: ..\..\src\common\uri.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\uri.cpp - -$(OBJS)\monolib_ustring.obj: ..\..\src\common\ustring.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ustring.cpp - -$(OBJS)\monolib_variant.obj: ..\..\src\common\variant.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\variant.cpp - -$(OBJS)\monolib_wfstream.obj: ..\..\src\common\wfstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wfstream.cpp - -$(OBJS)\monolib_wxcrt.obj: ..\..\src\common\wxcrt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wxcrt.cpp - -$(OBJS)\monolib_wxprintf.obj: ..\..\src\common\wxprintf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wxprintf.cpp - -$(OBJS)\monolib_xlocale.obj: ..\..\src\common\xlocale.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xlocale.cpp - -$(OBJS)\monolib_xti.obj: ..\..\src\common\xti.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xti.cpp - -$(OBJS)\monolib_xtistrm.obj: ..\..\src\common\xtistrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xtistrm.cpp - -$(OBJS)\monolib_zipstrm.obj: ..\..\src\common\zipstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\zipstrm.cpp - -$(OBJS)\monolib_zstream.obj: ..\..\src\common\zstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\zstream.cpp - -$(OBJS)\monolib_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp - -$(OBJS)\monolib_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp - -$(OBJS)\monolib_basemsw.obj: ..\..\src\msw\basemsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp - -$(OBJS)\monolib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\crashrpt.cpp - -$(OBJS)\monolib_debughlp.obj: ..\..\src\msw\debughlp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\debughlp.cpp - -$(OBJS)\monolib_dde.obj: ..\..\src\msw\dde.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dde.cpp - -$(OBJS)\monolib_dir.obj: ..\..\src\msw\dir.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dir.cpp - -$(OBJS)\monolib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp - -$(OBJS)\monolib_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp - -$(OBJS)\monolib_mimetype.obj: ..\..\src\msw\mimetype.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp - -$(OBJS)\monolib_power.obj: ..\..\src\msw\power.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\power.cpp - -$(OBJS)\monolib_regconf.obj: ..\..\src\msw\regconf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\regconf.cpp - -$(OBJS)\monolib_registry.obj: ..\..\src\msw\registry.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\registry.cpp - -$(OBJS)\monolib_snglinst.obj: ..\..\src\msw\snglinst.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\snglinst.cpp - -$(OBJS)\monolib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stackwalk.cpp - -$(OBJS)\monolib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stdpaths.cpp - -$(OBJS)\monolib_thread.obj: ..\..\src\msw\thread.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\thread.cpp - -$(OBJS)\monolib_timer.obj: ..\..\src\msw\timer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timer.cpp - -$(OBJS)\monolib_utils.obj: ..\..\src\msw\utils.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utils.cpp - -$(OBJS)\monolib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp - -$(OBJS)\monolib_fswatcher.obj: ..\..\src\msw\fswatcher.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fswatcher.cpp - -$(OBJS)\monolib_event.obj: ..\..\src\common\event.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\event.cpp - -$(OBJS)\monolib_fs_mem.obj: ..\..\src\common\fs_mem.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_mem.cpp - -$(OBJS)\monolib_msgout.obj: ..\..\src\common\msgout.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\msgout.cpp - -$(OBJS)\monolib_utilscmn.obj: ..\..\src\common\utilscmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp - -$(OBJS)\monolib_main.obj: ..\..\src\msw\main.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\main.cpp - -$(OBJS)\monolib_mslu.obj: ..\..\src\msw\mslu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mslu.cpp - -$(OBJS)\monolib_volume.obj: ..\..\src\msw\volume.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\volume.cpp - -$(OBJS)\monolib_fs_inet.obj: ..\..\src\common\fs_inet.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fs_inet.cpp - -$(OBJS)\monolib_ftp.obj: ..\..\src\common\ftp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ftp.cpp - -$(OBJS)\monolib_http.obj: ..\..\src\common\http.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\http.cpp - -$(OBJS)\monolib_protocol.obj: ..\..\src\common\protocol.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\protocol.cpp - -$(OBJS)\monolib_sckaddr.obj: ..\..\src\common\sckaddr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckaddr.cpp - -$(OBJS)\monolib_sckfile.obj: ..\..\src\common\sckfile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckfile.cpp - -$(OBJS)\monolib_sckipc.obj: ..\..\src\common\sckipc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckipc.cpp - -$(OBJS)\monolib_sckstrm.obj: ..\..\src\common\sckstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sckstrm.cpp - -$(OBJS)\monolib_socket.obj: ..\..\src\common\socket.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\socket.cpp - -$(OBJS)\monolib_url.obj: ..\..\src\common\url.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\url.cpp - -$(OBJS)\monolib_sockmsw.obj: ..\..\src\msw\sockmsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sockmsw.cpp - -$(OBJS)\monolib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\urlmsw.cpp - -$(OBJS)\monolib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp - -$(OBJS)\monolib_msw_accel.obj: ..\..\src\msw\accel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\accel.cpp - -$(OBJS)\monolib_anybutton.obj: ..\..\src\msw\anybutton.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp - -$(OBJS)\monolib_artmsw.obj: ..\..\src\msw\artmsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp - -$(OBJS)\monolib_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp - -$(OBJS)\monolib_msw_button.obj: ..\..\src\msw\button.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\button.cpp - -$(OBJS)\monolib_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp - -$(OBJS)\monolib_msw_choice.obj: ..\..\src\msw\choice.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\choice.cpp - -$(OBJS)\monolib_colordlg.obj: ..\..\src\msw\colordlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp - -$(OBJS)\monolib_combo.obj: ..\..\src\msw\combo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combo.cpp - -$(OBJS)\monolib_msw_combobox.obj: ..\..\src\msw\combobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\combobox.cpp - -$(OBJS)\monolib_msw_control.obj: ..\..\src\msw\control.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\control.cpp - -$(OBJS)\monolib_msw_dialog.obj: ..\..\src\msw\dialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialog.cpp - -$(OBJS)\monolib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp - -$(OBJS)\monolib_dragimag.obj: ..\..\src\msw\dragimag.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp - -$(OBJS)\monolib_filedlg.obj: ..\..\src\msw\filedlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp - -$(OBJS)\monolib_frame.obj: ..\..\src\msw\frame.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\frame.cpp - -$(OBJS)\monolib_msw_gauge.obj: ..\..\src\msw\gauge.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gauge.cpp - -$(OBJS)\monolib_headerctrl.obj: ..\..\src\msw\headerctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\headerctrl.cpp - -$(OBJS)\monolib_iniconf.obj: ..\..\src\msw\iniconf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp - -$(OBJS)\monolib_msw_listbox.obj: ..\..\src\msw\listbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listbox.cpp - -$(OBJS)\monolib_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp - -$(OBJS)\monolib_mdi.obj: ..\..\src\msw\mdi.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mdi.cpp - -$(OBJS)\monolib_msw_menu.obj: ..\..\src\msw\menu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menu.cpp - -$(OBJS)\monolib_menuitem.obj: ..\..\src\msw\menuitem.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp - -$(OBJS)\monolib_metafile.obj: ..\..\src\msw\metafile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\metafile.cpp - -$(OBJS)\monolib_msgdlg.obj: ..\..\src\msw\msgdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\msgdlg.cpp - -$(OBJS)\monolib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativdlg.cpp - -$(OBJS)\monolib_nativewin.obj: ..\..\src\msw\nativewin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp - -$(OBJS)\monolib_msw_notebook.obj: ..\..\src\msw\notebook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notebook.cpp - -$(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp - -$(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp - -$(OBJS)\monolib_msw_panel.obj: ..\..\src\msw\panel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\panel.cpp - -$(OBJS)\monolib_progdlg.obj: ..\..\src\msw\progdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp - -$(OBJS)\monolib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp - -$(OBJS)\monolib_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp - -$(OBJS)\monolib_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp - -$(OBJS)\monolib_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp - -$(OBJS)\monolib_msw_slider.obj: ..\..\src\msw\slider.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\slider.cpp - -$(OBJS)\monolib_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp - -$(OBJS)\monolib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp - -$(OBJS)\monolib_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp - -$(OBJS)\monolib_msw_statbox.obj: ..\..\src\msw\statbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statbox.cpp - -$(OBJS)\monolib_statusbar.obj: ..\..\src\msw\statusbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp - -$(OBJS)\monolib_msw_statline.obj: ..\..\src\msw\statline.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\statline.cpp - -$(OBJS)\monolib_msw_stattext.obj: ..\..\src\msw\stattext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\stattext.cpp - -$(OBJS)\monolib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp - -$(OBJS)\monolib_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp - -$(OBJS)\monolib_textentry.obj: ..\..\src\msw\textentry.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textentry.cpp - -$(OBJS)\monolib_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp - -$(OBJS)\monolib_treectrl.obj: ..\..\src\msw\treectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp - -$(OBJS)\monolib_msw_checklst.obj: ..\..\src\msw\checklst.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\checklst.cpp - -$(OBJS)\monolib_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp - -$(OBJS)\monolib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp - -$(OBJS)\monolib_generic_accel.obj: ..\..\src\generic\accel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\accel.cpp - -$(OBJS)\monolib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp - -$(OBJS)\monolib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp - -$(OBJS)\monolib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp - -$(OBJS)\monolib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp - -$(OBJS)\monolib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp - -$(OBJS)\monolib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp - -$(OBJS)\monolib_mdig.obj: ..\..\src\generic\mdig.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\mdig.cpp - -$(OBJS)\monolib_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp - -$(OBJS)\monolib_univ_button.obj: ..\..\src\univ\button.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\button.cpp - -$(OBJS)\monolib_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp - -$(OBJS)\monolib_univ_checklst.obj: ..\..\src\univ\checklst.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\checklst.cpp - -$(OBJS)\monolib_univ_choice.obj: ..\..\src\univ\choice.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\choice.cpp - -$(OBJS)\monolib_univ_combobox.obj: ..\..\src\univ\combobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\combobox.cpp - -$(OBJS)\monolib_univ_control.obj: ..\..\src\univ\control.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\control.cpp - -$(OBJS)\monolib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp - -$(OBJS)\monolib_univ_dialog.obj: ..\..\src\univ\dialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\dialog.cpp - -$(OBJS)\monolib_framuniv.obj: ..\..\src\univ\framuniv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp - -$(OBJS)\monolib_univ_gauge.obj: ..\..\src\univ\gauge.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\gauge.cpp - -$(OBJS)\monolib_inpcons.obj: ..\..\src\univ\inpcons.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp - -$(OBJS)\monolib_inphand.obj: ..\..\src\univ\inphand.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\inphand.cpp - -$(OBJS)\monolib_univ_listbox.obj: ..\..\src\univ\listbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\listbox.cpp - -$(OBJS)\monolib_univ_menu.obj: ..\..\src\univ\menu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\menu.cpp - -$(OBJS)\monolib_univ_notebook.obj: ..\..\src\univ\notebook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\notebook.cpp - -$(OBJS)\monolib_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp - -$(OBJS)\monolib_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp - -$(OBJS)\monolib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp - -$(OBJS)\monolib_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp - -$(OBJS)\monolib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp - -$(OBJS)\monolib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp - -$(OBJS)\monolib_univ_slider.obj: ..\..\src\univ\slider.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\slider.cpp - -$(OBJS)\monolib_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp - -$(OBJS)\monolib_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp - -$(OBJS)\monolib_univ_statbox.obj: ..\..\src\univ\statbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statbox.cpp - -$(OBJS)\monolib_univ_statline.obj: ..\..\src\univ\statline.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statline.cpp - -$(OBJS)\monolib_univ_stattext.obj: ..\..\src\univ\stattext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stattext.cpp - -$(OBJS)\monolib_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp - -$(OBJS)\monolib_stdrend.obj: ..\..\src\univ\stdrend.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp - -$(OBJS)\monolib_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp - -$(OBJS)\monolib_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp - -$(OBJS)\monolib_theme.obj: ..\..\src\univ\theme.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\theme.cpp - -$(OBJS)\monolib_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp - -$(OBJS)\monolib_topluniv.obj: ..\..\src\univ\topluniv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp - -$(OBJS)\monolib_winuniv.obj: ..\..\src\univ\winuniv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\winuniv.cpp - -$(OBJS)\monolib_gtk.obj: ..\..\src\univ\themes\gtk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp - -$(OBJS)\monolib_metal.obj: ..\..\src\univ\themes\metal.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\metal.cpp - -$(OBJS)\monolib_mono.obj: ..\..\src\univ\themes\mono.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\mono.cpp - -$(OBJS)\monolib_win32.obj: ..\..\src\univ\themes\win32.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp - -$(OBJS)\monolib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp - -$(OBJS)\monolib_calctrl.obj: ..\..\src\msw\calctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp - -$(OBJS)\monolib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp - -$(OBJS)\monolib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp - -$(OBJS)\monolib_datectrl.obj: ..\..\src\msw\datectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp - -$(OBJS)\monolib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp - -$(OBJS)\monolib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp - -$(OBJS)\monolib_timectrl.obj: ..\..\src\msw\timectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp - -$(OBJS)\monolib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp - -$(OBJS)\monolib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp - -$(OBJS)\monolib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp - -$(OBJS)\monolib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp - -$(OBJS)\monolib_helpbest.obj: ..\..\src\msw\helpbest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp - -$(OBJS)\monolib_helpctrl.obj: ..\..\src\html\helpctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpctrl.cpp - -$(OBJS)\monolib_helpdata.obj: ..\..\src\html\helpdata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpdata.cpp - -$(OBJS)\monolib_helpdlg.obj: ..\..\src\html\helpdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpdlg.cpp - -$(OBJS)\monolib_helpfrm.obj: ..\..\src\html\helpfrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpfrm.cpp - -$(OBJS)\monolib_helpwnd.obj: ..\..\src\html\helpwnd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\helpwnd.cpp - -$(OBJS)\monolib_htmlcell.obj: ..\..\src\html\htmlcell.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlcell.cpp - -$(OBJS)\monolib_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlfilt.cpp - -$(OBJS)\monolib_htmlpars.obj: ..\..\src\html\htmlpars.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlpars.cpp - -$(OBJS)\monolib_htmltag.obj: ..\..\src\html\htmltag.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmltag.cpp - -$(OBJS)\monolib_htmlwin.obj: ..\..\src\html\htmlwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmlwin.cpp - -$(OBJS)\monolib_htmprint.obj: ..\..\src\html\htmprint.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\htmprint.cpp - -$(OBJS)\monolib_m_dflist.obj: ..\..\src\html\m_dflist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_dflist.cpp - -$(OBJS)\monolib_m_fonts.obj: ..\..\src\html\m_fonts.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_fonts.cpp - -$(OBJS)\monolib_m_hline.obj: ..\..\src\html\m_hline.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_hline.cpp - -$(OBJS)\monolib_m_image.obj: ..\..\src\html\m_image.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_image.cpp - -$(OBJS)\monolib_m_layout.obj: ..\..\src\html\m_layout.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_layout.cpp - -$(OBJS)\monolib_m_links.obj: ..\..\src\html\m_links.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_links.cpp - -$(OBJS)\monolib_m_list.obj: ..\..\src\html\m_list.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_list.cpp - -$(OBJS)\monolib_m_pre.obj: ..\..\src\html\m_pre.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp - -$(OBJS)\monolib_m_span.obj: ..\..\src\html\m_span.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_span.cpp - -$(OBJS)\monolib_m_style.obj: ..\..\src\html\m_style.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_style.cpp - -$(OBJS)\monolib_m_tables.obj: ..\..\src\html\m_tables.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp - -$(OBJS)\monolib_styleparams.obj: ..\..\src\html\styleparams.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp - -$(OBJS)\monolib_winpars.obj: ..\..\src\html\winpars.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\html\winpars.cpp - -$(OBJS)\monolib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\htmllbox.cpp - -$(OBJS)\monolib_webview_ie.obj: ..\..\src\msw\webview_ie.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\webview_ie.cpp - -$(OBJS)\monolib_webview.obj: ..\..\src\common\webview.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webview.cpp - -$(OBJS)\monolib_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp - -$(OBJS)\monolib_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp - -$(OBJS)\monolib_debugrpt.obj: ..\..\src\common\debugrpt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\debugrpt.cpp - -$(OBJS)\monolib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp - -$(OBJS)\monolib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp - -$(OBJS)\monolib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp - -$(OBJS)\monolib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp - -$(OBJS)\monolib_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp - -$(OBJS)\monolib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp - -$(OBJS)\monolib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp - -$(OBJS)\monolib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp - -$(OBJS)\monolib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp - -$(OBJS)\monolib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp - -$(OBJS)\monolib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp - -$(OBJS)\monolib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp - -$(OBJS)\monolib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp - -$(OBJS)\monolib_xh_cmdlinkbn.obj: ..\..\src\xrc\xh_cmdlinkbn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_cmdlinkbn.cpp - -$(OBJS)\monolib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp - -$(OBJS)\monolib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp - -$(OBJS)\monolib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp - -$(OBJS)\monolib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp - -$(OBJS)\monolib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp - -$(OBJS)\monolib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp - -$(OBJS)\monolib_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp - -$(OBJS)\monolib_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp - -$(OBJS)\monolib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp - -$(OBJS)\monolib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp - -$(OBJS)\monolib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp - -$(OBJS)\monolib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp - -$(OBJS)\monolib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp - -$(OBJS)\monolib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp - -$(OBJS)\monolib_xh_html.obj: ..\..\src\xrc\xh_html.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_html.cpp - -$(OBJS)\monolib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp - -$(OBJS)\monolib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp - -$(OBJS)\monolib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp - -$(OBJS)\monolib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp - -$(OBJS)\monolib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp - -$(OBJS)\monolib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp - -$(OBJS)\monolib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp - -$(OBJS)\monolib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp - -$(OBJS)\monolib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp - -$(OBJS)\monolib_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp - -$(OBJS)\monolib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp - -$(OBJS)\monolib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp - -$(OBJS)\monolib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp - -$(OBJS)\monolib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp - -$(OBJS)\monolib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp - -$(OBJS)\monolib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp - -$(OBJS)\monolib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp - -$(OBJS)\monolib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp - -$(OBJS)\monolib_xh_split.obj: ..\..\src\xrc\xh_split.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_split.cpp - -$(OBJS)\monolib_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp - -$(OBJS)\monolib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp - -$(OBJS)\monolib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp - -$(OBJS)\monolib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp - -$(OBJS)\monolib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp - -$(OBJS)\monolib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp - -$(OBJS)\monolib_xh_text.obj: ..\..\src\xrc\xh_text.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp - -$(OBJS)\monolib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp - -$(OBJS)\monolib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp - -$(OBJS)\monolib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp - -$(OBJS)\monolib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp - -$(OBJS)\monolib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp - -$(OBJS)\monolib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp - -$(OBJS)\monolib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp - -$(OBJS)\monolib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp - -$(OBJS)\monolib_xmlres.obj: ..\..\src\xrc\xmlres.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp - -$(OBJS)\monolib_xmladv.obj: ..\..\src\xrc\xmladv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmladv.cpp - -$(OBJS)\monolib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp - -$(OBJS)\monolib_framemanager.obj: ..\..\src\aui\framemanager.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\framemanager.cpp - -$(OBJS)\monolib_dockart.obj: ..\..\src\aui\dockart.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\dockart.cpp - -$(OBJS)\monolib_floatpane.obj: ..\..\src\aui\floatpane.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\floatpane.cpp - -$(OBJS)\monolib_auibook.obj: ..\..\src\aui\auibook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\auibook.cpp - -$(OBJS)\monolib_auibar.obj: ..\..\src\aui\auibar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\auibar.cpp - -$(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp - -$(OBJS)\monolib_tabart.obj: ..\..\src\aui\tabart.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabart.cpp - -$(OBJS)\monolib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp - -$(OBJS)\monolib_advprops.obj: ..\..\src\propgrid\advprops.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp - -$(OBJS)\monolib_editors.obj: ..\..\src\propgrid\editors.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\editors.cpp - -$(OBJS)\monolib_manager.obj: ..\..\src\propgrid\manager.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\manager.cpp - -$(OBJS)\monolib_property.obj: ..\..\src\propgrid\property.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\property.cpp - -$(OBJS)\monolib_propgrid.obj: ..\..\src\propgrid\propgrid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp - -$(OBJS)\monolib_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp - -$(OBJS)\monolib_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp - -$(OBJS)\monolib_props.obj: ..\..\src\propgrid\props.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp - -$(OBJS)\monolib_art_internal.obj: ..\..\src\ribbon\art_internal.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp - -$(OBJS)\monolib_art_msw.obj: ..\..\src\ribbon\art_msw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp - -$(OBJS)\monolib_art_aui.obj: ..\..\src\ribbon\art_aui.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp - -$(OBJS)\monolib_bar.obj: ..\..\src\ribbon\bar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\bar.cpp - -$(OBJS)\monolib_ribbon_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp - -$(OBJS)\monolib_ribbon_control.obj: ..\..\src\ribbon\control.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\control.cpp - -$(OBJS)\monolib_gallery.obj: ..\..\src\ribbon\gallery.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\gallery.cpp - -$(OBJS)\monolib_page.obj: ..\..\src\ribbon\page.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp - -$(OBJS)\monolib_ribbon_panel.obj: ..\..\src\ribbon\panel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp - -$(OBJS)\monolib_ribbon_toolbar.obj: ..\..\src\ribbon\toolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp - -$(OBJS)\monolib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp - -$(OBJS)\monolib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp - -$(OBJS)\monolib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp - -$(OBJS)\monolib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp - -$(OBJS)\monolib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp - -$(OBJS)\monolib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp - -$(OBJS)\monolib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp - -$(OBJS)\monolib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp - -$(OBJS)\monolib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp - -$(OBJS)\monolib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp - -$(OBJS)\monolib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp - -$(OBJS)\monolib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp - -$(OBJS)\monolib_stc.obj: ..\..\src\stc\stc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\stc.cpp - -$(OBJS)\monolib_PlatWX.obj: ..\..\src\stc\PlatWX.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\PlatWX.cpp - -$(OBJS)\monolib_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp - -$(OBJS)\monolib_xml.obj: ..\..\src\xml\xml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xml\xml.cpp - -$(OBJS)\monolib_xtixml.obj: ..\..\src\common\xtixml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xtixml.cpp - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_activex.obj: ..\..\src\msw\ole\activex.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_app.obj: ..\..\src\msw\app.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\app.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_bitmap.obj: ..\..\src\msw\bitmap.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\bitmap.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_brush.obj: ..\..\src\msw\brush.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\brush.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_caret.obj: ..\..\src\msw\caret.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\caret.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_clipbrd.obj: ..\..\src\msw\clipbrd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\clipbrd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_colour.obj: ..\..\src\msw\colour.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\colour.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_cursor.obj: ..\..\src\msw\cursor.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\cursor.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_data.obj: ..\..\src\msw\data.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\data.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dc.obj: ..\..\src\msw\dc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcclient.obj: ..\..\src\msw\dcclient.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcclient.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcmemory.obj: ..\..\src\msw\dcmemory.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcmemory.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcprint.obj: ..\..\src\msw\dcprint.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcprint.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcscreen.obj: ..\..\src\msw\dcscreen.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dcscreen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dialup.obj: ..\..\src\msw\dialup.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dialup.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dib.obj: ..\..\src\msw\dib.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\dib.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_display.obj: ..\..\src\msw\display.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\display.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_enhmeta.obj: ..\..\src\msw\enhmeta.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\enhmeta.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_font.obj: ..\..\src\msw\font.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\font.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontenum.obj: ..\..\src\msw\fontenum.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontenum.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontutil.obj: ..\..\src\msw\fontutil.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\fontutil.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gdiimage.obj: ..\..\src\msw\gdiimage.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiimage.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiobj.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\gdiplus.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_graphics.obj: ..\..\src\msw\graphics.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\graphics.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_icon.obj: ..\..\src\msw\icon.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\icon.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imaglist.obj: ..\..\src\msw\imaglist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_minifram.obj: ..\..\src\msw\minifram.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\minifram.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_safearray.obj: ..\..\src\msw\ole\safearray.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_palette.obj: ..\..\src\msw\palette.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\palette.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_pen.obj: ..\..\src\msw\pen.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\pen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_popupwin.obj: ..\..\src\msw\popupwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\popupwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_printdlg.obj: ..\..\src\msw\printdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\printdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_printwin.obj: ..\..\src\msw\printwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\printwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_region.obj: ..\..\src\msw\region.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\region.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_renderer.obj: ..\..\src\msw\renderer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\renderer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_settings.obj: ..\..\src\msw\settings.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\settings.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_tooltip.obj: ..\..\src\msw\tooltip.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_toplevel.obj: ..\..\src\msw\toplevel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_uiaction.obj: ..\..\src\msw\uiaction.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_utilswin.obj: ..\..\src\msw\utilswin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\utilswin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_window.obj: ..\..\src\msw\window.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\window.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_helpchm.obj: ..\..\src\msw\helpchm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpchm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_helpwin.obj: ..\..\src\msw\helpwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\helpwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_automtn.obj: ..\..\src\msw\ole\automtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\collpaneg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filepickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_accesscmn.obj: ..\..\src\common\accesscmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accesscmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_anidecod.obj: ..\..\src\common\anidecod.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\anidecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_appcmn.obj: ..\..\src\common\appcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\appcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_artprov.obj: ..\..\src\common\artprov.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artprov.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_artstd.obj: ..\..\src\common\artstd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\artstd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_arttango.obj: ..\..\src\common\arttango.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\arttango.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_bmpbase.obj: ..\..\src\common\bmpbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_btncmn.obj: ..\..\src\common\btncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\btncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_cairo.obj: ..\..\src\common\cairo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cairo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_clipcmn.obj: ..\..\src\common\clipcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clipcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_colourcmn.obj: ..\..\src\common\colourcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_colourdata.obj: ..\..\src\common\colourdata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\colourdata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_combocmn.obj: ..\..\src\common\combocmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\combocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_cmdproc.obj: ..\..\src\common\cmdproc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmdproc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_cmndata.obj: ..\..\src\common\cmndata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cmndata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_containr.obj: ..\..\src\common\containr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\containr.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_cshelp.obj: ..\..\src\common\cshelp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\cshelp.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcbase.obj: ..\..\src\common\dcbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcgraph.obj: ..\..\src\common\dcgraph.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcgraph.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcsvg.obj: ..\..\src\common\dcsvg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dndcmn.obj: ..\..\src\common\dndcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dndcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dobjcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_docmdi.obj: ..\..\src\common\docmdi.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\docmdi.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_docview.obj: ..\..\src\common\docview.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\docview.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dpycmn.obj: ..\..\src\common\dpycmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dpycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dseldlg.obj: ..\..\src\common\dseldlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\dseldlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_effects.obj: ..\..\src\common\effects.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\effects.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_filehistorycmn.obj: ..\..\src\common\filehistorycmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filehistorycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\filepickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontcmn.obj: ..\..\src\common\fontcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontdata.obj: ..\..\src\common\fontdata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontdata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_graphicc.obj: ..\..\src\generic\graphicc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontmap.obj: ..\..\src\common\fontmap.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontmap.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_framecmn.obj: ..\..\src\common\framecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\framecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gaugecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gbsizer.obj: ..\..\src\common\gbsizer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gbsizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gdicmn.obj: ..\..\src\common\gdicmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gdicmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_geometry.obj: ..\..\src\common\geometry.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\geometry.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gifdecod.obj: ..\..\src\common\gifdecod.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gifdecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_graphcmn.obj: ..\..\src\common\graphcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_helpbase.obj: ..\..\src\common\helpbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\helpbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_iconbndl.obj: ..\..\src\common\iconbndl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\iconbndl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagall.obj: ..\..\src\common\imagall.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagall.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagbmp.obj: ..\..\src\common\imagbmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagbmp.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_image.obj: ..\..\src\common\image.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\image.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagfill.obj: ..\..\src\common\imagfill.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagfill.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imaggif.obj: ..\..\src\common\imaggif.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imaggif.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagiff.obj: ..\..\src\common\imagiff.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagiff.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagjpeg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagpcx.obj: ..\..\src\common\imagpcx.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagpcx.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagpng.obj: ..\..\src\common\imagpng.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagpng.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagpnm.obj: ..\..\src\common\imagpnm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagpnm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagtga.obj: ..\..\src\common\imagtga.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagtga.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagtiff.obj: ..\..\src\common\imagtiff.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagtiff.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_imagxpm.obj: ..\..\src\common\imagxpm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\imagxpm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_layout.obj: ..\..\src\common\layout.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\layout.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\lboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_markupparser.obj: ..\..\src\common\markupparser.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\markupparser.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_matrix.obj: ..\..\src\common\matrix.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\matrix.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_menucmn.obj: ..\..\src\common\menucmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\menucmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_modalhook.obj: ..\..\src\common\modalhook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\modalhook.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_mousemanager.obj: ..\..\src\common\mousemanager.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_panelcmn.obj: ..\..\src\common\panelcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\persist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_pickerbase.obj: ..\..\src\common\pickerbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\preferencescmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_prntbase.obj: ..\..\src\common\prntbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\prntbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_quantize.obj: ..\..\src\common\quantize.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\quantize.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_radiocmn.obj: ..\..\src\common\radiocmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_rendcmn.obj: ..\..\src\common\rendcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rendcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_rgncmn.obj: ..\..\src\common\rgncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_settcmn.obj: ..\..\src\common\settcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\settcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_sizer.obj: ..\..\src\common\sizer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\sizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_slidercmn.obj: ..\..\src\common\slidercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_srchcmn.obj: ..\..\src\common\srchcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\srchcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_statbar.obj: ..\..\src\common\statbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_stockitem.obj: ..\..\src\common\stockitem.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\stockitem.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_tbarbase.obj: ..\..\src\common\tbarbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\tbarbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_textcmn.obj: ..\..\src\common\textcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_treebase.obj: ..\..\src\common\treebase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\treebase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_uiactioncmn.obj: ..\..\src\common\uiactioncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\uiactioncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_valgen.obj: ..\..\src\common\valgen.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valgen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_validate.obj: ..\..\src\common\validate.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\validate.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_valtext.obj: ..\..\src\common\valtext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valtext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_valnum.obj: ..\..\src\common\valnum.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\valnum.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_wincmn.obj: ..\..\src\common\wincmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wincmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_windowid.obj: ..\..\src\common\windowid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\windowid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\busyinfo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_generic_buttonbar.obj: ..\..\src\generic\buttonbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\buttonbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\choicdgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\choicbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\combog.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dcpsg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\dragimgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_filectrlg.obj: ..\..\src\generic\filectrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\filectrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_infobar.obj: ..\..\src\generic\infobar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\infobar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_listbkg.obj: ..\..\src\generic\listbkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_logg.obj: ..\..\src\generic\logg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\logg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_markuptext.obj: ..\..\src\generic\markuptext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\numdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_preferencesg.obj: ..\..\src\generic\preferencesg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\preferencesg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_printps.obj: ..\..\src\generic\printps.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\printps.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_renderg.obj: ..\..\src\generic\renderg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\renderg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_scrlwing.obj: ..\..\src\generic\scrlwing.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\scrlwing.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_selstore.obj: ..\..\src\generic\selstore.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\selstore.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_spinctlg.obj: ..\..\src\generic\spinctlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\spinctlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_splitter.obj: ..\..\src\generic\splitter.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splitter.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\srchctlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_statbmpg.obj: ..\..\src\generic\statbmpg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\statbmpg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_stattextg.obj: ..\..\src\generic\stattextg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_tipwin.obj: ..\..\src\generic\tipwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_treectlg.obj: ..\..\src\generic\treectlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_treebkg.obj: ..\..\src\generic\treebkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_vlbox.obj: ..\..\src\generic\vlbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vlbox.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_vscroll.obj: ..\..\src\generic\vscroll.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_animatecmn.obj: ..\..\src\common\animatecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gridcmn.obj: ..\..\src\common\gridcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_datavgen.obj: ..\..\src\generic\datavgen.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\datavgen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_datectlg.obj: ..\..\src\generic\datectlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\datectlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_editlbox.obj: ..\..\src\generic\editlbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\editlbox.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_grid.obj: ..\..\src\generic\grid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\grid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\gridctrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_grideditors.obj: ..\..\src\generic\grideditors.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\grideditors.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_gridsel.obj: ..\..\src\generic\gridsel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\gridsel.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_helpext.obj: ..\..\src\generic\helpext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\helpext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_laywin.obj: ..\..\src\generic\laywin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_odcombo.obj: ..\..\src\generic\odcombo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_propdlg.obj: ..\..\src\generic\propdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_sashwin.obj: ..\..\src\generic\sashwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_splash.obj: ..\..\src\generic\splash.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\splash.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_timectrlg.obj: ..\..\src\generic\timectrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\timectrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_treelist.obj: ..\..\src\generic\treelist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_wizard.obj: ..\..\src\generic\wizard.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_sound.obj: ..\..\src\msw\sound.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\sound.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_taskbar.obj: ..\..\src\msw\taskbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_joystick.obj: ..\..\src\msw\joystick.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\monolib_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp -!endif - -$(OBJS)\basedll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\basedll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXMAKINGDLL_BASE /d wxUSE_BASE=1 ..\..\src\msw\version.rc - -$(OBJS)\basedll_any.obj: ..\..\src\common\any.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\any.cpp - -$(OBJS)\basedll_appbase.obj: ..\..\src\common\appbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\appbase.cpp - -$(OBJS)\basedll_arcall.obj: ..\..\src\common\arcall.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\arcall.cpp - -$(OBJS)\basedll_arcfind.obj: ..\..\src\common\arcfind.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\arcfind.cpp - -$(OBJS)\basedll_archive.obj: ..\..\src\common\archive.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\archive.cpp - -$(OBJS)\basedll_arrstr.obj: ..\..\src\common\arrstr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\arrstr.cpp - -$(OBJS)\basedll_base64.obj: ..\..\src\common\base64.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\base64.cpp - -$(OBJS)\basedll_clntdata.obj: ..\..\src\common\clntdata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\clntdata.cpp - -$(OBJS)\basedll_cmdline.obj: ..\..\src\common\cmdline.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\cmdline.cpp - -$(OBJS)\basedll_config.obj: ..\..\src\common\config.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\config.cpp - -$(OBJS)\basedll_convauto.obj: ..\..\src\common\convauto.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\convauto.cpp - -$(OBJS)\basedll_datetime.obj: ..\..\src\common\datetime.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datetime.cpp - -$(OBJS)\basedll_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datetimefmt.cpp - -$(OBJS)\basedll_datstrm.obj: ..\..\src\common\datstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\datstrm.cpp - -$(OBJS)\basedll_dircmn.obj: ..\..\src\common\dircmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dircmn.cpp - -$(OBJS)\basedll_dynarray.obj: ..\..\src\common\dynarray.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynarray.cpp - -$(OBJS)\basedll_dynlib.obj: ..\..\src\common\dynlib.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynlib.cpp - -$(OBJS)\basedll_dynload.obj: ..\..\src\common\dynload.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\dynload.cpp - -$(OBJS)\basedll_encconv.obj: ..\..\src\common\encconv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\encconv.cpp - -$(OBJS)\basedll_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp - -$(OBJS)\basedll_extended.obj: ..\..\src\common\extended.c - $(CC) /c /nologo /TC /Fo$@ $(BASEDLL_CFLAGS) ..\..\src\common\extended.c - -$(OBJS)\basedll_ffile.obj: ..\..\src\common\ffile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ffile.cpp - -$(OBJS)\basedll_file.obj: ..\..\src\common\file.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\file.cpp - -$(OBJS)\basedll_fileback.obj: ..\..\src\common\fileback.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fileback.cpp - -$(OBJS)\basedll_fileconf.obj: ..\..\src\common\fileconf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fileconf.cpp - -$(OBJS)\basedll_filefn.obj: ..\..\src\common\filefn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filefn.cpp - -$(OBJS)\basedll_filename.obj: ..\..\src\common\filename.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filename.cpp - -$(OBJS)\basedll_filesys.obj: ..\..\src\common\filesys.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filesys.cpp - -$(OBJS)\basedll_filtall.obj: ..\..\src\common\filtall.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filtall.cpp - -$(OBJS)\basedll_filtfind.obj: ..\..\src\common\filtfind.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\filtfind.cpp - -$(OBJS)\basedll_fmapbase.obj: ..\..\src\common\fmapbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fmapbase.cpp - -$(OBJS)\basedll_fs_arc.obj: ..\..\src\common\fs_arc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fs_arc.cpp - -$(OBJS)\basedll_fs_filter.obj: ..\..\src\common\fs_filter.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fs_filter.cpp - -$(OBJS)\basedll_hash.obj: ..\..\src\common\hash.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\hash.cpp - -$(OBJS)\basedll_hashmap.obj: ..\..\src\common\hashmap.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\hashmap.cpp - -$(OBJS)\basedll_init.obj: ..\..\src\common\init.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\init.cpp - -$(OBJS)\basedll_intl.obj: ..\..\src\common\intl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\intl.cpp - -$(OBJS)\basedll_ipcbase.obj: ..\..\src\common\ipcbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ipcbase.cpp - -$(OBJS)\basedll_languageinfo.obj: ..\..\src\common\languageinfo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\languageinfo.cpp - -$(OBJS)\basedll_list.obj: ..\..\src\common\list.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\list.cpp - -$(OBJS)\basedll_log.obj: ..\..\src\common\log.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\log.cpp - -$(OBJS)\basedll_longlong.obj: ..\..\src\common\longlong.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\longlong.cpp - -$(OBJS)\basedll_memory.obj: ..\..\src\common\memory.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\memory.cpp - -$(OBJS)\basedll_mimecmn.obj: ..\..\src\common\mimecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\mimecmn.cpp - -$(OBJS)\basedll_module.obj: ..\..\src\common\module.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\module.cpp - -$(OBJS)\basedll_mstream.obj: ..\..\src\common\mstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\mstream.cpp - -$(OBJS)\basedll_numformatter.obj: ..\..\src\common\numformatter.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\numformatter.cpp - -$(OBJS)\basedll_object.obj: ..\..\src\common\object.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\object.cpp - -$(OBJS)\basedll_platinfo.obj: ..\..\src\common\platinfo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\platinfo.cpp - -$(OBJS)\basedll_powercmn.obj: ..\..\src\common\powercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\powercmn.cpp - -$(OBJS)\basedll_process.obj: ..\..\src\common\process.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\process.cpp - -$(OBJS)\basedll_regex.obj: ..\..\src\common\regex.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\regex.cpp - -$(OBJS)\basedll_stdpbase.obj: ..\..\src\common\stdpbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stdpbase.cpp - -$(OBJS)\basedll_sstream.obj: ..\..\src\common\sstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\sstream.cpp - -$(OBJS)\basedll_stdstream.obj: ..\..\src\common\stdstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stdstream.cpp - -$(OBJS)\basedll_stopwatch.obj: ..\..\src\common\stopwatch.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stopwatch.cpp - -$(OBJS)\basedll_strconv.obj: ..\..\src\common\strconv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\strconv.cpp - -$(OBJS)\basedll_stream.obj: ..\..\src\common\stream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stream.cpp - -$(OBJS)\basedll_string.obj: ..\..\src\common\string.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\string.cpp - -$(OBJS)\basedll_stringimpl.obj: ..\..\src\common\stringimpl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stringimpl.cpp - -$(OBJS)\basedll_stringops.obj: ..\..\src\common\stringops.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\stringops.cpp - -$(OBJS)\basedll_strvararg.obj: ..\..\src\common\strvararg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\strvararg.cpp - -$(OBJS)\basedll_sysopt.obj: ..\..\src\common\sysopt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\sysopt.cpp - -$(OBJS)\basedll_tarstrm.obj: ..\..\src\common\tarstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\tarstrm.cpp - -$(OBJS)\basedll_textbuf.obj: ..\..\src\common\textbuf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textbuf.cpp - -$(OBJS)\basedll_textfile.obj: ..\..\src\common\textfile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\textfile.cpp - -$(OBJS)\basedll_threadinfo.obj: ..\..\src\common\threadinfo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\threadinfo.cpp - -$(OBJS)\basedll_time.obj: ..\..\src\common\time.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\time.cpp - -$(OBJS)\basedll_timercmn.obj: ..\..\src\common\timercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timercmn.cpp - -$(OBJS)\basedll_timerimpl.obj: ..\..\src\common\timerimpl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\timerimpl.cpp - -$(OBJS)\basedll_tokenzr.obj: ..\..\src\common\tokenzr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\tokenzr.cpp - -$(OBJS)\basedll_translation.obj: ..\..\src\common\translation.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\translation.cpp - -$(OBJS)\basedll_txtstrm.obj: ..\..\src\common\txtstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\txtstrm.cpp - -$(OBJS)\basedll_unichar.obj: ..\..\src\common\unichar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\unichar.cpp - -$(OBJS)\basedll_uri.obj: ..\..\src\common\uri.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\uri.cpp - -$(OBJS)\basedll_ustring.obj: ..\..\src\common\ustring.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\ustring.cpp - -$(OBJS)\basedll_variant.obj: ..\..\src\common\variant.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\variant.cpp - -$(OBJS)\basedll_wfstream.obj: ..\..\src\common\wfstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wfstream.cpp - -$(OBJS)\basedll_wxcrt.obj: ..\..\src\common\wxcrt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wxcrt.cpp - -$(OBJS)\basedll_wxprintf.obj: ..\..\src\common\wxprintf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\wxprintf.cpp - -$(OBJS)\basedll_xlocale.obj: ..\..\src\common\xlocale.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xlocale.cpp - -$(OBJS)\basedll_xti.obj: ..\..\src\common\xti.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xti.cpp - -$(OBJS)\basedll_xtistrm.obj: ..\..\src\common\xtistrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\xtistrm.cpp - -$(OBJS)\basedll_zipstrm.obj: ..\..\src\common\zipstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\zipstrm.cpp - -$(OBJS)\basedll_zstream.obj: ..\..\src\common\zstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\zstream.cpp - -$(OBJS)\basedll_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp - -$(OBJS)\basedll_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp - -$(OBJS)\basedll_basemsw.obj: ..\..\src\msw\basemsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\basemsw.cpp - -$(OBJS)\basedll_crashrpt.obj: ..\..\src\msw\crashrpt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\crashrpt.cpp - -$(OBJS)\basedll_debughlp.obj: ..\..\src\msw\debughlp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\debughlp.cpp - -$(OBJS)\basedll_dde.obj: ..\..\src\msw\dde.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dde.cpp - -$(OBJS)\basedll_dir.obj: ..\..\src\msw\dir.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dir.cpp - -$(OBJS)\basedll_dlmsw.obj: ..\..\src\msw\dlmsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\dlmsw.cpp - -$(OBJS)\basedll_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp - -$(OBJS)\basedll_mimetype.obj: ..\..\src\msw\mimetype.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\mimetype.cpp - -$(OBJS)\basedll_power.obj: ..\..\src\msw\power.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\power.cpp - -$(OBJS)\basedll_regconf.obj: ..\..\src\msw\regconf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\regconf.cpp - -$(OBJS)\basedll_registry.obj: ..\..\src\msw\registry.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\registry.cpp - -$(OBJS)\basedll_snglinst.obj: ..\..\src\msw\snglinst.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\snglinst.cpp - -$(OBJS)\basedll_stackwalk.obj: ..\..\src\msw\stackwalk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\stackwalk.cpp - -$(OBJS)\basedll_stdpaths.obj: ..\..\src\msw\stdpaths.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\stdpaths.cpp - -$(OBJS)\basedll_thread.obj: ..\..\src\msw\thread.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\thread.cpp - -$(OBJS)\basedll_timer.obj: ..\..\src\msw\timer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\timer.cpp - -$(OBJS)\basedll_utils.obj: ..\..\src\msw\utils.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\utils.cpp - -$(OBJS)\basedll_utilsexc.obj: ..\..\src\msw\utilsexc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\utilsexc.cpp - -$(OBJS)\basedll_fswatcher.obj: ..\..\src\msw\fswatcher.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\fswatcher.cpp - -$(OBJS)\basedll_event.obj: ..\..\src\common\event.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\event.cpp - -$(OBJS)\basedll_fs_mem.obj: ..\..\src\common\fs_mem.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\fs_mem.cpp - -$(OBJS)\basedll_msgout.obj: ..\..\src\common\msgout.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\msgout.cpp - -$(OBJS)\basedll_utilscmn.obj: ..\..\src\common\utilscmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp - -$(OBJS)\basedll_main.obj: ..\..\src\msw\main.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\main.cpp - -$(OBJS)\basedll_mslu.obj: ..\..\src\msw\mslu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\mslu.cpp - -$(OBJS)\basedll_volume.obj: ..\..\src\msw\volume.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASEDLL_CXXFLAGS) ..\..\src\msw\volume.cpp - -$(OBJS)\baselib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\baselib_any.obj: ..\..\src\common\any.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\any.cpp - -$(OBJS)\baselib_appbase.obj: ..\..\src\common\appbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\appbase.cpp - -$(OBJS)\baselib_arcall.obj: ..\..\src\common\arcall.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\arcall.cpp - -$(OBJS)\baselib_arcfind.obj: ..\..\src\common\arcfind.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\arcfind.cpp - -$(OBJS)\baselib_archive.obj: ..\..\src\common\archive.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\archive.cpp - -$(OBJS)\baselib_arrstr.obj: ..\..\src\common\arrstr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\arrstr.cpp - -$(OBJS)\baselib_base64.obj: ..\..\src\common\base64.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\base64.cpp - -$(OBJS)\baselib_clntdata.obj: ..\..\src\common\clntdata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\clntdata.cpp - -$(OBJS)\baselib_cmdline.obj: ..\..\src\common\cmdline.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\cmdline.cpp - -$(OBJS)\baselib_config.obj: ..\..\src\common\config.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\config.cpp - -$(OBJS)\baselib_convauto.obj: ..\..\src\common\convauto.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\convauto.cpp - -$(OBJS)\baselib_datetime.obj: ..\..\src\common\datetime.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datetime.cpp - -$(OBJS)\baselib_datetimefmt.obj: ..\..\src\common\datetimefmt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datetimefmt.cpp - -$(OBJS)\baselib_datstrm.obj: ..\..\src\common\datstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\datstrm.cpp - -$(OBJS)\baselib_dircmn.obj: ..\..\src\common\dircmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dircmn.cpp - -$(OBJS)\baselib_dynarray.obj: ..\..\src\common\dynarray.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynarray.cpp - -$(OBJS)\baselib_dynlib.obj: ..\..\src\common\dynlib.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynlib.cpp - -$(OBJS)\baselib_dynload.obj: ..\..\src\common\dynload.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\dynload.cpp - -$(OBJS)\baselib_encconv.obj: ..\..\src\common\encconv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\encconv.cpp - -$(OBJS)\baselib_evtloopcmn.obj: ..\..\src\common\evtloopcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\evtloopcmn.cpp - -$(OBJS)\baselib_extended.obj: ..\..\src\common\extended.c - $(CC) /c /nologo /TC /Fo$@ $(BASELIB_CFLAGS) ..\..\src\common\extended.c - -$(OBJS)\baselib_ffile.obj: ..\..\src\common\ffile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ffile.cpp - -$(OBJS)\baselib_file.obj: ..\..\src\common\file.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\file.cpp - -$(OBJS)\baselib_fileback.obj: ..\..\src\common\fileback.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fileback.cpp - -$(OBJS)\baselib_fileconf.obj: ..\..\src\common\fileconf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fileconf.cpp - -$(OBJS)\baselib_filefn.obj: ..\..\src\common\filefn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filefn.cpp - -$(OBJS)\baselib_filename.obj: ..\..\src\common\filename.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filename.cpp - -$(OBJS)\baselib_filesys.obj: ..\..\src\common\filesys.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filesys.cpp - -$(OBJS)\baselib_filtall.obj: ..\..\src\common\filtall.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filtall.cpp - -$(OBJS)\baselib_filtfind.obj: ..\..\src\common\filtfind.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\filtfind.cpp - -$(OBJS)\baselib_fmapbase.obj: ..\..\src\common\fmapbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fmapbase.cpp - -$(OBJS)\baselib_fs_arc.obj: ..\..\src\common\fs_arc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fs_arc.cpp - -$(OBJS)\baselib_fs_filter.obj: ..\..\src\common\fs_filter.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fs_filter.cpp - -$(OBJS)\baselib_hash.obj: ..\..\src\common\hash.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\hash.cpp - -$(OBJS)\baselib_hashmap.obj: ..\..\src\common\hashmap.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\hashmap.cpp - -$(OBJS)\baselib_init.obj: ..\..\src\common\init.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\init.cpp - -$(OBJS)\baselib_intl.obj: ..\..\src\common\intl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\intl.cpp - -$(OBJS)\baselib_ipcbase.obj: ..\..\src\common\ipcbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ipcbase.cpp - -$(OBJS)\baselib_languageinfo.obj: ..\..\src\common\languageinfo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\languageinfo.cpp - -$(OBJS)\baselib_list.obj: ..\..\src\common\list.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\list.cpp - -$(OBJS)\baselib_log.obj: ..\..\src\common\log.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\log.cpp - -$(OBJS)\baselib_longlong.obj: ..\..\src\common\longlong.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\longlong.cpp - -$(OBJS)\baselib_memory.obj: ..\..\src\common\memory.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\memory.cpp - -$(OBJS)\baselib_mimecmn.obj: ..\..\src\common\mimecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\mimecmn.cpp - -$(OBJS)\baselib_module.obj: ..\..\src\common\module.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\module.cpp - -$(OBJS)\baselib_mstream.obj: ..\..\src\common\mstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\mstream.cpp - -$(OBJS)\baselib_numformatter.obj: ..\..\src\common\numformatter.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\numformatter.cpp - -$(OBJS)\baselib_object.obj: ..\..\src\common\object.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\object.cpp - -$(OBJS)\baselib_platinfo.obj: ..\..\src\common\platinfo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\platinfo.cpp - -$(OBJS)\baselib_powercmn.obj: ..\..\src\common\powercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\powercmn.cpp - -$(OBJS)\baselib_process.obj: ..\..\src\common\process.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\process.cpp - -$(OBJS)\baselib_regex.obj: ..\..\src\common\regex.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\regex.cpp - -$(OBJS)\baselib_stdpbase.obj: ..\..\src\common\stdpbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stdpbase.cpp - -$(OBJS)\baselib_sstream.obj: ..\..\src\common\sstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\sstream.cpp - -$(OBJS)\baselib_stdstream.obj: ..\..\src\common\stdstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stdstream.cpp - -$(OBJS)\baselib_stopwatch.obj: ..\..\src\common\stopwatch.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stopwatch.cpp - -$(OBJS)\baselib_strconv.obj: ..\..\src\common\strconv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\strconv.cpp - -$(OBJS)\baselib_stream.obj: ..\..\src\common\stream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stream.cpp - -$(OBJS)\baselib_string.obj: ..\..\src\common\string.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\string.cpp - -$(OBJS)\baselib_stringimpl.obj: ..\..\src\common\stringimpl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stringimpl.cpp - -$(OBJS)\baselib_stringops.obj: ..\..\src\common\stringops.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\stringops.cpp - -$(OBJS)\baselib_strvararg.obj: ..\..\src\common\strvararg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\strvararg.cpp - -$(OBJS)\baselib_sysopt.obj: ..\..\src\common\sysopt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\sysopt.cpp - -$(OBJS)\baselib_tarstrm.obj: ..\..\src\common\tarstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\tarstrm.cpp - -$(OBJS)\baselib_textbuf.obj: ..\..\src\common\textbuf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textbuf.cpp - -$(OBJS)\baselib_textfile.obj: ..\..\src\common\textfile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\textfile.cpp - -$(OBJS)\baselib_threadinfo.obj: ..\..\src\common\threadinfo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\threadinfo.cpp - -$(OBJS)\baselib_time.obj: ..\..\src\common\time.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\time.cpp - -$(OBJS)\baselib_timercmn.obj: ..\..\src\common\timercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timercmn.cpp - -$(OBJS)\baselib_timerimpl.obj: ..\..\src\common\timerimpl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\timerimpl.cpp - -$(OBJS)\baselib_tokenzr.obj: ..\..\src\common\tokenzr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\tokenzr.cpp - -$(OBJS)\baselib_translation.obj: ..\..\src\common\translation.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\translation.cpp - -$(OBJS)\baselib_txtstrm.obj: ..\..\src\common\txtstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\txtstrm.cpp - -$(OBJS)\baselib_unichar.obj: ..\..\src\common\unichar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\unichar.cpp - -$(OBJS)\baselib_uri.obj: ..\..\src\common\uri.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\uri.cpp - -$(OBJS)\baselib_ustring.obj: ..\..\src\common\ustring.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\ustring.cpp - -$(OBJS)\baselib_variant.obj: ..\..\src\common\variant.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\variant.cpp - -$(OBJS)\baselib_wfstream.obj: ..\..\src\common\wfstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wfstream.cpp - -$(OBJS)\baselib_wxcrt.obj: ..\..\src\common\wxcrt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wxcrt.cpp - -$(OBJS)\baselib_wxprintf.obj: ..\..\src\common\wxprintf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\wxprintf.cpp - -$(OBJS)\baselib_xlocale.obj: ..\..\src\common\xlocale.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xlocale.cpp - -$(OBJS)\baselib_xti.obj: ..\..\src\common\xti.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xti.cpp - -$(OBJS)\baselib_xtistrm.obj: ..\..\src\common\xtistrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\xtistrm.cpp - -$(OBJS)\baselib_zipstrm.obj: ..\..\src\common\zipstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\zipstrm.cpp - -$(OBJS)\baselib_zstream.obj: ..\..\src\common\zstream.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\zstream.cpp - -$(OBJS)\baselib_fswatchercmn.obj: ..\..\src\common\fswatchercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fswatchercmn.cpp - -$(OBJS)\baselib_fswatcherg.obj: ..\..\src\generic\fswatcherg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\generic\fswatcherg.cpp - -$(OBJS)\baselib_basemsw.obj: ..\..\src\msw\basemsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\basemsw.cpp - -$(OBJS)\baselib_crashrpt.obj: ..\..\src\msw\crashrpt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\crashrpt.cpp - -$(OBJS)\baselib_debughlp.obj: ..\..\src\msw\debughlp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\debughlp.cpp - -$(OBJS)\baselib_dde.obj: ..\..\src\msw\dde.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dde.cpp - -$(OBJS)\baselib_dir.obj: ..\..\src\msw\dir.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dir.cpp - -$(OBJS)\baselib_dlmsw.obj: ..\..\src\msw\dlmsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\dlmsw.cpp - -$(OBJS)\baselib_evtloopconsole.obj: ..\..\src\msw\evtloopconsole.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\evtloopconsole.cpp - -$(OBJS)\baselib_mimetype.obj: ..\..\src\msw\mimetype.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\mimetype.cpp - -$(OBJS)\baselib_power.obj: ..\..\src\msw\power.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\power.cpp - -$(OBJS)\baselib_regconf.obj: ..\..\src\msw\regconf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\regconf.cpp - -$(OBJS)\baselib_registry.obj: ..\..\src\msw\registry.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\registry.cpp - -$(OBJS)\baselib_snglinst.obj: ..\..\src\msw\snglinst.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\snglinst.cpp - -$(OBJS)\baselib_stackwalk.obj: ..\..\src\msw\stackwalk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\stackwalk.cpp - -$(OBJS)\baselib_stdpaths.obj: ..\..\src\msw\stdpaths.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\stdpaths.cpp - -$(OBJS)\baselib_thread.obj: ..\..\src\msw\thread.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\thread.cpp - -$(OBJS)\baselib_timer.obj: ..\..\src\msw\timer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\timer.cpp - -$(OBJS)\baselib_utils.obj: ..\..\src\msw\utils.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\utils.cpp - -$(OBJS)\baselib_utilsexc.obj: ..\..\src\msw\utilsexc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\utilsexc.cpp - -$(OBJS)\baselib_fswatcher.obj: ..\..\src\msw\fswatcher.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\fswatcher.cpp - -$(OBJS)\baselib_event.obj: ..\..\src\common\event.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\event.cpp - -$(OBJS)\baselib_fs_mem.obj: ..\..\src\common\fs_mem.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\fs_mem.cpp - -$(OBJS)\baselib_msgout.obj: ..\..\src\common\msgout.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\msgout.cpp - -$(OBJS)\baselib_utilscmn.obj: ..\..\src\common\utilscmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp - -$(OBJS)\baselib_main.obj: ..\..\src\msw\main.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\main.cpp - -$(OBJS)\baselib_mslu.obj: ..\..\src\msw\mslu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\mslu.cpp - -$(OBJS)\baselib_volume.obj: ..\..\src\msw\volume.cpp - $(CXX) /c /nologo /TP /Fo$@ $(BASELIB_CXXFLAGS) ..\..\src\msw\volume.cpp - -$(OBJS)\netdll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\netdll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_NET ..\..\src\msw\version.rc - -$(OBJS)\netdll_fs_inet.obj: ..\..\src\common\fs_inet.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\fs_inet.cpp - -$(OBJS)\netdll_ftp.obj: ..\..\src\common\ftp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\ftp.cpp - -$(OBJS)\netdll_http.obj: ..\..\src\common\http.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\http.cpp - -$(OBJS)\netdll_protocol.obj: ..\..\src\common\protocol.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\protocol.cpp - -$(OBJS)\netdll_sckaddr.obj: ..\..\src\common\sckaddr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckaddr.cpp - -$(OBJS)\netdll_sckfile.obj: ..\..\src\common\sckfile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckfile.cpp - -$(OBJS)\netdll_sckipc.obj: ..\..\src\common\sckipc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckipc.cpp - -$(OBJS)\netdll_sckstrm.obj: ..\..\src\common\sckstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\sckstrm.cpp - -$(OBJS)\netdll_socket.obj: ..\..\src\common\socket.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\socket.cpp - -$(OBJS)\netdll_url.obj: ..\..\src\common\url.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\common\url.cpp - -$(OBJS)\netdll_sockmsw.obj: ..\..\src\msw\sockmsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\msw\sockmsw.cpp - -$(OBJS)\netdll_urlmsw.obj: ..\..\src\msw\urlmsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETDLL_CXXFLAGS) ..\..\src\msw\urlmsw.cpp - -$(OBJS)\netlib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\netlib_fs_inet.obj: ..\..\src\common\fs_inet.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\fs_inet.cpp - -$(OBJS)\netlib_ftp.obj: ..\..\src\common\ftp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\ftp.cpp - -$(OBJS)\netlib_http.obj: ..\..\src\common\http.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\http.cpp - -$(OBJS)\netlib_protocol.obj: ..\..\src\common\protocol.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\protocol.cpp - -$(OBJS)\netlib_sckaddr.obj: ..\..\src\common\sckaddr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckaddr.cpp - -$(OBJS)\netlib_sckfile.obj: ..\..\src\common\sckfile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckfile.cpp - -$(OBJS)\netlib_sckipc.obj: ..\..\src\common\sckipc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckipc.cpp - -$(OBJS)\netlib_sckstrm.obj: ..\..\src\common\sckstrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\sckstrm.cpp - -$(OBJS)\netlib_socket.obj: ..\..\src\common\socket.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\socket.cpp - -$(OBJS)\netlib_url.obj: ..\..\src\common\url.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\common\url.cpp - -$(OBJS)\netlib_sockmsw.obj: ..\..\src\msw\sockmsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\msw\sockmsw.cpp - -$(OBJS)\netlib_urlmsw.obj: ..\..\src\msw\urlmsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(NETLIB_CXXFLAGS) ..\..\src\msw\urlmsw.cpp - -$(OBJS)\coredll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\coredll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_CORE /d wxUSE_BASE=0 ..\..\src\msw\version.rc - -$(OBJS)\coredll_event.obj: ..\..\src\common\event.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\event.cpp - -$(OBJS)\coredll_fs_mem.obj: ..\..\src\common\fs_mem.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fs_mem.cpp - -$(OBJS)\coredll_msgout.obj: ..\..\src\common\msgout.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\msgout.cpp - -$(OBJS)\coredll_utilscmn.obj: ..\..\src\common\utilscmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\utilscmn.cpp - -$(OBJS)\coredll_main.obj: ..\..\src\msw\main.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\main.cpp - -$(OBJS)\coredll_mslu.obj: ..\..\src\msw\mslu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\mslu.cpp - -$(OBJS)\coredll_volume.obj: ..\..\src\msw\volume.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\volume.cpp - -$(OBJS)\coredll_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statusbr.cpp - -$(OBJS)\coredll_msw_accel.obj: ..\..\src\msw\accel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\accel.cpp - -$(OBJS)\coredll_anybutton.obj: ..\..\src\msw\anybutton.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\anybutton.cpp - -$(OBJS)\coredll_artmsw.obj: ..\..\src\msw\artmsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\artmsw.cpp - -$(OBJS)\coredll_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp - -$(OBJS)\coredll_msw_button.obj: ..\..\src\msw\button.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\button.cpp - -$(OBJS)\coredll_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checkbox.cpp - -$(OBJS)\coredll_msw_choice.obj: ..\..\src\msw\choice.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\choice.cpp - -$(OBJS)\coredll_colordlg.obj: ..\..\src\msw\colordlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\colordlg.cpp - -$(OBJS)\coredll_combo.obj: ..\..\src\msw\combo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combo.cpp - -$(OBJS)\coredll_msw_combobox.obj: ..\..\src\msw\combobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\combobox.cpp - -$(OBJS)\coredll_msw_control.obj: ..\..\src\msw\control.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\control.cpp - -$(OBJS)\coredll_msw_dialog.obj: ..\..\src\msw\dialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dialog.cpp - -$(OBJS)\coredll_dirdlg.obj: ..\..\src\msw\dirdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dirdlg.cpp - -$(OBJS)\coredll_dragimag.obj: ..\..\src\msw\dragimag.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dragimag.cpp - -$(OBJS)\coredll_filedlg.obj: ..\..\src\msw\filedlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\filedlg.cpp - -$(OBJS)\coredll_frame.obj: ..\..\src\msw\frame.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\frame.cpp - -$(OBJS)\coredll_msw_gauge.obj: ..\..\src\msw\gauge.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gauge.cpp - -$(OBJS)\coredll_headerctrl.obj: ..\..\src\msw\headerctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\headerctrl.cpp - -$(OBJS)\coredll_iniconf.obj: ..\..\src\msw\iniconf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\iniconf.cpp - -$(OBJS)\coredll_msw_listbox.obj: ..\..\src\msw\listbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listbox.cpp - -$(OBJS)\coredll_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\listctrl.cpp - -$(OBJS)\coredll_mdi.obj: ..\..\src\msw\mdi.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\mdi.cpp - -$(OBJS)\coredll_msw_menu.obj: ..\..\src\msw\menu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menu.cpp - -$(OBJS)\coredll_menuitem.obj: ..\..\src\msw\menuitem.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\menuitem.cpp - -$(OBJS)\coredll_metafile.obj: ..\..\src\msw\metafile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\metafile.cpp - -$(OBJS)\coredll_msgdlg.obj: ..\..\src\msw\msgdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\msgdlg.cpp - -$(OBJS)\coredll_nativdlg.obj: ..\..\src\msw\nativdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativdlg.cpp - -$(OBJS)\coredll_nativewin.obj: ..\..\src\msw\nativewin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nativewin.cpp - -$(OBJS)\coredll_msw_notebook.obj: ..\..\src\msw\notebook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\notebook.cpp - -$(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\access.cpp - -$(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp - -$(OBJS)\coredll_panel.obj: ..\..\src\msw\panel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\panel.cpp - -$(OBJS)\coredll_progdlg.obj: ..\..\src\msw\progdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp - -$(OBJS)\coredll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp - -$(OBJS)\coredll_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobut.cpp - -$(OBJS)\coredll_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp - -$(OBJS)\coredll_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\scrolbar.cpp - -$(OBJS)\coredll_msw_slider.obj: ..\..\src\msw\slider.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\slider.cpp - -$(OBJS)\coredll_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinbutt.cpp - -$(OBJS)\coredll_spinctrl.obj: ..\..\src\msw\spinctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\spinctrl.cpp - -$(OBJS)\coredll_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbmp.cpp - -$(OBJS)\coredll_msw_statbox.obj: ..\..\src\msw\statbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statbox.cpp - -$(OBJS)\coredll_statusbar.obj: ..\..\src\msw\statusbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statusbar.cpp - -$(OBJS)\coredll_msw_statline.obj: ..\..\src\msw\statline.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\statline.cpp - -$(OBJS)\coredll_msw_stattext.obj: ..\..\src\msw\stattext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\stattext.cpp - -$(OBJS)\coredll_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toolbar.cpp - -$(OBJS)\coredll_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textctrl.cpp - -$(OBJS)\coredll_textentry.obj: ..\..\src\msw\textentry.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textentry.cpp - -$(OBJS)\coredll_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tglbtn.cpp - -$(OBJS)\coredll_treectrl.obj: ..\..\src\msw\treectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\treectrl.cpp - -$(OBJS)\coredll_msw_checklst.obj: ..\..\src\msw\checklst.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\checklst.cpp - -$(OBJS)\coredll_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp - -$(OBJS)\coredll_fontdlg.obj: ..\..\src\msw\fontdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontdlg.cpp - -$(OBJS)\coredll_generic_accel.obj: ..\..\src\generic\accel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\accel.cpp - -$(OBJS)\coredll_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp - -$(OBJS)\coredll_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp - -$(OBJS)\coredll_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp - -$(OBJS)\coredll_filedlgg.obj: ..\..\src\generic\filedlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filedlgg.cpp - -$(OBJS)\coredll_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp - -$(OBJS)\coredll_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listctrl.cpp - -$(OBJS)\coredll_mdig.obj: ..\..\src\generic\mdig.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\mdig.cpp - -$(OBJS)\coredll_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp - -$(OBJS)\coredll_univ_button.obj: ..\..\src\univ\button.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\button.cpp - -$(OBJS)\coredll_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checkbox.cpp - -$(OBJS)\coredll_univ_checklst.obj: ..\..\src\univ\checklst.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\checklst.cpp - -$(OBJS)\coredll_univ_choice.obj: ..\..\src\univ\choice.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\choice.cpp - -$(OBJS)\coredll_univ_combobox.obj: ..\..\src\univ\combobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\combobox.cpp - -$(OBJS)\coredll_univ_control.obj: ..\..\src\univ\control.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\control.cpp - -$(OBJS)\coredll_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp - -$(OBJS)\coredll_univ_dialog.obj: ..\..\src\univ\dialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\dialog.cpp - -$(OBJS)\coredll_framuniv.obj: ..\..\src\univ\framuniv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\framuniv.cpp - -$(OBJS)\coredll_univ_gauge.obj: ..\..\src\univ\gauge.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\gauge.cpp - -$(OBJS)\coredll_inpcons.obj: ..\..\src\univ\inpcons.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inpcons.cpp - -$(OBJS)\coredll_inphand.obj: ..\..\src\univ\inphand.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\inphand.cpp - -$(OBJS)\coredll_univ_listbox.obj: ..\..\src\univ\listbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\listbox.cpp - -$(OBJS)\coredll_univ_menu.obj: ..\..\src\univ\menu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\menu.cpp - -$(OBJS)\coredll_univ_notebook.obj: ..\..\src\univ\notebook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\notebook.cpp - -$(OBJS)\coredll_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobox.cpp - -$(OBJS)\coredll_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\radiobut.cpp - -$(OBJS)\coredll_scrarrow.obj: ..\..\src\univ\scrarrow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrarrow.cpp - -$(OBJS)\coredll_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrolbar.cpp - -$(OBJS)\coredll_scrthumb.obj: ..\..\src\univ\scrthumb.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\scrthumb.cpp - -$(OBJS)\coredll_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp - -$(OBJS)\coredll_univ_slider.obj: ..\..\src\univ\slider.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\slider.cpp - -$(OBJS)\coredll_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\spinbutt.cpp - -$(OBJS)\coredll_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbmp.cpp - -$(OBJS)\coredll_univ_statbox.obj: ..\..\src\univ\statbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statbox.cpp - -$(OBJS)\coredll_univ_statline.obj: ..\..\src\univ\statline.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statline.cpp - -$(OBJS)\coredll_univ_stattext.obj: ..\..\src\univ\stattext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stattext.cpp - -$(OBJS)\coredll_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\statusbr.cpp - -$(OBJS)\coredll_stdrend.obj: ..\..\src\univ\stdrend.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\stdrend.cpp - -$(OBJS)\coredll_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\textctrl.cpp - -$(OBJS)\coredll_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\tglbtn.cpp - -$(OBJS)\coredll_theme.obj: ..\..\src\univ\theme.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\theme.cpp - -$(OBJS)\coredll_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\toolbar.cpp - -$(OBJS)\coredll_topluniv.obj: ..\..\src\univ\topluniv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\topluniv.cpp - -$(OBJS)\coredll_winuniv.obj: ..\..\src\univ\winuniv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\winuniv.cpp - -$(OBJS)\coredll_gtk.obj: ..\..\src\univ\themes\gtk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp - -$(OBJS)\coredll_metal.obj: ..\..\src\univ\themes\metal.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\metal.cpp - -$(OBJS)\coredll_mono.obj: ..\..\src\univ\themes\mono.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\mono.cpp - -$(OBJS)\coredll_win32.obj: ..\..\src\univ\themes\win32.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\univ\themes\win32.cpp - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_activex.obj: ..\..\src\msw\ole\activex.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\activex.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_app.obj: ..\..\src\msw\app.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\app.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_bitmap.obj: ..\..\src\msw\bitmap.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\bitmap.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_brush.obj: ..\..\src\msw\brush.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\brush.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_caret.obj: ..\..\src\msw\caret.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\caret.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_clipbrd.obj: ..\..\src\msw\clipbrd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\clipbrd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_colour.obj: ..\..\src\msw\colour.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\colour.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_cursor.obj: ..\..\src\msw\cursor.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\cursor.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_data.obj: ..\..\src\msw\data.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\data.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dc.obj: ..\..\src\msw\dc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcclient.obj: ..\..\src\msw\dcclient.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcclient.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcmemory.obj: ..\..\src\msw\dcmemory.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcmemory.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcprint.obj: ..\..\src\msw\dcprint.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcprint.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcscreen.obj: ..\..\src\msw\dcscreen.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dcscreen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dialup.obj: ..\..\src\msw\dialup.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dialup.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dib.obj: ..\..\src\msw\dib.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\dib.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_display.obj: ..\..\src\msw\display.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\display.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_enhmeta.obj: ..\..\src\msw\enhmeta.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\enhmeta.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_font.obj: ..\..\src\msw\font.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\font.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontenum.obj: ..\..\src\msw\fontenum.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontenum.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontutil.obj: ..\..\src\msw\fontutil.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\fontutil.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gdiimage.obj: ..\..\src\msw\gdiimage.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiimage.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gdiobj.obj: ..\..\src\msw\gdiobj.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiobj.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gdiplus.obj: ..\..\src\msw\gdiplus.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\gdiplus.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_graphics.obj: ..\..\src\msw\graphics.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\graphics.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_icon.obj: ..\..\src\msw\icon.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\icon.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imaglist.obj: ..\..\src\msw\imaglist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\imaglist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_minifram.obj: ..\..\src\msw\minifram.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\minifram.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_safearray.obj: ..\..\src\msw\ole\safearray.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_palette.obj: ..\..\src\msw\palette.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\palette.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_pen.obj: ..\..\src\msw\pen.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\pen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_popupwin.obj: ..\..\src\msw\popupwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\popupwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_printdlg.obj: ..\..\src\msw\printdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\printdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_printwin.obj: ..\..\src\msw\printwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\printwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_region.obj: ..\..\src\msw\region.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\region.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_renderer.obj: ..\..\src\msw\renderer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\renderer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_settings.obj: ..\..\src\msw\settings.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\settings.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_textmeasure.obj: ..\..\src\msw\textmeasure.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\textmeasure.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_tooltip.obj: ..\..\src\msw\tooltip.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\tooltip.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_toplevel.obj: ..\..\src\msw\toplevel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\toplevel.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_uiaction.obj: ..\..\src\msw\uiaction.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uiaction.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_utilsgui.obj: ..\..\src\msw\utilsgui.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilsgui.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_utilswin.obj: ..\..\src\msw\utilswin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\utilswin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_uxtheme.obj: ..\..\src\msw\uxtheme.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\uxtheme.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_window.obj: ..\..\src\msw\window.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\window.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_helpchm.obj: ..\..\src\msw\helpchm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\helpchm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_helpwin.obj: ..\..\src\msw\helpwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\helpwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_automtn.obj: ..\..\src\msw\ole\automtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_collpaneg.obj: ..\..\src\generic\collpaneg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\collpaneg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filepickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_accesscmn.obj: ..\..\src\common\accesscmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accesscmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_anidecod.obj: ..\..\src\common\anidecod.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\anidecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_appcmn.obj: ..\..\src\common\appcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\appcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_artprov.obj: ..\..\src\common\artprov.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\artprov.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_artstd.obj: ..\..\src\common\artstd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\artstd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_arttango.obj: ..\..\src\common\arttango.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\arttango.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_bmpbase.obj: ..\..\src\common\bmpbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\bookctrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_btncmn.obj: ..\..\src\common\btncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\btncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_cairo.obj: ..\..\src\common\cairo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cairo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\checklstcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_choiccmn.obj: ..\..\src\common\choiccmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\choiccmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_clipcmn.obj: ..\..\src\common\clipcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\clipcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_colourcmn.obj: ..\..\src\common\colourcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_colourdata.obj: ..\..\src\common\colourdata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\colourdata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_combocmn.obj: ..\..\src\common\combocmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\combocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_cmdproc.obj: ..\..\src\common\cmdproc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cmdproc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_cmndata.obj: ..\..\src\common\cmndata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cmndata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_containr.obj: ..\..\src\common\containr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\containr.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_cshelp.obj: ..\..\src\common\cshelp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\cshelp.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ctrlsub.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcbase.obj: ..\..\src\common\dcbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcgraph.obj: ..\..\src\common\dcgraph.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcgraph.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcsvg.obj: ..\..\src\common\dcsvg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dcsvg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dndcmn.obj: ..\..\src\common\dndcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dndcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dobjcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_docmdi.obj: ..\..\src\common\docmdi.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\docmdi.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_docview.obj: ..\..\src\common\docview.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\docview.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dpycmn.obj: ..\..\src\common\dpycmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dpycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dseldlg.obj: ..\..\src\common\dseldlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\dseldlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_effects.obj: ..\..\src\common\effects.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\effects.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_filehistorycmn.obj: ..\..\src\common\filehistorycmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\filehistorycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\filepickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontcmn.obj: ..\..\src\common\fontcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontdata.obj: ..\..\src\common\fontdata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontdata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_graphicc.obj: ..\..\src\generic\graphicc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\graphicc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontmap.obj: ..\..\src\common\fontmap.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontmap.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_framecmn.obj: ..\..\src\common\framecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\framecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gaugecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gbsizer.obj: ..\..\src\common\gbsizer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gbsizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gdicmn.obj: ..\..\src\common\gdicmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gdicmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_geometry.obj: ..\..\src\common\geometry.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\geometry.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_gifdecod.obj: ..\..\src\common\gifdecod.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\gifdecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_graphcmn.obj: ..\..\src\common\graphcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\graphcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headercolcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_helpbase.obj: ..\..\src\common\helpbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\helpbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_iconbndl.obj: ..\..\src\common\iconbndl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\iconbndl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagall.obj: ..\..\src\common\imagall.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagall.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagbmp.obj: ..\..\src\common\imagbmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagbmp.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_image.obj: ..\..\src\common\image.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\image.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagfill.obj: ..\..\src\common\imagfill.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagfill.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imaggif.obj: ..\..\src\common\imaggif.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imaggif.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagiff.obj: ..\..\src\common\imagiff.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagiff.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagjpeg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagpcx.obj: ..\..\src\common\imagpcx.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagpcx.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagpng.obj: ..\..\src\common\imagpng.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagpng.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagpnm.obj: ..\..\src\common\imagpnm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagpnm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagtga.obj: ..\..\src\common\imagtga.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagtga.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagtiff.obj: ..\..\src\common\imagtiff.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagtiff.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_imagxpm.obj: ..\..\src\common\imagxpm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\imagxpm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_layout.obj: ..\..\src\common\layout.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\layout.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\lboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_markupparser.obj: ..\..\src\common\markupparser.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\markupparser.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_matrix.obj: ..\..\src\common\matrix.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\matrix.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_menucmn.obj: ..\..\src\common\menucmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\menucmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_modalhook.obj: ..\..\src\common\modalhook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\modalhook.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_mousemanager.obj: ..\..\src\common\mousemanager.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\mousemanager.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\nbkbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_panelcmn.obj: ..\..\src\common\panelcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\panelcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\persist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_pickerbase.obj: ..\..\src\common\pickerbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\pickerbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\preferencescmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_prntbase.obj: ..\..\src\common\prntbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\prntbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_quantize.obj: ..\..\src\common\quantize.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\quantize.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_radiocmn.obj: ..\..\src\common\radiocmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\radiocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_rendcmn.obj: ..\..\src\common\rendcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rendcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_rgncmn.obj: ..\..\src\common\rgncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\rgncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_settcmn.obj: ..\..\src\common\settcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\settcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_sizer.obj: ..\..\src\common\sizer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\sizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_slidercmn.obj: ..\..\src\common\slidercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\slidercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_srchcmn.obj: ..\..\src\common\srchcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\srchcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_statbar.obj: ..\..\src\common\statbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\statlinecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\stattextcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_stockitem.obj: ..\..\src\common\stockitem.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\stockitem.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_tbarbase.obj: ..\..\src\common\tbarbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\tbarbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_textcmn.obj: ..\..\src\common\textcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textentrycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\toplvcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_treebase.obj: ..\..\src\common\treebase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\treebase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_uiactioncmn.obj: ..\..\src\common\uiactioncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\uiactioncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_valgen.obj: ..\..\src\common\valgen.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valgen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_validate.obj: ..\..\src\common\validate.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\validate.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_valtext.obj: ..\..\src\common\valtext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valtext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_valnum.obj: ..\..\src\common\valnum.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\valnum.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_wincmn.obj: ..\..\src\common\wincmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\wincmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_windowid.obj: ..\..\src\common\windowid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\windowid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\wrapsizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\xpmdecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_busyinfo.obj: ..\..\src\generic\busyinfo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\busyinfo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\buttonbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_choicdgg.obj: ..\..\src\generic\choicdgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\choicdgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\choicbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\combog.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dcpsg.obj: ..\..\src\generic\dcpsg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dcpsg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_dragimgg.obj: ..\..\src\generic\dragimgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\dragimgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_filectrlg.obj: ..\..\src\generic\filectrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\filectrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_infobar.obj: ..\..\src\generic\infobar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\infobar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_listbkg.obj: ..\..\src\generic\listbkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\listbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_logg.obj: ..\..\src\generic\logg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\logg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_markuptext.obj: ..\..\src\generic\markuptext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\markuptext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\numdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_preferencesg.obj: ..\..\src\generic\preferencesg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\preferencesg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_printps.obj: ..\..\src\generic\printps.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\printps.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_renderg.obj: ..\..\src\generic\renderg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\renderg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_scrlwing.obj: ..\..\src\generic\scrlwing.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\scrlwing.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_selstore.obj: ..\..\src\generic\selstore.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\selstore.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_spinctlg.obj: ..\..\src\generic\spinctlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\spinctlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_splitter.obj: ..\..\src\generic\splitter.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\splitter.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_srchctlg.obj: ..\..\src\generic\srchctlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\srchctlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_statbmpg.obj: ..\..\src\generic\statbmpg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\statbmpg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_stattextg.obj: ..\..\src\generic\stattextg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\stattextg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_textdlgg.obj: ..\..\src\generic\textdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\textdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_tipwin.obj: ..\..\src\generic\tipwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\tipwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_toolbkg.obj: ..\..\src\generic\toolbkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\toolbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_treectlg.obj: ..\..\src\generic\treectlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treectlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_treebkg.obj: ..\..\src\generic\treebkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\treebkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_vlbox.obj: ..\..\src\generic\vlbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vlbox.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_vscroll.obj: ..\..\src\generic\vscroll.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\vscroll.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\coredll_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp - $(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp -!endif - -$(OBJS)\corelib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\corelib_event.obj: ..\..\src\common\event.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\event.cpp - -$(OBJS)\corelib_fs_mem.obj: ..\..\src\common\fs_mem.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fs_mem.cpp - -$(OBJS)\corelib_msgout.obj: ..\..\src\common\msgout.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\msgout.cpp - -$(OBJS)\corelib_utilscmn.obj: ..\..\src\common\utilscmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\utilscmn.cpp - -$(OBJS)\corelib_main.obj: ..\..\src\msw\main.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\main.cpp - -$(OBJS)\corelib_mslu.obj: ..\..\src\msw\mslu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\mslu.cpp - -$(OBJS)\corelib_volume.obj: ..\..\src\msw\volume.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\volume.cpp - -$(OBJS)\corelib_generic_statusbr.obj: ..\..\src\generic\statusbr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statusbr.cpp - -$(OBJS)\corelib_msw_accel.obj: ..\..\src\msw\accel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\accel.cpp - -$(OBJS)\corelib_anybutton.obj: ..\..\src\msw\anybutton.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\anybutton.cpp - -$(OBJS)\corelib_artmsw.obj: ..\..\src\msw\artmsw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\artmsw.cpp - -$(OBJS)\corelib_msw_bmpbuttn.obj: ..\..\src\msw\bmpbuttn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\bmpbuttn.cpp - -$(OBJS)\corelib_msw_button.obj: ..\..\src\msw\button.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\button.cpp - -$(OBJS)\corelib_msw_checkbox.obj: ..\..\src\msw\checkbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checkbox.cpp - -$(OBJS)\corelib_msw_choice.obj: ..\..\src\msw\choice.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\choice.cpp - -$(OBJS)\corelib_colordlg.obj: ..\..\src\msw\colordlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\colordlg.cpp - -$(OBJS)\corelib_combo.obj: ..\..\src\msw\combo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combo.cpp - -$(OBJS)\corelib_msw_combobox.obj: ..\..\src\msw\combobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\combobox.cpp - -$(OBJS)\corelib_msw_control.obj: ..\..\src\msw\control.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\control.cpp - -$(OBJS)\corelib_msw_dialog.obj: ..\..\src\msw\dialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dialog.cpp - -$(OBJS)\corelib_dirdlg.obj: ..\..\src\msw\dirdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dirdlg.cpp - -$(OBJS)\corelib_dragimag.obj: ..\..\src\msw\dragimag.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dragimag.cpp - -$(OBJS)\corelib_filedlg.obj: ..\..\src\msw\filedlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\filedlg.cpp - -$(OBJS)\corelib_frame.obj: ..\..\src\msw\frame.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\frame.cpp - -$(OBJS)\corelib_msw_gauge.obj: ..\..\src\msw\gauge.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gauge.cpp - -$(OBJS)\corelib_headerctrl.obj: ..\..\src\msw\headerctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\headerctrl.cpp - -$(OBJS)\corelib_iniconf.obj: ..\..\src\msw\iniconf.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\iniconf.cpp - -$(OBJS)\corelib_msw_listbox.obj: ..\..\src\msw\listbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listbox.cpp - -$(OBJS)\corelib_msw_listctrl.obj: ..\..\src\msw\listctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\listctrl.cpp - -$(OBJS)\corelib_mdi.obj: ..\..\src\msw\mdi.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\mdi.cpp - -$(OBJS)\corelib_msw_menu.obj: ..\..\src\msw\menu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menu.cpp - -$(OBJS)\corelib_menuitem.obj: ..\..\src\msw\menuitem.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\menuitem.cpp - -$(OBJS)\corelib_metafile.obj: ..\..\src\msw\metafile.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\metafile.cpp - -$(OBJS)\corelib_msgdlg.obj: ..\..\src\msw\msgdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\msgdlg.cpp - -$(OBJS)\corelib_nativdlg.obj: ..\..\src\msw\nativdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativdlg.cpp - -$(OBJS)\corelib_nativewin.obj: ..\..\src\msw\nativewin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nativewin.cpp - -$(OBJS)\corelib_msw_notebook.obj: ..\..\src\msw\notebook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\notebook.cpp - -$(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\access.cpp - -$(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp - -$(OBJS)\corelib_panel.obj: ..\..\src\msw\panel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\panel.cpp - -$(OBJS)\corelib_progdlg.obj: ..\..\src\msw\progdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp - -$(OBJS)\corelib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp - -$(OBJS)\corelib_msw_radiobut.obj: ..\..\src\msw\radiobut.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobut.cpp - -$(OBJS)\corelib_richmsgdlg.obj: ..\..\src\msw\richmsgdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\richmsgdlg.cpp - -$(OBJS)\corelib_msw_scrolbar.obj: ..\..\src\msw\scrolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\scrolbar.cpp - -$(OBJS)\corelib_msw_slider.obj: ..\..\src\msw\slider.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\slider.cpp - -$(OBJS)\corelib_msw_spinbutt.obj: ..\..\src\msw\spinbutt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinbutt.cpp - -$(OBJS)\corelib_spinctrl.obj: ..\..\src\msw\spinctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\spinctrl.cpp - -$(OBJS)\corelib_msw_statbmp.obj: ..\..\src\msw\statbmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbmp.cpp - -$(OBJS)\corelib_msw_statbox.obj: ..\..\src\msw\statbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statbox.cpp - -$(OBJS)\corelib_statusbar.obj: ..\..\src\msw\statusbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statusbar.cpp - -$(OBJS)\corelib_msw_statline.obj: ..\..\src\msw\statline.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\statline.cpp - -$(OBJS)\corelib_msw_stattext.obj: ..\..\src\msw\stattext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\stattext.cpp - -$(OBJS)\corelib_msw_toolbar.obj: ..\..\src\msw\toolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toolbar.cpp - -$(OBJS)\corelib_msw_textctrl.obj: ..\..\src\msw\textctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textctrl.cpp - -$(OBJS)\corelib_textentry.obj: ..\..\src\msw\textentry.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textentry.cpp - -$(OBJS)\corelib_msw_tglbtn.obj: ..\..\src\msw\tglbtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tglbtn.cpp - -$(OBJS)\corelib_treectrl.obj: ..\..\src\msw\treectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\treectrl.cpp - -$(OBJS)\corelib_msw_checklst.obj: ..\..\src\msw\checklst.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\checklst.cpp - -$(OBJS)\corelib_msw_fdrepdlg.obj: ..\..\src\msw\fdrepdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fdrepdlg.cpp - -$(OBJS)\corelib_fontdlg.obj: ..\..\src\msw\fontdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontdlg.cpp - -$(OBJS)\corelib_generic_accel.obj: ..\..\src\generic\accel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\accel.cpp - -$(OBJS)\corelib_colrdlgg.obj: ..\..\src\generic\colrdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\colrdlgg.cpp - -$(OBJS)\corelib_dirdlgg.obj: ..\..\src\generic\dirdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dirdlgg.cpp - -$(OBJS)\corelib_generic_fdrepdlg.obj: ..\..\src\generic\fdrepdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fdrepdlg.cpp - -$(OBJS)\corelib_filedlgg.obj: ..\..\src\generic\filedlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filedlgg.cpp - -$(OBJS)\corelib_fontdlgg.obj: ..\..\src\generic\fontdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontdlgg.cpp - -$(OBJS)\corelib_generic_listctrl.obj: ..\..\src\generic\listctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listctrl.cpp - -$(OBJS)\corelib_mdig.obj: ..\..\src\generic\mdig.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\mdig.cpp - -$(OBJS)\corelib_univ_bmpbuttn.obj: ..\..\src\univ\bmpbuttn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\bmpbuttn.cpp - -$(OBJS)\corelib_univ_button.obj: ..\..\src\univ\button.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\button.cpp - -$(OBJS)\corelib_univ_checkbox.obj: ..\..\src\univ\checkbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checkbox.cpp - -$(OBJS)\corelib_univ_checklst.obj: ..\..\src\univ\checklst.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\checklst.cpp - -$(OBJS)\corelib_univ_choice.obj: ..\..\src\univ\choice.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\choice.cpp - -$(OBJS)\corelib_univ_combobox.obj: ..\..\src\univ\combobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\combobox.cpp - -$(OBJS)\corelib_univ_control.obj: ..\..\src\univ\control.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\control.cpp - -$(OBJS)\corelib_ctrlrend.obj: ..\..\src\univ\ctrlrend.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\ctrlrend.cpp - -$(OBJS)\corelib_univ_dialog.obj: ..\..\src\univ\dialog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\dialog.cpp - -$(OBJS)\corelib_framuniv.obj: ..\..\src\univ\framuniv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\framuniv.cpp - -$(OBJS)\corelib_univ_gauge.obj: ..\..\src\univ\gauge.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\gauge.cpp - -$(OBJS)\corelib_inpcons.obj: ..\..\src\univ\inpcons.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inpcons.cpp - -$(OBJS)\corelib_inphand.obj: ..\..\src\univ\inphand.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\inphand.cpp - -$(OBJS)\corelib_univ_listbox.obj: ..\..\src\univ\listbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\listbox.cpp - -$(OBJS)\corelib_univ_menu.obj: ..\..\src\univ\menu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\menu.cpp - -$(OBJS)\corelib_univ_notebook.obj: ..\..\src\univ\notebook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\notebook.cpp - -$(OBJS)\corelib_univ_radiobox.obj: ..\..\src\univ\radiobox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobox.cpp - -$(OBJS)\corelib_univ_radiobut.obj: ..\..\src\univ\radiobut.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\radiobut.cpp - -$(OBJS)\corelib_scrarrow.obj: ..\..\src\univ\scrarrow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrarrow.cpp - -$(OBJS)\corelib_univ_scrolbar.obj: ..\..\src\univ\scrolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrolbar.cpp - -$(OBJS)\corelib_scrthumb.obj: ..\..\src\univ\scrthumb.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\scrthumb.cpp - -$(OBJS)\corelib_settingsuniv.obj: ..\..\src\univ\settingsuniv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\settingsuniv.cpp - -$(OBJS)\corelib_univ_slider.obj: ..\..\src\univ\slider.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\slider.cpp - -$(OBJS)\corelib_univ_spinbutt.obj: ..\..\src\univ\spinbutt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\spinbutt.cpp - -$(OBJS)\corelib_univ_statbmp.obj: ..\..\src\univ\statbmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbmp.cpp - -$(OBJS)\corelib_univ_statbox.obj: ..\..\src\univ\statbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statbox.cpp - -$(OBJS)\corelib_univ_statline.obj: ..\..\src\univ\statline.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statline.cpp - -$(OBJS)\corelib_univ_stattext.obj: ..\..\src\univ\stattext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stattext.cpp - -$(OBJS)\corelib_univ_statusbr.obj: ..\..\src\univ\statusbr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\statusbr.cpp - -$(OBJS)\corelib_stdrend.obj: ..\..\src\univ\stdrend.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\stdrend.cpp - -$(OBJS)\corelib_univ_textctrl.obj: ..\..\src\univ\textctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\textctrl.cpp - -$(OBJS)\corelib_univ_tglbtn.obj: ..\..\src\univ\tglbtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\tglbtn.cpp - -$(OBJS)\corelib_theme.obj: ..\..\src\univ\theme.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\theme.cpp - -$(OBJS)\corelib_univ_toolbar.obj: ..\..\src\univ\toolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\toolbar.cpp - -$(OBJS)\corelib_topluniv.obj: ..\..\src\univ\topluniv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\topluniv.cpp - -$(OBJS)\corelib_winuniv.obj: ..\..\src\univ\winuniv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\winuniv.cpp - -$(OBJS)\corelib_gtk.obj: ..\..\src\univ\themes\gtk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\gtk.cpp - -$(OBJS)\corelib_metal.obj: ..\..\src\univ\themes\metal.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\metal.cpp - -$(OBJS)\corelib_mono.obj: ..\..\src\univ\themes\mono.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\mono.cpp - -$(OBJS)\corelib_win32.obj: ..\..\src\univ\themes\win32.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\univ\themes\win32.cpp - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_activex.obj: ..\..\src\msw\ole\activex.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\activex.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_app.obj: ..\..\src\msw\app.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\app.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_bitmap.obj: ..\..\src\msw\bitmap.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\bitmap.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_brush.obj: ..\..\src\msw\brush.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\brush.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_caret.obj: ..\..\src\msw\caret.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\caret.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_clipbrd.obj: ..\..\src\msw\clipbrd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\clipbrd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_colour.obj: ..\..\src\msw\colour.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\colour.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_cursor.obj: ..\..\src\msw\cursor.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\cursor.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_data.obj: ..\..\src\msw\data.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\data.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dc.obj: ..\..\src\msw\dc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcclient.obj: ..\..\src\msw\dcclient.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcclient.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcmemory.obj: ..\..\src\msw\dcmemory.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcmemory.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcprint.obj: ..\..\src\msw\dcprint.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcprint.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcscreen.obj: ..\..\src\msw\dcscreen.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dcscreen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dialup.obj: ..\..\src\msw\dialup.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dialup.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dib.obj: ..\..\src\msw\dib.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\dib.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_display.obj: ..\..\src\msw\display.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\display.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_enhmeta.obj: ..\..\src\msw\enhmeta.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\enhmeta.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_font.obj: ..\..\src\msw\font.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\font.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontenum.obj: ..\..\src\msw\fontenum.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontenum.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontutil.obj: ..\..\src\msw\fontutil.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\fontutil.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gdiimage.obj: ..\..\src\msw\gdiimage.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiimage.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gdiobj.obj: ..\..\src\msw\gdiobj.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiobj.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gdiplus.obj: ..\..\src\msw\gdiplus.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\gdiplus.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_graphics.obj: ..\..\src\msw\graphics.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\graphics.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_icon.obj: ..\..\src\msw\icon.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\icon.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imaglist.obj: ..\..\src\msw\imaglist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\imaglist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_minifram.obj: ..\..\src\msw\minifram.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\minifram.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_nonownedwnd.obj: ..\..\src\msw\nonownedwnd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\nonownedwnd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dataobj.obj: ..\..\src\msw\ole\dataobj.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dataobj.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dropsrc.obj: ..\..\src\msw\ole\dropsrc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\dropsrc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_droptgt.obj: ..\..\src\msw\ole\droptgt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\droptgt.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_oleutils.obj: ..\..\src\msw\ole\oleutils.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\oleutils.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_safearray.obj: ..\..\src\msw\ole\safearray.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\safearray.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_palette.obj: ..\..\src\msw\palette.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\palette.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_pen.obj: ..\..\src\msw\pen.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\pen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_popupwin.obj: ..\..\src\msw\popupwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\popupwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_printdlg.obj: ..\..\src\msw\printdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\printdlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_printwin.obj: ..\..\src\msw\printwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\printwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_region.obj: ..\..\src\msw\region.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\region.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_renderer.obj: ..\..\src\msw\renderer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\renderer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_settings.obj: ..\..\src\msw\settings.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\settings.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_textmeasure.obj: ..\..\src\msw\textmeasure.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\textmeasure.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_tooltip.obj: ..\..\src\msw\tooltip.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\tooltip.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_toplevel.obj: ..\..\src\msw\toplevel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\toplevel.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_uiaction.obj: ..\..\src\msw\uiaction.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uiaction.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_utilsgui.obj: ..\..\src\msw\utilsgui.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilsgui.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_utilswin.obj: ..\..\src\msw\utilswin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\utilswin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_uxtheme.obj: ..\..\src\msw\uxtheme.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\uxtheme.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_window.obj: ..\..\src\msw\window.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\window.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_helpchm.obj: ..\..\src\msw\helpchm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\helpchm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_helpwin.obj: ..\..\src\msw\helpwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\helpwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_automtn.obj: ..\..\src\msw\ole\automtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\automtn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_uuid.obj: ..\..\src\msw\ole\uuid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ole\uuid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_clrpickerg.obj: ..\..\src\generic\clrpickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\clrpickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_collpaneg.obj: ..\..\src\generic\collpaneg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\collpaneg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_filepickerg.obj: ..\..\src\generic\filepickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filepickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontpickerg.obj: ..\..\src\generic\fontpickerg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\fontpickerg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_prntdlgg.obj: ..\..\src\generic\prntdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\prntdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_accesscmn.obj: ..\..\src\common\accesscmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accesscmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_anidecod.obj: ..\..\src\common\anidecod.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\anidecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_affinematrix2d.obj: ..\..\src\common\affinematrix2d.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\affinematrix2d.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_appcmn.obj: ..\..\src\common\appcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\appcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_artprov.obj: ..\..\src\common\artprov.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\artprov.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_artstd.obj: ..\..\src\common\artstd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\artstd.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_arttango.obj: ..\..\src\common\arttango.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\arttango.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_bmpbase.obj: ..\..\src\common\bmpbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_bmpbtncmn.obj: ..\..\src\common\bmpbtncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bmpbtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\bookctrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_btncmn.obj: ..\..\src\common\btncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\btncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_cairo.obj: ..\..\src\common\cairo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cairo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_checkboxcmn.obj: ..\..\src\common\checkboxcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checkboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_checklstcmn.obj: ..\..\src\common\checklstcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\checklstcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_choiccmn.obj: ..\..\src\common\choiccmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\choiccmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_clipcmn.obj: ..\..\src\common\clipcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\clipcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_clrpickercmn.obj: ..\..\src\common\clrpickercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\clrpickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_colourcmn.obj: ..\..\src\common\colourcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_colourdata.obj: ..\..\src\common\colourdata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\colourdata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_combocmn.obj: ..\..\src\common\combocmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\combocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_cmdproc.obj: ..\..\src\common\cmdproc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cmdproc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_cmndata.obj: ..\..\src\common\cmndata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cmndata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_containr.obj: ..\..\src\common\containr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\containr.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_cshelp.obj: ..\..\src\common\cshelp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\cshelp.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_ctrlcmn.obj: ..\..\src\common\ctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_ctrlsub.obj: ..\..\src\common\ctrlsub.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ctrlsub.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcbase.obj: ..\..\src\common\dcbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcbufcmn.obj: ..\..\src\common\dcbufcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcbufcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcgraph.obj: ..\..\src\common\dcgraph.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcgraph.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcsvg.obj: ..\..\src\common\dcsvg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dcsvg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dirctrlcmn.obj: ..\..\src\common\dirctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dirctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dlgcmn.obj: ..\..\src\common\dlgcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dndcmn.obj: ..\..\src\common\dndcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dndcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dobjcmn.obj: ..\..\src\common\dobjcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dobjcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_docmdi.obj: ..\..\src\common\docmdi.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\docmdi.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_docview.obj: ..\..\src\common\docview.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\docview.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dpycmn.obj: ..\..\src\common\dpycmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dpycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dseldlg.obj: ..\..\src\common\dseldlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\dseldlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_effects.obj: ..\..\src\common\effects.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\effects.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fddlgcmn.obj: ..\..\src\common\fddlgcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fddlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_filectrlcmn.obj: ..\..\src\common\filectrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\filectrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_filehistorycmn.obj: ..\..\src\common\filehistorycmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\filehistorycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_filepickercmn.obj: ..\..\src\common\filepickercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\filepickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontpickercmn.obj: ..\..\src\common\fontpickercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontpickercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fldlgcmn.obj: ..\..\src\common\fldlgcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fldlgcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontcmn.obj: ..\..\src\common\fontcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontdata.obj: ..\..\src\common\fontdata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontdata.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_graphicc.obj: ..\..\src\generic\graphicc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\graphicc.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontenumcmn.obj: ..\..\src\common\fontenumcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontenumcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontmap.obj: ..\..\src\common\fontmap.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontmap.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_fontutilcmn.obj: ..\..\src\common\fontutilcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\fontutilcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_framecmn.obj: ..\..\src\common\framecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\framecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gaugecmn.obj: ..\..\src\common\gaugecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gaugecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gbsizer.obj: ..\..\src\common\gbsizer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gbsizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gdicmn.obj: ..\..\src\common\gdicmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gdicmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_geometry.obj: ..\..\src\common\geometry.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\geometry.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_gifdecod.obj: ..\..\src\common\gifdecod.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\gifdecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_graphcmn.obj: ..\..\src\common\graphcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\graphcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_headercolcmn.obj: ..\..\src\common\headercolcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headercolcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_headerctrlcmn.obj: ..\..\src\common\headerctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\headerctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_helpbase.obj: ..\..\src\common\helpbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\helpbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_iconbndl.obj: ..\..\src\common\iconbndl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\iconbndl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagall.obj: ..\..\src\common\imagall.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagall.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagbmp.obj: ..\..\src\common\imagbmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagbmp.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_image.obj: ..\..\src\common\image.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\image.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagfill.obj: ..\..\src\common\imagfill.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagfill.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imaggif.obj: ..\..\src\common\imaggif.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imaggif.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagiff.obj: ..\..\src\common\imagiff.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagiff.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagjpeg.obj: ..\..\src\common\imagjpeg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagjpeg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagpcx.obj: ..\..\src\common\imagpcx.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagpcx.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagpng.obj: ..\..\src\common\imagpng.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagpng.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagpnm.obj: ..\..\src\common\imagpnm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagpnm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagtga.obj: ..\..\src\common\imagtga.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagtga.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagtiff.obj: ..\..\src\common\imagtiff.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagtiff.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_imagxpm.obj: ..\..\src\common\imagxpm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\imagxpm.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_layout.obj: ..\..\src\common\layout.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\layout.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_lboxcmn.obj: ..\..\src\common\lboxcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\lboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_listctrlcmn.obj: ..\..\src\common\listctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\listctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_markupparser.obj: ..\..\src\common\markupparser.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\markupparser.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_matrix.obj: ..\..\src\common\matrix.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\matrix.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_menucmn.obj: ..\..\src\common\menucmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\menucmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_modalhook.obj: ..\..\src\common\modalhook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\modalhook.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_mousemanager.obj: ..\..\src\common\mousemanager.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\mousemanager.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\nbkbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_panelcmn.obj: ..\..\src\common\panelcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\panelcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\persist.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_pickerbase.obj: ..\..\src\common\pickerbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\pickerbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\preferencescmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_prntbase.obj: ..\..\src\common\prntbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\prntbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_quantize.obj: ..\..\src\common\quantize.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\quantize.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_radiobtncmn.obj: ..\..\src\common\radiobtncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiobtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_radiocmn.obj: ..\..\src\common\radiocmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\radiocmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_rearrangectrl.obj: ..\..\src\common\rearrangectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rearrangectrl.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_rendcmn.obj: ..\..\src\common\rendcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rendcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_rgncmn.obj: ..\..\src\common\rgncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\rgncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_scrolbarcmn.obj: ..\..\src\common\scrolbarcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\scrolbarcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_settcmn.obj: ..\..\src\common\settcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\settcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_sizer.obj: ..\..\src\common\sizer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\sizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_slidercmn.obj: ..\..\src\common\slidercmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\slidercmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_spinbtncmn.obj: ..\..\src\common\spinbtncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinbtncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_spinctrlcmn.obj: ..\..\src\common\spinctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\spinctrlcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_srchcmn.obj: ..\..\src\common\srchcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\srchcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_statbar.obj: ..\..\src\common\statbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_statbmpcmn.obj: ..\..\src\common\statbmpcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statbmpcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_statboxcmn.obj: ..\..\src\common\statboxcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statboxcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_statlinecmn.obj: ..\..\src\common\statlinecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\statlinecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_stattextcmn.obj: ..\..\src\common\stattextcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\stattextcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_stockitem.obj: ..\..\src\common\stockitem.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\stockitem.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_tbarbase.obj: ..\..\src\common\tbarbase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\tbarbase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_textcmn.obj: ..\..\src\common\textcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_textentrycmn.obj: ..\..\src\common\textentrycmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textentrycmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_textmeasurecmn.obj: ..\..\src\common\textmeasurecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\textmeasurecmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_toplvcmn.obj: ..\..\src\common\toplvcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\toplvcmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_treebase.obj: ..\..\src\common\treebase.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\treebase.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_uiactioncmn.obj: ..\..\src\common\uiactioncmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\uiactioncmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_valgen.obj: ..\..\src\common\valgen.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valgen.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_validate.obj: ..\..\src\common\validate.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\validate.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_valtext.obj: ..\..\src\common\valtext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valtext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_valnum.obj: ..\..\src\common\valnum.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\valnum.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_wincmn.obj: ..\..\src\common\wincmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\wincmn.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_windowid.obj: ..\..\src\common\windowid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\windowid.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_wrapsizer.obj: ..\..\src\common\wrapsizer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\wrapsizer.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_xpmdecod.obj: ..\..\src\common\xpmdecod.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\xpmdecod.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_busyinfo.obj: ..\..\src\generic\busyinfo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\busyinfo.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\buttonbar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_choicdgg.obj: ..\..\src\generic\choicdgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\choicdgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\choicbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\combog.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dcpsg.obj: ..\..\src\generic\dcpsg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dcpsg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dirctrlg.obj: ..\..\src\generic\dirctrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dirctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_dragimgg.obj: ..\..\src\generic\dragimgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\dragimgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_filectrlg.obj: ..\..\src\generic\filectrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\filectrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_headerctrlg.obj: ..\..\src\generic\headerctrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\headerctrlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_infobar.obj: ..\..\src\generic\infobar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\infobar.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_listbkg.obj: ..\..\src\generic\listbkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\listbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_logg.obj: ..\..\src\generic\logg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\logg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_markuptext.obj: ..\..\src\generic\markuptext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\markuptext.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_msgdlgg.obj: ..\..\src\generic\msgdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\msgdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\numdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_preferencesg.obj: ..\..\src\generic\preferencesg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\preferencesg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_printps.obj: ..\..\src\generic\printps.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\printps.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_renderg.obj: ..\..\src\generic\renderg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\renderg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_richmsgdlgg.obj: ..\..\src\generic\richmsgdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\richmsgdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_scrlwing.obj: ..\..\src\generic\scrlwing.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\scrlwing.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_selstore.obj: ..\..\src\generic\selstore.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\selstore.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_spinctlg.obj: ..\..\src\generic\spinctlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\spinctlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_splitter.obj: ..\..\src\generic\splitter.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\splitter.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_srchctlg.obj: ..\..\src\generic\srchctlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\srchctlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_statbmpg.obj: ..\..\src\generic\statbmpg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\statbmpg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_stattextg.obj: ..\..\src\generic\stattextg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\stattextg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_textdlgg.obj: ..\..\src\generic\textdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\textdlgg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_tipwin.obj: ..\..\src\generic\tipwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\tipwin.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_toolbkg.obj: ..\..\src\generic\toolbkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\toolbkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_treectlg.obj: ..\..\src\generic\treectlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treectlg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_treebkg.obj: ..\..\src\generic\treebkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\treebkg.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_vlbox.obj: ..\..\src\generic\vlbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vlbox.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_vscroll.obj: ..\..\src\generic\vscroll.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\vscroll.cpp -!endif - -!if "$(USE_GUI)" == "1" -$(OBJS)\corelib_xmlreshandler.obj: ..\..\src\xrc\xmlreshandler.cpp - $(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\xrc\xmlreshandler.cpp -!endif - -$(OBJS)\advdll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\advdll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_ADV ..\..\src\msw\version.rc - -$(OBJS)\advdll_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp - -$(OBJS)\advdll_calctrl.obj: ..\..\src\msw\calctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\calctrl.cpp - -$(OBJS)\advdll_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp - -$(OBJS)\advdll_datecontrols.obj: ..\..\src\msw\datecontrols.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datecontrols.cpp - -$(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datectrl.cpp - -$(OBJS)\advdll_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp - -$(OBJS)\advdll_hyperlink.obj: ..\..\src\msw\hyperlink.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\hyperlink.cpp - -$(OBJS)\advdll_timectrl.obj: ..\..\src\msw\timectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\timectrl.cpp - -$(OBJS)\advdll_animatecmn.obj: ..\..\src\common\animatecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\animatecmn.cpp - -$(OBJS)\advdll_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp - -$(OBJS)\advdll_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp - -$(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\datavcmn.cpp - -$(OBJS)\advdll_gridcmn.obj: ..\..\src\common\gridcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\gridcmn.cpp - -$(OBJS)\advdll_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp - -$(OBJS)\advdll_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\odcombocmn.cpp - -$(OBJS)\advdll_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp - -$(OBJS)\advdll_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp - -$(OBJS)\advdll_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp - -$(OBJS)\advdll_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp - -$(OBJS)\advdll_calctrlg.obj: ..\..\src\generic\calctrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\calctrlg.cpp - -$(OBJS)\advdll_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp - -$(OBJS)\advdll_datavgen.obj: ..\..\src\generic\datavgen.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\datavgen.cpp - -$(OBJS)\advdll_datectlg.obj: ..\..\src\generic\datectlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\datectlg.cpp - -$(OBJS)\advdll_editlbox.obj: ..\..\src\generic\editlbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\editlbox.cpp - -$(OBJS)\advdll_grid.obj: ..\..\src\generic\grid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\grid.cpp - -$(OBJS)\advdll_gridctrl.obj: ..\..\src\generic\gridctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\gridctrl.cpp - -$(OBJS)\advdll_grideditors.obj: ..\..\src\generic\grideditors.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\grideditors.cpp - -$(OBJS)\advdll_gridsel.obj: ..\..\src\generic\gridsel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\gridsel.cpp - -$(OBJS)\advdll_helpext.obj: ..\..\src\generic\helpext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\helpext.cpp - -$(OBJS)\advdll_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp - -$(OBJS)\advdll_laywin.obj: ..\..\src\generic\laywin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\laywin.cpp - -$(OBJS)\advdll_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp - -$(OBJS)\advdll_odcombo.obj: ..\..\src\generic\odcombo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\odcombo.cpp - -$(OBJS)\advdll_propdlg.obj: ..\..\src\generic\propdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\propdlg.cpp - -$(OBJS)\advdll_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp - -$(OBJS)\advdll_sashwin.obj: ..\..\src\generic\sashwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\sashwin.cpp - -$(OBJS)\advdll_splash.obj: ..\..\src\generic\splash.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\splash.cpp - -$(OBJS)\advdll_timectrlg.obj: ..\..\src\generic\timectrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\timectrlg.cpp - -$(OBJS)\advdll_tipdlg.obj: ..\..\src\generic\tipdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\tipdlg.cpp - -$(OBJS)\advdll_treelist.obj: ..\..\src\generic\treelist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\treelist.cpp - -$(OBJS)\advdll_wizard.obj: ..\..\src\generic\wizard.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\wizard.cpp - -$(OBJS)\advdll_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp - -$(OBJS)\advdll_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp - -$(OBJS)\advdll_notifmsg.obj: ..\..\src\msw\notifmsg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\notifmsg.cpp - -$(OBJS)\advdll_richtooltip.obj: ..\..\src\msw\richtooltip.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\richtooltip.cpp - -$(OBJS)\advdll_sound.obj: ..\..\src\msw\sound.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\sound.cpp - -$(OBJS)\advdll_taskbar.obj: ..\..\src\msw\taskbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\taskbar.cpp - -$(OBJS)\advdll_joystick.obj: ..\..\src\msw\joystick.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\msw\joystick.cpp - -$(OBJS)\advdll_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) ..\..\src\generic\animateg.cpp - -$(OBJS)\advlib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\advlib_bmpcbox.obj: ..\..\src\msw\bmpcbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\bmpcbox.cpp - -$(OBJS)\advlib_calctrl.obj: ..\..\src\msw\calctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\calctrl.cpp - -$(OBJS)\advlib_commandlinkbutton.obj: ..\..\src\msw\commandlinkbutton.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\commandlinkbutton.cpp - -$(OBJS)\advlib_datecontrols.obj: ..\..\src\msw\datecontrols.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datecontrols.cpp - -$(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datectrl.cpp - -$(OBJS)\advlib_datetimectrl.obj: ..\..\src\msw\datetimectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\datetimectrl.cpp - -$(OBJS)\advlib_hyperlink.obj: ..\..\src\msw\hyperlink.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\hyperlink.cpp - -$(OBJS)\advlib_timectrl.obj: ..\..\src\msw\timectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\timectrl.cpp - -$(OBJS)\advlib_animatecmn.obj: ..\..\src\common\animatecmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\animatecmn.cpp - -$(OBJS)\advlib_bmpcboxcmn.obj: ..\..\src\common\bmpcboxcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\bmpcboxcmn.cpp - -$(OBJS)\advlib_calctrlcmn.obj: ..\..\src\common\calctrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\calctrlcmn.cpp - -$(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\datavcmn.cpp - -$(OBJS)\advlib_gridcmn.obj: ..\..\src\common\gridcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\gridcmn.cpp - -$(OBJS)\advlib_hyperlnkcmn.obj: ..\..\src\common\hyperlnkcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\hyperlnkcmn.cpp - -$(OBJS)\advlib_odcombocmn.obj: ..\..\src\common\odcombocmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\odcombocmn.cpp - -$(OBJS)\advlib_richtooltipcmn.obj: ..\..\src\common\richtooltipcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\richtooltipcmn.cpp - -$(OBJS)\advlib_aboutdlgg.obj: ..\..\src\generic\aboutdlgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\aboutdlgg.cpp - -$(OBJS)\advlib_bannerwindow.obj: ..\..\src\generic\bannerwindow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bannerwindow.cpp - -$(OBJS)\advlib_bmpcboxg.obj: ..\..\src\generic\bmpcboxg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\bmpcboxg.cpp - -$(OBJS)\advlib_calctrlg.obj: ..\..\src\generic\calctrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\calctrlg.cpp - -$(OBJS)\advlib_commandlinkbuttong.obj: ..\..\src\generic\commandlinkbuttong.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\commandlinkbuttong.cpp - -$(OBJS)\advlib_datavgen.obj: ..\..\src\generic\datavgen.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\datavgen.cpp - -$(OBJS)\advlib_datectlg.obj: ..\..\src\generic\datectlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\datectlg.cpp - -$(OBJS)\advlib_editlbox.obj: ..\..\src\generic\editlbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\editlbox.cpp - -$(OBJS)\advlib_grid.obj: ..\..\src\generic\grid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\grid.cpp - -$(OBJS)\advlib_gridctrl.obj: ..\..\src\generic\gridctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\gridctrl.cpp - -$(OBJS)\advlib_grideditors.obj: ..\..\src\generic\grideditors.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\grideditors.cpp - -$(OBJS)\advlib_gridsel.obj: ..\..\src\generic\gridsel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\gridsel.cpp - -$(OBJS)\advlib_helpext.obj: ..\..\src\generic\helpext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\helpext.cpp - -$(OBJS)\advlib_hyperlinkg.obj: ..\..\src\generic\hyperlinkg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\hyperlinkg.cpp - -$(OBJS)\advlib_laywin.obj: ..\..\src\generic\laywin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\laywin.cpp - -$(OBJS)\advlib_notifmsgg.obj: ..\..\src\generic\notifmsgg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\notifmsgg.cpp - -$(OBJS)\advlib_odcombo.obj: ..\..\src\generic\odcombo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\odcombo.cpp - -$(OBJS)\advlib_propdlg.obj: ..\..\src\generic\propdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\propdlg.cpp - -$(OBJS)\advlib_richtooltipg.obj: ..\..\src\generic\richtooltipg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\richtooltipg.cpp - -$(OBJS)\advlib_sashwin.obj: ..\..\src\generic\sashwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\sashwin.cpp - -$(OBJS)\advlib_splash.obj: ..\..\src\generic\splash.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\splash.cpp - -$(OBJS)\advlib_timectrlg.obj: ..\..\src\generic\timectrlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\timectrlg.cpp - -$(OBJS)\advlib_tipdlg.obj: ..\..\src\generic\tipdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\tipdlg.cpp - -$(OBJS)\advlib_treelist.obj: ..\..\src\generic\treelist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\treelist.cpp - -$(OBJS)\advlib_wizard.obj: ..\..\src\generic\wizard.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\wizard.cpp - -$(OBJS)\advlib_taskbarcmn.obj: ..\..\src\common\taskbarcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\common\taskbarcmn.cpp - -$(OBJS)\advlib_aboutdlg.obj: ..\..\src\msw\aboutdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\aboutdlg.cpp - -$(OBJS)\advlib_notifmsg.obj: ..\..\src\msw\notifmsg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\notifmsg.cpp - -$(OBJS)\advlib_richtooltip.obj: ..\..\src\msw\richtooltip.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\richtooltip.cpp - -$(OBJS)\advlib_sound.obj: ..\..\src\msw\sound.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\sound.cpp - -$(OBJS)\advlib_taskbar.obj: ..\..\src\msw\taskbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\taskbar.cpp - -$(OBJS)\advlib_joystick.obj: ..\..\src\msw\joystick.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\msw\joystick.cpp - -$(OBJS)\advlib_animateg.obj: ..\..\src\generic\animateg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) ..\..\src\generic\animateg.cpp - -$(OBJS)\mediadll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\mediadll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_MEDIA ..\..\src\msw\version.rc - -$(OBJS)\mediadll_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp - -$(OBJS)\mediadll_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp - -$(OBJS)\mediadll_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp - -$(OBJS)\mediadll_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MEDIADLL_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp - -$(OBJS)\medialib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\medialib_mediactrlcmn.obj: ..\..\src\common\mediactrlcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\common\mediactrlcmn.cpp - -$(OBJS)\medialib_mediactrl_am.obj: ..\..\src\msw\mediactrl_am.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_am.cpp - -$(OBJS)\medialib_mediactrl_wmp10.obj: ..\..\src\msw\mediactrl_wmp10.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_wmp10.cpp - -$(OBJS)\medialib_mediactrl_qt.obj: ..\..\src\msw\mediactrl_qt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MEDIALIB_CXXFLAGS) ..\..\src\msw\mediactrl_qt.cpp - -$(OBJS)\htmldll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\htmldll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_HTML ..\..\src\msw\version.rc - -$(OBJS)\htmldll_helpbest.obj: ..\..\src\msw\helpbest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\msw\helpbest.cpp - -$(OBJS)\htmldll_helpctrl.obj: ..\..\src\html\helpctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpctrl.cpp - -$(OBJS)\htmldll_helpdata.obj: ..\..\src\html\helpdata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpdata.cpp - -$(OBJS)\htmldll_helpdlg.obj: ..\..\src\html\helpdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpdlg.cpp - -$(OBJS)\htmldll_helpfrm.obj: ..\..\src\html\helpfrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpfrm.cpp - -$(OBJS)\htmldll_helpwnd.obj: ..\..\src\html\helpwnd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\helpwnd.cpp - -$(OBJS)\htmldll_htmlcell.obj: ..\..\src\html\htmlcell.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlcell.cpp - -$(OBJS)\htmldll_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlfilt.cpp - -$(OBJS)\htmldll_htmlpars.obj: ..\..\src\html\htmlpars.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlpars.cpp - -$(OBJS)\htmldll_htmltag.obj: ..\..\src\html\htmltag.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmltag.cpp - -$(OBJS)\htmldll_htmlwin.obj: ..\..\src\html\htmlwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmlwin.cpp - -$(OBJS)\htmldll_htmprint.obj: ..\..\src\html\htmprint.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\htmprint.cpp - -$(OBJS)\htmldll_m_dflist.obj: ..\..\src\html\m_dflist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_dflist.cpp - -$(OBJS)\htmldll_m_fonts.obj: ..\..\src\html\m_fonts.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_fonts.cpp - -$(OBJS)\htmldll_m_hline.obj: ..\..\src\html\m_hline.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_hline.cpp - -$(OBJS)\htmldll_m_image.obj: ..\..\src\html\m_image.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_image.cpp - -$(OBJS)\htmldll_m_layout.obj: ..\..\src\html\m_layout.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_layout.cpp - -$(OBJS)\htmldll_m_links.obj: ..\..\src\html\m_links.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_links.cpp - -$(OBJS)\htmldll_m_list.obj: ..\..\src\html\m_list.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_list.cpp - -$(OBJS)\htmldll_m_pre.obj: ..\..\src\html\m_pre.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_pre.cpp - -$(OBJS)\htmldll_m_span.obj: ..\..\src\html\m_span.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_span.cpp - -$(OBJS)\htmldll_m_style.obj: ..\..\src\html\m_style.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_style.cpp - -$(OBJS)\htmldll_m_tables.obj: ..\..\src\html\m_tables.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\m_tables.cpp - -$(OBJS)\htmldll_styleparams.obj: ..\..\src\html\styleparams.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\styleparams.cpp - -$(OBJS)\htmldll_winpars.obj: ..\..\src\html\winpars.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\html\winpars.cpp - -$(OBJS)\htmldll_htmllbox.obj: ..\..\src\generic\htmllbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLDLL_CXXFLAGS) ..\..\src\generic\htmllbox.cpp - -$(OBJS)\htmllib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\htmllib_helpbest.obj: ..\..\src\msw\helpbest.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\msw\helpbest.cpp - -$(OBJS)\htmllib_helpctrl.obj: ..\..\src\html\helpctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpctrl.cpp - -$(OBJS)\htmllib_helpdata.obj: ..\..\src\html\helpdata.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpdata.cpp - -$(OBJS)\htmllib_helpdlg.obj: ..\..\src\html\helpdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpdlg.cpp - -$(OBJS)\htmllib_helpfrm.obj: ..\..\src\html\helpfrm.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpfrm.cpp - -$(OBJS)\htmllib_helpwnd.obj: ..\..\src\html\helpwnd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\helpwnd.cpp - -$(OBJS)\htmllib_htmlcell.obj: ..\..\src\html\htmlcell.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlcell.cpp - -$(OBJS)\htmllib_htmlfilt.obj: ..\..\src\html\htmlfilt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlfilt.cpp - -$(OBJS)\htmllib_htmlpars.obj: ..\..\src\html\htmlpars.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlpars.cpp - -$(OBJS)\htmllib_htmltag.obj: ..\..\src\html\htmltag.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmltag.cpp - -$(OBJS)\htmllib_htmlwin.obj: ..\..\src\html\htmlwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmlwin.cpp - -$(OBJS)\htmllib_htmprint.obj: ..\..\src\html\htmprint.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\htmprint.cpp - -$(OBJS)\htmllib_m_dflist.obj: ..\..\src\html\m_dflist.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_dflist.cpp - -$(OBJS)\htmllib_m_fonts.obj: ..\..\src\html\m_fonts.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_fonts.cpp - -$(OBJS)\htmllib_m_hline.obj: ..\..\src\html\m_hline.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_hline.cpp - -$(OBJS)\htmllib_m_image.obj: ..\..\src\html\m_image.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_image.cpp - -$(OBJS)\htmllib_m_layout.obj: ..\..\src\html\m_layout.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_layout.cpp - -$(OBJS)\htmllib_m_links.obj: ..\..\src\html\m_links.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_links.cpp - -$(OBJS)\htmllib_m_list.obj: ..\..\src\html\m_list.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_list.cpp - -$(OBJS)\htmllib_m_pre.obj: ..\..\src\html\m_pre.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_pre.cpp - -$(OBJS)\htmllib_m_span.obj: ..\..\src\html\m_span.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_span.cpp - -$(OBJS)\htmllib_m_style.obj: ..\..\src\html\m_style.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_style.cpp - -$(OBJS)\htmllib_m_tables.obj: ..\..\src\html\m_tables.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\m_tables.cpp - -$(OBJS)\htmllib_styleparams.obj: ..\..\src\html\styleparams.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\styleparams.cpp - -$(OBJS)\htmllib_winpars.obj: ..\..\src\html\winpars.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\html\winpars.cpp - -$(OBJS)\htmllib_htmllbox.obj: ..\..\src\generic\htmllbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(HTMLLIB_CXXFLAGS) ..\..\src\generic\htmllbox.cpp - -$(OBJS)\webviewdll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\webviewdll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_WEBVIEW ..\..\src\msw\version.rc - -$(OBJS)\webviewdll_webview_ie.obj: ..\..\src\msw\webview_ie.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\msw\webview_ie.cpp - -$(OBJS)\webviewdll_webview.obj: ..\..\src\common\webview.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webview.cpp - -$(OBJS)\webviewdll_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp - -$(OBJS)\webviewdll_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWDLL_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp - -$(OBJS)\webviewlib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\webviewlib_webview_ie.obj: ..\..\src\msw\webview_ie.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\msw\webview_ie.cpp - -$(OBJS)\webviewlib_webview.obj: ..\..\src\common\webview.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webview.cpp - -$(OBJS)\webviewlib_webviewarchivehandler.obj: ..\..\src\common\webviewarchivehandler.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webviewarchivehandler.cpp - -$(OBJS)\webviewlib_webviewfshandler.obj: ..\..\src\common\webviewfshandler.cpp - $(CXX) /c /nologo /TP /Fo$@ $(WEBVIEWLIB_CXXFLAGS) ..\..\src\common\webviewfshandler.cpp - -$(OBJS)\qadll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\qadll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_QA ..\..\src\msw\version.rc - -$(OBJS)\qadll_debugrpt.obj: ..\..\src\common\debugrpt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) ..\..\src\common\debugrpt.cpp - -$(OBJS)\qadll_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(QADLL_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp - -$(OBJS)\qalib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\qalib_debugrpt.obj: ..\..\src\common\debugrpt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) ..\..\src\common\debugrpt.cpp - -$(OBJS)\qalib_dbgrptg.obj: ..\..\src\generic\dbgrptg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(QALIB_CXXFLAGS) ..\..\src\generic\dbgrptg.cpp - -$(OBJS)\xmldll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\xmldll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d wxUSE_GUI=0 /d WXUSINGDLL /d WXMAKINGDLL_XML ..\..\src\msw\version.rc - -$(OBJS)\xmldll_xml.obj: ..\..\src\xml\xml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) ..\..\src\xml\xml.cpp - -$(OBJS)\xmldll_xtixml.obj: ..\..\src\common\xtixml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XMLDLL_CXXFLAGS) ..\..\src\common\xtixml.cpp - -$(OBJS)\xmllib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\xmllib_xml.obj: ..\..\src\xml\xml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) ..\..\src\xml\xml.cpp - -$(OBJS)\xmllib_xtixml.obj: ..\..\src\common\xtixml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XMLLIB_CXXFLAGS) ..\..\src\common\xtixml.cpp - -$(OBJS)\xrcdll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\xrcdll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_XRC ..\..\src\msw\version.rc - -$(OBJS)\xrcdll_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp - -$(OBJS)\xrcdll_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp - -$(OBJS)\xrcdll_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp - -$(OBJS)\xrcdll_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp - -$(OBJS)\xrcdll_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp - -$(OBJS)\xrcdll_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp - -$(OBJS)\xrcdll_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp - -$(OBJS)\xrcdll_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp - -$(OBJS)\xrcdll_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp - -$(OBJS)\xrcdll_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp - -$(OBJS)\xrcdll_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp - -$(OBJS)\xrcdll_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp - -$(OBJS)\xrcdll_xh_cmdlinkbn.obj: ..\..\src\xrc\xh_cmdlinkbn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_cmdlinkbn.cpp - -$(OBJS)\xrcdll_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp - -$(OBJS)\xrcdll_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp - -$(OBJS)\xrcdll_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp - -$(OBJS)\xrcdll_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp - -$(OBJS)\xrcdll_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp - -$(OBJS)\xrcdll_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp - -$(OBJS)\xrcdll_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp - -$(OBJS)\xrcdll_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp - -$(OBJS)\xrcdll_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp - -$(OBJS)\xrcdll_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp - -$(OBJS)\xrcdll_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp - -$(OBJS)\xrcdll_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp - -$(OBJS)\xrcdll_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp - -$(OBJS)\xrcdll_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp - -$(OBJS)\xrcdll_xh_html.obj: ..\..\src\xrc\xh_html.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_html.cpp - -$(OBJS)\xrcdll_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp - -$(OBJS)\xrcdll_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp - -$(OBJS)\xrcdll_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp - -$(OBJS)\xrcdll_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp - -$(OBJS)\xrcdll_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp - -$(OBJS)\xrcdll_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp - -$(OBJS)\xrcdll_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp - -$(OBJS)\xrcdll_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp - -$(OBJS)\xrcdll_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp - -$(OBJS)\xrcdll_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp - -$(OBJS)\xrcdll_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp - -$(OBJS)\xrcdll_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp - -$(OBJS)\xrcdll_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp - -$(OBJS)\xrcdll_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp - -$(OBJS)\xrcdll_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp - -$(OBJS)\xrcdll_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp - -$(OBJS)\xrcdll_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp - -$(OBJS)\xrcdll_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp - -$(OBJS)\xrcdll_xh_split.obj: ..\..\src\xrc\xh_split.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_split.cpp - -$(OBJS)\xrcdll_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp - -$(OBJS)\xrcdll_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp - -$(OBJS)\xrcdll_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp - -$(OBJS)\xrcdll_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp - -$(OBJS)\xrcdll_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp - -$(OBJS)\xrcdll_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp - -$(OBJS)\xrcdll_xh_text.obj: ..\..\src\xrc\xh_text.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_text.cpp - -$(OBJS)\xrcdll_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp - -$(OBJS)\xrcdll_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp - -$(OBJS)\xrcdll_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp - -$(OBJS)\xrcdll_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp - -$(OBJS)\xrcdll_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp - -$(OBJS)\xrcdll_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp - -$(OBJS)\xrcdll_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp - -$(OBJS)\xrcdll_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp - -$(OBJS)\xrcdll_xmlres.obj: ..\..\src\xrc\xmlres.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlres.cpp - -$(OBJS)\xrcdll_xmladv.obj: ..\..\src\xrc\xmladv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmladv.cpp - -$(OBJS)\xrcdll_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCDLL_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp - -$(OBJS)\xrclib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\xrclib_xh_animatctrl.obj: ..\..\src\xrc\xh_animatctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_animatctrl.cpp - -$(OBJS)\xrclib_xh_bannerwindow.obj: ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bannerwindow.cpp - -$(OBJS)\xrclib_xh_bmp.obj: ..\..\src\xrc\xh_bmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmp.cpp - -$(OBJS)\xrclib_xh_bmpcbox.obj: ..\..\src\xrc\xh_bmpcbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpcbox.cpp - -$(OBJS)\xrclib_xh_bmpbt.obj: ..\..\src\xrc\xh_bmpbt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bmpbt.cpp - -$(OBJS)\xrclib_xh_bttn.obj: ..\..\src\xrc\xh_bttn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_bttn.cpp - -$(OBJS)\xrclib_xh_cald.obj: ..\..\src\xrc\xh_cald.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_cald.cpp - -$(OBJS)\xrclib_xh_chckb.obj: ..\..\src\xrc\xh_chckb.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_chckb.cpp - -$(OBJS)\xrclib_xh_chckl.obj: ..\..\src\xrc\xh_chckl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_chckl.cpp - -$(OBJS)\xrclib_xh_choic.obj: ..\..\src\xrc\xh_choic.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_choic.cpp - -$(OBJS)\xrclib_xh_choicbk.obj: ..\..\src\xrc\xh_choicbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_choicbk.cpp - -$(OBJS)\xrclib_xh_clrpicker.obj: ..\..\src\xrc\xh_clrpicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_clrpicker.cpp - -$(OBJS)\xrclib_xh_cmdlinkbn.obj: ..\..\src\xrc\xh_cmdlinkbn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_cmdlinkbn.cpp - -$(OBJS)\xrclib_xh_collpane.obj: ..\..\src\xrc\xh_collpane.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_collpane.cpp - -$(OBJS)\xrclib_xh_combo.obj: ..\..\src\xrc\xh_combo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_combo.cpp - -$(OBJS)\xrclib_xh_comboctrl.obj: ..\..\src\xrc\xh_comboctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_comboctrl.cpp - -$(OBJS)\xrclib_xh_datectrl.obj: ..\..\src\xrc\xh_datectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_datectrl.cpp - -$(OBJS)\xrclib_xh_dirpicker.obj: ..\..\src\xrc\xh_dirpicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_dirpicker.cpp - -$(OBJS)\xrclib_xh_dlg.obj: ..\..\src\xrc\xh_dlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_dlg.cpp - -$(OBJS)\xrclib_xh_editlbox.obj: ..\..\src\xrc\xh_editlbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_editlbox.cpp - -$(OBJS)\xrclib_xh_filectrl.obj: ..\..\src\xrc\xh_filectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_filectrl.cpp - -$(OBJS)\xrclib_xh_filepicker.obj: ..\..\src\xrc\xh_filepicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_filepicker.cpp - -$(OBJS)\xrclib_xh_fontpicker.obj: ..\..\src\xrc\xh_fontpicker.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_fontpicker.cpp - -$(OBJS)\xrclib_xh_frame.obj: ..\..\src\xrc\xh_frame.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_frame.cpp - -$(OBJS)\xrclib_xh_gauge.obj: ..\..\src\xrc\xh_gauge.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_gauge.cpp - -$(OBJS)\xrclib_xh_gdctl.obj: ..\..\src\xrc\xh_gdctl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_gdctl.cpp - -$(OBJS)\xrclib_xh_grid.obj: ..\..\src\xrc\xh_grid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_grid.cpp - -$(OBJS)\xrclib_xh_html.obj: ..\..\src\xrc\xh_html.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_html.cpp - -$(OBJS)\xrclib_xh_hyperlink.obj: ..\..\src\xrc\xh_hyperlink.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_hyperlink.cpp - -$(OBJS)\xrclib_xh_listb.obj: ..\..\src\xrc\xh_listb.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listb.cpp - -$(OBJS)\xrclib_xh_listbk.obj: ..\..\src\xrc\xh_listbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listbk.cpp - -$(OBJS)\xrclib_xh_listc.obj: ..\..\src\xrc\xh_listc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_listc.cpp - -$(OBJS)\xrclib_xh_mdi.obj: ..\..\src\xrc\xh_mdi.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_mdi.cpp - -$(OBJS)\xrclib_xh_menu.obj: ..\..\src\xrc\xh_menu.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_menu.cpp - -$(OBJS)\xrclib_xh_notbk.obj: ..\..\src\xrc\xh_notbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_notbk.cpp - -$(OBJS)\xrclib_xh_odcombo.obj: ..\..\src\xrc\xh_odcombo.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_odcombo.cpp - -$(OBJS)\xrclib_xh_panel.obj: ..\..\src\xrc\xh_panel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_panel.cpp - -$(OBJS)\xrclib_xh_propdlg.obj: ..\..\src\xrc\xh_propdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_propdlg.cpp - -$(OBJS)\xrclib_xh_radbt.obj: ..\..\src\xrc\xh_radbt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_radbt.cpp - -$(OBJS)\xrclib_xh_radbx.obj: ..\..\src\xrc\xh_radbx.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_radbx.cpp - -$(OBJS)\xrclib_xh_scrol.obj: ..\..\src\xrc\xh_scrol.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_scrol.cpp - -$(OBJS)\xrclib_xh_scwin.obj: ..\..\src\xrc\xh_scwin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_scwin.cpp - -$(OBJS)\xrclib_xh_htmllbox.obj: ..\..\src\xrc\xh_htmllbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_htmllbox.cpp - -$(OBJS)\xrclib_xh_sizer.obj: ..\..\src\xrc\xh_sizer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sizer.cpp - -$(OBJS)\xrclib_xh_slidr.obj: ..\..\src\xrc\xh_slidr.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_slidr.cpp - -$(OBJS)\xrclib_xh_spin.obj: ..\..\src\xrc\xh_spin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_spin.cpp - -$(OBJS)\xrclib_xh_split.obj: ..\..\src\xrc\xh_split.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_split.cpp - -$(OBJS)\xrclib_xh_srchctrl.obj: ..\..\src\xrc\xh_srchctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_srchctrl.cpp - -$(OBJS)\xrclib_xh_statbar.obj: ..\..\src\xrc\xh_statbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_statbar.cpp - -$(OBJS)\xrclib_xh_stbmp.obj: ..\..\src\xrc\xh_stbmp.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_stbmp.cpp - -$(OBJS)\xrclib_xh_stbox.obj: ..\..\src\xrc\xh_stbox.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_stbox.cpp - -$(OBJS)\xrclib_xh_stlin.obj: ..\..\src\xrc\xh_stlin.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_stlin.cpp - -$(OBJS)\xrclib_xh_sttxt.obj: ..\..\src\xrc\xh_sttxt.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_sttxt.cpp - -$(OBJS)\xrclib_xh_text.obj: ..\..\src\xrc\xh_text.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_text.cpp - -$(OBJS)\xrclib_xh_tglbtn.obj: ..\..\src\xrc\xh_tglbtn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tglbtn.cpp - -$(OBJS)\xrclib_xh_timectrl.obj: ..\..\src\xrc\xh_timectrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_timectrl.cpp - -$(OBJS)\xrclib_xh_toolb.obj: ..\..\src\xrc\xh_toolb.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolb.cpp - -$(OBJS)\xrclib_xh_toolbk.obj: ..\..\src\xrc\xh_toolbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_toolbk.cpp - -$(OBJS)\xrclib_xh_tree.obj: ..\..\src\xrc\xh_tree.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_tree.cpp - -$(OBJS)\xrclib_xh_treebk.obj: ..\..\src\xrc\xh_treebk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_treebk.cpp - -$(OBJS)\xrclib_xh_unkwn.obj: ..\..\src\xrc\xh_unkwn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_unkwn.cpp - -$(OBJS)\xrclib_xh_wizrd.obj: ..\..\src\xrc\xh_wizrd.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xh_wizrd.cpp - -$(OBJS)\xrclib_xmlres.obj: ..\..\src\xrc\xmlres.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlres.cpp - -$(OBJS)\xrclib_xmladv.obj: ..\..\src\xrc\xmladv.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmladv.cpp - -$(OBJS)\xrclib_xmlrsall.obj: ..\..\src\xrc\xmlrsall.cpp - $(CXX) /c /nologo /TP /Fo$@ $(XRCLIB_CXXFLAGS) ..\..\src\xrc\xmlrsall.cpp - -$(OBJS)\auidll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\auidll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_AUI ..\..\src\msw\version.rc - -$(OBJS)\auidll_framemanager.obj: ..\..\src\aui\framemanager.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\framemanager.cpp - -$(OBJS)\auidll_dockart.obj: ..\..\src\aui\dockart.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\dockart.cpp - -$(OBJS)\auidll_floatpane.obj: ..\..\src\aui\floatpane.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\floatpane.cpp - -$(OBJS)\auidll_auibook.obj: ..\..\src\aui\auibook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\auibook.cpp - -$(OBJS)\auidll_auibar.obj: ..\..\src\aui\auibar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\auibar.cpp - -$(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp - -$(OBJS)\auidll_tabart.obj: ..\..\src\aui\tabart.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabart.cpp - -$(OBJS)\auidll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp - -$(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\auilib_framemanager.obj: ..\..\src\aui\framemanager.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\framemanager.cpp - -$(OBJS)\auilib_dockart.obj: ..\..\src\aui\dockart.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\dockart.cpp - -$(OBJS)\auilib_floatpane.obj: ..\..\src\aui\floatpane.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\floatpane.cpp - -$(OBJS)\auilib_auibook.obj: ..\..\src\aui\auibook.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\auibook.cpp - -$(OBJS)\auilib_auibar.obj: ..\..\src\aui\auibar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\auibar.cpp - -$(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp - -$(OBJS)\auilib_tabart.obj: ..\..\src\aui\tabart.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabart.cpp - -$(OBJS)\auilib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp - $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp - -$(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\ribbondll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RIBBON ..\..\src\msw\version.rc - -$(OBJS)\ribbondll_art_internal.obj: ..\..\src\ribbon\art_internal.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp - -$(OBJS)\ribbondll_art_msw.obj: ..\..\src\ribbon\art_msw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp - -$(OBJS)\ribbondll_art_aui.obj: ..\..\src\ribbon\art_aui.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp - -$(OBJS)\ribbondll_bar.obj: ..\..\src\ribbon\bar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\bar.cpp - -$(OBJS)\ribbondll_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp - -$(OBJS)\ribbondll_control.obj: ..\..\src\ribbon\control.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\control.cpp - -$(OBJS)\ribbondll_gallery.obj: ..\..\src\ribbon\gallery.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\gallery.cpp - -$(OBJS)\ribbondll_page.obj: ..\..\src\ribbon\page.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\page.cpp - -$(OBJS)\ribbondll_panel.obj: ..\..\src\ribbon\panel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\panel.cpp - -$(OBJS)\ribbondll_toolbar.obj: ..\..\src\ribbon\toolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp - -$(OBJS)\ribbondll_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp - -$(OBJS)\ribbonlib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\ribbonlib_art_internal.obj: ..\..\src\ribbon\art_internal.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_internal.cpp - -$(OBJS)\ribbonlib_art_msw.obj: ..\..\src\ribbon\art_msw.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_msw.cpp - -$(OBJS)\ribbonlib_art_aui.obj: ..\..\src\ribbon\art_aui.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\art_aui.cpp - -$(OBJS)\ribbonlib_bar.obj: ..\..\src\ribbon\bar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\bar.cpp - -$(OBJS)\ribbonlib_buttonbar.obj: ..\..\src\ribbon\buttonbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\buttonbar.cpp - -$(OBJS)\ribbonlib_control.obj: ..\..\src\ribbon\control.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\control.cpp - -$(OBJS)\ribbonlib_gallery.obj: ..\..\src\ribbon\gallery.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\gallery.cpp - -$(OBJS)\ribbonlib_page.obj: ..\..\src\ribbon\page.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\page.cpp - -$(OBJS)\ribbonlib_panel.obj: ..\..\src\ribbon\panel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\panel.cpp - -$(OBJS)\ribbonlib_toolbar.obj: ..\..\src\ribbon\toolbar.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\ribbon\toolbar.cpp - -$(OBJS)\ribbonlib_xh_ribbon.obj: ..\..\src\xrc\xh_ribbon.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RIBBONLIB_CXXFLAGS) ..\..\src\xrc\xh_ribbon.cpp - -$(OBJS)\propgriddll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\propgriddll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_PROPGRID ..\..\src\msw\version.rc - -$(OBJS)\propgriddll_advprops.obj: ..\..\src\propgrid\advprops.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp - -$(OBJS)\propgriddll_editors.obj: ..\..\src\propgrid\editors.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\editors.cpp - -$(OBJS)\propgriddll_manager.obj: ..\..\src\propgrid\manager.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\manager.cpp - -$(OBJS)\propgriddll_property.obj: ..\..\src\propgrid\property.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\property.cpp - -$(OBJS)\propgriddll_propgrid.obj: ..\..\src\propgrid\propgrid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp - -$(OBJS)\propgriddll_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp - -$(OBJS)\propgriddll_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp - -$(OBJS)\propgriddll_props.obj: ..\..\src\propgrid\props.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDDLL_CXXFLAGS) ..\..\src\propgrid\props.cpp - -$(OBJS)\propgridlib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\propgridlib_advprops.obj: ..\..\src\propgrid\advprops.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp - -$(OBJS)\propgridlib_editors.obj: ..\..\src\propgrid\editors.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\editors.cpp - -$(OBJS)\propgridlib_manager.obj: ..\..\src\propgrid\manager.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\manager.cpp - -$(OBJS)\propgridlib_property.obj: ..\..\src\propgrid\property.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\property.cpp - -$(OBJS)\propgridlib_propgrid.obj: ..\..\src\propgrid\propgrid.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgrid.cpp - -$(OBJS)\propgridlib_propgridiface.obj: ..\..\src\propgrid\propgridiface.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgridiface.cpp - -$(OBJS)\propgridlib_propgridpagestate.obj: ..\..\src\propgrid\propgridpagestate.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\propgridpagestate.cpp - -$(OBJS)\propgridlib_props.obj: ..\..\src\propgrid\props.cpp - $(CXX) /c /nologo /TP /Fo$@ $(PROPGRIDLIB_CXXFLAGS) ..\..\src\propgrid\props.cpp - -$(OBJS)\richtextdll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\richtextdll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_RICHTEXT ..\..\src\msw\version.rc - -$(OBJS)\richtextdll_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp - -$(OBJS)\richtextdll_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp - -$(OBJS)\richtextdll_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp - -$(OBJS)\richtextdll_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp - -$(OBJS)\richtextdll_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp - -$(OBJS)\richtextdll_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp - -$(OBJS)\richtextdll_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp - -$(OBJS)\richtextdll_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp - -$(OBJS)\richtextdll_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp - -$(OBJS)\richtextdll_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp - -$(OBJS)\richtextdll_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTDLL_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp - -$(OBJS)\richtextlib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\richtextlib_richtextbuffer.obj: ..\..\src\richtext\richtextbuffer.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextbuffer.cpp - -$(OBJS)\richtextlib_richtextctrl.obj: ..\..\src\richtext\richtextctrl.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextctrl.cpp - -$(OBJS)\richtextlib_richtextformatdlg.obj: ..\..\src\richtext\richtextformatdlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextformatdlg.cpp - -$(OBJS)\richtextlib_richtexthtml.obj: ..\..\src\richtext\richtexthtml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtexthtml.cpp - -$(OBJS)\richtextlib_richtextimagedlg.obj: ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextimagedlg.cpp - -$(OBJS)\richtextlib_richtextprint.obj: ..\..\src\richtext\richtextprint.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextprint.cpp - -$(OBJS)\richtextlib_richtextstyledlg.obj: ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyledlg.cpp - -$(OBJS)\richtextlib_richtextstyles.obj: ..\..\src\richtext\richtextstyles.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextstyles.cpp - -$(OBJS)\richtextlib_richtextsymboldlg.obj: ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextsymboldlg.cpp - -$(OBJS)\richtextlib_richtextxml.obj: ..\..\src\richtext\richtextxml.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\richtext\richtextxml.cpp - -$(OBJS)\richtextlib_xh_richtext.obj: ..\..\src\xrc\xh_richtext.cpp - $(CXX) /c /nologo /TP /Fo$@ $(RICHTEXTLIB_CXXFLAGS) ..\..\src\xrc\xh_richtext.cpp - -$(OBJS)\stcdll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\stcdll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /i ..\..\src\stc\scintilla\include /i ..\..\src\stc\scintilla\lexlib /i ..\..\src\stc\scintilla\src /d __WX__ /d SCI_LEXER /d LINK_LEXERS /d WXUSINGDLL /d WXMAKINGDLL_STC ..\..\src\msw\version.rc - -$(OBJS)\stcdll_stc.obj: ..\..\src\stc\stc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\stc.cpp - -$(OBJS)\stcdll_PlatWX.obj: ..\..\src\stc\PlatWX.cpp - $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\PlatWX.cpp - -$(OBJS)\stcdll_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp - $(CXX) /c /nologo /TP /Fo$@ $(STCDLL_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp - -$(OBJS)\stclib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\stclib_stc.obj: ..\..\src\stc\stc.cpp - $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) ..\..\src\stc\stc.cpp - -$(OBJS)\stclib_PlatWX.obj: ..\..\src\stc\PlatWX.cpp - $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) ..\..\src\stc\PlatWX.cpp - -$(OBJS)\stclib_ScintillaWX.obj: ..\..\src\stc\ScintillaWX.cpp - $(CXX) /c /nologo /TP /Fo$@ $(STCLIB_CXXFLAGS) ..\..\src\stc\ScintillaWX.cpp - -$(OBJS)\gldll_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\gldll_version.res: ..\..\src\msw\version.rc - rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_6) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_72) /d __WXMSW__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__NDEBUG_DEFINE_p_65) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) $(__UNICODE_DEFINE_p_67) $(__MSLU_DEFINE_p_65) /i $(SETUPHDIR) /i ..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_4) /d WXBUILDING /d WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG) /i ..\..\src\tiff\libtiff /i ..\..\src\jpeg /i ..\..\src\png /i ..\..\src\zlib /i ..\..\src\regex /i ..\..\src\expat\lib /d WXUSINGDLL /d WXMAKINGDLL_GL ..\..\src\msw\version.rc - -$(OBJS)\gldll_glcmn.obj: ..\..\src\common\glcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\common\glcmn.cpp - -$(OBJS)\gldll_glcanvas.obj: ..\..\src\msw\glcanvas.cpp - $(CXX) /c /nologo /TP /Fo$@ $(GLDLL_CXXFLAGS) ..\..\src\msw\glcanvas.cpp - -$(OBJS)\gllib_dummy.obj: ..\..\src\common\dummy.cpp - $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp - -$(OBJS)\gllib_glcmn.obj: ..\..\src\common\glcmn.cpp - $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) ..\..\src\common\glcmn.cpp - -$(OBJS)\gllib_glcanvas.obj: ..\..\src\msw\glcanvas.cpp - $(CXX) /c /nologo /TP /Fo$@ $(GLLIB_CXXFLAGS) ..\..\src\msw\glcanvas.cpp - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/makefile.wat b/3rdparty/wxwidgets3.0-3.0.1/build/msw/makefile.wat deleted file mode 100644 index 5d8b8b04aa..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/makefile.wat +++ /dev/null @@ -1,16582 +0,0 @@ -# ========================================================================= -# This makefile was generated by -# Bakefile 0.2.9 (http://www.bakefile.org) -# Do not modify, all changes will be overwritten! -# ========================================================================= - -!include config.wat - -# ------------------------------------------------------------------------- -# Do not modify the rest of this file! -# ------------------------------------------------------------------------- - -# Speed up compilation a bit: -!ifdef __LOADDLL__ -! loaddll wcc wccd -! loaddll wccaxp wccdaxp -! loaddll wcc386 wccd386 -! loaddll wpp wppdi86 -! loaddll wppaxp wppdaxp -! loaddll wpp386 wppd386 -! if $(__VERSION__) >= 1280 -! loaddll wlink wlinkd -! else -! loaddll wlink wlink -! endif -! loaddll wlib wlibd -!endif - -# We need these variables in some bakefile-made rules: -WATCOM_CWD = $+ $(%cdrive):$(%cwd) $- - -### Conditionally set variables: ### - -PORTNAME = -!ifeq USE_GUI 0 -PORTNAME = base -!endif -!ifeq USE_GUI 1 -PORTNAME = msw$(TOOLKIT_VERSION) -!endif -COMPILER_VERSION = -!ifeq OFFICIAL_BUILD 1 -COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD -!endif -WXCOMPILER = -!ifeq OFFICIAL_BUILD 0 -WXCOMPILER = _wat -!endif -!ifeq OFFICIAL_BUILD 1 -WXCOMPILER = _wat$(COMPILER_VERSION) -!endif -VENDORTAG = -!ifeq OFFICIAL_BUILD 0 -VENDORTAG = _$(VENDOR) -!endif -!ifeq OFFICIAL_BUILD 1 -VENDORTAG = -!endif -WXDEBUGFLAG = -!ifeq BUILD debug -WXDEBUGFLAG = d -!endif -WXUNICODEFLAG = -!ifeq UNICODE 1 -WXUNICODEFLAG = u -!endif -WXUNIVNAME = -!ifeq WXUNIV 1 -WXUNIVNAME = univ -!endif -WXDLLFLAG = -!ifeq SHARED 1 -WXDLLFLAG = dll -!endif -LIBTYPE_SUFFIX = -!ifeq SHARED 0 -LIBTYPE_SUFFIX = lib -!endif -!ifeq SHARED 1 -LIBTYPE_SUFFIX = dll -!endif -__wxpng___depname = -!ifeq USE_GUI 1 -__wxpng___depname = $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib -!endif -__wxjpeg___depname = -!ifeq USE_GUI 1 -__wxjpeg___depname = $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib -!endif -__wxtiff___depname = -!ifeq USE_GUI 1 -__wxtiff___depname = $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib -!endif -__wxscintilla_usingdll_p = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -__wxscintilla_usingdll_p = -dWXUSINGDLL -!endif -!endif -EXTRALIBS_FOR_BASE = -!ifeq MONOLITHIC 0 -EXTRALIBS_FOR_BASE = -!endif -!ifeq MONOLITHIC 1 -EXTRALIBS_FOR_BASE = -!endif -__monodll___depname = -!ifeq MONOLITHIC 1 -!ifeq SHARED 1 -__monodll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll -!endif -!endif -____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = -!ifeq USE_GUI 1 -____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = & - $(____CORE_SRC_FILENAMES_OBJECTS) & - $(____ADVANCED_SRC_FILENAMES_OBJECTS) & - $(OBJS)\monodll_mediactrlcmn.obj & - $(OBJS)\monodll_mediactrl_am.obj & - $(OBJS)\monodll_mediactrl_wmp10.obj & - $(OBJS)\monodll_mediactrl_qt.obj & - $(OBJS)\monodll_helpbest.obj & - $(OBJS)\monodll_helpctrl.obj & - $(OBJS)\monodll_helpdata.obj & - $(OBJS)\monodll_helpdlg.obj & - $(OBJS)\monodll_helpfrm.obj & - $(OBJS)\monodll_helpwnd.obj & - $(OBJS)\monodll_htmlcell.obj & - $(OBJS)\monodll_htmlfilt.obj & - $(OBJS)\monodll_htmlpars.obj & - $(OBJS)\monodll_htmltag.obj & - $(OBJS)\monodll_htmlwin.obj & - $(OBJS)\monodll_htmprint.obj & - $(OBJS)\monodll_m_dflist.obj & - $(OBJS)\monodll_m_fonts.obj & - $(OBJS)\monodll_m_hline.obj & - $(OBJS)\monodll_m_image.obj & - $(OBJS)\monodll_m_layout.obj & - $(OBJS)\monodll_m_links.obj & - $(OBJS)\monodll_m_list.obj & - $(OBJS)\monodll_m_pre.obj & - $(OBJS)\monodll_m_span.obj & - $(OBJS)\monodll_m_style.obj & - $(OBJS)\monodll_m_tables.obj & - $(OBJS)\monodll_styleparams.obj & - $(OBJS)\monodll_winpars.obj & - $(OBJS)\monodll_htmllbox.obj & - $(OBJS)\monodll_webview_ie.obj & - $(OBJS)\monodll_webview.obj & - $(OBJS)\monodll_webviewarchivehandler.obj & - $(OBJS)\monodll_webviewfshandler.obj & - $(OBJS)\monodll_debugrpt.obj & - $(OBJS)\monodll_dbgrptg.obj & - $(OBJS)\monodll_xh_animatctrl.obj & - $(OBJS)\monodll_xh_bannerwindow.obj & - $(OBJS)\monodll_xh_bmp.obj & - $(OBJS)\monodll_xh_bmpcbox.obj & - $(OBJS)\monodll_xh_bmpbt.obj & - $(OBJS)\monodll_xh_bttn.obj & - $(OBJS)\monodll_xh_cald.obj & - $(OBJS)\monodll_xh_chckb.obj & - $(OBJS)\monodll_xh_chckl.obj & - $(OBJS)\monodll_xh_choic.obj & - $(OBJS)\monodll_xh_choicbk.obj & - $(OBJS)\monodll_xh_clrpicker.obj & - $(OBJS)\monodll_xh_cmdlinkbn.obj & - $(OBJS)\monodll_xh_collpane.obj & - $(OBJS)\monodll_xh_combo.obj & - $(OBJS)\monodll_xh_comboctrl.obj & - $(OBJS)\monodll_xh_datectrl.obj & - $(OBJS)\monodll_xh_dirpicker.obj & - $(OBJS)\monodll_xh_dlg.obj & - $(OBJS)\monodll_xh_editlbox.obj & - $(OBJS)\monodll_xh_filectrl.obj & - $(OBJS)\monodll_xh_filepicker.obj & - $(OBJS)\monodll_xh_fontpicker.obj & - $(OBJS)\monodll_xh_frame.obj & - $(OBJS)\monodll_xh_gauge.obj & - $(OBJS)\monodll_xh_gdctl.obj & - $(OBJS)\monodll_xh_grid.obj & - $(OBJS)\monodll_xh_html.obj & - $(OBJS)\monodll_xh_hyperlink.obj & - $(OBJS)\monodll_xh_listb.obj & - $(OBJS)\monodll_xh_listbk.obj & - $(OBJS)\monodll_xh_listc.obj & - $(OBJS)\monodll_xh_mdi.obj & - $(OBJS)\monodll_xh_menu.obj & - $(OBJS)\monodll_xh_notbk.obj & - $(OBJS)\monodll_xh_odcombo.obj & - $(OBJS)\monodll_xh_panel.obj & - $(OBJS)\monodll_xh_propdlg.obj & - $(OBJS)\monodll_xh_radbt.obj & - $(OBJS)\monodll_xh_radbx.obj & - $(OBJS)\monodll_xh_scrol.obj & - $(OBJS)\monodll_xh_scwin.obj & - $(OBJS)\monodll_xh_htmllbox.obj & - $(OBJS)\monodll_xh_sizer.obj & - $(OBJS)\monodll_xh_slidr.obj & - $(OBJS)\monodll_xh_spin.obj & - $(OBJS)\monodll_xh_split.obj & - $(OBJS)\monodll_xh_srchctrl.obj & - $(OBJS)\monodll_xh_statbar.obj & - $(OBJS)\monodll_xh_stbmp.obj & - $(OBJS)\monodll_xh_stbox.obj & - $(OBJS)\monodll_xh_stlin.obj & - $(OBJS)\monodll_xh_sttxt.obj & - $(OBJS)\monodll_xh_text.obj & - $(OBJS)\monodll_xh_tglbtn.obj & - $(OBJS)\monodll_xh_timectrl.obj & - $(OBJS)\monodll_xh_toolb.obj & - $(OBJS)\monodll_xh_toolbk.obj & - $(OBJS)\monodll_xh_tree.obj & - $(OBJS)\monodll_xh_treebk.obj & - $(OBJS)\monodll_xh_unkwn.obj & - $(OBJS)\monodll_xh_wizrd.obj & - $(OBJS)\monodll_xmlres.obj & - $(OBJS)\monodll_xmladv.obj & - $(OBJS)\monodll_xmlrsall.obj & - $(OBJS)\monodll_framemanager.obj & - $(OBJS)\monodll_dockart.obj & - $(OBJS)\monodll_floatpane.obj & - $(OBJS)\monodll_auibook.obj & - $(OBJS)\monodll_auibar.obj & - $(OBJS)\monodll_tabmdi.obj & - $(OBJS)\monodll_tabart.obj & - $(OBJS)\monodll_xh_auinotbk.obj & - $(OBJS)\monodll_advprops.obj & - $(OBJS)\monodll_editors.obj & - $(OBJS)\monodll_manager.obj & - $(OBJS)\monodll_property.obj & - $(OBJS)\monodll_propgrid.obj & - $(OBJS)\monodll_propgridiface.obj & - $(OBJS)\monodll_propgridpagestate.obj & - $(OBJS)\monodll_props.obj & - $(OBJS)\monodll_art_internal.obj & - $(OBJS)\monodll_art_msw.obj & - $(OBJS)\monodll_art_aui.obj & - $(OBJS)\monodll_bar.obj & - $(OBJS)\monodll_ribbon_buttonbar.obj & - $(OBJS)\monodll_ribbon_control.obj & - $(OBJS)\monodll_gallery.obj & - $(OBJS)\monodll_page.obj & - $(OBJS)\monodll_ribbon_panel.obj & - $(OBJS)\monodll_ribbon_toolbar.obj & - $(OBJS)\monodll_xh_ribbon.obj & - $(OBJS)\monodll_richtextbuffer.obj & - $(OBJS)\monodll_richtextctrl.obj & - $(OBJS)\monodll_richtextformatdlg.obj & - $(OBJS)\monodll_richtexthtml.obj & - $(OBJS)\monodll_richtextimagedlg.obj & - $(OBJS)\monodll_richtextprint.obj & - $(OBJS)\monodll_richtextstyledlg.obj & - $(OBJS)\monodll_richtextstyles.obj & - $(OBJS)\monodll_richtextsymboldlg.obj & - $(OBJS)\monodll_richtextxml.obj & - $(OBJS)\monodll_xh_richtext.obj & - $(OBJS)\monodll_stc.obj & - $(OBJS)\monodll_PlatWX.obj & - $(OBJS)\monodll_ScintillaWX.obj -!endif -____CORE_SRC_FILENAMES_OBJECTS = -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -____CORE_SRC_FILENAMES_OBJECTS = & - $(OBJS)\monodll_activex.obj & - $(OBJS)\monodll_app.obj & - $(OBJS)\monodll_bitmap.obj & - $(OBJS)\monodll_brush.obj & - $(OBJS)\monodll_caret.obj & - $(OBJS)\monodll_clipbrd.obj & - $(OBJS)\monodll_colour.obj & - $(OBJS)\monodll_cursor.obj & - $(OBJS)\monodll_data.obj & - $(OBJS)\monodll_dc.obj & - $(OBJS)\monodll_dcclient.obj & - $(OBJS)\monodll_dcmemory.obj & - $(OBJS)\monodll_dcprint.obj & - $(OBJS)\monodll_dcscreen.obj & - $(OBJS)\monodll_dialup.obj & - $(OBJS)\monodll_dib.obj & - $(OBJS)\monodll_display.obj & - $(OBJS)\monodll_enhmeta.obj & - $(OBJS)\monodll_font.obj & - $(OBJS)\monodll_fontenum.obj & - $(OBJS)\monodll_fontutil.obj & - $(OBJS)\monodll_gdiimage.obj & - $(OBJS)\monodll_gdiobj.obj & - $(OBJS)\monodll_gdiplus.obj & - $(OBJS)\monodll_graphics.obj & - $(OBJS)\monodll_icon.obj & - $(OBJS)\monodll_imaglist.obj & - $(OBJS)\monodll_minifram.obj & - $(OBJS)\monodll_nonownedwnd.obj & - $(OBJS)\monodll_dataobj.obj & - $(OBJS)\monodll_dropsrc.obj & - $(OBJS)\monodll_droptgt.obj & - $(OBJS)\monodll_oleutils.obj & - $(OBJS)\monodll_safearray.obj & - $(OBJS)\monodll_palette.obj & - $(OBJS)\monodll_pen.obj & - $(OBJS)\monodll_popupwin.obj & - $(OBJS)\monodll_printdlg.obj & - $(OBJS)\monodll_printwin.obj & - $(OBJS)\monodll_region.obj & - $(OBJS)\monodll_renderer.obj & - $(OBJS)\monodll_settings.obj & - $(OBJS)\monodll_textmeasure.obj & - $(OBJS)\monodll_tooltip.obj & - $(OBJS)\monodll_toplevel.obj & - $(OBJS)\monodll_uiaction.obj & - $(OBJS)\monodll_utilsgui.obj & - $(OBJS)\monodll_utilswin.obj & - $(OBJS)\monodll_uxtheme.obj & - $(OBJS)\monodll_window.obj & - $(OBJS)\monodll_helpchm.obj & - $(OBJS)\monodll_helpwin.obj & - $(OBJS)\monodll_automtn.obj & - $(OBJS)\monodll_uuid.obj & - $(OBJS)\monodll_clrpickerg.obj & - $(OBJS)\monodll_collpaneg.obj & - $(OBJS)\monodll_filepickerg.obj & - $(OBJS)\monodll_fontpickerg.obj & - $(OBJS)\monodll_generic_statusbr.obj & - $(OBJS)\monodll_prntdlgg.obj & - $(OBJS)\monodll_msw_accel.obj & - $(OBJS)\monodll_anybutton.obj & - $(OBJS)\monodll_artmsw.obj & - $(OBJS)\monodll_msw_bmpbuttn.obj & - $(OBJS)\monodll_msw_button.obj & - $(OBJS)\monodll_msw_checkbox.obj & - $(OBJS)\monodll_msw_choice.obj & - $(OBJS)\monodll_colordlg.obj & - $(OBJS)\monodll_combo.obj & - $(OBJS)\monodll_msw_combobox.obj & - $(OBJS)\monodll_msw_control.obj & - $(OBJS)\monodll_msw_dialog.obj & - $(OBJS)\monodll_dirdlg.obj & - $(OBJS)\monodll_dragimag.obj & - $(OBJS)\monodll_evtloop.obj & - $(OBJS)\monodll_filedlg.obj & - $(OBJS)\monodll_frame.obj & - $(OBJS)\monodll_msw_gauge.obj & - $(OBJS)\monodll_headerctrl.obj & - $(OBJS)\monodll_iniconf.obj & - $(OBJS)\monodll_msw_listbox.obj & - $(OBJS)\monodll_msw_listctrl.obj & - $(OBJS)\monodll_mdi.obj & - $(OBJS)\monodll_msw_menu.obj & - $(OBJS)\monodll_menuitem.obj & - $(OBJS)\monodll_metafile.obj & - $(OBJS)\monodll_msgdlg.obj & - $(OBJS)\monodll_nativdlg.obj & - $(OBJS)\monodll_nativewin.obj & - $(OBJS)\monodll_msw_notebook.obj & - $(OBJS)\monodll_access.obj & - $(OBJS)\monodll_ownerdrw.obj & - $(OBJS)\monodll_msw_panel.obj & - $(OBJS)\monodll_progdlg.obj & - $(OBJS)\monodll_msw_radiobox.obj & - $(OBJS)\monodll_msw_radiobut.obj & - $(OBJS)\monodll_richmsgdlg.obj & - $(OBJS)\monodll_msw_scrolbar.obj & - $(OBJS)\monodll_msw_slider.obj & - $(OBJS)\monodll_msw_spinbutt.obj & - $(OBJS)\monodll_spinctrl.obj & - $(OBJS)\monodll_msw_statbmp.obj & - $(OBJS)\monodll_msw_statbox.obj & - $(OBJS)\monodll_statusbar.obj & - $(OBJS)\monodll_msw_statline.obj & - $(OBJS)\monodll_msw_stattext.obj & - $(OBJS)\monodll_msw_toolbar.obj & - $(OBJS)\monodll_msw_textctrl.obj & - $(OBJS)\monodll_textentry.obj & - $(OBJS)\monodll_msw_tglbtn.obj & - $(OBJS)\monodll_treectrl.obj & - $(OBJS)\monodll_msw_checklst.obj & - $(OBJS)\monodll_msw_fdrepdlg.obj & - $(OBJS)\monodll_fontdlg.obj & - $(OBJS)\monodll_accelcmn.obj & - $(OBJS)\monodll_accesscmn.obj & - $(OBJS)\monodll_anidecod.obj & - $(OBJS)\monodll_affinematrix2d.obj & - $(OBJS)\monodll_appcmn.obj & - $(OBJS)\monodll_artprov.obj & - $(OBJS)\monodll_artstd.obj & - $(OBJS)\monodll_arttango.obj & - $(OBJS)\monodll_bmpbase.obj & - $(OBJS)\monodll_bmpbtncmn.obj & - $(OBJS)\monodll_bookctrl.obj & - $(OBJS)\monodll_btncmn.obj & - $(OBJS)\monodll_cairo.obj & - $(OBJS)\monodll_checkboxcmn.obj & - $(OBJS)\monodll_checklstcmn.obj & - $(OBJS)\monodll_choiccmn.obj & - $(OBJS)\monodll_clipcmn.obj & - $(OBJS)\monodll_clrpickercmn.obj & - $(OBJS)\monodll_colourcmn.obj & - $(OBJS)\monodll_colourdata.obj & - $(OBJS)\monodll_combocmn.obj & - $(OBJS)\monodll_cmdproc.obj & - $(OBJS)\monodll_cmndata.obj & - $(OBJS)\monodll_containr.obj & - $(OBJS)\monodll_cshelp.obj & - $(OBJS)\monodll_ctrlcmn.obj & - $(OBJS)\monodll_ctrlsub.obj & - $(OBJS)\monodll_dcbase.obj & - $(OBJS)\monodll_dcbufcmn.obj & - $(OBJS)\monodll_dcgraph.obj & - $(OBJS)\monodll_dcsvg.obj & - $(OBJS)\monodll_dirctrlcmn.obj & - $(OBJS)\monodll_dlgcmn.obj & - $(OBJS)\monodll_dndcmn.obj & - $(OBJS)\monodll_dobjcmn.obj & - $(OBJS)\monodll_docmdi.obj & - $(OBJS)\monodll_docview.obj & - $(OBJS)\monodll_dpycmn.obj & - $(OBJS)\monodll_dseldlg.obj & - $(OBJS)\monodll_effects.obj & - $(OBJS)\monodll_fddlgcmn.obj & - $(OBJS)\monodll_filectrlcmn.obj & - $(OBJS)\monodll_filehistorycmn.obj & - $(OBJS)\monodll_filepickercmn.obj & - $(OBJS)\monodll_fontpickercmn.obj & - $(OBJS)\monodll_fldlgcmn.obj & - $(OBJS)\monodll_fontcmn.obj & - $(OBJS)\monodll_fontdata.obj & - $(OBJS)\monodll_graphicc.obj & - $(OBJS)\monodll_fontenumcmn.obj & - $(OBJS)\monodll_fontmap.obj & - $(OBJS)\monodll_fontutilcmn.obj & - $(OBJS)\monodll_framecmn.obj & - $(OBJS)\monodll_gaugecmn.obj & - $(OBJS)\monodll_gbsizer.obj & - $(OBJS)\monodll_gdicmn.obj & - $(OBJS)\monodll_geometry.obj & - $(OBJS)\monodll_gifdecod.obj & - $(OBJS)\monodll_graphcmn.obj & - $(OBJS)\monodll_headercolcmn.obj & - $(OBJS)\monodll_headerctrlcmn.obj & - $(OBJS)\monodll_helpbase.obj & - $(OBJS)\monodll_iconbndl.obj & - $(OBJS)\monodll_imagall.obj & - $(OBJS)\monodll_imagbmp.obj & - $(OBJS)\monodll_image.obj & - $(OBJS)\monodll_imagfill.obj & - $(OBJS)\monodll_imaggif.obj & - $(OBJS)\monodll_imagiff.obj & - $(OBJS)\monodll_imagjpeg.obj & - $(OBJS)\monodll_imagpcx.obj & - $(OBJS)\monodll_imagpng.obj & - $(OBJS)\monodll_imagpnm.obj & - $(OBJS)\monodll_imagtga.obj & - $(OBJS)\monodll_imagtiff.obj & - $(OBJS)\monodll_imagxpm.obj & - $(OBJS)\monodll_layout.obj & - $(OBJS)\monodll_lboxcmn.obj & - $(OBJS)\monodll_listctrlcmn.obj & - $(OBJS)\monodll_markupparser.obj & - $(OBJS)\monodll_matrix.obj & - $(OBJS)\monodll_menucmn.obj & - $(OBJS)\monodll_modalhook.obj & - $(OBJS)\monodll_mousemanager.obj & - $(OBJS)\monodll_nbkbase.obj & - $(OBJS)\monodll_overlaycmn.obj & - $(OBJS)\monodll_ownerdrwcmn.obj & - $(OBJS)\monodll_paper.obj & - $(OBJS)\monodll_panelcmn.obj & - $(OBJS)\monodll_persist.obj & - $(OBJS)\monodll_pickerbase.obj & - $(OBJS)\monodll_popupcmn.obj & - $(OBJS)\monodll_preferencescmn.obj & - $(OBJS)\monodll_prntbase.obj & - $(OBJS)\monodll_quantize.obj & - $(OBJS)\monodll_radiobtncmn.obj & - $(OBJS)\monodll_radiocmn.obj & - $(OBJS)\monodll_rearrangectrl.obj & - $(OBJS)\monodll_rendcmn.obj & - $(OBJS)\monodll_rgncmn.obj & - $(OBJS)\monodll_scrolbarcmn.obj & - $(OBJS)\monodll_settcmn.obj & - $(OBJS)\monodll_sizer.obj & - $(OBJS)\monodll_slidercmn.obj & - $(OBJS)\monodll_spinbtncmn.obj & - $(OBJS)\monodll_spinctrlcmn.obj & - $(OBJS)\monodll_srchcmn.obj & - $(OBJS)\monodll_statbar.obj & - $(OBJS)\monodll_statbmpcmn.obj & - $(OBJS)\monodll_statboxcmn.obj & - $(OBJS)\monodll_statlinecmn.obj & - $(OBJS)\monodll_stattextcmn.obj & - $(OBJS)\monodll_stockitem.obj & - $(OBJS)\monodll_tbarbase.obj & - $(OBJS)\monodll_textcmn.obj & - $(OBJS)\monodll_textentrycmn.obj & - $(OBJS)\monodll_textmeasurecmn.obj & - $(OBJS)\monodll_toplvcmn.obj & - $(OBJS)\monodll_treebase.obj & - $(OBJS)\monodll_uiactioncmn.obj & - $(OBJS)\monodll_valgen.obj & - $(OBJS)\monodll_validate.obj & - $(OBJS)\monodll_valtext.obj & - $(OBJS)\monodll_valnum.obj & - $(OBJS)\monodll_wincmn.obj & - $(OBJS)\monodll_windowid.obj & - $(OBJS)\monodll_wrapsizer.obj & - $(OBJS)\monodll_xpmdecod.obj & - $(OBJS)\monodll_busyinfo.obj & - $(OBJS)\monodll_generic_buttonbar.obj & - $(OBJS)\monodll_choicdgg.obj & - $(OBJS)\monodll_choicbkg.obj & - $(OBJS)\monodll_combog.obj & - $(OBJS)\monodll_dcpsg.obj & - $(OBJS)\monodll_dirctrlg.obj & - $(OBJS)\monodll_dragimgg.obj & - $(OBJS)\monodll_filectrlg.obj & - $(OBJS)\monodll_headerctrlg.obj & - $(OBJS)\monodll_infobar.obj & - $(OBJS)\monodll_listbkg.obj & - $(OBJS)\monodll_logg.obj & - $(OBJS)\monodll_markuptext.obj & - $(OBJS)\monodll_msgdlgg.obj & - $(OBJS)\monodll_numdlgg.obj & - $(OBJS)\monodll_progdlgg.obj & - $(OBJS)\monodll_preferencesg.obj & - $(OBJS)\monodll_printps.obj & - $(OBJS)\monodll_renderg.obj & - $(OBJS)\monodll_richmsgdlgg.obj & - $(OBJS)\monodll_scrlwing.obj & - $(OBJS)\monodll_selstore.obj & - $(OBJS)\monodll_spinctlg.obj & - $(OBJS)\monodll_splitter.obj & - $(OBJS)\monodll_srchctlg.obj & - $(OBJS)\monodll_statbmpg.obj & - $(OBJS)\monodll_stattextg.obj & - $(OBJS)\monodll_textdlgg.obj & - $(OBJS)\monodll_tipwin.obj & - $(OBJS)\monodll_toolbkg.obj & - $(OBJS)\monodll_treectlg.obj & - $(OBJS)\monodll_treebkg.obj & - $(OBJS)\monodll_vlbox.obj & - $(OBJS)\monodll_vscroll.obj & - $(OBJS)\monodll_xmlreshandler.obj -!endif -!endif -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -____CORE_SRC_FILENAMES_OBJECTS = & - $(OBJS)\monodll_activex.obj & - $(OBJS)\monodll_app.obj & - $(OBJS)\monodll_bitmap.obj & - $(OBJS)\monodll_brush.obj & - $(OBJS)\monodll_caret.obj & - $(OBJS)\monodll_clipbrd.obj & - $(OBJS)\monodll_colour.obj & - $(OBJS)\monodll_cursor.obj & - $(OBJS)\monodll_data.obj & - $(OBJS)\monodll_dc.obj & - $(OBJS)\monodll_dcclient.obj & - $(OBJS)\monodll_dcmemory.obj & - $(OBJS)\monodll_dcprint.obj & - $(OBJS)\monodll_dcscreen.obj & - $(OBJS)\monodll_dialup.obj & - $(OBJS)\monodll_dib.obj & - $(OBJS)\monodll_display.obj & - $(OBJS)\monodll_enhmeta.obj & - $(OBJS)\monodll_font.obj & - $(OBJS)\monodll_fontenum.obj & - $(OBJS)\monodll_fontutil.obj & - $(OBJS)\monodll_gdiimage.obj & - $(OBJS)\monodll_gdiobj.obj & - $(OBJS)\monodll_gdiplus.obj & - $(OBJS)\monodll_graphics.obj & - $(OBJS)\monodll_icon.obj & - $(OBJS)\monodll_imaglist.obj & - $(OBJS)\monodll_minifram.obj & - $(OBJS)\monodll_nonownedwnd.obj & - $(OBJS)\monodll_dataobj.obj & - $(OBJS)\monodll_dropsrc.obj & - $(OBJS)\monodll_droptgt.obj & - $(OBJS)\monodll_oleutils.obj & - $(OBJS)\monodll_safearray.obj & - $(OBJS)\monodll_palette.obj & - $(OBJS)\monodll_pen.obj & - $(OBJS)\monodll_popupwin.obj & - $(OBJS)\monodll_printdlg.obj & - $(OBJS)\monodll_printwin.obj & - $(OBJS)\monodll_region.obj & - $(OBJS)\monodll_renderer.obj & - $(OBJS)\monodll_settings.obj & - $(OBJS)\monodll_textmeasure.obj & - $(OBJS)\monodll_tooltip.obj & - $(OBJS)\monodll_toplevel.obj & - $(OBJS)\monodll_uiaction.obj & - $(OBJS)\monodll_utilsgui.obj & - $(OBJS)\monodll_utilswin.obj & - $(OBJS)\monodll_uxtheme.obj & - $(OBJS)\monodll_window.obj & - $(OBJS)\monodll_helpchm.obj & - $(OBJS)\monodll_helpwin.obj & - $(OBJS)\monodll_automtn.obj & - $(OBJS)\monodll_uuid.obj & - $(OBJS)\monodll_evtloop.obj & - $(OBJS)\monodll_generic_accel.obj & - $(OBJS)\monodll_clrpickerg.obj & - $(OBJS)\monodll_collpaneg.obj & - $(OBJS)\monodll_colrdlgg.obj & - $(OBJS)\monodll_dirdlgg.obj & - $(OBJS)\monodll_generic_fdrepdlg.obj & - $(OBJS)\monodll_filedlgg.obj & - $(OBJS)\monodll_filepickerg.obj & - $(OBJS)\monodll_fontdlgg.obj & - $(OBJS)\monodll_fontpickerg.obj & - $(OBJS)\monodll_generic_listctrl.obj & - $(OBJS)\monodll_mdig.obj & - $(OBJS)\monodll_prntdlgg.obj & - $(OBJS)\monodll_univ_bmpbuttn.obj & - $(OBJS)\monodll_univ_button.obj & - $(OBJS)\monodll_univ_checkbox.obj & - $(OBJS)\monodll_univ_checklst.obj & - $(OBJS)\monodll_univ_choice.obj & - $(OBJS)\monodll_univ_combobox.obj & - $(OBJS)\monodll_univ_control.obj & - $(OBJS)\monodll_ctrlrend.obj & - $(OBJS)\monodll_univ_dialog.obj & - $(OBJS)\monodll_framuniv.obj & - $(OBJS)\monodll_univ_gauge.obj & - $(OBJS)\monodll_inpcons.obj & - $(OBJS)\monodll_inphand.obj & - $(OBJS)\monodll_univ_listbox.obj & - $(OBJS)\monodll_univ_menu.obj & - $(OBJS)\monodll_univ_notebook.obj & - $(OBJS)\monodll_univ_radiobox.obj & - $(OBJS)\monodll_univ_radiobut.obj & - $(OBJS)\monodll_scrarrow.obj & - $(OBJS)\monodll_univ_scrolbar.obj & - $(OBJS)\monodll_scrthumb.obj & - $(OBJS)\monodll_settingsuniv.obj & - $(OBJS)\monodll_univ_slider.obj & - $(OBJS)\monodll_univ_spinbutt.obj & - $(OBJS)\monodll_univ_statbmp.obj & - $(OBJS)\monodll_univ_statbox.obj & - $(OBJS)\monodll_univ_statline.obj & - $(OBJS)\monodll_univ_stattext.obj & - $(OBJS)\monodll_univ_statusbr.obj & - $(OBJS)\monodll_stdrend.obj & - $(OBJS)\monodll_univ_textctrl.obj & - $(OBJS)\monodll_univ_tglbtn.obj & - $(OBJS)\monodll_theme.obj & - $(OBJS)\monodll_univ_toolbar.obj & - $(OBJS)\monodll_topluniv.obj & - $(OBJS)\monodll_winuniv.obj & - $(OBJS)\monodll_gtk.obj & - $(OBJS)\monodll_metal.obj & - $(OBJS)\monodll_mono.obj & - $(OBJS)\monodll_win32.obj & - $(OBJS)\monodll_accelcmn.obj & - $(OBJS)\monodll_accesscmn.obj & - $(OBJS)\monodll_anidecod.obj & - $(OBJS)\monodll_affinematrix2d.obj & - $(OBJS)\monodll_appcmn.obj & - $(OBJS)\monodll_artprov.obj & - $(OBJS)\monodll_artstd.obj & - $(OBJS)\monodll_arttango.obj & - $(OBJS)\monodll_bmpbase.obj & - $(OBJS)\monodll_bmpbtncmn.obj & - $(OBJS)\monodll_bookctrl.obj & - $(OBJS)\monodll_btncmn.obj & - $(OBJS)\monodll_cairo.obj & - $(OBJS)\monodll_checkboxcmn.obj & - $(OBJS)\monodll_checklstcmn.obj & - $(OBJS)\monodll_choiccmn.obj & - $(OBJS)\monodll_clipcmn.obj & - $(OBJS)\monodll_clrpickercmn.obj & - $(OBJS)\monodll_colourcmn.obj & - $(OBJS)\monodll_colourdata.obj & - $(OBJS)\monodll_combocmn.obj & - $(OBJS)\monodll_cmdproc.obj & - $(OBJS)\monodll_cmndata.obj & - $(OBJS)\monodll_containr.obj & - $(OBJS)\monodll_cshelp.obj & - $(OBJS)\monodll_ctrlcmn.obj & - $(OBJS)\monodll_ctrlsub.obj & - $(OBJS)\monodll_dcbase.obj & - $(OBJS)\monodll_dcbufcmn.obj & - $(OBJS)\monodll_dcgraph.obj & - $(OBJS)\monodll_dcsvg.obj & - $(OBJS)\monodll_dirctrlcmn.obj & - $(OBJS)\monodll_dlgcmn.obj & - $(OBJS)\monodll_dndcmn.obj & - $(OBJS)\monodll_dobjcmn.obj & - $(OBJS)\monodll_docmdi.obj & - $(OBJS)\monodll_docview.obj & - $(OBJS)\monodll_dpycmn.obj & - $(OBJS)\monodll_dseldlg.obj & - $(OBJS)\monodll_effects.obj & - $(OBJS)\monodll_fddlgcmn.obj & - $(OBJS)\monodll_filectrlcmn.obj & - $(OBJS)\monodll_filehistorycmn.obj & - $(OBJS)\monodll_filepickercmn.obj & - $(OBJS)\monodll_fontpickercmn.obj & - $(OBJS)\monodll_fldlgcmn.obj & - $(OBJS)\monodll_fontcmn.obj & - $(OBJS)\monodll_fontdata.obj & - $(OBJS)\monodll_graphicc.obj & - $(OBJS)\monodll_fontenumcmn.obj & - $(OBJS)\monodll_fontmap.obj & - $(OBJS)\monodll_fontutilcmn.obj & - $(OBJS)\monodll_framecmn.obj & - $(OBJS)\monodll_gaugecmn.obj & - $(OBJS)\monodll_gbsizer.obj & - $(OBJS)\monodll_gdicmn.obj & - $(OBJS)\monodll_geometry.obj & - $(OBJS)\monodll_gifdecod.obj & - $(OBJS)\monodll_graphcmn.obj & - $(OBJS)\monodll_headercolcmn.obj & - $(OBJS)\monodll_headerctrlcmn.obj & - $(OBJS)\monodll_helpbase.obj & - $(OBJS)\monodll_iconbndl.obj & - $(OBJS)\monodll_imagall.obj & - $(OBJS)\monodll_imagbmp.obj & - $(OBJS)\monodll_image.obj & - $(OBJS)\monodll_imagfill.obj & - $(OBJS)\monodll_imaggif.obj & - $(OBJS)\monodll_imagiff.obj & - $(OBJS)\monodll_imagjpeg.obj & - $(OBJS)\monodll_imagpcx.obj & - $(OBJS)\monodll_imagpng.obj & - $(OBJS)\monodll_imagpnm.obj & - $(OBJS)\monodll_imagtga.obj & - $(OBJS)\monodll_imagtiff.obj & - $(OBJS)\monodll_imagxpm.obj & - $(OBJS)\monodll_layout.obj & - $(OBJS)\monodll_lboxcmn.obj & - $(OBJS)\monodll_listctrlcmn.obj & - $(OBJS)\monodll_markupparser.obj & - $(OBJS)\monodll_matrix.obj & - $(OBJS)\monodll_menucmn.obj & - $(OBJS)\monodll_modalhook.obj & - $(OBJS)\monodll_mousemanager.obj & - $(OBJS)\monodll_nbkbase.obj & - $(OBJS)\monodll_overlaycmn.obj & - $(OBJS)\monodll_ownerdrwcmn.obj & - $(OBJS)\monodll_paper.obj & - $(OBJS)\monodll_panelcmn.obj & - $(OBJS)\monodll_persist.obj & - $(OBJS)\monodll_pickerbase.obj & - $(OBJS)\monodll_popupcmn.obj & - $(OBJS)\monodll_preferencescmn.obj & - $(OBJS)\monodll_prntbase.obj & - $(OBJS)\monodll_quantize.obj & - $(OBJS)\monodll_radiobtncmn.obj & - $(OBJS)\monodll_radiocmn.obj & - $(OBJS)\monodll_rearrangectrl.obj & - $(OBJS)\monodll_rendcmn.obj & - $(OBJS)\monodll_rgncmn.obj & - $(OBJS)\monodll_scrolbarcmn.obj & - $(OBJS)\monodll_settcmn.obj & - $(OBJS)\monodll_sizer.obj & - $(OBJS)\monodll_slidercmn.obj & - $(OBJS)\monodll_spinbtncmn.obj & - $(OBJS)\monodll_spinctrlcmn.obj & - $(OBJS)\monodll_srchcmn.obj & - $(OBJS)\monodll_statbar.obj & - $(OBJS)\monodll_statbmpcmn.obj & - $(OBJS)\monodll_statboxcmn.obj & - $(OBJS)\monodll_statlinecmn.obj & - $(OBJS)\monodll_stattextcmn.obj & - $(OBJS)\monodll_stockitem.obj & - $(OBJS)\monodll_tbarbase.obj & - $(OBJS)\monodll_textcmn.obj & - $(OBJS)\monodll_textentrycmn.obj & - $(OBJS)\monodll_textmeasurecmn.obj & - $(OBJS)\monodll_toplvcmn.obj & - $(OBJS)\monodll_treebase.obj & - $(OBJS)\monodll_uiactioncmn.obj & - $(OBJS)\monodll_valgen.obj & - $(OBJS)\monodll_validate.obj & - $(OBJS)\monodll_valtext.obj & - $(OBJS)\monodll_valnum.obj & - $(OBJS)\monodll_wincmn.obj & - $(OBJS)\monodll_windowid.obj & - $(OBJS)\monodll_wrapsizer.obj & - $(OBJS)\monodll_xpmdecod.obj & - $(OBJS)\monodll_busyinfo.obj & - $(OBJS)\monodll_generic_buttonbar.obj & - $(OBJS)\monodll_choicdgg.obj & - $(OBJS)\monodll_choicbkg.obj & - $(OBJS)\monodll_combog.obj & - $(OBJS)\monodll_dcpsg.obj & - $(OBJS)\monodll_dirctrlg.obj & - $(OBJS)\monodll_dragimgg.obj & - $(OBJS)\monodll_filectrlg.obj & - $(OBJS)\monodll_headerctrlg.obj & - $(OBJS)\monodll_infobar.obj & - $(OBJS)\monodll_listbkg.obj & - $(OBJS)\monodll_logg.obj & - $(OBJS)\monodll_markuptext.obj & - $(OBJS)\monodll_msgdlgg.obj & - $(OBJS)\monodll_numdlgg.obj & - $(OBJS)\monodll_progdlgg.obj & - $(OBJS)\monodll_preferencesg.obj & - $(OBJS)\monodll_printps.obj & - $(OBJS)\monodll_renderg.obj & - $(OBJS)\monodll_richmsgdlgg.obj & - $(OBJS)\monodll_scrlwing.obj & - $(OBJS)\monodll_selstore.obj & - $(OBJS)\monodll_spinctlg.obj & - $(OBJS)\monodll_splitter.obj & - $(OBJS)\monodll_srchctlg.obj & - $(OBJS)\monodll_statbmpg.obj & - $(OBJS)\monodll_stattextg.obj & - $(OBJS)\monodll_textdlgg.obj & - $(OBJS)\monodll_tipwin.obj & - $(OBJS)\monodll_toolbkg.obj & - $(OBJS)\monodll_treectlg.obj & - $(OBJS)\monodll_treebkg.obj & - $(OBJS)\monodll_vlbox.obj & - $(OBJS)\monodll_vscroll.obj & - $(OBJS)\monodll_xmlreshandler.obj -!endif -!endif -____ADVANCED_SRC_FILENAMES_OBJECTS = -!ifeq WXUNIV 0 -____ADVANCED_SRC_FILENAMES_OBJECTS = & - $(OBJS)\monodll_animatecmn.obj & - $(OBJS)\monodll_bmpcboxcmn.obj & - $(OBJS)\monodll_calctrlcmn.obj & - $(OBJS)\monodll_datavcmn.obj & - $(OBJS)\monodll_gridcmn.obj & - $(OBJS)\monodll_hyperlnkcmn.obj & - $(OBJS)\monodll_odcombocmn.obj & - $(OBJS)\monodll_richtooltipcmn.obj & - $(OBJS)\monodll_aboutdlgg.obj & - $(OBJS)\monodll_bannerwindow.obj & - $(OBJS)\monodll_bmpcboxg.obj & - $(OBJS)\monodll_calctrlg.obj & - $(OBJS)\monodll_commandlinkbuttong.obj & - $(OBJS)\monodll_datavgen.obj & - $(OBJS)\monodll_datectlg.obj & - $(OBJS)\monodll_editlbox.obj & - $(OBJS)\monodll_grid.obj & - $(OBJS)\monodll_gridctrl.obj & - $(OBJS)\monodll_grideditors.obj & - $(OBJS)\monodll_gridsel.obj & - $(OBJS)\monodll_helpext.obj & - $(OBJS)\monodll_hyperlinkg.obj & - $(OBJS)\monodll_laywin.obj & - $(OBJS)\monodll_notifmsgg.obj & - $(OBJS)\monodll_odcombo.obj & - $(OBJS)\monodll_propdlg.obj & - $(OBJS)\monodll_richtooltipg.obj & - $(OBJS)\monodll_sashwin.obj & - $(OBJS)\monodll_splash.obj & - $(OBJS)\monodll_timectrlg.obj & - $(OBJS)\monodll_tipdlg.obj & - $(OBJS)\monodll_treelist.obj & - $(OBJS)\monodll_wizard.obj & - $(OBJS)\monodll_taskbarcmn.obj & - $(OBJS)\monodll_aboutdlg.obj & - $(OBJS)\monodll_notifmsg.obj & - $(OBJS)\monodll_richtooltip.obj & - $(OBJS)\monodll_sound.obj & - $(OBJS)\monodll_taskbar.obj & - $(OBJS)\monodll_joystick.obj & - $(OBJS)\monodll_animateg.obj & - $(OBJS)\monodll_bmpcbox.obj & - $(OBJS)\monodll_calctrl.obj & - $(OBJS)\monodll_commandlinkbutton.obj & - $(OBJS)\monodll_datecontrols.obj & - $(OBJS)\monodll_datectrl.obj & - $(OBJS)\monodll_datetimectrl.obj & - $(OBJS)\monodll_hyperlink.obj & - $(OBJS)\monodll_timectrl.obj -!endif -!ifeq WXUNIV 1 -____ADVANCED_SRC_FILENAMES_OBJECTS = & - $(OBJS)\monodll_animatecmn.obj & - $(OBJS)\monodll_bmpcboxcmn.obj & - $(OBJS)\monodll_calctrlcmn.obj & - $(OBJS)\monodll_datavcmn.obj & - $(OBJS)\monodll_gridcmn.obj & - $(OBJS)\monodll_hyperlnkcmn.obj & - $(OBJS)\monodll_odcombocmn.obj & - $(OBJS)\monodll_richtooltipcmn.obj & - $(OBJS)\monodll_aboutdlgg.obj & - $(OBJS)\monodll_bannerwindow.obj & - $(OBJS)\monodll_bmpcboxg.obj & - $(OBJS)\monodll_calctrlg.obj & - $(OBJS)\monodll_commandlinkbuttong.obj & - $(OBJS)\monodll_datavgen.obj & - $(OBJS)\monodll_datectlg.obj & - $(OBJS)\monodll_editlbox.obj & - $(OBJS)\monodll_grid.obj & - $(OBJS)\monodll_gridctrl.obj & - $(OBJS)\monodll_grideditors.obj & - $(OBJS)\monodll_gridsel.obj & - $(OBJS)\monodll_helpext.obj & - $(OBJS)\monodll_hyperlinkg.obj & - $(OBJS)\monodll_laywin.obj & - $(OBJS)\monodll_notifmsgg.obj & - $(OBJS)\monodll_odcombo.obj & - $(OBJS)\monodll_propdlg.obj & - $(OBJS)\monodll_richtooltipg.obj & - $(OBJS)\monodll_sashwin.obj & - $(OBJS)\monodll_splash.obj & - $(OBJS)\monodll_timectrlg.obj & - $(OBJS)\monodll_tipdlg.obj & - $(OBJS)\monodll_treelist.obj & - $(OBJS)\monodll_wizard.obj & - $(OBJS)\monodll_taskbarcmn.obj & - $(OBJS)\monodll_aboutdlg.obj & - $(OBJS)\monodll_notifmsg.obj & - $(OBJS)\monodll_richtooltip.obj & - $(OBJS)\monodll_sound.obj & - $(OBJS)\monodll_taskbar.obj & - $(OBJS)\monodll_joystick.obj & - $(OBJS)\monodll_animateg.obj -!endif -__wxscintilla_library_link_DEP = -!ifeq USE_STC 1 -__wxscintilla_library_link_DEP = $(__wxscintilla) -!endif -__monolib___depname = -!ifeq MONOLITHIC 1 -!ifeq SHARED 0 -__monolib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!endif -____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = -!ifeq USE_GUI 1 -____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = & - $(____CORE_SRC_FILENAMES_1_OBJECTS) & - $(____ADVANCED_SRC_FILENAMES_1_OBJECTS) & - $(OBJS)\monolib_mediactrlcmn.obj & - $(OBJS)\monolib_mediactrl_am.obj & - $(OBJS)\monolib_mediactrl_wmp10.obj & - $(OBJS)\monolib_mediactrl_qt.obj & - $(OBJS)\monolib_helpbest.obj & - $(OBJS)\monolib_helpctrl.obj & - $(OBJS)\monolib_helpdata.obj & - $(OBJS)\monolib_helpdlg.obj & - $(OBJS)\monolib_helpfrm.obj & - $(OBJS)\monolib_helpwnd.obj & - $(OBJS)\monolib_htmlcell.obj & - $(OBJS)\monolib_htmlfilt.obj & - $(OBJS)\monolib_htmlpars.obj & - $(OBJS)\monolib_htmltag.obj & - $(OBJS)\monolib_htmlwin.obj & - $(OBJS)\monolib_htmprint.obj & - $(OBJS)\monolib_m_dflist.obj & - $(OBJS)\monolib_m_fonts.obj & - $(OBJS)\monolib_m_hline.obj & - $(OBJS)\monolib_m_image.obj & - $(OBJS)\monolib_m_layout.obj & - $(OBJS)\monolib_m_links.obj & - $(OBJS)\monolib_m_list.obj & - $(OBJS)\monolib_m_pre.obj & - $(OBJS)\monolib_m_span.obj & - $(OBJS)\monolib_m_style.obj & - $(OBJS)\monolib_m_tables.obj & - $(OBJS)\monolib_styleparams.obj & - $(OBJS)\monolib_winpars.obj & - $(OBJS)\monolib_htmllbox.obj & - $(OBJS)\monolib_webview_ie.obj & - $(OBJS)\monolib_webview.obj & - $(OBJS)\monolib_webviewarchivehandler.obj & - $(OBJS)\monolib_webviewfshandler.obj & - $(OBJS)\monolib_debugrpt.obj & - $(OBJS)\monolib_dbgrptg.obj & - $(OBJS)\monolib_xh_animatctrl.obj & - $(OBJS)\monolib_xh_bannerwindow.obj & - $(OBJS)\monolib_xh_bmp.obj & - $(OBJS)\monolib_xh_bmpcbox.obj & - $(OBJS)\monolib_xh_bmpbt.obj & - $(OBJS)\monolib_xh_bttn.obj & - $(OBJS)\monolib_xh_cald.obj & - $(OBJS)\monolib_xh_chckb.obj & - $(OBJS)\monolib_xh_chckl.obj & - $(OBJS)\monolib_xh_choic.obj & - $(OBJS)\monolib_xh_choicbk.obj & - $(OBJS)\monolib_xh_clrpicker.obj & - $(OBJS)\monolib_xh_cmdlinkbn.obj & - $(OBJS)\monolib_xh_collpane.obj & - $(OBJS)\monolib_xh_combo.obj & - $(OBJS)\monolib_xh_comboctrl.obj & - $(OBJS)\monolib_xh_datectrl.obj & - $(OBJS)\monolib_xh_dirpicker.obj & - $(OBJS)\monolib_xh_dlg.obj & - $(OBJS)\monolib_xh_editlbox.obj & - $(OBJS)\monolib_xh_filectrl.obj & - $(OBJS)\monolib_xh_filepicker.obj & - $(OBJS)\monolib_xh_fontpicker.obj & - $(OBJS)\monolib_xh_frame.obj & - $(OBJS)\monolib_xh_gauge.obj & - $(OBJS)\monolib_xh_gdctl.obj & - $(OBJS)\monolib_xh_grid.obj & - $(OBJS)\monolib_xh_html.obj & - $(OBJS)\monolib_xh_hyperlink.obj & - $(OBJS)\monolib_xh_listb.obj & - $(OBJS)\monolib_xh_listbk.obj & - $(OBJS)\monolib_xh_listc.obj & - $(OBJS)\monolib_xh_mdi.obj & - $(OBJS)\monolib_xh_menu.obj & - $(OBJS)\monolib_xh_notbk.obj & - $(OBJS)\monolib_xh_odcombo.obj & - $(OBJS)\monolib_xh_panel.obj & - $(OBJS)\monolib_xh_propdlg.obj & - $(OBJS)\monolib_xh_radbt.obj & - $(OBJS)\monolib_xh_radbx.obj & - $(OBJS)\monolib_xh_scrol.obj & - $(OBJS)\monolib_xh_scwin.obj & - $(OBJS)\monolib_xh_htmllbox.obj & - $(OBJS)\monolib_xh_sizer.obj & - $(OBJS)\monolib_xh_slidr.obj & - $(OBJS)\monolib_xh_spin.obj & - $(OBJS)\monolib_xh_split.obj & - $(OBJS)\monolib_xh_srchctrl.obj & - $(OBJS)\monolib_xh_statbar.obj & - $(OBJS)\monolib_xh_stbmp.obj & - $(OBJS)\monolib_xh_stbox.obj & - $(OBJS)\monolib_xh_stlin.obj & - $(OBJS)\monolib_xh_sttxt.obj & - $(OBJS)\monolib_xh_text.obj & - $(OBJS)\monolib_xh_tglbtn.obj & - $(OBJS)\monolib_xh_timectrl.obj & - $(OBJS)\monolib_xh_toolb.obj & - $(OBJS)\monolib_xh_toolbk.obj & - $(OBJS)\monolib_xh_tree.obj & - $(OBJS)\monolib_xh_treebk.obj & - $(OBJS)\monolib_xh_unkwn.obj & - $(OBJS)\monolib_xh_wizrd.obj & - $(OBJS)\monolib_xmlres.obj & - $(OBJS)\monolib_xmladv.obj & - $(OBJS)\monolib_xmlrsall.obj & - $(OBJS)\monolib_framemanager.obj & - $(OBJS)\monolib_dockart.obj & - $(OBJS)\monolib_floatpane.obj & - $(OBJS)\monolib_auibook.obj & - $(OBJS)\monolib_auibar.obj & - $(OBJS)\monolib_tabmdi.obj & - $(OBJS)\monolib_tabart.obj & - $(OBJS)\monolib_xh_auinotbk.obj & - $(OBJS)\monolib_advprops.obj & - $(OBJS)\monolib_editors.obj & - $(OBJS)\monolib_manager.obj & - $(OBJS)\monolib_property.obj & - $(OBJS)\monolib_propgrid.obj & - $(OBJS)\monolib_propgridiface.obj & - $(OBJS)\monolib_propgridpagestate.obj & - $(OBJS)\monolib_props.obj & - $(OBJS)\monolib_art_internal.obj & - $(OBJS)\monolib_art_msw.obj & - $(OBJS)\monolib_art_aui.obj & - $(OBJS)\monolib_bar.obj & - $(OBJS)\monolib_ribbon_buttonbar.obj & - $(OBJS)\monolib_ribbon_control.obj & - $(OBJS)\monolib_gallery.obj & - $(OBJS)\monolib_page.obj & - $(OBJS)\monolib_ribbon_panel.obj & - $(OBJS)\monolib_ribbon_toolbar.obj & - $(OBJS)\monolib_xh_ribbon.obj & - $(OBJS)\monolib_richtextbuffer.obj & - $(OBJS)\monolib_richtextctrl.obj & - $(OBJS)\monolib_richtextformatdlg.obj & - $(OBJS)\monolib_richtexthtml.obj & - $(OBJS)\monolib_richtextimagedlg.obj & - $(OBJS)\monolib_richtextprint.obj & - $(OBJS)\monolib_richtextstyledlg.obj & - $(OBJS)\monolib_richtextstyles.obj & - $(OBJS)\monolib_richtextsymboldlg.obj & - $(OBJS)\monolib_richtextxml.obj & - $(OBJS)\monolib_xh_richtext.obj & - $(OBJS)\monolib_stc.obj & - $(OBJS)\monolib_PlatWX.obj & - $(OBJS)\monolib_ScintillaWX.obj -!endif -____CORE_SRC_FILENAMES_1_OBJECTS = -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -____CORE_SRC_FILENAMES_1_OBJECTS = & - $(OBJS)\monolib_activex.obj & - $(OBJS)\monolib_app.obj & - $(OBJS)\monolib_bitmap.obj & - $(OBJS)\monolib_brush.obj & - $(OBJS)\monolib_caret.obj & - $(OBJS)\monolib_clipbrd.obj & - $(OBJS)\monolib_colour.obj & - $(OBJS)\monolib_cursor.obj & - $(OBJS)\monolib_data.obj & - $(OBJS)\monolib_dc.obj & - $(OBJS)\monolib_dcclient.obj & - $(OBJS)\monolib_dcmemory.obj & - $(OBJS)\monolib_dcprint.obj & - $(OBJS)\monolib_dcscreen.obj & - $(OBJS)\monolib_dialup.obj & - $(OBJS)\monolib_dib.obj & - $(OBJS)\monolib_display.obj & - $(OBJS)\monolib_enhmeta.obj & - $(OBJS)\monolib_font.obj & - $(OBJS)\monolib_fontenum.obj & - $(OBJS)\monolib_fontutil.obj & - $(OBJS)\monolib_gdiimage.obj & - $(OBJS)\monolib_gdiobj.obj & - $(OBJS)\monolib_gdiplus.obj & - $(OBJS)\monolib_graphics.obj & - $(OBJS)\monolib_icon.obj & - $(OBJS)\monolib_imaglist.obj & - $(OBJS)\monolib_minifram.obj & - $(OBJS)\monolib_nonownedwnd.obj & - $(OBJS)\monolib_dataobj.obj & - $(OBJS)\monolib_dropsrc.obj & - $(OBJS)\monolib_droptgt.obj & - $(OBJS)\monolib_oleutils.obj & - $(OBJS)\monolib_safearray.obj & - $(OBJS)\monolib_palette.obj & - $(OBJS)\monolib_pen.obj & - $(OBJS)\monolib_popupwin.obj & - $(OBJS)\monolib_printdlg.obj & - $(OBJS)\monolib_printwin.obj & - $(OBJS)\monolib_region.obj & - $(OBJS)\monolib_renderer.obj & - $(OBJS)\monolib_settings.obj & - $(OBJS)\monolib_textmeasure.obj & - $(OBJS)\monolib_tooltip.obj & - $(OBJS)\monolib_toplevel.obj & - $(OBJS)\monolib_uiaction.obj & - $(OBJS)\monolib_utilsgui.obj & - $(OBJS)\monolib_utilswin.obj & - $(OBJS)\monolib_uxtheme.obj & - $(OBJS)\monolib_window.obj & - $(OBJS)\monolib_helpchm.obj & - $(OBJS)\monolib_helpwin.obj & - $(OBJS)\monolib_automtn.obj & - $(OBJS)\monolib_uuid.obj & - $(OBJS)\monolib_clrpickerg.obj & - $(OBJS)\monolib_collpaneg.obj & - $(OBJS)\monolib_filepickerg.obj & - $(OBJS)\monolib_fontpickerg.obj & - $(OBJS)\monolib_generic_statusbr.obj & - $(OBJS)\monolib_prntdlgg.obj & - $(OBJS)\monolib_msw_accel.obj & - $(OBJS)\monolib_anybutton.obj & - $(OBJS)\monolib_artmsw.obj & - $(OBJS)\monolib_msw_bmpbuttn.obj & - $(OBJS)\monolib_msw_button.obj & - $(OBJS)\monolib_msw_checkbox.obj & - $(OBJS)\monolib_msw_choice.obj & - $(OBJS)\monolib_colordlg.obj & - $(OBJS)\monolib_combo.obj & - $(OBJS)\monolib_msw_combobox.obj & - $(OBJS)\monolib_msw_control.obj & - $(OBJS)\monolib_msw_dialog.obj & - $(OBJS)\monolib_dirdlg.obj & - $(OBJS)\monolib_dragimag.obj & - $(OBJS)\monolib_evtloop.obj & - $(OBJS)\monolib_filedlg.obj & - $(OBJS)\monolib_frame.obj & - $(OBJS)\monolib_msw_gauge.obj & - $(OBJS)\monolib_headerctrl.obj & - $(OBJS)\monolib_iniconf.obj & - $(OBJS)\monolib_msw_listbox.obj & - $(OBJS)\monolib_msw_listctrl.obj & - $(OBJS)\monolib_mdi.obj & - $(OBJS)\monolib_msw_menu.obj & - $(OBJS)\monolib_menuitem.obj & - $(OBJS)\monolib_metafile.obj & - $(OBJS)\monolib_msgdlg.obj & - $(OBJS)\monolib_nativdlg.obj & - $(OBJS)\monolib_nativewin.obj & - $(OBJS)\monolib_msw_notebook.obj & - $(OBJS)\monolib_access.obj & - $(OBJS)\monolib_ownerdrw.obj & - $(OBJS)\monolib_msw_panel.obj & - $(OBJS)\monolib_progdlg.obj & - $(OBJS)\monolib_msw_radiobox.obj & - $(OBJS)\monolib_msw_radiobut.obj & - $(OBJS)\monolib_richmsgdlg.obj & - $(OBJS)\monolib_msw_scrolbar.obj & - $(OBJS)\monolib_msw_slider.obj & - $(OBJS)\monolib_msw_spinbutt.obj & - $(OBJS)\monolib_spinctrl.obj & - $(OBJS)\monolib_msw_statbmp.obj & - $(OBJS)\monolib_msw_statbox.obj & - $(OBJS)\monolib_statusbar.obj & - $(OBJS)\monolib_msw_statline.obj & - $(OBJS)\monolib_msw_stattext.obj & - $(OBJS)\monolib_msw_toolbar.obj & - $(OBJS)\monolib_msw_textctrl.obj & - $(OBJS)\monolib_textentry.obj & - $(OBJS)\monolib_msw_tglbtn.obj & - $(OBJS)\monolib_treectrl.obj & - $(OBJS)\monolib_msw_checklst.obj & - $(OBJS)\monolib_msw_fdrepdlg.obj & - $(OBJS)\monolib_fontdlg.obj & - $(OBJS)\monolib_accelcmn.obj & - $(OBJS)\monolib_accesscmn.obj & - $(OBJS)\monolib_anidecod.obj & - $(OBJS)\monolib_affinematrix2d.obj & - $(OBJS)\monolib_appcmn.obj & - $(OBJS)\monolib_artprov.obj & - $(OBJS)\monolib_artstd.obj & - $(OBJS)\monolib_arttango.obj & - $(OBJS)\monolib_bmpbase.obj & - $(OBJS)\monolib_bmpbtncmn.obj & - $(OBJS)\monolib_bookctrl.obj & - $(OBJS)\monolib_btncmn.obj & - $(OBJS)\monolib_cairo.obj & - $(OBJS)\monolib_checkboxcmn.obj & - $(OBJS)\monolib_checklstcmn.obj & - $(OBJS)\monolib_choiccmn.obj & - $(OBJS)\monolib_clipcmn.obj & - $(OBJS)\monolib_clrpickercmn.obj & - $(OBJS)\monolib_colourcmn.obj & - $(OBJS)\monolib_colourdata.obj & - $(OBJS)\monolib_combocmn.obj & - $(OBJS)\monolib_cmdproc.obj & - $(OBJS)\monolib_cmndata.obj & - $(OBJS)\monolib_containr.obj & - $(OBJS)\monolib_cshelp.obj & - $(OBJS)\monolib_ctrlcmn.obj & - $(OBJS)\monolib_ctrlsub.obj & - $(OBJS)\monolib_dcbase.obj & - $(OBJS)\monolib_dcbufcmn.obj & - $(OBJS)\monolib_dcgraph.obj & - $(OBJS)\monolib_dcsvg.obj & - $(OBJS)\monolib_dirctrlcmn.obj & - $(OBJS)\monolib_dlgcmn.obj & - $(OBJS)\monolib_dndcmn.obj & - $(OBJS)\monolib_dobjcmn.obj & - $(OBJS)\monolib_docmdi.obj & - $(OBJS)\monolib_docview.obj & - $(OBJS)\monolib_dpycmn.obj & - $(OBJS)\monolib_dseldlg.obj & - $(OBJS)\monolib_effects.obj & - $(OBJS)\monolib_fddlgcmn.obj & - $(OBJS)\monolib_filectrlcmn.obj & - $(OBJS)\monolib_filehistorycmn.obj & - $(OBJS)\monolib_filepickercmn.obj & - $(OBJS)\monolib_fontpickercmn.obj & - $(OBJS)\monolib_fldlgcmn.obj & - $(OBJS)\monolib_fontcmn.obj & - $(OBJS)\monolib_fontdata.obj & - $(OBJS)\monolib_graphicc.obj & - $(OBJS)\monolib_fontenumcmn.obj & - $(OBJS)\monolib_fontmap.obj & - $(OBJS)\monolib_fontutilcmn.obj & - $(OBJS)\monolib_framecmn.obj & - $(OBJS)\monolib_gaugecmn.obj & - $(OBJS)\monolib_gbsizer.obj & - $(OBJS)\monolib_gdicmn.obj & - $(OBJS)\monolib_geometry.obj & - $(OBJS)\monolib_gifdecod.obj & - $(OBJS)\monolib_graphcmn.obj & - $(OBJS)\monolib_headercolcmn.obj & - $(OBJS)\monolib_headerctrlcmn.obj & - $(OBJS)\monolib_helpbase.obj & - $(OBJS)\monolib_iconbndl.obj & - $(OBJS)\monolib_imagall.obj & - $(OBJS)\monolib_imagbmp.obj & - $(OBJS)\monolib_image.obj & - $(OBJS)\monolib_imagfill.obj & - $(OBJS)\monolib_imaggif.obj & - $(OBJS)\monolib_imagiff.obj & - $(OBJS)\monolib_imagjpeg.obj & - $(OBJS)\monolib_imagpcx.obj & - $(OBJS)\monolib_imagpng.obj & - $(OBJS)\monolib_imagpnm.obj & - $(OBJS)\monolib_imagtga.obj & - $(OBJS)\monolib_imagtiff.obj & - $(OBJS)\monolib_imagxpm.obj & - $(OBJS)\monolib_layout.obj & - $(OBJS)\monolib_lboxcmn.obj & - $(OBJS)\monolib_listctrlcmn.obj & - $(OBJS)\monolib_markupparser.obj & - $(OBJS)\monolib_matrix.obj & - $(OBJS)\monolib_menucmn.obj & - $(OBJS)\monolib_modalhook.obj & - $(OBJS)\monolib_mousemanager.obj & - $(OBJS)\monolib_nbkbase.obj & - $(OBJS)\monolib_overlaycmn.obj & - $(OBJS)\monolib_ownerdrwcmn.obj & - $(OBJS)\monolib_paper.obj & - $(OBJS)\monolib_panelcmn.obj & - $(OBJS)\monolib_persist.obj & - $(OBJS)\monolib_pickerbase.obj & - $(OBJS)\monolib_popupcmn.obj & - $(OBJS)\monolib_preferencescmn.obj & - $(OBJS)\monolib_prntbase.obj & - $(OBJS)\monolib_quantize.obj & - $(OBJS)\monolib_radiobtncmn.obj & - $(OBJS)\monolib_radiocmn.obj & - $(OBJS)\monolib_rearrangectrl.obj & - $(OBJS)\monolib_rendcmn.obj & - $(OBJS)\monolib_rgncmn.obj & - $(OBJS)\monolib_scrolbarcmn.obj & - $(OBJS)\monolib_settcmn.obj & - $(OBJS)\monolib_sizer.obj & - $(OBJS)\monolib_slidercmn.obj & - $(OBJS)\monolib_spinbtncmn.obj & - $(OBJS)\monolib_spinctrlcmn.obj & - $(OBJS)\monolib_srchcmn.obj & - $(OBJS)\monolib_statbar.obj & - $(OBJS)\monolib_statbmpcmn.obj & - $(OBJS)\monolib_statboxcmn.obj & - $(OBJS)\monolib_statlinecmn.obj & - $(OBJS)\monolib_stattextcmn.obj & - $(OBJS)\monolib_stockitem.obj & - $(OBJS)\monolib_tbarbase.obj & - $(OBJS)\monolib_textcmn.obj & - $(OBJS)\monolib_textentrycmn.obj & - $(OBJS)\monolib_textmeasurecmn.obj & - $(OBJS)\monolib_toplvcmn.obj & - $(OBJS)\monolib_treebase.obj & - $(OBJS)\monolib_uiactioncmn.obj & - $(OBJS)\monolib_valgen.obj & - $(OBJS)\monolib_validate.obj & - $(OBJS)\monolib_valtext.obj & - $(OBJS)\monolib_valnum.obj & - $(OBJS)\monolib_wincmn.obj & - $(OBJS)\monolib_windowid.obj & - $(OBJS)\monolib_wrapsizer.obj & - $(OBJS)\monolib_xpmdecod.obj & - $(OBJS)\monolib_busyinfo.obj & - $(OBJS)\monolib_generic_buttonbar.obj & - $(OBJS)\monolib_choicdgg.obj & - $(OBJS)\monolib_choicbkg.obj & - $(OBJS)\monolib_combog.obj & - $(OBJS)\monolib_dcpsg.obj & - $(OBJS)\monolib_dirctrlg.obj & - $(OBJS)\monolib_dragimgg.obj & - $(OBJS)\monolib_filectrlg.obj & - $(OBJS)\monolib_headerctrlg.obj & - $(OBJS)\monolib_infobar.obj & - $(OBJS)\monolib_listbkg.obj & - $(OBJS)\monolib_logg.obj & - $(OBJS)\monolib_markuptext.obj & - $(OBJS)\monolib_msgdlgg.obj & - $(OBJS)\monolib_numdlgg.obj & - $(OBJS)\monolib_progdlgg.obj & - $(OBJS)\monolib_preferencesg.obj & - $(OBJS)\monolib_printps.obj & - $(OBJS)\monolib_renderg.obj & - $(OBJS)\monolib_richmsgdlgg.obj & - $(OBJS)\monolib_scrlwing.obj & - $(OBJS)\monolib_selstore.obj & - $(OBJS)\monolib_spinctlg.obj & - $(OBJS)\monolib_splitter.obj & - $(OBJS)\monolib_srchctlg.obj & - $(OBJS)\monolib_statbmpg.obj & - $(OBJS)\monolib_stattextg.obj & - $(OBJS)\monolib_textdlgg.obj & - $(OBJS)\monolib_tipwin.obj & - $(OBJS)\monolib_toolbkg.obj & - $(OBJS)\monolib_treectlg.obj & - $(OBJS)\monolib_treebkg.obj & - $(OBJS)\monolib_vlbox.obj & - $(OBJS)\monolib_vscroll.obj & - $(OBJS)\monolib_xmlreshandler.obj -!endif -!endif -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -____CORE_SRC_FILENAMES_1_OBJECTS = & - $(OBJS)\monolib_activex.obj & - $(OBJS)\monolib_app.obj & - $(OBJS)\monolib_bitmap.obj & - $(OBJS)\monolib_brush.obj & - $(OBJS)\monolib_caret.obj & - $(OBJS)\monolib_clipbrd.obj & - $(OBJS)\monolib_colour.obj & - $(OBJS)\monolib_cursor.obj & - $(OBJS)\monolib_data.obj & - $(OBJS)\monolib_dc.obj & - $(OBJS)\monolib_dcclient.obj & - $(OBJS)\monolib_dcmemory.obj & - $(OBJS)\monolib_dcprint.obj & - $(OBJS)\monolib_dcscreen.obj & - $(OBJS)\monolib_dialup.obj & - $(OBJS)\monolib_dib.obj & - $(OBJS)\monolib_display.obj & - $(OBJS)\monolib_enhmeta.obj & - $(OBJS)\monolib_font.obj & - $(OBJS)\monolib_fontenum.obj & - $(OBJS)\monolib_fontutil.obj & - $(OBJS)\monolib_gdiimage.obj & - $(OBJS)\monolib_gdiobj.obj & - $(OBJS)\monolib_gdiplus.obj & - $(OBJS)\monolib_graphics.obj & - $(OBJS)\monolib_icon.obj & - $(OBJS)\monolib_imaglist.obj & - $(OBJS)\monolib_minifram.obj & - $(OBJS)\monolib_nonownedwnd.obj & - $(OBJS)\monolib_dataobj.obj & - $(OBJS)\monolib_dropsrc.obj & - $(OBJS)\monolib_droptgt.obj & - $(OBJS)\monolib_oleutils.obj & - $(OBJS)\monolib_safearray.obj & - $(OBJS)\monolib_palette.obj & - $(OBJS)\monolib_pen.obj & - $(OBJS)\monolib_popupwin.obj & - $(OBJS)\monolib_printdlg.obj & - $(OBJS)\monolib_printwin.obj & - $(OBJS)\monolib_region.obj & - $(OBJS)\monolib_renderer.obj & - $(OBJS)\monolib_settings.obj & - $(OBJS)\monolib_textmeasure.obj & - $(OBJS)\monolib_tooltip.obj & - $(OBJS)\monolib_toplevel.obj & - $(OBJS)\monolib_uiaction.obj & - $(OBJS)\monolib_utilsgui.obj & - $(OBJS)\monolib_utilswin.obj & - $(OBJS)\monolib_uxtheme.obj & - $(OBJS)\monolib_window.obj & - $(OBJS)\monolib_helpchm.obj & - $(OBJS)\monolib_helpwin.obj & - $(OBJS)\monolib_automtn.obj & - $(OBJS)\monolib_uuid.obj & - $(OBJS)\monolib_evtloop.obj & - $(OBJS)\monolib_generic_accel.obj & - $(OBJS)\monolib_clrpickerg.obj & - $(OBJS)\monolib_collpaneg.obj & - $(OBJS)\monolib_colrdlgg.obj & - $(OBJS)\monolib_dirdlgg.obj & - $(OBJS)\monolib_generic_fdrepdlg.obj & - $(OBJS)\monolib_filedlgg.obj & - $(OBJS)\monolib_filepickerg.obj & - $(OBJS)\monolib_fontdlgg.obj & - $(OBJS)\monolib_fontpickerg.obj & - $(OBJS)\monolib_generic_listctrl.obj & - $(OBJS)\monolib_mdig.obj & - $(OBJS)\monolib_prntdlgg.obj & - $(OBJS)\monolib_univ_bmpbuttn.obj & - $(OBJS)\monolib_univ_button.obj & - $(OBJS)\monolib_univ_checkbox.obj & - $(OBJS)\monolib_univ_checklst.obj & - $(OBJS)\monolib_univ_choice.obj & - $(OBJS)\monolib_univ_combobox.obj & - $(OBJS)\monolib_univ_control.obj & - $(OBJS)\monolib_ctrlrend.obj & - $(OBJS)\monolib_univ_dialog.obj & - $(OBJS)\monolib_framuniv.obj & - $(OBJS)\monolib_univ_gauge.obj & - $(OBJS)\monolib_inpcons.obj & - $(OBJS)\monolib_inphand.obj & - $(OBJS)\monolib_univ_listbox.obj & - $(OBJS)\monolib_univ_menu.obj & - $(OBJS)\monolib_univ_notebook.obj & - $(OBJS)\monolib_univ_radiobox.obj & - $(OBJS)\monolib_univ_radiobut.obj & - $(OBJS)\monolib_scrarrow.obj & - $(OBJS)\monolib_univ_scrolbar.obj & - $(OBJS)\monolib_scrthumb.obj & - $(OBJS)\monolib_settingsuniv.obj & - $(OBJS)\monolib_univ_slider.obj & - $(OBJS)\monolib_univ_spinbutt.obj & - $(OBJS)\monolib_univ_statbmp.obj & - $(OBJS)\monolib_univ_statbox.obj & - $(OBJS)\monolib_univ_statline.obj & - $(OBJS)\monolib_univ_stattext.obj & - $(OBJS)\monolib_univ_statusbr.obj & - $(OBJS)\monolib_stdrend.obj & - $(OBJS)\monolib_univ_textctrl.obj & - $(OBJS)\monolib_univ_tglbtn.obj & - $(OBJS)\monolib_theme.obj & - $(OBJS)\monolib_univ_toolbar.obj & - $(OBJS)\monolib_topluniv.obj & - $(OBJS)\monolib_winuniv.obj & - $(OBJS)\monolib_gtk.obj & - $(OBJS)\monolib_metal.obj & - $(OBJS)\monolib_mono.obj & - $(OBJS)\monolib_win32.obj & - $(OBJS)\monolib_accelcmn.obj & - $(OBJS)\monolib_accesscmn.obj & - $(OBJS)\monolib_anidecod.obj & - $(OBJS)\monolib_affinematrix2d.obj & - $(OBJS)\monolib_appcmn.obj & - $(OBJS)\monolib_artprov.obj & - $(OBJS)\monolib_artstd.obj & - $(OBJS)\monolib_arttango.obj & - $(OBJS)\monolib_bmpbase.obj & - $(OBJS)\monolib_bmpbtncmn.obj & - $(OBJS)\monolib_bookctrl.obj & - $(OBJS)\monolib_btncmn.obj & - $(OBJS)\monolib_cairo.obj & - $(OBJS)\monolib_checkboxcmn.obj & - $(OBJS)\monolib_checklstcmn.obj & - $(OBJS)\monolib_choiccmn.obj & - $(OBJS)\monolib_clipcmn.obj & - $(OBJS)\monolib_clrpickercmn.obj & - $(OBJS)\monolib_colourcmn.obj & - $(OBJS)\monolib_colourdata.obj & - $(OBJS)\monolib_combocmn.obj & - $(OBJS)\monolib_cmdproc.obj & - $(OBJS)\monolib_cmndata.obj & - $(OBJS)\monolib_containr.obj & - $(OBJS)\monolib_cshelp.obj & - $(OBJS)\monolib_ctrlcmn.obj & - $(OBJS)\monolib_ctrlsub.obj & - $(OBJS)\monolib_dcbase.obj & - $(OBJS)\monolib_dcbufcmn.obj & - $(OBJS)\monolib_dcgraph.obj & - $(OBJS)\monolib_dcsvg.obj & - $(OBJS)\monolib_dirctrlcmn.obj & - $(OBJS)\monolib_dlgcmn.obj & - $(OBJS)\monolib_dndcmn.obj & - $(OBJS)\monolib_dobjcmn.obj & - $(OBJS)\monolib_docmdi.obj & - $(OBJS)\monolib_docview.obj & - $(OBJS)\monolib_dpycmn.obj & - $(OBJS)\monolib_dseldlg.obj & - $(OBJS)\monolib_effects.obj & - $(OBJS)\monolib_fddlgcmn.obj & - $(OBJS)\monolib_filectrlcmn.obj & - $(OBJS)\monolib_filehistorycmn.obj & - $(OBJS)\monolib_filepickercmn.obj & - $(OBJS)\monolib_fontpickercmn.obj & - $(OBJS)\monolib_fldlgcmn.obj & - $(OBJS)\monolib_fontcmn.obj & - $(OBJS)\monolib_fontdata.obj & - $(OBJS)\monolib_graphicc.obj & - $(OBJS)\monolib_fontenumcmn.obj & - $(OBJS)\monolib_fontmap.obj & - $(OBJS)\monolib_fontutilcmn.obj & - $(OBJS)\monolib_framecmn.obj & - $(OBJS)\monolib_gaugecmn.obj & - $(OBJS)\monolib_gbsizer.obj & - $(OBJS)\monolib_gdicmn.obj & - $(OBJS)\monolib_geometry.obj & - $(OBJS)\monolib_gifdecod.obj & - $(OBJS)\monolib_graphcmn.obj & - $(OBJS)\monolib_headercolcmn.obj & - $(OBJS)\monolib_headerctrlcmn.obj & - $(OBJS)\monolib_helpbase.obj & - $(OBJS)\monolib_iconbndl.obj & - $(OBJS)\monolib_imagall.obj & - $(OBJS)\monolib_imagbmp.obj & - $(OBJS)\monolib_image.obj & - $(OBJS)\monolib_imagfill.obj & - $(OBJS)\monolib_imaggif.obj & - $(OBJS)\monolib_imagiff.obj & - $(OBJS)\monolib_imagjpeg.obj & - $(OBJS)\monolib_imagpcx.obj & - $(OBJS)\monolib_imagpng.obj & - $(OBJS)\monolib_imagpnm.obj & - $(OBJS)\monolib_imagtga.obj & - $(OBJS)\monolib_imagtiff.obj & - $(OBJS)\monolib_imagxpm.obj & - $(OBJS)\monolib_layout.obj & - $(OBJS)\monolib_lboxcmn.obj & - $(OBJS)\monolib_listctrlcmn.obj & - $(OBJS)\monolib_markupparser.obj & - $(OBJS)\monolib_matrix.obj & - $(OBJS)\monolib_menucmn.obj & - $(OBJS)\monolib_modalhook.obj & - $(OBJS)\monolib_mousemanager.obj & - $(OBJS)\monolib_nbkbase.obj & - $(OBJS)\monolib_overlaycmn.obj & - $(OBJS)\monolib_ownerdrwcmn.obj & - $(OBJS)\monolib_paper.obj & - $(OBJS)\monolib_panelcmn.obj & - $(OBJS)\monolib_persist.obj & - $(OBJS)\monolib_pickerbase.obj & - $(OBJS)\monolib_popupcmn.obj & - $(OBJS)\monolib_preferencescmn.obj & - $(OBJS)\monolib_prntbase.obj & - $(OBJS)\monolib_quantize.obj & - $(OBJS)\monolib_radiobtncmn.obj & - $(OBJS)\monolib_radiocmn.obj & - $(OBJS)\monolib_rearrangectrl.obj & - $(OBJS)\monolib_rendcmn.obj & - $(OBJS)\monolib_rgncmn.obj & - $(OBJS)\monolib_scrolbarcmn.obj & - $(OBJS)\monolib_settcmn.obj & - $(OBJS)\monolib_sizer.obj & - $(OBJS)\monolib_slidercmn.obj & - $(OBJS)\monolib_spinbtncmn.obj & - $(OBJS)\monolib_spinctrlcmn.obj & - $(OBJS)\monolib_srchcmn.obj & - $(OBJS)\monolib_statbar.obj & - $(OBJS)\monolib_statbmpcmn.obj & - $(OBJS)\monolib_statboxcmn.obj & - $(OBJS)\monolib_statlinecmn.obj & - $(OBJS)\monolib_stattextcmn.obj & - $(OBJS)\monolib_stockitem.obj & - $(OBJS)\monolib_tbarbase.obj & - $(OBJS)\monolib_textcmn.obj & - $(OBJS)\monolib_textentrycmn.obj & - $(OBJS)\monolib_textmeasurecmn.obj & - $(OBJS)\monolib_toplvcmn.obj & - $(OBJS)\monolib_treebase.obj & - $(OBJS)\monolib_uiactioncmn.obj & - $(OBJS)\monolib_valgen.obj & - $(OBJS)\monolib_validate.obj & - $(OBJS)\monolib_valtext.obj & - $(OBJS)\monolib_valnum.obj & - $(OBJS)\monolib_wincmn.obj & - $(OBJS)\monolib_windowid.obj & - $(OBJS)\monolib_wrapsizer.obj & - $(OBJS)\monolib_xpmdecod.obj & - $(OBJS)\monolib_busyinfo.obj & - $(OBJS)\monolib_generic_buttonbar.obj & - $(OBJS)\monolib_choicdgg.obj & - $(OBJS)\monolib_choicbkg.obj & - $(OBJS)\monolib_combog.obj & - $(OBJS)\monolib_dcpsg.obj & - $(OBJS)\monolib_dirctrlg.obj & - $(OBJS)\monolib_dragimgg.obj & - $(OBJS)\monolib_filectrlg.obj & - $(OBJS)\monolib_headerctrlg.obj & - $(OBJS)\monolib_infobar.obj & - $(OBJS)\monolib_listbkg.obj & - $(OBJS)\monolib_logg.obj & - $(OBJS)\monolib_markuptext.obj & - $(OBJS)\monolib_msgdlgg.obj & - $(OBJS)\monolib_numdlgg.obj & - $(OBJS)\monolib_progdlgg.obj & - $(OBJS)\monolib_preferencesg.obj & - $(OBJS)\monolib_printps.obj & - $(OBJS)\monolib_renderg.obj & - $(OBJS)\monolib_richmsgdlgg.obj & - $(OBJS)\monolib_scrlwing.obj & - $(OBJS)\monolib_selstore.obj & - $(OBJS)\monolib_spinctlg.obj & - $(OBJS)\monolib_splitter.obj & - $(OBJS)\monolib_srchctlg.obj & - $(OBJS)\monolib_statbmpg.obj & - $(OBJS)\monolib_stattextg.obj & - $(OBJS)\monolib_textdlgg.obj & - $(OBJS)\monolib_tipwin.obj & - $(OBJS)\monolib_toolbkg.obj & - $(OBJS)\monolib_treectlg.obj & - $(OBJS)\monolib_treebkg.obj & - $(OBJS)\monolib_vlbox.obj & - $(OBJS)\monolib_vscroll.obj & - $(OBJS)\monolib_xmlreshandler.obj -!endif -!endif -____ADVANCED_SRC_FILENAMES_1_OBJECTS = -!ifeq WXUNIV 0 -____ADVANCED_SRC_FILENAMES_1_OBJECTS = & - $(OBJS)\monolib_animatecmn.obj & - $(OBJS)\monolib_bmpcboxcmn.obj & - $(OBJS)\monolib_calctrlcmn.obj & - $(OBJS)\monolib_datavcmn.obj & - $(OBJS)\monolib_gridcmn.obj & - $(OBJS)\monolib_hyperlnkcmn.obj & - $(OBJS)\monolib_odcombocmn.obj & - $(OBJS)\monolib_richtooltipcmn.obj & - $(OBJS)\monolib_aboutdlgg.obj & - $(OBJS)\monolib_bannerwindow.obj & - $(OBJS)\monolib_bmpcboxg.obj & - $(OBJS)\monolib_calctrlg.obj & - $(OBJS)\monolib_commandlinkbuttong.obj & - $(OBJS)\monolib_datavgen.obj & - $(OBJS)\monolib_datectlg.obj & - $(OBJS)\monolib_editlbox.obj & - $(OBJS)\monolib_grid.obj & - $(OBJS)\monolib_gridctrl.obj & - $(OBJS)\monolib_grideditors.obj & - $(OBJS)\monolib_gridsel.obj & - $(OBJS)\monolib_helpext.obj & - $(OBJS)\monolib_hyperlinkg.obj & - $(OBJS)\monolib_laywin.obj & - $(OBJS)\monolib_notifmsgg.obj & - $(OBJS)\monolib_odcombo.obj & - $(OBJS)\monolib_propdlg.obj & - $(OBJS)\monolib_richtooltipg.obj & - $(OBJS)\monolib_sashwin.obj & - $(OBJS)\monolib_splash.obj & - $(OBJS)\monolib_timectrlg.obj & - $(OBJS)\monolib_tipdlg.obj & - $(OBJS)\monolib_treelist.obj & - $(OBJS)\monolib_wizard.obj & - $(OBJS)\monolib_taskbarcmn.obj & - $(OBJS)\monolib_aboutdlg.obj & - $(OBJS)\monolib_notifmsg.obj & - $(OBJS)\monolib_richtooltip.obj & - $(OBJS)\monolib_sound.obj & - $(OBJS)\monolib_taskbar.obj & - $(OBJS)\monolib_joystick.obj & - $(OBJS)\monolib_animateg.obj & - $(OBJS)\monolib_bmpcbox.obj & - $(OBJS)\monolib_calctrl.obj & - $(OBJS)\monolib_commandlinkbutton.obj & - $(OBJS)\monolib_datecontrols.obj & - $(OBJS)\monolib_datectrl.obj & - $(OBJS)\monolib_datetimectrl.obj & - $(OBJS)\monolib_hyperlink.obj & - $(OBJS)\monolib_timectrl.obj -!endif -!ifeq WXUNIV 1 -____ADVANCED_SRC_FILENAMES_1_OBJECTS = & - $(OBJS)\monolib_animatecmn.obj & - $(OBJS)\monolib_bmpcboxcmn.obj & - $(OBJS)\monolib_calctrlcmn.obj & - $(OBJS)\monolib_datavcmn.obj & - $(OBJS)\monolib_gridcmn.obj & - $(OBJS)\monolib_hyperlnkcmn.obj & - $(OBJS)\monolib_odcombocmn.obj & - $(OBJS)\monolib_richtooltipcmn.obj & - $(OBJS)\monolib_aboutdlgg.obj & - $(OBJS)\monolib_bannerwindow.obj & - $(OBJS)\monolib_bmpcboxg.obj & - $(OBJS)\monolib_calctrlg.obj & - $(OBJS)\monolib_commandlinkbuttong.obj & - $(OBJS)\monolib_datavgen.obj & - $(OBJS)\monolib_datectlg.obj & - $(OBJS)\monolib_editlbox.obj & - $(OBJS)\monolib_grid.obj & - $(OBJS)\monolib_gridctrl.obj & - $(OBJS)\monolib_grideditors.obj & - $(OBJS)\monolib_gridsel.obj & - $(OBJS)\monolib_helpext.obj & - $(OBJS)\monolib_hyperlinkg.obj & - $(OBJS)\monolib_laywin.obj & - $(OBJS)\monolib_notifmsgg.obj & - $(OBJS)\monolib_odcombo.obj & - $(OBJS)\monolib_propdlg.obj & - $(OBJS)\monolib_richtooltipg.obj & - $(OBJS)\monolib_sashwin.obj & - $(OBJS)\monolib_splash.obj & - $(OBJS)\monolib_timectrlg.obj & - $(OBJS)\monolib_tipdlg.obj & - $(OBJS)\monolib_treelist.obj & - $(OBJS)\monolib_wizard.obj & - $(OBJS)\monolib_taskbarcmn.obj & - $(OBJS)\monolib_aboutdlg.obj & - $(OBJS)\monolib_notifmsg.obj & - $(OBJS)\monolib_richtooltip.obj & - $(OBJS)\monolib_sound.obj & - $(OBJS)\monolib_taskbar.obj & - $(OBJS)\monolib_joystick.obj & - $(OBJS)\monolib_animateg.obj -!endif -__basedll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -__basedll___depname = & - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll -!endif -!endif -__baselib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -__baselib___depname = & - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -!endif -____wxbase_namedll_DEP = -!ifeq SHARED 1 -____wxbase_namedll_DEP = $(__basedll___depname) -!endif -____wxbase_namelib_DEP = -!ifeq SHARED 0 -____wxbase_namelib_DEP = $(__baselib___depname) -!endif -__netdll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -__netdll___depname = & - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll -!endif -!endif -__netlib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -__netlib___depname = & - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib -!endif -!endif -____wxnet_namedll_DEP = -!ifeq SHARED 1 -____wxnet_namedll_DEP = $(__netdll___depname) -!endif -____wxnet_namelib_DEP = -!ifeq SHARED 0 -____wxnet_namelib_DEP = $(__netlib___depname) -!endif -__coredll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -__coredll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll -!endif -!endif -!endif -____CORE_SRC_FILENAMES_2_OBJECTS = -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -____CORE_SRC_FILENAMES_2_OBJECTS = & - $(OBJS)\coredll_activex.obj & - $(OBJS)\coredll_app.obj & - $(OBJS)\coredll_bitmap.obj & - $(OBJS)\coredll_brush.obj & - $(OBJS)\coredll_caret.obj & - $(OBJS)\coredll_clipbrd.obj & - $(OBJS)\coredll_colour.obj & - $(OBJS)\coredll_cursor.obj & - $(OBJS)\coredll_data.obj & - $(OBJS)\coredll_dc.obj & - $(OBJS)\coredll_dcclient.obj & - $(OBJS)\coredll_dcmemory.obj & - $(OBJS)\coredll_dcprint.obj & - $(OBJS)\coredll_dcscreen.obj & - $(OBJS)\coredll_dialup.obj & - $(OBJS)\coredll_dib.obj & - $(OBJS)\coredll_display.obj & - $(OBJS)\coredll_enhmeta.obj & - $(OBJS)\coredll_font.obj & - $(OBJS)\coredll_fontenum.obj & - $(OBJS)\coredll_fontutil.obj & - $(OBJS)\coredll_gdiimage.obj & - $(OBJS)\coredll_gdiobj.obj & - $(OBJS)\coredll_gdiplus.obj & - $(OBJS)\coredll_graphics.obj & - $(OBJS)\coredll_icon.obj & - $(OBJS)\coredll_imaglist.obj & - $(OBJS)\coredll_minifram.obj & - $(OBJS)\coredll_nonownedwnd.obj & - $(OBJS)\coredll_dataobj.obj & - $(OBJS)\coredll_dropsrc.obj & - $(OBJS)\coredll_droptgt.obj & - $(OBJS)\coredll_oleutils.obj & - $(OBJS)\coredll_safearray.obj & - $(OBJS)\coredll_palette.obj & - $(OBJS)\coredll_pen.obj & - $(OBJS)\coredll_popupwin.obj & - $(OBJS)\coredll_printdlg.obj & - $(OBJS)\coredll_printwin.obj & - $(OBJS)\coredll_region.obj & - $(OBJS)\coredll_renderer.obj & - $(OBJS)\coredll_settings.obj & - $(OBJS)\coredll_textmeasure.obj & - $(OBJS)\coredll_tooltip.obj & - $(OBJS)\coredll_toplevel.obj & - $(OBJS)\coredll_uiaction.obj & - $(OBJS)\coredll_utilsgui.obj & - $(OBJS)\coredll_utilswin.obj & - $(OBJS)\coredll_uxtheme.obj & - $(OBJS)\coredll_window.obj & - $(OBJS)\coredll_helpchm.obj & - $(OBJS)\coredll_helpwin.obj & - $(OBJS)\coredll_automtn.obj & - $(OBJS)\coredll_uuid.obj & - $(OBJS)\coredll_clrpickerg.obj & - $(OBJS)\coredll_collpaneg.obj & - $(OBJS)\coredll_filepickerg.obj & - $(OBJS)\coredll_fontpickerg.obj & - $(OBJS)\coredll_generic_statusbr.obj & - $(OBJS)\coredll_prntdlgg.obj & - $(OBJS)\coredll_msw_accel.obj & - $(OBJS)\coredll_anybutton.obj & - $(OBJS)\coredll_artmsw.obj & - $(OBJS)\coredll_msw_bmpbuttn.obj & - $(OBJS)\coredll_msw_button.obj & - $(OBJS)\coredll_msw_checkbox.obj & - $(OBJS)\coredll_msw_choice.obj & - $(OBJS)\coredll_colordlg.obj & - $(OBJS)\coredll_combo.obj & - $(OBJS)\coredll_msw_combobox.obj & - $(OBJS)\coredll_msw_control.obj & - $(OBJS)\coredll_msw_dialog.obj & - $(OBJS)\coredll_dirdlg.obj & - $(OBJS)\coredll_dragimag.obj & - $(OBJS)\coredll_evtloop.obj & - $(OBJS)\coredll_filedlg.obj & - $(OBJS)\coredll_frame.obj & - $(OBJS)\coredll_msw_gauge.obj & - $(OBJS)\coredll_headerctrl.obj & - $(OBJS)\coredll_iniconf.obj & - $(OBJS)\coredll_msw_listbox.obj & - $(OBJS)\coredll_msw_listctrl.obj & - $(OBJS)\coredll_mdi.obj & - $(OBJS)\coredll_msw_menu.obj & - $(OBJS)\coredll_menuitem.obj & - $(OBJS)\coredll_metafile.obj & - $(OBJS)\coredll_msgdlg.obj & - $(OBJS)\coredll_nativdlg.obj & - $(OBJS)\coredll_nativewin.obj & - $(OBJS)\coredll_msw_notebook.obj & - $(OBJS)\coredll_access.obj & - $(OBJS)\coredll_ownerdrw.obj & - $(OBJS)\coredll_panel.obj & - $(OBJS)\coredll_progdlg.obj & - $(OBJS)\coredll_msw_radiobox.obj & - $(OBJS)\coredll_msw_radiobut.obj & - $(OBJS)\coredll_richmsgdlg.obj & - $(OBJS)\coredll_msw_scrolbar.obj & - $(OBJS)\coredll_msw_slider.obj & - $(OBJS)\coredll_msw_spinbutt.obj & - $(OBJS)\coredll_spinctrl.obj & - $(OBJS)\coredll_msw_statbmp.obj & - $(OBJS)\coredll_msw_statbox.obj & - $(OBJS)\coredll_statusbar.obj & - $(OBJS)\coredll_msw_statline.obj & - $(OBJS)\coredll_msw_stattext.obj & - $(OBJS)\coredll_msw_toolbar.obj & - $(OBJS)\coredll_msw_textctrl.obj & - $(OBJS)\coredll_textentry.obj & - $(OBJS)\coredll_msw_tglbtn.obj & - $(OBJS)\coredll_treectrl.obj & - $(OBJS)\coredll_msw_checklst.obj & - $(OBJS)\coredll_msw_fdrepdlg.obj & - $(OBJS)\coredll_fontdlg.obj & - $(OBJS)\coredll_accelcmn.obj & - $(OBJS)\coredll_accesscmn.obj & - $(OBJS)\coredll_anidecod.obj & - $(OBJS)\coredll_affinematrix2d.obj & - $(OBJS)\coredll_appcmn.obj & - $(OBJS)\coredll_artprov.obj & - $(OBJS)\coredll_artstd.obj & - $(OBJS)\coredll_arttango.obj & - $(OBJS)\coredll_bmpbase.obj & - $(OBJS)\coredll_bmpbtncmn.obj & - $(OBJS)\coredll_bookctrl.obj & - $(OBJS)\coredll_btncmn.obj & - $(OBJS)\coredll_cairo.obj & - $(OBJS)\coredll_checkboxcmn.obj & - $(OBJS)\coredll_checklstcmn.obj & - $(OBJS)\coredll_choiccmn.obj & - $(OBJS)\coredll_clipcmn.obj & - $(OBJS)\coredll_clrpickercmn.obj & - $(OBJS)\coredll_colourcmn.obj & - $(OBJS)\coredll_colourdata.obj & - $(OBJS)\coredll_combocmn.obj & - $(OBJS)\coredll_cmdproc.obj & - $(OBJS)\coredll_cmndata.obj & - $(OBJS)\coredll_containr.obj & - $(OBJS)\coredll_cshelp.obj & - $(OBJS)\coredll_ctrlcmn.obj & - $(OBJS)\coredll_ctrlsub.obj & - $(OBJS)\coredll_dcbase.obj & - $(OBJS)\coredll_dcbufcmn.obj & - $(OBJS)\coredll_dcgraph.obj & - $(OBJS)\coredll_dcsvg.obj & - $(OBJS)\coredll_dirctrlcmn.obj & - $(OBJS)\coredll_dlgcmn.obj & - $(OBJS)\coredll_dndcmn.obj & - $(OBJS)\coredll_dobjcmn.obj & - $(OBJS)\coredll_docmdi.obj & - $(OBJS)\coredll_docview.obj & - $(OBJS)\coredll_dpycmn.obj & - $(OBJS)\coredll_dseldlg.obj & - $(OBJS)\coredll_effects.obj & - $(OBJS)\coredll_fddlgcmn.obj & - $(OBJS)\coredll_filectrlcmn.obj & - $(OBJS)\coredll_filehistorycmn.obj & - $(OBJS)\coredll_filepickercmn.obj & - $(OBJS)\coredll_fontpickercmn.obj & - $(OBJS)\coredll_fldlgcmn.obj & - $(OBJS)\coredll_fontcmn.obj & - $(OBJS)\coredll_fontdata.obj & - $(OBJS)\coredll_graphicc.obj & - $(OBJS)\coredll_fontenumcmn.obj & - $(OBJS)\coredll_fontmap.obj & - $(OBJS)\coredll_fontutilcmn.obj & - $(OBJS)\coredll_framecmn.obj & - $(OBJS)\coredll_gaugecmn.obj & - $(OBJS)\coredll_gbsizer.obj & - $(OBJS)\coredll_gdicmn.obj & - $(OBJS)\coredll_geometry.obj & - $(OBJS)\coredll_gifdecod.obj & - $(OBJS)\coredll_graphcmn.obj & - $(OBJS)\coredll_headercolcmn.obj & - $(OBJS)\coredll_headerctrlcmn.obj & - $(OBJS)\coredll_helpbase.obj & - $(OBJS)\coredll_iconbndl.obj & - $(OBJS)\coredll_imagall.obj & - $(OBJS)\coredll_imagbmp.obj & - $(OBJS)\coredll_image.obj & - $(OBJS)\coredll_imagfill.obj & - $(OBJS)\coredll_imaggif.obj & - $(OBJS)\coredll_imagiff.obj & - $(OBJS)\coredll_imagjpeg.obj & - $(OBJS)\coredll_imagpcx.obj & - $(OBJS)\coredll_imagpng.obj & - $(OBJS)\coredll_imagpnm.obj & - $(OBJS)\coredll_imagtga.obj & - $(OBJS)\coredll_imagtiff.obj & - $(OBJS)\coredll_imagxpm.obj & - $(OBJS)\coredll_layout.obj & - $(OBJS)\coredll_lboxcmn.obj & - $(OBJS)\coredll_listctrlcmn.obj & - $(OBJS)\coredll_markupparser.obj & - $(OBJS)\coredll_matrix.obj & - $(OBJS)\coredll_menucmn.obj & - $(OBJS)\coredll_modalhook.obj & - $(OBJS)\coredll_mousemanager.obj & - $(OBJS)\coredll_nbkbase.obj & - $(OBJS)\coredll_overlaycmn.obj & - $(OBJS)\coredll_ownerdrwcmn.obj & - $(OBJS)\coredll_paper.obj & - $(OBJS)\coredll_panelcmn.obj & - $(OBJS)\coredll_persist.obj & - $(OBJS)\coredll_pickerbase.obj & - $(OBJS)\coredll_popupcmn.obj & - $(OBJS)\coredll_preferencescmn.obj & - $(OBJS)\coredll_prntbase.obj & - $(OBJS)\coredll_quantize.obj & - $(OBJS)\coredll_radiobtncmn.obj & - $(OBJS)\coredll_radiocmn.obj & - $(OBJS)\coredll_rearrangectrl.obj & - $(OBJS)\coredll_rendcmn.obj & - $(OBJS)\coredll_rgncmn.obj & - $(OBJS)\coredll_scrolbarcmn.obj & - $(OBJS)\coredll_settcmn.obj & - $(OBJS)\coredll_sizer.obj & - $(OBJS)\coredll_slidercmn.obj & - $(OBJS)\coredll_spinbtncmn.obj & - $(OBJS)\coredll_spinctrlcmn.obj & - $(OBJS)\coredll_srchcmn.obj & - $(OBJS)\coredll_statbar.obj & - $(OBJS)\coredll_statbmpcmn.obj & - $(OBJS)\coredll_statboxcmn.obj & - $(OBJS)\coredll_statlinecmn.obj & - $(OBJS)\coredll_stattextcmn.obj & - $(OBJS)\coredll_stockitem.obj & - $(OBJS)\coredll_tbarbase.obj & - $(OBJS)\coredll_textcmn.obj & - $(OBJS)\coredll_textentrycmn.obj & - $(OBJS)\coredll_textmeasurecmn.obj & - $(OBJS)\coredll_toplvcmn.obj & - $(OBJS)\coredll_treebase.obj & - $(OBJS)\coredll_uiactioncmn.obj & - $(OBJS)\coredll_valgen.obj & - $(OBJS)\coredll_validate.obj & - $(OBJS)\coredll_valtext.obj & - $(OBJS)\coredll_valnum.obj & - $(OBJS)\coredll_wincmn.obj & - $(OBJS)\coredll_windowid.obj & - $(OBJS)\coredll_wrapsizer.obj & - $(OBJS)\coredll_xpmdecod.obj & - $(OBJS)\coredll_busyinfo.obj & - $(OBJS)\coredll_buttonbar.obj & - $(OBJS)\coredll_choicdgg.obj & - $(OBJS)\coredll_choicbkg.obj & - $(OBJS)\coredll_combog.obj & - $(OBJS)\coredll_dcpsg.obj & - $(OBJS)\coredll_dirctrlg.obj & - $(OBJS)\coredll_dragimgg.obj & - $(OBJS)\coredll_filectrlg.obj & - $(OBJS)\coredll_headerctrlg.obj & - $(OBJS)\coredll_infobar.obj & - $(OBJS)\coredll_listbkg.obj & - $(OBJS)\coredll_logg.obj & - $(OBJS)\coredll_markuptext.obj & - $(OBJS)\coredll_msgdlgg.obj & - $(OBJS)\coredll_numdlgg.obj & - $(OBJS)\coredll_progdlgg.obj & - $(OBJS)\coredll_preferencesg.obj & - $(OBJS)\coredll_printps.obj & - $(OBJS)\coredll_renderg.obj & - $(OBJS)\coredll_richmsgdlgg.obj & - $(OBJS)\coredll_scrlwing.obj & - $(OBJS)\coredll_selstore.obj & - $(OBJS)\coredll_spinctlg.obj & - $(OBJS)\coredll_splitter.obj & - $(OBJS)\coredll_srchctlg.obj & - $(OBJS)\coredll_statbmpg.obj & - $(OBJS)\coredll_stattextg.obj & - $(OBJS)\coredll_textdlgg.obj & - $(OBJS)\coredll_tipwin.obj & - $(OBJS)\coredll_toolbkg.obj & - $(OBJS)\coredll_treectlg.obj & - $(OBJS)\coredll_treebkg.obj & - $(OBJS)\coredll_vlbox.obj & - $(OBJS)\coredll_vscroll.obj & - $(OBJS)\coredll_xmlreshandler.obj -!endif -!endif -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -____CORE_SRC_FILENAMES_2_OBJECTS = & - $(OBJS)\coredll_activex.obj & - $(OBJS)\coredll_app.obj & - $(OBJS)\coredll_bitmap.obj & - $(OBJS)\coredll_brush.obj & - $(OBJS)\coredll_caret.obj & - $(OBJS)\coredll_clipbrd.obj & - $(OBJS)\coredll_colour.obj & - $(OBJS)\coredll_cursor.obj & - $(OBJS)\coredll_data.obj & - $(OBJS)\coredll_dc.obj & - $(OBJS)\coredll_dcclient.obj & - $(OBJS)\coredll_dcmemory.obj & - $(OBJS)\coredll_dcprint.obj & - $(OBJS)\coredll_dcscreen.obj & - $(OBJS)\coredll_dialup.obj & - $(OBJS)\coredll_dib.obj & - $(OBJS)\coredll_display.obj & - $(OBJS)\coredll_enhmeta.obj & - $(OBJS)\coredll_font.obj & - $(OBJS)\coredll_fontenum.obj & - $(OBJS)\coredll_fontutil.obj & - $(OBJS)\coredll_gdiimage.obj & - $(OBJS)\coredll_gdiobj.obj & - $(OBJS)\coredll_gdiplus.obj & - $(OBJS)\coredll_graphics.obj & - $(OBJS)\coredll_icon.obj & - $(OBJS)\coredll_imaglist.obj & - $(OBJS)\coredll_minifram.obj & - $(OBJS)\coredll_nonownedwnd.obj & - $(OBJS)\coredll_dataobj.obj & - $(OBJS)\coredll_dropsrc.obj & - $(OBJS)\coredll_droptgt.obj & - $(OBJS)\coredll_oleutils.obj & - $(OBJS)\coredll_safearray.obj & - $(OBJS)\coredll_palette.obj & - $(OBJS)\coredll_pen.obj & - $(OBJS)\coredll_popupwin.obj & - $(OBJS)\coredll_printdlg.obj & - $(OBJS)\coredll_printwin.obj & - $(OBJS)\coredll_region.obj & - $(OBJS)\coredll_renderer.obj & - $(OBJS)\coredll_settings.obj & - $(OBJS)\coredll_textmeasure.obj & - $(OBJS)\coredll_tooltip.obj & - $(OBJS)\coredll_toplevel.obj & - $(OBJS)\coredll_uiaction.obj & - $(OBJS)\coredll_utilsgui.obj & - $(OBJS)\coredll_utilswin.obj & - $(OBJS)\coredll_uxtheme.obj & - $(OBJS)\coredll_window.obj & - $(OBJS)\coredll_helpchm.obj & - $(OBJS)\coredll_helpwin.obj & - $(OBJS)\coredll_automtn.obj & - $(OBJS)\coredll_uuid.obj & - $(OBJS)\coredll_evtloop.obj & - $(OBJS)\coredll_generic_accel.obj & - $(OBJS)\coredll_clrpickerg.obj & - $(OBJS)\coredll_collpaneg.obj & - $(OBJS)\coredll_colrdlgg.obj & - $(OBJS)\coredll_dirdlgg.obj & - $(OBJS)\coredll_generic_fdrepdlg.obj & - $(OBJS)\coredll_filedlgg.obj & - $(OBJS)\coredll_filepickerg.obj & - $(OBJS)\coredll_fontdlgg.obj & - $(OBJS)\coredll_fontpickerg.obj & - $(OBJS)\coredll_generic_listctrl.obj & - $(OBJS)\coredll_mdig.obj & - $(OBJS)\coredll_prntdlgg.obj & - $(OBJS)\coredll_univ_bmpbuttn.obj & - $(OBJS)\coredll_univ_button.obj & - $(OBJS)\coredll_univ_checkbox.obj & - $(OBJS)\coredll_univ_checklst.obj & - $(OBJS)\coredll_univ_choice.obj & - $(OBJS)\coredll_univ_combobox.obj & - $(OBJS)\coredll_univ_control.obj & - $(OBJS)\coredll_ctrlrend.obj & - $(OBJS)\coredll_univ_dialog.obj & - $(OBJS)\coredll_framuniv.obj & - $(OBJS)\coredll_univ_gauge.obj & - $(OBJS)\coredll_inpcons.obj & - $(OBJS)\coredll_inphand.obj & - $(OBJS)\coredll_univ_listbox.obj & - $(OBJS)\coredll_univ_menu.obj & - $(OBJS)\coredll_univ_notebook.obj & - $(OBJS)\coredll_univ_radiobox.obj & - $(OBJS)\coredll_univ_radiobut.obj & - $(OBJS)\coredll_scrarrow.obj & - $(OBJS)\coredll_univ_scrolbar.obj & - $(OBJS)\coredll_scrthumb.obj & - $(OBJS)\coredll_settingsuniv.obj & - $(OBJS)\coredll_univ_slider.obj & - $(OBJS)\coredll_univ_spinbutt.obj & - $(OBJS)\coredll_univ_statbmp.obj & - $(OBJS)\coredll_univ_statbox.obj & - $(OBJS)\coredll_univ_statline.obj & - $(OBJS)\coredll_univ_stattext.obj & - $(OBJS)\coredll_univ_statusbr.obj & - $(OBJS)\coredll_stdrend.obj & - $(OBJS)\coredll_univ_textctrl.obj & - $(OBJS)\coredll_univ_tglbtn.obj & - $(OBJS)\coredll_theme.obj & - $(OBJS)\coredll_univ_toolbar.obj & - $(OBJS)\coredll_topluniv.obj & - $(OBJS)\coredll_winuniv.obj & - $(OBJS)\coredll_gtk.obj & - $(OBJS)\coredll_metal.obj & - $(OBJS)\coredll_mono.obj & - $(OBJS)\coredll_win32.obj & - $(OBJS)\coredll_accelcmn.obj & - $(OBJS)\coredll_accesscmn.obj & - $(OBJS)\coredll_anidecod.obj & - $(OBJS)\coredll_affinematrix2d.obj & - $(OBJS)\coredll_appcmn.obj & - $(OBJS)\coredll_artprov.obj & - $(OBJS)\coredll_artstd.obj & - $(OBJS)\coredll_arttango.obj & - $(OBJS)\coredll_bmpbase.obj & - $(OBJS)\coredll_bmpbtncmn.obj & - $(OBJS)\coredll_bookctrl.obj & - $(OBJS)\coredll_btncmn.obj & - $(OBJS)\coredll_cairo.obj & - $(OBJS)\coredll_checkboxcmn.obj & - $(OBJS)\coredll_checklstcmn.obj & - $(OBJS)\coredll_choiccmn.obj & - $(OBJS)\coredll_clipcmn.obj & - $(OBJS)\coredll_clrpickercmn.obj & - $(OBJS)\coredll_colourcmn.obj & - $(OBJS)\coredll_colourdata.obj & - $(OBJS)\coredll_combocmn.obj & - $(OBJS)\coredll_cmdproc.obj & - $(OBJS)\coredll_cmndata.obj & - $(OBJS)\coredll_containr.obj & - $(OBJS)\coredll_cshelp.obj & - $(OBJS)\coredll_ctrlcmn.obj & - $(OBJS)\coredll_ctrlsub.obj & - $(OBJS)\coredll_dcbase.obj & - $(OBJS)\coredll_dcbufcmn.obj & - $(OBJS)\coredll_dcgraph.obj & - $(OBJS)\coredll_dcsvg.obj & - $(OBJS)\coredll_dirctrlcmn.obj & - $(OBJS)\coredll_dlgcmn.obj & - $(OBJS)\coredll_dndcmn.obj & - $(OBJS)\coredll_dobjcmn.obj & - $(OBJS)\coredll_docmdi.obj & - $(OBJS)\coredll_docview.obj & - $(OBJS)\coredll_dpycmn.obj & - $(OBJS)\coredll_dseldlg.obj & - $(OBJS)\coredll_effects.obj & - $(OBJS)\coredll_fddlgcmn.obj & - $(OBJS)\coredll_filectrlcmn.obj & - $(OBJS)\coredll_filehistorycmn.obj & - $(OBJS)\coredll_filepickercmn.obj & - $(OBJS)\coredll_fontpickercmn.obj & - $(OBJS)\coredll_fldlgcmn.obj & - $(OBJS)\coredll_fontcmn.obj & - $(OBJS)\coredll_fontdata.obj & - $(OBJS)\coredll_graphicc.obj & - $(OBJS)\coredll_fontenumcmn.obj & - $(OBJS)\coredll_fontmap.obj & - $(OBJS)\coredll_fontutilcmn.obj & - $(OBJS)\coredll_framecmn.obj & - $(OBJS)\coredll_gaugecmn.obj & - $(OBJS)\coredll_gbsizer.obj & - $(OBJS)\coredll_gdicmn.obj & - $(OBJS)\coredll_geometry.obj & - $(OBJS)\coredll_gifdecod.obj & - $(OBJS)\coredll_graphcmn.obj & - $(OBJS)\coredll_headercolcmn.obj & - $(OBJS)\coredll_headerctrlcmn.obj & - $(OBJS)\coredll_helpbase.obj & - $(OBJS)\coredll_iconbndl.obj & - $(OBJS)\coredll_imagall.obj & - $(OBJS)\coredll_imagbmp.obj & - $(OBJS)\coredll_image.obj & - $(OBJS)\coredll_imagfill.obj & - $(OBJS)\coredll_imaggif.obj & - $(OBJS)\coredll_imagiff.obj & - $(OBJS)\coredll_imagjpeg.obj & - $(OBJS)\coredll_imagpcx.obj & - $(OBJS)\coredll_imagpng.obj & - $(OBJS)\coredll_imagpnm.obj & - $(OBJS)\coredll_imagtga.obj & - $(OBJS)\coredll_imagtiff.obj & - $(OBJS)\coredll_imagxpm.obj & - $(OBJS)\coredll_layout.obj & - $(OBJS)\coredll_lboxcmn.obj & - $(OBJS)\coredll_listctrlcmn.obj & - $(OBJS)\coredll_markupparser.obj & - $(OBJS)\coredll_matrix.obj & - $(OBJS)\coredll_menucmn.obj & - $(OBJS)\coredll_modalhook.obj & - $(OBJS)\coredll_mousemanager.obj & - $(OBJS)\coredll_nbkbase.obj & - $(OBJS)\coredll_overlaycmn.obj & - $(OBJS)\coredll_ownerdrwcmn.obj & - $(OBJS)\coredll_paper.obj & - $(OBJS)\coredll_panelcmn.obj & - $(OBJS)\coredll_persist.obj & - $(OBJS)\coredll_pickerbase.obj & - $(OBJS)\coredll_popupcmn.obj & - $(OBJS)\coredll_preferencescmn.obj & - $(OBJS)\coredll_prntbase.obj & - $(OBJS)\coredll_quantize.obj & - $(OBJS)\coredll_radiobtncmn.obj & - $(OBJS)\coredll_radiocmn.obj & - $(OBJS)\coredll_rearrangectrl.obj & - $(OBJS)\coredll_rendcmn.obj & - $(OBJS)\coredll_rgncmn.obj & - $(OBJS)\coredll_scrolbarcmn.obj & - $(OBJS)\coredll_settcmn.obj & - $(OBJS)\coredll_sizer.obj & - $(OBJS)\coredll_slidercmn.obj & - $(OBJS)\coredll_spinbtncmn.obj & - $(OBJS)\coredll_spinctrlcmn.obj & - $(OBJS)\coredll_srchcmn.obj & - $(OBJS)\coredll_statbar.obj & - $(OBJS)\coredll_statbmpcmn.obj & - $(OBJS)\coredll_statboxcmn.obj & - $(OBJS)\coredll_statlinecmn.obj & - $(OBJS)\coredll_stattextcmn.obj & - $(OBJS)\coredll_stockitem.obj & - $(OBJS)\coredll_tbarbase.obj & - $(OBJS)\coredll_textcmn.obj & - $(OBJS)\coredll_textentrycmn.obj & - $(OBJS)\coredll_textmeasurecmn.obj & - $(OBJS)\coredll_toplvcmn.obj & - $(OBJS)\coredll_treebase.obj & - $(OBJS)\coredll_uiactioncmn.obj & - $(OBJS)\coredll_valgen.obj & - $(OBJS)\coredll_validate.obj & - $(OBJS)\coredll_valtext.obj & - $(OBJS)\coredll_valnum.obj & - $(OBJS)\coredll_wincmn.obj & - $(OBJS)\coredll_windowid.obj & - $(OBJS)\coredll_wrapsizer.obj & - $(OBJS)\coredll_xpmdecod.obj & - $(OBJS)\coredll_busyinfo.obj & - $(OBJS)\coredll_buttonbar.obj & - $(OBJS)\coredll_choicdgg.obj & - $(OBJS)\coredll_choicbkg.obj & - $(OBJS)\coredll_combog.obj & - $(OBJS)\coredll_dcpsg.obj & - $(OBJS)\coredll_dirctrlg.obj & - $(OBJS)\coredll_dragimgg.obj & - $(OBJS)\coredll_filectrlg.obj & - $(OBJS)\coredll_headerctrlg.obj & - $(OBJS)\coredll_infobar.obj & - $(OBJS)\coredll_listbkg.obj & - $(OBJS)\coredll_logg.obj & - $(OBJS)\coredll_markuptext.obj & - $(OBJS)\coredll_msgdlgg.obj & - $(OBJS)\coredll_numdlgg.obj & - $(OBJS)\coredll_progdlgg.obj & - $(OBJS)\coredll_preferencesg.obj & - $(OBJS)\coredll_printps.obj & - $(OBJS)\coredll_renderg.obj & - $(OBJS)\coredll_richmsgdlgg.obj & - $(OBJS)\coredll_scrlwing.obj & - $(OBJS)\coredll_selstore.obj & - $(OBJS)\coredll_spinctlg.obj & - $(OBJS)\coredll_splitter.obj & - $(OBJS)\coredll_srchctlg.obj & - $(OBJS)\coredll_statbmpg.obj & - $(OBJS)\coredll_stattextg.obj & - $(OBJS)\coredll_textdlgg.obj & - $(OBJS)\coredll_tipwin.obj & - $(OBJS)\coredll_toolbkg.obj & - $(OBJS)\coredll_treectlg.obj & - $(OBJS)\coredll_treebkg.obj & - $(OBJS)\coredll_vlbox.obj & - $(OBJS)\coredll_vscroll.obj & - $(OBJS)\coredll_xmlreshandler.obj -!endif -!endif -__corelib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -__corelib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -!endif -!endif -____CORE_SRC_FILENAMES_3_OBJECTS = -!ifeq USE_GUI 1 -!ifeq WXUNIV 0 -____CORE_SRC_FILENAMES_3_OBJECTS = & - $(OBJS)\corelib_activex.obj & - $(OBJS)\corelib_app.obj & - $(OBJS)\corelib_bitmap.obj & - $(OBJS)\corelib_brush.obj & - $(OBJS)\corelib_caret.obj & - $(OBJS)\corelib_clipbrd.obj & - $(OBJS)\corelib_colour.obj & - $(OBJS)\corelib_cursor.obj & - $(OBJS)\corelib_data.obj & - $(OBJS)\corelib_dc.obj & - $(OBJS)\corelib_dcclient.obj & - $(OBJS)\corelib_dcmemory.obj & - $(OBJS)\corelib_dcprint.obj & - $(OBJS)\corelib_dcscreen.obj & - $(OBJS)\corelib_dialup.obj & - $(OBJS)\corelib_dib.obj & - $(OBJS)\corelib_display.obj & - $(OBJS)\corelib_enhmeta.obj & - $(OBJS)\corelib_font.obj & - $(OBJS)\corelib_fontenum.obj & - $(OBJS)\corelib_fontutil.obj & - $(OBJS)\corelib_gdiimage.obj & - $(OBJS)\corelib_gdiobj.obj & - $(OBJS)\corelib_gdiplus.obj & - $(OBJS)\corelib_graphics.obj & - $(OBJS)\corelib_icon.obj & - $(OBJS)\corelib_imaglist.obj & - $(OBJS)\corelib_minifram.obj & - $(OBJS)\corelib_nonownedwnd.obj & - $(OBJS)\corelib_dataobj.obj & - $(OBJS)\corelib_dropsrc.obj & - $(OBJS)\corelib_droptgt.obj & - $(OBJS)\corelib_oleutils.obj & - $(OBJS)\corelib_safearray.obj & - $(OBJS)\corelib_palette.obj & - $(OBJS)\corelib_pen.obj & - $(OBJS)\corelib_popupwin.obj & - $(OBJS)\corelib_printdlg.obj & - $(OBJS)\corelib_printwin.obj & - $(OBJS)\corelib_region.obj & - $(OBJS)\corelib_renderer.obj & - $(OBJS)\corelib_settings.obj & - $(OBJS)\corelib_textmeasure.obj & - $(OBJS)\corelib_tooltip.obj & - $(OBJS)\corelib_toplevel.obj & - $(OBJS)\corelib_uiaction.obj & - $(OBJS)\corelib_utilsgui.obj & - $(OBJS)\corelib_utilswin.obj & - $(OBJS)\corelib_uxtheme.obj & - $(OBJS)\corelib_window.obj & - $(OBJS)\corelib_helpchm.obj & - $(OBJS)\corelib_helpwin.obj & - $(OBJS)\corelib_automtn.obj & - $(OBJS)\corelib_uuid.obj & - $(OBJS)\corelib_clrpickerg.obj & - $(OBJS)\corelib_collpaneg.obj & - $(OBJS)\corelib_filepickerg.obj & - $(OBJS)\corelib_fontpickerg.obj & - $(OBJS)\corelib_generic_statusbr.obj & - $(OBJS)\corelib_prntdlgg.obj & - $(OBJS)\corelib_msw_accel.obj & - $(OBJS)\corelib_anybutton.obj & - $(OBJS)\corelib_artmsw.obj & - $(OBJS)\corelib_msw_bmpbuttn.obj & - $(OBJS)\corelib_msw_button.obj & - $(OBJS)\corelib_msw_checkbox.obj & - $(OBJS)\corelib_msw_choice.obj & - $(OBJS)\corelib_colordlg.obj & - $(OBJS)\corelib_combo.obj & - $(OBJS)\corelib_msw_combobox.obj & - $(OBJS)\corelib_msw_control.obj & - $(OBJS)\corelib_msw_dialog.obj & - $(OBJS)\corelib_dirdlg.obj & - $(OBJS)\corelib_dragimag.obj & - $(OBJS)\corelib_evtloop.obj & - $(OBJS)\corelib_filedlg.obj & - $(OBJS)\corelib_frame.obj & - $(OBJS)\corelib_msw_gauge.obj & - $(OBJS)\corelib_headerctrl.obj & - $(OBJS)\corelib_iniconf.obj & - $(OBJS)\corelib_msw_listbox.obj & - $(OBJS)\corelib_msw_listctrl.obj & - $(OBJS)\corelib_mdi.obj & - $(OBJS)\corelib_msw_menu.obj & - $(OBJS)\corelib_menuitem.obj & - $(OBJS)\corelib_metafile.obj & - $(OBJS)\corelib_msgdlg.obj & - $(OBJS)\corelib_nativdlg.obj & - $(OBJS)\corelib_nativewin.obj & - $(OBJS)\corelib_msw_notebook.obj & - $(OBJS)\corelib_access.obj & - $(OBJS)\corelib_ownerdrw.obj & - $(OBJS)\corelib_panel.obj & - $(OBJS)\corelib_progdlg.obj & - $(OBJS)\corelib_msw_radiobox.obj & - $(OBJS)\corelib_msw_radiobut.obj & - $(OBJS)\corelib_richmsgdlg.obj & - $(OBJS)\corelib_msw_scrolbar.obj & - $(OBJS)\corelib_msw_slider.obj & - $(OBJS)\corelib_msw_spinbutt.obj & - $(OBJS)\corelib_spinctrl.obj & - $(OBJS)\corelib_msw_statbmp.obj & - $(OBJS)\corelib_msw_statbox.obj & - $(OBJS)\corelib_statusbar.obj & - $(OBJS)\corelib_msw_statline.obj & - $(OBJS)\corelib_msw_stattext.obj & - $(OBJS)\corelib_msw_toolbar.obj & - $(OBJS)\corelib_msw_textctrl.obj & - $(OBJS)\corelib_textentry.obj & - $(OBJS)\corelib_msw_tglbtn.obj & - $(OBJS)\corelib_treectrl.obj & - $(OBJS)\corelib_msw_checklst.obj & - $(OBJS)\corelib_msw_fdrepdlg.obj & - $(OBJS)\corelib_fontdlg.obj & - $(OBJS)\corelib_accelcmn.obj & - $(OBJS)\corelib_accesscmn.obj & - $(OBJS)\corelib_anidecod.obj & - $(OBJS)\corelib_affinematrix2d.obj & - $(OBJS)\corelib_appcmn.obj & - $(OBJS)\corelib_artprov.obj & - $(OBJS)\corelib_artstd.obj & - $(OBJS)\corelib_arttango.obj & - $(OBJS)\corelib_bmpbase.obj & - $(OBJS)\corelib_bmpbtncmn.obj & - $(OBJS)\corelib_bookctrl.obj & - $(OBJS)\corelib_btncmn.obj & - $(OBJS)\corelib_cairo.obj & - $(OBJS)\corelib_checkboxcmn.obj & - $(OBJS)\corelib_checklstcmn.obj & - $(OBJS)\corelib_choiccmn.obj & - $(OBJS)\corelib_clipcmn.obj & - $(OBJS)\corelib_clrpickercmn.obj & - $(OBJS)\corelib_colourcmn.obj & - $(OBJS)\corelib_colourdata.obj & - $(OBJS)\corelib_combocmn.obj & - $(OBJS)\corelib_cmdproc.obj & - $(OBJS)\corelib_cmndata.obj & - $(OBJS)\corelib_containr.obj & - $(OBJS)\corelib_cshelp.obj & - $(OBJS)\corelib_ctrlcmn.obj & - $(OBJS)\corelib_ctrlsub.obj & - $(OBJS)\corelib_dcbase.obj & - $(OBJS)\corelib_dcbufcmn.obj & - $(OBJS)\corelib_dcgraph.obj & - $(OBJS)\corelib_dcsvg.obj & - $(OBJS)\corelib_dirctrlcmn.obj & - $(OBJS)\corelib_dlgcmn.obj & - $(OBJS)\corelib_dndcmn.obj & - $(OBJS)\corelib_dobjcmn.obj & - $(OBJS)\corelib_docmdi.obj & - $(OBJS)\corelib_docview.obj & - $(OBJS)\corelib_dpycmn.obj & - $(OBJS)\corelib_dseldlg.obj & - $(OBJS)\corelib_effects.obj & - $(OBJS)\corelib_fddlgcmn.obj & - $(OBJS)\corelib_filectrlcmn.obj & - $(OBJS)\corelib_filehistorycmn.obj & - $(OBJS)\corelib_filepickercmn.obj & - $(OBJS)\corelib_fontpickercmn.obj & - $(OBJS)\corelib_fldlgcmn.obj & - $(OBJS)\corelib_fontcmn.obj & - $(OBJS)\corelib_fontdata.obj & - $(OBJS)\corelib_graphicc.obj & - $(OBJS)\corelib_fontenumcmn.obj & - $(OBJS)\corelib_fontmap.obj & - $(OBJS)\corelib_fontutilcmn.obj & - $(OBJS)\corelib_framecmn.obj & - $(OBJS)\corelib_gaugecmn.obj & - $(OBJS)\corelib_gbsizer.obj & - $(OBJS)\corelib_gdicmn.obj & - $(OBJS)\corelib_geometry.obj & - $(OBJS)\corelib_gifdecod.obj & - $(OBJS)\corelib_graphcmn.obj & - $(OBJS)\corelib_headercolcmn.obj & - $(OBJS)\corelib_headerctrlcmn.obj & - $(OBJS)\corelib_helpbase.obj & - $(OBJS)\corelib_iconbndl.obj & - $(OBJS)\corelib_imagall.obj & - $(OBJS)\corelib_imagbmp.obj & - $(OBJS)\corelib_image.obj & - $(OBJS)\corelib_imagfill.obj & - $(OBJS)\corelib_imaggif.obj & - $(OBJS)\corelib_imagiff.obj & - $(OBJS)\corelib_imagjpeg.obj & - $(OBJS)\corelib_imagpcx.obj & - $(OBJS)\corelib_imagpng.obj & - $(OBJS)\corelib_imagpnm.obj & - $(OBJS)\corelib_imagtga.obj & - $(OBJS)\corelib_imagtiff.obj & - $(OBJS)\corelib_imagxpm.obj & - $(OBJS)\corelib_layout.obj & - $(OBJS)\corelib_lboxcmn.obj & - $(OBJS)\corelib_listctrlcmn.obj & - $(OBJS)\corelib_markupparser.obj & - $(OBJS)\corelib_matrix.obj & - $(OBJS)\corelib_menucmn.obj & - $(OBJS)\corelib_modalhook.obj & - $(OBJS)\corelib_mousemanager.obj & - $(OBJS)\corelib_nbkbase.obj & - $(OBJS)\corelib_overlaycmn.obj & - $(OBJS)\corelib_ownerdrwcmn.obj & - $(OBJS)\corelib_paper.obj & - $(OBJS)\corelib_panelcmn.obj & - $(OBJS)\corelib_persist.obj & - $(OBJS)\corelib_pickerbase.obj & - $(OBJS)\corelib_popupcmn.obj & - $(OBJS)\corelib_preferencescmn.obj & - $(OBJS)\corelib_prntbase.obj & - $(OBJS)\corelib_quantize.obj & - $(OBJS)\corelib_radiobtncmn.obj & - $(OBJS)\corelib_radiocmn.obj & - $(OBJS)\corelib_rearrangectrl.obj & - $(OBJS)\corelib_rendcmn.obj & - $(OBJS)\corelib_rgncmn.obj & - $(OBJS)\corelib_scrolbarcmn.obj & - $(OBJS)\corelib_settcmn.obj & - $(OBJS)\corelib_sizer.obj & - $(OBJS)\corelib_slidercmn.obj & - $(OBJS)\corelib_spinbtncmn.obj & - $(OBJS)\corelib_spinctrlcmn.obj & - $(OBJS)\corelib_srchcmn.obj & - $(OBJS)\corelib_statbar.obj & - $(OBJS)\corelib_statbmpcmn.obj & - $(OBJS)\corelib_statboxcmn.obj & - $(OBJS)\corelib_statlinecmn.obj & - $(OBJS)\corelib_stattextcmn.obj & - $(OBJS)\corelib_stockitem.obj & - $(OBJS)\corelib_tbarbase.obj & - $(OBJS)\corelib_textcmn.obj & - $(OBJS)\corelib_textentrycmn.obj & - $(OBJS)\corelib_textmeasurecmn.obj & - $(OBJS)\corelib_toplvcmn.obj & - $(OBJS)\corelib_treebase.obj & - $(OBJS)\corelib_uiactioncmn.obj & - $(OBJS)\corelib_valgen.obj & - $(OBJS)\corelib_validate.obj & - $(OBJS)\corelib_valtext.obj & - $(OBJS)\corelib_valnum.obj & - $(OBJS)\corelib_wincmn.obj & - $(OBJS)\corelib_windowid.obj & - $(OBJS)\corelib_wrapsizer.obj & - $(OBJS)\corelib_xpmdecod.obj & - $(OBJS)\corelib_busyinfo.obj & - $(OBJS)\corelib_buttonbar.obj & - $(OBJS)\corelib_choicdgg.obj & - $(OBJS)\corelib_choicbkg.obj & - $(OBJS)\corelib_combog.obj & - $(OBJS)\corelib_dcpsg.obj & - $(OBJS)\corelib_dirctrlg.obj & - $(OBJS)\corelib_dragimgg.obj & - $(OBJS)\corelib_filectrlg.obj & - $(OBJS)\corelib_headerctrlg.obj & - $(OBJS)\corelib_infobar.obj & - $(OBJS)\corelib_listbkg.obj & - $(OBJS)\corelib_logg.obj & - $(OBJS)\corelib_markuptext.obj & - $(OBJS)\corelib_msgdlgg.obj & - $(OBJS)\corelib_numdlgg.obj & - $(OBJS)\corelib_progdlgg.obj & - $(OBJS)\corelib_preferencesg.obj & - $(OBJS)\corelib_printps.obj & - $(OBJS)\corelib_renderg.obj & - $(OBJS)\corelib_richmsgdlgg.obj & - $(OBJS)\corelib_scrlwing.obj & - $(OBJS)\corelib_selstore.obj & - $(OBJS)\corelib_spinctlg.obj & - $(OBJS)\corelib_splitter.obj & - $(OBJS)\corelib_srchctlg.obj & - $(OBJS)\corelib_statbmpg.obj & - $(OBJS)\corelib_stattextg.obj & - $(OBJS)\corelib_textdlgg.obj & - $(OBJS)\corelib_tipwin.obj & - $(OBJS)\corelib_toolbkg.obj & - $(OBJS)\corelib_treectlg.obj & - $(OBJS)\corelib_treebkg.obj & - $(OBJS)\corelib_vlbox.obj & - $(OBJS)\corelib_vscroll.obj & - $(OBJS)\corelib_xmlreshandler.obj -!endif -!endif -!ifeq USE_GUI 1 -!ifeq WXUNIV 1 -____CORE_SRC_FILENAMES_3_OBJECTS = & - $(OBJS)\corelib_activex.obj & - $(OBJS)\corelib_app.obj & - $(OBJS)\corelib_bitmap.obj & - $(OBJS)\corelib_brush.obj & - $(OBJS)\corelib_caret.obj & - $(OBJS)\corelib_clipbrd.obj & - $(OBJS)\corelib_colour.obj & - $(OBJS)\corelib_cursor.obj & - $(OBJS)\corelib_data.obj & - $(OBJS)\corelib_dc.obj & - $(OBJS)\corelib_dcclient.obj & - $(OBJS)\corelib_dcmemory.obj & - $(OBJS)\corelib_dcprint.obj & - $(OBJS)\corelib_dcscreen.obj & - $(OBJS)\corelib_dialup.obj & - $(OBJS)\corelib_dib.obj & - $(OBJS)\corelib_display.obj & - $(OBJS)\corelib_enhmeta.obj & - $(OBJS)\corelib_font.obj & - $(OBJS)\corelib_fontenum.obj & - $(OBJS)\corelib_fontutil.obj & - $(OBJS)\corelib_gdiimage.obj & - $(OBJS)\corelib_gdiobj.obj & - $(OBJS)\corelib_gdiplus.obj & - $(OBJS)\corelib_graphics.obj & - $(OBJS)\corelib_icon.obj & - $(OBJS)\corelib_imaglist.obj & - $(OBJS)\corelib_minifram.obj & - $(OBJS)\corelib_nonownedwnd.obj & - $(OBJS)\corelib_dataobj.obj & - $(OBJS)\corelib_dropsrc.obj & - $(OBJS)\corelib_droptgt.obj & - $(OBJS)\corelib_oleutils.obj & - $(OBJS)\corelib_safearray.obj & - $(OBJS)\corelib_palette.obj & - $(OBJS)\corelib_pen.obj & - $(OBJS)\corelib_popupwin.obj & - $(OBJS)\corelib_printdlg.obj & - $(OBJS)\corelib_printwin.obj & - $(OBJS)\corelib_region.obj & - $(OBJS)\corelib_renderer.obj & - $(OBJS)\corelib_settings.obj & - $(OBJS)\corelib_textmeasure.obj & - $(OBJS)\corelib_tooltip.obj & - $(OBJS)\corelib_toplevel.obj & - $(OBJS)\corelib_uiaction.obj & - $(OBJS)\corelib_utilsgui.obj & - $(OBJS)\corelib_utilswin.obj & - $(OBJS)\corelib_uxtheme.obj & - $(OBJS)\corelib_window.obj & - $(OBJS)\corelib_helpchm.obj & - $(OBJS)\corelib_helpwin.obj & - $(OBJS)\corelib_automtn.obj & - $(OBJS)\corelib_uuid.obj & - $(OBJS)\corelib_evtloop.obj & - $(OBJS)\corelib_generic_accel.obj & - $(OBJS)\corelib_clrpickerg.obj & - $(OBJS)\corelib_collpaneg.obj & - $(OBJS)\corelib_colrdlgg.obj & - $(OBJS)\corelib_dirdlgg.obj & - $(OBJS)\corelib_generic_fdrepdlg.obj & - $(OBJS)\corelib_filedlgg.obj & - $(OBJS)\corelib_filepickerg.obj & - $(OBJS)\corelib_fontdlgg.obj & - $(OBJS)\corelib_fontpickerg.obj & - $(OBJS)\corelib_generic_listctrl.obj & - $(OBJS)\corelib_mdig.obj & - $(OBJS)\corelib_prntdlgg.obj & - $(OBJS)\corelib_univ_bmpbuttn.obj & - $(OBJS)\corelib_univ_button.obj & - $(OBJS)\corelib_univ_checkbox.obj & - $(OBJS)\corelib_univ_checklst.obj & - $(OBJS)\corelib_univ_choice.obj & - $(OBJS)\corelib_univ_combobox.obj & - $(OBJS)\corelib_univ_control.obj & - $(OBJS)\corelib_ctrlrend.obj & - $(OBJS)\corelib_univ_dialog.obj & - $(OBJS)\corelib_framuniv.obj & - $(OBJS)\corelib_univ_gauge.obj & - $(OBJS)\corelib_inpcons.obj & - $(OBJS)\corelib_inphand.obj & - $(OBJS)\corelib_univ_listbox.obj & - $(OBJS)\corelib_univ_menu.obj & - $(OBJS)\corelib_univ_notebook.obj & - $(OBJS)\corelib_univ_radiobox.obj & - $(OBJS)\corelib_univ_radiobut.obj & - $(OBJS)\corelib_scrarrow.obj & - $(OBJS)\corelib_univ_scrolbar.obj & - $(OBJS)\corelib_scrthumb.obj & - $(OBJS)\corelib_settingsuniv.obj & - $(OBJS)\corelib_univ_slider.obj & - $(OBJS)\corelib_univ_spinbutt.obj & - $(OBJS)\corelib_univ_statbmp.obj & - $(OBJS)\corelib_univ_statbox.obj & - $(OBJS)\corelib_univ_statline.obj & - $(OBJS)\corelib_univ_stattext.obj & - $(OBJS)\corelib_univ_statusbr.obj & - $(OBJS)\corelib_stdrend.obj & - $(OBJS)\corelib_univ_textctrl.obj & - $(OBJS)\corelib_univ_tglbtn.obj & - $(OBJS)\corelib_theme.obj & - $(OBJS)\corelib_univ_toolbar.obj & - $(OBJS)\corelib_topluniv.obj & - $(OBJS)\corelib_winuniv.obj & - $(OBJS)\corelib_gtk.obj & - $(OBJS)\corelib_metal.obj & - $(OBJS)\corelib_mono.obj & - $(OBJS)\corelib_win32.obj & - $(OBJS)\corelib_accelcmn.obj & - $(OBJS)\corelib_accesscmn.obj & - $(OBJS)\corelib_anidecod.obj & - $(OBJS)\corelib_affinematrix2d.obj & - $(OBJS)\corelib_appcmn.obj & - $(OBJS)\corelib_artprov.obj & - $(OBJS)\corelib_artstd.obj & - $(OBJS)\corelib_arttango.obj & - $(OBJS)\corelib_bmpbase.obj & - $(OBJS)\corelib_bmpbtncmn.obj & - $(OBJS)\corelib_bookctrl.obj & - $(OBJS)\corelib_btncmn.obj & - $(OBJS)\corelib_cairo.obj & - $(OBJS)\corelib_checkboxcmn.obj & - $(OBJS)\corelib_checklstcmn.obj & - $(OBJS)\corelib_choiccmn.obj & - $(OBJS)\corelib_clipcmn.obj & - $(OBJS)\corelib_clrpickercmn.obj & - $(OBJS)\corelib_colourcmn.obj & - $(OBJS)\corelib_colourdata.obj & - $(OBJS)\corelib_combocmn.obj & - $(OBJS)\corelib_cmdproc.obj & - $(OBJS)\corelib_cmndata.obj & - $(OBJS)\corelib_containr.obj & - $(OBJS)\corelib_cshelp.obj & - $(OBJS)\corelib_ctrlcmn.obj & - $(OBJS)\corelib_ctrlsub.obj & - $(OBJS)\corelib_dcbase.obj & - $(OBJS)\corelib_dcbufcmn.obj & - $(OBJS)\corelib_dcgraph.obj & - $(OBJS)\corelib_dcsvg.obj & - $(OBJS)\corelib_dirctrlcmn.obj & - $(OBJS)\corelib_dlgcmn.obj & - $(OBJS)\corelib_dndcmn.obj & - $(OBJS)\corelib_dobjcmn.obj & - $(OBJS)\corelib_docmdi.obj & - $(OBJS)\corelib_docview.obj & - $(OBJS)\corelib_dpycmn.obj & - $(OBJS)\corelib_dseldlg.obj & - $(OBJS)\corelib_effects.obj & - $(OBJS)\corelib_fddlgcmn.obj & - $(OBJS)\corelib_filectrlcmn.obj & - $(OBJS)\corelib_filehistorycmn.obj & - $(OBJS)\corelib_filepickercmn.obj & - $(OBJS)\corelib_fontpickercmn.obj & - $(OBJS)\corelib_fldlgcmn.obj & - $(OBJS)\corelib_fontcmn.obj & - $(OBJS)\corelib_fontdata.obj & - $(OBJS)\corelib_graphicc.obj & - $(OBJS)\corelib_fontenumcmn.obj & - $(OBJS)\corelib_fontmap.obj & - $(OBJS)\corelib_fontutilcmn.obj & - $(OBJS)\corelib_framecmn.obj & - $(OBJS)\corelib_gaugecmn.obj & - $(OBJS)\corelib_gbsizer.obj & - $(OBJS)\corelib_gdicmn.obj & - $(OBJS)\corelib_geometry.obj & - $(OBJS)\corelib_gifdecod.obj & - $(OBJS)\corelib_graphcmn.obj & - $(OBJS)\corelib_headercolcmn.obj & - $(OBJS)\corelib_headerctrlcmn.obj & - $(OBJS)\corelib_helpbase.obj & - $(OBJS)\corelib_iconbndl.obj & - $(OBJS)\corelib_imagall.obj & - $(OBJS)\corelib_imagbmp.obj & - $(OBJS)\corelib_image.obj & - $(OBJS)\corelib_imagfill.obj & - $(OBJS)\corelib_imaggif.obj & - $(OBJS)\corelib_imagiff.obj & - $(OBJS)\corelib_imagjpeg.obj & - $(OBJS)\corelib_imagpcx.obj & - $(OBJS)\corelib_imagpng.obj & - $(OBJS)\corelib_imagpnm.obj & - $(OBJS)\corelib_imagtga.obj & - $(OBJS)\corelib_imagtiff.obj & - $(OBJS)\corelib_imagxpm.obj & - $(OBJS)\corelib_layout.obj & - $(OBJS)\corelib_lboxcmn.obj & - $(OBJS)\corelib_listctrlcmn.obj & - $(OBJS)\corelib_markupparser.obj & - $(OBJS)\corelib_matrix.obj & - $(OBJS)\corelib_menucmn.obj & - $(OBJS)\corelib_modalhook.obj & - $(OBJS)\corelib_mousemanager.obj & - $(OBJS)\corelib_nbkbase.obj & - $(OBJS)\corelib_overlaycmn.obj & - $(OBJS)\corelib_ownerdrwcmn.obj & - $(OBJS)\corelib_paper.obj & - $(OBJS)\corelib_panelcmn.obj & - $(OBJS)\corelib_persist.obj & - $(OBJS)\corelib_pickerbase.obj & - $(OBJS)\corelib_popupcmn.obj & - $(OBJS)\corelib_preferencescmn.obj & - $(OBJS)\corelib_prntbase.obj & - $(OBJS)\corelib_quantize.obj & - $(OBJS)\corelib_radiobtncmn.obj & - $(OBJS)\corelib_radiocmn.obj & - $(OBJS)\corelib_rearrangectrl.obj & - $(OBJS)\corelib_rendcmn.obj & - $(OBJS)\corelib_rgncmn.obj & - $(OBJS)\corelib_scrolbarcmn.obj & - $(OBJS)\corelib_settcmn.obj & - $(OBJS)\corelib_sizer.obj & - $(OBJS)\corelib_slidercmn.obj & - $(OBJS)\corelib_spinbtncmn.obj & - $(OBJS)\corelib_spinctrlcmn.obj & - $(OBJS)\corelib_srchcmn.obj & - $(OBJS)\corelib_statbar.obj & - $(OBJS)\corelib_statbmpcmn.obj & - $(OBJS)\corelib_statboxcmn.obj & - $(OBJS)\corelib_statlinecmn.obj & - $(OBJS)\corelib_stattextcmn.obj & - $(OBJS)\corelib_stockitem.obj & - $(OBJS)\corelib_tbarbase.obj & - $(OBJS)\corelib_textcmn.obj & - $(OBJS)\corelib_textentrycmn.obj & - $(OBJS)\corelib_textmeasurecmn.obj & - $(OBJS)\corelib_toplvcmn.obj & - $(OBJS)\corelib_treebase.obj & - $(OBJS)\corelib_uiactioncmn.obj & - $(OBJS)\corelib_valgen.obj & - $(OBJS)\corelib_validate.obj & - $(OBJS)\corelib_valtext.obj & - $(OBJS)\corelib_valnum.obj & - $(OBJS)\corelib_wincmn.obj & - $(OBJS)\corelib_windowid.obj & - $(OBJS)\corelib_wrapsizer.obj & - $(OBJS)\corelib_xpmdecod.obj & - $(OBJS)\corelib_busyinfo.obj & - $(OBJS)\corelib_buttonbar.obj & - $(OBJS)\corelib_choicdgg.obj & - $(OBJS)\corelib_choicbkg.obj & - $(OBJS)\corelib_combog.obj & - $(OBJS)\corelib_dcpsg.obj & - $(OBJS)\corelib_dirctrlg.obj & - $(OBJS)\corelib_dragimgg.obj & - $(OBJS)\corelib_filectrlg.obj & - $(OBJS)\corelib_headerctrlg.obj & - $(OBJS)\corelib_infobar.obj & - $(OBJS)\corelib_listbkg.obj & - $(OBJS)\corelib_logg.obj & - $(OBJS)\corelib_markuptext.obj & - $(OBJS)\corelib_msgdlgg.obj & - $(OBJS)\corelib_numdlgg.obj & - $(OBJS)\corelib_progdlgg.obj & - $(OBJS)\corelib_preferencesg.obj & - $(OBJS)\corelib_printps.obj & - $(OBJS)\corelib_renderg.obj & - $(OBJS)\corelib_richmsgdlgg.obj & - $(OBJS)\corelib_scrlwing.obj & - $(OBJS)\corelib_selstore.obj & - $(OBJS)\corelib_spinctlg.obj & - $(OBJS)\corelib_splitter.obj & - $(OBJS)\corelib_srchctlg.obj & - $(OBJS)\corelib_statbmpg.obj & - $(OBJS)\corelib_stattextg.obj & - $(OBJS)\corelib_textdlgg.obj & - $(OBJS)\corelib_tipwin.obj & - $(OBJS)\corelib_toolbkg.obj & - $(OBJS)\corelib_treectlg.obj & - $(OBJS)\corelib_treebkg.obj & - $(OBJS)\corelib_vlbox.obj & - $(OBJS)\corelib_vscroll.obj & - $(OBJS)\corelib_xmlreshandler.obj -!endif -!endif -____wxcore_namedll_DEP = -!ifeq SHARED 1 -____wxcore_namedll_DEP = $(__coredll___depname) -!endif -____wxcore_namelib_DEP = -!ifeq SHARED 0 -____wxcore_namelib_DEP = $(__corelib___depname) -!endif -__advdll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -__advdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll -!endif -!endif -!endif -____ADVANCED_SRC_FILENAMES_2_OBJECTS = -!ifeq WXUNIV 0 -____ADVANCED_SRC_FILENAMES_2_OBJECTS = & - $(OBJS)\advdll_animatecmn.obj & - $(OBJS)\advdll_bmpcboxcmn.obj & - $(OBJS)\advdll_calctrlcmn.obj & - $(OBJS)\advdll_datavcmn.obj & - $(OBJS)\advdll_gridcmn.obj & - $(OBJS)\advdll_hyperlnkcmn.obj & - $(OBJS)\advdll_odcombocmn.obj & - $(OBJS)\advdll_richtooltipcmn.obj & - $(OBJS)\advdll_aboutdlgg.obj & - $(OBJS)\advdll_bannerwindow.obj & - $(OBJS)\advdll_bmpcboxg.obj & - $(OBJS)\advdll_calctrlg.obj & - $(OBJS)\advdll_commandlinkbuttong.obj & - $(OBJS)\advdll_datavgen.obj & - $(OBJS)\advdll_datectlg.obj & - $(OBJS)\advdll_editlbox.obj & - $(OBJS)\advdll_grid.obj & - $(OBJS)\advdll_gridctrl.obj & - $(OBJS)\advdll_grideditors.obj & - $(OBJS)\advdll_gridsel.obj & - $(OBJS)\advdll_helpext.obj & - $(OBJS)\advdll_hyperlinkg.obj & - $(OBJS)\advdll_laywin.obj & - $(OBJS)\advdll_notifmsgg.obj & - $(OBJS)\advdll_odcombo.obj & - $(OBJS)\advdll_propdlg.obj & - $(OBJS)\advdll_richtooltipg.obj & - $(OBJS)\advdll_sashwin.obj & - $(OBJS)\advdll_splash.obj & - $(OBJS)\advdll_timectrlg.obj & - $(OBJS)\advdll_tipdlg.obj & - $(OBJS)\advdll_treelist.obj & - $(OBJS)\advdll_wizard.obj & - $(OBJS)\advdll_taskbarcmn.obj & - $(OBJS)\advdll_aboutdlg.obj & - $(OBJS)\advdll_notifmsg.obj & - $(OBJS)\advdll_richtooltip.obj & - $(OBJS)\advdll_sound.obj & - $(OBJS)\advdll_taskbar.obj & - $(OBJS)\advdll_joystick.obj & - $(OBJS)\advdll_animateg.obj & - $(OBJS)\advdll_bmpcbox.obj & - $(OBJS)\advdll_calctrl.obj & - $(OBJS)\advdll_commandlinkbutton.obj & - $(OBJS)\advdll_datecontrols.obj & - $(OBJS)\advdll_datectrl.obj & - $(OBJS)\advdll_datetimectrl.obj & - $(OBJS)\advdll_hyperlink.obj & - $(OBJS)\advdll_timectrl.obj -!endif -!ifeq WXUNIV 1 -____ADVANCED_SRC_FILENAMES_2_OBJECTS = & - $(OBJS)\advdll_animatecmn.obj & - $(OBJS)\advdll_bmpcboxcmn.obj & - $(OBJS)\advdll_calctrlcmn.obj & - $(OBJS)\advdll_datavcmn.obj & - $(OBJS)\advdll_gridcmn.obj & - $(OBJS)\advdll_hyperlnkcmn.obj & - $(OBJS)\advdll_odcombocmn.obj & - $(OBJS)\advdll_richtooltipcmn.obj & - $(OBJS)\advdll_aboutdlgg.obj & - $(OBJS)\advdll_bannerwindow.obj & - $(OBJS)\advdll_bmpcboxg.obj & - $(OBJS)\advdll_calctrlg.obj & - $(OBJS)\advdll_commandlinkbuttong.obj & - $(OBJS)\advdll_datavgen.obj & - $(OBJS)\advdll_datectlg.obj & - $(OBJS)\advdll_editlbox.obj & - $(OBJS)\advdll_grid.obj & - $(OBJS)\advdll_gridctrl.obj & - $(OBJS)\advdll_grideditors.obj & - $(OBJS)\advdll_gridsel.obj & - $(OBJS)\advdll_helpext.obj & - $(OBJS)\advdll_hyperlinkg.obj & - $(OBJS)\advdll_laywin.obj & - $(OBJS)\advdll_notifmsgg.obj & - $(OBJS)\advdll_odcombo.obj & - $(OBJS)\advdll_propdlg.obj & - $(OBJS)\advdll_richtooltipg.obj & - $(OBJS)\advdll_sashwin.obj & - $(OBJS)\advdll_splash.obj & - $(OBJS)\advdll_timectrlg.obj & - $(OBJS)\advdll_tipdlg.obj & - $(OBJS)\advdll_treelist.obj & - $(OBJS)\advdll_wizard.obj & - $(OBJS)\advdll_taskbarcmn.obj & - $(OBJS)\advdll_aboutdlg.obj & - $(OBJS)\advdll_notifmsg.obj & - $(OBJS)\advdll_richtooltip.obj & - $(OBJS)\advdll_sound.obj & - $(OBJS)\advdll_taskbar.obj & - $(OBJS)\advdll_joystick.obj & - $(OBJS)\advdll_animateg.obj -!endif -__advlib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -__advlib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib -!endif -!endif -!endif -____ADVANCED_SRC_FILENAMES_3_OBJECTS = -!ifeq WXUNIV 0 -____ADVANCED_SRC_FILENAMES_3_OBJECTS = & - $(OBJS)\advlib_animatecmn.obj & - $(OBJS)\advlib_bmpcboxcmn.obj & - $(OBJS)\advlib_calctrlcmn.obj & - $(OBJS)\advlib_datavcmn.obj & - $(OBJS)\advlib_gridcmn.obj & - $(OBJS)\advlib_hyperlnkcmn.obj & - $(OBJS)\advlib_odcombocmn.obj & - $(OBJS)\advlib_richtooltipcmn.obj & - $(OBJS)\advlib_aboutdlgg.obj & - $(OBJS)\advlib_bannerwindow.obj & - $(OBJS)\advlib_bmpcboxg.obj & - $(OBJS)\advlib_calctrlg.obj & - $(OBJS)\advlib_commandlinkbuttong.obj & - $(OBJS)\advlib_datavgen.obj & - $(OBJS)\advlib_datectlg.obj & - $(OBJS)\advlib_editlbox.obj & - $(OBJS)\advlib_grid.obj & - $(OBJS)\advlib_gridctrl.obj & - $(OBJS)\advlib_grideditors.obj & - $(OBJS)\advlib_gridsel.obj & - $(OBJS)\advlib_helpext.obj & - $(OBJS)\advlib_hyperlinkg.obj & - $(OBJS)\advlib_laywin.obj & - $(OBJS)\advlib_notifmsgg.obj & - $(OBJS)\advlib_odcombo.obj & - $(OBJS)\advlib_propdlg.obj & - $(OBJS)\advlib_richtooltipg.obj & - $(OBJS)\advlib_sashwin.obj & - $(OBJS)\advlib_splash.obj & - $(OBJS)\advlib_timectrlg.obj & - $(OBJS)\advlib_tipdlg.obj & - $(OBJS)\advlib_treelist.obj & - $(OBJS)\advlib_wizard.obj & - $(OBJS)\advlib_taskbarcmn.obj & - $(OBJS)\advlib_aboutdlg.obj & - $(OBJS)\advlib_notifmsg.obj & - $(OBJS)\advlib_richtooltip.obj & - $(OBJS)\advlib_sound.obj & - $(OBJS)\advlib_taskbar.obj & - $(OBJS)\advlib_joystick.obj & - $(OBJS)\advlib_animateg.obj & - $(OBJS)\advlib_bmpcbox.obj & - $(OBJS)\advlib_calctrl.obj & - $(OBJS)\advlib_commandlinkbutton.obj & - $(OBJS)\advlib_datecontrols.obj & - $(OBJS)\advlib_datectrl.obj & - $(OBJS)\advlib_datetimectrl.obj & - $(OBJS)\advlib_hyperlink.obj & - $(OBJS)\advlib_timectrl.obj -!endif -!ifeq WXUNIV 1 -____ADVANCED_SRC_FILENAMES_3_OBJECTS = & - $(OBJS)\advlib_animatecmn.obj & - $(OBJS)\advlib_bmpcboxcmn.obj & - $(OBJS)\advlib_calctrlcmn.obj & - $(OBJS)\advlib_datavcmn.obj & - $(OBJS)\advlib_gridcmn.obj & - $(OBJS)\advlib_hyperlnkcmn.obj & - $(OBJS)\advlib_odcombocmn.obj & - $(OBJS)\advlib_richtooltipcmn.obj & - $(OBJS)\advlib_aboutdlgg.obj & - $(OBJS)\advlib_bannerwindow.obj & - $(OBJS)\advlib_bmpcboxg.obj & - $(OBJS)\advlib_calctrlg.obj & - $(OBJS)\advlib_commandlinkbuttong.obj & - $(OBJS)\advlib_datavgen.obj & - $(OBJS)\advlib_datectlg.obj & - $(OBJS)\advlib_editlbox.obj & - $(OBJS)\advlib_grid.obj & - $(OBJS)\advlib_gridctrl.obj & - $(OBJS)\advlib_grideditors.obj & - $(OBJS)\advlib_gridsel.obj & - $(OBJS)\advlib_helpext.obj & - $(OBJS)\advlib_hyperlinkg.obj & - $(OBJS)\advlib_laywin.obj & - $(OBJS)\advlib_notifmsgg.obj & - $(OBJS)\advlib_odcombo.obj & - $(OBJS)\advlib_propdlg.obj & - $(OBJS)\advlib_richtooltipg.obj & - $(OBJS)\advlib_sashwin.obj & - $(OBJS)\advlib_splash.obj & - $(OBJS)\advlib_timectrlg.obj & - $(OBJS)\advlib_tipdlg.obj & - $(OBJS)\advlib_treelist.obj & - $(OBJS)\advlib_wizard.obj & - $(OBJS)\advlib_taskbarcmn.obj & - $(OBJS)\advlib_aboutdlg.obj & - $(OBJS)\advlib_notifmsg.obj & - $(OBJS)\advlib_richtooltip.obj & - $(OBJS)\advlib_sound.obj & - $(OBJS)\advlib_taskbar.obj & - $(OBJS)\advlib_joystick.obj & - $(OBJS)\advlib_animateg.obj -!endif -____wxadv_namedll_DEP = -!ifeq SHARED 1 -____wxadv_namedll_DEP = $(__advdll___depname) -!endif -____wxadv_namelib_DEP = -!ifeq SHARED 0 -____wxadv_namelib_DEP = $(__advlib___depname) -!endif -__mediadll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_MEDIA 1 -__mediadll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll -!endif -!endif -!endif -!endif -__medialib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_MEDIA 1 -__medialib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib -!endif -!endif -!endif -!endif -____wxmedia_namedll_DEP = -!ifeq SHARED 1 -____wxmedia_namedll_DEP = $(__mediadll___depname) -!endif -____wxmedia_namelib_DEP = -!ifeq SHARED 0 -____wxmedia_namelib_DEP = $(__medialib___depname) -!endif -__htmldll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_HTML 1 -__htmldll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll -!endif -!endif -!endif -!endif -__htmllib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_HTML 1 -__htmllib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!endif -!endif -!endif -____wxhtml_namedll_DEP = -!ifeq SHARED 1 -____wxhtml_namedll_DEP = $(__htmldll___depname) -!endif -____wxhtml_namelib_DEP = -!ifeq SHARED 0 -____wxhtml_namelib_DEP = $(__htmllib___depname) -!endif -__webviewdll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_WEBVIEW 1 -__webviewdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll -!endif -!endif -!endif -!endif -__webviewlib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_WEBVIEW 1 -__webviewlib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib -!endif -!endif -!endif -!endif -____wxwebview_namedll_DEP = -!ifeq SHARED 1 -____wxwebview_namedll_DEP = $(__webviewdll___depname) -!endif -____wxwebview_namelib_DEP = -!ifeq SHARED 0 -____wxwebview_namelib_DEP = $(__webviewlib___depname) -!endif -__qadll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_QA 1 -__qadll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll -!endif -!endif -!endif -!endif -__qalib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_QA 1 -__qalib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib -!endif -!endif -!endif -!endif -____wxqa_namedll_DEP = -!ifeq SHARED 1 -____wxqa_namedll_DEP = $(__qadll___depname) -!endif -____wxqa_namelib_DEP = -!ifeq SHARED 0 -____wxqa_namelib_DEP = $(__qalib___depname) -!endif -__xmldll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -__xmldll___depname = & - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll -!endif -!endif -__xmllib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -__xmllib___depname = & - $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib -!endif -!endif -____wxxml_namedll_DEP = -!ifeq SHARED 1 -____wxxml_namedll_DEP = $(__xmldll___depname) -!endif -____wxxml_namelib_DEP = -!ifeq SHARED 0 -____wxxml_namelib_DEP = $(__xmllib___depname) -!endif -__xrcdll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_XRC 1 -__xrcdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll -!endif -!endif -!endif -__xrclib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_XRC 1 -__xrclib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib -!endif -!endif -!endif -____wxxrc_namedll_DEP = -!ifeq SHARED 1 -____wxxrc_namedll_DEP = $(__xrcdll___depname) -!endif -____wxxrc_namelib_DEP = -!ifeq SHARED 0 -____wxxrc_namelib_DEP = $(__xrclib___depname) -!endif -__auidll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_AUI 1 -__auidll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll -!endif -!endif -!endif -__auilib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_AUI 1 -__auilib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib -!endif -!endif -!endif -____wxaui_namedll_DEP = -!ifeq SHARED 1 -____wxaui_namedll_DEP = $(__auidll___depname) -!endif -____wxaui_namelib_DEP = -!ifeq SHARED 0 -____wxaui_namelib_DEP = $(__auilib___depname) -!endif -__ribbondll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_RIBBON 1 -__ribbondll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll -!endif -!endif -!endif -__ribbonlib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_RIBBON 1 -__ribbonlib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib -!endif -!endif -!endif -____wxribbon_namedll_DEP = -!ifeq SHARED 1 -____wxribbon_namedll_DEP = $(__ribbondll___depname) -!endif -____wxribbon_namelib_DEP = -!ifeq SHARED 0 -____wxribbon_namelib_DEP = $(__ribbonlib___depname) -!endif -__propgriddll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_PROPGRID 1 -__propgriddll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll -!endif -!endif -!endif -__propgridlib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_PROPGRID 1 -__propgridlib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib -!endif -!endif -!endif -____wxpropgrid_namedll_DEP = -!ifeq SHARED 1 -____wxpropgrid_namedll_DEP = $(__propgriddll___depname) -!endif -____wxpropgrid_namelib_DEP = -!ifeq SHARED 0 -____wxpropgrid_namelib_DEP = $(__propgridlib___depname) -!endif -__richtextdll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_RICHTEXT 1 -__richtextdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll -!endif -!endif -!endif -__richtextlib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_RICHTEXT 1 -__richtextlib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib -!endif -!endif -!endif -____wxrichtext_namedll_DEP = -!ifeq SHARED 1 -____wxrichtext_namedll_DEP = $(__richtextdll___depname) -!endif -____wxrichtext_namelib_DEP = -!ifeq SHARED 0 -____wxrichtext_namelib_DEP = $(__richtextlib___depname) -!endif -__stcdll___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_STC 1 -__stcdll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll -!endif -!endif -!endif -__stclib___depname = -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_STC 1 -__stclib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib -!endif -!endif -!endif -____wxstc_namedll_DEP = -!ifeq SHARED 1 -____wxstc_namedll_DEP = $(__stcdll___depname) -!endif -____wxstc_namelib_DEP = -!ifeq SHARED 0 -____wxstc_namelib_DEP = $(__stclib___depname) -!endif -__gldll___depname = -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_OPENGL 1 -__gldll___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll -!endif -!endif -!endif -__WXLIBGLDEP_CORE_p = -!ifeq MONOLITHIC 0 -__WXLIBGLDEP_CORE_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib -!endif -__WXLIBGLDEP_BASE_p = -!ifeq MONOLITHIC 0 -__WXLIBGLDEP_BASE_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__WXLIB_MONO_p = -!ifeq MONOLITHIC 1 -__WXLIB_MONO_p = & - wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib -!endif -__gllib___depname = -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_OPENGL 1 -__gllib___depname = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib -!endif -!endif -!endif -____wxgl_namedll_DEP = -!ifeq SHARED 1 -____wxgl_namedll_DEP = $(__gldll___depname) -!endif -____wxgl_namelib_DEP = -!ifeq SHARED 0 -____wxgl_namelib_DEP = $(__gllib___depname) -!endif -__wxscintilla = -!ifeq USE_STC 1 -__wxscintilla = $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib -!endif -__htmldll_library_link_DEP = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_HTML 1 -__htmldll_library_link_DEP = $(__htmldll___depname) -!endif -!endif -!endif -!endif -__htmldll_library_link_LIBR = -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_HTML 1 -__htmldll_library_link_LIBR = & - $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib -!endif -!endif -!endif -!endif -__DEBUGINFO_4 = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO_4 = debug all -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO_4 = -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO_4 = -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO_4 = debug all -!endif -__LIB_TIFF_p = -!ifeq USE_GUI 1 -__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib -!endif -__LIB_JPEG_p = -!ifeq USE_GUI 1 -__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib -!endif -__LIB_PNG_p = -!ifeq USE_GUI 1 -__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib -!endif -__CAIRO_LIB_p = -!ifeq USE_CAIRO 1 -__CAIRO_LIB_p = cairo.lib -!endif -____CAIRO_LIBDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_LIBDIR_FILENAMES = libpath $(CAIRO_ROOT)\lib -!endif -__DEBUGINFO = -!ifeq BUILD debug -!ifeq DEBUG_INFO default -__DEBUGINFO = -d2 -!endif -!endif -!ifeq BUILD release -!ifeq DEBUG_INFO default -__DEBUGINFO = -d0 -!endif -!endif -!ifeq DEBUG_INFO 0 -__DEBUGINFO = -d0 -!endif -!ifeq DEBUG_INFO 1 -__DEBUGINFO = -d2 -!endif -__OPTIMIZEFLAG = -!ifeq BUILD debug -__OPTIMIZEFLAG = -od -!endif -!ifeq BUILD release -__OPTIMIZEFLAG = -ot -ox -!endif -__THREADSFLAG = -!ifeq USE_THREADS 0 -__THREADSFLAG = -!endif -!ifeq USE_THREADS 1 -__THREADSFLAG = -bm -!endif -__RUNTIME_LIBS = -!ifeq RUNTIME_LIBS dynamic -__RUNTIME_LIBS = -br -!endif -!ifeq RUNTIME_LIBS static -__RUNTIME_LIBS = -!endif -__RTTIFLAG = -!ifeq USE_RTTI 0 -__RTTIFLAG = -!endif -!ifeq USE_RTTI 1 -__RTTIFLAG = -xr -!endif -__EXCEPTIONSFLAG = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONSFLAG = -!endif -!ifeq USE_EXCEPTIONS 1 -__EXCEPTIONSFLAG = -xs -!endif -__WXUNIV_DEFINE_p = -!ifeq WXUNIV 1 -__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ -!endif -__DEBUG_DEFINE_p = -!ifeq DEBUG_FLAG 0 -__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0 -!endif -__NDEBUG_DEFINE_p = -!ifeq BUILD release -__NDEBUG_DEFINE_p = -dNDEBUG -!endif -__EXCEPTIONS_DEFINE_p = -!ifeq USE_EXCEPTIONS 0 -__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS -!endif -__RTTI_DEFINE_p = -!ifeq USE_RTTI 0 -__RTTI_DEFINE_p = -dwxNO_RTTI -!endif -__THREAD_DEFINE_p = -!ifeq USE_THREADS 0 -__THREAD_DEFINE_p = -dwxNO_THREADS -!endif -__UNICODE_DEFINE_p = -!ifeq UNICODE 0 -__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0 -!endif -!ifeq UNICODE 1 -__UNICODE_DEFINE_p = -d_UNICODE -!endif -____CAIRO_INCLUDEDIR_FILENAMES = -!ifeq USE_CAIRO 1 -____CAIRO_INCLUDEDIR_FILENAMES = -i=$(CAIRO_ROOT)\include\cairo -!endif -__SETUP_H_SUBDIR_FILENAMES = -!ifeq WXUNIV 0 -__SETUP_H_SUBDIR_FILENAMES = msw -!endif -!ifeq WXUNIV 1 -__SETUP_H_SUBDIR_FILENAMES = univ -!endif - -### Variables: ### - -MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & - CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" & - TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" & - UNICODE="$(UNICODE)" BUILD="$(BUILD)" DEBUG_INFO="$(DEBUG_INFO)" & - DEBUG_FLAG="$(DEBUG_FLAG)" MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" & - USE_HTML="$(USE_HTML)" USE_WEBVIEW="$(USE_WEBVIEW)" & - USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" & - USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" & - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" & - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & - USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & - USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" & - OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & - WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" & - CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" & - RUNTIME_LIBS="$(RUNTIME_LIBS)" -WX_RELEASE_NODOT = 30 -COMPILER_PREFIX = wat -OBJS = & - $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -LIBDIRNAME = & - ..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG) -SETUPHDIR = & - $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -WXREGEX_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -dNDEBUG -i=..\..\include -i=$(SETUPHDIR) -d__WXMSW__ & - $(__WXUNIV_DEFINE_p) $(__UNICODE_DEFINE_p) $(CPPFLAGS) $(CFLAGS) -WXREGEX_OBJECTS = & - $(OBJS)\wxregex_regcomp.obj & - $(OBJS)\wxregex_regexec.obj & - $(OBJS)\wxregex_regerror.obj & - $(OBJS)\wxregex_regfree.obj -WXZLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -dNDEBUG $(CPPFLAGS) $(CFLAGS) -WXZLIB_OBJECTS = & - $(OBJS)\wxzlib_adler32.obj & - $(OBJS)\wxzlib_compress.obj & - $(OBJS)\wxzlib_crc32.obj & - $(OBJS)\wxzlib_deflate.obj & - $(OBJS)\wxzlib_gzclose.obj & - $(OBJS)\wxzlib_gzlib.obj & - $(OBJS)\wxzlib_gzread.obj & - $(OBJS)\wxzlib_gzwrite.obj & - $(OBJS)\wxzlib_infback.obj & - $(OBJS)\wxzlib_inffast.obj & - $(OBJS)\wxzlib_inflate.obj & - $(OBJS)\wxzlib_inftrees.obj & - $(OBJS)\wxzlib_trees.obj & - $(OBJS)\wxzlib_uncompr.obj & - $(OBJS)\wxzlib_zutil.obj -WXPNG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -dNDEBUG -i=..\..\src\zlib -wcd=124 $(CPPFLAGS) $(CFLAGS) -WXPNG_OBJECTS = & - $(OBJS)\wxpng_png.obj & - $(OBJS)\wxpng_pngerror.obj & - $(OBJS)\wxpng_pngget.obj & - $(OBJS)\wxpng_pngmem.obj & - $(OBJS)\wxpng_pngpread.obj & - $(OBJS)\wxpng_pngread.obj & - $(OBJS)\wxpng_pngrio.obj & - $(OBJS)\wxpng_pngrtran.obj & - $(OBJS)\wxpng_pngrutil.obj & - $(OBJS)\wxpng_pngset.obj & - $(OBJS)\wxpng_pngtrans.obj & - $(OBJS)\wxpng_pngwio.obj & - $(OBJS)\wxpng_pngwrite.obj & - $(OBJS)\wxpng_pngwtran.obj & - $(OBJS)\wxpng_pngwutil.obj -WXJPEG_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -dNDEBUG -i=$(SETUPHDIR) -wcd=136 $(CPPFLAGS) $(CFLAGS) -WXJPEG_OBJECTS = & - $(OBJS)\wxjpeg_jcomapi.obj & - $(OBJS)\wxjpeg_jutils.obj & - $(OBJS)\wxjpeg_jerror.obj & - $(OBJS)\wxjpeg_jmemmgr.obj & - $(OBJS)\wxjpeg_jmemnobs.obj & - $(OBJS)\wxjpeg_jcapimin.obj & - $(OBJS)\wxjpeg_jcapistd.obj & - $(OBJS)\wxjpeg_jctrans.obj & - $(OBJS)\wxjpeg_jcparam.obj & - $(OBJS)\wxjpeg_jdatadst.obj & - $(OBJS)\wxjpeg_jcinit.obj & - $(OBJS)\wxjpeg_jcmaster.obj & - $(OBJS)\wxjpeg_jcmarker.obj & - $(OBJS)\wxjpeg_jcmainct.obj & - $(OBJS)\wxjpeg_jcprepct.obj & - $(OBJS)\wxjpeg_jccoefct.obj & - $(OBJS)\wxjpeg_jccolor.obj & - $(OBJS)\wxjpeg_jcsample.obj & - $(OBJS)\wxjpeg_jchuff.obj & - $(OBJS)\wxjpeg_jcphuff.obj & - $(OBJS)\wxjpeg_jcdctmgr.obj & - $(OBJS)\wxjpeg_jfdctfst.obj & - $(OBJS)\wxjpeg_jfdctflt.obj & - $(OBJS)\wxjpeg_jfdctint.obj & - $(OBJS)\wxjpeg_jdapimin.obj & - $(OBJS)\wxjpeg_jdapistd.obj & - $(OBJS)\wxjpeg_jdtrans.obj & - $(OBJS)\wxjpeg_jdatasrc.obj & - $(OBJS)\wxjpeg_jdmaster.obj & - $(OBJS)\wxjpeg_jdinput.obj & - $(OBJS)\wxjpeg_jdmarker.obj & - $(OBJS)\wxjpeg_jdhuff.obj & - $(OBJS)\wxjpeg_jdphuff.obj & - $(OBJS)\wxjpeg_jdmainct.obj & - $(OBJS)\wxjpeg_jdcoefct.obj & - $(OBJS)\wxjpeg_jdpostct.obj & - $(OBJS)\wxjpeg_jddctmgr.obj & - $(OBJS)\wxjpeg_jidctfst.obj & - $(OBJS)\wxjpeg_jidctflt.obj & - $(OBJS)\wxjpeg_jidctint.obj & - $(OBJS)\wxjpeg_jidctred.obj & - $(OBJS)\wxjpeg_jdsample.obj & - $(OBJS)\wxjpeg_jdcolor.obj & - $(OBJS)\wxjpeg_jquant1.obj & - $(OBJS)\wxjpeg_jquant2.obj & - $(OBJS)\wxjpeg_jdmerge.obj -WXTIFF_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -dNDEBUG -i=..\..\src\zlib -i=..\..\src\jpeg & - -i=..\..\src\tiff\libtiff -wcd=124 $(CPPFLAGS) $(CFLAGS) -WXTIFF_OBJECTS = & - $(OBJS)\wxtiff_tif_win32.obj & - $(OBJS)\wxtiff_tif_aux.obj & - $(OBJS)\wxtiff_tif_close.obj & - $(OBJS)\wxtiff_tif_codec.obj & - $(OBJS)\wxtiff_tif_color.obj & - $(OBJS)\wxtiff_tif_compress.obj & - $(OBJS)\wxtiff_tif_dir.obj & - $(OBJS)\wxtiff_tif_dirinfo.obj & - $(OBJS)\wxtiff_tif_dirread.obj & - $(OBJS)\wxtiff_tif_dirwrite.obj & - $(OBJS)\wxtiff_tif_dumpmode.obj & - $(OBJS)\wxtiff_tif_error.obj & - $(OBJS)\wxtiff_tif_extension.obj & - $(OBJS)\wxtiff_tif_fax3.obj & - $(OBJS)\wxtiff_tif_fax3sm.obj & - $(OBJS)\wxtiff_tif_flush.obj & - $(OBJS)\wxtiff_tif_getimage.obj & - $(OBJS)\wxtiff_tif_jbig.obj & - $(OBJS)\wxtiff_tif_jpeg.obj & - $(OBJS)\wxtiff_tif_jpeg_12.obj & - $(OBJS)\wxtiff_tif_luv.obj & - $(OBJS)\wxtiff_tif_lzma.obj & - $(OBJS)\wxtiff_tif_lzw.obj & - $(OBJS)\wxtiff_tif_next.obj & - $(OBJS)\wxtiff_tif_ojpeg.obj & - $(OBJS)\wxtiff_tif_open.obj & - $(OBJS)\wxtiff_tif_packbits.obj & - $(OBJS)\wxtiff_tif_pixarlog.obj & - $(OBJS)\wxtiff_tif_predict.obj & - $(OBJS)\wxtiff_tif_print.obj & - $(OBJS)\wxtiff_tif_read.obj & - $(OBJS)\wxtiff_tif_strip.obj & - $(OBJS)\wxtiff_tif_swab.obj & - $(OBJS)\wxtiff_tif_thunder.obj & - $(OBJS)\wxtiff_tif_tile.obj & - $(OBJS)\wxtiff_tif_version.obj & - $(OBJS)\wxtiff_tif_warning.obj & - $(OBJS)\wxtiff_tif_write.obj & - $(OBJS)\wxtiff_tif_zip.obj -WXEXPAT_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -dNDEBUG -i=$(LIBDIRNAME) -dCOMPILED_FROM_DSP $(CPPFLAGS) & - $(CFLAGS) -WXEXPAT_OBJECTS = & - $(OBJS)\wxexpat_xmlparse.obj & - $(OBJS)\wxexpat_xmlrole.obj & - $(OBJS)\wxexpat_xmltok.obj -WXSCINTILLA_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -dNDEBUG -i=..\..\src\stc\scintilla\include & - -i=..\..\src\stc\scintilla\lexlib -i=..\..\src\stc\scintilla\src -d__WX__ & - -dSCI_LEXER -dLINK_LEXERS -i=$(SETUPHDIR) -i=..\..\include & - $(__wxscintilla_usingdll_p) -d__WXMSW__ $(__WXUNIV_DEFINE_p) & - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) -WXSCINTILLA_OBJECTS = & - $(OBJS)\wxscintilla_LexA68k.obj & - $(OBJS)\wxscintilla_LexAbaqus.obj & - $(OBJS)\wxscintilla_LexAda.obj & - $(OBJS)\wxscintilla_LexAPDL.obj & - $(OBJS)\wxscintilla_LexAsm.obj & - $(OBJS)\wxscintilla_LexAsn1.obj & - $(OBJS)\wxscintilla_LexASY.obj & - $(OBJS)\wxscintilla_LexAU3.obj & - $(OBJS)\wxscintilla_LexAVE.obj & - $(OBJS)\wxscintilla_LexAVS.obj & - $(OBJS)\wxscintilla_LexBaan.obj & - $(OBJS)\wxscintilla_LexBash.obj & - $(OBJS)\wxscintilla_LexBasic.obj & - $(OBJS)\wxscintilla_LexBullant.obj & - $(OBJS)\wxscintilla_LexCaml.obj & - $(OBJS)\wxscintilla_LexCLW.obj & - $(OBJS)\wxscintilla_LexCmake.obj & - $(OBJS)\wxscintilla_LexCOBOL.obj & - $(OBJS)\wxscintilla_LexCoffeeScript.obj & - $(OBJS)\wxscintilla_LexConf.obj & - $(OBJS)\wxscintilla_LexCPP.obj & - $(OBJS)\wxscintilla_LexCrontab.obj & - $(OBJS)\wxscintilla_LexCsound.obj & - $(OBJS)\wxscintilla_LexCSS.obj & - $(OBJS)\wxscintilla_LexD.obj & - $(OBJS)\wxscintilla_LexECL.obj & - $(OBJS)\wxscintilla_LexEiffel.obj & - $(OBJS)\wxscintilla_LexErlang.obj & - $(OBJS)\wxscintilla_LexEScript.obj & - $(OBJS)\wxscintilla_LexFlagship.obj & - $(OBJS)\wxscintilla_LexForth.obj & - $(OBJS)\wxscintilla_LexFortran.obj & - $(OBJS)\wxscintilla_LexGAP.obj & - $(OBJS)\wxscintilla_LexGui4Cli.obj & - $(OBJS)\wxscintilla_LexHaskell.obj & - $(OBJS)\wxscintilla_LexHTML.obj & - $(OBJS)\wxscintilla_LexInno.obj & - $(OBJS)\wxscintilla_LexKix.obj & - $(OBJS)\wxscintilla_LexLisp.obj & - $(OBJS)\wxscintilla_LexLout.obj & - $(OBJS)\wxscintilla_LexLua.obj & - $(OBJS)\wxscintilla_LexMagik.obj & - $(OBJS)\wxscintilla_LexMarkdown.obj & - $(OBJS)\wxscintilla_LexMatlab.obj & - $(OBJS)\wxscintilla_LexMetapost.obj & - $(OBJS)\wxscintilla_LexMMIXAL.obj & - $(OBJS)\wxscintilla_LexModula.obj & - $(OBJS)\wxscintilla_LexMPT.obj & - $(OBJS)\wxscintilla_LexMSSQL.obj & - $(OBJS)\wxscintilla_LexMySQL.obj & - $(OBJS)\wxscintilla_LexNimrod.obj & - $(OBJS)\wxscintilla_LexNsis.obj & - $(OBJS)\wxscintilla_LexOpal.obj & - $(OBJS)\wxscintilla_LexOScript.obj & - $(OBJS)\wxscintilla_LexOthers.obj & - $(OBJS)\wxscintilla_LexPascal.obj & - $(OBJS)\wxscintilla_LexPB.obj & - $(OBJS)\wxscintilla_LexPerl.obj & - $(OBJS)\wxscintilla_LexPLM.obj & - $(OBJS)\wxscintilla_LexPOV.obj & - $(OBJS)\wxscintilla_LexPowerPro.obj & - $(OBJS)\wxscintilla_LexPowerShell.obj & - $(OBJS)\wxscintilla_LexProgress.obj & - $(OBJS)\wxscintilla_LexPS.obj & - $(OBJS)\wxscintilla_LexPython.obj & - $(OBJS)\wxscintilla_LexR.obj & - $(OBJS)\wxscintilla_LexRebol.obj & - $(OBJS)\wxscintilla_LexRuby.obj & - $(OBJS)\wxscintilla_LexScriptol.obj & - $(OBJS)\wxscintilla_LexSmalltalk.obj & - $(OBJS)\wxscintilla_LexSML.obj & - $(OBJS)\wxscintilla_LexSorcus.obj & - $(OBJS)\wxscintilla_LexSpecman.obj & - $(OBJS)\wxscintilla_LexSpice.obj & - $(OBJS)\wxscintilla_LexSQL.obj & - $(OBJS)\wxscintilla_LexTACL.obj & - $(OBJS)\wxscintilla_LexTADS3.obj & - $(OBJS)\wxscintilla_LexTAL.obj & - $(OBJS)\wxscintilla_LexTCL.obj & - $(OBJS)\wxscintilla_LexTCMD.obj & - $(OBJS)\wxscintilla_LexTeX.obj & - $(OBJS)\wxscintilla_LexTxt2tags.obj & - $(OBJS)\wxscintilla_LexVB.obj & - $(OBJS)\wxscintilla_LexVerilog.obj & - $(OBJS)\wxscintilla_LexVHDL.obj & - $(OBJS)\wxscintilla_LexVisualProlog.obj & - $(OBJS)\wxscintilla_LexYAML.obj & - $(OBJS)\wxscintilla_Accessor.obj & - $(OBJS)\wxscintilla_CharacterSet.obj & - $(OBJS)\wxscintilla_LexerBase.obj & - $(OBJS)\wxscintilla_LexerModule.obj & - $(OBJS)\wxscintilla_LexerNoExceptions.obj & - $(OBJS)\wxscintilla_LexerSimple.obj & - $(OBJS)\wxscintilla_PropSetSimple.obj & - $(OBJS)\wxscintilla_StyleContext.obj & - $(OBJS)\wxscintilla_WordList.obj & - $(OBJS)\wxscintilla_AutoComplete.obj & - $(OBJS)\wxscintilla_CallTip.obj & - $(OBJS)\wxscintilla_Catalogue.obj & - $(OBJS)\wxscintilla_CellBuffer.obj & - $(OBJS)\wxscintilla_CharClassify.obj & - $(OBJS)\wxscintilla_ContractionState.obj & - $(OBJS)\wxscintilla_Decoration.obj & - $(OBJS)\wxscintilla_Document.obj & - $(OBJS)\wxscintilla_Editor.obj & - $(OBJS)\wxscintilla_ExternalLexer.obj & - $(OBJS)\wxscintilla_Indicator.obj & - $(OBJS)\wxscintilla_KeyMap.obj & - $(OBJS)\wxscintilla_LineMarker.obj & - $(OBJS)\wxscintilla_PerLine.obj & - $(OBJS)\wxscintilla_PositionCache.obj & - $(OBJS)\wxscintilla_RESearch.obj & - $(OBJS)\wxscintilla_RunStyles.obj & - $(OBJS)\wxscintilla_ScintillaBase.obj & - $(OBJS)\wxscintilla_Selection.obj & - $(OBJS)\wxscintilla_Style.obj & - $(OBJS)\wxscintilla_UniConversion.obj & - $(OBJS)\wxscintilla_ViewStyle.obj & - $(OBJS)\wxscintilla_XPM.obj -MONODLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & - -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\lexlib & - -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS & - -dwxUSE_BASE=1 -dWXMAKINGDLL $(CPPFLAGS) $(CFLAGS) -MONODLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & - -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\lexlib & - -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS & - -dwxUSE_BASE=1 -dWXMAKINGDLL /fh=$(OBJS)\wxprec_monodll.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -MONODLL_OBJECTS = & - $(OBJS)\monodll_dummy.obj & - $(OBJS)\monodll_any.obj & - $(OBJS)\monodll_appbase.obj & - $(OBJS)\monodll_arcall.obj & - $(OBJS)\monodll_arcfind.obj & - $(OBJS)\monodll_archive.obj & - $(OBJS)\monodll_arrstr.obj & - $(OBJS)\monodll_base64.obj & - $(OBJS)\monodll_clntdata.obj & - $(OBJS)\monodll_cmdline.obj & - $(OBJS)\monodll_config.obj & - $(OBJS)\monodll_convauto.obj & - $(OBJS)\monodll_datetime.obj & - $(OBJS)\monodll_datetimefmt.obj & - $(OBJS)\monodll_datstrm.obj & - $(OBJS)\monodll_dircmn.obj & - $(OBJS)\monodll_dynarray.obj & - $(OBJS)\monodll_dynlib.obj & - $(OBJS)\monodll_dynload.obj & - $(OBJS)\monodll_encconv.obj & - $(OBJS)\monodll_evtloopcmn.obj & - $(OBJS)\monodll_extended.obj & - $(OBJS)\monodll_ffile.obj & - $(OBJS)\monodll_file.obj & - $(OBJS)\monodll_fileback.obj & - $(OBJS)\monodll_fileconf.obj & - $(OBJS)\monodll_filefn.obj & - $(OBJS)\monodll_filename.obj & - $(OBJS)\monodll_filesys.obj & - $(OBJS)\monodll_filtall.obj & - $(OBJS)\monodll_filtfind.obj & - $(OBJS)\monodll_fmapbase.obj & - $(OBJS)\monodll_fs_arc.obj & - $(OBJS)\monodll_fs_filter.obj & - $(OBJS)\monodll_hash.obj & - $(OBJS)\monodll_hashmap.obj & - $(OBJS)\monodll_init.obj & - $(OBJS)\monodll_intl.obj & - $(OBJS)\monodll_ipcbase.obj & - $(OBJS)\monodll_languageinfo.obj & - $(OBJS)\monodll_list.obj & - $(OBJS)\monodll_log.obj & - $(OBJS)\monodll_longlong.obj & - $(OBJS)\monodll_memory.obj & - $(OBJS)\monodll_mimecmn.obj & - $(OBJS)\monodll_module.obj & - $(OBJS)\monodll_mstream.obj & - $(OBJS)\monodll_numformatter.obj & - $(OBJS)\monodll_object.obj & - $(OBJS)\monodll_platinfo.obj & - $(OBJS)\monodll_powercmn.obj & - $(OBJS)\monodll_process.obj & - $(OBJS)\monodll_regex.obj & - $(OBJS)\monodll_stdpbase.obj & - $(OBJS)\monodll_sstream.obj & - $(OBJS)\monodll_stdstream.obj & - $(OBJS)\monodll_stopwatch.obj & - $(OBJS)\monodll_strconv.obj & - $(OBJS)\monodll_stream.obj & - $(OBJS)\monodll_string.obj & - $(OBJS)\monodll_stringimpl.obj & - $(OBJS)\monodll_stringops.obj & - $(OBJS)\monodll_strvararg.obj & - $(OBJS)\monodll_sysopt.obj & - $(OBJS)\monodll_tarstrm.obj & - $(OBJS)\monodll_textbuf.obj & - $(OBJS)\monodll_textfile.obj & - $(OBJS)\monodll_threadinfo.obj & - $(OBJS)\monodll_time.obj & - $(OBJS)\monodll_timercmn.obj & - $(OBJS)\monodll_timerimpl.obj & - $(OBJS)\monodll_tokenzr.obj & - $(OBJS)\monodll_translation.obj & - $(OBJS)\monodll_txtstrm.obj & - $(OBJS)\monodll_unichar.obj & - $(OBJS)\monodll_uri.obj & - $(OBJS)\monodll_ustring.obj & - $(OBJS)\monodll_variant.obj & - $(OBJS)\monodll_wfstream.obj & - $(OBJS)\monodll_wxcrt.obj & - $(OBJS)\monodll_wxprintf.obj & - $(OBJS)\monodll_xlocale.obj & - $(OBJS)\monodll_xti.obj & - $(OBJS)\monodll_xtistrm.obj & - $(OBJS)\monodll_zipstrm.obj & - $(OBJS)\monodll_zstream.obj & - $(OBJS)\monodll_fswatchercmn.obj & - $(OBJS)\monodll_fswatcherg.obj & - $(OBJS)\monodll_basemsw.obj & - $(OBJS)\monodll_crashrpt.obj & - $(OBJS)\monodll_debughlp.obj & - $(OBJS)\monodll_dde.obj & - $(OBJS)\monodll_dir.obj & - $(OBJS)\monodll_dlmsw.obj & - $(OBJS)\monodll_evtloopconsole.obj & - $(OBJS)\monodll_mimetype.obj & - $(OBJS)\monodll_power.obj & - $(OBJS)\monodll_regconf.obj & - $(OBJS)\monodll_registry.obj & - $(OBJS)\monodll_snglinst.obj & - $(OBJS)\monodll_stackwalk.obj & - $(OBJS)\monodll_stdpaths.obj & - $(OBJS)\monodll_thread.obj & - $(OBJS)\monodll_timer.obj & - $(OBJS)\monodll_utils.obj & - $(OBJS)\monodll_utilsexc.obj & - $(OBJS)\monodll_fswatcher.obj & - $(OBJS)\monodll_event.obj & - $(OBJS)\monodll_fs_mem.obj & - $(OBJS)\monodll_msgout.obj & - $(OBJS)\monodll_utilscmn.obj & - $(OBJS)\monodll_main.obj & - $(OBJS)\monodll_mslu.obj & - $(OBJS)\monodll_volume.obj & - $(OBJS)\monodll_fs_inet.obj & - $(OBJS)\monodll_ftp.obj & - $(OBJS)\monodll_http.obj & - $(OBJS)\monodll_protocol.obj & - $(OBJS)\monodll_sckaddr.obj & - $(OBJS)\monodll_sckfile.obj & - $(OBJS)\monodll_sckipc.obj & - $(OBJS)\monodll_sckstrm.obj & - $(OBJS)\monodll_socket.obj & - $(OBJS)\monodll_url.obj & - $(OBJS)\monodll_sockmsw.obj & - $(OBJS)\monodll_urlmsw.obj & - $(____MONOLIB_GUI_SRC_FILENAMES_OBJECTS) & - $(OBJS)\monodll_xml.obj & - $(OBJS)\monodll_xtixml.obj -MONOLIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & - -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\lexlib & - -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS & - -dwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) -MONOLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & - -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\lexlib & - -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS & - -dwxUSE_BASE=1 /fh=$(OBJS)\wxprec_monolib.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -MONOLIB_OBJECTS = & - $(OBJS)\monolib_dummy.obj & - $(OBJS)\monolib_any.obj & - $(OBJS)\monolib_appbase.obj & - $(OBJS)\monolib_arcall.obj & - $(OBJS)\monolib_arcfind.obj & - $(OBJS)\monolib_archive.obj & - $(OBJS)\monolib_arrstr.obj & - $(OBJS)\monolib_base64.obj & - $(OBJS)\monolib_clntdata.obj & - $(OBJS)\monolib_cmdline.obj & - $(OBJS)\monolib_config.obj & - $(OBJS)\monolib_convauto.obj & - $(OBJS)\monolib_datetime.obj & - $(OBJS)\monolib_datetimefmt.obj & - $(OBJS)\monolib_datstrm.obj & - $(OBJS)\monolib_dircmn.obj & - $(OBJS)\monolib_dynarray.obj & - $(OBJS)\monolib_dynlib.obj & - $(OBJS)\monolib_dynload.obj & - $(OBJS)\monolib_encconv.obj & - $(OBJS)\monolib_evtloopcmn.obj & - $(OBJS)\monolib_extended.obj & - $(OBJS)\monolib_ffile.obj & - $(OBJS)\monolib_file.obj & - $(OBJS)\monolib_fileback.obj & - $(OBJS)\monolib_fileconf.obj & - $(OBJS)\monolib_filefn.obj & - $(OBJS)\monolib_filename.obj & - $(OBJS)\monolib_filesys.obj & - $(OBJS)\monolib_filtall.obj & - $(OBJS)\monolib_filtfind.obj & - $(OBJS)\monolib_fmapbase.obj & - $(OBJS)\monolib_fs_arc.obj & - $(OBJS)\monolib_fs_filter.obj & - $(OBJS)\monolib_hash.obj & - $(OBJS)\monolib_hashmap.obj & - $(OBJS)\monolib_init.obj & - $(OBJS)\monolib_intl.obj & - $(OBJS)\monolib_ipcbase.obj & - $(OBJS)\monolib_languageinfo.obj & - $(OBJS)\monolib_list.obj & - $(OBJS)\monolib_log.obj & - $(OBJS)\monolib_longlong.obj & - $(OBJS)\monolib_memory.obj & - $(OBJS)\monolib_mimecmn.obj & - $(OBJS)\monolib_module.obj & - $(OBJS)\monolib_mstream.obj & - $(OBJS)\monolib_numformatter.obj & - $(OBJS)\monolib_object.obj & - $(OBJS)\monolib_platinfo.obj & - $(OBJS)\monolib_powercmn.obj & - $(OBJS)\monolib_process.obj & - $(OBJS)\monolib_regex.obj & - $(OBJS)\monolib_stdpbase.obj & - $(OBJS)\monolib_sstream.obj & - $(OBJS)\monolib_stdstream.obj & - $(OBJS)\monolib_stopwatch.obj & - $(OBJS)\monolib_strconv.obj & - $(OBJS)\monolib_stream.obj & - $(OBJS)\monolib_string.obj & - $(OBJS)\monolib_stringimpl.obj & - $(OBJS)\monolib_stringops.obj & - $(OBJS)\monolib_strvararg.obj & - $(OBJS)\monolib_sysopt.obj & - $(OBJS)\monolib_tarstrm.obj & - $(OBJS)\monolib_textbuf.obj & - $(OBJS)\monolib_textfile.obj & - $(OBJS)\monolib_threadinfo.obj & - $(OBJS)\monolib_time.obj & - $(OBJS)\monolib_timercmn.obj & - $(OBJS)\monolib_timerimpl.obj & - $(OBJS)\monolib_tokenzr.obj & - $(OBJS)\monolib_translation.obj & - $(OBJS)\monolib_txtstrm.obj & - $(OBJS)\monolib_unichar.obj & - $(OBJS)\monolib_uri.obj & - $(OBJS)\monolib_ustring.obj & - $(OBJS)\monolib_variant.obj & - $(OBJS)\monolib_wfstream.obj & - $(OBJS)\monolib_wxcrt.obj & - $(OBJS)\monolib_wxprintf.obj & - $(OBJS)\monolib_xlocale.obj & - $(OBJS)\monolib_xti.obj & - $(OBJS)\monolib_xtistrm.obj & - $(OBJS)\monolib_zipstrm.obj & - $(OBJS)\monolib_zstream.obj & - $(OBJS)\monolib_fswatchercmn.obj & - $(OBJS)\monolib_fswatcherg.obj & - $(OBJS)\monolib_basemsw.obj & - $(OBJS)\monolib_crashrpt.obj & - $(OBJS)\monolib_debughlp.obj & - $(OBJS)\monolib_dde.obj & - $(OBJS)\monolib_dir.obj & - $(OBJS)\monolib_dlmsw.obj & - $(OBJS)\monolib_evtloopconsole.obj & - $(OBJS)\monolib_mimetype.obj & - $(OBJS)\monolib_power.obj & - $(OBJS)\monolib_regconf.obj & - $(OBJS)\monolib_registry.obj & - $(OBJS)\monolib_snglinst.obj & - $(OBJS)\monolib_stackwalk.obj & - $(OBJS)\monolib_stdpaths.obj & - $(OBJS)\monolib_thread.obj & - $(OBJS)\monolib_timer.obj & - $(OBJS)\monolib_utils.obj & - $(OBJS)\monolib_utilsexc.obj & - $(OBJS)\monolib_fswatcher.obj & - $(OBJS)\monolib_event.obj & - $(OBJS)\monolib_fs_mem.obj & - $(OBJS)\monolib_msgout.obj & - $(OBJS)\monolib_utilscmn.obj & - $(OBJS)\monolib_main.obj & - $(OBJS)\monolib_mslu.obj & - $(OBJS)\monolib_volume.obj & - $(OBJS)\monolib_fs_inet.obj & - $(OBJS)\monolib_ftp.obj & - $(OBJS)\monolib_http.obj & - $(OBJS)\monolib_protocol.obj & - $(OBJS)\monolib_sckaddr.obj & - $(OBJS)\monolib_sckfile.obj & - $(OBJS)\monolib_sckipc.obj & - $(OBJS)\monolib_sckstrm.obj & - $(OBJS)\monolib_socket.obj & - $(OBJS)\monolib_url.obj & - $(OBJS)\monolib_sockmsw.obj & - $(OBJS)\monolib_urlmsw.obj & - $(____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS) & - $(OBJS)\monolib_xml.obj & - $(OBJS)\monolib_xtixml.obj -BASEDLL_CFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 & - -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) -BASEDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 & - -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 /fh=$(OBJS)\wxprec_basedll.pch & - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -BASEDLL_OBJECTS = & - $(OBJS)\basedll_dummy.obj & - $(OBJS)\basedll_any.obj & - $(OBJS)\basedll_appbase.obj & - $(OBJS)\basedll_arcall.obj & - $(OBJS)\basedll_arcfind.obj & - $(OBJS)\basedll_archive.obj & - $(OBJS)\basedll_arrstr.obj & - $(OBJS)\basedll_base64.obj & - $(OBJS)\basedll_clntdata.obj & - $(OBJS)\basedll_cmdline.obj & - $(OBJS)\basedll_config.obj & - $(OBJS)\basedll_convauto.obj & - $(OBJS)\basedll_datetime.obj & - $(OBJS)\basedll_datetimefmt.obj & - $(OBJS)\basedll_datstrm.obj & - $(OBJS)\basedll_dircmn.obj & - $(OBJS)\basedll_dynarray.obj & - $(OBJS)\basedll_dynlib.obj & - $(OBJS)\basedll_dynload.obj & - $(OBJS)\basedll_encconv.obj & - $(OBJS)\basedll_evtloopcmn.obj & - $(OBJS)\basedll_extended.obj & - $(OBJS)\basedll_ffile.obj & - $(OBJS)\basedll_file.obj & - $(OBJS)\basedll_fileback.obj & - $(OBJS)\basedll_fileconf.obj & - $(OBJS)\basedll_filefn.obj & - $(OBJS)\basedll_filename.obj & - $(OBJS)\basedll_filesys.obj & - $(OBJS)\basedll_filtall.obj & - $(OBJS)\basedll_filtfind.obj & - $(OBJS)\basedll_fmapbase.obj & - $(OBJS)\basedll_fs_arc.obj & - $(OBJS)\basedll_fs_filter.obj & - $(OBJS)\basedll_hash.obj & - $(OBJS)\basedll_hashmap.obj & - $(OBJS)\basedll_init.obj & - $(OBJS)\basedll_intl.obj & - $(OBJS)\basedll_ipcbase.obj & - $(OBJS)\basedll_languageinfo.obj & - $(OBJS)\basedll_list.obj & - $(OBJS)\basedll_log.obj & - $(OBJS)\basedll_longlong.obj & - $(OBJS)\basedll_memory.obj & - $(OBJS)\basedll_mimecmn.obj & - $(OBJS)\basedll_module.obj & - $(OBJS)\basedll_mstream.obj & - $(OBJS)\basedll_numformatter.obj & - $(OBJS)\basedll_object.obj & - $(OBJS)\basedll_platinfo.obj & - $(OBJS)\basedll_powercmn.obj & - $(OBJS)\basedll_process.obj & - $(OBJS)\basedll_regex.obj & - $(OBJS)\basedll_stdpbase.obj & - $(OBJS)\basedll_sstream.obj & - $(OBJS)\basedll_stdstream.obj & - $(OBJS)\basedll_stopwatch.obj & - $(OBJS)\basedll_strconv.obj & - $(OBJS)\basedll_stream.obj & - $(OBJS)\basedll_string.obj & - $(OBJS)\basedll_stringimpl.obj & - $(OBJS)\basedll_stringops.obj & - $(OBJS)\basedll_strvararg.obj & - $(OBJS)\basedll_sysopt.obj & - $(OBJS)\basedll_tarstrm.obj & - $(OBJS)\basedll_textbuf.obj & - $(OBJS)\basedll_textfile.obj & - $(OBJS)\basedll_threadinfo.obj & - $(OBJS)\basedll_time.obj & - $(OBJS)\basedll_timercmn.obj & - $(OBJS)\basedll_timerimpl.obj & - $(OBJS)\basedll_tokenzr.obj & - $(OBJS)\basedll_translation.obj & - $(OBJS)\basedll_txtstrm.obj & - $(OBJS)\basedll_unichar.obj & - $(OBJS)\basedll_uri.obj & - $(OBJS)\basedll_ustring.obj & - $(OBJS)\basedll_variant.obj & - $(OBJS)\basedll_wfstream.obj & - $(OBJS)\basedll_wxcrt.obj & - $(OBJS)\basedll_wxprintf.obj & - $(OBJS)\basedll_xlocale.obj & - $(OBJS)\basedll_xti.obj & - $(OBJS)\basedll_xtistrm.obj & - $(OBJS)\basedll_zipstrm.obj & - $(OBJS)\basedll_zstream.obj & - $(OBJS)\basedll_fswatchercmn.obj & - $(OBJS)\basedll_fswatcherg.obj & - $(OBJS)\basedll_basemsw.obj & - $(OBJS)\basedll_crashrpt.obj & - $(OBJS)\basedll_debughlp.obj & - $(OBJS)\basedll_dde.obj & - $(OBJS)\basedll_dir.obj & - $(OBJS)\basedll_dlmsw.obj & - $(OBJS)\basedll_evtloopconsole.obj & - $(OBJS)\basedll_mimetype.obj & - $(OBJS)\basedll_power.obj & - $(OBJS)\basedll_regconf.obj & - $(OBJS)\basedll_registry.obj & - $(OBJS)\basedll_snglinst.obj & - $(OBJS)\basedll_stackwalk.obj & - $(OBJS)\basedll_stdpaths.obj & - $(OBJS)\basedll_thread.obj & - $(OBJS)\basedll_timer.obj & - $(OBJS)\basedll_utils.obj & - $(OBJS)\basedll_utilsexc.obj & - $(OBJS)\basedll_fswatcher.obj & - $(OBJS)\basedll_event.obj & - $(OBJS)\basedll_fs_mem.obj & - $(OBJS)\basedll_msgout.obj & - $(OBJS)\basedll_utilscmn.obj & - $(OBJS)\basedll_main.obj & - $(OBJS)\basedll_mslu.obj & - $(OBJS)\basedll_volume.obj -BASELIB_CFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 & - -dwxUSE_BASE=1 $(CPPFLAGS) $(CFLAGS) -BASELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 & - -dwxUSE_BASE=1 /fh=$(OBJS)\wxprec_baselib.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -BASELIB_OBJECTS = & - $(OBJS)\baselib_dummy.obj & - $(OBJS)\baselib_any.obj & - $(OBJS)\baselib_appbase.obj & - $(OBJS)\baselib_arcall.obj & - $(OBJS)\baselib_arcfind.obj & - $(OBJS)\baselib_archive.obj & - $(OBJS)\baselib_arrstr.obj & - $(OBJS)\baselib_base64.obj & - $(OBJS)\baselib_clntdata.obj & - $(OBJS)\baselib_cmdline.obj & - $(OBJS)\baselib_config.obj & - $(OBJS)\baselib_convauto.obj & - $(OBJS)\baselib_datetime.obj & - $(OBJS)\baselib_datetimefmt.obj & - $(OBJS)\baselib_datstrm.obj & - $(OBJS)\baselib_dircmn.obj & - $(OBJS)\baselib_dynarray.obj & - $(OBJS)\baselib_dynlib.obj & - $(OBJS)\baselib_dynload.obj & - $(OBJS)\baselib_encconv.obj & - $(OBJS)\baselib_evtloopcmn.obj & - $(OBJS)\baselib_extended.obj & - $(OBJS)\baselib_ffile.obj & - $(OBJS)\baselib_file.obj & - $(OBJS)\baselib_fileback.obj & - $(OBJS)\baselib_fileconf.obj & - $(OBJS)\baselib_filefn.obj & - $(OBJS)\baselib_filename.obj & - $(OBJS)\baselib_filesys.obj & - $(OBJS)\baselib_filtall.obj & - $(OBJS)\baselib_filtfind.obj & - $(OBJS)\baselib_fmapbase.obj & - $(OBJS)\baselib_fs_arc.obj & - $(OBJS)\baselib_fs_filter.obj & - $(OBJS)\baselib_hash.obj & - $(OBJS)\baselib_hashmap.obj & - $(OBJS)\baselib_init.obj & - $(OBJS)\baselib_intl.obj & - $(OBJS)\baselib_ipcbase.obj & - $(OBJS)\baselib_languageinfo.obj & - $(OBJS)\baselib_list.obj & - $(OBJS)\baselib_log.obj & - $(OBJS)\baselib_longlong.obj & - $(OBJS)\baselib_memory.obj & - $(OBJS)\baselib_mimecmn.obj & - $(OBJS)\baselib_module.obj & - $(OBJS)\baselib_mstream.obj & - $(OBJS)\baselib_numformatter.obj & - $(OBJS)\baselib_object.obj & - $(OBJS)\baselib_platinfo.obj & - $(OBJS)\baselib_powercmn.obj & - $(OBJS)\baselib_process.obj & - $(OBJS)\baselib_regex.obj & - $(OBJS)\baselib_stdpbase.obj & - $(OBJS)\baselib_sstream.obj & - $(OBJS)\baselib_stdstream.obj & - $(OBJS)\baselib_stopwatch.obj & - $(OBJS)\baselib_strconv.obj & - $(OBJS)\baselib_stream.obj & - $(OBJS)\baselib_string.obj & - $(OBJS)\baselib_stringimpl.obj & - $(OBJS)\baselib_stringops.obj & - $(OBJS)\baselib_strvararg.obj & - $(OBJS)\baselib_sysopt.obj & - $(OBJS)\baselib_tarstrm.obj & - $(OBJS)\baselib_textbuf.obj & - $(OBJS)\baselib_textfile.obj & - $(OBJS)\baselib_threadinfo.obj & - $(OBJS)\baselib_time.obj & - $(OBJS)\baselib_timercmn.obj & - $(OBJS)\baselib_timerimpl.obj & - $(OBJS)\baselib_tokenzr.obj & - $(OBJS)\baselib_translation.obj & - $(OBJS)\baselib_txtstrm.obj & - $(OBJS)\baselib_unichar.obj & - $(OBJS)\baselib_uri.obj & - $(OBJS)\baselib_ustring.obj & - $(OBJS)\baselib_variant.obj & - $(OBJS)\baselib_wfstream.obj & - $(OBJS)\baselib_wxcrt.obj & - $(OBJS)\baselib_wxprintf.obj & - $(OBJS)\baselib_xlocale.obj & - $(OBJS)\baselib_xti.obj & - $(OBJS)\baselib_xtistrm.obj & - $(OBJS)\baselib_zipstrm.obj & - $(OBJS)\baselib_zstream.obj & - $(OBJS)\baselib_fswatchercmn.obj & - $(OBJS)\baselib_fswatcherg.obj & - $(OBJS)\baselib_basemsw.obj & - $(OBJS)\baselib_crashrpt.obj & - $(OBJS)\baselib_debughlp.obj & - $(OBJS)\baselib_dde.obj & - $(OBJS)\baselib_dir.obj & - $(OBJS)\baselib_dlmsw.obj & - $(OBJS)\baselib_evtloopconsole.obj & - $(OBJS)\baselib_mimetype.obj & - $(OBJS)\baselib_power.obj & - $(OBJS)\baselib_regconf.obj & - $(OBJS)\baselib_registry.obj & - $(OBJS)\baselib_snglinst.obj & - $(OBJS)\baselib_stackwalk.obj & - $(OBJS)\baselib_stdpaths.obj & - $(OBJS)\baselib_thread.obj & - $(OBJS)\baselib_timer.obj & - $(OBJS)\baselib_utils.obj & - $(OBJS)\baselib_utilsexc.obj & - $(OBJS)\baselib_fswatcher.obj & - $(OBJS)\baselib_event.obj & - $(OBJS)\baselib_fs_mem.obj & - $(OBJS)\baselib_msgout.obj & - $(OBJS)\baselib_utilscmn.obj & - $(OBJS)\baselib_main.obj & - $(OBJS)\baselib_mslu.obj & - $(OBJS)\baselib_volume.obj -NETDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 & - -dWXUSINGDLL -dWXMAKINGDLL_NET /fh=$(OBJS)\wxprec_netdll.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -NETDLL_OBJECTS = & - $(OBJS)\netdll_dummy.obj & - $(OBJS)\netdll_fs_inet.obj & - $(OBJS)\netdll_ftp.obj & - $(OBJS)\netdll_http.obj & - $(OBJS)\netdll_protocol.obj & - $(OBJS)\netdll_sckaddr.obj & - $(OBJS)\netdll_sckfile.obj & - $(OBJS)\netdll_sckipc.obj & - $(OBJS)\netdll_sckstrm.obj & - $(OBJS)\netdll_socket.obj & - $(OBJS)\netdll_url.obj & - $(OBJS)\netdll_sockmsw.obj & - $(OBJS)\netdll_urlmsw.obj -NETLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 & - /fh=$(OBJS)\wxprec_netlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -NETLIB_OBJECTS = & - $(OBJS)\netlib_dummy.obj & - $(OBJS)\netlib_fs_inet.obj & - $(OBJS)\netlib_ftp.obj & - $(OBJS)\netlib_http.obj & - $(OBJS)\netlib_protocol.obj & - $(OBJS)\netlib_sckaddr.obj & - $(OBJS)\netlib_sckfile.obj & - $(OBJS)\netlib_sckipc.obj & - $(OBJS)\netlib_sckstrm.obj & - $(OBJS)\netlib_socket.obj & - $(OBJS)\netlib_url.obj & - $(OBJS)\netlib_sockmsw.obj & - $(OBJS)\netlib_urlmsw.obj -COREDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL & - -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 /fh=$(OBJS)\wxprec_coredll.pch & - $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -COREDLL_OBJECTS = & - $(OBJS)\coredll_dummy.obj & - $(OBJS)\coredll_event.obj & - $(OBJS)\coredll_fs_mem.obj & - $(OBJS)\coredll_msgout.obj & - $(OBJS)\coredll_utilscmn.obj & - $(OBJS)\coredll_main.obj & - $(OBJS)\coredll_mslu.obj & - $(OBJS)\coredll_volume.obj & - $(____CORE_SRC_FILENAMES_2_OBJECTS) -CORELIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_BASE=0 & - /fh=$(OBJS)\wxprec_corelib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) -CORELIB_OBJECTS = & - $(OBJS)\corelib_dummy.obj & - $(OBJS)\corelib_event.obj & - $(OBJS)\corelib_fs_mem.obj & - $(OBJS)\corelib_msgout.obj & - $(OBJS)\corelib_utilscmn.obj & - $(OBJS)\corelib_main.obj & - $(OBJS)\corelib_mslu.obj & - $(OBJS)\corelib_volume.obj & - $(____CORE_SRC_FILENAMES_3_OBJECTS) -ADVDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL & - -dWXMAKINGDLL_ADV /fh=$(OBJS)\wxprec_advdll.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -ADVDLL_OBJECTS = & - $(OBJS)\advdll_dummy.obj & - $(____ADVANCED_SRC_FILENAMES_2_OBJECTS) -ADVLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & - /fh=$(OBJS)\wxprec_advlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -ADVLIB_OBJECTS = & - $(OBJS)\advlib_dummy.obj & - $(____ADVANCED_SRC_FILENAMES_3_OBJECTS) -MEDIADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL & - -dWXMAKINGDLL_MEDIA /fh=$(OBJS)\wxprec_mediadll.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -MEDIADLL_OBJECTS = & - $(OBJS)\mediadll_dummy.obj & - $(OBJS)\mediadll_mediactrlcmn.obj & - $(OBJS)\mediadll_mediactrl_am.obj & - $(OBJS)\mediadll_mediactrl_wmp10.obj & - $(OBJS)\mediadll_mediactrl_qt.obj -MEDIALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & - /fh=$(OBJS)\wxprec_medialib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) -MEDIALIB_OBJECTS = & - $(OBJS)\medialib_dummy.obj & - $(OBJS)\medialib_mediactrlcmn.obj & - $(OBJS)\medialib_mediactrl_am.obj & - $(OBJS)\medialib_mediactrl_wmp10.obj & - $(OBJS)\medialib_mediactrl_qt.obj -HTMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL & - -dWXMAKINGDLL_HTML /fh=$(OBJS)\wxprec_htmldll.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -HTMLDLL_OBJECTS = & - $(OBJS)\htmldll_dummy.obj & - $(OBJS)\htmldll_helpbest.obj & - $(OBJS)\htmldll_helpctrl.obj & - $(OBJS)\htmldll_helpdata.obj & - $(OBJS)\htmldll_helpdlg.obj & - $(OBJS)\htmldll_helpfrm.obj & - $(OBJS)\htmldll_helpwnd.obj & - $(OBJS)\htmldll_htmlcell.obj & - $(OBJS)\htmldll_htmlfilt.obj & - $(OBJS)\htmldll_htmlpars.obj & - $(OBJS)\htmldll_htmltag.obj & - $(OBJS)\htmldll_htmlwin.obj & - $(OBJS)\htmldll_htmprint.obj & - $(OBJS)\htmldll_m_dflist.obj & - $(OBJS)\htmldll_m_fonts.obj & - $(OBJS)\htmldll_m_hline.obj & - $(OBJS)\htmldll_m_image.obj & - $(OBJS)\htmldll_m_layout.obj & - $(OBJS)\htmldll_m_links.obj & - $(OBJS)\htmldll_m_list.obj & - $(OBJS)\htmldll_m_pre.obj & - $(OBJS)\htmldll_m_span.obj & - $(OBJS)\htmldll_m_style.obj & - $(OBJS)\htmldll_m_tables.obj & - $(OBJS)\htmldll_styleparams.obj & - $(OBJS)\htmldll_winpars.obj & - $(OBJS)\htmldll_htmllbox.obj -HTMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & - /fh=$(OBJS)\wxprec_htmllib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) -HTMLLIB_OBJECTS = & - $(OBJS)\htmllib_dummy.obj & - $(OBJS)\htmllib_helpbest.obj & - $(OBJS)\htmllib_helpctrl.obj & - $(OBJS)\htmllib_helpdata.obj & - $(OBJS)\htmllib_helpdlg.obj & - $(OBJS)\htmllib_helpfrm.obj & - $(OBJS)\htmllib_helpwnd.obj & - $(OBJS)\htmllib_htmlcell.obj & - $(OBJS)\htmllib_htmlfilt.obj & - $(OBJS)\htmllib_htmlpars.obj & - $(OBJS)\htmllib_htmltag.obj & - $(OBJS)\htmllib_htmlwin.obj & - $(OBJS)\htmllib_htmprint.obj & - $(OBJS)\htmllib_m_dflist.obj & - $(OBJS)\htmllib_m_fonts.obj & - $(OBJS)\htmllib_m_hline.obj & - $(OBJS)\htmllib_m_image.obj & - $(OBJS)\htmllib_m_layout.obj & - $(OBJS)\htmllib_m_links.obj & - $(OBJS)\htmllib_m_list.obj & - $(OBJS)\htmllib_m_pre.obj & - $(OBJS)\htmllib_m_span.obj & - $(OBJS)\htmllib_m_style.obj & - $(OBJS)\htmllib_m_tables.obj & - $(OBJS)\htmllib_styleparams.obj & - $(OBJS)\htmllib_winpars.obj & - $(OBJS)\htmllib_htmllbox.obj -WEBVIEWDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL & - -dWXMAKINGDLL_WEBVIEW /fh=$(OBJS)\wxprec_webviewdll.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -WEBVIEWDLL_OBJECTS = & - $(OBJS)\webviewdll_dummy.obj & - $(OBJS)\webviewdll_webview_ie.obj & - $(OBJS)\webviewdll_webview.obj & - $(OBJS)\webviewdll_webviewarchivehandler.obj & - $(OBJS)\webviewdll_webviewfshandler.obj -WEBVIEWLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & - /fh=$(OBJS)\wxprec_webviewlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) -WEBVIEWLIB_OBJECTS = & - $(OBJS)\webviewlib_dummy.obj & - $(OBJS)\webviewlib_webview_ie.obj & - $(OBJS)\webviewlib_webview.obj & - $(OBJS)\webviewlib_webviewarchivehandler.obj & - $(OBJS)\webviewlib_webviewfshandler.obj -QADLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL & - -dWXMAKINGDLL_QA /fh=$(OBJS)\wxprec_qadll.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -QADLL_OBJECTS = & - $(OBJS)\qadll_dummy.obj & - $(OBJS)\qadll_debugrpt.obj & - $(OBJS)\qadll_dbgrptg.obj -QALIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & - /fh=$(OBJS)\wxprec_qalib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -QALIB_OBJECTS = & - $(OBJS)\qalib_dummy.obj & - $(OBJS)\qalib_debugrpt.obj & - $(OBJS)\qalib_dbgrptg.obj -XMLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 & - -dWXUSINGDLL -dWXMAKINGDLL_XML /fh=$(OBJS)\wxprec_xmldll.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -XMLDLL_OBJECTS = & - $(OBJS)\xmldll_dummy.obj & - $(OBJS)\xmldll_xml.obj & - $(OBJS)\xmldll_xtixml.obj -XMLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 & - /fh=$(OBJS)\wxprec_xmllib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -XMLLIB_OBJECTS = & - $(OBJS)\xmllib_dummy.obj & - $(OBJS)\xmllib_xml.obj & - $(OBJS)\xmllib_xtixml.obj -XRCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL & - -dWXMAKINGDLL_XRC /fh=$(OBJS)\wxprec_xrcdll.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -XRCDLL_OBJECTS = & - $(OBJS)\xrcdll_dummy.obj & - $(OBJS)\xrcdll_xh_animatctrl.obj & - $(OBJS)\xrcdll_xh_bannerwindow.obj & - $(OBJS)\xrcdll_xh_bmp.obj & - $(OBJS)\xrcdll_xh_bmpcbox.obj & - $(OBJS)\xrcdll_xh_bmpbt.obj & - $(OBJS)\xrcdll_xh_bttn.obj & - $(OBJS)\xrcdll_xh_cald.obj & - $(OBJS)\xrcdll_xh_chckb.obj & - $(OBJS)\xrcdll_xh_chckl.obj & - $(OBJS)\xrcdll_xh_choic.obj & - $(OBJS)\xrcdll_xh_choicbk.obj & - $(OBJS)\xrcdll_xh_clrpicker.obj & - $(OBJS)\xrcdll_xh_cmdlinkbn.obj & - $(OBJS)\xrcdll_xh_collpane.obj & - $(OBJS)\xrcdll_xh_combo.obj & - $(OBJS)\xrcdll_xh_comboctrl.obj & - $(OBJS)\xrcdll_xh_datectrl.obj & - $(OBJS)\xrcdll_xh_dirpicker.obj & - $(OBJS)\xrcdll_xh_dlg.obj & - $(OBJS)\xrcdll_xh_editlbox.obj & - $(OBJS)\xrcdll_xh_filectrl.obj & - $(OBJS)\xrcdll_xh_filepicker.obj & - $(OBJS)\xrcdll_xh_fontpicker.obj & - $(OBJS)\xrcdll_xh_frame.obj & - $(OBJS)\xrcdll_xh_gauge.obj & - $(OBJS)\xrcdll_xh_gdctl.obj & - $(OBJS)\xrcdll_xh_grid.obj & - $(OBJS)\xrcdll_xh_html.obj & - $(OBJS)\xrcdll_xh_hyperlink.obj & - $(OBJS)\xrcdll_xh_listb.obj & - $(OBJS)\xrcdll_xh_listbk.obj & - $(OBJS)\xrcdll_xh_listc.obj & - $(OBJS)\xrcdll_xh_mdi.obj & - $(OBJS)\xrcdll_xh_menu.obj & - $(OBJS)\xrcdll_xh_notbk.obj & - $(OBJS)\xrcdll_xh_odcombo.obj & - $(OBJS)\xrcdll_xh_panel.obj & - $(OBJS)\xrcdll_xh_propdlg.obj & - $(OBJS)\xrcdll_xh_radbt.obj & - $(OBJS)\xrcdll_xh_radbx.obj & - $(OBJS)\xrcdll_xh_scrol.obj & - $(OBJS)\xrcdll_xh_scwin.obj & - $(OBJS)\xrcdll_xh_htmllbox.obj & - $(OBJS)\xrcdll_xh_sizer.obj & - $(OBJS)\xrcdll_xh_slidr.obj & - $(OBJS)\xrcdll_xh_spin.obj & - $(OBJS)\xrcdll_xh_split.obj & - $(OBJS)\xrcdll_xh_srchctrl.obj & - $(OBJS)\xrcdll_xh_statbar.obj & - $(OBJS)\xrcdll_xh_stbmp.obj & - $(OBJS)\xrcdll_xh_stbox.obj & - $(OBJS)\xrcdll_xh_stlin.obj & - $(OBJS)\xrcdll_xh_sttxt.obj & - $(OBJS)\xrcdll_xh_text.obj & - $(OBJS)\xrcdll_xh_tglbtn.obj & - $(OBJS)\xrcdll_xh_timectrl.obj & - $(OBJS)\xrcdll_xh_toolb.obj & - $(OBJS)\xrcdll_xh_toolbk.obj & - $(OBJS)\xrcdll_xh_tree.obj & - $(OBJS)\xrcdll_xh_treebk.obj & - $(OBJS)\xrcdll_xh_unkwn.obj & - $(OBJS)\xrcdll_xh_wizrd.obj & - $(OBJS)\xrcdll_xmlres.obj & - $(OBJS)\xrcdll_xmladv.obj & - $(OBJS)\xrcdll_xmlrsall.obj -XRCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & - /fh=$(OBJS)\wxprec_xrclib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -XRCLIB_OBJECTS = & - $(OBJS)\xrclib_dummy.obj & - $(OBJS)\xrclib_xh_animatctrl.obj & - $(OBJS)\xrclib_xh_bannerwindow.obj & - $(OBJS)\xrclib_xh_bmp.obj & - $(OBJS)\xrclib_xh_bmpcbox.obj & - $(OBJS)\xrclib_xh_bmpbt.obj & - $(OBJS)\xrclib_xh_bttn.obj & - $(OBJS)\xrclib_xh_cald.obj & - $(OBJS)\xrclib_xh_chckb.obj & - $(OBJS)\xrclib_xh_chckl.obj & - $(OBJS)\xrclib_xh_choic.obj & - $(OBJS)\xrclib_xh_choicbk.obj & - $(OBJS)\xrclib_xh_clrpicker.obj & - $(OBJS)\xrclib_xh_cmdlinkbn.obj & - $(OBJS)\xrclib_xh_collpane.obj & - $(OBJS)\xrclib_xh_combo.obj & - $(OBJS)\xrclib_xh_comboctrl.obj & - $(OBJS)\xrclib_xh_datectrl.obj & - $(OBJS)\xrclib_xh_dirpicker.obj & - $(OBJS)\xrclib_xh_dlg.obj & - $(OBJS)\xrclib_xh_editlbox.obj & - $(OBJS)\xrclib_xh_filectrl.obj & - $(OBJS)\xrclib_xh_filepicker.obj & - $(OBJS)\xrclib_xh_fontpicker.obj & - $(OBJS)\xrclib_xh_frame.obj & - $(OBJS)\xrclib_xh_gauge.obj & - $(OBJS)\xrclib_xh_gdctl.obj & - $(OBJS)\xrclib_xh_grid.obj & - $(OBJS)\xrclib_xh_html.obj & - $(OBJS)\xrclib_xh_hyperlink.obj & - $(OBJS)\xrclib_xh_listb.obj & - $(OBJS)\xrclib_xh_listbk.obj & - $(OBJS)\xrclib_xh_listc.obj & - $(OBJS)\xrclib_xh_mdi.obj & - $(OBJS)\xrclib_xh_menu.obj & - $(OBJS)\xrclib_xh_notbk.obj & - $(OBJS)\xrclib_xh_odcombo.obj & - $(OBJS)\xrclib_xh_panel.obj & - $(OBJS)\xrclib_xh_propdlg.obj & - $(OBJS)\xrclib_xh_radbt.obj & - $(OBJS)\xrclib_xh_radbx.obj & - $(OBJS)\xrclib_xh_scrol.obj & - $(OBJS)\xrclib_xh_scwin.obj & - $(OBJS)\xrclib_xh_htmllbox.obj & - $(OBJS)\xrclib_xh_sizer.obj & - $(OBJS)\xrclib_xh_slidr.obj & - $(OBJS)\xrclib_xh_spin.obj & - $(OBJS)\xrclib_xh_split.obj & - $(OBJS)\xrclib_xh_srchctrl.obj & - $(OBJS)\xrclib_xh_statbar.obj & - $(OBJS)\xrclib_xh_stbmp.obj & - $(OBJS)\xrclib_xh_stbox.obj & - $(OBJS)\xrclib_xh_stlin.obj & - $(OBJS)\xrclib_xh_sttxt.obj & - $(OBJS)\xrclib_xh_text.obj & - $(OBJS)\xrclib_xh_tglbtn.obj & - $(OBJS)\xrclib_xh_timectrl.obj & - $(OBJS)\xrclib_xh_toolb.obj & - $(OBJS)\xrclib_xh_toolbk.obj & - $(OBJS)\xrclib_xh_tree.obj & - $(OBJS)\xrclib_xh_treebk.obj & - $(OBJS)\xrclib_xh_unkwn.obj & - $(OBJS)\xrclib_xh_wizrd.obj & - $(OBJS)\xrclib_xmlres.obj & - $(OBJS)\xrclib_xmladv.obj & - $(OBJS)\xrclib_xmlrsall.obj -AUIDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL & - -dWXMAKINGDLL_AUI /fh=$(OBJS)\wxprec_auidll.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -AUIDLL_OBJECTS = & - $(OBJS)\auidll_dummy.obj & - $(OBJS)\auidll_framemanager.obj & - $(OBJS)\auidll_dockart.obj & - $(OBJS)\auidll_floatpane.obj & - $(OBJS)\auidll_auibook.obj & - $(OBJS)\auidll_auibar.obj & - $(OBJS)\auidll_tabmdi.obj & - $(OBJS)\auidll_tabart.obj & - $(OBJS)\auidll_xh_auinotbk.obj -AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & - /fh=$(OBJS)\wxprec_auilib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -AUILIB_OBJECTS = & - $(OBJS)\auilib_dummy.obj & - $(OBJS)\auilib_framemanager.obj & - $(OBJS)\auilib_dockart.obj & - $(OBJS)\auilib_floatpane.obj & - $(OBJS)\auilib_auibook.obj & - $(OBJS)\auilib_auibar.obj & - $(OBJS)\auilib_tabmdi.obj & - $(OBJS)\auilib_tabart.obj & - $(OBJS)\auilib_xh_auinotbk.obj -RIBBONDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL & - -dWXMAKINGDLL_RIBBON /fh=$(OBJS)\wxprec_ribbondll.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -RIBBONDLL_OBJECTS = & - $(OBJS)\ribbondll_dummy.obj & - $(OBJS)\ribbondll_art_internal.obj & - $(OBJS)\ribbondll_art_msw.obj & - $(OBJS)\ribbondll_art_aui.obj & - $(OBJS)\ribbondll_bar.obj & - $(OBJS)\ribbondll_buttonbar.obj & - $(OBJS)\ribbondll_control.obj & - $(OBJS)\ribbondll_gallery.obj & - $(OBJS)\ribbondll_page.obj & - $(OBJS)\ribbondll_panel.obj & - $(OBJS)\ribbondll_toolbar.obj & - $(OBJS)\ribbondll_xh_ribbon.obj -RIBBONLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & - /fh=$(OBJS)\wxprec_ribbonlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) -RIBBONLIB_OBJECTS = & - $(OBJS)\ribbonlib_dummy.obj & - $(OBJS)\ribbonlib_art_internal.obj & - $(OBJS)\ribbonlib_art_msw.obj & - $(OBJS)\ribbonlib_art_aui.obj & - $(OBJS)\ribbonlib_bar.obj & - $(OBJS)\ribbonlib_buttonbar.obj & - $(OBJS)\ribbonlib_control.obj & - $(OBJS)\ribbonlib_gallery.obj & - $(OBJS)\ribbonlib_page.obj & - $(OBJS)\ribbonlib_panel.obj & - $(OBJS)\ribbonlib_toolbar.obj & - $(OBJS)\ribbonlib_xh_ribbon.obj -PROPGRIDDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL & - -dWXMAKINGDLL_PROPGRID /fh=$(OBJS)\wxprec_propgriddll.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -PROPGRIDDLL_OBJECTS = & - $(OBJS)\propgriddll_dummy.obj & - $(OBJS)\propgriddll_advprops.obj & - $(OBJS)\propgriddll_editors.obj & - $(OBJS)\propgriddll_manager.obj & - $(OBJS)\propgriddll_property.obj & - $(OBJS)\propgriddll_propgrid.obj & - $(OBJS)\propgriddll_propgridiface.obj & - $(OBJS)\propgriddll_propgridpagestate.obj & - $(OBJS)\propgriddll_props.obj -PROPGRIDLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & - /fh=$(OBJS)\wxprec_propgridlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) -PROPGRIDLIB_OBJECTS = & - $(OBJS)\propgridlib_dummy.obj & - $(OBJS)\propgridlib_advprops.obj & - $(OBJS)\propgridlib_editors.obj & - $(OBJS)\propgridlib_manager.obj & - $(OBJS)\propgridlib_property.obj & - $(OBJS)\propgridlib_propgrid.obj & - $(OBJS)\propgridlib_propgridiface.obj & - $(OBJS)\propgridlib_propgridpagestate.obj & - $(OBJS)\propgridlib_props.obj -RICHTEXTDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL & - -dWXMAKINGDLL_RICHTEXT /fh=$(OBJS)\wxprec_richtextdll.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -RICHTEXTDLL_OBJECTS = & - $(OBJS)\richtextdll_dummy.obj & - $(OBJS)\richtextdll_richtextbuffer.obj & - $(OBJS)\richtextdll_richtextctrl.obj & - $(OBJS)\richtextdll_richtextformatdlg.obj & - $(OBJS)\richtextdll_richtexthtml.obj & - $(OBJS)\richtextdll_richtextimagedlg.obj & - $(OBJS)\richtextdll_richtextprint.obj & - $(OBJS)\richtextdll_richtextstyledlg.obj & - $(OBJS)\richtextdll_richtextstyles.obj & - $(OBJS)\richtextdll_richtextsymboldlg.obj & - $(OBJS)\richtextdll_richtextxml.obj & - $(OBJS)\richtextdll_xh_richtext.obj -RICHTEXTLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & - /fh=$(OBJS)\wxprec_richtextlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) & - $(CPPFLAGS) $(CXXFLAGS) -RICHTEXTLIB_OBJECTS = & - $(OBJS)\richtextlib_dummy.obj & - $(OBJS)\richtextlib_richtextbuffer.obj & - $(OBJS)\richtextlib_richtextctrl.obj & - $(OBJS)\richtextlib_richtextformatdlg.obj & - $(OBJS)\richtextlib_richtexthtml.obj & - $(OBJS)\richtextlib_richtextimagedlg.obj & - $(OBJS)\richtextlib_richtextprint.obj & - $(OBJS)\richtextlib_richtextstyledlg.obj & - $(OBJS)\richtextlib_richtextstyles.obj & - $(OBJS)\richtextlib_richtextsymboldlg.obj & - $(OBJS)\richtextlib_richtextxml.obj & - $(OBJS)\richtextlib_xh_richtext.obj -STCDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & - -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\lexlib & - -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS & - -dWXUSINGDLL -dWXMAKINGDLL_STC /fh=$(OBJS)\wxprec_stcdll.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -STCDLL_OBJECTS = & - $(OBJS)\stcdll_dummy.obj & - $(OBJS)\stcdll_stc.obj & - $(OBJS)\stcdll_PlatWX.obj & - $(OBJS)\stcdll_ScintillaWX.obj -STCLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & - -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\lexlib & - -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS & - /fh=$(OBJS)\wxprec_stclib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -STCLIB_OBJECTS = & - $(OBJS)\stclib_dummy.obj & - $(OBJS)\stclib_stc.obj & - $(OBJS)\stclib_PlatWX.obj & - $(OBJS)\stclib_ScintillaWX.obj -GLDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL & - -dWXMAKINGDLL_GL /fh=$(OBJS)\wxprec_gldll.pch $(__RTTIFLAG) & - $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) -GLDLL_OBJECTS = & - $(OBJS)\gldll_dummy.obj & - $(OBJS)\gldll_glcmn.obj & - $(OBJS)\gldll_glcanvas.obj -GLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & - $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & - $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & - $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include & - $(____CAIRO_INCLUDEDIR_FILENAMES) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 & - -dWXBUILDING -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png & - -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib & - /fh=$(OBJS)\wxprec_gllib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) & - $(CXXFLAGS) -GLLIB_OBJECTS = & - $(OBJS)\gllib_dummy.obj & - $(OBJS)\gllib_glcmn.obj & - $(OBJS)\gllib_glcanvas.obj -BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg - - -all : $(OBJS) -$(OBJS) : - -if not exist $(OBJS) mkdir $(OBJS) - -### Targets: ### - -all : .SYMBOLIC setup_h $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(__wxscintilla) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) build_cfg_file - -clean : .SYMBOLIC - -if exist $(OBJS)\*.obj del $(OBJS)\*.obj - -if exist $(OBJS)\*.res del $(OBJS)\*.res - -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc - -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk - -if exist $(OBJS)\*.pch del $(OBJS)\*.pch - -if exist $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib del $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib - -if exist $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib del $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib - -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib - cd ..\..\samples - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) - -setup_h : .SYMBOLIC $(SETUPHDIR)\wx ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h $(SETUPHDIR)\wx\msw\rcdefs.h - -$(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib : $(WXREGEX_OBJECTS) - @%create $(OBJS)\wxregex.lbc - @for %i in ($(WXREGEX_OBJECTS)) do @%append $(OBJS)\wxregex.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\wxregex.lbc - -$(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib : $(WXZLIB_OBJECTS) - @%create $(OBJS)\wxzlib.lbc - @for %i in ($(WXZLIB_OBJECTS)) do @%append $(OBJS)\wxzlib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\wxzlib.lbc - -!ifeq USE_GUI 1 -$(LIBDIRNAME)\wxpng$(WXDEBUGFLAG).lib : $(WXPNG_OBJECTS) - @%create $(OBJS)\wxpng.lbc - @for %i in ($(WXPNG_OBJECTS)) do @%append $(OBJS)\wxpng.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\wxpng.lbc -!endif - -!ifeq USE_GUI 1 -$(LIBDIRNAME)\wxjpeg$(WXDEBUGFLAG).lib : $(WXJPEG_OBJECTS) - @%create $(OBJS)\wxjpeg.lbc - @for %i in ($(WXJPEG_OBJECTS)) do @%append $(OBJS)\wxjpeg.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\wxjpeg.lbc -!endif - -!ifeq USE_GUI 1 -$(LIBDIRNAME)\wxtiff$(WXDEBUGFLAG).lib : $(WXTIFF_OBJECTS) - @%create $(OBJS)\wxtiff.lbc - @for %i in ($(WXTIFF_OBJECTS)) do @%append $(OBJS)\wxtiff.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\wxtiff.lbc -!endif - -$(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib : $(WXEXPAT_OBJECTS) - @%create $(OBJS)\wxexpat.lbc - @for %i in ($(WXEXPAT_OBJECTS)) do @%append $(OBJS)\wxexpat.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\wxexpat.lbc - -!ifeq USE_STC 1 -$(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib : $(WXSCINTILLA_OBJECTS) - @%create $(OBJS)\wxscintilla.lbc - @for %i in ($(WXSCINTILLA_OBJECTS)) do @%append $(OBJS)\wxscintilla.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\wxscintilla.lbc -!endif - -!ifeq MONOLITHIC 1 -!ifeq SHARED 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll : $(MONODLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\monodll_version.res $(__wxscintilla_library_link_DEP) - @%create $(OBJS)\monodll.lbc - @%append $(OBJS)\monodll.lbc option quiet - @%append $(OBJS)\monodll.lbc name $^@ - @%append $(OBJS)\monodll.lbc option caseexact - @%append $(OBJS)\monodll.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) - @for %i in ($(MONODLL_OBJECTS)) do @%append $(OBJS)\monodll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__wxscintilla)) do @%append $(OBJS)\monodll.lbc library %i - @%append $(OBJS)\monodll.lbc option resource=$(OBJS)\monodll_version.res - @%append $(OBJS)\monodll.lbc system nt_dll - wlink @$(OBJS)\monodll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +$^@ -!endif -!endif - -!ifeq MONOLITHIC 1 -!ifeq SHARED 0 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib : $(MONOLIB_OBJECTS) - @%create $(OBJS)\monolib.lbc - @for %i in ($(MONOLIB_OBJECTS)) do @%append $(OBJS)\monolib.lbc +%i - wlib -q -p8192 -n -b $^@ @$(OBJS)\monolib.lbc -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG).dll : $(BASEDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\basedll_version.res - @%create $(OBJS)\basedll.lbc - @%append $(OBJS)\basedll.lbc option quiet - @%append $(OBJS)\basedll.lbc name $^@ - @%append $(OBJS)\basedll.lbc option caseexact - @%append $(OBJS)\basedll.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) - @for %i in ($(BASEDLL_OBJECTS)) do @%append $(OBJS)\basedll.lbc file %i - @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib) do @%append $(OBJS)\basedll.lbc library %i - @%append $(OBJS)\basedll.lbc option resource=$(OBJS)\basedll_version.res - @%append $(OBJS)\basedll.lbc system nt_dll - wlink @$(OBJS)\basedll.lbc - wlib -q -n -b $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib +$^@ -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib : $(BASELIB_OBJECTS) - @%create $(OBJS)\baselib.lbc - @for %i in ($(BASELIB_OBJECTS)) do @%append $(OBJS)\baselib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\baselib.lbc -!endif -!endif - -!ifeq MONOLITHIC 0 -wxbase : .SYMBOLIC $(____wxbase_namedll_DEP) $(____wxbase_namelib_DEP) -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG).dll : $(NETDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\netdll_version.res $(__basedll___depname) - @%create $(OBJS)\netdll.lbc - @%append $(OBJS)\netdll.lbc option quiet - @%append $(OBJS)\netdll.lbc name $^@ - @%append $(OBJS)\netdll.lbc option caseexact - @%append $(OBJS)\netdll.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) - @for %i in ($(NETDLL_OBJECTS)) do @%append $(OBJS)\netdll.lbc file %i - @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\netdll.lbc library %i - @%append $(OBJS)\netdll.lbc option resource=$(OBJS)\netdll_version.res - @%append $(OBJS)\netdll.lbc system nt_dll - wlink @$(OBJS)\netdll.lbc - wlib -q -n -b $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +$^@ -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib : $(NETLIB_OBJECTS) - @%create $(OBJS)\netlib.lbc - @for %i in ($(NETLIB_OBJECTS)) do @%append $(OBJS)\netlib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\netlib.lbc -!endif -!endif - -!ifeq MONOLITHIC 0 -wxnet : .SYMBOLIC $(____wxnet_namedll_DEP) $(____wxnet_namelib_DEP) -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG).dll : $(COREDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\coredll_version.res $(__basedll___depname) - @%create $(OBJS)\coredll.lbc - @%append $(OBJS)\coredll.lbc option quiet - @%append $(OBJS)\coredll.lbc name $^@ - @%append $(OBJS)\coredll.lbc option caseexact - @%append $(OBJS)\coredll.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) - @for %i in ($(COREDLL_OBJECTS)) do @%append $(OBJS)\coredll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\coredll.lbc library %i - @%append $(OBJS)\coredll.lbc option resource=$(OBJS)\coredll_version.res - @%append $(OBJS)\coredll.lbc system nt_dll - wlink @$(OBJS)\coredll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +$^@ -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib : $(CORELIB_OBJECTS) - @%create $(OBJS)\corelib.lbc - @for %i in ($(CORELIB_OBJECTS)) do @%append $(OBJS)\corelib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\corelib.lbc -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_GUI 1 -wxcore : .SYMBOLIC $(____wxcore_namedll_DEP) $(____wxcore_namelib_DEP) -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG).dll : $(ADVDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\advdll_version.res $(__coredll___depname) $(__basedll___depname) - @%create $(OBJS)\advdll.lbc - @%append $(OBJS)\advdll.lbc option quiet - @%append $(OBJS)\advdll.lbc name $^@ - @%append $(OBJS)\advdll.lbc option caseexact - @%append $(OBJS)\advdll.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) - @for %i in ($(ADVDLL_OBJECTS)) do @%append $(OBJS)\advdll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\advdll.lbc library %i - @%append $(OBJS)\advdll.lbc option resource=$(OBJS)\advdll_version.res - @%append $(OBJS)\advdll.lbc system nt_dll - wlink @$(OBJS)\advdll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib +$^@ -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib : $(ADVLIB_OBJECTS) - @%create $(OBJS)\advlib.lbc - @for %i in ($(ADVLIB_OBJECTS)) do @%append $(OBJS)\advlib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\advlib.lbc -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_GUI 1 -wxadv : .SYMBOLIC $(____wxadv_namedll_DEP) $(____wxadv_namelib_DEP) -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_MEDIA 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG).dll : $(MEDIADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\mediadll_version.res $(__coredll___depname) $(__basedll___depname) - @%create $(OBJS)\mediadll.lbc - @%append $(OBJS)\mediadll.lbc option quiet - @%append $(OBJS)\mediadll.lbc name $^@ - @%append $(OBJS)\mediadll.lbc option caseexact - @%append $(OBJS)\mediadll.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) - @for %i in ($(MEDIADLL_OBJECTS)) do @%append $(OBJS)\mediadll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\mediadll.lbc library %i - @%append $(OBJS)\mediadll.lbc option resource=$(OBJS)\mediadll_version.res - @%append $(OBJS)\mediadll.lbc system nt_dll - wlink @$(OBJS)\mediadll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib +$^@ -!endif -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_MEDIA 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media.lib : $(MEDIALIB_OBJECTS) - @%create $(OBJS)\medialib.lbc - @for %i in ($(MEDIALIB_OBJECTS)) do @%append $(OBJS)\medialib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\medialib.lbc -!endif -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_GUI 1 -!ifeq USE_MEDIA 1 -wxmedia : .SYMBOLIC $(____wxmedia_namedll_DEP) $(____wxmedia_namelib_DEP) -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_HTML 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG).dll : $(HTMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\htmldll_version.res $(__coredll___depname) $(__basedll___depname) - @%create $(OBJS)\htmldll.lbc - @%append $(OBJS)\htmldll.lbc option quiet - @%append $(OBJS)\htmldll.lbc name $^@ - @%append $(OBJS)\htmldll.lbc option caseexact - @%append $(OBJS)\htmldll.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) - @for %i in ($(HTMLDLL_OBJECTS)) do @%append $(OBJS)\htmldll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\htmldll.lbc library %i - @%append $(OBJS)\htmldll.lbc option resource=$(OBJS)\htmldll_version.res - @%append $(OBJS)\htmldll.lbc system nt_dll - wlink @$(OBJS)\htmldll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib +$^@ -!endif -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_HTML 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib : $(HTMLLIB_OBJECTS) - @%create $(OBJS)\htmllib.lbc - @for %i in ($(HTMLLIB_OBJECTS)) do @%append $(OBJS)\htmllib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\htmllib.lbc -!endif -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_HTML 1 -wxhtml : .SYMBOLIC $(____wxhtml_namedll_DEP) $(____wxhtml_namelib_DEP) -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_WEBVIEW 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG).dll : $(WEBVIEWDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\webviewdll_version.res $(__coredll___depname) $(__basedll___depname) - @%create $(OBJS)\webviewdll.lbc - @%append $(OBJS)\webviewdll.lbc option quiet - @%append $(OBJS)\webviewdll.lbc name $^@ - @%append $(OBJS)\webviewdll.lbc option caseexact - @%append $(OBJS)\webviewdll.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) - @for %i in ($(WEBVIEWDLL_OBJECTS)) do @%append $(OBJS)\webviewdll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\webviewdll.lbc library %i - @%append $(OBJS)\webviewdll.lbc option resource=$(OBJS)\webviewdll_version.res - @%append $(OBJS)\webviewdll.lbc system nt_dll - wlink @$(OBJS)\webviewdll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib +$^@ -!endif -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_WEBVIEW 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview.lib : $(WEBVIEWLIB_OBJECTS) - @%create $(OBJS)\webviewlib.lbc - @for %i in ($(WEBVIEWLIB_OBJECTS)) do @%append $(OBJS)\webviewlib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\webviewlib.lbc -!endif -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_WEBVIEW 1 -wxwebview : .SYMBOLIC $(____wxwebview_namedll_DEP) $(____wxwebview_namelib_DEP) -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_QA 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG).dll : $(QADLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\qadll_version.res $(__coredll___depname) $(__basedll___depname) $(__xmldll___depname) - @%create $(OBJS)\qadll.lbc - @%append $(OBJS)\qadll.lbc option quiet - @%append $(OBJS)\qadll.lbc name $^@ - @%append $(OBJS)\qadll.lbc option caseexact - @%append $(OBJS)\qadll.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) - @for %i in ($(QADLL_OBJECTS)) do @%append $(OBJS)\qadll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib) do @%append $(OBJS)\qadll.lbc library %i - @%append $(OBJS)\qadll.lbc option resource=$(OBJS)\qadll_version.res - @%append $(OBJS)\qadll.lbc system nt_dll - wlink @$(OBJS)\qadll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib +$^@ -!endif -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_QA 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa.lib : $(QALIB_OBJECTS) - @%create $(OBJS)\qalib.lbc - @for %i in ($(QALIB_OBJECTS)) do @%append $(OBJS)\qalib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\qalib.lbc -!endif -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_QA 1 -wxqa : .SYMBOLIC $(____wxqa_namedll_DEP) $(____wxqa_namelib_DEP) -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG).dll : $(XMLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xmldll_version.res $(__basedll___depname) - @%create $(OBJS)\xmldll.lbc - @%append $(OBJS)\xmldll.lbc option quiet - @%append $(OBJS)\xmldll.lbc name $^@ - @%append $(OBJS)\xmldll.lbc option caseexact - @%append $(OBJS)\xmldll.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) - @for %i in ($(XMLDLL_OBJECTS)) do @%append $(OBJS)\xmldll.lbc file %i - @for %i in ( wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib ) do @%append $(OBJS)\xmldll.lbc library %i - @%append $(OBJS)\xmldll.lbc option resource=$(OBJS)\xmldll_version.res - @%append $(OBJS)\xmldll.lbc system nt_dll - wlink @$(OBJS)\xmldll.lbc - wlib -q -n -b $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib +$^@ -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -$(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib : $(XMLLIB_OBJECTS) - @%create $(OBJS)\xmllib.lbc - @for %i in ($(XMLLIB_OBJECTS)) do @%append $(OBJS)\xmllib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\xmllib.lbc -!endif -!endif - -!ifeq MONOLITHIC 0 -wxxml : .SYMBOLIC $(____wxxml_namedll_DEP) $(____wxxml_namelib_DEP) -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_XRC 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG).dll : $(XRCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\xrcdll_version.res $(__htmldll_library_link_DEP) $(__advdll___depname) $(__coredll___depname) $(__xmldll___depname) $(__basedll___depname) - @%create $(OBJS)\xrcdll.lbc - @%append $(OBJS)\xrcdll.lbc option quiet - @%append $(OBJS)\xrcdll.lbc name $^@ - @%append $(OBJS)\xrcdll.lbc option caseexact - @%append $(OBJS)\xrcdll.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) - @for %i in ($(XRCDLL_OBJECTS)) do @%append $(OBJS)\xrcdll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\xrcdll.lbc library %i - @%append $(OBJS)\xrcdll.lbc option resource=$(OBJS)\xrcdll_version.res - @%append $(OBJS)\xrcdll.lbc system nt_dll - wlink @$(OBJS)\xrcdll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib +$^@ -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_XRC 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib : $(XRCLIB_OBJECTS) - @%create $(OBJS)\xrclib.lbc - @for %i in ($(XRCLIB_OBJECTS)) do @%append $(OBJS)\xrclib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\xrclib.lbc -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_XRC 1 -wxxrc : .SYMBOLIC $(____wxxrc_namedll_DEP) $(____wxxrc_namelib_DEP) -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_AUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG).dll : $(AUIDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\auidll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - @%create $(OBJS)\auidll.lbc - @%append $(OBJS)\auidll.lbc option quiet - @%append $(OBJS)\auidll.lbc name $^@ - @%append $(OBJS)\auidll.lbc option caseexact - @%append $(OBJS)\auidll.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) - @for %i in ($(AUIDLL_OBJECTS)) do @%append $(OBJS)\auidll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\auidll.lbc library %i - @%append $(OBJS)\auidll.lbc option resource=$(OBJS)\auidll_version.res - @%append $(OBJS)\auidll.lbc system nt_dll - wlink @$(OBJS)\auidll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib +$^@ -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_AUI 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib : $(AUILIB_OBJECTS) - @%create $(OBJS)\auilib.lbc - @for %i in ($(AUILIB_OBJECTS)) do @%append $(OBJS)\auilib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\auilib.lbc -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_AUI 1 -wxaui : .SYMBOLIC $(____wxaui_namedll_DEP) $(____wxaui_namelib_DEP) -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_RIBBON 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).dll : $(RIBBONDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\ribbondll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - @%create $(OBJS)\ribbondll.lbc - @%append $(OBJS)\ribbondll.lbc option quiet - @%append $(OBJS)\ribbondll.lbc name $^@ - @%append $(OBJS)\ribbondll.lbc option caseexact - @%append $(OBJS)\ribbondll.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) - @for %i in ($(RIBBONDLL_OBJECTS)) do @%append $(OBJS)\ribbondll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\ribbondll.lbc library %i - @%append $(OBJS)\ribbondll.lbc option resource=$(OBJS)\ribbondll_version.res - @%append $(OBJS)\ribbondll.lbc system nt_dll - wlink @$(OBJS)\ribbondll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib +$^@ -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_RIBBON 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib : $(RIBBONLIB_OBJECTS) - @%create $(OBJS)\ribbonlib.lbc - @for %i in ($(RIBBONLIB_OBJECTS)) do @%append $(OBJS)\ribbonlib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\ribbonlib.lbc -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_RIBBON 1 -wxribbon : .SYMBOLIC $(____wxribbon_namedll_DEP) $(____wxribbon_namelib_DEP) -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_PROPGRID 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG).dll : $(PROPGRIDDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\propgriddll_version.res $(__advdll___depname) $(__coredll___depname) $(__basedll___depname) - @%create $(OBJS)\propgriddll.lbc - @%append $(OBJS)\propgriddll.lbc option quiet - @%append $(OBJS)\propgriddll.lbc name $^@ - @%append $(OBJS)\propgriddll.lbc option caseexact - @%append $(OBJS)\propgriddll.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) - @for %i in ($(PROPGRIDDLL_OBJECTS)) do @%append $(OBJS)\propgriddll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\propgriddll.lbc library %i - @%append $(OBJS)\propgriddll.lbc option resource=$(OBJS)\propgriddll_version.res - @%append $(OBJS)\propgriddll.lbc system nt_dll - wlink @$(OBJS)\propgriddll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib +$^@ -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_PROPGRID 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid.lib : $(PROPGRIDLIB_OBJECTS) - @%create $(OBJS)\propgridlib.lbc - @for %i in ($(PROPGRIDLIB_OBJECTS)) do @%append $(OBJS)\propgridlib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\propgridlib.lbc -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_PROPGRID 1 -wxpropgrid : .SYMBOLIC $(____wxpropgrid_namedll_DEP) $(____wxpropgrid_namelib_DEP) -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_RICHTEXT 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG).dll : $(RICHTEXTDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\richtextdll_version.res $(__advdll___depname) $(__htmldll_library_link_DEP) $(__xmldll___depname) $(__coredll___depname) $(__basedll___depname) - @%create $(OBJS)\richtextdll.lbc - @%append $(OBJS)\richtextdll.lbc option quiet - @%append $(OBJS)\richtextdll.lbc name $^@ - @%append $(OBJS)\richtextdll.lbc option caseexact - @%append $(OBJS)\richtextdll.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) - @for %i in ($(RICHTEXTDLL_OBJECTS)) do @%append $(OBJS)\richtextdll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib $(__htmldll_library_link_LIBR) $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\richtextdll.lbc library %i - @%append $(OBJS)\richtextdll.lbc option resource=$(OBJS)\richtextdll_version.res - @%append $(OBJS)\richtextdll.lbc system nt_dll - wlink @$(OBJS)\richtextdll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib +$^@ -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_RICHTEXT 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext.lib : $(RICHTEXTLIB_OBJECTS) - @%create $(OBJS)\richtextlib.lbc - @for %i in ($(RICHTEXTLIB_OBJECTS)) do @%append $(OBJS)\richtextlib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\richtextlib.lbc -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_RICHTEXT 1 -wxrichtext : .SYMBOLIC $(____wxrichtext_namedll_DEP) $(____wxrichtext_namelib_DEP) -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 1 -!ifeq USE_STC 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG).dll : $(STCDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(__wxscintilla) $(OBJS)\stcdll_version.res $(__coredll___depname) $(__basedll___depname) - @%create $(OBJS)\stcdll.lbc - @%append $(OBJS)\stcdll.lbc option quiet - @%append $(OBJS)\stcdll.lbc name $^@ - @%append $(OBJS)\stcdll.lbc option caseexact - @%append $(OBJS)\stcdll.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) - @for %i in ($(STCDLL_OBJECTS)) do @%append $(OBJS)\stcdll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(LIBDIRNAME)\wxscintilla$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib $(LIBDIRNAME)\wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib) do @%append $(OBJS)\stcdll.lbc library %i - @%append $(OBJS)\stcdll.lbc option resource=$(OBJS)\stcdll_version.res - @%append $(OBJS)\stcdll.lbc system nt_dll - wlink @$(OBJS)\stcdll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib +$^@ -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq SHARED 0 -!ifeq USE_STC 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib : $(STCLIB_OBJECTS) $(__wxscintilla) - @%create $(OBJS)\stclib.lbc - @for %i in ($(STCLIB_OBJECTS)) do @%append $(OBJS)\stclib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\stclib.lbc -!endif -!endif -!endif - -!ifeq MONOLITHIC 0 -!ifeq USE_STC 1 -wxstc : .SYMBOLIC $(____wxstc_namedll_DEP) $(____wxstc_namelib_DEP) -!endif -!endif - -!ifeq SHARED 1 -!ifeq USE_GUI 1 -!ifeq USE_OPENGL 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG).dll : $(GLDLL_OBJECTS) $(__wxtiff___depname) $(__wxjpeg___depname) $(__wxpng___depname) $(__wxscintilla) $(LIBDIRNAME)\wxexpat$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxzlib$(WXDEBUGFLAG).lib $(LIBDIRNAME)\wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib $(OBJS)\gldll_version.res $(__basedll___depname) $(__coredll___depname) $(__monodll___depname) - @%create $(OBJS)\gldll.lbc - @%append $(OBJS)\gldll.lbc option quiet - @%append $(OBJS)\gldll.lbc name $^@ - @%append $(OBJS)\gldll.lbc option caseexact - @%append $(OBJS)\gldll.lbc $(__DEBUGINFO_4) libpath $(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) - @for %i in ($(GLDLL_OBJECTS)) do @%append $(OBJS)\gldll.lbc file %i - @for %i in ( $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__CAIRO_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib $(__WXLIBGLDEP_CORE_p) $(__WXLIBGLDEP_BASE_p) $(__WXLIB_MONO_p) opengl32.lib glu32.lib) do @%append $(OBJS)\gldll.lbc library %i - @%append $(OBJS)\gldll.lbc option resource=$(OBJS)\gldll_version.res - @%append $(OBJS)\gldll.lbc system nt_dll - wlink @$(OBJS)\gldll.lbc - wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib +$^@ -!endif -!endif -!endif - -!ifeq SHARED 0 -!ifeq USE_GUI 1 -!ifeq USE_OPENGL 1 -$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl.lib : $(GLLIB_OBJECTS) - @%create $(OBJS)\gllib.lbc - @for %i in ($(GLLIB_OBJECTS)) do @%append $(OBJS)\gllib.lbc +%i - wlib -q -p4096 -n -b $^@ @$(OBJS)\gllib.lbc -!endif -!endif -!endif - -!ifeq USE_GUI 1 -!ifeq USE_OPENGL 1 -wxgl : .SYMBOLIC $(____wxgl_namedll_DEP) $(____wxgl_namelib_DEP) -!endif -!endif - -samples : .SYMBOLIC - cd ..\..\samples - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - -$(LIBDIRNAME) : - if not exist $(LIBDIRNAME) mkdir $(LIBDIRNAME) - -$(SETUPHDIR) : $(LIBDIRNAME) - if not exist $(SETUPHDIR) mkdir $(SETUPHDIR) - -$(SETUPHDIR)\wx : $(SETUPHDIR) - if not exist $(SETUPHDIR)\wx mkdir $(SETUPHDIR)\wx - -..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h : - if not exist ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup0.h ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h - -$(SETUPHDIR)\wx\setup.h : - if not exist $(SETUPHDIR)\wx\setup.h copy ..\..\include\wx\$(__SETUP_H_SUBDIR_FILENAMES)\setup.h $(SETUPHDIR)\wx\setup.h - -$(SETUPHDIR)\wx\msw : $(SETUPHDIR)\wx - if not exist $(SETUPHDIR)\wx\msw mkdir $(SETUPHDIR)\wx\msw - -$(SETUPHDIR)\wx\msw\rcdefs.h : $(SETUPHDIR)\wx\msw ..\..\include\wx\msw\genrcdefs.h - $(CPP) "..\..\include\wx\msw\genrcdefs.h" > "$(SETUPHDIR)\wx\msw\rcdefs.h" - -build_cfg_file : .SYMBOLIC $(SETUPHDIR) - @echo WXVER_MAJOR=3 >$(BUILD_CFG_FILE) - @echo WXVER_MINOR=0 >>$(BUILD_CFG_FILE) - @echo WXVER_RELEASE=1 >>$(BUILD_CFG_FILE) - @echo BUILD=$(BUILD) >>$(BUILD_CFG_FILE) - @echo MONOLITHIC=$(MONOLITHIC) >>$(BUILD_CFG_FILE) - @echo SHARED=$(SHARED) >>$(BUILD_CFG_FILE) - @echo UNICODE=$(UNICODE) >>$(BUILD_CFG_FILE) - @echo TOOLKIT=MSW >>$(BUILD_CFG_FILE) - @echo TOOLKIT_VERSION=$(TOOLKIT_VERSION) >>$(BUILD_CFG_FILE) - @echo WXUNIV=$(WXUNIV) >>$(BUILD_CFG_FILE) - @echo CFG=$(CFG) >>$(BUILD_CFG_FILE) - @echo VENDOR=$(VENDOR) >>$(BUILD_CFG_FILE) - @echo OFFICIAL_BUILD=$(OFFICIAL_BUILD) >>$(BUILD_CFG_FILE) - @echo DEBUG_FLAG=$(DEBUG_FLAG) >>$(BUILD_CFG_FILE) - @echo DEBUG_INFO=$(DEBUG_INFO) >>$(BUILD_CFG_FILE) - @echo RUNTIME_LIBS=$(RUNTIME_LIBS) >>$(BUILD_CFG_FILE) - @echo MSLU=0 >>$(BUILD_CFG_FILE) - @echo USE_EXCEPTIONS=$(USE_EXCEPTIONS) >>$(BUILD_CFG_FILE) - @echo USE_RTTI=$(USE_RTTI) >>$(BUILD_CFG_FILE) - @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE) - @echo USE_AUI=$(USE_AUI) >>$(BUILD_CFG_FILE) - @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE) - @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE) - @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE) - @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE) - @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE) - @echo USE_PROPGRID=$(USE_PROPGRID) >>$(BUILD_CFG_FILE) - @echo USE_RIBBON=$(USE_RIBBON) >>$(BUILD_CFG_FILE) - @echo USE_RICHTEXT=$(USE_RICHTEXT) >>$(BUILD_CFG_FILE) - @echo USE_STC=$(USE_STC) >>$(BUILD_CFG_FILE) - @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE) - @echo USE_XRC=$(USE_XRC) >>$(BUILD_CFG_FILE) - @echo COMPILER=wat >>$(BUILD_CFG_FILE) - @echo COMPILER_VERSION=$(COMPILER_VERSION) >>$(BUILD_CFG_FILE) - @echo CC=$(CC) >>$(BUILD_CFG_FILE) - @echo CXX=$(CXX) >>$(BUILD_CFG_FILE) - @echo CFLAGS=$(CFLAGS) >>$(BUILD_CFG_FILE) - @echo CPPFLAGS=$(CPPFLAGS) >>$(BUILD_CFG_FILE) - @echo CXXFLAGS=$(CXXFLAGS) >>$(BUILD_CFG_FILE) - @echo LDFLAGS=$(LDFLAGS) >>$(BUILD_CFG_FILE) - -$(OBJS)\wxregex_regcomp.obj : .AUTODEPEND ..\..\src\regex\regcomp.c - $(CC) -bt=nt -zq -fo=$^@ $(WXREGEX_CFLAGS) $< - -$(OBJS)\wxregex_regexec.obj : .AUTODEPEND ..\..\src\regex\regexec.c - $(CC) -bt=nt -zq -fo=$^@ $(WXREGEX_CFLAGS) $< - -$(OBJS)\wxregex_regerror.obj : .AUTODEPEND ..\..\src\regex\regerror.c - $(CC) -bt=nt -zq -fo=$^@ $(WXREGEX_CFLAGS) $< - -$(OBJS)\wxregex_regfree.obj : .AUTODEPEND ..\..\src\regex\regfree.c - $(CC) -bt=nt -zq -fo=$^@ $(WXREGEX_CFLAGS) $< - -$(OBJS)\wxzlib_adler32.obj : .AUTODEPEND ..\..\src\zlib\adler32.c - $(CC) -bt=nt -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_compress.obj : .AUTODEPEND ..\..\src\zlib\compress.c - $(CC) -bt=nt -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_crc32.obj : .AUTODEPEND ..\..\src\zlib\crc32.c - $(CC) -bt=nt -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_deflate.obj : .AUTODEPEND ..\..\src\zlib\deflate.c - $(CC) -bt=nt -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_gzclose.obj : .AUTODEPEND ..\..\src\zlib\gzclose.c - $(CC) -bt=nt -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_gzlib.obj : .AUTODEPEND ..\..\src\zlib\gzlib.c - $(CC) -bt=nt -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_gzread.obj : .AUTODEPEND ..\..\src\zlib\gzread.c - $(CC) -bt=nt -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_gzwrite.obj : .AUTODEPEND ..\..\src\zlib\gzwrite.c - $(CC) -bt=nt -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_infback.obj : .AUTODEPEND ..\..\src\zlib\infback.c - $(CC) -bt=nt -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_inffast.obj : .AUTODEPEND ..\..\src\zlib\inffast.c - $(CC) -bt=nt -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_inflate.obj : .AUTODEPEND ..\..\src\zlib\inflate.c - $(CC) -bt=nt -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_inftrees.obj : .AUTODEPEND ..\..\src\zlib\inftrees.c - $(CC) -bt=nt -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_trees.obj : .AUTODEPEND ..\..\src\zlib\trees.c - $(CC) -bt=nt -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_uncompr.obj : .AUTODEPEND ..\..\src\zlib\uncompr.c - $(CC) -bt=nt -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxzlib_zutil.obj : .AUTODEPEND ..\..\src\zlib\zutil.c - $(CC) -bt=nt -zq -fo=$^@ $(WXZLIB_CFLAGS) $< - -$(OBJS)\wxpng_png.obj : .AUTODEPEND ..\..\src\png\png.c - $(CC) -bt=nt -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngerror.obj : .AUTODEPEND ..\..\src\png\pngerror.c - $(CC) -bt=nt -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngget.obj : .AUTODEPEND ..\..\src\png\pngget.c - $(CC) -bt=nt -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngmem.obj : .AUTODEPEND ..\..\src\png\pngmem.c - $(CC) -bt=nt -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngpread.obj : .AUTODEPEND ..\..\src\png\pngpread.c - $(CC) -bt=nt -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngread.obj : .AUTODEPEND ..\..\src\png\pngread.c - $(CC) -bt=nt -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngrio.obj : .AUTODEPEND ..\..\src\png\pngrio.c - $(CC) -bt=nt -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngrtran.obj : .AUTODEPEND ..\..\src\png\pngrtran.c - $(CC) -bt=nt -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngrutil.obj : .AUTODEPEND ..\..\src\png\pngrutil.c - $(CC) -bt=nt -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngset.obj : .AUTODEPEND ..\..\src\png\pngset.c - $(CC) -bt=nt -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngtrans.obj : .AUTODEPEND ..\..\src\png\pngtrans.c - $(CC) -bt=nt -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngwio.obj : .AUTODEPEND ..\..\src\png\pngwio.c - $(CC) -bt=nt -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngwrite.obj : .AUTODEPEND ..\..\src\png\pngwrite.c - $(CC) -bt=nt -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngwtran.obj : .AUTODEPEND ..\..\src\png\pngwtran.c - $(CC) -bt=nt -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxpng_pngwutil.obj : .AUTODEPEND ..\..\src\png\pngwutil.c - $(CC) -bt=nt -zq -fo=$^@ $(WXPNG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcomapi.obj : .AUTODEPEND ..\..\src\jpeg\jcomapi.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jutils.obj : .AUTODEPEND ..\..\src\jpeg\jutils.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jerror.obj : .AUTODEPEND ..\..\src\jpeg\jerror.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jmemmgr.obj : .AUTODEPEND ..\..\src\jpeg\jmemmgr.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jmemnobs.obj : .AUTODEPEND ..\..\src\jpeg\jmemnobs.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcapimin.obj : .AUTODEPEND ..\..\src\jpeg\jcapimin.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcapistd.obj : .AUTODEPEND ..\..\src\jpeg\jcapistd.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jctrans.obj : .AUTODEPEND ..\..\src\jpeg\jctrans.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcparam.obj : .AUTODEPEND ..\..\src\jpeg\jcparam.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdatadst.obj : .AUTODEPEND ..\..\src\jpeg\jdatadst.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcinit.obj : .AUTODEPEND ..\..\src\jpeg\jcinit.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcmaster.obj : .AUTODEPEND ..\..\src\jpeg\jcmaster.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcmarker.obj : .AUTODEPEND ..\..\src\jpeg\jcmarker.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcmainct.obj : .AUTODEPEND ..\..\src\jpeg\jcmainct.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcprepct.obj : .AUTODEPEND ..\..\src\jpeg\jcprepct.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jccoefct.obj : .AUTODEPEND ..\..\src\jpeg\jccoefct.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jccolor.obj : .AUTODEPEND ..\..\src\jpeg\jccolor.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcsample.obj : .AUTODEPEND ..\..\src\jpeg\jcsample.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jchuff.obj : .AUTODEPEND ..\..\src\jpeg\jchuff.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcphuff.obj : .AUTODEPEND ..\..\src\jpeg\jcphuff.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jcdctmgr.obj : .AUTODEPEND ..\..\src\jpeg\jcdctmgr.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jfdctfst.obj : .AUTODEPEND ..\..\src\jpeg\jfdctfst.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jfdctflt.obj : .AUTODEPEND ..\..\src\jpeg\jfdctflt.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jfdctint.obj : .AUTODEPEND ..\..\src\jpeg\jfdctint.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdapimin.obj : .AUTODEPEND ..\..\src\jpeg\jdapimin.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdapistd.obj : .AUTODEPEND ..\..\src\jpeg\jdapistd.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdtrans.obj : .AUTODEPEND ..\..\src\jpeg\jdtrans.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdatasrc.obj : .AUTODEPEND ..\..\src\jpeg\jdatasrc.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdmaster.obj : .AUTODEPEND ..\..\src\jpeg\jdmaster.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdinput.obj : .AUTODEPEND ..\..\src\jpeg\jdinput.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdmarker.obj : .AUTODEPEND ..\..\src\jpeg\jdmarker.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdhuff.obj : .AUTODEPEND ..\..\src\jpeg\jdhuff.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdphuff.obj : .AUTODEPEND ..\..\src\jpeg\jdphuff.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdmainct.obj : .AUTODEPEND ..\..\src\jpeg\jdmainct.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdcoefct.obj : .AUTODEPEND ..\..\src\jpeg\jdcoefct.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdpostct.obj : .AUTODEPEND ..\..\src\jpeg\jdpostct.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jddctmgr.obj : .AUTODEPEND ..\..\src\jpeg\jddctmgr.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jidctfst.obj : .AUTODEPEND ..\..\src\jpeg\jidctfst.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jidctflt.obj : .AUTODEPEND ..\..\src\jpeg\jidctflt.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jidctint.obj : .AUTODEPEND ..\..\src\jpeg\jidctint.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jidctred.obj : .AUTODEPEND ..\..\src\jpeg\jidctred.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdsample.obj : .AUTODEPEND ..\..\src\jpeg\jdsample.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdcolor.obj : .AUTODEPEND ..\..\src\jpeg\jdcolor.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jquant1.obj : .AUTODEPEND ..\..\src\jpeg\jquant1.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jquant2.obj : .AUTODEPEND ..\..\src\jpeg\jquant2.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxjpeg_jdmerge.obj : .AUTODEPEND ..\..\src\jpeg\jdmerge.c - $(CC) -bt=nt -zq -fo=$^@ $(WXJPEG_CFLAGS) $< - -$(OBJS)\wxtiff_tif_win32.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_win32.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_aux.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_aux.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_close.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_close.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_codec.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_codec.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_color.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_color.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_compress.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_compress.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_dir.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_dir.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_dirinfo.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_dirinfo.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_dirread.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_dirread.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_dirwrite.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_dirwrite.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_dumpmode.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_dumpmode.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_error.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_error.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_extension.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_extension.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_fax3.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_fax3.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_fax3sm.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_fax3sm.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_flush.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_flush.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_getimage.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_getimage.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_jbig.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_jbig.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_jpeg.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_jpeg.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_jpeg_12.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_jpeg_12.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_luv.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_luv.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_lzma.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_lzma.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_lzw.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_lzw.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_next.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_next.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_ojpeg.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_ojpeg.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_open.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_open.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_packbits.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_packbits.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_pixarlog.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_pixarlog.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_predict.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_predict.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_print.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_print.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_read.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_read.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_strip.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_strip.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_swab.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_swab.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_thunder.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_thunder.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_tile.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_tile.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_version.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_version.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_warning.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_warning.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_write.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_write.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxtiff_tif_zip.obj : .AUTODEPEND ..\..\src\tiff\libtiff\tif_zip.c - $(CC) -bt=nt -zq -fo=$^@ $(WXTIFF_CFLAGS) $< - -$(OBJS)\wxexpat_xmlparse.obj : .AUTODEPEND ..\..\src\expat\lib\xmlparse.c - $(CC) -bt=nt -zq -fo=$^@ $(WXEXPAT_CFLAGS) $< - -$(OBJS)\wxexpat_xmlrole.obj : .AUTODEPEND ..\..\src\expat\lib\xmlrole.c - $(CC) -bt=nt -zq -fo=$^@ $(WXEXPAT_CFLAGS) $< - -$(OBJS)\wxexpat_xmltok.obj : .AUTODEPEND ..\..\src\expat\lib\xmltok.c - $(CC) -bt=nt -zq -fo=$^@ $(WXEXPAT_CFLAGS) $< - -$(OBJS)\wxscintilla_LexA68k.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexA68k.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexAbaqus.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexAbaqus.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexAda.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexAda.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexAPDL.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexAPDL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexAsm.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexAsm.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexAsn1.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexAsn1.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexASY.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexASY.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexAU3.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexAU3.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexAVE.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexAVE.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexAVS.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexAVS.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexBaan.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexBaan.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexBash.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexBash.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexBasic.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexBasic.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexBullant.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexBullant.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexCaml.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexCaml.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexCLW.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexCLW.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexCmake.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexCmake.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexCOBOL.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexCOBOL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexCoffeeScript.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexCoffeeScript.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexConf.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexConf.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexCPP.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexCPP.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexCrontab.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexCrontab.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexCsound.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexCsound.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexCSS.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexCSS.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexD.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexD.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexECL.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexECL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexEiffel.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexEiffel.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexErlang.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexErlang.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexEScript.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexEScript.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexFlagship.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexFlagship.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexForth.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexForth.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexFortran.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexFortran.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexGAP.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexGAP.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexGui4Cli.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexGui4Cli.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexHaskell.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexHaskell.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexHTML.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexHTML.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexInno.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexInno.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexKix.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexKix.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexLisp.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexLisp.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexLout.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexLout.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexLua.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexLua.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexMagik.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexMagik.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexMarkdown.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexMarkdown.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexMatlab.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexMatlab.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexMetapost.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexMetapost.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexMMIXAL.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexMMIXAL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexModula.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexModula.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexMPT.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexMPT.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexMSSQL.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexMSSQL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexMySQL.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexMySQL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexNimrod.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexNimrod.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexNsis.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexNsis.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexOpal.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexOpal.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexOScript.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexOScript.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexOthers.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexOthers.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexPascal.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexPascal.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexPB.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexPB.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexPerl.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexPerl.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexPLM.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexPLM.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexPOV.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexPOV.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexPowerPro.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexPowerPro.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexPowerShell.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexPowerShell.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexProgress.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexProgress.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexPS.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexPS.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexPython.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexPython.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexR.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexR.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexRebol.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexRebol.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexRuby.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexRuby.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexScriptol.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexScriptol.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexSmalltalk.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexSmalltalk.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexSML.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexSML.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexSorcus.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexSorcus.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexSpecman.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexSpecman.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexSpice.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexSpice.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexSQL.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexSQL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexTACL.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexTACL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexTADS3.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexTADS3.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexTAL.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexTAL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexTCL.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexTCL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexTCMD.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexTCMD.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexTeX.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexTeX.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexTxt2tags.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexTxt2tags.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexVB.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexVB.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexVerilog.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexVerilog.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexVHDL.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexVHDL.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexVisualProlog.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexVisualProlog.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexYAML.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexers\LexYAML.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_Accessor.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexlib\Accessor.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_CharacterSet.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexlib\CharacterSet.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexerBase.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexlib\LexerBase.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexerModule.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexlib\LexerModule.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexerNoExceptions.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexlib\LexerNoExceptions.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LexerSimple.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexlib\LexerSimple.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_PropSetSimple.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexlib\PropSetSimple.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_StyleContext.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexlib\StyleContext.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_WordList.obj : .AUTODEPEND ..\..\src\stc\scintilla\lexlib\WordList.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_AutoComplete.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\AutoComplete.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_CallTip.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CallTip.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_Catalogue.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Catalogue.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_CellBuffer.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CellBuffer.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_CharClassify.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\CharClassify.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_ContractionState.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ContractionState.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_Decoration.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Decoration.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_Document.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Document.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_Editor.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Editor.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_ExternalLexer.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ExternalLexer.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_Indicator.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Indicator.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_KeyMap.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\KeyMap.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_LineMarker.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\LineMarker.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_PerLine.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\PerLine.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_PositionCache.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\PositionCache.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_RESearch.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\RESearch.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_RunStyles.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\RunStyles.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_ScintillaBase.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ScintillaBase.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_Selection.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Selection.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_Style.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\Style.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_UniConversion.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\UniConversion.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_ViewStyle.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\ViewStyle.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\wxscintilla_XPM.obj : .AUTODEPEND ..\..\src\stc\scintilla\src\XPM.cxx - $(CXX) -bt=nt -zq -fo=$^@ $(WXSCINTILLA_CXXFLAGS) $< - -$(OBJS)\monodll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_any.obj : .AUTODEPEND ..\..\src\common\any.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_arcall.obj : .AUTODEPEND ..\..\src\common\arcall.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_arcfind.obj : .AUTODEPEND ..\..\src\common\arcfind.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_archive.obj : .AUTODEPEND ..\..\src\common\archive.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_arrstr.obj : .AUTODEPEND ..\..\src\common\arrstr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_base64.obj : .AUTODEPEND ..\..\src\common\base64.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_cmdline.obj : .AUTODEPEND ..\..\src\common\cmdline.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_config.obj : .AUTODEPEND ..\..\src\common\config.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_convauto.obj : .AUTODEPEND ..\..\src\common\convauto.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_datetime.obj : .AUTODEPEND ..\..\src\common\datetime.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_datetimefmt.obj : .AUTODEPEND ..\..\src\common\datetimefmt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_datstrm.obj : .AUTODEPEND ..\..\src\common\datstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dircmn.obj : .AUTODEPEND ..\..\src\common\dircmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dynarray.obj : .AUTODEPEND ..\..\src\common\dynarray.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dynlib.obj : .AUTODEPEND ..\..\src\common\dynlib.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dynload.obj : .AUTODEPEND ..\..\src\common\dynload.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_encconv.obj : .AUTODEPEND ..\..\src\common\encconv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_evtloopcmn.obj : .AUTODEPEND ..\..\src\common\evtloopcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_extended.obj : .AUTODEPEND ..\..\src\common\extended.c - $(CC) -bt=nt -zq -fo=$^@ $(MONODLL_CFLAGS) $< - -$(OBJS)\monodll_ffile.obj : .AUTODEPEND ..\..\src\common\ffile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_file.obj : .AUTODEPEND ..\..\src\common\file.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fileback.obj : .AUTODEPEND ..\..\src\common\fileback.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fileconf.obj : .AUTODEPEND ..\..\src\common\fileconf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_filefn.obj : .AUTODEPEND ..\..\src\common\filefn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_filename.obj : .AUTODEPEND ..\..\src\common\filename.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_filesys.obj : .AUTODEPEND ..\..\src\common\filesys.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_filtall.obj : .AUTODEPEND ..\..\src\common\filtall.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_filtfind.obj : .AUTODEPEND ..\..\src\common\filtfind.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fmapbase.obj : .AUTODEPEND ..\..\src\common\fmapbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fs_arc.obj : .AUTODEPEND ..\..\src\common\fs_arc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fs_filter.obj : .AUTODEPEND ..\..\src\common\fs_filter.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_hashmap.obj : .AUTODEPEND ..\..\src\common\hashmap.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_init.obj : .AUTODEPEND ..\..\src\common\init.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_intl.obj : .AUTODEPEND ..\..\src\common\intl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_ipcbase.obj : .AUTODEPEND ..\..\src\common\ipcbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_languageinfo.obj : .AUTODEPEND ..\..\src\common\languageinfo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_list.obj : .AUTODEPEND ..\..\src\common\list.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_log.obj : .AUTODEPEND ..\..\src\common\log.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_longlong.obj : .AUTODEPEND ..\..\src\common\longlong.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_memory.obj : .AUTODEPEND ..\..\src\common\memory.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_mimecmn.obj : .AUTODEPEND ..\..\src\common\mimecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_module.obj : .AUTODEPEND ..\..\src\common\module.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_mstream.obj : .AUTODEPEND ..\..\src\common\mstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_numformatter.obj : .AUTODEPEND ..\..\src\common\numformatter.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_object.obj : .AUTODEPEND ..\..\src\common\object.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_platinfo.obj : .AUTODEPEND ..\..\src\common\platinfo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_powercmn.obj : .AUTODEPEND ..\..\src\common\powercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_process.obj : .AUTODEPEND ..\..\src\common\process.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_regex.obj : .AUTODEPEND ..\..\src\common\regex.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stdpbase.obj : .AUTODEPEND ..\..\src\common\stdpbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_sstream.obj : .AUTODEPEND ..\..\src\common\sstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stdstream.obj : .AUTODEPEND ..\..\src\common\stdstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stopwatch.obj : .AUTODEPEND ..\..\src\common\stopwatch.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_strconv.obj : .AUTODEPEND ..\..\src\common\strconv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stream.obj : .AUTODEPEND ..\..\src\common\stream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_string.obj : .AUTODEPEND ..\..\src\common\string.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stringimpl.obj : .AUTODEPEND ..\..\src\common\stringimpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stringops.obj : .AUTODEPEND ..\..\src\common\stringops.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_strvararg.obj : .AUTODEPEND ..\..\src\common\strvararg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_sysopt.obj : .AUTODEPEND ..\..\src\common\sysopt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_tarstrm.obj : .AUTODEPEND ..\..\src\common\tarstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_threadinfo.obj : .AUTODEPEND ..\..\src\common\threadinfo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_time.obj : .AUTODEPEND ..\..\src\common\time.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_timerimpl.obj : .AUTODEPEND ..\..\src\common\timerimpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_translation.obj : .AUTODEPEND ..\..\src\common\translation.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_ustring.obj : .AUTODEPEND ..\..\src\common\ustring.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xlocale.obj : .AUTODEPEND ..\..\src\common\xlocale.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xtistrm.obj : .AUTODEPEND ..\..\src\common\xtistrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_zipstrm.obj : .AUTODEPEND ..\..\src\common\zipstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_zstream.obj : .AUTODEPEND ..\..\src\common\zstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fswatchercmn.obj : .AUTODEPEND ..\..\src\common\fswatchercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fswatcherg.obj : .AUTODEPEND ..\..\src\generic\fswatcherg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_basemsw.obj : .AUTODEPEND ..\..\src\msw\basemsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_crashrpt.obj : .AUTODEPEND ..\..\src\msw\crashrpt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_debughlp.obj : .AUTODEPEND ..\..\src\msw\debughlp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dde.obj : .AUTODEPEND ..\..\src\msw\dde.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dir.obj : .AUTODEPEND ..\..\src\msw\dir.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dlmsw.obj : .AUTODEPEND ..\..\src\msw\dlmsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_evtloopconsole.obj : .AUTODEPEND ..\..\src\msw\evtloopconsole.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_mimetype.obj : .AUTODEPEND ..\..\src\msw\mimetype.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_power.obj : .AUTODEPEND ..\..\src\msw\power.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_regconf.obj : .AUTODEPEND ..\..\src\msw\regconf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_registry.obj : .AUTODEPEND ..\..\src\msw\registry.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_snglinst.obj : .AUTODEPEND ..\..\src\msw\snglinst.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stackwalk.obj : .AUTODEPEND ..\..\src\msw\stackwalk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stdpaths.obj : .AUTODEPEND ..\..\src\msw\stdpaths.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_thread.obj : .AUTODEPEND ..\..\src\msw\thread.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_utils.obj : .AUTODEPEND ..\..\src\msw\utils.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_utilsexc.obj : .AUTODEPEND ..\..\src\msw\utilsexc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fswatcher.obj : .AUTODEPEND ..\..\src\msw\fswatcher.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_event.obj : .AUTODEPEND ..\..\src\common\event.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fs_mem.obj : .AUTODEPEND ..\..\src\common\fs_mem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fs_inet.obj : .AUTODEPEND ..\..\src\common\fs_inet.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_ftp.obj : .AUTODEPEND ..\..\src\common\ftp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_http.obj : .AUTODEPEND ..\..\src\common\http.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_protocol.obj : .AUTODEPEND ..\..\src\common\protocol.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_sckaddr.obj : .AUTODEPEND ..\..\src\common\sckaddr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_sckfile.obj : .AUTODEPEND ..\..\src\common\sckfile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_sckipc.obj : .AUTODEPEND ..\..\src\common\sckipc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_sckstrm.obj : .AUTODEPEND ..\..\src\common\sckstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_url.obj : .AUTODEPEND ..\..\src\common\url.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_sockmsw.obj : .AUTODEPEND ..\..\src\msw\sockmsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_generic_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_accel.obj : .AUTODEPEND ..\..\src\msw\accel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_anybutton.obj : .AUTODEPEND ..\..\src\msw\anybutton.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_artmsw.obj : .AUTODEPEND ..\..\src\msw\artmsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_bmpbuttn.obj : .AUTODEPEND ..\..\src\msw\bmpbuttn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_button.obj : .AUTODEPEND ..\..\src\msw\button.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_checkbox.obj : .AUTODEPEND ..\..\src\msw\checkbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_choice.obj : .AUTODEPEND ..\..\src\msw\choice.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_combo.obj : .AUTODEPEND ..\..\src\msw\combo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_combobox.obj : .AUTODEPEND ..\..\src\msw\combobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_control.obj : .AUTODEPEND ..\..\src\msw\control.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_dialog.obj : .AUTODEPEND ..\..\src\msw\dialog.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_gauge.obj : .AUTODEPEND ..\..\src\msw\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_headerctrl.obj : .AUTODEPEND ..\..\src\msw\headerctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_iniconf.obj : .AUTODEPEND ..\..\src\msw\iniconf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_listbox.obj : .AUTODEPEND ..\..\src\msw\listbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_listctrl.obj : .AUTODEPEND ..\..\src\msw\listctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_mdi.obj : .AUTODEPEND ..\..\src\msw\mdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_menu.obj : .AUTODEPEND ..\..\src\msw\menu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_menuitem.obj : .AUTODEPEND ..\..\src\msw\menuitem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_metafile.obj : .AUTODEPEND ..\..\src\msw\metafile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msgdlg.obj : .AUTODEPEND ..\..\src\msw\msgdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_nativdlg.obj : .AUTODEPEND ..\..\src\msw\nativdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_nativewin.obj : .AUTODEPEND ..\..\src\msw\nativewin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_notebook.obj : .AUTODEPEND ..\..\src\msw\notebook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_panel.obj : .AUTODEPEND ..\..\src\msw\panel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_progdlg.obj : .AUTODEPEND ..\..\src\msw\progdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_radiobox.obj : .AUTODEPEND ..\..\src\msw\radiobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_radiobut.obj : .AUTODEPEND ..\..\src\msw\radiobut.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richmsgdlg.obj : .AUTODEPEND ..\..\src\msw\richmsgdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_scrolbar.obj : .AUTODEPEND ..\..\src\msw\scrolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_slider.obj : .AUTODEPEND ..\..\src\msw\slider.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_spinbutt.obj : .AUTODEPEND ..\..\src\msw\spinbutt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_spinctrl.obj : .AUTODEPEND ..\..\src\msw\spinctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_statbmp.obj : .AUTODEPEND ..\..\src\msw\statbmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_statbox.obj : .AUTODEPEND ..\..\src\msw\statbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_statusbar.obj : .AUTODEPEND ..\..\src\msw\statusbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_statline.obj : .AUTODEPEND ..\..\src\msw\statline.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_stattext.obj : .AUTODEPEND ..\..\src\msw\stattext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_toolbar.obj : .AUTODEPEND ..\..\src\msw\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_textctrl.obj : .AUTODEPEND ..\..\src\msw\textctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_textentry.obj : .AUTODEPEND ..\..\src\msw\textentry.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_tglbtn.obj : .AUTODEPEND ..\..\src\msw\tglbtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_treectrl.obj : .AUTODEPEND ..\..\src\msw\treectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_checklst.obj : .AUTODEPEND ..\..\src\msw\checklst.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_msw_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_generic_accel.obj : .AUTODEPEND ..\..\src\generic\accel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_generic_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_generic_listctrl.obj : .AUTODEPEND ..\..\src\generic\listctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_button.obj : .AUTODEPEND ..\..\src\univ\button.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_checkbox.obj : .AUTODEPEND ..\..\src\univ\checkbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_checklst.obj : .AUTODEPEND ..\..\src\univ\checklst.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_choice.obj : .AUTODEPEND ..\..\src\univ\choice.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_combobox.obj : .AUTODEPEND ..\..\src\univ\combobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_control.obj : .AUTODEPEND ..\..\src\univ\control.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_inphand.obj : .AUTODEPEND ..\..\src\univ\inphand.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_listbox.obj : .AUTODEPEND ..\..\src\univ\listbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_menu.obj : .AUTODEPEND ..\..\src\univ\menu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_notebook.obj : .AUTODEPEND ..\..\src\univ\notebook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_radiobox.obj : .AUTODEPEND ..\..\src\univ\radiobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_radiobut.obj : .AUTODEPEND ..\..\src\univ\radiobut.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_settingsuniv.obj : .AUTODEPEND ..\..\src\univ\settingsuniv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_spinbutt.obj : .AUTODEPEND ..\..\src\univ\spinbutt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_statbmp.obj : .AUTODEPEND ..\..\src\univ\statbmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_statbox.obj : .AUTODEPEND ..\..\src\univ\statbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_statline.obj : .AUTODEPEND ..\..\src\univ\statline.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_statusbr.obj : .AUTODEPEND ..\..\src\univ\statusbr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_tglbtn.obj : .AUTODEPEND ..\..\src\univ\tglbtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_univ_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_winuniv.obj : .AUTODEPEND ..\..\src\univ\winuniv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_gtk.obj : .AUTODEPEND ..\..\src\univ\themes\gtk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_metal.obj : .AUTODEPEND ..\..\src\univ\themes\metal.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_mono.obj : .AUTODEPEND ..\..\src\univ\themes\mono.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_win32.obj : .AUTODEPEND ..\..\src\univ\themes\win32.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_bmpcbox.obj : .AUTODEPEND ..\..\src\msw\bmpcbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_calctrl.obj : .AUTODEPEND ..\..\src\msw\calctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_commandlinkbutton.obj : .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_datecontrols.obj : .AUTODEPEND ..\..\src\msw\datecontrols.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_datetimectrl.obj : .AUTODEPEND ..\..\src\msw\datetimectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_hyperlink.obj : .AUTODEPEND ..\..\src\msw\hyperlink.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_timectrl.obj : .AUTODEPEND ..\..\src\msw\timectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_mediactrl_am.obj : .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_mediactrl_qt.obj : .AUTODEPEND ..\..\src\msw\mediactrl_qt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_helpbest.obj : .AUTODEPEND ..\..\src\msw\helpbest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_helpctrl.obj : .AUTODEPEND ..\..\src\html\helpctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_helpdata.obj : .AUTODEPEND ..\..\src\html\helpdata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_helpdlg.obj : .AUTODEPEND ..\..\src\html\helpdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_helpfrm.obj : .AUTODEPEND ..\..\src\html\helpfrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_helpwnd.obj : .AUTODEPEND ..\..\src\html\helpwnd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_htmlcell.obj : .AUTODEPEND ..\..\src\html\htmlcell.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_htmlfilt.obj : .AUTODEPEND ..\..\src\html\htmlfilt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_htmlpars.obj : .AUTODEPEND ..\..\src\html\htmlpars.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_htmltag.obj : .AUTODEPEND ..\..\src\html\htmltag.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_htmlwin.obj : .AUTODEPEND ..\..\src\html\htmlwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_htmprint.obj : .AUTODEPEND ..\..\src\html\htmprint.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_dflist.obj : .AUTODEPEND ..\..\src\html\m_dflist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_fonts.obj : .AUTODEPEND ..\..\src\html\m_fonts.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_hline.obj : .AUTODEPEND ..\..\src\html\m_hline.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_image.obj : .AUTODEPEND ..\..\src\html\m_image.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_layout.obj : .AUTODEPEND ..\..\src\html\m_layout.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_links.obj : .AUTODEPEND ..\..\src\html\m_links.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_list.obj : .AUTODEPEND ..\..\src\html\m_list.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_pre.obj : .AUTODEPEND ..\..\src\html\m_pre.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_span.obj : .AUTODEPEND ..\..\src\html\m_span.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_style.obj : .AUTODEPEND ..\..\src\html\m_style.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_m_tables.obj : .AUTODEPEND ..\..\src\html\m_tables.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_styleparams.obj : .AUTODEPEND ..\..\src\html\styleparams.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_htmllbox.obj : .AUTODEPEND ..\..\src\generic\htmllbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_webview_ie.obj : .AUTODEPEND ..\..\src\msw\webview_ie.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_webview.obj : .AUTODEPEND ..\..\src\common\webview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_webviewarchivehandler.obj : .AUTODEPEND ..\..\src\common\webviewarchivehandler.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_webviewfshandler.obj : .AUTODEPEND ..\..\src\common\webviewfshandler.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_debugrpt.obj : .AUTODEPEND ..\..\src\common\debugrpt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_bannerwindow.obj : .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_bmpcbox.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpcbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_bmpbt.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_bttn.obj : .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_cald.obj : .AUTODEPEND ..\..\src\xrc\xh_cald.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_chckb.obj : .AUTODEPEND ..\..\src\xrc\xh_chckb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_chckl.obj : .AUTODEPEND ..\..\src\xrc\xh_chckl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_choic.obj : .AUTODEPEND ..\..\src\xrc\xh_choic.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_choicbk.obj : .AUTODEPEND ..\..\src\xrc\xh_choicbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_clrpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_clrpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_cmdlinkbn.obj : .AUTODEPEND ..\..\src\xrc\xh_cmdlinkbn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_collpane.obj : .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_comboctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_comboctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_datectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_dirpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_dirpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_editlbox.obj : .AUTODEPEND ..\..\src\xrc\xh_editlbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_filectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_filectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_filepicker.obj : .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_fontpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_fontpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_gdctl.obj : .AUTODEPEND ..\..\src\xrc\xh_gdctl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_grid.obj : .AUTODEPEND ..\..\src\xrc\xh_grid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_html.obj : .AUTODEPEND ..\..\src\xrc\xh_html.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_hyperlink.obj : .AUTODEPEND ..\..\src\xrc\xh_hyperlink.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_listb.obj : .AUTODEPEND ..\..\src\xrc\xh_listb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_listbk.obj : .AUTODEPEND ..\..\src\xrc\xh_listbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_listc.obj : .AUTODEPEND ..\..\src\xrc\xh_listc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_menu.obj : .AUTODEPEND ..\..\src\xrc\xh_menu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_notbk.obj : .AUTODEPEND ..\..\src\xrc\xh_notbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_odcombo.obj : .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_propdlg.obj : .AUTODEPEND ..\..\src\xrc\xh_propdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_radbx.obj : .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_htmllbox.obj : .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_slidr.obj : .AUTODEPEND ..\..\src\xrc\xh_slidr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_srchctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_srchctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_stbmp.obj : .AUTODEPEND ..\..\src\xrc\xh_stbmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_stbox.obj : .AUTODEPEND ..\..\src\xrc\xh_stbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_stlin.obj : .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_sttxt.obj : .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_text.obj : .AUTODEPEND ..\..\src\xrc\xh_text.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_tglbtn.obj : .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_timectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_toolbk.obj : .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_tree.obj : .AUTODEPEND ..\..\src\xrc\xh_tree.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_treebk.obj : .AUTODEPEND ..\..\src\xrc\xh_treebk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_unkwn.obj : .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xmladv.obj : .AUTODEPEND ..\..\src\xrc\xmladv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_framemanager.obj : .AUTODEPEND ..\..\src\aui\framemanager.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_auibar.obj : .AUTODEPEND ..\..\src\aui\auibar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_tabart.obj : .AUTODEPEND ..\..\src\aui\tabart.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_auinotbk.obj : .AUTODEPEND ..\..\src\xrc\xh_auinotbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_advprops.obj : .AUTODEPEND ..\..\src\propgrid\advprops.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_editors.obj : .AUTODEPEND ..\..\src\propgrid\editors.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_manager.obj : .AUTODEPEND ..\..\src\propgrid\manager.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_property.obj : .AUTODEPEND ..\..\src\propgrid\property.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_propgrid.obj : .AUTODEPEND ..\..\src\propgrid\propgrid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_propgridiface.obj : .AUTODEPEND ..\..\src\propgrid\propgridiface.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_propgridpagestate.obj : .AUTODEPEND ..\..\src\propgrid\propgridpagestate.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_props.obj : .AUTODEPEND ..\..\src\propgrid\props.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_art_internal.obj : .AUTODEPEND ..\..\src\ribbon\art_internal.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_art_msw.obj : .AUTODEPEND ..\..\src\ribbon\art_msw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_art_aui.obj : .AUTODEPEND ..\..\src\ribbon\art_aui.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_bar.obj : .AUTODEPEND ..\..\src\ribbon\bar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_ribbon_buttonbar.obj : .AUTODEPEND ..\..\src\ribbon\buttonbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_ribbon_control.obj : .AUTODEPEND ..\..\src\ribbon\control.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_gallery.obj : .AUTODEPEND ..\..\src\ribbon\gallery.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_page.obj : .AUTODEPEND ..\..\src\ribbon\page.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_ribbon_panel.obj : .AUTODEPEND ..\..\src\ribbon\panel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_ribbon_toolbar.obj : .AUTODEPEND ..\..\src\ribbon\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_ribbon.obj : .AUTODEPEND ..\..\src\xrc\xh_ribbon.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextformatdlg.obj : .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextimagedlg.obj : .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextprint.obj : .AUTODEPEND ..\..\src\richtext\richtextprint.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_PlatWX.obj : .AUTODEPEND ..\..\src\stc\PlatWX.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_ScintillaWX.obj : .AUTODEPEND ..\..\src\stc\ScintillaWX.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -$(OBJS)\monodll_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< - -!ifeq USE_GUI 1 -$(OBJS)\monodll_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_app.obj : .AUTODEPEND ..\..\src\msw\app.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_bitmap.obj : .AUTODEPEND ..\..\src\msw\bitmap.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_brush.obj : .AUTODEPEND ..\..\src\msw\brush.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_caret.obj : .AUTODEPEND ..\..\src\msw\caret.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_clipbrd.obj : .AUTODEPEND ..\..\src\msw\clipbrd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_colour.obj : .AUTODEPEND ..\..\src\msw\colour.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_cursor.obj : .AUTODEPEND ..\..\src\msw\cursor.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_data.obj : .AUTODEPEND ..\..\src\msw\data.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dc.obj : .AUTODEPEND ..\..\src\msw\dc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dcclient.obj : .AUTODEPEND ..\..\src\msw\dcclient.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dcmemory.obj : .AUTODEPEND ..\..\src\msw\dcmemory.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dcprint.obj : .AUTODEPEND ..\..\src\msw\dcprint.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dcscreen.obj : .AUTODEPEND ..\..\src\msw\dcscreen.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dialup.obj : .AUTODEPEND ..\..\src\msw\dialup.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dib.obj : .AUTODEPEND ..\..\src\msw\dib.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_display.obj : .AUTODEPEND ..\..\src\msw\display.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_enhmeta.obj : .AUTODEPEND ..\..\src\msw\enhmeta.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_font.obj : .AUTODEPEND ..\..\src\msw\font.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fontenum.obj : .AUTODEPEND ..\..\src\msw\fontenum.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fontutil.obj : .AUTODEPEND ..\..\src\msw\fontutil.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_gdiimage.obj : .AUTODEPEND ..\..\src\msw\gdiimage.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_gdiplus.obj : .AUTODEPEND ..\..\src\msw\gdiplus.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_icon.obj : .AUTODEPEND ..\..\src\msw\icon.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imaglist.obj : .AUTODEPEND ..\..\src\msw\imaglist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_minifram.obj : .AUTODEPEND ..\..\src\msw\minifram.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_nonownedwnd.obj : .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dataobj.obj : .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dropsrc.obj : .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_droptgt.obj : .AUTODEPEND ..\..\src\msw\ole\droptgt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_oleutils.obj : .AUTODEPEND ..\..\src\msw\ole\oleutils.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_safearray.obj : .AUTODEPEND ..\..\src\msw\ole\safearray.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_palette.obj : .AUTODEPEND ..\..\src\msw\palette.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_pen.obj : .AUTODEPEND ..\..\src\msw\pen.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_popupwin.obj : .AUTODEPEND ..\..\src\msw\popupwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_printdlg.obj : .AUTODEPEND ..\..\src\msw\printdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_printwin.obj : .AUTODEPEND ..\..\src\msw\printwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_region.obj : .AUTODEPEND ..\..\src\msw\region.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_renderer.obj : .AUTODEPEND ..\..\src\msw\renderer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_toplevel.obj : .AUTODEPEND ..\..\src\msw\toplevel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_uiaction.obj : .AUTODEPEND ..\..\src\msw\uiaction.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_utilsgui.obj : .AUTODEPEND ..\..\src\msw\utilsgui.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_utilswin.obj : .AUTODEPEND ..\..\src\msw\utilswin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_uxtheme.obj : .AUTODEPEND ..\..\src\msw\uxtheme.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_window.obj : .AUTODEPEND ..\..\src\msw\window.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_automtn.obj : .AUTODEPEND ..\..\src\msw\ole\automtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_accelcmn.obj : .AUTODEPEND ..\..\src\common\accelcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_anidecod.obj : .AUTODEPEND ..\..\src\common\anidecod.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_affinematrix2d.obj : .AUTODEPEND ..\..\src\common\affinematrix2d.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_appcmn.obj : .AUTODEPEND ..\..\src\common\appcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_artprov.obj : .AUTODEPEND ..\..\src\common\artprov.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_artstd.obj : .AUTODEPEND ..\..\src\common\artstd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_arttango.obj : .AUTODEPEND ..\..\src\common\arttango.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_bmpbtncmn.obj : .AUTODEPEND ..\..\src\common\bmpbtncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_btncmn.obj : .AUTODEPEND ..\..\src\common\btncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_checkboxcmn.obj : .AUTODEPEND ..\..\src\common\checkboxcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_checklstcmn.obj : .AUTODEPEND ..\..\src\common\checklstcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_choiccmn.obj : .AUTODEPEND ..\..\src\common\choiccmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_clipcmn.obj : .AUTODEPEND ..\..\src\common\clipcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_clrpickercmn.obj : .AUTODEPEND ..\..\src\common\clrpickercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_colourcmn.obj : .AUTODEPEND ..\..\src\common\colourcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_colourdata.obj : .AUTODEPEND ..\..\src\common\colourdata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_combocmn.obj : .AUTODEPEND ..\..\src\common\combocmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_cmndata.obj : .AUTODEPEND ..\..\src\common\cmndata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_containr.obj : .AUTODEPEND ..\..\src\common\containr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_cshelp.obj : .AUTODEPEND ..\..\src\common\cshelp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_ctrlcmn.obj : .AUTODEPEND ..\..\src\common\ctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_ctrlsub.obj : .AUTODEPEND ..\..\src\common\ctrlsub.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dcbase.obj : .AUTODEPEND ..\..\src\common\dcbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dcbufcmn.obj : .AUTODEPEND ..\..\src\common\dcbufcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dcgraph.obj : .AUTODEPEND ..\..\src\common\dcgraph.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dcsvg.obj : .AUTODEPEND ..\..\src\common\dcsvg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dirctrlcmn.obj : .AUTODEPEND ..\..\src\common\dirctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dndcmn.obj : .AUTODEPEND ..\..\src\common\dndcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dobjcmn.obj : .AUTODEPEND ..\..\src\common\dobjcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_docmdi.obj : .AUTODEPEND ..\..\src\common\docmdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_docview.obj : .AUTODEPEND ..\..\src\common\docview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dpycmn.obj : .AUTODEPEND ..\..\src\common\dpycmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dseldlg.obj : .AUTODEPEND ..\..\src\common\dseldlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_effects.obj : .AUTODEPEND ..\..\src\common\effects.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fddlgcmn.obj : .AUTODEPEND ..\..\src\common\fddlgcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_filectrlcmn.obj : .AUTODEPEND ..\..\src\common\filectrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_filehistorycmn.obj : .AUTODEPEND ..\..\src\common\filehistorycmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_filepickercmn.obj : .AUTODEPEND ..\..\src\common\filepickercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fontpickercmn.obj : .AUTODEPEND ..\..\src\common\fontpickercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fldlgcmn.obj : .AUTODEPEND ..\..\src\common\fldlgcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fontcmn.obj : .AUTODEPEND ..\..\src\common\fontcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fontdata.obj : .AUTODEPEND ..\..\src\common\fontdata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_graphicc.obj : .AUTODEPEND ..\..\src\generic\graphicc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fontenumcmn.obj : .AUTODEPEND ..\..\src\common\fontenumcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_fontutilcmn.obj : .AUTODEPEND ..\..\src\common\fontutilcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_framecmn.obj : .AUTODEPEND ..\..\src\common\framecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_gaugecmn.obj : .AUTODEPEND ..\..\src\common\gaugecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_gbsizer.obj : .AUTODEPEND ..\..\src\common\gbsizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_gdicmn.obj : .AUTODEPEND ..\..\src\common\gdicmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_geometry.obj : .AUTODEPEND ..\..\src\common\geometry.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_gifdecod.obj : .AUTODEPEND ..\..\src\common\gifdecod.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_headercolcmn.obj : .AUTODEPEND ..\..\src\common\headercolcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_headerctrlcmn.obj : .AUTODEPEND ..\..\src\common\headerctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_helpbase.obj : .AUTODEPEND ..\..\src\common\helpbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_iconbndl.obj : .AUTODEPEND ..\..\src\common\iconbndl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagall.obj : .AUTODEPEND ..\..\src\common\imagall.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagbmp.obj : .AUTODEPEND ..\..\src\common\imagbmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_image.obj : .AUTODEPEND ..\..\src\common\image.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagfill.obj : .AUTODEPEND ..\..\src\common\imagfill.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imaggif.obj : .AUTODEPEND ..\..\src\common\imaggif.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagiff.obj : .AUTODEPEND ..\..\src\common\imagiff.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagjpeg.obj : .AUTODEPEND ..\..\src\common\imagjpeg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagpcx.obj : .AUTODEPEND ..\..\src\common\imagpcx.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagpng.obj : .AUTODEPEND ..\..\src\common\imagpng.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagpnm.obj : .AUTODEPEND ..\..\src\common\imagpnm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagtga.obj : .AUTODEPEND ..\..\src\common\imagtga.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagtiff.obj : .AUTODEPEND ..\..\src\common\imagtiff.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_imagxpm.obj : .AUTODEPEND ..\..\src\common\imagxpm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_layout.obj : .AUTODEPEND ..\..\src\common\layout.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_lboxcmn.obj : .AUTODEPEND ..\..\src\common\lboxcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_listctrlcmn.obj : .AUTODEPEND ..\..\src\common\listctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_markupparser.obj : .AUTODEPEND ..\..\src\common\markupparser.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_matrix.obj : .AUTODEPEND ..\..\src\common\matrix.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_menucmn.obj : .AUTODEPEND ..\..\src\common\menucmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_modalhook.obj : .AUTODEPEND ..\..\src\common\modalhook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_mousemanager.obj : .AUTODEPEND ..\..\src\common\mousemanager.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_ownerdrwcmn.obj : .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_panelcmn.obj : .AUTODEPEND ..\..\src\common\panelcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_popupcmn.obj : .AUTODEPEND ..\..\src\common\popupcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_preferencescmn.obj : .AUTODEPEND ..\..\src\common\preferencescmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_prntbase.obj : .AUTODEPEND ..\..\src\common\prntbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_quantize.obj : .AUTODEPEND ..\..\src\common\quantize.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_radiobtncmn.obj : .AUTODEPEND ..\..\src\common\radiobtncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_radiocmn.obj : .AUTODEPEND ..\..\src\common\radiocmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_rearrangectrl.obj : .AUTODEPEND ..\..\src\common\rearrangectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_rendcmn.obj : .AUTODEPEND ..\..\src\common\rendcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_rgncmn.obj : .AUTODEPEND ..\..\src\common\rgncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_scrolbarcmn.obj : .AUTODEPEND ..\..\src\common\scrolbarcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_settcmn.obj : .AUTODEPEND ..\..\src\common\settcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_slidercmn.obj : .AUTODEPEND ..\..\src\common\slidercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_spinbtncmn.obj : .AUTODEPEND ..\..\src\common\spinbtncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_spinctrlcmn.obj : .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_statbmpcmn.obj : .AUTODEPEND ..\..\src\common\statbmpcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_statboxcmn.obj : .AUTODEPEND ..\..\src\common\statboxcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_statlinecmn.obj : .AUTODEPEND ..\..\src\common\statlinecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_stattextcmn.obj : .AUTODEPEND ..\..\src\common\stattextcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_tbarbase.obj : .AUTODEPEND ..\..\src\common\tbarbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_treebase.obj : .AUTODEPEND ..\..\src\common\treebase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_uiactioncmn.obj : .AUTODEPEND ..\..\src\common\uiactioncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_valgen.obj : .AUTODEPEND ..\..\src\common\valgen.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_validate.obj : .AUTODEPEND ..\..\src\common\validate.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_valtext.obj : .AUTODEPEND ..\..\src\common\valtext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_valnum.obj : .AUTODEPEND ..\..\src\common\valnum.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_wincmn.obj : .AUTODEPEND ..\..\src\common\wincmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_windowid.obj : .AUTODEPEND ..\..\src\common\windowid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_wrapsizer.obj : .AUTODEPEND ..\..\src\common\wrapsizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_busyinfo.obj : .AUTODEPEND ..\..\src\generic\busyinfo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_generic_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dcpsg.obj : .AUTODEPEND ..\..\src\generic\dcpsg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dirctrlg.obj : .AUTODEPEND ..\..\src\generic\dirctrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_filectrlg.obj : .AUTODEPEND ..\..\src\generic\filectrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_headerctrlg.obj : .AUTODEPEND ..\..\src\generic\headerctrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_infobar.obj : .AUTODEPEND ..\..\src\generic\infobar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_markuptext.obj : .AUTODEPEND ..\..\src\generic\markuptext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_preferencesg.obj : .AUTODEPEND ..\..\src\generic\preferencesg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_printps.obj : .AUTODEPEND ..\..\src\generic\printps.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_renderg.obj : .AUTODEPEND ..\..\src\generic\renderg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_richmsgdlgg.obj : .AUTODEPEND ..\..\src\generic\richmsgdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_scrlwing.obj : .AUTODEPEND ..\..\src\generic\scrlwing.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_selstore.obj : .AUTODEPEND ..\..\src\generic\selstore.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_spinctlg.obj : .AUTODEPEND ..\..\src\generic\spinctlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_statbmpg.obj : .AUTODEPEND ..\..\src\generic\statbmpg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_stattextg.obj : .AUTODEPEND ..\..\src\generic\stattextg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_tipwin.obj : .AUTODEPEND ..\..\src\generic\tipwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_toolbkg.obj : .AUTODEPEND ..\..\src\generic\toolbkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_treectlg.obj : .AUTODEPEND ..\..\src\generic\treectlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_treebkg.obj : .AUTODEPEND ..\..\src\generic\treebkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_vlbox.obj : .AUTODEPEND ..\..\src\generic\vlbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_xmlreshandler.obj : .AUTODEPEND ..\..\src\xrc\xmlreshandler.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_bmpcboxcmn.obj : .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_gridcmn.obj : .AUTODEPEND ..\..\src\common\gridcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_hyperlnkcmn.obj : .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_richtooltipcmn.obj : .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_bannerwindow.obj : .AUTODEPEND ..\..\src\generic\bannerwindow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_calctrlg.obj : .AUTODEPEND ..\..\src\generic\calctrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_commandlinkbuttong.obj : .AUTODEPEND ..\..\src\generic\commandlinkbuttong.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_editlbox.obj : .AUTODEPEND ..\..\src\generic\editlbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_gridctrl.obj : .AUTODEPEND ..\..\src\generic\gridctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_grideditors.obj : .AUTODEPEND ..\..\src\generic\grideditors.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_gridsel.obj : .AUTODEPEND ..\..\src\generic\gridsel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_hyperlinkg.obj : .AUTODEPEND ..\..\src\generic\hyperlinkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_notifmsgg.obj : .AUTODEPEND ..\..\src\generic\notifmsgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_odcombo.obj : .AUTODEPEND ..\..\src\generic\odcombo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_propdlg.obj : .AUTODEPEND ..\..\src\generic\propdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_richtooltipg.obj : .AUTODEPEND ..\..\src\generic\richtooltipg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_sashwin.obj : .AUTODEPEND ..\..\src\generic\sashwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_splash.obj : .AUTODEPEND ..\..\src\generic\splash.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_timectrlg.obj : .AUTODEPEND ..\..\src\generic\timectrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_treelist.obj : .AUTODEPEND ..\..\src\generic\treelist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_notifmsg.obj : .AUTODEPEND ..\..\src\msw\notifmsg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_richtooltip.obj : .AUTODEPEND ..\..\src\msw\richtooltip.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_sound.obj : .AUTODEPEND ..\..\src\msw\sound.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monodll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< -!endif - -$(OBJS)\monodll_version.res : .AUTODEPEND ..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\lexlib -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dwxUSE_BASE=1 -dWXMAKINGDLL $< - -$(OBJS)\monolib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_any.obj : .AUTODEPEND ..\..\src\common\any.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_arcall.obj : .AUTODEPEND ..\..\src\common\arcall.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_arcfind.obj : .AUTODEPEND ..\..\src\common\arcfind.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_archive.obj : .AUTODEPEND ..\..\src\common\archive.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_arrstr.obj : .AUTODEPEND ..\..\src\common\arrstr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_base64.obj : .AUTODEPEND ..\..\src\common\base64.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_cmdline.obj : .AUTODEPEND ..\..\src\common\cmdline.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_config.obj : .AUTODEPEND ..\..\src\common\config.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_convauto.obj : .AUTODEPEND ..\..\src\common\convauto.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_datetime.obj : .AUTODEPEND ..\..\src\common\datetime.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_datetimefmt.obj : .AUTODEPEND ..\..\src\common\datetimefmt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_datstrm.obj : .AUTODEPEND ..\..\src\common\datstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dircmn.obj : .AUTODEPEND ..\..\src\common\dircmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dynarray.obj : .AUTODEPEND ..\..\src\common\dynarray.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dynlib.obj : .AUTODEPEND ..\..\src\common\dynlib.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dynload.obj : .AUTODEPEND ..\..\src\common\dynload.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_encconv.obj : .AUTODEPEND ..\..\src\common\encconv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_evtloopcmn.obj : .AUTODEPEND ..\..\src\common\evtloopcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_extended.obj : .AUTODEPEND ..\..\src\common\extended.c - $(CC) -bt=nt -zq -fo=$^@ $(MONOLIB_CFLAGS) $< - -$(OBJS)\monolib_ffile.obj : .AUTODEPEND ..\..\src\common\ffile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_file.obj : .AUTODEPEND ..\..\src\common\file.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fileback.obj : .AUTODEPEND ..\..\src\common\fileback.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fileconf.obj : .AUTODEPEND ..\..\src\common\fileconf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_filefn.obj : .AUTODEPEND ..\..\src\common\filefn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_filename.obj : .AUTODEPEND ..\..\src\common\filename.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_filesys.obj : .AUTODEPEND ..\..\src\common\filesys.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_filtall.obj : .AUTODEPEND ..\..\src\common\filtall.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_filtfind.obj : .AUTODEPEND ..\..\src\common\filtfind.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fmapbase.obj : .AUTODEPEND ..\..\src\common\fmapbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fs_arc.obj : .AUTODEPEND ..\..\src\common\fs_arc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fs_filter.obj : .AUTODEPEND ..\..\src\common\fs_filter.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_hashmap.obj : .AUTODEPEND ..\..\src\common\hashmap.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_init.obj : .AUTODEPEND ..\..\src\common\init.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_intl.obj : .AUTODEPEND ..\..\src\common\intl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_ipcbase.obj : .AUTODEPEND ..\..\src\common\ipcbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_languageinfo.obj : .AUTODEPEND ..\..\src\common\languageinfo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_list.obj : .AUTODEPEND ..\..\src\common\list.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_log.obj : .AUTODEPEND ..\..\src\common\log.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_longlong.obj : .AUTODEPEND ..\..\src\common\longlong.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_memory.obj : .AUTODEPEND ..\..\src\common\memory.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_mimecmn.obj : .AUTODEPEND ..\..\src\common\mimecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_module.obj : .AUTODEPEND ..\..\src\common\module.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_mstream.obj : .AUTODEPEND ..\..\src\common\mstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_numformatter.obj : .AUTODEPEND ..\..\src\common\numformatter.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_object.obj : .AUTODEPEND ..\..\src\common\object.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_platinfo.obj : .AUTODEPEND ..\..\src\common\platinfo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_powercmn.obj : .AUTODEPEND ..\..\src\common\powercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_process.obj : .AUTODEPEND ..\..\src\common\process.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_regex.obj : .AUTODEPEND ..\..\src\common\regex.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stdpbase.obj : .AUTODEPEND ..\..\src\common\stdpbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_sstream.obj : .AUTODEPEND ..\..\src\common\sstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stdstream.obj : .AUTODEPEND ..\..\src\common\stdstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stopwatch.obj : .AUTODEPEND ..\..\src\common\stopwatch.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_strconv.obj : .AUTODEPEND ..\..\src\common\strconv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stream.obj : .AUTODEPEND ..\..\src\common\stream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_string.obj : .AUTODEPEND ..\..\src\common\string.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stringimpl.obj : .AUTODEPEND ..\..\src\common\stringimpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stringops.obj : .AUTODEPEND ..\..\src\common\stringops.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_strvararg.obj : .AUTODEPEND ..\..\src\common\strvararg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_sysopt.obj : .AUTODEPEND ..\..\src\common\sysopt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_tarstrm.obj : .AUTODEPEND ..\..\src\common\tarstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_threadinfo.obj : .AUTODEPEND ..\..\src\common\threadinfo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_time.obj : .AUTODEPEND ..\..\src\common\time.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_timerimpl.obj : .AUTODEPEND ..\..\src\common\timerimpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_translation.obj : .AUTODEPEND ..\..\src\common\translation.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_ustring.obj : .AUTODEPEND ..\..\src\common\ustring.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xlocale.obj : .AUTODEPEND ..\..\src\common\xlocale.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xtistrm.obj : .AUTODEPEND ..\..\src\common\xtistrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_zipstrm.obj : .AUTODEPEND ..\..\src\common\zipstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_zstream.obj : .AUTODEPEND ..\..\src\common\zstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fswatchercmn.obj : .AUTODEPEND ..\..\src\common\fswatchercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fswatcherg.obj : .AUTODEPEND ..\..\src\generic\fswatcherg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_basemsw.obj : .AUTODEPEND ..\..\src\msw\basemsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_crashrpt.obj : .AUTODEPEND ..\..\src\msw\crashrpt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_debughlp.obj : .AUTODEPEND ..\..\src\msw\debughlp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dde.obj : .AUTODEPEND ..\..\src\msw\dde.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dir.obj : .AUTODEPEND ..\..\src\msw\dir.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dlmsw.obj : .AUTODEPEND ..\..\src\msw\dlmsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_evtloopconsole.obj : .AUTODEPEND ..\..\src\msw\evtloopconsole.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_mimetype.obj : .AUTODEPEND ..\..\src\msw\mimetype.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_power.obj : .AUTODEPEND ..\..\src\msw\power.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_regconf.obj : .AUTODEPEND ..\..\src\msw\regconf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_registry.obj : .AUTODEPEND ..\..\src\msw\registry.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_snglinst.obj : .AUTODEPEND ..\..\src\msw\snglinst.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stackwalk.obj : .AUTODEPEND ..\..\src\msw\stackwalk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stdpaths.obj : .AUTODEPEND ..\..\src\msw\stdpaths.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_thread.obj : .AUTODEPEND ..\..\src\msw\thread.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_utils.obj : .AUTODEPEND ..\..\src\msw\utils.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_utilsexc.obj : .AUTODEPEND ..\..\src\msw\utilsexc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fswatcher.obj : .AUTODEPEND ..\..\src\msw\fswatcher.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_event.obj : .AUTODEPEND ..\..\src\common\event.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fs_mem.obj : .AUTODEPEND ..\..\src\common\fs_mem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fs_inet.obj : .AUTODEPEND ..\..\src\common\fs_inet.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_ftp.obj : .AUTODEPEND ..\..\src\common\ftp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_http.obj : .AUTODEPEND ..\..\src\common\http.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_protocol.obj : .AUTODEPEND ..\..\src\common\protocol.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_sckaddr.obj : .AUTODEPEND ..\..\src\common\sckaddr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_sckfile.obj : .AUTODEPEND ..\..\src\common\sckfile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_sckipc.obj : .AUTODEPEND ..\..\src\common\sckipc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_sckstrm.obj : .AUTODEPEND ..\..\src\common\sckstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_url.obj : .AUTODEPEND ..\..\src\common\url.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_sockmsw.obj : .AUTODEPEND ..\..\src\msw\sockmsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_generic_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_accel.obj : .AUTODEPEND ..\..\src\msw\accel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_anybutton.obj : .AUTODEPEND ..\..\src\msw\anybutton.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_artmsw.obj : .AUTODEPEND ..\..\src\msw\artmsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_bmpbuttn.obj : .AUTODEPEND ..\..\src\msw\bmpbuttn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_button.obj : .AUTODEPEND ..\..\src\msw\button.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_checkbox.obj : .AUTODEPEND ..\..\src\msw\checkbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_choice.obj : .AUTODEPEND ..\..\src\msw\choice.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_combo.obj : .AUTODEPEND ..\..\src\msw\combo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_combobox.obj : .AUTODEPEND ..\..\src\msw\combobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_control.obj : .AUTODEPEND ..\..\src\msw\control.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_dialog.obj : .AUTODEPEND ..\..\src\msw\dialog.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_gauge.obj : .AUTODEPEND ..\..\src\msw\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_headerctrl.obj : .AUTODEPEND ..\..\src\msw\headerctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_iniconf.obj : .AUTODEPEND ..\..\src\msw\iniconf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_listbox.obj : .AUTODEPEND ..\..\src\msw\listbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_listctrl.obj : .AUTODEPEND ..\..\src\msw\listctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_mdi.obj : .AUTODEPEND ..\..\src\msw\mdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_menu.obj : .AUTODEPEND ..\..\src\msw\menu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_menuitem.obj : .AUTODEPEND ..\..\src\msw\menuitem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_metafile.obj : .AUTODEPEND ..\..\src\msw\metafile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msgdlg.obj : .AUTODEPEND ..\..\src\msw\msgdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_nativdlg.obj : .AUTODEPEND ..\..\src\msw\nativdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_nativewin.obj : .AUTODEPEND ..\..\src\msw\nativewin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_notebook.obj : .AUTODEPEND ..\..\src\msw\notebook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_panel.obj : .AUTODEPEND ..\..\src\msw\panel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_progdlg.obj : .AUTODEPEND ..\..\src\msw\progdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_radiobox.obj : .AUTODEPEND ..\..\src\msw\radiobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_radiobut.obj : .AUTODEPEND ..\..\src\msw\radiobut.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richmsgdlg.obj : .AUTODEPEND ..\..\src\msw\richmsgdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_scrolbar.obj : .AUTODEPEND ..\..\src\msw\scrolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_slider.obj : .AUTODEPEND ..\..\src\msw\slider.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_spinbutt.obj : .AUTODEPEND ..\..\src\msw\spinbutt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_spinctrl.obj : .AUTODEPEND ..\..\src\msw\spinctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_statbmp.obj : .AUTODEPEND ..\..\src\msw\statbmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_statbox.obj : .AUTODEPEND ..\..\src\msw\statbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_statusbar.obj : .AUTODEPEND ..\..\src\msw\statusbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_statline.obj : .AUTODEPEND ..\..\src\msw\statline.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_stattext.obj : .AUTODEPEND ..\..\src\msw\stattext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_toolbar.obj : .AUTODEPEND ..\..\src\msw\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_textctrl.obj : .AUTODEPEND ..\..\src\msw\textctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_textentry.obj : .AUTODEPEND ..\..\src\msw\textentry.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_tglbtn.obj : .AUTODEPEND ..\..\src\msw\tglbtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_treectrl.obj : .AUTODEPEND ..\..\src\msw\treectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_checklst.obj : .AUTODEPEND ..\..\src\msw\checklst.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_msw_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_generic_accel.obj : .AUTODEPEND ..\..\src\generic\accel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_generic_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_generic_listctrl.obj : .AUTODEPEND ..\..\src\generic\listctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_button.obj : .AUTODEPEND ..\..\src\univ\button.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_checkbox.obj : .AUTODEPEND ..\..\src\univ\checkbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_checklst.obj : .AUTODEPEND ..\..\src\univ\checklst.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_choice.obj : .AUTODEPEND ..\..\src\univ\choice.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_combobox.obj : .AUTODEPEND ..\..\src\univ\combobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_control.obj : .AUTODEPEND ..\..\src\univ\control.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_inphand.obj : .AUTODEPEND ..\..\src\univ\inphand.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_listbox.obj : .AUTODEPEND ..\..\src\univ\listbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_menu.obj : .AUTODEPEND ..\..\src\univ\menu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_notebook.obj : .AUTODEPEND ..\..\src\univ\notebook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_radiobox.obj : .AUTODEPEND ..\..\src\univ\radiobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_radiobut.obj : .AUTODEPEND ..\..\src\univ\radiobut.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_settingsuniv.obj : .AUTODEPEND ..\..\src\univ\settingsuniv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_spinbutt.obj : .AUTODEPEND ..\..\src\univ\spinbutt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_statbmp.obj : .AUTODEPEND ..\..\src\univ\statbmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_statbox.obj : .AUTODEPEND ..\..\src\univ\statbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_statline.obj : .AUTODEPEND ..\..\src\univ\statline.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_statusbr.obj : .AUTODEPEND ..\..\src\univ\statusbr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_tglbtn.obj : .AUTODEPEND ..\..\src\univ\tglbtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_univ_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_winuniv.obj : .AUTODEPEND ..\..\src\univ\winuniv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_gtk.obj : .AUTODEPEND ..\..\src\univ\themes\gtk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_metal.obj : .AUTODEPEND ..\..\src\univ\themes\metal.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_mono.obj : .AUTODEPEND ..\..\src\univ\themes\mono.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_win32.obj : .AUTODEPEND ..\..\src\univ\themes\win32.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_bmpcbox.obj : .AUTODEPEND ..\..\src\msw\bmpcbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_calctrl.obj : .AUTODEPEND ..\..\src\msw\calctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_commandlinkbutton.obj : .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_datecontrols.obj : .AUTODEPEND ..\..\src\msw\datecontrols.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_datetimectrl.obj : .AUTODEPEND ..\..\src\msw\datetimectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_hyperlink.obj : .AUTODEPEND ..\..\src\msw\hyperlink.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_timectrl.obj : .AUTODEPEND ..\..\src\msw\timectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_mediactrl_am.obj : .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_mediactrl_qt.obj : .AUTODEPEND ..\..\src\msw\mediactrl_qt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_helpbest.obj : .AUTODEPEND ..\..\src\msw\helpbest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_helpctrl.obj : .AUTODEPEND ..\..\src\html\helpctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_helpdata.obj : .AUTODEPEND ..\..\src\html\helpdata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_helpdlg.obj : .AUTODEPEND ..\..\src\html\helpdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_helpfrm.obj : .AUTODEPEND ..\..\src\html\helpfrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_helpwnd.obj : .AUTODEPEND ..\..\src\html\helpwnd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_htmlcell.obj : .AUTODEPEND ..\..\src\html\htmlcell.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_htmlfilt.obj : .AUTODEPEND ..\..\src\html\htmlfilt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_htmlpars.obj : .AUTODEPEND ..\..\src\html\htmlpars.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_htmltag.obj : .AUTODEPEND ..\..\src\html\htmltag.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_htmlwin.obj : .AUTODEPEND ..\..\src\html\htmlwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_htmprint.obj : .AUTODEPEND ..\..\src\html\htmprint.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_dflist.obj : .AUTODEPEND ..\..\src\html\m_dflist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_fonts.obj : .AUTODEPEND ..\..\src\html\m_fonts.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_hline.obj : .AUTODEPEND ..\..\src\html\m_hline.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_image.obj : .AUTODEPEND ..\..\src\html\m_image.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_layout.obj : .AUTODEPEND ..\..\src\html\m_layout.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_links.obj : .AUTODEPEND ..\..\src\html\m_links.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_list.obj : .AUTODEPEND ..\..\src\html\m_list.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_pre.obj : .AUTODEPEND ..\..\src\html\m_pre.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_span.obj : .AUTODEPEND ..\..\src\html\m_span.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_style.obj : .AUTODEPEND ..\..\src\html\m_style.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_m_tables.obj : .AUTODEPEND ..\..\src\html\m_tables.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_styleparams.obj : .AUTODEPEND ..\..\src\html\styleparams.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_htmllbox.obj : .AUTODEPEND ..\..\src\generic\htmllbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_webview_ie.obj : .AUTODEPEND ..\..\src\msw\webview_ie.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_webview.obj : .AUTODEPEND ..\..\src\common\webview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_webviewarchivehandler.obj : .AUTODEPEND ..\..\src\common\webviewarchivehandler.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_webviewfshandler.obj : .AUTODEPEND ..\..\src\common\webviewfshandler.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_debugrpt.obj : .AUTODEPEND ..\..\src\common\debugrpt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_bannerwindow.obj : .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_bmpcbox.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpcbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_bmpbt.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_bttn.obj : .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_cald.obj : .AUTODEPEND ..\..\src\xrc\xh_cald.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_chckb.obj : .AUTODEPEND ..\..\src\xrc\xh_chckb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_chckl.obj : .AUTODEPEND ..\..\src\xrc\xh_chckl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_choic.obj : .AUTODEPEND ..\..\src\xrc\xh_choic.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_choicbk.obj : .AUTODEPEND ..\..\src\xrc\xh_choicbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_clrpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_clrpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_cmdlinkbn.obj : .AUTODEPEND ..\..\src\xrc\xh_cmdlinkbn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_collpane.obj : .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_comboctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_comboctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_datectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_dirpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_dirpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_editlbox.obj : .AUTODEPEND ..\..\src\xrc\xh_editlbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_filectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_filectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_filepicker.obj : .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_fontpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_fontpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_gdctl.obj : .AUTODEPEND ..\..\src\xrc\xh_gdctl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_grid.obj : .AUTODEPEND ..\..\src\xrc\xh_grid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_html.obj : .AUTODEPEND ..\..\src\xrc\xh_html.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_hyperlink.obj : .AUTODEPEND ..\..\src\xrc\xh_hyperlink.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_listb.obj : .AUTODEPEND ..\..\src\xrc\xh_listb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_listbk.obj : .AUTODEPEND ..\..\src\xrc\xh_listbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_listc.obj : .AUTODEPEND ..\..\src\xrc\xh_listc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_menu.obj : .AUTODEPEND ..\..\src\xrc\xh_menu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_notbk.obj : .AUTODEPEND ..\..\src\xrc\xh_notbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_odcombo.obj : .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_propdlg.obj : .AUTODEPEND ..\..\src\xrc\xh_propdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_radbx.obj : .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_htmllbox.obj : .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_slidr.obj : .AUTODEPEND ..\..\src\xrc\xh_slidr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_srchctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_srchctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_stbmp.obj : .AUTODEPEND ..\..\src\xrc\xh_stbmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_stbox.obj : .AUTODEPEND ..\..\src\xrc\xh_stbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_stlin.obj : .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_sttxt.obj : .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_text.obj : .AUTODEPEND ..\..\src\xrc\xh_text.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_tglbtn.obj : .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_timectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_toolbk.obj : .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_tree.obj : .AUTODEPEND ..\..\src\xrc\xh_tree.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_treebk.obj : .AUTODEPEND ..\..\src\xrc\xh_treebk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_unkwn.obj : .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xmladv.obj : .AUTODEPEND ..\..\src\xrc\xmladv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_framemanager.obj : .AUTODEPEND ..\..\src\aui\framemanager.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_auibar.obj : .AUTODEPEND ..\..\src\aui\auibar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_tabart.obj : .AUTODEPEND ..\..\src\aui\tabart.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_auinotbk.obj : .AUTODEPEND ..\..\src\xrc\xh_auinotbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_advprops.obj : .AUTODEPEND ..\..\src\propgrid\advprops.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_editors.obj : .AUTODEPEND ..\..\src\propgrid\editors.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_manager.obj : .AUTODEPEND ..\..\src\propgrid\manager.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_property.obj : .AUTODEPEND ..\..\src\propgrid\property.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_propgrid.obj : .AUTODEPEND ..\..\src\propgrid\propgrid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_propgridiface.obj : .AUTODEPEND ..\..\src\propgrid\propgridiface.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_propgridpagestate.obj : .AUTODEPEND ..\..\src\propgrid\propgridpagestate.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_props.obj : .AUTODEPEND ..\..\src\propgrid\props.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_art_internal.obj : .AUTODEPEND ..\..\src\ribbon\art_internal.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_art_msw.obj : .AUTODEPEND ..\..\src\ribbon\art_msw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_art_aui.obj : .AUTODEPEND ..\..\src\ribbon\art_aui.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_bar.obj : .AUTODEPEND ..\..\src\ribbon\bar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_ribbon_buttonbar.obj : .AUTODEPEND ..\..\src\ribbon\buttonbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_ribbon_control.obj : .AUTODEPEND ..\..\src\ribbon\control.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_gallery.obj : .AUTODEPEND ..\..\src\ribbon\gallery.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_page.obj : .AUTODEPEND ..\..\src\ribbon\page.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_ribbon_panel.obj : .AUTODEPEND ..\..\src\ribbon\panel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_ribbon_toolbar.obj : .AUTODEPEND ..\..\src\ribbon\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_ribbon.obj : .AUTODEPEND ..\..\src\xrc\xh_ribbon.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextformatdlg.obj : .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextimagedlg.obj : .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextprint.obj : .AUTODEPEND ..\..\src\richtext\richtextprint.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_PlatWX.obj : .AUTODEPEND ..\..\src\stc\PlatWX.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_ScintillaWX.obj : .AUTODEPEND ..\..\src\stc\ScintillaWX.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -$(OBJS)\monolib_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< - -!ifeq USE_GUI 1 -$(OBJS)\monolib_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_app.obj : .AUTODEPEND ..\..\src\msw\app.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_bitmap.obj : .AUTODEPEND ..\..\src\msw\bitmap.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_brush.obj : .AUTODEPEND ..\..\src\msw\brush.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_caret.obj : .AUTODEPEND ..\..\src\msw\caret.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_clipbrd.obj : .AUTODEPEND ..\..\src\msw\clipbrd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_colour.obj : .AUTODEPEND ..\..\src\msw\colour.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_cursor.obj : .AUTODEPEND ..\..\src\msw\cursor.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_data.obj : .AUTODEPEND ..\..\src\msw\data.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dc.obj : .AUTODEPEND ..\..\src\msw\dc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dcclient.obj : .AUTODEPEND ..\..\src\msw\dcclient.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dcmemory.obj : .AUTODEPEND ..\..\src\msw\dcmemory.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dcprint.obj : .AUTODEPEND ..\..\src\msw\dcprint.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dcscreen.obj : .AUTODEPEND ..\..\src\msw\dcscreen.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dialup.obj : .AUTODEPEND ..\..\src\msw\dialup.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dib.obj : .AUTODEPEND ..\..\src\msw\dib.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_display.obj : .AUTODEPEND ..\..\src\msw\display.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_enhmeta.obj : .AUTODEPEND ..\..\src\msw\enhmeta.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_font.obj : .AUTODEPEND ..\..\src\msw\font.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fontenum.obj : .AUTODEPEND ..\..\src\msw\fontenum.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fontutil.obj : .AUTODEPEND ..\..\src\msw\fontutil.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_gdiimage.obj : .AUTODEPEND ..\..\src\msw\gdiimage.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_gdiplus.obj : .AUTODEPEND ..\..\src\msw\gdiplus.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_icon.obj : .AUTODEPEND ..\..\src\msw\icon.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imaglist.obj : .AUTODEPEND ..\..\src\msw\imaglist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_minifram.obj : .AUTODEPEND ..\..\src\msw\minifram.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_nonownedwnd.obj : .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dataobj.obj : .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dropsrc.obj : .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_droptgt.obj : .AUTODEPEND ..\..\src\msw\ole\droptgt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_oleutils.obj : .AUTODEPEND ..\..\src\msw\ole\oleutils.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_safearray.obj : .AUTODEPEND ..\..\src\msw\ole\safearray.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_palette.obj : .AUTODEPEND ..\..\src\msw\palette.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_pen.obj : .AUTODEPEND ..\..\src\msw\pen.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_popupwin.obj : .AUTODEPEND ..\..\src\msw\popupwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_printdlg.obj : .AUTODEPEND ..\..\src\msw\printdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_printwin.obj : .AUTODEPEND ..\..\src\msw\printwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_region.obj : .AUTODEPEND ..\..\src\msw\region.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_renderer.obj : .AUTODEPEND ..\..\src\msw\renderer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_toplevel.obj : .AUTODEPEND ..\..\src\msw\toplevel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_uiaction.obj : .AUTODEPEND ..\..\src\msw\uiaction.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_utilsgui.obj : .AUTODEPEND ..\..\src\msw\utilsgui.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_utilswin.obj : .AUTODEPEND ..\..\src\msw\utilswin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_uxtheme.obj : .AUTODEPEND ..\..\src\msw\uxtheme.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_window.obj : .AUTODEPEND ..\..\src\msw\window.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_automtn.obj : .AUTODEPEND ..\..\src\msw\ole\automtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_accelcmn.obj : .AUTODEPEND ..\..\src\common\accelcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_anidecod.obj : .AUTODEPEND ..\..\src\common\anidecod.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_affinematrix2d.obj : .AUTODEPEND ..\..\src\common\affinematrix2d.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_appcmn.obj : .AUTODEPEND ..\..\src\common\appcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_artprov.obj : .AUTODEPEND ..\..\src\common\artprov.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_artstd.obj : .AUTODEPEND ..\..\src\common\artstd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_arttango.obj : .AUTODEPEND ..\..\src\common\arttango.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_bmpbtncmn.obj : .AUTODEPEND ..\..\src\common\bmpbtncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_btncmn.obj : .AUTODEPEND ..\..\src\common\btncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_checkboxcmn.obj : .AUTODEPEND ..\..\src\common\checkboxcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_checklstcmn.obj : .AUTODEPEND ..\..\src\common\checklstcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_choiccmn.obj : .AUTODEPEND ..\..\src\common\choiccmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_clipcmn.obj : .AUTODEPEND ..\..\src\common\clipcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_clrpickercmn.obj : .AUTODEPEND ..\..\src\common\clrpickercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_colourcmn.obj : .AUTODEPEND ..\..\src\common\colourcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_colourdata.obj : .AUTODEPEND ..\..\src\common\colourdata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_combocmn.obj : .AUTODEPEND ..\..\src\common\combocmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_cmndata.obj : .AUTODEPEND ..\..\src\common\cmndata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_containr.obj : .AUTODEPEND ..\..\src\common\containr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_cshelp.obj : .AUTODEPEND ..\..\src\common\cshelp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_ctrlcmn.obj : .AUTODEPEND ..\..\src\common\ctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_ctrlsub.obj : .AUTODEPEND ..\..\src\common\ctrlsub.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dcbase.obj : .AUTODEPEND ..\..\src\common\dcbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dcbufcmn.obj : .AUTODEPEND ..\..\src\common\dcbufcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dcgraph.obj : .AUTODEPEND ..\..\src\common\dcgraph.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dcsvg.obj : .AUTODEPEND ..\..\src\common\dcsvg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dirctrlcmn.obj : .AUTODEPEND ..\..\src\common\dirctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dndcmn.obj : .AUTODEPEND ..\..\src\common\dndcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dobjcmn.obj : .AUTODEPEND ..\..\src\common\dobjcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_docmdi.obj : .AUTODEPEND ..\..\src\common\docmdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_docview.obj : .AUTODEPEND ..\..\src\common\docview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dpycmn.obj : .AUTODEPEND ..\..\src\common\dpycmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dseldlg.obj : .AUTODEPEND ..\..\src\common\dseldlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_effects.obj : .AUTODEPEND ..\..\src\common\effects.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fddlgcmn.obj : .AUTODEPEND ..\..\src\common\fddlgcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_filectrlcmn.obj : .AUTODEPEND ..\..\src\common\filectrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_filehistorycmn.obj : .AUTODEPEND ..\..\src\common\filehistorycmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_filepickercmn.obj : .AUTODEPEND ..\..\src\common\filepickercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fontpickercmn.obj : .AUTODEPEND ..\..\src\common\fontpickercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fldlgcmn.obj : .AUTODEPEND ..\..\src\common\fldlgcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fontcmn.obj : .AUTODEPEND ..\..\src\common\fontcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fontdata.obj : .AUTODEPEND ..\..\src\common\fontdata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_graphicc.obj : .AUTODEPEND ..\..\src\generic\graphicc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fontenumcmn.obj : .AUTODEPEND ..\..\src\common\fontenumcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_fontutilcmn.obj : .AUTODEPEND ..\..\src\common\fontutilcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_framecmn.obj : .AUTODEPEND ..\..\src\common\framecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_gaugecmn.obj : .AUTODEPEND ..\..\src\common\gaugecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_gbsizer.obj : .AUTODEPEND ..\..\src\common\gbsizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_gdicmn.obj : .AUTODEPEND ..\..\src\common\gdicmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_geometry.obj : .AUTODEPEND ..\..\src\common\geometry.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_gifdecod.obj : .AUTODEPEND ..\..\src\common\gifdecod.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_headercolcmn.obj : .AUTODEPEND ..\..\src\common\headercolcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_headerctrlcmn.obj : .AUTODEPEND ..\..\src\common\headerctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_helpbase.obj : .AUTODEPEND ..\..\src\common\helpbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_iconbndl.obj : .AUTODEPEND ..\..\src\common\iconbndl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagall.obj : .AUTODEPEND ..\..\src\common\imagall.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagbmp.obj : .AUTODEPEND ..\..\src\common\imagbmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_image.obj : .AUTODEPEND ..\..\src\common\image.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagfill.obj : .AUTODEPEND ..\..\src\common\imagfill.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imaggif.obj : .AUTODEPEND ..\..\src\common\imaggif.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagiff.obj : .AUTODEPEND ..\..\src\common\imagiff.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagjpeg.obj : .AUTODEPEND ..\..\src\common\imagjpeg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagpcx.obj : .AUTODEPEND ..\..\src\common\imagpcx.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagpng.obj : .AUTODEPEND ..\..\src\common\imagpng.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagpnm.obj : .AUTODEPEND ..\..\src\common\imagpnm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagtga.obj : .AUTODEPEND ..\..\src\common\imagtga.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagtiff.obj : .AUTODEPEND ..\..\src\common\imagtiff.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_imagxpm.obj : .AUTODEPEND ..\..\src\common\imagxpm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_layout.obj : .AUTODEPEND ..\..\src\common\layout.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_lboxcmn.obj : .AUTODEPEND ..\..\src\common\lboxcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_listctrlcmn.obj : .AUTODEPEND ..\..\src\common\listctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_markupparser.obj : .AUTODEPEND ..\..\src\common\markupparser.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_matrix.obj : .AUTODEPEND ..\..\src\common\matrix.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_menucmn.obj : .AUTODEPEND ..\..\src\common\menucmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_modalhook.obj : .AUTODEPEND ..\..\src\common\modalhook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_mousemanager.obj : .AUTODEPEND ..\..\src\common\mousemanager.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_ownerdrwcmn.obj : .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_panelcmn.obj : .AUTODEPEND ..\..\src\common\panelcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_popupcmn.obj : .AUTODEPEND ..\..\src\common\popupcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_preferencescmn.obj : .AUTODEPEND ..\..\src\common\preferencescmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_prntbase.obj : .AUTODEPEND ..\..\src\common\prntbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_quantize.obj : .AUTODEPEND ..\..\src\common\quantize.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_radiobtncmn.obj : .AUTODEPEND ..\..\src\common\radiobtncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_radiocmn.obj : .AUTODEPEND ..\..\src\common\radiocmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_rearrangectrl.obj : .AUTODEPEND ..\..\src\common\rearrangectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_rendcmn.obj : .AUTODEPEND ..\..\src\common\rendcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_rgncmn.obj : .AUTODEPEND ..\..\src\common\rgncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_scrolbarcmn.obj : .AUTODEPEND ..\..\src\common\scrolbarcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_settcmn.obj : .AUTODEPEND ..\..\src\common\settcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_slidercmn.obj : .AUTODEPEND ..\..\src\common\slidercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_spinbtncmn.obj : .AUTODEPEND ..\..\src\common\spinbtncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_spinctrlcmn.obj : .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_statbmpcmn.obj : .AUTODEPEND ..\..\src\common\statbmpcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_statboxcmn.obj : .AUTODEPEND ..\..\src\common\statboxcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_statlinecmn.obj : .AUTODEPEND ..\..\src\common\statlinecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_stattextcmn.obj : .AUTODEPEND ..\..\src\common\stattextcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_tbarbase.obj : .AUTODEPEND ..\..\src\common\tbarbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_treebase.obj : .AUTODEPEND ..\..\src\common\treebase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_uiactioncmn.obj : .AUTODEPEND ..\..\src\common\uiactioncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_valgen.obj : .AUTODEPEND ..\..\src\common\valgen.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_validate.obj : .AUTODEPEND ..\..\src\common\validate.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_valtext.obj : .AUTODEPEND ..\..\src\common\valtext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_valnum.obj : .AUTODEPEND ..\..\src\common\valnum.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_wincmn.obj : .AUTODEPEND ..\..\src\common\wincmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_windowid.obj : .AUTODEPEND ..\..\src\common\windowid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_wrapsizer.obj : .AUTODEPEND ..\..\src\common\wrapsizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_busyinfo.obj : .AUTODEPEND ..\..\src\generic\busyinfo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_generic_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dcpsg.obj : .AUTODEPEND ..\..\src\generic\dcpsg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dirctrlg.obj : .AUTODEPEND ..\..\src\generic\dirctrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_filectrlg.obj : .AUTODEPEND ..\..\src\generic\filectrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_headerctrlg.obj : .AUTODEPEND ..\..\src\generic\headerctrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_infobar.obj : .AUTODEPEND ..\..\src\generic\infobar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_markuptext.obj : .AUTODEPEND ..\..\src\generic\markuptext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_preferencesg.obj : .AUTODEPEND ..\..\src\generic\preferencesg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_printps.obj : .AUTODEPEND ..\..\src\generic\printps.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_renderg.obj : .AUTODEPEND ..\..\src\generic\renderg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_richmsgdlgg.obj : .AUTODEPEND ..\..\src\generic\richmsgdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_scrlwing.obj : .AUTODEPEND ..\..\src\generic\scrlwing.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_selstore.obj : .AUTODEPEND ..\..\src\generic\selstore.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_spinctlg.obj : .AUTODEPEND ..\..\src\generic\spinctlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_statbmpg.obj : .AUTODEPEND ..\..\src\generic\statbmpg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_stattextg.obj : .AUTODEPEND ..\..\src\generic\stattextg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_tipwin.obj : .AUTODEPEND ..\..\src\generic\tipwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_toolbkg.obj : .AUTODEPEND ..\..\src\generic\toolbkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_treectlg.obj : .AUTODEPEND ..\..\src\generic\treectlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_treebkg.obj : .AUTODEPEND ..\..\src\generic\treebkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_vlbox.obj : .AUTODEPEND ..\..\src\generic\vlbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_xmlreshandler.obj : .AUTODEPEND ..\..\src\xrc\xmlreshandler.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_bmpcboxcmn.obj : .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_gridcmn.obj : .AUTODEPEND ..\..\src\common\gridcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_hyperlnkcmn.obj : .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_richtooltipcmn.obj : .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_bannerwindow.obj : .AUTODEPEND ..\..\src\generic\bannerwindow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_calctrlg.obj : .AUTODEPEND ..\..\src\generic\calctrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_commandlinkbuttong.obj : .AUTODEPEND ..\..\src\generic\commandlinkbuttong.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_editlbox.obj : .AUTODEPEND ..\..\src\generic\editlbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_gridctrl.obj : .AUTODEPEND ..\..\src\generic\gridctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_grideditors.obj : .AUTODEPEND ..\..\src\generic\grideditors.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_gridsel.obj : .AUTODEPEND ..\..\src\generic\gridsel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_hyperlinkg.obj : .AUTODEPEND ..\..\src\generic\hyperlinkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_notifmsgg.obj : .AUTODEPEND ..\..\src\generic\notifmsgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_odcombo.obj : .AUTODEPEND ..\..\src\generic\odcombo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_propdlg.obj : .AUTODEPEND ..\..\src\generic\propdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_richtooltipg.obj : .AUTODEPEND ..\..\src\generic\richtooltipg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_sashwin.obj : .AUTODEPEND ..\..\src\generic\sashwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_splash.obj : .AUTODEPEND ..\..\src\generic\splash.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_timectrlg.obj : .AUTODEPEND ..\..\src\generic\timectrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_treelist.obj : .AUTODEPEND ..\..\src\generic\treelist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_notifmsg.obj : .AUTODEPEND ..\..\src\msw\notifmsg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_richtooltip.obj : .AUTODEPEND ..\..\src\msw\richtooltip.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_sound.obj : .AUTODEPEND ..\..\src\msw\sound.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\monolib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< -!endif - -$(OBJS)\basedll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_version.res : .AUTODEPEND ..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)$(WXCOMPILER)$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXMAKINGDLL_BASE -dwxUSE_BASE=1 $< - -$(OBJS)\basedll_any.obj : .AUTODEPEND ..\..\src\common\any.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_arcall.obj : .AUTODEPEND ..\..\src\common\arcall.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_arcfind.obj : .AUTODEPEND ..\..\src\common\arcfind.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_archive.obj : .AUTODEPEND ..\..\src\common\archive.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_arrstr.obj : .AUTODEPEND ..\..\src\common\arrstr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_base64.obj : .AUTODEPEND ..\..\src\common\base64.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_cmdline.obj : .AUTODEPEND ..\..\src\common\cmdline.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_config.obj : .AUTODEPEND ..\..\src\common\config.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_convauto.obj : .AUTODEPEND ..\..\src\common\convauto.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_datetime.obj : .AUTODEPEND ..\..\src\common\datetime.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_datetimefmt.obj : .AUTODEPEND ..\..\src\common\datetimefmt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_datstrm.obj : .AUTODEPEND ..\..\src\common\datstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_dircmn.obj : .AUTODEPEND ..\..\src\common\dircmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_dynarray.obj : .AUTODEPEND ..\..\src\common\dynarray.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_dynlib.obj : .AUTODEPEND ..\..\src\common\dynlib.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_dynload.obj : .AUTODEPEND ..\..\src\common\dynload.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_encconv.obj : .AUTODEPEND ..\..\src\common\encconv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_evtloopcmn.obj : .AUTODEPEND ..\..\src\common\evtloopcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_extended.obj : .AUTODEPEND ..\..\src\common\extended.c - $(CC) -bt=nt -zq -fo=$^@ $(BASEDLL_CFLAGS) $< - -$(OBJS)\basedll_ffile.obj : .AUTODEPEND ..\..\src\common\ffile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_file.obj : .AUTODEPEND ..\..\src\common\file.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_fileback.obj : .AUTODEPEND ..\..\src\common\fileback.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_fileconf.obj : .AUTODEPEND ..\..\src\common\fileconf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_filefn.obj : .AUTODEPEND ..\..\src\common\filefn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_filename.obj : .AUTODEPEND ..\..\src\common\filename.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_filesys.obj : .AUTODEPEND ..\..\src\common\filesys.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_filtall.obj : .AUTODEPEND ..\..\src\common\filtall.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_filtfind.obj : .AUTODEPEND ..\..\src\common\filtfind.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_fmapbase.obj : .AUTODEPEND ..\..\src\common\fmapbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_fs_arc.obj : .AUTODEPEND ..\..\src\common\fs_arc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_fs_filter.obj : .AUTODEPEND ..\..\src\common\fs_filter.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_hashmap.obj : .AUTODEPEND ..\..\src\common\hashmap.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_init.obj : .AUTODEPEND ..\..\src\common\init.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_intl.obj : .AUTODEPEND ..\..\src\common\intl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_ipcbase.obj : .AUTODEPEND ..\..\src\common\ipcbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_languageinfo.obj : .AUTODEPEND ..\..\src\common\languageinfo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_list.obj : .AUTODEPEND ..\..\src\common\list.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_log.obj : .AUTODEPEND ..\..\src\common\log.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_longlong.obj : .AUTODEPEND ..\..\src\common\longlong.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_memory.obj : .AUTODEPEND ..\..\src\common\memory.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_mimecmn.obj : .AUTODEPEND ..\..\src\common\mimecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_module.obj : .AUTODEPEND ..\..\src\common\module.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_mstream.obj : .AUTODEPEND ..\..\src\common\mstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_numformatter.obj : .AUTODEPEND ..\..\src\common\numformatter.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_object.obj : .AUTODEPEND ..\..\src\common\object.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_platinfo.obj : .AUTODEPEND ..\..\src\common\platinfo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_powercmn.obj : .AUTODEPEND ..\..\src\common\powercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_process.obj : .AUTODEPEND ..\..\src\common\process.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_regex.obj : .AUTODEPEND ..\..\src\common\regex.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_stdpbase.obj : .AUTODEPEND ..\..\src\common\stdpbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_sstream.obj : .AUTODEPEND ..\..\src\common\sstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_stdstream.obj : .AUTODEPEND ..\..\src\common\stdstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_stopwatch.obj : .AUTODEPEND ..\..\src\common\stopwatch.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_strconv.obj : .AUTODEPEND ..\..\src\common\strconv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_stream.obj : .AUTODEPEND ..\..\src\common\stream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_string.obj : .AUTODEPEND ..\..\src\common\string.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_stringimpl.obj : .AUTODEPEND ..\..\src\common\stringimpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_stringops.obj : .AUTODEPEND ..\..\src\common\stringops.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_strvararg.obj : .AUTODEPEND ..\..\src\common\strvararg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_sysopt.obj : .AUTODEPEND ..\..\src\common\sysopt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_tarstrm.obj : .AUTODEPEND ..\..\src\common\tarstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_threadinfo.obj : .AUTODEPEND ..\..\src\common\threadinfo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_time.obj : .AUTODEPEND ..\..\src\common\time.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_timerimpl.obj : .AUTODEPEND ..\..\src\common\timerimpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_translation.obj : .AUTODEPEND ..\..\src\common\translation.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_ustring.obj : .AUTODEPEND ..\..\src\common\ustring.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_xlocale.obj : .AUTODEPEND ..\..\src\common\xlocale.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_xtistrm.obj : .AUTODEPEND ..\..\src\common\xtistrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_zipstrm.obj : .AUTODEPEND ..\..\src\common\zipstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_zstream.obj : .AUTODEPEND ..\..\src\common\zstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_fswatchercmn.obj : .AUTODEPEND ..\..\src\common\fswatchercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_fswatcherg.obj : .AUTODEPEND ..\..\src\generic\fswatcherg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_basemsw.obj : .AUTODEPEND ..\..\src\msw\basemsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_crashrpt.obj : .AUTODEPEND ..\..\src\msw\crashrpt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_debughlp.obj : .AUTODEPEND ..\..\src\msw\debughlp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_dde.obj : .AUTODEPEND ..\..\src\msw\dde.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_dir.obj : .AUTODEPEND ..\..\src\msw\dir.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_dlmsw.obj : .AUTODEPEND ..\..\src\msw\dlmsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_evtloopconsole.obj : .AUTODEPEND ..\..\src\msw\evtloopconsole.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_mimetype.obj : .AUTODEPEND ..\..\src\msw\mimetype.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_power.obj : .AUTODEPEND ..\..\src\msw\power.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_regconf.obj : .AUTODEPEND ..\..\src\msw\regconf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_registry.obj : .AUTODEPEND ..\..\src\msw\registry.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_snglinst.obj : .AUTODEPEND ..\..\src\msw\snglinst.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_stackwalk.obj : .AUTODEPEND ..\..\src\msw\stackwalk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_stdpaths.obj : .AUTODEPEND ..\..\src\msw\stdpaths.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_thread.obj : .AUTODEPEND ..\..\src\msw\thread.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_utils.obj : .AUTODEPEND ..\..\src\msw\utils.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_utilsexc.obj : .AUTODEPEND ..\..\src\msw\utilsexc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_fswatcher.obj : .AUTODEPEND ..\..\src\msw\fswatcher.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_event.obj : .AUTODEPEND ..\..\src\common\event.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_fs_mem.obj : .AUTODEPEND ..\..\src\common\fs_mem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\basedll_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASEDLL_CXXFLAGS) $< - -$(OBJS)\baselib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_any.obj : .AUTODEPEND ..\..\src\common\any.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_appbase.obj : .AUTODEPEND ..\..\src\common\appbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_arcall.obj : .AUTODEPEND ..\..\src\common\arcall.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_arcfind.obj : .AUTODEPEND ..\..\src\common\arcfind.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_archive.obj : .AUTODEPEND ..\..\src\common\archive.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_arrstr.obj : .AUTODEPEND ..\..\src\common\arrstr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_base64.obj : .AUTODEPEND ..\..\src\common\base64.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_clntdata.obj : .AUTODEPEND ..\..\src\common\clntdata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_cmdline.obj : .AUTODEPEND ..\..\src\common\cmdline.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_config.obj : .AUTODEPEND ..\..\src\common\config.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_convauto.obj : .AUTODEPEND ..\..\src\common\convauto.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_datetime.obj : .AUTODEPEND ..\..\src\common\datetime.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_datetimefmt.obj : .AUTODEPEND ..\..\src\common\datetimefmt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_datstrm.obj : .AUTODEPEND ..\..\src\common\datstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_dircmn.obj : .AUTODEPEND ..\..\src\common\dircmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_dynarray.obj : .AUTODEPEND ..\..\src\common\dynarray.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_dynlib.obj : .AUTODEPEND ..\..\src\common\dynlib.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_dynload.obj : .AUTODEPEND ..\..\src\common\dynload.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_encconv.obj : .AUTODEPEND ..\..\src\common\encconv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_evtloopcmn.obj : .AUTODEPEND ..\..\src\common\evtloopcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_extended.obj : .AUTODEPEND ..\..\src\common\extended.c - $(CC) -bt=nt -zq -fo=$^@ $(BASELIB_CFLAGS) $< - -$(OBJS)\baselib_ffile.obj : .AUTODEPEND ..\..\src\common\ffile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_file.obj : .AUTODEPEND ..\..\src\common\file.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_fileback.obj : .AUTODEPEND ..\..\src\common\fileback.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_fileconf.obj : .AUTODEPEND ..\..\src\common\fileconf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_filefn.obj : .AUTODEPEND ..\..\src\common\filefn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_filename.obj : .AUTODEPEND ..\..\src\common\filename.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_filesys.obj : .AUTODEPEND ..\..\src\common\filesys.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_filtall.obj : .AUTODEPEND ..\..\src\common\filtall.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_filtfind.obj : .AUTODEPEND ..\..\src\common\filtfind.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_fmapbase.obj : .AUTODEPEND ..\..\src\common\fmapbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_fs_arc.obj : .AUTODEPEND ..\..\src\common\fs_arc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_fs_filter.obj : .AUTODEPEND ..\..\src\common\fs_filter.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_hash.obj : .AUTODEPEND ..\..\src\common\hash.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_hashmap.obj : .AUTODEPEND ..\..\src\common\hashmap.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_init.obj : .AUTODEPEND ..\..\src\common\init.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_intl.obj : .AUTODEPEND ..\..\src\common\intl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_ipcbase.obj : .AUTODEPEND ..\..\src\common\ipcbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_languageinfo.obj : .AUTODEPEND ..\..\src\common\languageinfo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_list.obj : .AUTODEPEND ..\..\src\common\list.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_log.obj : .AUTODEPEND ..\..\src\common\log.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_longlong.obj : .AUTODEPEND ..\..\src\common\longlong.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_memory.obj : .AUTODEPEND ..\..\src\common\memory.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_mimecmn.obj : .AUTODEPEND ..\..\src\common\mimecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_module.obj : .AUTODEPEND ..\..\src\common\module.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_mstream.obj : .AUTODEPEND ..\..\src\common\mstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_numformatter.obj : .AUTODEPEND ..\..\src\common\numformatter.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_object.obj : .AUTODEPEND ..\..\src\common\object.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_platinfo.obj : .AUTODEPEND ..\..\src\common\platinfo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_powercmn.obj : .AUTODEPEND ..\..\src\common\powercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_process.obj : .AUTODEPEND ..\..\src\common\process.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_regex.obj : .AUTODEPEND ..\..\src\common\regex.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_stdpbase.obj : .AUTODEPEND ..\..\src\common\stdpbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_sstream.obj : .AUTODEPEND ..\..\src\common\sstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_stdstream.obj : .AUTODEPEND ..\..\src\common\stdstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_stopwatch.obj : .AUTODEPEND ..\..\src\common\stopwatch.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_strconv.obj : .AUTODEPEND ..\..\src\common\strconv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_stream.obj : .AUTODEPEND ..\..\src\common\stream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_string.obj : .AUTODEPEND ..\..\src\common\string.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_stringimpl.obj : .AUTODEPEND ..\..\src\common\stringimpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_stringops.obj : .AUTODEPEND ..\..\src\common\stringops.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_strvararg.obj : .AUTODEPEND ..\..\src\common\strvararg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_sysopt.obj : .AUTODEPEND ..\..\src\common\sysopt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_tarstrm.obj : .AUTODEPEND ..\..\src\common\tarstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_textbuf.obj : .AUTODEPEND ..\..\src\common\textbuf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_textfile.obj : .AUTODEPEND ..\..\src\common\textfile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_threadinfo.obj : .AUTODEPEND ..\..\src\common\threadinfo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_time.obj : .AUTODEPEND ..\..\src\common\time.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_timercmn.obj : .AUTODEPEND ..\..\src\common\timercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_timerimpl.obj : .AUTODEPEND ..\..\src\common\timerimpl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_tokenzr.obj : .AUTODEPEND ..\..\src\common\tokenzr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_translation.obj : .AUTODEPEND ..\..\src\common\translation.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_txtstrm.obj : .AUTODEPEND ..\..\src\common\txtstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_unichar.obj : .AUTODEPEND ..\..\src\common\unichar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_uri.obj : .AUTODEPEND ..\..\src\common\uri.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_ustring.obj : .AUTODEPEND ..\..\src\common\ustring.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_variant.obj : .AUTODEPEND ..\..\src\common\variant.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_wfstream.obj : .AUTODEPEND ..\..\src\common\wfstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_wxcrt.obj : .AUTODEPEND ..\..\src\common\wxcrt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_wxprintf.obj : .AUTODEPEND ..\..\src\common\wxprintf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_xlocale.obj : .AUTODEPEND ..\..\src\common\xlocale.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_xti.obj : .AUTODEPEND ..\..\src\common\xti.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_xtistrm.obj : .AUTODEPEND ..\..\src\common\xtistrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_zipstrm.obj : .AUTODEPEND ..\..\src\common\zipstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_zstream.obj : .AUTODEPEND ..\..\src\common\zstream.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_fswatchercmn.obj : .AUTODEPEND ..\..\src\common\fswatchercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_fswatcherg.obj : .AUTODEPEND ..\..\src\generic\fswatcherg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_basemsw.obj : .AUTODEPEND ..\..\src\msw\basemsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_crashrpt.obj : .AUTODEPEND ..\..\src\msw\crashrpt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_debughlp.obj : .AUTODEPEND ..\..\src\msw\debughlp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_dde.obj : .AUTODEPEND ..\..\src\msw\dde.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_dir.obj : .AUTODEPEND ..\..\src\msw\dir.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_dlmsw.obj : .AUTODEPEND ..\..\src\msw\dlmsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_evtloopconsole.obj : .AUTODEPEND ..\..\src\msw\evtloopconsole.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_mimetype.obj : .AUTODEPEND ..\..\src\msw\mimetype.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_power.obj : .AUTODEPEND ..\..\src\msw\power.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_regconf.obj : .AUTODEPEND ..\..\src\msw\regconf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_registry.obj : .AUTODEPEND ..\..\src\msw\registry.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_snglinst.obj : .AUTODEPEND ..\..\src\msw\snglinst.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_stackwalk.obj : .AUTODEPEND ..\..\src\msw\stackwalk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_stdpaths.obj : .AUTODEPEND ..\..\src\msw\stdpaths.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_thread.obj : .AUTODEPEND ..\..\src\msw\thread.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_timer.obj : .AUTODEPEND ..\..\src\msw\timer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_utils.obj : .AUTODEPEND ..\..\src\msw\utils.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_utilsexc.obj : .AUTODEPEND ..\..\src\msw\utilsexc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_fswatcher.obj : .AUTODEPEND ..\..\src\msw\fswatcher.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_event.obj : .AUTODEPEND ..\..\src\common\event.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_fs_mem.obj : .AUTODEPEND ..\..\src\common\fs_mem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\baselib_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(BASELIB_CXXFLAGS) $< - -$(OBJS)\netdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_version.res : .AUTODEPEND ..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net$(WXCOMPILER)$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_NET $< - -$(OBJS)\netdll_fs_inet.obj : .AUTODEPEND ..\..\src\common\fs_inet.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_ftp.obj : .AUTODEPEND ..\..\src\common\ftp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_http.obj : .AUTODEPEND ..\..\src\common\http.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_protocol.obj : .AUTODEPEND ..\..\src\common\protocol.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_sckaddr.obj : .AUTODEPEND ..\..\src\common\sckaddr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_sckfile.obj : .AUTODEPEND ..\..\src\common\sckfile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_sckipc.obj : .AUTODEPEND ..\..\src\common\sckipc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_sckstrm.obj : .AUTODEPEND ..\..\src\common\sckstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_url.obj : .AUTODEPEND ..\..\src\common\url.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_sockmsw.obj : .AUTODEPEND ..\..\src\msw\sockmsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netdll_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETDLL_CXXFLAGS) $< - -$(OBJS)\netlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_fs_inet.obj : .AUTODEPEND ..\..\src\common\fs_inet.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_ftp.obj : .AUTODEPEND ..\..\src\common\ftp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_http.obj : .AUTODEPEND ..\..\src\common\http.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_protocol.obj : .AUTODEPEND ..\..\src\common\protocol.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_sckaddr.obj : .AUTODEPEND ..\..\src\common\sckaddr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_sckfile.obj : .AUTODEPEND ..\..\src\common\sckfile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_sckipc.obj : .AUTODEPEND ..\..\src\common\sckipc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_sckstrm.obj : .AUTODEPEND ..\..\src\common\sckstrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_socket.obj : .AUTODEPEND ..\..\src\common\socket.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_url.obj : .AUTODEPEND ..\..\src\common\url.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_sockmsw.obj : .AUTODEPEND ..\..\src\msw\sockmsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\netlib_urlmsw.obj : .AUTODEPEND ..\..\src\msw\urlmsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(NETLIB_CXXFLAGS) $< - -$(OBJS)\coredll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_version.res : .AUTODEPEND ..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core$(WXCOMPILER)$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_CORE -dwxUSE_BASE=0 $< - -$(OBJS)\coredll_event.obj : .AUTODEPEND ..\..\src\common\event.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_fs_mem.obj : .AUTODEPEND ..\..\src\common\fs_mem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_generic_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_accel.obj : .AUTODEPEND ..\..\src\msw\accel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_anybutton.obj : .AUTODEPEND ..\..\src\msw\anybutton.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_artmsw.obj : .AUTODEPEND ..\..\src\msw\artmsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_bmpbuttn.obj : .AUTODEPEND ..\..\src\msw\bmpbuttn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_button.obj : .AUTODEPEND ..\..\src\msw\button.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_checkbox.obj : .AUTODEPEND ..\..\src\msw\checkbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_choice.obj : .AUTODEPEND ..\..\src\msw\choice.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_combo.obj : .AUTODEPEND ..\..\src\msw\combo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_combobox.obj : .AUTODEPEND ..\..\src\msw\combobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_control.obj : .AUTODEPEND ..\..\src\msw\control.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_dialog.obj : .AUTODEPEND ..\..\src\msw\dialog.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_gauge.obj : .AUTODEPEND ..\..\src\msw\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_headerctrl.obj : .AUTODEPEND ..\..\src\msw\headerctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_iniconf.obj : .AUTODEPEND ..\..\src\msw\iniconf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_listbox.obj : .AUTODEPEND ..\..\src\msw\listbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_listctrl.obj : .AUTODEPEND ..\..\src\msw\listctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_mdi.obj : .AUTODEPEND ..\..\src\msw\mdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_menu.obj : .AUTODEPEND ..\..\src\msw\menu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_menuitem.obj : .AUTODEPEND ..\..\src\msw\menuitem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_metafile.obj : .AUTODEPEND ..\..\src\msw\metafile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msgdlg.obj : .AUTODEPEND ..\..\src\msw\msgdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_nativdlg.obj : .AUTODEPEND ..\..\src\msw\nativdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_nativewin.obj : .AUTODEPEND ..\..\src\msw\nativewin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_notebook.obj : .AUTODEPEND ..\..\src\msw\notebook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_panel.obj : .AUTODEPEND ..\..\src\msw\panel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_progdlg.obj : .AUTODEPEND ..\..\src\msw\progdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_radiobox.obj : .AUTODEPEND ..\..\src\msw\radiobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_radiobut.obj : .AUTODEPEND ..\..\src\msw\radiobut.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_richmsgdlg.obj : .AUTODEPEND ..\..\src\msw\richmsgdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_scrolbar.obj : .AUTODEPEND ..\..\src\msw\scrolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_slider.obj : .AUTODEPEND ..\..\src\msw\slider.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_spinbutt.obj : .AUTODEPEND ..\..\src\msw\spinbutt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_spinctrl.obj : .AUTODEPEND ..\..\src\msw\spinctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_statbmp.obj : .AUTODEPEND ..\..\src\msw\statbmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_statbox.obj : .AUTODEPEND ..\..\src\msw\statbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_statusbar.obj : .AUTODEPEND ..\..\src\msw\statusbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_statline.obj : .AUTODEPEND ..\..\src\msw\statline.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_stattext.obj : .AUTODEPEND ..\..\src\msw\stattext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_toolbar.obj : .AUTODEPEND ..\..\src\msw\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_textctrl.obj : .AUTODEPEND ..\..\src\msw\textctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_textentry.obj : .AUTODEPEND ..\..\src\msw\textentry.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_tglbtn.obj : .AUTODEPEND ..\..\src\msw\tglbtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_treectrl.obj : .AUTODEPEND ..\..\src\msw\treectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_checklst.obj : .AUTODEPEND ..\..\src\msw\checklst.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_msw_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_generic_accel.obj : .AUTODEPEND ..\..\src\generic\accel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_generic_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_generic_listctrl.obj : .AUTODEPEND ..\..\src\generic\listctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_button.obj : .AUTODEPEND ..\..\src\univ\button.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_checkbox.obj : .AUTODEPEND ..\..\src\univ\checkbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_checklst.obj : .AUTODEPEND ..\..\src\univ\checklst.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_choice.obj : .AUTODEPEND ..\..\src\univ\choice.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_combobox.obj : .AUTODEPEND ..\..\src\univ\combobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_control.obj : .AUTODEPEND ..\..\src\univ\control.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_inphand.obj : .AUTODEPEND ..\..\src\univ\inphand.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_listbox.obj : .AUTODEPEND ..\..\src\univ\listbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_menu.obj : .AUTODEPEND ..\..\src\univ\menu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_notebook.obj : .AUTODEPEND ..\..\src\univ\notebook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_radiobox.obj : .AUTODEPEND ..\..\src\univ\radiobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_radiobut.obj : .AUTODEPEND ..\..\src\univ\radiobut.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_settingsuniv.obj : .AUTODEPEND ..\..\src\univ\settingsuniv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_spinbutt.obj : .AUTODEPEND ..\..\src\univ\spinbutt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_statbmp.obj : .AUTODEPEND ..\..\src\univ\statbmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_statbox.obj : .AUTODEPEND ..\..\src\univ\statbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_statline.obj : .AUTODEPEND ..\..\src\univ\statline.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_statusbr.obj : .AUTODEPEND ..\..\src\univ\statusbr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_tglbtn.obj : .AUTODEPEND ..\..\src\univ\tglbtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_univ_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_winuniv.obj : .AUTODEPEND ..\..\src\univ\winuniv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_gtk.obj : .AUTODEPEND ..\..\src\univ\themes\gtk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_metal.obj : .AUTODEPEND ..\..\src\univ\themes\metal.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_mono.obj : .AUTODEPEND ..\..\src\univ\themes\mono.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -$(OBJS)\coredll_win32.obj : .AUTODEPEND ..\..\src\univ\themes\win32.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< - -!ifeq USE_GUI 1 -$(OBJS)\coredll_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_app.obj : .AUTODEPEND ..\..\src\msw\app.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_bitmap.obj : .AUTODEPEND ..\..\src\msw\bitmap.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_brush.obj : .AUTODEPEND ..\..\src\msw\brush.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_caret.obj : .AUTODEPEND ..\..\src\msw\caret.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_clipbrd.obj : .AUTODEPEND ..\..\src\msw\clipbrd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_colour.obj : .AUTODEPEND ..\..\src\msw\colour.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_cursor.obj : .AUTODEPEND ..\..\src\msw\cursor.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_data.obj : .AUTODEPEND ..\..\src\msw\data.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dc.obj : .AUTODEPEND ..\..\src\msw\dc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dcclient.obj : .AUTODEPEND ..\..\src\msw\dcclient.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dcmemory.obj : .AUTODEPEND ..\..\src\msw\dcmemory.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dcprint.obj : .AUTODEPEND ..\..\src\msw\dcprint.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dcscreen.obj : .AUTODEPEND ..\..\src\msw\dcscreen.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dialup.obj : .AUTODEPEND ..\..\src\msw\dialup.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dib.obj : .AUTODEPEND ..\..\src\msw\dib.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_display.obj : .AUTODEPEND ..\..\src\msw\display.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_enhmeta.obj : .AUTODEPEND ..\..\src\msw\enhmeta.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_font.obj : .AUTODEPEND ..\..\src\msw\font.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fontenum.obj : .AUTODEPEND ..\..\src\msw\fontenum.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fontutil.obj : .AUTODEPEND ..\..\src\msw\fontutil.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_gdiimage.obj : .AUTODEPEND ..\..\src\msw\gdiimage.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_gdiplus.obj : .AUTODEPEND ..\..\src\msw\gdiplus.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_icon.obj : .AUTODEPEND ..\..\src\msw\icon.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imaglist.obj : .AUTODEPEND ..\..\src\msw\imaglist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_minifram.obj : .AUTODEPEND ..\..\src\msw\minifram.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_nonownedwnd.obj : .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dataobj.obj : .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dropsrc.obj : .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_droptgt.obj : .AUTODEPEND ..\..\src\msw\ole\droptgt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_oleutils.obj : .AUTODEPEND ..\..\src\msw\ole\oleutils.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_safearray.obj : .AUTODEPEND ..\..\src\msw\ole\safearray.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_palette.obj : .AUTODEPEND ..\..\src\msw\palette.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_pen.obj : .AUTODEPEND ..\..\src\msw\pen.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_popupwin.obj : .AUTODEPEND ..\..\src\msw\popupwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_printdlg.obj : .AUTODEPEND ..\..\src\msw\printdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_printwin.obj : .AUTODEPEND ..\..\src\msw\printwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_region.obj : .AUTODEPEND ..\..\src\msw\region.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_renderer.obj : .AUTODEPEND ..\..\src\msw\renderer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_toplevel.obj : .AUTODEPEND ..\..\src\msw\toplevel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_uiaction.obj : .AUTODEPEND ..\..\src\msw\uiaction.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_utilsgui.obj : .AUTODEPEND ..\..\src\msw\utilsgui.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_utilswin.obj : .AUTODEPEND ..\..\src\msw\utilswin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_uxtheme.obj : .AUTODEPEND ..\..\src\msw\uxtheme.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_window.obj : .AUTODEPEND ..\..\src\msw\window.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_automtn.obj : .AUTODEPEND ..\..\src\msw\ole\automtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_accelcmn.obj : .AUTODEPEND ..\..\src\common\accelcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_anidecod.obj : .AUTODEPEND ..\..\src\common\anidecod.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_affinematrix2d.obj : .AUTODEPEND ..\..\src\common\affinematrix2d.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_appcmn.obj : .AUTODEPEND ..\..\src\common\appcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_artprov.obj : .AUTODEPEND ..\..\src\common\artprov.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_artstd.obj : .AUTODEPEND ..\..\src\common\artstd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_arttango.obj : .AUTODEPEND ..\..\src\common\arttango.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_bmpbtncmn.obj : .AUTODEPEND ..\..\src\common\bmpbtncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_btncmn.obj : .AUTODEPEND ..\..\src\common\btncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_checkboxcmn.obj : .AUTODEPEND ..\..\src\common\checkboxcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_checklstcmn.obj : .AUTODEPEND ..\..\src\common\checklstcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_choiccmn.obj : .AUTODEPEND ..\..\src\common\choiccmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_clipcmn.obj : .AUTODEPEND ..\..\src\common\clipcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_clrpickercmn.obj : .AUTODEPEND ..\..\src\common\clrpickercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_colourcmn.obj : .AUTODEPEND ..\..\src\common\colourcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_colourdata.obj : .AUTODEPEND ..\..\src\common\colourdata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_combocmn.obj : .AUTODEPEND ..\..\src\common\combocmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_cmndata.obj : .AUTODEPEND ..\..\src\common\cmndata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_containr.obj : .AUTODEPEND ..\..\src\common\containr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_cshelp.obj : .AUTODEPEND ..\..\src\common\cshelp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_ctrlcmn.obj : .AUTODEPEND ..\..\src\common\ctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_ctrlsub.obj : .AUTODEPEND ..\..\src\common\ctrlsub.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dcbase.obj : .AUTODEPEND ..\..\src\common\dcbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dcbufcmn.obj : .AUTODEPEND ..\..\src\common\dcbufcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dcgraph.obj : .AUTODEPEND ..\..\src\common\dcgraph.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dcsvg.obj : .AUTODEPEND ..\..\src\common\dcsvg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dirctrlcmn.obj : .AUTODEPEND ..\..\src\common\dirctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dndcmn.obj : .AUTODEPEND ..\..\src\common\dndcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dobjcmn.obj : .AUTODEPEND ..\..\src\common\dobjcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_docmdi.obj : .AUTODEPEND ..\..\src\common\docmdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_docview.obj : .AUTODEPEND ..\..\src\common\docview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dpycmn.obj : .AUTODEPEND ..\..\src\common\dpycmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dseldlg.obj : .AUTODEPEND ..\..\src\common\dseldlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_effects.obj : .AUTODEPEND ..\..\src\common\effects.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fddlgcmn.obj : .AUTODEPEND ..\..\src\common\fddlgcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_filectrlcmn.obj : .AUTODEPEND ..\..\src\common\filectrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_filehistorycmn.obj : .AUTODEPEND ..\..\src\common\filehistorycmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_filepickercmn.obj : .AUTODEPEND ..\..\src\common\filepickercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fontpickercmn.obj : .AUTODEPEND ..\..\src\common\fontpickercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fldlgcmn.obj : .AUTODEPEND ..\..\src\common\fldlgcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fontcmn.obj : .AUTODEPEND ..\..\src\common\fontcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fontdata.obj : .AUTODEPEND ..\..\src\common\fontdata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_graphicc.obj : .AUTODEPEND ..\..\src\generic\graphicc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fontenumcmn.obj : .AUTODEPEND ..\..\src\common\fontenumcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_fontutilcmn.obj : .AUTODEPEND ..\..\src\common\fontutilcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_framecmn.obj : .AUTODEPEND ..\..\src\common\framecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_gaugecmn.obj : .AUTODEPEND ..\..\src\common\gaugecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_gbsizer.obj : .AUTODEPEND ..\..\src\common\gbsizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_gdicmn.obj : .AUTODEPEND ..\..\src\common\gdicmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_geometry.obj : .AUTODEPEND ..\..\src\common\geometry.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_gifdecod.obj : .AUTODEPEND ..\..\src\common\gifdecod.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_headercolcmn.obj : .AUTODEPEND ..\..\src\common\headercolcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_headerctrlcmn.obj : .AUTODEPEND ..\..\src\common\headerctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_helpbase.obj : .AUTODEPEND ..\..\src\common\helpbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_iconbndl.obj : .AUTODEPEND ..\..\src\common\iconbndl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagall.obj : .AUTODEPEND ..\..\src\common\imagall.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagbmp.obj : .AUTODEPEND ..\..\src\common\imagbmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_image.obj : .AUTODEPEND ..\..\src\common\image.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagfill.obj : .AUTODEPEND ..\..\src\common\imagfill.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imaggif.obj : .AUTODEPEND ..\..\src\common\imaggif.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagiff.obj : .AUTODEPEND ..\..\src\common\imagiff.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagjpeg.obj : .AUTODEPEND ..\..\src\common\imagjpeg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagpcx.obj : .AUTODEPEND ..\..\src\common\imagpcx.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagpng.obj : .AUTODEPEND ..\..\src\common\imagpng.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagpnm.obj : .AUTODEPEND ..\..\src\common\imagpnm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagtga.obj : .AUTODEPEND ..\..\src\common\imagtga.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagtiff.obj : .AUTODEPEND ..\..\src\common\imagtiff.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_imagxpm.obj : .AUTODEPEND ..\..\src\common\imagxpm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_layout.obj : .AUTODEPEND ..\..\src\common\layout.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_lboxcmn.obj : .AUTODEPEND ..\..\src\common\lboxcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_listctrlcmn.obj : .AUTODEPEND ..\..\src\common\listctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_markupparser.obj : .AUTODEPEND ..\..\src\common\markupparser.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_matrix.obj : .AUTODEPEND ..\..\src\common\matrix.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_menucmn.obj : .AUTODEPEND ..\..\src\common\menucmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_modalhook.obj : .AUTODEPEND ..\..\src\common\modalhook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_mousemanager.obj : .AUTODEPEND ..\..\src\common\mousemanager.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_ownerdrwcmn.obj : .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_panelcmn.obj : .AUTODEPEND ..\..\src\common\panelcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_popupcmn.obj : .AUTODEPEND ..\..\src\common\popupcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_preferencescmn.obj : .AUTODEPEND ..\..\src\common\preferencescmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_prntbase.obj : .AUTODEPEND ..\..\src\common\prntbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_quantize.obj : .AUTODEPEND ..\..\src\common\quantize.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_radiobtncmn.obj : .AUTODEPEND ..\..\src\common\radiobtncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_radiocmn.obj : .AUTODEPEND ..\..\src\common\radiocmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_rearrangectrl.obj : .AUTODEPEND ..\..\src\common\rearrangectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_rendcmn.obj : .AUTODEPEND ..\..\src\common\rendcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_rgncmn.obj : .AUTODEPEND ..\..\src\common\rgncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_scrolbarcmn.obj : .AUTODEPEND ..\..\src\common\scrolbarcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_settcmn.obj : .AUTODEPEND ..\..\src\common\settcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_slidercmn.obj : .AUTODEPEND ..\..\src\common\slidercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_spinbtncmn.obj : .AUTODEPEND ..\..\src\common\spinbtncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_spinctrlcmn.obj : .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_statbmpcmn.obj : .AUTODEPEND ..\..\src\common\statbmpcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_statboxcmn.obj : .AUTODEPEND ..\..\src\common\statboxcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_statlinecmn.obj : .AUTODEPEND ..\..\src\common\statlinecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_stattextcmn.obj : .AUTODEPEND ..\..\src\common\stattextcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_tbarbase.obj : .AUTODEPEND ..\..\src\common\tbarbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_treebase.obj : .AUTODEPEND ..\..\src\common\treebase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_uiactioncmn.obj : .AUTODEPEND ..\..\src\common\uiactioncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_valgen.obj : .AUTODEPEND ..\..\src\common\valgen.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_validate.obj : .AUTODEPEND ..\..\src\common\validate.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_valtext.obj : .AUTODEPEND ..\..\src\common\valtext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_valnum.obj : .AUTODEPEND ..\..\src\common\valnum.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_wincmn.obj : .AUTODEPEND ..\..\src\common\wincmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_windowid.obj : .AUTODEPEND ..\..\src\common\windowid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_wrapsizer.obj : .AUTODEPEND ..\..\src\common\wrapsizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_busyinfo.obj : .AUTODEPEND ..\..\src\generic\busyinfo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dcpsg.obj : .AUTODEPEND ..\..\src\generic\dcpsg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dirctrlg.obj : .AUTODEPEND ..\..\src\generic\dirctrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_filectrlg.obj : .AUTODEPEND ..\..\src\generic\filectrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_headerctrlg.obj : .AUTODEPEND ..\..\src\generic\headerctrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_infobar.obj : .AUTODEPEND ..\..\src\generic\infobar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_markuptext.obj : .AUTODEPEND ..\..\src\generic\markuptext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_preferencesg.obj : .AUTODEPEND ..\..\src\generic\preferencesg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_printps.obj : .AUTODEPEND ..\..\src\generic\printps.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_renderg.obj : .AUTODEPEND ..\..\src\generic\renderg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_richmsgdlgg.obj : .AUTODEPEND ..\..\src\generic\richmsgdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_scrlwing.obj : .AUTODEPEND ..\..\src\generic\scrlwing.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_selstore.obj : .AUTODEPEND ..\..\src\generic\selstore.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_spinctlg.obj : .AUTODEPEND ..\..\src\generic\spinctlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_statbmpg.obj : .AUTODEPEND ..\..\src\generic\statbmpg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_stattextg.obj : .AUTODEPEND ..\..\src\generic\stattextg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_tipwin.obj : .AUTODEPEND ..\..\src\generic\tipwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_toolbkg.obj : .AUTODEPEND ..\..\src\generic\toolbkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_treectlg.obj : .AUTODEPEND ..\..\src\generic\treectlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_treebkg.obj : .AUTODEPEND ..\..\src\generic\treebkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_vlbox.obj : .AUTODEPEND ..\..\src\generic\vlbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\coredll_xmlreshandler.obj : .AUTODEPEND ..\..\src\xrc\xmlreshandler.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $< -!endif - -$(OBJS)\corelib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_event.obj : .AUTODEPEND ..\..\src\common\event.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_fs_mem.obj : .AUTODEPEND ..\..\src\common\fs_mem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msgout.obj : .AUTODEPEND ..\..\src\common\msgout.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_utilscmn.obj : .AUTODEPEND ..\..\src\common\utilscmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_main.obj : .AUTODEPEND ..\..\src\msw\main.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_mslu.obj : .AUTODEPEND ..\..\src\msw\mslu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_volume.obj : .AUTODEPEND ..\..\src\msw\volume.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_generic_statusbr.obj : .AUTODEPEND ..\..\src\generic\statusbr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_accel.obj : .AUTODEPEND ..\..\src\msw\accel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_anybutton.obj : .AUTODEPEND ..\..\src\msw\anybutton.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_artmsw.obj : .AUTODEPEND ..\..\src\msw\artmsw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_bmpbuttn.obj : .AUTODEPEND ..\..\src\msw\bmpbuttn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_button.obj : .AUTODEPEND ..\..\src\msw\button.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_checkbox.obj : .AUTODEPEND ..\..\src\msw\checkbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_choice.obj : .AUTODEPEND ..\..\src\msw\choice.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_colordlg.obj : .AUTODEPEND ..\..\src\msw\colordlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_combo.obj : .AUTODEPEND ..\..\src\msw\combo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_combobox.obj : .AUTODEPEND ..\..\src\msw\combobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_control.obj : .AUTODEPEND ..\..\src\msw\control.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_dialog.obj : .AUTODEPEND ..\..\src\msw\dialog.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_dirdlg.obj : .AUTODEPEND ..\..\src\msw\dirdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_dragimag.obj : .AUTODEPEND ..\..\src\msw\dragimag.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_filedlg.obj : .AUTODEPEND ..\..\src\msw\filedlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_frame.obj : .AUTODEPEND ..\..\src\msw\frame.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_gauge.obj : .AUTODEPEND ..\..\src\msw\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_headerctrl.obj : .AUTODEPEND ..\..\src\msw\headerctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_iniconf.obj : .AUTODEPEND ..\..\src\msw\iniconf.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_listbox.obj : .AUTODEPEND ..\..\src\msw\listbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_listctrl.obj : .AUTODEPEND ..\..\src\msw\listctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_mdi.obj : .AUTODEPEND ..\..\src\msw\mdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_menu.obj : .AUTODEPEND ..\..\src\msw\menu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_menuitem.obj : .AUTODEPEND ..\..\src\msw\menuitem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_metafile.obj : .AUTODEPEND ..\..\src\msw\metafile.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msgdlg.obj : .AUTODEPEND ..\..\src\msw\msgdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_nativdlg.obj : .AUTODEPEND ..\..\src\msw\nativdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_nativewin.obj : .AUTODEPEND ..\..\src\msw\nativewin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_notebook.obj : .AUTODEPEND ..\..\src\msw\notebook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_panel.obj : .AUTODEPEND ..\..\src\msw\panel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_progdlg.obj : .AUTODEPEND ..\..\src\msw\progdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_radiobox.obj : .AUTODEPEND ..\..\src\msw\radiobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_radiobut.obj : .AUTODEPEND ..\..\src\msw\radiobut.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_richmsgdlg.obj : .AUTODEPEND ..\..\src\msw\richmsgdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_scrolbar.obj : .AUTODEPEND ..\..\src\msw\scrolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_slider.obj : .AUTODEPEND ..\..\src\msw\slider.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_spinbutt.obj : .AUTODEPEND ..\..\src\msw\spinbutt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_spinctrl.obj : .AUTODEPEND ..\..\src\msw\spinctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_statbmp.obj : .AUTODEPEND ..\..\src\msw\statbmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_statbox.obj : .AUTODEPEND ..\..\src\msw\statbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_statusbar.obj : .AUTODEPEND ..\..\src\msw\statusbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_statline.obj : .AUTODEPEND ..\..\src\msw\statline.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_stattext.obj : .AUTODEPEND ..\..\src\msw\stattext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_toolbar.obj : .AUTODEPEND ..\..\src\msw\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_textctrl.obj : .AUTODEPEND ..\..\src\msw\textctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_textentry.obj : .AUTODEPEND ..\..\src\msw\textentry.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_tglbtn.obj : .AUTODEPEND ..\..\src\msw\tglbtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_treectrl.obj : .AUTODEPEND ..\..\src\msw\treectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_checklst.obj : .AUTODEPEND ..\..\src\msw\checklst.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_msw_fdrepdlg.obj : .AUTODEPEND ..\..\src\msw\fdrepdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_fontdlg.obj : .AUTODEPEND ..\..\src\msw\fontdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_generic_accel.obj : .AUTODEPEND ..\..\src\generic\accel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_colrdlgg.obj : .AUTODEPEND ..\..\src\generic\colrdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_dirdlgg.obj : .AUTODEPEND ..\..\src\generic\dirdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_generic_fdrepdlg.obj : .AUTODEPEND ..\..\src\generic\fdrepdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_filedlgg.obj : .AUTODEPEND ..\..\src\generic\filedlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_fontdlgg.obj : .AUTODEPEND ..\..\src\generic\fontdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_generic_listctrl.obj : .AUTODEPEND ..\..\src\generic\listctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_mdig.obj : .AUTODEPEND ..\..\src\generic\mdig.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_bmpbuttn.obj : .AUTODEPEND ..\..\src\univ\bmpbuttn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_button.obj : .AUTODEPEND ..\..\src\univ\button.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_checkbox.obj : .AUTODEPEND ..\..\src\univ\checkbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_checklst.obj : .AUTODEPEND ..\..\src\univ\checklst.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_choice.obj : .AUTODEPEND ..\..\src\univ\choice.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_combobox.obj : .AUTODEPEND ..\..\src\univ\combobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_control.obj : .AUTODEPEND ..\..\src\univ\control.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_ctrlrend.obj : .AUTODEPEND ..\..\src\univ\ctrlrend.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_dialog.obj : .AUTODEPEND ..\..\src\univ\dialog.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_framuniv.obj : .AUTODEPEND ..\..\src\univ\framuniv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_gauge.obj : .AUTODEPEND ..\..\src\univ\gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_inpcons.obj : .AUTODEPEND ..\..\src\univ\inpcons.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_inphand.obj : .AUTODEPEND ..\..\src\univ\inphand.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_listbox.obj : .AUTODEPEND ..\..\src\univ\listbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_menu.obj : .AUTODEPEND ..\..\src\univ\menu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_notebook.obj : .AUTODEPEND ..\..\src\univ\notebook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_radiobox.obj : .AUTODEPEND ..\..\src\univ\radiobox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_radiobut.obj : .AUTODEPEND ..\..\src\univ\radiobut.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_scrarrow.obj : .AUTODEPEND ..\..\src\univ\scrarrow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_scrolbar.obj : .AUTODEPEND ..\..\src\univ\scrolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_scrthumb.obj : .AUTODEPEND ..\..\src\univ\scrthumb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_settingsuniv.obj : .AUTODEPEND ..\..\src\univ\settingsuniv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_slider.obj : .AUTODEPEND ..\..\src\univ\slider.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_spinbutt.obj : .AUTODEPEND ..\..\src\univ\spinbutt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_statbmp.obj : .AUTODEPEND ..\..\src\univ\statbmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_statbox.obj : .AUTODEPEND ..\..\src\univ\statbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_statline.obj : .AUTODEPEND ..\..\src\univ\statline.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_stattext.obj : .AUTODEPEND ..\..\src\univ\stattext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_statusbr.obj : .AUTODEPEND ..\..\src\univ\statusbr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_stdrend.obj : .AUTODEPEND ..\..\src\univ\stdrend.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_textctrl.obj : .AUTODEPEND ..\..\src\univ\textctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_tglbtn.obj : .AUTODEPEND ..\..\src\univ\tglbtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_theme.obj : .AUTODEPEND ..\..\src\univ\theme.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_univ_toolbar.obj : .AUTODEPEND ..\..\src\univ\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_topluniv.obj : .AUTODEPEND ..\..\src\univ\topluniv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_winuniv.obj : .AUTODEPEND ..\..\src\univ\winuniv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_gtk.obj : .AUTODEPEND ..\..\src\univ\themes\gtk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_metal.obj : .AUTODEPEND ..\..\src\univ\themes\metal.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_mono.obj : .AUTODEPEND ..\..\src\univ\themes\mono.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -$(OBJS)\corelib_win32.obj : .AUTODEPEND ..\..\src\univ\themes\win32.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< - -!ifeq USE_GUI 1 -$(OBJS)\corelib_activex.obj : .AUTODEPEND ..\..\src\msw\ole\activex.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_app.obj : .AUTODEPEND ..\..\src\msw\app.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_bitmap.obj : .AUTODEPEND ..\..\src\msw\bitmap.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_brush.obj : .AUTODEPEND ..\..\src\msw\brush.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_caret.obj : .AUTODEPEND ..\..\src\msw\caret.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_clipbrd.obj : .AUTODEPEND ..\..\src\msw\clipbrd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_colour.obj : .AUTODEPEND ..\..\src\msw\colour.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_cursor.obj : .AUTODEPEND ..\..\src\msw\cursor.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_data.obj : .AUTODEPEND ..\..\src\msw\data.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dc.obj : .AUTODEPEND ..\..\src\msw\dc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dcclient.obj : .AUTODEPEND ..\..\src\msw\dcclient.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dcmemory.obj : .AUTODEPEND ..\..\src\msw\dcmemory.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dcprint.obj : .AUTODEPEND ..\..\src\msw\dcprint.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dcscreen.obj : .AUTODEPEND ..\..\src\msw\dcscreen.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dialup.obj : .AUTODEPEND ..\..\src\msw\dialup.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dib.obj : .AUTODEPEND ..\..\src\msw\dib.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_display.obj : .AUTODEPEND ..\..\src\msw\display.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_enhmeta.obj : .AUTODEPEND ..\..\src\msw\enhmeta.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_font.obj : .AUTODEPEND ..\..\src\msw\font.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fontenum.obj : .AUTODEPEND ..\..\src\msw\fontenum.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fontutil.obj : .AUTODEPEND ..\..\src\msw\fontutil.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_gdiimage.obj : .AUTODEPEND ..\..\src\msw\gdiimage.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_gdiobj.obj : .AUTODEPEND ..\..\src\msw\gdiobj.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_gdiplus.obj : .AUTODEPEND ..\..\src\msw\gdiplus.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_graphics.obj : .AUTODEPEND ..\..\src\msw\graphics.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_icon.obj : .AUTODEPEND ..\..\src\msw\icon.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imaglist.obj : .AUTODEPEND ..\..\src\msw\imaglist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_minifram.obj : .AUTODEPEND ..\..\src\msw\minifram.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_nonownedwnd.obj : .AUTODEPEND ..\..\src\msw\nonownedwnd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dataobj.obj : .AUTODEPEND ..\..\src\msw\ole\dataobj.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dropsrc.obj : .AUTODEPEND ..\..\src\msw\ole\dropsrc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_droptgt.obj : .AUTODEPEND ..\..\src\msw\ole\droptgt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_oleutils.obj : .AUTODEPEND ..\..\src\msw\ole\oleutils.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_safearray.obj : .AUTODEPEND ..\..\src\msw\ole\safearray.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_palette.obj : .AUTODEPEND ..\..\src\msw\palette.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_pen.obj : .AUTODEPEND ..\..\src\msw\pen.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_popupwin.obj : .AUTODEPEND ..\..\src\msw\popupwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_printdlg.obj : .AUTODEPEND ..\..\src\msw\printdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_printwin.obj : .AUTODEPEND ..\..\src\msw\printwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_region.obj : .AUTODEPEND ..\..\src\msw\region.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_renderer.obj : .AUTODEPEND ..\..\src\msw\renderer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_settings.obj : .AUTODEPEND ..\..\src\msw\settings.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_textmeasure.obj : .AUTODEPEND ..\..\src\msw\textmeasure.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_tooltip.obj : .AUTODEPEND ..\..\src\msw\tooltip.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_toplevel.obj : .AUTODEPEND ..\..\src\msw\toplevel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_uiaction.obj : .AUTODEPEND ..\..\src\msw\uiaction.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_utilsgui.obj : .AUTODEPEND ..\..\src\msw\utilsgui.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_utilswin.obj : .AUTODEPEND ..\..\src\msw\utilswin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_uxtheme.obj : .AUTODEPEND ..\..\src\msw\uxtheme.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_window.obj : .AUTODEPEND ..\..\src\msw\window.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_helpchm.obj : .AUTODEPEND ..\..\src\msw\helpchm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_helpwin.obj : .AUTODEPEND ..\..\src\msw\helpwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_automtn.obj : .AUTODEPEND ..\..\src\msw\ole\automtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_uuid.obj : .AUTODEPEND ..\..\src\msw\ole\uuid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_clrpickerg.obj : .AUTODEPEND ..\..\src\generic\clrpickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_collpaneg.obj : .AUTODEPEND ..\..\src\generic\collpaneg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_filepickerg.obj : .AUTODEPEND ..\..\src\generic\filepickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fontpickerg.obj : .AUTODEPEND ..\..\src\generic\fontpickerg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_prntdlgg.obj : .AUTODEPEND ..\..\src\generic\prntdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_evtloop.obj : .AUTODEPEND ..\..\src\msw\evtloop.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_accelcmn.obj : .AUTODEPEND ..\..\src\common\accelcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_accesscmn.obj : .AUTODEPEND ..\..\src\common\accesscmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_anidecod.obj : .AUTODEPEND ..\..\src\common\anidecod.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_affinematrix2d.obj : .AUTODEPEND ..\..\src\common\affinematrix2d.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_appcmn.obj : .AUTODEPEND ..\..\src\common\appcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_artprov.obj : .AUTODEPEND ..\..\src\common\artprov.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_artstd.obj : .AUTODEPEND ..\..\src\common\artstd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_arttango.obj : .AUTODEPEND ..\..\src\common\arttango.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_bmpbase.obj : .AUTODEPEND ..\..\src\common\bmpbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_bmpbtncmn.obj : .AUTODEPEND ..\..\src\common\bmpbtncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_bookctrl.obj : .AUTODEPEND ..\..\src\common\bookctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_btncmn.obj : .AUTODEPEND ..\..\src\common\btncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_cairo.obj : .AUTODEPEND ..\..\src\common\cairo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_checkboxcmn.obj : .AUTODEPEND ..\..\src\common\checkboxcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_checklstcmn.obj : .AUTODEPEND ..\..\src\common\checklstcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_choiccmn.obj : .AUTODEPEND ..\..\src\common\choiccmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_clipcmn.obj : .AUTODEPEND ..\..\src\common\clipcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_clrpickercmn.obj : .AUTODEPEND ..\..\src\common\clrpickercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_colourcmn.obj : .AUTODEPEND ..\..\src\common\colourcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_colourdata.obj : .AUTODEPEND ..\..\src\common\colourdata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_combocmn.obj : .AUTODEPEND ..\..\src\common\combocmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_cmdproc.obj : .AUTODEPEND ..\..\src\common\cmdproc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_cmndata.obj : .AUTODEPEND ..\..\src\common\cmndata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_containr.obj : .AUTODEPEND ..\..\src\common\containr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_cshelp.obj : .AUTODEPEND ..\..\src\common\cshelp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_ctrlcmn.obj : .AUTODEPEND ..\..\src\common\ctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_ctrlsub.obj : .AUTODEPEND ..\..\src\common\ctrlsub.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dcbase.obj : .AUTODEPEND ..\..\src\common\dcbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dcbufcmn.obj : .AUTODEPEND ..\..\src\common\dcbufcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dcgraph.obj : .AUTODEPEND ..\..\src\common\dcgraph.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dcsvg.obj : .AUTODEPEND ..\..\src\common\dcsvg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dirctrlcmn.obj : .AUTODEPEND ..\..\src\common\dirctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dlgcmn.obj : .AUTODEPEND ..\..\src\common\dlgcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dndcmn.obj : .AUTODEPEND ..\..\src\common\dndcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dobjcmn.obj : .AUTODEPEND ..\..\src\common\dobjcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_docmdi.obj : .AUTODEPEND ..\..\src\common\docmdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_docview.obj : .AUTODEPEND ..\..\src\common\docview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dpycmn.obj : .AUTODEPEND ..\..\src\common\dpycmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dseldlg.obj : .AUTODEPEND ..\..\src\common\dseldlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_effects.obj : .AUTODEPEND ..\..\src\common\effects.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fddlgcmn.obj : .AUTODEPEND ..\..\src\common\fddlgcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_filectrlcmn.obj : .AUTODEPEND ..\..\src\common\filectrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_filehistorycmn.obj : .AUTODEPEND ..\..\src\common\filehistorycmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_filepickercmn.obj : .AUTODEPEND ..\..\src\common\filepickercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fontpickercmn.obj : .AUTODEPEND ..\..\src\common\fontpickercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fldlgcmn.obj : .AUTODEPEND ..\..\src\common\fldlgcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fontcmn.obj : .AUTODEPEND ..\..\src\common\fontcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fontdata.obj : .AUTODEPEND ..\..\src\common\fontdata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_graphicc.obj : .AUTODEPEND ..\..\src\generic\graphicc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fontenumcmn.obj : .AUTODEPEND ..\..\src\common\fontenumcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fontmap.obj : .AUTODEPEND ..\..\src\common\fontmap.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_fontutilcmn.obj : .AUTODEPEND ..\..\src\common\fontutilcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_framecmn.obj : .AUTODEPEND ..\..\src\common\framecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_gaugecmn.obj : .AUTODEPEND ..\..\src\common\gaugecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_gbsizer.obj : .AUTODEPEND ..\..\src\common\gbsizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_gdicmn.obj : .AUTODEPEND ..\..\src\common\gdicmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_geometry.obj : .AUTODEPEND ..\..\src\common\geometry.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_gifdecod.obj : .AUTODEPEND ..\..\src\common\gifdecod.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_graphcmn.obj : .AUTODEPEND ..\..\src\common\graphcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_headercolcmn.obj : .AUTODEPEND ..\..\src\common\headercolcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_headerctrlcmn.obj : .AUTODEPEND ..\..\src\common\headerctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_helpbase.obj : .AUTODEPEND ..\..\src\common\helpbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_iconbndl.obj : .AUTODEPEND ..\..\src\common\iconbndl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagall.obj : .AUTODEPEND ..\..\src\common\imagall.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagbmp.obj : .AUTODEPEND ..\..\src\common\imagbmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_image.obj : .AUTODEPEND ..\..\src\common\image.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagfill.obj : .AUTODEPEND ..\..\src\common\imagfill.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imaggif.obj : .AUTODEPEND ..\..\src\common\imaggif.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagiff.obj : .AUTODEPEND ..\..\src\common\imagiff.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagjpeg.obj : .AUTODEPEND ..\..\src\common\imagjpeg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagpcx.obj : .AUTODEPEND ..\..\src\common\imagpcx.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagpng.obj : .AUTODEPEND ..\..\src\common\imagpng.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagpnm.obj : .AUTODEPEND ..\..\src\common\imagpnm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagtga.obj : .AUTODEPEND ..\..\src\common\imagtga.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagtiff.obj : .AUTODEPEND ..\..\src\common\imagtiff.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_imagxpm.obj : .AUTODEPEND ..\..\src\common\imagxpm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_layout.obj : .AUTODEPEND ..\..\src\common\layout.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_lboxcmn.obj : .AUTODEPEND ..\..\src\common\lboxcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_listctrlcmn.obj : .AUTODEPEND ..\..\src\common\listctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_markupparser.obj : .AUTODEPEND ..\..\src\common\markupparser.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_matrix.obj : .AUTODEPEND ..\..\src\common\matrix.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_menucmn.obj : .AUTODEPEND ..\..\src\common\menucmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_modalhook.obj : .AUTODEPEND ..\..\src\common\modalhook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_mousemanager.obj : .AUTODEPEND ..\..\src\common\mousemanager.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_ownerdrwcmn.obj : .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_panelcmn.obj : .AUTODEPEND ..\..\src\common\panelcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_pickerbase.obj : .AUTODEPEND ..\..\src\common\pickerbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_popupcmn.obj : .AUTODEPEND ..\..\src\common\popupcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_preferencescmn.obj : .AUTODEPEND ..\..\src\common\preferencescmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_prntbase.obj : .AUTODEPEND ..\..\src\common\prntbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_quantize.obj : .AUTODEPEND ..\..\src\common\quantize.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_radiobtncmn.obj : .AUTODEPEND ..\..\src\common\radiobtncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_radiocmn.obj : .AUTODEPEND ..\..\src\common\radiocmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_rearrangectrl.obj : .AUTODEPEND ..\..\src\common\rearrangectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_rendcmn.obj : .AUTODEPEND ..\..\src\common\rendcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_rgncmn.obj : .AUTODEPEND ..\..\src\common\rgncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_scrolbarcmn.obj : .AUTODEPEND ..\..\src\common\scrolbarcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_settcmn.obj : .AUTODEPEND ..\..\src\common\settcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_sizer.obj : .AUTODEPEND ..\..\src\common\sizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_slidercmn.obj : .AUTODEPEND ..\..\src\common\slidercmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_spinbtncmn.obj : .AUTODEPEND ..\..\src\common\spinbtncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_spinctrlcmn.obj : .AUTODEPEND ..\..\src\common\spinctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_srchcmn.obj : .AUTODEPEND ..\..\src\common\srchcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_statbar.obj : .AUTODEPEND ..\..\src\common\statbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_statbmpcmn.obj : .AUTODEPEND ..\..\src\common\statbmpcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_statboxcmn.obj : .AUTODEPEND ..\..\src\common\statboxcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_statlinecmn.obj : .AUTODEPEND ..\..\src\common\statlinecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_stattextcmn.obj : .AUTODEPEND ..\..\src\common\stattextcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_stockitem.obj : .AUTODEPEND ..\..\src\common\stockitem.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_tbarbase.obj : .AUTODEPEND ..\..\src\common\tbarbase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_textcmn.obj : .AUTODEPEND ..\..\src\common\textcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_textentrycmn.obj : .AUTODEPEND ..\..\src\common\textentrycmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_textmeasurecmn.obj : .AUTODEPEND ..\..\src\common\textmeasurecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_toplvcmn.obj : .AUTODEPEND ..\..\src\common\toplvcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_treebase.obj : .AUTODEPEND ..\..\src\common\treebase.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_uiactioncmn.obj : .AUTODEPEND ..\..\src\common\uiactioncmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_valgen.obj : .AUTODEPEND ..\..\src\common\valgen.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_validate.obj : .AUTODEPEND ..\..\src\common\validate.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_valtext.obj : .AUTODEPEND ..\..\src\common\valtext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_valnum.obj : .AUTODEPEND ..\..\src\common\valnum.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_wincmn.obj : .AUTODEPEND ..\..\src\common\wincmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_windowid.obj : .AUTODEPEND ..\..\src\common\windowid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_wrapsizer.obj : .AUTODEPEND ..\..\src\common\wrapsizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_xpmdecod.obj : .AUTODEPEND ..\..\src\common\xpmdecod.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_busyinfo.obj : .AUTODEPEND ..\..\src\generic\busyinfo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_choicdgg.obj : .AUTODEPEND ..\..\src\generic\choicdgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_choicbkg.obj : .AUTODEPEND ..\..\src\generic\choicbkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_combog.obj : .AUTODEPEND ..\..\src\generic\combog.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dcpsg.obj : .AUTODEPEND ..\..\src\generic\dcpsg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dirctrlg.obj : .AUTODEPEND ..\..\src\generic\dirctrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_dragimgg.obj : .AUTODEPEND ..\..\src\generic\dragimgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_filectrlg.obj : .AUTODEPEND ..\..\src\generic\filectrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_headerctrlg.obj : .AUTODEPEND ..\..\src\generic\headerctrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_infobar.obj : .AUTODEPEND ..\..\src\generic\infobar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_listbkg.obj : .AUTODEPEND ..\..\src\generic\listbkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_logg.obj : .AUTODEPEND ..\..\src\generic\logg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_markuptext.obj : .AUTODEPEND ..\..\src\generic\markuptext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_msgdlgg.obj : .AUTODEPEND ..\..\src\generic\msgdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_preferencesg.obj : .AUTODEPEND ..\..\src\generic\preferencesg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_printps.obj : .AUTODEPEND ..\..\src\generic\printps.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_renderg.obj : .AUTODEPEND ..\..\src\generic\renderg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_richmsgdlgg.obj : .AUTODEPEND ..\..\src\generic\richmsgdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_scrlwing.obj : .AUTODEPEND ..\..\src\generic\scrlwing.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_selstore.obj : .AUTODEPEND ..\..\src\generic\selstore.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_spinctlg.obj : .AUTODEPEND ..\..\src\generic\spinctlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_splitter.obj : .AUTODEPEND ..\..\src\generic\splitter.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_srchctlg.obj : .AUTODEPEND ..\..\src\generic\srchctlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_statbmpg.obj : .AUTODEPEND ..\..\src\generic\statbmpg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_stattextg.obj : .AUTODEPEND ..\..\src\generic\stattextg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_textdlgg.obj : .AUTODEPEND ..\..\src\generic\textdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_tipwin.obj : .AUTODEPEND ..\..\src\generic\tipwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_toolbkg.obj : .AUTODEPEND ..\..\src\generic\toolbkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_treectlg.obj : .AUTODEPEND ..\..\src\generic\treectlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_treebkg.obj : .AUTODEPEND ..\..\src\generic\treebkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_vlbox.obj : .AUTODEPEND ..\..\src\generic\vlbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_vscroll.obj : .AUTODEPEND ..\..\src\generic\vscroll.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -!ifeq USE_GUI 1 -$(OBJS)\corelib_xmlreshandler.obj : .AUTODEPEND ..\..\src\xrc\xmlreshandler.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $< -!endif - -$(OBJS)\advdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_version.res : .AUTODEPEND ..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv$(WXCOMPILER)$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_ADV $< - -$(OBJS)\advdll_bmpcbox.obj : .AUTODEPEND ..\..\src\msw\bmpcbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_calctrl.obj : .AUTODEPEND ..\..\src\msw\calctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_commandlinkbutton.obj : .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_datecontrols.obj : .AUTODEPEND ..\..\src\msw\datecontrols.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_datetimectrl.obj : .AUTODEPEND ..\..\src\msw\datetimectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_hyperlink.obj : .AUTODEPEND ..\..\src\msw\hyperlink.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_timectrl.obj : .AUTODEPEND ..\..\src\msw\timectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_bmpcboxcmn.obj : .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_gridcmn.obj : .AUTODEPEND ..\..\src\common\gridcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_hyperlnkcmn.obj : .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_richtooltipcmn.obj : .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_bannerwindow.obj : .AUTODEPEND ..\..\src\generic\bannerwindow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_calctrlg.obj : .AUTODEPEND ..\..\src\generic\calctrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_commandlinkbuttong.obj : .AUTODEPEND ..\..\src\generic\commandlinkbuttong.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_editlbox.obj : .AUTODEPEND ..\..\src\generic\editlbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_gridctrl.obj : .AUTODEPEND ..\..\src\generic\gridctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_grideditors.obj : .AUTODEPEND ..\..\src\generic\grideditors.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_gridsel.obj : .AUTODEPEND ..\..\src\generic\gridsel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_hyperlinkg.obj : .AUTODEPEND ..\..\src\generic\hyperlinkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_notifmsgg.obj : .AUTODEPEND ..\..\src\generic\notifmsgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_odcombo.obj : .AUTODEPEND ..\..\src\generic\odcombo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_propdlg.obj : .AUTODEPEND ..\..\src\generic\propdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_richtooltipg.obj : .AUTODEPEND ..\..\src\generic\richtooltipg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_sashwin.obj : .AUTODEPEND ..\..\src\generic\sashwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_splash.obj : .AUTODEPEND ..\..\src\generic\splash.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_timectrlg.obj : .AUTODEPEND ..\..\src\generic\timectrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_treelist.obj : .AUTODEPEND ..\..\src\generic\treelist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_notifmsg.obj : .AUTODEPEND ..\..\src\msw\notifmsg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_richtooltip.obj : .AUTODEPEND ..\..\src\msw\richtooltip.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_sound.obj : .AUTODEPEND ..\..\src\msw\sound.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advdll_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $< - -$(OBJS)\advlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_bmpcbox.obj : .AUTODEPEND ..\..\src\msw\bmpcbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_calctrl.obj : .AUTODEPEND ..\..\src\msw\calctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_commandlinkbutton.obj : .AUTODEPEND ..\..\src\msw\commandlinkbutton.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_datecontrols.obj : .AUTODEPEND ..\..\src\msw\datecontrols.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_datetimectrl.obj : .AUTODEPEND ..\..\src\msw\datetimectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_hyperlink.obj : .AUTODEPEND ..\..\src\msw\hyperlink.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_timectrl.obj : .AUTODEPEND ..\..\src\msw\timectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_animatecmn.obj : .AUTODEPEND ..\..\src\common\animatecmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_bmpcboxcmn.obj : .AUTODEPEND ..\..\src\common\bmpcboxcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_calctrlcmn.obj : .AUTODEPEND ..\..\src\common\calctrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_gridcmn.obj : .AUTODEPEND ..\..\src\common\gridcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_hyperlnkcmn.obj : .AUTODEPEND ..\..\src\common\hyperlnkcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_odcombocmn.obj : .AUTODEPEND ..\..\src\common\odcombocmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_richtooltipcmn.obj : .AUTODEPEND ..\..\src\common\richtooltipcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_aboutdlgg.obj : .AUTODEPEND ..\..\src\generic\aboutdlgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_bannerwindow.obj : .AUTODEPEND ..\..\src\generic\bannerwindow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_bmpcboxg.obj : .AUTODEPEND ..\..\src\generic\bmpcboxg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_calctrlg.obj : .AUTODEPEND ..\..\src\generic\calctrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_commandlinkbuttong.obj : .AUTODEPEND ..\..\src\generic\commandlinkbuttong.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_datavgen.obj : .AUTODEPEND ..\..\src\generic\datavgen.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_datectlg.obj : .AUTODEPEND ..\..\src\generic\datectlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_editlbox.obj : .AUTODEPEND ..\..\src\generic\editlbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_grid.obj : .AUTODEPEND ..\..\src\generic\grid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_gridctrl.obj : .AUTODEPEND ..\..\src\generic\gridctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_grideditors.obj : .AUTODEPEND ..\..\src\generic\grideditors.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_gridsel.obj : .AUTODEPEND ..\..\src\generic\gridsel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_helpext.obj : .AUTODEPEND ..\..\src\generic\helpext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_hyperlinkg.obj : .AUTODEPEND ..\..\src\generic\hyperlinkg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_laywin.obj : .AUTODEPEND ..\..\src\generic\laywin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_notifmsgg.obj : .AUTODEPEND ..\..\src\generic\notifmsgg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_odcombo.obj : .AUTODEPEND ..\..\src\generic\odcombo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_propdlg.obj : .AUTODEPEND ..\..\src\generic\propdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_richtooltipg.obj : .AUTODEPEND ..\..\src\generic\richtooltipg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_sashwin.obj : .AUTODEPEND ..\..\src\generic\sashwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_splash.obj : .AUTODEPEND ..\..\src\generic\splash.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_timectrlg.obj : .AUTODEPEND ..\..\src\generic\timectrlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_tipdlg.obj : .AUTODEPEND ..\..\src\generic\tipdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_treelist.obj : .AUTODEPEND ..\..\src\generic\treelist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_wizard.obj : .AUTODEPEND ..\..\src\generic\wizard.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_taskbarcmn.obj : .AUTODEPEND ..\..\src\common\taskbarcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_aboutdlg.obj : .AUTODEPEND ..\..\src\msw\aboutdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_notifmsg.obj : .AUTODEPEND ..\..\src\msw\notifmsg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_richtooltip.obj : .AUTODEPEND ..\..\src\msw\richtooltip.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_sound.obj : .AUTODEPEND ..\..\src\msw\sound.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_taskbar.obj : .AUTODEPEND ..\..\src\msw\taskbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_joystick.obj : .AUTODEPEND ..\..\src\msw\joystick.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\advlib_animateg.obj : .AUTODEPEND ..\..\src\generic\animateg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $< - -$(OBJS)\mediadll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $< - -$(OBJS)\mediadll_version.res : .AUTODEPEND ..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_media$(WXCOMPILER)$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_MEDIA $< - -$(OBJS)\mediadll_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $< - -$(OBJS)\mediadll_mediactrl_am.obj : .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $< - -$(OBJS)\mediadll_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $< - -$(OBJS)\mediadll_mediactrl_qt.obj : .AUTODEPEND ..\..\src\msw\mediactrl_qt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MEDIADLL_CXXFLAGS) $< - -$(OBJS)\medialib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $< - -$(OBJS)\medialib_mediactrlcmn.obj : .AUTODEPEND ..\..\src\common\mediactrlcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $< - -$(OBJS)\medialib_mediactrl_am.obj : .AUTODEPEND ..\..\src\msw\mediactrl_am.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $< - -$(OBJS)\medialib_mediactrl_wmp10.obj : .AUTODEPEND ..\..\src\msw\mediactrl_wmp10.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $< - -$(OBJS)\medialib_mediactrl_qt.obj : .AUTODEPEND ..\..\src\msw\mediactrl_qt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(MEDIALIB_CXXFLAGS) $< - -$(OBJS)\htmldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_version.res : .AUTODEPEND ..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html$(WXCOMPILER)$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_HTML $< - -$(OBJS)\htmldll_helpbest.obj : .AUTODEPEND ..\..\src\msw\helpbest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_helpctrl.obj : .AUTODEPEND ..\..\src\html\helpctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_helpdata.obj : .AUTODEPEND ..\..\src\html\helpdata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_helpdlg.obj : .AUTODEPEND ..\..\src\html\helpdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_helpfrm.obj : .AUTODEPEND ..\..\src\html\helpfrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_helpwnd.obj : .AUTODEPEND ..\..\src\html\helpwnd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_htmlcell.obj : .AUTODEPEND ..\..\src\html\htmlcell.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_htmlfilt.obj : .AUTODEPEND ..\..\src\html\htmlfilt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_htmlpars.obj : .AUTODEPEND ..\..\src\html\htmlpars.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_htmltag.obj : .AUTODEPEND ..\..\src\html\htmltag.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_htmlwin.obj : .AUTODEPEND ..\..\src\html\htmlwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_htmprint.obj : .AUTODEPEND ..\..\src\html\htmprint.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_dflist.obj : .AUTODEPEND ..\..\src\html\m_dflist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_fonts.obj : .AUTODEPEND ..\..\src\html\m_fonts.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_hline.obj : .AUTODEPEND ..\..\src\html\m_hline.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_image.obj : .AUTODEPEND ..\..\src\html\m_image.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_layout.obj : .AUTODEPEND ..\..\src\html\m_layout.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_links.obj : .AUTODEPEND ..\..\src\html\m_links.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_list.obj : .AUTODEPEND ..\..\src\html\m_list.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_pre.obj : .AUTODEPEND ..\..\src\html\m_pre.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_span.obj : .AUTODEPEND ..\..\src\html\m_span.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_style.obj : .AUTODEPEND ..\..\src\html\m_style.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_m_tables.obj : .AUTODEPEND ..\..\src\html\m_tables.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_styleparams.obj : .AUTODEPEND ..\..\src\html\styleparams.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmldll_htmllbox.obj : .AUTODEPEND ..\..\src\generic\htmllbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLDLL_CXXFLAGS) $< - -$(OBJS)\htmllib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_helpbest.obj : .AUTODEPEND ..\..\src\msw\helpbest.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_helpctrl.obj : .AUTODEPEND ..\..\src\html\helpctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_helpdata.obj : .AUTODEPEND ..\..\src\html\helpdata.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_helpdlg.obj : .AUTODEPEND ..\..\src\html\helpdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_helpfrm.obj : .AUTODEPEND ..\..\src\html\helpfrm.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_helpwnd.obj : .AUTODEPEND ..\..\src\html\helpwnd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_htmlcell.obj : .AUTODEPEND ..\..\src\html\htmlcell.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_htmlfilt.obj : .AUTODEPEND ..\..\src\html\htmlfilt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_htmlpars.obj : .AUTODEPEND ..\..\src\html\htmlpars.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_htmltag.obj : .AUTODEPEND ..\..\src\html\htmltag.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_htmlwin.obj : .AUTODEPEND ..\..\src\html\htmlwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_htmprint.obj : .AUTODEPEND ..\..\src\html\htmprint.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_dflist.obj : .AUTODEPEND ..\..\src\html\m_dflist.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_fonts.obj : .AUTODEPEND ..\..\src\html\m_fonts.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_hline.obj : .AUTODEPEND ..\..\src\html\m_hline.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_image.obj : .AUTODEPEND ..\..\src\html\m_image.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_layout.obj : .AUTODEPEND ..\..\src\html\m_layout.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_links.obj : .AUTODEPEND ..\..\src\html\m_links.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_list.obj : .AUTODEPEND ..\..\src\html\m_list.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_pre.obj : .AUTODEPEND ..\..\src\html\m_pre.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_span.obj : .AUTODEPEND ..\..\src\html\m_span.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_style.obj : .AUTODEPEND ..\..\src\html\m_style.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_m_tables.obj : .AUTODEPEND ..\..\src\html\m_tables.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_styleparams.obj : .AUTODEPEND ..\..\src\html\styleparams.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_winpars.obj : .AUTODEPEND ..\..\src\html\winpars.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\htmllib_htmllbox.obj : .AUTODEPEND ..\..\src\generic\htmllbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(HTMLLIB_CXXFLAGS) $< - -$(OBJS)\webviewdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWDLL_CXXFLAGS) $< - -$(OBJS)\webviewdll_version.res : .AUTODEPEND ..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_webview$(WXCOMPILER)$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_WEBVIEW $< - -$(OBJS)\webviewdll_webview_ie.obj : .AUTODEPEND ..\..\src\msw\webview_ie.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWDLL_CXXFLAGS) $< - -$(OBJS)\webviewdll_webview.obj : .AUTODEPEND ..\..\src\common\webview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWDLL_CXXFLAGS) $< - -$(OBJS)\webviewdll_webviewarchivehandler.obj : .AUTODEPEND ..\..\src\common\webviewarchivehandler.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWDLL_CXXFLAGS) $< - -$(OBJS)\webviewdll_webviewfshandler.obj : .AUTODEPEND ..\..\src\common\webviewfshandler.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWDLL_CXXFLAGS) $< - -$(OBJS)\webviewlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWLIB_CXXFLAGS) $< - -$(OBJS)\webviewlib_webview_ie.obj : .AUTODEPEND ..\..\src\msw\webview_ie.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWLIB_CXXFLAGS) $< - -$(OBJS)\webviewlib_webview.obj : .AUTODEPEND ..\..\src\common\webview.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWLIB_CXXFLAGS) $< - -$(OBJS)\webviewlib_webviewarchivehandler.obj : .AUTODEPEND ..\..\src\common\webviewarchivehandler.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWLIB_CXXFLAGS) $< - -$(OBJS)\webviewlib_webviewfshandler.obj : .AUTODEPEND ..\..\src\common\webviewfshandler.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(WEBVIEWLIB_CXXFLAGS) $< - -$(OBJS)\qadll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(QADLL_CXXFLAGS) $< - -$(OBJS)\qadll_version.res : .AUTODEPEND ..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_qa$(WXCOMPILER)$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_QA $< - -$(OBJS)\qadll_debugrpt.obj : .AUTODEPEND ..\..\src\common\debugrpt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(QADLL_CXXFLAGS) $< - -$(OBJS)\qadll_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(QADLL_CXXFLAGS) $< - -$(OBJS)\qalib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(QALIB_CXXFLAGS) $< - -$(OBJS)\qalib_debugrpt.obj : .AUTODEPEND ..\..\src\common\debugrpt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(QALIB_CXXFLAGS) $< - -$(OBJS)\qalib_dbgrptg.obj : .AUTODEPEND ..\..\src\generic\dbgrptg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(QALIB_CXXFLAGS) $< - -$(OBJS)\xmldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XMLDLL_CXXFLAGS) $< - -$(OBJS)\xmldll_version.res : .AUTODEPEND ..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml$(WXCOMPILER)$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dwxUSE_GUI=0 -dWXUSINGDLL -dWXMAKINGDLL_XML $< - -$(OBJS)\xmldll_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XMLDLL_CXXFLAGS) $< - -$(OBJS)\xmldll_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XMLDLL_CXXFLAGS) $< - -$(OBJS)\xmllib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XMLLIB_CXXFLAGS) $< - -$(OBJS)\xmllib_xml.obj : .AUTODEPEND ..\..\src\xml\xml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XMLLIB_CXXFLAGS) $< - -$(OBJS)\xmllib_xtixml.obj : .AUTODEPEND ..\..\src\common\xtixml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XMLLIB_CXXFLAGS) $< - -$(OBJS)\xrcdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_version.res : .AUTODEPEND ..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc$(WXCOMPILER)$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_XRC $< - -$(OBJS)\xrcdll_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_bannerwindow.obj : .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_bmpcbox.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpcbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_bmpbt.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_bttn.obj : .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_cald.obj : .AUTODEPEND ..\..\src\xrc\xh_cald.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_chckb.obj : .AUTODEPEND ..\..\src\xrc\xh_chckb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_chckl.obj : .AUTODEPEND ..\..\src\xrc\xh_chckl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_choic.obj : .AUTODEPEND ..\..\src\xrc\xh_choic.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_choicbk.obj : .AUTODEPEND ..\..\src\xrc\xh_choicbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_clrpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_clrpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_cmdlinkbn.obj : .AUTODEPEND ..\..\src\xrc\xh_cmdlinkbn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_collpane.obj : .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_comboctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_comboctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_datectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_dirpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_dirpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_editlbox.obj : .AUTODEPEND ..\..\src\xrc\xh_editlbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_filectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_filectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_filepicker.obj : .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_fontpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_fontpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_gdctl.obj : .AUTODEPEND ..\..\src\xrc\xh_gdctl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_grid.obj : .AUTODEPEND ..\..\src\xrc\xh_grid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_html.obj : .AUTODEPEND ..\..\src\xrc\xh_html.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_hyperlink.obj : .AUTODEPEND ..\..\src\xrc\xh_hyperlink.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_listb.obj : .AUTODEPEND ..\..\src\xrc\xh_listb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_listbk.obj : .AUTODEPEND ..\..\src\xrc\xh_listbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_listc.obj : .AUTODEPEND ..\..\src\xrc\xh_listc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_menu.obj : .AUTODEPEND ..\..\src\xrc\xh_menu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_notbk.obj : .AUTODEPEND ..\..\src\xrc\xh_notbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_odcombo.obj : .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_propdlg.obj : .AUTODEPEND ..\..\src\xrc\xh_propdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_radbx.obj : .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_htmllbox.obj : .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_slidr.obj : .AUTODEPEND ..\..\src\xrc\xh_slidr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_srchctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_srchctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_stbmp.obj : .AUTODEPEND ..\..\src\xrc\xh_stbmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_stbox.obj : .AUTODEPEND ..\..\src\xrc\xh_stbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_stlin.obj : .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_sttxt.obj : .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_text.obj : .AUTODEPEND ..\..\src\xrc\xh_text.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_tglbtn.obj : .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_timectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_toolbk.obj : .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_tree.obj : .AUTODEPEND ..\..\src\xrc\xh_tree.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_treebk.obj : .AUTODEPEND ..\..\src\xrc\xh_treebk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_unkwn.obj : .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xmladv.obj : .AUTODEPEND ..\..\src\xrc\xmladv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrcdll_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCDLL_CXXFLAGS) $< - -$(OBJS)\xrclib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_animatctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_animatctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_bannerwindow.obj : .AUTODEPEND ..\..\src\xrc\xh_bannerwindow.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_bmp.obj : .AUTODEPEND ..\..\src\xrc\xh_bmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_bmpcbox.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpcbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_bmpbt.obj : .AUTODEPEND ..\..\src\xrc\xh_bmpbt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_bttn.obj : .AUTODEPEND ..\..\src\xrc\xh_bttn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_cald.obj : .AUTODEPEND ..\..\src\xrc\xh_cald.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_chckb.obj : .AUTODEPEND ..\..\src\xrc\xh_chckb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_chckl.obj : .AUTODEPEND ..\..\src\xrc\xh_chckl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_choic.obj : .AUTODEPEND ..\..\src\xrc\xh_choic.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_choicbk.obj : .AUTODEPEND ..\..\src\xrc\xh_choicbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_clrpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_clrpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_cmdlinkbn.obj : .AUTODEPEND ..\..\src\xrc\xh_cmdlinkbn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_collpane.obj : .AUTODEPEND ..\..\src\xrc\xh_collpane.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_combo.obj : .AUTODEPEND ..\..\src\xrc\xh_combo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_comboctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_comboctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_datectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_datectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_dirpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_dirpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_dlg.obj : .AUTODEPEND ..\..\src\xrc\xh_dlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_editlbox.obj : .AUTODEPEND ..\..\src\xrc\xh_editlbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_filectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_filectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_filepicker.obj : .AUTODEPEND ..\..\src\xrc\xh_filepicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_fontpicker.obj : .AUTODEPEND ..\..\src\xrc\xh_fontpicker.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_frame.obj : .AUTODEPEND ..\..\src\xrc\xh_frame.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_gauge.obj : .AUTODEPEND ..\..\src\xrc\xh_gauge.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_gdctl.obj : .AUTODEPEND ..\..\src\xrc\xh_gdctl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_grid.obj : .AUTODEPEND ..\..\src\xrc\xh_grid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_html.obj : .AUTODEPEND ..\..\src\xrc\xh_html.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_hyperlink.obj : .AUTODEPEND ..\..\src\xrc\xh_hyperlink.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_listb.obj : .AUTODEPEND ..\..\src\xrc\xh_listb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_listbk.obj : .AUTODEPEND ..\..\src\xrc\xh_listbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_listc.obj : .AUTODEPEND ..\..\src\xrc\xh_listc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_mdi.obj : .AUTODEPEND ..\..\src\xrc\xh_mdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_menu.obj : .AUTODEPEND ..\..\src\xrc\xh_menu.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_notbk.obj : .AUTODEPEND ..\..\src\xrc\xh_notbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_odcombo.obj : .AUTODEPEND ..\..\src\xrc\xh_odcombo.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_panel.obj : .AUTODEPEND ..\..\src\xrc\xh_panel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_propdlg.obj : .AUTODEPEND ..\..\src\xrc\xh_propdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_radbt.obj : .AUTODEPEND ..\..\src\xrc\xh_radbt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_radbx.obj : .AUTODEPEND ..\..\src\xrc\xh_radbx.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_scrol.obj : .AUTODEPEND ..\..\src\xrc\xh_scrol.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_scwin.obj : .AUTODEPEND ..\..\src\xrc\xh_scwin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_htmllbox.obj : .AUTODEPEND ..\..\src\xrc\xh_htmllbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_sizer.obj : .AUTODEPEND ..\..\src\xrc\xh_sizer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_slidr.obj : .AUTODEPEND ..\..\src\xrc\xh_slidr.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_spin.obj : .AUTODEPEND ..\..\src\xrc\xh_spin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_split.obj : .AUTODEPEND ..\..\src\xrc\xh_split.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_srchctrl.obj : .AUTODEPEND ..\..\src\xrc\xh_srchctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_statbar.obj : .AUTODEPEND ..\..\src\xrc\xh_statbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_stbmp.obj : .AUTODEPEND ..\..\src\xrc\xh_stbmp.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_stbox.obj : .AUTODEPEND ..\..\src\xrc\xh_stbox.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_stlin.obj : .AUTODEPEND ..\..\src\xrc\xh_stlin.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_sttxt.obj : .AUTODEPEND ..\..\src\xrc\xh_sttxt.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_text.obj : .AUTODEPEND ..\..\src\xrc\xh_text.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_tglbtn.obj : .AUTODEPEND ..\..\src\xrc\xh_tglbtn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_timectrl.obj : .AUTODEPEND ..\..\src\xrc\xh_timectrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_toolb.obj : .AUTODEPEND ..\..\src\xrc\xh_toolb.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_toolbk.obj : .AUTODEPEND ..\..\src\xrc\xh_toolbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_tree.obj : .AUTODEPEND ..\..\src\xrc\xh_tree.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_treebk.obj : .AUTODEPEND ..\..\src\xrc\xh_treebk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_unkwn.obj : .AUTODEPEND ..\..\src\xrc\xh_unkwn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xh_wizrd.obj : .AUTODEPEND ..\..\src\xrc\xh_wizrd.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xmlres.obj : .AUTODEPEND ..\..\src\xrc\xmlres.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xmladv.obj : .AUTODEPEND ..\..\src\xrc\xmladv.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\xrclib_xmlrsall.obj : .AUTODEPEND ..\..\src\xrc\xmlrsall.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(XRCLIB_CXXFLAGS) $< - -$(OBJS)\auidll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< - -$(OBJS)\auidll_version.res : .AUTODEPEND ..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui$(WXCOMPILER)$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_AUI $< - -$(OBJS)\auidll_framemanager.obj : .AUTODEPEND ..\..\src\aui\framemanager.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< - -$(OBJS)\auidll_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< - -$(OBJS)\auidll_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< - -$(OBJS)\auidll_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< - -$(OBJS)\auidll_auibar.obj : .AUTODEPEND ..\..\src\aui\auibar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< - -$(OBJS)\auidll_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< - -$(OBJS)\auidll_tabart.obj : .AUTODEPEND ..\..\src\aui\tabart.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< - -$(OBJS)\auidll_xh_auinotbk.obj : .AUTODEPEND ..\..\src\xrc\xh_auinotbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< - -$(OBJS)\auilib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< - -$(OBJS)\auilib_framemanager.obj : .AUTODEPEND ..\..\src\aui\framemanager.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< - -$(OBJS)\auilib_dockart.obj : .AUTODEPEND ..\..\src\aui\dockart.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< - -$(OBJS)\auilib_floatpane.obj : .AUTODEPEND ..\..\src\aui\floatpane.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< - -$(OBJS)\auilib_auibook.obj : .AUTODEPEND ..\..\src\aui\auibook.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< - -$(OBJS)\auilib_auibar.obj : .AUTODEPEND ..\..\src\aui\auibar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< - -$(OBJS)\auilib_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< - -$(OBJS)\auilib_tabart.obj : .AUTODEPEND ..\..\src\aui\tabart.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< - -$(OBJS)\auilib_xh_auinotbk.obj : .AUTODEPEND ..\..\src\xrc\xh_auinotbk.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< - -$(OBJS)\ribbondll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $< - -$(OBJS)\ribbondll_version.res : .AUTODEPEND ..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RIBBON $< - -$(OBJS)\ribbondll_art_internal.obj : .AUTODEPEND ..\..\src\ribbon\art_internal.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $< - -$(OBJS)\ribbondll_art_msw.obj : .AUTODEPEND ..\..\src\ribbon\art_msw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $< - -$(OBJS)\ribbondll_art_aui.obj : .AUTODEPEND ..\..\src\ribbon\art_aui.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $< - -$(OBJS)\ribbondll_bar.obj : .AUTODEPEND ..\..\src\ribbon\bar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $< - -$(OBJS)\ribbondll_buttonbar.obj : .AUTODEPEND ..\..\src\ribbon\buttonbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $< - -$(OBJS)\ribbondll_control.obj : .AUTODEPEND ..\..\src\ribbon\control.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $< - -$(OBJS)\ribbondll_gallery.obj : .AUTODEPEND ..\..\src\ribbon\gallery.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $< - -$(OBJS)\ribbondll_page.obj : .AUTODEPEND ..\..\src\ribbon\page.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $< - -$(OBJS)\ribbondll_panel.obj : .AUTODEPEND ..\..\src\ribbon\panel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $< - -$(OBJS)\ribbondll_toolbar.obj : .AUTODEPEND ..\..\src\ribbon\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $< - -$(OBJS)\ribbondll_xh_ribbon.obj : .AUTODEPEND ..\..\src\xrc\xh_ribbon.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $< - -$(OBJS)\ribbonlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $< - -$(OBJS)\ribbonlib_art_internal.obj : .AUTODEPEND ..\..\src\ribbon\art_internal.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $< - -$(OBJS)\ribbonlib_art_msw.obj : .AUTODEPEND ..\..\src\ribbon\art_msw.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $< - -$(OBJS)\ribbonlib_art_aui.obj : .AUTODEPEND ..\..\src\ribbon\art_aui.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $< - -$(OBJS)\ribbonlib_bar.obj : .AUTODEPEND ..\..\src\ribbon\bar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $< - -$(OBJS)\ribbonlib_buttonbar.obj : .AUTODEPEND ..\..\src\ribbon\buttonbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $< - -$(OBJS)\ribbonlib_control.obj : .AUTODEPEND ..\..\src\ribbon\control.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $< - -$(OBJS)\ribbonlib_gallery.obj : .AUTODEPEND ..\..\src\ribbon\gallery.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $< - -$(OBJS)\ribbonlib_page.obj : .AUTODEPEND ..\..\src\ribbon\page.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $< - -$(OBJS)\ribbonlib_panel.obj : .AUTODEPEND ..\..\src\ribbon\panel.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $< - -$(OBJS)\ribbonlib_toolbar.obj : .AUTODEPEND ..\..\src\ribbon\toolbar.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $< - -$(OBJS)\ribbonlib_xh_ribbon.obj : .AUTODEPEND ..\..\src\xrc\xh_ribbon.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONLIB_CXXFLAGS) $< - -$(OBJS)\propgriddll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< - -$(OBJS)\propgriddll_version.res : .AUTODEPEND ..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_propgrid$(WXCOMPILER)$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_PROPGRID $< - -$(OBJS)\propgriddll_advprops.obj : .AUTODEPEND ..\..\src\propgrid\advprops.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< - -$(OBJS)\propgriddll_editors.obj : .AUTODEPEND ..\..\src\propgrid\editors.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< - -$(OBJS)\propgriddll_manager.obj : .AUTODEPEND ..\..\src\propgrid\manager.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< - -$(OBJS)\propgriddll_property.obj : .AUTODEPEND ..\..\src\propgrid\property.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< - -$(OBJS)\propgriddll_propgrid.obj : .AUTODEPEND ..\..\src\propgrid\propgrid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< - -$(OBJS)\propgriddll_propgridiface.obj : .AUTODEPEND ..\..\src\propgrid\propgridiface.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< - -$(OBJS)\propgriddll_propgridpagestate.obj : .AUTODEPEND ..\..\src\propgrid\propgridpagestate.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< - -$(OBJS)\propgriddll_props.obj : .AUTODEPEND ..\..\src\propgrid\props.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDDLL_CXXFLAGS) $< - -$(OBJS)\propgridlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< - -$(OBJS)\propgridlib_advprops.obj : .AUTODEPEND ..\..\src\propgrid\advprops.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< - -$(OBJS)\propgridlib_editors.obj : .AUTODEPEND ..\..\src\propgrid\editors.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< - -$(OBJS)\propgridlib_manager.obj : .AUTODEPEND ..\..\src\propgrid\manager.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< - -$(OBJS)\propgridlib_property.obj : .AUTODEPEND ..\..\src\propgrid\property.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< - -$(OBJS)\propgridlib_propgrid.obj : .AUTODEPEND ..\..\src\propgrid\propgrid.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< - -$(OBJS)\propgridlib_propgridiface.obj : .AUTODEPEND ..\..\src\propgrid\propgridiface.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< - -$(OBJS)\propgridlib_propgridpagestate.obj : .AUTODEPEND ..\..\src\propgrid\propgridpagestate.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< - -$(OBJS)\propgridlib_props.obj : .AUTODEPEND ..\..\src\propgrid\props.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(PROPGRIDLIB_CXXFLAGS) $< - -$(OBJS)\richtextdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_version.res : .AUTODEPEND ..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_richtext$(WXCOMPILER)$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_RICHTEXT $< - -$(OBJS)\richtextdll_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextformatdlg.obj : .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextimagedlg.obj : .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextprint.obj : .AUTODEPEND ..\..\src\richtext\richtextprint.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextdll_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTDLL_CXXFLAGS) $< - -$(OBJS)\richtextlib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextbuffer.obj : .AUTODEPEND ..\..\src\richtext\richtextbuffer.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextctrl.obj : .AUTODEPEND ..\..\src\richtext\richtextctrl.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextformatdlg.obj : .AUTODEPEND ..\..\src\richtext\richtextformatdlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtexthtml.obj : .AUTODEPEND ..\..\src\richtext\richtexthtml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextimagedlg.obj : .AUTODEPEND ..\..\src\richtext\richtextimagedlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextprint.obj : .AUTODEPEND ..\..\src\richtext\richtextprint.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextstyledlg.obj : .AUTODEPEND ..\..\src\richtext\richtextstyledlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextstyles.obj : .AUTODEPEND ..\..\src\richtext\richtextstyles.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextsymboldlg.obj : .AUTODEPEND ..\..\src\richtext\richtextsymboldlg.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_richtextxml.obj : .AUTODEPEND ..\..\src\richtext\richtextxml.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\richtextlib_xh_richtext.obj : .AUTODEPEND ..\..\src\xrc\xh_richtext.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(RICHTEXTLIB_CXXFLAGS) $< - -$(OBJS)\stcdll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< - -$(OBJS)\stcdll_version.res : .AUTODEPEND ..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc$(WXCOMPILER)$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -i=..\..\src\stc\scintilla\include -i=..\..\src\stc\scintilla\lexlib -i=..\..\src\stc\scintilla\src -d__WX__ -dSCI_LEXER -dLINK_LEXERS -dWXUSINGDLL -dWXMAKINGDLL_STC $< - -$(OBJS)\stcdll_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< - -$(OBJS)\stcdll_PlatWX.obj : .AUTODEPEND ..\..\src\stc\PlatWX.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< - -$(OBJS)\stcdll_ScintillaWX.obj : .AUTODEPEND ..\..\src\stc\ScintillaWX.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCDLL_CXXFLAGS) $< - -$(OBJS)\stclib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< - -$(OBJS)\stclib_stc.obj : .AUTODEPEND ..\..\src\stc\stc.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< - -$(OBJS)\stclib_PlatWX.obj : .AUTODEPEND ..\..\src\stc\PlatWX.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< - -$(OBJS)\stclib_ScintillaWX.obj : .AUTODEPEND ..\..\src\stc\ScintillaWX.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(STCLIB_CXXFLAGS) $< - -$(OBJS)\gldll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GLDLL_CXXFLAGS) $< - -$(OBJS)\gldll_version.res : .AUTODEPEND ..\..\src\msw\version.rc - wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -dWXBUILDING -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gl$(WXCOMPILER)$(VENDORTAG) -i=..\..\src\tiff\libtiff -i=..\..\src\jpeg -i=..\..\src\png -i=..\..\src\zlib -i=..\..\src\regex -i=..\..\src\expat\lib -dWXUSINGDLL -dWXMAKINGDLL_GL $< - -$(OBJS)\gldll_glcmn.obj : .AUTODEPEND ..\..\src\common\glcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GLDLL_CXXFLAGS) $< - -$(OBJS)\gldll_glcanvas.obj : .AUTODEPEND ..\..\src\msw\glcanvas.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GLDLL_CXXFLAGS) $< - -$(OBJS)\gllib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GLLIB_CXXFLAGS) $< - -$(OBJS)\gllib_glcmn.obj : .AUTODEPEND ..\..\src\common\glcmn.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GLLIB_CXXFLAGS) $< - -$(OBJS)\gllib_glcanvas.obj : .AUTODEPEND ..\..\src\msw\glcanvas.cpp - $(CXX) -bt=nt -zq -fo=$^@ $(GLLIB_CXXFLAGS) $< - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10.sln b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10.sln deleted file mode 100644 index b3975e1d99..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10.sln +++ /dev/null @@ -1,493 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wx_vc10_wxregex.vcxproj", "{56A4B526-BB81-5D01-AAA9-16D23BBB169D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "wx_vc10_wxzlib.vcxproj", "{8B867186-A0B5-5479-B824-E176EDD27C40}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "wx_vc10_wxpng.vcxproj", "{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "wx_vc10_wxjpeg.vcxproj", "{6053CC38-CDEE-584C-8BC8-4B000D800FC7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "wx_vc10_wxtiff.vcxproj", "{75596CE6-5AE7-55C9-B890-C07B0A657A83}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "wx_vc10_wxexpat.vcxproj", "{A1A8355B-0988-528E-9CC2-B971D6266669}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxscintilla", "wx_vc10_wxscintilla.vcxproj", "{74827EBD-93DC-5110-BA95-3F2AB029B6B0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "wx_vc10_base.vcxproj", "{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}" - ProjectSection(ProjectDependencies) = postProject - {56A4B526-BB81-5D01-AAA9-16D23BBB169D} = {56A4B526-BB81-5D01-AAA9-16D23BBB169D} - {A1A8355B-0988-528E-9CC2-B971D6266669} = {A1A8355B-0988-528E-9CC2-B971D6266669} - {8B867186-A0B5-5479-B824-E176EDD27C40} = {8B867186-A0B5-5479-B824-E176EDD27C40} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "wx_vc10_net.vcxproj", "{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}" - ProjectSection(ProjectDependencies) = postProject - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} = {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "wx_vc10_core.vcxproj", "{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}" - ProjectSection(ProjectDependencies) = postProject - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0} = {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0} - {6053CC38-CDEE-584C-8BC8-4B000D800FC7} = {6053CC38-CDEE-584C-8BC8-4B000D800FC7} - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} = {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} - {75596CE6-5AE7-55C9-B890-C07B0A657A83} = {75596CE6-5AE7-55C9-B890-C07B0A657A83} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "wx_vc10_adv.vcxproj", "{24C45343-FD20-5C92-81C1-35A2AE841E79}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "wx_vc10_media.vcxproj", "{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "wx_vc10_html.vcxproj", "{33CC42F9-7756-5587-863C-8D4461B7C5DD}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webview", "wx_vc10_webview.vcxproj", "{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "wx_vc10_qa.vcxproj", "{E21129E0-7C08-5936-9D8C-0D60B5319BA7}" - ProjectSection(ProjectDependencies) = postProject - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "wx_vc10_xml.vcxproj", "{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}" - ProjectSection(ProjectDependencies) = postProject - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} = {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wx_vc10_xrc.vcxproj", "{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}" - ProjectSection(ProjectDependencies) = postProject - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} - {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wx_vc10_aui.vcxproj", "{A16D3832-0F42-57CE-8F48-50E06649ADE8}" - ProjectSection(ProjectDependencies) = postProject - {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - {33CC42F9-7756-5587-863C-8D4461B7C5DD} = {33CC42F9-7756-5587-863C-8D4461B7C5DD} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "wx_vc10_ribbon.vcxproj", "{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}" - ProjectSection(ProjectDependencies) = postProject - {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "propgrid", "wx_vc10_propgrid.vcxproj", "{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}" - ProjectSection(ProjectDependencies) = postProject - {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "wx_vc10_richtext.vcxproj", "{7FB0902D-8579-5DCE-B883-DAF66A885005}" - ProjectSection(ProjectDependencies) = postProject - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} - {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stc", "wx_vc10_stc.vcxproj", "{23E1C437-A951-5943-8639-A17F3CF2E606}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "wx_vc10_gl.vcxproj", "{DA8B15EF-6750-5928-BC0E-C748213CF9B2}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - DLL Debug|Win32 = DLL Debug|Win32 - DLL Debug|x64 = DLL Debug|x64 - DLL Release|Win32 = DLL Release|Win32 - DLL Release|x64 = DLL Release|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.ActiveCfg = Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.Build.0 = Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|x64.ActiveCfg = Debug|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|x64.Build.0 = Debug|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|x64.Build.0 = DLL Release|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.ActiveCfg = Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.Build.0 = Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|x64.ActiveCfg = Release|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|x64.Build.0 = Release|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.ActiveCfg = Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.Build.0 = Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|x64.ActiveCfg = Debug|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|x64.Build.0 = Debug|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|x64.Build.0 = DLL Release|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.ActiveCfg = Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.Build.0 = Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|x64.ActiveCfg = Release|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|x64.Build.0 = Release|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.ActiveCfg = Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.Build.0 = Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|x64.ActiveCfg = Debug|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|x64.Build.0 = Debug|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|x64.Build.0 = DLL Release|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.ActiveCfg = Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.Build.0 = Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|x64.ActiveCfg = Release|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|x64.Build.0 = Release|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.ActiveCfg = Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.Build.0 = Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|x64.ActiveCfg = Debug|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|x64.Build.0 = Debug|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|x64.Build.0 = DLL Release|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.ActiveCfg = Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.Build.0 = Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|x64.ActiveCfg = Release|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|x64.Build.0 = Release|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.ActiveCfg = Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.Build.0 = Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|x64.ActiveCfg = Debug|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|x64.Build.0 = Debug|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|x64.Build.0 = DLL Release|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.ActiveCfg = Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.Build.0 = Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|x64.ActiveCfg = Release|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|x64.Build.0 = Release|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.ActiveCfg = Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.Build.0 = Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|x64.ActiveCfg = Debug|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|x64.Build.0 = Debug|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|x64.Build.0 = DLL Release|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.ActiveCfg = Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.Build.0 = Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|x64.ActiveCfg = Release|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|x64.Build.0 = Release|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.ActiveCfg = Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.Build.0 = Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.ActiveCfg = Debug|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.Build.0 = Debug|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|x64.Build.0 = DLL Release|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.ActiveCfg = Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.Build.0 = Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.ActiveCfg = Release|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.Build.0 = Release|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.Build.0 = Debug|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.ActiveCfg = Debug|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.Build.0 = Debug|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.Build.0 = DLL Release|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.ActiveCfg = Release|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.Build.0 = Release|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.Build.0 = Debug|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.ActiveCfg = Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.Build.0 = Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|x64.ActiveCfg = Debug|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|x64.Build.0 = Debug|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|x64.Build.0 = DLL Release|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.ActiveCfg = Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.Build.0 = Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|x64.ActiveCfg = Release|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|x64.Build.0 = Release|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.ActiveCfg = Debug|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.Build.0 = Debug|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.Build.0 = DLL Release|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.ActiveCfg = Release|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.Build.0 = Release|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.ActiveCfg = Debug|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.Build.0 = Debug|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.Build.0 = DLL Release|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.ActiveCfg = Release|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.Build.0 = Release|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.ActiveCfg = Debug|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.Build.0 = Debug|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.ActiveCfg = Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.Build.0 = Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|x64.ActiveCfg = Debug|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|x64.Build.0 = Debug|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|x64.Build.0 = DLL Release|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.ActiveCfg = Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.Build.0 = Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|x64.ActiveCfg = Release|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|x64.Build.0 = Release|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.ActiveCfg = Debug|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.Build.0 = Debug|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.Build.0 = DLL Release|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.ActiveCfg = Release|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.Build.0 = Release|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.ActiveCfg = Debug|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.Build.0 = Debug|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.Build.0 = DLL Release|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.ActiveCfg = Release|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.Build.0 = Release|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.ActiveCfg = Debug|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.Build.0 = Debug|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.Build.0 = DLL Release|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.ActiveCfg = Release|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.Build.0 = Release|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.ActiveCfg = Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.Build.0 = Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.ActiveCfg = Debug|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.Build.0 = Debug|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|x64.Build.0 = DLL Release|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.ActiveCfg = Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.Build.0 = Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.ActiveCfg = Release|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.Build.0 = Release|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.ActiveCfg = Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.Build.0 = Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|x64.ActiveCfg = Debug|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|x64.Build.0 = Debug|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|x64.Build.0 = DLL Release|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.ActiveCfg = Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.Build.0 = Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|x64.ActiveCfg = Release|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|x64.Build.0 = Release|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.ActiveCfg = Debug|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.Build.0 = Debug|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.Build.0 = DLL Release|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.ActiveCfg = Release|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.Build.0 = Release|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.ActiveCfg = Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.Build.0 = Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.ActiveCfg = Debug|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.Build.0 = Debug|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|x64.Build.0 = DLL Release|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.ActiveCfg = Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.Build.0 = Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.ActiveCfg = Release|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.Build.0 = Release|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.ActiveCfg = Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.Build.0 = Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|x64.ActiveCfg = Debug|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|x64.Build.0 = Debug|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|x64.Build.0 = DLL Release|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.ActiveCfg = Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.Build.0 = Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|x64.ActiveCfg = Release|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_adv.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_adv.vcxproj deleted file mode 100644 index 76760d4a97..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_adv.vcxproj +++ /dev/null @@ -1,658 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - adv - {24C45343-FD20-5C92-81C1-35A2AE841E79} - - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\adv\ - vc_x64_mswud\adv\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\adv\ - vc_x64_mswu\adv\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\adv\ - vc_x64_mswuddll\adv\ - true - true - true - true - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\adv\ - vc_x64_mswudll\adv\ - false - false - true - true - wxmsw30ud_adv - wxmsw30ud_adv - wxmsw30u_adv - wxmsw30u_adv - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_advlib.pch - $(OutDir)wxmsw30ud_adv.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_adv.lib - true - - - $(OutDir)wx_vc9_adv.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_advlib.pch - $(OutDir)wxmsw30ud_adv.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_adv.lib - true - - - $(OutDir)wx_vc9_adv.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_advlib.pch - $(OutDir)wxmsw30u_adv.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_adv.lib - true - - - $(OutDir)wx_vc9_adv.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_advlib.pch - $(OutDir)wxmsw30u_adv.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_adv.lib - true - - - $(OutDir)wx_vc9_adv.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_advdll.pch - $(OutDir)wxmsw30ud_adv_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_adv_vc_custom.dll - $(OutDir)wxmsw30ud_adv.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_adv_vc_custom.pdb - MachineX86 - - - $(OutDir)wx_vc9_adv.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_advdll.pch - $(OutDir)wxmsw30ud_adv_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_adv_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_adv_vc_x64_custom.dll - $(OutDir)wxmsw30ud_adv.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_adv_vc_x64_custom.pdb - - - $(OutDir)wx_vc9_adv.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_advdll.pch - $(OutDir)wxmsw30u_adv_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_adv_vc_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_adv_vc_custom.dll - $(OutDir)wxmsw30u_adv.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_adv_vc_custom.pdb - MachineX86 - true - true - - - $(OutDir)wx_vc9_adv.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_advdll.pch - $(OutDir)wxmsw30u_adv_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_adv_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_adv_vc_x64_custom.dll - $(OutDir)wxmsw30u_adv.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_adv_vc_x64_custom.pdb - true - true - - - $(OutDir)wx_vc9_adv.bsc - true - - - - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - - - - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_adv.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_adv.vcxproj.filters deleted file mode 100644 index c683aa4e44..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_adv.vcxproj.filters +++ /dev/null @@ -1,376 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {FEA0C02F-F300-53BA-B784-52A5086B8093} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {61C63C83-EF8C-51CA-A418-51936E7FCD4A} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - - - MSW Sources - - - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_aui.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_aui.vcxproj deleted file mode 100644 index 642cef4a98..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_aui.vcxproj +++ /dev/null @@ -1,565 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - aui - {A16D3832-0F42-57CE-8F48-50E06649ADE8} - - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\aui\ - vc_x64_mswud\aui\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\aui\ - vc_x64_mswu\aui\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\aui\ - vc_x64_mswuddll\aui\ - true - true - true - true - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\aui\ - vc_x64_mswudll\aui\ - false - false - true - true - wxmsw30ud_aui - wxmsw30ud_aui - wxmsw30u_aui - wxmsw30u_aui - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_auilib.pch - $(OutDir)wxmsw30ud_aui.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_aui.lib - true - - - $(OutDir)wx_vc9_aui.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_auilib.pch - $(OutDir)wxmsw30ud_aui.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_aui.lib - true - - - $(OutDir)wx_vc9_aui.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_auilib.pch - $(OutDir)wxmsw30u_aui.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_aui.lib - true - - - $(OutDir)wx_vc9_aui.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_auilib.pch - $(OutDir)wxmsw30u_aui.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_aui.lib - true - - - $(OutDir)wx_vc9_aui.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_auidll.pch - $(OutDir)wxmsw30ud_aui_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_aui_vc_custom.dll - $(OutDir)wxmsw30ud_aui.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_aui_vc_custom.pdb - MachineX86 - - - $(OutDir)wx_vc9_aui.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_auidll.pch - $(OutDir)wxmsw30ud_aui_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_aui_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_aui_vc_x64_custom.dll - $(OutDir)wxmsw30ud_aui.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_aui_vc_x64_custom.pdb - - - $(OutDir)wx_vc9_aui.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_auidll.pch - $(OutDir)wxmsw30u_aui_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_aui_vc_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_aui_vc_custom.dll - $(OutDir)wxmsw30u_aui.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_aui_vc_custom.pdb - MachineX86 - true - true - - - $(OutDir)wx_vc9_aui.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_auidll.pch - $(OutDir)wxmsw30u_aui_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_aui_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_aui_vc_x64_custom.dll - $(OutDir)wxmsw30u_aui.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_aui_vc_x64_custom.pdb - true - true - - - $(OutDir)wx_vc9_aui.bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_aui.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_aui.vcxproj.filters deleted file mode 100644 index 8ce60aa177..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_aui.vcxproj.filters +++ /dev/null @@ -1,95 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_base.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_base.vcxproj deleted file mode 100644 index 752dc82712..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_base.vcxproj +++ /dev/null @@ -1,859 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - base - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} - - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\base\ - vc_x64_mswud\base\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\base\ - vc_x64_mswu\base\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\base\ - vc_x64_mswuddll\base\ - true - true - true - true - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\base\ - vc_x64_mswudll\base\ - false - false - true - true - wxbase30ud - wxbase30ud - wx$(ProjectName)30ud_vc_custom - wx$(ProjectName)30ud_vc_x64_custom - wxbase30u - wxbase30u - wx$(ProjectName)30u_vc_custom - wx$(ProjectName)30u_vc_x64_custom - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_baselib.pch - $(OutDir)wxbase30ud.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30ud.lib - true - - - $(OutDir)wx_vc9_base.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_baselib.pch - $(OutDir)wxbase30ud.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30ud.lib - true - - - $(OutDir)wx_vc9_base.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_baselib.pch - $(OutDir)wxbase30u.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30u.lib - true - - - $(OutDir)wx_vc9_base.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_baselib.pch - $(OutDir)wxbase30u.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30u.lib - true - - - $(OutDir)wx_vc9_base.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_basedll.pch - $(OutDir)wxbase30ud_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) - $(OutDir)wxbase30ud_vc_custom.dll - $(OutDir)wxbase30ud.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30ud_vc_custom.pdb - MachineX86 - - - $(OutDir)wx_vc9_base.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_basedll.pch - $(OutDir)wxbase30ud_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_vc_x64_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) - $(OutDir)wxbase30ud_vc_x64_custom.dll - $(OutDir)wxbase30ud.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30ud_vc_x64_custom.pdb - - - $(OutDir)wx_vc9_base.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_basedll.pch - $(OutDir)wxbase30u_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_vc_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) - $(OutDir)wxbase30u_vc_custom.dll - $(OutDir)wxbase30u.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30u_vc_custom.pdb - MachineX86 - true - true - - - $(OutDir)wx_vc9_base.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_basedll.pch - $(OutDir)wxbase30u_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_vc_x64_custom;wxUSE_GUI=0;WXMAKINGDLL_BASE;wxUSE_BASE=1;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;%(AdditionalDependencies) - $(OutDir)wxbase30u_vc_x64_custom.dll - $(OutDir)wxbase30u.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30u_vc_x64_custom.pdb - true - true - - - $(OutDir)wx_vc9_base.bsc - true - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - - - - - - - - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_base.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_base.vcxproj.filters deleted file mode 100644 index 7dbd959a59..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_base.vcxproj.filters +++ /dev/null @@ -1,931 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {FEA0C02F-F300-53BA-B784-52A5086B8093} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {61C63C83-EF8C-51CA-A418-51936E7FCD4A} - - - {B4103426-A5DB-5CF0-A30E-BC9546513AAF} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - Generic Sources - - - Common Sources - - - - - MSW Sources - - - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - Generic Headers - - - wxHTML Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_core.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_core.vcxproj deleted file mode 100644 index edac84fdb3..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_core.vcxproj +++ /dev/null @@ -1,1717 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - core - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\core\ - vc_x64_mswud\core\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\core\ - vc_x64_mswu\core\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\core\ - vc_x64_mswuddll\core\ - true - true - true - true - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\core\ - vc_x64_mswudll\core\ - false - false - true - true - wxmsw30ud_core - wxmsw30ud_core - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_core - wxmsw30u_core - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_corelib.pch - $(OutDir)wxmsw30ud_core.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_core.lib - true - - - $(OutDir)wx_vc9_core.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_corelib.pch - $(OutDir)wxmsw30ud_core.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_core.lib - true - - - $(OutDir)wx_vc9_core.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_corelib.pch - $(OutDir)wxmsw30u_core.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_core.lib - true - - - $(OutDir)wx_vc9_core.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_corelib.pch - $(OutDir)wxmsw30u_core.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_core.lib - true - - - $(OutDir)wx_vc9_core.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_coredll.pch - $(OutDir)wxmsw30ud_core_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_core_vc_custom.dll - $(OutDir)wxmsw30ud_core.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_core_vc_custom.pdb - MachineX86 - - - $(OutDir)wx_vc9_core.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_coredll.pch - $(OutDir)wxmsw30ud_core_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_core_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_core_vc_x64_custom.dll - $(OutDir)wxmsw30ud_core.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_core_vc_x64_custom.pdb - - - $(OutDir)wx_vc9_core.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_coredll.pch - $(OutDir)wxmsw30u_core_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_core_vc_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_core_vc_custom.dll - $(OutDir)wxmsw30u_core.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_core_vc_custom.pdb - MachineX86 - true - true - - - $(OutDir)wx_vc9_core.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_coredll.pch - $(OutDir)wxmsw30u_core_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_core_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_core_vc_x64_custom.dll - $(OutDir)wxmsw30u_core.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_core_vc_x64_custom.pdb - true - true - - - $(OutDir)wx_vc9_core.bsc - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - vc_mswuddll\core\msw_accel.obj - vc_x64_mswuddll\core\msw_accel.obj - vc_mswudll\core\msw_accel.obj - vc_x64_mswudll\core\msw_accel.obj - vc_mswud\core\msw_accel.obj - vc_x64_mswud\core\msw_accel.obj - vc_mswu\core\msw_accel.obj - vc_x64_mswu\core\msw_accel.obj - - - - - - - - - - vc_mswuddll\core\msw_bmpbuttn.obj - vc_x64_mswuddll\core\msw_bmpbuttn.obj - vc_mswudll\core\msw_bmpbuttn.obj - vc_x64_mswudll\core\msw_bmpbuttn.obj - vc_mswud\core\msw_bmpbuttn.obj - vc_x64_mswud\core\msw_bmpbuttn.obj - vc_mswu\core\msw_bmpbuttn.obj - vc_x64_mswu\core\msw_bmpbuttn.obj - - - - vc_mswuddll\core\msw_button.obj - vc_x64_mswuddll\core\msw_button.obj - vc_mswudll\core\msw_button.obj - vc_x64_mswudll\core\msw_button.obj - vc_mswud\core\msw_button.obj - vc_x64_mswud\core\msw_button.obj - vc_mswu\core\msw_button.obj - vc_x64_mswu\core\msw_button.obj - - - - vc_mswuddll\core\msw_checkbox.obj - vc_x64_mswuddll\core\msw_checkbox.obj - vc_mswudll\core\msw_checkbox.obj - vc_x64_mswudll\core\msw_checkbox.obj - vc_mswud\core\msw_checkbox.obj - vc_x64_mswud\core\msw_checkbox.obj - vc_mswu\core\msw_checkbox.obj - vc_x64_mswu\core\msw_checkbox.obj - - - vc_mswuddll\core\msw_checklst.obj - vc_x64_mswuddll\core\msw_checklst.obj - vc_mswudll\core\msw_checklst.obj - vc_x64_mswudll\core\msw_checklst.obj - vc_mswud\core\msw_checklst.obj - vc_x64_mswud\core\msw_checklst.obj - vc_mswu\core\msw_checklst.obj - vc_x64_mswu\core\msw_checklst.obj - - - vc_mswuddll\core\msw_choice.obj - vc_x64_mswuddll\core\msw_choice.obj - vc_mswudll\core\msw_choice.obj - vc_x64_mswudll\core\msw_choice.obj - vc_mswud\core\msw_choice.obj - vc_x64_mswud\core\msw_choice.obj - vc_mswu\core\msw_choice.obj - vc_x64_mswu\core\msw_choice.obj - - - - - - - vc_mswuddll\core\msw_combobox.obj - vc_x64_mswuddll\core\msw_combobox.obj - vc_mswudll\core\msw_combobox.obj - vc_x64_mswudll\core\msw_combobox.obj - vc_mswud\core\msw_combobox.obj - vc_x64_mswud\core\msw_combobox.obj - vc_mswu\core\msw_combobox.obj - vc_x64_mswu\core\msw_combobox.obj - - - vc_mswuddll\core\msw_control.obj - vc_x64_mswuddll\core\msw_control.obj - vc_mswudll\core\msw_control.obj - vc_x64_mswudll\core\msw_control.obj - vc_mswud\core\msw_control.obj - vc_x64_mswud\core\msw_control.obj - vc_mswu\core\msw_control.obj - vc_x64_mswu\core\msw_control.obj - - - - - - - - - - - vc_mswuddll\core\msw_dialog.obj - vc_x64_mswuddll\core\msw_dialog.obj - vc_mswudll\core\msw_dialog.obj - vc_x64_mswudll\core\msw_dialog.obj - vc_mswud\core\msw_dialog.obj - vc_x64_mswud\core\msw_dialog.obj - vc_mswu\core\msw_dialog.obj - vc_x64_mswu\core\msw_dialog.obj - - - - - - - - - - - - vc_mswuddll\core\msw_fdrepdlg.obj - vc_x64_mswuddll\core\msw_fdrepdlg.obj - vc_mswudll\core\msw_fdrepdlg.obj - vc_x64_mswudll\core\msw_fdrepdlg.obj - vc_mswud\core\msw_fdrepdlg.obj - vc_x64_mswud\core\msw_fdrepdlg.obj - vc_mswu\core\msw_fdrepdlg.obj - vc_x64_mswu\core\msw_fdrepdlg.obj - - - - - - - - - vc_mswuddll\core\msw_gauge.obj - vc_x64_mswuddll\core\msw_gauge.obj - vc_mswudll\core\msw_gauge.obj - vc_x64_mswudll\core\msw_gauge.obj - vc_mswud\core\msw_gauge.obj - vc_x64_mswud\core\msw_gauge.obj - vc_mswu\core\msw_gauge.obj - vc_x64_mswu\core\msw_gauge.obj - - - - - - - - - - - - - vc_mswuddll\core\msw_listbox.obj - vc_x64_mswuddll\core\msw_listbox.obj - vc_mswudll\core\msw_listbox.obj - vc_x64_mswudll\core\msw_listbox.obj - vc_mswud\core\msw_listbox.obj - vc_x64_mswud\core\msw_listbox.obj - vc_mswu\core\msw_listbox.obj - vc_x64_mswu\core\msw_listbox.obj - - - vc_mswuddll\core\msw_listctrl.obj - vc_x64_mswuddll\core\msw_listctrl.obj - vc_mswudll\core\msw_listctrl.obj - vc_x64_mswudll\core\msw_listctrl.obj - vc_mswud\core\msw_listctrl.obj - vc_x64_mswud\core\msw_listctrl.obj - vc_mswu\core\msw_listctrl.obj - vc_x64_mswu\core\msw_listctrl.obj - - - - - vc_mswuddll\core\msw_menu.obj - vc_x64_mswuddll\core\msw_menu.obj - vc_mswudll\core\msw_menu.obj - vc_x64_mswudll\core\msw_menu.obj - vc_mswud\core\msw_menu.obj - vc_x64_mswud\core\msw_menu.obj - vc_mswu\core\msw_menu.obj - vc_x64_mswu\core\msw_menu.obj - - - - - - - - - - - vc_mswuddll\core\msw_notebook.obj - vc_x64_mswuddll\core\msw_notebook.obj - vc_mswudll\core\msw_notebook.obj - vc_x64_mswudll\core\msw_notebook.obj - vc_mswud\core\msw_notebook.obj - vc_x64_mswud\core\msw_notebook.obj - vc_mswu\core\msw_notebook.obj - vc_x64_mswu\core\msw_notebook.obj - - - - - - - - - - - - - vc_mswuddll\core\msw_radiobox.obj - vc_x64_mswuddll\core\msw_radiobox.obj - vc_mswudll\core\msw_radiobox.obj - vc_x64_mswudll\core\msw_radiobox.obj - vc_mswud\core\msw_radiobox.obj - vc_x64_mswud\core\msw_radiobox.obj - vc_mswu\core\msw_radiobox.obj - vc_x64_mswu\core\msw_radiobox.obj - - - vc_mswuddll\core\msw_radiobut.obj - vc_x64_mswuddll\core\msw_radiobut.obj - vc_mswudll\core\msw_radiobut.obj - vc_x64_mswudll\core\msw_radiobut.obj - vc_mswud\core\msw_radiobut.obj - vc_x64_mswud\core\msw_radiobut.obj - vc_mswu\core\msw_radiobut.obj - vc_x64_mswu\core\msw_radiobut.obj - - - - - - vc_mswuddll\core\msw_scrolbar.obj - vc_x64_mswuddll\core\msw_scrolbar.obj - vc_mswudll\core\msw_scrolbar.obj - vc_x64_mswudll\core\msw_scrolbar.obj - vc_mswud\core\msw_scrolbar.obj - vc_x64_mswud\core\msw_scrolbar.obj - vc_mswu\core\msw_scrolbar.obj - vc_x64_mswu\core\msw_scrolbar.obj - - - - vc_mswuddll\core\msw_slider.obj - vc_x64_mswuddll\core\msw_slider.obj - vc_mswudll\core\msw_slider.obj - vc_x64_mswudll\core\msw_slider.obj - vc_mswud\core\msw_slider.obj - vc_x64_mswud\core\msw_slider.obj - vc_mswu\core\msw_slider.obj - vc_x64_mswu\core\msw_slider.obj - - - vc_mswuddll\core\msw_spinbutt.obj - vc_x64_mswuddll\core\msw_spinbutt.obj - vc_mswudll\core\msw_spinbutt.obj - vc_x64_mswudll\core\msw_spinbutt.obj - vc_mswud\core\msw_spinbutt.obj - vc_x64_mswud\core\msw_spinbutt.obj - vc_mswu\core\msw_spinbutt.obj - vc_x64_mswu\core\msw_spinbutt.obj - - - - vc_mswuddll\core\msw_statbmp.obj - vc_x64_mswuddll\core\msw_statbmp.obj - vc_mswudll\core\msw_statbmp.obj - vc_x64_mswudll\core\msw_statbmp.obj - vc_mswud\core\msw_statbmp.obj - vc_x64_mswud\core\msw_statbmp.obj - vc_mswu\core\msw_statbmp.obj - vc_x64_mswu\core\msw_statbmp.obj - - - vc_mswuddll\core\msw_statbox.obj - vc_x64_mswuddll\core\msw_statbox.obj - vc_mswudll\core\msw_statbox.obj - vc_x64_mswudll\core\msw_statbox.obj - vc_mswud\core\msw_statbox.obj - vc_x64_mswud\core\msw_statbox.obj - vc_mswu\core\msw_statbox.obj - vc_x64_mswu\core\msw_statbox.obj - - - vc_mswuddll\core\msw_statline.obj - vc_x64_mswuddll\core\msw_statline.obj - vc_mswudll\core\msw_statline.obj - vc_x64_mswudll\core\msw_statline.obj - vc_mswud\core\msw_statline.obj - vc_x64_mswud\core\msw_statline.obj - vc_mswu\core\msw_statline.obj - vc_x64_mswu\core\msw_statline.obj - - - vc_mswuddll\core\msw_stattext.obj - vc_x64_mswuddll\core\msw_stattext.obj - vc_mswudll\core\msw_stattext.obj - vc_x64_mswudll\core\msw_stattext.obj - vc_mswud\core\msw_stattext.obj - vc_x64_mswud\core\msw_stattext.obj - vc_mswu\core\msw_stattext.obj - vc_x64_mswu\core\msw_stattext.obj - - - - vc_mswuddll\core\msw_textctrl.obj - vc_x64_mswuddll\core\msw_textctrl.obj - vc_mswudll\core\msw_textctrl.obj - vc_x64_mswudll\core\msw_textctrl.obj - vc_mswud\core\msw_textctrl.obj - vc_x64_mswud\core\msw_textctrl.obj - vc_mswu\core\msw_textctrl.obj - vc_x64_mswu\core\msw_textctrl.obj - - - - vc_mswuddll\core\msw_textmeasure.obj - vc_x64_mswuddll\core\msw_textmeasure.obj - vc_mswudll\core\msw_textmeasure.obj - vc_x64_mswudll\core\msw_textmeasure.obj - vc_mswud\core\msw_textmeasure.obj - vc_x64_mswud\core\msw_textmeasure.obj - vc_mswu\core\msw_textmeasure.obj - vc_x64_mswu\core\msw_textmeasure.obj - - - vc_mswuddll\core\msw_tglbtn.obj - vc_x64_mswuddll\core\msw_tglbtn.obj - vc_mswudll\core\msw_tglbtn.obj - vc_x64_mswudll\core\msw_tglbtn.obj - vc_mswud\core\msw_tglbtn.obj - vc_x64_mswud\core\msw_tglbtn.obj - vc_mswu\core\msw_tglbtn.obj - vc_x64_mswu\core\msw_tglbtn.obj - - - vc_mswuddll\core\msw_toolbar.obj - vc_x64_mswuddll\core\msw_toolbar.obj - vc_mswudll\core\msw_toolbar.obj - vc_x64_mswudll\core\msw_toolbar.obj - vc_mswud\core\msw_toolbar.obj - vc_x64_mswud\core\msw_toolbar.obj - vc_mswu\core\msw_toolbar.obj - vc_x64_mswu\core\msw_toolbar.obj - - - - - - - - - - - - - true - true - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - true - true - - - - - - true - true - true - true - true - true - true - true - - - - true - true - true - true - true - true - true - true - - - - true - true - true - true - true - true - true - true - - - - true - true - true - true - true - true - true - true - - - - - - - - true - true - true - true - true - true - true - true - - - - - true - true - true - true - true - true - true - true - - - - - - - - - - - - - - - - - vc_mswuddll\core\generic_statusbr.obj - vc_x64_mswuddll\core\generic_statusbr.obj - vc_mswudll\core\generic_statusbr.obj - vc_x64_mswudll\core\generic_statusbr.obj - vc_mswud\core\generic_statusbr.obj - vc_x64_mswud\core\generic_statusbr.obj - vc_mswu\core\generic_statusbr.obj - vc_x64_mswu\core\generic_statusbr.obj - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_core.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_core.vcxproj.filters deleted file mode 100644 index 5f5c1635dd..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_core.vcxproj.filters +++ /dev/null @@ -1,2551 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {FEA0C02F-F300-53BA-B784-52A5086B8093} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {61C63C83-EF8C-51CA-A418-51936E7FCD4A} - - - {B4103426-A5DB-5CF0-A30E-BC9546513AAF} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - Generic Sources - - - MSW Sources - - - - - - Common Sources - - - Generic Sources - - - - - MSW Sources - - - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - MSW Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - Generic Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_gl.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_gl.vcxproj deleted file mode 100644 index 69dcb4a5fa..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_gl.vcxproj +++ /dev/null @@ -1,552 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - gl - {DA8B15EF-6750-5928-BC0E-C748213CF9B2} - - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\gl\ - vc_x64_mswud\gl\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\gl\ - vc_x64_mswu\gl\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\gl\ - vc_x64_mswuddll\gl\ - true - true - true - true - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\gl\ - vc_x64_mswudll\gl\ - false - false - true - true - wxmsw30ud_gl - wxmsw30ud_gl - wxmsw30u_gl - wxmsw30u_gl - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_gllib.pch - $(OutDir)wxmsw30ud_gl.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_gl.lib - true - - - $(OutDir)wx_vc9_gl.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_gllib.pch - $(OutDir)wxmsw30ud_gl.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_gl.lib - true - - - $(OutDir)wx_vc9_gl.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_gllib.pch - $(OutDir)wxmsw30u_gl.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_gl.lib - true - - - $(OutDir)wx_vc9_gl.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_gllib.pch - $(OutDir)wxmsw30u_gl.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_gl.lib - true - - - $(OutDir)wx_vc9_gl.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_gldll.pch - $(OutDir)wxmsw30ud_gl_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;wxmsw30ud_core.lib;wxbase30ud.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_gl_vc_custom.dll - $(OutDir)wxmsw30ud_gl.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_gl_vc_custom.pdb - MachineX86 - - - $(OutDir)wx_vc9_gl.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_gldll.pch - $(OutDir)wxmsw30ud_gl_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_gl_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;wxmsw30ud_core.lib;wxbase30ud.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_gl_vc_x64_custom.dll - $(OutDir)wxmsw30ud_gl.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_gl_vc_x64_custom.pdb - - - $(OutDir)wx_vc9_gl.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_gldll.pch - $(OutDir)wxmsw30u_gl_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_gl_vc_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;wxmsw30u_core.lib;wxbase30u.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_gl_vc_custom.dll - $(OutDir)wxmsw30u_gl.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_gl_vc_custom.pdb - MachineX86 - true - true - - - $(OutDir)wx_vc9_gl.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_gldll.pch - $(OutDir)wxmsw30u_gl_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_gl_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;wxmsw30u_core.lib;wxbase30u.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_gl_vc_x64_custom.dll - $(OutDir)wxmsw30u_gl.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_gl_vc_x64_custom.pdb - true - true - - - $(OutDir)wx_vc9_gl.bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - true - true - true - true - - - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_gl.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_gl.vcxproj.filters deleted file mode 100644 index 7425caae50..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_gl.vcxproj.filters +++ /dev/null @@ -1,52 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - MSW Sources - - - - - MSW Sources - - - - - MSW Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_html.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_html.vcxproj deleted file mode 100644 index df99bdbaf6..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_html.vcxproj +++ /dev/null @@ -1,593 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - html - {33CC42F9-7756-5587-863C-8D4461B7C5DD} - - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\html\ - vc_x64_mswud\html\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\html\ - vc_x64_mswu\html\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\html\ - vc_x64_mswuddll\html\ - true - true - true - true - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\html\ - vc_x64_mswudll\html\ - false - false - true - true - wxmsw30ud_html - wxmsw30ud_html - wxmsw30u_html - wxmsw30u_html - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_htmllib.pch - $(OutDir)wxmsw30ud_html.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_html.lib - true - - - $(OutDir)wx_vc9_html.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_htmllib.pch - $(OutDir)wxmsw30ud_html.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_html.lib - true - - - $(OutDir)wx_vc9_html.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_htmllib.pch - $(OutDir)wxmsw30u_html.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_html.lib - true - - - $(OutDir)wx_vc9_html.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_htmllib.pch - $(OutDir)wxmsw30u_html.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_html.lib - true - - - $(OutDir)wx_vc9_html.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_htmldll.pch - $(OutDir)wxmsw30ud_html_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_html_vc_custom.dll - $(OutDir)wxmsw30ud_html.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_html_vc_custom.pdb - MachineX86 - - - $(OutDir)wx_vc9_html.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_htmldll.pch - $(OutDir)wxmsw30ud_html_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_html_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_html_vc_x64_custom.dll - $(OutDir)wxmsw30ud_html.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_html_vc_x64_custom.pdb - - - $(OutDir)wx_vc9_html.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_htmldll.pch - $(OutDir)wxmsw30u_html_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_html_vc_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_html_vc_custom.dll - $(OutDir)wxmsw30u_html.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_html_vc_custom.pdb - MachineX86 - true - true - - - $(OutDir)wx_vc9_html.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_htmldll.pch - $(OutDir)wxmsw30u_html_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_html_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_html_vc_x64_custom.dll - $(OutDir)wxmsw30u_html.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_html_vc_x64_custom.pdb - true - true - - - $(OutDir)wx_vc9_html.bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_html.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_html.vcxproj.filters deleted file mode 100644 index 0ec72a4a42..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_html.vcxproj.filters +++ /dev/null @@ -1,184 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {FEA0C02F-F300-53BA-B784-52A5086B8093} - - - {2F6FA2A9-E2B7-5B50-9F90-38855A21AF00} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {B4103426-A5DB-5CF0-A30E-BC9546513AAF} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - MSW Sources - - - Generic Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - - - MSW Sources - - - - - MSW Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_media.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_media.vcxproj deleted file mode 100644 index 7463063ccf..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_media.vcxproj +++ /dev/null @@ -1,553 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - media - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550} - - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\media\ - vc_x64_mswud\media\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\media\ - vc_x64_mswu\media\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\media\ - vc_x64_mswuddll\media\ - true - true - true - true - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\media\ - vc_x64_mswudll\media\ - false - false - true - true - wxmsw30ud_media - wxmsw30ud_media - wxmsw30u_media - wxmsw30u_media - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_medialib.pch - $(OutDir)wxmsw30ud_media.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_media.lib - true - - - $(OutDir)wx_vc9_media.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_medialib.pch - $(OutDir)wxmsw30ud_media.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_media.lib - true - - - $(OutDir)wx_vc9_media.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_medialib.pch - $(OutDir)wxmsw30u_media.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_media.lib - true - - - $(OutDir)wx_vc9_media.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_medialib.pch - $(OutDir)wxmsw30u_media.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_media.lib - true - - - $(OutDir)wx_vc9_media.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_mediadll.pch - $(OutDir)wxmsw30ud_media_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_media_vc_custom.dll - $(OutDir)wxmsw30ud_media.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_media_vc_custom.pdb - MachineX86 - - - $(OutDir)wx_vc9_media.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_mediadll.pch - $(OutDir)wxmsw30ud_media_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_media_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_media_vc_x64_custom.dll - $(OutDir)wxmsw30ud_media.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_media_vc_x64_custom.pdb - - - $(OutDir)wx_vc9_media.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_mediadll.pch - $(OutDir)wxmsw30u_media_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_media_vc_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_media_vc_custom.dll - $(OutDir)wxmsw30u_media.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_media_vc_custom.pdb - MachineX86 - true - true - - - $(OutDir)wx_vc9_media.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_mediadll.pch - $(OutDir)wxmsw30u_media_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_media_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_media_vc_x64_custom.dll - $(OutDir)wxmsw30u_media.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_media_vc_x64_custom.pdb - true - true - - - $(OutDir)wx_vc9_media.bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_media.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_media.vcxproj.filters deleted file mode 100644 index 86c8194d48..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_media.vcxproj.filters +++ /dev/null @@ -1,55 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - - - MSW Sources - - - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_net.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_net.vcxproj deleted file mode 100644 index 5d5162f218..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_net.vcxproj +++ /dev/null @@ -1,571 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - net - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00} - - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\net\ - vc_x64_mswud\net\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\net\ - vc_x64_mswu\net\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\net\ - vc_x64_mswuddll\net\ - true - true - true - true - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\net\ - vc_x64_mswudll\net\ - false - false - true - true - wxbase30ud_net - wxbase30ud_net - wxbase30u_net - wxbase30u_net - wxbase30ud_$(ProjectName)_vc_custom - wxbase30ud_$(ProjectName)_vc_x64_custom - wxbase30u_$(ProjectName)_vc_custom - wxbase30u_$(ProjectName)_vc_x64_custom - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_netlib.pch - $(OutDir)wxbase30ud_net.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30ud_net.lib - true - - - $(OutDir)wx_vc9_net.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_netlib.pch - $(OutDir)wxbase30ud_net.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30ud_net.lib - true - - - $(OutDir)wx_vc9_net.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_netlib.pch - $(OutDir)wxbase30u_net.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30u_net.lib - true - - - $(OutDir)wx_vc9_net.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_netlib.pch - $(OutDir)wxbase30u_net.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30u_net.lib - true - - - $(OutDir)wx_vc9_net.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_netdll.pch - $(OutDir)wxbase30ud_net_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxbase30ud_net_vc_custom.dll - $(OutDir)wxbase30ud_net.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30ud_net_vc_custom.pdb - MachineX86 - - - $(OutDir)wx_vc9_net.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_netdll.pch - $(OutDir)wxbase30ud_net_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_net_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxbase30ud_net_vc_x64_custom.dll - $(OutDir)wxbase30ud_net.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30ud_net_vc_x64_custom.pdb - - - $(OutDir)wx_vc9_net.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_netdll.pch - $(OutDir)wxbase30u_net_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_net_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxbase30u_net_vc_custom.dll - $(OutDir)wxbase30u_net.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30u_net_vc_custom.pdb - MachineX86 - true - true - - - $(OutDir)wx_vc9_net.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_netdll.pch - $(OutDir)wxbase30u_net_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_net_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxbase30u_net_vc_x64_custom.dll - $(OutDir)wxbase30u_net.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30u_net_vc_x64_custom.pdb - true - true - - - $(OutDir)wx_vc9_net.bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_net.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_net.vcxproj.filters deleted file mode 100644 index a035d90fe4..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_net.vcxproj.filters +++ /dev/null @@ -1,109 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - MSW Sources - - - MSW Sources - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_propgrid.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_propgrid.vcxproj deleted file mode 100644 index 83a4c1fd54..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_propgrid.vcxproj +++ /dev/null @@ -1,565 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - propgrid - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63} - - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\propgrid\ - vc_x64_mswud\propgrid\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\propgrid\ - vc_x64_mswu\propgrid\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\propgrid\ - vc_x64_mswuddll\propgrid\ - true - true - true - true - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\propgrid\ - vc_x64_mswudll\propgrid\ - false - false - true - true - wxmsw30ud_propgrid - wxmsw30ud_propgrid - wxmsw30u_propgrid - wxmsw30u_propgrid - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_propgridlib.pch - $(OutDir)wxmsw30ud_propgrid.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_propgrid.lib - true - - - $(OutDir)wx_vc9_propgrid.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_propgridlib.pch - $(OutDir)wxmsw30ud_propgrid.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_propgrid.lib - true - - - $(OutDir)wx_vc9_propgrid.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_propgridlib.pch - $(OutDir)wxmsw30u_propgrid.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_propgrid.lib - true - - - $(OutDir)wx_vc9_propgrid.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_propgridlib.pch - $(OutDir)wxmsw30u_propgrid.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_propgrid.lib - true - - - $(OutDir)wx_vc9_propgrid.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_propgriddll.pch - $(OutDir)wxmsw30ud_propgrid_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_propgrid_vc_custom.dll - $(OutDir)wxmsw30ud_propgrid.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_propgrid_vc_custom.pdb - MachineX86 - - - $(OutDir)wx_vc9_propgrid.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_propgriddll.pch - $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_propgrid_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.dll - $(OutDir)wxmsw30ud_propgrid.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_propgrid_vc_x64_custom.pdb - - - $(OutDir)wx_vc9_propgrid.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_propgriddll.pch - $(OutDir)wxmsw30u_propgrid_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_propgrid_vc_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_propgrid_vc_custom.dll - $(OutDir)wxmsw30u_propgrid.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_propgrid_vc_custom.pdb - MachineX86 - true - true - - - $(OutDir)wx_vc9_propgrid.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_propgriddll.pch - $(OutDir)wxmsw30u_propgrid_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_propgrid_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_propgrid_vc_x64_custom.dll - $(OutDir)wxmsw30u_propgrid.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_propgrid_vc_x64_custom.pdb - true - true - - - $(OutDir)wx_vc9_propgrid.bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_propgrid.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_propgrid.vcxproj.filters deleted file mode 100644 index e5bc5d5bca..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_propgrid.vcxproj.filters +++ /dev/null @@ -1,95 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_qa.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_qa.vcxproj deleted file mode 100644 index dbe1f7daa6..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_qa.vcxproj +++ /dev/null @@ -1,551 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - qa - {E21129E0-7C08-5936-9D8C-0D60B5319BA7} - - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\qa\ - vc_x64_mswud\qa\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\qa\ - vc_x64_mswu\qa\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\qa\ - vc_x64_mswuddll\qa\ - true - true - true - true - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\qa\ - vc_x64_mswudll\qa\ - false - false - true - true - wxmsw30ud_qa - wxmsw30ud_qa - wxmsw30u_qa - wxmsw30u_qa - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_qalib.pch - $(OutDir)wxmsw30ud_qa.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_qa.lib - true - - - $(OutDir)wx_vc9_qa.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_qalib.pch - $(OutDir)wxmsw30ud_qa.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_qa.lib - true - - - $(OutDir)wx_vc9_qa.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_qalib.pch - $(OutDir)wxmsw30u_qa.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_qa.lib - true - - - $(OutDir)wx_vc9_qa.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_qalib.pch - $(OutDir)wxmsw30u_qa.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_qa.lib - true - - - $(OutDir)wx_vc9_qa.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_qadll.pch - $(OutDir)wxmsw30ud_qa_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;$(OutDir)wxbase30ud_xml.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_qa_vc_custom.dll - $(OutDir)wxmsw30ud_qa.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_qa_vc_custom.pdb - MachineX86 - - - $(OutDir)wx_vc9_qa.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_qadll.pch - $(OutDir)wxmsw30ud_qa_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_qa_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;$(OutDir)wxbase30ud_xml.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_qa_vc_x64_custom.dll - $(OutDir)wxmsw30ud_qa.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_qa_vc_x64_custom.pdb - - - $(OutDir)wx_vc9_qa.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_qadll.pch - $(OutDir)wxmsw30u_qa_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_qa_vc_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;$(OutDir)wxbase30u_xml.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_qa_vc_custom.dll - $(OutDir)wxmsw30u_qa.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_qa_vc_custom.pdb - MachineX86 - true - true - - - $(OutDir)wx_vc9_qa.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_qadll.pch - $(OutDir)wxmsw30u_qa_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_qa_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;$(OutDir)wxbase30u_xml.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_qa_vc_x64_custom.dll - $(OutDir)wxmsw30u_qa.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_qa_vc_x64_custom.pdb - true - true - - - $(OutDir)wx_vc9_qa.bsc - true - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - true - true - true - true - - - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_qa.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_qa.vcxproj.filters deleted file mode 100644 index 6f46761f46..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_qa.vcxproj.filters +++ /dev/null @@ -1,52 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {FEA0C02F-F300-53BA-B784-52A5086B8093} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - Generic Sources - - - - - MSW Sources - - - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_ribbon.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_ribbon.vcxproj deleted file mode 100644 index 8d937b8132..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_ribbon.vcxproj +++ /dev/null @@ -1,569 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - ribbon - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D} - - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\ribbon\ - vc_x64_mswud\ribbon\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\ribbon\ - vc_x64_mswu\ribbon\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\ribbon\ - vc_x64_mswuddll\ribbon\ - true - true - true - true - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\ribbon\ - vc_x64_mswudll\ribbon\ - false - false - true - true - wxmsw30ud_ribbon - wxmsw30ud_ribbon - wxmsw30u_ribbon - wxmsw30u_ribbon - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_ribbonlib.pch - $(OutDir)wxmsw30ud_ribbon.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_ribbon.lib - true - - - $(OutDir)wx_vc9_ribbon.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_ribbonlib.pch - $(OutDir)wxmsw30ud_ribbon.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_ribbon.lib - true - - - $(OutDir)wx_vc9_ribbon.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_ribbonlib.pch - $(OutDir)wxmsw30u_ribbon.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_ribbon.lib - true - - - $(OutDir)wx_vc9_ribbon.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_ribbonlib.pch - $(OutDir)wxmsw30u_ribbon.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_ribbon.lib - true - - - $(OutDir)wx_vc9_ribbon.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_ribbondll.pch - $(OutDir)wxmsw30ud_ribbon_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_ribbon_vc_custom.dll - $(OutDir)wxmsw30ud_ribbon.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_ribbon_vc_custom.pdb - MachineX86 - - - $(OutDir)wx_vc9_ribbon.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_ribbondll.pch - $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_ribbon_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.dll - $(OutDir)wxmsw30ud_ribbon.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_ribbon_vc_x64_custom.pdb - - - $(OutDir)wx_vc9_ribbon.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_ribbondll.pch - $(OutDir)wxmsw30u_ribbon_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_ribbon_vc_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_ribbon_vc_custom.dll - $(OutDir)wxmsw30u_ribbon.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_ribbon_vc_custom.pdb - MachineX86 - true - true - - - $(OutDir)wx_vc9_ribbon.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_ribbondll.pch - $(OutDir)wxmsw30u_ribbon_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_ribbon_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_ribbon_vc_x64_custom.dll - $(OutDir)wxmsw30u_ribbon.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_ribbon_vc_x64_custom.pdb - true - true - - - $(OutDir)wx_vc9_ribbon.bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_ribbon.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_ribbon.vcxproj.filters deleted file mode 100644 index 9395b143f7..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_ribbon.vcxproj.filters +++ /dev/null @@ -1,107 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_richtext.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_richtext.vcxproj deleted file mode 100644 index 3df210aa38..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_richtext.vcxproj +++ /dev/null @@ -1,579 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - richtext - {7FB0902D-8579-5DCE-B883-DAF66A885005} - - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\richtext\ - vc_x64_mswud\richtext\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\richtext\ - vc_x64_mswu\richtext\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\richtext\ - vc_x64_mswuddll\richtext\ - true - true - true - true - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\richtext\ - vc_x64_mswudll\richtext\ - false - false - true - true - wxmsw30ud_richtext - wxmsw30ud_richtext - wxmsw30u_richtext - wxmsw30u_richtext - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_richtextlib.pch - $(OutDir)wxmsw30ud_richtext.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_richtext.lib - true - - - $(OutDir)wx_vc9_richtext.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_richtextlib.pch - $(OutDir)wxmsw30ud_richtext.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_richtext.lib - true - - - $(OutDir)wx_vc9_richtext.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_richtextlib.pch - $(OutDir)wxmsw30u_richtext.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_richtext.lib - true - - - $(OutDir)wx_vc9_richtext.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_richtextlib.pch - $(OutDir)wxmsw30u_richtext.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_richtext.lib - true - - - $(OutDir)wx_vc9_richtext.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_richtextdll.pch - $(OutDir)wxmsw30ud_richtext_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_html.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_richtext_vc_custom.dll - $(OutDir)wxmsw30ud_richtext.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_richtext_vc_custom.pdb - MachineX86 - - - $(OutDir)wx_vc9_richtext.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_richtextdll.pch - $(OutDir)wxmsw30ud_richtext_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_richtext_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_html.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_richtext_vc_x64_custom.dll - $(OutDir)wxmsw30ud_richtext.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_richtext_vc_x64_custom.pdb - - - $(OutDir)wx_vc9_richtext.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_richtextdll.pch - $(OutDir)wxmsw30u_richtext_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_richtext_vc_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_html.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_richtext_vc_custom.dll - $(OutDir)wxmsw30u_richtext.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_richtext_vc_custom.pdb - MachineX86 - true - true - - - $(OutDir)wx_vc9_richtext.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_richtextdll.pch - $(OutDir)wxmsw30u_richtext_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_richtext_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_html.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_richtext_vc_x64_custom.dll - $(OutDir)wxmsw30u_richtext.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_richtext_vc_x64_custom.pdb - true - true - - - $(OutDir)wx_vc9_richtext.bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_richtext.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_richtext.vcxproj.filters deleted file mode 100644 index 0c12699475..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_richtext.vcxproj.filters +++ /dev/null @@ -1,137 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_stc.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_stc.vcxproj deleted file mode 100644 index c80da2e4f9..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_stc.vcxproj +++ /dev/null @@ -1,558 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - stc - {23E1C437-A951-5943-8639-A17F3CF2E606} - - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\stc\ - vc_x64_mswud\stc\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\stc\ - vc_x64_mswu\stc\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\stc\ - vc_x64_mswuddll\stc\ - true - true - true - true - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\stc\ - vc_x64_mswudll\stc\ - false - false - true - true - wxmsw30ud_stc - wxmsw30ud_stc - wxmsw30u_stc - wxmsw30u_stc - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_stclib.pch - $(OutDir)wxmsw30ud_stc.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_stc.lib - true - - - $(OutDir)wx_vc9_stc.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_stclib.pch - $(OutDir)wxmsw30ud_stc.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_stc.lib - true - - - $(OutDir)wx_vc9_stc.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_stclib.pch - $(OutDir)wxmsw30u_stc.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_stc.lib - true - - - $(OutDir)wx_vc9_stc.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_stclib.pch - $(OutDir)wxmsw30u_stc.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_stc.lib - true - - - $(OutDir)wx_vc9_stc.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_stcdll.pch - $(OutDir)wxmsw30ud_stc_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxscintillad.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_stc_vc_custom.dll - $(OutDir)wxmsw30ud_stc.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_stc_vc_custom.pdb - MachineX86 - - - $(OutDir)wx_vc9_stc.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_stcdll.pch - $(OutDir)wxmsw30ud_stc_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_stc_vc_x64_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxscintillad.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_stc_vc_x64_custom.dll - $(OutDir)wxmsw30ud_stc.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_stc_vc_x64_custom.pdb - - - $(OutDir)wx_vc9_stc.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_stcdll.pch - $(OutDir)wxmsw30u_stc_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_stc_vc_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxscintilla.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_stc_vc_custom.dll - $(OutDir)wxmsw30u_stc.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_stc_vc_custom.pdb - MachineX86 - true - true - - - $(OutDir)wx_vc9_stc.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_stcdll.pch - $(OutDir)wxmsw30u_stc_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_stc_vc_x64_custom;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxscintilla.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_stc_vc_x64_custom.dll - $(OutDir)wxmsw30u_stc.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_stc_vc_x64_custom.pdb - true - true - - - $(OutDir)wx_vc9_stc.bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - - - - {74827ebd-93dc-5110-ba95-3f2ab029b6b0} - false - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_stc.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_stc.vcxproj.filters deleted file mode 100644 index ad555d0c97..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_stc.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_webview.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_webview.vcxproj deleted file mode 100644 index 5ec8e4f2cd..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_webview.vcxproj +++ /dev/null @@ -1,557 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - webview - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E} - - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\webview\ - vc_x64_mswud\webview\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\webview\ - vc_x64_mswu\webview\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\webview\ - vc_x64_mswuddll\webview\ - true - true - true - true - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\webview\ - vc_x64_mswudll\webview\ - false - false - true - true - wxmsw30ud_webview - wxmsw30ud_webview - wxmsw30u_webview - wxmsw30u_webview - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_webviewlib.pch - $(OutDir)wxmsw30ud_webview.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_webview.lib - true - - - $(OutDir)wx_vc9_webview.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_webviewlib.pch - $(OutDir)wxmsw30ud_webview.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_webview.lib - true - - - $(OutDir)wx_vc9_webview.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_webviewlib.pch - $(OutDir)wxmsw30u_webview.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_webview.lib - true - - - $(OutDir)wx_vc9_webview.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_webviewlib.pch - $(OutDir)wxmsw30u_webview.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_webview.lib - true - - - $(OutDir)wx_vc9_webview.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_webviewdll.pch - $(OutDir)wxmsw30ud_webview_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_webview_vc_custom.dll - $(OutDir)wxmsw30ud_webview.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_webview_vc_custom.pdb - MachineX86 - - - $(OutDir)wx_vc9_webview.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_webviewdll.pch - $(OutDir)wxmsw30ud_webview_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_webview_vc_x64_custom.dll - $(OutDir)wxmsw30ud_webview.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_webview_vc_custom.pdb - - - $(OutDir)wx_vc9_webview.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_webviewdll.pch - $(OutDir)wxmsw30u_webview_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_webview_vc_custom.dll - $(OutDir)wxmsw30u_webview.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_webview_vc_custom.pdb - MachineX86 - true - true - - - $(OutDir)wx_vc9_webview.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_webviewdll.pch - $(OutDir)wxmsw30u_webview_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_webview_vc_custom;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_webview_vc_x64_custom.dll - $(OutDir)wxmsw30u_webview.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_webview_vc_custom.pdb - true - true - - - $(OutDir)wx_vc9_webview.bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_webview.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_webview.vcxproj.filters deleted file mode 100644 index f720a9de8b..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_webview.vcxproj.filters +++ /dev/null @@ -1,67 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - MSW Sources - - - - - MSW Sources - - - - - MSW Headers - - - MSW Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxexpat.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxexpat.vcxproj deleted file mode 100644 index a0d9555346..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxexpat.vcxproj +++ /dev/null @@ -1,397 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxexpat - {A1A8355B-0988-528E-9CC2-B971D6266669} - - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\wxexpat\ - vc_x64_mswud\wxexpat\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\wxexpat\ - vc_x64_mswu\wxexpat\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\wxexpat\ - vc_x64_mswuddll\wxexpat\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\wxexpat\ - vc_x64_mswudll\wxexpat\ - $(ProjectName)d - $(ProjectName)d - $(ProjectName)d - $(ProjectName)d - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxexpatd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - $(OutDir)wxexpatd.lib - true - - - $(OutDir)wx_vc9_wxexpat.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxexpatd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - $(OutDir)wxexpatd.lib - true - - - $(OutDir)wx_vc9_wxexpat.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxexpat.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - $(OutDir)wxexpat.lib - true - - - $(OutDir)wx_vc9_wxexpat.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxexpat.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - $(OutDir)wxexpat.lib - true - - - $(OutDir)wx_vc9_wxexpat.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxexpatd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - $(OutDir)wxexpatd.lib - true - - - $(OutDir)wx_vc9_wxexpat.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxexpatd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - $(OutDir)wxexpatd.lib - true - - - $(OutDir)wx_vc9_wxexpat.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxexpat.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - $(OutDir)wxexpat.lib - true - - - $(OutDir)wx_vc9_wxexpat.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxexpat.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - $(OutDir)wxexpat.lib - true - - - $(OutDir)wx_vc9_wxexpat.bsc - true - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxexpat.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxexpat.vcxproj.filters deleted file mode 100644 index 7a4ecc7cce..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxexpat.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxjpeg.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxjpeg.vcxproj deleted file mode 100644 index da312515d1..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxjpeg.vcxproj +++ /dev/null @@ -1,440 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxjpeg - {6053CC38-CDEE-584C-8BC8-4B000D800FC7} - - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\wxjpeg\ - vc_x64_mswud\wxjpeg\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\wxjpeg\ - vc_x64_mswu\wxjpeg\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\wxjpeg\ - vc_x64_mswuddll\wxjpeg\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\wxjpeg\ - vc_x64_mswudll\wxjpeg\ - $(ProjectName)d - $(ProjectName)d - $(ProjectName)d - $(ProjectName)d - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)mswud;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxjpegd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;%(AdditionalIncludeDirectories) - - - $(OutDir)wxjpegd.lib - true - - - $(OutDir)wx_vc9_wxjpeg.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)mswud;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxjpegd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;%(AdditionalIncludeDirectories) - - - $(OutDir)wxjpegd.lib - true - - - $(OutDir)wx_vc9_wxjpeg.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)mswu;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxjpeg.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;%(AdditionalIncludeDirectories) - - - $(OutDir)wxjpeg.lib - true - - - $(OutDir)wx_vc9_wxjpeg.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)mswu;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxjpeg.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;%(AdditionalIncludeDirectories) - - - $(OutDir)wxjpeg.lib - true - - - $(OutDir)wx_vc9_wxjpeg.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)mswud;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxjpegd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;%(AdditionalIncludeDirectories) - - - $(OutDir)wxjpegd.lib - true - - - $(OutDir)wx_vc9_wxjpeg.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)mswud;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxjpegd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;%(AdditionalIncludeDirectories) - - - $(OutDir)wxjpegd.lib - true - - - $(OutDir)wx_vc9_wxjpeg.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)mswu;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxjpeg.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;%(AdditionalIncludeDirectories) - - - $(OutDir)wxjpeg.lib - true - - - $(OutDir)wx_vc9_wxjpeg.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)mswu;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxjpeg.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;%(AdditionalIncludeDirectories) - - - $(OutDir)wxjpeg.lib - true - - - $(OutDir)wx_vc9_wxjpeg.bsc - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxjpeg.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxjpeg.vcxproj.filters deleted file mode 100644 index 7ff9dae2ca..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxjpeg.vcxproj.filters +++ /dev/null @@ -1,149 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxpng.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxpng.vcxproj deleted file mode 100644 index 73a087b578..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxpng.vcxproj +++ /dev/null @@ -1,409 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxpng - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0} - - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\wxpng\ - vc_x64_mswud\wxpng\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\wxpng\ - vc_x64_mswu\wxpng\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\wxpng\ - vc_x64_mswuddll\wxpng\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\wxpng\ - vc_x64_mswudll\wxpng\ - $(ProjectName)d - $(ProjectName)d - $(ProjectName)d - $(ProjectName)d - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxpngd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxpngd.lib - true - - - $(OutDir)wx_vc9_wxpng.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxpngd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxpngd.lib - true - - - $(OutDir)wx_vc9_wxpng.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxpng.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxpng.lib - true - - - $(OutDir)wx_vc9_wxpng.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxpng.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxpng.lib - true - - - $(OutDir)wx_vc9_wxpng.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxpngd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxpngd.lib - true - - - $(OutDir)wx_vc9_wxpng.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxpngd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxpngd.lib - true - - - $(OutDir)wx_vc9_wxpng.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxpng.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxpng.lib - true - - - $(OutDir)wx_vc9_wxpng.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxpng.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxpng.lib - true - - - $(OutDir)wx_vc9_wxpng.bsc - true - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxpng.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxpng.vcxproj.filters deleted file mode 100644 index 2355a6eaf8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxpng.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxregex.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxregex.vcxproj deleted file mode 100644 index fe66f2259f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxregex.vcxproj +++ /dev/null @@ -1,472 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxregex - {56A4B526-BB81-5D01-AAA9-16D23BBB169D} - - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\wxregex\ - vc_x64_mswud\wxregex\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\wxregex\ - vc_x64_mswu\wxregex\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\wxregex\ - vc_x64_mswuddll\wxregex\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\wxregex\ - vc_x64_mswudll\wxregex\ - $(ProjectName)ud - $(ProjectName)ud - $(ProjectName)ud - $(ProjectName)ud - $(ProjectName)u - $(ProjectName)u - $(ProjectName)u - $(ProjectName)u - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxregexud.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) - - - $(OutDir)wxregexud.lib - true - - - $(OutDir)wx_vc9_wxregex.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxregexud.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) - - - $(OutDir)wxregexud.lib - true - - - $(OutDir)wx_vc9_wxregex.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxregexu.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) - - - $(OutDir)wxregexu.lib - true - - - $(OutDir)wx_vc9_wxregex.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxregexu.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) - - - $(OutDir)wxregexu.lib - true - - - $(OutDir)wx_vc9_wxregex.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxregexud.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) - - - $(OutDir)wxregexud.lib - true - - - $(OutDir)wx_vc9_wxregex.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxregexud.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)mswud;%(AdditionalIncludeDirectories) - - - $(OutDir)wxregexud.lib - true - - - $(OutDir)wx_vc9_wxregex.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxregexu.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) - - - $(OutDir)wxregexu.lib - true - - - $(OutDir)wx_vc9_wxregex.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxregexu.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)mswu;%(AdditionalIncludeDirectories) - - - $(OutDir)wxregexu.lib - true - - - $(OutDir)wx_vc9_wxregex.bsc - true - - - - - - - - - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxregex.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxregex.vcxproj.filters deleted file mode 100644 index 13f1956e2b..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxregex.vcxproj.filters +++ /dev/null @@ -1,35 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxscintilla.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxscintilla.vcxproj deleted file mode 100644 index 531777ec72..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxscintilla.vcxproj +++ /dev/null @@ -1,583 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxscintilla - {74827EBD-93DC-5110-BA95-3F2AB029B6B0} - - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\wxscintilla\ - vc_x64_mswud\wxscintilla\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\wxscintilla\ - vc_x64_mswu\wxscintilla\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\wxscintilla\ - vc_x64_mswuddll\wxscintilla\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\wxscintilla\ - vc_x64_mswudll\wxscintilla\ - $(ProjectName)d - $(ProjectName)d - $(ProjectName)d - $(ProjectName)d - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxscintillad.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) - - - $(OutDir)wxscintillad.lib - true - - - $(OutDir)wx_vc9_wxscintilla.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxscintillad.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) - - - $(OutDir)wxscintillad.lib - true - - - $(OutDir)wx_vc9_wxscintilla.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxscintilla.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - - - $(OutDir)wxscintilla.lib - true - - - $(OutDir)wx_vc9_wxscintilla.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxscintilla.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - - - $(OutDir)wxscintilla.lib - true - - - $(OutDir)wx_vc9_wxscintilla.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxscintillad.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) - - - $(OutDir)wxscintillad.lib - true - - - $(OutDir)wx_vc9_wxscintilla.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxscintillad.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswud;..\..\include;%(AdditionalIncludeDirectories) - - - $(OutDir)wxscintillad.lib - true - - - $(OutDir)wx_vc9_wxscintilla.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxscintilla.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - - - $(OutDir)wxscintilla.lib - true - - - $(OutDir)wx_vc9_wxscintilla.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxscintilla.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)mswu;..\..\include;%(AdditionalIncludeDirectories) - - - $(OutDir)wxscintilla.lib - true - - - $(OutDir)wx_vc9_wxscintilla.bsc - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxscintilla.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxscintilla.vcxproj.filters deleted file mode 100644 index 81f348d5c1..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxscintilla.vcxproj.filters +++ /dev/null @@ -1,380 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxtiff.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxtiff.vcxproj deleted file mode 100644 index 8ec62c3707..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxtiff.vcxproj +++ /dev/null @@ -1,430 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxtiff - {75596CE6-5AE7-55C9-B890-C07B0A657A83} - - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\wxtiff\ - vc_x64_mswud\wxtiff\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\wxtiff\ - vc_x64_mswu\wxtiff\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\wxtiff\ - vc_x64_mswuddll\wxtiff\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\wxtiff\ - vc_x64_mswudll\wxtiff\ - $(ProjectName)d - $(ProjectName)d - $(ProjectName)d - $(ProjectName)d - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxtiffd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - $(OutDir)wxtiffd.lib - true - - - $(OutDir)wx_vc9_wxtiff.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxtiffd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - $(OutDir)wxtiffd.lib - true - - - $(OutDir)wx_vc9_wxtiff.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxtiff.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - $(OutDir)wxtiff.lib - true - - - $(OutDir)wx_vc9_wxtiff.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxtiff.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - $(OutDir)wxtiff.lib - true - - - $(OutDir)wx_vc9_wxtiff.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxtiffd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - $(OutDir)wxtiffd.lib - true - - - $(OutDir)wx_vc9_wxtiff.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxtiffd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - $(OutDir)wxtiffd.lib - true - - - $(OutDir)wx_vc9_wxtiff.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxtiff.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - $(OutDir)wxtiff.lib - true - - - $(OutDir)wx_vc9_wxtiff.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxtiff.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - $(OutDir)wxtiff.lib - true - - - $(OutDir)wx_vc9_wxtiff.bsc - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxtiff.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxtiff.vcxproj.filters deleted file mode 100644 index 9294e7c179..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxtiff.vcxproj.filters +++ /dev/null @@ -1,119 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxzlib.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxzlib.vcxproj deleted file mode 100644 index 3aa33bea8e..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxzlib.vcxproj +++ /dev/null @@ -1,409 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxzlib - {8B867186-A0B5-5479-B824-E176EDD27C40} - - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - StaticLibrary - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\wxzlib\ - vc_x64_mswud\wxzlib\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\wxzlib\ - vc_x64_mswu\wxzlib\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\wxzlib\ - vc_x64_mswuddll\wxzlib\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\wxzlib\ - vc_x64_mswudll\wxzlib\ - $(ProjectName)d - $(ProjectName)d - $(ProjectName)d - $(ProjectName)d - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxzlibd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - $(OutDir)wxzlibd.lib - true - - - $(OutDir)wx_vc9_wxzlib.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxzlibd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - $(OutDir)wxzlibd.lib - true - - - $(OutDir)wx_vc9_wxzlib.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxzlib.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - $(OutDir)wxzlib.lib - true - - - $(OutDir)wx_vc9_wxzlib.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxzlib.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - $(OutDir)wxzlib.lib - true - - - $(OutDir)wx_vc9_wxzlib.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxzlibd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - $(OutDir)wxzlibd.lib - true - - - $(OutDir)wx_vc9_wxzlib.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)wxzlibd.pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - $(OutDir)wxzlibd.lib - true - - - $(OutDir)wx_vc9_wxzlib.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxzlib.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - $(OutDir)wxzlib.lib - true - - - $(OutDir)wx_vc9_wxzlib.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)wxzlib.pdb - Level3 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - $(OutDir)wxzlib.lib - true - - - $(OutDir)wx_vc9_wxzlib.bsc - true - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxzlib.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxzlib.vcxproj.filters deleted file mode 100644 index 61fc76f670..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_wxzlib.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_xml.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_xml.vcxproj deleted file mode 100644 index c65f94c301..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_xml.vcxproj +++ /dev/null @@ -1,552 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - xml - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} - - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\xml\ - vc_x64_mswud\xml\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\xml\ - vc_x64_mswu\xml\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\xml\ - vc_x64_mswuddll\xml\ - true - true - true - true - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\xml\ - vc_x64_mswudll\xml\ - false - false - true - true - wxbase30ud_xml - wxbase30ud_xml - wxbase30u_xml - wxbase30u_xml - wxbase30ud_$(ProjectName)_vc_custom - wxbase30ud_$(ProjectName)_vc_x64_custom - wxbase30u_$(ProjectName)_vc_custom - wxbase30u_$(ProjectName)_vc_x64_custom - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_xmllib.pch - $(OutDir)wxbase30ud_xml.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30ud_xml.lib - true - - - $(OutDir)wx_vc9_xml.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_xmllib.pch - $(OutDir)wxbase30ud_xml.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30ud_xml.lib - true - - - $(OutDir)wx_vc9_xml.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_xmllib.pch - $(OutDir)wxbase30u_xml.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30u_xml.lib - true - - - $(OutDir)wx_vc9_xml.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_xmllib.pch - $(OutDir)wxbase30u_xml.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxbase30u_xml.lib - true - - - $(OutDir)wx_vc9_xml.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_xmldll.pch - $(OutDir)wxbase30ud_xml_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxbase30ud_xml_vc_custom.dll - $(OutDir)wxbase30ud_xml.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30ud_xml_vc_custom.pdb - MachineX86 - - - $(OutDir)wx_vc9_xml.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_xmldll.pch - $(OutDir)wxbase30ud_xml_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30ud_xml_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxbase30ud_xml_vc_x64_custom.dll - $(OutDir)wxbase30ud_xml.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30ud_xml_vc_x64_custom.pdb - - - $(OutDir)wx_vc9_xml.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_xmldll.pch - $(OutDir)wxbase30u_xml_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_xml_vc_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxbase30u_xml_vc_custom.dll - $(OutDir)wxbase30u_xml.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30u_xml_vc_custom.pdb - MachineX86 - true - true - - - $(OutDir)wx_vc9_xml.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_xmldll.pch - $(OutDir)wxbase30u_xml_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxbase30u_xml_vc_x64_custom;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxbase30u_xml_vc_x64_custom.dll - $(OutDir)wxbase30u_xml.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxbase30u_xml_vc_x64_custom.pdb - true - true - - - $(OutDir)wx_vc9_xml.bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - true - true - true - true - - - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_xml.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_xml.vcxproj.filters deleted file mode 100644 index 294ba1105e..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_xml.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Common Sources - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_xrc.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_xrc.vcxproj deleted file mode 100644 index f84d3bdb55..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_xrc.vcxproj +++ /dev/null @@ -1,677 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - xrc - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D} - - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - DynamicLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - StaticLibrary - false - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswud\xrc\ - vc_x64_mswud\xrc\ - ..\..\lib\vc_lib\ - ..\..\lib\vc_x64_lib\ - vc_mswu\xrc\ - vc_x64_mswu\xrc\ - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswuddll\xrc\ - vc_x64_mswuddll\xrc\ - true - true - true - true - ..\..\lib\vc_dll\ - ..\..\lib\vc_x64_dll\ - vc_mswudll\xrc\ - vc_x64_mswudll\xrc\ - false - false - true - true - wxmsw30ud_xrc - wxmsw30ud_xrc - wxmsw30u_xrc - wxmsw30u_xrc - wxmsw30ud_$(ProjectName)_vc_custom - wxmsw30ud_$(ProjectName)_vc_x64_custom - wxmsw30u_$(ProjectName)_vc_custom - wxmsw30u_$(ProjectName)_vc_x64_custom - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_xrclib.pch - $(OutDir)wxmsw30ud_xrc.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_xrc.lib - true - - - $(OutDir)wx_vc9_xrc.bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswud\wxprec_xrclib.pch - $(OutDir)wxmsw30ud_xrc.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30ud_xrc.lib - true - - - $(OutDir)wx_vc9_xrc.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_xrclib.pch - $(OutDir)wxmsw30u_xrc.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_xrc.lib - true - - - $(OutDir)wx_vc9_xrc.bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswu\wxprec_xrclib.pch - $(OutDir)wxmsw30u_xrc.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)wxmsw30u_xrc.lib - true - - - $(OutDir)wx_vc9_xrc.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_xrcdll.pch - $(OutDir)wxmsw30ud_xrc_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_html.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_xrc_vc_custom.dll - $(OutDir)wxmsw30ud_xrc.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_xrc_vc_custom.pdb - MachineX86 - - - $(OutDir)wx_vc9_xrc.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - vc_mswuddll\wxprec_xrcdll.pch - $(OutDir)wxmsw30ud_xrc_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30ud_xrc_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswud;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiffd.lib;wxjpegd.lib;wxpngd.lib;wxzlibd.lib;wxregexud.lib;wxexpatd.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30ud_html.lib;$(OutDir)wxmsw30ud_adv.lib;$(OutDir)wxmsw30ud_core.lib;$(OutDir)wxbase30ud_xml.lib;$(OutDir)wxbase30ud.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30ud_xrc_vc_x64_custom.dll - $(OutDir)wxmsw30ud_xrc.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30ud_xrc_vc_x64_custom.pdb - - - $(OutDir)wx_vc9_xrc.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_xrcdll.pch - $(OutDir)wxmsw30u_xrc_vc_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_xrc_vc_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_html.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_xrc_vc_custom.dll - $(OutDir)wxmsw30u_xrc.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_xrc_vc_custom.pdb - MachineX86 - true - true - - - $(OutDir)wx_vc9_xrc.bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - vc_mswudll\wxprec_xrcdll.pch - $(OutDir)wxmsw30u_xrc_vc_x64_custom.pdb - Level4 - true - ProgramDatabase - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=wxmsw30u_xrc_vc_x64_custom;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)mswu;..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff.lib;wxjpeg.lib;wxpng.lib;wxzlib.lib;wxregexu.lib;wxexpat.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;winmm.lib;shell32.lib;comctl32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;advapi32.lib;wsock32.lib;wininet.lib;$(OutDir)wxmsw30u_html.lib;$(OutDir)wxmsw30u_adv.lib;$(OutDir)wxmsw30u_core.lib;$(OutDir)wxbase30u_xml.lib;$(OutDir)wxbase30u.lib;%(AdditionalDependencies) - $(OutDir)wxmsw30u_xrc_vc_x64_custom.dll - $(OutDir)wxmsw30u_xrc.lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - $(OutDir)wxmsw30u_xrc_vc_x64_custom.pdb - true - true - - - $(OutDir)wx_vc9_xrc.bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - Creating $(OutDir)mswud\wx\setup.h - Creating $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - copy "%(FullPath)" $(OutDir)mswud\wx\setup.h - $(OutDir)mswud\wx\setup.h;%(Outputs) - $(OutDir)mswud\wx\setup.h;%(Outputs) - Creating $(OutDir)mswu\wx\setup.h - Creating $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - copy "%(FullPath)" $(OutDir)mswu\wx\setup.h - $(OutDir)mswu\wx\setup.h;%(Outputs) - $(OutDir)mswu\wx\setup.h;%(Outputs) - - - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswud\wx\msw\rcdefs.h - Creating $(OutDir)mswud\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswud\wx\msw\rcdefs.h" - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - $(OutDir)mswud\wx\msw;%(AdditionalInputs) - Creating $(OutDir)mswu\wx\msw\rcdefs.h - Creating $(OutDir)mswu\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)mswu\wx\msw\rcdefs.h" - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - $(OutDir)mswu\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_xrc.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_xrc.vcxproj.filters deleted file mode 100644 index 6742e819bf..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc10_xrc.vcxproj.filters +++ /dev/null @@ -1,431 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11.sln b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11.sln deleted file mode 100644 index c12a314d78..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11.sln +++ /dev/null @@ -1,494 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wx_vc11_wxregex.vcxproj", "{56A4B526-BB81-5D01-AAA9-16D23BBB169D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "wx_vc11_wxzlib.vcxproj", "{8B867186-A0B5-5479-B824-E176EDD27C40}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "wx_vc11_wxpng.vcxproj", "{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "wx_vc11_wxjpeg.vcxproj", "{6053CC38-CDEE-584C-8BC8-4B000D800FC7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "wx_vc11_wxtiff.vcxproj", "{75596CE6-5AE7-55C9-B890-C07B0A657A83}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "wx_vc11_wxexpat.vcxproj", "{A1A8355B-0988-528E-9CC2-B971D6266669}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxscintilla", "wx_vc11_wxscintilla.vcxproj", "{74827EBD-93DC-5110-BA95-3F2AB029B6B0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "wx_vc11_base.vcxproj", "{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}" - ProjectSection(ProjectDependencies) = postProject - {56A4B526-BB81-5D01-AAA9-16D23BBB169D} = {56A4B526-BB81-5D01-AAA9-16D23BBB169D} - {A1A8355B-0988-528E-9CC2-B971D6266669} = {A1A8355B-0988-528E-9CC2-B971D6266669} - {8B867186-A0B5-5479-B824-E176EDD27C40} = {8B867186-A0B5-5479-B824-E176EDD27C40} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "wx_vc11_net.vcxproj", "{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}" - ProjectSection(ProjectDependencies) = postProject - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} = {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "wx_vc11_core.vcxproj", "{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}" - ProjectSection(ProjectDependencies) = postProject - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0} = {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0} - {6053CC38-CDEE-584C-8BC8-4B000D800FC7} = {6053CC38-CDEE-584C-8BC8-4B000D800FC7} - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} = {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} - {75596CE6-5AE7-55C9-B890-C07B0A657A83} = {75596CE6-5AE7-55C9-B890-C07B0A657A83} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "wx_vc11_adv.vcxproj", "{24C45343-FD20-5C92-81C1-35A2AE841E79}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "wx_vc11_media.vcxproj", "{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "wx_vc11_html.vcxproj", "{33CC42F9-7756-5587-863C-8D4461B7C5DD}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webview", "wx_vc11_webview.vcxproj", "{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "wx_vc11_qa.vcxproj", "{E21129E0-7C08-5936-9D8C-0D60B5319BA7}" - ProjectSection(ProjectDependencies) = postProject - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "wx_vc11_xml.vcxproj", "{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}" - ProjectSection(ProjectDependencies) = postProject - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} = {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wx_vc11_xrc.vcxproj", "{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}" - ProjectSection(ProjectDependencies) = postProject - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} - {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wx_vc11_aui.vcxproj", "{A16D3832-0F42-57CE-8F48-50E06649ADE8}" - ProjectSection(ProjectDependencies) = postProject - {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - {33CC42F9-7756-5587-863C-8D4461B7C5DD} = {33CC42F9-7756-5587-863C-8D4461B7C5DD} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "wx_vc11_ribbon.vcxproj", "{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}" - ProjectSection(ProjectDependencies) = postProject - {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "propgrid", "wx_vc11_propgrid.vcxproj", "{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}" - ProjectSection(ProjectDependencies) = postProject - {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "wx_vc11_richtext.vcxproj", "{7FB0902D-8579-5DCE-B883-DAF66A885005}" - ProjectSection(ProjectDependencies) = postProject - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} - {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stc", "wx_vc11_stc.vcxproj", "{23E1C437-A951-5943-8639-A17F3CF2E606}" - ProjectSection(ProjectDependencies) = postProject - {74827EBD-93DC-5110-BA95-3F2AB029B6B0} = {74827EBD-93DC-5110-BA95-3F2AB029B6B0} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "wx_vc11_gl.vcxproj", "{DA8B15EF-6750-5928-BC0E-C748213CF9B2}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - DLL Debug|Win32 = DLL Debug|Win32 - DLL Debug|x64 = DLL Debug|x64 - DLL Release|Win32 = DLL Release|Win32 - DLL Release|x64 = DLL Release|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.ActiveCfg = Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.Build.0 = Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|x64.ActiveCfg = Debug|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|x64.Build.0 = Debug|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|x64.Build.0 = DLL Release|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.ActiveCfg = Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.Build.0 = Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|x64.ActiveCfg = Release|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|x64.Build.0 = Release|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.ActiveCfg = Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.Build.0 = Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|x64.ActiveCfg = Debug|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|x64.Build.0 = Debug|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|x64.Build.0 = DLL Release|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.ActiveCfg = Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.Build.0 = Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|x64.ActiveCfg = Release|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|x64.Build.0 = Release|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.ActiveCfg = Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.Build.0 = Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|x64.ActiveCfg = Debug|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|x64.Build.0 = Debug|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|x64.Build.0 = DLL Release|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.ActiveCfg = Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.Build.0 = Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|x64.ActiveCfg = Release|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|x64.Build.0 = Release|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.ActiveCfg = Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.Build.0 = Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|x64.ActiveCfg = Debug|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|x64.Build.0 = Debug|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|x64.Build.0 = DLL Release|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.ActiveCfg = Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.Build.0 = Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|x64.ActiveCfg = Release|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|x64.Build.0 = Release|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.ActiveCfg = Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.Build.0 = Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|x64.ActiveCfg = Debug|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|x64.Build.0 = Debug|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|x64.Build.0 = DLL Release|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.ActiveCfg = Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.Build.0 = Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|x64.ActiveCfg = Release|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|x64.Build.0 = Release|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.ActiveCfg = Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.Build.0 = Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|x64.ActiveCfg = Debug|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|x64.Build.0 = Debug|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|x64.Build.0 = DLL Release|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.ActiveCfg = Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.Build.0 = Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|x64.ActiveCfg = Release|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|x64.Build.0 = Release|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.ActiveCfg = Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.Build.0 = Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.ActiveCfg = Debug|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.Build.0 = Debug|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|x64.Build.0 = DLL Release|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.ActiveCfg = Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.Build.0 = Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.ActiveCfg = Release|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.Build.0 = Release|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.Build.0 = Debug|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.ActiveCfg = Debug|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.Build.0 = Debug|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.Build.0 = DLL Release|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.ActiveCfg = Release|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.Build.0 = Release|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.Build.0 = Debug|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.ActiveCfg = Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.Build.0 = Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|x64.ActiveCfg = Debug|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|x64.Build.0 = Debug|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|x64.Build.0 = DLL Release|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.ActiveCfg = Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.Build.0 = Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|x64.ActiveCfg = Release|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|x64.Build.0 = Release|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.ActiveCfg = Debug|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.Build.0 = Debug|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.Build.0 = DLL Release|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.ActiveCfg = Release|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.Build.0 = Release|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.ActiveCfg = Debug|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.Build.0 = Debug|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.Build.0 = DLL Release|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.ActiveCfg = Release|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.Build.0 = Release|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.ActiveCfg = Debug|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.Build.0 = Debug|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.ActiveCfg = Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.Build.0 = Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|x64.ActiveCfg = Debug|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|x64.Build.0 = Debug|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|x64.Build.0 = DLL Release|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.ActiveCfg = Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.Build.0 = Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|x64.ActiveCfg = Release|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|x64.Build.0 = Release|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.ActiveCfg = Debug|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.Build.0 = Debug|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.Build.0 = DLL Release|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.ActiveCfg = Release|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.Build.0 = Release|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.ActiveCfg = Debug|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.Build.0 = Debug|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.Build.0 = DLL Release|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.ActiveCfg = Release|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.Build.0 = Release|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.ActiveCfg = Debug|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.Build.0 = Debug|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.Build.0 = DLL Release|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.ActiveCfg = Release|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.Build.0 = Release|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.ActiveCfg = Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.Build.0 = Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.ActiveCfg = Debug|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.Build.0 = Debug|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|x64.Build.0 = DLL Release|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.ActiveCfg = Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.Build.0 = Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.ActiveCfg = Release|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.Build.0 = Release|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.ActiveCfg = Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.Build.0 = Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|x64.ActiveCfg = Debug|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|x64.Build.0 = Debug|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|x64.Build.0 = DLL Release|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.ActiveCfg = Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.Build.0 = Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|x64.ActiveCfg = Release|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|x64.Build.0 = Release|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.ActiveCfg = Debug|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.Build.0 = Debug|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.Build.0 = DLL Release|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.ActiveCfg = Release|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.Build.0 = Release|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.ActiveCfg = Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.Build.0 = Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.ActiveCfg = Debug|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.Build.0 = Debug|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|x64.Build.0 = DLL Release|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.ActiveCfg = Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.Build.0 = Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.ActiveCfg = Release|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.Build.0 = Release|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.ActiveCfg = Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.Build.0 = Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|x64.ActiveCfg = Debug|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|x64.Build.0 = Debug|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|x64.Build.0 = DLL Release|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.ActiveCfg = Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.Build.0 = Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|x64.ActiveCfg = Release|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_adv.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_adv.vcxproj deleted file mode 100644 index 458f2ff8aa..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_adv.vcxproj +++ /dev/null @@ -1,673 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - adv - {24C45343-FD20-5C92-81C1-35A2AE841E79} - - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - AnySuitable - true - Speed - ProgramDatabase - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_aui.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_aui.vcxproj deleted file mode 100644 index 3afbee7caa..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_aui.vcxproj +++ /dev/null @@ -1,580 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - aui - {A16D3832-0F42-57CE-8F48-50E06649ADE8} - - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_aui.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_aui.vcxproj.filters deleted file mode 100644 index 741764520f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_aui.vcxproj.filters +++ /dev/null @@ -1,95 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_core.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_core.vcxproj deleted file mode 100644 index 71f49e0f27..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_core.vcxproj +++ /dev/null @@ -1,1727 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - core - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - - - - - - - true - true - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - true - true - - - - - - true - true - true - true - true - true - true - true - - - - true - true - true - true - true - true - true - true - - - - true - true - true - true - true - true - true - true - - - - true - true - true - true - true - true - true - true - - - - - - - - true - true - true - true - true - true - true - true - - - - - true - true - true - true - true - true - true - true - - - - - - - - - - - - - - - - - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_gl.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_gl.vcxproj deleted file mode 100644 index 76df6fb685..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_gl.vcxproj +++ /dev/null @@ -1,567 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - gl - {DA8B15EF-6750-5928-BC0E-C748213CF9B2} - - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - $(OutDir)$(TargetName).pdb - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_gl.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_gl.vcxproj.filters deleted file mode 100644 index 72348ec3c4..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_gl.vcxproj.filters +++ /dev/null @@ -1,52 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - MSW Sources - - - - - MSW Sources - - - - - MSW Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_html.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_html.vcxproj deleted file mode 100644 index acc5c471ec..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_html.vcxproj +++ /dev/null @@ -1,608 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - html - {33CC42F9-7756-5587-863C-8D4461B7C5DD} - - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - $(OutDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_html.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_html.vcxproj.filters deleted file mode 100644 index ffaeba88b4..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_html.vcxproj.filters +++ /dev/null @@ -1,184 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {FEA0C02F-F300-53BA-B784-52A5086B8093} - - - {2F6FA2A9-E2B7-5B50-9F90-38855A21AF00} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {B4103426-A5DB-5CF0-A30E-BC9546513AAF} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - MSW Sources - - - Generic Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - - - MSW Sources - - - - - MSW Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_media.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_media.vcxproj deleted file mode 100644 index 7d33927e4f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_media.vcxproj +++ /dev/null @@ -1,568 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - media - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550} - - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_media.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_media.vcxproj.filters deleted file mode 100644 index 1049af9571..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_media.vcxproj.filters +++ /dev/null @@ -1,55 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - - - MSW Sources - - - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_net.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_net.vcxproj deleted file mode 100644 index e39c8f2e96..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_net.vcxproj +++ /dev/null @@ -1,586 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - net - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00} - - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxBaseLibNamePrefix)_$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxBaseLibNamePrefix)_$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxBaseLibNamePrefix)_$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxBaseLibNamePrefix)_$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_net.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_net.vcxproj.filters deleted file mode 100644 index 066580bfab..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_net.vcxproj.filters +++ /dev/null @@ -1,109 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - MSW Sources - - - MSW Sources - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_propgrid.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_propgrid.vcxproj deleted file mode 100644 index 9b7c0e0888..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_propgrid.vcxproj +++ /dev/null @@ -1,580 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - propgrid - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63} - - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_propgrid.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_propgrid.vcxproj.filters deleted file mode 100644 index 066dc00375..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_propgrid.vcxproj.filters +++ /dev/null @@ -1,95 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_qa.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_qa.vcxproj deleted file mode 100644 index b4c320b767..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_qa.vcxproj +++ /dev/null @@ -1,566 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - qa - {E21129E0-7C08-5936-9D8C-0D60B5319BA7} - - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxBaseLibNamePrefix)_xml.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxBaseLibNamePrefix)_xml.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxBaseLibNamePrefix)_xml.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxBaseLibNamePrefix)_xml.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_qa.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_qa.vcxproj.filters deleted file mode 100644 index ab62dbf090..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_qa.vcxproj.filters +++ /dev/null @@ -1,52 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {FEA0C02F-F300-53BA-B784-52A5086B8093} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - Generic Sources - - - - - MSW Sources - - - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_ribbon.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_ribbon.vcxproj deleted file mode 100644 index dd939b2e80..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_ribbon.vcxproj +++ /dev/null @@ -1,584 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - ribbon - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D} - - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_ribbon.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_ribbon.vcxproj.filters deleted file mode 100644 index 74b8db4e2c..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_ribbon.vcxproj.filters +++ /dev/null @@ -1,107 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_richtext.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_richtext.vcxproj deleted file mode 100644 index f39b4c0483..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_richtext.vcxproj +++ /dev/null @@ -1,596 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - richtext - {7FB0902D-8579-5DCE-B883-DAF66A885005} - - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)html.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxBaseLibNamePrefix)_xml.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)html.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxBaseLibNamePrefix)_xml.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)html.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxBaseLibNamePrefix)_xml.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)html.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxBaseLibNamePrefix)_xml.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_richtext.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_richtext.vcxproj.filters deleted file mode 100644 index bc88ea988c..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_richtext.vcxproj.filters +++ /dev/null @@ -1,143 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_stc.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_stc.vcxproj deleted file mode 100644 index 59792ede6d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_stc.vcxproj +++ /dev/null @@ -1,567 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - stc - {23E1C437-A951-5943-8639-A17F3CF2E606} - - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxOutDir) - $(wxOutDir) - $(wxOutDir) - $(wxOutDir) - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - true - true - false - false - true - true - true - true - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_stc.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_stc.vcxproj.filters deleted file mode 100644 index 5ee91a464d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_stc.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_webview.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_webview.vcxproj deleted file mode 100644 index df0372d67d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_webview.vcxproj +++ /dev/null @@ -1,572 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - webview - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E} - - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_webview.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_webview.vcxproj.filters deleted file mode 100644 index 4496415640..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_webview.vcxproj.filters +++ /dev/null @@ -1,67 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - MSW Sources - - - - - MSW Sources - - - - - MSW Headers - - - MSW Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxexpat.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxexpat.vcxproj deleted file mode 100644 index 896f3d8c7b..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxexpat.vcxproj +++ /dev/null @@ -1,442 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxexpat - {A1A8355B-0988-528E-9CC2-B971D6266669} - - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxexpat.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxexpat.vcxproj.filters deleted file mode 100644 index 59e9b80653..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxexpat.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxjpeg.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxjpeg.vcxproj deleted file mode 100644 index 3b9e4f0d89..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxjpeg.vcxproj +++ /dev/null @@ -1,485 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxjpeg - {6053CC38-CDEE-584C-8BC8-4B000D800FC7} - - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxjpeg.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxjpeg.vcxproj.filters deleted file mode 100644 index f81cbf8abc..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxjpeg.vcxproj.filters +++ /dev/null @@ -1,149 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxpng.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxpng.vcxproj deleted file mode 100644 index a48fcfc218..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxpng.vcxproj +++ /dev/null @@ -1,454 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxpng - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0} - - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - Disabled - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxpng.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxpng.vcxproj.filters deleted file mode 100644 index 90f43c4e1a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxpng.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxregex.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxregex.vcxproj deleted file mode 100644 index cc2f42c2b2..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxregex.vcxproj +++ /dev/null @@ -1,497 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxregex - {56A4B526-BB81-5D01-AAA9-16D23BBB169D} - - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(ProjectName)$(wxSuffix) - $(ProjectName)$(wxSuffix) - $(ProjectName)$(wxSuffix) - $(ProjectName)$(wxSuffix) - $(ProjectName)$(wxSuffix) - $(ProjectName)$(wxSuffix) - $(ProjectName)$(wxSuffix) - $(ProjectName)$(wxSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - Disabled - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxregex.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxregex.vcxproj.filters deleted file mode 100644 index 0e3fbf0511..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxregex.vcxproj.filters +++ /dev/null @@ -1,35 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxscintilla.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxscintilla.vcxproj deleted file mode 100644 index c1240c4054..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxscintilla.vcxproj +++ /dev/null @@ -1,620 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxscintilla - {74827EBD-93DC-5110-BA95-3F2AB029B6B0} - - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - Disabled - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxscintilla.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxscintilla.vcxproj.filters deleted file mode 100644 index 1b75ea62c8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxscintilla.vcxproj.filters +++ /dev/null @@ -1,380 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxtiff.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxtiff.vcxproj deleted file mode 100644 index 10fb445881..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxtiff.vcxproj +++ /dev/null @@ -1,475 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxtiff - {75596CE6-5AE7-55C9-B890-C07B0A657A83} - - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - Disabled - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxtiff.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxtiff.vcxproj.filters deleted file mode 100644 index b3074065e1..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxtiff.vcxproj.filters +++ /dev/null @@ -1,119 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxzlib.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxzlib.vcxproj deleted file mode 100644 index 9ee9f52d27..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxzlib.vcxproj +++ /dev/null @@ -1,454 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxzlib - {8B867186-A0B5-5479-B824-E176EDD27C40} - - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - StaticLibrary - false - v110 - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Level3 - true - ProgramDatabase - $(OutDir)$(TargetName).pdb - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Level3 - true - ProgramDatabase - $(OutDir)$(TargetName).pdb - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - true - $(OutDir)$(TargetName).pdb - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Level3 - true - None - AnySuitable - true - Speed - $(OutDir)$(TargetName).pdb - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Level3 - true - ProgramDatabase - $(OutDir)$(TargetName).pdb - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Level3 - true - ProgramDatabase - $(OutDir)$(TargetName).pdb - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - $(OutDir)$(TargetName).pdb - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Level3 - true - None - AnySuitable - true - Speed - $(OutDir)$(TargetName).pdb - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxzlib.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxzlib.vcxproj.filters deleted file mode 100644 index 76e762f8d9..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_wxzlib.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_xml.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_xml.vcxproj deleted file mode 100644 index 7314f1d98c..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_xml.vcxproj +++ /dev/null @@ -1,567 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - xml - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} - - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxBaseLibNamePrefix)_$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxBaseLibNamePrefix)_$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxBaseLibNamePrefix)_$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxBaseLibNamePrefix)_$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_xml.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_xml.vcxproj.filters deleted file mode 100644 index 18feef67c6..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_xml.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Common Sources - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_xrc.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_xrc.vcxproj deleted file mode 100644 index 35df86ddcd..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_xrc.vcxproj +++ /dev/null @@ -1,692 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - xrc - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D} - - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - DynamicLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - StaticLibrary - false - Unicode - v110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)html.lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix)_xml.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)html.lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix)_xml.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)html.lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix)_xml.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)html.lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix)_xml.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_xrc.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_xrc.vcxproj.filters deleted file mode 100644 index 775cd3831d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc11_xrc.vcxproj.filters +++ /dev/null @@ -1,431 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12.sln b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12.sln deleted file mode 100644 index b67323ec12..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12.sln +++ /dev/null @@ -1,494 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wx_vc12_wxregex.vcxproj", "{56A4B526-BB81-5D01-AAA9-16D23BBB169D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "wx_vc12_wxzlib.vcxproj", "{8B867186-A0B5-5479-B824-E176EDD27C40}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "wx_vc12_wxpng.vcxproj", "{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "wx_vc12_wxjpeg.vcxproj", "{6053CC38-CDEE-584C-8BC8-4B000D800FC7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "wx_vc12_wxtiff.vcxproj", "{75596CE6-5AE7-55C9-B890-C07B0A657A83}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "wx_vc12_wxexpat.vcxproj", "{A1A8355B-0988-528E-9CC2-B971D6266669}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxscintilla", "wx_vc12_wxscintilla.vcxproj", "{74827EBD-93DC-5110-BA95-3F2AB029B6B0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "wx_vc12_base.vcxproj", "{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}" - ProjectSection(ProjectDependencies) = postProject - {56A4B526-BB81-5D01-AAA9-16D23BBB169D} = {56A4B526-BB81-5D01-AAA9-16D23BBB169D} - {A1A8355B-0988-528E-9CC2-B971D6266669} = {A1A8355B-0988-528E-9CC2-B971D6266669} - {8B867186-A0B5-5479-B824-E176EDD27C40} = {8B867186-A0B5-5479-B824-E176EDD27C40} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "wx_vc12_net.vcxproj", "{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}" - ProjectSection(ProjectDependencies) = postProject - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} = {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "wx_vc12_core.vcxproj", "{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}" - ProjectSection(ProjectDependencies) = postProject - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0} = {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0} - {6053CC38-CDEE-584C-8BC8-4B000D800FC7} = {6053CC38-CDEE-584C-8BC8-4B000D800FC7} - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} = {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} - {75596CE6-5AE7-55C9-B890-C07B0A657A83} = {75596CE6-5AE7-55C9-B890-C07B0A657A83} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "wx_vc12_adv.vcxproj", "{24C45343-FD20-5C92-81C1-35A2AE841E79}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "wx_vc12_media.vcxproj", "{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "wx_vc12_html.vcxproj", "{33CC42F9-7756-5587-863C-8D4461B7C5DD}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webview", "wx_vc12_webview.vcxproj", "{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "wx_vc12_qa.vcxproj", "{E21129E0-7C08-5936-9D8C-0D60B5319BA7}" - ProjectSection(ProjectDependencies) = postProject - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "wx_vc12_xml.vcxproj", "{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}" - ProjectSection(ProjectDependencies) = postProject - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} = {3FCC50C2-81E9-5DB2-B8D8-2129427568B1} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wx_vc12_xrc.vcxproj", "{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}" - ProjectSection(ProjectDependencies) = postProject - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} - {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wx_vc12_aui.vcxproj", "{A16D3832-0F42-57CE-8F48-50E06649ADE8}" - ProjectSection(ProjectDependencies) = postProject - {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - {33CC42F9-7756-5587-863C-8D4461B7C5DD} = {33CC42F9-7756-5587-863C-8D4461B7C5DD} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "wx_vc12_ribbon.vcxproj", "{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}" - ProjectSection(ProjectDependencies) = postProject - {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "propgrid", "wx_vc12_propgrid.vcxproj", "{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}" - ProjectSection(ProjectDependencies) = postProject - {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "wx_vc12_richtext.vcxproj", "{7FB0902D-8579-5DCE-B883-DAF66A885005}" - ProjectSection(ProjectDependencies) = postProject - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} - {24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stc", "wx_vc12_stc.vcxproj", "{23E1C437-A951-5943-8639-A17F3CF2E606}" - ProjectSection(ProjectDependencies) = postProject - {74827EBD-93DC-5110-BA95-3F2AB029B6B0} = {74827EBD-93DC-5110-BA95-3F2AB029B6B0} - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "wx_vc12_gl.vcxproj", "{DA8B15EF-6750-5928-BC0E-C748213CF9B2}" - ProjectSection(ProjectDependencies) = postProject - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - DLL Debug|Win32 = DLL Debug|Win32 - DLL Debug|x64 = DLL Debug|x64 - DLL Release|Win32 = DLL Release|Win32 - DLL Release|x64 = DLL Release|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.ActiveCfg = Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.Build.0 = Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|x64.ActiveCfg = Debug|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|x64.Build.0 = Debug|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|x64.Build.0 = DLL Release|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.ActiveCfg = Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.Build.0 = Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|x64.ActiveCfg = Release|x64 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|x64.Build.0 = Release|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.ActiveCfg = Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.Build.0 = Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|x64.ActiveCfg = Debug|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|x64.Build.0 = Debug|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|x64.Build.0 = DLL Release|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.ActiveCfg = Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.Build.0 = Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|x64.ActiveCfg = Release|x64 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|x64.Build.0 = Release|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.ActiveCfg = Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.Build.0 = Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|x64.ActiveCfg = Debug|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|x64.Build.0 = Debug|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|x64.Build.0 = DLL Release|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.ActiveCfg = Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.Build.0 = Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|x64.ActiveCfg = Release|x64 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|x64.Build.0 = Release|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.ActiveCfg = Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.Build.0 = Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|x64.ActiveCfg = Debug|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|x64.Build.0 = Debug|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|x64.Build.0 = DLL Release|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.ActiveCfg = Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.Build.0 = Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|x64.ActiveCfg = Release|x64 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|x64.Build.0 = Release|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.ActiveCfg = Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.Build.0 = Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|x64.ActiveCfg = Debug|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|x64.Build.0 = Debug|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|x64.Build.0 = DLL Release|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.ActiveCfg = Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.Build.0 = Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|x64.ActiveCfg = Release|x64 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|x64.Build.0 = Release|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.ActiveCfg = Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.Build.0 = Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|x64.ActiveCfg = Debug|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|x64.Build.0 = Debug|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|x64.Build.0 = DLL Release|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.ActiveCfg = Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.Build.0 = Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|x64.ActiveCfg = Release|x64 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|x64.Build.0 = Release|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.ActiveCfg = Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.Build.0 = Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.ActiveCfg = Debug|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|x64.Build.0 = Debug|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|x64.Build.0 = DLL Release|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.ActiveCfg = Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.Build.0 = Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.ActiveCfg = Release|x64 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|x64.Build.0 = Release|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.ActiveCfg = Debug|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|x64.Build.0 = Debug|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|x64.Build.0 = DLL Release|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.ActiveCfg = Release|x64 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|x64.Build.0 = Release|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.ActiveCfg = Debug|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|x64.Build.0 = Debug|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|x64.Build.0 = DLL Release|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.ActiveCfg = Release|x64 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|x64.Build.0 = Release|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.ActiveCfg = Debug|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|x64.Build.0 = Debug|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|x64.Build.0 = DLL Release|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.ActiveCfg = Release|x64 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|x64.Build.0 = Release|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.ActiveCfg = Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.Build.0 = Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|x64.ActiveCfg = Debug|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|x64.Build.0 = Debug|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|x64.Build.0 = DLL Release|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.ActiveCfg = Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.Build.0 = Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|x64.ActiveCfg = Release|x64 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|x64.Build.0 = Release|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.ActiveCfg = Debug|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|x64.Build.0 = Debug|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|x64.Build.0 = DLL Release|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.ActiveCfg = Release|x64 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|x64.Build.0 = Release|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.ActiveCfg = Debug|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|x64.Build.0 = Debug|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|x64.Build.0 = DLL Release|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.ActiveCfg = Release|x64 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|x64.Build.0 = Release|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.ActiveCfg = Debug|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|x64.Build.0 = Debug|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|x64.Build.0 = DLL Release|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.ActiveCfg = Release|x64 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|x64.Build.0 = Release|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.ActiveCfg = Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.Build.0 = Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|x64.ActiveCfg = Debug|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|x64.Build.0 = Debug|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|x64.Build.0 = DLL Release|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.ActiveCfg = Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.Build.0 = Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|x64.ActiveCfg = Release|x64 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|x64.Build.0 = Release|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.ActiveCfg = Debug|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|x64.Build.0 = Debug|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|x64.Build.0 = DLL Release|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.ActiveCfg = Release|x64 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|x64.Build.0 = Release|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.ActiveCfg = Debug|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|x64.Build.0 = Debug|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|x64.Build.0 = DLL Release|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.ActiveCfg = Release|x64 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|x64.Build.0 = Release|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.ActiveCfg = Debug|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|x64.Build.0 = Debug|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|x64.Build.0 = DLL Release|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.ActiveCfg = Release|x64 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|x64.Build.0 = Release|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.ActiveCfg = Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.Build.0 = Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.ActiveCfg = Debug|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|x64.Build.0 = Debug|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|x64.Build.0 = DLL Release|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.ActiveCfg = Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.Build.0 = Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.ActiveCfg = Release|x64 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|x64.Build.0 = Release|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.ActiveCfg = Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.Build.0 = Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|x64.ActiveCfg = Debug|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|x64.Build.0 = Debug|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|x64.Build.0 = DLL Release|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.ActiveCfg = Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.Build.0 = Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|x64.ActiveCfg = Release|x64 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|x64.Build.0 = Release|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.ActiveCfg = Debug|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|x64.Build.0 = Debug|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|x64.Build.0 = DLL Release|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.ActiveCfg = Release|x64 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|x64.Build.0 = Release|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.ActiveCfg = Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.Build.0 = Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.ActiveCfg = Debug|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|x64.Build.0 = Debug|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|x64.Build.0 = DLL Release|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.ActiveCfg = Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.Build.0 = Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.ActiveCfg = Release|x64 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|x64.Build.0 = Release|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.ActiveCfg = Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.Build.0 = Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|x64.ActiveCfg = Debug|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|x64.Build.0 = Debug|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|x64.ActiveCfg = DLL Debug|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|x64.Build.0 = DLL Debug|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|x64.ActiveCfg = DLL Release|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|x64.Build.0 = DLL Release|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.ActiveCfg = Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.Build.0 = Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|x64.ActiveCfg = Release|x64 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_adv.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_adv.vcxproj deleted file mode 100644 index 6b74f9b766..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_adv.vcxproj +++ /dev/null @@ -1,673 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - adv - {24C45343-FD20-5C92-81C1-35A2AE841E79} - - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - AnySuitable - true - Speed - ProgramDatabase - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_ADV;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_aui.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_aui.vcxproj deleted file mode 100644 index c7e447168c..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_aui.vcxproj +++ /dev/null @@ -1,580 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - aui - {A16D3832-0F42-57CE-8F48-50E06649ADE8} - - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_AUI;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_aui.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_aui.vcxproj.filters deleted file mode 100644 index 741764520f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_aui.vcxproj.filters +++ /dev/null @@ -1,95 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_core.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_core.vcxproj deleted file mode 100644 index d513776bf5..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_core.vcxproj +++ /dev/null @@ -1,1727 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - core - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} - - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_CORE;wxUSE_BASE=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - $(IntDir)msw_%(Filename).obj - - - - - - - - - - - - - true - true - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - true - true - - - - - - true - true - true - true - true - true - true - true - - - - true - true - true - true - true - true - true - true - - - - true - true - true - true - true - true - true - true - - - - true - true - true - true - true - true - true - true - - - - - - - - true - true - true - true - true - true - true - true - - - - - true - true - true - true - true - true - true - true - - - - - - - - - - - - - - - - - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - $(IntDir)generic_%(Filename).obj - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_gl.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_gl.vcxproj deleted file mode 100644 index a9171801ed..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_gl.vcxproj +++ /dev/null @@ -1,567 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - gl - {DA8B15EF-6750-5928-BC0E-C748213CF9B2} - - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - Level4 - true - ProgramDatabase - $(OutDir)$(TargetName).pdb - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_GL;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;opengl32.lib;glu32.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_gl.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_gl.vcxproj.filters deleted file mode 100644 index 72348ec3c4..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_gl.vcxproj.filters +++ /dev/null @@ -1,52 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - MSW Sources - - - - - MSW Sources - - - - - MSW Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_html.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_html.vcxproj deleted file mode 100644 index c5637550b2..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_html.vcxproj +++ /dev/null @@ -1,608 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - html - {33CC42F9-7756-5587-863C-8D4461B7C5DD} - - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - $(OutDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_HTML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_html.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_html.vcxproj.filters deleted file mode 100644 index ffaeba88b4..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_html.vcxproj.filters +++ /dev/null @@ -1,184 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {FEA0C02F-F300-53BA-B784-52A5086B8093} - - - {2F6FA2A9-E2B7-5B50-9F90-38855A21AF00} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {B4103426-A5DB-5CF0-A30E-BC9546513AAF} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - MSW Sources - - - Generic Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - wxHTML Sources - - - - - MSW Sources - - - - - MSW Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - wxHTML Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_media.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_media.vcxproj deleted file mode 100644 index 8be6b2522e..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_media.vcxproj +++ /dev/null @@ -1,568 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - media - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550} - - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_MEDIA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_media.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_media.vcxproj.filters deleted file mode 100644 index 1049af9571..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_media.vcxproj.filters +++ /dev/null @@ -1,55 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - MSW Sources - - - MSW Sources - - - MSW Sources - - - - - MSW Sources - - - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_net.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_net.vcxproj deleted file mode 100644 index 839ce6d564..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_net.vcxproj +++ /dev/null @@ -1,586 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - net - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00} - - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxBaseLibNamePrefix)_$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxBaseLibNamePrefix)_$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxBaseLibNamePrefix)_$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_NET;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxBaseLibNamePrefix)_$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_net.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_net.vcxproj.filters deleted file mode 100644 index 066580bfab..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_net.vcxproj.filters +++ /dev/null @@ -1,109 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - MSW Sources - - - MSW Sources - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_propgrid.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_propgrid.vcxproj deleted file mode 100644 index 782b720db2..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_propgrid.vcxproj +++ /dev/null @@ -1,580 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - propgrid - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63} - - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_PROPGRID;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_propgrid.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_propgrid.vcxproj.filters deleted file mode 100644 index 066dc00375..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_propgrid.vcxproj.filters +++ /dev/null @@ -1,95 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_qa.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_qa.vcxproj deleted file mode 100644 index 1d54eac949..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_qa.vcxproj +++ /dev/null @@ -1,566 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - qa - {E21129E0-7C08-5936-9D8C-0D60B5319BA7} - - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxBaseLibNamePrefix)_xml.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxBaseLibNamePrefix)_xml.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxBaseLibNamePrefix)_xml.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_QA;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxBaseLibNamePrefix)_xml.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_qa.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_qa.vcxproj.filters deleted file mode 100644 index ab62dbf090..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_qa.vcxproj.filters +++ /dev/null @@ -1,52 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {FEA0C02F-F300-53BA-B784-52A5086B8093} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - Generic Sources - - - - - MSW Sources - - - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_ribbon.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_ribbon.vcxproj deleted file mode 100644 index 9d2e5fa4d9..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_ribbon.vcxproj +++ /dev/null @@ -1,584 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - ribbon - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D} - - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_RIBBON;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_ribbon.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_ribbon.vcxproj.filters deleted file mode 100644 index 74b8db4e2c..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_ribbon.vcxproj.filters +++ /dev/null @@ -1,107 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_richtext.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_richtext.vcxproj deleted file mode 100644 index 1c6437d665..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_richtext.vcxproj +++ /dev/null @@ -1,596 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - richtext - {7FB0902D-8579-5DCE-B883-DAF66A885005} - - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)html.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxBaseLibNamePrefix)_xml.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)html.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxBaseLibNamePrefix)_xml.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)html.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxBaseLibNamePrefix)_xml.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_RICHTEXT;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)html.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;$(wxBaseLibNamePrefix)_xml.lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_richtext.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_richtext.vcxproj.filters deleted file mode 100644 index bc88ea988c..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_richtext.vcxproj.filters +++ /dev/null @@ -1,143 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_stc.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_stc.vcxproj deleted file mode 100644 index ec6e02854a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_stc.vcxproj +++ /dev/null @@ -1,567 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - stc - {23E1C437-A951-5943-8639-A17F3CF2E606} - - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxOutDir) - $(wxOutDir) - $(wxOutDir) - $(wxOutDir) - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - true - true - false - false - true - true - true - true - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;WXMAKINGDLL_STC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;wxscintilla$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_stc.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_stc.vcxproj.filters deleted file mode 100644 index 5ee91a464d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_stc.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_webview.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_webview.vcxproj deleted file mode 100644 index ac9d5da325..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_webview.vcxproj +++ /dev/null @@ -1,572 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - webview - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E} - - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_WEBVIEW;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_webview.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_webview.vcxproj.filters deleted file mode 100644 index 4496415640..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_webview.vcxproj.filters +++ /dev/null @@ -1,67 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - - - Common Sources - - - Common Sources - - - Common Sources - - - Common Sources - - - MSW Sources - - - - - MSW Sources - - - - - MSW Headers - - - MSW Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxexpat.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxexpat.vcxproj deleted file mode 100644 index c8f13c27f7..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxexpat.vcxproj +++ /dev/null @@ -1,442 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxexpat - {A1A8355B-0988-528E-9CC2-B971D6266669} - - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - $(OutDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;COMPILED_FROM_DSP;%(PreprocessorDefinitions) - 0x0409 - $(OutDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxexpat.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxexpat.vcxproj.filters deleted file mode 100644 index 59e9b80653..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxexpat.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxjpeg.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxjpeg.vcxproj deleted file mode 100644 index 8ef71b5531..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxjpeg.vcxproj +++ /dev/null @@ -1,485 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxjpeg - {6053CC38-CDEE-584C-8BC8-4B000D800FC7} - - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxjpeg.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxjpeg.vcxproj.filters deleted file mode 100644 index f81cbf8abc..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxjpeg.vcxproj.filters +++ /dev/null @@ -1,149 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxpng.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxpng.vcxproj deleted file mode 100644 index 1c76de3221..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxpng.vcxproj +++ /dev/null @@ -1,454 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxpng - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0} - - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - Disabled - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxpng.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxpng.vcxproj.filters deleted file mode 100644 index 90f43c4e1a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxpng.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxregex.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxregex.vcxproj deleted file mode 100644 index 772b709b5b..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxregex.vcxproj +++ /dev/null @@ -1,497 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxregex - {56A4B526-BB81-5D01-AAA9-16D23BBB169D} - - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(ProjectName)$(wxSuffix) - $(ProjectName)$(wxSuffix) - $(ProjectName)$(wxSuffix) - $(ProjectName)$(wxSuffix) - $(ProjectName)$(wxSuffix) - $(ProjectName)$(wxSuffix) - $(ProjectName)$(wxSuffix) - $(ProjectName)$(wxSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - Disabled - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\include;$(OutDir)$(wxIncSubDir);%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxregex.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxregex.vcxproj.filters deleted file mode 100644 index 0e3fbf0511..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxregex.vcxproj.filters +++ /dev/null @@ -1,35 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxscintilla.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxscintilla.vcxproj deleted file mode 100644 index 07e2cba439..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxscintilla.vcxproj +++ /dev/null @@ -1,620 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxscintilla - {74827EBD-93DC-5110-BA95-3F2AB029B6B0} - - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - Disabled - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;__WX__;SCI_LEXER;LINK_LEXERS;WXUSINGDLL;__WXMSW__;_UNICODE;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\stc\scintilla\include;..\..\src\stc\scintilla\lexlib;..\..\src\stc\scintilla\src;$(OutDir)$(wxIncSubDir);..\..\include;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxscintilla.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxscintilla.vcxproj.filters deleted file mode 100644 index 1b75ea62c8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxscintilla.vcxproj.filters +++ /dev/null @@ -1,380 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxtiff.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxtiff.vcxproj deleted file mode 100644 index 3ef1c9ebc0..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxtiff.vcxproj +++ /dev/null @@ -1,475 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxtiff - {75596CE6-5AE7-55C9-B890-C07B0A657A83} - - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - Disabled - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - $(OutDir)$(TargetName).pdb - Level3 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - ..\..\src\zlib;..\..\src\jpeg;..\..\src\tiff\libtiff;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxtiff.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxtiff.vcxproj.filters deleted file mode 100644 index b3074065e1..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxtiff.vcxproj.filters +++ /dev/null @@ -1,119 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxzlib.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxzlib.vcxproj deleted file mode 100644 index db18eb5bcc..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxzlib.vcxproj +++ /dev/null @@ -1,454 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - wxzlib - {8B867186-A0B5-5479-B824-E176EDD27C40} - - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - StaticLibrary - false - v120 - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - $(ProjectName)$(wxSuffixDebug) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - Disabled - %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Level3 - true - ProgramDatabase - $(OutDir)$(TargetName).pdb - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Level3 - true - ProgramDatabase - $(OutDir)$(TargetName).pdb - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - true - $(OutDir)$(TargetName).pdb - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Level3 - true - None - AnySuitable - true - Speed - $(OutDir)$(TargetName).pdb - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Level3 - true - ProgramDatabase - $(OutDir)$(TargetName).pdb - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - %(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Level3 - true - ProgramDatabase - $(OutDir)$(TargetName).pdb - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Level3 - true - ProgramDatabase - AnySuitable - true - Speed - $(OutDir)$(TargetName).pdb - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - %(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Level3 - true - None - AnySuitable - true - Speed - $(OutDir)$(TargetName).pdb - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions) - 0x0409 - %(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxzlib.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxzlib.vcxproj.filters deleted file mode 100644 index 76e762f8d9..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_wxzlib.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_xml.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_xml.vcxproj deleted file mode 100644 index a5e88e3933..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_xml.vcxproj +++ /dev/null @@ -1,567 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - xml - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} - - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxBaseLibNamePrefix)_$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxBaseLibNamePrefix)_$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxBaseLibNamePrefix)_$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxBaseLibNamePrefix)_$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);wxUSE_GUI=0;WXUSINGDLL;WXMAKINGDLL_XML;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxBaseLibNamePrefix)_$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_xml.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_xml.vcxproj.filters deleted file mode 100644 index 18feef67c6..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_xml.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Common Sources - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_xrc.vcxproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_xrc.vcxproj deleted file mode 100644 index 85a19e8097..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_xrc.vcxproj +++ /dev/null @@ -1,692 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - DLL Debug - Win32 - - - DLL Debug - x64 - - - DLL Release - Win32 - - - DLL Release - x64 - - - Release - Win32 - - - Release - x64 - - - - xrc - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D} - - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - DynamicLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - StaticLibrary - false - Unicode - v120 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - true - true - true - true - $(wxOutDir) - $(wxOutDir) - $(wxIntRootDir)$(ProjectName)\ - $(wxIntRootDir)$(ProjectName)\ - false - false - true - true - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitLibNamePrefix)$(ProjectName) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - $(wxToolkitDllNamePrefix)$(ProjectName)$(wxToolkitDllNameSuffix) - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - true - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - true - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_LIB;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)lib.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - $(OutDir)$(TargetName)$(TargetExt) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)html.lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix)_xml.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - MachineX86 - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - Disabled - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - Sync - EnableFastChecks - MultiThreadedDebugDLL - true - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - - - _DEBUG;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)html.lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix)_xml.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - ProgramDatabase - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)html.lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix)_xml.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - MachineX86 - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - /MP %(AdditionalOptions) - MaxSpeed - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - WIN32;_USRDLL;DLL_EXPORTS;_CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - Sync - MultiThreadedDLL - true - Use - wx/wxprec.h - $(IntDir)..\wxprec_$(ProjectName)dll.pch - $(OutDir)$(TargetName).pdb - Level4 - true - None - AnySuitable - true - Speed - - - _CRT_SECURE_NO_DEPRECATE=1;_CRT_NON_CONFORMING_SWPRINTFS=1;_SCL_SECURE_NO_WARNINGS=1;__WXMSW__;NDEBUG;_UNICODE;WXBUILDING;WXDLLNAME=$(TargetName);WXUSINGDLL;WXMAKINGDLL_XRC;%(PreprocessorDefinitions) - 0x0409 - $(OutDir)$(wxIncSubDir);..\..\include;..\..\src\tiff\libtiff;..\..\src\jpeg;..\..\src\png;..\..\src\zlib;..\..\src\regex;..\..\src\expat\lib;%(AdditionalIncludeDirectories) - - - %(AdditionalOptions) - wxtiff$(wxSuffixDebug).lib;wxjpeg$(wxSuffixDebug).lib;wxpng$(wxSuffixDebug).lib;wxzlib$(wxSuffixDebug).lib;wxregex$(wxSuffix).lib;wxexpat$(wxSuffixDebug).lib;$(wxToolkitLibNamePrefix)html.lib;$(wxToolkitLibNamePrefix)adv.lib;$(wxToolkitLibNamePrefix)core.lib;$(wxBaseLibNamePrefix)_xml.lib;$(wxBaseLibNamePrefix).lib;%(AdditionalDependencies) - $(OutDir)$(wxToolkitLibNamePrefix)$(ProjectName).lib - true - $(OutDir);%(AdditionalLibraryDirectories) - false - true - true - - - $(OutDir)wx_$(wxCompilerPrefix)_$(ProjectName).bsc - true - - - - - Create - Create - Create - Create - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - - - - - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - Creating $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - copy "%(FullPath)" $(OutDir)$(wxIncSubDir)\wx\setup.h - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\setup.h;%(Outputs) - - - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - Creating $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - cl /EP /nologo "%(FullPath)" > "$(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h" - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw\rcdefs.h;%(Outputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - $(OutDir)$(wxIncSubDir)\wx\msw;%(AdditionalInputs) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_xrc.vcxproj.filters b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_xrc.vcxproj.filters deleted file mode 100644 index 775cd3831d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc12_xrc.vcxproj.filters +++ /dev/null @@ -1,431 +0,0 @@ - - - - - {A6A5C30D-BDB6-5050-906D-10A96065136C} - - - {D030D8C2-53EE-5B96-8F89-D78157B06140} - - - {63537534-1833-5C1F-8DBD-359A84F294C8} - - - {5AFFF20E-29F9-512B-B80A-7DC45976CDAC} - - - {8C07E926-65B0-5F00-B0D6-7F40DA69BB25} - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Common Sources - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - MSW Sources - - - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - Common Headers - - - - - Setup Headers - - - MSW Headers - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7.sln b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7.sln deleted file mode 100644 index ad723b1d82..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7.sln +++ /dev/null @@ -1,248 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wx_vc7_wxregex.vcproj", "{7A1A5354-6DB4-53F1-B75C-FE909D796167}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "wx_vc7_wxzlib.vcproj", "{DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "wx_vc7_wxpng.vcproj", "{EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "wx_vc7_wxjpeg.vcproj", "{3CA6563C-F480-52D4-AF05-D641E25A5DF2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "wx_vc7_wxtiff.vcproj", "{456F9EAD-4A96-59BD-A39A-75DAA25D517B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "wx_vc7_wxexpat.vcproj", "{AF27ABC5-1AB2-55D0-8E7D-239C0176530E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxscintilla", "wx_vc7_wxscintilla.vcproj", "{A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "wx_vc7_base.vcproj", "{79F1691B-08C4-55BB-985E-FDDB0BC8753C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "wx_vc7_net.vcproj", "{48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "wx_vc7_core.vcproj", "{552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "wx_vc7_adv.vcproj", "{35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "wx_vc7_media.vcproj", "{CD68AE51-BA90-5367-BB7D-F013E8E42AAF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "wx_vc7_html.vcproj", "{C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webview", "wx_vc7_webview.vcproj", "{BF21B19C-6122-566D-8795-8820E033BFA2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "wx_vc7_qa.vcproj", "{5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "wx_vc7_xml.vcproj", "{B036100A-CEA0-5466-BE27-7E5B3687CAB8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wx_vc7_xrc.vcproj", "{40DB525F-1EFF-56A4-8301-3AAD661135F3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wx_vc7_aui.vcproj", "{0937D36F-9EAC-5D3D-B990-44B3F99BFC34}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "wx_vc7_ribbon.vcproj", "{7973B6EB-688A-5E14-8175-A32A51A3DFC8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "propgrid", "wx_vc7_propgrid.vcproj", "{F7A944F0-250D-57CD-8F71-BC38B2513B28}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "wx_vc7_richtext.vcproj", "{52F16F53-E13D-55CA-AD64-ACB0274B0704}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stc", "wx_vc7_stc.vcproj", "{4B498696-42F2-5547-B159-87E4CAF436C1}" - ProjectSection(ProjectDependencies) = postProject - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6} = {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "wx_vc7_gl.vcproj", "{407F0D6F-2B2D-5774-B9D3-FA972A663072}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - DLL Debug|Win32 = DLL Debug|Win32 - DLL Release|Win32 = DLL Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Debug|Win32.ActiveCfg = Debug|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Debug|Win32.Build.0 = Debug|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Release|Win32.ActiveCfg = Release|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.Release|Win32.Build.0 = Release|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {7A1A5354-6DB4-53F1-B75C-FE909D796167}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Debug|Win32.ActiveCfg = Debug|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Debug|Win32.Build.0 = Debug|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Release|Win32.ActiveCfg = Release|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.Release|Win32.Build.0 = Release|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {DDD86D36-A4F6-5A54-AE2C-144B3594E1CE}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Debug|Win32.ActiveCfg = Debug|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Debug|Win32.Build.0 = Debug|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Release|Win32.ActiveCfg = Release|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.Release|Win32.Build.0 = Release|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {EE6AD15D-E891-5E03-AB6C-6F98ACE69A3C}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Debug|Win32.ActiveCfg = Debug|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Debug|Win32.Build.0 = Debug|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Release|Win32.ActiveCfg = Release|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.Release|Win32.Build.0 = Release|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {3CA6563C-F480-52D4-AF05-D641E25A5DF2}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Debug|Win32.ActiveCfg = Debug|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Debug|Win32.Build.0 = Debug|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Release|Win32.ActiveCfg = Release|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.Release|Win32.Build.0 = Release|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {456F9EAD-4A96-59BD-A39A-75DAA25D517B}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Debug|Win32.ActiveCfg = Debug|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Debug|Win32.Build.0 = Debug|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Release|Win32.ActiveCfg = Release|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.Release|Win32.Build.0 = Release|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {AF27ABC5-1AB2-55D0-8E7D-239C0176530E}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Debug|Win32.ActiveCfg = Debug|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Debug|Win32.Build.0 = Debug|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Release|Win32.ActiveCfg = Release|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.Release|Win32.Build.0 = Release|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A00328D4-6B01-5DF5-828E-AC2CB8B83CF6}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Debug|Win32.ActiveCfg = Debug|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Debug|Win32.Build.0 = Debug|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Release|Win32.ActiveCfg = Release|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.Release|Win32.Build.0 = Release|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {79F1691B-08C4-55BB-985E-FDDB0BC8753C}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Debug|Win32.ActiveCfg = Debug|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Debug|Win32.Build.0 = Debug|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Release|Win32.ActiveCfg = Release|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.Release|Win32.Build.0 = Release|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {48EEE04D-6B25-5A11-8A4A-B84C3C1146EC}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Debug|Win32.ActiveCfg = Debug|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Debug|Win32.Build.0 = Debug|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Release|Win32.ActiveCfg = Release|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.Release|Win32.Build.0 = Release|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {552E2EB7-F6EA-548D-A6CC-FCB0B246EE7F}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Debug|Win32.ActiveCfg = Debug|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Debug|Win32.Build.0 = Debug|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Release|Win32.ActiveCfg = Release|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.Release|Win32.Build.0 = Release|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {35F2F245-4EF0-5FFB-AD23-E1D7DAC39F0E}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Debug|Win32.ActiveCfg = Debug|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Debug|Win32.Build.0 = Debug|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Release|Win32.ActiveCfg = Release|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.Release|Win32.Build.0 = Release|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {CD68AE51-BA90-5367-BB7D-F013E8E42AAF}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Debug|Win32.ActiveCfg = Debug|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Debug|Win32.Build.0 = Debug|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Release|Win32.ActiveCfg = Release|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.Release|Win32.Build.0 = Release|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {C4CBFDA4-B78E-5C7D-A5EC-B20CF69DB256}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {BF21B19C-6122-566D-8795-8820E033BFA2}.Debug|Win32.ActiveCfg = Debug|Win32 - {BF21B19C-6122-566D-8795-8820E033BFA2}.Debug|Win32.Build.0 = Debug|Win32 - {BF21B19C-6122-566D-8795-8820E033BFA2}.Release|Win32.ActiveCfg = Release|Win32 - {BF21B19C-6122-566D-8795-8820E033BFA2}.Release|Win32.Build.0 = Release|Win32 - {BF21B19C-6122-566D-8795-8820E033BFA2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {BF21B19C-6122-566D-8795-8820E033BFA2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {BF21B19C-6122-566D-8795-8820E033BFA2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {BF21B19C-6122-566D-8795-8820E033BFA2}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Debug|Win32.ActiveCfg = Debug|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Debug|Win32.Build.0 = Debug|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Release|Win32.ActiveCfg = Release|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.Release|Win32.Build.0 = Release|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {5ADF90A8-DA5C-55B3-88F1-94C0A0E9C76D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Debug|Win32.ActiveCfg = Debug|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Debug|Win32.Build.0 = Debug|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Release|Win32.ActiveCfg = Release|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.Release|Win32.Build.0 = Release|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {B036100A-CEA0-5466-BE27-7E5B3687CAB8}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Debug|Win32.ActiveCfg = Debug|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Debug|Win32.Build.0 = Debug|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Release|Win32.ActiveCfg = Release|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.Release|Win32.Build.0 = Release|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {40DB525F-1EFF-56A4-8301-3AAD661135F3}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Debug|Win32.ActiveCfg = Debug|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Debug|Win32.Build.0 = Debug|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Release|Win32.ActiveCfg = Release|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.Release|Win32.Build.0 = Release|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {0937D36F-9EAC-5D3D-B990-44B3F99BFC34}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Debug|Win32.ActiveCfg = Debug|Win32 - {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Debug|Win32.Build.0 = Debug|Win32 - {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Release|Win32.ActiveCfg = Release|Win32 - {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.Release|Win32.Build.0 = Release|Win32 - {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {7973B6EB-688A-5E14-8175-A32A51A3DFC8}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Debug|Win32.ActiveCfg = Debug|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Debug|Win32.Build.0 = Debug|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Release|Win32.ActiveCfg = Release|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.Release|Win32.Build.0 = Release|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {F7A944F0-250D-57CD-8F71-BC38B2513B28}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Debug|Win32.ActiveCfg = Debug|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Debug|Win32.Build.0 = Debug|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Release|Win32.ActiveCfg = Release|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.Release|Win32.Build.0 = Release|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {52F16F53-E13D-55CA-AD64-ACB0274B0704}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.Debug|Win32.ActiveCfg = Debug|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.Debug|Win32.Build.0 = Debug|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.Release|Win32.ActiveCfg = Release|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.Release|Win32.Build.0 = Release|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {4B498696-42F2-5547-B159-87E4CAF436C1}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Debug|Win32.ActiveCfg = Debug|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Debug|Win32.Build.0 = Debug|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Release|Win32.ActiveCfg = Release|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.Release|Win32.Build.0 = Release|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {407F0D6F-2B2D-5774-B9D3-FA972A663072}.DLL Release|Win32.Build.0 = DLL Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_adv.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_adv.vcproj deleted file mode 100644 index fd63bb094a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_adv.vcproj +++ /dev/null @@ -1,760 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_aui.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_aui.vcproj deleted file mode 100644 index eb2cdac9ea..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_aui.vcproj +++ /dev/null @@ -1,478 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_base.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_base.vcproj deleted file mode 100644 index d9fbe15892..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_base.vcproj +++ /dev/null @@ -1,1346 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_core.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_core.vcproj deleted file mode 100644 index 8bd4f46f96..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_core.vcproj +++ /dev/null @@ -1,2914 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_gl.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_gl.vcproj deleted file mode 100644 index ac8992a878..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_gl.vcproj +++ /dev/null @@ -1,434 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_html.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_html.vcproj deleted file mode 100644 index ea2168e8c4..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_html.vcproj +++ /dev/null @@ -1,569 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_media.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_media.vcproj deleted file mode 100644 index 860c336428..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_media.vcproj +++ /dev/null @@ -1,437 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_net.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_net.vcproj deleted file mode 100644 index 59ab48a9b3..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_net.vcproj +++ /dev/null @@ -1,491 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_propgrid.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_propgrid.vcproj deleted file mode 100644 index e62dd8acac..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_propgrid.vcproj +++ /dev/null @@ -1,478 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_qa.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_qa.vcproj deleted file mode 100644 index c368469b2b..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_qa.vcproj +++ /dev/null @@ -1,435 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_ribbon.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_ribbon.vcproj deleted file mode 100644 index 9b53a97ce5..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_ribbon.vcproj +++ /dev/null @@ -1,490 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_richtext.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_richtext.vcproj deleted file mode 100644 index afb95d8460..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_richtext.vcproj +++ /dev/null @@ -1,529 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_stc.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_stc.vcproj deleted file mode 100644 index 8227fb7d94..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_stc.vcproj +++ /dev/null @@ -1,439 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_webview.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_webview.vcproj deleted file mode 100644 index 7728cfb3ef..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_webview.vcproj +++ /dev/null @@ -1,452 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxexpat.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxexpat.vcproj deleted file mode 100644 index ec6216019c..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxexpat.vcproj +++ /dev/null @@ -1,261 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxjpeg.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxjpeg.vcproj deleted file mode 100644 index de882959de..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxjpeg.vcproj +++ /dev/null @@ -1,390 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxpng.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxpng.vcproj deleted file mode 100644 index f8debfab46..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxpng.vcproj +++ /dev/null @@ -1,297 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxregex.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxregex.vcproj deleted file mode 100644 index efffd6609f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxregex.vcproj +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxscintilla.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxscintilla.vcproj deleted file mode 100644 index 98b4c15cb5..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxscintilla.vcproj +++ /dev/null @@ -1,703 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxtiff.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxtiff.vcproj deleted file mode 100644 index 6cbb2d1776..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxtiff.vcproj +++ /dev/null @@ -1,369 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxzlib.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxzlib.vcproj deleted file mode 100644 index d0d9edde8b..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_wxzlib.vcproj +++ /dev/null @@ -1,297 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_xml.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_xml.vcproj deleted file mode 100644 index e09b1da34f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_xml.vcproj +++ /dev/null @@ -1,439 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_xrc.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_xrc.vcproj deleted file mode 100644 index eca30bde61..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc7_xrc.vcproj +++ /dev/null @@ -1,814 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8.sln b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8.sln deleted file mode 100644 index 55f8f624f7..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8.sln +++ /dev/null @@ -1,249 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wx_vc8_wxregex.vcproj", "{078F4E39-D258-54B5-B1B1-4905D10E06DC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "wx_vc8_wxzlib.vcproj", "{02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "wx_vc8_wxpng.vcproj", "{2E428F55-7263-58A2-80E4-59D2E6BD9E5A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "wx_vc8_wxjpeg.vcproj", "{4BDDC25D-2967-5450-8439-107D28E7B5D7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "wx_vc8_wxtiff.vcproj", "{6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "wx_vc8_wxexpat.vcproj", "{3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxscintilla", "wx_vc8_wxscintilla.vcproj", "{CC1B3044-403C-53A2-8AA5-821F7A99A29F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "wx_vc8_base.vcproj", "{9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "wx_vc8_net.vcproj", "{C752F044-0E49-5C21-818F-751B327B35AA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "wx_vc8_core.vcproj", "{A92A7D53-52C9-5561-AD62-A3EC4379CC4D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "wx_vc8_adv.vcproj", "{2764E632-B514-5EEE-BD94-23BCF6FC2A92}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "wx_vc8_media.vcproj", "{3FCADF33-E2F4-5D9C-9300-A5995BDA9378}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "wx_vc8_html.vcproj", "{32B18CFE-19C8-5F72-9759-CE03A314A875}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webview", "wx_vc8_webview.vcproj", "{51173FB3-6227-51D7-8807-1FC9CD18781C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "wx_vc8_qa.vcproj", "{6EA54780-4728-5F04-A501-3B3F4538874C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "wx_vc8_xml.vcproj", "{CD477539-2983-5490-B8C4-DC72B2760FFF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wx_vc8_xrc.vcproj", "{5802720D-A6B1-5E95-AFF3-B80CFE03431B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wx_vc8_aui.vcproj", "{B361C000-79E7-5B8A-8F5F-BC0168C7002E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "wx_vc8_ribbon.vcproj", "{F751C47E-8534-571F-8E4A-F0E6AC978D63}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "propgrid", "wx_vc8_propgrid.vcproj", "{93781718-26B6-5541-84C5-78C6A8226AEC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "wx_vc8_richtext.vcproj", "{4928FA3B-C258-5E39-AE05-E4BD709955B3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stc", "wx_vc8_stc.vcproj", "{FA559111-7B08-54E7-BD3B-0B621C819C78}" - ProjectSection(ProjectDependencies) = postProject - {CC1B3044-403C-53A2-8AA5-821F7A99A29F} = {CC1B3044-403C-53A2-8AA5-821F7A99A29F} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "wx_vc8_gl.vcproj", "{F2A00E07-A7DC-511E-912E-B3A10B8A93CC}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - DLL Debug|Win32 = DLL Debug|Win32 - DLL Release|Win32 = DLL Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Debug|Win32.ActiveCfg = Debug|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Debug|Win32.Build.0 = Debug|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Release|Win32.ActiveCfg = Release|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.Release|Win32.Build.0 = Release|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {078F4E39-D258-54B5-B1B1-4905D10E06DC}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Debug|Win32.ActiveCfg = Debug|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Debug|Win32.Build.0 = Debug|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Release|Win32.ActiveCfg = Release|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.Release|Win32.Build.0 = Release|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {02A5D9F0-B0D3-5AD7-B6BA-9E5C05647992}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Debug|Win32.ActiveCfg = Debug|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Debug|Win32.Build.0 = Debug|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Release|Win32.ActiveCfg = Release|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.Release|Win32.Build.0 = Release|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {2E428F55-7263-58A2-80E4-59D2E6BD9E5A}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Debug|Win32.ActiveCfg = Debug|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Debug|Win32.Build.0 = Debug|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Release|Win32.ActiveCfg = Release|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.Release|Win32.Build.0 = Release|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {4BDDC25D-2967-5450-8439-107D28E7B5D7}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Debug|Win32.ActiveCfg = Debug|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Debug|Win32.Build.0 = Debug|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Release|Win32.ActiveCfg = Release|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.Release|Win32.Build.0 = Release|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {6C6028A1-9741-536A-A4CC-AD9D5A21EFE9}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Debug|Win32.ActiveCfg = Debug|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Debug|Win32.Build.0 = Debug|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Release|Win32.ActiveCfg = Release|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.Release|Win32.Build.0 = Release|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {3E2CE61B-B4B7-5120-8EE3-65ECC0BE055E}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Debug|Win32.ActiveCfg = Debug|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Debug|Win32.Build.0 = Debug|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Release|Win32.ActiveCfg = Release|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.Release|Win32.Build.0 = Release|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {CC1B3044-403C-53A2-8AA5-821F7A99A29F}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Debug|Win32.ActiveCfg = Debug|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Debug|Win32.Build.0 = Debug|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Release|Win32.ActiveCfg = Release|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.Release|Win32.Build.0 = Release|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {9B9B8541-3661-5AD8-8DFF-0BE67FBF1A37}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.Debug|Win32.ActiveCfg = Debug|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.Debug|Win32.Build.0 = Debug|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.Release|Win32.ActiveCfg = Release|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.Release|Win32.Build.0 = Release|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {C752F044-0E49-5C21-818F-751B327B35AA}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Debug|Win32.ActiveCfg = Debug|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Debug|Win32.Build.0 = Debug|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Release|Win32.ActiveCfg = Release|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.Release|Win32.Build.0 = Release|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A92A7D53-52C9-5561-AD62-A3EC4379CC4D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Debug|Win32.ActiveCfg = Debug|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Debug|Win32.Build.0 = Debug|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Release|Win32.ActiveCfg = Release|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.Release|Win32.Build.0 = Release|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {2764E632-B514-5EEE-BD94-23BCF6FC2A92}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Debug|Win32.ActiveCfg = Debug|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Debug|Win32.Build.0 = Debug|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Release|Win32.ActiveCfg = Release|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.Release|Win32.Build.0 = Release|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {3FCADF33-E2F4-5D9C-9300-A5995BDA9378}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.Debug|Win32.ActiveCfg = Debug|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.Debug|Win32.Build.0 = Debug|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.Release|Win32.ActiveCfg = Release|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.Release|Win32.Build.0 = Release|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {32B18CFE-19C8-5F72-9759-CE03A314A875}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {51173FB3-6227-51D7-8807-1FC9CD18781C}.Debug|Win32.ActiveCfg = Debug|Win32 - {51173FB3-6227-51D7-8807-1FC9CD18781C}.Debug|Win32.Build.0 = Debug|Win32 - {51173FB3-6227-51D7-8807-1FC9CD18781C}.Release|Win32.ActiveCfg = Release|Win32 - {51173FB3-6227-51D7-8807-1FC9CD18781C}.Release|Win32.Build.0 = Release|Win32 - {51173FB3-6227-51D7-8807-1FC9CD18781C}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {51173FB3-6227-51D7-8807-1FC9CD18781C}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {51173FB3-6227-51D7-8807-1FC9CD18781C}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {51173FB3-6227-51D7-8807-1FC9CD18781C}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.Debug|Win32.ActiveCfg = Debug|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.Debug|Win32.Build.0 = Debug|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.Release|Win32.ActiveCfg = Release|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.Release|Win32.Build.0 = Release|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {6EA54780-4728-5F04-A501-3B3F4538874C}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.Debug|Win32.ActiveCfg = Debug|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.Debug|Win32.Build.0 = Debug|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.Release|Win32.ActiveCfg = Release|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.Release|Win32.Build.0 = Release|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {CD477539-2983-5490-B8C4-DC72B2760FFF}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Debug|Win32.ActiveCfg = Debug|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Debug|Win32.Build.0 = Debug|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Release|Win32.ActiveCfg = Release|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.Release|Win32.Build.0 = Release|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {5802720D-A6B1-5E95-AFF3-B80CFE03431B}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Debug|Win32.ActiveCfg = Debug|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Debug|Win32.Build.0 = Debug|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Release|Win32.ActiveCfg = Release|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.Release|Win32.Build.0 = Release|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {B361C000-79E7-5B8A-8F5F-BC0168C7002E}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Debug|Win32.ActiveCfg = Debug|Win32 - {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Debug|Win32.Build.0 = Debug|Win32 - {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Release|Win32.ActiveCfg = Release|Win32 - {F751C47E-8534-571F-8E4A-F0E6AC978D63}.Release|Win32.Build.0 = Release|Win32 - {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {F751C47E-8534-571F-8E4A-F0E6AC978D63}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.Debug|Win32.ActiveCfg = Debug|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.Debug|Win32.Build.0 = Debug|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.Release|Win32.ActiveCfg = Release|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.Release|Win32.Build.0 = Release|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {93781718-26B6-5541-84C5-78C6A8226AEC}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Debug|Win32.ActiveCfg = Debug|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Debug|Win32.Build.0 = Debug|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Release|Win32.ActiveCfg = Release|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.Release|Win32.Build.0 = Release|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {4928FA3B-C258-5E39-AE05-E4BD709955B3}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.Debug|Win32.ActiveCfg = Debug|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.Debug|Win32.Build.0 = Debug|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.Release|Win32.ActiveCfg = Release|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.Release|Win32.Build.0 = Release|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {FA559111-7B08-54E7-BD3B-0B621C819C78}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Debug|Win32.ActiveCfg = Debug|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Debug|Win32.Build.0 = Debug|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Release|Win32.ActiveCfg = Release|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.Release|Win32.Build.0 = Release|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {F2A00E07-A7DC-511E-912E-B3A10B8A93CC}.DLL Release|Win32.Build.0 = DLL Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_adv.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_adv.vcproj deleted file mode 100644 index b09a5b6567..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_adv.vcproj +++ /dev/null @@ -1,1019 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_aui.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_aui.vcproj deleted file mode 100644 index fec567146e..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_aui.vcproj +++ /dev/null @@ -1,643 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_base.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_base.vcproj deleted file mode 100644 index 2719275fc6..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_base.vcproj +++ /dev/null @@ -1,1800 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_core.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_core.vcproj deleted file mode 100644 index fa9901f2bc..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_core.vcproj +++ /dev/null @@ -1,3890 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_gl.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_gl.vcproj deleted file mode 100644 index 898d32bdc4..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_gl.vcproj +++ /dev/null @@ -1,585 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_html.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_html.vcproj deleted file mode 100644 index deea2934d7..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_html.vcproj +++ /dev/null @@ -1,764 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_media.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_media.vcproj deleted file mode 100644 index 3ae22be241..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_media.vcproj +++ /dev/null @@ -1,589 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_net.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_net.vcproj deleted file mode 100644 index 19a46f7cbd..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_net.vcproj +++ /dev/null @@ -1,661 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_propgrid.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_propgrid.vcproj deleted file mode 100644 index 0af6df8fe5..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_propgrid.vcproj +++ /dev/null @@ -1,643 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_qa.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_qa.vcproj deleted file mode 100644 index f5b04aba08..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_qa.vcproj +++ /dev/null @@ -1,586 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_ribbon.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_ribbon.vcproj deleted file mode 100644 index ca62286862..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_ribbon.vcproj +++ /dev/null @@ -1,659 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_richtext.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_richtext.vcproj deleted file mode 100644 index e4b1aaca1e..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_richtext.vcproj +++ /dev/null @@ -1,711 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_stc.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_stc.vcproj deleted file mode 100644 index d0071ff976..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_stc.vcproj +++ /dev/null @@ -1,591 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_webview.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_webview.vcproj deleted file mode 100644 index f5c049c7cd..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_webview.vcproj +++ /dev/null @@ -1,609 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxexpat.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxexpat.vcproj deleted file mode 100644 index c9ff1563d7..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxexpat.vcproj +++ /dev/null @@ -1,370 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxjpeg.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxjpeg.vcproj deleted file mode 100644 index 7aa7e6388f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxjpeg.vcproj +++ /dev/null @@ -1,542 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxpng.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxpng.vcproj deleted file mode 100644 index 5eec3cd8e8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxpng.vcproj +++ /dev/null @@ -1,418 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxregex.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxregex.vcproj deleted file mode 100644 index f68f2ccdd8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxregex.vcproj +++ /dev/null @@ -1,492 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxscintilla.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxscintilla.vcproj deleted file mode 100644 index 9e150277e8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxscintilla.vcproj +++ /dev/null @@ -1,952 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxtiff.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxtiff.vcproj deleted file mode 100644 index 0a81f69605..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxtiff.vcproj +++ /dev/null @@ -1,514 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxzlib.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxzlib.vcproj deleted file mode 100644 index 6c160c8bc6..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_wxzlib.vcproj +++ /dev/null @@ -1,418 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_xml.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_xml.vcproj deleted file mode 100644 index e1d1e81910..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_xml.vcproj +++ /dev/null @@ -1,591 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_xrc.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_xrc.vcproj deleted file mode 100644 index 731a031109..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc8_xrc.vcproj +++ /dev/null @@ -1,1091 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9.sln b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9.sln deleted file mode 100644 index fad9021db5..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9.sln +++ /dev/null @@ -1,249 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "wx_vc9_wxregex.vcproj", "{56A4B526-BB81-5D01-AAA9-16D23BBB169D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "wx_vc9_wxzlib.vcproj", "{8B867186-A0B5-5479-B824-E176EDD27C40}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "wx_vc9_wxpng.vcproj", "{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "wx_vc9_wxjpeg.vcproj", "{6053CC38-CDEE-584C-8BC8-4B000D800FC7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "wx_vc9_wxtiff.vcproj", "{75596CE6-5AE7-55C9-B890-C07B0A657A83}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "wx_vc9_wxexpat.vcproj", "{A1A8355B-0988-528E-9CC2-B971D6266669}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxscintilla", "wx_vc9_wxscintilla.vcproj", "{74827EBD-93DC-5110-BA95-3F2AB029B6B0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "wx_vc9_base.vcproj", "{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "wx_vc9_net.vcproj", "{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "wx_vc9_core.vcproj", "{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "wx_vc9_adv.vcproj", "{24C45343-FD20-5C92-81C1-35A2AE841E79}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "wx_vc9_media.vcproj", "{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "wx_vc9_html.vcproj", "{33CC42F9-7756-5587-863C-8D4461B7C5DD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webview", "wx_vc9_webview.vcproj", "{A8E8442A-078A-5FC5-B495-8D71BA77EE6E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "wx_vc9_qa.vcproj", "{E21129E0-7C08-5936-9D8C-0D60B5319BA7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "wx_vc9_xml.vcproj", "{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "wx_vc9_xrc.vcproj", "{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "wx_vc9_aui.vcproj", "{A16D3832-0F42-57CE-8F48-50E06649ADE8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ribbon", "wx_vc9_ribbon.vcproj", "{87B42A9C-3F5C-53D7-9017-2B1CAE39457D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "propgrid", "wx_vc9_propgrid.vcproj", "{97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "wx_vc9_richtext.vcproj", "{7FB0902D-8579-5DCE-B883-DAF66A885005}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stc", "wx_vc9_stc.vcproj", "{23E1C437-A951-5943-8639-A17F3CF2E606}" - ProjectSection(ProjectDependencies) = postProject - {74827EBD-93DC-5110-BA95-3F2AB029B6B0} = {74827EBD-93DC-5110-BA95-3F2AB029B6B0} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "wx_vc9_gl.vcproj", "{DA8B15EF-6750-5928-BC0E-C748213CF9B2}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - DLL Debug|Win32 = DLL Debug|Win32 - DLL Release|Win32 = DLL Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.ActiveCfg = Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.Build.0 = Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.ActiveCfg = Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.Build.0 = Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {56A4B526-BB81-5D01-AAA9-16D23BBB169D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.ActiveCfg = Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.Build.0 = Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.ActiveCfg = Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.Build.0 = Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {8B867186-A0B5-5479-B824-E176EDD27C40}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.ActiveCfg = Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.Build.0 = Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.ActiveCfg = Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.Build.0 = Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.ActiveCfg = Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.Build.0 = Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.ActiveCfg = Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.Build.0 = Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {6053CC38-CDEE-584C-8BC8-4B000D800FC7}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.ActiveCfg = Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.Build.0 = Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.ActiveCfg = Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.Build.0 = Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {75596CE6-5AE7-55C9-B890-C07B0A657A83}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.ActiveCfg = Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.Build.0 = Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.ActiveCfg = Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.Build.0 = Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A1A8355B-0988-528E-9CC2-B971D6266669}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.ActiveCfg = Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Debug|Win32.Build.0 = Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.ActiveCfg = Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.Release|Win32.Build.0 = Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {74827EBD-93DC-5110-BA95-3F2AB029B6B0}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.ActiveCfg = Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.Build.0 = Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.ActiveCfg = Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.Build.0 = Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {24C45343-FD20-5C92-81C1-35A2AE841E79}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {33CC42F9-7756-5587-863C-8D4461B7C5DD}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.ActiveCfg = Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Debug|Win32.Build.0 = Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.ActiveCfg = Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.Release|Win32.Build.0 = Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A8E8442A-078A-5FC5-B495-8D71BA77EE6E}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.ActiveCfg = Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.Build.0 = Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.ActiveCfg = Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.Build.0 = Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {E21129E0-7C08-5936-9D8C-0D60B5319BA7}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {A16D3832-0F42-57CE-8F48-50E06649ADE8}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.ActiveCfg = Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Debug|Win32.Build.0 = Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.ActiveCfg = Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.Release|Win32.Build.0 = Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {87B42A9C-3F5C-53D7-9017-2B1CAE39457D}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.ActiveCfg = Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Debug|Win32.Build.0 = Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.ActiveCfg = Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.Release|Win32.Build.0 = Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {97FDAB45-9C58-5BC5-A2F4-EE42739EBC63}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {7FB0902D-8579-5DCE-B883-DAF66A885005}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.ActiveCfg = Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Debug|Win32.Build.0 = Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.ActiveCfg = Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.Release|Win32.Build.0 = Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {23E1C437-A951-5943-8639-A17F3CF2E606}.DLL Release|Win32.Build.0 = DLL Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.ActiveCfg = Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.Build.0 = Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.ActiveCfg = Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.Build.0 = Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Debug|Win32.Build.0 = DLL Debug|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.ActiveCfg = DLL Release|Win32 - {DA8B15EF-6750-5928-BC0E-C748213CF9B2}.DLL Release|Win32.Build.0 = DLL Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_adv.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_adv.vcproj deleted file mode 100644 index e831f145e0..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_adv.vcproj +++ /dev/null @@ -1,1017 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_aui.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_aui.vcproj deleted file mode 100644 index 7662938ccc..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_aui.vcproj +++ /dev/null @@ -1,641 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_base.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_base.vcproj deleted file mode 100644 index 29a289a1a3..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_base.vcproj +++ /dev/null @@ -1,1798 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_core.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_core.vcproj deleted file mode 100644 index 00eba9502e..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_core.vcproj +++ /dev/null @@ -1,3888 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_gl.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_gl.vcproj deleted file mode 100644 index 9a152a5585..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_gl.vcproj +++ /dev/null @@ -1,583 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_html.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_html.vcproj deleted file mode 100644 index 28118b491c..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_html.vcproj +++ /dev/null @@ -1,762 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_media.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_media.vcproj deleted file mode 100644 index 01b98855d4..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_media.vcproj +++ /dev/null @@ -1,587 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_net.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_net.vcproj deleted file mode 100644 index d44faeacd6..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_net.vcproj +++ /dev/null @@ -1,659 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_propgrid.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_propgrid.vcproj deleted file mode 100644 index 851dbd8cf8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_propgrid.vcproj +++ /dev/null @@ -1,641 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_qa.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_qa.vcproj deleted file mode 100644 index 9d0377f8c5..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_qa.vcproj +++ /dev/null @@ -1,584 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_ribbon.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_ribbon.vcproj deleted file mode 100644 index 6540a90ba6..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_ribbon.vcproj +++ /dev/null @@ -1,657 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_richtext.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_richtext.vcproj deleted file mode 100644 index f5970afa63..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_richtext.vcproj +++ /dev/null @@ -1,709 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_stc.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_stc.vcproj deleted file mode 100644 index 2891afc974..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_stc.vcproj +++ /dev/null @@ -1,589 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_webview.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_webview.vcproj deleted file mode 100644 index 700537a486..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_webview.vcproj +++ /dev/null @@ -1,607 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxexpat.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxexpat.vcproj deleted file mode 100644 index 641f545a23..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxexpat.vcproj +++ /dev/null @@ -1,368 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxjpeg.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxjpeg.vcproj deleted file mode 100644 index 46a4f3cddd..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxjpeg.vcproj +++ /dev/null @@ -1,540 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxpng.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxpng.vcproj deleted file mode 100644 index e0b0d9d583..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxpng.vcproj +++ /dev/null @@ -1,416 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxregex.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxregex.vcproj deleted file mode 100644 index e8b3b14892..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxregex.vcproj +++ /dev/null @@ -1,490 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxscintilla.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxscintilla.vcproj deleted file mode 100644 index e183cfe553..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxscintilla.vcproj +++ /dev/null @@ -1,950 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxtiff.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxtiff.vcproj deleted file mode 100644 index 3eb5a11e32..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxtiff.vcproj +++ /dev/null @@ -1,512 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxzlib.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxzlib.vcproj deleted file mode 100644 index d50962e62f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_wxzlib.vcproj +++ /dev/null @@ -1,416 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_xml.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_xml.vcproj deleted file mode 100644 index 3bb76fc939..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_xml.vcproj +++ /dev/null @@ -1,589 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_xrc.vcproj b/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_xrc.vcproj deleted file mode 100644 index 53639fa6fe..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/build/msw/wx_vc9_xrc.vcproj +++ /dev/null @@ -1,1089 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/android/chkconf.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/android/chkconf.h deleted file mode 100644 index 73c631b0b3..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/android/chkconf.h +++ /dev/null @@ -1,230 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/android/chkconf.h -// Purpose: Android-specific configuration options checks -// Author: Zsolt Bakcsi -// Modified by: -// Created: 2011-12-08 -// RCS-ID: -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_ANDROID_CHKCONF_H_ -#define _WX_ANDROID_CHKCONF_H_ - -// ---------------------------------------------------------------------------- -// Disable features which don't work (yet) or don't make sense under Android. -// ---------------------------------------------------------------------------- - -// please keep the list in alphabetic order except for closely related settings -// (e.g. wxUSE_ENH_METAFILE is put immediately after wxUSE_METAFILE) - - -// ---------------------------------------------------------------------------- -// These are disabled because they are TODO. Or to decide whether to do or not. -// ---------------------------------------------------------------------------- - -#undef wxUSE_CONFIG -#define wxUSE_CONFIG 0 - -// This compiles, but not yet tested, so: -#undef wxUSE_CONSOLE_EVENTLOOP -#define wxUSE_CONSOLE_EVENTLOOP 0 - -#undef wxUSE_DEBUGREPORT -#define wxUSE_DEBUGREPORT 0 - -#undef wxUSE_DIALUP_MANAGER -#define wxUSE_DIALUP_MANAGER 0 - -#undef wxUSE_DISPLAY -#define wxUSE_DISPLAY 0 - -#undef wxUSE_DYNAMIC_LOADER -#define wxUSE_DYNAMIC_LOADER 0 - -#undef wxUSE_DYNLIB_CLASS -#define wxUSE_DYNLIB_CLASS 0 - -#undef wxUSE_FSVOLUME -#define wxUSE_FSVOLUME 0 - -// Compile-time errors when last tried (wxHAS_INOTIFY, wxHAS_KQUEUE) -#undef wxUSE_FSWATCHER -#define wxUSE_FSWATCHER 0 - -// Seems like Android lacks locale support. TODO: check! -// Hint: -// http://groups.google.com/group/android-ndk/browse_thread/thread/ffd012a047ec2392?pli=1 -// "Android doesn't provide locale support in its C and C++ runtimes. -// This is handled at a higher-level in the application stack, using ICU -// (which is not exposed by the NDK, since the ABI is very volatile, and the -// set of built-in tables varies from device to device, based on customization -// / size reasons). -// You might want to use a different locale implementation. The STLport and GNU -// libstdc++ do provide then if you're using C++." -#undef wxUSE_INTL -#define wxUSE_INTL 0 -#undef wxUSE_XLOCALE -#define wxUSE_XLOCALE 0 - -#undef wxUSE_IPC -#define wxUSE_IPC 0 - -#undef wxUSE_MEDIACTRL -#define wxUSE_MEDIACTRL 0 - -#undef wxUSE_ON_FATAL_EXCEPTION -#define wxUSE_ON_FATAL_EXCEPTION 0 - -#undef wxUSE_REGEX -#define wxUSE_REGEX 0 - -#undef wxUSE_STDPATHS -#define wxUSE_STDPATHS 0 - -#undef wxUSE_STACKWALKER -#define wxUSE_STACKWALKER 0 - -#undef wxUSE_MIMETYPE -#define wxUSE_MIMETYPE 0 - -#undef wxUSE_REGEX -#define wxUSE_REGEX 0 - -#undef wxUSE_REGKEY -#define wxUSE_REGKEY 0 - -#undef wxUSE_SNGLINST_CHECKER -#define wxUSE_SNGLINST_CHECKER 0 - -#undef wxUSE_SOUND -#define wxUSE_SOUND 0 - -#undef wxUSE_SYSTEM_OPTIONS -#define wxUSE_SYSTEM_OPTIONS 0 - -#undef wxUSE_XRC -#define wxUSE_XRC 0 - - -// ---------------------------------------------------------------------------- -// GUI is completely TODO. -// ---------------------------------------------------------------------------- - -#undef wxUSE_COLOURPICKERCTRL -#define wxUSE_COLOURPICKERCTRL 0 - -#undef wxUSE_COLOURDLG -#define wxUSE_COLOURDLG 0 - -#undef wxUSE_FONTENUM -#define wxUSE_FONTENUM 0 - -#undef wxUSE_FONTMAP -#define wxUSE_FONTMAP 0 - -#undef wxUSE_HELP -#define wxUSE_HELP 0 - -#undef wxUSE_HTML -#define wxUSE_HTML 0 - -#undef wxUSE_LISTBOOK -#define wxUSE_LISTBOOK 0 - -#undef wxUSE_OWNER_DRAWN -#define wxUSE_OWNER_DRAWN 0 - -#undef wxUSE_NOTEBOOK -#define wxUSE_NOTEBOOK 0 - -#undef wxUSE_RICHEDIT -#define wxUSE_RICHEDIT 0 -#undef wxUSE_RICHEDIT2 -#define wxUSE_RICHEDIT2 0 - -#undef wxUSE_STATUSBAR -#define wxUSE_STATUSBAR 0 - -// Are tooltips useful at all on a touch screen? -#undef wxUSE_TOOLTIPS -#define wxUSE_TOOLTIPS 0 - -#undef wxUSE_WXHTML_HELP -#define wxUSE_WXHTML_HELP 0 - - -// ---------------------------------------------------------------------------- -// All image classes are TODO. -// ---------------------------------------------------------------------------- - -#undef wxUSE_IMAGE -#define wxUSE_IMAGE 0 - -#undef wxUSE_LIBPNG -#define wxUSE_LIBPNG 0 - -#undef wxUSE_LIBJPEG -#define wxUSE_LIBJPEG 0 - -#undef wxUSE_LIBTIFF -#define wxUSE_LIBTIFF 0 - -#undef wxUSE_TGA -#define wxUSE_TGA 0 - -#undef wxUSE_GIF -#define wxUSE_GIF 0 - -#undef wxUSE_PNM -#define wxUSE_PNM 0 - -#undef wxUSE_PCX -#define wxUSE_PCX 0 - -#undef wxUSE_IFF -#define wxUSE_IFF 0 - -#undef wxUSE_XPM -#define wxUSE_XPM 0 - -#undef wxUSE_ICO_CUR -#define wxUSE_ICO_CUR 0 - -#undef wxUSE_PALETTE -#define wxUSE_PALETTE 0 - - - -// ---------------------------------------------------------------------------- -// These are disabled because they don't make sense, are not supported, or -// would require too much effort. -// ---------------------------------------------------------------------------- - -// Unnecessary under Android, probably it doesn't even compile. -#undef wxUSE_AUI -#define wxUSE_AUI 0 - -// No command line on Android. -#undef wxUSE_CMDLINE_PARSER -#define wxUSE_CMDLINE_PARSER 0 - -// No joystick on Android devices. -// (What about using the direction sensor or the accelerometer?) -#undef wxUSE_JOYSTICK -#define wxUSE_JOYSTICK 0 - -// No MDI under Android. Well, no GUI at all (yet). -#undef wxUSE_MDI -#define wxUSE_MDI 0 -#undef wxUSE_MDI_ARCHITECTURE -#define wxUSE_MDI_ARCHITECTURE 0 - -// No printing support on Android (2011). -// Although 3rd party SDKs may exist (I know of one payware). -#undef wxUSE_PRINTING_ARCHITECTURE -#define wxUSE_PRINTING_ARCHITECTURE 0 - - -#endif // _WX_ANDROID_CHKCONF_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/android/config_android.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/android/config_android.h deleted file mode 100644 index e94d09360f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/android/config_android.h +++ /dev/null @@ -1,55 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/android/config_android.h -// Purpose: configurations for Android builds -// Author: Zsolt Bakcsi -// Modified by: -// Created: 2011-12-02 -// RCS-ID: -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -// Please note that most of these settings are based on config_xcode.h and -// 'fine-tuned' on a trial-and-error basis. This means, no in-depth analysis -// of Android docs / source was done. - -#define wxUSE_UNIX 1 -#define __UNIX__ 1 - -#define HAVE_NANOSLEEP -#define HAVE_FCNTL 1 -#define HAVE_GCC_ATOMIC_BUILTINS -#define HAVE_GETHOSTBYNAME 1 -#define HAVE_GETSERVBYNAME 1 -#define HAVE_GETTIMEOFDAY 1 -#define HAVE_GMTIME_R 1 -#define HAVE_INET_ADDR 1 -#define HAVE_INET_ATON 1 -#define HAVE_LOCALTIME_R 1 -#define HAVE_PTHREAD_MUTEXATTR_T 1 -#define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1 -#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 -#define HAVE_THREAD_PRIORITY_FUNCTIONS 1 -#define HAVE_SSIZE_T 1 -#define HAVE_WPRINTF 1 - -#define SIZEOF_INT 4 -#define SIZEOF_LONG 4 -#define SIZEOF_LONG_LONG 8 -#define SIZEOF_SIZE_T 4 -#define SIZEOF_VOID_P 4 -#define SIZEOF_WCHAR_T 4 - -#define wxHAVE_PTHREAD_CLEANUP 1 -#define wxNO_WOSTREAM -#define wxSIZE_T_IS_UINT 1 -#define wxWCHAR_T_IS_REAL_TYPE 1 - -#define wxTYPE_SA_HANDLER int - -#define wxUSE_SELECT_DISPATCHER 1 - -#ifdef HAVE_PTHREAD_CANCEL -// Android doesn't support pthread_cancel(). -#undef HAVE_PTHREAD_CANCEL -#endif diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/android/setup.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/android/setup.h deleted file mode 100644 index 3b9ab293b4..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/android/setup.h +++ /dev/null @@ -1,1644 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/univ/setup.h -// Purpose: Configuration for the universal build of the library -// Author: Julian Smart -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SETUP_H_ -#define _WX_SETUP_H_ - -/* --- start common options --- */ -// ---------------------------------------------------------------------------- -// global settings -// ---------------------------------------------------------------------------- - -// define this to 0 when building wxBase library - this can also be done from -// makefile/project file overriding the value here -#ifndef wxUSE_GUI - #define wxUSE_GUI 1 -#endif // wxUSE_GUI - -// ---------------------------------------------------------------------------- -// compatibility settings -// ---------------------------------------------------------------------------- - -// This setting determines the compatibility with 2.6 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_6 0 - -// This setting determines the compatibility with 2.8 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_8 1 - -// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when -// default system font is used for wxWindow::GetCharWidth/Height() instead of -// the current font. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxDIALOG_UNIT_COMPATIBILITY 0 - -// ---------------------------------------------------------------------------- -// debugging settings -// ---------------------------------------------------------------------------- - -// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no -// need to define it here. You may do it for two reasons: either completely -// disable/compile out the asserts in release version (then do it inside #ifdef -// NDEBUG) or, on the contrary, enable more asserts, including the usually -// disabled ones, in the debug build (then do it inside #ifndef NDEBUG) -// -// #ifdef NDEBUG -// #define wxDEBUG_LEVEL 0 -// #else -// #define wxDEBUG_LEVEL 2 -// #endif - -// wxHandleFatalExceptions() may be used to catch the program faults at run -// time and, instead of terminating the program with a usual GPF message box, -// call the user-defined wxApp::OnFatalException() function. If you set -// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work. -// -// This setting is for Win32 only and can only be enabled if your compiler -// supports Win32 structured exception handling (currently only VC++ does) -// -// Default is 1 -// -// Recommended setting: 1 if your compiler supports it. -#define wxUSE_ON_FATAL_EXCEPTION 1 - -// Set this to 1 to be able to generate a human-readable (unlike -// machine-readable minidump created by wxCrashReport::Generate()) stack back -// trace when your program crashes using wxStackWalker -// -// Default is 1 if supported by the compiler. -// -// Recommended setting: 1, set to 0 if your programs never crash -#define wxUSE_STACKWALKER 1 - -// Set this to 1 to compile in wxDebugReport class which allows you to create -// and optionally upload to your web site a debug report consisting of back -// trace of the crash (if wxUSE_STACKWALKER == 1) and other information. -// -// Default is 1 if supported by the compiler. -// -// Recommended setting: 1, it is compiled into a separate library so there -// is no overhead if you don't use it -#define wxUSE_DEBUGREPORT 1 - -// Generic comment about debugging settings: they are very useful if you don't -// use any other memory leak detection tools such as Purify/BoundsChecker, but -// are probably redundant otherwise. Also, Visual C++ CRT has the same features -// as wxWidgets memory debugging subsystem built in since version 5.0 and you -// may prefer to use it instead of built in memory debugging code because it is -// faster and more fool proof. -// -// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG -// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0) -// and if __NO_VC_CRTDBG__ is not defined. - -// The rest of the options in this section are obsolete and not supported, -// enable them at your own risk. - -// If 1, enables wxDebugContext, for writing error messages to file, etc. If -// __WXDEBUG__ is not defined, will still use the normal memory operators. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_DEBUG_CONTEXT 0 - -// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF* -// __WXDEBUG__ is also defined. -// -// WARNING: this code may not work with all architectures, especially if -// alignment is an issue. This switch is currently ignored for mingw / cygwin -// -// Default is 0 -// -// Recommended setting: 1 if you are not using a memory debugging tool, else 0 -#define wxUSE_MEMORY_TRACING 0 - -// In debug mode, cause new and delete to be redefined globally. -// If this causes problems (e.g. link errors which is a common problem -// especially if you use another library which also redefines the global new -// and delete), set this to 0. -// This switch is currently ignored for mingw / cygwin -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 - -// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If -// this causes problems (e.g. link errors), set this to 0. You may need to set -// this to 0 if using templates (at least for VC++). This switch is currently -// ignored for MinGW/Cygwin. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_DEBUG_NEW_ALWAYS 0 - - -// ---------------------------------------------------------------------------- -// Unicode support -// ---------------------------------------------------------------------------- - -// These settings are obsolete: the library is always built in Unicode mode -// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if -// absolutely necessary -- updating it is strongly recommended as the ANSI mode -// will disappear completely in future wxWidgets releases. -#ifndef wxUSE_UNICODE - #define wxUSE_UNICODE 1 -#endif - -// wxUSE_WCHAR_T is required by wxWidgets now, don't change. -#define wxUSE_WCHAR_T 1 - -// ---------------------------------------------------------------------------- -// global features -// ---------------------------------------------------------------------------- - -// Compile library in exception-safe mode? If set to 1, the library will try to -// behave correctly in presence of exceptions (even though it still will not -// use the exceptions itself) and notify the user code about any unhandled -// exceptions. If set to 0, propagation of the exceptions through the library -// code will lead to undefined behaviour -- but the code itself will be -// slightly smaller and faster. -// -// Note that like wxUSE_THREADS this option is automatically set to 0 if -// wxNO_EXCEPTIONS is defined. -// -// Default is 1 -// -// Recommended setting: depends on whether you intend to use C++ exceptions -// in your own code (1 if you do, 0 if you don't) -#define wxUSE_EXCEPTIONS 1 - -// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI -// -// Default is 0 -// -// Recommended setting: 0 (this is still work in progress...) -#define wxUSE_EXTENDED_RTTI 0 - -// Support for message/error logging. This includes wxLogXXX() functions and -// wxLog and derived classes. Don't set this to 0 unless you really know what -// you are doing. -// -// Default is 1 -// -// Recommended setting: 1 (always) -#define wxUSE_LOG 1 - -// Recommended setting: 1 -#define wxUSE_LOGWINDOW 1 - -// Recommended setting: 1 -#define wxUSE_LOGGUI 1 - -// Recommended setting: 1 -#define wxUSE_LOG_DIALOG 1 - -// Support for command line parsing using wxCmdLineParser class. -// -// Default is 1 -// -// Recommended setting: 1 (can be set to 0 if you don't use the cmd line) -#define wxUSE_CMDLINE_PARSER 1 - -// Support for multithreaded applications: if 1, compile in thread classes -// (thread.h) and make the library a bit more thread safe. Although thread -// support is quite stable by now, you may still consider recompiling the -// library without it if you have no use for it - this will result in a -// somewhat smaller and faster operation. -// -// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset -// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in -// build/msw/config.* file this value will have no effect. -// -// Default is 1 -// -// Recommended setting: 0 unless you do plan to develop MT applications -#define wxUSE_THREADS 1 - -// If enabled, compiles wxWidgets streams classes -// -// wx stream classes are used for image IO, process IO redirection, network -// protocols implementation and much more and so disabling this results in a -// lot of other functionality being lost. -// -// Default is 1 -// -// Recommended setting: 1 as setting it to 0 disables many other things -#define wxUSE_STREAMS 1 - -// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf. -// Note that if the system's implementation does not support positional -// parameters, setting this to 1 forces the use of the wxWidgets implementation -// of wxVsnprintf. The standard vsnprintf() supports positional parameters on -// many Unix systems but usually doesn't under Windows. -// -// Positional parameters are very useful when translating a program since using -// them in formatting strings allow translators to correctly reorder the -// translated sentences. -// -// Default is 1 -// -// Recommended setting: 1 if you want to support multiple languages -#define wxUSE_PRINTF_POS_PARAMS 1 - - -// ---------------------------------------------------------------------------- -// Interoperability with the standard library. -// ---------------------------------------------------------------------------- - -// Set wxUSE_STL to 1 to enable maximal interoperability with the standard -// library, even at the cost of backwards compatibility. -// -// Default is 0 -// -// Recommended setting: 0 as the options below already provide a relatively -// good level of interoperability and changing this option arguably isn't worth -// diverging from the official builds of the library. -#define wxUSE_STL 0 - -// This is not a real option but is used as the default value for -// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS. -// -// Currently the Digital Mars and Watcom compilers come without standard C++ -// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have -// them (e.g. from STLPort). -// -// VC++ 5.0 does include standard C++ library headers, however they produce -// many warnings that can't be turned off when compiled at warning level 4. -#if defined(__DMC__) || defined(__WATCOMC__) \ - || (defined(_MSC_VER) && _MSC_VER < 1200) - #define wxUSE_STD_DEFAULT 0 -#else - #define wxUSE_STD_DEFAULT 1 -#endif - -// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<> -// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but -// usually more limited) implementations are used which allows to avoid the -// dependency on the C++ run-time library. -// -// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't -// support using standard containers and that VC6 needs non-default options for -// such build to avoid getting "fatal error C1076: compiler limit : internal -// heap limit reached; use /Zm to specify a higher limit" in its own standard -// headers, so you need to ensure you do increase the heap size before enabling -// this option for this compiler. -// -// Default is 0 for compatibility reasons. -// -// Recommended setting: 1 unless compatibility with the official wxWidgets -// build and/or the existing code is a concern. -#define wxUSE_STD_CONTAINERS 0 - -// Use standard C++ streams if 1 instead of wx streams in some places. If -// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the -// standard streams library. -// -// Notice that enabling this does not replace wx streams with std streams -// everywhere, in a lot of places wx streams are used no matter what. -// -// Default is 1 if compiler supports it. -// -// Recommended setting: 1 if you use the standard streams anyhow and so -// dependency on the standard streams library is not a -// problem -#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT - -// Enable minimal interoperability with the standard C++ string class if 1. -// "Minimal" means that wxString can be constructed from std::string or -// std::wstring but can't be implicitly converted to them. You need to enable -// the option below for the latter. -// -// Default is 1 for most compilers. -// -// Recommended setting: 1 unless you want to ensure your program doesn't use -// the standard C++ library at all. -#define wxUSE_STD_STRING wxUSE_STD_DEFAULT - -// Make wxString as much interchangeable with std::[w]string as possible, in -// particular allow implicit conversion of wxString to either of these classes. -// This comes at a price (or a benefit, depending on your point of view) of not -// allowing implicit conversion to "const char *" and "const wchar_t *". -// -// Because a lot of existing code relies on these conversions, this option is -// disabled by default but can be enabled for your build if you don't care -// about compatibility. -// -// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled. -// -// Recommended setting: 0 to remain compatible with the official builds of -// wxWidgets. -#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL - -// VC++ 4.2 and above allows and but you can't mix -// them. Set this option to 1 to use , 0 to use . -// -// Note that newer compilers (including VC++ 7.1 and later) don't support -// wxUSE_IOSTREAMH == 1 and so will be used anyhow. -// -// Default is 0. -// -// Recommended setting: 0, only set to 1 if you use a really old compiler -#define wxUSE_IOSTREAMH 0 - - -// ---------------------------------------------------------------------------- -// non GUI features selection -// ---------------------------------------------------------------------------- - -// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit -// integer which is implemented in terms of native 64 bit integers if any or -// uses emulation otherwise. -// -// This class is required by wxDateTime and so you should enable it if you want -// to use wxDateTime. For most modern platforms, it will use the native 64 bit -// integers in which case (almost) all of its functions are inline and it -// almost does not take any space, so there should be no reason to switch it -// off. -// -// Recommended setting: 1 -#define wxUSE_LONGLONG 1 - -// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for -// storing binary data in wxConfig on most platforms. -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_BASE64 1 - -// Set this to 1 to be able to use wxEventLoop even in console applications -// (i.e. using base library only, without GUI). This is mostly useful for -// processing socket events but is also necessary to use timers in console -// applications -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_CONSOLE_EVENTLOOP 1 - -// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level -// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions. -// -// Default is 1 -// -// Recommended setting: 1 (wxFile is highly recommended as it is required by -// i18n code, wxFileConfig and others) -#define wxUSE_FILE 1 -#define wxUSE_FFILE 1 - -// Use wxFSVolume class providing access to the configured/active mount points -// -// Default is 1 -// -// Recommended setting: 1 (but may be safely disabled if you don't use it) -#define wxUSE_FSVOLUME 1 - -// Use wxStandardPaths class which allows to retrieve some standard locations -// in the file system -// -// Default is 1 -// -// Recommended setting: 1 (may be disabled to save space, but not much) -#define wxUSE_STDPATHS 1 - -// use wxTextBuffer class: required by wxTextFile -#define wxUSE_TEXTBUFFER 1 - -// use wxTextFile class: requires wxFile and wxTextBuffer, required by -// wxFileConfig -#define wxUSE_TEXTFILE 1 - -// i18n support: _() macro, wxLocale class. Requires wxTextFile. -#define wxUSE_INTL 1 - -// Provide wxFoo_l() functions similar to standard foo() functions but taking -// an extra locale parameter. -// -// Notice that this is fully implemented only for the systems providing POSIX -// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary -// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will -// only work for the current user locale and "C" locale. You can use -// wxHAS_XLOCALE_SUPPORT to test whether the full support is available. -// -// Default is 1 -// -// Recommended setting: 1 but may be disabled if you are writing programs -// running only in C locale anyhow -#define wxUSE_XLOCALE 1 - -// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which -// allow to manipulate dates, times and time intervals. wxDateTime replaces the -// old wxTime and wxDate classes which are still provided for backwards -// compatibility (and implemented in terms of wxDateTime). -// -// Note that this class is relatively new and is still officially in alpha -// stage because some features are not yet (fully) implemented. It is already -// quite useful though and should only be disabled if you are aiming at -// absolutely minimal version of the library. -// -// Requires: wxUSE_LONGLONG -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_DATETIME 1 - -// Set wxUSE_TIMER to 1 to compile wxTimer class -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_TIMER 1 - -// Use wxStopWatch clas. -// -// Default is 1 -// -// Recommended setting: 1 (needed by wxSocket) -#define wxUSE_STOPWATCH 1 - -// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_FSWATCHER 1 - -// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes -// which allow the application to store its settings in the persistent -// storage. Setting this to 1 will also enable on-demand creation of the -// global config object in wxApp. -// -// See also wxUSE_CONFIG_NATIVE below. -// -// Recommended setting: 1 -#define wxUSE_CONFIG 1 - -// If wxUSE_CONFIG is 1, you may choose to use either the native config -// classes under Windows (using .INI files under Win16 and the registry under -// Win32) or the portable text file format used by the config classes under -// Unix. -// -// Default is 1 to use native classes. Note that you may still use -// wxFileConfig even if you set this to 1 - just the config object created by -// default for the applications needs will be a wxRegConfig or wxIniConfig and -// not wxFileConfig. -// -// Recommended setting: 1 -#define wxUSE_CONFIG_NATIVE 1 - -// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows -// to connect/disconnect from the network and be notified whenever the dial-up -// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DIALUP_MANAGER 1 - -// Compile in classes for run-time DLL loading and function calling. -// Required by wxUSE_DIALUP_MANAGER. -// -// This setting is for Win32 only -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DYNLIB_CLASS 1 - -// experimental, don't use for now -#define wxUSE_DYNAMIC_LOADER 1 - -// Set to 1 to use socket classes -#define wxUSE_SOCKETS 1 - -// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS) -// -// Notice that currently setting this option under Windows will result in -// programs which can only run on recent OS versions (with ws2_32.dll -// installed) which is why it is disabled by default. -// -// Default is 1. -// -// Recommended setting: 1 if you need IPv6 support -#define wxUSE_IPV6 0 - -// Set to 1 to enable virtual file systems (required by wxHTML) -#define wxUSE_FILESYSTEM 1 - -// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_ZIP 1 - -// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_ARCHIVE 1 - -// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_INET 1 - -// wxArchive classes for accessing archives such as zip and tar -#define wxUSE_ARCHIVE_STREAMS 1 - -// Set to 1 to compile wxZipInput/OutputStream classes. -#define wxUSE_ZIPSTREAM 1 - -// Set to 1 to compile wxTarInput/OutputStream classes. -#define wxUSE_TARSTREAM 1 - -// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by -// wxUSE_LIBPNG -#define wxUSE_ZLIB 1 - -// If enabled, the code written by Apple will be used to write, in a portable -// way, float on the disk. See extended.c for the license which is different -// from wxWidgets one. -// -// Default is 1. -// -// Recommended setting: 1 unless you don't like the license terms (unlikely) -#define wxUSE_APPLE_IEEE 1 - -// Joystick support class -#define wxUSE_JOYSTICK 1 - -// wxFontEnumerator class -#define wxUSE_FONTENUM 1 - -// wxFontMapper class -#define wxUSE_FONTMAP 1 - -// wxMimeTypesManager class -#define wxUSE_MIMETYPE 1 - -// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP -// or wxURL you need to set this to 1. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_PROTOCOL 1 - -// The settings for the individual URL schemes -#define wxUSE_PROTOCOL_FILE 1 -#define wxUSE_PROTOCOL_FTP 1 -#define wxUSE_PROTOCOL_HTTP 1 - -// Define this to use wxURL class. -#define wxUSE_URL 1 - -// Define this to use native platform url and protocol support. -// Currently valid only for MS-Windows. -// Note: if you set this to 1, you can open ftp/http/gopher sites -// and obtain a valid input stream for these sites -// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0. -// Doing so reduces the code size. -// -// This code is experimental and subject to change. -#define wxUSE_URL_NATIVE 0 - -// Support for wxVariant class used in several places throughout the library, -// notably in wxDataViewCtrl API. -// -// Default is 1. -// -// Recommended setting: 1 unless you want to reduce the library size as much as -// possible in which case setting this to 0 can gain up to 100KB. -#define wxUSE_VARIANT 1 - -// Support for wxAny class, the successor for wxVariant. -// -// Default is 1. -// -// Recommended setting: 1 unless you want to reduce the library size by a small amount, -// or your compiler cannot for some reason cope with complexity of templates used. -#define wxUSE_ANY 1 - -// Support for regular expression matching via wxRegEx class: enable this to -// use POSIX regular expressions in your code. You need to compile regex -// library from src/regex to use it under Windows. -// -// Default is 0 -// -// Recommended setting: 1 if your compiler supports it, if it doesn't please -// contribute us a makefile for src/regex for it -#define wxUSE_REGEX 1 - -// wxSystemOptions class -#define wxUSE_SYSTEM_OPTIONS 1 - -// wxSound class -#define wxUSE_SOUND 1 - -// Use wxMediaCtrl -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_MEDIACTRL 1 - -// Use wxWidget's XRC XML-based resource system. Recommended. -// -// Default is 1 -// -// Recommended setting: 1 (requires wxUSE_XML) -#define wxUSE_XRC 1 - -// XML parsing classes. Note that their API will change in the future, so -// using wxXmlDocument and wxXmlNode in your app is not recommended. -// -// Default is the same as wxUSE_XRC, i.e. 1 by default. -// -// Recommended setting: 1 (required by XRC) -#define wxUSE_XML wxUSE_XRC - -// Use wxWidget's AUI docking system -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_AUI 1 - -// Use wxWidget's Ribbon classes for interfaces -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_RIBBON 1 - -// Use wxPropertyGrid. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_PROPGRID 1 - -// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_STC 1 - -// Use wxWidget's web viewing classes -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_WEBVIEW 1 - -// Use the IE wxWebView backend -// -// Default is 1 on MSW -// -// Recommended setting: 1 -#ifdef __WXMSW__ -#define wxUSE_WEBVIEW_IE 1 -#else -#define wxUSE_WEBVIEW_IE 0 -#endif - -// Use the WebKit wxWebView backend -// -// Default is 1 on GTK and OSX -// -// Recommended setting: 1 -#if defined(__WXGTK__) || defined(__WXOSX__) -#define wxUSE_WEBVIEW_WEBKIT 1 -#else -#define wxUSE_WEBVIEW_WEBKIT 0 -#endif - -// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced -// 2D drawing API. (Still somewhat experimental) -// -// Please note that on Windows gdiplus.dll is loaded dynamically which means -// that nothing special needs to be done as long as you don't use -// wxGraphicsContext at all or only use it on XP and later systems but you -// still do need to distribute it yourself for an application using -// wxGraphicsContext to be runnable on pre-XP systems. -// -// Default is 1 except if you're using a non-Microsoft compiler under Windows -// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g. -// mingw32) you may need to install the headers (and just the headers) -// yourself. If you do, change the setting below manually. -// -// Recommended setting: 1 if supported by the compilation environment - -// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is -// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined -#ifdef _MSC_VER -# if _MSC_VER >= 1310 - // MSVC7.1+ comes with new enough Platform SDK, enable - // wxGraphicsContext support for it -# define wxUSE_GRAPHICS_CONTEXT 1 -# else - // MSVC 6 didn't include GDI+ headers so disable by default, enable it - // here if you use MSVC 6 with a newer SDK -# define wxUSE_GRAPHICS_CONTEXT 0 -# endif -#else - // Disable support for other Windows compilers, enable it if your compiler - // comes with new enough SDK or you installed the headers manually. - // - // Notice that this will be set by configure under non-Windows platforms - // anyhow so the value there is not important. -# define wxUSE_GRAPHICS_CONTEXT 0 -#endif - -// Enable wxGraphicsContext implementation using Cairo library. -// -// This is not needed under Windows and detected automatically by configure -// under other systems, however you may set this to 1 manually if you installed -// Cairo under Windows yourself and prefer to use it instead the native GDI+ -// implementation. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_CAIRO 0 - - -// ---------------------------------------------------------------------------- -// Individual GUI controls -// ---------------------------------------------------------------------------- - -// You must set wxUSE_CONTROLS to 1 if you are using any controls at all -// (without it, wxControl class is not compiled) -// -// Default is 1 -// -// Recommended setting: 1 (don't change except for very special programs) -#define wxUSE_CONTROLS 1 - -// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup(). -// Currently markup is supported only by a few controls and only some ports but -// their number will increase with time. -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0 if you want to save on code size) -#define wxUSE_MARKUP 1 - -// wxPopupWindow class is a top level transient window. It is currently used -// to implement wxTipWindow -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW) -#define wxUSE_POPUPWIN 1 - -// wxTipWindow allows to implement the custom tooltips, it is used by the -// context help classes. Requires wxUSE_POPUPWIN. -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0) -#define wxUSE_TIPWINDOW 1 - -// Each of the settings below corresponds to one wxWidgets control. They are -// all switched on by default but may be disabled if you are sure that your -// program (including any standard dialogs it can show!) doesn't need them and -// if you desperately want to save some space. If you use any of these you must -// set wxUSE_CONTROLS as well. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl -#define wxUSE_BANNERWINDOW 1 // wxBannerWindow -#define wxUSE_BUTTON 1 // wxButton -#define wxUSE_BMPBUTTON 1 // wxBitmapButton -#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl -#define wxUSE_CHECKBOX 1 // wxCheckBox -#define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN) -#define wxUSE_CHOICE 1 // wxChoice -#define wxUSE_COLLPANE 1 // wxCollapsiblePane -#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl -#define wxUSE_COMBOBOX 1 // wxComboBox -#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton -#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl -#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl -#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl -#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox -#define wxUSE_FILECTRL 1 // wxFileCtrl -#define wxUSE_FILEPICKERCTRL 1 // wxFilePickerCtrl -#define wxUSE_FONTPICKERCTRL 1 // wxFontPickerCtrl -#define wxUSE_GAUGE 1 // wxGauge -#define wxUSE_HEADERCTRL 1 // wxHeaderCtrl -#define wxUSE_HYPERLINKCTRL 1 // wxHyperlinkCtrl -#define wxUSE_LISTBOX 1 // wxListBox -#define wxUSE_LISTCTRL 1 // wxListCtrl -#define wxUSE_RADIOBOX 1 // wxRadioBox -#define wxUSE_RADIOBTN 1 // wxRadioButton -#define wxUSE_RICHMSGDLG 1 // wxRichMessageDialog -#define wxUSE_SCROLLBAR 1 // wxScrollBar -#define wxUSE_SEARCHCTRL 1 // wxSearchCtrl -#define wxUSE_SLIDER 1 // wxSlider -#define wxUSE_SPINBTN 1 // wxSpinButton -#define wxUSE_SPINCTRL 1 // wxSpinCtrl -#define wxUSE_STATBOX 1 // wxStaticBox -#define wxUSE_STATLINE 1 // wxStaticLine -#define wxUSE_STATTEXT 1 // wxStaticText -#define wxUSE_STATBMP 1 // wxStaticBitmap -#define wxUSE_TEXTCTRL 1 // wxTextCtrl -#define wxUSE_TIMEPICKCTRL 1 // wxTimePickerCtrl -#define wxUSE_TOGGLEBTN 1 // requires wxButton -#define wxUSE_TREECTRL 1 // wxTreeCtrl -#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl - -// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR -// below either wxStatusBar95 or a generic wxStatusBar will be used. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_STATUSBAR 1 - -// Two status bar implementations are available under Win32: the generic one -// or the wrapper around native control. For native look and feel the native -// version should be used. -// -// Default is 1 for the platforms where native status bar is supported. -// -// Recommended setting: 1 (there is no advantage in using the generic one) -#define wxUSE_NATIVE_STATUSBAR 1 - -// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar -// classes at all. Otherwise, use the native toolbar class unless -// wxUSE_TOOLBAR_NATIVE is 0. -// -// Default is 1 for all settings. -// -// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE. -#define wxUSE_TOOLBAR 1 -#define wxUSE_TOOLBAR_NATIVE 1 - -// wxNotebook is a control with several "tabs" located on one of its sides. It -// may be used to logically organise the data presented to the user instead of -// putting everything in one huge dialog. It replaces wxTabControl and related -// classes of wxWin 1.6x. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_NOTEBOOK 1 - -// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_LISTBOOK 1 - -// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_CHOICEBOOK 1 - -// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TREEBOOK 1 - -// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of -// tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TOOLBOOK 1 - -// wxTaskBarIcon is a small notification icon shown in the system toolbar or -// dock. -// -// Default is 1. -// -// Recommended setting: 1 (but can be set to 0 if you don't need it) -#define wxUSE_TASKBARICON 1 - -// wxGrid class -// -// Default is 1, set to 0 to cut down compilation time and binaries size if you -// don't use it. -// -// Recommended setting: 1 -// -#define wxUSE_GRID 1 - -// wxMiniFrame class: a frame with narrow title bar -// -// Default is 1. -// -// Recommended setting: 1 (it doesn't cost almost anything) -#define wxUSE_MINIFRAME 1 - -// wxComboCtrl and related classes: combobox with custom popup window and -// not necessarily a listbox. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it -// it used by wxComboBox -#define wxUSE_COMBOCTRL 1 - -// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox -// items. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0, except where it is -// needed as a base class for generic wxBitmapComboBox. -#define wxUSE_ODCOMBOBOX 1 - -// wxBitmapComboBox is a combobox that can have images in front of text items. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 -#define wxUSE_BITMAPCOMBOBOX 1 - -// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items -// up and down in it. It is also used as part of wxRearrangeDialog. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 (currently used only by -// wxHeaderCtrl) -#define wxUSE_REARRANGECTRL 1 - -// ---------------------------------------------------------------------------- -// Miscellaneous GUI stuff -// ---------------------------------------------------------------------------- - -// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar) -#define wxUSE_ACCEL 1 - -// Use the standard art provider. The icons returned by this provider are -// embedded into the library as XPMs so disabling it reduces the library size -// somewhat but this should only be done if you use your own custom art -// provider returning the icons or never use any icons not provided by the -// native art provider (which might not be implemented at all for some -// platforms) or by the Tango icons provider (if it's not itself disabled -// below). -// -// Default is 1. -// -// Recommended setting: 1 unless you use your own custom art provider. -#define wxUSE_ARTPROVIDER_STD 1 - -// Use art provider providing Tango icons: this art provider has higher quality -// icons than the default ones using smaller size XPM icons without -// transparency but the embedded PNG icons add to the library size. -// -// Default is 1 under non-GTK ports. Under wxGTK the native art provider using -// the GTK+ stock icons replaces it so it is normally not necessary. -// -// Recommended setting: 1 but can be turned off to reduce the library size. -#define wxUSE_ARTPROVIDER_TANGO 1 - -// Hotkey support (currently Windows only) -#define wxUSE_HOTKEY 1 - -// Use wxCaret: a class implementing a "cursor" in a text control (called caret -// under Windows). -// -// Default is 1. -// -// Recommended setting: 1 (can be safely set to 0, not used by the library) -#define wxUSE_CARET 1 - -// Use wxDisplay class: it allows enumerating all displays on a system and -// their geometries as well as finding the display on which the given point or -// window lies. -// -// Default is 1. -// -// Recommended setting: 1 if you need it, can be safely set to 0 otherwise -#define wxUSE_DISPLAY 1 - -// Miscellaneous geometry code: needed for Canvas library -#define wxUSE_GEOMETRY 1 - -// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and -// wxListCtrl. -// -// Default is 1. -// -// Recommended setting: 1 (set it to 0 if you don't use any of the controls -// enumerated above, then this class is mostly useless too) -#define wxUSE_IMAGLIST 1 - -// Use wxInfoBar class. -// -// Default is 1. -// -// Recommended setting: 1 (but can be disabled without problems as nothing -// depends on it) -#define wxUSE_INFOBAR 1 - -// Use wxMenu, wxMenuBar, wxMenuItem. -// -// Default is 1. -// -// Recommended setting: 1 (can't be disabled under MSW) -#define wxUSE_MENUS 1 - -// Use wxNotificationMessage. -// -// wxNotificationMessage allows to show non-intrusive messages to the user -// using balloons, banners, popups or whatever is the appropriate method for -// the current platform. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_NOTIFICATION_MESSAGE 1 - -// wxRichToolTip is a customizable tooltip class which has more functionality -// than the stock (but native, unlike this class) wxToolTip. -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely set to 0 if you don't need it) -#define wxUSE_RICHTOOLTIP 1 - -// Use wxSashWindow class. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_SASH 1 - -// Use wxSplitterWindow class. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_SPLITTER 1 - -// Use wxToolTip and wxWindow::Set/GetToolTip() methods. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TOOLTIPS 1 - -// wxValidator class and related methods -#define wxUSE_VALIDATORS 1 - -// Use reference counted ID management: this means that wxWidgets will track -// the automatically allocated ids (those used when you use wxID_ANY when -// creating a window, menu or toolbar item &c) instead of just supposing that -// the program never runs out of them. This is mostly useful only under wxMSW -// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where -// long-running programs can run into problems with ids reuse without this. On -// the other platforms, where the ids have the full int range, this shouldn't -// be necessary. -#ifdef __WXMSW__ -#define wxUSE_AUTOID_MANAGEMENT 1 -#else -#define wxUSE_AUTOID_MANAGEMENT 0 -#endif - -// ---------------------------------------------------------------------------- -// common dialogs -// ---------------------------------------------------------------------------- - -// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g. -// file selector, printer dialog). Switching this off also switches off the -// printing architecture and interactive wxPrinterDC. -// -// Default is 1 -// -// Recommended setting: 1 (unless it really doesn't work) -#define wxUSE_COMMON_DIALOGS 1 - -// wxBusyInfo displays window with message when app is busy. Works in same way -// as wxBusyCursor -#define wxUSE_BUSYINFO 1 - -// Use single/multiple choice dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_CHOICEDLG 1 - -// Use colour picker dialog -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_COLOURDLG 1 - -// wxDirDlg class for getting a directory name from user -#define wxUSE_DIRDLG 1 - -// TODO: setting to choose the generic or native one - -// Use file open/save dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (used in many places in the library itself) -#define wxUSE_FILEDLG 1 - -// Use find/replace dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (but may be safely set to 0) -#define wxUSE_FINDREPLDLG 1 - -// Use font picker dialog -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_FONTDLG 1 - -// Use wxMessageDialog and wxMessageBox. -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_MSGDLG 1 - -// progress dialog class for lengthy operations -#define wxUSE_PROGRESSDLG 1 - -// support for startup tips (wxShowTip &c) -#define wxUSE_STARTUP_TIPS 1 - -// text entry dialog and wxGetTextFromUser function -#define wxUSE_TEXTDLG 1 - -// number entry dialog -#define wxUSE_NUMBERDLG 1 - -// splash screen class -#define wxUSE_SPLASH 1 - -// wizards -#define wxUSE_WIZARDDLG 1 - -// Compile in wxAboutBox() function showing the standard "About" dialog. -// -// Default is 1 -// -// Recommended setting: 1 but can be set to 0 to save some space if you don't -// use this function -#define wxUSE_ABOUTDLG 1 - -// wxFileHistory class -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_FILE_HISTORY 1 - -// ---------------------------------------------------------------------------- -// Metafiles support -// ---------------------------------------------------------------------------- - -// Windows supports the graphics format known as metafile which is, though not -// portable, is widely used under Windows and so is supported by wxWin (under -// Windows only, of course). Win16 (Win3.1) used the so-called "Window -// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in -// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by -// default, WMFs will be used under Win16 and EMFs under Win32. This may be -// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting -// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile -// in any metafile related classes at all. -// -// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS. -// -// Recommended setting: default or 0 for everything for portable programs. -#define wxUSE_METAFILE 1 -#define wxUSE_ENH_METAFILE 1 -#define wxUSE_WIN_METAFILES_ALWAYS 0 - -// ---------------------------------------------------------------------------- -// Big GUI components -// ---------------------------------------------------------------------------- - -// Set to 0 to disable MDI support. -// -// Requires wxUSE_NOTEBOOK under platforms other than MSW. -// -// Default is 1. -// -// Recommended setting: 1, can be safely set to 0. -#define wxUSE_MDI 1 - -// Set to 0 to disable document/view architecture -#define wxUSE_DOC_VIEW_ARCHITECTURE 1 - -// Set to 0 to disable MDI document/view architecture -// -// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE -#define wxUSE_MDI_ARCHITECTURE 1 - -// Set to 0 to disable print/preview architecture code -#define wxUSE_PRINTING_ARCHITECTURE 1 - -// wxHTML sublibrary allows to display HTML in wxWindow programs and much, -// much more. -// -// Default is 1. -// -// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a -// smaller library. -#define wxUSE_HTML 1 - -// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL -// headers and libraries to be able to compile the library with wxUSE_GLCANVAS -// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the -// list of libraries used to link your application (although this is done -// implicitly for Microsoft Visual C++ users). -// -// Default is 1 unless the compiler is known to ship without the necessary -// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE). -// -// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0 -// otherwise. -#define wxUSE_GLCANVAS 1 - -// wxRichTextCtrl allows editing of styled text. -// -// Default is 1. -// -// Recommended setting: 1, set to 0 if you want compile a -// smaller library. -#define wxUSE_RICHTEXT 1 - -// ---------------------------------------------------------------------------- -// Data transfer -// ---------------------------------------------------------------------------- - -// Use wxClipboard class for clipboard copy/paste. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_CLIPBOARD 1 - -// Use wxDataObject and related classes. Needed for clipboard and OLE drag and -// drop -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DATAOBJ 1 - -// Use wxDropTarget and wxDropSource classes for drag and drop (this is -// different from "built in" drag and drop in wxTreeCtrl which is always -// available). Requires wxUSE_DATAOBJ. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DRAG_AND_DROP 1 - -// Use wxAccessible for enhanced and customisable accessibility. -// Depends on wxUSE_OLE. -// -// Default is 0. -// -// Recommended setting (at present): 0 -#define wxUSE_ACCESSIBILITY 0 - -// ---------------------------------------------------------------------------- -// miscellaneous settings -// ---------------------------------------------------------------------------- - -// wxSingleInstanceChecker class allows to verify at startup if another program -// instance is running. -// -// Default is 1 -// -// Recommended setting: 1 (the class is tiny, disabling it won't save much -// space) -#define wxUSE_SNGLINST_CHECKER 1 - -#define wxUSE_DRAGIMAGE 1 - -#define wxUSE_IPC 1 - // 0 for no interprocess comms -#define wxUSE_HELP 0 - // 0 for no help facility - -// Should we use MS HTML help for wxHelpController? If disabled, neither -// wxCHMHelpController nor wxBestHelpController are available. -// -// Default is 1 under MSW, 0 is always used for the other platforms. -// -// Recommended setting: 1, only set to 0 if you have trouble compiling -// wxCHMHelpController (could be a problem with really ancient compilers) -#define wxUSE_MS_HTML_HELP 1 - - -// Use wxHTML-based help controller? -#define wxUSE_WXHTML_HELP 1 - -#define wxUSE_CONSTRAINTS 1 - // 0 for no window layout constraint system - -#define wxUSE_SPLINES 1 - // 0 for no splines - -#define wxUSE_MOUSEWHEEL 1 - // Include mouse wheel support - -// Compile wxUIActionSimulator class? -#define wxUSE_UIACTIONSIMULATOR 1 - -// ---------------------------------------------------------------------------- -// wxDC classes for various output formats -// ---------------------------------------------------------------------------- - -// Set to 1 for PostScript device context. -#define wxUSE_POSTSCRIPT 0 - -// Set to 1 to use font metric files in GetTextExtent -#define wxUSE_AFM_FOR_POSTSCRIPT 1 - -// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows -// to create files in SVG (Scalable Vector Graphics) format. -#define wxUSE_SVG 1 - -// Should wxDC provide SetTransformMatrix() and related methods? -// -// Default is 1 but can be set to 0 if this functionality is not used. Notice -// that currently only wxMSW supports this so setting this to 0 doesn't change -// much for non-MSW platforms (although it will still save a few bytes -// probably). -// -// Recommended setting: 1. -#define wxUSE_DC_TRANSFORM_MATRIX 1 - -// ---------------------------------------------------------------------------- -// image format support -// ---------------------------------------------------------------------------- - -// wxImage supports many different image formats which can be configured at -// compile-time. BMP is always supported, others are optional and can be safely -// disabled if you don't plan to use images in such format sometimes saving -// substantial amount of code in the final library. -// -// Some formats require an extra library which is included in wxWin sources -// which is mentioned if it is the case. - -// Set to 1 for wxImage support (recommended). -#define wxUSE_IMAGE 1 - -// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB. -#define wxUSE_LIBPNG 1 - -// Set to 1 for JPEG format support (requires libjpeg) -#define wxUSE_LIBJPEG 1 - -// Set to 1 for TIFF format support (requires libtiff) -#define wxUSE_LIBTIFF 1 - -// Set to 1 for TGA format support (loading only) -#define wxUSE_TGA 1 - -// Set to 1 for GIF format support -#define wxUSE_GIF 1 - -// Set to 1 for PNM format support -#define wxUSE_PNM 1 - -// Set to 1 for PCX format support -#define wxUSE_PCX 1 - -// Set to 1 for IFF format support (Amiga format) -#define wxUSE_IFF 0 - -// Set to 1 for XPM format support -#define wxUSE_XPM 1 - -// Set to 1 for MS Icons and Cursors format support -#define wxUSE_ICO_CUR 1 - -// Set to 1 to compile in wxPalette class -#define wxUSE_PALETTE 1 - -// ---------------------------------------------------------------------------- -// wxUniversal-only options -// ---------------------------------------------------------------------------- - -// Set to 1 to enable compilation of all themes, this is the default -#define wxUSE_ALL_THEMES 1 - -// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES -// is unset, if it is set these options are not used; notice that metal theme -// uses Win32 one -#define wxUSE_THEME_GTK 0 -#define wxUSE_THEME_METAL 0 -#define wxUSE_THEME_MONO 0 -#define wxUSE_THEME_WIN32 0 - - -/* --- end common options --- */ - -/* --- start MSW options --- */ -// ---------------------------------------------------------------------------- -// Windows-only settings -// ---------------------------------------------------------------------------- - -// Set wxUSE_UNICODE_MSLU to 1 if you're compiling wxWidgets in Unicode mode -// and want to run your programs under Windows 9x and not only NT/2000/XP. -// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see -// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note -// that you will have to modify the makefiles to include unicows.lib import -// library as the first library (see installation instructions in install.txt -// to learn how to do it when building the library or samples). -// -// If your compiler doesn't have unicows.lib, you can get a version of it at -// http://libunicows.sourceforge.net -// -// Default is 0 -// -// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems) -#ifndef wxUSE_UNICODE_MSLU - #define wxUSE_UNICODE_MSLU 0 -#endif - -// Set this to 1 if you want to use wxWidgets and MFC in the same program. This -// will override some other settings (see below) -// -// Default is 0. -// -// Recommended setting: 0 unless you really have to use MFC -#define wxUSE_MFC 0 - -// Set this to 1 for generic OLE support: this is required for drag-and-drop, -// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and -// can't compile/doesn't have the OLE headers. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_OLE 1 - -// Set this to 1 to enable wxAutomationObject class. -// -// Default is 1. -// -// Recommended setting: 1 if you need to control other applications via OLE -// Automation, can be safely set to 0 otherwise -#define wxUSE_OLE_AUTOMATION 1 - -// Set this to 1 to enable wxActiveXContainer class allowing to embed OLE -// controls in wx. -// -// Default is 1. -// -// Recommended setting: 1, required by wxMediaCtrl -#define wxUSE_ACTIVEX 1 - -// wxDC caching implementation -#define wxUSE_DC_CACHEING 1 - -// Set this to 1 to enable wxDIB class used internally for manipulating -// wxBitmap data. -// -// Default is 1, set it to 0 only if you don't use wxImage neither -// -// Recommended setting: 1 (without it conversion to/from wxImage won't work) -#define wxUSE_WXDIB 1 - -// Set to 0 to disable PostScript print/preview architecture code under Windows -// (just use Windows printing). -#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 - -// Set this to 1 to compile in wxRegKey class. -// -// Default is 1 -// -// Recommended setting: 1, this is used internally by wx in a few places -#define wxUSE_REGKEY 1 - -// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH -// which allows to put more than ~32Kb of text in it even under Win9x (NT -// doesn't have such limitation). -// -// Default is 1 for compilers which support it -// -// Recommended setting: 1, only set it to 0 if your compiler doesn't have -// or can't compile -#define wxUSE_RICHEDIT 1 - -// Set this to 1 to use extra features of richedit v2 and later controls -// -// Default is 1 for compilers which support it -// -// Recommended setting: 1 -#define wxUSE_RICHEDIT2 1 - -// Set this to 1 to enable support for the owner-drawn menu and listboxes. This -// is required by wxUSE_CHECKLISTBOX. -// -// Default is 1. -// -// Recommended setting: 1, set to 0 for a small library size reduction -#define wxUSE_OWNER_DRAWN 1 - -// Set this to 1 to enable MSW-specific wxTaskBarIcon::ShowBalloon() method. It -// is required by native wxNotificationMessage implementation. -// -// Default is 1 but disabled in wx/msw/chkconf.h if SDK is too old to contain -// the necessary declarations. -// -// Recommended setting: 1, set to 0 for a tiny library size reduction -#define wxUSE_TASKBARICON_BALLOONS 1 - -// Set to 1 to compile MS Windows XP theme engine support -#define wxUSE_UXTHEME 1 - -// Set to 1 to use InkEdit control (Tablet PC), if available -#define wxUSE_INKEDIT 0 - -// Set to 1 to enable .INI files based wxConfig implementation (wxIniConfig) -// -// Default is 0. -// -// Recommended setting: 0, nobody uses .INI files any more -#define wxUSE_INICONF 0 - -// ---------------------------------------------------------------------------- -// Generic versions of native controls -// ---------------------------------------------------------------------------- - -// Set this to 1 to be able to use wxDatePickerCtrlGeneric in addition to the -// native wxDatePickerCtrl -// -// Default is 0. -// -// Recommended setting: 0, this is mainly used for testing -#define wxUSE_DATEPICKCTRL_GENERIC 0 - -// ---------------------------------------------------------------------------- -// Crash debugging helpers -// ---------------------------------------------------------------------------- - -// Set this to 1 to be able to use wxCrashReport::Generate() to create mini -// dumps of your program when it crashes (or at any other moment) -// -// Default is 1 if supported by the compiler (VC++ and recent BC++ only). -// -// Recommended setting: 1, set to 0 if your programs never crash -#define wxUSE_CRASHREPORT 1 -/* --- end MSW options --- */ - -/* --- start wxUniv options --- */ -// ---------------------------------------------------------------------------- -// wxUniversal-only options -// ---------------------------------------------------------------------------- - -// Set to 1 to enable compilation of all themes, this is the default -#define wxUSE_ALL_THEMES 1 - -// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES -// is unset, if it is set these options are not used; notice that metal theme -// uses Win32 one -#define wxUSE_THEME_GTK 0 -#define wxUSE_THEME_METAL 0 -#define wxUSE_THEME_MONO 0 -#define wxUSE_THEME_WIN32 0 -/* --- end wxUniv options --- */ - -#endif // _WX_SETUP_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/aui.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/aui.h deleted file mode 100644 index df3a9166a1..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/aui.h +++ /dev/null @@ -1,22 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/aui.h -// Purpose: wxaui: wx advanced user interface - docking window manager -// Author: Benjamin I. Williams -// Modified by: -// Created: 2005-05-17 -// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_AUI_H_ -#define _WX_AUI_H_ - -#include "wx/aui/framemanager.h" -#include "wx/aui/dockart.h" -#include "wx/aui/floatpane.h" -#include "wx/aui/auibar.h" -#include "wx/aui/auibook.h" -#include "wx/aui/tabmdi.h" - -#endif // _WX_AUI_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/auibar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/auibar.h deleted file mode 100644 index 52e2525215..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/auibar.h +++ /dev/null @@ -1,755 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/toolbar.h -// Purpose: wxaui: wx advanced user interface - docking window manager -// Author: Benjamin I. Williams -// Modified by: -// Created: 2008-08-04 -// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_AUIBAR_H_ -#define _WX_AUIBAR_H_ - -#include "wx/defs.h" - -#if wxUSE_AUI - -#include "wx/control.h" -#include "wx/sizer.h" -#include "wx/pen.h" - -class WXDLLIMPEXP_FWD_CORE wxClientDC; -class WXDLLIMPEXP_FWD_AUI wxAuiPaneInfo; - -enum wxAuiToolBarStyle -{ - wxAUI_TB_TEXT = 1 << 0, - wxAUI_TB_NO_TOOLTIPS = 1 << 1, - wxAUI_TB_NO_AUTORESIZE = 1 << 2, - wxAUI_TB_GRIPPER = 1 << 3, - wxAUI_TB_OVERFLOW = 1 << 4, - // using this style forces the toolbar to be vertical and - // be only dockable to the left or right sides of the window - // whereas by default it can be horizontal or vertical and - // be docked anywhere - wxAUI_TB_VERTICAL = 1 << 5, - wxAUI_TB_HORZ_LAYOUT = 1 << 6, - // analogous to wxAUI_TB_VERTICAL, but forces the toolbar - // to be horizontal - wxAUI_TB_HORIZONTAL = 1 << 7, - wxAUI_TB_PLAIN_BACKGROUND = 1 << 8, - wxAUI_TB_HORZ_TEXT = (wxAUI_TB_HORZ_LAYOUT | wxAUI_TB_TEXT), - wxAUI_ORIENTATION_MASK = (wxAUI_TB_VERTICAL | wxAUI_TB_HORIZONTAL), - wxAUI_TB_DEFAULT_STYLE = 0 -}; - -enum wxAuiToolBarArtSetting -{ - wxAUI_TBART_SEPARATOR_SIZE = 0, - wxAUI_TBART_GRIPPER_SIZE = 1, - wxAUI_TBART_OVERFLOW_SIZE = 2 -}; - -enum wxAuiToolBarToolTextOrientation -{ - wxAUI_TBTOOL_TEXT_LEFT = 0, // unused/unimplemented - wxAUI_TBTOOL_TEXT_RIGHT = 1, - wxAUI_TBTOOL_TEXT_TOP = 2, // unused/unimplemented - wxAUI_TBTOOL_TEXT_BOTTOM = 3 -}; - - -// aui toolbar event class - -class WXDLLIMPEXP_AUI wxAuiToolBarEvent : public wxNotifyEvent -{ -public: - wxAuiToolBarEvent(wxEventType commandType = wxEVT_NULL, - int winId = 0) - : wxNotifyEvent(commandType, winId) - { - m_isDropdownClicked = false; - m_clickPt = wxPoint(-1, -1); - m_rect = wxRect(-1,-1, 0, 0); - m_toolId = -1; - } -#ifndef SWIG - wxAuiToolBarEvent(const wxAuiToolBarEvent& c) : wxNotifyEvent(c) - { - m_isDropdownClicked = c.m_isDropdownClicked; - m_clickPt = c.m_clickPt; - m_rect = c.m_rect; - m_toolId = c.m_toolId; - } -#endif - wxEvent *Clone() const { return new wxAuiToolBarEvent(*this); } - - bool IsDropDownClicked() const { return m_isDropdownClicked; } - void SetDropDownClicked(bool c) { m_isDropdownClicked = c; } - - wxPoint GetClickPoint() const { return m_clickPt; } - void SetClickPoint(const wxPoint& p) { m_clickPt = p; } - - wxRect GetItemRect() const { return m_rect; } - void SetItemRect(const wxRect& r) { m_rect = r; } - - int GetToolId() const { return m_toolId; } - void SetToolId(int toolId) { m_toolId = toolId; } - -private: - - bool m_isDropdownClicked; - wxPoint m_clickPt; - wxRect m_rect; - int m_toolId; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiToolBarEvent) -}; - - -class WXDLLIMPEXP_AUI wxAuiToolBarItem -{ - friend class wxAuiToolBar; - -public: - - wxAuiToolBarItem() - { - m_window = NULL; - m_sizerItem = NULL; - m_spacerPixels = 0; - m_toolId = 0; - m_kind = wxITEM_NORMAL; - m_state = 0; // normal, enabled - m_proportion = 0; - m_active = true; - m_dropDown = true; - m_sticky = true; - m_userData = 0; - m_alignment = wxALIGN_CENTER; - } - - wxAuiToolBarItem(const wxAuiToolBarItem& c) - { - Assign(c); - } - - wxAuiToolBarItem& operator=(const wxAuiToolBarItem& c) - { - Assign(c); - return *this; - } - - void Assign(const wxAuiToolBarItem& c) - { - m_window = c.m_window; - m_label = c.m_label; - m_bitmap = c.m_bitmap; - m_disabledBitmap = c.m_disabledBitmap; - m_hoverBitmap = c.m_hoverBitmap; - m_shortHelp = c.m_shortHelp; - m_longHelp = c.m_longHelp; - m_sizerItem = c.m_sizerItem; - m_minSize = c.m_minSize; - m_spacerPixels = c.m_spacerPixels; - m_toolId = c.m_toolId; - m_kind = c.m_kind; - m_state = c.m_state; - m_proportion = c.m_proportion; - m_active = c.m_active; - m_dropDown = c.m_dropDown; - m_sticky = c.m_sticky; - m_userData = c.m_userData; - m_alignment = c.m_alignment; - } - - - void SetWindow(wxWindow* w) { m_window = w; } - wxWindow* GetWindow() { return m_window; } - - void SetId(int newId) { m_toolId = newId; } - int GetId() const { return m_toolId; } - - void SetKind(int newKind) { m_kind = newKind; } - int GetKind() const { return m_kind; } - - void SetState(int newState) { m_state = newState; } - int GetState() const { return m_state; } - - void SetSizerItem(wxSizerItem* s) { m_sizerItem = s; } - wxSizerItem* GetSizerItem() const { return m_sizerItem; } - - void SetLabel(const wxString& s) { m_label = s; } - const wxString& GetLabel() const { return m_label; } - - void SetBitmap(const wxBitmap& bmp) { m_bitmap = bmp; } - const wxBitmap& GetBitmap() const { return m_bitmap; } - - void SetDisabledBitmap(const wxBitmap& bmp) { m_disabledBitmap = bmp; } - const wxBitmap& GetDisabledBitmap() const { return m_disabledBitmap; } - - void SetHoverBitmap(const wxBitmap& bmp) { m_hoverBitmap = bmp; } - const wxBitmap& GetHoverBitmap() const { return m_hoverBitmap; } - - void SetShortHelp(const wxString& s) { m_shortHelp = s; } - const wxString& GetShortHelp() const { return m_shortHelp; } - - void SetLongHelp(const wxString& s) { m_longHelp = s; } - const wxString& GetLongHelp() const { return m_longHelp; } - - void SetMinSize(const wxSize& s) { m_minSize = s; } - const wxSize& GetMinSize() const { return m_minSize; } - - void SetSpacerPixels(int s) { m_spacerPixels = s; } - int GetSpacerPixels() const { return m_spacerPixels; } - - void SetProportion(int p) { m_proportion = p; } - int GetProportion() const { return m_proportion; } - - void SetActive(bool b) { m_active = b; } - bool IsActive() const { return m_active; } - - void SetHasDropDown(bool b) - { - wxCHECK_RET( !b || m_kind == wxITEM_NORMAL, - wxS("Only normal tools can have drop downs") ); - - m_dropDown = b; - } - - bool HasDropDown() const { return m_dropDown; } - - void SetSticky(bool b) { m_sticky = b; } - bool IsSticky() const { return m_sticky; } - - void SetUserData(long l) { m_userData = l; } - long GetUserData() const { return m_userData; } - - void SetAlignment(int l) { m_alignment = l; } - int GetAlignment() const { return m_alignment; } - -private: - - wxWindow* m_window; // item's associated window - wxString m_label; // label displayed on the item - wxBitmap m_bitmap; // item's bitmap - wxBitmap m_disabledBitmap; // item's disabled bitmap - wxBitmap m_hoverBitmap; // item's hover bitmap - wxString m_shortHelp; // short help (for tooltip) - wxString m_longHelp; // long help (for status bar) - wxSizerItem* m_sizerItem; // sizer item - wxSize m_minSize; // item's minimum size - int m_spacerPixels; // size of a spacer - int m_toolId; // item's id - int m_kind; // item's kind - int m_state; // state - int m_proportion; // proportion - bool m_active; // true if the item is currently active - bool m_dropDown; // true if the item has a dropdown button - bool m_sticky; // overrides button states if true (always active) - long m_userData; // user-specified data - int m_alignment; // sizer alignment flag, defaults to wxCENTER, may be wxEXPAND or any other -}; - -#ifndef SWIG -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiToolBarItem, wxAuiToolBarItemArray, WXDLLIMPEXP_AUI); -#endif - - - - -// tab art class - -class WXDLLIMPEXP_AUI wxAuiToolBarArt -{ -public: - - wxAuiToolBarArt() { } - virtual ~wxAuiToolBarArt() { } - - virtual wxAuiToolBarArt* Clone() = 0; - virtual void SetFlags(unsigned int flags) = 0; - virtual unsigned int GetFlags() = 0; - virtual void SetFont(const wxFont& font) = 0; - virtual wxFont GetFont() = 0; - virtual void SetTextOrientation(int orientation) = 0; - virtual int GetTextOrientation() = 0; - - virtual void DrawBackground( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) = 0; - - virtual void DrawPlainBackground( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) = 0; - - virtual void DrawLabel( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) = 0; - - virtual void DrawButton( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) = 0; - - virtual void DrawDropDownButton( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) = 0; - - virtual void DrawControlLabel( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect) = 0; - - virtual void DrawSeparator( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) = 0; - - virtual void DrawGripper( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) = 0; - - virtual void DrawOverflowButton( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect, - int state) = 0; - - virtual wxSize GetLabelSize( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item) = 0; - - virtual wxSize GetToolSize( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item) = 0; - - virtual int GetElementSize(int elementId) = 0; - virtual void SetElementSize(int elementId, int size) = 0; - - virtual int ShowDropDown( - wxWindow* wnd, - const wxAuiToolBarItemArray& items) = 0; -}; - - - -class WXDLLIMPEXP_AUI wxAuiDefaultToolBarArt : public wxAuiToolBarArt -{ - -public: - - wxAuiDefaultToolBarArt(); - virtual ~wxAuiDefaultToolBarArt(); - - virtual wxAuiToolBarArt* Clone(); - virtual void SetFlags(unsigned int flags); - virtual unsigned int GetFlags(); - virtual void SetFont(const wxFont& font); - virtual wxFont GetFont(); - virtual void SetTextOrientation(int orientation); - virtual int GetTextOrientation(); - - virtual void DrawBackground( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect); - - virtual void DrawPlainBackground(wxDC& dc, - wxWindow* wnd, - const wxRect& rect); - - virtual void DrawLabel( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect); - - virtual void DrawButton( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect); - - virtual void DrawDropDownButton( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect); - - virtual void DrawControlLabel( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item, - const wxRect& rect); - - virtual void DrawSeparator( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect); - - virtual void DrawGripper( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect); - - virtual void DrawOverflowButton( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect, - int state); - - virtual wxSize GetLabelSize( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item); - - virtual wxSize GetToolSize( - wxDC& dc, - wxWindow* wnd, - const wxAuiToolBarItem& item); - - virtual int GetElementSize(int element); - virtual void SetElementSize(int elementId, int size); - - virtual int ShowDropDown(wxWindow* wnd, - const wxAuiToolBarItemArray& items); - -protected: - - wxBitmap m_buttonDropDownBmp; - wxBitmap m_disabledButtonDropDownBmp; - wxBitmap m_overflowBmp; - wxBitmap m_disabledOverflowBmp; - wxColour m_baseColour; - wxColour m_highlightColour; - wxFont m_font; - unsigned int m_flags; - int m_textOrientation; - - wxPen m_gripperPen1; - wxPen m_gripperPen2; - wxPen m_gripperPen3; - - int m_separatorSize; - int m_gripperSize; - int m_overflowSize; -}; - - - - -class WXDLLIMPEXP_AUI wxAuiToolBar : public wxControl -{ -public: - wxAuiToolBar() { Init(); } - - wxAuiToolBar(wxWindow* parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxAUI_TB_DEFAULT_STYLE) - { - Init(); - Create(parent, id, pos, size, style); - } - - virtual ~wxAuiToolBar(); - - bool Create(wxWindow* parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxAUI_TB_DEFAULT_STYLE); - - virtual void SetWindowStyleFlag(long style); - - void SetArtProvider(wxAuiToolBarArt* art); - wxAuiToolBarArt* GetArtProvider() const; - - bool SetFont(const wxFont& font); - - - wxAuiToolBarItem* AddTool(int toolId, - const wxString& label, - const wxBitmap& bitmap, - const wxString& shortHelpString = wxEmptyString, - wxItemKind kind = wxITEM_NORMAL); - - wxAuiToolBarItem* AddTool(int toolId, - const wxString& label, - const wxBitmap& bitmap, - const wxBitmap& disabledBitmap, - wxItemKind kind, - const wxString& shortHelpString, - const wxString& longHelpString, - wxObject* clientData); - - wxAuiToolBarItem* AddTool(int toolId, - const wxBitmap& bitmap, - const wxBitmap& disabledBitmap, - bool toggle = false, - wxObject* clientData = NULL, - const wxString& shortHelpString = wxEmptyString, - const wxString& longHelpString = wxEmptyString) - { - return AddTool(toolId, - wxEmptyString, - bitmap, - disabledBitmap, - toggle ? wxITEM_CHECK : wxITEM_NORMAL, - shortHelpString, - longHelpString, - clientData); - } - - wxAuiToolBarItem* AddLabel(int toolId, - const wxString& label = wxEmptyString, - const int width = -1); - wxAuiToolBarItem* AddControl(wxControl* control, - const wxString& label = wxEmptyString); - wxAuiToolBarItem* AddSeparator(); - wxAuiToolBarItem* AddSpacer(int pixels); - wxAuiToolBarItem* AddStretchSpacer(int proportion = 1); - - bool Realize(); - - wxControl* FindControl(int windowId); - wxAuiToolBarItem* FindToolByPosition(wxCoord x, wxCoord y) const; - wxAuiToolBarItem* FindToolByIndex(int idx) const; - wxAuiToolBarItem* FindTool(int toolId) const; - - void ClearTools() { Clear() ; } - void Clear(); - bool DeleteTool(int toolId); - bool DeleteByIndex(int toolId); - - size_t GetToolCount() const; - int GetToolPos(int toolId) const { return GetToolIndex(toolId); } - int GetToolIndex(int toolId) const; - bool GetToolFits(int toolId) const; - wxRect GetToolRect(int toolId) const; - bool GetToolFitsByIndex(int toolId) const; - bool GetToolBarFits() const; - - void SetMargins(const wxSize& size) { SetMargins(size.x, size.x, size.y, size.y); } - void SetMargins(int x, int y) { SetMargins(x, x, y, y); } - void SetMargins(int left, int right, int top, int bottom); - - void SetToolBitmapSize(const wxSize& size); - wxSize GetToolBitmapSize() const; - - bool GetOverflowVisible() const; - void SetOverflowVisible(bool visible); - - bool GetGripperVisible() const; - void SetGripperVisible(bool visible); - - void ToggleTool(int toolId, bool state); - bool GetToolToggled(int toolId) const; - - void EnableTool(int toolId, bool state); - bool GetToolEnabled(int toolId) const; - - void SetToolDropDown(int toolId, bool dropdown); - bool GetToolDropDown(int toolId) const; - - void SetToolBorderPadding(int padding); - int GetToolBorderPadding() const; - - void SetToolTextOrientation(int orientation); - int GetToolTextOrientation() const; - - void SetToolPacking(int packing); - int GetToolPacking() const; - - void SetToolProportion(int toolId, int proportion); - int GetToolProportion(int toolId) const; - - void SetToolSeparation(int separation); - int GetToolSeparation() const; - - void SetToolSticky(int toolId, bool sticky); - bool GetToolSticky(int toolId) const; - - wxString GetToolLabel(int toolId) const; - void SetToolLabel(int toolId, const wxString& label); - - wxBitmap GetToolBitmap(int toolId) const; - void SetToolBitmap(int toolId, const wxBitmap& bitmap); - - wxString GetToolShortHelp(int toolId) const; - void SetToolShortHelp(int toolId, const wxString& helpString); - - wxString GetToolLongHelp(int toolId) const; - void SetToolLongHelp(int toolId, const wxString& helpString); - - void SetCustomOverflowItems(const wxAuiToolBarItemArray& prepend, - const wxAuiToolBarItemArray& append); - - // get size of hint rectangle for a particular dock location - wxSize GetHintSize(int dockDirection) const; - bool IsPaneValid(const wxAuiPaneInfo& pane) const; - - // Override to call DoIdleUpdate(). - virtual void UpdateWindowUI(long flags = wxUPDATE_UI_NONE); - -protected: - void Init(); - - virtual void OnCustomRender(wxDC& WXUNUSED(dc), - const wxAuiToolBarItem& WXUNUSED(item), - const wxRect& WXUNUSED(rect)) { } - -protected: - - void DoIdleUpdate(); - void SetOrientation(int orientation); - void SetHoverItem(wxAuiToolBarItem* item); - void SetPressedItem(wxAuiToolBarItem* item); - void RefreshOverflowState(); - - int GetOverflowState() const; - wxRect GetOverflowRect() const; - wxSize GetLabelSize(const wxString& label); - wxAuiToolBarItem* FindToolByPositionWithPacking(wxCoord x, wxCoord y) const; - - void DoSetSize(int x, - int y, - int width, - int height, - int sizeFlags = wxSIZE_AUTO); - -protected: // handlers - - void OnSize(wxSizeEvent& evt); - void OnIdle(wxIdleEvent& evt); - void OnPaint(wxPaintEvent& evt); - void OnEraseBackground(wxEraseEvent& evt); - void OnLeftDown(wxMouseEvent& evt); - void OnLeftUp(wxMouseEvent& evt); - void OnRightDown(wxMouseEvent& evt); - void OnRightUp(wxMouseEvent& evt); - void OnMiddleDown(wxMouseEvent& evt); - void OnMiddleUp(wxMouseEvent& evt); - void OnMotion(wxMouseEvent& evt); - void OnLeaveWindow(wxMouseEvent& evt); - void OnCaptureLost(wxMouseCaptureLostEvent& evt); - void OnSetCursor(wxSetCursorEvent& evt); - -protected: - - wxAuiToolBarItemArray m_items; // array of toolbar items - wxAuiToolBarArt* m_art; // art provider - wxBoxSizer* m_sizer; // main sizer for toolbar - wxAuiToolBarItem* m_actionItem; // item that's being acted upon (pressed) - wxAuiToolBarItem* m_tipItem; // item that has its tooltip shown - wxBitmap m_bitmap; // double-buffer bitmap - wxSizerItem* m_gripperSizerItem; - wxSizerItem* m_overflowSizerItem; - wxSize m_absoluteMinSize; - wxPoint m_actionPos; // position of left-mouse down - wxAuiToolBarItemArray m_customOverflowPrepend; - wxAuiToolBarItemArray m_customOverflowAppend; - - int m_buttonWidth; - int m_buttonHeight; - int m_sizerElementCount; - int m_leftPadding; - int m_rightPadding; - int m_topPadding; - int m_bottomPadding; - int m_toolPacking; - int m_toolBorderPadding; - int m_toolTextOrientation; - int m_overflowState; - bool m_dragging; - bool m_gripperVisible; - bool m_overflowVisible; - - bool RealizeHelper(wxClientDC& dc, bool horizontal); - static bool IsPaneValid(long style, const wxAuiPaneInfo& pane); - bool IsPaneValid(long style) const; - void SetArtFlags() const; - wxOrientation m_orientation; - wxSize m_horzHintSize; - wxSize m_vertHintSize; - -private: - // Common part of OnLeaveWindow() and OnCaptureLost(). - void DoResetMouseState(); - - DECLARE_EVENT_TABLE() - DECLARE_CLASS(wxAuiToolBar) -}; - - - - -// wx event machinery - -#ifndef SWIG - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_TOOL_DROPDOWN, wxAuiToolBarEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_OVERFLOW_CLICK, wxAuiToolBarEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_RIGHT_CLICK, wxAuiToolBarEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_MIDDLE_CLICK, wxAuiToolBarEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUITOOLBAR_BEGIN_DRAG, wxAuiToolBarEvent ); - -typedef void (wxEvtHandler::*wxAuiToolBarEventFunction)(wxAuiToolBarEvent&); - -#define wxAuiToolBarEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxAuiToolBarEventFunction, func) - -#define EVT_AUITOOLBAR_TOOL_DROPDOWN(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_TOOL_DROPDOWN, winid, wxAuiToolBarEventHandler(fn)) -#define EVT_AUITOOLBAR_OVERFLOW_CLICK(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_OVERFLOW_CLICK, winid, wxAuiToolBarEventHandler(fn)) -#define EVT_AUITOOLBAR_RIGHT_CLICK(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_RIGHT_CLICK, winid, wxAuiToolBarEventHandler(fn)) -#define EVT_AUITOOLBAR_MIDDLE_CLICK(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_MIDDLE_CLICK, winid, wxAuiToolBarEventHandler(fn)) -#define EVT_AUITOOLBAR_BEGIN_DRAG(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUITOOLBAR_BEGIN_DRAG, winid, wxAuiToolBarEventHandler(fn)) - -#else - -// wxpython/swig event work -%constant wxEventType wxEVT_AUITOOLBAR_TOOL_DROPDOWN; -%constant wxEventType wxEVT_AUITOOLBAR_OVERFLOW_CLICK; -%constant wxEventType wxEVT_AUITOOLBAR_RIGHT_CLICK; -%constant wxEventType wxEVT_AUITOOLBAR_MIDDLE_CLICK; -%constant wxEventType wxEVT_AUITOOLBAR_BEGIN_DRAG; - -%pythoncode { - EVT_AUITOOLBAR_TOOL_DROPDOWN = wx.PyEventBinder( wxEVT_AUITOOLBAR_TOOL_DROPDOWN, 1 ) - EVT_AUITOOLBAR_OVERFLOW_CLICK = wx.PyEventBinder( wxEVT_AUITOOLBAR_OVERFLOW_CLICK, 1 ) - EVT_AUITOOLBAR_RIGHT_CLICK = wx.PyEventBinder( wxEVT_AUITOOLBAR_RIGHT_CLICK, 1 ) - EVT_AUITOOLBAR_MIDDLE_CLICK = wx.PyEventBinder( wxEVT_AUITOOLBAR_MIDDLE_CLICK, 1 ) - EVT_AUITOOLBAR_BEGIN_DRAG = wx.PyEventBinder( wxEVT_AUITOOLBAR_BEGIN_DRAG, 1 ) -} -#endif // SWIG - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN wxEVT_AUITOOLBAR_TOOL_DROPDOWN -#define wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK wxEVT_AUITOOLBAR_OVERFLOW_CLICK -#define wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK wxEVT_AUITOOLBAR_RIGHT_CLICK -#define wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK wxEVT_AUITOOLBAR_MIDDLE_CLICK -#define wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG wxEVT_AUITOOLBAR_BEGIN_DRAG - -#endif // wxUSE_AUI -#endif // _WX_AUIBAR_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/auibook.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/auibook.h deleted file mode 100644 index 17b3fdae9f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/auibook.h +++ /dev/null @@ -1,556 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/auibook.h -// Purpose: wxaui: wx advanced user interface - notebook -// Author: Benjamin I. Williams -// Modified by: Jens Lody -// Created: 2006-06-28 -// Copyright: (C) Copyright 2006, Kirix Corporation, All Rights Reserved. -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - - - -#ifndef _WX_AUINOTEBOOK_H_ -#define _WX_AUINOTEBOOK_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_AUI - -#include "wx/aui/tabart.h" -#include "wx/aui/framemanager.h" -#include "wx/bookctrl.h" -#include "wx/containr.h" - - -class wxAuiNotebook; - - -enum wxAuiNotebookOption -{ - wxAUI_NB_TOP = 1 << 0, - wxAUI_NB_LEFT = 1 << 1, // not implemented yet - wxAUI_NB_RIGHT = 1 << 2, // not implemented yet - wxAUI_NB_BOTTOM = 1 << 3, - wxAUI_NB_TAB_SPLIT = 1 << 4, - wxAUI_NB_TAB_MOVE = 1 << 5, - wxAUI_NB_TAB_EXTERNAL_MOVE = 1 << 6, - wxAUI_NB_TAB_FIXED_WIDTH = 1 << 7, - wxAUI_NB_SCROLL_BUTTONS = 1 << 8, - wxAUI_NB_WINDOWLIST_BUTTON = 1 << 9, - wxAUI_NB_CLOSE_BUTTON = 1 << 10, - wxAUI_NB_CLOSE_ON_ACTIVE_TAB = 1 << 11, - wxAUI_NB_CLOSE_ON_ALL_TABS = 1 << 12, - wxAUI_NB_MIDDLE_CLICK_CLOSE = 1 << 13, - - wxAUI_NB_DEFAULT_STYLE = wxAUI_NB_TOP | - wxAUI_NB_TAB_SPLIT | - wxAUI_NB_TAB_MOVE | - wxAUI_NB_SCROLL_BUTTONS | - wxAUI_NB_CLOSE_ON_ACTIVE_TAB | - wxAUI_NB_MIDDLE_CLICK_CLOSE -}; - - - - -// aui notebook event class - -class WXDLLIMPEXP_AUI wxAuiNotebookEvent : public wxBookCtrlEvent -{ -public: - wxAuiNotebookEvent(wxEventType commandType = wxEVT_NULL, - int winId = 0) - : wxBookCtrlEvent(commandType, winId) - { - m_dragSource = NULL; - } -#ifndef SWIG - wxAuiNotebookEvent(const wxAuiNotebookEvent& c) : wxBookCtrlEvent(c) - { - m_dragSource = c.m_dragSource; - } -#endif - wxEvent *Clone() const { return new wxAuiNotebookEvent(*this); } - - void SetDragSource(wxAuiNotebook* s) { m_dragSource = s; } - wxAuiNotebook* GetDragSource() const { return m_dragSource; } - -private: - wxAuiNotebook* m_dragSource; - -#ifndef SWIG -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiNotebookEvent) -#endif -}; - - -class WXDLLIMPEXP_AUI wxAuiNotebookPage -{ -public: - wxWindow* window; // page's associated window - wxString caption; // caption displayed on the tab - wxString tooltip; // tooltip displayed when hovering over tab title - wxBitmap bitmap; // tab's bitmap - wxRect rect; // tab's hit rectangle - bool active; // true if the page is currently active -}; - -class WXDLLIMPEXP_AUI wxAuiTabContainerButton -{ -public: - - int id; // button's id - int curState; // current state (normal, hover, pressed, etc.) - int location; // buttons location (wxLEFT, wxRIGHT, or wxCENTER) - wxBitmap bitmap; // button's hover bitmap - wxBitmap disBitmap; // button's disabled bitmap - wxRect rect; // button's hit rectangle -}; - - -#ifndef SWIG -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiNotebookPage, wxAuiNotebookPageArray, WXDLLIMPEXP_AUI); -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiTabContainerButton, wxAuiTabContainerButtonArray, WXDLLIMPEXP_AUI); -#endif - - -class WXDLLIMPEXP_AUI wxAuiTabContainer -{ -public: - - wxAuiTabContainer(); - virtual ~wxAuiTabContainer(); - - void SetArtProvider(wxAuiTabArt* art); - wxAuiTabArt* GetArtProvider() const; - - void SetFlags(unsigned int flags); - unsigned int GetFlags() const; - - bool AddPage(wxWindow* page, const wxAuiNotebookPage& info); - bool InsertPage(wxWindow* page, const wxAuiNotebookPage& info, size_t idx); - bool MovePage(wxWindow* page, size_t newIdx); - bool RemovePage(wxWindow* page); - bool SetActivePage(wxWindow* page); - bool SetActivePage(size_t page); - void SetNoneActive(); - int GetActivePage() const; - bool TabHitTest(int x, int y, wxWindow** hit) const; - bool ButtonHitTest(int x, int y, wxAuiTabContainerButton** hit) const; - wxWindow* GetWindowFromIdx(size_t idx) const; - int GetIdxFromWindow(wxWindow* page) const; - size_t GetPageCount() const; - wxAuiNotebookPage& GetPage(size_t idx); - const wxAuiNotebookPage& GetPage(size_t idx) const; - wxAuiNotebookPageArray& GetPages(); - void SetNormalFont(const wxFont& normalFont); - void SetSelectedFont(const wxFont& selectedFont); - void SetMeasuringFont(const wxFont& measuringFont); - void SetColour(const wxColour& colour); - void SetActiveColour(const wxColour& colour); - void DoShowHide(); - void SetRect(const wxRect& rect); - - void RemoveButton(int id); - void AddButton(int id, - int location, - const wxBitmap& normalBitmap = wxNullBitmap, - const wxBitmap& disabledBitmap = wxNullBitmap); - - size_t GetTabOffset() const; - void SetTabOffset(size_t offset); - - // Is the tab visible? - bool IsTabVisible(int tabPage, int tabOffset, wxDC* dc, wxWindow* wnd); - - // Make the tab visible if it wasn't already - void MakeTabVisible(int tabPage, wxWindow* win); - -protected: - - virtual void Render(wxDC* dc, wxWindow* wnd); - -protected: - - wxAuiTabArt* m_art; - wxAuiNotebookPageArray m_pages; - wxAuiTabContainerButtonArray m_buttons; - wxAuiTabContainerButtonArray m_tabCloseButtons; - wxRect m_rect; - size_t m_tabOffset; - unsigned int m_flags; -}; - - - -class WXDLLIMPEXP_AUI wxAuiTabCtrl : public wxControl, - public wxAuiTabContainer -{ -public: - - wxAuiTabCtrl(wxWindow* parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0); - - ~wxAuiTabCtrl(); - - bool IsDragging() const { return m_isDragging; } - -protected: - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - - void OnPaint(wxPaintEvent& evt); - void OnEraseBackground(wxEraseEvent& evt); - void OnSize(wxSizeEvent& evt); - void OnLeftDown(wxMouseEvent& evt); - void OnLeftDClick(wxMouseEvent& evt); - void OnLeftUp(wxMouseEvent& evt); - void OnMiddleDown(wxMouseEvent& evt); - void OnMiddleUp(wxMouseEvent& evt); - void OnRightDown(wxMouseEvent& evt); - void OnRightUp(wxMouseEvent& evt); - void OnMotion(wxMouseEvent& evt); - void OnLeaveWindow(wxMouseEvent& evt); - void OnButton(wxAuiNotebookEvent& evt); - void OnSetFocus(wxFocusEvent& event); - void OnKillFocus(wxFocusEvent& event); - void OnChar(wxKeyEvent& event); - void OnCaptureLost(wxMouseCaptureLostEvent& evt); - -protected: - - wxPoint m_clickPt; - wxWindow* m_clickTab; - bool m_isDragging; - wxAuiTabContainerButton* m_hoverButton; - wxAuiTabContainerButton* m_pressedButton; - -#ifndef SWIG - DECLARE_CLASS(wxAuiTabCtrl) - DECLARE_EVENT_TABLE() -#endif -}; - - - - -class WXDLLIMPEXP_AUI wxAuiNotebook : public wxNavigationEnabled -{ - -public: - - wxAuiNotebook() { Init(); } - - wxAuiNotebook(wxWindow* parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxAUI_NB_DEFAULT_STYLE) - { - Init(); - Create(parent, id, pos, size, style); - } - - virtual ~wxAuiNotebook(); - - bool Create(wxWindow* parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0); - - void SetWindowStyleFlag(long style); - void SetArtProvider(wxAuiTabArt* art); - wxAuiTabArt* GetArtProvider() const; - - virtual void SetUniformBitmapSize(const wxSize& size); - virtual void SetTabCtrlHeight(int height); - - bool AddPage(wxWindow* page, - const wxString& caption, - bool select = false, - const wxBitmap& bitmap = wxNullBitmap); - - bool InsertPage(size_t pageIdx, - wxWindow* page, - const wxString& caption, - bool select = false, - const wxBitmap& bitmap = wxNullBitmap); - - bool DeletePage(size_t page); - bool RemovePage(size_t page); - - virtual size_t GetPageCount() const; - virtual wxWindow* GetPage(size_t pageIdx) const; - int GetPageIndex(wxWindow* pageWnd) const; - - bool SetPageText(size_t page, const wxString& text); - wxString GetPageText(size_t pageIdx) const; - - bool SetPageToolTip(size_t page, const wxString& text); - wxString GetPageToolTip(size_t pageIdx) const; - - bool SetPageBitmap(size_t page, const wxBitmap& bitmap); - wxBitmap GetPageBitmap(size_t pageIdx) const; - - int SetSelection(size_t newPage); - int GetSelection() const; - - virtual void Split(size_t page, int direction); - - const wxAuiManager& GetAuiManager() const { return m_mgr; } - - // Sets the normal font - void SetNormalFont(const wxFont& font); - - // Sets the selected tab font - void SetSelectedFont(const wxFont& font); - - // Sets the measuring font - void SetMeasuringFont(const wxFont& font); - - // Sets the tab font - virtual bool SetFont(const wxFont& font); - - // Gets the tab control height - int GetTabCtrlHeight() const; - - // Gets the height of the notebook for a given page height - int GetHeightForPageHeight(int pageHeight); - - // Shows the window menu - bool ShowWindowMenu(); - - // we do have multiple pages - virtual bool HasMultiplePages() const { return true; } - - // we don't want focus for ourselves - // virtual bool AcceptsFocus() const { return false; } - - //wxBookCtrlBase functions - - virtual void SetPageSize (const wxSize &size); - virtual int HitTest (const wxPoint &pt, long *flags=NULL) const; - - virtual int GetPageImage(size_t n) const; - virtual bool SetPageImage(size_t n, int imageId); - - virtual int ChangeSelection(size_t n); - - virtual bool AddPage(wxWindow *page, const wxString &text, bool select, - int imageId); - virtual bool DeleteAllPages(); - virtual bool InsertPage(size_t index, wxWindow *page, const wxString &text, - bool select, int imageId); - -protected: - // Common part of all ctors. - void Init(); - - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - - // Redo sizing after thawing - virtual void DoThaw(); - - // these can be overridden - - // update the height, return true if it was done or false if the new height - // calculated by CalculateTabCtrlHeight() is the same as the old one - virtual bool UpdateTabCtrlHeight(); - - virtual int CalculateTabCtrlHeight(); - virtual wxSize CalculateNewSplitSize(); - - // remove the page and return a pointer to it - virtual wxWindow *DoRemovePage(size_t WXUNUSED(page)) { return NULL; } - - //A general selection function - virtual int DoModifySelection(size_t n, bool events); - -protected: - - void DoSizing(); - void InitNotebook(long style); - wxAuiTabCtrl* GetTabCtrlFromPoint(const wxPoint& pt); - wxWindow* GetTabFrameFromTabCtrl(wxWindow* tabCtrl); - wxAuiTabCtrl* GetActiveTabCtrl(); - bool FindTab(wxWindow* page, wxAuiTabCtrl** ctrl, int* idx); - void RemoveEmptyTabFrames(); - void UpdateHintWindowSize(); - -protected: - - void OnChildFocusNotebook(wxChildFocusEvent& evt); - void OnRender(wxAuiManagerEvent& evt); - void OnSize(wxSizeEvent& evt); - void OnTabClicked(wxAuiNotebookEvent& evt); - void OnTabBeginDrag(wxAuiNotebookEvent& evt); - void OnTabDragMotion(wxAuiNotebookEvent& evt); - void OnTabEndDrag(wxAuiNotebookEvent& evt); - void OnTabCancelDrag(wxAuiNotebookEvent& evt); - void OnTabButton(wxAuiNotebookEvent& evt); - void OnTabMiddleDown(wxAuiNotebookEvent& evt); - void OnTabMiddleUp(wxAuiNotebookEvent& evt); - void OnTabRightDown(wxAuiNotebookEvent& evt); - void OnTabRightUp(wxAuiNotebookEvent& evt); - void OnTabBgDClick(wxAuiNotebookEvent& evt); - void OnNavigationKeyNotebook(wxNavigationKeyEvent& event); - - // set selection to the given window (which must be non-NULL and be one of - // our pages, otherwise an assert is raised) - void SetSelectionToWindow(wxWindow *win); - void SetSelectionToPage(const wxAuiNotebookPage& page) - { - SetSelectionToWindow(page.window); - } - -protected: - - wxAuiManager m_mgr; - wxAuiTabContainer m_tabs; - int m_curPage; - int m_tabIdCounter; - wxWindow* m_dummyWnd; - - wxSize m_requestedBmpSize; - int m_requestedTabCtrlHeight; - wxFont m_selectedFont; - wxFont m_normalFont; - int m_tabCtrlHeight; - - int m_lastDragX; - unsigned int m_flags; - -#ifndef SWIG - DECLARE_CLASS(wxAuiNotebook) - DECLARE_EVENT_TABLE() -#endif -}; - - - - -// wx event machinery - -#ifndef SWIG - -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_PAGE_CLOSE, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_PAGE_CHANGED, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_PAGE_CHANGING, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_PAGE_CLOSED, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_BUTTON, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_BEGIN_DRAG, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_END_DRAG, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_DRAG_MOTION, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_ALLOW_DND, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_DRAG_DONE, wxAuiNotebookEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_AUI, wxEVT_AUINOTEBOOK_BG_DCLICK, wxAuiNotebookEvent); - -typedef void (wxEvtHandler::*wxAuiNotebookEventFunction)(wxAuiNotebookEvent&); - -#define wxAuiNotebookEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxAuiNotebookEventFunction, func) - -#define EVT_AUINOTEBOOK_PAGE_CLOSE(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_PAGE_CLOSE, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_PAGE_CLOSED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_PAGE_CLOSED, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_PAGE_CHANGED(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_PAGE_CHANGED, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_PAGE_CHANGING(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_PAGE_CHANGING, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_BUTTON(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_BUTTON, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_BEGIN_DRAG(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_BEGIN_DRAG, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_END_DRAG(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_END_DRAG, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_DRAG_MOTION(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_DRAG_MOTION, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_ALLOW_DND(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_ALLOW_DND, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_DRAG_DONE(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_DRAG_DONE, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_TAB_MIDDLE_DOWN(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_TAB_MIDDLE_UP(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_TAB_RIGHT_DOWN(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_TAB_RIGHT_UP(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, winid, wxAuiNotebookEventHandler(fn)) -#define EVT_AUINOTEBOOK_BG_DCLICK(winid, fn) \ - wx__DECLARE_EVT1(wxEVT_AUINOTEBOOK_BG_DCLICK, winid, wxAuiNotebookEventHandler(fn)) -#else - -// wxpython/swig event work -%constant wxEventType wxEVT_AUINOTEBOOK_PAGE_CLOSE; -%constant wxEventType wxEVT_AUINOTEBOOK_PAGE_CLOSED; -%constant wxEventType wxEVT_AUINOTEBOOK_PAGE_CHANGED; -%constant wxEventType wxEVT_AUINOTEBOOK_PAGE_CHANGING; -%constant wxEventType wxEVT_AUINOTEBOOK_BUTTON; -%constant wxEventType wxEVT_AUINOTEBOOK_BEGIN_DRAG; -%constant wxEventType wxEVT_AUINOTEBOOK_END_DRAG; -%constant wxEventType wxEVT_AUINOTEBOOK_DRAG_MOTION; -%constant wxEventType wxEVT_AUINOTEBOOK_ALLOW_DND; -%constant wxEventType wxEVT_AUINOTEBOOK_DRAG_DONE; -%constant wxEventType wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN; -%constant wxEventType wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP; -%constant wxEventType wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN; -%constant wxEventType wxEVT_AUINOTEBOOK_TAB_RIGHT_UP; -%constant wxEventType wxEVT_AUINOTEBOOK_BG_DCLICK; - -%pythoncode { - EVT_AUINOTEBOOK_PAGE_CLOSE = wx.PyEventBinder( wxEVT_AUINOTEBOOK_PAGE_CLOSE, 1 ) - EVT_AUINOTEBOOK_PAGE_CLOSED = wx.PyEventBinder( wxEVT_AUINOTEBOOK_PAGE_CLOSED, 1 ) - EVT_AUINOTEBOOK_PAGE_CHANGED = wx.PyEventBinder( wxEVT_AUINOTEBOOK_PAGE_CHANGED, 1 ) - EVT_AUINOTEBOOK_PAGE_CHANGING = wx.PyEventBinder( wxEVT_AUINOTEBOOK_PAGE_CHANGING, 1 ) - EVT_AUINOTEBOOK_BUTTON = wx.PyEventBinder( wxEVT_AUINOTEBOOK_BUTTON, 1 ) - EVT_AUINOTEBOOK_BEGIN_DRAG = wx.PyEventBinder( wxEVT_AUINOTEBOOK_BEGIN_DRAG, 1 ) - EVT_AUINOTEBOOK_END_DRAG = wx.PyEventBinder( wxEVT_AUINOTEBOOK_END_DRAG, 1 ) - EVT_AUINOTEBOOK_DRAG_MOTION = wx.PyEventBinder( wxEVT_AUINOTEBOOK_DRAG_MOTION, 1 ) - EVT_AUINOTEBOOK_ALLOW_DND = wx.PyEventBinder( wxEVT_AUINOTEBOOK_ALLOW_DND, 1 ) - EVT_AUINOTEBOOK_DRAG_DONE = wx.PyEventBinder( wxEVT_AUINOTEBOOK_DRAG_DONE, 1 ) - EVT__AUINOTEBOOK_TAB_MIDDLE_DOWN = wx.PyEventBinder( wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN, 1 ) - EVT__AUINOTEBOOK_TAB_MIDDLE_UP = wx.PyEventBinder( wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP, 1 ) - EVT__AUINOTEBOOK_TAB_RIGHT_DOWN = wx.PyEventBinder( wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN, 1 ) - EVT__AUINOTEBOOK_TAB_RIGHT_UP = wx.PyEventBinder( wxEVT_AUINOTEBOOK_TAB_RIGHT_UP, 1 ) - EVT_AUINOTEBOOK_BG_DCLICK = wx.PyEventBinder( wxEVT_AUINOTEBOOK_BG_DCLICK, 1 ) -} -#endif - - -// old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSE wxEVT_AUINOTEBOOK_PAGE_CLOSE -#define wxEVT_COMMAND_AUINOTEBOOK_PAGE_CLOSED wxEVT_AUINOTEBOOK_PAGE_CLOSED -#define wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED wxEVT_AUINOTEBOOK_PAGE_CHANGED -#define wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGING wxEVT_AUINOTEBOOK_PAGE_CHANGING -#define wxEVT_COMMAND_AUINOTEBOOK_BUTTON wxEVT_AUINOTEBOOK_BUTTON -#define wxEVT_COMMAND_AUINOTEBOOK_BEGIN_DRAG wxEVT_AUINOTEBOOK_BEGIN_DRAG -#define wxEVT_COMMAND_AUINOTEBOOK_END_DRAG wxEVT_AUINOTEBOOK_END_DRAG -#define wxEVT_COMMAND_AUINOTEBOOK_DRAG_MOTION wxEVT_AUINOTEBOOK_DRAG_MOTION -#define wxEVT_COMMAND_AUINOTEBOOK_ALLOW_DND wxEVT_AUINOTEBOOK_ALLOW_DND -#define wxEVT_COMMAND_AUINOTEBOOK_DRAG_DONE wxEVT_AUINOTEBOOK_DRAG_DONE -#define wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_DOWN wxEVT_AUINOTEBOOK_TAB_MIDDLE_DOWN -#define wxEVT_COMMAND_AUINOTEBOOK_TAB_MIDDLE_UP wxEVT_AUINOTEBOOK_TAB_MIDDLE_UP -#define wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_DOWN wxEVT_AUINOTEBOOK_TAB_RIGHT_DOWN -#define wxEVT_COMMAND_AUINOTEBOOK_TAB_RIGHT_UP wxEVT_AUINOTEBOOK_TAB_RIGHT_UP -#define wxEVT_COMMAND_AUINOTEBOOK_BG_DCLICK wxEVT_AUINOTEBOOK_BG_DCLICK -#define wxEVT_COMMAND_AUINOTEBOOK_CANCEL_DRAG wxEVT_AUINOTEBOOK_CANCEL_DRAG - -#endif // wxUSE_AUI -#endif // _WX_AUINOTEBOOK_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/dockart.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/dockart.h deleted file mode 100644 index 744cad56c4..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/dockart.h +++ /dev/null @@ -1,178 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/dockart.h -// Purpose: wxaui: wx advanced user interface - docking window manager -// Author: Benjamin I. Williams -// Modified by: -// Created: 2005-05-17 -// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DOCKART_H_ -#define _WX_DOCKART_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_AUI - -#include "wx/pen.h" -#include "wx/brush.h" -#include "wx/bitmap.h" -#include "wx/colour.h" - -// dock art provider code - a dock provider provides all drawing -// functionality to the wxAui dock manager. This allows the dock -// manager to have plugable look-and-feels - -class WXDLLIMPEXP_AUI wxAuiDockArt -{ -public: - - wxAuiDockArt() { } - virtual ~wxAuiDockArt() { } - - virtual int GetMetric(int id) = 0; - virtual void SetMetric(int id, int newVal) = 0; - virtual void SetFont(int id, const wxFont& font) = 0; - virtual wxFont GetFont(int id) = 0; - virtual wxColour GetColour(int id) = 0; - virtual void SetColour(int id, const wxColor& colour) = 0; - wxColour GetColor(int id) { return GetColour(id); } - void SetColor(int id, const wxColour& color) { SetColour(id, color); } - - virtual void DrawSash(wxDC& dc, - wxWindow* window, - int orientation, - const wxRect& rect) = 0; - - virtual void DrawBackground(wxDC& dc, - wxWindow* window, - int orientation, - const wxRect& rect) = 0; - - virtual void DrawCaption(wxDC& dc, - wxWindow* window, - const wxString& text, - const wxRect& rect, - wxAuiPaneInfo& pane) = 0; - - virtual void DrawGripper(wxDC& dc, - wxWindow* window, - const wxRect& rect, - wxAuiPaneInfo& pane) = 0; - - virtual void DrawBorder(wxDC& dc, - wxWindow* window, - const wxRect& rect, - wxAuiPaneInfo& pane) = 0; - - virtual void DrawPaneButton(wxDC& dc, - wxWindow* window, - int button, - int buttonState, - const wxRect& rect, - wxAuiPaneInfo& pane) = 0; -}; - - -// this is the default art provider for wxAuiManager. Dock art -// can be customized by creating a class derived from this one, -// or replacing this class entirely - -class WXDLLIMPEXP_AUI wxAuiDefaultDockArt : public wxAuiDockArt -{ -public: - - wxAuiDefaultDockArt(); - - int GetMetric(int metricId); - void SetMetric(int metricId, int newVal); - wxColour GetColour(int id); - void SetColour(int id, const wxColor& colour); - void SetFont(int id, const wxFont& font); - wxFont GetFont(int id); - - void DrawSash(wxDC& dc, - wxWindow *window, - int orientation, - const wxRect& rect); - - void DrawBackground(wxDC& dc, - wxWindow *window, - int orientation, - const wxRect& rect); - - void DrawCaption(wxDC& dc, - wxWindow *window, - const wxString& text, - const wxRect& rect, - wxAuiPaneInfo& pane); - - void DrawGripper(wxDC& dc, - wxWindow *window, - const wxRect& rect, - wxAuiPaneInfo& pane); - - void DrawBorder(wxDC& dc, - wxWindow *window, - const wxRect& rect, - wxAuiPaneInfo& pane); - - void DrawPaneButton(wxDC& dc, - wxWindow *window, - int button, - int buttonState, - const wxRect& rect, - wxAuiPaneInfo& pane); - - void DrawIcon(wxDC& dc, - const wxRect& rect, - wxAuiPaneInfo& pane); - -protected: - - void DrawCaptionBackground(wxDC& dc, const wxRect& rect, bool active); - - void InitBitmaps(); - -protected: - - wxPen m_borderPen; - wxBrush m_sashBrush; - wxBrush m_backgroundBrush; - wxBrush m_gripperBrush; - wxFont m_captionFont; - wxBitmap m_inactiveCloseBitmap; - wxBitmap m_inactivePinBitmap; - wxBitmap m_inactiveMaximizeBitmap; - wxBitmap m_inactiveRestoreBitmap; - wxBitmap m_activeCloseBitmap; - wxBitmap m_activePinBitmap; - wxBitmap m_activeMaximizeBitmap; - wxBitmap m_activeRestoreBitmap; - wxPen m_gripperPen1; - wxPen m_gripperPen2; - wxPen m_gripperPen3; - wxColour m_baseColour; - wxColour m_activeCaptionColour; - wxColour m_activeCaptionGradientColour; - wxColour m_activeCaptionTextColour; - wxColour m_inactiveCaptionColour; - wxColour m_inactiveCaptionGradientColour; - wxColour m_inactiveCaptionTextColour; - int m_borderSize; - int m_captionSize; - int m_sashSize; - int m_buttonSize; - int m_gripperSize; - int m_gradientType; -}; - - - -#endif // wxUSE_AUI -#endif //_WX_DOCKART_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/floatpane.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/floatpane.h deleted file mode 100644 index bf158933b8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/floatpane.h +++ /dev/null @@ -1,80 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/floatpane.h -// Purpose: wxaui: wx advanced user interface - docking window manager -// Author: Benjamin I. Williams -// Modified by: -// Created: 2005-05-17 -// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FLOATPANE_H_ -#define _WX_FLOATPANE_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" -#include "wx/weakref.h" - -#if wxUSE_AUI - -#if wxUSE_MINIFRAME - #include "wx/minifram.h" - #define wxAuiFloatingFrameBaseClass wxMiniFrame -#else - #include "wx/frame.h" - #define wxAuiFloatingFrameBaseClass wxFrame -#endif - -class WXDLLIMPEXP_AUI wxAuiFloatingFrame : public wxAuiFloatingFrameBaseClass -{ -public: - wxAuiFloatingFrame(wxWindow* parent, - wxAuiManager* ownerMgr, - const wxAuiPaneInfo& pane, - wxWindowID id = wxID_ANY, - long style = wxRESIZE_BORDER | wxSYSTEM_MENU | wxCAPTION | - wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT | - wxCLIP_CHILDREN - ); - virtual ~wxAuiFloatingFrame(); - void SetPaneWindow(const wxAuiPaneInfo& pane); - wxAuiManager* GetOwnerManager() const; - -protected: - virtual void OnMoveStart(); - virtual void OnMoving(const wxRect& windowRect, wxDirection dir); - virtual void OnMoveFinished(); - -private: - void OnSize(wxSizeEvent& event); - void OnClose(wxCloseEvent& event); - void OnMoveEvent(wxMoveEvent& event); - void OnIdle(wxIdleEvent& event); - void OnActivate(wxActivateEvent& event); - static bool isMouseDown(); - -private: - wxWindow* m_paneWindow; // pane window being managed - bool m_solidDrag; // true if system uses solid window drag - bool m_moving; - wxRect m_lastRect; - wxRect m_last2Rect; - wxRect m_last3Rect; - wxSize m_lastSize; - wxDirection m_lastDirection; - - wxWeakRef m_ownerMgr; - wxAuiManager m_mgr; - -#ifndef SWIG - DECLARE_EVENT_TABLE() - DECLARE_CLASS(wxAuiFloatingFrame) -#endif // SWIG -}; - -#endif // wxUSE_AUI -#endif //_WX_FLOATPANE_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/framemanager.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/framemanager.h deleted file mode 100644 index 4f6b4641b1..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/framemanager.h +++ /dev/null @@ -1,890 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/framemanager.h -// Purpose: wxaui: wx advanced user interface - docking window manager -// Author: Benjamin I. Williams -// Modified by: -// Created: 2005-05-17 -// Copyright: (C) Copyright 2005, Kirix Corporation, All Rights Reserved. -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FRAMEMANAGER_H_ -#define _WX_FRAMEMANAGER_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_AUI - -#include "wx/dynarray.h" -#include "wx/gdicmn.h" -#include "wx/window.h" -#include "wx/timer.h" -#include "wx/sizer.h" -#include "wx/bitmap.h" - -enum wxAuiManagerDock -{ - wxAUI_DOCK_NONE = 0, - wxAUI_DOCK_TOP = 1, - wxAUI_DOCK_RIGHT = 2, - wxAUI_DOCK_BOTTOM = 3, - wxAUI_DOCK_LEFT = 4, - wxAUI_DOCK_CENTER = 5, - wxAUI_DOCK_CENTRE = wxAUI_DOCK_CENTER -}; - -enum wxAuiManagerOption -{ - wxAUI_MGR_ALLOW_FLOATING = 1 << 0, - wxAUI_MGR_ALLOW_ACTIVE_PANE = 1 << 1, - wxAUI_MGR_TRANSPARENT_DRAG = 1 << 2, - wxAUI_MGR_TRANSPARENT_HINT = 1 << 3, - wxAUI_MGR_VENETIAN_BLINDS_HINT = 1 << 4, - wxAUI_MGR_RECTANGLE_HINT = 1 << 5, - wxAUI_MGR_HINT_FADE = 1 << 6, - wxAUI_MGR_NO_VENETIAN_BLINDS_FADE = 1 << 7, - wxAUI_MGR_LIVE_RESIZE = 1 << 8, - - wxAUI_MGR_DEFAULT = wxAUI_MGR_ALLOW_FLOATING | - wxAUI_MGR_TRANSPARENT_HINT | - wxAUI_MGR_HINT_FADE | - wxAUI_MGR_NO_VENETIAN_BLINDS_FADE -}; - - -enum wxAuiPaneDockArtSetting -{ - wxAUI_DOCKART_SASH_SIZE = 0, - wxAUI_DOCKART_CAPTION_SIZE = 1, - wxAUI_DOCKART_GRIPPER_SIZE = 2, - wxAUI_DOCKART_PANE_BORDER_SIZE = 3, - wxAUI_DOCKART_PANE_BUTTON_SIZE = 4, - wxAUI_DOCKART_BACKGROUND_COLOUR = 5, - wxAUI_DOCKART_SASH_COLOUR = 6, - wxAUI_DOCKART_ACTIVE_CAPTION_COLOUR = 7, - wxAUI_DOCKART_ACTIVE_CAPTION_GRADIENT_COLOUR = 8, - wxAUI_DOCKART_INACTIVE_CAPTION_COLOUR = 9, - wxAUI_DOCKART_INACTIVE_CAPTION_GRADIENT_COLOUR = 10, - wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR = 11, - wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR = 12, - wxAUI_DOCKART_BORDER_COLOUR = 13, - wxAUI_DOCKART_GRIPPER_COLOUR = 14, - wxAUI_DOCKART_CAPTION_FONT = 15, - wxAUI_DOCKART_GRADIENT_TYPE = 16 -}; - -enum wxAuiPaneDockArtGradients -{ - wxAUI_GRADIENT_NONE = 0, - wxAUI_GRADIENT_VERTICAL = 1, - wxAUI_GRADIENT_HORIZONTAL = 2 -}; - -enum wxAuiPaneButtonState -{ - wxAUI_BUTTON_STATE_NORMAL = 0, - wxAUI_BUTTON_STATE_HOVER = 1 << 1, - wxAUI_BUTTON_STATE_PRESSED = 1 << 2, - wxAUI_BUTTON_STATE_DISABLED = 1 << 3, - wxAUI_BUTTON_STATE_HIDDEN = 1 << 4, - wxAUI_BUTTON_STATE_CHECKED = 1 << 5 -}; - -enum wxAuiButtonId -{ - wxAUI_BUTTON_CLOSE = 101, - wxAUI_BUTTON_MAXIMIZE_RESTORE = 102, - wxAUI_BUTTON_MINIMIZE = 103, - wxAUI_BUTTON_PIN = 104, - wxAUI_BUTTON_OPTIONS = 105, - wxAUI_BUTTON_WINDOWLIST = 106, - wxAUI_BUTTON_LEFT = 107, - wxAUI_BUTTON_RIGHT = 108, - wxAUI_BUTTON_UP = 109, - wxAUI_BUTTON_DOWN = 110, - wxAUI_BUTTON_CUSTOM1 = 201, - wxAUI_BUTTON_CUSTOM2 = 202, - wxAUI_BUTTON_CUSTOM3 = 203 -}; - -enum wxAuiPaneInsertLevel -{ - wxAUI_INSERT_PANE = 0, - wxAUI_INSERT_ROW = 1, - wxAUI_INSERT_DOCK = 2 -}; - - - - -// forwards and array declarations -class wxAuiDockUIPart; -class wxAuiPaneButton; -class wxAuiPaneInfo; -class wxAuiDockInfo; -class wxAuiDockArt; -class wxAuiManagerEvent; - -#ifndef SWIG -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiDockInfo, wxAuiDockInfoArray, WXDLLIMPEXP_AUI); -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiDockUIPart, wxAuiDockUIPartArray, WXDLLIMPEXP_AUI); -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiPaneButton, wxAuiPaneButtonArray, WXDLLIMPEXP_AUI); -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiPaneInfo, wxAuiPaneInfoArray, WXDLLIMPEXP_AUI); -WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxAuiPaneInfo*, wxAuiPaneInfoPtrArray, class WXDLLIMPEXP_AUI); -WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxAuiDockInfo*, wxAuiDockInfoPtrArray, class WXDLLIMPEXP_AUI); -#endif // SWIG - -extern WXDLLIMPEXP_AUI wxAuiDockInfo wxAuiNullDockInfo; -extern WXDLLIMPEXP_AUI wxAuiPaneInfo wxAuiNullPaneInfo; - - - -class WXDLLIMPEXP_AUI wxAuiPaneInfo -{ -public: - - wxAuiPaneInfo() - { - window = NULL; - frame = NULL; - state = 0; - dock_direction = wxAUI_DOCK_LEFT; - dock_layer = 0; - dock_row = 0; - dock_pos = 0; - floating_pos = wxDefaultPosition; - floating_size = wxDefaultSize; - best_size = wxDefaultSize; - min_size = wxDefaultSize; - max_size = wxDefaultSize; - dock_proportion = 0; - - DefaultPane(); - } - - ~wxAuiPaneInfo() {} - -#ifndef SWIG - wxAuiPaneInfo(const wxAuiPaneInfo& c) - { - name = c.name; - caption = c.caption; - icon = c.icon; - window = c.window; - frame = c.frame; - state = c.state; - dock_direction = c.dock_direction; - dock_layer = c.dock_layer; - dock_row = c.dock_row; - dock_pos = c.dock_pos; - best_size = c.best_size; - min_size = c.min_size; - max_size = c.max_size; - floating_pos = c.floating_pos; - floating_size = c.floating_size; - dock_proportion = c.dock_proportion; - buttons = c.buttons; - rect = c.rect; - } - - wxAuiPaneInfo& operator=(const wxAuiPaneInfo& c) - { - name = c.name; - caption = c.caption; - window = c.window; - frame = c.frame; - state = c.state; - dock_direction = c.dock_direction; - dock_layer = c.dock_layer; - dock_row = c.dock_row; - dock_pos = c.dock_pos; - best_size = c.best_size; - min_size = c.min_size; - max_size = c.max_size; - floating_pos = c.floating_pos; - floating_size = c.floating_size; - dock_proportion = c.dock_proportion; - buttons = c.buttons; - rect = c.rect; - return *this; - } -#endif // SWIG - - // Write the safe parts of a newly loaded PaneInfo structure "source" into "this" - // used on loading perspectives etc. - void SafeSet(wxAuiPaneInfo source) - { - // note source is not passed by reference so we can overwrite, to keep the - // unsafe bits of "dest" - source.window = window; - source.frame = frame; - source.buttons = buttons; - wxCHECK_RET(source.IsValid(), - "window settings and pane settings are incompatible"); - // now assign - *this = source; - } - - bool IsOk() const { return window != NULL; } - bool IsFixed() const { return !HasFlag(optionResizable); } - bool IsResizable() const { return HasFlag(optionResizable); } - bool IsShown() const { return !HasFlag(optionHidden); } - bool IsFloating() const { return HasFlag(optionFloating); } - bool IsDocked() const { return !HasFlag(optionFloating); } - bool IsToolbar() const { return HasFlag(optionToolbar); } - bool IsTopDockable() const { return HasFlag(optionTopDockable); } - bool IsBottomDockable() const { return HasFlag(optionBottomDockable); } - bool IsLeftDockable() const { return HasFlag(optionLeftDockable); } - bool IsRightDockable() const { return HasFlag(optionRightDockable); } - bool IsDockable() const - { - return HasFlag(optionTopDockable | optionBottomDockable | - optionLeftDockable | optionRightDockable); - } - bool IsFloatable() const { return HasFlag(optionFloatable); } - bool IsMovable() const { return HasFlag(optionMovable); } - bool IsDestroyOnClose() const { return HasFlag(optionDestroyOnClose); } - bool IsMaximized() const { return HasFlag(optionMaximized); } - bool HasCaption() const { return HasFlag(optionCaption); } - bool HasGripper() const { return HasFlag(optionGripper); } - bool HasBorder() const { return HasFlag(optionPaneBorder); } - bool HasCloseButton() const { return HasFlag(buttonClose); } - bool HasMaximizeButton() const { return HasFlag(buttonMaximize); } - bool HasMinimizeButton() const { return HasFlag(buttonMinimize); } - bool HasPinButton() const { return HasFlag(buttonPin); } - bool HasGripperTop() const { return HasFlag(optionGripperTop); } - -#ifdef SWIG - %typemap(out) wxAuiPaneInfo& { $result = $self; Py_INCREF($result); } -#endif - wxAuiPaneInfo& Window(wxWindow* w) - { - wxAuiPaneInfo test(*this); - test.window = w; - wxCHECK_MSG(test.IsValid(), *this, - "window settings and pane settings are incompatible"); - *this = test; - return *this; - } - wxAuiPaneInfo& Name(const wxString& n) { name = n; return *this; } - wxAuiPaneInfo& Caption(const wxString& c) { caption = c; return *this; } - wxAuiPaneInfo& Icon(const wxBitmap& b) { icon = b; return *this; } - wxAuiPaneInfo& Left() { dock_direction = wxAUI_DOCK_LEFT; return *this; } - wxAuiPaneInfo& Right() { dock_direction = wxAUI_DOCK_RIGHT; return *this; } - wxAuiPaneInfo& Top() { dock_direction = wxAUI_DOCK_TOP; return *this; } - wxAuiPaneInfo& Bottom() { dock_direction = wxAUI_DOCK_BOTTOM; return *this; } - wxAuiPaneInfo& Center() { dock_direction = wxAUI_DOCK_CENTER; return *this; } - wxAuiPaneInfo& Centre() { dock_direction = wxAUI_DOCK_CENTRE; return *this; } - wxAuiPaneInfo& Direction(int direction) { dock_direction = direction; return *this; } - wxAuiPaneInfo& Layer(int layer) { dock_layer = layer; return *this; } - wxAuiPaneInfo& Row(int row) { dock_row = row; return *this; } - wxAuiPaneInfo& Position(int pos) { dock_pos = pos; return *this; } - wxAuiPaneInfo& BestSize(const wxSize& size) { best_size = size; return *this; } - wxAuiPaneInfo& MinSize(const wxSize& size) { min_size = size; return *this; } - wxAuiPaneInfo& MaxSize(const wxSize& size) { max_size = size; return *this; } - wxAuiPaneInfo& BestSize(int x, int y) { best_size.Set(x,y); return *this; } - wxAuiPaneInfo& MinSize(int x, int y) { min_size.Set(x,y); return *this; } - wxAuiPaneInfo& MaxSize(int x, int y) { max_size.Set(x,y); return *this; } - wxAuiPaneInfo& FloatingPosition(const wxPoint& pos) { floating_pos = pos; return *this; } - wxAuiPaneInfo& FloatingPosition(int x, int y) { floating_pos.x = x; floating_pos.y = y; return *this; } - wxAuiPaneInfo& FloatingSize(const wxSize& size) { floating_size = size; return *this; } - wxAuiPaneInfo& FloatingSize(int x, int y) { floating_size.Set(x,y); return *this; } - wxAuiPaneInfo& Fixed() { return SetFlag(optionResizable, false); } - wxAuiPaneInfo& Resizable(bool resizable = true) { return SetFlag(optionResizable, resizable); } - wxAuiPaneInfo& Dock() { return SetFlag(optionFloating, false); } - wxAuiPaneInfo& Float() { return SetFlag(optionFloating, true); } - wxAuiPaneInfo& Hide() { return SetFlag(optionHidden, true); } - wxAuiPaneInfo& Show(bool show = true) { return SetFlag(optionHidden, !show); } - wxAuiPaneInfo& CaptionVisible(bool visible = true) { return SetFlag(optionCaption, visible); } - wxAuiPaneInfo& Maximize() { return SetFlag(optionMaximized, true); } - wxAuiPaneInfo& Restore() { return SetFlag(optionMaximized, false); } - wxAuiPaneInfo& PaneBorder(bool visible = true) { return SetFlag(optionPaneBorder, visible); } - wxAuiPaneInfo& Gripper(bool visible = true) { return SetFlag(optionGripper, visible); } - wxAuiPaneInfo& GripperTop(bool attop = true) { return SetFlag(optionGripperTop, attop); } - wxAuiPaneInfo& CloseButton(bool visible = true) { return SetFlag(buttonClose, visible); } - wxAuiPaneInfo& MaximizeButton(bool visible = true) { return SetFlag(buttonMaximize, visible); } - wxAuiPaneInfo& MinimizeButton(bool visible = true) { return SetFlag(buttonMinimize, visible); } - wxAuiPaneInfo& PinButton(bool visible = true) { return SetFlag(buttonPin, visible); } - wxAuiPaneInfo& DestroyOnClose(bool b = true) { return SetFlag(optionDestroyOnClose, b); } - wxAuiPaneInfo& TopDockable(bool b = true) { return SetFlag(optionTopDockable, b); } - wxAuiPaneInfo& BottomDockable(bool b = true) { return SetFlag(optionBottomDockable, b); } - wxAuiPaneInfo& LeftDockable(bool b = true) { return SetFlag(optionLeftDockable, b); } - wxAuiPaneInfo& RightDockable(bool b = true) { return SetFlag(optionRightDockable, b); } - wxAuiPaneInfo& Floatable(bool b = true) { return SetFlag(optionFloatable, b); } - wxAuiPaneInfo& Movable(bool b = true) { return SetFlag(optionMovable, b); } - wxAuiPaneInfo& DockFixed(bool b = true) { return SetFlag(optionDockFixed, b); } - - wxAuiPaneInfo& Dockable(bool b = true) - { - return TopDockable(b).BottomDockable(b).LeftDockable(b).RightDockable(b); - } - - wxAuiPaneInfo& DefaultPane() - { - wxAuiPaneInfo test(*this); - test.state |= optionTopDockable | optionBottomDockable | - optionLeftDockable | optionRightDockable | - optionFloatable | optionMovable | optionResizable | - optionCaption | optionPaneBorder | buttonClose; - wxCHECK_MSG(test.IsValid(), *this, - "window settings and pane settings are incompatible"); - *this = test; - return *this; - } - - wxAuiPaneInfo& CentrePane() { return CenterPane(); } - wxAuiPaneInfo& CenterPane() - { - state = 0; - return Center().PaneBorder().Resizable(); - } - - wxAuiPaneInfo& ToolbarPane() - { - DefaultPane(); - state |= (optionToolbar | optionGripper); - state &= ~(optionResizable | optionCaption); - if (dock_layer == 0) - dock_layer = 10; - return *this; - } - - wxAuiPaneInfo& SetFlag(int flag, bool option_state) - { - wxAuiPaneInfo test(*this); - if (option_state) - test.state |= flag; - else - test.state &= ~flag; - wxCHECK_MSG(test.IsValid(), *this, - "window settings and pane settings are incompatible"); - *this = test; - return *this; - } - - bool HasFlag(int flag) const - { - return (state & flag) != 0; - } - -#ifdef SWIG - %typemap(out) wxAuiPaneInfo& ; -#endif - -public: - - // NOTE: You can add and subtract flags from this list, - // but do not change the values of the flags, because - // they are stored in a binary integer format in the - // perspective string. If you really need to change the - // values around, you'll have to ensure backwards-compatibility - // in the perspective loading code. - enum wxAuiPaneState - { - optionFloating = 1 << 0, - optionHidden = 1 << 1, - optionLeftDockable = 1 << 2, - optionRightDockable = 1 << 3, - optionTopDockable = 1 << 4, - optionBottomDockable = 1 << 5, - optionFloatable = 1 << 6, - optionMovable = 1 << 7, - optionResizable = 1 << 8, - optionPaneBorder = 1 << 9, - optionCaption = 1 << 10, - optionGripper = 1 << 11, - optionDestroyOnClose = 1 << 12, - optionToolbar = 1 << 13, - optionActive = 1 << 14, - optionGripperTop = 1 << 15, - optionMaximized = 1 << 16, - optionDockFixed = 1 << 17, - - buttonClose = 1 << 21, - buttonMaximize = 1 << 22, - buttonMinimize = 1 << 23, - buttonPin = 1 << 24, - - buttonCustom1 = 1 << 26, - buttonCustom2 = 1 << 27, - buttonCustom3 = 1 << 28, - - savedHiddenState = 1 << 30, // used internally - actionPane = 1 << 31 // used internally - }; - -public: - wxString name; // name of the pane - wxString caption; // caption displayed on the window - wxBitmap icon; // icon of the pane, may be invalid - - wxWindow* window; // window that is in this pane - wxFrame* frame; // floating frame window that holds the pane - unsigned int state; // a combination of wxPaneState values - - int dock_direction; // dock direction (top, bottom, left, right, center) - int dock_layer; // layer number (0 = innermost layer) - int dock_row; // row number on the docking bar (0 = first row) - int dock_pos; // position inside the row (0 = first position) - - wxSize best_size; // size that the layout engine will prefer - wxSize min_size; // minimum size the pane window can tolerate - wxSize max_size; // maximum size the pane window can tolerate - - wxPoint floating_pos; // position while floating - wxSize floating_size; // size while floating - int dock_proportion; // proportion while docked - - wxAuiPaneButtonArray buttons; // buttons on the pane - - - wxRect rect; // current rectangle (populated by wxAUI) - - bool IsValid() const; -}; - - - -class WXDLLIMPEXP_FWD_AUI wxAuiFloatingFrame; - -class WXDLLIMPEXP_AUI wxAuiManager : public wxEvtHandler -{ - friend class wxAuiFloatingFrame; - -public: - - wxAuiManager(wxWindow* managedWnd = NULL, - unsigned int flags = wxAUI_MGR_DEFAULT); - virtual ~wxAuiManager(); - void UnInit(); - - void SetFlags(unsigned int flags); - unsigned int GetFlags() const; - - void SetManagedWindow(wxWindow* managedWnd); - wxWindow* GetManagedWindow() const; - - static wxAuiManager* GetManager(wxWindow* window); - - void SetArtProvider(wxAuiDockArt* artProvider); - wxAuiDockArt* GetArtProvider() const; - - wxAuiPaneInfo& GetPane(wxWindow* window); - wxAuiPaneInfo& GetPane(const wxString& name); - wxAuiPaneInfoArray& GetAllPanes(); - - bool AddPane(wxWindow* window, - const wxAuiPaneInfo& paneInfo); - - bool AddPane(wxWindow* window, - const wxAuiPaneInfo& paneInfo, - const wxPoint& dropPos); - - bool AddPane(wxWindow* window, - int direction = wxLEFT, - const wxString& caption = wxEmptyString); - - bool InsertPane(wxWindow* window, - const wxAuiPaneInfo& insertLocation, - int insertLevel = wxAUI_INSERT_PANE); - - bool DetachPane(wxWindow* window); - - void Update(); - - wxString SavePaneInfo(wxAuiPaneInfo& pane); - void LoadPaneInfo(wxString panePart, wxAuiPaneInfo &pane); - wxString SavePerspective(); - bool LoadPerspective(const wxString& perspective, bool update = true); - - void SetDockSizeConstraint(double widthPct, double heightPct); - void GetDockSizeConstraint(double* widthPct, double* heightPct) const; - - void ClosePane(wxAuiPaneInfo& paneInfo); - void MaximizePane(wxAuiPaneInfo& paneInfo); - void RestorePane(wxAuiPaneInfo& paneInfo); - void RestoreMaximizedPane(); - -public: - - virtual wxAuiFloatingFrame* CreateFloatingFrame(wxWindow* parent, const wxAuiPaneInfo& p); - virtual bool CanDockPanel(const wxAuiPaneInfo & p); - - void StartPaneDrag( - wxWindow* paneWindow, - const wxPoint& offset); - - wxRect CalculateHintRect( - wxWindow* paneWindow, - const wxPoint& pt, - const wxPoint& offset); - - void DrawHintRect( - wxWindow* paneWindow, - const wxPoint& pt, - const wxPoint& offset); - - virtual void ShowHint(const wxRect& rect); - virtual void HideHint(); - - void OnHintActivate(wxActivateEvent& event); - -public: - - // deprecated -- please use SetManagedWindow() and - // and GetManagedWindow() instead - - wxDEPRECATED( void SetFrame(wxFrame* frame) ); - wxDEPRECATED( wxFrame* GetFrame() const ); - -protected: - - void UpdateHintWindowConfig(); - - void DoFrameLayout(); - - void LayoutAddPane(wxSizer* container, - wxAuiDockInfo& dock, - wxAuiPaneInfo& pane, - wxAuiDockUIPartArray& uiparts, - bool spacerOnly); - - void LayoutAddDock(wxSizer* container, - wxAuiDockInfo& dock, - wxAuiDockUIPartArray& uiParts, - bool spacerOnly); - - wxSizer* LayoutAll(wxAuiPaneInfoArray& panes, - wxAuiDockInfoArray& docks, - wxAuiDockUIPartArray & uiParts, - bool spacerOnly = false); - - virtual bool ProcessDockResult(wxAuiPaneInfo& target, - const wxAuiPaneInfo& newPos); - - bool DoDrop(wxAuiDockInfoArray& docks, - wxAuiPaneInfoArray& panes, - wxAuiPaneInfo& drop, - const wxPoint& pt, - const wxPoint& actionOffset = wxPoint(0,0)); - - wxAuiDockUIPart* HitTest(int x, int y); - wxAuiDockUIPart* GetPanePart(wxWindow* pane); - int GetDockPixelOffset(wxAuiPaneInfo& test); - void OnFloatingPaneMoveStart(wxWindow* window); - void OnFloatingPaneMoving(wxWindow* window, wxDirection dir ); - void OnFloatingPaneMoved(wxWindow* window, wxDirection dir); - void OnFloatingPaneActivated(wxWindow* window); - void OnFloatingPaneClosed(wxWindow* window, wxCloseEvent& evt); - void OnFloatingPaneResized(wxWindow* window, const wxRect& rect); - void Render(wxDC* dc); - void Repaint(wxDC* dc = NULL); - void ProcessMgrEvent(wxAuiManagerEvent& event); - void UpdateButtonOnScreen(wxAuiDockUIPart* buttonUiPart, - const wxMouseEvent& event); - void GetPanePositionsAndSizes(wxAuiDockInfo& dock, - wxArrayInt& positions, - wxArrayInt& sizes); - - /// Ends a resize action, or for live update, resizes the sash - bool DoEndResizeAction(wxMouseEvent& event); - - void SetActivePane(wxWindow* active_pane); - -public: - - // public events (which can be invoked externally) - void OnRender(wxAuiManagerEvent& evt); - void OnPaneButton(wxAuiManagerEvent& evt); - -protected: - - // protected events - void OnPaint(wxPaintEvent& evt); - void OnEraseBackground(wxEraseEvent& evt); - void OnSize(wxSizeEvent& evt); - void OnSetCursor(wxSetCursorEvent& evt); - void OnLeftDown(wxMouseEvent& evt); - void OnLeftUp(wxMouseEvent& evt); - void OnMotion(wxMouseEvent& evt); - void OnCaptureLost(wxMouseCaptureLostEvent& evt); - void OnLeaveWindow(wxMouseEvent& evt); - void OnChildFocus(wxChildFocusEvent& evt); - void OnHintFadeTimer(wxTimerEvent& evt); - void OnFindManager(wxAuiManagerEvent& evt); - -protected: - - enum - { - actionNone = 0, - actionResize, - actionClickButton, - actionClickCaption, - actionDragToolbarPane, - actionDragFloatingPane - }; - -protected: - - wxWindow* m_frame; // the window being managed - wxAuiDockArt* m_art; // dock art object which does all drawing - unsigned int m_flags; // manager flags wxAUI_MGR_* - - wxAuiPaneInfoArray m_panes; // array of panes structures - wxAuiDockInfoArray m_docks; // array of docks structures - wxAuiDockUIPartArray m_uiParts; // array of UI parts (captions, buttons, etc) - - int m_action; // current mouse action - wxPoint m_actionStart; // position where the action click started - wxPoint m_actionOffset; // offset from upper left of the item clicked - wxAuiDockUIPart* m_actionPart; // ptr to the part the action happened to - wxWindow* m_actionWindow; // action frame or window (NULL if none) - wxRect m_actionHintRect; // hint rectangle for the action - wxRect m_lastRect; - wxAuiDockUIPart* m_hoverButton;// button uipart being hovered over - wxRect m_lastHint; // last hint rectangle - wxPoint m_lastMouseMove; // last mouse move position (see OnMotion) - int m_currentDragItem; - bool m_skipping; - bool m_hasMaximized; - - double m_dockConstraintX; // 0.0 .. 1.0; max pct of window width a dock can consume - double m_dockConstraintY; // 0.0 .. 1.0; max pct of window height a dock can consume - - wxFrame* m_hintWnd; // transparent hint window, if supported by platform - wxTimer m_hintFadeTimer; // transparent fade timer - wxByte m_hintFadeAmt; // transparent fade amount - wxByte m_hintFadeMax; // maximum value of hint fade - - void* m_reserved; - -#ifndef SWIG - DECLARE_EVENT_TABLE() - DECLARE_CLASS(wxAuiManager) -#endif // SWIG -}; - - - -// event declarations/classes - -class WXDLLIMPEXP_AUI wxAuiManagerEvent : public wxEvent -{ -public: - wxAuiManagerEvent(wxEventType type=wxEVT_NULL) : wxEvent(0, type) - { - manager = NULL; - pane = NULL; - button = 0; - veto_flag = false; - canveto_flag = true; - dc = NULL; - } -#ifndef SWIG - wxAuiManagerEvent(const wxAuiManagerEvent& c) : wxEvent(c) - { - manager = c.manager; - pane = c.pane; - button = c.button; - veto_flag = c.veto_flag; - canveto_flag = c.canveto_flag; - dc = c.dc; - } -#endif - wxEvent *Clone() const { return new wxAuiManagerEvent(*this); } - - void SetManager(wxAuiManager* mgr) { manager = mgr; } - void SetPane(wxAuiPaneInfo* p) { pane = p; } - void SetButton(int b) { button = b; } - void SetDC(wxDC* pdc) { dc = pdc; } - - wxAuiManager* GetManager() const { return manager; } - wxAuiPaneInfo* GetPane() const { return pane; } - int GetButton() const { return button; } - wxDC* GetDC() const { return dc; } - - void Veto(bool veto = true) { veto_flag = veto; } - bool GetVeto() const { return veto_flag; } - void SetCanVeto(bool can_veto) { canveto_flag = can_veto; } - bool CanVeto() const { return canveto_flag && veto_flag; } - -public: - wxAuiManager* manager; - wxAuiPaneInfo* pane; - int button; - bool veto_flag; - bool canveto_flag; - wxDC* dc; - -#ifndef SWIG -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxAuiManagerEvent) -#endif -}; - - -class WXDLLIMPEXP_AUI wxAuiDockInfo -{ -public: - wxAuiDockInfo() - { - dock_direction = 0; - dock_layer = 0; - dock_row = 0; - size = 0; - min_size = 0; - resizable = true; - fixed = false; - toolbar = false; - reserved1 = false; - } - -#ifndef SWIG - wxAuiDockInfo(const wxAuiDockInfo& c) - { - dock_direction = c.dock_direction; - dock_layer = c.dock_layer; - dock_row = c.dock_row; - size = c.size; - min_size = c.min_size; - resizable = c.resizable; - fixed = c.fixed; - toolbar = c.toolbar; - panes = c.panes; - rect = c.rect; - reserved1 = c.reserved1; - } - - wxAuiDockInfo& operator=(const wxAuiDockInfo& c) - { - dock_direction = c.dock_direction; - dock_layer = c.dock_layer; - dock_row = c.dock_row; - size = c.size; - min_size = c.min_size; - resizable = c.resizable; - fixed = c.fixed; - toolbar = c.toolbar; - panes = c.panes; - rect = c.rect; - reserved1 = c.reserved1; - return *this; - } -#endif // SWIG - - bool IsOk() const { return dock_direction != 0; } - bool IsHorizontal() const { return dock_direction == wxAUI_DOCK_TOP || - dock_direction == wxAUI_DOCK_BOTTOM; } - bool IsVertical() const { return dock_direction == wxAUI_DOCK_LEFT || - dock_direction == wxAUI_DOCK_RIGHT || - dock_direction == wxAUI_DOCK_CENTER; } -public: - wxAuiPaneInfoPtrArray panes; // array of panes - wxRect rect; // current rectangle - int dock_direction; // dock direction (top, bottom, left, right, center) - int dock_layer; // layer number (0 = innermost layer) - int dock_row; // row number on the docking bar (0 = first row) - int size; // size of the dock - int min_size; // minimum size of a dock (0 if there is no min) - bool resizable; // flag indicating whether the dock is resizable - bool toolbar; // flag indicating dock contains only toolbars - bool fixed; // flag indicating that the dock operates on - // absolute coordinates as opposed to proportional - bool reserved1; -}; - - -class WXDLLIMPEXP_AUI wxAuiDockUIPart -{ -public: - enum - { - typeCaption, - typeGripper, - typeDock, - typeDockSizer, - typePane, - typePaneSizer, - typeBackground, - typePaneBorder, - typePaneButton - }; - - int type; // ui part type (see enum above) - int orientation; // orientation (either wxHORIZONTAL or wxVERTICAL) - wxAuiDockInfo* dock; // which dock the item is associated with - wxAuiPaneInfo* pane; // which pane the item is associated with - wxAuiPaneButton* button; // which pane button the item is associated with - wxSizer* cont_sizer; // the part's containing sizer - wxSizerItem* sizer_item; // the sizer item of the part - wxRect rect; // client coord rectangle of the part itself -}; - - -class WXDLLIMPEXP_AUI wxAuiPaneButton -{ -public: - int button_id; // id of the button (e.g. buttonClose) -}; - - - -#ifndef SWIG - -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_BUTTON, wxAuiManagerEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_CLOSE, wxAuiManagerEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_MAXIMIZE, wxAuiManagerEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_RESTORE, wxAuiManagerEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_PANE_ACTIVATED, wxAuiManagerEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_RENDER, wxAuiManagerEvent ); -wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_AUI, wxEVT_AUI_FIND_MANAGER, wxAuiManagerEvent ); - -typedef void (wxEvtHandler::*wxAuiManagerEventFunction)(wxAuiManagerEvent&); - -#define wxAuiManagerEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxAuiManagerEventFunction, func) - -#define EVT_AUI_PANE_BUTTON(func) \ - wx__DECLARE_EVT0(wxEVT_AUI_PANE_BUTTON, wxAuiManagerEventHandler(func)) -#define EVT_AUI_PANE_CLOSE(func) \ - wx__DECLARE_EVT0(wxEVT_AUI_PANE_CLOSE, wxAuiManagerEventHandler(func)) -#define EVT_AUI_PANE_MAXIMIZE(func) \ - wx__DECLARE_EVT0(wxEVT_AUI_PANE_MAXIMIZE, wxAuiManagerEventHandler(func)) -#define EVT_AUI_PANE_RESTORE(func) \ - wx__DECLARE_EVT0(wxEVT_AUI_PANE_RESTORE, wxAuiManagerEventHandler(func)) -#define EVT_AUI_PANE_ACTIVATED(func) \ - wx__DECLARE_EVT0(wxEVT_AUI_PANE_ACTIVATED, wxAuiManagerEventHandler(func)) -#define EVT_AUI_RENDER(func) \ - wx__DECLARE_EVT0(wxEVT_AUI_RENDER, wxAuiManagerEventHandler(func)) -#define EVT_AUI_FIND_MANAGER(func) \ - wx__DECLARE_EVT0(wxEVT_AUI_FIND_MANAGER, wxAuiManagerEventHandler(func)) - -#else - -%constant wxEventType wxEVT_AUI_PANE_BUTTON; -%constant wxEventType wxEVT_AUI_PANE_CLOSE; -%constant wxEventType wxEVT_AUI_PANE_MAXIMIZE; -%constant wxEventType wxEVT_AUI_PANE_RESTORE; -%constant wxEventType wxEVT_AUI_PANE_ACTIVATED; -%constant wxEventType wxEVT_AUI_RENDER; -%constant wxEventType wxEVT_AUI_FIND_MANAGER; - -%pythoncode { - EVT_AUI_PANE_BUTTON = wx.PyEventBinder( wxEVT_AUI_PANE_BUTTON ) - EVT_AUI_PANE_CLOSE = wx.PyEventBinder( wxEVT_AUI_PANE_CLOSE ) - EVT_AUI_PANE_MAXIMIZE = wx.PyEventBinder( wxEVT_AUI_PANE_MAXIMIZE ) - EVT_AUI_PANE_RESTORE = wx.PyEventBinder( wxEVT_AUI_PANE_RESTORE ) - EVT_AUI_PANE_ACTIVATED = wx.PyEventBinder( wxEVT_AUI_PANE_ACTIVATED ) - EVT_AUI_RENDER = wx.PyEventBinder( wxEVT_AUI_RENDER ) - EVT_AUI_FIND_MANAGER = wx.PyEventBinder( wxEVT_AUI_FIND_MANAGER ) -} -#endif // SWIG - -#endif // wxUSE_AUI -#endif //_WX_FRAMEMANAGER_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/tabart.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/tabart.h deleted file mode 100644 index 3de076c9e3..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/tabart.h +++ /dev/null @@ -1,324 +0,0 @@ -////////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/tabart.h -// Purpose: wxaui: wx advanced user interface - notebook -// Author: Benjamin I. Williams -// Modified by: Jens Lody (extracted from wx/aui/auibook.h) -// Created: 2012-03-21 -// Copyright: (C) Copyright 2006, Kirix Corporation, All Rights Reserved. -// Licence: wxWindows Library Licence, Version 3.1 -/////////////////////////////////////////////////////////////////////////////// - - -#ifndef _WX_AUI_TABART_H_ -#define _WX_AUI_TABART_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_AUI - -#include "wx/colour.h" -#include "wx/gdicmn.h" -#include "wx/font.h" -#include "wx/pen.h" -#include "wx/brush.h" -#include "wx/bitmap.h" - - -class wxAuiNotebookPage; -class wxAuiNotebookPageArray; -class wxWindow; -class wxDC; - - -// tab art class - -class WXDLLIMPEXP_AUI wxAuiTabArt -{ -public: - - wxAuiTabArt() { } - virtual ~wxAuiTabArt() { } - - virtual wxAuiTabArt* Clone() = 0; - virtual void SetFlags(unsigned int flags) = 0; - - virtual void SetSizingInfo(const wxSize& tabCtrlSize, - size_t tabCount) = 0; - - virtual void SetNormalFont(const wxFont& font) = 0; - virtual void SetSelectedFont(const wxFont& font) = 0; - virtual void SetMeasuringFont(const wxFont& font) = 0; - virtual void SetColour(const wxColour& colour) = 0; - virtual void SetActiveColour(const wxColour& colour) = 0; - - virtual void DrawBorder( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) = 0; - - virtual void DrawBackground( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect) = 0; - - virtual void DrawTab(wxDC& dc, - wxWindow* wnd, - const wxAuiNotebookPage& pane, - const wxRect& inRect, - int closeButtonState, - wxRect* outTabRect, - wxRect* outButtonRect, - int* xExtent) = 0; - - virtual void DrawButton( - wxDC& dc, - wxWindow* wnd, - const wxRect& inRect, - int bitmapId, - int buttonState, - int orientation, - wxRect* outRect) = 0; - - virtual wxSize GetTabSize( - wxDC& dc, - wxWindow* wnd, - const wxString& caption, - const wxBitmap& bitmap, - bool active, - int closeButtonState, - int* xExtent) = 0; - - virtual int ShowDropDown( - wxWindow* wnd, - const wxAuiNotebookPageArray& items, - int activeIdx) = 0; - - virtual int GetIndentSize() = 0; - - virtual int GetBorderWidth( - wxWindow* wnd) = 0; - - virtual int GetAdditionalBorderSpace( - wxWindow* wnd) = 0; - - virtual int GetBestTabCtrlSize( - wxWindow* wnd, - const wxAuiNotebookPageArray& pages, - const wxSize& requiredBmpSize) = 0; -}; - - -class WXDLLIMPEXP_AUI wxAuiGenericTabArt : public wxAuiTabArt -{ - -public: - - wxAuiGenericTabArt(); - virtual ~wxAuiGenericTabArt(); - - wxAuiTabArt* Clone(); - void SetFlags(unsigned int flags); - void SetSizingInfo(const wxSize& tabCtrlSize, - size_t tabCount); - - void SetNormalFont(const wxFont& font); - void SetSelectedFont(const wxFont& font); - void SetMeasuringFont(const wxFont& font); - void SetColour(const wxColour& colour); - void SetActiveColour(const wxColour& colour); - - void DrawBorder( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect); - - void DrawBackground( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect); - - void DrawTab(wxDC& dc, - wxWindow* wnd, - const wxAuiNotebookPage& pane, - const wxRect& inRect, - int closeButtonState, - wxRect* outTabRect, - wxRect* outButtonRect, - int* xExtent); - - void DrawButton( - wxDC& dc, - wxWindow* wnd, - const wxRect& inRect, - int bitmapId, - int buttonState, - int orientation, - wxRect* outRect); - - int GetIndentSize(); - - int GetBorderWidth( - wxWindow* wnd); - - int GetAdditionalBorderSpace( - wxWindow* wnd); - - wxSize GetTabSize( - wxDC& dc, - wxWindow* wnd, - const wxString& caption, - const wxBitmap& bitmap, - bool active, - int closeButtonState, - int* xExtent); - - int ShowDropDown( - wxWindow* wnd, - const wxAuiNotebookPageArray& items, - int activeIdx); - - int GetBestTabCtrlSize(wxWindow* wnd, - const wxAuiNotebookPageArray& pages, - const wxSize& requiredBmpSize); - -protected: - - wxFont m_normalFont; - wxFont m_selectedFont; - wxFont m_measuringFont; - wxColour m_baseColour; - wxPen m_baseColourPen; - wxPen m_borderPen; - wxBrush m_baseColourBrush; - wxColour m_activeColour; - wxBitmap m_activeCloseBmp; - wxBitmap m_disabledCloseBmp; - wxBitmap m_activeLeftBmp; - wxBitmap m_disabledLeftBmp; - wxBitmap m_activeRightBmp; - wxBitmap m_disabledRightBmp; - wxBitmap m_activeWindowListBmp; - wxBitmap m_disabledWindowListBmp; - - int m_fixedTabWidth; - int m_tabCtrlHeight; - unsigned int m_flags; -}; - - -class WXDLLIMPEXP_AUI wxAuiSimpleTabArt : public wxAuiTabArt -{ - -public: - - wxAuiSimpleTabArt(); - virtual ~wxAuiSimpleTabArt(); - - wxAuiTabArt* Clone(); - void SetFlags(unsigned int flags); - - void SetSizingInfo(const wxSize& tabCtrlSize, - size_t tabCount); - - void SetNormalFont(const wxFont& font); - void SetSelectedFont(const wxFont& font); - void SetMeasuringFont(const wxFont& font); - void SetColour(const wxColour& colour); - void SetActiveColour(const wxColour& colour); - - void DrawBorder( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect); - - void DrawBackground( - wxDC& dc, - wxWindow* wnd, - const wxRect& rect); - - void DrawTab(wxDC& dc, - wxWindow* wnd, - const wxAuiNotebookPage& pane, - const wxRect& inRect, - int closeButtonState, - wxRect* outTabRect, - wxRect* outButtonRect, - int* xExtent); - - void DrawButton( - wxDC& dc, - wxWindow* wnd, - const wxRect& inRect, - int bitmapId, - int buttonState, - int orientation, - wxRect* outRect); - - int GetIndentSize(); - - int GetBorderWidth( - wxWindow* wnd); - - int GetAdditionalBorderSpace( - wxWindow* wnd); - - wxSize GetTabSize( - wxDC& dc, - wxWindow* wnd, - const wxString& caption, - const wxBitmap& bitmap, - bool active, - int closeButtonState, - int* xExtent); - - int ShowDropDown( - wxWindow* wnd, - const wxAuiNotebookPageArray& items, - int activeIdx); - - int GetBestTabCtrlSize(wxWindow* wnd, - const wxAuiNotebookPageArray& pages, - const wxSize& requiredBmpSize); - -protected: - - wxFont m_normalFont; - wxFont m_selectedFont; - wxFont m_measuringFont; - wxPen m_normalBkPen; - wxPen m_selectedBkPen; - wxBrush m_normalBkBrush; - wxBrush m_selectedBkBrush; - wxBrush m_bkBrush; - wxBitmap m_activeCloseBmp; - wxBitmap m_disabledCloseBmp; - wxBitmap m_activeLeftBmp; - wxBitmap m_disabledLeftBmp; - wxBitmap m_activeRightBmp; - wxBitmap m_disabledRightBmp; - wxBitmap m_activeWindowListBmp; - wxBitmap m_disabledWindowListBmp; - - int m_fixedTabWidth; - unsigned int m_flags; -}; - -#ifndef __WXUNIVERSAL__ - #if defined(__WXGTK20__) && !defined(__WXGTK3__) - #define wxHAS_NATIVE_TABART - #include "wx/aui/tabartgtk.h" - #define wxAuiDefaultTabArt wxAuiGtkTabArt - #endif -#endif // !__WXUNIVERSAL__ - -#ifndef wxHAS_NATIVE_TABART - #define wxAuiDefaultTabArt wxAuiGenericTabArt -#endif - -#endif // wxUSE_AUI - -#endif // _WX_AUI_TABART_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/tabartgtk.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/tabartgtk.h deleted file mode 100644 index 85fe9e2a50..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/tabartgtk.h +++ /dev/null @@ -1,58 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/aui/tabartgtk.h -// Purpose: declaration of the wxAuiGTKTabArt -// Author: Jens Lody and Teodor Petrov -// Modified by: -// Created: 2012-03-23 -// Copyright: (c) 2012 Jens Lody -// and Teodor Petrov -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_AUI_TABARTGTK_H_ -#define _WX_AUI_TABARTGTK_H_ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/defs.h" - -#if wxUSE_AUI - -#include "wx/aui/tabart.h" -#include "wx/gdicmn.h" - -class wxWindow; -class wxDC; - -class WXDLLIMPEXP_AUI wxAuiGtkTabArt : public wxAuiGenericTabArt -{ -public: - wxAuiGtkTabArt(); - - virtual wxAuiTabArt* Clone(); - virtual void DrawBorder(wxDC& dc, wxWindow* wnd, const wxRect& rect); - virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect); - virtual void DrawTab(wxDC& dc, - wxWindow* wnd, - const wxAuiNotebookPage& page, - const wxRect& in_rect, - int close_button_state, - wxRect* out_tab_rect, - wxRect* out_button_rect, - int* x_extent); - void DrawButton(wxDC& dc, wxWindow* wnd, const wxRect& in_rect, int bitmap_id, - int button_state, int orientation, wxRect* out_rect); - int GetBestTabCtrlSize(wxWindow* wnd, const wxAuiNotebookPageArray& pages, - const wxSize& required_bmp_size); - int GetBorderWidth(wxWindow* wnd); - int GetAdditionalBorderSpace(wxWindow* wnd); - virtual wxSize GetTabSize(wxDC& dc, wxWindow* wnd, const wxString& caption, - const wxBitmap& bitmap, bool active, - int close_button_state, int* x_extent); -}; - -#endif // wxUSE_AUI - -#endif // _WX_AUI_TABARTGTK_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/tabmdi.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/tabmdi.h deleted file mode 100644 index 8750831747..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/aui/tabmdi.h +++ /dev/null @@ -1,270 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/aui/tabmdi.h -// Purpose: Generic MDI (Multiple Document Interface) classes -// Author: Hans Van Leemputten -// Modified by: Benjamin I. Williams / Kirix Corporation -// Created: 29/07/2002 -// Copyright: (c) Hans Van Leemputten -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_AUITABMDI_H_ -#define _WX_AUITABMDI_H_ - -#if wxUSE_AUI - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- - -#include "wx/frame.h" -#include "wx/panel.h" -#include "wx/notebook.h" -#include "wx/icon.h" -#include "wx/aui/auibook.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_AUI wxAuiMDIParentFrame; -class WXDLLIMPEXP_FWD_AUI wxAuiMDIClientWindow; -class WXDLLIMPEXP_FWD_AUI wxAuiMDIChildFrame; - -//----------------------------------------------------------------------------- -// wxAuiMDIParentFrame -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_AUI wxAuiMDIParentFrame : public wxFrame -{ -public: - wxAuiMDIParentFrame(); - wxAuiMDIParentFrame(wxWindow *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr); - - ~wxAuiMDIParentFrame(); - - bool Create(wxWindow *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr ); - - void SetArtProvider(wxAuiTabArt* provider); - wxAuiTabArt* GetArtProvider(); - wxAuiNotebook* GetNotebook() const; - -#if wxUSE_MENUS - wxMenu* GetWindowMenu() const { return m_pWindowMenu; } - void SetWindowMenu(wxMenu* pMenu); - - virtual void SetMenuBar(wxMenuBar *pMenuBar); -#endif // wxUSE_MENUS - - void SetChildMenuBar(wxAuiMDIChildFrame *pChild); - - wxAuiMDIChildFrame *GetActiveChild() const; - void SetActiveChild(wxAuiMDIChildFrame* pChildFrame); - - wxAuiMDIClientWindow *GetClientWindow() const; - virtual wxAuiMDIClientWindow *OnCreateClient(); - - virtual void Cascade() { /* Has no effect */ } - virtual void Tile(wxOrientation orient = wxHORIZONTAL); - virtual void ArrangeIcons() { /* Has no effect */ } - virtual void ActivateNext(); - virtual void ActivatePrevious(); - -protected: - wxAuiMDIClientWindow* m_pClientWindow; - wxEvent* m_pLastEvt; - -#if wxUSE_MENUS - wxMenu *m_pWindowMenu; - wxMenuBar *m_pMyMenuBar; -#endif // wxUSE_MENUS - -protected: - void Init(); - -#if wxUSE_MENUS - void RemoveWindowMenu(wxMenuBar *pMenuBar); - void AddWindowMenu(wxMenuBar *pMenuBar); - - void DoHandleMenu(wxCommandEvent &event); - void DoHandleUpdateUI(wxUpdateUIEvent &event); -#endif // wxUSE_MENUS - - virtual bool ProcessEvent(wxEvent& event); - - virtual void DoGetClientSize(int *width, int *height) const; - -private: - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxAuiMDIParentFrame) -}; - -//----------------------------------------------------------------------------- -// wxAuiMDIChildFrame -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_AUI wxAuiMDIChildFrame : public wxPanel -{ -public: - wxAuiMDIChildFrame(); - wxAuiMDIChildFrame(wxAuiMDIParentFrame *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - virtual ~wxAuiMDIChildFrame(); - bool Create(wxAuiMDIParentFrame *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - -#if wxUSE_MENUS - virtual void SetMenuBar(wxMenuBar *menuBar); - virtual wxMenuBar *GetMenuBar() const; -#endif // wxUSE_MENUS - - virtual void SetTitle(const wxString& title); - virtual wxString GetTitle() const; - - virtual void SetIcons(const wxIconBundle& icons); - virtual const wxIconBundle& GetIcons() const; - - virtual void SetIcon(const wxIcon& icon); - virtual const wxIcon& GetIcon() const; - - virtual void Activate(); - virtual bool Destroy(); - - virtual bool Show(bool show = true); - -#if wxUSE_STATUSBAR - // no status bars - virtual wxStatusBar* CreateStatusBar(int WXUNUSED(number) = 1, - long WXUNUSED(style) = 1, - wxWindowID WXUNUSED(winid) = 1, - const wxString& WXUNUSED(name) = wxEmptyString) - { return NULL; } - - virtual wxStatusBar *GetStatusBar() const { return NULL; } - virtual void SetStatusText( const wxString &WXUNUSED(text), int WXUNUSED(number)=0 ) {} - virtual void SetStatusWidths( int WXUNUSED(n), const int WXUNUSED(widths_field)[] ) {} -#endif - -#if wxUSE_TOOLBAR - // no toolbar bars - virtual wxToolBar* CreateToolBar(long WXUNUSED(style), - wxWindowID WXUNUSED(winid), - const wxString& WXUNUSED(name)) - { return NULL; } - virtual wxToolBar *GetToolBar() const { return NULL; } -#endif - - - // no maximize etc - virtual void Maximize(bool WXUNUSED(maximize) = true) { /* Has no effect */ } - virtual void Restore() { /* Has no effect */ } - virtual void Iconize(bool WXUNUSED(iconize) = true) { /* Has no effect */ } - virtual bool IsMaximized() const { return true; } - virtual bool IsIconized() const { return false; } - virtual bool ShowFullScreen(bool WXUNUSED(show), long WXUNUSED(style)) { return false; } - virtual bool IsFullScreen() const { return false; } - - virtual bool IsTopLevel() const { return false; } - - void OnMenuHighlight(wxMenuEvent& evt); - void OnActivate(wxActivateEvent& evt); - void OnCloseWindow(wxCloseEvent& evt); - - void SetMDIParentFrame(wxAuiMDIParentFrame* parent); - wxAuiMDIParentFrame* GetMDIParentFrame() const; - -protected: - void Init(); - virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags); - virtual void DoMoveWindow(int x, int y, int width, int height); - - // no size hints - virtual void DoSetSizeHints(int WXUNUSED(minW), int WXUNUSED(minH), - int WXUNUSED(maxW), int WXUNUSED(maxH), - int WXUNUSED(incW), int WXUNUSED(incH)) {} -public: - // This function needs to be called when a size change is confirmed, - // we needed this function to prevent anybody from the outside - // changing the panel... it messes the UI layout when we would allow it. - void ApplyMDIChildFrameRect(); - void DoShow(bool show); - -protected: - wxAuiMDIParentFrame* m_pMDIParentFrame; - wxRect m_mdiNewRect; - wxRect m_mdiCurRect; - wxString m_title; - wxIcon m_icon; - wxIconBundle m_iconBundle; - bool m_activateOnCreate; - -#if wxUSE_MENUS - wxMenuBar* m_pMenuBar; -#endif // wxUSE_MENUS - - - -private: - DECLARE_DYNAMIC_CLASS(wxAuiMDIChildFrame) - DECLARE_EVENT_TABLE() - - friend class wxAuiMDIClientWindow; -}; - -//----------------------------------------------------------------------------- -// wxAuiMDIClientWindow -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_AUI wxAuiMDIClientWindow : public wxAuiNotebook -{ -public: - wxAuiMDIClientWindow(); - wxAuiMDIClientWindow(wxAuiMDIParentFrame *parent, long style = 0); - - virtual bool CreateClient(wxAuiMDIParentFrame *parent, - long style = wxVSCROLL | wxHSCROLL); - - virtual int SetSelection(size_t page); - virtual wxAuiMDIChildFrame* GetActiveChild(); - virtual void SetActiveChild(wxAuiMDIChildFrame* pChildFrame) - { - SetSelection(GetPageIndex(pChildFrame)); - } - -protected: - - void PageChanged(int oldSelection, int newSelection); - void OnPageClose(wxAuiNotebookEvent& evt); - void OnPageChanged(wxAuiNotebookEvent& evt); - void OnSize(wxSizeEvent& evt); - -private: - DECLARE_DYNAMIC_CLASS(wxAuiMDIClientWindow) - DECLARE_EVENT_TABLE() -}; -#endif // wxUSE_AUI - -#endif // _WX_AUITABMDI_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSApplication.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSApplication.h deleted file mode 100644 index 192d282782..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSApplication.h +++ /dev/null @@ -1,67 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/NSApplication.h -// Purpose: wxNSApplicationDelegate definition -// Author: David Elliott -// Modified by: -// Created: 2004/01/26 -// Copyright: (c) 2003,2004 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_NSAPPLICATION_H__ -#define _WX_COCOA_NSAPPLICATION_H__ - -#include "wx/cocoa/objc/objc_uniquifying.h" - -// ======================================================================== -// wxNSApplicationDelegate -// ======================================================================== -/*! - @class wxNSApplicationDelegate - @discussion Implements an NSApplication delegate which can respond to messages sent by Cocoa to change Cocoa's behaviour. - - wxCocoa will set a singleton instance of this class as the NSApplication delegate upon startup unless wxWidgets is running - in a "plugin" manner in which case it would not be appropriate to do this. - - Although Cocoa will send notifications to the delegate it is also possible to register a different object to listen for - them. Because we want to support the plugin case, we use a separate notification observer object when we can. -*/ -@interface wxNSApplicationDelegate : NSObject -{ -} - -// Delegate methods -- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication; -@end // interface wxNSApplicationDelegate : NSObject -WX_DECLARE_GET_OBJC_CLASS(wxNSApplicationDelegate,NSObject) - -// ======================================================================== -// wxNSApplicationObserver -// ======================================================================== -/*! - @class wxNSApplicationObserver - @discussion Observes most notifications sent by the NSApplication singleton. - - wxCocoa will create a singleton instance of this class upon startup and register it with the default notification center to - listen for several events sent by the NSApplication singleton. - - Because there can be any number of notification observers, this method allows wxCocoa to function properly even when it is - running as a plugin of some other (most likely not wxWidgets) application. -*/ -@interface wxNSApplicationObserver : NSObject -{ -} - -// Methods defined as (but not used here) as NSApplication delegate methods. -- (void)applicationWillBecomeActive:(NSNotification *)notification; -- (void)applicationDidBecomeActive:(NSNotification *)notification; -- (void)applicationWillResignActive:(NSNotification *)notification; -- (void)applicationDidResignActive:(NSNotification *)notification; -- (void)applicationWillUpdate:(NSNotification *)notification; - -// Other notifications -- (void)controlTintChanged:(NSNotification *)notification; -@end // interface wxNSApplicationObserver : NSObject -WX_DECLARE_GET_OBJC_CLASS(wxNSApplicationObserver,NSObject) - -#endif //ndef _WX_COCOA_NSAPPLICATION_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSBox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSBox.h deleted file mode 100644 index 39cbe3de5f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSBox.h +++ /dev/null @@ -1,25 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/NSBox.h -// Purpose: wxCocoaNSBox class -// Author: David Elliott -// Modified by: -// Created: 2003/03/19 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_NSBOX_H__ -#define __WX_COCOA_NSBOX_H__ - -#include "wx/hashmap.h" -#include "wx/cocoa/ObjcAssociate.h" - -WX_DECLARE_OBJC_HASHMAP(NSBox); -class wxCocoaNSBox -{ - WX_DECLARE_OBJC_INTERFACE(NSBox) -protected: -// virtual void Cocoa_didChangeText(void) = 0; -}; - -#endif // _WX_COCOA_NSBOX_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSButton.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSButton.h deleted file mode 100644 index 7e32aac07d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSButton.h +++ /dev/null @@ -1,38 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/NSButton.h -// Purpose: wxCocoaNSButton class -// Author: David Elliott -// Modified by: -// Created: 2002/12/09 -// Copyright: (c) 2002-2004 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_NSBUTTON_H__ -#define _WX_COCOA_NSBUTTON_H__ - -#include "wx/hashmap.h" -#include "wx/cocoa/ObjcAssociate.h" -#include "wx/cocoa/ObjcRef.h" - -WX_DECLARE_OBJC_HASHMAP(NSButton); - -class wxCocoaNSButton -{ - WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSButton); -public: - void AssociateNSButton(WX_NSButton cocoaNSButton); - void DisassociateNSButton(WX_NSButton cocoaNSButton) - { - if(cocoaNSButton) - sm_cocoaHash.erase(cocoaNSButton); - } - - virtual void Cocoa_wxNSButtonAction(void) = 0; - virtual ~wxCocoaNSButton() { } - -protected: - static const wxObjcAutoRefFromAlloc sm_cocoaTarget; -}; - -#endif // _WX_COCOA_NSBUTTON_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSControl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSControl.h deleted file mode 100644 index f921c337d1..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSControl.h +++ /dev/null @@ -1,31 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/NSControl.h -// Purpose: wxCocoaNSControl class -// Author: David Elliott -// Modified by: -// Created: 2003/02/15 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_NSCONTROL_H__ -#define __WX_COCOA_NSCONTROL_H__ - -#include "wx/hashmap.h" -#include "wx/cocoa/ObjcAssociate.h" - -WX_DECLARE_OBJC_HASHMAP(NSControl); -class wxCocoaNSControl -{ - WX_DECLARE_OBJC_INTERFACE(NSControl) -public: - virtual void CocoaTarget_action() {} -// virtual void Cocoa_didChangeText(void) = 0; - - virtual ~wxCocoaNSControl() { } - -protected: - static struct objc_object *sm_cocoaTarget; -}; - -#endif // _WX_COCOA_NSCONTROL_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSMenu.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSMenu.h deleted file mode 100644 index a413ad45a6..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSMenu.h +++ /dev/null @@ -1,48 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/NSMenu.h -// Purpose: wxCocoaNSMenu class -// Author: David Elliott -// Modified by: -// Created: 2002/12/09 -// Copyright: (c) 2002 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_NSMENU_H__ -#define __WX_COCOA_NSMENU_H__ - -#include "wx/hashmap.h" -#include "wx/cocoa/ObjcAssociate.h" - -WX_DECLARE_OBJC_HASHMAP(NSMenu); - -// ======================================================================== -// wxCocoaNSMenu -// ======================================================================== - -class wxCocoaNSMenu -{ - WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSMenu) -public: - void AssociateNSMenu(WX_NSMenu cocoaNSMenu, unsigned int flags = 0); - void DisassociateNSMenu(WX_NSMenu cocoaNSMenu); - enum - { OBSERVE_DidAddItem = 0x01 - , OBSERVE_DidChangeItem = 0x02 - , OBSERVE_DidRemoveItem = 0x04 - , OBSERVE_DidSendAction = 0x08 - , OBSERVE_WillSendAction = 0x10 - }; - virtual void Cocoa_dealloc() {} - virtual void CocoaNotification_menuDidAddItem(WX_NSNotification WXUNUSED(notification)) {} - virtual void CocoaNotification_menuDidChangeItem(WX_NSNotification WXUNUSED(notification)) {} - virtual void CocoaNotification_menuDidRemoveItem(WX_NSNotification WXUNUSED(notification)) {} - virtual void CocoaNotification_menuDidSendAction(WX_NSNotification WXUNUSED(notification)) {} - virtual void CocoaNotification_menuWillSendAction(WX_NSNotification WXUNUSED(notification)) {} - virtual ~wxCocoaNSMenu() { } - -protected: - static struct objc_object *sm_cocoaObserver; -}; - -#endif // _WX_COCOA_NSMENU_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSPanel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSPanel.h deleted file mode 100644 index 25acf54c42..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSPanel.h +++ /dev/null @@ -1,24 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/NSPanel.h -// Purpose: wxCocoaNSPanel class -// Author: David Elliott -// Modified by: -// Created: 2003/03/16 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_NSPANEL_H__ -#define __WX_COCOA_NSPANEL_H__ - -#include "wx/hashmap.h" -#include "wx/cocoa/ObjcAssociate.h" - -WX_DECLARE_OBJC_HASHMAP(NSPanel); - -class wxCocoaNSPanel -{ - WX_DECLARE_OBJC_INTERFACE(NSPanel) -}; - -#endif // _WX_COCOA_NSPANEL_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSScroller.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSScroller.h deleted file mode 100644 index 3cafc5815a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSScroller.h +++ /dev/null @@ -1,40 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/NSScroller.h -// Purpose: wxCocoaNSScroller class -// Author: David Elliott -// Modified by: -// Created: 2004/04/27 -// Copyright: (c) 2004 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_NSSCROLLER_H__ -#define _WX_COCOA_NSSCROLLER_H__ - -#include "wx/hashmap.h" -#include "wx/cocoa/ObjcAssociate.h" -#include "wx/cocoa/ObjcRef.h" - -DECLARE_WXCOCOA_OBJC_CLASS(NSScroller); - -WX_DECLARE_OBJC_HASHMAP(NSScroller); - -class wxCocoaNSScroller -{ - WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSScroller); -public: - void AssociateNSScroller(WX_NSScroller cocoaNSScroller); - void DisassociateNSScroller(WX_NSScroller cocoaNSScroller) - { - if(cocoaNSScroller) - sm_cocoaHash.erase(cocoaNSScroller); - } - - virtual void Cocoa_wxNSScrollerAction(void) = 0; - virtual ~wxCocoaNSScroller() { } - -protected: - static const wxObjcAutoRefFromAlloc sm_cocoaTarget; -}; - -#endif // _WX_COCOA_NSSCROLLER_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSSlider.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSSlider.h deleted file mode 100644 index 0f278984ee..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSSlider.h +++ /dev/null @@ -1,46 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/NSSlider.h -// Purpose: wxCocoaNSSlider class -// Author: Mark Oxenham -// Modified by: David Elliott -// Created: 2007/08/10 -// Copyright: (c) 2007 Software 2000 Ltd. All rights reserved. -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WXNSSLIDER_H_ -#define _WXNSSLIDER_H_ - -#include "wx/hashmap.h" -#include "wx/cocoa/ObjcAssociate.h" -#include "wx/cocoa/ObjcRef.h" - -DECLARE_WXCOCOA_OBJC_CLASS(NSSlider); - -WX_DECLARE_OBJC_HASHMAP(NSSlider); - -// For when we're not in Objective-C mode: -typedef struct objc_selector *SEL; - -class wxCocoaNSSliderLastSelectorChanger; - -class wxCocoaNSSlider -{ - friend class wxCocoaNSSliderLastSelectorChanger; - WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSSlider); -public: - void AssociateNSSlider(WX_NSSlider cocoaNSSlider); - void DisassociateNSSlider(WX_NSSlider cocoaNSSlider); - - virtual void CocoaNotification_startTracking(WX_NSNotification notification) = 0; - virtual void CocoaNotification_continueTracking(WX_NSNotification notification) = 0; - virtual void CocoaNotification_stopTracking(WX_NSNotification notification) = 0; - - static SEL GetLastResponderSelector() - { return sm_lastResponderSelector; } -protected: - virtual ~wxCocoaNSSlider() { } - static SEL sm_lastResponderSelector; -}; - -#endif diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSTabView.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSTabView.h deleted file mode 100644 index 8c4320d0ae..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSTabView.h +++ /dev/null @@ -1,35 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/NSTabView.h -// Purpose: wxCocoaNSTabView class -// Author: David Elliott -// Modified by: -// Created: 2004/04/08 -// Copyright: (c) 2004 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_NSTABVIEW_H__ -#define _WX_COCOA_NSTABVIEW_H__ - -#include "wx/hashmap.h" -#include "wx/cocoa/ObjcAssociate.h" -#include "wx/cocoa/ObjcRef.h" - -DECLARE_WXCOCOA_OBJC_CLASS(NSTabView); -DECLARE_WXCOCOA_OBJC_CLASS(NSTabViewItem); -WX_DECLARE_OBJC_HASHMAP(NSTabView); -class wxCocoaNSTabView -{ - WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSTabView) -public: - void AssociateNSTabView(WX_NSTabView cocoaNSTabView); - void DisassociateNSTabView(WX_NSTabView ocoaNSTabView); - virtual void CocoaDelegate_tabView_didSelectTabViewItem(WX_NSTabViewItem tabviewItem) = 0; - virtual bool CocoaDelegate_tabView_shouldSelectTabViewItem(WX_NSTabViewItem tabviewItem) = 0; - virtual ~wxCocoaNSTabView() { } - -protected: - static wxObjcAutoRefFromAlloc sm_cocoaDelegate; -}; - -#endif // _WX_COCOA_NSTABVIEW_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSTableDataSource.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSTableDataSource.h deleted file mode 100644 index 39e96a8343..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSTableDataSource.h +++ /dev/null @@ -1,34 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/NSTableDataSource.h -// Purpose: wxCocoaNSTableDataSource Objective-C class -// Author: David Elliott -// Modified by: -// Created: 2003/08/05 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_NSTABLEDATASOURCE_H__ -#define __WX_COCOA_NSTABLEDATASOURCE_H__ - -#include "wx/cocoa/objc/objc_uniquifying.h" - -#import - -// ============================================================================ -// @class wxCocoaNSTableDataSource -// ============================================================================ -@interface wxCocoaNSTableDataSource : NSObject -{ -} - -// NSTableDataSource is a loosely defined protocol consisting of the -// following two message implementations -- (int)numberOfRowsInTableView: (NSTableView *)tableView; -- (id)tableView:(NSTableView *)tableView - objectValueForTableColumn: (NSTableColumn *)tableColumn - row: (int)rowIndex; -@end // wxCocoaNSTableDataSource -WX_DECLARE_GET_OBJC_CLASS(wxCocoaNSTableDataSource,NSObject) - -#endif // _WX_COCOA_NSTABLEDATASOURCE_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSTableView.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSTableView.h deleted file mode 100644 index 749a844d03..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSTableView.h +++ /dev/null @@ -1,29 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/NSTableView.h -// Purpose: wxCocoaNSTableView class -// Author: David Elliott -// Modified by: -// Created: 2003/08/05 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_NSTABLEVIEW_H__ -#define __WX_COCOA_NSTABLEVIEW_H__ - -#include "wx/hashmap.h" -#include "wx/cocoa/ObjcAssociate.h" - -WX_DECLARE_OBJC_HASHMAP(NSTableView); - -class wxCocoaNSTableView -{ - WX_DECLARE_OBJC_INTERFACE(NSTableView) -public: - virtual int CocoaDataSource_numberOfRows() = 0; - virtual struct objc_object* CocoaDataSource_objectForTableColumn( - WX_NSTableColumn tableColumn, int rowIndex) = 0; - virtual ~wxCocoaNSTableView() { } -}; - -#endif // _WX_COCOA_NSTABLEVIEW_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSTextField.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSTextField.h deleted file mode 100644 index 5632318677..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSTextField.h +++ /dev/null @@ -1,26 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/NSTextField.h -// Purpose: wxCocoaNSTextField class -// Author: David Elliott -// Modified by: -// Created: 2002/12/09 -// Copyright: (c) 2002 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_NSTEXTFIELD_H__ -#define __WX_COCOA_NSTEXTFIELD_H__ - -#include "wx/hashmap.h" -#include "wx/cocoa/ObjcAssociate.h" - -WX_DECLARE_OBJC_HASHMAP(NSTextField); -class wxCocoaNSTextField -{ - WX_DECLARE_OBJC_INTERFACE(NSTextField) -protected: - virtual void Cocoa_didChangeText(void) = 0; - virtual ~wxCocoaNSTextField() { } -}; - -#endif // _WX_COCOA_NSTEXTFIELD_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSView.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSView.h deleted file mode 100644 index 3095fb1738..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSView.h +++ /dev/null @@ -1,80 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/NSView.h -// Purpose: wxCocoaNSView class -// Author: David Elliott -// Modified by: -// Created: 2003/02/15 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_NSVIEW_H__ -#define __WX_COCOA_NSVIEW_H__ - -#include "wx/hashmap.h" -#include "wx/cocoa/ObjcAssociate.h" - -#if defined(__LP64__) || defined(NS_BUILD_32_LIKE_64) -typedef struct CGRect NSRect; -#else -typedef struct _NSRect NSRect; -#endif - -struct objc_object; - -class wxWindow; - -WX_DECLARE_OBJC_HASHMAP(NSView); -class wxCocoaNSView -{ -/* NSView is a rather special case and requires some extra attention */ - WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSView) -public: - void AssociateNSView(WX_NSView cocoaNSView); - void DisassociateNSView(WX_NSView cocoaNSView); -protected: - static struct objc_object *sm_cocoaObserver; -public: - virtual wxWindow* GetWxWindow() const - { return NULL; } - virtual void Cocoa_FrameChanged(void) = 0; - virtual void Cocoa_synthesizeMouseMoved(void) = 0; - virtual bool Cocoa_acceptsFirstMouse(bool &WXUNUSED(acceptsFirstMouse), WX_NSEvent WXUNUSED(theEvent)) - { return false; } - virtual bool Cocoa_drawRect(const NSRect &WXUNUSED(rect)) - { return false; } - virtual bool Cocoa_mouseDown(WX_NSEvent WXUNUSED(theEvent)) - { return false; } - virtual bool Cocoa_mouseDragged(WX_NSEvent WXUNUSED(theEvent)) - { return false; } - virtual bool Cocoa_mouseUp(WX_NSEvent WXUNUSED(theEvent)) - { return false; } - virtual bool Cocoa_mouseMoved(WX_NSEvent WXUNUSED(theEvent)) - { return false; } - virtual bool Cocoa_mouseEntered(WX_NSEvent WXUNUSED(theEvent)) - { return false; } - virtual bool Cocoa_mouseExited(WX_NSEvent WXUNUSED(theEvent)) - { return false; } - virtual bool Cocoa_rightMouseDown(WX_NSEvent WXUNUSED(theEvent)) - { return false; } - virtual bool Cocoa_rightMouseDragged(WX_NSEvent WXUNUSED(theEvent)) - { return false; } - virtual bool Cocoa_rightMouseUp(WX_NSEvent WXUNUSED(theEvent)) - { return false; } - virtual bool Cocoa_otherMouseDown(WX_NSEvent WXUNUSED(theEvent)) - { return false; } - virtual bool Cocoa_otherMouseDragged(WX_NSEvent WXUNUSED(theEvent)) - { return false; } - virtual bool Cocoa_otherMouseUp(WX_NSEvent WXUNUSED(theEvent)) - { return false; } - virtual bool Cocoa_resetCursorRects() - { return false; } - virtual bool Cocoa_viewDidMoveToWindow() - { return false; } - virtual bool Cocoa_viewWillMoveToWindow(WX_NSWindow WXUNUSED(newWindow)) - { return false; } - virtual ~wxCocoaNSView() { } -}; - -#endif - // __WX_COCOA_NSVIEW_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSWindow.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSWindow.h deleted file mode 100644 index 228ffe3ed0..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/NSWindow.h +++ /dev/null @@ -1,54 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/NSWindow.h -// Purpose: wxCocoaNSWindow class -// Author: David Elliott -// Modified by: -// Created: 2003/03/16 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_NSWINDOW_H__ -#define __WX_COCOA_NSWINDOW_H__ - -#include "wx/hashmap.h" -#include "wx/cocoa/ObjcAssociate.h" - -WX_DECLARE_OBJC_HASHMAP(NSWindow); - -class WXDLLIMPEXP_FWD_CORE wxMenuBar; -class WXDLLIMPEXP_FWD_CORE wxTopLevelWindowCocoa; - -DECLARE_WXCOCOA_OBJC_CLASS(NSMenuItem); -DECLARE_WXCOCOA_OBJC_CLASS(wxNSWindowDelegate); - -class WXDLLIMPEXP_CORE wxCocoaNSWindow -{ -/* NSWindow is a rather special case and requires some extra attention */ - WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSWindow) -public: - void AssociateNSWindow(WX_NSWindow cocoaNSWindow); - void DisassociateNSWindow(WX_NSWindow cocoaNSWindow); - virtual bool Cocoa_canBecomeKeyWindow(bool &WXUNUSED(canBecome)) - { return false; } - virtual bool Cocoa_canBecomeMainWindow(bool &WXUNUSED(canBecome)) - { return false; } - virtual bool CocoaDelegate_windowShouldClose(void) = 0; - virtual void CocoaDelegate_windowWillClose(void) = 0; - virtual void CocoaDelegate_windowDidBecomeKey(void) { } - virtual void CocoaDelegate_windowDidResignKey(void) { } - virtual void CocoaDelegate_windowDidBecomeMain(void) { } - virtual void CocoaDelegate_windowDidResignMain(void) { } - virtual void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem) = 0; - virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem) = 0; - virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win); - inline wxTopLevelWindowCocoa* GetWxTopLevelWindowCocoa() - { return m_wxTopLevelWindowCocoa; } -protected: - wxCocoaNSWindow(wxTopLevelWindowCocoa *tlw = NULL); - virtual ~wxCocoaNSWindow(); - WX_wxNSWindowDelegate m_cocoaDelegate; - wxTopLevelWindowCocoa *m_wxTopLevelWindowCocoa; -}; - -#endif // _WX_COCOA_NSWINDOW_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/ObjcAssociate.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/ObjcAssociate.h deleted file mode 100644 index a6bf6e2ce4..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/ObjcAssociate.h +++ /dev/null @@ -1,77 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/ObjcAssociate.h -// Purpose: Associates an Objective-C class with a C++ class -// Author: David Elliott -// Modified by: -// Created: 2002/12/03 -// Copyright: (c) 2002 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_OBJC_ASSOCIATE_H__ -#define __WX_COCOA_OBJC_ASSOCIATE_H__ - -/*------------------------------------------------------------------------- -Basic hashmap stuff, used by everything --------------------------------------------------------------------------*/ -#define WX_DECLARE_OBJC_HASHMAP(ObjcClass) \ -class wxCocoa##ObjcClass; \ -WX_DECLARE_HASH_MAP(WX_##ObjcClass,wxCocoa##ObjcClass*,wxPointerHash,wxPointerEqual,wxCocoa##ObjcClass##Hash) - -#define WX_DECLARE_OBJC_INTERFACE_HASHMAP(ObjcClass) \ -public: \ - static inline wxCocoa##ObjcClass* GetFromCocoa(WX_##ObjcClass cocoaObjcClass) \ - { \ - wxCocoa##ObjcClass##Hash::iterator iter = sm_cocoaHash.find(cocoaObjcClass); \ - if(iter!=sm_cocoaHash.end()) \ - { \ - return iter->second; \ - } \ - return NULL; \ - } \ -protected: \ - static wxCocoa##ObjcClass##Hash sm_cocoaHash; - -#define WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(ObjcClass) \ -wxCocoa##ObjcClass##Hash wxCocoa##ObjcClass::sm_cocoaHash; - - -/*------------------------------------------------------------------------- -The entire interface, including some boilerplate stuff --------------------------------------------------------------------------*/ -#define WX_DECLARE_OBJC_INTERFACE(ObjcClass) \ -WX_DECLARE_OBJC_INTERFACE_HASHMAP(ObjcClass) \ -public: \ - inline void Associate##ObjcClass(WX_##ObjcClass cocoaObjcClass) \ - { \ - if(cocoaObjcClass) \ - sm_cocoaHash.insert(wxCocoa##ObjcClass##Hash::value_type(cocoaObjcClass,this)); \ - } \ - inline void Disassociate##ObjcClass(WX_##ObjcClass cocoaObjcClass) \ - { \ - if(cocoaObjcClass) \ - sm_cocoaHash.erase(cocoaObjcClass); \ - } - -#define WX_IMPLEMENT_OBJC_INTERFACE(ObjcClass) \ -WX_IMPLEMENT_OBJC_INTERFACE_HASHMAP(ObjcClass) - -/*------------------------------------------------------------------------- -Stuff to be used by the wxWidgets class (not the Cocoa interface) --------------------------------------------------------------------------*/ -#define WX_DECLARE_COCOA_OWNER(ObjcClass,ObjcBase,ObjcRoot) \ -public: \ - inline WX_##ObjcClass Get##ObjcClass() { return (WX_##ObjcClass)m_cocoa##ObjcRoot; } \ - inline const WX_##ObjcClass Get##ObjcClass() const { return (WX_##ObjcClass)m_cocoa##ObjcRoot; } \ -protected: \ - void Set##ObjcClass(WX_##ObjcClass cocoaObjcClass); - -#define WX_IMPLEMENT_COCOA_OWNER(wxClass,ObjcClass,ObjcBase,ObjcRoot) \ -void wxClass::Set##ObjcClass(WX_##ObjcClass cocoaObjcClass) \ -{ \ - Disassociate##ObjcClass((WX_##ObjcClass)m_cocoa##ObjcRoot); \ - Set##ObjcBase(cocoaObjcClass); \ - Associate##ObjcClass((WX_##ObjcClass)m_cocoa##ObjcRoot); \ -} - -#endif // __WX_COCOA_OBJC_ASSOCIATE_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/ObjcRef.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/ObjcRef.h deleted file mode 100644 index d4aa6d91ec..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/ObjcRef.h +++ /dev/null @@ -1,235 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/ObjcRef.h -// Purpose: wxObjcAutoRef template class -// Author: David Elliott -// Modified by: -// Created: 2004/03/28 -// Copyright: (c) 2004 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_OBJCREF_H__ -#define _WX_COCOA_OBJCREF_H__ - -// Reuse wxCFRef-related code (e.g. wxCFRetain/wxCFRelease) -#include "wx/osx/core/cfref.h" - -// NOTE WELL: We can only know whether or not GC can be used when compiling Objective-C. -// Therefore we cannot implement these functions except when compiling Objective-C. -#ifdef __OBJC__ -/*! @function wxGCSafeRetain - @templatefield Type (implicit) An Objective-C class type - @arg r Pointer to Objective-C object. May be null. - @abstract Retains the Objective-C object, even when using Apple's garbage collector - @discussion - When Apple's garbage collector is enabled, the usual [obj retain] and [obj release] messages - are ignored. Instead the collector with help from compiler-generated write-barriers tracks - reachable objects. The write-barriers are generated when setting i-vars of C++ classes but - they are ignored by the garbage collector unless the C++ object is in GC-managed memory. - - The simple solution is to use CFRetain on the Objective-C object which has been enhanced in - GC mode to forcibly retain the object. In Retain/Release (RR) mode the CFRetain function has - the same effect as [obj retain]. Note that GC vs. RR is selected at runtime. - - Take care that wxGCSafeRetain must be balanced with wxGCSafeRelease and that conversely - wxGCSafeRelease must only be called on objects to balance wxGCSafeRetain. In particular when - receiving an Objective-C object from an alloc or copy method take care that you must retain - it with wxGCSafeRetain and balance the initial alloc with a standard release. - - Example: - wxGCSafeRelease(m_obj); // release current object (if any) - NSObject *obj = [[NSObject alloc] init]; - m_obj = wxGCSafeRetain(obj); - [obj release]; - - Alternatively (same effect, perhaps less clear): - wxGCSafeRelease(m_obj); // release current object (if any) - m_obj = wxGCSafeRetain([[NSObject alloc] init]); - [m_obj release]; // balance alloc - - Consider the effect on the retain count from each statement (alloc, CFRetain, release) - In RR mode: retainCount = 1, +1, -1 - In GC mode: strongRetainCount = 0, +1, -0 - - This is a template function to ensure it is used on raw pointers and never on pointer-holder - objects via implicit conversion operators. -*/ -template -inline Type * wxGCSafeRetain(Type *r) -{ -#ifdef __OBJC_GC__ - return static_cast(wxCFRetain(r)); -#else - return [r retain]; -#endif -} - -/*! @function wxGCSafeRelease - @templatefield Type (implicit) An Objective-C class type - @arg r Pointer to Objective-C object. May be null. - @abstract Balances wxGCSafeRetain. Particularly useful with the Apple Garbage Collector. - @discussion - See the wxGCSafeRetain documentation for more details. - - Example (from wxGCSafeRetain documentation): - wxGCSafeRelease(m_obj); // release current object (if any) - m_obj = wxGCSafeRetain([[NSObject alloc] init]); - [m_obj release]; // balance alloc - - When viewed from the start, m_obj ought to start as nil. However, the second time through - the wxGCSafeRelease call becomes critical as it releases the retain from the first time - through. - - In the destructor for this C++ object with the m_obj i-var you ought to do the following: - wxGCSafeRelease(m_obj); - m_obj = nil; // Not strictly needed, but safer. - - Under no circumstances should you balance an alloc or copy with a wxGCSafeRelease. -*/ -template -inline void wxGCSafeRelease(Type *r) -{ -#ifdef __OBJC_GC__ - wxCFRelease(r); -#else - [r release]; -#endif -} -#else -// NOTE: When not compiling Objective-C, declare these functions such that they can be -// used by other inline-implemented methods. Since those methods in turn will not actually -// be used from non-ObjC code the compiler ought not emit them. If it emits an out of -// line copy of those methods then presumably it will have also emitted at least one -// out of line copy of these functions from at least one Objective-C++ translation unit. -// That means the out of line implementation will be available at link time. - -template -inline Type * wxGCSafeRetain(Type *r); - -template -inline void wxGCSafeRelease(Type *r); - -#endif //def __OBJC__ - -/* -wxObjcAutoRefFromAlloc: construct a reference to an object that was -[NSObject -alloc]'ed and thus does not need a retain -wxObjcAutoRef: construct a reference to an object that was -either autoreleased or is retained by something else. -*/ - -struct objc_object; - -// We must do any calls to Objective-C from an Objective-C++ source file -class wxObjcAutoRefBase -{ -protected: - /*! @function ObjcRetain - @abstract Simply does [p retain]. - */ - static struct objc_object* ObjcRetain(struct objc_object*); - - /*! @function ObjcRelease - @abstract Simply does [p release]. - */ - static void ObjcRelease(struct objc_object*); -}; - -/*! @class wxObjcAutoRefFromAlloc - @templatefield T The type of _pointer_ (e.g. NSString*, NSRunLoop*) - @abstract Pointer-holder for Objective-C objects - @discussion - When constructing this object from a raw pointer, the pointer is assumed to have - come from an alloc-style method. That is, once you construct this object from - the pointer you must not balance your alloc with a call to release. - - This class has been carefully designed to work with both the traditional Retain/Release - and the new Garbage Collected modes. In RR-mode it will prevent the object from being - released by managing the reference count using the retain/release semantics. In GC-mode - it will use a method (currently CFRetain/CFRelease) to ensure the object will never be - finalized until this object is destroyed. - */ - -template -class wxObjcAutoRefFromAlloc: wxObjcAutoRefBase -{ -public: - wxObjcAutoRefFromAlloc(T p = 0) - : m_ptr(p) - // NOTE: this is from alloc. Do NOT retain - { - // CFRetain - // GC: Object is strongly retained and prevented from being collected - // non-GC: Simply realizes it's an Objective-C object and calls [p retain] - wxGCSafeRetain(p); - // ObjcRelease (e.g. [p release]) - // GC: Objective-C retain/release mean nothing in GC mode - // non-GC: This is a normal release call, balancing the retain - ObjcRelease(static_cast(p)); - // The overall result: - // GC: Object is strongly retained - // non-GC: Retain count is the same as it was (retain then release) - } - wxObjcAutoRefFromAlloc(const wxObjcAutoRefFromAlloc& otherRef) - : m_ptr(otherRef.m_ptr) - { wxGCSafeRetain(m_ptr); } - ~wxObjcAutoRefFromAlloc() - { wxGCSafeRelease(m_ptr); } - wxObjcAutoRefFromAlloc& operator=(const wxObjcAutoRefFromAlloc& otherRef) - { wxGCSafeRetain(otherRef.m_ptr); - wxGCSafeRelease(m_ptr); - m_ptr = otherRef.m_ptr; - return *this; - } - operator T() const - { return static_cast(m_ptr); } - T operator->() const - { return static_cast(m_ptr); } -protected: - /*! @field m_ptr The pointer to the Objective-C object - @discussion - The pointer to the Objective-C object is typed as void* to avoid compiler-generated write - barriers as would be used for implicitly __strong object pointers and to avoid the similar - read barriers as would be used for an explicitly __weak object pointer. The write barriers - are useless unless this object is located in GC-managed heap which is highly unlikely. - - Since we guarantee strong reference via CFRetain/CFRelease the write-barriers are not needed - at all, even if this object does happen to be allocated in GC-managed heap. - */ - void *m_ptr; -}; - -/*! - @class wxObjcAutoRef - @description - A pointer holder that does retain its argument. - NOTE: It is suggest that you instead use wxObjcAutoRefFromAlloc foo([aRawPointer retain]) - */ -template -class wxObjcAutoRef: public wxObjcAutoRefFromAlloc -{ -public: - /*! @method wxObjcAutoRef - @description - Uses the underlying wxObjcAutoRefFromAlloc and simply does a typical [p retain] such that - in RR-mode the object is in effectively the same retain-count state as it would have been - coming straight from an alloc method. - */ - wxObjcAutoRef(T p = 0) - : wxObjcAutoRefFromAlloc(p) - { // NOTE: ObjcRetain is correct because in GC-mode it balances ObjcRelease in our superclass constructor - // In RR mode it does retain and the superclass does retain/release thus resulting in an overall retain. - ObjcRetain(static_cast(wxObjcAutoRefFromAlloc::m_ptr)); - } - ~wxObjcAutoRef() {} - wxObjcAutoRef(const wxObjcAutoRef& otherRef) - : wxObjcAutoRefFromAlloc(otherRef) - {} - wxObjcAutoRef(const wxObjcAutoRefFromAlloc& otherRef) - : wxObjcAutoRefFromAlloc(otherRef) - {} - wxObjcAutoRef& operator=(const wxObjcAutoRef& otherRef) - { return wxObjcAutoRefFromAlloc::operator=(otherRef); } -}; - -#endif //ndef _WX_COCOA_OBJCREF_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/app.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/app.h deleted file mode 100644 index dffb0cae63..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/app.h +++ /dev/null @@ -1,73 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/app.h -// Purpose: wxApp class -// Author: David Elliott -// Modified by: -// Created: 2002/11/27 -// Copyright: (c) 2002 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_APP_H_ -#define _WX_COCOA_APP_H_ - -typedef struct __CFRunLoopObserver * CFRunLoopObserverRef; -typedef const struct __CFString * CFStringRef; - -#include "wx/osx/core/cfref.h" - -// ======================================================================== -// wxApp -// ======================================================================== -// Represents the application. Derive OnInit and declare -// a new App object to start application -class WXDLLIMPEXP_CORE wxApp: public wxAppBase -{ - DECLARE_DYNAMIC_CLASS(wxApp) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxApp(); - virtual ~wxApp(); - -// ------------------------------------------------------------------------ -// Cocoa specifics -// ------------------------------------------------------------------------ -public: - inline WX_NSApplication GetNSApplication() { return m_cocoaApp; } - virtual void CocoaDelegate_applicationWillBecomeActive(); - virtual void CocoaDelegate_applicationDidBecomeActive(); - virtual void CocoaDelegate_applicationWillResignActive(); - virtual void CocoaDelegate_applicationDidResignActive(); - virtual void CocoaDelegate_applicationWillUpdate(); - virtual void CF_ObserveMainRunLoopBeforeWaiting(CFRunLoopObserverRef observer, int activity); -protected: - WX_NSApplication m_cocoaApp; - struct objc_object *m_cocoaAppDelegate; - WX_NSThread m_cocoaMainThread; - wxCFRef m_cfRunLoopIdleObserver; - wxCFRef m_cfObservedRunLoopMode; - -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - // Implement wxAppBase pure virtuals - virtual void Exit(); - - virtual void WakeUpIdle(); - - virtual bool Initialize(int& argc, wxChar **argv); - virtual void CleanUp(); - virtual bool CallOnInit(); - - - virtual bool OnInit(); - virtual bool OnInitGui(); - - // Set true _before_ initializing wx to force embedded mode (no app delegate, etc.) - static bool sm_isEmbedded; -}; - -#endif // _WX_COCOA_APP_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/autorelease.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/autorelease.h deleted file mode 100644 index cd5f6b3e26..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/autorelease.h +++ /dev/null @@ -1,31 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/autorelease.h -// Purpose: Automatic NSAutoreleasePool functionality -// Author: David Elliott -// Modified by: -// Created: 2003/07/11 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_AUTORELEASE_H__ -#define __WX_COCOA_AUTORELEASE_H__ - -#import - -class wxAutoNSAutoreleasePool -{ -public: - wxAutoNSAutoreleasePool() - { - m_pool = [[NSAutoreleasePool alloc] init]; - } - ~wxAutoNSAutoreleasePool() - { - [m_pool release]; - } -protected: - NSAutoreleasePool *m_pool; -}; - -#endif //__WX_COCOA_AUTORELEASE_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/bitmap.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/bitmap.h deleted file mode 100644 index 392b50b5b9..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/bitmap.h +++ /dev/null @@ -1,164 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/bitmap.h -// Purpose: wxBitmap class -// Author: David Elliott -// Modified by: -// Created: 2003/07/19 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_BITMAP_H__ -#define __WX_COCOA_BITMAP_H__ - -#include "wx/palette.h" - -// Bitmap -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_FWD_CORE wxIcon; -class WXDLLIMPEXP_FWD_CORE wxCursor; -class WXDLLIMPEXP_FWD_CORE wxImage; -class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; - -// ======================================================================== -// wxMask -// ======================================================================== - -// A mask is a 1-bit alpha bitmap used for drawing bitmaps transparently. -class WXDLLIMPEXP_CORE wxMask: public wxObject -{ - DECLARE_DYNAMIC_CLASS(wxMask) -public: - wxMask(); - - // Construct a mask from a bitmap and a colour indicating - // the transparent area - wxMask(const wxBitmap& bitmap, const wxColour& colour); - - // Construct a mask from a bitmap and a palette index indicating - // the transparent area - wxMask(const wxBitmap& bitmap, int paletteIndex); - - // Construct a mask from a mono bitmap (copies the bitmap). - wxMask(const wxBitmap& bitmap); - - // Copy constructor - wxMask(const wxMask& src); - - virtual ~wxMask(); - - bool Create(const wxBitmap& bitmap, const wxColour& colour); - bool Create(const wxBitmap& bitmap, int paletteIndex); - bool Create(const wxBitmap& bitmap); - - // wxCocoa - inline WX_NSBitmapImageRep GetNSBitmapImageRep() - { return m_cocoaNSBitmapImageRep; } -protected: - WX_NSBitmapImageRep m_cocoaNSBitmapImageRep; -}; - - -// ======================================================================== -// wxBitmap -// ======================================================================== - -class WXDLLIMPEXP_CORE wxBitmap: public wxGDIObject, - public wxBitmapHelpers -{ -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - // Platform-specific default constructor - wxBitmap(); - // Initialize with raw data. - wxBitmap(const char bits[], int width, int height, int depth = 1); - // Initialize with XPM data - wxBitmap(const char* const* bits); - // Load a file or resource - wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); - // Construct from Cocoa's NSImage - wxBitmap(NSImage* cocoaNSImage); - // Construct from Cocoa's NSBitmapImageRep - wxBitmap(NSBitmapImageRep* cocoaNSBitmapImageRep); - // Constructor for generalised creation from data - wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth = 1); - // If depth is omitted, will create a bitmap compatible with the display - wxBitmap(int width, int height, int depth = -1) - { (void)Create(width, height, depth); } - wxBitmap(const wxSize& sz, int depth = -1) - { (void)Create(sz, depth); } - // Convert from wxImage: - wxBitmap(const wxImage& image, int depth = -1) - { CreateFromImage(image, depth); } - // Convert from wxIcon - wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); } - - // destructor - virtual ~wxBitmap(); - -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - // Initialize from wxImage - bool CreateFromImage(const wxImage& image, int depth=-1); - - virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); - virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) - { return Create(sz.GetWidth(), sz.GetHeight(), depth); } - - bool Create(NSImage* cocoaNSImage); - bool Create(NSBitmapImageRep* cocoaNSBitmapImageRep); - virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1); - virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); - virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const; - - // copies the contents and mask of the given (colour) icon to the bitmap - virtual bool CopyFromIcon(const wxIcon& icon); - - wxImage ConvertToImage() const; - - // get the given part of bitmap - wxBitmap GetSubBitmap( const wxRect& rect ) const; - - int GetWidth() const; - int GetHeight() const; - int GetDepth() const; - int GetQuality() const; - void SetWidth(int w); - void SetHeight(int h); - void SetDepth(int d); - void SetQuality(int q); - void SetOk(bool isOk); - - // raw bitmap access support functions - void *GetRawData(wxPixelDataBase& data, int bpp); - void UngetRawData(wxPixelDataBase& data); - - wxPalette* GetPalette() const; - void SetPalette(const wxPalette& palette); - - wxMask *GetMask() const; - void SetMask(wxMask *mask) ; - - wxBitmapType GetBitmapType() const; - - // wxCocoa - WX_NSBitmapImageRep GetNSBitmapImageRep(); - void SetNSBitmapImageRep(WX_NSBitmapImageRep bitmapImageRep); - WX_NSImage GetNSImage(bool useMask) const; - - static void InitStandardHandlers() { } - static void CleanUpHandlers() { } - -protected: - wxGDIRefData *CreateGDIRefData() const; - wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - DECLARE_DYNAMIC_CLASS(wxBitmap) -}; - - -#endif // __WX_COCOA_BITMAP_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/bmpbuttn.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/bmpbuttn.h deleted file mode 100644 index 10a1394872..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/bmpbuttn.h +++ /dev/null @@ -1,61 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/bmpbuttn.h -// Purpose: wxBitmapButton class -// Author: David Elliott -// Modified by: -// Created: 2003/03/16 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_BMPBUTTN_H__ -#define __WX_COCOA_BMPBUTTN_H__ - -#include "wx/cocoa/NSButton.h" - -// ======================================================================== -// wxBitmapButton -// ======================================================================== -class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase -{ - DECLARE_DYNAMIC_CLASS(wxBitmapButton) - DECLARE_EVENT_TABLE() - WX_DECLARE_COCOA_OWNER(NSButton,NSControl,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxBitmapButton() { } - wxBitmapButton(wxWindow *parent, wxWindowID winid, - const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, winid, bitmap, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, - const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - virtual ~wxBitmapButton(); - -// ------------------------------------------------------------------------ -// Cocoa callbacks -// ------------------------------------------------------------------------ -protected: - virtual void Cocoa_wxNSButtonAction(void); -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - // The wxButton::DoGetBestSize is not correct for bitmap buttons - wxSize DoGetBestSize() const - { return wxButtonBase::DoGetBestSize(); } -}; - -#endif // __WX_COCOA_BMPBUTTN_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/brush.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/brush.h deleted file mode 100644 index d67294beac..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/brush.h +++ /dev/null @@ -1,70 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/brush.h -// Purpose: wxBrush class -// Author: David Elliott -// Modified by: -// Created: 2003/07/03 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_BRUSH_H__ -#define __WX_COCOA_BRUSH_H__ - -#include "wx/gdicmn.h" -#include "wx/gdiobj.h" -#include "wx/bitmap.h" - -class WXDLLIMPEXP_FWD_CORE wxBrush; - -// ======================================================================== -// wxBrush -// ======================================================================== -class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase -{ - DECLARE_DYNAMIC_CLASS(wxBrush) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxBrush(); - wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID); -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) ); -#endif - wxBrush(const wxBitmap& stipple); - virtual ~wxBrush(); - -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ - virtual void SetColour(const wxColour& col) ; - virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ; - virtual void SetStyle(wxBrushStyle style) ; - virtual void SetStipple(const wxBitmap& stipple) ; - - // comparison - bool operator == (const wxBrush& brush) const - { return m_refData == brush.m_refData; } - bool operator != (const wxBrush& brush) const - { return m_refData != brush.m_refData; } - - // accessors - wxColour GetColour() const; - virtual wxBrushStyle GetStyle() const; - wxBitmap *GetStipple() const; - -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_FUTURE( void SetStyle(int style) ) - { SetStyle((wxBrushStyle)style); } -#endif - - // wxCocoa - WX_NSColor GetNSColor(); - -protected: - wxGDIRefData *CreateGDIRefData() const; - wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; -}; - -#endif // __WX_COCOA_BRUSH_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/button.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/button.h deleted file mode 100644 index d58d0fb6bd..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/button.h +++ /dev/null @@ -1,64 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/button.h -// Purpose: wxButton class -// Author: David Elliott -// Modified by: -// Created: 2002/12/29 -// Copyright: (c) 2002 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_BUTTON_H__ -#define __WX_COCOA_BUTTON_H__ - -#include "wx/cocoa/NSButton.h" - -// ======================================================================== -// wxButton -// ======================================================================== -class WXDLLIMPEXP_CORE wxButton : public wxButtonBase, protected wxCocoaNSButton -{ - DECLARE_DYNAMIC_CLASS(wxButton) - DECLARE_EVENT_TABLE() - WX_DECLARE_COCOA_OWNER(NSButton,NSControl,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxButton() { } - wxButton(wxWindow *parent, wxWindowID winid, - const wxString& label = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, winid, label, pos, size, style, validator, name); - } - - - bool Create(wxWindow *parent, wxWindowID winid, - const wxString& label = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - - virtual ~wxButton(); - -// ------------------------------------------------------------------------ -// Cocoa callbacks -// ------------------------------------------------------------------------ -protected: - virtual void Cocoa_wxNSButtonAction(void); -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - wxString GetLabel() const; - void SetLabel(const wxString& label); - wxSize DoGetBestSize() const; -}; - -#endif - // __WX_COCOA_BUTTON_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/checkbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/checkbox.h deleted file mode 100644 index ba811c54e8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/checkbox.h +++ /dev/null @@ -1,68 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/checkbox.h -// Purpose: wxCheckBox class -// Author: David Elliott -// Modified by: -// Created: 2003/03/16 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_CHECKBOX_H__ -#define __WX_COCOA_CHECKBOX_H__ - -#include "wx/cocoa/NSButton.h" - -// ======================================================================== -// wxCheckBox -// ======================================================================== -class WXDLLIMPEXP_CORE wxCheckBox: public wxCheckBoxBase , protected wxCocoaNSButton -{ - DECLARE_DYNAMIC_CLASS(wxCheckBox) - DECLARE_EVENT_TABLE() - WX_DECLARE_COCOA_OWNER(NSButton,NSControl,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxCheckBox() { } - wxCheckBox(wxWindow *parent, wxWindowID winid, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, winid, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - virtual ~wxCheckBox(); - -// ------------------------------------------------------------------------ -// Cocoa callbacks -// ------------------------------------------------------------------------ -protected: - virtual void Cocoa_wxNSButtonAction(void); -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - virtual void SetValue(bool); - virtual bool GetValue() const; - virtual void SetLabel(const wxString& label); - virtual wxString GetLabel() const; - -protected: - virtual void DoSet3StateValue(wxCheckBoxState state); - virtual wxCheckBoxState DoGet3StateValue() const; -}; - -#endif // __WX_COCOA_CHECKBOX_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/checklst.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/checklst.h deleted file mode 100644 index 8f07894342..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/checklst.h +++ /dev/null @@ -1,79 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/checklst.h -// Purpose: wxCheckListBox class -// Author: David Elliott -// Modified by: -// Created: 2003/03/16 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_CHECKLST_H__ -#define __WX_COCOA_CHECKLST_H__ - -//#include "wx/cocoa/NSTableView.h" - -// ======================================================================== -// wxCheckListBox -// ======================================================================== -class WXDLLIMPEXP_CORE wxCheckListBox: public wxCheckListBoxBase //, protected wxCocoaNSTableView -{ - DECLARE_DYNAMIC_CLASS(wxCheckListBox) - DECLARE_EVENT_TABLE() - WX_DECLARE_COCOA_OWNER(NSTableView,NSControl,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxCheckListBox() { } - wxCheckListBox(wxWindow *parent, wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr) - { - Create(parent, winid, pos, size, n, choices, style, validator, name); - } - wxCheckListBox(wxWindow *parent, wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr) - { - Create(parent, winid, pos, size, choices, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - bool Create(wxWindow *parent, wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - virtual ~wxCheckListBox(); - -// ------------------------------------------------------------------------ -// Cocoa callbacks -// ------------------------------------------------------------------------ -protected: -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - // check list box specific methods - virtual bool IsChecked(unsigned int item) const; - virtual void Check(unsigned int item, bool check = true); -}; - -#endif // __WX_COCOA_CHECKLST_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/chkconf.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/chkconf.h deleted file mode 100644 index 77ccadfe68..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/chkconf.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Name: wx/cocoa/chkconf.h - * Purpose: wxCocoa-specific config settings checks - * Author: Vadim Zeitlin - * Created: 2008-09-11 - * Copyright: (c) 2008 Vadim Zeitlin - * Licence: wxWindows licence - */ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ - -#ifndef _WX_COCOA_CHKCONF_H_ -#define _WX_COCOA_CHKCONF_H_ - -/* - wxLogDialog doesn't currently work correctly in wxCocoa. - */ -#undef wxUSE_LOG_DIALOG -#define wxUSE_LOG_DIALOG 0 - -#endif /* _WX_COCOA_CHKCONF_H_ */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/choice.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/choice.h deleted file mode 100644 index 7fe2c06e8d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/choice.h +++ /dev/null @@ -1,100 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/choice.h -// Purpose: wxChoice class -// Author: David Elliott -// Modified by: -// Created: 2003/03/16 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_CHOICE_H__ -#define __WX_COCOA_CHOICE_H__ - -//#include "wx/cocoa/NSPopUpButton.h" -#include "wx/cocoa/NSMenu.h" - -class WXDLLIMPEXP_FWD_BASE wxSortedArrayString; - -// ======================================================================== -// wxChoice -// ======================================================================== -class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase /*, protected wxCocoaNSPopUpButton */, protected wxCocoaNSMenu -{ - DECLARE_DYNAMIC_CLASS(wxChoice) - DECLARE_EVENT_TABLE() -// WX_DECLARE_COCOA_OWNER(NSTableView,NSControl,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxChoice() { Init(); } - wxChoice(wxWindow *parent, wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr) - { - Init(); - Create(parent, winid, pos, size, n, choices, style, validator, name); - } - wxChoice(wxWindow *parent, wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr) - { - Init(); - Create(parent, winid, pos, size, choices, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr); - bool Create(wxWindow *parent, wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr); - virtual ~wxChoice(); -protected: - void Init(); - -// ------------------------------------------------------------------------ -// Cocoa callbacks -// ------------------------------------------------------------------------ -protected: - void CocoaNotification_menuDidSendAction(WX_NSNotification notification); -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - virtual void DoClear(); - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int) const; - virtual void SetString(unsigned int pos, const wxString&); - virtual int FindString(const wxString& s, bool bCase = false) const; - virtual int GetSelection() const; - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, wxClientDataType type); - virtual void DoDeleteOneItem(unsigned int pos); - virtual void DoSetItemClientData(unsigned int, void*); - virtual void* DoGetItemClientData(unsigned int) const; - virtual void SetSelection(int pos); -protected: - wxSortedArrayString *m_sortedStrings; - wxArrayPtrVoid m_itemsClientData; -}; - -#endif // __WX_COCOA_CHOICE_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/clipbrd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/clipbrd.h deleted file mode 100644 index 8571f8f56d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/clipbrd.h +++ /dev/null @@ -1,51 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/clipbrd.h -// Purpose: wxClipboard -// Author: David Elliott -// Modified by: -// Created: 2003/07/23 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_CLIPBRD_H__ -#define __WX_COCOA_CLIPBRD_H__ - -#include "wx/dataobj.h" - -//========================================================================= -// wxClipboard -//========================================================================= -class wxClipboard : public wxClipboardBase -{ - DECLARE_DYNAMIC_CLASS(wxClipboard) -public: - wxClipboard(); - virtual ~wxClipboard(); - - // open the clipboard before SetData() and GetData() - virtual bool Open(); - - // close the clipboard after SetData() and GetData() - virtual void Close(); - - // query whether the clipboard is opened - virtual bool IsOpened() const; - - // set the clipboard data. all other formats will be deleted. - virtual bool SetData( wxDataObject *data ); - - // add to the clipboard data. - virtual bool AddData( wxDataObject *data ); - - // ask if data in correct format is available - virtual bool IsSupported( const wxDataFormat& format ); - - // fill data with data on the clipboard (if available) - virtual bool GetData( wxDataObject& data ); - - // clears wxTheClipboard and the system's clipboard if possible - virtual void Clear(); -}; - -#endif //__WX_COCOA_CLIPBRD_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/colordlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/colordlg.h deleted file mode 100644 index 8b13789179..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/colordlg.h +++ /dev/null @@ -1 +0,0 @@ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/colour.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/colour.h deleted file mode 100644 index 97593a3e3f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/colour.h +++ /dev/null @@ -1,92 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/colour.h -// Purpose: wxColour class -// Author: David Elliott -// Modified by: -// Created: 2003/06/17 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_COLOUR_H__ -#define __WX_COCOA_COLOUR_H__ - -#include "wx/object.h" -#include "wx/string.h" - -// ======================================================================== -// wxColour -// ======================================================================== - -class WXDLLIMPEXP_CORE wxColour : public wxColourBase -{ -public: - // constructors - // ------------ - DEFINE_STD_WXCOLOUR_CONSTRUCTORS - - // initialization using existing NSColor - wxColour( WX_NSColor aColor ); - - // copy ctors and assignment operators - wxColour( const wxColour& col ); - wxColour& operator = ( const wxColour& col ); - - virtual ~wxColour(); - - // accessors - virtual bool IsOk() const { return m_cocoaNSColor; } - WX_NSColor GetNSColor() { return m_cocoaNSColor; } - WX_NSColor GetNSColor() const { return m_cocoaNSColor; } - - unsigned char Red() const { return m_red; } - unsigned char Green() const { return m_green; } - unsigned char Blue() const { return m_blue; } - unsigned char Alpha() const { return m_alpha; } - - // comparison - bool operator == (const wxColour& colour) const - { - return m_cocoaNSColor == colour.m_cocoaNSColor || - (m_red == colour.m_red && - m_green == colour.m_green && - m_blue == colour.m_blue && - m_alpha == colour.m_alpha); - } - bool operator != (const wxColour& colour) const - { return !(*this == colour); } - - // Set() functions - void Set( WX_NSColor aColor ); - - // reroute the inherited ones - void Set(unsigned char red, - unsigned char green, - unsigned char blue, - unsigned char alpha = wxALPHA_OPAQUE) - { wxColourBase::Set(red, green, blue, alpha); } - - bool Set(const wxString &str) - { return wxColourBase::Set(str); } - - void Set(unsigned long colRGB) - { wxColourBase::Set(colRGB); } - -protected: - // puts the object in an invalid, uninitialized state - void Init(); - - virtual void - InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); - -private: - WX_NSColor m_cocoaNSColor; - unsigned char m_red; - unsigned char m_green; - unsigned char m_blue; - unsigned char m_alpha; - - DECLARE_DYNAMIC_CLASS(wxColour) -}; - -#endif // __WX_COCOA_COLOUR_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/combobox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/combobox.h deleted file mode 100644 index dc09cf216c..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/combobox.h +++ /dev/null @@ -1,157 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/combobox.h -// Purpose: wxComboBox class -// Author: Ryan Norton -// Modified by: -// Created: 2005/02/16 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_COMBOBOX_H__ -#define __WX_COCOA_COMBOBOX_H__ - -//Begin NSComboBox.h - -#include "wx/hashmap.h" -#include "wx/cocoa/ObjcAssociate.h" - -#include "wx/textctrl.h" - -DECLARE_WXCOCOA_OBJC_CLASS(NSComboBox); - -WX_DECLARE_OBJC_HASHMAP(NSComboBox); -class wxCocoaNSComboBox -{ - WX_DECLARE_OBJC_INTERFACE_HASHMAP(NSComboBox) -public: - void AssociateNSComboBox(WX_NSComboBox cocoaNSComboBox); - void DisassociateNSComboBox(WX_NSComboBox cocoaNSComboBox); - - virtual void doWxEvent(int nEvent) = 0; - virtual ~wxCocoaNSComboBox() { } -}; - -//begin combobox.h - -#include "wx/dynarray.h" - -// ======================================================================== -// wxComboBox -// ======================================================================== -class WXDLLIMPEXP_CORE wxComboBox : public wxControl, public wxComboBoxBase, protected wxCocoaNSComboBox, protected wxCocoaNSTextField -{ - DECLARE_DYNAMIC_CLASS(wxComboBox) - DECLARE_EVENT_TABLE() - WX_DECLARE_COCOA_OWNER(NSComboBox,NSTextField,NSView) - WX_DECLARE_COCOA_OWNER(NSTextField,NSControl,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxComboBox() { } - wxComboBox(wxWindow *parent, wxWindowID winid, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) - { - Create(parent, winid, value, pos, size, n, choices, style, validator, name); - } - wxComboBox(wxWindow *parent, wxWindowID winid, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) - { - Create(parent, winid, value, pos, size, choices, style, - validator, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - bool Create(wxWindow *parent, wxWindowID winid, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - virtual ~wxComboBox(); - -// ------------------------------------------------------------------------ -// Cocoa callbacks -// ------------------------------------------------------------------------ -protected: - wxArrayPtrVoid m_Datas; - virtual void doWxEvent(int nEvent); - - virtual void Cocoa_didChangeText() - {} -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - void Clear() // HACK - { wxComboBoxBase::Clear(); } - - // wxCombobox methods - virtual void SetSelection(int pos); - // Overlapping methods - virtual wxString GetStringSelection(); - // wxItemContainer - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int n); - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int) const; - virtual void SetString(unsigned int pos, const wxString&); - virtual int FindString(const wxString& s, bool bCase = false) const; - virtual int GetSelection() const; - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, wxClientDataType type); - virtual void DoSetItemClientData(unsigned int, void*); - virtual void* DoGetItemClientData(unsigned int) const; - virtual bool IsSorted() const { return HasFlag(wxCB_SORT); } - -// ------------------------------------------------------------------------ -// wxTextEntryBase virtual implementations: -// ------------------------------------------------------------------------ - // FIXME: This needs to be moved to some sort of common code. - virtual void WriteText(const wxString&); - virtual wxString GetValue() const; - virtual void Remove(long, long); - virtual void Cut(); - virtual void Copy(); - virtual void Paste(); - virtual void Undo(); - virtual void Redo(); - virtual bool CanUndo() const; - virtual bool CanRedo() const; - virtual void SetInsertionPoint(long pos); - virtual long GetInsertionPoint() const; - virtual wxTextPos GetLastPosition() const; - virtual void SetSelection(long from, long to); - virtual void GetSelection(long *from, long *to) const; - virtual bool IsEditable() const; - virtual void SetEditable(bool editable); - -private: - // implement wxTextEntry pure virtual method - virtual wxWindow *GetEditableWindow() { return this; } -}; - -#endif // __WX_COCOA_COMBOBOX_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/control.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/control.h deleted file mode 100644 index cb493202a6..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/control.h +++ /dev/null @@ -1,77 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/control.h -// Purpose: wxControl class -// Author: David Elliott -// Modified by: -// Created: 2003/02/15 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_CONTROL_H__ -#define __WX_COCOA_CONTROL_H__ - -#include "wx/cocoa/NSControl.h" - -// ======================================================================== -// wxControl -// ======================================================================== - -class WXDLLIMPEXP_CORE wxControl : public wxControlBase, public wxCocoaNSControl -{ - DECLARE_ABSTRACT_CLASS(wxControl) - WX_DECLARE_COCOA_OWNER(NSControl,NSView,NSView) - DECLARE_EVENT_TABLE() -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxControl() {} - wxControl(wxWindow *parent, wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxControlNameStr) - { - Create(parent, winid, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxControlNameStr); - virtual ~wxControl(); - -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - - // implementation from now on - // -------------------------- - - void OnEraseBackground(wxEraseEvent& event); - - virtual void Command(wxCommandEvent& event) { ProcessCommand(event); } - - // Calls the callback and appropriate event handlers - bool ProcessCommand(wxCommandEvent& event); - - // Enables the control - virtual void CocoaSetEnabled(bool enable); -protected: - virtual wxSize DoGetBestSize() const; - - // Provides a common implementation of title setting which strips mnemonics - // and then calls setTitle: with the stripped string. May be implemented - // to call setTitleWithMnemonic: on OpenStep-compatible systems. Only - // intended for use by views or cells which implement at least setTitle: - // and possibly setTitleWithMnemonic: such as NSBox and NSButton or NSCell - // classes, for example as used by wxRadioBox. Not usable with classes like - // NSTextField which expect setStringValue:. - static void CocoaSetLabelForObject(const wxString& labelWithWxMnemonic, struct objc_object *anObject); -}; - -#endif - // __WX_COCOA_CONTROL_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/cursor.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/cursor.h deleted file mode 100644 index 54209f0b19..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/cursor.h +++ /dev/null @@ -1,64 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/cursor.h -// Purpose: wxCursor class -// Author: David Elliott -// Modified by: -// Created: 2002/11/27 -// Copyright: (c) David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_CURSOR_H_ -#define _WX_COCOA_CURSOR_H_ - -#include "wx/bitmap.h" - -class WXDLLIMPEXP_CORE wxCursorRefData : public wxGDIRefData -{ -public: - wxCursorRefData(); - virtual ~wxCursorRefData(); - -protected: - int m_width, m_height; - WX_NSCursor m_hCursor; - - friend class WXDLLIMPEXP_FWD_CORE wxBitmap; - friend class WXDLLIMPEXP_FWD_CORE wxCursor; - - wxDECLARE_NO_COPY_CLASS(wxCursorRefData); -}; - -#define M_CURSORDATA ((wxCursorRefData *)m_refData) -#define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData) - -// Cursor -class WXDLLIMPEXP_CORE wxCursor: public wxBitmap -{ -public: - wxCursor(); - - wxCursor(const wxString& name, wxBitmapType type = wxCURSOR_DEFAULT_TYPE, - int hotSpotX = 0, int hotSpotY = 0); - - wxCursor(wxStockCursor id) { InitFromStock(id); } -#if WXWIN_COMPATIBILITY_2_8 - wxCursor(int id) { InitFromStock((wxStockCursor)id); } -#endif - virtual ~wxCursor(); - - // FIXME: operator==() is wrong! - bool operator==(const wxCursor& cursor) const { return m_refData == cursor.m_refData; } - bool operator!=(const wxCursor& cursor) const { return !(*this == cursor); } - - WX_NSCursor GetNSCursor() const { return M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0; } - -private: - void InitFromStock(wxStockCursor); - DECLARE_DYNAMIC_CLASS(wxCursor) -}; - -extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor); - -#endif - // _WX_COCOA_CURSOR_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dataform.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dataform.h deleted file mode 100644 index 870ddb0470..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dataform.h +++ /dev/null @@ -1,50 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/dataform.h -// Purpose: declaration of the wxDataFormat class -// Author: David Elliott -// Modified by: -// Created: 2003/07/23 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_DATAFORM_H__ -#define __WX_COCOA_DATAFORM_H__ - -class wxDataFormat -{ -public: - wxDataFormat(unsigned int uFormat = wxDF_INVALID) { m_uFormat = uFormat; } - wxDataFormat(const wxString& zFormat) { SetId(zFormat); } - - wxDataFormat& operator=(unsigned int uFormat) { m_uFormat = uFormat; return(*this); } - wxDataFormat& operator=(const wxDataFormat& rFormat) {m_uFormat = rFormat.m_uFormat; return(*this); } - - // - // Comparison (must have both versions) - // - bool operator==(wxDataFormatId eFormat) const { return (m_uFormat == (unsigned int)eFormat); } - bool operator!=(wxDataFormatId eFormat) const { return (m_uFormat != (unsigned int)eFormat); } - bool operator==(const wxDataFormat& rFormat) const { return (m_uFormat == rFormat.m_uFormat); } - bool operator!=(const wxDataFormat& rFormat) const { return (m_uFormat != rFormat.m_uFormat); } - operator unsigned int(void) const { return m_uFormat; } - - unsigned int GetFormatId(void) const { return (unsigned int)m_uFormat; } - unsigned int GetType(void) const { return (unsigned int)m_uFormat; } - - bool IsStandard(void) const; - - void SetType(unsigned int uType){ m_uFormat = uType; } - - // - // String ids are used for custom types - this SetId() must be used for - // application-specific formats - // - wxString GetId(void) const; - void SetId(const wxString& WXUNUSED(pId)) { /* TODO */ } - -private: - unsigned int m_uFormat; -}; // end of CLASS wxDataFormat - -#endif // __WX_COCOA_DATAFORM_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dataobj.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dataobj.h deleted file mode 100644 index d525029f9c..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dataobj.h +++ /dev/null @@ -1,23 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/dataobj.h -// Purpose: declaration of the wxDataObject -// Author: David Elliott -// Modified by: -// Created: 2003/07/23 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_DATAOBJ_H__ -#define __WX_COCOA_DATAOBJ_H__ - -class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase -{ -public: - wxDataObject(); - virtual ~wxDataObject(); - virtual bool IsSupportedFormat(const wxDataFormat& format, - Direction dir = Get) const; -}; - -#endif // __WX_COCOA_DATAOBJ_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dataobj2.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dataobj2.h deleted file mode 100644 index b824fe933e..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dataobj2.h +++ /dev/null @@ -1,83 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/dataobj2.h -// Purpose: declaration of standard wxDataObjectSimple-derived classes -// Author: David Elliott -// Modified by: -// Created: 2003/07/23 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_DATAOBJ2_H__ -#define __WX_COCOA_DATAOBJ2_H__ - -//========================================================================= -// wxBitmapDataObject is a specialization of wxDataObject for bitmaps -//========================================================================= -class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase -{ -public: - // ctors - wxBitmapDataObject(); - wxBitmapDataObject(const wxBitmap& bitmap); - - // destr - virtual ~wxBitmapDataObject(); - - // override base class virtual to update PNG data too - virtual void SetBitmap(const wxBitmap& bitmap); - - // implement base class pure virtuals - // ---------------------------------- - - virtual size_t GetDataSize() const { return m_pngSize; } - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); - -protected: - void Init() { m_pngData = NULL; m_pngSize = 0; } - void Clear() { free(m_pngData); } - void ClearAll() { Clear(); Init(); } - - size_t m_pngSize; - void *m_pngData; - - void DoConvertToPng(); - -private: - // virtual function hiding supression - size_t GetDataSize(const wxDataFormat& format) const - { return(wxDataObjectSimple::GetDataSize(format)); } - bool GetDataHere(const wxDataFormat& format, void* pBuf) const - { return(wxDataObjectSimple::GetDataHere(format, pBuf)); } - bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf) - { return(wxDataObjectSimple::SetData(format, nLen, pBuf)); } -}; - -//========================================================================= -// wxFileDataObject is a specialization of wxDataObject for file names -//========================================================================= - -class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase -{ -public: - // implement base class pure virtuals - // ---------------------------------- - - void AddFile( const wxString &filename ); - - virtual size_t GetDataSize() const; - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); - -private: - // virtual function hiding supression - size_t GetDataSize(const wxDataFormat& format) const - { return(wxDataObjectSimple::GetDataSize(format)); } - bool GetDataHere(const wxDataFormat& format, void* pBuf) const - { return(wxDataObjectSimple::GetDataHere(format, pBuf)); } - bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf) - { return(wxDataObjectSimple::SetData(format, nLen, pBuf)); } -}; - -#endif //__WX_COCOA_DATAOBJ2_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dc.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dc.h deleted file mode 100644 index 0d4fec2065..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dc.h +++ /dev/null @@ -1,174 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/dc.h -// Purpose: wxDC -// Author: David Elliott -// Modified by: -// Created: 2003/04/01 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_DC_H__ -#define __WX_COCOA_DC_H__ - -DECLARE_WXCOCOA_OBJC_CLASS(NSAffineTransform); - -#include "wx/dc.h" - -class WXDLLIMPEXP_FWD_CORE wxCocoaDCImpl; -WX_DECLARE_LIST(wxCocoaDCImpl, wxCocoaDCStack); - -//========================================================================= -// wxDC -//========================================================================= -class WXDLLIMPEXP_CORE wxCocoaDCImpl: public wxDCImpl -{ - DECLARE_ABSTRACT_CLASS(wxCocoaDCImpl) - wxDECLARE_NO_COPY_CLASS(wxCocoaDCImpl); -//------------------------------------------------------------------------- -// Initialization -//------------------------------------------------------------------------- -public: - wxCocoaDCImpl(wxDC *owner); - virtual ~wxCocoaDCImpl(); - -//------------------------------------------------------------------------- -// wxCocoa specifics -//------------------------------------------------------------------------- -public: - static void CocoaInitializeTextSystem(); - static void CocoaShutdownTextSystem(); - static WX_NSTextStorage sm_cocoaNSTextStorage; - static WX_NSLayoutManager sm_cocoaNSLayoutManager; - static WX_NSTextContainer sm_cocoaNSTextContainer; - // Create a simple Wx to Bounds transform (just flip the coordinate system) - static WX_NSAffineTransform CocoaGetWxToBoundsTransform(bool isFlipped, float height); -protected: -// DC stack - static wxCocoaDCStack sm_cocoaDCStack; - virtual bool CocoaLockFocus(); - virtual bool CocoaUnlockFocus(); - bool CocoaUnwindStackAndTakeFocus(); - inline bool CocoaTakeFocus() - { - wxCocoaDCStack::compatibility_iterator node = sm_cocoaDCStack.GetFirst(); - if(node && (node->GetData() == this)) - return true; - return CocoaUnwindStackAndTakeFocus(); - } - void CocoaUnwindStackAndLoseFocus(); -// DC flipping/transformation - void CocoaApplyTransformations(); - void CocoaUnapplyTransformations(); - WX_NSAffineTransform m_cocoaWxToBoundsTransform; -// Get bounds rect (for Clear()) - // note: we use void * to mean NSRect * so that we can avoid - // putting NSRect in the headers. - virtual bool CocoaGetBounds(void *rectData); -// Blitting - virtual bool CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest, - wxCoord width, wxCoord height, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode logicalFunc, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask); -//------------------------------------------------------------------------- -// Implementation -//------------------------------------------------------------------------- -public: - // implement base class pure virtuals - // ---------------------------------- - - virtual void Clear(); - - virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; } - virtual void EndDoc(void) {} - - virtual void StartPage(void) {} - virtual void EndPage(void) {} - - virtual void SetFont(const wxFont& font); - virtual void SetPen(const wxPen& pen); - virtual void SetBrush(const wxBrush& brush); - virtual void SetBackground(const wxBrush& brush); - virtual void SetBackgroundMode(int mode) { m_backgroundMode = mode; } - virtual void SetPalette(const wxPalette& palette); - - virtual void DestroyClippingRegion(); - - virtual wxCoord GetCharHeight() const; - virtual wxCoord GetCharWidth() const; - virtual void DoGetTextExtent(const wxString& string, - wxCoord *x, wxCoord *y, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const; - - virtual bool CanDrawBitmap() const; - virtual bool CanGetTextExtent() const; - virtual int GetDepth() const; - virtual wxSize GetPPI() const; - - virtual void SetMapMode(wxMappingMode mode); - virtual void SetUserScale(double x, double y); - - virtual void SetLogicalScale(double x, double y); - virtual void SetLogicalOrigin(wxCoord x, wxCoord y); - virtual void SetDeviceOrigin(wxCoord x, wxCoord y); - virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp); - virtual void SetLogicalFunction(wxRasterOperationMode function); - - virtual void SetTextForeground(const wxColour& colour) ; - virtual void SetTextBackground(const wxColour& colour) ; - - virtual void ComputeScaleAndOrigin(); -protected: - virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style = wxFLOOD_SURFACE); - - virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const; - - virtual void DoDrawPoint(wxCoord x, wxCoord y); - virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); - - virtual void DoDrawArc(wxCoord x1, wxCoord y1, - wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc); - - virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea); - - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, - wxCoord width, wxCoord height, - double radius); - virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - - virtual void DoCrossHair(wxCoord x, wxCoord y); - - virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y); - virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = false); - - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y); - virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, - double angle); - - virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, - int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1); - - // this is gnarly - we can't even call this function DoSetClippingRegion() - // because of virtual function hiding - virtual void DoSetDeviceClippingRegion(const wxRegion& region); - virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord width, wxCoord height); - - virtual void DoGetSize(int *width, int *height) const; - virtual void DoGetSizeMM(int* width, int* height) const; - - virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset); - virtual void DoDrawPolygon(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE); -}; - -#endif // __WX_COCOA_DC_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dcclient.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dcclient.h deleted file mode 100644 index 631c6ffd33..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dcclient.h +++ /dev/null @@ -1,69 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/dcclient.h -// Purpose: wxClientDCImpl, wxPaintDCImpl and wxWindowDCImpl classes -// Author: David Elliott -// Modified by: -// Created: 2003/04/01 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_DCCLIENT_H__ -#define __WX_COCOA_DCCLIENT_H__ - -#include "wx/cocoa/dc.h" - -// DFE: A while ago I stumbled upon the fact that retrieving the parent -// NSView of the content view seems to return the entire window rectangle -// (including decorations). Of course, that is not at all part of the -// Cocoa or OpenStep APIs, but it might be a neat hack. -class WXDLLIMPEXP_CORE wxWindowDCImpl: public wxCocoaDCImpl -{ - DECLARE_DYNAMIC_CLASS(wxWindowDCImpl) -public: - wxWindowDCImpl(wxDC *owner); - // Create a DC corresponding to a window - wxWindowDCImpl(wxDC *owner, wxWindow *win); - virtual ~wxWindowDCImpl(void); - -protected: - wxWindow *m_window; - WX_NSView m_lockedNSView; -// DC stack - virtual bool CocoaLockFocus(); - virtual bool CocoaUnlockFocus(); - bool CocoaLockFocusOnNSView(WX_NSView nsview); - bool CocoaUnlockFocusOnNSView(); - virtual bool CocoaGetBounds(void *rectData); -}; - -class WXDLLIMPEXP_CORE wxClientDCImpl: public wxWindowDCImpl -{ - DECLARE_DYNAMIC_CLASS(wxClientDCImpl) -public: - wxClientDCImpl(wxDC *owner); - // Create a DC corresponding to a window - wxClientDCImpl(wxDC *owner, wxWindow *win); - virtual ~wxClientDCImpl(void); -protected: -// DC stack - virtual bool CocoaLockFocus(); - virtual bool CocoaUnlockFocus(); -}; - -class WXDLLIMPEXP_CORE wxPaintDCImpl: public wxWindowDCImpl -{ - DECLARE_DYNAMIC_CLASS(wxPaintDCImpl) -public: - wxPaintDCImpl(wxDC *owner); - // Create a DC corresponding to a window - wxPaintDCImpl(wxDC *owner, wxWindow *win); - virtual ~wxPaintDCImpl(void); -protected: -// DC stack - virtual bool CocoaLockFocus(); - virtual bool CocoaUnlockFocus(); -}; - -#endif - // __WX_COCOA_DCCLIENT_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dcmemory.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dcmemory.h deleted file mode 100644 index 33846293c3..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dcmemory.h +++ /dev/null @@ -1,54 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/dcmemory.h -// Purpose: wxMemoryDCImpl class -// Author: David Elliott -// Modified by: -// Created: 2003/03/16 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_DCMEMORY_H__ -#define __WX_COCOA_DCMEMORY_H__ - -#include "wx/cocoa/dc.h" - -#include "wx/dcmemory.h" - -class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxCocoaDCImpl -{ - DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl) - -public: - wxMemoryDCImpl(wxMemoryDC *owner) - : wxCocoaDCImpl(owner) - { Init(); } - wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap) - : wxCocoaDCImpl(owner) - { Init(); - owner->SelectObject(bitmap); - } - wxMemoryDCImpl(wxMemoryDC *owner, wxDC *dc ); // Create compatible DC - virtual ~wxMemoryDCImpl(void); - - virtual void DoGetSize(int *width, int *height) const; - virtual void DoSelect(const wxBitmap& bitmap); - -protected: - wxBitmap m_selectedBitmap; - WX_NSImage m_cocoaNSImage; -// DC stack - virtual bool CocoaLockFocus(); - virtual bool CocoaUnlockFocus(); - virtual bool CocoaGetBounds(void *rectData); -// Blitting - virtual bool CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest, - wxCoord width, wxCoord height, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode logicalFunc, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask); - -private: - void Init(); -}; - -#endif - // __WX_COCOA_DCMEMORY_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dcscreen.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dcscreen.h deleted file mode 100644 index af7d4ee54e..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dcscreen.h +++ /dev/null @@ -1,31 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/dcscreen.h -// Purpose: wxScreenDCImpl class -// Author: David Elliott -// Modified by: -// Created: 2003/03/16 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_DCSCREEN_H__ -#define __WX_COCOA_DCSCREEN_H__ - -#include "wx/dcscreen.h" -#include "wx/cocoa/dc.h" - -class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxCocoaDCImpl -{ - DECLARE_DYNAMIC_CLASS(wxScreenDCImpl) -public: - wxScreenDCImpl(wxScreenDC *owner); - wxScreenDCImpl(wxScreenDC *owner, wxDC *dc ); // Create compatible DC - virtual ~wxScreenDCImpl(void); - - // Compatibility with X's requirements for drawing on top of all windows - static bool StartDrawingOnTop(wxWindow* WXUNUSED(window)) { return true; } - static bool StartDrawingOnTop(wxRect* WXUNUSED(rect) = NULL) { return true; } - static bool EndDrawingOnTop() { return true; } -}; - -#endif // __WX_COCOA_DCSCREEN_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dialog.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dialog.h deleted file mode 100644 index 632df8f1bb..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dialog.h +++ /dev/null @@ -1,94 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/dialog.h -// Purpose: wxDialog class -// Author: David Elliott -// Modified by: -// Created: 2002/12/15 -// Copyright: David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_DIALOG_H_ -#define _WX_COCOA_DIALOG_H_ - -#include "wx/defs.h" -// NOTE: we don't need panel.h, but other things expect it to be included -#include "wx/panel.h" -#include "wx/cocoa/NSPanel.h" - -// ======================================================================== -// wxDialog -// ======================================================================== -class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase, protected wxCocoaNSPanel -{ - DECLARE_DYNAMIC_CLASS(wxDialog) - WX_DECLARE_COCOA_OWNER(NSPanel,NSWindow,NSWindow) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxDialog() { Init(); } - -#if WXWIN_COMPATIBILITY_2_6 - // Constructor with a modal flag, but no window id - the old convention - wxDialog(wxWindow *parent, - const wxString& title, bool WXUNUSED(modal), - int x = wxDefaultCoord, int y= wxDefaultCoord, int width = 500, int height = 500, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr) - { - Init(); - Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(width, height), - style, name); - } -#endif // WXWIN_COMPATIBILITY_2_6 - - // Constructor with no modal flag - the new convention. - wxDialog(wxWindow *parent, wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr) - { - Init(); - Create(parent, winid, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString& name = wxDialogNameStr); - - virtual ~wxDialog(); -protected: - void Init(); - -// ------------------------------------------------------------------------ -// Cocoa specifics -// ------------------------------------------------------------------------ -protected: - virtual void CocoaDelegate_windowWillClose(void); - virtual bool Cocoa_canBecomeMainWindow(bool &canBecome) - { canBecome = true; return true; } - -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - virtual bool Show(bool show = true); - - void SetModal(bool flag); - virtual bool IsModal() const { return m_isModal; } - bool m_isModal; - - // For now, same as Show(true) but returns return code - virtual int ShowModal(); - - // may be called to terminate the dialog with the given return code - virtual void EndModal(int retCode); -}; - -#endif // _WX_COCOA_DIALOG_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dirdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dirdlg.h deleted file mode 100644 index 207f79baac..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/dirdlg.h +++ /dev/null @@ -1,50 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/dirdlg.h -// Purpose: wxDirDialog class -// Author: Ryan Norton -// Modified by: Hiroyuki Nakamura(maloninc) -// Created: 2006-01-10 -// Copyright: (c) Ryan Norton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_DIRDLG_H_ -#define _WX_COCOA_DIRDLG_H_ - -DECLARE_WXCOCOA_OBJC_CLASS(NSSavePanel); - -#define wxDirDialog wxCocoaDirDialog -//------------------------------------------------------------------------- -// wxDirDialog -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDirDialog: public wxDirDialogBase -{ - DECLARE_DYNAMIC_CLASS(wxDirDialog) - wxDECLARE_NO_COPY_CLASS(wxDirDialog); -public: - wxDirDialog(wxWindow *parent, - const wxString& message = wxDirSelectorPromptStr, - const wxString& defaultPath = wxT(""), - long style = wxDD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxString& name = wxDirDialogNameStr); - virtual ~wxDirDialog(); - - virtual int ShowModal(); - - inline WX_NSSavePanel GetNSSavePanel() - { return (WX_NSSavePanel)m_cocoaNSWindow; } - -protected: - wxString m_dir; - wxWindow * m_parent; - wxString m_fileName; - -private: - wxArrayString m_fileNames; -}; - -#endif // _WX_DIRDLG_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/drawer.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/drawer.h deleted file mode 100644 index 8b13789179..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/drawer.h +++ /dev/null @@ -1 +0,0 @@ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/evtloop.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/evtloop.h deleted file mode 100644 index 366e46cb1b..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/evtloop.h +++ /dev/null @@ -1,38 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/evtloop.h -// Purpose: declaration of wxGUIEventLoop for wxCocoa -// Author: Vadim Zeitlin -// Created: 2008-12-28 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_EVTLOOP_H_ -#define _WX_COCOA_EVTLOOP_H_ - -// ---------------------------------------------------------------------------- -// wxGUIEventLoop for wxCocoa -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase -{ -public: - wxGUIEventLoop() { m_exitcode = 0; } - - virtual void ScheduleExit(int rc = 0); - virtual bool Pending() const; - virtual bool Dispatch(); - virtual int DispatchTimeout(unsigned long timeout); - virtual void WakeUp() { } - virtual bool YieldFor(long eventsToProcess); - -protected: - virtual int DoRun(); - - int m_exitcode; - - wxDECLARE_NO_COPY_CLASS(wxGUIEventLoop); -}; - -#endif // _WX_COCOA_EVTLOOP_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/filedlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/filedlg.h deleted file mode 100644 index b888be18e7..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/filedlg.h +++ /dev/null @@ -1,52 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/filedlg.h -// Purpose: wxFileDialog class -// Author: Ryan Norton -// Modified by: -// Created: 2004-10-02 -// Copyright: (c) Ryan Norton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_FILEDLG_H_ -#define _WX_COCOA_FILEDLG_H_ - -DECLARE_WXCOCOA_OBJC_CLASS(NSSavePanel); - -#define wxFileDialog wxCocoaFileDialog -//------------------------------------------------------------------------- -// wxFileDialog -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase -{ - DECLARE_DYNAMIC_CLASS(wxFileDialog) - wxDECLARE_NO_COPY_CLASS(wxFileDialog); -public: - wxFileDialog(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr); - virtual ~wxFileDialog(); - - virtual void SetPath(const wxString& path); - virtual void GetPaths(wxArrayString& paths) const; - virtual void GetFilenames(wxArrayString& files) const; - - virtual int ShowModal(); - - inline WX_NSSavePanel GetNSSavePanel() - { return (WX_NSSavePanel)m_cocoaNSWindow; } - -private: - WX_NSMutableArray m_wildcards; - wxArrayString m_fileNames; -}; - -#endif // _WX_FILEDLG_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/font.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/font.h deleted file mode 100644 index c9c245f9e1..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/font.h +++ /dev/null @@ -1,171 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/font.h -// Purpose: wxFont class -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_FONT_H_ -#define _WX_FONT_H_ - -// ---------------------------------------------------------------------------- -// wxFont -// ---------------------------------------------------------------------------- - -DECLARE_WXCOCOA_OBJC_CLASS(NSFont); - -// Internal class that bridges us with code like wxSystemSettings -class wxCocoaFontFactory; -// We have c-tors/methods taking pointers of these -class wxFontRefData; - -/*! @discussion - wxCocoa's implementation of wxFont is very incomplete. In particular, - a lot of work needs to be done on wxNativeFontInfo which is currently - using the totally generic implementation. - - See the documentation in src/cocoa/font.mm for more implementatoin details. - */ -class WXDLLIMPEXP_CORE wxFont : public wxFontBase -{ - friend class wxCocoaFontFactory; -public: - /*! @abstract Default construction of invalid font for 2-step construct then Create process. - */ - wxFont() { } - - wxFont(const wxFontInfo& info) - { - Create(info.GetPointSize(), - info.GetFamily(), - info.GetStyle(), - info.GetWeight(), - info.IsUnderlined(), - info.GetFaceName(), - info.GetEncoding()); - - if ( info.IsUsingSizeInPixels() ) - SetPixelSize(info.GetPixelSize()); - } - - /*! @abstract Platform-independent construction with individual properties - */ -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxFont(int size, - int family, - int style, - int weight, - bool underlined = FALSE, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding); - } -#endif - wxFont(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = FALSE, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - (void)Create(size, family, style, weight, underlined, face, encoding); - } - - wxFont(const wxSize& pixelSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - Create(10, family, style, weight, underlined, face, encoding); - SetPixelSize(pixelSize); - } - - /*! @abstract Construction with opaque wxNativeFontInfo - */ - wxFont(const wxNativeFontInfo& info) - { - (void)Create(info); - } - - /*! @abstract Construction with platform-dependent font descriptor string. - @param fontDesc Usually the result of wxNativeFontInfo::ToUserString() - */ - wxFont(const wxString& fontDesc); - - // NOTE: Copy c-tor and assignment from wxObject is fine - - bool Create(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = FALSE, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - - bool Create(const wxNativeFontInfo& info); - - virtual ~wxFont(); - - // implement base class pure virtuals - virtual int GetPointSize() const; - virtual wxFontStyle GetStyle() const; - virtual wxFontWeight GetWeight() const; - virtual bool GetUnderlined() const; - virtual wxString GetFaceName() const; - virtual wxFontEncoding GetEncoding() const; - virtual const wxNativeFontInfo *GetNativeFontInfo() const; - - virtual void SetPointSize(int pointSize); - virtual void SetFamily(wxFontFamily family); - virtual void SetStyle(wxFontStyle style); - virtual void SetWeight(wxFontWeight weight); - virtual bool SetFaceName(const wxString& faceName); - virtual void SetUnderlined(bool underlined); - virtual void SetEncoding(wxFontEncoding encoding); - - wxDECLARE_COMMON_FONT_METHODS(); - - // implementation only from now on - // ------------------------------- - - /*! @abstract Defined on some ports (not including this one) in wxGDIObject - @discussion - The intention here I suppose is to allow one to create a wxFont without yet - creating the underlying native object. There's no point not to create the - NSFont immediately in wxCocoa so this is useless. - This method came from the stub code copied in the early days of wxCocoa. - FIXME(1): Remove this in trunk. FIXME(2): Is it really a good idea for this to - be part of the public API for wxGDIObject? - */ - virtual bool RealizeResource(); - -protected: - /*! @abstract Internal constructor with ref data - @discussion - Takes ownership of @a refData. That is, it is assumed that refData has either just been - created using new (which initializes its m_refCount to 1) or if you are sharing a ref that - you have called IncRef on it before passing it to this method. - */ - explicit wxFont(wxFontRefData *refData) - { Create(refData); } - bool Create(wxFontRefData *refData); - - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - virtual wxFontFamily DoGetFamily() const; - -private: - DECLARE_DYNAMIC_CLASS(wxFont) -}; - -#endif - // _WX_FONT_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/fontdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/fontdlg.h deleted file mode 100644 index 8b13789179..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/fontdlg.h +++ /dev/null @@ -1 +0,0 @@ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/frame.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/frame.h deleted file mode 100644 index ebdb56ed34..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/frame.h +++ /dev/null @@ -1,106 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/frame.h -// Purpose: wxFrame class -// Author: David Elliott -// Modified by: -// Created: 2003/03/16 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_FRAME_H_ -#define _WX_COCOA_FRAME_H_ - -class WXDLLIMPEXP_FWD_CORE wxMenuBar; -class WXDLLIMPEXP_FWD_CORE wxStatusBar; - -class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase -{ - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxFrame) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxFrame() { Init(); } - wxFrame(wxWindow *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - Create(parent, winid, title, pos, size, style, name); - } - - virtual ~wxFrame(); - - bool Create(wxWindow *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); -protected: - void Init(); -// ------------------------------------------------------------------------ -// Cocoa specifics -// ------------------------------------------------------------------------ -public: - virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win); - // Returns the NSView for non-client drawing - virtual WX_NSView GetNonClientNSView(); - - // Helper function to position status/tool bars - // Also called by native toolbar to force a size update - void UpdateFrameNSView(); - - virtual void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem menuItem); - virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem menuItem); -protected: - virtual void CocoaSetWxWindowSize(int width, int height); - - virtual void CocoaReplaceView(WX_NSView oldView, WX_NSView newView); - // frameNSView is used whenever a statusbar/generic toolbar are present - WX_NSView m_frameNSView; -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - virtual void AttachMenuBar(wxMenuBar *mbar); - virtual void DetachMenuBar(); - virtual void SetMenuBar(wxMenuBar *menubar); - - // implementation only from now on - // ------------------------------- - - // override some more virtuals - - // get the origin of the client area (which may be different from (0, 0) - // if the frame has a toolbar) in client coordinates - virtual wxPoint GetClientAreaOrigin() const; - - // create the main status bar by calling OnCreateStatusBar() - virtual wxStatusBar* CreateStatusBar(int number = 1, - long style = wxSTB_DEFAULT_STYLE, - wxWindowID winid = 0, - const wxString& name = - wxStatusLineNameStr); - // sets the main status bar - void SetStatusBar(wxStatusBar *statBar); -#if wxUSE_TOOLBAR - // create main toolbar bycalling OnCreateToolBar() - virtual wxToolBar* CreateToolBar(long style = -1, - wxWindowID winid = wxID_ANY, - const wxString& name = wxToolBarNameStr); - // sets the main tool bar - virtual void SetToolBar(wxToolBar *toolbar); -#endif //wxUSE_TOOLBAR -protected: - void PositionStatusBar(); -}; - -#endif // _WX_COCOA_FRAME_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/gauge.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/gauge.h deleted file mode 100644 index ffadb1c27b..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/gauge.h +++ /dev/null @@ -1,73 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/gauge.h -// Purpose: wxGauge class -// Author: David Elliott -// Modified by: -// Created: 2003/07/15 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_GAUGE_H__ -#define __WX_COCOA_GAUGE_H__ - -// #include "wx/cocoa/NSProgressIndicator.h" - -DECLARE_WXCOCOA_OBJC_CLASS(NSProgressIndicator); - -// ======================================================================== -// wxGauge -// ======================================================================== -class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase// , protected wxCocoaNSProgressIndicator -{ - DECLARE_DYNAMIC_CLASS(wxGauge) - DECLARE_EVENT_TABLE() -// WX_DECLARE_COCOA_OWNER(NSProgressIndicator,NSView,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxGauge() { } - wxGauge(wxWindow *parent, wxWindowID winid, int range, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxGA_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxGaugeNameStr) - { - Create(parent, winid, range, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, int range, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxGA_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxGaugeNameStr); - virtual ~wxGauge(); - -// ------------------------------------------------------------------------ -// Cocoa callbacks -// ------------------------------------------------------------------------ -public: - inline WX_NSProgressIndicator GetNSProgressIndicator() const { return (WX_NSProgressIndicator)m_cocoaNSView; } -protected: - // NSProgressIndicator cannot be enabled/disabled - virtual void CocoaSetEnabled(bool WXUNUSED(enable)) { } -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - // Pure Virtuals - virtual int GetValue() const; - virtual void SetValue(int value); - - // retrieve/change the range - virtual void SetRange(int maxValue); - int GetRange(void) const; -protected: - virtual wxSize DoGetBestSize() const; -}; - -#endif - // __WX_COCOA_GAUGE_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/glcanvas.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/glcanvas.h deleted file mode 100644 index 927c3e05ee..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/glcanvas.h +++ /dev/null @@ -1,97 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/glcanvas.h -// Purpose: wxGLCanvas class -// Author: David Elliott -// Modified by: -// Created: 2004/09/29 -// Copyright: (c) 2004 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_GLCANVAS_H__ -#define _WX_COCOA_GLCANVAS_H__ - -#include "wx/window.h" - -// #include "wx/cocoa/NSOpenGLView.h" -// Include gl.h from the OpenGL framework -#include - -class WXDLLIMPEXP_FWD_GL wxGLCanvas; -DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLContext); -DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLView); - -// ======================================================================== -// wxGLContext -// ======================================================================== - -class WXDLLIMPEXP_GL wxGLContext : public wxGLContextBase -{ -public: - wxGLContext(wxGLCanvas *win, const wxGLContext *other = NULL); - - virtual ~wxGLContext(); - - virtual void SetCurrent(const wxGLCanvas& win) const; - - WX_NSOpenGLContext GetNSOpenGLContext() const - { return m_cocoaNSOpenGLContext; } - -private: - WX_NSOpenGLContext m_cocoaNSOpenGLContext; -}; - -// ======================================================================== -// wxGLCanvas -// ======================================================================== - -class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasBase - // , protected wxCocoaNSOpenGLView -{ - DECLARE_DYNAMIC_CLASS(wxGLCanvas) -// WX_DECLARE_COCOA_OWNER(NSOpenGLView,NSView,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxGLCanvas(wxWindow *parent, - wxWindowID id = wxID_ANY, - const int *attribList = NULL, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette) - { - Create(parent, id, pos, size, style, name, attribList, palette); - } - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette); - - virtual ~wxGLCanvas(); - -// ------------------------------------------------------------------------ -// Cocoa callbacks -// ------------------------------------------------------------------------ -protected: - // NSOpenGLView cannot be enabled/disabled - virtual void CocoaSetEnabled(bool enable) { } -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - virtual void SwapBuffers(); - - - NSOpenGLView *GetNSOpenGLView() const - { return (NSOpenGLView *)m_cocoaNSView; } -}; - -#endif //ndef _WX_COCOA_GLCANVAS_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/icon.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/icon.h deleted file mode 100644 index ac041ba354..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/icon.h +++ /dev/null @@ -1,63 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/icon.h -// Purpose: wxIcon class -// Author: David Elliott -// Modified by: -// Created: 2003/08/11 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_ICON_H__ -#define _WX_COCOA_ICON_H__ - -#include "wx/gdicmn.h" -#include "wx/gdiobj.h" - -// ======================================================================== -// wxIcon -// ======================================================================== -class WXDLLIMPEXP_CORE wxIcon : public wxGDIObject -{ -public: - wxIcon(); - - wxIcon(const char* const* data) { CreateFromXpm(data); } - wxIcon(const char bits[], int width , int height ); - wxIcon(const wxString& name, int flags = wxICON_DEFAULT_TYPE, - int desiredWidth = -1, int desiredHeight = -1); - wxIcon(const wxIconLocation& loc) - { - LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON); - } - virtual ~wxIcon(); - - bool LoadFile(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE, - int desiredWidth=-1, int desiredHeight=-1); - - bool operator==(const wxIcon& icon) const - { return m_refData == icon.m_refData; } - bool operator!=(const wxIcon& icon) const { return !(*this == icon); } - - // create from bitmap (which should have a mask unless it's monochrome): - // there shouldn't be any implicit bitmap -> icon conversion (i.e. no - // ctors, assignment operators...), but it's ok to have such function - void CopyFromBitmap(const wxBitmap& bmp); - - int GetWidth() const; - int GetHeight() const; - - wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); } - - WX_NSImage GetNSImage() const; - bool CreateFromXpm(const char* const* bits); - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - DECLARE_DYNAMIC_CLASS(wxIcon) -}; - -#endif // _WX_COCOA_ICON_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/listbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/listbox.h deleted file mode 100644 index a9f233aa8a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/listbox.h +++ /dev/null @@ -1,114 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/listbox.h -// Purpose: wxListBox class -// Author: David Elliott -// Modified by: -// Created: 2003/03/16 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_LISTBOX_H__ -#define __WX_COCOA_LISTBOX_H__ - -#include "wx/cocoa/NSTableView.h" - -#include "wx/dynarray.h" - -// ======================================================================== -// wxListBox -// ======================================================================== -class WXDLLIMPEXP_CORE wxListBox: public wxListBoxBase, protected wxCocoaNSTableView -{ - DECLARE_DYNAMIC_CLASS(wxListBox) - DECLARE_EVENT_TABLE() - WX_DECLARE_COCOA_OWNER(NSTableView,NSControl,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxListBox() { m_cocoaItems = NULL; m_cocoaDataSource = NULL; } - wxListBox(wxWindow *parent, wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr) - { - Create(parent, winid, pos, size, n, choices, style, validator, name); - } - wxListBox(wxWindow *parent, wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr) - { - Create(parent, winid, pos, size, choices, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - bool Create(wxWindow *parent, wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - virtual ~wxListBox(); - -// ------------------------------------------------------------------------ -// Cocoa callbacks -// ------------------------------------------------------------------------ -protected: - virtual int CocoaDataSource_numberOfRows(); - virtual struct objc_object* CocoaDataSource_objectForTableColumn( - WX_NSTableColumn tableColumn, int rowIndex); - WX_NSMutableArray m_cocoaItems; - wxArrayPtrVoid m_itemClientData; - struct objc_object *m_cocoaDataSource; - bool m_needsUpdate; - inline bool _WxCocoa_GetNeedsUpdate(); - inline void _WxCocoa_SetNeedsUpdate(bool needsUpdate); - virtual void OnInternalIdle(); -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - virtual wxSize DoGetBestSize() const; -// pure virtuals from wxListBoxBase - virtual bool IsSelected(int n) const; - virtual int GetSelections(wxArrayInt& aSelections) const; -protected: - virtual void DoSetFirstItem(int n); - virtual void DoSetSelection(int n, bool select); - -// pure virtuals from wxItemContainer -public: - // deleting items - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int n); - // accessing strings - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& s); - virtual int FindString(const wxString& s, bool bCase = false) const; - // selection - virtual int GetSelection() const; -protected: - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, wxClientDataType type); - virtual void DoSetItemClientData(unsigned int n, void* clientData); - virtual void* DoGetItemClientData(unsigned int n) const; -}; - -#endif // __WX_COCOA_LISTBOX_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/log.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/log.h deleted file mode 100644 index 82f9319a48..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/log.h +++ /dev/null @@ -1,21 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/log.h -// Purpose: Declare wxCocoa-specific trace masks -// Author: David Elliott -// Modified by: -// Created: 2004/02/07 -// Copyright: (c) 2004 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_LOG_H__ -#define _WX_COCOA_LOG_H__ - -// General tracing (in lieu of wxLogDebug) -#define wxTRACE_COCOA wxT("COCOA") -// Specific tracing -#define wxTRACE_COCOA_RetainRelease wxT("COCOA_RetainRelease") -#define wxTRACE_COCOA_TopLevelWindow_Size wxT("COCOA_TopLevelWindow_Size") -#define wxTRACE_COCOA_Window_Size wxT("COCOA_Window_Size") - -#endif //ndef _WX_COCOA_LOG_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/mbarman.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/mbarman.h deleted file mode 100644 index 0223cb5c74..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/mbarman.h +++ /dev/null @@ -1,70 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/mbarman.h -// Purpose: wxMenuBarManager class -// Author: David Elliott -// Modified by: -// Created: 2003/09/04 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_MBARMAN_H__ -#define __WX_COCOA_MBARMAN_H__ - -#if wxUSE_MENUS - -#include "wx/toplevel.h" - -DECLARE_WXCOCOA_OBJC_CLASS(wxMenuBarManagerObserver); - -// ======================================================================== -// wxMenuBarManager -// ======================================================================== -class WXDLLIMPEXP_CORE wxMenuBarManager : public wxObject -{ -// ------------------------------------------------------------------------ -// initialization/destruction -// ------------------------------------------------------------------------ -public: - wxMenuBarManager(); - virtual ~wxMenuBarManager(); -// ------------------------------------------------------------------------ -// Single instance -// ------------------------------------------------------------------------ -public: - static wxMenuBarManager *GetInstance() { return sm_mbarmanInstance; } - static void CreateInstance(); - static void DestroyInstance(); -protected: - static wxMenuBarManager *sm_mbarmanInstance; -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - void SetMainMenuBar(wxMenuBar* menubar); - void WindowDidBecomeKey(NSNotification *notification); -#if 0 - void WindowDidResignKey(NSNotification *notification); - void WindowDidBecomeMain(NSNotification *notification); - void WindowDidResignMain(NSNotification *notification); - void WindowWillClose(NSNotification *notification); -#endif // 0 - void UpdateMenuBar(); -protected: - void SetMenuBar(wxMenuBar* menubar); - void InstallMenuBarForWindow(wxCocoaNSWindow *win); - void InstallMainMenu(); - WX_NSMenu m_menuApp; - WX_NSMenu m_menuServices; - WX_NSMenu m_menuWindows; - WX_NSMenu m_menuMain; - // Is main menu bar the current one - bool m_mainMenuBarInstalled; - // Main menu (if app provides one) - wxMenuBar *m_mainMenuBar; - wxMenuBarManagerObserver *m_observer; - WX_NSWindow m_currentNSWindow; -}; - -#endif // wxUSE_MENUS -#endif // _WX_COCOA_MBARMAN_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/mdi.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/mdi.h deleted file mode 100644 index 6cef55caf2..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/mdi.h +++ /dev/null @@ -1,163 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/mdi.h -// Purpose: wxMDIParentFrame, wxMDIChildFrame, wxMDIClientWindow -// Author: David Elliott -// Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes -// Created: 2003/09/08 -// Copyright: (c) 2003 David Elliott -// (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_MDI_H__ -#define __WX_COCOA_MDI_H__ - -#include "wx/frame.h" - -DECLARE_WXCOCOA_OBJC_CLASS(wxMDIParentFrameObserver); - -class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; -class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; - -WX_DECLARE_EXPORTED_LIST(wxMDIChildFrame, wxCocoaMDIChildFrameList); - -// ======================================================================== -// wxMDIParentFrame -// ======================================================================== -class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxMDIParentFrameBase -{ - friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxMDIParentFrame() { Init(); } - wxMDIParentFrame(wxWindow *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - Create(parent, winid, title, pos, size, style, name); - } - - virtual ~wxMDIParentFrame(); - - bool Create(wxWindow *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); -protected: - void Init(); -// ------------------------------------------------------------------------ -// Cocoa specifics -// ------------------------------------------------------------------------ -public: - void WindowDidBecomeMain(NSNotification *notification); -protected: - virtual void CocoaDelegate_windowDidBecomeKey(void); - virtual void CocoaDelegate_windowDidResignKey(void); - virtual bool Cocoa_canBecomeMainWindow(bool &canBecome); - virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win); - - void AddMDIChild(wxMDIChildFrame *child); - void RemoveMDIChild(wxMDIChildFrame *child); - - wxMDIParentFrameObserver *m_observer; -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - void SetActiveChild(wxMDIChildFrame *child); - - // implement base class pure virtuals - // ---------------------------------- - - static bool IsTDI() { return false; } - - virtual void ActivateNext() { /* TODO */ } - virtual void ActivatePrevious() { /* TODO */ } - -protected: - wxMDIClientWindow *m_clientWindow; - wxMDIChildFrame *m_currentChild; - wxCocoaMDIChildFrameList m_mdiChildren; -}; - -// ======================================================================== -// wxMDIChildFrame -// ======================================================================== -class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame -{ - friend class WXDLLIMPEXP_FWD_CORE wxMDIParentFrame; - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxMDIChildFrame) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxMDIChildFrame() { Init(); } - wxMDIChildFrame(wxMDIParentFrame *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - Create(parent, winid, title, pos, size, style, name); - } - - virtual ~wxMDIChildFrame(); - - bool Create(wxMDIParentFrame *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); -protected: - void Init(); -// ------------------------------------------------------------------------ -// Cocoa specifics -// ------------------------------------------------------------------------ -public: -protected: - virtual void CocoaDelegate_windowDidBecomeKey(void); - virtual void CocoaDelegate_windowDidBecomeMain(void); - virtual void CocoaDelegate_windowDidResignKey(void); -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - virtual void Activate(); - virtual bool Destroy(); -protected: - wxMDIParentFrame *m_mdiParent; -}; - -// ======================================================================== -// wxMDIClientWindow -// ======================================================================== -class wxMDIClientWindow : public wxMDIClientWindowBase -{ -public: - wxMDIClientWindow() { } - - virtual bool CreateClient(wxMDIParentFrame *parent, - long style = wxHSCROLL | wxVSCROLL); - - DECLARE_DYNAMIC_CLASS(wxMDIClientWindow) -}; - -#endif // __WX_COCOA_MDI_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/menu.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/menu.h deleted file mode 100644 index 0cb304126f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/menu.h +++ /dev/null @@ -1,185 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/menu.h -// Purpose: wxMenu and wxMenuBar classes -// Author: David Elliott -// Modified by: -// Created: 2002/12/09 -// Copyright: (c) 2002 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_MENU_H__ -#define __WX_COCOA_MENU_H__ - -#include "wx/cocoa/NSMenu.h" - -#if wxUSE_ACCEL - #include "wx/accel.h" -#endif // wxUSE_ACCEL - -// ======================================================================== -// wxMenu -// ======================================================================== - -class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase, public wxCocoaNSMenu -{ -public: - // ctors and dtor - wxMenu(const wxString& title, long style = 0) - : wxMenuBase(title, style) - , m_cocoaDeletes(false) - { Create(title,style); } - bool Create(const wxString& title, long style = 0); - - wxMenu(long style = 0) : wxMenuBase(style) { Create(wxEmptyString, style); } - - virtual ~wxMenu(); - -// ------------------------------------------------------------------------ -// Cocoa specifics -// ------------------------------------------------------------------------ -public: - inline WX_NSMenu GetNSMenu() { return m_cocoaNSMenu; } - void SetCocoaDeletes(bool cocoaDeletes); - virtual void Cocoa_dealloc(); -protected: - WX_NSMenu m_cocoaNSMenu; - bool m_cocoaDeletes; -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -protected: - // implement base class virtuals - virtual wxMenuItem* DoAppend(wxMenuItem *item); - virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); - virtual wxMenuItem* DoRemove(wxMenuItem *item); - -#if wxUSE_ACCEL - // add/remove accel for the given menu item - void AddAccelFor(wxMenuItem *item); - void RemoveAccelFor(wxMenuItem *item); -#endif // wxUSE_ACCEL - -private: -#if wxUSE_ACCEL - // the accel table for this menu - wxAcceleratorTable m_accelTable; -#endif // wxUSE_ACCEL - - DECLARE_DYNAMIC_CLASS(wxMenu) -}; - -// ======================================================================== -// wxMenuBar -// ======================================================================== -class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase -{ -public: - // ctors and dtor - wxMenuBar(long style = 0) { Create(style); } - wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); - bool Create(long style = 0); - virtual ~wxMenuBar(); - -// ------------------------------------------------------------------------ -// Cocoa specifics -// ------------------------------------------------------------------------ -public: - inline WX_NSMenu GetNSMenu() { return m_cocoaNSMenu; } -protected: - WX_NSMenu m_cocoaNSMenu; -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - // implement base class virtuals - virtual bool Append(wxMenu *menu, const wxString &title); - virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title); - virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title); - virtual wxMenu *Remove(size_t pos); - - virtual void EnableTop(size_t pos, bool enable); - virtual bool IsEnabledTop(size_t pos) const; - - virtual void SetMenuLabel(size_t pos, const wxString& label); - virtual wxString GetMenuLabel(size_t pos) const; - - virtual void Attach(wxFrame *frame); - virtual void Detach(); - - // get the next item for the givan accel letter (used by wxFrame), return - // -1 if none - // - // if unique is not NULL, filled with TRUE if there is only one item with - // this accel, FALSE if two or more - int FindNextItemForAccel(int idxStart, - int keycode, - bool *unique = NULL) const; - - // called by wxFrame to set focus to or open the given menu - void SelectMenu(size_t pos); - -#if wxUSE_ACCEL - // find the item for the given accel and generate an event if found - bool ProcessAccelEvent(const wxKeyEvent& event); -#endif // wxUSE_ACCEL - -protected: - // event handlers - void OnLeftDown(wxMouseEvent& event); - void OnMouseMove(wxMouseEvent& event); - void OnKeyDown(wxKeyEvent& event); - void OnKillFocus(wxFocusEvent& event); - - // process the mouse move event, return TRUE if we did, FALSE to continue - // processing as usual - // - // the coordinates are client coordinates of menubar, convert if necessary - bool ProcessMouseEvent(const wxPoint& pt); - - // menubar geometry - virtual wxSize DoGetBestClientSize() const; - - // has the menubar been created already? - bool IsCreated() const { return m_frameLast != NULL; } - - // get the (total) width of the specified menu - wxCoord GetItemWidth(size_t pos) const; - - // get the rect of the item - wxRect GetItemRect(size_t pos) const; - - // get the menu from the given point or -1 if none - int GetMenuFromPoint(const wxPoint& pos) const; - - // refresh the given item - void RefreshItem(size_t pos); - - // refresh all items after this one (including it) - void RefreshAllItemsAfter(size_t pos); - - // do we show a menu currently? - bool IsShowingMenu() const { return m_menuShown != 0; } - - // we don't want to have focus except while selecting from menu - void GiveAwayFocus(); - - // the current item (only used when menubar has focus) - int m_current; - -private: - // the last frame to which we were attached, NULL initially - wxFrame *m_frameLast; - - // the currently shown menu or NULL - wxMenu *m_menuShown; - - // should be showing the menu? this is subtly different from m_menuShown != - // NULL as the menu which should be shown may be disabled in which case we - // don't show it - but will do as soon as the focus shifts to another menu - bool m_shouldShowMenu; - - DECLARE_DYNAMIC_CLASS(wxMenuBar) -}; - -#endif // _WX_COCOA_MENU_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/menuitem.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/menuitem.h deleted file mode 100644 index 23983171bb..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/menuitem.h +++ /dev/null @@ -1,99 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/menuitem.h -// Purpose: wxMenuItem class -// Author: David Elliott -// Modified by: -// Created: 2002/12/13 -// Copyright: (c) 2002 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_MENUITEM_H_ -#define _WX_COCOA_MENUITEM_H_ - -#include "wx/hashmap.h" -#include "wx/bitmap.h" - -#include "wx/cocoa/ObjcRef.h" - -// ======================================================================== -// wxMenuItem -// ======================================================================== - -#define wxMenuItemCocoa wxMenuItem -class wxMenuItemCocoa; -WX_DECLARE_HASH_MAP(WX_NSMenuItem,wxMenuItem*,wxPointerHash,wxPointerEqual,wxMenuItemCocoaHash); - -class WXDLLIMPEXP_CORE wxMenuItemCocoa : public wxMenuItemBase -{ -public: -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ - wxMenuItemCocoa(wxMenu *parentMenu = NULL, - int id = wxID_SEPARATOR, - const wxString& name = wxEmptyString, - const wxString& help = wxEmptyString, - wxItemKind kind = wxITEM_NORMAL, - wxMenu *subMenu = NULL); - virtual ~wxMenuItemCocoa(); - -// ------------------------------------------------------------------------ -// Cocoa specifics -// ------------------------------------------------------------------------ -public: - inline WX_NSMenuItem GetNSMenuItem() { return m_cocoaNSMenuItem; } - static inline wxMenuItem* GetFromCocoa(WX_NSMenuItem cocoaNSMenuItem) - { - wxMenuItemCocoaHash::iterator iter=sm_cocoaHash.find(cocoaNSMenuItem); - if(iter!=sm_cocoaHash.end()) - return iter->second; - return NULL; - } - void CocoaItemSelected(); - bool Cocoa_validateMenuItem(); -protected: - void CocoaSetKeyEquivalent(); - WX_NSMenuItem m_cocoaNSMenuItem; - static wxMenuItemCocoaHash sm_cocoaHash; - static wxObjcAutoRefFromAlloc sm_cocoaTarget; -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - // override base class virtuals to update the item appearance on screen - virtual void SetItemLabel(const wxString& text); - virtual void SetCheckable(bool checkable); - - virtual void Enable(bool enable = TRUE); - virtual void Check(bool check = TRUE); - - // we add some extra functions which are also available under MSW from - // wxOwnerDrawn class - they will be moved to wxMenuItemBase later - // hopefully - void SetBitmaps(const wxBitmap& bmpChecked, - const wxBitmap& bmpUnchecked = wxNullBitmap); - void SetBitmap(const wxBitmap& bmp) { SetBitmaps(bmp); } - const wxBitmap& GetBitmap(bool checked = TRUE) const - { return checked ? m_bmpChecked : m_bmpUnchecked; } - -protected: - // notify the menu about the change in this item - inline void NotifyMenu(); - - // set the accel index and string from text - void UpdateAccelInfo(); - - // the bitmaps (may be invalid, then they're not used) - wxBitmap m_bmpChecked, - m_bmpUnchecked; - - // the accel string (i.e. "Ctrl-Q" or "Alt-F1") - wxString m_strAccel; - -private: - DECLARE_DYNAMIC_CLASS(wxMenuItem) -}; - -#endif // _WX_COCOA_MENUITEM_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/msgdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/msgdlg.h deleted file mode 100644 index 4a313c44af..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/msgdlg.h +++ /dev/null @@ -1,70 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/msgdlg.h -// Purpose: wxMessageDialog class -// Author: Gareth Simpson -// Created: 2007-10-29 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_MSGDLG_H_ -#define _WX_COCOA_MSGDLG_H_ - -#include "wx/msgdlg.h" - -DECLARE_WXCOCOA_OBJC_CLASS(NSAlert); - -#ifndef wxUSE_COCOA_NATIVE_MSGDLG -// trunk: Always use Cocoa dialog -// 2.8: Only use Cocoa dialog if ABI incompatible features is on -// Build both on both branches (there was no wxCocoaMessageDialog class so it's not an ABI issue) - #if 1/* wxUSE_ABI_INCOMPATIBLE_FEATURES */ - #define wxUSE_COCOA_NATIVE_MSGDLG 1 - #else - #define wxUSE_COCOA_NATIVE_MSGDLG 0 - #endif -#endif - -#if wxUSE_COCOA_NATIVE_MSGDLG - #define wxMessageDialog wxCocoaMessageDialog -#else - #include "wx/generic/msgdlgg.h" - - #define wxMessageDialog wxGenericMessageDialog -#endif - -// ---------------------------------------------------------------------------- -// wxCocoaMessageDialog -// ---------------------------------------------------------------------------- - - -class WXDLLIMPEXP_CORE wxCocoaMessageDialog - : public wxMessageDialogWithCustomLabels -{ -public: - wxCocoaMessageDialog(wxWindow *parent, - const wxString& message, - const wxString& caption = wxMessageBoxCaptionStr, - long style = wxOK|wxCENTRE, - const wxPoint& pos = wxDefaultPosition); - - virtual int ShowModal(); - -protected: - // not supported for message dialog - virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} - - // override wxMessageDialogWithCustomLabels method to get rid of - // accelerators in the custom label strings - // - // VZ: I have no idea _why_ do we do this but the old version did and - // I didn't want to change the existing behaviour - virtual void DoSetCustomLabel(wxString& var, const ButtonLabel& label); - - DECLARE_DYNAMIC_CLASS(wxCocoaMessageDialog) - wxDECLARE_NO_COPY_CLASS(wxCocoaMessageDialog); -}; - -#endif // _WX_MSGDLG_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/notebook.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/notebook.h deleted file mode 100644 index 0fe99e91a1..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/notebook.h +++ /dev/null @@ -1,104 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/notebook.h -// Purpose: wxNotebook class -// Author: David Elliott -// Modified by: -// Created: 2004/04/08 -// Copyright: (c) 2004 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_NOTEBOOK_H__ -#define _WX_COCOA_NOTEBOOK_H__ - -#include "wx/cocoa/NSTabView.h" - -// ======================================================================== -// wxNotebook -// ======================================================================== -class WXDLLIMPEXP_CORE wxNotebook: public wxNotebookBase, protected wxCocoaNSTabView -{ - DECLARE_DYNAMIC_CLASS(wxNotebook) - DECLARE_EVENT_TABLE() - WX_DECLARE_COCOA_OWNER(NSTabView,NSView,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxNotebook() { } - wxNotebook(wxWindow *parent, wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxNotebookNameStr) - { - Create(parent, winid, pos, size, style, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxNotebookNameStr); - virtual ~wxNotebook(); - -// ------------------------------------------------------------------------ -// Cocoa callbacks -// ------------------------------------------------------------------------ -protected: - // Notebooks cannot be enabled/disabled - virtual void CocoaSetEnabled(bool WXUNUSED(enable)) { } - virtual void CocoaDelegate_tabView_didSelectTabViewItem(WX_NSTabViewItem tabviewItem); - virtual bool CocoaDelegate_tabView_shouldSelectTabViewItem(WX_NSTabViewItem tabviewItem); -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - // set the currently selected page, return the index of the previously - // selected one (or wxNOT_FOUND on error) - int SetSelection(size_t nPage); - // get the currently selected page - int GetSelection() const; - - // changes selected page without sending events - int ChangeSelection(size_t nPage); - - // set/get the title of a page - bool SetPageText(size_t nPage, const wxString& strText); - wxString GetPageText(size_t nPage) const; - - // sets/returns item's image index in the current image list - int GetPageImage(size_t nPage) const; - bool SetPageImage(size_t nPage, int nImage); - - // set the size (the same for all pages) - void SetPageSize(const wxSize& size); - - // SetPadding and SetTabSize aren't possible to implement - void SetPadding(const wxSize& padding); - void SetTabSize(const wxSize& sz); - - //----------------------- - // adding/removing pages - - // remove one page from the notebook, without deleting - virtual wxNotebookPage *DoRemovePage(size_t nPage); - - // remove one page from the notebook - bool DeletePage(size_t nPage); - // remove all pages - bool DeleteAllPages(); - - // adds a new page to the notebook (it will be deleted ny the notebook, - // don't delete it yourself). If bSelect, this page becomes active. - // the same as AddPage(), but adds it at the specified position - bool InsertPage( size_t position, - wxNotebookPage *win, - const wxString& strText, - bool bSelect = false, - int imageId = NO_IMAGE ); - -protected: -}; - -#endif //ndef _WX_COCOA_NOTEBOOK_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/objc/NSMenu.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/objc/NSMenu.h deleted file mode 100644 index 780d306058..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/objc/NSMenu.h +++ /dev/null @@ -1,30 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/objc/NSMenu.h -// Purpose: WXNSMenu class -// Author: David Elliott -// Modified by: -// Created: 2007/04/20 (move from NSMenu.mm) -// Copyright: (c) 2002 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_OBJC_NSMENU_H__ -#define __WX_COCOA_OBJC_NSMENU_H__ - -#include "wx/cocoa/objc/objc_uniquifying.h" - -#import - -// ============================================================================ -// @class WXNSMenu -// ============================================================================ -@interface WXNSMenu : NSMenu -{ -} - -- (void)dealloc; - -@end // WXNSMenu -WX_DECLARE_GET_OBJC_CLASS(WXNSMenu,NSMenu) - -#endif //ndef __WX_COCOA_OBJC_NSMENU_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/objc/NSSlider.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/objc/NSSlider.h deleted file mode 100644 index 3534d8576f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/objc/NSSlider.h +++ /dev/null @@ -1,36 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/objc/NSSlider.h -// Purpose: WXNSSlider class -// Author: David Elliott -// Modified by: -// Created: 2007/08/10 (move from NSSlider.mm) -// Copyright: (c) 2007 Software 2000 Ltd. -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_OBJC_NSSLIDER_H__ -#define __WX_COCOA_OBJC_NSSLIDER_H__ - -#include "wx/cocoa/objc/objc_uniquifying.h" - -#import - -// ============================================================================ -// @class WXNSSlider -// ============================================================================ - -@interface WXNSSlider : NSSlider -@end - -WX_DECLARE_GET_OBJC_CLASS(WXNSSlider,NSSlider) - -// ============================================================================ -// @class WXNSSliderCell -// ============================================================================ - -@interface WXNSSliderCell : NSSliderCell -@end - -WX_DECLARE_GET_OBJC_CLASS(WXNSSliderCell,NSSliderCell) - -#endif //ndef __WX_COCOA_OBJC_NSSLIDER_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/objc/NSView.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/objc/NSView.h deleted file mode 100644 index f4c5f04ebf..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/objc/NSView.h +++ /dev/null @@ -1,44 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/objc/NSView.h -// Purpose: WXNSView class -// Author: David Elliott -// Modified by: -// Created: 2007/04/20 (move from NSView.mm) -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_OBJC_NSVIEW_H__ -#define __WX_COCOA_OBJC_NSVIEW_H__ - -#include "wx/cocoa/objc/objc_uniquifying.h" - -#import - -// ============================================================================ -// @class WXNSView -// ============================================================================ -@interface WXNSView : NSView -{ -} - -- (void)drawRect: (NSRect)rect; -- (void)mouseDown:(NSEvent *)theEvent; -- (void)mouseDragged:(NSEvent *)theEvent; -- (void)mouseUp:(NSEvent *)theEvent; -- (void)mouseMoved:(NSEvent *)theEvent; -- (void)mouseEntered:(NSEvent *)theEvent; -- (void)mouseExited:(NSEvent *)theEvent; -- (void)rightMouseDown:(NSEvent *)theEvent; -- (void)rightMouseDragged:(NSEvent *)theEvent; -- (void)rightMouseUp:(NSEvent *)theEvent; -- (void)otherMouseDown:(NSEvent *)theEvent; -- (void)otherMouseDragged:(NSEvent *)theEvent; -- (void)otherMouseUp:(NSEvent *)theEvent; -- (void)resetCursorRects; -- (void)viewDidMoveToWindow; -- (void)viewWillMoveToWindow:(NSWindow *)newWindow; -@end // WXNSView -WX_DECLARE_GET_OBJC_CLASS(WXNSView,NSView) - -#endif //ndef __WX_COCOA_OBJC_NSVIEW_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/objc/NSWindow.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/objc/NSWindow.h deleted file mode 100644 index bed9e59838..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/objc/NSWindow.h +++ /dev/null @@ -1,39 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/objc/NSWindow.h -// Purpose: WXNSWindow class -// Author: David Elliott -// Modified by: -// Created: 2007/04/20 (move from NSWindow.mm) -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#import -#import - -#include "wx/cocoa/objc/objc_uniquifying.h" - -// ============================================================================ -// @class WXNSWindow -// ============================================================================ -@interface WXNSWindow : NSWindow -{ -} - -- (BOOL)canBecomeKeyWindow; -- (BOOL)canBecomeMainWindow; -@end // WXNSWindow -WX_DECLARE_GET_OBJC_CLASS(WXNSWindow,NSWindow) - -// ============================================================================ -// @class WXNSPanel -// ============================================================================ -@interface WXNSPanel : NSPanel -{ -} - -- (BOOL)canBecomeKeyWindow; -- (BOOL)canBecomeMainWindow; -@end // WXNSPanel -WX_DECLARE_GET_OBJC_CLASS(WXNSPanel,NSPanel) - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/objc/objc_uniquifying.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/objc/objc_uniquifying.h deleted file mode 100644 index bedbf44677..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/objc/objc_uniquifying.h +++ /dev/null @@ -1,364 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/objc/objc_uniquifying.h -// Purpose: Allows wxWidgets code to get a direct pointer to a compiled -// Objective-C class and provides a method to fix up the -// name to include a unique identifier (currently the address -// of the objc_class structure). -// Author: David Elliott -// Modified by: -// Created: 2007/05/15 -// Copyright: (c) 2007 Software 2000 Ltd. -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_OBJC_CLASS_H__ -#define __WX_COCOA_OBJC_CLASS_H__ - -/* A note about this header: -Nothing in here is guaranteed to exist in future versions of wxCocoa. There -are other ways of adding Objective-C classes at runtime and a future wxCocoa -might use these instead of this ugly hack. You may use this header file in -your own wxCocoa code if you need your own Objective-C classes to be -unqiuified. - -You cannot turn this on for 64-bit mode. It will not compile due to opaque -Objective-C data structures and it is not needed because it is a workaround -for a bug that does not exist in the 64-bit runtime. - -You should not use this when wxCocoa is built as a dynamic library. This has -only been tested for the case when wxCocoa is built as a static library and -statically linked to user code to form a loadable bundle (e.g. a Cocoa plugin). -It forces each plugin (when multiple wxCocoa-using plugins are used) to use -its own internal Objective-C classes which is desirable when wxCocoa is -statically linked to the rest of the code. - -Do not use uniquifying on your principal class. That one should be named -differently for different bundles. - */ - -#if wxUSE_OBJC_UNIQUIFYING - -// objc_getClass and stuff -#include - -////////////// Objective-C uniquifying implementation ////////////// - -template -class wxObjcClassInitializer; - -template -class UniquifiedName; - -template -class wxObjcCompilerInformation -{ - friend class wxObjcClassInitializer; - friend class UniquifiedName; -private: - // GetCompiledClass must be partially specialized for an ObjcType - // If you're not using it, implement an inline returning NULL - inline static struct objc_class * GetCompiledClass(); - - // sm_theClassName must be partially specialized for each type - static const char sm_theClassName[]; - - // GetSuperclass must be specialized. Typically one of two ways: - // 1. objc_getClass("SomeRealClassName") - // 2. wxGetObjcClass_SomeWxClassName(); - inline static struct objc_class *GetSuperclass(); -}; - - -template -struct UniquifiedName -{ - // We're going for OriginalClassName@ClassStructureAddress - // Therefore our size is the sizeof the original class name constant string (which includes the terminating NULL) - // plus the sizeof a pointer to struct objc_class times two (two hex digits for each byte) plus 3 for "@0x" - typedef char Type[sizeof(wxObjcCompilerInformation::sm_theClassName) + (sizeof(struct objc_class*)<<1) + 3]; - static void Init(Type m_theString, const objc_class *aClass) - { - snprintf(const_cast(m_theString), sizeof(Type), "%s@%p", wxObjcCompilerInformation::sm_theClassName, aClass); - } -}; - -/*! @function HidePointerFromGC - @abstract Returns an l-value whose location the compiler cannot know. - @discussion - The compiler-generated Objective-C class structures are located in the static data area. - They are by design Objective-C objects in their own right which makes the compiler issue - write barriers as if they were located in the GC-managed heap as most Objective-C objects. - - By accepting and returning a reference to any pointer type we can set any i-var of an - Objective-C object that is a pointer to another Objective-C object without the compiler - generating an objc_assign_ivar write barrier. It will instad generate an - objc_assign_strongCast write barrier which is the appropriate write-barrier when assigning - pointers to Objective-C objects located in unknown memory. - - For instance: - Class *someClass = ...; - HidePointerFromGC(someClass->isa) = ...; - */ -template -inline ObjcType * & HidePointerFromGC(ObjcType * &p) __attribute__((always_inline)); - -template -inline ObjcType * & HidePointerFromGC(ObjcType * &p) -{ - return p; -} - -template -class wxObjcClassInitializer -{ -public: - static struct objc_class* Get() - { - static wxObjcClassInitializer s_theInstance; - s_theInstance.noop(); // Make the compiler think we need this instance - return wxObjcCompilerInformation::GetCompiledClass(); - } -private: - void noop() - {} - // This "constructor" operates solely on static data - // It exists so that we can take advantage of a function-static - // "instance" of this class to do the static data initialization. - wxObjcClassInitializer() - { - // Objective-C class initialization occurs before C++ static initialization because the - // libobjc.dylib gets notified directly by dyld on Tiger. - // Therefore, even though we change the name, the class is still registered with the - // original name. We unfortunately can't change that. - - // The first time the class is loaded, Objective-C will already have fixed up the super_class - // and isa->isa and isa->super_class variables so much of this won't do anything. But - // the next time the class is loaded, Objective-C will ignore it and thus we need to - // initialize the data structures appropriately. - - // Ideally we'd have some sort of lock here, but we depend on the fact that we get called - // just before the first time someone wants to send a class message so it should be - // reasonably safe to do this without any locks. - - struct objc_class &theClassData = *wxObjcCompilerInformation::GetCompiledClass(); - // Initialize the uniquified class name - UniquifiedName::Init(sm_theUniquifiedClassName, &theClassData); - - //////// Class Initialization //////// - // Use objc_getClass to fix up the superclass pointer - theClassData.super_class = wxObjcCompilerInformation::GetSuperclass(); - // Fix up the compiler generated class struct to use the new name - theClassData.name = sm_theUniquifiedClassName; - - //////// Meta-Class Initialization //////// - // theClassData.isa is the metaclass pointer - // Globals on Darwin use PC-relative access (slow) so it's quicker to use theClassData.isa - - // In any object hierarchy a metaclass's metaclass is always the root class's metaclass - // Therefore, our superclass's metaclass's metaclass should already be the root class's metaclass - HidePointerFromGC(theClassData.isa->isa) = theClassData.super_class->isa->isa; - // A metaclass's superclass is always the superclass's metaclass. - HidePointerFromGC(theClassData.isa->super_class) = theClassData.super_class->isa; - // Fix up the compiler generated metaclass struct to use the new name - theClassData.isa->name = sm_theUniquifiedClassName; - - // We need to set the initialized flag because after we change the name, Objective-C can't - // look us up by name because we're only registered with the original name. - theClassData.isa->info |= CLS_INITIALIZED; - } - wxObjcClassInitializer(const wxObjcClassInitializer&); // NO COPY - wxObjcClassInitializer& operator =(const wxObjcClassInitializer&); // NO ASSIGN - static typename UniquifiedName::Type sm_theUniquifiedClassName; -}; - -template -typename UniquifiedName::Type wxObjcClassInitializer::sm_theUniquifiedClassName; - -// WX_DECLARE_GET_OBJC_CLASS -// Declares a function to get a direct pointer to an objective-C class. -// The class is guaranteed to be usable. -// When wxCocoa is built into a Mach-O bundle this function allows the wxCocoa -// code to get a reference to the Objective-C class structure located in the -// same bundle. This allows a static wxCocoa library to be built into -// two different Mach-O bundles without having one bundle's Objective-C -// classes trample on the other's. -// Right now we toss the ObjcSuperClass parameter, but we might use it later. -#define WX_DECLARE_GET_OBJC_CLASS(ObjcClass,ObjcSuperClass) \ -struct objc_class* wx_GetObjcClass_ ## ObjcClass(); - -// WX_IMPLEMENT_OBJC_GET_COMPILED_CLASS(ObjcClass) -// Provides an architecture-dependent way to get the direct pointer to the -// objc_class structure in the __OBJC segment. -// This takes advantage of the fact that the Objective-C compiler uses guessable -// local assembler labels for the class structures. -// Those class structures are only available on the Objective-C file containing the -// @implementation block. - -#if 1 -// Generic implementation - Tested on i386 and PPC. Should work in all cases. -// This is a hack that depends on GCC asm symbol names. -// The static variable winds up being initialized with a direct reference to the appropriate -// L_OBJC_CLASS and no global symbol reference is generated because nothing uses the global symbol -// except for the static initializer which does it directly. -// The generated assembler for s_objc_class_ptr is basically like this: -// _s_objc_class_ptr_ObjcClass: -// .long L_OBJC_CLASS_ObjcClass -// Once that static symbol is defined, the function implementation is easy for GCC to generate. -// Do note that return &s_objc_class_data_ObjcClass won't work. The code is wrong in this case. -#define WX_IMPLEMENT_OBJC_GET_COMPILED_CLASS(ObjcClass) \ -extern "C" objc_class s_objc_class_data_ ## ObjcClass asm("L_OBJC_CLASS_" #ObjcClass); \ -static objc_class * s_objc_class_ptr_ ## ObjcClass = &s_objc_class_data_ ## ObjcClass; \ -template<> \ -inline objc_class * wxObjcCompilerInformation::GetCompiledClass() \ -{ \ - return s_objc_class_ptr_## ObjcClass; \ -} - -#elif defined(__i386__) -// Not used because the generic implementation seems to work fine. -// But this is here since it was written beforehand and it also works. - -// This is based on the code GCC generates for accessing file-static data on i386. -// The i386 PC-relative addressing happens in this manner -// 1. The program counter is placed into ecx using the code that GCC should have -// already generated. -// 2. A label is placed directly after the call to get the program counter. -// 3. The Load Effective Address instruction is used to add the offset of the -// local assembler label we're interested in minus the local assembler label -// from step 2 to the program counter register in ecx and place the result -// into the result register (typically eax if not inlined). -#define WX_IMPLEMENT_OBJC_GET_COMPILED_CLASS(ObjcClass) \ -template<> \ -inline objc_class * wxObjcCompilerInformation::GetCompiledClass() \ -{ \ - register struct objc_class *retval; \ - asm \ - ( "call ___i686.get_pc_thunk.cx\n" \ - "\"LPC_FOR_GET_CLASS_" #ObjcClass "\":\n\t" \ - "leal L_OBJC_CLASS_" #ObjcClass "-\"LPC_FOR_GET_CLASS_" #ObjcClass "\"(%%ecx), %0" \ - : "=r"(retval) \ - : \ - : "ecx" \ - ); \ - return retval; \ -} - -#elif defined(__ppc__) -// Not used because the generic implementation seems to work fine. -// But this is here since it was written beforehand and it also works. - -// This is based on the code GCC generates for accessing file-static data on PPC. -// The PowerPC PC-relative addressing happens in this manner -// 1. The link register is saved (mflr) to a temporary (we re-use the output register for this) -// 2. An unconditional branch instruction (bcl) "branches" to the following address (labeled) -// 3. The link register (filled in by bcl) is saved to r10 (a temporary) -// 4. The previous link register is restored (mtlr) (from the output register we were using as a temporary) -// 5. The address of the LPC label as executed is added to the high 16 bits of the offset between that label and the static data we want -// and stored in a temporary register (r2) -// 6. That temporary register plus the low 16 bits of the offset are stored into the result register. -#define WX_IMPLEMENT_OBJC_GET_COMPILED_CLASS(ObjcClass) \ -template<> \ -inline objc_class * wxObjcCompilerInformation::GetCompiledClass() \ -{ \ - register struct objc_class *retval; \ - asm \ - ( "mflr %0" \ - "\n\tbcl 20, 31, \"LPC_FOR_GET_CLASS_" #ObjcClass "\"" \ - "\n\"LPC_FOR_GET_CLASS_" #ObjcClass "\":" \ - "\n\tmflr r10" \ - "\n\tmtlr %0" \ - "\n\taddis r2,r10,ha16(L_OBJC_CLASS_" #ObjcClass "-\"LPC_FOR_GET_CLASS_" #ObjcClass "\")" \ - "\n\tla %0,lo16(L_OBJC_CLASS_" #ObjcClass "-\"LPC_FOR_GET_CLASS_" #ObjcClass "\")(r2)" \ - : "=r" (retval) \ - : \ - : "r10","r2" \ - ); \ - return retval; \ -} - -// TODO: __x86_64__, __ppc64__ -#else // Can't write inline asm to bust into __OBJC segment -// This won't be used since the generic implementation takes precedence. - -#warning "Don't know how to implement wxObjcCompilerInformation::GetCompiledClass on this platform" - -#endif // platforms - -// The WX_IMPLEMENT_OBJC_GET_SUPERCLASS macro implements the template specialization -// to get the superclass. This only works if it's a real superclass. If you are -// deriving from a class that's already being uniquified then you'd need to -// implement the specialization to call the appropriate get method instead. -#define WX_IMPLEMENT_OBJC_GET_SUPERCLASS(ObjcClass,ObjcSuperClass) \ - template <> \ - inline objc_class* wxObjcCompilerInformation::GetSuperclass() \ - { \ - return objc_getClass(#ObjcSuperClass); \ - } - -// The WX_IMPLEMENT_OBJC_GET_UNIQUIFIED_SUPERCLASS macro implements the template -// specialization to get the superclass when the superclass is another uniquified -// Objective-C class. -#define WX_IMPLEMENT_OBJC_GET_UNIQUIFIED_SUPERCLASS(ObjcClass,ObjcSuperClass) \ - template <> \ - inline objc_class* wxObjcCompilerInformation::GetSuperclass() \ - { \ - return wx_GetObjcClass_ ## ObjcSuperClass(); \ - } - -// The WX_IMPLEMENT_OBJC_CLASS_NAME macro implements the template specialization -// of the sm_theClassName constant. As soon as this specialization is in place -// sizeof(sm_theClassName) will return the number of bytes at compile time. -#define WX_IMPLEMENT_OBJC_CLASS_NAME(ObjcClass) \ - template <> \ - const char wxObjcCompilerInformation::sm_theClassName[] = #ObjcClass; - -// The WX_IMPLEMENT_OBJC_GET_OBJC_CLASS macro is the final one that actually provides -// the wx_GetObjcClass_XXX function that will be called in lieu of asking the Objective-C -// runtime for the class. All the others are really machinery to make this happen. -#define WX_IMPLEMENT_OBJC_GET_OBJC_CLASS(ObjcClass) \ - objc_class* wx_GetObjcClass_ ## ObjcClass() \ - { \ - return wxObjcClassInitializer::Get(); \ - } - -// The WX_IMPLEMENT_GET_OBJC_CLASS macro combines all of these together -// for the case when the superclass is a non-uniquified class. -#define WX_IMPLEMENT_GET_OBJC_CLASS(ObjcClass,ObjcSuperClass) \ - WX_IMPLEMENT_OBJC_GET_COMPILED_CLASS(ObjcClass) \ - WX_IMPLEMENT_OBJC_GET_SUPERCLASS(ObjcClass,ObjcSuperClass) \ - WX_IMPLEMENT_OBJC_CLASS_NAME(ObjcClass) \ - WX_IMPLEMENT_OBJC_GET_OBJC_CLASS(ObjcClass) - -// The WX_IMPLEMENT_GET_OBJC_CLASS_WITH_UNIQUIFIED_SUPERCLASS macro combines all -// of these together for the case when the superclass is another uniquified class. -#define WX_IMPLEMENT_GET_OBJC_CLASS_WITH_UNIQUIFIED_SUPERCLASS(ObjcClass,ObjcSuperClass) \ - WX_IMPLEMENT_OBJC_GET_COMPILED_CLASS(ObjcClass) \ - WX_IMPLEMENT_OBJC_GET_UNIQUIFIED_SUPERCLASS(ObjcClass,ObjcSuperClass) \ - WX_IMPLEMENT_OBJC_CLASS_NAME(ObjcClass) \ - WX_IMPLEMENT_OBJC_GET_OBJC_CLASS(ObjcClass) - -// The WX_GET_OBJC_CLASS macro is intended to wrap the class name when the class -// is used as a message receiver (e.g. for calling class methods). When -// class name uniquifying is used, this calls the global function implemented -// in the Objective-C file containing the class @implementation. -#define WX_GET_OBJC_CLASS(ObjcClass) wx_GetObjcClass_ ## ObjcClass() - -#else // wxUSE_OBJC_UNIQUIFYING - -// Define WX_DECLARE_GET_OBJC_CLASS as nothing -#define WX_DECLARE_GET_OBJC_CLASS(ObjcClass,ObjcSuperClass) -// Define WX_IMPLEMENT_GET_OBJC_CLASS as nothing -#define WX_IMPLEMENT_GET_OBJC_CLASS(ObjcClass,ObjcSuperClass) -// Define WX_IMPLEMENT_GET_OBJC_CLASS_WITH_UNIQUIFIED_SUPERCLASS as nothing -#define WX_IMPLEMENT_GET_OBJC_CLASS_WITH_UNIQUIFIED_SUPERCLASS(ObjcClass,ObjcSuperClass) - -// Define WX_GET_OBJC_CLASS macro to output the class name and let the compiler do the normal thing -// The WX_GET_OBJC_CLASS macro is intended to wrap the class name when the class -// is used as a message receiver (e.g. for calling class methods). When -// class name uniquifying is not used, this is simply defined to be the class -// name which will allow the compiler to do the normal thing. -#define WX_GET_OBJC_CLASS(ObjcClass) ObjcClass - -#endif // wxUSE_OBJC_UNIQUIFYING - -#endif //ndef __WX_COCOA_OBJC_CLASS_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/pen.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/pen.h deleted file mode 100644 index 66a0c7f367..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/pen.h +++ /dev/null @@ -1,72 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/pen.h -// Purpose: wxPen class -// Author: David Elliott -// Modified by: -// Created: 2003/08/02 (stubs from 22.03.2003) -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_PEN_H__ -#define __WX_COCOA_PEN_H__ - -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" - -class WXDLLIMPEXP_FWD_CORE wxColour; -class WXDLLIMPEXP_FWD_CORE wxBitmap; - -// ======================================================================== -// wxPen -// ======================================================================== -class WXDLLIMPEXP_CORE wxPen: public wxGDIObject -{ -public: - wxPen(); - wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID); -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); -#endif - wxPen(const wxBitmap& stipple, int width); - virtual ~wxPen(); - - // FIXME: operator==() is wrong - bool operator==(const wxPen& pen) const { return m_refData == pen.m_refData; } - bool operator!=(const wxPen& pen) const { return !(*this == pen); } - - void SetColour(const wxColour& col) ; - void SetColour(unsigned char r, unsigned char g, unsigned char b) ; - - void SetWidth(int width); - void SetStyle(wxPenStyle style); - void SetStipple(const wxBitmap& stipple); - void SetDashes(int nb_dashes, const wxDash *dash); - void SetJoin(wxPenJoin join); - void SetCap(wxPenCap cap); - - wxColour GetColour() const; - int GetWidth() const; - wxPenStyle GetStyle() const; - wxPenJoin GetJoin() const; - wxPenCap GetCap() const; - int GetDashes(wxDash **ptr) const; - wxBitmap *GetStipple() const; - -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_FUTURE( void SetStyle(int style) ) - { SetStyle((wxPenStyle)style); } -#endif - - // Cocoa-specific - WX_NSColor GetNSColor(); - int GetCocoaLineDash(const CGFloat **pattern); - -protected: - wxGDIRefData *CreateGDIRefData() const; - wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - DECLARE_DYNAMIC_CLASS(wxPen) -}; - -#endif // __WX_COCOA_PEN_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/private/fontfactory.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/private/fontfactory.h deleted file mode 100644 index 7cbfcfe0d1..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/private/fontfactory.h +++ /dev/null @@ -1,27 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/private/fontfactory.h -// Purpose: wxFontFactory class -// Author: David Elliott -// Modified by: -// Created: 2007-10-13 -// Copyright: 2007 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_FONTFACTORY_H_ -#define _WX_COCOA_FONTFACTORY_H_ - -/*! @discussion - This class exists so that wxFont need not know about wxSettings - The implementation, however, is in the font.mm file because the - implementation needs to have knowledge of wxFontRefData. - */ -class wxCocoaFontFactory -{ -public: - /*! @abstract Create an instance with the specified NSFont and underline flag. - */ - static wxFont InstanceForNSFont(WX_NSFont cocoaFont, bool underlined = false); -}; - -#endif //_WX_COCOA_FONTFACTORY_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/private/scrollview.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/private/scrollview.h deleted file mode 100644 index fe07ff9fa1..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/private/scrollview.h +++ /dev/null @@ -1,128 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/private/scrollview.h -// Purpose: wxWindowCocoaScrollView -// Author: David Elliott -// Modified by: -// Created: 2008/02/14 -// Copyright: (c) 2003- David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_SCROLLVIEW_H__ -#define _WX_COCOA_SCROLLVIEW_H__ - -@class NSScroller; - -// ======================================================================== -// wxWindowCocoaScrollView -// ======================================================================== -class wxWindowCocoaScrollView: protected wxCocoaNSView -{ - wxDECLARE_NO_COPY_CLASS(wxWindowCocoaScrollView); -public: - wxWindowCocoaScrollView(wxWindow *owner); - virtual ~wxWindowCocoaScrollView(); - inline WX_NSScrollView GetNSScrollView() { return m_cocoaNSScrollView; } - void ClientSizeToSize(int &width, int &height); - void DoGetClientSize(int *x, int *y) const; - void Encapsulate(); - void Unencapsulate(); - - // wxWindow calls this to do the work. Note that we don't have the refresh parameter - // because wxWindow handles that itself. - void SetScrollbar(int orientation, int position, int thumbSize, int range); - int GetScrollPos(wxOrientation orient); - void SetScrollPos(wxOrientation orient, int position); - int GetScrollRange(wxOrientation orient); - int GetScrollThumb(wxOrientation orient); - void ScrollWindow(int dx, int dy, const wxRect*); - void UpdateSizes(); - - void _wx_doScroller(NSScroller *sender); - -protected: - wxWindowCocoa *m_owner; - WX_NSScrollView m_cocoaNSScrollView; - virtual void Cocoa_FrameChanged(void); - virtual void Cocoa_synthesizeMouseMoved(void) {} - /*! - Flag as to whether we're scrolling for a native view or a custom - wxWindow. This controls the scrolling behaviour. When providing - scrolling for a native view we don't catch scroller action messages - and thus don't send scroll events and we don't actually scroll the - window when the application calls ScrollWindow. - - When providing scrolling for a custom wxWindow, we make the NSScroller - send their action messages to us which we in turn package as wx window - scrolling events. At this point, the window will not physically be - scrolled. The application will most likely handle the event by calling - ScrollWindow which will do the real scrolling. On the other hand, - the application may instead not call ScrollWindow until some threshold - is reached. This causes the window to only scroll in steps which is - what, for instance, wxScrolledWindow does. - */ - bool m_isNativeView; - /*! - The range as the application code wishes to see it. That is, the - range from the last SetScrollbar call for the appropriate dimension. - The horizontal dimension is the first [0] element and the vertical - dimension the second [1] element. - - In wxMSW, a SCROLLINFO with nMin=0 and nMax=range-1 is used which - gives exactly range possible positions so long as nPage (which is - the thumb size) is less than or equal to 1. - */ - int m_scrollRange[2]; - /*! - The thumb size is intended to reflect the size of the visible portion - of the scrolled document. As the document size increases, the thumb - visible thumb size decreases. As document size decreases, the visible - thumb size increases. However, the thumb size on wx is defined in - terms of scroll units (which are effectively defined by the scroll - range) and so increasing the number of scroll units to reflect increased - document size will have the effect of decreasing the visible thumb - size even though the number doesn't change. - - It's also important to note that subtracting the thumb size from the - full range gives you the real range that can be used. Microsoft - defines nPos (the current scrolling position) to be within the range - from nMin to nMax - max(nPage - 1, 0). We know that wxMSW code always - sets nMin = 0 and nMax = range -1. So let's algebraically reduce the - definition of the maximum allowed position: - - Begin: - = nMax - max(nPage - 1, 0) - Substitute (range - 1) for nMax and thumbSize for nPage: - = range - 1 - max(thumbSize - 1, 0) - Add one inside the max conditional and subtract one outside of it: - = range - 1 - (max(thumbSize - 1 + 1, 1) - 1) - Reduce some constants: - = range - 1 - (max(thumbSize, 1) - 1) - Distribute the negative across the parenthesis: - = range - 1 - max(thumbSize, 1) + 1 - Reduce the constants: - = range - max(thumbSize, 1) - - Also keep in mind that thumbSize may never be greater than range but - can be equal to it. Thus for the smallest possible thumbSize there - are exactly range possible scroll positions (numbered from 0 to - range - 1) and for the largest possible thumbSize there is exactly - one possible scroll position (numbered 0). - */ - int m_scrollThumb[2]; - - /*! - The origin of the virtual coordinate space expressed in terms of client - coordinates. Starts at (0,0) and each call to ScrollWindow accumulates - into it. Thus if the user scrolls the window right (thus causing the - contents to move left with respect to the client origin, the - application code (typically wxScrolledWindow) will be called with - dx of -something, for example -20. This is added to m_virtualOrigin - and thus m_virtualOrigin will be (-20,0) in this example. - */ - wxPoint m_virtualOrigin; -private: - wxWindowCocoaScrollView(); -}; - -#endif //ndef _WX_COCOA_SCROLLVIEW_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/private/timer.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/private/timer.h deleted file mode 100644 index 1dec2cf7fb..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/private/timer.h +++ /dev/null @@ -1,42 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/private/timer.h -// Purpose: Cocoa wxTimer class -// Author: Ryan Norton -// Copyright: (c) Ryan Norton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_PRIVATE_TIMER_H_ -#define _WX_COCOA_PRIVATE_TIMER_H_ - -#include "wx/private/timer.h" - -#include "wx/cocoa/ObjcRef.h" - -//----------------------------------------------------------------------------- -// wxTimer -//----------------------------------------------------------------------------- - -DECLARE_WXCOCOA_OBJC_CLASS(NSTimer); - -class WXDLLIMPEXP_CORE wxCocoaTimerImpl : public wxTimerImpl -{ -public: - wxCocoaTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { Init(); } - virtual ~wxCocoaTimerImpl(); - - virtual bool Start(int millisecs = -1, bool oneShot = false); - virtual void Stop(); - - virtual bool IsRunning() const; - - WX_NSTimer GetNSTimer() { return m_cocoaNSTimer; } - -protected: - void Init(); - -private: - WX_NSTimer m_cocoaNSTimer; -}; - -#endif // _WX_COCOA_PRIVATE_TIMER_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/radiobox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/radiobox.h deleted file mode 100644 index a56a0c654b..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/radiobox.h +++ /dev/null @@ -1,137 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/radiobox.h -// Purpose: wxRadioBox class -// Author: David Elliott -// Modified by: -// Created: 2003/03/18 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_RADIOBOX_H__ -#define __WX_COCOA_RADIOBOX_H__ - -// #include "wx/cocoa/NSButton.h" -DECLARE_WXCOCOA_OBJC_CLASS(NSMatrix); - -// ======================================================================== -// wxRadioBox -// ======================================================================== -class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase// , protected wxCocoaNSButton -{ - DECLARE_DYNAMIC_CLASS(wxRadioBox) - DECLARE_EVENT_TABLE() - // NOTE: We explicitly skip NSControl because our primary cocoa view is - // the NSBox but we want to receive action messages from the NSMatrix. - WX_DECLARE_COCOA_OWNER(NSBox,NSView,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxRadioBox() { } - wxRadioBox(wxWindow *parent, wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - int majorDim = 0, - long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr) - { - Create(parent, winid, title, pos, size, n, choices, majorDim, style, validator, name); - } - wxRadioBox(wxWindow *parent, wxWindowID winid, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - int majorDim = 0, - long style = 0, const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr) - { - Create(parent, winid, title, pos, size, choices, majorDim, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - int majorDim = 0, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr); - bool Create(wxWindow *parent, wxWindowID winid, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - int majorDim = 0, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr); - virtual ~wxRadioBox(); - - // Enabling - virtual bool Enable(unsigned int n, bool enable = true); - virtual bool IsItemEnabled(unsigned int WXUNUSED(n)) const - { - /* TODO */ - return true; - } - - // Showing - virtual bool Show(unsigned int n, bool show = true); - virtual bool IsItemShown(unsigned int WXUNUSED(n)) const - { - /* TODO */ - return true; - } - -// ------------------------------------------------------------------------ -// Cocoa callbacks -// ------------------------------------------------------------------------ -protected: - // Radio boxes cannot be enabled/disabled - virtual void CocoaSetEnabled(bool WXUNUSED(enable)) { } - virtual void CocoaTarget_action(void); -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: -// Pure virtuals - // selection - virtual void SetSelection(int n); - virtual int GetSelection() const; - // string access - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& label); - // change the individual radio button state -protected: - // We don't want the typical wxCocoaNSBox behaviour because our real - // implementation is by using an NSMatrix as the NSBox's contentView. - WX_NSMatrix GetNSMatrix() const; - void AssociateNSBox(WX_NSBox theBox); - void DisassociateNSBox(WX_NSBox theBox); - - virtual wxSize DoGetBestSize() const; - - int GetRowForIndex(int n) const - { - if(m_windowStyle & wxRA_SPECIFY_COLS) - return n / GetMajorDim(); - else - return n % GetMajorDim(); - } - - int GetColumnForIndex(int n) const - { - if(m_windowStyle & wxRA_SPECIFY_COLS) - return n % GetMajorDim(); - else - return n / GetMajorDim(); - } -}; - -#endif // __WX_COCOA_RADIOBOX_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/radiobut.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/radiobut.h deleted file mode 100644 index 4a78b617c2..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/radiobut.h +++ /dev/null @@ -1,73 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/radiobut.h -// Purpose: wxRadioButton class -// Author: David Elliott -// Modified by: -// Created: 2003/03/18 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_RADIOBUT_H__ -#define __WX_COCOA_RADIOBUT_H__ - -#include "wx/cocoa/NSButton.h" - -class WXDLLIMPEXP_FWD_CORE wxRadioButton; - -WX_DECLARE_EXPORTED_LIST(wxRadioButton, wxRadioButtonList); - -// ======================================================================== -// wxRadioButton -// ======================================================================== -class WXDLLIMPEXP_CORE wxRadioButton: public wxControl, protected wxCocoaNSButton -{ - DECLARE_DYNAMIC_CLASS(wxRadioButton) - DECLARE_EVENT_TABLE() - WX_DECLARE_COCOA_OWNER(NSButton,NSControl,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxRadioButton() { m_radioMaster = NULL; } - wxRadioButton(wxWindow *parent, wxWindowID winid, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioButtonNameStr) - { - Create(parent, winid, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioButtonNameStr); - virtual ~wxRadioButton(); - -// ------------------------------------------------------------------------ -// Cocoa callbacks -// ------------------------------------------------------------------------ -protected: - virtual void Cocoa_wxNSButtonAction(void); -private: - void Cocoa_DeselectOtherButtonsInTheGroup(void); -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - virtual void SetValue(bool); - virtual bool GetValue() const; - virtual void SetLabel(const wxString& label); - virtual wxString GetLabel() const; -protected: - wxRadioButtonList m_radioSlaves; - wxRadioButton *m_radioMaster; -}; - -#endif // __WX_COCOA_RADIOBUT_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/region.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/region.h deleted file mode 100644 index c9aed9592d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/region.h +++ /dev/null @@ -1,75 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/region.h -// Purpose: wxRegion class -// Author: David Elliott -// Modified by: -// Created: 2004/04/12 -// Copyright: (c) 2004 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_REGION_H__ -#define _WX_COCOA_REGION_H__ - -#include "wx/generic/region.h" - -#if defined(__LP64__) || defined(NS_BUILD_32_LIKE_64) -typedef struct CGRect NSRect; -#else -typedef struct _NSRect NSRect; -#endif - -class WXDLLIMPEXP_CORE wxRegion : public wxRegionGeneric -{ -public: - wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h) - : wxRegionGeneric(x,y,w,h) - {} - wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight) - : wxRegionGeneric(topLeft, bottomRight) - {} - wxRegion(const wxRect& rect) - : wxRegionGeneric(rect) - {} - wxRegion() {} - wxRegion(const wxBitmap& bmp) - : wxRegionGeneric() - { Union(bmp); } - wxRegion(const wxBitmap& bmp, - const wxColour& transColour, int tolerance = 0) - : wxRegionGeneric() - { Union(bmp, transColour, tolerance); } - virtual ~wxRegion() {} - wxRegion(const wxRegion& r) - : wxRegionGeneric(r) - {} - wxRegion& operator= (const wxRegion& r) - { return *(wxRegion*)&(this->wxRegionGeneric::operator=(r)); } - - // Cocoa-specific creation - wxRegion(const NSRect& rect); - wxRegion(const NSRect *rects, int count); - -private: - DECLARE_DYNAMIC_CLASS(wxRegion); -}; - -class WXDLLIMPEXP_CORE wxRegionIterator : public wxRegionIteratorGeneric -{ -// DECLARE_DYNAMIC_CLASS(wxRegionIteratorGeneric); -public: - wxRegionIterator() {} - wxRegionIterator(const wxRegion& region) - : wxRegionIteratorGeneric(region) - {} - wxRegionIterator(const wxRegionIterator& iterator) - : wxRegionIteratorGeneric(iterator) - {} - virtual ~wxRegionIterator() {} - - wxRegionIterator& operator=(const wxRegionIterator& iter) - { return *(wxRegionIterator*)&(this->wxRegionIteratorGeneric::operator=(iter)); } -}; - -#endif - //ndef _WX_COCOA_REGION_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/scrolbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/scrolbar.h deleted file mode 100644 index a051896ef7..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/scrolbar.h +++ /dev/null @@ -1,74 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/scrolbar.h -// Purpose: wxScrollBar class -// Author: David Elliott -// Modified by: -// Created: 2004/04/25 -// Copyright: (c) 2004 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_SCROLBAR_H__ -#define _WX_COCOA_SCROLBAR_H__ - -#include "wx/cocoa/NSScroller.h" - -// ======================================================================== -// wxScrollBar -// ======================================================================== -class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase, protected wxCocoaNSScroller -{ - DECLARE_DYNAMIC_CLASS(wxScrollBar) - DECLARE_EVENT_TABLE() - WX_DECLARE_COCOA_OWNER(NSScroller,NSControl,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxScrollBar() { } - wxScrollBar(wxWindow *parent, wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSB_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxScrollBarNameStr) - { - Create(parent, winid, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSB_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxScrollBarNameStr); - virtual ~wxScrollBar(); - -// ------------------------------------------------------------------------ -// Cocoa callbacks -// ------------------------------------------------------------------------ -protected: - virtual void Cocoa_wxNSScrollerAction(void); -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - // accessors - virtual int GetThumbPosition() const; - virtual int GetThumbSize() const { return m_thumbSize; } - virtual int GetPageSize() const { return m_pageSize; } - virtual int GetRange() const { return m_range; } - - // operations - virtual void SetThumbPosition(int viewStart); - virtual void SetScrollbar(int position, int thumbSize, - int range, int pageSize, - bool refresh = TRUE); -protected: - int m_range; - int m_thumbSize; - int m_pageSize; -}; - -#endif - // _WX_COCOA_SCROLBAR_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/slider.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/slider.h deleted file mode 100644 index 5e73aa1796..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/slider.h +++ /dev/null @@ -1,107 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/slider.h -// Purpose: wxSlider class -// Author: David Elliott -// Mark Oxenham -// Modified by: -// Created: 2003/06/19 -// Copyright: (c) 2003 David Elliott -// (c) 2007 Software 2000 Ltd. -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_SLIDER_H__ -#define __WX_COCOA_SLIDER_H__ - -#include "wx/cocoa/NSSlider.h" - -// ======================================================================== -// wxSlider -// ======================================================================== -class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase, protected wxCocoaNSSlider -{ - DECLARE_DYNAMIC_CLASS(wxSlider) - DECLARE_EVENT_TABLE() - WX_DECLARE_COCOA_OWNER(NSSlider,NSControl,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxSlider() { } - wxSlider(wxWindow *parent, wxWindowID winid, - int value, int minValue, int maxValue, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSL_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSliderNameStr) - { - Create(parent, winid, value, minValue, maxValue, - pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, - int value, int minValue, int maxValue, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSL_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSliderNameStr); - virtual ~wxSlider(); - -// ------------------------------------------------------------------------ -// Cocoa callbacks -// ------------------------------------------------------------------------ -protected: - // Override this so we can use wxCocoaNSControl's target - void AssociateNSSlider(WX_NSSlider theSlider); - - // Helper method to do the real work - virtual void ProcessEventType(wxEventType commandType); - - // from wxCocoaNSControl: - virtual void CocoaTarget_action(); - - // from wxCocoaNSSlider: - virtual void CocoaNotification_startTracking(WX_NSNotification notification); - virtual void CocoaNotification_continueTracking(WX_NSNotification notification); - virtual void CocoaNotification_stopTracking(WX_NSNotification notification); - -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - // Pure Virtuals - virtual int GetValue() const; - virtual void SetValue(int value); - - // retrieve/change the range - virtual void SetRange(int minValue, int maxValue); - virtual int GetMin() const; - virtual int GetMax() const; - - // the line/page size is the increment by which the slider moves when - // cursor arrow key/page up or down are pressed (clicking the mouse is like - // pressing PageUp/Down) and are by default set to 1 and 1/10 of the range - virtual void SetLineSize(int lineSize); - virtual void SetPageSize(int pageSize); - virtual int GetLineSize() const; - virtual int GetPageSize() const; - - // these methods get/set the length of the slider pointer in pixels - virtual void SetThumbLength(int lenPixels); - virtual int GetThumbLength() const; - - // copied from (wxSliderCocoa.h) - virtual int GetTickFreq() const; - virtual void ClearTicks() { SetTickFreq(0); } - - virtual void SetTickPos(int pos); - -protected: - // Platform-specific implementation of SetTickFreq - virtual void DoSetTickFreq(int freq); -}; - -#endif - // __WX_COCOA_SLIDER_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/sound.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/sound.h deleted file mode 100644 index 362e2e288d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/sound.h +++ /dev/null @@ -1,51 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/sound.h -// Purpose: wxSound class (loads and plays short Windows .wav files). -// Optional on non-Windows platforms. -// Authors: David Elliott, Ryan Norton -// Modified by: -// Created: 2004-10-02 -// Copyright: (c) 2004 David Elliott, Ryan Norton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_SOUND_H_ -#define _WX_COCOA_SOUND_H_ - -#include "wx/object.h" -#include "wx/cocoa/ObjcRef.h" - -class WXDLLIMPEXP_ADV wxSound : public wxSoundBase -{ -public: - wxSound() - : m_cocoaNSSound(NULL) - {} - wxSound(const wxString& fileName, bool isResource = false) - : m_cocoaNSSound(NULL) - { Create(fileName, isResource); } - wxSound(size_t size, const void* data) - : m_cocoaNSSound(NULL) - { LoadWAV(data,size,true); } - wxSound(const wxSound& sound); // why not? - virtual ~wxSound(); - -public: - bool Create(const wxString& fileName, bool isResource = false); - bool IsOk() const - { return m_cocoaNSSound; } - static void Stop(); - static bool IsPlaying(); - - void SetNSSound(WX_NSSound cocoaNSSound); - inline WX_NSSound GetNSSound() - { return m_cocoaNSSound; } -protected: - bool DoPlay(unsigned flags) const; - bool LoadWAV(const void* data, size_t length, bool copyData); -private: - WX_NSSound m_cocoaNSSound; - static const wxObjcAutoRefFromAlloc sm_cocoaDelegate; -}; - -#endif //ndef _WX_COCOA_SOUND_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/spinbutt.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/spinbutt.h deleted file mode 100644 index d4dc80dfc0..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/spinbutt.h +++ /dev/null @@ -1,63 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/spinbutt.h -// Purpose: wxSpinButton class -// Author: David Elliott -// Modified by: -// Created: 2003/07/14 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_SPINBUTT_H__ -#define __WX_COCOA_SPINBUTT_H__ - -// #include "wx/cocoa/NSStepper.h" - -// ======================================================================== -// wxSpinButton -// ======================================================================== -class WXDLLIMPEXP_CORE wxSpinButton: public wxSpinButtonBase// , protected wxCocoaNSStepper -{ - DECLARE_DYNAMIC_CLASS(wxSpinButton) - DECLARE_EVENT_TABLE() -// WX_DECLARE_COCOA_OWNER(NSStepper,NSControl,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxSpinButton() { } - wxSpinButton(wxWindow *parent, wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_VERTICAL | wxSP_ARROW_KEYS, - const wxString& name = wxSPIN_BUTTON_NAME) - { - Create(parent, winid, pos, size, style, name); - } - - bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_HORIZONTAL, - const wxString& name = wxSPIN_BUTTON_NAME); - virtual ~wxSpinButton(); - -// ------------------------------------------------------------------------ -// Cocoa callbacks -// ------------------------------------------------------------------------ -protected: - virtual void CocoaTarget_action(); -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - // Pure Virtuals - virtual int GetValue() const; - virtual void SetValue(int value); - - // retrieve/change the range - virtual void SetRange(int minValue, int maxValue); -}; - -#endif - // __WX_COCOA_SPINBUTT_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/statbmp.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/statbmp.h deleted file mode 100644 index f06b129d9f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/statbmp.h +++ /dev/null @@ -1,59 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/statbmp.h -// Purpose: wxStaticBitmap class -// Author: David Elliott -// Modified by: -// Created: 2003/03/16 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_STATBMP_H__ -#define __WX_COCOA_STATBMP_H__ - -DECLARE_WXCOCOA_OBJC_CLASS(NSImageView); - -// ======================================================================== -// wxStaticBitmap -// ======================================================================== -class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase //, protected wxCocoaNSxxx -{ - DECLARE_DYNAMIC_CLASS(wxStaticBitmap) - DECLARE_EVENT_TABLE() -// WX_DECLARE_COCOA_OWNER(NSxxx,NSControl,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxStaticBitmap() {} - wxStaticBitmap(wxWindow *parent, wxWindowID winid, - const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxStaticBitmapNameStr) - { - Create(parent, winid, bitmap, pos, size, style, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, - const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxStaticBitmapNameStr); - virtual ~wxStaticBitmap(); - -// ------------------------------------------------------------------------ -// Cocoa specifics -// ------------------------------------------------------------------------ - WX_NSImageView GetNSImageView() { return (WX_NSImageView)m_cocoaNSView; } - wxBitmap m_bitmap; - -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ - virtual void SetIcon(const wxIcon& icon); - virtual void SetBitmap(const wxBitmap& bitmap); - virtual wxBitmap GetBitmap() const; -}; - -#endif // __WX_COCOA_STATBMP_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/statbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/statbox.h deleted file mode 100644 index f19579850c..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/statbox.h +++ /dev/null @@ -1,60 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/statbox.h -// Purpose: wxStaticBox class -// Author: David Elliott -// Modified by: -// Created: 2003/03/18 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_STATBOX_H__ -#define __WX_COCOA_STATBOX_H__ - -#include "wx/cocoa/NSBox.h" - -// ======================================================================== -// wxStaticBox -// ======================================================================== -class WXDLLIMPEXP_CORE wxStaticBox: public wxStaticBoxBase, protected wxCocoaNSBox -{ - DECLARE_DYNAMIC_CLASS(wxStaticBox) - DECLARE_EVENT_TABLE() - WX_DECLARE_COCOA_OWNER(NSBox,NSView,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxStaticBox() { } - wxStaticBox(wxWindow *parent, wxWindowID winid, const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, const wxString& name = wxStaticBoxNameStr) - { - Create(parent, winid, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, const wxString& name = wxStaticBoxNameStr); - virtual ~wxStaticBox(); - - virtual void SetLabel(const wxString& label); - virtual wxString GetLabel() const; - -// ------------------------------------------------------------------------ -// Cocoa callbacks -// ------------------------------------------------------------------------ -protected: - // Static boxes cannot be enabled/disabled - virtual void CocoaSetEnabled(bool WXUNUSED(enable)) { } -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - virtual void GetBordersForSizer(int *borderTop, int *borderOther) const; -protected: -}; - -#endif // __WX_COCOA_STATBOX_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/statline.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/statline.h deleted file mode 100644 index 3834a37637..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/statline.h +++ /dev/null @@ -1,55 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/statline.h -// Purpose: wxStaticLine class -// Author: David Elliott -// Modified by: -// Created: 2003/03/18 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_STATLINE_H__ -#define __WX_COCOA_STATLINE_H__ - -// #include "wx/cocoa/NSButton.h" - -// ======================================================================== -// wxStaticLine -// ======================================================================== -class WXDLLIMPEXP_CORE wxStaticLine: public wxStaticLineBase// , protected wxCocoaNSButton -{ - DECLARE_DYNAMIC_CLASS(wxStaticLine) - DECLARE_EVENT_TABLE() -// WX_DECLARE_COCOA_OWNER(NSButton,NSControl,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxStaticLine() { } - wxStaticLine(wxWindow *parent, wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, const wxString& name = wxStaticLineNameStr) - { - Create(parent, winid, pos, size, style, name); - } - - bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, const wxString& name = wxStaticLineNameStr); - virtual ~wxStaticLine(); - -// ------------------------------------------------------------------------ -// Cocoa callbacks -// ------------------------------------------------------------------------ -protected: - // Static lines cannot be enabled/disabled - virtual void CocoaSetEnabled(bool WXUNUSED(enable)) { } -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: -}; - -#endif // __WX_COCOA_STATLINE_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/stattext.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/stattext.h deleted file mode 100644 index 176d53a0be..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/stattext.h +++ /dev/null @@ -1,58 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/stattext.h -// Purpose: wxStaticText class -// Author: David Elliott -// Modified by: -// Created: 2003/02/15 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_STATTEXT_H__ -#define __WX_COCOA_STATTEXT_H__ - -#include "wx/cocoa/NSTextField.h" - -// ======================================================================== -// wxStaticText -// ======================================================================== -class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase, protected wxCocoaNSTextField -{ - DECLARE_DYNAMIC_CLASS(wxStaticText) - DECLARE_EVENT_TABLE() - WX_DECLARE_COCOA_OWNER(NSTextField,NSControl,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxStaticText() {} - wxStaticText(wxWindow *parent, wxWindowID winid, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxStaticTextNameStr) - { - Create(parent, winid, label, pos, size, style, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxStaticTextNameStr); - virtual ~wxStaticText(); - -// ------------------------------------------------------------------------ -// Cocoa specifics -// ------------------------------------------------------------------------ -protected: - virtual void Cocoa_didChangeText(void); -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - virtual void SetLabel(const wxString& label); - virtual wxString GetLabel() const; -}; - -#endif // __WX_COCOA_STATTEXT_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/string.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/string.h deleted file mode 100644 index 65112a053a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/string.h +++ /dev/null @@ -1,52 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/string.h -// Purpose: String conversion methods -// Author: David Elliott -// Modified by: -// Created: 2003/04/13 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_STRING_H__ -#define __WX_COCOA_STRING_H__ - -#import -#include "wx/string.h" - -// FIXME: In unicode mode we are doing the conversion twice. wxString -// converts to UTF-8 and NSString converts from UTF-8. -// One possible optimization is to convert to the wxString internal -// representation which is an unsigned short (unichar) but unfortunately -// there is little documentation on which encoding it uses by default. - -// Return an autoreleased NSString -inline NSString* wxNSStringWithWxString(const wxString &wxstring) -{ -#if wxUSE_UNICODE - return [NSString stringWithUTF8String: wxstring.utf8_str()]; -#else - return [NSString stringWithCString: wxstring.c_str() length:wxstring.Len()]; -#endif // wxUSE_UNICODE -} - -// Intialize an NSString which has already been allocated -inline NSString* wxInitNSStringWithWxString(NSString *nsstring, const wxString &wxstring) -{ -#if wxUSE_UNICODE - return [nsstring initWithUTF8String: wxstring.utf8_str()]; -#else - return [nsstring initWithCString: wxstring.c_str() length:wxstring.Len()]; -#endif // wxUSE_UNICODE -} - -inline wxString wxStringWithNSString(NSString *nsstring) -{ -#if wxUSE_UNICODE - return wxString::FromUTF8Unchecked([nsstring UTF8String]); -#else - return wxString([nsstring lossyCString]); -#endif // wxUSE_UNICODE -} - -#endif // __WX_COCOA_STRING_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/taskbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/taskbar.h deleted file mode 100644 index 9c52bfc6c8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/taskbar.h +++ /dev/null @@ -1,47 +0,0 @@ -///////////////////////////////////////////////////////////////////////// -// File: wx/cocoa/taskbar.h -// Purpose: Defines wxTaskBarIcon class -// Author: David Elliott -// Modified by: -// Created: 2004/01/24 -// Copyright: (c) 2004 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_TASKBAR_H__ -#define _WX_COCOA_TASKBAR_H__ - -#include "wx/icon.h" - -class WXDLLIMPEXP_FWD_CORE wxIcon; -class WXDLLIMPEXP_FWD_CORE wxMenu; - -class wxTaskBarIconCocoaImpl; - -class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase -{ - friend class wxTaskBarIconCocoaImpl; - DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon) -public: - //type of taskbar item to create (currently only DOCK is implemented) - enum wxTaskBarIconType - { DOCK - , CUSTOM_STATUSITEM -// , STATUSITEM // TODO: Implement using NSStatusItem w/o custom NSView -// , MENUEXTRA // Menu extras require undocumented hacks - , DEFAULT_TYPE = CUSTOM_STATUSITEM - }; - - // Only one wxTaskBarIcon can be of the Dock type so by default - // create NSStatusItem for maximum source compatibility. - wxTaskBarIcon(wxTaskBarIconType iconType = DEFAULT_TYPE); - virtual ~wxTaskBarIcon(); - - bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString); - bool RemoveIcon(); - bool PopupMenu(wxMenu *menu); //, int x, int y); -protected: - wxTaskBarIconCocoaImpl *m_impl; -}; - -#endif // _WX_COCOA_TASKBAR_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/textctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/textctrl.h deleted file mode 100644 index d7b8c0aa7c..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/textctrl.h +++ /dev/null @@ -1,122 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/textctrl.h -// Purpose: wxTextCtrl class -// Author: David Elliott -// Modified by: -// Created: 2003/03/16 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_TEXTCTRL_H__ -#define __WX_COCOA_TEXTCTRL_H__ - -#include "wx/cocoa/NSTextField.h" - -// ======================================================================== -// wxTextCtrl -// ======================================================================== -class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase, protected wxCocoaNSTextField -{ - DECLARE_DYNAMIC_CLASS(wxTextCtrl) - DECLARE_EVENT_TABLE() - WX_DECLARE_COCOA_OWNER(NSTextField,NSControl,NSView) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxTextCtrl() {} - wxTextCtrl(wxWindow *parent, wxWindowID winid, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTextCtrlNameStr) - { - Create(parent, winid, value, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID winid, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxTextCtrlNameStr); - virtual ~wxTextCtrl(); - -// ------------------------------------------------------------------------ -// Cocoa specifics -// ------------------------------------------------------------------------ -protected: - virtual void Cocoa_didChangeText(void); - virtual void CocoaTarget_action(void); -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - virtual wxString GetValue() const; - - virtual int GetLineLength(long lineNo) const; - virtual wxString GetLineText(long lineNo) const; - virtual int GetNumberOfLines() const; - - virtual bool IsModified() const; - virtual bool IsEditable() const; - - // If the return values from and to are the same, there is no selection. - virtual void GetSelection(long* from, long* to) const; - - // operations - // ---------- - - // editing - virtual void Clear(); - virtual void Replace(long from, long to, const wxString& value); - virtual void Remove(long from, long to); - - // clears the dirty flag - virtual void MarkDirty(); - virtual void DiscardEdits(); - - // writing text inserts it at the current position, appending always - // inserts it at the end - virtual void WriteText(const wxString& text); - virtual void AppendText(const wxString& text); - - // translate between the position (which is just an index in the text ctrl - // considering all its contents as a single strings) and (x, y) coordinates - // which represent column and line. - virtual long XYToPosition(long x, long y) const; - virtual bool PositionToXY(long pos, long *x, long *y) const; - - virtual void ShowPosition(long pos); - - // Clipboard operations - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); - - // Undo/redo - virtual void Undo(); - virtual void Redo(); - - virtual bool CanUndo() const; - virtual bool CanRedo() const; - - // Insertion point - virtual void SetInsertionPoint(long pos); - virtual void SetInsertionPointEnd(); - virtual long GetInsertionPoint() const; - virtual wxTextPos GetLastPosition() const; - - virtual void SetSelection(long from, long to); -// virtual void SelectAll(); - virtual void SetEditable(bool editable); - -protected: - virtual wxSize DoGetBestSize() const; - - virtual void DoSetValue(const wxString& value, int flags = 0); -}; - -#endif // __WX_COCOA_TEXTCTRL_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/toolbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/toolbar.h deleted file mode 100644 index ce57dee03f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/toolbar.h +++ /dev/null @@ -1,120 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/toolbar.h -// Purpose: wxToolBar -// Author: David Elliott -// Modified by: -// Created: 2003/08/17 -// Copyright: (c) 2003 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_TOOLBAR_H__ -#define __WX_COCOA_TOOLBAR_H__ - -#if wxUSE_TOOLBAR - -// ======================================================================== -// wxToolBar -// ======================================================================== -#if defined(__LP64__) || defined(NS_BUILD_32_LIKE_64) -typedef struct CGPoint NSPoint; -#else -typedef struct _NSPoint NSPoint; -#endif - -class wxToolBarTool; - -class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase -{ - DECLARE_DYNAMIC_CLASS(wxToolBar) -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxToolBar() { Init(); } - wxToolBar( wxWindow *parent, - wxWindowID toolid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxToolBarNameStr ) - { - Init(); - - Create(parent, toolid, pos, size, style, name); - } - - bool Create( wxWindow *parent, - wxWindowID toolid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxToolBarNameStr ); - - virtual ~wxToolBar(); - -protected: - // common part of all ctors - void Init(); - -// ------------------------------------------------------------------------ -// Cocoa -// ------------------------------------------------------------------------ -protected: - virtual bool Cocoa_acceptsFirstMouse(bool &acceptsFirstMouse, WX_NSEvent theEvent); - virtual bool Cocoa_drawRect(const NSRect &rect); - virtual bool Cocoa_mouseDown(WX_NSEvent theEvent); - virtual bool Cocoa_mouseDragged(WX_NSEvent theEvent); - wxToolBarTool *CocoaFindToolForPosition(const NSPoint& pos) const; - void CocoaToolClickEnded(); -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - // override base class virtuals - virtual void SetMargins(int x, int y); - virtual void SetToolSeparation(int separation); - - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; - - virtual void SetToolShortHelp(int toolid, const wxString& helpString); - - virtual void SetWindowStyleFlag( long style ); - - // implementation from now on - // -------------------------- - - void OnInternalIdle(); - virtual bool Realize(); - virtual wxSize DoGetBestSize() const; - - void SetOwningFrame(wxFrame *owningFrame) - { m_owningFrame = owningFrame; } -protected: - // implement base class pure virtuals - virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); - virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); - - virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable); - virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); - virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); - - virtual wxToolBarToolBase *CreateTool(int toolid, - const wxString& label, - const wxBitmap& bitmap1, - const wxBitmap& bitmap2, - wxItemKind kind, - wxObject *clientData, - const wxString& shortHelpString, - const wxString& longHelpString); - virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label); - - wxSize m_bestSize; - wxFrame *m_owningFrame; - wxToolBarTool *m_mouseDownTool; -}; - -#endif // wxUSE_TOOLBAR - -#endif // __WX_COCOA_TOOLBAR_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/tooltip.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/tooltip.h deleted file mode 100644 index a096a54236..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/tooltip.h +++ /dev/null @@ -1,54 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/tooltip.h -// Purpose: wxToolTip class - tooltip control -// Author: Ryan Norton -// Modified by: -// Created: 31.01.99 -// Copyright: (c) Ryan Norton -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COCOA_TOOLTIP_H_ -#define _WX_COCOA_TOOLTIP_H_ - -#include "wx/object.h" - -class wxWindow; - -class wxToolTip : public wxObject -{ -public: - // ctor & dtor - wxToolTip(const wxString &tip); - virtual ~wxToolTip(); - - // accessors - // tip text - void SetTip(const wxString& tip); - const wxString& GetTip() const; - - // the window we're associated with - wxWindow *GetWindow() const; - - // controlling tooltip behaviour: globally change tooltip parameters - // enable or disable the tooltips globally - static void Enable(bool flag); - // set the delay after which the tooltip appears - static void SetDelay(long milliseconds); - // set the delay after which the tooltip disappears or how long the tooltip remains visible - static void SetAutoPop(long milliseconds); - // set the delay between subsequent tooltips to appear - static void SetReshow(long milliseconds); - -private: - void SetWindow(wxWindow* window); - - friend class wxWindow; - - wxString m_text; // tooltip text - wxWindow *m_window; // window we're associated with - - DECLARE_ABSTRACT_CLASS(wxToolTip) -}; - -#endif // _WX_COCOA_TOOLTIP_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/toplevel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/toplevel.h deleted file mode 100644 index d0768294d3..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/toplevel.h +++ /dev/null @@ -1,130 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/toplevel.h -// Purpose: wxTopLevelWindowCocoa is the Cocoa implementation of wxTLW -// Author: David Elliott -// Modified by: -// Created: 2002/12/08 -// Copyright: (c) 2002 David Elliott -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_TOPLEVEL_H__ -#define __WX_COCOA_TOPLEVEL_H__ - -#include "wx/hashmap.h" -#include "wx/cocoa/NSWindow.h" - -class WXDLLIMPEXP_FWD_CORE wxMenuBar; - -// ======================================================================== -// wxTopLevelWindowCocoa -// ======================================================================== -class WXDLLIMPEXP_CORE wxTopLevelWindowCocoa : public wxTopLevelWindowBase, protected wxCocoaNSWindow -{ - DECLARE_EVENT_TABLE(); - DECLARE_NO_COPY_CLASS(wxTopLevelWindowCocoa); -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - inline wxTopLevelWindowCocoa() - : wxCocoaNSWindow(this) - { Init(); } - - inline wxTopLevelWindowCocoa(wxWindow *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - : wxCocoaNSWindow(this) - { - Init(); - Create(parent, winid, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID winid, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - virtual ~wxTopLevelWindowCocoa(); - -protected: - // common part of all ctors - void Init(); - -// ------------------------------------------------------------------------ -// Cocoa specifics -// ------------------------------------------------------------------------ -public: - inline WX_NSWindow GetNSWindow() { return m_cocoaNSWindow; } - virtual void CocoaDelegate_windowWillClose(void); - virtual bool CocoaDelegate_windowShouldClose(void); - virtual void CocoaDelegate_windowDidBecomeKey(void); - virtual void CocoaDelegate_windowDidResignKey(void); - virtual void CocoaDelegate_windowDidBecomeMain(void); - virtual void CocoaDelegate_windowDidResignMain(void); - virtual void CocoaDelegate_wxMenuItemAction(WX_NSMenuItem sender); - virtual bool CocoaDelegate_validateMenuItem(WX_NSMenuItem sender); - virtual wxMenuBar* GetAppMenuBar(wxCocoaNSWindow *win); - static void DeactivatePendingWindow(); -protected: - void SetNSWindow(WX_NSWindow cocoaNSWindow); - WX_NSWindow m_cocoaNSWindow; - static wxCocoaNSWindowHash sm_cocoaHash; - virtual void CocoaReplaceView(WX_NSView oldView, WX_NSView newView); - static unsigned int NSWindowStyleForWxStyle(long style); - static NSRect MakeInitialNSWindowContentRect(const wxPoint& pos, const wxSize& size, unsigned int cocoaStyleMask); - - static wxTopLevelWindowCocoa *sm_cocoaDeactivateWindow; -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - virtual bool Destroy(); - // Pure virtuals - virtual void Maximize(bool maximize = true); - virtual bool IsMaximized() const; - virtual void Iconize(bool iconize = true); - virtual bool IsIconized() const; - virtual void Restore(); - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - virtual bool IsFullScreen() const; - // other - virtual bool Show( bool show = true ); - virtual bool Close( bool force = false ); - virtual void OnCloseWindow(wxCloseEvent& event); - virtual void CocoaSetWxWindowSize(int width, int height); - virtual void DoMoveWindow(int x, int y, int width, int height); - virtual void DoGetSize(int *width, int *height) const; - virtual void DoGetPosition(int *x, int *y) const; - virtual void SetTitle( const wxString& title); - virtual wxString GetTitle() const; - - // Default button (item) - wxWindow *SetDefaultItem(wxWindow *win); - -// Things I may/may not do -// virtual void SetIcons(const wxIconBundle& icons); -// virtual void Clear() ; -// virtual void Raise(); -// virtual void Lower(); -protected: - // is the frame currently iconized? - bool m_iconized; - // has the frame been closed - bool m_closed; - // should the frame be maximized when it will be shown? set by Maximize() - // when it is called while the frame is hidden - bool m_maximizeOnShow; -}; - -// list of all frames and modeless dialogs -extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxModelessWindows; - -#endif // __WX_COCOA_TOPLEVEL_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/trackingrectmanager.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/trackingrectmanager.h deleted file mode 100644 index eac59b07b4..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/trackingrectmanager.h +++ /dev/null @@ -1,40 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/trackingrectmanager.h -// Purpose: wxCocoaTrackingRectManager -// Notes: Source in window.mm -// Author: David Elliott -// Modified by: -// Created: 2007/05/02 -// Copyright: (c) 2007 Software 2000 Ltd. -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// -#ifndef __WX_COCOA_TRACKINGRECTMANAGER_H__ -#define __WX_COCOA_TRACKINGRECTMANAGER_H__ - -#include - -#define wxTRACE_COCOA_TrackingRect wxT("COCOA_TrackingRect") - -class wxCocoaTrackingRectManager -{ - wxDECLARE_NO_COPY_CLASS(wxCocoaTrackingRectManager); -public: - wxCocoaTrackingRectManager(wxWindow *window); - void ClearTrackingRect(); - void BuildTrackingRect(); - void RebuildTrackingRectIfNeeded(); - void RebuildTrackingRect(); - bool IsOwnerOfEvent(NSEvent *anEvent); - ~wxCocoaTrackingRectManager(); - void BeginSynthesizingEvents(); - void StopSynthesizingEvents(); -protected: - wxWindow *m_window; - bool m_isTrackingRectActive; - NSInteger m_trackingRectTag; - NSRect m_trackingRectInWindowCoordinates; -private: - wxCocoaTrackingRectManager(); -}; - -#endif // ndef __WX_COCOA_TRACKINGRECTMANAGER_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/window.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/window.h deleted file mode 100644 index a060f37892..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/cocoa/window.h +++ /dev/null @@ -1,226 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/cocoa/window.h -// Purpose: wxWindowCocoa -// Author: David Elliott -// Modified by: -// Created: 2002/12/26 -// Copyright: (c) 2002 David Elliott -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __WX_COCOA_WINDOW_H__ -#define __WX_COCOA_WINDOW_H__ - -#include "wx/cocoa/NSView.h" - -#ifdef __OBJC__ - #import -#endif //def __OBJC__ - -// We can only import Foundation/NSGeometry.h from Objective-C code but it's -// nice to be able to use NSPoint and NSRect in the declarations of helper -// methods so we must define them as opaque structs identically to the way -// they are defined by the real header. -// NOTE: We specifically use these regardless of C++ or Objective-C++ mode so -// the compiler will complain if we got the definitions wrong. In regular -// C++ mode there is no way to know if we got the definitons right so -// we depend on at least one Objective-C++ file including this header. -#if defined(__LP64__) || defined(NS_BUILD_32_LIKE_64) -typedef struct CGPoint NSPoint; -typedef struct CGRect NSRect; -#else -typedef struct _NSPoint NSPoint; -typedef struct _NSRect NSRect; -#endif - -DECLARE_WXCOCOA_OBJC_CLASS(NSAffineTransform); - -class wxWindowCocoaHider; -class wxWindowCocoaScrollView; -class wxCocoaTrackingRectManager; - -// ======================================================================== -// wxWindowCocoa -// ======================================================================== -class WXDLLIMPEXP_CORE wxWindowCocoa: public wxWindowBase, protected wxCocoaNSView -{ - DECLARE_DYNAMIC_CLASS(wxWindowCocoa) - wxDECLARE_NO_COPY_CLASS(wxWindowCocoa); - DECLARE_EVENT_TABLE() - friend wxWindow *wxWindowBase::GetCapture(); - friend class wxWindowCocoaScrollView; - friend class wxCocoaTrackingRectManager; -// ------------------------------------------------------------------------ -// initialization -// ------------------------------------------------------------------------ -public: - wxWindowCocoa() { Init(); } - inline wxWindowCocoa(wxWindow *parent, wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr) - { - Init(); - Create(parent, winid, pos, size, style, name); - } - - virtual ~wxWindowCocoa(); - - bool Create(wxWindow *parent, wxWindowID winid, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr); -protected: - void Init(); -// ------------------------------------------------------------------------ -// Cocoa specifics -// ------------------------------------------------------------------------ -public: - // Returns the content NSView (where children are added, drawing performed) - inline WX_NSView GetNSView() { return m_cocoaNSView; } - // Returns the NSView suitable for use as a subview - WX_NSView GetNSViewForSuperview() const; - // Returns the NSView that may be hidden/is being hidden - WX_NSView GetNSViewForHiding() const; - // Returns the NSView for non-client drawing - virtual WX_NSView GetNonClientNSView() { return GetNSViewForSuperview(); } - // Add/remove children - void CocoaAddChild(wxWindowCocoa *child); - void CocoaRemoveFromParent(void); -#ifdef __OBJC__ - // Returns an autoreleased NSAffineTransform which can be applied - // to a graphics context currently using the view's coordinate system - // (such as the one locked when drawRect is called or after a call - // to [NSView lockFocus]) such that further drawing is done using - // the wxWidgets coordinate system. - WX_NSAffineTransform CocoaGetWxToBoundsTransform(); -#endif //def __OBJC__ -protected: - // actually enable/disable the cocoa control, overridden by subclasses - virtual void CocoaSetEnabled(bool WXUNUSED(enable)) { } - - void CocoaCreateNSScrollView(); - void InitMouseEvent(wxMouseEvent &event, WX_NSEvent cocoaEvent); - virtual wxWindow* GetWxWindow() const; - virtual void Cocoa_FrameChanged(void); - virtual void Cocoa_synthesizeMouseMoved(void); - virtual bool Cocoa_drawRect(const NSRect &rect); - virtual bool Cocoa_mouseDown(WX_NSEvent theEvent); - virtual bool Cocoa_mouseDragged(WX_NSEvent theEvent); - virtual bool Cocoa_mouseUp(WX_NSEvent theEvent); - virtual bool Cocoa_mouseMoved(WX_NSEvent theEvent); - virtual bool Cocoa_mouseEntered(WX_NSEvent theEvent); - virtual bool Cocoa_mouseExited(WX_NSEvent theEvent); - virtual bool Cocoa_rightMouseDown(WX_NSEvent theEvent); - virtual bool Cocoa_rightMouseDragged(WX_NSEvent theEvent); - virtual bool Cocoa_rightMouseUp(WX_NSEvent theEvent); - virtual bool Cocoa_otherMouseDown(WX_NSEvent theEvent); - virtual bool Cocoa_otherMouseDragged(WX_NSEvent theEvent); - virtual bool Cocoa_otherMouseUp(WX_NSEvent theEvent); - virtual bool Cocoa_resetCursorRects(); - virtual bool Cocoa_viewDidMoveToWindow(); - virtual bool Cocoa_viewWillMoveToWindow(WX_NSWindow newWindow); - void SetNSView(WX_NSView cocoaNSView); - WX_NSView m_cocoaNSView; - wxWindowCocoaHider *m_cocoaHider; - wxWindowCocoaScrollView *m_wxCocoaScrollView; - bool m_isInPaint; - wxCocoaTrackingRectManager *m_visibleTrackingRectManager; - static wxWindow *sm_capturedWindow; - virtual void CocoaReplaceView(WX_NSView oldView, WX_NSView newView); - void SetInitialFrameRect(const wxPoint& pos, const wxSize& size); -#ifdef __OBJC__ - inline NSRect MakeDefaultNSRect(const wxSize& size) - { - // NOTE: position is 10,10 to make it "obvious" that it's out of place - return NSMakeRect(10.0,10.0,WidthDefault(size.x),HeightDefault(size.y)); - } - // These functions translate NSPoint or NSRect between the coordinate - // system of Cocoa's boudns rect and wx's coordinate system. - NSPoint CocoaTransformBoundsToWx(NSPoint pointBounds); - NSRect CocoaTransformBoundsToWx(NSRect rectBounds); - NSPoint CocoaTransformWxToBounds(NSPoint pointWx); - NSRect CocoaTransformWxToBounds(NSRect rectWx); -#endif //def __OBJC__ - static wxPoint OriginInWxDisplayCoordinatesForRectInCocoaScreenCoordinates(NSRect windowFrame); - static NSPoint OriginInCocoaScreenCoordinatesForRectInWxDisplayCoordinates(wxCoord x, wxCoord y, wxCoord width, wxCoord height, bool keepOriginVisible); -// ------------------------------------------------------------------------ -// Implementation -// ------------------------------------------------------------------------ -public: - /* Pure Virtuals */ - // Raise the window to the top of the Z order - virtual void Raise(); - // Lower the window to the bottom of the Z order - virtual void Lower(); - // Set the focus to this window - virtual void SetFocus(); - // Warp the pointer the given position - virtual void WarpPointer(int x_pos, int y_pos) ; - // Change the window's cursor - virtual bool SetCursor( const wxCursor &cursor ); - // Send the window a refresh event - virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL); - // Set/get the window's font - virtual bool SetFont(const wxFont& f); -// inline virtual wxFont& GetFont() const; - virtual void SetLabel(const wxString& label); - virtual wxString GetLabel() const; - // label handling - // Get character size - virtual int GetCharHeight() const; - virtual int GetCharWidth() const; - virtual void DoGetTextExtent(const wxString& string, int *x, int *y, - int *descent = NULL, - int *externalLeading = NULL, - const wxFont *theFont = NULL) const; - // Scroll stuff - virtual void SetScrollbar(int orient, int pos, int thumbVisible, - int range, bool refresh = true); - virtual void SetScrollPos(int orient, int pos, bool refresh = true); - virtual int GetScrollPos(int orient) const; - virtual int GetScrollThumb(int orient) const; - virtual int GetScrollRange(int orient) const; - virtual void ScrollWindow(int dx, int dy, const wxRect *rect = NULL); - virtual void DoSetVirtualSize(int x, int y); - // Get the private handle (platform-dependent) - virtual WXWidget GetHandle() const; - // Convert client to screen coordinates - virtual void DoClientToScreen(int *x, int *y) const; - // Convert screen to client coordinates - virtual void DoScreenToClient(int *x, int *y) const; - // Capture/release mouse - virtual void DoCaptureMouse(); - virtual void DoReleaseMouse(); - // Get window position, relative to parent (or screen if no parent) - virtual void DoGetPosition(int *x, int *y) const; - // Get overall window size - virtual void DoGetSize(int *width, int *height) const; - // Get/set client (application-useable) size - virtual void DoGetClientSize(int *width, int *height) const; - virtual void DoSetClientSize(int width, int size); - // Set this window's tooltip - virtual void DoSetToolTip( wxToolTip *tip ); - // Set the size of the wxWindow (the contentView of an NSWindow) - // wxTopLevelWindow will override this and set the NSWindow size - // such that the contentView will be this size - virtual void CocoaSetWxWindowSize(int width, int height); - // Set overall size and position - virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - virtual void DoMoveWindow(int x, int y, int width, int height); - // Popup a menu - virtual bool DoPopupMenu(wxMenu *menu, int x, int y); - - /* Other implementation */ - - // NOTE: typically Close() is not virtual, but we want this for Cocoa - virtual bool Close( bool force = false ); - virtual bool Show( bool show = true ); - virtual void DoEnable( bool enable ); - - virtual bool IsDoubleBuffered() const { return true; } -}; - -#endif // __WX_COCOA_WINDOW_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/app.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/app.h deleted file mode 100644 index 4807dd6a4a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/app.h +++ /dev/null @@ -1,44 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/app.h -// Purpose: wxApp class -// Author: Vaclav Slavik -// Created: 2006-08-10 -// Copyright: (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_APP_H_ -#define _WX_DFB_APP_H_ - -#include "wx/dfb/dfbptr.h" - -#include "wx/vidmode.h" - -wxDFB_DECLARE_INTERFACE(IDirectFB); - -//----------------------------------------------------------------------------- -// wxApp -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxApp: public wxAppBase -{ -public: - wxApp(); - ~wxApp(); - - // override base class (pure) virtuals - virtual bool Initialize(int& argc, wxChar **argv); - virtual void CleanUp(); - - virtual void WakeUpIdle(); - - virtual wxVideoMode GetDisplayMode() const; - virtual bool SetDisplayMode(const wxVideoMode& mode); - -private: - wxVideoMode m_videoMode; - - DECLARE_DYNAMIC_CLASS(wxApp) -}; - -#endif // _WX_DFB_APP_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/bitmap.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/bitmap.h deleted file mode 100644 index 391a8e06fd..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/bitmap.h +++ /dev/null @@ -1,94 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/bitmap.h -// Purpose: wxBitmap class -// Author: Vaclav Slavik -// Created: 2006-08-04 -// Copyright: (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_BITMAP_H_ -#define _WX_DFB_BITMAP_H_ - -#include "wx/dfb/dfbptr.h" - -class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; - -wxDFB_DECLARE_INTERFACE(IDirectFBSurface); - -//----------------------------------------------------------------------------- -// wxBitmap -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmap : public wxBitmapBase -{ -public: - wxBitmap() {} - wxBitmap(const wxIDirectFBSurfacePtr& surface) { Create(surface); } - wxBitmap(int width, int height, int depth = -1) { Create(width, height, depth); } - wxBitmap(const wxSize& sz, int depth = -1) { Create(sz, depth); } - wxBitmap(const char bits[], int width, int height, int depth = 1); - wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); - wxBitmap(const char* const* bits); -#if wxUSE_IMAGE - wxBitmap(const wxImage& image, int depth = -1); -#endif - - bool Create(const wxIDirectFBSurfacePtr& surface); - bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); - bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) - { return Create(sz.GetWidth(), sz.GetHeight(), depth); } - bool Create(int width, int height, const wxDC& WXUNUSED(dc)) - { return Create(width,height); } - - virtual int GetHeight() const; - virtual int GetWidth() const; - virtual int GetDepth() const; - -#if wxUSE_IMAGE - virtual wxImage ConvertToImage() const; -#endif - - virtual wxMask *GetMask() const; - virtual void SetMask(wxMask *mask); - - virtual wxBitmap GetSubBitmap(const wxRect& rect) const; - - virtual bool SaveFile(const wxString &name, wxBitmapType type, - const wxPalette *palette = NULL) const; - virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); - -#if wxUSE_PALETTE - virtual wxPalette *GetPalette() const; - virtual void SetPalette(const wxPalette& palette); -#endif - - // copies the contents and mask of the given (colour) icon to the bitmap - virtual bool CopyFromIcon(const wxIcon& icon); - - static void InitStandardHandlers(); - - // raw bitmap access support functions - void *GetRawData(wxPixelDataBase& data, int bpp); - void UngetRawData(wxPixelDataBase& data); - - bool HasAlpha() const; - - // implementation: - virtual void SetHeight(int height); - virtual void SetWidth(int width); - virtual void SetDepth(int depth); - - // get underlying native representation: - wxIDirectFBSurfacePtr GetDirectFBSurface() const; - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - bool CreateWithFormat(int width, int height, int dfbFormat); - - DECLARE_DYNAMIC_CLASS(wxBitmap) -}; - -#endif // _WX_DFB_BITMAP_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/brush.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/brush.h deleted file mode 100644 index 50c1968dd8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/brush.h +++ /dev/null @@ -1,64 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/brush.h -// Purpose: wxBrush class declaration -// Author: Vaclav Slavik -// Created: 2006-08-04 -// Copyright: (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_BRUSH_H_ -#define _WX_DFB_BRUSH_H_ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/gdiobj.h" -#include "wx/bitmap.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_FWD_CORE wxBrush; - -//----------------------------------------------------------------------------- -// wxBrush -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase -{ -public: - wxBrush() {} - wxBrush(const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID); -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) ); -#endif - wxBrush(const wxBitmap &stippleBitmap); - - bool operator==(const wxBrush& brush) const; - bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - - wxBrushStyle GetStyle() const; - wxColour GetColour() const; - wxBitmap *GetStipple() const; - - void SetColour(const wxColour& col); - void SetColour(unsigned char r, unsigned char g, unsigned char b); - void SetStyle(wxBrushStyle style); - void SetStipple(const wxBitmap& stipple); - -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_FUTURE( void SetStyle(int style) ) - { SetStyle((wxBrushStyle)style); } -#endif - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - DECLARE_DYNAMIC_CLASS(wxBrush) -}; - -#endif // _WX_DFB_BRUSH_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/chkconf.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/chkconf.h deleted file mode 100644 index 89f35ed42c..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/chkconf.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Name: wx/dfb/chkconf.h - * Author: Vaclav Slavik - * Purpose: Compiler-specific configuration checking - * Created: 2006-08-10 - * Copyright: (c) 2006 REA Elektronik GmbH - * Licence: wxWindows licence - */ - -/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */ - -#ifndef _WX_DFB_CHKCONF_H_ -#define _WX_DFB_CHKCONF_H_ - -#ifndef __WXUNIVERSAL__ -# error "wxDirectFB cannot be built without wxUniversal" -#endif - -#if !wxUSE_CONFIG -# error "wxFileConfig is required by wxDFB port" -#endif - -#if wxUSE_SOCKETS && !wxUSE_CONSOLE_EVENTLOOP -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxSocket requires wxSelectDispatcher in wxDFB" -# else -# undef wxUSE_CONSOLE_EVENTLOOP -# define wxUSE_CONSOLE_EVENTLOOP 1 -# endif -#endif - -#if wxUSE_DATAOBJ -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxDataObject not supported in wxDFB" -# else -# undef wxUSE_DATAOBJ -# define wxUSE_DATAOBJ 0 -# endif -#endif - -#endif /* _WX_DFB_CHKCONF_H_ */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/cursor.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/cursor.h deleted file mode 100644 index 32e102e8f3..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/cursor.h +++ /dev/null @@ -1,47 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/cursor.h -// Purpose: wxCursor declaration -// Author: Vaclav Slavik -// Created: 2006-08-08 -// Copyright: (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_CURSOR_H_ -#define _WX_DFB_CURSOR_H_ - -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" - -class WXDLLIMPEXP_FWD_CORE wxBitmap; - -//----------------------------------------------------------------------------- -// wxCursor -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject -{ -public: - wxCursor() {} - wxCursor(wxStockCursor id) { InitFromStock(id); } -#if WXWIN_COMPATIBILITY_2_8 - wxCursor(int id) { InitFromStock((wxStockCursor)id); } -#endif - wxCursor(const wxString& name, - wxBitmapType type = wxCURSOR_DEFAULT_TYPE, - int hotSpotX = 0, int hotSpotY = 0); - - // implementation - wxBitmap GetBitmap() const; - -protected: - void InitFromStock(wxStockCursor); - - // ref counting code - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - DECLARE_DYNAMIC_CLASS(wxCursor) -}; - -#endif // _WX_DFB_CURSOR_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/dc.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/dc.h deleted file mode 100644 index ea6b8a0010..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/dc.h +++ /dev/null @@ -1,167 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/dc.h -// Purpose: wxDC class -// Author: Vaclav Slavik -// Created: 2006-08-07 -// Copyright: (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_DC_H_ -#define _WX_DFB_DC_H_ - -#include "wx/defs.h" -#include "wx/region.h" -#include "wx/dc.h" -#include "wx/dfb/dfbptr.h" - -wxDFB_DECLARE_INTERFACE(IDirectFBSurface); - -//----------------------------------------------------------------------------- -// wxDFBDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDFBDCImpl : public wxDCImpl -{ -public: - // ctors - wxDFBDCImpl(wxDC *owner) : wxDCImpl(owner) { m_surface = NULL; } - wxDFBDCImpl(wxDC *owner, const wxIDirectFBSurfacePtr& surface) - : wxDCImpl(owner) - { - DFBInit(surface); - } - - bool IsOk() const { return m_surface != NULL; } - - // implement base class pure virtuals - // ---------------------------------- - - virtual void Clear(); - - virtual bool StartDoc(const wxString& message); - virtual void EndDoc(); - - virtual void StartPage(); - virtual void EndPage(); - - virtual void SetFont(const wxFont& font); - virtual void SetPen(const wxPen& pen); - virtual void SetBrush(const wxBrush& brush); - virtual void SetBackground(const wxBrush& brush); - virtual void SetBackgroundMode(int mode); -#if wxUSE_PALETTE - virtual void SetPalette(const wxPalette& palette); -#endif - - virtual void SetLogicalFunction(wxRasterOperationMode function); - - virtual void DestroyClippingRegion(); - - virtual wxCoord GetCharHeight() const; - virtual wxCoord GetCharWidth() const; - virtual void DoGetTextExtent(const wxString& string, - wxCoord *x, wxCoord *y, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const; - - virtual bool CanDrawBitmap() const { return true; } - virtual bool CanGetTextExtent() const { return true; } - virtual int GetDepth() const; - virtual wxSize GetPPI() const; - - // Returns the surface (and increases its ref count) - wxIDirectFBSurfacePtr GetDirectFBSurface() const { return m_surface; } - -protected: - // implementation - wxCoord XDEV2LOG(wxCoord x) const { return DeviceToLogicalX(x); } - wxCoord XDEV2LOGREL(wxCoord x) const { return DeviceToLogicalXRel(x); } - wxCoord YDEV2LOG(wxCoord y) const { return DeviceToLogicalY(y); } - wxCoord YDEV2LOGREL(wxCoord y) const { return DeviceToLogicalYRel(y); } - wxCoord XLOG2DEV(wxCoord x) const { return LogicalToDeviceX(x); } - wxCoord XLOG2DEVREL(wxCoord x) const { return LogicalToDeviceXRel(x); } - wxCoord YLOG2DEV(wxCoord y) const { return LogicalToDeviceY(y); } - wxCoord YLOG2DEVREL(wxCoord y) const { return LogicalToDeviceYRel(y); } - - // initializes the DC from a surface, must be called if default ctor - // was used - void DFBInit(const wxIDirectFBSurfacePtr& surface); - - virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style = wxFLOOD_SURFACE); - - virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const; - - virtual void DoDrawPoint(wxCoord x, wxCoord y); - virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); - - virtual void DoDrawArc(wxCoord x1, wxCoord y1, - wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc); - virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, - double sa, double ea); - - virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y, - wxCoord width, wxCoord height, - double radius); - virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - - virtual void DoCrossHair(wxCoord x, wxCoord y); - - virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y); - virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, - bool useMask = false); - - virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y); - virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, - double angle); - - virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode rop = wxCOPY, bool useMask = false, - wxCoord xsrcMask = -1, wxCoord ysrcMask = -1); - - virtual void DoSetClippingRegion(wxCoord x, wxCoord y, - wxCoord width, wxCoord height); - virtual void DoSetDeviceClippingRegion(const wxRegion& region); - - virtual void DoGetSize(int *width, int *height) const; - virtual void DoGetSizeMM(int* width, int* height) const; - - virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset); - virtual void DoDrawPolygon(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE); - - // implementation from now on: -protected: - wxIDirectFBFontPtr GetCurrentFont() const; - -private: - // Unified implementation of DrawIcon, DrawBitmap and Blit: - void DoDrawSubBitmap(const wxBitmap &bmp, - wxCoord x, wxCoord y, wxCoord w, wxCoord h, - wxCoord destx, wxCoord desty, int rop, bool useMask); - bool DoBlitFromSurface(const wxIDirectFBSurfacePtr& src, - wxCoord srcx, wxCoord srcy, - wxCoord w, wxCoord h, - wxCoord dstx, wxCoord dsty); - - // selects colour into surface's state - void SelectColour(const wxColour& clr); - -protected: - wxIDirectFBSurfacePtr m_surface; - - double m_mm_to_pix_x, m_mm_to_pix_y; - - friend class WXDLLIMPEXP_FWD_CORE wxOverlayImpl; // for Init - - DECLARE_ABSTRACT_CLASS(wxDFBDCImpl) -}; - -#endif // _WX_DFB_DC_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/dcclient.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/dcclient.h deleted file mode 100644 index 29ed91b273..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/dcclient.h +++ /dev/null @@ -1,73 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/dcclient.h -// Purpose: wxWindowDCImpl, wxClientDCImpl and wxPaintDCImpl -// Author: Vaclav Slavik -// Created: 2006-08-10 -// Copyright: (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_DCCLIENT_H_ -#define _WX_DFB_DCCLIENT_H_ - -#include "wx/dfb/dc.h" - -class WXDLLIMPEXP_FWD_CORE wxWindow; - -//----------------------------------------------------------------------------- -// wxWindowDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxDFBDCImpl -{ -public: - wxWindowDCImpl(wxDC *owner) : wxDFBDCImpl(owner), m_shouldFlip(false) { } - wxWindowDCImpl(wxDC *owner, wxWindow *win); - virtual ~wxWindowDCImpl(); - -protected: - // initializes the DC for painting on given window; if rect!=NULL, then - // for painting only on the given region of the window - void InitForWin(wxWindow *win, const wxRect *rect); - -private: - wxRect m_winRect; // rectangle of the window being painted - - bool m_shouldFlip; // flip the surface when done? - - friend class wxOverlayImpl; // for m_shouldFlip; - - DECLARE_DYNAMIC_CLASS(wxWindowDCImpl) - wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl); -}; - -//----------------------------------------------------------------------------- -// wxClientDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl -{ -public: - wxClientDCImpl(wxDC *owner) : wxWindowDCImpl(owner) { } - wxClientDCImpl(wxDC *owner, wxWindow *win); - - DECLARE_DYNAMIC_CLASS(wxClientDCImpl) - wxDECLARE_NO_COPY_CLASS(wxClientDCImpl); -}; - - -//----------------------------------------------------------------------------- -// wxPaintDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl -{ -public: - wxPaintDCImpl(wxDC *owner) : wxClientDCImpl(owner) { } - wxPaintDCImpl(wxDC *owner, wxWindow *win) : wxClientDCImpl(owner, win) { } - - DECLARE_DYNAMIC_CLASS(wxPaintDCImpl) - wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl); -}; - -#endif // _WX_DFB_DCCLIENT_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/dcmemory.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/dcmemory.h deleted file mode 100644 index a02a7faefc..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/dcmemory.h +++ /dev/null @@ -1,37 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/dcmemory.h -// Purpose: wxMemoryDC class declaration -// Created: 2006-08-10 -// Author: Vaclav Slavik -// Copyright: (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_DCMEMORY_H_ -#define _WX_DFB_DCMEMORY_H_ - -#include "wx/dfb/dc.h" -#include "wx/bitmap.h" - -class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxDFBDCImpl -{ -public: - wxMemoryDCImpl(wxMemoryDC *owner); - wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap); - wxMemoryDCImpl(wxMemoryDC *owner, wxDC *dc); // create compatible DC - - // override wxMemoryDC-specific base class virtual methods - virtual const wxBitmap& GetSelectedBitmap() const { return m_bmp; } - virtual wxBitmap& GetSelectedBitmap() { return m_bmp; } - virtual void DoSelect(const wxBitmap& bitmap); - -private: - void Init(); - - wxBitmap m_bmp; - - DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl) -}; - -#endif // _WX_DFB_DCMEMORY_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/dcscreen.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/dcscreen.h deleted file mode 100644 index 37e44d69b7..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/dcscreen.h +++ /dev/null @@ -1,23 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/dcscreen.h -// Purpose: wxScreenDCImpl declaration -// Author: Vaclav Slavik -// Created: 2006-08-10 -// Copyright: (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_DCSCREEN_H_ -#define _WX_DFB_DCSCREEN_H_ - -#include "wx/dfb/dc.h" - -class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxDFBDCImpl -{ -public: - wxScreenDCImpl(wxScreenDC *owner); - - DECLARE_DYNAMIC_CLASS(wxScreenDCImpl) -}; - -#endif // _WX_DFB_DCSCREEN_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/dfbptr.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/dfbptr.h deleted file mode 100644 index e34e3dc268..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/dfbptr.h +++ /dev/null @@ -1,109 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/dfbptr.h -// Purpose: wxDfbPtr for holding objects declared in wrapdfb.h -// Author: Vaclav Slavik -// Created: 2006-08-09 -// Copyright: (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_DFBPTR_H_ -#define _WX_DFB_DFBPTR_H_ - -//----------------------------------------------------------------------------- -// wxDFB_DECLARE_INTERFACE -//----------------------------------------------------------------------------- - -/** - Forward declares wx wrapper around DirectFB interface @a name. - - Also declares wx##name##Ptr typedef for wxDfbPtr pointer. - - @param name name of the DirectFB interface - */ -#define wxDFB_DECLARE_INTERFACE(name) \ - class wx##name; \ - typedef wxDfbPtr wx##name##Ptr; - - -//----------------------------------------------------------------------------- -// wxDfbPtr -//----------------------------------------------------------------------------- - -class wxDfbWrapperBase; - -class WXDLLIMPEXP_CORE wxDfbPtrBase -{ -protected: - static void DoAddRef(wxDfbWrapperBase *ptr); - static void DoRelease(wxDfbWrapperBase *ptr); -}; - -/** - This template implements smart pointer for keeping pointers to DirectFB - wrappers (i.e. wxIFoo classes derived from wxDfbWrapper). Interface's - reference count is increased on copying and the interface is released when - the pointer is deleted. - */ -template -class wxDfbPtr : private wxDfbPtrBase -{ -public: - /** - Creates the pointer from raw pointer to the wrapper. - - Takes ownership of @a ptr, i.e. AddRef() is @em not called on it. - */ - wxDfbPtr(T *ptr = NULL) : m_ptr(ptr) {} - - /// Copy ctor - wxDfbPtr(const wxDfbPtr& ptr) { InitFrom(ptr); } - - /// Dtor. Releases the interface - ~wxDfbPtr() { Reset(); } - - /// Resets the pointer to NULL, decreasing reference count of the interface. - void Reset() - { - if ( m_ptr ) - { - this->DoRelease((wxDfbWrapperBase*)m_ptr); - m_ptr = NULL; - } - } - - /// Cast to the wrapper pointer - operator T*() const { return m_ptr; } - - // standard operators: - - wxDfbPtr& operator=(T *ptr) - { - Reset(); - m_ptr = ptr; - return *this; - } - - wxDfbPtr& operator=(const wxDfbPtr& ptr) - { - Reset(); - InitFrom(ptr); - return *this; - } - - T& operator*() const { return *m_ptr; } - T* operator->() const { return m_ptr; } - -private: - void InitFrom(const wxDfbPtr& ptr) - { - m_ptr = ptr.m_ptr; - if ( m_ptr ) - this->DoAddRef((wxDfbWrapperBase*)m_ptr); - } - -private: - T *m_ptr; -}; - -#endif // _WX_DFB_DFBPTR_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/evtloop.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/evtloop.h deleted file mode 100644 index 7a0dd0e056..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/evtloop.h +++ /dev/null @@ -1,45 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/evtloop.h -// Purpose: declares wxEventLoop class -// Author: Vaclav Slavik -// Created: 2006-08-16 -// Copyright: (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_EVTLOOP_H_ -#define _WX_DFB_EVTLOOP_H_ - -#include "wx/dfb/dfbptr.h" -#include "wx/unix/evtloop.h" - -wxDFB_DECLARE_INTERFACE(IDirectFBEventBuffer); - -// ---------------------------------------------------------------------------- -// wxEventLoop -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxConsoleEventLoop -{ -public: - wxGUIEventLoop(); - - virtual bool YieldFor(long eventsToProcess); - - // returns DirectFB event buffer used by wx - static wxIDirectFBEventBufferPtr GetDirectFBEventBuffer(); - -private: - static void InitBuffer(); - static void CleanUp(); - - friend class wxApp; // calls CleanUp() - -private: - static wxIDirectFBEventBufferPtr ms_buffer; - static int ms_bufferFd; - - wxDECLARE_NO_COPY_CLASS(wxGUIEventLoop); -}; - -#endif // _WX_DFB_EVTLOOP_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/font.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/font.h deleted file mode 100644 index afeee6e993..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/font.h +++ /dev/null @@ -1,119 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/font.h -// Author: Vaclav Slavik -// Purpose: wxFont declaration -// Created: 2006-08-08 -// Copyright: (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_FONT_H_ -#define _WX_DFB_FONT_H_ - -#include "wx/dfb/dfbptr.h" - -wxDFB_DECLARE_INTERFACE(IDirectFBFont); - -// ---------------------------------------------------------------------------- -// wxFont -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFont : public wxFontBase -{ -public: - wxFont() {} - - wxFont(const wxFontInfo& info) - { - Create(info.GetPointSize(), - info.GetFamily(), - info.GetStyle(), - info.GetWeight(), - info.IsUnderlined(), - info.GetFaceName(), - info.GetEncoding()); - - if ( info.IsUsingSizeInPixels() ) - SetPixelSize(info.GetPixelSize()); - } - - wxFont(const wxNativeFontInfo& info) { Create(info); } -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxFont(int size, - int family, - int style, - int weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding); - } -#endif - - wxFont(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - Create(size, family, style, weight, underlined, face, encoding); - } - - wxFont(const wxSize& pixelSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - Create(10, family, style, weight, underlined, face, encoding); - SetPixelSize(pixelSize); - } - - bool Create(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - bool Create(const wxNativeFontInfo& fontinfo); - - // implement base class pure virtuals - virtual int GetPointSize() const; - virtual wxFontStyle GetStyle() const; - virtual wxFontWeight GetWeight() const; - virtual wxString GetFaceName() const; - virtual bool GetUnderlined() const; - virtual wxFontEncoding GetEncoding() const; - virtual bool IsFixedWidth() const; - virtual const wxNativeFontInfo *GetNativeFontInfo() const; - - virtual void SetPointSize(int pointSize); - virtual void SetFamily(wxFontFamily family); - virtual void SetStyle(wxFontStyle style); - virtual void SetWeight(wxFontWeight weight); - virtual bool SetFaceName(const wxString& faceName); - virtual void SetUnderlined(bool underlined); - virtual void SetEncoding(wxFontEncoding encoding); - - wxDECLARE_COMMON_FONT_METHODS(); - - // implementation from now on: - wxIDirectFBFontPtr GetDirectFBFont(bool antialiased) const; - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - virtual wxFontFamily DoGetFamily() const; - -private: - DECLARE_DYNAMIC_CLASS(wxFont) -}; - -#endif // _WX_DFB_FONT_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/nonownedwnd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/nonownedwnd.h deleted file mode 100644 index a4e8dcc7bc..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/nonownedwnd.h +++ /dev/null @@ -1,125 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/nonownedwnd.h -// Purpose: declares wxNonOwnedWindow class -// Author: Vaclav Slavik -// Modified by: -// Created: 2006-12-24 -// Copyright: (c) 2006 TT-Solutions -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_NONOWNEDWND_H_ -#define _WX_DFB_NONOWNEDWND_H_ - -#include "wx/window.h" -#include "wx/dfb/dfbptr.h" - -wxDFB_DECLARE_INTERFACE(IDirectFBWindow); -class wxDfbQueuedPaintRequests; -struct wxDFBWindowEvent; -class wxDFBEventsHandler; - -//----------------------------------------------------------------------------- -// wxNonOwnedWindow -//----------------------------------------------------------------------------- - -// This class represents "non-owned" window. A window is owned by another -// window if it has a parent and is positioned within the parent. For example, -// wxFrame is non-owned, because even though it can have a parent, it's -// location is independent of it. This class is for internal use only, it's -// the base class for wxTopLevelWindow and wxPopupWindow. -class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase -{ -public: - // construction - wxNonOwnedWindow() { Init(); } - wxNonOwnedWindow(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr) - { - Init(); - - Create(parent, id, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr); - - virtual ~wxNonOwnedWindow(); - - // implement base class pure virtuals - virtual bool Show(bool show = true); - - virtual void Update(); - - virtual void Raise(); - virtual void Lower(); - - // implementation from now on - // -------------------------- - - void OnInternalIdle(); - - wxIDirectFBWindowPtr GetDirectFBWindow() const { return m_dfbwin; } - - // Returns true if some invalidated area of the TLW is currently being - // painted - bool IsPainting() const { return m_isPainting; } - -protected: - // common part of all ctors - void Init(); - - virtual wxIDirectFBSurfacePtr ObtainDfbSurface() const; - - // overridden wxWindow methods - virtual void DoGetPosition(int *x, int *y) const; - virtual void DoGetSize(int *width, int *height) const; - virtual void DoMoveWindow(int x, int y, int width, int height); - - virtual void DoRefreshRect(const wxRect& rect); - - // sets DirectFB keyboard focus to this toplevel window (note that DFB - // focus is different from wx: only shown TLWs can have it and not any - // wxWindows as in wx - void SetDfbFocus(); - - // overridden in wxTopLevelWindowDFB, there's no common handling for wxTLW - // and wxPopupWindow to be done here - virtual void HandleFocusEvent(const wxDFBWindowEvent& WXUNUSED(event_)) {} - -private: - // do queued painting in idle time - void HandleQueuedPaintRequests(); - - // DirectFB events handling - static void HandleDFBWindowEvent(const wxDFBWindowEvent& event_); - -protected: - // did we sent wxSizeEvent at least once? - bool m_sizeSet:1; - - // window's opacity (0: transparent, 255: opaque) - wxByte m_opacity; - - // interface to the underlying DirectFB window - wxIDirectFBWindowPtr m_dfbwin; - -private: - // invalidated areas of the TLW that need repainting - wxDfbQueuedPaintRequests *m_toPaint; - // are we currently painting some area of this TLW? - bool m_isPainting; - - friend class wxDFBEventsHandler; // for HandleDFBWindowEvent - friend class wxWindowDFB; // for SetDfbFocus -}; - -#endif // _WX_DFB_NONOWNEDWND_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/pen.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/pen.h deleted file mode 100644 index d81907e08b..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/pen.h +++ /dev/null @@ -1,75 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/pen.h -// Purpose: wxPen class declaration -// Author: Vaclav Slavik -// Created: 2006-08-04 -// Copyright: (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_PEN_H_ -#define _WX_DFB_PEN_H_ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_FWD_CORE wxPen; - -//----------------------------------------------------------------------------- -// wxPen -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPen: public wxPenBase -{ -public: - wxPen() {} - wxPen(const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID); -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); -#endif - - wxPen(const wxBitmap& stipple, int width); - - bool operator==(const wxPen& pen) const; - bool operator!=(const wxPen& pen) const { return !(*this == pen); } - - void SetColour(const wxColour &colour); - void SetColour(unsigned char red, unsigned char green, unsigned char blue); - void SetCap(wxPenCap capStyle); - void SetJoin(wxPenJoin joinStyle); - void SetStyle(wxPenStyle style); - void SetWidth(int width); - void SetDashes(int number_of_dashes, const wxDash *dash); - void SetStipple(const wxBitmap& stipple); - - wxColour GetColour() const; - wxPenCap GetCap() const; - wxPenJoin GetJoin() const; - wxPenStyle GetStyle() const; - int GetWidth() const; - int GetDashes(wxDash **ptr) const; - int GetDashCount() const; - wxDash* GetDash() const; - wxBitmap *GetStipple() const; - -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_FUTURE( void SetStyle(int style) ) - { SetStyle((wxPenStyle)style); } -#endif - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - DECLARE_DYNAMIC_CLASS(wxPen) -}; - -#endif // _WX_DFB_PEN_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/popupwin.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/popupwin.h deleted file mode 100644 index 00a8f80a05..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/popupwin.h +++ /dev/null @@ -1,44 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/popupwin.h -// Purpose: wxPopupWindow class for wxDFB -// Author: Vaclav Slavik -// Created: 2006-12-24 -// Copyright: (c) 2006 TT-Solutions -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_POPUPWIN_H_ -#define _WX_DFB_POPUPWIN_H_ - -// ---------------------------------------------------------------------------- -// wxPopupWindow -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase -{ -public: - wxPopupWindow() {} - - wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) - { Create(parent, flags); } - - bool Create(wxWindow *parent, int flags = wxBORDER_NONE) - { - if ( !wxPopupWindowBase::Create(parent) ) - return false; - - return wxNonOwnedWindow::Create - ( - parent, - -1, - // DFB windows must have valid pos & size: - wxPoint(0, 0), wxSize(1, 1), - (flags & wxBORDER_MASK) | wxPOPUP_WINDOW - ); - } - - DECLARE_DYNAMIC_CLASS(wxPopupWindow) -}; - -#endif // _WX_DFB_POPUPWIN_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/private.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/private.h deleted file mode 100644 index d8c0b8613d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/private.h +++ /dev/null @@ -1,40 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/private.h -// Purpose: private helpers for wxDFB implementation -// Author: Vaclav Slavik -// Created: 2006-08-09 -// Copyright: (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_PRIVATE_H_ -#define _WX_DFB_PRIVATE_H_ - -#include "wx/intl.h" -#include "wx/log.h" - -#include "wx/dfb/wrapdfb.h" -#include - -//----------------------------------------------------------------------------- -// misc helpers -//----------------------------------------------------------------------------- - -/// Convert DirectFB timestamp to wxEvent one: -#define wxDFB_EVENT_TIMESTAMP(event) \ - ((event).timestamp.tv_sec * 1000 + (event).timestamp.tv_usec / 1000) - -/** - Check if DirectFB library version is at least @a major.@a minor.@a release. - - @see wxCHECK_VERSION - */ -#define wxCHECK_DFB_VERSION(major,minor,release) \ - (DIRECTFB_MAJOR_VERSION > (major) || \ - (DIRECTFB_MAJOR_VERSION == (major) && \ - DIRECTFB_MINOR_VERSION > (minor)) || \ - (DIRECTFB_MAJOR_VERSION == (major) && \ - DIRECTFB_MINOR_VERSION == (minor) && \ - DIRECTFB_MICRO_VERSION >= (release))) - -#endif // _WX_DFB_PRIVATE_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/private/fontmgr.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/private/fontmgr.h deleted file mode 100644 index bec290a352..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/private/fontmgr.h +++ /dev/null @@ -1,83 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/private/fontmgr.h -// Purpose: font management for wxDFB -// Author: Vaclav Slavik -// Created: 2006-11-18 -// Copyright: (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com) -// (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_PRIVATE_FONTMGR_H_ -#define _WX_DFB_PRIVATE_FONTMGR_H_ - -#include "wx/dfb/wrapdfb.h" - -class wxFileConfig; - -class wxFontInstance : public wxFontInstanceBase -{ -public: - wxFontInstance(float ptSize, bool aa, const wxString& filename); - - wxIDirectFBFontPtr GetDirectFBFont() const { return m_font; } - -private: - wxIDirectFBFontPtr m_font; -}; - -class wxFontFace : public wxFontFaceBase -{ -public: - wxFontFace(const wxString& filename) : m_fileName(filename) {} - -protected: - wxFontInstance *CreateFontInstance(float ptSize, bool aa); - -private: - wxString m_fileName; -}; - -class wxFontBundle : public wxFontBundleBase -{ -public: - wxFontBundle(const wxString& name, - const wxString& fileRegular, - const wxString& fileBold, - const wxString& fileItalic, - const wxString& fileBoldItalic, - bool isFixed); - - /// Returns name of the family - virtual wxString GetName() const { return m_name; } - - virtual bool IsFixed() const { return m_isFixed; } - -private: - wxString m_name; - bool m_isFixed; -}; - -class wxFontsManager : public wxFontsManagerBase -{ -public: - wxFontsManager() { AddAllFonts(); } - - virtual wxString GetDefaultFacename(wxFontFamily family) const - { - return m_defaultFacenames[family]; - } - -private: - // adds all fonts using AddBundle() - void AddAllFonts(); - void AddFontsFromDir(const wxString& indexFile); - void AddFont(const wxString& dir, const wxString& name, wxFileConfig& cfg); - void SetDefaultFonts(wxFileConfig& cfg); - -private: - // default facenames - wxString m_defaultFacenames[wxFONTFAMILY_MAX]; -}; - -#endif // _WX_DFB_PRIVATE_FONTMGR_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/private/overlay.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/private/overlay.h deleted file mode 100644 index dcebe0d653..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/private/overlay.h +++ /dev/null @@ -1,51 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/private/overlay.h -// Purpose: wxOverlayImpl declaration -// Author: Vaclav Slavik -// Created: 2006-10-20 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_PRIVATE_OVERLAY_H_ -#define _WX_DFB_PRIVATE_OVERLAY_H_ - -#include "wx/dfb/dfbptr.h" -#include "wx/gdicmn.h" - -wxDFB_DECLARE_INTERFACE(IDirectFBSurface); - -class WXDLLIMPEXP_FWD_CORE wxWindow; -class WXDLLIMPEXP_FWD_CORE wxDC; - -class wxOverlayImpl -{ -public: - wxOverlayImpl(); - ~wxOverlayImpl(); - - void Reset(); - bool IsOk(); - void Init(wxDC* dc, int x , int y , int width , int height); - void BeginDrawing(wxDC* dc); - void EndDrawing(wxDC* dc); - void Clear(wxDC* dc); - - // wxDFB specific methods: - bool IsEmpty() const { return m_isEmpty; } - wxRect GetRect() const { return m_rect; } - wxIDirectFBSurfacePtr GetDirectFBSurface() const { return m_surface; } - -public: - // window the overlay is associated with - wxWindow *m_window; - // rectangle covered by the overlay, in m_window's window coordinates - wxRect m_rect; - // surface of the overlay, same size as m_rect - wxIDirectFBSurfacePtr m_surface; - // this flag is set to true if nothing was drawn on the overlay (either - // initially or Clear() was called) - bool m_isEmpty; -}; - -#endif // _WX_DFB_PRIVATE_OVERLAY_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/region.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/region.h deleted file mode 100644 index 8a62291c04..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/region.h +++ /dev/null @@ -1,94 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/region.h -// Purpose: wxRegion class -// Author: Vaclav Slavik -// Created: 2006-08-08 -// Copyright: (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_REGION_H_ -#define _WX_DFB_REGION_H_ - -class WXDLLIMPEXP_CORE wxRegion : public wxRegionBase -{ -public: - wxRegion(); - wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h); - wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight); - wxRegion(const wxRect& rect); - wxRegion(const wxBitmap& bmp) - { - Union(bmp); - } - wxRegion(const wxBitmap& bmp, - const wxColour& transColour, int tolerance = 0) - { - Union(bmp, transColour, tolerance); - } - - virtual ~wxRegion(); - - // wxRegionBase methods - virtual void Clear(); - virtual bool IsEmpty() const; - - // NB: implementation detail of DirectFB, should be removed if full - // (i.e. not rect-only version is implemented) so that all code that - // assumes region==rect breaks - wxRect AsRect() const { return GetBox(); } - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - // wxRegionBase pure virtuals - virtual bool DoIsEqual(const wxRegion& region) const; - virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const; - virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const; - virtual wxRegionContain DoContainsRect(const wxRect& rect) const; - - virtual bool DoOffset(wxCoord x, wxCoord y); - virtual bool DoUnionWithRect(const wxRect& rect); - virtual bool DoUnionWithRegion(const wxRegion& region); - virtual bool DoIntersect(const wxRegion& region); - virtual bool DoSubtract(const wxRegion& region); - virtual bool DoXor(const wxRegion& region); - - - friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator; - - DECLARE_DYNAMIC_CLASS(wxRegion); -}; - - -class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject -{ -public: - wxRegionIterator() {} - wxRegionIterator(const wxRegion& region) { Reset(region); } - - void Reset() { m_rect = wxRect(); } - void Reset(const wxRegion& region); - - bool HaveRects() const { return !m_rect.IsEmpty(); } - operator bool() const { return HaveRects(); } - - wxRegionIterator& operator++(); - wxRegionIterator operator++(int); - - wxCoord GetX() const { return m_rect.GetX(); } - wxCoord GetY() const { return m_rect.GetY(); } - wxCoord GetW() const { return m_rect.GetWidth(); } - wxCoord GetWidth() const { return GetW(); } - wxCoord GetH() const { return m_rect.GetHeight(); } - wxCoord GetHeight() const { return GetH(); } - wxRect GetRect() const { return m_rect; } - -private: - wxRect m_rect; - - DECLARE_DYNAMIC_CLASS(wxRegionIterator); -}; - -#endif // _WX_DFB_REGION_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/toplevel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/toplevel.h deleted file mode 100644 index abf06e449e..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/toplevel.h +++ /dev/null @@ -1,78 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/toplevel.h -// Purpose: Top level window, abstraction of wxFrame and wxDialog -// Author: Vaclav Slavik -// Created: 2006-08-10 -// Copyright: (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_TOPLEVEL_H_ -#define _WX_DFB_TOPLEVEL_H_ - -//----------------------------------------------------------------------------- -// wxTopLevelWindowDFB -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTopLevelWindowDFB : public wxTopLevelWindowBase -{ -public: - // construction - wxTopLevelWindowDFB() { Init(); } - wxTopLevelWindowDFB(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - - Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - // implement base class pure virtuals - virtual void Maximize(bool maximize = true); - virtual bool IsMaximized() const; - virtual void Iconize(bool iconize = true); - virtual bool IsIconized() const; - virtual void Restore(); - - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - virtual bool IsFullScreen() const { return m_fsIsShowing; } - - virtual bool CanSetTransparent() { return true; } - virtual bool SetTransparent(wxByte alpha); - - virtual void SetTitle(const wxString &title) { m_title = title; } - virtual wxString GetTitle() const { return m_title; } - -protected: - // common part of all ctors - void Init(); - - virtual void HandleFocusEvent(const wxDFBWindowEvent& event_); - -protected: - wxString m_title; - - bool m_fsIsShowing:1; /* full screen */ - long m_fsSaveStyle; - long m_fsSaveFlag; - wxRect m_fsSaveFrame; - - // is the frame currently maximized? - bool m_isMaximized:1; - wxRect m_savedFrame; -}; - -#endif // _WX_DFB_TOPLEVEL_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/window.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/window.h deleted file mode 100644 index f67cce2268..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/window.h +++ /dev/null @@ -1,193 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/window.h -// Purpose: wxWindow class -// Author: Vaclav Slavik -// Created: 2006-08-10 -// Copyright: (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_WINDOW_H_ -#define _WX_DFB_WINDOW_H_ - -// --------------------------------------------------------------------------- -// headers -// --------------------------------------------------------------------------- - -#include "wx/dfb/dfbptr.h" - -wxDFB_DECLARE_INTERFACE(IDirectFBSurface); -struct wxDFBWindowEvent; - -class WXDLLIMPEXP_FWD_CORE wxFont; -class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow; - -class wxOverlayImpl; -class wxDfbOverlaysList; - -// --------------------------------------------------------------------------- -// wxWindow -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowDFB : public wxWindowBase -{ -public: - wxWindowDFB() { Init(); } - - wxWindowDFB(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr) - { - Init(); - Create(parent, id, pos, size, style, name); - } - - virtual ~wxWindowDFB(); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr); - - // implement base class (pure) virtual methods - // ------------------------------------------- - - virtual void SetLabel( const wxString &WXUNUSED(label) ) {} - virtual wxString GetLabel() const { return wxEmptyString; } - - virtual void Raise(); - virtual void Lower(); - - virtual bool Show(bool show = true); - - virtual void SetFocus(); - - virtual bool Reparent(wxWindowBase *newParent); - - virtual void WarpPointer(int x, int y); - - virtual void Refresh(bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL); - virtual void Update(); - - virtual bool SetCursor(const wxCursor &cursor); - virtual bool SetFont(const wxFont &font) { m_font = font; return true; } - - virtual int GetCharHeight() const; - virtual int GetCharWidth() const; - -#if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget(wxDropTarget *dropTarget); - - // Accept files for dragging - virtual void DragAcceptFiles(bool accept); -#endif // wxUSE_DRAG_AND_DROP - - virtual WXWidget GetHandle() const { return this; } - - // implementation from now on - // -------------------------- - - // Returns DirectFB surface used for rendering of this window - wxIDirectFBSurfacePtr GetDfbSurface(); - - // returns toplevel window the window belongs to - wxNonOwnedWindow *GetTLW() const { return m_tlw; } - - virtual bool IsDoubleBuffered() const { return true; } - -protected: - // implement the base class pure virtuals - virtual void DoGetTextExtent(const wxString& string, - int *x, int *y, - int *descent = NULL, - int *externalLeading = NULL, - const wxFont *theFont = NULL) const; - virtual void DoClientToScreen(int *x, int *y) const; - virtual void DoScreenToClient(int *x, int *y) const; - virtual void DoGetPosition(int *x, int *y) const; - virtual void DoGetSize(int *width, int *height) const; - virtual void DoGetClientSize(int *width, int *height) const; - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - virtual void DoSetClientSize(int width, int height); - - virtual void DoCaptureMouse(); - virtual void DoReleaseMouse(); - - virtual void DoThaw(); - - // move the window to the specified location and resize it: this is called - // from both DoSetSize() and DoSetClientSize() and would usually just call - // ::MoveWindow() except for composite controls which will want to arrange - // themselves inside the given rectangle - virtual void DoMoveWindow(int x, int y, int width, int height); - - // return DFB surface used to render this window (will be assigned to - // m_surface if the window is visible) - virtual wxIDirectFBSurfacePtr ObtainDfbSurface() const; - - // this method must be called when window's position, size or visibility - // changes; it resets m_surface so that ObtainDfbSurface has to be called - // next time GetDfbSurface is called - void InvalidateDfbSurface(); - - // called by parent to render (part of) the window - void PaintWindow(const wxRect& rect); - - // paint window's overlays (if any) on top of window's surface - void PaintOverlays(const wxRect& rect); - - // refreshes the entire window (including non-client areas) - void DoRefreshWindow(); - // refreshes given rectangle of the window (in window, _not_ client coords) - virtual void DoRefreshRect(const wxRect& rect); - // refreshes given rectangle; unlike RefreshRect(), the argument is in - // window, not client, coords and unlike DoRefreshRect() and like Refresh(), - // does nothing if the window is hidden or frozen - void RefreshWindowRect(const wxRect& rect); - - // add/remove overlay for this window - void AddOverlay(wxOverlayImpl *overlay); - void RemoveOverlay(wxOverlayImpl *overlay); - - // DirectFB events handling - void HandleKeyEvent(const wxDFBWindowEvent& event_); - -private: - // common part of all ctors - void Init(); - // counterpart to SetFocus - void DFBKillFocus(); - -protected: - // toplevel window (i.e. DirectFB window) this window belongs to - wxNonOwnedWindow *m_tlw; - -private: - // subsurface of TLW's surface covered by this window - wxIDirectFBSurfacePtr m_surface; - - // position of the window (relative to the parent, not used by wxTLW, so - // don't access it directly) - wxRect m_rect; - - // overlays for this window (or NULL if it doesn't have any) - wxDfbOverlaysList *m_overlays; - - friend class wxNonOwnedWindow; // for HandleXXXEvent - friend class wxOverlayImpl; // for Add/RemoveOverlay - friend class wxWindowDCImpl; // for PaintOverlays - - DECLARE_DYNAMIC_CLASS(wxWindowDFB) - wxDECLARE_NO_COPY_CLASS(wxWindowDFB); - DECLARE_EVENT_TABLE() -}; - -#endif // _WX_DFB_WINDOW_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/wrapdfb.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/wrapdfb.h deleted file mode 100644 index 14d8b02c87..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/dfb/wrapdfb.h +++ /dev/null @@ -1,536 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/dfb/wrapdfb.h -// Purpose: wx wrappers for DirectFB interfaces -// Author: Vaclav Slavik -// Created: 2006-08-23 -// Copyright: (c) 2006 REA Elektronik GmbH -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_DFB_WRAPDFB_H_ -#define _WX_DFB_WRAPDFB_H_ - -#include "wx/dfb/dfbptr.h" -#include "wx/gdicmn.h" -#include "wx/vidmode.h" - -#include -#include - -// DFB < 1.0 didn't have u8 type, only __u8 -#if DIRECTFB_MAJOR_VERSION == 0 -typedef __u8 u8; -#endif - - -wxDFB_DECLARE_INTERFACE(IDirectFB); -wxDFB_DECLARE_INTERFACE(IDirectFBDisplayLayer); -wxDFB_DECLARE_INTERFACE(IDirectFBFont); -wxDFB_DECLARE_INTERFACE(IDirectFBWindow); -wxDFB_DECLARE_INTERFACE(IDirectFBSurface); -wxDFB_DECLARE_INTERFACE(IDirectFBPalette); -wxDFB_DECLARE_INTERFACE(IDirectFBEventBuffer); - - -/** - Checks the @a code of a DirectFB call and returns true if it was - successful and false if it failed, logging the errors as appropriate - (asserts for programming errors, wxLogError for runtime failures). - */ -bool wxDfbCheckReturn(DFBResult code); - -//----------------------------------------------------------------------------- -// wxDfbEvent -//----------------------------------------------------------------------------- - -/** - The struct defined by this macro is a thin wrapper around DFB*Event type. - It is needed because DFB*Event are typedefs and so we can't forward declare - them, but we need to pass them to methods declared in public headers where - cannot be included. So this struct just holds the event value, - it's sole purpose is that it can be forward declared. - */ -#define WXDFB_DEFINE_EVENT_WRAPPER(T) \ - struct wx##T \ - { \ - wx##T() {} \ - wx##T(const T& event) : m_event(event) {} \ - \ - operator T&() { return m_event; } \ - operator const T&() const { return m_event; } \ - T* operator&() { return &m_event; } \ - \ - DFBEventClass GetClass() const { return m_event.clazz; } \ - \ - private: \ - T m_event; \ - }; - -WXDFB_DEFINE_EVENT_WRAPPER(DFBEvent) -WXDFB_DEFINE_EVENT_WRAPPER(DFBWindowEvent) - - -//----------------------------------------------------------------------------- -// wxDfbWrapper -//----------------------------------------------------------------------------- - -/// Base class for wxDfbWrapper -class wxDfbWrapperBase -{ -public: - /// Increases reference count of the object - void AddRef() - { - m_refCnt++; - } - - /// Decreases reference count and if it reaches zero, deletes the object - void Release() - { - if ( --m_refCnt == 0 ) - delete this; - } - - /// Returns result code of the last call - DFBResult GetLastResult() const { return m_lastResult; } - -protected: - wxDfbWrapperBase() : m_refCnt(1), m_lastResult(DFB_OK) {} - - /// Dtor may only be called from Release() - virtual ~wxDfbWrapperBase() {} - - /** - Checks the @a result of a DirectFB call and returns true if it was - successful and false if it failed. Also stores result of the call - so that it can be obtained by calling GetLastResult(). - */ - bool Check(DFBResult result) - { - m_lastResult = result; - return wxDfbCheckReturn(result); - } - -protected: - /// Reference count - unsigned m_refCnt; - - /// Result of the last DirectFB call - DFBResult m_lastResult; -}; - -/** - This template is base class for friendly C++ wrapper around DirectFB - interface T. - - The wrapper provides same API as DirectFB, with a few exceptions: - - methods return true/false instead of error code - - methods that return or create another interface return pointer to the - interface (or NULL on failure) instead of storing it in the last - argument - - interface arguments use wxFooPtr type instead of raw DirectFB pointer - - methods taking flags use int type instead of an enum when the flags - can be or-combination of enum elements (this is workaround for - C++-unfriendly DirectFB API) - */ -template -class wxDfbWrapper : public wxDfbWrapperBase -{ -public: - /// "Raw" DirectFB interface type - typedef T DirectFBIface; - - /// Returns raw DirectFB pointer - T *GetRaw() const { return m_ptr; } - -protected: - /// To be called from ctor. Takes ownership of raw object. - void Init(T *ptr) { m_ptr = ptr; } - - /// Dtor may only be used from Release - ~wxDfbWrapper() - { - if ( m_ptr ) - m_ptr->Release(m_ptr); - } - -protected: - // pointer to DirectFB object - T *m_ptr; -}; - - -//----------------------------------------------------------------------------- -// wxIDirectFBFont -//----------------------------------------------------------------------------- - -struct wxIDirectFBFont : public wxDfbWrapper -{ - wxIDirectFBFont(IDirectFBFont *s) { Init(s); } - - bool GetStringWidth(const char *text, int bytes, int *w) - { return Check(m_ptr->GetStringWidth(m_ptr, text, bytes, w)); } - - bool GetStringExtents(const char *text, int bytes, - DFBRectangle *logicalRect, DFBRectangle *inkRect) - { - return Check(m_ptr->GetStringExtents(m_ptr, text, bytes, - logicalRect, inkRect)); - } - - bool GetHeight(int *h) - { return Check(m_ptr->GetHeight(m_ptr, h)); } - - bool GetDescender(int *descender) - { return Check(m_ptr->GetDescender(m_ptr, descender)); } -}; - - -//----------------------------------------------------------------------------- -// wxIDirectFBPalette -//----------------------------------------------------------------------------- - -struct wxIDirectFBPalette : public wxDfbWrapper -{ - wxIDirectFBPalette(IDirectFBPalette *s) { Init(s); } -}; - - -//----------------------------------------------------------------------------- -// wxIDirectFBSurface -//----------------------------------------------------------------------------- - -struct wxIDirectFBSurface : public wxDfbWrapper -{ - wxIDirectFBSurface(IDirectFBSurface *s) { Init(s); } - - bool GetSize(int *w, int *h) - { return Check(m_ptr->GetSize(m_ptr, w, h)); } - - bool GetCapabilities(DFBSurfaceCapabilities *caps) - { return Check(m_ptr->GetCapabilities(m_ptr, caps)); } - - bool GetPixelFormat(DFBSurfacePixelFormat *caps) - { return Check(m_ptr->GetPixelFormat(m_ptr, caps)); } - - // convenience version of GetPixelFormat, returns DSPF_UNKNOWN if fails - DFBSurfacePixelFormat GetPixelFormat(); - - bool SetClip(const DFBRegion *clip) - { return Check(m_ptr->SetClip(m_ptr, clip)); } - - bool SetColor(u8 r, u8 g, u8 b, u8 a) - { return Check(m_ptr->SetColor(m_ptr, r, g, b, a)); } - - bool Clear(u8 r, u8 g, u8 b, u8 a) - { return Check(m_ptr->Clear(m_ptr, r, g, b, a)); } - - bool DrawLine(int x1, int y1, int x2, int y2) - { return Check(m_ptr->DrawLine(m_ptr, x1, y1, x2, y2)); } - - bool DrawRectangle(int x, int y, int w, int h) - { return Check(m_ptr->DrawRectangle(m_ptr, x, y, w, h)); } - - bool FillRectangle(int x, int y, int w, int h) - { return Check(m_ptr->FillRectangle(m_ptr, x, y, w, h)); } - - bool SetFont(const wxIDirectFBFontPtr& font) - { return Check(m_ptr->SetFont(m_ptr, font->GetRaw())); } - - bool DrawString(const char *text, int bytes, int x, int y, int flags) - { - return Check(m_ptr->DrawString(m_ptr, text, bytes, x, y, - (DFBSurfaceTextFlags)flags)); - } - - /** - Updates the front buffer from the back buffer. If @a region is not - NULL, only given rectangle is updated. - */ - bool FlipToFront(const DFBRegion *region = NULL); - - wxIDirectFBSurfacePtr GetSubSurface(const DFBRectangle *rect) - { - IDirectFBSurface *s; - if ( Check(m_ptr->GetSubSurface(m_ptr, rect, &s)) ) - return new wxIDirectFBSurface(s); - else - return NULL; - } - - wxIDirectFBPalettePtr GetPalette() - { - IDirectFBPalette *s; - if ( Check(m_ptr->GetPalette(m_ptr, &s)) ) - return new wxIDirectFBPalette(s); - else - return NULL; - } - - bool SetPalette(const wxIDirectFBPalettePtr& pal) - { return Check(m_ptr->SetPalette(m_ptr, pal->GetRaw())); } - - bool SetBlittingFlags(int flags) - { - return Check( - m_ptr->SetBlittingFlags(m_ptr, (DFBSurfaceBlittingFlags)flags)); - } - - bool Blit(const wxIDirectFBSurfacePtr& source, - const DFBRectangle *source_rect, - int x, int y) - { return Blit(source->GetRaw(), source_rect, x, y); } - - bool Blit(IDirectFBSurface *source, - const DFBRectangle *source_rect, - int x, int y) - { return Check(m_ptr->Blit(m_ptr, source, source_rect, x, y)); } - - bool StretchBlit(const wxIDirectFBSurfacePtr& source, - const DFBRectangle *source_rect, - const DFBRectangle *dest_rect) - { - return Check(m_ptr->StretchBlit(m_ptr, source->GetRaw(), - source_rect, dest_rect)); - } - - /// Returns bit depth used by the surface or -1 on error - int GetDepth(); - - /** - Creates a new surface by cloning this one. New surface will have same - capabilities, pixel format and pixel data as the existing one. - - @see CreateCompatible - */ - wxIDirectFBSurfacePtr Clone(); - - /// Flags for CreateCompatible() - enum CreateCompatibleFlags - { - /// Don't create double-buffered surface - CreateCompatible_NoBackBuffer = 1 - }; - - /** - Creates a surface compatible with this one, i.e. surface with the same - capabilities and pixel format, but with different and size. - - @param size Size of the surface to create. If wxDefaultSize, use the - size of this surface. - @param flags Or-combination of CreateCompatibleFlags values - */ - wxIDirectFBSurfacePtr CreateCompatible(const wxSize& size = wxDefaultSize, - int flags = 0); - - bool Lock(DFBSurfaceLockFlags flags, void **ret_ptr, int *ret_pitch) - { return Check(m_ptr->Lock(m_ptr, flags, ret_ptr, ret_pitch)); } - - bool Unlock() - { return Check(m_ptr->Unlock(m_ptr)); } - - /// Helper struct for safe locking & unlocking of surfaces - struct Locked - { - Locked(const wxIDirectFBSurfacePtr& surface, DFBSurfaceLockFlags flags) - : m_surface(surface) - { - if ( !surface->Lock(flags, &ptr, &pitch) ) - ptr = NULL; - } - - ~Locked() - { - if ( ptr ) - m_surface->Unlock(); - } - - void *ptr; - int pitch; - - private: - wxIDirectFBSurfacePtr m_surface; - }; - - -private: - // this is private because we want user code to use FlipToFront() - bool Flip(const DFBRegion *region, int flags); -}; - - -//----------------------------------------------------------------------------- -// wxIDirectFBEventBuffer -//----------------------------------------------------------------------------- - -struct wxIDirectFBEventBuffer : public wxDfbWrapper -{ - wxIDirectFBEventBuffer(IDirectFBEventBuffer *s) { Init(s); } - - bool CreateFileDescriptor(int *ret_fd) - { - return Check(m_ptr->CreateFileDescriptor(m_ptr, ret_fd)); - } -}; - - -//----------------------------------------------------------------------------- -// wxIDirectFBWindow -//----------------------------------------------------------------------------- - -struct wxIDirectFBWindow : public wxDfbWrapper -{ - wxIDirectFBWindow(IDirectFBWindow *s) { Init(s); } - - bool GetID(DFBWindowID *id) - { return Check(m_ptr->GetID(m_ptr, id)); } - - bool GetPosition(int *x, int *y) - { return Check(m_ptr->GetPosition(m_ptr, x, y)); } - - bool GetSize(int *w, int *h) - { return Check(m_ptr->GetSize(m_ptr, w, h)); } - - bool MoveTo(int x, int y) - { return Check(m_ptr->MoveTo(m_ptr, x, y)); } - - bool Resize(int w, int h) - { return Check(m_ptr->Resize(m_ptr, w, h)); } - - bool SetOpacity(u8 opacity) - { return Check(m_ptr->SetOpacity(m_ptr, opacity)); } - - bool SetStackingClass(DFBWindowStackingClass klass) - { return Check(m_ptr->SetStackingClass(m_ptr, klass)); } - - bool RaiseToTop() - { return Check(m_ptr->RaiseToTop(m_ptr)); } - - bool LowerToBottom() - { return Check(m_ptr->LowerToBottom(m_ptr)); } - - wxIDirectFBSurfacePtr GetSurface() - { - IDirectFBSurface *s; - if ( Check(m_ptr->GetSurface(m_ptr, &s)) ) - return new wxIDirectFBSurface(s); - else - return NULL; - } - - bool AttachEventBuffer(const wxIDirectFBEventBufferPtr& buffer) - { return Check(m_ptr->AttachEventBuffer(m_ptr, buffer->GetRaw())); } - - bool RequestFocus() - { return Check(m_ptr->RequestFocus(m_ptr)); } - - bool Destroy() - { return Check(m_ptr->Destroy(m_ptr)); } -}; - - -//----------------------------------------------------------------------------- -// wxIDirectFBDisplayLayer -//----------------------------------------------------------------------------- - -struct wxIDirectFBDisplayLayer : public wxDfbWrapper -{ - wxIDirectFBDisplayLayer(IDirectFBDisplayLayer *s) { Init(s); } - - wxIDirectFBWindowPtr CreateWindow(const DFBWindowDescription *desc) - { - IDirectFBWindow *w; - if ( Check(m_ptr->CreateWindow(m_ptr, desc, &w)) ) - return new wxIDirectFBWindow(w); - else - return NULL; - } - - bool GetConfiguration(DFBDisplayLayerConfig *config) - { return Check(m_ptr->GetConfiguration(m_ptr, config)); } - - wxVideoMode GetVideoMode(); - - bool GetCursorPosition(int *x, int *y) - { return Check(m_ptr->GetCursorPosition(m_ptr, x, y)); } - - bool WarpCursor(int x, int y) - { return Check(m_ptr->WarpCursor(m_ptr, x, y)); } -}; - - -//----------------------------------------------------------------------------- -// wxIDirectFB -//----------------------------------------------------------------------------- - -struct wxIDirectFB : public wxDfbWrapper -{ - /** - Returns pointer to DirectFB singleton object, it never returns NULL - after wxApp was initialized. The object is cached, so calling this - method is cheap. - */ - static wxIDirectFBPtr Get() - { - if ( !ms_ptr ) CreateDirectFB(); - return ms_ptr; - } - - bool SetVideoMode(int w, int h, int bpp) - { return Check(m_ptr->SetVideoMode(m_ptr, w, h, bpp)); } - - wxIDirectFBSurfacePtr CreateSurface(const DFBSurfaceDescription *desc) - { - IDirectFBSurface *s; - if ( Check(m_ptr->CreateSurface(m_ptr, desc, &s)) ) - return new wxIDirectFBSurface(s); - else - return NULL; - } - - wxIDirectFBEventBufferPtr CreateEventBuffer() - { - IDirectFBEventBuffer *b; - if ( Check(m_ptr->CreateEventBuffer(m_ptr, &b)) ) - return new wxIDirectFBEventBuffer(b); - else - return NULL; - } - - wxIDirectFBFontPtr CreateFont(const char *filename, - const DFBFontDescription *desc) - { - IDirectFBFont *f; - if ( Check(m_ptr->CreateFont(m_ptr, filename, desc, &f)) ) - return new wxIDirectFBFont(f); - else - return NULL; - } - - wxIDirectFBDisplayLayerPtr - GetDisplayLayer(DFBDisplayLayerID id = DLID_PRIMARY) - { - IDirectFBDisplayLayer *l; - if ( Check(m_ptr->GetDisplayLayer(m_ptr, id, &l)) ) - return new wxIDirectFBDisplayLayer(l); - else - return NULL; - } - - /// Returns primary surface - wxIDirectFBSurfacePtr GetPrimarySurface(); - -private: - wxIDirectFB(IDirectFB *ptr) { Init(ptr); } - - // creates ms_ptr instance - static void CreateDirectFB(); - - static void CleanUp(); - friend class wxApp; // calls CleanUp - - // pointer to the singleton IDirectFB object - static wxIDirectFBPtr ms_ptr; -}; - -#endif // _WX_DFB_WRAPDFB_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/event.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/event.h deleted file mode 100644 index 5ec79071ca..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/event.h +++ /dev/null @@ -1,4554 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/event.h -// Purpose: Event classes -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) wxWidgets team -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_EVENT_H_ -#define _WX_EVENT_H_ - -#include "wx/defs.h" -#include "wx/cpp.h" -#include "wx/object.h" -#include "wx/clntdata.h" - -#if wxUSE_GUI - #include "wx/gdicmn.h" - #include "wx/cursor.h" - #include "wx/mousestate.h" -#endif - -#include "wx/dynarray.h" -#include "wx/thread.h" -#include "wx/tracker.h" -#include "wx/typeinfo.h" -#include "wx/any.h" - -#ifdef wxHAS_EVENT_BIND - #include "wx/meta/convertible.h" -#endif - -// Currently VC6 and VC7 are known to not be able to compile CallAfter() code, -// so disable it for them. -#if !defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(8) - #include "wx/meta/removeref.h" - - #define wxHAS_CALL_AFTER -#endif - -// ---------------------------------------------------------------------------- -// forward declarations -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_BASE wxList; -class WXDLLIMPEXP_FWD_BASE wxEvent; -class WXDLLIMPEXP_FWD_BASE wxEventFilter; -#if wxUSE_GUI - class WXDLLIMPEXP_FWD_CORE wxDC; - class WXDLLIMPEXP_FWD_CORE wxMenu; - class WXDLLIMPEXP_FWD_CORE wxWindow; - class WXDLLIMPEXP_FWD_CORE wxWindowBase; -#endif // wxUSE_GUI - -// We operate with pointer to members of wxEvtHandler (such functions are used -// as event handlers in the event tables or as arguments to Connect()) but by -// default MSVC uses a restricted (but more efficient) representation of -// pointers to members which can't deal with multiple base classes. To avoid -// mysterious (as the compiler is not good enough to detect this and give a -// sensible error message) errors in the user code as soon as it defines -// classes inheriting from both wxEvtHandler (possibly indirectly, e.g. via -// wxWindow) and something else (including our own wxTrackable but not limited -// to it), we use the special MSVC keyword telling the compiler to use a more -// general pointer to member representation for the classes inheriting from -// wxEvtHandler. -#ifdef __VISUALC__ - #define wxMSVC_FWD_MULTIPLE_BASES __multiple_inheritance -#else - #define wxMSVC_FWD_MULTIPLE_BASES -#endif - -class WXDLLIMPEXP_FWD_BASE wxMSVC_FWD_MULTIPLE_BASES wxEvtHandler; -class wxEventConnectionRef; - -// ---------------------------------------------------------------------------- -// Event types -// ---------------------------------------------------------------------------- - -typedef int wxEventType; - -#define wxEVT_ANY ((wxEventType)-1) - -// this is used to make the event table entry type safe, so that for an event -// handler only a function with proper parameter list can be given. See also -// the wxEVENT_HANDLER_CAST-macro. -#define wxStaticCastEvent(type, val) static_cast(val) - -#define wxDECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj) \ - wxEventTableEntry(type, winid, idLast, wxNewEventTableFunctor(type, fn), obj) - -#define wxDECLARE_EVENT_TABLE_TERMINATOR() \ - wxEventTableEntry(wxEVT_NULL, 0, 0, 0, 0) - -// generate a new unique event type -extern WXDLLIMPEXP_BASE wxEventType wxNewEventType(); - -// define macros to create new event types: -#ifdef wxHAS_EVENT_BIND - // events are represented by an instance of wxEventTypeTag and the - // corresponding type must be specified for type-safety checks - - // define a new custom event type, can be used alone or after event - // declaration in the header using one of the macros below - #define wxDEFINE_EVENT( name, type ) \ - const wxEventTypeTag< type > name( wxNewEventType() ) - - // the general version allowing exporting the event type from DLL, used by - // wxWidgets itself - #define wxDECLARE_EXPORTED_EVENT( expdecl, name, type ) \ - extern const expdecl wxEventTypeTag< type > name - - // this is the version which will normally be used in the user code - #define wxDECLARE_EVENT( name, type ) \ - wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type ) - - - // these macros are only used internally for backwards compatibility and - // allow to define an alias for an existing event type (this is used by - // wxEVT_SPIN_XXX) - #define wxDEFINE_EVENT_ALIAS( name, type, value ) \ - const wxEventTypeTag< type > name( value ) - - #define wxDECLARE_EXPORTED_EVENT_ALIAS( expdecl, name, type ) \ - extern const expdecl wxEventTypeTag< type > name -#else // !wxHAS_EVENT_BIND - // the macros are the same ones as above but defined differently as we only - // use the integer event type values to identify events in this case - - #define wxDEFINE_EVENT( name, type ) \ - const wxEventType name( wxNewEventType() ) - - #define wxDECLARE_EXPORTED_EVENT( expdecl, name, type ) \ - extern const expdecl wxEventType name - #define wxDECLARE_EVENT( name, type ) \ - wxDECLARE_EXPORTED_EVENT( wxEMPTY_PARAMETER_VALUE, name, type ) - - #define wxDEFINE_EVENT_ALIAS( name, type, value ) \ - const wxEventType name = value - #define wxDECLARE_EXPORTED_EVENT_ALIAS( expdecl, name, type ) \ - extern const expdecl wxEventType name -#endif // wxHAS_EVENT_BIND/!wxHAS_EVENT_BIND - -// Try to cast the given event handler to the correct handler type: - -#define wxEVENT_HANDLER_CAST( functype, func ) \ - ( wxObjectEventFunction )( wxEventFunction )wxStaticCastEvent( functype, &func ) - - -#ifdef wxHAS_EVENT_BIND - -// The tag is a type associated to the event type (which is an integer itself, -// in spite of its name) value. It exists in order to be used as a template -// parameter and provide a mapping between the event type values and their -// corresponding wxEvent-derived classes. -template -class wxEventTypeTag -{ -public: - // The class of wxEvent-derived class carried by the events of this type. - typedef T EventClass; - - wxEventTypeTag(wxEventType type) { m_type = type; } - - // Return a wxEventType reference for the initialization of the static - // event tables. See wxEventTableEntry::m_eventType for a more thorough - // explanation. - operator const wxEventType&() const { return m_type; } - -private: - wxEventType m_type; -}; - -#endif // wxHAS_EVENT_BIND - -// These are needed for the functor definitions -typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&); - -// We had some trouble (specifically with eVC for ARM WinCE build) with using -// wxEventFunction in the past so we had introduced wxObjectEventFunction which -// used to be a typedef for a member of wxObject and not wxEvtHandler to work -// around this but as eVC is not really supported any longer we now only keep -// this for backwards compatibility and, despite its name, this is a typedef -// for wxEvtHandler member now -- but if we have the same problem with another -// compiler we can restore its old definition for it. -typedef wxEventFunction wxObjectEventFunction; - -// The event functor which is stored in the static and dynamic event tables: -class WXDLLIMPEXP_BASE wxEventFunctor -{ -public: - virtual ~wxEventFunctor(); - - // Invoke the actual event handler: - virtual void operator()(wxEvtHandler *, wxEvent&) = 0; - - // this function tests whether this functor is matched, for the purpose of - // finding it in an event table in Unbind(), by the given functor: - virtual bool IsMatching(const wxEventFunctor& functor) const = 0; - - // If the functor holds an wxEvtHandler, then get access to it and track - // its lifetime with wxEventConnectionRef: - virtual wxEvtHandler *GetEvtHandler() const - { return NULL; } - - // This is only used to maintain backward compatibility in - // wxAppConsoleBase::CallEventHandler and ensures that an overwritten - // wxAppConsoleBase::HandleEvent is still called for functors which hold an - // wxEventFunction: - virtual wxEventFunction GetEvtMethod() const - { return NULL; } - -private: - WX_DECLARE_ABSTRACT_TYPEINFO(wxEventFunctor) -}; - -// A plain method functor for the untyped legacy event types: -class WXDLLIMPEXP_BASE wxObjectEventFunctor : public wxEventFunctor -{ -public: - wxObjectEventFunctor(wxObjectEventFunction method, wxEvtHandler *handler) - : m_handler( handler ), m_method( method ) - { } - - virtual void operator()(wxEvtHandler *handler, wxEvent& event); - - virtual bool IsMatching(const wxEventFunctor& functor) const - { - if ( wxTypeId(functor) == wxTypeId(*this) ) - { - const wxObjectEventFunctor &other = - static_cast< const wxObjectEventFunctor & >( functor ); - - // FIXME-VC6: amazing but true: replacing "m_method == 0" here - // with "!m_method" makes VC6 crash with an ICE in DLL build (only!) - // Also notice that using "NULL" instead of "0" results in warnings - // about "using NULL in arithmetics" from arm-linux-androideabi-g++ - // 4.4.3 used for wxAndroid build. - - return ( m_method == other.m_method || other.m_method == 0 ) && - ( m_handler == other.m_handler || other.m_handler == NULL ); - } - else - return false; - } - - virtual wxEvtHandler *GetEvtHandler() const - { return m_handler; } - - virtual wxEventFunction GetEvtMethod() const - { return m_method; } - -private: - wxEvtHandler *m_handler; - wxEventFunction m_method; - - // Provide a dummy default ctor for type info purposes - wxObjectEventFunctor() { } - - WX_DECLARE_TYPEINFO_INLINE(wxObjectEventFunctor) -}; - -// Create a functor for the legacy events: used by Connect() -inline wxObjectEventFunctor * -wxNewEventFunctor(const wxEventType& WXUNUSED(evtType), - wxObjectEventFunction method, - wxEvtHandler *handler) -{ - return new wxObjectEventFunctor(method, handler); -} - -// This version is used by wxDECLARE_EVENT_TABLE_ENTRY() -inline wxObjectEventFunctor * -wxNewEventTableFunctor(const wxEventType& WXUNUSED(evtType), - wxObjectEventFunction method) -{ - return new wxObjectEventFunctor(method, NULL); -} - -inline wxObjectEventFunctor -wxMakeEventFunctor(const wxEventType& WXUNUSED(evtType), - wxObjectEventFunction method, - wxEvtHandler *handler) -{ - return wxObjectEventFunctor(method, handler); -} - -#ifdef wxHAS_EVENT_BIND - -namespace wxPrivate -{ - -// helper template defining nested "type" typedef as the event class -// corresponding to the given event type -template struct EventClassOf; - -// the typed events provide the information about the class of the events they -// carry themselves: -template -struct EventClassOf< wxEventTypeTag > -{ - typedef typename wxEventTypeTag::EventClass type; -}; - -// for the old untyped events we don't have information about the exact event -// class carried by them -template <> -struct EventClassOf -{ - typedef wxEvent type; -}; - - -// helper class defining operations different for method functors using an -// object of wxEvtHandler-derived class as handler and the others -template struct HandlerImpl; - -// specialization for handlers deriving from wxEvtHandler -template -struct HandlerImpl -{ - static bool IsEvtHandler() - { return true; } - static T *ConvertFromEvtHandler(wxEvtHandler *p) - { return static_cast(p); } - static wxEvtHandler *ConvertToEvtHandler(T *p) - { return p; } - static wxEventFunction ConvertToEvtMethod(void (T::*f)(A&)) - { return static_cast( - reinterpret_cast(f)); } -}; - -// specialization for handlers not deriving from wxEvtHandler -template -struct HandlerImpl -{ - static bool IsEvtHandler() - { return false; } - static T *ConvertFromEvtHandler(wxEvtHandler *) - { return NULL; } - static wxEvtHandler *ConvertToEvtHandler(T *) - { return NULL; } - static wxEventFunction ConvertToEvtMethod(void (T::*)(A&)) - { return NULL; } -}; - -} // namespace wxPrivate - -// functor forwarding the event to a method of the given object -// -// notice that the object class may be different from the class in which the -// method is defined but it must be convertible to this class -// -// also, the type of the handler parameter doesn't need to be exactly the same -// as EventTag::EventClass but it must be its base class -- this is explicitly -// allowed to handle different events in the same handler taking wxEvent&, for -// example -template - -class wxEventFunctorMethod - : public wxEventFunctor, - private wxPrivate::HandlerImpl - < - Class, - EventArg, - wxConvertibleTo::value != 0 - > -{ -private: - static void CheckHandlerArgument(EventArg *) { } - -public: - // the event class associated with the given event tag - typedef typename wxPrivate::EventClassOf::type EventClass; - - - wxEventFunctorMethod(void (Class::*method)(EventArg&), EventHandler *handler) - : m_handler( handler ), m_method( method ) - { - wxASSERT_MSG( handler || this->IsEvtHandler(), - "handlers defined in non-wxEvtHandler-derived classes " - "must be connected with a valid sink object" ); - - // if you get an error here it means that the signature of the handler - // you're trying to use is not compatible with (i.e. is not the same as - // or a base class of) the real event class used for this event type - CheckHandlerArgument(static_cast(NULL)); - } - - virtual void operator()(wxEvtHandler *handler, wxEvent& event) - { - Class * realHandler = m_handler; - if ( !realHandler ) - { - realHandler = this->ConvertFromEvtHandler(handler); - - // this is not supposed to happen but check for it nevertheless - wxCHECK_RET( realHandler, "invalid event handler" ); - } - - // the real (run-time) type of event is EventClass and we checked in - // the ctor that EventClass can be converted to EventArg, so this cast - // is always valid - (realHandler->*m_method)(static_cast(event)); - } - - virtual bool IsMatching(const wxEventFunctor& functor) const - { - if ( wxTypeId(functor) != wxTypeId(*this) ) - return false; - - typedef wxEventFunctorMethod - ThisFunctor; - - // the cast is valid because wxTypeId()s matched above - const ThisFunctor& other = static_cast(functor); - - return (m_method == other.m_method || other.m_method == NULL) && - (m_handler == other.m_handler || other.m_handler == NULL); - } - - virtual wxEvtHandler *GetEvtHandler() const - { return this->ConvertToEvtHandler(m_handler); } - - virtual wxEventFunction GetEvtMethod() const - { return this->ConvertToEvtMethod(m_method); } - -private: - EventHandler *m_handler; - void (Class::*m_method)(EventArg&); - - // Provide a dummy default ctor for type info purposes - wxEventFunctorMethod() { } - - typedef wxEventFunctorMethod thisClass; - WX_DECLARE_TYPEINFO_INLINE(thisClass) -}; - - -// functor forwarding the event to function (function, static method) -template -class wxEventFunctorFunction : public wxEventFunctor -{ -private: - static void CheckHandlerArgument(EventArg *) { } - -public: - // the event class associated with the given event tag - typedef typename wxPrivate::EventClassOf::type EventClass; - - wxEventFunctorFunction( void ( *handler )( EventArg & )) - : m_handler( handler ) - { - // if you get an error here it means that the signature of the handler - // you're trying to use is not compatible with (i.e. is not the same as - // or a base class of) the real event class used for this event type - CheckHandlerArgument(static_cast(NULL)); - } - - virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event) - { - // If you get an error here like "must use .* or ->* to call - // pointer-to-member function" then you probably tried to call - // Bind/Unbind with a method pointer but without a handler pointer or - // NULL as a handler e.g.: - // Unbind( wxEVT_XXX, &EventHandler::method ); - // or - // Unbind( wxEVT_XXX, &EventHandler::method, NULL ) - m_handler(static_cast(event)); - } - - virtual bool IsMatching(const wxEventFunctor &functor) const - { - if ( wxTypeId(functor) != wxTypeId(*this) ) - return false; - - typedef wxEventFunctorFunction ThisFunctor; - - const ThisFunctor& other = static_cast( functor ); - - return m_handler == other.m_handler; - } - -private: - void (*m_handler)(EventArg&); - - // Provide a dummy default ctor for type info purposes - wxEventFunctorFunction() { } - - typedef wxEventFunctorFunction thisClass; - WX_DECLARE_TYPEINFO_INLINE(thisClass) -}; - - -template -class wxEventFunctorFunctor : public wxEventFunctor -{ -public: - typedef typename EventTag::EventClass EventArg; - - wxEventFunctorFunctor(const Functor& handler) - : m_handler(handler), m_handlerAddr(&handler) - { } - - virtual void operator()(wxEvtHandler *WXUNUSED(handler), wxEvent& event) - { - // If you get an error here like "must use '.*' or '->*' to call - // pointer-to-member function" then you probably tried to call - // Bind/Unbind with a method pointer but without a handler pointer or - // NULL as a handler e.g.: - // Unbind( wxEVT_XXX, &EventHandler::method ); - // or - // Unbind( wxEVT_XXX, &EventHandler::method, NULL ) - m_handler(static_cast(event)); - } - - virtual bool IsMatching(const wxEventFunctor &functor) const - { - if ( wxTypeId(functor) != wxTypeId(*this) ) - return false; - - typedef wxEventFunctorFunctor FunctorThis; - - const FunctorThis& other = static_cast(functor); - - // The only reliable/portable way to compare two functors is by - // identity: - return m_handlerAddr == other.m_handlerAddr; - } - -private: - // Store a copy of the functor to prevent using/calling an already - // destroyed instance: - Functor m_handler; - - // Use the address of the original functor for comparison in IsMatching: - const void *m_handlerAddr; - - // Provide a dummy default ctor for type info purposes - wxEventFunctorFunctor() { } - - typedef wxEventFunctorFunctor thisClass; - WX_DECLARE_TYPEINFO_INLINE(thisClass) -}; - -// Create functors for the templatized events, either allocated on the heap for -// wxNewXXX() variants (this is needed in wxEvtHandler::Bind<>() to store them -// in dynamic event table) or just by returning them as temporary objects (this -// is enough for Unbind<>() and we avoid unnecessary heap allocation like this). - - -// Create functors wrapping functions: -template -inline wxEventFunctorFunction * -wxNewEventFunctor(const EventTag&, void (*func)(EventArg &)) -{ - return new wxEventFunctorFunction(func); -} - -template -inline wxEventFunctorFunction -wxMakeEventFunctor(const EventTag&, void (*func)(EventArg &)) -{ - return wxEventFunctorFunction(func); -} - -// Create functors wrapping other functors: -template -inline wxEventFunctorFunctor * -wxNewEventFunctor(const EventTag&, const Functor &func) -{ - return new wxEventFunctorFunctor(func); -} - -template -inline wxEventFunctorFunctor -wxMakeEventFunctor(const EventTag&, const Functor &func) -{ - return wxEventFunctorFunctor(func); -} - -// Create functors wrapping methods: -template - -inline wxEventFunctorMethod * -wxNewEventFunctor(const EventTag&, - void (Class::*method)(EventArg&), - EventHandler *handler) -{ - return new wxEventFunctorMethod( - method, handler); -} - -template - -inline wxEventFunctorMethod -wxMakeEventFunctor(const EventTag&, - void (Class::*method)(EventArg&), - EventHandler *handler) -{ - return wxEventFunctorMethod( - method, handler); -} - -// Create an event functor for the event table via wxDECLARE_EVENT_TABLE_ENTRY: -// in this case we don't have the handler (as it's always the same as the -// object which generated the event) so we must use Class as its type -template -inline wxEventFunctorMethod * -wxNewEventTableFunctor(const EventTag&, void (Class::*method)(EventArg&)) -{ - return new wxEventFunctorMethod( - method, NULL); -} - -#endif // wxHAS_EVENT_BIND - - -// many, but not all, standard event types - - // some generic events -extern WXDLLIMPEXP_BASE const wxEventType wxEVT_NULL; -extern WXDLLIMPEXP_BASE const wxEventType wxEVT_FIRST; -extern WXDLLIMPEXP_BASE const wxEventType wxEVT_USER_FIRST; - - // Need events declared to do this -class WXDLLIMPEXP_FWD_BASE wxIdleEvent; -class WXDLLIMPEXP_FWD_BASE wxThreadEvent; -class WXDLLIMPEXP_FWD_BASE wxAsyncMethodCallEvent; -class WXDLLIMPEXP_FWD_CORE wxCommandEvent; -class WXDLLIMPEXP_FWD_CORE wxMouseEvent; -class WXDLLIMPEXP_FWD_CORE wxFocusEvent; -class WXDLLIMPEXP_FWD_CORE wxChildFocusEvent; -class WXDLLIMPEXP_FWD_CORE wxKeyEvent; -class WXDLLIMPEXP_FWD_CORE wxNavigationKeyEvent; -class WXDLLIMPEXP_FWD_CORE wxSetCursorEvent; -class WXDLLIMPEXP_FWD_CORE wxScrollEvent; -class WXDLLIMPEXP_FWD_CORE wxSpinEvent; -class WXDLLIMPEXP_FWD_CORE wxScrollWinEvent; -class WXDLLIMPEXP_FWD_CORE wxSizeEvent; -class WXDLLIMPEXP_FWD_CORE wxMoveEvent; -class WXDLLIMPEXP_FWD_CORE wxCloseEvent; -class WXDLLIMPEXP_FWD_CORE wxActivateEvent; -class WXDLLIMPEXP_FWD_CORE wxWindowCreateEvent; -class WXDLLIMPEXP_FWD_CORE wxWindowDestroyEvent; -class WXDLLIMPEXP_FWD_CORE wxShowEvent; -class WXDLLIMPEXP_FWD_CORE wxIconizeEvent; -class WXDLLIMPEXP_FWD_CORE wxMaximizeEvent; -class WXDLLIMPEXP_FWD_CORE wxMouseCaptureChangedEvent; -class WXDLLIMPEXP_FWD_CORE wxMouseCaptureLostEvent; -class WXDLLIMPEXP_FWD_CORE wxPaintEvent; -class WXDLLIMPEXP_FWD_CORE wxEraseEvent; -class WXDLLIMPEXP_FWD_CORE wxNcPaintEvent; -class WXDLLIMPEXP_FWD_CORE wxMenuEvent; -class WXDLLIMPEXP_FWD_CORE wxContextMenuEvent; -class WXDLLIMPEXP_FWD_CORE wxSysColourChangedEvent; -class WXDLLIMPEXP_FWD_CORE wxDisplayChangedEvent; -class WXDLLIMPEXP_FWD_CORE wxQueryNewPaletteEvent; -class WXDLLIMPEXP_FWD_CORE wxPaletteChangedEvent; -class WXDLLIMPEXP_FWD_CORE wxJoystickEvent; -class WXDLLIMPEXP_FWD_CORE wxDropFilesEvent; -class WXDLLIMPEXP_FWD_CORE wxInitDialogEvent; -class WXDLLIMPEXP_FWD_CORE wxUpdateUIEvent; -class WXDLLIMPEXP_FWD_CORE wxClipboardTextEvent; -class WXDLLIMPEXP_FWD_CORE wxHelpEvent; - - - // Command events -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_BUTTON, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHECKBOX, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHOICE, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LISTBOX, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LISTBOX_DCLICK, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHECKLISTBOX, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SLIDER, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RADIOBOX, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RADIOBUTTON, wxCommandEvent); - -// wxEVT_SCROLLBAR is deprecated, use wxEVT_SCROLL... events -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLBAR, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_VLBOX, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMBOBOX, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TOOL_RCLICKED, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TOOL_DROPDOWN, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TOOL_ENTER, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMBOBOX_DROPDOWN, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMBOBOX_CLOSEUP, wxCommandEvent); - - // Thread and asynchronous method call events -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_THREAD, wxThreadEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_ASYNC_METHOD_CALL, wxAsyncMethodCallEvent); - - // Mouse event types -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_DOWN, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_UP, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MIDDLE_DOWN, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MIDDLE_UP, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RIGHT_DOWN, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RIGHT_UP, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOTION, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ENTER_WINDOW, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEAVE_WINDOW, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LEFT_DCLICK, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MIDDLE_DCLICK, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_RIGHT_DCLICK, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SET_FOCUS, wxFocusEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_KILL_FOCUS, wxFocusEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHILD_FOCUS, wxChildFocusEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOUSEWHEEL, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX1_DOWN, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX1_UP, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX1_DCLICK, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_DOWN, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_UP, wxMouseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AUX2_DCLICK, wxMouseEvent); - - // Character input event type -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHAR, wxKeyEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CHAR_HOOK, wxKeyEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_NAVIGATION_KEY, wxNavigationKeyEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_KEY_DOWN, wxKeyEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_KEY_UP, wxKeyEvent); -#if wxUSE_HOTKEY -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HOTKEY, wxKeyEvent); -#endif -// This is a private event used by wxMSW code only and subject to change or -// disappear in the future. Don't use. -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_AFTER_CHAR, wxKeyEvent); - - // Set cursor event -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SET_CURSOR, wxSetCursorEvent); - - // wxScrollBar and wxSlider event identifiers -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_TOP, wxScrollEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_BOTTOM, wxScrollEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_LINEUP, wxScrollEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_LINEDOWN, wxScrollEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_PAGEUP, wxScrollEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_PAGEDOWN, wxScrollEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_THUMBTRACK, wxScrollEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_THUMBRELEASE, wxScrollEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLL_CHANGED, wxScrollEvent); - -// Due to a bug in older wx versions, wxSpinEvents were being sent with type of -// wxEVT_SCROLL_LINEUP, wxEVT_SCROLL_LINEDOWN and wxEVT_SCROLL_THUMBTRACK. But -// with the type-safe events in place, these event types are associated with -// wxScrollEvent. To allow handling of spin events, new event types have been -// defined in spinbutt.h/spinnbuttcmn.cpp. To maintain backward compatibility -// the spin event types are being initialized with the scroll event types. - -#if wxUSE_SPINBTN - -wxDECLARE_EXPORTED_EVENT_ALIAS( WXDLLIMPEXP_CORE, wxEVT_SPIN_UP, wxSpinEvent ); -wxDECLARE_EXPORTED_EVENT_ALIAS( WXDLLIMPEXP_CORE, wxEVT_SPIN_DOWN, wxSpinEvent ); -wxDECLARE_EXPORTED_EVENT_ALIAS( WXDLLIMPEXP_CORE, wxEVT_SPIN, wxSpinEvent ); - -#endif - - // Scroll events from wxWindow -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_TOP, wxScrollWinEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_BOTTOM, wxScrollWinEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_LINEUP, wxScrollWinEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_LINEDOWN, wxScrollWinEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_PAGEUP, wxScrollWinEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_PAGEDOWN, wxScrollWinEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_THUMBTRACK, wxScrollWinEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_THUMBRELEASE, wxScrollWinEvent); - - // System events -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SIZE, wxSizeEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVE, wxMoveEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CLOSE_WINDOW, wxCloseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_END_SESSION, wxCloseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_QUERY_END_SESSION, wxCloseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ACTIVATE_APP, wxActivateEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ACTIVATE, wxActivateEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CREATE, wxWindowCreateEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DESTROY, wxWindowDestroyEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SHOW, wxShowEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ICONIZE, wxIconizeEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MAXIMIZE, wxMaximizeEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOUSE_CAPTURE_CHANGED, wxMouseCaptureChangedEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOUSE_CAPTURE_LOST, wxMouseCaptureLostEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_PAINT, wxPaintEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_ERASE_BACKGROUND, wxEraseEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_NC_PAINT, wxNcPaintEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU_OPEN, wxMenuEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU_CLOSE, wxMenuEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MENU_HIGHLIGHT, wxMenuEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_CONTEXT_MENU, wxContextMenuEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SYS_COLOUR_CHANGED, wxSysColourChangedEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DISPLAY_CHANGED, wxDisplayChangedEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_QUERY_NEW_PALETTE, wxQueryNewPaletteEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_PALETTE_CHANGED, wxPaletteChangedEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_BUTTON_DOWN, wxJoystickEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_BUTTON_UP, wxJoystickEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_MOVE, wxJoystickEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_JOY_ZMOVE, wxJoystickEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DROP_FILES, wxDropFilesEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_INIT_DIALOG, wxInitDialogEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_BASE, wxEVT_IDLE, wxIdleEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_UPDATE_UI, wxUpdateUIEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SIZING, wxSizeEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVING, wxMoveEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVE_START, wxMoveEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVE_END, wxMoveEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HIBERNATE, wxActivateEvent); - - // Clipboard events -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_COPY, wxClipboardTextEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_CUT, wxClipboardTextEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT_PASTE, wxClipboardTextEvent); - - // Generic command events - // Note: a click is a higher-level event than button down/up -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LEFT_CLICK, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_LEFT_DCLICK, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RIGHT_CLICK, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_RIGHT_DCLICK, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_SET_FOCUS, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_KILL_FOCUS, wxCommandEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_COMMAND_ENTER, wxCommandEvent); - - // Help events -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_HELP, wxHelpEvent); -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_DETAILED_HELP, wxHelpEvent); - -// these 2 events are the same -#define wxEVT_TOOL wxEVT_MENU - -// ---------------------------------------------------------------------------- -// Compatibility -// ---------------------------------------------------------------------------- - -// this event is also used by wxComboBox and wxSpinCtrl which don't include -// wx/textctrl.h in all ports [yet], so declare it here as well -// -// still, any new code using it should include wx/textctrl.h explicitly -wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TEXT, wxCommandEvent); - - -// ---------------------------------------------------------------------------- -// wxEvent(-derived) classes -// ---------------------------------------------------------------------------- - -// the predefined constants for the number of times we propagate event -// upwards window child-parent chain -enum wxEventPropagation -{ - // don't propagate it at all - wxEVENT_PROPAGATE_NONE = 0, - - // propagate it until it is processed - wxEVENT_PROPAGATE_MAX = INT_MAX -}; - -// The different categories for a wxEvent; see wxEvent::GetEventCategory. -// NOTE: they are used as OR-combinable flags by wxEventLoopBase::YieldFor -enum wxEventCategory -{ - // this is the category for those events which are generated to update - // the appearance of the GUI but which (usually) do not comport data - // processing, i.e. which do not provide input or output data - // (e.g. size events, scroll events, etc). - // They are events NOT directly generated by the user's input devices. - wxEVT_CATEGORY_UI = 1, - - // this category groups those events which are generated directly from the - // user through input devices like mouse and keyboard and usually result in - // data to be processed from the application. - // (e.g. mouse clicks, key presses, etc) - wxEVT_CATEGORY_USER_INPUT = 2, - - // this category is for wxSocketEvent - wxEVT_CATEGORY_SOCKET = 4, - - // this category is for wxTimerEvent - wxEVT_CATEGORY_TIMER = 8, - - // this category is for any event used to send notifications from the - // secondary threads to the main one or in general for notifications among - // different threads (which may or may not be user-generated) - wxEVT_CATEGORY_THREAD = 16, - - - // implementation only - - // used in the implementations of wxEventLoopBase::YieldFor - wxEVT_CATEGORY_UNKNOWN = 32, - - // a special category used as an argument to wxEventLoopBase::YieldFor to indicate that - // Yield() should leave all wxEvents on the queue while emptying the native event queue - // (native events will be processed but the wxEvents they generate will be queued) - wxEVT_CATEGORY_CLIPBOARD = 64, - - - // shortcut masks - - // this category groups those events which are emitted in response to - // events of the native toolkit and which typically are not-"delayable". - wxEVT_CATEGORY_NATIVE_EVENTS = wxEVT_CATEGORY_UI|wxEVT_CATEGORY_USER_INPUT, - - // used in wxEventLoopBase::YieldFor to specify all event categories should be processed: - wxEVT_CATEGORY_ALL = - wxEVT_CATEGORY_UI|wxEVT_CATEGORY_USER_INPUT|wxEVT_CATEGORY_SOCKET| \ - wxEVT_CATEGORY_TIMER|wxEVT_CATEGORY_THREAD|wxEVT_CATEGORY_UNKNOWN| \ - wxEVT_CATEGORY_CLIPBOARD -}; - -/* - * wxWidgets events, covering all interesting things that might happen - * (button clicking, resizing, setting text in widgets, etc.). - * - * For each completely new event type, derive a new event class. - * An event CLASS represents a C++ class defining a range of similar event TYPES; - * examples are canvas events, panel item command events. - * An event TYPE is a unique identifier for a particular system event, - * such as a button press or a listbox deselection. - * - */ - -class WXDLLIMPEXP_BASE wxEvent : public wxObject -{ -public: - wxEvent(int winid = 0, wxEventType commandType = wxEVT_NULL ); - - void SetEventType(wxEventType typ) { m_eventType = typ; } - wxEventType GetEventType() const { return m_eventType; } - - wxObject *GetEventObject() const { return m_eventObject; } - void SetEventObject(wxObject *obj) { m_eventObject = obj; } - - long GetTimestamp() const { return m_timeStamp; } - void SetTimestamp(long ts = 0) { m_timeStamp = ts; } - - int GetId() const { return m_id; } - void SetId(int Id) { m_id = Id; } - - // Returns the user data optionally associated with the event handler when - // using Connect() or Bind(). - wxObject *GetEventUserData() const { return m_callbackUserData; } - - // Can instruct event processor that we wish to ignore this event - // (treat as if the event table entry had not been found): this must be done - // to allow the event processing by the base classes (calling event.Skip() - // is the analog of calling the base class version of a virtual function) - void Skip(bool skip = true) { m_skipped = skip; } - bool GetSkipped() const { return m_skipped; } - - // This function is used to create a copy of the event polymorphically and - // all derived classes must implement it because otherwise wxPostEvent() - // for them wouldn't work (it needs to do a copy of the event) - virtual wxEvent *Clone() const = 0; - - // this function is used to selectively process events in wxEventLoopBase::YieldFor - // NOTE: by default it returns wxEVT_CATEGORY_UI just because the major - // part of wxWidgets events belong to that category. - virtual wxEventCategory GetEventCategory() const - { return wxEVT_CATEGORY_UI; } - - // Implementation only: this test is explicitly anti OO and this function - // exists only for optimization purposes. - bool IsCommandEvent() const { return m_isCommandEvent; } - - // Determine if this event should be propagating to the parent window. - bool ShouldPropagate() const - { return m_propagationLevel != wxEVENT_PROPAGATE_NONE; } - - // Stop an event from propagating to its parent window, returns the old - // propagation level value - int StopPropagation() - { - int propagationLevel = m_propagationLevel; - m_propagationLevel = wxEVENT_PROPAGATE_NONE; - return propagationLevel; - } - - // Resume the event propagation by restoring the propagation level - // (returned by StopPropagation()) - void ResumePropagation(int propagationLevel) - { - m_propagationLevel = propagationLevel; - } - - // This method is for internal use only and allows to get the object that - // is propagating this event upwards the window hierarchy, if any. - wxEvtHandler* GetPropagatedFrom() const { return m_propagatedFrom; } - - // This is for internal use only and is only called by - // wxEvtHandler::ProcessEvent() to check whether it's the first time this - // event is being processed - bool WasProcessed() - { - if ( m_wasProcessed ) - return true; - - m_wasProcessed = true; - - return false; - } - - // This is for internal use only and is used for setting, testing and - // resetting of m_willBeProcessedAgain flag. - void SetWillBeProcessedAgain() - { - m_willBeProcessedAgain = true; - } - - bool WillBeProcessedAgain() - { - if ( m_willBeProcessedAgain ) - { - m_willBeProcessedAgain = false; - return true; - } - - return false; - } - - // This is also used only internally by ProcessEvent() to check if it - // should process the event normally or only restrict the search for the - // event handler to this object itself. - bool ShouldProcessOnlyIn(wxEvtHandler *h) const - { - return h == m_handlerToProcessOnlyIn; - } - - // Called to indicate that the result of ShouldProcessOnlyIn() wasn't taken - // into account. The existence of this function may seem counterintuitive - // but unfortunately it's needed by wxScrollHelperEvtHandler, see comments - // there. Don't even think of using this in your own code, this is a gross - // hack and is only needed because of wx complicated history and should - // never be used anywhere else. - void DidntHonourProcessOnlyIn() - { - m_handlerToProcessOnlyIn = NULL; - } - -protected: - wxObject* m_eventObject; - wxEventType m_eventType; - long m_timeStamp; - int m_id; - -public: - // m_callbackUserData is for internal usage only - wxObject* m_callbackUserData; - -private: - // If this handler - wxEvtHandler *m_handlerToProcessOnlyIn; - -protected: - // the propagation level: while it is positive, we propagate the event to - // the parent window (if any) - int m_propagationLevel; - - // The object that the event is being propagated from, initially NULL and - // only set by wxPropagateOnce. - wxEvtHandler* m_propagatedFrom; - - bool m_skipped; - bool m_isCommandEvent; - - // initially false but becomes true as soon as WasProcessed() is called for - // the first time, as this is done only by ProcessEvent() it explains the - // variable name: it becomes true after ProcessEvent() was called at least - // once for this event - bool m_wasProcessed; - - // This one is initially false too, but can be set to true to indicate that - // the event will be passed to another handler if it's not processed in - // this one. - bool m_willBeProcessedAgain; - -protected: - wxEvent(const wxEvent&); // for implementing Clone() - wxEvent& operator=(const wxEvent&); // for derived classes operator=() - -private: - // It needs to access our m_propagationLevel and m_propagatedFrom fields. - friend class WXDLLIMPEXP_FWD_BASE wxPropagateOnce; - - // and this one needs to access our m_handlerToProcessOnlyIn - friend class WXDLLIMPEXP_FWD_BASE wxEventProcessInHandlerOnly; - - - DECLARE_ABSTRACT_CLASS(wxEvent) -}; - -/* - * Helper class to temporarily change an event not to propagate. - */ -class WXDLLIMPEXP_BASE wxPropagationDisabler -{ -public: - wxPropagationDisabler(wxEvent& event) : m_event(event) - { - m_propagationLevelOld = m_event.StopPropagation(); - } - - ~wxPropagationDisabler() - { - m_event.ResumePropagation(m_propagationLevelOld); - } - -private: - wxEvent& m_event; - int m_propagationLevelOld; - - wxDECLARE_NO_COPY_CLASS(wxPropagationDisabler); -}; - -/* - * Helper used to indicate that an event is propagated upwards the window - * hierarchy by the given window. - */ -class WXDLLIMPEXP_BASE wxPropagateOnce -{ -public: - // The handler argument should normally be non-NULL to allow the parent - // event handler to know that it's being used to process an event coming - // from the child, it's only NULL by default for backwards compatibility. - wxPropagateOnce(wxEvent& event, wxEvtHandler* handler = NULL) - : m_event(event), - m_propagatedFromOld(event.m_propagatedFrom) - { - wxASSERT_MSG( m_event.m_propagationLevel > 0, - wxT("shouldn't be used unless ShouldPropagate()!") ); - - m_event.m_propagationLevel--; - m_event.m_propagatedFrom = handler; - } - - ~wxPropagateOnce() - { - m_event.m_propagatedFrom = m_propagatedFromOld; - m_event.m_propagationLevel++; - } - -private: - wxEvent& m_event; - wxEvtHandler* const m_propagatedFromOld; - - wxDECLARE_NO_COPY_CLASS(wxPropagateOnce); -}; - -// A helper object used to temporarily make wxEvent::ShouldProcessOnlyIn() -// return true for the handler passed to its ctor. -class wxEventProcessInHandlerOnly -{ -public: - wxEventProcessInHandlerOnly(wxEvent& event, wxEvtHandler *handler) - : m_event(event), - m_handlerToProcessOnlyInOld(event.m_handlerToProcessOnlyIn) - { - m_event.m_handlerToProcessOnlyIn = handler; - } - - ~wxEventProcessInHandlerOnly() - { - m_event.m_handlerToProcessOnlyIn = m_handlerToProcessOnlyInOld; - } - -private: - wxEvent& m_event; - wxEvtHandler * const m_handlerToProcessOnlyInOld; - - wxDECLARE_NO_COPY_CLASS(wxEventProcessInHandlerOnly); -}; - - -class WXDLLIMPEXP_BASE wxEventBasicPayloadMixin -{ -public: - wxEventBasicPayloadMixin() - : m_commandInt(0), - m_extraLong(0) - { - } - - void SetString(const wxString& s) { m_cmdString = s; } - const wxString& GetString() const { return m_cmdString; } - - void SetInt(int i) { m_commandInt = i; } - int GetInt() const { return m_commandInt; } - - void SetExtraLong(long extraLong) { m_extraLong = extraLong; } - long GetExtraLong() const { return m_extraLong; } - -protected: - // Note: these variables have "cmd" or "command" in their name for backward compatibility: - // they used to be part of wxCommandEvent, not this mixin. - wxString m_cmdString; // String event argument - int m_commandInt; - long m_extraLong; // Additional information (e.g. select/deselect) - - wxDECLARE_NO_ASSIGN_CLASS(wxEventBasicPayloadMixin); -}; - -class WXDLLIMPEXP_BASE wxEventAnyPayloadMixin : public wxEventBasicPayloadMixin -{ -public: - wxEventAnyPayloadMixin() : wxEventBasicPayloadMixin() {} - -#if wxUSE_ANY && (!defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)) - template - void SetPayload(const T& payload) - { - m_payload = payload; - } - - template - T GetPayload() const - { - return m_payload.As(); - } - -protected: - wxAny m_payload; -#endif // wxUSE_ANY && (!defined(__VISUALC__) || wxCHECK_VISUALC_VERSION(7)) - - wxDECLARE_NO_ASSIGN_CLASS(wxEventBasicPayloadMixin); -}; - - -// Idle event -/* - wxEVT_IDLE - */ - -// Whether to always send idle events to windows, or -// to only send update events to those with the -// wxWS_EX_PROCESS_IDLE style. - -enum wxIdleMode -{ - // Send idle events to all windows - wxIDLE_PROCESS_ALL, - - // Send idle events to windows that have - // the wxWS_EX_PROCESS_IDLE flag specified - wxIDLE_PROCESS_SPECIFIED -}; - -class WXDLLIMPEXP_BASE wxIdleEvent : public wxEvent -{ -public: - wxIdleEvent() - : wxEvent(0, wxEVT_IDLE), - m_requestMore(false) - { } - wxIdleEvent(const wxIdleEvent& event) - : wxEvent(event), - m_requestMore(event.m_requestMore) - { } - - void RequestMore(bool needMore = true) { m_requestMore = needMore; } - bool MoreRequested() const { return m_requestMore; } - - virtual wxEvent *Clone() const { return new wxIdleEvent(*this); } - - // Specify how wxWidgets will send idle events: to - // all windows, or only to those which specify that they - // will process the events. - static void SetMode(wxIdleMode mode) { sm_idleMode = mode; } - - // Returns the idle event mode - static wxIdleMode GetMode() { return sm_idleMode; } - -protected: - bool m_requestMore; - static wxIdleMode sm_idleMode; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIdleEvent) -}; - - -// Thread event - -class WXDLLIMPEXP_BASE wxThreadEvent : public wxEvent, - public wxEventAnyPayloadMixin -{ -public: - wxThreadEvent(wxEventType eventType = wxEVT_THREAD, int id = wxID_ANY) - : wxEvent(id, eventType) - { } - - wxThreadEvent(const wxThreadEvent& event) - : wxEvent(event), - wxEventAnyPayloadMixin(event) - { - // make sure our string member (which uses COW, aka refcounting) is not - // shared by other wxString instances: - SetString(GetString().Clone()); - } - - virtual wxEvent *Clone() const - { - return new wxThreadEvent(*this); - } - - // this is important to avoid that calling wxEventLoopBase::YieldFor thread events - // gets processed when this is unwanted: - virtual wxEventCategory GetEventCategory() const - { return wxEVT_CATEGORY_THREAD; } - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxThreadEvent) -}; - - -// Asynchronous method call events: these event are processed by wxEvtHandler -// itself and result in a call to its Execute() method which simply calls the -// specified method. The difference with a simple method call is that this is -// done asynchronously, i.e. at some later time, instead of immediately when -// the event object is constructed. - -#ifdef wxHAS_CALL_AFTER - -// This is a base class used to process all method calls. -class wxAsyncMethodCallEvent : public wxEvent -{ -public: - wxAsyncMethodCallEvent(wxObject* object) - : wxEvent(wxID_ANY, wxEVT_ASYNC_METHOD_CALL) - { - SetEventObject(object); - } - - wxAsyncMethodCallEvent(const wxAsyncMethodCallEvent& other) - : wxEvent(other) - { - } - - virtual void Execute() = 0; -}; - -// This is a version for calling methods without parameters. -template -class wxAsyncMethodCallEvent0 : public wxAsyncMethodCallEvent -{ -public: - typedef T ObjectType; - typedef void (ObjectType::*MethodType)(); - - wxAsyncMethodCallEvent0(ObjectType* object, - MethodType method) - : wxAsyncMethodCallEvent(object), - m_object(object), - m_method(method) - { - } - - wxAsyncMethodCallEvent0(const wxAsyncMethodCallEvent0& other) - : wxAsyncMethodCallEvent(other), - m_object(other.m_object), - m_method(other.m_method) - { - } - - virtual wxEvent *Clone() const - { - return new wxAsyncMethodCallEvent0(*this); - } - - virtual void Execute() - { - (m_object->*m_method)(); - } - -private: - ObjectType* const m_object; - const MethodType m_method; -}; - -// This is a version for calling methods with a single parameter. -template -class wxAsyncMethodCallEvent1 : public wxAsyncMethodCallEvent -{ -public: - typedef T ObjectType; - typedef void (ObjectType::*MethodType)(T1 x1); - typedef typename wxRemoveRef::type ParamType1; - - wxAsyncMethodCallEvent1(ObjectType* object, - MethodType method, - const ParamType1& x1) - : wxAsyncMethodCallEvent(object), - m_object(object), - m_method(method), - m_param1(x1) - { - } - - wxAsyncMethodCallEvent1(const wxAsyncMethodCallEvent1& other) - : wxAsyncMethodCallEvent(other), - m_object(other.m_object), - m_method(other.m_method), - m_param1(other.m_param1) - { - } - - virtual wxEvent *Clone() const - { - return new wxAsyncMethodCallEvent1(*this); - } - - virtual void Execute() - { - (m_object->*m_method)(m_param1); - } - -private: - ObjectType* const m_object; - const MethodType m_method; - const ParamType1 m_param1; -}; - -// This is a version for calling methods with two parameters. -template -class wxAsyncMethodCallEvent2 : public wxAsyncMethodCallEvent -{ -public: - typedef T ObjectType; - typedef void (ObjectType::*MethodType)(T1 x1, T2 x2); - typedef typename wxRemoveRef::type ParamType1; - typedef typename wxRemoveRef::type ParamType2; - - wxAsyncMethodCallEvent2(ObjectType* object, - MethodType method, - const ParamType1& x1, - const ParamType2& x2) - : wxAsyncMethodCallEvent(object), - m_object(object), - m_method(method), - m_param1(x1), - m_param2(x2) - { - } - - wxAsyncMethodCallEvent2(const wxAsyncMethodCallEvent2& other) - : wxAsyncMethodCallEvent(other), - m_object(other.m_object), - m_method(other.m_method), - m_param1(other.m_param1), - m_param2(other.m_param2) - { - } - - virtual wxEvent *Clone() const - { - return new wxAsyncMethodCallEvent2(*this); - } - - virtual void Execute() - { - (m_object->*m_method)(m_param1, m_param2); - } - -private: - ObjectType* const m_object; - const MethodType m_method; - const ParamType1 m_param1; - const ParamType2 m_param2; -}; - -// This is a version for calling any functors -template -class wxAsyncMethodCallEventFunctor : public wxAsyncMethodCallEvent -{ -public: - typedef T FunctorType; - - wxAsyncMethodCallEventFunctor(wxObject *object, const FunctorType& fn) - : wxAsyncMethodCallEvent(object), - m_fn(fn) - { - } - - wxAsyncMethodCallEventFunctor(const wxAsyncMethodCallEventFunctor& other) - : wxAsyncMethodCallEvent(other), - m_fn(other.m_fn) - { - } - - virtual wxEvent *Clone() const - { - return new wxAsyncMethodCallEventFunctor(*this); - } - - virtual void Execute() - { - m_fn(); - } - -private: - FunctorType m_fn; -}; - -#endif // wxHAS_CALL_AFTER - - -#if wxUSE_GUI - - -// Item or menu event class -/* - wxEVT_BUTTON - wxEVT_CHECKBOX - wxEVT_CHOICE - wxEVT_LISTBOX - wxEVT_LISTBOX_DCLICK - wxEVT_TEXT - wxEVT_TEXT_ENTER - wxEVT_MENU - wxEVT_SLIDER - wxEVT_RADIOBOX - wxEVT_RADIOBUTTON - wxEVT_SCROLLBAR - wxEVT_VLBOX - wxEVT_COMBOBOX - wxEVT_TOGGLEBUTTON -*/ - -class WXDLLIMPEXP_CORE wxCommandEvent : public wxEvent, - public wxEventBasicPayloadMixin -{ -public: - wxCommandEvent(wxEventType commandType = wxEVT_NULL, int winid = 0); - - wxCommandEvent(const wxCommandEvent& event) - : wxEvent(event), - wxEventBasicPayloadMixin(event), - m_clientData(event.m_clientData), - m_clientObject(event.m_clientObject) - { - // Because GetString() can retrieve the string text only on demand, we - // need to copy it explicitly. - if ( m_cmdString.empty() ) - m_cmdString = event.GetString(); - } - - // Set/Get client data from controls - void SetClientData(void* clientData) { m_clientData = clientData; } - void *GetClientData() const { return m_clientData; } - - // Set/Get client object from controls - void SetClientObject(wxClientData* clientObject) { m_clientObject = clientObject; } - wxClientData *GetClientObject() const { return m_clientObject; } - - // Note: this shadows wxEventBasicPayloadMixin::GetString(), because it does some - // GUI-specific hacks - wxString GetString() const; - - // Get listbox selection if single-choice - int GetSelection() const { return m_commandInt; } - - // Get checkbox value - bool IsChecked() const { return m_commandInt != 0; } - - // true if the listbox event was a selection. - bool IsSelection() const { return (m_extraLong != 0); } - - virtual wxEvent *Clone() const { return new wxCommandEvent(*this); } - virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; } - -protected: - void* m_clientData; // Arbitrary client data - wxClientData* m_clientObject; // Arbitrary client object - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCommandEvent) -}; - -// this class adds a possibility to react (from the user) code to a control -// notification: allow or veto the operation being reported. -class WXDLLIMPEXP_CORE wxNotifyEvent : public wxCommandEvent -{ -public: - wxNotifyEvent(wxEventType commandType = wxEVT_NULL, int winid = 0) - : wxCommandEvent(commandType, winid) - { m_bAllow = true; } - - wxNotifyEvent(const wxNotifyEvent& event) - : wxCommandEvent(event) - { m_bAllow = event.m_bAllow; } - - // veto the operation (usually it's allowed by default) - void Veto() { m_bAllow = false; } - - // allow the operation if it was disabled by default - void Allow() { m_bAllow = true; } - - // for implementation code only: is the operation allowed? - bool IsAllowed() const { return m_bAllow; } - - virtual wxEvent *Clone() const { return new wxNotifyEvent(*this); } - -private: - bool m_bAllow; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNotifyEvent) -}; - - -// Scroll event class, derived form wxCommandEvent. wxScrollEvents are -// sent by wxSlider and wxScrollBar. -/* - wxEVT_SCROLL_TOP - wxEVT_SCROLL_BOTTOM - wxEVT_SCROLL_LINEUP - wxEVT_SCROLL_LINEDOWN - wxEVT_SCROLL_PAGEUP - wxEVT_SCROLL_PAGEDOWN - wxEVT_SCROLL_THUMBTRACK - wxEVT_SCROLL_THUMBRELEASE - wxEVT_SCROLL_CHANGED -*/ - -class WXDLLIMPEXP_CORE wxScrollEvent : public wxCommandEvent -{ -public: - wxScrollEvent(wxEventType commandType = wxEVT_NULL, - int winid = 0, int pos = 0, int orient = 0); - - int GetOrientation() const { return (int) m_extraLong; } - int GetPosition() const { return m_commandInt; } - void SetOrientation(int orient) { m_extraLong = (long) orient; } - void SetPosition(int pos) { m_commandInt = pos; } - - virtual wxEvent *Clone() const { return new wxScrollEvent(*this); } - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollEvent) -}; - -// ScrollWin event class, derived fom wxEvent. wxScrollWinEvents -// are sent by wxWindow. -/* - wxEVT_SCROLLWIN_TOP - wxEVT_SCROLLWIN_BOTTOM - wxEVT_SCROLLWIN_LINEUP - wxEVT_SCROLLWIN_LINEDOWN - wxEVT_SCROLLWIN_PAGEUP - wxEVT_SCROLLWIN_PAGEDOWN - wxEVT_SCROLLWIN_THUMBTRACK - wxEVT_SCROLLWIN_THUMBRELEASE -*/ - -class WXDLLIMPEXP_CORE wxScrollWinEvent : public wxEvent -{ -public: - wxScrollWinEvent(wxEventType commandType = wxEVT_NULL, - int pos = 0, int orient = 0); - wxScrollWinEvent(const wxScrollWinEvent& event) : wxEvent(event) - { m_commandInt = event.m_commandInt; - m_extraLong = event.m_extraLong; } - - int GetOrientation() const { return (int) m_extraLong; } - int GetPosition() const { return m_commandInt; } - void SetOrientation(int orient) { m_extraLong = (long) orient; } - void SetPosition(int pos) { m_commandInt = pos; } - - virtual wxEvent *Clone() const { return new wxScrollWinEvent(*this); } - -protected: - int m_commandInt; - long m_extraLong; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxScrollWinEvent) -}; - - - -// Mouse event class - -/* - wxEVT_LEFT_DOWN - wxEVT_LEFT_UP - wxEVT_MIDDLE_DOWN - wxEVT_MIDDLE_UP - wxEVT_RIGHT_DOWN - wxEVT_RIGHT_UP - wxEVT_MOTION - wxEVT_ENTER_WINDOW - wxEVT_LEAVE_WINDOW - wxEVT_LEFT_DCLICK - wxEVT_MIDDLE_DCLICK - wxEVT_RIGHT_DCLICK -*/ - -enum wxMouseWheelAxis -{ - wxMOUSE_WHEEL_VERTICAL, - wxMOUSE_WHEEL_HORIZONTAL -}; - -class WXDLLIMPEXP_CORE wxMouseEvent : public wxEvent, - public wxMouseState -{ -public: - wxMouseEvent(wxEventType mouseType = wxEVT_NULL); - wxMouseEvent(const wxMouseEvent& event) - : wxEvent(event), - wxMouseState(event) - { - Assign(event); - } - - // Was it a button event? (*doesn't* mean: is any button *down*?) - bool IsButton() const { return Button(wxMOUSE_BTN_ANY); } - - // Was it a down event from this (or any) button? - bool ButtonDown(int but = wxMOUSE_BTN_ANY) const; - - // Was it a dclick event from this (or any) button? - bool ButtonDClick(int but = wxMOUSE_BTN_ANY) const; - - // Was it a up event from this (or any) button? - bool ButtonUp(int but = wxMOUSE_BTN_ANY) const; - - // Was this event generated by the given button? - bool Button(int but) const; - - // Get the button which is changing state (wxMOUSE_BTN_NONE if none) - int GetButton() const; - - // Find which event was just generated - bool LeftDown() const { return (m_eventType == wxEVT_LEFT_DOWN); } - bool MiddleDown() const { return (m_eventType == wxEVT_MIDDLE_DOWN); } - bool RightDown() const { return (m_eventType == wxEVT_RIGHT_DOWN); } - bool Aux1Down() const { return (m_eventType == wxEVT_AUX1_DOWN); } - bool Aux2Down() const { return (m_eventType == wxEVT_AUX2_DOWN); } - - bool LeftUp() const { return (m_eventType == wxEVT_LEFT_UP); } - bool MiddleUp() const { return (m_eventType == wxEVT_MIDDLE_UP); } - bool RightUp() const { return (m_eventType == wxEVT_RIGHT_UP); } - bool Aux1Up() const { return (m_eventType == wxEVT_AUX1_UP); } - bool Aux2Up() const { return (m_eventType == wxEVT_AUX2_UP); } - - bool LeftDClick() const { return (m_eventType == wxEVT_LEFT_DCLICK); } - bool MiddleDClick() const { return (m_eventType == wxEVT_MIDDLE_DCLICK); } - bool RightDClick() const { return (m_eventType == wxEVT_RIGHT_DCLICK); } - bool Aux1DClick() const { return (m_eventType == wxEVT_AUX1_DCLICK); } - bool Aux2DClick() const { return (m_eventType == wxEVT_AUX2_DCLICK); } - - // True if a button is down and the mouse is moving - bool Dragging() const - { - return (m_eventType == wxEVT_MOTION) && ButtonIsDown(wxMOUSE_BTN_ANY); - } - - // True if the mouse is moving, and no button is down - bool Moving() const - { - return (m_eventType == wxEVT_MOTION) && !ButtonIsDown(wxMOUSE_BTN_ANY); - } - - // True if the mouse is just entering the window - bool Entering() const { return (m_eventType == wxEVT_ENTER_WINDOW); } - - // True if the mouse is just leaving the window - bool Leaving() const { return (m_eventType == wxEVT_LEAVE_WINDOW); } - - // Returns the number of mouse clicks associated with this event. - int GetClickCount() const { return m_clickCount; } - - // Find the logical position of the event given the DC - wxPoint GetLogicalPosition(const wxDC& dc) const; - - // Get wheel rotation, positive or negative indicates direction of - // rotation. Current devices all send an event when rotation is equal to - // +/-WheelDelta, but this allows for finer resolution devices to be - // created in the future. Because of this you shouldn't assume that one - // event is equal to 1 line or whatever, but you should be able to either - // do partial line scrolling or wait until +/-WheelDelta rotation values - // have been accumulated before scrolling. - int GetWheelRotation() const { return m_wheelRotation; } - - // Get wheel delta, normally 120. This is the threshold for action to be - // taken, and one such action (for example, scrolling one increment) - // should occur for each delta. - int GetWheelDelta() const { return m_wheelDelta; } - - // Gets the axis the wheel operation concerns; wxMOUSE_WHEEL_VERTICAL - // (most common case) or wxMOUSE_WHEEL_HORIZONTAL (for horizontal scrolling - // using e.g. a trackpad). - wxMouseWheelAxis GetWheelAxis() const { return m_wheelAxis; } - - // Returns the configured number of lines (or whatever) to be scrolled per - // wheel action. Defaults to three. - int GetLinesPerAction() const { return m_linesPerAction; } - - // Returns the configured number of columns (or whatever) to be scrolled per - // wheel action. Defaults to three. - int GetColumnsPerAction() const { return m_columnsPerAction; } - - // Is the system set to do page scrolling? - bool IsPageScroll() const { return ((unsigned int)m_linesPerAction == UINT_MAX); } - - virtual wxEvent *Clone() const { return new wxMouseEvent(*this); } - virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; } - - wxMouseEvent& operator=(const wxMouseEvent& event) - { - if (&event != this) - Assign(event); - return *this; - } - -public: - int m_clickCount; - - wxMouseWheelAxis m_wheelAxis; - int m_wheelRotation; - int m_wheelDelta; - int m_linesPerAction; - int m_columnsPerAction; - -protected: - void Assign(const wxMouseEvent& evt); - -private: - DECLARE_DYNAMIC_CLASS(wxMouseEvent) -}; - -// Cursor set event - -/* - wxEVT_SET_CURSOR - */ - -class WXDLLIMPEXP_CORE wxSetCursorEvent : public wxEvent -{ -public: - wxSetCursorEvent(wxCoord x = 0, wxCoord y = 0) - : wxEvent(0, wxEVT_SET_CURSOR), - m_x(x), m_y(y), m_cursor() - { } - - wxSetCursorEvent(const wxSetCursorEvent& event) - : wxEvent(event), - m_x(event.m_x), - m_y(event.m_y), - m_cursor(event.m_cursor) - { } - - wxCoord GetX() const { return m_x; } - wxCoord GetY() const { return m_y; } - - void SetCursor(const wxCursor& cursor) { m_cursor = cursor; } - const wxCursor& GetCursor() const { return m_cursor; } - bool HasCursor() const { return m_cursor.IsOk(); } - - virtual wxEvent *Clone() const { return new wxSetCursorEvent(*this); } - -private: - wxCoord m_x, m_y; - wxCursor m_cursor; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSetCursorEvent) -}; - -// Keyboard input event class - -/* - wxEVT_CHAR - wxEVT_CHAR_HOOK - wxEVT_KEY_DOWN - wxEVT_KEY_UP - wxEVT_HOTKEY - */ - -// key categories: the bit flags for IsKeyInCategory() function -// -// the enum values used may change in future version of wx -// use the named constants only, or bitwise combinations thereof -enum wxKeyCategoryFlags -{ - // arrow keys, on and off numeric keypads - WXK_CATEGORY_ARROW = 1, - - // page up and page down keys, on and off numeric keypads - WXK_CATEGORY_PAGING = 2, - - // home and end keys, on and off numeric keypads - WXK_CATEGORY_JUMP = 4, - - // tab key, on and off numeric keypads - WXK_CATEGORY_TAB = 8, - - // backspace and delete keys, on and off numeric keypads - WXK_CATEGORY_CUT = 16, - - // all keys usually used for navigation - WXK_CATEGORY_NAVIGATION = WXK_CATEGORY_ARROW | - WXK_CATEGORY_PAGING | - WXK_CATEGORY_JUMP -}; - -class WXDLLIMPEXP_CORE wxKeyEvent : public wxEvent, - public wxKeyboardState -{ -public: - wxKeyEvent(wxEventType keyType = wxEVT_NULL); - - // Normal copy ctor and a ctor creating a new event for the same key as the - // given one but a different event type (this is used in implementation - // code only, do not use outside of the library). - wxKeyEvent(const wxKeyEvent& evt); - wxKeyEvent(wxEventType eventType, const wxKeyEvent& evt); - - // get the key code: an ASCII7 char or an element of wxKeyCode enum - int GetKeyCode() const { return (int)m_keyCode; } - - // returns true iff this event's key code is of a certain type - bool IsKeyInCategory(int category) const; - -#if wxUSE_UNICODE - // get the Unicode character corresponding to this key - wxChar GetUnicodeKey() const { return m_uniChar; } -#endif // wxUSE_UNICODE - - // get the raw key code (platform-dependent) - wxUint32 GetRawKeyCode() const { return m_rawCode; } - - // get the raw key flags (platform-dependent) - wxUint32 GetRawKeyFlags() const { return m_rawFlags; } - - // Find the position of the event - void GetPosition(wxCoord *xpos, wxCoord *ypos) const - { - if (xpos) - *xpos = GetX(); - if (ypos) - *ypos = GetY(); - } - - // This version if provided only for backwards compatiblity, don't use. - void GetPosition(long *xpos, long *ypos) const - { - if (xpos) - *xpos = GetX(); - if (ypos) - *ypos = GetY(); - } - - wxPoint GetPosition() const - { return wxPoint(GetX(), GetY()); } - - // Get X position - wxCoord GetX() const; - - // Get Y position - wxCoord GetY() const; - - // Can be called from wxEVT_CHAR_HOOK handler to allow generation of normal - // key events even though the event had been handled (by default they would - // not be generated in this case). - void DoAllowNextEvent() { m_allowNext = true; } - - // Return the value of the "allow next" flag, for internal use only. - bool IsNextEventAllowed() const { return m_allowNext; } - - - virtual wxEvent *Clone() const { return new wxKeyEvent(*this); } - virtual wxEventCategory GetEventCategory() const { return wxEVT_CATEGORY_USER_INPUT; } - - // we do need to copy wxKeyEvent sometimes (in wxTreeCtrl code, for - // example) - wxKeyEvent& operator=(const wxKeyEvent& evt) - { - if ( &evt != this ) - { - wxEvent::operator=(evt); - - // Borland C++ 5.82 doesn't compile an explicit call to an - // implicitly defined operator=() so need to do it this way: - *static_cast(this) = evt; - - DoAssignMembers(evt); - } - return *this; - } - -public: - // Do not use these fields directly, they are initialized on demand, so - // call GetX() and GetY() or GetPosition() instead. - wxCoord m_x, m_y; - - long m_keyCode; - -#if wxUSE_UNICODE - // This contains the full Unicode character - // in a character events in Unicode mode - wxChar m_uniChar; -#endif - - // these fields contain the platform-specific information about - // key that was pressed - wxUint32 m_rawCode; - wxUint32 m_rawFlags; - -private: - // Set the event to propagate if necessary, i.e. if it's of wxEVT_CHAR_HOOK - // type. This is used by all ctors. - void InitPropagation() - { - if ( m_eventType == wxEVT_CHAR_HOOK ) - m_propagationLevel = wxEVENT_PROPAGATE_MAX; - - m_allowNext = false; - } - - // Copy only the event data present in this class, this is used by - // AssignKeyData() and copy ctor. - void DoAssignMembers(const wxKeyEvent& evt) - { - m_x = evt.m_x; - m_y = evt.m_y; - m_hasPosition = evt.m_hasPosition; - - m_keyCode = evt.m_keyCode; - - m_rawCode = evt.m_rawCode; - m_rawFlags = evt.m_rawFlags; -#if wxUSE_UNICODE - m_uniChar = evt.m_uniChar; -#endif - } - - // Initialize m_x and m_y using the current mouse cursor position if - // necessary. - void InitPositionIfNecessary() const; - - // If this flag is true, the normal key events should still be generated - // even if wxEVT_CHAR_HOOK had been handled. By default it is false as - // handling wxEVT_CHAR_HOOK suppresses all the subsequent events. - bool m_allowNext; - - // If true, m_x and m_y were already initialized. If false, try to get them - // when they're requested. - bool m_hasPosition; - - DECLARE_DYNAMIC_CLASS(wxKeyEvent) -}; - -// Size event class -/* - wxEVT_SIZE - */ - -class WXDLLIMPEXP_CORE wxSizeEvent : public wxEvent -{ -public: - wxSizeEvent() : wxEvent(0, wxEVT_SIZE) - { } - wxSizeEvent(const wxSize& sz, int winid = 0) - : wxEvent(winid, wxEVT_SIZE), - m_size(sz) - { } - wxSizeEvent(const wxSizeEvent& event) - : wxEvent(event), - m_size(event.m_size), m_rect(event.m_rect) - { } - wxSizeEvent(const wxRect& rect, int id = 0) - : m_size(rect.GetSize()), m_rect(rect) - { m_eventType = wxEVT_SIZING; m_id = id; } - - wxSize GetSize() const { return m_size; } - void SetSize(wxSize size) { m_size = size; } - wxRect GetRect() const { return m_rect; } - void SetRect(const wxRect& rect) { m_rect = rect; } - - virtual wxEvent *Clone() const { return new wxSizeEvent(*this); } - -public: - // For internal usage only. Will be converted to protected members. - wxSize m_size; - wxRect m_rect; // Used for wxEVT_SIZING - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSizeEvent) -}; - -// Move event class - -/* - wxEVT_MOVE - */ - -class WXDLLIMPEXP_CORE wxMoveEvent : public wxEvent -{ -public: - wxMoveEvent() - : wxEvent(0, wxEVT_MOVE) - { } - wxMoveEvent(const wxPoint& pos, int winid = 0) - : wxEvent(winid, wxEVT_MOVE), - m_pos(pos) - { } - wxMoveEvent(const wxMoveEvent& event) - : wxEvent(event), - m_pos(event.m_pos) - { } - wxMoveEvent(const wxRect& rect, int id = 0) - : m_pos(rect.GetPosition()), m_rect(rect) - { m_eventType = wxEVT_MOVING; m_id = id; } - - wxPoint GetPosition() const { return m_pos; } - void SetPosition(const wxPoint& pos) { m_pos = pos; } - wxRect GetRect() const { return m_rect; } - void SetRect(const wxRect& rect) { m_rect = rect; } - - virtual wxEvent *Clone() const { return new wxMoveEvent(*this); } - -protected: - wxPoint m_pos; - wxRect m_rect; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMoveEvent) -}; - -// Paint event class -/* - wxEVT_PAINT - wxEVT_NC_PAINT - */ - -#if wxDEBUG_LEVEL && (defined(__WXMSW__) || defined(__WXPM__)) - #define wxHAS_PAINT_DEBUG - - // see comments in src/msw|os2/dcclient.cpp where g_isPainting is defined - extern WXDLLIMPEXP_CORE int g_isPainting; -#endif // debug - -class WXDLLIMPEXP_CORE wxPaintEvent : public wxEvent -{ -public: - wxPaintEvent(int Id = 0) - : wxEvent(Id, wxEVT_PAINT) - { -#ifdef wxHAS_PAINT_DEBUG - // set the internal flag for the duration of redrawing - g_isPainting++; -#endif // debug - } - - // default copy ctor and dtor are normally fine, we only need them to keep - // g_isPainting updated in debug build -#ifdef wxHAS_PAINT_DEBUG - wxPaintEvent(const wxPaintEvent& event) - : wxEvent(event) - { - g_isPainting++; - } - - virtual ~wxPaintEvent() - { - g_isPainting--; - } -#endif // debug - - virtual wxEvent *Clone() const { return new wxPaintEvent(*this); } - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPaintEvent) -}; - -class WXDLLIMPEXP_CORE wxNcPaintEvent : public wxEvent -{ -public: - wxNcPaintEvent(int winid = 0) - : wxEvent(winid, wxEVT_NC_PAINT) - { } - - virtual wxEvent *Clone() const { return new wxNcPaintEvent(*this); } - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNcPaintEvent) -}; - -// Erase background event class -/* - wxEVT_ERASE_BACKGROUND - */ - -class WXDLLIMPEXP_CORE wxEraseEvent : public wxEvent -{ -public: - wxEraseEvent(int Id = 0, wxDC *dc = NULL) - : wxEvent(Id, wxEVT_ERASE_BACKGROUND), - m_dc(dc) - { } - - wxEraseEvent(const wxEraseEvent& event) - : wxEvent(event), - m_dc(event.m_dc) - { } - - wxDC *GetDC() const { return m_dc; } - - virtual wxEvent *Clone() const { return new wxEraseEvent(*this); } - -protected: - wxDC *m_dc; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxEraseEvent) -}; - -// Focus event class -/* - wxEVT_SET_FOCUS - wxEVT_KILL_FOCUS - */ - -class WXDLLIMPEXP_CORE wxFocusEvent : public wxEvent -{ -public: - wxFocusEvent(wxEventType type = wxEVT_NULL, int winid = 0) - : wxEvent(winid, type) - { m_win = NULL; } - - wxFocusEvent(const wxFocusEvent& event) - : wxEvent(event) - { m_win = event.m_win; } - - // The window associated with this event is the window which had focus - // before for SET event and the window which will have focus for the KILL - // one. NB: it may be NULL in both cases! - wxWindow *GetWindow() const { return m_win; } - void SetWindow(wxWindow *win) { m_win = win; } - - virtual wxEvent *Clone() const { return new wxFocusEvent(*this); } - -private: - wxWindow *m_win; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxFocusEvent) -}; - -// wxChildFocusEvent notifies the parent that a child has got the focus: unlike -// wxFocusEvent it is propagated upwards the window chain -class WXDLLIMPEXP_CORE wxChildFocusEvent : public wxCommandEvent -{ -public: - wxChildFocusEvent(wxWindow *win = NULL); - - wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); } - - virtual wxEvent *Clone() const { return new wxChildFocusEvent(*this); } - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxChildFocusEvent) -}; - -// Activate event class -/* - wxEVT_ACTIVATE - wxEVT_ACTIVATE_APP - wxEVT_HIBERNATE - */ - -class WXDLLIMPEXP_CORE wxActivateEvent : public wxEvent -{ -public: - // Type of activation. For now we can only detect if it was by mouse or by - // some other method and even this is only available under wxMSW. - enum Reason - { - Reason_Mouse, - Reason_Unknown - }; - - wxActivateEvent(wxEventType type = wxEVT_NULL, bool active = true, - int Id = 0, Reason activationReason = Reason_Unknown) - : wxEvent(Id, type), - m_activationReason(activationReason) - { - m_active = active; - } - wxActivateEvent(const wxActivateEvent& event) - : wxEvent(event) - { - m_active = event.m_active; - m_activationReason = event.m_activationReason; - } - - bool GetActive() const { return m_active; } - Reason GetActivationReason() const { return m_activationReason;} - - virtual wxEvent *Clone() const { return new wxActivateEvent(*this); } - -private: - bool m_active; - Reason m_activationReason; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxActivateEvent) -}; - -// InitDialog event class -/* - wxEVT_INIT_DIALOG - */ - -class WXDLLIMPEXP_CORE wxInitDialogEvent : public wxEvent -{ -public: - wxInitDialogEvent(int Id = 0) - : wxEvent(Id, wxEVT_INIT_DIALOG) - { } - - virtual wxEvent *Clone() const { return new wxInitDialogEvent(*this); } - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxInitDialogEvent) -}; - -// Miscellaneous menu event class -/* - wxEVT_MENU_OPEN, - wxEVT_MENU_CLOSE, - wxEVT_MENU_HIGHLIGHT, -*/ - -class WXDLLIMPEXP_CORE wxMenuEvent : public wxEvent -{ -public: - wxMenuEvent(wxEventType type = wxEVT_NULL, int winid = 0, wxMenu* menu = NULL) - : wxEvent(winid, type) - { m_menuId = winid; m_menu = menu; } - wxMenuEvent(const wxMenuEvent& event) - : wxEvent(event) - { m_menuId = event.m_menuId; m_menu = event.m_menu; } - - // only for wxEVT_MENU_HIGHLIGHT - int GetMenuId() const { return m_menuId; } - - // only for wxEVT_MENU_OPEN/CLOSE - bool IsPopup() const { return m_menuId == wxID_ANY; } - - // only for wxEVT_MENU_OPEN/CLOSE - wxMenu* GetMenu() const { return m_menu; } - - virtual wxEvent *Clone() const { return new wxMenuEvent(*this); } - -private: - int m_menuId; - wxMenu* m_menu; - - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMenuEvent) -}; - -// Window close or session close event class -/* - wxEVT_CLOSE_WINDOW, - wxEVT_END_SESSION, - wxEVT_QUERY_END_SESSION - */ - -class WXDLLIMPEXP_CORE wxCloseEvent : public wxEvent -{ -public: - wxCloseEvent(wxEventType type = wxEVT_NULL, int winid = 0) - : wxEvent(winid, type), - m_loggingOff(true), - m_veto(false), // should be false by default - m_canVeto(true) {} - - wxCloseEvent(const wxCloseEvent& event) - : wxEvent(event), - m_loggingOff(event.m_loggingOff), - m_veto(event.m_veto), - m_canVeto(event.m_canVeto) {} - - void SetLoggingOff(bool logOff) { m_loggingOff = logOff; } - bool GetLoggingOff() const - { - // m_loggingOff flag is only used by wxEVT_[QUERY_]END_SESSION, it - // doesn't make sense for wxEVT_CLOSE_WINDOW - wxASSERT_MSG( m_eventType != wxEVT_CLOSE_WINDOW, - wxT("this flag is for end session events only") ); - - return m_loggingOff; - } - - void Veto(bool veto = true) - { - // GetVeto() will return false anyhow... - wxCHECK_RET( m_canVeto, - wxT("call to Veto() ignored (can't veto this event)") ); - - m_veto = veto; - } - void SetCanVeto(bool canVeto) { m_canVeto = canVeto; } - bool CanVeto() const { return m_canVeto; } - bool GetVeto() const { return m_canVeto && m_veto; } - - virtual wxEvent *Clone() const { return new wxCloseEvent(*this); } - -protected: - bool m_loggingOff, - m_veto, - m_canVeto; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxCloseEvent) -}; - -/* - wxEVT_SHOW - */ - -class WXDLLIMPEXP_CORE wxShowEvent : public wxEvent -{ -public: - wxShowEvent(int winid = 0, bool show = false) - : wxEvent(winid, wxEVT_SHOW) - { m_show = show; } - wxShowEvent(const wxShowEvent& event) - : wxEvent(event) - { m_show = event.m_show; } - - void SetShow(bool show) { m_show = show; } - - // return true if the window was shown, false if hidden - bool IsShown() const { return m_show; } - -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( bool GetShow() const { return IsShown(); } ) -#endif - - virtual wxEvent *Clone() const { return new wxShowEvent(*this); } - -protected: - bool m_show; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxShowEvent) -}; - -/* - wxEVT_ICONIZE - */ - -class WXDLLIMPEXP_CORE wxIconizeEvent : public wxEvent -{ -public: - wxIconizeEvent(int winid = 0, bool iconized = true) - : wxEvent(winid, wxEVT_ICONIZE) - { m_iconized = iconized; } - wxIconizeEvent(const wxIconizeEvent& event) - : wxEvent(event) - { m_iconized = event.m_iconized; } - -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( bool Iconized() const { return IsIconized(); } ) -#endif - // return true if the frame was iconized, false if restored - bool IsIconized() const { return m_iconized; } - - virtual wxEvent *Clone() const { return new wxIconizeEvent(*this); } - -protected: - bool m_iconized; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxIconizeEvent) -}; -/* - wxEVT_MAXIMIZE - */ - -class WXDLLIMPEXP_CORE wxMaximizeEvent : public wxEvent -{ -public: - wxMaximizeEvent(int winid = 0) - : wxEvent(winid, wxEVT_MAXIMIZE) - { } - - virtual wxEvent *Clone() const { return new wxMaximizeEvent(*this); } - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMaximizeEvent) -}; - -// Joystick event class -/* - wxEVT_JOY_BUTTON_DOWN, - wxEVT_JOY_BUTTON_UP, - wxEVT_JOY_MOVE, - wxEVT_JOY_ZMOVE -*/ - -// Which joystick? Same as Windows ids so no conversion necessary. -enum -{ - wxJOYSTICK1, - wxJOYSTICK2 -}; - -// Which button is down? -enum -{ - wxJOY_BUTTON_ANY = -1, - wxJOY_BUTTON1 = 1, - wxJOY_BUTTON2 = 2, - wxJOY_BUTTON3 = 4, - wxJOY_BUTTON4 = 8 -}; - -class WXDLLIMPEXP_CORE wxJoystickEvent : public wxEvent -{ -protected: - wxPoint m_pos; - int m_zPosition; - int m_buttonChange; // Which button changed? - int m_buttonState; // Which buttons are down? - int m_joyStick; // Which joystick? - -public: - wxJoystickEvent(wxEventType type = wxEVT_NULL, - int state = 0, - int joystick = wxJOYSTICK1, - int change = 0) - : wxEvent(0, type), - m_pos(), - m_zPosition(0), - m_buttonChange(change), - m_buttonState(state), - m_joyStick(joystick) - { - } - wxJoystickEvent(const wxJoystickEvent& event) - : wxEvent(event), - m_pos(event.m_pos), - m_zPosition(event.m_zPosition), - m_buttonChange(event.m_buttonChange), - m_buttonState(event.m_buttonState), - m_joyStick(event.m_joyStick) - { } - - wxPoint GetPosition() const { return m_pos; } - int GetZPosition() const { return m_zPosition; } - int GetButtonState() const { return m_buttonState; } - int GetButtonChange() const { return m_buttonChange; } - int GetJoystick() const { return m_joyStick; } - - void SetJoystick(int stick) { m_joyStick = stick; } - void SetButtonState(int state) { m_buttonState = state; } - void SetButtonChange(int change) { m_buttonChange = change; } - void SetPosition(const wxPoint& pos) { m_pos = pos; } - void SetZPosition(int zPos) { m_zPosition = zPos; } - - // Was it a button event? (*doesn't* mean: is any button *down*?) - bool IsButton() const { return ((GetEventType() == wxEVT_JOY_BUTTON_DOWN) || - (GetEventType() == wxEVT_JOY_BUTTON_UP)); } - - // Was it a move event? - bool IsMove() const { return (GetEventType() == wxEVT_JOY_MOVE); } - - // Was it a zmove event? - bool IsZMove() const { return (GetEventType() == wxEVT_JOY_ZMOVE); } - - // Was it a down event from button 1, 2, 3, 4 or any? - bool ButtonDown(int but = wxJOY_BUTTON_ANY) const - { return ((GetEventType() == wxEVT_JOY_BUTTON_DOWN) && - ((but == wxJOY_BUTTON_ANY) || (but == m_buttonChange))); } - - // Was it a up event from button 1, 2, 3 or any? - bool ButtonUp(int but = wxJOY_BUTTON_ANY) const - { return ((GetEventType() == wxEVT_JOY_BUTTON_UP) && - ((but == wxJOY_BUTTON_ANY) || (but == m_buttonChange))); } - - // Was the given button 1,2,3,4 or any in Down state? - bool ButtonIsDown(int but = wxJOY_BUTTON_ANY) const - { return (((but == wxJOY_BUTTON_ANY) && (m_buttonState != 0)) || - ((m_buttonState & but) == but)); } - - virtual wxEvent *Clone() const { return new wxJoystickEvent(*this); } - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxJoystickEvent) -}; - -// Drop files event class -/* - wxEVT_DROP_FILES - */ - -class WXDLLIMPEXP_CORE wxDropFilesEvent : public wxEvent -{ -public: - int m_noFiles; - wxPoint m_pos; - wxString* m_files; - - wxDropFilesEvent(wxEventType type = wxEVT_NULL, - int noFiles = 0, - wxString *files = NULL) - : wxEvent(0, type), - m_noFiles(noFiles), - m_pos(), - m_files(files) - { } - - // we need a copy ctor to avoid deleting m_files pointer twice - wxDropFilesEvent(const wxDropFilesEvent& other) - : wxEvent(other), - m_noFiles(other.m_noFiles), - m_pos(other.m_pos), - m_files(NULL) - { - m_files = new wxString[m_noFiles]; - for ( int n = 0; n < m_noFiles; n++ ) - { - m_files[n] = other.m_files[n]; - } - } - - virtual ~wxDropFilesEvent() - { - delete [] m_files; - } - - wxPoint GetPosition() const { return m_pos; } - int GetNumberOfFiles() const { return m_noFiles; } - wxString *GetFiles() const { return m_files; } - - virtual wxEvent *Clone() const { return new wxDropFilesEvent(*this); } - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDropFilesEvent) -}; - -// Update UI event -/* - wxEVT_UPDATE_UI - */ - -// Whether to always send update events to windows, or -// to only send update events to those with the -// wxWS_EX_PROCESS_UI_UPDATES style. - -enum wxUpdateUIMode -{ - // Send UI update events to all windows - wxUPDATE_UI_PROCESS_ALL, - - // Send UI update events to windows that have - // the wxWS_EX_PROCESS_UI_UPDATES flag specified - wxUPDATE_UI_PROCESS_SPECIFIED -}; - -class WXDLLIMPEXP_CORE wxUpdateUIEvent : public wxCommandEvent -{ -public: - wxUpdateUIEvent(wxWindowID commandId = 0) - : wxCommandEvent(wxEVT_UPDATE_UI, commandId) - { - m_checked = - m_enabled = - m_shown = - m_setEnabled = - m_setShown = - m_setText = - m_setChecked = false; - } - wxUpdateUIEvent(const wxUpdateUIEvent& event) - : wxCommandEvent(event), - m_checked(event.m_checked), - m_enabled(event.m_enabled), - m_shown(event.m_shown), - m_setEnabled(event.m_setEnabled), - m_setShown(event.m_setShown), - m_setText(event.m_setText), - m_setChecked(event.m_setChecked), - m_text(event.m_text) - { } - - bool GetChecked() const { return m_checked; } - bool GetEnabled() const { return m_enabled; } - bool GetShown() const { return m_shown; } - wxString GetText() const { return m_text; } - bool GetSetText() const { return m_setText; } - bool GetSetChecked() const { return m_setChecked; } - bool GetSetEnabled() const { return m_setEnabled; } - bool GetSetShown() const { return m_setShown; } - - void Check(bool check) { m_checked = check; m_setChecked = true; } - void Enable(bool enable) { m_enabled = enable; m_setEnabled = true; } - void Show(bool show) { m_shown = show; m_setShown = true; } - void SetText(const wxString& text) { m_text = text; m_setText = true; } - - // Sets the interval between updates in milliseconds. - // Set to -1 to disable updates, or to 0 to update as frequently as possible. - static void SetUpdateInterval(long updateInterval) { sm_updateInterval = updateInterval; } - - // Returns the current interval between updates in milliseconds - static long GetUpdateInterval() { return sm_updateInterval; } - - // Can we update this window? - static bool CanUpdate(wxWindowBase *win); - - // Reset the update time to provide a delay until the next - // time we should update - static void ResetUpdateTime(); - - // Specify how wxWidgets will send update events: to - // all windows, or only to those which specify that they - // will process the events. - static void SetMode(wxUpdateUIMode mode) { sm_updateMode = mode; } - - // Returns the UI update mode - static wxUpdateUIMode GetMode() { return sm_updateMode; } - - virtual wxEvent *Clone() const { return new wxUpdateUIEvent(*this); } - -protected: - bool m_checked; - bool m_enabled; - bool m_shown; - bool m_setEnabled; - bool m_setShown; - bool m_setText; - bool m_setChecked; - wxString m_text; -#if wxUSE_LONGLONG - static wxLongLong sm_lastUpdate; -#endif - static long sm_updateInterval; - static wxUpdateUIMode sm_updateMode; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxUpdateUIEvent) -}; - -/* - wxEVT_SYS_COLOUR_CHANGED - */ - -// TODO: shouldn't all events record the window ID? -class WXDLLIMPEXP_CORE wxSysColourChangedEvent : public wxEvent -{ -public: - wxSysColourChangedEvent() - : wxEvent(0, wxEVT_SYS_COLOUR_CHANGED) - { } - - virtual wxEvent *Clone() const { return new wxSysColourChangedEvent(*this); } - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSysColourChangedEvent) -}; - -/* - wxEVT_MOUSE_CAPTURE_CHANGED - The window losing the capture receives this message - (even if it released the capture itself). - */ - -class WXDLLIMPEXP_CORE wxMouseCaptureChangedEvent : public wxEvent -{ -public: - wxMouseCaptureChangedEvent(wxWindowID winid = 0, wxWindow* gainedCapture = NULL) - : wxEvent(winid, wxEVT_MOUSE_CAPTURE_CHANGED), - m_gainedCapture(gainedCapture) - { } - - wxMouseCaptureChangedEvent(const wxMouseCaptureChangedEvent& event) - : wxEvent(event), - m_gainedCapture(event.m_gainedCapture) - { } - - virtual wxEvent *Clone() const { return new wxMouseCaptureChangedEvent(*this); } - - wxWindow* GetCapturedWindow() const { return m_gainedCapture; } - -private: - wxWindow* m_gainedCapture; - - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMouseCaptureChangedEvent) -}; - -/* - wxEVT_MOUSE_CAPTURE_LOST - The window losing the capture receives this message, unless it released it - it itself or unless wxWindow::CaptureMouse was called on another window - (and so capture will be restored when the new capturer releases it). - */ - -class WXDLLIMPEXP_CORE wxMouseCaptureLostEvent : public wxEvent -{ -public: - wxMouseCaptureLostEvent(wxWindowID winid = 0) - : wxEvent(winid, wxEVT_MOUSE_CAPTURE_LOST) - {} - - wxMouseCaptureLostEvent(const wxMouseCaptureLostEvent& event) - : wxEvent(event) - {} - - virtual wxEvent *Clone() const { return new wxMouseCaptureLostEvent(*this); } - - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxMouseCaptureLostEvent) -}; - -/* - wxEVT_DISPLAY_CHANGED - */ -class WXDLLIMPEXP_CORE wxDisplayChangedEvent : public wxEvent -{ -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxDisplayChangedEvent) - -public: - wxDisplayChangedEvent() - : wxEvent(0, wxEVT_DISPLAY_CHANGED) - { } - - virtual wxEvent *Clone() const { return new wxDisplayChangedEvent(*this); } -}; - -/* - wxEVT_PALETTE_CHANGED - */ - -class WXDLLIMPEXP_CORE wxPaletteChangedEvent : public wxEvent -{ -public: - wxPaletteChangedEvent(wxWindowID winid = 0) - : wxEvent(winid, wxEVT_PALETTE_CHANGED), - m_changedWindow(NULL) - { } - - wxPaletteChangedEvent(const wxPaletteChangedEvent& event) - : wxEvent(event), - m_changedWindow(event.m_changedWindow) - { } - - void SetChangedWindow(wxWindow* win) { m_changedWindow = win; } - wxWindow* GetChangedWindow() const { return m_changedWindow; } - - virtual wxEvent *Clone() const { return new wxPaletteChangedEvent(*this); } - -protected: - wxWindow* m_changedWindow; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPaletteChangedEvent) -}; - -/* - wxEVT_QUERY_NEW_PALETTE - Indicates the window is getting keyboard focus and should re-do its palette. - */ - -class WXDLLIMPEXP_CORE wxQueryNewPaletteEvent : public wxEvent -{ -public: - wxQueryNewPaletteEvent(wxWindowID winid = 0) - : wxEvent(winid, wxEVT_QUERY_NEW_PALETTE), - m_paletteRealized(false) - { } - wxQueryNewPaletteEvent(const wxQueryNewPaletteEvent& event) - : wxEvent(event), - m_paletteRealized(event.m_paletteRealized) - { } - - // App sets this if it changes the palette. - void SetPaletteRealized(bool realized) { m_paletteRealized = realized; } - bool GetPaletteRealized() const { return m_paletteRealized; } - - virtual wxEvent *Clone() const { return new wxQueryNewPaletteEvent(*this); } - -protected: - bool m_paletteRealized; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxQueryNewPaletteEvent) -}; - -/* - Event generated by dialog navigation keys - wxEVT_NAVIGATION_KEY - */ -// NB: don't derive from command event to avoid being propagated to the parent -class WXDLLIMPEXP_CORE wxNavigationKeyEvent : public wxEvent -{ -public: - wxNavigationKeyEvent() - : wxEvent(0, wxEVT_NAVIGATION_KEY), - m_flags(IsForward | FromTab), // defaults are for TAB - m_focus(NULL) - { - m_propagationLevel = wxEVENT_PROPAGATE_NONE; - } - - wxNavigationKeyEvent(const wxNavigationKeyEvent& event) - : wxEvent(event), - m_flags(event.m_flags), - m_focus(event.m_focus) - { } - - // direction: forward (true) or backward (false) - bool GetDirection() const - { return (m_flags & IsForward) != 0; } - void SetDirection(bool bForward) - { if ( bForward ) m_flags |= IsForward; else m_flags &= ~IsForward; } - - // it may be a window change event (MDI, notebook pages...) or a control - // change event - bool IsWindowChange() const - { return (m_flags & WinChange) != 0; } - void SetWindowChange(bool bIs) - { if ( bIs ) m_flags |= WinChange; else m_flags &= ~WinChange; } - - // Set to true under MSW if the event was generated using the tab key. - // This is required for proper navogation over radio buttons - bool IsFromTab() const - { return (m_flags & FromTab) != 0; } - void SetFromTab(bool bIs) - { if ( bIs ) m_flags |= FromTab; else m_flags &= ~FromTab; } - - // the child which has the focus currently (may be NULL - use - // wxWindow::FindFocus then) - wxWindow* GetCurrentFocus() const { return m_focus; } - void SetCurrentFocus(wxWindow *win) { m_focus = win; } - - // Set flags - void SetFlags(long flags) { m_flags = flags; } - - virtual wxEvent *Clone() const { return new wxNavigationKeyEvent(*this); } - - enum wxNavigationKeyEventFlags - { - IsBackward = 0x0000, - IsForward = 0x0001, - WinChange = 0x0002, - FromTab = 0x0004 - }; - - long m_flags; - wxWindow *m_focus; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxNavigationKeyEvent) -}; - -// Window creation/destruction events: the first is sent as soon as window is -// created (i.e. the underlying GUI object exists), but when the C++ object is -// fully initialized (so virtual functions may be called). The second, -// wxEVT_DESTROY, is sent right before the window is destroyed - again, it's -// still safe to call virtual functions at this moment -/* - wxEVT_CREATE - wxEVT_DESTROY - */ - -class WXDLLIMPEXP_CORE wxWindowCreateEvent : public wxCommandEvent -{ -public: - wxWindowCreateEvent(wxWindow *win = NULL); - - wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); } - - virtual wxEvent *Clone() const { return new wxWindowCreateEvent(*this); } - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowCreateEvent) -}; - -class WXDLLIMPEXP_CORE wxWindowDestroyEvent : public wxCommandEvent -{ -public: - wxWindowDestroyEvent(wxWindow *win = NULL); - - wxWindow *GetWindow() const { return (wxWindow *)GetEventObject(); } - - virtual wxEvent *Clone() const { return new wxWindowDestroyEvent(*this); } - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWindowDestroyEvent) -}; - -// A help event is sent when the user clicks on a window in context-help mode. -/* - wxEVT_HELP - wxEVT_DETAILED_HELP -*/ - -class WXDLLIMPEXP_CORE wxHelpEvent : public wxCommandEvent -{ -public: - // how was this help event generated? - enum Origin - { - Origin_Unknown, // unrecognized event source - Origin_Keyboard, // event generated from F1 key press - Origin_HelpButton // event from [?] button on the title bar (Windows) - }; - - wxHelpEvent(wxEventType type = wxEVT_NULL, - wxWindowID winid = 0, - const wxPoint& pt = wxDefaultPosition, - Origin origin = Origin_Unknown) - : wxCommandEvent(type, winid), - m_pos(pt), - m_origin(GuessOrigin(origin)) - { } - wxHelpEvent(const wxHelpEvent& event) - : wxCommandEvent(event), - m_pos(event.m_pos), - m_target(event.m_target), - m_link(event.m_link), - m_origin(event.m_origin) - { } - - // Position of event (in screen coordinates) - const wxPoint& GetPosition() const { return m_pos; } - void SetPosition(const wxPoint& pos) { m_pos = pos; } - - // Optional link to further help - const wxString& GetLink() const { return m_link; } - void SetLink(const wxString& link) { m_link = link; } - - // Optional target to display help in. E.g. a window specification - const wxString& GetTarget() const { return m_target; } - void SetTarget(const wxString& target) { m_target = target; } - - virtual wxEvent *Clone() const { return new wxHelpEvent(*this); } - - // optional indication of the event source - Origin GetOrigin() const { return m_origin; } - void SetOrigin(Origin origin) { m_origin = origin; } - -protected: - wxPoint m_pos; - wxString m_target; - wxString m_link; - Origin m_origin; - - // we can try to guess the event origin ourselves, even if none is - // specified in the ctor - static Origin GuessOrigin(Origin origin); - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHelpEvent) -}; - -// A Clipboard Text event is sent when a window intercepts text copy/cut/paste -// message, i.e. the user has cut/copied/pasted data from/into a text control -// via ctrl-C/X/V, ctrl/shift-del/insert, a popup menu command, etc. -// NOTE : under windows these events are *NOT* generated automatically -// for a Rich Edit text control. -/* -wxEVT_TEXT_COPY -wxEVT_TEXT_CUT -wxEVT_TEXT_PASTE -*/ - -class WXDLLIMPEXP_CORE wxClipboardTextEvent : public wxCommandEvent -{ -public: - wxClipboardTextEvent(wxEventType type = wxEVT_NULL, - wxWindowID winid = 0) - : wxCommandEvent(type, winid) - { } - wxClipboardTextEvent(const wxClipboardTextEvent& event) - : wxCommandEvent(event) - { } - - virtual wxEvent *Clone() const { return new wxClipboardTextEvent(*this); } - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxClipboardTextEvent) -}; - -// A Context event is sent when the user right clicks on a window or -// presses Shift-F10 -// NOTE : Under windows this is a repackaged WM_CONTETXMENU message -// Under other systems it may have to be generated from a right click event -/* - wxEVT_CONTEXT_MENU -*/ - -class WXDLLIMPEXP_CORE wxContextMenuEvent : public wxCommandEvent -{ -public: - wxContextMenuEvent(wxEventType type = wxEVT_NULL, - wxWindowID winid = 0, - const wxPoint& pt = wxDefaultPosition) - : wxCommandEvent(type, winid), - m_pos(pt) - { } - wxContextMenuEvent(const wxContextMenuEvent& event) - : wxCommandEvent(event), - m_pos(event.m_pos) - { } - - // Position of event (in screen coordinates) - const wxPoint& GetPosition() const { return m_pos; } - void SetPosition(const wxPoint& pos) { m_pos = pos; } - - virtual wxEvent *Clone() const { return new wxContextMenuEvent(*this); } - -protected: - wxPoint m_pos; - -private: - DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxContextMenuEvent) -}; - - -/* TODO - wxEVT_MOUSE_CAPTURE_CHANGED, - wxEVT_SETTING_CHANGED, // WM_WININICHANGE (NT) / WM_SETTINGCHANGE (Win95) -// wxEVT_FONT_CHANGED, // WM_FONTCHANGE: roll into wxEVT_SETTING_CHANGED, but remember to propagate - // wxEVT_FONT_CHANGED to all other windows (maybe). - wxEVT_DRAW_ITEM, // Leave these three as virtual functions in wxControl?? Platform-specific. - wxEVT_MEASURE_ITEM, - wxEVT_COMPARE_ITEM -*/ - -#endif // wxUSE_GUI - - -// ============================================================================ -// event handler and related classes -// ============================================================================ - - -// struct containing the members common to static and dynamic event tables -// entries -struct WXDLLIMPEXP_BASE wxEventTableEntryBase -{ - wxEventTableEntryBase(int winid, int idLast, - wxEventFunctor* fn, wxObject *data) - : m_id(winid), - m_lastId(idLast), - m_fn(fn), - m_callbackUserData(data) - { - wxASSERT_MSG( idLast == wxID_ANY || winid <= idLast, - "invalid IDs range: lower bound > upper bound" ); - } - - wxEventTableEntryBase( const wxEventTableEntryBase &entry ) - : m_id( entry.m_id ), - m_lastId( entry.m_lastId ), - m_fn( entry.m_fn ), - m_callbackUserData( entry.m_callbackUserData ) - { - // This is a 'hack' to ensure that only one instance tries to delete - // the functor pointer. It is safe as long as the only place where the - // copy constructor is being called is when the static event tables are - // being initialized (a temporary instance is created and then this - // constructor is called). - - const_cast( entry ).m_fn = NULL; - } - - ~wxEventTableEntryBase() - { - delete m_fn; - } - - // the range of ids for this entry: if m_lastId == wxID_ANY, the range - // consists only of m_id, otherwise it is m_id..m_lastId inclusive - int m_id, - m_lastId; - - // function/method/functor to call - wxEventFunctor* m_fn; - - // arbitrary user data associated with the callback - wxObject* m_callbackUserData; - -private: - wxDECLARE_NO_ASSIGN_CLASS(wxEventTableEntryBase); -}; - -// an entry from a static event table -struct WXDLLIMPEXP_BASE wxEventTableEntry : public wxEventTableEntryBase -{ - wxEventTableEntry(const int& evType, int winid, int idLast, - wxEventFunctor* fn, wxObject *data) - : wxEventTableEntryBase(winid, idLast, fn, data), - m_eventType(evType) - { } - - // the reference to event type: this allows us to not care about the - // (undefined) order in which the event table entries and the event types - // are initialized: initially the value of this reference might be - // invalid, but by the time it is used for the first time, all global - // objects will have been initialized (including the event type constants) - // and so it will have the correct value when it is needed - const int& m_eventType; - -private: - wxDECLARE_NO_ASSIGN_CLASS(wxEventTableEntry); -}; - -// an entry used in dynamic event table managed by wxEvtHandler::Connect() -struct WXDLLIMPEXP_BASE wxDynamicEventTableEntry : public wxEventTableEntryBase -{ - wxDynamicEventTableEntry(int evType, int winid, int idLast, - wxEventFunctor* fn, wxObject *data) - : wxEventTableEntryBase(winid, idLast, fn, data), - m_eventType(evType) - { } - - // not a reference here as we can't keep a reference to a temporary int - // created to wrap the constant value typically passed to Connect() - nor - // do we need it - int m_eventType; - -private: - wxDECLARE_NO_ASSIGN_CLASS(wxDynamicEventTableEntry); -}; - -// ---------------------------------------------------------------------------- -// wxEventTable: an array of event entries terminated with {0, 0, 0, 0, 0} -// ---------------------------------------------------------------------------- - -struct WXDLLIMPEXP_BASE wxEventTable -{ - const wxEventTable *baseTable; // base event table (next in chain) - const wxEventTableEntry *entries; // bottom of entry array -}; - -// ---------------------------------------------------------------------------- -// wxEventHashTable: a helper of wxEvtHandler to speed up wxEventTable lookups. -// ---------------------------------------------------------------------------- - -WX_DEFINE_ARRAY_PTR(const wxEventTableEntry*, wxEventTableEntryPointerArray); - -class WXDLLIMPEXP_BASE wxEventHashTable -{ -private: - // Internal data structs - struct EventTypeTable - { - wxEventType eventType; - wxEventTableEntryPointerArray eventEntryTable; - }; - typedef EventTypeTable* EventTypeTablePointer; - -public: - // Constructor, needs the event table it needs to hash later on. - // Note: hashing of the event table is not done in the constructor as it - // can be that the event table is not yet full initialize, the hash - // will gets initialized when handling the first event look-up request. - wxEventHashTable(const wxEventTable &table); - // Destructor. - ~wxEventHashTable(); - - // Handle the given event, in other words search the event table hash - // and call self->ProcessEvent() if a match was found. - bool HandleEvent(wxEvent& event, wxEvtHandler *self); - - // Clear table - void Clear(); - -#if wxUSE_MEMORY_TRACING - // Clear all tables: only used to work around problems in memory tracing - // code - static void ClearAll(); -#endif // wxUSE_MEMORY_TRACING - -protected: - // Init the hash table with the entries of the static event table. - void InitHashTable(); - // Helper function of InitHashTable() to insert 1 entry into the hash table. - void AddEntry(const wxEventTableEntry &entry); - // Allocate and init with null pointers the base hash table. - void AllocEventTypeTable(size_t size); - // Grow the hash table in size and transfer all items currently - // in the table to the correct location in the new table. - void GrowEventTypeTable(); - -protected: - const wxEventTable &m_table; - bool m_rebuildHash; - - size_t m_size; - EventTypeTablePointer *m_eventTypeTable; - - static wxEventHashTable* sm_first; - wxEventHashTable* m_previous; - wxEventHashTable* m_next; - - wxDECLARE_NO_COPY_CLASS(wxEventHashTable); -}; - -// ---------------------------------------------------------------------------- -// wxEvtHandler: the base class for all objects handling wxWidgets events -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_BASE wxEvtHandler : public wxObject - , public wxTrackable -{ -public: - wxEvtHandler(); - virtual ~wxEvtHandler(); - - - // Event handler chain - // ------------------- - - wxEvtHandler *GetNextHandler() const { return m_nextHandler; } - wxEvtHandler *GetPreviousHandler() const { return m_previousHandler; } - virtual void SetNextHandler(wxEvtHandler *handler) { m_nextHandler = handler; } - virtual void SetPreviousHandler(wxEvtHandler *handler) { m_previousHandler = handler; } - - void SetEvtHandlerEnabled(bool enabled) { m_enabled = enabled; } - bool GetEvtHandlerEnabled() const { return m_enabled; } - - void Unlink(); - bool IsUnlinked() const; - - - // Global event filters - // -------------------- - - // Add an event filter whose FilterEvent() method will be called for each - // and every event processed by wxWidgets. The filters are called in LIFO - // order and wxApp is registered as an event filter by default. The pointer - // must remain valid until it's removed with RemoveFilter() and is not - // deleted by wxEvtHandler. - static void AddFilter(wxEventFilter* filter); - - // Remove a filter previously installed with AddFilter(). - static void RemoveFilter(wxEventFilter* filter); - - - // Event queuing and processing - // ---------------------------- - - // Process an event right now: this can only be called from the main - // thread, use QueueEvent() for scheduling the events for - // processing from other threads. - virtual bool ProcessEvent(wxEvent& event); - - // Process an event by calling ProcessEvent and handling any exceptions - // thrown by event handlers. It's mostly useful when processing wx events - // when called from C code (e.g. in GTK+ callback) when the exception - // wouldn't correctly propagate to wxEventLoop. - bool SafelyProcessEvent(wxEvent& event); - // NOTE: uses ProcessEvent() - - // This method tries to process the event in this event handler, including - // any preprocessing done by TryBefore() and all the handlers chained to - // it, but excluding the post-processing done in TryAfter(). - // - // It is meant to be called from ProcessEvent() only and is not virtual, - // additional event handlers can be hooked into the normal event processing - // logic using TryBefore() and TryAfter() hooks. - // - // You can also call it yourself to forward an event to another handler but - // without propagating it upwards if it's unhandled (this is usually - // unwanted when forwarding as the original handler would already do it if - // needed normally). - bool ProcessEventLocally(wxEvent& event); - - // Schedule the given event to be processed later. It takes ownership of - // the event pointer, i.e. it will be deleted later. This is safe to call - // from multiple threads although you still need to ensure that wxString - // fields of the event object are deep copies and not use the same string - // buffer as other wxString objects in this thread. - virtual void QueueEvent(wxEvent *event); - - // Add an event to be processed later: notice that this function is not - // safe to call from threads other than main, use QueueEvent() - virtual void AddPendingEvent(const wxEvent& event) - { - // notice that the thread-safety problem comes from the fact that - // Clone() doesn't make deep copies of wxString fields of wxEvent - // object and so the same wxString could be used from both threads when - // the event object is destroyed in this one -- QueueEvent() avoids - // this problem as the event pointer is not used any more in this - // thread at all after it is called. - QueueEvent(event.Clone()); - } - - void ProcessPendingEvents(); - // NOTE: uses ProcessEvent() - - void DeletePendingEvents(); - -#if wxUSE_THREADS - bool ProcessThreadEvent(const wxEvent& event); - // NOTE: uses AddPendingEvent(); call only from secondary threads -#endif - -#ifdef wxHAS_CALL_AFTER - // Asynchronous method calls: these methods schedule the given method - // pointer for a later call (during the next idle event loop iteration). - // - // Notice that the method is called on this object itself, so the object - // CallAfter() is called on must have the correct dynamic type. - // - // These method can be used from another thread. - - template - void CallAfter(void (T::*method)()) - { - QueueEvent( - new wxAsyncMethodCallEvent0(static_cast(this), method) - ); - } - - // Notice that we use P1 and not T1 for the parameter to allow passing - // parameters that are convertible to the type taken by the method - // instead of being exactly the same, to be closer to the usual method call - // semantics. - template - void CallAfter(void (T::*method)(T1 x1), P1 x1) - { - QueueEvent( - new wxAsyncMethodCallEvent1( - static_cast(this), method, x1) - ); - } - - template - void CallAfter(void (T::*method)(T1 x1, T2 x2), P1 x1, P2 x2) - { - QueueEvent( - new wxAsyncMethodCallEvent2( - static_cast(this), method, x1, x2) - ); - } - - template - void CallAfter(const T& fn) - { - QueueEvent(new wxAsyncMethodCallEventFunctor(this, fn)); - } -#endif // wxHAS_CALL_AFTER - - - // Connecting and disconnecting - // ---------------------------- - - // These functions are used for old, untyped, event handlers and don't - // check that the type of the function passed to them actually matches the - // type of the event. They also only allow connecting events to methods of - // wxEvtHandler-derived classes. - // - // The template Connect() methods below are safer and allow connecting - // events to arbitrary functions or functors -- but require compiler - // support for templates. - - // Dynamic association of a member function handler with the event handler, - // winid and event type - void Connect(int winid, - int lastId, - wxEventType eventType, - wxObjectEventFunction func, - wxObject *userData = NULL, - wxEvtHandler *eventSink = NULL) - { - DoBind(winid, lastId, eventType, - wxNewEventFunctor(eventType, func, eventSink), - userData); - } - - // Convenience function: take just one id - void Connect(int winid, - wxEventType eventType, - wxObjectEventFunction func, - wxObject *userData = NULL, - wxEvtHandler *eventSink = NULL) - { Connect(winid, wxID_ANY, eventType, func, userData, eventSink); } - - // Even more convenient: without id (same as using id of wxID_ANY) - void Connect(wxEventType eventType, - wxObjectEventFunction func, - wxObject *userData = NULL, - wxEvtHandler *eventSink = NULL) - { Connect(wxID_ANY, wxID_ANY, eventType, func, userData, eventSink); } - - bool Disconnect(int winid, - int lastId, - wxEventType eventType, - wxObjectEventFunction func = NULL, - wxObject *userData = NULL, - wxEvtHandler *eventSink = NULL) - { - return DoUnbind(winid, lastId, eventType, - wxMakeEventFunctor(eventType, func, eventSink), - userData ); - } - - bool Disconnect(int winid = wxID_ANY, - wxEventType eventType = wxEVT_NULL, - wxObjectEventFunction func = NULL, - wxObject *userData = NULL, - wxEvtHandler *eventSink = NULL) - { return Disconnect(winid, wxID_ANY, eventType, func, userData, eventSink); } - - bool Disconnect(wxEventType eventType, - wxObjectEventFunction func, - wxObject *userData = NULL, - wxEvtHandler *eventSink = NULL) - { return Disconnect(wxID_ANY, eventType, func, userData, eventSink); } - -#ifdef wxHAS_EVENT_BIND - // Bind functions to an event: - template - void Bind(const EventTag& eventType, - void (*function)(EventArg &), - int winid = wxID_ANY, - int lastId = wxID_ANY, - wxObject *userData = NULL) - { - DoBind(winid, lastId, eventType, - wxNewEventFunctor(eventType, function), - userData); - } - - - template - bool Unbind(const EventTag& eventType, - void (*function)(EventArg &), - int winid = wxID_ANY, - int lastId = wxID_ANY, - wxObject *userData = NULL) - { - return DoUnbind(winid, lastId, eventType, - wxMakeEventFunctor(eventType, function), - userData); - } - - // Bind functors to an event: - template - void Bind(const EventTag& eventType, - const Functor &functor, - int winid = wxID_ANY, - int lastId = wxID_ANY, - wxObject *userData = NULL) - { - DoBind(winid, lastId, eventType, - wxNewEventFunctor(eventType, functor), - userData); - } - - - template - bool Unbind(const EventTag& eventType, - const Functor &functor, - int winid = wxID_ANY, - int lastId = wxID_ANY, - wxObject *userData = NULL) - { - return DoUnbind(winid, lastId, eventType, - wxMakeEventFunctor(eventType, functor), - userData); - } - - - // Bind a method of a class (called on the specified handler which must - // be convertible to this class) object to an event: - - template - void Bind(const EventTag &eventType, - void (Class::*method)(EventArg &), - EventHandler *handler, - int winid = wxID_ANY, - int lastId = wxID_ANY, - wxObject *userData = NULL) - { - DoBind(winid, lastId, eventType, - wxNewEventFunctor(eventType, method, handler), - userData); - } - - template - bool Unbind(const EventTag &eventType, - void (Class::*method)(EventArg&), - EventHandler *handler, - int winid = wxID_ANY, - int lastId = wxID_ANY, - wxObject *userData = NULL ) - { - return DoUnbind(winid, lastId, eventType, - wxMakeEventFunctor(eventType, method, handler), - userData); - } -#endif // wxHAS_EVENT_BIND - - wxList* GetDynamicEventTable() const { return m_dynamicEvents ; } - - // User data can be associated with each wxEvtHandler - void SetClientObject( wxClientData *data ) { DoSetClientObject(data); } - wxClientData *GetClientObject() const { return DoGetClientObject(); } - - void SetClientData( void *data ) { DoSetClientData(data); } - void *GetClientData() const { return DoGetClientData(); } - - - // implementation from now on - // -------------------------- - - // check if the given event table entry matches this event by id (the check - // for the event type should be done by caller) and call the handler if it - // does - // - // return true if the event was processed, false otherwise (no match or the - // handler decided to skip the event) - static bool ProcessEventIfMatchesId(const wxEventTableEntryBase& tableEntry, - wxEvtHandler *handler, - wxEvent& event); - - virtual bool SearchEventTable(wxEventTable& table, wxEvent& event); - bool SearchDynamicEventTable( wxEvent& event ); - - // Avoid problems at exit by cleaning up static hash table gracefully - void ClearEventHashTable() { GetEventHashTable().Clear(); } - void OnSinkDestroyed( wxEvtHandler *sink ); - - -private: - void DoBind(int winid, - int lastId, - wxEventType eventType, - wxEventFunctor *func, - wxObject* userData = NULL); - - bool DoUnbind(int winid, - int lastId, - wxEventType eventType, - const wxEventFunctor& func, - wxObject *userData = NULL); - - static const wxEventTableEntry sm_eventTableEntries[]; - -protected: - // hooks for wxWindow used by ProcessEvent() - // ----------------------------------------- - - // this one is called before trying our own event table to allow plugging - // in the event handlers overriding the default logic, this is used by e.g. - // validators. - virtual bool TryBefore(wxEvent& event); - - // This one is not a hook but just a helper which looks up the handler in - // this object itself. - // - // It is called from ProcessEventLocally() and normally shouldn't be called - // directly as doing it would ignore any chained event handlers - bool TryHereOnly(wxEvent& event); - - // Another helper which simply calls pre-processing hook and then tries to - // handle the event at this handler level. - bool TryBeforeAndHere(wxEvent& event) - { - return TryBefore(event) || TryHereOnly(event); - } - - // this one is called after failing to find the event handle in our own - // table to give a chance to the other windows to process it - // - // base class implementation passes the event to wxTheApp - virtual bool TryAfter(wxEvent& event); - -#if WXWIN_COMPATIBILITY_2_8 - // deprecated method: override TryBefore() instead of this one - wxDEPRECATED_BUT_USED_INTERNALLY_INLINE( - virtual bool TryValidator(wxEvent& WXUNUSED(event)), return false; ) - - wxDEPRECATED_BUT_USED_INTERNALLY_INLINE( - virtual bool TryParent(wxEvent& event), return DoTryApp(event); ) -#endif // WXWIN_COMPATIBILITY_2_8 - - - static const wxEventTable sm_eventTable; - virtual const wxEventTable *GetEventTable() const; - - static wxEventHashTable sm_eventHashTable; - virtual wxEventHashTable& GetEventHashTable() const; - - wxEvtHandler* m_nextHandler; - wxEvtHandler* m_previousHandler; - wxList* m_dynamicEvents; - wxList* m_pendingEvents; - -#if wxUSE_THREADS - // critical section protecting m_pendingEvents - wxCriticalSection m_pendingEventsLock; -#endif // wxUSE_THREADS - - // Is event handler enabled? - bool m_enabled; - - - // The user data: either an object which will be deleted by the container - // when it's deleted or some raw pointer which we do nothing with - only - // one type of data can be used with the given window (i.e. you cannot set - // the void data and then associate the container with wxClientData or vice - // versa) - union - { - wxClientData *m_clientObject; - void *m_clientData; - }; - - // what kind of data do we have? - wxClientDataType m_clientDataType; - - // client data accessors - virtual void DoSetClientObject( wxClientData *data ); - virtual wxClientData *DoGetClientObject() const; - - virtual void DoSetClientData( void *data ); - virtual void *DoGetClientData() const; - - // Search tracker objects for event connection with this sink - wxEventConnectionRef *FindRefInTrackerList(wxEvtHandler *handler); - -private: - // pass the event to wxTheApp instance, called from TryAfter() - bool DoTryApp(wxEvent& event); - - // try to process events in all handlers chained to this one - bool DoTryChain(wxEvent& event); - - // Head of the event filter linked list. - static wxEventFilter* ms_filterList; - - DECLARE_DYNAMIC_CLASS_NO_COPY(wxEvtHandler) -}; - -WX_DEFINE_ARRAY_WITH_DECL_PTR(wxEvtHandler *, wxEvtHandlerArray, class WXDLLIMPEXP_BASE); - - -// Define an inline method of wxObjectEventFunctor which couldn't be defined -// before wxEvtHandler declaration: at least Sun CC refuses to compile function -// calls through pointer to member for forward-declared classes (see #12452). -inline void wxObjectEventFunctor::operator()(wxEvtHandler *handler, wxEvent& event) -{ - wxEvtHandler * const realHandler = m_handler ? m_handler : handler; - - (realHandler->*m_method)(event); -} - -// ---------------------------------------------------------------------------- -// wxEventConnectionRef represents all connections between two event handlers -// and enables automatic disconnect when an event handler sink goes out of -// scope. Each connection/disconnect increases/decreases ref count, and -// when it reaches zero the node goes out of scope. -// ---------------------------------------------------------------------------- - -class wxEventConnectionRef : public wxTrackerNode -{ -public: - wxEventConnectionRef() : m_src(NULL), m_sink(NULL), m_refCount(0) { } - wxEventConnectionRef(wxEvtHandler *src, wxEvtHandler *sink) - : m_src(src), m_sink(sink), m_refCount(1) - { - m_sink->AddNode(this); - } - - // The sink is being destroyed - virtual void OnObjectDestroy( ) - { - if ( m_src ) - m_src->OnSinkDestroyed( m_sink ); - delete this; - } - - virtual wxEventConnectionRef *ToEventConnection() { return this; } - - void IncRef() { m_refCount++; } - void DecRef() - { - if ( !--m_refCount ) - { - // The sink holds the only external pointer to this object - if ( m_sink ) - m_sink->RemoveNode(this); - delete this; - } - } - -private: - wxEvtHandler *m_src, - *m_sink; - int m_refCount; - - friend class wxEvtHandler; - - wxDECLARE_NO_ASSIGN_CLASS(wxEventConnectionRef); -}; - -// Post a message to the given event handler which will be processed during the -// next event loop iteration. -// -// Notice that this one is not thread-safe, use wxQueueEvent() -inline void wxPostEvent(wxEvtHandler *dest, const wxEvent& event) -{ - wxCHECK_RET( dest, "need an object to post event to" ); - - dest->AddPendingEvent(event); -} - -// Wrapper around wxEvtHandler::QueueEvent(): adds an event for later -// processing, unlike wxPostEvent it is safe to use from different thread even -// for events with wxString members -inline void wxQueueEvent(wxEvtHandler *dest, wxEvent *event) -{ - wxCHECK_RET( dest, "need an object to queue event for" ); - - dest->QueueEvent(event); -} - -typedef void (wxEvtHandler::*wxEventFunction)(wxEvent&); -typedef void (wxEvtHandler::*wxIdleEventFunction)(wxIdleEvent&); -typedef void (wxEvtHandler::*wxThreadEventFunction)(wxThreadEvent&); - -#define wxEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxEventFunction, func) -#define wxIdleEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxIdleEventFunction, func) -#define wxThreadEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxThreadEventFunction, func) - -#if wxUSE_GUI - -// ---------------------------------------------------------------------------- -// wxEventBlocker: helper class to temporarily disable event handling for a window -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxEventBlocker : public wxEvtHandler -{ -public: - wxEventBlocker(wxWindow *win, wxEventType type = wxEVT_ANY); - virtual ~wxEventBlocker(); - - void Block(wxEventType type) - { - m_eventsToBlock.push_back(type); - } - - virtual bool ProcessEvent(wxEvent& event); - -protected: - wxArrayInt m_eventsToBlock; - wxWindow *m_window; - - wxDECLARE_NO_COPY_CLASS(wxEventBlocker); -}; - -typedef void (wxEvtHandler::*wxCommandEventFunction)(wxCommandEvent&); -typedef void (wxEvtHandler::*wxScrollEventFunction)(wxScrollEvent&); -typedef void (wxEvtHandler::*wxScrollWinEventFunction)(wxScrollWinEvent&); -typedef void (wxEvtHandler::*wxSizeEventFunction)(wxSizeEvent&); -typedef void (wxEvtHandler::*wxMoveEventFunction)(wxMoveEvent&); -typedef void (wxEvtHandler::*wxPaintEventFunction)(wxPaintEvent&); -typedef void (wxEvtHandler::*wxNcPaintEventFunction)(wxNcPaintEvent&); -typedef void (wxEvtHandler::*wxEraseEventFunction)(wxEraseEvent&); -typedef void (wxEvtHandler::*wxMouseEventFunction)(wxMouseEvent&); -typedef void (wxEvtHandler::*wxCharEventFunction)(wxKeyEvent&); -typedef void (wxEvtHandler::*wxFocusEventFunction)(wxFocusEvent&); -typedef void (wxEvtHandler::*wxChildFocusEventFunction)(wxChildFocusEvent&); -typedef void (wxEvtHandler::*wxActivateEventFunction)(wxActivateEvent&); -typedef void (wxEvtHandler::*wxMenuEventFunction)(wxMenuEvent&); -typedef void (wxEvtHandler::*wxJoystickEventFunction)(wxJoystickEvent&); -typedef void (wxEvtHandler::*wxDropFilesEventFunction)(wxDropFilesEvent&); -typedef void (wxEvtHandler::*wxInitDialogEventFunction)(wxInitDialogEvent&); -typedef void (wxEvtHandler::*wxSysColourChangedEventFunction)(wxSysColourChangedEvent&); -typedef void (wxEvtHandler::*wxDisplayChangedEventFunction)(wxDisplayChangedEvent&); -typedef void (wxEvtHandler::*wxUpdateUIEventFunction)(wxUpdateUIEvent&); -typedef void (wxEvtHandler::*wxCloseEventFunction)(wxCloseEvent&); -typedef void (wxEvtHandler::*wxShowEventFunction)(wxShowEvent&); -typedef void (wxEvtHandler::*wxIconizeEventFunction)(wxIconizeEvent&); -typedef void (wxEvtHandler::*wxMaximizeEventFunction)(wxMaximizeEvent&); -typedef void (wxEvtHandler::*wxNavigationKeyEventFunction)(wxNavigationKeyEvent&); -typedef void (wxEvtHandler::*wxPaletteChangedEventFunction)(wxPaletteChangedEvent&); -typedef void (wxEvtHandler::*wxQueryNewPaletteEventFunction)(wxQueryNewPaletteEvent&); -typedef void (wxEvtHandler::*wxWindowCreateEventFunction)(wxWindowCreateEvent&); -typedef void (wxEvtHandler::*wxWindowDestroyEventFunction)(wxWindowDestroyEvent&); -typedef void (wxEvtHandler::*wxSetCursorEventFunction)(wxSetCursorEvent&); -typedef void (wxEvtHandler::*wxNotifyEventFunction)(wxNotifyEvent&); -typedef void (wxEvtHandler::*wxHelpEventFunction)(wxHelpEvent&); -typedef void (wxEvtHandler::*wxContextMenuEventFunction)(wxContextMenuEvent&); -typedef void (wxEvtHandler::*wxMouseCaptureChangedEventFunction)(wxMouseCaptureChangedEvent&); -typedef void (wxEvtHandler::*wxMouseCaptureLostEventFunction)(wxMouseCaptureLostEvent&); -typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&); - - -#define wxCommandEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxCommandEventFunction, func) -#define wxScrollEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxScrollEventFunction, func) -#define wxScrollWinEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxScrollWinEventFunction, func) -#define wxSizeEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxSizeEventFunction, func) -#define wxMoveEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxMoveEventFunction, func) -#define wxPaintEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxPaintEventFunction, func) -#define wxNcPaintEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxNcPaintEventFunction, func) -#define wxEraseEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxEraseEventFunction, func) -#define wxMouseEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxMouseEventFunction, func) -#define wxCharEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxCharEventFunction, func) -#define wxKeyEventHandler(func) wxCharEventHandler(func) -#define wxFocusEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxFocusEventFunction, func) -#define wxChildFocusEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxChildFocusEventFunction, func) -#define wxActivateEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxActivateEventFunction, func) -#define wxMenuEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxMenuEventFunction, func) -#define wxJoystickEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxJoystickEventFunction, func) -#define wxDropFilesEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxDropFilesEventFunction, func) -#define wxInitDialogEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxInitDialogEventFunction, func) -#define wxSysColourChangedEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxSysColourChangedEventFunction, func) -#define wxDisplayChangedEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxDisplayChangedEventFunction, func) -#define wxUpdateUIEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxUpdateUIEventFunction, func) -#define wxCloseEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxCloseEventFunction, func) -#define wxShowEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxShowEventFunction, func) -#define wxIconizeEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxIconizeEventFunction, func) -#define wxMaximizeEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxMaximizeEventFunction, func) -#define wxNavigationKeyEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxNavigationKeyEventFunction, func) -#define wxPaletteChangedEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxPaletteChangedEventFunction, func) -#define wxQueryNewPaletteEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxQueryNewPaletteEventFunction, func) -#define wxWindowCreateEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxWindowCreateEventFunction, func) -#define wxWindowDestroyEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxWindowDestroyEventFunction, func) -#define wxSetCursorEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxSetCursorEventFunction, func) -#define wxNotifyEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxNotifyEventFunction, func) -#define wxHelpEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxHelpEventFunction, func) -#define wxContextMenuEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxContextMenuEventFunction, func) -#define wxMouseCaptureChangedEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxMouseCaptureChangedEventFunction, func) -#define wxMouseCaptureLostEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxMouseCaptureLostEventFunction, func) -#define wxClipboardTextEventHandler(func) \ - wxEVENT_HANDLER_CAST(wxClipboardTextEventFunction, func) - -#endif // wxUSE_GUI - -// N.B. In GNU-WIN32, you *have* to take the address of a member function -// (use &) or the compiler crashes... - -#define wxDECLARE_EVENT_TABLE() \ - private: \ - static const wxEventTableEntry sm_eventTableEntries[]; \ - protected: \ - static const wxEventTable sm_eventTable; \ - virtual const wxEventTable* GetEventTable() const; \ - static wxEventHashTable sm_eventHashTable; \ - virtual wxEventHashTable& GetEventHashTable() const - -// N.B.: when building DLL with Borland C++ 5.5 compiler, you must initialize -// sm_eventTable before using it in GetEventTable() or the compiler gives -// E2233 (see http://groups.google.com/groups?selm=397dcc8a%241_2%40dnews) - -#define wxBEGIN_EVENT_TABLE(theClass, baseClass) \ - const wxEventTable theClass::sm_eventTable = \ - { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \ - const wxEventTable *theClass::GetEventTable() const \ - { return &theClass::sm_eventTable; } \ - wxEventHashTable theClass::sm_eventHashTable(theClass::sm_eventTable); \ - wxEventHashTable &theClass::GetEventHashTable() const \ - { return theClass::sm_eventHashTable; } \ - const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ - -#define wxBEGIN_EVENT_TABLE_TEMPLATE1(theClass, baseClass, T1) \ - template \ - const wxEventTable theClass::sm_eventTable = \ - { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \ - template \ - const wxEventTable *theClass::GetEventTable() const \ - { return &theClass::sm_eventTable; } \ - template \ - wxEventHashTable theClass::sm_eventHashTable(theClass::sm_eventTable); \ - template \ - wxEventHashTable &theClass::GetEventHashTable() const \ - { return theClass::sm_eventHashTable; } \ - template \ - const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ - -#define wxBEGIN_EVENT_TABLE_TEMPLATE2(theClass, baseClass, T1, T2) \ - template \ - const wxEventTable theClass::sm_eventTable = \ - { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \ - template \ - const wxEventTable *theClass::GetEventTable() const \ - { return &theClass::sm_eventTable; } \ - template \ - wxEventHashTable theClass::sm_eventHashTable(theClass::sm_eventTable); \ - template \ - wxEventHashTable &theClass::GetEventHashTable() const \ - { return theClass::sm_eventHashTable; } \ - template \ - const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ - -#define wxBEGIN_EVENT_TABLE_TEMPLATE3(theClass, baseClass, T1, T2, T3) \ - template \ - const wxEventTable theClass::sm_eventTable = \ - { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \ - template \ - const wxEventTable *theClass::GetEventTable() const \ - { return &theClass::sm_eventTable; } \ - template \ - wxEventHashTable theClass::sm_eventHashTable(theClass::sm_eventTable); \ - template \ - wxEventHashTable &theClass::GetEventHashTable() const \ - { return theClass::sm_eventHashTable; } \ - template \ - const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ - -#define wxBEGIN_EVENT_TABLE_TEMPLATE4(theClass, baseClass, T1, T2, T3, T4) \ - template \ - const wxEventTable theClass::sm_eventTable = \ - { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \ - template \ - const wxEventTable *theClass::GetEventTable() const \ - { return &theClass::sm_eventTable; } \ - template \ - wxEventHashTable theClass::sm_eventHashTable(theClass::sm_eventTable); \ - template \ - wxEventHashTable &theClass::GetEventHashTable() const \ - { return theClass::sm_eventHashTable; } \ - template \ - const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ - -#define wxBEGIN_EVENT_TABLE_TEMPLATE5(theClass, baseClass, T1, T2, T3, T4, T5) \ - template \ - const wxEventTable theClass::sm_eventTable = \ - { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \ - template \ - const wxEventTable *theClass::GetEventTable() const \ - { return &theClass::sm_eventTable; } \ - template \ - wxEventHashTable theClass::sm_eventHashTable(theClass::sm_eventTable); \ - template \ - wxEventHashTable &theClass::GetEventHashTable() const \ - { return theClass::sm_eventHashTable; } \ - template \ - const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ - -#define wxBEGIN_EVENT_TABLE_TEMPLATE7(theClass, baseClass, T1, T2, T3, T4, T5, T6, T7) \ - template \ - const wxEventTable theClass::sm_eventTable = \ - { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \ - template \ - const wxEventTable *theClass::GetEventTable() const \ - { return &theClass::sm_eventTable; } \ - template \ - wxEventHashTable theClass::sm_eventHashTable(theClass::sm_eventTable); \ - template \ - wxEventHashTable &theClass::GetEventHashTable() const \ - { return theClass::sm_eventHashTable; } \ - template \ - const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ - -#define wxBEGIN_EVENT_TABLE_TEMPLATE8(theClass, baseClass, T1, T2, T3, T4, T5, T6, T7, T8) \ - template \ - const wxEventTable theClass::sm_eventTable = \ - { &baseClass::sm_eventTable, &theClass::sm_eventTableEntries[0] }; \ - template \ - const wxEventTable *theClass::GetEventTable() const \ - { return &theClass::sm_eventTable; } \ - template \ - wxEventHashTable theClass::sm_eventHashTable(theClass::sm_eventTable); \ - template \ - wxEventHashTable &theClass::GetEventHashTable() const \ - { return theClass::sm_eventHashTable; } \ - template \ - const wxEventTableEntry theClass::sm_eventTableEntries[] = { \ - -#define wxEND_EVENT_TABLE() \ - wxDECLARE_EVENT_TABLE_TERMINATOR() }; - -/* - * Event table macros - */ - -// helpers for writing shorter code below: declare an event macro taking 2, 1 -// or none ids (the missing ids default to wxID_ANY) -// -// macro arguments: -// - evt one of wxEVT_XXX constants -// - id1, id2 ids of the first/last id -// - fn the function (should be cast to the right type) -#define wx__DECLARE_EVT2(evt, id1, id2, fn) \ - wxDECLARE_EVENT_TABLE_ENTRY(evt, id1, id2, fn, NULL), -#define wx__DECLARE_EVT1(evt, id, fn) \ - wx__DECLARE_EVT2(evt, id, wxID_ANY, fn) -#define wx__DECLARE_EVT0(evt, fn) \ - wx__DECLARE_EVT1(evt, wxID_ANY, fn) - - -// Generic events -#define EVT_CUSTOM(event, winid, func) \ - wx__DECLARE_EVT1(event, winid, wxEventHandler(func)) -#define EVT_CUSTOM_RANGE(event, id1, id2, func) \ - wx__DECLARE_EVT2(event, id1, id2, wxEventHandler(func)) - -// EVT_COMMAND -#define EVT_COMMAND(winid, event, func) \ - wx__DECLARE_EVT1(event, winid, wxCommandEventHandler(func)) - -#define EVT_COMMAND_RANGE(id1, id2, event, func) \ - wx__DECLARE_EVT2(event, id1, id2, wxCommandEventHandler(func)) - -#define EVT_NOTIFY(event, winid, func) \ - wx__DECLARE_EVT1(event, winid, wxNotifyEventHandler(func)) - -#define EVT_NOTIFY_RANGE(event, id1, id2, func) \ - wx__DECLARE_EVT2(event, id1, id2, wxNotifyEventHandler(func)) - -// Miscellaneous -#define EVT_SIZE(func) wx__DECLARE_EVT0(wxEVT_SIZE, wxSizeEventHandler(func)) -#define EVT_SIZING(func) wx__DECLARE_EVT0(wxEVT_SIZING, wxSizeEventHandler(func)) -#define EVT_MOVE(func) wx__DECLARE_EVT0(wxEVT_MOVE, wxMoveEventHandler(func)) -#define EVT_MOVING(func) wx__DECLARE_EVT0(wxEVT_MOVING, wxMoveEventHandler(func)) -#define EVT_MOVE_START(func) wx__DECLARE_EVT0(wxEVT_MOVE_START, wxMoveEventHandler(func)) -#define EVT_MOVE_END(func) wx__DECLARE_EVT0(wxEVT_MOVE_END, wxMoveEventHandler(func)) -#define EVT_CLOSE(func) wx__DECLARE_EVT0(wxEVT_CLOSE_WINDOW, wxCloseEventHandler(func)) -#define EVT_END_SESSION(func) wx__DECLARE_EVT0(wxEVT_END_SESSION, wxCloseEventHandler(func)) -#define EVT_QUERY_END_SESSION(func) wx__DECLARE_EVT0(wxEVT_QUERY_END_SESSION, wxCloseEventHandler(func)) -#define EVT_PAINT(func) wx__DECLARE_EVT0(wxEVT_PAINT, wxPaintEventHandler(func)) -#define EVT_NC_PAINT(func) wx__DECLARE_EVT0(wxEVT_NC_PAINT, wxNcPaintEventHandler(func)) -#define EVT_ERASE_BACKGROUND(func) wx__DECLARE_EVT0(wxEVT_ERASE_BACKGROUND, wxEraseEventHandler(func)) -#define EVT_CHAR(func) wx__DECLARE_EVT0(wxEVT_CHAR, wxCharEventHandler(func)) -#define EVT_KEY_DOWN(func) wx__DECLARE_EVT0(wxEVT_KEY_DOWN, wxKeyEventHandler(func)) -#define EVT_KEY_UP(func) wx__DECLARE_EVT0(wxEVT_KEY_UP, wxKeyEventHandler(func)) -#if wxUSE_HOTKEY -#define EVT_HOTKEY(winid, func) wx__DECLARE_EVT1(wxEVT_HOTKEY, winid, wxCharEventHandler(func)) -#endif -#define EVT_CHAR_HOOK(func) wx__DECLARE_EVT0(wxEVT_CHAR_HOOK, wxCharEventHandler(func)) -#define EVT_MENU_OPEN(func) wx__DECLARE_EVT0(wxEVT_MENU_OPEN, wxMenuEventHandler(func)) -#define EVT_MENU_CLOSE(func) wx__DECLARE_EVT0(wxEVT_MENU_CLOSE, wxMenuEventHandler(func)) -#define EVT_MENU_HIGHLIGHT(winid, func) wx__DECLARE_EVT1(wxEVT_MENU_HIGHLIGHT, winid, wxMenuEventHandler(func)) -#define EVT_MENU_HIGHLIGHT_ALL(func) wx__DECLARE_EVT0(wxEVT_MENU_HIGHLIGHT, wxMenuEventHandler(func)) -#define EVT_SET_FOCUS(func) wx__DECLARE_EVT0(wxEVT_SET_FOCUS, wxFocusEventHandler(func)) -#define EVT_KILL_FOCUS(func) wx__DECLARE_EVT0(wxEVT_KILL_FOCUS, wxFocusEventHandler(func)) -#define EVT_CHILD_FOCUS(func) wx__DECLARE_EVT0(wxEVT_CHILD_FOCUS, wxChildFocusEventHandler(func)) -#define EVT_ACTIVATE(func) wx__DECLARE_EVT0(wxEVT_ACTIVATE, wxActivateEventHandler(func)) -#define EVT_ACTIVATE_APP(func) wx__DECLARE_EVT0(wxEVT_ACTIVATE_APP, wxActivateEventHandler(func)) -#define EVT_HIBERNATE(func) wx__DECLARE_EVT0(wxEVT_HIBERNATE, wxActivateEventHandler(func)) -#define EVT_END_SESSION(func) wx__DECLARE_EVT0(wxEVT_END_SESSION, wxCloseEventHandler(func)) -#define EVT_QUERY_END_SESSION(func) wx__DECLARE_EVT0(wxEVT_QUERY_END_SESSION, wxCloseEventHandler(func)) -#define EVT_DROP_FILES(func) wx__DECLARE_EVT0(wxEVT_DROP_FILES, wxDropFilesEventHandler(func)) -#define EVT_INIT_DIALOG(func) wx__DECLARE_EVT0(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(func)) -#define EVT_SYS_COLOUR_CHANGED(func) wx__DECLARE_EVT0(wxEVT_SYS_COLOUR_CHANGED, wxSysColourChangedEventHandler(func)) -#define EVT_DISPLAY_CHANGED(func) wx__DECLARE_EVT0(wxEVT_DISPLAY_CHANGED, wxDisplayChangedEventHandler(func)) -#define EVT_SHOW(func) wx__DECLARE_EVT0(wxEVT_SHOW, wxShowEventHandler(func)) -#define EVT_MAXIMIZE(func) wx__DECLARE_EVT0(wxEVT_MAXIMIZE, wxMaximizeEventHandler(func)) -#define EVT_ICONIZE(func) wx__DECLARE_EVT0(wxEVT_ICONIZE, wxIconizeEventHandler(func)) -#define EVT_NAVIGATION_KEY(func) wx__DECLARE_EVT0(wxEVT_NAVIGATION_KEY, wxNavigationKeyEventHandler(func)) -#define EVT_PALETTE_CHANGED(func) wx__DECLARE_EVT0(wxEVT_PALETTE_CHANGED, wxPaletteChangedEventHandler(func)) -#define EVT_QUERY_NEW_PALETTE(func) wx__DECLARE_EVT0(wxEVT_QUERY_NEW_PALETTE, wxQueryNewPaletteEventHandler(func)) -#define EVT_WINDOW_CREATE(func) wx__DECLARE_EVT0(wxEVT_CREATE, wxWindowCreateEventHandler(func)) -#define EVT_WINDOW_DESTROY(func) wx__DECLARE_EVT0(wxEVT_DESTROY, wxWindowDestroyEventHandler(func)) -#define EVT_SET_CURSOR(func) wx__DECLARE_EVT0(wxEVT_SET_CURSOR, wxSetCursorEventHandler(func)) -#define EVT_MOUSE_CAPTURE_CHANGED(func) wx__DECLARE_EVT0(wxEVT_MOUSE_CAPTURE_CHANGED, wxMouseCaptureChangedEventHandler(func)) -#define EVT_MOUSE_CAPTURE_LOST(func) wx__DECLARE_EVT0(wxEVT_MOUSE_CAPTURE_LOST, wxMouseCaptureLostEventHandler(func)) - -// Mouse events -#define EVT_LEFT_DOWN(func) wx__DECLARE_EVT0(wxEVT_LEFT_DOWN, wxMouseEventHandler(func)) -#define EVT_LEFT_UP(func) wx__DECLARE_EVT0(wxEVT_LEFT_UP, wxMouseEventHandler(func)) -#define EVT_MIDDLE_DOWN(func) wx__DECLARE_EVT0(wxEVT_MIDDLE_DOWN, wxMouseEventHandler(func)) -#define EVT_MIDDLE_UP(func) wx__DECLARE_EVT0(wxEVT_MIDDLE_UP, wxMouseEventHandler(func)) -#define EVT_RIGHT_DOWN(func) wx__DECLARE_EVT0(wxEVT_RIGHT_DOWN, wxMouseEventHandler(func)) -#define EVT_RIGHT_UP(func) wx__DECLARE_EVT0(wxEVT_RIGHT_UP, wxMouseEventHandler(func)) -#define EVT_MOTION(func) wx__DECLARE_EVT0(wxEVT_MOTION, wxMouseEventHandler(func)) -#define EVT_LEFT_DCLICK(func) wx__DECLARE_EVT0(wxEVT_LEFT_DCLICK, wxMouseEventHandler(func)) -#define EVT_MIDDLE_DCLICK(func) wx__DECLARE_EVT0(wxEVT_MIDDLE_DCLICK, wxMouseEventHandler(func)) -#define EVT_RIGHT_DCLICK(func) wx__DECLARE_EVT0(wxEVT_RIGHT_DCLICK, wxMouseEventHandler(func)) -#define EVT_LEAVE_WINDOW(func) wx__DECLARE_EVT0(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(func)) -#define EVT_ENTER_WINDOW(func) wx__DECLARE_EVT0(wxEVT_ENTER_WINDOW, wxMouseEventHandler(func)) -#define EVT_MOUSEWHEEL(func) wx__DECLARE_EVT0(wxEVT_MOUSEWHEEL, wxMouseEventHandler(func)) -#define EVT_MOUSE_AUX1_DOWN(func) wx__DECLARE_EVT0(wxEVT_AUX1_DOWN, wxMouseEventHandler(func)) -#define EVT_MOUSE_AUX1_UP(func) wx__DECLARE_EVT0(wxEVT_AUX1_UP, wxMouseEventHandler(func)) -#define EVT_MOUSE_AUX1_DCLICK(func) wx__DECLARE_EVT0(wxEVT_AUX1_DCLICK, wxMouseEventHandler(func)) -#define EVT_MOUSE_AUX2_DOWN(func) wx__DECLARE_EVT0(wxEVT_AUX2_DOWN, wxMouseEventHandler(func)) -#define EVT_MOUSE_AUX2_UP(func) wx__DECLARE_EVT0(wxEVT_AUX2_UP, wxMouseEventHandler(func)) -#define EVT_MOUSE_AUX2_DCLICK(func) wx__DECLARE_EVT0(wxEVT_AUX2_DCLICK, wxMouseEventHandler(func)) - -// All mouse events -#define EVT_MOUSE_EVENTS(func) \ - EVT_LEFT_DOWN(func) \ - EVT_LEFT_UP(func) \ - EVT_LEFT_DCLICK(func) \ - EVT_MIDDLE_DOWN(func) \ - EVT_MIDDLE_UP(func) \ - EVT_MIDDLE_DCLICK(func) \ - EVT_RIGHT_DOWN(func) \ - EVT_RIGHT_UP(func) \ - EVT_RIGHT_DCLICK(func) \ - EVT_MOUSE_AUX1_DOWN(func) \ - EVT_MOUSE_AUX1_UP(func) \ - EVT_MOUSE_AUX1_DCLICK(func) \ - EVT_MOUSE_AUX2_DOWN(func) \ - EVT_MOUSE_AUX2_UP(func) \ - EVT_MOUSE_AUX2_DCLICK(func) \ - EVT_MOTION(func) \ - EVT_LEAVE_WINDOW(func) \ - EVT_ENTER_WINDOW(func) \ - EVT_MOUSEWHEEL(func) - -// Scrolling from wxWindow (sent to wxScrolledWindow) -#define EVT_SCROLLWIN_TOP(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_TOP, wxScrollWinEventHandler(func)) -#define EVT_SCROLLWIN_BOTTOM(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_BOTTOM, wxScrollWinEventHandler(func)) -#define EVT_SCROLLWIN_LINEUP(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_LINEUP, wxScrollWinEventHandler(func)) -#define EVT_SCROLLWIN_LINEDOWN(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_LINEDOWN, wxScrollWinEventHandler(func)) -#define EVT_SCROLLWIN_PAGEUP(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_PAGEUP, wxScrollWinEventHandler(func)) -#define EVT_SCROLLWIN_PAGEDOWN(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_PAGEDOWN, wxScrollWinEventHandler(func)) -#define EVT_SCROLLWIN_THUMBTRACK(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_THUMBTRACK, wxScrollWinEventHandler(func)) -#define EVT_SCROLLWIN_THUMBRELEASE(func) wx__DECLARE_EVT0(wxEVT_SCROLLWIN_THUMBRELEASE, wxScrollWinEventHandler(func)) - -#define EVT_SCROLLWIN(func) \ - EVT_SCROLLWIN_TOP(func) \ - EVT_SCROLLWIN_BOTTOM(func) \ - EVT_SCROLLWIN_LINEUP(func) \ - EVT_SCROLLWIN_LINEDOWN(func) \ - EVT_SCROLLWIN_PAGEUP(func) \ - EVT_SCROLLWIN_PAGEDOWN(func) \ - EVT_SCROLLWIN_THUMBTRACK(func) \ - EVT_SCROLLWIN_THUMBRELEASE(func) - -// Scrolling from wxSlider and wxScrollBar -#define EVT_SCROLL_TOP(func) wx__DECLARE_EVT0(wxEVT_SCROLL_TOP, wxScrollEventHandler(func)) -#define EVT_SCROLL_BOTTOM(func) wx__DECLARE_EVT0(wxEVT_SCROLL_BOTTOM, wxScrollEventHandler(func)) -#define EVT_SCROLL_LINEUP(func) wx__DECLARE_EVT0(wxEVT_SCROLL_LINEUP, wxScrollEventHandler(func)) -#define EVT_SCROLL_LINEDOWN(func) wx__DECLARE_EVT0(wxEVT_SCROLL_LINEDOWN, wxScrollEventHandler(func)) -#define EVT_SCROLL_PAGEUP(func) wx__DECLARE_EVT0(wxEVT_SCROLL_PAGEUP, wxScrollEventHandler(func)) -#define EVT_SCROLL_PAGEDOWN(func) wx__DECLARE_EVT0(wxEVT_SCROLL_PAGEDOWN, wxScrollEventHandler(func)) -#define EVT_SCROLL_THUMBTRACK(func) wx__DECLARE_EVT0(wxEVT_SCROLL_THUMBTRACK, wxScrollEventHandler(func)) -#define EVT_SCROLL_THUMBRELEASE(func) wx__DECLARE_EVT0(wxEVT_SCROLL_THUMBRELEASE, wxScrollEventHandler(func)) -#define EVT_SCROLL_CHANGED(func) wx__DECLARE_EVT0(wxEVT_SCROLL_CHANGED, wxScrollEventHandler(func)) - -#define EVT_SCROLL(func) \ - EVT_SCROLL_TOP(func) \ - EVT_SCROLL_BOTTOM(func) \ - EVT_SCROLL_LINEUP(func) \ - EVT_SCROLL_LINEDOWN(func) \ - EVT_SCROLL_PAGEUP(func) \ - EVT_SCROLL_PAGEDOWN(func) \ - EVT_SCROLL_THUMBTRACK(func) \ - EVT_SCROLL_THUMBRELEASE(func) \ - EVT_SCROLL_CHANGED(func) - -// Scrolling from wxSlider and wxScrollBar, with an id -#define EVT_COMMAND_SCROLL_TOP(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_TOP, winid, wxScrollEventHandler(func)) -#define EVT_COMMAND_SCROLL_BOTTOM(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_BOTTOM, winid, wxScrollEventHandler(func)) -#define EVT_COMMAND_SCROLL_LINEUP(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_LINEUP, winid, wxScrollEventHandler(func)) -#define EVT_COMMAND_SCROLL_LINEDOWN(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_LINEDOWN, winid, wxScrollEventHandler(func)) -#define EVT_COMMAND_SCROLL_PAGEUP(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_PAGEUP, winid, wxScrollEventHandler(func)) -#define EVT_COMMAND_SCROLL_PAGEDOWN(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_PAGEDOWN, winid, wxScrollEventHandler(func)) -#define EVT_COMMAND_SCROLL_THUMBTRACK(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_THUMBTRACK, winid, wxScrollEventHandler(func)) -#define EVT_COMMAND_SCROLL_THUMBRELEASE(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_THUMBRELEASE, winid, wxScrollEventHandler(func)) -#define EVT_COMMAND_SCROLL_CHANGED(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLL_CHANGED, winid, wxScrollEventHandler(func)) - -#define EVT_COMMAND_SCROLL(winid, func) \ - EVT_COMMAND_SCROLL_TOP(winid, func) \ - EVT_COMMAND_SCROLL_BOTTOM(winid, func) \ - EVT_COMMAND_SCROLL_LINEUP(winid, func) \ - EVT_COMMAND_SCROLL_LINEDOWN(winid, func) \ - EVT_COMMAND_SCROLL_PAGEUP(winid, func) \ - EVT_COMMAND_SCROLL_PAGEDOWN(winid, func) \ - EVT_COMMAND_SCROLL_THUMBTRACK(winid, func) \ - EVT_COMMAND_SCROLL_THUMBRELEASE(winid, func) \ - EVT_COMMAND_SCROLL_CHANGED(winid, func) - -#if WXWIN_COMPATIBILITY_2_6 - // compatibility macros for the old name, deprecated in 2.8 - #define wxEVT_SCROLL_ENDSCROLL wxEVT_SCROLL_CHANGED - #define EVT_COMMAND_SCROLL_ENDSCROLL EVT_COMMAND_SCROLL_CHANGED - #define EVT_SCROLL_ENDSCROLL EVT_SCROLL_CHANGED -#endif // WXWIN_COMPATIBILITY_2_6 - -// Convenience macros for commonly-used commands -#define EVT_CHECKBOX(winid, func) wx__DECLARE_EVT1(wxEVT_CHECKBOX, winid, wxCommandEventHandler(func)) -#define EVT_CHOICE(winid, func) wx__DECLARE_EVT1(wxEVT_CHOICE, winid, wxCommandEventHandler(func)) -#define EVT_LISTBOX(winid, func) wx__DECLARE_EVT1(wxEVT_LISTBOX, winid, wxCommandEventHandler(func)) -#define EVT_LISTBOX_DCLICK(winid, func) wx__DECLARE_EVT1(wxEVT_LISTBOX_DCLICK, winid, wxCommandEventHandler(func)) -#define EVT_MENU(winid, func) wx__DECLARE_EVT1(wxEVT_MENU, winid, wxCommandEventHandler(func)) -#define EVT_MENU_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_MENU, id1, id2, wxCommandEventHandler(func)) -#if defined(__SMARTPHONE__) -# define EVT_BUTTON(winid, func) EVT_MENU(winid, func) -#else -# define EVT_BUTTON(winid, func) wx__DECLARE_EVT1(wxEVT_BUTTON, winid, wxCommandEventHandler(func)) -#endif -#define EVT_SLIDER(winid, func) wx__DECLARE_EVT1(wxEVT_SLIDER, winid, wxCommandEventHandler(func)) -#define EVT_RADIOBOX(winid, func) wx__DECLARE_EVT1(wxEVT_RADIOBOX, winid, wxCommandEventHandler(func)) -#define EVT_RADIOBUTTON(winid, func) wx__DECLARE_EVT1(wxEVT_RADIOBUTTON, winid, wxCommandEventHandler(func)) -// EVT_SCROLLBAR is now obsolete since we use EVT_COMMAND_SCROLL... events -#define EVT_SCROLLBAR(winid, func) wx__DECLARE_EVT1(wxEVT_SCROLLBAR, winid, wxCommandEventHandler(func)) -#define EVT_VLBOX(winid, func) wx__DECLARE_EVT1(wxEVT_VLBOX, winid, wxCommandEventHandler(func)) -#define EVT_COMBOBOX(winid, func) wx__DECLARE_EVT1(wxEVT_COMBOBOX, winid, wxCommandEventHandler(func)) -#define EVT_TOOL(winid, func) wx__DECLARE_EVT1(wxEVT_TOOL, winid, wxCommandEventHandler(func)) -#define EVT_TOOL_DROPDOWN(winid, func) wx__DECLARE_EVT1(wxEVT_TOOL_DROPDOWN, winid, wxCommandEventHandler(func)) -#define EVT_TOOL_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_TOOL, id1, id2, wxCommandEventHandler(func)) -#define EVT_TOOL_RCLICKED(winid, func) wx__DECLARE_EVT1(wxEVT_TOOL_RCLICKED, winid, wxCommandEventHandler(func)) -#define EVT_TOOL_RCLICKED_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_TOOL_RCLICKED, id1, id2, wxCommandEventHandler(func)) -#define EVT_TOOL_ENTER(winid, func) wx__DECLARE_EVT1(wxEVT_TOOL_ENTER, winid, wxCommandEventHandler(func)) -#define EVT_CHECKLISTBOX(winid, func) wx__DECLARE_EVT1(wxEVT_CHECKLISTBOX, winid, wxCommandEventHandler(func)) -#define EVT_COMBOBOX_DROPDOWN(winid, func) wx__DECLARE_EVT1(wxEVT_COMBOBOX_DROPDOWN, winid, wxCommandEventHandler(func)) -#define EVT_COMBOBOX_CLOSEUP(winid, func) wx__DECLARE_EVT1(wxEVT_COMBOBOX_CLOSEUP, winid, wxCommandEventHandler(func)) - -// Generic command events -#define EVT_COMMAND_LEFT_CLICK(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_LEFT_CLICK, winid, wxCommandEventHandler(func)) -#define EVT_COMMAND_LEFT_DCLICK(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_LEFT_DCLICK, winid, wxCommandEventHandler(func)) -#define EVT_COMMAND_RIGHT_CLICK(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_RIGHT_CLICK, winid, wxCommandEventHandler(func)) -#define EVT_COMMAND_RIGHT_DCLICK(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_RIGHT_DCLICK, winid, wxCommandEventHandler(func)) -#define EVT_COMMAND_SET_FOCUS(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_SET_FOCUS, winid, wxCommandEventHandler(func)) -#define EVT_COMMAND_KILL_FOCUS(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_KILL_FOCUS, winid, wxCommandEventHandler(func)) -#define EVT_COMMAND_ENTER(winid, func) wx__DECLARE_EVT1(wxEVT_COMMAND_ENTER, winid, wxCommandEventHandler(func)) - -// Joystick events - -#define EVT_JOY_BUTTON_DOWN(func) wx__DECLARE_EVT0(wxEVT_JOY_BUTTON_DOWN, wxJoystickEventHandler(func)) -#define EVT_JOY_BUTTON_UP(func) wx__DECLARE_EVT0(wxEVT_JOY_BUTTON_UP, wxJoystickEventHandler(func)) -#define EVT_JOY_MOVE(func) wx__DECLARE_EVT0(wxEVT_JOY_MOVE, wxJoystickEventHandler(func)) -#define EVT_JOY_ZMOVE(func) wx__DECLARE_EVT0(wxEVT_JOY_ZMOVE, wxJoystickEventHandler(func)) - -// All joystick events -#define EVT_JOYSTICK_EVENTS(func) \ - EVT_JOY_BUTTON_DOWN(func) \ - EVT_JOY_BUTTON_UP(func) \ - EVT_JOY_MOVE(func) \ - EVT_JOY_ZMOVE(func) - -// Idle event -#define EVT_IDLE(func) wx__DECLARE_EVT0(wxEVT_IDLE, wxIdleEventHandler(func)) - -// Update UI event -#define EVT_UPDATE_UI(winid, func) wx__DECLARE_EVT1(wxEVT_UPDATE_UI, winid, wxUpdateUIEventHandler(func)) -#define EVT_UPDATE_UI_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_UPDATE_UI, id1, id2, wxUpdateUIEventHandler(func)) - -// Help events -#define EVT_HELP(winid, func) wx__DECLARE_EVT1(wxEVT_HELP, winid, wxHelpEventHandler(func)) -#define EVT_HELP_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_HELP, id1, id2, wxHelpEventHandler(func)) -#define EVT_DETAILED_HELP(winid, func) wx__DECLARE_EVT1(wxEVT_DETAILED_HELP, winid, wxHelpEventHandler(func)) -#define EVT_DETAILED_HELP_RANGE(id1, id2, func) wx__DECLARE_EVT2(wxEVT_DETAILED_HELP, id1, id2, wxHelpEventHandler(func)) - -// Context Menu Events -#define EVT_CONTEXT_MENU(func) wx__DECLARE_EVT0(wxEVT_CONTEXT_MENU, wxContextMenuEventHandler(func)) -#define EVT_COMMAND_CONTEXT_MENU(winid, func) wx__DECLARE_EVT1(wxEVT_CONTEXT_MENU, winid, wxContextMenuEventHandler(func)) - -// Clipboard text Events -#define EVT_TEXT_CUT(winid, func) wx__DECLARE_EVT1(wxEVT_TEXT_CUT, winid, wxClipboardTextEventHandler(func)) -#define EVT_TEXT_COPY(winid, func) wx__DECLARE_EVT1(wxEVT_TEXT_COPY, winid, wxClipboardTextEventHandler(func)) -#define EVT_TEXT_PASTE(winid, func) wx__DECLARE_EVT1(wxEVT_TEXT_PASTE, winid, wxClipboardTextEventHandler(func)) - -// Thread events -#define EVT_THREAD(id, func) wx__DECLARE_EVT1(wxEVT_THREAD, id, wxThreadEventHandler(func)) - -// ---------------------------------------------------------------------------- -// Helper functions -// ---------------------------------------------------------------------------- - -// This is an ugly hack to allow the use of Bind() instead of Connect() inside -// the library code if the library was built with support for it, here is how -// it is used: -// -// class SomeEventHandlingClass : wxBIND_OR_CONNECT_HACK_BASE_CLASS -// public SomeBaseClass -// { -// public: -// SomeEventHandlingClass(wxWindow *win) -// { -// // connect to the event for the given window -// wxBIND_OR_CONNECT_HACK(win, wxEVT_SOMETHING, wxSomeEventHandler, -// SomeEventHandlingClass::OnSomeEvent, this); -// } -// -// private: -// void OnSomeEvent(wxSomeEvent&) { ... } -// }; -// -// This is *not* meant to be used by library users, it is only defined here -// (and not in a private header) because the base class must be visible from -// other public headers, please do NOT use this in your code, it will be -// removed from future wx versions without warning. -#ifdef wxHAS_EVENT_BIND - #define wxBIND_OR_CONNECT_HACK_BASE_CLASS - #define wxBIND_OR_CONNECT_HACK_ONLY_BASE_CLASS - #define wxBIND_OR_CONNECT_HACK(win, evt, handler, func, obj) \ - win->Bind(evt, &func, obj) -#else // wxHAS_EVENT_BIND - #define wxBIND_OR_CONNECT_HACK_BASE_CLASS public wxEvtHandler, - #define wxBIND_OR_CONNECT_HACK_ONLY_BASE_CLASS : public wxEvtHandler - #define wxBIND_OR_CONNECT_HACK(win, evt, handler, func, obj) \ - win->Connect(evt, handler(func), NULL, obj) -#endif // wxHAS_EVENT_BIND - -#if wxUSE_GUI - -// Find a window with the focus, that is also a descendant of the given window. -// This is used to determine the window to initially send commands to. -WXDLLIMPEXP_CORE wxWindow* wxFindFocusDescendant(wxWindow* ancestor); - -#endif // wxUSE_GUI - - -// ---------------------------------------------------------------------------- -// Compatibility macro aliases -// ---------------------------------------------------------------------------- - -// deprecated variants _not_ requiring a semicolon after them and without wx prefix -// (note that also some wx-prefixed macro do _not_ require a semicolon because -// it's not always possible to force the compire to require it) - -#define DECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj) \ - wxDECLARE_EVENT_TABLE_ENTRY(type, winid, idLast, fn, obj) -#define DECLARE_EVENT_TABLE_TERMINATOR() wxDECLARE_EVENT_TABLE_TERMINATOR() -#define DECLARE_EVENT_TABLE() wxDECLARE_EVENT_TABLE(); -#define BEGIN_EVENT_TABLE(a,b) wxBEGIN_EVENT_TABLE(a,b) -#define BEGIN_EVENT_TABLE_TEMPLATE1(a,b,c) wxBEGIN_EVENT_TABLE_TEMPLATE1(a,b,c) -#define BEGIN_EVENT_TABLE_TEMPLATE2(a,b,c,d) wxBEGIN_EVENT_TABLE_TEMPLATE2(a,b,c,d) -#define BEGIN_EVENT_TABLE_TEMPLATE3(a,b,c,d,e) wxBEGIN_EVENT_TABLE_TEMPLATE3(a,b,c,d,e) -#define BEGIN_EVENT_TABLE_TEMPLATE4(a,b,c,d,e,f) wxBEGIN_EVENT_TABLE_TEMPLATE4(a,b,c,d,e,f) -#define BEGIN_EVENT_TABLE_TEMPLATE5(a,b,c,d,e,f,g) wxBEGIN_EVENT_TABLE_TEMPLATE5(a,b,c,d,e,f,g) -#define BEGIN_EVENT_TABLE_TEMPLATE6(a,b,c,d,e,f,g,h) wxBEGIN_EVENT_TABLE_TEMPLATE6(a,b,c,d,e,f,g,h) -#define END_EVENT_TABLE() wxEND_EVENT_TABLE() - -// other obsolete event declaration/definition macros; we don't need them any longer -// but we keep them for compatibility as it doesn't cost us anything anyhow -#define BEGIN_DECLARE_EVENT_TYPES() -#define END_DECLARE_EVENT_TYPES() -#define DECLARE_EXPORTED_EVENT_TYPE(expdecl, name, value) \ - extern expdecl const wxEventType name; -#define DECLARE_EVENT_TYPE(name, value) \ - DECLARE_EXPORTED_EVENT_TYPE(WXDLLIMPEXP_CORE, name, value) -#define DECLARE_LOCAL_EVENT_TYPE(name, value) \ - DECLARE_EXPORTED_EVENT_TYPE(wxEMPTY_PARAMETER_VALUE, name, value) -#define DEFINE_EVENT_TYPE(name) const wxEventType name = wxNewEventType(); -#define DEFINE_LOCAL_EVENT_TYPE(name) DEFINE_EVENT_TYPE(name) - -// alias for backward compatibility with 2.9.0: -#define wxEVT_COMMAND_THREAD wxEVT_THREAD -// other old wxEVT_COMMAND_* constants -#define wxEVT_COMMAND_BUTTON_CLICKED wxEVT_BUTTON -#define wxEVT_COMMAND_CHECKBOX_CLICKED wxEVT_CHECKBOX -#define wxEVT_COMMAND_CHOICE_SELECTED wxEVT_CHOICE -#define wxEVT_COMMAND_LISTBOX_SELECTED wxEVT_LISTBOX -#define wxEVT_COMMAND_LISTBOX_DOUBLECLICKED wxEVT_LISTBOX_DCLICK -#define wxEVT_COMMAND_CHECKLISTBOX_TOGGLED wxEVT_CHECKLISTBOX -#define wxEVT_COMMAND_MENU_SELECTED wxEVT_MENU -#define wxEVT_COMMAND_TOOL_CLICKED wxEVT_TOOL -#define wxEVT_COMMAND_SLIDER_UPDATED wxEVT_SLIDER -#define wxEVT_COMMAND_RADIOBOX_SELECTED wxEVT_RADIOBOX -#define wxEVT_COMMAND_RADIOBUTTON_SELECTED wxEVT_RADIOBUTTON -#define wxEVT_COMMAND_SCROLLBAR_UPDATED wxEVT_SCROLLBAR -#define wxEVT_COMMAND_VLBOX_SELECTED wxEVT_VLBOX -#define wxEVT_COMMAND_COMBOBOX_SELECTED wxEVT_COMBOBOX -#define wxEVT_COMMAND_TOOL_RCLICKED wxEVT_TOOL_RCLICKED -#define wxEVT_COMMAND_TOOL_DROPDOWN_CLICKED wxEVT_TOOL_DROPDOWN -#define wxEVT_COMMAND_TOOL_ENTER wxEVT_TOOL_ENTER -#define wxEVT_COMMAND_COMBOBOX_DROPDOWN wxEVT_COMBOBOX_DROPDOWN -#define wxEVT_COMMAND_COMBOBOX_CLOSEUP wxEVT_COMBOBOX_CLOSEUP -#define wxEVT_COMMAND_TEXT_COPY wxEVT_TEXT_COPY -#define wxEVT_COMMAND_TEXT_CUT wxEVT_TEXT_CUT -#define wxEVT_COMMAND_TEXT_PASTE wxEVT_TEXT_PASTE -#define wxEVT_COMMAND_TEXT_UPDATED wxEVT_TEXT - -#if defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ == 9 -#if !defined NO_WX3_GCC49_VIRTUAL_HACK && !defined WXBUILDING -// Ugly work-around for GCC 4.9 bug: https://bugs.debian.org/752733 -#define WX3_GCC49_VIRTUAL_HACK(C) wxEvent* (C::*debian_wx3_gcc49_pr61214_##C##_hack)() const __attribute__((unused)) = &C::Clone - -namespace { - -WX3_GCC49_VIRTUAL_HACK(wxIdleEvent); -WX3_GCC49_VIRTUAL_HACK(wxThreadEvent); - -#if wxUSE_GUI -WX3_GCC49_VIRTUAL_HACK(wxActivateEvent); -WX3_GCC49_VIRTUAL_HACK(wxChildFocusEvent); -WX3_GCC49_VIRTUAL_HACK(wxClipboardTextEvent); -WX3_GCC49_VIRTUAL_HACK(wxCloseEvent); -WX3_GCC49_VIRTUAL_HACK(wxCommandEvent); -WX3_GCC49_VIRTUAL_HACK(wxContextMenuEvent); -WX3_GCC49_VIRTUAL_HACK(wxDisplayChangedEvent); -WX3_GCC49_VIRTUAL_HACK(wxDropFilesEvent); -WX3_GCC49_VIRTUAL_HACK(wxEraseEvent); -WX3_GCC49_VIRTUAL_HACK(wxFocusEvent); -WX3_GCC49_VIRTUAL_HACK(wxHelpEvent); -WX3_GCC49_VIRTUAL_HACK(wxIconizeEvent); -WX3_GCC49_VIRTUAL_HACK(wxInitDialogEvent); -WX3_GCC49_VIRTUAL_HACK(wxJoystickEvent); -WX3_GCC49_VIRTUAL_HACK(wxKeyEvent); -WX3_GCC49_VIRTUAL_HACK(wxMaximizeEvent); -WX3_GCC49_VIRTUAL_HACK(wxMenuEvent); -WX3_GCC49_VIRTUAL_HACK(wxMouseCaptureChangedEvent); -WX3_GCC49_VIRTUAL_HACK(wxMouseCaptureLostEvent); -WX3_GCC49_VIRTUAL_HACK(wxMouseEvent); -WX3_GCC49_VIRTUAL_HACK(wxMoveEvent); -WX3_GCC49_VIRTUAL_HACK(wxNavigationKeyEvent); -WX3_GCC49_VIRTUAL_HACK(wxNcPaintEvent); -WX3_GCC49_VIRTUAL_HACK(wxNotifyEvent); -WX3_GCC49_VIRTUAL_HACK(wxPaintEvent); -WX3_GCC49_VIRTUAL_HACK(wxPaletteChangedEvent); -WX3_GCC49_VIRTUAL_HACK(wxQueryNewPaletteEvent); -WX3_GCC49_VIRTUAL_HACK(wxScrollEvent); -WX3_GCC49_VIRTUAL_HACK(wxScrollWinEvent); -WX3_GCC49_VIRTUAL_HACK(wxSetCursorEvent); -WX3_GCC49_VIRTUAL_HACK(wxShowEvent); -WX3_GCC49_VIRTUAL_HACK(wxSizeEvent); -WX3_GCC49_VIRTUAL_HACK(wxSysColourChangedEvent); -WX3_GCC49_VIRTUAL_HACK(wxUpdateUIEvent); -WX3_GCC49_VIRTUAL_HACK(wxWindowCreateEvent); -WX3_GCC49_VIRTUAL_HACK(wxWindowDestroyEvent); -#endif - -} -#endif -#endif - -#endif // _WX_EVENT_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/accel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/accel.h deleted file mode 100644 index 09ffb61cc1..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/accel.h +++ /dev/null @@ -1,14 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/accel.h -// Purpose: wxAcceleratorTable redirection file -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// VZ: keeping the old file just in case we're going to have a native GTK+ -// wxAcceleratorTable implementation one day, but for now use the generic -// version -#include "wx/generic/accel.h" diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/animate.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/animate.h deleted file mode 100644 index 1cda545a41..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/animate.h +++ /dev/null @@ -1,153 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/animate.h -// Purpose: Animation classes -// Author: Julian Smart and Guillermo Rodriguez Garcia -// Modified by: Francesco Montorsi -// Created: 13/8/99 -// Copyright: (c) Julian Smart and Guillermo Rodriguez Garcia -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKANIMATEH__ -#define _WX_GTKANIMATEH__ - -typedef struct _GdkPixbufAnimation GdkPixbufAnimation; -typedef struct _GdkPixbufAnimationIter GdkPixbufAnimationIter; - -// ---------------------------------------------------------------------------- -// wxAnimation -// Unlike the generic wxAnimation object (see generic\animate.cpp), we won't -// use directly wxAnimationHandlers as gdk-pixbuf already provides the -// concept of handler and will automatically use the available handlers. -// Like generic wxAnimation object, this implementation of wxAnimation is -// refcounted so that assignment is very fast -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxAnimation : public wxAnimationBase -{ -public: - wxAnimation(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY) - : m_pixbuf(NULL) { LoadFile(name, type); } - wxAnimation(GdkPixbufAnimation *p = NULL); - wxAnimation(const wxAnimation&); - ~wxAnimation() { UnRef(); } - - wxAnimation& operator= (const wxAnimation&); - - virtual bool IsOk() const - { return m_pixbuf != NULL; } - - - // unfortunately GdkPixbufAnimation does not expose these info: - - virtual unsigned int GetFrameCount() const { return 0; } - virtual wxImage GetFrame(unsigned int frame) const; - - // we can retrieve the delay for a frame only after building - // a GdkPixbufAnimationIter... - virtual int GetDelay(unsigned int WXUNUSED(frame)) const { return 0; } - - virtual wxSize GetSize() const; - - virtual bool LoadFile(const wxString &name, wxAnimationType type = wxANIMATION_TYPE_ANY); - virtual bool Load(wxInputStream &stream, wxAnimationType type = wxANIMATION_TYPE_ANY); - - // Implementation -public: // used by GTK callbacks - - GdkPixbufAnimation *GetPixbuf() const - { return m_pixbuf; } - void SetPixbuf(GdkPixbufAnimation* p); - -protected: - GdkPixbufAnimation *m_pixbuf; - -private: - void UnRef(); - - typedef wxAnimationBase base_type; - DECLARE_DYNAMIC_CLASS(wxAnimation) -}; - - -// ---------------------------------------------------------------------------- -// wxAnimationCtrl -// ---------------------------------------------------------------------------- - -// Resize to animation size if this is set -#define wxAN_FIT_ANIMATION 0x0010 - -class WXDLLIMPEXP_ADV wxAnimationCtrl: public wxAnimationCtrlBase -{ -public: - wxAnimationCtrl() { Init(); } - wxAnimationCtrl(wxWindow *parent, - wxWindowID id, - const wxAnimation& anim = wxNullAnimation, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxAC_DEFAULT_STYLE, - const wxString& name = wxAnimationCtrlNameStr) - { - Init(); - - Create(parent, id, anim, pos, size, style, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxAnimation& anim = wxNullAnimation, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxAC_DEFAULT_STYLE, - const wxString& name = wxAnimationCtrlNameStr); - - ~wxAnimationCtrl(); - -public: // event handler - - void OnTimer(wxTimerEvent &); - -public: // public API - - virtual bool LoadFile(const wxString& filename, wxAnimationType type = wxANIMATION_TYPE_ANY); - virtual bool Load(wxInputStream& stream, wxAnimationType type = wxANIMATION_TYPE_ANY); - - virtual void SetAnimation(const wxAnimation &anim); - virtual wxAnimation GetAnimation() const - { return wxAnimation(m_anim); } - - virtual bool Play(); - virtual void Stop(); - - virtual bool IsPlaying() const; - - bool SetBackgroundColour( const wxColour &colour ); - -protected: - - virtual void DisplayStaticImage(); - virtual wxSize DoGetBestSize() const; - void FitToAnimation(); - void ClearToBackgroundColour(); - - void ResetAnim(); - void ResetIter(); - -protected: // internal vars - - GdkPixbufAnimation *m_anim; - GdkPixbufAnimationIter *m_iter; - - wxTimer m_timer; - bool m_bPlaying; - -private: - typedef wxAnimationCtrlBase base_type; - - void Init(); - - DECLARE_DYNAMIC_CLASS(wxAnimationCtrl) - DECLARE_EVENT_TABLE() -}; - -#endif // _WX_GTKANIMATEH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/anybutton.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/anybutton.h deleted file mode 100644 index 604c72c72a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/anybutton.h +++ /dev/null @@ -1,80 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/anybutton.h -// Purpose: wxGTK wxAnyButton class declaration -// Author: Robert Roebling -// Created: 1998-05-20 (extracted from button.h) -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_ANYBUTTON_H_ -#define _WX_GTK_ANYBUTTON_H_ - -//----------------------------------------------------------------------------- -// wxAnyButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase -{ -public: - wxAnyButton() - { - m_isCurrent = - m_isPressed = false; - } - - virtual bool Enable( bool enable = true ); - - // implementation - // -------------- - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // called from GTK callbacks: they update the button state and call - // GTKUpdateBitmap() - void GTKMouseEnters(); - void GTKMouseLeaves(); - void GTKPressed(); - void GTKReleased(); - -protected: - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - - virtual wxBitmap DoGetBitmap(State which) const; - virtual void DoSetBitmap(const wxBitmap& bitmap, State which); - virtual void DoSetBitmapPosition(wxDirection dir); - -private: - typedef wxAnyButtonBase base_type; - - // focus event handler: calls GTKUpdateBitmap() - void GTKOnFocus(wxFocusEvent& event); - - // update the bitmap to correspond to the current button state - void GTKUpdateBitmap(); - - // return the current button state from m_isXXX flags (which means that it - // might not correspond to the real current state as e.g. m_isCurrent will - // never be true if we don't have a valid current bitmap) - State GTKGetCurrentState() const; - - // show the given bitmap (must be valid) - void GTKDoShowBitmap(const wxBitmap& bitmap); - - - // the bitmaps for the different state of the buttons, all of them may be - // invalid and the button only shows a bitmap at all if State_Normal bitmap - // is valid - wxBitmap m_bitmaps[State_Max]; - - // true iff mouse is currently over the button - bool m_isCurrent; - - // true iff the button is in pressed state - bool m_isPressed; - - wxDECLARE_NO_COPY_CLASS(wxAnyButton); -}; - -#endif // _WX_GTK_ANYBUTTON_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/app.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/app.h deleted file mode 100644 index 6f112a3c88..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/app.h +++ /dev/null @@ -1,93 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/app.h -// Purpose: wxApp definition for wxGTK -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_APP_H_ -#define _WX_GTK_APP_H_ - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 -typedef struct _HildonProgram HildonProgram; -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - -//----------------------------------------------------------------------------- -// wxApp -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxApp: public wxAppBase -{ -public: - wxApp(); - virtual ~wxApp(); - - /* override for altering the way wxGTK intializes the GUI - * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by - * default. when overriding this method, the code in it is likely to be - * platform dependent, otherwise use OnInit(). */ - virtual bool SetNativeTheme(const wxString& theme); - virtual bool OnInitGui(); - - // override base class (pure) virtuals - virtual void WakeUpIdle(); - - virtual bool Initialize(int& argc, wxChar **argv); - virtual void CleanUp(); - - virtual void OnAssertFailure(const wxChar *file, - int line, - const wxChar *func, - const wxChar *cond, - const wxChar *msg); - - // GTK-specific methods - // ------------------- - - // this can be overridden to return a specific visual to be used for GTK+ - // instead of the default one (it's used by wxGLApp) - // - // must return XVisualInfo pointer (it is not freed by caller) - virtual void *GetXVisualInfo() { return NULL; } - - // Check if we're using a global menu. Currently this is only true when - // running under Ubuntu Unity and global menu is not disabled. - // - // This is mostly used in the implementation in order to work around - // various bugs arising due to this. - static bool GTKIsUsingGlobalMenu(); - -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - // Maemo-specific method: get the main program object - HildonProgram *GetHildonProgram(); -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - - // implementation only from now on - // ------------------------------- - - // check for pending events, without interference from our idle source - bool EventsPending(); - bool DoIdle(); - -private: - // true if we're inside an assert modal dialog - bool m_isInAssert; - -#if wxUSE_THREADS - wxMutex m_idleMutex; -#endif - unsigned m_idleSourceId; - -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - HildonProgram *m_hildonProgram; -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - - DECLARE_DYNAMIC_CLASS(wxApp) -}; - -#endif // _WX_GTK_APP_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/assertdlg_gtk.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/assertdlg_gtk.h deleted file mode 100644 index 098e9b1123..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/assertdlg_gtk.h +++ /dev/null @@ -1,77 +0,0 @@ -/* /////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/assertdlg_gtk.h -// Purpose: GtkAssertDialog -// Author: Francesco Montorsi -// Copyright: (c) 2006 Francesco Montorsi -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////// */ - -#ifndef _WX_GTK_ASSERTDLG_H_ -#define _WX_GTK_ASSERTDLG_H_ - -#define GTK_TYPE_ASSERT_DIALOG (gtk_assert_dialog_get_type ()) -#define GTK_ASSERT_DIALOG(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GTK_TYPE_ASSERT_DIALOG, GtkAssertDialog)) -#define GTK_ASSERT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ASSERT_DIALOG, GtkAssertDialogClass)) -#define GTK_IS_ASSERT_DIALOG(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GTK_TYPE_ASSERT_DIALOG)) -#define GTK_IS_ASSERT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ASSERT_DIALOG)) -#define GTK_ASSERT_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ASSERT_DIALOG, GtkAssertDialogClass)) - -typedef struct _GtkAssertDialog GtkAssertDialog; -typedef struct _GtkAssertDialogClass GtkAssertDialogClass; -typedef void (*GtkAssertDialogStackFrameCallback)(void *); - -struct _GtkAssertDialog -{ - GtkDialog parent_instance; - - /* GtkAssertDialog widgets */ - GtkWidget *expander; - GtkWidget *message; - GtkWidget *treeview; - - GtkWidget *shownexttime; - - /* callback for processing the stack frame */ - GtkAssertDialogStackFrameCallback callback; - void *userdata; -}; - -struct _GtkAssertDialogClass -{ - GtkDialogClass parent_class; -}; - -typedef enum -{ - GTK_ASSERT_DIALOG_STOP, - GTK_ASSERT_DIALOG_CONTINUE, - GTK_ASSERT_DIALOG_CONTINUE_SUPPRESSING -} GtkAssertDialogResponseID; - - - - -GType gtk_assert_dialog_get_type(void); -GtkWidget *gtk_assert_dialog_new(void); - -/* get the assert message */ -gchar *gtk_assert_dialog_get_message(GtkAssertDialog *assertdlg); - -/* set the assert message */ -void gtk_assert_dialog_set_message(GtkAssertDialog *assertdlg, const gchar *msg); - -/* get a string containing all stack frames appended to the dialog */ -gchar *gtk_assert_dialog_get_backtrace(GtkAssertDialog *assertdlg); - -/* sets the callback to use when the user wants to see the stackframe */ -void gtk_assert_dialog_set_backtrace_callback(GtkAssertDialog *assertdlg, - GtkAssertDialogStackFrameCallback callback, - void *userdata); - -/* appends a stack frame to the dialog */ -void gtk_assert_dialog_append_stack_frame(GtkAssertDialog *dlg, - const gchar *function, - const gchar *sourcefile, - guint line_number); - -#endif /* _WX_GTK_ASSERTDLG_H_ */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/bitmap.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/bitmap.h deleted file mode 100644 index d035f2c2c1..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/bitmap.h +++ /dev/null @@ -1,181 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/bitmap.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_BITMAP_H_ -#define _WX_GTK_BITMAP_H_ - -#ifdef __WXGTK3__ -typedef struct _cairo cairo_t; -typedef struct _cairo_surface cairo_surface_t; -#endif -typedef struct _GdkPixbuf GdkPixbuf; -class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; - -//----------------------------------------------------------------------------- -// wxMask -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMask: public wxMaskBase -{ -public: - wxMask(); - wxMask(const wxMask& mask); - wxMask( const wxBitmap& bitmap, const wxColour& colour ); -#if wxUSE_PALETTE - wxMask( const wxBitmap& bitmap, int paletteIndex ); -#endif // wxUSE_PALETTE - wxMask( const wxBitmap& bitmap ); - virtual ~wxMask(); - wxBitmap GetBitmap() const; - - // implementation -#ifdef __WXGTK3__ - wxMask(cairo_surface_t*); - operator cairo_surface_t*() const; -#else - wxMask(GdkPixmap*); - operator GdkPixmap*() const; -#endif - -protected: - virtual void FreeData(); - virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour); - virtual bool InitFromMonoBitmap(const wxBitmap& bitmap); - -private: -#ifdef __WXGTK3__ - cairo_surface_t* m_bitmap; -#else - GdkPixmap* m_bitmap; -#endif - - DECLARE_DYNAMIC_CLASS(wxMask) -}; - -//----------------------------------------------------------------------------- -// wxBitmap -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase -{ -public: - wxBitmap() { } - wxBitmap( int width, int height, int depth = wxBITMAP_SCREEN_DEPTH ) - { Create(width, height, depth); } - wxBitmap( const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH ) - { Create(sz, depth); } - wxBitmap( const char bits[], int width, int height, int depth = 1 ); - wxBitmap( const char* const* bits ); -#ifdef wxNEEDS_CHARPP - // needed for old GCC - wxBitmap(char** data) - { *this = wxBitmap(const_cast(data)); } -#endif - wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE ); -#if wxUSE_IMAGE - wxBitmap(const wxImage& image, int depth = wxBITMAP_SCREEN_DEPTH); -#endif // wxUSE_IMAGE - wxBitmap(GdkPixbuf* pixbuf, int depth = 0); - virtual ~wxBitmap(); - - bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); - bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) - { return Create(sz.GetWidth(), sz.GetHeight(), depth); } - bool Create(int width, int height, const wxDC& WXUNUSED(dc)) - { return Create(width,height); } - - - virtual int GetHeight() const; - virtual int GetWidth() const; - virtual int GetDepth() const; - -#if wxUSE_IMAGE - wxImage ConvertToImage() const; -#endif // wxUSE_IMAGE - - // copies the contents and mask of the given (colour) icon to the bitmap - virtual bool CopyFromIcon(const wxIcon& icon); - - wxMask *GetMask() const; - void SetMask( wxMask *mask ); - - wxBitmap GetSubBitmap( const wxRect& rect ) const; - - bool SaveFile(const wxString &name, wxBitmapType type, - const wxPalette *palette = NULL) const; - bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); - -#if wxUSE_PALETTE - wxPalette *GetPalette() const; - void SetPalette(const wxPalette& palette); - wxPalette *GetColourMap() const { return GetPalette(); } -#endif // wxUSE_PALETTE - - static void InitStandardHandlers(); - - // implementation - // -------------- - - void SetHeight( int height ); - void SetWidth( int width ); - void SetDepth( int depth ); - -#ifdef __WXGTK3__ - GdkPixbuf* GetPixbufNoMask() const; - cairo_t* CairoCreate() const; - void Draw(cairo_t* cr, int x, int y, bool useMask = true, const wxColour* fg = NULL, const wxColour* bg = NULL) const; - void SetSourceSurface(cairo_t* cr, int x, int y, const wxColour* fg = NULL, const wxColour* bg = NULL) const; -#else - GdkPixmap *GetPixmap() const; - bool HasPixmap() const; - bool HasPixbuf() const; - wxBitmap(GdkPixmap* pixmap); -#endif - GdkPixbuf *GetPixbuf() const; - - // raw bitmap access support functions - void *GetRawData(wxPixelDataBase& data, int bpp); - void UngetRawData(wxPixelDataBase& data); - - bool HasAlpha() const; - -protected: -#ifndef __WXGTK3__ -#if wxUSE_IMAGE - bool CreateFromImage(const wxImage& image, int depth); -#endif // wxUSE_IMAGE -#endif - - virtual wxGDIRefData* CreateGDIRefData() const; - virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const; - -private: -#ifndef __WXGTK3__ - void SetPixmap(GdkPixmap* pixmap); -#if wxUSE_IMAGE - // to be called from CreateFromImage only! - bool CreateFromImageAsPixmap(const wxImage& image, int depth); - bool CreateFromImageAsPixbuf(const wxImage& image); -#endif // wxUSE_IMAGE - -public: - // implementation only - enum Representation - { - Pixmap, - Pixbuf - }; - // removes other representations from memory, keeping only 'keep' - // (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf): - void PurgeOtherRepresentations(Representation keep); -#endif - - DECLARE_DYNAMIC_CLASS(wxBitmap) -}; - -#endif // _WX_GTK_BITMAP_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/bmpbuttn.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/bmpbuttn.h deleted file mode 100644 index f70e28ceb7..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/bmpbuttn.h +++ /dev/null @@ -1,46 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/bmpbutton.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_BMPBUTTON_H_ -#define _WX_GTK_BMPBUTTON_H_ - -// ---------------------------------------------------------------------------- -// wxBitmapButton -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase -{ -public: - wxBitmapButton() { } - - wxBitmapButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, bitmap, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - -private: - DECLARE_DYNAMIC_CLASS(wxBitmapButton) -}; - -#endif // _WX_GTK_BMPBUTTON_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/bmpcbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/bmpcbox.h deleted file mode 100644 index f5d00a517b..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/bmpcbox.h +++ /dev/null @@ -1,146 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/bmpcbox.h -// Purpose: wxBitmapComboBox -// Author: Jaakko Salli -// Created: 2008-05-19 -// Copyright: (c) 2008 Jaakko Salli -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_BMPCBOX_H_ -#define _WX_GTK_BMPCBOX_H_ - - -#include "wx/combobox.h" - -// ---------------------------------------------------------------------------- -// wxBitmapComboBox: a wxComboBox that allows images to be shown -// in front of string items. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxBitmapComboBox : public wxComboBox, - public wxBitmapComboBoxBase -{ -public: - // ctors and such - wxBitmapComboBox() : wxComboBox(), wxBitmapComboBoxBase() - { - Init(); - } - - wxBitmapComboBox(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, - const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapComboBoxNameStr) - : wxComboBox(), - wxBitmapComboBoxBase() - { - Init(); - - (void)Create(parent, id, value, pos, size, n, - choices, style, validator, name); - } - - wxBitmapComboBox(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapComboBoxNameStr); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - int n, - const wxString choices[], - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapComboBoxNameStr); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxBitmapComboBoxNameStr); - - virtual ~wxBitmapComboBox(); - - // Sets the image for the given item. - virtual void SetItemBitmap(unsigned int n, const wxBitmap& bitmap); - - // Returns the image of the item with the given index. - virtual wxBitmap GetItemBitmap(unsigned int n) const; - - // Returns size of the image used in list - virtual wxSize GetBitmapSize() const - { - return m_bitmapSize; - } - - // Adds item with image to the end of the combo box. - int Append(const wxString& item, const wxBitmap& bitmap = wxNullBitmap); - int Append(const wxString& item, const wxBitmap& bitmap, void *clientData); - int Append(const wxString& item, const wxBitmap& bitmap, wxClientData *clientData); - - // Inserts item with image into the list before pos. Not valid for wxCB_SORT - // styles, use Append instead. - int Insert(const wxString& item, const wxBitmap& bitmap, unsigned int pos); - int Insert(const wxString& item, const wxBitmap& bitmap, - unsigned int pos, void *clientData); - int Insert(const wxString& item, const wxBitmap& bitmap, - unsigned int pos, wxClientData *clientData); - - // Override some wxTextEntry interface. - virtual void WriteText(const wxString& value); - - virtual wxString GetValue() const; - virtual void Remove(long from, long to); - - virtual void SetInsertionPoint(long pos); - virtual long GetInsertionPoint() const; - virtual long GetLastPosition() const; - - virtual void SetSelection(long from, long to); - virtual void GetSelection(long *from, long *to) const; - - virtual void SetSelection(int n) { wxComboBox::SetSelection(n); } - virtual int GetSelection() const { return wxComboBox::GetSelection(); } - - virtual bool IsEditable() const; - virtual void SetEditable(bool editable); - - virtual GtkWidget* GetConnectWidget(); - -protected: - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - - virtual void GTKCreateComboBoxWidget(); - virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text ); - - virtual wxSize DoGetBestSize() const; - - wxSize m_bitmapSize; - int m_bitmapCellIndex; - -private: - void Init(); - - DECLARE_DYNAMIC_CLASS(wxBitmapComboBox) -}; - -#endif // _WX_GTK_BMPCBOX_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/brush.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/brush.h deleted file mode 100644 index 37a4845e6e..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/brush.h +++ /dev/null @@ -1,55 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/brush.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_BRUSH_H_ -#define _WX_GTK_BRUSH_H_ - -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_FWD_CORE wxColour; - -//----------------------------------------------------------------------------- -// wxBrush -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase -{ -public: - wxBrush() { } - - wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID ); -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) ); -#endif - wxBrush( const wxBitmap &stippleBitmap ); - virtual ~wxBrush(); - - bool operator==(const wxBrush& brush) const; - bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - - wxBrushStyle GetStyle() const; - wxColour GetColour() const; - wxBitmap *GetStipple() const; - - void SetColour( const wxColour& col ); - void SetColour( unsigned char r, unsigned char g, unsigned char b ); - void SetStyle( wxBrushStyle style ); - void SetStipple( const wxBitmap& stipple ); - -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_FUTURE( void SetStyle(int style) ) - { SetStyle((wxBrushStyle)style); } -#endif - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - DECLARE_DYNAMIC_CLASS(wxBrush) -}; - -#endif // _WX_GTK_BRUSH_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/button.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/button.h deleted file mode 100644 index 9e7a57d890..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/button.h +++ /dev/null @@ -1,73 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/button.h -// Purpose: wxGTK wxButton class declaration -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_BUTTON_H_ -#define _WX_GTK_BUTTON_H_ - -//----------------------------------------------------------------------------- -// wxButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxButton : public wxButtonBase -{ -public: - wxButton() {} - wxButton(wxWindow *parent, wxWindowID id, - const wxString& label = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& label = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - - virtual wxWindow *SetDefault(); - virtual void SetLabel( const wxString &label ); - - // implementation - // -------------- - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // helper to allow access to protected member from GTK callback - void MoveWindow(int x, int y, int width, int height) { DoMoveWindow(x, y, width, height); } - - // called from GTK callbacks: they update the button state and call - // GTKUpdateBitmap() - void GTKMouseEnters(); - void GTKMouseLeaves(); - void GTKPressed(); - void GTKReleased(); - -protected: - virtual wxSize DoGetBestSize() const; - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - -#if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup); -#endif // wxUSE_MARKUP - -private: - typedef wxButtonBase base_type; - - // Return the GtkLabel used by this button. - GtkLabel *GTKGetLabel() const; - - DECLARE_DYNAMIC_CLASS(wxButton) -}; - -#endif // _WX_GTK_BUTTON_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/calctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/calctrl.h deleted file mode 100644 index 3fce698ee5..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/calctrl.h +++ /dev/null @@ -1,69 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/calctrl.h -// Purpose: wxGtkCalendarCtrl control -// Author: Marcin Wojdyr -// Copyright: (C) 2008 Marcin Wojdyr -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef GTK_CALCTRL_H__ -#define GTK_CALCTRL_H__ - -class WXDLLIMPEXP_ADV wxGtkCalendarCtrl : public wxCalendarCtrlBase -{ -public: - wxGtkCalendarCtrl() {} - wxGtkCalendarCtrl(wxWindow *parent, - wxWindowID id, - const wxDateTime& date = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCAL_SHOW_HOLIDAYS, - const wxString& name = wxCalendarNameStr) - { - Create(parent, id, date, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxDateTime& date = wxDefaultDateTime, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCAL_SHOW_HOLIDAYS, - const wxString& name = wxCalendarNameStr); - - virtual ~wxGtkCalendarCtrl() {} - - virtual bool SetDate(const wxDateTime& date); - virtual wxDateTime GetDate() const; - - virtual bool SetDateRange(const wxDateTime& lowerdate = wxDefaultDateTime, - const wxDateTime& upperdate = wxDefaultDateTime); - virtual bool GetDateRange(wxDateTime *lowerdate, wxDateTime *upperdate) const; - - virtual bool EnableMonthChange(bool enable = true); - - virtual void Mark(size_t day, bool mark); - - // implementation - // -------------- - - void GTKGenerateEvent(wxEventType type); - -private: - bool IsInValidRange(const wxDateTime& dt) const; - - // Range of the dates that can be selected by user, either or both may be - // invalid to indicate that no corresponding restriction is set. - wxDateTime m_validStart, - m_validEnd; - - // Last known selected date, may be different from the real selection in - // the control while a handler for day-selected is running. - wxDateTime m_selectedDate; - - DECLARE_DYNAMIC_CLASS(wxGtkCalendarCtrl) - wxDECLARE_NO_COPY_CLASS(wxGtkCalendarCtrl); -}; - -#endif // GTK_CALCTRL_H__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/checkbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/checkbox.h deleted file mode 100644 index 69985fc457..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/checkbox.h +++ /dev/null @@ -1,67 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/checkbox.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKCHECKBOX_H_ -#define _WX_GTKCHECKBOX_H_ - -// ---------------------------------------------------------------------------- -// wxCheckBox -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase -{ -public: - wxCheckBox(); - ~wxCheckBox(); - wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr ); - - void SetValue( bool state ); - bool GetValue() const; - - virtual void SetLabel( const wxString& label ); - virtual bool Enable( bool enable = true ); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - void GTKDisableEvents(); - void GTKEnableEvents(); - -protected: - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - - void DoSet3StateValue(wxCheckBoxState state); - wxCheckBoxState DoGet3StateValue() const; - -private: - typedef wxCheckBoxBase base_type; - - GtkWidget *m_widgetCheckbox; - GtkWidget *m_widgetLabel; - - DECLARE_DYNAMIC_CLASS(wxCheckBox) -}; - -#endif // _WX_GTKCHECKBOX_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/checklst.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/checklst.h deleted file mode 100644 index 3cfbd76407..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/checklst.h +++ /dev/null @@ -1,48 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/checklst.h -// Purpose: wxCheckListBox class -// Author: Robert Roebling -// Modified by: -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKCHECKLIST_H_ -#define _WX_GTKCHECKLIST_H_ - -//----------------------------------------------------------------------------- -// wxCheckListBox -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase -{ -public: - wxCheckListBox(); - wxCheckListBox(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int nStrings = 0, - const wxString *choices = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - wxCheckListBox(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - - virtual bool IsChecked(unsigned int index) const; - virtual void Check(unsigned int index, bool check = true); - - int GetItemHeight() const; - - void DoCreateCheckList(); - -private: - DECLARE_DYNAMIC_CLASS(wxCheckListBox) -}; - -#endif // _WX_GTKCHECKLIST_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/chkconf.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/chkconf.h deleted file mode 100644 index 84595b256c..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/chkconf.h +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Name: wx/gtk/chkconf.h - * Purpose: wxGTK-specific settings consistency checks - * Author: Vadim Zeitlin - * Created: 2007-07-19 (extracted from wx/chkconf.h) - * Copyright: (c) 2000-2007 Vadim Zeitlin - * Licence: wxWindows licence - */ - -#ifndef __WXUNIVERSAL__ -# if wxUSE_MDI_ARCHITECTURE && !wxUSE_MENUS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "MDI requires wxUSE_MENUS in wxGTK" -# else -# undef wxUSE_MENUS -# define wxUSE_MENUS 1 -# endif -# endif -#endif /* !__WXUNIVERSAL__ */ - -#if wxUSE_JOYSTICK -# if !wxUSE_THREADS -# ifdef wxABORT_ON_CONFIG_ERROR -# error "wxJoystick requires threads in wxGTK" -# else -# undef wxUSE_JOYSTICK -# define wxUSE_JOYSTICK 0 -# endif -# endif -#endif /* wxUSE_JOYSTICK */ - -#if wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW && !wxUSE_POSTSCRIPT -# undef wxUSE_POSTSCRIPT -# define wxUSE_POSTSCRIPT 1 -#endif - -#if wxUSE_OWNER_DRAWN -# undef wxUSE_OWNER_DRAWN -# define wxUSE_OWNER_DRAWN 0 -#endif - -#if wxUSE_METAFILE -# undef wxUSE_METAFILE -# define wxUSE_METAFILE 0 -#endif - -#if wxUSE_ENH_METAFILE -# undef wxUSE_ENH_METAFILE -# define wxUSE_ENH_METAFILE 0 -#endif - -#ifndef __UNIX__ - -# undef wxUSE_WEBVIEW -# define wxUSE_WEBVIEW 0 -# undef wxUSE_WEBVIEW_WEBKIT -# define wxUSE_WEBVIEW_WEBKIT 0 - -# undef wxUSE_MEDIACTRL -# define wxUSE_MEDIACTRL 0 - - /* - We could use GDK_WINDOWING_X11 for those but this would require - including gdk/gdk.h and we don't want to do it from here, so assume - we're not using X11 if we're not under Unix. - */ - -# undef wxUSE_UIACTIONSIMULATOR -# define wxUSE_UIACTIONSIMULATOR 0 - -# undef wxUSE_GLCANVAS -# define wxUSE_GLCANVAS 0 - -#endif /* __UNIX__ */ - -/* - We always need Cairo with wxGTK, enable it if necessary (this can only - happen under Windows). - */ -#ifdef __WINDOWS__ - -#if !wxUSE_CAIRO -# undef wxUSE_CAIRO -# define wxUSE_CAIRO 1 -#endif - -#endif /* __WINDOWS__ */ - -#ifdef __WXGTK3__ - #if !wxUSE_GRAPHICS_CONTEXT - #ifdef wxABORT_ON_CONFIG_ERROR - #error "GTK+ 3 support requires wxGraphicsContext" - #else - #undef wxUSE_GRAPHICS_CONTEXT - #define wxUSE_GRAPHICS_CONTEXT 1 - #endif - #endif -#endif diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/choice.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/choice.h deleted file mode 100644 index d952a0fa2c..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/choice.h +++ /dev/null @@ -1,118 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/choice.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_CHOICE_H_ -#define _WX_GTK_CHOICE_H_ - -class WXDLLIMPEXP_FWD_BASE wxSortedArrayString; -class WXDLLIMPEXP_FWD_BASE wxArrayString; - -//----------------------------------------------------------------------------- -// wxChoice -//----------------------------------------------------------------------------- - -class wxGtkCollatedArrayString; - -class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase -{ -public: - wxChoice() - { - Init(); - } - wxChoice( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (const wxString *) NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr ) - { - Init(); - Create(parent, id, pos, size, n, choices, style, validator, name); - } - wxChoice( wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr ) - { - Init(); - Create(parent, id, pos, size, choices, style, validator, name); - } - virtual ~wxChoice(); - bool Create( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr ); - bool Create( wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr ); - - int GetSelection() const; - void SetSelection(int n); - - virtual unsigned int GetCount() const; - virtual int FindString(const wxString& s, bool bCase = false) const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& string); - - virtual void SetColumns(int n=1); - virtual int GetColumns() const; - - virtual void GTKDisableEvents(); - virtual void GTKEnableEvents(); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -protected: - // this array is only used for controls with wxCB_SORT style, so only - // allocate it if it's needed (hence using pointer) - wxGtkCollatedArrayString *m_strings; - - // contains the client data for the items - wxArrayPtrVoid m_clientData; - - // index to GtkListStore cell which displays the item text - int m_stringCellIndex; - - virtual wxSize DoGetBestSize() const; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, wxClientDataType type); - virtual void DoSetItemClientData(unsigned int n, void* clientData); - virtual void* DoGetItemClientData(unsigned int n) const; - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int n); - - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - - // in derived classes, implement this to insert list store entry - // with all items default except text - virtual void GTKInsertComboBoxTextItem( unsigned int n, const wxString& text ); - -private: - void Init(); - - DECLARE_DYNAMIC_CLASS(wxChoice) -}; - - -#endif // _WX_GTK_CHOICE_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/clipbrd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/clipbrd.h deleted file mode 100644 index 28d84df815..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/clipbrd.h +++ /dev/null @@ -1,135 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/clipbrd.h -// Purpose: wxClipboard for wxGTK -// Author: Robert Roebling, Vadim Zeitlin -// Copyright: (c) 1998 Robert Roebling -// (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_CLIPBOARD_H_ -#define _WX_GTK_CLIPBOARD_H_ - -// ---------------------------------------------------------------------------- -// wxClipboard -// ---------------------------------------------------------------------------- - -#include "wx/weakref.h" - -class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase -{ -public: - // there are several clipboards in X11 (and in GDK) - enum Kind - { - Primary, - Clipboard - }; - - wxClipboard(); - virtual ~wxClipboard(); - - // open the clipboard before SetData() and GetData() - virtual bool Open(); - - // close the clipboard after SetData() and GetData() - virtual void Close(); - - // query whether the clipboard is opened - virtual bool IsOpened() const; - - // set the clipboard data. all other formats will be deleted. - virtual bool SetData( wxDataObject *data ); - - // add to the clipboard data. - virtual bool AddData( wxDataObject *data ); - - // ask if data in correct format is available - virtual bool IsSupported( const wxDataFormat& format ); - - // ask if data in correct format is available - virtual bool IsSupportedAsync( wxEvtHandler *sink ); - - // fill data with data on the clipboard (if available) - virtual bool GetData( wxDataObject& data ); - - // clears wxTheClipboard and the system's clipboard if possible - virtual void Clear(); - - - - // implementation from now on - // -------------------------- - - // get our clipboard item (depending on m_usePrimary value) - GdkAtom GTKGetClipboardAtom() const; - - // get the data object currently being requested - wxDataObject *GTKGetDataObject( GdkAtom atom ); - - // clear the data for the given clipboard kind - void GTKClearData(Kind kind); - - // called when selection data is received - void GTKOnSelectionReceived(const GtkSelectionData& sel); - - // called when available target information is received - bool GTKOnTargetReceived(const wxDataFormat& format); - -private: - // the data object for the specific selection - wxDataObject *& Data(Kind kind) - { - return kind == Primary ? m_dataPrimary : m_dataClipboard; - } - - // the data object we're currently using - wxDataObject *& Data() - { - return Data(m_usePrimary ? Primary : Clipboard); - } - - - // set or unset selection ownership - bool SetSelectionOwner(bool set = true); - - // add atom to the list of supported targets - void AddSupportedTarget(GdkAtom atom); - - // check if the given format is supported - bool DoIsSupported(const wxDataFormat& format); - - - // both of these pointers can be non-NULL simultaneously but we only use - // one of them at any moment depending on m_usePrimary value, use Data() - // (from inside) or GTKGetDataObject() (from outside) accessors - wxDataObject *m_dataPrimary, - *m_dataClipboard; - - // this is used to temporarily hold the object passed to our GetData() so - // that GTK callbacks could access it - wxDataObject *m_receivedData; - - // used to pass information about the format we need from DoIsSupported() - // to GTKOnTargetReceived() - GdkAtom m_targetRequested; - - GtkWidget *m_clipboardWidget; // for getting and offering data - GtkWidget *m_targetsWidget; // for getting list of supported formats - - // ID of the connection to "selection_get" signal, initially 0. - unsigned long m_idSelectionGetHandler; - - bool m_open; - bool m_formatSupported; - -public: - // async stuff - wxEvtHandlerRef m_sink; -private: - GtkWidget *m_targetsWidgetAsync; // for getting list of supported formats - - DECLARE_DYNAMIC_CLASS(wxClipboard) -}; - -#endif // _WX_GTK_CLIPBOARD_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/clrpicker.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/clrpicker.h deleted file mode 100644 index 4a375fb849..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/clrpicker.h +++ /dev/null @@ -1,64 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/clrpicker.h -// Purpose: wxColourButton header -// Author: Francesco Montorsi -// Modified by: -// Created: 14/4/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_CLRPICKER_H_ -#define _WX_GTK_CLRPICKER_H_ - -#include "wx/button.h" - -//----------------------------------------------------------------------------- -// wxColourButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxColourButton : public wxButton, - public wxColourPickerWidgetBase -{ -public: - wxColourButton() : m_topParent(NULL) {} - wxColourButton(wxWindow *parent, - wxWindowID id, - const wxColour& initial = *wxBLACK, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCLRBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxColourPickerWidgetNameStr) - : m_topParent(NULL) - { - Create(parent, id, initial, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxColour& initial = *wxBLACK, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCLRBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxColourPickerWidgetNameStr); - - virtual ~wxColourButton(); - -protected: - void UpdateColour(); - -public: // used by the GTK callback only - - void GTKSetColour(const wxColour& colour) - { m_colour = colour; } - - wxWindow *m_topParent; - -private: - DECLARE_DYNAMIC_CLASS(wxColourButton) -}; - -#endif // _WX_GTK_CLRPICKER_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/collpane.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/collpane.h deleted file mode 100644 index 7503b8e1b2..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/collpane.h +++ /dev/null @@ -1,79 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/collpane.h -// Purpose: wxCollapsiblePane -// Author: Francesco Montorsi -// Modified by: -// Created: 8/10/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_COLLAPSABLE_PANEL_H_GTK_ -#define _WX_COLLAPSABLE_PANEL_H_GTK_ - -// ---------------------------------------------------------------------------- -// wxCollapsiblePane -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCollapsiblePane : public wxCollapsiblePaneBase -{ -public: - wxCollapsiblePane() { Init(); } - - wxCollapsiblePane(wxWindow *parent, - wxWindowID winid, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCP_DEFAULT_STYLE, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxCollapsiblePaneNameStr) - { - Init(); - - Create(parent, winid, label, pos, size, style, val, name); - } - - bool Create(wxWindow *parent, - wxWindowID winid, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCP_DEFAULT_STYLE, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxCollapsiblePaneNameStr); - - virtual void Collapse(bool collapse = true); - virtual bool IsCollapsed() const; - virtual void SetLabel(const wxString& str); - - virtual wxWindow *GetPane() const { return m_pPane; } - virtual wxString GetLabel() const { return m_strLabel; } - -protected: - virtual wxSize DoGetBestSize() const; - -public: // used by GTK callbacks - bool m_bIgnoreNextChange; - wxSize m_szCollapsed; - - wxWindow *m_pPane; - - // the button label without ">>" or "<<" - wxString m_strLabel; - -private: - void Init() - { - m_bIgnoreNextChange = false; - } - - void OnSize(wxSizeEvent&); - virtual void AddChildGTK(wxWindowGTK* child); - GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - - DECLARE_DYNAMIC_CLASS(wxCollapsiblePane) - DECLARE_EVENT_TABLE() -}; - -#endif // _WX_COLLAPSABLE_PANEL_H_GTK_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/colordlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/colordlg.h deleted file mode 100644 index a1fdbb75ec..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/colordlg.h +++ /dev/null @@ -1,48 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/colordlg.h -// Purpose: wxColourDialog -// Author: Vaclav Slavik -// Modified by: -// Created: 2004/06/04 -// Copyright: (c) Vaclav Slavik, 2004 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_COLORDLG_H_ -#define _WX_GTK_COLORDLG_H_ - -#include "wx/dialog.h" - -class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog -{ -public: - wxColourDialog() {} - wxColourDialog(wxWindow *parent, - wxColourData *data = NULL); - virtual ~wxColourDialog() {} - - bool Create(wxWindow *parent, wxColourData *data = NULL); - - wxColourData &GetColourData() { return m_data; } - - virtual int ShowModal(); - -protected: - // implement some base class methods to do nothing to avoid asserts and - // GTK warnings, since this is not a real wxDialog. - virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} - virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) {} - - // copy data between the dialog and m_colourData: - void ColourDataToDialog(); - void DialogToColourData(); - - wxColourData m_data; - - DECLARE_DYNAMIC_CLASS(wxColourDialog) -}; - -#endif diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/colour.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/colour.h deleted file mode 100644 index d48d707cbe..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/colour.h +++ /dev/null @@ -1,59 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/colour.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_COLOUR_H_ -#define _WX_GTK_COLOUR_H_ - -#ifdef __WXGTK3__ -typedef struct _GdkRGBA GdkRGBA; -#endif - -//----------------------------------------------------------------------------- -// wxColour -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxColour : public wxColourBase -{ -public: - // constructors - // ------------ - DEFINE_STD_WXCOLOUR_CONSTRUCTORS - wxColour(const GdkColor& gdkColor); -#ifdef __WXGTK3__ - wxColour(const GdkRGBA& gdkRGBA); -#endif - - virtual ~wxColour(); - - bool operator==(const wxColour& col) const; - bool operator!=(const wxColour& col) const { return !(*this == col); } - - unsigned char Red() const; - unsigned char Green() const; - unsigned char Blue() const; - unsigned char Alpha() const; - - // Implementation part -#ifdef __WXGTK3__ - operator const GdkRGBA*() const; -#else - void CalcPixel( GdkColormap *cmap ); - int GetPixel() const; -#endif - const GdkColor *GetColor() const; - -protected: - virtual void - InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); - - virtual bool FromString(const wxString& str); - - DECLARE_DYNAMIC_CLASS(wxColour) -}; - -#endif // _WX_GTK_COLOUR_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/combobox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/combobox.h deleted file mode 100644 index c655991e3c..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/combobox.h +++ /dev/null @@ -1,166 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/combobox.h -// Purpose: -// Author: Robert Roebling -// Created: 01/02/97 -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_COMBOBOX_H_ -#define _WX_GTK_COMBOBOX_H_ - -#include "wx/choice.h" - -typedef struct _GtkEntry GtkEntry; - -//----------------------------------------------------------------------------- -// wxComboBox -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxComboBox : public wxChoice, - public wxTextEntry -{ -public: - wxComboBox() - : wxChoice(), wxTextEntry() - { - Init(); - } - wxComboBox(wxWindow *parent, - wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) - : wxChoice(), wxTextEntry() - { - Init(); - Create(parent, id, value, pos, size, n, choices, style, validator, name); - } - - wxComboBox(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) - : wxChoice(), wxTextEntry() - { - Init(); - Create(parent, id, value, pos, size, choices, style, validator, name); - } - ~wxComboBox(); - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (const wxString *) NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - bool Create(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - - // Set/GetSelection() from wxTextEntry and wxChoice - - virtual void SetSelection(int n) { wxChoice::SetSelection(n); } - virtual void SetSelection(long from, long to) - { wxTextEntry::SetSelection(from, to); } - - virtual int GetSelection() const { return wxChoice::GetSelection(); } - virtual void GetSelection(long *from, long *to) const - { return wxTextEntry::GetSelection(from, to); } - - virtual wxString GetStringSelection() const - { - return wxItemContainer::GetStringSelection(); - } - - virtual void SetString(unsigned int n, const wxString& string); - - virtual void Popup(); - virtual void Dismiss(); - - virtual void Clear() - { - wxTextEntry::Clear(); - wxItemContainer::Clear(); - } - - // See wxComboBoxBase discussion of IsEmpty(). - bool IsListEmpty() const { return wxItemContainer::IsEmpty(); } - bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); } - - void OnChar( wxKeyEvent &event ); - - virtual void SetValue(const wxString& value); - - // Standard event handling - void OnCut(wxCommandEvent& event); - void OnCopy(wxCommandEvent& event); - void OnPaste(wxCommandEvent& event); - void OnUndo(wxCommandEvent& event); - void OnRedo(wxCommandEvent& event); - void OnDelete(wxCommandEvent& event); - void OnSelectAll(wxCommandEvent& event); - - void OnUpdateCut(wxUpdateUIEvent& event); - void OnUpdateCopy(wxUpdateUIEvent& event); - void OnUpdatePaste(wxUpdateUIEvent& event); - void OnUpdateUndo(wxUpdateUIEvent& event); - void OnUpdateRedo(wxUpdateUIEvent& event); - void OnUpdateDelete(wxUpdateUIEvent& event); - void OnUpdateSelectAll(wxUpdateUIEvent& event); - - virtual void GTKDisableEvents(); - virtual void GTKEnableEvents(); - GtkWidget* GetConnectWidget(); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -protected: - // From wxWindowGTK: - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - - // Widgets that use the style->base colour for the BG colour should - // override this and return true. - virtual bool UseGTKStyleBase() const { return true; } - - // Override in derived classes to create combo box widgets with - // custom list stores. - virtual void GTKCreateComboBoxWidget(); - - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; - - virtual GtkEntry *GetEntry() const - { return m_entry; } - - GtkEntry* m_entry; - -private: - // From wxTextEntry: - virtual wxWindow *GetEditableWindow() { return this; } - virtual GtkEditable *GetEditable() const; - virtual void EnableTextChangedEvents(bool enable); - - void Init(); - - DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox) - DECLARE_EVENT_TABLE() -}; - -#endif // _WX_GTK_COMBOBOX_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/control.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/control.h deleted file mode 100644 index 454d1fc90d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/control.h +++ /dev/null @@ -1,93 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/control.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_CONTROL_H_ -#define _WX_GTK_CONTROL_H_ - -typedef struct _GtkLabel GtkLabel; -typedef struct _GtkFrame GtkFrame; -typedef struct _GtkEntry GtkEntry; - -//----------------------------------------------------------------------------- -// wxControl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxControl : public wxControlBase -{ - typedef wxControlBase base_type; -public: - wxControl(); - wxControl(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxControlNameStr) - { - Create(parent, id, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxControlNameStr); - - virtual wxVisualAttributes GetDefaultAttributes() const; -#ifdef __WXGTK3__ - virtual bool SetFont(const wxFont& font); -#endif - -protected: - virtual wxSize DoGetBestSize() const; - void PostCreation(const wxSize& size); - - // sets the label to the given string and also sets it for the given widget - void GTKSetLabelForLabel(GtkLabel *w, const wxString& label); -#if wxUSE_MARKUP - void GTKSetLabelWithMarkupForLabel(GtkLabel *w, const wxString& label); -#endif // wxUSE_MARKUP - - // GtkFrame helpers - GtkWidget* GTKCreateFrame(const wxString& label); - void GTKSetLabelForFrame(GtkFrame *w, const wxString& label); - void GTKFrameApplyWidgetStyle(GtkFrame* w, GtkRcStyle* rc); - void GTKFrameSetMnemonicWidget(GtkFrame* w, GtkWidget* widget); - - // remove mnemonics ("&"s) from the label - static wxString GTKRemoveMnemonics(const wxString& label); - - // converts wx label to GTK+ label, i.e. basically replace "&"s with "_"s - static wxString GTKConvertMnemonics(const wxString &label); - - // converts wx label to GTK+ labels preserving Pango markup - static wxString GTKConvertMnemonicsWithMarkup(const wxString& label); - - // These are used by GetDefaultAttributes - static wxVisualAttributes - GetDefaultAttributesFromGTKWidget(GtkWidget* widget, - bool useBase = false, - int state = 0); - - // Widgets that use the style->base colour for the BG colour should - // override this and return true. - virtual bool UseGTKStyleBase() const { return false; } - - // Fix sensitivity due to bug in GTK+ < 2.14 - void GTKFixSensitivity(bool onlyIfUnderMouse = true); - - // Ask GTK+ for preferred size. Use it after setting the font. - wxSize GTKGetPreferredSize(GtkWidget* widget) const; - - // Inner margins in a GtkEntry - wxPoint GTKGetEntryMargins(GtkEntry* entry) const; - -private: - DECLARE_DYNAMIC_CLASS(wxControl) -}; - -#endif // _WX_GTK_CONTROL_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/cursor.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/cursor.h deleted file mode 100644 index e1915efc1d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/cursor.h +++ /dev/null @@ -1,59 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/cursor.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_CURSOR_H_ -#define _WX_GTK_CURSOR_H_ - -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" - -class WXDLLIMPEXP_FWD_CORE wxColour; -class WXDLLIMPEXP_FWD_CORE wxImage; - -//----------------------------------------------------------------------------- -// wxCursor -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject -{ -public: - wxCursor(); - wxCursor(wxStockCursor id) { InitFromStock(id); } -#if WXWIN_COMPATIBILITY_2_8 - wxCursor(int id) { InitFromStock((wxStockCursor)id); } -#endif -#if wxUSE_IMAGE - wxCursor( const wxImage & image ); - wxCursor(const wxString& name, - wxBitmapType type = wxCURSOR_DEFAULT_TYPE, - int hotSpotX = 0, int hotSpotY = 0); -#endif - wxCursor( const char bits[], int width, int height, - int hotSpotX = -1, int hotSpotY = -1, - const char maskBits[] = NULL, - const wxColour* fg = NULL, const wxColour* bg = NULL); - virtual ~wxCursor(); - - // implementation - - GdkCursor *GetCursor() const; - -protected: - void InitFromStock(wxStockCursor); -#if wxUSE_IMAGE - void InitFromImage(const wxImage& image); -#endif - - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - DECLARE_DYNAMIC_CLASS(wxCursor) -}; - -#endif // _WX_GTK_CURSOR_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dataform.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dataform.h deleted file mode 100644 index b7c3be71f3..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dataform.h +++ /dev/null @@ -1,80 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dataform.h -// Purpose: declaration of the wxDataFormat class -// Author: Vadim Zeitlin -// Modified by: -// Created: 19.10.99 (extracted from gtk/dataobj.h) -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_DATAFORM_H -#define _WX_GTK_DATAFORM_H - -class WXDLLIMPEXP_CORE wxDataFormat -{ -public: - // the clipboard formats under GDK are GdkAtoms - typedef GdkAtom NativeFormat; - - wxDataFormat(); - wxDataFormat( wxDataFormatId type ); - wxDataFormat( NativeFormat format ); - - // we have to provide all the overloads to allow using strings instead of - // data formats (as a lot of existing code does) - wxDataFormat( const wxString& id ) { InitFromString(id); } - wxDataFormat( const char *id ) { InitFromString(id); } - wxDataFormat( const wchar_t *id ) { InitFromString(id); } - wxDataFormat( const wxCStrData& id ) { InitFromString(id); } - - wxDataFormat& operator=(const wxDataFormat& format) - { - if (&format != this) - { - m_type = format.m_type; - m_format = format.m_format; - } - return *this; - } - wxDataFormat& operator=(NativeFormat format) - { SetId(format); return *this; } - - // comparison (must have both versions) - bool operator==(NativeFormat format) const - { return m_format == (NativeFormat)format; } - bool operator!=(NativeFormat format) const - { return m_format != (NativeFormat)format; } - bool operator==(wxDataFormatId format) const - { return m_type == (wxDataFormatId)format; } - bool operator!=(wxDataFormatId format) const - { return m_type != (wxDataFormatId)format; } - - // explicit and implicit conversions to NativeFormat which is one of - // standard data types (implicit conversion is useful for preserving the - // compatibility with old code) - NativeFormat GetFormatId() const { return m_format; } - operator NativeFormat() const { return m_format; } - - void SetId( NativeFormat format ); - - // string ids are used for custom types - this SetId() must be used for - // application-specific formats - wxString GetId() const; - void SetId( const wxString& id ); - - // implementation - wxDataFormatId GetType() const; - void SetType( wxDataFormatId type ); - -private: - // common part of ctors from format name - void InitFromString(const wxString& id); - - wxDataFormatId m_type; - NativeFormat m_format; - - void PrepareFormats(); -}; - -#endif // _WX_GTK_DATAFORM_H diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dataobj.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dataobj.h deleted file mode 100644 index 859093fcb2..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dataobj.h +++ /dev/null @@ -1,26 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dataobj.h -// Purpose: declaration of the wxDataObject -// Author: Robert Roebling -// Copyright: (c) 1998, 1999 Vadim Zeitlin, Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_DATAOBJ_H_ -#define _WX_GTK_DATAOBJ_H_ - -// ---------------------------------------------------------------------------- -// wxDataObject is the same as wxDataObjectBase under wxGTK -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase -{ -public: - wxDataObject(); - virtual ~wxDataObject(); - - virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const; -}; - -#endif // _WX_GTK_DATAOBJ_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dataobj2.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dataobj2.h deleted file mode 100644 index 62f380a429..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dataobj2.h +++ /dev/null @@ -1,114 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dataobj2.h -// Purpose: declaration of standard wxDataObjectSimple-derived classes -// Author: Robert Roebling -// Created: 19.10.99 (extracted from gtk/dataobj.h) -// Copyright: (c) 1998, 1999 Vadim Zeitlin, Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_DATAOBJ2_H_ -#define _WX_GTK_DATAOBJ2_H_ - -// ---------------------------------------------------------------------------- -// wxBitmapDataObject is a specialization of wxDataObject for bitmaps -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase -{ -public: - // ctors - wxBitmapDataObject(); - wxBitmapDataObject(const wxBitmap& bitmap); - - // destr - virtual ~wxBitmapDataObject(); - - // override base class virtual to update PNG data too - virtual void SetBitmap(const wxBitmap& bitmap); - - // implement base class pure virtuals - // ---------------------------------- - - virtual size_t GetDataSize() const { return m_pngSize; } - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); - // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const - { - return GetDataSize(); - } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const - { - return GetDataHere(buf); - } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) - { - return SetData(len, buf); - } - -protected: - void Clear() { free(m_pngData); } - void ClearAll() { Clear(); Init(); } - - size_t m_pngSize; - void *m_pngData; - - void DoConvertToPng(); - -private: - void Init() { m_pngData = NULL; m_pngSize = 0; } -}; - -// ---------------------------------------------------------------------------- -// wxFileDataObject is a specialization of wxDataObject for file names -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase -{ -public: - // implement base class pure virtuals - // ---------------------------------- - - void AddFile( const wxString &filename ); - - virtual size_t GetDataSize() const; - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); - // Must provide overloads to avoid hiding them (and warnings about it) - virtual size_t GetDataSize(const wxDataFormat&) const - { - return GetDataSize(); - } - virtual bool GetDataHere(const wxDataFormat&, void *buf) const - { - return GetDataHere(buf); - } - virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) - { - return SetData(len, buf); - } -}; - -// ---------------------------------------------------------------------------- -// wxURLDataObject is a specialization of wxDataObject for URLs -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxURLDataObject : public wxDataObjectComposite -{ -public: - wxURLDataObject(const wxString& url = wxEmptyString); - - wxString GetURL() const; - void SetURL(const wxString& url); - -private: - class wxTextURIListDataObject* const m_dobjURIList; - wxTextDataObject* const m_dobjText; - - wxDECLARE_NO_COPY_CLASS(wxURLDataObject); -}; - - -#endif // _WX_GTK_DATAOBJ2_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dataview.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dataview.h deleted file mode 100644 index 44d2af93b2..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dataview.h +++ /dev/null @@ -1,230 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dataview.h -// Purpose: wxDataViewCtrl GTK+2 implementation header -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKDATAVIEWCTRL_H_ -#define _WX_GTKDATAVIEWCTRL_H_ - -#include "wx/list.h" - -class WXDLLIMPEXP_FWD_ADV wxDataViewCtrlInternal; - -struct _GtkTreePath; - -// --------------------------------------------------------- -// wxDataViewColumn -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase -{ -public: - wxDataViewColumn( const wxString &title, wxDataViewRenderer *renderer, - unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE ); - wxDataViewColumn( const wxBitmap &bitmap, wxDataViewRenderer *renderer, - unsigned int model_column, int width = wxDVC_DEFAULT_WIDTH, - wxAlignment align = wxALIGN_CENTER, - int flags = wxDATAVIEW_COL_RESIZABLE ); - - - // setters: - - virtual void SetTitle( const wxString &title ); - virtual void SetBitmap( const wxBitmap &bitmap ); - - virtual void SetOwner( wxDataViewCtrl *owner ); - - virtual void SetAlignment( wxAlignment align ); - - virtual void SetSortable( bool sortable ); - virtual void SetSortOrder( bool ascending ); - - virtual void SetResizeable( bool resizable ); - virtual void SetHidden( bool hidden ); - - virtual void SetMinWidth( int minWidth ); - virtual void SetWidth( int width ); - - virtual void SetReorderable( bool reorderable ); - - virtual void SetFlags(int flags) { SetIndividualFlags(flags); } - - // getters: - - virtual wxString GetTitle() const; - virtual wxAlignment GetAlignment() const; - - virtual bool IsSortable() const; - virtual bool IsSortOrderAscending() const; - virtual bool IsSortKey() const; - - virtual bool IsResizeable() const; - virtual bool IsHidden() const; - - virtual int GetWidth() const; - virtual int GetMinWidth() const; - - virtual bool IsReorderable() const; - - virtual int GetFlags() const { return GetFromIndividualFlags(); } - - // implementation - GtkWidget* GetGtkHandle() const { return m_column; } - -private: - // holds the GTK handle - GtkWidget *m_column; - - // holds GTK handles for title/bitmap in the header - GtkWidget *m_image; - GtkWidget *m_label; - - // delayed connection to mouse events - friend class wxDataViewCtrl; - void OnInternalIdle(); - bool m_isConnected; - - void Init(wxAlignment align, int flags, int width); -}; - -WX_DECLARE_LIST_WITH_DECL(wxDataViewColumn, wxDataViewColumnList, - class WXDLLIMPEXP_ADV); - -// --------------------------------------------------------- -// wxDataViewCtrl -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase -{ -public: - wxDataViewCtrl() - { - Init(); - } - - wxDataViewCtrl( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDataViewCtrlNameStr ) - { - Init(); - - Create(parent, id, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxDataViewCtrlNameStr); - - virtual ~wxDataViewCtrl(); - - virtual bool AssociateModel( wxDataViewModel *model ); - - virtual bool PrependColumn( wxDataViewColumn *col ); - virtual bool AppendColumn( wxDataViewColumn *col ); - virtual bool InsertColumn( unsigned int pos, wxDataViewColumn *col ); - - virtual unsigned int GetColumnCount() const; - virtual wxDataViewColumn* GetColumn( unsigned int pos ) const; - virtual bool DeleteColumn( wxDataViewColumn *column ); - virtual bool ClearColumns(); - virtual int GetColumnPosition( const wxDataViewColumn *column ) const; - - virtual wxDataViewColumn *GetSortingColumn() const; - - virtual int GetSelectedItemsCount() const; - virtual int GetSelections( wxDataViewItemArray & sel ) const; - virtual void SetSelections( const wxDataViewItemArray & sel ); - virtual void Select( const wxDataViewItem & item ); - virtual void Unselect( const wxDataViewItem & item ); - virtual bool IsSelected( const wxDataViewItem & item ) const; - virtual void SelectAll(); - virtual void UnselectAll(); - - virtual void EnsureVisible( const wxDataViewItem& item, - const wxDataViewColumn *column = NULL ); - virtual void HitTest( const wxPoint &point, - wxDataViewItem &item, - wxDataViewColumn *&column ) const; - virtual wxRect GetItemRect( const wxDataViewItem &item, - const wxDataViewColumn *column = NULL ) const; - - virtual bool SetRowHeight( int rowHeight ); - - virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column); - - virtual void Expand( const wxDataViewItem & item ); - virtual void Collapse( const wxDataViewItem & item ); - virtual bool IsExpanded( const wxDataViewItem & item ) const; - - virtual bool EnableDragSource( const wxDataFormat &format ); - virtual bool EnableDropTarget( const wxDataFormat &format ); - - virtual wxDataViewColumn *GetCurrentColumn() const; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - wxWindow *GetMainWindow() { return (wxWindow*) this; } - - GtkWidget *GtkGetTreeView() { return m_treeview; } - wxDataViewCtrlInternal* GtkGetInternal() { return m_internal; } - - // Convert GTK path to our item. Returned item may be invalid if get_iter() - // failed. - wxDataViewItem GTKPathToItem(struct _GtkTreePath *path) const; - - virtual void OnInternalIdle(); - - int GTKGetUniformRowHeight() const { return m_uniformRowHeight; } - -protected: - virtual void DoSetExpanderColumn(); - virtual void DoSetIndent(); - - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - -private: - void Init(); - - virtual wxDataViewItem DoGetCurrentItem() const; - virtual void DoSetCurrentItem(const wxDataViewItem& item); - - // Return wxDataViewColumn matching the given GtkTreeViewColumn. - // - // If the input argument is NULL, return NULL too. Otherwise we must find - // the matching column and assert if we didn't. - wxDataViewColumn* FromGTKColumn(GtkTreeViewColumn *gtk_col) const; - - friend class wxDataViewCtrlDCImpl; - friend class wxDataViewColumn; - friend class wxDataViewCtrlInternal; - - GtkWidget *m_treeview; - wxDataViewCtrlInternal *m_internal; - wxDataViewColumnList m_cols; - wxDataViewItem m_ensureVisibleDefered; - - // By default this is set to -1 and the height of the rows is determined by - // GetRect() methods of the renderers but this can be set to a positive - // value to force the height of all rows to the given value. - int m_uniformRowHeight; - - virtual void AddChildGTK(wxWindowGTK* child); - void GtkEnableSelectionEvents(); - void GtkDisableSelectionEvents(); - - DECLARE_DYNAMIC_CLASS(wxDataViewCtrl) - wxDECLARE_NO_COPY_CLASS(wxDataViewCtrl); -}; - - -#endif // _WX_GTKDATAVIEWCTRL_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dc.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dc.h deleted file mode 100644 index 7eb9dd1267..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dc.h +++ /dev/null @@ -1,155 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dc.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKDC_H_ -#define _WX_GTKDC_H_ - -#ifdef __WXGTK3__ - -#include "wx/dcgraph.h" - -class wxGTKCairoDCImpl: public wxGCDCImpl -{ - typedef wxGCDCImpl base_type; -public: - wxGTKCairoDCImpl(wxDC* owner); - wxGTKCairoDCImpl(wxDC* owner, int); - wxGTKCairoDCImpl(wxDC* owner, wxWindow* window); - - virtual void DoDrawBitmap(const wxBitmap& bitmap, int x, int y, bool useMask); - virtual void DoDrawIcon(const wxIcon& icon, int x, int y); -#if wxUSE_IMAGE - virtual bool DoFloodFill(int x, int y, const wxColour& col, wxFloodFillStyle style); -#endif - virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const; - virtual bool DoGetPixel(int x, int y, wxColour* col) const; - virtual void DoGetSize(int* width, int* height) const; - virtual bool DoStretchBlit(int xdest, int ydest, int dstWidth, int dstHeight, wxDC* source, int xsrc, int ysrc, int srcWidth, int srcHeight, wxRasterOperationMode rop, bool useMask, int xsrcMask, int ysrcMask); - virtual void* GetCairoContext() const; - -protected: - int m_width, m_height; - - wxDECLARE_NO_COPY_CLASS(wxGTKCairoDCImpl); -}; -//----------------------------------------------------------------------------- - -class wxWindowDCImpl: public wxGTKCairoDCImpl -{ - typedef wxGTKCairoDCImpl base_type; -public: - wxWindowDCImpl(wxWindowDC* owner, wxWindow* window); - - wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl); -}; -//----------------------------------------------------------------------------- - -class wxClientDCImpl: public wxGTKCairoDCImpl -{ - typedef wxGTKCairoDCImpl base_type; -public: - wxClientDCImpl(wxClientDC* owner, wxWindow* window); - - wxDECLARE_NO_COPY_CLASS(wxClientDCImpl); -}; -//----------------------------------------------------------------------------- - -class wxPaintDCImpl: public wxGTKCairoDCImpl -{ - typedef wxGTKCairoDCImpl base_type; -public: - wxPaintDCImpl(wxPaintDC* owner, wxWindow* window); - - wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl); -}; -//----------------------------------------------------------------------------- - -class wxScreenDCImpl: public wxGTKCairoDCImpl -{ - typedef wxGTKCairoDCImpl base_type; -public: - wxScreenDCImpl(wxScreenDC* owner); - - wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl); -}; -//----------------------------------------------------------------------------- - -class wxMemoryDCImpl: public wxGTKCairoDCImpl -{ - typedef wxGTKCairoDCImpl base_type; -public: - wxMemoryDCImpl(wxMemoryDC* owner); - wxMemoryDCImpl(wxMemoryDC* owner, wxBitmap& bitmap); - wxMemoryDCImpl(wxMemoryDC* owner, wxDC* dc); - virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const; - virtual void DoSelect(const wxBitmap& bitmap); - virtual const wxBitmap& GetSelectedBitmap() const; - virtual wxBitmap& GetSelectedBitmap(); - -private: - void Setup(); - wxBitmap m_bitmap; - - wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl); -}; -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGTKCairoDC: public wxDC -{ - typedef wxDC base_type; -public: - wxGTKCairoDC(cairo_t* cr); - - wxDECLARE_NO_COPY_CLASS(wxGTKCairoDC); -}; - -#else - -#include "wx/dc.h" - -//----------------------------------------------------------------------------- -// wxDC -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGTKDCImpl : public wxDCImpl -{ -public: - wxGTKDCImpl( wxDC *owner ); - virtual ~wxGTKDCImpl(); - -#if wxUSE_PALETTE - void SetColourMap( const wxPalette& palette ) { SetPalette(palette); } -#endif // wxUSE_PALETTE - - // Resolution in pixels per logical inch - virtual wxSize GetPPI() const; - - virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; } - virtual void EndDoc() { } - virtual void StartPage() { } - virtual void EndPage() { } - - virtual GdkWindow* GetGDKWindow() const { return NULL; } - virtual void* GetHandle() const { return GetGDKWindow(); } - - // base class pure virtuals implemented here - virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - virtual void DoGetSizeMM(int* width, int* height) const; - - DECLARE_ABSTRACT_CLASS(wxGTKDCImpl) -}; - -// this must be defined when wxDC::Blit() honours the DC origin and needed to -// allow wxUniv code in univ/winuniv.cpp to work with versions of wxGTK -// 2.3.[23] -#ifndef wxHAS_WORKING_GTK_DC_BLIT - #define wxHAS_WORKING_GTK_DC_BLIT -#endif - -#endif -#endif // _WX_GTKDC_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dcclient.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dcclient.h deleted file mode 100644 index 53469796a1..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dcclient.h +++ /dev/null @@ -1,161 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dcclient.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKDCCLIENT_H_ -#define _WX_GTKDCCLIENT_H_ - -#include "wx/gtk/dc.h" - -//----------------------------------------------------------------------------- -// wxWindowDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxGTKDCImpl -{ -public: - wxWindowDCImpl( wxDC *owner ); - wxWindowDCImpl( wxDC *owner, wxWindow *win ); - - virtual ~wxWindowDCImpl(); - - virtual bool CanDrawBitmap() const { return true; } - virtual bool CanGetTextExtent() const { return true; } - - virtual void DoGetSize(int *width, int *height) const; - virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, - wxFloodFillStyle style=wxFLOOD_SURFACE ); - virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const; - - virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ); - virtual void DoCrossHair( wxCoord x, wxCoord y ); - virtual void DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc ); - virtual void DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord height, - double sa, double ea ); - virtual void DoDrawPoint( wxCoord x, wxCoord y ); - - virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset); - virtual void DoDrawPolygon(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE); - - virtual void DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); - virtual void DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0 ); - virtual void DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); - - virtual void DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ); - virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y, - bool useMask = false ); - - virtual bool DoBlit( wxCoord xdest, wxCoord ydest, - wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode logical_func = wxCOPY, - bool useMask = false, - wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 ); - - virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y ); - virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, - double angle); - virtual void DoGetTextExtent( const wxString &string, - wxCoord *width, wxCoord *height, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const; - virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const; - virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); - virtual void DoSetDeviceClippingRegion( const wxRegion ®ion ); - - virtual wxCoord GetCharWidth() const; - virtual wxCoord GetCharHeight() const; - - virtual void Clear(); - - virtual void SetFont( const wxFont &font ); - virtual void SetPen( const wxPen &pen ); - virtual void SetBrush( const wxBrush &brush ); - virtual void SetBackground( const wxBrush &brush ); - virtual void SetLogicalFunction( wxRasterOperationMode function ); - virtual void SetTextForeground( const wxColour &col ); - virtual void SetTextBackground( const wxColour &col ); - virtual void SetBackgroundMode( int mode ); - virtual void SetPalette( const wxPalette& palette ); - - virtual void DestroyClippingRegion(); - - // Resolution in pixels per logical inch - virtual wxSize GetPPI() const; - virtual int GetDepth() const; - - // overrriden here for RTL - virtual void SetDeviceOrigin( wxCoord x, wxCoord y ); - virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp ); - -// protected: - // implementation - // -------------- - - GdkWindow *m_gdkwindow; - GdkGC *m_penGC; - GdkGC *m_brushGC; - GdkGC *m_textGC; - GdkGC *m_bgGC; - GdkColormap *m_cmap; - bool m_isScreenDC; - wxRegion m_currentClippingRegion; - wxRegion m_paintClippingRegion; - - // PangoContext stuff for GTK 2.0 - PangoContext *m_context; - PangoLayout *m_layout; - PangoFontDescription *m_fontdesc; - - void SetUpDC( bool ismem = false ); - void Destroy(); - - virtual void ComputeScaleAndOrigin(); - - virtual GdkWindow *GetGDKWindow() const { return m_gdkwindow; } - -private: - void DrawingSetup(GdkGC*& gc, bool& originChanged); - GdkPixmap* MonoToColor(GdkPixmap* monoPixmap, int x, int y, int w, int h) const; - - DECLARE_ABSTRACT_CLASS(wxWindowDCImpl) -}; - -//----------------------------------------------------------------------------- -// wxClientDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl -{ -public: - wxClientDCImpl( wxDC *owner ); - wxClientDCImpl( wxDC *owner, wxWindow *win ); - - virtual void DoGetSize(int *width, int *height) const; - - DECLARE_ABSTRACT_CLASS(wxClientDCImpl) -}; - -//----------------------------------------------------------------------------- -// wxPaintDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl -{ -public: - wxPaintDCImpl( wxDC *owner ); - wxPaintDCImpl( wxDC *owner, wxWindow *win ); - - DECLARE_ABSTRACT_CLASS(wxPaintDCImpl) -}; - -#endif // _WX_GTKDCCLIENT_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dcmemory.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dcmemory.h deleted file mode 100644 index 8afb45c52e..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dcmemory.h +++ /dev/null @@ -1,59 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dcmemory.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_DCMEMORY_H_ -#define _WX_GTK_DCMEMORY_H_ - -#include "wx/dcmemory.h" -#include "wx/gtk/dcclient.h" - -//----------------------------------------------------------------------------- -// wxMemoryDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxWindowDCImpl -{ -public: - wxMemoryDCImpl( wxMemoryDC *owner ); - wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap ); - wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc ); - - virtual ~wxMemoryDCImpl(); - - // these get reimplemented for mono-bitmaps to behave - // more like their Win32 couterparts. They now interpret - // wxWHITE, wxWHITE_BRUSH and wxWHITE_PEN as drawing 0 - // and everything else as drawing 1. - virtual void SetPen( const wxPen &pen ); - virtual void SetBrush( const wxBrush &brush ); - virtual void SetBackground( const wxBrush &brush ); - virtual void SetTextForeground( const wxColour &col ); - virtual void SetTextBackground( const wxColour &col ); - - // overridden from wxDCImpl - virtual void DoGetSize( int *width, int *height ) const; - virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const; - virtual void* GetHandle() const; - - // overridden for wxMemoryDC Impl - virtual void DoSelect(const wxBitmap& bitmap); - - virtual const wxBitmap& GetSelectedBitmap() const; - virtual wxBitmap& GetSelectedBitmap(); - -private: - wxBitmap m_selected; - - void Init(); - - DECLARE_ABSTRACT_CLASS(wxMemoryDCImpl) -}; - -#endif - // _WX_GTK_DCMEMORY_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dcscreen.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dcscreen.h deleted file mode 100644 index c91926b910..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dcscreen.h +++ /dev/null @@ -1,33 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dcscreen.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKDCSCREEN_H_ -#define _WX_GTKDCSCREEN_H_ - -#include "wx/dcscreen.h" -#include "wx/gtk/dcclient.h" - -//----------------------------------------------------------------------------- -// wxScreenDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxWindowDCImpl -{ -public: - wxScreenDCImpl( wxScreenDC *owner ); - ~wxScreenDCImpl(); - - virtual void DoGetSize(int *width, int *height) const; - -private: - void Init(); - - DECLARE_ABSTRACT_CLASS(wxScreenDCImpl) -}; - -#endif // _WX_GTKDCSCREEN_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dialog.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dialog.h deleted file mode 100644 index fcd7cd3db8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dialog.h +++ /dev/null @@ -1,52 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dialog.h -// Purpose: -// Author: Robert Roebling -// Created: -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKDIALOG_H_ -#define _WX_GTKDIALOG_H_ - -class WXDLLIMPEXP_FWD_CORE wxGUIEventLoop; - -//----------------------------------------------------------------------------- -// wxDialog -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase -{ -public: - wxDialog() { Init(); } - wxDialog( wxWindow *parent, wxWindowID id, - const wxString &title, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString &name = wxDialogNameStr ); - bool Create( wxWindow *parent, wxWindowID id, - const wxString &title, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString &name = wxDialogNameStr ); - virtual ~wxDialog(); - - virtual bool Show( bool show = true ); - virtual int ShowModal(); - virtual void EndModal( int retCode ); - virtual bool IsModal() const; - -private: - // common part of all ctors - void Init(); - - bool m_modalShowing; - wxGUIEventLoop *m_modalLoop; - - DECLARE_DYNAMIC_CLASS(wxDialog) -}; - -#endif // _WX_GTKDIALOG_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dirdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dirdlg.h deleted file mode 100644 index 8a05d55796..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dirdlg.h +++ /dev/null @@ -1,63 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dirdlg.h -// Purpose: wxDirDialog -// Author: Francesco Montorsi -// Copyright: (c) 2006 Francesco Montorsi -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKDIRDLGH__ -#define __GTKDIRDLGH__ - -//------------------------------------------------------------------------- -// wxDirDialog -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase -{ -public: - wxDirDialog() { } - - wxDirDialog(wxWindow *parent, - const wxString& message = wxDirSelectorPromptStr, - const wxString& defaultPath = wxEmptyString, - long style = wxDD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxString& name = wxDirDialogNameStr); - bool Create(wxWindow *parent, - const wxString& message = wxDirSelectorPromptStr, - const wxString& defaultPath = wxEmptyString, - long style = wxDD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxString& name = wxDirDialogNameStr); - virtual ~wxDirDialog() { } - - -public: // overrides from wxGenericDirDialog - - wxString GetPath() const; - void SetPath(const wxString& path); - - - // Implementation only. - - void GTKOnAccept(); - void GTKOnCancel(); - -protected: - // override this from wxTLW since the native - // form doesn't have any m_wxwindow - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - - -private: - wxString m_selectedDirectory; - - DECLARE_DYNAMIC_CLASS(wxDirDialog) -}; - -#endif // __GTKDIRDLGH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dnd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dnd.h deleted file mode 100644 index 0aea7b41f6..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dnd.h +++ /dev/null @@ -1,124 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dnd.h -// Purpose: declaration of the wxDropTarget class -// Author: Robert Roebling -// Copyright: (c) 1998 Vadim Zeitlin, Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_DND_H_ -#define _WX_GTK_DND_H_ - -#include "wx/icon.h" - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -// this macro may be used instead for wxDropSource ctor arguments: it will use -// the icon 'name' from an XPM file under GTK, but will expand to something -// else under MSW. If you don't use it, you will have to use #ifdef in the -// application code. -#define wxDROP_ICON(name) wxICON(name) - -//------------------------------------------------------------------------- -// wxDropTarget -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase -{ -public: - wxDropTarget(wxDataObject *dataObject = NULL ); - - virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def); - virtual bool OnDrop(wxCoord x, wxCoord y); - virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); - virtual bool GetData(); - - // Can only be called during OnXXX methods. - wxDataFormat GetMatchingPair(); - - // implementation - - GdkAtom GTKGetMatchingPair(bool quiet = false); - wxDragResult GTKFigureOutSuggestedAction(); - - void GtkRegisterWidget( GtkWidget *widget ); - void GtkUnregisterWidget( GtkWidget *widget ); - - GdkDragContext *m_dragContext; - GtkWidget *m_dragWidget; - GtkSelectionData *m_dragData; - unsigned m_dragTime; - bool m_firstMotion; // gdk has no "gdk_drag_enter" event - - void GTKSetDragContext( GdkDragContext *dc ) { m_dragContext = dc; } - void GTKSetDragWidget( GtkWidget *w ) { m_dragWidget = w; } - void GTKSetDragData( GtkSelectionData *sd ) { m_dragData = sd; } - void GTKSetDragTime(unsigned time) { m_dragTime = time; } -}; - -//------------------------------------------------------------------------- -// wxDropSource -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase -{ -public: - // constructor. set data later with SetData() - wxDropSource( wxWindow *win = NULL, - const wxIcon © = wxNullIcon, - const wxIcon &move = wxNullIcon, - const wxIcon &none = wxNullIcon); - - // constructor for setting one data object - wxDropSource( wxDataObject& data, - wxWindow *win, - const wxIcon © = wxNullIcon, - const wxIcon &move = wxNullIcon, - const wxIcon &none = wxNullIcon); - - virtual ~wxDropSource(); - - // set the icon corresponding to given drag result - void SetIcon(wxDragResult res, const wxIcon& icon) - { - if ( res == wxDragCopy ) - m_iconCopy = icon; - else if ( res == wxDragMove ) - m_iconMove = icon; - else - m_iconNone = icon; - } - - // start drag action - virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); - - void PrepareIcon( int action, GdkDragContext *context ); - - GtkWidget *m_widget; - GtkWidget *m_iconWindow; - GdkDragContext *m_dragContext; - wxWindow *m_window; - - wxDragResult m_retValue; - wxIcon m_iconCopy, - m_iconMove, - m_iconNone; - - bool m_waiting; - -private: - // common part of both ctors - void SetIcons(const wxIcon& copy, - const wxIcon& move, - const wxIcon& none); - - // GTK implementation - void GTKConnectDragSignals(); - void GTKDisconnectDragSignals(); - -}; - -#endif // _WX_GTK_DND_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dvrenderer.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dvrenderer.h deleted file mode 100644 index dfaba5609a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dvrenderer.h +++ /dev/null @@ -1,104 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dvrenderer.h -// Purpose: wxDataViewRenderer for GTK wxDataViewCtrl implementation -// Author: Robert Roebling, Vadim Zeitlin -// Created: 2009-11-07 (extracted from wx/gtk/dataview.h) -// Copyright: (c) 2006 Robert Roebling -// (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_DVRENDERER_H_ -#define _WX_GTK_DVRENDERER_H_ - -typedef struct _GtkCellRendererText GtkCellRendererText; -typedef struct _GtkTreeViewColumn GtkTreeViewColumn; - -// ---------------------------------------------------------------------------- -// wxDataViewRenderer -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewRenderer: public wxDataViewRendererBase -{ -public: - wxDataViewRenderer( const wxString &varianttype, - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - - virtual void SetMode( wxDataViewCellMode mode ); - virtual wxDataViewCellMode GetMode() const; - - virtual void SetAlignment( int align ); - virtual int GetAlignment() const; - - virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE); - virtual wxEllipsizeMode GetEllipsizeMode() const; - - // GTK-specific implementation - // --------------------------- - - // pack the GTK cell renderers used by this renderer to the given column - // - // by default only a single m_renderer is used but some renderers use more - // than one GTK cell renderer - virtual void GtkPackIntoColumn(GtkTreeViewColumn *column); - - // called when the cell value was edited by user with the new value - // - // it validates the new value and notifies the model about the change by - // calling GtkOnCellChanged() if it was accepted - virtual void GtkOnTextEdited(const char *itempath, const wxString& value); - - GtkCellRenderer* GetGtkHandle() { return m_renderer; } - void GtkInitHandlers(); - void GtkUpdateAlignment() { GtkApplyAlignment(m_renderer); } - - // should be overridden to return true if the renderer supports properties - // corresponding to wxDataViewItemAttr field, see wxGtkTreeCellDataFunc() - // for details - virtual bool GtkSupportsAttrs() const { return false; } - - // if GtkSupportsAttrs() returns true, this function will be called to - // effectively set the attribute to use for rendering the next item - // - // it should return true if the attribute had any non-default properties - virtual bool GtkSetAttr(const wxDataViewItemAttr& WXUNUSED(attr)) - { return false; } - - - // these functions are only called if GtkSupportsAttrs() returns true and - // are used to remember whether the renderer currently uses the default - // attributes or if we changed (and not reset them) - bool GtkIsUsingDefaultAttrs() const { return m_usingDefaultAttrs; } - void GtkSetUsingDefaultAttrs(bool def) { m_usingDefaultAttrs = def; } - - // return the text renderer used by this renderer for setting text cell - // specific attributes: can return NULL if this renderer doesn't render any - // text - virtual GtkCellRendererText *GtkGetTextRenderer() const { return NULL; } - - wxDataViewCellMode GtkGetMode() { return m_mode; } - -protected: - virtual void GtkOnCellChanged(const wxVariant& value, - const wxDataViewItem& item, - unsigned col); - - // Apply our effective alignment (i.e. m_alignment if specified or the - // associated column alignment by default) to the given renderer. - void GtkApplyAlignment(GtkCellRenderer *renderer); - - GtkCellRenderer *m_renderer; - int m_alignment; - wxDataViewCellMode m_mode; - - // true if we hadn't changed any visual attributes or restored them since - // doing this - bool m_usingDefaultAttrs; - -protected: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer) -}; - -#endif // _WX_GTK_DVRENDERER_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dvrenderers.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dvrenderers.h deleted file mode 100644 index 385fa73a0b..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/dvrenderers.h +++ /dev/null @@ -1,274 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/dvrenderers.h -// Purpose: All GTK wxDataViewCtrl renderer classes -// Author: Robert Roebling, Vadim Zeitlin -// Created: 2009-11-07 (extracted from wx/gtk/dataview.h) -// Copyright: (c) 2006 Robert Roebling -// (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_DVRENDERERS_H_ -#define _WX_GTK_DVRENDERERS_H_ - -#ifdef __WXGTK3__ - typedef struct _cairo_rectangle_int cairo_rectangle_int_t; - typedef cairo_rectangle_int_t GdkRectangle; -#else - typedef struct _GdkRectangle GdkRectangle; -#endif - -// --------------------------------------------------------- -// wxDataViewTextRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewTextRenderer: public wxDataViewRenderer -{ -public: - wxDataViewTextRenderer( const wxString &varianttype = "string", - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - - virtual bool SetValue( const wxVariant &value ) - { - return SetTextValue(value); - } - - virtual bool GetValue( wxVariant &value ) const - { - wxString str; - if ( !GetTextValue(str) ) - return false; - - value = str; - - return true; - } - - virtual void SetAlignment( int align ); - - virtual bool GtkSupportsAttrs() const { return true; } - virtual bool GtkSetAttr(const wxDataViewItemAttr& attr); - - virtual GtkCellRendererText *GtkGetTextRenderer() const; - -protected: - // implementation of Set/GetValue() - bool SetTextValue(const wxString& str); - bool GetTextValue(wxString& str) const; - - - DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer) -}; - -// --------------------------------------------------------- -// wxDataViewBitmapRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewBitmapRenderer: public wxDataViewRenderer -{ -public: - wxDataViewBitmapRenderer( const wxString &varianttype = "wxBitmap", - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - - bool SetValue( const wxVariant &value ); - bool GetValue( wxVariant &value ) const; - -protected: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer) -}; - -// --------------------------------------------------------- -// wxDataViewToggleRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewRenderer -{ -public: - wxDataViewToggleRenderer( const wxString &varianttype = "bool", - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - - bool SetValue( const wxVariant &value ); - bool GetValue( wxVariant &value ) const; - -protected: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer) -}; - -// --------------------------------------------------------- -// wxDataViewCustomRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewCustomRenderer: public wxDataViewCustomRendererBase -{ -public: - wxDataViewCustomRenderer( const wxString &varianttype = "string", - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT, - bool no_init = false ); - virtual ~wxDataViewCustomRenderer(); - - - // Create DC on request - virtual wxDC *GetDC(); - - // override the base class function to use GTK text cell renderer - virtual void RenderText(const wxString& text, - int xoffset, - wxRect cell, - wxDC *dc, - int state); - - struct GTKRenderParams; - - // store GTK render call parameters for possible later use - void GTKSetRenderParams(GTKRenderParams* renderParams) - { - m_renderParams = renderParams; - } - - // we may or not support attributes, as we don't know it, return true to - // make it possible to use them - virtual bool GtkSupportsAttrs() const { return true; } - - virtual bool GtkSetAttr(const wxDataViewItemAttr& attr) - { - SetAttr(attr); - return !attr.IsDefault(); - } - - virtual GtkCellRendererText *GtkGetTextRenderer() const; - -private: - bool Init(wxDataViewCellMode mode, int align); - - // Called from GtkGetTextRenderer() to really create the renderer if - // necessary. - void GtkInitTextRenderer(); - - wxDC *m_dc; - - GtkCellRendererText *m_text_renderer; - - // parameters of the original render() call stored so that we could pass - // them forward to m_text_renderer if our RenderText() is called - GTKRenderParams* m_renderParams; - - DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer) -}; - -// --------------------------------------------------------- -// wxDataViewProgressRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewProgressRenderer: public wxDataViewCustomRenderer -{ -public: - wxDataViewProgressRenderer( const wxString &label = wxEmptyString, - const wxString &varianttype = "long", - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - virtual ~wxDataViewProgressRenderer(); - - bool SetValue( const wxVariant &value ); - bool GetValue( wxVariant &value ) const; - - virtual bool Render( wxRect cell, wxDC *dc, int state ); - virtual wxSize GetSize() const; - -private: - void GTKSetLabel(); - - wxString m_label; - int m_value; - -#if !wxUSE_UNICODE - // Flag used to indicate that we need to set the label because we were - // unable to do it in the ctor (see comments there). - bool m_needsToSetLabel; -#endif // !wxUSE_UNICODE - -protected: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer) -}; - -// --------------------------------------------------------- -// wxDataViewIconTextRenderer -// --------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewTextRenderer -{ -public: - wxDataViewIconTextRenderer( const wxString &varianttype = "wxDataViewIconText", - wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT, - int align = wxDVR_DEFAULT_ALIGNMENT ); - virtual ~wxDataViewIconTextRenderer(); - - bool SetValue( const wxVariant &value ); - bool GetValue( wxVariant &value ) const; - - virtual void GtkPackIntoColumn(GtkTreeViewColumn *column); - -protected: - virtual void GtkOnCellChanged(const wxVariant& value, - const wxDataViewItem& item, - unsigned col); - -private: - wxDataViewIconText m_value; - - // we use the base class m_renderer for the text and this one for the icon - GtkCellRenderer *m_rendererIcon; - - DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer) -}; - -// ------------------------------------- -// wxDataViewChoiceRenderer -// ------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewChoiceRenderer: public wxDataViewCustomRenderer -{ -public: - wxDataViewChoiceRenderer(const wxArrayString &choices, - wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, - int alignment = wxDVR_DEFAULT_ALIGNMENT ); - virtual bool Render( wxRect rect, wxDC *dc, int state ); - virtual wxSize GetSize() const; - virtual bool SetValue( const wxVariant &value ); - virtual bool GetValue( wxVariant &value ) const; - - void SetAlignment( int align ); - - wxString GetChoice(size_t index) const { return m_choices[index]; } - const wxArrayString& GetChoices() const { return m_choices; } - -private: - wxArrayString m_choices; - wxString m_data; -}; - -// ---------------------------------------------------------------------------- -// wxDataViewChoiceByIndexRenderer -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxDataViewChoiceByIndexRenderer: public wxDataViewChoiceRenderer -{ -public: - wxDataViewChoiceByIndexRenderer( const wxArrayString &choices, - wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE, - int alignment = wxDVR_DEFAULT_ALIGNMENT ); - - virtual bool SetValue( const wxVariant &value ); - virtual bool GetValue( wxVariant &value ) const; - -private: - virtual void GtkOnTextEdited(const char *itempath, const wxString& str); -}; - - - -#endif // _WX_GTK_DVRENDERERS_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/evtloop.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/evtloop.h deleted file mode 100644 index ba8db406d5..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/evtloop.h +++ /dev/null @@ -1,47 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/evtloop.h -// Purpose: wxGTK event loop implementation -// Author: Vadim Zeitlin -// Created: 2008-12-27 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_EVTLOOP_H_ -#define _WX_GTK_EVTLOOP_H_ - -// ---------------------------------------------------------------------------- -// wxGUIEventLoop for wxGTK -// ---------------------------------------------------------------------------- - -typedef union _GdkEvent GdkEvent; - -class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxEventLoopBase -{ -public: - wxGUIEventLoop(); - - virtual void ScheduleExit(int rc = 0); - virtual bool Pending() const; - virtual bool Dispatch(); - virtual int DispatchTimeout(unsigned long timeout); - virtual void WakeUp(); - virtual bool YieldFor(long eventsToProcess); - - void StoreGdkEventForLaterProcessing(GdkEvent* ev) - { m_arrGdkEvents.Add(ev); } - -protected: - virtual int DoRun(); - -private: - // the exit code of this event loop - int m_exitcode; - - // used to temporarily store events in DoYield() - wxArrayPtrVoid m_arrGdkEvents; - - wxDECLARE_NO_COPY_CLASS(wxGUIEventLoop); -}; - -#endif // _WX_GTK_EVTLOOP_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/evtloopsrc.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/evtloopsrc.h deleted file mode 100644 index f80523424d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/evtloopsrc.h +++ /dev/null @@ -1,39 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/evtloopsrc.h -// Purpose: wxGTKEventLoopSource class -// Author: Vadim Zeitlin -// Created: 2009-10-21 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_EVTLOOPSRC_H_ -#define _WX_GTK_EVTLOOPSRC_H_ - -// ---------------------------------------------------------------------------- -// wxGTKEventLoopSource: wxEventLoopSource for GTK port -// ---------------------------------------------------------------------------- - -class wxGTKEventLoopSource : public wxEventLoopSource -{ -public: - // sourceId is the id of the watch in GTK context, not the FD of the file - // this source corresponds to - wxGTKEventLoopSource(unsigned sourceId, - wxEventLoopSourceHandler *handler, - int flags) - : wxEventLoopSource(handler, flags), - m_sourceId(sourceId) - { - } - - virtual ~wxGTKEventLoopSource(); - -private: - const unsigned m_sourceId; - - wxDECLARE_NO_COPY_CLASS(wxGTKEventLoopSource); -}; - -#endif // _WX_GTK_EVTLOOPSRC_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/filectrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/filectrl.h deleted file mode 100644 index 3de17e3af8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/filectrl.h +++ /dev/null @@ -1,144 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/filectrl.h -// Purpose: wxGtkFileCtrl Header -// Author: Diaa M. Sami -// Modified by: -// Created: Aug-10-2007 -// Copyright: (c) Diaa M. Sami -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - - -#ifndef _WX_GTK_FILECTRL_H_ -#define _WX_GTK_FILECTRL_H_ - -#include "wx/control.h" -#include "wx/filectrl.h" - -extern WXDLLIMPEXP_DATA_CORE(const char) wxFileSelectorDefaultWildcardStr[]; - -typedef struct _GtkFileChooser GtkFileChooser; - -// [GTK] current problems: -// All methods(e.g. SetFilename(), SetPath(), etc) which change the state of -// the control result in events fired, such events should be suppressed. -// ------ -// Sometimes a selection event(with 0 files) is fired before -// wxEVT_FILECTRL_FOLDERCHANGED, unfortunately this can hardly be detected! - -// A wx wrapper for any Gtk object implementing the interface GtkFileChooser - -class WXDLLIMPEXP_CORE wxGtkFileChooser -{ -public: - wxGtkFileChooser() { m_ignoreNextFilterEvent = false; } - - void SetWidget(GtkFileChooser *w); - - wxString GetPath() const; - void GetPaths( wxArrayString& paths ) const; - wxString GetDirectory() const; - wxString GetFilename() const; - void GetFilenames( wxArrayString& files ) const; - int GetFilterIndex() const; - - bool SetPath( const wxString& path ); - bool SetDirectory( const wxString& dir ); - void SetWildcard( const wxString& wildCard ); - void SetFilterIndex( int filterIndex ); - - bool HasFilterChoice() const; - - bool ShouldIgnoreNextFilterEvent() const { return m_ignoreNextFilterEvent; } - - wxString GetCurrentWildCard() const - { return m_wildcards[GetFilterIndex()]; } - -private: - GtkFileChooser *m_widget; - // First wildcard in filter, to be used when the user - // saves a file without giving an extension. - wxArrayString m_wildcards; - - // If true, ignore the next event because it was generated by us and not - // the user. - bool m_ignoreNextFilterEvent; -}; - -#if wxUSE_FILECTRL - -class WXDLLIMPEXP_CORE wxGtkFileCtrl: public wxControl, - public wxFileCtrlBase -{ -public: - wxGtkFileCtrl () { Init(); } - - wxGtkFileCtrl ( wxWindow *parent, - wxWindowID id, - const wxString& defaultDirectory = wxEmptyString, - const wxString& defaultFilename = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFC_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxString& name = wxFileCtrlNameStr ) - { - Init(); - Create( parent, id, defaultDirectory, defaultFilename, wildCard, style, pos, size, name ); - } - - virtual ~wxGtkFileCtrl(); - - bool Create( wxWindow *parent, - wxWindowID id, - const wxString& defaultDirectory = wxEmptyString, - const wxString& defaultFileName = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFC_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - const wxString& name = wxFileCtrlNameStr ); - - virtual void SetWildcard( const wxString& wildCard ); - virtual void SetFilterIndex( int filterIndex ); - virtual bool SetDirectory( const wxString& dir ); - virtual bool SetFilename( const wxString& name ); - virtual bool SetPath( const wxString& path ); - - virtual wxString GetFilename() const; - virtual wxString GetDirectory() const; - virtual wxString GetWildcard() const { return this->m_wildCard; } - virtual wxString GetPath() const; - virtual void GetPaths( wxArrayString& paths ) const; - virtual void GetFilenames( wxArrayString& files ) const; - virtual int GetFilterIndex() const { return m_fc.GetFilterIndex(); } - - virtual bool HasMultipleFileSelection() const { return HasFlag( wxFC_MULTIPLE ); } - virtual void ShowHidden(bool show); - - virtual bool HasFilterChoice() const - { return m_fc.HasFilterChoice(); } - - - // Implementation only from now on. - bool GTKShouldIgnoreNextFilterEvent() const - { return m_fc.ShouldIgnoreNextFilterEvent(); } - - bool m_checkNextSelEvent; - bool m_ignoreNextFolderChangeEvent; - -protected: - GtkFileChooser *m_fcWidget; - wxGtkFileChooser m_fc; - wxString m_wildCard; - -private: - void Init(); - - DECLARE_DYNAMIC_CLASS( wxGtkFileCtrl ) -}; - -#endif // wxUSE_FILECTRL - -#endif // _WX_GTK_FILECTRL_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/filedlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/filedlg.h deleted file mode 100644 index 377734db79..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/filedlg.h +++ /dev/null @@ -1,83 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/filedlg.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKFILEDLG_H_ -#define _WX_GTKFILEDLG_H_ - -#include "wx/gtk/filectrl.h" // for wxGtkFileChooser - -//------------------------------------------------------------------------- -// wxFileDialog -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase -{ -public: - wxFileDialog() { } - - wxFileDialog(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr); - bool Create(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr); - virtual ~wxFileDialog(); - - virtual wxString GetPath() const; - virtual void GetPaths(wxArrayString& paths) const; - virtual wxString GetFilename() const; - virtual void GetFilenames(wxArrayString& files) const; - virtual int GetFilterIndex() const; - - virtual void SetMessage(const wxString& message); - virtual void SetPath(const wxString& path); - virtual void SetDirectory(const wxString& dir); - virtual void SetFilename(const wxString& name); - virtual void SetWildcard(const wxString& wildCard); - virtual void SetFilterIndex(int filterIndex); - - virtual int ShowModal(); - - virtual bool SupportsExtraControl() const { return true; } - - // Implementation only. - void GTKSelectionChanged(const wxString& filename); - - -protected: - // override this from wxTLW since the native - // form doesn't have any m_wxwindow - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - - -private: - void OnFakeOk( wxCommandEvent &event ); - void OnSize(wxSizeEvent&); - virtual void AddChildGTK(wxWindowGTK* child); - - wxGtkFileChooser m_fc; - - DECLARE_DYNAMIC_CLASS(wxFileDialog) - DECLARE_EVENT_TABLE() -}; - -#endif // _WX_GTKFILEDLG_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/filehistory.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/filehistory.h deleted file mode 100644 index 70a93d6f5e..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/filehistory.h +++ /dev/null @@ -1,24 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/filehistory.h -// Purpose: GTK+ bits for wxFileHistory -// Author: Vaclav Slavik -// Created: 2010-05-06 -// Copyright: (c) 2010 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_FILEHISTORY_H_ -#define _WX_GTK_FILEHISTORY_H_ - -class WXDLLIMPEXP_CORE wxFileHistory : public wxFileHistoryBase -{ -public: - wxFileHistory(size_t maxFiles = 9, wxWindowID idBase = wxID_FILE1) - : wxFileHistoryBase(maxFiles, idBase) {} - - virtual void AddFileToHistory(const wxString& file); - - DECLARE_DYNAMIC_CLASS(wxFileHistory) -}; - -#endif // _WX_GTK_FILEHISTORY_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/filepicker.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/filepicker.h deleted file mode 100644 index 27e1fdc779..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/filepicker.h +++ /dev/null @@ -1,192 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/filedirpicker.h -// Purpose: wxFileButton, wxDirButton header -// Author: Francesco Montorsi -// Modified by: -// Created: 14/4/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_FILEPICKER_H_ -#define _WX_GTK_FILEPICKER_H_ - -// since GtkColorButton is available only for GTK+ >= 2.4, -// we need to use generic versions if we detect (at runtime) -// that GTK+ < 2.4 -#include "wx/generic/filepickerg.h" - -//----------------------------------------------------------------------------- -// wxFileButton and wxDirButton shared code -// (cannot be a base class since they need to derive from wxGenericFileButton -// and from wxGenericDirButton classes !) -//----------------------------------------------------------------------------- - -#define FILEDIRBTN_OVERRIDES \ - /* NULL is because of a problem with destruction order which happens */ \ - /* if we pass GetParent(): in fact, this GTK native implementation */ \ - /* needs to create the dialog in ::Create() and not for each user */ \ - /* request in response to the user click as the generic implementation */ \ - /* does. */ \ - virtual wxWindow *GetDialogParent() \ - { \ - return NULL; \ - } \ - \ - /* even if wx derive from wxGenericFileButton, i.e. from wxButton, our */ \ - /* native GTK+ widget does not derive from GtkButton thus *all* uses */ \ - /* GTK_BUTTON(m_widget) macro done by wxButton must be bypassed to */ \ - /* avoid bunch of GTK+ warnings like: */ \ - /* invalid cast from `GtkFileChooserButton' to `GtkButton' */ \ - /* so, override wxButton::GTKGetWindow and return NULL as GTK+ doesn't */ \ - /* give us access to the internal GdkWindow of a GtkFileChooserButton */ \ -protected: \ - virtual GdkWindow * \ - GTKGetWindow(wxArrayGdkWindows& WXUNUSED(windows)) const \ - { return NULL; } - - -//----------------------------------------------------------------------------- -// wxFileButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileButton : public wxGenericFileButton -{ -public: - wxFileButton() { Init(); } - wxFileButton(wxWindow *parent, - wxWindowID id, - const wxString& label = wxFilePickerWidgetLabel, - const wxString &path = wxEmptyString, - const wxString &message = wxFileSelectorPromptStr, - const wxString &wildcard = wxFileSelectorDefaultWildcardStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxFILEBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFilePickerWidgetNameStr) - { - Init(); - m_pickerStyle = style; - Create(parent, id, label, path, message, wildcard, - pos, size, style, validator, name); - } - - virtual ~wxFileButton(); - - -public: // overrides - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label = wxFilePickerWidgetLabel, - const wxString &path = wxEmptyString, - const wxString &message = wxFileSelectorPromptStr, - const wxString &wildcard = wxFileSelectorDefaultWildcardStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFilePickerWidgetNameStr); - - // event handler for the click - void OnDialogOK(wxCommandEvent &); - - virtual void SetPath(const wxString &str); - virtual void SetInitialDirectory(const wxString& dir); - - // see macro defined above - FILEDIRBTN_OVERRIDES - -protected: - wxDialog *m_dialog; - -private: - // common part of all ctors - void Init() { m_dialog = NULL; } - - DECLARE_DYNAMIC_CLASS(wxFileButton) -}; - - -//----------------------------------------------------------------------------- -// wxDirButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDirButton : public wxGenericDirButton -{ -public: - wxDirButton() { Init(); } - wxDirButton(wxWindow *parent, - wxWindowID id, - const wxString& label = wxFilePickerWidgetLabel, - const wxString &path = wxEmptyString, - const wxString &message = wxFileSelectorPromptStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDIRBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFilePickerWidgetNameStr) - { - Init(); - - m_pickerStyle = style; - - Create(parent, id, label, path, message, wxEmptyString, - pos, size, style, validator, name); - } - - virtual ~wxDirButton(); - - -public: // overrides - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label = wxFilePickerWidgetLabel, - const wxString &path = wxEmptyString, - const wxString &message = wxFileSelectorPromptStr, - const wxString &wildcard = wxFileSelectorDefaultWildcardStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFilePickerWidgetNameStr); - - - // GtkFileChooserButton does not support GTK_FILE_CHOOSER_CREATE_FOLDER - // thus we must ensure that the wxDD_DIR_MUST_EXIST style was given - long GetDialogStyle() const - { - return (wxGenericDirButton::GetDialogStyle() | wxDD_DIR_MUST_EXIST); - } - - virtual void SetPath(const wxString &str); - virtual void SetInitialDirectory(const wxString& dir); - - // see macro defined above - FILEDIRBTN_OVERRIDES - -protected: - wxDialog *m_dialog; - -public: // used by the GTK callback only - - bool m_bIgnoreNextChange; - - void GTKUpdatePath(const char *gtkpath); - -private: - void Init() - { - m_dialog = NULL; - m_bIgnoreNextChange = false; - } - - DECLARE_DYNAMIC_CLASS(wxDirButton) -}; - -#undef FILEDIRBTN_OVERRIDES - -#endif // _WX_GTK_FILEPICKER_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/font.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/font.h deleted file mode 100644 index a218a29dfe..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/font.h +++ /dev/null @@ -1,127 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/font.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_FONT_H_ -#define _WX_GTK_FONT_H_ - -// ---------------------------------------------------------------------------- -// wxFont -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFont : public wxFontBase -{ -public: - wxFont() { } - - wxFont(const wxFontInfo& info); - - wxFont(const wxString& nativeFontInfoString) - { - Create(nativeFontInfoString); - } - - wxFont(const wxNativeFontInfo& info); - -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxFont(int size, - int family, - int style, - int weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding); - } -#endif - - wxFont(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - Create(size, family, style, weight, underlined, face, encoding); - } - - wxFont(const wxSize& pixelSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - Create(10, family, style, weight, underlined, face, encoding); - SetPixelSize(pixelSize); - } - - bool Create(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - - // wxGTK-specific - bool Create(const wxString& fontname); - - virtual ~wxFont(); - - // implement base class pure virtuals - virtual int GetPointSize() const; - virtual wxFontStyle GetStyle() const; - virtual wxFontWeight GetWeight() const; - virtual wxString GetFaceName() const; - virtual bool GetUnderlined() const; - virtual bool GetStrikethrough() const; - virtual wxFontEncoding GetEncoding() const; - virtual const wxNativeFontInfo *GetNativeFontInfo() const; - virtual bool IsFixedWidth() const; - - virtual void SetPointSize( int pointSize ); - virtual void SetFamily(wxFontFamily family); - virtual void SetStyle(wxFontStyle style); - virtual void SetWeight(wxFontWeight weight); - virtual bool SetFaceName( const wxString& faceName ); - virtual void SetUnderlined( bool underlined ); - virtual void SetStrikethrough(bool strikethrough); - virtual void SetEncoding(wxFontEncoding encoding); - - wxDECLARE_COMMON_FONT_METHODS(); - - // Set Pango attributes in the specified layout. Currently only - // underlined and strike-through attributes are handled by this function. - // - // If neither of them is specified, returns false, otherwise sets up the - // attributes and returns true. - bool GTKSetPangoAttrs(PangoLayout* layout) const; - - // implementation from now on - void Unshare(); - - // no data :-) - -protected: - virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ); - - virtual wxGDIRefData* CreateGDIRefData() const; - virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const; - - virtual wxFontFamily DoGetFamily() const; - -private: - void Init(); - - DECLARE_DYNAMIC_CLASS(wxFont) -}; - -#endif // _WX_GTK_FONT_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/fontdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/fontdlg.h deleted file mode 100644 index 4c5b57a3e3..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/fontdlg.h +++ /dev/null @@ -1,46 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/fontdlg.h -// Purpose: wxFontDialog -// Author: Robert Roebling -// Created: -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_FONTDLG_H_ -#define _WX_GTK_FONTDLG_H_ - -//----------------------------------------------------------------------------- -// wxFontDialog -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase -{ -public: - wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ } - wxFontDialog(wxWindow *parent) - : wxFontDialogBase(parent) { Create(parent); } - wxFontDialog(wxWindow *parent, const wxFontData& data) - : wxFontDialogBase(parent, data) { Create(parent, data); } - - virtual ~wxFontDialog(); - -#if WXWIN_COMPATIBILITY_2_6 - // deprecated interface, don't use - wxDEPRECATED( wxFontDialog(wxWindow *parent, const wxFontData *data) ); -#endif // WXWIN_COMPATIBILITY_2_6 - -protected: - // create the GTK dialog - virtual bool DoCreate(wxWindow *parent); - - DECLARE_DYNAMIC_CLASS(wxFontDialog) -}; - -#if WXWIN_COMPATIBILITY_2_6 - // deprecated interface, don't use -inline wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData *data) - : wxFontDialogBase(parent) { InitFontData(data); Create(parent); } -#endif // WXWIN_COMPATIBILITY_2_6 - -#endif diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/fontpicker.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/fontpicker.h deleted file mode 100644 index 65bb5c9593..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/fontpicker.h +++ /dev/null @@ -1,62 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/fontpicker.h -// Purpose: wxFontButton header -// Author: Francesco Montorsi -// Modified by: -// Created: 14/4/2006 -// Copyright: (c) Francesco Montorsi -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_FONTPICKER_H_ -#define _WX_GTK_FONTPICKER_H_ - -#include "wx/button.h" - -//----------------------------------------------------------------------------- -// wxFontButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFontButton : public wxButton, - public wxFontPickerWidgetBase -{ -public: - wxFontButton() {} - wxFontButton(wxWindow *parent, - wxWindowID id, - const wxFont& initial = wxNullFont, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxFONTBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFontPickerWidgetNameStr) - { - Create(parent, id, initial, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxFont& initial = wxNullFont, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxFONTBTN_DEFAULT_STYLE, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxFontPickerWidgetNameStr); - - virtual ~wxFontButton(); - -protected: - void UpdateFont(); - - -public: // used by the GTK callback only - - void SetNativeFontInfo(const char *gtkdescription) - { m_selectedFont.SetNativeFontInfo(wxString::FromAscii(gtkdescription)); } - -private: - DECLARE_DYNAMIC_CLASS(wxFontButton) -}; - -#endif // _WX_GTK_FONTPICKER_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/frame.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/frame.h deleted file mode 100644 index 1f172c43c1..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/frame.h +++ /dev/null @@ -1,82 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/frame.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_FRAME_H_ -#define _WX_GTK_FRAME_H_ - -//----------------------------------------------------------------------------- -// wxFrame -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase -{ -public: - // construction - wxFrame() { Init(); } - wxFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - - Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - virtual ~wxFrame(); - -#if wxUSE_STATUSBAR - void SetStatusBar(wxStatusBar *statbar); -#endif // wxUSE_STATUSBAR - -#if wxUSE_TOOLBAR - void SetToolBar(wxToolBar *toolbar); -#endif // wxUSE_TOOLBAR - - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); } - -#if wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - // in Hildon environment all frames are always shown maximized - virtual bool IsMaximized() const { return true; } -#endif // wxUSE_LIBHILDON || wxUSE_LIBHILDON2 - - // implementation from now on - // -------------------------- - - virtual bool SendIdleEvents(wxIdleEvent& event); - -protected: - // override wxWindow methods to take into account tool/menu/statusbars - virtual void DoGetClientSize( int *width, int *height ) const; - -#if wxUSE_MENUS_NATIVE - virtual void DetachMenuBar(); - virtual void AttachMenuBar(wxMenuBar *menubar); -#endif // wxUSE_MENUS_NATIVE - -private: - void Init(); - - long m_fsSaveFlag; - - DECLARE_DYNAMIC_CLASS(wxFrame) -}; - -#endif // _WX_GTK_FRAME_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/gauge.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/gauge.h deleted file mode 100644 index 8df47461e5..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/gauge.h +++ /dev/null @@ -1,85 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/gauge.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_GAUGE_H_ -#define _WX_GTK_GAUGE_H_ - -//----------------------------------------------------------------------------- -// wxGauge -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGauge: public wxControl -{ -public: - wxGauge() { Init(); } - - wxGauge( wxWindow *parent, - wxWindowID id, - int range, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxGA_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxGaugeNameStr ) - { - Init(); - - Create(parent, id, range, pos, size, style, validator, name); - } - - bool Create( wxWindow *parent, - wxWindowID id, int range, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxGA_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxGaugeNameStr ); - - void SetShadowWidth( int WXUNUSED(w) ) { } - void SetBezelFace( int WXUNUSED(w) ) { } - int GetShadowWidth() const { return 0; } - int GetBezelFace() const { return 0; } - - // determinate mode API - void SetRange( int r ); - void SetValue( int pos ); - - int GetRange() const; - int GetValue() const; - - // indeterminate mode API - virtual void Pulse(); - - bool IsVertical() const { return HasFlag(wxGA_VERTICAL); } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - virtual wxVisualAttributes GetDefaultAttributes() const; - - // implementation - // ------------- - - // the max and current gauge values - int m_rangeMax, - m_gaugePos; - -protected: - // set the gauge value to the value of m_gaugePos - void DoSetGauge(); - - virtual wxSize DoGetBestSize() const; - -private: - void Init() { m_rangeMax = m_gaugePos = 0; } - - DECLARE_DYNAMIC_CLASS(wxGauge) -}; - -#endif - // _WX_GTK_GAUGE_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/glcanvas.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/glcanvas.h deleted file mode 100644 index 01591149b5..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/glcanvas.h +++ /dev/null @@ -1,111 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/glcanvas.h -// Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK -// Author: Robert Roebling -// Modified by: -// Created: 17/8/98 -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GLCANVAS_H_ -#define _WX_GLCANVAS_H_ - -#include "wx/unix/glx11.h" - -//--------------------------------------------------------------------------- -// wxGLCanvas -//--------------------------------------------------------------------------- - -class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasX11 -{ -public: - wxGLCanvas(wxWindow *parent, - wxWindowID id = wxID_ANY, - const int *attribList = NULL, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette); - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette); - - virtual bool SetBackgroundStyle(wxBackgroundStyle style); - - // implement wxGLCanvasX11 methods - // -------------------------------- - - virtual Window GetXWindow() const; - - - // deprecated methods - // ------------------ - -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED( - wxGLCanvas(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette) - ); - - wxDEPRECATED( - wxGLCanvas(wxWindow *parent, - const wxGLContext *shared, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette) - ); - - wxDEPRECATED( - wxGLCanvas(wxWindow *parent, - const wxGLCanvas *shared, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette) - ); - - // called from "realized" callback to create the implicit context if needed - void GTKInitImplicitContext(); -#endif // WXWIN_COMPATIBILITY_2_8 - - // implementation from now on - void OnInternalIdle(); - - bool m_exposed; -#ifdef __WXGTK3__ - cairo_t* m_cairoPaintContext; -#endif - -#if WXWIN_COMPATIBILITY_2_8 - wxGLContext *m_sharedContext; - wxGLCanvas *m_sharedContextOf; - const bool m_createImplicitContext; -#endif // WXWIN_COMPATIBILITY_2_8 - -private: - DECLARE_CLASS(wxGLCanvas) -}; - -#endif // _WX_GLCANVAS_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/gnome/gvfs.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/gnome/gvfs.h deleted file mode 100644 index 559f14f569..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/gnome/gvfs.h +++ /dev/null @@ -1,52 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/gnome/gvfs.h -// Author: Robert Roebling -// Purpose: GNOME VFS support -// Created: 17/03/06 -// Copyright: Robert Roebling -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_GVFS_H_ -#define _WX_GTK_GVFS_H_ - -#include "wx/defs.h" - -#if wxUSE_MIMETYPE && wxUSE_LIBGNOMEVFS - -#include "wx/string.h" -#include "wx/unix/mimetype.h" - -//---------------------------------------------------------------------------- -// wxGnomeVFSMimeTypesManagerImpl -//---------------------------------------------------------------------------- - -class wxGnomeVFSMimeTypesManagerImpl: public wxMimeTypesManagerImpl -{ -public: - wxGnomeVFSMimeTypesManagerImpl() { } - -protected: - virtual bool DoAssociation(const wxString& strType, - const wxString& strIcon, - wxMimeTypeCommands *entry, - const wxArrayString& strExtensions, - const wxString& strDesc); -}; - -//---------------------------------------------------------------------------- -// wxGnomeVFSMimeTypesManagerFactory -//---------------------------------------------------------------------------- - -class wxGnomeVFSMimeTypesManagerFactory: public wxMimeTypesManagerFactory -{ -public: - wxGnomeVFSMimeTypesManagerFactory() {} - - virtual wxMimeTypesManagerImpl *CreateMimeTypesManagerImpl(); -}; - -#endif - // wxUSE_MIMETYPE - -#endif diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/hildon/notifmsg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/hildon/notifmsg.h deleted file mode 100644 index ade115fe8a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/hildon/notifmsg.h +++ /dev/null @@ -1,58 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/hildon/notifmsg.h -// Purpose: Hildon implementation of wxNotificationMessage -// Author: Vadim Zeitlin -// Created: 2007-11-21 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_HILDON_NOTIFMSG_H_ -#define _WX_GTK_HILDON_NOTIFMSG_H_ - -typedef struct _HildonBanner HildonBanner; - -// ---------------------------------------------------------------------------- -// wxNotificationMessage -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxNotificationMessage : public wxNotificationMessageBase -{ -public: - wxNotificationMessage() { Init(); } - wxNotificationMessage(const wxString& title, - const wxString& message = wxString(), - wxWindow *parent = NULL) - : wxNotificationMessageBase(title, message, parent) - { - Init(); - } - - virtual ~wxNotificationMessage(); - - - virtual bool Show(int timeout = Timeout_Auto); - virtual bool Close(); - -private: - void Init() { m_banner = NULL; } - - // return the string containing markup for both the title and, if - // specified, the message - wxString HildonGetMarkup() const; - - // returns the widget of the parent GtkWindow to use or NULL - GtkWidget *HildonGetWindow() const; - - - // the banner we're showing, only non-NULL if it's an animation or progress - // banner as the informational dialog times out on its own and we don't - // need to store it (nor do we have any way to get its widget anyhow) - GtkWidget *m_banner; - - - wxDECLARE_NO_COPY_CLASS(wxNotificationMessage); -}; - -#endif // _WX_GTK_HILDON_NOTIFMSG_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/hyperlink.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/hyperlink.h deleted file mode 100644 index 0b6ce6bf9a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/hyperlink.h +++ /dev/null @@ -1,72 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/hyperlink.h -// Purpose: Hyperlink control -// Author: Francesco Montorsi -// Modified by: -// Created: 14/2/2007 -// Copyright: (c) 2007 Francesco Montorsi -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKHYPERLINKCTRL_H_ -#define _WX_GTKHYPERLINKCTRL_H_ - -#include "wx/generic/hyperlink.h" - -// ---------------------------------------------------------------------------- -// wxHyperlinkCtrl -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxHyperlinkCtrl : public wxGenericHyperlinkCtrl -{ -public: - // Default constructor (for two-step construction). - wxHyperlinkCtrl() { } - - // Constructor. - wxHyperlinkCtrl(wxWindow *parent, - wxWindowID id, - const wxString& label, const wxString& url, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxHL_DEFAULT_STYLE, - const wxString& name = wxHyperlinkCtrlNameStr) - { - (void)Create(parent, id, label, url, pos, size, style, name); - } - - // Creation function (for two-step construction). - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, const wxString& url, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxHL_DEFAULT_STYLE, - const wxString& name = wxHyperlinkCtrlNameStr); - - - // get/set - virtual wxColour GetHoverColour() const; - virtual void SetHoverColour(const wxColour &colour); - - virtual wxColour GetNormalColour() const; - virtual void SetNormalColour(const wxColour &colour); - - virtual wxColour GetVisitedColour() const; - virtual void SetVisitedColour(const wxColour &colour); - - virtual wxString GetURL() const; - virtual void SetURL(const wxString &url); - - virtual void SetLabel(const wxString &label); - -protected: - virtual wxSize DoGetBestSize() const; - virtual wxSize DoGetBestClientSize() const; - - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - - DECLARE_DYNAMIC_CLASS(wxHyperlinkCtrl) -}; - -#endif // _WX_GTKHYPERLINKCTRL_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/infobar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/infobar.h deleted file mode 100644 index 45563eb275..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/infobar.h +++ /dev/null @@ -1,73 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/infobar.h -// Purpose: native implementation of wxInfoBar for GTK+ 2.18 and later -// Author: Vadim Zeitlin -// Created: 2009-09-26 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_INFOBAR_H_ -#define _WX_GTK_INFOBAR_H_ - -#include "wx/generic/infobar.h" - -// ---------------------------------------------------------------------------- -// wxInfoBar for GTK+ -// ---------------------------------------------------------------------------- - -// notice that the native GTK+ implementation is only available since -// (relatively recent) 2.18 so we inherit from the generic one to be able to -// fall back to it if GTK+ version is determined to be too old during run-time -class WXDLLIMPEXP_CORE wxInfoBar : public wxInfoBarGeneric -{ -public: - wxInfoBar() { Init(); } - - wxInfoBar(wxWindow *parent, wxWindowID winid = wxID_ANY) - { - Init(); - Create(parent, winid); - } - - bool Create(wxWindow *parent, wxWindowID winid = wxID_ANY); - - virtual ~wxInfoBar(); - - // implement base class methods - // ---------------------------- - - virtual void ShowMessage(const wxString& msg, - int flags = wxICON_INFORMATION); - - virtual void Dismiss(); - - virtual void AddButton(wxWindowID btnid, - const wxString& label = wxString()); - - virtual void RemoveButton(wxWindowID btnid); - - // implementation only - // ------------------- - - void GTKResponse(int btnid); - -protected: - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - -private: - void Init() { m_impl = NULL; } - - // add a button with the given id/label and return its widget - GtkWidget *GTKAddButton(wxWindowID btnid, - const wxString& label = wxString()); - - - // only used when the native implementation is really being used - class wxInfoBarGTKImpl *m_impl; - - wxDECLARE_NO_COPY_CLASS(wxInfoBar); -}; - -#endif // _WX_GTK_INFOBAR_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/listbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/listbox.h deleted file mode 100644 index c40bda6a27..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/listbox.h +++ /dev/null @@ -1,135 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/listbox.h -// Purpose: wxListBox class declaration -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_LISTBOX_H_ -#define _WX_GTK_LISTBOX_H_ - -struct _wxTreeEntry; -struct _GtkTreeIter; - -//----------------------------------------------------------------------------- -// wxListBox -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase -{ -public: - // ctors and such - wxListBox() - { - Init(); - } - wxListBox( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (const wxString *) NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr ) - { - Init(); - Create(parent, id, pos, size, n, choices, style, validator, name); - } - wxListBox( wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr ) - { - Init(); - Create(parent, id, pos, size, choices, style, validator, name); - } - virtual ~wxListBox(); - - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (const wxString *) NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& s); - virtual int FindString(const wxString& s, bool bCase = false) const; - - virtual bool IsSelected(int n) const; - virtual int GetSelection() const; - virtual int GetSelections(wxArrayInt& aSelections) const; - - virtual void EnsureVisible(int n); - - virtual void Update(); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation from now on - - virtual GtkWidget *GetConnectWidget(); - - struct _GtkTreeView *m_treeview; - struct _GtkListStore *m_liststore; - -#if wxUSE_CHECKLISTBOX - bool m_hasCheckBoxes; -#endif // wxUSE_CHECKLISTBOX - - struct _wxTreeEntry* GTKGetEntry(unsigned pos) const; - - void GTKDisableEvents(); - void GTKEnableEvents(); - - void GTKOnSelectionChanged(); - void GTKOnActivated(int item); - -protected: - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int n); - virtual wxSize DoGetBestSize() const; - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - - virtual void DoSetSelection(int n, bool select); - - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, wxClientDataType type); - virtual int DoInsertOneItem(const wxString& item, unsigned int pos); - - virtual void DoSetFirstItem(int n); - virtual void DoSetItemClientData(unsigned int n, void* clientData); - virtual void* DoGetItemClientData(unsigned int n) const; - virtual int DoListHitTest(const wxPoint& point) const; - - // get the iterator for the given index, returns false if invalid - bool GTKGetIteratorFor(unsigned pos, _GtkTreeIter *iter) const; - - // get the index for the given iterator, return wxNOT_FOUND on failure - int GTKGetIndexFor(_GtkTreeIter& iter) const; - - // common part of DoSetFirstItem() and EnsureVisible() - void DoScrollToCell(int n, float alignY, float alignX); - -private: - void Init(); //common construction - - DECLARE_DYNAMIC_CLASS(wxListBox) -}; - -#endif // _WX_GTK_LISTBOX_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/mdi.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/mdi.h deleted file mode 100644 index 02a61eb899..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/mdi.h +++ /dev/null @@ -1,153 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/mdi.h -// Purpose: TDI-based MDI implementation for wxGTK -// Author: Robert Roebling -// Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes -// Copyright: (c) 1998 Robert Roebling -// (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_MDI_H_ -#define _WX_GTK_MDI_H_ - -#include "wx/frame.h" - -class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; -class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; - -typedef struct _GtkNotebook GtkNotebook; - -//----------------------------------------------------------------------------- -// wxMDIParentFrame -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxMDIParentFrameBase -{ -public: - wxMDIParentFrame() { Init(); } - wxMDIParentFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr) - { - Init(); - - (void)Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr); - - // we don't store the active child in m_currentChild unlike the base class - // version so override this method to find it dynamically - virtual wxMDIChildFrame *GetActiveChild() const; - - // implement base class pure virtuals - // ---------------------------------- - - virtual void ActivateNext(); - virtual void ActivatePrevious(); - - static bool IsTDI() { return true; } - - // implementation - - bool m_justInserted; - - virtual void OnInternalIdle(); - -protected: - virtual void DoGetClientSize(int* width, int* height) const; - -private: - friend class wxMDIChildFrame; - void Init(); - - DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) -}; - -//----------------------------------------------------------------------------- -// wxMDIChildFrame -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxTDIChildFrame -{ -public: - wxMDIChildFrame() { Init(); } - wxMDIChildFrame(wxMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - - Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - virtual ~wxMDIChildFrame(); - - virtual void SetMenuBar( wxMenuBar *menu_bar ); - virtual wxMenuBar *GetMenuBar() const; - - virtual void Activate(); - - virtual void SetTitle(const wxString& title); - - // implementation - - void OnActivate( wxActivateEvent& event ); - void OnMenuHighlight( wxMenuEvent& event ); - virtual void GTKHandleRealized(); - - wxMenuBar *m_menuBar; - bool m_justInserted; - -private: - void Init(); - - GtkNotebook *GTKGetNotebook() const; - - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxMDIChildFrame) -}; - -//----------------------------------------------------------------------------- -// wxMDIClientWindow -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase -{ -public: - wxMDIClientWindow() { } - ~wxMDIClientWindow(); - - virtual bool CreateClient(wxMDIParentFrame *parent, - long style = wxVSCROLL | wxHSCROLL); - -private: - virtual void AddChildGTK(wxWindowGTK* child); - - DECLARE_DYNAMIC_CLASS(wxMDIClientWindow) -}; - -#endif // _WX_GTK_MDI_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/menu.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/menu.h deleted file mode 100644 index fec12ba977..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/menu.h +++ /dev/null @@ -1,110 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/menu.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKMENU_H_ -#define _WX_GTKMENU_H_ - -//----------------------------------------------------------------------------- -// wxMenuBar -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase -{ -public: - // ctors - wxMenuBar(); - wxMenuBar(long style); - wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); - ~wxMenuBar(); - - // implement base class (pure) virtuals - virtual bool Append( wxMenu *menu, const wxString &title ); - virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title); - virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title); - virtual wxMenu *Remove(size_t pos); - - virtual int FindMenuItem(const wxString& menuString, - const wxString& itemString) const; - virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const; - - virtual void EnableTop( size_t pos, bool flag ); - virtual bool IsEnabledTop(size_t pos) const; - virtual void SetMenuLabel( size_t pos, const wxString& label ); - virtual wxString GetMenuLabel( size_t pos ) const; - - void SetLayoutDirection(wxLayoutDirection dir); - wxLayoutDirection GetLayoutDirection() const; - - virtual void Attach(wxFrame *frame); - virtual void Detach(); - -private: - // common part of Append and Insert - void GtkAppend(wxMenu* menu, const wxString& title, int pos = -1); - - void Init(size_t n, wxMenu *menus[], const wxString titles[], long style); - - // wxMenuBar is not a top level window but it still doesn't need a parent - // window - virtual bool GTKNeedsParent() const { return false; } - - GtkWidget* m_menubar; - - DECLARE_DYNAMIC_CLASS(wxMenuBar) -}; - -//----------------------------------------------------------------------------- -// wxMenu -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase -{ -public: - // ctors & dtor - wxMenu(const wxString& title, long style = 0) - : wxMenuBase(title, style) { Init(); } - - wxMenu(long style = 0) : wxMenuBase(style) { Init(); } - - virtual ~wxMenu(); - - void Attach(wxMenuBarBase *menubar); - - void SetLayoutDirection(const wxLayoutDirection dir); - wxLayoutDirection GetLayoutDirection() const; - - // Returns the title, with mnemonics translated to wx format - wxString GetTitle() const; - - // Sets the title, with mnemonics translated to gtk format - virtual void SetTitle(const wxString& title); - - // implementation GTK only - GtkWidget *m_menu; // GtkMenu - GtkWidget *m_owner; - GtkAccelGroup *m_accel; - bool m_popupShown; - -protected: - virtual wxMenuItem* DoAppend(wxMenuItem *item); - virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); - virtual wxMenuItem* DoRemove(wxMenuItem *item); - -private: - // common code for all constructors: - void Init(); - - // common part of Append (if pos == -1) and Insert - void GtkAppend(wxMenuItem* item, int pos = -1); - - - DECLARE_DYNAMIC_CLASS(wxMenu) -}; - -#endif - // _WX_GTKMENU_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/menuitem.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/menuitem.h deleted file mode 100644 index c17ad03a97..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/menuitem.h +++ /dev/null @@ -1,61 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/menuitem.h -// Purpose: wxMenuItem class -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKMENUITEM_H_ -#define _WX_GTKMENUITEM_H_ - -#include "wx/bitmap.h" - -//----------------------------------------------------------------------------- -// wxMenuItem -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase -{ -public: - wxMenuItem(wxMenu *parentMenu = NULL, - int id = wxID_SEPARATOR, - const wxString& text = wxEmptyString, - const wxString& help = wxEmptyString, - wxItemKind kind = wxITEM_NORMAL, - wxMenu *subMenu = NULL); - virtual ~wxMenuItem(); - - // implement base class virtuals - virtual void SetItemLabel( const wxString& str ); - virtual void Enable( bool enable = true ); - virtual void Check( bool check = true ); - virtual bool IsChecked() const; - virtual void SetBitmap(const wxBitmap& bitmap); - virtual const wxBitmap& GetBitmap() const { return m_bitmap; } - - // implementation - void SetMenuItem(GtkWidget *menuItem); - GtkWidget *GetMenuItem() const { return m_menuItem; } - void SetGtkLabel(); - -#if WXWIN_COMPATIBILITY_2_8 - // compatibility only, don't use in new code - wxDEPRECATED_CONSTRUCTOR( - wxMenuItem(wxMenu *parentMenu, - int id, - const wxString& text, - const wxString& help, - bool isCheckable, - wxMenu *subMenu = NULL) - ); -#endif - -private: - wxBitmap m_bitmap; // Bitmap for menuitem, if any - GtkWidget *m_menuItem; // GtkMenuItem - - DECLARE_DYNAMIC_CLASS(wxMenuItem) -}; - -#endif // _WX_GTKMENUITEM_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/minifram.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/minifram.h deleted file mode 100644 index 748f266a9a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/minifram.h +++ /dev/null @@ -1,63 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/minifram.h -// Purpose: wxMiniFrame class -// Author: Robert Roebling -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_MINIFRAME_H_ -#define _WX_GTK_MINIFRAME_H_ - -#include "wx/bitmap.h" -#include "wx/frame.h" - -//----------------------------------------------------------------------------- -// wxMiniFrame -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame -{ - DECLARE_DYNAMIC_CLASS(wxMiniFrame) - -public: - wxMiniFrame() {} - wxMiniFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCAPTION | wxRESIZE_BORDER, - const wxString& name = wxFrameNameStr) - { - Create(parent, id, title, pos, size, style, name); - } - ~wxMiniFrame(); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxCAPTION | wxRESIZE_BORDER, - const wxString& name = wxFrameNameStr); - - virtual void SetTitle( const wxString &title ); - -protected: - virtual void DoSetSizeHints( int minW, int minH, - int maxW, int maxH, - int incW, int incH ); - virtual void DoGetClientSize(int* width, int* height) const; - - // implementation -public: - bool m_isDragging; - int m_oldX,m_oldY; - int m_diffX,m_diffY; - wxBitmap m_closeButton; - int m_miniEdge; - int m_miniTitle; -}; - -#endif // _WX_GTK_MINIFRAME_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/msgdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/msgdlg.h deleted file mode 100644 index 670d7f9782..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/msgdlg.h +++ /dev/null @@ -1,51 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/msgdlg.h -// Purpose: wxMessageDialog for GTK+2 -// Author: Vaclav Slavik -// Modified by: -// Created: 2003/02/28 -// Copyright: (c) Vaclav Slavik, 2003 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_MSGDLG_H_ -#define _WX_GTK_MSGDLG_H_ - -class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase -{ -public: - wxMessageDialog(wxWindow *parent, const wxString& message, - const wxString& caption = wxMessageBoxCaptionStr, - long style = wxOK|wxCENTRE, - const wxPoint& pos = wxDefaultPosition); - - virtual int ShowModal(); - virtual bool Show(bool WXUNUSED(show) = true) { return false; } - -protected: - // implement some base class methods to do nothing to avoid asserts and - // GTK warnings, since this is not a real wxDialog. - virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} - virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) {} - // override to convert wx mnemonics to GTK+ ones and handle stock ids - virtual void DoSetCustomLabel(wxString& var, const ButtonLabel& label); - -private: - // override to use stock GTK+ defaults instead of just string ones - virtual wxString GetDefaultYesLabel() const; - virtual wxString GetDefaultNoLabel() const; - virtual wxString GetDefaultOKLabel() const; - virtual wxString GetDefaultCancelLabel() const; - virtual wxString GetDefaultHelpLabel() const; - - // create the real GTK+ dialog: this is done from ShowModal() to allow - // changing the message between constructing the dialog and showing it - void GTKCreateMsgDialog(); - - DECLARE_DYNAMIC_CLASS(wxMessageDialog) -}; - -#endif // _WX_GTK_MSGDLG_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/nonownedwnd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/nonownedwnd.h deleted file mode 100644 index 70e853c1ce..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/nonownedwnd.h +++ /dev/null @@ -1,43 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/nonownedwnd.h -// Purpose: wxGTK-specific wxNonOwnedWindow declaration. -// Author: Vadim Zeitlin -// Created: 2011-10-12 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_NONOWNEDWND_H_ -#define _WX_GTK_NONOWNEDWND_H_ - -class wxNonOwnedWindowShapeImpl; - -// ---------------------------------------------------------------------------- -// wxNonOwnedWindow contains code common to wx{Popup,TopLevel}Window in wxGTK. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase -{ -public: - wxNonOwnedWindow() { m_shapeImpl = NULL; } - virtual ~wxNonOwnedWindow(); - - // Overridden to actually set the shape when the window becomes realized. - virtual void GTKHandleRealized(); - -protected: - virtual bool DoClearShape(); - virtual bool DoSetRegionShape(const wxRegion& region); -#if wxUSE_GRAPHICS_CONTEXT - virtual bool DoSetPathShape(const wxGraphicsPath& path); -#endif // wxUSE_GRAPHICS_CONTEXT - - -private: - // If non-NULL, contains information about custom window shape. - wxNonOwnedWindowShapeImpl* m_shapeImpl; - - wxDECLARE_NO_COPY_CLASS(wxNonOwnedWindow); -}; - -#endif // _WX_GTK_NONOWNEDWND_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/notebook.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/notebook.h deleted file mode 100644 index 6edbb84fb1..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/notebook.h +++ /dev/null @@ -1,144 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/notebook.h -// Purpose: wxNotebook class -// Author: Robert Roebling -// Modified by: -// Copyright: (c) Julian Smart and Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKNOTEBOOK_H_ -#define _WX_GTKNOTEBOOK_H_ - -//----------------------------------------------------------------------------- -// internal class -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxGtkNotebookPage; - -#include "wx/list.h" -WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList); - -//----------------------------------------------------------------------------- -// wxNotebook -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase -{ -public: - // default for dynamic class - wxNotebook(); - // the same arguments as for wxControl - wxNotebook(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxNotebookNameStr); - // Create() function - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxNotebookNameStr); - // dtor - virtual ~wxNotebook(); - - // accessors - // --------- - - // set the currently selected page, return the index of the previously - // selected one (or wxNOT_FOUND on error) - // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events - int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); } - // get the currently selected page - int GetSelection() const; - - // changes selected page without sending events - int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); } - - // set/get the title of a page - bool SetPageText(size_t nPage, const wxString& strText); - wxString GetPageText(size_t nPage) const; - - // sets/returns item's image index in the current image list - int GetPageImage(size_t nPage) const; - bool SetPageImage(size_t nPage, int nImage); - - // control the appearance of the notebook pages - // set the padding between tabs (in pixels) - void SetPadding(const wxSize& padding); - // sets the size of the tabs (assumes all tabs are the same size) - void SetTabSize(const wxSize& sz); - - // geometry - virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const; - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; - - // operations - // ---------- - // remove all pages - bool DeleteAllPages(); - - // adds a new page to the notebook (it will be deleted by the notebook, - // don't delete it yourself). If bSelect, this page becomes active. - // the same as AddPage(), but adds it at the specified position - bool InsertPage( size_t position, - wxNotebookPage *win, - const wxString& strText, - bool bSelect = false, - int imageId = NO_IMAGE ); - - // handler for tab navigation - // -------------------------- - void OnNavigationKey(wxNavigationKeyEvent& event); - - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - // -------------- - -#if wxUSE_CONSTRAINTS - void SetConstraintSizes(bool recurse); - bool DoPhase(int phase); -#endif - - // Called by GTK event handler when the current page is definitely changed. - void GTKOnPageChanged(); - - // helper function - wxGtkNotebookPage* GetNotebookPage(int page) const; - - // the additional page data (the pages themselves are in m_pages array) - wxGtkNotebookPagesList m_pagesData; - - // we need to store the old selection since there - // is no other way to know about it at the time - // of the change selection event - int m_oldSelection; - -protected: - // set all page's attributes - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - - // remove one page from the notebook but do not destroy it - virtual wxNotebookPage *DoRemovePage(size_t nPage); - - int DoSetSelection(size_t nPage, int flags = 0); - -private: - // the padding set by SetPadding() - int m_padding; - - void Init(); - virtual void AddChildGTK(wxWindowGTK* child); - - DECLARE_DYNAMIC_CLASS(wxNotebook) - DECLARE_EVENT_TABLE() -}; - -#endif // _WX_GTKNOTEBOOK_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/notifmsg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/notifmsg.h deleted file mode 100644 index 9135b3aee8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/notifmsg.h +++ /dev/null @@ -1,51 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/notifmsg.h -// Purpose: wxNotificationMessage for wxGTK. -// Author: Vadim Zeitlin -// Created: 2012-07-25 -// Copyright: (c) 2012 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_NOTIFMSG_H_ -#define _WX_GTK_NOTIFMSG_H_ - -typedef struct _NotifyNotification NotifyNotification; - -// ---------------------------------------------------------------------------- -// wxNotificationMessage -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_ADV wxNotificationMessage : public wxNotificationMessageBase -{ -public: - wxNotificationMessage() { Init(); } - wxNotificationMessage(const wxString& title, - const wxString& message = wxString(), - wxWindow *parent = NULL, - int flags = wxICON_INFORMATION) - : wxNotificationMessageBase(title, message, parent, flags) - { - Init(); - } - - virtual ~wxNotificationMessage(); - - - virtual bool Show(int timeout = Timeout_Auto); - virtual bool Close(); - - // Set the name of the icon to use, overriding the default icon determined - // by the flags. Call with empty string to reset custom icon. - bool GTKSetIconName(const wxString& name); - -private: - void Init() { m_notification = NULL; } - - NotifyNotification* m_notification; - wxString m_iconName; - - wxDECLARE_NO_COPY_CLASS(wxNotificationMessage); -}; - -#endif // _WX_GTK_NOTIFMSG_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/pen.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/pen.h deleted file mode 100644 index 85aa102747..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/pen.h +++ /dev/null @@ -1,64 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/pen.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PEN_H_ -#define _WX_GTK_PEN_H_ - -typedef signed char wxGTKDash; - -//----------------------------------------------------------------------------- -// wxPen -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPen: public wxPenBase -{ -public: - wxPen() { } - - wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID ); -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); -#endif - - virtual ~wxPen(); - - bool operator==(const wxPen& pen) const; - bool operator!=(const wxPen& pen) const { return !(*this == pen); } - - void SetColour( const wxColour &colour ); - void SetColour( unsigned char red, unsigned char green, unsigned char blue ); - void SetCap( wxPenCap capStyle ); - void SetJoin( wxPenJoin joinStyle ); - void SetStyle( wxPenStyle style ); - void SetWidth( int width ); - void SetDashes( int number_of_dashes, const wxDash *dash ); - void SetStipple(const wxBitmap& stipple); - - wxColour GetColour() const; - wxPenCap GetCap() const; - wxPenJoin GetJoin() const; - wxPenStyle GetStyle() const; - int GetWidth() const; - int GetDashes(wxDash **ptr) const; - int GetDashCount() const; - wxDash* GetDash() const; - wxBitmap *GetStipple() const; - -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_FUTURE( void SetStyle(int style) ) - { SetStyle((wxPenStyle)style); } -#endif - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - DECLARE_DYNAMIC_CLASS(wxPen) -}; - -#endif // _WX_GTK_PEN_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/popupwin.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/popupwin.h deleted file mode 100644 index 1c848795b9..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/popupwin.h +++ /dev/null @@ -1,50 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/popupwin.h -// Purpose: -// Author: Robert Roebling -// Created: -// Copyright: (c) 2001 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_POPUPWIN_H_ -#define _WX_GTK_POPUPWIN_H_ - -//----------------------------------------------------------------------------- -// wxPopUpWindow -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPopupWindow: public wxPopupWindowBase -{ -public: - wxPopupWindow() { } - virtual ~wxPopupWindow(); - - wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) - { (void)Create(parent, flags); } - bool Create(wxWindow *parent, int flags = wxBORDER_NONE); - - virtual bool Show(bool show = true); - - virtual void SetFocus(); - - // implementation - // -------------- - - // GTK time when connecting to button_press signal - wxUint32 m_time; - -protected: - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - - virtual void DoMoveWindow(int x, int y, int width, int height); - -#ifdef __WXUNIVERSAL__ - DECLARE_EVENT_TABLE() -#endif - DECLARE_DYNAMIC_CLASS(wxPopupWindow) -}; - -#endif // _WX_GTK_POPUPWIN_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/print.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/print.h deleted file mode 100644 index e4eae1cef3..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/print.h +++ /dev/null @@ -1,354 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/print.h -// Author: Anthony Bretaudeau -// Purpose: GTK printing support -// Created: 2007-08-25 -// Copyright: (c) Anthony Bretaudeau -// Licence: wxWindows Licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRINT_H_ -#define _WX_GTK_PRINT_H_ - -#include "wx/defs.h" - -#if wxUSE_GTKPRINT - -#include "wx/print.h" -#include "wx/printdlg.h" -#include "wx/prntbase.h" -#include "wx/dc.h" - -typedef struct _GtkPrintOperation GtkPrintOperation; -typedef struct _GtkPrintContext GtkPrintContext; -typedef struct _GtkPrintSettings GtkPrintSettings; -typedef struct _GtkPageSetup GtkPageSetup; - -typedef struct _cairo cairo_t; - -//---------------------------------------------------------------------------- -// wxGtkPrintFactory -//---------------------------------------------------------------------------- - -class wxGtkPrintFactory: public wxPrintFactory -{ -public: - virtual wxPrinterBase *CreatePrinter( wxPrintDialogData *data ); - - virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, - wxPrintout *printout = NULL, - wxPrintDialogData *data = NULL ); - virtual wxPrintPreviewBase *CreatePrintPreview( wxPrintout *preview, - wxPrintout *printout, - wxPrintData *data ); - - virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, - wxPrintDialogData *data = NULL ); - virtual wxPrintDialogBase *CreatePrintDialog( wxWindow *parent, - wxPrintData *data ); - - virtual wxPageSetupDialogBase *CreatePageSetupDialog( wxWindow *parent, - wxPageSetupDialogData * data = NULL ); - - virtual wxDCImpl* CreatePrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ); - - virtual bool HasPrintSetupDialog(); - virtual wxDialog *CreatePrintSetupDialog( wxWindow *parent, wxPrintData *data ); - virtual bool HasOwnPrintToFile(); - virtual bool HasPrinterLine(); - virtual wxString CreatePrinterLine(); - virtual bool HasStatusLine(); - virtual wxString CreateStatusLine(); - - virtual wxPrintNativeDataBase *CreatePrintNativeData(); -}; - -//---------------------------------------------------------------------------- -// wxGtkPrintDialog -//---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGtkPrintDialog: public wxPrintDialogBase -{ -public: - wxGtkPrintDialog( wxWindow *parent, - wxPrintDialogData* data = NULL ); - wxGtkPrintDialog( wxWindow *parent, wxPrintData* data); - virtual ~wxGtkPrintDialog(); - - wxPrintData& GetPrintData() - { return m_printDialogData.GetPrintData(); } - wxPrintDialogData& GetPrintDialogData() - { return m_printDialogData; } - - wxDC *GetPrintDC() { return m_dc; } - void SetPrintDC(wxDC * printDC) { m_dc = printDC; } - - virtual int ShowModal(); - - virtual bool Validate() { return true; } - virtual bool TransferDataToWindow() { return true; } - virtual bool TransferDataFromWindow() { return true; } - - void SetShowDialog(bool show) { m_showDialog = show; } - bool GetShowDialog() { return m_showDialog; } - -protected: - // Implement some base class methods to do nothing to avoid asserts and - // GTK warnings, since this is not a real wxDialog. - virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} - virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) {} - -private: - wxPrintDialogData m_printDialogData; - wxWindow *m_parent; - bool m_showDialog; - wxDC *m_dc; - - DECLARE_DYNAMIC_CLASS(wxGtkPrintDialog) -}; - -//---------------------------------------------------------------------------- -// wxGtkPageSetupDialog -//---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGtkPageSetupDialog: public wxPageSetupDialogBase -{ -public: - wxGtkPageSetupDialog( wxWindow *parent, - wxPageSetupDialogData* data = NULL ); - virtual ~wxGtkPageSetupDialog(); - - virtual wxPageSetupDialogData& GetPageSetupDialogData() { return m_pageDialogData; } - - virtual int ShowModal(); - - virtual bool Validate() { return true; } - virtual bool TransferDataToWindow() { return true; } - virtual bool TransferDataFromWindow() { return true; } - -protected: - // Implement some base class methods to do nothing to avoid asserts and - // GTK warnings, since this is not a real wxDialog. - virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} - virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) {} - -private: - wxPageSetupDialogData m_pageDialogData; - wxWindow *m_parent; - - DECLARE_DYNAMIC_CLASS(wxGtkPageSetupDialog) -}; - -//---------------------------------------------------------------------------- -// wxGtkPrinter -//---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGtkPrinter : public wxPrinterBase -{ -public: - wxGtkPrinter(wxPrintDialogData *data = NULL); - virtual ~wxGtkPrinter(); - - virtual bool Print(wxWindow *parent, - wxPrintout *printout, - bool prompt = true); - virtual wxDC* PrintDialog(wxWindow *parent); - virtual bool Setup(wxWindow *parent); - - GtkPrintContext *GetPrintContext() { return m_gpc; } - void SetPrintContext(GtkPrintContext *context) {m_gpc = context;} - void BeginPrint(wxPrintout *printout, GtkPrintOperation *operation, GtkPrintContext *context); - void DrawPage(wxPrintout *printout, GtkPrintOperation *operation, GtkPrintContext *context, int page_nr); - -private: - GtkPrintContext *m_gpc; - wxDC *m_dc; - - DECLARE_DYNAMIC_CLASS(wxGtkPrinter) - wxDECLARE_NO_COPY_CLASS(wxGtkPrinter); -}; - -//---------------------------------------------------------------------------- -// wxGtkPrintNativeData -//---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGtkPrintNativeData : public wxPrintNativeDataBase -{ -public: - wxGtkPrintNativeData(); - virtual ~wxGtkPrintNativeData(); - - virtual bool TransferTo( wxPrintData &data ); - virtual bool TransferFrom( const wxPrintData &data ); - - virtual bool Ok() const { return IsOk(); } - virtual bool IsOk() const { return true; } - - GtkPrintSettings* GetPrintConfig() { return m_config; } - void SetPrintConfig( GtkPrintSettings * config ); - - GtkPrintOperation* GetPrintJob() { return m_job; } - void SetPrintJob(GtkPrintOperation *job) { m_job = job; } - - GtkPrintContext *GetPrintContext() { return m_context; } - void SetPrintContext(GtkPrintContext *context) {m_context = context; } - - - GtkPageSetup* GetPageSetupFromSettings(GtkPrintSettings* settings); - void SetPageSetupToSettings(GtkPrintSettings* settings, GtkPageSetup* page_setup); - -private: - // NB: m_config is created and owned by us, but the other objects are not - // and their accessors don't change their ref count. - GtkPrintSettings *m_config; - GtkPrintOperation *m_job; - GtkPrintContext *m_context; - - DECLARE_DYNAMIC_CLASS(wxGtkPrintNativeData) -}; - -//----------------------------------------------------------------------------- -// wxGtkPrinterDC -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGtkPrinterDCImpl : public wxDCImpl -{ -public: - wxGtkPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& data ); - virtual ~wxGtkPrinterDCImpl(); - - bool Ok() const { return IsOk(); } - bool IsOk() const; - - virtual void* GetCairoContext() const; - virtual void* GetHandle() const; - - bool CanDrawBitmap() const { return true; } - void Clear(); - void SetFont( const wxFont& font ); - void SetPen( const wxPen& pen ); - void SetBrush( const wxBrush& brush ); - void SetLogicalFunction( wxRasterOperationMode function ); - void SetBackground( const wxBrush& brush ); - void DestroyClippingRegion(); - bool StartDoc(const wxString& message); - void EndDoc(); - void StartPage(); - void EndPage(); - wxCoord GetCharHeight() const; - wxCoord GetCharWidth() const; - bool CanGetTextExtent() const { return true; } - wxSize GetPPI() const; - virtual int GetDepth() const { return 24; } - void SetBackgroundMode(int mode); - void SetPalette(const wxPalette& WXUNUSED(palette)) { } - void SetResolution(int ppi); - - // overridden for wxPrinterDC Impl - virtual int GetResolution() const; - virtual wxRect GetPaperRect() const; - -protected: - bool DoFloodFill(wxCoord x1, wxCoord y1, const wxColour &col, - wxFloodFillStyle style=wxFLOOD_SURFACE ); - void DoGradientFillConcentric(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, const wxPoint& circleCenter); - void DoGradientFillLinear(const wxRect& rect, const wxColour& initialColour, const wxColour& destColour, wxDirection nDirection = wxEAST); - bool DoGetPixel(wxCoord x1, wxCoord y1, wxColour *col) const; - void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2); - void DoCrossHair(wxCoord x, wxCoord y); - void DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2,wxCoord xc,wxCoord yc); - void DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea); - void DoDrawPoint(wxCoord x, wxCoord y); - void DoDrawLines(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0); - void DoDrawPolygon(int n, const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE); - void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[], wxCoord xoffset = 0, wxCoord yoffset = 0, wxPolygonFillMode fillStyle=wxODDEVEN_RULE); - void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - void DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0); - void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height); -#if wxUSE_SPLINES - void DoDrawSpline(const wxPointList *points); -#endif - bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode rop = wxCOPY, bool useMask = false, - wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord); - void DoDrawIcon( const wxIcon& icon, wxCoord x, wxCoord y ); - void DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask = false ); - void DoDrawText(const wxString& text, wxCoord x, wxCoord y ); - void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle); - void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - void DoSetDeviceClippingRegion( const wxRegion &WXUNUSED(clip) ) - { - wxFAIL_MSG( "not implemented" ); - } - void DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL ) const; - void DoGetSize(int* width, int* height) const; - void DoGetSizeMM(int *width, int *height) const; - - wxPrintData& GetPrintData() { return m_printData; } - void SetPrintData(const wxPrintData& data); - -private: - wxPrintData m_printData; - PangoContext *m_context; - PangoLayout *m_layout; - PangoFontDescription *m_fontdesc; - cairo_t *m_cairo; - - unsigned char m_currentRed; - unsigned char m_currentGreen; - unsigned char m_currentBlue; - unsigned char m_currentAlpha; - - GtkPrintContext *m_gpc; - int m_resolution; - double m_PS2DEV; - double m_DEV2PS; - - DECLARE_DYNAMIC_CLASS(wxGtkPrinterDCImpl) - wxDECLARE_NO_COPY_CLASS(wxGtkPrinterDCImpl); -}; - -// ---------------------------------------------------------------------------- -// wxGtkPrintPreview: programmer creates an object of this class to preview a -// wxPrintout. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGtkPrintPreview : public wxPrintPreviewBase -{ -public: - wxGtkPrintPreview(wxPrintout *printout, - wxPrintout *printoutForPrinting = NULL, - wxPrintDialogData *data = NULL); - wxGtkPrintPreview(wxPrintout *printout, - wxPrintout *printoutForPrinting, - wxPrintData *data); - - virtual ~wxGtkPrintPreview(); - - virtual bool Print(bool interactive); - virtual void DetermineScaling(); - -private: - void Init(wxPrintout *printout, - wxPrintout *printoutForPrinting, - wxPrintData *data); - - // resolution to use in DPI - int m_resolution; - - DECLARE_CLASS(wxGtkPrintPreview) -}; - -#endif // wxUSE_GTKPRINT - -#endif // _WX_GTK_PRINT_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private.h deleted file mode 100644 index 4c52f53c50..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private.h +++ /dev/null @@ -1,132 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private.h -// Purpose: wxGTK private macros, functions &c -// Author: Vadim Zeitlin -// Modified by: -// Created: 12.03.02 -// Copyright: (c) 2002 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_H_ -#define _WX_GTK_PRIVATE_H_ - -#include - -#include "wx/gtk/private/string.h" -#include "wx/gtk/private/gtk2-compat.h" - -#ifndef G_VALUE_INIT - // introduced in GLib 2.30 - #define G_VALUE_INIT { 0, { { 0 } } } -#endif - -// pango_version_check symbol is quite recent ATM (4/2007)... so we -// use our own wrapper which implements a smart trick. -// Use this function as you'd use pango_version_check: -// -// if (!wx_pango_version_check(1,18,0)) -// ... call to a function available only in pango >= 1.18 ... -// -// and use it only to test for pango versions >= 1.16.0 -extern const gchar *wx_pango_version_check(int major, int minor, int micro); - -#if wxUSE_UNICODE - #define wxGTK_CONV(s) (s).utf8_str() - #define wxGTK_CONV_ENC(s, enc) wxGTK_CONV((s)) - #define wxGTK_CONV_FONT(s, font) wxGTK_CONV((s)) - #define wxGTK_CONV_SYS(s) wxGTK_CONV((s)) - - #define wxGTK_CONV_BACK(s) wxString::FromUTF8Unchecked(s) - #define wxGTK_CONV_BACK_ENC(s, enc) wxGTK_CONV_BACK(s) - #define wxGTK_CONV_BACK_FONT(s, font) wxGTK_CONV_BACK(s) - #define wxGTK_CONV_BACK_SYS(s) wxGTK_CONV_BACK(s) -#else - #include "wx/font.h" - - // convert the text between the given encoding and UTF-8 used by wxGTK - extern WXDLLIMPEXP_CORE wxCharBuffer - wxConvertToGTK(const wxString& s, - wxFontEncoding enc = wxFONTENCODING_SYSTEM); - - extern WXDLLIMPEXP_CORE wxCharBuffer - wxConvertFromGTK(const wxString& s, - wxFontEncoding enc = wxFONTENCODING_SYSTEM); - - // helper: use the encoding of the given font if it's valid - inline wxCharBuffer wxConvertToGTK(const wxString& s, const wxFont& font) - { - return wxConvertToGTK(s, font.IsOk() ? font.GetEncoding() - : wxFONTENCODING_SYSTEM); - } - - inline wxCharBuffer wxConvertFromGTK(const wxString& s, const wxFont& font) - { - return wxConvertFromGTK(s, font.IsOk() ? font.GetEncoding() - : wxFONTENCODING_SYSTEM); - } - - // more helpers: allow passing GTK+ strings directly - inline wxCharBuffer - wxConvertFromGTK(const wxGtkString& gs, - wxFontEncoding enc = wxFONTENCODING_SYSTEM) - { - return wxConvertFromGTK(gs.c_str(), enc); - } - - inline wxCharBuffer - wxConvertFromGTK(const wxGtkString& gs, const wxFont& font) - { - return wxConvertFromGTK(gs.c_str(), font); - } - - #define wxGTK_CONV(s) wxGTK_CONV_FONT((s), m_font) - #define wxGTK_CONV_ENC(s, enc) wxConvertToGTK((s), (enc)) - #define wxGTK_CONV_FONT(s, font) wxConvertToGTK((s), (font)) - #define wxGTK_CONV_SYS(s) wxConvertToGTK((s)) - - #define wxGTK_CONV_BACK(s) wxConvertFromGTK((s), m_font) - #define wxGTK_CONV_BACK_ENC(s, enc) wxConvertFromGTK((s), (enc)) - #define wxGTK_CONV_BACK_FONT(s, font) wxConvertFromGTK((s), (font)) - #define wxGTK_CONV_BACK_SYS(s) wxConvertFromGTK((s)) -#endif - -// Define a macro for converting wxString to char* in appropriate encoding for -// the file names. -#ifdef G_OS_WIN32 - // Under MSW, UTF-8 file name encodings are always used. - #define wxGTK_CONV_FN(s) (s).utf8_str() -#else - // Under Unix use GLib file name encoding (which is also UTF-8 by default - // but may be different from it). - #define wxGTK_CONV_FN(s) (s).fn_str() -#endif - -// ---------------------------------------------------------------------------- -// various private helper functions -// ---------------------------------------------------------------------------- - -namespace wxGTKPrivate -{ - -// these functions create the GTK widgets of the specified types which can then -// used to retrieve their styles, pass them to drawing functions &c -// -// the returned widgets shouldn't be destroyed, this is done automatically on -// shutdown -WXDLLIMPEXP_CORE GtkWidget *GetButtonWidget(); -WXDLLIMPEXP_CORE GtkWidget *GetCheckButtonWidget(); -WXDLLIMPEXP_CORE GtkWidget *GetComboBoxWidget(); -WXDLLIMPEXP_CORE GtkWidget *GetEntryWidget(); -WXDLLIMPEXP_CORE GtkWidget *GetHeaderButtonWidgetFirst(); -WXDLLIMPEXP_CORE GtkWidget *GetHeaderButtonWidgetLast(); -WXDLLIMPEXP_CORE GtkWidget *GetHeaderButtonWidget(); -WXDLLIMPEXP_CORE GtkWidget *GetNotebookWidget(); -WXDLLIMPEXP_CORE GtkWidget *GetRadioButtonWidget(); -WXDLLIMPEXP_CORE GtkWidget *GetSplitterWidget(wxOrientation orient = wxHORIZONTAL); -WXDLLIMPEXP_CORE GtkWidget *GetTextEntryWidget(); -WXDLLIMPEXP_CORE GtkWidget *GetTreeWidget(); - -} // wxGTKPrivate - -#endif // _WX_GTK_PRIVATE_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/dialogcount.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/dialogcount.h deleted file mode 100644 index b282e99ca5..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/dialogcount.h +++ /dev/null @@ -1,48 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/dialogcount.h -// Purpose: Helper for temporarily changing wxOpenModalDialogsCount global. -// Author: Vadim Zeitlin -// Created: 2013-03-21 -// Copyright: (c) 2013 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_DIALOGCOUNT_H_ -#define _WX_GTK_PRIVATE_DIALOGCOUNT_H_ - -#include "wx/defs.h" - -// This global variable contains the number of currently opened modal dialogs. -// When it is non null, the global menu used in Ubuntu Unity needs to be -// explicitly disabled as this doesn't currently happen on its own due to a bug -// in Unity, see https://bugs.launchpad.net/indicator-appmenu/+bug/674605 -// -// For this to work, all modal dialogs must use wxOpenModalDialogLocker class -// below to increment this variable while they are indeed being modally shown. -// -// This variable is defined in src/gtk/toplevel.cpp -extern int wxOpenModalDialogsCount; - -// ---------------------------------------------------------------------------- -// wxOpenModalDialogLocker: Create an object of this class to increment -// wxOpenModalDialogsCount during its lifetime. -// ---------------------------------------------------------------------------- - -class wxOpenModalDialogLocker -{ -public: - wxOpenModalDialogLocker() - { - wxOpenModalDialogsCount++; - } - - ~wxOpenModalDialogLocker() - { - wxOpenModalDialogsCount--; - } - -private: - wxDECLARE_NO_COPY_CLASS(wxOpenModalDialogLocker); -}; - -#endif // _WX_GTK_PRIVATE_DIALOGCOUNT_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/error.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/error.h deleted file mode 100644 index 5432b18bf3..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/error.h +++ /dev/null @@ -1,45 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: gtk/private/error.h -// Purpose: Wrapper around GError. -// Author: Vadim Zeitlin -// Created: 2012-07-25 -// Copyright: (c) 2012 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_ERROR_H_ -#define _WX_GTK_PRIVATE_ERROR_H_ - -// ---------------------------------------------------------------------------- -// wxGtkError wraps GError and releases it automatically. -// ---------------------------------------------------------------------------- - -// Create an object of this class and pass the result of its Out() method to a -// function taking "GError**", then use GetMessage() if the function returned -// false. -class wxGtkError -{ -public: - wxGtkError() { m_error = NULL; } - ~wxGtkError() { if ( m_error ) g_error_free(m_error); } - - GError** Out() - { - // This would result in a GError leak. - wxASSERT_MSG( !m_error, wxS("Can't reuse the same object.") ); - - return &m_error; - } - - wxString GetMessage() const - { - return wxString::FromUTF8(m_error->message); - } - -private: - GError* m_error; - - wxDECLARE_NO_COPY_CLASS(wxGtkError); -}; - -#endif // _WX_GTK_PRIVATE_ERROR_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/event.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/event.h deleted file mode 100644 index eda9e6e7f4..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/event.h +++ /dev/null @@ -1,79 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/event.h -// Purpose: Helper functions for working with GDK and wx events -// Author: Vaclav Slavik -// Created: 2011-10-14 -// Copyright: (c) 2011 Vaclav Slavik -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _GTK_PRIVATE_EVENT_H_ -#define _GTK_PRIVATE_EVENT_H_ - -#if !GTK_CHECK_VERSION(2,10,0) - // GTK+ can reliably detect Meta key state only since 2.10 when - // GDK_META_MASK was introduced -- there wasn't any way to detect it - // in older versions. wxGTK used GDK_MOD2_MASK for this purpose, but - // GDK_MOD2_MASK is documented as: - // - // the fifth modifier key (it depends on the modifier mapping of the X - // server which key is interpreted as this modifier) - // - // In other words, it isn't guaranteed to map to Meta. This is a real - // problem: it is common to map NumLock to it (in fact, it's an exception - // if the X server _doesn't_ use it for NumLock). So the old code caused - // wxKeyEvent::MetaDown() to always return true as long as NumLock was on - // on many systems, which broke all applications using - // wxKeyEvent::GetModifiers() to check modifiers state (see e.g. here: - // http://tinyurl.com/56lsk2). - // - // Because of this, it's better to not detect Meta key state at all than - // to detect it incorrectly. Hence the following #define, which causes - // m_metaDown to be always set to false. - #define GDK_META_MASK 0 -#endif - -namespace wxGTKImpl -{ - -// init wxMouseEvent with the info from GdkEventXXX struct -template void InitMouseEvent(wxWindowGTK *win, - wxMouseEvent& event, - T *gdk_event) -{ - event.m_shiftDown = (gdk_event->state & GDK_SHIFT_MASK) != 0; - event.m_controlDown = (gdk_event->state & GDK_CONTROL_MASK) != 0; - event.m_altDown = (gdk_event->state & GDK_MOD1_MASK) != 0; - event.m_metaDown = (gdk_event->state & GDK_META_MASK) != 0; - event.m_leftDown = (gdk_event->state & GDK_BUTTON1_MASK) != 0; - event.m_middleDown = (gdk_event->state & GDK_BUTTON2_MASK) != 0; - event.m_rightDown = (gdk_event->state & GDK_BUTTON3_MASK) != 0; - - // In gdk/win32 VK_XBUTTON1 is translated to GDK_BUTTON4_MASK - // and VK_XBUTTON2 to GDK_BUTTON5_MASK. In x11/gdk buttons 4/5 - // are wheel rotation and buttons 8/9 don't change the state. - event.m_aux1Down = (gdk_event->state & GDK_BUTTON4_MASK) != 0; - event.m_aux2Down = (gdk_event->state & GDK_BUTTON5_MASK) != 0; - - wxPoint pt = win->GetClientAreaOrigin(); - event.m_x = (wxCoord)gdk_event->x - pt.x; - event.m_y = (wxCoord)gdk_event->y - pt.y; - - if ((win->m_wxwindow) && (win->GetLayoutDirection() == wxLayout_RightToLeft)) - { - // origin in the upper right corner - GtkAllocation a; - gtk_widget_get_allocation(win->m_wxwindow, &a); - int window_width = a.width; - event.m_x = window_width - event.m_x; - } - - event.SetEventObject( win ); - event.SetId( win->GetId() ); - event.SetTimestamp( gdk_event->time ); -} - -} // namespace wxGTKImpl - -#endif // _GTK_PRIVATE_EVENT_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/gdkconv.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/gdkconv.h deleted file mode 100644 index b63b0c74cd..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/gdkconv.h +++ /dev/null @@ -1,32 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/gdkconv.h -// Purpose: Helper functions for converting between GDK and wx types -// Author: Vadim Zeitlin -// Created: 2009-11-10 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _GTK_PRIVATE_GDKCONV_H_ -#define _GTK_PRIVATE_GDKCONV_H_ - -namespace wxGTKImpl -{ - -inline wxRect wxRectFromGDKRect(const GdkRectangle *r) -{ - return wxRect(r->x, r->y, r->width, r->height); -} - -inline void wxRectToGDKRect(const wxRect& rect, GdkRectangle& r) -{ - r.x = rect.x; - r.y = rect.y; - r.width = rect.width; - r.height = rect.height; -} - -} // namespace wxGTKImpl - -#endif // _GTK_PRIVATE_GDKCONV_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/gtk2-compat.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/gtk2-compat.h deleted file mode 100644 index 76a6075857..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/gtk2-compat.h +++ /dev/null @@ -1,521 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/compat.h -// Purpose: Compatibility code for older GTK+ versions -// Author: Vaclav Slavik -// Created: 2011-03-25 -// Copyright: (c) 2011 Vaclav Slavik -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_COMPAT_H_ -#define _WX_GTK_PRIVATE_COMPAT_H_ - -// ---------------------------------------------------------------------------- -// Implementations of new accessors for older GTK+ versions -// ---------------------------------------------------------------------------- - -// GTK+ deprecated direct access to struct members and some other stuff, -// replacing them with simple accessor functions. These aren't available in -// older versions, though, so we have to provide them for compatibility. -// -// Note: wx_ prefix is used to avoid symbol conflicts at runtime -// -// Note 2: We support building against newer GTK+ version and using an older -// one at runtime, so we must provide our implementations of these -// functions even if GTK_CHECK_VERSION would indicate the function is -// already available in GTK+. - -#ifndef __WXGTK3__ - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 2.8 - -static inline GtkWidget* wx_gtk_scrolled_window_get_hscrollbar(GtkScrolledWindow* scrolled_window) -{ - return scrolled_window->hscrollbar; -} -#define gtk_scrolled_window_get_hscrollbar wx_gtk_scrolled_window_get_hscrollbar - -static inline GtkWidget* wx_gtk_scrolled_window_get_vscrollbar(GtkScrolledWindow* scrolled_window) -{ - return scrolled_window->vscrollbar; -} -#define gtk_scrolled_window_get_vscrollbar wx_gtk_scrolled_window_get_vscrollbar - -// ---------------------------------------------------------------------------- -// the following were introduced in GLib 2.10 - -static inline gpointer wx_g_object_ref_sink(gpointer object) -{ - g_object_ref(object); - gtk_object_sink(GTK_OBJECT(object)); - return object; -} -#define g_object_ref_sink wx_g_object_ref_sink - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 2.12 - -static inline void wx_gtk_about_dialog_set_program_name(GtkAboutDialog* about, const gchar* name) -{ - gtk_about_dialog_set_name(about, name); -} -#define gtk_about_dialog_set_program_name wx_gtk_about_dialog_set_program_name - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 2.14 - -static inline gdouble wx_gtk_adjustment_get_lower(GtkAdjustment* adjustment) -{ - return adjustment->lower; -} -#define gtk_adjustment_get_lower wx_gtk_adjustment_get_lower - -static inline gdouble wx_gtk_adjustment_get_page_increment(GtkAdjustment* adjustment) -{ - return adjustment->page_increment; -} -#define gtk_adjustment_get_page_increment wx_gtk_adjustment_get_page_increment - -static inline gdouble wx_gtk_adjustment_get_page_size(GtkAdjustment* adjustment) -{ - return adjustment->page_size; -} -#define gtk_adjustment_get_page_size wx_gtk_adjustment_get_page_size - -static inline gdouble wx_gtk_adjustment_get_step_increment(GtkAdjustment* adjustment) -{ - return adjustment->step_increment; -} -#define gtk_adjustment_get_step_increment wx_gtk_adjustment_get_step_increment - -static inline gdouble wx_gtk_adjustment_get_upper(GtkAdjustment* adjustment) -{ - return adjustment->upper; -} -#define gtk_adjustment_get_upper wx_gtk_adjustment_get_upper - -static inline void wx_gtk_adjustment_set_page_size(GtkAdjustment* adjustment, gdouble page_size) -{ - adjustment->page_size = page_size; -} -#define gtk_adjustment_set_page_size wx_gtk_adjustment_set_page_size - -static inline GtkWidget* wx_gtk_color_selection_dialog_get_color_selection(GtkColorSelectionDialog* csd) -{ - return csd->colorsel; -} -#define gtk_color_selection_dialog_get_color_selection wx_gtk_color_selection_dialog_get_color_selection - -static inline GtkWidget* wx_gtk_dialog_get_content_area(GtkDialog* dialog) -{ - return dialog->vbox; -} -#define gtk_dialog_get_content_area wx_gtk_dialog_get_content_area - -static inline GtkWidget* wx_gtk_dialog_get_action_area(GtkDialog* dialog) -{ - return dialog->action_area; -} -#define gtk_dialog_get_action_area wx_gtk_dialog_get_action_area - -static inline guint16 wx_gtk_entry_get_text_length(GtkEntry* entry) -{ - return entry->text_length; -} -#define gtk_entry_get_text_length wx_gtk_entry_get_text_length - -static inline const guchar* wx_gtk_selection_data_get_data(GtkSelectionData* selection_data) -{ - return selection_data->data; -} -#define gtk_selection_data_get_data wx_gtk_selection_data_get_data - -static inline GdkAtom wx_gtk_selection_data_get_data_type(GtkSelectionData* selection_data) -{ - return selection_data->type; -} -#define gtk_selection_data_get_data_type wx_gtk_selection_data_get_data_type - -static inline gint wx_gtk_selection_data_get_format(GtkSelectionData* selection_data) -{ - return selection_data->format; -} -#define gtk_selection_data_get_format wx_gtk_selection_data_get_format - -static inline gint wx_gtk_selection_data_get_length(GtkSelectionData* selection_data) -{ - return selection_data->length; -} -#define gtk_selection_data_get_length wx_gtk_selection_data_get_length - -static inline GdkAtom wx_gtk_selection_data_get_target(GtkSelectionData* selection_data) -{ - return selection_data->target; -} -#define gtk_selection_data_get_target wx_gtk_selection_data_get_target - -static inline GdkWindow* wx_gtk_widget_get_window(GtkWidget* widget) -{ - return widget->window; -} -#define gtk_widget_get_window wx_gtk_widget_get_window - -static inline GtkWidget* wx_gtk_window_get_default_widget(GtkWindow* window) -{ - return window->default_widget; -} -#define gtk_window_get_default_widget wx_gtk_window_get_default_widget - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 2.16 - -static inline GdkAtom wx_gtk_selection_data_get_selection(GtkSelectionData* selection_data) -{ - return selection_data->selection; -} -#define gtk_selection_data_get_selection wx_gtk_selection_data_get_selection - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 2.18 - -static inline void wx_gtk_cell_renderer_get_alignment(GtkCellRenderer* cell, gfloat* xalign, gfloat* yalign) -{ - *xalign = cell->xalign; - *yalign = cell->yalign; -} -#define gtk_cell_renderer_get_alignment wx_gtk_cell_renderer_get_alignment - -static inline void wx_gtk_cell_renderer_get_padding(GtkCellRenderer* cell, gint* xpad, gint* ypad) -{ - *xpad = cell->xpad; - *ypad = cell->ypad; -} -#define gtk_cell_renderer_get_padding wx_gtk_cell_renderer_get_padding - -static inline void wx_gtk_widget_get_allocation(GtkWidget* widget, GtkAllocation* allocation) -{ - *allocation = widget->allocation; -} -#define gtk_widget_get_allocation wx_gtk_widget_get_allocation - -inline gboolean wx_gtk_widget_get_has_window(GtkWidget *widget) -{ - return !GTK_WIDGET_NO_WINDOW(widget); -} -#define gtk_widget_get_has_window wx_gtk_widget_get_has_window - - -inline gboolean wx_gtk_widget_get_has_grab(GtkWidget *widget) -{ - return GTK_WIDGET_HAS_GRAB(widget); -} -#define gtk_widget_get_has_grab wx_gtk_widget_get_has_grab - - -inline gboolean wx_gtk_widget_get_visible(GtkWidget *widget) -{ - return GTK_WIDGET_VISIBLE(widget); -} -#define gtk_widget_get_visible wx_gtk_widget_get_visible - - -inline gboolean wx_gtk_widget_get_sensitive(GtkWidget *widget) -{ - return GTK_WIDGET_SENSITIVE(widget); -} -#define gtk_widget_get_sensitive wx_gtk_widget_get_sensitive - - -inline gboolean wx_gtk_widget_is_drawable(GtkWidget *widget) -{ - return GTK_WIDGET_DRAWABLE(widget); -} -#define gtk_widget_is_drawable wx_gtk_widget_is_drawable - - -inline gboolean wx_gtk_widget_get_can_focus(GtkWidget *widget) -{ - return GTK_WIDGET_CAN_FOCUS(widget); -} -#define gtk_widget_get_can_focus wx_gtk_widget_get_can_focus - -inline void wx_gtk_widget_set_can_focus(GtkWidget *widget, gboolean can) -{ - if ( can ) - GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_FOCUS); - else - GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_FOCUS); -} -#define gtk_widget_set_can_focus wx_gtk_widget_set_can_focus - - -inline gboolean wx_gtk_widget_get_can_default(GtkWidget *widget) -{ - return GTK_WIDGET_CAN_DEFAULT(widget); -} -#define gtk_widget_get_can_default wx_gtk_widget_get_can_default - -inline void wx_gtk_widget_set_can_default(GtkWidget *widget, gboolean can) -{ - if ( can ) - GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_DEFAULT); - else - GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_DEFAULT); -} -#define gtk_widget_set_can_default wx_gtk_widget_set_can_default - - -inline gboolean wx_gtk_widget_has_default(GtkWidget *widget) -{ - return GTK_WIDGET_HAS_DEFAULT(widget); -} -#define gtk_widget_has_default wx_gtk_widget_has_default - - -inline GtkStateType wx_gtk_widget_get_state(GtkWidget *widget) -{ - return (GtkStateType)GTK_WIDGET_STATE(widget); -} -#define gtk_widget_get_state wx_gtk_widget_get_state - - -inline gboolean wx_gtk_widget_get_double_buffered(GtkWidget *widget) -{ - return GTK_WIDGET_DOUBLE_BUFFERED(widget); -} -#define gtk_widget_get_double_buffered wx_gtk_widget_get_double_buffered - -static inline gboolean wx_gtk_widget_has_grab(GtkWidget* widget) -{ - return GTK_WIDGET_HAS_GRAB(widget); -} -#define gtk_widget_has_grab wx_gtk_widget_has_grab - -static inline void wx_gtk_widget_set_allocation(GtkWidget* widget, const GtkAllocation* allocation) -{ - widget->allocation = *allocation; -} -#define gtk_widget_set_allocation wx_gtk_widget_set_allocation - -static inline gboolean wx_gtk_widget_is_toplevel(GtkWidget* widget) -{ - return GTK_WIDGET_TOPLEVEL(widget); -} -#define gtk_widget_is_toplevel wx_gtk_widget_is_toplevel - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 2.20 - -inline gboolean wx_gtk_widget_get_realized(GtkWidget *widget) -{ - return GTK_WIDGET_REALIZED(widget); -} -#define gtk_widget_get_realized wx_gtk_widget_get_realized - - -inline gboolean wx_gtk_widget_get_mapped(GtkWidget *widget) -{ - return GTK_WIDGET_MAPPED(widget); -} -#define gtk_widget_get_mapped wx_gtk_widget_get_mapped - -static inline void wx_gtk_widget_get_requisition(GtkWidget* widget, GtkRequisition* requisition) -{ - *requisition = widget->requisition; -} -#define gtk_widget_get_requisition wx_gtk_widget_get_requisition - -static inline GdkWindow* wx_gtk_entry_get_text_window(GtkEntry* entry) -{ - return entry->text_area; -} -#define gtk_entry_get_text_window wx_gtk_entry_get_text_window - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 2.22 - -static inline GdkWindow* wx_gtk_button_get_event_window(GtkButton* button) -{ - return button->event_window; -} -#define gtk_button_get_event_window wx_gtk_button_get_event_window - -static inline GdkDragAction wx_gdk_drag_context_get_actions(GdkDragContext* context) -{ - return context->actions; -} -#define gdk_drag_context_get_actions wx_gdk_drag_context_get_actions - -static inline GdkDragAction wx_gdk_drag_context_get_selected_action(GdkDragContext* context) -{ - return context->action; -} -#define gdk_drag_context_get_selected_action wx_gdk_drag_context_get_selected_action - -static inline GdkDragAction wx_gdk_drag_context_get_suggested_action(GdkDragContext* context) -{ - return context->suggested_action; -} -#define gdk_drag_context_get_suggested_action wx_gdk_drag_context_get_suggested_action - -static inline GList* wx_gdk_drag_context_list_targets(GdkDragContext* context) -{ - return context->targets; -} -#define gdk_drag_context_list_targets wx_gdk_drag_context_list_targets - -static inline gint wx_gdk_visual_get_depth(GdkVisual* visual) -{ - return visual->depth; -} -#define gdk_visual_get_depth wx_gdk_visual_get_depth - -static inline gboolean wx_gtk_window_has_group(GtkWindow* window) -{ - return window->group != NULL; -} -#define gtk_window_has_group wx_gtk_window_has_group - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 2.24 - -static inline GdkDisplay* wx_gdk_window_get_display(GdkWindow* window) -{ - return gdk_drawable_get_display(window); -} -#define gdk_window_get_display wx_gdk_window_get_display - -static inline GdkScreen* wx_gdk_window_get_screen(GdkWindow* window) -{ - return gdk_drawable_get_screen(window); -} -#define gdk_window_get_screen wx_gdk_window_get_screen - -static inline gint wx_gdk_window_get_height(GdkWindow* window) -{ - int h; - gdk_drawable_get_size(window, NULL, &h); - return h; -} -#define gdk_window_get_height wx_gdk_window_get_height - -static inline gint wx_gdk_window_get_width(GdkWindow* window) -{ - int w; - gdk_drawable_get_size(window, &w, NULL); - return w; -} -#define gdk_window_get_width wx_gdk_window_get_width - -#if GTK_CHECK_VERSION(2,10,0) -static inline void wx_gdk_cairo_set_source_window(cairo_t* cr, GdkWindow* window, gdouble x, gdouble y) -{ - gdk_cairo_set_source_pixmap(cr, window, x, y); -} -#define gdk_cairo_set_source_window wx_gdk_cairo_set_source_window -#endif - -// ---------------------------------------------------------------------------- -// the following were introduced in GTK+ 3.0 - -static inline void wx_gdk_window_get_geometry(GdkWindow* window, gint* x, gint* y, gint* width, gint* height) -{ - gdk_window_get_geometry(window, x, y, width, height, NULL); -} -#define gdk_window_get_geometry wx_gdk_window_get_geometry - -static inline GtkWidget* wx_gtk_tree_view_column_get_button(GtkTreeViewColumn* tree_column) -{ - return tree_column->button; -} -#define gtk_tree_view_column_get_button wx_gtk_tree_view_column_get_button - -static inline GtkWidget* wx_gtk_box_new(GtkOrientation orientation, gint spacing) -{ - GtkWidget* widget; - if (orientation == GTK_ORIENTATION_HORIZONTAL) - widget = gtk_hbox_new(false, spacing); - else - widget = gtk_vbox_new(false, spacing); - return widget; -} -#define gtk_box_new wx_gtk_box_new - -static inline GtkWidget* wx_gtk_button_box_new(GtkOrientation orientation) -{ - GtkWidget* widget; - if (orientation == GTK_ORIENTATION_HORIZONTAL) - widget = gtk_hbutton_box_new(); - else - widget = gtk_vbutton_box_new(); - return widget; -} -#define gtk_button_box_new wx_gtk_button_box_new - -static inline GtkWidget* wx_gtk_scale_new(GtkOrientation orientation, GtkAdjustment* adjustment) -{ - GtkWidget* widget; - if (orientation == GTK_ORIENTATION_HORIZONTAL) - widget = gtk_hscale_new(adjustment); - else - widget = gtk_vscale_new(adjustment); - return widget; -} -#define gtk_scale_new wx_gtk_scale_new - -static inline GtkWidget* wx_gtk_scrollbar_new(GtkOrientation orientation, GtkAdjustment* adjustment) -{ - GtkWidget* widget; - if (orientation == GTK_ORIENTATION_HORIZONTAL) - widget = gtk_hscrollbar_new(adjustment); - else - widget = gtk_vscrollbar_new(adjustment); - return widget; -} -#define gtk_scrollbar_new wx_gtk_scrollbar_new - -static inline GtkWidget* wx_gtk_separator_new(GtkOrientation orientation) -{ - GtkWidget* widget; - if (orientation == GTK_ORIENTATION_HORIZONTAL) - widget = gtk_hseparator_new(); - else - widget = gtk_vseparator_new(); - return widget; -} -#define gtk_separator_new wx_gtk_separator_new - -static inline void wx_gtk_widget_get_preferred_height(GtkWidget* widget, gint* minimum, gint* natural) -{ - GtkRequisition req; - gtk_widget_size_request(widget, &req); - if (minimum) - *minimum = req.height; - if (natural) - *natural = req.height; -} -#define gtk_widget_get_preferred_height wx_gtk_widget_get_preferred_height - -static inline void wx_gtk_widget_get_preferred_width(GtkWidget* widget, gint* minimum, gint* natural) -{ - GtkRequisition req; - gtk_widget_size_request(widget, &req); - if (minimum) - *minimum = req.width; - if (natural) - *natural = req.width; -} -#define gtk_widget_get_preferred_width wx_gtk_widget_get_preferred_width - -static inline void wx_gtk_widget_get_preferred_size(GtkWidget* widget, GtkRequisition* minimum, GtkRequisition* natural) -{ - GtkRequisition* req = minimum; - if (req == NULL) - req = natural; - gtk_widget_size_request(widget, req); -} -#define gtk_widget_get_preferred_size wx_gtk_widget_get_preferred_size - -#endif // !__WXGTK3__ -#endif // _WX_GTK_PRIVATE_COMPAT_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/list.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/list.h deleted file mode 100644 index 15ddf71cae..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/list.h +++ /dev/null @@ -1,32 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/list.h -// Purpose: wxGtkList class. -// Author: Vadim Zeitlin -// Created: 2011-08-21 -// Copyright: (c) 2011 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_LIST_H_ -#define _WX_GTK_PRIVATE_LIST_H_ - -// ---------------------------------------------------------------------------- -// Convenience class for calling g_list_free() automatically -// ---------------------------------------------------------------------------- - -class wxGtkList -{ -public: - explicit wxGtkList(GList* list) : m_list(list) { } - ~wxGtkList() { g_list_free(m_list); } - - operator GList *() const { return m_list; } - GList * operator->() const { return m_list; } - -protected: - GList* const m_list; - - wxDECLARE_NO_COPY_CLASS(wxGtkList); -}; - -#endif // _WX_GTK_PRIVATE_LIST_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/messagetype.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/messagetype.h deleted file mode 100644 index 2c3a2a5a58..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/messagetype.h +++ /dev/null @@ -1,44 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/messagetype.h -// Purpose: translate between wx and GtkMessageType -// Author: Vadim Zeitlin -// Created: 2009-09-27 -// Copyright: (c) 2009 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _GTK_PRIVATE_MSGTYPE_H_ -#define _GTK_PRIVATE_MSGTYPE_H_ - -#include - -namespace wxGTKImpl -{ - -// Convert the given wx style to GtkMessageType, return true if succeeded or -// false if failed. -inline bool ConvertMessageTypeFromWX(int style, GtkMessageType *type) -{ -#ifdef __WXGTK210__ - if ( gtk_check_version(2, 10, 0) == NULL && (style & wxICON_NONE)) - *type = GTK_MESSAGE_OTHER; - else -#endif // __WXGTK210__ - if (style & wxICON_EXCLAMATION) - *type = GTK_MESSAGE_WARNING; - else if (style & wxICON_ERROR) - *type = GTK_MESSAGE_ERROR; - else if (style & wxICON_INFORMATION) - *type = GTK_MESSAGE_INFO; - else if (style & wxICON_QUESTION) - *type = GTK_MESSAGE_QUESTION; - else - return false; - - return true; -} - -} // namespace wxGTKImpl - -#endif // _GTK_PRIVATE_MSGTYPE_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/mnemonics.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/mnemonics.h deleted file mode 100644 index 0b6e4ba45a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/mnemonics.h +++ /dev/null @@ -1,38 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/mnemonics.h -// Purpose: helper functions for dealing with GTK+ mnemonics -// Author: Vadim Zeitlin -// Created: 2007-11-12 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _GTK_PRIVATE_MNEMONICS_H_ -#define _GTK_PRIVATE_MNEMONICS_H_ - -#if wxUSE_CONTROLS || wxUSE_MENUS - -#include "wx/string.h" - -// ---------------------------------------------------------------------------- -// functions to convert between wxWidgets and GTK+ string containing mnemonics -// ---------------------------------------------------------------------------- - -// remove all mnemonics from a string -wxString wxGTKRemoveMnemonics(const wxString& label); - -// convert a wx string with '&' to GTK+ string with '_'s -wxString wxConvertMnemonicsToGTK(const wxString& label); - -// convert a wx string with '&' to indicate mnemonics as well as HTML entities -// to a GTK+ string with "&" used instead of '&', i.e. suitable for use -// with GTK+ functions using markup strings -wxString wxConvertMnemonicsToGTKMarkup(const wxString& label); - -// convert GTK+ string with '_'s to wx string with '&'s -wxString wxConvertMnemonicsFromGTK(const wxString& label); - -#endif // wxUSE_CONTROLS || wxUSE_MENUS - -#endif // _GTK_PRIVATE_MNEMONICS_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/object.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/object.h deleted file mode 100644 index 472e4c3ede..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/object.h +++ /dev/null @@ -1,35 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/object.h -// Purpose: wxGtkObject class declaration -// Author: Vadim Zeitlin -// Created: 2008-08-27 -// Copyright: (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_OBJECT_H_ -#define _WX_GTK_PRIVATE_OBJECT_H_ - -// ---------------------------------------------------------------------------- -// Convenience class for calling g_object_unref() automatically -// ---------------------------------------------------------------------------- - -template -class wxGtkObject -{ -public: - explicit wxGtkObject(T *p) : m_ptr(p) { } - ~wxGtkObject() { g_object_unref(m_ptr); } - - operator T *() const { return m_ptr; } - -private: - T * const m_ptr; - - // copying could be implemented by using g_object_ref() but for now there - // is no need for it so don't implement it - wxDECLARE_NO_COPY_CLASS(wxGtkObject); -}; - -#endif // _WX_GTK_PRIVATE_OBJECT_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/string.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/string.h deleted file mode 100644 index bd188d10f8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/string.h +++ /dev/null @@ -1,120 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/string.h -// Purpose: wxGtkString class declaration -// Author: Vadim Zeitlin -// Created: 2006-10-19 -// Copyright: (c) 2006 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_STRING_H_ -#define _WX_GTK_PRIVATE_STRING_H_ - -// ---------------------------------------------------------------------------- -// Convenience class for g_freeing a gchar* on scope exit automatically -// ---------------------------------------------------------------------------- - -class wxGtkString -{ -public: - explicit wxGtkString(gchar *s) : m_str(s) { } - ~wxGtkString() { g_free(m_str); } - - const gchar *c_str() const { return m_str; } - - operator gchar *() const { return m_str; } - -private: - gchar *m_str; - - wxDECLARE_NO_COPY_CLASS(wxGtkString); -}; - - -// ---------------------------------------------------------------------------- -// list for sorting collated strings -// ---------------------------------------------------------------------------- - -#include "wx/string.h" -#include "wx/vector.h" -#include "wx/sharedptr.h" - -class wxGtkCollatableString -{ -public: - wxGtkCollatableString( const wxString &label, gchar *key ) - { - m_label = label; - m_key = key; - } - - ~wxGtkCollatableString() - { - if (m_key) - g_free( m_key ); - } - - wxString m_label; - gchar *m_key; -}; - -class wxGtkCollatedArrayString -{ -public: - wxGtkCollatedArrayString() { } - - int Add( const wxString &new_label ) - { - int index = 0; - - gchar *new_key_lower = g_utf8_casefold( new_label.utf8_str(), -1); - gchar *new_key = g_utf8_collate_key( new_key_lower, -1); - g_free( new_key_lower ); - - wxSharedPtr new_ptr( new wxGtkCollatableString( new_label, new_key ) ); - - wxVector< wxSharedPtr >::iterator iter; - for (iter = m_list.begin(); iter != m_list.end(); ++iter) - { - wxSharedPtr ptr = *iter; - - gchar *key = ptr->m_key; - if (strcmp(key,new_key) >= 0) - { - m_list.insert( iter, new_ptr ); - return index; - } - index ++; - } - - m_list.push_back( new_ptr ); - return index; - } - - size_t GetCount() - { - return m_list.size(); - } - - wxString At( size_t index ) - { - return m_list[index]->m_label; - } - - void Clear() - { - m_list.clear(); - } - - void RemoveAt( size_t index ) - { - m_list.erase( m_list.begin() + index ); - } - -private: - wxVector< wxSharedPtr > m_list; -}; - - -#endif // _WX_GTK_PRIVATE_STRING_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/textmeasure.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/textmeasure.h deleted file mode 100644 index d27b096f26..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/textmeasure.h +++ /dev/null @@ -1,64 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/textmeasure.h -// Purpose: wxGTK-specific declaration of wxTextMeasure class -// Author: Manuel Martin -// Created: 2012-10-05 -// Copyright: (c) 1997-2012 wxWidgets team -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_TEXTMEASURE_H_ -#define _WX_GTK_PRIVATE_TEXTMEASURE_H_ - -// ---------------------------------------------------------------------------- -// wxTextMeasure -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxWindowDCImpl; - -class wxTextMeasure : public wxTextMeasureBase -{ -public: - wxEXPLICIT wxTextMeasure(const wxDC *dc, const wxFont *font = NULL) - : wxTextMeasureBase(dc, font) - { - Init(); - } - - wxEXPLICIT wxTextMeasure(const wxWindow *win, const wxFont *font = NULL) - : wxTextMeasureBase(win, font) - { - Init(); - } - -protected: - // Common part of both ctors. - void Init(); - - virtual void BeginMeasuring(); - virtual void EndMeasuring(); - - virtual void DoGetTextExtent(const wxString& string, - wxCoord *width, - wxCoord *height, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL); - - virtual bool DoGetPartialTextExtents(const wxString& text, - wxArrayInt& widths, - double scaleX); - - // This class is only used for DC text measuring with GTK+ 2 as GTK+ 3 uses - // Cairo and not Pango for this. However it's still used even with GTK+ 3 - // for window text measuring, so the context and the layout are still - // needed. -#ifndef __WXGTK3__ - wxWindowDCImpl *m_wdc; -#endif // GTK+ < 3 - PangoContext *m_context; - PangoLayout *m_layout; - - wxDECLARE_NO_COPY_CLASS(wxTextMeasure); -}; - -#endif // _WX_GTK_PRIVATE_TEXTMEASURE_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/timer.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/timer.h deleted file mode 100644 index 89f1355bba..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/timer.h +++ /dev/null @@ -1,35 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/timer.h -// Purpose: wxTimerImpl for wxGTK -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_TIMER_H_ -#define _WX_GTK_PRIVATE_TIMER_H_ - -#if wxUSE_TIMER - -#include "wx/private/timer.h" - -//----------------------------------------------------------------------------- -// wxTimer -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGTKTimerImpl : public wxTimerImpl -{ -public: - wxGTKTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { m_sourceId = 0; } - - virtual bool Start( int millisecs = -1, bool oneShot = false ); - virtual void Stop(); - virtual bool IsRunning() const { return m_sourceId != 0; } - -protected: - int m_sourceId; -}; - -#endif // wxUSE_TIMER - -#endif // _WX_GTK_PRIVATE_TIMER_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/treeentry_gtk.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/treeentry_gtk.h deleted file mode 100644 index 17abe2fc77..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/treeentry_gtk.h +++ /dev/null @@ -1,58 +0,0 @@ -/* /////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/treeentry_gtk.h -// Purpose: GtkTreeEntry - a string/userdata combo for use with treeview -// Author: Ryan Norton -// Copyright: (c) 2006 Ryan Norton -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////// */ - -#ifndef _WX_GTK_TREE_ENTRY_H_ -#define _WX_GTK_TREE_ENTRY_H_ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include /* for gpointer and gchar* etc. */ - -#define WX_TYPE_TREE_ENTRY wx_tree_entry_get_type() -#define WX_TREE_ENTRY(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, wx_tree_entry_get_type(), wxTreeEntry) -#define WX_IS_TREE_ENTRY(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, wx_tree_entry_get_type()) - -typedef struct _wxTreeEntry wxTreeEntry; - -typedef void (*wxTreeEntryDestroy)(wxTreeEntry* entry, void* context); - -struct _wxTreeEntry -{ - GObject parent; /* object instance */ - gchar* label; /* label - always copied by this object except on get */ - gchar* collate_key; /* collate key used for string comparisons/sorting */ - gpointer userdata; /* untouched userdata */ - wxTreeEntryDestroy destroy_func; /* called upon destruction - use for freeing userdata etc. */ - gpointer destroy_func_data; /* context passed to destroy_func */ -}; - -wxTreeEntry* wx_tree_entry_new(void); - -GType wx_tree_entry_get_type(void); - -char* wx_tree_entry_get_collate_key(wxTreeEntry* entry); - -char* wx_tree_entry_get_label(wxTreeEntry* entry); - -void* wx_tree_entry_get_userdata(wxTreeEntry* entry); - -void wx_tree_entry_set_label(wxTreeEntry* entry, const char* label); - -void wx_tree_entry_set_userdata(wxTreeEntry* entry, void* userdata); - -void wx_tree_entry_set_destroy_func(wxTreeEntry* entry, - wxTreeEntryDestroy destroy_func, - gpointer destroy_func_data); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* _WX_GTK_TREE_ENTRY_H_ */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/win_gtk.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/win_gtk.h deleted file mode 100644 index 0fd421f3bc..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/private/win_gtk.h +++ /dev/null @@ -1,35 +0,0 @@ -/* /////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/private/win_gtk.h -// Purpose: native GTK+ widget for wxWindow -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////// */ - -#ifndef _WX_GTK_PIZZA_H_ -#define _WX_GTK_PIZZA_H_ - -#define WX_PIZZA(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, wxPizza::type(), wxPizza) -#define WX_IS_PIZZA(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, wxPizza::type()) - -struct WXDLLIMPEXP_CORE wxPizza -{ - // borders styles which can be used with wxPizza - enum { BORDER_STYLES = - wxBORDER_SIMPLE | wxBORDER_RAISED | wxBORDER_SUNKEN | wxBORDER_THEME }; - - static GtkWidget* New(long windowStyle = 0); - static GType type(); - void move(GtkWidget* widget, int x, int y, int width, int height); - void put(GtkWidget* widget, int x, int y, int width, int height); - void scroll(int dx, int dy); - void get_border(GtkBorder& border); - - GtkFixed m_fixed; - GList* m_children; - int m_scroll_x; - int m_scroll_y; - int m_windowStyle; -}; - -#endif // _WX_GTK_PIZZA_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/radiobox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/radiobox.h deleted file mode 100644 index a7f6bd9125..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/radiobox.h +++ /dev/null @@ -1,153 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/radiobox.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_RADIOBOX_H_ -#define _WX_GTK_RADIOBOX_H_ - -#include "wx/bitmap.h" - -class WXDLLIMPEXP_FWD_CORE wxGTKRadioButtonInfo; - -#include "wx/list.h" - -WX_DECLARE_EXPORTED_LIST(wxGTKRadioButtonInfo, wxRadioBoxButtonsInfoList); - - -//----------------------------------------------------------------------------- -// wxRadioBox -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, - public wxRadioBoxBase -{ -public: - // ctors and dtor - wxRadioBox() { } - wxRadioBox(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, - const wxString choices[] = (const wxString *) NULL, - int majorDim = 0, - long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr) - { - Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name ); - } - - wxRadioBox(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - int majorDim = 0, - long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr) - { - Create( parent, id, title, pos, size, choices, majorDim, style, val, name ); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, - const wxString choices[] = (const wxString *) NULL, - int majorDim = 0, - long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr); - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - int majorDim = 0, - long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr); - - virtual ~wxRadioBox(); - - - // implement wxItemContainerImmutable methods - virtual unsigned int GetCount() const; - - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& s); - - virtual void SetSelection(int n); - virtual int GetSelection() const; - - - // implement wxRadioBoxBase methods - virtual bool Show(unsigned int n, bool show = true); - virtual bool Enable(unsigned int n, bool enable = true); - - virtual bool IsItemEnabled(unsigned int n) const; - virtual bool IsItemShown(unsigned int n) const; - - - // override some base class methods to operate on radiobox itself too - virtual bool Show( bool show = true ); - virtual bool Enable( bool enable = true ); - - virtual void SetLabel( const wxString& label ); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - virtual int GetItemFromPoint( const wxPoint& pt ) const; -#if wxUSE_HELP - // override virtual wxWindow::GetHelpTextAtPoint to use common platform independent - // wxRadioBoxBase::DoGetHelpTextAtPoint from the platform independent - // base class-interface wxRadioBoxBase. - virtual wxString GetHelpTextAtPoint(const wxPoint & pt, wxHelpEvent::Origin origin) const - { - return wxRadioBoxBase::DoGetHelpTextAtPoint( this, pt, origin ); - } -#endif // wxUSE_HELP - - // implementation - // -------------- - - void GtkDisableEvents(); - void GtkEnableEvents(); -#if wxUSE_TOOLTIPS - virtual void GTKApplyToolTip(const char* tip); -#endif // wxUSE_TOOLTIPS - - wxRadioBoxButtonsInfoList m_buttonsInfo; - -protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - -#if wxUSE_TOOLTIPS - virtual void DoSetItemToolTip(unsigned int n, wxToolTip *tooltip); -#endif - - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - - virtual bool GTKNeedsToFilterSameWindowFocus() const { return true; } - - virtual bool GTKWidgetNeedsMnemonic() const; - virtual void GTKWidgetDoSetMnemonic(GtkWidget* w); - -private: - DECLARE_DYNAMIC_CLASS(wxRadioBox) -}; - -#endif // _WX_GTK_RADIOBOX_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/radiobut.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/radiobut.h deleted file mode 100644 index 165370aa12..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/radiobut.h +++ /dev/null @@ -1,61 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/radiobut.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_RADIOBUT_H_ -#define _WX_GTK_RADIOBUT_H_ - -//----------------------------------------------------------------------------- -// wxRadioButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRadioButton: public wxControl -{ -public: - wxRadioButton() { } - wxRadioButton( wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioButtonNameStr ) - { - Create( parent, id, label, pos, size, style, validator, name ); - } - - bool Create( wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioButtonNameStr ); - - virtual void SetLabel(const wxString& label); - virtual void SetValue(bool val); - virtual bool GetValue() const; - virtual bool Enable( bool enable = true ); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -protected: - virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; } - - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - -private: - typedef wxControl base_type; - - DECLARE_DYNAMIC_CLASS(wxRadioButton) -}; - -#endif // _WX_GTK_RADIOBUT_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/region.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/region.h deleted file mode 100644 index a2231a1950..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/region.h +++ /dev/null @@ -1,138 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/region.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_REGION_H_ -#define _WX_GTK_REGION_H_ - -#ifdef __WXGTK3__ -typedef struct _cairo_region cairo_region_t; -#endif - -// ---------------------------------------------------------------------------- -// wxRegion -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRegion : public wxRegionBase -{ -public: - wxRegion() { } - - wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) - { - InitRect(x, y, w, h); - } - - wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight ) - { - InitRect(topLeft.x, topLeft.y, - bottomRight.x - topLeft.x, bottomRight.y - topLeft.y); - } - - wxRegion( const wxRect& rect ) - { - InitRect(rect.x, rect.y, rect.width, rect.height); - } - - wxRegion( size_t n, const wxPoint *points, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); - -#if wxUSE_IMAGE - wxRegion( const wxBitmap& bmp) - { - Union(bmp); - } - wxRegion( const wxBitmap& bmp, - const wxColour& transColour, int tolerance = 0) - { - Union(bmp, transColour, tolerance); - } -#endif // wxUSE_IMAGE - - virtual ~wxRegion(); - - // wxRegionBase methods - virtual void Clear(); - virtual bool IsEmpty() const; - -#ifdef __WXGTK3__ - cairo_region_t* GetRegion() const; -#else - wxRegion(const GdkRegion* region); - GdkRegion *GetRegion() const; -#endif - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - // wxRegionBase pure virtuals - virtual bool DoIsEqual(const wxRegion& region) const; - virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const; - virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const; - virtual wxRegionContain DoContainsRect(const wxRect& rect) const; - - virtual bool DoOffset(wxCoord x, wxCoord y); - virtual bool DoUnionWithRect(const wxRect& rect); - virtual bool DoUnionWithRegion(const wxRegion& region); - virtual bool DoIntersect(const wxRegion& region); - virtual bool DoSubtract(const wxRegion& region); - virtual bool DoXor(const wxRegion& region); - - // common part of ctors for a rectangle region - void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h); - -private: - DECLARE_DYNAMIC_CLASS(wxRegion) -}; - -// ---------------------------------------------------------------------------- -// wxRegionIterator: decomposes a region into rectangles -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRegionIterator: public wxObject -{ -public: - wxRegionIterator(); - wxRegionIterator(const wxRegion& region); - wxRegionIterator(const wxRegionIterator& ri) : wxObject(ri) { Init(); *this = ri; } - ~wxRegionIterator(); - - wxRegionIterator& operator=(const wxRegionIterator& ri); - - void Reset() { m_current = 0u; } - void Reset(const wxRegion& region); - - bool HaveRects() const; - operator bool () const { return HaveRects(); } - - wxRegionIterator& operator ++ (); - wxRegionIterator operator ++ (int); - - wxCoord GetX() const; - wxCoord GetY() const; - wxCoord GetW() const; - wxCoord GetWidth() const { return GetW(); } - wxCoord GetH() const; - wxCoord GetHeight() const { return GetH(); } - wxRect GetRect() const; - -private: - void Init(); - void CreateRects( const wxRegion& r ); - - wxRegion m_region; - wxRect *m_rects; - int m_numRects; - int m_current; - - DECLARE_DYNAMIC_CLASS(wxRegionIterator) -}; - - -#endif - // _WX_GTK_REGION_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/scrolbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/scrolbar.h deleted file mode 100644 index e49bb7a2ce..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/scrolbar.h +++ /dev/null @@ -1,54 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/scrolbar.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_SCROLLBAR_H_ -#define _WX_GTK_SCROLLBAR_H_ - -//----------------------------------------------------------------------------- -// wxScrollBar -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase -{ -public: - wxScrollBar(); - inline wxScrollBar( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSB_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxScrollBarNameStr ) - { - Create( parent, id, pos, size, style, validator, name ); - } - bool Create( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSB_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxScrollBarNameStr ); - virtual ~wxScrollBar(); - int GetThumbPosition() const; - int GetThumbSize() const; - int GetPageSize() const; - int GetRange() const; - virtual void SetThumbPosition( int viewStart ); - virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize, - bool refresh = true ); - - void SetThumbSize(int thumbSize); - void SetPageSize( int pageLength ); - void SetRange(int range); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - DECLARE_DYNAMIC_CLASS(wxScrollBar) -}; - -#endif // _WX_GTK_SCROLLBAR_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/scrolwin.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/scrolwin.h deleted file mode 100644 index c36040ce88..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/scrolwin.h +++ /dev/null @@ -1,79 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/scrolwin.h -// Purpose: wxScrolledWindow class -// Author: Robert Roebling -// Modified by: Vadim Zeitlin (2005-10-10): wxScrolledWindow is now common -// Created: 01/02/97 -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_SCROLLWIN_H_ -#define _WX_GTK_SCROLLWIN_H_ - -// ---------------------------------------------------------------------------- -// wxScrolledWindow -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxScrollHelper : public wxScrollHelperBase -{ - typedef wxScrollHelperBase base_type; -public: - // default ctor doesn't do anything - wxScrollHelper(wxWindow *win) : wxScrollHelperBase(win) { } - - // implement the base class methods - virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, - int noUnitsX, int noUnitsY, - int xPos = 0, int yPos = 0, - bool noRefresh = false); - virtual void AdjustScrollbars(); - - virtual bool IsScrollbarShown(int orient) const; - -protected: - virtual void DoScroll(int x, int y); - virtual void DoShowScrollbars(wxScrollbarVisibility horz, - wxScrollbarVisibility vert); - -private: - // this does (each) half of AdjustScrollbars() work - void DoAdjustScrollbar(GtkRange* range, - int pixelsPerLine, - int winSize, - int virtSize, - int *pos, - int *lines, - int *linesPerPage); - - void DoAdjustHScrollbar(int winSize, int virtSize) - { - DoAdjustScrollbar - ( - m_win->m_scrollBar[wxWindow::ScrollDir_Horz], - m_xScrollPixelsPerLine, winSize, virtSize, - &m_xScrollPosition, &m_xScrollLines, &m_xScrollLinesPerPage - ); - } - - void DoAdjustVScrollbar(int winSize, int virtSize) - { - DoAdjustScrollbar - ( - m_win->m_scrollBar[wxWindow::ScrollDir_Vert], - m_yScrollPixelsPerLine, winSize, virtSize, - &m_yScrollPosition, &m_yScrollLines, &m_yScrollLinesPerPage - ); - } - - // and this does the same for Scroll() - void DoScrollOneDir(int orient, - int pos, - int pixelsPerLine, - int *posOld); - - wxDECLARE_NO_COPY_CLASS(wxScrollHelper); -}; - -#endif // _WX_GTK_SCROLLWIN_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/setup.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/setup.h deleted file mode 100644 index f2e1182ab7..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/setup.h +++ /dev/null @@ -1,1672 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/setup.h -// Purpose: Configuration for the library -// Author: Julian Smart -// Modified by: -// Created: 01/02/97 -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_SETUP_H_ -#define _WX_SETUP_H_ - -/* --- start common options --- */ -// ---------------------------------------------------------------------------- -// global settings -// ---------------------------------------------------------------------------- - -// define this to 0 when building wxBase library - this can also be done from -// makefile/project file overriding the value here -#ifndef wxUSE_GUI - #define wxUSE_GUI 1 -#endif // wxUSE_GUI - -// ---------------------------------------------------------------------------- -// compatibility settings -// ---------------------------------------------------------------------------- - -// This setting determines the compatibility with 2.6 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_6 0 - -// This setting determines the compatibility with 2.8 API: set it to 0 to -// flag all cases of using deprecated functions. -// -// Default is 1 but please try building your code with 0 as the default will -// change to 0 in the next version and the deprecated functions will disappear -// in the version after it completely. -// -// Recommended setting: 0 (please update your code) -#define WXWIN_COMPATIBILITY_2_8 1 - -// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when -// default system font is used for wxWindow::GetCharWidth/Height() instead of -// the current font. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxDIALOG_UNIT_COMPATIBILITY 0 - -// ---------------------------------------------------------------------------- -// debugging settings -// ---------------------------------------------------------------------------- - -// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no -// need to define it here. You may do it for two reasons: either completely -// disable/compile out the asserts in release version (then do it inside #ifdef -// NDEBUG) or, on the contrary, enable more asserts, including the usually -// disabled ones, in the debug build (then do it inside #ifndef NDEBUG) -// -// #ifdef NDEBUG -// #define wxDEBUG_LEVEL 0 -// #else -// #define wxDEBUG_LEVEL 2 -// #endif - -// wxHandleFatalExceptions() may be used to catch the program faults at run -// time and, instead of terminating the program with a usual GPF message box, -// call the user-defined wxApp::OnFatalException() function. If you set -// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work. -// -// This setting is for Win32 only and can only be enabled if your compiler -// supports Win32 structured exception handling (currently only VC++ does) -// -// Default is 1 -// -// Recommended setting: 1 if your compiler supports it. -#define wxUSE_ON_FATAL_EXCEPTION 1 - -// Set this to 1 to be able to generate a human-readable (unlike -// machine-readable minidump created by wxCrashReport::Generate()) stack back -// trace when your program crashes using wxStackWalker -// -// Default is 1 if supported by the compiler. -// -// Recommended setting: 1, set to 0 if your programs never crash -#define wxUSE_STACKWALKER 1 - -// Set this to 1 to compile in wxDebugReport class which allows you to create -// and optionally upload to your web site a debug report consisting of back -// trace of the crash (if wxUSE_STACKWALKER == 1) and other information. -// -// Default is 1 if supported by the compiler. -// -// Recommended setting: 1, it is compiled into a separate library so there -// is no overhead if you don't use it -#define wxUSE_DEBUGREPORT 1 - -// Generic comment about debugging settings: they are very useful if you don't -// use any other memory leak detection tools such as Purify/BoundsChecker, but -// are probably redundant otherwise. Also, Visual C++ CRT has the same features -// as wxWidgets memory debugging subsystem built in since version 5.0 and you -// may prefer to use it instead of built in memory debugging code because it is -// faster and more fool proof. -// -// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG -// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0) -// and if __NO_VC_CRTDBG__ is not defined. - -// The rest of the options in this section are obsolete and not supported, -// enable them at your own risk. - -// If 1, enables wxDebugContext, for writing error messages to file, etc. If -// __WXDEBUG__ is not defined, will still use the normal memory operators. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_DEBUG_CONTEXT 0 - -// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF* -// __WXDEBUG__ is also defined. -// -// WARNING: this code may not work with all architectures, especially if -// alignment is an issue. This switch is currently ignored for mingw / cygwin -// -// Default is 0 -// -// Recommended setting: 1 if you are not using a memory debugging tool, else 0 -#define wxUSE_MEMORY_TRACING 0 - -// In debug mode, cause new and delete to be redefined globally. -// If this causes problems (e.g. link errors which is a common problem -// especially if you use another library which also redefines the global new -// and delete), set this to 0. -// This switch is currently ignored for mingw / cygwin -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_GLOBAL_MEMORY_OPERATORS 0 - -// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If -// this causes problems (e.g. link errors), set this to 0. You may need to set -// this to 0 if using templates (at least for VC++). This switch is currently -// ignored for MinGW/Cygwin. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_DEBUG_NEW_ALWAYS 0 - - -// ---------------------------------------------------------------------------- -// Unicode support -// ---------------------------------------------------------------------------- - -// These settings are obsolete: the library is always built in Unicode mode -// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if -// absolutely necessary -- updating it is strongly recommended as the ANSI mode -// will disappear completely in future wxWidgets releases. -#ifndef wxUSE_UNICODE - #define wxUSE_UNICODE 1 -#endif - -// wxUSE_WCHAR_T is required by wxWidgets now, don't change. -#define wxUSE_WCHAR_T 1 - -// ---------------------------------------------------------------------------- -// global features -// ---------------------------------------------------------------------------- - -// Compile library in exception-safe mode? If set to 1, the library will try to -// behave correctly in presence of exceptions (even though it still will not -// use the exceptions itself) and notify the user code about any unhandled -// exceptions. If set to 0, propagation of the exceptions through the library -// code will lead to undefined behaviour -- but the code itself will be -// slightly smaller and faster. -// -// Note that like wxUSE_THREADS this option is automatically set to 0 if -// wxNO_EXCEPTIONS is defined. -// -// Default is 1 -// -// Recommended setting: depends on whether you intend to use C++ exceptions -// in your own code (1 if you do, 0 if you don't) -#define wxUSE_EXCEPTIONS 1 - -// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI -// -// Default is 0 -// -// Recommended setting: 0 (this is still work in progress...) -#define wxUSE_EXTENDED_RTTI 0 - -// Support for message/error logging. This includes wxLogXXX() functions and -// wxLog and derived classes. Don't set this to 0 unless you really know what -// you are doing. -// -// Default is 1 -// -// Recommended setting: 1 (always) -#define wxUSE_LOG 1 - -// Recommended setting: 1 -#define wxUSE_LOGWINDOW 1 - -// Recommended setting: 1 -#define wxUSE_LOGGUI 1 - -// Recommended setting: 1 -#define wxUSE_LOG_DIALOG 1 - -// Support for command line parsing using wxCmdLineParser class. -// -// Default is 1 -// -// Recommended setting: 1 (can be set to 0 if you don't use the cmd line) -#define wxUSE_CMDLINE_PARSER 1 - -// Support for multithreaded applications: if 1, compile in thread classes -// (thread.h) and make the library a bit more thread safe. Although thread -// support is quite stable by now, you may still consider recompiling the -// library without it if you have no use for it - this will result in a -// somewhat smaller and faster operation. -// -// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset -// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in -// build/msw/config.* file this value will have no effect. -// -// Default is 1 -// -// Recommended setting: 0 unless you do plan to develop MT applications -#define wxUSE_THREADS 1 - -// If enabled, compiles wxWidgets streams classes -// -// wx stream classes are used for image IO, process IO redirection, network -// protocols implementation and much more and so disabling this results in a -// lot of other functionality being lost. -// -// Default is 1 -// -// Recommended setting: 1 as setting it to 0 disables many other things -#define wxUSE_STREAMS 1 - -// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf. -// Note that if the system's implementation does not support positional -// parameters, setting this to 1 forces the use of the wxWidgets implementation -// of wxVsnprintf. The standard vsnprintf() supports positional parameters on -// many Unix systems but usually doesn't under Windows. -// -// Positional parameters are very useful when translating a program since using -// them in formatting strings allow translators to correctly reorder the -// translated sentences. -// -// Default is 1 -// -// Recommended setting: 1 if you want to support multiple languages -#define wxUSE_PRINTF_POS_PARAMS 1 - -// Enable the use of compiler-specific thread local storage keyword, if any. -// This is used for wxTLS_XXX() macros implementation and normally should use -// the compiler-provided support as it's simpler and more efficient, but is -// disabled under Windows in wx/msw/chkconf.h as it can't be used if wxWidgets -// is used in a dynamically loaded Win32 DLL (i.e. using LoadLibrary()) under -// XP as this triggers a bug in compiler TLS support that results in crashes -// when any TLS variables are used. -// -// If you're absolutely sure that your build of wxWidgets is never going to be -// used in such situation, either because it's not going to be linked from any -// kind of plugin or because you only target Vista or later systems, you can -// set this to 2 to force the use of compiler TLS even under MSW. -// -// Default is 1 meaning that compiler TLS is used only if it's 100% safe. -// -// Recommended setting: 2 if you want to have maximal performance and don't -// care about the scenario described above. -#define wxUSE_COMPILER_TLS 1 - -// ---------------------------------------------------------------------------- -// Interoperability with the standard library. -// ---------------------------------------------------------------------------- - -// Set wxUSE_STL to 1 to enable maximal interoperability with the standard -// library, even at the cost of backwards compatibility. -// -// Default is 0 -// -// Recommended setting: 0 as the options below already provide a relatively -// good level of interoperability and changing this option arguably isn't worth -// diverging from the official builds of the library. -#define wxUSE_STL 0 - -// This is not a real option but is used as the default value for -// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS. -// -// Currently the Digital Mars and Watcom compilers come without standard C++ -// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have -// them (e.g. from STLPort). -// -// VC++ 5.0 does include standard C++ library headers, however they produce -// many warnings that can't be turned off when compiled at warning level 4. -#if defined(__DMC__) || defined(__WATCOMC__) \ - || (defined(_MSC_VER) && _MSC_VER < 1200) - #define wxUSE_STD_DEFAULT 0 -#else - #define wxUSE_STD_DEFAULT 1 -#endif - -// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<> -// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but -// usually more limited) implementations are used which allows to avoid the -// dependency on the C++ run-time library. -// -// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't -// support using standard containers and that VC6 needs non-default options for -// such build to avoid getting "fatal error C1076: compiler limit : internal -// heap limit reached; use /Zm to specify a higher limit" in its own standard -// headers, so you need to ensure you do increase the heap size before enabling -// this option for this compiler. -// -// Default is 0 for compatibility reasons. -// -// Recommended setting: 1 unless compatibility with the official wxWidgets -// build and/or the existing code is a concern. -#define wxUSE_STD_CONTAINERS 0 - -// Use standard C++ streams if 1 instead of wx streams in some places. If -// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the -// standard streams library. -// -// Notice that enabling this does not replace wx streams with std streams -// everywhere, in a lot of places wx streams are used no matter what. -// -// Default is 1 if compiler supports it. -// -// Recommended setting: 1 if you use the standard streams anyhow and so -// dependency on the standard streams library is not a -// problem -#define wxUSE_STD_IOSTREAM wxUSE_STD_DEFAULT - -// Enable minimal interoperability with the standard C++ string class if 1. -// "Minimal" means that wxString can be constructed from std::string or -// std::wstring but can't be implicitly converted to them. You need to enable -// the option below for the latter. -// -// Default is 1 for most compilers. -// -// Recommended setting: 1 unless you want to ensure your program doesn't use -// the standard C++ library at all. -#define wxUSE_STD_STRING wxUSE_STD_DEFAULT - -// Make wxString as much interchangeable with std::[w]string as possible, in -// particular allow implicit conversion of wxString to either of these classes. -// This comes at a price (or a benefit, depending on your point of view) of not -// allowing implicit conversion to "const char *" and "const wchar_t *". -// -// Because a lot of existing code relies on these conversions, this option is -// disabled by default but can be enabled for your build if you don't care -// about compatibility. -// -// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled. -// -// Recommended setting: 0 to remain compatible with the official builds of -// wxWidgets. -#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL - -// VC++ 4.2 and above allows and but you can't mix -// them. Set this option to 1 to use , 0 to use . -// -// Note that newer compilers (including VC++ 7.1 and later) don't support -// wxUSE_IOSTREAMH == 1 and so will be used anyhow. -// -// Default is 0. -// -// Recommended setting: 0, only set to 1 if you use a really old compiler -#define wxUSE_IOSTREAMH 0 - - -// ---------------------------------------------------------------------------- -// non GUI features selection -// ---------------------------------------------------------------------------- - -// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit -// integer which is implemented in terms of native 64 bit integers if any or -// uses emulation otherwise. -// -// This class is required by wxDateTime and so you should enable it if you want -// to use wxDateTime. For most modern platforms, it will use the native 64 bit -// integers in which case (almost) all of its functions are inline and it -// almost does not take any space, so there should be no reason to switch it -// off. -// -// Recommended setting: 1 -#define wxUSE_LONGLONG 1 - -// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for -// storing binary data in wxConfig on most platforms. -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_BASE64 1 - -// Set this to 1 to be able to use wxEventLoop even in console applications -// (i.e. using base library only, without GUI). This is mostly useful for -// processing socket events but is also necessary to use timers in console -// applications -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_CONSOLE_EVENTLOOP 1 - -// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level -// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions. -// -// Default is 1 -// -// Recommended setting: 1 (wxFile is highly recommended as it is required by -// i18n code, wxFileConfig and others) -#define wxUSE_FILE 1 -#define wxUSE_FFILE 1 - -// Use wxFSVolume class providing access to the configured/active mount points -// -// Default is 1 -// -// Recommended setting: 1 (but may be safely disabled if you don't use it) -#define wxUSE_FSVOLUME 1 - -// Use wxStandardPaths class which allows to retrieve some standard locations -// in the file system -// -// Default is 1 -// -// Recommended setting: 1 (may be disabled to save space, but not much) -#define wxUSE_STDPATHS 1 - -// use wxTextBuffer class: required by wxTextFile -#define wxUSE_TEXTBUFFER 1 - -// use wxTextFile class: requires wxFile and wxTextBuffer, required by -// wxFileConfig -#define wxUSE_TEXTFILE 1 - -// i18n support: _() macro, wxLocale class. Requires wxTextFile. -#define wxUSE_INTL 1 - -// Provide wxFoo_l() functions similar to standard foo() functions but taking -// an extra locale parameter. -// -// Notice that this is fully implemented only for the systems providing POSIX -// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary -// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will -// only work for the current user locale and "C" locale. You can use -// wxHAS_XLOCALE_SUPPORT to test whether the full support is available. -// -// Default is 1 -// -// Recommended setting: 1 but may be disabled if you are writing programs -// running only in C locale anyhow -#define wxUSE_XLOCALE 1 - -// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which -// allow to manipulate dates, times and time intervals. wxDateTime replaces the -// old wxTime and wxDate classes which are still provided for backwards -// compatibility (and implemented in terms of wxDateTime). -// -// Note that this class is relatively new and is still officially in alpha -// stage because some features are not yet (fully) implemented. It is already -// quite useful though and should only be disabled if you are aiming at -// absolutely minimal version of the library. -// -// Requires: wxUSE_LONGLONG -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_DATETIME 1 - -// Set wxUSE_TIMER to 1 to compile wxTimer class -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_TIMER 1 - -// Use wxStopWatch clas. -// -// Default is 1 -// -// Recommended setting: 1 (needed by wxSocket) -#define wxUSE_STOPWATCH 1 - -// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_FSWATCHER 1 - -// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes -// which allow the application to store its settings in the persistent -// storage. Setting this to 1 will also enable on-demand creation of the -// global config object in wxApp. -// -// See also wxUSE_CONFIG_NATIVE below. -// -// Recommended setting: 1 -#define wxUSE_CONFIG 1 - -// If wxUSE_CONFIG is 1, you may choose to use either the native config -// classes under Windows (using .INI files under Win16 and the registry under -// Win32) or the portable text file format used by the config classes under -// Unix. -// -// Default is 1 to use native classes. Note that you may still use -// wxFileConfig even if you set this to 1 - just the config object created by -// default for the applications needs will be a wxRegConfig or wxIniConfig and -// not wxFileConfig. -// -// Recommended setting: 1 -#define wxUSE_CONFIG_NATIVE 1 - -// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows -// to connect/disconnect from the network and be notified whenever the dial-up -// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DIALUP_MANAGER 1 - -// Compile in classes for run-time DLL loading and function calling. -// Required by wxUSE_DIALUP_MANAGER. -// -// This setting is for Win32 only -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DYNLIB_CLASS 1 - -// experimental, don't use for now -#define wxUSE_DYNAMIC_LOADER 1 - -// Set to 1 to use socket classes -#define wxUSE_SOCKETS 1 - -// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS) -// -// Notice that currently setting this option under Windows will result in -// programs which can only run on recent OS versions (with ws2_32.dll -// installed) which is why it is disabled by default. -// -// Default is 1. -// -// Recommended setting: 1 if you need IPv6 support -#define wxUSE_IPV6 0 - -// Set to 1 to enable virtual file systems (required by wxHTML) -#define wxUSE_FILESYSTEM 1 - -// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_ZIP 1 - -// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_ARCHIVE 1 - -// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM) -#define wxUSE_FS_INET 1 - -// wxArchive classes for accessing archives such as zip and tar -#define wxUSE_ARCHIVE_STREAMS 1 - -// Set to 1 to compile wxZipInput/OutputStream classes. -#define wxUSE_ZIPSTREAM 1 - -// Set to 1 to compile wxTarInput/OutputStream classes. -#define wxUSE_TARSTREAM 1 - -// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by -// wxUSE_LIBPNG -#define wxUSE_ZLIB 1 - -// If enabled, the code written by Apple will be used to write, in a portable -// way, float on the disk. See extended.c for the license which is different -// from wxWidgets one. -// -// Default is 1. -// -// Recommended setting: 1 unless you don't like the license terms (unlikely) -#define wxUSE_APPLE_IEEE 1 - -// Joystick support class -#define wxUSE_JOYSTICK 1 - -// wxFontEnumerator class -#define wxUSE_FONTENUM 1 - -// wxFontMapper class -#define wxUSE_FONTMAP 1 - -// wxMimeTypesManager class -#define wxUSE_MIMETYPE 1 - -// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP -// or wxURL you need to set this to 1. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_PROTOCOL 1 - -// The settings for the individual URL schemes -#define wxUSE_PROTOCOL_FILE 1 -#define wxUSE_PROTOCOL_FTP 1 -#define wxUSE_PROTOCOL_HTTP 1 - -// Define this to use wxURL class. -#define wxUSE_URL 1 - -// Define this to use native platform url and protocol support. -// Currently valid only for MS-Windows. -// Note: if you set this to 1, you can open ftp/http/gopher sites -// and obtain a valid input stream for these sites -// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0. -// Doing so reduces the code size. -// -// This code is experimental and subject to change. -#define wxUSE_URL_NATIVE 0 - -// Support for wxVariant class used in several places throughout the library, -// notably in wxDataViewCtrl API. -// -// Default is 1. -// -// Recommended setting: 1 unless you want to reduce the library size as much as -// possible in which case setting this to 0 can gain up to 100KB. -#define wxUSE_VARIANT 1 - -// Support for wxAny class, the successor for wxVariant. -// -// Default is 1. -// -// Recommended setting: 1 unless you want to reduce the library size by a small amount, -// or your compiler cannot for some reason cope with complexity of templates used. -#define wxUSE_ANY 1 - -// Support for regular expression matching via wxRegEx class: enable this to -// use POSIX regular expressions in your code. You need to compile regex -// library from src/regex to use it under Windows. -// -// Default is 0 -// -// Recommended setting: 1 if your compiler supports it, if it doesn't please -// contribute us a makefile for src/regex for it -#define wxUSE_REGEX 1 - -// wxSystemOptions class -#define wxUSE_SYSTEM_OPTIONS 1 - -// wxSound class -#define wxUSE_SOUND 1 - -// Use wxMediaCtrl -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_MEDIACTRL 1 - -// Use wxWidget's XRC XML-based resource system. Recommended. -// -// Default is 1 -// -// Recommended setting: 1 (requires wxUSE_XML) -#define wxUSE_XRC 1 - -// XML parsing classes. Note that their API will change in the future, so -// using wxXmlDocument and wxXmlNode in your app is not recommended. -// -// Default is the same as wxUSE_XRC, i.e. 1 by default. -// -// Recommended setting: 1 (required by XRC) -#define wxUSE_XML wxUSE_XRC - -// Use wxWidget's AUI docking system -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_AUI 1 - -// Use wxWidget's Ribbon classes for interfaces -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_RIBBON 1 - -// Use wxPropertyGrid. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_PROPGRID 1 - -// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_STC 1 - -// Use wxWidget's web viewing classes -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_WEBVIEW 1 - -// Use the IE wxWebView backend -// -// Default is 1 on MSW -// -// Recommended setting: 1 -#ifdef __WXMSW__ -#define wxUSE_WEBVIEW_IE 1 -#else -#define wxUSE_WEBVIEW_IE 0 -#endif - -// Use the WebKit wxWebView backend -// -// Default is 1 on GTK and OSX -// -// Recommended setting: 1 -#if defined(__WXGTK__) || defined(__WXOSX__) -#define wxUSE_WEBVIEW_WEBKIT 1 -#else -#define wxUSE_WEBVIEW_WEBKIT 0 -#endif - -// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced -// 2D drawing API. (Still somewhat experimental) -// -// Please note that on Windows gdiplus.dll is loaded dynamically which means -// that nothing special needs to be done as long as you don't use -// wxGraphicsContext at all or only use it on XP and later systems but you -// still do need to distribute it yourself for an application using -// wxGraphicsContext to be runnable on pre-XP systems. -// -// Default is 1 except if you're using a non-Microsoft compiler under Windows -// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g. -// mingw32) you may need to install the headers (and just the headers) -// yourself. If you do, change the setting below manually. -// -// Recommended setting: 1 if supported by the compilation environment - -// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is -// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined -#ifdef _MSC_VER -# if _MSC_VER >= 1310 - // MSVC7.1+ comes with new enough Platform SDK, enable - // wxGraphicsContext support for it -# define wxUSE_GRAPHICS_CONTEXT 1 -# else - // MSVC 6 didn't include GDI+ headers so disable by default, enable it - // here if you use MSVC 6 with a newer SDK -# define wxUSE_GRAPHICS_CONTEXT 0 -# endif -#else - // Disable support for other Windows compilers, enable it if your compiler - // comes with new enough SDK or you installed the headers manually. - // - // Notice that this will be set by configure under non-Windows platforms - // anyhow so the value there is not important. -# define wxUSE_GRAPHICS_CONTEXT 0 -#endif - -// Enable wxGraphicsContext implementation using Cairo library. -// -// This is not needed under Windows and detected automatically by configure -// under other systems, however you may set this to 1 manually if you installed -// Cairo under Windows yourself and prefer to use it instead the native GDI+ -// implementation. -// -// Default is 0 -// -// Recommended setting: 0 -#define wxUSE_CAIRO 0 - - -// ---------------------------------------------------------------------------- -// Individual GUI controls -// ---------------------------------------------------------------------------- - -// You must set wxUSE_CONTROLS to 1 if you are using any controls at all -// (without it, wxControl class is not compiled) -// -// Default is 1 -// -// Recommended setting: 1 (don't change except for very special programs) -#define wxUSE_CONTROLS 1 - -// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup(). -// Currently markup is supported only by a few controls and only some ports but -// their number will increase with time. -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0 if you want to save on code size) -#define wxUSE_MARKUP 1 - -// wxPopupWindow class is a top level transient window. It is currently used -// to implement wxTipWindow -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW) -#define wxUSE_POPUPWIN 1 - -// wxTipWindow allows to implement the custom tooltips, it is used by the -// context help classes. Requires wxUSE_POPUPWIN. -// -// Default is 1 -// -// Recommended setting: 1 (may be set to 0) -#define wxUSE_TIPWINDOW 1 - -// Each of the settings below corresponds to one wxWidgets control. They are -// all switched on by default but may be disabled if you are sure that your -// program (including any standard dialogs it can show!) doesn't need them and -// if you desperately want to save some space. If you use any of these you must -// set wxUSE_CONTROLS as well. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_ANIMATIONCTRL 1 // wxAnimationCtrl -#define wxUSE_BANNERWINDOW 1 // wxBannerWindow -#define wxUSE_BUTTON 1 // wxButton -#define wxUSE_BMPBUTTON 1 // wxBitmapButton -#define wxUSE_CALENDARCTRL 1 // wxCalendarCtrl -#define wxUSE_CHECKBOX 1 // wxCheckBox -#define wxUSE_CHECKLISTBOX 1 // wxCheckListBox (requires wxUSE_OWNER_DRAWN) -#define wxUSE_CHOICE 1 // wxChoice -#define wxUSE_COLLPANE 1 // wxCollapsiblePane -#define wxUSE_COLOURPICKERCTRL 1 // wxColourPickerCtrl -#define wxUSE_COMBOBOX 1 // wxComboBox -#define wxUSE_COMMANDLINKBUTTON 1 // wxCommandLinkButton -#define wxUSE_DATAVIEWCTRL 1 // wxDataViewCtrl -#define wxUSE_DATEPICKCTRL 1 // wxDatePickerCtrl -#define wxUSE_DIRPICKERCTRL 1 // wxDirPickerCtrl -#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox -#define wxUSE_FILECTRL 1 // wxFileCtrl -#define wxUSE_FILEPICKERCTRL 1 // wxFilePickerCtrl -#define wxUSE_FONTPICKERCTRL 1 // wxFontPickerCtrl -#define wxUSE_GAUGE 1 // wxGauge -#define wxUSE_HEADERCTRL 1 // wxHeaderCtrl -#define wxUSE_HYPERLINKCTRL 1 // wxHyperlinkCtrl -#define wxUSE_LISTBOX 1 // wxListBox -#define wxUSE_LISTCTRL 1 // wxListCtrl -#define wxUSE_RADIOBOX 1 // wxRadioBox -#define wxUSE_RADIOBTN 1 // wxRadioButton -#define wxUSE_RICHMSGDLG 1 // wxRichMessageDialog -#define wxUSE_SCROLLBAR 1 // wxScrollBar -#define wxUSE_SEARCHCTRL 1 // wxSearchCtrl -#define wxUSE_SLIDER 1 // wxSlider -#define wxUSE_SPINBTN 1 // wxSpinButton -#define wxUSE_SPINCTRL 1 // wxSpinCtrl -#define wxUSE_STATBOX 1 // wxStaticBox -#define wxUSE_STATLINE 1 // wxStaticLine -#define wxUSE_STATTEXT 1 // wxStaticText -#define wxUSE_STATBMP 1 // wxStaticBitmap -#define wxUSE_TEXTCTRL 1 // wxTextCtrl -#define wxUSE_TIMEPICKCTRL 1 // wxTimePickerCtrl -#define wxUSE_TOGGLEBTN 1 // requires wxButton -#define wxUSE_TREECTRL 1 // wxTreeCtrl -#define wxUSE_TREELISTCTRL 1 // wxTreeListCtrl - -// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR -// below either wxStatusBar95 or a generic wxStatusBar will be used. -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_STATUSBAR 1 - -// Two status bar implementations are available under Win32: the generic one -// or the wrapper around native control. For native look and feel the native -// version should be used. -// -// Default is 1 for the platforms where native status bar is supported. -// -// Recommended setting: 1 (there is no advantage in using the generic one) -#define wxUSE_NATIVE_STATUSBAR 1 - -// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar -// classes at all. Otherwise, use the native toolbar class unless -// wxUSE_TOOLBAR_NATIVE is 0. -// -// Default is 1 for all settings. -// -// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE. -#define wxUSE_TOOLBAR 1 -#define wxUSE_TOOLBAR_NATIVE 1 - -// wxNotebook is a control with several "tabs" located on one of its sides. It -// may be used to logically organise the data presented to the user instead of -// putting everything in one huge dialog. It replaces wxTabControl and related -// classes of wxWin 1.6x. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_NOTEBOOK 1 - -// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_LISTBOOK 1 - -// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_CHOICEBOOK 1 - -// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of -// the tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TREEBOOK 1 - -// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of -// tabs -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TOOLBOOK 1 - -// wxTaskBarIcon is a small notification icon shown in the system toolbar or -// dock. -// -// Default is 1. -// -// Recommended setting: 1 (but can be set to 0 if you don't need it) -#define wxUSE_TASKBARICON 1 - -// wxGrid class -// -// Default is 1, set to 0 to cut down compilation time and binaries size if you -// don't use it. -// -// Recommended setting: 1 -// -#define wxUSE_GRID 1 - -// wxMiniFrame class: a frame with narrow title bar -// -// Default is 1. -// -// Recommended setting: 1 (it doesn't cost almost anything) -#define wxUSE_MINIFRAME 1 - -// wxComboCtrl and related classes: combobox with custom popup window and -// not necessarily a listbox. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it -// it used by wxComboBox -#define wxUSE_COMBOCTRL 1 - -// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox -// items. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0, except where it is -// needed as a base class for generic wxBitmapComboBox. -#define wxUSE_ODCOMBOBOX 1 - -// wxBitmapComboBox is a combobox that can have images in front of text items. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 -#define wxUSE_BITMAPCOMBOBOX 1 - -// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items -// up and down in it. It is also used as part of wxRearrangeDialog. -// -// Default is 1. -// -// Recommended setting: 1 but can be safely set to 0 (currently used only by -// wxHeaderCtrl) -#define wxUSE_REARRANGECTRL 1 - -// ---------------------------------------------------------------------------- -// Miscellaneous GUI stuff -// ---------------------------------------------------------------------------- - -// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar) -#define wxUSE_ACCEL 1 - -// Use the standard art provider. The icons returned by this provider are -// embedded into the library as XPMs so disabling it reduces the library size -// somewhat but this should only be done if you use your own custom art -// provider returning the icons or never use any icons not provided by the -// native art provider (which might not be implemented at all for some -// platforms) or by the Tango icons provider (if it's not itself disabled -// below). -// -// Default is 1. -// -// Recommended setting: 1 unless you use your own custom art provider. -#define wxUSE_ARTPROVIDER_STD 1 - -// Use art provider providing Tango icons: this art provider has higher quality -// icons than the default ones using smaller size XPM icons without -// transparency but the embedded PNG icons add to the library size. -// -// Default is 1 under non-GTK ports. Under wxGTK the native art provider using -// the GTK+ stock icons replaces it so it is normally not necessary. -// -// Recommended setting: 1 but can be turned off to reduce the library size. -#define wxUSE_ARTPROVIDER_TANGO 1 - -// Hotkey support (currently Windows only) -#define wxUSE_HOTKEY 1 - -// Use wxCaret: a class implementing a "cursor" in a text control (called caret -// under Windows). -// -// Default is 1. -// -// Recommended setting: 1 (can be safely set to 0, not used by the library) -#define wxUSE_CARET 1 - -// Use wxDisplay class: it allows enumerating all displays on a system and -// their geometries as well as finding the display on which the given point or -// window lies. -// -// Default is 1. -// -// Recommended setting: 1 if you need it, can be safely set to 0 otherwise -#define wxUSE_DISPLAY 1 - -// Miscellaneous geometry code: needed for Canvas library -#define wxUSE_GEOMETRY 1 - -// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and -// wxListCtrl. -// -// Default is 1. -// -// Recommended setting: 1 (set it to 0 if you don't use any of the controls -// enumerated above, then this class is mostly useless too) -#define wxUSE_IMAGLIST 1 - -// Use wxInfoBar class. -// -// Default is 1. -// -// Recommended setting: 1 (but can be disabled without problems as nothing -// depends on it) -#define wxUSE_INFOBAR 1 - -// Use wxMenu, wxMenuBar, wxMenuItem. -// -// Default is 1. -// -// Recommended setting: 1 (can't be disabled under MSW) -#define wxUSE_MENUS 1 - -// Use wxNotificationMessage. -// -// wxNotificationMessage allows to show non-intrusive messages to the user -// using balloons, banners, popups or whatever is the appropriate method for -// the current platform. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_NOTIFICATION_MESSAGE 1 - -// wxPreferencesEditor provides a common API for different ways of presenting -// the standard "Preferences" or "Properties" dialog under different platforms -// (e.g. some use modal dialogs, some use modeless ones; some apply the changes -// immediately while others require an explicit "Apply" button). -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely disabled if you don't use it) -#define wxUSE_PREFERENCES_EDITOR 1 - -// wxRichToolTip is a customizable tooltip class which has more functionality -// than the stock (but native, unlike this class) wxToolTip. -// -// Default is 1. -// -// Recommended setting: 1 (but can be safely set to 0 if you don't need it) -#define wxUSE_RICHTOOLTIP 1 - -// Use wxSashWindow class. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_SASH 1 - -// Use wxSplitterWindow class. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_SPLITTER 1 - -// Use wxToolTip and wxWindow::Set/GetToolTip() methods. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_TOOLTIPS 1 - -// wxValidator class and related methods -#define wxUSE_VALIDATORS 1 - -// Use reference counted ID management: this means that wxWidgets will track -// the automatically allocated ids (those used when you use wxID_ANY when -// creating a window, menu or toolbar item &c) instead of just supposing that -// the program never runs out of them. This is mostly useful only under wxMSW -// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where -// long-running programs can run into problems with ids reuse without this. On -// the other platforms, where the ids have the full int range, this shouldn't -// be necessary. -#ifdef __WXMSW__ -#define wxUSE_AUTOID_MANAGEMENT 1 -#else -#define wxUSE_AUTOID_MANAGEMENT 0 -#endif - -// ---------------------------------------------------------------------------- -// common dialogs -// ---------------------------------------------------------------------------- - -// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g. -// file selector, printer dialog). Switching this off also switches off the -// printing architecture and interactive wxPrinterDC. -// -// Default is 1 -// -// Recommended setting: 1 (unless it really doesn't work) -#define wxUSE_COMMON_DIALOGS 1 - -// wxBusyInfo displays window with message when app is busy. Works in same way -// as wxBusyCursor -#define wxUSE_BUSYINFO 1 - -// Use single/multiple choice dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_CHOICEDLG 1 - -// Use colour picker dialog -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_COLOURDLG 1 - -// wxDirDlg class for getting a directory name from user -#define wxUSE_DIRDLG 1 - -// TODO: setting to choose the generic or native one - -// Use file open/save dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (used in many places in the library itself) -#define wxUSE_FILEDLG 1 - -// Use find/replace dialogs. -// -// Default is 1 -// -// Recommended setting: 1 (but may be safely set to 0) -#define wxUSE_FINDREPLDLG 1 - -// Use font picker dialog -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_FONTDLG 1 - -// Use wxMessageDialog and wxMessageBox. -// -// Default is 1 -// -// Recommended setting: 1 (used in the library itself) -#define wxUSE_MSGDLG 1 - -// progress dialog class for lengthy operations -#define wxUSE_PROGRESSDLG 1 - -// support for startup tips (wxShowTip &c) -#define wxUSE_STARTUP_TIPS 1 - -// text entry dialog and wxGetTextFromUser function -#define wxUSE_TEXTDLG 1 - -// number entry dialog -#define wxUSE_NUMBERDLG 1 - -// splash screen class -#define wxUSE_SPLASH 1 - -// wizards -#define wxUSE_WIZARDDLG 1 - -// Compile in wxAboutBox() function showing the standard "About" dialog. -// -// Default is 1 -// -// Recommended setting: 1 but can be set to 0 to save some space if you don't -// use this function -#define wxUSE_ABOUTDLG 1 - -// wxFileHistory class -// -// Default is 1 -// -// Recommended setting: 1 -#define wxUSE_FILE_HISTORY 1 - -// ---------------------------------------------------------------------------- -// Metafiles support -// ---------------------------------------------------------------------------- - -// Windows supports the graphics format known as metafile which is, though not -// portable, is widely used under Windows and so is supported by wxWin (under -// Windows only, of course). Win16 (Win3.1) used the so-called "Window -// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in -// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by -// default, WMFs will be used under Win16 and EMFs under Win32. This may be -// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting -// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile -// in any metafile related classes at all. -// -// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS. -// -// Recommended setting: default or 0 for everything for portable programs. -#define wxUSE_METAFILE 1 -#define wxUSE_ENH_METAFILE 1 -#define wxUSE_WIN_METAFILES_ALWAYS 0 - -// ---------------------------------------------------------------------------- -// Big GUI components -// ---------------------------------------------------------------------------- - -// Set to 0 to disable MDI support. -// -// Requires wxUSE_NOTEBOOK under platforms other than MSW. -// -// Default is 1. -// -// Recommended setting: 1, can be safely set to 0. -#define wxUSE_MDI 1 - -// Set to 0 to disable document/view architecture -#define wxUSE_DOC_VIEW_ARCHITECTURE 1 - -// Set to 0 to disable MDI document/view architecture -// -// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE -#define wxUSE_MDI_ARCHITECTURE 1 - -// Set to 0 to disable print/preview architecture code -#define wxUSE_PRINTING_ARCHITECTURE 1 - -// wxHTML sublibrary allows to display HTML in wxWindow programs and much, -// much more. -// -// Default is 1. -// -// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a -// smaller library. -#define wxUSE_HTML 1 - -// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL -// headers and libraries to be able to compile the library with wxUSE_GLCANVAS -// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the -// list of libraries used to link your application (although this is done -// implicitly for Microsoft Visual C++ users). -// -// Default is 1 unless the compiler is known to ship without the necessary -// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE). -// -// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0 -// otherwise. -#define wxUSE_GLCANVAS 1 - -// wxRichTextCtrl allows editing of styled text. -// -// Default is 1. -// -// Recommended setting: 1, set to 0 if you want compile a -// smaller library. -#define wxUSE_RICHTEXT 1 - -// ---------------------------------------------------------------------------- -// Data transfer -// ---------------------------------------------------------------------------- - -// Use wxClipboard class for clipboard copy/paste. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_CLIPBOARD 1 - -// Use wxDataObject and related classes. Needed for clipboard and OLE drag and -// drop -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DATAOBJ 1 - -// Use wxDropTarget and wxDropSource classes for drag and drop (this is -// different from "built in" drag and drop in wxTreeCtrl which is always -// available). Requires wxUSE_DATAOBJ. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_DRAG_AND_DROP 1 - -// Use wxAccessible for enhanced and customisable accessibility. -// Depends on wxUSE_OLE. -// -// Default is 0. -// -// Recommended setting (at present): 0 -#define wxUSE_ACCESSIBILITY 0 - -// ---------------------------------------------------------------------------- -// miscellaneous settings -// ---------------------------------------------------------------------------- - -// wxSingleInstanceChecker class allows to verify at startup if another program -// instance is running. -// -// Default is 1 -// -// Recommended setting: 1 (the class is tiny, disabling it won't save much -// space) -#define wxUSE_SNGLINST_CHECKER 1 - -#define wxUSE_DRAGIMAGE 1 - -#define wxUSE_IPC 1 - // 0 for no interprocess comms -#define wxUSE_HELP 1 - // 0 for no help facility - -// Should we use MS HTML help for wxHelpController? If disabled, neither -// wxCHMHelpController nor wxBestHelpController are available. -// -// Default is 1 under MSW, 0 is always used for the other platforms. -// -// Recommended setting: 1, only set to 0 if you have trouble compiling -// wxCHMHelpController (could be a problem with really ancient compilers) -#define wxUSE_MS_HTML_HELP 1 - - -// Use wxHTML-based help controller? -#define wxUSE_WXHTML_HELP 1 - -#define wxUSE_CONSTRAINTS 1 - // 0 for no window layout constraint system - -#define wxUSE_SPLINES 1 - // 0 for no splines - -#define wxUSE_MOUSEWHEEL 1 - // Include mouse wheel support - -// Compile wxUIActionSimulator class? -#define wxUSE_UIACTIONSIMULATOR 1 - -// ---------------------------------------------------------------------------- -// wxDC classes for various output formats -// ---------------------------------------------------------------------------- - -// Set to 1 for PostScript device context. -#define wxUSE_POSTSCRIPT 0 - -// Set to 1 to use font metric files in GetTextExtent -#define wxUSE_AFM_FOR_POSTSCRIPT 1 - -// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows -// to create files in SVG (Scalable Vector Graphics) format. -#define wxUSE_SVG 1 - -// Should wxDC provide SetTransformMatrix() and related methods? -// -// Default is 1 but can be set to 0 if this functionality is not used. Notice -// that currently only wxMSW supports this so setting this to 0 doesn't change -// much for non-MSW platforms (although it will still save a few bytes -// probably). -// -// Recommended setting: 1. -#define wxUSE_DC_TRANSFORM_MATRIX 1 - -// ---------------------------------------------------------------------------- -// image format support -// ---------------------------------------------------------------------------- - -// wxImage supports many different image formats which can be configured at -// compile-time. BMP is always supported, others are optional and can be safely -// disabled if you don't plan to use images in such format sometimes saving -// substantial amount of code in the final library. -// -// Some formats require an extra library which is included in wxWin sources -// which is mentioned if it is the case. - -// Set to 1 for wxImage support (recommended). -#define wxUSE_IMAGE 1 - -// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB. -#define wxUSE_LIBPNG 1 - -// Set to 1 for JPEG format support (requires libjpeg) -#define wxUSE_LIBJPEG 1 - -// Set to 1 for TIFF format support (requires libtiff) -#define wxUSE_LIBTIFF 1 - -// Set to 1 for TGA format support (loading only) -#define wxUSE_TGA 1 - -// Set to 1 for GIF format support -#define wxUSE_GIF 1 - -// Set to 1 for PNM format support -#define wxUSE_PNM 1 - -// Set to 1 for PCX format support -#define wxUSE_PCX 1 - -// Set to 1 for IFF format support (Amiga format) -#define wxUSE_IFF 0 - -// Set to 1 for XPM format support -#define wxUSE_XPM 1 - -// Set to 1 for MS Icons and Cursors format support -#define wxUSE_ICO_CUR 1 - -// Set to 1 to compile in wxPalette class -#define wxUSE_PALETTE 1 - -// ---------------------------------------------------------------------------- -// wxUniversal-only options -// ---------------------------------------------------------------------------- - -// Set to 1 to enable compilation of all themes, this is the default -#define wxUSE_ALL_THEMES 1 - -// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES -// is unset, if it is set these options are not used; notice that metal theme -// uses Win32 one -#define wxUSE_THEME_GTK 0 -#define wxUSE_THEME_METAL 0 -#define wxUSE_THEME_MONO 0 -#define wxUSE_THEME_WIN32 0 - - -/* --- end common options --- */ - -/* --- start MSW options --- */ -// ---------------------------------------------------------------------------- -// Windows-only settings -// ---------------------------------------------------------------------------- - -// Set wxUSE_UNICODE_MSLU to 1 if you're compiling wxWidgets in Unicode mode -// and want to run your programs under Windows 9x and not only NT/2000/XP. -// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see -// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note -// that you will have to modify the makefiles to include unicows.lib import -// library as the first library (see installation instructions in install.txt -// to learn how to do it when building the library or samples). -// -// If your compiler doesn't have unicows.lib, you can get a version of it at -// http://libunicows.sourceforge.net -// -// Default is 0 -// -// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems) -#ifndef wxUSE_UNICODE_MSLU - #define wxUSE_UNICODE_MSLU 0 -#endif - -// Set this to 1 if you want to use wxWidgets and MFC in the same program. This -// will override some other settings (see below) -// -// Default is 0. -// -// Recommended setting: 0 unless you really have to use MFC -#define wxUSE_MFC 0 - -// Set this to 1 for generic OLE support: this is required for drag-and-drop, -// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and -// can't compile/doesn't have the OLE headers. -// -// Default is 1. -// -// Recommended setting: 1 -#define wxUSE_OLE 1 - -// Set this to 1 to enable wxAutomationObject class. -// -// Default is 1. -// -// Recommended setting: 1 if you need to control other applications via OLE -// Automation, can be safely set to 0 otherwise -#define wxUSE_OLE_AUTOMATION 1 - -// Set this to 1 to enable wxActiveXContainer class allowing to embed OLE -// controls in wx. -// -// Default is 1. -// -// Recommended setting: 1, required by wxMediaCtrl -#define wxUSE_ACTIVEX 1 - -// wxDC caching implementation -#define wxUSE_DC_CACHEING 1 - -// Set this to 1 to enable wxDIB class used internally for manipulating -// wxBitmap data. -// -// Default is 1, set it to 0 only if you don't use wxImage neither -// -// Recommended setting: 1 (without it conversion to/from wxImage won't work) -#define wxUSE_WXDIB 1 - -// Set to 0 to disable PostScript print/preview architecture code under Windows -// (just use Windows printing). -#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1 - -// Set this to 1 to compile in wxRegKey class. -// -// Default is 1 -// -// Recommended setting: 1, this is used internally by wx in a few places -#define wxUSE_REGKEY 1 - -// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH -// which allows to put more than ~32Kb of text in it even under Win9x (NT -// doesn't have such limitation). -// -// Default is 1 for compilers which support it -// -// Recommended setting: 1, only set it to 0 if your compiler doesn't have -// or can't compile -#define wxUSE_RICHEDIT 1 - -// Set this to 1 to use extra features of richedit v2 and later controls -// -// Default is 1 for compilers which support it -// -// Recommended setting: 1 -#define wxUSE_RICHEDIT2 1 - -// Set this to 1 to enable support for the owner-drawn menu and listboxes. This -// is required by wxUSE_CHECKLISTBOX. -// -// Default is 1. -// -// Recommended setting: 1, set to 0 for a small library size reduction -#define wxUSE_OWNER_DRAWN 1 - -// Set this to 1 to enable MSW-specific wxTaskBarIcon::ShowBalloon() method. It -// is required by native wxNotificationMessage implementation. -// -// Default is 1 but disabled in wx/msw/chkconf.h if SDK is too old to contain -// the necessary declarations. -// -// Recommended setting: 1, set to 0 for a tiny library size reduction -#define wxUSE_TASKBARICON_BALLOONS 1 - -// Set to 1 to compile MS Windows XP theme engine support -#define wxUSE_UXTHEME 1 - -// Set to 1 to use InkEdit control (Tablet PC), if available -#define wxUSE_INKEDIT 0 - -// Set to 1 to enable .INI files based wxConfig implementation (wxIniConfig) -// -// Default is 0. -// -// Recommended setting: 0, nobody uses .INI files any more -#define wxUSE_INICONF 0 - -// ---------------------------------------------------------------------------- -// Generic versions of native controls -// ---------------------------------------------------------------------------- - -// Set this to 1 to be able to use wxDatePickerCtrlGeneric in addition to the -// native wxDatePickerCtrl -// -// Default is 0. -// -// Recommended setting: 0, this is mainly used for testing -#define wxUSE_DATEPICKCTRL_GENERIC 0 - -// Set this to 1 to be able to use wxTimePickerCtrlGeneric in addition to the -// native wxTimePickerCtrl for the platforms that have the latter (MSW). -// -// Default is 0. -// -// Recommended setting: 0, this is mainly used for testing -#define wxUSE_TIMEPICKCTRL_GENERIC 0 - -// ---------------------------------------------------------------------------- -// Crash debugging helpers -// ---------------------------------------------------------------------------- - -// Set this to 1 to be able to use wxCrashReport::Generate() to create mini -// dumps of your program when it crashes (or at any other moment) -// -// Default is 1 if supported by the compiler (VC++ and recent BC++ only). -// -// Recommended setting: 1, set to 0 if your programs never crash -#define wxUSE_CRASHREPORT 1 -/* --- end MSW options --- */ - -// GTK-specific options used when not using configure. As we can't test for the -// exact GTK version (without including GTK+ headers that we don't want to -// include from our own public headers), just assume a recent GTK 2.x. -#define __WXGTK20__ -#define __WXGTK210__ -#define __WXGTK218__ -//#define __WXGTK3__ - -#endif // _WX_SETUP_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/slider.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/slider.h deleted file mode 100644 index f8833c4685..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/slider.h +++ /dev/null @@ -1,84 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/slider.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_SLIDER_H_ -#define _WX_GTK_SLIDER_H_ - -// ---------------------------------------------------------------------------- -// wxSlider -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase -{ -public: - wxSlider(); - wxSlider(wxWindow *parent, - wxWindowID id, - int value, int minValue, int maxValue, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSL_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSliderNameStr) - { - Create( parent, id, value, minValue, maxValue, - pos, size, style, validator, name ); - } - ~wxSlider(); - - bool Create(wxWindow *parent, - wxWindowID id, - int value, int minValue, int maxValue, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSL_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSliderNameStr); - - // implement the base class pure virtuals - virtual int GetValue() const; - virtual void SetValue(int value); - - virtual void SetRange(int minValue, int maxValue); - virtual int GetMin() const; - virtual int GetMax() const; - - virtual void SetLineSize(int lineSize); - virtual void SetPageSize(int pageSize); - virtual int GetLineSize() const; - virtual int GetPageSize() const; - - virtual void SetThumbLength(int lenPixels); - virtual int GetThumbLength() const; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - void GTKDisableEvents(); - void GTKEnableEvents(); - bool GTKEventsDisabled() const; - - double m_pos; - int m_scrollEventType; - bool m_needThumbRelease; - GtkWidget *m_scale; - -protected: - GtkWidget *m_minLabel,*m_maxLabel; - bool m_blockScrollEvent; - - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - - // set the slider value unconditionally - void GTKSetValue(int value); - - DECLARE_DYNAMIC_CLASS(wxSlider) -}; - -#endif // _WX_GTK_SLIDER_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/spinbutt.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/spinbutt.h deleted file mode 100644 index 4bd71f4746..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/spinbutt.h +++ /dev/null @@ -1,65 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/spinbutt.h -// Purpose: wxSpinButton class -// Author: Robert Roebling -// Modified by: -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_SPINBUTT_H_ -#define _WX_GTK_SPINBUTT_H_ - -//----------------------------------------------------------------------------- -// wxSpinButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase -{ -public: - wxSpinButton(); - wxSpinButton(wxWindow *parent, - wxWindowID id = -1, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_VERTICAL, - const wxString& name = wxSPIN_BUTTON_NAME) - { - Create(parent, id, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id = -1, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_VERTICAL, - const wxString& name = wxSPIN_BUTTON_NAME); - - virtual int GetValue() const; - virtual void SetValue( int value ); - virtual void SetRange( int minVal, int maxVal ); - virtual int GetMin() const; - virtual int GetMax() const; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - virtual bool Enable( bool enable = true ); - - // implementation - int m_pos; - -protected: - void GtkDisableEvents() const; - void GtkEnableEvents() const; - - virtual wxSize DoGetBestSize() const; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - -private: - typedef wxSpinButtonBase base_type; - - DECLARE_DYNAMIC_CLASS(wxSpinButton) -}; - -#endif // _WX_GTK_SPINBUTT_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/spinctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/spinctrl.h deleted file mode 100644 index ef7b6edb7d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/spinctrl.h +++ /dev/null @@ -1,205 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/spinctrl.h -// Purpose: wxSpinCtrl class -// Author: Robert Roebling -// Modified by: -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_SPINCTRL_H_ -#define _WX_GTK_SPINCTRL_H_ - -//----------------------------------------------------------------------------- -// wxSpinCtrlGTKBase - Base class for GTK versions of the wxSpinCtrl[Double] -// -// This class manages a double valued GTK spinctrl through the DoGet/SetXXX -// functions that are made public as Get/SetXXX functions for int or double -// for the wxSpinCtrl and wxSpinCtrlDouble classes respectively to avoid -// function ambiguity. -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinCtrlGTKBase : public wxSpinCtrlBase -{ -public: - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - long style, - double min, double max, double initial, - double inc, - const wxString& name); - - // wxSpinCtrl(Double) methods call DoXXX functions of the same name - - // accessors - // T GetValue() const - // T GetMin() const - // T GetMax() const - // T GetIncrement() const - virtual bool GetSnapToTicks() const; - - // operations - virtual void SetValue(const wxString& value); - // void SetValue(T val) - // void SetRange(T minVal, T maxVal) - // void SetIncrement(T inc) - void SetSnapToTicks( bool snap_to_ticks ); - - // Select text in the textctrl - void SetSelection(long from, long to); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - void OnChar( wxKeyEvent &event ); - -protected: - double DoGetValue() const; - double DoGetMin() const; - double DoGetMax() const; - double DoGetIncrement() const; - - void DoSetValue(double val); - void DoSetValue(const wxString& strValue); - void DoSetRange(double min_val, double max_val); - void DoSetIncrement(double inc); - - void GtkDisableEvents() const; - void GtkEnableEvents() const; - - virtual wxSize DoGetBestSize() const; - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - - // Widgets that use the style->base colour for the BG colour should - // override this and return true. - virtual bool UseGTKStyleBase() const { return true; } - - friend class wxSpinCtrlEventDisabler; - - DECLARE_EVENT_TABLE() -}; - -//----------------------------------------------------------------------------- -// wxSpinCtrl - An integer valued spin control -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinCtrlGTKBase -{ -public: - wxSpinCtrl() { Init(); } - wxSpinCtrl(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, - int min = 0, int max = 100, int initial = 0, - const wxString& name = wxS("wxSpinCtrl")) - { - Init(); - - Create(parent, id, value, pos, size, style, min, max, initial, name); - } - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, - int min = 0, int max = 100, int initial = 0, - const wxString& name = wxS("wxSpinCtrl")) - { - return wxSpinCtrlGTKBase::Create(parent, id, value, pos, size, - style, min, max, initial, 1, name); - } - - // accessors - int GetValue() const { return int(DoGetValue()); } - int GetMin() const { return int(DoGetMin()); } - int GetMax() const { return int(DoGetMax()); } - int GetIncrement() const { return int(DoGetIncrement()); } - - // operations - void SetValue(const wxString& value) { wxSpinCtrlGTKBase::SetValue(value); } // visibility problem w/ gcc - void SetValue( int value ) { DoSetValue(value); } - void SetRange( int minVal, int maxVal ) { DoSetRange(minVal, maxVal); } - void SetIncrement(int inc) { DoSetIncrement(inc); } - - virtual int GetBase() const { return m_base; } - virtual bool SetBase(int base); - -private: - // Common part of all ctors. - void Init() - { - m_base = 10; - } - - int m_base; - - DECLARE_DYNAMIC_CLASS(wxSpinCtrl) -}; - -//----------------------------------------------------------------------------- -// wxSpinCtrlDouble - a double valued spin control -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinCtrlDouble : public wxSpinCtrlGTKBase -{ -public: - wxSpinCtrlDouble() {} - wxSpinCtrlDouble(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, - double min = 0, double max = 100, double initial = 0, - double inc = 1, - const wxString& name = wxS("wxSpinCtrlDouble")) - { - Create(parent, id, value, pos, size, style, - min, max, initial, inc, name); - } - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS | wxALIGN_RIGHT, - double min = 0, double max = 100, double initial = 0, - double inc = 1, - const wxString& name = wxS("wxSpinCtrlDouble")) - { - return wxSpinCtrlGTKBase::Create(parent, id, value, pos, size, - style, min, max, initial, inc, name); - } - - // accessors - double GetValue() const { return DoGetValue(); } - double GetMin() const { return DoGetMin(); } - double GetMax() const { return DoGetMax(); } - double GetIncrement() const { return DoGetIncrement(); } - unsigned GetDigits() const; - - // operations - void SetValue(const wxString& value) { wxSpinCtrlGTKBase::SetValue(value); } // visibility problem w/ gcc - void SetValue(double value) { DoSetValue(value); } - void SetRange(double minVal, double maxVal) { DoSetRange(minVal, maxVal); } - void SetIncrement(double inc) { DoSetIncrement(inc); } - void SetDigits(unsigned digits); - - virtual int GetBase() const { return 10; } - virtual bool SetBase(int WXUNUSED(base)) { return false; } - - DECLARE_DYNAMIC_CLASS(wxSpinCtrlDouble) -}; - -#endif // _WX_GTK_SPINCTRL_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/statbmp.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/statbmp.h deleted file mode 100644 index b7bba950d0..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/statbmp.h +++ /dev/null @@ -1,58 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/statbmp.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKSTATICBITMAPH__ -#define __GTKSTATICBITMAPH__ - -#include "wx/icon.h" - -//----------------------------------------------------------------------------- -// wxStaticBitmap -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase -{ -public: - wxStaticBitmap(); - wxStaticBitmap( wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBitmapNameStr ); - bool Create( wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBitmapNameStr); - - virtual void SetIcon(const wxIcon& icon) { SetBitmap( icon ); } - virtual void SetBitmap( const wxBitmap& bitmap ); - virtual wxBitmap GetBitmap() const { return m_bitmap; } - - // for compatibility with wxMSW - wxIcon GetIcon() const - { - // don't use wxDynamicCast, icons and bitmaps are really the same thing - // in wxGTK - return (const wxIcon &)m_bitmap; - } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -private: - wxBitmap m_bitmap; - - DECLARE_DYNAMIC_CLASS(wxStaticBitmap) -}; - -#endif // __GTKSTATICBITMAPH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/statbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/statbox.h deleted file mode 100644 index 80dbb7f594..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/statbox.h +++ /dev/null @@ -1,57 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/statbox.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKSTATICBOX_H_ -#define _WX_GTKSTATICBOX_H_ - -//----------------------------------------------------------------------------- -// wxStaticBox -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase -{ -public: - wxStaticBox(); - wxStaticBox( wxWindow *parent, - wxWindowID id, - const wxString &label, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxString &name = wxStaticBoxNameStr ); - bool Create( wxWindow *parent, - wxWindowID id, - const wxString &label, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxString &name = wxStaticBoxNameStr ); - - virtual void SetLabel( const wxString &label ); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - - virtual bool GTKIsTransparentForMouse() const { return true; } - - virtual void GetBordersForSizer(int *borderTop, int *borderOther) const; - - virtual void AddChild( wxWindowBase *child ); - -protected: - virtual bool GTKWidgetNeedsMnemonic() const; - virtual void GTKWidgetDoSetMnemonic(GtkWidget* w); - - void DoApplyWidgetStyle(GtkRcStyle *style); - - DECLARE_DYNAMIC_CLASS(wxStaticBox) -}; - -#endif // _WX_GTKSTATICBOX_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/statline.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/statline.h deleted file mode 100644 index aa4077671f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/statline.h +++ /dev/null @@ -1,48 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/statline.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKSTATICLINEH__ -#define __GTKSTATICLINEH__ - -#include "wx/defs.h" - -#if wxUSE_STATLINE - -// ---------------------------------------------------------------------------- -// wxStaticLine -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase -{ -public: - wxStaticLine(); - wxStaticLine(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint &pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxLI_HORIZONTAL, - const wxString &name = wxStaticLineNameStr); - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxLI_HORIZONTAL, - const wxString &name = wxStaticLineNameStr); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - -private: - DECLARE_DYNAMIC_CLASS(wxStaticLine) -}; - -#endif // wxUSE_STATLINE - -#endif // __GTKSTATICLINEH__ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/stattext.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/stattext.h deleted file mode 100644 index f6d88cb83a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/stattext.h +++ /dev/null @@ -1,69 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/stattext.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_STATTEXT_H_ -#define _WX_GTK_STATTEXT_H_ - -//----------------------------------------------------------------------------- -// wxStaticText -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase -{ -public: - wxStaticText(); - wxStaticText(wxWindow *parent, - wxWindowID id, - const wxString &label, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxString &name = wxStaticTextNameStr ); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString &label, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxString &name = wxStaticTextNameStr ); - - void SetLabel( const wxString &label ); - - bool SetFont( const wxFont &font ); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - // -------------- - -protected: - virtual bool GTKWidgetNeedsMnemonic() const; - virtual void GTKWidgetDoSetMnemonic(GtkWidget* w); - - virtual wxSize DoGetBestSize() const; - - virtual wxString DoGetLabel() const; - virtual void DoSetLabel(const wxString& str); -#if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup); -#endif // wxUSE_MARKUP - -private: - // Common part of SetLabel() and DoSetLabelMarkup(). - typedef void (wxStaticText::*GTKLabelSetter)(GtkLabel *, const wxString&); - - void GTKDoSetLabel(GTKLabelSetter setter, const wxString& label); - - - DECLARE_DYNAMIC_CLASS(wxStaticText) -}; - -#endif - // _WX_GTK_STATTEXT_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/taskbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/taskbar.h deleted file mode 100644 index 03bd8daff0..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/taskbar.h +++ /dev/null @@ -1,33 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/taskbar.h -// Purpose: wxTaskBarIcon class for GTK2 -// Author: Paul Cornett -// Created: 2009-02-08 -// Copyright: (c) 2009 Paul Cornett -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_TASKBARICON_H_ -#define _WX_GTK_TASKBARICON_H_ - -class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase -{ -public: - wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE); - ~wxTaskBarIcon(); - virtual bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxString()); - virtual bool RemoveIcon(); - virtual bool PopupMenu(wxMenu* menu); - bool IsOk() const { return true; } - bool IsIconInstalled() const; - - class Private; - -private: - Private* m_priv; - - DECLARE_DYNAMIC_CLASS(wxTaskBarIcon) - DECLARE_NO_COPY_CLASS(wxTaskBarIcon) -}; - -#endif // _WX_GTK_TASKBARICON_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/textctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/textctrl.h deleted file mode 100644 index 9fefd91975..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/textctrl.h +++ /dev/null @@ -1,227 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/textctrl.h -// Purpose: -// Author: Robert Roebling -// Created: 01/02/97 -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_TEXTCTRL_H_ -#define _WX_GTK_TEXTCTRL_H_ - -typedef struct _GtkTextMark GtkTextMark; - -//----------------------------------------------------------------------------- -// wxTextCtrl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase -{ -public: - wxTextCtrl() { Init(); } - wxTextCtrl(wxWindow *parent, - wxWindowID id, - const wxString &value = wxEmptyString, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxTextCtrlNameStr); - - virtual ~wxTextCtrl(); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString &value = wxEmptyString, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxTextCtrlNameStr); - - // implement base class pure virtuals - // ---------------------------------- - - virtual void WriteText(const wxString& text); - virtual wxString GetValue() const; - virtual bool IsEmpty() const; - - virtual int GetLineLength(long lineNo) const; - virtual wxString GetLineText(long lineNo) const; - virtual int GetNumberOfLines() const; - - virtual bool IsModified() const; - virtual bool IsEditable() const; - - virtual void GetSelection(long* from, long* to) const; - - virtual void Remove(long from, long to); - - virtual void MarkDirty(); - virtual void DiscardEdits(); - - virtual bool SetStyle(long start, long end, const wxTextAttr& style); - virtual bool GetStyle(long position, wxTextAttr& style); - - // translate between the position (which is just an index in the text ctrl - // considering all its contents as a single strings) and (x, y) coordinates - // which represent column and line. - virtual long XYToPosition(long x, long y) const; - virtual bool PositionToXY(long pos, long *x, long *y) const; - - virtual void ShowPosition(long pos); - - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const; - virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, - wxTextCoord *col, - wxTextCoord *row) const - { - return wxTextCtrlBase::HitTest(pt, col, row); - } - - // Clipboard operations - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); - - // Insertion point - virtual void SetInsertionPoint(long pos); - virtual long GetInsertionPoint() const; - virtual wxTextPos GetLastPosition() const; - - virtual void SetSelection(long from, long to); - virtual void SetEditable(bool editable); - - // Overridden wxWindow methods - virtual void SetWindowStyleFlag( long style ); - virtual bool Enable( bool enable = true ); - - // Implementation from now on - void OnDropFiles( wxDropFilesEvent &event ); - void OnChar( wxKeyEvent &event ); - - void OnCut(wxCommandEvent& event); - void OnCopy(wxCommandEvent& event); - void OnPaste(wxCommandEvent& event); - void OnUndo(wxCommandEvent& event); - void OnRedo(wxCommandEvent& event); - - void OnUpdateCut(wxUpdateUIEvent& event); - void OnUpdateCopy(wxUpdateUIEvent& event); - void OnUpdatePaste(wxUpdateUIEvent& event); - void OnUpdateUndo(wxUpdateUIEvent& event); - void OnUpdateRedo(wxUpdateUIEvent& event); - - bool SetFont(const wxFont& font); - bool SetForegroundColour(const wxColour& colour); - bool SetBackgroundColour(const wxColour& colour); - - GtkWidget* GetConnectWidget(); - - void SetUpdateFont(bool WXUNUSED(update)) { } - - // implementation only from now on - - // tell the control to ignore next text changed signal - void IgnoreNextTextUpdate(int n = 1) { m_countUpdatesToIgnore = n; } - - // should we ignore the changed signal? always resets the flag - bool IgnoreTextUpdate(); - - // call this to indicate that the control is about to be changed - // programmatically and so m_modified flag shouldn't be set - void DontMarkDirtyOnNextChange() { m_dontMarkDirty = true; } - - // should we mark the control as dirty? always resets the flag - bool MarkDirtyOnChange(); - - // always let GTK have mouse release events for multiline controls - virtual bool GTKProcessEvent(wxEvent& event) const; - - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -protected: - // overridden wxWindow virtual methods - virtual wxSize DoGetBestSize() const; - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - - virtual wxSize DoGetSizeFromTextSize(int xlen, int ylen = -1) const; - - virtual void DoFreeze(); - virtual void DoThaw(); - - // Widgets that use the style->base colour for the BG colour should - // override this and return true. - virtual bool UseGTKStyleBase() const { return true; } - - virtual void DoSetValue(const wxString &value, int flags = 0); - - // Override this to use either GtkEntry or GtkTextView IME depending on the - // kind of control we are. - virtual int GTKIMFilterKeypress(GdkEventKey* event) const; - - virtual wxPoint DoPositionToCoords(long pos) const; - - // wrappers hiding the differences between functions doing the same thing - // for GtkTextView and GtkEntry (all of them use current window style to - // set the given characteristic) - void GTKSetEditable(); - void GTKSetVisibility(); - void GTKSetActivatesDefault(); - void GTKSetWrapMode(); - void GTKSetJustification(); - -private: - void Init(); - - // overridden wxTextEntry virtual methods - virtual GtkEditable *GetEditable() const; - virtual GtkEntry *GetEntry() const; - virtual void EnableTextChangedEvents(bool enable); - - // change the font for everything in this control - void ChangeFontGlobally(); - - // get the encoding which is used in this control: this looks at our font - // and default style but not the current style (i.e. the style for the - // current position); returns wxFONTENCODING_SYSTEM if we have no specific - // encoding - wxFontEncoding GetTextEncoding() const; - - // returns either m_text or m_buffer depending on whether the control is - // single- or multi-line; convenient for the GTK+ functions which work with - // both - void *GetTextObject() const - { - return IsMultiLine() ? static_cast(m_buffer) - : static_cast(m_text); - } - - - // the widget used for single line controls - GtkWidget *m_text; - - bool m_modified:1; - bool m_dontMarkDirty:1; - - int m_countUpdatesToIgnore; - - // Our text buffer. Convenient, and holds the buffer while using - // a dummy one when frozen - GtkTextBuffer *m_buffer; - - GtkTextMark* m_showPositionOnThaw; - GSList* m_anonymousMarkList; - - // For wxTE_AUTO_URL - void OnUrlMouseEvent(wxMouseEvent&); - - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxTextCtrl) -}; - -#endif // _WX_GTK_TEXTCTRL_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/textentry.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/textentry.h deleted file mode 100644 index 5df686cf24..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/textentry.h +++ /dev/null @@ -1,86 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/textentry.h -// Purpose: wxGTK-specific wxTextEntry implementation -// Author: Vadim Zeitlin -// Created: 2007-09-24 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_TEXTENTRY_H_ -#define _WX_GTK_TEXTENTRY_H_ - -typedef struct _GdkEventKey GdkEventKey; -typedef struct _GtkEditable GtkEditable; -typedef struct _GtkEntry GtkEntry; - -// ---------------------------------------------------------------------------- -// wxTextEntry: roughly corresponds to GtkEditable -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase -{ -public: - wxTextEntry() { } - - // implement wxTextEntryBase pure virtual methods - virtual void WriteText(const wxString& text); - virtual void Remove(long from, long to); - - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); - - virtual void Undo(); - virtual void Redo(); - virtual bool CanUndo() const; - virtual bool CanRedo() const; - - virtual void SetInsertionPoint(long pos); - virtual long GetInsertionPoint() const; - virtual long GetLastPosition() const; - - virtual void SetSelection(long from, long to); - virtual void GetSelection(long *from, long *to) const; - - virtual bool IsEditable() const; - virtual void SetEditable(bool editable); - - virtual void SetMaxLength(unsigned long len); - - // implementation only from now on - void SendMaxLenEvent(); - bool GTKEntryOnInsertText(const char* text); - -protected: - // This method must be called from the derived class Create() to connect - // the handlers for the clipboard (cut/copy/paste) events. - void GTKConnectClipboardSignals(GtkWidget* entry); - - // And this one to connect "insert-text" signal. - void GTKConnectInsertTextSignal(GtkEntry* entry); - - - virtual void DoSetValue(const wxString& value, int flags); - virtual wxString DoGetValue() const; - - // margins functions - virtual bool DoSetMargins(const wxPoint& pt); - virtual wxPoint DoGetMargins() const; - - virtual bool DoAutoCompleteStrings(const wxArrayString& choices); - - // Override the base class method to use GtkEntry IM context. - virtual int GTKIMFilterKeypress(GdkEventKey* event) const; - -private: - // implement this to return the associated GtkEntry or another widget - // implementing GtkEditable - virtual GtkEditable *GetEditable() const = 0; - - // implement this to return the associated GtkEntry - virtual GtkEntry *GetEntry() const = 0; -}; - -#endif // _WX_GTK_TEXTENTRY_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/tglbtn.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/tglbtn.h deleted file mode 100644 index d6975311f4..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/tglbtn.h +++ /dev/null @@ -1,120 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/tglbtn.h -// Purpose: Declaration of the wxToggleButton class, which implements a -// toggle button under wxGTK. -// Author: John Norris, minor changes by Axel Schlueter -// Modified by: -// Created: 08.02.01 -// Copyright: (c) 2000 Johnny C. Norris II -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_TOGGLEBUTTON_H_ -#define _WX_GTK_TOGGLEBUTTON_H_ - -#include "wx/bitmap.h" - -//----------------------------------------------------------------------------- -// wxToggleButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxToggleButton: public wxToggleButtonBase -{ -public: - // construction/destruction - wxToggleButton() {} - wxToggleButton(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - // Create the control - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - - // Get/set the value - void SetValue(bool state); - bool GetValue() const; - - // Set the label - void SetLabel(const wxString& label); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -protected: - void GTKDisableEvents(); - void GTKEnableEvents(); - - virtual wxSize DoGetBestSize() const; - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - -#if wxUSE_MARKUP - virtual bool DoSetLabelMarkup(const wxString& markup); -#endif // wxUSE_MARKUP - -private: - typedef wxToggleButtonBase base_type; - - // Return the GtkLabel used by this toggle button. - GtkLabel *GTKGetLabel() const; - - DECLARE_DYNAMIC_CLASS(wxToggleButton) -}; - -//----------------------------------------------------------------------------- -// wxBitmapToggleButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapToggleButton: public wxToggleButton -{ -public: - // construction/destruction - wxBitmapToggleButton() {} - wxBitmapToggleButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - // Create the control - bool Create(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - - // deprecated synonym for SetBitmapLabel() - wxDEPRECATED_INLINE( void SetLabel(const wxBitmap& bitmap), - SetBitmapLabel(bitmap); ) - // prevent virtual function hiding - virtual void SetLabel(const wxString& label) { wxToggleButton::SetLabel(label); } - -private: - typedef wxToggleButtonBase base_type; - - DECLARE_DYNAMIC_CLASS(wxBitmapToggleButton) -}; - -#endif // _WX_GTK_TOGGLEBUTTON_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/toolbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/toolbar.h deleted file mode 100644 index d504b6c2e8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/toolbar.h +++ /dev/null @@ -1,104 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/toolbar.h -// Purpose: GTK toolbar -// Author: Robert Roebling -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_TOOLBAR_H_ -#define _WX_GTK_TOOLBAR_H_ - -#if wxUSE_TOOLBAR - -typedef struct _GtkTooltips GtkTooltips; - -// ---------------------------------------------------------------------------- -// wxToolBar -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase -{ -public: - // construction/destruction - wxToolBar() { Init(); } - wxToolBar( wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTB_HORIZONTAL, - const wxString& name = wxToolBarNameStr ) - { - Init(); - - Create(parent, id, pos, size, style, name); - } - - bool Create( wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTB_HORIZONTAL, - const wxString& name = wxToolBarNameStr ); - - virtual ~wxToolBar(); - - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; - - virtual void SetToolShortHelp(int id, const wxString& helpString); - - virtual void SetWindowStyleFlag( long style ); - - virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap); - virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap); - - virtual bool Realize(); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - virtual wxToolBarToolBase *CreateTool(int id, - const wxString& label, - const wxBitmap& bitmap1, - const wxBitmap& bitmap2 = wxNullBitmap, - wxItemKind kind = wxITEM_NORMAL, - wxObject *clientData = NULL, - const wxString& shortHelpString = wxEmptyString, - const wxString& longHelpString = wxEmptyString); - virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label); - - // implementation from now on - // -------------------------- - -protected: - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_DEFAULT; } - - virtual wxSize DoGetBestSize() const; - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - - // implement base class pure virtuals - virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); - virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); - - virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable); - virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); - virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); - -private: - void Init(); - void GtkSetStyle(); - GSList* GetRadioGroup(size_t pos); - virtual void AddChildGTK(wxWindowGTK* child); - - GtkToolbar* m_toolbar; - GtkTooltips* m_tooltips; - - DECLARE_DYNAMIC_CLASS(wxToolBar) -}; - -#endif // wxUSE_TOOLBAR - -#endif - // _WX_GTK_TOOLBAR_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/tooltip.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/tooltip.h deleted file mode 100644 index 25c682b428..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/tooltip.h +++ /dev/null @@ -1,55 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/tooltip.h -// Purpose: wxToolTip class -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTKTOOLTIP_H_ -#define _WX_GTKTOOLTIP_H_ - -#include "wx/string.h" -#include "wx/object.h" - -//----------------------------------------------------------------------------- -// forward declarations -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxWindow; - -//----------------------------------------------------------------------------- -// wxToolTip -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxToolTip : public wxObject -{ -public: - wxToolTip( const wxString &tip ); - - // globally change the tooltip parameters - static void Enable( bool flag ); - static void SetDelay( long msecs ); - // set the delay after which the tooltip disappears or how long the tooltip remains visible - static void SetAutoPop(long msecs); - // set the delay between subsequent tooltips to appear - static void SetReshow(long msecs); - - // get/set the tooltip text - void SetTip( const wxString &tip ); - wxString GetTip() const { return m_text; } - - wxWindow *GetWindow() const { return m_window; } - - // Implementation - void GTKSetWindow(wxWindow* win); - static void GTKApply(GtkWidget* widget, const char* tip); - -private: - wxString m_text; - wxWindow *m_window; - - DECLARE_ABSTRACT_CLASS(wxToolTip) -}; - -#endif // _WX_GTKTOOLTIP_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/toplevel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/toplevel.h deleted file mode 100644 index 9f9374b06b..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/toplevel.h +++ /dev/null @@ -1,169 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/toplevel.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_TOPLEVEL_H_ -#define _WX_GTK_TOPLEVEL_H_ - -//----------------------------------------------------------------------------- -// wxTopLevelWindowGTK -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTopLevelWindowGTK : public wxTopLevelWindowBase -{ - typedef wxTopLevelWindowBase base_type; -public: - // construction - wxTopLevelWindowGTK() { Init(); } - wxTopLevelWindowGTK(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - - Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - virtual ~wxTopLevelWindowGTK(); - - // implement base class pure virtuals - virtual void Maximize(bool maximize = true); - virtual bool IsMaximized() const; - virtual void Iconize(bool iconize = true); - virtual bool IsIconized() const; - virtual void SetIcons(const wxIconBundle& icons); - virtual void Restore(); - - virtual bool EnableCloseButton(bool enable = true); - - virtual void ShowWithoutActivating(); - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - virtual bool IsFullScreen() const { return m_fsIsShowing; } - - virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); - - virtual void SetWindowStyleFlag( long style ); - - virtual bool Show(bool show = true); - - virtual void Raise(); - - virtual bool IsActive(); - - virtual void SetTitle( const wxString &title ); - virtual wxString GetTitle() const { return m_title; } - - virtual void SetLabel(const wxString& label) { SetTitle( label ); } - virtual wxString GetLabel() const { return GetTitle(); } - - - virtual bool SetTransparent(wxByte alpha); - virtual bool CanSetTransparent(); - - // Experimental, to allow help windows to be - // viewable from within modal dialogs - virtual void AddGrab(); - virtual void RemoveGrab(); - virtual bool IsGrabbed() const { return m_grabbed; } - - - virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ); - - // implementation from now on - // -------------------------- - - // GTK callbacks - virtual void OnInternalIdle(); - - virtual void GTKHandleRealized(); - - void GTKConfigureEvent(int x, int y); - - // do *not* call this to iconize the frame, this is a private function! - void SetIconizeState(bool iconic); - - GtkWidget *m_mainWidget; - - bool m_fsIsShowing; /* full screen */ - int m_fsSaveGdkFunc, m_fsSaveGdkDecor; - wxRect m_fsSaveFrame; - - // m_windowStyle translated to GDK's terms - int m_gdkFunc, - m_gdkDecor; - - // size of WM decorations - struct DecorSize - { - int left, right, top, bottom; - }; - DecorSize m_decorSize; - - // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and - // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle. - int m_urgency_hint; - // timer for detecting WM with broken _NET_REQUEST_FRAME_EXTENTS handling - unsigned m_netFrameExtentsTimerId; - - // return the size of the window without WM decorations - void GTKDoGetSize(int *width, int *height) const; - - void GTKUpdateDecorSize(const DecorSize& decorSize); - -protected: - // give hints to the Window Manager for how the size - // of the TLW can be changed by dragging - virtual void DoSetSizeHints( int minW, int minH, - int maxW, int maxH, - int incW, int incH); - // move the window to the specified location and resize it - virtual void DoMoveWindow(int x, int y, int width, int height); - - // take into account WM decorations here - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - - virtual void DoSetClientSize(int width, int height); - virtual void DoGetClientSize(int *width, int *height) const; - - // string shown in the title bar - wxString m_title; - - bool m_deferShow; - -private: - void Init(); - DecorSize& GetCachedDecorSize(); - - // size hint increments - int m_incWidth, m_incHeight; - - // is the frame currently iconized? - bool m_isIconized; - - // is the frame currently grabbed explicitly by the application? - bool m_grabbed; - - bool m_updateDecorSize; - bool m_deferShowAllowed; -}; - -#endif // _WX_GTK_TOPLEVEL_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/webview_webkit.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/webview_webkit.h deleted file mode 100644 index e1a01bf811..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/webview_webkit.h +++ /dev/null @@ -1,186 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: include/gtk/wx/webview.h -// Purpose: GTK webkit backend for web view component -// Author: Robert Roebling, Marianne Gagnon -// Copyright: (c) 2010 Marianne Gagnon, 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_WEBKITCTRL_H_ -#define _WX_GTK_WEBKITCTRL_H_ - -#include "wx/defs.h" - -#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__) - -#include "wx/sharedptr.h" -#include "wx/webview.h" - -typedef struct _WebKitWebView WebKitWebView; - -//----------------------------------------------------------------------------- -// wxWebViewWebKit -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView -{ -public: - wxWebViewWebKit(); - - wxWebViewWebKit(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& url = wxWebViewDefaultURLStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxWebViewNameStr) - { - Create(parent, id, url, pos, size, style, name); - } - - virtual bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxString& url = wxWebViewDefaultURLStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxString& name = wxWebViewNameStr); - - virtual ~wxWebViewWebKit(); - - virtual bool Enable( bool enable = true ); - - // implementation - // -------------- - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - virtual void Stop(); - virtual void LoadURL(const wxString& url); - virtual void GoBack(); - virtual void GoForward(); - virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT); - virtual bool CanGoBack() const; - virtual bool CanGoForward() const; - virtual void ClearHistory(); - virtual void EnableContextMenu(bool enable = true); - virtual void EnableHistory(bool enable = true); - virtual wxVector > GetBackwardHistory(); - virtual wxVector > GetForwardHistory(); - virtual void LoadHistoryItem(wxSharedPtr item); - virtual wxString GetCurrentURL() const; - virtual wxString GetCurrentTitle() const; - virtual wxString GetPageSource() const; - virtual wxString GetPageText() const; - virtual void Print(); - virtual bool IsBusy() const; - - void SetZoomType(wxWebViewZoomType); - wxWebViewZoomType GetZoomType() const; - bool CanSetZoomType(wxWebViewZoomType) const; - virtual wxWebViewZoom GetZoom() const; - virtual void SetZoom(wxWebViewZoom); - - //Clipboard functions - virtual bool CanCut() const; - virtual bool CanCopy() const; - virtual bool CanPaste() const; - virtual void Cut(); - virtual void Copy(); - virtual void Paste(); - - //Undo / redo functionality - virtual bool CanUndo() const; - virtual bool CanRedo() const; - virtual void Undo(); - virtual void Redo(); - - //Find function - virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT); - - //Editing functions - virtual void SetEditable(bool enable = true); - virtual bool IsEditable() const; - - //Selection - virtual void DeleteSelection(); - virtual bool HasSelection() const; - virtual void SelectAll(); - virtual wxString GetSelectedText() const; - virtual wxString GetSelectedSource() const; - virtual void ClearSelection(); - - virtual void RunScript(const wxString& javascript); - - //Virtual Filesystem Support - virtual void RegisterHandler(wxSharedPtr handler); - virtual wxVector > GetHandlers() { return m_handlerList; } - - virtual void* GetNativeBackend() const { return m_web_view; } - - /** TODO: check if this can be made private - * The native control has a getter to check for busy state, but except in - * very recent versions of webkit this getter doesn't say everything we need - * (namely it seems to stay indefinitely busy when loading is cancelled by - * user) - */ - bool m_busy; - - wxString m_vfsurl; - - //We use this flag to stop recursion when we load a page from the navigation - //callback, mainly when loading a VFS page - bool m_guard; - //This flag is use to indicate when a navigation event is the result of a - //create-web-view signal and so we need to send a new window event - bool m_creating; - -protected: - virtual void DoSetPage(const wxString& html, const wxString& baseUrl); - - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - -private: - - void ZoomIn(); - void ZoomOut(); - void SetWebkitZoom(float level); - float GetWebkitZoom() const; - - //Find helper function - void FindClear(); - - // focus event handler: calls GTKUpdateBitmap() - void GTKOnFocus(wxFocusEvent& event); - - WebKitWebView *m_web_view; - int m_historyLimit; - - wxVector > m_handlerList; - - //variables used for Find() - int m_findFlags; - wxString m_findText; - int m_findPosition; - int m_findCount; - - wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit); -}; - -class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryWebKit : public wxWebViewFactory -{ -public: - virtual wxWebView* Create() { return new wxWebViewWebKit; } - virtual wxWebView* Create(wxWindow* parent, - wxWindowID id, - const wxString& url = wxWebViewDefaultURLStr, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxWebViewNameStr) - { return new wxWebViewWebKit(parent, id, url, pos, size, style, name); } -}; - - -#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__) - -#endif diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/webviewhistoryitem_webkit.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/webviewhistoryitem_webkit.h deleted file mode 100644 index a798efdda6..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/webviewhistoryitem_webkit.h +++ /dev/null @@ -1,33 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: include/wx/gtk/webviewhistoryitem.h -// Purpose: wxWebViewHistoryItem header for GTK -// Author: Steven Lamerton -// Copyright: (c) 2011 Steven Lamerton -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_WEBVIEWHISTORYITEM_H_ -#define _WX_GTK_WEBVIEWHISTORYITEM_H_ - -#include "wx/setup.h" - -#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__) - -class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem -{ -public: - wxWebViewHistoryItem(const wxString& url, const wxString& title) : - m_url(url), m_title(title) {} - wxString GetUrl() { return m_url; } - wxString GetTitle() { return m_title; } - - friend class wxWebViewWebKit; - -private: - wxString m_url, m_title; - void* m_histItem; -}; - -#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__) - -#endif // _WX_GTK_WEBVIEWHISTORYITEM_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/window.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/window.h deleted file mode 100644 index 2d37388a06..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk/window.h +++ /dev/null @@ -1,461 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/window.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_WINDOW_H_ -#define _WX_GTK_WINDOW_H_ - -#include "wx/dynarray.h" - -#ifdef __WXGTK3__ - typedef struct _cairo cairo_t; - typedef struct _GtkStyleProvider GtkStyleProvider; - #define WXUNUSED_IN_GTK3(x) -#else - #define WXUNUSED_IN_GTK3(x) x -#endif - -typedef struct _GdkEventKey GdkEventKey; -typedef struct _GtkIMContext GtkIMContext; - -WX_DEFINE_EXPORTED_ARRAY_PTR(GdkWindow *, wxArrayGdkWindows); - -extern "C" -{ - -typedef void (*wxGTKCallback)(); - -} - -//----------------------------------------------------------------------------- -// wxWindowGTK -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowGTK : public wxWindowBase -{ -public: - // creating the window - // ------------------- - wxWindowGTK(); - wxWindowGTK(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr); - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr); - virtual ~wxWindowGTK(); - - // implement base class (pure) virtual methods - // ------------------------------------------- - - virtual void Raise(); - virtual void Lower(); - - virtual bool Show( bool show = true ); - - virtual bool IsRetained() const; - - virtual void SetFocus(); - - // hint from wx to native GTK+ tab traversal code - virtual void SetCanFocus(bool canFocus); - - virtual bool Reparent( wxWindowBase *newParent ); - - virtual void WarpPointer(int x, int y); - - virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ); - virtual void Update(); - virtual void ClearBackground(); - - virtual bool SetBackgroundColour( const wxColour &colour ); - virtual bool SetForegroundColour( const wxColour &colour ); - virtual bool SetCursor( const wxCursor &cursor ); - virtual bool SetFont( const wxFont &font ); - - virtual bool SetBackgroundStyle(wxBackgroundStyle style) ; - virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const; - - virtual int GetCharHeight() const; - virtual int GetCharWidth() const; - - virtual void SetScrollbar( int orient, int pos, int thumbVisible, - int range, bool refresh = true ); - virtual void SetScrollPos( int orient, int pos, bool refresh = true ); - virtual int GetScrollPos( int orient ) const; - virtual int GetScrollThumb( int orient ) const; - virtual int GetScrollRange( int orient ) const; - virtual void ScrollWindow( int dx, int dy, - const wxRect* rect = NULL ); - virtual bool ScrollLines(int lines); - virtual bool ScrollPages(int pages); - -#if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget( wxDropTarget *dropTarget ); -#endif // wxUSE_DRAG_AND_DROP - - virtual void AddChild( wxWindowBase *child ); - virtual void RemoveChild( wxWindowBase *child ); - - virtual void SetLayoutDirection(wxLayoutDirection dir); - virtual wxLayoutDirection GetLayoutDirection() const; - virtual wxCoord AdjustForLayoutDirection(wxCoord x, - wxCoord width, - wxCoord widthTotal) const; - - virtual bool DoIsExposed( int x, int y ) const; - virtual bool DoIsExposed( int x, int y, int w, int h ) const; - - // currently wxGTK2-only - void SetDoubleBuffered(bool on); - virtual bool IsDoubleBuffered() const; - - // SetLabel(), which does nothing in wxWindow - virtual void SetLabel(const wxString& label) { m_gtkLabel = label; } - virtual wxString GetLabel() const { return m_gtkLabel; } - - // implementation - // -------------- - - virtual WXWidget GetHandle() const { return m_widget; } - - // many important things are done here, this function must be called - // regularly - virtual void OnInternalIdle(); - - // For compatibility across platforms (not in event table) - void OnIdle(wxIdleEvent& WXUNUSED(event)) {} - - // Used by all window classes in the widget creation process. - bool PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size ); - void PostCreation(); - - // Internal addition of child windows - void DoAddChild(wxWindowGTK *child); - - // This method sends wxPaintEvents to the window. - // It is also responsible for background erase events. -#ifdef __WXGTK3__ - void GTKSendPaintEvents(cairo_t* cr); -#else - void GTKSendPaintEvents(const GdkRegion* region); -#endif - - // The methods below are required because many native widgets - // are composed of several subwidgets and setting a style for - // the widget means setting it for all subwidgets as well. - // also, it is not clear which native widget is the top - // widget where (most of) the input goes. even tooltips have - // to be applied to all subwidgets. - virtual GtkWidget* GetConnectWidget(); - void ConnectWidget( GtkWidget *widget ); - - // Called from several event handlers, if it returns true or false, the - // same value should be immediately returned by the handler without doing - // anything else. If it returns -1, the handler should continue as usual - int GTKCallbackCommonPrologue(struct _GdkEventAny *event) const; - - // Simplified form of GTKCallbackCommonPrologue() which can be used from - // GTK callbacks without return value to check if the event should be - // ignored: if this returns true, the event shouldn't be handled - bool GTKShouldIgnoreEvent() const; - - - // override this if some events should never be consumed by wxWidgets but - // but have to be left for the native control - // - // base version just calls HandleWindowEvent() - virtual bool GTKProcessEvent(wxEvent& event) const; - - // Map GTK widget direction of the given widget to/from wxLayoutDirection - static wxLayoutDirection GTKGetLayout(GtkWidget *widget); - static void GTKSetLayout(GtkWidget *widget, wxLayoutDirection dir); - - // This is called when capture is taken from the window. It will - // fire off capture lost events. - void GTKReleaseMouseAndNotify(); - - GdkWindow* GTKGetDrawingWindow() const; - - bool GTKHandleFocusIn(); - bool GTKHandleFocusOut(); - void GTKHandleFocusOutNoDeferring(); - static void GTKHandleDeferredFocusOut(); - - // Called when m_widget becomes realized. Derived classes must call the - // base class method if they override it. - virtual void GTKHandleRealized(); - void GTKHandleUnrealize(); - -protected: - // for controls composed of multiple GTK widgets, return true to eliminate - // spurious focus events if the focus changes between GTK+ children within - // the same wxWindow - virtual bool GTKNeedsToFilterSameWindowFocus() const { return false; } - - // Override GTKWidgetNeedsMnemonic and return true if your - // needs to set its mnemonic widget, such as for a - // GtkLabel for wxStaticText, then do the actual - // setting of the widget inside GTKWidgetDoSetMnemonic - virtual bool GTKWidgetNeedsMnemonic() const; - virtual void GTKWidgetDoSetMnemonic(GtkWidget* w); - - // Get the GdkWindows making part of this window: usually there will be - // only one of them in which case it should be returned directly by this - // function. If there is more than one GdkWindow (can be the case for - // composite widgets), return NULL and fill in the provided array - // - // This is not pure virtual for backwards compatibility but almost - // certainly must be overridden in any wxControl-derived class! - virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; - - // Check if the given window makes part of this widget - bool GTKIsOwnWindow(GdkWindow *window) const; - -public: - // Returns the default context which usually is anti-aliased - PangoContext *GTKGetPangoDefaultContext(); - -#if wxUSE_TOOLTIPS - // applies tooltip to the widget (tip must be UTF-8 encoded) - virtual void GTKApplyToolTip(const char* tip); -#endif // wxUSE_TOOLTIPS - - // Called when a window should delay showing itself - // until idle time used in Reparent(). - void GTKShowOnIdle() { m_showOnIdle = true; } - - // This is called from the various OnInternalIdle methods - bool GTKShowFromOnIdle(); - - // is this window transparent for the mouse events (as wxStaticBox is)? - virtual bool GTKIsTransparentForMouse() const { return false; } - - // Common scroll event handling code for wxWindow and wxScrollBar - wxEventType GTKGetScrollEventType(GtkRange* range); - - // position and size of the window - int m_x, m_y; - int m_width, m_height; - int m_clientWidth, m_clientHeight; - // Whether the client size variables above are known to be correct - // (because they have been validated by a size-allocate) and should - // be used to report client size - bool m_useCachedClientSize; - - // see the docs in src/gtk/window.cpp - GtkWidget *m_widget; // mostly the widget seen by the rest of GTK - GtkWidget *m_wxwindow; // mostly the client area as per wxWidgets - - // label for use with GetLabelSetLabel - wxString m_gtkLabel; - - // return true if the window is of a standard (i.e. not wxWidgets') class - bool IsOfStandardClass() const { return m_wxwindow == NULL; } - - // this widget will be queried for GTK's focus events - GtkWidget *m_focusWidget; - - void GTKDisableFocusOutEvent(); - void GTKEnableFocusOutEvent(); - - - // Input method support - - // The IM context used for generic, i.e. non-native, windows. - // - // It might be a good idea to avoid allocating it unless key events from - // this window are really needed but currently we do it unconditionally. - // - // For native widgets (i.e. those for which IsOfStandardClass() returns - // true) it is NULL. - GtkIMContext* m_imContext; - - // Pointer to the event being currently processed by the IME or NULL if not - // inside key handling. - GdkEventKey* m_imKeyEvent; - - // This method generalizes gtk_im_context_filter_keypress(): for the - // generic windows it does just that but it's overridden by the classes - // wrapping native widgets that use IM themselves and so provide specific - // methods for accessing it such gtk_entry_im_context_filter_keypress(). - virtual int GTKIMFilterKeypress(GdkEventKey* event) const; - - // This method must be called from the derived classes "insert-text" signal - // handlers to check if the text is not being inserted by the IM and, if - // this is the case, generate appropriate wxEVT_CHAR events for it. - // - // Returns true if we did generate and process events corresponding to this - // text or false if we didn't handle it. - bool GTKOnInsertText(const char* text); - - // This is just a helper of GTKOnInsertText() which is also used by GTK+ - // "commit" signal handler. - bool GTKDoInsertTextFromIM(const char* text); - - - // indices for the arrays below - enum ScrollDir { ScrollDir_Horz, ScrollDir_Vert, ScrollDir_Max }; - - // horizontal/vertical scroll bar - GtkRange* m_scrollBar[ScrollDir_Max]; - - // horizontal/vertical scroll position - double m_scrollPos[ScrollDir_Max]; - - // return the scroll direction index corresponding to the given orientation - // (which is wxVERTICAL or wxHORIZONTAL) - static ScrollDir ScrollDirFromOrient(int orient) - { - return orient == wxVERTICAL ? ScrollDir_Vert : ScrollDir_Horz; - } - - // return the orientation for the given scrolling direction - static int OrientFromScrollDir(ScrollDir dir) - { - return dir == ScrollDir_Horz ? wxHORIZONTAL : wxVERTICAL; - } - - // find the direction of the given scrollbar (must be one of ours) - ScrollDir ScrollDirFromRange(GtkRange *range) const; - - void GTKUpdateCursor(bool isBusyOrGlobalCursor = false, bool isRealize = false); - - // extra (wxGTK-specific) flags - bool m_noExpose:1; // wxGLCanvas has its own redrawing - bool m_nativeSizeEvent:1; // wxGLCanvas sends wxSizeEvent upon "alloc_size" - bool m_isScrolling:1; // dragging scrollbar thumb? - bool m_clipPaintRegion:1; // true after ScrollWindow() - wxRegion m_nativeUpdateRegion; // not transformed for RTL - bool m_dirtyTabOrder:1; // tab order changed, GTK focus - // chain needs update - bool m_mouseButtonDown:1; - - bool m_showOnIdle:1; // postpone showing the window until idle - -protected: - // implement the base class pure virtuals - virtual void DoGetTextExtent(const wxString& string, - int *x, int *y, - int *descent = NULL, - int *externalLeading = NULL, - const wxFont *font = NULL) const; - virtual void DoClientToScreen( int *x, int *y ) const; - virtual void DoScreenToClient( int *x, int *y ) const; - virtual void DoGetPosition( int *x, int *y ) const; - virtual void DoGetSize( int *width, int *height ) const; - virtual void DoGetClientSize( int *width, int *height ) const; - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - virtual void DoSetClientSize(int width, int height); - virtual wxSize DoGetBorderSize() const; - virtual void DoMoveWindow(int x, int y, int width, int height); - virtual void DoEnable(bool enable); - -#if wxUSE_MENUS_NATIVE - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); -#endif // wxUSE_MENUS_NATIVE - - virtual void DoCaptureMouse(); - virtual void DoReleaseMouse(); - - virtual void DoFreeze(); - virtual void DoThaw(); - - void GTKFreezeWidget(GtkWidget *w); - void GTKThawWidget(GtkWidget *w); - void GTKDisconnect(void* instance); - -#if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ); -#endif // wxUSE_TOOLTIPS - - // Create a GtkScrolledWindow containing the given widget (usually - // m_wxwindow but not necessarily) and assigns it to m_widget. Also shows - // the widget passed to it. - // - // Can be only called if we have either wxHSCROLL or wxVSCROLL in our - // style. - void GTKCreateScrolledWindowWith(GtkWidget* view); - - virtual void DoMoveInTabOrder(wxWindow *win, WindowOrder move); - virtual bool DoNavigateIn(int flags); - - - // Copies m_children tab order to GTK focus chain: - void RealizeTabOrder(); - -#ifndef __WXGTK3__ - // Called by ApplyWidgetStyle (which is called by SetFont() and - // SetXXXColour etc to apply style changed to native widgets) to create - // modified GTK style with non-standard attributes. - GtkRcStyle* GTKCreateWidgetStyle(); -#endif - - void GTKApplyWidgetStyle(bool forceStyle = false); - - // helper function to ease native widgets wrapping, called by - // ApplyWidgetStyle -- override this, not ApplyWidgetStyle - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - - void GTKApplyStyle(GtkWidget* widget, GtkRcStyle* style); - - // sets the border of a given GtkScrolledWindow from a wx style - static void GTKScrolledWindowSetBorder(GtkWidget* w, int style); - - // Connect the given function to the specified signal on m_widget. - // - // This is just a wrapper for g_signal_connect() and returns the handler id - // just as it does. - unsigned long GTKConnectWidget(const char *signal, wxGTKCallback callback); - - void ConstrainSize(); - -private: - void Init(); - - // return true if this window must have a non-NULL parent, false if it can - // be created without parent (normally only top level windows but in wxGTK - // there is also the exception of wxMenuBar) - virtual bool GTKNeedsParent() const { return !IsTopLevel(); } - - enum ScrollUnit { ScrollUnit_Line, ScrollUnit_Page, ScrollUnit_Max }; - - // common part of ScrollLines() and ScrollPages() and could be used, in the - // future, for horizontal scrolling as well - // - // return true if we scrolled, false otherwise (on error or simply if we - // are already at the end) - bool DoScrollByUnits(ScrollDir dir, ScrollUnit unit, int units); - virtual void AddChildGTK(wxWindowGTK* child); - -#ifdef __WXGTK3__ - // paint context is stashed here so wxPaintDC can use it - cairo_t* m_paintContext; - // style provider for "background-image" - GtkStyleProvider* m_styleProvider; - -public: - cairo_t* GTKPaintContext() const - { - return m_paintContext; - } -#endif - - DECLARE_DYNAMIC_CLASS(wxWindowGTK) - wxDECLARE_NO_COPY_CLASS(wxWindowGTK); -}; - -#endif // _WX_GTK_WINDOW_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/accel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/accel.h deleted file mode 100644 index 36f153ef40..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/accel.h +++ /dev/null @@ -1,14 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/accel.h -// Purpose: wxAcceleratorTable redirection file -// Author: Julian Smart -// Modified by: -// Created: -// Copyright: (c) Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -// VZ: keeping the old file just in case we're going to have a native GTK+ -// wxAcceleratorTable implementation one day, but for now use the generic -// version -#include "wx/generic/accel.h" diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/app.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/app.h deleted file mode 100644 index c8b7dc8a97..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/app.h +++ /dev/null @@ -1,77 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/app.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKAPPH__ -#define __GTKAPPH__ - -#include "wx/frame.h" -#include "wx/icon.h" -#include "wx/strconv.h" - -typedef struct _GdkVisual GdkVisual; - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxApp; -class WXDLLIMPEXP_FWD_BASE wxLog; - -//----------------------------------------------------------------------------- -// wxApp -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxApp: public wxAppBase -{ -public: - wxApp(); - virtual ~wxApp(); - - /* override for altering the way wxGTK intializes the GUI - * (palette/visual/colorcube). under wxMSW, OnInitGui() does nothing by - * default. when overriding this method, the code in it is likely to be - * platform dependent, otherwise use OnInit(). */ - virtual bool OnInitGui(); - - // override base class (pure) virtuals - virtual void WakeUpIdle(); - - virtual bool Initialize(int& argc, wxChar **argv); - virtual void CleanUp(); - - static bool InitialzeVisual(); - - virtual void OnAssertFailure(const wxChar *file, - int line, - const wxChar *func, - const wxChar *cond, - const wxChar *msg); - - bool IsInAssert() const { return m_isInAssert; } - - int m_idleTag; - void RemoveIdleTag(); - - unsigned char *m_colorCube; - - // Used by the wxGLApp and wxGLCanvas class for GL-based X visual - // selection. - void *m_glVisualInfo; // this is actually an XVisualInfo* - void *m_glFBCInfo; // this is actually an GLXFBConfig* - // This returns the current visual: either that used by wxRootWindow - // or the XVisualInfo* for SGI. - GdkVisual *GetGdkVisual(); - -private: - // true if we're inside an assert modal dialog - bool m_isInAssert; - - DECLARE_DYNAMIC_CLASS(wxApp) -}; - -#endif // __GTKAPPH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/bitmap.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/bitmap.h deleted file mode 100644 index 6eb72a95c5..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/bitmap.h +++ /dev/null @@ -1,154 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/bitmap.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -#ifndef __GTKBITMAPH__ -#define __GTKBITMAPH__ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/palette.h" -#include "wx/gdiobj.h" - -class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxMask; -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_FWD_CORE wxImage; - -//----------------------------------------------------------------------------- -// wxMask -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMask: public wxObject -{ -public: - wxMask(); - wxMask( const wxBitmap& bitmap, const wxColour& colour ); -#if wxUSE_PALETTE - wxMask( const wxBitmap& bitmap, int paletteIndex ); -#endif // wxUSE_PALETTE - wxMask( const wxBitmap& bitmap ); - virtual ~wxMask(); - - bool Create( const wxBitmap& bitmap, const wxColour& colour ); -#if wxUSE_PALETTE - bool Create( const wxBitmap& bitmap, int paletteIndex ); -#endif // wxUSE_PALETTE - bool Create( const wxBitmap& bitmap ); - - // implementation - GdkBitmap *m_bitmap; - - GdkBitmap *GetBitmap() const; - -private: - DECLARE_DYNAMIC_CLASS(wxMask) -}; - -//----------------------------------------------------------------------------- -// wxBitmap -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase -{ -public: - wxBitmap() {} - wxBitmap( int width, int height, int depth = -1 ) { Create( width, height, depth ); } - wxBitmap( const wxSize& sz, int depth = -1 ) { Create( sz, depth ); } - wxBitmap( const char bits[], int width, int height, int depth = 1 ); - wxBitmap( const char* const* bits ); -#ifdef wxNEEDS_CHARPP - // needed for old GCC - wxBitmap(char** data) - { - *this = wxBitmap(const_cast(data)); - } -#endif - wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE ); - wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } - virtual ~wxBitmap(); - - bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); - bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) - { return Create(sz.GetWidth(), sz.GetHeight(), depth); } - bool Create(int width, int height, const wxDC& WXUNUSED(dc)) - { return Create(width,height); } - - virtual int GetHeight() const; - virtual int GetWidth() const; - virtual int GetDepth() const; - - wxImage ConvertToImage() const; - - // copies the contents and mask of the given (colour) icon to the bitmap - virtual bool CopyFromIcon(const wxIcon& icon); - - wxMask *GetMask() const; - void SetMask( wxMask *mask ); - - wxBitmap GetSubBitmap( const wxRect& rect ) const; - - bool SaveFile(const wxString &name, wxBitmapType type, - const wxPalette *palette = NULL) const; - bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); - -#if wxUSE_PALETTE - wxPalette *GetPalette() const; - void SetPalette(const wxPalette& palette); - wxPalette *GetColourMap() const { return GetPalette(); } -#endif // wxUSE_PALETTE - - static void InitStandardHandlers(); - - // implementation - // -------------- - - void SetHeight( int height ); - void SetWidth( int width ); - void SetDepth( int depth ); - void SetPixmap( GdkPixmap *pixmap ); - void SetBitmap( GdkBitmap *bitmap ); - - GdkPixmap *GetPixmap() const; - GdkBitmap *GetBitmap() const; - bool HasPixmap() const; - - // Basically, this corresponds to Win32 StretchBlt() - wxBitmap Rescale( int clipx, int clipy, int clipwidth, int clipheight, int width, int height ); - - // raw bitmap access support functions - void *GetRawData(wxPixelDataBase& data, int bpp); - void UngetRawData(wxPixelDataBase& data); - - bool HasAlpha() const; - -protected: - bool CreateFromImage(const wxImage& image, int depth); - - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - // to be called from CreateFromImage only! - bool CreateFromImageAsBitmap(const wxImage& image); - bool CreateFromImageAsPixmap(const wxImage& image); - - friend class wxBitmapHandler; - -private: - DECLARE_DYNAMIC_CLASS(wxBitmap) -}; - - -#endif // __GTKBITMAPH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/bmpbuttn.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/bmpbuttn.h deleted file mode 100644 index 40dc99d9bb..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/bmpbuttn.h +++ /dev/null @@ -1,72 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/bmpbutton.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -#ifndef __BMPBUTTONH__ -#define __BMPBUTTONH__ - -// ---------------------------------------------------------------------------- -// wxBitmapButton -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase -{ -public: - wxBitmapButton() { Init(); } - - wxBitmapButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxBU_AUTODRAW, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Init(); - - Create(parent, id, bitmap, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxBitmap& bitmap, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxBU_AUTODRAW, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - - void SetLabel( const wxString &label ); - virtual void SetLabel( const wxBitmap& bitmap ) { SetBitmapLabel(bitmap); } - - virtual bool Enable(bool enable = TRUE); - - // implementation - // -------------- - - void GTKSetHasFocus(); - void GTKSetNotFocus(); - void StartSelect(); - void EndSelect(); - void DoApplyWidgetStyle(GtkRcStyle *style); - - bool m_hasFocus:1; - bool m_isSelected:1; - -protected: - virtual void OnSetBitmap(); - virtual wxSize DoGetBestSize() const; - - void Init(); - -private: - DECLARE_DYNAMIC_CLASS(wxBitmapButton) -}; - -#endif // __BMPBUTTONH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/brush.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/brush.h deleted file mode 100644 index e4ede7f560..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/brush.h +++ /dev/null @@ -1,65 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/brush.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -#ifndef __GTKBRUSHH__ -#define __GTKBRUSHH__ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/gdiobj.h" -#include "wx/bitmap.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxBrush; - -//----------------------------------------------------------------------------- -// wxBrush -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase -{ -public: - wxBrush() { } - - wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID ); -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) ); -#endif - wxBrush( const wxBitmap &stippleBitmap ); - virtual ~wxBrush(); - - bool operator==(const wxBrush& brush) const; - bool operator!=(const wxBrush& brush) const { return !(*this == brush); } - - wxBrushStyle GetStyle() const; - wxColour GetColour() const; - wxBitmap *GetStipple() const; - - void SetColour( const wxColour& col ); - void SetColour( unsigned char r, unsigned char g, unsigned char b ); - void SetStyle( wxBrushStyle style ); - void SetStipple( const wxBitmap& stipple ); - -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_FUTURE( void SetStyle(int style) ) - { SetStyle((wxBrushStyle)style); } -#endif - -private: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - DECLARE_DYNAMIC_CLASS(wxBrush) -}; - -#endif // __GTKBRUSHH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/button.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/button.h deleted file mode 100644 index d7909905d4..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/button.h +++ /dev/null @@ -1,67 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/button.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKBUTTONH__ -#define __GTKBUTTONH__ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/list.h" - -//----------------------------------------------------------------------------- -// wxButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxButton: public wxButtonBase -{ -public: - wxButton(); - wxButton(wxWindow *parent, wxWindowID id, - const wxString& label = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - virtual ~wxButton(); - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& label = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - - virtual wxWindow *SetDefault(); - virtual void SetLabel( const wxString &label ); - virtual bool Enable( bool enable = TRUE ); - - // implementation - // -------------- - - void DoApplyWidgetStyle(GtkRcStyle *style); - bool IsOwnGtkWindow( GdkWindow *window ); - - // Since this wxButton doesn't derive from wxButtonBase (why?) we need - // to override this here too... - virtual bool ShouldInheritColours() const { return false; } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -protected: - virtual wxSize DoGetBestSize() const; - -private: - DECLARE_DYNAMIC_CLASS(wxButton) -}; - -#endif // __GTKBUTTONH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/checkbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/checkbox.h deleted file mode 100644 index 2cc90a1703..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/checkbox.h +++ /dev/null @@ -1,65 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/checkbox.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKCHECKBOXH__ -#define __GTKCHECKBOXH__ - -// ---------------------------------------------------------------------------- -// wxCheckBox -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase -{ -public: - wxCheckBox(); - wxCheckBox( wxWindow *parent, wxWindowID id, const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr ); - - void SetValue( bool state ); - bool GetValue() const; - - virtual void SetLabel( const wxString& label ); - virtual bool Enable( bool enable = TRUE ); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - // -------------- - - void DoApplyWidgetStyle(GtkRcStyle *style); - bool IsOwnGtkWindow( GdkWindow *window ); - void OnInternalIdle(); - - GtkWidget *m_widgetCheckbox; - GtkWidget *m_widgetLabel; - - bool m_blockEvent; - -protected: - virtual wxSize DoGetBestSize() const; - -private: - DECLARE_DYNAMIC_CLASS(wxCheckBox) -}; - -#endif // __GTKCHECKBOXH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/checklst.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/checklst.h deleted file mode 100644 index bf20d53f55..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/checklst.h +++ /dev/null @@ -1,59 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/checklst.h -// Purpose: wxCheckListBox class -// Author: Robert Roebling -// Modified by: -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKCHECKLISTH__ -#define __GTKCHECKLISTH__ - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -// there is no "right" choice of the checkbox indicators, so allow the user to -// define them himself if he wants -#ifndef wxCHECKLBOX_CHECKED - #define wxCHECKLBOX_CHECKED wxT('x') - #define wxCHECKLBOX_UNCHECKED wxT(' ') - - #define wxCHECKLBOX_STRING wxT("[ ] ") -#endif - -//----------------------------------------------------------------------------- -// wxCheckListBox -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase -{ -public: - wxCheckListBox(); - wxCheckListBox(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int nStrings = 0, - const wxString *choices = (const wxString *)NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - wxCheckListBox(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - - bool IsChecked(unsigned int index) const; - void Check(unsigned int index, bool check = true); - - int GetItemHeight() const; - -private: - DECLARE_DYNAMIC_CLASS(wxCheckListBox) -}; - -#endif //__GTKCHECKLISTH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/choice.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/choice.h deleted file mode 100644 index 83fb38db79..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/choice.h +++ /dev/null @@ -1,111 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/choice.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKCHOICEH__ -#define __GTKCHOICEH__ - -class WXDLLIMPEXP_FWD_BASE wxSortedArrayString; -class WXDLLIMPEXP_FWD_BASE wxArrayString; - -//----------------------------------------------------------------------------- -// wxChoice -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxChoice : public wxChoiceBase -{ -public: - wxChoice(); - wxChoice( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (const wxString *) NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr ) - { - m_strings = NULL; - - Create(parent, id, pos, size, n, choices, style, validator, name); - } - wxChoice( wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr ) - { - m_strings = NULL; - - Create(parent, id, pos, size, choices, style, validator, name); - } - virtual ~wxChoice(); - bool Create( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr ); - bool Create( wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxChoiceNameStr ); - - // implement base class pure virtuals - void DoDeleteOneItem(unsigned int n); - void DoClear(); - - int GetSelection() const; - virtual void SetSelection(int n); - - virtual unsigned int GetCount() const; - virtual int FindString(const wxString& s, bool bCase = false) const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& string); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -protected: - wxList m_clientList; // contains the client data for the items - - void DoApplyWidgetStyle(GtkRcStyle *style); - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, wxClientDataType type); - - virtual void DoSetItemClientData(unsigned int n, void* clientData); - virtual void* DoGetItemClientData(unsigned int n) const; - - virtual wxSize DoGetBestSize() const; - - virtual bool IsOwnGtkWindow( GdkWindow *window ); - -private: - // DoInsertItems() helper - int GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item); - - // this array is only used for controls with wxCB_SORT style, so only - // allocate it if it's needed (hence using pointer) - wxSortedArrayString *m_strings; - -public: - // this circumvents a GTK+ 2.0 bug so that the selection is - // invalidated properly - int m_selection_hack; - -private: - DECLARE_DYNAMIC_CLASS(wxChoice) -}; - - -#endif // __GTKCHOICEH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/clipbrd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/clipbrd.h deleted file mode 100644 index 18d1d9d400..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/clipbrd.h +++ /dev/null @@ -1,77 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/clipbrd.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -#ifndef __GTKCLIPBOARDH__ -#define __GTKCLIPBOARDH__ - -#if wxUSE_CLIPBOARD - -#include "wx/object.h" -#include "wx/list.h" -#include "wx/dataobj.h" -#include "wx/control.h" -#include "wx/module.h" - -// ---------------------------------------------------------------------------- -// wxClipboard -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase -{ -public: - wxClipboard(); - virtual ~wxClipboard(); - - // open the clipboard before SetData() and GetData() - virtual bool Open(); - - // close the clipboard after SetData() and GetData() - virtual void Close(); - - // query whether the clipboard is opened - virtual bool IsOpened() const; - - // set the clipboard data. all other formats will be deleted. - virtual bool SetData( wxDataObject *data ); - - // add to the clipboard data. - virtual bool AddData( wxDataObject *data ); - - // ask if data in correct format is available - virtual bool IsSupported( const wxDataFormat& format ); - - // fill data with data on the clipboard (if available) - virtual bool GetData( wxDataObject& data ); - - // clears wxTheClipboard and the system's clipboard if possible - virtual void Clear(); - - // implementation from now on - bool m_open; - bool m_ownsClipboard; - bool m_ownsPrimarySelection; - wxDataObject *m_data; - - GtkWidget *m_clipboardWidget; /* for getting and offering data */ - GtkWidget *m_targetsWidget; /* for getting list of supported formats */ - bool m_waiting; /* querying data or formats is asynchronous */ - - bool m_formatSupported; - GdkAtom m_targetRequested; - wxDataObject *m_receivedData; - -private: - DECLARE_DYNAMIC_CLASS(wxClipboard) -}; - -#endif - // wxUSE_CLIPBOARD - -#endif - // __GTKCLIPBOARDH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/colordlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/colordlg.h deleted file mode 100644 index 6b780f7c6b..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/colordlg.h +++ /dev/null @@ -1,51 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/colordlg.h -// Purpose: wxColourDialog -// Author: Vaclav Slavik -// Modified by: -// Created: 2004/06/04 -// Copyright: (c) Vaclav Slavik, 2004 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __COLORDLG_H__ -#define __COLORDLG_H__ - -#include "wx/defs.h" -#include "wx/gdicmn.h" -#include "wx/dialog.h" - - -class WXDLLIMPEXP_CORE wxColourDialog : public wxDialog -{ -public: - wxColourDialog() {} - wxColourDialog(wxWindow *parent, - wxColourData *data = NULL); - virtual ~wxColourDialog() {} - - bool Create(wxWindow *parent, wxColourData *data = NULL); - - wxColourData &GetColourData() { return m_data; } - - virtual int ShowModal(); - -protected: - // implement some base class methods to do nothing to avoid asserts and - // GTK warnings, since this is not a real wxDialog. - virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} - virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) {} - - // copy data between the dialog and m_colourData: - void ColourDataToDialog(); - void DialogToColourData(); - - wxColourData m_data; - - DECLARE_DYNAMIC_CLASS(wxColourDialog) -}; - -#endif diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/colour.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/colour.h deleted file mode 100644 index 3c18f74368..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/colour.h +++ /dev/null @@ -1,69 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/colour.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKCOLOURH__ -#define __GTKCOLOURH__ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/gdiobj.h" -#include "wx/palette.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxDC; -class WXDLLIMPEXP_FWD_CORE wxPaintDC; -class WXDLLIMPEXP_FWD_CORE wxBitmap; -class WXDLLIMPEXP_FWD_CORE wxWindow; - -class WXDLLIMPEXP_FWD_CORE wxColour; - -//----------------------------------------------------------------------------- -// wxColour -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxColour : public wxColourBase -{ -public: - // constructors - // ------------ - DEFINE_STD_WXCOLOUR_CONSTRUCTORS - - virtual ~wxColour(); - - virtual bool FromString(const wxString& str); - - bool operator==(const wxColour& col) const; - bool operator!=(const wxColour& col) const { return !(*this == col); } - - unsigned char Red() const; - unsigned char Green() const; - unsigned char Blue() const; - - - // Implementation part - void CalcPixel( GdkColormap *cmap ); - int GetPixel() const; - GdkColor *GetColor() const; - -protected: - // ref counting code - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - virtual void - InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a); - -private: - DECLARE_DYNAMIC_CLASS(wxColour) -}; - -#endif // __GTKCOLOURH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/combobox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/combobox.h deleted file mode 100644 index 585318f4b3..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/combobox.h +++ /dev/null @@ -1,187 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/combobox.h -// Purpose: -// Author: Robert Roebling -// Created: 01/02/97 -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKCOMBOBOXH__ -#define __GTKCOMBOBOXH__ - -#include "wx/defs.h" - -#if wxUSE_COMBOBOX - -#include "wx/object.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxComboBox; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern WXDLLIMPEXP_DATA_CORE(const char) wxComboBoxNameStr[]; -extern WXDLLIMPEXP_BASE const wxChar* wxEmptyString; - -//----------------------------------------------------------------------------- -// wxComboBox -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxComboBox : - public wxWindowWithItems -{ -public: - inline wxComboBox() {} - inline wxComboBox(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (const wxString *) NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) - { - Create(parent, id, value, pos, size, n, choices, style, validator, name); - } - inline wxComboBox(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr) - { - Create(parent, id, value, pos, size, choices, style, validator, name); - } - - virtual ~wxComboBox(); - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (const wxString *) NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - bool Create(wxWindow *parent, wxWindowID id, - const wxString& value, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxComboBoxNameStr); - - void DoClear(); - void DoDeleteOneItem(unsigned int n); - - virtual int FindString(const wxString& s, bool bCase = false) const; - int GetSelection() const; - int GetCurrentSelection() const; - virtual wxString GetString(unsigned int n) const; - wxString GetStringSelection() const; - virtual unsigned int GetCount() const; - virtual void SetSelection(int n); - virtual void SetString(unsigned int n, const wxString &text); - - wxString GetValue() const { return DoGetValue(); } - void SetValue(const wxString& value); - void WriteText(const wxString& value); - - void Copy(); - void Cut(); - void Paste(); - bool CanCopy() const; - bool CanCut() const; - bool CanPaste() const; - void SetInsertionPoint( long pos ); - void SetInsertionPointEnd() { SetInsertionPoint( -1 ); } - long GetInsertionPoint() const; - virtual wxTextPos GetLastPosition() const; - void Remove(long from, long to) { Replace(from, to, wxEmptyString); } - void Replace( long from, long to, const wxString& value ); - void SetSelection( long from, long to ); - void GetSelection( long* from, long* to ) const; - void SetEditable( bool editable ); - void Undo() ; - void Redo() ; - bool CanUndo() const; - bool CanRedo() const; - void SelectAll(); - bool IsEditable() const ; - bool HasSelection() const ; - - // implementation - - virtual void SetFocus(); - - void OnSize( wxSizeEvent &event ); - void OnChar( wxKeyEvent &event ); - - // Standard event handling - void OnCut(wxCommandEvent& event); - void OnCopy(wxCommandEvent& event); - void OnPaste(wxCommandEvent& event); - void OnUndo(wxCommandEvent& event); - void OnRedo(wxCommandEvent& event); - void OnDelete(wxCommandEvent& event); - void OnSelectAll(wxCommandEvent& event); - - void OnUpdateCut(wxUpdateUIEvent& event); - void OnUpdateCopy(wxUpdateUIEvent& event); - void OnUpdatePaste(wxUpdateUIEvent& event); - void OnUpdateUndo(wxUpdateUIEvent& event); - void OnUpdateRedo(wxUpdateUIEvent& event); - void OnUpdateDelete(wxUpdateUIEvent& event); - void OnUpdateSelectAll(wxUpdateUIEvent& event); - - bool m_ignoreNextUpdate:1; - wxList m_clientDataList; - wxList m_clientObjectList; - int m_prevSelection; - - void DisableEvents(); - void EnableEvents(); - GtkWidget* GetConnectWidget(); - bool IsOwnGtkWindow( GdkWindow *window ); - void DoApplyWidgetStyle(GtkRcStyle *style); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -protected: - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, wxClientDataType type); - - virtual void DoSetItemClientData(unsigned int n, void* clientData); - virtual void* DoGetItemClientData(unsigned int n) const; - - virtual wxSize DoGetBestSize() const; - - // implement wxTextEntry pure virtual methods - virtual wxString DoGetValue() const; - virtual wxWindow *GetEditableWindow() { return this; } - - // Widgets that use the style->base colour for the BG colour should - // override this and return true. - virtual bool UseGTKStyleBase() const { return true; } - -private: - DECLARE_DYNAMIC_CLASS_NO_COPY(wxComboBox) - DECLARE_EVENT_TABLE() -}; - -#endif - -#endif - - // __GTKCOMBOBOXH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/control.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/control.h deleted file mode 100644 index c9b8982088..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/control.h +++ /dev/null @@ -1,104 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/control.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKCONTROLH__ -#define __GTKCONTROLH__ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/list.h" -#include "wx/window.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxControl; - -typedef struct _GtkLabel GtkLabel; -typedef struct _GtkFrame GtkFrame; - -//----------------------------------------------------------------------------- -// wxControl -//----------------------------------------------------------------------------- - -// C-linkage function pointer types for GetDefaultAttributesFromGTKWidget -extern "C" { - typedef GtkWidget* (*wxGtkWidgetNew_t)(void); - typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const char*); - typedef GtkWidget* (*wxGtkWidgetNewFromAdj_t)(GtkAdjustment*); -} - -class WXDLLIMPEXP_CORE wxControl : public wxControlBase -{ -public: - wxControl(); - wxControl(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxControlNameStr) - { - Create(parent, id, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxControlNameStr); - - virtual void SetLabel( const wxString &label ); - virtual wxString GetLabel() const; - - virtual wxVisualAttributes GetDefaultAttributes() const; - -protected: - virtual wxSize DoGetBestSize() const; - void PostCreation(const wxSize& size); - - // sets the label to the given string and also sets it for the given widget - void GTKSetLabelForLabel(GtkLabel *w, const wxString& label); - - // as GTKSetLabelForLabel() but for a GtkFrame widget - void GTKSetLabelForFrame(GtkFrame *w, const wxString& label); - - // remove mnemonics ("&"s) from the label - static wxString GTKRemoveMnemonics(const wxString& label); - - // These are used by GetDefaultAttributes - static wxVisualAttributes - GetDefaultAttributesFromGTKWidget(GtkWidget* widget, - bool useBase = false, - int state = -1); - static wxVisualAttributes - GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t, - bool useBase = false, - int state = -1); - static wxVisualAttributes - GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t, - bool useBase = false, - int state = -1); - - static wxVisualAttributes - GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t, - bool useBase = false, - int state = -1); - - // Widgets that use the style->base colour for the BG colour should - // override this and return true. - virtual bool UseGTKStyleBase() const { return false; } - - // this field contains the label in wx format, i.e. with "&" mnemonics - wxString m_label; - -private: - DECLARE_DYNAMIC_CLASS(wxControl) -}; - -#endif // __GTKCONTROLH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/cursor.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/cursor.h deleted file mode 100644 index 15b041183f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/cursor.h +++ /dev/null @@ -1,62 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/cursor.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKCURSORH__ -#define __GTKCURSORH__ - -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" - -#if wxUSE_IMAGE -#include "wx/image.h" -#endif - -//----------------------------------------------------------------------------- -// wxCursor -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject -{ -public: - wxCursor(); - wxCursor(wxStockCursor id) { InitFromStock(id); } -#if WXWIN_COMPATIBILITY_2_8 - wxCursor(int id) { InitFromStock((wxStockCursor)id); } -#endif -#if wxUSE_IMAGE - wxCursor( const wxImage & image ); -#endif - wxCursor( const char bits[], int width, int height, - int hotSpotX=-1, int hotSpotY=-1, - const char maskBits[] = NULL, - const wxColour* fg = NULL, const wxColour* bg = NULL); - - /* WARNING: the following ctor is missing: - - wxCursor(const wxString& name, - wxBitmapType type = wxCURSOR_DEFAULT_TYPE, - int hotSpotX = 0, int hotSpotY = 0); - */ - - virtual ~wxCursor(); - - // implementation - - GdkCursor *GetCursor() const; - -protected: - void InitFromStock(wxStockCursor); - - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - -private: - DECLARE_DYNAMIC_CLASS(wxCursor) -}; - -#endif // __GTKCURSORH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dataform.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dataform.h deleted file mode 100644 index bfdab5e596..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dataform.h +++ /dev/null @@ -1,74 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/dataform.h -// Purpose: declaration of the wxDataFormat class -// Author: Vadim Zeitlin -// Modified by: -// Created: 19.10.99 (extracted from gtk/dataobj.h) -// Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_DATAFORM_H -#define _WX_GTK_DATAFORM_H - -class WXDLLIMPEXP_CORE wxDataFormat -{ -public: - // the clipboard formats under GDK are GdkAtoms - typedef GdkAtom NativeFormat; - - wxDataFormat(); - wxDataFormat( wxDataFormatId type ); - wxDataFormat( NativeFormat format ); - - // we have to provide all the overloads to allow using strings instead of - // data formats (as a lot of existing code does) - wxDataFormat( const wxString& id ) { InitFromString(id); } - wxDataFormat( const char *id ) { InitFromString(id); } - wxDataFormat( const wchar_t *id ) { InitFromString(id); } - wxDataFormat( const wxCStrData& id ) { InitFromString(id); } - - - wxDataFormat& operator=(const wxDataFormat& format) - { m_type = format.m_type; m_format = format.m_format; return *this; } - wxDataFormat& operator=(NativeFormat format) - { SetId(format); return *this; } - - // comparison (must have both versions) - bool operator==(NativeFormat format) const - { return m_format == (NativeFormat)format; } - bool operator!=(NativeFormat format) const - { return m_format != (NativeFormat)format; } - bool operator==(wxDataFormatId format) const - { return m_type == (wxDataFormatId)format; } - bool operator!=(wxDataFormatId format) const - { return m_type != (wxDataFormatId)format; } - - // explicit and implicit conversions to NativeFormat which is one of - // standard data types (implicit conversion is useful for preserving the - // compatibility with old code) - NativeFormat GetFormatId() const { return m_format; } - operator NativeFormat() const { return m_format; } - - void SetId( NativeFormat format ); - - // string ids are used for custom types - this SetId() must be used for - // application-specific formats - wxString GetId() const; - void SetId( const wxString& id ); - - // implementation - wxDataFormatId GetType() const; - void SetType( wxDataFormatId type ); - -private: - // common part of ctors from format name - void InitFromString(const wxString& id); - - wxDataFormatId m_type; - NativeFormat m_format; - - void PrepareFormats(); -}; - -#endif // _WX_GTK_DATAFORM_H diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dataobj.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dataobj.h deleted file mode 100644 index 16bfe64eff..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dataobj.h +++ /dev/null @@ -1,26 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/dataobj.h -// Purpose: declaration of the wxDataObject -// Author: Robert Roebling -// Copyright: (c) 1998, 1999 Vadim Zeitlin, Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_DATAOBJ_H_ -#define _WX_GTK_DATAOBJ_H_ - -// ---------------------------------------------------------------------------- -// wxDataObject is the same as wxDataObjectBase under wxGTK -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase -{ -public: - wxDataObject(); - virtual ~wxDataObject(); - - virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const; -}; - -#endif // _WX_GTK_DATAOBJ_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dataobj2.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dataobj2.h deleted file mode 100644 index b847242cfc..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dataobj2.h +++ /dev/null @@ -1,84 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/dataobj2.h -// Purpose: declaration of standard wxDataObjectSimple-derived classes -// Author: Robert Roebling -// Created: 19.10.99 (extracted from gtk/dataobj.h) -// Copyright: (c) 1998, 1999 Vadim Zeitlin, Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_DATAOBJ2_H_ -#define _WX_GTK_DATAOBJ2_H_ - -// ---------------------------------------------------------------------------- -// wxBitmapDataObject is a specialization of wxDataObject for bitmaps -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase -{ -public: - // ctors - wxBitmapDataObject(); - wxBitmapDataObject(const wxBitmap& bitmap); - - // destr - virtual ~wxBitmapDataObject(); - - // override base class virtual to update PNG data too - virtual void SetBitmap(const wxBitmap& bitmap); - - // implement base class pure virtuals - // ---------------------------------- - - virtual size_t GetDataSize() const { return m_pngSize; } - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); - -protected: - void Init() { m_pngData = NULL; m_pngSize = 0; } - void Clear() { free(m_pngData); } - void ClearAll() { Clear(); Init(); } - - size_t m_pngSize; - void *m_pngData; - - void DoConvertToPng(); - -private: - // virtual function hiding supression - size_t GetDataSize(const wxDataFormat& format) const - { return(wxDataObjectSimple::GetDataSize(format)); } - bool GetDataHere(const wxDataFormat& format, void* pBuf) const - { return(wxDataObjectSimple::GetDataHere(format, pBuf)); } - bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf) - { return(wxDataObjectSimple::SetData(format, nLen, pBuf)); } -}; - -// ---------------------------------------------------------------------------- -// wxFileDataObject is a specialization of wxDataObject for file names -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase -{ -public: - // implement base class pure virtuals - // ---------------------------------- - - void AddFile( const wxString &filename ); - - virtual size_t GetDataSize() const; - virtual bool GetDataHere(void *buf) const; - virtual bool SetData(size_t len, const void *buf); - -private: - // virtual function hiding supression - size_t GetDataSize(const wxDataFormat& format) const - { return(wxDataObjectSimple::GetDataSize(format)); } - bool GetDataHere(const wxDataFormat& format, void* pBuf) const - { return(wxDataObjectSimple::GetDataHere(format, pBuf)); } - bool SetData(const wxDataFormat& format, size_t nLen, const void* pBuf) - { return(wxDataObjectSimple::SetData(format, nLen, pBuf)); } -}; - -#endif // _WX_GTK_DATAOBJ2_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dc.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dc.h deleted file mode 100644 index a6d571f8eb..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dc.h +++ /dev/null @@ -1,64 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/dc.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKDCH__ -#define __GTKDCH__ - -#include "wx/dc.h" - -//----------------------------------------------------------------------------- -// wxDC -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGTKDCImpl : public wxDCImpl -{ -public: - wxGTKDCImpl(wxDC *owner); - virtual ~wxGTKDCImpl() { } - -#if wxUSE_PALETTE - void SetColourMap( const wxPalette& palette ) { SetPalette(palette); } -#endif // wxUSE_PALETTE - - // Resolution in pixels per logical inch - virtual wxSize GetPPI() const; - - virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; } - virtual void EndDoc() { } - virtual void StartPage() { } - virtual void EndPage() { } - - virtual GdkWindow* GetGDKWindow() const { return NULL; } - -public: - // implementation - wxCoord XDEV2LOG(wxCoord x) const { return DeviceToLogicalX(x); } - wxCoord XDEV2LOGREL(wxCoord x) const { return DeviceToLogicalXRel(x); } - wxCoord YDEV2LOG(wxCoord y) const { return DeviceToLogicalY(y); } - wxCoord YDEV2LOGREL(wxCoord y) const { return DeviceToLogicalYRel(y); } - wxCoord XLOG2DEV(wxCoord x) const { return LogicalToDeviceX(x); } - wxCoord XLOG2DEVREL(wxCoord x) const { return LogicalToDeviceXRel(x); } - wxCoord YLOG2DEV(wxCoord y) const { return LogicalToDeviceY(y); } - wxCoord YLOG2DEVREL(wxCoord y) const { return LogicalToDeviceYRel(y); } - - // base class pure virtuals implemented here - virtual void DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height); - virtual void DoGetSizeMM(int* width, int* height) const; - -private: - DECLARE_ABSTRACT_CLASS(wxDC) -}; - -// this must be defined when wxDC::Blit() honours the DC origian and needed to -// allow wxUniv code in univ/winuniv.cpp to work with versions of wxGTK -// 2.3.[23] -#ifndef wxHAS_WORKING_GTK_DC_BLIT - #define wxHAS_WORKING_GTK_DC_BLIT -#endif - -#endif // __GTKDCH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dcclient.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dcclient.h deleted file mode 100644 index 142268273a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dcclient.h +++ /dev/null @@ -1,161 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/dcclient.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKDCCLIENTH__ -#define __GTKDCCLIENTH__ - -#include "wx/gtk1/dc.h" -#include "wx/window.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxWindowDCImpl; -class WXDLLIMPEXP_FWD_CORE wxPaintDCImpl; -class WXDLLIMPEXP_FWD_CORE wxClientDCImpl; - -//----------------------------------------------------------------------------- -// wxWindowDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxGTKDCImpl -{ -public: - wxWindowDCImpl(wxDC *owner); - wxWindowDCImpl(wxDC *owner, wxWindow *win); - - virtual ~wxWindowDCImpl(); - - virtual bool CanDrawBitmap() const { return true; } - virtual bool CanGetTextExtent() const { return true; } - -protected: - virtual void DoGetSize(int *width, int *height) const; - virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col, wxFloodFillStyle style=wxFLOOD_SURFACE ); - virtual bool DoGetPixel( wxCoord x1, wxCoord y1, wxColour *col ) const; - - virtual void DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ); - virtual void DoCrossHair( wxCoord x, wxCoord y ); - virtual void DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, - wxCoord xc, wxCoord yc ); - virtual void DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord width, wxCoord height, - double sa, double ea ); - virtual void DoDrawPoint( wxCoord x, wxCoord y ); - - virtual void DoDrawLines(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset); - virtual void DoDrawPolygon(int n, const wxPoint points[], - wxCoord xoffset, wxCoord yoffset, - wxPolygonFillMode fillStyle = wxODDEVEN_RULE); - - virtual void DoDrawRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); - virtual void DoDrawRoundedRectangle( wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius = 20.0 ); - virtual void DoDrawEllipse( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); - - virtual void DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ); - virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y, - bool useMask = false ); - - virtual bool DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, - wxDC *source, wxCoord xsrc, wxCoord ysrc, - wxRasterOperationMode logical_func = wxCOPY, bool useMask = false, - wxCoord xsrcMask = -1, wxCoord ysrcMask = -1 ); - - virtual void DoDrawText( const wxString &text, wxCoord x, wxCoord y ); - virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, - double angle); - virtual void DoGetTextExtent( const wxString &string, - wxCoord *width, wxCoord *height, - wxCoord *descent = NULL, - wxCoord *externalLeading = NULL, - const wxFont *theFont = NULL) const; - -public: - virtual wxCoord GetCharWidth() const; - virtual wxCoord GetCharHeight() const; - - virtual void Clear(); - - virtual void SetFont( const wxFont &font ); - virtual void SetPen( const wxPen &pen ); - virtual void SetBrush( const wxBrush &brush ); - virtual void SetBackground( const wxBrush &brush ); - virtual void SetLogicalFunction( wxRasterOperationMode function ); - virtual void SetTextForeground( const wxColour &col ); - virtual void SetTextBackground( const wxColour &col ); - virtual void SetBackgroundMode( int mode ); - virtual void SetPalette( const wxPalette& palette ); - - virtual void DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ); - virtual void DestroyClippingRegion(); - virtual void DoSetDeviceClippingRegion( const wxRegion ®ion ); - - // Resolution in pixels per logical inch - virtual wxSize GetPPI() const; - virtual int GetDepth() const; - - virtual GdkWindow* GetGDKWindow() const { return m_window; } - - // implementation - // -------------- - - GdkWindow *m_window; - GdkGC *m_penGC; - GdkGC *m_brushGC; - GdkGC *m_textGC; - GdkGC *m_bgGC; - GdkColormap *m_cmap; - bool m_isMemDC; - bool m_isScreenDC; - wxWindow *m_owner; - wxRegion m_currentClippingRegion; - wxRegion m_paintClippingRegion; - - void SetUpDC(); - void Destroy(); - virtual void ComputeScaleAndOrigin(); - - GdkWindow *GetWindow() { return m_window; } - -private: - DECLARE_DYNAMIC_CLASS(wxWindowDCImpl) -}; - -//----------------------------------------------------------------------------- -// wxClientDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl -{ -public: - wxClientDCImpl(wxDC *owner) : wxWindowDCImpl(owner) { } - wxClientDCImpl(wxDC *owner, wxWindow *win); - -protected: - virtual void DoGetSize(int *width, int *height) const; - -private: - DECLARE_DYNAMIC_CLASS(wxClientDCImpl) -}; - -//----------------------------------------------------------------------------- -// wxPaintDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl -{ -public: - wxPaintDCImpl(wxDC *owner) : wxClientDCImpl(owner) { } - wxPaintDCImpl(wxDC *owner, wxWindow *win); - -private: - DECLARE_DYNAMIC_CLASS(wxPaintDCImpl) -}; - -#endif // __GTKDCCLIENTH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dcmemory.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dcmemory.h deleted file mode 100644 index 0c55c755d8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dcmemory.h +++ /dev/null @@ -1,68 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/dcmemory.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKDCMEMORYH__ -#define __GTKDCMEMORYH__ - -#include "wx/dcmemory.h" -#include "wx/gtk1/dcclient.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxMemoryDCImpl; - -//----------------------------------------------------------------------------- -// wxMemoryDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxWindowDCImpl -{ -public: - wxMemoryDCImpl(wxMemoryDC *owner) - : wxWindowDCImpl(owner) - { - Init(); - } - - wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap) - : wxWindowDCImpl(owner) - { - Init(); - - DoSelect(bitmap); - } - - wxMemoryDCImpl(wxMemoryDC *owner, wxDC *dc); - virtual ~wxMemoryDCImpl(); - - virtual void DoSelect(const wxBitmap& bitmap); - virtual void DoGetSize( int *width, int *height ) const; - - // these get reimplemented for mono-bitmaps to behave - // more like their Win32 couterparts. They now interpret - // wxWHITE, wxWHITE_BRUSH and wxWHITE_PEN as drawing 0 - // and everything else as drawing 1. - virtual void SetPen( const wxPen &pen ); - virtual void SetBrush( const wxBrush &brush ); - virtual void SetBackground( const wxBrush &brush ); - virtual void SetTextForeground( const wxColour &col ); - virtual void SetTextBackground( const wxColour &col ); - - // implementation - wxBitmap m_selected; - -private: - void Init(); - - DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl) -}; - -#endif // __GTKDCMEMORYH__ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dcscreen.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dcscreen.h deleted file mode 100644 index 17adad8811..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dcscreen.h +++ /dev/null @@ -1,38 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/dcscreen.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKDCSCREENH__ -#define __GTKDCSCREENH__ - -#include "wx/gtk1/dcclient.h" - -//----------------------------------------------------------------------------- -// wxScreenDCImpl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxPaintDCImpl -{ -public: - wxScreenDCImpl(wxScreenDC *owner); - virtual ~wxScreenDCImpl(); - - // implementation - - static GdkWindow *sm_overlayWindow; - static int sm_overlayWindowX; - static int sm_overlayWindowY; - -protected: - virtual void DoGetSize(int *width, int *height) const; - -private: - DECLARE_DYNAMIC_CLASS(wxScreenDCImpl) -}; - -#endif // __GTKDCSCREENH__ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dialog.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dialog.h deleted file mode 100644 index a5adcebec5..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dialog.h +++ /dev/null @@ -1,64 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/dialog.h -// Purpose: -// Author: Robert Roebling -// Created: -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKDIALOGH__ -#define __GTKDIALOGH__ - -//----------------------------------------------------------------------------- -// wxDialog -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase -{ -public: - wxDialog() { Init(); } - wxDialog( wxWindow *parent, wxWindowID id, - const wxString &title, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString &name = wxDialogNameStr ); - bool Create( wxWindow *parent, wxWindowID id, - const wxString &title, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = wxDEFAULT_DIALOG_STYLE, - const wxString &name = wxDialogNameStr ); - virtual ~wxDialog() {} - - void OnApply( wxCommandEvent &event ); - void OnCancel( wxCommandEvent &event ); - void OnOK( wxCommandEvent &event ); - void OnPaint( wxPaintEvent& event ); - void OnCloseWindow( wxCloseEvent& event ); - /* - void OnCharHook( wxKeyEvent& event ); - */ - - virtual bool Show( bool show = TRUE ); - virtual int ShowModal(); - virtual void EndModal( int retCode ); - virtual bool IsModal() const; - void SetModal( bool modal ); - - // implementation - // -------------- - - bool m_modalShowing; - -protected: - // common part of all ctors - void Init(); - -private: - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxDialog) -}; - -#endif // __GTKDIALOGH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dnd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dnd.h deleted file mode 100644 index 11832ed3f3..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/dnd.h +++ /dev/null @@ -1,129 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/dnd.h -// Purpose: declaration of the wxDropTarget class -// Author: Robert Roebling -// Copyright: (c) 1998 Vadim Zeitlin, Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKDNDH__ -#define __GTKDNDH__ - -#if wxUSE_DRAG_AND_DROP - -#include "wx/object.h" -#include "wx/string.h" -#include "wx/dataobj.h" -#include "wx/cursor.h" -#include "wx/icon.h" -#include "wx/gdicmn.h" - -//------------------------------------------------------------------------- -// classes -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxWindow; - -class WXDLLIMPEXP_FWD_CORE wxDropTarget; -class WXDLLIMPEXP_FWD_CORE wxTextDropTarget; -class WXDLLIMPEXP_FWD_CORE wxFileDropTarget; - -class WXDLLIMPEXP_FWD_CORE wxDropSource; - -// ---------------------------------------------------------------------------- -// macros -// ---------------------------------------------------------------------------- - -// this macro may be used instead for wxDropSource ctor arguments: it will use -// the icon 'name' from an XPM file under GTK, but will expand to something -// else under MSW. If you don't use it, you will have to use #ifdef in the -// application code. -#define wxDROP_ICON(name) wxICON(name) - -//------------------------------------------------------------------------- -// wxDropTarget -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase -{ -public: - wxDropTarget(wxDataObject *dataObject = NULL ); - - virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def); - virtual bool OnDrop(wxCoord x, wxCoord y); - virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def); - virtual bool GetData(); - - // implementation - - GdkAtom GetMatchingPair(bool quiet = false); - - void RegisterWidget( GtkWidget *widget ); - void UnregisterWidget( GtkWidget *widget ); - - GdkDragContext *m_dragContext; - GtkWidget *m_dragWidget; - GtkSelectionData *m_dragData; - unsigned m_dragTime; - bool m_firstMotion; // gdk has no "gdk_drag_enter" event - - void SetDragContext( GdkDragContext *dc ) { m_dragContext = dc; } - void SetDragWidget( GtkWidget *w ) { m_dragWidget = w; } - void SetDragData( GtkSelectionData *sd ) { m_dragData = sd; } - void SetDragTime(unsigned time) { m_dragTime = time; } -}; - -//------------------------------------------------------------------------- -// wxDropSource -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase -{ -public: - // constructor. set data later with SetData() - wxDropSource( wxWindow *win = NULL, - const wxIcon © = wxNullIcon, - const wxIcon &move = wxNullIcon, - const wxIcon &none = wxNullIcon); - - // constructor for setting one data object - wxDropSource( wxDataObject& data, - wxWindow *win, - const wxIcon © = wxNullIcon, - const wxIcon &move = wxNullIcon, - const wxIcon &none = wxNullIcon); - - virtual ~wxDropSource(); - - // start drag action - virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly); - - // GTK implementation - void RegisterWindow(); - void UnregisterWindow(); - - void PrepareIcon( int action, GdkDragContext *context ); - - GtkWidget *m_widget; - GtkWidget *m_iconWindow; - GdkDragContext *m_dragContext; - wxWindow *m_window; - - wxDragResult m_retValue; - wxIcon m_iconCopy, - m_iconMove, - m_iconNone; - - bool m_waiting; - -private: - // common part of both ctors - void SetIcons(const wxIcon& copy, - const wxIcon& move, - const wxIcon& none); -}; - -#endif // wxUSE_DRAG_AND_DROP - -#endif //__GTKDNDH__ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/filedlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/filedlg.h deleted file mode 100644 index 41ed774ea4..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/filedlg.h +++ /dev/null @@ -1,68 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/filedlg.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKFILEDLGH__ -#define __GTKFILEDLGH__ - -#include "wx/generic/filedlgg.h" - -//------------------------------------------------------------------------- -// wxFileDialog -//------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFileDialog: public wxGenericFileDialog -{ -public: - wxFileDialog() { } - - wxFileDialog(wxWindow *parent, - const wxString& message = wxFileSelectorPromptStr, - const wxString& defaultDir = wxEmptyString, - const wxString& defaultFile = wxEmptyString, - const wxString& wildCard = wxFileSelectorDefaultWildcardStr, - long style = wxFD_DEFAULT_STYLE, - const wxPoint& pos = wxDefaultPosition, - const wxSize& sz = wxDefaultSize, - const wxString& name = wxFileDialogNameStr); - - virtual ~wxFileDialog(); - - virtual wxString GetPath() const; - virtual void GetPaths(wxArrayString& paths) const; - virtual wxString GetDirectory() const; - virtual wxString GetFilename() const; - virtual void GetFilenames(wxArrayString& files) const; - virtual int GetFilterIndex() const; - - virtual void SetMessage(const wxString& message); - virtual void SetPath(const wxString& path); - virtual void SetDirectory(const wxString& dir); - virtual void SetFilename(const wxString& name); - virtual void SetWildcard(const wxString& wildCard); - virtual void SetFilterIndex(int filterIndex); - - virtual int ShowModal(); - virtual bool Show( bool show = true ); - -//private: - bool m_destroyed_by_delete; - - // override this from wxTLW since the native - // form doesn't have any m_wxwindow - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - - -private: - DECLARE_DYNAMIC_CLASS(wxFileDialog) - DECLARE_EVENT_TABLE() - void OnFakeOk( wxCommandEvent &event ); -}; - -#endif // __GTKFILEDLGH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/font.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/font.h deleted file mode 100644 index b240152149..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/font.h +++ /dev/null @@ -1,141 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/font.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKFONTH__ -#define __GTKFONTH__ - -#include "wx/hash.h" - -// ---------------------------------------------------------------------------- -// classes -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxDC; -class WXDLLIMPEXP_FWD_CORE wxPaintDC; -class WXDLLIMPEXP_FWD_CORE wxWindow; - -class WXDLLIMPEXP_FWD_CORE wxFont; - -// ---------------------------------------------------------------------------- -// wxFont -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFont : public wxFontBase -{ -public: - // ctors and such - wxFont() { } - - wxFont(const wxFontInfo& info) - { - Create(info.GetPointSize(), - info.GetFamily(), - info.GetStyle(), - info.GetWeight(), - info.IsUnderlined(), - info.GetFaceName(), - info.GetEncoding()); - - if ( info.IsUsingSizeInPixels() ) - SetPixelSize(info.GetPixelSize()); - } - - wxFont(const wxString& fontname) - { - Create(fontname); - } - - wxFont(const wxNativeFontInfo& info); - -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxFont(int size, - int family, - int style, - int weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding); - } -#endif - - wxFont(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - Create(size, family, style, weight, underlined, face, encoding); - } - - wxFont(const wxSize& pixelSize, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT) - { - Create(10, family, style, weight, underlined, face, encoding); - SetPixelSize(pixelSize); - } - - bool Create(int size, - wxFontFamily family, - wxFontStyle style, - wxFontWeight weight, - bool underlined = false, - const wxString& face = wxEmptyString, - wxFontEncoding encoding = wxFONTENCODING_DEFAULT); - - - // wxGTK-specific - bool Create(const wxString& fontname); - - virtual ~wxFont(); - - // implement base class pure virtuals - virtual int GetPointSize() const; - virtual wxFontStyle GetStyle() const; - virtual wxFontWeight GetWeight() const; - virtual wxString GetFaceName() const; - virtual bool GetUnderlined() const; - virtual wxFontEncoding GetEncoding() const; - virtual const wxNativeFontInfo *GetNativeFontInfo() const; - virtual bool IsFixedWidth() const; - - virtual void SetPointSize( int pointSize ); - virtual void SetFamily(wxFontFamily family); - virtual void SetStyle(wxFontStyle style); - virtual void SetWeight(wxFontWeight weight); - virtual bool SetFaceName( const wxString& faceName ); - virtual void SetUnderlined( bool underlined ); - virtual void SetEncoding(wxFontEncoding encoding); - - wxDECLARE_COMMON_FONT_METHODS(); - - // implementation from now on - void Unshare(); - - GdkFont* GetInternalFont(float scale = 1.0) const; - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info ); - virtual wxFontFamily DoGetFamily() const; - -private: - DECLARE_DYNAMIC_CLASS(wxFont) -}; - -#endif // __GTKFONTH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/fontdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/fontdlg.h deleted file mode 100644 index bb82bf8d9a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/fontdlg.h +++ /dev/null @@ -1,50 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/fontdlg.h -// Purpose: wxFontDialog -// Author: Robert Roebling -// Created: -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTK_FONTDLGH__ -#define __GTK_FONTDLGH__ - -//----------------------------------------------------------------------------- -// wxFontDialog -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFontDialog : public wxFontDialogBase -{ -public: - wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ } - wxFontDialog(wxWindow *parent) - : wxFontDialogBase(parent) { Create(parent); } - wxFontDialog(wxWindow *parent, const wxFontData& data) - : wxFontDialogBase(parent, data) { Create(parent, data); } - - virtual ~wxFontDialog(); - - // implementation only - void SetChosenFont(const char *name); - -#if WXWIN_COMPATIBILITY_2_6 - // deprecated interface, don't use - wxDEPRECATED( wxFontDialog(wxWindow *parent, const wxFontData *data) ); -#endif // WXWIN_COMPATIBILITY_2_6 - -protected: - // create the GTK dialog - virtual bool DoCreate(wxWindow *parent); - -private: - DECLARE_DYNAMIC_CLASS(wxFontDialog) -}; - -#if WXWIN_COMPATIBILITY_2_6 - // deprecated interface, don't use -inline wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData *data) - : wxFontDialogBase(parent) { InitFontData(data); Create(parent); } -#endif // WXWIN_COMPATIBILITY_2_6 - -#endif diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/frame.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/frame.h deleted file mode 100644 index 12d0984a64..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/frame.h +++ /dev/null @@ -1,108 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/frame.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKFRAMEH__ -#define __GTKFRAMEH__ - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; -class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; -class WXDLLIMPEXP_FWD_CORE wxMenu; -class WXDLLIMPEXP_FWD_CORE wxMenuBar; -class WXDLLIMPEXP_FWD_CORE wxToolBar; -class WXDLLIMPEXP_FWD_CORE wxStatusBar; - -//----------------------------------------------------------------------------- -// wxFrame -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase -{ -public: - // construction - wxFrame() { Init(); } - wxFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - - Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - virtual ~wxFrame(); - -#if wxUSE_STATUSBAR - virtual void PositionStatusBar(); - - virtual wxStatusBar* CreateStatusBar(int number = 1, - long style = wxSTB_DEFAULT_STYLE, - wxWindowID id = 0, - const wxString& name = wxStatusLineNameStr); - - void SetStatusBar(wxStatusBar *statbar); -#endif // wxUSE_STATUSBAR - -#if wxUSE_TOOLBAR - virtual wxToolBar* CreateToolBar(long style = -1, - wxWindowID id = -1, - const wxString& name = wxToolBarNameStr); - void SetToolBar(wxToolBar *toolbar); -#endif // wxUSE_TOOLBAR - - wxPoint GetClientAreaOrigin() const { return wxPoint(0, 0); } - - // implementation from now on - // -------------------------- - - // GTK callbacks - virtual void GtkOnSize( int x, int y, int width, int height ); - virtual void OnInternalIdle(); - - bool m_menuBarDetached; - int m_menuBarHeight; - bool m_toolBarDetached; - -protected: - // common part of all ctors - void Init(); - - // override wxWindow methods to take into account tool/menu/statusbars - virtual void DoSetClientSize(int width, int height); - virtual void DoGetClientSize( int *width, int *height ) const; - -#if wxUSE_MENUS_NATIVE - - virtual void DetachMenuBar(); - virtual void AttachMenuBar(wxMenuBar *menubar); - -public: - // Menu size is dynamic now, call this whenever it might change. - void UpdateMenuBarSize(); - -#endif // wxUSE_MENUS_NATIVE - - DECLARE_DYNAMIC_CLASS(wxFrame) -}; - -#endif // __GTKFRAMEH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/gauge.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/gauge.h deleted file mode 100644 index 2d8aa5c8d9..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/gauge.h +++ /dev/null @@ -1,80 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/gauge.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKGAUGEH__ -#define __GTKGAUGEH__ - -//----------------------------------------------------------------------------- -// wxGaugeBox -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase -{ -public: - wxGauge() { Init(); } - - wxGauge( wxWindow *parent, - wxWindowID id, - int range, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxGA_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxGaugeNameStr ) - { - Init(); - - Create(parent, id, range, pos, size, style, validator, name); - } - - bool Create( wxWindow *parent, - wxWindowID id, int range, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxGA_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxGaugeNameStr ); - - void SetShadowWidth( int WXUNUSED(w) ) { } - void SetBezelFace( int WXUNUSED(w) ) { } - void SetRange( int r ); - void SetValue( int pos ); - int GetShadowWidth() const { return 0; } - int GetBezelFace() const { return 0; } - int GetRange() const; - int GetValue() const; - - bool IsVertical() const { return HasFlag(wxGA_VERTICAL); } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - // ------------- - - // the max and current gauge values - int m_rangeMax, - m_gaugePos; - -protected: - // common part of all ctors - void Init() { m_rangeMax = m_gaugePos = 0; } - - // set the gauge value to the value of m_gaugePos - void DoSetGauge(); - - virtual wxSize DoGetBestSize() const; - - virtual wxVisualAttributes GetDefaultAttributes() const; - -private: - DECLARE_DYNAMIC_CLASS(wxGauge) -}; - -#endif - // __GTKGAUGEH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/glcanvas.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/glcanvas.h deleted file mode 100644 index 222225e0d9..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/glcanvas.h +++ /dev/null @@ -1,108 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/glcanvas.h -// Purpose: wxGLCanvas, for using OpenGL/Mesa with wxWidgets and GTK -// Author: Robert Roebling -// Modified by: -// Created: 17/8/98 -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GLCANVAS_H_ -#define _WX_GLCANVAS_H_ - -#include "wx/unix/glx11.h" - -//--------------------------------------------------------------------------- -// wxGLCanvas -//--------------------------------------------------------------------------- - -class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasX11 -{ -public: - wxGLCanvas(wxWindow *parent, - wxWindowID id = wxID_ANY, - const int *attribList = NULL, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const wxPalette& palette = wxNullPalette); - - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette); - - - // implement wxGLCanvasX11 methods - // ------------------------------- - - virtual Window GetXWindow() const; - - - // deprecated methods - // ------------------ - -#if WXWIN_COMPATIBILITY_2_8 - wxDEPRECATED_CONSTRUCTOR( - wxGLCanvas(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette) - ); - - wxDEPRECATED_CONSTRUCTOR( - wxGLCanvas(wxWindow *parent, - const wxGLContext *shared, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette) - ); - - wxDEPRECATED_CONSTRUCTOR( - wxGLCanvas(wxWindow *parent, - const wxGLCanvas *shared, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxGLCanvasName, - const int *attribList = NULL, - const wxPalette& palette = wxNullPalette) - ); - - // called from "realized" callback to create the implicit context if needed - void GTKInitImplicitContext(); -#endif // WXWIN_COMPATIBILITY_2_8 - - // implementation from now on - virtual void OnInternalIdle(); - - - GtkWidget *m_glWidget; - -#if WXWIN_COMPATIBILITY_2_8 - wxGLContext *m_sharedContext; - wxGLCanvas *m_sharedContextOf; - const bool m_createImplicitContext; -#endif // WXWIN_COMPATIBILITY_2_8 - -private: - DECLARE_CLASS(wxGLCanvas) -}; - -#endif // _WX_GLCANVAS_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/listbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/listbox.h deleted file mode 100644 index 96968fc153..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/listbox.h +++ /dev/null @@ -1,139 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/listbox.h -// Purpose: wxListBox class declaration -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKLISTBOXH__ -#define __GTKLISTBOXH__ - -#include "wx/list.h" - -typedef struct _GtkList GtkList; - -class WXDLLIMPEXP_FWD_BASE wxSortedArrayString; - -//----------------------------------------------------------------------------- -// wxListBox -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase -{ -public: - // ctors and such - wxListBox(); - wxListBox( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (const wxString *) NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr ) - { -#if wxUSE_CHECKLISTBOX - m_hasCheckBoxes = false; -#endif // wxUSE_CHECKLISTBOX - Create(parent, id, pos, size, n, choices, style, validator, name); - } - wxListBox( wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr ) - { -#if wxUSE_CHECKLISTBOX - m_hasCheckBoxes = false; -#endif // wxUSE_CHECKLISTBOX - Create(parent, id, pos, size, choices, style, validator, name); - } - virtual ~wxListBox(); - - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, const wxString choices[] = (const wxString *) NULL, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - bool Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxListBoxNameStr); - - // implement base class pure virtuals - virtual void DoClear(); - virtual void DoDeleteOneItem(unsigned int n); - - virtual unsigned int GetCount() const; - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& s); - virtual int FindString(const wxString& s, bool bCase = false) const; - - virtual bool IsSelected(int n) const; - virtual void DoSetSelection(int n, bool select); - virtual int GetSelection() const; - virtual int GetSelections(wxArrayInt& aSelections) const; - - virtual int DoInsertItems(const wxArrayStringsAdapter& items, - unsigned int pos, - void **clientData, wxClientDataType type); - - virtual void DoSetFirstItem(int n); - - virtual void DoSetItemClientData(unsigned int n, void* clientData); - virtual void* DoGetItemClientData(unsigned int n) const; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation from now on - - void GtkAddItem( const wxString &item, int pos=-1 ); - int GtkGetIndex( GtkWidget *item ) const; - GtkWidget *GetConnectWidget(); - bool IsOwnGtkWindow( GdkWindow *window ); - void DoApplyWidgetStyle(GtkRcStyle *style); - void OnInternalIdle(); - -#if wxUSE_TOOLTIPS - void ApplyToolTip( GtkTooltips *tips, const wxChar *tip ); -#endif // wxUSE_TOOLTIPS - - GtkList *m_list; - wxList m_clientList; - -#if wxUSE_CHECKLISTBOX - bool m_hasCheckBoxes; -#endif // wxUSE_CHECKLISTBOX - - int m_prevSelection; - bool m_blockEvent; - - virtual void FixUpMouseEvent(GtkWidget *widget, wxCoord& x, wxCoord& y); - -protected: - virtual wxSize DoGetBestSize() const; - - // return the string label for the given item - wxString GetRealLabel(struct _GList *item) const; - - // Widgets that use the style->base colour for the BG colour should - // override this and return true. - virtual bool UseGTKStyleBase() const { return true; } - -private: - // this array is only used for controls with wxCB_SORT style, so only - // allocate it if it's needed (hence using pointer) - wxSortedArrayString *m_strings; - - DECLARE_DYNAMIC_CLASS(wxListBox) -}; - -#endif // __GTKLISTBOXH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/mdi.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/mdi.h deleted file mode 100644 index 301ab4c482..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/mdi.h +++ /dev/null @@ -1,147 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/mdi.h -// Purpose: TDI-based MDI implementation for wxGTK1 -// Author: Robert Roebling -// Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes -// Copyright: (c) 1998 Robert Roebling -// (c) 2008 Vadim Zeitlin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK1_MDI_H_ -#define _WX_GTK1_MDI_H_ - -#include "wx/frame.h" - -class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; -class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; - -typedef struct _GtkNotebook GtkNotebook; - -//----------------------------------------------------------------------------- -// wxMDIParentFrame -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxMDIParentFrameBase -{ -public: - wxMDIParentFrame() { Init(); } - wxMDIParentFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr) - { - Init(); - - (void)Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, - const wxString& name = wxFrameNameStr); - - // we don't store the active child in m_currentChild unlike the base class - // version so override this method to find it dynamically - virtual wxMDIChildFrame *GetActiveChild() const; - - // implement base class pure virtuals - // ---------------------------------- - - virtual void ActivateNext(); - virtual void ActivatePrevious(); - - static bool IsTDI() { return true; } - - // implementation - - bool m_justInserted; - - virtual void GtkOnSize( int x, int y, int width, int height ); - virtual void OnInternalIdle(); - -private: - void Init(); - - DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) -}; - -//----------------------------------------------------------------------------- -// wxMDIChildFrame -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxTDIChildFrame -{ -public: - wxMDIChildFrame() { Init(); } - wxMDIChildFrame(wxMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - - Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxMDIParentFrame *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - virtual ~wxMDIChildFrame(); - - virtual void SetMenuBar( wxMenuBar *menu_bar ); - virtual wxMenuBar *GetMenuBar() const; - - virtual void Activate(); - - virtual void SetTitle(const wxString& title); - - // implementation - - void OnActivate( wxActivateEvent& event ); - void OnMenuHighlight( wxMenuEvent& event ); - - wxMenuBar *m_menuBar; - GtkNotebookPage *m_page; - bool m_justInserted; - -private: - void Init(); - - GtkNotebook *GTKGetNotebook() const; - - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxMDIChildFrame) -}; - -//----------------------------------------------------------------------------- -// wxMDIClientWindow -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase -{ -public: - wxMDIClientWindow() { } - - virtual bool CreateClient(wxMDIParentFrame *parent, - long style = wxVSCROLL | wxHSCROLL); - -private: - DECLARE_DYNAMIC_CLASS(wxMDIClientWindow) -}; - -#endif // _WX_GTK1_MDI_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/menu.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/menu.h deleted file mode 100644 index b3285c7d11..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/menu.h +++ /dev/null @@ -1,101 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/menu.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKMENUH__ -#define __GTKMENUH__ - -//----------------------------------------------------------------------------- -// wxMenuBar -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase -{ -public: - // ctors - wxMenuBar(); - wxMenuBar(long style); - wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0); - virtual ~wxMenuBar(); - - // implement base class (pure) virtuals - virtual bool Append( wxMenu *menu, const wxString &title ); - virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title); - virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title); - virtual wxMenu *Remove(size_t pos); - - virtual int FindMenuItem(const wxString& menuString, - const wxString& itemString) const; - virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const; - - virtual void EnableTop( size_t pos, bool flag ); - virtual void SetMenuLabel( size_t pos, const wxString& label ); - virtual wxString GetMenuLabel( size_t pos ) const; - - // common part of Append and Insert - bool GtkAppend(wxMenu *menu, const wxString& title, int pos=-1); - - virtual void Attach(wxFrame *frame); - virtual void Detach(); - - GtkAccelGroup *m_accel; - GtkWidget *m_menubar; - long m_style; - -private: - void Init(size_t n, wxMenu *menus[], const wxString titles[], long style); - - DECLARE_DYNAMIC_CLASS(wxMenuBar) -}; - -//----------------------------------------------------------------------------- -// wxMenu -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase -{ -public: - // ctors & dtor - wxMenu(const wxString& title, long style = 0) - : wxMenuBase(title, style) { Init(); } - - wxMenu(long style = 0) : wxMenuBase(style) { Init(); } - - virtual ~wxMenu(); - - // implement base class virtuals - virtual wxMenuItem* DoAppend(wxMenuItem *item); - virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item); - virtual wxMenuItem* DoRemove(wxMenuItem *item); - - // Returns the title, with mnemonics translated to wx format - wxString GetTitle() const; - - // TODO: virtual void SetTitle(const wxString& title); - - // implementation - int FindMenuIdByMenuItem( GtkWidget *menuItem ) const; - - // implementation GTK only - GtkWidget *m_menu; // GtkMenu - GtkWidget *m_owner; - GtkAccelGroup *m_accel; - -private: - // common code for all constructors: - void Init(); - - // common part of Append (if pos == -1) and Insert - bool GtkAppend(wxMenuItem *item, int pos=-1); - - GtkWidget *m_prevRadio; - - DECLARE_DYNAMIC_CLASS(wxMenu) -}; - -#endif - // __GTKMENUH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/menuitem.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/menuitem.h deleted file mode 100644 index a36b1b2fc7..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/menuitem.h +++ /dev/null @@ -1,77 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/menuitem.h -// Purpose: wxMenuItem class -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKMENUITEMH__ -#define __GTKMENUITEMH__ - -#include "wx/bitmap.h" - -//----------------------------------------------------------------------------- -// wxMenuItem -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase -{ -public: - wxMenuItem(wxMenu *parentMenu = NULL, - int id = wxID_SEPARATOR, - const wxString& text = wxEmptyString, - const wxString& help = wxEmptyString, - wxItemKind kind = wxITEM_NORMAL, - wxMenu *subMenu = NULL); - virtual ~wxMenuItem(); - - // implement base class virtuals - virtual void SetItemLabel( const wxString& str ); - virtual wxString GetItemLabel() const; - virtual void Enable( bool enable = TRUE ); - virtual void Check( bool check = TRUE ); - virtual bool IsChecked() const; - virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; } - virtual const wxBitmap& GetBitmap() const { return m_bitmap; } - -#if wxUSE_ACCEL - virtual wxAcceleratorEntry *GetAccel() const; -#endif // wxUSE_ACCEL - - // implementation - void SetMenuItem(GtkWidget *menuItem) { m_menuItem = menuItem; } - GtkWidget *GetMenuItem() const { return m_menuItem; } - GtkWidget *GetLabelWidget() const { return m_labelWidget; } - void SetLabelWidget(GtkWidget *labelWidget) { m_labelWidget = labelWidget; } - wxString GetFactoryPath() const; - - wxString GetHotKey() const { return m_hotKey; } - - // compatibility only, don't use in new code - wxMenuItem(wxMenu *parentMenu, - int id, - const wxString& text, - const wxString& help, - bool isCheckable, - wxMenu *subMenu = NULL); - -private: - // common part of all ctors - void Init(); - - // DoSetText() transforms the accel mnemonics in our label from MSW/wxWin - // style to GTK+ and is called from ctor and SetText() - void DoSetText(const wxString& text); - - wxString m_hotKey; - wxBitmap m_bitmap; // Bitmap for menuitem, if any - - GtkWidget *m_menuItem; // GtkMenuItem - GtkWidget* m_labelWidget; // Label widget - - DECLARE_DYNAMIC_CLASS(wxMenuItem) -}; - -#endif - //__GTKMENUITEMH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/minifram.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/minifram.h deleted file mode 100644 index 84e3104cbc..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/minifram.h +++ /dev/null @@ -1,65 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/minifram.h -// Purpose: wxMiniFrame class -// Author: Robert Roebling -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKMINIFRAMEH__ -#define __GTKMINIFRAMEH__ - -#include "wx/defs.h" - -#if wxUSE_MINIFRAME - -#include "wx/object.h" -#include "wx/frame.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxMiniFrame; - -//----------------------------------------------------------------------------- -// wxMiniFrame -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame -{ - DECLARE_DYNAMIC_CLASS(wxMiniFrame) - -public: - wxMiniFrame() {} - wxMiniFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION, - const wxString& name = wxFrameNameStr) - { - Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxTINY_CAPTION, - const wxString& name = wxFrameNameStr); - - virtual void SetTitle( const wxString &title ); - // implementation - - bool m_isDragging; - int m_oldX,m_oldY; - int m_diffX,m_diffY; -}; - -#endif - -#endif - // __GTKMINIFRAMEH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/msgdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/msgdlg.h deleted file mode 100644 index 444f5a798e..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/msgdlg.h +++ /dev/null @@ -1,50 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/msgdlg.h -// Purpose: wxMessageDialog for GTK+2 -// Author: Vaclav Slavik -// Modified by: -// Created: 2003/02/28 -// Copyright: (c) Vaclav Slavik, 2003 -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __MSGDLG_H__ -#define __MSGDLG_H__ - -#include "wx/defs.h" -#include "wx/dialog.h" - -// type is an 'or' (|) of wxOK, wxCANCEL, wxYES_NO -// Returns wxYES/NO/OK/CANCEL - -extern WXDLLIMPEXP_DATA_CORE(const wxChar) wxMessageBoxCaptionStr[]; - -class WXDLLIMPEXP_CORE wxMessageDialog: public wxDialog, public wxMessageDialogBase -{ -public: - wxMessageDialog(wxWindow *parent, const wxString& message, - const wxString& caption = wxMessageBoxCaptionStr, - long style = wxOK|wxCENTRE, - const wxPoint& pos = wxDefaultPosition); - virtual ~wxMessageDialog(); - - int ShowModal(); - virtual bool Show( bool WXUNUSED(show) = true ) { return false; } - -protected: - // implement some base class methods to do nothing to avoid asserts and - // GTK warnings, since this is not a real wxDialog. - virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height), - int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {} - virtual void DoMoveWindow(int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(width), int WXUNUSED(height)) {} - -private: - wxString m_caption; - wxString m_message; - - DECLARE_DYNAMIC_CLASS(wxMessageDialog) -}; - -#endif diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/notebook.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/notebook.h deleted file mode 100644 index 45e7db965f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/notebook.h +++ /dev/null @@ -1,149 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/notebook.h -// Purpose: wxNotebook class -// Author: Robert Roebling -// Modified by: -// Copyright: (c) Julian Smart and Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKNOTEBOOKH__ -#define __GTKNOTEBOOKH__ - -//----------------------------------------------------------------------------- -// internal class -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxGtkNotebookPage; - -#include "wx/list.h" -WX_DECLARE_LIST(wxGtkNotebookPage, wxGtkNotebookPagesList); - -//----------------------------------------------------------------------------- -// wxNotebook -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase -{ -public: - // default for dynamic class - wxNotebook(); - // the same arguments as for wxControl - wxNotebook(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxNotebookNameStr); - // Create() function - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxNotebookNameStr); - // dtor - virtual ~wxNotebook(); - - // accessors - // --------- - - // set the currently selected page, return the index of the previously - // selected one (or wxNOT_FOUND on error) - // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events - int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); } - // get the currently selected page - int GetSelection() const; - - // changes selected page without sending events - int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); } - - // set/get the title of a page - bool SetPageText(size_t nPage, const wxString& strText); - wxString GetPageText(size_t nPage) const; - - // sets/returns item's image index in the current image list - int GetPageImage(size_t nPage) const; - bool SetPageImage(size_t nPage, int nImage); - - // control the appearance of the notebook pages - // set the size (the same for all pages) - void SetPageSize(const wxSize& size); - // set the padding between tabs (in pixels) - void SetPadding(const wxSize& padding); - // sets the size of the tabs (assumes all tabs are the same size) - void SetTabSize(const wxSize& sz); - - virtual int HitTest(const wxPoint& pt, long *flags = NULL) const; - - // operations - // ---------- - // remove all pages - bool DeleteAllPages(); - - // adds a new page to the notebook (it will be deleted by the notebook, - // don't delete it yourself). If bSelect, this page becomes active. - // the same as AddPage(), but adds it at the specified position - bool InsertPage( size_t position, - wxNotebookPage *win, - const wxString& strText, - bool bSelect = false, - int imageId = NO_IMAGE ); - - // handler for tab navigation - // -------------------------- - void OnNavigationKey(wxNavigationKeyEvent& event); - - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - // -------------- - -#if wxUSE_CONSTRAINTS - void SetConstraintSizes(bool recurse); - bool DoPhase(int phase); -#endif - - // set all page's attributes - void DoApplyWidgetStyle(GtkRcStyle *style); - - // report if window belongs to notebook - bool IsOwnGtkWindow( GdkWindow *window ); - - // common part of all ctors - void Init(); - - // helper function - wxGtkNotebookPage* GetNotebookPage(int page) const; - - // the additional page data (the pages themselves are in m_pages array) - wxGtkNotebookPagesList m_pagesData; - - // for reasons explained in gtk/notebook.cpp we store the current - // selection internally instead of querying the notebook for it - int m_selection; - - // flag set to true while we're inside "switch_page" callback - bool m_inSwitchPage; - - // flag set to true when the switch-page signal has been programmatically generated - bool m_skipNextPageChangeEvent; - -protected: - // remove one page from the notebook but do not destroy it - virtual wxNotebookPage *DoRemovePage(size_t nPage); - - int DoSetSelection(size_t nPage, int flags = 0); - -private: - // the padding set by SetPadding() - int m_padding; - - DECLARE_DYNAMIC_CLASS(wxNotebook) - DECLARE_EVENT_TABLE() -}; - -#endif - // __GTKNOTEBOOKH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/pen.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/pen.h deleted file mode 100644 index 6c308c31d7..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/pen.h +++ /dev/null @@ -1,78 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/pen.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKPENH__ -#define __GTKPENH__ - -#include "wx/defs.h" -#include "wx/object.h" -#include "wx/string.h" -#include "wx/gdiobj.h" -#include "wx/gdicmn.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxPen; - -#if defined(__WXGTK127__) -typedef signed char wxGTKDash; -#else -typedef char wxGTKDash; -#endif - -//----------------------------------------------------------------------------- -// wxPen -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPen: public wxPenBase -{ -public: - wxPen() { } - - wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID ); -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) ); -#endif - - bool operator==(const wxPen& pen) const; - bool operator!=(const wxPen& pen) const { return !(*this == pen); } - - void SetColour( const wxColour &colour ); - void SetColour( unsigned char red, unsigned char green, unsigned char blue ); - void SetCap( wxPenCap capStyle ); - void SetJoin( wxPenJoin joinStyle ); - void SetStyle( wxPenStyle style ); - void SetWidth( int width ); - void SetDashes( int number_of_dashes, const wxDash *dash ); - void SetStipple(const wxBitmap& stipple); - - wxColour GetColour() const; - wxPenCap GetCap() const; - wxPenJoin GetJoin() const; - wxPenStyle GetStyle() const; - int GetWidth() const; - int GetDashes(wxDash **ptr) const; - int GetDashCount() const; - wxDash* GetDash() const; - wxBitmap *GetStipple() const; - -#if FUTURE_WXWIN_COMPATIBILITY_3_0 - wxDEPRECATED_FUTURE( void SetStyle(int style) ) - { SetStyle((wxPenStyle)style); } -#endif - -private: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - DECLARE_DYNAMIC_CLASS(wxPen) -}; - -#endif // __GTKPENH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/popupwin.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/popupwin.h deleted file mode 100644 index b053b519de..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/popupwin.h +++ /dev/null @@ -1,53 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/popupwin.h -// Purpose: -// Author: Robert Roebling -// Created: -// Copyright: (c) 2001 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKPOPUPWINH__ -#define __GTKPOPUPWINH__ - -#include "wx/defs.h" -#include "wx/panel.h" -#include "wx/icon.h" - -//----------------------------------------------------------------------------- -// wxPopUpWindow -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxPopupWindow: public wxPopupWindowBase -{ -public: - wxPopupWindow() { } - virtual ~wxPopupWindow(); - - wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE) - { (void)Create(parent, flags); } - bool Create(wxWindow *parent, int flags = wxBORDER_NONE); - - virtual bool Show( bool show = TRUE ); - - // implementation - // -------------- - - virtual void DoMoveWindow(int x, int y, int width, int height); - - virtual void OnInternalIdle(); - - -protected: - void GtkOnSize( int x, int y, int width, int height ); - - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - -private: - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxPopupWindow) -}; - -#endif // __GTKPOPUPWINDOWH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/private.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/private.h deleted file mode 100644 index e684e9ea2f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/private.h +++ /dev/null @@ -1,95 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/private.h -// Purpose: wxGTK private macros, functions &c -// Author: Vadim Zeitlin -// Modified by: -// Created: 12.03.02 -// Copyright: (c) 2002 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_PRIVATE_H_ -#define _WX_GTK_PRIVATE_H_ - -#include -#include - -#include "wx/event.h" - -// fail all version tests if the GTK+ version is so ancient that it doesn't -// even have GTK_CHECK_VERSION -#ifndef GTK_CHECK_VERSION - #define GTK_CHECK_VERSION(a, b, c) 0 -#endif - -#define wxGTK_CONV(s) s.c_str() -#define wxGTK_CONV_BACK(s) s - - -// child is not a member of GTK_BUTTON() any more in GTK+ 2.0 -#define BUTTON_CHILD(w) GTK_BUTTON((w))->child - -// event_window has disappeared from GtkToggleButton in GTK+ 2.0 -#define TOGGLE_BUTTON_EVENT_WIN(w) GTK_TOGGLE_BUTTON((w))->event_window - -// gtk_editable_{copy|cut|paste}_clipboard() had an extra argument under -// previous GTK+ versions but no more -#if defined(__WXGTK20__) || (GTK_MINOR_VERSION > 0) - #define DUMMY_CLIPBOARD_ARG -#else - #define DUMMY_CLIPBOARD_ARG ,0 -#endif - -// _GtkEditable is private in GTK2 -#define GET_EDITABLE_POS(w) GTK_EDITABLE((w))->current_pos -#define SET_EDITABLE_POS(w, pos) \ - GTK_EDITABLE((w))->current_pos = (pos) - -// this GtkNotebook struct field has been renamed in GTK2 -#define NOTEBOOK_PANEL(nb) GTK_NOTEBOOK(nb)->panel - -#define SCROLLBAR_CBACK_ARG -#define GET_SCROLL_TYPE(w) GTK_RANGE((w))->scroll_type - -// translate a GTK+ scroll type to a wxEventType -inline wxEventType GtkScrollTypeToWx(guint scrollType) -{ - wxEventType command; - switch ( scrollType ) - { - case GTK_SCROLL_STEP_BACKWARD: - command = wxEVT_SCROLL_LINEUP; - break; - - case GTK_SCROLL_STEP_FORWARD: - command = wxEVT_SCROLL_LINEDOWN; - break; - - case GTK_SCROLL_PAGE_BACKWARD: - command = wxEVT_SCROLL_PAGEUP; - break; - - case GTK_SCROLL_PAGE_FORWARD: - command = wxEVT_SCROLL_PAGEDOWN; - break; - - default: - command = wxEVT_SCROLL_THUMBTRACK; - } - - return command; -} - -inline wxEventType GtkScrollWinTypeToWx(guint scrollType) -{ - // GtkScrollTypeToWx() returns SCROLL_XXX, not SCROLLWIN_XXX as we need - return GtkScrollTypeToWx(scrollType) + - wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP; -} - -// Needed for implementing e.g. combobox on wxGTK within a modal dialog. -void wxAddGrab(wxWindow* window); -void wxRemoveGrab(wxWindow* window); - -#endif // _WX_GTK_PRIVATE_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/private/mnemonics.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/private/mnemonics.h deleted file mode 100644 index 98907cd779..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/private/mnemonics.h +++ /dev/null @@ -1,38 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/private/mnemonics.h -// Purpose: helper functions for dealing with GTK+ mnemonics -// Author: Vadim Zeitlin -// Created: 2007-11-12 -// Copyright: (c) 2007 Vadim Zeitlin -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////////// - -#ifndef _GTK_PRIVATE_MNEMONICS_H_ -#define _GTK_PRIVATE_MNEMONICS_H_ - -#if wxUSE_CONTROLS || wxUSE_MENUS - -#include "wx/string.h" - -// ---------------------------------------------------------------------------- -// functions to convert between wxWidgets and GTK+ string containing mnemonics -// ---------------------------------------------------------------------------- - -// remove all mnemonics from a string -wxString wxGTKRemoveMnemonics(const wxString& label); - -// convert a wx string with '&' to GTK+ string with '_'s -wxString wxConvertMnemonicsToGTK(const wxString& label); - -// convert a wx string with '&' to indicate mnemonics as well as HTML entities -// to a GTK+ string with "&" used instead of '&', i.e. suitable for use -// with GTK+ functions using markup strings -wxString wxConvertMnemonicsToGTKMarkup(const wxString& label); - -// convert GTK+ string with '_'s to wx string with '&'s -wxString wxConvertMnemonicsFromGTK(const wxString& label); - -#endif // wxUSE_CONTROLS || wxUSE_MENUS - -#endif // _GTK_PRIVATE_MNEMONICS_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/private/timer.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/private/timer.h deleted file mode 100644 index add461e32a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/private/timer.h +++ /dev/null @@ -1,33 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/private/timer.h -// Purpose: wxTimerImpl for wxGTK -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK1_PRIVATE_TIMER_H_ -#define _WX_GTK1_PRIVATE_TIMER_H_ - -#include "wx/private/timer.h" - -//----------------------------------------------------------------------------- -// wxTimer -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxGTKTimerImpl : public wxTimerImpl -{ -public: - wxGTKTimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_tag = -1; } - - virtual bool Start(int millisecs = -1, bool oneShot = FALSE); - virtual void Stop(); - - virtual bool IsRunning() const { return m_tag != -1; } - -private: - // registered timeout id, -1 if the timer isn't running - int m_tag; -}; - -#endif // _WX_GTK1_PRIVATE_TIMER_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/radiobox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/radiobox.h deleted file mode 100644 index c6cac92ad9..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/radiobox.h +++ /dev/null @@ -1,135 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/radiobox.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_RADIOBOX_H_ -#define _WX_GTK_RADIOBOX_H_ - -#include "wx/bitmap.h" - -//----------------------------------------------------------------------------- -// wxRadioBox -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, - public wxRadioBoxBase -{ -public: - // ctors and dtor - wxRadioBox() { Init(); } - wxRadioBox(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, - const wxString choices[] = (const wxString *) NULL, - int majorDim = 1, - long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr) - { - Init(); - - Create( parent, id, title, pos, size, n, choices, majorDim, style, val, name ); - } - - wxRadioBox(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - int majorDim = 1, - long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr) - { - Init(); - - Create( parent, id, title, pos, size, choices, majorDim, style, val, name ); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int n = 0, - const wxString choices[] = (const wxString *) NULL, - int majorDim = 0, - long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr); - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos, - const wxSize& size, - const wxArrayString& choices, - int majorDim = 0, - long style = wxRA_SPECIFY_COLS, - const wxValidator& val = wxDefaultValidator, - const wxString& name = wxRadioBoxNameStr); - - virtual ~wxRadioBox(); - - - // implement wxItemContainerImmutable methods - virtual unsigned int GetCount() const; - - virtual wxString GetString(unsigned int n) const; - virtual void SetString(unsigned int n, const wxString& s); - - virtual void SetSelection(int n); - virtual int GetSelection() const; - - - // implement wxRadioBoxBase methods - virtual bool Show(unsigned int n, bool show = true); - virtual bool Enable(unsigned int n, bool enable = true); - - virtual bool IsItemEnabled(unsigned int n) const; - virtual bool IsItemShown(unsigned int n) const; - - - // override some base class methods to operate on radiobox itself too - virtual bool Show( bool show = true ); - virtual bool Enable( bool enable = true ); - - virtual void SetLabel( const wxString& label ); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - // -------------- - - void SetFocus(); - void GtkDisableEvents(); - void GtkEnableEvents(); - bool IsOwnGtkWindow( GdkWindow *window ); - void DoApplyWidgetStyle(GtkRcStyle *style); -#if wxUSE_TOOLTIPS - void ApplyToolTip( GtkTooltips *tips, const wxChar *tip ); -#endif // wxUSE_TOOLTIPS - - virtual void OnInternalIdle(); - - bool m_hasFocus, - m_lostFocus; - wxList m_boxes; - -protected: - // common part of all ctors - void Init(); - -private: - DECLARE_DYNAMIC_CLASS(wxRadioBox) -}; - -#endif // _WX_GTK_RADIOBOX_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/radiobut.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/radiobut.h deleted file mode 100644 index 153dd275cf..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/radiobut.h +++ /dev/null @@ -1,66 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/radiobut.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKRADIOBUTTONH__ -#define __GTKRADIOBUTTONH__ - -//----------------------------------------------------------------------------- -// wxRadioButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRadioButton: public wxControl -{ -public: - wxRadioButton() { } - wxRadioButton( wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioButtonNameStr ) - { - Create( parent, id, label, pos, size, style, validator, name ); - } - - bool Create( wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxRadioButtonNameStr ); - - virtual void SetLabel(const wxString& label); - virtual void SetValue(bool val); - virtual bool GetValue() const; - virtual bool Enable( bool enable = TRUE ); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - - virtual bool IsRadioButton() const { return TRUE; } - - void DoApplyWidgetStyle(GtkRcStyle *style); - bool IsOwnGtkWindow( GdkWindow *window ); - void OnInternalIdle(); - - bool m_blockEvent; - -protected: - virtual wxSize DoGetBestSize() const; - -private: - DECLARE_DYNAMIC_CLASS(wxRadioButton) -}; - -#endif // __GTKRADIOBUTTONH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/region.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/region.h deleted file mode 100644 index 8647b94b80..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/region.h +++ /dev/null @@ -1,125 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/region.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_REGION_H_ -#define _WX_GTK_REGION_H_ - -#include "wx/list.h" - -// ---------------------------------------------------------------------------- -// wxRegion -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRegion : public wxRegionBase -{ -public: - wxRegion() { } - - wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h ) - { - InitRect(x, y, w, h); - } - - wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight ) - { - InitRect(topLeft.x, topLeft.y, - bottomRight.x - topLeft.x, bottomRight.y - topLeft.y); - } - - wxRegion( const wxRect& rect ) - { - InitRect(rect.x, rect.y, rect.width, rect.height); - } - - wxRegion( size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE ); - - wxRegion( const wxBitmap& bmp) - { - Union(bmp); - } - wxRegion( const wxBitmap& bmp, - const wxColour& transColour, int tolerance = 0) - { - Union(bmp, transColour, tolerance); - } - - virtual ~wxRegion(); - - // wxRegionBase methods - virtual void Clear(); - virtual bool IsEmpty() const; - -public: - // Init with GdkRegion, set ref count to 2 so that - // the C++ class will not destroy the region! - wxRegion( GdkRegion *region ); - - GdkRegion *GetRegion() const; - -protected: - virtual wxGDIRefData *CreateGDIRefData() const; - virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; - - // wxRegionBase pure virtuals - virtual bool DoIsEqual(const wxRegion& region) const; - virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const; - virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const; - virtual wxRegionContain DoContainsRect(const wxRect& rect) const; - - virtual bool DoOffset(wxCoord x, wxCoord y); - virtual bool DoUnionWithRect(const wxRect& rect); - virtual bool DoUnionWithRegion(const wxRegion& region); - virtual bool DoIntersect(const wxRegion& region); - virtual bool DoSubtract(const wxRegion& region); - virtual bool DoXor(const wxRegion& region); - - // common part of ctors for a rectangle region - void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h); - -private: - DECLARE_DYNAMIC_CLASS(wxRegion) -}; - -// ---------------------------------------------------------------------------- -// wxRegionIterator: decomposes a region into rectangles -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxRegionIterator: public wxObject -{ -public: - wxRegionIterator(); - wxRegionIterator(const wxRegion& region); - - void Reset() { m_current = 0u; } - void Reset(const wxRegion& region); - - bool HaveRects() const; - operator bool () const { return HaveRects(); } - - wxRegionIterator& operator ++ (); - wxRegionIterator operator ++ (int); - - wxCoord GetX() const; - wxCoord GetY() const; - wxCoord GetW() const; - wxCoord GetWidth() const { return GetW(); } - wxCoord GetH() const; - wxCoord GetHeight() const { return GetH(); } - wxRect GetRect() const; - -private: - size_t m_current; - wxRegion m_region; - -private: - DECLARE_DYNAMIC_CLASS(wxRegionIterator) -}; - - -#endif - // _WX_GTK_REGION_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/scrolbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/scrolbar.h deleted file mode 100644 index 2a5baa7ff2..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/scrolbar.h +++ /dev/null @@ -1,84 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/scrolbar.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKSCROLLBARH__ -#define __GTKSCROLLBARH__ - -#include "wx/defs.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxScrollBar; - -//----------------------------------------------------------------------------- -// wxScrollBar -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase -{ -public: - wxScrollBar() - { m_adjust = NULL; m_oldPos = 0.0; } - inline wxScrollBar( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSB_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxScrollBarNameStr ) - { - Create( parent, id, pos, size, style, validator, name ); - } - bool Create( wxWindow *parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSB_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxScrollBarNameStr ); - virtual ~wxScrollBar(); - int GetThumbPosition() const; - int GetThumbSize() const; - int GetPageSize() const; - int GetRange() const; - virtual void SetThumbPosition( int viewStart ); - virtual void SetScrollbar( int position, int thumbSize, int range, int pageSize, - bool refresh = TRUE ); - - // Backward compatibility - // ---------------------- - - int GetValue(void) const; - void SetValue( int viewStart ); - void GetValues( int *viewStart, int *viewLength, int *objectLength, int *pageLength) const; - int GetViewLength() const; - int GetObjectLength() const; - void SetPageSize( int pageLength ); - void SetObjectLength( int objectLength ); - void SetViewLength( int viewLength ); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - // -------------- - - bool IsOwnGtkWindow( GdkWindow *window ); - - GtkAdjustment *m_adjust; - float m_oldPos; - -protected: - virtual wxSize DoGetBestSize() const; - -private: - DECLARE_DYNAMIC_CLASS(wxScrollBar) -}; - -#endif - // __GTKSCROLLBARH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/scrolwin.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/scrolwin.h deleted file mode 100644 index 28fe92640f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/scrolwin.h +++ /dev/null @@ -1,57 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/scrolwin.h -// Purpose: wxScrolledWindow class -// Author: Robert Roebling -// Modified by: Vadim Zeitlin (2005-10-10): wxScrolledWindow is now common -// Created: 01/02/97 -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_SCROLLWIN_H_ -#define _WX_GTK_SCROLLWIN_H_ - -// ---------------------------------------------------------------------------- -// wxScrolledWindow -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxScrollHelper : public wxScrollHelperBase -{ -public: - wxScrollHelper(wxWindow *win) : wxScrollHelperBase(win) { } - - // implement base class pure virtuals - virtual void SetScrollbars(int pixelsPerUnitX, int pixelsPerUnitY, - int noUnitsX, int noUnitsY, - int xPos = 0, int yPos = 0, - bool noRefresh = false); - virtual bool IsScrollbarShown(int orient) const; - virtual void AdjustScrollbars(); - -protected: - virtual void DoScroll(int x, int y); - virtual void DoShowScrollbars(wxScrollbarVisibility horz, - wxScrollbarVisibility vert); - - // this does (each) half of AdjustScrollbars() work - void DoAdjustScrollbar(GtkAdjustment *adj, - int pixelsPerLine, - int winSize, - int virtSize, - int *pos, - int *lines, - int *linesPerPage); - - // and this does the same for Scroll() - void DoScrollOneDir(int orient, - GtkAdjustment *adj, - int pos, - int pixelsPerLine, - int *posOld); - -private: - wxDECLARE_NO_COPY_CLASS(wxScrollHelper); -}; - -#endif // _WX_GTK_SCROLLWIN_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/slider.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/slider.h deleted file mode 100644 index 0782415170..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/slider.h +++ /dev/null @@ -1,73 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/slider.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKSLIDERH__ -#define __GTKSLIDERH__ - -// ---------------------------------------------------------------------------- -// wxSlider -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase -{ -public: - wxSlider() { } - wxSlider(wxWindow *parent, - wxWindowID id, - int value, int minValue, int maxValue, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSL_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSliderNameStr) - { - Create( parent, id, value, minValue, maxValue, - pos, size, style, validator, name ); - } - - bool Create(wxWindow *parent, - wxWindowID id, - int value, int minValue, int maxValue, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSL_HORIZONTAL, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxSliderNameStr); - - // implement the base class pure virtuals - virtual int GetValue() const; - virtual void SetValue(int value); - - virtual void SetRange(int minValue, int maxValue); - virtual int GetMin() const; - virtual int GetMax() const; - - virtual void SetLineSize(int lineSize); - virtual void SetPageSize(int pageSize); - virtual int GetLineSize() const; - virtual int GetPageSize() const; - - virtual void SetThumbLength(int lenPixels); - virtual int GetThumbLength() const; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - bool IsOwnGtkWindow( GdkWindow *window ); - void GtkDisableEvents(); - void GtkEnableEvents(); - - GtkAdjustment *m_adjust; - float m_oldPos; - -private: - DECLARE_DYNAMIC_CLASS(wxSlider) -}; - -#endif // __GTKSLIDERH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/spinbutt.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/spinbutt.h deleted file mode 100644 index 332628fd8d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/spinbutt.h +++ /dev/null @@ -1,64 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/spinbutt.h -// Purpose: wxSpinButton class -// Author: Robert Roebling -// Modified by: -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_SPINBUTT_H_ -#define _WX_GTK_SPINBUTT_H_ - -//----------------------------------------------------------------------------- -// wxSpinButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase -{ -public: - wxSpinButton() { } - wxSpinButton(wxWindow *parent, - wxWindowID id = -1, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_VERTICAL, - const wxString& name = wxSPIN_BUTTON_NAME) - { - Create(parent, id, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id = -1, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_VERTICAL, - const wxString& name = wxSPIN_BUTTON_NAME); - - virtual int GetValue() const; - virtual void SetValue( int value ); - virtual void SetRange( int minVal, int maxVal ); - virtual int GetMin() const; - virtual int GetMax() const; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - void OnSize( wxSizeEvent &event ); - - bool IsOwnGtkWindow( GdkWindow *window ); - - GtkAdjustment *m_adjust; - float m_oldPos; - -protected: - virtual wxSize DoGetBestSize() const; - -private: - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxSpinButton) -}; - -#endif - // _WX_GTK_SPINBUTT_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/spinctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/spinctrl.h deleted file mode 100644 index 0b42fce248..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/spinctrl.h +++ /dev/null @@ -1,97 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/spinctrl.h -// Purpose: wxSpinCtrl class -// Author: Robert Roebling -// Modified by: -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKSPINCTRLH__ -#define __GTKSPINCTRLH__ - -#include "wx/defs.h" - -#if wxUSE_SPINCTRL - -#include "wx/control.h" - -//----------------------------------------------------------------------------- -// wxSpinCtrl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxSpinCtrl : public wxControl -{ -public: - wxSpinCtrl() {} - wxSpinCtrl(wxWindow *parent, - wxWindowID id = -1, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS, - int min = 0, int max = 100, int initial = 0, - const wxString& name = wxT("wxSpinCtrl")) - { - Create(parent, id, value, pos, size, style, min, max, initial, name); - } - - bool Create(wxWindow *parent, - wxWindowID id = -1, - const wxString& value = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxSP_ARROW_KEYS, - int min = 0, int max = 100, int initial = 0, - const wxString& name = wxT("wxSpinCtrl")); - - void SetValue(const wxString& text); - void SetSelection(long from, long to); - - virtual int GetValue() const; - virtual void SetValue( int value ); - virtual void SetRange( int minVal, int maxVal ); - virtual int GetMin() const; - virtual int GetMax() const; - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - void OnChar( wxKeyEvent &event ); - - bool IsOwnGtkWindow( GdkWindow *window ); - void GtkDisableEvents(); - void GtkEnableEvents(); - - GtkAdjustment *m_adjust; - float m_oldPos; - - virtual int GetBase() const { return m_base; } - virtual bool SetBase(int base); - - protected: - virtual wxSize DoGetBestSize() const; - - // Widgets that use the style->base colour for the BG colour should - // override this and return true. - virtual bool UseGTKStyleBase() const { return true; } - -private: - // Common part of all ctors. - void Init() - { - m_base = 10; - } - - int m_base; - - DECLARE_DYNAMIC_CLASS(wxSpinCtrl) - DECLARE_EVENT_TABLE() -}; - -#endif - // wxUSE_SPINCTRL - -#endif - // __GTKSPINCTRLH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/statbmp.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/statbmp.h deleted file mode 100644 index e67d425258..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/statbmp.h +++ /dev/null @@ -1,58 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/statbmp.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKSTATICBITMAPH__ -#define __GTKSTATICBITMAPH__ - -#include "wx/icon.h" - -//----------------------------------------------------------------------------- -// wxStaticBitmap -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase -{ -public: - wxStaticBitmap(); - wxStaticBitmap( wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBitmapNameStr ); - bool Create( wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxStaticBitmapNameStr); - - virtual void SetIcon(const wxIcon& icon) { SetBitmap( icon ); } - virtual void SetBitmap( const wxBitmap& bitmap ); - virtual wxBitmap GetBitmap() const { return m_bitmap; } - - // for compatibility with wxMSW - wxIcon GetIcon() const - { - // don't use wxDynamicCast, icons and bitmaps are really the same thing - // in wxGTK - return (const wxIcon &)m_bitmap; - } - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -private: - wxBitmap m_bitmap; - - DECLARE_DYNAMIC_CLASS(wxStaticBitmap) -}; - -#endif // __GTKSTATICBITMAPH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/statbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/statbox.h deleted file mode 100644 index 089c3488c9..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/statbox.h +++ /dev/null @@ -1,51 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/statbox.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKSTATICBOXH__ -#define __GTKSTATICBOXH__ - -//----------------------------------------------------------------------------- -// wxStaticBox -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase -{ -public: - wxStaticBox(); - wxStaticBox( wxWindow *parent, - wxWindowID id, - const wxString &label, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxString &name = wxStaticBoxNameStr ); - bool Create( wxWindow *parent, - wxWindowID id, - const wxString &label, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxString &name = wxStaticBoxNameStr ); - - virtual void SetLabel( const wxString &label ); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - - virtual bool IsTransparentForMouse() const { return TRUE; } - -protected: - void DoApplyWidgetStyle(GtkRcStyle *style); - -private: - DECLARE_DYNAMIC_CLASS(wxStaticBox) -}; - -#endif // __GTKSTATICBOXH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/statline.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/statline.h deleted file mode 100644 index b1be2ce3cc..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/statline.h +++ /dev/null @@ -1,48 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/statline.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKSTATICLINEH__ -#define __GTKSTATICLINEH__ - -#include "wx/defs.h" - -#if wxUSE_STATLINE - -// ---------------------------------------------------------------------------- -// wxStaticLine -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase -{ -public: - wxStaticLine(); - wxStaticLine(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint &pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxLI_HORIZONTAL, - const wxString &name = wxStaticLineNameStr); - bool Create(wxWindow *parent, - wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxLI_HORIZONTAL, - const wxString &name = wxStaticLineNameStr); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - -private: - DECLARE_DYNAMIC_CLASS(wxStaticLine) -}; - -#endif // wxUSE_STATLINE - -#endif // __GTKSTATICLINEH__ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/stattext.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/stattext.h deleted file mode 100644 index fd70468c9a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/stattext.h +++ /dev/null @@ -1,55 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/stattext.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKSTATICTEXTH__ -#define __GTKSTATICTEXTH__ - -//----------------------------------------------------------------------------- -// wxStaticText -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase -{ -public: - wxStaticText(); - wxStaticText(wxWindow *parent, - wxWindowID id, - const wxString &label, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxString &name = wxStaticTextNameStr ); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString &label, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxString &name = wxStaticTextNameStr ); - - virtual wxString GetLabel() const; - virtual void SetLabel( const wxString &label ); - - virtual bool SetFont( const wxFont &font ); - virtual bool SetForegroundColour( const wxColour& colour ); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -protected: - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - - virtual wxSize DoGetBestSize() const; - - DECLARE_DYNAMIC_CLASS(wxStaticText) -}; - -#endif // __GTKSTATICTEXTH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/textctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/textctrl.h deleted file mode 100644 index ebb07ea642..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/textctrl.h +++ /dev/null @@ -1,195 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/textctrl.h -// Purpose: -// Author: Robert Roebling -// Created: 01/02/97 -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKTEXTCTRLH__ -#define __GTKTEXTCTRLH__ - -//----------------------------------------------------------------------------- -// wxTextCtrl -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase -{ -public: - wxTextCtrl() { Init(); } - wxTextCtrl(wxWindow *parent, - wxWindowID id, - const wxString &value = wxEmptyString, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxTextCtrlNameStr); - - virtual ~wxTextCtrl(); - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString &value = wxEmptyString, - const wxPoint &pos = wxDefaultPosition, - const wxSize &size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString &name = wxTextCtrlNameStr); - - // implement base class pure virtuals - // ---------------------------------- - - virtual int GetLineLength(long lineNo) const; - virtual wxString GetLineText(long lineNo) const; - virtual int GetNumberOfLines() const; - - virtual bool IsModified() const; - virtual bool IsEditable() const; - - // If the return values from and to are the same, there is no selection. - virtual void GetSelection(long* from, long* to) const; - - // operations - // ---------- - - // editing - virtual void Clear(); - virtual void Replace(long from, long to, const wxString& value); - virtual void Remove(long from, long to); - - // sets/clears the dirty flag - virtual void MarkDirty(); - virtual void DiscardEdits(); - - virtual void SetMaxLength(unsigned long len); - - // writing text inserts it at the current position, appending always - // inserts it at the end - virtual void WriteText(const wxString& text); - virtual void AppendText(const wxString& text); - - // apply text attribute to the range of text (only works with richedit - // controls) - virtual bool SetStyle(long start, long end, const wxTextAttr& style); - - // translate between the position (which is just an index in the text ctrl - // considering all its contents as a single strings) and (x, y) coordinates - // which represent column and line. - virtual long XYToPosition(long x, long y) const; - virtual bool PositionToXY(long pos, long *x, long *y) const; - - virtual void ShowPosition(long pos); - - // Clipboard operations - virtual void Copy(); - virtual void Cut(); - virtual void Paste(); - - // Undo/redo - virtual void Undo(); - virtual void Redo(); - - virtual bool CanUndo() const; - virtual bool CanRedo() const; - - // Insertion point - virtual void SetInsertionPoint(long pos); - virtual void SetInsertionPointEnd(); - virtual long GetInsertionPoint() const; - virtual wxTextPos GetLastPosition() const; - - virtual void SetSelection(long from, long to); - virtual void SetEditable(bool editable); - - virtual void DoEnable( bool enable ); - - // Implementation from now on - void OnDropFiles( wxDropFilesEvent &event ); - void OnChar( wxKeyEvent &event ); - - void OnCut(wxCommandEvent& event); - void OnCopy(wxCommandEvent& event); - void OnPaste(wxCommandEvent& event); - void OnUndo(wxCommandEvent& event); - void OnRedo(wxCommandEvent& event); - - void OnUpdateCut(wxUpdateUIEvent& event); - void OnUpdateCopy(wxUpdateUIEvent& event); - void OnUpdatePaste(wxUpdateUIEvent& event); - void OnUpdateUndo(wxUpdateUIEvent& event); - void OnUpdateRedo(wxUpdateUIEvent& event); - - bool SetFont(const wxFont& font); - bool SetForegroundColour(const wxColour& colour); - bool SetBackgroundColour(const wxColour& colour); - - GtkWidget* GetConnectWidget(); - bool IsOwnGtkWindow( GdkWindow *window ); - void DoApplyWidgetStyle(GtkRcStyle *style); - void CalculateScrollbar(); - void OnInternalIdle(); - - void SetUpdateFont(bool update) { m_updateFont = update; } - void UpdateFontIfNeeded(); - - void SetModified() { m_modified = true; } - - // textctrl specific scrolling - virtual bool ScrollLines(int lines); - virtual bool ScrollPages(int pages); - - // implementation only from now on - - // tell the control to ignore next text changed signal - void IgnoreNextTextUpdate(); - - // should we ignore the changed signal? always resets the flag - bool IgnoreTextUpdate(); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - -protected: - virtual wxSize DoGetBestSize() const; - - // common part of all ctors - void Init(); - - // overridden wxWindow methods - virtual void DoFreeze(); - virtual void DoThaw(); - - // get the vertical adjustment, if any, NULL otherwise - GtkAdjustment *GetVAdj() const; - - // scroll the control by the given number of pixels, return true if the - // scroll position changed - bool DoScroll(GtkAdjustment *adj, int diff); - - // Widgets that use the style->base colour for the BG colour should - // override this and return true. - virtual bool UseGTKStyleBase() const { return true; } - - virtual void DoSetValue(const wxString &value, int flags = 0); - virtual wxString DoGetValue() const; - -private: - // change the font for everything in this control - void ChangeFontGlobally(); - - GtkWidget *m_text; - GtkWidget *m_vScrollbar; - - bool m_modified:1; - bool m_vScrollbarVisible:1; - bool m_updateFont:1; - bool m_ignoreNextUpdate:1; - - DECLARE_EVENT_TABLE() - DECLARE_DYNAMIC_CLASS(wxTextCtrl) -}; - -#endif // __GTKTEXTCTRLH__ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/tglbtn.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/tglbtn.h deleted file mode 100644 index 60c9f8981d..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/tglbtn.h +++ /dev/null @@ -1,136 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/tglbtn.h -// Purpose: Declaration of the wxToggleButton class, which implements a -// toggle button under wxGTK. -// Author: John Norris, minor changes by Axel Schlueter -// Modified by: -// Created: 08.02.01 -// Copyright: (c) 2000 Johnny C. Norris II -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_TOGGLEBUTTON_H_ -#define _WX_GTK_TOGGLEBUTTON_H_ - -#include "wx/bitmap.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxToggleButton; -class WXDLLIMPEXP_FWD_CORE wxToggleBitmapButton; - -//----------------------------------------------------------------------------- -// wxToggleBitmapButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxToggleBitmapButton: public wxToggleButtonBase -{ -public: - // construction/destruction - wxToggleBitmapButton() {} - wxToggleBitmapButton(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - // Create the control - bool Create(wxWindow *parent, - wxWindowID id, - const wxBitmap& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - - // Get/set the value - void SetValue(bool state); - bool GetValue() const; - - // Set the label - virtual void SetLabel(const wxString& label) { wxControl::SetLabel(label); } - virtual void SetLabel(const wxBitmap& label); - bool Enable(bool enable = TRUE); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - bool m_blockEvent; - wxBitmap m_bitmap; - - void OnSetBitmap(); - void DoApplyWidgetStyle(GtkRcStyle *style); - bool IsOwnGtkWindow(GdkWindow *window); - - virtual void OnInternalIdle(); - virtual wxSize DoGetBestSize() const; - -private: - DECLARE_DYNAMIC_CLASS(wxToggleBitmapButton) -}; - -//----------------------------------------------------------------------------- -// wxToggleButton -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxToggleButton: public wxControl -{ -public: - // construction/destruction - wxToggleButton() {} - wxToggleButton(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - // Create the control - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxCheckBoxNameStr); - - // Get/set the value - void SetValue(bool state); - bool GetValue() const; - - // Set the label - void SetLabel(const wxString& label); - bool Enable(bool enable = TRUE); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation - bool m_blockEvent; - - void DoApplyWidgetStyle(GtkRcStyle *style); - bool IsOwnGtkWindow(GdkWindow *window); - - virtual void OnInternalIdle(); - virtual wxSize DoGetBestSize() const; - -private: - DECLARE_DYNAMIC_CLASS(wxToggleButton) -}; - -#endif // _WX_GTK_TOGGLEBUTTON_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/toolbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/toolbar.h deleted file mode 100644 index 6b6f05990a..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/toolbar.h +++ /dev/null @@ -1,102 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/toolbar.h -// Purpose: GTK toolbar -// Author: Robert Roebling -// Copyright: (c) Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_GTK_TOOLBAR_H_ -#define _WX_GTK_TOOLBAR_H_ - -#if wxUSE_TOOLBAR - -// ---------------------------------------------------------------------------- -// wxToolBar -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase -{ -public: - // construction/destruction - wxToolBar() { Init(); } - wxToolBar( wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxToolBarNameStr ) - { - Init(); - - Create(parent, id, pos, size, style, name); - } - - bool Create( wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxToolBarNameStr ); - - virtual ~wxToolBar(); - - // override base class virtuals - virtual void SetMargins(int x, int y); - virtual void SetToolSeparation(int separation); - - virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const; - - virtual void SetToolShortHelp(int id, const wxString& helpString); - - virtual void SetWindowStyleFlag( long style ); - - static wxVisualAttributes - GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); - - // implementation from now on - // -------------------------- - - GtkToolbar *m_toolbar; - - bool m_blockEvent; - - void OnInternalIdle(); - -protected: - // common part of all ctors - void Init(); - - // choose the default border for this window - virtual wxBorder GetDefaultBorder() const { return wxBORDER_DEFAULT; } - - // set the GTK toolbar style and orientation - void GtkSetStyle(); - - // implement base class pure virtuals - virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool); - virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool); - - virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable); - virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle); - virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle); - - virtual wxToolBarToolBase *CreateTool(int id, - const wxString& label, - const wxBitmap& bitmap1, - const wxBitmap& bitmap2, - wxItemKind kind, - wxObject *clientData, - const wxString& shortHelpString, - const wxString& longHelpString); - virtual wxToolBarToolBase *CreateTool(wxControl *control, - const wxString& label); - -private: - DECLARE_DYNAMIC_CLASS(wxToolBar) -}; - -#endif // wxUSE_TOOLBAR - -#endif - // _WX_GTK_TOOLBAR_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/tooltip.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/tooltip.h deleted file mode 100644 index e293160c8f..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/tooltip.h +++ /dev/null @@ -1,57 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/tooltip.h -// Purpose: wxToolTip class -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKTOOLTIPH__ -#define __GTKTOOLTIPH__ - -#include "wx/defs.h" -#include "wx/string.h" -#include "wx/object.h" - -//----------------------------------------------------------------------------- -// forward declarations -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxToolTip; -class WXDLLIMPEXP_FWD_CORE wxWindow; - -//----------------------------------------------------------------------------- -// wxToolTip -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxToolTip : public wxObject -{ -public: - // globally change the tooltip parameters - static void Enable( bool flag ); - static void SetDelay( long msecs ); - // set the delay after which the tooltip disappears or how long the tooltip remains visible - static void SetAutoPop(long msecs); - // set the delay between subsequent tooltips to appear - static void SetReshow(long msecs); - - wxToolTip( const wxString &tip ); - - // get/set the tooltip text - void SetTip( const wxString &tip ); - wxString GetTip() const { return m_text; } - - wxWindow *GetWindow() const { return m_window; } - bool IsOk() const { return m_window != NULL; } - - // implementation - void Apply( wxWindow *win ); - -private: - wxString m_text; - wxWindow *m_window; - - DECLARE_ABSTRACT_CLASS(wxToolTip) -}; - -#endif // __GTKTOOLTIPH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/toplevel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/toplevel.h deleted file mode 100644 index dc75a430d8..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/toplevel.h +++ /dev/null @@ -1,129 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/toplevel.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKTOPLEVELH__ -#define __GTKTOPLEVELH__ - -//----------------------------------------------------------------------------- -// wxTopLevelWindowGTK -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxTopLevelWindowGTK : public wxTopLevelWindowBase -{ -public: - // construction - wxTopLevelWindowGTK() { Init(); } - wxTopLevelWindowGTK(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr) - { - Init(); - - Create(parent, id, title, pos, size, style, name); - } - - bool Create(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE, - const wxString& name = wxFrameNameStr); - - virtual ~wxTopLevelWindowGTK(); - - // implement base class pure virtuals - virtual void Maximize(bool maximize = true); - virtual bool IsMaximized() const; - virtual void Iconize(bool iconize = true); - virtual bool IsIconized() const; - virtual void SetIcons(const wxIconBundle& icons); - virtual void Restore(); - - virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - virtual bool IsFullScreen() const { return m_fsIsShowing; } - - virtual bool SetShape(const wxRegion& region); - - virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO); - - virtual void SetWindowStyleFlag( long style ); - - virtual bool Show(bool show = true); - - virtual void Raise(); - - virtual bool IsActive(); - - virtual void SetTitle( const wxString &title ); - virtual wxString GetTitle() const { return m_title; } - - // Experimental, to allow help windows to be - // viewable from within modal dialogs - virtual void AddGrab(); - virtual void RemoveGrab(); - virtual bool IsGrabbed() const { return m_grabbed; } - - // implementation from now on - // -------------------------- - - // move the window to the specified location and resize it: this is called - // from both DoSetSize() and DoSetClientSize() - virtual void DoMoveWindow(int x, int y, int width, int height); - - // GTK callbacks - virtual void GtkOnSize( int x, int y, int width, int height ); - virtual void OnInternalIdle(); - - // do *not* call this to iconize the frame, this is a private function! - void SetIconizeState(bool iconic); - - int m_miniEdge, - m_miniTitle; - GtkWidget *m_mainWidget; - bool m_insertInClientArea; /* not from within OnCreateXXX */ - - bool m_fsIsShowing; /* full screen */ - long m_fsSaveGdkFunc, m_fsSaveGdkDecor; - long m_fsSaveFlag; - wxRect m_fsSaveFrame; - - // m_windowStyle translated to GDK's terms - long m_gdkFunc, - m_gdkDecor; - - // private gtk_timeout_add result for mimicing wxUSER_ATTENTION_INFO and - // wxUSER_ATTENTION_ERROR difference, -2 for no hint, -1 for ERROR hint, rest for GtkTimeout handle. - int m_urgency_hint; - -protected: - // common part of all ctors - void Init(); - - // override wxWindow methods to take into account tool/menu/statusbars - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - - virtual void DoSetClientSize(int width, int height); - virtual void DoGetClientSize( int *width, int *height ) const; - - wxString m_title; - - // is the frame currently iconized? - bool m_isIconized; - // is the frame currently grabbed explicitly - // by the application? - bool m_grabbed; -}; - -#endif // __GTKTOPLEVELH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/treectrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/treectrl.h deleted file mode 100644 index a290539ee6..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/treectrl.h +++ /dev/null @@ -1,405 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/treectrl.h -// Purpose: wxTreeCtrl class -// Author: Denis Pershin -// Modified by: -// Created: 08/08/98 -// Copyright: (c) Denis Pershin -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_TREECTRL_H_ -#define _WX_TREECTRL_H_ - -#include "wx/textctrl.h" -#include "wx/imaglist.h" - -#include - -// the type for "untyped" data -typedef long wxDataType; - -// fwd decl -class WXDLLIMPEXP_CORE wxImageList; -struct wxTreeViewItem; - -// a callback function used for sorting tree items, it should return -1 if the -// first item precedes the second, +1 if the second precedes the first or 0 if -// they're equivalent -class WXDLLIMPEXP_FWD_CORE wxTreeItemData; -typedef int (*wxTreeItemCmpFunc)(wxTreeItemData *item1, wxTreeItemData *item2); - -// ---------------------------------------------------------------------------- -// constants -// ---------------------------------------------------------------------------- - -// values for the `flags' parameter of wxTreeCtrl::HitTest() which determine -// where exactly the specified point is situated: - // above the client area. -static const int wxTREE_HITTEST_ABOVE = 0x0001; - // below the client area. -static const int wxTREE_HITTEST_BELOW = 0x0002; - // in the client area but below the last item. -static const int wxTREE_HITTEST_NOWHERE = 0x0004; - // on the button associated with an item. -static const int wxTREE_HITTEST_ONITEMBUTTON = 0x0010; - // on the bitmap associated with an item. -static const int wxTREE_HITTEST_ONITEMICON = 0x0020; - // in the indentation associated with an item. -static const int wxTREE_HITTEST_ONITEMINDENT = 0x0040; - // on the label (string) associated with an item. -static const int wxTREE_HITTEST_ONITEMLABEL = 0x0080; - // in the area to the right of an item. -static const int wxTREE_HITTEST_ONITEMRIGHT = 0x0100; - // on the state icon for a tree view item that is in a user-defined state. -static const int wxTREE_HITTEST_ONITEMSTATEICON = 0x0200; - // to the right of the client area. -static const int wxTREE_HITTEST_TOLEFT = 0x0400; - // to the left of the client area. -static const int wxTREE_HITTEST_TORIGHT = 0x0800; - // anywhere on the item -static const int wxTREE_HITTEST_ONITEM = wxTREE_HITTEST_ONITEMICON | - wxTREE_HITTEST_ONITEMLABEL | - wxTREE_HITTEST_ONITEMSTATEICON; - -#if WXWIN_COMPATIBILITY_2_6 - // NB: all the following flags are for compatbility only and will be removed in - // next versions - // flags for deprecated InsertItem() variant - #define wxTREE_INSERT_FIRST 0xFFFF0001 - #define wxTREE_INSERT_LAST 0xFFFF0002 -#endif - -// ---------------------------------------------------------------------------- -// wxTreeItemId identifies an element of the tree. In this implementation, it's -// just a trivial wrapper around GTK GtkTreeItem *. It's opaque for the -// application. -// ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxTreeItemId { -public: - // ctors - wxTreeItemId() { m_itemId = NULL; } - - // default copy ctor/assignment operator are ok for us - - // accessors - // is this a valid tree item? - bool IsOk() const { return m_itemId != NULL; } - - // conversion to/from either real (system-dependent) tree item id or - // to "long" which used to be the type for tree item ids in previous - // versions of wxWidgets - - // for wxTreeCtrl usage only - wxTreeItemId(GtkTreeItem *itemId) { m_itemId = itemId; } - operator GtkTreeItem *() const { return m_itemId; } - void operator =(GtkTreeItem *item) { m_itemId = item; } - -protected: - GtkTreeItem *m_itemId; -}; - -// ---------------------------------------------------------------------------- -// wxTreeItemData is some (arbitrary) user class associated with some item. The -// main advantage of having this class (compared to old untyped interface) is -// that wxTreeItemData's are destroyed automatically by the tree and, as this -// class has virtual dtor, it means that the memory will be automatically -// freed. OTOH, we don't just use wxObject instead of wxTreeItemData because -// the size of this class is critical: in any real application, each tree leaf -// will have wxTreeItemData associated with it and number of leaves may be -// quite big. -// -// Because the objects of this class are deleted by the tree, they should -// always be allocated on the heap! -// ---------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxTreeItemData : private wxTreeItemId { -public: - // default ctor/copy ctor/assignment operator are ok - - // dtor is virtual and all the items are deleted by the tree control when - // it's deleted, so you normally don't have to care about freeing memory - // allocated in your wxTreeItemData-derived class - virtual ~wxTreeItemData() { } - - // accessors: set/get the item associated with this node - void SetId(const wxTreeItemId& id) { m_itemId = id; } - const wxTreeItemId& GetId() const { return (wxTreeItemId&) m_itemId; } -}; - -class WXDLLIMPEXP_CORE wxTreeCtrl: public wxControl { -public: - // creation - // -------- - wxTreeCtrl() { Init(); } - - wxTreeCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = "wxTreeCtrl") { - Create(parent, id, pos, size, style, validator, name); - } - - virtual ~wxTreeCtrl(); - - bool Create(wxWindow *parent, wxWindowID id = wxID_ANY, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = "wxTreeCtrl"); - - // accessors - // --------- - - // get the total number of items in the control - virtual unsigned int GetCount() const; - - // indent is the number of pixels the children are indented relative to - // the parents position. SetIndent() also redraws the control - // immediately. - unsigned int GetIndent() const; - void SetIndent(unsigned int indent); - - // image list: these functions allow to associate an image list with - // the control and retrieve it. Note that the control does _not_ delete - // the associated image list when it's deleted in order to allow image - // lists to be shared between different controls. - // - // The normal image list is for the icons which correspond to the - // normal tree item state (whether it is selected or not). - // Additionally, the application might choose to show a state icon - // which corresponds to an app-defined item state (for example, - // checked/unchecked) which are taken from the state image list. - wxImageList *GetImageList() const; - wxImageList *GetStateImageList() const; - - void SetImageList(wxImageList *imageList); - void SetStateImageList(wxImageList *imageList); - - // Functions to work with tree ctrl items. Unfortunately, they can _not_ be - // member functions of wxTreeItem because they must know the tree the item - // belongs to for Windows implementation and storing the pointer to - // wxTreeCtrl in each wxTreeItem is just too much waste. - - // accessors - // --------- - - // retrieve items label - wxString GetItemText(const wxTreeItemId& item) const; - // get the normal item image - int GetItemImage(const wxTreeItemId& item) const; - // get the data associated with the item - wxTreeItemData *GetItemData(const wxTreeItemId& item) const; - - // modifiers - // --------- - - // set items label - void SetItemText(const wxTreeItemId& item, const wxString& text); - // set the normal item image - void SetItemImage(const wxTreeItemId& item, int image); - // associate some data with the item - void SetItemData(const wxTreeItemId& item, wxTreeItemData *data); - - // item status inquiries - // --------------------- - - // is the item visible (it might be outside the view or not expanded)? - bool IsVisible(const wxTreeItemId& item) const; - // does the item has any children? - bool ItemHasChildren(const wxTreeItemId& item) const; - // is the item expanded (only makes sense if HasChildren())? - bool IsExpanded(const wxTreeItemId& item) const; - // is this item currently selected (the same as has focus)? - bool IsSelected(const wxTreeItemId& item) const; - - // number of children - // ------------------ - - // if 'recursively' is false, only immediate children count, otherwise - // the returned number is the number of all items in this branch - size_t GetChildrenCount(const wxTreeItemId& item, bool recursively = true); - - // navigation - // ---------- - - // wxTreeItemId.IsOk() will return false if there is no such item - - // get the root tree item - wxTreeItemId GetRootItem() const; - - // get the item currently selected (may return NULL if no selection) - wxTreeItemId GetSelection() const; - - // get the parent of this item (may return NULL if root) - wxTreeItemId GetItemParent(const wxTreeItemId& item) const; - - // for this enumeration function you must pass in a "cookie" parameter - // which is opaque for the application but is necessary for the library - // to make these functions reentrant (i.e. allow more than one - // enumeration on one and the same object simultaneously). Of course, - // the "cookie" passed to GetFirstChild() and GetNextChild() should be - // the same! - - // get the last child of this item - this method doesn't use cookies - wxTreeItemId GetLastChild(const wxTreeItemId& item) const; - - // get the next sibling of this item - wxTreeItemId GetNextSibling(const wxTreeItemId& item) const; - // get the previous sibling - wxTreeItemId GetPrevSibling(const wxTreeItemId& item) const; - - // get first visible item - wxTreeItemId GetFirstVisibleItem() const; - // get the next visible item: item must be visible itself! - // see IsVisible() and wxTreeCtrl::GetFirstVisibleItem() - wxTreeItemId GetNextVisible(const wxTreeItemId& item) const; - // get the previous visible item: item must be visible itself! - wxTreeItemId GetPrevVisible(const wxTreeItemId& item) const; - - // operations - // ---------- - - // add the root node to the tree - wxTreeItemId AddRoot(const wxString& text, - int image = -1, int selectedImage = -1, - wxTreeItemData *data = NULL); - - // insert a new item in as the first child of the parent - wxTreeItemId PrependItem(const wxTreeItemId& parent, - const wxString& text, - int image = -1, int selectedImage = -1, - wxTreeItemData *data = NULL); - - // insert a new item after a given one - wxTreeItemId InsertItem(const wxTreeItemId& parent, - const wxTreeItemId& idPrevious, - const wxString& text, - int image = -1, int selectedImage = -1, - wxTreeItemData *data = NULL); - - // insert a new item in as the last child of the parent - wxTreeItemId AppendItem(const wxTreeItemId& parent, - const wxString& text, - int image = -1, int selectedImage = -1, - wxTreeItemData *data = NULL); - - // delete this item and associated data if any - void Delete(const wxTreeItemId& item); - // delete all items from the tree - void DeleteAllItems(); - - // expand this item - void Expand(const wxTreeItemId& item); - // collapse the item without removing its children - void Collapse(const wxTreeItemId& item); - // collapse the item and remove all children - void CollapseAndReset(const wxTreeItemId& item); - // toggles the current state - void Toggle(const wxTreeItemId& item); - - // remove the selection from currently selected item (if any) - void Unselect(); - // select this item - void SelectItem(const wxTreeItemId& item); - // make sure this item is visible (expanding the parent item and/or - // scrolling to this item if necessary) - void EnsureVisible(const wxTreeItemId& item); - // scroll to this item (but don't expand its parent) - void ScrollTo(const wxTreeItemId& item); - - // start editing the item label: this (temporarily) replaces the item - // with a one line edit control. The item will be selected if it hadn't - // been before. textCtrlClass parameter allows you to create an edit - // control of arbitrary user-defined class deriving from wxTextCtrl. - wxTextCtrl* EditLabel(const wxTreeItemId& item, - wxClassInfo* textCtrlClass = wxCLASSINFO(wxTextCtrl)); - // returns the same pointer as StartEdit() if the item is being edited, - // NULL otherwise (it's assumed that no more than one item may be - // edited simultaneously) - wxTextCtrl* GetEditControl() const; - // end editing and accept or discard the changes to item label - void EndEditLabel(const wxTreeItemId& item, bool discardChanges = false); - - // sort the children of this item using the specified callback function - // (it should return -1, 0 or +1 as usual), if it's not specified - // alphabetical comparaison is performed. - // - // NB: this function is not reentrant! - void SortChildren(const wxTreeItemId& item, - wxTreeItemCmpFunc *cmpFunction = NULL); - - // deprecated - // ---------- - -#if WXWIN_COMPATIBILITY_2_6 - // these methods are deprecated and will be removed in future versions of - // wxWidgets, they're here for compatibility only, don't use them in new - // code (the comments indicate why these methods are now useless and how to - // replace them) - - // use Expand, Collapse, CollapseAndReset or Toggle - wxDEPRECATED( void ExpandItem(const wxTreeItemId& item, int action) ); - - // use SetImageList - wxDEPRECATED( void SetImageList(wxImageList *imageList, int) ) - { SetImageList(imageList); } - - // use Set/GetItemImage directly - wxDEPRECATED( int GetItemSelectedImage(const wxTreeItemId& item) const ); - wxDEPRECATED( void SetItemSelectedImage(const wxTreeItemId& item, int image) ); - - // get the first child of this item - wxDEPRECATED( wxTreeItemId GetFirstChild(const wxTreeItemId& item, long& cookie) const ); - // get the next child (after GetFirstChild or GetNextChild) - wxDEPRECATED( wxTreeItemId GetNextChild(const wxTreeItemId& item, long& cookie) const ); - - // use AddRoot, PrependItem or AppendItem - wxDEPRECATED( wxTreeItemId InsertItem(const wxTreeItemId& parent, - const wxString& text, - int image = -1, int selImage = -1, - long insertAfter = wxTREE_INSERT_LAST) ); - -#endif // WXWIN_COMPATIBILITY_2_6 - - // use Set/GetImageList and Set/GetStateImageList - wxImageList *GetImageList(int) const - { return GetImageList(); } - - void SendExpanding(const wxTreeItemId& item); - void SendExpanded(const wxTreeItemId& item); - void SendCollapsing(const wxTreeItemId& item); - void SendCollapsed(const wxTreeItemId& item); - void SendSelChanging(const wxTreeItemId& item); - void SendSelChanged(const wxTreeItemId& item); - -protected: - - wxTreeItemId m_editItem; - GtkTree *m_tree; - GtkTreeItem *m_anchor; - wxTextCtrl* m_textCtrl; - wxImageList* m_imageListNormal; - wxImageList* m_imageListState; - - long m_curitemId; - - void SendMessage(wxEventType command, const wxTreeItemId& item); -// GtkTreeItem *findGtkTreeItem(wxTreeCtrlId &id) const; - - // the common part of all ctors - void Init(); - // insert a new item in as the last child of the parent - wxTreeItemId p_InsertItem(GtkTreeItem *p, - const wxString& text, - int image, int selectedImage, - wxTreeItemData *data); - - - DECLARE_DYNAMIC_CLASS(wxTreeCtrl) -}; - -#endif - // _WX_TREECTRL_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/win_gtk.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/win_gtk.h deleted file mode 100644 index 09f23c59b3..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/win_gtk.h +++ /dev/null @@ -1,146 +0,0 @@ -/* /////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/win_gtk.h -// Purpose: wxWidgets's GTK base widget = GtkPizza -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -/////////////////////////////////////////////////////////////////////////// */ - - -#ifndef __GTK_PIZZA_H__ -#define __GTK_PIZZA_H__ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include -#include -#include -#include -#include - -#include "wx/dlimpexp.h" - -#define GTK_PIZZA(obj) GTK_CHECK_CAST (obj, gtk_pizza_get_type (), GtkPizza) -#define GTK_PIZZA_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, gtk_pizza_get_type (), GtkPizzaClass) -#define GTK_IS_PIZZA(obj) GTK_CHECK_TYPE (obj, gtk_pizza_get_type ()) - -/* Shadow types */ -typedef enum -{ - GTK_MYSHADOW_NONE, - GTK_MYSHADOW_THIN, - GTK_MYSHADOW_IN, - GTK_MYSHADOW_OUT -} GtkMyShadowType; - -typedef struct _GtkPizzaChild GtkPizzaChild; -typedef struct _GtkPizza GtkPizza; -typedef struct _GtkPizzaClass GtkPizzaClass; - -struct _GtkPizzaChild -{ - GtkWidget *widget; - gint x; - gint y; - gint width; - gint height; -}; - -struct _GtkPizza -{ - GtkContainer container; - GList *children; - GtkMyShadowType shadow_type; - - guint width; - guint height; - - guint xoffset; - guint yoffset; - - GdkWindow *bin_window; - - GdkVisibilityState visibility; - gulong configure_serial; - gint scroll_x; - gint scroll_y; - - gboolean clear_on_draw; - gboolean use_filter; - gboolean external_expose; -}; - -struct _GtkPizzaClass -{ - GtkContainerClass parent_class; - - void (*set_scroll_adjustments) (GtkPizza *pizza, - GtkAdjustment *hadjustment, - GtkAdjustment *vadjustment); -}; - -WXDLLIMPEXP_CORE -GtkType gtk_pizza_get_type (void); -WXDLLIMPEXP_CORE -GtkWidget* gtk_pizza_new (void); - -WXDLLIMPEXP_CORE -void gtk_pizza_set_shadow_type (GtkPizza *pizza, - GtkMyShadowType type); - -WXDLLIMPEXP_CORE -void gtk_pizza_set_clear (GtkPizza *pizza, - gboolean clear); - -WXDLLIMPEXP_CORE -void gtk_pizza_set_filter (GtkPizza *pizza, - gboolean use); - -WXDLLIMPEXP_CORE -void gtk_pizza_set_external (GtkPizza *pizza, - gboolean expose); - -WXDLLIMPEXP_CORE -void gtk_pizza_scroll (GtkPizza *pizza, - gint dx, - gint dy); - -WXDLLIMPEXP_CORE -gint gtk_pizza_child_resized (GtkPizza *pizza, - GtkWidget *widget); - -WXDLLIMPEXP_CORE -void gtk_pizza_put (GtkPizza *pizza, - GtkWidget *widget, - gint x, - gint y, - gint width, - gint height); - -WXDLLIMPEXP_CORE -void gtk_pizza_move (GtkPizza *pizza, - GtkWidget *widget, - gint x, - gint y ); - -WXDLLIMPEXP_CORE -void gtk_pizza_resize (GtkPizza *pizza, - GtkWidget *widget, - gint width, - gint height ); - -WXDLLIMPEXP_CORE -void gtk_pizza_set_size (GtkPizza *pizza, - GtkWidget *widget, - gint x, - gint y, - gint width, - gint height); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* __GTK_PIZZA_H__ */ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/window.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/window.h deleted file mode 100644 index a7fd1e9bac..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/gtk1/window.h +++ /dev/null @@ -1,273 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk1/window.h -// Purpose: -// Author: Robert Roebling -// Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef __GTKWINDOWH__ -#define __GTKWINDOWH__ - -typedef struct _GtkTooltips GtkTooltips; -#ifdef HAVE_XIM -typedef struct _GdkIC GdkIC; -typedef struct _GdkICAttr GdkICAttr; -#endif - -//----------------------------------------------------------------------------- -// callback definition for inserting a window (internal) -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_FWD_CORE wxWindowGTK; -typedef void (*wxInsertChildFunction)( wxWindowGTK*, wxWindowGTK* ); - -//----------------------------------------------------------------------------- -// wxWindowGTK -//----------------------------------------------------------------------------- - -class WXDLLIMPEXP_CORE wxWindowGTK : public wxWindowBase -{ -public: - // creating the window - // ------------------- - wxWindowGTK(); - wxWindowGTK(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr); - bool Create(wxWindow *parent, - wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = 0, - const wxString& name = wxPanelNameStr); - virtual ~wxWindowGTK(); - - // implement base class (pure) virtual methods - // ------------------------------------------- - - virtual void SetLabel(const wxString& WXUNUSED(label)) { } - virtual wxString GetLabel() const { return wxEmptyString; } - - virtual bool Destroy(); - - virtual void Raise(); - virtual void Lower(); - - virtual bool Show( bool show = true ); - virtual void DoEnable( bool enable ); - - virtual void SetWindowStyleFlag( long style ); - - virtual bool IsRetained() const; - - virtual void SetFocus(); - virtual bool AcceptsFocus() const; - - virtual bool Reparent( wxWindowBase *newParent ); - - virtual void WarpPointer(int x, int y); - - virtual void Refresh( bool eraseBackground = true, - const wxRect *rect = (const wxRect *) NULL ); - virtual void Update(); - virtual void ClearBackground(); - - virtual bool SetBackgroundColour( const wxColour &colour ); - virtual bool SetForegroundColour( const wxColour &colour ); - virtual bool SetCursor( const wxCursor &cursor ); - virtual bool SetFont( const wxFont &font ); - - virtual bool SetBackgroundStyle(wxBackgroundStyle style) ; - - virtual int GetCharHeight() const; - virtual int GetCharWidth() const; - - virtual void SetScrollbar( int orient, int pos, int thumbVisible, - int range, bool refresh = true ); - virtual void SetScrollPos( int orient, int pos, bool refresh = true ); - virtual int GetScrollPos( int orient ) const; - virtual int GetScrollThumb( int orient ) const; - virtual int GetScrollRange( int orient ) const; - virtual void ScrollWindow( int dx, int dy, - const wxRect* rect = NULL ); - -#if wxUSE_DRAG_AND_DROP - virtual void SetDropTarget( wxDropTarget *dropTarget ); -#endif // wxUSE_DRAG_AND_DROP - - virtual bool IsDoubleBuffered() const { return false; } - - GdkWindow* GTKGetDrawingWindow() const; - - // implementation - // -------------- - - virtual WXWidget GetHandle() const { return m_widget; } - - // I don't want users to override what's done in idle so everything that - // has to be done in idle time in order for wxGTK to work is done in - // OnInternalIdle - virtual void OnInternalIdle(); - - // Internal representation of Update() - void GtkUpdate(); - - // For compatibility across platforms (not in event table) - void OnIdle(wxIdleEvent& WXUNUSED(event)) {} - - // Used by all window classes in the widget creation process. - bool PreCreation( wxWindowGTK *parent, const wxPoint &pos, const wxSize &size ); - void PostCreation(); - - // Internal addition of child windows. differs from class - // to class not by using virtual functions but by using - // the m_insertCallback. - void DoAddChild(wxWindowGTK *child); - - // This methods sends wxPaintEvents to the window. It reads the - // update region, breaks it up into rects and sends an event - // for each rect. It is also responsible for background erase - // events and NC paint events. It is called from "draw" and - // "expose" handlers as well as from ::Update() - void GtkSendPaintEvents(); - - // The methods below are required because many native widgets - // are composed of several subwidgets and setting a style for - // the widget means setting it for all subwidgets as well. - // also, it is not clear which native widget is the top - // widget where (most of) the input goes. even tooltips have - // to be applied to all subwidgets. - virtual GtkWidget* GetConnectWidget(); - virtual bool IsOwnGtkWindow( GdkWindow *window ); - void ConnectWidget( GtkWidget *widget ); - -#if wxUSE_TOOLTIPS - virtual void ApplyToolTip( GtkTooltips *tips, const wxChar *tip ); -#endif // wxUSE_TOOLTIPS - - // Call after modifing the value of m_hAdjust or m_vAdjust to bring the - // scrolbar in sync (this does not generate any wx events) - void GtkUpdateScrollbar(int orient); - - // Called from GTK signal handlers. it indicates that - // the layout functions have to be called later on - // (i.e. in idle time, implemented in OnInternalIdle() ). - void GtkUpdateSize() { m_sizeSet = false; } - - // fix up the mouse event coords, used by wxListBox only so far - virtual void FixUpMouseEvent(GtkWidget * WXUNUSED(widget), - wxCoord& WXUNUSED(x), - wxCoord& WXUNUSED(y)) { } - - // is this window transparent for the mouse events (as wxStaticBox is)? - virtual bool IsTransparentForMouse() const { return false; } - - // is this a radiobutton (used by radiobutton code itself only)? - virtual bool IsRadioButton() const { return false; } - - // position and size of the window - int m_x, m_y; - int m_width, m_height; - int m_oldClientWidth,m_oldClientHeight; - - // see the docs in src/gtk/window.cpp - GtkWidget *m_widget; // mostly the widget seen by the rest of GTK - GtkWidget *m_wxwindow; // mostly the client area as per wxWidgets - - // this widget will be queried for GTK's focus events - GtkWidget *m_focusWidget; - -#ifdef HAVE_XIM - // XIM support for wxWidgets - GdkIC *m_ic; - GdkICAttr *m_icattr; -#endif // HAVE_XIM - - // The area to be cleared (and not just refreshed) - // We cannot make this distinction under GTK 2.0. - wxRegion m_clearRegion; - - // scrolling stuff - GtkAdjustment *m_hAdjust,*m_vAdjust; - float m_oldHorizontalPos; - float m_oldVerticalPos; - - // extra (wxGTK-specific) flags - bool m_needParent:1; // ! wxFrame, wxDialog, wxNotebookPage ? - bool m_noExpose:1; // wxGLCanvas has its own redrawing - bool m_nativeSizeEvent:1; // wxGLCanvas sends wxSizeEvent upon "alloc_size" - bool m_hasScrolling:1; - bool m_hasVMT:1; - bool m_sizeSet:1; - bool m_resizing:1; - bool m_acceptsFocus:1; // true if not static - bool m_hasFocus:1; // true if == FindFocus() - bool m_isScrolling:1; // dragging scrollbar thumb? - bool m_clipPaintRegion:1; // true after ScrollWindow() - bool m_needsStyleChange:1; // May not be able to change - // background style until OnIdle - - // C++ has no virtual methods in the constrcutor of any class but we need - // different methods of inserting a child window into a wxFrame, - // wxMDIFrame, wxNotebook etc. this is the callback that will get used. - wxInsertChildFunction m_insertCallback; - - // implement the base class pure virtuals - virtual void DoGetTextExtent(const wxString& string, - int *x, int *y, - int *descent = NULL, - int *externalLeading = NULL, - const wxFont *theFont = NULL) const; - -#if wxUSE_MENUS_NATIVE - virtual bool DoPopupMenu( wxMenu *menu, int x, int y ); -#endif // wxUSE_MENUS_NATIVE - - virtual void DoClientToScreen( int *x, int *y ) const; - virtual void DoScreenToClient( int *x, int *y ) const; - virtual void DoGetPosition( int *x, int *y ) const; - virtual void DoGetSize( int *width, int *height ) const; - virtual void DoGetClientSize( int *width, int *height ) const; - virtual void DoSetSize(int x, int y, - int width, int height, - int sizeFlags = wxSIZE_AUTO); - virtual void DoSetClientSize(int width, int height); - virtual void DoMoveWindow(int x, int y, int width, int height); - - virtual void DoCaptureMouse(); - virtual void DoReleaseMouse(); - -#if wxUSE_TOOLTIPS - virtual void DoSetToolTip( wxToolTip *tip ); -#endif // wxUSE_TOOLTIPS - -protected: - // common part of all ctors (not virtual because called from ctor) - void Init(); - - // Called by ApplyWidgetStyle (which is called by SetFont() and - // SetXXXColour etc to apply style changed to native widgets) to create - // modified GTK style with non-standard attributes. If forceStyle=true, - // creates empty GtkRcStyle if there are no modifications, otherwise - // returns NULL in such case. - GtkRcStyle *CreateWidgetStyle(bool forceStyle = false); - - // Overridden in many GTK widgets who have to handle subwidgets - virtual void ApplyWidgetStyle(bool forceStyle = false); - - // helper function to ease native widgets wrapping, called by - // ApplyWidgetStyle -- override this, not ApplyWidgetStyle - virtual void DoApplyWidgetStyle(GtkRcStyle *style); - -private: - DECLARE_DYNAMIC_CLASS(wxWindowGTK) - wxDECLARE_NO_COPY_CLASS(wxWindowGTK); -}; - -extern WXDLLIMPEXP_CORE wxWindow *wxFindFocusedChild(wxWindowGTK *win); - -#endif // __GTKWINDOWH__ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/forcelnk.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/forcelnk.h deleted file mode 100644 index 8d3631c903..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/forcelnk.h +++ /dev/null @@ -1,62 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/html/forcelnk.h -// Purpose: macros which force the linker to link apparently unused code -// Author: Vaclav Slavik -// Copyright: (c) Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -/* - -DESCRPITON: - -mod_*.cpp files contain handlers for tags. These files are modules - they contain -one wxTagModule class and it's OnInit() method is called from wxApp's init method. -The module is called even if you only link it into the executable, so everything -seems wonderful. - -The problem is that we have these modules in LIBRARY and mod_*.cpp files contain -no method nor class which is known out of the module. So the linker won't -link these .o/.obj files into executable because it detected that it is not used -by the program. - -To workaround this I introduced set of macros FORCE_LINK_ME and FORCE_LINK. These -macros are generic and are not limited to mod_*.cpp files. You may find them quite -useful somewhere else... - -How to use them: -let's suppose you want to always link file foo.cpp and that you have module -always.cpp that is certainly always linked (e.g. the one with main() function -or htmlwin.cpp in wxHtml library). - -Place FORCE_LINK_ME(foo) somewhere in foo.cpp and FORCE_LINK(foo) somewhere -in always.cpp -See mod_*.cpp and htmlwin.cpp for example :-) - -*/ - - -#ifndef _WX_FORCELNK_H_ -#define _WX_FORCELNK_H_ - -#include "wx/link.h" - -// compatibility defines -#define FORCE_LINK wxFORCE_LINK_MODULE -#define FORCE_LINK_ME wxFORCE_LINK_THIS_MODULE - -#define FORCE_WXHTML_MODULES() \ - FORCE_LINK(m_layout) \ - FORCE_LINK(m_fonts) \ - FORCE_LINK(m_image) \ - FORCE_LINK(m_list) \ - FORCE_LINK(m_dflist) \ - FORCE_LINK(m_pre) \ - FORCE_LINK(m_hline) \ - FORCE_LINK(m_links) \ - FORCE_LINK(m_tables) \ - FORCE_LINK(m_span) \ - FORCE_LINK(m_style) - - -#endif // _WX_FORCELNK_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/helpctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/helpctrl.h deleted file mode 100644 index 0053823a88..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/helpctrl.h +++ /dev/null @@ -1,164 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/html/helpctrl.h -// Purpose: wxHtmlHelpController -// Notes: Based on htmlhelp.cpp, implementing a monolithic -// HTML Help controller class, by Vaclav Slavik -// Author: Harm van der Heijden and Vaclav Slavik -// Copyright: (c) Harm van der Heijden and Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HELPCTRL_H_ -#define _WX_HELPCTRL_H_ - -#include "wx/defs.h" - -#if wxUSE_WXHTML_HELP - -#include "wx/helpbase.h" -#include "wx/html/helpfrm.h" - -#define wxID_HTML_HELPFRAME (wxID_HIGHEST + 1) - -// This style indicates that the window is -// embedded in the application and must not be -// destroyed by the help controller. -#define wxHF_EMBEDDED 0x00008000 - -// Create a dialog for the help window. -#define wxHF_DIALOG 0x00010000 - -// Create a frame for the help window. -#define wxHF_FRAME 0x00020000 - -// Make the dialog modal when displaying help. -#define wxHF_MODAL 0x00040000 - -class WXDLLIMPEXP_FWD_HTML wxHtmlHelpDialog; -class WXDLLIMPEXP_FWD_HTML wxHtmlHelpWindow; -class WXDLLIMPEXP_FWD_HTML wxHtmlHelpFrame; -class WXDLLIMPEXP_FWD_HTML wxHtmlHelpDialog; - -class WXDLLIMPEXP_HTML wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler -{ - DECLARE_DYNAMIC_CLASS(wxHtmlHelpController) - -public: - wxHtmlHelpController(int style = wxHF_DEFAULT_STYLE, wxWindow* parentWindow = NULL); - wxHtmlHelpController(wxWindow* parentWindow, int style = wxHF_DEFAULT_STYLE); - - virtual ~wxHtmlHelpController(); - - void SetShouldPreventAppExit(bool enable); - - void SetTitleFormat(const wxString& format); - void SetTempDir(const wxString& path) { m_helpData.SetTempDir(path); } - bool AddBook(const wxString& book_url, bool show_wait_msg = false); - bool AddBook(const wxFileName& book_file, bool show_wait_msg = false); - - bool Display(const wxString& x); - bool Display(int id); - bool DisplayContents(); - bool DisplayIndex(); - bool KeywordSearch(const wxString& keyword, - wxHelpSearchMode mode = wxHELP_SEARCH_ALL); - - wxHtmlHelpWindow* GetHelpWindow() { return m_helpWindow; } - void SetHelpWindow(wxHtmlHelpWindow* helpWindow); - - wxHtmlHelpFrame* GetFrame() { return m_helpFrame; } - wxHtmlHelpDialog* GetDialog() { return m_helpDialog; } - -#if wxUSE_CONFIG - void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString); - - // Assigns config object to the Ctrl. This config is then - // used in subsequent calls to Read/WriteCustomization of both help - // Ctrl and it's wxHtmlWindow - virtual void ReadCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString); - virtual void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString); -#endif // wxUSE_CONFIG - - //// Backward compatibility with wxHelpController API - - virtual bool Initialize(const wxString& file, int WXUNUSED(server) ) { return Initialize(file); } - virtual bool Initialize(const wxString& file); - virtual void SetViewer(const wxString& WXUNUSED(viewer), long WXUNUSED(flags) = 0) {} - virtual bool LoadFile(const wxString& file = wxT("")); - virtual bool DisplaySection(int sectionNo); - virtual bool DisplaySection(const wxString& section) { return Display(section); } - virtual bool DisplayBlock(long blockNo) { return DisplaySection(blockNo); } - virtual bool DisplayTextPopup(const wxString& text, const wxPoint& pos); - - virtual void SetFrameParameters(const wxString& titleFormat, - const wxSize& size, - const wxPoint& pos = wxDefaultPosition, - bool newFrameEachTime = false); - /// Obtains the latest settings used by the help frame and the help - /// frame. - virtual wxFrame *GetFrameParameters(wxSize *size = NULL, - wxPoint *pos = NULL, - bool *newFrameEachTime = NULL); - - // Get direct access to help data: - wxHtmlHelpData *GetHelpData() { return &m_helpData; } - - virtual bool Quit() ; - virtual void OnQuit() {} - - void OnCloseFrame(wxCloseEvent& evt); - - // Make the help controller's frame 'modal' if - // needed - void MakeModalIfNeeded(); - - // Find the top-most parent window - wxWindow* FindTopLevelWindow(); - -protected: - void Init(int style); - - virtual wxWindow* CreateHelpWindow(); - virtual wxHtmlHelpFrame* CreateHelpFrame(wxHtmlHelpData *data); - virtual wxHtmlHelpDialog* CreateHelpDialog(wxHtmlHelpData *data); - virtual void DestroyHelpWindow(); - - wxHtmlHelpData m_helpData; - wxHtmlHelpWindow* m_helpWindow; -#if wxUSE_CONFIG - wxConfigBase * m_Config; - wxString m_ConfigRoot; -#endif // wxUSE_CONFIG - wxString m_titleFormat; - int m_FrameStyle; - wxHtmlHelpFrame* m_helpFrame; - wxHtmlHelpDialog* m_helpDialog; - - bool m_shouldPreventAppExit; - - wxDECLARE_NO_COPY_CLASS(wxHtmlHelpController); -}; - -/* - * wxHtmlModalHelp - * A convenience class particularly for use on wxMac, - * where you can only show modal dialogs from a modal - * dialog. - * - * Use like this: - * - * wxHtmlModalHelp help(parent, filename, topic); - * - * If topic is empty, the help contents is displayed. - */ - -class WXDLLIMPEXP_HTML wxHtmlModalHelp -{ -public: - wxHtmlModalHelp(wxWindow* parent, const wxString& helpFile, const wxString& topic = wxEmptyString, - int style = wxHF_DEFAULT_STYLE | wxHF_DIALOG | wxHF_MODAL); -}; - -#endif // wxUSE_WXHTML_HELP - -#endif // _WX_HELPCTRL_H_ diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/helpdata.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/helpdata.h deleted file mode 100644 index 5b4480379b..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/helpdata.h +++ /dev/null @@ -1,222 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/html/helpdata.h -// Purpose: wxHtmlHelpData -// Notes: Based on htmlhelp.cpp, implementing a monolithic -// HTML Help controller class, by Vaclav Slavik -// Author: Harm van der Heijden and Vaclav Slavik -// Copyright: (c) Harm van der Heijden and Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HELPDATA_H_ -#define _WX_HELPDATA_H_ - -#include "wx/defs.h" - -#if wxUSE_HTML - -#include "wx/object.h" -#include "wx/string.h" -#include "wx/filesys.h" -#include "wx/dynarray.h" -#include "wx/font.h" - -class WXDLLIMPEXP_FWD_HTML wxHtmlHelpData; - -//-------------------------------------------------------------------------------- -// helper classes & structs -//-------------------------------------------------------------------------------- - -class WXDLLIMPEXP_HTML wxHtmlBookRecord -{ -public: - wxHtmlBookRecord(const wxString& bookfile, const wxString& basepath, - const wxString& title, const wxString& start) - { - m_BookFile = bookfile; - m_BasePath = basepath; - m_Title = title; - m_Start = start; - // for debugging, give the contents index obvious default values - m_ContentsStart = m_ContentsEnd = -1; - } - wxString GetBookFile() const { return m_BookFile; } - wxString GetTitle() const { return m_Title; } - wxString GetStart() const { return m_Start; } - wxString GetBasePath() const { return m_BasePath; } - /* SetContentsRange: store in the bookrecord where in the index/contents lists the - * book's records are stored. This to facilitate searching in a specific book. - * This code will have to be revised when loading/removing books becomes dynamic. - * (as opposed to appending only) - * Note that storing index range is pointless, because the index is alphab. sorted. */ - void SetContentsRange(int start, int end) { m_ContentsStart = start; m_ContentsEnd = end; } - int GetContentsStart() const { return m_ContentsStart; } - int GetContentsEnd() const { return m_ContentsEnd; } - - void SetTitle(const wxString& title) { m_Title = title; } - void SetBasePath(const wxString& path) { m_BasePath = path; } - void SetStart(const wxString& start) { m_Start = start; } - - // returns full filename of page (which is part of the book), - // i.e. with book's basePath prepended. If page is already absolute - // path, basePath is _not_ prepended. - wxString GetFullPath(const wxString &page) const; - -protected: - wxString m_BookFile; - wxString m_BasePath; - wxString m_Title; - wxString m_Start; - int m_ContentsStart; - int m_ContentsEnd; -}; - - -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxHtmlBookRecord, wxHtmlBookRecArray, - WXDLLIMPEXP_HTML); - -struct WXDLLIMPEXP_HTML wxHtmlHelpDataItem -{ - wxHtmlHelpDataItem() : level(0), parent(NULL), id(wxID_ANY), book(NULL) {} - - int level; - wxHtmlHelpDataItem *parent; - int id; - wxString name; - wxString page; - wxHtmlBookRecord *book; - - // returns full filename of m_Page, i.e. with book's basePath prepended - wxString GetFullPath() const { return book->GetFullPath(page); } - - // returns item indented with spaces if it has level>1: - wxString GetIndentedName() const; -}; - -WX_DECLARE_USER_EXPORTED_OBJARRAY(wxHtmlHelpDataItem, wxHtmlHelpDataItems, - WXDLLIMPEXP_HTML); - - -//------------------------------------------------------------------------------ -// wxHtmlSearchEngine -// This class takes input streams and scans them for occurrence -// of keyword(s) -//------------------------------------------------------------------------------ - -class WXDLLIMPEXP_HTML wxHtmlSearchEngine : public wxObject -{ -public: - wxHtmlSearchEngine() : wxObject() {} - virtual ~wxHtmlSearchEngine() {} - - // Sets the keyword we will be searching for - virtual void LookFor(const wxString& keyword, bool case_sensitive, bool whole_words_only); - - // Scans the stream for the keyword. - // Returns true if the stream contains keyword, fALSE otherwise - virtual bool Scan(const wxFSFile& file); - -private: - wxString m_Keyword; - bool m_CaseSensitive; - bool m_WholeWords; - - wxDECLARE_NO_COPY_CLASS(wxHtmlSearchEngine); -}; - - -// State information of a search action. I'd have preferred to make this a -// nested class inside wxHtmlHelpData, but that's against coding standards :-( -// Never construct this class yourself, obtain a copy from -// wxHtmlHelpData::PrepareKeywordSearch(const wxString& key) -class WXDLLIMPEXP_HTML wxHtmlSearchStatus -{ -public: - // constructor; supply wxHtmlHelpData ptr, the keyword and (optionally) the - // title of the book to search. By default, all books are searched. - wxHtmlSearchStatus(wxHtmlHelpData* base, const wxString& keyword, - bool case_sensitive, bool whole_words_only, - const wxString& book = wxEmptyString); - bool Search(); // do the next iteration - bool IsActive() { return m_Active; } - int GetCurIndex() { return m_CurIndex; } - int GetMaxIndex() { return m_MaxIndex; } - const wxString& GetName() { return m_Name; } - - const wxHtmlHelpDataItem *GetCurItem() const { return m_CurItem; } - -private: - wxHtmlHelpData* m_Data; - wxHtmlSearchEngine m_Engine; - wxString m_Keyword, m_Name; - wxString m_LastPage; - wxHtmlHelpDataItem* m_CurItem; - bool m_Active; // search is not finished - int m_CurIndex; // where we are now - int m_MaxIndex; // number of files we search - // For progress bar: 100*curindex/maxindex = % complete - - wxDECLARE_NO_COPY_CLASS(wxHtmlSearchStatus); -}; - -class WXDLLIMPEXP_HTML wxHtmlHelpData : public wxObject -{ - DECLARE_DYNAMIC_CLASS(wxHtmlHelpData) - friend class wxHtmlSearchStatus; - -public: - wxHtmlHelpData(); - virtual ~wxHtmlHelpData(); - - // Sets directory where temporary files are stored. - // These temp files are index & contents file in binary (much faster to read) - // form. These files are NOT deleted on program's exit. - void SetTempDir(const wxString& path); - - // Adds new book. 'book' is location of .htb file (stands for "html book"). - // See documentation for details on its format. - // Returns success. - bool AddBook(const wxString& book); - bool AddBookParam(const wxFSFile& bookfile, - wxFontEncoding encoding, - const wxString& title, const wxString& contfile, - const wxString& indexfile = wxEmptyString, - const wxString& deftopic = wxEmptyString, - const wxString& path = wxEmptyString); - - // Some accessing stuff: - - // returns URL of page on basis of (file)name - wxString FindPageByName(const wxString& page); - // returns URL of page on basis of MS id - wxString FindPageById(int id); - - const wxHtmlBookRecArray& GetBookRecArray() const { return m_bookRecords; } - - const wxHtmlHelpDataItems& GetContentsArray() const { return m_contents; } - const wxHtmlHelpDataItems& GetIndexArray() const { return m_index; } - -protected: - wxString m_tempPath; - - // each book has one record in this array: - wxHtmlBookRecArray m_bookRecords; - - wxHtmlHelpDataItems m_contents; // list of all available books and pages - wxHtmlHelpDataItems m_index; // list of index itesm - -protected: - // Imports .hhp files (MS HTML Help Workshop) - bool LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys, - const wxString& indexfile, const wxString& contentsfile); - // Reads binary book - bool LoadCachedBook(wxHtmlBookRecord *book, wxInputStream *f); - // Writes binary book - bool SaveCachedBook(wxHtmlBookRecord *book, wxOutputStream *f); - - wxDECLARE_NO_COPY_CLASS(wxHtmlHelpData); -}; - -#endif - -#endif diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/helpdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/helpdlg.h deleted file mode 100644 index fd86b2e3f3..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/helpdlg.h +++ /dev/null @@ -1,89 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/html/helpdlg.h -// Purpose: wxHtmlHelpDialog -// Notes: Based on htmlhelp.cpp, implementing a monolithic -// HTML Help controller class, by Vaclav Slavik -// Author: Harm van der Heijden, Vaclav Slavik, Julian Smart -// Copyright: (c) Harm van der Heijden, Vaclav Slavik, Julian Smart -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HELPDLG_H_ -#define _WX_HELPDLG_H_ - -#include "wx/defs.h" - -#if wxUSE_WXHTML_HELP - -#include "wx/html/helpdata.h" -#include "wx/window.h" -#include "wx/dialog.h" -#include "wx/frame.h" -#include "wx/config.h" -#include "wx/splitter.h" -#include "wx/notebook.h" -#include "wx/listbox.h" -#include "wx/choice.h" -#include "wx/combobox.h" -#include "wx/checkbox.h" -#include "wx/stattext.h" -#include "wx/html/htmlwin.h" -#include "wx/html/helpwnd.h" -#include "wx/html/htmprint.h" - -class WXDLLIMPEXP_FWD_HTML wxHtmlHelpController; -class WXDLLIMPEXP_FWD_HTML wxHtmlHelpWindow; - -class WXDLLIMPEXP_HTML wxHtmlHelpDialog : public wxDialog -{ - DECLARE_DYNAMIC_CLASS(wxHtmlHelpDialog) - -public: - wxHtmlHelpDialog(wxHtmlHelpData* data = NULL) { Init(data); } - wxHtmlHelpDialog(wxWindow* parent, wxWindowID wxWindowID, - const wxString& title = wxEmptyString, - int style = wxHF_DEFAULT_STYLE, wxHtmlHelpData* data = NULL); - virtual ~wxHtmlHelpDialog(); - - bool Create(wxWindow* parent, wxWindowID id, const wxString& title = wxEmptyString, - int style = wxHF_DEFAULT_STYLE); - - /// Returns the data associated with this dialog. - wxHtmlHelpData* GetData() { return m_Data; } - - /// Returns the controller that created this dialog. - wxHtmlHelpController* GetController() const { return m_helpController; } - - /// Sets the controller associated with this dialog. - void SetController(wxHtmlHelpController* controller) { m_helpController = controller; } - - /// Returns the help window. - wxHtmlHelpWindow* GetHelpWindow() const { return m_HtmlHelpWin; } - - // Sets format of title of the frame. Must contain exactly one "%s" - // (for title of displayed HTML page) - void SetTitleFormat(const wxString& format); - - // Override to add custom buttons to the toolbar - virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {} - -protected: - void Init(wxHtmlHelpData* data = NULL); - - void OnCloseWindow(wxCloseEvent& event); - -protected: - // Temporary pointer to pass to window - wxHtmlHelpData* m_Data; - wxString m_TitleFormat; // title of the help frame - wxHtmlHelpWindow *m_HtmlHelpWin; - wxHtmlHelpController* m_helpController; - - DECLARE_EVENT_TABLE() - wxDECLARE_NO_COPY_CLASS(wxHtmlHelpDialog); -}; - -#endif - // wxUSE_WXHTML_HELP - -#endif diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/helpfrm.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/helpfrm.h deleted file mode 100644 index 89225eb27b..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/helpfrm.h +++ /dev/null @@ -1,157 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/html/helpfrm.h -// Purpose: wxHtmlHelpFrame -// Notes: Based on htmlhelp.cpp, implementing a monolithic -// HTML Help controller class, by Vaclav Slavik -// Author: Harm van der Heijden and Vaclav Slavik -// Copyright: (c) Harm van der Heijden and Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HELPFRM_H_ -#define _WX_HELPFRM_H_ - -#include "wx/defs.h" - -#if wxUSE_WXHTML_HELP - -#include "wx/helpbase.h" -#include "wx/html/helpdata.h" -#include "wx/window.h" -#include "wx/frame.h" -#include "wx/config.h" -#include "wx/splitter.h" -#include "wx/notebook.h" -#include "wx/listbox.h" -#include "wx/choice.h" -#include "wx/combobox.h" -#include "wx/checkbox.h" -#include "wx/stattext.h" -#include "wx/html/htmlwin.h" -#include "wx/html/helpwnd.h" -#include "wx/html/htmprint.h" - -class WXDLLIMPEXP_FWD_CORE wxButton; -class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -class WXDLLIMPEXP_FWD_CORE wxTreeEvent; -class WXDLLIMPEXP_FWD_CORE wxTreeCtrl; - - -// style flags for the Help Frame -#define wxHF_TOOLBAR 0x0001 -#define wxHF_CONTENTS 0x0002 -#define wxHF_INDEX 0x0004 -#define wxHF_SEARCH 0x0008 -#define wxHF_BOOKMARKS 0x0010 -#define wxHF_OPEN_FILES 0x0020 -#define wxHF_PRINT 0x0040 -#define wxHF_FLAT_TOOLBAR 0x0080 -#define wxHF_MERGE_BOOKS 0x0100 -#define wxHF_ICONS_BOOK 0x0200 -#define wxHF_ICONS_BOOK_CHAPTER 0x0400 -#define wxHF_ICONS_FOLDER 0x0000 // this is 0 since it is default -#define wxHF_DEFAULT_STYLE (wxHF_TOOLBAR | wxHF_CONTENTS | \ - wxHF_INDEX | wxHF_SEARCH | \ - wxHF_BOOKMARKS | wxHF_PRINT) -//compatibility: -#define wxHF_OPENFILES wxHF_OPEN_FILES -#define wxHF_FLATTOOLBAR wxHF_FLAT_TOOLBAR -#define wxHF_DEFAULTSTYLE wxHF_DEFAULT_STYLE - -struct wxHtmlHelpMergedIndexItem; -class wxHtmlHelpMergedIndex; - -class WXDLLIMPEXP_FWD_CORE wxHelpControllerBase; -class WXDLLIMPEXP_FWD_HTML wxHtmlHelpController; -class WXDLLIMPEXP_FWD_HTML wxHtmlHelpWindow; - -class WXDLLIMPEXP_HTML wxHtmlHelpFrame : public wxFrame -{ - DECLARE_DYNAMIC_CLASS(wxHtmlHelpFrame) - -public: - wxHtmlHelpFrame(wxHtmlHelpData* data = NULL) { Init(data); } - wxHtmlHelpFrame(wxWindow* parent, wxWindowID wxWindowID, - const wxString& title = wxEmptyString, - int style = wxHF_DEFAULT_STYLE, wxHtmlHelpData* data = NULL -#if wxUSE_CONFIG - , wxConfigBase *config=NULL, const wxString& rootpath = wxEmptyString -#endif // wxUSE_CONFIG - ); - bool Create(wxWindow* parent, wxWindowID id, const wxString& title = wxEmptyString, - int style = wxHF_DEFAULT_STYLE -#if wxUSE_CONFIG - , wxConfigBase *config=NULL, const wxString& rootpath = wxEmptyString -#endif // wxUSE_CONFIG - ); - virtual ~wxHtmlHelpFrame(); - - /// Returns the data associated with the window. - wxHtmlHelpData* GetData() { return m_Data; } - - /// Returns the help controller associated with the window. - wxHtmlHelpController* GetController() const { return m_helpController; } - - /// Sets the help controller associated with the window. - void SetController(wxHtmlHelpController* controller); - - /// Returns the help window. - wxHtmlHelpWindow* GetHelpWindow() const { return m_HtmlHelpWin; } - - // Sets format of title of the frame. Must contain exactly one "%s" - // (for title of displayed HTML page) - void SetTitleFormat(const wxString& format); - -#if wxUSE_CONFIG - // For compatibility - void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString); -#endif // wxUSE_CONFIG - - // Make the help controller's frame 'modal' if - // needed - void AddGrabIfNeeded(); - - // Override to add custom buttons to the toolbar - virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {} - - void SetShouldPreventAppExit(bool enable); - - // we don't want to prevent the app from closing just because a help window - // remains opened - virtual bool ShouldPreventAppExit() const { return m_shouldPreventAppExit; } - -protected: - void Init(wxHtmlHelpData* data = NULL); - - void OnCloseWindow(wxCloseEvent& event); - void OnActivate(wxActivateEvent& event); - -#ifdef __WXMAC__ - void OnClose(wxCommandEvent& event); - void OnAbout(wxCommandEvent& event); -#endif - - // Images: - enum { - IMG_Book = 0, - IMG_Folder, - IMG_Page - }; - -protected: - wxHtmlHelpData* m_Data; - bool m_DataCreated; // m_Data created by frame, or supplied? - wxString m_TitleFormat; // title of the help frame - wxHtmlHelpWindow *m_HtmlHelpWin; - wxHtmlHelpController* m_helpController; - bool m_shouldPreventAppExit; - -private: - - DECLARE_EVENT_TABLE() - wxDECLARE_NO_COPY_CLASS(wxHtmlHelpFrame); -}; - -#endif // wxUSE_WXHTML_HELP - -#endif diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/helpwnd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/helpwnd.h deleted file mode 100644 index 803c0da14b..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/helpwnd.h +++ /dev/null @@ -1,304 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/html/helpwnd.h -// Purpose: wxHtmlHelpWindow -// Notes: Based on htmlhelp.cpp, implementing a monolithic -// HTML Help controller class, by Vaclav Slavik -// Author: Harm van der Heijden and Vaclav Slavik -// Copyright: (c) Harm van der Heijden and Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HELPWND_H_ -#define _WX_HELPWND_H_ - -#include "wx/defs.h" - -#if wxUSE_WXHTML_HELP - -#include "wx/helpbase.h" -#include "wx/html/helpdata.h" -#include "wx/window.h" -#include "wx/frame.h" -#include "wx/config.h" -#include "wx/splitter.h" -#include "wx/notebook.h" -#include "wx/listbox.h" -#include "wx/choice.h" -#include "wx/combobox.h" -#include "wx/checkbox.h" -#include "wx/stattext.h" -#include "wx/hash.h" -#include "wx/html/htmlwin.h" -#include "wx/html/htmprint.h" - -class WXDLLIMPEXP_FWD_CORE wxButton; -class WXDLLIMPEXP_FWD_CORE wxTextCtrl; -class WXDLLIMPEXP_FWD_CORE wxTreeEvent; -class WXDLLIMPEXP_FWD_CORE wxTreeCtrl; - -// style flags for the Help Frame -#define wxHF_TOOLBAR 0x0001 -#define wxHF_CONTENTS 0x0002 -#define wxHF_INDEX 0x0004 -#define wxHF_SEARCH 0x0008 -#define wxHF_BOOKMARKS 0x0010 -#define wxHF_OPEN_FILES 0x0020 -#define wxHF_PRINT 0x0040 -#define wxHF_FLAT_TOOLBAR 0x0080 -#define wxHF_MERGE_BOOKS 0x0100 -#define wxHF_ICONS_BOOK 0x0200 -#define wxHF_ICONS_BOOK_CHAPTER 0x0400 -#define wxHF_ICONS_FOLDER 0x0000 // this is 0 since it is default -#define wxHF_DEFAULT_STYLE (wxHF_TOOLBAR | wxHF_CONTENTS | \ - wxHF_INDEX | wxHF_SEARCH | \ - wxHF_BOOKMARKS | wxHF_PRINT) -//compatibility: -#define wxHF_OPENFILES wxHF_OPEN_FILES -#define wxHF_FLATTOOLBAR wxHF_FLAT_TOOLBAR -#define wxHF_DEFAULTSTYLE wxHF_DEFAULT_STYLE - -struct wxHtmlHelpFrameCfg -{ - int x, y, w, h; - long sashpos; - bool navig_on; -}; - -struct wxHtmlHelpMergedIndexItem; -class wxHtmlHelpMergedIndex; - -class WXDLLIMPEXP_FWD_CORE wxHelpControllerBase; -class WXDLLIMPEXP_FWD_HTML wxHtmlHelpController; - -/*! - * Help window - */ - -class WXDLLIMPEXP_HTML wxHtmlHelpWindow : public wxWindow -{ - DECLARE_DYNAMIC_CLASS(wxHtmlHelpWindow) - -public: - wxHtmlHelpWindow(wxHtmlHelpData* data = NULL) { Init(data); } - wxHtmlHelpWindow(wxWindow* parent, wxWindowID wxWindowID, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int style = wxTAB_TRAVERSAL|wxNO_BORDER, - int helpStyle = wxHF_DEFAULT_STYLE, - wxHtmlHelpData* data = NULL); - bool Create(wxWindow* parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - int style = wxTAB_TRAVERSAL|wxNO_BORDER, - int helpStyle = wxHF_DEFAULT_STYLE); - virtual ~wxHtmlHelpWindow(); - - wxHtmlHelpData* GetData() { return m_Data; } - wxHtmlHelpController* GetController() const { return m_helpController; } - void SetController(wxHtmlHelpController* controller); - - // Displays page x. If not found it will offect the user a choice of - // searching books. - // Looking for the page runs in these steps: - // 1. try to locate file named x (if x is for example "doc/howto.htm") - // 2. try to open starting page of book x - // 3. try to find x in contents (if x is for example "How To ...") - // 4. try to find x in index (if x is for example "How To ...") - bool Display(const wxString& x); - - // Alternative version that works with numeric ID. - // (uses extension to MS format, , see docs) - bool Display(const int id); - - // Displays help window and focuses contents. - bool DisplayContents(); - - // Displays help window and focuses index. - bool DisplayIndex(); - - // Searches for keyword. Returns true and display page if found, return - // false otherwise - // Syntax of keyword is Altavista-like: - // * words are separated by spaces - // (but "\"hello world\"" is only one world "hello world") - // * word may be pretended by + or - - // (+ : page must contain the word ; - : page can't contain the word) - // * if there is no + or - before the word, + is default - bool KeywordSearch(const wxString& keyword, - wxHelpSearchMode mode = wxHELP_SEARCH_ALL); - -#if wxUSE_CONFIG - void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString) - { - m_Config = config; - m_ConfigRoot = rootpath; - ReadCustomization(config, rootpath); - } - - // Saves custom settings into cfg config. it will use the path 'path' - // if given, otherwise it will save info into currently selected path. - // saved values : things set by SetFonts, SetBorders. - void ReadCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString); - void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString); -#endif // wxUSE_CONFIG - - // call this to let wxHtmlHelpWindow know page changed - void NotifyPageChanged(); - - // Refreshes Contents and Index tabs - void RefreshLists(); - - // Gets the HTML window - wxHtmlWindow* GetHtmlWindow() const { return m_HtmlWin; } - - // Gets the splitter window - wxSplitterWindow* GetSplitterWindow() const { return m_Splitter; } - - // Gets the toolbar - wxToolBar* GetToolBar() const { return m_toolBar; } - - // Gets the configuration data - wxHtmlHelpFrameCfg& GetCfgData() { return m_Cfg; } - - // Gets the tree control - wxTreeCtrl *GetTreeCtrl() const { return m_ContentsBox; } - -protected: - void Init(wxHtmlHelpData* data = NULL); - - // Adds items to m_Contents tree control - void CreateContents(); - - // Adds items to m_IndexList - void CreateIndex(); - - // Add books to search choice panel - void CreateSearch(); - - // Updates "merged index" structure that combines indexes of all books - // into better searchable structure - void UpdateMergedIndex(); - - // Add custom buttons to toolbar - virtual void AddToolbarButtons(wxToolBar *toolBar, int style); - - // Displays options dialog (fonts etc.) - virtual void OptionsDialog(); - - void OnToolbar(wxCommandEvent& event); - void OnContentsSel(wxTreeEvent& event); - void OnIndexSel(wxCommandEvent& event); - void OnIndexFind(wxCommandEvent& event); - void OnIndexAll(wxCommandEvent& event); - void OnSearchSel(wxCommandEvent& event); - void OnSearch(wxCommandEvent& event); - void OnBookmarksSel(wxCommandEvent& event); - void OnSize(wxSizeEvent& event); - - // Images: - enum { - IMG_Book = 0, - IMG_Folder, - IMG_Page - }; - -protected: - wxHtmlHelpData* m_Data; - bool m_DataCreated; // m_Data created by frame, or supplied? - wxString m_TitleFormat; // title of the help frame - // below are various pointers to GUI components - wxHtmlWindow *m_HtmlWin; - wxSplitterWindow *m_Splitter; - wxPanel *m_NavigPan; - wxNotebook *m_NavigNotebook; - wxTreeCtrl *m_ContentsBox; - wxTextCtrl *m_IndexText; - wxButton *m_IndexButton; - wxButton *m_IndexButtonAll; - wxListBox *m_IndexList; - wxTextCtrl *m_SearchText; - wxButton *m_SearchButton; - wxListBox *m_SearchList; - wxChoice *m_SearchChoice; - wxStaticText *m_IndexCountInfo; - wxCheckBox *m_SearchCaseSensitive; - wxCheckBox *m_SearchWholeWords; - wxToolBar* m_toolBar; - - wxComboBox *m_Bookmarks; - wxArrayString m_BookmarksNames, m_BookmarksPages; - - wxHtmlHelpFrameCfg m_Cfg; - -#if wxUSE_CONFIG - wxConfigBase *m_Config; - wxString m_ConfigRoot; -#endif // wxUSE_CONFIG - - // pagenumbers of controls in notebook (usually 0,1,2) - int m_ContentsPage; - int m_IndexPage; - int m_SearchPage; - - // lists of available fonts (used in options dialog) - wxArrayString *m_NormalFonts, *m_FixedFonts; - int m_FontSize; // 0,1,2 = small,medium,big - wxString m_NormalFace, m_FixedFace; - - bool m_UpdateContents; - -#if wxUSE_PRINTING_ARCHITECTURE - wxHtmlEasyPrinting *m_Printer; -#endif - wxHashTable *m_PagesHash; - wxHtmlHelpController* m_helpController; - - int m_hfStyle; - -private: - void DoIndexFind(); - void DoIndexAll(); - void DisplayIndexItem(const wxHtmlHelpMergedIndexItem *it); - wxHtmlHelpMergedIndex *m_mergedIndex; - - DECLARE_EVENT_TABLE() - wxDECLARE_NO_COPY_CLASS(wxHtmlHelpWindow); -}; - -/*! - * Command IDs - */ - -enum -{ - //wxID_HTML_HELPFRAME = wxID_HIGHEST + 1, - wxID_HTML_PANEL = wxID_HIGHEST + 10, - wxID_HTML_BACK, - wxID_HTML_FORWARD, - wxID_HTML_UPNODE, - wxID_HTML_UP, - wxID_HTML_DOWN, - wxID_HTML_PRINT, - wxID_HTML_OPENFILE, - wxID_HTML_OPTIONS, - wxID_HTML_BOOKMARKSLIST, - wxID_HTML_BOOKMARKSADD, - wxID_HTML_BOOKMARKSREMOVE, - wxID_HTML_TREECTRL, - wxID_HTML_INDEXPAGE, - wxID_HTML_INDEXLIST, - wxID_HTML_INDEXTEXT, - wxID_HTML_INDEXBUTTON, - wxID_HTML_INDEXBUTTONALL, - wxID_HTML_NOTEBOOK, - wxID_HTML_SEARCHPAGE, - wxID_HTML_SEARCHTEXT, - wxID_HTML_SEARCHLIST, - wxID_HTML_SEARCHBUTTON, - wxID_HTML_SEARCHCHOICE, - wxID_HTML_COUNTINFO -}; - -#endif // wxUSE_WXHTML_HELP - -#endif diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmlcell.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmlcell.h deleted file mode 100644 index 7f40f94ed5..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmlcell.h +++ /dev/null @@ -1,709 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/html/htmlcell.h -// Purpose: wxHtmlCell class is used by wxHtmlWindow/wxHtmlWinParser -// as a basic visual element of HTML page -// Author: Vaclav Slavik -// Copyright: (c) 1999-2003 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HTMLCELL_H_ -#define _WX_HTMLCELL_H_ - -#include "wx/defs.h" - -#if wxUSE_HTML - -#include "wx/html/htmltag.h" -#include "wx/html/htmldefs.h" -#include "wx/window.h" - - -class WXDLLIMPEXP_FWD_HTML wxHtmlWindowInterface; -class WXDLLIMPEXP_FWD_HTML wxHtmlLinkInfo; -class WXDLLIMPEXP_FWD_HTML wxHtmlCell; -class WXDLLIMPEXP_FWD_HTML wxHtmlContainerCell; - - -// wxHtmlSelection is data holder with information about text selection. -// Selection is defined by two positions (beginning and end of the selection) -// and two leaf(!) cells at these positions. -class WXDLLIMPEXP_HTML wxHtmlSelection -{ -public: - wxHtmlSelection() - : m_fromPos(wxDefaultPosition), m_toPos(wxDefaultPosition), - m_fromCharacterPos(-1), m_toCharacterPos(-1), - m_fromCell(NULL), m_toCell(NULL) {} - - // this version is used for the user selection defined with the mouse - void Set(const wxPoint& fromPos, const wxHtmlCell *fromCell, - const wxPoint& toPos, const wxHtmlCell *toCell); - void Set(const wxHtmlCell *fromCell, const wxHtmlCell *toCell); - - const wxHtmlCell *GetFromCell() const { return m_fromCell; } - const wxHtmlCell *GetToCell() const { return m_toCell; } - - // these values are in absolute coordinates: - const wxPoint& GetFromPos() const { return m_fromPos; } - const wxPoint& GetToPos() const { return m_toPos; } - - // these are From/ToCell's private data - void ClearFromToCharacterPos() { m_toCharacterPos = m_fromCharacterPos = -1; } - bool AreFromToCharacterPosSet() const { return m_toCharacterPos != -1 && m_fromCharacterPos != -1; } - - void SetFromCharacterPos (wxCoord pos) { m_fromCharacterPos = pos; } - void SetToCharacterPos (wxCoord pos) { m_toCharacterPos = pos; } - wxCoord GetFromCharacterPos () const { return m_fromCharacterPos; } - wxCoord GetToCharacterPos () const { return m_toCharacterPos; } - - bool IsEmpty() const - { return m_fromPos == wxDefaultPosition && - m_toPos == wxDefaultPosition; } - -private: - wxPoint m_fromPos, m_toPos; - wxCoord m_fromCharacterPos, m_toCharacterPos; - const wxHtmlCell *m_fromCell, *m_toCell; -}; - - - -enum wxHtmlSelectionState -{ - wxHTML_SEL_OUT, // currently rendered cell is outside the selection - wxHTML_SEL_IN, // ... is inside selection - wxHTML_SEL_CHANGING // ... is the cell on which selection state changes -}; - -// Selection state is passed to wxHtmlCell::Draw so that it can render itself -// differently e.g. when inside text selection or outside it. -class WXDLLIMPEXP_HTML wxHtmlRenderingState -{ -public: - wxHtmlRenderingState() : m_selState(wxHTML_SEL_OUT) {} - - void SetSelectionState(wxHtmlSelectionState s) { m_selState = s; } - wxHtmlSelectionState GetSelectionState() const { return m_selState; } - - void SetFgColour(const wxColour& c) { m_fgColour = c; } - const wxColour& GetFgColour() const { return m_fgColour; } - void SetBgColour(const wxColour& c) { m_bgColour = c; } - const wxColour& GetBgColour() const { return m_bgColour; } - void SetBgMode(int m) { m_bgMode = m; } - int GetBgMode() const { return m_bgMode; } - -private: - wxHtmlSelectionState m_selState; - wxColour m_fgColour, m_bgColour; - int m_bgMode; -}; - - -// HTML rendering customization. This class is used when rendering wxHtmlCells -// as a callback: -class WXDLLIMPEXP_HTML wxHtmlRenderingStyle -{ -public: - virtual ~wxHtmlRenderingStyle() {} - virtual wxColour GetSelectedTextColour(const wxColour& clr) = 0; - virtual wxColour GetSelectedTextBgColour(const wxColour& clr) = 0; -}; - -// Standard style: -class WXDLLIMPEXP_HTML wxDefaultHtmlRenderingStyle : public wxHtmlRenderingStyle -{ -public: - virtual wxColour GetSelectedTextColour(const wxColour& clr); - virtual wxColour GetSelectedTextBgColour(const wxColour& clr); -}; - - -// Information given to cells when drawing them. Contains rendering state, -// selection information and rendering style object that can be used to -// customize the output. -class WXDLLIMPEXP_HTML wxHtmlRenderingInfo -{ -public: - wxHtmlRenderingInfo() : m_selection(NULL), m_style(NULL) {} - - void SetSelection(wxHtmlSelection *s) { m_selection = s; } - wxHtmlSelection *GetSelection() const { return m_selection; } - - void SetStyle(wxHtmlRenderingStyle *style) { m_style = style; } - wxHtmlRenderingStyle& GetStyle() { return *m_style; } - - wxHtmlRenderingState& GetState() { return m_state; } - -protected: - wxHtmlSelection *m_selection; - wxHtmlRenderingStyle *m_style; - wxHtmlRenderingState m_state; -}; - - -// Flags for wxHtmlCell::FindCellByPos -enum -{ - wxHTML_FIND_EXACT = 1, - wxHTML_FIND_NEAREST_BEFORE = 2, - wxHTML_FIND_NEAREST_AFTER = 4 -}; - - -// Superscript/subscript/normal script mode of a cell -enum wxHtmlScriptMode -{ - wxHTML_SCRIPT_NORMAL, - wxHTML_SCRIPT_SUB, - wxHTML_SCRIPT_SUP -}; - - -// --------------------------------------------------------------------------- -// wxHtmlCell -// Internal data structure. It represents fragments of parsed -// HTML page - a word, picture, table, horizontal line and so -// on. It is used by wxHtmlWindow to represent HTML page in -// memory. -// --------------------------------------------------------------------------- - - -class WXDLLIMPEXP_HTML wxHtmlCell : public wxObject -{ -public: - wxHtmlCell(); - virtual ~wxHtmlCell(); - - void SetParent(wxHtmlContainerCell *p) {m_Parent = p;} - wxHtmlContainerCell *GetParent() const {return m_Parent;} - - int GetPosX() const {return m_PosX;} - int GetPosY() const {return m_PosY;} - int GetWidth() const {return m_Width;} - - // Returns the maximum possible length of the cell. - // Call Layout at least once before using GetMaxTotalWidth() - virtual int GetMaxTotalWidth() const { return m_Width; } - - int GetHeight() const {return m_Height;} - int GetDescent() const {return m_Descent;} - - void SetScriptMode(wxHtmlScriptMode mode, long previousBase); - wxHtmlScriptMode GetScriptMode() const { return m_ScriptMode; } - long GetScriptBaseline() { return m_ScriptBaseline; } - - // Formatting cells are not visible on the screen, they only alter - // renderer's state. - bool IsFormattingCell() const { return m_Width == 0 && m_Height == 0; } - - const wxString& GetId() const { return m_id; } - void SetId(const wxString& id) { m_id = id; } - - // returns the link associated with this cell. The position is position - // within the cell so it varies from 0 to m_Width, from 0 to m_Height - virtual wxHtmlLinkInfo* GetLink(int WXUNUSED(x) = 0, - int WXUNUSED(y) = 0) const - { return m_Link; } - - // Returns cursor to be used when mouse is over the cell, can be - // overridden by the derived classes to use a different cursor whenever the - // mouse is over this cell. - virtual wxCursor GetMouseCursor(wxHtmlWindowInterface *window) const; - - // Returns cursor to be used when mouse is over the given point, can be - // overridden if the cursor should change depending on where exactly inside - // the cell the mouse is. - virtual wxCursor GetMouseCursorAt(wxHtmlWindowInterface *window, - const wxPoint& relPos) const; - -#if WXWIN_COMPATIBILITY_2_6 - // this was replaced by GetMouseCursor, don't use in new code! - virtual wxCursor GetCursor() const; -#endif - - // return next cell among parent's cells - wxHtmlCell *GetNext() const {return m_Next;} - // returns first child cell (if there are any, i.e. if this is container): - virtual wxHtmlCell* GetFirstChild() const { return NULL; } - - // members writing methods - virtual void SetPos(int x, int y) {m_PosX = x, m_PosY = y;} - void SetLink(const wxHtmlLinkInfo& link); - void SetNext(wxHtmlCell *cell) {m_Next = cell;} - - // 1. adjust cell's width according to the fact that maximal possible width - // is w. (this has sense when working with horizontal lines, tables - // etc.) - // 2. prepare layout (=fill-in m_PosX, m_PosY (and sometime m_Height) - // members) = place items to fit window, according to the width w - virtual void Layout(int w); - - // renders the cell - virtual void Draw(wxDC& WXUNUSED(dc), - int WXUNUSED(x), int WXUNUSED(y), - int WXUNUSED(view_y1), int WXUNUSED(view_y2), - wxHtmlRenderingInfo& WXUNUSED(info)) {} - - // proceed drawing actions in case the cell is not visible (scrolled out of - // screen). This is needed to change fonts, colors and so on. - virtual void DrawInvisible(wxDC& WXUNUSED(dc), - int WXUNUSED(x), int WXUNUSED(y), - wxHtmlRenderingInfo& WXUNUSED(info)) {} - - // This method returns pointer to the FIRST cell for that - // the condition - // is true. It first checks if the condition is true for this - // cell and then calls m_Next->Find(). (Note: it checks - // all subcells if the cell is container) - // Condition is unique condition identifier (see htmldefs.h) - // (user-defined condition IDs should start from 10000) - // and param is optional parameter - // Example : m_Cell->Find(wxHTML_COND_ISANCHOR, "news"); - // returns pointer to anchor news - virtual const wxHtmlCell* Find(int condition, const void* param) const; - - - // This function is called when mouse button is clicked over the cell. - // Returns true if a link is clicked, false otherwise. - // - // 'window' is pointer to wxHtmlWindowInterface of the window which - // generated the event. - // HINT: if this handling is not enough for you you should use - // wxHtmlWidgetCell - virtual bool ProcessMouseClick(wxHtmlWindowInterface *window, - const wxPoint& pos, - const wxMouseEvent& event); - -#if WXWIN_COMPATIBILITY_2_6 - // this was replaced by ProcessMouseClick, don't use in new code! - virtual void OnMouseClick(wxWindow *window, - int x, int y, const wxMouseEvent& event); -#endif - - // This method used to adjust pagebreak position. The parameter is variable - // that contains y-coordinate of page break (= horizontal line that should - // not be crossed by words, images etc.). If this cell cannot be divided - // into two pieces (each one on another page) then it moves the pagebreak - // few pixels up. - // - // Returned value : true if pagebreak was modified, false otherwise - // Usage : while (container->AdjustPagebreak(&p)) {} - virtual bool AdjustPagebreak(int *pagebreak, - const wxArrayInt& known_pagebreaks, - int pageHeight) const; - - // Sets cell's behaviour on pagebreaks (see AdjustPagebreak). Default - // is true - the cell can be split on two pages - // If there is no way to fit a cell in the current page size, the cell - // is always split, ignoring this setting. - void SetCanLiveOnPagebreak(bool can) { m_CanLiveOnPagebreak = can; } - - // Can the line be broken before this cell? - virtual bool IsLinebreakAllowed() const - { return !IsFormattingCell(); } - - // Returns true for simple == terminal cells, i.e. not composite ones. - // This if for internal usage only and may disappear in future versions! - virtual bool IsTerminalCell() const { return true; } - - // Find a cell inside this cell positioned at the given coordinates - // (relative to this's positions). Returns NULL if no such cell exists. - // The flag can be used to specify whether to look for terminal or - // nonterminal cells or both. In either case, returned cell is deepest - // cell in cells tree that contains [x,y]. - virtual wxHtmlCell *FindCellByPos(wxCoord x, wxCoord y, - unsigned flags = wxHTML_FIND_EXACT) const; - - // Returns absolute position of the cell on HTML canvas. - // If rootCell is provided, then it's considered to be the root of the - // hierarchy and the returned value is relative to it. - wxPoint GetAbsPos(wxHtmlCell *rootCell = NULL) const; - - // Returns root cell of the hierarchy (i.e. grand-grand-...-parent that - // doesn't have a parent itself) - wxHtmlCell *GetRootCell() const; - - // Returns first (last) terminal cell inside this cell. It may return NULL, - // but it is rare -- only if there are no terminals in the tree. - virtual wxHtmlCell *GetFirstTerminal() const - { return wxConstCast(this, wxHtmlCell); } - virtual wxHtmlCell *GetLastTerminal() const - { return wxConstCast(this, wxHtmlCell); } - - // Returns cell's depth, i.e. how far under the root cell it is - // (if it is the root, depth is 0) - unsigned GetDepth() const; - - // Returns true if the cell appears before 'cell' in natural order of - // cells (= as they are read). If cell A is (grand)parent of cell B, - // then both A.IsBefore(B) and B.IsBefore(A) always return true. - bool IsBefore(wxHtmlCell *cell) const; - - // Converts the cell into text representation. If sel != NULL then - // only part of the cell inside the selection is converted. - virtual wxString ConvertToText(wxHtmlSelection *WXUNUSED(sel)) const - { return wxEmptyString; } - -protected: - // pointer to the next cell - wxHtmlCell *m_Next; - // pointer to parent cell - wxHtmlContainerCell *m_Parent; - - // dimensions of fragment (m_Descent is used to position text & images) - int m_Width, m_Height, m_Descent; - // position where the fragment is drawn: - int m_PosX, m_PosY; - - // superscript/subscript/normal: - wxHtmlScriptMode m_ScriptMode; - long m_ScriptBaseline; - - // destination address if this fragment is hypertext link, NULL otherwise - wxHtmlLinkInfo *m_Link; - // true if this cell can be placed on pagebreak, false otherwise - bool m_CanLiveOnPagebreak; - // unique identifier of the cell, generated from "id" property of tags - wxString m_id; - - DECLARE_ABSTRACT_CLASS(wxHtmlCell) - wxDECLARE_NO_COPY_CLASS(wxHtmlCell); -}; - - - - -// ---------------------------------------------------------------------------- -// Inherited cells: -// ---------------------------------------------------------------------------- - - -// ---------------------------------------------------------------------------- -// wxHtmlWordCell -// Single word in input stream. -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_HTML wxHtmlWordCell : public wxHtmlCell -{ -public: - wxHtmlWordCell(const wxString& word, const wxDC& dc); - void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, - wxHtmlRenderingInfo& info); - virtual wxCursor GetMouseCursor(wxHtmlWindowInterface *window) const; - virtual wxString ConvertToText(wxHtmlSelection *sel) const; - bool IsLinebreakAllowed() const { return m_allowLinebreak; } - - void SetPreviousWord(wxHtmlWordCell *cell); - -protected: - virtual wxString GetAllAsText() const - { return m_Word; } - virtual wxString GetPartAsText(int begin, int end) const - { return m_Word.Mid(begin, end - begin); } - - void SetSelectionPrivPos(const wxDC& dc, wxHtmlSelection *s) const; - void Split(const wxDC& dc, - const wxPoint& selFrom, const wxPoint& selTo, - unsigned& pos1, unsigned& pos2) const; - - wxString m_Word; - bool m_allowLinebreak; - - DECLARE_ABSTRACT_CLASS(wxHtmlWordCell) - wxDECLARE_NO_COPY_CLASS(wxHtmlWordCell); -}; - - -// wxHtmlWordCell specialization for storing text fragments with embedded -// '\t's; these differ from normal words in that the displayed text is -// different from the text copied to clipboard -class WXDLLIMPEXP_HTML wxHtmlWordWithTabsCell : public wxHtmlWordCell -{ -public: - wxHtmlWordWithTabsCell(const wxString& word, - const wxString& wordOrig, - size_t linepos, - const wxDC& dc) - : wxHtmlWordCell(word, dc), - m_wordOrig(wordOrig), - m_linepos(linepos) - {} - -protected: - virtual wxString GetAllAsText() const; - virtual wxString GetPartAsText(int begin, int end) const; - - wxString m_wordOrig; - size_t m_linepos; -}; - - -// Container contains other cells, thus forming tree structure of rendering -// elements. Basic code of layout algorithm is contained in this class. -class WXDLLIMPEXP_HTML wxHtmlContainerCell : public wxHtmlCell -{ -public: - wxHtmlContainerCell(wxHtmlContainerCell *parent); - virtual ~wxHtmlContainerCell(); - - virtual void Layout(int w); - virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, - wxHtmlRenderingInfo& info); - virtual void DrawInvisible(wxDC& dc, int x, int y, - wxHtmlRenderingInfo& info); - - virtual bool AdjustPagebreak(int *pagebreak, - const wxArrayInt& known_pagebreaks, - int pageHeight) const; - - // insert cell at the end of m_Cells list - void InsertCell(wxHtmlCell *cell); - - // sets horizontal/vertical alignment - void SetAlignHor(int al) {m_AlignHor = al; m_LastLayout = -1;} - int GetAlignHor() const {return m_AlignHor;} - void SetAlignVer(int al) {m_AlignVer = al; m_LastLayout = -1;} - int GetAlignVer() const {return m_AlignVer;} - - // sets left-border indentation. units is one of wxHTML_UNITS_* constants - // what is combination of wxHTML_INDENT_* - void SetIndent(int i, int what, int units = wxHTML_UNITS_PIXELS); - // returns the indentation. ind is one of wxHTML_INDENT_* constants - int GetIndent(int ind) const; - // returns type of value returned by GetIndent(ind) - int GetIndentUnits(int ind) const; - - // sets alignment info based on given tag's params - void SetAlign(const wxHtmlTag& tag); - // sets floating width adjustment - // (examples : 32 percent of parent container, - // -15 pixels percent (this means 100 % - 15 pixels) - void SetWidthFloat(int w, int units) {m_WidthFloat = w; m_WidthFloatUnits = units; m_LastLayout = -1;} - void SetWidthFloat(const wxHtmlTag& tag, double pixel_scale = 1.0); - // sets minimal height of this container. - void SetMinHeight(int h, int align = wxHTML_ALIGN_TOP) {m_MinHeight = h; m_MinHeightAlign = align; m_LastLayout = -1;} - - void SetBackgroundColour(const wxColour& clr) {m_BkColour = clr;} - // returns background colour (of wxNullColour if none set), so that widgets can - // adapt to it: - wxColour GetBackgroundColour(); - void SetBorder(const wxColour& clr1, const wxColour& clr2, int border = 1) {m_Border = border; m_BorderColour1 = clr1, m_BorderColour2 = clr2;} - virtual wxHtmlLinkInfo* GetLink(int x = 0, int y = 0) const; - virtual const wxHtmlCell* Find(int condition, const void* param) const; - -#if WXWIN_COMPATIBILITY_2_6 - // this was replaced by ProcessMouseClick, don't use in new code! - virtual void OnMouseClick(wxWindow *window, - int x, int y, const wxMouseEvent& event); -#endif - virtual bool ProcessMouseClick(wxHtmlWindowInterface *window, - const wxPoint& pos, - const wxMouseEvent& event); - - virtual wxHtmlCell* GetFirstChild() const { return m_Cells; } - - // returns last child cell: - wxHtmlCell* GetLastChild() const { return m_LastCell; } - - // see comment in wxHtmlCell about this method - virtual bool IsTerminalCell() const { return false; } - - virtual wxHtmlCell *FindCellByPos(wxCoord x, wxCoord y, - unsigned flags = wxHTML_FIND_EXACT) const; - - virtual wxHtmlCell *GetFirstTerminal() const; - virtual wxHtmlCell *GetLastTerminal() const; - - - // Removes indentation on top or bottom of the container (i.e. above or - // below first/last terminal cell). For internal use only. - virtual void RemoveExtraSpacing(bool top, bool bottom); - - // Returns the maximum possible length of the container. - // Call Layout at least once before using GetMaxTotalWidth() - virtual int GetMaxTotalWidth() const { return m_MaxTotalWidth; } - -protected: - void UpdateRenderingStatePre(wxHtmlRenderingInfo& info, - wxHtmlCell *cell) const; - void UpdateRenderingStatePost(wxHtmlRenderingInfo& info, - wxHtmlCell *cell) const; - -protected: - int m_IndentLeft, m_IndentRight, m_IndentTop, m_IndentBottom; - // indentation of subcells. There is always m_Indent pixels - // big space between given border of the container and the subcells - // it m_Indent < 0 it is in PERCENTS, otherwise it is in pixels - int m_MinHeight, m_MinHeightAlign; - // minimal height. - wxHtmlCell *m_Cells, *m_LastCell; - // internal cells, m_Cells points to the first of them, m_LastCell to the last one. - // (LastCell is needed only to speed-up InsertCell) - int m_AlignHor, m_AlignVer; - // alignment horizontal and vertical (left, center, right) - int m_WidthFloat, m_WidthFloatUnits; - // width float is used in adjustWidth - wxColour m_BkColour; - // background color of this container - int m_Border; - // border size. Draw only if m_Border > 0 - wxColour m_BorderColour1, m_BorderColour2; - // borders color of this container - int m_LastLayout; - // if != -1 then call to Layout may be no-op - // if previous call to Layout has same argument - int m_MaxTotalWidth; - // Maximum possible length if ignoring line wrap - - - DECLARE_ABSTRACT_CLASS(wxHtmlContainerCell) - wxDECLARE_NO_COPY_CLASS(wxHtmlContainerCell); -}; - - - -// --------------------------------------------------------------------------- -// wxHtmlColourCell -// Color changer. -// --------------------------------------------------------------------------- - -class WXDLLIMPEXP_HTML wxHtmlColourCell : public wxHtmlCell -{ -public: - wxHtmlColourCell(const wxColour& clr, int flags = wxHTML_CLR_FOREGROUND) : wxHtmlCell() {m_Colour = clr; m_Flags = flags;} - virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, - wxHtmlRenderingInfo& info); - virtual void DrawInvisible(wxDC& dc, int x, int y, - wxHtmlRenderingInfo& info); - -protected: - wxColour m_Colour; - unsigned m_Flags; - - DECLARE_ABSTRACT_CLASS(wxHtmlColourCell) - wxDECLARE_NO_COPY_CLASS(wxHtmlColourCell); -}; - - - - -//-------------------------------------------------------------------------------- -// wxHtmlFontCell -// Sets actual font used for text rendering -//-------------------------------------------------------------------------------- - -class WXDLLIMPEXP_HTML wxHtmlFontCell : public wxHtmlCell -{ -public: - wxHtmlFontCell(wxFont *font) : wxHtmlCell() { m_Font = (*font); } - virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, - wxHtmlRenderingInfo& info); - virtual void DrawInvisible(wxDC& dc, int x, int y, - wxHtmlRenderingInfo& info); - -protected: - wxFont m_Font; - - DECLARE_ABSTRACT_CLASS(wxHtmlFontCell) - wxDECLARE_NO_COPY_CLASS(wxHtmlFontCell); -}; - - - - - - -//-------------------------------------------------------------------------------- -// wxHtmlwidgetCell -// This cell is connected with wxWindow object -// You can use it to insert windows into HTML page -// (buttons, input boxes etc.) -//-------------------------------------------------------------------------------- - -class WXDLLIMPEXP_HTML wxHtmlWidgetCell : public wxHtmlCell -{ -public: - // !!! wnd must have correct parent! - // if w != 0 then the m_Wnd has 'floating' width - it adjust - // it's width according to parent container's width - // (w is percent of parent's width) - wxHtmlWidgetCell(wxWindow *wnd, int w = 0); - virtual ~wxHtmlWidgetCell() { m_Wnd->Destroy(); } - virtual void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2, - wxHtmlRenderingInfo& info); - virtual void DrawInvisible(wxDC& dc, int x, int y, - wxHtmlRenderingInfo& info); - virtual void Layout(int w); - -protected: - wxWindow* m_Wnd; - int m_WidthFloat; - // width float is used in adjustWidth (it is in percents) - - DECLARE_ABSTRACT_CLASS(wxHtmlWidgetCell) - wxDECLARE_NO_COPY_CLASS(wxHtmlWidgetCell); -}; - - - -//-------------------------------------------------------------------------------- -// wxHtmlLinkInfo -// Internal data structure. It represents hypertext link -//-------------------------------------------------------------------------------- - -class WXDLLIMPEXP_HTML wxHtmlLinkInfo : public wxObject -{ -public: - wxHtmlLinkInfo() : wxObject() - { m_Href = m_Target = wxEmptyString; m_Event = NULL, m_Cell = NULL; } - wxHtmlLinkInfo(const wxString& href, const wxString& target = wxEmptyString) : wxObject() - { m_Href = href; m_Target = target; m_Event = NULL, m_Cell = NULL; } - wxHtmlLinkInfo(const wxHtmlLinkInfo& l) : wxObject() - { m_Href = l.m_Href, m_Target = l.m_Target, m_Event = l.m_Event; - m_Cell = l.m_Cell; } - wxHtmlLinkInfo& operator=(const wxHtmlLinkInfo& l) - { m_Href = l.m_Href, m_Target = l.m_Target, m_Event = l.m_Event; - m_Cell = l.m_Cell; return *this; } - - void SetEvent(const wxMouseEvent *e) { m_Event = e; } - void SetHtmlCell(const wxHtmlCell *e) { m_Cell = e; } - - wxString GetHref() const { return m_Href; } - wxString GetTarget() const { return m_Target; } - const wxMouseEvent* GetEvent() const { return m_Event; } - const wxHtmlCell* GetHtmlCell() const { return m_Cell; } - -private: - wxString m_Href, m_Target; - const wxMouseEvent *m_Event; - const wxHtmlCell *m_Cell; -}; - - - -// ---------------------------------------------------------------------------- -// wxHtmlTerminalCellsInterator -// ---------------------------------------------------------------------------- - -class WXDLLIMPEXP_HTML wxHtmlTerminalCellsInterator -{ -public: - wxHtmlTerminalCellsInterator(const wxHtmlCell *from, const wxHtmlCell *to) - : m_to(to), m_pos(from) {} - - operator bool() const { return m_pos != NULL; } - const wxHtmlCell* operator++(); - const wxHtmlCell* operator->() const { return m_pos; } - const wxHtmlCell* operator*() const { return m_pos; } - -private: - const wxHtmlCell *m_to, *m_pos; -}; - - - -#endif // wxUSE_HTML - -#endif // _WX_HTMLCELL_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmldefs.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmldefs.h deleted file mode 100644 index 9de190ca34..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmldefs.h +++ /dev/null @@ -1,101 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/html/htmldefs.h -// Purpose: constants for wxhtml library -// Author: Vaclav Slavik -// Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - - -#ifndef _WX_HTMLDEFS_H_ -#define _WX_HTMLDEFS_H_ - -#include "wx/defs.h" - -#if wxUSE_HTML - -//-------------------------------------------------------------------------------- -// ALIGNMENTS -// Describes alignment of text etc. in containers -//-------------------------------------------------------------------------------- - -#define wxHTML_ALIGN_LEFT 0x0000 -#define wxHTML_ALIGN_RIGHT 0x0002 -#define wxHTML_ALIGN_JUSTIFY 0x0010 - -#define wxHTML_ALIGN_TOP 0x0004 -#define wxHTML_ALIGN_BOTTOM 0x0008 - -#define wxHTML_ALIGN_CENTER 0x0001 - - - -//-------------------------------------------------------------------------------- -// COLOR MODES -// Used by wxHtmlColourCell to determine clr of what is changing -//-------------------------------------------------------------------------------- - -#define wxHTML_CLR_FOREGROUND 0x0001 -#define wxHTML_CLR_BACKGROUND 0x0002 -#define wxHTML_CLR_TRANSPARENT_BACKGROUND 0x0004 - - - -//-------------------------------------------------------------------------------- -// UNITS -// Used to specify units -//-------------------------------------------------------------------------------- - -#define wxHTML_UNITS_PIXELS 0x0001 -#define wxHTML_UNITS_PERCENT 0x0002 - - - -//-------------------------------------------------------------------------------- -// INDENTS -// Used to specify indetation relatives -//-------------------------------------------------------------------------------- - -#define wxHTML_INDENT_LEFT 0x0010 -#define wxHTML_INDENT_RIGHT 0x0020 -#define wxHTML_INDENT_TOP 0x0040 -#define wxHTML_INDENT_BOTTOM 0x0080 - -#define wxHTML_INDENT_HORIZONTAL (wxHTML_INDENT_LEFT | wxHTML_INDENT_RIGHT) -#define wxHTML_INDENT_VERTICAL (wxHTML_INDENT_TOP | wxHTML_INDENT_BOTTOM) -#define wxHTML_INDENT_ALL (wxHTML_INDENT_VERTICAL | wxHTML_INDENT_HORIZONTAL) - - - - -//-------------------------------------------------------------------------------- -// FIND CONDITIONS -// Identifiers of wxHtmlCell's Find() conditions -//-------------------------------------------------------------------------------- - -#define wxHTML_COND_ISANCHOR 1 - // Finds the anchor of 'param' name (pointer to wxString). - -#define wxHTML_COND_ISIMAGEMAP 2 - // Finds imagemap of 'param' name (pointer to wxString). - // (used exclusively by m_image.cpp) - -#define wxHTML_COND_USER 10000 - // User-defined conditions should start from this number - - -//-------------------------------------------------------------------------------- -// INTERNALS -// wxHTML internal constants -//-------------------------------------------------------------------------------- - - /* size of one scroll step of wxHtmlWindow in pixels */ -#define wxHTML_SCROLL_STEP 16 - - /* size of temporary buffer used during parsing */ -#define wxHTML_BUFLEN 1024 - -#endif // wxUSE_HTML - -#endif // _WX_HTMLDEFS_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmlfilt.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmlfilt.h deleted file mode 100644 index fe25d4ffb9..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmlfilt.h +++ /dev/null @@ -1,81 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/html/htmlfilt.h -// Purpose: filters -// Author: Vaclav Slavik -// Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HTMLFILT_H_ -#define _WX_HTMLFILT_H_ - -#include "wx/defs.h" - -#if wxUSE_HTML - -#include "wx/filesys.h" - - -//-------------------------------------------------------------------------------- -// wxHtmlFilter -// This class is input filter. It can "translate" files -// in non-HTML format to HTML format -// interface to access certain -// kinds of files (HTPP, FTP, local, tar.gz etc..) -//-------------------------------------------------------------------------------- - -class WXDLLIMPEXP_HTML wxHtmlFilter : public wxObject -{ - DECLARE_ABSTRACT_CLASS(wxHtmlFilter) - -public: - wxHtmlFilter() : wxObject() {} - virtual ~wxHtmlFilter() {} - - // returns true if this filter is able to open&read given file - virtual bool CanRead(const wxFSFile& file) const = 0; - - // Reads given file and returns HTML document. - // Returns empty string if opening failed - virtual wxString ReadFile(const wxFSFile& file) const = 0; -}; - - - -//-------------------------------------------------------------------------------- -// wxHtmlFilterPlainText -// This filter is used as default filter if no other can -// be used (= uknown type of file). It is used by -// wxHtmlWindow itself. -//-------------------------------------------------------------------------------- - - -class WXDLLIMPEXP_HTML wxHtmlFilterPlainText : public wxHtmlFilter -{ - DECLARE_DYNAMIC_CLASS(wxHtmlFilterPlainText) - -public: - virtual bool CanRead(const wxFSFile& file) const; - virtual wxString ReadFile(const wxFSFile& file) const; -}; - -//-------------------------------------------------------------------------------- -// wxHtmlFilterHTML -// filter for text/html -//-------------------------------------------------------------------------------- - -class wxHtmlFilterHTML : public wxHtmlFilter -{ - DECLARE_DYNAMIC_CLASS(wxHtmlFilterHTML) - - public: - virtual bool CanRead(const wxFSFile& file) const; - virtual wxString ReadFile(const wxFSFile& file) const; -}; - - - -#endif // wxUSE_HTML - -#endif // _WX_HTMLFILT_H_ - diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmlpars.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmlpars.h deleted file mode 100644 index 86612f168e..0000000000 --- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmlpars.h +++ /dev/null @@ -1,307 +0,0 @@ -///////////////////////////////////////////////////////////////////////////// -// Name: wx/html/htmlpars.h -// Purpose: wxHtmlParser class (generic parser) -// Author: Vaclav Slavik -// Copyright: (c) 1999 Vaclav Slavik -// Licence: wxWindows licence -///////////////////////////////////////////////////////////////////////////// - -#ifndef _WX_HTMLPARS_H_ -#define _WX_HTMLPARS_H_ - -#include "wx/defs.h" -#if wxUSE_HTML - -#include "wx/html/htmltag.h" -#include "wx/filesys.h" -#include "wx/hashmap.h" -#include "wx/hashset.h" -#include "wx/vector.h" -#include "wx/fontenc.h" - -class WXDLLIMPEXP_FWD_BASE wxMBConv; -class WXDLLIMPEXP_FWD_HTML wxHtmlParser; -class WXDLLIMPEXP_FWD_HTML wxHtmlTagHandler; -class WXDLLIMPEXP_FWD_HTML wxHtmlEntitiesParser; - -class wxHtmlTextPieces; -class wxHtmlParserState; - -WX_DECLARE_HASH_SET_WITH_DECL_PTR(wxHtmlTagHandler*, - wxPointerHash, wxPointerEqual, - wxHtmlTagHandlersSet, - class WXDLLIMPEXP_HTML); -WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxHtmlTagHandler*, - wxHtmlTagHandlersHash, - class WXDLLIMPEXP_HTML); - - -enum wxHtmlURLType -{ - wxHTML_URL_PAGE, - wxHTML_URL_IMAGE, - wxHTML_URL_OTHER -}; - -// This class handles generic parsing of HTML document : it scans -// the document and divides it into blocks of tags (where one block -// consists of starting and ending tag and of text between these -// 2 tags. -class WXDLLIMPEXP_HTML wxHtmlParser : public wxObject -{ - DECLARE_ABSTRACT_CLASS(wxHtmlParser) - -public: - wxHtmlParser(); - virtual ~wxHtmlParser(); - - // Sets the class which will be used for opening files - void SetFS(wxFileSystem *fs) { m_FS = fs; } - - wxFileSystem* GetFS() const { return m_FS; } - - // Opens file if the parser is allowed to open given URL (may be forbidden - // for security reasons) - virtual wxFSFile *OpenURL(wxHtmlURLType type, const wxString& url) const; - - // You can simply call this method when you need parsed output. - // This method does these things: - // 1. call InitParser(source); - // 2. call DoParsing(); - // 3. call GetProduct(); (its return value is then returned) - // 4. call DoneParser(); - wxObject* Parse(const wxString& source); - - // Sets the source. This must be called before running Parse() method. - virtual void InitParser(const wxString& source); - // This must be called after Parse(). - virtual void DoneParser(); - - // May be called during parsing to immediately return from Parse(). - virtual void StopParsing() { m_stopParsing = true; } - - // Parses the m_Source from begin_pos to end_pos-1. - // (in noparams version it parses whole m_Source) - void DoParsing(const wxString::const_iterator& begin_pos, - const wxString::const_iterator& end_pos); - void DoParsing(); - - // Returns pointer to the tag at parser's current position - wxHtmlTag *GetCurrentTag() const { return m_CurTag; } - - // Returns product of parsing - // Returned value is result of parsing of the part. The type of this result - // depends on internal representation in derived parser - // (see wxHtmlWinParser for details). - virtual wxObject* GetProduct() = 0; - - // adds handler to the list & hash table of handlers. - virtual void AddTagHandler(wxHtmlTagHandler *handler); - - // Forces the handler to handle additional tags (not returned by GetSupportedTags). - // The handler should already be in use by this parser. - // Example: you want to parse following pseudo-html structure: - // - // - // - // - // This last it has different meaning, we don't want it to be parsed by myitems handler! - // handler can handle only 'myitems' (e.g. its GetSupportedTags returns "MYITEMS") - // you can call PushTagHandler(handler, "IT") when you find - // and call PopTagHandler() when you find - void PushTagHandler(wxHtmlTagHandler *handler, const wxString& tags); - - // Restores state before last call to PushTagHandler - void PopTagHandler(); - - const wxString* GetSource() {return m_Source;} - void SetSource(const wxString& src); - - // Sets HTML source and remembers current parser's state so that it can - // later be restored. This is useful for on-line modifications of - // HTML source (for example, 
 handler replaces spaces with  
-    // and newlines with 
)
-    virtual void SetSourceAndSaveState(const wxString& src);
-    // Restores parser's state from stack or returns false if the stack is
-    // empty
-    virtual bool RestoreState();
-
-    // Returns HTML source inside the element (i.e. between the starting
-    // and ending tag)
-    wxString GetInnerSource(const wxHtmlTag& tag);
-
-    // Parses HTML string 'markup' and extracts charset info from  tag
-    // if present. Returns empty string if the tag is missing.
-    // For wxHTML's internal use.
-    static wxString ExtractCharsetInformation(const wxString& markup);
-
-    // Returns entity parser object, used to substitute HTML &entities;
-    wxHtmlEntitiesParser *GetEntitiesParser() const { return m_entitiesParser; }
-
-    // Returns true if the tag starting at the given position is a comment tag
-    //
-    // p should point to '<' character and is modified to point to the closing
-    // '>' of the end comment tag if this is indeed a comment
-    static bool
-    SkipCommentTag(wxString::const_iterator& p, wxString::const_iterator end);
-
-protected:
-    // DOM structure
-    void CreateDOMTree();
-    void DestroyDOMTree();
-    void CreateDOMSubTree(wxHtmlTag *cur,
-                          const wxString::const_iterator& begin_pos,
-                          const wxString::const_iterator& end_pos,
-                          wxHtmlTagsCache *cache);
-
-    // Adds text to the output.
-    // This is called from Parse() and must be overridden in derived classes.
-    // txt is not guaranteed to be only one word. It is largest continuous part
-    // of text (= not broken by tags)
-    virtual void AddText(const wxString& txt) = 0;
-
-    // Adds tag and proceeds it. Parse() may (and usually is) called from this method.
-    // This is called from Parse() and may be overridden.
-    // Default behaviour is that it looks for proper handler in m_Handlers. The tag is
-    // ignored if no hander is found.
-    // Derived class is *responsible* for filling in m_Handlers table.
-    virtual void AddTag(const wxHtmlTag& tag);
-
-protected:
-    // DOM tree:
-    wxHtmlTag *m_CurTag;
-    wxHtmlTag *m_Tags;
-    wxHtmlTextPieces *m_TextPieces;
-    size_t m_CurTextPiece;
-
-    const wxString *m_Source;
-
-    wxHtmlParserState *m_SavedStates;
-
-    // handlers that handle particular tags. The table is accessed by
-    // key = tag's name.
-    // This attribute MUST be filled by derived class otherwise it would
-    // be empty and no tags would be recognized
-    // (see wxHtmlWinParser for details about filling it)
-    // m_HandlersHash is for random access based on knowledge of tag name (BR, P, etc.)
-    //      it may (and often does) contain more references to one object
-    // m_HandlersList is list of all handlers and it is guaranteed to contain
-    //      only one reference to each handler instance.
-    wxHtmlTagHandlersSet m_HandlersSet;
-    wxHtmlTagHandlersHash m_HandlersHash;
-
-    wxDECLARE_NO_COPY_CLASS(wxHtmlParser);
-
-    // class for opening files (file system)
-    wxFileSystem *m_FS;
-    // handlers stack used by PushTagHandler and PopTagHandler
-    wxVector m_HandlersStack;
-
-    // entity parse
-    wxHtmlEntitiesParser *m_entitiesParser;
-
-    // flag indicating that the parser should stop
-    bool m_stopParsing;
-};
-
-
-
-// This class (and derived classes) cooperates with wxHtmlParser.
-// Each recognized tag is passed to handler which is capable
-// of handling it. Each tag is handled in 3 steps:
-// 1. Handler will modifies state of parser
-//    (using its public methods)
-// 2. Parser parses source between starting and ending tag
-// 3. Handler restores original state of the parser
-class WXDLLIMPEXP_HTML wxHtmlTagHandler : public wxObject
-{
-    DECLARE_ABSTRACT_CLASS(wxHtmlTagHandler)
-
-public:
-    wxHtmlTagHandler() : wxObject () { m_Parser = NULL; }
-
-    // Sets the parser.
-    // NOTE : each _instance_ of handler is guaranteed to be called
-    // only by one parser. This means you don't have to care about
-    // reentrancy.
-    virtual void SetParser(wxHtmlParser *parser)
-        { m_Parser = parser; }
-
-    // Get the parser associated with this tag handler.
-    wxHtmlParser* GetParser() const { return m_Parser; }
-
-    // Returns list of supported tags. The list is in uppercase and
-    // tags are delimited by ','.
-    // Example : "I,B,FONT,P"
-    //   is capable of handling italic, bold, font and paragraph tags
-    virtual wxString GetSupportedTags() = 0;
-
-    // This is hadling core method. It does all the Steps 1-3.
-    // To process step 2, you can call ParseInner()
-    // returned value : true if it called ParseInner(),
-    //                  false etherwise
-    virtual bool HandleTag(const wxHtmlTag& tag) = 0;
-
-protected:
-    // parses input between beginning and ending tag.
-    // m_Parser must be set.
-    void ParseInner(const wxHtmlTag& tag)
-        { m_Parser->DoParsing(tag.GetBeginIter(), tag.GetEndIter1()); }
-
-    // Parses given source as if it was tag's inner code (see
-    // wxHtmlParser::GetInnerSource).  Unlike ParseInner(), this method lets
-    // you specify the source code to parse. This is useful when you need to
-    // modify the inner text before parsing.
-    void ParseInnerSource(const wxString& source);
-
-    wxHtmlParser *m_Parser;
-
-    wxDECLARE_NO_COPY_CLASS(wxHtmlTagHandler);
-};
-
-
-// This class is used to parse HTML entities in strings. It can handle
-// both named entities and &#xxxx entries where xxxx is Unicode code.
-class WXDLLIMPEXP_HTML wxHtmlEntitiesParser : public wxObject
-{
-    DECLARE_DYNAMIC_CLASS(wxHtmlEntitiesParser)
-
-public:
-    wxHtmlEntitiesParser();
-    virtual ~wxHtmlEntitiesParser();
-
-    // Sets encoding of output string.
-    // Has no effect if wxUSE_UNICODE==1
-#if wxUSE_UNICODE
-    void SetEncoding(wxFontEncoding WXUNUSED(encoding)) {}
-#else
-    void SetEncoding(wxFontEncoding encoding);
-#endif
-
-    // Parses entities in input and replaces them with respective characters
-    // (with respect to output encoding)
-    wxString Parse(const wxString& input) const;
-
-    // Returns character for given entity or 0 if the enity is unknown
-    wxChar GetEntityChar(const wxString& entity) const;
-
-    // Returns character that represents given Unicode code
-#if wxUSE_UNICODE
-    wxChar GetCharForCode(unsigned code) const { return (wxChar)code; }
-#else
-    wxChar GetCharForCode(unsigned code) const;
-#endif
-
-protected:
-#if !wxUSE_UNICODE
-    wxMBConv *m_conv;
-    wxFontEncoding m_encoding;
-#endif
-
-    wxDECLARE_NO_COPY_CLASS(wxHtmlEntitiesParser);
-};
-
-
-#endif
-
-#endif // _WX_HTMLPARS_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmlproc.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmlproc.h
deleted file mode 100644
index d608b58ff9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmlproc.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/html/htmlprep.h
-// Purpose:     HTML processor
-// Author:      Vaclav Slavik
-// Copyright:   (c) 2001 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_HTMLPREP_H_
-#define _WX_HTMLPREP_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_HTML
-
-#include "wx/string.h"
-
-// Priority of preprocessor in the chain. The higher, the earlier it is used
-enum
-{
-    wxHTML_PRIORITY_DONTCARE = 128, // if the order doesn't matter, use this
-                                    // priority
-    wxHTML_PRIORITY_SYSTEM   = 256  // >=256 is only for wxHTML's internals
-};
-
-// Classes derived from this class serve as simple text processors for
-// wxHtmlWindow. wxHtmlWindow runs HTML markup through all registered
-// processors before displaying it, thus allowing for on-the-fly
-// modifications of the markup.
-
-class WXDLLIMPEXP_HTML wxHtmlProcessor : public wxObject
-{
-    DECLARE_ABSTRACT_CLASS(wxHtmlProcessor)
-
-public:
-    wxHtmlProcessor() : wxObject(), m_enabled(true) {}
-    virtual ~wxHtmlProcessor() {}
-
-    // Process input text and return processed result
-    virtual wxString Process(const wxString& text) const = 0;
-
-    // Return priority value of this processor. The higher, the sooner
-    // is the processor applied to the text.
-    virtual int GetPriority() const { return wxHTML_PRIORITY_DONTCARE; }
-
-    // Enable/disable the processor. wxHtmlWindow won't use a disabled
-    // processor even if it is in its processors queue.
-    virtual void Enable(bool enable = true) { m_enabled = enable; }
-    bool IsEnabled() const { return m_enabled; }
-
-protected:
-    bool m_enabled;
-};
-
-#endif // wxUSE_HTML
-
-#endif // _WX_HTMLPROC_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmltag.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmltag.h
deleted file mode 100644
index f7b4f9b5b0..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmltag.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/html/htmltag.h
-// Purpose:     wxHtmlTag class (represents single tag)
-// Author:      Vaclav Slavik
-// Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_HTMLTAG_H_
-#define _WX_HTMLTAG_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_HTML
-
-#include "wx/object.h"
-#include "wx/arrstr.h"
-
-class WXDLLIMPEXP_FWD_CORE wxColour;
-class WXDLLIMPEXP_FWD_HTML wxHtmlEntitiesParser;
-
-//-----------------------------------------------------------------------------
-// wxHtmlTagsCache
-//          - internal wxHTML class, do not use!
-//-----------------------------------------------------------------------------
-
-class wxHtmlTagsCacheData;
-
-class WXDLLIMPEXP_HTML wxHtmlTagsCache
-{
-private:
-    wxHtmlTagsCacheData *m_Cache;
-    int m_CachePos;
-
-    wxHtmlTagsCacheData& Cache() { return *m_Cache; }
-
-public:
-    wxHtmlTagsCache() {m_Cache = NULL;}
-    wxHtmlTagsCache(const wxString& source);
-    virtual ~wxHtmlTagsCache();
-
-    // Finds parameters for tag starting at at and fills the variables
-    void QueryTag(const wxString::const_iterator& at,
-                  const wxString::const_iterator& inputEnd,
-                  wxString::const_iterator *end1,
-                  wxString::const_iterator *end2,
-                  bool *hasEnding);
-
-    wxDECLARE_NO_COPY_CLASS(wxHtmlTagsCache);
-};
-
-
-//--------------------------------------------------------------------------------
-// wxHtmlTag
-//                  This represents single tag. It is used as internal structure
-//                  by wxHtmlParser.
-//--------------------------------------------------------------------------------
-
-class WXDLLIMPEXP_HTML wxHtmlTag
-{
-protected:
-    // constructs wxHtmlTag object based on HTML tag.
-    // The tag begins (with '<' character) at position pos in source
-    // end_pos is position where parsing ends (usually end of document)
-    wxHtmlTag(wxHtmlTag *parent,
-              const wxString *source,
-              const wxString::const_iterator& pos,
-              const wxString::const_iterator& end_pos,
-              wxHtmlTagsCache *cache,
-              wxHtmlEntitiesParser *entParser);
-    friend class wxHtmlParser;
-public:
-    ~wxHtmlTag();
-
-    wxHtmlTag *GetParent() const {return m_Parent;}
-    wxHtmlTag *GetFirstSibling() const;
-    wxHtmlTag *GetLastSibling() const;
-    wxHtmlTag *GetChildren() const { return m_FirstChild; }
-    wxHtmlTag *GetPreviousSibling() const { return m_Prev; }
-    wxHtmlTag *GetNextSibling() const {return m_Next; }
-    // Return next tag, as if tree had been flattened
-    wxHtmlTag *GetNextTag() const;
-
-    // Returns tag's name in uppercase.
-    inline wxString GetName() const {return m_Name;}
-
-    // Returns true if the tag has given parameter. Parameter
-    // should always be in uppercase.
-    // Example :  HasParam("SRC") returns true
-    bool HasParam(const wxString& par) const;
-
-    // Returns value of the param. Value is in uppercase unless it is
-    // enclosed with "
-    // Example : 
 GetParam("ALIGN") returns (RIGHT)
-    //           
 GetParam("SRC") returns (WhaT.jpg)
-    //                           (or ("WhaT.jpg") if with_quotes == true)
-    wxString GetParam(const wxString& par, bool with_quotes = false) const;
-
-    // Return true if the string could be parsed as an HTML colour and false
-    // otherwise.
-    static bool ParseAsColour(const wxString& str, wxColour *clr);
-
-    // Convenience functions:
-    bool GetParamAsString(const wxString& par, wxString *str) const;
-    bool GetParamAsColour(const wxString& par, wxColour *clr) const;
-    bool GetParamAsInt(const wxString& par, int *clr) const;
-    bool GetParamAsIntOrPercent(const wxString& param,
-                                int* value, bool& isPercent) const;
-
-    // Scans param like scanf() functions family does.
-    // Example : ScanParam("COLOR", "\"#%X\"", &clr);
-    // This is always with with_quotes=false
-    // Returns number of scanned values
-    // (like sscanf() does)
-    // NOTE: unlike scanf family, this function only accepts
-    //       *one* parameter !
-    int ScanParam(const wxString& par, const char *format, void *param) const;
-    int ScanParam(const wxString& par, const wchar_t *format, void *param) const;
-
-    // Returns string containing all params.
-    wxString GetAllParams() const;
-
-    // return true if there is matching ending tag
-    inline bool HasEnding() const {return m_hasEnding;}
-
-    // returns beginning position of _internal_ block of text as iterator
-    // into parser's source string (see wxHtmlParser::GetSource())
-    // See explanation (returned value is marked with *):
-    // bla bla bla * bla bla intenal text bla bla
-    wxString::const_iterator GetBeginIter() const
-        { return m_Begin; }
-    // returns ending position of _internal_ block of text as iterator
-    // into parser's source string (see wxHtmlParser::GetSource()):
-    // bla bla bla  bla bla intenal text* bla bla
-    wxString::const_iterator GetEndIter1() const { return m_End1; }
-    // returns end position 2 as iterator
-    // into parser's source string (see wxHtmlParser::GetSource()):
-    // bla bla bla  bla bla internal text* bla bla
-    wxString::const_iterator GetEndIter2() const { return m_End2; }
-
-#if WXWIN_COMPATIBILITY_2_8
-    // use GetBeginIter(), GetEndIter1() and GetEndIter2() instead
-    wxDEPRECATED( inline int GetBeginPos() const );
-    wxDEPRECATED( inline int GetEndPos1() const );
-    wxDEPRECATED( inline int GetEndPos2() const );
-#endif // WXWIN_COMPATIBILITY_2_8
-
-private:
-    wxString m_Name;
-    bool m_hasEnding;
-    wxString::const_iterator m_Begin, m_End1, m_End2;
-    wxArrayString m_ParamNames, m_ParamValues;
-#if WXWIN_COMPATIBILITY_2_8
-    wxString::const_iterator m_sourceStart;
-#endif
-
-    // DOM tree relations:
-    wxHtmlTag *m_Next;
-    wxHtmlTag *m_Prev;
-    wxHtmlTag *m_FirstChild, *m_LastChild;
-    wxHtmlTag *m_Parent;
-
-    wxDECLARE_NO_COPY_CLASS(wxHtmlTag);
-};
-
-
-#if WXWIN_COMPATIBILITY_2_8
-inline int wxHtmlTag::GetBeginPos() const { return int(m_Begin - m_sourceStart); }
-inline int wxHtmlTag::GetEndPos1() const { return int(m_End1 - m_sourceStart); }
-inline int wxHtmlTag::GetEndPos2() const { return int(m_End2 - m_sourceStart); }
-#endif // WXWIN_COMPATIBILITY_2_8
-
-
-
-
-#endif // wxUSE_HTML
-
-#endif // _WX_HTMLTAG_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmlwin.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmlwin.h
deleted file mode 100644
index 7c716df115..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmlwin.h
+++ /dev/null
@@ -1,658 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/html/htmlwin.h
-// Purpose:     wxHtmlWindow class for parsing & displaying HTML
-// Author:      Vaclav Slavik
-// Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_HTMLWIN_H_
-#define _WX_HTMLWIN_H_
-
-#include "wx/defs.h"
-#if wxUSE_HTML
-
-#include "wx/window.h"
-#include "wx/scrolwin.h"
-#include "wx/config.h"
-#include "wx/stopwatch.h"
-#include "wx/html/winpars.h"
-#include "wx/html/htmlcell.h"
-#include "wx/filesys.h"
-#include "wx/html/htmlfilt.h"
-#include "wx/filename.h"
-#include "wx/bitmap.h"
-
-class wxHtmlProcessor;
-class wxHtmlWinModule;
-class wxHtmlHistoryArray;
-class wxHtmlProcessorList;
-class WXDLLIMPEXP_FWD_HTML wxHtmlWinAutoScrollTimer;
-class WXDLLIMPEXP_FWD_HTML wxHtmlCellEvent;
-class WXDLLIMPEXP_FWD_HTML wxHtmlLinkEvent;
-class WXDLLIMPEXP_FWD_CORE wxStatusBar;
-
-// wxHtmlWindow flags:
-#define wxHW_SCROLLBAR_NEVER    0x0002
-#define wxHW_SCROLLBAR_AUTO     0x0004
-#define wxHW_NO_SELECTION       0x0008
-
-#define wxHW_DEFAULT_STYLE      wxHW_SCROLLBAR_AUTO
-
-/// Enum for wxHtmlWindow::OnOpeningURL and wxHtmlWindowInterface::OnOpeningURL
-enum wxHtmlOpeningStatus
-{
-    /// Open the requested URL
-    wxHTML_OPEN,
-    /// Do not open the URL
-    wxHTML_BLOCK,
-    /// Redirect to another URL (returned from OnOpeningURL)
-    wxHTML_REDIRECT
-};
-
-/**
-    Abstract interface to a HTML rendering window (such as wxHtmlWindow or
-    wxHtmlListBox) that is passed to wxHtmlWinParser. It encapsulates all
-    communication from the parser to the window.
- */
-class WXDLLIMPEXP_HTML wxHtmlWindowInterface
-{
-public:
-    /// Ctor
-    wxHtmlWindowInterface() {}
-    virtual ~wxHtmlWindowInterface() {}
-
-    /**
-        Called by the parser to set window's title to given text.
-     */
-    virtual void SetHTMLWindowTitle(const wxString& title) = 0;
-
-    /**
-        Called when a link is clicked.
-
-        @param link information about the clicked link
-     */
-    virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link) = 0;
-
-    /**
-        Called when the parser needs to open another URL (e.g. an image).
-
-        @param type     Type of the URL request (e.g. image)
-        @param url      URL the parser wants to open
-        @param redirect If the return value is wxHTML_REDIRECT, then the
-                        URL to redirect to will be stored in this variable
-                        (the pointer must never be NULL)
-
-        @return indicator of how to treat the request
-     */
-    virtual wxHtmlOpeningStatus OnHTMLOpeningURL(wxHtmlURLType type,
-                                                 const wxString& url,
-                                                 wxString *redirect) const = 0;
-
-    /**
-        Converts coordinates @a pos relative to given @a cell to
-        physical coordinates in the window.
-     */
-    virtual wxPoint HTMLCoordsToWindow(wxHtmlCell *cell,
-                                       const wxPoint& pos) const = 0;
-
-    /// Returns the window used for rendering (may be NULL).
-    virtual wxWindow* GetHTMLWindow() = 0;
-
-    /// Returns background colour to use by default.
-    virtual wxColour GetHTMLBackgroundColour() const = 0;
-
-    /// Sets window's background to colour @a clr.
-    virtual void SetHTMLBackgroundColour(const wxColour& clr) = 0;
-
-    /// Sets window's background to given bitmap.
-    virtual void SetHTMLBackgroundImage(const wxBitmap& bmpBg) = 0;
-
-    /// Sets status bar text.
-    virtual void SetHTMLStatusText(const wxString& text) = 0;
-
-    /// Type of mouse cursor
-    enum HTMLCursor
-    {
-        /// Standard mouse cursor (typically an arrow)
-        HTMLCursor_Default,
-        /// Cursor shown over links
-        HTMLCursor_Link,
-        /// Cursor shown over selectable text
-        HTMLCursor_Text
-    };
-
-    /**
-        Returns mouse cursor of given @a type.
-     */
-    virtual wxCursor GetHTMLCursor(HTMLCursor type) const = 0;
-};
-
-/**
-    Helper class that implements part of mouse handling for wxHtmlWindow and
-    wxHtmlListBox. Cursor changes and clicking on links are handled, text
-    selection is not.
- */
-class WXDLLIMPEXP_HTML wxHtmlWindowMouseHelper
-{
-protected:
-    /**
-        Ctor.
-
-        @param iface Interface to the owner window.
-     */
-    wxHtmlWindowMouseHelper(wxHtmlWindowInterface *iface);
-
-    /**
-        Virtual dtor.
-
-        It is not really needed in this case but at leats it prevents gcc from
-        complaining about its absence.
-     */
-    virtual ~wxHtmlWindowMouseHelper() { }
-
-    /// Returns true if the mouse moved since the last call to HandleIdle
-    bool DidMouseMove() const { return m_tmpMouseMoved; }
-
-    /// Call this from EVT_MOTION event handler
-    void HandleMouseMoved();
-
-    /**
-        Call this from EVT_LEFT_UP handler (or, alternatively, EVT_LEFT_DOWN).
-
-        @param rootCell HTML cell inside which the click occured. This doesn't
-                        have to be the leaf cell, it can be e.g. toplevel
-                        container, but the mouse must be inside the container's
-                        area, otherwise the event would be ignored.
-        @param pos      Mouse position in coordinates relative to @a cell
-        @param event    The event that triggered the call
-     */
-    bool HandleMouseClick(wxHtmlCell *rootCell,
-                          const wxPoint& pos, const wxMouseEvent& event);
-
-    /**
-        Call this from OnInternalIdle of the HTML displaying window. Handles
-        mouse movements and must be used together with HandleMouseMoved.
-
-        @param rootCell HTML cell inside which the click occured. This doesn't
-                        have to be the leaf cell, it can be e.g. toplevel
-                        container, but the mouse must be inside the container's
-                        area, otherwise the event would be ignored.
-        @param pos      Current mouse position in coordinates relative to
-                        @a cell
-     */
-    void HandleIdle(wxHtmlCell *rootCell, const wxPoint& pos);
-
-    /**
-        Called by HandleIdle when the mouse hovers over a cell. Default
-        behaviour is to do nothing.
-
-        @param cell   the cell the mouse is over
-        @param x, y   coordinates of mouse relative to the cell
-     */
-    virtual void OnCellMouseHover(wxHtmlCell *cell, wxCoord x, wxCoord y);
-
-    /**
-        Called by HandleMouseClick when the user clicks on a cell.
-        Default behaviour is to call wxHtmlWindowInterface::OnLinkClicked()
-        if this cell corresponds to a hypertext link.
-
-        @param cell   the cell the mouse is over
-        @param x, y   coordinates of mouse relative to the cell
-        @param event    The event that triggered the call
-
-
-        @return true if a link was clicked, false otherwise.
-     */
-    virtual bool OnCellClicked(wxHtmlCell *cell,
-                               wxCoord x, wxCoord y,
-                               const wxMouseEvent& event);
-
-protected:
-    // this flag indicates if the mouse moved (used by HandleIdle)
-    bool m_tmpMouseMoved;
-    // contains last link name
-    wxHtmlLinkInfo *m_tmpLastLink;
-    // contains the last (terminal) cell which contained the mouse
-    wxHtmlCell *m_tmpLastCell;
-
-private:
-    wxHtmlWindowInterface *m_interface;
-};
-
-// ----------------------------------------------------------------------------
-// wxHtmlWindow
-//                  (This is probably the only class you will directly use.)
-//                  Purpose of this class is to display HTML page (either local
-//                  file or downloaded via HTTP protocol) in a window. Width of
-//                  window is constant - given in constructor - virtual height
-//                  is changed dynamically depending on page size.  Once the
-//                  window is created you can set its content by calling
-//                  SetPage(text) or LoadPage(filename).
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_HTML wxHtmlWindow : public wxScrolledWindow,
-                                      public wxHtmlWindowInterface,
-                                      public wxHtmlWindowMouseHelper
-{
-    DECLARE_DYNAMIC_CLASS(wxHtmlWindow)
-    friend class wxHtmlWinModule;
-
-public:
-    wxHtmlWindow() : wxHtmlWindowMouseHelper(this) { Init(); }
-    wxHtmlWindow(wxWindow *parent, wxWindowID id = wxID_ANY,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = wxHW_DEFAULT_STYLE,
-                 const wxString& name = wxT("htmlWindow"))
-        : wxHtmlWindowMouseHelper(this)
-    {
-        Init();
-        Create(parent, id, pos, size, style, name);
-    }
-    virtual ~wxHtmlWindow();
-
-    bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxHW_SCROLLBAR_AUTO,
-                const wxString& name = wxT("htmlWindow"));
-
-    // Set HTML page and display it. !! source is HTML document itself,
-    // it is NOT address/filename of HTML document. If you want to
-    // specify document location, use LoadPage() istead
-    // Return value : false if an error occurred, true otherwise
-    virtual bool SetPage(const wxString& source);
-
-    // Append to current page
-    bool AppendToPage(const wxString& source);
-
-    // Load HTML page from given location. Location can be either
-    // a) /usr/wxGTK2/docs/html/wx.htm
-    // b) http://www.somewhere.uk/document.htm
-    // c) ftp://ftp.somesite.cz/pub/something.htm
-    // In case there is no prefix (http:,ftp:), the method
-    // will try to find it itself (1. local file, then http or ftp)
-    // After the page is loaded, the method calls SetPage() to display it.
-    // Note : you can also use path relative to previously loaded page
-    // Return value : same as SetPage
-    virtual bool LoadPage(const wxString& location);
-
-    // Loads HTML page from file
-    bool LoadFile(const wxFileName& filename);
-
-    // Returns full location of opened page
-    wxString GetOpenedPage() const {return m_OpenedPage;}
-    // Returns anchor within opened page
-    wxString GetOpenedAnchor() const {return m_OpenedAnchor;}
-    // Returns  of opened page or empty string otherwise
-    wxString GetOpenedPageTitle() const {return m_OpenedPageTitle;}
-
-    // Sets frame in which page title will  be displayed. Format is format of
-    // frame title, e.g. "HtmlHelp : %s". It must contain exactly one %s
-    void SetRelatedFrame(wxFrame* frame, const wxString& format);
-    wxFrame* GetRelatedFrame() const {return m_RelatedFrame;}
-
-#if wxUSE_STATUSBAR
-    // After(!) calling SetRelatedFrame, this sets statusbar slot where messages
-    // will be displayed. Default is -1 = no messages.
-    void SetRelatedStatusBar(int index);
-    void SetRelatedStatusBar(wxStatusBar*, int index = 0);
-#endif // wxUSE_STATUSBAR
-
-    // Sets fonts to be used when displaying HTML page.
-    void SetFonts(const wxString& normal_face, const wxString& fixed_face,
-                  const int *sizes = NULL);
-
-    // Sets font sizes to be relative to the given size or the system
-    // default size; use either specified or default font
-    void SetStandardFonts(int size = -1,
-                          const wxString& normal_face = wxEmptyString,
-                          const wxString& fixed_face = wxEmptyString);
-
-    // Sets space between text and window borders.
-    void SetBorders(int b) {m_Borders = b;}
-
-    // Sets the bitmap to use for background (currnetly it will be tiled,
-    // when/if we have CSS support we could add other possibilities...)
-    void SetBackgroundImage(const wxBitmap& bmpBg) { m_bmpBg = bmpBg; }
-
-#if wxUSE_CONFIG
-    // Saves custom settings into cfg config. it will use the path 'path'
-    // if given, otherwise it will save info into currently selected path.
-    // saved values : things set by SetFonts, SetBorders.
-    virtual void ReadCustomization(wxConfigBase *cfg, wxString path = wxEmptyString);
-    // ...
-    virtual void WriteCustomization(wxConfigBase *cfg, wxString path = wxEmptyString);
-#endif // wxUSE_CONFIG
-
-    // Goes to previous/next page (in browsing history)
-    // Returns true if successful, false otherwise
-    bool HistoryBack();
-    bool HistoryForward();
-    bool HistoryCanBack();
-    bool HistoryCanForward();
-    // Resets history
-    void HistoryClear();
-
-    // Returns pointer to conteiners/cells structure.
-    // It should be used ONLY when printing
-    wxHtmlContainerCell* GetInternalRepresentation() const {return m_Cell;}
-
-    // Adds input filter
-    static void AddFilter(wxHtmlFilter *filter);
-
-    // Returns a pointer to the parser.
-    wxHtmlWinParser *GetParser() const { return m_Parser; }
-
-    // Adds HTML processor to this instance of wxHtmlWindow:
-    void AddProcessor(wxHtmlProcessor *processor);
-    // Adds HTML processor to wxHtmlWindow class as whole:
-    static void AddGlobalProcessor(wxHtmlProcessor *processor);
-
-
-    // -- Callbacks --
-
-    // Sets the title of the window
-    // (depending on the information passed to SetRelatedFrame() method)
-    virtual void OnSetTitle(const wxString& title);
-
-    // Called when user clicked on hypertext link. Default behaviour is to
-    // call LoadPage(loc)
-    virtual void OnLinkClicked(const wxHtmlLinkInfo& link);
-
-    // Called when wxHtmlWindow wants to fetch data from an URL (e.g. when
-    // loading a page or loading an image). The data are downloaded if and only if
-    // OnOpeningURL returns true. If OnOpeningURL returns wxHTML_REDIRECT,
-    // it must set *redirect to the new URL
-    virtual wxHtmlOpeningStatus OnOpeningURL(wxHtmlURLType WXUNUSED(type),
-                                             const wxString& WXUNUSED(url),
-                                             wxString *WXUNUSED(redirect)) const
-        { return wxHTML_OPEN; }
-
-#if wxUSE_CLIPBOARD
-    // Helper functions to select parts of page:
-    void SelectWord(const wxPoint& pos);
-    void SelectLine(const wxPoint& pos);
-    void SelectAll();
-
-    // Convert selection to text:
-    wxString SelectionToText() { return DoSelectionToText(m_selection); }
-
-    // Converts current page to text:
-    wxString ToText();
-#endif // wxUSE_CLIPBOARD
-
-    virtual void OnInternalIdle();
-
-    /// Returns standard HTML cursor as used by wxHtmlWindow
-    static wxCursor GetDefaultHTMLCursor(HTMLCursor type);
-
-protected:
-    void Init();
-
-    // Scrolls to anchor of this name. (Anchor is #news
-    // or #features etc. it is part of address sometimes:
-    // http://www.ms.mff.cuni.cz/~vsla8348/wxhtml/index.html#news)
-    // Return value : true if anchor exists, false otherwise
-    bool ScrollToAnchor(const wxString& anchor);
-
-    // Prepares layout (= fill m_PosX, m_PosY for fragments) based on
-    // actual size of window. This method also setup scrollbars
-    void CreateLayout();
-
-    void OnPaint(wxPaintEvent& event);
-    void OnEraseBackground(wxEraseEvent& event);
-    void OnSize(wxSizeEvent& event);
-    void OnMouseMove(wxMouseEvent& event);
-    void OnMouseDown(wxMouseEvent& event);
-    void OnMouseUp(wxMouseEvent& event);
-#if wxUSE_CLIPBOARD
-    void OnKeyUp(wxKeyEvent& event);
-    void OnDoubleClick(wxMouseEvent& event);
-    void OnCopy(wxCommandEvent& event);
-    void OnClipboardEvent(wxClipboardTextEvent& event);
-    void OnMouseEnter(wxMouseEvent& event);
-    void OnMouseLeave(wxMouseEvent& event);
-    void OnMouseCaptureLost(wxMouseCaptureLostEvent& event);
-#endif // wxUSE_CLIPBOARD
-
-    // Returns new filter (will be stored into m_DefaultFilter variable)
-    virtual wxHtmlFilter *GetDefaultFilter() {return new wxHtmlFilterPlainText;}
-
-    // cleans static variables
-    static void CleanUpStatics();
-
-    // Returns true if text selection is enabled (wxClipboard must be available
-    // and wxHW_NO_SELECTION not used)
-    bool IsSelectionEnabled() const;
-
-    enum ClipboardType
-    {
-        Primary,
-        Secondary
-    };
-
-    // Copies selection to clipboard if the clipboard support is available
-    //
-    // returns true if anything was copied to clipboard, false otherwise
-    bool CopySelection(ClipboardType t = Secondary);
-
-#if wxUSE_CLIPBOARD
-    // Automatic scrolling during selection:
-    void StopAutoScrolling();
-#endif // wxUSE_CLIPBOARD
-
-    wxString DoSelectionToText(wxHtmlSelection *sel);
-
-public:
-    // wxHtmlWindowInterface methods:
-    virtual void SetHTMLWindowTitle(const wxString& title);
-    virtual void OnHTMLLinkClicked(const wxHtmlLinkInfo& link);
-    virtual wxHtmlOpeningStatus OnHTMLOpeningURL(wxHtmlURLType type,
-                                                 const wxString& url,
-                                                 wxString *redirect) const;
-    virtual wxPoint HTMLCoordsToWindow(wxHtmlCell *cell,
-                                       const wxPoint& pos) const;
-    virtual wxWindow* GetHTMLWindow();
-    virtual wxColour GetHTMLBackgroundColour() const;
-    virtual void SetHTMLBackgroundColour(const wxColour& clr);
-    virtual void SetHTMLBackgroundImage(const wxBitmap& bmpBg);
-    virtual void SetHTMLStatusText(const wxString& text);
-    virtual wxCursor GetHTMLCursor(HTMLCursor type) const;
-
-    // implementation of SetPage()
-    bool DoSetPage(const wxString& source);
-
-protected:
-    // This is pointer to the first cell in parsed data.  (Note: the first cell
-    // is usually top one = all other cells are sub-cells of this one)
-    wxHtmlContainerCell *m_Cell;
-    // parser which is used to parse HTML input.
-    // Each wxHtmlWindow has its own parser because sharing one global
-    // parser would be problematic (because of reentrancy)
-    wxHtmlWinParser *m_Parser;
-    // contains name of actually opened page or empty string if no page opened
-    wxString m_OpenedPage;
-    // contains name of current anchor within m_OpenedPage
-    wxString m_OpenedAnchor;
-    // contains title of actually opened page or empty string if no <TITLE> tag
-    wxString m_OpenedPageTitle;
-    // class for opening files (file system)
-    wxFileSystem* m_FS;
-
-    // frame in which page title should be displayed & number of its statusbar
-    // reserved for usage with this html window
-    wxFrame *m_RelatedFrame;
-#if wxUSE_STATUSBAR
-    int m_RelatedStatusBarIndex;
-    wxStatusBar* m_RelatedStatusBar;
-#endif // wxUSE_STATUSBAR
-    wxString m_TitleFormat;
-
-    // borders (free space between text and window borders)
-    // defaults to 10 pixels.
-    int m_Borders;
-
-    // current text selection or NULL
-    wxHtmlSelection *m_selection;
-
-    // true if the user is dragging mouse to select text
-    bool m_makingSelection;
-
-#if wxUSE_CLIPBOARD
-    // time of the last doubleclick event, used to detect tripleclicks
-    // (tripleclicks are used to select whole line):
-    wxMilliClock_t m_lastDoubleClick;
-
-    // helper class to automatically scroll the window if the user is selecting
-    // text and the mouse leaves wxHtmlWindow:
-    wxHtmlWinAutoScrollTimer *m_timerAutoScroll;
-#endif // wxUSE_CLIPBOARD
-
-private:
-    // erase the window background using m_bmpBg or just solid colour if we
-    // don't have any background image
-    void DoEraseBackground(wxDC& dc);
-
-    // window content for double buffered rendering, may be invalid until it is
-    // really initialized in OnPaint()
-    wxBitmap m_backBuffer;
-
-    // background image, may be invalid
-    wxBitmap m_bmpBg;
-
-    // variables used when user is selecting text
-    wxPoint     m_tmpSelFromPos;
-    wxHtmlCell *m_tmpSelFromCell;
-
-    // if >0 contents of the window is not redrawn
-    // (in order to avoid ugly blinking)
-    int m_tmpCanDrawLocks;
-
-    // list of HTML filters
-    static wxList m_Filters;
-    // this filter is used when no filter is able to read some file
-    static wxHtmlFilter *m_DefaultFilter;
-
-    // html processors array:
-    wxHtmlProcessorList *m_Processors;
-    static wxHtmlProcessorList *m_GlobalProcessors;
-
-    // browser history
-    wxHtmlHistoryArray *m_History;
-    int m_HistoryPos;
-    // if this FLAG is false, items are not added to history
-    bool m_HistoryOn;
-
-    // Flag used to communicate between OnPaint() and OnEraseBackground(), see
-    // the comments near its use.
-    bool m_isBgReallyErased;
-
-    // standard mouse cursors
-    static wxCursor *ms_cursorLink;
-    static wxCursor *ms_cursorText;
-
-    DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxHtmlWindow);
-};
-
-class WXDLLIMPEXP_FWD_HTML wxHtmlCellEvent;
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_HTML, wxEVT_HTML_CELL_CLICKED, wxHtmlCellEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_HTML, wxEVT_HTML_CELL_HOVER, wxHtmlCellEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_HTML, wxEVT_HTML_LINK_CLICKED, wxHtmlLinkEvent );
-
-
-/*!
- * Html cell window event
- */
-
-class WXDLLIMPEXP_HTML wxHtmlCellEvent : public wxCommandEvent
-{
-public:
-    wxHtmlCellEvent() {}
-    wxHtmlCellEvent(wxEventType commandType, int id,
-                    wxHtmlCell *cell, const wxPoint &pt,
-                    const wxMouseEvent &ev)
-        : wxCommandEvent(commandType, id)
-    {
-        m_cell = cell;
-        m_pt = pt;
-        m_mouseEvent = ev;
-        m_bLinkWasClicked = false;
-    }
-
-    wxHtmlCell* GetCell() const { return m_cell; }
-    wxPoint GetPoint() const { return m_pt; }
-    wxMouseEvent GetMouseEvent() const { return m_mouseEvent; }
-
-    void SetLinkClicked(bool linkclicked) { m_bLinkWasClicked=linkclicked; }
-    bool GetLinkClicked() const { return m_bLinkWasClicked; }
-
-    // default copy ctor, assignment operator and dtor are ok
-    virtual wxEvent *Clone() const { return new wxHtmlCellEvent(*this); }
-
-private:
-    wxHtmlCell *m_cell;
-    wxMouseEvent m_mouseEvent;
-    wxPoint m_pt;
-
-    bool m_bLinkWasClicked;
-
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHtmlCellEvent)
-};
-
-
-
-/*!
- * Html link event
- */
-
-class WXDLLIMPEXP_HTML wxHtmlLinkEvent : public wxCommandEvent
-{
-public:
-    wxHtmlLinkEvent() {}
-    wxHtmlLinkEvent(int id, const wxHtmlLinkInfo &linkinfo)
-        : wxCommandEvent(wxEVT_HTML_LINK_CLICKED, id)
-    {
-        m_linkInfo = linkinfo;
-    }
-
-    const wxHtmlLinkInfo &GetLinkInfo() const { return m_linkInfo; }
-
-    // default copy ctor, assignment operator and dtor are ok
-    virtual wxEvent *Clone() const { return new wxHtmlLinkEvent(*this); }
-
-private:
-    wxHtmlLinkInfo m_linkInfo;
-
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxHtmlLinkEvent)
-};
-
-
-typedef void (wxEvtHandler::*wxHtmlCellEventFunction)(wxHtmlCellEvent&);
-typedef void (wxEvtHandler::*wxHtmlLinkEventFunction)(wxHtmlLinkEvent&);
-
-#define wxHtmlCellEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxHtmlCellEventFunction, func)
-#define wxHtmlLinkEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxHtmlLinkEventFunction, func)
-
-#define EVT_HTML_CELL_CLICKED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_HTML_CELL_CLICKED, id, wxHtmlCellEventHandler(fn))
-#define EVT_HTML_CELL_HOVER(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_HTML_CELL_HOVER, id, wxHtmlCellEventHandler(fn))
-#define EVT_HTML_LINK_CLICKED(id, fn) \
-    wx__DECLARE_EVT1(wxEVT_HTML_LINK_CLICKED, id, wxHtmlLinkEventHandler(fn))
-
-
-// old wxEVT_COMMAND_* constants
-#define wxEVT_COMMAND_HTML_CELL_CLICKED   wxEVT_HTML_CELL_CLICKED
-#define wxEVT_COMMAND_HTML_CELL_HOVER     wxEVT_HTML_CELL_HOVER
-#define wxEVT_COMMAND_HTML_LINK_CLICKED   wxEVT_HTML_LINK_CLICKED
-
-#endif // wxUSE_HTML
-
-#endif // _WX_HTMLWIN_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmprint.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmprint.h
deleted file mode 100644
index 9cf170a461..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/htmprint.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/html/htmprint.h
-// Purpose:     html printing classes
-// Author:      Vaclav Slavik
-// Created:     25/09/99
-// Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_HTMPRINT_H_
-#define _WX_HTMPRINT_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_HTML & wxUSE_PRINTING_ARCHITECTURE
-
-#include "wx/html/htmlcell.h"
-#include "wx/html/winpars.h"
-#include "wx/html/htmlfilt.h"
-
-#include "wx/print.h"
-#include "wx/printdlg.h"
-
-#include <limits.h> // INT_MAX
-
-//--------------------------------------------------------------------------------
-// wxHtmlDCRenderer
-//                  This class is capable of rendering HTML into specified
-//                  portion of DC
-//--------------------------------------------------------------------------------
-
-class WXDLLIMPEXP_HTML wxHtmlDCRenderer : public wxObject
-{
-public:
-    wxHtmlDCRenderer();
-    virtual ~wxHtmlDCRenderer();
-
-    // Following 3 methods *must* be called before any call to Render:
-
-    // Assign DC to this render
-    void SetDC(wxDC *dc, double pixel_scale = 1.0)
-        { SetDC(dc, pixel_scale, pixel_scale); }
-    void SetDC(wxDC *dc, double pixel_scale, double font_scale);
-
-    // Sets size of output rectangle, in pixels. Note that you *can't* change
-    // width of the rectangle between calls to Render! (You can freely change height.)
-    void SetSize(int width, int height);
-
-    // Sets the text to be displayed.
-    // Basepath is base directory (html string would be stored there if it was in
-    // file). It is used to determine path for loading images, for example.
-    // isdir is false if basepath is filename, true if it is directory name
-    // (see wxFileSystem for detailed explanation)
-    void SetHtmlText(const wxString& html, const wxString& basepath = wxEmptyString, bool isdir = true);
-
-    // Sets fonts to be used when displaying HTML page. (if size null then default sizes used).
-    void SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes = NULL);
-
-    // Sets font sizes to be relative to the given size or the system
-    // default size; use either specified or default font
-    void SetStandardFonts(int size = -1,
-                          const wxString& normal_face = wxEmptyString,
-                          const wxString& fixed_face = wxEmptyString);
-
-    // [x,y] is position of upper-left corner of printing rectangle (see SetSize)
-    // from is y-coordinate of the very first visible cell
-    // to is y-coordinate of the next following page break, if any
-    // Returned value is y coordinate of first cell than didn't fit onto page.
-    // Use this value as 'from' in next call to Render in order to print multiple pages
-    // document
-    // If dont_render is TRUE then nothing is rendered into DC and it only counts
-    // pixels and return y coord of the next page
-    //
-    // known_pagebreaks and number_of_pages are used only when counting pages;
-    // otherwise, their default values should be used. Their purpose is to
-    // support pagebreaks using a subset of CSS2's <DIV>. The <DIV> handler
-    // needs to know what pagebreaks have already been set so that it doesn't
-    // set the same pagebreak twice.
-    //
-    // CAUTION! Render() changes DC's user scale and does NOT restore it!
-    int Render(int x, int y, wxArrayInt& known_pagebreaks, int from = 0,
-               int dont_render = false, int to = INT_MAX);
-
-    // returns total width of the html document
-    int GetTotalWidth() const;
-
-    // returns total height of the html document
-    // (compare Render's return value with this)
-    int GetTotalHeight() const;
-
-private:
-    wxDC *m_DC;
-    wxHtmlWinParser *m_Parser;
-    wxFileSystem *m_FS;
-    wxHtmlContainerCell *m_Cells;
-    int m_MaxWidth, m_Width, m_Height;
-
-    wxDECLARE_NO_COPY_CLASS(wxHtmlDCRenderer);
-};
-
-
-
-
-
-enum {
-    wxPAGE_ODD,
-    wxPAGE_EVEN,
-    wxPAGE_ALL
-};
-
-
-
-//--------------------------------------------------------------------------------
-// wxHtmlPrintout
-//                  This class is derived from standard wxWidgets printout class
-//                  and is used to print HTML documents.
-//--------------------------------------------------------------------------------
-
-
-class WXDLLIMPEXP_HTML wxHtmlPrintout : public wxPrintout
-{
-public:
-    wxHtmlPrintout(const wxString& title = wxT("Printout"));
-    virtual ~wxHtmlPrintout();
-
-    void SetHtmlText(const wxString& html, const wxString &basepath = wxEmptyString, bool isdir = true);
-            // prepares the class for printing this html document.
-            // Must be called before using the class, in fact just after constructor
-            //
-            // basepath is base directory (html string would be stored there if it was in
-            // file). It is used to determine path for loading images, for example.
-            // isdir is false if basepath is filename, true if it is directory name
-            // (see wxFileSystem for detailed explanation)
-
-    void SetHtmlFile(const wxString &htmlfile);
-            // same as SetHtmlText except that it takes regular file as the parameter
-
-    void SetHeader(const wxString& header, int pg = wxPAGE_ALL);
-    void SetFooter(const wxString& footer, int pg = wxPAGE_ALL);
-            // sets header/footer for the document. The argument is interpreted as HTML document.
-            // You can use macros in it:
-            //   @PAGENUM@ is replaced by page number
-            //   @PAGESCNT@ is replaced by total number of pages
-            //
-            // pg is one of wxPAGE_ODD, wxPAGE_EVEN and wx_PAGE_ALL constants.
-            // You can set different header/footer for odd and even pages
-
-    // Sets fonts to be used when displaying HTML page. (if size null then default sizes used).
-    void SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes = NULL);
-
-    // Sets font sizes to be relative to the given size or the system
-    // default size; use either specified or default font
-    void SetStandardFonts(int size = -1,
-                          const wxString& normal_face = wxEmptyString,
-                          const wxString& fixed_face = wxEmptyString);
-
-    void SetMargins(float top = 25.2f, float bottom = 25.2f, float left = 25.2f, float right = 25.2f,
-                    float spaces = 5);
-            // sets margins in milimeters. Defaults to 1 inch for margins and 0.5cm for space
-            // between text and header and/or footer
-
-    // wxPrintout stuff:
-    bool OnPrintPage(int page);
-    bool HasPage(int page);
-    void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo);
-    bool OnBeginDocument(int startPage, int endPage);
-    void OnPreparePrinting();
-
-    // Adds input filter
-    static void AddFilter(wxHtmlFilter *filter);
-
-    // Cleanup
-    static void CleanUpStatics();
-
-private:
-    // this function is called by the base class OnPreparePrinting()
-    // implementation and by default checks whether the document fits into
-    // pageArea horizontally and warns the user if it does not and, if we're
-    // going to print and not just to preview the document, giving him the
-    // possibility to cancel printing
-    //
-    // you may override it to either suppress this check if truncation of the
-    // HTML being printed is acceptable or, on the contrary, add more checks to
-    // it, e.g. for the fit in the vertical direction if the document should
-    // always appear on a single page
-    //
-    // return true if printing should go ahead or false to cancel it (the
-    // return value is ignored when previewing)
-    virtual bool CheckFit(const wxSize& pageArea, const wxSize& docArea) const;
-
-    void RenderPage(wxDC *dc, int page);
-            // renders one page into dc
-    wxString TranslateHeader(const wxString& instr, int page);
-            // substitute @PAGENUM@ and @PAGESCNT@ by real values
-    void CountPages();
-            // counts pages and fills m_NumPages and m_PageBreaks
-
-
-private:
-    int m_NumPages;
-    wxArrayInt m_PageBreaks;
-
-    wxString m_Document, m_BasePath;
-    bool m_BasePathIsDir;
-    wxString m_Headers[2], m_Footers[2];
-
-    int m_HeaderHeight, m_FooterHeight;
-    wxHtmlDCRenderer *m_Renderer, *m_RendererHdr;
-    float m_MarginTop, m_MarginBottom, m_MarginLeft, m_MarginRight, m_MarginSpace;
-
-    // list of HTML filters
-    static wxList m_Filters;
-
-    wxDECLARE_NO_COPY_CLASS(wxHtmlPrintout);
-};
-
-
-
-
-
-//--------------------------------------------------------------------------------
-// wxHtmlEasyPrinting
-//                  This class provides very simple interface to printing
-//                  architecture. It allows you to print HTML documents only
-//                  with very few commands.
-//
-//                  Note : do not create this class on stack only.
-//                         You should create an instance on app startup and
-//                         use this instance for all printing. Why? The class
-//                         stores page&printer settings in it.
-//--------------------------------------------------------------------------------
-
-class WXDLLIMPEXP_HTML wxHtmlEasyPrinting : public wxObject
-{
-public:
-    wxHtmlEasyPrinting(const wxString& name = wxT("Printing"), wxWindow *parentWindow = NULL);
-    virtual ~wxHtmlEasyPrinting();
-
-    bool PreviewFile(const wxString &htmlfile);
-    bool PreviewText(const wxString &htmltext, const wxString& basepath = wxEmptyString);
-            // Preview file / html-text for printing
-            // (and offers printing)
-            // basepath is base directory for opening subsequent files (e.g. from <img> tag)
-
-    bool PrintFile(const wxString &htmlfile);
-    bool PrintText(const wxString &htmltext, const wxString& basepath = wxEmptyString);
-            // Print file / html-text w/o preview
-
-    void PageSetup();
-            // pop up printer or page setup dialog
-
-    void SetHeader(const wxString& header, int pg = wxPAGE_ALL);
-    void SetFooter(const wxString& footer, int pg = wxPAGE_ALL);
-            // sets header/footer for the document. The argument is interpreted as HTML document.
-            // You can use macros in it:
-            //   @PAGENUM@ is replaced by page number
-            //   @PAGESCNT@ is replaced by total number of pages
-            //
-            // pg is one of wxPAGE_ODD, wxPAGE_EVEN and wx_PAGE_ALL constants.
-            // You can set different header/footer for odd and even pages
-
-    void SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes = 0);
-    // Sets fonts to be used when displaying HTML page. (if size null then default sizes used)
-
-    // Sets font sizes to be relative to the given size or the system
-    // default size; use either specified or default font
-    void SetStandardFonts(int size = -1,
-                          const wxString& normal_face = wxEmptyString,
-                          const wxString& fixed_face = wxEmptyString);
-
-    wxPrintData *GetPrintData();
-    wxPageSetupDialogData *GetPageSetupData() {return m_PageSetupData;}
-            // return page setting data objects.
-            // (You can set their parameters.)
-
-    wxWindow* GetParentWindow() const { return m_ParentWindow; }
-            // get the parent window
-    void SetParentWindow(wxWindow* window) { m_ParentWindow = window; }
-            // set the parent window
-
-    const wxString& GetName() const { return m_Name; }
-            // get the printout name
-    void SetName(const wxString& name) { m_Name = name; }
-            // set the printout name
-
-protected:
-    virtual wxHtmlPrintout *CreatePrintout();
-    virtual bool DoPreview(wxHtmlPrintout *printout1, wxHtmlPrintout *printout2);
-    virtual bool DoPrint(wxHtmlPrintout *printout);
-
-private:
-    wxPrintData *m_PrintData;
-    wxPageSetupDialogData *m_PageSetupData;
-    wxString m_Name;
-    int m_FontsSizesArr[7];
-    int *m_FontsSizes;
-    wxString m_FontFaceFixed, m_FontFaceNormal;
-
-    enum FontMode
-    {
-        FontMode_Explicit,
-        FontMode_Standard
-    };
-    FontMode m_fontMode;
-
-    wxString m_Headers[2], m_Footers[2];
-    wxWindow *m_ParentWindow;
-
-    wxDECLARE_NO_COPY_CLASS(wxHtmlEasyPrinting);
-};
-
-
-
-
-#endif  // wxUSE_HTML & wxUSE_PRINTING_ARCHITECTURE
-
-#endif // _WX_HTMPRINT_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/m_templ.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/m_templ.h
deleted file mode 100644
index 58603ac086..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/m_templ.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/html/m_templ.h
-// Purpose:     Modules template file
-// Author:      Vaclav Slavik
-// Copyright:   (c) Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-/*
-
-DESCRIPTION:
-This is set of macros for easier writing of tag handlers. How to use it?
-See mod_fonts.cpp for example...
-
-Attention! This is quite strange C++ bastard. Before using it,
-I STRONGLY recommend reading and understanding these macros!!
-
-*/
-
-
-#ifndef _WX_M_TEMPL_H_
-#define _WX_M_TEMPL_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_HTML
-
-#include "wx/html/winpars.h"
-
-#define TAG_HANDLER_BEGIN(name,tags)                                      \
-    class wxHTML_Handler_##name : public wxHtmlWinTagHandler              \
-    {                                                                     \
-        public:                                                           \
-            wxString GetSupportedTags() {return wxT(tags);}
-
-
-
-#define TAG_HANDLER_VARS                                                  \
-        private:
-
-#define TAG_HANDLER_CONSTR(name)                                                \
-        public:                                                           \
-        wxHTML_Handler_##name () : wxHtmlWinTagHandler()
-
-
-#define TAG_HANDLER_PROC(varib)                                           \
-        public:                                                           \
-            bool HandleTag(const wxHtmlTag& varib)
-
-
-
-#define TAG_HANDLER_END(name)                                             \
-    };
-
-
-
-
-#define TAGS_MODULE_BEGIN(name)                                           \
-    class wxHTML_Module##name : public wxHtmlTagsModule                   \
-    {                                                                     \
-        DECLARE_DYNAMIC_CLASS(wxHTML_Module##name )                       \
-        public:                                                           \
-            void FillHandlersTable(wxHtmlWinParser *parser)               \
-                {
-
-
-
-
-#define TAGS_MODULE_ADD(handler)                                          \
-                    parser->AddTagHandler(new wxHTML_Handler_##handler);
-
-
-
-
-#define TAGS_MODULE_END(name)                                             \
-                }                                                         \
-    };                                                                    \
-    IMPLEMENT_DYNAMIC_CLASS(wxHTML_Module##name , wxHtmlTagsModule)
-
-
-
-#endif
-#endif
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/styleparams.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/styleparams.h
deleted file mode 100644
index 8269c12459..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/styleparams.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/html/styleparams.h
-// Purpose:     wxHtml helper code for extracting style parameters
-// Author:      Nigel Paton
-// Copyright:   wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_HTML_STYLEPARAMS_H_
-#define _WX_HTML_STYLEPARAMS_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_HTML
-
-#include "wx/arrstr.h"
-
-class WXDLLIMPEXP_FWD_HTML wxHtmlTag;
-
-// This is a private class used by wxHTML to parse "style" attributes of HTML
-// elements. Currently both parsing and support for the parsed values is pretty
-// trivial.
-class WXDLLIMPEXP_HTML wxHtmlStyleParams
-{
-public:
-    // Construct a style parameters object corresponding to the style attribute
-    // of the given HTML tag.
-    wxHtmlStyleParams(const wxHtmlTag& tag);
-
-    // Check whether the named parameter is present or not.
-    bool HasParam(const wxString& par) const
-    {
-        return m_names.Index(par, false /* ignore case */) != wxNOT_FOUND;
-    }
-
-    // Get the value of the named parameter, return empty string if none.
-    wxString GetParam(const wxString& par) const
-    {
-        int index = m_names.Index(par, false);
-        return index == wxNOT_FOUND ? wxString() : m_values[index];
-    }
-
-private:
-    // Arrays if names and values of the parameters
-    wxArrayString
-        m_names,
-        m_values;
-};
-
-#endif // wxUSE_HTML
-
-#endif // _WX_HTML_STYLEPARAMS_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/webkit.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/webkit.h
deleted file mode 100644
index 87003672b4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/webkit.h
+++ /dev/null
@@ -1,239 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/html/webkit.h
-// Purpose:     wxWebKitCtrl - embeddable web kit control
-// Author:      Jethro Grassie / Kevin Ollivier
-// Modified by:
-// Created:     2004-4-16
-// Copyright:   (c) Jethro Grassie / Kevin Ollivier
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WEBKIT_H
-#define _WX_WEBKIT_H
-
-#if wxUSE_WEBKIT
-
-#if !defined(__WXMAC__) && !defined(__WXCOCOA__)
-#error "wxWebKitCtrl not implemented for this platform"
-#endif
-
-#include "wx/control.h"
-DECLARE_WXCOCOA_OBJC_CLASS(WebView); 
-
-// ----------------------------------------------------------------------------
-// Web Kit Control
-// ----------------------------------------------------------------------------
-
-extern WXDLLIMPEXP_DATA_CORE(const char) wxWebKitCtrlNameStr[];
-
-class WXDLLIMPEXP_CORE wxWebKitCtrl : public wxControl
-{
-public:
-    DECLARE_DYNAMIC_CLASS(wxWebKitCtrl)
-
-    wxWebKitCtrl() {}
-    wxWebKitCtrl(wxWindow *parent,
-                    wxWindowID winID,
-                    const wxString& strURL,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize, long style = 0,
-                    const wxValidator& validator = wxDefaultValidator,
-                    const wxString& name = wxWebKitCtrlNameStr)
-    {
-        Create(parent, winID, strURL, pos, size, style, validator, name);
-    }
-    bool Create(wxWindow *parent,
-                wxWindowID winID,
-                const wxString& strURL,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize, long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxWebKitCtrlNameStr);
-    virtual ~wxWebKitCtrl();
-
-    void LoadURL(const wxString &url);
-
-    bool CanGoBack();
-    bool CanGoForward();
-    bool GoBack();
-    bool GoForward();
-    void Reload();
-    void Stop();
-    bool CanGetPageSource();
-    wxString GetPageSource();
-    void SetPageSource(const wxString& source, const wxString& baseUrl = wxEmptyString);
-    wxString GetPageURL(){ return m_currentURL; }
-    void SetPageTitle(const wxString& title) { m_pageTitle = title; }
-    wxString GetPageTitle(){ return m_pageTitle; }
-
-    // since these worked in 2.6, add wrappers
-    void SetTitle(const wxString& title) { SetPageTitle(title); }
-    wxString GetTitle() { return GetPageTitle(); }
-
-    wxString GetSelection();
-
-    bool CanIncreaseTextSize();
-    void IncreaseTextSize();
-    bool CanDecreaseTextSize();
-    void DecreaseTextSize();
-
-    void Print(bool showPrompt = false);
-
-    void MakeEditable(bool enable = true);
-    bool IsEditable();
-
-    wxString RunScript(const wxString& javascript);
-
-    void SetScrollPos(int pos);
-    int GetScrollPos();
-
-    // don't hide base class virtuals
-    virtual void SetScrollPos( int orient, int pos, bool refresh = true )
-        { return wxControl::SetScrollPos(orient, pos, refresh); }
-    virtual int GetScrollPos( int orient ) const
-        { return wxControl::GetScrollPos(orient); }
-
-    //we need to resize the webview when the control size changes
-    void OnSize(wxSizeEvent &event);
-    void OnMove(wxMoveEvent &event);
-    void OnMouseEvents(wxMouseEvent &event);
-protected:
-    DECLARE_EVENT_TABLE()
-    void MacVisibilityChanged();
-
-private:
-    wxWindow *m_parent;
-    wxWindowID m_windowID;
-    wxString m_currentURL;
-    wxString m_pageTitle;
-
-    WX_WebView m_webView;
-
-    // we may use this later to setup our own mouse events,
-    // so leave it in for now.
-    void* m_webKitCtrlEventHandler;
-};
-
-// ----------------------------------------------------------------------------
-// Web Kit Events
-// ----------------------------------------------------------------------------
-
-enum {
-    wxWEBKIT_STATE_START = 1,
-    wxWEBKIT_STATE_NEGOTIATING = 2,
-    wxWEBKIT_STATE_REDIRECTING = 4,
-    wxWEBKIT_STATE_TRANSFERRING = 8,
-    wxWEBKIT_STATE_STOP = 16,
-        wxWEBKIT_STATE_FAILED = 32
-};
-
-enum {
-    wxWEBKIT_NAV_LINK_CLICKED = 1,
-    wxWEBKIT_NAV_BACK_NEXT = 2,
-    wxWEBKIT_NAV_FORM_SUBMITTED = 4,
-    wxWEBKIT_NAV_RELOAD = 8,
-    wxWEBKIT_NAV_FORM_RESUBMITTED = 16,
-    wxWEBKIT_NAV_OTHER = 32
-
-};
-
-
-
-class WXDLLIMPEXP_CORE wxWebKitBeforeLoadEvent : public wxCommandEvent
-{
-    DECLARE_DYNAMIC_CLASS( wxWebKitBeforeLoadEvent )
-
-public:
-    bool IsCancelled() { return m_cancelled; }
-    void Cancel(bool cancel = true) { m_cancelled = cancel; }
-    wxString GetURL() { return m_url; }
-    void SetURL(const wxString& url) { m_url = url; }
-    void SetNavigationType(int navType) { m_navType = navType; }
-    int GetNavigationType() { return m_navType; }
-
-    wxWebKitBeforeLoadEvent( wxWindow* win = NULL );
-    wxEvent *Clone(void) const { return new wxWebKitBeforeLoadEvent(*this); }
-
-protected:
-    bool m_cancelled;
-    wxString m_url;
-    int m_navType;
-};
-
-class WXDLLIMPEXP_CORE wxWebKitStateChangedEvent : public wxCommandEvent
-{
-    DECLARE_DYNAMIC_CLASS( wxWebKitStateChangedEvent )
-
-public:
-    int GetState() { return m_state; }
-    void SetState(const int state) { m_state = state; }
-    wxString GetURL() { return m_url; }
-    void SetURL(const wxString& url) { m_url = url; }
-
-    wxWebKitStateChangedEvent( wxWindow* win = NULL );
-    wxEvent *Clone(void) const { return new wxWebKitStateChangedEvent(*this); }
-
-protected:
-    int m_state;
-    wxString m_url;
-};
-
-
-class WXDLLIMPEXP_CORE wxWebKitNewWindowEvent : public wxCommandEvent
-{
-    DECLARE_DYNAMIC_CLASS( wxWebKitNewWindowEvent )
-public:
-    wxString GetURL() const { return m_url; }
-    void SetURL(const wxString& url) { m_url = url; }
-    wxString GetTargetName() const { return m_targetName; }
-    void SetTargetName(const wxString& name) { m_targetName = name; }
-
-    wxWebKitNewWindowEvent( wxWindow* win = (wxWindow*)(NULL));
-    wxEvent *Clone(void) const { return new wxWebKitNewWindowEvent(*this); }
-
-private:
-    wxString m_url;
-    wxString m_targetName;
-};
-
-typedef void (wxEvtHandler::*wxWebKitStateChangedEventFunction)(wxWebKitStateChangedEvent&);
-typedef void (wxEvtHandler::*wxWebKitBeforeLoadEventFunction)(wxWebKitBeforeLoadEvent&);
-typedef void (wxEvtHandler::*wxWebKitNewWindowEventFunction)(wxWebKitNewWindowEvent&);
-
-#define wxWebKitStateChangedEventHandler( func ) \
-    wxEVENT_HANDLER_CAST( wxWebKitStateChangedEventFunction, func )
-
-#define wxWebKitBeforeLoadEventHandler( func ) \
-    wxEVENT_HANDLER_CAST( wxWebKitBeforeLoadEventFunction, func )
-
-#define wxWebKitNewWindowEventHandler( func ) \
-    wxEVENT_HANDLER_CAST( wxWebKitNewWindowEventFunction, func )
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_STATE_CHANGED, wxWebKitStateChangedEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_BEFORE_LOAD, wxWebKitBeforeLoadEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_CORE, wxEVT_WEBKIT_NEW_WINDOW, wxWebKitNewWindowEvent );
-
-#define EVT_WEBKIT_STATE_CHANGED(func) \
-            wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_STATE_CHANGED, \
-                            wxID_ANY, \
-                            wxID_ANY, \
-                            wxWebKitStateChangedEventHandler( func ), \
-                            NULL ),
-
-#define EVT_WEBKIT_BEFORE_LOAD(func) \
-            wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_BEFORE_LOAD, \
-                            wxID_ANY, \
-                            wxID_ANY, \
-                            wxWebKitBeforeLoadEventHandler( func ), \
-                            NULL ),
-
-#define EVT_WEBKIT_NEW_WINDOW(func)                              \
-            wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_WEBKIT_NEW_WINDOW, \
-                            wxID_ANY, \
-                            wxID_ANY, \
-                            wxWebKitNewWindowEventHandler( func ), \
-                            NULL ),
-#endif // wxUSE_WEBKIT
-
-#endif
-    // _WX_WEBKIT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/winpars.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/winpars.h
deleted file mode 100644
index a778dfa85f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/html/winpars.h
+++ /dev/null
@@ -1,312 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/html/winpars.h
-// Purpose:     wxHtmlWinParser class (parser to be used with wxHtmlWindow)
-// Author:      Vaclav Slavik
-// Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WINPARS_H_
-#define _WX_WINPARS_H_
-
-#include "wx/defs.h"
-#if wxUSE_HTML
-
-#include "wx/module.h"
-#include "wx/font.h"
-#include "wx/html/htmlpars.h"
-#include "wx/html/htmlcell.h"
-#include "wx/encconv.h"
-
-class WXDLLIMPEXP_FWD_HTML wxHtmlWindow;
-class WXDLLIMPEXP_FWD_HTML wxHtmlWindowInterface;
-class WXDLLIMPEXP_FWD_HTML wxHtmlWinParser;
-class WXDLLIMPEXP_FWD_HTML wxHtmlWinTagHandler;
-class WXDLLIMPEXP_FWD_HTML wxHtmlTagsModule;
-
-
-//--------------------------------------------------------------------------------
-// wxHtmlWinParser
-//                  This class is derived from wxHtmlParser and its mail goal
-//                  is to parse HTML input so that it can be displayed in
-//                  wxHtmlWindow. It uses special wxHtmlWinTagHandler.
-//--------------------------------------------------------------------------------
-
-class WXDLLIMPEXP_HTML wxHtmlWinParser : public wxHtmlParser
-{
-    DECLARE_ABSTRACT_CLASS(wxHtmlWinParser)
-    friend class wxHtmlWindow;
-
-public:
-    wxHtmlWinParser(wxHtmlWindowInterface *wndIface = NULL);
-
-    virtual ~wxHtmlWinParser();
-
-    virtual void InitParser(const wxString& source);
-    virtual void DoneParser();
-    virtual wxObject* GetProduct();
-
-    virtual wxFSFile *OpenURL(wxHtmlURLType type, const wxString& url) const;
-
-    // Set's the DC used for parsing. If SetDC() is not called,
-    // parsing won't proceed
-    virtual void SetDC(wxDC *dc, double pixel_scale = 1.0)
-        { SetDC(dc, pixel_scale, pixel_scale); }
-    void SetDC(wxDC *dc, double pixel_scale, double font_scale);
-
-    wxDC *GetDC() {return m_DC;}
-    double GetPixelScale() {return m_PixelScale;}
-    int GetCharHeight() const {return m_CharHeight;}
-    int GetCharWidth() const {return m_CharWidth;}
-
-    // NOTE : these functions do _not_ return _actual_
-    // height/width. They return h/w of default font
-    // for this DC. If you want actual values, call
-    // GetDC()->GetChar...()
-
-    // returns interface to the rendering window
-    wxHtmlWindowInterface *GetWindowInterface() {return m_windowInterface;}
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated, use GetWindowInterface()->GetHTMLWindow() instead
-    wxDEPRECATED( wxHtmlWindow *GetWindow() );
-#endif
-
-    // Sets fonts to be used when displaying HTML page. (if size null then default sizes used).
-    void SetFonts(const wxString& normal_face, const wxString& fixed_face, const int *sizes = NULL);
-
-    // Sets font sizes to be relative to the given size or the system
-    // default size; use either specified or default font
-    void SetStandardFonts(int size = -1,
-                          const wxString& normal_face = wxEmptyString,
-                          const wxString& fixed_face = wxEmptyString);
-
-    // Adds tags module. see wxHtmlTagsModule for details.
-    static void AddModule(wxHtmlTagsModule *module);
-
-    static void RemoveModule(wxHtmlTagsModule *module);
-
-    // parsing-related methods. These methods are called by tag handlers:
-
-    // Returns pointer to actual container. Common use in tag handler is :
-    // m_WParser->GetContainer()->InsertCell(new ...);
-    wxHtmlContainerCell *GetContainer() const {return m_Container;}
-
-    // opens new container. This container is sub-container of opened
-    // container. Sets GetContainer to newly created container
-    // and returns it.
-    wxHtmlContainerCell *OpenContainer();
-
-    // works like OpenContainer except that new container is not created
-    // but c is used. You can use this to directly set actual container
-    wxHtmlContainerCell *SetContainer(wxHtmlContainerCell *c);
-
-    // closes the container and sets actual Container to upper-level
-    // container
-    wxHtmlContainerCell *CloseContainer();
-
-    int GetFontSize() const {return m_FontSize;}
-    void SetFontSize(int s);
-    // Try to map a font size in points to the HTML 1-7 font size range.
-    void SetFontPointSize(int pt);
-    int GetFontBold() const {return m_FontBold;}
-    void SetFontBold(int x) {m_FontBold = x;}
-    int GetFontItalic() const {return m_FontItalic;}
-    void SetFontItalic(int x) {m_FontItalic = x;}
-    int GetFontUnderlined() const {return m_FontUnderlined;}
-    void SetFontUnderlined(int x) {m_FontUnderlined = x;}
-    int GetFontFixed() const {return m_FontFixed;}
-    void SetFontFixed(int x) {m_FontFixed = x;}
-    wxString GetFontFace() const {return GetFontFixed() ? m_FontFaceFixed : m_FontFaceNormal;}
-    void SetFontFace(const wxString& face);
-
-    int GetAlign() const {return m_Align;}
-    void SetAlign(int a) {m_Align = a;}
-
-    wxHtmlScriptMode GetScriptMode() const { return m_ScriptMode; }
-    void SetScriptMode(wxHtmlScriptMode mode) { m_ScriptMode = mode; }
-    long GetScriptBaseline() const { return m_ScriptBaseline; }
-    void SetScriptBaseline(long base) { m_ScriptBaseline = base; }
-
-    const wxColour& GetLinkColor() const { return m_LinkColor; }
-    void SetLinkColor(const wxColour& clr) { m_LinkColor = clr; }
-    const wxColour& GetActualColor() const { return m_ActualColor; }
-    void SetActualColor(const wxColour& clr) { m_ActualColor = clr ;}
-    const wxColour& GetActualBackgroundColor() const { return m_ActualBackgroundColor; }
-    void SetActualBackgroundColor(const wxColour& clr) { m_ActualBackgroundColor = clr;}
-    int GetActualBackgroundMode() const { return m_ActualBackgroundMode; }
-    void SetActualBackgroundMode(int mode) { m_ActualBackgroundMode = mode;}
-    const wxHtmlLinkInfo& GetLink() const { return m_Link; }
-    void SetLink(const wxHtmlLinkInfo& link);
-
-    // applies current parser state (link, sub/supscript, ...) to given cell
-    void ApplyStateToCell(wxHtmlCell *cell);
-
-    // Needs to be called after inserting a cell that interrupts the flow of
-    // the text like e.g. <img> and tells us to not consider any of the
-    // following space as being part of the same space run as before.
-    void StopCollapsingSpaces() { m_tmpLastWasSpace = false; }
-
-#if !wxUSE_UNICODE
-    void SetInputEncoding(wxFontEncoding enc);
-    wxFontEncoding GetInputEncoding() const { return m_InputEnc; }
-    wxFontEncoding GetOutputEncoding() const { return m_OutputEnc; }
-    wxEncodingConverter *GetEncodingConverter() const { return m_EncConv; }
-#endif
-
-    // creates font depending on m_Font* members.
-    virtual wxFont* CreateCurrentFont();
-
-    enum WhitespaceMode
-    {
-        Whitespace_Normal,  // normal mode, collapse whitespace
-        Whitespace_Pre      // inside <pre>, keep whitespace as-is
-    };
-
-    // change the current whitespace handling mode
-    void SetWhitespaceMode(WhitespaceMode mode) { m_whitespaceMode = mode; }
-    WhitespaceMode GetWhitespaceMode() const { return m_whitespaceMode; }
-
-protected:
-    virtual void AddText(const wxString& txt);
-
-private:
-    void FlushWordBuf(wxChar *temp, int& len);
-    void AddWord(wxHtmlWordCell *word);
-    void AddWord(const wxString& word)
-        { AddWord(new wxHtmlWordCell(word, *(GetDC()))); }
-    void AddPreBlock(const wxString& text);
-
-    bool m_tmpLastWasSpace;
-    wxChar *m_tmpStrBuf;
-    size_t  m_tmpStrBufSize;
-        // temporary variables used by AddText
-    wxHtmlWindowInterface *m_windowInterface;
-            // window we're parsing for
-    double m_PixelScale, m_FontScale;
-    wxDC *m_DC;
-            // Device Context we're parsing for
-    static wxList m_Modules;
-            // list of tags modules (see wxHtmlTagsModule for details)
-            // This list is used to initialize m_Handlers member.
-
-    wxHtmlContainerCell *m_Container;
-            // current container. See Open/CloseContainer for details.
-
-    int m_FontBold, m_FontItalic, m_FontUnderlined, m_FontFixed; // this is not true,false but 1,0, we need it for indexing
-    int m_FontSize; // From 1 (smallest) to 7, default is 3.
-    wxColour m_LinkColor;
-    wxColour m_ActualColor;
-    wxColour m_ActualBackgroundColor;
-    int m_ActualBackgroundMode;
-            // basic font parameters.
-    wxHtmlLinkInfo m_Link;
-            // actual hypertext link or empty string
-    bool m_UseLink;
-            // true if m_Link is not empty
-    int m_CharHeight, m_CharWidth;
-            // average height of normal-sized text
-    int m_Align;
-            // actual alignment
-    wxHtmlScriptMode m_ScriptMode;
-            // current script mode (sub/sup/normal)
-    long m_ScriptBaseline;
-            // current sub/supscript base
-
-    wxFont* m_FontsTable[2][2][2][2][7];
-    wxString m_FontsFacesTable[2][2][2][2][7];
-#if !wxUSE_UNICODE
-    wxFontEncoding m_FontsEncTable[2][2][2][2][7];
-#endif
-            // table of loaded fonts. 1st four indexes are 0 or 1, depending on on/off
-            // state of these flags (from left to right):
-            // [bold][italic][underlined][fixed_size]
-            // last index is font size : from 0 to 6 (remapped from html sizes 1 to 7)
-            // Note : this table covers all possible combinations of fonts, but not
-            // all of them are used, so many items in table are usually NULL.
-    int m_FontsSizes[7];
-    wxString m_FontFaceFixed, m_FontFaceNormal;
-            // html font sizes and faces of fixed and proportional fonts
-
-#if !wxUSE_UNICODE
-    wxChar m_nbsp;
-    wxFontEncoding m_InputEnc, m_OutputEnc;
-            // I/O font encodings
-    wxEncodingConverter *m_EncConv;
-#endif
-
-    // current whitespace handling mode
-    WhitespaceMode m_whitespaceMode;
-
-    wxHtmlWordCell *m_lastWordCell;
-
-    // current position on line, in num. of characters; used to properly
-    // expand TABs; only updated while inside <pre>
-    int m_posColumn;
-
-    wxDECLARE_NO_COPY_CLASS(wxHtmlWinParser);
-};
-
-
-
-
-
-
-//-----------------------------------------------------------------------------
-// wxHtmlWinTagHandler
-//                  This is basicly wxHtmlTagHandler except
-//                  it is extended with protected member m_Parser pointing to
-//                  the wxHtmlWinParser object
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_HTML wxHtmlStyleParams;
-
-class WXDLLIMPEXP_HTML wxHtmlWinTagHandler : public wxHtmlTagHandler
-{
-    DECLARE_ABSTRACT_CLASS(wxHtmlWinTagHandler)
-
-public:
-    wxHtmlWinTagHandler() : wxHtmlTagHandler() {}
-
-    virtual void SetParser(wxHtmlParser *parser) {wxHtmlTagHandler::SetParser(parser); m_WParser = (wxHtmlWinParser*) parser;}
-
-protected:
-    wxHtmlWinParser *m_WParser; // same as m_Parser, but overcasted
-
-    void ApplyStyle(const wxHtmlStyleParams &styleParams);
-
-    wxDECLARE_NO_COPY_CLASS(wxHtmlWinTagHandler);
-};
-
-
-
-
-
-
-//----------------------------------------------------------------------------
-// wxHtmlTagsModule
-//                  This is basic of dynamic tag handlers binding.
-//                  The class provides methods for filling parser's handlers
-//                  hash table.
-//                  (See documentation for details)
-//----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_HTML wxHtmlTagsModule : public wxModule
-{
-    DECLARE_DYNAMIC_CLASS(wxHtmlTagsModule)
-
-public:
-    wxHtmlTagsModule() : wxModule() {}
-
-    virtual bool OnInit();
-    virtual void OnExit();
-
-    // This is called by wxHtmlWinParser.
-    // The method must simply call parser->AddTagHandler(new
-    // <handler_class_name>); for each handler
-    virtual void FillHandlersTable(wxHtmlWinParser * WXUNUSED(parser)) { }
-};
-
-
-#endif
-
-#endif // _WX_WINPARS_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/accel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/accel.h
deleted file mode 100644
index 1c048c6dca..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/accel.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/accel.h
-// Purpose:     wxAcceleratorTable class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_ACCEL_H_
-#define _WX_ACCEL_H_
-
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/event.h"
-
-class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject
-{
-    DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
-public:
-    wxAcceleratorTable();
-    wxAcceleratorTable(const wxString& resource); // Load from .rc resource
-    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
-
-    virtual ~wxAcceleratorTable();
-
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const;
-
-    // Implementation only
-    int GetCount() const;
-    wxAcceleratorEntry* GetEntries() const;
-};
-
-extern WXDLLIMPEXP_DATA_CORE(wxAcceleratorTable) wxNullAcceleratorTable;
-
-#endif
-// _WX_ACCEL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/app.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/app.h
deleted file mode 100644
index 1fb7f951ec..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/app.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/app.h
-// Purpose:     wxApp class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_APP_H_
-#define _WX_APP_H_
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/event.h"
-#include "wx/hashmap.h"
-
-// ----------------------------------------------------------------------------
-// forward declarations
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxFrame;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLIMPEXP_FWD_CORE wxApp;
-class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
-class WXDLLIMPEXP_FWD_BASE wxLog;
-class WXDLLIMPEXP_FWD_CORE wxEventLoop;
-class WXDLLIMPEXP_FWD_CORE wxXVisualInfo;
-class WXDLLIMPEXP_FWD_CORE wxPerDisplayData;
-
-// ----------------------------------------------------------------------------
-// the wxApp class for Motif - see wxAppBase for more details
-// ----------------------------------------------------------------------------
-
-WX_DECLARE_VOIDPTR_HASH_MAP( wxPerDisplayData*, wxPerDisplayDataMap );
-
-class WXDLLIMPEXP_CORE wxApp : public wxAppBase
-{
-    DECLARE_DYNAMIC_CLASS(wxApp)
-
-public:
-    wxApp();
-    virtual ~wxApp();
-
-    // override base class (pure) virtuals
-    // -----------------------------------
-
-    virtual int MainLoop();
-
-    virtual void Exit();
-
-    virtual void WakeUpIdle(); // implemented in motif/evtloop.cpp
-
-    // implementation from now on
-    // --------------------------
-
-protected:
-    bool                  m_showOnInit;
-
-public:
-    // Implementation
-    virtual bool Initialize(int& argc, wxChar **argv);
-    virtual void CleanUp();
-
-    // Motif-specific
-    WXAppContext   GetAppContext() const { return m_appContext; }
-    WXWidget       GetTopLevelWidget();
-    WXWidget       GetTopLevelRealizedWidget();
-    WXColormap     GetMainColormap(WXDisplay* display);
-    WXDisplay*     GetInitialDisplay() const { return m_initialDisplay; }
-
-    void           SetTopLevelWidget(WXDisplay* display, WXWidget widget);
-    void           SetTopLevelRealizedWidget(WXDisplay* display,
-                                             WXWidget widget);
-
-    // This handler is called when a property change event occurs
-    virtual void   HandlePropertyChange(WXEvent *event);
-
-    wxXVisualInfo* GetVisualInfo(WXDisplay* display);
-
-private:
-    // Motif-specific
-    WXAppContext          m_appContext;
-    WXColormap            m_mainColormap;
-    WXDisplay*            m_initialDisplay;
-    wxPerDisplayDataMap*  m_perDisplayData;
-};
-
-#endif
-// _WX_APP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/bmpbuttn.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/bmpbuttn.h
deleted file mode 100644
index 8a3bcf335c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/bmpbuttn.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/bmpbuttn.h
-// Purpose:     wxBitmapButton class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BMPBUTTN_H_
-#define _WX_BMPBUTTN_H_
-
-#include "wx/motif/bmpmotif.h"
-
-#define wxDEFAULT_BUTTON_MARGIN 4
-
-class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase
-{
-public:
-    wxBitmapButton();
-    virtual ~wxBitmapButton();
-    wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxButtonNameStr)
-    {
-        Create(parent, id, bitmap, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxButtonNameStr);
-
-    // Implementation
-    virtual void ChangeBackgroundColour();
-
-protected:
-    virtual wxSize DoGetBestSize() const;
-
-    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
-    virtual void OnSetBitmap();
-
-    // original bitmaps may be different from the ones we were initialized with
-    // if they were changed to reflect button background colour
-    wxBitmap m_bitmapsOriginal[State_Max];
-
-    wxBitmapCache m_bitmapCache;
-
-    WXPixmap m_insensPixmap;
-
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
-};
-
-#endif // _WX_BMPBUTTN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/bmpmotif.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/bmpmotif.h
deleted file mode 100644
index ada8ae17f7..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/bmpmotif.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/bmpmotif.h
-// Purpose:     Motif-specific bitmap routines
-// Author:      Julian Smart, originally in bitmap.h
-// Modified by:
-// Created:     25/03/2003
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BMPMOTIF_H_
-#define _WX_BMPMOTIF_H_
-
-#include "wx/defs.h"
-#include "wx/bitmap.h"
-
-class WXDLLIMPEXP_CORE wxBitmapCache
-{
-public:
-    wxBitmapCache()
-    {
-        m_labelPixmap = (WXPixmap)NULL;
-        m_armPixmap = (WXPixmap)NULL;
-        m_insensPixmap = (WXPixmap)NULL;
-        m_image = (WXImage)NULL;
-        m_display = NULL;
-        SetColoursChanged();
-    }
-
-    ~wxBitmapCache();
-
-    void SetColoursChanged();
-    void SetBitmap( const wxBitmap& bitmap );
-
-    WXPixmap GetLabelPixmap( WXWidget w );
-    WXPixmap GetInsensPixmap( WXWidget w = (WXWidget)NULL );
-    WXPixmap GetArmPixmap( WXWidget w );
-private:
-    void InvalidateCache();
-    void CreateImageIfNeeded( WXWidget w );
-
-    WXPixmap GetPixmapFromCache(WXWidget w);
-
-    struct
-    {
-        bool label  : 1;
-        bool arm    : 1;
-        bool insens : 1;
-    } m_recalcPixmaps;
-    wxBitmap m_bitmap;
-    WXDisplay* m_display;
-    WXPixmap m_labelPixmap, m_armPixmap, m_insensPixmap;
-    WXImage m_image;
-};
-
-#endif // _WX_BMPMOTIF_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/button.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/button.h
deleted file mode 100644
index 29d201e111..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/button.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/button.h
-// Purpose:     wxButton class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BUTTON_H_
-#define _WX_BUTTON_H_
-
-// Pushbutton
-class WXDLLIMPEXP_CORE wxButton: public wxButtonBase
-{
-public:
-    wxButton() { }
-    wxButton(wxWindow *parent,
-        wxWindowID id,
-        const wxString& label = wxEmptyString,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxButtonNameStr)
-    {
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxString& label = wxEmptyString,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxButtonNameStr);
-
-    virtual wxWindow *SetDefault();
-    virtual void Command(wxCommandEvent& event);
-
-    static wxSize GetDefaultSize();
-
-    // Implementation
-    virtual wxSize GetMinSize() const;
-
-protected:
-    virtual wxSize DoGetBestSize() const;
-
-private:
-    wxSize OldGetBestSize() const;
-    wxSize OldGetMinSize() const;
-    void SetDefaultShadowThicknessAndResize();
-
-    DECLARE_DYNAMIC_CLASS(wxButton)
-};
-
-#endif // _WX_BUTTON_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/checkbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/checkbox.h
deleted file mode 100644
index 0fc4c1e488..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/checkbox.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/checkbox.h
-// Purpose:     wxCheckBox class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CHECKBOX_H_
-#define _WX_CHECKBOX_H_
-
-// Checkbox item (single checkbox)
-class WXDLLIMPEXP_CORE wxCheckBox: public wxCheckBoxBase
-{
-    DECLARE_DYNAMIC_CLASS(wxCheckBox)
-
-public:
-    inline wxCheckBox() { Init(); }
-    inline wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxCheckBoxNameStr)
-    {
-        Init();
-
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxCheckBoxNameStr);
-    virtual void SetValue(bool);
-    virtual bool GetValue() const ;
-    virtual void Command(wxCommandEvent& event);
-
-    // Implementation
-    virtual void ChangeBackgroundColour();
-private:
-    // common part of all constructors
-    void Init()
-    {
-        m_evtType = wxEVT_CHECKBOX;
-    }
-
-    virtual void DoSet3StateValue(wxCheckBoxState state);
-
-    virtual wxCheckBoxState DoGet3StateValue() const;
-
-    // public for the callback
-public:
-    // either wxEVT_CHECKBOX or ..._TOGGLEBUTTON
-    wxEventType m_evtType;
-};
-
-#endif
-// _WX_CHECKBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/checklst.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/checklst.h
deleted file mode 100644
index c197dedaa4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/checklst.h
+++ /dev/null
@@ -1,76 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/checklst.h
-// Purpose:     wxCheckListBox class - a listbox with checkable items
-//              Note: this is an optional class.
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CHECKLST_H_
-#define _WX_CHECKLST_H_
-
-#include "wx/listbox.h"
-
-class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase
-{
-    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
-
-public:
-    // ctors
-    wxCheckListBox();
-    wxCheckListBox(wxWindow *parent, wxWindowID id,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        int nStrings = 0,
-        const wxString choices[] = NULL,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr);
-
-    wxCheckListBox(wxWindow *parent, wxWindowID id,
-        const wxPoint& pos,
-        const wxSize& size,
-        const wxArrayString& choices,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr);
-
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        int n = 0, const wxString choices[] = NULL,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr);
-
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxPoint& pos,
-        const wxSize& size,
-        const wxArrayString& choices,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr);
-
-    // items may be checked
-    bool IsChecked(unsigned int uiIndex) const;
-    void Check(unsigned int uiIndex, bool bCheck = true);
-
-    // override base class functions
-    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
-                              unsigned int pos,
-                              void **clientData, wxClientDataType type);
-    virtual int FindString(const wxString& s, bool bCase = false) const;
-    virtual void SetString(unsigned int n, const wxString& s);
-    virtual wxString GetString(unsigned int n) const;
-
-private:
-    void DoToggleItem( int item, int x );
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
-// _WX_CHECKLST_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/chkconf.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/chkconf.h
deleted file mode 100644
index 79bbaa03b6..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/chkconf.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Name:        wx/motif/chkconf.h
- * Purpose:     Motif-specific config settings checks
- * Author:      Vadim Zeitlin
- * Modified by:
- * Created:     2005-04-05 (extracted from wx/chkconf.h)
- * Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
- * Licence:     wxWindows licence
- */
-
-/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
-
-#if !defined(wxUSE_GADGETS)
-#   define wxUSE_GADGETS 0
-#endif
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/choice.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/choice.h
deleted file mode 100644
index 625810d14c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/choice.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/choice.h
-// Purpose:     wxChoice class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CHOICE_H_
-#define _WX_CHOICE_H_
-
-#include "wx/clntdata.h"
-
-#ifndef wxWIDGET_ARRAY_DEFINED
-    #define wxWIDGET_ARRAY_DEFINED
-
-    #include "wx/dynarray.h"
-    WX_DEFINE_ARRAY_PTR(WXWidget, wxWidgetArray);
-#endif
-
-// Choice item
-class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase
-{
-    DECLARE_DYNAMIC_CLASS(wxChoice)
-
-public:
-    wxChoice();
-    virtual ~wxChoice();
-
-    wxChoice(wxWindow *parent, wxWindowID id,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        int n = 0, const wxString choices[] = NULL,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxChoiceNameStr)
-    {
-        Init();
-        Create(parent, id, pos, size, n, choices, style, validator, name);
-    }
-
-    wxChoice(wxWindow *parent, wxWindowID id,
-        const wxPoint& pos,
-        const wxSize& size,
-        const wxArrayString& choices,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxChoiceNameStr)
-    {
-        Init();
-        Create(parent, id, pos, size, choices, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        int n = 0, const wxString choices[] = NULL,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxChoiceNameStr);
-
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxPoint& pos,
-        const wxSize& size,
-        const wxArrayString& choices,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxChoiceNameStr);
-
-    // implementation of wxControlWithItems
-    virtual unsigned int GetCount() const;
-    virtual int GetSelection() const;
-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual void DoClear();
-    virtual void SetString(unsigned int n, const wxString& s);
-    virtual wxString GetString(unsigned int n) const;
-
-    // implementation of wxChoiceBase
-    virtual void SetSelection(int n);
-    virtual void SetColumns(int n = 1 );
-    virtual int GetColumns() const ;
-
-    // Original API
-    virtual void Command(wxCommandEvent& event);
-
-    void SetFocus();
-
-    // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = true);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
-    WXWidget GetTopWidget() const { return m_formWidget; }
-    WXWidget GetMainWidget() const { return m_buttonWidget; }
-
-    virtual wxSize DoGetBestSize() const;
-
-    // implementation, for wxChoiceCallback
-    const wxWidgetArray& GetWidgets() const { return m_widgetArray; }
-    const wxArrayString&  GetStrings() const { return m_stringArray; }
-protected:
-    // minimum size for the text ctrl
-    wxSize GetItemsSize() const;
-    // common part of all contructors
-    void Init();
-
-    WXWidget      m_menuWidget;
-    WXWidget      m_buttonWidget;
-    wxWidgetArray m_widgetArray;
-    WXWidget      m_formWidget;
-    wxArrayString m_stringArray;
-
-    virtual void DoSetSize(int x, int y,
-        int width, int height,
-        int sizeFlags = wxSIZE_AUTO);
-
-    // implementation of wxControlWithItems
-    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
-                              unsigned int pos,
-                              void **clientData, wxClientDataType type);
-};
-
-#endif // _WX_CHOICE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/clipbrd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/clipbrd.h
deleted file mode 100644
index a70022659d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/clipbrd.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/clipbrd.h
-// Purpose:     Clipboard functionality.
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CLIPBRD_H_
-#define _WX_CLIPBRD_H_
-
-#if wxUSE_CLIPBOARD
-
-class WXDLLIMPEXP_FWD_CORE wxDataObject;
-struct wxDataIdToDataObject;
-
-#include "wx/list.h"
-
-WX_DECLARE_LIST(wxDataObject, wxDataObjectList);
-WX_DECLARE_LIST(wxDataIdToDataObject, wxDataIdToDataObjectList);
-
-WXDLLIMPEXP_CORE bool wxOpenClipboard();
-WXDLLIMPEXP_CORE bool wxClipboardOpen();
-WXDLLIMPEXP_CORE bool wxCloseClipboard();
-WXDLLIMPEXP_CORE bool wxEmptyClipboard();
-WXDLLIMPEXP_CORE bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
-WXDLLIMPEXP_CORE bool wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width = 0, int height = 0);
-WXDLLIMPEXP_CORE wxObject* wxGetClipboardData(wxDataFormat dataFormat, long *len = NULL);
-WXDLLIMPEXP_CORE wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
-WXDLLIMPEXP_CORE wxDataFormat wxRegisterClipboardFormat(char *formatName);
-WXDLLIMPEXP_CORE bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int maxCount);
-
-//-----------------------------------------------------------------------------
-// wxClipboard
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
-{
-public:
-    wxClipboard();
-    virtual ~wxClipboard();
-
-    // open the clipboard before SetData() and GetData()
-    virtual bool Open();
-
-    // close the clipboard after SetData() and GetData()
-    virtual void Close();
-
-    // opened?
-    virtual bool IsOpened() const { return m_open; }
-
-    // replaces the data on the clipboard with data
-    virtual bool SetData( wxDataObject *data );
-
-    // adds data to the clipboard
-    virtual bool AddData( wxDataObject *data );
-
-    // format available on the clipboard ?
-    virtual bool IsSupported( const wxDataFormat& format );
-
-    // fill data with data on the clipboard (if available)
-    virtual bool GetData( wxDataObject& data );
-
-    // clears wxTheClipboard and the system's clipboard if possible
-    virtual void Clear();
-
-    // implementation from now on
-    bool              m_open;
-    wxDataObjectList  m_data;
-    wxDataIdToDataObjectList m_idToObject;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
-};
-
-#endif // wxUSE_CLIPBOARD
-
-#endif // _WX_CLIPBRD_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/colour.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/colour.h
deleted file mode 100644
index c30bbee091..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/colour.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/colour.h
-// Purpose:     wxColour class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COLOUR_H_
-#define _WX_COLOUR_H_
-
-#include "wx/object.h"
-#include "wx/string.h"
-
-// Colour
-class WXDLLIMPEXP_CORE wxColour : public wxColourBase
-{
-    DECLARE_DYNAMIC_CLASS(wxColour)
-public:
-    // constructors
-    // ------------
-    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
-
-    // copy ctors and assignment operators
-    wxColour( const wxColour& col );
-    wxColour& operator = ( const wxColour& col );
-
-    // dtor
-    virtual ~wxColour();
-
-
-    // accessors
-    virtual bool IsOk() const {return m_isInit; }
-    unsigned char Red() const { return m_red; }
-    unsigned char Green() const { return m_green; }
-    unsigned char Blue() const { return m_blue; }
-
-    WXPixel GetPixel() const { return m_pixel; }
-    void SetPixel(WXPixel pixel) { m_pixel = pixel; m_isInit = true; }
-
-    inline bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); }
-
-    inline bool operator != (const wxColour& colour) const { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); }
-
-    // Allocate a colour, or nearest colour, using the given display.
-    // If realloc is true, ignore the existing pixel, otherwise just return
-    // the existing one.
-    // Returns the allocated pixel.
-
-    // TODO: can this handle mono displays? If not, we should have an extra
-    // flag to specify whether this should be black or white by default.
-
-    WXPixel AllocColour(WXDisplay* display, bool realloc = false);
-
-protected:
-    // Helper function
-    void Init();
-
-    virtual void
-    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
-
-private:
-    bool          m_isInit;
-    unsigned char m_red;
-    unsigned char m_blue;
-    unsigned char m_green;
-
-public:
-    WXPixel       m_pixel;
-};
-
-#endif
-// _WX_COLOUR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/combobox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/combobox.h
deleted file mode 100644
index 15f2249a86..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/combobox.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/combobox.h
-// Purpose:     wxComboBox class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COMBOBOX_H_
-#define _WX_COMBOBOX_H_
-
-#include "wx/choice.h"
-#include "wx/textentry.h"
-
-// Combobox item
-class WXDLLIMPEXP_CORE wxComboBox : public wxChoice,
-                               public wxTextEntry
-{
-public:
-    wxComboBox() { m_inSetSelection = false; }
-    virtual ~wxComboBox();
-
-    inline wxComboBox(wxWindow *parent, wxWindowID id,
-        const wxString& value = wxEmptyString,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        int n = 0, const wxString choices[] = NULL,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxComboBoxNameStr)
-    {
-        m_inSetSelection = false;
-        Create(parent, id, value, pos, size, n, choices,
-               style, validator, name);
-    }
-
-    inline wxComboBox(wxWindow *parent, wxWindowID id,
-        const wxString& value,
-        const wxPoint& pos,
-        const wxSize& size,
-        const wxArrayString& choices,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxComboBoxNameStr)
-    {
-        m_inSetSelection = false;
-        Create(parent, id, value, pos, size, choices,
-               style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxString& value = wxEmptyString,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        int n = 0, const wxString choices[] = NULL,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxComboBoxNameStr);
-
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxString& value,
-        const wxPoint& pos,
-        const wxSize& size,
-        const wxArrayString& choices,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxComboBoxNameStr);
-
-    // See wxComboBoxBase discussion of IsEmpty().
-    bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
-    bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
-
-    // resolve ambiguities among virtual functions inherited from both base
-    // classes
-    virtual void Clear();
-    virtual wxString GetValue() const { return wxTextEntry::GetValue(); }
-    virtual void SetValue(const wxString& value);
-    virtual wxString GetStringSelection() const
-        { return wxChoice::GetStringSelection(); }
-
-    virtual void SetSelection(long from, long to)
-        { wxTextEntry::SetSelection(from, to); }
-    virtual void GetSelection(long *from, long *to) const
-        { wxTextEntry::GetSelection(from, to); }
-
-
-    // implementation of wxControlWithItems
-    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
-                              unsigned int pos,
-                              void **clientData, wxClientDataType type);
-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual int GetSelection() const ;
-    virtual void SetSelection(int n);
-    virtual int FindString(const wxString& s, bool bCase = false) const;
-    virtual wxString GetString(unsigned int n) const ;
-    virtual void SetString(unsigned int n, const wxString& s);
-
-    // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = true);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
-    WXWidget GetTopWidget() const { return m_mainWidget; }
-    WXWidget GetMainWidget() const { return m_mainWidget; }
-
-   //Copied from wxComboBoxBase because for wxMOTIF wxComboBox does not inherit from it.
-    virtual void Popup() { wxFAIL_MSG( wxT("Not implemented") ); }
-    virtual void Dismiss() { wxFAIL_MSG( wxT("Not implemented") ); }
-
-protected:
-    virtual wxSize DoGetBestSize() const;
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-
-    // implement wxTextEntry pure virtual methods
-    virtual wxWindow *GetEditableWindow() { return this; }
-    virtual WXWidget GetTextWidget() const;
-
-private:
-    // only implemented for native combo box
-    void AdjustDropDownListSize();
-
-    // implementation detail, should really be private
-public:
-    bool m_inSetSelection;
-
-    DECLARE_DYNAMIC_CLASS(wxComboBox)
-};
-
-#endif // _WX_COMBOBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/control.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/control.h
deleted file mode 100644
index 88062ce02d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/control.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/control.h
-// Purpose:     wxControl class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CONTROL_H_
-#define _WX_CONTROL_H_
-
-#include "wx/window.h"
-#include "wx/list.h"
-#include "wx/validate.h"
-
-// General item class
-class WXDLLIMPEXP_CORE wxControl: public wxControlBase
-{
-    DECLARE_ABSTRACT_CLASS(wxControl)
-
-public:
-    wxControl();
-    wxControl( wxWindow *parent,
-        wxWindowID id,
-        const wxPoint &pos = wxDefaultPosition,
-        const wxSize &size = wxDefaultSize,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString &name = wxControlNameStr )
-    {
-        Create(parent, id, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxControlNameStr);
-
-    // simulates the event, returns true if the event was processed
-    virtual void Command(wxCommandEvent& WXUNUSED(event)) { }
-
-    // calls the callback and appropriate event handlers, returns true if
-    // event was processed
-    virtual bool ProcessCommand(wxCommandEvent& event);
-
-    virtual void SetLabel(const wxString& label);
-    virtual wxString GetLabel() const ;
-
-    bool InSetValue() const { return m_inSetValue; }
-
-protected:
-    // calls wxControlBase::CreateControl, also sets foreground, background and
-    // font to parent's values
-    bool CreateControl(wxWindow *parent,
-                       wxWindowID id,
-                       const wxPoint& pos,
-                       const wxSize& size,
-                       long style,
-                       const wxValidator& validator,
-                       const wxString& name);
-
-    // native implementation using XtQueryGeometry
-    virtual wxSize DoGetBestSize() const;
-
-    // Motif: prevent callbacks being called while in SetValue
-    bool m_inSetValue;
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif // _WX_CONTROL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/ctrlsub.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/ctrlsub.h
deleted file mode 100644
index 582cf854de..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/ctrlsub.h
+++ /dev/null
@@ -1,39 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/ctrlsub.h
-// Purpose:     common functionality of wxItemContainer-derived controls
-// Author:      Vadim Zeitlin
-// Created:     2007-07-25
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MOTIF_CTRLSUB_H_
-#define _WX_MOTIF_CTRLSUB_H_
-
-#include "wx/dynarray.h"
-#include "wx/generic/ctrlsub.h"
-
-// ----------------------------------------------------------------------------
-// wxControlWithItems
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxControlWithItems : public wxControlWithItemsGeneric
-{
-public:
-    wxControlWithItems() { }
-
-protected:
-    // Motif functions inserting items in the control interpret positions
-    // differently from wx: they're 1-based and 0 means to append
-    unsigned int GetMotifPosition(unsigned int pos) const
-    {
-        return pos == GetCount() ? 0 : pos + 1;
-    }
-
-private:
-    DECLARE_ABSTRACT_CLASS(wxControlWithItems)
-    wxDECLARE_NO_COPY_CLASS(wxControlWithItems);
-};
-
-#endif // _WX_MOTIF_CTRLSUB_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/cursor.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/cursor.h
deleted file mode 100644
index 3915d44335..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/cursor.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/cursor.h
-// Purpose:     wxCursor class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CURSOR_H_
-#define _WX_CURSOR_H_
-
-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
-
-class WXDLLIMPEXP_FWD_CORE wxImage;
-
-// Cursor
-class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
-{
-public:
-    wxCursor();
-
-    wxCursor(const char bits[], int width, int height,
-             int hotSpotX = -1, int hotSpotY = -1,
-             const char maskBits[] = NULL,
-             const wxColour* fg = NULL, const wxColour* bg = NULL);
-
-    wxCursor(const wxString& name,
-             wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
-             int hotSpotX = 0, int hotSpotY = 0);
-
-#if wxUSE_IMAGE
-    wxCursor(const wxImage& image);
-#endif
-
-    wxCursor(wxStockCursor id) { InitFromStock(id); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
-#endif
-
-    virtual ~wxCursor();
-
-    // Motif-specific.
-    // Create/get a cursor for the current display
-    WXCursor GetXCursor(WXDisplay* display) const;
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-private:
-    void InitFromStock(wxStockCursor);
-
-    void Create(const char bits[], int width, int height,
-                int hotSpotX = -1, int hotSpotY = -1,
-                const char maskBits[] = NULL);
-    void Create(WXPixmap cursor, WXPixmap mask, int hotSpotX, int hotSpotY);
-
-    // Make a cursor from standard id
-    WXCursor MakeCursor(WXDisplay* display, wxStockCursor id) const;
-
-    DECLARE_DYNAMIC_CLASS(wxCursor)
-};
-
-extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor);
-
-#endif
-// _WX_CURSOR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dataform.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dataform.h
deleted file mode 100644
index e1cc2d6473..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dataform.h
+++ /dev/null
@@ -1,63 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/dataform.h
-// Purpose:     declaration of the wxDataFormat class
-// Author:      Robert Roebling
-// Modified by:
-// Created:     19.10.99 (extracted from motif/dataobj.h)
-// Copyright:   (c) 1999 Robert Roebling
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MOTIF_DATAFORM_H
-#define _WX_MOTIF_DATAFORM_H
-
-class WXDLLIMPEXP_CORE wxDataFormat
-{
-public:
-    // the clipboard formats under Xt are Atoms
-    typedef Atom NativeFormat;
-
-    wxDataFormat();
-    wxDataFormat( wxDataFormatId type );
-    wxDataFormat( const wxString &id );
-    wxDataFormat( NativeFormat format );
-
-    wxDataFormat& operator=(NativeFormat format)
-    { SetId(format); return *this; }
-
-    // comparison (must have both versions)
-    bool operator==(NativeFormat format) const
-    { return m_format == (NativeFormat)format; }
-    bool operator!=(NativeFormat format) const
-    { return m_format != (NativeFormat)format; }
-    bool operator==(wxDataFormatId format) const
-    { return m_type == (wxDataFormatId)format; }
-    bool operator!=(wxDataFormatId format) const
-    { return m_type != (wxDataFormatId)format; }
-
-    // explicit and implicit conversions to NativeFormat which is one of
-    // standard data types (implicit conversion is useful for preserving the
-    // compatibility with old code)
-    NativeFormat GetFormatId() const { return m_format; }
-    operator NativeFormat() const { return m_format; }
-
-    void SetId( NativeFormat format );
-
-    // string ids are used for custom types - this SetId() must be used for
-    // application-specific formats
-    wxString GetId() const;
-    void SetId( const wxString& id );
-
-    // implementation
-    wxDataFormatId GetType() const;
-
-private:
-    wxDataFormatId   m_type;
-    NativeFormat     m_format;
-
-    void PrepareFormats();
-    void SetType( wxDataFormatId type );
-};
-
-
-#endif // _WX_MOTIF_DATAFORM_H
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dataobj.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dataobj.h
deleted file mode 100644
index e88284f58c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dataobj.h
+++ /dev/null
@@ -1,23 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/dataobj.h
-// Purpose:     declaration of the wxDataObject class for Motif
-// Author:      Julian Smart
-// Copyright:   (c) 1998 Julian Smart
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MOTIF_DATAOBJ_H_
-#define _WX_MOTIF_DATAOBJ_H_
-
-// ----------------------------------------------------------------------------
-// wxDataObject is the same as wxDataObjectBase under wxMotif
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase
-{
-public:
-    virtual ~wxDataObject();
-};
-
-#endif //_WX_MOTIF_DATAOBJ_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dataobj2.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dataobj2.h
deleted file mode 100644
index d3f274b847..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dataobj2.h
+++ /dev/null
@@ -1,43 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/dataobj2.h
-// Purpose:     declaration of standard wxDataObjectSimple-derived classes
-// Author:      Mattia Barbon
-// Created:     27.04.03
-// Copyright:   (c) 2003 Mattia Barbon
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MOTIF_DATAOBJ2_H_
-#define _WX_MOTIF_DATAOBJ2_H_
-
-// ----------------------------------------------------------------------------
-// wxBitmapDataObject is a specialization of wxDataObject for bitmaps
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase
-{
-public:
-    // ctors
-    wxBitmapDataObject()
-        : wxBitmapDataObjectBase() { }
-    wxBitmapDataObject(const wxBitmap& bitmap)
-        : wxBitmapDataObjectBase(bitmap) { }
-
-    // implement base class pure virtuals
-    // ----------------------------------
-    virtual size_t GetDataSize() const;
-    virtual bool GetDataHere(void *buf) const;
-    virtual bool SetData(size_t len, const void *buf);
-
-    // unhide base class virtual functions
-    virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const
-        { return GetDataSize(); }
-    virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
-                             void *buf) const
-        { return GetDataHere(buf); }
-    virtual bool SetData(const wxDataFormat& WXUNUSED(format),
-                         size_t len, const void *buf)
-        { return SetData(len, buf); }
-};
-
-#endif // _WX_MOTIF_DATAOBJ2_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dc.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dc.h
deleted file mode 100644
index 4a96162fdf..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dc.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/dc.h
-// Purpose:     wxMotifDCImpl class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DC_H_
-#define _WX_DC_H_
-
-#include "wx/dc.h"
-
-// ----------------------------------------------------------------------------
-// wxMotifDCImpl
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMotifDCImpl : public wxDCImpl
-{
-public:
-    wxMotifDCImpl(wxDC *owner);
-
-    virtual wxSize GetPPI() const;
-
-protected:
-    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
-    virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
-                              bool useMask = false);
-
-    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
-                                     wxCoord width, wxCoord height);
-    virtual void DoGetSize(int *width, int *height) const;
-    virtual void DoGetSizeMM(int* width, int* height) const;
-
-public:
-    // implementation
-    wxCoord XDEV2LOG(wxCoord x) const       { return DeviceToLogicalX(x); }
-    wxCoord XDEV2LOGREL(wxCoord x) const    { return DeviceToLogicalXRel(x); }
-    wxCoord YDEV2LOG(wxCoord y) const       { return DeviceToLogicalY(y); }
-    wxCoord YDEV2LOGREL(wxCoord y) const    { return DeviceToLogicalYRel(y); }
-    wxCoord XLOG2DEV(wxCoord x) const       { return LogicalToDeviceX(x); }
-    wxCoord XLOG2DEVREL(wxCoord x) const    { return LogicalToDeviceXRel(x); }
-    wxCoord YLOG2DEV(wxCoord y) const       { return LogicalToDeviceY(y); }
-    wxCoord YLOG2DEVREL(wxCoord y) const    { return LogicalToDeviceYRel(y); }
-
-    // Without device translation, for backing pixmap purposes
-    wxCoord XLOG2DEV_2(wxCoord x) const
-    {
-        return wxRound((double)(x - m_logicalOriginX) * m_scaleX) * m_signX;
-    }
-    wxCoord YLOG2DEV_2(wxCoord y) const
-    {
-        return wxRound((double)(y - m_logicalOriginY) * m_scaleY) * m_signY;
-    }
-
-    DECLARE_DYNAMIC_CLASS(wxMotifDCImpl)
-};
-
-#endif // _WX_DC_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dcclient.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dcclient.h
deleted file mode 100644
index 6dc0b0c522..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dcclient.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/dcclient.h
-// Purpose:     wxClientDCImpl, wxPaintDCImpl and wxWindowDCImpl classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DCCLIENT_H_
-#define _WX_DCCLIENT_H_
-
-#include "wx/motif/dc.h"
-
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-
-//-----------------------------------------------------------------------------
-// wxWindowDCImpl
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxMotifDCImpl
-{
-public:
-    wxWindowDCImpl(wxDC *owner);
-    wxWindowDCImpl(wxDC *owner, wxWindow *win);
-
-    virtual ~wxWindowDCImpl();
-
-    // TODO this function is Motif-only for now - should it go into base class?
-    void Clear(const wxRect& rect);
-
-    // implement base class pure virtuals
-    // ----------------------------------
-
-    virtual void Clear();
-
-    virtual void SetFont(const wxFont& font);
-    virtual void SetPen(const wxPen& pen);
-    virtual void SetBrush(const wxBrush& brush);
-    virtual void SetBackground(const wxBrush& brush);
-    virtual void SetBackgroundMode(int mode);
-    virtual void SetPalette(const wxPalette& palette);
-    virtual void SetLogicalFunction( wxRasterOperationMode function );
-
-    virtual void SetTextForeground(const wxColour& colour);
-    virtual void SetTextBackground(const wxColour& colour);
-
-    virtual wxCoord GetCharHeight() const;
-    virtual wxCoord GetCharWidth() const;
-    virtual void DoGetTextExtent(const wxString& string,
-        wxCoord *x, wxCoord *y,
-        wxCoord *descent = NULL,
-        wxCoord *externalLeading = NULL,
-        const wxFont *theFont = NULL) const;
-
-    virtual bool CanDrawBitmap() const;
-    virtual bool CanGetTextExtent() const;
-
-    virtual int GetDepth() const;
-    virtual wxSize GetPPI() const;
-
-    virtual void DestroyClippingRegion();
-
-    // Helper function for setting clipping
-    void SetDCClipping(WXRegion region);
-
-    // implementation from now on
-    // --------------------------
-
-    WXGC GetGC() const { return m_gc; }
-    WXGC GetBackingGC() const { return m_gcBacking; }
-    WXDisplay* GetDisplay() const { return m_display; }
-    bool GetAutoSetting() const { return (m_autoSetting != 0); } // See comment in dcclient.cpp
-    void SetAutoSetting(bool flag) { m_autoSetting = flag; }
-
-protected:
-    // note that this function will call colour.SetPixel,
-    // and will do one of curCol = colour, curCol = wxWHITE, curCol = wxBLACK
-    // roundToWhite has an effect for monochrome display only
-    // if roundToWhite == true then the colour will be set to white unless
-    // it is RGB 0x000000;if roundToWhite == true the colour wull be set to
-    // black unless it id RGB 0xffffff
-    WXPixel CalculatePixel(wxColour& colour, wxColour& curCol,
-                           bool roundToWhite) const;
-    // sets the foreground pixel taking into account the
-    // currently selected logical operation
-    void SetForegroundPixelWithLogicalFunction(WXPixel pixel);
-
-    virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
-                             wxFloodFillStyle style = wxFLOOD_SURFACE);
-
-    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
-
-    virtual void DoDrawPoint(wxCoord x, wxCoord y);
-    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
-
-    virtual void DoDrawArc(wxCoord x1, wxCoord y1,
-        wxCoord x2, wxCoord y2,
-        wxCoord xc, wxCoord yc);
-    virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-        double sa, double ea);
-
-    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
-        wxCoord width, wxCoord height,
-        double radius);
-    virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-
-    virtual void DoCrossHair(wxCoord x, wxCoord y);
-
-    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
-    virtual void DoDrawRotatedText(const wxString &text, wxCoord x, wxCoord y, double angle);
-
-    virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-        wxDC *source, wxCoord xsrc, wxCoord ysrc,
-        wxRasterOperationMode rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
-
-    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
-        wxCoord width, wxCoord height);
-    virtual void DoSetDeviceClippingRegion(const wxRegion& region);
-
-    virtual void DoDrawLines(int n, const wxPoint points[],
-        wxCoord xoffset, wxCoord yoffset);
-    virtual void DoDrawPolygon(int n, const wxPoint points[],
-        wxCoord xoffset, wxCoord yoffset,
-        wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
-
-    void DoGetSize( int *width, int *height ) const;
-
-    // common part of constructors
-    void Init();
-
-    WXGC         m_gc;
-    WXGC         m_gcBacking;
-    WXDisplay*   m_display;
-    wxWindow*    m_window;
-    // Pixmap for drawing on
-    WXPixmap     m_pixmap;
-    // Last clipping region set on th GC, this is the combination
-    // of paint clipping region and all user-defined clipping regions
-    WXRegion     m_clipRegion;
-
-    // Not sure if we'll need all of these
-    WXPixel      m_backgroundPixel;
-    wxColour     m_currentColour;
-    int          m_currentPenWidth ;
-    int          m_currentPenJoin ;
-    int          m_currentPenCap ;
-    int          m_currentPenDashCount ;
-    wxX11Dash*   m_currentPenDash ;
-    wxBitmap     m_currentStipple ;
-    int          m_currentStyle ;
-    int          m_currentFill ;
-    int          m_autoSetting ; // See comment in dcclient.cpp
-
-    DECLARE_DYNAMIC_CLASS(wxWindowDCImpl)
-};
-
-class WXDLLIMPEXP_CORE wxPaintDCImpl: public wxWindowDCImpl
-{
-public:
-    wxPaintDCImpl(wxDC *owner) : wxWindowDCImpl(owner) { }
-    wxPaintDCImpl(wxDC *owner, wxWindow* win);
-
-    virtual ~wxPaintDCImpl();
-
-    DECLARE_DYNAMIC_CLASS(wxPaintDCImpl)
-};
-
-class WXDLLIMPEXP_CORE wxClientDCImpl: public wxWindowDCImpl
-{
-public:
-    wxClientDCImpl(wxDC *owner) : wxWindowDCImpl(owner) { }
-    wxClientDCImpl(wxDC *owner, wxWindow* win)
-        : wxWindowDCImpl(owner, win) { }
-
-    DECLARE_DYNAMIC_CLASS(wxClientDCImpl)
-};
-
-#endif // _WX_DCCLIENT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dcmemory.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dcmemory.h
deleted file mode 100644
index 6a2e3e4e4d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dcmemory.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/dcmemory.h
-// Purpose:     wxMemoryDCImpl class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DCMEMORY_H_
-#define _WX_DCMEMORY_H_
-
-#include "wx/motif/dcclient.h"
-
-class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxWindowDCImpl
-{
-public:
-    wxMemoryDCImpl(wxMemoryDC *owner) : wxWindowDCImpl(owner) { Init(); }
-    wxMemoryDCImpl(wxMemoryDC *owner, wxBitmap& bitmap)
-        : wxWindowDCImpl(owner)
-    {
-        Init();
-        DoSelect(bitmap);
-    }
-
-    wxMemoryDCImpl(wxMemoryDC *owner, wxDC *dc);
-    virtual ~wxMemoryDCImpl();
-
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual void DoSelect(const wxBitmap& bitmap);
-
-private:
-    friend class wxPaintDC;
-
-    void Init();
-
-    wxBitmap m_bitmap;
-
-    DECLARE_DYNAMIC_CLASS(wxMemoryDCImpl)
-};
-
-#endif
-// _WX_DCMEMORY_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dcprint.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dcprint.h
deleted file mode 100644
index d0e133cb51..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dcprint.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/dcprint.h
-// Purpose:     wxPrinterDC class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DCPRINT_H_
-#define _WX_DCPRINT_H_
-
-#include "wx/motif/dc.h"
-
-class WXDLLIMPEXP_CORE wxPrinterDC : public wxMotifDCImpl
-{
-public:
-    // Create a printer DC
-    wxPrinterDCImpl(const wxString& driver, const wxString& device,
-                    const wxString& output,
-                    bool interactive = true,
-                    wxPrintOrientation orientation = wxPORTRAIT);
-    virtual ~wxPrinterDC();
-
-    wxRect GetPaperRect() const;
-
-    DECLARE_CLASS(wxPrinterDCImpl)
-};
-
-#endif // _WX_DCPRINT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dcscreen.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dcscreen.h
deleted file mode 100644
index e12af87660..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dcscreen.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/dcscreen.h
-// Purpose:     wxScreenDCImpl class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DCSCREEN_H_
-#define _WX_DCSCREEN_H_
-
-#include "wx/motif/dcclient.h"
-
-class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxWindowDCImpl
-{
-public:
-    // Create a DC representing the whole screen
-    wxScreenDCImpl(wxScreenDC *owner);
-    virtual ~wxScreenDCImpl();
-
-    // Compatibility with X's requirements for
-    // drawing on top of all windows
-    static bool StartDrawingOnTop(wxWindow* window);
-    static bool StartDrawingOnTop(wxRect* rect = NULL);
-    static bool EndDrawingOnTop();
-
-private:
-    static WXWindow sm_overlayWindow;
-
-    // If we have started transparent drawing at a non-(0,0) point
-    // then we will have to adjust the device origin in the
-    // constructor.
-    static int sm_overlayWindowX;
-    static int sm_overlayWindowY;
-
-    DECLARE_DYNAMIC_CLASS(wxScreenDCImpl)
-};
-
-#endif // _WX_DCSCREEN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dialog.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dialog.h
deleted file mode 100644
index f826926bfd..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dialog.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/dialog.h
-// Purpose:     wxDialog class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DIALOG_H_
-#define _WX_DIALOG_H_
-
-class WXDLLIMPEXP_FWD_CORE wxEventLoop;
-
-// Dialog boxes
-class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase
-{
-public:
-    wxDialog();
-
-    wxDialog(wxWindow *parent, wxWindowID id,
-        const wxString& title,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxDEFAULT_DIALOG_STYLE,
-        const wxString& name = wxDialogNameStr)
-    {
-        Create(parent, id, title, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxString& title,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxDEFAULT_DIALOG_STYLE,
-        const wxString& name = wxDialogNameStr);
-
-    virtual ~wxDialog();
-
-    virtual bool Destroy();
-
-    virtual bool Show(bool show = true);
-
-    void SetTitle(const wxString& title);
-
-    void SetModal(bool flag);
-
-    virtual bool IsModal() const
-    { return m_modalShowing; }
-
-    virtual int ShowModal();
-    virtual void EndModal(int retCode);
-
-    // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = true);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
-    WXWidget GetTopWidget() const { return m_mainWidget; }
-    WXWidget GetClientWidget() const { return m_mainWidget; }
-
-private:
-    virtual bool XmDoCreateTLW(wxWindow* parent,
-                               wxWindowID id,
-                               const wxString& title,
-                               const wxPoint& pos,
-                               const wxSize& size,
-                               long style,
-                               const wxString& name);
-
-
-    //// Motif-specific
-    bool          m_modalShowing;
-    wxEventLoop*  m_eventLoop;
-
-protected:
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-
-    virtual void DoSetClientSize(int width, int height);
-
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxDialog)
-};
-
-#endif // _WX_DIALOG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dnd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dnd.h
deleted file mode 100644
index bc6baaa315..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/dnd.h
+++ /dev/null
@@ -1,171 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/dnd.h
-// Purpose:     declaration of wxDropTarget, wxDropSource classes
-// Author:      Julian Smart
-// Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DND_H_
-#define _WX_DND_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_DRAG_AND_DROP
-
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/dataobj.h"
-#include "wx/cursor.h"
-
-//-------------------------------------------------------------------------
-// classes
-//-------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-
-class WXDLLIMPEXP_FWD_CORE wxDropTarget;
-class WXDLLIMPEXP_FWD_CORE wxTextDropTarget;
-class WXDLLIMPEXP_FWD_CORE wxFileDropTarget;
-class WXDLLIMPEXP_FWD_CORE wxPrivateDropTarget;
-
-class WXDLLIMPEXP_FWD_CORE wxDropSource;
-
-//-------------------------------------------------------------------------
-// wxDropTarget
-//-------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDropTarget: public wxObject
-{
-public:
-
-    wxDropTarget();
-    virtual ~wxDropTarget();
-
-    virtual void OnEnter() { }
-    virtual void OnLeave() { }
-    virtual bool OnDrop( long x, long y, const void *data, size_t size ) = 0;
-
-    // Override these to indicate what kind of data you support:
-
-    virtual size_t GetFormatCount() const = 0;
-    virtual wxDataFormat GetFormat(size_t n) const = 0;
-
-    // implementation
-};
-
-//-------------------------------------------------------------------------
-// wxTextDropTarget
-//-------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxTextDropTarget: public wxDropTarget
-{
-public:
-
-    wxTextDropTarget() {}
-    virtual bool OnDrop( long x, long y, const void *data, size_t size );
-    virtual bool OnDropText( long x, long y, const char *psz );
-
-protected:
-
-    virtual size_t GetFormatCount() const;
-    virtual wxDataFormat GetFormat(size_t n) const;
-};
-
-//-------------------------------------------------------------------------
-// wxPrivateDropTarget
-//-------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPrivateDropTarget: public wxDropTarget
-{
-public:
-
-    wxPrivateDropTarget();
-
-    // you have to override OnDrop to get at the data
-
-    // the string ID identifies the format of clipboard or DnD data. a word
-    // processor would e.g. add a wxTextDataObject and a wxPrivateDataObject
-    // to the clipboard - the latter with the Id "WXWORD_FORMAT".
-
-    void SetId( const wxString& id )
-    { m_id = id; }
-
-    wxString GetId()
-    { return m_id; }
-
-private:
-
-    virtual size_t GetFormatCount() const;
-    virtual wxDataFormat GetFormat(size_t n) const;
-
-    wxString   m_id;
-};
-
-// ----------------------------------------------------------------------------
-// A drop target which accepts files (dragged from File Manager or Explorer)
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxFileDropTarget: public wxDropTarget
-{
-public:
-
-    wxFileDropTarget() {}
-
-    virtual bool OnDrop( long x, long y, const void *data, size_t size );
-    virtual bool OnDropFiles( long x, long y,
-        size_t nFiles, const char * const aszFiles[] );
-
-protected:
-
-    virtual size_t GetFormatCount() const;
-    virtual wxDataFormat GetFormat(size_t n) const;
-};
-
-//-------------------------------------------------------------------------
-// wxDropSource
-//-------------------------------------------------------------------------
-
-enum wxDragResult
-{
-    wxDragError,    // error prevented the d&d operation from completing
-        wxDragNone,     // drag target didn't accept the data
-        wxDragCopy,     // the data was successfully copied
-        wxDragMove,     // the data was successfully moved
-        wxDragCancel    // the operation was cancelled by user (not an error)
-};
-
-class WXDLLIMPEXP_CORE wxDropSource: public wxObject
-{
-public:
-
-    wxDropSource( wxWindow *win );
-    wxDropSource( wxDataObject &data, wxWindow *win );
-
-    virtual ~wxDropSource(void);
-
-    void SetData( wxDataObject &data  );
-    wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
-
-    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return true; }
-
-    // implementation
-#if 0
-    void RegisterWindow(void);
-    void UnregisterWindow(void);
-
-    wxWindow      *m_window;
-    wxDragResult   m_retValue;
-    wxDataObject  *m_data;
-
-    wxCursor      m_defaultCursor;
-    wxCursor      m_goaheadCursor;
-#endif
-};
-
-#endif
-
-// wxUSE_DRAG_AND_DROP
-
-#endif
-//_WX_DND_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/filedlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/filedlg.h
deleted file mode 100644
index 8a44a32add..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/filedlg.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/filedlg.h
-// Purpose:     wxFileDialog class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FILEDLG_H_
-#define _WX_FILEDLG_H_
-
-//-------------------------------------------------------------------------
-// wxFileDialog
-//-------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase
-{
-    DECLARE_DYNAMIC_CLASS(wxFileDialog)
-public:
-
-    // For Motif
-    static wxString m_fileSelectorAnswer;
-    static bool m_fileSelectorReturned;
-
-public:
-    wxFileDialog(wxWindow *parent,
-                 const wxString& message = wxFileSelectorPromptStr,
-                 const wxString& defaultDir = wxEmptyString,
-                 const wxString& defaultFile = wxEmptyString,
-                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
-                 long style = wxFD_DEFAULT_STYLE,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& sz = wxDefaultSize,
-                 const wxString& name = wxFileDialogNameStr);
-
-    virtual int ShowModal();
-};
-
-#endif // _WX_FILEDLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/font.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/font.h
deleted file mode 100644
index 470d56a30c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/font.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/font.h
-// Purpose:     wxFont class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FONT_H_
-#define _WX_FONT_H_
-
-#if __WXMOTIF20__ && !__WXLESSTIF__
-    #define wxMOTIF_USE_RENDER_TABLE 1
-#else
-    #define wxMOTIF_USE_RENDER_TABLE 0
-#endif
-#define wxMOTIF_NEW_FONT_HANDLING wxMOTIF_USE_RENDER_TABLE
-
-class wxXFont;
-
-// Font
-class WXDLLIMPEXP_CORE wxFont : public wxFontBase
-{
-public:
-    // ctors and such
-    wxFont() { }
-
-    wxFont(const wxFontInfo& info)
-    {
-        Create(info.GetPointSize(),
-               info.GetFamily(),
-               info.GetStyle(),
-               info.GetWeight(),
-               info.IsUnderlined(),
-               info.GetFaceName(),
-               info.GetEncoding());
-
-        if ( info.IsUsingSizeInPixels() )
-            SetPixelSize(info.GetPixelSize());
-    }
-
-    wxFont(const wxNativeFontInfo& info);
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxFont(int size,
-           int family,
-           int style,
-           int weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
-    }
-#endif
-
-    wxFont(int size,
-           wxFontFamily family,
-           wxFontStyle style,
-           wxFontWeight weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        Create(size, family, style, weight, underlined, face, encoding);
-    }
-
-    wxFont(const wxSize& pixelSize,
-           wxFontFamily family,
-           wxFontStyle style,
-           wxFontWeight weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        Create(10, family, style, weight, underlined, face, encoding);
-        SetPixelSize(pixelSize);
-    }
-
-    bool Create(int size,
-                wxFontFamily family,
-                wxFontStyle style,
-                wxFontWeight weight,
-                bool underlined = false,
-                const wxString& face = wxEmptyString,
-                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
-
-    // wxMOTIF-specific
-    bool Create(const wxString& fontname,
-        wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
-    bool Create(const wxNativeFontInfo& fontinfo);
-
-    virtual ~wxFont();
-
-    // implement base class pure virtuals
-    virtual int GetPointSize() const;
-    virtual wxFontStyle GetStyle() const;
-    virtual wxFontWeight GetWeight() const;
-    virtual bool GetUnderlined() const;
-    virtual wxString GetFaceName() const;
-    virtual wxFontEncoding GetEncoding() const;
-    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
-
-    virtual void SetPointSize(int pointSize);
-    virtual void SetFamily(wxFontFamily family);
-    virtual void SetStyle(wxFontStyle style);
-    virtual void SetWeight(wxFontWeight weight);
-    virtual bool SetFaceName(const wxString& faceName);
-    virtual void SetUnderlined(bool underlined);
-    virtual void SetEncoding(wxFontEncoding encoding);
-
-    wxDECLARE_COMMON_FONT_METHODS();
-
-    // Implementation
-
-    // Find an existing, or create a new, XFontStruct
-    // based on this wxFont and the given scale. Append the
-    // font to list in the private data for future reference.
-
-    // TODO This is a fairly basic implementation, that doesn't
-    // allow for different facenames, and also doesn't do a mapping
-    // between 'standard' facenames (e.g. Arial, Helvetica, Times Roman etc.)
-    // and the fonts that are available on a particular system.
-    // Maybe we need to scan the user's machine to build up a profile
-    // of the fonts and a mapping file.
-
-    // Return font struct, and optionally the Motif font list
-    wxXFont *GetInternalFont(double scale = 1.0,
-        WXDisplay* display = NULL) const;
-
-    // These two are helper functions for convenient access of the above.
-#if wxMOTIF_USE_RENDER_TABLE
-    WXFontSet GetFontSet(double scale, WXDisplay* display = NULL) const;
-    WXRenderTable GetRenderTable(WXDisplay* display) const;
-#else // if !wxMOTIF_USE_RENDER_TABLE
-    WXFontStructPtr GetFontStruct(double scale = 1.0,
-        WXDisplay* display = NULL) const;
-    WXFontList GetFontList(double scale = 1.0,
-        WXDisplay* display = NULL) const;
-#endif // !wxMOTIF_USE_RENDER_TABLE
-    // returns either a XmFontList or XmRenderTable, depending
-    // on Motif version
-    WXFontType GetFontType(WXDisplay* display) const;
-    // like the function above but does a copy for XmFontList
-    WXFontType GetFontTypeC(WXDisplay* display) const;
-    static WXString GetFontTag();
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-    virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
-    virtual wxFontFamily DoGetFamily() const;
-
-    void Unshare();
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxFont)
-};
-
-#endif // _WX_FONT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/frame.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/frame.h
deleted file mode 100644
index 3815420d5e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/frame.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/frame.h
-// Purpose:     wxFrame class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MOTIF_FRAME_H_
-#define _WX_MOTIF_FRAME_H_
-
-class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase
-{
-public:
-    wxFrame() { Init(); }
-    wxFrame(wxWindow *parent,
-        wxWindowID id,
-        const wxString& title,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxDEFAULT_FRAME_STYLE,
-        const wxString& name = wxFrameNameStr)
-    {
-        Init();
-
-        Create(parent, id, title, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-        wxWindowID id,
-        const wxString& title,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxDEFAULT_FRAME_STYLE,
-        const wxString& name = wxFrameNameStr);
-
-    virtual ~wxFrame();
-
-    virtual bool Show(bool show = true);
-
-    // Set menu bar
-    void SetMenuBar(wxMenuBar *menu_bar);
-
-    // Set title
-    void SetTitle(const wxString& title);
-
-    // Set icon
-    virtual void SetIcons(const wxIconBundle& icons);
-
-#if wxUSE_STATUSBAR
-    virtual void PositionStatusBar();
-#endif // wxUSE_STATUSBAR
-
-    // Create toolbar
-#if wxUSE_TOOLBAR
-    virtual wxToolBar* CreateToolBar(long style = -1,
-                                     wxWindowID id = wxID_ANY,
-                                     const wxString& name = wxToolBarNameStr);
-    virtual void SetToolBar(wxToolBar *toolbar);
-    virtual void PositionToolBar();
-#endif // wxUSE_TOOLBAR
-
-    // Implementation only from now on
-    // -------------------------------
-
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-    void OnActivate(wxActivateEvent& event);
-
-    virtual void ChangeFont(bool keepOriginalSize = true);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
-    WXWidget GetMenuBarWidget() const;
-    WXWidget GetShellWidget() const { return m_frameShell; }
-    WXWidget GetWorkAreaWidget() const { return m_workArea; }
-    WXWidget GetClientAreaWidget() const { return m_clientArea; }
-    WXWidget GetTopWidget() const { return m_frameShell; }
-
-    virtual WXWidget GetMainWidget() const { return m_mainWidget; }
-
-    // The widget that can have children on it
-    WXWidget GetClientWidget() const;
-    bool GetVisibleStatus() const { return m_visibleStatus; }
-    void SetVisibleStatus( bool status ) { m_visibleStatus = status; }
-
-    bool PreResize();
-
-    // for generic/mdig.h
-    virtual void DoGetClientSize(int *width, int *height) const;
-
-private:
-    // common part of all ctors
-    void Init();
-
-    // set a single icon for the frame
-    void DoSetIcon( const wxIcon& icon );
-
-    //// Motif-specific
-    WXWidget              m_frameShell;
-    WXWidget              m_workArea;
-    WXWidget              m_clientArea;
-    bool                  m_visibleStatus;
-    bool                  m_iconized;
-
-    virtual void DoGetSize(int *width, int *height) const;
-    virtual void DoSetSize(int x, int y,
-        int width, int height,
-        int sizeFlags = wxSIZE_AUTO);
-    virtual void DoSetClientSize(int width, int height);
-
-private:
-    virtual bool XmDoCreateTLW(wxWindow* parent,
-                               wxWindowID id,
-                               const wxString& title,
-                               const wxPoint& pos,
-                               const wxSize& size,
-                               long style,
-                               const wxString& name);
-
-
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxFrame)
-};
-
-#endif // _WX_MOTIF_FRAME_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/gauge.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/gauge.h
deleted file mode 100644
index f839c2cc93..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/gauge.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/gauge.h
-// Purpose:     wxGauge class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GAUGE_H_
-#define _WX_GAUGE_H_
-
-// Group box
-class WXDLLIMPEXP_CORE wxGauge : public wxGaugeBase
-{
-    DECLARE_DYNAMIC_CLASS(wxGauge)
-
-public:
-    inline wxGauge() { m_rangeMax = 0; m_gaugePos = 0; }
-
-    inline wxGauge(wxWindow *parent, wxWindowID id,
-        int range,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxGA_HORIZONTAL,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxGaugeNameStr)
-    {
-        Create(parent, id, range, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-        int range,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxGA_HORIZONTAL,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxGaugeNameStr);
-
-    void SetShadowWidth(int w);
-    void SetRange(int r);
-    void SetValue(int pos);
-
-    int GetShadowWidth() const ;
-    int GetRange() const ;
-    int GetValue() const ;
-
-    virtual void Command(wxCommandEvent& WXUNUSED(event)) {} ;
-
-private:
-    virtual wxSize DoGetBestSize() const;
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-};
-
-#endif
-// _WX_GAUGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/icon.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/icon.h
deleted file mode 100644
index 8b2620bf4a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/icon.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/icon.h
-// Purpose:     wxIcon class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_ICON_H_
-#define _WX_ICON_H_
-
-#include "wx/bitmap.h"
-
-// Icon
-class WXDLLIMPEXP_CORE wxIcon : public wxBitmap
-{
-public:
-    wxIcon();
-
-    // Initialize with XBM data
-    wxIcon(const char bits[], int width, int height);
-
-    // Initialize with XPM data
-    wxIcon(const char* const* data);
-#ifdef wxNEEDS_CHARPP
-    wxIcon(char **data);
-#endif
-
-    wxIcon(const wxString& name, wxBitmapType type = wxICON_DEFAULT_TYPE,
-           int desiredWidth = -1, int desiredHeight = -1)
-    {
-        LoadFile(name, type, desiredWidth, desiredHeight);
-    }
-
-    wxIcon(const wxIconLocation& loc)
-    {
-        LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ANY);
-    }
-
-    virtual ~wxIcon();
-
-    bool LoadFile(const wxString& name, wxBitmapType type,
-                  int desiredWidth, int desiredHeight);
-
-    // unhide the base class version
-    virtual bool LoadFile(const wxString& name,
-                          wxBitmapType flags = wxICON_DEFAULT_TYPE)
-        { return LoadFile(name, flags); }
-
-    // create from bitmap (which should have a mask unless it's monochrome):
-    // there shouldn't be any implicit bitmap -> icon conversion (i.e. no
-    // ctors, assignment operators...), but it's ok to have such function
-    void CopyFromBitmap(const wxBitmap& bmp);
-
-
-    DECLARE_DYNAMIC_CLASS(wxIcon)
-};
-
-#endif // _WX_ICON_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/listbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/listbox.h
deleted file mode 100644
index 0b8b91a59f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/listbox.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/listbox.h
-// Purpose:     wxListBox class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_LISTBOX_H_
-#define _WX_LISTBOX_H_
-
-#include "wx/ctrlsub.h"
-#include "wx/clntdata.h"
-
-// forward decl for GetSelections()
-class WXDLLIMPEXP_FWD_BASE wxArrayInt;
-
-// List box item
-class WXDLLIMPEXP_CORE wxListBox: public wxListBoxBase
-{
-    DECLARE_DYNAMIC_CLASS(wxListBox)
-
-public:
-    wxListBox();
-    wxListBox(wxWindow *parent, wxWindowID id,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        int n = 0, const wxString choices[] = NULL,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr)
-    {
-        Create(parent, id, pos, size, n, choices, style, validator, name);
-    }
-
-    wxListBox(wxWindow *parent, wxWindowID id,
-        const wxPoint& pos,
-        const wxSize& size,
-        const wxArrayString& choices,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr)
-    {
-        Create(parent, id, pos, size, choices, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        int n = 0, const wxString choices[] = NULL,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr);
-
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxPoint& pos,
-        const wxSize& size,
-        const wxArrayString& choices,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr);
-
-    // implementation of wxControlWithItems
-    virtual unsigned int GetCount() const;
-    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
-                              unsigned int pos,
-                              void **clientData, wxClientDataType type);
-    virtual int GetSelection() const;
-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual int FindString(const wxString& s, bool bCase = false) const;
-    virtual void DoClear();
-    virtual void SetString(unsigned int n, const wxString& s);
-    virtual wxString GetString(unsigned int n) const;
-
-    // implementation of wxListBoxbase
-    virtual void DoSetSelection(int n, bool select);
-    virtual void DoSetFirstItem(int n);
-    virtual int GetSelections(wxArrayInt& aSelections) const;
-    virtual bool IsSelected(int n) const;
-
-    // For single or multiple choice list item
-    void Command(wxCommandEvent& event);
-
-    // Implementation
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
-    WXWidget GetTopWidget() const;
-
-#if wxUSE_CHECKLISTBOX
-    virtual void DoToggleItem(int WXUNUSED(item), int WXUNUSED(x)) {}
-#endif
-protected:
-    virtual wxSize DoGetBestSize() const;
-
-    unsigned int m_noItems;
-
-private:
-    void SetSelectionPolicy();
-};
-
-#endif
-// _WX_LISTBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/menu.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/menu.h
deleted file mode 100644
index 822a13d28b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/menu.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/menu.h
-// Purpose:     wxMenu, wxMenuBar classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MOTIF_MENU_H_
-#define _WX_MOTIF_MENU_H_
-
-#include "wx/colour.h"
-#include "wx/font.h"
-#include "wx/arrstr.h"
-
-class WXDLLIMPEXP_FWD_CORE wxFrame;
-
-// ----------------------------------------------------------------------------
-// Menu
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase
-{
-public:
-    // ctors & dtor
-    wxMenu(const wxString& title, long style = 0)
-        : wxMenuBase(title, style) { Init(); }
-
-    wxMenu(long style = 0) : wxMenuBase(style) { Init(); }
-
-    virtual ~wxMenu();
-
-    // implement base class virtuals
-    virtual wxMenuItem* DoAppend(wxMenuItem *item);
-    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem* DoRemove(wxMenuItem *item);
-
-    virtual void Break();
-
-    virtual void SetTitle(const wxString& title);
-
-    bool ProcessCommand(wxCommandEvent& event);
-
-    //// Motif-specific
-    WXWidget GetButtonWidget() const { return m_buttonWidget; }
-    void SetButtonWidget(WXWidget buttonWidget) { m_buttonWidget = buttonWidget; }
-
-    WXWidget GetMainWidget() const { return m_menuWidget; }
-
-    int GetId() const { return m_menuId; }
-    void SetId(int id) { m_menuId = id; }
-
-    void SetMenuBar(wxMenuBar* menuBar) { m_menuBar = menuBar; }
-    wxMenuBar* GetMenuBar() const { return m_menuBar; }
-
-    void CreatePopup(WXWidget logicalParent, int x, int y);
-    void DestroyPopup();
-    void ShowPopup(int x, int y);
-    void HidePopup();
-
-    WXWidget CreateMenu(wxMenuBar *menuBar, WXWidget parent, wxMenu *topMenu,
-        size_t index, const wxString& title = wxEmptyString,
-        bool isPulldown = false);
-
-    // For popups, need to destroy, then recreate menu for a different (or
-    // possibly same) window, since the parent may change.
-    void DestroyMenu(bool full);
-    WXWidget FindMenuItem(int id, wxMenuItem **it = NULL) const;
-
-    const wxColour& GetBackgroundColour() const { return m_backgroundColour; }
-    const wxColour& GetForegroundColour() const { return m_foregroundColour; }
-    const wxFont& GetFont() const { return m_font; }
-
-    void SetBackgroundColour(const wxColour& colour);
-    void SetForegroundColour(const wxColour& colour);
-    void SetFont(const wxFont& colour);
-    void ChangeFont(bool keepOriginalSize = false);
-
-    WXWidget GetHandle() const { return m_menuWidget; }
-
-    bool IsTearOff() const { return (m_style & wxMENU_TEAROFF) != 0; }
-
-    void DestroyWidgetAndDetach();
-public:
-    // Motif-specific data
-    int               m_numColumns;
-    WXWidget          m_menuWidget;
-    WXWidget          m_popupShell;   // For holding the popup shell widget
-    WXWidget          m_buttonWidget; // The actual string, so we can grey it etc.
-    int               m_menuId;
-    wxMenu*           m_topLevelMenu ;
-    bool              m_ownedByMenuBar;
-    wxColour          m_foregroundColour;
-    wxColour          m_backgroundColour;
-    wxFont            m_font;
-
-private:
-    // common code for both constructors:
-    void Init();
-
-    DECLARE_DYNAMIC_CLASS(wxMenu)
-};
-
-// ----------------------------------------------------------------------------
-// Menu Bar
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase
-{
-public:
-    wxMenuBar() { Init(); }
-    wxMenuBar(long WXUNUSED(style)) { Init(); }
-    wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
-    wxMenuBar(size_t n, wxMenu *menus[], const wxArrayString& titles, long style = 0);
-    virtual ~wxMenuBar();
-
-    // implement base class (pure) virtuals
-    // ------------------------------------
-
-    virtual bool Append( wxMenu *menu, const wxString &title );
-    virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);
-    virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
-    virtual wxMenu *Remove(size_t pos);
-
-    virtual int FindMenuItem(const wxString& menuString,
-        const wxString& itemString) const;
-    virtual wxMenuItem* FindItem( int id, wxMenu **menu = NULL ) const;
-
-    virtual void EnableTop( size_t pos, bool flag );
-    virtual void SetMenuLabel( size_t pos, const wxString& label );
-    virtual wxString GetMenuLabel( size_t pos ) const;
-
-    // implementation only from now on
-    // -------------------------------
-
-    wxFrame* GetMenuBarFrame() const { return m_menuBarFrame; }
-    void SetMenuBarFrame(wxFrame* frame) { m_menuBarFrame = frame; }
-    WXWidget GetMainWidget() const { return m_mainWidget; }
-    void SetMainWidget(WXWidget widget) { m_mainWidget = widget; }
-
-    // Create menubar
-    bool CreateMenuBar(wxFrame* frame);
-
-    // Destroy menubar, but keep data structures intact so we can recreate it.
-    bool DestroyMenuBar();
-
-    const wxColour& GetBackgroundColour() const { return m_backgroundColour; }
-    const wxColour& GetForegroundColour() const { return m_foregroundColour; }
-    const wxFont& GetFont() const { return m_font; }
-
-    virtual bool SetBackgroundColour(const wxColour& colour);
-    virtual bool SetForegroundColour(const wxColour& colour);
-    virtual bool SetFont(const wxFont& colour);
-    void ChangeFont(bool keepOriginalSize = false);
-
-public:
-    // common part of all ctors
-    void Init();
-
-    wxArrayString m_titles;
-    wxFrame      *m_menuBarFrame;
-
-    WXWidget      m_mainWidget;
-
-    wxColour      m_foregroundColour;
-    wxColour      m_backgroundColour;
-    wxFont        m_font;
-
-    DECLARE_DYNAMIC_CLASS(wxMenuBar)
-};
-
-#endif // _WX_MOTIF_MENU_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/menuitem.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/menuitem.h
deleted file mode 100644
index 541e970a89..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/menuitem.h
+++ /dev/null
@@ -1,67 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/menuitem.h
-// Purpose:     wxMenuItem class
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     11.11.97
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MOTIF_MENUITEM_H
-#define _WX_MOTIF_MENUITEM_H
-
-#include "wx/bitmap.h"
-
-class WXDLLIMPEXP_FWD_CORE wxMenuBar;
-
-// ----------------------------------------------------------------------------
-// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase
-{
-public:
-    // ctor & dtor
-    wxMenuItem(wxMenu *parentMenu = NULL,
-               int id = wxID_SEPARATOR,
-               const wxString& text = wxEmptyString,
-               const wxString& help = wxEmptyString,
-               wxItemKind kind = wxITEM_NORMAL,
-               wxMenu *subMenu = NULL);
-    virtual ~wxMenuItem();
-
-    // accessors (some more are inherited from wxOwnerDrawn or are below)
-    virtual void SetItemLabel(const wxString& label);
-    virtual void Enable(bool enable = true);
-    virtual void Check(bool check = true);
-    // included SetBitmap and GetBitmap as copied from the GTK include file
-    // I'm not sure if this works but it silences the linker in the
-    // menu sample.
-    //     JJ
-    virtual void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
-    virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
-
-    // implementation from now on
-    void CreateItem (WXWidget menu, wxMenuBar * menuBar, wxMenu * topMenu,
-                     size_t index);
-    void DestroyItem(bool full);
-
-    WXWidget GetButtonWidget() const { return m_buttonWidget; }
-
-    wxMenuBar* GetMenuBar() const { return m_menuBar; }
-    void SetMenuBar(wxMenuBar* menuBar) { m_menuBar = menuBar; }
-
-    wxMenu* GetTopMenu() const { return m_topMenu; }
-    void SetTopMenu(wxMenu* menu) { m_topMenu = menu; }
-
-private:
-    WXWidget    m_buttonWidget;
-    wxMenuBar*  m_menuBar;
-    wxMenu*     m_topMenu;        // Top-level menu e.g. popup-menu
-    wxBitmap  m_bitmap; // Bitmap for menuitem, if any
-
-    DECLARE_DYNAMIC_CLASS(wxMenuItem)
-};
-
-#endif  // _WX_MOTIF_MENUITEM_H
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/minifram.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/minifram.h
deleted file mode 100644
index f04a9ea989..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/minifram.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/minifram.h
-// Purpose:     wxMiniFrame class. A small frame for e.g. floating toolbars.
-//              If there is no equivalent on your platform, just make it a
-//              normal frame.
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MINIFRAM_H_
-#define _WX_MINIFRAM_H_
-
-#include "wx/frame.h"
-
-class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame {
-
-    DECLARE_DYNAMIC_CLASS(wxMiniFrame)
-
-public:
-    inline wxMiniFrame() {}
-    inline wxMiniFrame(wxWindow *parent,
-        wxWindowID id,
-        const wxString& title,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION,
-        const wxString& name = wxFrameNameStr)
-    {
-        // Use wxFrame constructor in absence of more specific code.
-        Create(parent, id, title, pos, size, style, name);
-    }
-
-    virtual ~wxMiniFrame() {}
-protected:
-};
-
-#endif
-// _WX_MINIFRAM_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/msgdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/msgdlg.h
deleted file mode 100644
index c662da2deb..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/msgdlg.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/msgdlg.h
-// Purpose:     wxMessageDialog class. Use generic version if no
-//              platform-specific implementation.
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSGBOXDLG_H_
-#define _WX_MSGBOXDLG_H_
-
-// ----------------------------------------------------------------------------
-// Message box dialog
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
-{
-public:
-    wxMessageDialog(wxWindow *parent,
-                    const wxString& message,
-                    const wxString& caption = wxMessageBoxCaptionStr,
-                    long style = wxOK | wxCENTRE,
-                    const wxPoint& WXUNUSED(pos) = wxDefaultPosition)
-        : wxMessageDialogBase(parent, message, caption, style)
-    {
-    }
-
-    virtual int ShowModal();
-
-    // implementation only from now on
-    // called by the Motif callback
-    void SetResult(long result) { m_result = result; }
-
-protected:
-    long        m_result;
-
-    DECLARE_DYNAMIC_CLASS(wxMessageDialog)
-};
-
-#endif // _WX_MSGBOXDLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/popupwin.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/popupwin.h
deleted file mode 100644
index 8ef11f1e1b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/popupwin.h
+++ /dev/null
@@ -1,35 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/popupwin.h
-// Purpose:     wxPopupWindow class for wxMotif
-// Author:      Mattia Barbon
-// Modified by:
-// Created:     28.08.03
-// Copyright:   (c) 2003 Mattia Barbon
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MOTIF_POPUPWIN_H_
-#define _WX_MOTIF_POPUPWIN_H_
-
-// ----------------------------------------------------------------------------
-// wxPopupWindow
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase
-{
-public:
-    wxPopupWindow() { Init(); }
-
-    wxPopupWindow( wxWindow *parent, int flags = wxBORDER_NONE )
-        { Init(); (void)Create( parent, flags ); }
-
-    bool Create( wxWindow *parent, int flags = wxBORDER_NONE );
-
-    virtual bool Show( bool show = true );
-private:
-    void Init() { m_isShown = false; }
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
-};
-
-#endif // _WX_MOTIF_POPUPWIN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/print.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/print.h
deleted file mode 100644
index 258a8091d8..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/print.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/print.h
-// Purpose:     wxPrinter, wxPrintPreview classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRINT_H_
-#define _WX_PRINT_H_
-
-#include "wx/prntbase.h"
-
-/*
-* Represents the printer: manages printing a wxPrintout object
-*/
-
-class WXDLLIMPEXP_CORE wxPrinter: public wxPrinterBase
-{
-    DECLARE_DYNAMIC_CLASS(wxPrinter)
-
-public:
-    wxPrinter(wxPrintData *data = NULL);
-    virtual ~wxPrinter();
-
-    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true);
-    virtual bool PrintDialog(wxWindow *parent);
-    virtual bool Setup(wxWindow *parent);
-};
-
-/*
-* wxPrintPreview
-* Programmer creates an object of this class to preview a wxPrintout.
-*/
-
-class WXDLLIMPEXP_CORE wxPrintPreview: public wxPrintPreviewBase
-{
-    DECLARE_CLASS(wxPrintPreview)
-
-public:
-    wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL);
-    virtual ~wxPrintPreview();
-
-    virtual bool Print(bool interactive);
-    virtual void DetermineScaling();
-};
-
-#endif
-// _WX_PRINT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/private.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/private.h
deleted file mode 100644
index f36fd8d6dd..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/private.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/private.h
-// Purpose:     Private declarations for wxMotif port
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRIVATE_H_
-#define _WX_PRIVATE_H_
-
-#include "wx/defs.h"
-#include <X11/Xlib.h>
-#include <Xm/Xm.h>
-#include "wx/evtloop.h"
-
-class WXDLLIMPEXP_FWD_CORE wxFont;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLIMPEXP_FWD_CORE wxSize;
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLIMPEXP_FWD_CORE wxColour;
-
-#include "wx/x11/privx.h"
-
-// Put any private declarations here: native Motif types may be used because
-// this header is included after Xm/Xm.h
-
-// ----------------------------------------------------------------------------
-// convenience macros
-// ----------------------------------------------------------------------------
-
-#define wxCHECK_MOTIF_VERSION( major, minor ) \
-  ( XmVersion >= (major) * 1000 + (minor) )
-
-#define wxCHECK_LESSTIF_VERSION( major, minor ) \
-  ( LesstifVersion >= (major) * 1000 + (minor) )
-
-#define wxCHECK_LESSTIF() ( __WXLESSTIF__ )
-
-// some compilers (e.g. Sun CC) give warnings when treating string literals as
-// (non const) "char *" but many Motif functions take "char *" parameters which
-// are really "const char *" so use this macro to suppress the warnings when we
-// know it's ok
-#define wxMOTIF_STR(x) const_cast<char *>(x)
-
-// ----------------------------------------------------------------------------
-// Miscellaneous functions
-// ----------------------------------------------------------------------------
-
-WXWidget wxCreateBorderWidget( WXWidget parent, long style );
-
-// ----------------------------------------------------------------------------
-// common callbacks
-// ----------------------------------------------------------------------------
-
-// All widgets should have this as their resize proc.
-extern void wxWidgetResizeProc(Widget w, XConfigureEvent *event,
-                               String args[], int *num_args);
-
-// For repainting arbitrary windows
-void wxUniversalRepaintProc(Widget w, XtPointer WXUNUSED(c_data),
-                            XEvent *event, char *);
-
-// ----------------------------------------------------------------------------
-// we maintain a hash table which contains the mapping from Widget to wxWindow
-// corresponding to the window for this widget
-// ----------------------------------------------------------------------------
-
-extern void wxDeleteWindowFromTable(Widget w);
-extern wxWindow *wxGetWindowFromTable(Widget w);
-extern bool wxAddWindowToTable(Widget w, wxWindow *win);
-
-// ----------------------------------------------------------------------------
-// wxBitmap related functions
-// ----------------------------------------------------------------------------
-
-// Creates a bitmap with transparent areas drawn in the given colour.
-wxBitmap wxCreateMaskedBitmap(const wxBitmap& bitmap, const wxColour& colour);
-
-// ----------------------------------------------------------------------------
-// key events related functions
-// ----------------------------------------------------------------------------
-
-extern char wxFindMnemonic(const char* s);
-
-extern char * wxFindAccelerator (const char *s);
-extern XmString wxFindAcceleratorText (const char *s);
-
-// ----------------------------------------------------------------------------
-// TranslateXXXEvent() functions - translate Motif event to wxWindow one
-// ----------------------------------------------------------------------------
-
-extern bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win,
-                                  Widget widget, const XEvent *xevent);
-extern bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win,
-                                Widget widget, const XEvent *xevent);
-
-extern void wxDoChangeForegroundColour(WXWidget widget,
-                                       wxColour& foregroundColour);
-extern void wxDoChangeBackgroundColour(WXWidget widget,
-                                       const wxColour& backgroundColour,
-                                       bool changeArmColour = false);
-extern void wxDoChangeFont(WXWidget widget, const wxFont& font);
-extern void wxGetTextExtent(WXDisplay* display, const wxFont& font,
-                            double scale,
-                            const wxString& string, int* width, int* height,
-                            int* ascent, int* descent);
-extern void wxGetTextExtent(const wxWindow* window, const wxString& str,
-                            int* width, int* height,
-                            int* ascent, int* descent);
-
-#define wxNO_COLORS   0x00
-#define wxBACK_COLORS 0x01
-#define wxFORE_COLORS 0x02
-
-extern XColor itemColors[5] ;
-
-#define wxBACK_INDEX 0
-#define wxFORE_INDEX 1
-#define wxSELE_INDEX 2
-#define wxTOPS_INDEX 3
-#define wxBOTS_INDEX 4
-
-// ----------------------------------------------------------------------------
-// XmString/wxString conversion utilities
-// ----------------------------------------------------------------------------
-
-wxString wxXmStringToString( const XmString& xmString );
-XmString wxStringToXmString( const char* string );
-inline XmString wxStringToXmString( const wxScopedCharBuffer& string )
-    { return wxStringToXmString(string.data()); }
-inline XmString wxStringToXmString( const wxString& string )
-    { return wxStringToXmString((const char*)string.mb_str()); }
-
-// XmString made easy to use in wxWidgets (and has an added benefit of
-// cleaning up automatically)
-class wxXmString
-{
-    void Init(const char *str)
-    {
-        m_string = XmStringCreateLtoR
-                   (
-                    const_cast<char *>(str),
-                    const_cast<char *>(XmSTRING_DEFAULT_CHARSET)
-                   );
-    }
-
-public:
-    wxXmString(const char* str)
-    {
-        Init(str);
-    }
-
-    wxXmString(const wchar_t* str)
-    {
-        Init(wxConvLibc.cWC2MB(str));
-    }
-
-    wxXmString(const wxString& str)
-    {
-        Init(str.mb_str());
-    }
-
-    wxXmString(const wxCStrData& str)
-    {
-        Init(str);
-    }
-
-    // just to avoid calling XmStringFree()
-    wxXmString(const XmString& string) { m_string = string; }
-
-    ~wxXmString() { XmStringFree(m_string); }
-
-    // semi-implicit conversion to XmString (shouldn't rely on implicit
-    // conversion because many of Motif functions are macros)
-    XmString operator()() const { return m_string; }
-
-private:
-    XmString m_string;
-};
-
-// ----------------------------------------------------------------------------
-// Routines used in both wxTextCtrl/wxListBox and nativa wxComboBox
-// (defined in src/motif/listbox.cpp or src/motif/textctrl.cpp
-// ----------------------------------------------------------------------------
-
-int wxDoFindStringInList( Widget listWidget, const wxString& str );
-int wxDoGetSelectionInList( Widget listWidget );
-wxString wxDoGetStringInList( Widget listWidget, int n );
-wxSize wxDoGetListBoxBestSize( Widget listWidget, const wxWindow* window );
-
-wxSize wxDoGetSingleTextCtrlBestSize( Widget textWidget,
-                                      const wxWindow* window );
-
-// ----------------------------------------------------------------------------
-// event-related functions
-// ----------------------------------------------------------------------------
-
-// executes one main loop iteration (implemented in src/motif/evtloop.cpp)
-// returns true if the loop should be exited
-bool wxDoEventLoopIteration( wxGUIEventLoop& evtLoop );
-
-// Consume all events until no more left
-void wxFlushEvents(WXDisplay* display);
-
-// ----------------------------------------------------------------------------
-// macros to avoid casting WXFOO to Foo all the time
-// ----------------------------------------------------------------------------
-
-// argument is of type "wxWindow *"
-#define GetWidget(w)    ((Widget)(w)->GetHandle())
-
-// ----------------------------------------------------------------------------
-// accessors for C modules
-// ----------------------------------------------------------------------------
-
-extern "C" XtAppContext wxGetAppContext();
-
-#endif
-// _WX_PRIVATE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/private/timer.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/private/timer.h
deleted file mode 100644
index 65a60f88c1..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/private/timer.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/private/timer.h
-// Purpose:     wxTimer class
-// Author:      Julian Smart
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MOTIF_PRIVATE_TIMER_H_
-#define _WX_MOTIF_PRIVATE_TIMER_H_
-
-#include "wx/private/timer.h"
-
-class WXDLLIMPEXP_CORE wxMotifTimerImpl : public wxTimerImpl
-{
-public:
-    wxMotifTimerImpl(wxTimer* timer) : wxTimerImpl(timer) { m_id = 0; }
-    virtual ~wxMotifTimerImpl();
-
-    virtual bool Start(int milliseconds = -1, bool oneShot = false);
-    virtual void Stop();
-    virtual bool IsRunning() const { return m_id != 0; }
-
-    // override this to rearm the timer if necessary (i.e. if not one shot) as
-    // X timeouts are removed automatically when they expire
-    virtual void Notify();
-
-protected:
-    // common part of Start() and Notify()
-    void DoStart();
-
-    long m_id;
-};
-
-#endif // _WX_MOTIF_PRIVATE_TIMER_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/radiobox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/radiobox.h
deleted file mode 100644
index 80dc58d22e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/radiobox.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/radiobox.h
-// Purpose:     wxRadioBox class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MOTIF_RADIOBOX_H_
-#define _WX_MOTIF_RADIOBOX_H_
-
-#ifndef wxWIDGET_ARRAY_DEFINED
-    #define wxWIDGET_ARRAY_DEFINED
-
-    #include "wx/dynarray.h"
-    WX_DEFINE_ARRAY_PTR(WXWidget, wxWidgetArray);
-#endif // wxWIDGET_ARRAY_DEFINED
-
-#include "wx/arrstr.h"
-
-class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, public wxRadioBoxBase
-{
-public:
-    wxRadioBox() { Init(); }
-
-    wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               int n = 0, const wxString choices[] = NULL,
-               int majorDim = 0, long style = wxRA_SPECIFY_COLS,
-               const wxValidator& val = wxDefaultValidator,
-               const wxString& name = wxRadioBoxNameStr)
-    {
-        Init();
-
-        Create(parent, id, title, pos, size, n, choices,
-               majorDim, style, val, name);
-    }
-
-    wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
-               const wxPoint& pos,
-               const wxSize& size,
-               const wxArrayString& choices,
-               int majorDim = 0, long style = wxRA_SPECIFY_COLS,
-               const wxValidator& val = wxDefaultValidator,
-               const wxString& name = wxRadioBoxNameStr)
-    {
-        Init();
-
-        Create(parent, id, title, pos, size, choices,
-               majorDim, style, val, name);
-    }
-
-    virtual ~wxRadioBox();
-
-    bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                int n = 0, const wxString choices[] = NULL,
-                int majorDim = 0, long style = wxRA_SPECIFY_COLS,
-                const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxRadioBoxNameStr);
-
-    bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
-                const wxPoint& pos,
-                const wxSize& size,
-                const wxArrayString& choices,
-                int majorDim = 0, long style = wxRA_SPECIFY_COLS,
-                const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxRadioBoxNameStr);
-
-    // Enabling
-    virtual bool Enable(bool enable = true);
-    virtual bool Enable(unsigned int item, bool enable = true);
-    virtual bool IsItemEnabled(unsigned int WXUNUSED(n)) const
-    {
-        /* TODO */
-        return true;
-    }
-
-    // Showing
-    virtual bool Show(bool show = true);
-    virtual bool Show(unsigned int item, bool show = true);
-    virtual bool IsItemShown(unsigned int WXUNUSED(n)) const
-    {
-        /* TODO */
-        return true;
-    }
-
-    virtual void SetSelection(int n);
-    int GetSelection() const;
-
-    virtual void SetString(unsigned int item, const wxString& label);
-    virtual wxString GetString(unsigned int item) const;
-
-    virtual wxString GetStringSelection() const;
-    virtual bool SetStringSelection(const wxString& s);
-    virtual unsigned int GetCount() const { return m_noItems; } ;
-    void Command(wxCommandEvent& event);
-
-    int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
-    void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
-
-    // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = true);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
-    const wxWidgetArray& GetRadioButtons() const { return m_radioButtons; }
-    void SetSel(int i) { m_selectedButton = i; }
-    virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
-
-protected:
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-
-    unsigned int      m_noItems;
-    int               m_noRowsOrCols;
-    int               m_selectedButton;
-
-    wxWidgetArray     m_radioButtons;
-    WXWidget          m_labelWidget;
-    wxArrayString     m_radioButtonLabels;
-
-private:
-    void Init();
-
-    DECLARE_DYNAMIC_CLASS(wxRadioBox)
-};
-
-#endif // _WX_MOTIF_RADIOBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/radiobut.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/radiobut.h
deleted file mode 100644
index 072294e4bd..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/radiobut.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/radiobut.h
-// Purpose:     wxRadioButton class
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RADIOBUT_H_
-#define _WX_RADIOBUT_H_
-
-class WXDLLIMPEXP_CORE wxRadioButton: public wxControl
-{
-    DECLARE_DYNAMIC_CLASS(wxRadioButton)
-public:
-    wxRadioButton();
-    virtual ~wxRadioButton() { RemoveFromCycle(); }
-
-    inline wxRadioButton(wxWindow *parent, wxWindowID id,
-        const wxString& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxRadioButtonNameStr)
-    {
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxString& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxRadioButtonNameStr);
-
-    virtual void SetValue(bool val);
-    virtual bool GetValue() const ;
-
-    void Command(wxCommandEvent& event);
-
-    // Implementation
-    virtual void ChangeBackgroundColour();
-
-    // *this function is an implementation detail*
-    // clears the selection in the radiobuttons in the cycle
-    // and returns the old selection (if any)
-    wxRadioButton* ClearSelections();
-protected:
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-private:
-    wxRadioButton* AddInCycle(wxRadioButton* cycle);
-    void RemoveFromCycle();
-    wxRadioButton* NextInCycle() { return m_cycle; }
-
-    wxRadioButton *m_cycle;
-};
-
-#endif
-// _WX_RADIOBUT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/scrolbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/scrolbar.h
deleted file mode 100644
index 2029f60b03..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/scrolbar.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/scrolbar.h
-// Purpose:     wxScrollBar class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SCROLBAR_H_
-#define _WX_SCROLBAR_H_
-
-// Scrollbar item
-class WXDLLIMPEXP_CORE wxScrollBar: public wxScrollBarBase
-{
-    DECLARE_DYNAMIC_CLASS(wxScrollBar)
-
-public:
-    inline wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }
-    virtual ~wxScrollBar();
-
-    inline wxScrollBar(wxWindow *parent, wxWindowID id,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxSB_HORIZONTAL,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxScrollBarNameStr)
-    {
-        Create(parent, id, pos, size, style, validator, name);
-    }
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxSB_HORIZONTAL,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxScrollBarNameStr);
-
-    int GetThumbPosition() const ;
-    inline int GetThumbSize() const { return m_pageSize; }
-    inline int GetPageSize() const { return m_viewSize; }
-    inline int GetRange() const { return m_objectSize; }
-
-    virtual void SetThumbPosition(int viewStart);
-    virtual void SetScrollbar(int position, int thumbSize, int range, int pageSize,
-        bool refresh = true);
-
-    void Command(wxCommandEvent& event);
-
-    // Implementation
-    virtual void ChangeFont(bool keepOriginalSize = true);
-    virtual void ChangeBackgroundColour();
-
-protected:
-    int m_pageSize;
-    int m_viewSize;
-    int m_objectSize;
-};
-
-#endif
-// _WX_SCROLBAR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/setup.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/setup.h
deleted file mode 100644
index f92391d4dd..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/setup.h
+++ /dev/null
@@ -1,1507 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/setup.h
-// Purpose:     Configuration for the library
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SETUP_H_
-#define _WX_SETUP_H_
-
-/* --- start common options --- */
-// ----------------------------------------------------------------------------
-// global settings
-// ----------------------------------------------------------------------------
-
-// define this to 0 when building wxBase library - this can also be done from
-// makefile/project file overriding the value here
-#ifndef wxUSE_GUI
-    #define wxUSE_GUI            1
-#endif // wxUSE_GUI
-
-// ----------------------------------------------------------------------------
-// compatibility settings
-// ----------------------------------------------------------------------------
-
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
-// This setting determines the compatibility with 2.8 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
-
-// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
-// default system font is used for wxWindow::GetCharWidth/Height() instead of
-// the current font.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxDIALOG_UNIT_COMPATIBILITY   0
-
-// ----------------------------------------------------------------------------
-// debugging settings
-// ----------------------------------------------------------------------------
-
-// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no
-// need to define it here. You may do it for two reasons: either completely
-// disable/compile out the asserts in release version (then do it inside #ifdef
-// NDEBUG) or, on the contrary, enable more asserts, including the usually
-// disabled ones, in the debug build (then do it inside #ifndef NDEBUG)
-//
-// #ifdef NDEBUG
-//  #define wxDEBUG_LEVEL 0
-// #else
-//  #define wxDEBUG_LEVEL 2
-// #endif
-
-// wxHandleFatalExceptions() may be used to catch the program faults at run
-// time and, instead of terminating the program with a usual GPF message box,
-// call the user-defined wxApp::OnFatalException() function. If you set
-// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work.
-//
-// This setting is for Win32 only and can only be enabled if your compiler
-// supports Win32 structured exception handling (currently only VC++ does)
-//
-// Default is 1
-//
-// Recommended setting: 1 if your compiler supports it.
-#define wxUSE_ON_FATAL_EXCEPTION 1
-
-// Set this to 1 to be able to generate a human-readable (unlike
-// machine-readable minidump created by wxCrashReport::Generate()) stack back
-// trace when your program crashes using wxStackWalker
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_STACKWALKER 1
-
-// Set this to 1 to compile in wxDebugReport class which allows you to create
-// and optionally upload to your web site a debug report consisting of back
-// trace of the crash (if wxUSE_STACKWALKER == 1) and other information.
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, it is compiled into a separate library so there
-//                         is no overhead if you don't use it
-#define wxUSE_DEBUGREPORT 1
-
-// Generic comment about debugging settings: they are very useful if you don't
-// use any other memory leak detection tools such as Purify/BoundsChecker, but
-// are probably redundant otherwise. Also, Visual C++ CRT has the same features
-// as wxWidgets memory debugging subsystem built in since version 5.0 and you
-// may prefer to use it instead of built in memory debugging code because it is
-// faster and more fool proof.
-//
-// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG
-// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0)
-// and if __NO_VC_CRTDBG__ is not defined.
-
-// The rest of the options in this section are obsolete and not supported,
-// enable them at your own risk.
-
-// If 1, enables wxDebugContext, for writing error messages to file, etc. If
-// __WXDEBUG__ is not defined, will still use the normal memory operators.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_CONTEXT 0
-
-// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF*
-// __WXDEBUG__ is also defined.
-//
-// WARNING: this code may not work with all architectures, especially if
-// alignment is an issue. This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 1 if you are not using a memory debugging tool, else 0
-#define wxUSE_MEMORY_TRACING 0
-
-// In debug mode, cause new and delete to be redefined globally.
-// If this causes problems (e.g. link errors which is a common problem
-// especially if you use another library which also redefines the global new
-// and delete), set this to 0.
-// This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
-
-// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
-// this causes problems (e.g. link errors), set this to 0. You may need to set
-// this to 0 if using templates (at least for VC++). This switch is currently
-// ignored for MinGW/Cygwin.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_NEW_ALWAYS 0
-
-
-// ----------------------------------------------------------------------------
-// Unicode support
-// ----------------------------------------------------------------------------
-
-// These settings are obsolete: the library is always built in Unicode mode
-// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if
-// absolutely necessary -- updating it is strongly recommended as the ANSI mode
-// will disappear completely in future wxWidgets releases.
-#ifndef wxUSE_UNICODE
-    #define wxUSE_UNICODE 1
-#endif
-
-// wxUSE_WCHAR_T is required by wxWidgets now, don't change.
-#define wxUSE_WCHAR_T 1
-
-// ----------------------------------------------------------------------------
-// global features
-// ----------------------------------------------------------------------------
-
-// Compile library in exception-safe mode? If set to 1, the library will try to
-// behave correctly in presence of exceptions (even though it still will not
-// use the exceptions itself) and notify the user code about any unhandled
-// exceptions. If set to 0, propagation of the exceptions through the library
-// code will lead to undefined behaviour -- but the code itself will be
-// slightly smaller and faster.
-//
-// Note that like wxUSE_THREADS this option is automatically set to 0 if
-// wxNO_EXCEPTIONS is defined.
-//
-// Default is 1
-//
-// Recommended setting: depends on whether you intend to use C++ exceptions
-//                      in your own code (1 if you do, 0 if you don't)
-#define wxUSE_EXCEPTIONS    1
-
-// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
-//
-// Default is 0
-//
-// Recommended setting: 0 (this is still work in progress...)
-#define wxUSE_EXTENDED_RTTI 0
-
-// Support for message/error logging. This includes wxLogXXX() functions and
-// wxLog and derived classes. Don't set this to 0 unless you really know what
-// you are doing.
-//
-// Default is 1
-//
-// Recommended setting: 1 (always)
-#define wxUSE_LOG 1
-
-// Recommended setting: 1
-#define wxUSE_LOGWINDOW 1
-
-// Recommended setting: 1
-#define wxUSE_LOGGUI 1
-
-// Recommended setting: 1
-#define wxUSE_LOG_DIALOG 1
-
-// Support for command line parsing using wxCmdLineParser class.
-//
-// Default is 1
-//
-// Recommended setting: 1 (can be set to 0 if you don't use the cmd line)
-#define wxUSE_CMDLINE_PARSER 1
-
-// Support for multithreaded applications: if 1, compile in thread classes
-// (thread.h) and make the library a bit more thread safe. Although thread
-// support is quite stable by now, you may still consider recompiling the
-// library without it if you have no use for it - this will result in a
-// somewhat smaller and faster operation.
-//
-// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset
-// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in
-// build/msw/config.* file this value will have no effect.
-//
-// Default is 1
-//
-// Recommended setting: 0 unless you do plan to develop MT applications
-#define wxUSE_THREADS 1
-
-// If enabled, compiles wxWidgets streams classes
-//
-// wx stream classes are used for image IO, process IO redirection, network
-// protocols implementation and much more and so disabling this results in a
-// lot of other functionality being lost.
-//
-// Default is 1
-//
-// Recommended setting: 1 as setting it to 0 disables many other things
-#define wxUSE_STREAMS       1
-
-// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf.
-// Note that if the system's implementation does not support positional
-// parameters, setting this to 1 forces the use of the wxWidgets implementation
-// of wxVsnprintf. The standard vsnprintf() supports positional parameters on
-// many Unix systems but usually doesn't under Windows.
-//
-// Positional parameters are very useful when translating a program since using
-// them in formatting strings allow translators to correctly reorder the
-// translated sentences.
-//
-// Default is 1
-//
-// Recommended setting: 1 if you want to support multiple languages
-#define wxUSE_PRINTF_POS_PARAMS      1
-
-// Enable the use of compiler-specific thread local storage keyword, if any.
-// This is used for wxTLS_XXX() macros implementation and normally should use
-// the compiler-provided support as it's simpler and more efficient, but is
-// disabled under Windows in wx/msw/chkconf.h as it can't be used if wxWidgets
-// is used in a dynamically loaded Win32 DLL (i.e. using LoadLibrary()) under
-// XP as this triggers a bug in compiler TLS support that results in crashes
-// when any TLS variables are used.
-//
-// If you're absolutely sure that your build of wxWidgets is never going to be
-// used in such situation, either because it's not going to be linked from any
-// kind of plugin or because you only target Vista or later systems, you can
-// set this to 2 to force the use of compiler TLS even under MSW.
-//
-// Default is 1 meaning that compiler TLS is used only if it's 100% safe.
-//
-// Recommended setting: 2 if you want to have maximal performance and don't
-// care about the scenario described above.
-#define wxUSE_COMPILER_TLS 1
-
-// ----------------------------------------------------------------------------
-// Interoperability with the standard library.
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_STL to 1 to enable maximal interoperability with the standard
-// library, even at the cost of backwards compatibility.
-//
-// Default is 0
-//
-// Recommended setting: 0 as the options below already provide a relatively
-// good level of interoperability and changing this option arguably isn't worth
-// diverging from the official builds of the library.
-#define wxUSE_STL 0
-
-// This is not a real option but is used as the default value for
-// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS.
-//
-// Currently the Digital Mars and Watcom compilers come without standard C++
-// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have
-// them (e.g. from STLPort).
-//
-// VC++ 5.0 does include standard C++ library headers, however they produce
-// many warnings that can't be turned off when compiled at warning level 4.
-#if defined(__DMC__) || defined(__WATCOMC__) \
-        || (defined(_MSC_VER) && _MSC_VER < 1200)
-    #define wxUSE_STD_DEFAULT  0
-#else
-    #define wxUSE_STD_DEFAULT  1
-#endif
-
-// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<>
-// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but
-// usually more limited) implementations are used which allows to avoid the
-// dependency on the C++ run-time library.
-//
-// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't
-// support using standard containers and that VC6 needs non-default options for
-// such build to avoid getting "fatal error C1076: compiler limit : internal
-// heap limit reached; use /Zm to specify a higher limit" in its own standard
-// headers, so you need to ensure you do increase the heap size before enabling
-// this option for this compiler.
-//
-// Default is 0 for compatibility reasons.
-//
-// Recommended setting: 1 unless compatibility with the official wxWidgets
-// build and/or the existing code is a concern.
-#define wxUSE_STD_CONTAINERS 0
-
-// Use standard C++ streams if 1 instead of wx streams in some places. If
-// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
-// standard streams library.
-//
-// Notice that enabling this does not replace wx streams with std streams
-// everywhere, in a lot of places wx streams are used no matter what.
-//
-// Default is 1 if compiler supports it.
-//
-// Recommended setting: 1 if you use the standard streams anyhow and so
-//                      dependency on the standard streams library is not a
-//                      problem
-#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
-
-// Enable minimal interoperability with the standard C++ string class if 1.
-// "Minimal" means that wxString can be constructed from std::string or
-// std::wstring but can't be implicitly converted to them. You need to enable
-// the option below for the latter.
-//
-// Default is 1 for most compilers.
-//
-// Recommended setting: 1 unless you want to ensure your program doesn't use
-//                      the standard C++ library at all.
-#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
-
-// Make wxString as much interchangeable with std::[w]string as possible, in
-// particular allow implicit conversion of wxString to either of these classes.
-// This comes at a price (or a benefit, depending on your point of view) of not
-// allowing implicit conversion to "const char *" and "const wchar_t *".
-//
-// Because a lot of existing code relies on these conversions, this option is
-// disabled by default but can be enabled for your build if you don't care
-// about compatibility.
-//
-// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled.
-//
-// Recommended setting: 0 to remain compatible with the official builds of
-// wxWidgets.
-#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
-
-// VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
-// them. Set this option to 1 to use <iostream.h>, 0 to use <iostream>.
-//
-// Note that newer compilers (including VC++ 7.1 and later) don't support
-// wxUSE_IOSTREAMH == 1 and so <iostream> will be used anyhow.
-//
-// Default is 0.
-//
-// Recommended setting: 0, only set to 1 if you use a really old compiler
-#define wxUSE_IOSTREAMH     0
-
-
-// ----------------------------------------------------------------------------
-// non GUI features selection
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit
-// integer which is implemented in terms of native 64 bit integers if any or
-// uses emulation otherwise.
-//
-// This class is required by wxDateTime and so you should enable it if you want
-// to use wxDateTime. For most modern platforms, it will use the native 64 bit
-// integers in which case (almost) all of its functions are inline and it
-// almost does not take any space, so there should be no reason to switch it
-// off.
-//
-// Recommended setting: 1
-#define wxUSE_LONGLONG      1
-
-// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for
-// storing binary data in wxConfig on most platforms.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_BASE64        1
-
-// Set this to 1 to be able to use wxEventLoop even in console applications
-// (i.e. using base library only, without GUI). This is mostly useful for
-// processing socket events but is also necessary to use timers in console
-// applications
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_CONSOLE_EVENTLOOP 1
-
-// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level
-// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions.
-//
-// Default is 1
-//
-// Recommended setting: 1 (wxFile is highly recommended as it is required by
-// i18n code, wxFileConfig and others)
-#define wxUSE_FILE          1
-#define wxUSE_FFILE         1
-
-// Use wxFSVolume class providing access to the configured/active mount points
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely disabled if you don't use it)
-#define wxUSE_FSVOLUME      1
-
-// Use wxStandardPaths class which allows to retrieve some standard locations
-// in the file system
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be disabled to save space, but not much)
-#define wxUSE_STDPATHS      1
-
-// use wxTextBuffer class: required by wxTextFile
-#define wxUSE_TEXTBUFFER    1
-
-// use wxTextFile class: requires wxFile and wxTextBuffer, required by
-// wxFileConfig
-#define wxUSE_TEXTFILE      1
-
-// i18n support: _() macro, wxLocale class. Requires wxTextFile.
-#define wxUSE_INTL          1
-
-// Provide wxFoo_l() functions similar to standard foo() functions but taking
-// an extra locale parameter.
-//
-// Notice that this is fully implemented only for the systems providing POSIX
-// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary
-// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will
-// only work for the current user locale and "C" locale. You can use
-// wxHAS_XLOCALE_SUPPORT to test whether the full support is available.
-//
-// Default is 1
-//
-// Recommended setting: 1 but may be disabled if you are writing programs
-// running only in C locale anyhow
-#define wxUSE_XLOCALE       1
-
-// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which
-// allow to manipulate dates, times and time intervals. wxDateTime replaces the
-// old wxTime and wxDate classes which are still provided for backwards
-// compatibility (and implemented in terms of wxDateTime).
-//
-// Note that this class is relatively new and is still officially in alpha
-// stage because some features are not yet (fully) implemented. It is already
-// quite useful though and should only be disabled if you are aiming at
-// absolutely minimal version of the library.
-//
-// Requires: wxUSE_LONGLONG
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_DATETIME      1
-
-// Set wxUSE_TIMER to 1 to compile wxTimer class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_TIMER         1
-
-// Use wxStopWatch clas.
-//
-// Default is 1
-//
-// Recommended setting: 1 (needed by wxSocket)
-#define wxUSE_STOPWATCH     1
-
-// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FSWATCHER     1
-
-// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes
-// which allow the application to store its settings in the persistent
-// storage. Setting this to 1 will also enable on-demand creation of the
-// global config object in wxApp.
-//
-// See also wxUSE_CONFIG_NATIVE below.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG        1
-
-// If wxUSE_CONFIG is 1, you may choose to use either the native config
-// classes under Windows (using .INI files under Win16 and the registry under
-// Win32) or the portable text file format used by the config classes under
-// Unix.
-//
-// Default is 1 to use native classes. Note that you may still use
-// wxFileConfig even if you set this to 1 - just the config object created by
-// default for the applications needs will be a wxRegConfig or wxIniConfig and
-// not wxFileConfig.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG_NATIVE   1
-
-// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows
-// to connect/disconnect from the network and be notified whenever the dial-up
-// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DIALUP_MANAGER   1
-
-// Compile in classes for run-time DLL loading and function calling.
-// Required by wxUSE_DIALUP_MANAGER.
-//
-// This setting is for Win32 only
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DYNLIB_CLASS    1
-
-// experimental, don't use for now
-#define wxUSE_DYNAMIC_LOADER  1
-
-// Set to 1 to use socket classes
-#define wxUSE_SOCKETS       1
-
-// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS)
-//
-// Notice that currently setting this option under Windows will result in
-// programs which can only run on recent OS versions (with ws2_32.dll
-// installed) which is why it is disabled by default.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need IPv6 support
-#define wxUSE_IPV6          0
-
-// Set to 1 to enable virtual file systems (required by wxHTML)
-#define wxUSE_FILESYSTEM    1
-
-// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ZIP        1
-
-// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ARCHIVE    1
-
-// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_INET       1
-
-// wxArchive classes for accessing archives such as zip and tar
-#define wxUSE_ARCHIVE_STREAMS     1
-
-// Set to 1 to compile wxZipInput/OutputStream classes.
-#define wxUSE_ZIPSTREAM     1
-
-// Set to 1 to compile wxTarInput/OutputStream classes.
-#define wxUSE_TARSTREAM     1
-
-// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
-// wxUSE_LIBPNG
-#define wxUSE_ZLIB          1
-
-// If enabled, the code written by Apple will be used to write, in a portable
-// way, float on the disk. See extended.c for the license which is different
-// from wxWidgets one.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you don't like the license terms (unlikely)
-#define wxUSE_APPLE_IEEE          1
-
-// Joystick support class
-#define wxUSE_JOYSTICK            1
-
-// wxFontEnumerator class
-#define wxUSE_FONTENUM 1
-
-// wxFontMapper class
-#define wxUSE_FONTMAP 1
-
-// wxMimeTypesManager class
-#define wxUSE_MIMETYPE 1
-
-// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
-// or wxURL you need to set this to 1.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_PROTOCOL 1
-
-// The settings for the individual URL schemes
-#define wxUSE_PROTOCOL_FILE 1
-#define wxUSE_PROTOCOL_FTP 1
-#define wxUSE_PROTOCOL_HTTP 1
-
-// Define this to use wxURL class.
-#define wxUSE_URL 1
-
-// Define this to use native platform url and protocol support.
-// Currently valid only for MS-Windows.
-// Note: if you set this to 1, you can open ftp/http/gopher sites
-// and obtain a valid input stream for these sites
-// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0.
-// Doing so reduces the code size.
-//
-// This code is experimental and subject to change.
-#define wxUSE_URL_NATIVE 0
-
-// Support for wxVariant class used in several places throughout the library,
-// notably in wxDataViewCtrl API.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size as much as
-// possible in which case setting this to 0 can gain up to 100KB.
-#define wxUSE_VARIANT 1
-
-// Support for wxAny class, the successor for wxVariant.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size by a small amount,
-// or your compiler cannot for some reason cope with complexity of templates used.
-#define wxUSE_ANY 1
-
-// Support for regular expression matching via wxRegEx class: enable this to
-// use POSIX regular expressions in your code. You need to compile regex
-// library from src/regex to use it under Windows.
-//
-// Default is 0
-//
-// Recommended setting: 1 if your compiler supports it, if it doesn't please
-// contribute us a makefile for src/regex for it
-#define wxUSE_REGEX       1
-
-// wxSystemOptions class
-#define wxUSE_SYSTEM_OPTIONS 1
-
-// wxSound class
-#define wxUSE_SOUND      1
-
-// Use wxMediaCtrl
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_MEDIACTRL     1
-
-// Use wxWidget's XRC XML-based resource system.  Recommended.
-//
-// Default is 1
-//
-// Recommended setting: 1 (requires wxUSE_XML)
-#define wxUSE_XRC       1
-
-// XML parsing classes. Note that their API will change in the future, so
-// using wxXmlDocument and wxXmlNode in your app is not recommended.
-//
-// Default is the same as wxUSE_XRC, i.e. 1 by default.
-//
-// Recommended setting: 1 (required by XRC)
-#define wxUSE_XML       wxUSE_XRC
-
-// Use wxWidget's AUI docking system
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_AUI       1
-
-// Use wxWidget's Ribbon classes for interfaces
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_RIBBON    1
-
-// Use wxPropertyGrid.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_PROPGRID  1
-
-// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STC 1
-
-// Use wxWidget's web viewing classes
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_WEBVIEW 1
-
-// Use the IE wxWebView backend
-//
-// Default is 1 on MSW
-//
-// Recommended setting: 1
-#ifdef __WXMSW__
-#define wxUSE_WEBVIEW_IE 1
-#else
-#define wxUSE_WEBVIEW_IE 0
-#endif
-
-// Use the WebKit wxWebView backend
-//
-// Default is 1 on GTK and OSX
-//
-// Recommended setting: 1
-#if defined(__WXGTK__) || defined(__WXOSX__)
-#define wxUSE_WEBVIEW_WEBKIT 1
-#else
-#define wxUSE_WEBVIEW_WEBKIT 0
-#endif
-
-// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
-// 2D drawing API.  (Still somewhat experimental)
-//
-// Please note that on Windows gdiplus.dll is loaded dynamically which means
-// that nothing special needs to be done as long as you don't use
-// wxGraphicsContext at all or only use it on XP and later systems but you
-// still do need to distribute it yourself for an application using
-// wxGraphicsContext to be runnable on pre-XP systems.
-//
-// Default is 1 except if you're using a non-Microsoft compiler under Windows
-// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
-// mingw32) you may need to install the headers (and just the headers)
-// yourself. If you do, change the setting below manually.
-//
-// Recommended setting: 1 if supported by the compilation environment
-
-// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
-// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
-#ifdef _MSC_VER
-#   if _MSC_VER >= 1310
-        // MSVC7.1+ comes with new enough Platform SDK, enable
-        // wxGraphicsContext support for it
-#       define wxUSE_GRAPHICS_CONTEXT 1
-#   else
-        // MSVC 6 didn't include GDI+ headers so disable by default, enable it
-        // here if you use MSVC 6 with a newer SDK
-#       define wxUSE_GRAPHICS_CONTEXT 0
-#   endif
-#else
-    // Disable support for other Windows compilers, enable it if your compiler
-    // comes with new enough SDK or you installed the headers manually.
-    //
-    // Notice that this will be set by configure under non-Windows platforms
-    // anyhow so the value there is not important.
-#   define wxUSE_GRAPHICS_CONTEXT 0
-#endif
-
-// Enable wxGraphicsContext implementation using Cairo library.
-//
-// This is not needed under Windows and detected automatically by configure
-// under other systems, however you may set this to 1 manually if you installed
-// Cairo under Windows yourself and prefer to use it instead the native GDI+
-// implementation.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_CAIRO 0
-
-
-// ----------------------------------------------------------------------------
-// Individual GUI controls
-// ----------------------------------------------------------------------------
-
-// You must set wxUSE_CONTROLS to 1 if you are using any controls at all
-// (without it, wxControl class is not compiled)
-//
-// Default is 1
-//
-// Recommended setting: 1 (don't change except for very special programs)
-#define wxUSE_CONTROLS     1
-
-// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup().
-// Currently markup is supported only by a few controls and only some ports but
-// their number will increase with time.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you want to save on code size)
-#define wxUSE_MARKUP       1
-
-// wxPopupWindow class is a top level transient window. It is currently used
-// to implement wxTipWindow
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW)
-#define wxUSE_POPUPWIN     1
-
-// wxTipWindow allows to implement the custom tooltips, it is used by the
-// context help classes. Requires wxUSE_POPUPWIN.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0)
-#define wxUSE_TIPWINDOW    1
-
-// Each of the settings below corresponds to one wxWidgets control. They are
-// all switched on by default but may be disabled if you are sure that your
-// program (including any standard dialogs it can show!) doesn't need them and
-// if you desperately want to save some space. If you use any of these you must
-// set wxUSE_CONTROLS as well.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_ANIMATIONCTRL 1   // wxAnimationCtrl
-#define wxUSE_BANNERWINDOW  1   // wxBannerWindow
-#define wxUSE_BUTTON        1   // wxButton
-#define wxUSE_BMPBUTTON     1   // wxBitmapButton
-#define wxUSE_CALENDARCTRL  1   // wxCalendarCtrl
-#define wxUSE_CHECKBOX      1   // wxCheckBox
-#define wxUSE_CHECKLISTBOX  1   // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
-#define wxUSE_CHOICE        1   // wxChoice
-#define wxUSE_COLLPANE      1   // wxCollapsiblePane
-#define wxUSE_COLOURPICKERCTRL 1    // wxColourPickerCtrl
-#define wxUSE_COMBOBOX      1   // wxComboBox
-#define wxUSE_COMMANDLINKBUTTON 1   // wxCommandLinkButton
-#define wxUSE_DATAVIEWCTRL  1   // wxDataViewCtrl
-#define wxUSE_DATEPICKCTRL  1   // wxDatePickerCtrl
-#define wxUSE_DIRPICKERCTRL 1   // wxDirPickerCtrl
-#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox
-#define wxUSE_FILECTRL      1   // wxFileCtrl
-#define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
-#define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
-#define wxUSE_GAUGE         1   // wxGauge
-#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
-#define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
-#define wxUSE_LISTBOX       1   // wxListBox
-#define wxUSE_LISTCTRL      1   // wxListCtrl
-#define wxUSE_RADIOBOX      1   // wxRadioBox
-#define wxUSE_RADIOBTN      1   // wxRadioButton
-#define wxUSE_RICHMSGDLG    1   // wxRichMessageDialog
-#define wxUSE_SCROLLBAR     1   // wxScrollBar
-#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
-#define wxUSE_SLIDER        1   // wxSlider
-#define wxUSE_SPINBTN       1   // wxSpinButton
-#define wxUSE_SPINCTRL      1   // wxSpinCtrl
-#define wxUSE_STATBOX       1   // wxStaticBox
-#define wxUSE_STATLINE      1   // wxStaticLine
-#define wxUSE_STATTEXT      1   // wxStaticText
-#define wxUSE_STATBMP       1   // wxStaticBitmap
-#define wxUSE_TEXTCTRL      1   // wxTextCtrl
-#define wxUSE_TIMEPICKCTRL  1   // wxTimePickerCtrl
-#define wxUSE_TOGGLEBTN     1   // requires wxButton
-#define wxUSE_TREECTRL      1   // wxTreeCtrl
-#define wxUSE_TREELISTCTRL  1   // wxTreeListCtrl
-
-// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
-// below either wxStatusBar95 or a generic wxStatusBar will be used.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STATUSBAR    1
-
-// Two status bar implementations are available under Win32: the generic one
-// or the wrapper around native control. For native look and feel the native
-// version should be used.
-//
-// Default is 1 for the platforms where native status bar is supported.
-//
-// Recommended setting: 1 (there is no advantage in using the generic one)
-#define wxUSE_NATIVE_STATUSBAR        1
-
-// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
-// classes at all. Otherwise, use the native toolbar class unless
-// wxUSE_TOOLBAR_NATIVE is 0.
-//
-// Default is 1 for all settings.
-//
-// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.
-#define wxUSE_TOOLBAR 1
-#define wxUSE_TOOLBAR_NATIVE 1
-
-// wxNotebook is a control with several "tabs" located on one of its sides. It
-// may be used to logically organise the data presented to the user instead of
-// putting everything in one huge dialog. It replaces wxTabControl and related
-// classes of wxWin 1.6x.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTEBOOK 1
-
-// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_LISTBOOK 1
-
-// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CHOICEBOOK 1
-
-// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TREEBOOK 1
-
-// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of
-// tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLBOOK 1
-
-// wxTaskBarIcon is a small notification icon shown in the system toolbar or
-// dock.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be set to 0 if you don't need it)
-#define wxUSE_TASKBARICON 1
-
-// wxGrid class
-//
-// Default is 1, set to 0 to cut down compilation time and binaries size if you
-// don't use it.
-//
-// Recommended setting: 1
-//
-#define wxUSE_GRID         1
-
-// wxMiniFrame class: a frame with narrow title bar
-//
-// Default is 1.
-//
-// Recommended setting: 1 (it doesn't cost almost anything)
-#define wxUSE_MINIFRAME 1
-
-// wxComboCtrl and related classes: combobox with custom popup window and
-// not necessarily a listbox.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
-//                      it used by wxComboBox
-#define wxUSE_COMBOCTRL 1
-
-// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
-// items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0, except where it is
-//                      needed as a base class for generic wxBitmapComboBox.
-#define wxUSE_ODCOMBOBOX 1
-
-// wxBitmapComboBox is a combobox that can have images in front of text items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0
-#define wxUSE_BITMAPCOMBOBOX 1
-
-// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items
-// up and down in it. It is also used as part of wxRearrangeDialog.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 (currently used only by
-// wxHeaderCtrl)
-#define wxUSE_REARRANGECTRL 1
-
-// ----------------------------------------------------------------------------
-// Miscellaneous GUI stuff
-// ----------------------------------------------------------------------------
-
-// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
-#define wxUSE_ACCEL 1
-
-// Use the standard art provider. The icons returned by this provider are
-// embedded into the library as XPMs so disabling it reduces the library size
-// somewhat but this should only be done if you use your own custom art
-// provider returning the icons or never use any icons not provided by the
-// native art provider (which might not be implemented at all for some
-// platforms) or by the Tango icons provider (if it's not itself disabled
-// below).
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you use your own custom art provider.
-#define wxUSE_ARTPROVIDER_STD 1
-
-// Use art provider providing Tango icons: this art provider has higher quality
-// icons than the default ones using smaller size XPM icons without
-// transparency but the embedded PNG icons add to the library size.
-//
-// Default is 1 under non-GTK ports. Under wxGTK the native art provider using
-// the GTK+ stock icons replaces it so it is normally not necessary.
-//
-// Recommended setting: 1 but can be turned off to reduce the library size.
-#define wxUSE_ARTPROVIDER_TANGO 1
-
-// Hotkey support (currently Windows only)
-#define wxUSE_HOTKEY 1
-
-// Use wxCaret: a class implementing a "cursor" in a text control (called caret
-// under Windows).
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can be safely set to 0, not used by the library)
-#define wxUSE_CARET         1
-
-// Use wxDisplay class: it allows enumerating all displays on a system and
-// their geometries as well as finding the display on which the given point or
-// window lies.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
-#define wxUSE_DISPLAY       1
-
-// Miscellaneous geometry code: needed for Canvas library
-#define wxUSE_GEOMETRY            1
-
-// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
-// wxListCtrl.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (set it to 0 if you don't use any of the controls
-// enumerated above, then this class is mostly useless too)
-#define wxUSE_IMAGLIST      1
-
-// Use wxInfoBar class.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be disabled without problems as nothing
-// depends on it)
-#define wxUSE_INFOBAR       1
-
-// Use wxMenu, wxMenuBar, wxMenuItem.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can't be disabled under MSW)
-#define wxUSE_MENUS         1
-
-// Use wxNotificationMessage.
-//
-// wxNotificationMessage allows to show non-intrusive messages to the user
-// using balloons, banners, popups or whatever is the appropriate method for
-// the current platform.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTIFICATION_MESSAGE 1
-
-// wxPreferencesEditor provides a common API for different ways of presenting
-// the standard "Preferences" or "Properties" dialog under different platforms
-// (e.g. some use modal dialogs, some use modeless ones; some apply the changes
-// immediately while others require an explicit "Apply" button).
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_PREFERENCES_EDITOR 1
-
-// wxRichToolTip is a customizable tooltip class which has more functionality
-// than the stock (but native, unlike this class) wxToolTip.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely set to 0 if you don't need it)
-#define wxUSE_RICHTOOLTIP 1
-
-// Use wxSashWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SASH          1
-
-// Use wxSplitterWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SPLITTER      1
-
-// Use wxToolTip and wxWindow::Set/GetToolTip() methods.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLTIPS      1
-
-// wxValidator class and related methods
-#define wxUSE_VALIDATORS 1
-
-// Use reference counted ID management: this means that wxWidgets will track
-// the automatically allocated ids (those used when you use wxID_ANY when
-// creating a window, menu or toolbar item &c) instead of just supposing that
-// the program never runs out of them. This is mostly useful only under wxMSW
-// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where
-// long-running programs can run into problems with ids reuse without this. On
-// the other platforms, where the ids have the full int range, this shouldn't
-// be necessary.
-#ifdef __WXMSW__
-#define wxUSE_AUTOID_MANAGEMENT 1
-#else
-#define wxUSE_AUTOID_MANAGEMENT 0
-#endif
-
-// ----------------------------------------------------------------------------
-// common dialogs
-// ----------------------------------------------------------------------------
-
-// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g.
-// file selector, printer dialog). Switching this off also switches off the
-// printing architecture and interactive wxPrinterDC.
-//
-// Default is 1
-//
-// Recommended setting: 1 (unless it really doesn't work)
-#define wxUSE_COMMON_DIALOGS 1
-
-// wxBusyInfo displays window with message when app is busy. Works in same way
-// as wxBusyCursor
-#define wxUSE_BUSYINFO      1
-
-// Use single/multiple choice dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_CHOICEDLG     1
-
-// Use colour picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_COLOURDLG     1
-
-// wxDirDlg class for getting a directory name from user
-#define wxUSE_DIRDLG 1
-
-// TODO: setting to choose the generic or native one
-
-// Use file open/save dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in many places in the library itself)
-#define wxUSE_FILEDLG       1
-
-// Use find/replace dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely set to 0)
-#define wxUSE_FINDREPLDLG       1
-
-// Use font picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_FONTDLG       1
-
-// Use wxMessageDialog and wxMessageBox.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_MSGDLG        1
-
-// progress dialog class for lengthy operations
-#define wxUSE_PROGRESSDLG 1
-
-// support for startup tips (wxShowTip &c)
-#define wxUSE_STARTUP_TIPS 1
-
-// text entry dialog and wxGetTextFromUser function
-#define wxUSE_TEXTDLG 1
-
-// number entry dialog
-#define wxUSE_NUMBERDLG 1
-
-// splash screen class
-#define wxUSE_SPLASH 1
-
-// wizards
-#define wxUSE_WIZARDDLG 1
-
-// Compile in wxAboutBox() function showing the standard "About" dialog.
-//
-// Default is 1
-//
-// Recommended setting: 1 but can be set to 0 to save some space if you don't
-//                      use this function
-#define wxUSE_ABOUTDLG 1
-
-// wxFileHistory class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FILE_HISTORY 1
-
-// ----------------------------------------------------------------------------
-// Metafiles support
-// ----------------------------------------------------------------------------
-
-// Windows supports the graphics format known as metafile which is, though not
-// portable, is widely used under Windows and so is supported by wxWin (under
-// Windows only, of course). Win16 (Win3.1) used the so-called "Window
-// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in
-// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by
-// default, WMFs will be used under Win16 and EMFs under Win32. This may be
-// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting
-// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile
-// in any metafile related classes at all.
-//
-// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS.
-//
-// Recommended setting: default or 0 for everything for portable programs.
-#define wxUSE_METAFILE              1
-#define wxUSE_ENH_METAFILE          1
-#define wxUSE_WIN_METAFILES_ALWAYS  0
-
-// ----------------------------------------------------------------------------
-// Big GUI components
-// ----------------------------------------------------------------------------
-
-// Set to 0 to disable MDI support.
-//
-// Requires wxUSE_NOTEBOOK under platforms other than MSW.
-//
-// Default is 1.
-//
-// Recommended setting: 1, can be safely set to 0.
-#define wxUSE_MDI 1
-
-// Set to 0 to disable document/view architecture
-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
-
-// Set to 0 to disable MDI document/view architecture
-//
-// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
-#define wxUSE_MDI_ARCHITECTURE    1
-
-// Set to 0 to disable print/preview architecture code
-#define wxUSE_PRINTING_ARCHITECTURE  1
-
-// wxHTML sublibrary allows to display HTML in wxWindow programs and much,
-// much more.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
-// smaller library.
-#define wxUSE_HTML          1
-
-// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
-// headers and libraries to be able to compile the library with wxUSE_GLCANVAS
-// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the
-// list of libraries used to link your application (although this is done
-// implicitly for Microsoft Visual C++ users).
-//
-// Default is 1 unless the compiler is known to ship without the necessary
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
-//
-// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
-// otherwise.
-#define wxUSE_GLCANVAS       1
-
-// wxRichTextCtrl allows editing of styled text.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 if you want compile a
-// smaller library.
-#define wxUSE_RICHTEXT       1
-
-// ----------------------------------------------------------------------------
-// Data transfer
-// ----------------------------------------------------------------------------
-
-// Use wxClipboard class for clipboard copy/paste.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CLIPBOARD     1
-
-// Use wxDataObject and related classes. Needed for clipboard and OLE drag and
-// drop
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DATAOBJ       1
-
-// Use wxDropTarget and wxDropSource classes for drag and drop (this is
-// different from "built in" drag and drop in wxTreeCtrl which is always
-// available). Requires wxUSE_DATAOBJ.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DRAG_AND_DROP 1
-
-// Use wxAccessible for enhanced and customisable accessibility.
-// Depends on wxUSE_OLE.
-//
-// Default is 0.
-//
-// Recommended setting (at present): 0
-#define wxUSE_ACCESSIBILITY 0
-
-// ----------------------------------------------------------------------------
-// miscellaneous settings
-// ----------------------------------------------------------------------------
-
-// wxSingleInstanceChecker class allows to verify at startup if another program
-// instance is running.
-//
-// Default is 1
-//
-// Recommended setting: 1 (the class is tiny, disabling it won't save much
-// space)
-#define wxUSE_SNGLINST_CHECKER  1
-
-#define wxUSE_DRAGIMAGE 1
-
-#define wxUSE_IPC         1
-                                // 0 for no interprocess comms
-#define wxUSE_HELP        1
-                                // 0 for no help facility
-
-// Should we use MS HTML help for wxHelpController? If disabled, neither
-// wxCHMHelpController nor wxBestHelpController are available.
-//
-// Default is 1 under MSW, 0 is always used for the other platforms.
-//
-// Recommended setting: 1, only set to 0 if you have trouble compiling
-// wxCHMHelpController (could be a problem with really ancient compilers)
-#define wxUSE_MS_HTML_HELP 1
-
-
-// Use wxHTML-based help controller?
-#define wxUSE_WXHTML_HELP 1
-
-#define wxUSE_CONSTRAINTS 1
-                                // 0 for no window layout constraint system
-
-#define wxUSE_SPLINES     1
-                                // 0 for no splines
-
-#define wxUSE_MOUSEWHEEL        1
-                                // Include mouse wheel support
-
-// Compile wxUIActionSimulator class?
-#define wxUSE_UIACTIONSIMULATOR 1
-
-// ----------------------------------------------------------------------------
-// wxDC classes for various output formats
-// ----------------------------------------------------------------------------
-
-// Set to 1 for PostScript device context.
-#define wxUSE_POSTSCRIPT  0
-
-// Set to 1 to use font metric files in GetTextExtent
-#define wxUSE_AFM_FOR_POSTSCRIPT 1
-
-// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
-// to create files in SVG (Scalable Vector Graphics) format.
-#define wxUSE_SVG 1
-
-// Should wxDC provide SetTransformMatrix() and related methods?
-//
-// Default is 1 but can be set to 0 if this functionality is not used. Notice
-// that currently only wxMSW supports this so setting this to 0 doesn't change
-// much for non-MSW platforms (although it will still save a few bytes
-// probably).
-//
-// Recommended setting: 1.
-#define wxUSE_DC_TRANSFORM_MATRIX 1
-
-// ----------------------------------------------------------------------------
-// image format support
-// ----------------------------------------------------------------------------
-
-// wxImage supports many different image formats which can be configured at
-// compile-time. BMP is always supported, others are optional and can be safely
-// disabled if you don't plan to use images in such format sometimes saving
-// substantial amount of code in the final library.
-//
-// Some formats require an extra library which is included in wxWin sources
-// which is mentioned if it is the case.
-
-// Set to 1 for wxImage support (recommended).
-#define wxUSE_IMAGE         1
-
-// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
-#define wxUSE_LIBPNG        1
-
-// Set to 1 for JPEG format support (requires libjpeg)
-#define wxUSE_LIBJPEG       1
-
-// Set to 1 for TIFF format support (requires libtiff)
-#define wxUSE_LIBTIFF       1
-
-// Set to 1 for TGA format support (loading only)
-#define wxUSE_TGA           1
-
-// Set to 1 for GIF format support
-#define wxUSE_GIF           1
-
-// Set to 1 for PNM format support
-#define wxUSE_PNM           1
-
-// Set to 1 for PCX format support
-#define wxUSE_PCX           1
-
-// Set to 1 for IFF format support (Amiga format)
-#define wxUSE_IFF           0
-
-// Set to 1 for XPM format support
-#define wxUSE_XPM           1
-
-// Set to 1 for MS Icons and Cursors format support
-#define wxUSE_ICO_CUR       1
-
-// Set to 1 to compile in wxPalette class
-#define wxUSE_PALETTE       1
-
-// ----------------------------------------------------------------------------
-// wxUniversal-only options
-// ----------------------------------------------------------------------------
-
-// Set to 1 to enable compilation of all themes, this is the default
-#define wxUSE_ALL_THEMES    1
-
-// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES
-// is unset, if it is set these options are not used; notice that metal theme
-// uses Win32 one
-#define wxUSE_THEME_GTK     0
-#define wxUSE_THEME_METAL   0
-#define wxUSE_THEME_MONO    0
-#define wxUSE_THEME_WIN32   0
-
-
-/* --- end common options --- */
-
-#endif // _WX_SETUP_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/slider.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/slider.h
deleted file mode 100644
index db86ca0952..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/slider.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/slider.h
-// Purpose:     wxSlider class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SLIDER_H_
-#define _WX_SLIDER_H_
-
-#include "wx/control.h"
-
-// Slider
-class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase
-{
-    DECLARE_DYNAMIC_CLASS(wxSlider)
-
-public:
-    wxSlider();
-
-    wxSlider(wxWindow *parent, wxWindowID id,
-        int value, int minValue, int maxValue,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxSL_HORIZONTAL,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxSliderNameStr)
-    {
-        Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
-    }
-
-    virtual ~wxSlider();
-
-    bool Create(wxWindow *parent, wxWindowID id,
-        int value, int minValue, int maxValue,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxSL_HORIZONTAL,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxSliderNameStr);
-
-    virtual int GetValue() const ;
-    virtual void SetValue(int);
-
-    void SetRange(int minValue, int maxValue);
-
-    inline int GetMin() const { return m_rangeMin; }
-    inline int GetMax() const { return m_rangeMax; }
-
-    // For trackbars only
-    void SetPageSize(int pageSize);
-    int GetPageSize() const ;
-    void SetLineSize(int lineSize);
-    int GetLineSize() const ;
-    void SetThumbLength(int len) ;
-    int GetThumbLength() const ;
-
-    void Command(wxCommandEvent& event);
-
-protected:
-    int           m_rangeMin;
-    int           m_rangeMax;
-    int           m_pageSize;
-    int           m_lineSize;
-
-    virtual void DoSetSize(int x, int y,
-        int width, int height,
-        int sizeFlags = wxSIZE_AUTO);
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
-// _WX_SLIDER_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/spinbutt.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/spinbutt.h
deleted file mode 100644
index eed6f6ce83..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/spinbutt.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/spinbutt.h
-// Purpose:     wxSpinButton class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SPINBUTT_H_
-#define _WX_SPINBUTT_H_
-
-class WXDLLIMPEXP_FWD_CORE wxArrowButton; // internal
-
-class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase
-{
-    DECLARE_DYNAMIC_CLASS(wxSpinButton)
-
-public:
-    wxSpinButton() : m_up( 0 ), m_down( 0 ), m_pos( 0 ) { }
-
-    wxSpinButton(wxWindow *parent,
-        wxWindowID id = wxID_ANY,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxSP_VERTICAL,
-        const wxString& name = "wxSpinButton")
-        : m_up( 0 ),
-        m_down( 0 ),
-        m_pos( 0 )
-    {
-        Create(parent, id, pos, size, style, name);
-    }
-    virtual ~wxSpinButton();
-
-    bool Create(wxWindow *parent,
-        wxWindowID id = wxID_ANY,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxSP_VERTICAL,
-        const wxString& name = "wxSpinButton");
-
-    // accessors
-    int GetValue() const;
-    int GetMin() const { return m_min; }
-    int GetMax() const { return m_max; }
-
-    // operations
-    void SetValue(int val);
-    void SetRange(int minVal, int maxVal);
-
-    // Implementation
-    virtual void Command(wxCommandEvent& event)
-        { (void)ProcessCommand(event); }
-    virtual void ChangeFont(bool keepOriginalSize = true);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
-public:
-    // implementation detail
-    void Increment( int delta );
-
-private:
-    virtual void DoSetSize(int x, int y, int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-    virtual wxSize DoGetBestSize() const;
-
-    wxArrowButton* m_up;
-    wxArrowButton* m_down;
-    int m_pos;
-};
-
-#endif
-// _WX_SPINBUTT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/statbmp.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/statbmp.h
deleted file mode 100644
index c19268b710..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/statbmp.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/statbmp.h
-// Purpose:     wxStaticBitmap class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_STATBMP_H_
-#define _WX_STATBMP_H_
-
-#include "wx/motif/bmpmotif.h"
-#include "wx/icon.h"
-
-class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
-{
-    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-
-public:
-    wxStaticBitmap() { }
-    virtual ~wxStaticBitmap();
-
-    wxStaticBitmap(wxWindow *parent, wxWindowID id,
-        const wxBitmap& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticBitmapNameStr)
-    {
-        Create(parent, id, label, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxBitmap& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticBitmapNameStr);
-
-    virtual void SetBitmap(const wxBitmap& bitmap);
-
-    virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
-    {
-        return false;
-    }
-
-    wxBitmap GetBitmap() const { return m_messageBitmap; }
-
-    // for compatibility with wxMSW
-    wxIcon GetIcon() const
-    {
-        // don't use wxDynamicCast, icons and bitmaps are really the same thing
-        return *(wxIcon*)&m_messageBitmap;
-    }
-
-    // for compatibility with wxMSW
-    void  SetIcon(const wxIcon& icon)
-    {
-        SetBitmap( icon );
-    }
-
-    // Implementation
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
-
-protected:
-    void DoSetBitmap();
-
-protected:
-    wxBitmap m_messageBitmap;
-    wxBitmap m_messageBitmapOriginal;
-    wxBitmapCache m_bitmapCache;
-};
-
-#endif
-// _WX_STATBMP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/statbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/statbox.h
deleted file mode 100644
index a33967cf5d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/statbox.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/statbox.h
-// Purpose:     wxStaticBox class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_STATBOX_H_
-#define _WX_STATBOX_H_
-
-// Group box
-class WXDLLIMPEXP_CORE wxStaticBox: public wxStaticBoxBase
-{
-    DECLARE_DYNAMIC_CLASS(wxStaticBox)
-
-public:
-    wxStaticBox();
-    wxStaticBox(wxWindow *parent, wxWindowID id,
-        const wxString& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticBoxNameStr)
-    {
-        Create(parent, id, label, pos, size, style, name);
-    }
-
-    virtual ~wxStaticBox();
-
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxString& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticBoxNameStr);
-
-    virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
-    {
-        return false;
-    }
-
-    virtual WXWidget GetLabelWidget() const { return m_labelWidget; }
-
-    virtual void SetLabel(const wxString& label);
-    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
-
-private:
-    WXWidget  m_labelWidget;
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
-// _WX_STATBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/stattext.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/stattext.h
deleted file mode 100644
index 7abec32193..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/stattext.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/stattext.h
-// Purpose:     wxStaticText class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_STATTEXT_H_
-#define _WX_STATTEXT_H_
-
-class WXDLLIMPEXP_CORE wxStaticText: public wxStaticTextBase
-{
-    DECLARE_DYNAMIC_CLASS(wxStaticText)
-
-public:
-    wxStaticText() { }
-
-    wxStaticText(wxWindow *parent, wxWindowID id,
-        const wxString& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticTextNameStr)
-    {
-        Create(parent, id, label, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-        const wxString& label,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxStaticTextNameStr);
-
-    // implementation
-    // --------------
-
-    // operations
-    virtual bool ProcessCommand(wxCommandEvent& WXUNUSED(event))
-    {
-        return false;
-    }
-
-    virtual void SetLabel(const wxString& label);
-
-    // Get the widget that corresponds to the label
-    // (for font setting, label setting etc.)
-    virtual WXWidget GetLabelWidget() const
-        { return m_labelWidget; }
-
-    virtual void DoSetLabel(const wxString& str);
-    virtual wxString DoGetLabel() const;
-
-    virtual wxSize DoGetBestSize() const;
-protected:
-    WXWidget              m_labelWidget;
-};
-
-#endif
-// _WX_STATTEXT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/textctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/textctrl.h
deleted file mode 100644
index 9ffe9d5a96..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/textctrl.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/textctrl.h
-// Purpose:     wxTextCtrl class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TEXTCTRL_H_
-#define _WX_TEXTCTRL_H_
-
-// Single-line text item
-class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase
-{
-public:
-    // creation
-    // --------
-
-    wxTextCtrl();
-    wxTextCtrl(wxWindow *parent,
-               wxWindowID id,
-               const wxString& value = wxEmptyString,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxTextCtrlNameStr)
-    {
-        Create(parent, id, value, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-                const wxString& value = wxEmptyString,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize, long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxTextCtrlNameStr);
-
-    // accessors
-    // ---------
-    virtual wxString GetValue() const;
-
-    virtual int GetLineLength(long lineNo) const;
-    virtual wxString GetLineText(long lineNo) const;
-    virtual int GetNumberOfLines() const;
-
-    // operations
-    // ----------
-
-    virtual void MarkDirty();
-    virtual void DiscardEdits();
-    virtual bool IsModified() const;
-
-    virtual long XYToPosition(long x, long y) const;
-    virtual bool PositionToXY(long pos, long *x, long *y) const;
-    virtual void ShowPosition(long pos);
-
-    // callbacks
-    // ---------
-    void OnDropFiles(wxDropFilesEvent& event);
-    void OnChar(wxKeyEvent& event);
-    //  void OnEraseBackground(wxEraseEvent& event);
-
-    void OnCut(wxCommandEvent& event);
-    void OnCopy(wxCommandEvent& event);
-    void OnPaste(wxCommandEvent& event);
-    void OnUndo(wxCommandEvent& event);
-    void OnRedo(wxCommandEvent& event);
-
-    void OnUpdateCut(wxUpdateUIEvent& event);
-    void OnUpdateCopy(wxUpdateUIEvent& event);
-    void OnUpdatePaste(wxUpdateUIEvent& event);
-    void OnUpdateUndo(wxUpdateUIEvent& event);
-    void OnUpdateRedo(wxUpdateUIEvent& event);
-
-    virtual void Command(wxCommandEvent& event);
-
-    // implementation from here to the end
-    // -----------------------------------
-    virtual void ChangeFont(bool keepOriginalSize = true);
-    virtual void ChangeBackgroundColour();
-    virtual void ChangeForegroundColour();
-    void SetModified(bool mod) { m_modified = mod; }
-    virtual WXWidget GetTopWidget() const;
-
-    // send the CHAR and TEXT_UPDATED events
-    void DoSendEvents(void /* XmTextVerifyCallbackStruct */ *cbs,
-                      long keycode);
-
-protected:
-    virtual wxSize DoGetBestSize() const;
-
-    virtual void DoSetValue(const wxString& value, int flags = 0);
-
-    virtual WXWidget GetTextWidget() const { return m_mainWidget; }
-
-public:
-    // Motif-specific
-    void*     m_tempCallbackStruct;
-    bool      m_modified;
-    wxString  m_value;            // Required for password text controls
-
-    // Did we call wxTextCtrl::OnChar? If so, generate a command event.
-    bool      m_processedDefault;
-
-private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxTextCtrl)
-};
-
-#endif
-// _WX_TEXTCTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/textentry.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/textentry.h
deleted file mode 100644
index 5cb18a715d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/textentry.h
+++ /dev/null
@@ -1,59 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/textentry.h
-// Purpose:     wxMotif-specific wxTextEntry implementation
-// Author:      Vadim Zeitlin
-// Created:     2007-11-05
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MOTIF_TEXTENTRY_H_
-#define _WX_MOTIF_TEXTENTRY_H_
-
-// ----------------------------------------------------------------------------
-// wxTextEntry wraps XmTextXXX() methods suitable for single-line controls
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase
-{
-public:
-    wxTextEntry() { }
-
-    // implement wxTextEntryBase pure virtual methods
-    virtual void WriteText(const wxString& text);
-    virtual void Replace(long from, long to, const wxString& value);
-    virtual void Remove(long from, long to);
-
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
-
-    virtual void Undo();
-    virtual void Redo();
-    virtual bool CanUndo() const;
-    virtual bool CanRedo() const;
-
-    virtual void SetInsertionPoint(long pos);
-    virtual long GetInsertionPoint() const;
-    virtual long GetLastPosition() const;
-
-    virtual void SetSelection(long from, long to);
-    virtual void GetSelection(long *from, long *to) const;
-
-    virtual bool IsEditable() const;
-    virtual void SetEditable(bool editable);
-
-protected:
-    virtual wxString DoGetValue() const;
-
-    // translate wx text position (which may be -1 meaning "last one") to a
-    // valid Motif text position
-    long GetMotifPos(long pos) const;
-
-private:
-    // implement this to return the associated xmTextWidgetClass widget
-    virtual WXWidget GetTextWidget() const = 0;
-};
-
-#endif // _WX_MOTIF_TEXTENTRY_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/tglbtn.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/tglbtn.h
deleted file mode 100644
index 68e731f5f6..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/tglbtn.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/tglbtn.h
-// Purpose:     Declaration of the wxToggleButton class, which implements a
-//              toggle button under wxMotif.
-// Author:      Mattia Barbon
-// Modified by:
-// Created:     10.02.03
-// Copyright:   (c) 2003 Mattia Barbon
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TOGGLEBUTTON_H_
-#define _WX_TOGGLEBUTTON_H_
-
-#include "wx/checkbox.h"
-
-class WXDLLIMPEXP_CORE wxToggleButton : public wxCheckBox
-{
-public:
-    wxToggleButton() { Init(); }
-    wxToggleButton( wxWindow* parent, wxWindowID id, const wxString& label,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = 0,
-                    const wxValidator& val = wxDefaultValidator,
-                    const wxString& name = wxCheckBoxNameStr )
-    {
-        Init();
-
-        Create( parent, id, label, pos, size, style, val, name );
-    }
-
-    bool Create( wxWindow* parent, wxWindowID id, const wxString& label,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = 0,
-                 const wxValidator& val = wxDefaultValidator,
-                 const wxString &name = wxCheckBoxNameStr );
-
-protected:
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxToggleButton)
-
-    // common part of all constructors
-    void Init()
-    {
-        m_evtType = wxEVT_TOGGLEBUTTON;
-    }
-};
-
-#endif // _WX_TOGGLEBUTTON_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/toolbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/toolbar.h
deleted file mode 100644
index 954c836faf..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/toolbar.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/toolbar.h
-// Purpose:     wxToolBar class
-// Author:      Julian Smart
-// Modified by: 13.12.99 by VZ during toolbar classes reorganization
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TOOLBAR_H_
-#define _WX_TOOLBAR_H_
-
-class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase
-{
-public:
-    // ctors and dtor
-    wxToolBar() { Init(); }
-
-    wxToolBar(wxWindow *parent,
-        wxWindowID id,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxTB_HORIZONTAL,
-        const wxString& name = wxToolBarNameStr)
-    {
-        Init();
-
-        Create(parent, id, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-        wxWindowID id,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxTB_HORIZONTAL,
-        const wxString& name = wxToolBarNameStr);
-
-    virtual ~wxToolBar();
-
-    // override/implement base class virtuals
-    virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
-
-    virtual bool Realize();
-
-    // implementation from now on
-
-    // find tool by widget
-    wxToolBarToolBase *FindToolByWidget(WXWidget w) const;
-
-private:
-    // common part of all ctors
-    void Init();
-
-    // implement base class pure virtuals
-    virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
-    virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
-
-    virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
-    virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
-    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
-
-    virtual wxToolBarToolBase *CreateTool(int id,
-                                          const wxString& label,
-                                          const wxBitmap& bmpNormal,
-                                          const wxBitmap& bmpDisabled,
-                                          wxItemKind kind,
-                                          wxObject *clientData,
-                                          const wxString& shortHelp,
-                                          const wxString& longHelp);
-    virtual wxToolBarToolBase *CreateTool(wxControl *control,
-                                          const wxString& label);
-
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-private:
-    DECLARE_DYNAMIC_CLASS(wxToolBar)
-};
-
-#endif
-    // _WX_TOOLBAR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/toplevel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/toplevel.h
deleted file mode 100644
index 5c9f28eb07..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/toplevel.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/toplevel.h
-// Purpose:     wxTopLevelWindow Motif implementation
-// Author:      Mattia Barbon
-// Modified by:
-// Created:     12/10/2002
-// Copyright:   (c) Mattia Barbon
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __MOTIFTOPLEVELH__
-#define __MOTIFTOPLEVELH__
-
-class WXDLLIMPEXP_CORE wxTopLevelWindowMotif : public wxTopLevelWindowBase
-{
-public:
-    wxTopLevelWindowMotif() { Init(); }
-    wxTopLevelWindowMotif( wxWindow* parent, wxWindowID id,
-                           const wxString& title,
-                           const wxPoint& pos = wxDefaultPosition,
-                           const wxSize& size = wxDefaultSize,
-                           long style = wxDEFAULT_FRAME_STYLE,
-                           const wxString& name = wxFrameNameStr )
-    {
-        Init();
-
-        Create( parent, id, title, pos, size, style, name );
-    }
-
-    bool Create( wxWindow* parent, wxWindowID id,
-                 const wxString& title,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = wxDEFAULT_FRAME_STYLE,
-                 const wxString& name = wxFrameNameStr );
-
-    virtual ~wxTopLevelWindowMotif();
-
-    virtual bool ShowFullScreen( bool show, long style = wxFULLSCREEN_ALL );
-    virtual bool IsFullScreen() const;
-
-    virtual void Maximize(bool maximize = true);
-    virtual void Restore();
-    virtual void Iconize(bool iconize = true);
-    virtual bool IsMaximized() const;
-    virtual bool IsIconized() const;
-
-    virtual void Raise();
-    virtual void Lower();
-
-    virtual wxString GetTitle() const { return m_title; }
-    virtual void SetTitle( const wxString& title ) { m_title = title; }
-
-    virtual bool SetShape( const wxRegion& region );
-
-    WXWidget GetShellWidget() const;
-protected:
-    // common part of all constructors
-    void Init();
-    // common part of wxDialog/wxFrame destructors
-    void PreDestroy();
-
-    virtual void DoGetPosition(int* x, int* y) const;
-    virtual void DoSetSizeHints(int minW, int minH,
-                                int maxW, int maxH,
-                                int incW, int incH);
-
-private:
-    // really create the Motif widget for TLW
-    virtual bool XmDoCreateTLW(wxWindow* parent,
-                               wxWindowID id,
-                               const wxString& title,
-                               const wxPoint& pos,
-                               const wxSize& size,
-                               long style,
-                               const wxString& name) = 0;
-
-
-    wxString m_title;
-};
-
-#endif // __MOTIFTOPLEVELH__
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/window.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/window.h
deleted file mode 100644
index d4cbc60d96..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/motif/window.h
+++ /dev/null
@@ -1,329 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/motif/window.h
-// Purpose:     wxWindow class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WINDOW_H_
-#define _WX_WINDOW_H_
-
-#include "wx/region.h"
-
-// ----------------------------------------------------------------------------
-// wxWindow class for Motif - see also wxWindowBase
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxWindow : public wxWindowBase
-{
-    friend class WXDLLIMPEXP_FWD_CORE wxDC;
-    friend class WXDLLIMPEXP_FWD_CORE wxWindowDC;
-
-public:
-    wxWindow() { Init(); }
-
-    wxWindow(wxWindow *parent,
-             wxWindowID id,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = 0,
-             const wxString& name = wxPanelNameStr)
-    {
-        Init();
-        Create(parent, id, pos, size, style, name);
-    }
-
-    virtual ~wxWindow();
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr);
-
-    // implement base class pure virtuals
-    virtual void SetLabel(const wxString& label);
-    virtual wxString GetLabel() const;
-
-    virtual void Raise();
-    virtual void Lower();
-
-    virtual bool Show( bool show = true );
-    virtual bool Enable( bool enable = true );
-
-    virtual void SetFocus();
-
-    virtual void WarpPointer(int x, int y);
-
-    virtual void Refresh( bool eraseBackground = true,
-        const wxRect *rect = (const wxRect *) NULL );
-
-    virtual bool SetBackgroundColour( const wxColour &colour );
-    virtual bool SetForegroundColour( const wxColour &colour );
-
-    virtual bool SetCursor( const wxCursor &cursor );
-    virtual bool SetFont( const wxFont &font );
-
-    virtual int GetCharHeight() const;
-    virtual int GetCharWidth() const;
-
-    virtual void SetScrollbar( int orient, int pos, int thumbVisible,
-        int range, bool refresh = true );
-    virtual void SetScrollPos( int orient, int pos, bool refresh = true );
-    virtual int GetScrollPos( int orient ) const;
-    virtual int GetScrollThumb( int orient ) const;
-    virtual int GetScrollRange( int orient ) const;
-    virtual void ScrollWindow( int dx, int dy,
-        const wxRect* rect = NULL );
-
-#if wxUSE_DRAG_AND_DROP
-    virtual void SetDropTarget( wxDropTarget *dropTarget );
-#endif // wxUSE_DRAG_AND_DROP
-
-    // Accept files for dragging
-    virtual void DragAcceptFiles(bool accept);
-
-    // Get the unique identifier of a window
-    virtual WXWidget GetHandle() const { return GetMainWidget(); }
-
-    // implementation from now on
-    // --------------------------
-
-    // accessors
-    // ---------
-
-    // Get main widget for this window, e.g. a text widget
-    virtual WXWidget GetMainWidget() const;
-    // Get the widget that corresponds to the label (for font setting,
-    // label setting etc.)
-    virtual WXWidget GetLabelWidget() const;
-    // Get the client widget for this window (something we can create other
-    // windows on)
-    virtual WXWidget GetClientWidget() const;
-    // Get the top widget for this window, e.g. the scrolled widget parent of a
-    // multi-line text widget. Top means, top in the window hierarchy that
-    // implements this window.
-    virtual WXWidget GetTopWidget() const;
-
-    // Get the underlying X window and display
-    WXWindow GetClientXWindow() const;
-    WXWindow GetXWindow() const;
-    WXDisplay *GetXDisplay() const;
-
-    void SetLastClick(int button, long timestamp)
-    { m_lastButton = button; m_lastTS = timestamp; }
-
-    int GetLastClickedButton() const { return m_lastButton; }
-    long GetLastClickTime() const { return m_lastTS; }
-
-    // Gives window a chance to do something in response to a size message,
-    // e.g. arrange status bar, toolbar etc.
-    virtual bool PreResize();
-
-    // Generates a paint event
-    virtual void DoPaint();
-
-    // update rectangle/region manipulation
-    // (for wxWindowDC and Motif callbacks only)
-    // -----------------------------------------
-
-    // Adds a recangle to the updates list
-    void AddUpdateRect(int x, int y, int w, int h);
-
-    void ClearUpdateRegion() { m_updateRegion.Clear(); }
-    void SetUpdateRegion(const wxRegion& region) { m_updateRegion = region; }
-
-    // post-creation activities
-    void PostCreation();
-
-    // pre-creation activities
-    void PreCreation();
-
-protected:
-    // Responds to colour changes: passes event on to children.
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-    // Motif-specific
-
-    void SetMainWidget(WXWidget w) { m_mainWidget = w; }
-
-    // See src/motif/window.cpp, near the top, for an explanation
-    // why this is necessary
-    void CanvasSetSizeIntr(int x, int y, int width, int height,
-                           int sizeFlags, bool fromCtor);
-    void DoSetSizeIntr(int x, int y,
-                       int width, int height,
-                       int sizeFlags, bool fromCtor);
-
-    // for DoMoveWindowIntr flags
-    enum
-    {
-        wxMOVE_X = 1,
-        wxMOVE_Y = 2,
-        wxMOVE_WIDTH = 4,
-        wxMOVE_HEIGHT = 8
-    };
-
-    void DoMoveWindowIntr(int x, int y, int width, int height,
-                          int flags);
-
-    // helper function, to remove duplicate code, used in wxScrollBar
-    WXWidget DoCreateScrollBar(WXWidget parent, wxOrientation orientation,
-                               void (*callback)());
-public:
-    WXPixmap GetBackingPixmap() const { return m_backingPixmap; }
-    void SetBackingPixmap(WXPixmap pixmap) { m_backingPixmap = pixmap; }
-    int GetPixmapWidth() const { return m_pixmapWidth; }
-    int GetPixmapHeight() const { return m_pixmapHeight; }
-    void SetPixmapWidth(int w) { m_pixmapWidth = w; }
-    void SetPixmapHeight(int h) { m_pixmapHeight = h; }
-
-    // Change properties
-    // Change to the current font (often overridden)
-    virtual void ChangeFont(bool keepOriginalSize = true);
-
-    // Change background and foreground colour using current background colour
-    // setting (Motif generates foreground based on background)
-    virtual void ChangeBackgroundColour();
-    // Change foreground colour using current foreground colour setting
-    virtual void ChangeForegroundColour();
-
-protected:
-    // Adds the widget to the hash table and adds event handlers.
-    bool AttachWidget(wxWindow* parent, WXWidget mainWidget,
-        WXWidget formWidget, int x, int y, int width, int height);
-    bool DetachWidget(WXWidget widget);
-
-    // How to implement accelerators. If we find a key event, translate to
-    // wxWidgets wxKeyEvent form. Find a widget for the window. Now find a
-    // wxWindow for the widget. If there isn't one, go up the widget hierarchy
-    // trying to find one. Once one is found, call ProcessAccelerator for the
-    // window. If it returns true (processed the event), skip the X event,
-    // otherwise carry on up the wxWidgets window hierarchy calling
-    // ProcessAccelerator. If all return false, process the X event as normal.
-    // Eventually we can implement OnCharHook the same way, but concentrate on
-    // accelerators for now. ProcessAccelerator must look at the current
-    // accelerator table, and try to find what menu id or window (beneath it)
-    // has this ID. Then construct an appropriate command
-    // event and send it.
-public:
-    virtual bool ProcessAccelerator(wxKeyEvent& event);
-
-protected:
-    // unmanage and destroy an X widget f it's !NULL (passing NULL is ok)
-    void UnmanageAndDestroy(WXWidget widget);
-
-    // map or unmap an X widget (passing NULL is ok),
-    // returns true if widget was mapped/unmapped
-    bool MapOrUnmap(WXWidget widget, bool map);
-
-    // scrolling stuff
-    // ---------------
-
-    // create/destroy window scrollbars
-    void CreateScrollbar(wxOrientation orientation);
-    void DestroyScrollbar(wxOrientation orientation);
-
-    // get either hor or vert scrollbar widget
-    WXWidget GetScrollbar(wxOrientation orient) const
-    { return orient == wxHORIZONTAL ? m_hScrollBar : m_vScrollBar; }
-
-    // set the scroll pos
-    void SetInternalScrollPos(wxOrientation orient, int pos)
-    {
-        if ( orient == wxHORIZONTAL )
-            m_scrollPosX = pos;
-        else
-            m_scrollPosY = pos;
-    }
-
-    // Motif-specific flags
-    // --------------------
-
-    bool m_needsRefresh:1;          // repaint backing store?
-
-    // For double-click detection
-    long                  m_lastTS;           // last timestamp
-    unsigned              m_lastButton:2;     // last pressed button
-
-protected:
-    WXWidget              m_mainWidget;
-    WXWidget              m_hScrollBar;
-    WXWidget              m_vScrollBar;
-    WXWidget              m_borderWidget;
-    WXWidget              m_scrolledWindow;
-    WXWidget              m_drawingArea;
-    bool                  m_winCaptured:1;
-    WXPixmap              m_backingPixmap;
-    int                   m_pixmapWidth;
-    int                   m_pixmapHeight;
-    int                   m_pixmapOffsetX;
-    int                   m_pixmapOffsetY;
-
-    // Store the last scroll pos, since in wxWin the pos isn't set
-    // automatically by system
-    int                   m_scrollPosX;
-    int                   m_scrollPosY;
-
-    // implement the base class pure virtuals
-    virtual void DoGetTextExtent(const wxString& string,
-                                 int *x, int *y,
-                                 int *descent = NULL,
-                                 int *externalLeading = NULL,
-                                 const wxFont *font = NULL) const;
-    virtual void DoClientToScreen( int *x, int *y ) const;
-    virtual void DoScreenToClient( int *x, int *y ) const;
-    virtual void DoGetPosition( int *x, int *y ) const;
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual void DoGetClientSize( int *width, int *height ) const;
-    virtual void DoSetSize(int x, int y,
-        int width, int height,
-        int sizeFlags = wxSIZE_AUTO);
-    virtual void DoSetClientSize(int width, int height);
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-    virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
-    virtual void DoCaptureMouse();
-    virtual void DoReleaseMouse();
-
-#if wxUSE_TOOLTIPS
-    virtual void DoSetToolTip( wxToolTip *tip );
-#endif // wxUSE_TOOLTIPS
-
-private:
-    // common part of all ctors
-    void Init();
-
-    DECLARE_DYNAMIC_CLASS(wxWindow)
-    wxDECLARE_NO_COPY_CLASS(wxWindow);
-    DECLARE_EVENT_TABLE()
-};
-
-// ----------------------------------------------------------------------------
-// A little class to switch off `size optimization' while an instance of the
-// object exists: this may be useful to temporarily disable the optimisation
-// which consists to do nothing when the new size is equal to the old size -
-// although quite useful usually to avoid flicker, sometimes it leads to
-// undesired effects.
-//
-// Usage: create an instance of this class on the stack to disable the size
-// optimisation, it will be reenabled as soon as the object goes out
-// from scope.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxNoOptimize
-{
-public:
-    wxNoOptimize() { ms_count++; }
-    ~wxNoOptimize() { ms_count--; }
-
-    static bool CanOptimize() { return ms_count == 0; }
-
-protected:
-    static int ms_count;
-};
-
-#endif // _WX_WINDOW_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/msdos/apptrait.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/msdos/apptrait.h
deleted file mode 100644
index 69216c64aa..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/msdos/apptrait.h
+++ /dev/null
@@ -1,35 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msdos/apptrait.h
-// Author:      Michael Wetherell
-// Copyright:   (c) 2006 Michael Wetherell
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSDOS_APPTRAIT_H_
-#define _WX_MSDOS_APPTRAIT_H_
-
-class wxConsoleAppTraits : public wxConsoleAppTraitsBase
-{
-public:
-    virtual wxEventLoopBase *CreateEventLoop() { return NULL; }
-#if wxUSE_TIMER
-    virtual wxTimerImpl *CreateTimerImpl(wxTimer *) { return NULL; }
-#endif // wxUSE_TIMER
-};
-
-#if wxUSE_GUI
-
-class wxGUIAppTraits : public wxGUIAppTraitsBase
-{
-public:
-    virtual wxEventLoopBase *CreateEventLoop();
-    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
-
-#if wxUSE_TIMER
-    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
-#endif // wxUSE_TIMER
-};
-
-#endif // wxUSE_GUI
-
-#endif // _WX_MSDOS_APPTRAIT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/msdos/mimetype.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/msdos/mimetype.h
deleted file mode 100644
index 2404304704..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/msdos/mimetype.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msdos/mimetype.h
-// Purpose:     classes and functions to manage MIME types
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     23.09.98
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MIMETYPE_IMPL_H
-#define _MIMETYPE_IMPL_H
-
-#include "wx/defs.h"
-#include "wx/mimetype.h"
-
-
-class wxMimeTypesManagerImpl
-{
-public :
-    wxMimeTypesManagerImpl() { }
-
-    // load all data into memory - done when it is needed for the first time
-    void Initialize(int mailcapStyles = wxMAILCAP_STANDARD,
-                    const wxString& extraDir = wxEmptyString);
-
-    // and delete the data here
-    void ClearData();
-
-    // implement containing class functions
-    wxFileType *GetFileTypeFromExtension(const wxString& ext);
-    wxFileType *GetOrAllocateFileTypeFromExtension(const wxString& ext) ;
-    wxFileType *GetFileTypeFromMimeType(const wxString& mimeType);
-
-    size_t EnumAllFileTypes(wxArrayString& mimetypes);
-
-    void AddFallback(const wxFileTypeInfo& ft) { m_fallbacks.Add(ft); }
-
-    // create a new filetype association
-    wxFileType *Associate(const wxFileTypeInfo& ftInfo);
-    // remove association
-    bool Unassociate(wxFileType *ft);
-
-    // create a new filetype with the given name and extension
-    wxFileType *CreateFileType(const wxString& filetype, const wxString& ext);
-
-private:
-    wxArrayFileTypeInfo m_fallbacks;
-};
-
-class wxFileTypeImpl
-{
-public:
-    // initialization functions
-    // this is used to construct a list of mimetypes which match;
-    // if built with GetFileTypeFromMimetype index 0 has the exact match and
-    // index 1 the type / * match
-    // if built with GetFileTypeFromExtension, index 0 has the mimetype for
-    // the first extension found, index 1 for the second and so on
-
-    void Init(wxMimeTypesManagerImpl *manager, size_t index)
-    { m_manager = manager; m_index.Add(index); }
-
-    // initialize us with our file type name
-    void SetFileType(const wxString& strFileType)
-        { m_strFileType = strFileType; }
-    void SetExt(const wxString& ext)
-        { m_ext = ext; }
-
-    // implement accessor functions
-    bool GetExtensions(wxArrayString& extensions);
-    bool GetMimeType(wxString *mimeType) const;
-    bool GetMimeTypes(wxArrayString& mimeTypes) const;
-    bool GetIcon(wxIconLocation *iconLoc) const;
-    bool GetDescription(wxString *desc) const;
-    bool GetOpenCommand(wxString *openCmd,
-                        const wxFileType::MessageParameters&) const
-        { return GetCommand(openCmd, "open"); }
-    bool GetPrintCommand(wxString *printCmd,
-                         const wxFileType::MessageParameters&) const
-        { return GetCommand(printCmd, "print"); }
-
-    size_t GetAllCommands(wxArrayString * verbs, wxArrayString * commands,
-                          const wxFileType::MessageParameters& params) const;
-
-    // remove the record for this file type
-    // probably a mistake to come here, use wxMimeTypesManager.Unassociate (ft) instead
-    bool Unassociate(wxFileType *ft)
-    {
-        return m_manager->Unassociate(ft);
-    }
-
-    // set an arbitrary command, ask confirmation if it already exists and
-    // overwriteprompt is TRUE
-    bool SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt = TRUE);
-    bool SetDefaultIcon(const wxString& strIcon = wxEmptyString, int index = 0);
-
- private:
-    // helper function
-    bool GetCommand(wxString *command, const char *verb) const;
-
-    wxMimeTypesManagerImpl *m_manager;
-    wxArrayInt              m_index; // in the wxMimeTypesManagerImpl arrays
-    wxString m_strFileType, m_ext;
-};
-
-#endif
-  //_MIMETYPE_H
-
-/* vi: set cin tw=80 ts=4 sw=4: */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/msw/rcdefs.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/msw/rcdefs.h
deleted file mode 100644
index 8b9ac716f9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/msw/rcdefs.h
+++ /dev/null
@@ -1,41 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/msw/rcdefs.h
-// Purpose:     Fallback for the generated rcdefs.h under the lib directory
-// Author:      Mike Wetherell
-// Copyright:   (c) 2005 Mike Wetherell
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RCDEFS_H
-#define _WX_RCDEFS_H
-
-#ifdef __GNUC__
-    // We must be using windres which uses gcc as its preprocessor. We do need
-    // to generate the manifest then as gcc doesn't do it automatically and we
-    // can define the architecture macro on our own as all the usual symbols
-    // are available (unlike with Microsoft RC.EXE which doesn't predefine
-    // anything useful at all).
-    #ifndef wxUSE_RC_MANIFEST
-        #define wxUSE_RC_MANIFEST 1
-    #endif
-
-    #if defined __i386__
-        #ifndef WX_CPU_X86
-            #define WX_CPU_X86
-        #endif
-    #elif defined __x86_64__
-        #ifndef WX_CPU_AMD64
-            #define WX_CPU_AMD64
-        #endif
-    #elif defined __ia64__
-        #ifndef WX_CPU_IA64
-            #define WX_CPU_IA64
-        #endif
-    #endif
-#endif
-
-// Don't do anything here for the other compilers, in particular don't define
-// WX_CPU_X86 here as we used to do. If people define wxUSE_RC_MANIFEST, they
-// must also define the architecture constant correctly.
-
-#endif
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/accel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/accel.h
deleted file mode 100644
index 0b9bde6dcc..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/accel.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/accel.h
-// Purpose:     wxAcceleratorTable class
-// Author:      David Webster
-// Modified by:
-// Created:     10/13/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_ACCEL_H_
-#define _WX_ACCEL_H_
-
-#include "wx/object.h"
-
-class WXDLLIMPEXP_FWD_CORE wxAcceleratorTable;
-
-// Hold Ctrl key down
-#define wxACCEL_ALT     0x01
-
-// Hold Ctrl key down
-#define wxACCEL_CTRL    0x02
-
- // Hold Shift key down
-#define wxACCEL_SHIFT   0x04
-
- // Hold no key down
-#define wxACCEL_NORMAL  0x00
-
-class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject
-{
-DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
-public:
-    wxAcceleratorTable();
-    wxAcceleratorTable(const wxString& rsResource); // Load from .rc resource
-    wxAcceleratorTable( int                n
-                       ,const wxAcceleratorEntry vaEntries[]
-                      ); // Load from array
-
-    virtual ~wxAcceleratorTable();
-
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const;
-    void SetHACCEL(WXHACCEL hAccel);
-    WXHACCEL GetHACCEL(void) const;
-
-    // translate the accelerator, return TRUE if done
-    bool Translate( WXHWND hWnd
-                   ,WXMSG* pMsg
-                  ) const;
-};
-
-WXDLLIMPEXP_DATA_CORE(extern wxAcceleratorTable) wxNullAcceleratorTable;
-
-WXDLLIMPEXP_CORE wxString wxPMTextToLabel(const wxString& rsTitle);
-#endif
-    // _WX_ACCEL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/app.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/app.h
deleted file mode 100644
index 984783963d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/app.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/app.h
-// Purpose:     wxApp class
-// Author:      David Webster
-// Modified by:
-// Created:     10/13/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_APP_H_
-#define _WX_APP_H_
-
-#ifdef __WATCOMC__
-
-#include <types.h>
-#include <sys/ioctl.h>
-#include <sys/select.h>
-
-#else
-
-#include <sys/time.h>
-#include <sys/types.h>
-
-#ifdef __EMX__
-#include <unistd.h>
-#else
-#include <utils.h>
-#undef BYTE_ORDER
-#include <types.h>
-#define INCL_ORDERS
-#endif
-
-#endif
-
-#include "wx/event.h"
-#include "wx/icon.h"
-
-class WXDLLIMPEXP_FWD_CORE wxFrame;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLIMPEXP_FWD_CORE wxApp;
-class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
-class WXDLLIMPEXP_FWD_BASE wxLog;
-
-WXDLLIMPEXP_DATA_CORE(extern wxApp*) wxTheApp;
-WXDLLIMPEXP_DATA_CORE(extern HAB)    vHabmain;
-
-// Force an exit from main loop
-void WXDLLIMPEXP_CORE wxExit(void);
-
-// Yield to other apps/messages
-bool WXDLLIMPEXP_CORE wxYield(void);
-
-extern MRESULT EXPENTRY wxWndProc( HWND
-                                  ,ULONG
-                                  ,MPARAM
-                                  ,MPARAM
-                                 );
-
-
-// Represents the application. Derive OnInit and declare
-// a new App object to start application
-class WXDLLIMPEXP_CORE wxApp : public wxAppBase
-{
-    DECLARE_DYNAMIC_CLASS(wxApp)
-
-public:
-    wxApp();
-    virtual ~wxApp();
-
-    // override base class (pure) virtuals
-    virtual bool Initialize(int& argc, wxChar **argv);
-    virtual void CleanUp(void);
-
-    virtual bool OnInitGui(void);
-
-    virtual void WakeUpIdle(void);
-
-    virtual void SetPrintMode(int mode) { m_nPrintMode = mode; }
-    virtual int  GetPrintMode(void) const { return m_nPrintMode; }
-
-    // implementation only
-    void OnIdle(wxIdleEvent& rEvent);
-    void OnEndSession(wxCloseEvent& rEvent);
-    void OnQueryEndSession(wxCloseEvent& rEvent);
-
-    int AddSocketHandler(int handle, int mask,
-                         void (*callback)(void*), void * gsock);
-    void RemoveSocketHandler(int handle);
-    void HandleSockets();
-
-protected:
-    bool                            m_bShowOnInit;
-    int                             m_nPrintMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
-
-    //
-    // PM-specific wxApp definitions */
-    //
-private:
-    int                             m_maxSocketHandles;
-    int                             m_maxSocketNr;
-    int                             m_lastUsedHandle;
-    fd_set                          m_readfds;
-    fd_set                          m_writefds;
-    void*                           m_sockCallbackInfo;
-
-public:
-
-    // Implementation
-    static bool  RegisterWindowClasses(HAB vHab);
-
-public:
-    int                             m_nCmdShow;
-    HMQ                             m_hMq;
-
-protected:
-    DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxApp);
-};
-#endif
-    // _WX_APP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/apptbase.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/apptbase.h
deleted file mode 100644
index d4476b649a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/apptbase.h
+++ /dev/null
@@ -1,35 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/apptbase.h
-// Purpose:     declaration of wxAppTraits for OS2
-// Author:      Stefan Neis
-// Modified by:
-// Created:     22.09.2003
-// Copyright:   (c) 2003 Stefan Neis <Stefan.Neis@t-online.de>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OS2_APPTBASE_H_
-#define _WX_OS2_APPTBASE_H_
-
-// ----------------------------------------------------------------------------
-// wxAppTraits: the OS2 version adds extra hooks needed by OS2-only code
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
-{
-public:
-    // wxThread helpers
-    // ----------------
-
-    // Initialize PM facilities to enable GUI access
-    virtual void InitializeGui(unsigned long &ulHab);
-
-    // Clean up message queue.
-    virtual void TerminateGui(unsigned long ulHab);
-
-#if wxUSE_SOCKETS
-    virtual wxFDIOManager *GetFDIOManager();
-#endif
-};
-
-#endif // _WX_OS2_APPTBASE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/apptrait.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/apptrait.h
deleted file mode 100644
index d9d1cd8aed..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/apptrait.h
+++ /dev/null
@@ -1,68 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/apptrait.h
-// Purpose:     class implementing wxAppTraits for OS/2
-// Author:      Stefan Neis
-// Modified by:
-// Created:     22.09.2003
-// Copyright:   (c) 2003 Stefan Neis <Stefan.Neis@t-online.de>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OS2_APPTRAIT_H_
-#define _WX_OS2_APPTRAIT_H_
-
-// ----------------------------------------------------------------------------
-// wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
-{
-public:
-#if wxUSE_CONSOLE_EVENTLOOP
-    virtual wxEventLoopBase *CreateEventLoop();
-#endif // wxUSE_CONSOLE_EVENTLOOP
-#if wxUSE_TIMER
-    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
-#endif
-};
-
-#if wxUSE_GUI
-
-class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
-{
-public:
-    virtual wxEventLoopBase *CreateEventLoop();
-#if wxUSE_TIMER
-    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
-#endif
-    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
-
-    // wxThread helpers
-    // ----------------
-
-    // Initialize PM facilities to enable GUI access
-    virtual void InitializeGui(unsigned long &ulHab);
-
-    // Clean up message queue.
-    virtual void TerminateGui(unsigned long ulHab);
-#ifdef __WXGTK__
-    virtual wxString GetDesktopEnvironment() const;
-#endif
-#if wxUSE_SOCKETS
-    virtual wxFDIOManager *GetFDIOManager();
-#endif
-};
-
-#ifndef __WXPM__
-inline void wxGUIAppTraits::InitializeGui(unsigned long &WXUNUSED(ulHab))
-{
-}
-
-inline void wxGUIAppTraits::TerminateGui(unsigned long WXUNUSED(ulHab))
-{
-}
-#endif
-
-#endif // wxUSE_GUI
-
-#endif // _WX_OS2_APPTRAIT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/bitmap.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/bitmap.h
deleted file mode 100644
index b4c1642395..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/bitmap.h
+++ /dev/null
@@ -1,374 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/bitmap.h
-// Purpose:     wxBitmap class
-// Author:      David Webster
-// Modified by:
-// Created:     11/28/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BITMAP_H_
-#define _WX_BITMAP_H_
-
-#include "wx/os2/private.h"
-#include "wx/os2/gdiimage.h"
-#include "wx/gdicmn.h"
-#include "wx/palette.h"
-
-class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLIMPEXP_FWD_CORE wxControl;
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
-class WXDLLIMPEXP_FWD_CORE wxIcon;
-class WXDLLIMPEXP_FWD_CORE wxMask;
-class WXDLLIMPEXP_FWD_CORE wxCursor;
-class WXDLLIMPEXP_FWD_CORE wxControl;
-class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
-
-// ----------------------------------------------------------------------------
-// Bitmap data
-//
-// NB: this class is private, but declared here to make it possible inline
-//     wxBitmap functions accessing it
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBitmapRefData : public wxGDIImageRefData
-{
-public:
-    wxBitmapRefData();
-    wxBitmapRefData(const wxBitmapRefData &tocopy);
-    virtual ~wxBitmapRefData() { Free(); }
-
-    virtual void Free();
-
-public:
-    int                             m_nNumColors;
-    wxPalette                       m_vBitmapPalette;
-    int                             m_nQuality;
-
-    // OS2-specific
-    // ------------
-
-    wxDC*                           m_pSelectedInto;
-
-    //
-    // Optional mask for transparent drawing
-    //
-    wxMask*                         m_pBitmapMask;
-}; // end of CLASS wxBitmapRefData
-
-// ----------------------------------------------------------------------------
-// wxBitmap: a mono or colour bitmap
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBitmap : public wxGDIImage,
-                                  public wxBitmapHelpers
-{
-public:
-    // default ctor creates an invalid bitmap, you must Create() it later
-    wxBitmap() { Init(); }
-
-    // Copy constructors
-    inline wxBitmap(const wxBitmap& rBitmap)
-        : wxGDIImage(rBitmap)
-    {
-        Init();
-        SetHandle(rBitmap.GetHandle());
-    }
-
-    // Initialize with raw data
-    wxBitmap( const char bits[]
-             ,int        nWidth
-             ,int        nHeight
-             ,int        nDepth = 1
-            );
-
-    // Initialize with XPM data
-    wxBitmap(const char* const* bits);
-#ifdef wxNEEDS_CHARPP
-    // needed for old GCC
-    wxBitmap(char** data)
-    {
-        *this = wxBitmap(const_cast<const char* const*>(data));
-    }
-#endif
-
-    // Load a resource
-    wxBitmap( int             nId
-             ,wxBitmapType    lType = wxBITMAP_DEFAULT_TYPE
-            );
-
-    // For compatiability with other ports, under OS/2 does same as default ctor
-    inline wxBitmap( const wxString& WXUNUSED(rFilename)
-                    ,wxBitmapType    WXUNUSED(lType)
-                   )
-    { Init(); }
-    // New constructor for generalised creation from data
-    wxBitmap( const void* pData
-             ,wxBitmapType lType
-             ,int   nWidth
-             ,int   nHeight
-             ,int   nDepth = 1
-            );
-
-    // If depth is omitted, will create a bitmap compatible with the display
-    wxBitmap( int nWidth, int nHeight, int nDepth = -1 )
-    {
-        Init();
-        (void)Create(nWidth, nHeight, nDepth);
-    }
-    wxBitmap( const wxSize& sz, int nDepth = -1 )
-    {
-        Init();
-        (void)Create(sz, nDepth);
-    }
-
-    wxBitmap( const wxImage& image, int depth = -1 )
-                         { (void)CreateFromImage(image, depth); }
-
-    // we must have this, otherwise icons are silently copied into bitmaps using
-    // the copy ctor but the resulting bitmap is invalid!
-    inline wxBitmap(const wxIcon& rIcon)
-      { Init(); CopyFromIcon(rIcon); }
-
-    wxBitmap& operator=(const wxIcon& rIcon)
-    {
-        (void)CopyFromIcon(rIcon);
-
-        return(*this);
-    }
-
-    wxBitmap& operator=(const wxCursor& rCursor)
-    {
-        (void)CopyFromCursor(rCursor);
-        return (*this);
-    }
-
-    virtual ~wxBitmap();
-
-    wxImage ConvertToImage() const;
-    wxBitmap ConvertToDisabled(unsigned char brightness = 255) const;
-
-    // get the given part of bitmap
-    wxBitmap GetSubBitmap(const wxRect& rRect) const;
-
-    // copies the contents and mask of the given (colour) icon to the bitmap
-    bool CopyFromIcon(const wxIcon& rIcon);
-
-    // copies the contents and mask of the given cursor to the bitmap
-    bool CopyFromCursor(const wxCursor& rCursor);
-
-    virtual bool Create( int nWidth
-                        ,int nHeight
-                        ,int nDepth = wxBITMAP_SCREEN_DEPTH
-                       );
-    virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
-        { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
-    virtual bool Create(int width, int height, const wxDC& WXUNUSED(dc))
-        { return Create(width,height); }
-
-    virtual bool Create( const void* pData
-                        ,wxBitmapType lType
-                        ,int   nWidth
-                        ,int   nHeight
-                        ,int   nDepth = 1
-                       );
-    virtual bool LoadFile( int             nId
-                          ,wxBitmapType    lType = wxBITMAP_DEFAULT_TYPE
-                         );
-    virtual bool LoadFile( const wxString& rName
-                          ,wxBitmapType    lType = wxBITMAP_DEFAULT_TYPE
-                         );
-    virtual bool SaveFile( const wxString&  rName
-                          ,wxBitmapType     lType
-                          ,const wxPalette* pCmap = NULL
-                         );
-
-    inline wxBitmapRefData* GetBitmapData() const
-      { return (wxBitmapRefData *)m_refData; }
-
-    // raw bitmap access support functions
-    void *GetRawData(wxPixelDataBase& data, int bpp);
-    void UngetRawData(wxPixelDataBase& data);
-
-    inline int GetQuality() const
-      { return (GetBitmapData() ? GetBitmapData()->m_nQuality : 0); }
-
-    void SetQuality(int nQ);
-
-    wxPalette* GetPalette() const
-      { return (GetBitmapData() ? (& GetBitmapData()->m_vBitmapPalette) : NULL); }
-
-    void       SetPalette(const wxPalette& rPalette);
-
-    inline wxMask* GetMask() const
-      { return (GetBitmapData() ? GetBitmapData()->m_pBitmapMask : NULL); }
-
-    void SetMask(wxMask* pMask) ;
-
-    // Implementation
-public:
-    inline void SetHBITMAP(WXHBITMAP hBmp)
-      { SetHandle((WXHANDLE)hBmp); }
-
-    inline WXHBITMAP GetHBITMAP() const
-      { return (WXHBITMAP)GetHandle(); }
-
-    inline void  SetSelectedInto(wxDC* pDc)
-      { if (GetBitmapData()) GetBitmapData()->m_pSelectedInto = pDc; }
-
-    inline wxDC* GetSelectedInto() const
-      { return (GetBitmapData() ? GetBitmapData()->m_pSelectedInto : NULL); }
-
-    inline bool IsMono(void) const { return m_bIsMono; }
-
-    // An OS/2 version that probably doesn't do anything like the msw version
-    wxBitmap GetBitmapForDC(wxDC& rDc) const;
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    inline virtual wxGDIImageRefData* CreateData() const
-        { return new wxBitmapRefData; }
-
-    bool CreateFromImage(const wxImage& image, int depth);
-
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-private:
-    bool CopyFromIconOrCursor(const wxGDIImage& rIcon);
-
-    bool                            m_bIsMono;
-    DECLARE_DYNAMIC_CLASS(wxBitmap)
-}; // end of CLASS wxBitmap
-
-// ----------------------------------------------------------------------------
-// wxMask: a mono bitmap used for drawing bitmaps transparently.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMask : public wxObject
-{
-public:
-    wxMask();
-    wxMask( const wxMask& tocopy);
-
-    // Construct a mask from a bitmap and a colour indicating the transparent
-    // area
-    wxMask( const wxBitmap& rBitmap
-           ,const wxColour& rColour
-          );
-
-    // Construct a mask from a bitmap and a palette index indicating the
-    // transparent area
-    wxMask( const wxBitmap& rBitmap
-           ,int             nPaletteIndex
-          );
-
-    // Construct a mask from a mono bitmap (copies the bitmap).
-    wxMask(const wxBitmap& rBitmap);
-
-    // construct a mask from the givne bitmap handle
-    wxMask(WXHBITMAP hBmp)
-      { m_hMaskBitmap = hBmp; }
-
-    virtual ~wxMask();
-
-    bool Create( const wxBitmap& bitmap
-                ,const wxColour& rColour
-               );
-    bool Create( const wxBitmap& rBitmap
-                ,int             nPaletteIndex
-               );
-    bool Create(const wxBitmap& rBitmap);
-
-    // Implementation
-    WXHBITMAP GetMaskBitmap() const
-      { return m_hMaskBitmap; }
-    void SetMaskBitmap(WXHBITMAP hBmp)
-      { m_hMaskBitmap = hBmp; }
-
-protected:
-    WXHBITMAP                       m_hMaskBitmap;
-    DECLARE_DYNAMIC_CLASS(wxMask)
-}; // end of CLASS wxMask
-
-// ----------------------------------------------------------------------------
-// wxBitmapHandler is a class which knows how to load/save bitmaps to/from file
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBitmapHandler : public wxGDIImageHandler
-{
-public:
-    inline wxBitmapHandler()
-      { m_lType = wxBITMAP_TYPE_INVALID; }
-
-    inline wxBitmapHandler( const wxString& rName
-                    ,const wxString& rExt
-                    ,wxBitmapType lType
-                   )
-                   : wxGDIImageHandler( rName
-                                       ,rExt
-                                       ,lType)
-    {
-    }
-
-    // keep wxBitmapHandler derived from wxGDIImageHandler compatible with the
-    // old class which worked only with bitmaps
-    virtual bool Create( wxBitmap* pBitmap
-                        ,const void* pData
-                        ,wxBitmapType lType
-                        ,int       nWidth
-                        ,int       nHeight
-                        ,int       nDepth = 1
-                       );
-    virtual bool LoadFile( wxBitmap*       pBitmap
-                          ,int             nId
-                          ,wxBitmapType    lType
-                          ,int             nDesiredWidth
-                          ,int             nDesiredHeight
-                         );
-    virtual bool LoadFile( wxBitmap*       pBitmap
-                          ,const wxString& rName
-                          ,wxBitmapType    lType
-                          ,int             nDesiredWidth
-                          ,int             nDesiredHeight
-                         );
-    virtual bool SaveFile( wxBitmap*        pBitmap
-                          ,const wxString&  rName
-                          ,wxBitmapType     lType
-                          ,const wxPalette* pPalette = NULL
-                         ) const;
-
-    virtual bool Create( wxGDIImage* pImage
-                        ,const void* pData
-                        ,wxBitmapType lFlags
-                        ,int         nWidth
-                        ,int         nHeight
-                        ,int         nDepth = 1
-                       );
-    virtual bool Load( wxGDIImage*     pImage
-                      ,int             nId
-                      ,wxBitmapType    lFlags
-                      ,int             nDesiredWidth
-                      ,int             nDesiredHeight
-                     );
-    virtual bool Save( const wxGDIImage* pImage
-                      ,const wxString&   rName
-                      ,wxBitmapType      lType
-                     ) const;
-private:
-    inline virtual bool Load( wxGDIImage*     WXUNUSED(pImage)
-                             ,const wxString& WXUNUSED(rName)
-                             ,WXHANDLE        WXUNUSED(hPs)
-                             ,wxBitmapType    WXUNUSED(lFlags)
-                             ,int             WXUNUSED(nDesiredWidth)
-                             ,int             WXUNUSED(nDesiredHeight)
-                            )
-    { return false; }
-    DECLARE_DYNAMIC_CLASS(wxBitmapHandler)
-}; // end of CLASS wxBitmapHandler
-
-#endif
-  // _WX_BITMAP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/blank.ptr b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/blank.ptr
deleted file mode 100644
index bc209be62b..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/blank.ptr and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/bmpbuttn.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/bmpbuttn.h
deleted file mode 100644
index 1b7c5ab278..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/bmpbuttn.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/bmpbuttn.h
-// Purpose:     wxBitmapButton class
-// Author:      David Webster
-// Modified by:
-// Created:     10/13/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BMPBUTTN_H_
-#define _WX_BMPBUTTN_H_
-
-#include "wx/button.h"
-#include "wx/dcclient.h"
-
-WXDLLIMPEXP_DATA_CORE(extern const char) wxButtonNameStr[];
-
-#define wxDEFAULT_BUTTON_MARGIN 4
-
-class WXDLLIMPEXP_CORE wxBitmapButton: public wxBitmapButtonBase
-{
-public:
-    inline wxBitmapButton()
-    {
-        m_marginX = wxDEFAULT_BUTTON_MARGIN;
-        m_marginY = wxDEFAULT_BUTTON_MARGIN;
-    }
-    inline wxBitmapButton( wxWindow*          pParent
-                          ,wxWindowID         vId
-                          ,const wxBitmap&    rBitmap
-                          ,const wxPoint&     rPos = wxDefaultPosition
-                          ,const wxSize&      rSize = wxDefaultSize
-                          ,long               lStyle = wxBU_AUTODRAW
-                          ,const wxValidator& rValidator = wxDefaultValidator
-                          ,const wxString&    rsName = wxButtonNameStr
-                         )
-    {
-        Create( pParent
-               ,vId
-               ,rBitmap
-               ,rPos
-               ,rSize
-               ,lStyle
-               ,rValidator
-               ,rsName
-              );
-    }
-
-    bool Create( wxWindow*          pParent
-                ,wxWindowID         vId
-                ,const wxBitmap&    rBitmap
-                ,const wxPoint&     rPos = wxDefaultPosition
-                ,const wxSize&      rSize = wxDefaultSize
-                ,long               lStyle = wxBU_AUTODRAW
-                ,const wxValidator& rValidator = wxDefaultValidator
-                ,const wxString&    rsName = wxButtonNameStr
-               );
-
-    virtual void SetLabel(const wxBitmap& rBitmap)
-    {
-        SetBitmapLabel(rBitmap);
-    }
-
-    //
-    // Implementation
-    //
-    virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* pItem);
-
-private:
-
-    virtual void DrawFace( wxClientDC& rDC
-                          ,bool        bSel
-                         );
-    virtual void DrawButtonFocus(wxClientDC& rDC);
-    virtual void DrawButtonDisable( wxClientDC& rDC
-                                   ,wxBitmap&   rBmp
-                                  );
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
-
-    virtual void SetLabel(const wxString& rsString)
-    {
-        wxButton::SetLabel(rsString);
-    }
-}; // end of CLASS wxBitmapButton
-
-#endif // _WX_BMPBUTTN_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/brush.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/brush.h
deleted file mode 100644
index a94d111289..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/brush.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/brush.h
-// Purpose:     wxBrush class
-// Author:      David Webster
-// Modified by:
-// Created:     10/13/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BRUSH_H_
-#define _WX_BRUSH_H_
-
-#include "wx/bitmap.h"
-
-// Brush
-class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
-{
-public:
-    wxBrush();
-    wxBrush(const wxColour& rCol, wxBrushStyle nStyle = wxBRUSHSTYLE_SOLID);
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
-#endif
-    wxBrush(const wxBitmap& rStipple);
-    virtual ~wxBrush();
-
-    bool operator == (const wxBrush& rBrush) const;
-    inline bool operator != (const wxBrush& rBrush) const { return !(*this == rBrush); }
-
-    virtual void SetColour(const wxColour& rColour);
-    virtual void SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBrush);
-    virtual void SetPS(HPS hPS);
-    virtual void SetStyle(wxBrushStyle nStyle);
-    virtual void SetStipple(const wxBitmap& rStipple);
-
-    wxColour GetColour(void) const;
-    wxBrushStyle GetStyle(void) const;
-    wxBitmap* GetStipple(void) const;
-    int       GetPS(void) const;
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
-        { SetStyle((wxBrushStyle)style); }
-#endif
-
-    //
-    // Implementation
-    //
-
-    //
-    // Useful helper: create the brush resource
-    //
-    bool     RealizeResource(void);
-    virtual WXHANDLE GetResourceHandle(void) const;
-    bool     FreeResource(bool bForce = false);
-    bool     IsFree(void) const;
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxBrush)
-}; // end of CLASS wxBrush
-
-#endif
-    // _WX_BRUSH_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/bullseye.ptr b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/bullseye.ptr
deleted file mode 100644
index ce684b465b..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/bullseye.ptr and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/button.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/button.h
deleted file mode 100644
index 134c4ce017..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/button.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/button.h
-// Purpose:     wxButton class
-// Author:      David Webster
-// Modified by:
-// Created:     10/13/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BUTTON_H_
-#define _WX_BUTTON_H_
-
-#include "wx/control.h"
-
-// Pushbutton
-class WXDLLIMPEXP_CORE wxButton: public wxButtonBase
-{
-public:
-    inline wxButton() {}
-    inline wxButton( wxWindow*          pParent
-                    ,wxWindowID         vId
-                    ,const wxString&    rsLabel = wxEmptyString
-                    ,const wxPoint&     rPos = wxDefaultPosition
-                    ,const wxSize&      rSize = wxDefaultSize
-                    ,long               lStyle = 0
-                    ,const wxValidator& rValidator = wxDefaultValidator
-                    ,const wxString&    rsName = wxButtonNameStr
-                   )
-    {
-        Create( pParent
-               ,vId
-               ,rsLabel
-               ,rPos
-               ,rSize
-               ,lStyle
-               ,rValidator
-               ,rsName
-              );
-    }
-
-    bool Create( wxWindow*          pParent
-                ,wxWindowID         vId
-                ,const wxString&    rsLabel = wxEmptyString
-                ,const wxPoint&     rPos = wxDefaultPosition
-                ,const wxSize&      rSize = wxDefaultSize
-                ,long               lStyle = 0
-                ,const wxValidator& rValidator = wxDefaultValidator
-                ,const wxString&    rsName = wxButtonNameStr
-               );
-
-    virtual ~wxButton();
-
-    virtual wxWindow *SetDefault();
-
-    static wxSize    GetDefaultSize(void);
-    virtual void     Command(wxCommandEvent& rEvent);
-    virtual bool     OS2Command( WXUINT uParam
-                                ,WXWORD vId
-                               );
-    virtual WXHBRUSH OnCtlColor( WXHDC    hDC
-                                ,WXHWND   hWnd
-                                ,WXUINT   uCtlColor
-                                ,WXUINT   uMessage
-                                ,WXWPARAM wParam
-                                ,WXLPARAM lParam
-                               );
-    void          MakeOwnerDrawn(void);
-
-    virtual MRESULT WindowProc( WXUINT   uMsg
-                               ,WXWPARAM wParam
-                               ,WXLPARAM lParam
-                              );
-
-protected:
-
-    bool            SendClickEvent(void);
-    void            SetTmpDefault(void);
-    void            UnsetTmpDefault(void);
-
-    static void     SetDefaultStyle( wxButton* pButton
-                                    ,bool      bOn
-                                   );
-
-    virtual wxSize  DoGetBestSize(void) const;
-    virtual WXDWORD OS2GetStyle( long     style
-                                ,WXDWORD* exstyle
-                               ) const;
-private:
-  DECLARE_DYNAMIC_CLASS(wxButton)
-}; // end of CLASS wxButton
-
-#endif
-    // _WX_BUTTON_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/cdrom.ico b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/cdrom.ico
deleted file mode 100644
index e9e2364af1..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/cdrom.ico and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/checkbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/checkbox.h
deleted file mode 100644
index 6514fdd2d5..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/checkbox.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/checkbox.h
-// Purpose:     wxCheckBox class
-// Author:      David Webster
-// Modified by:
-// Created:     10/13/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CHECKBOX_H_
-#define _WX_CHECKBOX_H_
-
-#include "wx/control.h"
-
-// Checkbox item (single checkbox)
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase
-{
- public:
-    inline wxCheckBox() { }
-    inline wxCheckBox( wxWindow*          pParent
-                      ,wxWindowID         vId
-                      ,const wxString&    rsLabel
-                      ,const wxPoint&     rPos = wxDefaultPosition
-                      ,const wxSize&      rSize = wxDefaultSize
-                      ,long lStyle = 0
-                      ,const wxValidator& rValidator = wxDefaultValidator
-                      ,const wxString&    rsName = wxCheckBoxNameStr
-                     )
-    {
-        Create( pParent
-               ,vId
-               ,rsLabel
-               ,rPos
-               ,rSize
-               ,lStyle
-               ,rValidator
-               ,rsName
-              );
-    }
-
-    bool Create( wxWindow* pParent
-                ,wxWindowID         vId
-                ,const wxString&    rsLabel
-                ,const wxPoint&     rPos = wxDefaultPosition
-                ,const wxSize&      rSize = wxDefaultSize
-                ,long lStyle = 0
-                ,const wxValidator& rValidator = wxDefaultValidator
-                ,const wxString&    rsName = wxCheckBoxNameStr
-               );
-
-  virtual void SetValue(bool bValue);
-  virtual bool GetValue(void) const ;
-
-  virtual bool OS2Command( WXUINT uParam
-                          ,WXWORD wId
-                         );
-  virtual void SetLabel(const wxString& rsLabel);
-  virtual void Command(wxCommandEvent& rEvent);
-
-protected:
-  virtual wxSize DoGetBestSize(void) const;
-private:
-  DECLARE_DYNAMIC_CLASS(wxCheckBox)
-};
-
-class WXDLLIMPEXP_CORE wxBitmapCheckBox: public wxCheckBox
-{
- public:
-
-    inline wxBitmapCheckBox() { m_nCheckWidth = -1; m_nCheckHeight = -1; }
-    inline wxBitmapCheckBox( wxWindow*          pParent
-                            ,wxWindowID         vId
-                            ,const wxBitmap*    pLabel
-                            ,const wxPoint&     rPos = wxDefaultPosition
-                            ,const wxSize&      rSize = wxDefaultSize
-                            ,long               lStyle = 0
-                            ,const wxValidator& rValidator = wxDefaultValidator
-                            ,const wxString&    rsName = wxCheckBoxNameStr
-                           )
-    {
-        Create( pParent
-               ,vId
-               ,pLabel
-               ,rPos
-               ,rSize
-               ,lStyle
-               ,rValidator
-               ,rsName
-              );
-    }
-
-    bool Create( wxWindow*          pParent
-                ,wxWindowID         vId
-                ,const wxBitmap*    pLabel
-                ,const wxPoint&     rPos = wxDefaultPosition
-                ,const wxSize&      rSize = wxDefaultSize
-                ,long               lStyle = 0
-                ,const wxValidator& rValidator = wxDefaultValidator
-                ,const wxString&    rsName = wxCheckBoxNameStr
-               );
-
-    virtual void SetLabel(const wxBitmap& rBitmap);
-
-    int                             m_nCheckWidth;
-    int                             m_nCheckHeight;
-
-private:
-
-    virtual void SetLabel(const wxString& rsString)
-    { wxCheckBox::SetLabel(rsString); }
-    DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox)
-};
-#endif
-    // _WX_CHECKBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/checklst.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/checklst.h
deleted file mode 100644
index 04e5249509..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/checklst.h
+++ /dev/null
@@ -1,88 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/checklst.h
-// Purpose:     wxCheckListBox class - a listbox with checkable items
-//              Note: this is an optional class.
-// Author:      David Webster
-// Modified by:
-// Created:     10/13/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CHECKLST_H_
-#define _WX_CHECKLST_H_
-
-#include <stddef.h>
-
-#include "wx/defs.h"
-
-class wxOwnerDrawn; // so the compiler knows, it is a class.
-
-class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase
-{
-public:
-    //
-    // Ctors
-    //
-    wxCheckListBox();
-    wxCheckListBox( wxWindow*          pParent
-                   ,wxWindowID         vId
-                   ,const wxPoint&     rPos = wxDefaultPosition
-                   ,const wxSize&      vSize = wxDefaultSize
-                   ,int                nStrings = 0
-                   ,const wxString     asChoices[] = NULL
-                   ,long               lStyle = 0
-                   ,const wxValidator& rValidator = wxDefaultValidator
-                   ,const wxString&    rsName = wxListBoxNameStr
-                  );
-    wxCheckListBox( wxWindow*            pParent
-                   ,wxWindowID           vId
-                   ,const wxPoint&       rPos
-                   ,const wxSize&        vSize
-                   ,const wxArrayString& asChoices
-                   ,long                 lStyle = 0
-                   ,const wxValidator&   rValidator = wxDefaultValidator
-                   ,const wxString&      rsName = wxListBoxNameStr
-                  );
-
-    //
-    // Override base class virtuals
-    //
-    virtual void Delete(unsigned int n);
-
-    virtual bool SetFont(const wxFont &rFont);
-
-    //
-    // Items may be checked
-    //
-    bool IsChecked(unsigned int uiIndex) const;
-    void Check(unsigned int uiIndex, bool bCheck = true);
-
-    //
-    // Accessors
-    //
-    size_t GetItemHeight(void) const { return m_nItemHeight; }
-
-protected:
-    //
-    // We create our items ourselves and they have non-standard size,
-    // so we need to override these functions
-    //
-    virtual wxOwnerDrawn* CreateItem(size_t n);
-    virtual long          OS2OnMeasure(WXMEASUREITEMSTRUCT* pItem);
-
-    //
-    // Pressing space or clicking the check box toggles the item
-    //
-    void OnChar(wxKeyEvent& rEvent);
-    void OnLeftClick(wxMouseEvent& rEvent);
-
-private:
-    size_t m_nItemHeight;  // height of checklistbox items (the same for all)
-
-    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
-    DECLARE_EVENT_TABLE()
-}; // end of CLASS wxCheckListBox
-
-#endif
-   // _WX_CHECKLST_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/child.ico b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/child.ico
deleted file mode 100644
index 6d94514c93..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/child.ico and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/chkconf.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/chkconf.h
deleted file mode 100644
index 3a9151853b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/chkconf.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Name:        wx/os2/chkconf.h
- * Purpose:     Compiler-specific configuration checking
- * Author:      Julian Smart
- * Modified by:
- * Created:     01/02/97
- * Copyright:   (c) Julian Smart
- * Licence:     wxWindows licence
- */
-
-/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
-
-#ifndef _WX_OS2_CHKCONF_H_
-#define _WX_OS2_CHKCONF_H_
-
-/*
-   wxDisplay is not implemented for OS/2, use stub common version instead.
- */
-#if wxUSE_DISPLAY
-#   undef wxUSE_DISPLAY
-#   define wxUSE_DISPLAY 0
-#endif /* wxUSE_DISPLAY */
-
-/* Watcom builds for OS/2 port are setup.h driven and setup.h is
-   automatically generated from include/wx/setup_inc.h so we have
-   to disable here features not supported currently or enable
-   features required */
-#ifdef __WATCOMC__
-
-#if wxUSE_STACKWALKER
-#   undef wxUSE_STACKWALKER
-#   define wxUSE_STACKWALKER 0
-#endif /* wxUSE_STACKWALKER */
-
-#if !wxUSE_POSTSCRIPT
-#   undef wxUSE_POSTSCRIPT
-#   define wxUSE_POSTSCRIPT 1
-#endif
-
-#if wxUSE_MS_HTML_HELP
-#   undef wxUSE_MS_HTML_HELP
-#   define wxUSE_MS_HTML_HELP 0
-#endif
-
-#endif /* __WATCOM__ */
-
-#endif /* _WX_OS2_CHKCONF_H_ */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/choice.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/choice.h
deleted file mode 100644
index 2a5e3ae4cc..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/choice.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/choice.h
-// Purpose:     wxChoice class
-// Author:      David Webster
-// Modified by:
-// Created:     10/13/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CHOICE_H_
-#define _WX_CHOICE_H_
-
-// ----------------------------------------------------------------------------
-// Choice item
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase
-{
-  DECLARE_DYNAMIC_CLASS(wxChoice)
-
-public:
-    // ctors
-    inline wxChoice() { }
-    virtual ~wxChoice();
-
-    inline wxChoice( wxWindow*          pParent
-                    ,wxWindowID         vId
-                    ,const wxPoint&     rPos = wxDefaultPosition
-                    ,const wxSize&      rSize = wxDefaultSize
-                    ,int                n = 0
-                    ,const wxString     asChoices[] = NULL
-                    ,long               lStyle = 0
-                    ,const wxValidator& rValidator = wxDefaultValidator
-                    ,const wxString&    rsName = wxChoiceNameStr
-                   )
-    {
-        Create( pParent
-               ,vId
-               ,rPos
-               ,rSize
-               ,n
-               ,asChoices
-               ,lStyle
-               ,rValidator
-               ,rsName
-              );
-    }
-
-    inline wxChoice( wxWindow*            pParent
-                    ,wxWindowID           vId
-                    ,const wxPoint&       rPos
-                    ,const wxSize&        rSize
-                    ,const wxArrayString& asChoices
-                    ,long                 lStyle = 0
-                    ,const wxValidator&   rValidator = wxDefaultValidator
-                    ,const wxString&      rsName = wxChoiceNameStr
-                   )
-    {
-        Create( pParent
-               ,vId
-               ,rPos
-               ,rSize
-               ,asChoices
-               ,lStyle
-               ,rValidator
-               ,rsName
-              );
-    }
-
-    bool Create( wxWindow*          pParent
-                ,wxWindowID         vId
-                ,const wxPoint&     rPos = wxDefaultPosition
-                ,const wxSize&      rSize = wxDefaultSize
-                ,int                n = 0
-                ,const wxString     asChoices[] = NULL
-                ,long               lStyle = 0
-                ,const wxValidator& rValidator = wxDefaultValidator
-                ,const wxString&    rsName = wxChoiceNameStr
-               );
-
-    bool Create( wxWindow*            pParent
-                ,wxWindowID           vId
-                ,const wxPoint&       rPos
-                ,const wxSize&        rSize
-                ,const wxArrayString& asChoices
-                ,long                 lStyle = 0
-                ,const wxValidator&   rValidator = wxDefaultValidator
-                ,const wxString&      rsName = wxChoiceNameStr
-               );
-
-    //
-    // Implement base class virtuals
-    //
-    virtual void     DoDeleteOneItem(unsigned int n);
-    virtual void     DoClear(void);
-
-    virtual unsigned int GetCount() const;
-    virtual int      GetSelection(void) const;
-    virtual void     SetSelection(int n);
-
-    virtual wxString GetString(unsigned int n) const;
-    virtual void     SetString(unsigned int n, const wxString& rsStr);
-
-    //
-    // OS2 only
-    //
-    virtual bool     OS2Command( WXUINT uParam
-                                ,WXWORD wId
-                               );
-    MRESULT          OS2WindowProc( WXUINT   uMsg
-                                   ,WXWPARAM wParam
-                                   ,WXLPARAM lParam
-                                  );
-
-protected:
-    virtual int           DoInsertItems(const wxArrayStringsAdapter& items,
-                                        unsigned int pos,
-                                        void **clientData,
-                                        wxClientDataType type);
-
-    virtual void          DoSetItemClientData(unsigned int n, void* pClientData);
-    virtual void*         DoGetItemClientData(unsigned int n) const;
-    virtual wxSize        DoGetBestSize(void) const;
-    virtual void          DoSetSize( int nX
-                                    ,int nY
-                                    ,int nWidth
-                                    ,int nHeight
-                                    ,int nsizeFlags = wxSIZE_AUTO
-                                   );
-    void                  Free(void);
-}; // end of CLASS wxChoice
-
-#endif // _WX_CHOICE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/clipbrd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/clipbrd.h
deleted file mode 100644
index ddd31b872c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/clipbrd.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/clipbrd.h
-// Purpose:     Clipboard functionality.
-//              Note: this functionality is under review, and
-//              is derived from wxWidgets 1.xx code. Please contact
-//              the wxWidgets developers for further information.
-// Author:      David Webster
-// Modified by:
-// Created:     10/13/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CLIPBRD_H_
-#define _WX_CLIPBRD_H_
-
-#if wxUSE_CLIPBOARD
-
-#include "wx/list.h"
-#include "wx/module.h"
-#include "wx/dataobj.h"     // for wxDataFormat
-
-// These functions superceded by wxClipboard, but retained in order to
-// implement wxClipboard, and for compatibility.
-
-// open/close the clipboard
-WXDLLIMPEXP_CORE bool wxOpenClipboard();
-WXDLLIMPEXP_CORE bool wxIsClipboardOpened();
-#define wxClipboardOpen wxIsClipboardOpened
-WXDLLIMPEXP_CORE bool wxCloseClipboard();
-
-// get/set data
-WXDLLIMPEXP_CORE bool wxEmptyClipboard();
-WXDLLIMPEXP_CORE bool wxSetClipboardData(wxDataFormat dataFormat,
-                                    const void *data,
-                                    int width = 0, int height = 0);
-WXDLLIMPEXP_CORE void* wxGetClipboardData(wxDataFormat dataFormat,
-                                     long *len = NULL);
-
-// clipboard formats
-WXDLLIMPEXP_CORE bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat);
-WXDLLIMPEXP_CORE wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat);
-WXDLLIMPEXP_CORE int  wxRegisterClipboardFormat(wxChar *formatName);
-WXDLLIMPEXP_CORE bool wxGetClipboardFormatName(wxDataFormat dataFormat,
-                                          wxChar *formatName,
-                                          int maxCount);
-
-//-----------------------------------------------------------------------------
-// wxClipboard
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxDataObject;
-class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
-{
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
-
-public:
-    wxClipboard();
-    virtual ~wxClipboard();
-
-    // open the clipboard before SetData() and GetData()
-    virtual bool Open();
-
-    // close the clipboard after SetData() and GetData()
-    virtual void Close();
-
-    // query whether the clipboard is opened
-    virtual bool IsOpened() const;
-
-    // set the clipboard data. all other formats will be deleted.
-    virtual bool SetData( wxDataObject *data );
-
-    // add to the clipboard data.
-    virtual bool AddData( wxDataObject *data );
-
-    // ask if data in correct format is available
-    virtual bool IsSupported( const wxDataFormat& format );
-
-    // fill data with data on the clipboard (if available)
-    virtual bool GetData( wxDataObject& data );
-
-    // clears wxTheClipboard and the system's clipboard if possible
-    virtual void Clear();
-
-    // flushes the clipboard: this means that the data which is currently on
-    // clipboard will stay available even after the application exits (possibly
-    // eating memory), otherwise the clipboard will be emptied on exit
-    virtual bool Flush();
-
-private:
-    bool m_clearOnExit;
-};
-
-#endif // wxUSE_CLIPBOARD
-#endif // _WX_CLIPBRD_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/clock.ptr b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/clock.ptr
deleted file mode 100644
index 45ac051667..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/clock.ptr and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/colour.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/colour.h
deleted file mode 100644
index 857e533c41..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/colour.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/colour.h
-// Purpose:     wxColour class
-// Author:      David Webster
-// Modified by:
-// Created:     10/13/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COLOUR_H_
-#define _WX_COLOUR_H_
-
-#include "wx/object.h"
-
-// Colour
-class WXDLLIMPEXP_CORE wxColour: public wxColourBase
-{
-public:
-    // constructors
-    // ------------
-    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
-
-    // Copy ctors and assignment operators
-    wxColour(const wxColour& rCol);
-    wxColour(const wxColour* pCol);
-    wxColour&operator = (const wxColour& rCol);
-
-    // Dtor
-    virtual ~wxColour();
-
-    // Accessors
-    virtual bool IsOk(void) const { return m_bIsInit; }
-
-    unsigned char Red(void) const { return m_cRed; }
-    unsigned char Green(void) const { return m_cGreen; }
-    unsigned char Blue(void) const { return m_cBlue; }
-
-    // Comparison
-    bool operator == (const wxColour& rColour) const
-    {
-        return (m_bIsInit == rColour.m_bIsInit
-                && m_cRed   == rColour.m_cRed
-                && m_cGreen == rColour.m_cGreen
-                && m_cBlue  == rColour.m_cBlue
-               );
-    }
-
-    bool operator != (const wxColour& rColour) const { return !(*this == rColour); }
-
-    WXCOLORREF GetPixel(void) const { return m_vPixel; }
-
-
-private:
-
-    // Helper function
-    void Init();
-
-    bool           m_bIsInit;
-    unsigned char  m_cRed;
-    unsigned char  m_cBlue;
-    unsigned char  m_cGreen;
-
-    virtual void
-    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
-
-public:
-    WXCOLORREF                      m_vPixel ;
-private:
-    DECLARE_DYNAMIC_CLASS(wxColour)
-}; // end of class wxColour
-
-#endif
-  // _WX_COLOUR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/colours.bmp b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/colours.bmp
deleted file mode 100644
index 62d1f8045f..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/colours.bmp and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/combobox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/combobox.h
deleted file mode 100644
index 0678cd791c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/combobox.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/combobox.h
-// Purpose:     wxComboBox class
-// Author:      David Webster
-// Modified by:
-// Created:     10/13/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COMBOBOX_H_
-#define _WX_COMBOBOX_H_
-
-#include "wx/choice.h"
-#include "wx/textentry.h"
-
-#if wxUSE_COMBOBOX
-
-// Combobox item
-class WXDLLIMPEXP_CORE wxComboBox : public wxChoice,
-                               public wxTextEntry
-{
-
- public:
-  inline wxComboBox() {}
-
-  inline wxComboBox( wxWindow*          pParent
-                    ,wxWindowID         vId
-                    ,const wxString&    rsValue = wxEmptyString
-                    ,const wxPoint&     rPos = wxDefaultPosition
-                    ,const wxSize&      rSize = wxDefaultSize
-                    ,int                n = 0
-                    ,const wxString     asChoices[] = NULL
-                    ,long               lStyle = 0
-                    ,const wxValidator& rValidator = wxDefaultValidator
-                    ,const wxString&    rsName = wxComboBoxNameStr
-                   )
-    {
-        Create( pParent
-               ,vId
-               ,rsValue
-               ,rPos
-               ,rSize
-               ,n
-               ,asChoices
-               ,lStyle
-               ,rValidator
-               ,rsName
-              );
-    }
-
-  inline wxComboBox( wxWindow*            pParent
-                    ,wxWindowID           vId
-                    ,const wxString&      rsValue
-                    ,const wxPoint&       rPos
-                    ,const wxSize&        rSize
-                    ,const wxArrayString& asChoices
-                    ,long                 lStyle = 0
-                    ,const wxValidator&   rValidator = wxDefaultValidator
-                    ,const wxString&      rsName = wxComboBoxNameStr
-                   )
-    {
-        Create( pParent
-               ,vId
-               ,rsValue
-               ,rPos
-               ,rSize
-               ,asChoices
-               ,lStyle
-               ,rValidator
-               ,rsName
-              );
-    }
-
-    bool Create( wxWindow*          pParent
-                ,wxWindowID         vId
-                ,const wxString&    rsValue = wxEmptyString
-                ,const wxPoint&     rPos = wxDefaultPosition
-                ,const wxSize&      rSize = wxDefaultSize
-                ,int                n = 0
-                ,const wxString     asChoices[] = NULL
-                ,long               lStyle = 0
-                ,const wxValidator& rValidator = wxDefaultValidator
-                ,const wxString&    rsName = wxComboBoxNameStr
-               );
-
-    bool Create( wxWindow*            pParent
-                ,wxWindowID           vId
-                ,const wxString&      rsValue
-                ,const wxPoint&       rPos
-                ,const wxSize&        rSize
-                ,const wxArrayString& asChoices
-                ,long                 lStyle = 0
-                ,const wxValidator&   rValidator = wxDefaultValidator
-                ,const wxString&      rsName = wxComboBoxNameStr
-               );
-
-    // See wxComboBoxBase discussion of IsEmpty().
-    bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
-    bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
-
-    // resolve ambiguities among virtual functions inherited from both base
-    // classes
-    virtual void Clear();
-    virtual wxString GetValue() const;
-    virtual void SetValue(const wxString& value);
-    virtual wxString GetStringSelection() const
-        { return wxChoice::GetStringSelection(); }
-
-    inline virtual void SetSelection(int n) { wxChoice::SetSelection(n); }
-    virtual void SetSelection(long from, long to)
-        { wxTextEntry::SetSelection(from, to); }
-    virtual int GetSelection() const { return wxChoice::GetSelection(); }
-    virtual void GetSelection(long *from, long *to) const
-        { wxTextEntry::GetSelection(from, to); }
-
-    virtual bool IsEditable() const;
-
-    virtual bool        OS2Command( WXUINT uParam
-                                   ,WXWORD wId
-                                  );
-    bool                ProcessEditMsg( WXUINT   uMsg
-                                       ,WXWPARAM wParam
-                                       ,WXLPARAM lParam
-                                      );
-
-private:
-    // implement wxTextEntry pure virtual methods
-    virtual wxWindow *GetEditableWindow() { return this; }
-    virtual WXHWND GetEditHWND() const { return m_hWnd; }
-
-    DECLARE_DYNAMIC_CLASS(wxComboBox)
-}; // end of CLASS wxComboBox
-
-#endif // wxUSE_COMBOBOX
-#endif
-    // _WX_COMBOBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/computer.ico b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/computer.ico
deleted file mode 100644
index 07d8e0e29a..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/computer.ico and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/control.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/control.h
deleted file mode 100644
index 0d799ed1cc..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/control.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/control.h
-// Purpose:     wxControl class
-// Author:      David Webster
-// Modified by:
-// Created:     09/17/99
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CONTROL_H_
-#define _WX_CONTROL_H_
-
-#include "wx/dynarray.h"
-
-// General item class
-class WXDLLIMPEXP_CORE wxControl : public wxControlBase
-{
-    DECLARE_ABSTRACT_CLASS(wxControl)
-
-public:
-   wxControl();
-   wxControl( wxWindow*          pParent
-             ,wxWindowID         vId
-             ,const wxPoint&     rPos = wxDefaultPosition
-             ,const wxSize&      rSize = wxDefaultSize
-             ,long               lStyle = 0
-             ,const wxValidator& rValidator = wxDefaultValidator
-             ,const wxString&    rsName = wxControlNameStr
-            )
-    {
-        Create( pParent, vId, rPos, rSize, lStyle, rValidator, rsName );
-    }
-
-    bool Create( wxWindow*          pParent
-                ,wxWindowID         vId
-                ,const wxPoint&     rPos = wxDefaultPosition
-                ,const wxSize&      rSize = wxDefaultSize
-                ,long               lStyle = 0
-                ,const wxValidator& rValidator = wxDefaultValidator
-                ,const wxString&    rsName = wxControlNameStr
-               );
-
-    virtual void SetLabel(const wxString& rsLabel);
-    virtual wxString GetLabel() const { return m_label; }
-
-    //
-    // Simulates an event
-    //
-    virtual void Command(wxCommandEvent& rEvent) { ProcessCommand(rEvent); }
-
-    //
-    // Implementation from now on
-    // --------------------------
-    //
-
-    //
-    // Calls the callback and appropriate event handlers
-    //
-    bool ProcessCommand(wxCommandEvent& rEvent);
-
-    //
-    // For ownerdraw items
-    //
-    virtual bool OS2OnDraw(WXDRAWITEMSTRUCT* WXUNUSED(pItem)) { return false; }
-    virtual long OS2OnMeasure(WXMEASUREITEMSTRUCT* WXUNUSED(pItem)) { return 0L; }
-
-    wxArrayLong&     GetSubcontrols() { return m_aSubControls; }
-    void             OnEraseBackground(wxEraseEvent& rEvent);
-    virtual WXHBRUSH OnCtlColor( WXHDC    hDC
-                                ,WXHWND   pWnd
-                                ,WXUINT   nCtlColor
-                                ,WXUINT   uMessage
-                                ,WXWPARAM wParam
-                                ,WXLPARAM lParam
-                               );
-
-public:
-    //
-    // For controls like radiobuttons which are really composite
-    //
-    wxArrayLong m_aSubControls;
-
-    virtual wxSize DoGetBestSize(void) const;
-
-    //
-    // Create the control of the given PM class
-    //
-    bool OS2CreateControl( const wxChar*   zClassname
-                          ,const wxString& rsLabel
-                          ,const wxPoint&  rPos
-                          ,const wxSize&   rSize
-                          ,long            lStyle
-                         );
-    //
-    // Create the control of the given class with the given style, returns false
-    // if creation failed.
-    //
-    bool OS2CreateControl( const wxChar*   zClassname
-                          ,WXDWORD         dwStyle
-                          ,const wxPoint&  rPos = wxDefaultPosition
-                          ,const wxSize&   rSize = wxDefaultSize
-                          ,const wxString& rsLabel = wxEmptyString
-                          ,WXDWORD         dwExstyle = (WXDWORD)-1
-                         );
-
-    //
-    // Default style for the control include WS_TABSTOP if it AcceptsFocus()
-    //
-    virtual WXDWORD OS2GetStyle( long     lStyle
-                                ,WXDWORD* pdwExstyle
-                               ) const;
-
-    inline int  GetXComp(void) const {return m_nXComp;}
-    inline int  GetYComp(void) const {return m_nYComp;}
-    inline void SetXComp(const int nXComp) {m_nXComp = nXComp;}
-    inline void SetYComp(const int nYComp) {m_nYComp = nYComp;}
-
-private:
-    int m_nXComp;
-    int m_nYComp;
-
-    wxString m_label;
-    WXDWORD  m_dwStyle;
-
-    DECLARE_EVENT_TABLE()
-}; // end of wxControl
-
-#endif // _WX_CONTROL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/cross.bmp b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/cross.bmp
deleted file mode 100644
index 079cb0dd58..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/cross.bmp and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/csquery.bmp b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/csquery.bmp
deleted file mode 100644
index 7a63555268..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/csquery.bmp and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/cursor.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/cursor.h
deleted file mode 100644
index 8dd6b02780..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/cursor.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/cursor.h
-// Purpose:     wxCursor class
-// Author:      David Webster
-// Modified by:
-// Created:     10/13/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CURSOR_H_
-#define _WX_CURSOR_H_
-
-#include "wx/bitmap.h"
-
-class WXDLLIMPEXP_CORE wxCursorRefData: public wxGDIImageRefData
-{
-public:
-    wxCursorRefData();
-    virtual ~wxCursorRefData() { Free(); }
-    virtual void Free(void);
-    bool                            m_bDestroyCursor;
-}; // end of CLASS wxCursorRefData
-
-#define M_CURSORDATA ((wxCursorRefData *)m_refData)
-#define M_CURSORHANDLERDATA ((wxCursorRefData *)bitmap->m_refData)
-
-// Cursor
-class WXDLLIMPEXP_CORE wxCursor: public wxBitmap
-{
-public:
-    wxCursor();
-
-    wxCursor(const wxImage& rImage);
-
-    wxCursor( const wxString& rsName
-             ,wxBitmapType    lType = wxCURSOR_DEFAULT_TYPE
-             ,int             nHotSpotX = 0
-             ,int             nHotSpotY = 0
-            );
-    wxCursor(wxStockCursor id) { InitFromStock(id); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
-#endif
-    inline ~wxCursor() { }
-
-    inline WXHCURSOR GetHCURSOR(void) const { return (M_CURSORDATA ? M_CURSORDATA->m_hCursor : 0); }
-    inline void      SetHCURSOR(WXHCURSOR hCursor) { SetHandle((WXHANDLE)hCursor); }
-
-protected:
-    void InitFromStock(wxStockCursor);
-    inline virtual wxGDIImageRefData* CreateData(void) const { return (new wxCursorRefData); }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxCursor)
-}; // end of CLASS wxCursor
-
-#endif
-    // _WX_CURSOR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dataform.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dataform.h
deleted file mode 100644
index 1d6896c247..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dataform.h
+++ /dev/null
@@ -1,50 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/dataform.h
-// Purpose:     declaration of the wxDataFormat class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     10/21/99
-// Copyright:   (c) 1999 Stefan Csomor
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OS2_DATAFORM_H
-#define _WX_OS2_DATAFORM_H
-
-class wxDataFormat
-{
-public:
-    wxDataFormat(unsigned int uFormat = wxDF_INVALID) { m_uFormat = uFormat; }
-    wxDataFormat(const wxString& zFormat) { SetId(zFormat); }
-
-    wxDataFormat& operator=(unsigned int uFormat) { m_uFormat = uFormat; return(*this); }
-    wxDataFormat& operator=(const wxDataFormat& rFormat) {m_uFormat = rFormat.m_uFormat; return(*this); }
-
-    //
-    // Comparison (must have both versions)
-    //
-    bool operator==(wxDataFormatId eFormat) const { return (m_uFormat == (unsigned int)eFormat); }
-    bool operator!=(wxDataFormatId eFormat) const { return (m_uFormat != (unsigned int)eFormat); }
-    bool operator==(const wxDataFormat& rFormat) const { return (m_uFormat == rFormat.m_uFormat); }
-    bool operator!=(const wxDataFormat& rFormat) const { return (m_uFormat != rFormat.m_uFormat); }
-         operator unsigned int(void) const { return m_uFormat; }
-
-    unsigned int GetFormatId(void) const { return (unsigned int)m_uFormat; }
-    unsigned int GetType(void) const { return (unsigned int)m_uFormat; }
-
-    bool IsStandard(void) const;
-
-    void SetType(unsigned int uType){ m_uFormat = uType; }
-
-    //
-    // String ids are used for custom types - this SetId() must be used for
-    // application-specific formats
-    //
-    wxString GetId(void) const;
-    void     SetId(const wxString& pId);
-
-private:
-    unsigned int                    m_uFormat;
-}; // end of CLASS wxDataFormat
-
-#endif // _WX_GTK_DATAFORM_H
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dataobj.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dataobj.h
deleted file mode 100644
index e83ded21bb..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dataobj.h
+++ /dev/null
@@ -1,38 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/dataobj.h
-// Purpose:     declaration of the wxDataObject
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     10/21/99
-// Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OS2_DATAOBJ_H_
-#define _WX_OS2_DATAOBJ_H_
-
-// ----------------------------------------------------------------------------
-// wxDataObject is the same as wxDataObjectBase under wxGTK
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase
-{
-public:
-    wxDataObject();
-    virtual ~wxDataObject();
-
-    virtual bool IsSupportedFormat( const wxDataFormat& eFormat
-                                   ,Direction           eDir = Get
-                                  ) const
-    {
-        return(IsSupported( eFormat
-                           ,eDir
-                          ));
-    }
-
-    PDRAGITEM GetInterface(void) const {return m_pDataObject;}
-private:
-    PDRAGITEM                       m_pDataObject;
-};
-
-#endif // _WX_OS2_DATAOBJ_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dataobj2.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dataobj2.h
deleted file mode 100644
index b3e3d319d4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dataobj2.h
+++ /dev/null
@@ -1,84 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/dataobj2.h
-// Purpose:     declaration of standard wxDataObjectSimple-derived classes
-// Author:      Stefan Csomor (adapted from Robert Roebling's gtk port
-// Modified by:
-// Created:     10/21/99
-// Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OS2_DATAOBJ2_H_
-#define _WX_OS2_DATAOBJ2_H_
-
-// ----------------------------------------------------------------------------
-// wxBitmapDataObject is a specialization of wxDataObject for bitmaps
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase
-{
-public:
-    // ctors
-    wxBitmapDataObject();
-    wxBitmapDataObject(const wxBitmap& bitmap);
-
-    // destr
-    virtual ~wxBitmapDataObject();
-
-    // override base class virtual to update PNG data too
-    virtual void SetBitmap(const wxBitmap& bitmap);
-
-    // implement base class pure virtuals
-    // ----------------------------------
-
-    virtual size_t GetDataSize() const { return m_pngSize; }
-    virtual bool GetDataHere(void *buf) const;
-    virtual bool SetData(size_t len, const void *buf);
-
-protected:
-    void Init() { m_pngData = NULL; m_pngSize = 0; }
-    void Clear() { free(m_pngData); }
-    void ClearAll() { Clear(); Init(); }
-
-    size_t      m_pngSize;
-    void       *m_pngData;
-
-    void DoConvertToPng();
-
-private:
-    // Virtual function hiding supression
-    size_t GetDataSize(const wxDataFormat& rFormat) const
-    { return(wxDataObjectSimple::GetDataSize(rFormat)); }
-    bool GetDataHere(const wxDataFormat& rFormat, void* pBuf) const
-    { return(wxDataObjectSimple::GetDataHere(rFormat, pBuf)); }
-    bool SetData(const wxDataFormat& rFormat, size_t nLen, const void* pBuf)
-    { return(wxDataObjectSimple::SetData(rFormat, nLen, pBuf)); }
-};
-
-// ----------------------------------------------------------------------------
-// wxFileDataObject is a specialization of wxDataObject for file names
-// ----------------------------------------------------------------------------
-
-class wxFileDataObject : public wxFileDataObjectBase
-{
-public:
-    // implement base class pure virtuals
-    // ----------------------------------
-
-    void AddFile( const wxString &filename );
-
-    virtual size_t GetDataSize() const;
-    virtual bool GetDataHere(void *buf) const;
-    virtual bool SetData(size_t len, const void *buf);
-
-private:
-    // Virtual function hiding supression
-    size_t GetDataSize(const wxDataFormat& rFormat) const
-    { return(wxDataObjectSimple::GetDataSize(rFormat)); }
-    bool GetDataHere(const wxDataFormat& rFormat, void* pBuf) const
-    { return(wxDataObjectSimple::GetDataHere(rFormat, pBuf)); }
-    bool SetData(const wxDataFormat& rFormat, size_t nLen, const void* pBuf)
-    { return(wxDataObjectSimple::SetData(rFormat, nLen, pBuf)); }
-};
-
-#endif // _WX_OS2_DATAOBJ2_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dc.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dc.h
deleted file mode 100644
index 3db23c71b5..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dc.h
+++ /dev/null
@@ -1,407 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/dc.h
-// Purpose:     wxDC class
-// Author:      David Webster
-// Modified by:
-// Created:     08/26/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DC_H_
-#define _WX_DC_H_
-
-#include "wx/defs.h"
-#include "wx/dc.h"
-
-// ---------------------------------------------------------------------------
-// macros
-// ---------------------------------------------------------------------------
-
-// Logical to device
-// Absolute
-#define XLOG2DEV(x) (x)
-#define YLOG2DEV(y) (y)
-
-// Relative
-#define XLOG2DEVREL(x) (x)
-#define YLOG2DEVREL(y) (y)
-
-// Device to logical
-// Absolute
-#define XDEV2LOG(x) (x)
-
-#define YDEV2LOG(y) (y)
-
-// Relative
-#define XDEV2LOGREL(x) (x)
-#define YDEV2LOGREL(y) (y)
-
-/*
- * Have the same macros as for XView but not for every operation:
- * just for calculating window/viewport extent (a better way of scaling).
- */
-
-// Logical to device
-// Absolute
-#define MS_XLOG2DEV(x) LogicalToDevice(x)
-
-#define MS_YLOG2DEV(y) LogicalToDevice(y)
-
-// Relative
-#define MS_XLOG2DEVREL(x) LogicalToDeviceXRel(x)
-#define MS_YLOG2DEVREL(y) LogicalToDeviceYRel(y)
-
-// Device to logical
-// Absolute
-#define MS_XDEV2LOG(x) DeviceToLogicalX(x)
-
-#define MS_YDEV2LOG(y) DeviceToLogicalY(y)
-
-// Relative
-#define MS_XDEV2LOGREL(x) DeviceToLogicalXRel(x)
-#define MS_YDEV2LOGREL(y) DeviceToLogicalYRel(y)
-
-#define YSCALE(y) (yorigin - (y))
-
-#define     wx_round(a)    (int)((a)+.5)
-
-#if wxUSE_DC_CACHEING
-/*
- * Cached blitting, maintaining a cache
- * of bitmaps required for transparent blitting
- * instead of constant creation/deletion
- */
-
-class wxDCCacheEntry : public wxObject
-{
-public:
-    wxDCCacheEntry( WXHBITMAP hBitmap
-                   ,int       nWidth
-                   ,int       nHeight
-                   ,int       nDepth
-                  );
-    wxDCCacheEntry( HPS   hPS
-                   ,int   nDepth
-                  );
-    virtual ~wxDCCacheEntry();
-
-    WXHBITMAP                       m_hBitmap;
-    HPS                             m_hPS;
-    int                             m_nWidth;
-    int                             m_nHeight;
-    int                             m_nDepth;
-}; // end of CLASS wxDCCacheEntry
-#endif
-
-// this is an ABC: use one of the derived classes to create a DC associated
-// with a window, screen, printer and so on
-class WXDLLIMPEXP_CORE wxPMDCImpl : public wxDCImpl
-{
-    DECLARE_DYNAMIC_CLASS(wxDC)
-
-public:
-    wxPMDCImpl(wxDC *owner, WXHDC hDC);
-    virtual ~wxPMDCImpl();
-
-    // implement base class pure virtuals
-    // ----------------------------------
-
-    virtual void Clear();
-
-    virtual bool    StartDoc(const wxString& rsMessage);
-    virtual void    EndDoc();
-
-    virtual void    StartPage();
-    virtual void    EndPage();
-
-    virtual void    SetFont(const wxFont& rFont);
-    virtual void    SetPen(const wxPen& rPen);
-    virtual void    SetBrush(const wxBrush& rBrush);
-    virtual void    SetBackground(const wxBrush& rBrush);
-    virtual void    SetBackgroundMode(int nMode);
-    virtual void    SetPalette(const wxPalette& rPalette);
-
-    virtual void    DestroyClippingRegion();
-
-    virtual wxCoord GetCharHeight() const;
-    virtual wxCoord GetCharWidth() const;
-
-    virtual bool    CanDrawBitmap() const;
-    virtual bool    CanGetTextExtent() const;
-    virtual int     GetDepth() const;
-    virtual wxSize  GetPPI() const;
-
-    virtual void    SetMapMode(wxMappingMode nMode);
-    virtual void    SetUserScale( double dX
-                                 ,double dY
-                                );
-    virtual void    SetLogicalScale( double dX
-                                    ,double dY
-                                   );
-    virtual void    SetLogicalOrigin( wxCoord vX
-                                     ,wxCoord vY
-                                    );
-    virtual void    SetDeviceOrigin( wxCoord vX
-                                    ,wxCoord vY
-                                   );
-    virtual void    SetAxisOrientation( bool bXLeftRight
-                                       ,bool bYBottomUp
-                                      );
-    virtual void    SetLogicalFunction(wxRasterOperationMode nFunction);
-
-    // implementation from now on
-    // --------------------------
-
-    virtual void    SetRop(WXHDC hCdc);
-    virtual void    SelectOldObjects(WXHDC hDc);
-
-    wxWindow*       GetWindow() const { return m_pCanvas; }
-    void            SetWindow(wxWindow* pWin) { m_pCanvas = pWin; }
-
-    WXHDC           GetHDC() const { return m_hDC; }
-    void            SetHDC( WXHDC hDc
-                           ,bool  bOwnsDC = FALSE
-                          )
-    {
-        m_hDC = hDc;
-        m_bOwnsDC = bOwnsDC;
-    }
-
-    HPS             GetHPS() const { return m_hPS; }
-    void            SetHPS(HPS hPS)
-    {
-        m_hPS = hPS;
-    }
-    const wxBitmap& GetSelectedBitmap() const { return m_vSelectedBitmap; }
-    wxBitmap&       GetSelectedBitmap() { return m_vSelectedBitmap; }
-
-    void            UpdateClipBox();
-
-#if wxUSE_DC_CACHEING
-    static wxDCCacheEntry* FindBitmapInCache( HPS hPS
-                                             ,int nWidth
-                                             ,int nHeight
-                                            );
-    static wxDCCacheEntry* FindDCInCache( wxDCCacheEntry* pNotThis
-                                         ,HPS             hPS
-                                        );
-
-    static void AddToBitmapCache(wxDCCacheEntry* pEntry);
-    static void AddToDCCache(wxDCCacheEntry* pEntry);
-    static void ClearCache();
-#endif
-
-protected:
-    void Init()
-    {
-        m_pCanvas      = NULL;
-        m_hOldBitmap   = 0;
-        m_hOldPen      = 0;
-        m_hOldBrush    = 0;
-        m_hOldFont     = 0;
-#if wxUSE_PALETTE
-        m_hOldPalette  = 0;
-#endif // wxUSE_PALETTE
-
-        m_bOwnsDC      = false;
-        m_hDC          = 0;
-        m_hOldPS       = NULL;
-        m_hPS          = NULL;
-        m_bIsPaintTime = false; // True at Paint Time
-
-        m_pen.SetColour(*wxBLACK);
-        m_brush.SetColour(*wxWHITE);
-    }
-
-    // create an uninitialized DC: this should be only used by the derived
-    // classes
-    wxPMDCImpl( wxDC *owner ) : wxDCImpl( owner ) { Init(); }
-
-public:
-    virtual void    DoGetTextExtent( const wxString& rsString
-                                    ,wxCoord*        pX
-                                    ,wxCoord*        pY
-                                    ,wxCoord*        pDescent = NULL
-                                    ,wxCoord*        pExternalLeading = NULL
-                                    ,const wxFont*   pTheFont = NULL
-                                   ) const;
-    virtual bool DoFloodFill( wxCoord          vX
-                             ,wxCoord          vY
-                             ,const wxColour&  rCol
-                             ,wxFloodFillStyle nStyle = wxFLOOD_SURFACE
-                            );
-
-    virtual bool DoGetPixel( wxCoord   vX
-                            ,wxCoord   vY
-                            ,wxColour* pCol
-                           ) const;
-
-    virtual void DoDrawPoint( wxCoord vX
-                             ,wxCoord vY
-                            );
-    virtual void DoDrawLine( wxCoord vX1
-                            ,wxCoord vY1
-                            ,wxCoord vX2
-                            ,wxCoord vY2
-                           );
-
-    virtual void DoDrawArc( wxCoord vX1
-                           ,wxCoord vY1
-                           ,wxCoord vX2
-                           ,wxCoord vY2
-                           ,wxCoord vXc
-                           ,wxCoord vYc
-                          );
-    virtual void DoDrawCheckMark( wxCoord vX
-                                 ,wxCoord vY
-                                 ,wxCoord vWidth
-                                 ,wxCoord vHeight
-                                );
-    virtual void DoDrawEllipticArc( wxCoord vX
-                                   ,wxCoord vY
-                                   ,wxCoord vW
-                                   ,wxCoord vH
-                                   ,double  dSa
-                                   ,double  dEa
-                                  );
-
-    virtual void DoDrawRectangle( wxCoord vX
-                                 ,wxCoord vY
-                                 ,wxCoord vWidth
-                                 ,wxCoord vHeight
-                                );
-    virtual void DoDrawRoundedRectangle( wxCoord vX
-                                        ,wxCoord vY
-                                        ,wxCoord vWidth
-                                        ,wxCoord vHeight
-                                        ,double  dRadius
-                                       );
-    virtual void DoDrawEllipse( wxCoord vX
-                               ,wxCoord vY
-                               ,wxCoord vWidth
-                               ,wxCoord vHeight
-                              );
-
-    virtual void DoCrossHair( wxCoord vX
-                             ,wxCoord vY
-                            );
-
-    virtual void DoDrawIcon( const wxIcon& rIcon
-                            ,wxCoord       vX
-                            ,wxCoord       vY
-                           );
-    virtual void DoDrawBitmap( const wxBitmap& rBmp
-                              ,wxCoord         vX
-                              ,wxCoord         vY
-                              ,bool            bUseMask = FALSE
-                             );
-
-    virtual void DoDrawText( const wxString& rsText
-                            ,wxCoord         vX
-                            ,wxCoord         vY
-                           );
-    virtual void DoDrawRotatedText( const wxString& rsText
-                                   ,wxCoord         vX
-                                   ,wxCoord         vY
-                                   ,double          dAngle
-                                  );
-
-    virtual bool DoBlit( wxCoord vXdest
-                        ,wxCoord vYdest
-                        ,wxCoord vWidth
-                        ,wxCoord vHeight
-                        ,wxDC*   pSource
-                        ,wxCoord vXsrc
-                        ,wxCoord vYsrc
-                        ,wxRasterOperationMode     nRop = wxCOPY
-                        ,bool    bUseMask = FALSE
-                        ,wxCoord vXsrcMask = -1
-                        ,wxCoord vYsrcMask = -1
-                       );
-
-    virtual void DoSetClippingRegion( wxCoord vX
-                                     ,wxCoord vY
-                                     ,wxCoord vWidth
-                                     ,wxCoord vHeight
-                                    );
-    virtual void DoSetDeviceClippingRegion(const wxRegion& rRegion);
-
-    virtual void DoGetSize( int* pWidth
-                           ,int* pHeight
-                          ) const;
-    virtual void DoGetSizeMM( int* pWidth
-                             ,int* pHeight
-                            ) const;
-
-    virtual void DoDrawLines( int     n
-                             ,const wxPoint vaPoints[]
-                             ,wxCoord vXoffset
-                             ,wxCoord yYoffset
-                            );
-    virtual void DoDrawPolygon( int     n
-                               ,const wxPoint vaPoints[]
-                               ,wxCoord vXoffset
-                               ,wxCoord vYoffset
-                               ,wxPolygonFillMode     nFillStyle = wxODDEVEN_RULE
-                              );
-
-#if wxUSE_PALETTE
-    void DoSelectPalette(bool bRealize = FALSE);
-    void InitializePalette();
-#endif // wxUSE_PALETTE
-
-protected:
-    //
-    // common part of DoDrawText() and DoDrawRotatedText()
-    //
-    void DrawAnyText( const wxString& rsText
-                     ,wxCoord         vX
-                     ,wxCoord         vY
-                    );
-
-    // OS2-specific member variables ?? do we even need this under OS/2?
-    int                             m_nWindowExtX;
-    int                             m_nWindowExtY;
-
-    //
-    // the window associated with this DC (may be NULL)
-    //
-    wxWindow*                       m_pCanvas;
-    wxBitmap                        m_vSelectedBitmap;
-
-public:
-    // PM specific stuff
-    HPS                             m_hPS;
-    HPS                             m_hOldPS;   // old hPS, if any
-    bool                            m_bIsPaintTime;// True at Paint Time
-
-    RECTL                           m_vRclPaint; // Bounding rectangle at Paint time etc.
-    //
-    // TRUE => DeleteDC() in dtor, FALSE => only ReleaseDC() it
-    //
-    bool                            m_bOwnsDC:1;
-
-    //
-    // our HDC
-    //
-    WXHDC                           m_hDC;
-
-    //
-    // Store all old GDI objects when do a SelectObject, so we can select them
-    // back in (this unselecting user's objects) so we can safely delete the
-    // DC.
-    //
-    WXHBITMAP                       m_hOldBitmap;
-    WXHPEN                          m_hOldPen;
-    WXHBRUSH                        m_hOldBrush;
-    WXHFONT                         m_hOldFont;
-    WXHPALETTE                      m_hOldPalette;
-
-#if wxUSE_DC_CACHEING
-    static wxList                   m_svBitmapCache;
-    static wxList                   m_svDCCache;
-#endif
-}; // end of CLASS wxDC
-#endif
-    // _WX_DC_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dcclient.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dcclient.h
deleted file mode 100644
index 1770285489..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dcclient.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/dcclient.h
-// Purpose:     wxClientDC class
-// Author:      David Webster
-// Modified by:
-// Created:     09/12/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DCCLIENT_H_
-#define _WX_DCCLIENT_H_
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/dc.h"
-#include "wx/os2/dc.h"
-#include "wx/dcclient.h"
-#include "wx/dynarray.h"
-
-// ----------------------------------------------------------------------------
-// array types
-// ----------------------------------------------------------------------------
-
-// this one if used by wxPaintDC only
-struct WXDLLIMPEXP_FWD_CORE wxPaintDCInfo;
-
-WX_DECLARE_EXPORTED_OBJARRAY(wxPaintDCInfo, wxArrayDCInfo);
-
-// ----------------------------------------------------------------------------
-// DC classes
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxPMDCImpl
-{
-public:
-    // default ctor
-    wxWindowDCImpl( wxDC *owner );
-
-    // Create a DC corresponding to the whole window
-    wxWindowDCImpl( wxDC *owner, wxWindow *pWin );
-
-    virtual void DoGetSize(int *pWidth, int *pHeight) const;
-
-protected:
-    // initialize the newly created DC
-    void InitDC(void);
-
-private:
-    SIZEL                   m_PageSize;
-    DECLARE_CLASS(wxWindowDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
-}; // end of CLASS wxWindowDC
-
-class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl
-{
-public:
-    // default ctor
-    wxClientDCImpl( wxDC *owner );
-
-    // Create a DC corresponding to the client area of the window
-    wxClientDCImpl( wxDC *owner, wxWindow *pWin );
-
-    virtual ~wxClientDCImpl();
-
-    virtual void DoGetSize(int *pWidth, int *pHeight) const;
-
-protected:
-    void InitDC(void);
-
-private:
-    DECLARE_CLASS(wxClientDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
-}; // end of CLASS wxClientDC
-
-class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl
-{
-public:
-    wxPaintDCImpl( wxDC *owner );
-
-    // Create a DC corresponding for painting the window in OnPaint()
-    wxPaintDCImpl( wxDC *owner, wxWindow *pWin );
-
-    virtual ~wxPaintDCImpl();
-
-    // find the entry for this DC in the cache (keyed by the window)
-    static WXHDC FindDCInCache(wxWindow* pWin);
-
-protected:
-    static wxArrayDCInfo ms_cache;
-
-    // find the entry for this DC in the cache (keyed by the window)
-    wxPaintDCInfo* FindInCache(size_t* pIndex = NULL) const;
-private:
-    DECLARE_CLASS(wxPaintDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
-}; // end of wxPaintDC
-
-#endif
-    // _WX_DCCLIENT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dcmemory.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dcmemory.h
deleted file mode 100644
index fb22f0a4d7..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dcmemory.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/dcmemory.h
-// Purpose:     wxMemoryDC class
-// Author:      David Webster
-// Modified by:
-// Created:     09/09/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DCMEMORY_H_
-#define _WX_DCMEMORY_H_
-
-#include "wx/dcmemory.h"
-#include "wx/os2/dc.h"
-
-class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPMDCImpl
-{
-public:
-    wxMemoryDCImpl( wxMemoryDC *owner );
-    wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
-    wxMemoryDCImpl( wxMemoryDC *owner, wxDC* pDC); // Create compatible DC
-
-    // override some base class virtuals
-    virtual void DoGetSize(int* pWidth, int* pHeight) const;
-    virtual void DoSelect(const wxBitmap& bitmap);
-
-    virtual wxBitmap DoGetAsBitmap(const wxRect* subrect) const
-    { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect);}
-
-protected:
-    // create DC compatible with the given one or screen if dc == NULL
-    bool CreateCompatible(wxDC* pDC);
-
-    // initialize the newly created DC
-    void Init(void);
-private:
-    DECLARE_CLASS(wxMemoryDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
-}; // end of CLASS wxMemoryDCImpl
-
-#endif
-    // _WX_DCMEMORY_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dcprint.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dcprint.h
deleted file mode 100644
index 7baef4a679..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dcprint.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/dcprint.h
-// Purpose:     wxPrinterDC class
-// Author:      David Webster
-// Modified by:
-// Created:     09/12/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DCPRINT_H_
-#define _WX_DCPRINT_H_
-
-#if wxUSE_PRINTING_ARCHITECTURE
-
-#include "wx/dc.h"
-#include "wx/cmndata.h"
-#include "wx/os2/dc.h"
-
-class WXDLLIMPEXP_CORE wxPrinterDCImpl: public wxPMDCImpl
-{
- public:
-    // Create a printer DC
-
-    // Create from print data
-    wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& rData );
-    wxPrinterDCImpl( wxPrinterDC *owner, WXHDC hTheDC);
-
-    // override some base class virtuals
-    virtual bool StartDoc(const wxString& rsMessage);
-    virtual void EndDoc(void);
-    virtual void StartPage(void);
-    virtual void EndPage(void);
-
-    virtual wxRect GetPaperRect() const;
-
-protected:
-    virtual void DoDrawBitmap( const wxBitmap& rBmp
-                              ,wxCoord         vX
-                              ,wxCoord         vY
-                              ,bool            bUseMask = FALSE
-                             );
-    virtual bool DoBlit( wxCoord vXdest
-                        ,wxCoord vYdest
-                        ,wxCoord vWidth
-                        ,wxCoord vHeight
-                        ,wxDC*   pSource
-                        ,wxCoord vXsrc
-                        ,wxCoord vYsrc
-                        ,wxRasterOperationMode     nRop = wxCOPY
-                        ,bool    bUseMask = FALSE
-                        ,wxCoord vXsrcMask = -1
-                        ,wxCoord vYsrcMask = -1
-                       );
-
-    // init the dc
-    void Init(void);
-
-    wxPrintData                     m_printData;
-private:
-    DECLARE_CLASS(wxPrinterDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxPrinterDCImpl);
-}; // end of CLASS wxPrinterDC
-
-// Gets an HDC for the specified printer configuration
-WXHDC WXDLLIMPEXP_CORE wxGetPrinterDC(const wxPrintData& rData);
-
-#endif // wxUSE_PRINTING_ARCHITECTURE
-
-#endif
-    // _WX_DCPRINT_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dcscreen.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dcscreen.h
deleted file mode 100644
index 76b7243f68..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dcscreen.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/dcscreen.h
-// Purpose:     wxScreenDC class
-// Author:      David Webster
-// Modified by:
-// Created:     10/14/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OS2_DCSCREEN_H_
-#define _WX_OS2_DCSCREEN_H_
-
-#include "wx/dcscreen.h"
-#include "wx/os2/dc.h"
-
-class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxPMDCImpl
-{
- public:
-    // Create a DC representing the whole screen
-    wxScreenDCImpl( wxScreenDC *owner );
-
-    virtual void DoGetSize( int* pnWidth
-                           ,int* pnHeight
-                          ) const;
-
-private:
-    DECLARE_CLASS(wxScreenDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
-}; // end of CLASS wxScreenDC
-
-#endif
-    // _WX_DCSCREEN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dialog.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dialog.h
deleted file mode 100644
index e4136df3c9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dialog.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/dialog.h
-// Purpose:     wxDialog class
-// Author:      David Webster
-// Modified by:
-// Created:     10/14/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DIALOG_H_
-#define _WX_DIALOG_H_
-
-#include "wx/panel.h"
-
-WXDLLIMPEXP_DATA_CORE(extern const char) wxDialogNameStr[];
-
-class WXDLLIMPEXP_FWD_CORE wxDialogModalData;
-
-//
-// Dialog boxes
-//
-class WXDLLIMPEXP_CORE wxDialog: public wxDialogBase
-{
-public:
-
-  inline wxDialog() { Init(); }
-
-    // full ctor
-    wxDialog(wxWindow *parent, wxWindowID id,
-             const wxString& title,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = wxDEFAULT_DIALOG_STYLE,
-             const wxString& name = wxDialogNameStr)
-    {
-        Init();
-
-        (void)Create(parent, id, title, pos, size, style, name);
-    }
-
-    bool Create( wxWindow*       pParent
-                ,wxWindowID      vId
-                ,const wxString& rsTitle
-                ,const wxPoint&  rPos = wxDefaultPosition
-                ,const wxSize&   rSize = wxDefaultSize
-                ,long            lStyle = wxDEFAULT_DIALOG_STYLE
-                ,const wxString& rsName = wxDialogNameStr
-               );
-    virtual ~wxDialog();
-
-    // return true if we're showing the dialog modally
-    virtual bool IsModal() const { return m_modalData != NULL; }
-
-    // show the dialog modally and return the value passed to EndModal()
-    virtual int ShowModal();
-
-    // may be called to terminate the dialog with the given return code
-    virtual void EndModal(int retCode);
-
-    // implementation only from now on
-    // -------------------------------
-
-    // override some base class virtuals
-    virtual bool Show(bool show = true);
-
-    //
-    // Callbacks
-    //
-    virtual MRESULT OS2WindowProc( WXUINT   uMessage
-                                  ,WXWPARAM wParam
-                                  ,WXLPARAM lParam
-                                 );
-#if WXWIN_COMPATIBILITY_2_6
-
-    // Constructor with a modal flag, but no window id - the old convention
-    wxDEPRECATED( wxDialog( wxWindow*       pParent
-                           ,const wxString& rsTitle
-                           ,bool            bModal
-                           ,int             nX = -1
-                           ,int             nY = -1
-                           ,int             nWidth = 500
-                           ,int             nHeight = 500
-                           ,long            lStyle = wxDEFAULT_DIALOG_STYLE
-                           ,const wxString& rsName = wxDialogNameStr
-                          ) );
-
-    // just call Show() or ShowModal()
-    wxDEPRECATED( void SetModal(bool bFlag) );
-
-    // use IsModal()
-    wxDEPRECATED( bool IsModalShowing() const );
-
-#endif // WXWIN_COMPATIBILITY_2_6
-
-protected:
-    //
-    // Common part of all ctors
-    //
-    void Init(void);
-
-private:
-    wxWindow*                       m_pOldFocus;
-    bool        m_endModalCalled; // allow for closing within InitDialog
-
-    // this pointer is non-NULL only while the modal event loop is running
-    wxDialogModalData *m_modalData;
-
-    //
-    // While we are showing a modal dialog we disable the other windows using
-    // this object
-    //
-    class wxWindowDisabler*         m_pWindowDisabler;
-
-    DECLARE_DYNAMIC_CLASS(wxDialog)
-    wxDECLARE_NO_COPY_CLASS(wxDialog);
-}; // end of CLASS wxDialog
-
-#endif // _WX_DIALOG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dirdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dirdlg.h
deleted file mode 100644
index fa53c6857f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dirdlg.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/dirdlg.h
-// Purpose:     wxDirDialog class
-// Author:      David Webster
-// Modified by:
-// Created:     10/14/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DIRDLG_H_
-#define _WX_DIRDLG_H_
-
-#include "wx/dialog.h"
-
-WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxFileSelectorPromptStr[];
-
-class WXDLLIMPEXP_CORE wxDirDialog: public wxDirDialogBase
-{
-    DECLARE_DYNAMIC_CLASS(wxDirDialog)
-public:
-    wxDirDialog(wxWindow *parent, const wxString& message = wxFileSelectorPromptStr,
-        const wxString& defaultPath = "",
-        long style = 0, const wxPoint& pos = wxDefaultPosition);
-
-    int ShowModal();
-
-protected:
-    wxWindow *  m_parent;
-};
-
-#endif
-    // _WX_DIRDLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/disable.bmp b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/disable.bmp
deleted file mode 100644
index 8859e1b9ae..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/disable.bmp and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dnd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dnd.h
deleted file mode 100644
index c70a0d3e53..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/dnd.h
+++ /dev/null
@@ -1,98 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/dnd.h
-// Purpose:     declaration of the wxDropTarget class
-// Author:      David Webster
-// Modified by:
-// Created:     10/21/99
-// Copyright:   (c) 1999 David Webster
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef __OS2DNDH__
-#define __OS2DNDH__
-
-#if !wxUSE_DRAG_AND_DROP
-    #error  "You should #define wxUSE_DRAG_AND_DROP to 1 to compile this file!"
-#endif  //WX_DRAG_DROP
-
-#define INCL_WINSTDDRAG
-#include <os2.h>
-#ifndef __EMX__
-#include <pmstddlg.h>
-#endif
-
-class CIDropTarget;
-
-//-------------------------------------------------------------------------
-// wxDropSource
-//-------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase
-{
-public:
-    /* constructor. set data later with SetData() */
-    wxDropSource(wxWindow* pWin);
-
-    /* constructor for setting one data object */
-    wxDropSource( wxDataObject& rData,
-                  wxWindow*     pWin
-                );
-    virtual ~wxDropSource();
-
-    /* start drag action */
-    virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
-    virtual bool         GiveFeedback(wxDragResult eEffect);
-
-protected:
-    void Init(void);
-
-    ULONG                           m_ulItems;
-    PDRAGINFO                       m_pDragInfo;
-    DRAGIMAGE                       m_vDragImage;
-    PDRAGITEM                       m_pDragItem;
-    wxWindow*                       m_pWindow;
-}; // end of CLASS wxDropSource
-
-//-------------------------------------------------------------------------
-// wxDropTarget
-//-------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDropTarget : public wxDropTargetBase
-{
-public:
-    wxDropTarget(wxDataObject* pDataObject = NULL);
-    virtual ~wxDropTarget();
-
-    //
-    // These functions are called when data is moved over position (x, y) and
-    // may return either wxDragCopy, wxDragMove or wxDragNone depending on
-    // what would happen if the data were dropped here.
-    //
-    // The last parameter is what would happen by default and is determined by
-    // the platform-specific logic (for example, under Windows it's wxDragCopy
-    // if Ctrl key is pressed and wxDragMove otherwise) except that it will
-    // always be wxDragNone if the carried data is in an unsupported format.
-    //
-    // OnData must be implemented and other should be overridden by derived classes
-    //
-    virtual wxDragResult OnData( wxCoord      vX
-                                ,wxCoord      vY
-                                ,wxDragResult eResult
-                               );
-    virtual bool         OnDrop( wxCoord vX
-                                ,wxCoord vY
-                               );
-            bool         IsAcceptedData(PDRAGINFO pDataSource) const;
-
-protected:
-    virtual bool         GetData(void);
-            wxDataFormat GetSupportedFormat(PDRAGINFO pDataSource) const;
-            void         Release(void);
-
-private:
-    CIDropTarget*                   m_pDropTarget;
-}; // end of CLASS wxDropTarget
-
-#endif //__OS2DNDH__
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/drive.ico b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/drive.ico
deleted file mode 100644
index 06ed593368..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/drive.ico and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/error.ico b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/error.ico
deleted file mode 100644
index d921d22f7a..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/error.ico and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/file.ico b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/file.ico
deleted file mode 100644
index a0769fac51..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/file.ico and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/filedlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/filedlg.h
deleted file mode 100644
index 74c789dbf0..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/filedlg.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/filedlg.h
-// Purpose:     wxFileDialog class
-// Author:      David Webster
-// Modified by:
-// Created:     10/05/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FILEDLG_H_
-#define _WX_FILEDLG_H_
-
-//-------------------------------------------------------------------------
-// wxFileDialog
-//-------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase
-{
-DECLARE_DYNAMIC_CLASS(wxFileDialog)
-public:
-    wxFileDialog( wxWindow*       pParent
-                 ,const wxString& rsMessage = wxFileSelectorPromptStr
-                 ,const wxString& rsDefaultDir = wxEmptyString
-                 ,const wxString& rsDefaultFile = wxEmptyString
-                 ,const wxString& rsWildCard = wxFileSelectorDefaultWildcardStr
-                 ,long            lStyle = wxFD_DEFAULT_STYLE
-                 ,const wxPoint&  rPos = wxDefaultPosition,
-                  const wxSize& sz = wxDefaultSize,
-                  const wxString& name = wxFileDialogNameStr
-                );
-
-    virtual void GetPaths(wxArrayString& rasPath) const;
-
-    int ShowModal();
-
-protected:
-    wxArrayString m_fileNames;
-}; // end of CLASS wxFileDialog
-
-#endif // _WX_FILEDLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/floppy.ico b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/floppy.ico
deleted file mode 100644
index 823094f1e5..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/floppy.ico and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/folder.ico b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/folder.ico
deleted file mode 100644
index 317fe37393..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/folder.ico and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/folder1.ico b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/folder1.ico
deleted file mode 100644
index 317fe37393..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/folder1.ico and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/folder2.ico b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/folder2.ico
deleted file mode 100644
index b35a1469ec..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/folder2.ico and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/font.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/font.h
deleted file mode 100644
index 2d5f39f54f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/font.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/font.h
-// Purpose:     wxFont class
-// Author:      David Webster
-// Modified by:
-// Created:     10/06/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FONT_H_
-#define _WX_FONT_H_
-
-#include "wx/gdiobj.h"
-#include "wx/os2/private.h"
-
-WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxEmptyString;
-
-// ----------------------------------------------------------------------------
-// wxFont
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxFont : public wxFontBase
-{
-public:
-    // ctors and such
-    wxFont() { }
-
-    wxFont(const wxFontInfo& info)
-    {
-        Create(info.GetPointSize(),
-               info.GetFamily(),
-               info.GetStyle(),
-               info.GetWeight(),
-               info.IsUnderlined(),
-               info.GetFaceName(),
-               info.GetEncoding());
-
-        if ( info.IsUsingSizeInPixels() )
-            SetPixelSize(info.GetPixelSize());
-    }
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxFont(int size,
-           int family,
-           int style,
-           int weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
-    }
-#endif
-
-    wxFont(int size,
-           wxFontFamily family,
-           wxFontStyle style,
-           wxFontWeight weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        Create(size, family, style, weight, underlined, face, encoding);
-    }
-
-    wxFont(const wxSize& pixelSize,
-           wxFontFamily family,
-           wxFontStyle style,
-           wxFontWeight weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        Create(10, family, style, weight, underlined, face, encoding);
-        SetPixelSize(pixelSize);
-    }
-
-    bool Create(int size,
-                wxFontFamily family,
-                wxFontStyle style,
-                wxFontWeight weight,
-                bool underlined = false,
-                const wxString& face = wxEmptyString,
-                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
-
-    wxFont( const wxNativeFontInfo& rInfo
-           ,WXHFONT                 hFont = 0
-          )
-
-    {
-        (void)Create( rInfo
-                     ,hFont
-                    );
-    }
-
-    wxFont(const wxString& rsFontDesc);
-
-    bool Create( const wxNativeFontInfo& rInfo
-                ,WXHFONT                 hFont = 0
-               );
-
-    virtual ~wxFont();
-
-    //
-    // Implement base class pure virtuals
-    //
-    virtual int               GetPointSize(void) const;
-    virtual wxFontStyle GetStyle() const;
-    virtual wxFontWeight GetWeight() const;
-    virtual bool              GetUnderlined(void) const;
-    virtual wxString          GetFaceName(void) const;
-    virtual wxFontEncoding    GetEncoding(void) const;
-    virtual const wxNativeFontInfo* GetNativeFontInfo() const;
-
-    virtual void SetPointSize(int nPointSize);
-    virtual void SetFamily(wxFontFamily family);
-    virtual void SetStyle(wxFontStyle style);
-    virtual void SetWeight(wxFontWeight weight);
-    virtual bool SetFaceName(const wxString& rsFaceName);
-    virtual void SetUnderlined(bool bUnderlined);
-    virtual void SetEncoding(wxFontEncoding vEncoding);
-
-    wxDECLARE_COMMON_FONT_METHODS();
-
-    //
-    // For internal use only!
-    //
-    void SetPS(HPS hPS);
-    void SetFM( PFONTMETRICS pFM
-               ,int          nNumFonts
-              );
-    //
-    // Implementation only from now on
-    // -------------------------------
-    //
-    virtual bool     IsFree(void) const;
-    virtual bool     RealizeResource(void);
-    virtual WXHANDLE GetResourceHandle(void) const;
-    virtual bool     FreeResource(bool bForce = false);
-
-    WXHFONT GetHFONT(void) const;
-
-protected:
-    virtual void DoSetNativeFontInfo(const wxNativeFontInfo& rInfo);
-    virtual wxFontFamily DoGetFamily() const;
-
-    // implement wxObject virtuals which are used by AllocExclusive()
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxFont)
-}; // end of wxFont
-
-#endif // _WX_FONT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/fontdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/fontdlg.h
deleted file mode 100644
index c2e65c10e7..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/fontdlg.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/fontdlg.h
-// Purpose:     wxFontDialog class. Use generic version if no
-//              platform-specific implementation.
-// Author:      David Webster
-// Modified by:
-// Created:     10/06/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FONTDLG_H_
-#define _WX_FONTDLG_H_
-
-#include "wx/dialog.h"
-
-/*
- * Font dialog
- */
-
-class WXDLLIMPEXP_CORE wxFontDialog: public wxFontDialogBase
-{
-public:
-    wxFontDialog() : wxFontDialogBase() { /* must be Create()d later */ }
-    wxFontDialog (wxWindow* pParent) : wxFontDialogBase(pParent) { Create(pParent); }
-    wxFontDialog( wxWindow*         pParent
-                 ,const wxFontData& rData
-                )
-                : wxFontDialogBase( pParent
-                                   ,rData
-                                  )
-    {
-        Create( pParent
-               ,rData
-              );
-    }
-
-    virtual int ShowModal();
-
-#if WXWIN_COMPATIBILITY_2_6
-    //
-    // Deprecated interface, don't use
-    //
-    wxDEPRECATED( wxFontDialog( wxWindow* pParent, const wxFontData* pData ) );
-#endif // WXWIN_COMPATIBILITY_2_6
-
-protected:
-    DECLARE_DYNAMIC_CLASS(wxFontDialog)
-}; // end of CLASS wxFontDialog
-
-#if WXWIN_COMPATIBILITY_2_6
-    // deprecated interface, don't use
-inline wxFontDialog::wxFontDialog(wxWindow *parent, const wxFontData *data)
-        : wxFontDialogBase(parent) { InitFontData(data); Create(parent); }
-#endif // WXWIN_COMPATIBILITY_2_6
-
-#endif
-    // _WX_FONTDLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/frame.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/frame.h
deleted file mode 100644
index e337086b95..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/frame.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/frame.h
-// Purpose:     wxFrame class
-// Author:      David Webster
-// Modified by:
-// Created:     10/27/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FRAME_H_
-#define _WX_FRAME_H_
-
-//
-// Get the default resource ID's for frames
-//
-#include "wx/os2/wxrsc.h"
-
-class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase
-{
-public:
-    // construction
-    wxFrame() { Init(); }
-    wxFrame( wxWindow*       pParent
-               ,wxWindowID      vId
-               ,const wxString& rsTitle
-               ,const wxPoint&  rPos = wxDefaultPosition
-               ,const wxSize&   rSize = wxDefaultSize
-               ,long            lStyle = wxDEFAULT_FRAME_STYLE
-               ,const wxString& rsName = wxFrameNameStr
-              )
-    {
-        Init();
-
-        Create(pParent, vId, rsTitle, rPos, rSize, lStyle, rsName);
-    }
-
-    bool Create( wxWindow*       pParent
-                ,wxWindowID      vId
-                ,const wxString& rsTitle
-                ,const wxPoint&  rPos = wxDefaultPosition
-                ,const wxSize&   rSize = wxDefaultSize
-                ,long            lStyle = wxDEFAULT_FRAME_STYLE
-                ,const wxString& rsName = wxFrameNameStr
-               );
-
-    virtual ~wxFrame();
-
-    // implement base class pure virtuals
-#if wxUSE_MENUS_NATIVE
-    virtual void SetMenuBar(wxMenuBar* pMenubar);
-#endif
-    virtual bool ShowFullScreen( bool bShow
-                                ,long lStyle = wxFULLSCREEN_ALL
-                               );
-
-
-    // implementation only from now on
-    // -------------------------------
-
-    virtual void Raise(void);
-
-    // event handlers
-    void OnSysColourChanged(wxSysColourChangedEvent& rEvent);
-
-    // Toolbar
-#if wxUSE_TOOLBAR
-    virtual wxToolBar* CreateToolBar( long            lStyle = -1
-                                     ,wxWindowID      vId = -1
-                                     ,const wxString& rsName = wxToolBarNameStr
-                                    );
-
-    virtual wxToolBar* OnCreateToolBar( long            lStyle
-                                       ,wxWindowID      vId
-                                       ,const wxString& rsName
-                                      );
-    virtual void       PositionToolBar(void);
-#endif // wxUSE_TOOLBAR
-
-    // Status bar
-#if wxUSE_STATUSBAR
-    virtual wxStatusBar* OnCreateStatusBar( int             nNumber = 1
-                                           ,long            lStyle = wxSTB_DEFAULT_STYLE
-                                           ,wxWindowID      vId = 0
-                                           ,const wxString& rsName = wxStatusLineNameStr
-                                          );
-    virtual void PositionStatusBar(void);
-
-    // Hint to tell framework which status bar to use: the default is to use
-    // native one for the platforms which support it (Win32), the generic one
-    // otherwise
-
-    // TODO: should this go into a wxFrameworkSettings class perhaps?
-    static void UseNativeStatusBar(bool bUseNative)
-        { m_bUseNativeStatusBar = bUseNative; }
-    static bool UsesNativeStatusBar()
-        { return m_bUseNativeStatusBar; }
-#endif // wxUSE_STATUSBAR
-
-    WXHMENU GetWinMenu() const { return m_hMenu; }
-
-    // Returns the origin of client area (may be different from (0,0) if the
-    // frame has a toolbar)
-    virtual wxPoint GetClientAreaOrigin() const;
-
-    // event handlers
-    bool HandlePaint(void);
-    bool HandleSize( int    nX
-                    ,int    nY
-                    ,WXUINT uFlag
-                   );
-    bool HandleCommand( WXWORD wId
-                       ,WXWORD wCmd
-                       ,WXHWND wControl
-                      );
-    bool HandleMenuSelect( WXWORD  wItem
-                          ,WXWORD  wFlags
-                          ,WXHMENU hMenu
-                         );
-
-    // tooltip management
-#if wxUSE_TOOLTIPS
-    WXHWND GetToolTipCtrl(void) const { return m_hWndToolTip; }
-    void   SetToolTipCtrl(WXHWND hHwndTT) { m_hWndToolTip = hHwndTT; }
-#endif // tooltips
-
-    void      SetClient(WXHWND    c_Hwnd);
-    void      SetClient(wxWindow* c_Window);
-    wxWindow *GetClient();
-
- friend MRESULT EXPENTRY wxFrameWndProc(HWND  hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
- friend MRESULT EXPENTRY wxFrameMainWndProc(HWND  hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
-
-protected:
-    // common part of all ctors
-    void         Init(void);
-
-    virtual WXHICON GetDefaultIcon(void) const;
-    // override base class virtuals
-    virtual void DoGetClientSize( int* pWidth
-                                 ,int* pHeight
-                                ) const;
-    virtual void DoSetClientSize( int nWidth
-                                 ,int nWeight
-                                );
-    inline virtual bool IsMDIChild(void) const { return FALSE; }
-
-#if wxUSE_MENUS_NATIVE
-    // helper
-    void         DetachMenuBar(void);
-    // perform MSW-specific action when menubar is changed
-    virtual void AttachMenuBar(wxMenuBar* pMenubar);
-    // a plug in for MDI frame classes which need to do something special when
-    // the menubar is set
-    virtual void InternalSetMenuBar(void);
-#endif
-    // propagate our state change to all child frames
-    void IconizeChildFrames(bool bIconize);
-
-    // we add menu bar accel processing
-    bool OS2TranslateMessage(WXMSG* pMsg);
-
-    // window proc for the frames
-    MRESULT OS2WindowProc( WXUINT   uMessage
-                          ,WXWPARAM wParam
-                          ,WXLPARAM lParam
-                         );
-
-    bool                            m_bIconized;
-    WXHICON                         m_hDefaultIcon;
-
-#if wxUSE_STATUSBAR
-    static bool                     m_bUseNativeStatusBar;
-#endif // wxUSE_STATUSBAR
-
-    // Data to save/restore when calling ShowFullScreen
-    long                            m_lFsStyle;           // Passed to ShowFullScreen
-    wxRect                          m_vFsOldSize;
-    long                            m_lFsOldWindowStyle;
-    int                             m_nFsStatusBarFields; // 0 for no status bar
-    int                             m_nFsStatusBarHeight;
-    int                             m_nFsToolBarHeight;
-    bool                            m_bFsIsMaximized;
-    bool                            m_bFsIsShowing;
-    bool                            m_bWasMinimized;
-    bool                            m_bIsShown;
-
-private:
-#if wxUSE_TOOLTIPS
-    WXHWND                          m_hWndToolTip;
-#endif // tooltips
-
-    //
-    // Handles to child windows of the Frame, and the frame itself,
-    // that we don't have child objects for (m_hWnd in wxWindow is the
-    // handle of the Frame's client window!
-    //
-    WXHWND                          m_hTitleBar;
-    WXHWND                          m_hHScroll;
-    WXHWND                          m_hVScroll;
-
-    //
-    // Swp structures for various client data
-    // DW: Better off in attached RefData?
-    //
-    SWP                             m_vSwpTitleBar;
-    SWP                             m_vSwpMenuBar;
-    SWP                             m_vSwpHScroll;
-    SWP                             m_vSwpVScroll;
-    SWP                             m_vSwpStatusBar;
-    SWP                             m_vSwpToolBar;
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxFrame)
-};
-
-MRESULT EXPENTRY wxFrameWndProc(HWND  hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
-MRESULT EXPENTRY wxFrameMainWndProc(HWND  hWnd,ULONG ulMsg, MPARAM wParam, MPARAM lParam);
-#endif
-    // _WX_FRAME_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/gauge.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/gauge.h
deleted file mode 100644
index faac3db4b8..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/gauge.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/gauge.h
-// Purpose:     wxGauge class
-// Author:      David Webster
-// Modified by:
-// Created:     10/06/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GAUGE_H_
-#define _WX_GAUGE_H_
-
-class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase
-{
-public:
-    inline wxGauge() { m_nRangeMax = 0; m_nGaugePos = 0; }
-
-    inline wxGauge( wxWindow*          pParent
-                   ,wxWindowID         vId
-                   ,int                nRange
-                   ,const wxPoint&     rPos = wxDefaultPosition
-                   ,const wxSize&      rSize = wxDefaultSize
-                   ,long               lStyle = wxGA_HORIZONTAL
-                   ,const wxValidator& rValidator = wxDefaultValidator
-                   ,const wxString&    rsName = wxGaugeNameStr
-                  )
-    {
-        Create( pParent
-               ,vId
-               ,nRange
-               ,rPos
-               ,rSize
-               ,lStyle
-               ,rValidator
-               ,rsName
-              );
-    }
-
-    bool Create( wxWindow*          pParent
-                ,wxWindowID         vId
-                ,int                nRange
-                ,const wxPoint&     rPos = wxDefaultPosition
-                ,const wxSize&      rSize = wxDefaultSize
-                ,long               lStyle = wxGA_HORIZONTAL
-                ,const wxValidator& rValidator = wxDefaultValidator
-                ,const wxString&    rsName = wxGaugeNameStr
-               );
-
-    int  GetShadowWidth(void) const;
-    int  GetBezelFace(void) const;
-    int  GetRange(void) const;
-    int  GetValue(void) const;
-
-    bool SetBackgroundColour(const wxColour& rColour);
-    void SetBezelFace(int nWidth);
-    bool SetForegroundColour(const wxColour& rColour);
-    void SetRange(int nRange);
-    void SetShadowWidth(int nWidth);
-    void SetValue(int nPos);
-
-    inline virtual bool AcceptsFocus(void) const { return FALSE; }
-    inline virtual void Command(wxCommandEvent& WXUNUSED(rEvent)) {}
-
-protected:
-    int                             m_nRangeMax;
-    int                             m_nGaugePos;
-    int                             m_nWidth;
-    int                             m_nHeight;
-
-    wxSize DoGetBestSize(void) const;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxGauge)
-}; // end of CLASS wxGauge
-
-#endif // _WX_GAUGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/gdiimage.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/gdiimage.h
deleted file mode 100644
index 45814eb0ec..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/gdiimage.h
+++ /dev/null
@@ -1,251 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/gdiimage.h
-// Purpose:     wxGDIImage class: base class for wxBitmap, wxIcon, wxCursor
-//              under OS/2
-// Author:      David Webster (adapted from msw version by Vadim Zeitlin)
-// Modified by:
-// Created:     20.11.99
-// Copyright:   (c) 1999 David Webster
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// NB: this is a private header, it is not intended to be directly included by
-//     user code (but may be included from other, public, wxWin headers
-
-#ifndef _WX_OS2_GDIIMAGE_H_
-#define _WX_OS2_GDIIMAGE_H_
-
-#include "wx/gdiobj.h"          // base class
-#include "wx/gdicmn.h"          // wxBITMAP_TYPE_INVALID
-#include "wx/list.h"
-
-class WXDLLIMPEXP_FWD_CORE wxGDIImageRefData;
-class WXDLLIMPEXP_FWD_CORE wxGDIImageHandler;
-class WXDLLIMPEXP_FWD_CORE wxGDIImage;
-
-WX_DECLARE_EXPORTED_LIST(wxGDIImageHandler, wxGDIImageHandlerList);
-
-// ----------------------------------------------------------------------------
-// wxGDIImageRefData: common data fields for all derived classes
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxGDIImageRefData : public wxGDIRefData
-{
-public:
-    wxGDIImageRefData()
-    {
-        m_nWidth = m_nHeight = m_nDepth = 0;
-
-        m_hHandle = 0;
-    }
-
-    // accessors
-    virtual bool IsOk() const
-    {
-        if (m_hHandle == 0)
-            return false;
-        return true;
-    }
-
-    void SetSize( int nW
-                 ,int nH
-                )
-        { m_nWidth = nW; m_nHeight = nH; }
-
-    // free the ressources we allocated
-    virtual void Free() { }
-
-    // for compatibility, the member fields are public
-
-    // the size of the image
-    int                             m_nWidth;
-    int                             m_nHeight;
-
-    // the depth of the image
-    int                             m_nDepth;
-
-    // the handle to it
-    union
-    {
-        WXHANDLE                    m_hHandle;     // for untyped access
-        WXHBITMAP                   m_hBitmap;
-        WXHICON                     m_hIcon;
-        WXHCURSOR                   m_hCursor;
-    };
-
-    unsigned int                    m_uId;
-};
-
-// ----------------------------------------------------------------------------
-// wxGDIImageHandler: a class which knows how to load/save wxGDIImages.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxGDIImageHandler : public wxObject
-{
-public:
-    // ctor
-    wxGDIImageHandler() { m_lType = wxBITMAP_TYPE_INVALID; }
-    wxGDIImageHandler( const wxString& rName
-                      ,const wxString& rExt
-                      ,wxBitmapType    lType
-                     )
-                     : m_sName(rName)
-                     , m_sExtension(rExt)
-    {
-        m_lType = lType;
-    }
-
-    // accessors
-    void SetName(const wxString& rName) { m_sName = rName; }
-    void SetExtension(const wxString& rExt) { m_sExtension = rExt; }
-    void SetType(wxBitmapType lType) { m_lType = lType; }
-
-    wxString GetName() const { return m_sName; }
-    wxString GetExtension() const { return m_sExtension; }
-    wxBitmapType GetType() const { return m_lType; }
-
-    // real handler operations: to implement in derived classes
-    virtual bool Create( wxGDIImage* pImage
-                        ,const void* pData
-                        ,wxBitmapType lFlags
-                        ,int         nWidth
-                        ,int         nHeight
-                        ,int         nDepth = 1
-                       ) = 0;
-    virtual bool Load( wxGDIImage*     pImage
-                      ,const wxString& rName
-                      ,HPS             hPs
-                      ,wxBitmapType    lFlags
-                      ,int             nDesiredWidth
-                      ,int             nDesiredHeight
-                     ) = 0;
-    virtual bool Load( wxGDIImage*     pImage
-                      ,int             nId
-                      ,wxBitmapType    lFlags
-                      ,int             nDesiredWidth
-                      ,int             nDesiredHeight
-                     ) = 0;
-    virtual bool Save( const wxGDIImage* pImage
-                      ,const wxString&   rName
-                      ,wxBitmapType      lType
-                     ) const = 0;
-
-protected:
-    wxString                        m_sName;
-    wxString                        m_sExtension;
-    wxBitmapType                    m_lType;
-}; // end of wxGDIImageHandler
-
-// ----------------------------------------------------------------------------
-// wxGDIImage: this class supports GDI image handlers which may be registered
-// dynamically and will be used for loading/saving the images in the specified
-// format. It also falls back to wxImage if no appropriate image is found.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxGDIImage : public wxGDIObject
-{
-public:
-    // handlers list interface
-    static wxGDIImageHandlerList& GetHandlers() { return ms_handlers; }
-
-    static void AddHandler(wxGDIImageHandler* hHandler);
-    static void InsertHandler(wxGDIImageHandler* hHandler);
-    static bool RemoveHandler(const wxString& rName);
-
-    static wxGDIImageHandler* FindHandler(const wxString& rName);
-    static wxGDIImageHandler* FindHandler(const wxString& rExtension, wxBitmapType lType);
-    static wxGDIImageHandler* FindHandler(wxBitmapType lType);
-
-    static void InitStandardHandlers();
-    static void CleanUpHandlers();
-
-    // access to the ref data casted to the right type
-    wxGDIImageRefData *GetGDIImageData() const
-        { return (wxGDIImageRefData *)m_refData; }
-
-    // create data if we don't have it yet
-    void EnsureHasData() { if ( IsNull() ) m_refData = CreateData(); }
-
-    // accessors
-    WXHANDLE GetHandle() const
-    {
-        wxGDIImageRefData*               pData;
-
-        pData = GetGDIImageData();
-        if (!pData)
-            return 0;
-        else
-            return pData->m_hHandle;
-    }
-    void SetHandle(WXHANDLE hHandle)
-    {
-        wxGDIImageRefData*               pData;
-
-        EnsureHasData();
-        pData = GetGDIImageData();
-        pData->m_hHandle = hHandle;
-    }
-
-    int GetWidth() const { return IsNull() ? 0 : GetGDIImageData()->m_nWidth; }
-    int GetHeight() const { return IsNull() ? 0 : GetGDIImageData()->m_nHeight; }
-    int GetDepth() const { return IsNull() ? 0 : GetGDIImageData()->m_nDepth; }
-
-    wxSize GetSize() const
-    {
-        return IsNull() ? wxSize(0,0) :
-               wxSize(GetGDIImageData()->m_nWidth, GetGDIImageData()->m_nHeight);
-    }
-
-    void SetWidth(int nW) { EnsureHasData(); GetGDIImageData()->m_nWidth = nW; }
-    void SetHeight(int nH) { EnsureHasData(); GetGDIImageData()->m_nHeight = nH; }
-    void SetDepth(int nD) { EnsureHasData(); GetGDIImageData()->m_nDepth = nD; }
-
-    void SetSize( int nW
-                 ,int nH
-                )
-    {
-        EnsureHasData();
-        GetGDIImageData()->SetSize(nW, nH);
-    }
-    void SetSize(const wxSize& rSize) { SetSize(rSize.x, rSize.y); }
-
-    unsigned int GetId(void) const
-    {
-        wxGDIImageRefData*          pData;
-
-        pData = GetGDIImageData();
-        if (!pData)
-            return 0;
-        else
-            return pData->m_uId;
-    } // end of WxWinGdi_CGDIImage::GetId
-    void SetId(unsigned int uId)
-    {
-        wxGDIImageRefData*          pData;
-
-        EnsureHasData();
-        pData = GetGDIImageData();
-        pData->m_uId = uId;
-    }
-    // forward some of base class virtuals to wxGDIImageRefData
-    bool             FreeResource(bool bForce = false);
-    virtual WXHANDLE GetResourceHandle() const;
-
-protected:
-    // create the data for the derived class here
-    virtual wxGDIImageRefData* CreateData() const = 0;
-    virtual wxGDIRefData *CreateGDIRefData() const { return CreateData(); }
-
-    // we can't [efficiently] clone objects of this class
-    virtual wxGDIRefData *
-    CloneGDIRefData(const wxGDIRefData *WXUNUSED(data)) const
-    {
-        wxFAIL_MSG( wxT("must be implemented if used") );
-
-        return NULL;
-    }
-
-    static wxGDIImageHandlerList    ms_handlers;
-};
-
-#endif // _WX_MSW_GDIIMAGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/hand.ptr b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/hand.ptr
deleted file mode 100644
index 4dfcca7cee..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/hand.ptr and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/heart.ptr b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/heart.ptr
deleted file mode 100644
index e2e9519fb5..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/heart.ptr and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/helpwin.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/helpwin.h
deleted file mode 100644
index 7013ae5db6..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/helpwin.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/helpwin.h
-// Purpose:     Help system: native implementation for your system.
-// Author:      David Webster
-// Modified by:
-// Created:     10/09/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_HELPWIN_H_
-#define _WX_HELPWIN_H_
-
-#include "wx/wx.h"
-
-#if wxUSE_HELP
-
-#include "wx/helpbase.h"
-
-class WXDLLIMPEXP_CORE wxWinHelpController: public wxHelpControllerBase
-{
-  DECLARE_CLASS(wxWinHelpController)
-
- public:
-  wxWinHelpController();
-  virtual ~wxWinHelpController();
-
-  // Must call this to set the filename and server name
-  virtual bool Initialize(const wxString& file);
-
-  // If file is "", reloads file given  in Initialize
-  virtual bool LoadFile(const wxString& file = wxEmptyString);
-  virtual bool DisplayContents();
-  virtual bool DisplaySection(int sectionNo);
-  virtual bool DisplayBlock(long blockNo);
-  virtual bool KeywordSearch(const wxString& k,
-                             wxHelpSearchMode mode = wxHELP_SEARCH_ALL);
-
-  virtual bool Quit();
-  virtual void OnQuit();
-
-  inline wxString GetHelpFile() const { return m_helpFile; }
-
-protected:
-  wxString m_helpFile;
-private:
-    // virtual function hiding supression :: do not use
-    bool Initialize(const wxString& rFile, int WXUNUSED(nServer) ) { return(Initialize(rFile)); }
-    bool DisplaySection(const wxString& rSection) { return wxHelpControllerBase::DisplaySection(rSection); }
-};
-
-#endif //wxUSE_HELP
-
-#endif
-    // _WX_HELPWIN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/icon.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/icon.h
deleted file mode 100644
index 1248f619f8..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/icon.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/icon.h
-// Purpose:     wxIcon class
-// Author:      David Webster
-// Modified by:
-// Created:     10/09/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_ICON_H_
-#define _WX_ICON_H_
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/bitmap.h"
-#include "wx/os2/gdiimage.h"
-
-#define wxIconRefDataBase   wxGDIImageRefData
-#define wxIconBase          wxGDIImage
-
-class WXDLLIMPEXP_CORE wxIconRefData: public wxIconRefDataBase
-{
-public:
-    wxIconRefData() { }
-    virtual ~wxIconRefData() { Free(); }
-
-    virtual void Free();
-}; // end of
-
-// ---------------------------------------------------------------------------
-// Icon
-// ---------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxIcon: public wxIconBase
-{
-public:
-    wxIcon();
-
-    wxIcon( const char bits[]
-           ,int        nWidth
-           ,int        nHeight
-          );
-    wxIcon(const char* const* ppData) { CreateIconFromXpm(ppData); }
-#ifdef wxNEEDS_CHARPP
-    wxIcon(char** ppData) { CreateIconFromXpm(const_cast<const char* const*>(ppData)); }
-#endif
-    wxIcon( const wxString& rName
-           ,wxBitmapType    lFlags = wxICON_DEFAULT_TYPE
-           ,int             nDesiredWidth = -1
-           ,int             nDesiredHeight = -1
-          );
-    wxIcon(const wxIconLocation& loc)
-    {
-        LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICO);
-    }
-
-    virtual ~wxIcon();
-
-    bool LoadFile( const wxString& rName
-                  ,wxBitmapType    lFlags = wxICON_DEFAULT_TYPE
-                  ,int             nDesiredWidth = -1
-                  ,int             nDesiredHeight = -1
-                 );
-
-    wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; }
-
-    inline void SetHICON(WXHICON hIcon) { SetHandle((WXHANDLE)hIcon); }
-    inline WXHICON GetHICON() const { return (WXHICON)GetHandle(); }
-    inline bool    IsXpm(void) const { return m_bIsXpm; }
-    inline const wxBitmap& GetXpmSrc(void) const { return m_vXpmSrc; }
-
-    void CopyFromBitmap(const wxBitmap& rBmp);
-protected:
-    virtual wxGDIImageRefData* CreateData() const
-    {
-        return new wxIconRefData;
-    }
-    void    CreateIconFromXpm(const char* const* ppData);
-
-private:
-    bool                            m_bIsXpm;
-    wxBitmap                        m_vXpmSrc;
-
-    DECLARE_DYNAMIC_CLASS(wxIcon)
-};
-
-#endif
-    // _WX_ICON_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/info.ico b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/info.ico
deleted file mode 100644
index eccdd2e09c..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/info.ico and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/iniconf.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/iniconf.h
deleted file mode 100644
index 07cb3ef0ff..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/iniconf.h
+++ /dev/null
@@ -1,121 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/iniconf.h
-// Purpose:     INI-file based wxConfigBase implementation
-// Author:      David Webster
-// Modified by:
-// Created:     10/09/99
-// Copyright:   David Webster
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef   _INICONF_H
-#define   _INICONF_H
-
-// ----------------------------------------------------------------------------
-// wxIniConfig is a wxConfig implementation which uses MS Windows INI files to
-// store the data. Because INI files don't really support arbitrary nesting of
-// groups, we do the following:
-//  (1) in win.ini file we store all entries in the [vendor] section and
-//      the value group1/group2/key is mapped to the value group1_group2_key
-//      in this section, i.e. all path separators are replaced with underscore
-//  (2) in appname.ini file we map group1/group2/group3/key to the entry
-//      group2_group3_key in [group1]
-//
-// Of course, it might lead to indesirable results if '_' is also used in key
-// names (i.e. group/key is the same as group_key) and also GetPath() result
-// may be not what you would expect it to be.
-//
-// Another limitation: the keys and section names are never case-sensitive
-// which might differ from wxFileConfig it it was compiled with
-// wxCONFIG_CASE_SENSITIVE option.
-// ----------------------------------------------------------------------------
-
-// for this class, "local" file is the file appname.ini and the global file
-// is the [vendor] subsection of win.ini (default for "vendor" is to be the
-// same as appname). The file name (strAppName parameter) may, in fact,
-// contain the full path to the file. If it doesn't, the file is searched for
-// in the Windows directory.
-class WXDLLIMPEXP_CORE wxIniConfig : public wxConfigBase
-{
-public:
-  // ctor & dtor
-    // if strAppName doesn't contain the extension and is not an absolute path,
-    // ".ini" is appended to it. if strVendor is empty, it's taken to be the
-    // same as strAppName.
-  wxIniConfig(const wxString& strAppName = wxEmptyString, const wxString& strVendor = wxEmptyString,
-    const wxString& localFilename = wxEmptyString, const wxString& globalFilename = wxEmptyString, long style = wxCONFIG_USE_LOCAL_FILE);
-  virtual ~wxIniConfig();
-
-  // implement inherited pure virtual functions
-  virtual void SetPath(const wxString& strPath);
-  virtual const wxString& GetPath() const;
-
-  virtual bool GetFirstGroup(wxString& str, long& lIndex) const;
-  virtual bool GetNextGroup (wxString& str, long& lIndex) const;
-  virtual bool GetFirstEntry(wxString& str, long& lIndex) const;
-  virtual bool GetNextEntry (wxString& str, long& lIndex) const;
-
-  virtual size_t GetNumberOfEntries(bool bRecursive = FALSE) const;
-  virtual size_t GetNumberOfGroups(bool bRecursive = FALSE) const;
-
-  virtual bool HasGroup(const wxString& strName) const;
-  virtual bool HasEntry(const wxString& strName) const;
-
-  // return TRUE if the current group is empty
-  bool IsEmpty() const;
-
-  // read/write
-  bool Read(const wxString& key, wxString *pStr) const;
-  bool Read(const wxString& key, wxString *pStr, const wxString& szDefault) const;
-  bool Read(const wxString& key, long *plResult) const;
-
-  // The following are necessary to satisfy the compiler
-  wxString Read(const wxString& key, const wxString& defVal) const
-  { return wxConfigBase::Read(key, defVal); }
-  bool Read(const wxString& key, long *pl, long defVal) const
-  { return wxConfigBase::Read(key, pl, defVal); }
-  long Read(const wxString& key, long defVal) const
-  { return wxConfigBase::Read(key, defVal); }
-  bool Read(const wxString& key, int *pi, int defVal) const
-    { return wxConfigBase::Read(key, pi, defVal); }
-  bool Read(const wxString& key, int *pi) const
-    { return wxConfigBase::Read(key, pi); }
-  bool Read(const wxString& key, double* val) const
-  { return wxConfigBase::Read(key, val); }
-  bool Read(const wxString& key, double* val, double defVal) const
-  { return wxConfigBase::Read(key, val, defVal); }
-
-  bool Write(const wxString& key, const wxString& szValue);
-  bool Write(const wxString& key, long lValue);
-
-  virtual bool Flush(bool bCurrentOnly = FALSE);
-
-  virtual bool RenameEntry(const wxString& oldName, const wxString& newName);
-  virtual bool RenameGroup(const wxString& oldName, const wxString& newName);
-
-  virtual bool DeleteEntry(const wxString& Key, bool bGroupIfEmptyAlso);
-  virtual bool DeleteGroup(const wxString& szKey);
-  virtual bool DeleteAll();
-
-private:
-  // helpers
-  wxString GetPrivateKeyName(const wxString& szKey) const;
-  wxString GetKeyName(const wxString& szKey) const;
-
-  wxString m_strLocalFilename;  // name of the private INI file
-  wxString m_strGroup,    // current group in appname.ini file
-           m_strPath;     // the rest of the path (no trailing '_'!)
-  // Virtual function hiding
-  virtual bool Read(const wxString& key, bool* val) const
-  { return(wxConfigBase::Read(key, val));}
-  virtual bool Read(const wxString& key, bool* val, bool defVal) const
-  { return(wxConfigBase::Read(key, val, defVal));}
-  virtual bool Write(const wxString& key, double value)
-  { return(wxConfigBase::Write(key, value));}
-  virtual bool Write(const wxString& key, bool value)
-  { return(wxConfigBase::Write(key, value));}
-  virtual bool Write(const wxString& key, const char* value)
-  { return(wxConfigBase::Write(key, value));}
-};
-
-#endif  //_INICONF_H
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/joystick.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/joystick.h
deleted file mode 100644
index dd431d71d8..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/joystick.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/joystick.h
-// Purpose:     wxJoystick class
-// Author:      David Webster
-// Modified by:
-// Created:     10/09/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_JOYSTICK_H_
-#define _WX_JOYSTICK_H_
-
-#include "wx/event.h"
-
-class WXDLLIMPEXP_ADV wxJoystick: public wxObject
-{
-  DECLARE_DYNAMIC_CLASS(wxJoystick)
- public:
-  /*
-   * Public interface
-   */
-
-  wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }
-
-  // Attributes
-  ////////////////////////////////////////////////////////////////////////////
-
-  wxPoint GetPosition() const;
-  int GetZPosition() const;
-  int GetButtonState() const;
-  int GetPOVPosition() const;
-  int GetPOVCTSPosition() const;
-  int GetRudderPosition() const;
-  int GetUPosition() const;
-  int GetVPosition() const;
-  int GetMovementThreshold() const;
-  void SetMovementThreshold(int threshold) ;
-
-  // Capabilities
-  ////////////////////////////////////////////////////////////////////////////
-
-  bool IsOk() const; // Checks that the joystick is functioning
-  static int GetNumberJoysticks() ;
-  int GetManufacturerId() const ;
-  int GetProductId() const ;
-  wxString GetProductName() const ;
-  int GetXMin() const;
-  int GetYMin() const;
-  int GetZMin() const;
-  int GetXMax() const;
-  int GetYMax() const;
-  int GetZMax() const;
-  int GetNumberButtons() const;
-  int GetNumberAxes() const;
-  int GetMaxButtons() const;
-  int GetMaxAxes() const;
-  int GetPollingMin() const;
-  int GetPollingMax() const;
-  int GetRudderMin() const;
-  int GetRudderMax() const;
-  int GetUMin() const;
-  int GetUMax() const;
-  int GetVMin() const;
-  int GetVMax() const;
-
-  bool HasRudder() const;
-  bool HasZ() const;
-  bool HasU() const;
-  bool HasV() const;
-  bool HasPOV() const;
-  bool HasPOV4Dir() const;
-  bool HasPOVCTS() const;
-
-  // Operations
-  ////////////////////////////////////////////////////////////////////////////
-
-  // pollingFreq = 0 means that movement events are sent when above the threshold.
-  // If pollingFreq > 0, events are received every this many milliseconds.
-  bool SetCapture(wxWindow* win, int pollingFreq = 0);
-  bool ReleaseCapture();
-
-protected:
-  int       m_joystick;
-};
-
-#endif
-    // _WX_JOYSTICK_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/listbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/listbox.h
deleted file mode 100644
index dc6d6913b9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/listbox.h
+++ /dev/null
@@ -1,165 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/listbox.h
-// Purpose:     wxListBox class
-// Author:      David Webster
-// Modified by:
-// Created:     10/09/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_LISTBOX_H_
-#define _WX_LISTBOX_H_
-
-// ----------------------------------------------------------------------------
-// simple types
-// ----------------------------------------------------------------------------
-
-#if wxUSE_OWNER_DRAWN
-    class WXDLLIMPEXP_FWD_CORE wxOwnerDrawn;
-
-    // define the array of list box items
-    #include  "wx/dynarray.h"
-
-    WX_DEFINE_EXPORTED_ARRAY_PTR(wxOwnerDrawn *, wxListBoxItemsArray);
-#endif // wxUSE_OWNER_DRAWN
-
-// forward decl for GetSelections()
-class wxArrayInt;
-
-// ----------------------------------------------------------------------------
-// List box control
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase
-{
-public:
-    // ctors and such
-    wxListBox();
-    wxListBox( wxWindow*          pParent
-              ,wxWindowID         vId
-              ,const wxPoint&     rPos = wxDefaultPosition
-              ,const wxSize&      rSize = wxDefaultSize
-              ,int                n = 0
-              ,const wxString     asChoices[] = NULL
-              ,long               lStyle = 0
-              ,const wxValidator& rValidator = wxDefaultValidator
-              ,const wxString&    rsName = wxListBoxNameStr)
-    {
-        Create( pParent
-               ,vId
-               ,rPos
-               ,rSize
-               ,n
-               ,asChoices
-               ,lStyle
-               ,rValidator
-               ,rsName
-              );
-    }
-    wxListBox( wxWindow*            pParent
-              ,wxWindowID           vId
-              ,const wxPoint&       rPos
-              ,const wxSize&        rSize
-              ,const wxArrayString& asChoices
-              ,long                 lStyle = 0
-              ,const wxValidator&   rValidator = wxDefaultValidator
-              ,const wxString&      rsName = wxListBoxNameStr)
-    {
-        Create( pParent
-               ,vId
-               ,rPos
-               ,rSize
-               ,asChoices
-               ,lStyle
-               ,rValidator
-               ,rsName
-              );
-    }
-
-    bool Create( wxWindow*          pParent
-                ,wxWindowID         vId
-                ,const wxPoint&     rPos = wxDefaultPosition
-                ,const wxSize&      rSize = wxDefaultSize
-                ,int                n = 0
-                ,const wxString     asChoices[] = NULL
-                ,long               lStyle = 0
-                ,const wxValidator& rValidator = wxDefaultValidator
-                ,const wxString&    rsName = wxListBoxNameStr
-               );
-    bool Create( wxWindow*            pParent
-                ,wxWindowID           vId
-                ,const wxPoint&       rPos
-                ,const wxSize&        rSize
-                ,const wxArrayString& asChoices
-                ,long                 lStyle = 0
-                ,const wxValidator&   rValidator = wxDefaultValidator
-                ,const wxString&      rsName = wxListBoxNameStr
-               );
-
-    virtual ~wxListBox();
-
-    //
-    // Implement base class pure virtuals
-    //
-    virtual void          DoClear(void);
-    virtual void          DoDeleteOneItem(unsigned int n);
-
-    virtual unsigned int  GetCount() const;
-    virtual wxString      GetString(unsigned int n) const;
-    virtual void          SetString(unsigned int n, const wxString& rsString);
-
-    virtual bool          IsSelected(int n) const;
-    virtual void          DoSetSelection(int  n, bool bSelect);
-    virtual int           GetSelection(void) const;
-    virtual int           GetSelections(wxArrayInt& raSelections) const;
-
-    virtual void          DoSetFirstItem(int n);
-
-    virtual void          DoSetItemClientData(unsigned int n, void* pClientData);
-    virtual void*         DoGetItemClientData(unsigned int n) const;
-
-    //
-    // wxCheckListBox support
-    //
-#if wxUSE_OWNER_DRAWN
-    long                  OS2OnMeasure(WXMEASUREITEMSTRUCT *item);
-    bool                  OS2OnDraw(WXDRAWITEMSTRUCT *item);
-
-    virtual wxOwnerDrawn* CreateItem(size_t n);
-    wxOwnerDrawn*         GetItem(size_t n) const { return m_aItems[n]; }
-    int                   GetItemIndex(wxOwnerDrawn *item) const { return m_aItems.Index(item); }
-#endif // wxUSE_OWNER_DRAWN
-
-    bool                  OS2Command( WXUINT uParam
-                                     ,WXWORD wId
-                                    );
-    virtual void          SetupColours(void);
-
-protected:
-
-    bool                  HasMultipleSelection(void) const;
-    virtual wxSize        DoGetBestSize(void) const;
-
-    unsigned int          m_nNumItems;
-    int                   m_nSelected;
-
-#if wxUSE_OWNER_DRAWN
-    //
-    // Control items
-    //
-    wxListBoxItemsArray             m_aItems;
-#endif
-
-    //
-    // Implement base wxItemContainer virtuals
-    //
-    virtual int           DoInsertItems(const wxArrayStringsAdapter& items,
-                                        unsigned int pos,
-                                        void **clientData,
-                                        wxClientDataType type);
-
-    DECLARE_DYNAMIC_CLASS(wxListBox)
-}; // end of wxListBox
-
-#endif // _WX_LISTBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/listctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/listctrl.h
deleted file mode 100644
index 8f7aee9904..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/listctrl.h
+++ /dev/null
@@ -1,539 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/listctrl.h
-// Purpose:     wxListCtrl class
-// Author:
-// Modified by:
-// Created:
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_LISTCTRL_H_
-#define _WX_LISTCTRL_H_
-
-#if wxUSE_LISTCTRL
-
-#include "wx/control.h"
-#include "wx/event.h"
-#include "wx/hash.h"
-#include "wx/textctrl.h"
-
-
-class WXDLLIMPEXP_FWD_CORE wxImageList;
-
-typedef int (wxCALLBACK *wxListCtrlCompare)(long lItem1, long lItem2, long lSortData);
-
-class WXDLLIMPEXP_CORE wxListCtrl: public wxControl
-{
-public:
-    wxListCtrl() { Init(); }
-    wxListCtrl( wxWindow*          pParent
-               ,wxWindowID         vId = -1
-               ,const wxPoint&     rPos = wxDefaultPosition
-               ,const wxSize&      rSize = wxDefaultSize
-               ,long               lStyle = wxLC_ICON
-               ,const wxValidator& rValidator = wxDefaultValidator
-               ,const wxString&    rsName = wxListCtrlNameStr)
-    {
-        Init();
-        Create( pParent
-               ,vId
-               ,rPos
-               ,rSize
-               ,lStyle
-               ,rValidator
-               ,rsName
-              );
-    }
-    virtual ~wxListCtrl();
-
-    bool Create( wxWindow*          pParent
-                ,wxWindowID         vId = -1
-                ,const wxPoint&     rPos = wxDefaultPosition
-                ,const wxSize&      rSize = wxDefaultSize
-                ,long               lStyle = wxLC_ICON
-                ,const wxValidator& rValidator = wxDefaultValidator
-                ,const wxString&    rsName = wxListCtrlNameStr
-               );
-
-
-    // Attributes
-    ////////////////////////////////////////////////////////////////////////////
-    //
-
-    //
-    // Set the control colours
-    //
-    bool SetForegroundColour(const wxColour& rCol);
-    bool SetBackgroundColour(const wxColour& rCol);
-
-    //
-    // Information about this column
-    //
-    bool GetColumn( int nCol
-                   ,wxListItem& rItem
-                  ) const;
-    bool SetColumn( int         nCol
-                   ,wxListItem& rItem
-                  );
-
-    //
-    // Column width
-    //
-    int  GetColumnWidth(int nCol) const;
-    bool SetColumnWidth( int nCol
-                        ,int nWidth
-                       );
-
-    //
-    // Gets the number of items that can fit vertically in the
-    // visible area of the list control (list or report view)
-    // or the total number of items in the list control (icon
-    // or small icon view)
-    //
-    int GetCountPerPage(void) const;
-
-    wxRect GetViewRect() const;
-    //
-    // Gets the edit control for editing labels.
-    //
-    wxTextCtrl* GetEditControl(void) const;
-
-    //
-    // Information about the item
-    //
-    bool GetItem(wxListItem& rInfo) const;
-    bool SetItem(wxListItem& rInfo);
-
-    //
-    // Sets a string field at a particular column
-    //
-    long SetItem( long            lIndex
-                 ,int             nCol
-                 ,const wxString& rsLabel
-                 ,int             nImageId = -1
-                );
-
-    //
-    // Item state
-    //
-    int  GetItemState( long lItem
-                      ,long lStateMask
-                     ) const;
-    bool SetItemState( long lItem
-                      ,long lState
-                      ,long lStateMask
-                      );
-
-    //
-    // Sets the item image
-    //
-    bool SetItemImage( long lItem
-                      ,int  nImage
-                      ,int  lSelImage
-                     );
-    bool SetItemColumnImage( long lItem
-                            ,long lColumn
-                            ,int  nImage
-                           );
-
-    //
-    // Item text
-    //
-    wxString GetItemText(long lItem) const;
-    void     SetItemText( long            lItem
-                         ,const wxString& rsStr
-                        );
-
-    //
-    // Item data
-    //
-    long GetItemData(long lItem) const;
-    bool SetItemPtrData(long item, wxUIntPtr data);
-    bool SetItemData(long item, long data) { return SetItemPtrData(item, data); }
-
-    //
-    // Gets the item rectangle
-    //
-    bool GetItemRect( long    lItem
-                     ,wxRect& rRect
-                     ,int     nCode = wxLIST_RECT_BOUNDS
-                    ) const;
-
-    //
-    // Item position
-    //
-    bool GetItemPosition( long     lItem
-                         ,wxPoint& rPos
-                        ) const;
-    bool SetItemPosition( long           lItem
-                         ,const wxPoint& rPos
-                        );
-
-    //
-    // Gets the number of items in the list control
-    //
-    int  GetItemCount(void) const;
-
-    //
-    // Gets the number of columns in the list control
-    //
-    inline int GetColumnCount(void) const { return m_nColCount; }
-
-    //
-    // Retrieves the spacing between icons in pixels.
-    // If bIsSmall is true, gets the spacing for the small icon
-    // view, otherwise the large icon view.
-    //
-    int  GetItemSpacing(bool bIsSmall) const;
-
-    //
-    // Foreground colour of an item.
-    //
-    wxColour GetItemTextColour(long lItem) const;
-    void     SetItemTextColour( long            lItem
-                               ,const wxColour& rCol
-                              );
-
-    //
-    // Background colour of an item.
-    //
-    wxColour GetItemBackgroundColour(long lItem ) const;
-    void     SetItemBackgroundColour( long            lItem
-                                     ,const wxColour& rCol
-                                    );
-
-    //
-    // Gets the number of selected items in the list control
-    //
-    int      GetSelectedItemCount(void) const;
-
-    //
-    // Text colour of the listview
-    //
-    wxColour GetTextColour(void) const;
-    void     SetTextColour(const wxColour& rCol);
-
-    //
-    // Gets the index of the topmost visible item when in
-    // list or report view
-    //
-    long GetTopItem(void) const;
-
-    //
-    // Add or remove a single window style
-    void SetSingleStyle( long lStyle
-                        ,bool bAdd = true
-                       );
-
-    //
-    // Set the whole window style
-    //
-    void SetWindowStyleFlag(long lStyle);
-
-    //
-    // Searches for an item, starting from 'item'.
-    // item can be -1 to find the first item that matches the
-    // specified flags.
-    // Returns the item or -1 if unsuccessful.
-    long GetNextItem( long lItem
-                     ,int  nGeometry = wxLIST_NEXT_ALL
-                     ,int  lState = wxLIST_STATE_DONTCARE
-                    ) const;
-
-    //
-    // Gets one of the three image lists
-    //
-    wxImageList* GetImageList(int nWhich) const;
-
-    //
-    // Sets the image list
-    //
-    void SetImageList( wxImageList* pImageList
-                      ,int          nWhich
-                     );
-    void AssignImageList( wxImageList* pImageList
-                         ,int          nWhich
-                        );
-
-    //
-    // Returns true if it is a virtual list control
-    //
-    inline bool IsVirtual() const { return (GetWindowStyle() & wxLC_VIRTUAL) != 0; }
-
-    //
-    // Refresh items selectively (only useful for virtual list controls)
-    //
-    void RefreshItem(long lItem);
-    void RefreshItems( long lItemFrom
-                      ,long lItemTo
-                     );
-
-    //
-    // Operations
-    ////////////////////////////////////////////////////////////////////////////
-    //
-
-    //
-    // Arranges the items
-    //
-    bool Arrange(int nFlag = wxLIST_ALIGN_DEFAULT);
-
-    //
-    // Deletes an item
-    //
-    bool DeleteItem(long lItem);
-
-    //
-    // Deletes all items
-    bool DeleteAllItems(void);
-
-    //
-    // Deletes a column
-    //
-    bool DeleteColumn(int nCol);
-
-    //
-    // Deletes all columns
-    //
-    bool DeleteAllColumns(void);
-
-    //
-    // Clears items, and columns if there are any.
-    //
-    void ClearAll(void);
-
-    //
-    // Edit the label
-    //
-    wxTextCtrl* EditLabel( long         lItem
-                          ,wxClassInfo* pTextControlClass = wxCLASSINFO(wxTextCtrl)
-                         );
-
-    //
-    // End label editing, optionally cancelling the edit
-    //
-    bool EndEditLabel(bool bCancel);
-
-    //
-    // Ensures this item is visible
-    //
-    bool EnsureVisible(long lItem);
-
-    //
-    // Find an item whose label matches this string, starting from the item after 'start'
-    // or the beginning if 'start' is -1.
-    //
-    long FindItem( long            lStart
-                  ,const wxString& rsStr
-                  ,bool            bPartial = false
-                 );
-
-    //
-    // Find an item whose data matches this data, starting from the item after 'start'
-    // or the beginning if 'start' is -1.
-    //
-    long FindItem( long lStart
-                  ,long lData
-                 );
-
-    //
-    // Find an item nearest this position in the specified direction, starting from
-    // the item after 'start' or the beginning if 'start' is -1.
-    //
-    long FindItem( long           lStart
-                  ,const wxPoint& rPoint
-                  ,int            lDirection
-                 );
-
-    //
-    // Determines which item (if any) is at the specified point,
-    // giving details in 'flags' (see wxLIST_HITTEST_... flags above)
-    //
-    long HitTest( const wxPoint& rPoint
-                 ,int&           rFlags
-                );
-
-    //
-    // Inserts an item, returning the index of the new item if successful,
-    // -1 otherwise.
-    //
-    long InsertItem(wxListItem& rInfo);
-
-    //
-    // Insert a string item
-    //
-    long InsertItem( long            lIndex
-                    ,const wxString& rsLabel
-                   );
-
-    //
-    // Insert an image item
-    //
-    long InsertItem( long lIndex
-                    ,int  nImageIndex
-                   );
-
-    //
-    // Insert an image/string item
-    //
-    long InsertItem( long            lIndex
-                    ,const wxString& rsLabel
-                    ,int             nImageIndex
-                   );
-
-    //
-    // For list view mode (only), inserts a column.
-    //
-    long InsertColumn( long        lCol
-                      ,wxListItem& rInfo
-                     );
-
-    long InsertColumn( long            lCol
-                      ,const wxString& rsHeading
-                      ,int             nFormat = wxLIST_FORMAT_LEFT
-                      ,int             lWidth = -1
-                     );
-
-    //
-    // set the number of items in a virtual list control
-    //
-    void SetItemCount(long lCount);
-
-    //
-    // Scrolls the list control. If in icon, small icon or report view mode,
-    // x specifies the number of pixels to scroll. If in list view mode, x
-    // specifies the number of columns to scroll.
-    // If in icon, small icon or list view mode, y specifies the number of pixels
-    // to scroll. If in report view mode, y specifies the number of lines to scroll.
-    //
-    bool ScrollList( int nDx
-                    ,int nDy
-                   );
-
-    // Sort items.
-
-    //
-    // fn is a function which takes 3 long arguments: item1, item2, data.
-    // item1 is the long data associated with a first item (NOT the index).
-    // item2 is the long data associated with a second item (NOT the index).
-    // data is the same value as passed to SortItems.
-    // The return value is a negative number if the first item should precede the second
-    // item, a positive number of the second item should precede the first,
-    // or zero if the two items are equivalent.
-    //
-    // data is arbitrary data to be passed to the sort function.
-    //
-    bool SortItems( wxListCtrlCompare fn
-                   ,long              lData
-                  );
-
-    //
-    // IMPLEMENTATION
-    // --------------
-    //
-    virtual bool OS2Command( WXUINT uParam
-                            ,WXWORD wId
-                           );
-    //
-    // Bring the control in sync with current m_windowStyle value
-    //
-    void UpdateStyle(void);
-
-    //
-    // Implementation: converts wxWidgets style to MSW style.
-    // Can be a single style flag or a bit list.
-    // oldStyle is 'normalised' so that it doesn't contain
-    // conflicting styles.
-    //
-    long ConvertToOS2Style( long& lOldStyle
-                           ,long  lStyle
-                          ) const;
-    long ConvertArrangeToOS2Style(long lStyle);
-    long ConvertViewToOS2Style(long lStyle);
-
-    virtual MRESULT OS2WindowProc( WXUINT   uMsg
-                                  ,WXWPARAM wParam
-                                  ,WXLPARAM lParam
-                                 );
-
-    // Event handlers
-    ////////////////////////////////////////////////////////////////////////////
-    // Necessary for drawing hrules and vrules, if specified
-    void OnPaint(wxPaintEvent& rEvent);
-
-protected:
-    //
-    // common part of all ctors
-    //
-    void Init(void);
-
-    //
-    // Free memory taken by all internal data
-    //
-    void FreeAllInternalData(void);
-
-    wxTextCtrl*                     m_pTextCtrl;        // The control used for editing a label
-    wxImageList*                    m_pImageListNormal; // The image list for normal icons
-    wxImageList*                    m_pImageListSmall;  // The image list for small icons
-    wxImageList*                    m_pImageListState;  // The image list state icons (not implemented yet)
-    bool                            m_bOwnsImageListNormal;
-    bool                            m_bOwnsImageListSmall;
-    bool                            m_bOwnsImageListState;
-    long                            m_lBaseStyle;       // Basic PM style flags, for recreation purposes
-    int                             m_nColCount;        // PM doesn't have GetColumnCount so must
-                                                        // keep track of inserted/deleted columns
-
-    //
-    // true if we have any internal data (user data & attributes)
-    //
-    bool                            m_bAnyInternalData;
-
-    //
-    // true if we have any items with custom attributes
-    //
-    bool                            m_bHasAnyAttr;
-
-    //
-    // These functions are only used for virtual list view controls, i.e. the
-    // ones with wxLC_VIRTUAL style
-    //
-    // return the text for the given column of the given item
-    //
-    virtual wxString OnGetItemText( long lItem
-                                   ,long lColumn
-                                  ) const;
-
-    //
-    // Return the icon for the given item. In report view, OnGetItemImage will
-    // only be called for the first column. See OnGetItemColumnImage for
-    // details.
-    //
-    virtual int OnGetItemImage(long lItem) const;
-
-    //
-    // Return the icon for the given item and column
-    //
-    virtual int OnGetItemColumnImage(long lItem, long lColumn) const;
-
-    //
-    // Return the attribute for the item (may return NULL if none)
-    //
-    virtual wxListItemAttr* OnGetItemAttr(long lItem) const;
-
-private:
-    bool DoCreateControl( int nX
-                         ,int nY
-                         ,int nWidth
-                         ,int nHeight
-                        );
-
-    DECLARE_DYNAMIC_CLASS(wxListCtrl)
-    DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxListCtrl);
-}; // end of CLASS wxListCtrl
-
-#endif // wxUSE_LISTCTRL
-
-#endif // _WX_LISTCTRL_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/magnit1.ptr b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/magnit1.ptr
deleted file mode 100644
index 0e0b74803c..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/magnit1.ptr and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/mdi.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/mdi.h
deleted file mode 100644
index dbb6703767..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/mdi.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/mdi.h
-// Purpose:     MDI (Multiple Document Interface) classes.
-//              This doesn't have to be implemented just like Windows,
-//              it could be a tabbed design as in wxGTK.
-// Author:      David Webster
-// Modified by:
-// Created:     10/10/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MDI_H_
-#define _WX_MDI_H_
-
-#include "wx/frame.h"
-
-class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow;
-class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
-
-class WXDLLIMPEXP_CORE wxMDIParentFrame: public wxFrame
-{
-DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-
-  friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
-public:
-
-  wxMDIParentFrame();
-  inline wxMDIParentFrame(wxWindow *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,  // Scrolling refers to client window
-           const wxString& name = wxFrameNameStr)
-  {
-      Create(parent, id, title, pos, size, style, name);
-  }
-
-  virtual ~wxMDIParentFrame();
-
-  bool Create(wxWindow *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-           const wxString& name = wxFrameNameStr);
-
-    // accessors
-    // ---------
-
-    // Get the active MDI child window (Windows only)
-    wxMDIChildFrame *GetActiveChild() const;
-
-    // Get the client window
-    wxMDIClientWindow *GetClientWindow() const { return m_clientWindow; }
-
-    // Create the client window class (don't Create the window,
-    // just return a new class)
-    virtual wxMDIClientWindow *OnCreateClient(void);
-
-    wxMenu* GetWindowMenu() const { return m_windowMenu; }
-//    void    SetWindowMenu(wxMwnu* pMenu);
-
-    // MDI operations
-    // --------------
-    virtual void Cascade();
-    virtual void Tile();
-    virtual void ArrangeIcons();
-    virtual void ActivateNext();
-    virtual void ActivatePrevious();
-
-    // handlers
-    // --------
-
-    // Responds to colour changes
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-    void OnSize(wxSizeEvent& event);
-
-    bool HandleActivate(int state, bool minimized, WXHWND activate);
-    bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
-
-    // override window proc for MDI-specific message processing
-    virtual MRESULT OS2WindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam);
-
-    virtual MRESULT OS2DefWindowProc(WXUINT, WXWPARAM, WXLPARAM);
-    virtual bool OS2TranslateMessage(WXMSG* msg);
-
-protected:
-    virtual void InternalSetMenuBar();
-
-    wxMDIClientWindow *             m_clientWindow;
-    wxMDIChildFrame *               m_currentChild;
-    wxMenu*                         m_windowMenu;
-
-    // TRUE if MDI Frame is intercepting commands, not child
-    bool m_parentFrameActive;
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame
-{
-DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
-public:
-
-  wxMDIChildFrame();
-  inline wxMDIChildFrame(wxMDIParentFrame *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME_STYLE,
-           const wxString& name = wxFrameNameStr)
-  {
-      Create(parent, id, title, pos, size, style, name);
-  }
-
-  virtual ~wxMDIChildFrame();
-
-  bool Create(wxMDIParentFrame *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME_STYLE,
-           const wxString& name = wxFrameNameStr);
-
-    // MDI operations
-    virtual void Maximize(bool maximize = TRUE);
-    virtual void Restore();
-    virtual void Activate();
-
-    // Handlers
-
-    bool HandleMDIActivate(long bActivate, WXHWND, WXHWND);
-    bool HandleSize(int x, int y, WXUINT);
-    bool HandleWindowPosChanging(void *lpPos);
-    bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control);
-
-    virtual MRESULT OS2WindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-    virtual MRESULT OS2DefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-    virtual bool OS2TranslateMessage(WXMSG *msg);
-
-    virtual void OS2DestroyWindow();
-
-    // Implementation
-    bool ResetWindowStyle(void *vrect);
-
-protected:
-    virtual void DoGetPosition(int *x, int *y) const;
-    virtual void DoSetClientSize(int width, int height);
-    virtual void InternalSetMenuBar();
-};
-
-/* The client window is a child of the parent MDI frame, and itself
- * contains the child MDI frames.
- * However, you create the MDI children as children of the MDI parent:
- * only in the implementation does the client window become the parent
- * of the children. Phew! So the children are sort of 'adopted'...
- */
-
-class WXDLLIMPEXP_CORE wxMDIClientWindow: public wxWindow
-{
-  DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
-
- public:
-
-    wxMDIClientWindow() { Init(); }
-    wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0)
-    {
-        Init();
-
-        CreateClient(parent, style);
-    }
-
-    // Note: this is virtual, to allow overridden behaviour.
-    virtual bool CreateClient(wxMDIParentFrame *parent,
-                              long style = wxVSCROLL | wxHSCROLL);
-
-    // Explicitly call default scroll behaviour
-    void OnScroll(wxScrollEvent& event);
-
-protected:
-    void Init() { m_scrollX = m_scrollY = 0; }
-
-    int m_scrollX, m_scrollY;
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
-    // _WX_MDI_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/menu.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/menu.h
deleted file mode 100644
index a3a045bb1f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/menu.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/menu.h
-// Purpose:     wxMenu, wxMenuBar classes
-// Author:      David Webster
-// Modified by:
-// Created:     10/10/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MENU_H_
-#define _WX_MENU_H_
-
-#if wxUSE_ACCEL
-    #include "wx/accel.h"
-    #include "wx/list.h"        // for "template" list classes
-    #include "wx/dynarray.h"
-
-    WX_DEFINE_EXPORTED_ARRAY_PTR(wxAcceleratorEntry *, wxAcceleratorArray);
-#endif // wxUSE_ACCEL
-
-class WXDLLIMPEXP_FWD_CORE wxFrame;
-
-void wxSetShortCutKey(wxChar* zText);
-
-// ----------------------------------------------------------------------------
-// Menu
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase
-{
-public:
-    //
-    // Ctors & dtor
-    //
-    wxMenu( const wxString& rTitle
-           ,long            lStyle = 0
-          )
-          : wxMenuBase( rTitle
-                       ,lStyle
-                      )
-    {
-        Init();
-    }
-
-    wxMenu(long lStyle = 0)
-          : wxMenuBase(lStyle)
-    {
-        Init();
-    }
-
-    virtual ~wxMenu();
-
-    //
-    // Implement base class virtuals
-    //
-    virtual wxMenuItem* DoAppend(wxMenuItem* pItem);
-    virtual wxMenuItem* DoInsert( size_t      nPos
-                                 ,wxMenuItem* pItem
-                                );
-    virtual wxMenuItem* DoRemove(wxMenuItem* pItem);
-    virtual void        Break(void);
-    virtual void        SetTitle(const wxString& rTitle);
-
-    //
-    // Implementation only from now on
-    // -------------------------------
-    //
-    virtual void Attach(wxMenuBarBase* pMenubar);
-
-    bool OS2Command( WXUINT uParam
-                    ,WXWORD wId
-                   );
-
-    //
-    // Semi-private accessors
-    //
-
-    //
-    // Get the window which contains this menu
-    //
-    wxWindow* GetWindow(void) const;
-
-    //
-    // Get the menu handle
-    //
-    WXHMENU GetHMenu() const { return m_hMenu; }
-
-#if wxUSE_ACCEL
-    //
-    // Called by wxMenuBar to build its accel table from the accels of all menus
-    //
-    bool   HasAccels(void) const { return m_vAccels.IsEmpty(); }
-    size_t GetAccelCount(void) const { return m_vAccels.GetCount(); }
-    size_t CopyAccels(wxAcceleratorEntry* pAccels) const;
-
-    //
-    // Called by wxMenuItem when its accels changes
-    //
-    void UpdateAccel(wxMenuItem* pItem);
-
-    //
-    // Helper used by wxMenu itself (returns the index in m_accels)
-    //
-    int FindAccel(int nId) const;
-#endif // wxUSE_ACCEL
-    //
-    // OS/2 specific Find
-    //
-    wxMenuItem* FindItem(int id, ULONG hItem, wxMenu **menu = NULL) const;
-    //virtual function hiding suppression
-    int FindItem(const wxString& rsString) const
-    { return wxMenuBase::FindItem(rsString); }
-    wxMenuItem* FindItem(int id, wxMenu **menu = NULL) const
-    { return wxMenuBase::FindItem(id, menu); }
-
-    //
-    // All OS/2PM Menu's have one of these
-    //
-    MENUITEM                        m_vMenuData;
-
-private:
-    //
-    // Common part of all ctors
-    //
-    void Init();
-
-    //
-    // Common part of Append/Insert (behaves as Append is pos == (size_t)-1)
-    //
-    bool DoInsertOrAppend( wxMenuItem* pItem
-                          ,size_t      nPos = (size_t)-1
-                         );
-
-    //
-    // Terminate the current radio group, if any
-    //
-    void EndRadioGroup(void);
-
-    //
-    // If true, insert a breal before appending the next item
-    //
-    bool m_bDoBreak;
-
-    //
-    // The menu handle of this menu
-    //
-    WXHMENU                         m_hMenu;
-
-    //
-    // The helper variable for creating unique IDs.
-    //
-    static USHORT                   m_nextMenuId;
-
-    //
-    // The position of the first item in the current radio group or -1
-    //
-    int                             m_nStartRadioGroup;
-
-#if wxUSE_ACCEL
-    //
-    // The accelerators for our menu items
-    //
-    wxAcceleratorArray              m_vAccels;
-#endif // wxUSE_ACCEL
-
-    DECLARE_DYNAMIC_CLASS(wxMenu)
-}; // end of wxMenu
-
-// ----------------------------------------------------------------------------
-// Menu Bar (a la Windows)
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase
-{
-public:
-    //
-    // Ctors & dtor
-    //
-
-    //
-    // Default constructor
-    //
-    wxMenuBar();
-
-    //
-    // Unused under OS2
-    wxMenuBar(long lStyle);
-
-    //
-    // Menubar takes ownership of the menus arrays but copies the titles
-    //
-    wxMenuBar( int            n
-              ,wxMenu*        vMenus[]
-              ,const wxString sTitles[]
-              ,long           lStyle = 0
-             );
-    virtual ~wxMenuBar();
-
-    //
-    // Menubar construction
-    //
-    virtual bool        Append( wxMenu*         pMenu
-                               ,const wxString& rTitle
-                              );
-    virtual bool        Insert( size_t          nPos
-                               ,wxMenu*         pMenu
-                               ,const wxString& rTitle
-                              );
-    virtual wxMenu*     Replace( size_t          nPos
-                                ,wxMenu*         pMenu
-                                ,const wxString& rTitle
-                               );
-    virtual wxMenu*     Remove(size_t nPos);
-    virtual int         FindMenuItem( const wxString& rMenuString
-                                     ,const wxString& rItemString
-                                    ) const;
-    virtual wxMenuItem* FindItem( int      nId
-                                 ,wxMenu** ppMenu = NULL
-                                ) const;
-    virtual wxMenuItem* FindItem( int      nId
-                                 ,ULONG    hItem
-                                 ,wxMenu** ppMenu = NULL
-                                ) const;
-    virtual void        EnableTop( size_t nPos
-                                  ,bool   bFlag
-                                 );
-    virtual void        SetMenuLabel( size_t          nPos
-                                    ,const wxString& rLabel
-                                   );
-    virtual wxString    GetMenuLabel(size_t nPos) const;
-
-    //
-    // Implementation from now on
-    //
-    WXHMENU                   Create(void);
-    virtual void              Detach(void);
-    virtual void              Attach(wxFrame* pFrame);
-
-#if wxUSE_ACCEL
-    //
-    // Get the accel table for all the menus
-    //
-    const wxAcceleratorTable& GetAccelTable(void) const { return m_vAccelTable; }
-
-    //
-    // Update the accel table (must be called after adding/deleting a menu)
-    //
-    void                      RebuildAccelTable(void);
-#endif // wxUSE_ACCEL
-
-    //
-    // Get the menu handle
-    WXHMENU                   GetHMenu(void) const { return m_hMenu; }
-
-    //
-    // If the menubar is modified, the display is not updated automatically,
-    // call this function to update it (m_menuBarFrame should be !NULL)
-    //
-    void                      Refresh(void);
-
-protected:
-    //
-    // Common part of all ctors
-    //
-    void                      Init(void);
-
-    wxArrayString m_titles;
-
-    WXHMENU                         m_hMenu;
-
-#if wxUSE_ACCEL
-    //
-    // The accelerator table for all accelerators in all our menus
-    //
-    wxAcceleratorTable              m_vAccelTable;
-#endif // wxUSE_ACCEL
-
-private:
-    //
-    // Virtual function hiding suppression
-    //
-    void                      Refresh( bool          bErase
-                                      ,const wxRect* pRect
-                                     )
-    { wxWindow::Refresh(bErase, pRect); }
-
-    DECLARE_DYNAMIC_CLASS(wxMenuBar)
-};
-
-#endif // _WX_MENU_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/menuitem.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/menuitem.h
deleted file mode 100644
index 626996fe26..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/menuitem.h
+++ /dev/null
@@ -1,171 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/menuitem.h
-// Purpose:     wxMenuItem class
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     11.11.97
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef   _MENUITEM_H
-#define   _MENUITEM_H
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/defs.h"
-#include "wx/os2/private.h"     // for MENUITEM
-
-// an exception to the general rule that a normal header doesn't include other
-// headers - only because ownerdrw.h is not always included and I don't want
-// to write #ifdef's everywhere...
-#if wxUSE_OWNER_DRAWN
-    #include "wx/ownerdrw.h"
-    #include "wx/bitmap.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// ----------------------------------------------------------------------------
-// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
-// ----------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxMenuItem: public wxMenuItemBase
-#if wxUSE_OWNER_DRAWN
-                            , public wxOwnerDrawn
-#endif
-{
-public:
-    //
-    // ctor & dtor
-    //
-    wxMenuItem( wxMenu*         pParentMenu = NULL
-               ,int             nId = wxID_SEPARATOR
-               ,const wxString& rStrName = wxEmptyString
-               ,const wxString& rWxHelp = wxEmptyString
-               ,wxItemKind      eKind = wxITEM_NORMAL
-               ,wxMenu*         pSubMenu = NULL
-              );
-
-    //
-    // Depricated, do not use in new code
-    //
-    wxMenuItem( wxMenu*         pParentMenu
-               ,int             vId
-               ,const wxString& rsText
-               ,const wxString& rsHelp
-               ,bool            bIsCheckable
-               ,wxMenu*         pSubMenu = NULL
-              );
-    virtual ~wxMenuItem();
-
-    //
-    // Override base class virtuals
-    //
-    virtual void SetItemLabel(const wxString& rStrName);
-
-    virtual void Enable(bool bDoEnable = true);
-    virtual void Check(bool bDoCheck = true);
-    virtual bool IsChecked(void) const;
-
-    //
-    // Unfortunately needed to resolve ambiguity between
-    // wxMenuItemBase::IsCheckable() and wxOwnerDrawn::IsCheckable()
-    //
-    bool IsCheckable(void) const { return wxMenuItemBase::IsCheckable(); }
-
-    //
-    // The id for a popup menu is really its menu handle (as required by
-    // ::AppendMenu() API), so this function will return either the id or the
-    // menu handle depending on what we're
-    //
-    int GetRealId(void) const;
-
-    //
-    // Mark item as belonging to the given radio group
-    //
-    void SetAsRadioGroupStart(void);
-    void SetRadioGroupStart(int nStart);
-    void SetRadioGroupEnd(int nEnd);
-
-    //
-    // All OS/2PM Submenus and menus have one of these
-    //
-    MENUITEM                        m_vMenuData;
-
-#if wxUSE_OWNER_DRAWN
-
-    void SetBitmaps(const wxBitmap& bmpChecked,
-                    const wxBitmap& bmpUnchecked = wxNullBitmap)
-    {
-        m_bmpChecked = bmpChecked;
-        m_bmpUnchecked = bmpUnchecked;
-        SetOwnerDrawn(true);
-    }
-
-    void SetBitmap(const wxBitmap& bmp, bool bChecked = true)
-    {
-        if ( bChecked )
-            m_bmpChecked = bmp;
-        else
-            m_bmpUnchecked = bmp;
-        SetOwnerDrawn(true);
-    }
-
-    void SetDisabledBitmap(const wxBitmap& bmpDisabled)
-    {
-        m_bmpDisabled = bmpDisabled;
-        SetOwnerDrawn(true);
-    }
-
-    const wxBitmap& GetBitmap(bool bChecked = true) const
-        { return (bChecked ? m_bmpChecked : m_bmpUnchecked); }
-
-    const wxBitmap& GetDisabledBitmap() const
-        { return m_bmpDisabled; }
-
-
-    // override wxOwnerDrawn base class virtuals
-    virtual wxString GetName() const;
-    virtual bool OnMeasureItem(size_t *pwidth, size_t *pheight);
-    virtual bool OnDrawItem(wxDC& dc, const wxRect& rc, wxODAction act, wxODStatus stat);
-
-protected:
-    virtual void GetFontToUse(wxFont& font) const;
-
-#endif // wxUSE_OWNER_DRAWN
-
-private:
-    void Init();
-
-    //
-    // The positions of the first and last items of the radio group this item
-    // belongs to or -1: start is the radio group start and is valid for all
-    // but first radio group items (m_isRadioGroupStart == FALSE), end is valid
-    // only for the first one
-    //
-    union
-    {
-        int m_nStart;
-        int m_nEnd;
-    } m_vRadioGroup;
-
-    //
-    // Does this item start a radio group?
-    //
-    bool                            m_bIsRadioGroupStart;
-
-#if wxUSE_OWNER_DRAWN
-    // item bitmaps
-    wxBitmap m_bmpChecked,     // bitmap to put near the item
-             m_bmpUnchecked,   // (checked is used also for 'uncheckable' items)
-             m_bmpDisabled;
-#endif // wxUSE_OWNER_DRAWN
-
-    DECLARE_DYNAMIC_CLASS(wxMenuItem)
-}; // end of CLASS wxMenuItem
-
-#endif  //_MENUITEM_H
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/metafile.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/metafile.h
deleted file mode 100644
index 5036afe6eb..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/metafile.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/metafile.h
-// Purpose:     wxMetaFile, wxMetaFileDC classes.
-//              This probably should be restricted to Windows platforms,
-//              but if there is an equivalent on your platform, great.
-// Author:      David Webster
-// Modified by:
-// Created:     10/10/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef _WX_METAFIILE_H_
-#define _WX_METAFIILE_H_
-
-#include "wx/dc.h"
-#include "wx/gdiobj.h"
-#include "wx/os2/dc.h"
-
-#if wxUSE_DRAG_AND_DROP
-#include "wx/dataobj.h"
-#endif
-
-/*
- * Metafile and metafile device context classes
- *
- */
-
-#define wxMetaFile wxMetafile
-#define wxMetaFileDC wxMetafileDC
-
-class WXDLLIMPEXP_FWD_CORE wxMetafile;
-
-class WXDLLIMPEXP_CORE wxMetafileRefData: public wxGDIRefData
-{
-    friend class WXDLLIMPEXP_FWD_CORE wxMetafile;
-public:
-    wxMetafileRefData(void);
-    virtual ~wxMetafileRefData(void);
-
-    virtual bool IsOk() const { return m_metafile != 0; }
-
-public:
-    WXHANDLE m_metafile;
-    int m_windowsMappingMode;
-};
-
-#define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
-
-class WXDLLIMPEXP_CORE wxMetafile: public wxGDIObject
-{
-    DECLARE_DYNAMIC_CLASS(wxMetafile)
-public:
-    wxMetafile(const wxString& file = wxEmptyString);
-    virtual ~wxMetafile(void);
-
-    // After this is called, the metafile cannot be used for anything
-    // since it is now owned by the clipboard.
-    virtual bool SetClipboard(int width = 0, int height = 0);
-
-    virtual bool Play(wxDC *dc);
-
-    // Implementation
-    inline WXHANDLE GetHMETAFILE(void) { return M_METAFILEDATA->m_metafile; }
-    void SetHMETAFILE(WXHANDLE mf) ;
-    inline int GetWindowsMappingMode(void) { return M_METAFILEDATA->m_windowsMappingMode; }
-    void SetWindowsMappingMode(int mm);
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-};
-
-class WXDLLIMPEXP_CORE wxMetafileDCImpl: public wxPMDCImpl
-{
-public:
-    wxMetafileDCImpl(wxDC *owner, const wxString& file = wxEmptyString);
-    wxMetafileDCImpl(wxDC *owner, const wxString& file,
-                     int xext, int yext, int xorg, int yorg);
-    virtual ~wxMetafileDCImpl();
-
-    virtual wxMetafile *Close();
-    virtual void SetMapMode(wxMappingMode mode);
-    virtual void DoGetTextExtent(const wxString& string,
-                                 wxCoord *x, wxCoord *y,
-                                 wxCoord *descent = NULL,
-                                 wxCoord *externalLeading = NULL,
-                                 const wxFont *theFont = NULL) const;
-
-    // Implementation
-    wxMetafile *GetMetaFile() const { return m_metaFile; }
-    void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; }
-    int GetWindowsMappingMode() const { return m_windowsMappingMode; }
-    void SetWindowsMappingMode(int mm) { m_windowsMappingMode = mm; }
-
-protected:
-    virtual void DoGetSize(int *width, int *height) const;
-
-    int           m_windowsMappingMode;
-    wxMetafile*   m_metaFile;
-
-private:
-    DECLARE_CLASS(wxMetafileDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl);
-};
-
-class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC
-{
-public:
-    // Don't supply origin and extent
-    // Supply them to wxMakeMetaFilePlaceable instead.
-    wxMetafileDC(const wxString& file = wxEmptyString)
-         :wxDC(new wxMetafileDCImpl( this, file ))
-         { }
-
-    // Supply origin and extent (recommended).
-    // Then don't need to supply them to wxMakeMetaFilePlaceable.
-    wxMetafileDC(const wxString& file, int xext, int yext, int xorg, int yorg)
-        : wxDC(new wxMetafileDCImpl( this, file, xext, yext, xorg, yorg ))
-         { }
-
-    wxMetafile *GetMetafile() const
-        { return ((wxMetafileDCImpl*)m_pimpl)->GetMetaFile(); }
-
-    virtual ~wxMetafileDC(void)
-        { delete m_pimpl; }
-
-    // Should be called at end of drawing
-    virtual wxMetafile *Close(void)
-        { return ((wxMetafileDCImpl*)m_pimpl)->Close(); }
-
-    inline void SetMetaFile(wxMetafile *mf)
-        { ((wxMetafileDCImpl*)m_pimpl)->SetMetaFile(mf); }
-
-private:
-    DECLARE_CLASS(wxMetafileDC)
-    wxDECLARE_NO_COPY_CLASS(wxMetafileDC);
-};
-
-/*
- * Pass filename of existing non-placeable metafile, and bounding box.
- * Adds a placeable metafile header, sets the mapping mode to anisotropic,
- * and sets the window origin and extent to mimic the wxMM_TEXT mapping mode.
- *
- */
-
-// No origin or extent
-#define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable
-bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);
-
-// Optional origin and extent
-bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable( const wxString& filename
-                                         ,int x1
-                                         ,int y1
-                                         ,int x2
-                                         ,int y2
-                                         ,float scale = 1.0
-                                         ,bool useOriginAndExtent = true
-                                        );
-
-// ----------------------------------------------------------------------------
-// wxMetafileDataObject is a specialization of wxDataObject for metafile data
-// ----------------------------------------------------------------------------
-
-// TODO: implement OLE side of things. At present, it's just for clipboard
-// use.
-
-#if wxUSE_DRAG_AND_DROP
-class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObject
-{
-public:
-    // ctors
-    wxMetafileDataObject() { m_width = 0; m_height = 0; }
-    wxMetafileDataObject(const wxMetafile& metafile, int width = 0,int height = 0)
-                        :m_metafile(metafile)
-                        ,m_width(width)
-                        ,m_height(height) { }
-
-    void SetMetafile(const wxMetafile& metafile, int w = 0, int h = 0)
-        { m_metafile = metafile; m_width = w; m_height = h; }
-    wxMetafile GetMetafile() const { return m_metafile; }
-    int GetWidth() const { return m_width; }
-    int GetHeight() const { return m_height; }
-
-    virtual wxDataFormat GetFormat() const { return wxDF_METAFILE; }
-
-/* ??
-    // implement base class pure virtuals
-    virtual wxDataFormat GetPreferredFormat() const
-        { return (wxDataFormat) wxDataObject::Text; }
-    virtual bool IsSupportedFormat(wxDataFormat format) const
-        { return format == wxDataObject::Text || format == wxDataObject::Locale; }
-    virtual size_t GetDataSize() const
-        { return m_strText.Len() + 1; } // +1 for trailing '\0'of course
-    virtual void GetDataHere(void *pBuf) const
-        { memcpy(pBuf, m_strText.c_str(), GetDataSize()); }
-*/
-
-private:
-    wxMetafile   m_metafile;
-    int          m_width;
-    int          m_height;
-};
-#endif
-
-#endif
-    // _WX_METAFIILE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/mimetype.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/mimetype.h
deleted file mode 100644
index 6429e98776..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/mimetype.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/mimetype.h
-// Purpose:     classes and functions to manage MIME types
-// Author:      David Webster
-// Modified by:
-// Created:     01.21.99
-// Copyright:   adopted from msw port -- (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MIMETYPE_IMPL_H
-#define _MIMETYPE_IMPL_H
-
-#include "wx/defs.h"
-
-#if wxUSE_MIMETYPE
-
-#include "wx/mimetype.h"
-
-// ----------------------------------------------------------------------------
-// wxFileTypeImpl is the OS/2 version of wxFileType, this is a private class
-// and is never used directly by the application
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxFileTypeImpl
-{
-public:
-    // ctor
-    wxFileTypeImpl() { m_info = NULL; }
-
-    // one of these Init() function must be called (ctor can't take any
-    // arguments because it's common)
-
-        // initialize us with our file type name and extension - in this case
-        // we will read all other data from the registry
-    void Init(const wxString& strFileType, const wxString& ext)
-        { m_strFileType = strFileType; m_ext = ext; }
-
-        // initialize us with a wxFileTypeInfo object - it contains all the
-        // data
-    void Init(const wxFileTypeInfo& info)
-        { m_info = &info; }
-
-    // implement accessor functions
-    bool GetExtensions(wxArrayString& extensions);
-    bool GetMimeType(wxString *mimeType) const;
-    bool GetMimeTypes(wxArrayString& mimeTypes) const;
-    bool GetIcon(wxIconLocation *iconLoc) const;
-    bool GetDescription(wxString *desc) const;
-    bool GetOpenCommand(wxString *openCmd,
-                        const wxFileType::MessageParameters& params) const;
-    bool GetPrintCommand(wxString *printCmd,
-                         const wxFileType::MessageParameters& params) const;
-
-    size_t GetAllCommands(wxArrayString * verbs, wxArrayString * commands,
-                          const wxFileType::MessageParameters& params) const;
-
-    bool Unassociate();
-
-    // set an arbitrary command, ask confirmation if it already exists and
-    // overwriteprompt is true
-    bool SetCommand(const wxString& cmd,
-                    const wxString& verb,
-                    bool overwriteprompt = true);
-
-    bool SetDefaultIcon(const wxString& cmd = wxEmptyString, int index = 0);
-
-    // this is called  by Associate
-    bool SetDescription (const wxString& desc);
-
-private:
-    // helper function: reads the command corresponding to the specified verb
-    // from the registry (returns an empty string if not found)
-    wxString GetCommand(const wxChar *verb) const;
-
-    // we use either m_info or read the data from the registry if m_info == NULL
-    const wxFileTypeInfo *m_info;
-    wxString m_strFileType,         // may be empty
-             m_ext;
-};
-
-
-
-class WXDLLIMPEXP_BASE wxMimeTypesManagerImpl
-{
-public:
-    // nothing to do here, we don't load any data but just go and fetch it from
-    // the registry when asked for
-    wxMimeTypesManagerImpl() { }
-
-    // implement containing class functions
-    wxFileType *GetFileTypeFromExtension(const wxString& ext);
-    wxFileType *GetOrAllocateFileTypeFromExtension(const wxString& ext);
-    wxFileType *GetFileTypeFromMimeType(const wxString& mimeType);
-
-    size_t EnumAllFileTypes(wxArrayString& mimetypes);
-
-    void AddFallback(const wxFileTypeInfo& ft) { m_fallbacks.Add(ft); }
-
-private:
-    wxArrayFileTypeInfo m_fallbacks;
-};
-
-#endif // wxUSE_MIMETYPE
-
-#endif
-  //_MIMETYPE_IMPL_H
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/minifram.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/minifram.h
deleted file mode 100644
index 44dd84eec1..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/minifram.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/minifram.h
-// Purpose:     wxMiniFrame class. A small frame for e.g. floating toolbars.
-//              If there is no equivalent on your platform, just make it a
-//              normal frame.
-// Author:      David Webster
-// Modified by:
-// Created:     10/10/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MINIFRAM_H_
-#define _WX_MINIFRAM_H_
-
-#include "wx/frame.h"
-
-class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame {
-
-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
-
-public:
-  inline wxMiniFrame(void) {}
-  inline wxMiniFrame(wxWindow *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxDEFAULT_FRAME_STYLE,
-           const wxString& name = wxFrameNameStr)
-  {
-      Create(parent, id, title, pos, size, style | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT, name);
-  }
-
-protected:
-};
-
-#endif
-    // _WX_MINIFRAM_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/msgdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/msgdlg.h
deleted file mode 100644
index 8b94effb3f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/msgdlg.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/msgdlg.h
-// Purpose:     wxMessageDialog class. Use generic version if no
-//              platform-specific implementation.
-// Author:      David Webster
-// Modified by:
-// Created:     10/12/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSGBOXDLG_H_
-#define _WX_MSGBOXDLG_H_
-
-class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
-{
-public:
-    wxMessageDialog( wxWindow*       pParent
-                    ,const wxString& rsMessage
-                    ,const wxString& rsCaption = wxMessageBoxCaptionStr
-                    ,long            lStyle = wxOK|wxCENTRE
-                    ,const wxPoint&  WXUNUSED(rPos) = wxDefaultPosition
-                   )
-        : wxMessageDialogBase(pParent, rsMessage, rsCaption, lStyle)
-    {
-    }
-
-    int ShowModal(void);
-
-protected:
-    DECLARE_DYNAMIC_CLASS(wxMessageDialog)
-}; // end of CLASS wxMessageDialog
-
-#endif // _WX_MSGBOXDLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/notebook.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/notebook.h
deleted file mode 100644
index e9df265914..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/notebook.h
+++ /dev/null
@@ -1,200 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/notebook.h
-// Purpose:     MSW/GTK compatible notebook (a.k.a. property sheet)
-// Author:      David Webster
-// Modified by:
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _NOTEBOOK_H
-#define _NOTEBOOK_H
-
-#if wxUSE_NOTEBOOK
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/control.h"
-
-// ----------------------------------------------------------------------------
-// wxNotebook
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase
-{
-public:
-    //
-    // Ctors
-    // -----
-    // Default for dynamic class
-    //
-    wxNotebook();
-
-    //
-    // the same arguments as for wxControl
-    //
-    wxNotebook( wxWindow*       pParent
-               ,wxWindowID      vId
-               ,const wxPoint&  rPos = wxDefaultPosition
-               ,const wxSize&   rSize = wxDefaultSize
-               ,long            lStyle = 0
-               ,const wxString& rsName = wxNotebookNameStr
-              );
-
-    bool Create( wxWindow*       pParent
-                ,wxWindowID      vId
-                ,const wxPoint&  rPos = wxDefaultPosition
-                ,const wxSize&   rSize = wxDefaultSize
-                ,long            lStyle = 0
-                ,const wxString& rsName = wxNotebookNameStr
-               );
-
-    //
-    // Accessors
-    // ---------
-    // Get number of pages in the dialog
-    //
-    virtual size_t GetPageCount(void) const;
-
-    //
-    // Set the currently selected page, return the index of the previously
-    // selected one (or wxNOT_FOUND on error)
-    // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
-    //
-    int      SetSelection(size_t nPage);
-
-    // changes selected page without sending events
-    int ChangeSelection(size_t nPage);
-
-    //
-    // Set/Get the title of a page
-    //
-    bool     SetPageText( size_t             nPage
-                         ,const wxString& sStrText
-                        );
-    wxString GetPageText(size_t nPage) const;
-
-    //
-    // Image list stuff: each page may have an image associated with it. All
-    // the images belong to an image list, so you have to
-    // 1) create an image list
-    // 2) associate it with the notebook
-    // 3) set for each page it's image
-    // associate image list with a control
-    //
-           void     SetImageList(wxImageList* pImageList);
-
-    //
-    // Sets/returns item's image index in the current image list
-    //
-    int      GetPageImage(size_t nPage) const;
-    bool     SetPageImage( size_t nPage
-                          ,int nImage
-                         );
-
-    //
-    // Currently it's always 1 because wxGTK doesn't support multi-row
-    // tab controls
-    //
-           int      GetRowCount(void) const;
-
-    //
-    // control the appearance of the notebook pages
-    // set the size (the same for all pages)
-    //
-           void     SetPageSize(const wxSize& rSize);
-
-    //
-    // Set the padding between tabs (in pixels)
-    //
-           void     SetPadding(const wxSize& rPadding);
-
-    //
-    // Operations
-    // ----------
-    // Remove all pages
-    //
-           bool     DeleteAllPages(void);
-
-    //
-    // Adds a new page to the notebook (it will be deleted ny the notebook,
-    // don't delete it yourself). If bSelect, this page becomes active.
-    //
-           bool     AddPage( wxNotebookPage* pPage
-                            ,const wxString& rsStrText
-                            ,bool            bSelect = false
-                            ,int             nImageId = -1
-                           );
-
-    //
-    // The same as AddPage(), but adds it at the specified position
-    //
-    bool     InsertPage( size_t nPage
-                        ,wxNotebookPage* pPage
-                        ,const wxString& rsStrText
-                        ,bool            bSelect = false
-                        ,int             nImageId = -1
-                       );
-
-    //
-    // Windows-only at present. Also, you must use the wxNB_FIXEDWIDTH
-    // style.
-    //
-           void     SetTabSize(const wxSize& rSize);
-
-    //
-    // Callbacks
-    // ---------
-    //
-    void OnSize(wxSizeEvent& rEvent);
-    void OnSelChange(wxBookCtrlEvent& rEvent);
-    void OnSetFocus(wxFocusEvent& rEvent);
-    void OnNavigationKey(wxNavigationKeyEvent& rEvent);
-
-    //
-    // Base class virtuals
-    // -------------------
-    //
-    virtual bool OS2OnScroll( int    nOrientation
-                             ,WXWORD wSBCode
-                             ,WXWORD wPos
-                             ,WXHWND hControl
-                            );
-    virtual void SetConstraintSizes(bool bRecurse = true);
-    virtual bool DoPhase(int nPhase);
-
-protected:
-    //
-    // Common part of all ctors
-    //
-    void                    Init(void);
-
-    //
-    // Translate wxWin styles to the PM ones
-    //
-    virtual WXDWORD         OS2GetStyle( long     lFlags
-                                        ,WXDWORD* pwExstyle = NULL
-                                       ) const;
-
-    //
-    // Remove one page from the notebook, without deleting
-    //
-    virtual wxNotebookPage* DoRemovePage(size_t nPage);
-
-    //
-    // Helper functions
-    //
-
-private:
-    wxArrayLong                     m_alPageId;
-    int                             m_nTabSize; // holds the largest tab size
-
-    DECLARE_DYNAMIC_CLASS(wxNotebook)
-    DECLARE_EVENT_TABLE()
-}; // end of CLASS wxNotebook
-
-#endif // wxUSE_NOTEBOOK
-
-#endif // _NOTEBOOK_H
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/ownerdrw.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/ownerdrw.h
deleted file mode 100644
index 49de7f00f2..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/ownerdrw.h
+++ /dev/null
@@ -1,28 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/ownerdrw.h
-// Purpose:     wxOwnerDrawn class
-// Author:      Marcin Malich
-// Modified by:
-// Created:     2009-09-22
-// Copyright:   (c) 2009 Marcin Malich <me@malcom.pl>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OWNERDRW_H_
-#define _WX_OWNERDRW_H_
-
-#if wxUSE_OWNER_DRAWN
-
-class WXDLLIMPEXP_CORE wxOwnerDrawn : public wxOwnerDrawnBase
-{
-public:
-    wxOwnerDrawn() {}
-    virtual ~wxOwnerDrawn() {}
-
-    virtual bool OnDrawItem(wxDC& dc, const wxRect& rc,
-                            wxODAction act, wxODStatus stat);
-};
-
-#endif // wxUSE_OWNER_DRAWN
-
-#endif // _WX_OWNERDRW_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/palette.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/palette.h
deleted file mode 100644
index ef67ec240a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/palette.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/palette.h
-// Purpose:     wxPalette class
-// Author:      David Webster
-// Modified by:
-// Created:     10/12/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PALETTE_H_
-#define _WX_PALETTE_H_
-
-#include "wx/gdiobj.h"
-#include "wx/os2/private.h"
-
-class WXDLLIMPEXP_FWD_CORE wxPalette;
-
-class WXDLLIMPEXP_CORE wxPaletteRefData: public wxGDIRefData
-{
-    friend class WXDLLIMPEXP_FWD_CORE wxPalette;
-public:
-    wxPaletteRefData();
-    virtual ~wxPaletteRefData();
-// protected:
-    WXHPALETTE                      m_hPalette;
-    HPS                             m_hPS;
-}; // end of CLASS wxPaletteRefData
-
-#define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
-
-class WXDLLIMPEXP_CORE wxPalette: public wxPaletteBase
-{
-public:
-    wxPalette();
-
-    wxPalette( int                  n
-              ,const unsigned char* pRed
-              ,const unsigned char* pGreen
-              ,const unsigned char* pBlue
-             );
-    virtual ~wxPalette();
-
-    bool Create( int                  n
-                ,const unsigned char* pRed
-                ,const unsigned char* pGreen
-                ,const unsigned char* pBlue
-               );
-    int  GetPixel( unsigned char cRed
-                  ,unsigned char cGreen
-                  ,unsigned char cBlue
-                 ) const;
-    bool GetRGB( int            nPixel
-                ,unsigned char* pRed
-                ,unsigned char* pGreen
-                ,unsigned char* pBlue
-               ) const;
-
-    virtual bool FreeResource(bool bForce = false);
-
-    inline WXHPALETTE GetHPALETTE(void) const { return (M_PALETTEDATA ? M_PALETTEDATA->m_hPalette : 0); }
-    void              SetHPALETTE(WXHPALETTE hPalette);
-    void              SetPS(HPS hPS);
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxPalette)
-}; // end of CLASS wxPalette
-
-#endif
-    // _WX_PALETTE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pbrush.ptr b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pbrush.ptr
deleted file mode 100644
index f7738ca048..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pbrush.ptr and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pen.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pen.h
deleted file mode 100644
index 9ae321a020..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pen.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/pen.h
-// Purpose:     wxPen class
-// Author:      David Webster
-// Modified by:
-// Created:     10/10/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PEN_H_
-#define _WX_PEN_H_
-
-#include "wx/gdiobj.h"
-#include "wx/bitmap.h"
-
-typedef long wxPMDash;
-
-// ----------------------------------------------------------------------------
-// Pen
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPen : public wxPenBase
-{
-public:
-  wxPen() { }
-    wxPen( const wxColour& rColour
-          ,int             nWidth = 1
-          ,wxPenStyle      nStyle = wxPENSTYLE_SOLID
-         );
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
-#endif
-
-    wxPen( const wxBitmap& rStipple
-          ,int             nWidth
-         );
-    virtual ~wxPen() { }
-
-    bool   operator == (const wxPen& rPen) const;
-    inline bool   operator != (const wxPen& rPen) const
-        { return !(*this == rPen); }
-
-    //
-    // Override in order to recreate the pen
-    //
-    void SetColour(const wxColour& rColour);
-    void SetColour(unsigned char cRed, unsigned char cGreen, unsigned char cBlue);
-
-    void SetWidth(int nWidth);
-    void SetStyle(wxPenStyle nStyle);
-    void SetStipple(const wxBitmap& rStipple);
-    void SetDashes( int           nNbDashes
-                   ,const wxDash* pDash
-                  );
-    void SetJoin(wxPenJoin nJoin);
-    void SetCap(wxPenCap nCap);
-    void SetPS(HPS hPS);
-
-    wxColour GetColour(void) const;
-    int       GetWidth(void) const;
-    wxPenStyle GetStyle(void) const;
-    wxPenJoin  GetJoin(void) const;
-    wxPenCap   GetCap(void) const;
-    int       GetPS(void) const;
-    int       GetDashes(wxDash **ptr) const;
-    wxDash*   GetDash() const;
-    int       GetDashCount() const;
-    wxBitmap* GetStipple(void) const;
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
-        { SetStyle((wxPenStyle)style); }
-#endif
-
-    //
-    // Implementation
-    //
-
-    //
-    // Useful helper: create the brush resource
-    //
-    bool     RealizeResource(void);
-    bool     FreeResource(bool bForce = false);
-    virtual WXHANDLE GetResourceHandle(void) const;
-    bool     IsFree(void) const;
-
-private:
-    LINEBUNDLE                     m_vLineBundle;
-    AREABUNDLE                     m_vAreaBundle;
-
-protected:
-    virtual wxGDIRefData* CreateGDIRefData() const;
-    virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const;
-
-    // same as FreeResource() + RealizeResource()
-    bool Recreate();
-
-    DECLARE_DYNAMIC_CLASS(wxPen)
-}; // end of CLASS wxPen
-
-extern int wx2os2PenStyle(wxPenStyle nWxStyle);
-
-#endif
-    // _WX_PEN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pencil.ptr b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pencil.ptr
deleted file mode 100644
index 792d7bbec6..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pencil.ptr and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pnghand.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pnghand.h
deleted file mode 100644
index f5d0209dcd..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pnghand.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/pnghand.h
-// Purpose:     PNG bitmap handler
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// Copyright:   (c) Microsoft, Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PNGHAND_H_
-#define _WX_PNGHAND_H_
-
-class WXDLLIMPEXP_CORE wxPNGFileHandler: public wxBitmapHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxPNGFileHandler)
-public:
-    inline wxPNGFileHandler(void)
-    {
-        m_sName = "PNG bitmap file";
-        m_sExtension = "bmp";
-        m_lType = wxBITMAP_TYPE_PNG;
-    }
-
-    virtual bool LoadFile( wxBitmap*       pBitmap
-                          ,const wxString& rName
-                          ,HPS             hPs
-                          ,long            lFlags
-                          ,int             nDesiredWidth
-                          ,int             nDesiredHeight
-                         );
-    virtual bool SaveFile( wxBitmap*        pBitmap
-                          ,const wxString&  rName
-                          ,int              nType
-                          ,const wxPalette* pPalette = NULL
-                         );
-};
-
-#endif
-    // _WX_PNGHAND_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pngread.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pngread.h
deleted file mode 100644
index 3c40306804..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pngread.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * File:    wx/os2/pngread.h
- * Purpose: PNG file reader
- * Author:  Alejandro Aguilar Sierra/Julian Smart
- * Created: 1995
- * Copyright: (c) 1995, Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
- *
- *
- */
-
-#ifndef _WX_PNGREAD__
-#define _WX_PNGREAD__
-
-#ifndef byte
-typedef unsigned char byte;
-#endif
-
-#define WXIMA_COLORS DIB_PAL_COLORS
-
-typedef byte* ImagePointerType;
-
-typedef struct
-{
-    byte red;
-    byte green;
-    byte blue;
-} rgb_color_struct;
-
-
-#define COLORTYPE_PALETTE  1
-#define COLORTYPE_COLOR    2
-#define COLORTYPE_ALPHA    4
-
-class wxPNGReader
-{
-protected:
-  int filetype;
-  wxChar filename[255];
-  ImagePointerType RawImage;        //  Image data
-
-  int Width, Height;                //  Dimensions
-  int Depth;                        // (bits x pixel)
-  int ColorType;                    // Bit 1 = Palette used
-                                    // Bit 2 = Color used
-                                    // Bit 3 = Alpha used
-
-  long EfeWidth;                    // Efective Width
-
-  BITMAPINFOHEADER2* lpbi;
-  int bgindex;
-  wxPalette* Palette;
-  bool imageOK;
-friend class wxPNGReaderIter;
-public:
-  wxPNGReader(void);
-  wxPNGReader (wxChar* ImageFileName);     // Read an image file
-  ~wxPNGReader ();
-
-  void Create(int width, int height, int deep, int colortype=-1);
-
-  bool ReadFile( wxChar* ImageFileName=0 );
-  bool SaveFile( wxChar* ImageFileName=0 );
-  bool SaveXPM(wxChar *filename, wxChar *name = 0);
-  int  GetWidth( void ) const { return Width; }
-  int  GetHeight( void ) const { return Height; }
-  int  GetDepth( void ) const { return Depth; }
-  int  GetColorType( void ) const { return ColorType; }
-
-  int  GetIndex(int x, int y);
-  bool GetRGB(int x, int y, byte* r, byte* g, byte* b);
-
-  bool SetIndex(int x, int y, int index);
-  bool SetRGB(int x, int y, byte r, byte g, byte b);
-
-  // ColorMap settings
-  bool SetPalette(wxPalette* colourmap);
-  bool SetPalette(int n, rgb_color_struct *rgb_struct);
-  bool SetPalette(int n, byte *r, byte *g=0, byte *b=0);
-  wxPalette* GetPalette() const { return Palette; }
-
-  void NullData();
-  inline int GetBGIndex(void) { return bgindex; }
-
-  inline bool Inside(int x, int y)
-      { return (0<=y && y<Height && 0<=x && x<Width); }
-
-  virtual wxBitmap *GetBitmap(void);
-  virtual bool InstantiateBitmap(wxBitmap *bitmap);
-  wxMask *CreateMask(void);
-
-  inline bool Ok() const { return IsOk(); }
-  inline bool IsOk(void) { return imageOK; }
-};
-
-class wxPNGReaderIter
-{
-protected:
-  int Itx, Ity;                     // Counters
-  int Stepx, Stepy;
-  ImagePointerType IterImage;       //  Image pointer
-  wxPNGReader *ima;
-public:
-// Constructors
-  wxPNGReaderIter ( void );
-  wxPNGReaderIter ( wxPNGReader *imax );
-  operator wxPNGReader* ();
-
-// Iterators
-  bool ItOK ();
-  void reset ();
-  void upset ();
-  void SetRow(byte *buf, int n);
-  void GetRow(byte *buf, int n);
-  byte GetByte( ) { return IterImage[Itx]; }
-  void SetByte(byte b) { IterImage[Itx] = b; }
-  ImagePointerType GetRow(void);
-  bool NextRow();
-  bool PrevRow();
-  bool NextByte();
-  bool PrevByte();
-
-  void SetSteps(int x, int y=0) {  Stepx = x; Stepy = y; }
-  void GetSteps(int *x, int *y) {  *x = Stepx; *y = Stepy; }
-  bool NextStep();
-  bool PrevStep();
-
-////////////////////////// AD - for interlace ///////////////////////////////
-  void SetY(int y);
-/////////////////////////////////////////////////////////////////////////////
-};
-
-
-inline
-wxPNGReaderIter::wxPNGReaderIter(void)
-{
-  ima = 0;
-  IterImage = 0;
-  Itx = Ity = 0;
-  Stepx = Stepy = 0;
-}
-
-inline
-wxPNGReaderIter::wxPNGReaderIter(wxPNGReader *imax): ima(imax)
-{
-  if (ima)
-    IterImage = ima->RawImage;
-  Itx = Ity = 0;
-  Stepx = Stepy = 0;
-}
-
-inline
-wxPNGReaderIter::operator wxPNGReader* ()
-{
-  return ima;
-}
-
-inline
-bool wxPNGReaderIter::ItOK ()
-{
-  if (ima)
-    return ima->Inside(Itx, Ity);
-  else
-    return FALSE;
-}
-
-
-inline void wxPNGReaderIter::reset()
-{
-  IterImage = ima->RawImage;
-  Itx = Ity = 0;
-}
-
-inline void wxPNGReaderIter::upset()
-{
-  Itx = 0;
-  Ity = ima->Height-1;
-  IterImage = ima->RawImage + ima->EfeWidth*(ima->Height-1);
-}
-
-inline bool wxPNGReaderIter::NextRow()
-{
-  if (++Ity >= ima->Height) return 0;
-  IterImage += ima->EfeWidth;
-  return 1;
-}
-
-inline bool wxPNGReaderIter::PrevRow()
-{
-  if (--Ity < 0) return 0;
-  IterImage -= ima->EfeWidth;
-  return 1;
-}
-
-////////////////////////// AD - for interlace ///////////////////////////////
-inline void wxPNGReaderIter::SetY(int y)
-{
-  if ((y < 0) || (y > ima->Height)) return;
-  Ity = y;
-  IterImage = ima->RawImage + ima->EfeWidth*y;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-inline void wxPNGReaderIter::SetRow(byte *buf, int n)
-{
-// Here should be bcopy or memcpy
-  //_fmemcpy(IterImage, (void far *)buf, n);
-  if (n<0)
-    n = ima->GetWidth();
-
-  for (int i=0; i<n; i++) IterImage[i] = buf[i];
-}
-
-inline void wxPNGReaderIter::GetRow(byte *buf, int n)
-{
-  for (int i=0; i<n; i++) buf[i] = IterImage[i];
-}
-
-inline ImagePointerType wxPNGReaderIter::GetRow()
-{
-  return IterImage;
-}
-
-inline bool wxPNGReaderIter::NextByte()
-{
-  if (++Itx < ima->EfeWidth)
-     return 1;
-  else
-     if (++Ity < ima->Height)
-     {
-        IterImage += ima->EfeWidth;
-        Itx = 0;
-        return 1;
-     } else
-        return 0;
-}
-
-inline bool wxPNGReaderIter::PrevByte()
-{
-  if (--Itx >= 0)
-     return 1;
-  else
-     if (--Ity >= 0)
-     {
-        IterImage -= ima->EfeWidth;
-        Itx = 0;
-        return 1;
-     } else
-        return 0;
-}
-
-inline bool wxPNGReaderIter::NextStep()
-{
-  Itx += Stepx;
-  if (Itx < ima->EfeWidth)
-     return 1;
-  else {
-     Ity += Stepy;
-     if (Ity < ima->Height)
-     {
-        IterImage += ima->EfeWidth;
-        Itx = 0;
-        return 1;
-     } else
-        return 0;
-  }
-}
-
-inline bool wxPNGReaderIter::PrevStep()
-{
-  Itx -= Stepx;
-  if (Itx >= 0)
-     return 1;
-  else {
-     Ity -= Stepy;
-     if (Ity >= 0 && Ity < ima->Height)
-     {
-        IterImage -= ima->EfeWidth;
-        Itx = 0;
-        return 1;
-     } else
-        return 0;
-  }
-}
-
-#endif
-    // _WX_PNGREAD__
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pntleft.ptr b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pntleft.ptr
deleted file mode 100644
index e11bb0882d..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pntleft.ptr and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pntright.ptr b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pntright.ptr
deleted file mode 100644
index b243c42a05..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/pntright.ptr and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/popupwin.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/popupwin.h
deleted file mode 100644
index bcbe265cf4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/popupwin.h
+++ /dev/null
@@ -1,57 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/popupwin.h
-// Purpose:     wxPopupWindow class for wxPM
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     06.01.01
-// Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PM_POPUPWIN_H_
-#define _WX_PM_POPUPWIN_H_
-
-// ----------------------------------------------------------------------------
-// wxPopupWindow
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase
-{
-public:
-    wxPopupWindow() { }
-
-    wxPopupWindow( wxWindow* pParent
-                  ,int       nFlags
-                 )
-    { (void)Create(pParent, nFlags); }
-
-    bool Create( wxWindow* pParent
-                ,int       nFlags = wxBORDER_NONE
-               );
-    //
-    // Implementation only from now on
-    // -------------------------------
-    //
-protected:
-
-    virtual void DoGetPosition( int* pnX
-                               ,int* pny
-                              ) const;
-
-    virtual WXDWORD OS2GetStyle( long     lFlags
-                                ,WXDWORD* dwExstyle
-                               ) const;
-    //
-    // Get the HWND to be used as parent of this window with CreateWindow()
-    //
-    virtual WXHWND OS2GetParent(void) const;
-
-    //
-    // The list of all currently shown popup windows used by FindPopupFor()
-    //
-    static wxWindowList             m_svShownPopups;
-
-    DECLARE_DYNAMIC_CLASS(wxPopupWindow)
-}; // end of CLASS wxPopupWindow
-
-#endif // _WX_PM_POPUPWIN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/print.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/print.h
deleted file mode 100644
index a22fab1e01..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/print.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/print.h
-// Purpose:     wxPrinter, wxPrintPreview classes
-// Author:      David Webster
-// Modified by:
-// Created:     10/14/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRINT_H_
-#define _WX_PRINT_H_
-
-#include "wx/prntbase.h"
-
-/*
- * Represents the printer: manages printing a wxPrintout object
- */
-
-class WXDLLIMPEXP_CORE wxOS2Printer: public wxPrinterBase
-{
-  DECLARE_DYNAMIC_CLASS(wxPrinter)
-
- public:
-  wxOS2Printer(wxPrintData *data = NULL);
-  virtual ~wxOS2Printer();
-
-  virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE);
-  virtual wxDC* PrintDialog(wxWindow *parent);
-  virtual bool Setup(wxWindow *parent);
-private:
-};
-
-/*
- * wxPrintPreview
- * Programmer creates an object of this class to preview a wxPrintout.
- */
-
-class WXDLLIMPEXP_CORE wxOS2PrintPreview: public wxPrintPreviewBase
-{
-  DECLARE_CLASS(wxPrintPreview)
-
- public:
-  wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL);
-  virtual ~wxOS2PrintPreview();
-
-  virtual bool Print(bool interactive);
-  virtual void DetermineScaling();
-};
-
-#endif
-    // _WX_PRINT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/printos2.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/printos2.h
deleted file mode 100644
index 3cf8f0ec4d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/printos2.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/printos2.h
-// Purpose:     wxOS2Printer, wxOS2PrintPreview classes
-// Author:      David Webster
-// Modified by:
-// Created:     10/14/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRINT_H_
-#define _WX_PRINT_H_
-
-#include "wx/prntbase.h"
-
-#if wxUSE_PRINTING_ARCHITECTURE
-
-/*
- * Represents the printer: manages printing a wxPrintout object
- */
-
-class WXDLLIMPEXP_CORE wxOS2Printer: public wxPrinterBase
-{
-    DECLARE_DYNAMIC_CLASS(wxOS2Printer)
-
-public:
-    wxOS2Printer(wxPrintDialogData *data = NULL);
-    virtual ~wxOS2Printer();
-
-    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = true);
-    virtual wxDC* PrintDialog(wxWindow *parent);
-    virtual bool Setup(wxWindow *parent);
-private:
-};
-
-/*
- * wxOS2PrintPreview
- * Programmer creates an object of this class to preview a wxPrintout.
- */
-
-class WXDLLIMPEXP_CORE wxOS2PrintPreview: public wxPrintPreviewBase
-{
-    DECLARE_CLASS(wxOS2PrintPreview)
-
-public:
-    wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintDialogData *data = NULL);
-    wxOS2PrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting, wxPrintData *data);
-    virtual ~wxOS2PrintPreview();
-
-    virtual bool Print(bool interactive);
-    virtual void DetermineScaling();
-};
-
-#endif // wxUSE_PRINTING_ARCHITECTURE
-
-#endif
-    // _WX_PRINT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/private.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/private.h
deleted file mode 100644
index 9729793909..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/private.h
+++ /dev/null
@@ -1,423 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/private.h
-// Purpose:     Private declarations: as this header is only included by
-//              wxWidgets itself, it may contain identifiers which don't start
-//              with "wx".
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OS2_PRIVATE_H_
-#define _WX_OS2_PRIVATE_H_
-
-#define INCL_BASE
-#define INCL_PM
-#define INCL_GPI
-#define INCL_WINSYS
-#define INCL_GPIERRORS
-#define INCL_DOS
-#define INCL_DOSPROCESS
-#define INCL_DOSERRORS
-#define INCL_WIN
-#define INCL_WINATOM
-#define INCL_SHLERRORS
-
-#include <os2.h>
-
-#if wxONLY_WATCOM_EARLIER_THAN(1,4)
-    inline HATOMTBL APIENTRY WinQuerySystemAtomTable(VOID){return NULL;}
-    inline ULONG APIENTRY WinQueryAtomName(HATOMTBL,ATOM,PCSZ,ULONG){return 0;}
-    inline LONG APIENTRY GpiPointArc(HPS,PPOINTL){return GPI_ERROR;}
-    inline BOOL APIENTRY WinDrawPointer(HPS,LONG,LONG,HPOINTER,ULONG){return FALSE;}
-    inline HPOINTER APIENTRY WinCreatePointerIndirect(HWND,PPOINTERINFO){return NULLHANDLE;}
-    inline BOOL APIENTRY WinGetMaxPosition(HWND,PSWP){return FALSE;}
-    inline BOOL APIENTRY WinGetMinPosition(HWND,PSWP,PPOINTL){return FALSE;}
-#endif
-
-#if defined(__WATCOMC__) && defined(__WXMOTIF__)
-    #include <os2def.h>
-    #define I_NEED_OS2_H
-    #include <X11/Xmd.h>
-
-    // include this header from here for many of the GUI related code
-    #if wxUSE_GUI
-        extern "C" {
-            #include <Xm/VendorSP.h>
-        }
-    #endif
-
-    // provide Unix-like pipe()
-    #include <types.h>
-    #include <tcpustd.h>
-    #include <sys/time.h>
-    // Use ::DosCreatePipe or ::DosCreateNPipe under OS/2
-    // for more see http://posix2.sourceforge.net/guide.html
-    inline int pipe( int WXUNUSED(filedes)[2] )
-    {
-        wxFAIL_MSG(wxT("Implement first"));
-        return -1;
-    }
-#endif
-
-#if defined (__EMX__) && !defined(USE_OS2_TOOLKIT_HEADERS) && !defined(HAVE_SPBCDATA)
-
-    typedef struct _SPBCDATA {
-        ULONG     cbSize;       /*  Size of control block. */
-        ULONG     ulTextLimit;  /*  Entryfield text limit. */
-        LONG      lLowerLimit;  /*  Spin lower limit (numeric only). */
-        LONG      lUpperLimit;  /*  Spin upper limit (numeric only). */
-        ULONG     idMasterSpb;  /*  ID of the servant's master spinbutton. */
-        PVOID     pHWXCtlData;  /*  Handwriting control data structure flag. */
-    } SPBCDATA;
-
-    typedef SPBCDATA *PSPBCDATA;
-
-#endif
-
-#include "wx/dlimpexp.h"
-#include "wx/fontenc.h"
-
-class WXDLLIMPEXP_FWD_CORE wxFont;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLIMPEXP_FWD_BASE wxString;
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-
-// ---------------------------------------------------------------------------
-// private constants
-// ---------------------------------------------------------------------------
-
-//
-// Constant strings for control names and classes
-//
-
-//
-// Controls
-//
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxButtonNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxCheckBoxNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxChoiceNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxComboBoxNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxDialogNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxFrameNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxGaugeNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxStaticBoxNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxListBoxNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxStaticLineNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxStaticTextNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxStaticBitmapNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxPanelNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxRadioBoxNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxRadioButtonNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxBitmapRadioButtonNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxScrollBarNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxSliderNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxTextCtrlNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxToolBarNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxStatusLineNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxGetTextFromUserPromptStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxMessageBoxCaptionStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxFileSelectorPromptStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxFileSelectorDefaultWildcardStr[];
-WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxInternalErrorStr;
-WXDLLIMPEXP_DATA_CORE(extern const wxChar*) wxFatalErrorStr;
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxTreeCtrlNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxDirDialogNameStr[];
-WXDLLIMPEXP_DATA_CORE(extern const char)   wxDirDialogDefaultFolderStr[];
-
-//
-// Class names
-//
-WXDLLIMPEXP_DATA_CORE(extern const wxChar*)  wxFrameClassName;
-WXDLLIMPEXP_DATA_CORE(extern const wxChar*)  wxFrameClassNameNoRedraw;
-WXDLLIMPEXP_DATA_CORE(extern const wxChar*)  wxMDIFrameClassName;
-WXDLLIMPEXP_DATA_CORE(extern const wxChar*)  wxMDIFrameClassNameNoRedraw;
-WXDLLIMPEXP_DATA_CORE(extern const wxChar*)  wxMDIChildFrameClassName;
-WXDLLIMPEXP_DATA_CORE(extern const wxChar*)  wxMDIChildFrameClassNameNoRedraw;
-WXDLLIMPEXP_DATA_CORE(extern const wxChar*)  wxPanelClassName;
-WXDLLIMPEXP_DATA_CORE(extern const wxChar*)  wxPanelClassNameNR;
-WXDLLIMPEXP_DATA_CORE(extern const wxChar*)  wxCanvasClassName;
-WXDLLIMPEXP_DATA_CORE(extern const wxChar*)  wxCanvasClassNameNR;
-
-// ---------------------------------------------------------------------------
-// standard icons from the resources
-// ---------------------------------------------------------------------------
-
-#ifdef __WXPM__
-
-WXDLLIMPEXP_DATA_CORE(extern HICON) wxSTD_FRAME_ICON;
-WXDLLIMPEXP_DATA_CORE(extern HICON) wxSTD_MDIPARENTFRAME_ICON;
-WXDLLIMPEXP_DATA_CORE(extern HICON) wxSTD_MDICHILDFRAME_ICON;
-WXDLLIMPEXP_DATA_CORE(extern HICON) wxDEFAULT_FRAME_ICON;
-WXDLLIMPEXP_DATA_CORE(extern HICON) wxDEFAULT_MDIPARENTFRAME_ICON;
-WXDLLIMPEXP_DATA_CORE(extern HICON) wxDEFAULT_MDICHILDFRAME_ICON;
-WXDLLIMPEXP_DATA_CORE(extern HFONT) wxSTATUS_LINE_FONT;
-
-#endif
-
-// ---------------------------------------------------------------------------
-// this defines a CASTWNDPROC macro which casts a pointer to the type of a
-// window proc for PM.
-// MPARAM is a void * but is really a 32-bit value
-// ---------------------------------------------------------------------------
-
-typedef MRESULT (APIENTRY * WndProcCast) (HWND, ULONG, MPARAM, MPARAM);
-#define CASTWNDPROC (WndProcCast)
-
-/*
- * Decide what window classes we're going to use
- * for this combination of CTl3D/FAFA settings
- */
-
-#define STATIC_CLASS     wxT("STATIC")
-#define STATIC_FLAGS     (SS_TEXT|DT_LEFT|SS_LEFT|WS_VISIBLE)
-#define CHECK_CLASS      wxT("BUTTON")
-#define CHECK_FLAGS      (BS_AUTOCHECKBOX|WS_TABSTOP)
-#define CHECK_IS_FAFA    FALSE
-#define RADIO_CLASS      wxT("BUTTON" )
-#define RADIO_FLAGS      (BS_AUTORADIOBUTTON|WS_VISIBLE)
-#define RADIO_SIZE       20
-#define RADIO_IS_FAFA    FALSE
-#define PURE_WINDOWS
-/*  PM has no group box button style
-#define GROUP_CLASS      "BUTTON"
-#define GROUP_FLAGS      (BS_GROUPBOX|WS_CHILD|WS_VISIBLE)
-*/
-
-/*
-#define BITCHECK_FLAGS   (FB_BITMAP|FC_BUTTONDRAW|FC_DEFAULT|WS_VISIBLE)
-#define BITRADIO_FLAGS   (FC_BUTTONDRAW|FB_BITMAP|FC_RADIO|WS_CHILD|WS_VISIBLE)
-*/
-
-// ---------------------------------------------------------------------------
-// misc macros
-// ---------------------------------------------------------------------------
-
-#define MEANING_CHARACTER '0'
-#define DEFAULT_ITEM_WIDTH  200
-#define DEFAULT_ITEM_HEIGHT 80
-
-// Scale font to get edit control height
-#define EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy)    (3*(cy)/2)
-
-#ifdef __WXPM__
-
-// Generic subclass proc, for panel item moving/sizing and intercept
-// EDIT control VK_RETURN messages
-extern LONG APIENTRY wxSubclassedGenericControlProc(WXHWND hWnd, WXDWORD message, WXWPARAM wParam, WXLPARAM lParam);
-
-#endif
-
-// ---------------------------------------------------------------------------
-// constants which might miss from some compilers' headers
-// ---------------------------------------------------------------------------
-
-#if !defined(WS_EX_CLIENTEDGE)
-    #define WS_EX_CLIENTEDGE 0x00000200L
-#endif
-
-#ifndef ENDSESSION_LOGOFF
-    #define ENDSESSION_LOGOFF    0x80000000
-#endif
-
-#ifndef PMERR_INVALID_PARM
-    #define PMERR_INVALID_PARM 0x1303
-#endif
-
-#ifndef PMERR_INVALID_PARAMETERS
-    #define PMERR_INVALID_PARAMETERS 0x1208
-#endif
-
-#ifndef BOOKERR_INVALID_PARAMETERS
-    #define BOOKERR_INVALID_PARAMETERS -1
-#endif
-
-#ifndef DLGC_ENTRYFIELD
-    #define DLGC_ENTRYFIELD  0x0001
-#endif
-
-#ifndef DLGC_BUTTON
-    #define DLGC_BUTTON      0x0002
-#endif
-
-#ifndef DLGC_MLE
-    #define DLGC_MLE         0x0400
-#endif
-
-#ifndef DP_NORMAL
-    #define DP_NORMAL 0
-#endif
-
-// ---------------------------------------------------------------------------
-// debug messages -- OS/2 has no native debug output system
-// ---------------------------------------------------------------------------
-
-// ---------------------------------------------------------------------------
-// macros to make casting between WXFOO and FOO a bit easier: the GetFoo()
-// returns Foo cast to the Windows type for oruselves, while GetFooOf() takes
-// an argument which should be a pointer or reference to the object of the
-// corresponding class (this depends on the macro)
-// ---------------------------------------------------------------------------
-
-#define GetHwnd()               ((HWND)GetHWND())
-#define GetHwndOf(win)          ((HWND)((win)->GetHWND()))
-// old name
-#define GetWinHwnd              GetHwndOf
-
-#define GetHdc()                ((HDC)GetHDC())
-#define GetHdcOf(dc)            ((HDC)(dc).GetHDC())
-
-#define GetHbitmap()            ((HBITMAP)GetHBITMAP())
-#define GetHbitmapOf(bmp)       ((HBITMAP)(bmp).GetHBITMAP())
-
-#define GetHicon()              ((HICON)GetHICON())
-#define GetHiconOf(icon)        ((HICON)(icon).GetHICON())
-
-#define GetHaccel()             ((HACCEL)GetHACCEL())
-#define GetHaccelOf(table)      ((HACCEL)((table).GetHACCEL()))
-
-#define GetHmenu()              ((HMENU)GetHMenu())
-#define GetHmenuOf(menu)        ((HMENU)menu->GetHMenu())
-
-#define GetHcursor()            ((HCURSOR)GetHCURSOR())
-#define GetHcursorOf(cursor)    ((HCURSOR)(cursor).GetHCURSOR())
-
-#define GetHfont()              ((HFONT)GetHFONT())
-#define GetHfontOf(font)        ((HFONT)(font).GetHFONT())
-
-// OS/2 convention of the mask is opposed to the wxWidgets one, so we need
-// to invert the mask each time we pass one/get one to/from Windows
-extern HBITMAP wxInvertMask(HBITMAP hbmpMask, int w = 0, int h = 0);
-extern HBITMAP wxCopyBmp(HBITMAP hbmp, bool flip=false, int w=0, int h=0);
-
-// ---------------------------------------------------------------------------
-// global data
-// ---------------------------------------------------------------------------
-
-#ifdef __WXPM__
-// The MakeProcInstance version of the function wxSubclassedGenericControlProc
-WXDLLIMPEXP_DATA_CORE(extern int) wxGenericControlSubClassProc;
-WXDLLIMPEXP_DATA_CORE(extern wxChar*) wxBuffer;
-WXDLLIMPEXP_DATA_CORE(extern HINSTANCE) wxhInstance;
-#endif
-
-// ---------------------------------------------------------------------------
-// global functions
-// ---------------------------------------------------------------------------
-
-#ifdef __WXPM__
-extern "C"
-{
-WXDLLIMPEXP_CORE HINSTANCE wxGetInstance();
-}
-
-WXDLLIMPEXP_CORE void wxSetInstance(HINSTANCE hInst);
-#endif
-
-#include "wx/thread.h"
-static inline MRESULT MySendMsg(HWND hwnd, ULONG ulMsgid,
-                                MPARAM mpParam1, MPARAM mpParam2)
-{
-    MRESULT vRes;
-    vRes = ::WinSendMsg(hwnd, ulMsgid, mpParam1, mpParam2);
-#if wxUSE_THREADS
-    if (!wxThread::IsMain())
-        ::WinPostMsg(hwnd, ulMsgid, mpParam1, mpParam2);
-#endif
-    return vRes;
-}
-#define WinSendMsg MySendMsg
-
-#ifdef __WXPM__
-
-WXDLLIMPEXP_CORE void wxDrawBorder( HPS     hPS
-                              ,RECTL&  rRect
-                              ,WXDWORD dwStyle
-                             );
-
-WXDLLIMPEXP_CORE wxWindow* wxFindWinFromHandle(WXHWND hWnd);
-
-WXDLLIMPEXP_CORE void   wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font);
-
-WXDLLIMPEXP_CORE void   wxConvertVectorFontSize( FIXED   fxPointSize
-                                           ,PFATTRS pFattrs
-                                          );
-WXDLLIMPEXP_CORE void   wxFillLogFont( LOGFONT*      pLogFont
-                                 ,PFACENAMEDESC pFaceName
-                                 ,HPS*          phPS
-                                 ,bool*         pbInternalPS
-                                 ,long*         pflId
-                                 ,wxString&     sFaceName
-                                 ,wxFont*       pFont
-                                );
-WXDLLIMPEXP_CORE wxFontEncoding wxGetFontEncFromCharSet(int nCharSet);
-WXDLLIMPEXP_CORE void   wxOS2SelectMatchingFontByName( PFATTRS       vFattrs
-                                                 ,PFACENAMEDESC pFaceName
-                                                 ,PFONTMETRICS  pFM
-                                                 ,int           nNumFonts
-                                                 ,const wxFont* pFont
-                                                );
-WXDLLIMPEXP_CORE wxFont wxCreateFontFromLogFont( LOGFONT*      pLogFont
-                                           ,PFONTMETRICS  pFM
-                                           ,PFACENAMEDESC pFace
-                                          );
-WXDLLIMPEXP_CORE int    wxGpiStrcmp(wxChar* s0, wxChar* s1);
-
-WXDLLIMPEXP_CORE void wxSliderEvent(WXHWND control, WXWORD wParam, WXWORD pos);
-WXDLLIMPEXP_CORE void wxScrollBarEvent(WXHWND hbar, WXWORD wParam, WXWORD pos);
-
-// Find maximum size of window/rectangle
-WXDLLIMPEXP_CORE extern void wxFindMaxSize(WXHWND hwnd, RECT *rect);
-
-WXDLLIMPEXP_CORE wxWindow* wxFindControlFromHandle(WXHWND hWnd);
-WXDLLIMPEXP_CORE void wxAddControlHandle(WXHWND hWnd, wxWindow *item);
-
-// Safely get the window text (i.e. without using fixed size buffer)
-WXDLLIMPEXP_CORE extern wxString wxGetWindowText(WXHWND hWnd);
-
-// get the window class name
-WXDLLIMPEXP_CORE extern wxString wxGetWindowClass(WXHWND hWnd);
-
-// get the window id (should be unsigned, hence this is not wxWindowID which
-// is, for mainly historical reasons, signed)
-WXDLLIMPEXP_CORE extern WXWORD wxGetWindowId(WXHWND hWnd);
-
-// Convert a PM Error code to a string
-WXDLLIMPEXP_BASE extern wxString wxPMErrorToStr(ERRORID vError);
-
-// Does this window style specify any border?
-inline bool wxStyleHasBorder(long style)
-{
-  return (style & (wxSIMPLE_BORDER | wxRAISED_BORDER |
-                   wxSUNKEN_BORDER | wxDOUBLE_BORDER)) != 0;
-}
-
-inline RECTL wxGetWindowRect(HWND hWnd)
-{
-    RECTL                           vRect;
-
-    ::WinQueryWindowRect(hWnd, &vRect);
-    return vRect;
-} // end of wxGetWindowRect
-
-WXDLLIMPEXP_CORE extern void wxOS2SetFont( HWND          hWnd
-                                     ,const wxFont& rFont
-                                    );
-
-
-WXDLLIMPEXP_CORE extern bool wxCheckWindowWndProc( WXHWND    hWnd
-                                             ,WXFARPROC fnWndProc
-                                            );
-WXDLLIMPEXP_CORE extern wxBitmap wxDisableBitmap( const wxBitmap& rBmp
-                                            ,long            lColor
-                                           );
-#if wxUSE_GUI
-class wxColour;
-WXDLLIMPEXP_CORE extern COLORREF wxColourToRGB(const wxColour& rColor);
-#endif
-
-#endif // __WXPM__
-
-#endif // _WX_OS2_PRIVATE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/private/timer.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/private/timer.h
deleted file mode 100644
index a1ba027559..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/private/timer.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/private/timer.h
-// Purpose:     wxTimer class
-// Author:      David Webster
-// Modified by:
-// Created:     10/17/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OS2_PRIVATE_TIMER_H_
-#define _WX_OS2_PRIVATE_TIMER_H_
-
-#include "wx/private/timer.h"
-
-class WXDLLIMPEXP_CORE wxOS2TimerImpl: public wxTimerImpl
-{
-friend void wxProcessTimer(wxOS2TimerImpl& timer);
-
-public:
-    wxOS2TimerImpl(wxTimer *timer) : wxTimerImpl(timer) { m_ulId = 0; }
-
-    virtual bool Start(int  nMilliseconds = -1, bool bOneShot = FALSE);
-    virtual void Stop(void);
-
-    virtual bool IsRunning(void) const { return m_ulId != 0L; }
-
-protected:
-    ULONG                            m_ulId;
-    HAB                              m_Hab;
-};
-
-extern ULONG wxTimerProc( HWND  WXUNUSED(hwnd)
-                         ,ULONG
-                         ,int   nIdTimer
-                         ,ULONG
-                        );
-#endif // _WX_OS2_PRIVATE_TIMER_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/query.ptr b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/query.ptr
deleted file mode 100644
index cfffae5951..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/query.ptr and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/question.ico b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/question.ico
deleted file mode 100644
index 129053ec6a..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/question.ico and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/radiobox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/radiobox.h
deleted file mode 100644
index c548ab7b14..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/radiobox.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/radiobox.h
-// Purpose:     wxRadioBox class
-// Author:      David Webster
-// Modified by:
-// Created:     10/12/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RADIOBOX_H_
-#define _WX_RADIOBOX_H_
-
-// List box item
-class WXDLLIMPEXP_FWD_CORE wxBitmap ;
-
-class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase
-{
-public:
-    wxRadioBox();
-
-    inline wxRadioBox( wxWindow*          pParent
-                      ,wxWindowID         vId
-                      ,const wxString&    rsTitle
-                      ,const wxPoint&     rPos = wxDefaultPosition
-                      ,const wxSize&      rSize = wxDefaultSize
-                      ,int                nNum = 0
-                      ,const wxString     asChoices[] = NULL
-                      ,int                nMajorDim = 0
-                      ,long               lStyle = wxRA_SPECIFY_COLS
-                      ,const wxValidator& rVal = wxDefaultValidator
-                      ,const wxString&    rsName = wxRadioBoxNameStr
-                     )
-    {
-        Create( pParent
-               ,vId
-               ,rsTitle
-               ,rPos
-               ,rSize
-               ,nNum
-               ,asChoices
-               ,nMajorDim
-               ,lStyle
-               ,rVal
-               ,rsName
-              );
-    }
-
-    inline wxRadioBox( wxWindow*            pParent
-                      ,wxWindowID           vId
-                      ,const wxString&      rsTitle
-                      ,const wxPoint&       rPos
-                      ,const wxSize&        rSize
-                      ,const wxArrayString& asChoices
-                      ,int                  nMajorDim = 0
-                      ,long                 lStyle = wxRA_SPECIFY_COLS
-                      ,const wxValidator&   rVal = wxDefaultValidator
-                      ,const wxString&      rsName = wxRadioBoxNameStr
-                     )
-    {
-        Create( pParent
-               ,vId
-               ,rsTitle
-               ,rPos
-               ,rSize
-               ,asChoices
-               ,nMajorDim
-               ,lStyle
-               ,rVal
-               ,rsName
-              );
-    }
-
-    virtual ~wxRadioBox();
-
-    bool Create( wxWindow*          pParent
-                ,wxWindowID         vId
-                ,const wxString&    rsTitle
-                ,const wxPoint&     rPos = wxDefaultPosition
-                ,const wxSize&      rSize = wxDefaultSize
-                ,int                nNum = 0
-                ,const wxString     asChoices[] = NULL
-                ,int                nMajorDim = 0
-                ,long               lStyle = wxRA_SPECIFY_COLS
-                ,const wxValidator& rVal = wxDefaultValidator
-                ,const wxString&    rsName = wxRadioBoxNameStr
-               );
-
-    bool Create( wxWindow*            pParent
-                ,wxWindowID           vId
-                ,const wxString&      rsTitle
-                ,const wxPoint&       rPos
-                ,const wxSize&        rSize
-                ,const wxArrayString& asChoices
-                ,int                  nMajorDim = 0
-                ,long                 lStyle = wxRA_SPECIFY_COLS
-                ,const wxValidator&   rVal = wxDefaultValidator
-                ,const wxString&      rsName = wxRadioBoxNameStr
-               );
-
-    // Enabling
-    virtual bool Enable(bool bEnable = true);
-    virtual bool Enable(unsigned int nItem, bool bEnable = true);
-    virtual bool IsItemEnabled(unsigned int WXUNUSED(n)) const
-    {
-        /* TODO */
-        return true;
-    }
-
-    // Showing
-    virtual bool Show(bool bShow = true);
-    virtual bool Show(unsigned int nItem, bool bShow = true);
-    virtual bool IsItemShown(unsigned int WXUNUSED(n)) const
-    {
-        /* TODO */
-        return true;
-    }
-
-    void Command(wxCommandEvent& rEvent);
-    bool ContainsHWND(WXHWND hWnd) const;
-
-    virtual WXHBRUSH OnCtlColor( WXHDC    hDC
-                                ,WXHWND   hWnd
-                                ,WXUINT   uCtlColor
-                                ,WXUINT   uMessage
-                                ,WXWPARAM wParam
-                                ,WXLPARAM lParam
-                               );
-    virtual bool     OS2Command( WXUINT uParam
-                                ,WXWORD wId
-                               );
-    void             SendNotificationEvent(void);
-    MRESULT          WindowProc( WXUINT   uMsg
-                                ,WXWPARAM wParam
-                                ,WXLPARAM lParam
-                               );
-
-
-
-
-           virtual unsigned int GetCount() const;
-    inline         WXHWND*  GetRadioButtons(void) const { return m_ahRadioButtons; }
-                   int      GetSelection(void) const;
-                   void     GetSize(int* pnX, int* pnY) const;
-    inline         int      GetSizeFlags(void) const { return m_nSizeFlags; }
-           virtual wxString GetString(unsigned int nIndex) const;
-           virtual wxString GetStringSelection(void) const;
-
-    inline         void     SetButtonFont(const wxFont& rFont) { SetFont(rFont); }
-                   void     SetFocus(void);
-           virtual bool     SetFont(const wxFont& rFont);
-    inline         void     SetLabelFont(const wxFont& WXUNUSED(font)) {}
-           virtual void     SetSelection(int nIndex);
-           virtual void     SetString(unsigned int nNum, const wxString& rsLabel);
-    virtual bool SetStringSelection(const wxString& rsStr);
-
-    virtual void SetLabel(const wxString& rsLabel)
-        { wxControl::SetLabel(rsLabel); }
-    virtual wxString GetLabel() const
-        { return wxControl::GetLabel(); }
-
-    void SetLabel( int nItem, const wxString& rsLabel );
-    void SetLabel( int item, wxBitmap* pBitmap );
-    wxString GetLabel(int nItem) const;
-
-protected:
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-    virtual wxSize DoGetBestSize(void) const;
-    virtual void   DoSetSize( int nX
-                             ,int nY
-                             ,int nWidth
-                             ,int nHeight
-                             ,int nSizeFlags = wxSIZE_AUTO
-                            );
-    wxSize GetMaxButtonSize(void) const;
-    wxSize GetTotalButtonSize(const wxSize& rSizeBtn) const;
-    void   SubclassRadioButton(WXHWND hWndBtn);
-
-
-    WXHWND* m_ahRadioButtons;
-    int*    m_pnRadioWidth;  // for bitmaps
-    int*    m_pnRadioHeight;
-    int     m_nSelectedButton;
-    int     m_nSizeFlags;
-
-private:
-
-    unsigned int m_nNoItems;
-
-    DECLARE_DYNAMIC_CLASS(wxRadioBox)
-}; // end of wxRadioBox
-
-#endif // _WX_RADIOBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/radiobut.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/radiobut.h
deleted file mode 100644
index 7e8f9ac173..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/radiobut.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/radiobut.h
-// Purpose:     wxRadioButton class
-// Author:      David Webster
-// Modified by:
-// Created:     10/12/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RADIOBUT_H_
-#define _WX_RADIOBUT_H_
-
-#include "wx/control.h"
-
-class WXDLLIMPEXP_CORE wxRadioButton: public wxControl
-{
-public:
-    inline wxRadioButton() { Init(); }
-    inline wxRadioButton( wxWindow*          pParent
-                         ,wxWindowID         vId
-                         ,const wxString&    rsLabel
-                         ,const wxPoint&     rPos = wxDefaultPosition
-                         ,const wxSize&      rSize = wxDefaultSize
-                         ,long               lStyle = 0
-                         ,const wxValidator& rValidator = wxDefaultValidator
-                         ,const wxString&    rsName = wxRadioButtonNameStr
-                         )
-    {
-        Init();
-
-        Create( pParent
-               ,vId
-               ,rsLabel
-               ,rPos
-               ,rSize
-               ,lStyle
-               ,rValidator
-               ,rsName
-              );
-    }
-
-    bool Create( wxWindow* pParent
-                ,wxWindowID         vId
-                ,const wxString&    rsLabel
-                ,const wxPoint&     rPos = wxDefaultPosition
-                ,const wxSize&      rSize = wxDefaultSize
-                ,long               lStyle = 0
-                ,const wxValidator& rValidator = wxDefaultValidator
-                ,const wxString&    rsName = wxRadioButtonNameStr
-               );
-
-    virtual void SetLabel(const wxString& rsLabel);
-    virtual void SetValue(bool bVal);
-    virtual bool GetValue(void) const ;
-
-    bool            OS2Command( WXUINT wParam
-                               ,WXWORD wId
-                              );
-    void            Command(wxCommandEvent& rEvent);
-    virtual MRESULT OS2WindowProc( WXUINT   uMsg
-                                  ,WXWPARAM wParam
-                                  ,WXLPARAM lParam
-                                 );
-    virtual void    SetFocus(void);
-
-protected:
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-    virtual wxSize DoGetBestSize() const;
-
-private:
-    void Init(void);
-
-    bool                            m_bFocusJustSet;
-
-    DECLARE_DYNAMIC_CLASS(wxRadioButton)
-}; // end of wxRadioButton
-
-#endif
-    // _WX_RADIOBUT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/region.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/region.h
deleted file mode 100644
index 40ef561b96..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/region.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/region.h
-// Purpose:     wxRegion class
-// Author:      David Webster
-// Modified by:
-// Created:     10/15/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OS2_REGION_H_
-#define _WX_OS2_REGION_H_
-
-#include "wx/list.h"
-#include "wx/os2/private.h"
-
-class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine
-{
-public:
-    wxRegion( wxCoord x
-             ,wxCoord y
-             ,wxCoord vWidth
-             ,wxCoord vHeight
-            );
-    wxRegion( const wxPoint& rTopLeft
-             ,const wxPoint& rBottomRight
-            );
-    wxRegion(const wxRect& rRect);
-    wxRegion(WXHRGN hRegion, WXHDC hPS); // Hangs on to this region
-    wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
-    wxRegion( const wxBitmap& bmp)
-    {
-        Union(bmp);
-    }
-    wxRegion( const wxBitmap& bmp,
-              const wxColour& transColour, int tolerance = 0)
-    {
-        Union(bmp, transColour, tolerance);
-    }
-
-    wxRegion();
-    virtual ~wxRegion();
-
-    //
-    // Modify region
-    //
-
-    //
-    // Clear current region
-    //
-    virtual void Clear();
-
-    //
-    // Is region empty?
-    //
-    virtual bool IsEmpty() const;
-
-    //
-    // Get internal region handle
-    //
-    WXHRGN GetHRGN() const;
-
-    void   SetPS(HPS hPS);
-
-protected:
-    virtual wxGDIRefData* CreateGDIRefData(void) const;
-    virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* pData) const;
-
-    virtual bool DoIsEqual(const wxRegion& region) const;
-    virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const;
-    virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const;
-    virtual wxRegionContain DoContainsRect(const wxRect& rect) const;
-
-    virtual bool DoOffset(wxCoord x, wxCoord y);
-    virtual bool DoCombine(const wxRegion& region, wxRegionOp op);
-
-    friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;
-    DECLARE_DYNAMIC_CLASS(wxRegion);
-
-}; // end of CLASS wxRegion
-
-class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject
-{
-public:
-    wxRegionIterator();
-    wxRegionIterator(const wxRegion& rRegion);
-    virtual ~wxRegionIterator();
-
-    void Reset(void) { m_lCurrent = 0; }
-    void Reset(const wxRegion& rRegion);
-
-    operator bool (void) const { return m_lCurrent < m_lNumRects; }
-    bool HaveRects(void) const { return m_lCurrent < m_lNumRects; }
-
-    void operator ++ (void);
-    void operator ++ (int);
-
-    wxCoord GetX(void) const;
-    wxCoord GetY(void) const;
-    wxCoord GetW(void) const;
-    wxCoord GetWidth(void) const { return GetW(); }
-    wxCoord GetH(void) const;
-    wxCoord GetHeight(void) const { return GetH(); }
-    wxRect  GetRect(void) const { return wxRect(GetX(), GetY(), GetWidth(), GetHeight()); }
-
-private:
-    long                            m_lCurrent;
-    long                            m_lNumRects;
-    wxRegion                        m_vRegion;
-    wxRect*                         m_pRects;
-
-    DECLARE_DYNAMIC_CLASS(wxRegionIterator)
-}; // end of wxRegionIterator
-
-#endif // _WX_OS2_REGION_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/removble.ico b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/removble.ico
deleted file mode 100644
index 823094f1e5..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/removble.ico and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/roller.ptr b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/roller.ptr
deleted file mode 100644
index 5306a1722b..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/roller.ptr and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/scrolbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/scrolbar.h
deleted file mode 100644
index d8688818e6..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/scrolbar.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/scrolbar.h
-// Purpose:     wxScrollBar class
-// Author:      David Webster
-// Modified by:
-// Created:     10/15/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SCROLBAR_H_
-#define _WX_SCROLBAR_H_
-
-#include "wx/scrolbar.h"
-
-// Scrollbar item
-class WXDLLIMPEXP_CORE wxScrollBar : public wxScrollBarBase
-{
-public:
-    inline wxScrollBar()
-    {
-        m_nPageSize = 0;
-        m_nViewSize = 0;
-        m_nObjectSize = 0;
-    }
-    inline wxScrollBar( wxWindow*          pParent
-                       ,wxWindowID         vId
-                       ,const wxPoint&     rPos = wxDefaultPosition
-                       ,const wxSize&      rSize = wxDefaultSize
-                       ,long               lStyle = wxSB_HORIZONTAL
-#if wxUSE_VALIDATORS
-                       ,const wxValidator& rValidator = wxDefaultValidator
-#endif
-                       ,const wxString&    rsName = wxScrollBarNameStr
-                      )
-    {
-        Create( pParent
-               ,vId
-               ,rPos
-               ,rSize
-               ,lStyle
-#if wxUSE_VALIDATORS
-               ,rValidator
-#endif
-               ,rsName
-              );
-    }
-    virtual ~wxScrollBar();
-
-    bool Create( wxWindow*          pParent
-                ,wxWindowID         vId
-                ,const wxPoint&     rPos = wxDefaultPosition
-                ,const wxSize&      rSize = wxDefaultSize
-                ,long               lStyle = wxSB_HORIZONTAL
-#if wxUSE_VALIDATORS
-                ,const wxValidator& rValidator = wxDefaultValidator
-#endif
-                ,const wxString&    rsName = wxScrollBarNameStr
-               );
-
-                   int   GetThumbPosition(void) const ;
-    inline         int   GetThumbSize(void) const { return m_nPageSize; }
-    inline         int   GetPageSize(void) const { return m_nViewSize; }
-    inline         int   GetRange(void) const { return m_nObjectSize; }
-
-           virtual void  SetThumbPosition(int nViewStart);
-           virtual void  SetScrollbar( int  nPosition
-                                      ,int  nThumbSize
-                                      ,int  nRange
-                                      ,int  nPageSize
-                                      ,bool bRefresh = TRUE
-                                     );
-
-                   void      Command(wxCommandEvent& rEvent);
-            virtual WXHBRUSH OnCtlColor( WXHDC    hDC
-                                        ,WXHWND   hWnd
-                                        ,WXUINT   uCtlColor
-                                        ,WXUINT   uMessage
-                                        ,WXWPARAM wParam
-                                        ,WXLPARAM lParam
-                                       );
-            virtual bool     OS2OnScroll( int    nOrientation
-                                         ,WXWORD wParam
-                                         ,WXWORD wPos
-                                         ,WXHWND hControl
-                                        );
-
-protected:
-    int                             m_nPageSize;
-    int                             m_nViewSize;
-    int                             m_nObjectSize;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxScrollBar)
-}; // end of CLASS wxScrollBar
-
-#endif
-    // _WX_SCROLBAR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/setup.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/setup.h
deleted file mode 100644
index 6884170ab9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/setup.h
+++ /dev/null
@@ -1,1515 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/setup.h
-// Purpose:     Configuration for the library
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SETUP_H_
-#define _WX_SETUP_H_
-
-/* --- start common options --- */
-// ----------------------------------------------------------------------------
-// global settings
-// ----------------------------------------------------------------------------
-
-// define this to 0 when building wxBase library - this can also be done from
-// makefile/project file overriding the value here
-#ifndef wxUSE_GUI
-    #define wxUSE_GUI            1
-#endif // wxUSE_GUI
-
-// ----------------------------------------------------------------------------
-// compatibility settings
-// ----------------------------------------------------------------------------
-
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
-// This setting determines the compatibility with 2.8 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
-
-// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
-// default system font is used for wxWindow::GetCharWidth/Height() instead of
-// the current font.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxDIALOG_UNIT_COMPATIBILITY   0
-
-// ----------------------------------------------------------------------------
-// debugging settings
-// ----------------------------------------------------------------------------
-
-// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no
-// need to define it here. You may do it for two reasons: either completely
-// disable/compile out the asserts in release version (then do it inside #ifdef
-// NDEBUG) or, on the contrary, enable more asserts, including the usually
-// disabled ones, in the debug build (then do it inside #ifndef NDEBUG)
-//
-// #ifdef NDEBUG
-//  #define wxDEBUG_LEVEL 0
-// #else
-//  #define wxDEBUG_LEVEL 2
-// #endif
-
-// wxHandleFatalExceptions() may be used to catch the program faults at run
-// time and, instead of terminating the program with a usual GPF message box,
-// call the user-defined wxApp::OnFatalException() function. If you set
-// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work.
-//
-// This setting is for Win32 only and can only be enabled if your compiler
-// supports Win32 structured exception handling (currently only VC++ does)
-//
-// Default is 1
-//
-// Recommended setting: 1 if your compiler supports it.
-#define wxUSE_ON_FATAL_EXCEPTION 1
-
-// Set this to 1 to be able to generate a human-readable (unlike
-// machine-readable minidump created by wxCrashReport::Generate()) stack back
-// trace when your program crashes using wxStackWalker
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_STACKWALKER 1
-
-// Set this to 1 to compile in wxDebugReport class which allows you to create
-// and optionally upload to your web site a debug report consisting of back
-// trace of the crash (if wxUSE_STACKWALKER == 1) and other information.
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, it is compiled into a separate library so there
-//                         is no overhead if you don't use it
-#define wxUSE_DEBUGREPORT 1
-
-// Generic comment about debugging settings: they are very useful if you don't
-// use any other memory leak detection tools such as Purify/BoundsChecker, but
-// are probably redundant otherwise. Also, Visual C++ CRT has the same features
-// as wxWidgets memory debugging subsystem built in since version 5.0 and you
-// may prefer to use it instead of built in memory debugging code because it is
-// faster and more fool proof.
-//
-// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG
-// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0)
-// and if __NO_VC_CRTDBG__ is not defined.
-
-// The rest of the options in this section are obsolete and not supported,
-// enable them at your own risk.
-
-// If 1, enables wxDebugContext, for writing error messages to file, etc. If
-// __WXDEBUG__ is not defined, will still use the normal memory operators.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_CONTEXT 0
-
-// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF*
-// __WXDEBUG__ is also defined.
-//
-// WARNING: this code may not work with all architectures, especially if
-// alignment is an issue. This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 1 if you are not using a memory debugging tool, else 0
-#define wxUSE_MEMORY_TRACING 0
-
-// In debug mode, cause new and delete to be redefined globally.
-// If this causes problems (e.g. link errors which is a common problem
-// especially if you use another library which also redefines the global new
-// and delete), set this to 0.
-// This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
-
-// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
-// this causes problems (e.g. link errors), set this to 0. You may need to set
-// this to 0 if using templates (at least for VC++). This switch is currently
-// ignored for MinGW/Cygwin.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_NEW_ALWAYS 0
-
-
-// ----------------------------------------------------------------------------
-// Unicode support
-// ----------------------------------------------------------------------------
-
-// These settings are obsolete: the library is always built in Unicode mode
-// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if
-// absolutely necessary -- updating it is strongly recommended as the ANSI mode
-// will disappear completely in future wxWidgets releases.
-#ifndef wxUSE_UNICODE
-    #define wxUSE_UNICODE 1
-#endif
-
-// wxUSE_WCHAR_T is required by wxWidgets now, don't change.
-#define wxUSE_WCHAR_T 1
-
-// ----------------------------------------------------------------------------
-// global features
-// ----------------------------------------------------------------------------
-
-// Compile library in exception-safe mode? If set to 1, the library will try to
-// behave correctly in presence of exceptions (even though it still will not
-// use the exceptions itself) and notify the user code about any unhandled
-// exceptions. If set to 0, propagation of the exceptions through the library
-// code will lead to undefined behaviour -- but the code itself will be
-// slightly smaller and faster.
-//
-// Note that like wxUSE_THREADS this option is automatically set to 0 if
-// wxNO_EXCEPTIONS is defined.
-//
-// Default is 1
-//
-// Recommended setting: depends on whether you intend to use C++ exceptions
-//                      in your own code (1 if you do, 0 if you don't)
-#define wxUSE_EXCEPTIONS    1
-
-// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
-//
-// Default is 0
-//
-// Recommended setting: 0 (this is still work in progress...)
-#define wxUSE_EXTENDED_RTTI 0
-
-// Support for message/error logging. This includes wxLogXXX() functions and
-// wxLog and derived classes. Don't set this to 0 unless you really know what
-// you are doing.
-//
-// Default is 1
-//
-// Recommended setting: 1 (always)
-#define wxUSE_LOG 1
-
-// Recommended setting: 1
-#define wxUSE_LOGWINDOW 1
-
-// Recommended setting: 1
-#define wxUSE_LOGGUI 1
-
-// Recommended setting: 1
-#define wxUSE_LOG_DIALOG 1
-
-// Support for command line parsing using wxCmdLineParser class.
-//
-// Default is 1
-//
-// Recommended setting: 1 (can be set to 0 if you don't use the cmd line)
-#define wxUSE_CMDLINE_PARSER 1
-
-// Support for multithreaded applications: if 1, compile in thread classes
-// (thread.h) and make the library a bit more thread safe. Although thread
-// support is quite stable by now, you may still consider recompiling the
-// library without it if you have no use for it - this will result in a
-// somewhat smaller and faster operation.
-//
-// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset
-// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in
-// build/msw/config.* file this value will have no effect.
-//
-// Default is 1
-//
-// Recommended setting: 0 unless you do plan to develop MT applications
-#define wxUSE_THREADS 1
-
-// If enabled, compiles wxWidgets streams classes
-//
-// wx stream classes are used for image IO, process IO redirection, network
-// protocols implementation and much more and so disabling this results in a
-// lot of other functionality being lost.
-//
-// Default is 1
-//
-// Recommended setting: 1 as setting it to 0 disables many other things
-#define wxUSE_STREAMS       1
-
-// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf.
-// Note that if the system's implementation does not support positional
-// parameters, setting this to 1 forces the use of the wxWidgets implementation
-// of wxVsnprintf. The standard vsnprintf() supports positional parameters on
-// many Unix systems but usually doesn't under Windows.
-//
-// Positional parameters are very useful when translating a program since using
-// them in formatting strings allow translators to correctly reorder the
-// translated sentences.
-//
-// Default is 1
-//
-// Recommended setting: 1 if you want to support multiple languages
-#define wxUSE_PRINTF_POS_PARAMS      1
-
-// Enable the use of compiler-specific thread local storage keyword, if any.
-// This is used for wxTLS_XXX() macros implementation and normally should use
-// the compiler-provided support as it's simpler and more efficient, but is
-// disabled under Windows in wx/msw/chkconf.h as it can't be used if wxWidgets
-// is used in a dynamically loaded Win32 DLL (i.e. using LoadLibrary()) under
-// XP as this triggers a bug in compiler TLS support that results in crashes
-// when any TLS variables are used.
-//
-// If you're absolutely sure that your build of wxWidgets is never going to be
-// used in such situation, either because it's not going to be linked from any
-// kind of plugin or because you only target Vista or later systems, you can
-// set this to 2 to force the use of compiler TLS even under MSW.
-//
-// Default is 1 meaning that compiler TLS is used only if it's 100% safe.
-//
-// Recommended setting: 2 if you want to have maximal performance and don't
-// care about the scenario described above.
-#define wxUSE_COMPILER_TLS 1
-
-// ----------------------------------------------------------------------------
-// Interoperability with the standard library.
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_STL to 1 to enable maximal interoperability with the standard
-// library, even at the cost of backwards compatibility.
-//
-// Default is 0
-//
-// Recommended setting: 0 as the options below already provide a relatively
-// good level of interoperability and changing this option arguably isn't worth
-// diverging from the official builds of the library.
-#define wxUSE_STL 0
-
-// This is not a real option but is used as the default value for
-// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS.
-//
-// Currently the Digital Mars and Watcom compilers come without standard C++
-// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have
-// them (e.g. from STLPort).
-//
-// VC++ 5.0 does include standard C++ library headers, however they produce
-// many warnings that can't be turned off when compiled at warning level 4.
-#if defined(__DMC__) || defined(__WATCOMC__) \
-        || (defined(_MSC_VER) && _MSC_VER < 1200)
-    #define wxUSE_STD_DEFAULT  0
-#else
-    #define wxUSE_STD_DEFAULT  1
-#endif
-
-// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<>
-// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but
-// usually more limited) implementations are used which allows to avoid the
-// dependency on the C++ run-time library.
-//
-// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't
-// support using standard containers and that VC6 needs non-default options for
-// such build to avoid getting "fatal error C1076: compiler limit : internal
-// heap limit reached; use /Zm to specify a higher limit" in its own standard
-// headers, so you need to ensure you do increase the heap size before enabling
-// this option for this compiler.
-//
-// Default is 0 for compatibility reasons.
-//
-// Recommended setting: 1 unless compatibility with the official wxWidgets
-// build and/or the existing code is a concern.
-#define wxUSE_STD_CONTAINERS 0
-
-// Use standard C++ streams if 1 instead of wx streams in some places. If
-// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
-// standard streams library.
-//
-// Notice that enabling this does not replace wx streams with std streams
-// everywhere, in a lot of places wx streams are used no matter what.
-//
-// Default is 1 if compiler supports it.
-//
-// Recommended setting: 1 if you use the standard streams anyhow and so
-//                      dependency on the standard streams library is not a
-//                      problem
-#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
-
-// Enable minimal interoperability with the standard C++ string class if 1.
-// "Minimal" means that wxString can be constructed from std::string or
-// std::wstring but can't be implicitly converted to them. You need to enable
-// the option below for the latter.
-//
-// Default is 1 for most compilers.
-//
-// Recommended setting: 1 unless you want to ensure your program doesn't use
-//                      the standard C++ library at all.
-#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
-
-// Make wxString as much interchangeable with std::[w]string as possible, in
-// particular allow implicit conversion of wxString to either of these classes.
-// This comes at a price (or a benefit, depending on your point of view) of not
-// allowing implicit conversion to "const char *" and "const wchar_t *".
-//
-// Because a lot of existing code relies on these conversions, this option is
-// disabled by default but can be enabled for your build if you don't care
-// about compatibility.
-//
-// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled.
-//
-// Recommended setting: 0 to remain compatible with the official builds of
-// wxWidgets.
-#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
-
-// VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
-// them. Set this option to 1 to use <iostream.h>, 0 to use <iostream>.
-//
-// Note that newer compilers (including VC++ 7.1 and later) don't support
-// wxUSE_IOSTREAMH == 1 and so <iostream> will be used anyhow.
-//
-// Default is 0.
-//
-// Recommended setting: 0, only set to 1 if you use a really old compiler
-#define wxUSE_IOSTREAMH     0
-
-
-// ----------------------------------------------------------------------------
-// non GUI features selection
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit
-// integer which is implemented in terms of native 64 bit integers if any or
-// uses emulation otherwise.
-//
-// This class is required by wxDateTime and so you should enable it if you want
-// to use wxDateTime. For most modern platforms, it will use the native 64 bit
-// integers in which case (almost) all of its functions are inline and it
-// almost does not take any space, so there should be no reason to switch it
-// off.
-//
-// Recommended setting: 1
-#define wxUSE_LONGLONG      1
-
-// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for
-// storing binary data in wxConfig on most platforms.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_BASE64        1
-
-// Set this to 1 to be able to use wxEventLoop even in console applications
-// (i.e. using base library only, without GUI). This is mostly useful for
-// processing socket events but is also necessary to use timers in console
-// applications
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_CONSOLE_EVENTLOOP 1
-
-// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level
-// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions.
-//
-// Default is 1
-//
-// Recommended setting: 1 (wxFile is highly recommended as it is required by
-// i18n code, wxFileConfig and others)
-#define wxUSE_FILE          1
-#define wxUSE_FFILE         1
-
-// Use wxFSVolume class providing access to the configured/active mount points
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely disabled if you don't use it)
-#define wxUSE_FSVOLUME      1
-
-// Use wxStandardPaths class which allows to retrieve some standard locations
-// in the file system
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be disabled to save space, but not much)
-#define wxUSE_STDPATHS      1
-
-// use wxTextBuffer class: required by wxTextFile
-#define wxUSE_TEXTBUFFER    1
-
-// use wxTextFile class: requires wxFile and wxTextBuffer, required by
-// wxFileConfig
-#define wxUSE_TEXTFILE      1
-
-// i18n support: _() macro, wxLocale class. Requires wxTextFile.
-#define wxUSE_INTL          1
-
-// Provide wxFoo_l() functions similar to standard foo() functions but taking
-// an extra locale parameter.
-//
-// Notice that this is fully implemented only for the systems providing POSIX
-// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary
-// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will
-// only work for the current user locale and "C" locale. You can use
-// wxHAS_XLOCALE_SUPPORT to test whether the full support is available.
-//
-// Default is 1
-//
-// Recommended setting: 1 but may be disabled if you are writing programs
-// running only in C locale anyhow
-#define wxUSE_XLOCALE       1
-
-// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which
-// allow to manipulate dates, times and time intervals. wxDateTime replaces the
-// old wxTime and wxDate classes which are still provided for backwards
-// compatibility (and implemented in terms of wxDateTime).
-//
-// Note that this class is relatively new and is still officially in alpha
-// stage because some features are not yet (fully) implemented. It is already
-// quite useful though and should only be disabled if you are aiming at
-// absolutely minimal version of the library.
-//
-// Requires: wxUSE_LONGLONG
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_DATETIME      1
-
-// Set wxUSE_TIMER to 1 to compile wxTimer class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_TIMER         1
-
-// Use wxStopWatch clas.
-//
-// Default is 1
-//
-// Recommended setting: 1 (needed by wxSocket)
-#define wxUSE_STOPWATCH     1
-
-// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FSWATCHER     1
-
-// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes
-// which allow the application to store its settings in the persistent
-// storage. Setting this to 1 will also enable on-demand creation of the
-// global config object in wxApp.
-//
-// See also wxUSE_CONFIG_NATIVE below.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG        1
-
-// If wxUSE_CONFIG is 1, you may choose to use either the native config
-// classes under Windows (using .INI files under Win16 and the registry under
-// Win32) or the portable text file format used by the config classes under
-// Unix.
-//
-// Default is 1 to use native classes. Note that you may still use
-// wxFileConfig even if you set this to 1 - just the config object created by
-// default for the applications needs will be a wxRegConfig or wxIniConfig and
-// not wxFileConfig.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG_NATIVE   1
-
-// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows
-// to connect/disconnect from the network and be notified whenever the dial-up
-// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DIALUP_MANAGER   1
-
-// Compile in classes for run-time DLL loading and function calling.
-// Required by wxUSE_DIALUP_MANAGER.
-//
-// This setting is for Win32 only
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DYNLIB_CLASS    1
-
-// experimental, don't use for now
-#define wxUSE_DYNAMIC_LOADER  1
-
-// Set to 1 to use socket classes
-#define wxUSE_SOCKETS       1
-
-// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS)
-//
-// Notice that currently setting this option under Windows will result in
-// programs which can only run on recent OS versions (with ws2_32.dll
-// installed) which is why it is disabled by default.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need IPv6 support
-#define wxUSE_IPV6          0
-
-// Set to 1 to enable virtual file systems (required by wxHTML)
-#define wxUSE_FILESYSTEM    1
-
-// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ZIP        1
-
-// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ARCHIVE    1
-
-// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_INET       1
-
-// wxArchive classes for accessing archives such as zip and tar
-#define wxUSE_ARCHIVE_STREAMS     1
-
-// Set to 1 to compile wxZipInput/OutputStream classes.
-#define wxUSE_ZIPSTREAM     1
-
-// Set to 1 to compile wxTarInput/OutputStream classes.
-#define wxUSE_TARSTREAM     1
-
-// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
-// wxUSE_LIBPNG
-#define wxUSE_ZLIB          1
-
-// If enabled, the code written by Apple will be used to write, in a portable
-// way, float on the disk. See extended.c for the license which is different
-// from wxWidgets one.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you don't like the license terms (unlikely)
-#define wxUSE_APPLE_IEEE          1
-
-// Joystick support class
-#define wxUSE_JOYSTICK            1
-
-// wxFontEnumerator class
-#define wxUSE_FONTENUM 1
-
-// wxFontMapper class
-#define wxUSE_FONTMAP 1
-
-// wxMimeTypesManager class
-#define wxUSE_MIMETYPE 1
-
-// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
-// or wxURL you need to set this to 1.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_PROTOCOL 1
-
-// The settings for the individual URL schemes
-#define wxUSE_PROTOCOL_FILE 1
-#define wxUSE_PROTOCOL_FTP 1
-#define wxUSE_PROTOCOL_HTTP 1
-
-// Define this to use wxURL class.
-#define wxUSE_URL 1
-
-// Define this to use native platform url and protocol support.
-// Currently valid only for MS-Windows.
-// Note: if you set this to 1, you can open ftp/http/gopher sites
-// and obtain a valid input stream for these sites
-// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0.
-// Doing so reduces the code size.
-//
-// This code is experimental and subject to change.
-#define wxUSE_URL_NATIVE 0
-
-// Support for wxVariant class used in several places throughout the library,
-// notably in wxDataViewCtrl API.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size as much as
-// possible in which case setting this to 0 can gain up to 100KB.
-#define wxUSE_VARIANT 1
-
-// Support for wxAny class, the successor for wxVariant.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size by a small amount,
-// or your compiler cannot for some reason cope with complexity of templates used.
-#define wxUSE_ANY 1
-
-// Support for regular expression matching via wxRegEx class: enable this to
-// use POSIX regular expressions in your code. You need to compile regex
-// library from src/regex to use it under Windows.
-//
-// Default is 0
-//
-// Recommended setting: 1 if your compiler supports it, if it doesn't please
-// contribute us a makefile for src/regex for it
-#define wxUSE_REGEX       1
-
-// wxSystemOptions class
-#define wxUSE_SYSTEM_OPTIONS 1
-
-// wxSound class
-#define wxUSE_SOUND      1
-
-// Use wxMediaCtrl
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_MEDIACTRL     1
-
-// Use wxWidget's XRC XML-based resource system.  Recommended.
-//
-// Default is 1
-//
-// Recommended setting: 1 (requires wxUSE_XML)
-#define wxUSE_XRC       1
-
-// XML parsing classes. Note that their API will change in the future, so
-// using wxXmlDocument and wxXmlNode in your app is not recommended.
-//
-// Default is the same as wxUSE_XRC, i.e. 1 by default.
-//
-// Recommended setting: 1 (required by XRC)
-#define wxUSE_XML       wxUSE_XRC
-
-// Use wxWidget's AUI docking system
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_AUI       1
-
-// Use wxWidget's Ribbon classes for interfaces
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_RIBBON    1
-
-// Use wxPropertyGrid.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_PROPGRID  1
-
-// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STC 1
-
-// Use wxWidget's web viewing classes
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_WEBVIEW 1
-
-// Use the IE wxWebView backend
-//
-// Default is 1 on MSW
-//
-// Recommended setting: 1
-#ifdef __WXMSW__
-#define wxUSE_WEBVIEW_IE 1
-#else
-#define wxUSE_WEBVIEW_IE 0
-#endif
-
-// Use the WebKit wxWebView backend
-//
-// Default is 1 on GTK and OSX
-//
-// Recommended setting: 1
-#if defined(__WXGTK__) || defined(__WXOSX__)
-#define wxUSE_WEBVIEW_WEBKIT 1
-#else
-#define wxUSE_WEBVIEW_WEBKIT 0
-#endif
-
-// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
-// 2D drawing API.  (Still somewhat experimental)
-//
-// Please note that on Windows gdiplus.dll is loaded dynamically which means
-// that nothing special needs to be done as long as you don't use
-// wxGraphicsContext at all or only use it on XP and later systems but you
-// still do need to distribute it yourself for an application using
-// wxGraphicsContext to be runnable on pre-XP systems.
-//
-// Default is 1 except if you're using a non-Microsoft compiler under Windows
-// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
-// mingw32) you may need to install the headers (and just the headers)
-// yourself. If you do, change the setting below manually.
-//
-// Recommended setting: 1 if supported by the compilation environment
-
-// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
-// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
-#ifdef _MSC_VER
-#   if _MSC_VER >= 1310
-        // MSVC7.1+ comes with new enough Platform SDK, enable
-        // wxGraphicsContext support for it
-#       define wxUSE_GRAPHICS_CONTEXT 1
-#   else
-        // MSVC 6 didn't include GDI+ headers so disable by default, enable it
-        // here if you use MSVC 6 with a newer SDK
-#       define wxUSE_GRAPHICS_CONTEXT 0
-#   endif
-#else
-    // Disable support for other Windows compilers, enable it if your compiler
-    // comes with new enough SDK or you installed the headers manually.
-    //
-    // Notice that this will be set by configure under non-Windows platforms
-    // anyhow so the value there is not important.
-#   define wxUSE_GRAPHICS_CONTEXT 0
-#endif
-
-// Enable wxGraphicsContext implementation using Cairo library.
-//
-// This is not needed under Windows and detected automatically by configure
-// under other systems, however you may set this to 1 manually if you installed
-// Cairo under Windows yourself and prefer to use it instead the native GDI+
-// implementation.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_CAIRO 0
-
-
-// ----------------------------------------------------------------------------
-// Individual GUI controls
-// ----------------------------------------------------------------------------
-
-// You must set wxUSE_CONTROLS to 1 if you are using any controls at all
-// (without it, wxControl class is not compiled)
-//
-// Default is 1
-//
-// Recommended setting: 1 (don't change except for very special programs)
-#define wxUSE_CONTROLS     1
-
-// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup().
-// Currently markup is supported only by a few controls and only some ports but
-// their number will increase with time.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you want to save on code size)
-#define wxUSE_MARKUP       1
-
-// wxPopupWindow class is a top level transient window. It is currently used
-// to implement wxTipWindow
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW)
-#define wxUSE_POPUPWIN     1
-
-// wxTipWindow allows to implement the custom tooltips, it is used by the
-// context help classes. Requires wxUSE_POPUPWIN.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0)
-#define wxUSE_TIPWINDOW    1
-
-// Each of the settings below corresponds to one wxWidgets control. They are
-// all switched on by default but may be disabled if you are sure that your
-// program (including any standard dialogs it can show!) doesn't need them and
-// if you desperately want to save some space. If you use any of these you must
-// set wxUSE_CONTROLS as well.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_ANIMATIONCTRL 1   // wxAnimationCtrl
-#define wxUSE_BANNERWINDOW  1   // wxBannerWindow
-#define wxUSE_BUTTON        1   // wxButton
-#define wxUSE_BMPBUTTON     1   // wxBitmapButton
-#define wxUSE_CALENDARCTRL  1   // wxCalendarCtrl
-#define wxUSE_CHECKBOX      1   // wxCheckBox
-#define wxUSE_CHECKLISTBOX  1   // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
-#define wxUSE_CHOICE        1   // wxChoice
-#define wxUSE_COLLPANE      1   // wxCollapsiblePane
-#define wxUSE_COLOURPICKERCTRL 1    // wxColourPickerCtrl
-#define wxUSE_COMBOBOX      1   // wxComboBox
-#define wxUSE_COMMANDLINKBUTTON 1   // wxCommandLinkButton
-#define wxUSE_DATAVIEWCTRL  1   // wxDataViewCtrl
-#define wxUSE_DATEPICKCTRL  1   // wxDatePickerCtrl
-#define wxUSE_DIRPICKERCTRL 1   // wxDirPickerCtrl
-#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox
-#define wxUSE_FILECTRL      1   // wxFileCtrl
-#define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
-#define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
-#define wxUSE_GAUGE         1   // wxGauge
-#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
-#define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
-#define wxUSE_LISTBOX       1   // wxListBox
-#define wxUSE_LISTCTRL      1   // wxListCtrl
-#define wxUSE_RADIOBOX      1   // wxRadioBox
-#define wxUSE_RADIOBTN      1   // wxRadioButton
-#define wxUSE_RICHMSGDLG    1   // wxRichMessageDialog
-#define wxUSE_SCROLLBAR     1   // wxScrollBar
-#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
-#define wxUSE_SLIDER        1   // wxSlider
-#define wxUSE_SPINBTN       1   // wxSpinButton
-#define wxUSE_SPINCTRL      1   // wxSpinCtrl
-#define wxUSE_STATBOX       1   // wxStaticBox
-#define wxUSE_STATLINE      1   // wxStaticLine
-#define wxUSE_STATTEXT      1   // wxStaticText
-#define wxUSE_STATBMP       1   // wxStaticBitmap
-#define wxUSE_TEXTCTRL      1   // wxTextCtrl
-#define wxUSE_TIMEPICKCTRL  1   // wxTimePickerCtrl
-#define wxUSE_TOGGLEBTN     1   // requires wxButton
-#define wxUSE_TREECTRL      1   // wxTreeCtrl
-#define wxUSE_TREELISTCTRL  1   // wxTreeListCtrl
-
-// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
-// below either wxStatusBar95 or a generic wxStatusBar will be used.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STATUSBAR    1
-
-// Two status bar implementations are available under Win32: the generic one
-// or the wrapper around native control. For native look and feel the native
-// version should be used.
-//
-// Default is 1 for the platforms where native status bar is supported.
-//
-// Recommended setting: 1 (there is no advantage in using the generic one)
-#define wxUSE_NATIVE_STATUSBAR        1
-
-// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
-// classes at all. Otherwise, use the native toolbar class unless
-// wxUSE_TOOLBAR_NATIVE is 0.
-//
-// Default is 1 for all settings.
-//
-// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.
-#define wxUSE_TOOLBAR 1
-#define wxUSE_TOOLBAR_NATIVE 1
-
-// wxNotebook is a control with several "tabs" located on one of its sides. It
-// may be used to logically organise the data presented to the user instead of
-// putting everything in one huge dialog. It replaces wxTabControl and related
-// classes of wxWin 1.6x.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTEBOOK 1
-
-// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_LISTBOOK 1
-
-// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CHOICEBOOK 1
-
-// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TREEBOOK 1
-
-// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of
-// tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLBOOK 1
-
-// wxTaskBarIcon is a small notification icon shown in the system toolbar or
-// dock.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be set to 0 if you don't need it)
-#define wxUSE_TASKBARICON 1
-
-// wxGrid class
-//
-// Default is 1, set to 0 to cut down compilation time and binaries size if you
-// don't use it.
-//
-// Recommended setting: 1
-//
-#define wxUSE_GRID         1
-
-// wxMiniFrame class: a frame with narrow title bar
-//
-// Default is 1.
-//
-// Recommended setting: 1 (it doesn't cost almost anything)
-#define wxUSE_MINIFRAME 1
-
-// wxComboCtrl and related classes: combobox with custom popup window and
-// not necessarily a listbox.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
-//                      it used by wxComboBox
-#define wxUSE_COMBOCTRL 1
-
-// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
-// items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0, except where it is
-//                      needed as a base class for generic wxBitmapComboBox.
-#define wxUSE_ODCOMBOBOX 1
-
-// wxBitmapComboBox is a combobox that can have images in front of text items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0
-#define wxUSE_BITMAPCOMBOBOX 1
-
-// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items
-// up and down in it. It is also used as part of wxRearrangeDialog.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 (currently used only by
-// wxHeaderCtrl)
-#define wxUSE_REARRANGECTRL 1
-
-// ----------------------------------------------------------------------------
-// Miscellaneous GUI stuff
-// ----------------------------------------------------------------------------
-
-// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
-#define wxUSE_ACCEL 1
-
-// Use the standard art provider. The icons returned by this provider are
-// embedded into the library as XPMs so disabling it reduces the library size
-// somewhat but this should only be done if you use your own custom art
-// provider returning the icons or never use any icons not provided by the
-// native art provider (which might not be implemented at all for some
-// platforms) or by the Tango icons provider (if it's not itself disabled
-// below).
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you use your own custom art provider.
-#define wxUSE_ARTPROVIDER_STD 1
-
-// Use art provider providing Tango icons: this art provider has higher quality
-// icons than the default ones using smaller size XPM icons without
-// transparency but the embedded PNG icons add to the library size.
-//
-// Default is 1 under non-GTK ports. Under wxGTK the native art provider using
-// the GTK+ stock icons replaces it so it is normally not necessary.
-//
-// Recommended setting: 1 but can be turned off to reduce the library size.
-#define wxUSE_ARTPROVIDER_TANGO 1
-
-// Hotkey support (currently Windows only)
-#define wxUSE_HOTKEY 1
-
-// Use wxCaret: a class implementing a "cursor" in a text control (called caret
-// under Windows).
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can be safely set to 0, not used by the library)
-#define wxUSE_CARET         1
-
-// Use wxDisplay class: it allows enumerating all displays on a system and
-// their geometries as well as finding the display on which the given point or
-// window lies.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
-#define wxUSE_DISPLAY       1
-
-// Miscellaneous geometry code: needed for Canvas library
-#define wxUSE_GEOMETRY            1
-
-// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
-// wxListCtrl.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (set it to 0 if you don't use any of the controls
-// enumerated above, then this class is mostly useless too)
-#define wxUSE_IMAGLIST      1
-
-// Use wxInfoBar class.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be disabled without problems as nothing
-// depends on it)
-#define wxUSE_INFOBAR       1
-
-// Use wxMenu, wxMenuBar, wxMenuItem.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can't be disabled under MSW)
-#define wxUSE_MENUS         1
-
-// Use wxNotificationMessage.
-//
-// wxNotificationMessage allows to show non-intrusive messages to the user
-// using balloons, banners, popups or whatever is the appropriate method for
-// the current platform.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTIFICATION_MESSAGE 1
-
-// wxPreferencesEditor provides a common API for different ways of presenting
-// the standard "Preferences" or "Properties" dialog under different platforms
-// (e.g. some use modal dialogs, some use modeless ones; some apply the changes
-// immediately while others require an explicit "Apply" button).
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_PREFERENCES_EDITOR 1
-
-// wxRichToolTip is a customizable tooltip class which has more functionality
-// than the stock (but native, unlike this class) wxToolTip.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely set to 0 if you don't need it)
-#define wxUSE_RICHTOOLTIP 1
-
-// Use wxSashWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SASH          1
-
-// Use wxSplitterWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SPLITTER      1
-
-// Use wxToolTip and wxWindow::Set/GetToolTip() methods.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLTIPS      1
-
-// wxValidator class and related methods
-#define wxUSE_VALIDATORS 1
-
-// Use reference counted ID management: this means that wxWidgets will track
-// the automatically allocated ids (those used when you use wxID_ANY when
-// creating a window, menu or toolbar item &c) instead of just supposing that
-// the program never runs out of them. This is mostly useful only under wxMSW
-// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where
-// long-running programs can run into problems with ids reuse without this. On
-// the other platforms, where the ids have the full int range, this shouldn't
-// be necessary.
-#ifdef __WXMSW__
-#define wxUSE_AUTOID_MANAGEMENT 1
-#else
-#define wxUSE_AUTOID_MANAGEMENT 0
-#endif
-
-// ----------------------------------------------------------------------------
-// common dialogs
-// ----------------------------------------------------------------------------
-
-// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g.
-// file selector, printer dialog). Switching this off also switches off the
-// printing architecture and interactive wxPrinterDC.
-//
-// Default is 1
-//
-// Recommended setting: 1 (unless it really doesn't work)
-#define wxUSE_COMMON_DIALOGS 1
-
-// wxBusyInfo displays window with message when app is busy. Works in same way
-// as wxBusyCursor
-#define wxUSE_BUSYINFO      1
-
-// Use single/multiple choice dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_CHOICEDLG     1
-
-// Use colour picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_COLOURDLG     1
-
-// wxDirDlg class for getting a directory name from user
-#define wxUSE_DIRDLG 1
-
-// TODO: setting to choose the generic or native one
-
-// Use file open/save dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in many places in the library itself)
-#define wxUSE_FILEDLG       1
-
-// Use find/replace dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely set to 0)
-#define wxUSE_FINDREPLDLG       1
-
-// Use font picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_FONTDLG       1
-
-// Use wxMessageDialog and wxMessageBox.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_MSGDLG        1
-
-// progress dialog class for lengthy operations
-#define wxUSE_PROGRESSDLG 1
-
-// support for startup tips (wxShowTip &c)
-#define wxUSE_STARTUP_TIPS 1
-
-// text entry dialog and wxGetTextFromUser function
-#define wxUSE_TEXTDLG 1
-
-// number entry dialog
-#define wxUSE_NUMBERDLG 1
-
-// splash screen class
-#define wxUSE_SPLASH 1
-
-// wizards
-#define wxUSE_WIZARDDLG 1
-
-// Compile in wxAboutBox() function showing the standard "About" dialog.
-//
-// Default is 1
-//
-// Recommended setting: 1 but can be set to 0 to save some space if you don't
-//                      use this function
-#define wxUSE_ABOUTDLG 1
-
-// wxFileHistory class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FILE_HISTORY 1
-
-// ----------------------------------------------------------------------------
-// Metafiles support
-// ----------------------------------------------------------------------------
-
-// Windows supports the graphics format known as metafile which is, though not
-// portable, is widely used under Windows and so is supported by wxWin (under
-// Windows only, of course). Win16 (Win3.1) used the so-called "Window
-// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in
-// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by
-// default, WMFs will be used under Win16 and EMFs under Win32. This may be
-// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting
-// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile
-// in any metafile related classes at all.
-//
-// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS.
-//
-// Recommended setting: default or 0 for everything for portable programs.
-#define wxUSE_METAFILE              1
-#define wxUSE_ENH_METAFILE          1
-#define wxUSE_WIN_METAFILES_ALWAYS  0
-
-// ----------------------------------------------------------------------------
-// Big GUI components
-// ----------------------------------------------------------------------------
-
-// Set to 0 to disable MDI support.
-//
-// Requires wxUSE_NOTEBOOK under platforms other than MSW.
-//
-// Default is 1.
-//
-// Recommended setting: 1, can be safely set to 0.
-#define wxUSE_MDI 1
-
-// Set to 0 to disable document/view architecture
-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
-
-// Set to 0 to disable MDI document/view architecture
-//
-// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
-#define wxUSE_MDI_ARCHITECTURE    1
-
-// Set to 0 to disable print/preview architecture code
-#define wxUSE_PRINTING_ARCHITECTURE  1
-
-// wxHTML sublibrary allows to display HTML in wxWindow programs and much,
-// much more.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
-// smaller library.
-#define wxUSE_HTML          1
-
-// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
-// headers and libraries to be able to compile the library with wxUSE_GLCANVAS
-// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the
-// list of libraries used to link your application (although this is done
-// implicitly for Microsoft Visual C++ users).
-//
-// Default is 1 unless the compiler is known to ship without the necessary
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
-//
-// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
-// otherwise.
-#define wxUSE_GLCANVAS       1
-
-// wxRichTextCtrl allows editing of styled text.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 if you want compile a
-// smaller library.
-#define wxUSE_RICHTEXT       1
-
-// ----------------------------------------------------------------------------
-// Data transfer
-// ----------------------------------------------------------------------------
-
-// Use wxClipboard class for clipboard copy/paste.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CLIPBOARD     1
-
-// Use wxDataObject and related classes. Needed for clipboard and OLE drag and
-// drop
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DATAOBJ       1
-
-// Use wxDropTarget and wxDropSource classes for drag and drop (this is
-// different from "built in" drag and drop in wxTreeCtrl which is always
-// available). Requires wxUSE_DATAOBJ.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DRAG_AND_DROP 1
-
-// Use wxAccessible for enhanced and customisable accessibility.
-// Depends on wxUSE_OLE.
-//
-// Default is 0.
-//
-// Recommended setting (at present): 0
-#define wxUSE_ACCESSIBILITY 0
-
-// ----------------------------------------------------------------------------
-// miscellaneous settings
-// ----------------------------------------------------------------------------
-
-// wxSingleInstanceChecker class allows to verify at startup if another program
-// instance is running.
-//
-// Default is 1
-//
-// Recommended setting: 1 (the class is tiny, disabling it won't save much
-// space)
-#define wxUSE_SNGLINST_CHECKER  1
-
-#define wxUSE_DRAGIMAGE 1
-
-#define wxUSE_IPC         1
-                                // 0 for no interprocess comms
-#define wxUSE_HELP        1
-                                // 0 for no help facility
-
-// Should we use MS HTML help for wxHelpController? If disabled, neither
-// wxCHMHelpController nor wxBestHelpController are available.
-//
-// Default is 1 under MSW, 0 is always used for the other platforms.
-//
-// Recommended setting: 1, only set to 0 if you have trouble compiling
-// wxCHMHelpController (could be a problem with really ancient compilers)
-#define wxUSE_MS_HTML_HELP 1
-
-
-// Use wxHTML-based help controller?
-#define wxUSE_WXHTML_HELP 1
-
-#define wxUSE_CONSTRAINTS 1
-                                // 0 for no window layout constraint system
-
-#define wxUSE_SPLINES     1
-                                // 0 for no splines
-
-#define wxUSE_MOUSEWHEEL        1
-                                // Include mouse wheel support
-
-// Compile wxUIActionSimulator class?
-#define wxUSE_UIACTIONSIMULATOR 1
-
-// ----------------------------------------------------------------------------
-// wxDC classes for various output formats
-// ----------------------------------------------------------------------------
-
-// Set to 1 for PostScript device context.
-#define wxUSE_POSTSCRIPT  0
-
-// Set to 1 to use font metric files in GetTextExtent
-#define wxUSE_AFM_FOR_POSTSCRIPT 1
-
-// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
-// to create files in SVG (Scalable Vector Graphics) format.
-#define wxUSE_SVG 1
-
-// Should wxDC provide SetTransformMatrix() and related methods?
-//
-// Default is 1 but can be set to 0 if this functionality is not used. Notice
-// that currently only wxMSW supports this so setting this to 0 doesn't change
-// much for non-MSW platforms (although it will still save a few bytes
-// probably).
-//
-// Recommended setting: 1.
-#define wxUSE_DC_TRANSFORM_MATRIX 1
-
-// ----------------------------------------------------------------------------
-// image format support
-// ----------------------------------------------------------------------------
-
-// wxImage supports many different image formats which can be configured at
-// compile-time. BMP is always supported, others are optional and can be safely
-// disabled if you don't plan to use images in such format sometimes saving
-// substantial amount of code in the final library.
-//
-// Some formats require an extra library which is included in wxWin sources
-// which is mentioned if it is the case.
-
-// Set to 1 for wxImage support (recommended).
-#define wxUSE_IMAGE         1
-
-// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
-#define wxUSE_LIBPNG        1
-
-// Set to 1 for JPEG format support (requires libjpeg)
-#define wxUSE_LIBJPEG       1
-
-// Set to 1 for TIFF format support (requires libtiff)
-#define wxUSE_LIBTIFF       1
-
-// Set to 1 for TGA format support (loading only)
-#define wxUSE_TGA           1
-
-// Set to 1 for GIF format support
-#define wxUSE_GIF           1
-
-// Set to 1 for PNM format support
-#define wxUSE_PNM           1
-
-// Set to 1 for PCX format support
-#define wxUSE_PCX           1
-
-// Set to 1 for IFF format support (Amiga format)
-#define wxUSE_IFF           0
-
-// Set to 1 for XPM format support
-#define wxUSE_XPM           1
-
-// Set to 1 for MS Icons and Cursors format support
-#define wxUSE_ICO_CUR       1
-
-// Set to 1 to compile in wxPalette class
-#define wxUSE_PALETTE       1
-
-// ----------------------------------------------------------------------------
-// wxUniversal-only options
-// ----------------------------------------------------------------------------
-
-// Set to 1 to enable compilation of all themes, this is the default
-#define wxUSE_ALL_THEMES    1
-
-// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES
-// is unset, if it is set these options are not used; notice that metal theme
-// uses Win32 one
-#define wxUSE_THEME_GTK     0
-#define wxUSE_THEME_METAL   0
-#define wxUSE_THEME_MONO    0
-#define wxUSE_THEME_WIN32   0
-
-
-/* --- end common options --- */
-
-/*
- * Unix-specific options
- */
-#define wxUSE_SELECT_DISPATCHER 1
-#define wxUSE_EPOLL_DISPATCHER 0
-
-#define wxUSE_UNICODE_UTF8 0
-#define wxUSE_UTF8_LOCALE_ONLY 0
-
-#endif // _WX_SETUP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/size.ptr b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/size.ptr
deleted file mode 100644
index c361ba01ff..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/size.ptr and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/slider.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/slider.h
deleted file mode 100644
index dd53538ae3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/slider.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/slider.h
-// Purpose:     wxSlider class
-// Author:      David Webster
-// Modified by:
-// Created:     10/15/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SLIDER_H_
-#define _WX_SLIDER_H_
-
-#include "wx/control.h"
-
-// Slider
-class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase
-{
-public:
-  wxSlider();
-  inline wxSlider( wxWindow*          pParent
-                  ,wxWindowID         vId
-                  ,int                nValue
-                  ,int                nMinValue
-                  ,int                nMaxValue
-                  ,const wxPoint&     rPos = wxDefaultPosition
-                  ,const wxSize&      rSize = wxDefaultSize
-                  ,long               lStyle = wxSL_HORIZONTAL
-                  ,const wxValidator& rValidator = wxDefaultValidator
-                  ,const wxString&    rsName = wxSliderNameStr
-                 )
-    {
-        Create( pParent
-               ,vId
-               ,nValue
-               ,nMinValue
-               ,nMaxValue
-               ,rPos
-               ,rSize
-               ,lStyle
-               ,rValidator
-               ,rsName
-              );
-    }
-    virtual ~wxSlider();
-
-    bool Create( wxWindow*          pParent
-                ,wxWindowID         vId
-                ,int                nValue
-                ,int                nMinValue
-                ,int                nMaxValue
-                ,const wxPoint&     rPos = wxDefaultPosition
-                ,const wxSize&      rSize = wxDefaultSize
-                ,long               lStyle = wxSL_HORIZONTAL
-                ,const wxValidator& rValidator = wxDefaultValidator
-                ,const wxString&    rsName = wxSliderNameStr
-               );
-
-         virtual int  GetValue(void) const ;
-         virtual void SetValue(int);
-
-                 void GetSize( int* pnX
-                              ,int* pnY
-                             ) const;
-                 void GetPosition( int* pnX
-                                  ,int* pnY
-                                 ) const ;
-                 bool Show(bool bShow = TRUE);
-                 void SetRange( int nMinValue
-                               ,int nMaxValue
-                              );
-
-    inline       int  GetMin(void) const { return m_nRangeMin; }
-    inline       int  GetMax(void) const { return m_nRangeMax; }
-
-    //
-    // For trackbars only
-    //
-                 void ClearSel(void);
-                 void ClearTicks(void);
-
-                 int  GetLineSize(void) const;
-                 int  GetPageSize(void) const ;
-                 int  GetSelEnd(void) const;
-                 int  GetSelStart(void) const;
-    inline       int  GetTickFreq(void) const { return m_nTickFreq; }
-                 int  GetThumbLength(void) const ;
-
-                 void SetLineSize(int nLineSize);
-                 void SetPageSize(int nPageSize);
-                 void SetSelection( int nMinPos
-                                   ,int nMaxPos
-                                  );
-                 void SetThumbLength(int nLen) ;
-                 void SetTick(int ntickPos) ;
-
-    //
-    // IMPLEMENTATION
-    //
-    inline         WXHWND   GetStaticMin(void) const { return m_hStaticMin; }
-    inline         WXHWND   GetStaticMax(void) const { return m_hStaticMax; }
-    inline         WXHWND   GetEditValue(void) const { return m_hStaticValue; }
-           virtual bool     ContainsHWND(WXHWND hWnd) const;
-                   void     AdjustSubControls( int  nX
-                                              ,int  nY
-                                              ,int  nWidth
-                                              ,int  nHeight
-                                              ,int  nSizeFlags
-                                             );
-    inline         int      GetSizeFlags(void) { return m_nSizeFlags; }
-                   void     Command(wxCommandEvent& rEvent);
-           virtual WXHBRUSH OnCtlColor( WXHDC    hDC
-                                       ,WXHWND   hWnd
-                                       ,WXUINT   uCtlColor
-                                       ,WXUINT   uMessage
-                                       ,WXWPARAM wParam
-                                       ,WXLPARAM lParam
-                                      );
-           virtual bool     OS2OnScroll( int    nOrientation
-                                        ,WXWORD wParam
-                                        ,WXWORD wPos
-                                        ,WXHWND hControl
-                                       );
-
-protected:
-    WXHWND                          m_hStaticMin;
-    WXHWND                          m_hStaticMax;
-    WXHWND                          m_hStaticValue;
-    int                             m_nRangeMin;
-    int                             m_nRangeMax;
-    int                             m_nPageSize;
-    int                             m_nLineSize;
-    int                             m_nTickFreq;
-    double                          m_dPixelToRange;
-    int                             m_nThumbLength;
-    int                             m_nSizeFlags;
-
-    virtual void DoGetSize( int* pnWidth
-                           ,int* pnHeight
-                          ) const;
-    virtual void DoSetSize( int  nX
-                           ,int  nY
-                           ,int  nWidth
-                           ,int  nHeight
-                           ,int  nSizeFlags = wxSIZE_AUTO
-                          );
-
-    // Platform-specific implementation of SetTickFreq
-    virtual void DoSetTickFreq(int freq);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxSlider)
-}; // end of CLASS wxSlider
-
-#endif
-    // _WX_SLIDER_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/sound.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/sound.h
deleted file mode 100644
index e8fdad5428..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/sound.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/sound.h
-// Purpose:     wxSound class (loads and plays short Windows .wav files).
-//              Optional on non-Windows platforms.
-// Author:      David Webster
-// Modified by:
-// Created:     10/17/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SOUND_H_
-#define _WX_SOUND_H_
-
-#include "wx/object.h"
-
-class wxSound : public wxSoundBase
-{
-public:
-  wxSound();
-  wxSound(const wxString& fileName, bool isResource = FALSE);
-  wxSound(size_t size, const void* data);
-  virtual ~wxSound();
-
-public:
-  // Create from resource or file
-  bool  Create(const wxString& fileName, bool isResource = FALSE);
-  // Create from data
-  bool Create(size_t size, const void* data);
-
-  bool  IsOk() const { return (m_waveData ? TRUE : FALSE); }
-
-protected:
-  bool  Free();
-
-  bool  DoPlay(unsigned flags) const;
-
-private:
-  wxByte* m_waveData;
-  int   m_waveLength;
-  bool  m_isResource;
-};
-
-#endif
-    // _WX_SOUND_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/spinbutt.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/spinbutt.h
deleted file mode 100644
index c37381f327..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/spinbutt.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/spinbutt.h
-// Purpose:     wxSpinButton class
-// Author:      David Webster
-// Modified by:
-// Created:     10/15/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SPINBUTT_H_
-#define _WX_SPINBUTT_H_
-
-#include "wx/control.h"
-#include "wx/event.h"
-
-extern MRESULT EXPENTRY wxSpinCtrlWndProc(
-  HWND                              hWnd
-, UINT                              uMessage
-, MPARAM                            wParam
-, MPARAM                            lParam
-);
-
-class WXDLLIMPEXP_CORE wxSpinButton: public wxSpinButtonBase
-{
-public:
-    // Construction
-    wxSpinButton() { }
-    inline wxSpinButton( wxWindow*       pParent
-                        ,wxWindowID      vId = -1
-                        ,const wxPoint&  rPos = wxDefaultPosition
-                        ,const wxSize&   rSize = wxDefaultSize
-                        ,long            lStyle = wxSP_VERTICAL
-                        ,const wxString& rsName = wxT("wxSpinButton")
-                       )
-    {
-        Create(pParent, vId, rPos, rSize, lStyle, rsName);
-    }
-    virtual ~wxSpinButton();
-
-
-    bool Create( wxWindow*       pParent
-                ,wxWindowID      vId = -1
-                ,const wxPoint&  rPos = wxDefaultPosition
-                ,const wxSize&   rSize = wxDefaultSize
-                ,long            lStyle = wxSP_VERTICAL
-                ,const wxString& rsName = wxT("wxSpinButton")
-               );
-
-    // Accessors
-    inline virtual int  GetMax(void) const { return m_max; }
-    inline virtual int  GetMin(void) const { return m_min; }
-           virtual int  GetValue(void) const;
-    inline         bool IsVertical(void) const {return ((m_windowStyle & wxSP_VERTICAL) != 0); }
-           virtual void SetValue(int nVal);
-           virtual void SetRange( int nMinVal
-                                 ,int nMaxVal
-                                );
-
-    //
-    // Implementation
-    //
-    virtual bool OS2Command( WXUINT wParam
-                            ,WXWORD wId
-                           );
-    virtual bool OS2OnScroll( int    nOrientation
-                             ,WXWORD wParam
-                             ,WXWORD wPos
-                             ,WXHWND hControl
-                            );
-
-    inline virtual bool AcceptsFocus(void) const { return FALSE; }
-protected:
-    virtual wxSize DoGetBestSize() const;
-private:
-    DECLARE_DYNAMIC_CLASS(wxSpinButton)
-}; // end of CLASS wxSpinButton
-
-#endif // _WX_SPINBUTT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/spinctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/spinctrl.h
deleted file mode 100644
index ac81c63996..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/spinctrl.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/spinctrl.h
-// Purpose:     wxSpinCtrl class declaration for Win32
-// Author:      David Webster
-// Modified by:
-// Created:     10/15/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_SPINCTRL_H_
-#define _WX_MSW_SPINCTRL_H_
-
-#include "wx/spinbutt.h"    // the base class
-#include "wx/dynarray.h"
-class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
-WX_DEFINE_EXPORTED_ARRAY_PTR(wxSpinCtrl *, wxArraySpins);
-
-// ----------------------------------------------------------------------------
-// Under Win32 and OS2 PM, wxSpinCtrl is a wxSpinButton with a buddy
-// text window whose contents is automatically updated when the spin
-// control is clicked.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxSpinCtrl : public wxSpinButton
-{
-public:
-    wxSpinCtrl() { }
-    wxSpinCtrl( wxWindow*       pParent
-               ,wxWindowID      vId = wxID_ANY
-               ,const wxString& rsValue = wxEmptyString
-               ,const wxPoint&  rPos = wxDefaultPosition
-               ,const wxSize&   rSize = wxDefaultSize
-               ,long            lStyle = wxSP_ARROW_KEYS
-               ,int             nMin = 0
-               ,int             nMax = 100
-               ,int             nInitial = 0
-               ,const wxString& rsName = wxT("wxSpinCtrl")
-              )
-    {
-        Create(pParent, vId, rsValue, rPos, rSize, lStyle, nMin, nMax, nInitial, rsName);
-    }
-    virtual ~wxSpinCtrl();
-
-    bool Create(wxWindow*       pParent
-               ,wxWindowID      vId = wxID_ANY
-               ,const wxString& rsValue = wxEmptyString
-               ,const wxPoint&  rPos = wxDefaultPosition
-               ,const wxSize&   rSize = wxDefaultSize
-               ,long            lStyle = wxSP_ARROW_KEYS
-               ,int             nMin = 0
-               ,int             nMax = 100
-               ,int             nInitial = 0
-               ,const wxString& rsName = wxT("wxSpinCtrl")
-              );
-
-    //
-    // A wxTextCtrl-like method (but we can't have GetValue returning wxString
-    // because the base class already has one returning int!)
-    //
-    void SetValue(const wxString& rsText);
-
-    //
-    // implementation only from now on
-    // -------------------------------
-    //
-    virtual bool Enable(bool bEnable = true);
-
-    virtual int  GetValue(void) const;
-
-    virtual bool SetFont(const wxFont &rFont);
-    virtual void SetFocus(void);
-
-    inline virtual void SetValue(int nVal) { wxSpinButton::SetValue(nVal); }
-
-    void SetSelection(long lFrom, long lTo);
-
-    virtual bool Show(bool bShow = true);
-
-    //
-    // wxSpinButton doesn't accept focus, but we do
-    //
-    inline virtual bool AcceptsFocus(void) const { return false; }
-
-    //
-    // Return the spinctrl object whose buddy is the given window or NULL
-    // Doesn't really do much under OS/2
-    //
-    static wxSpinCtrl*  GetSpinForTextCtrl(WXHWND hWndBuddy);
-
-    //
-    // Process a WM_COMMAND generated by the buddy text control
-    //
-    bool ProcessTextCommand( WXWORD wCmd
-                            ,WXWORD wId
-                           );
-
-protected:
-    virtual void          DoGetPosition( int* nlX
-                                        ,int* nlY
-                                       ) const;
-    void                  DoMoveWindow( int nX
-                                       ,int nY
-                                       ,int nWidth
-                                       ,int nHeight
-                                      );
-    virtual wxSize        DoGetBestSize(void) const;
-    virtual void          DoGetSize( int* pnWidth
-                                    ,int* pnHeight
-                                   ) const;
-
-    //
-    // The handler for wxSpinButton events
-    //
-    void OnSpinChange(wxSpinEvent& rEvent);
-    void OnChar(wxKeyEvent& rEvent);
-    void OnSetFocus(wxFocusEvent& rEvent);
-
-    WXHWND                          m_hWndBuddy;
-    static wxArraySpins             m_svAllSpins;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxSpinCtrl)
-    DECLARE_EVENT_TABLE()
-}; // end of CLASS wxSpinCtrl
-
-#endif // _WX_MSW_SPINCTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/statbmp.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/statbmp.h
deleted file mode 100644
index ff59f015e1..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/statbmp.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/statbmp.h
-// Purpose:     wxStaticBitmap class
-// Author:      David Webster
-// Modified by:
-// Created:     11/27/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_STATBMP_H_
-#define _WX_STATBMP_H_
-
-#include "wx/control.h"
-#include "wx/icon.h"
-
-class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
-{
- public:
-    inline wxStaticBitmap() { Init(); }
-
-    inline wxStaticBitmap( wxWindow*         pParent
-                          ,wxWindowID        nId
-                          ,const wxGDIImage& rLabel
-                          ,const wxPoint&    rPos = wxDefaultPosition
-                          ,const wxSize&     rSize = wxDefaultSize
-                          ,long              lStyle = 0
-                          ,const wxString&   rName = wxStaticBitmapNameStr
-                         )
-    {
-        Create(pParent, nId, rLabel, rPos, rSize, lStyle, rName);
-    }
-
-    bool Create( wxWindow*         pParent
-                ,wxWindowID        nId
-                ,const wxGDIImage& rLabel
-                ,const wxPoint&    rPos = wxDefaultPosition
-                ,const wxSize&     rSize = wxDefaultSize
-                ,long              lStyle = 0
-                ,const wxString&   rName = wxStaticBitmapNameStr
-               );
-    inline virtual ~wxStaticBitmap() { Free(); }
-
-    virtual void SetIcon(const wxIcon& rIcon) { SetImage(rIcon); }
-    virtual void SetBitmap(const wxBitmap& rBitmap) { SetImage(rBitmap); }
-
-    // assert failure is provoked by an attempt to get an icon from bitmap or
-    // vice versa
-    wxIcon GetIcon() const
-      { wxASSERT( m_bIsIcon ); return *(wxIcon *)m_pImage; }
-    wxBitmap GetBitmap() const
-      { wxASSERT( !m_bIsIcon ); return *(wxBitmap *)m_pImage; }
-
-    // overridden base class virtuals
-    virtual bool AcceptsFocus() const { return FALSE; }
-    virtual MRESULT OS2WindowProc( WXUINT   uMsg
-                                  ,WXWPARAM wParam
-                                  ,WXLPARAM lParam
-                                 );
-    void OnPaint(wxPaintEvent& rEvent);
-
-protected:
-    virtual wxSize DoGetBestSize() const;
-
-    void Init() { m_bIsIcon = TRUE; m_pImage = NULL; }
-    void Free();
-
-    // TRUE if icon/bitmap is valid
-    bool ImageIsOk() const;
-
-    void SetImage(const wxGDIImage& rImage);
-
-    // we can have either an icon or a bitmap
-    bool                            m_bIsIcon;
-    wxGDIImage*                     m_pImage;
-private:
-    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-    DECLARE_EVENT_TABLE()
-}; // end of wxStaticBitmap
-
-#endif
-    // _WX_STATBMP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/statbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/statbox.h
deleted file mode 100644
index 764fd74b07..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/statbox.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/statbox.h
-// Purpose:     wxStaticBox class
-// Author:      David Webster
-// Modified by:
-// Created:     10/15/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_STATBOX_H_
-#define _WX_STATBOX_H_
-
-#include "wx/control.h"
-
-// Group box
-class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase
-{
-public:
-    inline wxStaticBox() {}
-    inline wxStaticBox( wxWindow*       pParent
-                       ,wxWindowID      vId
-                       ,const wxString& rsLabel
-                       ,const wxPoint&  rPos = wxDefaultPosition
-                       ,const wxSize&   rSize = wxDefaultSize
-                       ,long            lStyle = 0
-                       ,const wxString& rsName = wxStaticBoxNameStr
-                      )
-    {
-        Create(pParent, vId, rsLabel, rPos, rSize, lStyle, rsName);
-    }
-
-    bool Create( wxWindow*       pParent
-                ,wxWindowID      vId
-                ,const wxString& rsLabel
-                ,const wxPoint&  rPos = wxDefaultPosition
-                ,const wxSize&   rSize = wxDefaultSize
-                ,long            lStyle = 0
-                ,const wxString& rsName = wxStaticBoxNameStr
-               );
-
-    //
-    // implementation from now on
-    // --------------------------
-    //
-    virtual MRESULT OS2WindowProc( WXUINT   uMsg
-                                  ,WXWPARAM wParam
-                                  ,WXLPARAM lParam
-                                 );
-
-    //
-    // overridden base class virtuals
-    //
-    inline virtual bool AcceptsFocus(void) const { return FALSE; }
-
-protected:
-    virtual wxSize DoGetBestSize(void) const;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxStaticBox)
-}; // end of CLASS wxStaticBox
-
-#endif
-    // _WX_STATBOX_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/statline.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/statline.h
deleted file mode 100644
index 8d31bdcaa0..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/statline.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/statline.h
-// Purpose:     MSW version of wxStaticLine class
-// Author:      Vadim Zeitlin
-// Created:     28.06.99
-// Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OS2_STATLINE_H_
-#define _WX_OS2_STATLINE_H_
-
-// ----------------------------------------------------------------------------
-// wxStaticLine
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
-{
-
-public:
-    // constructors and pseudo-constructors
-    wxStaticLine() { }
-    wxStaticLine( wxWindow*       pParent
-                 ,wxWindowID      vId = wxID_ANY
-                 ,const wxPoint&  rPos = wxDefaultPosition
-                 ,const wxSize&   rSize = wxDefaultSize
-                 ,long            lStyle = wxLI_HORIZONTAL
-                 ,const wxString& rsName = wxStaticLineNameStr
-                )
-    {
-        Create(pParent, vId, rPos, rSize, lStyle, rsName);
-    }
-
-    bool Create(  wxWindow*       pParent
-                 ,wxWindowID      vId = wxID_ANY
-                 ,const wxPoint&  rPos = wxDefaultPosition
-                 ,const wxSize&   rSize = wxDefaultSize
-                 ,long            lStyle = wxLI_HORIZONTAL
-                 ,const wxString& rsName = wxStaticLineNameStr
-                );
-
-    inline bool          IsVertical(void) const { return((GetWindowStyleFlag() & wxLI_VERTICAL) != 0); }
-    inline static int    GetDefaultSize(void) { return 2; }
-
-    //
-    // Overridden base class virtuals
-    //
-    inline virtual bool AcceptsFocus(void) const {return FALSE;}
-
-protected:
-    inline wxSize AdjustSize(const wxSize& rSize) const
-    {
-        wxSize                      vSizeReal( rSize.x
-                                              ,rSize.y
-                                             );
-
-        if (IsVertical())
-        {
-            if (rSize.x == -1 )
-                vSizeReal.x = GetDefaultSize();
-        }
-        else
-        {
-            if (rSize.y == -1)
-                vSizeReal.y = GetDefaultSize();
-        }
-        return vSizeReal;
-    }
-
-    inline wxSize DoGetBestSize(void) const { return (AdjustSize(wxDefaultSize)); }
-
-    //
-    // Usually overridden base class virtuals
-    //
-    virtual WXDWORD OS2GetStyle( long     lStyle
-                                ,WXDWORD* pdwExstyle
-                               ) const;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxStaticLine)
-}; // end of CLASS wxStaticLine
-
-#endif // _WX_OS2_STATLINE_H_
-
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/stattext.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/stattext.h
deleted file mode 100644
index 3db6fd34b3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/stattext.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/stattext.h
-// Purpose:     wxStaticText class
-// Author:      David Webster
-// Modified by:
-// Created:     10/17/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_STATTEXT_H_
-#define _WX_STATTEXT_H_
-
-#include "wx/control.h"
-
-class WXDLLIMPEXP_CORE wxStaticText : public wxStaticTextBase
-{
-public:
-    inline wxStaticText() { }
-    inline wxStaticText( wxWindow*       pParent
-                        ,wxWindowID      vId
-                        ,const wxString& rsLabel
-                        ,const wxPoint&  rPos = wxDefaultPosition
-                        ,const wxSize&   rSize = wxDefaultSize
-                        ,long            lStyle = 0L
-                        ,const wxString& rsName = wxStaticTextNameStr
-                       )
-    {
-        Create(pParent, vId, rsLabel, rPos, rSize, lStyle, rsName);
-    }
-
-    bool Create( wxWindow*       pParent
-                ,wxWindowID      vId
-                ,const wxString& rsLabel
-                ,const wxPoint&  rPos = wxDefaultPosition
-                ,const wxSize&   rSize = wxDefaultSize
-                ,long            lStyle = 0L
-                ,const wxString& rsName = wxStaticTextNameStr
-               );
-
-    //
-    // Accessors
-    //
-    virtual void SetLabel(const wxString& rsLabel);
-    virtual bool SetFont(const wxFont &rFont);
-
-    //
-    // Overridden base class virtuals
-    //
-    virtual bool AcceptsFocus() const { return FALSE; }
-
-    //
-    // Callbacks
-    //
-    virtual MRESULT OS2WindowProc( WXUINT   uMsg
-                                  ,WXWPARAM wParam
-                                  ,WXLPARAM lParam
-                                 );
-
-protected:
-    virtual void   DoSetSize( int nX
-                             ,int nY
-                             ,int nWidth
-                             ,int nHeight
-                             ,int nSizeFlags = wxSIZE_AUTO
-                            );
-    virtual wxSize DoGetBestSize(void) const;
-
-    virtual void DoSetLabel(const wxString& str);
-    virtual wxString DoGetLabel() const;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxStaticText)
-}; // end of CLASS wxStaticText
-
-#endif
-    // _WX_STATTEXT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/stdpaths.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/stdpaths.h
deleted file mode 100644
index 62d58429b8..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/stdpaths.h
+++ /dev/null
@@ -1,51 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/stdpaths.h
-// Purpose:     wxStandardPaths for OS/2
-// Author:      Stefan Neis
-// Modified by:
-// Created:     2004-11-06
-// Copyright:   (c) 2004 Stefan Neis <Stefan.Neis@t-online.de>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OS2_STDPATHS_H_
-#define _WX_OS2_STDPATHS_H_
-
-// ----------------------------------------------------------------------------
-// wxStandardPaths
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
-{
-public:
-    // set the program installation directory which is /usr/local by default
-    //
-    // The program directory can be determined automatically from argv[0],
-    // this function is automatically called from application initialisation.
-    // If you override the initialisation routine, you should call it
-    // explicitly yourself.
-    static void SetInstallPrefix(const wxString& prefix);
-
-    // get the program installation prefix
-    //
-    // if the prefix had been previously by SetInstallPrefix, returns that
-    // value, otherwise returns /usr/local if it failed
-    wxString GetInstallPrefix() const;
-
-    // implement base class pure virtuals
-    virtual wxString GetConfigDir() const;
-    virtual wxString GetUserConfigDir() const;
-    virtual wxString GetDataDir() const;
-    virtual wxString GetUserDataDir() const;
-    virtual wxString GetPluginsDir() const;
-
-protected:
-    // Ctor is protected, use wxStandardPaths::Get() instead of instantiating
-    // objects of this class directly.
-    wxStandardPaths() { }
-
-private:
-    static wxString m_prefix;
-};
-
-#endif // _WX_OS2_STDPATHS_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/textctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/textctrl.h
deleted file mode 100644
index cc1d8d1e05..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/textctrl.h
+++ /dev/null
@@ -1,197 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/textctrl.h
-// Purpose:     wxTextCtrl class
-// Author:      David Webster
-// Modified by:
-// Created:     10/17/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TEXTCTRL_H_
-#define _WX_TEXTCTRL_H_
-
-typedef int (wxCALLBACK *wxTreeCtrlCompare)(long lItem1, long lItem2, long lSortData);
-
-class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase
-{
-public:
-    wxTextCtrl();
-    wxTextCtrl( wxWindow*          pParent
-               ,wxWindowID         vId
-               ,const wxString&    rsValue = wxEmptyString
-               ,const wxPoint&     rPos = wxDefaultPosition
-               ,const wxSize&      rSize = wxDefaultSize
-               ,long               lStyle = 0
-               ,const wxValidator& rValidator = wxDefaultValidator
-               ,const wxString&    rsName = wxTextCtrlNameStr
-              )
-    {
-        Create(pParent, vId, rsValue, rPos, rSize, lStyle, rValidator, rsName);
-    }
-    virtual ~wxTextCtrl();
-
-    bool Create( wxWindow*          pParent
-                ,wxWindowID         vId
-                ,const wxString&    rsValue = wxEmptyString
-                ,const wxPoint&     rPos = wxDefaultPosition
-                ,const wxSize&      rSize = wxDefaultSize
-                ,long               lStyle = 0
-                ,const wxValidator& rValidator = wxDefaultValidator
-                ,const wxString&    rsName = wxTextCtrlNameStr
-               );
-
-    //
-    // Implement base class pure virtuals
-    // ----------------------------------
-    //
-    virtual      wxString GetValue(void) const;
-
-    virtual int      GetLineLength(long nLineNo) const;
-    virtual wxString GetLineText(long nLineNo) const;
-    virtual int      GetNumberOfLines(void) const;
-
-    virtual bool IsModified(void) const;
-    virtual bool IsEditable(void) const;
-
-    virtual void GetSelection( long* pFrom
-                              ,long* pTo
-                             ) const;
-    //
-    // Operations
-    // ----------
-    //
-    virtual void Clear(void);
-    virtual void Replace( long            lFrom
-                         ,long            lTo
-                         ,const wxString& rsValue
-                        );
-    virtual void Remove( long lFrom
-                        ,long lTo
-                       );
-
-    virtual bool DoLoadFile(const wxString& rsFile, int fileType);
-
-    virtual void MarkDirty();
-    virtual void DiscardEdits(void);
-
-    virtual void WriteText(const wxString& rsText);
-    virtual void AppendText(const wxString& rsText);
-    virtual bool EmulateKeyPress(const wxKeyEvent& rEvent);
-
-    virtual bool SetStyle( long              lStart
-                          ,long              lEnd
-                          ,const wxTextAttr& rStyle
-                         );
-    virtual long XYToPosition( long lX
-                              ,long lY
-                             ) const;
-    virtual bool PositionToXY( long  lPos
-                              ,long* plX
-                              ,long* plY
-                             ) const;
-
-    virtual void ShowPosition(long lPos);
-
-    virtual void Copy(void);
-    virtual void Cut(void);
-    virtual void Paste(void);
-
-    virtual bool CanCopy(void) const;
-    virtual bool CanCut(void) const;
-    virtual bool CanPaste(void) const;
-
-    virtual void Undo(void);
-    virtual void Redo(void);
-
-    virtual bool CanUndo(void) const;
-    virtual bool CanRedo(void) const;
-
-    virtual void SetInsertionPoint(long lPos);
-    virtual void SetInsertionPointEnd(void);
-    virtual long GetInsertionPoint(void) const;
-    virtual wxTextPos GetLastPosition(void) const;
-
-    virtual void SetSelection( long lFrom
-                              ,long lTo
-                             );
-    virtual void SetEditable(bool bEditable);
-    virtual void SetWindowStyleFlag(long lStyle);
-
-    //
-    // Implementation from now on
-    // --------------------------
-    //
-    virtual void Command(wxCommandEvent& rEvent);
-    virtual bool OS2Command( WXUINT uParam
-                            ,WXWORD wId
-                           );
-
-    virtual WXHBRUSH OnCtlColor( WXHDC    hDC
-                                ,WXHWND   pWnd
-                                ,WXUINT   nCtlColor
-                                ,WXUINT   message
-                                ,WXWPARAM wParam
-                                ,WXLPARAM lParam
-                               );
-
-    virtual bool SetBackgroundColour(const wxColour& colour);
-    virtual bool SetForegroundColour(const wxColour& colour);
-
-    virtual void AdoptAttributesFromHWND(void);
-    virtual void SetupColours(void);
-
-    virtual bool AcceptsFocus(void) const;
-
-    // callbacks
-    void OnDropFiles(wxDropFilesEvent& rEvent);
-    void OnChar(wxKeyEvent& rEvent); // Process 'enter' if required
-
-    void OnCut(wxCommandEvent& rEvent);
-    void OnCopy(wxCommandEvent& rEvent);
-    void OnPaste(wxCommandEvent& rEvent);
-    void OnUndo(wxCommandEvent& rEvent);
-    void OnRedo(wxCommandEvent& rEvent);
-    void OnDelete(wxCommandEvent& rEvent);
-    void OnSelectAll(wxCommandEvent& rEvent);
-
-    void OnUpdateCut(wxUpdateUIEvent& rEvent);
-    void OnUpdateCopy(wxUpdateUIEvent& rEvent);
-    void OnUpdatePaste(wxUpdateUIEvent& rEvent);
-    void OnUpdateUndo(wxUpdateUIEvent& rEvent);
-    void OnUpdateRedo(wxUpdateUIEvent& rEvent);
-    void OnUpdateDelete(wxUpdateUIEvent& rEvent);
-    void OnUpdateSelectAll(wxUpdateUIEvent& rEvent);
-
-    inline bool IsMLE(void) {return m_bIsMLE;}
-    inline void SetMLE(bool bIsMLE) {m_bIsMLE = bIsMLE;}
-
-protected:
-    //
-    // call this to increase the size limit (will do nothing if the current
-    // limit is big enough)
-    //
-    void           AdjustSpaceLimit(void);
-    virtual wxSize DoGetBestSize(void) const;
-    virtual bool   OS2ShouldPreProcessMessage(WXMSG* pMsg);
-
-    virtual WXDWORD OS2GetStyle( long     lStyle
-                                ,WXDWORD* dwExstyle
-                               ) const;
-
-    virtual void DoSetValue(const wxString &value, int flags = 0);
-
-    bool m_bSkipUpdate;
-
-private:
-    // implement wxTextEntry pure virtual: it implements all the operations for
-    // the simple EDIT controls
-    virtual WXHWND GetEditHWND() const { return m_hWnd; }
-
-    bool                            m_bIsMLE;
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxTextCtrl)
-}; // end of CLASS wxTextCtrl
-
-#endif
-    // _WX_TEXTCTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/textentry.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/textentry.h
deleted file mode 100644
index 5f8a8f37af..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/textentry.h
+++ /dev/null
@@ -1,67 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/textentry.h
-// Purpose:     wxOS2-specific wxTextEntry implementation
-// Author:      Stefan Neis
-// Created:     2007-11-18
-// Copyright:   (c) 2007 Stefan Neis
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OS2_TEXTENTRY_H_
-#define _WX_OS2_TEXTENTRY_H_
-
-// ----------------------------------------------------------------------------
-// wxTextEntry: common part of wxComboBox and (single line) wxTextCtrl
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxTextEntry : public wxTextEntryBase
-{
-public:
-    wxTextEntry() { }
-
-    // implement wxTextEntryBase pure virtual methods
-    virtual void WriteText(const wxString& text);
-    virtual void Remove(long from, long to);
-
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
-
-    virtual void Undo();
-    virtual void Redo();
-    virtual bool CanUndo() const;
-    virtual bool CanRedo() const;
-
-    virtual void SetInsertionPoint(long pos);
-    virtual long GetInsertionPoint() const;
-    virtual long GetLastPosition() const;
-
-    virtual void SetSelection(long from, long to)
-        { DoSetSelection(from, to); }
-    virtual void GetSelection(long *from, long *to) const;
-
-    virtual bool IsEditable() const;
-    virtual void SetEditable(bool editable);
-
-    virtual void SetMaxLength(unsigned long len);
-
-protected:
-    virtual wxString DoGetValue() const;
-
-    // this is really a hook for multiline text controls as the single line
-    // ones don't need to ever scroll to show the selection but having it here
-    // allows us to put Remove() in the base class
-    enum
-    {
-        SetSel_NoScroll = 0,    // don't do anything special
-        SetSel_Scroll = 1       // default: scroll to make the selection visible
-    };
-    virtual void DoSetSelection(long from, long to, int flags = SetSel_Scroll);
-
-private:
-    // implement this to return the HWND of the EDIT control
-    virtual WXHWND GetEditHWND() const = 0;
-};
-
-#endif // _WX_OS2_TEXTENTRY_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/tglbtn.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/tglbtn.h
deleted file mode 100644
index 959d8a2349..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/tglbtn.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/tglbtn.h
-// Purpose:     Declaration of the wxToggleButton class, which implements a
-//              toggle button under wxOS2.
-// Author:      Dave Webster
-// Modified by:
-// Created:     08.02.01
-// Copyright:   (c) 2005 David A Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TOGGLEBUTTON_H_
-#define _WX_TOGGLEBUTTON_H_
-
-// Checkbox item (single checkbox)
-class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase
-{
-public:
-    wxToggleButton() {}
-    wxToggleButton(wxWindow *parent,
-                   wxWindowID id,
-                   const wxString& label,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = 0,
-                   const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxCheckBoxNameStr)
-    {
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& label,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
-
-    virtual void SetValue(bool value);
-    virtual bool GetValue() const ;
-
-    virtual bool OS2Command(WXUINT param, WXWORD id);
-    virtual void Command(wxCommandEvent& event);
-
-protected:
-    virtual wxSize DoGetBestSize() const;
-    virtual wxBorder GetDefaultBorder() const;
-    virtual WXDWORD OS2GetStyle(long flags, WXDWORD *exstyle = NULL) const;
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)
-};
-
-#endif // _WX_TOGGLEBUTTON_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/tick.bmp b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/tick.bmp
deleted file mode 100644
index 3673eda5de..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/tick.bmp and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/tip.ico b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/tip.ico
deleted file mode 100644
index 6b77dcd123..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/tip.ico and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/tls.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/tls.h
deleted file mode 100644
index 4cdfdd1471..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/tls.h
+++ /dev/null
@@ -1,117 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/tls.h
-// Purpose:     OS/2 implementation of wxTlsValue<>
-// Author:      Stefan Neis
-// Created:     2008-08-30
-// Copyright:   (c) 2008 Stefan Neis
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OS2_TLS_H_
-#define _WX_OS2_TLS_H_
-
-#include "wx/os2/private.h"
-#include "wx/thread.h"
-#include "wx/vector.h"
-
-// ----------------------------------------------------------------------------
-// wxTlsKey is a helper class encapsulating a TLS slot
-// ----------------------------------------------------------------------------
-
-class wxTlsKey
-{
-public:
-    // ctor allocates a new key
-    wxTlsKey(wxTlsDestructorFunction destructor)
-    {
-        m_destructor = destructor;
-        APIRET rc = ::DosAllocThreadLocalMemory(1, &m_slot);
-        if (rc != NO_ERROR)
-            m_slot = NULL;
-    }
-
-    // return true if the key was successfully allocated
-    bool IsOk() const { return m_slot != NULL; }
-
-    // get the key value, there is no error return
-    void *Get() const
-    {
-        return (void *)m_slot;
-    }
-
-    // change the key value, return true if ok
-    bool Set(void *value)
-    {
-        void *old = Get();
-
-        m_slot = (ULONG*)value;
-
-        if ( old )
-            m_destructor(old);
-
-        // update m_allValues list of all values - remove old, add new
-        wxCriticalSectionLocker lock(m_csAllValues);
-        if ( old )
-        {
-            for ( wxVector<void*>::iterator i = m_allValues.begin();
-                  i != m_allValues.end();
-                  ++i )
-            {
-                if ( *i == old )
-                {
-                    if ( value )
-                        *i = value;
-                    else
-                        m_allValues.erase(i);
-                    return true;
-                }
-            }
-            wxFAIL_MSG( "previous wxTlsKey value not recorded in m_allValues" );
-        }
-
-        if ( value )
-            m_allValues.push_back(value);
-
-        return true;
-    }
-
-    // free the key
-    ~wxTlsKey()
-    {
-        if ( !IsOk() )
-            return;
-
-        // Win32 and OS/2 API doesn't have the equivalent of pthread's
-        // destructor, so we have to keep track of all allocated values and
-        // destroy them manually; ideally we'd do that at thread exit time, but
-        // since we could only do that with wxThread and not otherwise created
-        // threads, we do it here.
-        //
-        // TODO: We should still call destructors for wxTlsKey used in the
-        //       thread from wxThread's thread shutdown code, *in addition*
-        //       to doing it in ~wxTlsKey.
-        //
-        // NB: No need to lock m_csAllValues, by the time this code is called,
-        //     no other thread can be using this key.
-        for ( wxVector<void*>::iterator i = m_allValues.begin();
-              i != m_allValues.end();
-              ++i )
-        {
-            m_destructor(*i);
-        }
-
-        ::DosFreeThreadLocalMemory(m_slot);
-    }
-
-private:
-    wxTlsDestructorFunction m_destructor;
-    ULONG* m_slot;
-
-    wxVector<void*> m_allValues;
-    wxCriticalSection m_csAllValues;
-
-    wxDECLARE_NO_COPY_CLASS(wxTlsKey);
-};
-
-#endif // _WX_OS2_TLS_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/toolbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/toolbar.h
deleted file mode 100644
index d0fc1a1c7d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/toolbar.h
+++ /dev/null
@@ -1,224 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/toolbar.h
-// Purpose:     wxToolBar class
-// Author:      David Webster
-// Modified by:
-// Created:     10/17/98
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TOOLBAR_H_
-#define _WX_TOOLBAR_H_
-
-#if wxUSE_TOOLBAR
-#include "wx/timer.h"
-#include "wx/tbarbase.h"
-
-#define ID_TOOLTIMER                100
-#define ID_TOOLEXPTIMER             101
-
-class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
-{
-public:
-    /*
-     * Public interface
-     */
-
-    wxToolBar()
-    : m_vToolTimer(this, ID_TOOLTIMER)
-    , m_vToolExpTimer(this, ID_TOOLEXPTIMER)
-    { Init(); }
-
-    inline wxToolBar( wxWindow*       pParent
-                     ,wxWindowID      vId
-                     ,const wxPoint&  rPos = wxDefaultPosition
-                     ,const wxSize&   rSize = wxDefaultSize
-                     ,long            lStyle = wxTB_HORIZONTAL
-                     ,const wxString& rName = wxToolBarNameStr
-                    ) : m_vToolTimer(this, ID_TOOLTIMER)
-                      , m_vToolExpTimer(this, ID_TOOLEXPTIMER)
-    {
-        Init();
-        Create( pParent
-               ,vId
-               ,rPos
-               ,rSize
-               ,lStyle
-               ,rName
-              );
-    }
-    virtual ~wxToolBar();
-
-    bool Create( wxWindow*       pParent
-                ,wxWindowID      vId
-                ,const wxPoint&  rPos = wxDefaultPosition
-                ,const wxSize&   rSize = wxDefaultSize
-                ,long            lStyle = wxTB_HORIZONTAL
-                ,const wxString& rName = wxToolBarNameStr
-               );
-
-
-    //
-    // Override/implement base class virtuals
-    //
-    virtual wxToolBarToolBase* FindToolForPosition( wxCoord vX
-                                                   ,wxCoord vY
-                                                  ) const;
-    virtual bool               Realize(void);
-    virtual void               SetRows(int nRows);
-
-    //
-    // Special overrides for OS/2
-    //
-    virtual wxToolBarToolBase* InsertControl( size_t     nPos
-                                             ,wxControl* pControl
-                                            );
-    virtual wxToolBarToolBase* InsertSeparator(size_t nPos);
-    virtual wxToolBarToolBase* InsertTool( size_t          nPos
-                                          ,int             nId
-                                          ,const wxString& rsLabel
-                                          ,const wxBitmap& rBitmap
-                                          ,const wxBitmap& rBmpDisabled = wxNullBitmap
-                                          ,wxItemKind      eKind = wxITEM_NORMAL
-                                          ,const wxString& rsShortHelp = wxEmptyString
-                                          ,const wxString& rsLongHelp = wxEmptyString
-                                          ,wxObject*       pClientData = NULL
-                                         );
-    wxToolBarToolBase*         InsertTool( size_t          nPos
-                                          ,int             nId
-                                          ,const wxBitmap& rBitmap
-                                          ,const wxBitmap& rBmpDisabled = wxNullBitmap
-                                          ,bool            bToggle = FALSE
-                                          ,wxObject*       pClientData = NULL
-                                          ,const wxString& rsShortHelp = wxEmptyString
-                                          ,const wxString& rsLongHelp = wxEmptyString
-                                         )
-    {
-        return InsertTool( nPos
-                          ,nId
-                          ,wxEmptyString
-                          ,rBitmap
-                          ,rBmpDisabled
-                          ,bToggle ? wxITEM_CHECK : wxITEM_NORMAL
-                          ,rsShortHelp
-                          ,rsLongHelp
-                          ,pClientData
-                         );
-    }
-    virtual bool               DeleteTool(int nId);
-    virtual bool               DeleteToolByPos(size_t nPos);
-
-    //
-    // Event handlers
-    //
-    void OnPaint(wxPaintEvent& event);
-    void OnSize(wxSizeEvent& event);
-    void OnMouseEvent(wxMouseEvent& event);
-    void OnKillFocus(wxFocusEvent& event);
-
-protected:
-    //
-    // Common part of all ctors
-    //
-    void Init();
-
-    //
-    // Implement base class pure virtuals
-    //
-    virtual wxToolBarToolBase* DoAddTool( int id
-                                         ,const wxString& label
-                                         ,const wxBitmap& bitmap
-                                         ,const wxBitmap& bmpDisabled
-                                         ,wxItemKind kind
-                                         ,const wxString& shortHelp = wxEmptyString
-                                         ,const wxString& longHelp = wxEmptyString
-                                         ,wxObject *clientData = NULL
-                                         ,wxCoord xPos = -1
-                                         ,wxCoord yPos = -1
-                                        );
-
-    virtual bool DoInsertTool( size_t             nPos
-                              ,wxToolBarToolBase* pTool
-                             );
-    virtual bool DoDeleteTool( size_t              nPos
-                              , wxToolBarToolBase* pTool
-                             );
-
-    virtual void DoEnableTool( wxToolBarToolBase* pTool
-                              ,bool               bEnable
-                             );
-    virtual void DoToggleTool( wxToolBarToolBase* pTool
-                              ,bool               bToggle
-                             );
-    virtual void DoSetToggle( wxToolBarToolBase* pTool
-                             ,bool               bToggle
-                            );
-
-    virtual wxToolBarToolBase* CreateTool( int             vId
-                                          ,const wxString& rsLabel
-                                          ,const wxBitmap& rBmpNormal
-                                          ,const wxBitmap& rBmpDisabled
-                                          ,wxItemKind      eKind
-                                          ,wxObject*       pClientData
-                                          ,const wxString& rsShortHelp
-                                          ,const wxString& rsLongHelp
-                                         );
-    virtual wxToolBarToolBase* CreateTool(wxControl* pControl,
-                                          const wxString& label);
-
-    //
-    // Helpers
-    //
-    void         DrawTool(wxToolBarToolBase *tool);
-    virtual void DrawTool( wxDC&              rDC
-                          ,wxToolBarToolBase* pTool
-                         );
-    virtual void SpringUpButton(int nIndex);
-
-    int                             m_nCurrentRowsOrColumns;
-    int                             m_nPressedTool;
-    int                             m_nCurrentTool;
-    wxCoord                         m_vLastX;
-    wxCoord                         m_vLastY;
-    wxCoord                         m_vMaxWidth;
-    wxCoord                         m_vMaxHeight;
-    wxCoord                         m_vXPos;
-    wxCoord                         m_vYPos;
-    wxCoord                         m_vTextX;
-    wxCoord                         m_vTextY;
-
-private:
-    void LowerTool( wxToolBarToolBase* pTool
-                   ,bool               bLower = TRUE
-                  );
-    void RaiseTool( wxToolBarToolBase* pTool
-                   ,bool               bRaise = TRUE
-                  );
-    void OnTimer(wxTimerEvent& rEvent);
-
-    static bool                     m_bInitialized;
-
-    wxTimer                         m_vToolTimer;
-    wxTimer                         m_vToolExpTimer;
-    wxToolTip*                      m_pToolTip;
-    wxCoord                         m_vXMouse;
-    wxCoord                         m_vYMouse;
-
-    //
-    // Virtual function hiding supression
-    virtual wxToolBarToolBase *InsertTool (size_t nPos, wxToolBarToolBase* pTool)
-    {
-        return( wxToolBarBase::InsertTool( nPos
-                                          ,pTool
-                                         ));
-    }
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxToolBar)
-};
-
-#endif // wxUSE_TOOLBAR
-
-#endif
-    // _WX_TOOLBAR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/tooltip.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/tooltip.h
deleted file mode 100644
index c94ff99a82..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/tooltip.h
+++ /dev/null
@@ -1,54 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/tooltip.h
-// Purpose:     wxToolTip class - tooltip control
-// Author:      David Webster
-// Modified by:
-// Created:     10/17/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OS2_TOOLTIP_H_
-#define _WX_OS2_TOOLTIP_H_
-
-class wxToolTip : public wxObject
-{
-public:
-    // ctor & dtor
-    wxToolTip(const wxString &rsTip);
-    virtual ~wxToolTip();
-
-    //
-    // Accessors
-    //
-    inline const wxString& GetTip(void) const { return m_sText; }
-    inline wxWindow*       GetWindow(void) const { return m_pWindow; }
-
-           void            SetTip(const wxString& rsTip);
-    inline void            SetWindow(wxWindow* pWin) { m_pWindow = pWin; }
-
-    // controlling tooltip behaviour: globally change tooltip parameters
-        // enable or disable the tooltips globally
-    static void Enable(bool WXUNUSED(flag)) {}
-        // set the delay after which the tooltip appears
-    static void SetDelay(long WXUNUSED(milliseconds)) {}
-        // set the delay after which the tooltip disappears or how long the tooltip remains visible
-    static void SetAutoPop(long WXUNUSED(milliseconds)) {}
-        // set the delay between subsequent tooltips to appear
-    static void SetReshow(long WXUNUSED(milliseconds)) {}
-
-    //
-    // Implementation
-    //
-    void DisplayToolTipWindow(const wxPoint& rPos);
-    void HideToolTipWindow(void);
-
-private:
-    void Create(const wxString &rsTip);
-
-    HWND                            m_hWnd;
-    wxString                        m_sText;           // tooltip text
-    wxWindow*                       m_pWindow;         // window we're associated with
-}; // end of CLASS wxToolTip
-
-#endif // _WX_OS2_TOOLTIP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/toplevel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/toplevel.h
deleted file mode 100644
index 9b2ccfc4d4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/toplevel.h
+++ /dev/null
@@ -1,176 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/toplevel.h
-// Purpose:     wxTopLevelWindowOS2 is the OS2 implementation of wxTLW
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     20.09.01
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_TOPLEVEL_H_
-#define _WX_MSW_TOPLEVEL_H_
-
-enum ETemplateID
-{
-    kResizeableDialog = 130,
-    kCaptionDialog,
-    kNoCaptionDialog
-};
-
-// ----------------------------------------------------------------------------
-// wxTopLevelWindowOS2
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxTopLevelWindowOS2 : public wxTopLevelWindowBase
-{
-public:
-    // constructors and such
-    wxTopLevelWindowOS2() { Init(); }
-
-    wxTopLevelWindowOS2( wxWindow*       pParent
-                        ,wxWindowID      vId
-                        ,const wxString& rsTitle
-                        ,const wxPoint&  rPos = wxDefaultPosition
-                        ,const wxSize&   rSize = wxDefaultSize
-                        ,long            lStyle = wxDEFAULT_FRAME_STYLE
-                        ,const wxString& rsName = wxFrameNameStr
-                       )
-    {
-        Init();
-
-        (void)Create(pParent, vId, rsTitle, rPos, rSize, lStyle, rsName);
-    }
-
-    bool Create( wxWindow*       pParent
-                ,wxWindowID      vId
-                ,const wxString& rsTitle
-                ,const wxPoint&  rPos = wxDefaultPosition
-                ,const wxSize&   rSize = wxDefaultSize
-                ,long            lStyle = wxDEFAULT_FRAME_STYLE
-                ,const wxString& rsName = wxFrameNameStr
-               );
-
-    virtual ~wxTopLevelWindowOS2();
-
-    //
-    // Implement base class pure virtuals
-    //
-    virtual void SetTitle( const wxString& title);
-    virtual wxString GetTitle() const;
-
-    virtual void Iconize(bool bIconize = true);
-    virtual bool IsFullScreen(void) const { return m_bFsIsShowing; }
-    virtual bool IsIconized(void) const;
-    virtual bool IsMaximized(void) const;
-    virtual void Maximize(bool bMaximize = true);
-    virtual void Restore(void);
-    virtual void SendSizeEvent(int flags = 0);
-    virtual void SetIcons(const wxIconBundle& rIcons);
-
-    virtual bool Show(bool bShow = true);
-    virtual bool ShowFullScreen( bool bShow,
-                                 long lStyle = wxFULLSCREEN_ALL );
-
-    //
-    // EnableCloseButton(false) may be used to remove the "Close"
-    // button from the title bar
-    //
-    bool EnableCloseButton(bool bEnable = true);
-    HWND GetFrame(void) const { return m_hFrame; }
-
-    //
-    // Implementation from now on
-    // --------------------------
-    //
-    PSWP         GetSwpClient(void) { return &m_vSwpClient; }
-
-    void         OnActivate(wxActivateEvent& rEvent);
-
-    void         SetLastFocus(wxWindow *pWin) { m_pWinLastFocused = pWin; }
-    wxWindow*    GetLastFocus(void) const { return m_pWinLastFocused; }
-
-protected:
-
-    //
-    // Common part of all ctors
-    //
-    void Init(void);
-
-    //
-    // Create a new frame, return false if it couldn't be created
-    //
-    bool CreateFrame( const wxString& rsTitle
-                     ,const wxPoint&  rPos
-                     ,const wxSize&   rSize
-                    );
-
-    //
-    // Create a new dialog using the given dialog template from resources,
-    // return false if it couldn't be created
-    //
-    bool CreateDialog( ULONG           ulDlgTemplate
-                      ,const wxString& rsTitle
-                      ,const wxPoint&  rPos
-                      ,const wxSize&   rSize
-                     );
-
-    //
-    // Common part of Iconize(), Maximize() and Restore()
-    //
-    void DoShowWindow(int nShowCmd);
-
-    //
-    // Implement the geometry-related methods for a top level window
-    //
-    virtual void DoSetClientSize( int nWidth
-                                 ,int nHeight
-                                );
-    virtual void DoGetClientSize( int* pnWidth
-                                 ,int* pnHeight
-                                ) const;
-
-    //
-    // Translate wxWidgets flags into OS flags
-    //
-    virtual WXDWORD OS2GetStyle( long     lFlag
-                                ,WXDWORD* pdwExstyle
-                               ) const;
-
-    //
-    // Choose the right parent to use with CreateWindow()
-    //
-    virtual WXHWND  OS2GetParent(void) const;
-
-    //
-    // Is the frame currently iconized?
-    //
-    bool m_bIconized;
-
-    //
-    // Should the frame be maximized when it will be shown? set by Maximize()
-    // when it is called while the frame is hidden
-    //
-    bool   m_bMaximizeOnShow;
-
-    //
-    // Data to save/restore when calling ShowFullScreen
-    //
-    long   m_lFsStyle; // Passed to ShowFullScreen
-    wxRect m_vFsOldSize;
-    long   m_lFsOldWindowStyle;
-    bool   m_bFsIsMaximized;
-    bool   m_bFsIsShowing;
-
-    wxWindow* m_pWinLastFocused;
-
-    WXHWND m_hFrame;
-    SWP    m_vSwp;
-    SWP    m_vSwpClient;
-    static bool m_sbInitialized;
-    static wxWindow* m_spHiddenParent;
-
-    DECLARE_EVENT_TABLE()
-}; // end of CLASS wxTopLevelWindowOS2
-
-#endif // _WX_MSW_TOPLEVEL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/treectrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/treectrl.h
deleted file mode 100644
index 247359dda8..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/treectrl.h
+++ /dev/null
@@ -1,632 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/treectrl.h
-// Purpose:     wxTreeCtrl class
-// Author:      David Webster
-// Modified by:
-// Created:     01/23/03
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TREECTRL_H_
-#define _WX_TREECTRL_H_
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#if wxUSE_TREECTRL
-
-#include "wx/textctrl.h"
-#include "wx/dynarray.h"
-#include "wx/treebase.h"
-#include "wx/hashmap.h"
-
-// the type for "untyped" data
-typedef long wxDataType;
-
-// fwd decl
-class  WXDLLIMPEXP_CORE wxImageList;
-class  WXDLLIMPEXP_CORE wxDragImage;
-struct WXDLLIMPEXP_FWD_CORE wxTreeViewItem;
-
-// a callback function used for sorting tree items, it should return -1 if the
-// first item precedes the second, +1 if the second precedes the first or 0 if
-// they're equivalent
-class wxTreeItemData;
-
-#if WXWIN_COMPATIBILITY_2_6
-    // flags for deprecated InsertItem() variant
-    #define wxTREE_INSERT_FIRST 0xFFFF0001
-    #define wxTREE_INSERT_LAST  0xFFFF0002
-#endif
-
-// hash storing attributes for our items
-WX_DECLARE_EXPORTED_VOIDPTR_HASH_MAP(wxTreeItemAttr *, wxMapTreeAttr);
-
-// ----------------------------------------------------------------------------
-// wxTreeCtrl
-// ----------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxTreeCtrl : public wxControl
-{
-public:
-    // creation
-    // --------
-    wxTreeCtrl() { Init(); }
-
-    wxTreeCtrl( wxWindow*          pParent
-               ,wxWindowID         vId = wxID_ANY
-               ,const wxPoint&     rPos = wxDefaultPosition
-               ,const wxSize&      rSize = wxDefaultSize
-               ,long               lStyle = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT
-               ,const wxValidator& rValidator = wxDefaultValidator
-               ,const wxString&    rsName = wxTreeCtrlNameStr
-              )
-    {
-        Create( pParent
-               ,vId
-               ,rPos
-               ,rSize
-               ,lStyle
-               ,rValidator
-               ,rsName
-              );
-    }
-    virtual ~wxTreeCtrl();
-
-    bool Create( wxWindow*          pParent
-                ,wxWindowID         vId = wxID_ANY
-                ,const wxPoint&     rPos = wxDefaultPosition
-                ,const wxSize&      rSize = wxDefaultSize
-                ,long               lStyle = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT
-                ,const wxValidator& rValidator = wxDefaultValidator
-                ,const wxString&    rsName = wxTreeCtrlNameStr
-               );
-
-    //
-    // Accessors
-    // ---------
-    //
-
-    //
-    // Get the total number of items in the control
-    //
-    virtual unsigned int GetCount(void) const;
-
-    //
-    // Indent is the number of pixels the children are indented relative to
-    // the parents position. SetIndent() also redraws the control
-    // immediately.
-    //
-    unsigned int GetIndent(void) const;
-    void         SetIndent(unsigned int uIndent);
-
-    //
-    // Spacing is the number of pixels between the start and the Text
-    //
-    unsigned int GetSpacing(void) const { return 18; } // return wxGTK default
-    void SetSpacing(unsigned int uSpacing) { }
-
-    //
-    // Image list: these functions allow to associate an image list with
-    // the control and retrieve it. Note that the control does _not_ delete
-    // the associated image list when it's deleted in order to allow image
-    // lists to be shared between different controls.
-    //
-    // OS/2 doesn't really use imagelists as MSW does, but since the MSW
-    // control is the basis for this one, until I decide how to get rid of
-    // the need for them they are here for now.
-    //
-    wxImageList* GetImageList(void) const;
-    wxImageList* GetStateImageList(void) const;
-
-    void         AssignImageList(wxImageList* pImageList);
-    void         AssignStateImageList(wxImageList* pImageList);
-    void         SetImageList(wxImageList* pImageList);
-    void         SetStateImageList(wxImageList* pImageList);
-
-    //
-    // Functions to work with tree ctrl items. Unfortunately, they can _not_ be
-    // member functions of wxTreeItem because they must know the tree the item
-    // belongs to for Windows implementation and storing the pointer to
-    // wxTreeCtrl in each wxTreeItem is just too much waste.
-
-    //
-    // Item's label
-    //
-    wxString GetItemText(const wxTreeItemId& rItem) const;
-    void     SetItemText( const wxTreeItemId& rItem
-                         ,const wxString&     rsText
-                        );
-
-    //
-    // One of the images associated with the item (normal by default)
-    //
-    int  GetItemImage( const wxTreeItemId& rItem
-                      ,wxTreeItemIcon      vWhich = wxTreeItemIcon_Normal
-                     ) const;
-    void SetItemImage( const wxTreeItemId& rItem
-                      ,int                 nImage
-                      ,wxTreeItemIcon      vWhich = wxTreeItemIcon_Normal
-                     );
-
-    //
-    // Data associated with the item
-    //
-    wxTreeItemData* GetItemData(const wxTreeItemId& rItem) const;
-    void            SetItemData( const wxTreeItemId& rItem
-                                ,wxTreeItemData*     pData
-                               );
-
-    //
-    // Item's text colour
-    //
-    wxColour GetItemTextColour(const wxTreeItemId& rItem) const;
-    void     SetItemTextColour( const wxTreeItemId& rItem
-                               ,const wxColour&     rColor
-                              );
-
-    //
-    // Item's background colour
-    //
-    wxColour GetItemBackgroundColour(const wxTreeItemId& rItem) const;
-    void     SetItemBackgroundColour( const wxTreeItemId& rItem
-                                     ,const wxColour&     rColour
-                                    );
-
-    //
-    // Item's font
-    //
-    wxFont GetItemFont(const wxTreeItemId& rItem) const;
-    void   SetItemFont( const wxTreeItemId& rItem
-                       ,const wxFont&       rFont
-                      );
-
-    //
-    // Force appearance of [+] button near the item. This is useful to
-    // allow the user to expand the items which don't have any children now
-    // - but instead add them only when needed, thus minimizing memory
-    // usage and loading time.
-    //
-    void SetItemHasChildren( const wxTreeItemId& rItem
-                            ,bool                bHas = true
-                           );
-
-    //
-    // The item will be shown in bold
-    //
-    void SetItemBold( const wxTreeItemId& rItem
-                     ,bool                bBold = true
-                    );
-
-    //
-    // The item will be shown with a drop highlight
-    //
-    void SetItemDropHighlight( const wxTreeItemId& rItem
-                              ,bool                bHighlight = true
-                             );
-
-    //
-    // Item status inquiries
-    // ---------------------
-    //
-
-    //
-    // Is the item visible (it might be outside the view or not expanded)?
-    //
-    bool IsVisible(const wxTreeItemId& rItem) const;
-
-    //
-    // Does the item has any children?
-    //
-    bool ItemHasChildren(const wxTreeItemId& rItem) const;
-
-    //
-    // Is the item expanded (only makes sense if HasChildren())?
-    //
-    bool IsExpanded(const wxTreeItemId& rItem) const;
-
-    //
-    // Is this item currently selected (the same as has focus)?
-    //
-    bool IsSelected(const wxTreeItemId& rItem) const;
-
-    //
-    // Is item text in bold font?
-    //
-    bool IsBold(const wxTreeItemId& rItem) const;
-
-    //
-    // Number of children
-    // ------------------
-    //
-
-    //
-    // If 'bRecursively' is false, only immediate children count, otherwise
-    // the returned number is the number of all items in this branch
-    //
-    size_t GetChildrenCount( const wxTreeItemId& rItem
-                            ,bool                bRecursively = true
-                           ) const;
-
-    //
-    // Navigation
-    // ----------
-    //
-
-    //
-    // Get the root tree item
-    //
-    wxTreeItemId GetRootItem(void) const;
-
-    //
-    // Get the item currently selected (may return NULL if no selection)
-    //
-    wxTreeItemId GetSelection(void) const;
-
-    //
-    // Get the items currently selected, return the number of such item
-    //
-    size_t GetSelections(wxArrayTreeItemIds& rSelections) const;
-
-    //
-    // Get the parent of this item (may return NULL if root)
-    //
-    wxTreeItemId GetItemParent(const wxTreeItemId& rItem) const;
-
-        // for this enumeration function you must pass in a "cookie" parameter
-        // which is opaque for the application but is necessary for the library
-        // to make these functions reentrant (i.e. allow more than one
-        // enumeration on one and the same object simultaneously). Of course,
-        // the "cookie" passed to GetFirstChild() and GetNextChild() should be
-        // the same!
-
-        // get the first child of this item
-    wxTreeItemId GetFirstChild(const wxTreeItemId& item,
-                               wxTreeItemIdValue& cookie) const;
-        // get the next child
-    wxTreeItemId GetNextChild(const wxTreeItemId& item,
-                              wxTreeItemIdValue& cookie) const;
-
-    //
-    // Get the last child of this item - this method doesn't use cookies
-    //
-    wxTreeItemId GetLastChild(const wxTreeItemId& rItem) const;
-
-    //
-    // Get the next sibling of this item
-    //
-    wxTreeItemId GetNextSibling(const wxTreeItemId& rItem) const;
-
-    //
-    // Get the previous sibling
-    //
-    wxTreeItemId GetPrevSibling(const wxTreeItemId& rItem) const;
-
-    //
-    // Get first visible item
-    //
-    wxTreeItemId GetFirstVisibleItem(void) const;
-
-    //
-    // Get the next visible item: item must be visible itself!
-    // see IsVisible() and wxTreeCtrl::GetFirstVisibleItem()
-    //
-    wxTreeItemId GetNextVisible(const wxTreeItemId& rItem) const;
-
-    //
-    // Get the previous visible item: item must be visible itself!
-    //
-    wxTreeItemId GetPrevVisible(const wxTreeItemId& rItem) const;
-
-    //
-    // Operations
-    // ----------
-    //
-
-    //
-    // Add the root node to the tree
-    //
-    wxTreeItemId AddRoot( const wxString& rsText
-                         ,int             nImage = -1
-                         ,int             nSelectedImage = -1
-                         ,wxTreeItemData* pData = NULL
-                        );
-
-    //
-    // Insert a new item in as the first child of the parent
-    //
-    wxTreeItemId PrependItem( const wxTreeItemId& rParent
-                             ,const wxString&     rsText
-                             ,int                 nImage = -1
-                             ,int                 nSelectedImage = -1
-                             ,wxTreeItemData*     pData = NULL
-                            );
-
-    //
-    // Insert a new item after a given one
-    //
-    wxTreeItemId InsertItem( const wxTreeItemId& rParent
-                            ,const wxTreeItemId& rIdPrevious
-                            ,const wxString&     rsText
-                            ,int                 nImage = -1
-                            ,int                 nSelectedImage = -1
-                            ,wxTreeItemData*     pData = NULL
-                           );
-
-    //
-    // Insert a new item before the one with the given index
-    //
-    wxTreeItemId InsertItem( const wxTreeItemId& pParent
-                            ,size_t              nIndex
-                            ,const wxString&     rsText
-                            ,int                 nImage = -1
-                            ,int                 nSelectedImage = -1
-                            ,wxTreeItemData*     pData = NULL
-                           );
-
-    //
-    // Insert a new item in as the last child of the parent
-    //
-    wxTreeItemId AppendItem( const wxTreeItemId& rParent
-                            ,const wxString&     rsText
-                            ,int                 nImage = -1
-                            ,int                 nSelectedImage = -1
-                            ,wxTreeItemData*     pData = NULL
-                           );
-
-    //
-    // Delete this item and associated data if any
-    //
-    void Delete(const wxTreeItemId& rItem);
-
-    //
-    // Delete all children (but don't delete the item itself)
-    //
-    void DeleteChildren(const wxTreeItemId& rItem);
-
-    //
-    // Delete all items from the tree
-    //
-    void DeleteAllItems(void);
-
-    //
-    // Expand this item
-    //
-    void Expand(const wxTreeItemId& rItem);
-
-    //
-    // Collapse the item without removing its children
-    //
-    void Collapse(const wxTreeItemId& rItem);
-
-    //
-    // Collapse the item and remove all children
-    //
-    void CollapseAndReset(const wxTreeItemId& rItem);
-
-    //
-    // Toggles the current state
-    //
-    void Toggle(const wxTreeItemId& rItem);
-
-    //
-    // Remove the selection from currently selected item (if any)
-    //
-    void Unselect(void);
-
-    //
-    // Unselect all items (only makes sense for multiple selection control)
-    //
-    void UnselectAll(void);
-
-    //
-    // Select this item
-    //
-    void SelectItem(const wxTreeItemId& rItem);
-
-    //
-    // Make sure this item is visible (expanding the parent item and/or
-    // scrolling to this item if necessary)
-    //
-    void EnsureVisible(const wxTreeItemId& rItem);
-
-    //
-    // Scroll to this item (but don't expand its parent)
-    //
-    void ScrollTo(const wxTreeItemId& rItem);
-
-    //
-    // OS/2 does not use a separate edit field for editting text. Here for
-    // interface compatibility, only.
-    //
-    wxTextCtrl* EditLabel( const wxTreeItemId& rItem
-                          ,wxClassInfo*        pTextCtrlClass = wxCLASSINFO(wxTextCtrl)
-                         );
-
-    //
-    // returns NULL for OS/2 in ALL cases
-    //
-    wxTextCtrl* GetEditControl(void) const {return NULL;}
-
-    //
-    // End editing and accept or discard the changes to item label
-    //
-    void EndEditLabel( const wxTreeItemId& rItem
-                      ,bool                bDiscardChanges = false
-                     );
-
-    //
-    // Sorting
-    // -------
-    //
-
-    //
-    // This function is called to compare 2 items and should return -1, 0
-    // or +1 if the first item is less than, equal to or greater than the
-    // second one. The base class version performs alphabetic comparaison
-    // of item labels (GetText)
-    //
-    virtual int OnCompareItems( const wxTreeItemId& rItem1
-                               ,const wxTreeItemId& rItem2
-                              );
-
-    //
-    // Sort the children of this item using OnCompareItems
-    //
-    void SortChildren(const wxTreeItemId& rItem);
-
-    //
-    // Helpers
-    // -------
-    //
-
-    //
-    // Determine to which item (if any) belongs the given point (the
-    // coordinates specified are relative to the client area of tree ctrl)
-    // and fill the flags parameter with a bitmask of wxTREE_HITTEST_xxx
-    // constants.
-
-    //
-    // The first function is more portable (because easier to implement
-    // on other platforms), but the second one returns some extra info.
-    //
-    wxTreeItemId HitTest(const wxPoint& rPoint)
-        { int nDummy = 0; return HitTest(rPoint, nDummy); }
-    wxTreeItemId HitTest( const wxPoint& rPoint
-                         ,int&           rFlags
-                        );
-
-    //
-    // Get the bounding rectangle of the item (or of its label only)
-    //
-    bool GetBoundingRect( const wxTreeItemId& rItem
-                         ,wxRect&             rRect
-                         ,bool                bTextOnly = false
-                        ) const;
-
-    //
-    // Implementation
-    // --------------
-    //
-
-    virtual MRESULT OS2WindowProc( WXUINT   uMsg
-                                  ,WXWPARAM wParam
-                                  ,WXLPARAM lParam
-                                 );
-    virtual bool    OS2Command( WXUINT uParam
-                               ,WXWORD wId
-                              );
-//    virtual bool    OMSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
-
-    //
-    // Override some base class virtuals
-    //
-    virtual bool SetBackgroundColour(const wxColour& rColour);
-    virtual bool SetForegroundColour(const wxColour& rColour);
-
-    //
-    // Get/set the check state for the item (only for wxTR_MULTIPLE)
-    //
-    bool IsItemChecked(const wxTreeItemId& rItem) const;
-    void SetItemCheck( const wxTreeItemId& rItem
-                      ,bool                bCheck = true
-                     );
-
-protected:
-    //
-    // SetImageList helper
-    //
-    void SetAnyImageList( wxImageList* pImageList
-                         ,int          nWhich
-                        );
-
-    //
-    // Refresh a single item
-    //
-    void RefreshItem(const wxTreeItemId& rItem);
-
-    wxImageList*                    m_pImageListNormal; // images for tree elements
-    wxImageList*                    m_pImageListState;  // special images for app defined states
-    bool                            m_bOwnsImageListNormal;
-    bool                            m_bOwnsImageListState;
-
-private:
-
-    //
-    // The common part of all ctors
-    //
-    void Init(void);
-
-    //
-    // Helper functions
-    //
-    inline bool DoGetItem(wxTreeViewItem* pTvItem) const;
-    inline void DoSetItem(wxTreeViewItem* pTvItem);
-
-    inline void DoExpand( const wxTreeItemId& rItem
-                         ,int                 nFlag
-                        );
-    wxTreeItemId DoInsertItem( const wxTreeItemId& pParent
-                              ,wxTreeItemId        hInsertAfter
-                              ,const wxString&     rsText
-                              ,int                 nImage
-                              ,int                 nSelectedImage
-                              ,wxTreeItemData*     pData
-                             );
-    int  DoGetItemImageFromData( const wxTreeItemId& rItem
-                                ,wxTreeItemIcon      vWhich
-                               ) const;
-    void DoSetItemImageFromData( const wxTreeItemId& rItem
-                                ,int                 nImage
-                                ,wxTreeItemIcon      vWhich
-                               ) const;
-    void DoSetItemImages( const wxTreeItemId& rItem
-                         ,int                 nImage
-                         ,int                 nImageSel
-                        );
-    void DeleteTextCtrl() { }
-
-    //
-    // support for additional item images which we implement using
-    // wxTreeItemIndirectData technique - see the comments in msw/treectrl.cpp
-    //
-    void SetIndirectItemData( const wxTreeItemId&           rItem
-                             ,class wxTreeItemIndirectData* pData
-                            );
-    bool HasIndirectData(const wxTreeItemId& rItem) const;
-    bool IsDataIndirect(wxTreeItemData* pData) const
-        { return pData && pData->GetId().m_pItem == 0; }
-
-    //
-    // The hash storing the items attributes (indexed by items ids)
-    //
-    wxMapTreeAttr                   m_vAttrs;
-
-    //
-    // true if the hash above is not empty
-    //
-    bool                            m_bHasAnyAttr;
-
-    //
-    // Used for dragging
-    //
-    wxDragImage*                    m_pDragImage;
-
-    // Virtual root item, if wxTR_HIDE_ROOT is set.
-//    void* m_pVirtualRoot;
-
-    // the starting item for selection with Shift
-//    WXHTREEITEM m_htSelStart;
-//
-    friend class wxTreeItemIndirectData;
-    friend class wxTreeSortHelper;
-
-    DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
-    wxDECLARE_NO_COPY_CLASS(wxTreeCtrl);
-}; // end of CLASS wxTreeCtrl
-
-#endif // wxUSE_TREECTRL
-
-#endif
-    // _WX_TREECTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/warning.ico b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/warning.ico
deleted file mode 100644
index 7f70ff0708..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/warning.ico and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/window.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/window.h
deleted file mode 100644
index 787113c405..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/window.h
+++ /dev/null
@@ -1,570 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/os2/window.h
-// Purpose:     wxWindow class
-// Author:      David Webster
-// Modified by:
-// Created:     10/12/99
-// Copyright:   (c) David Webster
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WINDOW_H_
-#define _WX_WINDOW_H_
-
-#define wxUSE_MOUSEEVENT_HACK 0
-
-// ---------------------------------------------------------------------------
-// headers
-// ---------------------------------------------------------------------------
-#define INCL_DOS
-#define INCL_PM
-#define INCL_GPI
-#include <os2.h>
-
-
-// ---------------------------------------------------------------------------
-// forward declarations
-// ---------------------------------------------------------------------------
-#ifndef CW_USEDEFAULT
-#  define  CW_USEDEFAULT ((int)0x80000000)
-#endif
-
-// ---------------------------------------------------------------------------
-// forward declarations
-// ---------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxButton;
-
-// ---------------------------------------------------------------------------
-// wxWindow declaration for OS/2 PM
-// ---------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxWindowOS2 : public wxWindowBase
-{
-public:
-    wxWindowOS2()
-    {
-        Init();
-    }
-
-    wxWindowOS2( wxWindow*       pParent
-                ,wxWindowID      vId
-                ,const wxPoint&  rPos = wxDefaultPosition
-                ,const wxSize&   rSize = wxDefaultSize
-                ,long            lStyle = 0
-                ,const wxString& rName = wxPanelNameStr
-               )
-    {
-        Init();
-        Create( pParent
-               ,vId
-               ,rPos
-               ,rSize
-               ,lStyle
-               ,rName
-              );
-    }
-
-    virtual ~wxWindowOS2();
-
-    bool Create( wxWindow*       pParent
-                ,wxWindowID      vId
-                ,const wxPoint&  rPos = wxDefaultPosition
-                ,const wxSize&   rSize = wxDefaultSize
-                ,long            lStyle = 0
-                ,const wxString& rName = wxPanelNameStr
-               );
-
-    // implement base class pure virtuals
-    virtual void     SetLabel(const wxString& label);
-    virtual wxString GetLabel(void) const;
-    virtual void     Raise(void);
-    virtual void     Lower(void);
-    virtual bool     Show(bool bShow = true);
-    virtual void     DoEnable(bool bEnable);
-    virtual void     SetFocus(void);
-    virtual void     SetFocusFromKbd(void);
-    virtual bool     Reparent(wxWindowBase* pNewParent);
-    virtual void     WarpPointer( int x
-                                 ,int y
-                                );
-    virtual void     Refresh( bool          bEraseBackground = true
-                             ,const wxRect* pRect = (const wxRect *)NULL
-                            );
-    virtual void     Update(void);
-    virtual void     SetWindowStyleFlag(long lStyle);
-    virtual bool     SetCursor(const wxCursor& rCursor);
-    virtual bool     SetFont(const wxFont& rFont);
-    virtual int      GetCharHeight(void) const;
-    virtual int      GetCharWidth(void) const;
-
-    virtual void     SetScrollbar( int  nOrient
-                                  ,int  nPos
-                                  ,int  nThumbVisible
-                                  ,int  nRange
-                                  ,bool bRefresh = true
-                                 );
-    virtual void     SetScrollPos( int  nOrient
-                                  ,int  nPos
-                                  ,bool bRefresh = true
-                                 );
-    virtual int      GetScrollPos(int nOrient) const;
-    virtual int      GetScrollThumb(int nOrient) const;
-    virtual int      GetScrollRange(int nOrient) const;
-    virtual void     ScrollWindow( int           nDx
-                                  ,int           nDy
-                                  ,const wxRect* pRect = NULL
-                                 );
-
-    inline HWND                   GetScrollBarHorz(void) const {return m_hWndScrollBarHorz;}
-    inline HWND                   GetScrollBarVert(void) const {return m_hWndScrollBarVert;}
-#if wxUSE_DRAG_AND_DROP
-    virtual void SetDropTarget(wxDropTarget* pDropTarget);
-#endif // wxUSE_DRAG_AND_DROP
-
-    // Accept files for dragging
-    virtual void DragAcceptFiles(bool bAccept);
-
-#ifndef __WXUNIVERSAL__
-    // Native resource loading (implemented in src/os2/nativdlg.cpp)
-    // FIXME: should they really be all virtual?
-    virtual bool LoadNativeDialog( wxWindow*   pParent
-                                  ,wxWindowID& vId
-                                 );
-    virtual bool LoadNativeDialog( wxWindow*       pParent
-                                  ,const wxString& rName
-                                 );
-    wxWindow*    GetWindowChild1(wxWindowID vId);
-    wxWindow*    GetWindowChild(wxWindowID vId);
-#endif //__WXUNIVERSAL__
-
-    // implementation from now on
-    // --------------------------
-
-    // simple accessors
-    // ----------------
-
-    WXHWND           GetHWND(void) const { return m_hWnd; }
-    void             SetHWND(WXHWND hWnd) { m_hWnd = hWnd; }
-    virtual WXWidget GetHandle(void) const { return GetHWND(); }
-    bool             GetUseCtl3D(void) const { return m_bUseCtl3D; }
-    bool             GetTransparentBackground(void) const { return m_bBackgroundTransparent; }
-    void             SetTransparentBackground(bool bT = true) { m_bBackgroundTransparent = bT; }
-
-    // event handlers
-    // --------------
-    void OnSetFocus(wxFocusEvent& rEvent);
-    void OnEraseBackground(wxEraseEvent& rEvent);
-    void OnIdle(wxIdleEvent& rEvent);
-
-public:
-
-    // Windows subclassing
-    void SubclassWin(WXHWND hWnd);
-    void UnsubclassWin(void);
-
-    WXFARPROC OS2GetOldWndProc(void) const { return m_fnOldWndProc; }
-    void OS2SetOldWndProc(WXFARPROC fnProc) { m_fnOldWndProc = fnProc; }
-    //
-    // Return true if the window is of a standard (i.e. not wxWidgets') class
-    //
-    bool IsOfStandardClass(void) const { return m_fnOldWndProc != NULL; }
-
-    wxWindow* FindItem(long lId) const;
-    wxWindow* FindItemByHWND( WXHWND hWnd
-                             ,bool   bControlOnly = false
-                            ) const;
-
-    // Make a Windows extended style from the given wxWidgets window style ?? applicable to OS/2??
-    static WXDWORD MakeExtendedStyle( long lStyle
-                                     ,bool bEliminateBorders = true
-                                    );
-
-    // PM only: true if this control is part of the main control
-    virtual bool ContainsHWND(WXHWND WXUNUSED(hWnd)) const { return false; }
-
-    // translate wxWidgets style flags for this control into the PM style
-    // and optional extended style for the corresponding native control
-    //
-    // this is the function that should be overridden in the derived classes,
-    // but you will mostly use OS2GetCreateWindowFlags() below
-    virtual WXDWORD OS2GetStyle( long     lFlags
-                                ,WXDWORD* pdwExstyle = NULL
-                               ) const;
-
-    // get the MSW window flags corresponding to wxWidgets ones
-    //
-    // the functions returns the flags (WS_XXX) directly and puts the ext
-    // (WS_EX_XXX) flags into the provided pointer if not NULL
-    WXDWORD OS2GetCreateWindowFlags(WXDWORD* pdwExflags = NULL) const
-        { return OS2GetStyle(GetWindowStyle(), pdwExflags); }
-
-
-    // get the HWND to be used as parent of this window with CreateWindow()
-    virtual WXHWND OS2GetParent(void) const;
-
-    // returns true if the window has been created
-    bool         OS2Create( PSZ            zClass
-                           ,const wxChar*  zTitle
-                           ,WXDWORD        dwStyle
-                           ,const wxPoint& rPos
-                           ,const wxSize&  rSize
-                           ,void*          pCtlData
-                           ,WXDWORD        dwExStyle
-                           ,bool           bIsChild
-                          );
-    virtual bool OS2Command( WXUINT uParam
-                            ,WXWORD nId
-                           );
-
-#ifndef __WXUNIVERSAL__
-    // Create an appropriate wxWindow from a HWND
-    virtual wxWindow* CreateWindowFromHWND( wxWindow* pParent
-                                           ,WXHWND    hWnd
-                                          );
-
-    // Make sure the window style reflects the HWND style (roughly)
-    virtual void AdoptAttributesFromHWND(void);
-#endif
-
-    // Setup background and foreground colours correctly
-    virtual void SetupColours(void);
-
-    // ------------------------------------------------------------------------
-    // helpers for message handlers: these perform the same function as the
-    // message crackers from <windowsx.h> - they unpack WPARAM and LPARAM into
-    // the correct parameters
-    // ------------------------------------------------------------------------
-
-    void UnpackCommand( WXWPARAM wParam
-                       ,WXLPARAM lParam,
-                        WXWORD*  pId
-                       ,WXHWND*  pHwnd
-                       ,WXWORD*  pCmd
-                      );
-    void UnpackActivate( WXWPARAM wParam
-                        ,WXLPARAM lParam
-                        ,WXWORD*  pState
-                        ,WXHWND*  pHwnd
-                       );
-    void UnpackScroll( WXWPARAM wParam
-                      ,WXLPARAM lParam
-                      ,WXWORD*  pCode
-                      ,WXWORD*  pPos
-                      ,WXHWND*  pHwnd
-                     );
-    void UnpackMenuSelect( WXWPARAM wParam
-                          ,WXLPARAM lParam
-                          ,WXWORD*  pTtem
-                          ,WXWORD*  pFlags
-                          ,WXHMENU* pHmenu
-                         );
-
-    // ------------------------------------------------------------------------
-    // internal handlers for OS2 messages: all handlers return a boolen value:
-    // true means that the handler processed the event and false that it didn't
-    // ------------------------------------------------------------------------
-
-    // there are several cases where we have virtual functions for PM
-    // message processing: this is because these messages often require to be
-    // processed in a different manner in the derived classes. For all other
-    // messages, however, we do *not* have corresponding OS2OnXXX() function
-    // and if the derived class wants to process them, it should override
-    // OS2WindowProc() directly.
-
-    // scroll event (both horizontal and vertical)
-    virtual bool OS2OnScroll( int    nOrientation
-                             ,WXWORD nSBCode
-                             ,WXWORD pos
-                             ,WXHWND control
-                            );
-
-    // owner-drawn controls need to process these messages
-    virtual bool OS2OnDrawItem( int               nId
-                               ,WXDRAWITEMSTRUCT* pItem
-                              );
-    virtual long OS2OnMeasureItem( int                  nId
-                                  ,WXMEASUREITEMSTRUCT* pItem
-                                 );
-
-    virtual void OnPaint(wxPaintEvent& rEvent);
-
-    // the rest are not virtual
-    bool HandleCreate( WXLPCREATESTRUCT vCs
-                      ,bool*            pMayCreate
-                     );
-    bool HandleInitDialog(WXHWND hWndFocus);
-    bool HandleDestroy(void);
-    bool HandlePaint(void);
-    bool HandleEraseBkgnd(WXHDC vDC);
-    bool HandleMinimize(void);
-    bool HandleMaximize(void);
-    bool HandleSize( int    nX
-                    ,int    nY
-                    ,WXUINT uFlag
-                   );
-    bool HandleGetMinMaxInfo(PSWP pMmInfo);
-    bool HandleShow( bool bShow
-                    ,int  nStatus
-                   );
-    bool HandleActivate( int    nFlag
-                        ,WXHWND hActivate
-                       );
-    bool HandleCommand( WXWORD nId
-                       ,WXWORD nCmd
-                       ,WXHWND hControl
-                      );
-    bool HandleSysCommand( WXWPARAM wParam
-                          ,WXLPARAM lParam
-                         );
-    bool HandlePaletteChanged(void);
-    bool HandleQueryNewPalette(void);
-    bool HandleSysColorChange(void);
-    bool HandleDisplayChange(void);
-    bool HandleCaptureChanged(WXHWND hBainedCapture);
-
-    bool HandleCtlColor(WXHBRUSH* hBrush);
-    bool HandleSetFocus(WXHWND hWnd);
-    bool HandleKillFocus(WXHWND hWnd);
-    bool HandleEndDrag(WXWPARAM wParam);
-    bool HandleMouseEvent( WXUINT uMsg
-                          ,int    nX
-                          ,int    nY
-                          ,WXUINT uFlags
-                         );
-    bool HandleMouseMove( int    nX
-                         ,int    nY
-                         ,WXUINT uFlags
-                        );
-    bool HandleChar( WXWPARAM wParam
-                    ,WXLPARAM lParam
-                    ,bool     bIsASCII = false
-                   );
-    bool HandleKeyDown( WXWPARAM wParam
-                       ,WXLPARAM lParam
-                      );
-    bool HandleKeyUp( WXWPARAM wParam
-                     ,WXLPARAM lParam
-                    );
-    bool HandleQueryDragIcon(WXHICON* phIcon);
-    bool HandleSetCursor( USHORT vId
-                         ,WXHWND hWnd
-                        );
-
-    bool IsMouseInWindow(void) const;
-    bool OS2GetCreateWindowCoords( const wxPoint& rPos
-                                  ,const wxSize&  rSize
-                                  ,int&           rnX
-                                  ,int&           rnY
-                                  ,int&           rnWidth
-                                  ,int&           rnHeight
-                                 ) const;
-
-    // Window procedure
-    virtual MRESULT OS2WindowProc( WXUINT   uMsg
-                                  ,WXWPARAM wParam
-                                  ,WXLPARAM lParam
-                                 );
-
-    // Calls an appropriate default window procedure
-    virtual MRESULT OS2DefWindowProc( WXUINT   uMsg
-                                     ,WXWPARAM wParam
-                                     ,WXLPARAM lParam
-                                    );
-    virtual bool    OS2ProcessMessage(WXMSG* pMsg);
-    virtual bool    OS2ShouldPreProcessMessage(WXMSG* pMsg);
-    virtual bool    OS2TranslateMessage(WXMSG* pMsg);
-    virtual void    OS2DestroyWindow(void);
-
-    // this function should return the brush to paint the window background
-    // with or 0 for the default brush
-    virtual WXHBRUSH OnCtlColor( WXHDC    hDC
-                                ,WXHWND   hWnd
-                                ,WXUINT   uCtlColor
-                                ,WXUINT   uMessage
-                                ,WXWPARAM wParam
-                                ,WXLPARAM lParam
-                               );
-
-    // Responds to colour changes: passes event on to children.
-    void OnSysColourChanged(wxSysColourChangedEvent& rEvent);
-
-    // initialize various fields of wxMouseEvent (common part of OS2OnMouseXXX)
-    void InitMouseEvent( wxMouseEvent& rEvent
-                        ,int           nX
-                        ,int           nY
-                        ,WXUINT        uFlags
-                       );
-
-    void MoveChildren(int nDiff);
-    PSWP GetSwp(void) {return &m_vWinSwp;}
-
-protected:
-    virtual void     DoFreeze(void);
-    virtual void     DoThaw(void);
-
-    // PM can't create some MSW styles natively but can perform these after
-    // creation by sending messages
-    typedef enum extra_flags { kFrameToolWindow = 0x0001
-                              ,kVertCaption     = 0x0002
-                              ,kHorzCaption     = 0x0004
-                             } EExtraFlags;
-    // Some internal sizeing id's to make it easy for event handlers
-    typedef enum size_types { kSizeNormal
-                             ,kSizeMax
-                             ,kSizeMin
-                            } ESizeTypes;
-    // the window handle
-    WXHWND                          m_hWnd;
-
-    // the old window proc (we subclass all windows)
-    WXFARPROC                       m_fnOldWndProc;
-
-    // additional (OS2 specific) flags
-    bool                            m_bUseCtl3D:1; // Using CTL3D for this control
-    bool                            m_bBackgroundTransparent:1;
-    bool                            m_bMouseInWindow:1;
-    bool                            m_bLastKeydownProcessed:1;
-    bool                            m_bWinCaptured:1;
-    WXDWORD                         m_dwExStyle;
-
-    // the size of one page for scrolling
-    int                             m_nXThumbSize;
-    int                             m_nYThumbSize;
-
-#if wxUSE_MOUSEEVENT_HACK
-    // the coordinates of the last mouse event and the type of it
-    long                            m_lLastMouseX,
-    long                            m_lLastMouseY;
-    int                             m_nLastMouseEvent;
-#endif // wxUSE_MOUSEEVENT_HACK
-
-    WXHMENU                         m_hMenu; // Menu, if any
-    unsigned long                   m_ulMenubarId; // it's Id, if any
-
-    // the return value of WM_GETDLGCODE handler
-    long                            m_lDlgCode;
-
-    // implement the base class pure virtuals
-    virtual void     GetTextExtent( const wxString& rString
-                                   ,int*            pX
-                                   ,int*            pY
-                                   ,int*            pDescent = NULL
-                                   ,int*            pExternalLeading = NULL
-                                   ,const wxFont*   pTheFont = NULL
-                                  ) const;
-#if wxUSE_MENUS_NATIVE
-    virtual bool     DoPopupMenu( wxMenu* pMenu
-                                 ,int     nX
-                                 ,int     nY
-                                );
-#endif // wxUSE_MENUS_NATIVE
-    virtual void DoClientToScreen( int* pX
-                                  ,int* pY
-                                 ) const;
-    virtual void DoScreenToClient( int* pX
-                                  ,int* pY
-                                 ) const;
-    virtual void DoGetPosition( int* pX
-                               ,int* pY
-                              ) const;
-    virtual void DoGetSize( int* pWidth
-                           ,int* pHeight
-                          ) const;
-    virtual void DoGetClientSize( int* pWidth
-                                 ,int* pHeight
-                                ) const;
-    virtual void DoSetSize( int nX
-                           ,int nY
-                           ,int nWidth
-                           ,int nHeight
-                           ,int nSizeFlags = wxSIZE_AUTO
-                          );
-    virtual void DoSetClientSize( int nWidth
-                                 ,int nHeight
-                                );
-
-    virtual void     DoCaptureMouse(void);
-    virtual void     DoReleaseMouse(void);
-
-    // move the window to the specified location and resize it: this is called
-    // from both DoSetSize() and DoSetClientSize() and would usually just call
-    // ::WinSetWindowPos() except for composite controls which will want to arrange
-    // themselves inside the given rectangle
-    virtual void DoMoveWindow( int nX
-                              ,int nY
-                              ,int nWidth
-                              ,int nHeight
-                             );
-
-#if wxUSE_TOOLTIPS
-    virtual void DoSetToolTip(wxToolTip* pTip);
-#endif // wxUSE_TOOLTIPS
-
-    int  GetOS2ParentHeight(wxWindowOS2* pParent);
-
-private:
-    // common part of all ctors
-    void Init(void);
-
-    // the (non-virtual) handlers for the events
-    bool HandleMove( int nX
-                    ,int nY
-                   );
-    bool HandleJoystickEvent( WXUINT uMsg
-                             ,int    pX
-                             ,int    pY
-                             ,WXUINT uFlags
-                            );
-
-    bool HandleNotify( int       nIdCtrl
-                      ,WXLPARAM  lParam
-                      ,WXLPARAM* pResult
-                     );
-    // the helper functions used by HandleChar/KeyXXX methods
-    wxKeyEvent CreateKeyEvent( wxEventType evType
-                              ,int         nId
-                              ,WXLPARAM    lParam = 0
-                              ,WXWPARAM    wParam = 0
-                             ) const;
-
-    HWND                            m_hWndScrollBarHorz;
-    HWND                            m_hWndScrollBarVert;
-    SWP                             m_vWinSwp;
-
-    DECLARE_DYNAMIC_CLASS(wxWindowOS2);
-    wxDECLARE_NO_COPY_CLASS(wxWindowOS2);
-    DECLARE_EVENT_TABLE()
-}; // end of wxWindow
-
-class wxWindowCreationHook
-{
-public:
-    wxWindowCreationHook(wxWindow* pWinBeingCreated);
-    ~wxWindowCreationHook();
-}; // end of CLASS wxWindowCreationHook
-
-// ---------------------------------------------------------------------------
-// global functions
-// ---------------------------------------------------------------------------
-
-// kbd code translation
-WXDLLIMPEXP_CORE int wxCharCodeOS2ToWX(int nKeySym);
-WXDLLIMPEXP_CORE int wxCharCodeWXToOS2( int   nId
-                                  ,bool* pbIsVirtual = NULL
-                                 );
-
-// ----------------------------------------------------------------------------
-// global objects
-// ----------------------------------------------------------------------------
-
-// notice that this hash must be defined after wxWindow declaration as it
-// needs to "see" its dtor and not just forward declaration
-#include "wx/hash.h"
-
-// pseudo-template HWND <-> wxWindow hash table
-WX_DECLARE_HASH(wxWindowOS2, wxWindowList, wxWinHashTable);
-
-extern wxWinHashTable *wxWinHandleHash;
-
-#endif // _WX_WINDOW_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/wx.dlg b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/wx.dlg
deleted file mode 100644
index e4c73f8b46..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/wx.dlg
+++ /dev/null
@@ -1,34 +0,0 @@
-DLGINCLUDE  1   \dev\wx2\wxwindows\include\wx\os2\wxrsc.h
-
-DLGTEMPLATE ID_RESIZEABLEDIALOG   PRELOAD MOVEABLE DISCARDABLE
-BEGIN
-    DIALOG  "" ID_RESIZEABLEDIALOG   34, 22, 144, 75
-            WS_SAVEBITS | FS_SIZEBORDER | FS_NOMOVEWITHOWNER,
-            FCF_SIZEBORDER | FCF_TITLEBAR | FCF_SYSMENU
-    BEGIN
-    END
-END
-
-DLGTEMPLATE ID_CAPTIONDIALOG   PRELOAD MOVEABLE DISCARDABLE
-BEGIN
-    DIALOG  "Dummy Dialog"  ID_CAPTIONDIALOG   34, 22, 144, 75
-            WS_SAVEBITS | FS_DLGBORDER | FS_NOMOVEWITHOWNER,
-            FCF_DLGBORDER | FCF_TITLEBAR | FCF_SYSMENU
-    BEGIN
-    END
-END
-
-/*
-//////////////////////////////////////////////////////////////////////////////
-// Dummy dialog for dialog boxes without caption & with thin frame
-//////////////////////////////////////////////////////////////////////////////
-*/
-DLGTEMPLATE ID_NOCAPTIONDIALOG   PRELOAD MOVEABLE DISCARDABLE
-BEGIN
-    DIALOG  ""  ID_NOCAPTIONDIALOG   34, 22, 144, 75
-            WS_SAVEBITS | FS_NOMOVEWITHOWNER,
-            FCF_BORDER
-    BEGIN
-    END
-END
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/wx.rc b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/wx.rc
deleted file mode 100644
index 1a8570756a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/wx.rc
+++ /dev/null
@@ -1,85 +0,0 @@
-#include <os2.h>
-#include "wxrsc.h"
-
-
-/*
-//////////////////////////////////////////////////////////////////////////////
-// This is the MDI Window menu
-//////////////////////////////////////////////////////////////////////////////
-*/
-MENU    ID_WINDOW_MENU  PRELOAD
-BEGIN
-    SUBMENU "~Window",   131
-    BEGIN
-        MENUITEM "~Cascade",                    132
-        MENUITEM "Tile ~Horizontally",          133
-        MENUITEM "Tile ~Vertically",            134
-        MENUITEM "",                              -1
-        MENUITEM "~Arrange Icons",              135
-        MENUITEM "~Next",                       136
-    END
-END
-
-/*
-//////////////////////////////////////////////////////////////////////////////
-// Standard winWindows Cursors
-//////////////////////////////////////////////////////////////////////////////
-*/
-
-POINTER    WXCURSOR_HAND           LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\hand.ptr"
-POINTER    WXCURSOR_BULLSEYE       LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\bullseye.ptr"
-POINTER    WXCURSOR_PENCIL         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pencil.ptr"
-POINTER    WXCURSOR_MAGNIFIER      LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\magnit1.ptr"
-POINTER    WXCURSOR_SIZING         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\size.ptr"
-POINTER    WXCURSOR_ROLLER         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\roller.ptr"
-POINTER    WXCURSOR_PBRUSH         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pbrush.ptr"
-POINTER    WXCURSOR_PLEFT          LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pntleft.ptr"
-POINTER    WXCURSOR_PRIGHT         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\pntright.ptr"
-POINTER    WXCURSOR_QARROW         LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\query.ptr"
-POINTER    WXCURSOR_BLANK          LOADONCALL    "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\blank.ptr"
-
-/*
-//////////////////////////////////////////////////////////////////////////////
-// Default Icons
-//////////////////////////////////////////////////////////////////////////////
-*/
-/* Standard icons */
-ICON       wxICON_TIP                    PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\tip.ico"
-
-ICON       wxICON_SMALL_CLOSED_FOLDER    PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\folder1.ico"
-ICON       wxICON_SMALL_OPEN_FOLDER      PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\folder2.ico"
-ICON       wxICON_SMALL_FILE             PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\file.ico"
-ICON       wxICON_SMALL_COMPUTER         PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\computer.ico"
-ICON       wxICON_SMALL_DRIVE            PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\drive.ico"
-ICON       wxICON_SMALL_CDROM            PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\cdrom.ico"
-ICON       wxICON_SMALL_FLOPPY           PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\floppy.ico"
-ICON       wxICON_SMALL_REMOVEABLE       PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\removble.ico"
-ICON       wxICON_SMALL_ERROR            PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\error.ico"
-ICON       wxICON_SMALL_INFO             PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\info.ico"
-ICON       wxICON_SMALL_WARNING          PRELOAD "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\warning.ico"
-
-/*
-//////////////////////////////////////////////////////////////////////////////
-// Bitmaps
-//////////////////////////////////////////////////////////////////////////////
-*/
-BITMAP     wxDISABLE_BUTTON_BITMAP   LOADONCALL   "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\disable.bmp"
-
-/*
-// For src/generic/proplist.cpp
-*/
-BITMAP     wxTICK_BITMAP              LOADONCALL  "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\tick.bmp"
-BITMAP     wxCROSS_BITMAP             LOADONCALL  "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\cross.bmp"
-
-/*
-// For kContextHelpButton
-*/
-BITMAP     wxCSQUERY_BITMAP           LOADONCALL  "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\csquery.bmp"
-
-/*
-// For obtaining the RGB values of standard colours
-*/
-BITMAP     wxBITMAP_STD_COLOURS       LOADONCALL  "\\dev\\wx2\\wxwindows\\include\\wx\\os2\\colours.bmp"
-
-RCINCLUDE \Dev\Wx2\WxWindows\INCLUDE\WX\OS2\WX.DLG
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/wx.res b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/wx.res
deleted file mode 100644
index 25c2e20f51..0000000000
Binary files a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/wx.res and /dev/null differ
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/wxrsc.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/wxrsc.h
deleted file mode 100644
index e87843d15f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/os2/wxrsc.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-// Pointer ID's
-*/
-#define WXCURSOR_HAND                100
-#define WXCURSOR_BULLSEYE            101
-#define WXCURSOR_PENCIL              102
-#define WXCURSOR_MAGNIFIER           103
-#define WXCURSOR_NO_ENTRY            104
-#define WXCURSOR_SIZING              105
-#define WXCURSOR_ROLLER              106
-#define WXCURSOR_WATCH               107
-#define WXCURSOR_PBRUSH              108
-#define WXCURSOR_PLEFT               109
-#define WXCURSOR_PRIGHT              110
-#define WXCURSOR_QARROW              111
-#define WXCURSOR_BLANK               112
-
-/*
-// Icon Ids
-*/
-#define wxICON_TIP                   113
-#define wxICON_SMALL_CLOSED_FOLDER   114
-#define wxICON_SMALL_OPEN_FOLDER     115
-#define wxICON_SMALL_FILE            116
-#define wxICON_SMALL_COMPUTER        117
-#define wxICON_SMALL_DRIVE           118
-#define wxICON_SMALL_CDROM           119
-#define wxICON_SMALL_FLOPPY          120
-#define wxICON_SMALL_REMOVEABLE      121
-#define wxICON_SMALL_ERROR           122
-#define wxICON_SMALL_INFO            123
-#define wxICON_SMALL_WARNING         124
-
-/*
-// Bitmap Ids
-*/
-#define wxDISABLE_BUTTON_BITMAP      125
-#define wxTICK_BITMAP                126
-#define wxCROSS_BITMAP               127
-#define wxCSQUERY_BITMAP             128
-#define wxBITMAP_STD_COLOURS         129
-
-/*
-// Dialog Ids -- must match enums in Toplevel.cpp
-*/
-#define ID_RESIZEABLEDIALOG          130
-#define ID_CAPTIONDIALOG             131
-#define ID_NOCAPTIONDIALOG           132
-
-#define ID_WINDOW_MENU               133
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/accel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/accel.h
deleted file mode 100644
index a6690acf5f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/accel.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/accel.h
-// Purpose:     wxAcceleratorTable class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_ACCEL_H_
-#define _WX_ACCEL_H_
-
-#include "wx/string.h"
-#include "wx/event.h"
-
-class WXDLLIMPEXP_CORE wxAcceleratorTable: public wxObject
-{
-DECLARE_DYNAMIC_CLASS(wxAcceleratorTable)
-public:
-    wxAcceleratorTable();
-    wxAcceleratorTable(int n, const wxAcceleratorEntry entries[]); // Load from array
-
-    virtual ~wxAcceleratorTable();
-
-    bool Ok() const { return IsOk(); }
-    bool IsOk() const;
-
-    int GetCommand( wxKeyEvent &event );
-};
-
-#endif
-    // _WX_ACCEL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/anybutton.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/anybutton.h
deleted file mode 100644
index ffa28dfb6c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/anybutton.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        anybutton.h
-// Purpose:     wxAnyButton class
-// Author:      Stefan Csomor
-// Created:     1998-01-01 (extracted from button.h)
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_ANYBUTTON_H_
-#define _WX_OSX_ANYBUTTON_H_
-
-// Any button
-class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase
-{
-public:
-    wxAnyButton() {}
-
-    static wxSize GetDefaultSize();
-
-    virtual void SetLabel(const wxString& label);
-
-protected:
-    virtual wxSize DoGetBestSize() const ;
-
-    void OnEnterWindow( wxMouseEvent& event);
-    void OnLeaveWindow( wxMouseEvent& event);
-
-    virtual wxBitmap DoGetBitmap(State which) const;
-    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
-    virtual void DoSetBitmapPosition(wxDirection dir);
-
-    virtual void DoSetBitmapMargins(int x, int y)
-    {
-        m_marginX = x;
-        m_marginY = y;
-        InvalidateBestSize();
-    }
-
-#if wxUSE_MARKUP && wxOSX_USE_COCOA
-    virtual bool DoSetLabelMarkup(const wxString& markup);
-#endif // wxUSE_MARKUP && wxOSX_USE_COCOA
-
-
-    // the margins around the bitmap
-    int m_marginX;
-    int m_marginY;
-
-    // the bitmaps for the different state of the buttons, all of them may be
-    // invalid and the button only shows a bitmap at all if State_Normal bitmap
-    // is valid
-    wxBitmap m_bitmaps[State_Max];
-
-    wxDECLARE_NO_COPY_CLASS(wxAnyButton);
-    DECLARE_EVENT_TABLE()
-};
-
-#endif // _WX_OSX_ANYBUTTON_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/app.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/app.h
deleted file mode 100644
index 0d74d5fa76..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/app.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/app.h
-// Purpose:     wxApp class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_APP_H_
-#define _WX_APP_H_
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/gdicmn.h"
-#include "wx/event.h"
-
-class WXDLLIMPEXP_FWD_CORE wxFrame;
-class WXDLLIMPEXP_FWD_CORE wxWindowMac;
-class WXDLLIMPEXP_FWD_CORE wxApp ;
-class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
-class WXDLLIMPEXP_FWD_BASE wxLog;
-class WXDLLIMPEXP_FWD_CORE wxMacAutoreleasePool;
-
-// Force an exit from main loop
-void WXDLLIMPEXP_CORE wxExit();
-
-// Yield to other apps/messages
-bool WXDLLIMPEXP_CORE wxYield();
-
-// Represents the application. Derive OnInit and declare
-// a new App object to start application
-class WXDLLIMPEXP_CORE wxApp: public wxAppBase
-{
-    DECLARE_DYNAMIC_CLASS(wxApp)
-
-    wxApp();
-    virtual ~wxApp();
-
-    virtual void WakeUpIdle();
-
-    virtual void SetPrintMode(int mode) { m_printMode = mode; }
-    virtual int GetPrintMode() const { return m_printMode; }
-
-    // calling OnInit with an auto-release pool ready ...
-    virtual bool CallOnInit();
-#if wxUSE_GUI
-    // setting up all MacOS Specific Event-Handlers etc
-    virtual bool OnInitGui();
-#endif // wxUSE_GUI
-
-    virtual int OnRun();
-
-    virtual bool ProcessIdle();
-
-    // implementation only
-    void OnIdle(wxIdleEvent& event);
-    void OnEndSession(wxCloseEvent& event);
-    void OnQueryEndSession(wxCloseEvent& event);
-
-protected:
-    int                   m_printMode; // wxPRINT_WINDOWS, wxPRINT_POSTSCRIPT
-    wxMacAutoreleasePool* m_macPool;
-
-public:
-
-    static bool           sm_isEmbedded;
-    // Implementation
-    virtual bool Initialize(int& argc, wxChar **argv);
-    virtual void CleanUp();
-
-    // the installed application event handler
-    WXEVENTHANDLERREF    MacGetEventHandler() { return m_macEventHandler ; }
-    WXEVENTHANDLERREF    MacGetCurrentEventHandlerCallRef() { return m_macCurrentEventHandlerCallRef ; }
-    void MacSetCurrentEvent( WXEVENTREF event , WXEVENTHANDLERCALLREF handler )
-    { m_macCurrentEvent = event ; m_macCurrentEventHandlerCallRef = handler ; }
-
-    // adding a CFType object to be released only at the end of the current event cycle (increases the
-    // refcount of the object passed), needed in case we are in the middle of an event concering an object
-    // we want to delete and cannot do it immediately
-    // TODO change semantics to be in line with cocoa (make autrelease NOT increase the count)
-    void                  MacAddToAutorelease( void* cfrefobj );
-    void                  MacReleaseAutoreleasePool();
-    
-public:
-    static wxWindow*      s_captureWindow ;
-    static long           s_lastModifiers ;
-
-    int                   m_nCmdShow;
-
-    // mac specifics
-protected:
-#if wxOSX_USE_COCOA
-    // override for support of custom app controllers
-    virtual WX_NSObject   OSXCreateAppController();
-#endif
-    
-private:
-    virtual bool        DoInitGui();
-    virtual void        DoCleanUp();
-
-    WXEVENTHANDLERREF     m_macEventHandler ;
-    WXEVENTHANDLERCALLREF m_macCurrentEventHandlerCallRef ;
-    WXEVENTREF            m_macCurrentEvent ;
-
-public:
-    static long           s_macAboutMenuItemId ;
-    static long           s_macPreferencesMenuItemId ;
-    static long           s_macExitMenuItemId ;
-    static wxString       s_macHelpMenuTitleName ;
-
-    WXEVENTREF            MacGetCurrentEvent() { return m_macCurrentEvent ; }
-
-    // For embedded use. By default does nothing.
-    virtual void          MacHandleUnhandledEvent( WXEVENTREF ev );
-
-    bool    MacSendKeyDownEvent( wxWindow* focus , long keyval , long modifiers , long when , wxChar uniChar ) ;
-    bool    MacSendKeyUpEvent( wxWindow* focus , long keyval , long modifiers , long when , wxChar uniChar ) ;
-    bool    MacSendCharEvent( wxWindow* focus , long keymessage , long modifiers , long when , wxChar uniChar ) ;
-    void    MacCreateKeyEvent( wxKeyEvent& event, wxWindow* focus , long keymessage , long modifiers , long when , wxChar uniChar ) ;
-#if wxOSX_USE_CARBON
-    // we only have applescript on these
-    virtual short         MacHandleAEODoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
-    virtual short         MacHandleAEGURL(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
-    virtual short         MacHandleAEPDoc(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
-    virtual short         MacHandleAEOApp(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
-    virtual short         MacHandleAEQuit(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
-    virtual short         MacHandleAERApp(const WXAPPLEEVENTREF event , WXAPPLEEVENTREF reply) ;
-#endif
-    // in response of an openFiles message with Cocoa and an
-    // open-document apple event
-    virtual void         MacOpenFiles(const wxArrayString &fileNames) ;
-    // called by MacOpenFiles for each file.
-    virtual void         MacOpenFile(const wxString &fileName) ;
-    // in response of a get-url apple event
-    virtual void         MacOpenURL(const wxString &url) ;
-    // in response of a print-document apple event
-    virtual void         MacPrintFiles(const wxArrayString &fileNames) ;
-    // called by MacPrintFiles for each file
-    virtual void         MacPrintFile(const wxString &fileName) ;
-    // in response of a open-application apple event
-    virtual void         MacNewFile() ;
-    // in response of a reopen-application apple event
-    virtual void         MacReopenApp() ;
-
-    // Notice that this is just a placeholder and doesn't work yet!
-    //
-    // Override this to return false from a non-bundled console app in order to
-    // stay in background instead of being made a foreground application as
-    // happens by default.
-    virtual bool         OSXIsGUIApplication() { return true; }
-
-#if wxOSX_USE_COCOA_OR_IPHONE
-    // immediately before the native event loop launches
-    virtual void         OSXOnWillFinishLaunching();
-    // immediately when the native event loop starts, no events have been served yet
-    virtual void         OSXOnDidFinishLaunching();
-    // OS asks to terminate app, return no to stay running
-    virtual bool         OSXOnShouldTerminate();
-    // before application terminates
-    virtual void         OSXOnWillTerminate();
-
-private:
-    bool                m_onInitResult;
-    bool                m_inited;
-    wxArrayString       m_openFiles;
-    wxArrayString       m_printFiles;
-    wxString            m_getURL;
-    
-public:
-    bool                OSXInitWasCalled() { return m_inited; }
-    void                OSXStoreOpenFiles(const wxArrayString &files ) { m_openFiles = files ; }
-    void                OSXStorePrintFiles(const wxArrayString &files ) { m_printFiles = files ; }
-    void                OSXStoreOpenURL(const wxString &url ) { m_getURL = url ; }
-#endif
-    
-    // Hide the application windows the same as the system hide command would do it.
-    void MacHideApp();
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
-    // _WX_APP_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/bitmap.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/bitmap.h
deleted file mode 100644
index 8f51d7678f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/bitmap.h
+++ /dev/null
@@ -1,213 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/bitmap.h
-// Purpose:     wxBitmap class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BITMAP_H_
-#define _WX_BITMAP_H_
-
-#include "wx/palette.h"
-
-// Bitmap
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class wxBitmapRefData ;
-class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
-class WXDLLIMPEXP_FWD_CORE wxControl;
-class WXDLLIMPEXP_FWD_CORE wxCursor;
-class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLIMPEXP_FWD_CORE wxIcon;
-class WXDLLIMPEXP_FWD_CORE wxImage;
-class WXDLLIMPEXP_FWD_CORE wxPixelDataBase;
-
-// A mask is a bitmap used for drawing bitmaps
-// Internally it is stored as a 8 bit deep memory chunk, 0 = black means the source will be drawn
-// 255 = white means the source will not be drawn, no other values will be present
-// 8 bit is chosen only for performance reasons, note also that this is the inverse value range
-// from alpha, where 0 = invisible , 255 = fully drawn
-
-class WXDLLIMPEXP_CORE wxMask: public wxObject
-{
-    DECLARE_DYNAMIC_CLASS(wxMask)
-
-public:
-    wxMask();
-
-    // Copy constructor
-    wxMask(const wxMask& mask);
-
-    // Construct a mask from a bitmap and a colour indicating
-    // the transparent area
-    wxMask(const wxBitmap& bitmap, const wxColour& colour);
-
-    // Construct a mask from a mono bitmap (black meaning show pixels, white meaning transparent)
-    wxMask(const wxBitmap& bitmap);
-
-    // implementation helper only : construct a mask from a 32 bit memory buffer
-    wxMask(const wxMemoryBuffer& buf, int width , int height , int bytesPerRow ) ;
-
-    virtual ~wxMask();
-
-    bool Create(const wxBitmap& bitmap, const wxColour& colour);
-    bool Create(const wxBitmap& bitmap);
-    bool Create(const wxMemoryBuffer& buf, int width , int height , int bytesPerRow ) ;
-
-    wxBitmap GetBitmap() const;
-
-    // Implementation below
-
-    void Init() ;
-
-    // a 8 bit depth mask
-    void* GetRawAccess() const;
-    int GetBytesPerRow() const { return m_bytesPerRow ; }
-    // renders/updates native representation when necessary
-    void RealizeNative() ;
-
-    WXHBITMAP GetHBITMAP() const ;
-
-
-private:
-    wxMemoryBuffer m_memBuf ;
-    int m_bytesPerRow ;
-    int m_width ;
-    int m_height ;
-
-    WXHBITMAP m_maskBitmap ;
-
-};
-
-class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
-{
-    DECLARE_DYNAMIC_CLASS(wxBitmap)
-
-    friend class WXDLLIMPEXP_FWD_CORE wxBitmapHandler;
-
-public:
-    wxBitmap() {} // Platform-specific
-
-    // Initialize with raw data.
-    wxBitmap(const char bits[], int width, int height, int depth = 1);
-
-    // Initialize with XPM data
-    wxBitmap(const char* const* bits);
-
-    // Load a file or resource
-    wxBitmap(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
-
-    // Constructor for generalised creation from data
-    wxBitmap(const void* data, wxBitmapType type, int width, int height, int depth = 1);
-    
-    // creates an bitmap from the native image format
-    wxBitmap(CGImageRef image, double scale = 1.0);
-    wxBitmap(WX_NSImage image);
-    wxBitmap(CGContextRef bitmapcontext);
-
-    // Create a bitmap compatible with the given DC
-    wxBitmap(int width, int height, const wxDC& dc);
-    
-    // If depth is omitted, will create a bitmap compatible with the display
-    wxBitmap(int width, int height, int depth = -1) { (void)Create(width, height, depth); }
-    wxBitmap(const wxSize& sz, int depth = -1) { (void)Create(sz, depth); }
-
-    // Convert from wxImage:
-    wxBitmap(const wxImage& image, int depth = -1, double scale = 1.0);
-
-    // Convert from wxIcon
-    wxBitmap(const wxIcon& icon) { CopyFromIcon(icon); }
-
-    virtual ~wxBitmap() {}
-
-    wxImage ConvertToImage() const;
-
-    // get the given part of bitmap
-    wxBitmap GetSubBitmap( const wxRect& rect ) const;
-
-    virtual bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
-    virtual bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
-        { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
-
-    virtual bool Create(const void* data, wxBitmapType type, int width, int height, int depth = 1);
-    bool Create( CGImageRef image, double scale = 1.0 );
-    bool Create( WX_NSImage image );
-    bool Create( CGContextRef bitmapcontext);
-    
-    // Create a bitmap compatible with the given DC, inheriting its magnification factor
-    bool Create(int width, int height, const wxDC& dc);
-
-    // Create a bitmap with a scale factor, width and height are multiplied with that factor
-    bool CreateScaled(int logwidth, int logheight, int depth, double logicalScale);
-    
-    // virtual bool Create( WXHICON icon) ;
-    virtual bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE);
-    virtual bool SaveFile(const wxString& name, wxBitmapType type, const wxPalette *cmap = NULL) const;
-
-    wxBitmapRefData *GetBitmapData() const
-        { return (wxBitmapRefData *)m_refData; }
-
-    // copies the contents and mask of the given (colour) icon to the bitmap
-    virtual bool CopyFromIcon(const wxIcon& icon);
-
-    int GetWidth() const;
-    int GetHeight() const;
-    int GetDepth() const;
-    void SetWidth(int w);
-    void SetHeight(int h);
-    void SetDepth(int d);
-    void SetOk(bool isOk);
-
-#if wxUSE_PALETTE
-    wxPalette* GetPalette() const;
-    void SetPalette(const wxPalette& palette);
-#endif // wxUSE_PALETTE
-
-    wxMask *GetMask() const;
-    void SetMask(wxMask *mask) ;
-
-    static void InitStandardHandlers();
-
-    // raw bitmap access support functions, for internal use only
-    void *GetRawData(wxPixelDataBase& data, int bpp);
-    void UngetRawData(wxPixelDataBase& data);
-
-    // these functions are internal and shouldn't be used, they risk to
-    // disappear in the future
-    bool HasAlpha() const;
-    void UseAlpha();
-
-    // returns the 'native' implementation, a GWorldPtr for the content and one for the mask
-    WXHBITMAP GetHBITMAP( WXHBITMAP * mask = NULL ) const;
-
-    // returns a CGImageRef which must released after usage with CGImageRelease
-    CGImageRef CreateCGImage() const ;
-
-#if wxOSX_USE_COCOA
-    // returns an autoreleased version of the image
-    WX_NSImage GetNSImage() const;
-#endif
-#if wxOSX_USE_IPHONE
-    // returns an autoreleased version of the image
-    WX_UIImage GetUIImage() const;
-#endif
-    // returns a IconRef which must be retained before and released after usage
-    IconRef GetIconRef() const;
-    // returns a IconRef which must be released after usage
-    IconRef CreateIconRef() const;
-    // get read only access to the underlying buffer
-    void *GetRawAccess() const ;
-    // brackets to the underlying OS structure for read/write access
-    // makes sure that no cached images will be constructed until terminated
-    void *BeginRawAccess() ;
-    void EndRawAccess() ;
-
-    double GetScaleFactor() const;
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-};
-
-#endif // _WX_BITMAP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/bmpbuttn.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/bmpbuttn.h
deleted file mode 100644
index 4a045fe0b6..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/bmpbuttn.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/bmpbuttn.h
-// Purpose:     wxBitmapButton class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_BMPBUTTN_H_
-#define _WX_OSX_BMPBUTTN_H_
-
-#include "wx/button.h"
-
-#define wxDEFAULT_BUTTON_MARGIN 4
-
-class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase
-{
-public:
-    wxBitmapButton()
-        {
-            SetMargins(wxDEFAULT_BUTTON_MARGIN, wxDEFAULT_BUTTON_MARGIN);
-        }
-
-    wxBitmapButton(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
-                   const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxButtonNameStr)
-        {
-            Create(parent, id, bitmap, pos, size, style, validator, name);
-        }
-
-    bool Create(wxWindow *parent, wxWindowID id, const wxBitmap& bitmap,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize, long style = wxBU_AUTODRAW,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr);
-
-protected:
-
-    virtual wxSize DoGetBestSize() const;
-
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
-};
-
-#endif // _WX_OSX_BMPBUTTN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/brush.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/brush.h
deleted file mode 100644
index dc04a09b3d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/brush.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/brush.h
-// Purpose:     wxBrush class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BRUSH_H_
-#define _WX_BRUSH_H_
-
-#include "wx/gdicmn.h"
-#include "wx/gdiobj.h"
-#include "wx/bitmap.h"
-
-class WXDLLIMPEXP_FWD_CORE wxBrush;
-
-// Brush
-class WXDLLIMPEXP_CORE wxBrush: public wxBrushBase
-{
-public:
-    wxBrush();
-    wxBrush(const wxColour& col, wxBrushStyle style = wxBRUSHSTYLE_SOLID);
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
-#endif
-    wxBrush(const wxBitmap& stipple);
-    virtual ~wxBrush();
-
-    virtual void SetColour(const wxColour& col) ;
-    virtual void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
-    virtual void SetStyle(wxBrushStyle style)  ;
-    virtual void SetStipple(const wxBitmap& stipple)  ;
-
-    bool operator==(const wxBrush& brush) const;
-    bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
-
-    wxColour GetColour() const;
-    wxBrushStyle GetStyle() const ;
-    wxBitmap *GetStipple() const ;
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
-        { SetStyle((wxBrushStyle)style); }
-#endif
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxBrush)
-};
-
-#endif // _WX_BRUSH_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/button.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/button.h
deleted file mode 100644
index 8e8752288c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/button.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/button.h
-// Purpose:     wxButton class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_BUTTON_H_
-#define _WX_OSX_BUTTON_H_
-
-#include "wx/control.h"
-#include "wx/gdicmn.h"
-
-// Pushbutton
-class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
-{
-public:
-    wxButton() {}
-    wxButton(wxWindow *parent,
-             wxWindowID id,
-             const wxString& label = wxEmptyString,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = 0,
-             const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxButtonNameStr)
-    {
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& label = wxEmptyString,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr);
-
-    virtual void SetLabel(const wxString& label);
-    virtual wxWindow *SetDefault();
-    virtual void Command(wxCommandEvent& event);
-
-    // osx specific event handling common for all osx-ports
-
-    virtual bool        OSXHandleClicked( double timestampsec );
-
-#if wxOSX_USE_COCOA
-    void OSXUpdateAfterLabelChange(const wxString& label);
-#endif
-
-protected:
-    DECLARE_DYNAMIC_CLASS(wxButton)
-};
-
-// OS X specific class, not part of public wx API
-class WXDLLIMPEXP_CORE wxDisclosureTriangle : public wxControl
-{
-public:
-    wxDisclosureTriangle(wxWindow *parent,
-             wxWindowID id,
-             const wxString& label = wxEmptyString,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = wxBORDER_NONE,
-             const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxButtonNameStr)
-    {
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& label = wxEmptyString,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxBORDER_NONE,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr);
-
-    void SetOpen( bool open );
-    bool IsOpen() const;
-
-    // osx specific event handling common for all osx-ports
-
-    virtual bool        OSXHandleClicked( double timestampsec );
-
-protected:
-    virtual wxSize DoGetBestSize() const ;
-};
-
-#endif // _WX_OSX_BUTTON_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/chkconf.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/chkconf.h
deleted file mode 100644
index 9c6bc30508..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/chkconf.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Name:        wx/osx/carbon/chkconf.h
- * Purpose:     Compiler-specific configuration checking
- * Author:      Julian Smart
- * Modified by:
- * Created:     01/02/97
- * Copyright:   (c) Julian Smart
- * Licence:     wxWindows licence
- */
-
-#ifndef _WX_OSX_CARBON_CHKCONF_H_
-#define _WX_OSX_CARBON_CHKCONF_H_
-
-/*
- * native (1) or emulated (0) toolbar
- * also support old notation wxMAC_USE_NATIVE_TOOLBAR
- */
-
-
-
-#ifdef wxMAC_USE_NATIVE_TOOLBAR
-    #define wxOSX_USE_NATIVE_TOOLBAR wxMAC_USE_NATIVE_TOOLBAR
-#endif
-
-#ifndef wxOSX_USE_NATIVE_TOOLBAR
-    #define wxOSX_USE_NATIVE_TOOLBAR 1
-#endif
-
-/*
- * text rendering system
- */
-
-#define wxOSX_USE_ATSU_TEXT 1
-
-/*
- * Audio System
- */
-
-#define wxOSX_USE_QUICKTIME 1
-#define wxOSX_USE_AUDIOTOOLBOX 0
-
-#endif
-    /* _WX_OSX_CARBON_CHKCONF_H_ */
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/dataview.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/dataview.h
deleted file mode 100644
index 75185b092c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/dataview.h
+++ /dev/null
@@ -1,478 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/carbon/dataview.h
-// Purpose:     wxDataViewCtrl native implementation header for carbon
-// Author:
-// Copyright:   (c) 2009
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DATAVIEWCTRL_CARBON_H_
-#define _WX_DATAVIEWCTRL_CARBON_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_GUI
-
-#include "wx/osx/core/dataview.h"
-#include "wx/osx/private.h"
-
-// ============================================================================
-// wxDataViewColumnNativeData
-// ============================================================================
-class wxDataViewColumnNativeData
-{
-public:
-//
-// constructors / destructor
-//
-  wxDataViewColumnNativeData()
-  {
-  }
-  wxDataViewColumnNativeData(DataBrowserPropertyID initPropertyID)
-                            :m_PropertyID(initPropertyID)
-  {
-  }
-
-//
-// data access methods
-//
-  DataBrowserPropertyID GetPropertyID() const
-  {
-    return m_PropertyID;
-  }
-
-  void SetPropertyID(DataBrowserPropertyID newPropertyID)
-  {
-    m_PropertyID = newPropertyID;
-  }
-
-protected:
-private:
-//
-// variables
-//
-  DataBrowserPropertyID m_PropertyID; // each column is identified by its unique property ID (NOT by the column's index)
-};
-
-// ============================================================================
-// wxDataViewRendererNativeData
-// ============================================================================
-class wxDataViewRendererNativeData
-{
-public:
-//
-// constructors / destructor
-//
-  wxDataViewRendererNativeData()
-  {
-  }
-  wxDataViewRendererNativeData(DataBrowserPropertyType initPropertyType, DataBrowserItemDataRef initItemDataRef=NULL)
-                              :m_ItemDataRef(initItemDataRef), m_PropertyType(initPropertyType)
-  {
-  }
-
-//
-// data access methods
-//
-  DataBrowserItemDataRef GetItemDataRef() const
-  {
-    return m_ItemDataRef;
-  }
-  DataBrowserPropertyType GetPropertyType() const
-  {
-    return m_PropertyType;
-  }
-
-  void SetItemDataRef(DataBrowserItemDataRef newItemDataRef)
-  {
-    m_ItemDataRef = newItemDataRef;
-  }
-  void SetPropertyType(DataBrowserPropertyType newPropertyType)
-  {
-    m_PropertyType = newPropertyType;
-  }
-
-protected:
-private:
-//
-// variables
-//
-  DataBrowserItemDataRef m_ItemDataRef;
-
-  DataBrowserPropertyType m_PropertyType;
-};
-
-// ============================================================================
-// wxMacDataBrowserTableViewControl
-// ============================================================================
-//
-// This is a wrapper class for the Mac OS X data browser environment.
-// It covers all data brower functionality for the native browser's list
-// and column style.
-//
-
-// data browser's property IDs have a reserved ID range from 0 - 1023
-// therefore, the first usable property ID is 'kMinPropertyID'
-DataBrowserPropertyID const kMinPropertyID = 1024;
-
-// array of data browser item IDs
-WX_DEFINE_ARRAY_SIZE_T(size_t,wxArrayDataBrowserItemID);
-
-class wxMacDataBrowserTableViewControl : public wxMacControl
-{
-public:
-//
-// constructors / destructor
-//
-  wxMacDataBrowserTableViewControl(wxWindow* peer, const wxPoint& pos, const wxSize& size, long style);
-  wxMacDataBrowserTableViewControl()
-  {
-  }
-  ~wxMacDataBrowserTableViewControl();
-
-//
-// callback handling
-//
-  OSStatus SetCallbacks      (DataBrowserCallbacks const*       callbacks);
-  OSStatus SetCustomCallbacks(DataBrowserCustomCallbacks const* customCallbacks);
-
-//
-// DnD handling
-//
-  OSStatus EnableAutomaticDragTracking(bool enable=true);
-
-//
-// header handling
-//
-  OSStatus GetHeaderDesc(DataBrowserPropertyID property, DataBrowserListViewHeaderDesc* desc) const;
-
-  OSStatus SetHeaderDesc(DataBrowserPropertyID property, DataBrowserListViewHeaderDesc* desc);
-
-//
-// layout handling
-//
-  OSStatus AutoSizeColumns();
-
-  OSStatus EnableCellSizeModification(bool enableHeight=true, bool enableWidth=true); // enables or disables the column width and row height modification (default: false)
-
-  OSStatus GetAttributes        (OptionBits* attributes);
-  OSStatus GetColumnWidth       (DataBrowserPropertyID column, UInt16 *width ) const; // returns the column width in pixels
-  OSStatus GetDefaultColumnWidth(UInt16 *width ) const; // returns the default column width in pixels
-  OSStatus GetDefaultRowHeight  (UInt16 * height ) const;
-  OSStatus GetHeaderButtonHeight(UInt16 *height );
-  OSStatus GetPartBounds        (DataBrowserItemID item, DataBrowserPropertyID property, DataBrowserPropertyPart part, Rect* bounds);
-  OSStatus GetRowHeight         (DataBrowserItemID item , UInt16 *height) const;
-  OSStatus GetScrollPosition    (UInt32* top, UInt32 *left) const;
-
-  OSStatus SetAttributes (OptionBits attributes);
-  OSStatus SetColumnWidth(DataBrowserPropertyID column, UInt16 width); // sets the column width in pixels
-  OSStatus SetDefaultColumnWidth( UInt16 width );
-  OSStatus SetDefaultRowHeight( UInt16 height );
-  OSStatus SetHasScrollBars( bool horiz, bool vert );
-  OSStatus SetHeaderButtonHeight( UInt16 height );
-  OSStatus SetHiliteStyle(DataBrowserTableViewHiliteStyle hiliteStyle);
-  OSStatus SetIndent(float Indent);
-  OSStatus SetItemRowHeight( DataBrowserItemID item , UInt16 height);
-  OSStatus SetScrollPosition( UInt32 top , UInt32 left );
-
-//
-// column handling
-//
-  OSStatus GetColumnCount   (UInt32* numColumns) const;
-  OSStatus GetColumnIndex   (DataBrowserPropertyID propertyID, DataBrowserTableViewColumnIndex* index) const; // returns for the passed property the corresponding column index
-  OSStatus GetFreePropertyID(DataBrowserPropertyID* propertyID) const; // this method returns a property id that is valid and currently not used; if it cannot be found 'errDataBrowerPropertyNotSupported' is returned
-  OSStatus GetPropertyFlags (DataBrowserPropertyID propertyID, DataBrowserPropertyFlags *flags ) const;
-  OSStatus GetPropertyID    (DataBrowserItemDataRef itemData, DataBrowserPropertyID* propertyID) const; // returns for the passed item data reference the corresponding property ID
-  OSStatus GetPropertyID    (DataBrowserTableViewColumnIndex index, DataBrowserPropertyID* propertyID) const; // returns for the passed column index the corresponding property ID
-
-  OSStatus IsUsedPropertyID(DataBrowserPropertyID propertyID) const; // checks if passed property id is used by the control; no error is returned if the id exists
-
-  OSStatus RemoveColumnByProperty(DataBrowserTableViewColumnID propertyID);
-  OSStatus RemoveColumnByIndex   (DataBrowserTableViewColumnIndex index);
-
-  OSStatus SetColumnIndex     (DataBrowserPropertyID propertyID, DataBrowserTableViewColumnIndex index);
-  OSStatus SetDisclosureColumn(DataBrowserPropertyID propertyID, Boolean expandableRows=false);
-  OSStatus SetPropertyFlags   (DataBrowserPropertyID propertyID, DataBrowserPropertyFlags flags);
-
-//
-// item handling
-//
-  OSStatus AddItem(DataBrowserItemID container, DataBrowserItemID const* itemID) // adds a single item
-  {
-    return AddItems(container,1,itemID,kDataBrowserItemNoProperty);
-  }
-  OSStatus AddItems(DataBrowserItemID container, UInt32 numItems, DataBrowserItemID const* items, DataBrowserPropertyID preSortProperty); // adds items to the data browser
-
-  OSStatus GetFreeItemID(DataBrowserItemID* id) const; // this method returns an item id that is valid and currently not used; if it cannot be found 'errDataBrowserItemNotAdded' is returned
-  OSStatus GetItemCount (ItemCount* numItems) const
-  {
-    return GetItemCount(kDataBrowserNoItem,true,kDataBrowserItemAnyState,numItems);
-  }
-  OSStatus GetItemCount (DataBrowserItemID container, Boolean recurse, DataBrowserItemState state, ItemCount* numItems) const;
-  OSStatus GetItemID    (DataBrowserTableViewRowIndex row, DataBrowserItemID* item) const;
-  OSStatus GetItems     (DataBrowserItemID container, Boolean recurse, DataBrowserItemState state, Handle items) const;
-  OSStatus GetItemRow   (DataBrowserItemID item, DataBrowserTableViewRowIndex* row) const;
-  OSStatus GetItemState (DataBrowserItemID item, DataBrowserItemState* state) const;
-
-  OSStatus IsUsedItemID(DataBrowserItemID itemID) const; // checks if the passed id is in use
-
-  OSStatus RevealItem(DataBrowserItemID item, DataBrowserPropertyID propertyID, DataBrowserRevealOptions options) const;
-
-  OSStatus RemoveItem(DataBrowserItemID container, DataBrowserItemID const* itemID) // removes a single item
-  {
-    return RemoveItems(container,1,itemID,kDataBrowserItemNoProperty);
-  }
-  OSStatus RemoveItems(void) // removes all items
-  {
-    return RemoveItems(kDataBrowserNoItem,0,NULL,kDataBrowserItemNoProperty);
-  }
-  OSStatus RemoveItems(DataBrowserItemID container, UInt32 numItems, DataBrowserItemID const* items, DataBrowserPropertyID preSortProperty);
-
-  OSStatus UpdateItem(DataBrowserItemID container, DataBrowserItemID const* item) // updates all columns of the passed item
-  {
-    return UpdateItems(container,1,item,kDataBrowserItemNoProperty,kDataBrowserItemNoProperty);
-  }
-  OSStatus UpdateItems(void) // updates all items
-  {
-    return UpdateItems(kDataBrowserNoItem,0,NULL,kDataBrowserItemNoProperty,kDataBrowserItemNoProperty);
-  }
-  OSStatus UpdateItems(DataBrowserItemID container, UInt32 numItems, DataBrowserItemID const* items, DataBrowserPropertyID preSortProperty, DataBrowserPropertyID propertyID) const;
-
-//
-// item selection
-//
-  size_t   GetSelectedItemIDs(wxArrayDataBrowserItemID& itemIDs) const; // returns the number of selected item and the item IDs in the array
-  OSStatus GetSelectionAnchor(DataBrowserItemID *first, DataBrowserItemID *last) const;
-  OSStatus GetSelectionFlags (DataBrowserSelectionFlags* flags) const;
-
-  bool IsItemSelected(DataBrowserItemID item) const;
-
-  OSStatus SetSelectionFlags(DataBrowserSelectionFlags flags);
-  OSStatus SetSelectedItems (UInt32 numItems, DataBrowserItemID const* itemIDs, DataBrowserSetOption operation);
-
-//
-// item sorting
-//
-  OSStatus GetSortOrder   (DataBrowserSortOrder* order) const;
-  OSStatus GetSortProperty(DataBrowserPropertyID* propertyID) const;
-
-  OSStatus Resort(DataBrowserItemID container=kDataBrowserNoItem, Boolean sortChildren=true);
-
-  OSStatus SetSortOrder   (DataBrowserSortOrder  order);
-  OSStatus SetSortProperty(DataBrowserPropertyID propertyID);
-
-//
-// container handling
-//
-  OSStatus CloseContainer(DataBrowserItemID containerID);
-
-  OSStatus OpenContainer(DataBrowserItemID containerID);
-
-protected :
-//
-// standard callback functions
-//
-  static pascal Boolean  DataBrowserCompareProc          (ControlRef browser, DataBrowserItemID itemOneID, DataBrowserItemID itemTwoID, DataBrowserPropertyID sortProperty);
-  static pascal void     DataBrowserGetContextualMenuProc(ControlRef browser, MenuRef* menu, UInt32* helpType, CFStringRef* helpItemString, AEDesc* selection);
-  static pascal OSStatus DataBrowserGetSetItemDataProc   (ControlRef browser, DataBrowserItemID itemID, DataBrowserPropertyID property, DataBrowserItemDataRef itemData, Boolean getValue);
-  static pascal void     DataBrowserItemNotificationProc (ControlRef browser, DataBrowserItemID itemID, DataBrowserItemNotification message, DataBrowserItemDataRef itemData);
-
-  virtual Boolean  DataBrowserCompareProc          (DataBrowserItemID itemOneID, DataBrowserItemID itemTwoID, DataBrowserPropertyID sortProperty) = 0;
-  virtual void     DataBrowserGetContextualMenuProc(MenuRef* menu, UInt32* helpType, CFStringRef* helpItemString, AEDesc* selection) = 0;
-  virtual OSStatus DataBrowserGetSetItemDataProc   (DataBrowserItemID itemID, DataBrowserPropertyID property, DataBrowserItemDataRef itemData, Boolean getValue) = 0;
-  virtual void     DataBrowserItemNotificationProc (DataBrowserItemID itemID, DataBrowserItemNotification message, DataBrowserItemDataRef itemData) = 0;
-
-//
-// callback functions for customized types
-//
-  static pascal void                      DataBrowserDrawItemProc(ControlRef browser, DataBrowserItemID itemID, DataBrowserPropertyID propertyID, DataBrowserItemState state, Rect const* rectangle, SInt16 bitDepth, Boolean colorDevice);
-  static pascal Boolean                   DataBrowserEditItemProc(ControlRef browser, DataBrowserItemID itemID, DataBrowserPropertyID propertyID, CFStringRef theString, Rect* maxEditTextRect, Boolean* shrinkToFit);
-  static pascal Boolean                   DataBrowserHitTestProc (ControlRef browser, DataBrowserItemID itemID, DataBrowserPropertyID propertyID, Rect const* theRect, Rect const* mouseRect);
-  static pascal DataBrowserTrackingResult DataBrowserTrackingProc(ControlRef browser, DataBrowserItemID itemID, DataBrowserPropertyID propertyID, Rect const* theRect, Point startPt, EventModifiers modifiers);
-
-  virtual void                      DataBrowserDrawItemProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, DataBrowserItemState state, Rect const* rectangle, SInt16 bitDepth, Boolean colorDevice) = 0;
-  virtual Boolean                   DataBrowserEditItemProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, CFStringRef theString, Rect* maxEditTextRect, Boolean* shrinkToFit) = 0;
-  virtual Boolean                   DataBrowserHitTestProc (DataBrowserItemID itemID, DataBrowserPropertyID propertyID, Rect const* theRect, Rect const* mouseRect) = 0;
-  virtual DataBrowserTrackingResult DataBrowserTrackingProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, Rect const* theRect, Point startPt, EventModifiers modifiers) = 0;
-
-//
-// callback functions for drag & drop
-///
-  static pascal Boolean DataBrowserAcceptDragProc (ControlRef browser, DragReference dragRef, DataBrowserItemID itemID);
-  static pascal Boolean DataBrowserAddDragItemProc(ControlRef browser, DragReference dragRef, DataBrowserItemID itemID, ItemReference* itemRef);
-  static pascal Boolean DataBrowserReceiveDragProc(ControlRef browser, DragReference dragRef, DataBrowserItemID itemID);
-
-  virtual Boolean DataBrowserAcceptDragProc (DragReference dragRef, DataBrowserItemID itemID)                         = 0;
-  virtual Boolean DataBrowserAddDragItemProc(DragReference dragRef, DataBrowserItemID itemID, ItemReference* itemRef) = 0;
-  virtual Boolean DataBrowserReceiveDragProc(DragReference dragRef, DataBrowserItemID itemID)                         = 0;
-
-//
-// event handler for hit testing
-///
-  void*  m_macDataViewCtrlEventHandler;
-
-private:
-//
-// wxWidget internal stuff
-//
-    DECLARE_ABSTRACT_CLASS(wxMacDataBrowserTableViewControl)
-};
-
-// ============================================================================
-// wxMacDataBrowserListViewControl
-// ============================================================================
-//
-// This class is a wrapper for the native browser's list view style. It expands
-// the inherited functionality of the table view control class.
-// The term list view is in this case Mac OS X specific and is not related
-// to any wxWidget naming conventions.
-//
-class wxMacDataBrowserListViewControl : public wxMacDataBrowserTableViewControl
-{
-public:
-//
-// constructors / destructor
-//
-  wxMacDataBrowserListViewControl(wxWindow* peer, wxPoint const& pos, wxSize const& size, long style) : wxMacDataBrowserTableViewControl(peer,pos,size,style)
-  {
-  }
-
-//
-// column handling
-//
-  OSStatus AddColumn(DataBrowserListViewColumnDesc *columnDesc, DataBrowserTableViewColumnIndex position);
-
-protected:
-private:
-};
-
-
-// ============================================================================
-// wxMacDataViewDataBrowserListViewControl
-// ============================================================================
-//
-// This is the internal interface class between wxDataViewCtrl (wxWidget) and
-// the native data browser (Mac OS X carbon).
-//
-class wxMacDataViewDataBrowserListViewControl : public wxMacDataBrowserListViewControl, public wxDataViewWidgetImpl
-{
-public:
-//
-// constructors / destructor
-//
-  wxMacDataViewDataBrowserListViewControl(wxWindow* peer, wxPoint const& pos, wxSize const& size, long style);
-
- //
- // column related methods (inherited from wxDataViewWidgetImpl)
- //
-  virtual bool              ClearColumns       ();
-  virtual bool              DeleteColumn       (wxDataViewColumn* columnPtr);
-  virtual void              DoSetExpanderColumn(wxDataViewColumn const* columnPtr);
-  virtual wxDataViewColumn* GetColumn          (unsigned int pos) const;
-  virtual int               GetColumnPosition  (wxDataViewColumn const* columnPtr) const;
-  virtual bool              InsertColumn       (unsigned int pos, wxDataViewColumn* columnPtr);
-  virtual void              FitColumnWidthToContent(unsigned int WXUNUSED(pos)) { /*not implemented*/ }
-
- //
- // item related methods (inherited from wxDataViewWidgetImpl)
- //
-  virtual bool         Add          (wxDataViewItem const& parent, wxDataViewItem const& item);
-  virtual bool         Add          (wxDataViewItem const& parent, wxDataViewItemArray const& items);
-  virtual void         Collapse     (wxDataViewItem const& item);
-  virtual void         EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr);
-  virtual void         Expand       (wxDataViewItem const& item);
-  virtual unsigned int GetCount     () const;
-  virtual wxRect       GetRectangle (wxDataViewItem const& item, wxDataViewColumn const* columnPtr);
-  virtual bool         IsExpanded   (wxDataViewItem const& item) const;
-  virtual bool         Reload       ();
-  virtual bool         Remove       (wxDataViewItem const& parent, wxDataViewItem const& item);
-  virtual bool         Remove       (wxDataViewItem const& parent, wxDataViewItemArray const& item);
-  virtual bool         Update       (wxDataViewColumn const* columnPtr);
-  virtual bool         Update       (wxDataViewItem const& parent, wxDataViewItem const& item);
-  virtual bool         Update       (wxDataViewItem const& parent, wxDataViewItemArray const& items);
-
- //
- // model related methods
- //
-  virtual bool AssociateModel(wxDataViewModel* model);
-
- //
- // selection related methods (inherited from wxDataViewWidgetImpl)
- //
-  virtual wxDataViewItem GetCurrentItem() const;
-  virtual void SetCurrentItem(const wxDataViewItem& item);
-  virtual wxDataViewColumn *GetCurrentColumn() const;
-  virtual int  GetSelectedItemsCount() const;
-  virtual int  GetSelections(wxDataViewItemArray& sel)   const;
-  virtual bool IsSelected   (wxDataViewItem const& item) const;
-  virtual void Select       (wxDataViewItem const& item);
-  virtual void SelectAll    ();
-  virtual void Unselect     (wxDataViewItem const& item);
-  virtual void UnselectAll  ();
-
- //
- // sorting related methods
- //
-  virtual wxDataViewColumn* GetSortingColumn () const;
-  virtual void              Resort           ();
-
- //
- // other methods (inherited from wxDataViewWidgetImpl)
- //
-  virtual void DoSetIndent (int indent);
-  virtual void HitTest     (wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const;
-  virtual void SetRowHeight(wxDataViewItem const& item, unsigned int height);
-  virtual void OnSize      ();
-
-  virtual void StartEditor( const wxDataViewItem & item, unsigned int column );
-
- //
- // other methods
- //
-  wxDataViewCtrl* GetDataViewCtrl() const
-  {
-    return dynamic_cast<wxDataViewCtrl*>(GetWXPeer());
-  }
-
-protected:
-//
-// standard callback functions (inherited from wxMacDataBrowserTableViewControl)
-//
-  virtual Boolean  DataBrowserCompareProc          (DataBrowserItemID itemOneID, DataBrowserItemID itemTwoID, DataBrowserPropertyID sortProperty);
-  virtual void     DataBrowserItemNotificationProc (DataBrowserItemID itemID, DataBrowserItemNotification message, DataBrowserItemDataRef itemData);
-  virtual void     DataBrowserGetContextualMenuProc(MenuRef* menu, UInt32* helpType, CFStringRef* helpItemString, AEDesc* selection);
-  virtual OSStatus DataBrowserGetSetItemDataProc   (DataBrowserItemID itemID, DataBrowserPropertyID propertyID, DataBrowserItemDataRef itemData, Boolean getValue);
-
-//
-// callback functions for customized types (inherited from wxMacDataBrowserTableViewControl)
-//
-  virtual void                      DataBrowserDrawItemProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, DataBrowserItemState state, Rect const* rectangle, SInt16 bitDepth, Boolean colorDevice);
-  virtual Boolean                   DataBrowserEditItemProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, CFStringRef theString, Rect* maxEditTextRect, Boolean* shrinkToFit);
-  virtual Boolean                   DataBrowserHitTestProc (DataBrowserItemID itemID, DataBrowserPropertyID propertyID, Rect const* theRect, Rect const* mouseRect);
-  virtual DataBrowserTrackingResult DataBrowserTrackingProc(DataBrowserItemID itemID, DataBrowserPropertyID propertyID, Rect const* theRect, Point startPt, EventModifiers modifiers);
-
-//
-// callback functions for drag & drop (inherited from wxMacDataBrowserTableViewControl)
-//
-  virtual Boolean DataBrowserAcceptDragProc (DragReference dragRef, DataBrowserItemID itemID);
-  virtual Boolean DataBrowserAddDragItemProc(DragReference dragRef, DataBrowserItemID itemID, ItemReference* itemRef);
-  virtual Boolean DataBrowserReceiveDragProc(DragReference dragRef, DataBrowserItemID itemID);
-
-//
-// drag & drop helper methods
-//
-  wxDataFormat           GetDnDDataFormat(wxDataObjectComposite* dataObjects);
-  wxDataObjectComposite* GetDnDDataObjects(DragReference dragRef, ItemReference itemRef) const; // create the data objects from the native dragged object
-
-//
-// other methods
-//
-  wxDataViewColumn* GetColumnPtr(DataBrowserPropertyID propertyID) const; // returns for the passed property the corresponding pointer to a column; NULL is returned if not found
-
-private:
-};
-
-typedef wxMacDataViewDataBrowserListViewControl* wxMacDataViewDataBrowserListViewControlPointer;
-
-#endif // WX_GUI
-#endif // _WX_MACCARBONDATAVIEWCTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/drawer.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/drawer.h
deleted file mode 100644
index 6edb3921d4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/drawer.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/carbon/drawer.h
-// Purpose:     Drawer child window class.
-//              Drawer windows appear under their parent window and
-//              behave like a drawer, opening and closing to reveal
-//              content that does not need to be visible at all times.
-// Author:      Jason Bagley
-// Modified by:
-// Created:     2004-30-01
-// Copyright:   (c) Jason Bagley; Art & Logic, Inc.
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DRAWERWINDOW_H_
-#define _WX_DRAWERWINDOW_H_
-
-#include "wx/toplevel.h"
-
-//
-// NB:  This is currently a private undocumented class -
-// it is stable, but the API is not and will change in the
-// near future
-//
-
-class WXDLLIMPEXP_ADV wxDrawerWindow : public wxTopLevelWindow
-{
-    DECLARE_DYNAMIC_CLASS(wxDrawerWindow)
-
-public:
-
-    wxDrawerWindow();
-
-    wxDrawerWindow(wxWindow* parent,
-                   wxWindowID id,
-                   const wxString& title,
-                   wxSize size = wxDefaultSize,
-                   wxDirection edge = wxLEFT,
-                   const wxString& name = wxT("drawerwindow"))
-    {
-        this->Create(parent, id, title, size, edge, name);
-    }
-
-    virtual ~wxDrawerWindow();
-
-    // Create a drawer window.
-    // If parent is NULL, create as a tool window.
-    // If parent is not NULL, then wxTopLevelWindow::Attach this window to parent.
-    bool Create(wxWindow *parent,
-     wxWindowID id,
-     const wxString& title,
-     wxSize size = wxDefaultSize,
-     wxDirection edge = wxLEFT,
-     const wxString& name = wxFrameNameStr);
-
-    bool Open(bool show = true); // open or close the drawer, possibility for async param, i.e. animate
-    bool Close() { return this->Open(false); }
-    bool IsOpen() const;
-
-    // Set the edge of the parent where the drawer attaches.
-    bool SetPreferredEdge(wxDirection edge);
-    wxDirection GetPreferredEdge() const;
-    wxDirection GetCurrentEdge() const; // not necessarily the preferred, due to screen constraints
-};
-
-#endif // _WX_DRAWERWINDOW_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/evtloop.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/evtloop.h
deleted file mode 100644
index f18c7c9494..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/evtloop.h
+++ /dev/null
@@ -1,34 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/carbon/evtloop.h
-// Purpose:     declaration of wxEventLoop for wxMac
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     2006-01-12
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_CARBON_EVTLOOP_H_
-#define _WX_MAC_CARBON_EVTLOOP_H_
-
-struct OpaqueEventRef;
-typedef OpaqueEventRef *EventRef;
-
-class WXDLLIMPEXP_CORE wxGUIEventLoop : public wxCFEventLoop
-{
-public:
-    wxGUIEventLoop();
-
-    virtual void WakeUp();
-
-protected:
-    virtual int DoDispatchTimeout(unsigned long timeout);
-
-    virtual void OSXDoRun();
-    virtual void OSXDoStop();
-
-    virtual CFRunLoopRef CFGetCurrentRunLoop() const;
-};
-
-#endif // _WX_MAC_CARBON_EVTLOOP_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/mimetype.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/mimetype.h
deleted file mode 100644
index 837275285a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/mimetype.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/carbon/mimetype.h
-// Purpose:     Mac Carbon implementation for wx mime-related classes
-// Author:      Ryan Norton
-// Modified by:
-// Created:     04/16/2005
-// Copyright:   (c) 2005 Ryan Norton (<wxprojects@comcast.net>)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MIMETYPE_IMPL_H
-#define _MIMETYPE_IMPL_H
-
-#include "wx/defs.h"
-#include "wx/mimetype.h"
-
-
-class wxMimeTypesManagerImpl
-{
-public :
-    //kinda kooky but in wxMimeTypesManager::EnsureImpl it doesn't call
-    //intialize, so we do it ourselves
-    wxMimeTypesManagerImpl() : m_hIC(NULL) { Initialize(); }
-    ~wxMimeTypesManagerImpl() { ClearData(); }
-
-    // load all data into memory - done when it is needed for the first time
-    void Initialize(int mailcapStyles = wxMAILCAP_STANDARD,
-                    const wxString& extraDir = wxEmptyString);
-
-    // and delete the data here
-    void ClearData();
-
-    // implement containing class functions
-    wxFileType *GetFileTypeFromExtension(const wxString& ext);
-    wxFileType *GetOrAllocateFileTypeFromExtension(const wxString& ext) ;
-    wxFileType *GetFileTypeFromMimeType(const wxString& mimeType);
-
-    size_t EnumAllFileTypes(wxArrayString& mimetypes);
-
-    void AddFallback(const wxFileTypeInfo& ft) { m_fallbacks.Add(ft); }
-
-    // create a new filetype association
-    wxFileType *Associate(const wxFileTypeInfo& ftInfo);
-    // remove association
-    bool Unassociate(wxFileType *ft);
-
-private:
-    wxArrayFileTypeInfo m_fallbacks;
-    void*  m_hIC;
-    void** m_hDatabase;
-    long   m_lCount;
-
-    void* pReserved1;
-    void* pReserved2;
-    void* pReserved3;
-    void* pReserved4;
-    void* pReserved5;
-    void* pReserved6;
-
-    friend class wxFileTypeImpl;
-};
-
-class wxFileTypeImpl
-{
-public:
-    //kind of nutty, but mimecmn.cpp creates one with an empty new
-    wxFileTypeImpl() : m_manager(NULL) {}
-    ~wxFileTypeImpl() {} //for those broken compilers
-
-    // implement accessor functions
-    bool GetExtensions(wxArrayString& extensions);
-    bool GetMimeType(wxString *mimeType) const;
-    bool GetMimeTypes(wxArrayString& mimeTypes) const;
-    bool GetIcon(wxIconLocation *iconLoc) const;
-    bool GetDescription(wxString *desc) const;
-    bool GetOpenCommand(wxString *openCmd,
-                        const wxFileType::MessageParameters&) const;
-    bool GetPrintCommand(wxString *printCmd,
-                         const wxFileType::MessageParameters&) const;
-
-    size_t GetAllCommands(wxArrayString * verbs, wxArrayString * commands,
-                          const wxFileType::MessageParameters& params) const;
-
-    // remove the record for this file type
-    // probably a mistake to come here, use wxMimeTypesManager.Unassociate (ft) instead
-    bool Unassociate(wxFileType *ft)
-    {
-        return m_manager->Unassociate(ft);
-    }
-
-    // set an arbitrary command, ask confirmation if it already exists and
-    // overwriteprompt is TRUE
-    bool SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt = true);
-    bool SetDefaultIcon(const wxString& strIcon = wxEmptyString, int index = 0);
-
- private:
-    void Init(wxMimeTypesManagerImpl *manager, long lIndex)
-    { m_manager=(manager); m_lIndex=(lIndex); }
-
-    // helper function
-    wxString GetCommand(const wxString& verb) const;
-
-    wxMimeTypesManagerImpl *m_manager;
-    long                    m_lIndex;
-
-    void* pReserved1;
-    void* pReserved2;
-    void* pReserved3;
-    void* pReserved4;
-    void* pReserved5;
-    void* pReserved6;
-
-    friend class wxMimeTypesManagerImpl;
-};
-
-#endif
-    //_MIMETYPE_H
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/private.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/private.h
deleted file mode 100644
index 64fa447e14..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/private.h
+++ /dev/null
@@ -1,1045 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/carbon/private.h
-// Purpose:     Private declarations: as this header is only included by
-//              wxWidgets itself, it may contain identifiers which don't start
-//              with "wx".
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRIVATE_H_
-#define _WX_PRIVATE_H_
-
-#if wxUSE_GUI
-
-#include "wx/osx/uma.h"
-
-#include "wx/listbox.h"
-#include "wx/osx/dc.h"
-#include "wx/osx/dcclient.h"
-#include "wx/osx/dcmemory.h"
-
-// app.h
-
-#endif // wxUSE_GUI
-
-// filefn.h
-WXDLLIMPEXP_BASE wxString wxMacFSSpec2MacFilename( const FSSpec *spec );
-WXDLLIMPEXP_BASE void wxMacFilename2FSSpec( const wxString &path , FSSpec *spec );
-
-// utils.h
-WXDLLIMPEXP_BASE wxString wxMacFindFolderNoSeparator(short vRefNum,
-                                                     OSType folderType,
-                                                     Boolean createFolder);
-WXDLLIMPEXP_BASE wxString wxMacFindFolder(short vRefNum,
-                                          OSType folderType,
-                                          Boolean createFolder);
-
-template<typename T> EventParamType wxMacGetEventParamType() { wxFAIL_MSG( wxT("Unknown Param Type") ); return 0; }
-template<> inline EventParamType wxMacGetEventParamType<HIShapeRef>() { return typeHIShapeRef; }
-template<> inline EventParamType wxMacGetEventParamType<RgnHandle>() { return typeQDRgnHandle; }
-template<> inline EventParamType wxMacGetEventParamType<ControlRef>() { return typeControlRef; }
-template<> inline EventParamType wxMacGetEventParamType<WindowRef>() { return typeWindowRef; }
-template<> inline EventParamType wxMacGetEventParamType<MenuRef>() { return typeMenuRef; }
-template<> inline EventParamType wxMacGetEventParamType<EventRef>() { return typeEventRef; }
-template<> inline EventParamType wxMacGetEventParamType<Point>() { return typeQDPoint; }
-template<> inline EventParamType wxMacGetEventParamType<Rect>() { return typeQDRectangle; }
-template<> inline EventParamType wxMacGetEventParamType<Boolean>() { return typeBoolean; }
-template<> inline EventParamType wxMacGetEventParamType<SInt16>() { return typeSInt16; }
-template<> inline EventParamType wxMacGetEventParamType<SInt32>() { return typeSInt32; }
-template<> inline EventParamType wxMacGetEventParamType<UInt32>() { return typeUInt32; }
-template<> inline EventParamType wxMacGetEventParamType<RGBColor>() { return typeRGBColor; }
-template<> inline EventParamType wxMacGetEventParamType<HICommand>() { return typeHICommand; }
-template<> inline EventParamType wxMacGetEventParamType<HIPoint>() { return typeHIPoint; }
-template<> inline EventParamType wxMacGetEventParamType<HISize>() { return typeHISize; }
-template<> inline EventParamType wxMacGetEventParamType<HIRect>() { return typeHIRect; }
-template<> inline EventParamType wxMacGetEventParamType<void*>() { return typeVoidPtr; }
-template<> inline EventParamType wxMacGetEventParamType<CFDictionaryRef>() { return typeCFDictionaryRef; }
-template<> inline EventParamType wxMacGetEventParamType<Collection>() { return typeCollection; }
-template<> inline EventParamType wxMacGetEventParamType<CGContextRef>() { return typeCGContextRef; }
-/*
- These are ambiguous
- template<> EventParamType wxMacGetEventParamType<GrafPtr>() { return typeGrafPtr; }
- template<> EventParamType wxMacGetEventParamType<OSStatus>() { return typeOSStatus; }
- template<> EventParamType wxMacGetEventParamType<CFIndex>() { return typeCFIndex; }
- template<> EventParamType wxMacGetEventParamType<GWorldPtr>() { return typeGWorldPtr; }
- */
-
-class WXDLLIMPEXP_CORE wxMacCarbonEvent
-{
-
-public :
-    wxMacCarbonEvent()
-    {
-        m_eventRef = 0;
-        m_release = false;
-    }
-
-    wxMacCarbonEvent( EventRef event , bool release = false )
-    {
-        m_eventRef = event;
-        m_release = release;
-    }
-
-    wxMacCarbonEvent(UInt32 inClassID,UInt32 inKind,EventTime inWhen = 0 /*now*/,EventAttributes inAttributes=kEventAttributeNone)
-    {
-        m_eventRef = NULL;
-        verify_noerr( MacCreateEvent( NULL , inClassID, inKind,inWhen,inAttributes,&m_eventRef) );
-        m_release = true;
-    }
-
-    ~wxMacCarbonEvent()
-    {
-        if ( m_release )
-            ReleaseEvent( m_eventRef );
-    }
-
-    OSStatus Create(UInt32 inClassID,UInt32 inKind,EventTime inWhen = 0 /*now*/,EventAttributes inAttributes=kEventAttributeNone)
-    {
-        verify( (m_eventRef == NULL) || m_release );
-        if ( m_eventRef && m_release )
-        {
-            ReleaseEvent( m_eventRef );
-            m_release = false;
-            m_eventRef = NULL;
-        }
-        OSStatus err = MacCreateEvent( NULL , inClassID, inKind,inWhen,inAttributes,&m_eventRef);
-        if ( err == noErr )
-            m_release = true;
-        return err;
-    }
-
-    OSStatus GetParameter( EventParamName inName, EventParamType inDesiredType, UInt32 inBufferSize, void * outData);
-
-    template <typename T> OSStatus GetParameter( EventParamName inName, EventParamType type , T *data )
-    {
-        return GetParameter( inName, type , sizeof( T ) , data );
-    }
-    template <typename T> OSStatus GetParameter( EventParamName inName, T *data )
-    {
-        return GetParameter<T>( inName, wxMacGetEventParamType<T>() , data );
-    }
-
-    template <typename T> T GetParameter( EventParamName inName )
-    {
-        T value;
-        verify_noerr( GetParameter<T>( inName, &value ) );
-        return value;
-    }
-    template <typename T> T GetParameter( EventParamName inName, EventParamType inDesiredType )
-    {
-        T value;
-        verify_noerr( GetParameter<T>( inName, inDesiredType , &value ) );
-        return value;
-    }
-
-    OSStatus SetParameter( EventParamName inName, EventParamType inType, UInt32 inSize, const void * inData);
-    template <typename T> OSStatus SetParameter( EventParamName inName, EventParamType inDesiredType , const T *data )
-    {
-        return SetParameter( inName, inDesiredType , sizeof( T ) , data );
-    }
-    template <typename T> OSStatus SetParameter( EventParamName inName, EventParamType inDesiredType , const T& data )
-    {
-        return SetParameter<T>( inName, inDesiredType , &data );
-    }
-    template <typename T> OSStatus SetParameter( EventParamName inName, const T *data )
-    {
-        return SetParameter<T>( inName, wxMacGetEventParamType<T>() , data );
-    }
-    template <typename T> OSStatus SetParameter( EventParamName inName, const T& data )
-    {
-        return SetParameter<T>( inName, wxMacGetEventParamType<T>() , &data );
-    }
-    UInt32 GetClass()
-    {
-        return ::GetEventClass( m_eventRef );
-    }
-    UInt32 GetKind()
-    {
-        return ::GetEventKind( m_eventRef );
-    }
-    EventTime GetTime()
-    {
-        return ::GetEventTime( m_eventRef );
-    }
-    UInt32 GetTicks()
-    {
-        return EventTimeToTicks( GetTime() );
-    }
-    OSStatus SetCurrentTime( )
-    {
-        return ::SetEventTime( m_eventRef , GetCurrentEventTime() );
-    }
-    OSStatus SetTime( EventTime when )
-    {
-        return ::SetEventTime( m_eventRef , when );
-    }
-    operator EventRef () { return m_eventRef; }
-
-    bool IsValid() { return m_eventRef != 0; }
-protected :
-    EventRef m_eventRef;
-    bool     m_release;
-};
-
-#if wxUSE_GUI
-
-class WXDLLIMPEXP_FWD_CORE wxMacToolTipTimer ;
-
-class WXDLLIMPEXP_CORE wxMacToolTip
-{
-public :
-    wxMacToolTip() ;
-    ~wxMacToolTip() ;
-
-    void Setup( WindowRef window , const wxString& text , const wxPoint& localPosition ) ;
-    void Draw() ;
-    void Clear() ;
-
-    long GetMark()
-    { return m_mark ; }
-
-    bool IsShown()
-    { return m_shown ; }
-
-private :
-    wxString    m_label ;
-    wxPoint m_position ;
-    Rect            m_rect ;
-    WindowRef    m_window ;
-    PicHandle    m_backpict ;
-    bool        m_shown ;
-    long        m_mark ;
-#if wxUSE_TIMER
-    wxMacToolTipTimer* m_timer ;
-#endif
-    wxCFStringRef m_helpTextRef ;
-} ;
-
-// Quartz
-
-WXDLLIMPEXP_CORE void wxMacCreateBitmapButton( ControlButtonContentInfo*info , const wxBitmap& bitmap , int forceType = 0 );
-WXDLLIMPEXP_CORE void wxMacReleaseBitmapButton( ControlButtonContentInfo*info );
-
-#define MAC_WXHBITMAP(a) (GWorldPtr(a))
-#define MAC_WXHMETAFILE(a) (PicHandle(a))
-#define MAC_WXHICON(a) (IconRef(a))
-#define MAC_WXHCURSOR(a) (CursHandle(a))
-#define MAC_WXHRGN(a) (RgnHandle(a))
-#define MAC_WXHWND(a) (WindowPtr(a))
-#define MAC_WXRECPTR(a) ((Rect*)a)
-#define MAC_WXPOINTPTR(a) ((Point*)a)
-#define MAC_WXHMENU(a) ((MenuHandle)a)
-
-struct wxOpaqueWindowRef
-{
-    wxOpaqueWindowRef( WindowRef ref ) { m_data = ref; }
-    operator WindowRef() { return m_data; }
-private :
-    WindowRef m_data;
-};
-
-WXDLLIMPEXP_CORE void wxMacRectToNative( const wxRect *wx , Rect *n );
-WXDLLIMPEXP_CORE void wxMacNativeToRect( const Rect *n , wxRect* wx );
-WXDLLIMPEXP_CORE void wxMacPointToNative( const wxPoint* wx , Point *n );
-WXDLLIMPEXP_CORE void wxMacNativeToPoint( const Point *n , wxPoint* wx );
-
-WXDLLIMPEXP_CORE wxMenu* wxFindMenuFromMacMenu(MenuRef inMenuRef);
-
-WXDLLIMPEXP_CORE int wxMacCommandToId( UInt32 macCommandId );
-WXDLLIMPEXP_CORE UInt32 wxIdToMacCommand( int wxId );
-WXDLLIMPEXP_CORE wxMenu* wxFindMenuFromMacCommand( const HICommand &macCommandId , wxMenuItem* &item );
-
-WXDLLIMPEXP_CORE pascal OSStatus wxMacTopLevelMouseEventHandler( EventHandlerCallRef handler , EventRef event , void *data );
-WXDLLIMPEXP_CORE Rect wxMacGetBoundsForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size , bool adjustForOrigin = true );
-
-ControlActionUPP GetwxMacLiveScrollbarActionProc();
-
-// additional optional event defines
-
-class WXDLLIMPEXP_CORE wxMacControl : public wxWidgetImpl
-{
-public :
-    wxMacControl( wxWindowMac* peer , bool isRootControl = false, bool isUserPane = false );
-    wxMacControl() ;
-    virtual ~wxMacControl();
-
-    void Init();
-
-    void SetReferenceInNativeControl();
-    static wxMacControl* GetReferenceFromNativeControl(ControlRef control);
-
-    virtual ControlRef * GetControlRefAddr() { return &m_controlRef; }
-    virtual ControlRef GetControlRef() const { return m_controlRef; }
-
-    virtual WXWidget GetWXWidget() const { return (WXWidget) m_controlRef; }
-
-    virtual bool        IsVisible() const;
-
-    virtual void        Raise();
-
-    virtual void        Lower();
-
-    virtual void        ScrollRect( const wxRect *rect, int dx, int dy );
-
-    virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const;
-    virtual void        Move(int x, int y, int width, int height);
-    virtual void        GetPosition( int &x, int &y ) const;
-    virtual void        GetSize( int &width, int &height ) const;
-    virtual void        SetControlSize( wxWindowVariant variant ) ;
-
-    // where is in native window relative coordinates
-    virtual void        SetNeedsDisplay( const wxRect* where = NULL );
-    virtual bool        GetNeedsDisplay() const;
-
-    virtual bool        CanFocus() const;
-    // return true if successful
-    virtual bool        SetFocus();
-    virtual bool        HasFocus() const;
-
-    void                RemoveFromParent();
-    void                Embed( wxWidgetImpl *parent );
-
-    void                SetDefaultButton( bool isDefault );
-    void                PerformClick();
-    void                SetLabel( const wxString& title, wxFontEncoding encoding );
-
-    void                SetCursor( const wxCursor & cursor );
-    void                CaptureMouse();
-    void                ReleaseMouse();
-
-    wxInt32             GetValue() const;
-    void                SetValue( wxInt32 v );
-    wxBitmap            GetBitmap() const;
-    void                SetBitmap( const wxBitmap& bitmap );
-    void                SetBitmapPosition( wxDirection dir );
-
-    void                GetBestRect( wxRect *r ) const;
-    bool                IsEnabled() const;
-    void                Enable( bool enable );
-    bool                ButtonClickDidStateChange() { return false ;}
-    void                SetMinimum( wxInt32 v );
-    void                SetMaximum( wxInt32 v );
-    void                PulseGauge() ;
-    void                SetScrollThumb( wxInt32 value, wxInt32 thumbSize );
-
-    // temp convenience methods
-
-    void                GetBestRect( Rect *r ) const;
-    /*
-    void operator= (ControlRef c) { m_controlRef = c; }
-    operator ControlRef () { return m_controlRef; }
-    operator ControlRef * () { return &m_controlRef; }
-    */
-    // accessing data and values
-
-    virtual OSStatus SetData( ControlPartCode inPartCode , ResType inTag , Size inSize , const void * inData );
-    virtual OSStatus GetData( ControlPartCode inPartCode , ResType inTag , Size inBufferSize , void * inOutBuffer , Size * outActualSize ) const;
-    virtual OSStatus GetDataSize( ControlPartCode inPartCode , ResType inTag , Size * outActualSize ) const;
-    virtual OSStatus SendEvent(  EventRef ref , OptionBits inOptions = 0 );
-    virtual OSStatus SendHICommand( HICommand &command , OptionBits inOptions = 0 );
-
-    virtual OSStatus SendHICommand( UInt32 commandID , OptionBits inOptions = 0 );
-
-    virtual wxInt32 GetMaximum() const;
-    virtual wxInt32 GetMinimum() const;
-
-    virtual void SetValueAndRange( SInt32 value , SInt32 minimum , SInt32 maximum );
-    virtual void SetRange( SInt32 minimum , SInt32 maximum );
-
-    // templated helpers
-
-    Size GetDataSize( ControlPartCode inPartCode , ResType inTag ) const
-    {
-        Size sz;
-        verify_noerr( GetDataSize( inPartCode , inTag , &sz ) );
-        return sz;
-    }
-    template <typename T> OSStatus SetData( ControlPartCode inPartCode , ResType inTag , const T *data )
-    {
-        return SetData( inPartCode , inTag , sizeof( T ) , data );
-    }
-    template <typename T> OSStatus SetData( ControlPartCode inPartCode , ResType inTag , const T& data )
-    {
-        return SetData( inPartCode , inTag , sizeof( T ) , &data );
-    }
-    template <typename T> OSStatus SetData( ResType inTag , const T *data )
-    {
-        return SetData( kControlEntireControl , inTag , sizeof( T ) , data );
-    }
-    template <typename T> OSStatus SetData( ResType inTag , const T& data )
-    {
-        return SetData( kControlEntireControl , inTag , sizeof( T ) , &data );
-    }
-    template <typename T> OSStatus GetData( ControlPartCode inPartCode , ResType inTag , T *data ) const
-    {
-        Size dummy;
-        return GetData( inPartCode , inTag , sizeof( T ) , data , &dummy );
-    }
-    template <typename T> T GetData( ControlPartCode inPartCode , ResType inTag ) const
-    {
-        T value;
-        OSStatus err = GetData<T>( inPartCode , inTag , &value );
-
-        if ( err != noErr )
-        {
-            wxFAIL_MSG( wxString::Format(wxT("GetData Failed for Part [%i] and Tag [%i]"),
-                                        inPartCode, (int)inTag) );
-        }
-
-        return value;
-    }
-    template <typename T> OSStatus GetData( ResType inTag , T *data ) const
-    {
-        Size dummy;
-        return GetData( kControlEntireControl , inTag , sizeof( T ) , data , &dummy );
-    }
-    template <typename T> T GetData( ResType inTag ) const
-    {
-        return GetData<T>( kControlEntireControl , inTag );
-    }
-
-    // Flash the control for the specified amount of time
-
-    virtual void VisibilityChanged( bool shown );
-    virtual void SuperChangedPosition();
-
-
-    virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
-    virtual void SetBackgroundColour( const wxColour& col );
-    virtual bool SetBackgroundStyle(wxBackgroundStyle style);
-    virtual ControlPartCode HandleKey(  SInt16 keyCode,  SInt16 charCode, EventModifiers modifiers );
-    void SetActionProc( ControlActionUPP   actionProc );
-    SInt32 GetViewSize() const;
-
-    virtual void SetVisibility( bool visible );
-
-    virtual bool IsActive() const;
-
-    // invalidates this control and all children
-    virtual void InvalidateWithChildren();
-    virtual void SetDrawingEnabled( bool enable );
-
-    // in native parent window relative coordinates
-
-    virtual void GetRectInWindowCoords( Rect *r );
-
-
-    virtual void GetFeatures( UInt32 *features );
-
-    // to be moved into a tab control class
-
-    virtual OSStatus SetTabEnabled( SInt16 tabNo , bool enable );
-
-    virtual void InstallEventHandler( WXWidget control = NULL );
-protected :
-    WXEVENTHANDLERREF    m_macControlEventHandler ;
-    ControlRef  m_controlRef;
-    wxFont      m_font;
-    long        m_windowStyle;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacControl)
-};
-
-// ============================================================================
-// DataBrowser Wrapper
-// ============================================================================
-//
-// basing on DataBrowserItemIDs
-//
-
-class WXDLLIMPEXP_CORE wxMacDataBrowserControl : public wxMacControl
-{
-public :
-    wxMacDataBrowserControl( wxWindow* peer, const wxPoint& pos, const wxSize& size, long style);
-    wxMacDataBrowserControl() {}
-
-    OSStatus SetCallbacks( const DataBrowserCallbacks *callbacks );
-
-    OSStatus GetItemCount( DataBrowserItemID container,
-            Boolean recurse,
-            DataBrowserItemState state,
-            ItemCount *numItems) const;
-
-    OSStatus GetItems( DataBrowserItemID container,
-            Boolean recurse,
-            DataBrowserItemState state,
-            Handle items) const;
-
-
-    OSStatus AddColumn( DataBrowserListViewColumnDesc *columnDesc,
-        DataBrowserTableViewColumnIndex position );
-
-    OSStatus RemoveColumn( DataBrowserTableViewColumnIndex position );
-
-    OSStatus AutoSizeColumns();
-
-    OSStatus SetHasScrollBars( bool horiz, bool vert );
-    OSStatus SetHiliteStyle( DataBrowserTableViewHiliteStyle hiliteStyle );
-
-    OSStatus SetHeaderButtonHeight( UInt16 height );
-    OSStatus GetHeaderButtonHeight( UInt16 *height );
-
-    OSStatus UpdateItems( DataBrowserItemID container, UInt32 numItems,
-            const DataBrowserItemID *items,
-            DataBrowserPropertyID preSortProperty,
-            DataBrowserPropertyID propertyID ) const;
-
-    OSStatus AddItems( DataBrowserItemID container, UInt32 numItems,
-            const DataBrowserItemID *items,
-            DataBrowserPropertyID preSortProperty );
-    OSStatus RemoveItems( DataBrowserItemID container, UInt32 numItems,
-            const DataBrowserItemID *items,
-            DataBrowserPropertyID preSortProperty );
-    OSStatus RevealItem( DataBrowserItemID item,
-            DataBrowserPropertyID propertyID,
-            DataBrowserRevealOptions options ) const;
-
-    OSStatus SetSelectionFlags( DataBrowserSelectionFlags );
-    OSStatus GetSelectionAnchor( DataBrowserItemID *first, DataBrowserItemID *last ) const;
-    bool IsItemSelected( DataBrowserItemID item ) const;
-    OSStatus SetSelectedItems( UInt32 numItems,
-            const DataBrowserItemID *items,
-            DataBrowserSetOption operation );
-
-    OSStatus GetItemID( DataBrowserTableViewRowIndex row,
-            DataBrowserItemID * item ) const;
-    OSStatus GetItemRow( DataBrowserItemID item,
-            DataBrowserTableViewRowIndex * row ) const;
-
-    OSStatus SetDefaultRowHeight( UInt16 height );
-    OSStatus GetDefaultRowHeight( UInt16 * height ) const;
-
-    OSStatus SetRowHeight( DataBrowserItemID item , UInt16 height);
-    OSStatus GetRowHeight( DataBrowserItemID item , UInt16 *height) const;
-
-    OSStatus GetColumnWidth( DataBrowserPropertyID column , UInt16 *width ) const;
-    OSStatus SetColumnWidth( DataBrowserPropertyID column , UInt16 width );
-
-    OSStatus GetDefaultColumnWidth( UInt16 *width ) const;
-    OSStatus SetDefaultColumnWidth( UInt16 width );
-
-    OSStatus GetColumnCount( UInt32* numColumns) const;
-
-    OSStatus GetColumnIDFromIndex( DataBrowserTableViewColumnIndex position, DataBrowserTableViewColumnID* id );
-
-    OSStatus GetColumnPosition( DataBrowserPropertyID column, DataBrowserTableViewColumnIndex *position) const;
-    OSStatus SetColumnPosition( DataBrowserPropertyID column, DataBrowserTableViewColumnIndex position);
-
-    OSStatus GetScrollPosition( UInt32 *top , UInt32 *left ) const;
-    OSStatus SetScrollPosition( UInt32 top , UInt32 left );
-
-    OSStatus GetSortProperty( DataBrowserPropertyID *column ) const;
-    OSStatus SetSortProperty( DataBrowserPropertyID column );
-
-    OSStatus GetSortOrder( DataBrowserSortOrder *order ) const;
-    OSStatus SetSortOrder( DataBrowserSortOrder order );
-
-    OSStatus GetPropertyFlags( DataBrowserPropertyID property, DataBrowserPropertyFlags *flags ) const;
-    OSStatus SetPropertyFlags( DataBrowserPropertyID property, DataBrowserPropertyFlags flags );
-
-    OSStatus GetHeaderDesc( DataBrowserPropertyID property, DataBrowserListViewHeaderDesc *desc ) const;
-    OSStatus SetHeaderDesc( DataBrowserPropertyID property, DataBrowserListViewHeaderDesc *desc );
-
-    OSStatus SetDisclosureColumn( DataBrowserPropertyID property , Boolean expandableRows );
-
-    OSStatus GetItemPartBounds( DataBrowserItemID item, DataBrowserPropertyID property, DataBrowserPropertyPart part, Rect * bounds );
-protected :
-
-    static pascal void DataBrowserItemNotificationProc(
-        ControlRef browser,
-        DataBrowserItemID itemID,
-        DataBrowserItemNotification message,
-        DataBrowserItemDataRef itemData );
-
-    virtual void ItemNotification(
-        DataBrowserItemID itemID,
-        DataBrowserItemNotification message,
-        DataBrowserItemDataRef itemData) = 0;
-
-    static pascal OSStatus DataBrowserGetSetItemDataProc(
-        ControlRef browser,
-        DataBrowserItemID itemID,
-        DataBrowserPropertyID property,
-        DataBrowserItemDataRef itemData,
-        Boolean changeValue );
-
-    virtual OSStatus GetSetItemData(
-        DataBrowserItemID itemID,
-        DataBrowserPropertyID property,
-        DataBrowserItemDataRef itemData,
-        Boolean changeValue ) = 0;
-
-    static pascal Boolean DataBrowserCompareProc(
-        ControlRef browser,
-        DataBrowserItemID itemOneID,
-        DataBrowserItemID itemTwoID,
-        DataBrowserPropertyID sortProperty);
-
-    virtual Boolean CompareItems(DataBrowserItemID itemOneID,
-        DataBrowserItemID itemTwoID,
-        DataBrowserPropertyID sortProperty) = 0;
-    DECLARE_ABSTRACT_CLASS(wxMacDataBrowserControl)
-};
-
-// ============================================================================
-// Higher-level Databrowser
-// ============================================================================
-//
-// basing on data item objects
-//
-
-// forward decl
-
-class wxMacDataItemBrowserControl;
-class wxMacListBoxItem;
-
-const DataBrowserPropertyID kTextColumnId = 1024;
-const DataBrowserPropertyID kNumericOrderColumnId = 1025;
-
-// for multi-column controls, we will use this + the column ID to identify the
-// column. We don't use kTextColumnId there, and ideally the two should merge.
-const DataBrowserPropertyID kMinColumnId = 1050;
-
-// base API for high-level databrowser operations
-
-// base class for databrowser items
-
-enum DataItemType {
-    DataItem_Text
-};
-
-/*
-class WXDLLIMPEXP_CORE wxMacDataItem
-{
-public :
-    wxMacDataItem();
-    virtual ~wxMacDataItem();
-} ;
-*/
-
-class WXDLLIMPEXP_CORE wxMacDataItem
-{
-public :
-    wxMacDataItem();
-    virtual ~wxMacDataItem();
-
-    virtual bool IsLessThan(wxMacDataItemBrowserControl *owner ,
-        const wxMacDataItem*,
-        DataBrowserPropertyID property) const;
-
-    // returns true if access was successful, otherwise false
-    virtual OSStatus GetSetData(wxMacDataItemBrowserControl *owner ,
-        DataBrowserPropertyID property,
-        DataBrowserItemDataRef itemData,
-        bool changeValue );
-
-    virtual void Notification(wxMacDataItemBrowserControl *owner ,
-        DataBrowserItemNotification message,
-        DataBrowserItemDataRef itemData ) const;
-
-    void SetOrder( SInt32 order );
-    SInt32 GetOrder() const;
-
-protected :
-    SInt32      m_order;
-
-};
-
-enum ListSortOrder {
-    SortOrder_None,
-    SortOrder_Text_Ascending,
-    SortOrder_Text_Descending
-};
-
-typedef wxMacDataItem* wxMacDataItemPtr;
-const wxMacDataItemPtr wxMacDataBrowserRootContainer = NULL;
-typedef void * wxListColumnId ;
-
-WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxMacDataItemPtr, wxArrayMacDataItemPtr, class WXDLLIMPEXP_CORE);
-
-class WXDLLIMPEXP_CORE wxMacDataItemBrowserControl : public wxMacDataBrowserControl
-{
-public :
-    wxMacDataItemBrowserControl( wxWindow* peer , const wxPoint& pos, const wxSize& size, long style);
-    wxMacDataItemBrowserControl() {}
-    // create a list item (can be a subclass of wxMacListBoxItem)
-
-    unsigned int    GetItemCount(const wxMacDataItem* container, bool recurse , DataBrowserItemState state) const;
-    void            GetItems(const wxMacDataItem* container, bool recurse ,
-                        DataBrowserItemState state, wxArrayMacDataItemPtr &items ) const;
-
-    unsigned int    GetSelectedItemCount( const wxMacDataItem* container, bool recurse ) const;
-
-    unsigned int    GetLineFromItem(const wxMacDataItem *item) const;
-    wxMacDataItem * GetItemFromLine(unsigned int n) const;
-
-    void            UpdateItem(const wxMacDataItem *container, const wxMacDataItem *item,
-                        DataBrowserPropertyID property) const;
-    void            UpdateItems(const wxMacDataItem *container, wxArrayMacDataItemPtr &items,
-                        DataBrowserPropertyID property) const;
-
-    void            InsertColumn(int colId, DataBrowserPropertyType colType,
-                            const wxString& title, SInt16 just = teFlushDefault, int defaultWidth = -1);
-
-    int             GetColumnWidth(int colId);
-    void            SetColumnWidth(int colId, int width);
-
-    void            AddItem(wxMacDataItem *container, wxMacDataItem *item);
-    void            AddItems(wxMacDataItem *container, wxArrayMacDataItemPtr &items );
-
-    void            RemoveAllItems(wxMacDataItem *container);
-    void            RemoveItem(wxMacDataItem *container, wxMacDataItem* item);
-    void            RemoveItems(wxMacDataItem *container, wxArrayMacDataItemPtr &items);
-
-    void            SetSelectedItem( wxMacDataItem* item , DataBrowserSetOption option);
-    void            SetSelectedItems( wxArrayMacDataItemPtr &items , DataBrowserSetOption option);
-    void            SetSelectedAllItems( DataBrowserSetOption option);
-    Boolean         IsItemSelected( const wxMacDataItem* item) const;
-
-    void            RevealItem( wxMacDataItem* item, DataBrowserRevealOptions options);
-
-    void            GetSelectionAnchor( wxMacDataItemPtr* first , wxMacDataItemPtr* last) const;
-
-    // add and remove
-
-    virtual void            MacDelete( unsigned int n );
-    virtual void            MacInsert( unsigned int n, wxMacDataItem* item);
-    virtual void            MacClear();
-
-    // accessing content
-
-    virtual unsigned int    MacGetCount() const;
-
-public :
-
-    // as we are getting the same events for human and API selection we have to suppress
-    // events in the latter case, since this will be used from many subclasses we keep it here
-
-    bool            IsSelectionSuppressed() const { return m_suppressSelection; }
-    bool            SuppressSelection( bool suppress );
-
-    // client data
-
-    virtual wxClientDataType GetClientDataType() const;
-    virtual void            SetClientDataType(wxClientDataType clientDataItemsType);
-    //virtual ListSortOrder   GetSortOrder() const;
-    //virtual void            SetSortOrder(const ListSortOrder sort);
-
-
-
-protected:
-
-    ListSortOrder m_sortOrder;
-    wxClientDataType m_clientDataItemsType;
-
-    // ID aware base methods, should be 'final' ie not changed in subclasses
-
-    virtual Boolean CompareItems(DataBrowserItemID itemOneID,
-                        DataBrowserItemID itemTwoID,
-                        DataBrowserPropertyID sortProperty);
-
-    virtual OSStatus GetSetItemData(DataBrowserItemID itemID,
-                        DataBrowserPropertyID property,
-                        DataBrowserItemDataRef itemData,
-                        Boolean changeValue );
-
-    virtual void    ItemNotification(
-                        DataBrowserItemID itemID,
-                        DataBrowserItemNotification message,
-                        DataBrowserItemDataRef itemData);
-
-
-private :
-
-    bool m_suppressSelection;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataItemBrowserControl)
-};
-
-class WXDLLIMPEXP_CORE wxMacDataItemBrowserSelectionSuppressor
-{
-public :
-    wxMacDataItemBrowserSelectionSuppressor(wxMacDataItemBrowserControl *browser);
-    ~wxMacDataItemBrowserSelectionSuppressor();
-
-private :
-
-    bool m_former;
-    wxMacDataItemBrowserControl* m_browser;
-};
-
-// ============================================================================
-// platform listbox implementation
-// ============================================================================
-
-// exposed for reuse in wxCheckListBox
-
-class WXDLLIMPEXP_CORE wxMacListBoxItem : public wxMacDataItem
-{
-public :
-    wxMacListBoxItem();
-
-    virtual ~wxMacListBoxItem();
-
-    virtual OSStatus GetSetData(wxMacDataItemBrowserControl *owner ,
-        DataBrowserPropertyID property,
-        DataBrowserItemDataRef itemData,
-        bool changeValue );
-
-    virtual void Notification(wxMacDataItemBrowserControl *owner ,
-        DataBrowserItemNotification message,
-        DataBrowserItemDataRef itemData ) const;
-protected :
-};
-
-class WXDLLIMPEXP_CORE wxMacDataBrowserColumn : public wxListWidgetColumn
-{
-public :
-    wxMacDataBrowserColumn( DataBrowserPropertyID propertyId, DataBrowserPropertyType colType, bool editable )
-        : m_property(propertyId), m_editable(editable), m_type( colType )
-    {
-    }
-    ~wxMacDataBrowserColumn()
-    {
-    }
-    DataBrowserPropertyID GetProperty() const { return m_property ; }
-
-    bool IsEditable() const { return m_editable; }
-
-    DataBrowserPropertyType GetType() const { return m_type; }
-
-protected :
-    DataBrowserPropertyID m_property;
-    bool m_editable;
-    DataBrowserPropertyType m_type;
-} ;
-
-WX_DEFINE_ARRAY_PTR(wxMacDataBrowserColumn *, wxArrayMacDataBrowserColumns);
-
-
-class WXDLLIMPEXP_CORE wxMacDataBrowserCellValue : public wxListWidgetCellValue
-{
-public :
-    wxMacDataBrowserCellValue(DataBrowserItemDataRef data) : m_data(data) {}
-    virtual ~wxMacDataBrowserCellValue() {}
-
-    virtual void Set( CFStringRef value );
-    virtual void Set( const wxString& value );
-    virtual void Set( int value ) ;
-    virtual void Check( bool check );
-
-    virtual int GetIntValue() const ;
-    virtual wxString GetStringValue() const ;
-protected :
-    DataBrowserItemDataRef m_data;
-} ;
-
-
-class WXDLLIMPEXP_CORE wxMacDataBrowserListControl : public wxMacDataItemBrowserControl, public wxListWidgetImpl
-{
-public:
-    wxMacDataBrowserListControl( wxWindow *peer, const wxPoint& pos, const wxSize& size, long style );
-    wxMacDataBrowserListControl() {}
-    virtual ~wxMacDataBrowserListControl();
-
-    // wxListWidgetImpl Methods
-
-    wxListWidgetColumn*     InsertTextColumn( unsigned int pos, const wxString& title, bool editable = false,
-                                wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) ;
-    wxListWidgetColumn*     InsertCheckColumn( unsigned int pos , const wxString& title, bool editable = false,
-                                wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) ;
-
-    wxMacDataBrowserColumn* DoInsertColumn( unsigned int pos, DataBrowserPropertyID property,
-                                const wxString& title, bool editable,
-                                DataBrowserPropertyType colType, SInt16 just, int width );
-    // add and remove
-
-    virtual void            ListDelete( unsigned int n );
-    virtual void            ListInsert( unsigned int n );
-    virtual void            ListClear();
-
-    // selecting
-
-    virtual void            ListDeselectAll();
-    virtual void            ListSetSelection( unsigned int n, bool select, bool multi = false );
-    virtual int             ListGetSelection() const;
-    virtual int             ListGetSelections( wxArrayInt& aSelections ) const;
-    virtual bool            ListIsSelected( unsigned int n ) const;
-
-    // display
-
-    virtual void            ListScrollTo( unsigned int n );
-
-    // accessing content
-
-    virtual unsigned int    ListGetCount() const;
-    virtual int             DoListHitTest( const wxPoint& inpoint ) const;
-
-    virtual void            UpdateLine( unsigned int n, wxListWidgetColumn* col = NULL );
-    virtual void            UpdateLineToEnd( unsigned int n) ;
-
-    // pointing back
-
-    wxMacDataBrowserColumn*     GetColumnFromProperty( DataBrowserPropertyID );
-
-protected:
-    virtual void            ItemNotification(
-                                DataBrowserItemID itemID,
-                                DataBrowserItemNotification message,
-                                DataBrowserItemDataRef itemData);
-
-private:
-    wxArrayMacDataBrowserColumns m_columns;
-    int m_nextColumnId ;
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacDataBrowserListControl)
-};
-
-// ============================================================================
-// graphics implementation
-// ============================================================================
-
-// draw the image 'upside down' corrected as HIViewDrawCGImage does
-
-OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
-                               CGContextRef    inContext,
-                               const HIRect *  inBounds,
-                               CGImageRef      inImage) ;
-
-CGColorRef WXDLLIMPEXP_CORE wxMacCreateCGColorFromHITheme( ThemeBrush brush ) ;
-
-#endif // wxUSE_GUI
-
-#define wxMAC_DEFINE_PROC_GETTER( UPP , x ) \
-UPP Get##x()                                \
-{                                           \
-    static UPP sHandler = NULL;             \
-    if ( sHandler == NULL )                 \
-        sHandler = New##UPP( x );           \
-    return sHandler;                        \
-}
-
-//---------------------------------------------------------------------------
-// cocoa bridging utilities
-//---------------------------------------------------------------------------
-
-bool wxMacInitCocoa();
-
-typedef Cursor ClassicCursor;
-
-// -------------
-// Common to all
-// -------------
-
-// Cursor support
-
-const short kwxCursorBullseye = 0;
-const short kwxCursorBlank = 1;
-const short kwxCursorPencil = 2;
-const short kwxCursorMagnifier = 3;
-const short kwxCursorNoEntry = 4;
-const short kwxCursorPaintBrush = 5;
-const short kwxCursorPointRight = 6;
-const short kwxCursorPointLeft = 7;
-const short kwxCursorQuestionArrow = 8;
-const short kwxCursorRightArrow = 9;
-const short kwxCursorSizeNS = 10;
-const short kwxCursorSize = 11;
-const short kwxCursorSizeNESW = 12;
-const short kwxCursorSizeNWSE = 13;
-const short kwxCursorRoller = 14;
-const short kwxCursorWatch = 15;
-const short kwxCursorLast = kwxCursorWatch;
-
-// exposing our fallback cursor map
-
-extern ClassicCursor gMacCursors[];
-
-//
-//
-//
-
-#if wxUSE_GUI
-
-class wxNonOwnedWindowCarbonImpl : public wxNonOwnedWindowImpl
-{
-public :
-    wxNonOwnedWindowCarbonImpl( wxNonOwnedWindow* nonownedwnd) ;
-
-    wxNonOwnedWindowCarbonImpl();
-    virtual ~wxNonOwnedWindowCarbonImpl();
-
-    virtual void WillBeDestroyed() ;
-    void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
-    long style, long extraStyle, const wxString& name ) ;
-    void Create( wxWindow* parent, WXWindow nativeWindow );
-
-    WXWindow GetWXWindow() const;
-    void Raise();
-    void Lower();
-    bool Show(bool show);
-    bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout);
-
-
-    void Update();
-    bool SetTransparent(wxByte alpha);
-    bool SetBackgroundColour(const wxColour& col );
-    void SetExtraStyle( long exStyle );
-    bool SetBackgroundStyle(wxBackgroundStyle style);
-    bool CanSetTransparent();
-    void MoveWindow(int x, int y, int width, int height);
-    void GetPosition( int &x, int &y ) const;
-    void GetSize( int &width, int &height ) const;
-    void GetContentArea( int &left , int &top , int &width , int &height ) const;
-
-    bool SetShape(const wxRegion& region);
-
-    virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ;
-
-    virtual bool IsMaximized() const;
-
-    virtual bool IsIconized() const;
-
-    virtual void Iconize( bool iconize );
-
-    virtual void Maximize(bool maximize);
-
-    virtual bool IsFullScreen() const;
-
-    virtual bool ShowFullScreen(bool show, long style);
-
-    virtual void ShowWithoutActivating();
-
-    virtual void RequestUserAttention(int flags);
-
-    virtual void ScreenToWindow( int *x, int *y );
-
-    virtual void WindowToScreen( int *x, int *y );
-    virtual bool IsActive();
-
-
-    bool MacGetUnifiedAppearance() const ;
-    void MacChangeWindowAttributes( wxUint32 attributesToSet , wxUint32 attributesToClear ) ;
-    wxUint32 MacGetWindowAttributes() const ;
-    void MacSetMetalAppearance( bool set ) ;
-    bool MacGetMetalAppearance() const ;
-    void MacSetUnifiedAppearance( bool set );
-
-    WXEVENTHANDLERREF    MacGetEventHandler() { return m_macEventHandler ; }
-
-    wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
-protected :
-    void                MacInstallTopLevelWindowEventHandler();
-
-    WXEVENTHANDLERREF   m_macEventHandler ;
-    WindowRef           m_macWindow;
-    void *              m_macFullScreenData ;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCarbonImpl)
-};
-
-#endif // wxUSE_GUI
-
-#endif
-    // _WX_PRIVATE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/private/mactext.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/private/mactext.h
deleted file mode 100644
index d665abaa0d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/private/mactext.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/carbon/private/mactext.h
-// Purpose:     private wxMacTextControl base class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     03/02/99
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_PRIVATE_MACTEXT_H_
-#define _WX_MAC_PRIVATE_MACTEXT_H_
-
-#include "wx/osx/private.h"
-
-// implementation exposed, so that search control can pull it
-
-class wxMacUnicodeTextControl : public wxMacControl, public wxTextWidgetImpl
-{
-public :
-    wxMacUnicodeTextControl( wxTextCtrl *wxPeer ) ;
-    wxMacUnicodeTextControl( wxTextCtrl *wxPeer,
-                             const wxString& str,
-                             const wxPoint& pos,
-                             const wxSize& size, long style ) ;
-    virtual ~wxMacUnicodeTextControl();
-
-    virtual bool CanFocus() const
-                  { return true; }
-    virtual void VisibilityChanged(bool shown);
-    virtual wxString GetStringValue() const ;
-    virtual void SetStringValue( const wxString &str) ;
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
-    virtual bool CanPaste() const;
-    virtual void SetEditable(bool editable) ;
-    virtual void GetSelection( long* from, long* to) const ;
-    virtual void SetSelection( long from , long to ) ;
-    virtual void WriteText(const wxString& str) ;
-
-protected :
-    void    InstallEventHandlers();
-
-    // contains the tag for the content (is different for password and non-password controls)
-    OSType m_valueTag ;
-    WXEVENTHANDLERREF    m_macTextCtrlEventHandler ;
-public :
-    ControlEditTextSelectionRec m_selection ;
-};
-
-#endif // _WX_MAC_PRIVATE_MACTEXT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/private/overlay.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/private/overlay.h
deleted file mode 100644
index f5ebe1d83e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/private/overlay.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/carbon/private/overlay.h
-// Purpose:     wxOverlayImpl declaration
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     2006-10-20
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_CARBON_PRIVATE_OVERLAY_H_
-#define _WX_MAC_CARBON_PRIVATE_OVERLAY_H_
-
-#include "wx/osx/private.h"
-#include "wx/toplevel.h"
-#include "wx/graphics.h"
-
-class wxOverlayImpl
-{
-public:
-    wxOverlayImpl() ;
-    ~wxOverlayImpl() ;
-
-
-    // clears the overlay without restoring the former state
-    // to be done eg when the window content has been changed and repainted
-    void Reset();
-
-    // returns true if it has been setup
-    bool IsOk();
-
-    void Init( wxDC* dc, int x , int y , int width , int height );
-
-    void BeginDrawing( wxDC* dc);
-
-    void EndDrawing( wxDC* dc);
-
-    void Clear( wxDC* dc);
-
-private:
-    OSStatus CreateOverlayWindow();
-
-    void MacGetBounds( Rect *bounds );
-
-    WindowRef m_overlayWindow;
-    WindowRef m_overlayParentWindow;
-    CGContextRef m_overlayContext ;
-    // we store the window in case we would have to issue a Refresh()
-    wxWindow* m_window ;
-
-    int m_x ;
-    int m_y ;
-    int m_width ;
-    int m_height ;
-} ;
-
-#endif // _WX_MAC_CARBON_PRIVATE_OVERLAY_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/private/print.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/private/print.h
deleted file mode 100644
index b00fd619ef..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/private/print.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/carbon/private/print.h
-// Purpose:     private implementation for printing on OS X
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     03/02/99
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_PRIVATE_PRINT_H_
-#define _WX_MAC_PRIVATE_PRINT_H_
-
-#include "wx/cmndata.h"
-#include "wx/print.h"
-
-// for PrintingManager
-#include "ApplicationServices/ApplicationServices.h"
-
-class WXDLLIMPEXP_CORE wxOSXPrintData : public wxPrintNativeDataBase
-{
-public:
-                            wxOSXPrintData();
-    virtual                 ~wxOSXPrintData();
-
-    virtual bool            TransferTo( wxPrintData &data );
-    virtual bool            TransferFrom( const wxPrintData &data );
-
-    virtual bool            IsOk() const ;
-
-    virtual void            TransferFrom( wxPageSetupDialogData * );
-    virtual void            TransferTo( wxPageSetupDialogData * );
-
-    virtual void            TransferFrom( wxPrintDialogData * );
-    virtual void            TransferTo( wxPrintDialogData * );
-
-    PMPrintSession          GetPrintSession() { return m_macPrintSession; }
-    PMPageFormat            GetPageFormat() { return m_macPageFormat; }
-    PMPrintSettings         GetPrintSettings() { return m_macPrintSettings; }
-protected :
-    virtual void            TransferPrinterNameFrom( const wxPrintData &data );
-    virtual void            TransferPaperInfoFrom( const wxPrintData &data );
-    virtual void            TransferResolutionFrom( const wxPrintData &data );
-
-    virtual void            TransferPrinterNameTo( wxPrintData &data );
-    virtual void            TransferPaperInfoTo( wxPrintData &data );
-    virtual void            TransferResolutionTo( wxPrintData &data );
-
-
-    virtual void            UpdateFromPMState();
-    virtual void            UpdateToPMState();
-
-    PMPrintSession          m_macPrintSession ;
-    PMPageFormat            m_macPageFormat ;
-    PMPrintSettings         m_macPrintSettings ;
-    PMPaper                 m_macPaper;
-private:
-    DECLARE_DYNAMIC_CLASS(wxOSXPrintData)
-} ;
-
-WXDLLIMPEXP_CORE wxPrintNativeDataBase* wxOSXCreatePrintData();
-
-#if wxOSX_USE_CARBON
-class WXDLLIMPEXP_CORE wxOSXCarbonPrintData : public wxOSXPrintData
-{
-public:
-                            wxOSXCarbonPrintData();
-    virtual                 ~wxOSXCarbonPrintData();
-private:
-    DECLARE_DYNAMIC_CLASS(wxOSXCarbonPrintData)
-} ;
-#endif
-
-#if wxOSX_USE_COCOA
-class WXDLLIMPEXP_CORE wxOSXCocoaPrintData : public wxOSXPrintData
-{
-public:
-                            wxOSXCocoaPrintData();
-    virtual                 ~wxOSXCocoaPrintData();
-
-    WX_NSPrintInfo          GetNSPrintInfo() { return m_macPrintInfo; }
-protected:
-    virtual void            UpdateFromPMState();
-    virtual void            UpdateToPMState();
-
-    WX_NSPrintInfo          m_macPrintInfo;
-private:
-    DECLARE_DYNAMIC_CLASS(wxOSXCocoaPrintData)
-} ;
-#endif
-
-#endif // _WX_MAC_PRIVATE_PRINT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/private/timer.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/private/timer.h
deleted file mode 100644
index 0d68d7a204..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/private/timer.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/carbon/private/timer.h
-// Purpose:     wxTimer class
-// Author:      Stefan Csomor
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_PRIVATE_TIMER_H_
-#define _WX_MAC_PRIVATE_TIMER_H_
-
-#include "wx/private/timer.h"
-
-struct MacTimerInfo;
-
-class WXDLLIMPEXP_CORE wxCarbonTimerImpl : public wxTimerImpl
-{
-public:
-    wxCarbonTimerImpl(wxTimer *timer);
-    virtual ~wxCarbonTimerImpl();
-
-    virtual bool Start(int milliseconds = -1, bool one_shot = false);
-    virtual void Stop();
-
-    virtual bool IsRunning() const;
-
-private:
-    MacTimerInfo *m_info;
-};
-
-#endif // _WX_MAC_PRIVATE_TIMER_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/region.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/region.h
deleted file mode 100644
index f9c3fe3dd3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/region.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/carbon/region.h
-// Purpose:     wxRegion class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_CARBON_REGION_H_
-#define _WX_MAC_CARBON_REGION_H_
-
-#include "wx/list.h"
-
-class WXDLLIMPEXP_CORE wxRegion : public wxRegionWithCombine
-{
-public:
-    wxRegion() { }
-    wxRegion(long x, long y, long w, long h);
-    wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight);
-    wxRegion(const wxRect& rect);
-    wxRegion( WXHRGN hRegion );
-    wxRegion(size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
-#if wxUSE_IMAGE
-    wxRegion(const wxBitmap& bmp)
-    {
-        Union(bmp);
-    }
-    wxRegion(const wxBitmap& bmp,
-             const wxColour& transColour, int tolerance = 0)
-    {
-        Union(bmp, transColour, tolerance);
-    }
-#endif
-
-    virtual ~wxRegion();
-
-    // wxRegionBase methods
-    virtual void Clear();
-    virtual bool IsEmpty() const;
-
-    // Internal
-    WXHRGN GetWXHRGN() const ;
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-    virtual bool DoIsEqual(const wxRegion& region) const;
-    virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const;
-    virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const;
-    virtual wxRegionContain DoContainsRect(const wxRect& rect) const;
-
-    virtual bool DoOffset(wxCoord x, wxCoord y);
-    virtual bool DoCombine(const wxRegion& region, wxRegionOp op);
-    virtual bool DoUnionWithRect(const wxRect& rect);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxRegion)
-    friend class WXDLLIMPEXP_FWD_CORE wxRegionIterator;
-};
-
-class WXDLLIMPEXP_CORE wxRegionIterator : public wxObject
-{
-public:
-    wxRegionIterator();
-    wxRegionIterator(const wxRegion& region);
-    wxRegionIterator(const wxRegionIterator& iterator);
-    virtual ~wxRegionIterator();
-
-    wxRegionIterator& operator=(const wxRegionIterator& iterator);
-
-    void Reset() { m_current = 0; }
-    void Reset(const wxRegion& region);
-
-    operator bool () const { return m_current < m_numRects; }
-    bool HaveRects() const { return m_current < m_numRects; }
-
-    wxRegionIterator& operator++();
-    wxRegionIterator operator++(int);
-
-    long GetX() const;
-    long GetY() const;
-    long GetW() const;
-    long GetWidth() const { return GetW(); }
-    long GetH() const;
-    long GetHeight() const { return GetH(); }
-    wxRect GetRect() const { return wxRect((int)GetX(), (int)GetY(), (int)GetWidth(), (int)GetHeight()); }
-
-private:
-    void SetRects(long numRects, wxRect *rects);
-
-    long     m_current;
-    long     m_numRects;
-    wxRegion m_region;
-    wxRect*  m_rects;
-
-    DECLARE_DYNAMIC_CLASS(wxRegionIterator)
-};
-
-#endif // _WX_MAC_CARBON_REGION_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/statbmp.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/statbmp.h
deleted file mode 100644
index 0f9ffb1763..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/statbmp.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/carbon/statbmp.h
-// Purpose:     wxStaticBitmap class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_STATBMP_H_
-#define _WX_STATBMP_H_
-
-#include "wx/icon.h"
-
-class WXDLLIMPEXP_CORE wxStaticBitmap: public wxStaticBitmapBase
-{
-  DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
- public:
-  wxStaticBitmap() { }
-
-  wxStaticBitmap(wxWindow *parent, wxWindowID id,
-           const wxBitmap& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = 0,
-           const wxString& name = wxStaticBitmapNameStr)
-  {
-    Create(parent, id, label, pos, size, style, name);
-  }
-
-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxBitmap& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = 0,
-           const wxString& name = wxStaticBitmapNameStr);
-
-  virtual void SetBitmap(const wxBitmap& bitmap);
-
-  virtual void Command(wxCommandEvent& WXUNUSED(event)) {}
-  virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}
-  void         OnPaint( wxPaintEvent &event ) ;
-
-  wxBitmap GetBitmap() const { return m_bitmap; }
-  wxIcon GetIcon() const
-      {
-      // icons and bitmaps are really the same thing in wxMac
-      return (const wxIcon &)m_bitmap;
-      }
-  void  SetIcon(const wxIcon& icon) { SetBitmap( (const wxBitmap &)icon ) ; }
-
-  // overridden base class virtuals
-  virtual bool AcceptsFocus() const { return false; }
-
- protected:
-    virtual wxSize DoGetBestSize() const;
-
-    wxBitmap m_bitmap;
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
-    // _WX_STATBMP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/uma.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/uma.h
deleted file mode 100644
index 57b77f798c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/carbon/uma.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/carbon/uma.h
-// Purpose:     Universal MacOS API
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     03/02/99
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef H_UMA
-#define H_UMA
-
-#include "wx/osx/private.h"
-
-#if wxUSE_GUI
-
-// menu manager
-
-MenuRef         UMANewMenu( SInt16 id , const wxString& title , wxFontEncoding encoding) ;
-void             UMASetMenuTitle( MenuRef menu , const wxString& title , wxFontEncoding encoding) ;
-void             UMAEnableMenuItem( MenuRef inMenu , MenuItemIndex item , bool enable ) ;
-
-void            UMAAppendMenuItem( MenuRef menu , const wxString& title , wxFontEncoding encoding , wxAcceleratorEntry *entry = NULL  ) ;
-void            UMAInsertMenuItem( MenuRef menu , const wxString& title , wxFontEncoding encoding , MenuItemIndex item , wxAcceleratorEntry *entry = NULL ) ;
-void             UMASetMenuItemShortcut( MenuRef menu , MenuItemIndex item , wxAcceleratorEntry *entry ) ;
-
-void            UMASetMenuItemText(  MenuRef menu,  MenuItemIndex item, const wxString& title , wxFontEncoding encoding ) ;
-
-// Retrieves the Help menu handle. Warning: As a side-effect this functions also
-// creates the Help menu if it didn't exist yet.
-OSStatus UMAGetHelpMenu(
-  MenuRef *        outHelpMenu,
-  MenuItemIndex *  outFirstCustomItemIndex);      /* can be NULL */
-
-// Same as UMAGetHelpMenu, but doesn't create the Help menu if UMAGetHelpMenu hasn't been called yet.
-OSStatus UMAGetHelpMenuDontCreate(
-  MenuRef *        outHelpMenu,
-  MenuItemIndex *  outFirstCustomItemIndex);      /* can be NULL */
-
-#endif // wxUSE_GUI
-
-#endif
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/checkbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/checkbox.h
deleted file mode 100644
index 3ba0accc90..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/checkbox.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/checkbox.h
-// Purpose:     wxCheckBox class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CHECKBOX_H_
-#define _WX_CHECKBOX_H_
-
-// Checkbox item (single checkbox)
-class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase
-{
-public:
-    wxCheckBox() { }
-    wxCheckBox(wxWindow *parent, wxWindowID id, const wxString& label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr)
-    {
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr);
-    virtual void SetValue(bool);
-    virtual bool GetValue() const;
-
-    virtual void Command(wxCommandEvent& event);
-
-    // osx specific event handling common for all osx-ports
-
-    virtual bool        OSXHandleClicked( double timestampsec );
-protected:
-    void DoSet3StateValue(wxCheckBoxState val);
-    virtual wxCheckBoxState DoGet3StateValue() const;
-
-    DECLARE_DYNAMIC_CLASS(wxCheckBox)
-};
-
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLIMPEXP_CORE wxBitmapCheckBox: public wxCheckBox
-{
-public:
-    int checkWidth;
-    int checkHeight;
-
-    wxBitmapCheckBox()
-        : checkWidth(-1), checkHeight(-1)
-        { }
-
-    wxBitmapCheckBox(wxWindow *parent, wxWindowID id, const wxBitmap *label,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr)
-    {
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id, const wxBitmap *bitmap,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxCheckBoxNameStr);
-    virtual void SetValue(bool);
-    virtual bool GetValue() const;
-    virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-    virtual void SetLabel(const wxBitmap *bitmap);
-    virtual void SetLabel( const wxString & WXUNUSED(name) ) {}
-
-    DECLARE_DYNAMIC_CLASS(wxBitmapCheckBox)
-};
-#endif
-    // _WX_CHECKBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/checklst.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/checklst.h
deleted file mode 100644
index c23d36f562..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/checklst.h
+++ /dev/null
@@ -1,93 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/checklst.h
-// Purpose:     wxCheckListBox class - a listbox with checkable items
-//              Note: this is an optional class.
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_CHECKLST_H_
-#define _WX_MAC_CHECKLST_H_
-
-class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase
-{
-public:
-    // ctors
-    wxCheckListBox() { Init(); }
-    wxCheckListBox(wxWindow *parent,
-                   wxWindowID id,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   int nStrings = 0,
-                   const wxString *choices = NULL,
-                   long style = 0,
-                   const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxListBoxNameStr)
-    {
-        Init();
-
-        Create(parent, id, pos, size, nStrings, choices, style, validator, name);
-    }
-    wxCheckListBox(wxWindow *parent,
-                   wxWindowID id,
-                   const wxPoint& pos,
-                   const wxSize& size,
-                   const wxArrayString& choices,
-                   long style = 0,
-                   const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxListBoxNameStr)
-    {
-        Init();
-
-        Create(parent, id, pos, size, choices, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                int nStrings = 0,
-                const wxString *choices = NULL,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos,
-                const wxSize& size,
-                const wxArrayString& choices,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
-
-    // items may be checked
-    bool  IsChecked(unsigned int uiIndex) const;
-    void  Check(unsigned int uiIndex, bool bCheck = true);
-
-    // data callbacks
-    virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value );
-    virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value );
-
-protected:
-   // override all methods which add/delete items to update m_checks array as
-    // well
-    virtual void OnItemInserted(unsigned int pos);
-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual void DoClear();
-
-    // the array containing the checked status of the items
-    wxArrayInt m_checks;
-
-    wxListWidgetColumn* m_checkColumn ;
-
-    void Init();
-
-private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
-};
-
-#endif // _WX_MAC_CHECKLST_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/chkconf.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/chkconf.h
deleted file mode 100644
index c960923cc8..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/chkconf.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Name:        wx/osx/chkconf.h
- * Purpose:     Mac-specific config settings checks
- * Author:      Vadim Zeitlin
- * Modified by:
- * Created:     2005-04-05 (extracted from wx/chkconf.h)
- * Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwidgets.org>
- * Licence:     wxWindows licence
- */
-
-/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
-
-#ifndef _WX_OSX_CHKCONF_H_
-#define _WX_OSX_CHKCONF_H_
-
-/*
- * check graphics context option, must be on for every os x platform
- * we only use core graphics now on all builds, try to catch attempts
- * to configure the build otherwise and give error messages
- */
-
-#if wxUSE_GUI && (!wxUSE_GRAPHICS_CONTEXT || \
-    ( defined( wxMAC_USE_CORE_GRAPHICS ) && !wxMAC_USE_CORE_GRAPHICS ))
-#   error "OS X builds use CoreGraphics in this wx version, you cannot turn back to QuickDraw completely"
-#endif
-
-/*
- * using mixins of cocoa functionality
- */
-
-#ifdef __WXOSX_COCOA__
-    #define wxOSX_USE_COCOA 1
-#else
-    #define wxOSX_USE_COCOA 0
-#endif
-
-#ifdef __WXOSX_CARBON__
-    #define wxOSX_USE_CARBON 1
-#else
-    #define wxOSX_USE_CARBON 0
-#endif
-
-/*
- * setting flags according to the platform
- */
-
-#ifdef __LP64__
-    #if wxOSX_USE_COCOA == 0
-        #undef wxOSX_USE_COCOA
-        #define wxOSX_USE_COCOA 1
-    #endif
-    #if wxOSX_USE_CARBON
-        #error "Carbon does not support 64bit"
-    #endif
-    #define wxOSX_USE_IPHONE 0
-#else
-    #ifdef __WXOSX_IPHONE__
-        #define wxOSX_USE_IPHONE 1
-    #else
-        #define wxOSX_USE_IPHONE 0
-    #endif
-#endif
-
-/*
- * combination flags
- */
-
-#if wxOSX_USE_COCOA || wxOSX_USE_CARBON
-    #define wxOSX_USE_COCOA_OR_CARBON 1
-#else
-    #define wxOSX_USE_COCOA_OR_CARBON 0
-#endif
-
-#if wxOSX_USE_COCOA || wxOSX_USE_IPHONE
-    #define wxOSX_USE_COCOA_OR_IPHONE 1
-#else
-    #define wxOSX_USE_COCOA_OR_IPHONE 0
-#endif
-
-#if wxOSX_USE_IPHONE
-    #include "wx/osx/iphone/chkconf.h"
-#elif wxOSX_USE_CARBON
-    #include "wx/osx/carbon/chkconf.h"
-#elif wxOSX_USE_COCOA
-    #include "wx/osx/cocoa/chkconf.h"
-#endif
-
-#endif /* _WX_OSX_CHKCONF_H_ */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/choice.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/choice.h
deleted file mode 100644
index 0e108f4552..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/choice.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/choice.h
-// Purpose:     wxChoice class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CHOICE_H_
-#define _WX_CHOICE_H_
-
-#include "wx/control.h"
-
-#include  "wx/dynarray.h"
-#include  "wx/arrstr.h"
-
-WX_DEFINE_ARRAY( char * , wxChoiceDataArray ) ;
-
-// Choice item
-class WXDLLIMPEXP_CORE wxChoice: public wxChoiceBase
-{
-    DECLARE_DYNAMIC_CLASS(wxChoice)
-
-public:
-    wxChoice()
-        : m_strings(), m_datas()
-        {}
-
-    virtual ~wxChoice() ;
-
-    wxChoice(wxWindow *parent, wxWindowID id,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             int n = 0, const wxString choices[] = NULL,
-             long style = 0,
-             const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxChoiceNameStr)
-    {
-        Create(parent, id, pos, size, n, choices, style, validator, name);
-    }
-    wxChoice(wxWindow *parent, wxWindowID id,
-             const wxPoint& pos,
-             const wxSize& size,
-             const wxArrayString& choices,
-             long style = 0,
-             const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxChoiceNameStr)
-    {
-        Create(parent, id, pos, size, choices, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                int n = 0, const wxString choices[] = NULL,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxChoiceNameStr);
-    bool Create(wxWindow *parent, wxWindowID id,
-                const wxPoint& pos,
-                const wxSize& size,
-                const wxArrayString& choices,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxChoiceNameStr);
-
-    virtual unsigned int GetCount() const ;
-    virtual int GetSelection() const ;
-    virtual void SetSelection(int n);
-
-    virtual int FindString(const wxString& s, bool bCase = false) const;
-    virtual wxString GetString(unsigned int n) const ;
-    virtual void SetString(unsigned int pos, const wxString& s);
-    // osx specific event handling common for all osx-ports
-
-    virtual bool        OSXHandleClicked( double timestampsec );
-
-protected:
-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual void DoClear();
-
-    virtual wxSize DoGetBestSize() const ;
-    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
-                              unsigned int pos,
-                              void **clientData, wxClientDataType type);
-
-    virtual void DoSetItemClientData(unsigned int n, void* clientData);
-    virtual void* DoGetItemClientData(unsigned int n) const;
-
-    wxArrayString m_strings;
-    wxChoiceDataArray m_datas ;
-    wxMenu*    m_popUpMenu ;
-
-private:
-    // This should be called when the number of items in the control changes.
-    void DoAfterItemCountChange();
-};
-
-#endif
-    // _WX_CHOICE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/clipbrd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/clipbrd.h
deleted file mode 100644
index cba7a41e22..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/clipbrd.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/clipbrd.h
-// Purpose:     Clipboard functionality.
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CLIPBRD_H_
-#define _WX_CLIPBRD_H_
-
-#if wxUSE_CLIPBOARD
-
-#include "wx/osx/core/cfref.h"
-
-//-----------------------------------------------------------------------------
-// wxClipboard
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
-{
-public:
-    wxClipboard();
-    virtual ~wxClipboard();
-
-    // open the clipboard before SetData() and GetData()
-    virtual bool Open();
-
-    // close the clipboard after SetData() and GetData()
-    virtual void Close();
-
-    // query whether the clipboard is opened
-    virtual bool IsOpened() const;
-
-    // set the clipboard data. all other formats will be deleted.
-    virtual bool SetData( wxDataObject *data );
-
-    // add to the clipboard data.
-    virtual bool AddData( wxDataObject *data );
-
-    // ask if data in correct format is available
-    virtual bool IsSupported( const wxDataFormat& format );
-
-    // fill data with data on the clipboard (if available)
-    virtual bool GetData( wxDataObject& data );
-
-    // clears wxTheClipboard and the system's clipboard if possible
-    virtual void Clear();
-
-    // flushes the clipboard: this means that the data which is currently on
-    // clipboard will stay available even after the application exits (possibly
-    // eating memory), otherwise the clipboard will be emptied on exit
-    virtual bool Flush();
-
-private:
-    wxDataObject     *m_data;
-    bool              m_open;
-    wxCFRef<PasteboardRef> m_pasteboard;
-
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
-};
-
-#endif // wxUSE_CLIPBOARD
-
-#endif // _WX_CLIPBRD_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/chkconf.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/chkconf.h
deleted file mode 100644
index 03fd501925..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/chkconf.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Name:        wx/osx/cocoa/chkconf.h
- * Purpose:     Compiler-specific configuration checking
- * Author:      Stefan Csomor
- * Modified by:
- * Created:     2008-07-30
- * Copyright:   (c) Stefan Csomor
- * Licence:     wxWindows licence
- */
-
-#ifndef _WX_OSX_COCOA_CHKCONF_H_
-#define _WX_OSX_COCOA_CHKCONF_H_
-
-/* Many wchar functions (and also strnlen(), for some reason) are only
-   available since 10.7 so don't use them if we want to build the applications
-   that would run under 10.6 and earlier. */
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
-#define HAVE_STRNLEN 1
-#define HAVE_WCSDUP 1
-#define HAVE_WCSNLEN 1
-#define HAVE_WCSCASECMP 1
-#define HAVE_WCSNCASECMP 1
-#endif
-
-/*
- * native (1) or emulated (0) toolbar
- */
-
-#ifndef wxOSX_USE_NATIVE_TOOLBAR
-    #define wxOSX_USE_NATIVE_TOOLBAR 1
-#endif
-
-/*
- * leave is isFlipped and don't override
- */
-#ifndef wxOSX_USE_NATIVE_FLIPPED 
-    #define wxOSX_USE_NATIVE_FLIPPED 1
-#endif
-
-/*
- * text rendering system
- */
-
-#define wxOSX_USE_ATSU_TEXT 0
-
-/*
- * Audio System
- */
-
-#define wxOSX_USE_QUICKTIME 0
-#define wxOSX_USE_AUDIOTOOLBOX 1
-
-/*
- * turning off capabilities that don't work under cocoa yet
- */
-
-#endif
-    /* _WX_MAC_CHKCONF_H_ */
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/dataview.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/dataview.h
deleted file mode 100644
index 2d33fff661..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/dataview.h
+++ /dev/null
@@ -1,518 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/cocoa/dataview.h
-// Purpose:     wxDataViewCtrl native implementation header for carbon
-// Author:
-// Copyright:   (c) 2009
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DATAVIEWCTRL_COCOOA_H_
-#define _WX_DATAVIEWCTRL_COCOOA_H_
-
-#include "wx/defs.h"
-
-#import <Cocoa/Cocoa.h>
-
-#include "wx/osx/core/dataview.h"
-#include "wx/osx/private.h"
-
-// Forward declaration
-class wxCocoaDataViewControl;
-
-/*
-    Dramatis personae:
-
-    [vertical arrows indicate inheritance, horizontal -- aggregation]
-
-
-        wxWindow ---> wxWidgetCocoaImpl  wxDataViewWidgetImpl   NSOutlineView
-            |                 \                  /                   |
-            |                  \                /                    |
-            |                   \              /                     |
-            v                   \/            \/                     v
-     wxDataViewCtrl -------> wxCocoaDataViewControl <-------> wxCocoaOutlineView
-
-
-     The right most classes are Objective-C only and can't be used from (pure)
-     C++ code.
- */
-
-// ============================================================================
-// wxPointerObject: simply stores a pointer, without taking its ownership
-// ============================================================================
-
-// Two pointer objects are equal if the containing pointers are equal. This
-// means also that the hash value of a pointer object depends only on the
-// stored pointer.
-
-@interface wxPointerObject : NSObject
-{
-    void* pointer;
-}
-
-    -(id) initWithPointer:(void*)initPointer;
-
-    -(void*) pointer;
-    -(void)  setPointer:(void*)newPointer;
-@end
-
-// ============================================================================
-// wxSortDescriptorObject: helper class to use native sorting facilities
-// ============================================================================
-
-@interface wxSortDescriptorObject : NSSortDescriptor<NSCopying>
-{
-    wxDataViewColumn* columnPtr; // pointer to the sorting column
-
-    wxDataViewModel* modelPtr; // pointer to model
-}
-
-    -(id)
-    initWithModelPtr:(wxDataViewModel*)initModelPtr
-        sortingColumnPtr:(wxDataViewColumn*)initColumnPtr
-        ascending:(BOOL)sortAscending;
-
-    -(wxDataViewColumn*) columnPtr;
-    -(wxDataViewModel*) modelPtr;
-
-    -(void) setColumnPtr:(wxDataViewColumn*)newColumnPtr;
-    -(void) setModelPtr:(wxDataViewModel*)newModelPtr;
-@end
-
-// ============================================================================
-// wxDataViewColumnNativeData: extra data for wxDataViewColumn
-// ============================================================================
-
-class wxDataViewColumnNativeData
-{
-public:
-    wxDataViewColumnNativeData() : m_NativeColumnPtr(NULL)
-    {
-    }
-
-    wxDataViewColumnNativeData(NSTableColumn* initNativeColumnPtr)
-        : m_NativeColumnPtr(initNativeColumnPtr)
-    {
-    }
-
-    NSTableColumn* GetNativeColumnPtr() const
-    {
-        return m_NativeColumnPtr;
-    }
-
-    void SetNativeColumnPtr(NSTableColumn* newNativeColumnPtr)
-    {
-        m_NativeColumnPtr = newNativeColumnPtr;
-    }
-
-private:
-    // not owned by us
-    NSTableColumn* m_NativeColumnPtr;
-};
-
-// ============================================================================
-// wxDataViewRendererNativeData: extra data for wxDataViewRenderer
-// ============================================================================
-
-class wxDataViewRendererNativeData
-{
-public:
-    wxDataViewRendererNativeData()
-        : m_Object(NULL), m_ColumnCell(NULL)
-    {
-        Init();
-    }
-
-    wxDataViewRendererNativeData(NSCell* initColumnCell)
-        : m_Object(NULL), m_ColumnCell([initColumnCell retain])
-    {
-        Init();
-    }
-
-    wxDataViewRendererNativeData(NSCell* initColumnCell, id initObject)
-        : m_Object([initObject retain]), m_ColumnCell([initColumnCell retain])
-    {
-        Init();
-    }
-
-    ~wxDataViewRendererNativeData()
-    {
-        [m_ColumnCell release];
-        [m_Object release];
-
-        [m_origFont release];
-        [m_origTextColour release];
-    }
-
-    NSCell* GetColumnCell() const { return m_ColumnCell; }
-    NSTableColumn* GetColumnPtr() const { return m_TableColumnPtr; }
-    id GetItem() const { return m_Item; }
-    NSCell* GetItemCell() const { return m_ItemCell; }
-    id GetObject() const { return m_Object; }
-
-    void SetColumnCell(NSCell* newCell)
-    {
-        [newCell retain];
-        [m_ColumnCell release];
-        m_ColumnCell = newCell;
-    }
-    void SetColumnPtr(NSTableColumn* newColumnPtr)
-    {
-        m_TableColumnPtr = newColumnPtr;
-    }
-    void SetItem(id newItem)
-    {
-        m_Item = newItem;
-    }
-    void SetItemCell(NSCell* newCell)
-    {
-        m_ItemCell = newCell;
-    }
-    void SetObject(id newObject)
-    {
-        [newObject retain];
-        [m_Object release];
-        m_Object = newObject;
-    }
-
-    // The original cell font and text colour stored here are NULL by default
-    // and are only initialized to the values retrieved from the cell when we
-    // change them from wxCocoaOutlineView:willDisplayCell:forTableColumn:item:
-    // which calls our SaveOriginalXXX() methods before changing the cell
-    // attributes.
-    //
-    // This allows us to avoid doing anything for the columns without any
-    // attributes but still be able to restore the correct attributes for the
-    // ones that do.
-    NSFont *GetOriginalFont() const { return m_origFont; }
-    NSColor *GetOriginalTextColour() const { return m_origTextColour; }
-
-    void SaveOriginalFont(NSFont *font)
-    {
-        m_origFont = [font retain];
-    }
-
-    void SaveOriginalTextColour(NSColor *textColour)
-    {
-        m_origTextColour = [textColour retain];
-    }
-
-    // The ellipsization mode which we need to set for each cell being rendered.
-    void SetEllipsizeMode(wxEllipsizeMode mode) { m_ellipsizeMode = mode; }
-    wxEllipsizeMode GetEllipsizeMode() const { return m_ellipsizeMode; }
-
-    // Set the line break mode for the given cell using our m_ellipsizeMode
-    void ApplyLineBreakMode(NSCell *cell);
-
-private:
-    // common part of all ctors
-    void Init();
-
-    id m_Item;   // item NOT owned by renderer
-
-    // object that can be used by renderer for storing special data (owned by
-    // renderer)
-    id m_Object;
-
-    NSCell* m_ColumnCell; // column's cell is owned by renderer
-    NSCell* m_ItemCell;   // item's cell is NOT owned by renderer
-
-    NSTableColumn* m_TableColumnPtr; // column NOT owned by renderer
-
-    // we own those if they're non-NULL
-    NSFont *m_origFont;
-    NSColor *m_origTextColour;
-
-    wxEllipsizeMode m_ellipsizeMode;
-};
-
-// ============================================================================
-// wxCocoaOutlineDataSource
-// ============================================================================
-
-// This class implements the data source delegate for the outline view.
-// As only an informal protocol exists this class inherits from NSObject only.
-//
-// As mentioned in the documentation for NSOutlineView the native control does
-// not own any data. Therefore, it has to be done by the data source.
-// Unfortunately, wxWidget's data source is a C++ data source but
-// NSOutlineDataSource requires objects as data. Therefore, the data (or better
-// the native item objects) have to be stored additionally in the native data
-// source.
-// NSOutlineView requires quick access to the item objects and quick linear
-// access to an item's children. This requires normally a hash type of storage
-// for the item object itself and an array structure for each item's children.
-// This means that basically two times the whole structure of wxWidget's model
-// class has to be stored.
-// This implementation is using a compromise: all items that are in use by the
-// control are stored in a set (from there they can be easily retrieved) and
-// owned by the set. Furthermore, children of the last parent are stored
-// in a linear list.
-//
-@interface wxCocoaOutlineDataSource : NSObject wxOSX_10_6_AND_LATER(<NSOutlineViewDataSource>)
-{
-    // descriptors specifying the sorting (currently the array only holds one
-    // object only)
-    NSArray* sortDescriptors;
-
-    NSMutableArray* children; // buffered children
-
-    NSMutableSet* items; // stores all items that are in use by the control
-
-    wxCocoaDataViewControl* implementation;
-
-    wxDataViewModel* model;
-
-    // parent of the buffered children; the object is owned
-    wxPointerObject* currentParentItem;
-}
-
-    // methods of informal protocol:
-    -(BOOL)
-    outlineView:(NSOutlineView*)outlineView
-        acceptDrop:(id<NSDraggingInfo>)info
-        item:(id)item
-        childIndex:(NSInteger)index;
-
-    -(id)
-    outlineView:(NSOutlineView*)outlineView
-        child:(NSInteger)index
-        ofItem:(id)item;
-
-    -(id)
-    outlineView:(NSOutlineView*)outlineView
-        objectValueForTableColumn:(NSTableColumn*)tableColumn
-        byItem:(id)item;
-
-    -(BOOL)
-    outlineView:(NSOutlineView*)outlineView
-        isItemExpandable:(id)item;
-
-    -(NSInteger)
-    outlineView:(NSOutlineView*)outlineView
-        numberOfChildrenOfItem:(id)item;
-
-    -(NSDragOperation)
-    outlineView:(NSOutlineView*)outlineView
-        validateDrop:(id<NSDraggingInfo>)info
-        proposedItem:(id)item
-        proposedChildIndex:(NSInteger)index;
-
-    -(BOOL)
-    outlineView:(NSOutlineView*)outlineView
-        writeItems:(NSArray*)items
-        toPasteboard:(NSPasteboard*)pasteboard;
-
-    // buffer for items handling
-    -(void)             addToBuffer:(wxPointerObject*)item;
-    -(void)             clearBuffer;
-    // returns the item in the buffer that has got the same pointer as "item",
-    // if such an item does not exist nil is returned
-    -(wxPointerObject*) getDataViewItemFromBuffer:(const wxDataViewItem&)item;
-    -(wxPointerObject*) getItemFromBuffer:(wxPointerObject*)item;
-    -(BOOL)             isInBuffer:(wxPointerObject*)item;
-    -(void)             removeFromBuffer:(wxPointerObject*)item;
-
-    // buffered children handling
-    -(void)             appendChild:(wxPointerObject*)item;
-    -(void)             clearChildren;
-    -(wxPointerObject*) getChild:(NSUInteger)index;
-    -(NSUInteger)       getChildCount;
-    -(void)             removeChild:(NSUInteger)index;
-
-    // buffer handling
-    -(void) clearBuffers;
-
-    // sorting
-    -(NSArray*) sortDescriptors;
-    -(void)     setSortDescriptors:(NSArray*)newSortDescriptors;
-
-    // access to wxWidgets variables
-    -(wxPointerObject*) currentParentItem;
-    -(wxCocoaDataViewControl*) implementation;
-    -(wxDataViewModel*) model;
-    -(void) setCurrentParentItem:(wxPointerObject*)newCurrentParentItem;
-    -(void) setImplementation:(wxCocoaDataViewControl*)newImplementation;
-    -(void) setModel:(wxDataViewModel*)newModel;
-
-    // other methods
-    -(void)
-    bufferItem:(wxPointerObject*)parentItem
-        withChildren:(wxDataViewItemArray*)dataViewChildrenPtr;
-@end
-
-// ============================================================================
-// wxCustomCell: used for custom renderers
-// ============================================================================
-
-@interface wxCustomCell : NSTextFieldCell
-{
-}
-
-    -(NSSize) cellSize;
-@end
-
-// ============================================================================
-// wxImageTextCell
-// ============================================================================
-//
-// As the native cocoa environment does not have a cell displaying an icon/
-// image and text at the same time, it has to be implemented by the user.
-// This implementation follows the implementation of Chuck Pisula in Apple's
-// DragNDropOutline sample application.
-// Although in wxDataViewCtrl icons are used on OSX icons do not exist for
-// display. Therefore, the cell is also called wxImageTextCell.
-// Instead of displaying images of any size (which is possible) this cell uses
-// a fixed size for displaying the image. Larger images are scaled to fit
-// into their reserved space. Smaller or not existing images use the fixed
-// reserved size and are scaled if necessary.
-//
-@interface wxImageTextCell : NSTextFieldCell
-{
-@private
-    CGFloat xImageShift;    // shift for the image in x-direction from border
-    CGFloat spaceImageText; // space between image and text
-
-    NSImage* image; // the image itself
-
-    NSSize imageSize; // largest size of the image; default size is (16, 16)
-
-    // the text alignment is used to align the whole cell (image and text)
-    NSTextAlignment cellAlignment;
-}
-
-    -(NSTextAlignment) alignment;
-    -(void) setAlignment:(NSTextAlignment)newAlignment;
-
-    -(NSImage*) image;
-    -(void) setImage:(NSImage*)newImage;
-
-    -(NSSize) imageSize;
-    -(void) setImageSize:(NSSize) newImageSize;
-
-    -(NSSize) cellSize;
-@end
-
-// ============================================================================
-// wxCocoaOutlineView
-// ============================================================================
-
-@interface wxCocoaOutlineView : NSOutlineView wxOSX_10_6_AND_LATER(<NSOutlineViewDelegate>)
-{
-@private
-    // column and row of the cell being edited or -1 if none
-    int currentlyEditedColumn,
-        currentlyEditedRow;
-
-    wxCocoaDataViewControl* implementation;
-}
-
-    -(wxCocoaDataViewControl*) implementation;
-    -(void) setImplementation:(wxCocoaDataViewControl*) newImplementation;
-@end
-
-// ============================================================================
-// wxCocoaDataViewControl
-// ============================================================================
-
-// This is the internal interface class between wxDataViewCtrl (wxWidget) and
-// the native source view (Mac OS X cocoa).
-class wxCocoaDataViewControl : public wxWidgetCocoaImpl,
-                               public wxDataViewWidgetImpl
-{
-public:
-    // constructors / destructor
-    wxCocoaDataViewControl(wxWindow* peer,
-                           const wxPoint& pos,
-                           const wxSize& size,
-                           long style);
-    virtual ~wxCocoaDataViewControl();
-
-    wxDataViewCtrl* GetDataViewCtrl() const
-    {
-        return static_cast<wxDataViewCtrl*>(GetWXPeer());
-    }
-
-    // column related methods (inherited from wxDataViewWidgetImpl)
-    virtual bool ClearColumns();
-    virtual bool DeleteColumn(wxDataViewColumn* columnPtr);
-    virtual void DoSetExpanderColumn(wxDataViewColumn const* columnPtr);
-    virtual wxDataViewColumn* GetColumn(unsigned int pos) const;
-    virtual int GetColumnPosition(wxDataViewColumn const* columnPtr) const;
-    virtual bool InsertColumn(unsigned int pos, wxDataViewColumn* columnPtr);
-    virtual void FitColumnWidthToContent(unsigned int pos);
-
-    // item related methods (inherited from wxDataViewWidgetImpl)
-    virtual bool Add(const wxDataViewItem& parent, const wxDataViewItem& item);
-    virtual bool Add(const wxDataViewItem& parent,
-                     const wxDataViewItemArray& items);
-    virtual void Collapse(const wxDataViewItem& item);
-    virtual void EnsureVisible(const wxDataViewItem& item,
-                               wxDataViewColumn const* columnPtr);
-    virtual void Expand(const wxDataViewItem& item);
-    virtual unsigned int GetCount() const;
-    virtual wxRect GetRectangle(const wxDataViewItem& item,
-                                wxDataViewColumn const* columnPtr);
-    virtual bool IsExpanded(const wxDataViewItem& item) const;
-    virtual bool Reload();
-    virtual bool Remove(const wxDataViewItem& parent,
-                        const wxDataViewItem& item);
-    virtual bool Remove(const wxDataViewItem& parent,
-                        const wxDataViewItemArray& item);
-    virtual bool Update(const wxDataViewColumn* columnPtr);
-    virtual bool Update(const wxDataViewItem& parent,
-                        const wxDataViewItem& item);
-    virtual bool Update(const wxDataViewItem& parent,
-                        const wxDataViewItemArray& items);
-
-    // model related methods
-    virtual bool AssociateModel(wxDataViewModel* model);
-
-    //
-    // selection related methods (inherited from wxDataViewWidgetImpl)
-    //
-    virtual wxDataViewItem GetCurrentItem() const;
-    virtual void SetCurrentItem(const wxDataViewItem& item);
-    virtual wxDataViewColumn *GetCurrentColumn() const;
-    virtual int  GetSelectedItemsCount() const;
-    virtual int  GetSelections(wxDataViewItemArray& sel)   const;
-    virtual bool IsSelected(const wxDataViewItem& item) const;
-    virtual void Select(const wxDataViewItem& item);
-    virtual void SelectAll();
-    virtual void Unselect(const wxDataViewItem& item);
-    virtual void UnselectAll();
-
-    //
-    // sorting related methods
-    //
-    virtual wxDataViewColumn* GetSortingColumn () const;
-    virtual void Resort();
-
-    //
-    // other methods (inherited from wxDataViewWidgetImpl)
-    //
-    virtual void DoSetIndent(int indent);
-    virtual void HitTest(const wxPoint& point,
-                         wxDataViewItem& item,
-                         wxDataViewColumn*& columnPtr) const;
-    virtual void SetRowHeight(const wxDataViewItem& item, unsigned int height);
-    virtual void OnSize();
-    
-    virtual void StartEditor( const wxDataViewItem & item, unsigned int column );
-
-    // drag & drop helper methods
-    wxDataFormat GetDnDDataFormat(wxDataObjectComposite* dataObjects);
-    wxDataObjectComposite* GetDnDDataObjects(NSData* dataObject) const;
-
-    // Cocoa-specific helpers
-    id GetItemAtRow(int row) const;
-
-private:
-    void InitOutlineView(long style);
-
-    wxCocoaOutlineDataSource* m_DataSource;
-
-    wxCocoaOutlineView* m_OutlineView;
-};
-
-#endif // _WX_DATAVIEWCTRL_COCOOA_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/evtloop.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/evtloop.h
deleted file mode 100644
index ab15dd94af..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/evtloop.h
+++ /dev/null
@@ -1,48 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/cocoa/evtloop.h
-// Purpose:     declaration of wxGUIEventLoop for wxOSX/Cocoa
-// Author:      Vadim Zeitlin
-// Created:     2008-12-28
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_COCOA_EVTLOOP_H_
-#define _WX_OSX_COCOA_EVTLOOP_H_
-
-class WXDLLIMPEXP_BASE wxGUIEventLoop : public wxCFEventLoop
-{
-public:
-    wxGUIEventLoop();
-    ~wxGUIEventLoop();
-    
-    void BeginModalSession( wxWindow* modalWindow );
-    
-    void EndModalSession();
-
-    virtual void WakeUp();
-
-    void OSXUseLowLevelWakeup(bool useIt)
-        { m_osxLowLevelWakeUp = useIt ; }
-    
-protected:
-    virtual int DoDispatchTimeout(unsigned long timeout);
-
-    virtual void OSXDoRun();
-    virtual void OSXDoStop();
-
-    virtual CFRunLoopRef CFGetCurrentRunLoop() const;
-    
-    void* m_modalSession;
-    
-    wxWindow* m_modalWindow;
-    
-    WXWindow m_dummyWindow;
-    
-    int m_modalNestedLevel;
-    
-    bool m_osxLowLevelWakeUp;
-};
-
-#endif // _WX_OSX_COCOA_EVTLOOP_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/private.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/private.h
deleted file mode 100644
index ed731f7e72..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/private.h
+++ /dev/null
@@ -1,475 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/cocoa/private.h
-// Purpose:     Private declarations: as this header is only included by
-//              wxWidgets itself, it may contain identifiers which don't start
-//              with "wx".
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRIVATE_COCOA_H_
-#define _WX_PRIVATE_COCOA_H_
-
-#include <ApplicationServices/ApplicationServices.h>
-
-#ifdef __OBJC__
-    #import <Cocoa/Cocoa.h>
-#endif
-
-//
-// shared between Cocoa and Carbon
-//
-
-// bring in theming types without pulling in the headers
-
-#if wxUSE_GUI
-typedef SInt16 ThemeBrush;
-CGColorRef WXDLLIMPEXP_CORE wxMacCreateCGColorFromHITheme( ThemeBrush brush ) ;
-OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
-                               CGContextRef    inContext,
-                               const CGRect *  inBounds,
-                               CGImageRef      inImage) ;
-WX_NSImage WXDLLIMPEXP_CORE wxOSXGetNSImageFromCGImage( CGImageRef image, double scale = 1.0 );
-CGImageRef WXDLLIMPEXP_CORE wxOSXCreateCGImageFromNSImage( WX_NSImage nsimage, double *scale = NULL );
-CGContextRef WXDLLIMPEXP_CORE wxOSXCreateBitmapContextFromNSImage( WX_NSImage nsimage);
-
-wxBitmap WXDLLIMPEXP_CORE wxOSXCreateSystemBitmap(const wxString& id, const wxString &client, const wxSize& size);
-WXWindow WXDLLIMPEXP_CORE wxOSXGetMainWindow();
-
-class WXDLLIMPEXP_FWD_CORE wxDialog;
-
-class WXDLLIMPEXP_CORE wxWidgetCocoaImpl : public wxWidgetImpl
-{
-public :
-    wxWidgetCocoaImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false, bool isUserPane = false ) ;
-    wxWidgetCocoaImpl() ;
-    ~wxWidgetCocoaImpl();
-
-    void Init();
-
-    virtual bool        IsVisible() const ;
-    virtual void        SetVisibility(bool);
-
-    // we provide a static function which can be reused from
-    // wxNonOwnedWindowCocoaImpl too
-    static bool ShowViewOrWindowWithEffect(wxWindow *win,
-                                           bool show,
-                                           wxShowEffect effect,
-                                           unsigned timeout);
-
-    virtual bool ShowWithEffect(bool show,
-                                wxShowEffect effect,
-                                unsigned timeout);
-
-    virtual void        Raise();
-
-    virtual void        Lower();
-
-    virtual void        ScrollRect( const wxRect *rect, int dx, int dy );
-
-    virtual WXWidget    GetWXWidget() const { return m_osxView; }
-
-    virtual void        SetBackgroundColour(const wxColour&);
-    virtual bool        SetBackgroundStyle(wxBackgroundStyle style);
-
-    virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const;
-    virtual void        Move(int x, int y, int width, int height);
-    virtual void        GetPosition( int &x, int &y ) const;
-    virtual void        GetSize( int &width, int &height ) const;
-    virtual void        SetControlSize( wxWindowVariant variant );
-
-    virtual void        SetNeedsDisplay( const wxRect* where = NULL );
-    virtual bool        GetNeedsDisplay() const;
-
-    virtual void        SetDrawingEnabled(bool enabled);
-
-    virtual bool        CanFocus() const;
-    // return true if successful
-    virtual bool        SetFocus();
-    virtual bool        HasFocus() const;
-
-    void                RemoveFromParent();
-    void                Embed( wxWidgetImpl *parent );
-
-    void                SetDefaultButton( bool isDefault );
-    void                PerformClick();
-    virtual void        SetLabel(const wxString& title, wxFontEncoding encoding);
-
-    void                SetCursor( const wxCursor & cursor );
-    void                CaptureMouse();
-    void                ReleaseMouse();
-#if wxUSE_DRAG_AND_DROP
-    void                SetDropTarget(wxDropTarget* target);
-#endif
-    wxInt32             GetValue() const;
-    void                SetValue( wxInt32 v );
-    wxBitmap            GetBitmap() const;
-    void                SetBitmap( const wxBitmap& bitmap );
-    void                SetBitmapPosition( wxDirection dir );
-    void                SetupTabs( const wxNotebook ¬ebook );
-    void                GetBestRect( wxRect *r ) const;
-    bool                IsEnabled() const;
-    void                Enable( bool enable );
-    bool                ButtonClickDidStateChange() { return true ;}
-    void                SetMinimum( wxInt32 v );
-    void                SetMaximum( wxInt32 v );
-    wxInt32             GetMinimum() const;
-    wxInt32             GetMaximum() const;
-    void                PulseGauge();
-    void                SetScrollThumb( wxInt32 value, wxInt32 thumbSize );
-
-    void                SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
-    void                SetToolTip( wxToolTip* tooltip );
-
-    void                InstallEventHandler( WXWidget control = NULL );
-
-    virtual bool        DoHandleMouseEvent(NSEvent *event);
-    virtual bool        DoHandleKeyEvent(NSEvent *event);
-    virtual bool        DoHandleCharEvent(NSEvent *event, NSString *text);
-    virtual void        DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow);
-
-    virtual void        SetupKeyEvent(wxKeyEvent &wxevent, NSEvent * nsEvent, NSString* charString = NULL);
-    virtual void        SetupMouseEvent(wxMouseEvent &wxevent, NSEvent * nsEvent);
-    void                SetupCoordinates(wxCoord &x, wxCoord &y, NSEvent *nsEvent);
-    virtual bool        SetupCursor(NSEvent* event);
-
-
-#if !wxOSX_USE_NATIVE_FLIPPED
-    void                SetFlipped(bool flipped);
-    virtual bool        IsFlipped() const { return m_isFlipped; }
-#endif
-
-    virtual double      GetContentScaleFactor() const;
-    
-    // cocoa thunk connected calls
-
-#if wxUSE_DRAG_AND_DROP
-    virtual unsigned int        draggingEntered(void* sender, WXWidget slf, void* _cmd);
-    virtual void                draggingExited(void* sender, WXWidget slf, void* _cmd);
-    virtual unsigned int        draggingUpdated(void* sender, WXWidget slf, void* _cmd);
-    virtual bool                performDragOperation(void* sender, WXWidget slf, void* _cmd);
-#endif
-    virtual void                mouseEvent(WX_NSEvent event, WXWidget slf, void* _cmd);
-    virtual void                cursorUpdate(WX_NSEvent event, WXWidget slf, void* _cmd);
-    virtual void                keyEvent(WX_NSEvent event, WXWidget slf, void* _cmd);
-    virtual void                insertText(NSString* text, WXWidget slf, void* _cmd);
-    virtual void                doCommandBySelector(void* sel, WXWidget slf, void* _cmd);
-    virtual bool                performKeyEquivalent(WX_NSEvent event, WXWidget slf, void* _cmd);
-    virtual bool                acceptsFirstResponder(WXWidget slf, void* _cmd);
-    virtual bool                becomeFirstResponder(WXWidget slf, void* _cmd);
-    virtual bool                resignFirstResponder(WXWidget slf, void* _cmd);
-#if !wxOSX_USE_NATIVE_FLIPPED
-    virtual bool                isFlipped(WXWidget slf, void* _cmd);
-#endif
-    virtual void                drawRect(void* rect, WXWidget slf, void* _cmd);
-
-    virtual void                controlAction(WXWidget slf, void* _cmd, void* sender);
-    virtual void                controlDoubleAction(WXWidget slf, void* _cmd, void *sender);
-
-    // for wxTextCtrl-derived classes, put here since they don't all derive
-    // from the same pimpl class.
-    virtual void                controlTextDidChange();
-
-protected:
-    WXWidget m_osxView;
-    NSEvent* m_lastKeyDownEvent;
-#if !wxOSX_USE_NATIVE_FLIPPED
-    bool m_isFlipped;
-#endif
-    // if it the control has an editor, that editor will already send some
-    // events, don't resend them
-    bool m_hasEditor;
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl)
-};
-
-DECLARE_WXCOCOA_OBJC_CLASS( wxNSWindow );
-
-class wxNonOwnedWindowCocoaImpl : public wxNonOwnedWindowImpl
-{
-public :
-    wxNonOwnedWindowCocoaImpl( wxNonOwnedWindow* nonownedwnd) ;
-    wxNonOwnedWindowCocoaImpl();
-
-    virtual ~wxNonOwnedWindowCocoaImpl();
-
-    virtual void WillBeDestroyed() ;
-    void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
-    long style, long extraStyle, const wxString& name ) ;
-    void Create( wxWindow* parent, WXWindow nativeWindow );
-
-    WXWindow GetWXWindow() const;
-    void Raise();
-    void Lower();
-    bool Show(bool show);
-
-    virtual bool ShowWithEffect(bool show,
-                                wxShowEffect effect,
-                                unsigned timeout);
-
-    void Update();
-    bool SetTransparent(wxByte alpha);
-    bool SetBackgroundColour(const wxColour& col );
-    void SetExtraStyle( long exStyle );
-    void SetWindowStyleFlag( long style );
-    bool SetBackgroundStyle(wxBackgroundStyle style);
-    bool CanSetTransparent();
-
-    void MoveWindow(int x, int y, int width, int height);
-    void GetPosition( int &x, int &y ) const;
-    void GetSize( int &width, int &height ) const;
-
-    void GetContentArea( int &left , int &top , int &width , int &height ) const;
-    bool SetShape(const wxRegion& region);
-
-    virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ;
-
-    virtual bool IsMaximized() const;
-
-    virtual bool IsIconized() const;
-
-    virtual void Iconize( bool iconize );
-
-    virtual void Maximize(bool maximize);
-
-    virtual bool IsFullScreen() const;
-
-    virtual bool ShowFullScreen(bool show, long style);
-
-    virtual void ShowWithoutActivating();
-
-    virtual void RequestUserAttention(int flags);
-
-    virtual void ScreenToWindow( int *x, int *y );
-
-    virtual void WindowToScreen( int *x, int *y );
-
-    virtual bool IsActive();
-
-    virtual void SetModified(bool modified);
-    virtual bool IsModified() const;
-
-    virtual void SetRepresentedFilename(const wxString& filename);
-
-    wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
-    
-    CGWindowLevel   GetWindowLevel() const { return m_macWindowLevel; }
-    void            RestoreWindowLevel();
-    
-    static WX_NSResponder GetNextFirstResponder() ;
-protected :
-    CGWindowLevel   m_macWindowLevel;
-    WXWindow        m_macWindow;
-    void *          m_macFullScreenData ;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowCocoaImpl)
-};
-
-DECLARE_WXCOCOA_OBJC_CLASS( wxNSButton );
-
-class wxButtonCocoaImpl : public wxWidgetCocoaImpl, public wxButtonImpl
-{
-public:
-    wxButtonCocoaImpl(wxWindowMac *wxpeer, wxNSButton *v);
-    virtual void SetBitmap(const wxBitmap& bitmap);
-#if wxUSE_MARKUP
-    virtual void SetLabelMarkup(const wxString& markup);
-#endif // wxUSE_MARKUP
-    
-    void SetPressedBitmap( const wxBitmap& bitmap );
-    void GetLayoutInset(int &left , int &top , int &right, int &bottom) const;
-    void SetAcceleratorFromLabel(const wxString& label);
-
-    NSButton *GetNSButton() const;
-};
-
-#ifdef __OBJC__
-    typedef void (*wxOSX_TextEventHandlerPtr)(NSView* self, SEL _cmd, NSString *event);
-    typedef void (*wxOSX_EventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event);
-    typedef BOOL (*wxOSX_PerformKeyEventHandlerPtr)(NSView* self, SEL _cmd, NSEvent *event);
-    typedef BOOL (*wxOSX_FocusHandlerPtr)(NSView* self, SEL _cmd);
-
-
-    WXDLLIMPEXP_CORE NSScreen* wxOSXGetMenuScreen();
-    WXDLLIMPEXP_CORE NSRect wxToNSRect( NSView* parent, const wxRect& r );
-    WXDLLIMPEXP_CORE wxRect wxFromNSRect( NSView* parent, const NSRect& rect );
-    WXDLLIMPEXP_CORE NSPoint wxToNSPoint( NSView* parent, const wxPoint& p );
-    WXDLLIMPEXP_CORE wxPoint wxFromNSPoint( NSView* parent, const NSPoint& p );
-
-    NSRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size ,
-        bool adjustForOrigin = true );
-
-    WXDLLIMPEXP_CORE NSView* wxOSXGetViewFromResponder( NSResponder* responder );
-
-    // used for many wxControls
-
-    @interface wxNSButton : NSButton
-    {
-        NSTrackingRectTag rectTag;
-    }
-
-    @end
-
-    @interface wxNSBox : NSBox
-    {
-    }
-
-    @end
-
-    @interface wxNSTextFieldEditor : NSTextView
-    {
-        NSEvent* lastKeyDownEvent;
-    }
-
-    @end
-
-    @interface wxNSTextField : NSTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>)
-    {
-        wxNSTextFieldEditor* fieldEditor;
-    }
-
-    - (wxNSTextFieldEditor*) fieldEditor;
-    - (void) setFieldEditor:(wxNSTextFieldEditor*) fieldEditor;
-
-    @end
-
-    @interface wxNSSecureTextField : NSSecureTextField wxOSX_10_6_AND_LATER(<NSTextFieldDelegate>)
-    {
-    }
-
-    @end
-
-
-    @interface wxNSTextView : NSTextView wxOSX_10_6_AND_LATER(<NSTextViewDelegate>)
-    {
-    }
-
-    - (void)textDidChange:(NSNotification *)aNotification;
-
-    @end
-
-    @interface wxNSComboBox : NSComboBox
-    {
-        wxNSTextFieldEditor* fieldEditor;
-    }
-
-    - (wxNSTextFieldEditor*) fieldEditor;
-    - (void) setFieldEditor:(wxNSTextFieldEditor*) fieldEditor;
-
-    @end
-
-
-
-    @interface wxNSMenu : NSMenu
-    {
-       wxMenuImpl* impl;
-    }
-
-    - (void) setImplementation:(wxMenuImpl*) item;
-    - (wxMenuImpl*) implementation;
-
-    @end
-
-    @interface wxNSMenuItem : NSMenuItem
-    {
-       wxMenuItemImpl* impl;
-    }
-
-    - (void) setImplementation:(wxMenuItemImpl*) item;
-    - (wxMenuItemImpl*) implementation;
-
-    - (void)clickedAction:(id)sender;
-    - (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
-
-    @end
-
-    void WXDLLIMPEXP_CORE wxOSXCocoaClassAddWXMethods(Class c);
-
-    /*
-    We need this for ShowModal, as the sheet just disables the parent window and
-    returns control to the app, whereas we don't want to return from ShowModal
-    until the sheet has been dismissed.
-    */
-    @interface ModalDialogDelegate : NSObject
-    {
-        BOOL sheetFinished;
-        int resultCode;
-        wxDialog* impl;
-    }
-
-    - (void)setImplementation: (wxDialog *)dialog;
-    - (BOOL)finished;
-    - (int)code;
-    - (void)waitForSheetToFinish;
-    - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo;
-    @end
-
-    // This interface must be exported in shared 64 bit multilib build but
-    // using WXEXPORT with Objective C interfaces doesn't work with old (4.0.1)
-    // gcc when using 10.4 SDK. It does work with newer gcc even in 32 bit
-    // builds but seems to be unnecessary there so to avoid the expense of a
-    // configure check verifying if this does work or not with the current
-    // compiler we just only use it for 64 bit builds where this is always
-    // supported.
-    //
-    // NB: Currently this is the only place where we need to export an
-    //     interface but if we need to do it elsewhere we should define a
-    //     WXEXPORT_OBJC macro once and reuse it in all places it's needed
-    //     instead of duplicating this preprocessor check.
-#ifdef __LP64__
-    WXEXPORT
-#endif // 64 bit builds
-    @interface wxNSAppController : NSObject wxOSX_10_6_AND_LATER(<NSApplicationDelegate>)
-    {
-    }
-
-    @end
-
-#endif // __OBJC__
-
-// NSCursor
-
-WX_NSCursor wxMacCocoaCreateStockCursor( int cursor_type );
-WX_NSCursor  wxMacCocoaCreateCursorFromCGImage( CGImageRef cgImageRef, float hotSpotX, float hotSpotY );
-void  wxMacCocoaSetCursor( WX_NSCursor cursor );
-void  wxMacCocoaHideCursor();
-void  wxMacCocoaShowCursor();
-
-typedef struct tagClassicCursor
-{
-    wxUint16 bits[16];
-    wxUint16 mask[16];
-    wxInt16 hotspot[2];
-}ClassicCursor;
-
-const short kwxCursorBullseye = 0;
-const short kwxCursorBlank = 1;
-const short kwxCursorPencil = 2;
-const short kwxCursorMagnifier = 3;
-const short kwxCursorNoEntry = 4;
-const short kwxCursorPaintBrush = 5;
-const short kwxCursorPointRight = 6;
-const short kwxCursorPointLeft = 7;
-const short kwxCursorQuestionArrow = 8;
-const short kwxCursorRightArrow = 9;
-const short kwxCursorSizeNS = 10;
-const short kwxCursorSize = 11;
-const short kwxCursorSizeNESW = 12;
-const short kwxCursorSizeNWSE = 13;
-const short kwxCursorRoller = 14;
-const short kwxCursorWatch = 15;
-const short kwxCursorLast = kwxCursorWatch;
-
-// exposing our fallback cursor map
-
-extern ClassicCursor gMacCursors[];
-
-extern NSLayoutManager* gNSLayoutManager;
-
-#endif
-
-#endif
-    // _WX_PRIVATE_COCOA_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/private/date.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/private/date.h
deleted file mode 100644
index e7d9d40b6d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/private/date.h
+++ /dev/null
@@ -1,50 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/cocoa/private/date.h
-// Purpose:     NSDate-related helpers
-// Author:      Vadim Zeitlin
-// Created:     2011-12-19
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_COCOA_PRIVATE_DATE_H_
-#define _WX_OSX_COCOA_PRIVATE_DATE_H_
-
-#include "wx/datetime.h"
-
-namespace wxOSXImpl
-{
-
-// Functions to convert between NSDate and wxDateTime.
-
-// Returns an NSDate corresponding to the given wxDateTime which can be invalid
-// (in which case nil is returned).
-inline NSDate* NSDateFromWX(const wxDateTime& dt)
-{
-    if ( !dt.IsValid() )
-        return nil;
-
-    // Get the internal representation as a double used by NSDate.
-    double ticks = dt.GetValue().ToDouble();
-
-    // wxDateTime uses milliseconds while NSDate uses (fractional) seconds.
-    return [NSDate dateWithTimeIntervalSince1970:ticks/1000.];
-}
-
-
-// Returns wxDateTime corresponding to the given NSDate (which may be nil).
-inline wxDateTime NSDateToWX(const NSDate* d)
-{
-    if ( !d )
-        return wxDefaultDateTime;
-
-    // Reverse everything done above.
-    wxLongLong ll;
-    ll.Assign([d timeIntervalSince1970]*1000);
-    wxDateTime dt(ll);
-    return dt;
-}
-
-} // namespace wxOSXImpl
-
-#endif // _WX_OSX_COCOA_PRIVATE_DATE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/private/markuptoattr.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/private/markuptoattr.h
deleted file mode 100644
index 1d23d8e3b4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/private/markuptoattr.h
+++ /dev/null
@@ -1,119 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/cocoa/private/markuptoattr.h
-// Purpose:     Class to convert markup to Cocoa attributed strings.
-// Author:      Vadim Zeitlin
-// Created:     2011-02-22
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_COCOA_PRIVATE_MARKUPTOATTR_H_
-#define _WX_OSX_COCOA_PRIVATE_MARKUPTOATTR_H_
-
-#include "wx/private/markupparserattr.h"
-
-// ----------------------------------------------------------------------------
-// wxMarkupToAttrString: create NSAttributedString from markup.
-// ----------------------------------------------------------------------------
-
-class wxMarkupToAttrString : public wxMarkupParserAttrOutput
-{
-public:
-    // We don't care about the original colours because we never use them but
-    // we do need the correct initial font as we apply modifiers (e.g. create a
-    // font larger than it) to it and so it must be valid.
-    wxMarkupToAttrString(wxWindow *win, const wxString& markup)
-        : wxMarkupParserAttrOutput(win->GetFont(), wxColour(), wxColour())
-    {
-        const wxCFStringRef
-            label(wxControl::RemoveMnemonics(wxMarkupParser::Strip(markup)));
-        m_attrString = [[NSMutableAttributedString alloc]
-                        initWithString: label.AsNSString()];
-
-        m_pos = 0;
-
-        [m_attrString beginEditing];
-
-        // First thing we do is change the default string font: as mentioned in
-        // Apple documentation, attributed strings use "Helvetica 12" font by
-        // default which is different from the system "Lucida Grande" font. So
-        // we need to explicitly change the font for the entire string.
-        [m_attrString addAttribute:NSFontAttributeName
-                      value:win->GetFont().OSXGetNSFont()
-                      range:NSMakeRange(0, [m_attrString length])];
-
-        // Now translate the markup tags to corresponding attributes.
-        wxMarkupParser parser(*this);
-        parser.Parse(markup);
-
-        [m_attrString endEditing];
-    }
-
-    ~wxMarkupToAttrString()
-    {
-        [m_attrString release];
-    }
-
-    // Accessor for the users of this class.
-    //
-    // We keep ownership of the returned string.
-    NSMutableAttributedString *GetNSAttributedString() const
-    {
-        return m_attrString;
-    }
-
-
-    // Implement base class pure virtual methods to process markup tags.
-    virtual void OnText(const wxString& text)
-    {
-        m_pos += wxControl::RemoveMnemonics(text).length();
-    }
-
-    virtual void OnAttrStart(const Attr& WXUNUSED(attr))
-    {
-        // Just remember the starting position of the range, we can't really
-        // set the attribute until we find the end of it.
-        m_rangeStarts.push(m_pos);
-    }
-
-    virtual void OnAttrEnd(const Attr& attr)
-    {
-        unsigned start = m_rangeStarts.top();
-        m_rangeStarts.pop();
-
-        const NSRange range = NSMakeRange(start, m_pos - start);
-
-        [m_attrString addAttribute:NSFontAttributeName
-                      value:attr.font.OSXGetNSFont()
-                      range:range];
-
-        if ( attr.foreground.IsOk() )
-        {
-            [m_attrString addAttribute:NSForegroundColorAttributeName
-                          value:attr.foreground.OSXGetNSColor()
-                          range:range];
-        }
-
-        if ( attr.background.IsOk() )
-        {
-            [m_attrString addAttribute:NSBackgroundColorAttributeName
-                          value:attr.background.OSXGetNSColor()
-                          range:range];
-        }
-    }
-
-private:
-    // The attributed string we're building.
-    NSMutableAttributedString *m_attrString;
-
-    // The current position in the output string.
-    unsigned m_pos;
-
-    // The positions of starting ranges.
-    wxStack<unsigned> m_rangeStarts;
-
-
-    wxDECLARE_NO_COPY_CLASS(wxMarkupToAttrString);
-};
-
-#endif // _WX_OSX_COCOA_PRIVATE_MARKUPTOATTR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/private/overlay.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/private/overlay.h
deleted file mode 100644
index 5a49e8104e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/private/overlay.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/cocoa/private/overlay.h
-// Purpose:     wxOverlayImpl declaration
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     2006-10-20
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_COCOA_PRIVATE_OVERLAY_H_
-#define _WX_OSX_COCOA_PRIVATE_OVERLAY_H_
-
-#include "wx/osx/private.h"
-#include "wx/toplevel.h"
-#include "wx/graphics.h"
-
-class wxOverlayImpl
-{
-public:
-    wxOverlayImpl() ;
-    ~wxOverlayImpl() ;
-
-
-    // clears the overlay without restoring the former state
-    // to be done eg when the window content has been changed and repainted
-    void Reset();
-
-    // returns true if it has been setup
-    bool IsOk();
-
-    void Init( wxDC* dc, int x , int y , int width , int height );
-
-    void BeginDrawing( wxDC* dc);
-
-    void EndDrawing( wxDC* dc);
-
-    void Clear( wxDC* dc);
-
-private:
-    void CreateOverlayWindow();
-
-    WXWindow m_overlayWindow;
-    WXWindow m_overlayParentWindow;
-    CGContextRef m_overlayContext ;
-    // we store the window in case we would have to issue a Refresh()
-    wxWindow* m_window ;
-
-    int m_x ;
-    int m_y ;
-    int m_width ;
-    int m_height ;
-} ;
-
-#endif // _WX_MAC_CARBON_PRIVATE_OVERLAY_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/private/textimpl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/private/textimpl.h
deleted file mode 100644
index 767f31cddb..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cocoa/private/textimpl.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/cocoa/private/textimpl.h
-// Purpose:     textcontrol implementation classes that have to be exposed
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     03/02/99
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_COCOA_PRIVATE_TEXTIMPL_H_
-#define _WX_OSX_COCOA_PRIVATE_TEXTIMPL_H_
-
-#include "wx/combobox.h"
-#include "wx/osx/private.h"
-
-// implementation exposed, so that search control can pull it
-
-class wxNSTextFieldControl : public wxWidgetCocoaImpl, public wxTextWidgetImpl
-{
-public :
-    // wxNSTextFieldControl must always be associated with a wxTextEntry. If
-    // it's associated with a wxTextCtrl then we can get the associated entry
-    // from it but otherwise the second ctor should be used to explicitly pass
-    // us the entry.
-    wxNSTextFieldControl( wxTextCtrl *text, WXWidget w );
-    wxNSTextFieldControl( wxWindow *wxPeer, wxTextEntry *entry, WXWidget w );
-    virtual ~wxNSTextFieldControl();
-
-    virtual bool CanClipMaxLength() const { return true; }
-    virtual void SetMaxLength(unsigned long len);
-        
-    virtual wxString GetStringValue() const ;
-    virtual void SetStringValue( const wxString &str) ;
-    virtual void Copy() ;
-    virtual void Cut() ;
-    virtual void Paste() ;
-    virtual bool CanPaste() const ;
-    virtual void SetEditable(bool editable) ;
-    virtual void GetSelection( long* from, long* to) const ;
-    virtual void SetSelection( long from , long to );
-    virtual void WriteText(const wxString& str) ;
-    virtual bool HasOwnContextMenu() const { return true; }
-    virtual bool SetHint(const wxString& hint);
-
-    virtual void controlAction(WXWidget slf, void* _cmd, void *sender);
-    virtual bool becomeFirstResponder(WXWidget slf, void *_cmd);
-    virtual bool resignFirstResponder(WXWidget slf, void *_cmd);
-
-    virtual void SetInternalSelection( long from , long to );
-
-protected :
-    NSTextField* m_textField;
-    long m_selStart;
-    long m_selEnd;
-
-private:
-    // Common part of both ctors.
-    void Init(WXWidget w);
-};
-
-class wxNSTextViewControl : public wxWidgetCocoaImpl, public wxTextWidgetImpl
-{
-public:
-    wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w );
-    virtual ~wxNSTextViewControl();
-
-    virtual wxString GetStringValue() const ;
-    virtual void SetStringValue( const wxString &str) ;
-    virtual void Copy() ;
-    virtual void Cut() ;
-    virtual void Paste() ;
-    virtual bool CanPaste() const ;
-    virtual void SetEditable(bool editable) ;
-    virtual void GetSelection( long* from, long* to) const ;
-    virtual void SetSelection( long from , long to );
-    virtual void WriteText(const wxString& str) ;
-    virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
-
-    virtual bool GetStyle(long position, wxTextAttr& style);
-    virtual void SetStyle(long start, long end, const wxTextAttr& style);
-
-    virtual bool CanFocus() const;
-
-    virtual bool HasOwnContextMenu() const { return true; }
-
-    virtual void CheckSpelling(bool check);
-    virtual wxSize GetBestSize() const;
-
-protected:
-    NSScrollView* m_scrollView;
-    NSTextView* m_textView;
-};
-
-class wxNSComboBoxControl : public wxNSTextFieldControl, public wxComboWidgetImpl
-{
-public :
-    wxNSComboBoxControl( wxComboBox *wxPeer, WXWidget w );
-    virtual ~wxNSComboBoxControl();
-
-    virtual int GetSelectedItem() const;
-    virtual void SetSelectedItem(int item);
-
-    virtual int GetNumberOfItems() const;
-
-    virtual void InsertItem(int pos, const wxString& item);
-    virtual void RemoveItem(int pos);
-
-    virtual void Clear();
-
-    virtual wxString GetStringAtIndex(int pos) const;
-
-    virtual int FindString(const wxString& text) const;
-    virtual void Popup();
-    virtual void Dismiss();
-
-    virtual void SetEditable(bool editable);
-
-    virtual void mouseEvent(WX_NSEvent event, WXWidget slf, void *_cmd);
-
-private:
-    NSComboBox* m_comboBox;
-};
-
-#endif // _WX_OSX_COCOA_PRIVATE_TEXTIMPL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/colordlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/colordlg.h
deleted file mode 100644
index 832b46cf0d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/colordlg.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/colordlg.h
-// Purpose:     wxColourDialog class. Use generic version if no
-//              platform-specific implementation.
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COLORDLG_H_
-#define _WX_COLORDLG_H_
-
-#include "wx/dialog.h"
-
-/*
- * Platform-specific colour dialog implementation
- */
-
-class WXDLLIMPEXP_CORE wxColourDialog: public wxDialog
-{
-DECLARE_DYNAMIC_CLASS(wxColourDialog)
-public:
-    wxColourDialog();
-    wxColourDialog(wxWindow *parent, wxColourData *data = NULL);
-
-    bool Create(wxWindow *parent, wxColourData *data = NULL);
-
-    int ShowModal();
-    wxColourData& GetColourData() { return m_colourData; }
-
-protected:
-    wxColourData        m_colourData;
-    wxWindow*           m_dialogParent;
-};
-
-#endif
-    // _WX_COLORDLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/colour.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/colour.h
deleted file mode 100644
index 408625476d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/colour.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "wx/osx/core/colour.h"
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/combobox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/combobox.h
deleted file mode 100644
index d7d16f503f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/combobox.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/combobox.h
-// Purpose:     wxComboBox class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COMBOBOX_H_
-#define _WX_COMBOBOX_H_
-
-#include "wx/containr.h"
-#include "wx/choice.h"
-#include "wx/textctrl.h"
-
-WX_DEFINE_ARRAY( char * , wxComboBoxDataArray ) ;
-
-// forward declaration of private implementation classes
-
-class wxComboBoxText;
-class wxComboBoxChoice;
-class wxComboWidgetImpl;
-
-// Combobox item
-class WXDLLIMPEXP_CORE wxComboBox :
-    public wxWindowWithItems<
-#if wxOSX_USE_CARBON
-                wxNavigationEnabled<wxControl>,
-#else
-                wxControl,
-#endif
-                wxComboBoxBase>
-{
-    DECLARE_DYNAMIC_CLASS(wxComboBox)
-
- public:
-    virtual ~wxComboBox();
-
-#if wxOSX_USE_CARBON
-    // forward these functions to all subcontrols
-    virtual bool Enable(bool enable = true);
-    virtual bool Show(bool show = true);
-#endif
-
-    // callback functions
-    virtual void DelegateTextChanged( const wxString& value );
-    virtual void DelegateChoice( const wxString& value );
-
-    wxComboBox() { }
-
-    wxComboBox(wxWindow *parent, wxWindowID id,
-           const wxString& value = wxEmptyString,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = NULL,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxComboBoxNameStr)
-    {
-        Create(parent, id, value, pos, size, n, choices, style, validator, name);
-    }
-
-    wxComboBox(wxWindow *parent, wxWindowID id,
-           const wxString& value,
-           const wxPoint& pos,
-           const wxSize& size,
-           const wxArrayString& choices,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxComboBoxNameStr)
-    {
-        Create(parent, id, value, pos, size, choices, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-           const wxString& value = wxEmptyString,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           int n = 0, const wxString choices[] = NULL,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxComboBoxNameStr);
-
-    bool Create(wxWindow *parent, wxWindowID id,
-           const wxString& value,
-           const wxPoint& pos,
-           const wxSize& size,
-           const wxArrayString& choices,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxComboBoxNameStr);
-
-    virtual int GetSelection() const;
-    virtual void GetSelection(long *from, long *to) const;
-    virtual void SetSelection(int n);
-    virtual void SetSelection(long from, long to);
-    virtual int FindString(const wxString& s, bool bCase = false) const;
-    virtual wxString GetString(unsigned int n) const;
-    virtual wxString GetStringSelection() const;
-    virtual void SetString(unsigned int n, const wxString& s);
-
-    virtual unsigned int GetCount() const;
-
-    virtual void SetValue(const wxString& value);
-// these methods are provided by wxTextEntry for the native impl.
-#if wxOSX_USE_CARBON
-    // Text field functions
-    virtual wxString GetValue() const;
-    virtual void WriteText(const wxString& text);
-
-    // Clipboard operations
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
-    virtual void SetInsertionPoint(long pos);
-    virtual void SetInsertionPointEnd();
-    virtual long GetInsertionPoint() const;
-    virtual wxTextPos GetLastPosition() const;
-    virtual void Replace(long from, long to, const wxString& value);
-    virtual void Remove(long from, long to);
-    virtual void SetEditable(bool editable);
-    virtual bool IsEditable() const;
-
-    virtual void Undo();
-    virtual void Redo();
-    virtual void SelectAll();
-
-    virtual bool CanCopy() const;
-    virtual bool CanCut() const;
-    virtual bool CanPaste() const;
-    virtual bool CanUndo() const;
-    virtual bool CanRedo() const;
-
-    virtual wxClientDataType GetClientDataType() const;
-
-    virtual wxTextWidgetImpl* GetTextPeer() const;
-#endif // wxOSX_USE_CARBON
-
-#if wxOSX_USE_COCOA
-    virtual void Popup();
-    virtual void Dismiss();
-#endif // wxOSX_USE_COCOA
-
-
-    // osx specific event handling common for all osx-ports
-
-    virtual bool        OSXHandleClicked( double timestampsec );
-
-#if wxOSX_USE_COCOA
-    wxComboWidgetImpl* GetComboPeer() const;
-#endif
-protected:
-    // List functions
-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual void DoClear();
-
-    // wxTextEntry functions
-#if wxOSX_USE_CARBON
-    virtual wxString DoGetValue() const;
-#endif
-    virtual wxWindow *GetEditableWindow() { return this; }
-
-    // override the base class virtuals involved in geometry calculations
-    virtual wxSize DoGetBestSize() const;
-#if wxOSX_USE_CARBON
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-#endif
-
-    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
-                              unsigned int pos,
-                              void **clientData, wxClientDataType type);
-
-    virtual void DoSetItemClientData(unsigned int n, void* clientData);
-    virtual void * DoGetItemClientData(unsigned int n) const;
-
-#if wxOSX_USE_CARBON
-    virtual void SetClientDataType(wxClientDataType clientDataItemsType);
-#endif
-
-    virtual void EnableTextChangedEvents(bool enable);
-
-    // the subcontrols
-    wxComboBoxText*     m_text;
-    wxComboBoxChoice*   m_choice;
-
-    wxComboBoxDataArray m_datas;
-};
-
-#endif // _WX_COMBOBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/config_xcode.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/config_xcode.h
deleted file mode 100644
index 1acc549ecf..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/config_xcode.h
+++ /dev/null
@@ -1,153 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/config_xcode.h
-// Purpose:     configurations for xcode builds
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     29.04.04
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// from config.log confdefs
-
-#define HAVE_SSIZE_T 1
-#define STDC_HEADERS 1
-#ifdef __BIG_ENDIAN__
-#define WORDS_BIGENDIAN 1
-#endif
-#define wxUSE_UNIX 1
-#define __UNIX__ 1
-#define __BSD__ 1
-#define __DARWIN__ 1
-#define wx_USE_NANOX 0
-#define TARGET_CARBON 1
-
-#define HAVE_EXPLICIT 1
-#define HAVE_VA_COPY 1
-#define HAVE_VARIADIC_MACROS 1
-#define HAVE_STD_WSTRING 1
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
-#if __GNUC__ > 4 || (  __GNUC__ == 4 && __GNUC_MINOR__ >= 2 )
-  #if !defined(__has_include)
-    #define HAVE_TR1_UNORDERED_MAP 1
-    #define HAVE_TR1_UNORDERED_SET 1
-    #define HAVE_TR1_TYPE_TRAITS 1
-  #endif
-  #define HAVE_GCC_ATOMIC_BUILTINS 1
-#endif
-#endif
-#define HAVE_VISIBILITY 1
-#define wxHAVE_PTHREAD_CLEANUP 1
-#define CONST_COMPATIBILITY 0
-#define WX_TIMEZONE timezone
-#define WX_SOCKLEN_T socklen_t
-#define SOCKOPTLEN_T socklen_t
-#define WX_STATFS_T struct statfs
-#define wxTYPE_SA_HANDLER int
-#define WX_GMTOFF_IN_TM 1
-#define HAVE_PW_GECOS 1
-#define HAVE_DLOPEN 1
-#define HAVE_CXA_DEMANGLE 1
-#define HAVE_GETTIMEOFDAY 1
-#define HAVE_FSYNC 1
-#define HAVE_ROUND 1
-#define HAVE_SCHED_YIELD 1
-#define HAVE_PTHREAD_MUTEXATTR_T 1
-#define HAVE_PTHREAD_MUTEXATTR_SETTYPE_DECL 1
-#define HAVE_PTHREAD_CANCEL 1
-#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
-#define HAVE_SNPRINTF 1
-#define HAVE_SNPRINTF_DECL 1
-#define HAVE_UNIX98_PRINTF 1
-#define HAVE_STATFS 1
-#define HAVE_STATFS_DECL 1
-#define HAVE_STRPTIME 1
-#define HAVE_STRPTIME_DECL 1
-#define HAVE_STRTOULL 1
-#define HAVE_THREAD_PRIORITY_FUNCTIONS 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_VSNPRINTF_DECL 1
-#define HAVE_VSSCANF 1
-#define HAVE_VSSCANF_DECL 1
-#define HAVE_USLEEP 1
-#define HAVE_WCSLEN 1
-#define SIZEOF_WCHAR_T 4
-#define SIZEOF_SHORT 2
-#define SIZEOF_INT 4
-#ifdef __LP64__
-#define SIZEOF_VOID_P 8
-#define SIZEOF_LONG 8
-#define SIZEOF_SIZE_T 8
-#else
-#define SIZEOF_VOID_P 4
-#define SIZEOF_LONG 4
-#define SIZEOF_SIZE_T 4
-#endif
-#define SIZEOF_LONG_LONG 8
-#define wxSIZE_T_IS_ULONG 1
-#define wxWCHAR_T_IS_REAL_TYPE 1
-#define HAVE_DLERROR 1
-#define HAVE_FCNTL 1
-#define HAVE_GETHOSTBYNAME 1
-#define HAVE_GETSERVBYNAME 1
-#define HAVE_GMTIME_R 1
-#define HAVE_INET_ADDR 1
-#define HAVE_INET_ATON 1
-#define HAVE_LOCALTIME_R 1
-#define HAVE_MKSTEMP 1
-#define HAVE_SETENV 1
-/* #define HAVE_PUTENV 1 */
-#define HAVE_STRTOK_R 1
-#define HAVE_UNAME 1
-#define HAVE_USLEEP 1
-#define HAVE_X11_XKBLIB_H 1
-#define HAVE_SCHED_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_WCHAR_H 1
-/* better to use the built-in CF conversions, also avoid iconv versioning problems */
-/* #undef HAVE_ICONV */
-#define ICONV_CONST
-#define HAVE_LANGINFO_H 1
-#define HAVE_WCSRTOMBS 1
-#define HAVE_FPUTWS 1
-#define HAVE_WPRINTF 1
-#define HAVE_VSWPRINTF 1
-#define HAVE_VSWSCANF 1
-#define HAVE_FSEEKO 1
-#define HAVE_SYS_SELECT_H 1
-#define HAVE_FDOPEN 1
-#define HAVE_SYSCONF 1
-#define HAVE_GETPWUID_R 1
-#define HAVE_GETGRGID_R 1
-#define HAVE_LOCALE_T 1
-#define wxHAS_KQUEUE 1
-
-#define WXWIN_OS_DESCRIPTION "Darwin 7.9.0 Power Macintosh"
-#define PACKAGE_BUGREPORT "wx-dev@lists.wxwidgets.org"
-#define PACKAGE_NAME "wxWidgets"
-#define PACKAGE_STRING "wxWidgets 3.0.1"
-#define PACKAGE_TARNAME "wxwidgets"
-#define PACKAGE_VERSION "3.0.1"
-
-// for regex
-#define WX_NO_REGEX_ADVANCED 1
-
-// for jpeg
-
-#define HAVE_STDLIB_H 1
-
-// OBSOLETE ?
-
-#define HAVE_COS 1
-#define HAVE_FLOOR 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_MEMORY_H 1
-
-#define HAVE_REGCOMP 1
-#define HAVE_STRINGS_H 1
-#define HAVE_STRING_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_X11_XLIB_H 1
-#define SOCKLEN_T socklen_t
-#define _FILE_OFFSET_BITS 64
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/control.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/control.h
deleted file mode 100644
index f0d7c4606b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/control.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/control.h
-// Purpose:     wxControl class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CONTROL_H_
-#define _WX_CONTROL_H_
-
-WXDLLIMPEXP_DATA_CORE(extern const char) wxControlNameStr[];
-
-// General item class
-class WXDLLIMPEXP_CORE wxControl : public wxControlBase
-{
-    DECLARE_ABSTRACT_CLASS(wxControl)
-
-public:
-   wxControl();
-   wxControl(wxWindow *parent, wxWindowID winid,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize, long style = 0,
-             const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxControlNameStr)
-    {
-        Create(parent, winid, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID winid,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxControlNameStr);
-
-   // Simulates an event
-   virtual void Command(wxCommandEvent& event) { ProcessCommand(event); }
-
-   // implementation from now on
-   // --------------------------
-
-   // Calls the callback and appropriate event handlers
-   bool ProcessCommand(wxCommandEvent& event);
-
-   void                 OnKeyDown( wxKeyEvent &event ) ;
-};
-
-#endif
-    // _WX_CONTROL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/cfdataref.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/cfdataref.h
deleted file mode 100644
index 6c604cd069..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/cfdataref.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/core/cfdataref.h
-// Purpose:     wxCFDataRef class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     2007/05/10
-// Copyright:   (c) 2007 Stefan Csomor
-// Licence:     wxWindows licence
-// Notes:       See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFBinaryData/index.html
-/////////////////////////////////////////////////////////////////////////////
-/*! @header     wx/osx/core/cfdataref.h
-    @abstract   wxCFDataRef template class
-*/
-
-#ifndef _WX_MAC_COREFOUNDATION_CFDATAREF_H__
-#define _WX_MAC_COREFOUNDATION_CFDATAREF_H__
-
-#include "wx/osx/core/cfref.h"
-
-#include <CoreFoundation/CFData.h>
-
-/*! @class wxCFDataRef
-    @discussion Properly retains/releases reference to CoreFoundation data objects
-*/
-class wxCFDataRef : public wxCFRef< CFDataRef >
-{
-public:
-    /*! @method     wxCFDataRef
-        @abstract   Creates a NULL data ref
-    */
-    wxCFDataRef()
-    {}
-
-    typedef wxCFRef<CFDataRef> super_type;
-
-    /*! @method     wxCFDataRef
-        @abstract   Assumes ownership of p and creates a reference to it.
-        @templatefield otherType    Any type.
-        @param p        The raw pointer to assume ownership of.  May be NULL.
-        @discussion Like shared_ptr, it is assumed that the caller has a strong reference to p and intends
-                    to transfer ownership of that reference to this ref holder.  If the object comes from
-                    a Create or Copy method then this is the correct behaviour.  If the object comes from
-                    a Get method then you must CFRetain it yourself before passing it to this constructor.
-                    A handy way to do this is to use the non-member wxCFRefFromGet factory funcion.
-                    This method is templated and takes an otherType *p.  This prevents implicit conversion
-                    using an operator refType() in a different ref-holding class type.
-    */
-    explicit wxCFDataRef(CFDataRef r)
-    :   super_type(r)
-    {}
-
-    /*! @method     wxCFDataRef
-        @abstract   Copies a ref holder of the same type
-        @param otherRef The other ref holder to copy.
-        @discussion Ownership will be shared by the original ref and the newly created ref. That is,
-                    the object will be explicitly retained by this new ref.
-    */
-    wxCFDataRef(const wxCFDataRef& otherRef)
-    :  super_type( otherRef )
-    {}
-
-    /*! @method     wxCFDataRef
-        @abstract   Copies raw data into a data ref
-        @param data The raw data.
-        @param length The data length.
-    */
-    wxCFDataRef(const UInt8* data, CFIndex length)
-    : super_type(CFDataCreate(kCFAllocatorDefault, data, length))
-    {
-    }
-
-    /*! @method     GetLength
-        @abstract   returns the length in bytes of the data stored
-    */
-    CFIndex GetLength() const
-    {
-        if ( m_ptr )
-            return CFDataGetLength( *this );
-        else
-            return 0;
-    }
-
-    /*! @method     GetBytes
-        @abstract   Copies the data into an external buffer
-        @param range The desired range.
-        @param buffer The target buffer.
-    */
-    void GetBytes( CFRange range, UInt8 *buffer ) const
-    {
-        if ( m_ptr )
-            CFDataGetBytes(m_ptr, range, buffer);
-    }
-};
-
-#endif //ifndef _WX_MAC_COREFOUNDATION_CFDATAREF_H__
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/cfref.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/cfref.h
deleted file mode 100644
index c4a6b3c17a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/cfref.h
+++ /dev/null
@@ -1,400 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/core/cfref.h
-// Purpose:     wxCFRef template class
-// Author:      David Elliott <dfe@cox.net>
-// Modified by: Stefan Csomor
-// Created:     2007/05/10
-// Copyright:   (c) 2007 David Elliott <dfe@cox.net>, Stefan Csomor
-// Licence:     wxWindows licence
-// Notes:       See http://developer.apple.com/documentation/CoreFoundation/Conceptual/CFMemoryMgmt/index.html
-/////////////////////////////////////////////////////////////////////////////
-/*! @header     wx/osx/core/cfref.h
-    @abstract   wxCFRef template class
-    @discussion FIXME: Convert doc tags to something less buggy with C++
-*/
-
-#ifndef _WX_MAC_COREFOUNDATION_CFREF_H__
-#define _WX_MAC_COREFOUNDATION_CFREF_H__
-
-// Include unistd to ensure that NULL is defined
-#include <unistd.h>
-// Include AvailabilityMacros for DEPRECATED_ATTRIBUTE
-#include <AvailabilityMacros.h>
-
-// #include <CoreFoundation/CFBase.h>
-/* Don't include CFBase.h such that this header can be included from public
- * headers with minimal namespace pollution.
- * Note that Darwin CF uses extern for CF_EXPORT.  If we need this on Win32
- * or non-Darwin Mac OS we'll need to define the appropriate __declspec.
- */
-typedef const void *CFTypeRef;
-extern "C" {
-extern /* CF_EXPORT */
-CFTypeRef CFRetain(CFTypeRef cf);
-extern /* CF_EXPORT */
-void CFRelease(CFTypeRef cf);
-} // extern "C"
-
-
-/*! @function   wxCFRelease
-    @abstract   A CFRelease variant that checks for NULL before releasing.
-    @discussion The parameter is template not for type safety but to ensure the argument
-                is a raw pointer and not a ref holder of any type.
-*/
-template <class Type>
-inline void wxCFRelease(Type *r)
-{
-    if ( r != NULL )
-        ::CFRelease((CFTypeRef)r);
-}
-
-/*! @function   wxCFRetain
-    @abstract   A typesafe CFRetain variant that checks for NULL.
-*/
-template <class Type>
-inline Type* wxCFRetain(Type *r)
-{
-    // NOTE(DE): Setting r to the result of CFRetain improves efficiency on both x86 and PPC
-    // Casting r to CFTypeRef ensures we are calling the real C version defined in CFBase.h
-    // and not any possibly templated/overloaded CFRetain.
-    if ( r != NULL )
-        r = (Type*)::CFRetain((CFTypeRef)r);
-    return r;
-}
-
-template <class refType>
-class wxCFRef;
-
-/*! @class wxCFWeakRef
-    @templatefield  refType     The CF reference type (e.g. CFStringRef, CFRunLoopRef, etc.)
-                                It should already be a pointer.  This is different from
-                                shared_ptr where the template parameter is the pointee type.
-    @discussion Wraps a raw pointer without any retain or release.
-                Provides a way to get what amounts to a raw pointer from a wxCFRef without
-                using a raw pointer.  Unlike a raw pointer, constructing a wxCFRef from this
-                class will cause it to be retained because it is assumed that a wxCFWeakRef
-                does not own its pointer.
-*/
-template <class refType>
-class wxCFWeakRef
-{
-    template <class refTypeA, class otherRefType>
-    friend wxCFWeakRef<refTypeA> static_cfref_cast(const wxCFRef<otherRefType> &otherRef);
-public:
-    /*! @method     wxCFWeakRef
-        @abstract   Creates a NULL reference
-    */
-    wxCFWeakRef()
-    :   m_ptr(NULL)
-    {}
-
-    // Default copy constructor is fine.
-    // Default destructor is fine but we'll set NULL to avoid bugs
-    ~wxCFWeakRef()
-    {   m_ptr = NULL; }
-
-    // Do not implement a raw-pointer constructor.
-
-    /*! @method     wxCFWeakRef
-        @abstract   Copies another ref holder where its type can be converted to ours
-        @templatefield otherRefType     Any type held by another wxCFWeakRef.
-        @param otherRef The other weak ref holder to copy.
-        @discussion This is merely a copy or implicit cast.
-    */
-    template <class otherRefType>
-    wxCFWeakRef(const wxCFWeakRef<otherRefType>& otherRef)
-    :   m_ptr(otherRef.get()) // Implicit conversion from otherRefType to refType should occur
-    {}
-
-    /*! @method     wxCFWeakRef
-        @abstract   Copies a strong ref holder where its type can be converted to ours
-        @templatefield otherRefType     Any type held by a wxCFRef.
-        @param otherRef The strong ref holder to copy.
-        @discussion This ref is merely a pointer copy, the strong ref still holds the pointer.
-    */
-    template <class otherRefType>
-    wxCFWeakRef(const wxCFRef<otherRefType>& otherRef)
-    :   m_ptr(otherRef.get()) // Implicit conversion from otherRefType to refType should occur
-    {}
-
-    /*! @method     get
-        @abstract   Explicit conversion to the underlying pointer type
-        @discussion Allows the caller to explicitly get the underlying pointer.
-    */
-    refType get() const
-    {   return m_ptr; }
-
-    /*! @method     operator refType
-        @abstract   Implicit conversion to the underlying pointer type
-        @discussion Allows the ref to be used in CF function calls.
-    */
-    operator refType() const
-    {   return m_ptr; }
-
-protected:
-    /*! @method     wxCFWeakRef
-        @abstract   Constructs a weak reference to the raw pointer
-        @templatefield otherType    Any type.
-        @param p        The raw pointer to assume ownership of.  May be NULL.
-        @discussion This method is private so that the friend static_cfref_cast can use it
-    */
-    template <class otherType>
-    explicit wxCFWeakRef(otherType *p)
-    :   m_ptr(p) // Implicit conversion from otherType* to refType should occur.
-    {}
-
-    /*! @var m_ptr      The raw pointer.
-    */
-    refType m_ptr;
-};
-
-/*! @class wxCFRef
-    @templatefield  refType     The CF reference type (e.g. CFStringRef, CFRunLoopRef, etc.)
-                                It should already be a pointer.  This is different from
-                                shared_ptr where the template parameter is the pointee type.
-    @discussion Properly retains/releases reference to CoreFoundation objects
-*/
-template <class refType>
-class wxCFRef
-{
-public:
-    /*! @method     wxCFRef
-        @abstract   Creates a NULL reference
-    */
-    wxCFRef()
-    :   m_ptr(NULL)
-    {}
-
-    /*! @method     wxCFRef
-        @abstract   Assumes ownership of p and creates a reference to it.
-        @templatefield otherType    Any type.
-        @param p        The raw pointer to assume ownership of.  May be NULL.
-        @discussion Like shared_ptr, it is assumed that the caller has a strong reference to p and intends
-                    to transfer ownership of that reference to this ref holder.  If the object comes from
-                    a Create or Copy method then this is the correct behaviour.  If the object comes from
-                    a Get method then you must CFRetain it yourself before passing it to this constructor.
-                    A handy way to do this is to use the non-member wxCFRefFromGet factory funcion.
-                    This method is templated and takes an otherType *p.  This prevents implicit conversion
-                    using an operator refType() in a different ref-holding class type.
-    */
-    template <class otherType>
-    explicit wxCFRef(otherType *p)
-    :   m_ptr(p) // Implicit conversion from otherType* to refType should occur.
-    {}
-
-    /*! @method     wxCFRef
-        @abstract   Copies a ref holder of the same type
-        @param otherRef The other ref holder to copy.
-        @discussion Ownership will be shared by the original ref and the newly created ref. That is,
-                    the object will be explicitly retained by this new ref.
-    */
-    wxCFRef(const wxCFRef& otherRef)
-    :   m_ptr(wxCFRetain(otherRef.m_ptr))
-    {}
-
-    /*! @method     wxCFRef
-        @abstract   Copies a ref holder where its type can be converted to ours
-        @templatefield otherRefType     Any type held by another wxCFRef.
-        @param otherRef The other ref holder to copy.
-        @discussion Ownership will be shared by the original ref and the newly created ref. That is,
-                    the object will be explicitly retained by this new ref.
-    */
-    template <class otherRefType>
-    wxCFRef(const wxCFRef<otherRefType>& otherRef)
-    :   m_ptr(wxCFRetain(otherRef.get())) // Implicit conversion from otherRefType to refType should occur
-    {}
-
-    /*! @method     wxCFRef
-        @abstract   Copies a weak ref holder where its type can be converted to ours
-        @templatefield otherRefType     Any type held by a wxCFWeakRef.
-        @param otherRef The weak ref holder to copy.
-        @discussion Ownership will be taken by this newly created ref. That is,
-                    the object will be explicitly retained by this new ref.
-                    Ownership is most likely shared with some other ref as well.
-    */
-    template <class otherRefType>
-    wxCFRef(const wxCFWeakRef<otherRefType>& otherRef)
-    :   m_ptr(wxCFRetain(otherRef.get())) // Implicit conversion from otherRefType to refType should occur
-    {}
-
-    /*! @method     ~wxCFRef
-        @abstract   Releases (potentially shared) ownership of the ref.
-        @discussion A ref holder instance is always assumed to have ownership so ownership is always
-                    released (CFRelease called) upon destruction.
-    */
-    ~wxCFRef()
-    {   reset(); }
-
-    /*! @method     operator=
-        @abstract   Assigns the other ref's pointer to us when the otherRef is the same type.
-        @param otherRef The other ref holder to copy.
-        @discussion The incoming pointer is retained, the original pointer is released, and this object
-                    is made to point to the new pointer.
-    */
-    wxCFRef& operator=(const wxCFRef& otherRef)
-    {
-        if (this != &otherRef)
-        {
-            wxCFRetain(otherRef.m_ptr);
-            wxCFRelease(m_ptr);
-            m_ptr = otherRef.m_ptr;
-        }
-        return *this;
-    }
-
-    /*! @method     operator=
-        @abstract   Assigns the other ref's pointer to us when the other ref can be converted to our type.
-        @templatefield otherRefType     Any type held by another wxCFRef
-        @param otherRef The other ref holder to copy.
-        @discussion The incoming pointer is retained, the original pointer is released, and this object
-                    is made to point to the new pointer.
-    */
-    template <class otherRefType>
-    wxCFRef& operator=(const wxCFRef<otherRefType>& otherRef)
-    {
-        wxCFRetain(otherRef.get());
-        wxCFRelease(m_ptr);
-        m_ptr = otherRef.get(); // Implicit conversion from otherRefType to refType should occur
-        return *this;
-    }
-
-    /*! @method     get
-        @abstract   Explicit conversion to the underlying pointer type
-        @discussion Allows the caller to explicitly get the underlying pointer.
-    */
-    refType get() const
-    {   return m_ptr; }
-
-    /*! @method     operator refType
-        @abstract   Implicit conversion to the underlying pointer type
-        @discussion Allows the ref to be used in CF function calls.
-    */
-    operator refType() const
-    {   return m_ptr; }
-
-#if 0
-    <   // HeaderDoc is retarded and thinks the GT from operator-> is part of a template param.
-        // So give it that < outside of a comment to fake it out. (if 0 is not a comment to HeaderDoc)
-#endif
-
-    /*! @method     operator->
-        @abstract   Implicit conversion to the underlying pointer type
-        @discussion This is nearly useless for CF types which are nearly always opaque
-    */
-    refType operator-> () const
-    {   return m_ptr; }
-
-    /*! @method     reset
-        @abstract   Nullifies the reference
-        @discussion Releases ownership (calls CFRelease) before nullifying the pointer.
-    */
-    void reset()
-    {
-        wxCFRelease(m_ptr);
-        m_ptr = NULL;
-    }
-
-    /*! @method     reset
-        @abstract   Sets this to a new reference
-        @templatefield otherType    Any type.
-        @param p        The raw pointer to assume ownership of
-        @discussion The existing reference is released (like destruction).  It is assumed that the caller
-                    has a strong reference to the new p and intends to transfer ownership of that reference
-                    to this ref holder.  Take care to call CFRetain if you received the object from a Get method.
-                    This method is templated and takes an otherType *p.  This prevents implicit conversion
-                    using an operator refType() in a different ref-holding class type.
-    */
-    template <class otherType>
-    void reset(otherType* p)
-    {
-        wxCFRelease(m_ptr);
-        m_ptr = p; // Automatic conversion should occur
-    }
-
-    // Release the pointer, i.e. give up its ownership.
-    refType release()
-    {
-        refType p = m_ptr;
-        m_ptr = NULL;
-        return p;
-    }
-
-protected:
-    /*! @var m_ptr      The raw pointer.
-    */
-    refType m_ptr;
-};
-
-/*! @function   wxCFRefFromGet
-    @abstract   Factory function to create wxCFRef from a raw pointer obtained from a Get-rule function
-    @param  p           The pointer to retain and create a wxCFRef from.  May be NULL.
-    @discussion Unlike the wxCFRef raw pointer constructor, this function explicitly retains its
-                argument.  This can be used for functions such as CFDictionaryGetValue() or
-                CFAttributedStringGetString() which return a temporary reference (Get-rule functions).
-                FIXME: Anybody got a better name?
-*/
-template <typename Type>
-inline wxCFRef<Type*> wxCFRefFromGet(Type *p)
-{
-    return wxCFRef<Type*>(wxCFRetain(p));
-}
-
-/*! @function   static_cfref_cast
-    @abstract   Works like static_cast but with a wxCFRef as the argument.
-    @param  refType     Template parameter.  The destination raw pointer type
-    @param  otherRef    Normal parameter.  The source wxCFRef<> object.
-    @discussion This is intended to be a clever way to make static_cast work while allowing
-                the return value to be converted to either a strong ref or a raw pointer
-                while ensuring that the retain count is updated appropriately.
-
-                This is modeled after shared_ptr's static_pointer_cast.  Just as wxCFRef is
-                parameterized on a pointer to an opaque type so is this class.  Note that
-                this differs from shared_ptr which is parameterized on the pointee type.
-
-                FIXME: Anybody got a better name?
-*/
-template <class refType, class otherRefType>
-inline wxCFWeakRef<refType> static_cfref_cast(const wxCFRef<otherRefType> &otherRef);
-
-template <class refType, class otherRefType>
-inline wxCFWeakRef<refType> static_cfref_cast(const wxCFRef<otherRefType> &otherRef)
-{
-    return wxCFWeakRef<refType>(static_cast<refType>(otherRef.get()));
-}
-
-/*! @function   CFRelease
-    @abstract   Overloads CFRelease so that the user is warned of bad behaviour.
-    @discussion It is rarely appropriate to retain or release a wxCFRef.  If one absolutely
-                must do it he can explicitly get() the raw pointer
-                Normally, this function is unimplemented resulting in a linker error if used.
-*/
-template <class T>
-inline void CFRelease(const wxCFRef<T*> & cfref) DEPRECATED_ATTRIBUTE;
-
-/*! @function   CFRetain
-    @abstract   Overloads CFRetain so that the user is warned of bad behaviour.
-    @discussion It is rarely appropriate to retain or release a wxCFRef.  If one absolutely
-                must do it he can explicitly get() the raw pointer
-                Normally, this function is unimplemented resulting in a linker error if used.
-*/
-template <class T>
-inline void CFRetain(const wxCFRef<T*>& cfref) DEPRECATED_ATTRIBUTE;
-
-// Change the 0 to a 1 if you want the functions to work (no link errors)
-// Neither function will cause retain/release side-effects if implemented.
-#if 0
-template <class T>
-void CFRelease(const wxCFRef<T*> & cfref)
-{
-    CFRelease(cfref.get());
-}
-
-template <class T>
-void CFRetain(const wxCFRef<T*> & cfref)
-{
-    CFRetain(cfref.get());
-}
-#endif
-
-#endif //ndef _WX_MAC_COREFOUNDATION_CFREF_H__
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/cfstring.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/cfstring.h
deleted file mode 100644
index cbe092463b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/cfstring.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/core/cfstring.h
-// Purpose:     wxCFStringRef and other string functions
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     2004-10-29 (from code in wx/mac/carbon/private.h)
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-// Usage:       Darwin (base library)
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_CFSTRINGHOLDER_H__
-#define __WX_CFSTRINGHOLDER_H__
-
-#include <CoreFoundation/CFString.h>
-
-#include "wx/dlimpexp.h"
-#include "wx/fontenc.h"
-#include "wx/osx/core/cfref.h"
-
-#ifdef WORDS_BIGENDIAN
-    #define kCFStringEncodingUTF32Native kCFStringEncodingUTF32BE
-#else
-    #define kCFStringEncodingUTF32Native kCFStringEncodingUTF32LE
-#endif
-
-class WXDLLIMPEXP_FWD_BASE wxString;
-
-WXDLLIMPEXP_BASE void wxMacConvertNewlines13To10( wxString *data ) ;
-WXDLLIMPEXP_BASE void wxMacConvertNewlines10To13( wxString *data ) ;
-
-WXDLLIMPEXP_BASE void wxMacConvertNewlines13To10( char * data ) ;
-WXDLLIMPEXP_BASE void wxMacConvertNewlines10To13( char * data ) ;
-
-WXDLLIMPEXP_BASE wxUint32 wxMacGetSystemEncFromFontEnc(wxFontEncoding encoding) ;
-WXDLLIMPEXP_BASE wxFontEncoding wxMacGetFontEncFromSystemEnc(wxUint32 encoding) ;
-WXDLLIMPEXP_BASE void wxMacWakeUp() ;
-
-class WXDLLIMPEXP_BASE wxCFStringRef : public wxCFRef< CFStringRef >
-{
-public:
-    wxCFStringRef()
-    {
-    }
-
-    wxCFStringRef(const wxString &str,
-                        wxFontEncoding encoding = wxFONTENCODING_DEFAULT) ;
-
-#if wxOSX_USE_COCOA_OR_IPHONE
-    wxCFStringRef(NSString* ref)
-        : wxCFRef< CFStringRef >((CFStringRef) ref)
-    {
-    }
-#endif
-
-    wxCFStringRef(CFStringRef ref)
-        : wxCFRef< CFStringRef >(ref)
-    {
-    }
-
-    wxCFStringRef(const wxCFStringRef& otherRef )
-        : wxCFRef< CFStringRef >(otherRef)
-    {
-    }
-
-    ~wxCFStringRef()
-    {
-    }
-
-    wxString AsString( wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) const;
-
-    static wxString AsString( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
-    static wxString AsStringWithNormalizationFormC( CFStringRef ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
-#if wxOSX_USE_COCOA_OR_IPHONE
-    static wxString AsString( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
-    static wxString AsStringWithNormalizationFormC( NSString* ref, wxFontEncoding encoding = wxFONTENCODING_DEFAULT ) ;
-#endif
-
-#if wxOSX_USE_COCOA_OR_IPHONE
-    NSString* AsNSString() const { return (NSString*)(CFStringRef) *this; }
-#endif
-private:
-} ;
-
-// corresponding class for holding UniChars (native unicode characters)
-
-class WXDLLIMPEXP_BASE wxMacUniCharBuffer
-{
-public :
-    wxMacUniCharBuffer( const wxString &str ) ;
-
-    ~wxMacUniCharBuffer() ;
-
-    UniCharPtr GetBuffer() ;
-
-    UniCharCount GetChars() ;
-
-private :
-    UniCharPtr m_ubuf ;
-    UniCharCount m_chars ;
-};
-#endif //__WXCFSTRINGHOLDER_H__
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/colour.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/colour.h
deleted file mode 100644
index 004b627f61..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/colour.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/core/colour.h
-// Purpose:     wxColour class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COLOUR_H_
-#define _WX_COLOUR_H_
-
-#include "wx/object.h"
-#include "wx/string.h"
-
-#include "wx/osx/core/cfref.h"
-
-struct RGBColor;
-
-// Colour
-class WXDLLIMPEXP_CORE wxColour: public wxColourBase
-{
-public:
-    // constructors
-    // ------------
-    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
-
-    // default copy ctor and dtor are ok
-
-    // accessors
-    virtual bool IsOk() const { return m_cgColour != NULL; }
-
-    virtual WXDLLIMPEXP_INLINE_CORE ChannelType Red() const { return m_red; }
-    virtual WXDLLIMPEXP_INLINE_CORE ChannelType Green() const { return m_green; }
-    virtual WXDLLIMPEXP_INLINE_CORE ChannelType Blue() const { return m_blue; }
-    virtual WXDLLIMPEXP_INLINE_CORE ChannelType Alpha() const { return m_alpha; }
-
-    // comparison
-    bool operator == (const wxColour& colour) const;
-
-    bool operator != (const wxColour& colour) const { return !(*this == colour); }
-
-    CGColorRef GetPixel() const { return m_cgColour; }
-
-    CGColorRef GetCGColor() const { return m_cgColour; }
-    CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); }
-
-#if wxOSX_USE_COCOA_OR_CARBON
-    void GetRGBColor( RGBColor *col ) const;
-#endif
-
-    // Mac-specific ctor and assignment operator from the native colour
-    // assumes ownership of CGColorRef
-    wxColour( CGColorRef col );
-#if wxOSX_USE_COCOA_OR_CARBON
-    wxColour(const RGBColor& col);
-    wxColour& operator=(const RGBColor& col);
-#endif
-#if wxOSX_USE_COCOA
-    wxColour(WX_NSColor color);
-    WX_NSColor OSXGetNSColor() const;
-#endif
-    wxColour& operator=(CGColorRef col);
-    wxColour& operator=(const wxColour& col);
-
-protected :
-    virtual void
-    InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a);
-#if wxOSX_USE_COCOA_OR_CARBON
-    void InitRGBColor( const RGBColor& col );
-#endif
-    void InitCGColorRef( CGColorRef col );
-    void InitFromComponents(const CGFloat* components, size_t numComponents );
-private:
-    wxCFRef<CGColorRef>     m_cgColour;
-
-    ChannelType             m_red;
-    ChannelType             m_blue;
-    ChannelType             m_green;
-    ChannelType             m_alpha;
-
-    DECLARE_DYNAMIC_CLASS(wxColour)
-};
-
-#endif
-  // _WX_COLOUR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/dataview.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/dataview.h
deleted file mode 100644
index 61d05bf309..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/dataview.h
+++ /dev/null
@@ -1,117 +0,0 @@
-
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/core/dataview.h
-// Purpose:     wxDataViewCtrl native implementation header for OSX
-// Author:
-// Copyright:   (c) 2009
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DATAVIEWCTRL_CORE_H_
-#define _WX_DATAVIEWCTRL_CORE_H_
-
-#include "wx/dataview.h"
-
-#if wxOSX_USE_CARBON
-typedef wxMacControl wxWidgetImplType;
-#else
-typedef wxWidgetImpl wxWidgetImplType;
-#endif
-
-// ---------------------------------------------------------
-// Helper functions for dataview implementation on OSX
-// ---------------------------------------------------------
-wxWidgetImplType* CreateDataView(wxWindowMac* wxpeer, wxWindowMac* parent,  wxWindowID id,
-                                 wxPoint const& pos, wxSize const& size,
-                                 long style, long extraStyle);
-wxString ConcatenateDataViewItemValues(wxDataViewCtrl const* dataViewCtrlPtr, wxDataViewItem const& dataViewItem); // concatenates all data of the visible columns of the passed control
-                                                                                                                   // and item TAB separated into a string and returns it
-
-// ---------------------------------------------------------
-// wxDataViewWidgetImpl
-// Common interface of the native dataview implementation
-// for the carbon and cocoa environment.
-// ATTENTION
-//  All methods assume that the passed column pointers are
-//  valid (unless a NULL pointer is explicitly allowed
-//  to be passed)!
-// ATTENTION
-// ---------------------------------------------------------
-class WXDLLIMPEXP_CORE wxDataViewWidgetImpl
-{
-public:
- //
- // constructors / destructor
- //
-  virtual ~wxDataViewWidgetImpl(void)
-  {
-  }
-
- //
- // column related methods
- //
-  virtual bool              ClearColumns       (void)                                          = 0; // deletes all columns in the native control
-  virtual bool              DeleteColumn       (wxDataViewColumn* columnPtr)                   = 0; // deletes the column in the native control
-  virtual void              DoSetExpanderColumn(wxDataViewColumn const* columnPtr)             = 0; // sets the disclosure column in the native control
-  virtual wxDataViewColumn* GetColumn          (unsigned int pos) const                        = 0; // returns the column belonging to 'pos' in the native control
-  virtual int               GetColumnPosition  (wxDataViewColumn const* columnPtr) const       = 0; // returns the position of the passed column in the native control
-  virtual bool              InsertColumn       (unsigned int pos, wxDataViewColumn* columnPtr) = 0; // inserts a column at pos in the native control;
-                                                                                                    // the method can assume that the column's owner is already set
-  virtual void              FitColumnWidthToContent(unsigned int pos)                          = 0; // resizes column to fit its content
-
- //
- // item related methods
- //
-  virtual bool         Add          (wxDataViewItem const& parent, wxDataViewItem const& item)       = 0; // adds an item to the native control
-  virtual bool         Add          (wxDataViewItem const& parent, wxDataViewItemArray const& itesm) = 0; // adds a items to the native control
-  virtual void         Collapse     (wxDataViewItem const& item)                                     = 0; // collapses the passed item in the native control
-  virtual void         EnsureVisible(wxDataViewItem const& item, wxDataViewColumn const* columnPtr)  = 0; // ensures that the passed item's value in the passed column is visible (column pointer can be NULL)
-  virtual void         Expand       (wxDataViewItem const& item)                                     = 0; // expands the passed item in the native control
-  virtual unsigned int GetCount     (void) const                                                     = 0; // returns the number of items in the native control
-  virtual wxRect       GetRectangle (wxDataViewItem const& item, wxDataViewColumn const* columnPtr)  = 0; // returns the rectangle that is used by the passed item and column in the native control
-  virtual bool         IsExpanded   (wxDataViewItem const& item) const                               = 0; // checks if the passed item is expanded in the native control
-  virtual bool         Reload       (void)                                                           = 0; // clears the native control and reloads all data
-  virtual bool         Remove       (wxDataViewItem const& parent, wxDataViewItem const& item)       = 0; // removes an item from the native control
-  virtual bool         Remove       (wxDataViewItem const& parent, wxDataViewItemArray const& item)  = 0; // removes items from the native control
-  virtual bool         Update       (wxDataViewColumn const* columnPtr)                              = 0; // updates the items in the passed column of the native control
-  virtual bool         Update       (wxDataViewItem const& parent, wxDataViewItem const& item)       = 0; // updates the passed item in the native control
-  virtual bool         Update       (wxDataViewItem const& parent, wxDataViewItemArray const& items) = 0; // updates the passed items in the native control
-
- //
- // model related methods
- //
-  virtual bool AssociateModel(wxDataViewModel* model) = 0; // informs the native control that a model is present
-
- //
- // selection related methods
- //
-  virtual wxDataViewItem GetCurrentItem() const = 0;
-  virtual void SetCurrentItem(const wxDataViewItem& item) = 0;
-
-  virtual wxDataViewColumn *GetCurrentColumn() const = 0;
-
-  virtual int  GetSelectedItemsCount() const = 0;
-  virtual int  GetSelections(wxDataViewItemArray& sel)   const = 0; // returns all selected items in the native control
-  virtual bool IsSelected   (wxDataViewItem const& item) const = 0; // checks if the passed item is selected in the native control
-  virtual void Select       (wxDataViewItem const& item)       = 0; // selects the passed item in the native control
-  virtual void SelectAll    (void)                             = 0; // selects all items in the native control
-  virtual void Unselect     (wxDataViewItem const& item)       = 0; // unselects the passed item in the native control
-  virtual void UnselectAll  (void)                             = 0; // unselects all items in the native control
-
- //
- // sorting related methods
- //
-  virtual wxDataViewColumn* GetSortingColumn (void) const = 0; // returns the column that is primarily responsible for sorting in the native control
-  virtual void              Resort           (void)       = 0; // asks the native control to start a resorting process
-
- //
- // other methods
- //
-  virtual void DoSetIndent (int indent)                                                                     = 0; // sets the indention in the native control
-  virtual void HitTest     (wxPoint const& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const = 0; // return the item and column pointer that contains with the passed point
-  virtual void SetRowHeight(wxDataViewItem const& item, unsigned int height)                                = 0; // sets the height of the row containg the passed item in the native control
-  virtual void OnSize      (void)                                                                           = 0; // updates the layout of the native control after a size event
-  virtual void StartEditor( const wxDataViewItem & item, unsigned int column )                              = 0; // starts editing the passed in item and column
-};
-
-#endif // _WX_DATAVIEWCTRL_CORE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/evtloop.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/evtloop.h
deleted file mode 100644
index f3e181f6c4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/evtloop.h
+++ /dev/null
@@ -1,114 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/core/evtloop.h
-// Purpose:     CoreFoundation-based event loop
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     2006-01-12
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_CORE_EVTLOOP_H_
-#define _WX_OSX_CORE_EVTLOOP_H_
-
-DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoop )
-DECLARE_WXOSX_OPAQUE_CFREF( CFRunLoopObserver )
-
-class WXDLLIMPEXP_FWD_BASE wxCFEventLoopPauseIdleEvents;
-
-class WXDLLIMPEXP_BASE wxCFEventLoop : public wxEventLoopBase
-{
-    friend class wxCFEventLoopPauseIdleEvents;
-public:
-    wxCFEventLoop();
-    virtual ~wxCFEventLoop();
-
-    // sets the "should exit" flag and wakes up the loop so that it terminates
-    // soon
-    virtual void ScheduleExit(int rc = 0);
-
-    // return true if any events are available
-    virtual bool Pending() const;
-
-    // dispatch a single event, return false if we should exit from the loop
-    virtual bool Dispatch();
-
-    // same as Dispatch() but doesn't wait for longer than the specified (in
-    // ms) timeout, return true if an event was processed, false if we should
-    // exit the loop or -1 if timeout expired
-    virtual int DispatchTimeout(unsigned long timeout);
-
-    // implement this to wake up the loop: usually done by posting a dummy event
-    // to it (can be called from non main thread)
-    virtual void WakeUp();
-
-    virtual bool YieldFor(long eventsToProcess);
-
-    bool ShouldProcessIdleEvents() const { return m_processIdleEvents ; }
-    
-#if wxUSE_UIACTIONSIMULATOR
-    // notifies Yield and Dispatch to wait for at least one event before
-    // returning, this is necessary, because the synthesized events need to be
-    // converted by the OS before being available on the native event queue
-    void SetShouldWaitForEvent(bool should) { m_shouldWaitForEvent = should; }
-#endif
-protected:
-    // enters a loop calling OnNextIteration(), Pending() and Dispatch() and
-    // terminating when Exit() is called
-    virtual int DoRun();
-
-    void CommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity);
-    void DefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity);
-
-    // set to false to avoid idling at unexpected moments - eg when having native message boxes
-    void SetProcessIdleEvents(bool process) { m_processIdleEvents = process; }
-
-    static void OSXCommonModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info);
-    static void OSXDefaultModeObserverCallBack(CFRunLoopObserverRef observer, int activity, void *info);
-
-    // get the currently executing CFRunLoop
-    virtual CFRunLoopRef CFGetCurrentRunLoop() const;
-
-    virtual int DoDispatchTimeout(unsigned long timeout);
-
-    virtual void OSXDoRun();
-    virtual void OSXDoStop();
-
-    // the loop exit code
-    int m_exitcode;
-
-    // cfrunloop
-    CFRunLoopRef m_runLoop;
-
-    // common modes runloop observer
-    CFRunLoopObserverRef m_commonModeRunLoopObserver;
-
-    // default mode runloop observer
-    CFRunLoopObserverRef m_defaultModeRunLoopObserver;
-
-    // set to false to avoid idling at unexpected moments - eg when having native message boxes
-    bool m_processIdleEvents;
-
-#if wxUSE_UIACTIONSIMULATOR
-    bool m_shouldWaitForEvent;
-#endif
-private:
-    // process all already pending events and dispatch a new one (blocking
-    // until it appears in the event queue if necessary)
-    //
-    // returns the return value of DoDispatchTimeout()
-    int DoProcessEvents();
-
-    wxDECLARE_NO_COPY_CLASS(wxCFEventLoop);
-};
-
-class WXDLLIMPEXP_BASE wxCFEventLoopPauseIdleEvents : public wxObject
-{
-public:
-    wxCFEventLoopPauseIdleEvents();
-    virtual ~wxCFEventLoopPauseIdleEvents();
-private:
-    bool m_formerState;
-};
-
-#endif // _WX_OSX_EVTLOOP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/hid.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/hid.h
deleted file mode 100644
index 20c1a7ba41..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/hid.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/core/hid.h
-// Purpose:     DARWIN HID layer for WX
-// Author:      Ryan Norton
-// Modified by:
-// Created:     11/11/2003
-// Copyright:   (c) Ryan Norton
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ===========================================================================
-// declarations
-// ===========================================================================
-
-// ---------------------------------------------------------------------------
-// headers
-// ---------------------------------------------------------------------------
-
-#ifndef _WX_MACCARBONHID_H_
-#define _WX_MACCARBONHID_H_
-
-#include "wx/defs.h"
-#include "wx/string.h"
-
-//Mac OSX only
-#ifdef __DARWIN__
-
-#include <IOKit/IOKitLib.h>
-#include <IOKit/IOCFPlugIn.h>
-#include <IOKit/hid/IOHIDLib.h>
-#include <IOKit/hid/IOHIDKeys.h>
-#include <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
-
-//Darn apple - doesn't properly wrap their headers in extern "C"!
-//http://www.macosx.com/forums/archive/index.php/t-68069.html
-extern "C" {
-#include <mach/mach_port.h>
-}
-
-#include <mach/mach.h> //this actually includes mach_port.h (see above)
-
-// ===========================================================================
-// definitions
-// ===========================================================================
-
-
-// ---------------------------------------------------------------------------
-// wxHIDDevice
-//
-// A wrapper around OS X HID Manager procedures.
-// The tutorial "Working With HID Class Device Interfaces" Is
-// Quite good, as is the sample program associated with it
-// (Depite the author's protests!).
-// ---------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxHIDDevice
-{
-public:
-    wxHIDDevice() : m_ppDevice(NULL), m_ppQueue(NULL), m_pCookies(NULL) {}
-
-    bool Create (int nClass = -1, int nType = -1, int nDev = 1);
-
-    static size_t GetCount(int nClass = -1, int nType = -1);
-
-    void AddCookie(CFTypeRef Data, int i);
-    void AddCookieInQueue(CFTypeRef Data, int i);
-    void InitCookies(size_t dwSize, bool bQueue = false);
-
-    //Must be implemented by derived classes
-    //builds the cookie array -
-    //first call InitCookies to initialize the cookie
-    //array, then AddCookie to add a cookie at a certain point in an array
-    virtual void BuildCookies(CFArrayRef Array) = 0;
-
-    //checks to see whether the cookie at nIndex is active (element value != 0)
-    bool IsActive(int nIndex);
-
-    //checks to see whether an element in the internal cookie array
-    //exists
-    bool HasElement(int nIndex);
-
-    //closes the device and cleans the queue and cookies
-    virtual ~wxHIDDevice();
-
-protected:
-    IOHIDDeviceInterface** m_ppDevice; //this, essentially
-    IOHIDQueueInterface**  m_ppQueue;  //queue (if we want one)
-    IOHIDElementCookie*    m_pCookies; //cookies
-
-    wxString    m_szProductName; //product name
-    int         m_nProductId; //product id
-    int         m_nManufacturerId; //manufacturer id
-    mach_port_t m_pPort;            //mach port to use
-};
-
-// ---------------------------------------------------------------------------
-// wxHIDKeyboard
-//
-// Semi-simple implementation that opens a connection to the first
-// keyboard of the machine. Used in wxGetKeyState.
-// ---------------------------------------------------------------------------
-class WXDLLIMPEXP_CORE wxHIDKeyboard : public wxHIDDevice
-{
-public:
-    static int GetCount();
-    bool Create(int nDev = 1);
-    void AddCookie(CFTypeRef Data, int i);
-    virtual void BuildCookies(CFArrayRef Array);
-    void DoBuildCookies(CFArrayRef Array);
-};
-
-#endif //__DARWIN__
-
-#endif
-    // _WX_MACCARBONHID_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/joystick.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/joystick.h
deleted file mode 100644
index 36941b5b0b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/joystick.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/core/joystick.h
-// Purpose:     wxJoystick class
-// Author:      Ryan Norton
-// Modified by:
-// Created:     2/13/2005
-// Copyright:   (c) Ryan Norton
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_JOYSTICK_H_
-#define _WX_JOYSTICK_H_
-
-#include "wx/event.h"
-
-class WXDLLIMPEXP_FWD_CORE wxJoystickThread;
-
-class WXDLLIMPEXP_ADV wxJoystick: public wxObject
-{
-    DECLARE_DYNAMIC_CLASS(wxJoystick)
- public:
-
-    wxJoystick(int joystick = wxJOYSTICK1);
-    virtual ~wxJoystick();
-
-    // Attributes
-    ////////////////////////////////////////////////////////////////////////////
-
-    wxPoint GetPosition() const;
-    int GetPosition(unsigned axis) const;
-    bool GetButtonState(unsigned button) const;
-    int GetZPosition() const;
-    int GetButtonState() const;
-    int GetPOVPosition() const;
-    int GetPOVCTSPosition() const;
-    int GetRudderPosition() const;
-    int GetUPosition() const;
-    int GetVPosition() const;
-    int GetMovementThreshold() const;
-    void SetMovementThreshold(int threshold) ;
-
-    // Capabilities
-    ////////////////////////////////////////////////////////////////////////////
-
-    bool IsOk() const; // Checks that the joystick is functioning
-    static int GetNumberJoysticks() ;
-    int GetManufacturerId() const ;
-    int GetProductId() const ;
-    wxString GetProductName() const ;
-    int GetXMin() const;
-    int GetYMin() const;
-    int GetZMin() const;
-    int GetXMax() const;
-    int GetYMax() const;
-    int GetZMax() const;
-    int GetNumberButtons() const;
-    int GetNumberAxes() const;
-    int GetMaxButtons() const;
-    int GetMaxAxes() const;
-    int GetPollingMin() const;
-    int GetPollingMax() const;
-    int GetRudderMin() const;
-    int GetRudderMax() const;
-    int GetUMin() const;
-    int GetUMax() const;
-    int GetVMin() const;
-    int GetVMax() const;
-
-    bool HasRudder() const;
-    bool HasZ() const;
-    bool HasU() const;
-    bool HasV() const;
-    bool HasPOV() const;
-    bool HasPOV4Dir() const;
-    bool HasPOVCTS() const;
-
-    // Operations
-    ////////////////////////////////////////////////////////////////////////////
-
-    // pollingFreq = 0 means that movement events are sent when above the threshold.
-    // If pollingFreq > 0, events are received every this many milliseconds.
-    bool SetCapture(wxWindow* win, int pollingFreq = 0);
-    bool ReleaseCapture();
-
-protected:
-    int                 m_joystick;
-    wxJoystickThread*   m_thread;
-    class wxHIDJoystick* m_hid;
-};
-
-#endif
-    // _WX_JOYSTICK_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/mimetype.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/mimetype.h
deleted file mode 100644
index 7f92a990ff..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/mimetype.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/core/mimetype.h
-// Purpose:     Mac implementation for wx mime-related classes
-// Author:      Neil Perkins
-// Modified by:
-// Created:     2010-05-15
-// Copyright:   (C) 2010 Neil Perkins
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MIMETYPE_IMPL_H
-#define _MIMETYPE_IMPL_H
-
-#include "wx/defs.h"
-
-#if wxUSE_MIMETYPE
-
-#include "wx/mimetype.h"
-#include "wx/hashmap.h"
-#include "wx/iconloc.h"
-
-
-// This class implements mime type functionality for Mac OS X using UTIs and Launch Services
-// Currently only the GetFileTypeFromXXXX public functions have been implemented
-class WXDLLIMPEXP_BASE wxMimeTypesManagerImpl
-{
-public:
-
-    wxMimeTypesManagerImpl();
-    virtual ~wxMimeTypesManagerImpl();
-
-    // These functions are not needed on Mac OS X and have no-op implementations
-    void Initialize(int mailcapStyles = wxMAILCAP_STANDARD, const wxString& extraDir = wxEmptyString);
-    void ClearData();
-
-    // Functions to look up types by ext, mime or UTI
-    wxFileType *GetFileTypeFromExtension(const wxString& ext);
-    wxFileType *GetFileTypeFromMimeType(const wxString& mimeType);
-    wxFileType *GetFileTypeFromUti(const wxString& uti);
-
-    // These functions are only stubs on Mac OS X
-    size_t EnumAllFileTypes(wxArrayString& mimetypes);
-    wxFileType *Associate(const wxFileTypeInfo& ftInfo);
-    bool Unassociate(wxFileType *ft);
-
-private:
-
-    // The work of querying the OS for type data is done in these two functions
-    void LoadTypeDataForUti(const wxString& uti);
-    void LoadDisplayDataForUti(const wxString& uti);
-
-    // These functions are pass-throughs from wxFileTypeImpl
-    bool GetExtensions(const wxString& uti, wxArrayString& extensions);
-    bool GetMimeType(const wxString& uti, wxString *mimeType);
-    bool GetMimeTypes(const wxString& uti, wxArrayString& mimeTypes);
-    bool GetIcon(const wxString& uti, wxIconLocation *iconLoc);
-    bool GetDescription(const wxString& uti, wxString *desc);
-    bool GetApplication(const wxString& uti, wxString *command);
-
-    // Structure to represent file types
-    typedef struct FileTypeData
-    {
-        wxArrayString extensions;
-        wxArrayString mimeTypes;
-        wxIconLocation iconLoc;
-        wxString application;
-        wxString description;
-    }
-    FileTypeInfo;
-
-    // Map types
-    WX_DECLARE_STRING_HASH_MAP( wxString, TagMap );
-    WX_DECLARE_STRING_HASH_MAP( FileTypeData, UtiMap );
-
-    // Data store
-    TagMap m_extMap;
-    TagMap m_mimeMap;
-    UtiMap m_utiMap;
-
-    friend class wxFileTypeImpl;
-};
-
-
-// This class provides the interface between wxFileType and wxMimeTypesManagerImple for Mac OS X
-// Currently only extension, mimetype, description and icon information is available
-// All other methods have no-op implementation
-class WXDLLIMPEXP_BASE wxFileTypeImpl
-{
-public:
-
-    wxFileTypeImpl();
-    virtual ~wxFileTypeImpl();
-
-    bool GetExtensions(wxArrayString& extensions) const ;
-    bool GetMimeType(wxString *mimeType) const ;
-    bool GetMimeTypes(wxArrayString& mimeTypes) const ;
-    bool GetIcon(wxIconLocation *iconLoc) const ;
-    bool GetDescription(wxString *desc) const ;
-    bool GetOpenCommand(wxString *openCmd, const wxFileType::MessageParameters& params) const;
-
-    // These functions are only stubs on Mac OS X
-    bool GetPrintCommand(wxString *printCmd, const wxFileType::MessageParameters& params) const;
-    size_t GetAllCommands(wxArrayString *verbs, wxArrayString *commands, const wxFileType::MessageParameters& params) const;
-    bool SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt = TRUE);
-    bool SetDefaultIcon(const wxString& strIcon = wxEmptyString, int index = 0);
-    bool Unassociate(wxFileType *ft);
-
-private:
-
-    // All that is needed to query type info - UTI and pointer to the manager
-    wxString m_uti;
-    wxMimeTypesManagerImpl* m_manager;
-
-    friend class wxMimeTypesManagerImpl;
-};
-
-#endif // wxUSE_MIMETYPE
-#endif //_MIMETYPE_IMPL_H
-
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/objcid.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/objcid.h
deleted file mode 100644
index 35238bb891..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/objcid.h
+++ /dev/null
@@ -1,23 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/core/objcid.h
-// Purpose:     Define wxObjCID working in both C++ and Objective-C.
-// Author:      Vadim Zeitlin
-// Created:     2012-05-20
-// Copyright:   (c) 2012 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_CORE_OBJCID_H_
-#define _WX_OSX_CORE_OBJCID_H_
-
-// ----------------------------------------------------------------------------
-// wxObjCID: Equivalent of Objective-C "id" that works in C++ code.
-// ----------------------------------------------------------------------------
-
-#ifdef __OBJC__
-    #define wxObjCID id
-#else
-    typedef struct objc_object* wxObjCID;
-#endif
-
-#endif // _WX_OSX_CORE_OBJCID_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/private.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/private.h
deleted file mode 100644
index f16850a083..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/private.h
+++ /dev/null
@@ -1,937 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/core/private.h
-// Purpose:     Private declarations: as this header is only included by
-//              wxWidgets itself, it may contain identifiers which don't start
-//              with "wx".
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRIVATE_CORE_H_
-#define _WX_PRIVATE_CORE_H_
-
-#include "wx/defs.h"
-
-#include <CoreFoundation/CoreFoundation.h>
-
-#include "wx/osx/core/cfstring.h"
-#include "wx/osx/core/cfdataref.h"
-
-// Define helper macros allowing to insert small snippets of code to be
-// compiled for high enough OS X version only: this shouldn't be abused for
-// anything big but it's handy for e.g. specifying OS X 10.6-only protocols in
-// the Objective C classes declarations when they're not supported under the
-// previous versions
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
-    #define wxOSX_10_6_AND_LATER(x) x
-#else
-    #define wxOSX_10_6_AND_LATER(x)
-#endif
-
-// platform specific Clang analyzer support
-#ifndef NS_RETURNS_RETAINED
-#   if WX_HAS_CLANG_FEATURE(attribute_ns_returns_retained)
-#       define NS_RETURNS_RETAINED __attribute__((ns_returns_retained))
-#   else
-#       define NS_RETURNS_RETAINED
-#   endif
-#endif
-
-#ifndef CF_RETURNS_RETAINED
-#   if WX_HAS_CLANG_FEATURE(attribute_cf_returns_retained)
-#       define CF_RETURNS_RETAINED __attribute__((cf_returns_retained))
-#   else
-#       define CF_RETURNS_RETAINED
-#   endif
-#endif
-
-#if ( !wxUSE_GUI && !wxOSX_USE_IPHONE ) || wxOSX_USE_COCOA_OR_CARBON
-
-// Carbon functions are currently still used in wxOSX/Cocoa too (including
-// wxBase part of it).
-#include <Carbon/Carbon.h>
-
-WXDLLIMPEXP_BASE long UMAGetSystemVersion() ;
-
-void WXDLLIMPEXP_CORE wxMacStringToPascal( const wxString&from , unsigned char * to );
-wxString WXDLLIMPEXP_CORE wxMacMakeStringFromPascal( const unsigned char * from );
-
-WXDLLIMPEXP_BASE wxString wxMacFSRefToPath( const FSRef *fsRef , CFStringRef additionalPathComponent = NULL );
-WXDLLIMPEXP_BASE OSStatus wxMacPathToFSRef( const wxString&path , FSRef *fsRef );
-WXDLLIMPEXP_BASE wxString wxMacHFSUniStrToString( ConstHFSUniStr255Param uniname );
-
-// keycode utils from app.cpp
-
-WXDLLIMPEXP_BASE CGKeyCode wxCharCodeWXToOSX(wxKeyCode code);
-WXDLLIMPEXP_BASE long wxMacTranslateKey(unsigned char key, unsigned char code);
-
-#endif
-
-#if wxUSE_GUI
-
-#if wxOSX_USE_IPHONE
-#include <CoreGraphics/CoreGraphics.h>
-#else
-#include <ApplicationServices/ApplicationServices.h>
-#endif
-
-#include "wx/bitmap.h"
-#include "wx/window.h"
-
-class WXDLLIMPEXP_CORE wxMacCGContextStateSaver
-{
-    wxDECLARE_NO_COPY_CLASS(wxMacCGContextStateSaver);
-
-public:
-    wxMacCGContextStateSaver( CGContextRef cg )
-    {
-        m_cg = cg;
-        CGContextSaveGState( cg );
-    }
-    ~wxMacCGContextStateSaver()
-    {
-        CGContextRestoreGState( m_cg );
-    }
-private:
-    CGContextRef m_cg;
-};
-
-class WXDLLIMPEXP_CORE wxDeferredObjectDeleter : public wxObject
-{
-public :
-    wxDeferredObjectDeleter( wxObject* obj ) : m_obj(obj)
-    {
-    }
-    virtual ~wxDeferredObjectDeleter()
-    {
-        delete m_obj;
-    }
-protected :
-    wxObject* m_obj ;
-} ;
-
-// Quartz
-
-WXDLLIMPEXP_CORE CGImageRef wxMacCreateCGImageFromBitmap( const wxBitmap& bitmap );
-
-WXDLLIMPEXP_CORE CGDataProviderRef wxMacCGDataProviderCreateWithCFData( CFDataRef data );
-WXDLLIMPEXP_CORE CGDataConsumerRef wxMacCGDataConsumerCreateWithCFData( CFMutableDataRef data );
-WXDLLIMPEXP_CORE CGDataProviderRef wxMacCGDataProviderCreateWithMemoryBuffer( const wxMemoryBuffer& buf );
-
-WXDLLIMPEXP_CORE CGColorSpaceRef wxMacGetGenericRGBColorSpace(void);
-
-WXDLLIMPEXP_CORE double wxOSXGetMainScreenContentScaleFactor();
-
-class wxWindowMac;
-// to
-extern wxWindow* g_MacLastWindow;
-class wxNonOwnedWindow;
-
-// temporary typedef so that no additional casts are necessary within carbon code at the moment
-
-class wxMacControl;
-class wxWidgetImpl;
-class wxComboBox;
-class wxNotebook;
-class wxTextCtrl;
-class wxSearchCtrl;
-
-WXDLLIMPEXP_CORE wxWindowMac * wxFindWindowFromWXWidget(WXWidget inControl );
-
-#if wxOSX_USE_CARBON
-typedef wxMacControl wxWidgetImplType;
-#else
-typedef wxWidgetImpl wxWidgetImplType;
-#endif
-
-#if wxUSE_MENUS
-class wxMenuItemImpl : public wxObject
-{
-public :
-    wxMenuItemImpl( wxMenuItem* peer ) : m_peer(peer)
-    {
-    }
-
-    virtual ~wxMenuItemImpl() ;
-    virtual void SetBitmap( const wxBitmap& bitmap ) = 0;
-    virtual void Enable( bool enable ) = 0;
-    virtual void Check( bool check ) = 0;
-    virtual void SetLabel( const wxString& text, wxAcceleratorEntry *entry ) = 0;
-    virtual void Hide( bool hide = true ) = 0;
-
-    virtual void * GetHMenuItem() = 0;
-
-    wxMenuItem* GetWXPeer() { return m_peer ; }
-
-    static wxMenuItemImpl* Create( wxMenuItem* peer, wxMenu *pParentMenu,
-                       int id,
-                       const wxString& text,
-                       wxAcceleratorEntry *entry,
-                       const wxString& strHelp,
-                       wxItemKind kind,
-                       wxMenu *pSubMenu );
-    
-    // handle OS specific menu items if they weren't handled during normal processing
-    virtual bool DoDefault() { return false; }
-protected :
-    wxMenuItem* m_peer;
-
-    DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
-} ;
-
-class wxMenuImpl : public wxObject
-{
-public :
-    wxMenuImpl( wxMenu* peer ) : m_peer(peer)
-    {
-    }
-
-    virtual ~wxMenuImpl() ;
-    virtual void InsertOrAppend(wxMenuItem *pItem, size_t pos) = 0;
-    virtual void Remove( wxMenuItem *pItem ) = 0;
-
-    virtual void MakeRoot() = 0;
-
-    virtual void SetTitle( const wxString& text ) = 0;
-
-    virtual WXHMENU GetHMenu() = 0;
-
-    wxMenu* GetWXPeer() { return m_peer ; }
-
-    virtual void PopUp( wxWindow *win, int x, int y ) = 0;
-
-    static wxMenuImpl* Create( wxMenu* peer, const wxString& title );
-    static wxMenuImpl* CreateRootMenu( wxMenu* peer );
-protected :
-    wxMenu* m_peer;
-
-    DECLARE_ABSTRACT_CLASS(wxMenuItemImpl)
-} ;
-#endif
-
-
-class WXDLLIMPEXP_CORE wxWidgetImpl : public wxObject
-{
-public :
-    wxWidgetImpl( wxWindowMac* peer , bool isRootControl = false, bool isUserPane = false );
-    wxWidgetImpl();
-    virtual ~wxWidgetImpl();
-
-    void Init();
-
-    bool                IsRootControl() const { return m_isRootControl; }
-    
-    bool                IsUserPane() const { return m_isUserPane; }
-
-    wxWindowMac*        GetWXPeer() const { return m_wxPeer; }
-
-    bool IsOk() const { return GetWXWidget() != NULL; }
-
-    // not only the control itself, but also all its parents must be visible
-    // in order for this function to return true
-    virtual bool        IsVisible() const = 0;
-    // set the visibility of this widget (maybe latent)
-    virtual void        SetVisibility( bool visible ) = 0;
-
-    virtual bool ShowWithEffect(bool WXUNUSED(show),
-                                wxShowEffect WXUNUSED(effect),
-                                unsigned WXUNUSED(timeout))
-    {
-        return false;
-    }
-
-    virtual void        Raise() = 0;
-
-    virtual void        Lower() = 0;
-
-    virtual void        ScrollRect( const wxRect *rect, int dx, int dy ) = 0;
-
-    virtual WXWidget    GetWXWidget() const = 0;
-
-    virtual void        SetBackgroundColour( const wxColour& col ) = 0;
-    virtual bool        SetBackgroundStyle(wxBackgroundStyle style) = 0;
-
-    // all coordinates in native parent widget relative coordinates
-    virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const = 0;
-    virtual void        Move(int x, int y, int width, int height) = 0;
-    virtual void        GetPosition( int &x, int &y ) const = 0;
-    virtual void        GetSize( int &width, int &height ) const = 0;
-    virtual void        SetControlSize( wxWindowVariant variant ) = 0;
-    virtual double      GetContentScaleFactor() const
-    {
-        return 1.0;
-    }
-    
-    // the native coordinates may have an 'aura' for shadows etc, if this is the case the layout
-    // inset indicates on which insets the real control is drawn
-    virtual void        GetLayoutInset(int &left , int &top , int &right, int &bottom) const
-    {
-        left = top = right = bottom = 0;
-    }
-
-    // native view coordinates are topleft to bottom right (flipped regarding CoreGraphics origin)
-    virtual bool        IsFlipped() const { return true; }
-
-    virtual void        SetNeedsDisplay( const wxRect* where = NULL ) = 0;
-    virtual bool        GetNeedsDisplay() const = 0;
-
-    virtual bool        NeedsFocusRect() const;
-    virtual void        SetNeedsFocusRect( bool needs );
-
-    virtual bool        NeedsFrame() const;
-    virtual void        SetNeedsFrame( bool needs );
-    
-    virtual void        SetDrawingEnabled(bool enabled);
-
-    virtual bool        CanFocus() const = 0;
-    // return true if successful
-    virtual bool        SetFocus() = 0;
-    virtual bool        HasFocus() const = 0;
-
-    virtual void        RemoveFromParent() = 0;
-    virtual void        Embed( wxWidgetImpl *parent ) = 0;
-
-    virtual void        SetDefaultButton( bool isDefault ) = 0;
-    virtual void        PerformClick() = 0;
-    virtual void        SetLabel( const wxString& title, wxFontEncoding encoding ) = 0;
-#if wxUSE_MARKUP && wxOSX_USE_COCOA
-    virtual void        SetLabelMarkup( const wxString& WXUNUSED(markup) ) { }
-#endif
-
-    virtual void        SetCursor( const wxCursor & cursor ) = 0;
-    virtual void        CaptureMouse() = 0;
-    virtual void        ReleaseMouse() = 0;
-    
-    virtual void        SetDropTarget( wxDropTarget * WXUNUSED(dropTarget) ) {}
-
-    virtual wxInt32     GetValue() const = 0;
-    virtual void        SetValue( wxInt32 v ) = 0;
-    virtual wxBitmap    GetBitmap() const = 0;
-    virtual void        SetBitmap( const wxBitmap& bitmap ) = 0;
-    virtual void        SetBitmapPosition( wxDirection dir ) = 0;
-    virtual void        SetupTabs( const wxNotebook& WXUNUSED(notebook) ) {}
-    virtual int         TabHitTest( const wxPoint & WXUNUSED(pt), long *flags ) {*flags=1; return -1;}
-    virtual void        GetBestRect( wxRect *r ) const = 0;
-    virtual bool        IsEnabled() const = 0;
-    virtual void        Enable( bool enable ) = 0;
-    virtual void        SetMinimum( wxInt32 v ) = 0;
-    virtual void        SetMaximum( wxInt32 v ) = 0;
-    virtual wxInt32     GetMinimum() const = 0;
-    virtual wxInt32     GetMaximum() const = 0;
-    virtual void        PulseGauge() = 0;
-    virtual void        SetScrollThumb( wxInt32 value, wxInt32 thumbSize ) = 0;
-
-    virtual void        SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true ) = 0;
-
-    virtual void        SetToolTip(wxToolTip* WXUNUSED(tooltip)) { }
-
-    // is the clicked event sent AFTER the state already changed, so no additional
-    // state changing logic is required from the outside
-    virtual bool        ButtonClickDidStateChange() = 0;
-
-    virtual void        InstallEventHandler( WXWidget control = NULL ) = 0;
-
-    // Mechanism used to keep track of whether a change should send an event
-    // Do SendEvents(false) when starting actions that would trigger programmatic events
-    // and SendEvents(true) at the end of the block.
-    virtual void        SendEvents(bool shouldSendEvents) { m_shouldSendEvents = shouldSendEvents; }
-    virtual bool        ShouldSendEvents() { return m_shouldSendEvents; }
-
-    // static methods for associating native controls and their implementations
-
-    // finds the impl associated with this native control
-    static wxWidgetImpl*
-                        FindFromWXWidget(WXWidget control);
-
-    // finds the impl associated with this native control, if the native control itself is not known
-    // also checks whether its parent is eg a registered scrollview, ie whether the control is a native subpart
-    // of a known control
-    static wxWidgetImpl*
-                        FindBestFromWXWidget(WXWidget control);
-    
-    static void         RemoveAssociations( wxWidgetImpl* impl);
-
-    static void         Associate( WXWidget control, wxWidgetImpl *impl );
-
-    static WXWidget     FindFocus();
-
-    // static creation methods, must be implemented by all toolkits
-
-    static wxWidgetImplType*    CreateUserPane( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle) ;
-    static wxWidgetImplType*    CreateContentView( wxNonOwnedWindow* now ) ;
-
-    static wxWidgetImplType*    CreateButton( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    const wxString& label,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle) ;
-
-    static wxWidgetImplType*    CreateDisclosureTriangle( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    const wxString& label,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle) ;
-
-    static wxWidgetImplType*    CreateStaticLine( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle) ;
-
-    static wxWidgetImplType*    CreateGroupBox( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    const wxString& label,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle) ;
-
-    static wxWidgetImplType*    CreateStaticText( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    const wxString& label,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle) ;
-
-    static wxWidgetImplType*    CreateTextControl( wxTextCtrl* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    const wxString& content,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle) ;
-
-    static wxWidgetImplType*    CreateSearchControl( wxSearchCtrl* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    const wxString& content,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle) ;
-
-    static wxWidgetImplType*    CreateCheckBox( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    const wxString& label,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle);
-
-    static wxWidgetImplType*    CreateRadioButton( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    const wxString& label,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle);
-
-    static wxWidgetImplType*    CreateToggleButton( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    const wxString& label,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle);
-
-    static wxWidgetImplType*    CreateBitmapToggleButton( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    const wxBitmap& bitmap,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle);
-
-    static wxWidgetImplType*    CreateBitmapButton( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    const wxBitmap& bitmap,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle);
-
-    static wxWidgetImplType*    CreateTabView( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle);
-
-    static wxWidgetImplType*    CreateGauge( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    wxInt32 value,
-                                    wxInt32 minimum,
-                                    wxInt32 maximum,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle);
-
-    static wxWidgetImplType*    CreateSlider( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    wxInt32 value,
-                                    wxInt32 minimum,
-                                    wxInt32 maximum,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle);
-
-    static wxWidgetImplType*    CreateSpinButton( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    wxInt32 value,
-                                    wxInt32 minimum,
-                                    wxInt32 maximum,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle);
-
-    static wxWidgetImplType*    CreateScrollBar( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle);
-
-    static wxWidgetImplType*    CreateChoice( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    wxMenu* menu,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle);
-
-    static wxWidgetImplType*    CreateListBox( wxWindowMac* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle);
-
-#if wxOSX_USE_COCOA
-    static wxWidgetImplType*    CreateComboBox( wxComboBox* wxpeer,
-                                    wxWindowMac* parent,
-                                    wxWindowID id,
-                                    wxMenu* menu,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    long extraStyle);
-#endif
-
-    // converts from Toplevel-Content relative to local
-    static void Convert( wxPoint *pt , wxWidgetImpl *from , wxWidgetImpl *to );
-protected :
-    bool                m_isRootControl;
-    bool                m_isUserPane;
-    wxWindowMac*        m_wxPeer;
-    bool                m_needsFocusRect;
-    bool                m_needsFrame;
-    bool                m_shouldSendEvents;
-
-    DECLARE_ABSTRACT_CLASS(wxWidgetImpl)
-};
-
-//
-// the interface to be implemented eg by a listbox
-//
-
-class WXDLLIMPEXP_CORE wxListWidgetColumn
-{
-public :
-    virtual ~wxListWidgetColumn() {}
-} ;
-
-class WXDLLIMPEXP_CORE wxListWidgetCellValue
-{
-public :
-    wxListWidgetCellValue() {}
-    virtual ~wxListWidgetCellValue() {}
-
-   virtual void Set( CFStringRef value ) = 0;
-    virtual void Set( const wxString& value ) = 0;
-    virtual void Set( int value ) = 0;
-    virtual void Check( bool check );
-
-    virtual bool IsChecked() const;
-    virtual int GetIntValue() const = 0;
-    virtual wxString GetStringValue() const = 0;
-} ;
-
-class WXDLLIMPEXP_CORE wxListWidgetImpl
-{
-public:
-    wxListWidgetImpl() {}
-    virtual ~wxListWidgetImpl() { }
-
-    virtual wxListWidgetColumn*     InsertTextColumn( unsigned pos, const wxString& title, bool editable = false,
-                                wxAlignment just = wxALIGN_LEFT , int defaultWidth = -1) = 0 ;
-    virtual wxListWidgetColumn*     InsertCheckColumn( unsigned pos , const wxString& title, bool editable = false,
-                                wxAlignment just = wxALIGN_LEFT , int defaultWidth =  -1) = 0 ;
-
-    // add and remove
-
-    // TODO will be replaced
-    virtual void            ListDelete( unsigned int n ) = 0;
-    virtual void            ListInsert( unsigned int n ) = 0;
-    virtual void            ListClear() = 0;
-
-    // selecting
-
-    virtual void            ListDeselectAll() = 0;
-    virtual void            ListSetSelection( unsigned int n, bool select, bool multi ) = 0;
-    virtual int             ListGetSelection() const = 0;
-    virtual int             ListGetSelections( wxArrayInt& aSelections ) const = 0;
-    virtual bool            ListIsSelected( unsigned int n ) const = 0;
-
-    // display
-
-    virtual void            ListScrollTo( unsigned int n ) = 0;
-    virtual void            UpdateLine( unsigned int n, wxListWidgetColumn* col = NULL ) = 0;
-    virtual void            UpdateLineToEnd( unsigned int n) = 0;
-
-    // accessing content
-
-    virtual unsigned int    ListGetCount() const = 0;
-
-    virtual int             DoListHitTest( const wxPoint& inpoint ) const = 0;
-};
-
-//
-// interface to be implemented by a textcontrol
-//
-
-class WXDLLIMPEXP_FWD_CORE wxTextAttr;
-class WXDLLIMPEXP_FWD_CORE wxTextEntry;
-
-// common interface for all implementations
-class WXDLLIMPEXP_CORE wxTextWidgetImpl
-
-{
-public :
-    // Any widgets implementing this interface must be associated with a
-    // wxTextEntry so instead of requiring the derived classes to implement
-    // another (pure) virtual function, just take the pointer to this entry in
-    // our ctor and implement GetTextEntry() ourselves.
-    wxTextWidgetImpl(wxTextEntry *entry) : m_entry(entry) {}
-
-    virtual ~wxTextWidgetImpl() {}
-
-    wxTextEntry *GetTextEntry() const { return m_entry; }
-
-    virtual bool CanFocus() const { return true; }
-
-    virtual wxString GetStringValue() const = 0 ;
-    virtual void SetStringValue( const wxString &val ) = 0 ;
-    virtual void SetSelection( long from, long to ) = 0 ;
-    virtual void GetSelection( long* from, long* to ) const = 0 ;
-    virtual void WriteText( const wxString& str ) = 0 ;
-
-    virtual bool CanClipMaxLength() const { return false; }
-    virtual void SetMaxLength(unsigned long WXUNUSED(len)) {}
-    
-    virtual bool GetStyle( long position, wxTextAttr& style);
-    virtual void SetStyle( long start, long end, const wxTextAttr& style ) ;
-    virtual void Copy() ;
-    virtual void Cut() ;
-    virtual void Paste() ;
-    virtual bool CanPaste() const ;
-    virtual void SetEditable( bool editable ) ;
-    virtual long GetLastPosition() const ;
-    virtual void Replace( long from, long to, const wxString &str ) ;
-    virtual void Remove( long from, long to ) ;
-
-
-    virtual bool HasOwnContextMenu() const
-        { return false ; }
-
-    virtual bool SetupCursor( const wxPoint& WXUNUSED(pt) )
-        { return false ; }
-
-    virtual void Clear() ;
-    virtual bool CanUndo() const;
-    virtual void Undo() ;
-    virtual bool CanRedo() const;
-    virtual void Redo() ;
-    virtual int GetNumberOfLines() const ;
-    virtual long XYToPosition(long x, long y) const;
-    virtual bool PositionToXY(long pos, long *x, long *y) const ;
-    virtual void ShowPosition(long WXUNUSED(pos)) ;
-    virtual int GetLineLength(long lineNo) const ;
-    virtual wxString GetLineText(long lineNo) const ;
-    virtual void CheckSpelling(bool WXUNUSED(check)) { }
-
-    virtual wxSize GetBestSize() const { return wxDefaultSize; }
-
-    virtual bool SetHint(const wxString& WXUNUSED(hint)) { return false; }
-private:
-    wxTextEntry * const m_entry;
-
-    wxDECLARE_NO_COPY_CLASS(wxTextWidgetImpl);
-};
-
-// common interface for all implementations
-class WXDLLIMPEXP_CORE wxComboWidgetImpl
-
-{
-public :
-    wxComboWidgetImpl() {}
-
-    virtual ~wxComboWidgetImpl() {}
-
-    virtual int GetSelectedItem() const { return -1; }
-    virtual void SetSelectedItem(int WXUNUSED(item)) {}
-
-    virtual int GetNumberOfItems() const { return -1; }
-
-    virtual void InsertItem(int WXUNUSED(pos), const wxString& WXUNUSED(item)) {}
-
-    virtual void RemoveItem(int WXUNUSED(pos)) {}
-
-    virtual void Clear() {}
-    virtual void Popup() {}
-    virtual void Dismiss() {}
-
-    virtual wxString GetStringAtIndex(int WXUNUSED(pos)) const { return wxEmptyString; }
-
-    virtual int FindString(const wxString& WXUNUSED(text)) const { return -1; }
-};
-
-//
-// common interface for buttons
-//
-
-class wxButtonImpl
-{
-    public :
-    wxButtonImpl(){}
-    virtual ~wxButtonImpl(){}
-
-    virtual void SetPressedBitmap( const wxBitmap& bitmap ) = 0;
-} ;
-
-//
-// common interface for search controls
-//
-
-class wxSearchWidgetImpl
-{
-public :
-    wxSearchWidgetImpl(){}
-    virtual ~wxSearchWidgetImpl(){}
-
-    // search field options
-    virtual void ShowSearchButton( bool show ) = 0;
-    virtual bool IsSearchButtonVisible() const = 0;
-
-    virtual void ShowCancelButton( bool show ) = 0;
-    virtual bool IsCancelButtonVisible() const = 0;
-
-    virtual void SetSearchMenu( wxMenu* menu ) = 0;
-
-    virtual void SetDescriptiveText(const wxString& text) = 0;
-} ;
-
-//
-// toplevel window implementation class
-//
-
-class wxNonOwnedWindowImpl : public wxObject
-{
-public :
-    wxNonOwnedWindowImpl( wxNonOwnedWindow* nonownedwnd) : m_wxPeer(nonownedwnd)
-    {
-    }
-    wxNonOwnedWindowImpl()
-    {
-    }
-    virtual ~wxNonOwnedWindowImpl()
-    {
-    }
-
-    virtual void WillBeDestroyed()
-    {
-    }
-
-    virtual void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
-    long style, long extraStyle, const wxString& name ) = 0;
-
-
-    virtual WXWindow GetWXWindow() const = 0;
-
-    virtual void Raise()
-    {
-    }
-
-    virtual void Lower()
-    {
-    }
-
-    virtual bool Show(bool WXUNUSED(show))
-    {
-        return false;
-    }
-
-    virtual bool ShowWithEffect(bool show, wxShowEffect WXUNUSED(effect), unsigned WXUNUSED(timeout))
-    {
-        return Show(show);
-    }
-
-    virtual void Update()
-    {
-    }
-
-    virtual bool SetTransparent(wxByte WXUNUSED(alpha))
-    {
-        return false;
-    }
-
-    virtual bool SetBackgroundColour(const wxColour& WXUNUSED(col) )
-    {
-        return false;
-    }
-
-    virtual void SetExtraStyle( long WXUNUSED(exStyle) )
-    {
-    }
-
-    virtual void SetWindowStyleFlag( long WXUNUSED(style) )
-    {
-    }
-
-    virtual bool SetBackgroundStyle(wxBackgroundStyle WXUNUSED(style))
-    {
-        return false ;
-    }
-
-    virtual bool CanSetTransparent()
-    {
-        return false;
-    }
-
-    virtual void GetContentArea( int &left , int &top , int &width , int &height ) const = 0;
-    virtual void MoveWindow(int x, int y, int width, int height) = 0;
-    virtual void GetPosition( int &x, int &y ) const = 0;
-    virtual void GetSize( int &width, int &height ) const = 0;
-
-    virtual bool SetShape(const wxRegion& WXUNUSED(region))
-    {
-        return false;
-    }
-
-    virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) = 0;
-
-    virtual bool IsMaximized() const = 0;
-
-    virtual bool IsIconized() const= 0;
-
-    virtual void Iconize( bool iconize )= 0;
-
-    virtual void Maximize(bool maximize) = 0;
-
-    virtual bool IsFullScreen() const= 0;
-
-    virtual void ShowWithoutActivating() { Show(true); }
-
-    virtual bool ShowFullScreen(bool show, long style)= 0;
-
-    virtual void RequestUserAttention(int flags) = 0;
-
-    virtual void ScreenToWindow( int *x, int *y ) = 0;
-
-    virtual void WindowToScreen( int *x, int *y ) = 0;
-    
-    virtual bool IsActive() = 0;
-
-    wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
-
-    static wxNonOwnedWindowImpl*
-                FindFromWXWindow(WXWindow window);
-
-    static void  RemoveAssociations( wxNonOwnedWindowImpl* impl);
-
-    static void  Associate( WXWindow window, wxNonOwnedWindowImpl *impl );
-
-    // static creation methods, must be implemented by all toolkits
-
-    static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, WXWindow native) ;
-
-    static wxNonOwnedWindowImpl* CreateNonOwnedWindow( wxNonOwnedWindow* wxpeer, wxWindow* parent, const wxPoint& pos, const wxSize& size,
-    long style, long extraStyle, const wxString& name  ) ;
-
-    virtual void SetModified(bool WXUNUSED(modified)) { }
-    virtual bool IsModified() const { return false; }
-
-    virtual void SetRepresentedFilename(const wxString& WXUNUSED(filename)) { }
-
-#if wxOSX_USE_IPHONE
-    virtual CGFloat GetWindowLevel() const { return 0.0; }
-#else
-    virtual CGWindowLevel GetWindowLevel() const { return kCGNormalWindowLevel; }
-#endif
-    virtual void RestoreWindowLevel() {}
-protected :
-    wxNonOwnedWindow*   m_wxPeer;
-    DECLARE_ABSTRACT_CLASS(wxNonOwnedWindowImpl)
-};
-
-#endif // wxUSE_GUI
-
-//---------------------------------------------------------------------------
-// cocoa bridging utilities
-//---------------------------------------------------------------------------
-
-bool wxMacInitCocoa();
-
-class WXDLLIMPEXP_CORE wxMacAutoreleasePool
-{
-public :
-    wxMacAutoreleasePool();
-    ~wxMacAutoreleasePool();
-private :
-    void* m_pool;
-};
-
-// NSObject
-
-void wxMacCocoaRelease( void* obj );
-void wxMacCocoaAutorelease( void* obj );
-void* wxMacCocoaRetain( void* obj );
-
-
-#endif
-    // _WX_PRIVATE_CORE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/private/datetimectrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/private/datetimectrl.h
deleted file mode 100644
index 18778d7da5..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/private/datetimectrl.h
+++ /dev/null
@@ -1,70 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/core/private/datetime.h
-// Purpose:
-// Author:      Vadim Zeitlin
-// Created:     2011-12-19
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_CORE_PRIVATE_DATETIMECTRL_H_
-#define _WX_OSX_CORE_PRIVATE_DATETIMECTRL_H_
-
-#if wxUSE_DATEPICKCTRL
-
-#include "wx/osx/private.h"
-
-#include "wx/datetime.h"
-
-enum wxDateTimeWidgetKind
-{
-    wxDateTimeWidget_YearMonthDay,
-    wxDateTimeWidget_HourMinuteSecond
-};
-
-// ----------------------------------------------------------------------------
-// wxDateTimeWidgetImpl: peer class for wxDateTimePickerCtrl.
-// ----------------------------------------------------------------------------
-
-class wxDateTimeWidgetImpl
-#if wxOSX_USE_COCOA
-    : public wxWidgetCocoaImpl
-#elif wxOSX_USE_CARBON
-    : public wxMacControl
-#else
-    #error "Unsupported platform"
-#endif
-{
-public:
-    static wxDateTimeWidgetImpl*
-    CreateDateTimePicker(wxDateTimePickerCtrl* wxpeer,
-                         const wxDateTime& dt,
-                         const wxPoint& pos,
-                         const wxSize& size,
-                         long style,
-                         wxDateTimeWidgetKind kind);
-
-    virtual void SetDateTime(const wxDateTime& dt) = 0;
-    virtual wxDateTime GetDateTime() const = 0;
-
-    virtual void SetDateRange(const wxDateTime& dt1, const wxDateTime& dt2) = 0;
-    virtual bool GetDateRange(wxDateTime* dt1, wxDateTime* dt2) = 0;
-
-    virtual ~wxDateTimeWidgetImpl() { }
-
-protected:
-#if wxOSX_USE_COCOA
-    wxDateTimeWidgetImpl(wxDateTimePickerCtrl* wxpeer, WXWidget view)
-        : wxWidgetCocoaImpl(wxpeer, view)
-    {
-    }
-#elif wxOSX_USE_CARBON
-    // There is no Carbon implementation of this control yet so we don't need
-    // any ctor for it yet but it should be added here if Carbon version is
-    // written later.
-#endif
-};
-
-#endif // wxUSE_DATEPICKCTRL
-
-#endif // _WX_OSX_CORE_PRIVATE_DATETIMECTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/private/strconv_cf.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/private/strconv_cf.h
deleted file mode 100644
index d22c73f72f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/private/strconv_cf.h
+++ /dev/null
@@ -1,337 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/core/private/strconv_cf.h
-// Purpose:     Unicode conversion classes
-// Author:      David Elliott, Ryan Norton
-// Modified by:
-// Created:     2007-07-06
-// Copyright:   (c) 2004 Ryan Norton
-//              (c) 2007 David Elliott
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/strconv.h"
-
-#include <CoreFoundation/CFString.h>
-#include <CoreFoundation/CFStringEncodingExt.h>
-
-// ============================================================================
-// CoreFoundation conversion classes
-// ============================================================================
-
-inline CFStringEncoding wxCFStringEncFromFontEnc(wxFontEncoding encoding)
-{
-    CFStringEncoding enc = kCFStringEncodingInvalidId ;
-
-    switch (encoding)
-    {
-        case wxFONTENCODING_DEFAULT :
-            enc = CFStringGetSystemEncoding();
-            break ;
-
-        case wxFONTENCODING_ISO8859_1 :
-            enc = kCFStringEncodingISOLatin1 ;
-            break ;
-        case wxFONTENCODING_ISO8859_2 :
-            enc = kCFStringEncodingISOLatin2;
-            break ;
-        case wxFONTENCODING_ISO8859_3 :
-            enc = kCFStringEncodingISOLatin3 ;
-            break ;
-        case wxFONTENCODING_ISO8859_4 :
-            enc = kCFStringEncodingISOLatin4;
-            break ;
-        case wxFONTENCODING_ISO8859_5 :
-            enc = kCFStringEncodingISOLatinCyrillic;
-            break ;
-        case wxFONTENCODING_ISO8859_6 :
-            enc = kCFStringEncodingISOLatinArabic;
-            break ;
-        case wxFONTENCODING_ISO8859_7 :
-            enc = kCFStringEncodingISOLatinGreek;
-            break ;
-        case wxFONTENCODING_ISO8859_8 :
-            enc = kCFStringEncodingISOLatinHebrew;
-            break ;
-        case wxFONTENCODING_ISO8859_9 :
-            enc = kCFStringEncodingISOLatin5;
-            break ;
-        case wxFONTENCODING_ISO8859_10 :
-            enc = kCFStringEncodingISOLatin6;
-            break ;
-        case wxFONTENCODING_ISO8859_11 :
-            enc = kCFStringEncodingISOLatinThai;
-            break ;
-        case wxFONTENCODING_ISO8859_13 :
-            enc = kCFStringEncodingISOLatin7;
-            break ;
-        case wxFONTENCODING_ISO8859_14 :
-            enc = kCFStringEncodingISOLatin8;
-            break ;
-        case wxFONTENCODING_ISO8859_15 :
-            enc = kCFStringEncodingISOLatin9;
-            break ;
-
-        case wxFONTENCODING_KOI8 :
-            enc = kCFStringEncodingKOI8_R;
-            break ;
-        case wxFONTENCODING_ALTERNATIVE : // MS-DOS CP866
-            enc = kCFStringEncodingDOSRussian;
-            break ;
-
-//      case wxFONTENCODING_BULGARIAN :
-//          enc = ;
-//          break ;
-
-        case wxFONTENCODING_CP437 :
-            enc = kCFStringEncodingDOSLatinUS ;
-            break ;
-        case wxFONTENCODING_CP850 :
-            enc = kCFStringEncodingDOSLatin1;
-            break ;
-        case wxFONTENCODING_CP852 :
-            enc = kCFStringEncodingDOSLatin2;
-            break ;
-        case wxFONTENCODING_CP855 :
-            enc = kCFStringEncodingDOSCyrillic;
-            break ;
-        case wxFONTENCODING_CP866 :
-            enc = kCFStringEncodingDOSRussian ;
-            break ;
-        case wxFONTENCODING_CP874 :
-            enc = kCFStringEncodingDOSThai;
-            break ;
-        case wxFONTENCODING_CP932 :
-            enc = kCFStringEncodingDOSJapanese;
-            break ;
-        case wxFONTENCODING_CP936 :
-            enc = kCFStringEncodingDOSChineseSimplif ;
-            break ;
-        case wxFONTENCODING_CP949 :
-            enc = kCFStringEncodingDOSKorean;
-            break ;
-        case wxFONTENCODING_CP950 :
-            enc = kCFStringEncodingDOSChineseTrad;
-            break ;
-        case wxFONTENCODING_CP1250 :
-            enc = kCFStringEncodingWindowsLatin2;
-            break ;
-        case wxFONTENCODING_CP1251 :
-            enc = kCFStringEncodingWindowsCyrillic ;
-            break ;
-        case wxFONTENCODING_CP1252 :
-            enc = kCFStringEncodingWindowsLatin1 ;
-            break ;
-        case wxFONTENCODING_CP1253 :
-            enc = kCFStringEncodingWindowsGreek;
-            break ;
-        case wxFONTENCODING_CP1254 :
-            enc = kCFStringEncodingWindowsLatin5;
-            break ;
-        case wxFONTENCODING_CP1255 :
-            enc = kCFStringEncodingWindowsHebrew ;
-            break ;
-        case wxFONTENCODING_CP1256 :
-            enc = kCFStringEncodingWindowsArabic ;
-            break ;
-        case wxFONTENCODING_CP1257 :
-            enc = kCFStringEncodingWindowsBalticRim;
-            break ;
-//   This only really encodes to UTF7 (if that) evidently
-//        case wxFONTENCODING_UTF7 :
-//            enc = kCFStringEncodingNonLossyASCII ;
-//            break ;
-        case wxFONTENCODING_UTF8 :
-            enc = kCFStringEncodingUTF8 ;
-            break ;
-        case wxFONTENCODING_EUC_JP :
-            enc = kCFStringEncodingEUC_JP;
-            break ;
-/* Don't support conversion to/from UTF16 as wxWidgets can do this better.
- * In particular, ToWChar would fail miserably using strlen on an input UTF16.
-        case wxFONTENCODING_UTF16 :
-            enc = kCFStringEncodingUnicode ;
-            break ;
-*/
-        case wxFONTENCODING_MACROMAN :
-            enc = kCFStringEncodingMacRoman ;
-            break ;
-        case wxFONTENCODING_MACJAPANESE :
-            enc = kCFStringEncodingMacJapanese ;
-            break ;
-        case wxFONTENCODING_MACCHINESETRAD :
-            enc = kCFStringEncodingMacChineseTrad ;
-            break ;
-        case wxFONTENCODING_MACKOREAN :
-            enc = kCFStringEncodingMacKorean ;
-            break ;
-        case wxFONTENCODING_MACARABIC :
-            enc = kCFStringEncodingMacArabic ;
-            break ;
-        case wxFONTENCODING_MACHEBREW :
-            enc = kCFStringEncodingMacHebrew ;
-            break ;
-        case wxFONTENCODING_MACGREEK :
-            enc = kCFStringEncodingMacGreek ;
-            break ;
-        case wxFONTENCODING_MACCYRILLIC :
-            enc = kCFStringEncodingMacCyrillic ;
-            break ;
-        case wxFONTENCODING_MACDEVANAGARI :
-            enc = kCFStringEncodingMacDevanagari ;
-            break ;
-        case wxFONTENCODING_MACGURMUKHI :
-            enc = kCFStringEncodingMacGurmukhi ;
-            break ;
-        case wxFONTENCODING_MACGUJARATI :
-            enc = kCFStringEncodingMacGujarati ;
-            break ;
-        case wxFONTENCODING_MACORIYA :
-            enc = kCFStringEncodingMacOriya ;
-            break ;
-        case wxFONTENCODING_MACBENGALI :
-            enc = kCFStringEncodingMacBengali ;
-            break ;
-        case wxFONTENCODING_MACTAMIL :
-            enc = kCFStringEncodingMacTamil ;
-            break ;
-        case wxFONTENCODING_MACTELUGU :
-            enc = kCFStringEncodingMacTelugu ;
-            break ;
-        case wxFONTENCODING_MACKANNADA :
-            enc = kCFStringEncodingMacKannada ;
-            break ;
-        case wxFONTENCODING_MACMALAJALAM :
-            enc = kCFStringEncodingMacMalayalam ;
-            break ;
-        case wxFONTENCODING_MACSINHALESE :
-            enc = kCFStringEncodingMacSinhalese ;
-            break ;
-        case wxFONTENCODING_MACBURMESE :
-            enc = kCFStringEncodingMacBurmese ;
-            break ;
-        case wxFONTENCODING_MACKHMER :
-            enc = kCFStringEncodingMacKhmer ;
-            break ;
-        case wxFONTENCODING_MACTHAI :
-            enc = kCFStringEncodingMacThai ;
-            break ;
-        case wxFONTENCODING_MACLAOTIAN :
-            enc = kCFStringEncodingMacLaotian ;
-            break ;
-        case wxFONTENCODING_MACGEORGIAN :
-            enc = kCFStringEncodingMacGeorgian ;
-            break ;
-        case wxFONTENCODING_MACARMENIAN :
-            enc = kCFStringEncodingMacArmenian ;
-            break ;
-        case wxFONTENCODING_MACCHINESESIMP :
-            enc = kCFStringEncodingMacChineseSimp ;
-            break ;
-        case wxFONTENCODING_MACTIBETAN :
-            enc = kCFStringEncodingMacTibetan ;
-            break ;
-        case wxFONTENCODING_MACMONGOLIAN :
-            enc = kCFStringEncodingMacMongolian ;
-            break ;
-        case wxFONTENCODING_MACETHIOPIC :
-            enc = kCFStringEncodingMacEthiopic ;
-            break ;
-        case wxFONTENCODING_MACCENTRALEUR :
-            enc = kCFStringEncodingMacCentralEurRoman ;
-            break ;
-        case wxFONTENCODING_MACVIATNAMESE :
-            enc = kCFStringEncodingMacVietnamese ;
-            break ;
-        case wxFONTENCODING_MACARABICEXT :
-            enc = kCFStringEncodingMacExtArabic ;
-            break ;
-        case wxFONTENCODING_MACSYMBOL :
-            enc = kCFStringEncodingMacSymbol ;
-            break ;
-        case wxFONTENCODING_MACDINGBATS :
-            enc = kCFStringEncodingMacDingbats ;
-            break ;
-        case wxFONTENCODING_MACTURKISH :
-            enc = kCFStringEncodingMacTurkish ;
-            break ;
-        case wxFONTENCODING_MACCROATIAN :
-            enc = kCFStringEncodingMacCroatian ;
-            break ;
-        case wxFONTENCODING_MACICELANDIC :
-            enc = kCFStringEncodingMacIcelandic ;
-            break ;
-        case wxFONTENCODING_MACROMANIAN :
-            enc = kCFStringEncodingMacRomanian ;
-            break ;
-        case wxFONTENCODING_MACCELTIC :
-            enc = kCFStringEncodingMacCeltic ;
-            break ;
-        case wxFONTENCODING_MACGAELIC :
-            enc = kCFStringEncodingMacGaelic ;
-            break ;
-        /* CFString is known to support this back to the original CarbonLib */
-        /* http://developer.apple.com/samplecode/CarbonMDEF/listing2.html */
-        case wxFONTENCODING_MACKEYBOARD :
-            /* We don't wish to pollute the namespace too much, even though we're a private header. */
-            /* The constant is well-defined as 41 and is not expected to change. */
-            enc = 41 /*kTextEncodingMacKeyboardGlyphs*/ ;
-            break ;
-
-        default :
-            // because gcc is picky
-            break ;
-    }
-
-    return enc ;
-}
-
-
-class wxMBConv_cf : public wxMBConv
-{
-public:
-    wxMBConv_cf()
-    {
-        Init(CFStringGetSystemEncoding()) ;
-    }
-
-    wxMBConv_cf(const wxMBConv_cf& conv) : wxMBConv()
-    {
-        m_encoding = conv.m_encoding;
-    }
-
-#if wxUSE_FONTMAP
-    wxMBConv_cf(const char* name)
-    {
-        Init( wxCFStringEncFromFontEnc(wxFontMapperBase::Get()->CharsetToEncoding(name, false) ) ) ;
-    }
-#endif
-
-    wxMBConv_cf(wxFontEncoding encoding)
-    {
-        Init( wxCFStringEncFromFontEnc(encoding) );
-    }
-
-    virtual ~wxMBConv_cf()
-    {
-    }
-
-    void Init( CFStringEncoding encoding)
-    {
-        m_encoding = encoding ;
-    }
-
-    virtual size_t ToWChar(wchar_t * dst, size_t dstSize, const char * src, size_t srcSize = wxNO_LEN) const;
-    virtual size_t FromWChar(char *dst, size_t dstSize, const wchar_t *src, size_t srcSize = wxNO_LEN) const;
-
-    virtual wxMBConv *Clone() const { return new wxMBConv_cf(*this); }
-
-    bool IsOk() const
-    {
-        return m_encoding != kCFStringEncodingInvalidId &&
-              CFStringIsEncodingAvailable(m_encoding);
-    }
-
-private:
-    CFStringEncoding m_encoding ;
-};
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/private/timer.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/private/timer.h
deleted file mode 100644
index 2f191797d9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/private/timer.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/core/private/timer.h
-// Purpose:     wxTimer class based on core foundation
-// Author:      Stefan Csomor
-// Created:     2008-07-16
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_CORE_PRIVATE_TIMER_H_
-#define _WX_OSX_CORE_PRIVATE_TIMER_H_
-
-#include "wx/private/timer.h"
-
-struct wxOSXTimerInfo;
-
-class WXDLLIMPEXP_CORE wxOSXTimerImpl : public wxTimerImpl
-{
-public:
-    wxOSXTimerImpl(wxTimer *timer);
-    virtual ~wxOSXTimerImpl();
-
-    virtual bool Start(int milliseconds = -1, bool one_shot = false);
-    virtual void Stop();
-
-    virtual bool IsRunning() const;
-
-private:
-    wxOSXTimerInfo *m_info;
-};
-
-#endif // _WX_OSX_CORE_PRIVATE_TIMER_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/stdpaths.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/stdpaths.h
deleted file mode 100644
index 8ebe071e9c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/core/stdpaths.h
+++ /dev/null
@@ -1,69 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/core/stdpaths.h
-// Purpose:     wxStandardPaths for CoreFoundation systems
-// Author:      David Elliott
-// Modified by:
-// Created:     2004-10-27
-// Copyright:   (c) 2004 David Elliott
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_STDPATHS_H_
-#define _WX_MAC_STDPATHS_H_
-
-struct __CFBundle;
-struct __CFURL;
-
-typedef const __CFURL * wxCFURLRef;
-typedef __CFBundle * wxCFBundleRef;
-
-// we inherit the GUI CF-based wxStandardPaths implementation from the Unix one
-// used for console programs if possible (i.e. if we're under a Unix system at
-// all)
-#if defined(__UNIX__)
-    #include "wx/unix/stdpaths.h"
-    #define wxStandardPathsCFBase wxStandardPaths
-#else
-    #define wxStandardPathsCFBase wxStandardPathsBase
-#endif
-
-// ----------------------------------------------------------------------------
-// wxStandardPaths
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxStandardPathsCF : public wxStandardPathsCFBase
-{
-public:
-    virtual ~wxStandardPathsCF();
-
-    // wxMac specific: allow user to specify a different bundle
-    wxStandardPathsCF(wxCFBundleRef bundle);
-    void SetBundle(wxCFBundleRef bundle);
-
-    // implement base class pure virtuals
-    virtual wxString GetExecutablePath() const;
-    virtual wxString GetConfigDir() const;
-    virtual wxString GetUserConfigDir() const;
-    virtual wxString GetDataDir() const;
-    virtual wxString GetLocalDataDir() const;
-    virtual wxString GetUserDataDir() const;
-    virtual wxString GetPluginsDir() const;
-    virtual wxString GetResourcesDir() const;
-    virtual wxString
-    GetLocalizedResourcesDir(const wxString& lang,
-                             ResourceCat category = ResourceCat_None) const;
-    virtual wxString GetDocumentsDir() const;
-
-protected:
-    // Ctor is protected, use wxStandardPaths::Get() instead of instantiating
-    // objects of this class directly.
-    wxStandardPathsCF();
-
-    // this function can be called with any of CFBundleCopyXXXURL function
-    // pointer as parameter
-    wxString GetFromFunc(wxCFURLRef (*func)(wxCFBundleRef)) const;
-
-    wxCFBundleRef m_bundle;
-};
-
-#endif // _WX_MAC_STDPATHS_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cursor.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cursor.h
deleted file mode 100644
index 0dcf5be22d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/cursor.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/cursor.h
-// Purpose:     wxCursor class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CURSOR_H_
-#define _WX_CURSOR_H_
-
-#include "wx/bitmap.h"
-
-// Cursor
-class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
-{
-public:
-    wxCursor();
-
-    wxCursor(const wxImage & image) ;
-    wxCursor(const wxString& name,
-             wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
-             int hotSpotX = 0, int hotSpotY = 0);
-
-    wxCursor(wxStockCursor id) { InitFromStock(id); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
-#endif
-    virtual ~wxCursor();
-
-    void MacInstall() const ;
-
-    void SetHCURSOR(WXHCURSOR cursor);
-    WXHCURSOR GetHCURSOR() const;
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-private:
-    void InitFromStock(wxStockCursor);
-
-    void CreateFromImage(const wxImage & image) ;
-
-    DECLARE_DYNAMIC_CLASS(wxCursor)
-};
-
-extern WXDLLIMPEXP_CORE void wxSetCursor(const wxCursor& cursor);
-
-#endif // _WX_CURSOR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dataform.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dataform.h
deleted file mode 100644
index a9c7ba9e3c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dataform.h
+++ /dev/null
@@ -1,68 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/dataform.h
-// Purpose:     declaration of the wxDataFormat class
-// Author:      Stefan Csomor (lifted from dnd.h)
-// Modified by:
-// Created:     10/21/99
-// Copyright:   (c) 1999 Stefan Csomor
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_DATAFORM_H
-#define _WX_MAC_DATAFORM_H
-
-class WXDLLIMPEXP_CORE wxDataFormat
-{
-public:
-    typedef unsigned long NativeFormat;
-
-    wxDataFormat();
-    wxDataFormat(wxDataFormatId vType);
-    wxDataFormat(const wxDataFormat& rFormat);
-    wxDataFormat(const wxString& rId);
-    wxDataFormat(const wxChar* pId);
-    wxDataFormat(NativeFormat vFormat);
-    ~wxDataFormat();
-
-    wxDataFormat& operator=(NativeFormat vFormat)
-        { SetId(vFormat); return *this; }
-
-    // comparison (must have both versions)
-    bool operator==(const wxDataFormat& format) const ;
-    bool operator!=(const wxDataFormat& format) const
-        { return ! ( *this == format ); }
-    bool operator==(wxDataFormatId format) const
-        { return m_type == (wxDataFormatId)format; }
-    bool operator!=(wxDataFormatId format) const
-        { return m_type != (wxDataFormatId)format; }
-
-    wxDataFormat& operator=(const wxDataFormat& format);
-
-    // explicit and implicit conversions to NativeFormat which is one of
-    // standard data types (implicit conversion is useful for preserving the
-    // compatibility with old code)
-    NativeFormat GetFormatId() const { return m_format; }
-    operator NativeFormat() const { return m_format; }
-
-    void SetId(NativeFormat format);
-
-    // string ids are used for custom types - this SetId() must be used for
-    // application-specific formats
-    wxString GetId() const;
-    void SetId(const wxString& pId);
-
-    // implementation
-    wxDataFormatId GetType() const { return m_type; }
-    void SetType( wxDataFormatId type );
-
-    // returns true if the format is one of those defined in wxDataFormatId
-    bool IsStandard() const { return m_type > 0 && m_type < wxDF_PRIVATE; }
-
-private:
-    wxDataFormatId   m_type;
-    NativeFormat     m_format;
-    // indicates the type in case of wxDF_PRIVATE :
-    wxString         m_id ;
-};
-
-#endif // _WX_MAC_DATAFORM_H
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dataobj.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dataobj.h
deleted file mode 100644
index 45a73f289f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dataobj.h
+++ /dev/null
@@ -1,40 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/dataobj.h
-// Purpose:     declaration of the wxDataObject
-// Author:      Stefan Csomor (adapted from Robert Roebling's gtk port)
-// Modified by:
-// Created:     10/21/99
-// Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_DATAOBJ_H_
-#define _WX_MAC_DATAOBJ_H_
-
-// ----------------------------------------------------------------------------
-// wxDataObject is the same as wxDataObjectBase under wxGTK
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase
-{
-public:
-    wxDataObject();
-#ifdef __DARWIN__
-    virtual ~wxDataObject() { }
-#endif
-
-    virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const;
-    void AddToPasteboard( void * pasteboardRef , wxIntPtr itemID );
-    // returns true if the passed in format is present in the pasteboard
-    static bool IsFormatInPasteboard( void * pasteboardRef, const wxDataFormat &dataFormat );
-    // returns true if any of the accepted formats of this dataobj is in the pasteboard
-    bool HasDataInPasteboard( void * pasteboardRef );
-    bool GetFromPasteboard( void * pasteboardRef );
-    
-#if wxOSX_USE_COCOA
-    virtual void AddSupportedTypes( void* cfarray);
-#endif
-};
-
-#endif // _WX_MAC_DATAOBJ_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dataobj2.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dataobj2.h
deleted file mode 100644
index dec7fe50bf..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dataobj2.h
+++ /dev/null
@@ -1,93 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/dataobj2.h
-// Purpose:     declaration of standard wxDataObjectSimple-derived classes
-// Author:      David Webster (adapted from Robert Roebling's gtk port
-// Modified by:
-// Created:     10/21/99
-// Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_DATAOBJ2_H_
-#define _WX_MAC_DATAOBJ2_H_
-
-// ----------------------------------------------------------------------------
-// wxBitmapDataObject is a specialization of wxDataObject for bitmaps
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase
-{
-public:
-    // ctors
-    wxBitmapDataObject();
-    wxBitmapDataObject(const wxBitmap& bitmap);
-
-    // destr
-    virtual ~wxBitmapDataObject();
-
-    // override base class virtual to update PNG data too
-    virtual void SetBitmap(const wxBitmap& bitmap);
-
-    // implement base class pure virtuals
-    // ----------------------------------
-
-    virtual size_t GetDataSize() const ;
-    virtual bool GetDataHere(void *buf) const ;
-    virtual bool SetData(size_t len, const void *buf);
-    // Must provide overloads to avoid hiding them (and warnings about it)
-    virtual size_t GetDataSize(const wxDataFormat&) const
-    {
-        return GetDataSize();
-    }
-    virtual bool GetDataHere(const wxDataFormat&, void *buf) const
-    {
-        return GetDataHere(buf);
-    }
-    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
-    {
-        return SetData(len, buf);
-    }
-
-protected :
-    void Init() ;
-    void Clear() ;
-
-    void* m_pictHandle ;
-    bool m_pictCreated ;
-};
-
-// ----------------------------------------------------------------------------
-// wxFileDataObject is a specialization of wxDataObject for file names
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase
-{
-public:
-    // implement base class pure virtuals
-    // ----------------------------------
-
-    void AddFile( const wxString &filename );
-
-    virtual size_t GetDataSize() const;
-    virtual bool GetDataHere(void *buf) const;
-    virtual bool SetData(size_t len, const void *buf);
-    // Must provide overloads to avoid hiding them (and warnings about it)
-    virtual size_t GetDataSize(const wxDataFormat&) const
-    {
-        return GetDataSize();
-    }
-    virtual bool GetDataHere(const wxDataFormat&, void *buf) const
-    {
-        return GetDataHere(buf);
-    }
-    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
-    {
-        return SetData(len, buf);
-    }
-protected:
-    // translates the filenames stored into a utf8 encoded char stream
-    void GetFileNames(wxCharBuffer &buf) const ;
-};
-
-#endif // _WX_MAC_DATAOBJ2_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dataview.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dataview.h
deleted file mode 100644
index de7bd27839..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dataview.h
+++ /dev/null
@@ -1,311 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/dataview.h
-// Purpose:     wxDataViewCtrl native implementation header for OSX
-// Author:
-// Copyright:   (c) 2009
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DATAVIEWCTRL_OSX_H_
-#define _WX_DATAVIEWCTRL_OSX_H_
-
-#ifdef __WXMAC_CLASSIC__
-#  error "Native wxDataViewCtrl for classic environment not defined. Please use generic control."
-#endif
-
-// --------------------------------------------------------
-// Class declarations to mask native types
-// --------------------------------------------------------
-class wxDataViewColumnNativeData;   // class storing environment dependent data for the native implementation
-class wxDataViewWidgetImpl;         // class used as a common interface for carbon and cocoa implementation
-
-// ---------------------------------------------------------
-// wxDataViewColumn
-// ---------------------------------------------------------
-
-class WXDLLIMPEXP_ADV wxDataViewColumn: public wxDataViewColumnBase
-{
-public:
-    // constructors / destructor
-    wxDataViewColumn(const wxString& title,
-                     wxDataViewRenderer* renderer,
-                     unsigned int model_column,
-                     int width = wxDVC_DEFAULT_WIDTH,
-                     wxAlignment align = wxALIGN_CENTER,
-                     int flags = wxDATAVIEW_COL_RESIZABLE);
-    wxDataViewColumn(const wxBitmap& bitmap,
-                     wxDataViewRenderer* renderer,
-                     unsigned int model_column,
-                     int width = wxDVC_DEFAULT_WIDTH,
-                     wxAlignment align = wxALIGN_CENTER,
-                     int flags = wxDATAVIEW_COL_RESIZABLE);
-    virtual ~wxDataViewColumn();
-
-    // implement wxHeaderColumnBase pure virtual methods
-    virtual wxAlignment GetAlignment() const { return m_alignment; }
-    virtual int GetFlags() const { return m_flags; }
-    virtual int GetMaxWidth() const { return m_maxWidth; }
-    virtual int GetMinWidth() const { return m_minWidth; }
-    virtual wxString GetTitle() const { return m_title; }
-    virtual int GetWidth() const;
-    virtual bool IsSortOrderAscending() const { return m_ascending; }
-    virtual bool IsSortKey() const;
-    virtual bool IsHidden() const;
-
-    virtual void SetAlignment  (wxAlignment align);
-    virtual void SetBitmap     (wxBitmap const& bitmap);
-    virtual void SetFlags      (int flags) { m_flags = flags; /*SetIndividualFlags(flags); */ }
-    virtual void SetHidden     (bool hidden);
-    virtual void SetMaxWidth   (int maxWidth);
-    virtual void SetMinWidth   (int minWidth);
-    virtual void SetReorderable(bool reorderable);
-    virtual void SetResizeable (bool resizable);
-    virtual void SetSortable   (bool sortable);
-    virtual void SetSortOrder  (bool ascending);
-    virtual void SetTitle      (wxString const& title);
-    virtual void SetWidth      (int  width);
-
-   // implementation only
-    wxDataViewColumnNativeData* GetNativeData() const
-    {
-      return m_NativeDataPtr;
-    }
-
-    void SetNativeData(wxDataViewColumnNativeData* newNativeDataPtr); // class takes ownership of pointer
-    int GetWidthVariable() const
-    {
-        return m_width;
-    }
-    void SetWidthVariable(int NewWidth)
-    {
-        m_width = NewWidth;
-    }
-    void SetSortOrderVariable(bool NewOrder)
-    {
-        m_ascending = NewOrder;
-    }
-
-private:
-    // common part of all ctors
-    void InitCommon(int width, wxAlignment align, int flags)
-    {
-        m_ascending = true;
-        m_flags = flags & ~wxDATAVIEW_COL_HIDDEN; // TODO
-        m_maxWidth = 30000;
-        m_minWidth = 0;
-        m_alignment = align;
-        SetWidth(width);
-    }
-
-    bool m_ascending; // sorting order
-
-    int m_flags;    // flags for the column
-    int m_maxWidth; // maximum width for the column
-    int m_minWidth; // minimum width for the column
-    int m_width;    // column width
-
-    wxAlignment m_alignment; // column header alignment
-
-    wxDataViewColumnNativeData* m_NativeDataPtr; // storing environment dependent data for the native implementation
-
-    wxString m_title; // column title
-};
-
-//
-// type definitions related to wxDataViewColumn
-//
-WX_DEFINE_ARRAY(wxDataViewColumn*,wxDataViewColumnPtrArrayType);
-
-// ---------------------------------------------------------
-// wxDataViewCtrl
-// ---------------------------------------------------------
-class WXDLLIMPEXP_ADV wxDataViewCtrl: public wxDataViewCtrlBase
-{
-public:
- // Constructors / destructor:
-  wxDataViewCtrl()
-  {
-    Init();
-  }
-  wxDataViewCtrl(wxWindow *parent,
-                 wxWindowID winid,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = 0,
-                 const wxValidator& validator = wxDefaultValidator,
-                 const wxString& name = wxDataViewCtrlNameStr )
-  {
-    Init();
-    Create(parent, winid, pos, size, style, validator, name);
-  }
-
-  ~wxDataViewCtrl();
-
-  bool Create(wxWindow *parent,
-              wxWindowID winid,
-              const wxPoint& pos = wxDefaultPosition,
-              const wxSize& size = wxDefaultSize,
-              long style = 0,
-              const wxValidator& validator = wxDefaultValidator,
-              const wxString& name = wxDataViewCtrlNameStr);
-
-  virtual wxWindow* GetMainWindow() // not used for the native implementation
-  {
-    return this;
-  }
-
- // inherited methods from wxDataViewCtrlBase:
-  virtual bool AssociateModel(wxDataViewModel* model);
-
-  virtual bool              AppendColumn     (wxDataViewColumn* columnPtr);
-  virtual bool              ClearColumns     ();
-  virtual bool              DeleteColumn     (wxDataViewColumn* columnPtr);
-  virtual wxDataViewColumn* GetColumn        (unsigned int pos) const;
-  virtual unsigned int      GetColumnCount   () const;
-  virtual int               GetColumnPosition(const wxDataViewColumn* columnPtr) const;
-  virtual wxDataViewColumn* GetSortingColumn () const;
-  virtual bool              InsertColumn     (unsigned int pos, wxDataViewColumn *col);
-  virtual bool              PrependColumn    (wxDataViewColumn* columnPtr);
-
-  virtual void Collapse( const wxDataViewItem& item);
-  virtual void EnsureVisible(const wxDataViewItem& item, const wxDataViewColumn* columnPtr=NULL);
-  virtual void Expand(const wxDataViewItem& item);
-  virtual bool IsExpanded(const wxDataViewItem & item) const;
-
-  virtual unsigned int GetCount() const;
-  virtual wxRect GetItemRect(const wxDataViewItem& item,
-                             const wxDataViewColumn* columnPtr = NULL) const;
-  virtual int GetSelectedItemsCount() const;
-  virtual int GetSelections(wxDataViewItemArray& sel) const;
-
-  virtual void HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn*& columnPtr) const;
-
-  virtual bool IsSelected(const wxDataViewItem& item) const;
-
-  virtual void SelectAll();
-  virtual void Select(const wxDataViewItem& item);
-  virtual void SetSelections(const wxDataViewItemArray& sel);
-
-  virtual void Unselect(const wxDataViewItem& item);
-  virtual void UnselectAll();
-
-//
-// implementation
-//
- // returns a pointer to the native implementation
-  wxDataViewWidgetImpl* GetDataViewPeer() const;
-
- // adds all children of the passed parent to the control; if 'parentItem' is invalid the root(s) is/are added:
-  void AddChildren(wxDataViewItem const& parentItem);
-
- // finishes editing of custom items; if no custom item is currently edited the method does nothing
-  void FinishCustomItemEditing();
-  
-  virtual void EditItem(const wxDataViewItem& item, const wxDataViewColumn *column);
-
- // returns the n-th pointer to a column;
- // this method is different from GetColumn(unsigned int pos) because here 'n' is not a position in the control but the n-th
- // position in the internal list/array of column pointers
-  wxDataViewColumn* GetColumnPtr(size_t n) const
-  {
-    return m_ColumnPtrs[n];
-  }
- // returns the current being rendered item of the customized renderer (this item is only valid during editing)
-  wxDataViewItem const& GetCustomRendererItem() const
-  {
-    return m_CustomRendererItem;
-  }
- // returns a pointer to a customized renderer (this pointer is only valid during editing)
-  wxDataViewCustomRenderer* GetCustomRendererPtr() const
-  {
-    return m_CustomRendererPtr;
-  }
-
- // checks if currently a delete process is running
-  bool IsDeleting() const
-  {
-    return m_Deleting;
-  }
-
- // with CG, we need to get the context from an kEventControlDraw event
- // unfortunately, the DataBrowser callbacks don't provide the context
- // and we need it, so we need to set/remove it before and after draw
- // events so we can access it in the callbacks.
-  void MacSetDrawingContext(void* context)
-  {
-    m_cgContext = context;
-  }
-  void* MacGetDrawingContext() const
-  {
-    return m_cgContext;
-  }
-
- // sets the currently being edited item of the custom renderer
-  void SetCustomRendererItem(wxDataViewItem const& NewItem)
-  {
-    m_CustomRendererItem = NewItem;
-  }
- // sets the custom renderer
-  void SetCustomRendererPtr(wxDataViewCustomRenderer* NewCustomRendererPtr)
-  {
-    m_CustomRendererPtr = NewCustomRendererPtr;
-  }
- // sets the flag indicating a deletion process:
-  void SetDeleting(bool deleting)
-  {
-    m_Deleting = deleting;
-  }
-
-  virtual wxDataViewColumn *GetCurrentColumn() const;
-
-  virtual wxVisualAttributes GetDefaultAttributes() const
-  {
-      return GetClassDefaultAttributes(GetWindowVariant());
-  }
-
-  static wxVisualAttributes
-  GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
-protected:
- // inherited methods from wxDataViewCtrlBase
-  virtual void DoSetExpanderColumn();
-  virtual void DoSetIndent();
-
-  virtual wxSize DoGetBestSize() const;
-
- // event handling
-  void OnSize(wxSizeEvent &event);
-  void OnMouse(wxMouseEvent &event);
-
-private:
- // initializing of local variables:
-  void Init();
-
-  virtual wxDataViewItem DoGetCurrentItem() const;
-  virtual void DoSetCurrentItem(const wxDataViewItem& item);
-
- //
- // variables
- //
-  bool m_Deleting; // flag indicating if a delete process is running; this flag is necessary because the notifier indicating an item deletion in the model may be called
-                   // after the actual deletion of the item; then, native callback functions/delegates may try to update data of variables that are already deleted;
-                   // if this flag is set all native variable update requests will be ignored
-
-  void* m_cgContext; // pointer to core graphics context
-
-  wxDataViewCustomRenderer* m_CustomRendererPtr; // pointer to a valid custom renderer while editing; this class does NOT own the pointer
-
-  wxDataViewItem m_CustomRendererItem; // currently edited item by the customrenderer; it is invalid while not editing a custom item
-
-  wxDataViewColumnPtrArrayType m_ColumnPtrs; // all column pointers are stored in an array
-
-  wxDataViewModelNotifier* m_ModelNotifier; // stores the model notifier for the control (does not own the notifier)
-
- // wxWidget internal stuff:
-  DECLARE_DYNAMIC_CLASS(wxDataViewCtrl)
-  DECLARE_NO_COPY_CLASS(wxDataViewCtrl)
-  DECLARE_EVENT_TABLE()
-};
-
-#endif // _WX_DATAVIEWCTRL_OSX_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/datectrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/datectrl.h
deleted file mode 100644
index 555ba68e99..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/datectrl.h
+++ /dev/null
@@ -1,54 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/datectrl.h
-// Purpose:     Declaration of wxOSX-specific wxDatePickerCtrl class.
-// Author:      Vadim Zeitlin
-// Created:     2011-12-18
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_DATECTRL_H_
-#define _WX_OSX_DATECTRL_H_
-
-// ----------------------------------------------------------------------------
-// wxDatePickerCtrl
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_ADV wxDatePickerCtrl : public wxDatePickerCtrlBase
-{
-public:
-    // Constructors.
-    wxDatePickerCtrl() { }
-
-    wxDatePickerCtrl(wxWindow *parent,
-                     wxWindowID id,
-                     const wxDateTime& dt = wxDefaultDateTime,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize,
-                     long style = wxDP_DEFAULT | wxDP_SHOWCENTURY,
-                     const wxValidator& validator = wxDefaultValidator,
-                     const wxString& name = wxDatePickerCtrlNameStr)
-    {
-        Create(parent, id, dt, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxDateTime& dt = wxDefaultDateTime,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDP_DEFAULT | wxDP_SHOWCENTURY,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxDatePickerCtrlNameStr);
-
-    // Implement the base class pure virtuals.
-    virtual void SetRange(const wxDateTime& dt1, const wxDateTime& dt2);
-    virtual bool GetRange(wxDateTime *dt1, wxDateTime *dt2) const;
-
-    virtual void OSXGenerateEvent(const wxDateTime& dt);
-
-private:
-    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxDatePickerCtrl);
-};
-
-#endif // _WX_OSX_DATECTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/datetimectrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/datetimectrl.h
deleted file mode 100644
index 9993970125..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/datetimectrl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/datetimectrl.h
-// Purpose:     Declaration of wxOSX-specific wxDateTimePickerCtrl class.
-// Author:      Vadim Zeitlin
-// Created:     2011-12-18
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_DATETIMECTRL_H_
-#define _WX_OSX_DATETIMECTRL_H_
-
-class wxDateTimeWidgetImpl;
-
-// ----------------------------------------------------------------------------
-// wxDateTimePickerCtrl
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_ADV wxDateTimePickerCtrl : public wxDateTimePickerCtrlBase
-{
-public:
-    // Implement the base class pure virtuals.
-    virtual void SetValue(const wxDateTime& dt);
-    virtual wxDateTime GetValue() const;
-
-    // Implementation only.
-    virtual void OSXGenerateEvent(const wxDateTime& dt) = 0;
-
-protected:
-    wxDateTimeWidgetImpl* GetDateTimePeer() const;
-};
-
-#endif // _WX_OSX_DATETIMECTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dc.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dc.h
deleted file mode 100644
index 84bb59c077..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/dc.h
-// Purpose:     wxDC class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DC_H_
-#define _WX_DC_H_
-
-#endif // _WX_DC_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dcclient.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dcclient.h
deleted file mode 100644
index fca62cf35b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dcclient.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/dcclient.h
-// Purpose:     wxClientDC, wxPaintDC and wxWindowDC classes
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DCCLIENT_H_
-#define _WX_DCCLIENT_H_
-
-#include "wx/dc.h"
-#include "wx/dcgraph.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxPaintDC;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-
-class WXDLLIMPEXP_CORE wxWindowDCImpl: public wxGCDCImpl
-{
-public:
-    wxWindowDCImpl( wxDC *owner );
-    wxWindowDCImpl( wxDC *owner, wxWindow *window );
-    virtual ~wxWindowDCImpl();
-
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
-
-protected:
-    bool m_release;
-    int m_width;
-    int m_height;
-
-    DECLARE_CLASS(wxWindowDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxWindowDCImpl);
-};
-
-
-class WXDLLIMPEXP_CORE wxClientDCImpl: public wxWindowDCImpl
-{
-public:
-    wxClientDCImpl( wxDC *owner );
-    wxClientDCImpl( wxDC *owner, wxWindow *window );
-    virtual ~wxClientDCImpl();
-
-private:
-    DECLARE_CLASS(wxClientDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxClientDCImpl);
-};
-
-
-class WXDLLIMPEXP_CORE wxPaintDCImpl: public wxWindowDCImpl
-{
-public:
-    wxPaintDCImpl( wxDC *owner );
-    wxPaintDCImpl( wxDC *owner, wxWindow *win );
-    virtual ~wxPaintDCImpl();
-
-protected:
-    DECLARE_CLASS(wxPaintDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxPaintDCImpl);
-};
-
-
-#endif
-    // _WX_DCCLIENT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dcmemory.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dcmemory.h
deleted file mode 100644
index bace3c5a95..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dcmemory.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/dcmemory.h
-// Purpose:     wxMemoryDC class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DCMEMORY_H_
-#define _WX_DCMEMORY_H_
-
-#include "wx/osx/dcclient.h"
-
-class WXDLLIMPEXP_CORE wxMemoryDCImpl: public wxPaintDCImpl
-{
-public:
-    wxMemoryDCImpl( wxMemoryDC *owner );
-    wxMemoryDCImpl( wxMemoryDC *owner, wxBitmap& bitmap );
-    wxMemoryDCImpl( wxMemoryDC *owner, wxDC *dc );
-
-    virtual ~wxMemoryDCImpl();
-
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const
-       { return subrect == NULL ? GetSelectedBitmap() : GetSelectedBitmap().GetSubBitmap(*subrect); }
-    virtual void DoSelect(const wxBitmap& bitmap);
-
-    virtual const wxBitmap& GetSelectedBitmap() const
-        { return m_selected; }
-    virtual wxBitmap& GetSelectedBitmap()
-        { return m_selected; }
-
-private:
-    void Init();
-
-    wxBitmap  m_selected;
-
-    DECLARE_CLASS(wxMemoryDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxMemoryDCImpl);
-};
-
-#endif
-    // _WX_DCMEMORY_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dcprint.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dcprint.h
deleted file mode 100644
index ec9f785167..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dcprint.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/dcprint.h
-// Purpose:     wxPrinterDC class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DCPRINT_H_
-#define _WX_DCPRINT_H_
-
-#include "wx/dc.h"
-#include "wx/dcgraph.h"
-#include "wx/cmndata.h"
-
-class wxNativePrinterDC ;
-
-class WXDLLIMPEXP_CORE wxPrinterDCImpl: public wxGCDCImpl
-{
-public:
-#if wxUSE_PRINTING_ARCHITECTURE
-
-    wxPrinterDCImpl( wxPrinterDC *owner, const wxPrintData& printdata );
-    virtual ~wxPrinterDCImpl();
-
-    virtual bool StartDoc( const wxString& WXUNUSED(message) ) ;
-    virtual void EndDoc(void) ;
-    virtual void StartPage(void) ;
-    virtual void EndPage(void) ;
-
-    wxRect GetPaperRect() const;
-
-    wxPrintData& GetPrintData() { return m_printData; }
-    virtual wxSize GetPPI() const;
-
-protected:
-    virtual void DoGetSize( int *width, int *height ) const;
-
-    wxPrintData        m_printData ;
-    wxNativePrinterDC* m_nativePrinterDC ;
-
-private:
-    DECLARE_CLASS(wxPrinterDC)
-#endif // wxUSE_PRINTING_ARCHITECTURE
-};
-
-#endif
-    // _WX_DCPRINT_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dcscreen.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dcscreen.h
deleted file mode 100644
index 374f0efcd8..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dcscreen.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/dcscreen.h
-// Purpose:     wxScreenDC class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DCSCREEN_H_
-#define _WX_DCSCREEN_H_
-
-#include "wx/dcclient.h"
-#include "wx/osx/dcclient.h"
-
-class WXDLLIMPEXP_CORE wxScreenDCImpl: public wxWindowDCImpl
-{
-public:
-    wxScreenDCImpl( wxDC *owner );
-    virtual ~wxScreenDCImpl();
-
-    virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const;
-private:
-    void* m_overlayWindow;
-
-private:
-    DECLARE_CLASS(wxScreenDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxScreenDCImpl);
-};
-
-#endif
-    // _WX_DCSCREEN_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dialog.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dialog.h
deleted file mode 100644
index 3b0b724fb8..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dialog.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/dialog.h
-// Purpose:     wxDialog class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DIALOG_H_
-#define _WX_DIALOG_H_
-
-#include "wx/panel.h"
-
-class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
-class WXDLLIMPEXP_FWD_CORE wxModalEventLoop ;
-
-// Dialog boxes
-class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase
-{
-    DECLARE_DYNAMIC_CLASS(wxDialog)
-
-public:
-    wxDialog() { Init(); }
-
-    // Constructor with no modal flag - the new convention.
-    wxDialog(wxWindow *parent, wxWindowID id,
-             const wxString& title,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = wxDEFAULT_DIALOG_STYLE,
-             const wxString& name = wxDialogNameStr)
-    {
-        Init();
-        Create(parent, id, title, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_DIALOG_STYLE,
-                const wxString& name = wxDialogNameStr);
-
-    virtual ~wxDialog();
-
-//    virtual bool Destroy();
-    virtual bool Show(bool show = true);
-
-    // return true if we're showing the dialog modally
-    virtual bool IsModal() const;
-
-    // show the dialog modally and return the value passed to EndModal()
-    virtual int ShowModal();
-
-    virtual void ShowWindowModal();
-
-    // may be called to terminate the dialog with the given return code
-    virtual void EndModal(int retCode);
-
-    static bool OSXHasModalDialogsOpen();
-    static void OSXBeginModalDialog();
-    static void OSXEndModalDialog();
-
-    // implementation
-    // --------------
-
-    wxDialogModality GetModality() const;
-
-#if wxOSX_USE_COCOA
-    virtual void ModalFinishedCallback(void* WXUNUSED(panel), int WXUNUSED(returnCode)) {}
-#endif
-
-protected:
-    // show window modal dialog
-    void DoShowWindowModal();
-
-    // end window modal dialog.
-    void EndWindowModal();
-
-    // mac also takes command-period as cancel
-    virtual bool IsEscapeKey(const wxKeyEvent& event);
-
-
-    wxDialogModality m_modality;
-
-    wxModalEventLoop* m_eventLoop;
-
-private:
-    void Init();
-};
-
-#endif
-    // _WX_DIALOG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dirdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dirdlg.h
deleted file mode 100644
index f355f604e8..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dirdlg.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/dirdlg.h
-// Purpose:     wxDirDialog class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DIRDLG_H_
-#define _WX_DIRDLG_H_
-
-#if wxOSX_USE_COCOA
-    DECLARE_WXCOCOA_OBJC_CLASS(NSOpenPanel);
-#endif
-
-class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase
-{
-public:
-    wxDirDialog() { Init(); }
-
-    wxDirDialog(wxWindow *parent,
-                const wxString& message = wxDirSelectorPromptStr,
-                const wxString& defaultPath = wxT(""),
-                long style = wxDD_DEFAULT_STYLE,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                const wxString& name = wxDirDialogNameStr)
-    {
-        Init();
-
-        Create(parent,message,defaultPath,style,pos,size,name);
-    }
-
-    void Create(wxWindow *parent,
-                const wxString& message = wxDirSelectorPromptStr,
-                const wxString& defaultPath = wxT(""),
-                long style = wxDD_DEFAULT_STYLE,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                const wxString& name = wxDirDialogNameStr);
-
-#if wxOSX_USE_COCOA
-    ~wxDirDialog();
-#endif
-
-    virtual int ShowModal();
-
-#if wxOSX_USE_COCOA
-    virtual void ShowWindowModal();
-    virtual void ModalFinishedCallback(void* panel, int returnCode);
-#endif
-
-private:
-#if wxOSX_USE_COCOA
-    // Create and initialize NSOpenPanel that we use in both ShowModal() and
-    // ShowWindowModal().
-    WX_NSOpenPanel OSXCreatePanel() const;
-
-    WX_NSObject m_sheetDelegate;
-#endif
-
-    // Common part of all ctors.
-    void Init();
-
-    DECLARE_DYNAMIC_CLASS(wxDirDialog)
-};
-
-#endif // _WX_DIRDLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dnd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dnd.h
deleted file mode 100644
index 7cd8ed2242..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dnd.h
+++ /dev/null
@@ -1,108 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/dnd.h
-// Purpose:     Declaration of the wxDropTarget, wxDropSource class etc.
-// Author:      Stefan Csomor
-// Copyright:   (c) 1998 Stefan Csomor
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DND_H_
-#define _WX_DND_H_
-
-#if wxUSE_DRAG_AND_DROP
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/string.h"
-#include "wx/dataobj.h"
-#include "wx/cursor.h"
-
-//-------------------------------------------------------------------------
-// classes
-//-------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-
-class WXDLLIMPEXP_FWD_CORE wxDropTarget;
-class WXDLLIMPEXP_FWD_CORE wxTextDropTarget;
-class WXDLLIMPEXP_FWD_CORE wxFileDropTarget;
-
-class WXDLLIMPEXP_FWD_CORE wxDropSource;
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-// this macro may be used instead for wxDropSource ctor arguments: it will use
-// the icon 'name' from an XPM file under GTK, but will expand to something
-// else under MSW. If you don't use it, you will have to use #ifdef in the
-// application code.
-#define wxDROP_ICON(X)   wxCursor(X##_xpm)
-
-//-------------------------------------------------------------------------
-// wxDropTarget
-//-------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDropTarget: public wxDropTargetBase
-{
-  public:
-
-    wxDropTarget(wxDataObject *dataObject = NULL );
-
-    virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
-    virtual bool OnDrop(wxCoord x, wxCoord y);
-    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def);
-    virtual bool GetData();
-    // NOTE: This is needed by the generic wxDataViewCtrl, not sure how to implement.
-    virtual wxDataFormat GetMatchingPair();
-
-    bool CurrentDragHasSupportedFormat() ;
-    void SetCurrentDragPasteboard( void* dragpasteboard ) { m_currentDragPasteboard = dragpasteboard ; }
-  protected :
-    void* m_currentDragPasteboard ;
-};
-
-//-------------------------------------------------------------------------
-// wxDropSource
-//-------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDropSource: public wxDropSourceBase
-{
-public:
-    // ctors: if you use default ctor you must call SetData() later!
-    //
-    // NB: the "wxWindow *win" parameter is unused and is here only for wxGTK
-    //     compatibility, as well as both icon parameters
-    wxDropSource( wxWindow *win = NULL,
-                 const wxCursor &cursorCopy = wxNullCursor,
-                 const wxCursor &cursorMove = wxNullCursor,
-                 const wxCursor &cursorStop = wxNullCursor);
-
-    /* constructor for setting one data object */
-    wxDropSource( wxDataObject& data,
-                  wxWindow *win,
-                 const wxCursor &cursorCopy = wxNullCursor,
-                 const wxCursor &cursorMove = wxNullCursor,
-                 const wxCursor &cursorStop = wxNullCursor);
-
-    virtual ~wxDropSource();
-
-    // do it (call this in response to a mouse button press, for example)
-    // params: if bAllowMove is false, data can be only copied
-    virtual wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
-
-    wxWindow*     GetWindow() { return m_window ; }
-    void SetCurrentDragPasteboard( void* dragpasteboard ) { m_currentDragPasteboard = dragpasteboard ; }
-    bool MacInstallDefaultCursor(wxDragResult effect) ;
-    static wxDropSource* GetCurrentDropSource();
-  protected :
-
-    wxWindow        *m_window;
-    void* m_currentDragPasteboard ;
-};
-
-#endif // wxUSE_DRAG_AND_DROP
-
-#endif
-   //_WX_DND_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dvrenderer.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dvrenderer.h
deleted file mode 100644
index d7ded78464..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dvrenderer.h
+++ /dev/null
@@ -1,111 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/dvrenderer.h
-// Purpose:     wxDataViewRenderer for OS X wxDataViewCtrl implementations
-// Author:      Vadim Zeitlin
-// Created:     2009-11-07 (extracted from wx/osx/dataview.h)
-// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_DVRENDERER_H_
-#define _WX_OSX_DVRENDERER_H_
-
-class wxDataViewRendererNativeData;
-
-// ----------------------------------------------------------------------------
-// wxDataViewRenderer
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_ADV wxDataViewRenderer : public wxDataViewRendererBase
-{
-public:
-    // constructors / destructor
-    // -------------------------
-
-    wxDataViewRenderer(const wxString& varianttype,
-                       wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
-                       int align = wxDVR_DEFAULT_ALIGNMENT);
-
-    virtual ~wxDataViewRenderer();
-
-    // inherited methods from wxDataViewRendererBase
-    // ---------------------------------------------
-
-    virtual int GetAlignment() const
-    {
-        return m_alignment;
-    }
-    virtual wxDataViewCellMode GetMode() const
-    {
-        return m_mode;
-    }
-    virtual bool GetValue(wxVariant& value) const
-    {
-        value = m_value;
-        return true;
-    }
-
-    // NB: in Carbon this is always identical to the header alignment
-    virtual void SetAlignment(int align);
-    virtual void SetMode(wxDataViewCellMode mode);
-    virtual bool SetValue(const wxVariant& newValue)
-    {
-        m_value = newValue;
-        return true;
-    }
-
-    virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE);
-    virtual wxEllipsizeMode GetEllipsizeMode() const;
-
-    // implementation
-    // --------------
-
-    const wxVariant& GetValue() const
-    {
-        return m_value;
-    }
-
-    wxDataViewRendererNativeData* GetNativeData() const
-    {
-        return m_NativeDataPtr;
-    }
-
-    // a call to the native data browser function to render the data;
-    // returns true if the data value could be rendered, false otherwise
-    virtual bool MacRender() = 0;
-
-    void SetNativeData(wxDataViewRendererNativeData* newNativeDataPtr);
-
-
-#if wxOSX_USE_COCOA
-    // called when a value was edited by user
-    virtual void OSXOnCellChanged(NSObject *value,
-                                  const wxDataViewItem& item,
-                                  unsigned col);
-
-    // called to ensure that the given attribute will be used for rendering the
-    // next cell (which had been already associated with this renderer before)
-    virtual void OSXApplyAttr(const wxDataViewItemAttr& attr);
-
-    // called to set the state of the next cell to be rendered
-    virtual void OSXApplyEnabled(bool enabled);
-#endif // Cocoa
-
-private:
-    // contains the alignment flags
-    int m_alignment;
-
-    // storing the mode that determines how the cell is going to be shown
-    wxDataViewCellMode m_mode;
-
-    // data used by implementation of the native renderer
-    wxDataViewRendererNativeData* m_NativeDataPtr;
-
-    // value that is going to be rendered
-    wxVariant m_value;
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewRenderer)
-};
-
-#endif // _WX_OSX_DVRENDERER_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dvrenderers.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dvrenderers.h
deleted file mode 100644
index d046b1a851..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/dvrenderers.h
+++ /dev/null
@@ -1,212 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/dvrenderers.h
-// Purpose:     All OS X wxDataViewCtrl renderer classes
-// Author:      Vadim Zeitlin
-// Created:     2009-11-07 (extracted from wx/osx/dataview.h)
-// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_DVRENDERERS_H_
-#define _WX_OSX_DVRENDERERS_H_
-
-// ---------------------------------------------------------
-// wxDataViewCustomRenderer
-// ---------------------------------------------------------
-
-class WXDLLIMPEXP_ADV wxDataViewCustomRenderer : public wxDataViewCustomRendererBase
-{
-public:
-    wxDataViewCustomRenderer(const wxString& varianttype = "string",
-                             wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
-                             int align = wxDVR_DEFAULT_ALIGNMENT);
-
-    virtual ~wxDataViewCustomRenderer();
-
-
-    // implementation only
-    // -------------------
-
-    virtual bool MacRender();
-
-#if wxOSX_USE_COCOA
-    virtual void OSXApplyAttr(const wxDataViewItemAttr& attr);
-#endif // Cocoa
-
-    virtual wxDC* GetDC(); // creates a device context and keeps it
-    void SetDC(wxDC* newDCPtr); // this method takes ownership of the pointer
-
-private:
-    wxControl* m_editorCtrlPtr; // pointer to an in-place editor control
-
-    wxDC* m_DCPtr;
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewCustomRenderer)
-};
-
-// ---------------------------------------------------------
-// wxDataViewTextRenderer
-// ---------------------------------------------------------
-
-class WXDLLIMPEXP_ADV wxDataViewTextRenderer: public wxDataViewRenderer
-{
-public:
-    wxDataViewTextRenderer(const wxString& varianttype = "string",
-                           wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
-                           int align = wxDVR_DEFAULT_ALIGNMENT);
-
-    virtual bool MacRender();
-
-#if wxOSX_USE_COCOA
-    virtual void OSXOnCellChanged(NSObject *value,
-                                  const wxDataViewItem& item,
-                                  unsigned col);
-#endif // Cocoa
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewTextRenderer)
-};
-
-// ---------------------------------------------------------
-// wxDataViewBitmapRenderer
-// ---------------------------------------------------------
-
-class WXDLLIMPEXP_ADV wxDataViewBitmapRenderer: public wxDataViewRenderer
-{
-public:
-    wxDataViewBitmapRenderer(const wxString& varianttype = "wxBitmap",
-                             wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
-                             int align = wxDVR_DEFAULT_ALIGNMENT);
-
-    virtual bool MacRender();
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewBitmapRenderer)
-};
-
-#if wxOSX_USE_COCOA
-
-// -------------------------------------
-// wxDataViewChoiceRenderer
-// -------------------------------------
-
-class WXDLLIMPEXP_ADV wxDataViewChoiceRenderer: public wxDataViewRenderer
-{
-public:
-    wxDataViewChoiceRenderer(const wxArrayString& choices,
-                             wxDataViewCellMode mode = wxDATAVIEW_CELL_EDITABLE,
-                             int alignment = wxDVR_DEFAULT_ALIGNMENT );
-
-    virtual bool MacRender();
-
-    wxString GetChoice(size_t index) const { return m_choices[index]; }
-    const wxArrayString& GetChoices() const { return m_choices; }
-
-#if wxOSX_USE_COCOA
-    virtual void OSXOnCellChanged(NSObject *value,
-                                  const wxDataViewItem& item,
-                                  unsigned col);
-#endif // Cocoa
-
-private:
-    wxArrayString m_choices;
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewChoiceRenderer)
-};
-
-#endif // wxOSX_USE_COCOA
-
-// ---------------------------------------------------------
-// wxDataViewIconTextRenderer
-// ---------------------------------------------------------
-class WXDLLIMPEXP_ADV wxDataViewIconTextRenderer: public wxDataViewRenderer
-{
-public:
-    wxDataViewIconTextRenderer(const wxString& varianttype = "wxDataViewIconText",
-                               wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
-                               int align = wxDVR_DEFAULT_ALIGNMENT);
-
-    virtual bool MacRender();
-
-#if wxOSX_USE_COCOA
-    virtual void OSXOnCellChanged(NSObject *value,
-                                  const wxDataViewItem& item,
-                                  unsigned col);
-#endif // Cocoa
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewIconTextRenderer)
-};
-
-// ---------------------------------------------------------
-// wxDataViewToggleRenderer
-// ---------------------------------------------------------
-
-class WXDLLIMPEXP_ADV wxDataViewToggleRenderer: public wxDataViewRenderer
-{
-public:
-    wxDataViewToggleRenderer(const wxString& varianttype = "bool",
-                             wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
-                             int align = wxDVR_DEFAULT_ALIGNMENT);
-
-    virtual bool MacRender();
-
-#if wxOSX_USE_COCOA
-    virtual void OSXOnCellChanged(NSObject *value,
-                                  const wxDataViewItem& item,
-                                  unsigned col);
-#endif // Cocoa
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewToggleRenderer)
-};
-
-// ---------------------------------------------------------
-// wxDataViewProgressRenderer
-// ---------------------------------------------------------
-
-class WXDLLIMPEXP_ADV wxDataViewProgressRenderer: public wxDataViewRenderer
-{
-public:
-    wxDataViewProgressRenderer(const wxString& label = wxEmptyString,
-                               const wxString& varianttype = "long",
-                               wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
-                               int align = wxDVR_DEFAULT_ALIGNMENT);
-
-    virtual bool MacRender();
-
-#if wxOSX_USE_COCOA
-    virtual void OSXOnCellChanged(NSObject *value,
-                                  const wxDataViewItem& item,
-                                  unsigned col);
-#endif // Cocoa
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewProgressRenderer)
-};
-
-// ---------------------------------------------------------
-// wxDataViewDateRenderer
-// ---------------------------------------------------------
-
-class WXDLLIMPEXP_ADV wxDataViewDateRenderer: public wxDataViewRenderer
-{
-public:
-    wxDataViewDateRenderer(const wxString& varianttype = "datetime",
-                           wxDataViewCellMode mode = wxDATAVIEW_CELL_ACTIVATABLE,
-                           int align = wxDVR_DEFAULT_ALIGNMENT);
-
-    virtual bool MacRender();
-
-#if wxOSX_USE_COCOA
-    virtual void OSXOnCellChanged(NSObject *value,
-                                  const wxDataViewItem& item,
-                                  unsigned col);
-#endif // Cocoa
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxDataViewDateRenderer)
-};
-
-#endif // _WX_OSX_DVRENDERERS_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/evtloop.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/evtloop.h
deleted file mode 100644
index 98772dd97f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/evtloop.h
+++ /dev/null
@@ -1,46 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/evtloop.h
-// Purpose:     simply forwards to wx/osx/carbon/evtloop.h or
-//              wx/osx/cocoa/evtloop.h for consistency with the other Mac
-//              headers
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     2006-01-12
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_EVTLOOP_H_
-#define _WX_OSX_EVTLOOP_H_
-
-#ifdef __WXOSX_COCOA__
-    #include "wx/osx/cocoa/evtloop.h"
-#else
-    #include "wx/osx/carbon/evtloop.h"
-#endif
-
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow;
-
-class WXDLLIMPEXP_CORE wxModalEventLoop : public wxGUIEventLoop
-{
-public:
-    wxModalEventLoop(wxWindow *modalWindow);
-    wxModalEventLoop(WXWindow modalNativeWindow);
-    
-#ifdef __WXOSX_COCOA__
-    // skip wxGUIEventLoop to avoid missing Enter/Exit notifications
-    virtual int Run() { return wxCFEventLoop::Run(); }
-
-    virtual bool ProcessIdle();
-#endif
-protected:
-    virtual void OSXDoRun();
-    virtual void OSXDoStop();
-
-    // (in case) the modal window for this event loop
-    wxNonOwnedWindow* m_modalWindow;
-    WXWindow m_modalNativeWindow;
-};
-
-#endif // _WX_OSX_EVTLOOP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/evtloopsrc.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/evtloopsrc.h
deleted file mode 100644
index 291ce0f1e4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/evtloopsrc.h
+++ /dev/null
@@ -1,44 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/evtloopsrc.h
-// Purpose:     wxCFEventLoopSource class
-// Author:      Vadim Zeitlin
-// Created:     2009-10-21
-// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_EVTLOOPSRC_H_
-#define _WX_OSX_EVTLOOPSRC_H_
-
-typedef struct __CFSocket* CFSocketRef;
-
-// ----------------------------------------------------------------------------
-// wxCFEventLoopSource: CoreFoundation-based wxEventLoopSource for OS X
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxCFEventLoopSource : public wxEventLoopSource
-{
-public:
-    // Create a new source in uninitialized state, call InitSocketRef() later
-    // to associate it with the socket it is going to use.
-    wxCFEventLoopSource(wxEventLoopSourceHandler *handler, int flags)
-        : wxEventLoopSource(handler, flags)
-    {
-        m_cfSocket = NULL;
-    }
-
-    // Finish initialization of the event loop source by providing the
-    // associated socket. This object takes ownership of it and will release it.
-    void InitSourceSocket(CFSocketRef cfSocket);
-
-    // Destructor deletes the associated socket.
-    virtual ~wxCFEventLoopSource();
-
-private:
-    CFSocketRef m_cfSocket;
-
-    wxDECLARE_NO_COPY_CLASS(wxCFEventLoopSource);
-};
-
-#endif // _WX_OSX_EVTLOOPSRC_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/filedlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/filedlg.h
deleted file mode 100644
index 10342fa8a8..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/filedlg.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/filedlg.h
-// Purpose:     wxFileDialog class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FILEDLG_H_
-#define _WX_FILEDLG_H_
-
-class WXDLLIMPEXP_FWD_CORE wxChoice;
-
-//-------------------------------------------------------------------------
-// wxFileDialog
-//-------------------------------------------------------------------------
-
-// set this system option to 1 in order to always show the filetypes popup in 
-// file open dialogs if possible
-
-#define wxOSX_FILEDIALOG_ALWAYS_SHOW_TYPES wxT("osx.openfiledialog.always-show-types")
-
-class WXDLLIMPEXP_CORE wxFileDialog: public wxFileDialogBase
-{
-DECLARE_DYNAMIC_CLASS(wxFileDialog)
-protected:
-    wxArrayString m_fileNames;
-    wxArrayString m_paths;
-
-public:
-    wxFileDialog() { Init(); }
-    wxFileDialog(wxWindow *parent,
-                 const wxString& message = wxFileSelectorPromptStr,
-                 const wxString& defaultDir = wxEmptyString,
-                 const wxString& defaultFile = wxEmptyString,
-                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
-                 long style = wxFD_DEFAULT_STYLE,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& sz = wxDefaultSize,
-                 const wxString& name = wxFileDialogNameStr)
-    {
-        Init();
-
-        Create(parent,message,defaultDir,defaultFile,wildCard,style,pos,sz,name);
-    }
-
-    void Create(wxWindow *parent,
-                 const wxString& message = wxFileSelectorPromptStr,
-                 const wxString& defaultDir = wxEmptyString,
-                 const wxString& defaultFile = wxEmptyString,
-                 const wxString& wildCard = wxFileSelectorDefaultWildcardStr,
-                 long style = wxFD_DEFAULT_STYLE,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& sz = wxDefaultSize,
-                 const wxString& name = wxFileDialogNameStr);
-
-#if wxOSX_USE_COCOA
-    ~wxFileDialog();
-#endif
-    
-    virtual void GetPaths(wxArrayString& paths) const { paths = m_paths; }
-    virtual void GetFilenames(wxArrayString& files) const { files = m_fileNames ; }
-
-    virtual int ShowModal();
-
-#if wxOSX_USE_COCOA
-    virtual void ShowWindowModal();
-    virtual void ModalFinishedCallback(void* panel, int resultCode);
-#endif
-
-    virtual bool SupportsExtraControl() const;
-    
-    // implementation only
-    
-#if wxOSX_USE_COCOA
-    // returns true if the file can be shown as active
-    bool CheckFile( const wxString& filename );
-#endif
-
-protected:
-    // not supported for file dialog, RR
-    virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
-                           int WXUNUSED(width), int WXUNUSED(height),
-                           int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
-
-    void SetupExtraControls(WXWindow nativeWindow);
-    
-#if wxOSX_USE_COCOA
-    virtual wxWindow* CreateFilterPanel(wxWindow *extracontrol);
-    void DoOnFilterSelected(int index);
-    virtual void OnFilterSelected(wxCommandEvent &event);
-
-    wxArrayString m_filterExtensions;
-    wxArrayString m_filterNames;
-    wxChoice* m_filterChoice;
-    wxWindow* m_filterPanel;
-    bool m_useFileTypeFilter;
-    int m_firstFileTypeFilter;
-    wxArrayString m_currentExtensions;
-    WX_NSObject m_delegate;
-    WX_NSObject m_sheetDelegate;
-#endif
-
-private:
-    // Common part of all ctors.
-    void Init();
-};
-
-#endif // _WX_FILEDLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/font.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/font.h
deleted file mode 100644
index 2c31c2daa7..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/font.h
+++ /dev/null
@@ -1,191 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/font.h
-// Purpose:     wxFont class
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FONT_H_
-#define _WX_FONT_H_
-
-// ----------------------------------------------------------------------------
-// wxFont
-// ----------------------------------------------------------------------------
-
-// font styles
-enum wxOSXSystemFont
-{
-    wxOSX_SYSTEM_FONT_NONE = 0,
-    wxOSX_SYSTEM_FONT_NORMAL,
-    wxOSX_SYSTEM_FONT_BOLD,
-    wxOSX_SYSTEM_FONT_SMALL,
-    wxOSX_SYSTEM_FONT_SMALL_BOLD,
-    wxOSX_SYSTEM_FONT_MINI,
-    wxOSX_SYSTEM_FONT_MINI_BOLD,
-    wxOSX_SYSTEM_FONT_LABELS,
-    wxOSX_SYSTEM_FONT_VIEWS
-};
-
-
-class WXDLLIMPEXP_CORE wxFont : public wxFontBase
-{
-public:
-    // ctors and such
-    wxFont() { }
-
-    wxFont(const wxFontInfo& info)
-    {
-        Create(info.GetPointSize(),
-               info.GetFamily(),
-               info.GetStyle(),
-               info.GetWeight(),
-               info.IsUnderlined(),
-               info.GetFaceName(),
-               info.GetEncoding());
-
-        if ( info.IsUsingSizeInPixels() )
-            SetPixelSize(info.GetPixelSize());
-    }
-
-    wxFont( wxOSXSystemFont systemFont );
-
-#if wxOSX_USE_COCOA
-    wxFont(WX_NSFont nsfont);
-#endif
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxFont(int size,
-           int family,
-           int style,
-           int weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
-    }
-#endif
-
-    wxFont(int size,
-           wxFontFamily family,
-           wxFontStyle style,
-           wxFontWeight weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        Create(size, family, style, weight, underlined, face, encoding);
-    }
-
-    wxFont(const wxSize& pixelSize,
-           wxFontFamily family,
-           wxFontStyle style,
-           wxFontWeight weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        Create(10, family, style, weight, underlined, face, encoding);
-        SetPixelSize(pixelSize);
-    }
-
-    bool Create(int size,
-                wxFontFamily family,
-                wxFontStyle style,
-                wxFontWeight weight,
-                bool underlined = false,
-                const wxString& face = wxEmptyString,
-                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
-
-    wxFont(const wxNativeFontInfo& info)
-    {
-        (void)Create(info);
-    }
-
-    wxFont(const wxString& fontDesc);
-
-    bool Create(const wxNativeFontInfo& info);
-
-    virtual ~wxFont();
-
-    // implement base class pure virtuals
-    virtual int GetPointSize() const;
-    virtual wxSize GetPixelSize() const;
-    virtual wxFontStyle GetStyle() const;
-    virtual wxFontWeight GetWeight() const;
-    virtual bool GetUnderlined() const;
-    virtual wxString GetFaceName() const;
-    virtual wxFontEncoding GetEncoding() const;
-    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
-
-    virtual bool IsFixedWidth() const;
-
-    virtual void SetPointSize(int pointSize);
-    virtual void SetFamily(wxFontFamily family);
-    virtual void SetStyle(wxFontStyle style);
-    virtual void SetWeight(wxFontWeight weight);
-    virtual bool SetFaceName(const wxString& faceName);
-    virtual void SetUnderlined(bool underlined);
-    virtual void SetEncoding(wxFontEncoding encoding);
-
-    wxDECLARE_COMMON_FONT_METHODS();
-
-    // implementation only from now on
-    // -------------------------------
-
-    virtual bool RealizeResource();
-
-    // Mac-specific, risks to change, don't use in portable code
-
-#if wxOSX_USE_CARBON && wxOSX_USE_ATSU_TEXT
-    wxUint16 MacGetThemeFontID() const ;
-
-    // 'old' Quickdraw accessors
-    short MacGetFontNum() const;
-    wxByte  MacGetFontStyle() const;
-#endif
-
-#if wxOSX_USE_COCOA_OR_CARBON
-    CGFontRef OSXGetCGFont() const;
-#endif
-
-    CTFontRef OSXGetCTFont() const;
-
-#if wxOSX_USE_ATSU_TEXT
-    // Returns an ATSUStyle not ATSUStyle*
-    void* MacGetATSUStyle() const ;
-    void* OSXGetATSUStyle() const { return MacGetATSUStyle() ; }
-
-    wxDEPRECATED( wxUint32 MacGetATSUFontID() const );
-    wxDEPRECATED( wxUint32 MacGetATSUAdditionalQDStyles() const );
-#endif
-
-#if wxOSX_USE_COCOA
-    WX_NSFont OSXGetNSFont() const;
-    static WX_NSFont OSXCreateNSFont(wxOSXSystemFont font, wxNativeFontInfo* info);
-    static WX_NSFont OSXCreateNSFont(const wxNativeFontInfo* info);
-    static void SetNativeInfoFromNSFont(WX_NSFont nsfont, wxNativeFontInfo* info);
-#endif
-
-#if wxOSX_USE_IPHONE
-    WX_UIFont OSXGetUIFont() const;
-    static WX_UIFont OSXCreateUIFont(wxOSXSystemFont font, wxNativeFontInfo* info);
-    static WX_UIFont OSXCreateUIFont(const wxNativeFontInfo* info);
-#endif
-
-protected:
-    virtual void DoSetNativeFontInfo(const wxNativeFontInfo& info);
-    virtual wxFontFamily DoGetFamily() const;
-
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-private:
-
-    DECLARE_DYNAMIC_CLASS(wxFont)
-};
-
-#endif // _WX_FONT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/fontdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/fontdlg.h
deleted file mode 100644
index e271578cdf..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/fontdlg.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/fontdlg.h
-// Purpose:     wxFontDialog class using fonts window services (10.2+).
-// Author:      Ryan Norton
-// Modified by:
-// Created:     2004-09-25
-// Copyright:   (c) Ryan Norton
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FONTDLG_H_
-#define _WX_FONTDLG_H_
-
-#include "wx/dialog.h"
-
-/*
- * Font dialog
- */
-
-/*
- * support old notation
- */
-#ifdef wxMAC_USE_EXPERIMENTAL_FONTDIALOG
-#define wxOSX_USE_EXPERIMENTAL_FONTDIALOG wxMAC_USE_EXPERIMENTAL_FONTDIALOG
-#endif
-
-#ifndef wxOSX_USE_EXPERIMENTAL_FONTDIALOG
-#define wxOSX_USE_EXPERIMENTAL_FONTDIALOG 1
-#endif
-
-#if wxOSX_USE_EXPERIMENTAL_FONTDIALOG
-
-class WXDLLIMPEXP_CORE wxFontDialog : public wxDialog
-{
-public:
-    wxFontDialog();
-    wxFontDialog(wxWindow *parent);
-    wxFontDialog(wxWindow *parent, const wxFontData& data);
-    virtual ~wxFontDialog();
-
-    bool Create(wxWindow *parent);
-    bool Create(wxWindow *parent, const wxFontData& data);
-
-    int ShowModal();
-    wxFontData& GetFontData() { return m_fontData; }
-
-protected:
-    wxFontData m_fontData;
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFontDialog)
-};
-
-extern "C" int RunMixedFontDialog(wxFontDialog* dialog) ;
-
-#else // wxOSX_USE_EXPERIMENTAL_FONTDIALOG
-
-#if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
-
-/*!
- * Forward declarations
- */
-
-class wxFontColourSwatchCtrl;
-class wxFontPreviewCtrl;
-class WXDLLIMPEXP_FWD_CORE wxSpinCtrl;
-class WXDLLIMPEXP_FWD_CORE wxSpinEvent;
-class WXDLLIMPEXP_FWD_CORE wxListBox;
-class WXDLLIMPEXP_FWD_CORE wxChoice;
-class WXDLLIMPEXP_FWD_CORE wxButton;
-class WXDLLIMPEXP_FWD_CORE wxStaticText;
-class WXDLLIMPEXP_FWD_CORE wxCheckBox;
-
-/*!
- * Control identifiers
- */
-
-#define wxID_FONTDIALOG_FACENAME 20001
-#define wxID_FONTDIALOG_FONTSIZE 20002
-#define wxID_FONTDIALOG_BOLD 20003
-#define wxID_FONTDIALOG_ITALIC 20004
-#define wxID_FONTDIALOG_UNDERLINED 20005
-#define wxID_FONTDIALOG_COLOUR 20006
-#define wxID_FONTDIALOG_PREVIEW 20007
-
-#endif
-    // !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
-
-class WXDLLIMPEXP_CORE wxFontDialog: public wxDialog
-{
-DECLARE_DYNAMIC_CLASS(wxFontDialog)
-
-#if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
-DECLARE_EVENT_TABLE()
-#endif
-
-public:
-    wxFontDialog();
-    wxFontDialog(wxWindow *parent, const wxFontData& data);
-    virtual ~wxFontDialog();
-
-    bool Create(wxWindow *parent, const wxFontData& data);
-
-    int ShowModal();
-    wxFontData& GetFontData() { return m_fontData; }
-    bool IsShown() const;
-    void OnPanelClose();
-    void SetData(const wxFontData& data);
-
-#if !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-    /// Initialize font
-    void InitializeFont();
-
-    /// Set controls according to current font
-    void InitializeControls();
-
-    /// Respond to font change
-    void ChangeFont();
-
-    /// Respond to colour change
-    void OnColourChanged(wxCommandEvent& event);
-
-    /// wxEVT_LISTBOX event handler for wxID_FONTDIALOG_FACENAME
-    void OnFontdialogFacenameSelected( wxCommandEvent& event );
-
-    /// wxEVT_SPINCTRL event handler for wxID_FONTDIALOG_FONTSIZE
-    void OnFontdialogFontsizeUpdated( wxSpinEvent& event );
-
-    /// wxEVT_TEXT event handler for wxID_FONTDIALOG_FONTSIZE
-    void OnFontdialogFontsizeTextUpdated( wxCommandEvent& event );
-
-    /// wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_BOLD
-    void OnFontdialogBoldClick( wxCommandEvent& event );
-
-    /// wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_ITALIC
-    void OnFontdialogItalicClick( wxCommandEvent& event );
-
-    /// wxEVT_CHECKBOX event handler for wxID_FONTDIALOG_UNDERLINED
-    void OnFontdialogUnderlinedClick( wxCommandEvent& event );
-
-    /// wxEVT_BUTTON event handler for wxID_OK
-    void OnOkClick( wxCommandEvent& event );
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-    wxListBox* m_facenameCtrl;
-    wxSpinCtrl* m_sizeCtrl;
-    wxCheckBox* m_boldCtrl;
-    wxCheckBox* m_italicCtrl;
-    wxCheckBox* m_underlinedCtrl;
-    wxFontColourSwatchCtrl* m_colourCtrl;
-    wxFontPreviewCtrl* m_previewCtrl;
-
-    wxFont      m_dialogFont;
-    bool        m_suppressUpdates;
-
-#endif
-    // !USE_NATIVE_FONT_DIALOG_FOR_MACOSX
-
-protected:
-    wxWindow*   m_dialogParent;
-    wxFontData  m_fontData;
-    void*       m_pEventHandlerRef;
-};
-
-#endif
-
-#endif
-    // _WX_FONTDLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/frame.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/frame.h
deleted file mode 100644
index 5902dc0c9c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/frame.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/frame.h
-// Purpose:     wxFrame class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FRAME_H_
-#define _WX_FRAME_H_
-
-#include "wx/toolbar.h"
-#include "wx/accel.h"
-#include "wx/icon.h"
-
-class WXDLLIMPEXP_FWD_CORE wxMacToolTip ;
-
-class WXDLLIMPEXP_CORE wxFrame: public wxFrameBase
-{
-public:
-    // construction
-    wxFrame() { Init(); }
-    wxFrame(wxWindow *parent,
-            wxWindowID id,
-            const wxString& title,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxDEFAULT_FRAME_STYLE,
-            const wxString& name = wxFrameNameStr)
-    {
-        Init();
-
-        Create(parent, id, title, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
-
-    virtual ~wxFrame();
-
-    // implementation only from now on
-    // -------------------------------
-
-    // get the origin of the client area (which may be different from (0, 0)
-    // if the frame has a toolbar) in client coordinates
-    virtual wxPoint GetClientAreaOrigin() const;
-
-    // override some more virtuals
-    virtual bool Enable(bool enable = true) ;
-
-    // event handlers
-    void OnActivate(wxActivateEvent& event);
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-    // Toolbar
-#if wxUSE_TOOLBAR
-    virtual wxToolBar* CreateToolBar(long style = -1,
-                                     wxWindowID id = -1,
-                                     const wxString& name = wxToolBarNameStr);
-
-    virtual void SetToolBar(wxToolBar *toolbar);
-#endif // wxUSE_TOOLBAR
-
-    // Status bar
-#if wxUSE_STATUSBAR
-    virtual wxStatusBar* OnCreateStatusBar(int number = 1,
-                                           long style = wxSTB_DEFAULT_STYLE,
-                                           wxWindowID id = 0,
-                                           const wxString& name = wxStatusLineNameStr);
-#endif // wxUSE_STATUSBAR
-
-    // called by wxWindow whenever it gets focus
-    void SetLastFocus(wxWindow *win) { m_winLastFocused = win; }
-    wxWindow *GetLastFocus() const { return m_winLastFocused; }
-
-    void PositionBars();
-
-    // internal response to size events
-    virtual void MacOnInternalSize() { PositionBars(); }
-
-protected:
-    // common part of all ctors
-    void Init();
-
-#if wxUSE_TOOLBAR
-    virtual void PositionToolBar();
-#endif
-#if wxUSE_STATUSBAR
-    virtual void PositionStatusBar();
-#endif
-
-    // override base class virtuals
-    virtual void DoGetClientSize(int *width, int *height) const;
-    virtual void DoSetClientSize(int width, int height);
-
-#if wxUSE_MENUS
-    virtual void DetachMenuBar();
-    virtual void AttachMenuBar(wxMenuBar *menubar);
-#endif
-
-    // the last focused child: we restore focus to it on activation
-    wxWindow             *m_winLastFocused;
-
-    virtual bool        MacIsChildOfClientArea( const wxWindow* child ) const ;
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxFrame)
-};
-
-#endif
-    // _WX_FRAME_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/gauge.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/gauge.h
deleted file mode 100644
index 692c3b587a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/gauge.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/gauge.h
-// Purpose:     wxGauge class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GAUGE_H_
-#define _WX_GAUGE_H_
-
-#include "wx/control.h"
-
-// Group box
-class WXDLLIMPEXP_CORE wxGauge: public wxGaugeBase
-{
- public:
-  inline wxGauge() { }
-
-  inline wxGauge(wxWindow *parent, wxWindowID id,
-           int range,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxGA_HORIZONTAL,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxGaugeNameStr)
-  {
-    Create(parent, id, range, pos, size, style, validator, name);
-  }
-
-  bool Create(wxWindow *parent, wxWindowID id,
-           int range,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxGA_HORIZONTAL,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxGaugeNameStr);
-
-    // set gauge range/value
-    virtual void SetRange(int range);
-    virtual void SetValue(int pos);
-    virtual int  GetValue() const ;
-
-    void Pulse();
-
- protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxGauge)
-};
-
-#endif
-    // _WX_GAUGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/glcanvas.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/glcanvas.h
deleted file mode 100644
index 1789a900f0..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/glcanvas.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/glcanvas.h
-// Purpose:     wxGLCanvas, for using OpenGL with wxWidgets under Macintosh
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GLCANVAS_H_
-#define _WX_GLCANVAS_H_
-
-#ifdef __WXOSX_IPHONE__
-#import <OpenGLES/ES1/gl.h>
-#import <OpenGLES/ES1/glext.h>
-#define wxUSE_OPENGL_EMULATION 1
-#else
-#include <OpenGL/gl.h>
-#endif
-
-#include "wx/vector.h"
-
-// low level calls
-
-WXDLLIMPEXP_GL WXGLContext WXGLCreateContext( WXGLPixelFormat pixelFormat, WXGLContext shareContext );
-WXDLLIMPEXP_GL void WXGLDestroyContext( WXGLContext context );
-
-WXDLLIMPEXP_GL WXGLContext WXGLGetCurrentContext();
-WXDLLIMPEXP_GL bool WXGLSetCurrentContext(WXGLContext context);
-
-WXDLLIMPEXP_GL WXGLPixelFormat WXGLChoosePixelFormat(const int *attribList);
-WXDLLIMPEXP_GL void WXGLDestroyPixelFormat( WXGLPixelFormat pixelFormat );
-
-class WXDLLIMPEXP_GL wxGLContext : public wxGLContextBase
-{
-public:
-    wxGLContext(wxGLCanvas *win, const wxGLContext *other = NULL);
-    virtual ~wxGLContext();
-
-    virtual bool SetCurrent(const wxGLCanvas& win) const;
-
-    // Mac-specific
-    WXGLContext GetWXGLContext() const { return m_glContext; }
-
-private:
-    WXGLContext m_glContext;
-
-    wxDECLARE_NO_COPY_CLASS(wxGLContext);
-};
-
-class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasBase
-{
-public:
-    wxGLCanvas(wxWindow *parent,
-               wxWindowID id = wxID_ANY,
-               const int *attribList = NULL,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxGLCanvasName,
-               const wxPalette& palette = wxNullPalette);
-
-    bool Create(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxGLCanvasName,
-                const int *attribList = NULL,
-                const wxPalette& palette = wxNullPalette);
-
-    virtual ~wxGLCanvas();
-
-    // implement wxGLCanvasBase methods
-    virtual bool SwapBuffers();
-
-
-    // Mac-specific functions
-    // ----------------------
-
-    // return true if multisample extension is supported
-    static bool IsAGLMultiSampleAvailable();
-
-    // return the pixel format used by this window
-    WXGLPixelFormat GetWXGLPixelFormat() const { return m_glFormat; }
-
-    // update the view port of the current context to match this window
-    void SetViewport();
-
-
-    // deprecated methods
-    // ------------------
-
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED(
-    wxGLCanvas(wxWindow *parent,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxGLCanvasName,
-               const int *attribList = NULL,
-               const wxPalette& palette = wxNullPalette)
-    );
-
-    wxDEPRECATED(
-    wxGLCanvas(wxWindow *parent,
-               const wxGLContext *shared,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxGLCanvasName,
-               const int *attribList = NULL,
-               const wxPalette& palette = wxNullPalette)
-    );
-
-    wxDEPRECATED(
-    wxGLCanvas(wxWindow *parent,
-               const wxGLCanvas *shared,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxGLCanvasName,
-               const int *attribList = NULL,
-               const wxPalette& palette = wxNullPalette)
-    );
-#endif // WXWIN_COMPATIBILITY_2_8
-
-    // implementation-only from now on
-
-#if wxOSX_USE_CARBON
-    // Unlike some other platforms, this must get called if you override it,
-    // i.e. don't forget "event.Skip()" in your EVT_SIZE handler
-    void OnSize(wxSizeEvent& event);
-
-    virtual void MacSuperChangedPosition();
-    virtual void MacTopLevelWindowChangedPosition();
-    virtual void MacVisibilityChanged();
-
-    void MacUpdateView();
-
-    GLint GetAglBufferName() const { return m_bufferName; }
-#endif
-
-protected:
-    WXGLPixelFormat m_glFormat;
-
-#if wxOSX_USE_CARBON
-    bool m_macCanvasIsShown,
-         m_needsUpdate;
-    WXGLContext m_dummyContext;
-    GLint m_bufferName;
-#endif
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_CLASS(wxGLCanvas)
-};
-
-#endif // _WX_GLCANVAS_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/helpxxxx.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/helpxxxx.h
deleted file mode 100644
index 9a9fe4c67f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/helpxxxx.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/helpxxxx.h
-// Purpose:     Help system: native implementation for your system. Replace
-//              XXXX with suitable name.
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_HELPXXXX_H_
-#define _WX_HELPXXXX_H_
-
-#include "wx/wx.h"
-
-#include "wx/helpbase.h"
-
-class WXDLLIMPEXP_CORE wxXXXXHelpController: public wxHelpControllerBase
-{
-  DECLARE_CLASS(wxXXXXHelpController)
-
- public:
-  wxXXXXHelpController();
-  virtual ~wxXXXXHelpController();
-
-  // Must call this to set the filename and server name
-  virtual bool Initialize(const wxString& file);
-
-  // If file is "", reloads file given  in Initialize
-  virtual bool LoadFile(const wxString& file = "");
-  virtual bool DisplayContents();
-  virtual bool DisplaySection(int sectionNo);
-  virtual bool DisplayBlock(long blockNo);
-  virtual bool KeywordSearch(const wxString& k,
-                             wxHelpSearchMode mode = wxHELP_SEARCH_ALL);
-
-  virtual bool Quit();
-  virtual void OnQuit();
-
-  inline wxString GetHelpFile() const { return m_helpFile; }
-
-protected:
-  wxString m_helpFile;
-};
-
-#endif
-    // _WX_HELPXXXX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/icon.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/icon.h
deleted file mode 100644
index bc6b721db6..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/icon.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/icon.h
-// Purpose:     wxIcon class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_ICON_H_
-#define _WX_ICON_H_
-
-#include "wx/bitmap.h"
-
-// Icon
-class WXDLLIMPEXP_CORE wxIcon : public wxGDIObject
-{
-public:
-    wxIcon();
-
-    wxIcon(const char* const* data);
-    wxIcon(const char bits[], int width , int height );
-    wxIcon(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE,
-           int desiredWidth = -1, int desiredHeight = -1);
-    wxIcon(const wxIconLocation& loc)
-    {
-      LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON);
-    }
-
-    wxIcon(WXHICON icon, const wxSize& size);
-
-    virtual ~wxIcon();
-
-    bool LoadFile(const wxString& name, wxBitmapType flags = wxICON_DEFAULT_TYPE,
-                  int desiredWidth = -1, int desiredHeight = -1);
-
-
-    // create from bitmap (which should have a mask unless it's monochrome):
-    // there shouldn't be any implicit bitmap -> icon conversion (i.e. no
-    // ctors, assignment operators...), but it's ok to have such function
-    void CopyFromBitmap(const wxBitmap& bmp);
-
-    int GetWidth() const;
-    int GetHeight() const;
-    int GetDepth() const;
-    void SetWidth(int w);
-    void SetHeight(int h);
-    void SetDepth(int d);
-    void SetOk(bool isOk);
-
-    wxSize GetSize() const { return wxSize(GetWidth(), GetHeight()); }
-
-    WXHICON GetHICON() const;
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxIcon)
-
-    bool LoadIconFromSystemResource(const wxString& resourceName, int desiredWidth, int desiredHeight);
-    bool LoadIconFromBundleResource(const wxString& resourceName, int desiredWidth, int desiredHeight);
-    bool LoadIconFromFile(const wxString& filename, int desiredWidth, int desiredHeight);
-    bool LoadIconAsBitmap(const wxString& filename, wxBitmapType flags = wxICON_DEFAULT_TYPE, int desiredWidth = -1, int desiredHeight = -1);
-};
-
-class WXDLLIMPEXP_CORE wxICONResourceHandler: public wxBitmapHandler
-{
-public:
-    wxICONResourceHandler()
-    {
-        SetName(wxT("ICON resource"));
-        SetExtension(wxEmptyString);
-        SetType(wxBITMAP_TYPE_ICON_RESOURCE);
-    }
-
-    virtual bool LoadFile(wxBitmap *bitmap,
-                          const wxString& name,
-                          wxBitmapType flags,
-                          int desiredWidth = -1,
-                          int desiredHeight = -1);
-
-    // unhide the base class virtual
-    virtual bool LoadFile(wxBitmap *bitmap,
-            const wxString& name,
-            wxBitmapType flags)
-        { return LoadFile(bitmap, name, flags, -1, -1); }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxICONResourceHandler)
-};
-
-#endif
-    // _WX_ICON_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/imaglist.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/imaglist.h
deleted file mode 100644
index 0405f4cd43..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/imaglist.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/imaglist.h
-// Purpose:
-// Author:      Robert Roebling, Stefan Csomor
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling and Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_IMAGLIST_H_
-#define _WX_IMAGLIST_H_
-
-#include "wx/defs.h"
-#include "wx/list.h"
-#include "wx/icon.h"
-
-class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLIMPEXP_FWD_CORE wxColour;
-
-class WXDLLIMPEXP_CORE wxImageList: public wxObject
-{
-public:
-    wxImageList() { m_width = m_height = 0; }
-    wxImageList( int width, int height, bool mask = true, int initialCount = 1 );
-    virtual ~wxImageList();
-    bool Create( int width, int height, bool mask = true, int initialCount = 1 );
-    bool Create();
-
-    virtual int GetImageCount() const;
-    virtual bool GetSize( int index, int &width, int &height ) const;
-
-    int Add( const wxIcon& bitmap );
-    int Add( const wxBitmap& bitmap );
-    int Add( const wxBitmap& bitmap, const wxBitmap& mask );
-    int Add( const wxBitmap& bitmap, const wxColour& maskColour );
-    wxBitmap GetBitmap(int index) const;
-    wxIcon GetIcon(int index) const;
-    bool Replace( int index, const wxIcon &bitmap );
-    bool Replace( int index, const wxBitmap &bitmap );
-    bool Replace( int index, const wxBitmap &bitmap, const wxBitmap &mask );
-    bool Remove( int index );
-    bool RemoveAll();
-
-    virtual bool Draw(int index, wxDC& dc, int x, int y,
-                      int flags = wxIMAGELIST_DRAW_NORMAL,
-                      bool solidBackground = false);
-
-private:
-    wxList  m_images;
-
-    int     m_width;
-    int     m_height;
-
-    DECLARE_DYNAMIC_CLASS(wxImageList)
-};
-
-#endif  // _WX_IMAGLIST_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/iphone/chkconf.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/iphone/chkconf.h
deleted file mode 100644
index 8b925707cb..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/iphone/chkconf.h
+++ /dev/null
@@ -1,374 +0,0 @@
-/*
- * Name:        wx/osx/iphone/chkconf.h
- * Purpose:     Compiler-specific configuration checking
- * Author:      Stefan Csomor
- * Modified by:
- * Created:     2008-07-30
- * Copyright:   (c) Stefan Csomor
- * Licence:     wxWindows licence
- */
-
-#ifndef _WX_OSX_IPHONE_CHKCONF_H_
-#define _WX_OSX_IPHONE_CHKCONF_H_
-
-/*
- * text rendering system
- */
-
-/* we have different options and we turn on all that make sense
- * under a certain platform
- */
-
-#define wxOSX_USE_ATSU_TEXT 0
-#define wxHAS_OPENGL_ES
-
-#define wxOSX_USE_QUICKTIME 0
-#define wxOSX_USE_AUDIOTOOLBOX 1
-
-/*
- * turning off capabilities that don't work under iphone yet
- */
-
-#if wxUSE_MIMETYPE
-#undef wxUSE_MIMETYPE
-#define wxUSE_MIMETYPE 0
-#endif
-
-#if wxUSE_MDI
-#undef wxUSE_MDI
-#define wxUSE_MDI 0
-#endif
-
-#if wxUSE_MDI_ARCHITECTURE
-#undef wxUSE_MDI_ARCHITECTURE
-#define wxUSE_MDI_ARCHITECTURE 0
-#endif
-
-#if wxUSE_DRAG_AND_DROP
-#undef wxUSE_DRAG_AND_DROP
-#define wxUSE_DRAG_AND_DROP 0
-#endif
-
-#if wxUSE_TASKBARICON
-#undef wxUSE_TASKBARICON
-#define wxUSE_TASKBARICON 0
-#endif
-
-#if wxUSE_TOOLTIPS
-#undef wxUSE_TOOLTIPS
-#define wxUSE_TOOLTIPS 0
-#endif
-
-#if wxUSE_DATAVIEWCTRL
-#undef wxUSE_DATAVIEWCTRL
-#define wxUSE_DATAVIEWCTRL 0
-#endif
-
-#if wxUSE_TREELISTCTRL
-#undef wxUSE_TREELISTCTRL
-#define wxUSE_TREELISTCTRL 0
-#endif
-
-#if wxUSE_DRAG_AND_DROP
-#undef wxUSE_DRAG_AND_DROP
-#define wxUSE_DRAG_AND_DROP 0
-#endif
-
-#if wxUSE_TASKBARICON
-#undef wxUSE_TASKBARICON
-#define wxUSE_TASKBARICON 0
-#endif
-
-#define wxUSE_BUTTON 1
-
-#if wxUSE_CARET
-#undef wxUSE_CARET
-#define wxUSE_CARET 0
-#endif
-
-#if wxUSE_CHOICE
-#undef wxUSE_CHOICE
-#define wxUSE_CHOICE 0
-#endif
-
-#if wxUSE_COMBOBOX
-#undef wxUSE_COMBOBOX
-#define wxUSE_COMBOBOX 0
-#endif
-
-#ifndef __WXUNIVERSAL__
-#undef wxUSE_SCROLLBAR
-#define wxUSE_SCROLLBAR 0
-#endif
-
-#undef wxUSE_STATUSBAR
-#undef wxUSE_NATIVE_STATUSBAR
-#undef wxUSE_ABOUTDLG
-#undef wxUSE_STATLINE
-#undef wxUSE_COLLPANE
-#undef wxUSE_STATBMP
-#undef wxUSE_STATBOX
-#undef wxUSE_RADIOBTN
-#undef wxUSE_RADIOBOX
-#undef wxUSE_TOGGLEBTN
-
-
-#define wxUSE_STATUSBAR 0
-#define wxUSE_NATIVE_STATUSBAR 0
-#define wxUSE_ABOUTDLG 0
-#define wxUSE_STATLINE 0
-#define wxUSE_COLLPANE 0
-#define wxUSE_STATBMP 0
-#define wxUSE_STATBOX 0
-#define wxUSE_RADIOBTN 0
-#define wxUSE_RADIOBOX 0
-#define wxUSE_TOGGLEBTN 0
-
-#undef wxUSE_HTML
-
-#define wxUSE_HTML 0
-
-#undef wxUSE_RICHTEXT
-#define wxUSE_RICHTEXT 0
-
-#undef wxUSE_ANIMATIONCTRL
-#undef wxUSE_CALENDARCTRL
-#undef wxUSE_COMBOCTRL
-#undef wxUSE_ODCOMBOBOX
-#undef wxUSE_BITMAPCOMBOBOX
-#undef wxUSE_BMPBUTTON
-#undef wxUSE_CHECKLISTBOX
-#undef wxUSE_GRID
-#undef wxUSE_LISTBOX
-#undef wxUSE_LISTCTRL
-#undef wxUSE_NOTEBOOK
-#undef wxUSE_SPINBTN
-#undef wxUSE_SPINCTRL
-#undef wxUSE_TREECTRL
-#undef wxUSE_DATEPICKCTRL
-#undef wxUSE_DATAVIEWCTRL
-#undef wxUSE_EDITABLELISTBOX
-#undef wxUSE_FILEPICKERCTRL
-#undef wxUSE_DIRPICKERCTRL
-#undef wxUSE_FILECTRL
-#undef wxUSE_COLOURPICKERCTRL
-#undef wxUSE_FONTPICKERCTRL
-#undef wxUSE_DEBUGREPORT
-#undef wxUSE_HYPERLINKCTRL
-#undef wxUSE_STC
-#undef wxUSE_AUI
-#undef wxUSE_BUSYINFO
-#undef wxUSE_SEARCHCTRL
-
-#define wxUSE_ANIMATIONCTRL 0
-#define wxUSE_CALENDARCTRL 0
-#define wxUSE_COMBOCTRL 0
-#define wxUSE_ODCOMBOBOX 0
-#define wxUSE_BITMAPCOMBOBOX 0
-#define wxUSE_BMPBUTTON 0
-#define wxUSE_CHECKLISTBOX 0
-#define wxUSE_GRID 0
-#define wxUSE_LISTBOX 0
-#define wxUSE_LISTCTRL 0
-#define wxUSE_NOTEBOOK 0
-#define wxUSE_SPINBTN 0
-#define wxUSE_SPINCTRL 0
-#define wxUSE_TREECTRL 0
-#define wxUSE_DATEPICKCTRL 0
-#define wxUSE_DATAVIEWCTRL 0
-#define wxUSE_EDITABLELISTBOX 0
-#define wxUSE_FILEPICKERCTRL 0
-#define wxUSE_DIRPICKERCTRL 0
-#define wxUSE_FILECTRL 0
-#define wxUSE_COLOURPICKERCTRL 0
-#define wxUSE_FONTPICKERCTRL 0
-#define wxUSE_DEBUGREPORT 0
-#define wxUSE_HYPERLINKCTRL 0
-#define wxUSE_STC 0
-#define wxUSE_AUI 0
-#define wxUSE_BUSYINFO 0
-#define wxUSE_SEARCHCTRL 0
-
-#undef wxUSE_LOGWINDOW
-#undef wxUSE_LOG_DIALOG
-#undef wxUSE_LISTBOOK
-#undef wxUSE_CHOICEBOOK
-#undef wxUSE_TREEBOOK
-#undef wxUSE_TOOLBOOK
-#undef wxUSE_CHOICEDLG
-#undef wxUSE_HELP
-#undef wxUSE_PROGRESSDLG
-#undef  wxUSE_FONTDLG
-#undef wxUSE_FILEDLG
-#undef wxUSE_CHOICEDLG
-#undef wxUSE_NUMBERDLG
-#undef wxUSE_TEXTDLG
-#undef wxUSE_DIRDLG
-#undef wxUSE_STARTUP_TIPS
-#undef wxUSE_WIZARDDLG
-#undef wxUSE_TOOLBAR_NATIVE
-#undef wxUSE_FINDREPLDLG
-#undef wxUSE_TASKBARICON
-#undef wxUSE_REARRANGECTRL
-
-#define wxUSE_LOGWINDOW 0
-#define wxUSE_LOG_DIALOG 0
-#define wxUSE_LISTBOOK 0
-#define wxUSE_CHOICEBOOK 0
-#define wxUSE_TREEBOOK 0
-#define wxUSE_TOOLBOOK 0
-#define wxUSE_CHOICEDLG 0
-#define wxUSE_HELP 0
-#define wxUSE_PROGRESSDLG 0
-#define  wxUSE_FONTDLG 0
-#define wxUSE_FILEDLG 0
-#define wxUSE_CHOICEDLG 0
-#define wxUSE_NUMBERDLG 0
-#define wxUSE_TEXTDLG 0
-#define wxUSE_DIRDLG 0
-#define wxUSE_STARTUP_TIPS 0
-#define wxUSE_WIZARDDLG 0
-#define wxUSE_TOOLBAR_NATIVE 0
-#define wxUSE_FINDREPLDLG 0
-#define wxUSE_TASKBARICON 0
-#define wxUSE_REARRANGECTRL 0
-
-#if wxUSE_WXHTML_HELP
-#undef wxUSE_WXHTML_HELP
-#define wxUSE_WXHTML_HELP 0
-#endif
-
-#if wxUSE_DOC_VIEW_ARCHITECTURE
-#undef wxUSE_DOC_VIEW_ARCHITECTURE
-#define wxUSE_DOC_VIEW_ARCHITECTURE 0
-#endif
-
-#if wxUSE_PRINTING_ARCHITECTURE
-#undef wxUSE_PRINTING_ARCHITECTURE
-#define wxUSE_PRINTING_ARCHITECTURE 0
-#endif
-
-#if wxUSE_MENUS
-#undef wxUSE_MENUS
-#define wxUSE_MENUS 0
-#endif
-
-/*
-#if wxUSE_POPUPWIN
-#undef wxUSE_POPUPWIN
-#define wxUSE_POPUPWIN 0
-#endif
-
-#if wxUSE_COMBOBOX
-#undef wxUSE_COMBOBOX
-#define wxUSE_COMBOBOX 0
-#endif
-
-
-
-#if wxUSE_CALENDARCTRL
-#undef wxUSE_CALENDARCTRL
-#define wxUSE_CALENDARCTRL 0
-#endif
-
-*/
-
-#if wxUSE_CLIPBOARD
-#undef wxUSE_CLIPBOARD
-#define wxUSE_CLIPBOARD 0
-#endif // wxUSE_CLIPBOARD
-
-/*
-#if wxUSE_GLCANVAS
-#undef wxUSE_GLCANVAS
-#define wxUSE_GLCANVAS 0
-#endif // wxUSE_GLCANVAS
-*/
-
-#if wxUSE_COLOURDLG
-#undef wxUSE_COLOURDLG
-#define wxUSE_COLOURDLG 0
-#endif // wxUSE_COLOURDLG
-
-// iphone has a toolbar that is a regular UIView
-
-#ifdef wxOSX_USE_NATIVE_TOOLBAR
-#if wxOSX_USE_NATIVE_TOOLBAR
-#undef wxOSX_USE_NATIVE_TOOLBAR
-#define wxOSX_USE_NATIVE_TOOLBAR 0
-#endif
-#else
-#define wxOSX_USE_NATIVE_TOOLBAR 0
-#endif
-
-#if wxUSE_RIBBON
-#undef wxUSE_RIBBON
-#define wxUSE_RIBBON 0
-#endif
-
-#if wxUSE_INFOBAR
-#undef wxUSE_INFOBAR
-#define wxUSE_INFOBAR 0
-#endif
-
-#if wxUSE_FILE_HISTORY
-#undef wxUSE_FILE_HISTORY
-#define wxUSE_FILE_HISTORY 0
-#endif
-
-#if wxUSE_NOTIFICATION_MESSAGE
-#undef wxUSE_NOTIFICATION_MESSAGE
-#define wxUSE_NOTIFICATION_MESSAGE 0
-#endif
-
-#undef wxUSE_PREFERENCES_EDITOR
-#define wxUSE_PREFERENCES_EDITOR 0
-
-#if wxUSE_PROPGRID
-#undef wxUSE_PROPGRID
-#define wxUSE_PROPGRID 0
-#endif
-
-#if wxUSE_WEBKIT
-#undef wxUSE_WEBKIT
-#define wxUSE_WEBKIT 0
-#endif
-
-#if wxUSE_DATAOBJ
-#undef wxUSE_DATAOBJ
-#define wxUSE_DATAOBJ 0
-#endif
-
-#if wxUSE_UIACTIONSIMULATOR
-#undef wxUSE_UIACTIONSIMULATOR
-#define wxUSE_UIACTIONSIMULATOR 0
-#endif
-
-#if wxUSE_RICHMSGDLG
-#undef wxUSE_RICHMSGDLG
-#define wxUSE_RICHMSGDLG 0
-#endif
-
-#if wxUSE_RICHTEXT
-#undef wxUSE_RICHTEXT
-#define wxUSE_RICHTEXT 0
-#endif
-
-#if wxUSE_TIMEPICKCTRL
-#undef wxUSE_TIMEPICKCTRL
-#define wxUSE_TIMEPICKCTRL 0
-#endif
-
-#if wxUSE_RICHTOOLTIP
-#undef wxUSE_RICHTOOLTIP
-#define wxUSE_RICHTOOLTIP 0
-#endif
-
-#if wxUSE_WEBVIEW
-#undef wxUSE_WEBVIEW
-#define wxUSE_WEBVIEW 0
-#endif
-
-#endif
-    /* _WX_OSX_IPHONE_CHKCONF_H_ */
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/iphone/private.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/iphone/private.h
deleted file mode 100644
index e21dd388b0..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/iphone/private.h
+++ /dev/null
@@ -1,221 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/iphone/private.h
-// Purpose:     Private declarations: as this header is only included by
-//              wxWidgets itself, it may contain identifiers which don't start
-//              with "wx".
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRIVATE_IPHONE_H_
-#define _WX_PRIVATE_IPHONE_H_
-
-#ifdef __OBJC__
-    #import <UIKit/UIKit.h>
-#endif
-
-#include <CoreText/CTFont.h>
-#include <CoreText/CTStringAttributes.h>
-#include <CoreText/CTLine.h>
-
-
-#if wxUSE_GUI
-
-OSStatus WXDLLIMPEXP_CORE wxMacDrawCGImage(
-                               CGContextRef    inContext,
-                               const CGRect *  inBounds,
-                               CGImageRef      inImage) ;
-
-WX_UIImage WXDLLIMPEXP_CORE wxOSXGetUIImageFromCGImage( CGImageRef image );
-wxBitmap WXDLLIMPEXP_CORE wxOSXCreateSystemBitmap(const wxString& id, const wxString &client, const wxSize& size);
-
-class WXDLLIMPEXP_CORE wxWidgetIPhoneImpl : public wxWidgetImpl
-{
-public :
-    wxWidgetIPhoneImpl( wxWindowMac* peer , WXWidget w, bool isRootControl = false, bool isUserPane = false ) ;
-    wxWidgetIPhoneImpl() ;
-    ~wxWidgetIPhoneImpl();
-
-    void Init();
-
-    virtual bool        IsVisible() const ;
-    virtual void        SetVisibility( bool visible );
-
-    virtual void        Raise();
-
-    virtual void        Lower();
-
-    virtual void        ScrollRect( const wxRect *rect, int dx, int dy );
-
-    virtual WXWidget    GetWXWidget() const { return m_osxView; }
-
-    virtual void        SetBackgroundColour( const wxColour& col ) ;
-    virtual bool        SetBackgroundStyle(wxBackgroundStyle style) ;
-
-    virtual void        GetContentArea( int &left , int &top , int &width , int &height ) const;
-    virtual void        Move(int x, int y, int width, int height);
-    virtual void        GetPosition( int &x, int &y ) const;
-    virtual void        GetSize( int &width, int &height ) const;
-    virtual void        SetControlSize( wxWindowVariant variant );
-    virtual double      GetContentScaleFactor() const ;
-    
-    virtual void        SetNeedsDisplay( const wxRect* where = NULL );
-    virtual bool        GetNeedsDisplay() const;
-
-    virtual bool        CanFocus() const;
-    // return true if successful
-    virtual bool        SetFocus();
-    virtual bool        HasFocus() const;
-
-    void                RemoveFromParent();
-    void                Embed( wxWidgetImpl *parent );
-
-    void                SetDefaultButton( bool isDefault );
-    void                PerformClick();
-    virtual void        SetLabel(const wxString& title, wxFontEncoding encoding);
-
-    void                SetCursor( const wxCursor & cursor );
-    void                CaptureMouse();
-    void                ReleaseMouse();
-
-    wxInt32             GetValue() const;
-    void                SetValue( wxInt32 v );
-
-    virtual wxBitmap    GetBitmap() const;
-    virtual void        SetBitmap( const wxBitmap& bitmap );
-    virtual void        SetBitmapPosition( wxDirection dir );
-
-    void                SetupTabs( const wxNotebook ¬ebook );
-    void                GetBestRect( wxRect *r ) const;
-    bool                IsEnabled() const;
-    void                Enable( bool enable );
-    bool                ButtonClickDidStateChange() { return true ;}
-    void                SetMinimum( wxInt32 v );
-    void                SetMaximum( wxInt32 v );
-    wxInt32             GetMinimum() const;
-    wxInt32             GetMaximum() const;
-    void                PulseGauge();
-    void                SetScrollThumb( wxInt32 value, wxInt32 thumbSize );
-
-    void                SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
-
-    void                InstallEventHandler( WXWidget control = NULL );
-
-    virtual void        DoNotifyFocusEvent(bool receivedFocus, wxWidgetImpl* otherWindow);
-
-    // thunk connected calls
-
-    virtual void        drawRect(CGRect* rect, WXWidget slf, void* _cmd);
-    virtual void        touchEvent(WX_NSSet touches, WX_UIEvent event, WXWidget slf, void* _cmd);
-    virtual bool        becomeFirstResponder(WXWidget slf, void* _cmd);
-    virtual bool        resignFirstResponder(WXWidget slf, void* _cmd);
-
-    // action
-
-    virtual void        controlAction(void* sender, wxUint32 controlEvent, WX_UIEvent rawEvent);
-    virtual void         controlTextDidChange();
-protected:
-    WXWidget m_osxView;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetIPhoneImpl)
-};
-
-class wxNonOwnedWindowIPhoneImpl : public wxNonOwnedWindowImpl
-{
-public :
-    wxNonOwnedWindowIPhoneImpl( wxNonOwnedWindow* nonownedwnd) ;
-    wxNonOwnedWindowIPhoneImpl();
-
-    virtual ~wxNonOwnedWindowIPhoneImpl();
-
-    virtual void WillBeDestroyed() ;
-    void Create( wxWindow* parent, const wxPoint& pos, const wxSize& size,
-    long style, long extraStyle, const wxString& name ) ;
-    void Create( wxWindow* parent, WXWindow nativeWindow );
-
-    WXWindow GetWXWindow() const;
-    void Raise();
-    void Lower();
-    bool Show(bool show);
-    bool ShowWithEffect(bool show, wxShowEffect effect, unsigned timeout);
-
-    void Update();
-    bool SetTransparent(wxByte alpha);
-    bool SetBackgroundColour(const wxColour& col );
-    void SetExtraStyle( long exStyle );
-    bool SetBackgroundStyle(wxBackgroundStyle style);
-    bool CanSetTransparent();
-
-    void MoveWindow(int x, int y, int width, int height);
-    void GetPosition( int &x, int &y ) const;
-    void GetSize( int &width, int &height ) const;
-
-    void GetContentArea( int &left , int &top , int &width , int &height ) const;
-    bool SetShape(const wxRegion& region);
-
-    virtual void SetTitle( const wxString& title, wxFontEncoding encoding ) ;
-
-    virtual bool IsMaximized() const;
-
-    virtual bool IsIconized() const;
-
-    virtual void Iconize( bool iconize );
-
-    virtual void Maximize(bool maximize);
-
-    virtual bool IsFullScreen() const;
-
-    virtual bool ShowFullScreen(bool show, long style);
-
-    virtual void RequestUserAttention(int flags);
-
-    virtual void ScreenToWindow( int *x, int *y );
-
-    virtual void WindowToScreen( int *x, int *y );
-
-    // FIXME: Does iPhone have a concept of inactive windows?
-    virtual bool IsActive() { return true; }
-
-    wxNonOwnedWindow*   GetWXPeer() { return m_wxPeer; }
-
-    virtual bool InitialShowEventSent() { return m_initialShowSent; }
-protected :
-    WX_UIWindow          m_macWindow;
-    void *              m_macFullScreenData ;
-    bool                m_initialShowSent;
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxNonOwnedWindowIPhoneImpl)
-};
-
-#ifdef __OBJC__
-
-    WXDLLIMPEXP_CORE CGRect wxToNSRect( UIView* parent, const wxRect& r );
-    WXDLLIMPEXP_CORE wxRect wxFromNSRect( UIView* parent, const CGRect& rect );
-    WXDLLIMPEXP_CORE CGPoint wxToNSPoint( UIView* parent, const wxPoint& p );
-    WXDLLIMPEXP_CORE wxPoint wxFromNSPoint( UIView* parent, const CGPoint& p );
-
-    CGRect WXDLLIMPEXP_CORE wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const wxSize &size ,
-        bool adjustForOrigin = true );
-
-    @interface wxUIButton : UIButton
-    {
-    }
-
-    @end
-
-    @interface wxUIView : UIView
-    {
-    }
-
-    @end // wxUIView
-
-
-    void WXDLLIMPEXP_CORE wxOSXIPhoneClassAddWXMethods(Class c);
-
-#endif
-
-#endif // wxUSE_GUI
-
-#endif
-    // _WX_PRIVATE_IPHONE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/iphone/private/textimpl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/iphone/private/textimpl.h
deleted file mode 100644
index 7c9e5fd109..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/iphone/private/textimpl.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/iphone/private/textimpl.h
-// Purpose:     textcontrol implementation classes that have to be exposed
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     03/02/99
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_COCOA_PRIVATE_TEXTIMPL_H_
-#define _WX_OSX_COCOA_PRIVATE_TEXTIMPL_H_
-
-#include "wx/combobox.h"
-#include "wx/osx/private.h"
-
-// implementation exposed, so that search control can pull it
-
-class wxUITextFieldControl : public wxWidgetIPhoneImpl, public wxTextWidgetImpl
-{
-public :
-    wxUITextFieldControl( wxTextCtrl *wxPeer, UITextField* w );
-    virtual ~wxUITextFieldControl();
-
-    virtual wxString GetStringValue() const ;
-    virtual void SetStringValue( const wxString &str) ;
-    virtual void Copy() ;
-    virtual void Cut() ;
-    virtual void Paste() ;
-    virtual bool CanPaste() const ;
-    virtual void SetEditable(bool editable) ;
-    virtual void GetSelection( long* from, long* to) const ;
-    virtual void SetSelection( long from , long to );
-    virtual void WriteText(const wxString& str) ;
-    virtual bool HasOwnContextMenu() const { return true; }
-
-    virtual wxSize GetBestSize() const;    
-    
-    virtual bool SetHint(const wxString& hint);
-    
-    virtual void controlAction(WXWidget slf, void* _cmd, void *sender);
-protected :
-    UITextField* m_textField;
-    NSObject<UITextFieldDelegate>* m_delegate;
-    long m_selStart;
-    long m_selEnd;
-};
-
-class wxUITextViewControl : public wxWidgetIPhoneImpl, public wxTextWidgetImpl
-{
-public:
-    wxUITextViewControl( wxTextCtrl *wxPeer, UITextView* w );
-    virtual ~wxUITextViewControl();
-
-    virtual wxString GetStringValue() const ;
-    virtual void SetStringValue( const wxString &str) ;
-    virtual void Copy() ;
-    virtual void Cut() ;
-    virtual void Paste() ;
-    virtual bool CanPaste() const ;
-    virtual void SetEditable(bool editable) ;
-    virtual void GetSelection( long* from, long* to) const ;
-    virtual void SetSelection( long from , long to );
-    virtual void WriteText(const wxString& str) ;
-    virtual void SetFont( const wxFont & font , const wxColour& foreground , long windowStyle, bool ignoreBlack = true );
-
-    virtual bool GetStyle(long position, wxTextAttr& style);
-    virtual void SetStyle(long start, long end, const wxTextAttr& style);
-
-    virtual bool CanFocus() const;
-
-    virtual bool HasOwnContextMenu() const { return true; }
-
-    virtual void CheckSpelling(bool check);
-    virtual wxSize GetBestSize() const;
-
-protected:
-    NSObject<UITextViewDelegate>* m_delegate;
-    UITextView* m_textView;
-};
-
-#if 0
-class wxNSComboBoxControl : public wxUITextFieldControl, public wxComboWidgetImpl
-{
-public :
-    wxNSComboBoxControl( wxWindow *wxPeer, WXWidget w );
-    virtual ~wxNSComboBoxControl();
-
-    virtual int GetSelectedItem() const;
-    virtual void SetSelectedItem(int item);
-
-    virtual int GetNumberOfItems() const;
-
-    virtual void InsertItem(int pos, const wxString& item);
-    virtual void RemoveItem(int pos);
-
-    virtual void Clear();
-
-    virtual wxString GetStringAtIndex(int pos) const;
-
-    virtual int FindString(const wxString& text) const;
-private:
-    NSComboBox* m_comboBox;
-};
-#endif
-
-#endif // _WX_OSX_COCOA_PRIVATE_TEXTIMPL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/joystick.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/joystick.h
deleted file mode 100644
index e5f834390a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/joystick.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/joystick.h
-// Purpose:     wxJoystick class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_JOYSTICK_H_
-#define _WX_JOYSTICK_H_
-
-#include "wx/event.h"
-
-class WXDLLIMPEXP_ADV wxJoystick: public wxObject
-{
-  DECLARE_DYNAMIC_CLASS(wxJoystick)
- public:
-  /*
-   * Public interface
-   */
-
-  wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }
-
-  // Attributes
-  ////////////////////////////////////////////////////////////////////////////
-
-  wxPoint GetPosition() const;
-  int GetPosition(unsigned axis) const;
-  bool GetButtonState(unsigned button) const;
-  int GetZPosition() const;
-  int GetButtonState() const;
-  int GetPOVPosition() const;
-  int GetPOVCTSPosition() const;
-  int GetRudderPosition() const;
-  int GetUPosition() const;
-  int GetVPosition() const;
-  int GetMovementThreshold() const;
-  void SetMovementThreshold(int threshold) ;
-
-  // Capabilities
-  ////////////////////////////////////////////////////////////////////////////
-
-  bool IsOk() const; // Checks that the joystick is functioning
-  static int GetNumberJoysticks() ;
-  int GetManufacturerId() const ;
-  int GetProductId() const ;
-  wxString GetProductName() const ;
-  int GetXMin() const;
-  int GetYMin() const;
-  int GetZMin() const;
-  int GetXMax() const;
-  int GetYMax() const;
-  int GetZMax() const;
-  int GetNumberButtons() const;
-  int GetNumberAxes() const;
-  int GetMaxButtons() const;
-  int GetMaxAxes() const;
-  int GetPollingMin() const;
-  int GetPollingMax() const;
-  int GetRudderMin() const;
-  int GetRudderMax() const;
-  int GetUMin() const;
-  int GetUMax() const;
-  int GetVMin() const;
-  int GetVMax() const;
-
-  bool HasRudder() const;
-  bool HasZ() const;
-  bool HasU() const;
-  bool HasV() const;
-  bool HasPOV() const;
-  bool HasPOV4Dir() const;
-  bool HasPOVCTS() const;
-
-  // Operations
-  ////////////////////////////////////////////////////////////////////////////
-
-  // pollingFreq = 0 means that movement events are sent when above the threshold.
-  // If pollingFreq > 0, events are received every this many milliseconds.
-  bool SetCapture(wxWindow* win, int pollingFreq = 0);
-  bool ReleaseCapture();
-
-protected:
-  int       m_joystick;
-};
-
-#endif
-    // _WX_JOYSTICK_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/listbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/listbox.h
deleted file mode 100644
index 60f4199e74..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/listbox.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/listbox.h
-// Purpose:     wxListBox class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_LISTBOX_H_
-#define _WX_LISTBOX_H_
-
-// ----------------------------------------------------------------------------
-// simple types
-// ----------------------------------------------------------------------------
-#include  "wx/dynarray.h"
-#include  "wx/arrstr.h"
-
-// forward decl for GetSelections()
-class wxArrayInt;
-
-// forward decl for wxListWidgetImpl implementation type.
-class wxListWidgetImpl;
-
-// List box item
-
-WX_DEFINE_ARRAY( char* , wxListDataArray );
-
-// ----------------------------------------------------------------------------
-// List box control
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxListWidgetColumn;
-
-class WXDLLIMPEXP_FWD_CORE wxListWidgetCellValue;
-
-class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase
-{
-public:
-    // ctors and such
-    wxListBox();
-
-    wxListBox(
-        wxWindow *parent,
-        wxWindowID winid,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        int n = 0, const wxString choices[] = NULL,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr)
-    {
-        Create(parent, winid, pos, size, n, choices, style, validator, name);
-    }
-
-    wxListBox(
-        wxWindow *parent,
-        wxWindowID winid,
-        const wxPoint& pos,
-        const wxSize& size,
-        const wxArrayString& choices,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr)
-    {
-        Create(parent, winid, pos, size, choices, style, validator, name);
-    }
-
-    bool Create(
-        wxWindow *parent,
-        wxWindowID winid,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        int n = 0,
-        const wxString choices[] = NULL,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr);
-
-    bool Create(
-        wxWindow *parent,
-        wxWindowID winid,
-        const wxPoint& pos,
-        const wxSize& size,
-        const wxArrayString& choices,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxListBoxNameStr);
-
-    virtual ~wxListBox();
-
-    // implement base class pure virtuals
-    virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL);
-
-    virtual unsigned int GetCount() const;
-    virtual wxString GetString(unsigned int n) const;
-    virtual void SetString(unsigned int n, const wxString& s);
-    virtual int FindString(const wxString& s, bool bCase = false) const;
-
-    // data callbacks
-    virtual void GetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value );
-    virtual void SetValueCallback( unsigned int n, wxListWidgetColumn* col , wxListWidgetCellValue& value );
-
-    virtual bool IsSelected(int n) const;
-    virtual int GetSelection() const;
-    virtual int GetSelections(wxArrayInt& aSelections) const;
-
-    virtual void EnsureVisible(int n);
-
-    virtual wxVisualAttributes GetDefaultAttributes() const
-    {
-        return GetClassDefaultAttributes(GetWindowVariant());
-    }
-
-    // wxCheckListBox support
-    static wxVisualAttributes
-    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
-    wxListWidgetImpl* GetListPeer() const;
-
-    bool MacGetBlockEvents() const { return m_blockEvents; }
-
-    virtual void HandleLineEvent( unsigned int n, bool doubleClick );
-protected:
-    // callback for derived classes which may have to insert additional data
-    // at a certain line - which cannot be predetermined for sorted list data
-    virtual void OnItemInserted(unsigned int pos);
-
-    virtual void DoClear();
-    virtual void DoDeleteOneItem(unsigned int n);
-
-    // from wxItemContainer
-    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
-                              unsigned int pos,
-                              void **clientData, wxClientDataType type);
-
-    virtual void DoSetItemClientData(unsigned int n, void* clientData);
-    virtual void* DoGetItemClientData(unsigned int n) const;
-
-    // from wxListBoxBase
-    virtual void DoSetSelection(int n, bool select);
-    virtual void DoSetFirstItem(int n);
-    virtual int DoListHitTest(const wxPoint& point) const;
-
-    // free memory (common part of Clear() and dtor)
-    // prevent collision with some BSD definitions of macro Free()
-    void FreeData();
-
-    virtual wxSize DoGetBestSize() const;
-
-    bool m_blockEvents;
-
-    wxListWidgetColumn* m_textColumn;
-
-    // data storage (copied from univ)
-
-    // the array containing all items (it is sorted if the listbox has
-    // wxLB_SORT style)
-    union
-    {
-        wxArrayString *unsorted;
-        wxSortedArrayString *sorted;
-    } m_strings;
-
-    // and this one the client data (either void or wxClientData)
-    wxArrayPtrVoid m_itemsClientData;
-
-private:
-#ifdef __WXOSX_CARBON__
-    // It needs to call our CalcAndSendEvent().
-    friend class wxMacDataBrowserListControl;
-#endif // Carbon
-
-    DECLARE_DYNAMIC_CLASS(wxListBox)
-    DECLARE_EVENT_TABLE()
-};
-
-#endif // _WX_LISTBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/listctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/listctrl.h
deleted file mode 100644
index 9f2fdfe984..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/listctrl.h
+++ /dev/null
@@ -1,410 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/listctrl.h
-// Purpose:     wxListCtrl class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_LISTCTRL_H_
-#define _WX_LISTCTRL_H_
-
-#include "wx/defs.h"
-#include "wx/generic/listctrl.h"
-
-#define wxMAC_ALWAYS_USE_GENERIC_LISTCTRL wxT("mac.listctrl.always_use_generic")
-
-class wxMacDataBrowserListCtrlControl;
-class wxListCtrlTextCtrlWrapper;
-class wxListCtrlRenameTimer;
-
-WX_DECLARE_EXPORTED_LIST(wxListItem, wxColumnList);
-
-class WXDLLIMPEXP_CORE wxListCtrl: public wxListCtrlBase
-{
-  DECLARE_DYNAMIC_CLASS(wxListCtrl)
- public:
-  /*
-   * Public interface
-   */
-
-    wxListCtrl() { Init(); }
-
-    wxListCtrl(wxWindow *parent,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = wxLC_ICON,
-               const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxListCtrlNameStr)
-    {
-        Init();
-
-        Create(parent, id, pos, size, style, validator, name);
-    }
-
-    virtual ~wxListCtrl();
-
-    bool Create(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxLC_ICON,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListCtrlNameStr);
-
-  // Attributes
-  ////////////////////////////////////////////////////////////////////////////
-
-  // Gets information about this column
-  bool GetColumn(int col, wxListItem& item) const;
-
-  // Sets information about this column
-  bool SetColumn(int col, const wxListItem& item) ;
-
-  // Gets the column width
-  int GetColumnWidth(int col) const;
-
-  // Sets the column width
-  bool SetColumnWidth(int col, int width) ;
-
-  // Gets the number of items that can fit vertically in the
-  // visible area of the list control (list or report view)
-  // or the total number of items in the list control (icon
-  // or small icon view)
-  int GetCountPerPage() const;
-
-  // Gets the edit control for editing labels.
-  wxTextCtrl* GetEditControl() const;
-
-  // Gets information about the item
-  bool GetItem(wxListItem& info) const ;
-
-  // Sets information about the item
-  bool SetItem(wxListItem& info) ;
-
-  // Sets a string field at a particular column
-  long SetItem(long index, int col, const wxString& label, int imageId = -1);
-
-  // Gets the item state
-  int  GetItemState(long item, long stateMask) const ;
-
-  // Sets the item state
-  bool SetItemState(long item, long state, long stateMask) ;
-
-  void AssignImageList(wxImageList *imageList, int which);
-
-  // Sets the item image
-  bool SetItemImage(long item, int image, int selImage = -1) ;
-  bool SetItemColumnImage(long item, long column, int image);
-
-  // Gets the item text
-  wxString GetItemText(long item, int col = 0) const ;
-
-  // Sets the item text
-  void SetItemText(long item, const wxString& str) ;
-
-  void SetItemTextColour(long item, const wxColour& colour) ;
-  wxColour GetItemTextColour(long item) const;
-
-  void SetItemBackgroundColour(long item, const wxColour& colour) ;
-  wxColour GetItemBackgroundColour(long item) const;
-
-  void SetItemFont( long item, const wxFont &f);
-  wxFont GetItemFont( long item ) const;
-
-  // Gets the item data
-  long GetItemData(long item) const ;
-
-  // Sets the item data
-  bool SetItemPtrData(long item, wxUIntPtr data);
-  bool SetItemData(long item, long data) { return SetItemPtrData(item, data); }
-
-  // Gets the item rectangle
-  bool GetItemRect(long item, wxRect& rect, int code = wxLIST_RECT_BOUNDS) const ;
-
-  // Gets the item rectangle of a subitem
-  bool GetSubItemRect( long item, long subItem, wxRect& rect, int code = wxLIST_RECT_BOUNDS ) const;
-
-  // Gets the item position
-  bool GetItemPosition(long item, wxPoint& pos) const ;
-
-  // Sets the item position
-  bool SetItemPosition(long item, const wxPoint& pos) ;
-
-  // Gets the number of items in the list control
-  int GetItemCount() const;
-
-  // Gets the number of columns in the list control
-  int GetColumnCount() const;
-
-  void SetItemSpacing( int spacing, bool isSmall = false );
-  wxSize GetItemSpacing() const;
-
-  // Gets the number of selected items in the list control
-  int GetSelectedItemCount() const;
-
-  wxRect GetViewRect() const;
-
-  // Gets the text colour of the listview
-  wxColour GetTextColour() const;
-
-  // Sets the text colour of the listview
-  void SetTextColour(const wxColour& col);
-
-  // Gets the index of the topmost visible item when in
-  // list or report view
-  long GetTopItem() const ;
-
-  // Add or remove a single window style
-  void SetSingleStyle(long style, bool add = true) ;
-
-  // Set the whole window style
-  void SetWindowStyleFlag(long style) ;
-
-  // Searches for an item, starting from 'item'.
-  // item can be -1 to find the first item that matches the
-  // specified flags.
-  // Returns the item or -1 if unsuccessful.
-  long GetNextItem(long item, int geometry = wxLIST_NEXT_ALL, int state = wxLIST_STATE_DONTCARE) const ;
-
-  // Implementation: converts wxWidgets style to MSW style.
-  // Can be a single style flag or a bit list.
-  // oldStyle is 'normalised' so that it doesn't contain
-  // conflicting styles.
-  long ConvertToMSWStyle(long& oldStyle, long style) const;
-
-  // Gets one of the three image lists
-  wxImageList *GetImageList(int which) const ;
-
-  // Sets the image list
-  // N.B. There's a quirk in the Win95 list view implementation.
-  // If in wxLC_LIST mode, it'll *still* display images by the labels if
-  // there's a small-icon image list set for the control - even though you
-  // haven't specified wxLIST_MASK_IMAGE when inserting.
-  // So you have to set a NULL small-icon image list to be sure that
-  // the wxLC_LIST mode works without icons. Of course, you may want icons...
-  void SetImageList(wxImageList *imageList, int which) ;
-
-  // Operations
-  ////////////////////////////////////////////////////////////////////////////
-
-  // Arranges the items
-  bool Arrange(int flag = wxLIST_ALIGN_DEFAULT);
-
-  // Deletes an item
-  bool DeleteItem(long item);
-
-  // Deletes all items
-  bool DeleteAllItems() ;
-
-  // Deletes a column
-  bool DeleteColumn(int col);
-
-  // Deletes all columns
-  bool DeleteAllColumns();
-
-  // Clears items, and columns if there are any.
-  void ClearAll();
-
-  // Edit the label
-  wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl));
-
-  // End label editing, optionally cancelling the edit
-  bool EndEditLabel(bool cancel);
-
-  // Ensures this item is visible
-  bool EnsureVisible(long item) ;
-
-  // Find an item whose label matches this string, starting from the item after 'start'
-  // or the beginning if 'start' is -1.
-  long FindItem(long start, const wxString& str, bool partial = false);
-
-  // Find an item whose data matches this data, starting from the item after 'start'
-  // or the beginning if 'start' is -1.
-  long FindItem(long start, long data);
-
-  // Find an item nearest this position in the specified direction, starting from
-  // the item after 'start' or the beginning if 'start' is -1.
-  long FindItem(long start, const wxPoint& pt, int direction);
-
-  // Determines which item (if any) is at the specified point,
-  // giving details in 'flags' (see wxLIST_HITTEST_... flags above)
-  // Request the subitem number as well at the given coordinate.
-  long HitTest(const wxPoint& point, int& flags, long* ptrSubItem = NULL) const;
-
-  // Inserts an item, returning the index of the new item if successful,
-  // -1 otherwise.
-  // TOD: Should also have some further convenience functions
-  // which don't require setting a wxListItem object
-  long InsertItem(wxListItem& info);
-
-  // Insert a string item
-  long InsertItem(long index, const wxString& label);
-
-  // Insert an image item
-  long InsertItem(long index, int imageIndex);
-
-  // Insert an image/string item
-  long InsertItem(long index, const wxString& label, int imageIndex);
-
-  // Scrolls the list control. If in icon, small icon or report view mode,
-  // x specifies the number of pixels to scroll. If in list view mode, x
-  // specifies the number of columns to scroll.
-  // If in icon, small icon or list view mode, y specifies the number of pixels
-  // to scroll. If in report view mode, y specifies the number of lines to scroll.
-  bool ScrollList(int dx, int dy);
-
-  // Sort items.
-
-  // fn is a function which takes 3 long arguments: item1, item2, data.
-  // item1 is the long data associated with a first item (NOT the index).
-  // item2 is the long data associated with a second item (NOT the index).
-  // data is the same value as passed to SortItems.
-  // The return value is a negative number if the first item should precede the second
-  // item, a positive number of the second item should precede the first,
-  // or zero if the two items are equivalent.
-
-  // data is arbitrary data to be passed to the sort function.
-  bool SortItems(wxListCtrlCompare fn, wxIntPtr data);
-
-  wxMacDataBrowserListCtrlControl* GetListPeer() const;
-
-    // these functions are only used for virtual list view controls, i.e. the
-    // ones with wxLC_VIRTUAL style
-
-    void SetItemCount(long count);
-    void RefreshItem(long item);
-    void RefreshItems(long itemFrom, long itemTo);
-
-    // return the text for the given column of the given item
-    virtual wxString OnGetItemText(long item, long column) const;
-
-    // return the icon for the given item. In report view, OnGetItemImage will
-    // only be called for the first column. See OnGetItemColumnImage for
-    // details.
-    virtual int OnGetItemImage(long item) const;
-
-    // return the icon for the given item and column.
-    virtual int OnGetItemColumnImage(long item, long column) const;
-
-/* Why should we need this function? Leave for now.
- * We might need it because item data may have changed,
- * but the display needs refreshing (in string callback mode)
-  // Updates an item. If the list control has the wxLI_AUTO_ARRANGE style,
-  // the items will be rearranged.
-  bool Update(long item);
-*/
-
-  void Command(wxCommandEvent& event) { ProcessCommand(event); }
-
-  wxListCtrlCompare GetCompareFunc() { return m_compareFunc; }
-  wxIntPtr GetCompareFuncData() { return m_compareFuncData; }
-
-
-  // public overrides needed for pimpl approach
-  virtual bool SetFont(const wxFont& font);
-  virtual bool SetForegroundColour(const wxColour& colour);
-  virtual bool SetBackgroundColour(const wxColour& colour);
-  virtual wxColour GetBackgroundColour() const;
-
-  virtual void Freeze ();
-  virtual void Thaw ();
-  virtual void Update ();
-
-  // functions for editing/timer
-  void OnRenameTimer();
-  bool OnRenameAccept(long itemEdit, const wxString& value);
-  void OnRenameCancelled(long itemEdit);
-
-  void ChangeCurrent(long current);
-  void ResetCurrent() { ChangeCurrent((long)-1); }
-  bool HasCurrent() const { return m_current != (long)-1; }
-
-  void OnLeftDown(wxMouseEvent& event);
-  void OnDblClick(wxMouseEvent& event);
-
-  void FinishEditing(wxTextCtrl *text)
-  {
-      delete text;
-      m_textctrlWrapper = NULL;
-      SetFocus();
-  }
-
-  virtual int GetScrollPos(int orient) const;
-
-  void OnRightDown(wxMouseEvent& event);
-  void OnMiddleDown(wxMouseEvent& event);
-  void OnChar(wxKeyEvent& event);
-  virtual void SetFocus();
-  void FireMouseEvent(wxEventType eventType, wxPoint position);
-
-  virtual void SetDropTarget( wxDropTarget *dropTarget );
-  virtual wxDropTarget* GetDropTarget() const;
-
-  // with CG, we need to get the context from an kEventControlDraw event
-  // unfortunately, the DataBrowser callbacks don't provide the context
-  // and we need it, so we need to set/remove it before and after draw
-  // events so we can access it in the callbacks.
-  void MacSetDrawingContext(void* context) { m_cgContext = context; }
-  void* MacGetDrawingContext() { return m_cgContext; }
-
-  virtual wxVisualAttributes GetDefaultAttributes() const
-  {
-      return GetClassDefaultAttributes(GetWindowVariant());
-  }
-
-  static wxVisualAttributes
-  GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
-protected:
-  // Implement base class pure virtual methods.
-  long DoInsertColumn(long col, const wxListItem& info);
-
-  // protected overrides needed for pimpl approach
-  virtual void DoSetSize(int x, int y,
-                         int width, int height,
-                         int sizeFlags = wxSIZE_AUTO);
-
-  long               m_current;
-  wxListCtrlTextCtrlWrapper *m_textctrlWrapper;
-  wxListCtrlRenameTimer *m_renameTimer;
-  // common part of all ctors
-  void Init();
-
-  wxGenericListCtrl* m_genericImpl;   // allow use of the generic impl.
-  wxMacDataBrowserListCtrlControl* m_dbImpl;
-  void*  m_macListCtrlEventHandler;
-  void*  m_cgContext;
-  wxListCtrlCompare m_compareFunc;
-  wxIntPtr m_compareFuncData;
-
-  wxTextCtrl*       m_textCtrl;        // The control used for editing a label
-  wxImageList *     m_imageListNormal; // The image list for normal icons
-  wxImageList *     m_imageListSmall;  // The image list for small icons
-  wxImageList *     m_imageListState;  // The image list state icons (not implemented yet)
-
-  wxColumnList      m_colsInfo; // for storing info about each column
-  wxColour          m_textColor;
-  wxColour          m_bgColor;
-
-  // keep track of whether or not we should delete the image list ourselves.
-  bool              m_ownsImageListNormal,
-                    m_ownsImageListSmall,
-                    m_ownsImageListState;
-
-  long              m_baseStyle;  // Basic Windows style flags, for recreation purposes
-  int               m_colCount;   // Windows doesn't have GetColumnCount so must
-                                  // keep track of inserted/deleted columns
-
-  int               m_count; // for virtual lists, store item count
-
-private:
-  int CalcColumnAutoWidth(int col) const;
-
-};
-
-#endif
-    // _WX_LISTCTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/mdi.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/mdi.h
deleted file mode 100644
index 7a859d198d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/mdi.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/mdi.h
-// Purpose:     MDI (Multiple Document Interface) classes.
-// Author:      Stefan Csomor
-// Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-//              (c) 2008 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_CARBON_MDI_H_
-#define _WX_OSX_CARBON_MDI_H_
-
-class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxMDIParentFrameBase
-{
-public:
-    wxMDIParentFrame() { Init(); }
-    wxMDIParentFrame(wxWindow *parent,
-                     wxWindowID id,
-                     const wxString& title,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize,
-                     long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                     const wxString& name = wxFrameNameStr)
-    {
-        Init();
-        Create(parent, id, title, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL,
-                const wxString& name = wxFrameNameStr);
-
-    virtual ~wxMDIParentFrame();
-
-    // implement/override base class [pure] virtuals
-    // ---------------------------------------------
-
-    static bool IsTDI() { return false; }
-
-    virtual void AddChild(wxWindowBase *child);
-    virtual void RemoveChild(wxWindowBase *child);
-
-    virtual void ActivateNext() { /* TODO */ }
-    virtual void ActivatePrevious() { /* TODO */ }
-
-    virtual bool Show(bool show = true);
-
-
-    // Mac-specific implementation from now on
-    // ---------------------------------------
-
-    // Mac OS activate event
-    virtual void MacActivate(long timestamp, bool activating);
-
-    // wxWidgets activate event
-    void OnActivate(wxActivateEvent& event);
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-    void SetMenuBar(wxMenuBar *menu_bar);
-
-    // Get rect to be used to center top-level children
-    virtual void GetRectForTopLevelChildren(int *x, int *y, int *w, int *h);
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    // returns true if this frame has some contents and so should be visible,
-    // false if it's used solely as container for its children
-    bool ShouldBeVisible() const;
-
-
-    wxMenu *m_windowMenu;
-
-    // true if MDI Frame is intercepting commands, not child
-    bool m_parentFrameActive;
-
-    // true if the frame should be shown but is not because it is empty and
-    // useless otherwise than a container for its children
-    bool m_shouldBeShown;
-
-private:
-    friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame;
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxMDIParentFrame)
-};
-
-class WXDLLIMPEXP_CORE wxMDIChildFrame : public wxMDIChildFrameBase
-{
-public:
-    wxMDIChildFrame() { Init(); }
-    wxMDIChildFrame(wxMDIParentFrame *parent,
-                    wxWindowID id,
-                    const wxString& title,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = wxDEFAULT_FRAME_STYLE,
-                    const wxString& name = wxFrameNameStr)
-    {
-        Init() ;
-        Create(parent, id, title, pos, size, style, name);
-    }
-
-    bool Create(wxMDIParentFrame *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
-
-    virtual ~wxMDIChildFrame();
-
-    // un-override the base class override
-    virtual bool IsTopLevel() const { return true; }
-
-    // implement MDI operations
-    virtual void Activate();
-
-
-    // Mac OS activate event
-    virtual void MacActivate(long timestamp, bool activating);
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    DECLARE_DYNAMIC_CLASS(wxMDIChildFrame)
-};
-
-class WXDLLIMPEXP_CORE wxMDIClientWindow : public wxMDIClientWindowBase
-{
-public:
-    wxMDIClientWindow() { }
-    virtual ~wxMDIClientWindow();
-
-    virtual bool CreateClient(wxMDIParentFrame *parent,
-                              long style = wxVSCROLL | wxHSCROLL);
-
-protected:
-    virtual void DoGetClientSize(int *width, int *height) const;
-
-    DECLARE_DYNAMIC_CLASS(wxMDIClientWindow)
-};
-
-#endif // _WX_OSX_CARBON_MDI_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/menu.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/menu.h
deleted file mode 100644
index 9eded8593b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/menu.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/menu.h
-// Purpose:     wxMenu, wxMenuBar classes
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MENU_H_
-#define _WX_MENU_H_
-
-class WXDLLIMPEXP_FWD_CORE wxFrame;
-
-#include "wx/arrstr.h"
-
-// ----------------------------------------------------------------------------
-// Menu
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxMenuImpl ;
-
-class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase
-{
-public:
-    // ctors & dtor
-    wxMenu(const wxString& title, long style = 0)
-        : wxMenuBase(title, style) { Init(); }
-
-    wxMenu(long style = 0) : wxMenuBase(style) { Init(); }
-
-    virtual ~wxMenu();
-
-    virtual void Break();
-
-    virtual void SetTitle(const wxString& title);
-
-    bool ProcessCommand(wxCommandEvent& event);
-
-    // get the menu handle
-    WXHMENU GetHMenu() const ;
-
-    // implementation only from now on
-    // -------------------------------
-
-    bool HandleCommandUpdateStatus( wxMenuItem* menuItem, wxWindow* senderWindow = NULL);
-    bool HandleCommandProcess( wxMenuItem* menuItem, wxWindow* senderWindow = NULL);
-    void HandleMenuItemHighlighted( wxMenuItem* menuItem );
-    void HandleMenuOpened();
-    void HandleMenuClosed();
-
-    wxMenuImpl* GetPeer() { return m_peer; }
-
-    // make sure we can veto
-    void SetAllowRearrange( bool allow );
-    bool AllowRearrange() const { return m_allowRearrange; }
-
-    // if a menu is used purely for internal implementation reasons (eg wxChoice)
-    // we don't want native menu events being triggered
-    void SetNoEventsMode( bool noEvents );
-    bool GetNoEventsMode() const { return m_noEventsMode; }
-protected:
-    // hide special menu items like exit, preferences etc
-    // that are expected in the app menu
-    void DoRearrange() ;
-
-    bool DoHandleMenuEvent( wxEvent& evt );
-    virtual wxMenuItem* DoAppend(wxMenuItem *item);
-    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem* DoRemove(wxMenuItem *item);
-
-private:
-    // common part of all ctors
-    void Init();
-
-    // common part of Do{Append,Insert}(): behaves as Append if pos == -1
-    bool DoInsertOrAppend(wxMenuItem *item, size_t pos = (size_t)-1);
-
-    // Common part of HandleMenu{Opened,Closed}().
-    void DoHandleMenuOpenedOrClosed(wxEventType evtType);
-
-
-    // if TRUE, insert a break before appending the next item
-    bool m_doBreak;
-
-    // in this menu rearranging of menu items (esp hiding) is allowed
-    bool m_allowRearrange;
-
-    // don't trigger native events
-    bool m_noEventsMode;
-
-    wxMenuImpl* m_peer;
-
-    DECLARE_DYNAMIC_CLASS(wxMenu)
-};
-
-#if wxOSX_USE_COCOA_OR_CARBON
-
-// the iphone only has popup-menus
-
-// ----------------------------------------------------------------------------
-// Menu Bar (a la Windows)
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase
-{
-public:
-    // ctors & dtor
-        // default constructor
-    wxMenuBar();
-        // unused under MSW
-    wxMenuBar(long style);
-        // menubar takes ownership of the menus arrays but copies the titles
-    wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
-    virtual ~wxMenuBar();
-
-    // menubar construction
-    virtual bool Append( wxMenu *menu, const wxString &title );
-    virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);
-    virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
-    virtual wxMenu *Remove(size_t pos);
-
-    virtual void EnableTop( size_t pos, bool flag );
-    virtual bool IsEnabledTop(size_t pos) const;
-    virtual void SetMenuLabel( size_t pos, const wxString& label );
-    virtual wxString GetMenuLabel( size_t pos ) const;
-    virtual bool Enable( bool enable = true );
-    // for virtual function hiding
-    virtual void Enable( int itemid, bool enable )
-    {
-        wxMenuBarBase::Enable( itemid, enable );
-    }
-
-    // implementation from now on
-    void Detach();
-
-        // returns TRUE if we're attached to a frame
-    bool IsAttached() const { return m_menuBarFrame != NULL; }
-        // get the frame we live in
-    wxFrame *GetFrame() const { return m_menuBarFrame; }
-        // attach to a frame
-    void Attach(wxFrame *frame);
-
-    // if the menubar is modified, the display is not updated automatically,
-    // call this function to update it (m_menuBarFrame should be !NULL)
-    void Refresh(bool eraseBackground = true, const wxRect *rect = NULL);
-
-#if wxABI_VERSION >= 30001
-    wxMenu *OSXGetAppleMenu() const { return m_appleMenu; }
-#endif
-
-    static void SetAutoWindowMenu( bool enable ) { s_macAutoWindowMenu = enable ; }
-    static bool GetAutoWindowMenu() { return s_macAutoWindowMenu ; }
-
-    void MacInstallMenuBar() ;
-    static wxMenuBar* MacGetInstalledMenuBar() { return s_macInstalledMenuBar ; }
-    static void MacSetCommonMenuBar(wxMenuBar* menubar) { s_macCommonMenuBar=menubar; }
-    static wxMenuBar* MacGetCommonMenuBar() { return s_macCommonMenuBar; }
-
-
-    static WXHMENU MacGetWindowMenuHMenu() { return s_macWindowMenuHandle ; }
-protected:
-    // common part of all ctors
-    void Init();
-
-    static bool     s_macAutoWindowMenu ;
-    static WXHMENU  s_macWindowMenuHandle ;
-
-private:
-    static wxMenuBar*            s_macInstalledMenuBar ;
-    static wxMenuBar*            s_macCommonMenuBar ;
-
-    wxMenu* m_rootMenu;
-    wxMenu* m_appleMenu;
-
-    DECLARE_DYNAMIC_CLASS(wxMenuBar)
-};
-
-#endif
-
-#endif // _WX_MENU_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/menuitem.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/menuitem.h
deleted file mode 100644
index 69dc7e7bcb..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/menuitem.h
+++ /dev/null
@@ -1,98 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/menuitem.h
-// Purpose:     wxMenuItem class
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     11.11.97
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef   _MENUITEM_H
-#define   _MENUITEM_H
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/defs.h"
-#include "wx/bitmap.h"
-
-// ----------------------------------------------------------------------------
-// wxMenuItem: an item in the menu, optionally implements owner-drawn behaviour
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxMenuItemImpl ;
-
-class WXDLLIMPEXP_CORE wxMenuItem: public wxMenuItemBase
-{
-public:
-    // ctor & dtor
-    wxMenuItem(wxMenu *parentMenu = NULL,
-               int id = wxID_SEPARATOR,
-               const wxString& name = wxEmptyString,
-               const wxString& help = wxEmptyString,
-               wxItemKind kind = wxITEM_NORMAL,
-               wxMenu *subMenu = NULL);
-    virtual ~wxMenuItem();
-
-    // override base class virtuals
-    virtual void SetItemLabel(const wxString& strName);
-
-    virtual void Enable(bool bDoEnable = true);
-    virtual void Check(bool bDoCheck = true);
-
-    virtual void SetBitmap(const wxBitmap& bitmap) ;
-    virtual const wxBitmap& GetBitmap() const { return m_bitmap; }
-
-
-    // Implementation only from now on.
-
-    // update the os specific representation
-    void UpdateItemBitmap() ;
-    void UpdateItemText() ;
-    void UpdateItemStatus() ;
-
-    // mark item as belonging to the given radio group
-    void SetAsRadioGroupStart(bool start = true);
-    void SetRadioGroupStart(int start);
-    void SetRadioGroupEnd(int end);
-
-    // return true if this is the starting item of a radio group
-    bool IsRadioGroupStart() const;
-
-    // get the start of the radio group this item belongs to: should not be
-    // called for the starting radio group item itself because it doesn't have
-    // this information
-    int GetRadioGroupStart() const;
-
-    // get the end of the radio group this item belongs to: should be only
-    // called for the starting radio group item, i.e. if IsRadioGroupStart() is
-    // true
-    int GetRadioGroupEnd() const;
-
-    wxMenuItemImpl* GetPeer() { return m_peer; }
-private:
-    void UncheckRadio() ;
-
-    // the positions of the first and last items of the radio group this item
-    // belongs to or -1: start is the radio group start and is valid for all
-    // but first radio group items (m_isRadioGroupStart == FALSE), end is valid
-    // only for the first one
-    union
-    {
-        int start;
-        int end;
-    } m_radioGroup;
-
-    // does this item start a radio group?
-    bool m_isRadioGroupStart;
-
-    wxBitmap  m_bitmap; // Bitmap for menuitem, if any
-
-    wxMenuItemImpl* m_peer;
-
-    DECLARE_DYNAMIC_CLASS(wxMenuItem)
-};
-
-#endif  //_MENUITEM_H
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/metafile.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/metafile.h
deleted file mode 100644
index 973a5736a4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/metafile.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/metafile.h
-// Purpose:     wxMetaFile, wxMetaFileDC classes.
-//              This probably should be restricted to Windows platforms,
-//              but if there is an equivalent on your platform, great.
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef _WX_METAFIILE_H_
-#define _WX_METAFIILE_H_
-
-#include "wx/dc.h"
-#include "wx/gdiobj.h"
-
-#if wxUSE_DATAOBJ
-#include "wx/dataobj.h"
-#endif
-
-#include "wx/osx/dcclient.h"
-
-/*
- * Metafile and metafile device context classes
- *
- */
-
-#define wxMetaFile wxMetafile
-#define wxMetaFileDC wxMetafileDC
-
-class WXDLLIMPEXP_FWD_CORE wxMetafile;
-class wxMetafileRefData ;
-
-#define M_METAFILEDATA ((wxMetafileRefData *)m_refData)
-
-class WXDLLIMPEXP_CORE wxMetafile : public wxGDIObject
-{
-public:
-    wxMetafile(const wxString& file = wxEmptyString);
-    virtual ~wxMetafile(void);
-
-    // After this is called, the metafile cannot be used for anything
-    // since it is now owned by the clipboard.
-    virtual bool SetClipboard(int width = 0, int height = 0);
-
-    virtual bool Play(wxDC *dc);
-
-    wxSize GetSize() const;
-    int GetWidth() const { return GetSize().x; }
-    int GetHeight() const { return GetSize().y; }
-
-    // Implementation
-    WXHMETAFILE GetHMETAFILE() const ;
-    void SetHMETAFILE(WXHMETAFILE mf) ;
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-    DECLARE_DYNAMIC_CLASS(wxMetafile)
-};
-
-
-class WXDLLIMPEXP_CORE wxMetafileDCImpl: public wxGCDCImpl
-{
-public:
-    wxMetafileDCImpl( wxDC *owner,
-                      const wxString& filename,
-                      int width, int height,
-                      const wxString& description );
-
-    virtual ~wxMetafileDCImpl();
-
-    // Should be called at end of drawing
-    virtual wxMetafile *Close();
-
-    // Implementation
-    wxMetafile *GetMetaFile(void) const { return m_metaFile; }
-    void SetMetaFile(wxMetafile *mf) { m_metaFile = mf; }
-
-protected:
-    virtual void DoGetSize(int *width, int *height) const;
-
-    wxMetafile*   m_metaFile;
-
-private:
-    DECLARE_CLASS(wxMetafileDCImpl)
-    wxDECLARE_NO_COPY_CLASS(wxMetafileDCImpl);
-};
-
-class WXDLLIMPEXP_CORE wxMetafileDC: public wxDC
-{
- public:
-    // the ctor parameters specify the filename (empty for memory metafiles),
-    // the metafile picture size and the optional description/comment
-    wxMetafileDC(  const wxString& filename = wxEmptyString,
-                    int width = 0, int height = 0,
-                    const wxString& description = wxEmptyString ) :
-      wxDC( new wxMetafileDCImpl( this, filename, width, height, description) )
-    { }
-
-    wxMetafile *GetMetafile() const
-       { return ((wxMetafileDCImpl*)m_pimpl)->GetMetaFile(); }
-
-    wxMetafile *Close()
-       { return ((wxMetafileDCImpl*)m_pimpl)->Close(); }
-
-private:
-    DECLARE_CLASS(wxMetafileDC)
-    wxDECLARE_NO_COPY_CLASS(wxMetafileDC);
-};
-
-
-/*
- * Pass filename of existing non-placeable metafile, and bounding box.
- * Adds a placeable metafile header, sets the mapping mode to anisotropic,
- * and sets the window origin and extent to mimic the wxMM_TEXT mapping mode.
- *
- */
-
-// No origin or extent
-#define wxMakeMetaFilePlaceable wxMakeMetafilePlaceable
-bool WXDLLIMPEXP_CORE wxMakeMetafilePlaceable(const wxString& filename, float scale = 1.0);
-
-// Optional origin and extent
-bool WXDLLIMPEXP_CORE wxMakeMetaFilePlaceable(const wxString& filename, int x1, int y1, int x2, int y2, float scale = 1.0, bool useOriginAndExtent = true);
-
-// ----------------------------------------------------------------------------
-// wxMetafileDataObject is a specialization of wxDataObject for metafile data
-// ----------------------------------------------------------------------------
-
-#if wxUSE_DATAOBJ
-class WXDLLIMPEXP_CORE wxMetafileDataObject : public wxDataObjectSimple
-{
-public:
-  // ctors
-  wxMetafileDataObject()
-    : wxDataObjectSimple(wxDF_METAFILE) {  }
-  wxMetafileDataObject(const wxMetafile& metafile)
-    : wxDataObjectSimple(wxDF_METAFILE), m_metafile(metafile) { }
-
-    // virtual functions which you may override if you want to provide data on
-    // demand only - otherwise, the trivial default versions will be used
-    virtual void SetMetafile(const wxMetafile& metafile)
-        { m_metafile = metafile; }
-    virtual wxMetafile GetMetafile() const
-        { return m_metafile; }
-
-    // implement base class pure virtuals
-    virtual size_t GetDataSize() const;
-    virtual bool GetDataHere(void *buf) const;
-    virtual bool SetData(size_t len, const void *buf);
-
-    virtual size_t GetDataSize(const wxDataFormat& WXUNUSED(format)) const
-        { return GetDataSize(); }
-    virtual bool GetDataHere(const wxDataFormat& WXUNUSED(format),
-                             void *buf) const
-        { return GetDataHere(buf); }
-    virtual bool SetData(const wxDataFormat& WXUNUSED(format),
-                         size_t len, const void *buf)
-        { return SetData(len, buf); }
-protected:
-  wxMetafile   m_metafile;
-};
-#endif
-
-#endif
-    // _WX_METAFIILE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/mimetype.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/mimetype.h
deleted file mode 100644
index e6e6eb0c81..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/mimetype.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "wx/osx/core/mimetype.h"
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/minifram.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/minifram.h
deleted file mode 100644
index 00fe6e474a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/minifram.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/minifram.h
-// Purpose:     wxMiniFrame class. A small frame for e.g. floating toolbars.
-//              If there is no equivalent on your platform, just make it a
-//              normal frame.
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MINIFRAM_H_
-#define _WX_MINIFRAM_H_
-
-#include "wx/frame.h"
-
-class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame {
-
-  DECLARE_DYNAMIC_CLASS(wxMiniFrame)
-
-public:
-  inline wxMiniFrame() {}
-  inline wxMiniFrame(wxWindow *parent,
-           wxWindowID id,
-           const wxString& title,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = wxCAPTION | wxRESIZE_BORDER | wxTINY_CAPTION,
-           const wxString& name = wxFrameNameStr)
-  {
-      // Use wxFrame constructor in absence of more specific code.
-      Create(parent, id, title, pos, size, style | wxFRAME_TOOL_WINDOW | wxFRAME_FLOAT_ON_PARENT , name);
-  }
-
-  virtual ~wxMiniFrame() {}
-protected:
-};
-
-#endif
-    // _WX_MINIFRAM_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/msgdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/msgdlg.h
deleted file mode 100644
index 871d32f940..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/msgdlg.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/msgdlg.h
-// Purpose:     wxMessageDialog class. Use generic version if no
-//              platform-specific implementation.
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSGBOXDLG_H_
-#define _WX_MSGBOXDLG_H_
-
-class WXDLLIMPEXP_CORE wxMessageDialog : public wxMessageDialogBase
-{
-public:
-    wxMessageDialog(wxWindow *parent,
-                    const wxString& message,
-                    const wxString& caption = wxMessageBoxCaptionStr,
-                    long style = wxOK|wxCENTRE,
-                    const wxPoint& pos = wxDefaultPosition);
-
-#if wxOSX_USE_COCOA
-    ~wxMessageDialog();
-#endif
-    
-    virtual int ShowModal();
-
-#if wxOSX_USE_COCOA
-    virtual void ShowWindowModal();
-    virtual void ModalFinishedCallback(void* panel, int resultCode);
-#endif
-
-protected:
-    // not supported for message dialog
-    virtual void DoSetSize(int WXUNUSED(x), int WXUNUSED(y),
-                           int WXUNUSED(width), int WXUNUSED(height),
-                           int WXUNUSED(sizeFlags) = wxSIZE_AUTO) {}
-
-#if wxOSX_USE_COCOA
-    void* ConstructNSAlert();
-#endif
-
-    int m_buttonId[4];
-    int m_buttonCount;
-
-#if wxOSX_USE_COCOA
-    WX_NSObject m_sheetDelegate;
-#endif
-    DECLARE_DYNAMIC_CLASS(wxMessageDialog)
-};
-
-#endif // _WX_MSGBOXDLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/nonownedwnd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/nonownedwnd.h
deleted file mode 100644
index edc3f04e62..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/nonownedwnd.h
+++ /dev/null
@@ -1,161 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/nonownedwnd.h
-// Purpose:     declares wxNonOwnedWindow class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     2008-03-24
-// Copyright:   (c) 2008 Stefan Csomor
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_NONOWNEDWND_H_
-#define _WX_MAC_NONOWNEDWND_H_
-
-#include "wx/window.h"
-
-#include "wx/graphics.h"
-
-#if wxUSE_SYSTEM_OPTIONS
-    #define wxMAC_WINDOW_PLAIN_TRANSITION wxT("mac.window-plain-transition")
-#endif
-
-//-----------------------------------------------------------------------------
-// wxNonOwnedWindow
-//-----------------------------------------------------------------------------
-
-// This class represents "non-owned" window. A window is owned by another
-// window if it has a parent and is positioned within the parent. For example,
-// wxFrame is non-owned, because even though it can have a parent, it's
-// location is independent of it.  This class is for internal use only, it's
-// the base class for wxTopLevelWindow and wxPopupWindow.
-
-class wxNonOwnedWindowImpl;
-
-class WXDLLIMPEXP_CORE wxNonOwnedWindow : public wxNonOwnedWindowBase
-{
-public:
-    // constructors and such
-    wxNonOwnedWindow() { Init(); }
-
-    wxNonOwnedWindow(wxWindow *parent,
-                        wxWindowID id,
-                        const wxPoint& pos = wxDefaultPosition,
-                        const wxSize& size = wxDefaultSize,
-                        long style = 0,
-                        const wxString& name = wxPanelNameStr)
-    {
-        Init();
-
-        (void)Create(parent, id, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr);
-
-    bool Create(wxWindow *parent, WXWindow nativeWindow);
-
-    virtual ~wxNonOwnedWindow();
-
-    virtual void SubclassWin(WXWindow nativeWindow);
-    virtual void UnsubclassWin();
-
-    virtual wxPoint GetClientAreaOrigin() const;
-    
-    // implement base class pure virtuals
-
-    virtual bool SetTransparent(wxByte alpha);
-    virtual bool CanSetTransparent();
-
-    virtual bool SetBackgroundStyle(wxBackgroundStyle style);
-
-    virtual void Update();
-
-    WXWindow GetWXWindow() const ;
-    static wxNonOwnedWindow* GetFromWXWindow( WXWindow win );
-
-    // implementation from now on
-    // --------------------------
-
-    // These accessors are Mac-specific and don't exist in other ports.
-    const wxRegion& GetShape() const { return m_shape; }
-#if wxUSE_GRAPHICS_CONTEXT
-    const wxGraphicsPath& GetShapePath() { return m_shapePath; }
-#endif // wxUSE_GRAPHICS_CONTEXT
-
-    // activation hooks only necessary for MDI Implementation
-    static void MacDelayedDeactivation(long timestamp);
-    virtual void MacActivate( long timestamp , bool inIsActivating ) ;
-
-    virtual void SetWindowStyleFlag(long flags);
-
-    virtual void Raise();
-    virtual void Lower();
-    virtual bool Show( bool show = true );
-
-    virtual void SetExtraStyle(long exStyle) ;
-
-    virtual bool SetBackgroundColour( const wxColour &colour );
-
-    wxNonOwnedWindowImpl* GetNonOwnedPeer() const { return m_nowpeer; }
-
-#if wxOSX_USE_COCOA_OR_IPHONE
-    // override the base class method to return an NSWindow instead of NSView
-    virtual void *OSXGetViewOrWindow() const;
-#endif // Cocoa
-
-    // osx specific event handling common for all osx-ports
-
-    virtual void HandleActivated( double timestampsec, bool didActivate );
-    virtual void HandleResized( double timestampsec );
-    virtual void HandleMoved( double timestampsec );
-    virtual void HandleResizing( double timestampsec, wxRect* rect );
-    
-    void WindowWasPainted();
-
-    virtual bool Destroy();
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    virtual void DoGetPosition( int *x, int *y ) const;
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-    virtual void DoGetClientSize(int *width, int *height) const;
-
-    virtual bool OSXShowWithEffect(bool show,
-                                   wxShowEffect effect,
-                                   unsigned timeout);
-
-    virtual bool DoClearShape();
-    virtual bool DoSetRegionShape(const wxRegion& region);
-#if wxUSE_GRAPHICS_CONTEXT
-    virtual bool DoSetPathShape(const wxGraphicsPath& path);
-#endif // wxUSE_GRAPHICS_CONTEXT
-
-    virtual void WillBeDestroyed();
-
-    wxNonOwnedWindowImpl* m_nowpeer ;
-
-//    wxWindowMac* m_macFocus ;
-
-    static wxNonOwnedWindow *s_macDeactivateWindow;
-
-private :
-    static clock_t s_lastFlush;
-    
-    wxRegion m_shape;
-#if wxUSE_GRAPHICS_CONTEXT
-    wxGraphicsPath m_shapePath;
-#endif // wxUSE_GRAPHICS_CONTEXT
-};
-
-// list of all frames and modeless dialogs
-extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxModelessWindows;
-
-
-#endif // _WX_MAC_NONOWNEDWND_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/notebook.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/notebook.h
deleted file mode 100644
index 7e0ac72291..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/notebook.h
+++ /dev/null
@@ -1,141 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/notebook.h
-// Purpose:     MSW/GTK compatible notebook (a.k.a. property sheet)
-// Author:      Stefan Csomor
-// Modified by:
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_NOTEBOOK_H_
-#define _WX_NOTEBOOK_H_
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-#include "wx/event.h"
-
-// ----------------------------------------------------------------------------
-// types
-// ----------------------------------------------------------------------------
-
-// fwd declarations
-class WXDLLIMPEXP_FWD_CORE wxImageList;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-
-// ----------------------------------------------------------------------------
-// wxNotebook
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase
-{
-public:
-  // ctors
-  // -----
-    // default for dynamic class
-  wxNotebook() { }
-    // the same arguments as for wxControl (@@@ any special styles?)
-  wxNotebook(wxWindow *parent,
-             wxWindowID id,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = 0,
-             const wxString& name = wxNotebookNameStr)
-    { Create( parent, id, pos, size, style, name ); }
-    // Create() function
-  bool Create(wxWindow *parent,
-              wxWindowID id,
-              const wxPoint& pos = wxDefaultPosition,
-              const wxSize& size = wxDefaultSize,
-              long style = 0,
-              const wxString& name = wxNotebookNameStr);
-    // dtor
-  virtual ~wxNotebook();
-
-  // accessors
-  // ---------
-    // set the currently selected page, return the index of the previously
-    // selected one (or wxNOT_FOUND on error)
-    // NB: this function will _not_ generate wxEVT_NOTEBOOK_PAGE_xxx events
-  int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }
-
-    // changes selected page without sending events
-  int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); }
-
-    // set/get the title of a page
-  bool SetPageText(size_t nPage, const wxString& strText);
-  wxString GetPageText(size_t nPage) const;
-
-    // sets/returns item's image index in the current image list
-  int  GetPageImage(size_t nPage) const;
-  bool SetPageImage(size_t nPage, int nImage);
-
-  // control the appearance of the notebook pages
-    // set the size (the same for all pages)
-  virtual void SetPageSize(const wxSize& size);
-    // set the padding between tabs (in pixels)
-  virtual void SetPadding(const wxSize& padding);
-    // sets the size of the tabs (assumes all tabs are the same size)
-  virtual void SetTabSize(const wxSize& sz);
-
-  // hit test
-  virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
-
-  // calculate size for wxNotebookSizer
-  wxSize CalcSizeFromPage(const wxSize& sizePage) const;
-  wxRect GetPageRect() const ;
-
-  // operations
-  // ----------
-    // remove all pages
-  bool DeleteAllPages();
-    // the same as AddPage(), but adds it at the specified position
-  bool InsertPage(size_t nPage,
-                  wxNotebookPage *pPage,
-                  const wxString& strText,
-                  bool bSelect = false,
-                  int imageId = NO_IMAGE);
-
-  // callbacks
-  // ---------
-  void OnSize(wxSizeEvent& event);
-  void OnSelChange(wxBookCtrlEvent& event);
-  void OnSetFocus(wxFocusEvent& event);
-  void OnNavigationKey(wxNavigationKeyEvent& event);
-
-    // implementation
-    // --------------
-
-#if wxUSE_CONSTRAINTS
-  virtual void SetConstraintSizes(bool recurse = true);
-  virtual bool DoPhase(int nPhase);
-
-#endif
-
-  // base class virtuals
-  // -------------------
-  virtual void Command(wxCommandEvent& event);
-    // osx specific event handling common for all osx-ports
-
-    virtual bool        OSXHandleClicked( double timestampsec );
-
-protected:
-  virtual wxNotebookPage *DoRemovePage(size_t page) ;
-  // common part of all ctors
-  void Init();
-
-  // helper functions
-  void ChangePage(int nOldSel, int nSel); // change pages
-  void MacSetupTabs();
-
-  int DoSetSelection(size_t nPage, int flags = 0);
-
-  // the icon indices
-  wxArrayInt m_images;
-
-  DECLARE_DYNAMIC_CLASS(wxNotebook)
-  DECLARE_EVENT_TABLE()
-};
-
-
-#endif // _WX_NOTEBOOK_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/palette.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/palette.h
deleted file mode 100644
index 86e014f80f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/palette.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/palette.h
-// Purpose:     wxPalette class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PALETTE_H_
-#define _WX_PALETTE_H_
-
-#include "wx/gdiobj.h"
-
-#define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
-
-class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase
-{
-public:
-    wxPalette();
-
-    wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
-    virtual ~wxPalette();
-    bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
-
-    int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
-    bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
-
-    virtual int GetColoursCount() const;
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxPalette)
-};
-
-#endif // _WX_PALETTE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/pen.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/pen.h
deleted file mode 100644
index 391344850c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/pen.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/pen.h
-// Purpose:     wxPen class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PEN_H_
-#define _WX_PEN_H_
-
-#include "wx/gdiobj.h"
-#include "wx/colour.h"
-#include "wx/bitmap.h"
-
-// Pen
-class WXDLLIMPEXP_CORE wxPen : public wxPenBase
-{
-public:
-    wxPen();
-    wxPen(const wxColour& col, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID);
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
-#endif
-
-    wxPen(const wxBitmap& stipple, int width);
-    virtual ~wxPen();
-
-    bool operator==(const wxPen& pen) const;
-    bool operator!=(const wxPen& pen) const { return !(*this == pen); }
-
-    // Override in order to recreate the pen
-    void SetColour(const wxColour& col) ;
-    void SetColour(unsigned char r, unsigned char g, unsigned char b) ;
-
-    void SetWidth(int width)  ;
-    void SetStyle(wxPenStyle style)  ;
-    void SetStipple(const wxBitmap& stipple)  ;
-    void SetDashes(int nb_dashes, const wxDash *dash)  ;
-    void SetJoin(wxPenJoin join)  ;
-    void SetCap(wxPenCap cap)  ;
-
-    wxColour GetColour() const ;
-    int GetWidth() const;
-    wxPenStyle GetStyle() const;
-    wxPenJoin GetJoin() const;
-    wxPenCap GetCap() const;
-    int GetDashes(wxDash **ptr) const;
-    int GetDashCount() const;
-
-    wxBitmap *GetStipple() const ;
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
-        { SetStyle((wxPenStyle)style); }
-#endif
-
-    // Implementation
-
-    // Useful helper: create the brush resource
-    bool RealizeResource();
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-private:
-    void Unshare();
-
-    DECLARE_DYNAMIC_CLASS(wxPen)
-};
-
-#endif
-    // _WX_PEN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/pnghand.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/pnghand.h
deleted file mode 100644
index c040521337..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/pnghand.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/pnghand.h
-// Purpose:     PNG bitmap handler
-// Author:      Julian Smart
-// Modified by:
-// Created:     04/01/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PNGHAND_H_
-#define _WX_PNGHAND_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_LIBPNG
-
-class WXDLLIMPEXP_CORE wxPNGFileHandler: public wxBitmapHandler
-{
-  DECLARE_DYNAMIC_CLASS(wxPNGFileHandler)
-public:
-  inline wxPNGFileHandler(void)
-  {
-    SetName(wxT("PNG bitmap file"));
-    SetExtension(wxT("bmp"));
-    SetType(wxBITMAP_TYPE_PNG);
-  }
-
-  virtual bool LoadFile(wxBitmap *bitmap, const wxString& name, long flags,
-      int desiredWidth, int desiredHeight);
-  virtual bool SaveFile(const wxBitmap *bitmap, const wxString& name, int type, const wxPalette *palette = NULL);
-};
-
-#endif //wxUSE_LIBPNG
-
-#endif
-  // _WX_PNGHAND_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/pngread.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/pngread.h
deleted file mode 100644
index bdf466b8a3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/pngread.h
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * File:    pngread.h
- * Purpose:    PNG file reader
- * Author:    Alejandro Aguilar Sierra/Julian Smart
- * Created:    1995
- * Copyright:    (c) 1995, Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
- *
- *
- */
-
-#ifndef _WX_PNGREAD__
-#define _WX_PNGREAD__
-
-#ifndef byte
-typedef unsigned char byte;
-#endif
-
-#define WXIMA_COLORS DIB_PAL_COLORS
-
-typedef byte * ImagePointerType;
-
-typedef struct
-{
-    byte red;
-    byte green;
-   byte blue;
-} rgb_color_struct;
-
-
-#define COLORTYPE_PALETTE    1
-#define COLORTYPE_COLOR        2
-#define COLORTYPE_ALPHA        4
-
-class wxPNGReader
-{
-protected:
-  int filetype;
-  char filename[255];
-  ImagePointerType RawImage;      //  Image data
-
-  int Width, Height;               //  Dimensions
-  int Depth;             // (bits x pixel)
-  int ColorType;        // Bit 1 = Palette used
-                // Bit 2 = Color used
-                // Bit 3 = Alpha used
-
-  long EfeWidth;         // Efective Width
-
-  void *lpbi;
-  int bgindex;
-  wxPalette* m_palette;
-  bool imageOK;
-friend class wxPNGReaderIter;
-public:
-  wxPNGReader(void);
-  wxPNGReader (char* ImageFileName);     // Read an image file
-  virtual ~wxPNGReader ();
-
-  void Create(int width, int height, int deep, int colortype=-1);
-
-  bool ReadFile( char* ImageFileName=0 );
-  bool SaveFile( char* ImageFileName=0 );
-  bool SaveXPM(char *filename, char *name = 0);
-  int  GetWidth( void ) const { return Width; }
-  int  GetHeight( void ) const { return Height; }
-  int  GetDepth( void ) const { return Depth; }
-  int  GetColorType( void ) const { return ColorType; }
-
-  int  GetIndex(int x, int y);
-  bool GetRGB(int x, int y, byte* r, byte* g, byte* b);
-
-  bool SetIndex(int x, int y, int index);
-  bool SetRGB(int x, int y, byte r, byte g, byte b);
-
-  // ColorMap settings
-  bool SetPalette(wxPalette* colourmap);
-  bool SetPalette(int n, rgb_color_struct *rgb_struct);
-  bool SetPalette(int n, byte *r, byte *g=0, byte *b=0);
-  wxPalette* GetPalette() const { return m_palette; }
-
-  void NullData();
-  inline int GetBGIndex(void) { return bgindex; }
-
-  inline bool Inside(int x, int y)
-      { return (0<=y && y<Height && 0<=x && x<Width); }
-
-  virtual wxBitmap *GetBitmap(void);
-  virtual bool InstantiateBitmap(wxBitmap *bitmap);
-  wxMask *CreateMask(void);
-
-  inline bool Ok() const { return IsOk(); }
-  inline bool IsOk(void) { return imageOK; }
-};
-
-class wxPNGReaderIter
-{
-protected:
-  int Itx, Ity;                // Counters
-  int Stepx, Stepy;
-  ImagePointerType IterImage;          //  Image pointer
-  wxPNGReader *ima;
-public:
-// Constructors
-  wxPNGReaderIter ( void );
-  wxPNGReaderIter ( wxPNGReader *imax );
-  operator wxPNGReader* ();
-
-// Iterators
-  bool ItOK ();
-  void reset ();
-  void upset ();
-  void SetRow(byte *buf, int n);
-  void GetRow(byte *buf, int n);
-  byte GetByte( ) { return IterImage[Itx]; }
-  void SetByte(byte b) { IterImage[Itx] = b; }
-  ImagePointerType GetRow(void);
-  bool NextRow();
-  bool PrevRow();
-  bool NextByte();
-  bool PrevByte();
-
-  void SetSteps(int x, int y=0) {  Stepx = x; Stepy = y; }
-  void GetSteps(int *x, int *y) {  *x = Stepx; *y = Stepy; }
-  bool NextStep();
-  bool PrevStep();
-
-////////////////////////// AD - for interlace ///////////////////////////////
-  void SetY(int y);
-/////////////////////////////////////////////////////////////////////////////
-};
-
-
-inline
-wxPNGReaderIter::wxPNGReaderIter(void)
-{
-  ima = 0;
-  IterImage = 0;
-  Itx = Ity = 0;
-  Stepx = Stepy = 0;
-}
-
-inline
-wxPNGReaderIter::wxPNGReaderIter(wxPNGReader *imax): ima(imax)
-{
-  if (ima)
-     IterImage = ima->RawImage;
-  Itx = Ity = 0;
-  Stepx = Stepy = 0;
-}
-
-inline
-wxPNGReaderIter::operator wxPNGReader* ()
-{
-  return ima;
-}
-
-inline
-bool wxPNGReaderIter::ItOK ()
-{
-  if (ima)
-     return ima->Inside(Itx, Ity);
-  else
-     return FALSE;
-}
-
-
-inline void wxPNGReaderIter::reset()
-{
-  IterImage = ima->RawImage;
-  Itx = Ity = 0;
-}
-
-inline void wxPNGReaderIter::upset()
-{
-  Itx = 0;
-  Ity = ima->Height-1;
-  IterImage = ima->RawImage + ima->EfeWidth*(ima->Height-1);
-}
-
-inline bool wxPNGReaderIter::NextRow()
-{
-  if (++Ity >= ima->Height) return 0;
-  IterImage += ima->EfeWidth;
-  return 1;
-}
-
-inline bool wxPNGReaderIter::PrevRow()
-{
-  if (--Ity < 0) return 0;
-  IterImage -= ima->EfeWidth;
-  return 1;
-}
-
-////////////////////////// AD - for interlace ///////////////////////////////
-inline void wxPNGReaderIter::SetY(int y)
-{
-  if ((y < 0) || (y > ima->Height)) return;
-  Ity = y;
-  IterImage = ima->RawImage + ima->EfeWidth*y;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-inline void wxPNGReaderIter::SetRow(byte *buf, int n)
-{
-// Here should be bcopy or memcpy
-  //_fmemcpy(IterImage, (void far *)buf, n);
-  if (n<0)
-     n = ima->GetWidth();
-
-  for (int i=0; i<n; i++) IterImage[i] = buf[i];
-}
-
-inline void wxPNGReaderIter::GetRow(byte *buf, int n)
-{
-  for (int i=0; i<n; i++) buf[i] = IterImage[i];
-}
-
-inline ImagePointerType wxPNGReaderIter::GetRow()
-{
-  return IterImage;
-}
-
-inline bool wxPNGReaderIter::NextByte()
-{
-  if (++Itx < ima->EfeWidth)
-     return 1;
-  else
-     if (++Ity < ima->Height)
-     {
-        IterImage += ima->EfeWidth;
-        Itx = 0;
-        return 1;
-     } else
-        return 0;
-}
-
-inline bool wxPNGReaderIter::PrevByte()
-{
-  if (--Itx >= 0)
-     return 1;
-  else
-     if (--Ity >= 0)
-     {
-        IterImage -= ima->EfeWidth;
-        Itx = 0;
-        return 1;
-     } else
-        return 0;
-}
-
-inline bool wxPNGReaderIter::NextStep()
-{
-  Itx += Stepx;
-  if (Itx < ima->EfeWidth)
-     return 1;
-  else {
-     Ity += Stepy;
-     if (Ity < ima->Height)
-     {
-        IterImage += ima->EfeWidth;
-        Itx = 0;
-        return 1;
-     } else
-        return 0;
-  }
-}
-
-inline bool wxPNGReaderIter::PrevStep()
-{
-  Itx -= Stepx;
-  if (Itx >= 0)
-     return 1;
-  else {
-     Ity -= Stepy;
-     if (Ity >= 0 && Ity < ima->Height)
-     {
-        IterImage -= ima->EfeWidth;
-        Itx = 0;
-        return 1;
-     } else
-        return 0;
-  }
-}
-
-#endif
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/popupwin.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/popupwin.h
deleted file mode 100644
index ac42cd64dd..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/popupwin.h
+++ /dev/null
@@ -1,33 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/popupwin.h
-// Purpose:     wxPopupWindow class for wxMac
-// Author:      Stefan Csomor
-// Modified by:
-// Created:
-// Copyright:   (c) 2006 Stefan Csomor
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_POPUPWIN_H_
-#define _WX_MAC_POPUPWIN_H_
-
-// ----------------------------------------------------------------------------
-// wxPopupWindow
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase
-{
-public:
-    wxPopupWindow() { }
-    ~wxPopupWindow();
-
-    wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
-        { (void)Create(parent, flags); }
-
-    bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow)
-};
-
-#endif // _WX_MAC_POPUPWIN_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/printdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/printdlg.h
deleted file mode 100644
index d2601eccbe..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/printdlg.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/printdlg.h
-// Purpose:     wxPrintDialog, wxPageSetupDialog classes.
-//              Use generic, PostScript version if no
-//              platform-specific implementation.
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRINTDLG_H_
-#define _WX_PRINTDLG_H_
-
-#include "wx/dialog.h"
-#include "wx/cmndata.h"
-#include "wx/printdlg.h"
-#include "wx/prntbase.h"
-
-/*
- * wxMacPrintDialog
- * The Mac dialog for printing
- */
-
-class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLIMPEXP_CORE wxMacPrintDialog: public wxPrintDialogBase
-{
-public:
-    wxMacPrintDialog();
-    wxMacPrintDialog(wxWindow *parent, wxPrintDialogData* data = NULL);
-    wxMacPrintDialog(wxWindow *parent, wxPrintData* data );
-    virtual ~wxMacPrintDialog();
-
-    bool Create(wxWindow *parent, wxPrintDialogData* data = NULL);
-    virtual int ShowModal();
-
-    virtual wxPrintDialogData& GetPrintDialogData() { return m_printDialogData; }
-    virtual wxPrintData& GetPrintData() { return m_printDialogData.GetPrintData(); }
-    virtual wxDC *GetPrintDC();
-
-private:
-    wxPrintDialogData   m_printDialogData;
-    wxDC*               m_printerDC;
-    bool                m_destroyDC;
-    wxWindow*           m_dialogParent;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxPrintDialog)
-};
-
-/*
- * wxMacPageSetupDialog
- * The Mac page setup dialog
- */
-
-class WXDLLIMPEXP_CORE wxMacPageSetupDialog: public wxPageSetupDialogBase
-{
-public:
-    wxMacPageSetupDialog(wxWindow *parent, wxPageSetupDialogData *data = NULL);
-    virtual ~wxMacPageSetupDialog();
-
-    virtual wxPageSetupDialogData& GetPageSetupDialogData();
-
-    bool Create(wxWindow *parent, wxPageSetupDialogData *data = NULL);
-    virtual int ShowModal();
-
-private:
-    wxPageSetupDialogData   m_pageSetupData;
-    wxWindow*               m_dialogParent;
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageSetupDialog)
-};
-
-class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
-
-/*
-* wxMacPageMarginsDialog
-* A Mac dialog for setting the page margins separately from page setup since
-* (native) wxMacPageSetupDialog doesn't let you set margins.
-*/
-
-class WXDLLIMPEXP_CORE wxMacPageMarginsDialog : public wxDialog
-{
-public:
-    wxMacPageMarginsDialog(wxFrame* parent, wxPageSetupDialogData* data);
-    bool TransferToWindow();
-    bool TransferDataFromWindow();
-
-    virtual wxPageSetupDialogData& GetPageSetupDialogData() { return *m_pageSetupDialogData; }
-
-private:
-    wxPageSetupDialogData* m_pageSetupDialogData;
-
-    wxPoint m_MinMarginTopLeft;
-    wxPoint m_MinMarginBottomRight;
-    wxTextCtrl *m_LeftMargin;
-    wxTextCtrl *m_TopMargin;
-    wxTextCtrl *m_RightMargin;
-    wxTextCtrl *m_BottomMargin;
-
-    void GetMinMargins();
-    bool CheckValue(wxTextCtrl* textCtrl, int *value, int minValue, const wxString& name);
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxMacPageMarginsDialog)
-};
-
-
-#endif    // _WX_PRINTDLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/printmac.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/printmac.h
deleted file mode 100644
index fb68fd8d5f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/printmac.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/printmac.h
-// Purpose:     wxWindowsPrinter, wxWindowsPrintPreview classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     01/02/97
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRINTWIN_H_
-#define _WX_PRINTWIN_H_
-
-#include "wx/prntbase.h"
-
-/*
- * Represents the printer: manages printing a wxPrintout object
- */
-
-class WXDLLIMPEXP_CORE wxMacPrinter: public wxPrinterBase
-{
-  DECLARE_DYNAMIC_CLASS(wxMacPrinter)
-
- public:
-    wxMacPrinter(wxPrintDialogData *data = NULL);
-    virtual ~wxMacPrinter();
-
-    virtual bool Print(wxWindow *parent,
-                       wxPrintout *printout,
-                       bool prompt = true);
-    virtual wxDC* PrintDialog(wxWindow *parent);
-  virtual bool Setup(wxWindow *parent);
-
-};
-
-/*
- * wxPrintPreview
- * Programmer creates an object of this class to preview a wxPrintout.
- */
-
-class WXDLLIMPEXP_CORE wxMacPrintPreview: public wxPrintPreviewBase
-{
-  DECLARE_CLASS(wxMacPrintPreview)
-
- public:
-    wxMacPrintPreview(wxPrintout *printout,
-                          wxPrintout *printoutForPrinting = NULL,
-                          wxPrintDialogData *data = NULL);
-    wxMacPrintPreview(wxPrintout *printout,
-                          wxPrintout *printoutForPrinting,
-                          wxPrintData *data);
-    virtual ~wxMacPrintPreview();
-
-  virtual bool Print(bool interactive);
-    virtual void DetermineScaling();
-};
-
-#endif
-    // _WX_PRINTWIN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/private.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/private.h
deleted file mode 100644
index 5b33475f99..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/private.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _WX_PRIVATE_OSX_H_
-#define _WX_PRIVATE_OSX_H_
-
-#include "wx/osx/core/private.h"
-
-#if wxOSX_USE_IPHONE
-    #include "wx/osx/iphone/private.h"
-#elif wxOSX_USE_CARBON
-    #include "wx/osx/carbon/private.h"
-#elif wxOSX_USE_COCOA
-    #include "wx/osx/cocoa/private.h"
-#elif wxUSE_GUI
-    #error "Must include wx/defs.h first"
-#endif
-
-#endif
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/private/glgrab.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/private/glgrab.h
deleted file mode 100644
index a3ceabe689..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/private/glgrab.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <CoreFoundation/CoreFoundation.h>
-
-#if defined __cplusplus
-    extern "C" {
-#endif
-
-    CF_RETURNS_RETAINED CGImageRef grabViaOpenGL(CGDirectDisplayID display,
-                             CGRect srcRect);
-
-#if defined __cplusplus
-    }
-#endif
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/private/print.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/private/print.h
deleted file mode 100644
index 6f33d3ba17..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/private/print.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef __WXMAC_CLASSIC__
-#include "wx/osx/classic/private/print.h"
-#else
-#include "wx/osx/carbon/private/print.h"
-#endif
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/private/timer.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/private/timer.h
deleted file mode 100644
index cd990764c3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/private/timer.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* common warning snippet for all osx direct includes */
-
-#ifndef wxOSX_USE_CARBON
-#error "this files should only be included after platform.h was included"
-#endif
-
-#if 1 // revert to wxOSX_USE_COCOA_OR_IPHONE in case of problems
-    #include "wx/osx/core/private/timer.h"
-#elif wxOSX_USE_CARBON
-    #include "wx/osx/carbon/private/timer.h"
-#endif
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/radiobox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/radiobox.h
deleted file mode 100644
index f591a7df9b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/radiobox.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/radiobox.h
-// Purpose:     wxRadioBox class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RADIOBOX_H_
-#define _WX_RADIOBOX_H_
-
-// List box item
-class WXDLLIMPEXP_FWD_CORE wxBitmap ;
-
-class WXDLLIMPEXP_FWD_CORE wxRadioButton ;
-
-class WXDLLIMPEXP_CORE wxRadioBox: public wxControl, public wxRadioBoxBase
-{
-    DECLARE_DYNAMIC_CLASS(wxRadioBox)
-public:
-// Constructors & destructor
-    wxRadioBox();
-    inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
-             const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-             int n = 0, const wxString choices[] = NULL,
-             int majorDim = 0, long style = wxRA_SPECIFY_COLS,
-             const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr)
-        {
-            Create(parent, id, title, pos, size, n, choices, majorDim, style, val, name);
-        }
-    inline wxRadioBox(wxWindow *parent, wxWindowID id, const wxString& title,
-             const wxPoint& pos, const wxSize& size,
-             const wxArrayString& choices,
-             int majorDim = 0, long style = wxRA_SPECIFY_COLS,
-             const wxValidator& val = wxDefaultValidator,
-             const wxString& name = wxRadioBoxNameStr)
-     {
-         Create(parent, id, title, pos, size, choices,
-                majorDim, style, val, name);
-     }
-    virtual ~wxRadioBox();
-    bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
-             const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-             int n = 0, const wxString choices[] = NULL,
-             int majorDim = 0, long style = wxRA_SPECIFY_COLS,
-             const wxValidator& val = wxDefaultValidator, const wxString& name = wxRadioBoxNameStr);
-    bool Create(wxWindow *parent, wxWindowID id, const wxString& title,
-             const wxPoint& pos, const wxSize& size,
-             const wxArrayString& choices,
-             int majorDim = 0, long style = wxRA_SPECIFY_COLS,
-             const wxValidator& val = wxDefaultValidator,
-             const wxString& name = wxRadioBoxNameStr);
-
-    // Enabling
-    virtual bool Enable(bool enable = true);
-    virtual bool Enable(unsigned int item, bool enable = true);
-    virtual bool IsItemEnabled(unsigned int item) const;
-
-    // Showing
-    virtual bool Show(bool show = true);
-    virtual bool Show(unsigned int item, bool show = true);
-    virtual bool IsItemShown(unsigned int item) const;
-
-    // Specific functions (in wxWidgets2 reference)
-    virtual void SetSelection(int item);
-    virtual int GetSelection() const;
-
-    virtual unsigned int GetCount() const { return m_noItems; }
-
-    virtual wxString GetString(unsigned int item) const;
-    virtual void SetString(unsigned int item, const wxString& label);
-
-    virtual wxString GetLabel() const;
-    virtual void SetLabel(const wxString& label) ;
-
-    // protect native font of box
-    virtual bool SetFont( const wxFont &font );
-// Other external functions
-    void Command(wxCommandEvent& event);
-    void SetFocus();
-
-// Other variable access functions
-    inline int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
-    inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
-
-    void OnRadioButton( wxCommandEvent& event ) ;
-
-protected:
-    // resolve ambiguity in base classes
-    virtual wxBorder GetDefaultBorder() const { return wxRadioBoxBase::GetDefaultBorder(); }
-
-    wxRadioButton    *m_radioButtonCycle;
-
-    unsigned int      m_noItems;
-    int               m_noRowsOrCols;
-
-// Internal functions
-    virtual wxSize DoGetBestSize() const ;
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
-    // _WX_RADIOBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/radiobut.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/radiobut.h
deleted file mode 100644
index 649a544c3c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/radiobut.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/radiobut.h
-// Purpose:     wxRadioButton class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     01/02/97
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RADIOBUT_H_
-#define _WX_RADIOBUT_H_
-
-class WXDLLIMPEXP_CORE wxRadioButton: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxRadioButton)
- protected:
-public:
-    inline wxRadioButton() {}
-    inline wxRadioButton(wxWindow *parent, wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxRadioButtonNameStr)
-    {
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-    virtual ~wxRadioButton();
-
-    bool Create(wxWindow *parent, wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxRadioButtonNameStr);
-
-    virtual void SetValue(bool val);
-    virtual bool GetValue() const ;
-
-    // implementation
-
-    void Command(wxCommandEvent& event);
-    wxRadioButton *AddInCycle(wxRadioButton *cycle);
-    void RemoveFromCycle();
-    inline wxRadioButton *NextInCycle() {return m_cycle;}
-
-    // osx specific event handling common for all osx-ports
-
-    virtual bool        OSXHandleClicked( double timestampsec );
-  protected:
-
-    wxRadioButton *m_cycle;
-};
-
-// Not implemented
-#if 0
-class WXDLLIMPEXP_FWD_CORE wxBitmap ;
-
-WXDLLIMPEXP_DATA_CORE(extern const wxChar) wxBitmapRadioButtonNameStr[];
-
-class WXDLLIMPEXP_CORE wxBitmapRadioButton: public wxRadioButton
-{
-  DECLARE_DYNAMIC_CLASS(wxBitmapRadioButton)
- protected:
-  wxBitmap *theButtonBitmap;
- public:
-  inline wxBitmapRadioButton() { theButtonBitmap = NULL; }
-  inline wxBitmapRadioButton(wxWindow *parent, wxWindowID id,
-           const wxBitmap *label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxBitmapRadioButtonNameStr)
-  {
-      Create(parent, id, label, pos, size, style, validator, name);
-  }
-
-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxBitmap *label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize, long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxBitmapRadioButtonNameStr);
-
-  virtual void SetLabel(const wxBitmap *label);
-  virtual void SetValue(bool val) ;
-  virtual bool GetValue() const ;
-};
-#endif
-
-#endif
-    // _WX_RADIOBUT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/region.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/region.h
deleted file mode 100644
index e085282079..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/region.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#if wxOSX_USE_COCOA_OR_CARBON
-#include "wx/osx/carbon/region.h"
-#else
-#define wxRegionGeneric wxRegion
-#define wxRegionIteratorGeneric wxRegionIterator
-
-#include "wx/generic/region.h"
-#endif
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/scrolbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/scrolbar.h
deleted file mode 100644
index 2115ca5479..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/scrolbar.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/scrolbar.h
-// Purpose:     wxScrollBar class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SCROLBAR_H_
-#define _WX_SCROLBAR_H_
-
-// Scrollbar item
-class WXDLLIMPEXP_CORE wxScrollBar : public wxScrollBarBase
-{
-public:
-    wxScrollBar() { m_pageSize = 0; m_viewSize = 0; m_objectSize = 0; }
-    virtual ~wxScrollBar();
-
-    wxScrollBar(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxSB_HORIZONTAL,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxScrollBarNameStr)
-    {
-        Create(parent, id, pos, size, style, validator, name);
-    }
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxSB_HORIZONTAL,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxScrollBarNameStr);
-
-    virtual int GetThumbPosition() const ;
-    virtual int GetThumbSize() const { return m_viewSize; }
-    virtual int GetPageSize() const { return m_pageSize; }
-    virtual int GetRange() const { return m_objectSize; }
-
-    virtual void SetThumbPosition(int viewStart);
-    virtual void SetScrollbar(int position, int thumbSize, int range,
-            int pageSize, bool refresh = true);
-
-    // needed for RTTI
-    void SetThumbSize( int s ) { SetScrollbar( GetThumbPosition() , s , GetRange() , GetPageSize() , true ) ; }
-    void SetPageSize( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , GetRange() , s , true ) ; }
-    void SetRange( int s ) { SetScrollbar( GetThumbPosition() , GetThumbSize() , s , GetPageSize() , true ) ; }
-
-        // implementation only from now on
-    void Command(wxCommandEvent& event);
-    virtual void TriggerScrollEvent( wxEventType scrollEvent ) ;
-    virtual bool OSXHandleClicked( double timestampsec );
-protected:
-    virtual wxSize DoGetBestSize() const;
-
-    int m_pageSize;
-    int m_viewSize;
-    int m_objectSize;
-
-    DECLARE_DYNAMIC_CLASS(wxScrollBar)
-    DECLARE_EVENT_TABLE()
-};
-
-#endif // _WX_SCROLBAR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/setup.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/setup.h
deleted file mode 100644
index 1fd47f6c16..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/setup.h
+++ /dev/null
@@ -1,1558 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/setup.h
-// Purpose:     Configuration for the library
-// Author:      Stefan Csomor
-// Modified by: Stefan Csomor
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SETUP_H_
-#define _WX_SETUP_H_
-
-
-/* --- start common options --- */
-// ----------------------------------------------------------------------------
-// global settings
-// ----------------------------------------------------------------------------
-
-// define this to 0 when building wxBase library - this can also be done from
-// makefile/project file overriding the value here
-#ifndef wxUSE_GUI
-    #define wxUSE_GUI            1
-#endif // wxUSE_GUI
-
-// ----------------------------------------------------------------------------
-// compatibility settings
-// ----------------------------------------------------------------------------
-
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
-// This setting determines the compatibility with 2.8 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
-
-// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
-// default system font is used for wxWindow::GetCharWidth/Height() instead of
-// the current font.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxDIALOG_UNIT_COMPATIBILITY   0
-
-// ----------------------------------------------------------------------------
-// debugging settings
-// ----------------------------------------------------------------------------
-
-// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no
-// need to define it here. You may do it for two reasons: either completely
-// disable/compile out the asserts in release version (then do it inside #ifdef
-// NDEBUG) or, on the contrary, enable more asserts, including the usually
-// disabled ones, in the debug build (then do it inside #ifndef NDEBUG)
-//
-// #ifdef NDEBUG
-//  #define wxDEBUG_LEVEL 0
-// #else
-//  #define wxDEBUG_LEVEL 2
-// #endif
-
-// wxHandleFatalExceptions() may be used to catch the program faults at run
-// time and, instead of terminating the program with a usual GPF message box,
-// call the user-defined wxApp::OnFatalException() function. If you set
-// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work.
-//
-// This setting is for Win32 only and can only be enabled if your compiler
-// supports Win32 structured exception handling (currently only VC++ does)
-//
-// Default is 1
-//
-// Recommended setting: 1 if your compiler supports it.
-#define wxUSE_ON_FATAL_EXCEPTION 1
-
-// Set this to 1 to be able to generate a human-readable (unlike
-// machine-readable minidump created by wxCrashReport::Generate()) stack back
-// trace when your program crashes using wxStackWalker
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_STACKWALKER 1
-
-// Set this to 1 to compile in wxDebugReport class which allows you to create
-// and optionally upload to your web site a debug report consisting of back
-// trace of the crash (if wxUSE_STACKWALKER == 1) and other information.
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, it is compiled into a separate library so there
-//                         is no overhead if you don't use it
-#define wxUSE_DEBUGREPORT 1
-
-// Generic comment about debugging settings: they are very useful if you don't
-// use any other memory leak detection tools such as Purify/BoundsChecker, but
-// are probably redundant otherwise. Also, Visual C++ CRT has the same features
-// as wxWidgets memory debugging subsystem built in since version 5.0 and you
-// may prefer to use it instead of built in memory debugging code because it is
-// faster and more fool proof.
-//
-// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG
-// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0)
-// and if __NO_VC_CRTDBG__ is not defined.
-
-// The rest of the options in this section are obsolete and not supported,
-// enable them at your own risk.
-
-// If 1, enables wxDebugContext, for writing error messages to file, etc. If
-// __WXDEBUG__ is not defined, will still use the normal memory operators.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_CONTEXT 0
-
-// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF*
-// __WXDEBUG__ is also defined.
-//
-// WARNING: this code may not work with all architectures, especially if
-// alignment is an issue. This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 1 if you are not using a memory debugging tool, else 0
-#define wxUSE_MEMORY_TRACING 0
-
-// In debug mode, cause new and delete to be redefined globally.
-// If this causes problems (e.g. link errors which is a common problem
-// especially if you use another library which also redefines the global new
-// and delete), set this to 0.
-// This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
-
-// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
-// this causes problems (e.g. link errors), set this to 0. You may need to set
-// this to 0 if using templates (at least for VC++). This switch is currently
-// ignored for MinGW/Cygwin.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_NEW_ALWAYS 0
-
-
-// ----------------------------------------------------------------------------
-// Unicode support
-// ----------------------------------------------------------------------------
-
-// These settings are obsolete: the library is always built in Unicode mode
-// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if
-// absolutely necessary -- updating it is strongly recommended as the ANSI mode
-// will disappear completely in future wxWidgets releases.
-#ifndef wxUSE_UNICODE
-    #define wxUSE_UNICODE 1
-#endif
-
-// wxUSE_WCHAR_T is required by wxWidgets now, don't change.
-#define wxUSE_WCHAR_T 1
-
-// ----------------------------------------------------------------------------
-// global features
-// ----------------------------------------------------------------------------
-
-// Compile library in exception-safe mode? If set to 1, the library will try to
-// behave correctly in presence of exceptions (even though it still will not
-// use the exceptions itself) and notify the user code about any unhandled
-// exceptions. If set to 0, propagation of the exceptions through the library
-// code will lead to undefined behaviour -- but the code itself will be
-// slightly smaller and faster.
-//
-// Note that like wxUSE_THREADS this option is automatically set to 0 if
-// wxNO_EXCEPTIONS is defined.
-//
-// Default is 1
-//
-// Recommended setting: depends on whether you intend to use C++ exceptions
-//                      in your own code (1 if you do, 0 if you don't)
-#define wxUSE_EXCEPTIONS    1
-
-// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
-//
-// Default is 0
-//
-// Recommended setting: 0 (this is still work in progress...)
-#define wxUSE_EXTENDED_RTTI 0
-
-// Support for message/error logging. This includes wxLogXXX() functions and
-// wxLog and derived classes. Don't set this to 0 unless you really know what
-// you are doing.
-//
-// Default is 1
-//
-// Recommended setting: 1 (always)
-#define wxUSE_LOG 1
-
-// Recommended setting: 1
-#define wxUSE_LOGWINDOW 1
-
-// Recommended setting: 1
-#define wxUSE_LOGGUI 1
-
-// Recommended setting: 1
-#define wxUSE_LOG_DIALOG 1
-
-// Support for command line parsing using wxCmdLineParser class.
-//
-// Default is 1
-//
-// Recommended setting: 1 (can be set to 0 if you don't use the cmd line)
-#define wxUSE_CMDLINE_PARSER 1
-
-// Support for multithreaded applications: if 1, compile in thread classes
-// (thread.h) and make the library a bit more thread safe. Although thread
-// support is quite stable by now, you may still consider recompiling the
-// library without it if you have no use for it - this will result in a
-// somewhat smaller and faster operation.
-//
-// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset
-// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in
-// build/msw/config.* file this value will have no effect.
-//
-// Default is 1
-//
-// Recommended setting: 0 unless you do plan to develop MT applications
-#define wxUSE_THREADS 1
-
-// If enabled, compiles wxWidgets streams classes
-//
-// wx stream classes are used for image IO, process IO redirection, network
-// protocols implementation and much more and so disabling this results in a
-// lot of other functionality being lost.
-//
-// Default is 1
-//
-// Recommended setting: 1 as setting it to 0 disables many other things
-#define wxUSE_STREAMS       1
-
-// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf.
-// Note that if the system's implementation does not support positional
-// parameters, setting this to 1 forces the use of the wxWidgets implementation
-// of wxVsnprintf. The standard vsnprintf() supports positional parameters on
-// many Unix systems but usually doesn't under Windows.
-//
-// Positional parameters are very useful when translating a program since using
-// them in formatting strings allow translators to correctly reorder the
-// translated sentences.
-//
-// Default is 1
-//
-// Recommended setting: 1 if you want to support multiple languages
-#define wxUSE_PRINTF_POS_PARAMS      1
-
-// Enable the use of compiler-specific thread local storage keyword, if any.
-// This is used for wxTLS_XXX() macros implementation and normally should use
-// the compiler-provided support as it's simpler and more efficient, but is
-// disabled under Windows in wx/msw/chkconf.h as it can't be used if wxWidgets
-// is used in a dynamically loaded Win32 DLL (i.e. using LoadLibrary()) under
-// XP as this triggers a bug in compiler TLS support that results in crashes
-// when any TLS variables are used.
-//
-// If you're absolutely sure that your build of wxWidgets is never going to be
-// used in such situation, either because it's not going to be linked from any
-// kind of plugin or because you only target Vista or later systems, you can
-// set this to 2 to force the use of compiler TLS even under MSW.
-//
-// Default is 1 meaning that compiler TLS is used only if it's 100% safe.
-//
-// Recommended setting: 2 if you want to have maximal performance and don't
-// care about the scenario described above.
-#define wxUSE_COMPILER_TLS 1
-
-// ----------------------------------------------------------------------------
-// Interoperability with the standard library.
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_STL to 1 to enable maximal interoperability with the standard
-// library, even at the cost of backwards compatibility.
-//
-// Default is 0
-//
-// Recommended setting: 0 as the options below already provide a relatively
-// good level of interoperability and changing this option arguably isn't worth
-// diverging from the official builds of the library.
-#define wxUSE_STL 0
-
-// This is not a real option but is used as the default value for
-// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS.
-//
-// Currently the Digital Mars and Watcom compilers come without standard C++
-// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have
-// them (e.g. from STLPort).
-//
-// VC++ 5.0 does include standard C++ library headers, however they produce
-// many warnings that can't be turned off when compiled at warning level 4.
-#if defined(__DMC__) || defined(__WATCOMC__) \
-        || (defined(_MSC_VER) && _MSC_VER < 1200)
-    #define wxUSE_STD_DEFAULT  0
-#else
-    #define wxUSE_STD_DEFAULT  1
-#endif
-
-// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<>
-// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but
-// usually more limited) implementations are used which allows to avoid the
-// dependency on the C++ run-time library.
-//
-// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't
-// support using standard containers and that VC6 needs non-default options for
-// such build to avoid getting "fatal error C1076: compiler limit : internal
-// heap limit reached; use /Zm to specify a higher limit" in its own standard
-// headers, so you need to ensure you do increase the heap size before enabling
-// this option for this compiler.
-//
-// Default is 0 for compatibility reasons.
-//
-// Recommended setting: 1 unless compatibility with the official wxWidgets
-// build and/or the existing code is a concern.
-#define wxUSE_STD_CONTAINERS 0
-
-// Use standard C++ streams if 1 instead of wx streams in some places. If
-// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
-// standard streams library.
-//
-// Notice that enabling this does not replace wx streams with std streams
-// everywhere, in a lot of places wx streams are used no matter what.
-//
-// Default is 1 if compiler supports it.
-//
-// Recommended setting: 1 if you use the standard streams anyhow and so
-//                      dependency on the standard streams library is not a
-//                      problem
-#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
-
-// Enable minimal interoperability with the standard C++ string class if 1.
-// "Minimal" means that wxString can be constructed from std::string or
-// std::wstring but can't be implicitly converted to them. You need to enable
-// the option below for the latter.
-//
-// Default is 1 for most compilers.
-//
-// Recommended setting: 1 unless you want to ensure your program doesn't use
-//                      the standard C++ library at all.
-#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
-
-// Make wxString as much interchangeable with std::[w]string as possible, in
-// particular allow implicit conversion of wxString to either of these classes.
-// This comes at a price (or a benefit, depending on your point of view) of not
-// allowing implicit conversion to "const char *" and "const wchar_t *".
-//
-// Because a lot of existing code relies on these conversions, this option is
-// disabled by default but can be enabled for your build if you don't care
-// about compatibility.
-//
-// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled.
-//
-// Recommended setting: 0 to remain compatible with the official builds of
-// wxWidgets.
-#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
-
-// VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
-// them. Set this option to 1 to use <iostream.h>, 0 to use <iostream>.
-//
-// Note that newer compilers (including VC++ 7.1 and later) don't support
-// wxUSE_IOSTREAMH == 1 and so <iostream> will be used anyhow.
-//
-// Default is 0.
-//
-// Recommended setting: 0, only set to 1 if you use a really old compiler
-#define wxUSE_IOSTREAMH     0
-
-
-// ----------------------------------------------------------------------------
-// non GUI features selection
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit
-// integer which is implemented in terms of native 64 bit integers if any or
-// uses emulation otherwise.
-//
-// This class is required by wxDateTime and so you should enable it if you want
-// to use wxDateTime. For most modern platforms, it will use the native 64 bit
-// integers in which case (almost) all of its functions are inline and it
-// almost does not take any space, so there should be no reason to switch it
-// off.
-//
-// Recommended setting: 1
-#define wxUSE_LONGLONG      1
-
-// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for
-// storing binary data in wxConfig on most platforms.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_BASE64        1
-
-// Set this to 1 to be able to use wxEventLoop even in console applications
-// (i.e. using base library only, without GUI). This is mostly useful for
-// processing socket events but is also necessary to use timers in console
-// applications
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_CONSOLE_EVENTLOOP 1
-
-// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level
-// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions.
-//
-// Default is 1
-//
-// Recommended setting: 1 (wxFile is highly recommended as it is required by
-// i18n code, wxFileConfig and others)
-#define wxUSE_FILE          1
-#define wxUSE_FFILE         1
-
-// Use wxFSVolume class providing access to the configured/active mount points
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely disabled if you don't use it)
-#define wxUSE_FSVOLUME      1
-
-// Use wxStandardPaths class which allows to retrieve some standard locations
-// in the file system
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be disabled to save space, but not much)
-#define wxUSE_STDPATHS      1
-
-// use wxTextBuffer class: required by wxTextFile
-#define wxUSE_TEXTBUFFER    1
-
-// use wxTextFile class: requires wxFile and wxTextBuffer, required by
-// wxFileConfig
-#define wxUSE_TEXTFILE      1
-
-// i18n support: _() macro, wxLocale class. Requires wxTextFile.
-#define wxUSE_INTL          1
-
-// Provide wxFoo_l() functions similar to standard foo() functions but taking
-// an extra locale parameter.
-//
-// Notice that this is fully implemented only for the systems providing POSIX
-// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary
-// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will
-// only work for the current user locale and "C" locale. You can use
-// wxHAS_XLOCALE_SUPPORT to test whether the full support is available.
-//
-// Default is 1
-//
-// Recommended setting: 1 but may be disabled if you are writing programs
-// running only in C locale anyhow
-#define wxUSE_XLOCALE       1
-
-// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which
-// allow to manipulate dates, times and time intervals. wxDateTime replaces the
-// old wxTime and wxDate classes which are still provided for backwards
-// compatibility (and implemented in terms of wxDateTime).
-//
-// Note that this class is relatively new and is still officially in alpha
-// stage because some features are not yet (fully) implemented. It is already
-// quite useful though and should only be disabled if you are aiming at
-// absolutely minimal version of the library.
-//
-// Requires: wxUSE_LONGLONG
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_DATETIME      1
-
-// Set wxUSE_TIMER to 1 to compile wxTimer class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_TIMER         1
-
-// Use wxStopWatch clas.
-//
-// Default is 1
-//
-// Recommended setting: 1 (needed by wxSocket)
-#define wxUSE_STOPWATCH     1
-
-// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FSWATCHER     1
-
-// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes
-// which allow the application to store its settings in the persistent
-// storage. Setting this to 1 will also enable on-demand creation of the
-// global config object in wxApp.
-//
-// See also wxUSE_CONFIG_NATIVE below.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG        1
-
-// If wxUSE_CONFIG is 1, you may choose to use either the native config
-// classes under Windows (using .INI files under Win16 and the registry under
-// Win32) or the portable text file format used by the config classes under
-// Unix.
-//
-// Default is 1 to use native classes. Note that you may still use
-// wxFileConfig even if you set this to 1 - just the config object created by
-// default for the applications needs will be a wxRegConfig or wxIniConfig and
-// not wxFileConfig.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG_NATIVE   1
-
-// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows
-// to connect/disconnect from the network and be notified whenever the dial-up
-// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DIALUP_MANAGER   1
-
-// Compile in classes for run-time DLL loading and function calling.
-// Required by wxUSE_DIALUP_MANAGER.
-//
-// This setting is for Win32 only
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DYNLIB_CLASS    1
-
-// experimental, don't use for now
-#define wxUSE_DYNAMIC_LOADER  1
-
-// Set to 1 to use socket classes
-#define wxUSE_SOCKETS       1
-
-// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS)
-//
-// Notice that currently setting this option under Windows will result in
-// programs which can only run on recent OS versions (with ws2_32.dll
-// installed) which is why it is disabled by default.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need IPv6 support
-#define wxUSE_IPV6          0
-
-// Set to 1 to enable virtual file systems (required by wxHTML)
-#define wxUSE_FILESYSTEM    1
-
-// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ZIP        1
-
-// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ARCHIVE    1
-
-// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_INET       1
-
-// wxArchive classes for accessing archives such as zip and tar
-#define wxUSE_ARCHIVE_STREAMS     1
-
-// Set to 1 to compile wxZipInput/OutputStream classes.
-#define wxUSE_ZIPSTREAM     1
-
-// Set to 1 to compile wxTarInput/OutputStream classes.
-#define wxUSE_TARSTREAM     1
-
-// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
-// wxUSE_LIBPNG
-#define wxUSE_ZLIB          1
-
-// If enabled, the code written by Apple will be used to write, in a portable
-// way, float on the disk. See extended.c for the license which is different
-// from wxWidgets one.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you don't like the license terms (unlikely)
-#define wxUSE_APPLE_IEEE          1
-
-// Joystick support class
-#define wxUSE_JOYSTICK            1
-
-// wxFontEnumerator class
-#define wxUSE_FONTENUM 1
-
-// wxFontMapper class
-#define wxUSE_FONTMAP 1
-
-// wxMimeTypesManager class
-#define wxUSE_MIMETYPE 1
-
-// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
-// or wxURL you need to set this to 1.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_PROTOCOL 1
-
-// The settings for the individual URL schemes
-#define wxUSE_PROTOCOL_FILE 1
-#define wxUSE_PROTOCOL_FTP 1
-#define wxUSE_PROTOCOL_HTTP 1
-
-// Define this to use wxURL class.
-#define wxUSE_URL 1
-
-// Define this to use native platform url and protocol support.
-// Currently valid only for MS-Windows.
-// Note: if you set this to 1, you can open ftp/http/gopher sites
-// and obtain a valid input stream for these sites
-// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0.
-// Doing so reduces the code size.
-//
-// This code is experimental and subject to change.
-#define wxUSE_URL_NATIVE 0
-
-// Support for wxVariant class used in several places throughout the library,
-// notably in wxDataViewCtrl API.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size as much as
-// possible in which case setting this to 0 can gain up to 100KB.
-#define wxUSE_VARIANT 1
-
-// Support for wxAny class, the successor for wxVariant.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size by a small amount,
-// or your compiler cannot for some reason cope with complexity of templates used.
-#define wxUSE_ANY 1
-
-// Support for regular expression matching via wxRegEx class: enable this to
-// use POSIX regular expressions in your code. You need to compile regex
-// library from src/regex to use it under Windows.
-//
-// Default is 0
-//
-// Recommended setting: 1 if your compiler supports it, if it doesn't please
-// contribute us a makefile for src/regex for it
-#define wxUSE_REGEX       1
-
-// wxSystemOptions class
-#define wxUSE_SYSTEM_OPTIONS 1
-
-// wxSound class
-#define wxUSE_SOUND      1
-
-// Use wxMediaCtrl
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_MEDIACTRL     1
-
-// Use wxWidget's XRC XML-based resource system.  Recommended.
-//
-// Default is 1
-//
-// Recommended setting: 1 (requires wxUSE_XML)
-#define wxUSE_XRC       1
-
-// XML parsing classes. Note that their API will change in the future, so
-// using wxXmlDocument and wxXmlNode in your app is not recommended.
-//
-// Default is the same as wxUSE_XRC, i.e. 1 by default.
-//
-// Recommended setting: 1 (required by XRC)
-#define wxUSE_XML       wxUSE_XRC
-
-// Use wxWidget's AUI docking system
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_AUI       1
-
-// Use wxWidget's Ribbon classes for interfaces
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_RIBBON    1
-
-// Use wxPropertyGrid.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_PROPGRID  1
-
-// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STC 1
-
-// Use wxWidget's web viewing classes
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_WEBVIEW 1
-
-// Use the IE wxWebView backend
-//
-// Default is 1 on MSW
-//
-// Recommended setting: 1
-#ifdef __WXMSW__
-#define wxUSE_WEBVIEW_IE 1
-#else
-#define wxUSE_WEBVIEW_IE 0
-#endif
-
-// Use the WebKit wxWebView backend
-//
-// Default is 1 on GTK and OSX
-//
-// Recommended setting: 1
-#if defined(__WXGTK__) || defined(__WXOSX__)
-#define wxUSE_WEBVIEW_WEBKIT 1
-#else
-#define wxUSE_WEBVIEW_WEBKIT 0
-#endif
-
-// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
-// 2D drawing API.  (Still somewhat experimental)
-//
-// Please note that on Windows gdiplus.dll is loaded dynamically which means
-// that nothing special needs to be done as long as you don't use
-// wxGraphicsContext at all or only use it on XP and later systems but you
-// still do need to distribute it yourself for an application using
-// wxGraphicsContext to be runnable on pre-XP systems.
-//
-// Default is 1 except if you're using a non-Microsoft compiler under Windows
-// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
-// mingw32) you may need to install the headers (and just the headers)
-// yourself. If you do, change the setting below manually.
-//
-// Recommended setting: 1 if supported by the compilation environment
-
-// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
-// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
-#ifdef _MSC_VER
-#   if _MSC_VER >= 1310
-        // MSVC7.1+ comes with new enough Platform SDK, enable
-        // wxGraphicsContext support for it
-#       define wxUSE_GRAPHICS_CONTEXT 1
-#   else
-        // MSVC 6 didn't include GDI+ headers so disable by default, enable it
-        // here if you use MSVC 6 with a newer SDK
-#       define wxUSE_GRAPHICS_CONTEXT 0
-#   endif
-#else
-    // Disable support for other Windows compilers, enable it if your compiler
-    // comes with new enough SDK or you installed the headers manually.
-    //
-    // Notice that this will be set by configure under non-Windows platforms
-    // anyhow so the value there is not important.
-#   define wxUSE_GRAPHICS_CONTEXT 0
-#endif
-
-// Enable wxGraphicsContext implementation using Cairo library.
-//
-// This is not needed under Windows and detected automatically by configure
-// under other systems, however you may set this to 1 manually if you installed
-// Cairo under Windows yourself and prefer to use it instead the native GDI+
-// implementation.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_CAIRO 0
-
-
-// ----------------------------------------------------------------------------
-// Individual GUI controls
-// ----------------------------------------------------------------------------
-
-// You must set wxUSE_CONTROLS to 1 if you are using any controls at all
-// (without it, wxControl class is not compiled)
-//
-// Default is 1
-//
-// Recommended setting: 1 (don't change except for very special programs)
-#define wxUSE_CONTROLS     1
-
-// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup().
-// Currently markup is supported only by a few controls and only some ports but
-// their number will increase with time.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you want to save on code size)
-#define wxUSE_MARKUP       1
-
-// wxPopupWindow class is a top level transient window. It is currently used
-// to implement wxTipWindow
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW)
-#define wxUSE_POPUPWIN     1
-
-// wxTipWindow allows to implement the custom tooltips, it is used by the
-// context help classes. Requires wxUSE_POPUPWIN.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0)
-#define wxUSE_TIPWINDOW    1
-
-// Each of the settings below corresponds to one wxWidgets control. They are
-// all switched on by default but may be disabled if you are sure that your
-// program (including any standard dialogs it can show!) doesn't need them and
-// if you desperately want to save some space. If you use any of these you must
-// set wxUSE_CONTROLS as well.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_ANIMATIONCTRL 1   // wxAnimationCtrl
-#define wxUSE_BANNERWINDOW  1   // wxBannerWindow
-#define wxUSE_BUTTON        1   // wxButton
-#define wxUSE_BMPBUTTON     1   // wxBitmapButton
-#define wxUSE_CALENDARCTRL  1   // wxCalendarCtrl
-#define wxUSE_CHECKBOX      1   // wxCheckBox
-#define wxUSE_CHECKLISTBOX  1   // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
-#define wxUSE_CHOICE        1   // wxChoice
-#define wxUSE_COLLPANE      1   // wxCollapsiblePane
-#define wxUSE_COLOURPICKERCTRL 1    // wxColourPickerCtrl
-#define wxUSE_COMBOBOX      1   // wxComboBox
-#define wxUSE_COMMANDLINKBUTTON 1   // wxCommandLinkButton
-#define wxUSE_DATAVIEWCTRL  1   // wxDataViewCtrl
-#define wxUSE_DATEPICKCTRL  1   // wxDatePickerCtrl
-#define wxUSE_DIRPICKERCTRL 1   // wxDirPickerCtrl
-#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox
-#define wxUSE_FILECTRL      1   // wxFileCtrl
-#define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
-#define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
-#define wxUSE_GAUGE         1   // wxGauge
-#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
-#define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
-#define wxUSE_LISTBOX       1   // wxListBox
-#define wxUSE_LISTCTRL      1   // wxListCtrl
-#define wxUSE_RADIOBOX      1   // wxRadioBox
-#define wxUSE_RADIOBTN      1   // wxRadioButton
-#define wxUSE_RICHMSGDLG    1   // wxRichMessageDialog
-#define wxUSE_SCROLLBAR     1   // wxScrollBar
-#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
-#define wxUSE_SLIDER        1   // wxSlider
-#define wxUSE_SPINBTN       1   // wxSpinButton
-#define wxUSE_SPINCTRL      1   // wxSpinCtrl
-#define wxUSE_STATBOX       1   // wxStaticBox
-#define wxUSE_STATLINE      1   // wxStaticLine
-#define wxUSE_STATTEXT      1   // wxStaticText
-#define wxUSE_STATBMP       1   // wxStaticBitmap
-#define wxUSE_TEXTCTRL      1   // wxTextCtrl
-#define wxUSE_TIMEPICKCTRL  1   // wxTimePickerCtrl
-#define wxUSE_TOGGLEBTN     1   // requires wxButton
-#define wxUSE_TREECTRL      1   // wxTreeCtrl
-#define wxUSE_TREELISTCTRL  1   // wxTreeListCtrl
-
-// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
-// below either wxStatusBar95 or a generic wxStatusBar will be used.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STATUSBAR    1
-
-// Two status bar implementations are available under Win32: the generic one
-// or the wrapper around native control. For native look and feel the native
-// version should be used.
-//
-// Default is 1 for the platforms where native status bar is supported.
-//
-// Recommended setting: 1 (there is no advantage in using the generic one)
-#define wxUSE_NATIVE_STATUSBAR        1
-
-// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
-// classes at all. Otherwise, use the native toolbar class unless
-// wxUSE_TOOLBAR_NATIVE is 0.
-//
-// Default is 1 for all settings.
-//
-// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.
-#define wxUSE_TOOLBAR 1
-#define wxUSE_TOOLBAR_NATIVE 1
-
-// wxNotebook is a control with several "tabs" located on one of its sides. It
-// may be used to logically organise the data presented to the user instead of
-// putting everything in one huge dialog. It replaces wxTabControl and related
-// classes of wxWin 1.6x.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTEBOOK 1
-
-// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_LISTBOOK 1
-
-// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CHOICEBOOK 1
-
-// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TREEBOOK 1
-
-// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of
-// tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLBOOK 1
-
-// wxTaskBarIcon is a small notification icon shown in the system toolbar or
-// dock.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be set to 0 if you don't need it)
-#define wxUSE_TASKBARICON 1
-
-// wxGrid class
-//
-// Default is 1, set to 0 to cut down compilation time and binaries size if you
-// don't use it.
-//
-// Recommended setting: 1
-//
-#define wxUSE_GRID         1
-
-// wxMiniFrame class: a frame with narrow title bar
-//
-// Default is 1.
-//
-// Recommended setting: 1 (it doesn't cost almost anything)
-#define wxUSE_MINIFRAME 1
-
-// wxComboCtrl and related classes: combobox with custom popup window and
-// not necessarily a listbox.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
-//                      it used by wxComboBox
-#define wxUSE_COMBOCTRL 1
-
-// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
-// items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0, except where it is
-//                      needed as a base class for generic wxBitmapComboBox.
-#define wxUSE_ODCOMBOBOX 1
-
-// wxBitmapComboBox is a combobox that can have images in front of text items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0
-#define wxUSE_BITMAPCOMBOBOX 1
-
-// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items
-// up and down in it. It is also used as part of wxRearrangeDialog.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 (currently used only by
-// wxHeaderCtrl)
-#define wxUSE_REARRANGECTRL 1
-
-// ----------------------------------------------------------------------------
-// Miscellaneous GUI stuff
-// ----------------------------------------------------------------------------
-
-// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
-#define wxUSE_ACCEL 1
-
-// Use the standard art provider. The icons returned by this provider are
-// embedded into the library as XPMs so disabling it reduces the library size
-// somewhat but this should only be done if you use your own custom art
-// provider returning the icons or never use any icons not provided by the
-// native art provider (which might not be implemented at all for some
-// platforms) or by the Tango icons provider (if it's not itself disabled
-// below).
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you use your own custom art provider.
-#define wxUSE_ARTPROVIDER_STD 1
-
-// Use art provider providing Tango icons: this art provider has higher quality
-// icons than the default ones using smaller size XPM icons without
-// transparency but the embedded PNG icons add to the library size.
-//
-// Default is 1 under non-GTK ports. Under wxGTK the native art provider using
-// the GTK+ stock icons replaces it so it is normally not necessary.
-//
-// Recommended setting: 1 but can be turned off to reduce the library size.
-#define wxUSE_ARTPROVIDER_TANGO 1
-
-// Hotkey support (currently Windows only)
-#define wxUSE_HOTKEY 1
-
-// Use wxCaret: a class implementing a "cursor" in a text control (called caret
-// under Windows).
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can be safely set to 0, not used by the library)
-#define wxUSE_CARET         1
-
-// Use wxDisplay class: it allows enumerating all displays on a system and
-// their geometries as well as finding the display on which the given point or
-// window lies.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
-#define wxUSE_DISPLAY       1
-
-// Miscellaneous geometry code: needed for Canvas library
-#define wxUSE_GEOMETRY            1
-
-// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
-// wxListCtrl.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (set it to 0 if you don't use any of the controls
-// enumerated above, then this class is mostly useless too)
-#define wxUSE_IMAGLIST      1
-
-// Use wxInfoBar class.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be disabled without problems as nothing
-// depends on it)
-#define wxUSE_INFOBAR       1
-
-// Use wxMenu, wxMenuBar, wxMenuItem.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can't be disabled under MSW)
-#define wxUSE_MENUS         1
-
-// Use wxNotificationMessage.
-//
-// wxNotificationMessage allows to show non-intrusive messages to the user
-// using balloons, banners, popups or whatever is the appropriate method for
-// the current platform.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTIFICATION_MESSAGE 1
-
-// wxPreferencesEditor provides a common API for different ways of presenting
-// the standard "Preferences" or "Properties" dialog under different platforms
-// (e.g. some use modal dialogs, some use modeless ones; some apply the changes
-// immediately while others require an explicit "Apply" button).
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_PREFERENCES_EDITOR 1
-
-// wxRichToolTip is a customizable tooltip class which has more functionality
-// than the stock (but native, unlike this class) wxToolTip.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely set to 0 if you don't need it)
-#define wxUSE_RICHTOOLTIP 1
-
-// Use wxSashWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SASH          1
-
-// Use wxSplitterWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SPLITTER      1
-
-// Use wxToolTip and wxWindow::Set/GetToolTip() methods.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLTIPS      1
-
-// wxValidator class and related methods
-#define wxUSE_VALIDATORS 1
-
-// Use reference counted ID management: this means that wxWidgets will track
-// the automatically allocated ids (those used when you use wxID_ANY when
-// creating a window, menu or toolbar item &c) instead of just supposing that
-// the program never runs out of them. This is mostly useful only under wxMSW
-// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where
-// long-running programs can run into problems with ids reuse without this. On
-// the other platforms, where the ids have the full int range, this shouldn't
-// be necessary.
-#ifdef __WXMSW__
-#define wxUSE_AUTOID_MANAGEMENT 1
-#else
-#define wxUSE_AUTOID_MANAGEMENT 0
-#endif
-
-// ----------------------------------------------------------------------------
-// common dialogs
-// ----------------------------------------------------------------------------
-
-// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g.
-// file selector, printer dialog). Switching this off also switches off the
-// printing architecture and interactive wxPrinterDC.
-//
-// Default is 1
-//
-// Recommended setting: 1 (unless it really doesn't work)
-#define wxUSE_COMMON_DIALOGS 1
-
-// wxBusyInfo displays window with message when app is busy. Works in same way
-// as wxBusyCursor
-#define wxUSE_BUSYINFO      1
-
-// Use single/multiple choice dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_CHOICEDLG     1
-
-// Use colour picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_COLOURDLG     1
-
-// wxDirDlg class for getting a directory name from user
-#define wxUSE_DIRDLG 1
-
-// TODO: setting to choose the generic or native one
-
-// Use file open/save dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in many places in the library itself)
-#define wxUSE_FILEDLG       1
-
-// Use find/replace dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely set to 0)
-#define wxUSE_FINDREPLDLG       1
-
-// Use font picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_FONTDLG       1
-
-// Use wxMessageDialog and wxMessageBox.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_MSGDLG        1
-
-// progress dialog class for lengthy operations
-#define wxUSE_PROGRESSDLG 1
-
-// support for startup tips (wxShowTip &c)
-#define wxUSE_STARTUP_TIPS 1
-
-// text entry dialog and wxGetTextFromUser function
-#define wxUSE_TEXTDLG 1
-
-// number entry dialog
-#define wxUSE_NUMBERDLG 1
-
-// splash screen class
-#define wxUSE_SPLASH 1
-
-// wizards
-#define wxUSE_WIZARDDLG 1
-
-// Compile in wxAboutBox() function showing the standard "About" dialog.
-//
-// Default is 1
-//
-// Recommended setting: 1 but can be set to 0 to save some space if you don't
-//                      use this function
-#define wxUSE_ABOUTDLG 1
-
-// wxFileHistory class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FILE_HISTORY 1
-
-// ----------------------------------------------------------------------------
-// Metafiles support
-// ----------------------------------------------------------------------------
-
-// Windows supports the graphics format known as metafile which is, though not
-// portable, is widely used under Windows and so is supported by wxWin (under
-// Windows only, of course). Win16 (Win3.1) used the so-called "Window
-// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in
-// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by
-// default, WMFs will be used under Win16 and EMFs under Win32. This may be
-// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting
-// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile
-// in any metafile related classes at all.
-//
-// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS.
-//
-// Recommended setting: default or 0 for everything for portable programs.
-#define wxUSE_METAFILE              1
-#define wxUSE_ENH_METAFILE          1
-#define wxUSE_WIN_METAFILES_ALWAYS  0
-
-// ----------------------------------------------------------------------------
-// Big GUI components
-// ----------------------------------------------------------------------------
-
-// Set to 0 to disable MDI support.
-//
-// Requires wxUSE_NOTEBOOK under platforms other than MSW.
-//
-// Default is 1.
-//
-// Recommended setting: 1, can be safely set to 0.
-#define wxUSE_MDI 1
-
-// Set to 0 to disable document/view architecture
-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
-
-// Set to 0 to disable MDI document/view architecture
-//
-// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
-#define wxUSE_MDI_ARCHITECTURE    1
-
-// Set to 0 to disable print/preview architecture code
-#define wxUSE_PRINTING_ARCHITECTURE  1
-
-// wxHTML sublibrary allows to display HTML in wxWindow programs and much,
-// much more.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
-// smaller library.
-#define wxUSE_HTML          1
-
-// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
-// headers and libraries to be able to compile the library with wxUSE_GLCANVAS
-// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the
-// list of libraries used to link your application (although this is done
-// implicitly for Microsoft Visual C++ users).
-//
-// Default is 1 unless the compiler is known to ship without the necessary
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
-//
-// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
-// otherwise.
-#define wxUSE_GLCANVAS       1
-
-// wxRichTextCtrl allows editing of styled text.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 if you want compile a
-// smaller library.
-#define wxUSE_RICHTEXT       1
-
-// ----------------------------------------------------------------------------
-// Data transfer
-// ----------------------------------------------------------------------------
-
-// Use wxClipboard class for clipboard copy/paste.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CLIPBOARD     1
-
-// Use wxDataObject and related classes. Needed for clipboard and OLE drag and
-// drop
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DATAOBJ       1
-
-// Use wxDropTarget and wxDropSource classes for drag and drop (this is
-// different from "built in" drag and drop in wxTreeCtrl which is always
-// available). Requires wxUSE_DATAOBJ.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DRAG_AND_DROP 1
-
-// Use wxAccessible for enhanced and customisable accessibility.
-// Depends on wxUSE_OLE.
-//
-// Default is 0.
-//
-// Recommended setting (at present): 0
-#define wxUSE_ACCESSIBILITY 0
-
-// ----------------------------------------------------------------------------
-// miscellaneous settings
-// ----------------------------------------------------------------------------
-
-// wxSingleInstanceChecker class allows to verify at startup if another program
-// instance is running.
-//
-// Default is 1
-//
-// Recommended setting: 1 (the class is tiny, disabling it won't save much
-// space)
-#define wxUSE_SNGLINST_CHECKER  1
-
-#define wxUSE_DRAGIMAGE 1
-
-#define wxUSE_IPC         1
-                                // 0 for no interprocess comms
-#define wxUSE_HELP        1
-                                // 0 for no help facility
-
-// Should we use MS HTML help for wxHelpController? If disabled, neither
-// wxCHMHelpController nor wxBestHelpController are available.
-//
-// Default is 1 under MSW, 0 is always used for the other platforms.
-//
-// Recommended setting: 1, only set to 0 if you have trouble compiling
-// wxCHMHelpController (could be a problem with really ancient compilers)
-#define wxUSE_MS_HTML_HELP 1
-
-
-// Use wxHTML-based help controller?
-#define wxUSE_WXHTML_HELP 1
-
-#define wxUSE_CONSTRAINTS 1
-                                // 0 for no window layout constraint system
-
-#define wxUSE_SPLINES     1
-                                // 0 for no splines
-
-#define wxUSE_MOUSEWHEEL        1
-                                // Include mouse wheel support
-
-// Compile wxUIActionSimulator class?
-#define wxUSE_UIACTIONSIMULATOR 1
-
-// ----------------------------------------------------------------------------
-// wxDC classes for various output formats
-// ----------------------------------------------------------------------------
-
-// Set to 1 for PostScript device context.
-#define wxUSE_POSTSCRIPT  0
-
-// Set to 1 to use font metric files in GetTextExtent
-#define wxUSE_AFM_FOR_POSTSCRIPT 1
-
-// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
-// to create files in SVG (Scalable Vector Graphics) format.
-#define wxUSE_SVG 1
-
-// Should wxDC provide SetTransformMatrix() and related methods?
-//
-// Default is 1 but can be set to 0 if this functionality is not used. Notice
-// that currently only wxMSW supports this so setting this to 0 doesn't change
-// much for non-MSW platforms (although it will still save a few bytes
-// probably).
-//
-// Recommended setting: 1.
-#define wxUSE_DC_TRANSFORM_MATRIX 1
-
-// ----------------------------------------------------------------------------
-// image format support
-// ----------------------------------------------------------------------------
-
-// wxImage supports many different image formats which can be configured at
-// compile-time. BMP is always supported, others are optional and can be safely
-// disabled if you don't plan to use images in such format sometimes saving
-// substantial amount of code in the final library.
-//
-// Some formats require an extra library which is included in wxWin sources
-// which is mentioned if it is the case.
-
-// Set to 1 for wxImage support (recommended).
-#define wxUSE_IMAGE         1
-
-// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
-#define wxUSE_LIBPNG        1
-
-// Set to 1 for JPEG format support (requires libjpeg)
-#define wxUSE_LIBJPEG       1
-
-// Set to 1 for TIFF format support (requires libtiff)
-#define wxUSE_LIBTIFF       1
-
-// Set to 1 for TGA format support (loading only)
-#define wxUSE_TGA           1
-
-// Set to 1 for GIF format support
-#define wxUSE_GIF           1
-
-// Set to 1 for PNM format support
-#define wxUSE_PNM           1
-
-// Set to 1 for PCX format support
-#define wxUSE_PCX           1
-
-// Set to 1 for IFF format support (Amiga format)
-#define wxUSE_IFF           0
-
-// Set to 1 for XPM format support
-#define wxUSE_XPM           1
-
-// Set to 1 for MS Icons and Cursors format support
-#define wxUSE_ICO_CUR       1
-
-// Set to 1 to compile in wxPalette class
-#define wxUSE_PALETTE       1
-
-// ----------------------------------------------------------------------------
-// wxUniversal-only options
-// ----------------------------------------------------------------------------
-
-// Set to 1 to enable compilation of all themes, this is the default
-#define wxUSE_ALL_THEMES    1
-
-// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES
-// is unset, if it is set these options are not used; notice that metal theme
-// uses Win32 one
-#define wxUSE_THEME_GTK     0
-#define wxUSE_THEME_METAL   0
-#define wxUSE_THEME_MONO    0
-#define wxUSE_THEME_WIN32   0
-
-
-/* --- end common options --- */
-
-// ----------------------------------------------------------------------------
-// Unix-specific options settings
-// ----------------------------------------------------------------------------
-
-// use wxSelectDispatcher class
-#define wxUSE_SELECT_DISPATCHER 1
-
-// use wxEpollDispatcher class (Linux only)
-#define wxUSE_EPOLL_DISPATCHER 0
-
-/*
- Use GStreamer for Unix.
- 
- Default is 0 as this requires a lot of dependencies which might not be
- available.
- 
- Recommended setting: 1 (wxMediaCtrl won't work by default without it).
- */
-#define wxUSE_GSTREAMER 0
-
-// ----------------------------------------------------------------------------
-// Mac-specific settings
-// ----------------------------------------------------------------------------
-
-#undef wxUSE_GRAPHICS_CONTEXT
-#define wxUSE_GRAPHICS_CONTEXT 1
-
-
-// things not implemented under Mac
-
-#undef wxUSE_STACKWALKER
-#define wxUSE_STACKWALKER 0
-
-// wxWebKit is a wrapper for Apple's WebKit framework, use it if you want to
-// embed the Safari browser control
-// 0 by default because of Jaguar compatibility problems
-#define wxUSE_WEBKIT        1
-
-
-// Set to 0 for no libmspack
-#define wxUSE_LIBMSPACK     0
-
-// native toolbar does support embedding controls, but not complex panels, please test
-#define wxOSX_USE_NATIVE_TOOLBAR 1
-
-// make sure we have the proper dispatcher for the console event loop
-#define wxUSE_SELECT_DISPATCHER 1
-#define wxUSE_EPOLL_DISPATCHER 0
-
-
-#endif
-    // _WX_SETUP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/slider.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/slider.h
deleted file mode 100644
index bd99512dca..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/slider.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/slider.h
-// Purpose:     wxSlider class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SLIDER_H_
-#define _WX_SLIDER_H_
-
-#include "wx/control.h"
-#include "wx/slider.h"
-#include "wx/stattext.h"
-
-// Slider
-class WXDLLIMPEXP_CORE wxSlider: public wxSliderBase
-{
-    DECLARE_DYNAMIC_CLASS(wxSlider)
-
-public:
-    wxSlider();
-
-    inline wxSlider(wxWindow *parent, wxWindowID id,
-                    int value, int minValue, int maxValue,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = wxSL_HORIZONTAL,
-                    const wxValidator& validator = wxDefaultValidator,
-                    const wxString& name = wxSliderNameStr)
-    {
-        Create(parent, id, value, minValue, maxValue, pos, size, style, validator, name);
-    }
-
-    virtual ~wxSlider();
-
-    bool Create(wxWindow *parent, wxWindowID id,
-                int value, int minValue, int maxValue,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxSL_HORIZONTAL,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxSliderNameStr);
-
-    virtual int GetValue() const ;
-    virtual void SetValue(int);
-
-    void SetRange(int minValue, int maxValue);
-
-    inline int GetMin() const { return m_rangeMin; }
-    inline int GetMax() const { return m_rangeMax; }
-
-    void SetMin(int minValue) { SetRange(minValue, m_rangeMax); }
-    void SetMax(int maxValue) { SetRange(m_rangeMin, maxValue); }
-
-    // For trackbars only
-    inline int GetTickFreq() const { return m_tickFreq; }
-    void SetPageSize(int pageSize);
-    int GetPageSize() const ;
-    void ClearSel() ;
-    void ClearTicks() ;
-    void SetLineSize(int lineSize);
-    int GetLineSize() const ;
-    int GetSelEnd() const ;
-    int GetSelStart() const ;
-    void SetSelection(int minPos, int maxPos);
-    void SetThumbLength(int len) ;
-    int GetThumbLength() const ;
-    void SetTick(int tickPos) ;
-
-    void Command(wxCommandEvent& event);
-    // osx specific event handling common for all osx-ports
-
-    virtual bool OSXHandleClicked( double timestampsec );
-    virtual void TriggerScrollEvent( wxEventType scrollEvent ) ;
-
-protected:
-    // Platform-specific implementation of SetTickFreq
-    virtual void DoSetTickFreq(int freq);
-
-    virtual wxSize DoGetBestSize() const;
-    virtual void   DoSetSize(int x, int y, int w, int h, int sizeFlags);
-    virtual void   DoMoveWindow(int x, int y, int w, int h);
-
-    // set min/max size of the slider
-    virtual void DoSetSizeHints( int minW, int minH,
-                                 int maxW, int maxH,
-                                 int incW, int incH);
-
-    // Common processing to invert slider values based on wxSL_INVERSE
-    virtual int ValueInvertOrNot(int value) const;
-
-    wxStaticText*    m_macMinimumStatic ;
-    wxStaticText*    m_macMaximumStatic ;
-    wxStaticText*    m_macValueStatic ;
-
-    int           m_rangeMin;
-    int           m_rangeMax;
-    int           m_pageSize;
-    int           m_lineSize;
-    int           m_tickFreq;
-private :
-DECLARE_EVENT_TABLE()
-};
-
-#endif
-    // _WX_SLIDER_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/sound.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/sound.h
deleted file mode 100644
index f406537927..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/sound.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/sound.h
-// Purpose:     wxSound class (loads and plays short Windows .wav files).
-//              Optional on non-Windows platforms.
-// Author:      Ryan Norton, Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Ryan Norton, Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SOUND_H_
-#define _WX_SOUND_H_
-
-#if wxUSE_SOUND
-
-#include "wx/object.h"
-
-class WXDLLIMPEXP_FWD_ADV wxSoundTimer;
-
-class WXDLLIMPEXP_ADV wxSoundData
-{
-public :
-    wxSoundData();
-    virtual ~wxSoundData();
-
-    virtual bool Play(unsigned int flags) = 0;
-    // stops the sound and deletes the optional timer
-    virtual void Stop();
-    // can be called by a timer for repeated tasks during playback
-    virtual void SoundTask();
-    // mark this to be deleted
-    virtual void MarkForDeletion();
-    virtual bool IsMarkedForDeletion() const { return m_markedForDeletion; }
-
-    // does the true work of stopping and cleaning up
-    virtual void DoStop() = 0;
-protected :
-    void CreateAndStartTimer();
-
-    unsigned int m_flags;
-    wxSoundTimer* m_pTimer;
-    bool m_markedForDeletion;
-} ;
-
-class WXDLLIMPEXP_ADV wxSound : public wxSoundBase
-{
-public:
-    wxSound();
-    wxSound(const wxString& fileName, bool isResource = false);
-    wxSound(size_t size, const void* data);
-    virtual ~wxSound();
-
-    // Create from resource or file
-    bool  Create(const wxString& fileName, bool isResource = false);
-    // Create from data
-    bool Create(size_t size, const void* data);
-
-    bool IsOk() const { return m_data != NULL; }
-
-    // Stop playing any sound
-    static void Stop();
-
-    // Returns true if a sound is being played
-    static bool IsPlaying();
-
-    // Notification when a sound has stopped
-    static void SoundStopped(const wxSoundData* data);
-
-protected:
-    bool    DoPlay(unsigned flags) const;
-    void    Init();
-
-private:
-    // data of this object
-    class wxSoundData *m_data;
-
-    wxDECLARE_NO_COPY_CLASS(wxSound);
-};
-
-#endif
-#endif
-    // _WX_SOUND_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/spinbutt.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/spinbutt.h
deleted file mode 100644
index b294851f96..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/spinbutt.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/spinbutt.h
-// Purpose:     wxSpinButton class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SPINBUTT_H_
-#define _WX_SPINBUTT_H_
-
-#include "wx/control.h"
-#include "wx/event.h"
-
-/*
-    The wxSpinButton is like a small scrollbar than is often placed next
-    to a text control.
-
-    wxSP_HORIZONTAL:   horizontal spin button
-    wxSP_VERTICAL:     vertical spin button (the default)
-    wxSP_ARROW_KEYS:   arrow keys increment/decrement value
-    wxSP_WRAP:         value wraps at either end
- */
-
-class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase
-{
-public:
-    // construction
-    wxSpinButton();
-
-    wxSpinButton(wxWindow *parent,
-                 wxWindowID id = -1,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
-                 const wxString& name = wxT("wxSpinButton"))
-    {
-        Create(parent, id, pos, size, style, name);
-    }
-
-    virtual ~wxSpinButton();
-
-    bool Create(wxWindow *parent,
-                wxWindowID id = -1,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
-                const wxString& name = wxT("wxSpinButton"));
-
-
-    // accessors
-    virtual void SetRange(int minVal, int maxVal);
-    virtual int GetValue() const ;
-    virtual void SetValue(int val);
-
-    // implementation
-
-    virtual void TriggerScrollEvent( wxEventType scrollEvent ) ;
-
-    // osx specific event handling common for all osx-ports
-
-    virtual bool OSXHandleClicked( double timestampsec );
-
-protected:
-    void         SendThumbTrackEvent() ;
-
-    virtual wxSize DoGetBestSize() const;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxSpinButton)
-};
-
-#endif
-    // _WX_SPINBUTT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/srchctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/srchctrl.h
deleted file mode 100644
index ee926cf5f4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/srchctrl.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/srchctrl.h
-// Purpose:     mac carbon wxSearchCtrl class
-// Author:      Vince Harron
-// Created:     2006-02-19
-// Copyright:   Vince Harron
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SEARCHCTRL_H_
-#define _WX_SEARCHCTRL_H_
-
-#if wxUSE_SEARCHCTRL
-
-class wxSearchWidgetImpl;
-
-class WXDLLIMPEXP_CORE wxSearchCtrl : public wxSearchCtrlBase
-{
-public:
-    // creation
-    // --------
-
-    wxSearchCtrl();
-    wxSearchCtrl(wxWindow *parent, wxWindowID id,
-               const wxString& value = wxEmptyString,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxSearchCtrlNameStr);
-
-    virtual ~wxSearchCtrl();
-
-    bool Create(wxWindow *parent, wxWindowID id,
-                const wxString& value = wxEmptyString,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxSearchCtrlNameStr);
-
-    // get/set search button menu
-    // --------------------------
-    virtual void SetMenu( wxMenu* menu );
-    virtual wxMenu* GetMenu();
-
-    // get/set search options
-    // ----------------------
-    virtual void ShowSearchButton( bool show );
-    virtual bool IsSearchButtonVisible() const;
-
-    virtual void ShowCancelButton( bool show );
-    virtual bool IsCancelButtonVisible() const;
-
-    // TODO: In 2.9 these should probably be virtual, and declared in the base class...
-    void        SetDescriptiveText(const wxString& text);
-    wxString    GetDescriptiveText() const;
-
-    virtual bool    HandleSearchFieldSearchHit() ;
-    virtual bool    HandleSearchFieldCancelHit() ;
-
-    wxSearchWidgetImpl * GetSearchPeer() const;
-
-protected:
-
-    wxSize DoGetBestSize() const;
-
-    void Init();
-
-    wxMenu *m_menu;
-
-    wxString m_descriptiveText;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxSearchCtrl)
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif // wxUSE_SEARCHCTRL
-
-#endif // _WX_SEARCHCTRL_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/statbmp.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/statbmp.h
deleted file mode 100644
index 59bf91a8f0..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/statbmp.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#if wxOSX_USE_CARBON
-#include "wx/osx/carbon/statbmp.h"
-#else
-#define wxGenericStaticBitmap wxStaticBitmap
-#include "wx/generic/statbmpg.h"
-#endif
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/statbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/statbox.h
deleted file mode 100644
index 5b5f049c58..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/statbox.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/statbox.h
-// Purpose:     wxStaticBox class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_STATBOX_H_
-#define _WX_STATBOX_H_
-
-#include "wx/control.h"
-
-// Group box
-class WXDLLIMPEXP_CORE wxStaticBox: public wxControl
-{
-  DECLARE_DYNAMIC_CLASS(wxStaticBox)
-
- public:
-    inline wxStaticBox() {}
-    inline wxStaticBox(wxWindow *parent, wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = 0,
-           const wxString& name = wxStaticBoxNameStr)
-    {
-        Create(parent, id, label, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = 0,
-           const wxString& name = wxStaticBoxNameStr);
-
-    virtual void Command(wxCommandEvent& WXUNUSED(event)) {}
-    virtual void ProcessCommand(wxCommandEvent& WXUNUSED(event)) {}
-
-    virtual void GetBordersForSizer(int *borderTop, int *borderOther) const;
-
-    virtual bool AcceptsFocus() const { return false; }
-
-    // protect native font of box
-    virtual bool SetFont( const wxFont &font );
-};
-
-#endif
-    // _WX_STATBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/statline.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/statline.h
deleted file mode 100644
index bd94398239..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/statline.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/statline.h
-// Purpose:     a generic wxStaticLine class used for mac before adaptation
-// Author:      Vadim Zeitlin
-// Created:     28.06.99
-// Copyright:   (c) 1998 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GENERIC_STATLINE_H_
-#define _WX_GENERIC_STATLINE_H_
-
-class wxStaticBox;
-
-// ----------------------------------------------------------------------------
-// wxStaticLine
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
-{
-public:
-    // constructors and pseudo-constructors
-    wxStaticLine() : m_statbox(NULL) { }
-
-    wxStaticLine( wxWindow *parent,
-                  wxWindowID id = wxID_ANY,
-                  const wxPoint &pos = wxDefaultPosition,
-                  const wxSize &size = wxDefaultSize,
-                  long style = wxLI_HORIZONTAL,
-                  const wxString &name = wxStaticLineNameStr )
-        : m_statbox(NULL)
-    {
-        Create(parent, id, pos, size, style, name);
-    }
-
-    bool Create( wxWindow *parent,
-                 wxWindowID id = wxID_ANY,
-                 const wxPoint &pos = wxDefaultPosition,
-                 const wxSize &size = wxDefaultSize,
-                 long style = wxLI_HORIZONTAL,
-                 const wxString &name = wxStaticLineNameStr );
-
-    // it's necessary to override this wxWindow function because we
-    // will want to return the main widget for m_statbox
-    //
-    WXWidget GetMainWidget() const;
-
-protected:
-    // we implement the static line using a static box
-    wxStaticBox *m_statbox;
-
-    DECLARE_DYNAMIC_CLASS(wxStaticLine)
-};
-
-#endif // _WX_GENERIC_STATLINE_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/stattext.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/stattext.h
deleted file mode 100644
index 3b4b9b6637..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/stattext.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/stattext.h
-// Purpose:     wxStaticText class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_STATTEXT_H_
-#define _WX_STATTEXT_H_
-
-class WXDLLIMPEXP_CORE wxStaticText: public wxStaticTextBase
-{
-public:
-    wxStaticText() { }
-
-    wxStaticText(wxWindow *parent, wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = 0,
-           const wxString& name = wxStaticTextNameStr)
-  {
-    Create(parent, id, label, pos, size, style, name);
-  }
-
-  bool Create(wxWindow *parent, wxWindowID id,
-           const wxString& label,
-           const wxPoint& pos = wxDefaultPosition,
-           const wxSize& size = wxDefaultSize,
-           long style = 0,
-           const wxString& name = wxStaticTextNameStr);
-
-  // accessors
-  void SetLabel( const wxString &str ) ;
-  bool SetFont( const wxFont &font );
-
-    virtual bool AcceptsFocus() const { return false; }
-
-protected :
-
-    virtual wxString DoGetLabel() const;
-    virtual void DoSetLabel(const wxString& str);
-
-  virtual wxSize DoGetBestSize() const ;
-
-#if wxUSE_MARKUP && wxOSX_USE_COCOA
-    virtual bool DoSetLabelMarkup(const wxString& markup);
-#endif // wxUSE_MARKUP && wxOSX_USE_COCOA
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxStaticText)
-};
-
-#endif
-    // _WX_STATTEXT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/statusbr.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/statusbr.h
deleted file mode 100644
index 74ae67758c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/statusbr.h
+++ /dev/null
@@ -1,42 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/statusbr.h
-// Purpose:     native implementation of wxStatusBar.
-//              Optional: can use generic version instead.
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_STATBAR_H_
-#define _WX_STATBAR_H_
-
-class WXDLLIMPEXP_CORE wxStatusBarMac : public wxStatusBarGeneric
-{
-public:
-    wxStatusBarMac();
-    wxStatusBarMac(wxWindow *parent, wxWindowID id = wxID_ANY,
-           long style = wxSTB_DEFAULT_STYLE,
-           const wxString& name = wxStatusBarNameStr);
-
-    virtual ~wxStatusBarMac();
-
-    bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
-              long style = wxSTB_DEFAULT_STYLE,
-              const wxString& name = wxStatusBarNameStr);
-
-    // Implementation
-    virtual void MacHiliteChanged();
-    void OnPaint(wxPaintEvent& event);
-
-protected:
-    virtual void DrawFieldText(wxDC& dc, const wxRect& rc, int i, int textHeight);
-    virtual void DrawField(wxDC& dc, int i, int textHeight);
-    virtual void DoUpdateStatusText(int number = 0);
-
-    DECLARE_DYNAMIC_CLASS(wxStatusBarMac)
-    DECLARE_EVENT_TABLE()
-};
-
-#endif // _WX_STATBAR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/taskbarosx.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/taskbarosx.h
deleted file mode 100644
index 7d13df747e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/taskbarosx.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/////////////////////////////////////////////////////////////////////////
-// File:        wx/mac/taskbarosx.h
-// Purpose:     Defines wxTaskBarIcon class for OSX
-// Author:      Ryan Norton
-// Modified by:
-// Created:     04/04/2003
-// Copyright:   (c) Ryan Norton, 2003
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////
-
-#ifndef _TASKBAR_H_
-#define _TASKBAR_H_
-
-class WXDLLIMPEXP_FWD_CORE wxIcon;
-class WXDLLIMPEXP_FWD_CORE wxMenu;
-
-class WXDLLIMPEXP_ADV wxTaskBarIcon : public wxTaskBarIconBase
-{
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxTaskBarIcon)
-public:
-    wxTaskBarIcon(wxTaskBarIconType iconType = wxTBI_DEFAULT_TYPE);
-    virtual ~wxTaskBarIcon();
-
-    // returns true if the taskbaricon is in the global menubar
-#if wxOSX_USE_COCOA
-    bool OSXIsStatusItem();
-#else
-    bool OSXIsStatusItem() { return false; }
-#endif
-    bool IsOk() const { return true; }
-
-    bool IsIconInstalled() const;
-    bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString);
-    bool RemoveIcon();
-    bool PopupMenu(wxMenu *menu);
-
-protected:
-    wxTaskBarIconType m_type;
-    class wxTaskBarIconImpl* m_impl;
-    friend class wxTaskBarIconImpl;
-};
-#endif
-    // _TASKBAR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/textctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/textctrl.h
deleted file mode 100644
index a52620b5c7..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/textctrl.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/textctrl.h
-// Purpose:     wxTextCtrl class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TEXTCTRL_H_
-#define _WX_TEXTCTRL_H_
-
-#if wxUSE_SYSTEM_OPTIONS
-    // set this to 'true' if you want to use the 'classic' MLTE-based implementation
-    // instead of the HIView-based implementation in 10.3 and upwards, the former
-    // has more features (backgrounds etc.), but may show redraw artefacts and other
-    // problems depending on your usage; hence, the default is 'false'.
-    #define wxMAC_TEXTCONTROL_USE_MLTE wxT("mac.textcontrol-use-mlte")
-    // set this to 'true' if you want editable text controls to have spell checking turned
-    // on by default, you can change this setting individually on a control using MacCheckSpelling
-    #define wxMAC_TEXTCONTROL_USE_SPELL_CHECKER wxT("mac.textcontrol-use-spell-checker")
-#endif
-
-#include "wx/control.h"
-#include "wx/textctrl.h"
-
-class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase
-{
-  DECLARE_DYNAMIC_CLASS(wxTextCtrl)
-
-public:
-    wxTextCtrl()
-    { Init(); }
-
-    wxTextCtrl(wxWindow *parent,
-        wxWindowID id,
-        const wxString& value = wxEmptyString,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxTextCtrlNameStr)
-    {
-        Init();
-        Create(parent, id, value, pos, size, style, validator, name);
-    }
-
-    virtual ~wxTextCtrl();
-
-    bool Create(wxWindow *parent,
-        wxWindowID id,
-        const wxString& value = wxEmptyString,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = wxTextCtrlNameStr);
-
-    // accessors
-    // ---------
-
-    virtual int GetLineLength(long lineNo) const;
-    virtual wxString GetLineText(long lineNo) const;
-    virtual int GetNumberOfLines() const;
-
-    virtual bool IsModified() const;
-
-    // operations
-    // ----------
-
-
-    // sets/clears the dirty flag
-    virtual void MarkDirty();
-    virtual void DiscardEdits();
-
-    // text control under some platforms supports the text styles: these
-    // methods apply the given text style to the given selection or to
-    // set/get the style which will be used for all appended text
-    virtual bool SetFont( const wxFont &font );
-    virtual bool GetStyle(long position, wxTextAttr& style);
-    virtual bool SetStyle(long start, long end, const wxTextAttr& style);
-    virtual bool SetDefaultStyle(const wxTextAttr& style);
-
-    // translate between the position (which is just an index into the textctrl
-    // considering all its contents as a single strings) and (x, y) coordinates
-    // which represent column and line.
-    virtual long XYToPosition(long x, long y) const;
-    virtual bool PositionToXY(long pos, long *x, long *y) const;
-
-    virtual void ShowPosition(long pos);
-
-    // overrides so that we can send text updated events
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
-
-    // Implementation
-    // --------------
-    virtual void Command(wxCommandEvent& event);
-
-    virtual bool AcceptsFocus() const;
-
-    // callbacks
-    void OnDropFiles(wxDropFilesEvent& event);
-    void OnChar(wxKeyEvent& event); // Process 'enter' if required
-    void OnKeyDown(wxKeyEvent& event); // Process clipboard shortcuts
-
-    void OnCut(wxCommandEvent& event);
-    void OnCopy(wxCommandEvent& event);
-    void OnPaste(wxCommandEvent& event);
-    void OnUndo(wxCommandEvent& event);
-    void OnRedo(wxCommandEvent& event);
-    void OnDelete(wxCommandEvent& event);
-    void OnSelectAll(wxCommandEvent& event);
-
-    void OnUpdateCut(wxUpdateUIEvent& event);
-    void OnUpdateCopy(wxUpdateUIEvent& event);
-    void OnUpdatePaste(wxUpdateUIEvent& event);
-    void OnUpdateUndo(wxUpdateUIEvent& event);
-    void OnUpdateRedo(wxUpdateUIEvent& event);
-    void OnUpdateDelete(wxUpdateUIEvent& event);
-    void OnUpdateSelectAll(wxUpdateUIEvent& event);
-
-    void OnContextMenu(wxContextMenuEvent& event);
-
-    virtual bool MacSetupCursor( const wxPoint& pt );
-
-    virtual void MacVisibilityChanged();
-    virtual void MacSuperChangedPosition();
-    virtual void MacCheckSpelling(bool check);
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    virtual wxSize DoGetBestSize() const;
-
-    // flag is set to true when the user edits the controls contents
-    bool m_dirty;
-
-    virtual void EnableTextChangedEvents(bool WXUNUSED(enable))
-    {
-        // nothing to do here as the events are never generated when we change
-        // the controls value programmatically anyhow
-    }
-
-private :
-    wxMenu  *m_privateContextMenu;
-
-    DECLARE_EVENT_TABLE()
-};
-
-#endif // _WX_TEXTCTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/textentry.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/textentry.h
deleted file mode 100644
index 12d780778a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/textentry.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/textentry.h
-// Purpose:     wxTextEntry class
-// Author:      Stefan Csomor
-// Modified by: Kevin Ollivier
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_TEXTENTRY_H_
-#define _WX_OSX_TEXTENTRY_H_
-
-#if wxUSE_SYSTEM_OPTIONS
-    // set this to 'true' if you want to use the 'classic' MLTE-based implementation
-    // instead of the HIView-based implementation in 10.3 and upwards, the former
-    // has more features (backgrounds etc.), but may show redraw artefacts and other
-    // problems depending on your usage; hence, the default is 'false'.
-    #define wxMAC_TEXTCONTROL_USE_MLTE wxT("mac.textcontrol-use-mlte")
-    // set this to 'true' if you want editable text controls to have spell checking turned
-    // on by default, you can change this setting individually on a control using MacCheckSpelling
-    #define wxMAC_TEXTCONTROL_USE_SPELL_CHECKER wxT("mac.textcontrol-use-spell-checker")
-#endif
-
-#include "wx/control.h"
-
-// forward decl for wxListWidgetImpl implementation type.
-class WXDLLIMPEXP_FWD_CORE wxTextWidgetImpl;
-
-class WXDLLIMPEXP_CORE wxTextEntry: public wxTextEntryBase
-{
-
-public:
-    wxTextEntry();
-    virtual ~wxTextEntry();
-
-    virtual bool IsEditable() const;
-
-    // If the return values from and to are the same, there is no selection.
-    virtual void GetSelection(long* from, long* to) const;
-
-    // operations
-    // ----------
-
-    // editing
-    virtual void Clear();
-    virtual void Remove(long from, long to);
-
-    // set the max number of characters which may be entered
-    // in a single line text control
-    virtual void SetMaxLength(unsigned long len);
-
-    // writing text inserts it at the current position;
-    // appending always inserts it at the end
-    virtual void WriteText(const wxString& text);
-
-    // Clipboard operations
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
-
-    virtual bool CanCopy() const;
-    virtual bool CanCut() const;
-    virtual bool CanPaste() const;
-
-    // Undo/redo
-    virtual void Undo();
-    virtual void Redo();
-
-    virtual bool CanUndo() const;
-    virtual bool CanRedo() const;
-
-    // Insertion point
-    virtual void SetInsertionPoint(long pos);
-    virtual void SetInsertionPointEnd();
-    virtual long GetInsertionPoint() const;
-    virtual wxTextPos GetLastPosition() const;
-
-    virtual void SetSelection(long from, long to);
-    virtual void SetEditable(bool editable);
-
-    virtual bool SendMaxLenEvent();
-
-    // set the grayed out hint text
-    virtual bool SetHint(const wxString& hint);
-    virtual wxString GetHint() const;
-
-    // Implementation
-    // --------------
-
-    virtual wxTextWidgetImpl * GetTextPeer() const;
-    wxTextCompleter *OSXGetCompleter() const { return m_completer; }
-
-protected:
-
-    virtual wxString DoGetValue() const;
-
-    virtual bool DoAutoCompleteStrings(const wxArrayString& choices);
-    virtual bool DoAutoCompleteCustom(wxTextCompleter *completer);
-
-    // The object providing auto-completions or NULL if none.
-    wxTextCompleter *m_completer;
-
-    bool  m_editable;
-
-  // need to make this public because of the current implementation via callbacks
-    unsigned long  m_maxLength;
-
-private:
-    wxString m_hintString;
-};
-
-#endif // _WX_OSX_TEXTENTRY_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/tglbtn.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/tglbtn.h
deleted file mode 100644
index eaa48e8b81..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/tglbtn.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/tglbtn.h
-// Purpose:     Declaration of the wxToggleButton class, which implements a
-//              toggle button under wxMac.
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     08.02.01
-// Copyright:   (c) 2004 Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TOGGLEBUTTON_H_
-#define _WX_TOGGLEBUTTON_H_
-
-class WXDLLIMPEXP_CORE wxToggleButton : public wxToggleButtonBase
-{
-public:
-    wxToggleButton() {}
-    wxToggleButton(wxWindow *parent,
-                   wxWindowID id,
-                   const wxString& label,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = 0,
-                   const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxCheckBoxNameStr)
-    {
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& label,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
-
-    virtual void SetValue(bool value);
-    virtual bool GetValue() const ;
-
-    virtual bool OSXHandleClicked( double timestampsec );
-
-    virtual void Command(wxCommandEvent& event);
-
-protected:
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxToggleButton)
-};
-
-
-class WXDLLIMPEXP_CORE wxBitmapToggleButton : public wxToggleButton
-{
-public:
-    wxBitmapToggleButton() {}
-    wxBitmapToggleButton(wxWindow *parent,
-                   wxWindowID id,
-                   const wxBitmap& label,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = 0,
-                   const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxCheckBoxNameStr)
-    {
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxBitmap& label,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxBitmapToggleButton)
-};
-
-#endif // _WX_TOGGLEBUTTON_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/timectrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/timectrl.h
deleted file mode 100644
index 6673fcce38..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/timectrl.h
+++ /dev/null
@@ -1,50 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/timectrl.h
-// Purpose:     Declaration of wxOSX-specific wxTimePickerCtrl class.
-// Author:      Vadim Zeitlin
-// Created:     2011-12-18
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_TIMECTRL_H_
-#define _WX_OSX_TIMECTRL_H_
-
-// ----------------------------------------------------------------------------
-// wxTimePickerCtrl
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_ADV wxTimePickerCtrl : public wxTimePickerCtrlBase
-{
-public:
-    // Constructors.
-    wxTimePickerCtrl() { }
-
-    wxTimePickerCtrl(wxWindow *parent,
-                     wxWindowID id,
-                     const wxDateTime& dt = wxDefaultDateTime,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize,
-                     long style = wxTP_DEFAULT,
-                     const wxValidator& validator = wxDefaultValidator,
-                     const wxString& name = wxTimePickerCtrlNameStr)
-    {
-        Create(parent, id, dt, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxDateTime& dt = wxDefaultDateTime,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxTP_DEFAULT,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxTimePickerCtrlNameStr);
-
-    virtual void OSXGenerateEvent(const wxDateTime& dt);
-
-private:
-    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxTimePickerCtrl);
-};
-
-#endif // _WX_OSX_TIMECTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/toolbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/toolbar.h
deleted file mode 100644
index 2cbd0d7c6a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/toolbar.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/toolbar.h
-// Purpose:     wxToolBar class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TOOLBAR_H_
-#define _WX_TOOLBAR_H_
-
-#if wxUSE_TOOLBAR
-
-#include "wx/tbarbase.h"
-#include "wx/dynarray.h"
-
-class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
-{
-  DECLARE_DYNAMIC_CLASS(wxToolBar)
- public:
-  /*
-   * Public interface
-   */
-
-   wxToolBar() { Init(); }
-
-  inline wxToolBar(wxWindow *parent, wxWindowID id,
-                   const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                   long style = wxTB_HORIZONTAL,
-                   const wxString& name = wxToolBarNameStr)
-  {
-    Init();
-    Create(parent, id, pos, size, style, name);
-  }
-  virtual ~wxToolBar();
-
-  bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-            long style = wxTB_HORIZONTAL,
-            const wxString& name = wxToolBarNameStr);
-
-    virtual void SetWindowStyleFlag(long style);
-
-    virtual bool Destroy();
-
-    // override/implement base class virtuals
-    virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
-
-#ifndef __WXOSX_IPHONE__
-    virtual bool Show(bool show = true);
-    virtual bool IsShown() const;
-#endif
-    virtual bool Realize();
-
-    virtual void SetToolBitmapSize(const wxSize& size);
-    virtual wxSize GetToolSize() const;
-
-    virtual void SetRows(int nRows);
-
-    virtual void SetToolNormalBitmap(int id, const wxBitmap& bitmap);
-    virtual void SetToolDisabledBitmap(int id, const wxBitmap& bitmap);
-
-#ifndef __WXOSX_IPHONE__
-    // Add all the buttons
-
-    virtual wxString MacGetToolTipString( wxPoint &where ) ;
-    void OnPaint(wxPaintEvent& event) ;
-    void OnMouse(wxMouseEvent& event) ;
-    virtual void MacSuperChangedPosition() ;
-#endif
-
-#if wxOSX_USE_NATIVE_TOOLBAR
-    // make all tools selectable
-    void OSXSetSelectableTools(bool set);
-    void OSXSelectTool(int toolId);
-
-    bool MacInstallNativeToolbar(bool usesNative);
-    void MacUninstallNativeToolbar();
-    bool MacWantsNativeToolbar();
-    bool MacTopLevelHasNativeToolbar(bool *ownToolbarInstalled) const;
-#endif
-
-    virtual wxToolBarToolBase *CreateTool(int id,
-                                          const wxString& label,
-                                          const wxBitmap& bmpNormal,
-                                          const wxBitmap& bmpDisabled = wxNullBitmap,
-                                          wxItemKind kind = wxITEM_NORMAL,
-                                          wxObject *clientData = NULL,
-                                          const wxString& shortHelp = wxEmptyString,
-                                          const wxString& longHelp = wxEmptyString);
-    virtual wxToolBarToolBase *CreateTool(wxControl *control,
-                                          const wxString& label);
-
-protected:
-    // common part of all ctors
-    void Init();
-    
-    void DoLayout();
-    
-    void DoSetSize(int x, int y, int width, int height, int sizeFlags);
-
-#ifndef __WXOSX_IPHONE__
-    virtual void DoGetSize(int *width, int *height) const;
-    virtual wxSize DoGetBestSize() const;
-#endif
-#ifdef __WXOSX_COCOA__
-    virtual void DoGetPosition(int*x, int *y) const;
-#endif
-    virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
-    virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
-
-    virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
-    virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
-    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
-
-    DECLARE_EVENT_TABLE()
-#if wxOSX_USE_NATIVE_TOOLBAR
-    bool m_macUsesNativeToolbar ;
-    void* m_macToolbar ;
-#endif
-#ifdef __WXOSX_IPHONE__
-    WX_UIView m_macToolbar;
-#endif
-};
-
-#endif // wxUSE_TOOLBAR
-
-#endif
-    // _WX_TOOLBAR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/tooltip.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/tooltip.h
deleted file mode 100644
index f05122ba00..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/tooltip.h
+++ /dev/null
@@ -1,57 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/tooltip.h
-// Purpose:     wxToolTip class - tooltip control
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     31.01.99
-// Copyright:   (c) 1999 Robert Roebling, Vadim Zeitlin, Stefan Csomor
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MAC_TOOLTIP_H_
-#define _WX_MAC_TOOLTIP_H_
-
-#include "wx/string.h"
-#include "wx/event.h"
-
-class WXDLLIMPEXP_CORE wxToolTip : public wxObject
-{
-public:
-    // ctor & dtor
-    wxToolTip(const wxString &tip);
-    virtual ~wxToolTip();
-
-    // accessors
-        // tip text
-    void SetTip(const wxString& tip);
-    const wxString& GetTip() const { return m_text; }
-
-        // the window we're associated with
-    void SetWindow(wxWindow *win);
-    wxWindow *GetWindow() const { return m_window; }
-
-    // controlling tooltip behaviour: globally change tooltip parameters
-        // enable or disable the tooltips globally
-    static void Enable(bool flag);
-        // set the delay after which the tooltip appears
-    static void SetDelay(long milliseconds);
-        // set the delay after which the tooltip disappears or how long the tooltip remains visible
-    static void SetAutoPop(long milliseconds);
-        // set the delay between subsequent tooltips to appear
-    static void SetReshow(long milliseconds);
-    static void NotifyWindowDelete( WXHWND win ) ;
-
-    // implementation only from now on
-    // -------------------------------
-
-    // should be called in response to mouse events
-    static void RelayEvent(wxWindow *win , wxMouseEvent &event);
-    static void RemoveToolTips();
-
-private:
-    wxString  m_text;           // tooltip text
-    wxWindow *m_window;         // window we're associated with
-    DECLARE_ABSTRACT_CLASS(wxToolTip)
-};
-
-#endif // _WX_MAC_TOOLTIP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/toplevel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/toplevel.h
deleted file mode 100644
index 73b218fe75..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/toplevel.h
+++ /dev/null
@@ -1,98 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/toplevel.h
-// Purpose:     wxTopLevelWindowMac is the Mac implementation of wxTLW
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     20.09.01
-// Copyright:   (c) 2001 Stefan Csomor
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MSW_TOPLEVEL_H_
-#define _WX_MSW_TOPLEVEL_H_
-
-// ----------------------------------------------------------------------------
-// wxTopLevelWindowMac
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxTopLevelWindowMac : public wxTopLevelWindowBase
-{
-public:
-    // constructors and such
-    wxTopLevelWindowMac() { Init(); }
-
-    wxTopLevelWindowMac(wxWindow *parent,
-                        wxWindowID id,
-                        const wxString& title,
-                        const wxPoint& pos = wxDefaultPosition,
-                        const wxSize& size = wxDefaultSize,
-                        long style = wxDEFAULT_FRAME_STYLE,
-                        const wxString& name = wxFrameNameStr)
-    {
-        Init();
-
-        (void)Create(parent, id, title, pos, size, style, name);
-    }
-
-    virtual ~wxTopLevelWindowMac();
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
-
-    bool Create(wxWindow *parent, WXWindow nativeWindow);
-
-    virtual bool Destroy();
-
-    virtual wxPoint GetClientAreaOrigin() const;
-
-    // Attracts the users attention to this window if the application is
-    // inactive (should be called when a background event occurs)
-    virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
-
-    // implement base class pure virtuals
-    virtual void Maximize(bool maximize = true);
-    virtual bool IsMaximized() const;
-    virtual void Iconize(bool iconize = true);
-    virtual bool IsIconized() const;
-    virtual void Restore();
-
-    virtual bool IsActive();
-
-    virtual void ShowWithoutActivating();
-    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL) ;
-    virtual bool IsFullScreen() const ;
-
-    // implementation from now on
-    // --------------------------
-
-    virtual void SetTitle( const wxString& title);
-    virtual wxString GetTitle() const;
-
-    virtual void SetLabel(const wxString& label) { SetTitle( label ); }
-    virtual wxString GetLabel() const            { return GetTitle(); }
-    
-    virtual void OSXSetModified(bool modified);
-    virtual bool OSXIsModified() const;
-
-    virtual void SetRepresentedFilename(const wxString& filename);
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    // is the frame currently iconized?
-    bool m_iconized;
-
-    // should the frame be maximized when it will be shown? set by Maximize()
-    // when it is called while the frame is hidden
-    bool m_maximizeOnShow;
-private :
-    DECLARE_EVENT_TABLE()
-};
-
-#endif // _WX_MSW_TOPLEVEL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/treectrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/treectrl.h
deleted file mode 100644
index 587325b85a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/treectrl.h
+++ /dev/null
@@ -1,306 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/treectrl.h
-// Purpose:     wxTreeCtrl class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_TREECTRL_H_
-#define _WX_TREECTRL_H_
-
-#include "wx/control.h"
-#include "wx/event.h"
-#include "wx/imaglist.h"
-
-#define wxTREE_MASK_HANDLE          0x0001
-#define wxTREE_MASK_STATE           0x0002
-#define wxTREE_MASK_TEXT            0x0004
-#define wxTREE_MASK_IMAGE           0x0008
-#define wxTREE_MASK_SELECTED_IMAGE  0x0010
-#define wxTREE_MASK_CHILDREN        0x0020
-#define wxTREE_MASK_DATA            0x0040
-
-#define wxTREE_STATE_BOLD           0x0001
-#define wxTREE_STATE_DROPHILITED    0x0002
-#define wxTREE_STATE_EXPANDED       0x0004
-#define wxTREE_STATE_EXPANDEDONCE   0x0008
-#define wxTREE_STATE_FOCUSED        0x0010
-#define wxTREE_STATE_SELECTED       0x0020
-#define wxTREE_STATE_CUT            0x0040
-
-#define wxTREE_HITTEST_ABOVE            0x0001  // Above the client area.
-#define wxTREE_HITTEST_BELOW            0x0002  // Below the client area.
-#define wxTREE_HITTEST_NOWHERE          0x0004  // In the client area but below the last item.
-#define wxTREE_HITTEST_ONITEMBUTTON     0x0010  // On the button associated with an item.
-#define wxTREE_HITTEST_ONITEMICON       0x0020  // On the bitmap associated with an item.
-#define wxTREE_HITTEST_ONITEMINDENT     0x0040  // In the indentation associated with an item.
-#define wxTREE_HITTEST_ONITEMLABEL      0x0080  // On the label (string) associated with an item.
-#define wxTREE_HITTEST_ONITEMRIGHT      0x0100  // In the area to the right of an item.
-#define wxTREE_HITTEST_ONITEMSTATEICON  0x0200  // On the state icon for a tree view item that is in a user-defined state.
-#define wxTREE_HITTEST_TOLEFT           0x0400  // To the right of the client area.
-#define wxTREE_HITTEST_TORIGHT          0x0800  // To the left of the client area.
-
-#define wxTREE_HITTEST_ONITEM (wxTREE_HITTEST_ONITEMICON | wxTREE_HITTEST_ONITEMLABEL | wxTREE_HITTEST_ONITEMSTATEICON)
-
-// Flags for GetNextItem
-enum {
-    wxTREE_NEXT_CARET,                 // Retrieves the currently selected item.
-    wxTREE_NEXT_CHILD,                 // Retrieves the first child item. The hItem parameter must be NULL.
-    wxTREE_NEXT_DROPHILITE,            // Retrieves the item that is the target of a drag-and-drop operation.
-    wxTREE_NEXT_FIRSTVISIBLE,          // Retrieves the first visible item.
-    wxTREE_NEXT_NEXT,                  // Retrieves the next sibling item.
-    wxTREE_NEXT_NEXTVISIBLE,           // Retrieves the next visible item that follows the specified item.
-    wxTREE_NEXT_PARENT,                // Retrieves the parent of the specified item.
-    wxTREE_NEXT_PREVIOUS,              // Retrieves the previous sibling item.
-    wxTREE_NEXT_PREVIOUSVISIBLE,       // Retrieves the first visible item that precedes the specified item.
-    wxTREE_NEXT_ROOT                   // Retrieves the first child item of the root item of which the specified item is a part.
-};
-
-#if WXWIN_COMPATIBILITY_2_6
-    // Flags for InsertItem
-    enum {
-        wxTREE_INSERT_LAST = -1,
-        wxTREE_INSERT_FIRST = -2,
-        wxTREE_INSERT_SORT = -3
-    };
-#endif
-
-class WXDLLIMPEXP_CORE wxTreeItem: public wxObject
-{
-    DECLARE_DYNAMIC_CLASS(wxTreeItem)
-
-public:
-
-    long            m_mask;
-    long            m_itemId;
-    long            m_state;
-    long            m_stateMask;
-    wxString        m_text;
-    int             m_image;
-    int             m_selectedImage;
-    int             m_children;
-    long            m_data;
-
-    wxTreeItem();
-
-// Accessors
-    inline long GetMask() const { return m_mask; }
-    inline long GetItemId() const { return m_itemId; }
-    inline long GetState() const { return m_state; }
-    inline long GetStateMask() const { return m_stateMask; }
-    inline wxString GetText() const { return m_text; }
-    inline int GetImage() const { return m_image; }
-    inline int GetSelectedImage() const { return m_selectedImage; }
-    inline int GetChildren() const { return m_children; }
-    inline long GetData() const { return m_data; }
-
-    inline void SetMask(long mask) { m_mask = mask; }
-    inline void SetItemId(long id) { m_itemId = m_itemId = id; }
-    inline void SetState(long state) { m_state = state; }
-    inline void SetStateMask(long stateMask) { m_stateMask = stateMask; }
-    inline void GetText(const wxString& text) { m_text = text; }
-    inline void SetImage(int image) { m_image = image; }
-    inline void GetSelectedImage(int selImage) { m_selectedImage = selImage; }
-    inline void SetChildren(int children) { m_children = children; }
-    inline void SetData(long data) { m_data = data; }
-};
-
-class WXDLLIMPEXP_CORE wxTreeCtrl: public wxControl
-{
-public:
-   /*
-    * Public interface
-    */
-
-    // creation
-    // --------
-    wxTreeCtrl();
-
-    inline wxTreeCtrl(wxWindow *parent, wxWindowID id = wxID_ANY,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT,
-        const wxValidator& validator = wxDefaultValidator,
-        const wxString& name = "wxTreeCtrl")
-    {
-        Create(parent, id, pos, size, style, validator, name);
-    }
-    virtual ~wxTreeCtrl();
-
-    bool Create(wxWindow *parent, wxWindowID id = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = "wxTreeCtrl");
-
-    // accessors
-    // ---------
-      //
-    virtual unsigned int GetCount() const;
-
-      // indent
-    int GetIndent() const;
-    void SetIndent(int indent);
-      // image list
-    wxImageList *GetImageList(int which = wxIMAGE_LIST_NORMAL) const;
-
-      // navigation inside the tree
-    long GetNextItem(long item, int code) const;
-    bool ItemHasChildren(long item) const;
-    long GetChild(long item) const;
-    long GetItemParent(long item) const;
-    long GetFirstVisibleItem() const;
-    long GetNextVisibleItem(long item) const;
-    long GetSelection() const;
-    long GetRootItem() const;
-
-      // generic function for (g|s)etting item attributes
-    bool GetItem(wxTreeItem& info) const;
-    bool SetItem(wxTreeItem& info);
-      // item state
-    int  GetItemState(long item, long stateMask) const;
-    bool SetItemState(long item, long state, long stateMask);
-      // item image
-    bool SetItemImage(long item, int image, int selImage);
-      // item text
-    wxString GetItemText(long item) const;
-    void SetItemText(long item, const wxString& str);
-      // custom data associated with the item
-    long GetItemData(long item) const;
-    bool SetItemData(long item, long data);
-      // convenience function
-    bool IsItemExpanded(long item)
-    {
-        return (GetItemState(item, wxTREE_STATE_EXPANDED) &
-                             wxTREE_STATE_EXPANDED) != 0;
-    }
-
-      // bounding rect
-    bool GetItemRect(long item, wxRect& rect, bool textOnly = false) const;
-      //
-    wxTextCtrl* GetEditControl() const;
-
-    // operations
-    // ----------
-      // adding/deleting items
-    bool DeleteItem(long item);
-
-#if WXWIN_COMPATIBILITY_2_6
-    wxDEPRECATED( long InsertItem(long parent, wxTreeItem& info,
-                  long insertAfter = wxTREE_INSERT_LAST) );
-        // If image > -1 and selImage == -1, the same image is used for
-        // both selected and unselected items.
-    wxDEPRECATED( long InsertItem(long parent, const wxString& label,
-                                  int image = -1, int selImage = -1,
-                                  long insertAfter = wxTREE_INSERT_LAST) );
-
-        // use Expand, Collapse, CollapseAndReset or Toggle
-    wxDEPRECATED( bool ExpandItem(long item, int action) );
-    wxDEPRECATED( void SetImageList(wxImageList *imageList, int which = wxIMAGE_LIST_NORMAL) );
-#endif // WXWIN_COMPATIBILITY_2_6
-
-      // changing item state
-    bool ExpandItem(long item)   { return ExpandItem(item, wxTREE_EXPAND_EXPAND);   }
-    bool CollapseItem(long item) { return ExpandItem(item, wxTREE_EXPAND_COLLAPSE); }
-    bool ToggleItem(long item)   { return ExpandItem(item, wxTREE_EXPAND_TOGGLE);   }
-
-      //
-    bool SelectItem(long item);
-    bool ScrollTo(long item);
-    bool DeleteAllItems();
-
-    // Edit the label (tree must have the focus)
-    wxTextCtrl* EditLabel(long item, wxClassInfo* textControlClass = wxCLASSINFO(wxTextCtrl));
-
-    // End label editing, optionally cancelling the edit
-    bool EndEditLabel(bool cancel);
-
-    long HitTest(const wxPoint& point, int& flags);
-    //  wxImageList *CreateDragImage(long item);
-    bool SortChildren(long item);
-    bool EnsureVisible(long item);
-
-    void Command(wxCommandEvent& event) { ProcessCommand(event); }
-
-protected:
-    wxTextCtrl*  m_textCtrl;
-    wxImageList* m_imageListNormal;
-    wxImageList* m_imageListState;
-
-    DECLARE_DYNAMIC_CLASS(wxTreeCtrl)
-};
-
-/*
- wxEVT_TREE_BEGIN_DRAG,
- wxEVT_TREE_BEGIN_RDRAG,
- wxEVT_TREE_BEGIN_LABEL_EDIT,
- wxEVT_TREE_END_LABEL_EDIT,
- wxEVT_TREE_DELETE_ITEM,
- wxEVT_TREE_GET_INFO,
- wxEVT_TREE_SET_INFO,
- wxEVT_TREE_ITEM_EXPANDED,
- wxEVT_TREE_ITEM_EXPANDING,
- wxEVT_TREE_ITEM_COLLAPSED,
- wxEVT_TREE_ITEM_COLLAPSING,
- wxEVT_TREE_SEL_CHANGED,
- wxEVT_TREE_SEL_CHANGING,
- wxEVT_TREE_KEY_DOWN
-*/
-
-class WXDLLIMPEXP_CORE wxTreeEvent: public wxCommandEvent
-{
-    DECLARE_DYNAMIC_CLASS(wxTreeEvent)
-
-public:
-    wxTreeEvent(wxEventType commandType = wxEVT_NULL, int id = 0);
-
-    int           m_code;
-    wxTreeItem    m_item;
-    long          m_oldItem;
-    wxPoint       m_pointDrag;
-
-    inline long GetOldItem() const { return m_oldItem; }
-    inline wxTreeItem& GetItem() const { return (wxTreeItem&) m_item; }
-    inline wxPoint GetPoint() const { return m_pointDrag; }
-    inline int GetCode() const { return m_code; }
-};
-
-typedef void (wxEvtHandler::*wxTreeEventFunction)(wxTreeEvent&);
-
-#define EVT_TREE_BEGIN_DRAG(id, fn) { wxEVT_TREE_BEGIN_DRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_BEGIN_RDRAG(id, fn) { wxEVT_TREE_BEGIN_RDRAG, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_BEGIN_LABEL_EDIT(id, fn) { wxEVT_TREE_BEGIN_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_END_LABEL_EDIT(id, fn) { wxEVT_TREE_END_LABEL_EDIT, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_DELETE_ITEM(id, fn) { wxEVT_TREE_DELETE_ITEM, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_GET_INFO(id, fn) { wxEVT_TREE_GET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_SET_INFO(id, fn) { wxEVT_TREE_SET_INFO, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_ITEM_EXPANDED(id, fn) { wxEVT_TREE_ITEM_EXPANDED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_ITEM_EXPANDING(id, fn) { wxEVT_TREE_ITEM_EXPANDING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_ITEM_COLLAPSED(id, fn) { wxEVT_TREE_ITEM_COLLAPSED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_ITEM_COLLAPSING(id, fn) { wxEVT_TREE_ITEM_COLLAPSING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_SEL_CHANGED(id, fn) { wxEVT_TREE_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_SEL_CHANGING(id, fn) { wxEVT_TREE_SEL_CHANGING, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-#define EVT_TREE_KEY_DOWN(id, fn) { wxEVT_TREE_KEY_DOWN, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxTreeEventFunction) & fn, NULL },
-
-// old wxEVT_COMMAND_* constants
-#define wxEVT_COMMAND_TREE_BEGIN_DRAG         wxEVT_TREE_BEGIN_DRAG
-#define wxEVT_COMMAND_TREE_BEGIN_RDRAG        wxEVT_TREE_BEGIN_RDRAG
-#define wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT   wxEVT_TREE_BEGIN_LABEL_EDIT
-#define wxEVT_COMMAND_TREE_END_LABEL_EDIT     wxEVT_TREE_END_LABEL_EDIT
-#define wxEVT_COMMAND_TREE_DELETE_ITEM        wxEVT_TREE_DELETE_ITEM
-#define wxEVT_COMMAND_TREE_GET_INFO           wxEVT_TREE_GET_INFO
-#define wxEVT_COMMAND_TREE_SET_INFO           wxEVT_TREE_SET_INFO
-#define wxEVT_COMMAND_TREE_ITEM_EXPANDED      wxEVT_TREE_ITEM_EXPANDED
-#define wxEVT_COMMAND_TREE_ITEM_EXPANDING     wxEVT_TREE_ITEM_EXPANDING
-#define wxEVT_COMMAND_TREE_ITEM_COLLAPSED     wxEVT_TREE_ITEM_COLLAPSED
-#define wxEVT_COMMAND_TREE_ITEM_COLLAPSING    wxEVT_TREE_ITEM_COLLAPSING
-#define wxEVT_COMMAND_TREE_SEL_CHANGED        wxEVT_TREE_SEL_CHANGED
-#define wxEVT_COMMAND_TREE_SEL_CHANGING       wxEVT_TREE_SEL_CHANGING
-#define wxEVT_COMMAND_TREE_KEY_DOWN           wxEVT_TREE_KEY_DOWN
-
-#endif
-    // _WX_TREECTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/uma.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/uma.h
deleted file mode 100644
index 451f2f71f6..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/uma.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#if wxOSX_USE_CARBON
-#include "wx/osx/carbon/uma.h"
-#endif
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/webview_webkit.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/webview_webkit.h
deleted file mode 100644
index 803f8b0b29..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/webview_webkit.h
+++ /dev/null
@@ -1,186 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/osx/webkit.h
-// Purpose:     wxWebViewWebKit - embeddable web kit control,
-//                             OS X implementation of web view component
-// Author:      Jethro Grassie / Kevin Ollivier / Marianne Gagnon
-// Modified by:
-// Created:     2004-4-16
-// Copyright:   (c) Jethro Grassie / Kevin Ollivier / Marianne Gagnon
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WEBKIT_H
-#define _WX_WEBKIT_H
-
-#include "wx/setup.h"
-
-#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
-                                          ||  defined(__WXOSX_CARBON__))
-
-#include "wx/control.h"
-#include "wx/webview.h"
-
-#include "wx/osx/core/objcid.h"
-
-// ----------------------------------------------------------------------------
-// Web Kit Control
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
-{
-public:
-    wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);
-
-    wxWebViewWebKit() {}
-    wxWebViewWebKit(wxWindow *parent,
-                    wxWindowID winID = wxID_ANY,
-                    const wxString& strURL = wxWebViewDefaultURLStr,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize, long style = 0,
-                    const wxString& name = wxWebViewNameStr)
-    {
-        Create(parent, winID, strURL, pos, size, style, name);
-    }
-    bool Create(wxWindow *parent,
-                wxWindowID winID = wxID_ANY,
-                const wxString& strURL = wxWebViewDefaultURLStr,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize, long style = 0,
-                const wxString& name = wxWebViewNameStr);
-    virtual ~wxWebViewWebKit();
-
-    virtual bool CanGoBack() const;
-    virtual bool CanGoForward() const;
-    virtual void GoBack();
-    virtual void GoForward();
-    virtual void Reload(wxWebViewReloadFlags flags = wxWEBVIEW_RELOAD_DEFAULT);
-    virtual void Stop();
-    virtual wxString GetPageSource() const;
-    virtual wxString GetPageText() const;
-
-    virtual void Print();
-
-    virtual void LoadURL(const wxString& url);
-    virtual wxString GetCurrentURL() const;
-    virtual wxString GetCurrentTitle() const;
-    virtual wxWebViewZoom GetZoom() const;
-    virtual void SetZoom(wxWebViewZoom zoom);
-
-    virtual void SetZoomType(wxWebViewZoomType zoomType);
-    virtual wxWebViewZoomType GetZoomType() const;
-    virtual bool CanSetZoomType(wxWebViewZoomType type) const;
-
-    virtual bool IsBusy() const { return m_busy; }
-
-    //History functions
-    virtual void ClearHistory();
-    virtual void EnableHistory(bool enable = true);
-    virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetBackwardHistory();
-    virtual wxVector<wxSharedPtr<wxWebViewHistoryItem> > GetForwardHistory();
-    virtual void LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item);
-
-    //Undo / redo functionality
-    virtual bool CanUndo() const;
-    virtual bool CanRedo() const;
-    virtual void Undo();
-    virtual void Redo();
-
-    //Find function
-    virtual long Find(const wxString& text, int flags = wxWEBVIEW_FIND_DEFAULT) 
-    { 
-        wxUnusedVar(text);
-        wxUnusedVar(flags);
-        return wxNOT_FOUND; 
-    }
-
-    //Clipboard functions
-    virtual bool CanCut() const { return true; }
-    virtual bool CanCopy() const { return true; }
-    virtual bool CanPaste() const { return true; }
-    virtual void Cut();
-    virtual void Copy();
-    virtual void Paste();
-
-    //Editing functions
-    virtual void SetEditable(bool enable = true);
-    virtual bool IsEditable() const;
-
-    //Selection
-    virtual void DeleteSelection();
-    virtual bool HasSelection() const;
-    virtual void SelectAll();
-    virtual wxString GetSelectedText() const;
-    virtual wxString GetSelectedSource() const;
-    virtual void ClearSelection();
-
-    void RunScript(const wxString& javascript);
-
-    //Virtual Filesystem Support
-    virtual void RegisterHandler(wxSharedPtr<wxWebViewHandler> handler);
-
-    virtual void* GetNativeBackend() const { return m_webView; }
-
-    // ---- methods not from the parent (common) interface
-    bool  CanGetPageSource() const;
-
-    void  SetScrollPos(int pos);
-    int   GetScrollPos();
-
-    bool  CanIncreaseTextSize() const;
-    void  IncreaseTextSize();
-    bool  CanDecreaseTextSize() const;
-    void  DecreaseTextSize();
-
-    float GetWebkitZoom() const;
-    void  SetWebkitZoom(float zoom);
-
-    // don't hide base class virtuals
-    virtual void SetScrollPos( int orient, int pos, bool refresh = true )
-        { return wxControl::SetScrollPos(orient, pos, refresh); }
-    virtual int GetScrollPos( int orient ) const
-        { return wxControl::GetScrollPos(orient); }
-
-    //we need to resize the webview when the control size changes
-    void OnSize(wxSizeEvent &event);
-    void OnMove(wxMoveEvent &event);
-    void OnMouseEvents(wxMouseEvent &event);
-
-    bool m_busy;
-
-protected:
-    virtual void DoSetPage(const wxString& html, const wxString& baseUrl);
-
-    DECLARE_EVENT_TABLE()
-    void MacVisibilityChanged();
-
-private:
-    wxWindow *m_parent;
-    wxWindowID m_windowID;
-    wxString m_pageTitle;
-
-    wxObjCID m_webView;
-
-    // we may use this later to setup our own mouse events,
-    // so leave it in for now.
-    void* m_webKitCtrlEventHandler;
-    //It should be WebView*, but WebView is an Objective-C class
-    //TODO: look into using DECLARE_WXCOCOA_OBJC_CLASS rather than this.
-};
-
-class WXDLLIMPEXP_WEBVIEW wxWebViewFactoryWebKit : public wxWebViewFactory
-{
-public:
-    virtual wxWebView* Create() { return new wxWebViewWebKit; }
-    virtual wxWebView* Create(wxWindow* parent,
-                              wxWindowID id,
-                              const wxString& url = wxWebViewDefaultURLStr,
-                              const wxPoint& pos = wxDefaultPosition,
-                              const wxSize& size = wxDefaultSize,
-                              long style = 0,
-                              const wxString& name = wxWebViewNameStr)
-    { return new wxWebViewWebKit(parent, id, url, pos, size, style, name); }
-};
-
-#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
-
-#endif // _WX_WEBKIT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/webviewhistoryitem_webkit.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/webviewhistoryitem_webkit.h
deleted file mode 100644
index f1c2d5f655..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/webviewhistoryitem_webkit.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        include/wx/osx/webviewhistoryitem.h
-// Purpose:     wxWebViewHistoryItem header for OSX
-// Author:      Steven Lamerton
-// Copyright:   (c) 2011 Steven Lamerton
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_OSX_WEBVIEWHISTORYITEM_H_
-#define _WX_OSX_WEBVIEWHISTORYITEM_H_
-
-#include "wx/setup.h"
-
-#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
-                                          ||  defined(__WXOSX_CARBON__))
-
-#include "wx/osx/core/objcid.h"
-
-class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
-{
-public:
-    wxWebViewHistoryItem(const wxString& url, const wxString& title) :
-                     m_url(url), m_title(title) {}
-    wxString GetUrl() { return m_url; }
-    wxString GetTitle() { return m_title; }
-
-    friend class wxWebViewWebKit;
-
-private:
-    wxString m_url, m_title;
-    wxObjCID m_histItem;
-};
-
-#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT
-
-#endif // _WX_OSX_WEBVIEWHISTORYITEM_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/window.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/window.h
deleted file mode 100644
index 623493aa1e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/osx/window.h
+++ /dev/null
@@ -1,403 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/osx/window.h
-// Purpose:     wxWindowMac class
-// Author:      Stefan Csomor
-// Modified by:
-// Created:     1998-01-01
-// Copyright:   (c) Stefan Csomor
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WINDOW_H_
-#define _WX_WINDOW_H_
-
-#include "wx/brush.h"
-#include "wx/dc.h"
-
-class WXDLLIMPEXP_FWD_CORE wxButton;
-class WXDLLIMPEXP_FWD_CORE wxScrollBar;
-class WXDLLIMPEXP_FWD_CORE wxPanel;
-class WXDLLIMPEXP_FWD_CORE wxNonOwnedWindow;
-
-#if wxOSX_USE_CARBON
-    class WXDLLIMPEXP_FWD_CORE wxMacControl ;
-    typedef wxMacControl wxOSXWidgetImpl;
-#elif wxOSX_USE_COCOA_OR_IPHONE
-    class WXDLLIMPEXP_FWD_CORE wxWidgetImpl ;
-    typedef wxWidgetImpl wxOSXWidgetImpl;
-#endif
-
-
-class WXDLLIMPEXP_CORE wxWindowMac: public wxWindowBase
-{
-    DECLARE_DYNAMIC_CLASS(wxWindowMac)
-
-    friend class wxDC;
-    friend class wxPaintDC;
-
-public:
-    wxWindowMac();
-
-    wxWindowMac( wxWindowMac *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr );
-
-    virtual ~wxWindowMac();
-
-    bool Create( wxWindowMac *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr );
-
-    virtual void SendSizeEvent(int flags = 0);
-    
-    // implement base class pure virtuals
-    virtual void SetLabel( const wxString& label );
-    virtual wxString GetLabel() const;
-
-    virtual void Raise();
-    virtual void Lower();
-
-    virtual bool Show( bool show = true );
-    virtual bool ShowWithEffect(wxShowEffect effect,
-                                unsigned timeout = 0)
-    {
-        return OSXShowWithEffect(true, effect, timeout);
-    }
-    virtual bool HideWithEffect(wxShowEffect effect,
-                                unsigned timeout = 0)
-    {
-        return OSXShowWithEffect(false, effect, timeout);
-    }
-
-    virtual bool IsShownOnScreen() const;
-
-    virtual void SetFocus();
-
-    virtual void WarpPointer( int x, int y );
-
-    virtual void Refresh( bool eraseBackground = true,
-                          const wxRect *rect = NULL );
-
-    virtual void Update() ;
-    virtual void ClearBackground();
-
-    virtual bool SetCursor( const wxCursor &cursor );
-    virtual bool SetFont( const wxFont &font );
-    virtual bool SetBackgroundColour( const wxColour &colour );
-    virtual bool SetForegroundColour( const wxColour &colour );
-
-    virtual bool SetBackgroundStyle(wxBackgroundStyle style);
-
-    virtual int GetCharHeight() const;
-    virtual int GetCharWidth() const;
-    
-public:
-    virtual void SetScrollbar( int orient, int pos, int thumbVisible,
-                               int range, bool refresh = true );
-    virtual void SetScrollPos( int orient, int pos, bool refresh = true );
-    virtual int GetScrollPos( int orient ) const;
-    virtual int GetScrollThumb( int orient ) const;
-    virtual int GetScrollRange( int orient ) const;
-    virtual void ScrollWindow( int dx, int dy,
-                               const wxRect* rect = NULL );
-    virtual void AlwaysShowScrollbars(bool horz = true, bool vert = true);
-    virtual bool IsScrollbarAlwaysShown(int orient) const
-    {
-        return orient == wxHORIZONTAL ? m_hScrollBarAlwaysShown
-                                      : m_vScrollBarAlwaysShown;
-    }
-
-    virtual bool Reparent( wxWindowBase *newParent );
-
-#if wxUSE_HOTKEY && wxOSX_USE_COCOA_OR_CARBON
-    // hot keys (system wide accelerators)
-    // -----------------------------------
-    
-    virtual bool RegisterHotKey(int hotkeyId, int modifiers, int keycode);
-    virtual bool UnregisterHotKey(int hotkeyId);
-#endif // wxUSE_HOTKEY
-    
-#if wxUSE_DRAG_AND_DROP
-    virtual void SetDropTarget( wxDropTarget *dropTarget );
-#endif
-
-    // Accept files for dragging
-    virtual void DragAcceptFiles( bool accept );
-
-    // implementation from now on
-    // --------------------------
-
-    void MacClientToRootWindow( int *x , int *y ) const;
-
-    void MacWindowToRootWindow( int *x , int *y ) const;
-
-    void MacRootWindowToWindow( int *x , int *y ) const;
-
-    virtual wxString MacGetToolTipString( wxPoint &where );
-
-    // simple accessors
-    // ----------------
-
-    virtual WXWidget GetHandle() const;
-
-    virtual bool SetTransparent(wxByte alpha);
-    virtual bool CanSetTransparent();
-    virtual wxByte GetTransparent() const ;
-
-    // event handlers
-    // --------------
-
-    void OnMouseEvent( wxMouseEvent &event );
-
-    void MacOnScroll( wxScrollEvent&event );
-
-    virtual bool AcceptsFocus() const;
-
-    virtual bool IsDoubleBuffered() const { return true; }
-
-public:
-    static long         MacRemoveBordersFromStyle( long style ) ;
-
-public:
-    // For implementation purposes:
-    // sometimes decorations make the client area smaller
-    virtual wxPoint GetClientAreaOrigin() const;
-
-    wxWindowMac *FindItem(long id) const;
-    wxWindowMac *FindItemByHWND(WXHWND hWnd, bool controlOnly = false) const;
-
-    virtual void        TriggerScrollEvent( wxEventType scrollEvent ) ;
-    // this should not be overridden in classes above wxWindowMac
-    // because it is called from its destructor via DeleteChildren
-    virtual void        RemoveChild( wxWindowBase *child );
-
-    virtual bool        MacDoRedraw( long time ) ;
-    virtual void        MacPaintChildrenBorders();
-    virtual void        MacPaintBorders( int left , int top ) ;
-    void                MacPaintGrowBox();
-
-    // invalidates the borders and focus area around the control;
-    // must not be virtual as it will be called during destruction
-    void                MacInvalidateBorders() ;
-
-    WXWindow            MacGetTopLevelWindowRef() const ;
-    wxNonOwnedWindow*   MacGetTopLevelWindow() const ;
-
-    virtual long        MacGetWXBorderSize() const;
-    virtual long        MacGetLeftBorderSize() const ;
-    virtual long        MacGetRightBorderSize() const ;
-    virtual long        MacGetTopBorderSize() const ;
-    virtual long        MacGetBottomBorderSize() const ;
-
-    virtual void        MacSuperChangedPosition() ;
-
-    // absolute coordinates of this window's root have changed
-    virtual void        MacTopLevelWindowChangedPosition() ;
-
-    virtual void        MacChildAdded() ;
-    virtual void        MacVisibilityChanged() ;
-    virtual void        MacEnabledStateChanged() ;
-    virtual void        MacHiliteChanged() ;
-    virtual wxInt32     MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
-
-    bool                MacIsReallyEnabled() ;
-    bool                MacIsReallyHilited() ;
-
-#if WXWIN_COMPATIBILITY_2_8
-    bool                MacIsUserPane();
-#endif
-    bool                MacIsUserPane() const;
-
-    virtual bool        MacSetupCursor( const wxPoint& pt ) ;
-
-    // return the rectangle that would be visible of this control,
-    // regardless whether controls are hidden
-    // only taking into account clipping by parent windows
-    const wxRect&       MacGetClippedClientRect() const ;
-    const wxRect&       MacGetClippedRect() const ;
-    const wxRect&       MacGetClippedRectWithOuterStructure() const ;
-
-    // returns the visible region of this control in window ie non-client coordinates
-    const wxRegion&     MacGetVisibleRegion( bool includeOuterStructures = false ) ;
-
-    // returns true if children have to clipped to the content area
-    // (e.g., scrolled windows)
-    bool                MacClipChildren() const { return m_clipChildren ; }
-    void                MacSetClipChildren( bool clip ) { m_clipChildren = clip ; }
-
-    // returns true if the grandchildren need to be clipped to the children's content area
-    // (e.g., splitter windows)
-    virtual bool        MacClipGrandChildren() const { return false ; }
-    bool                MacIsWindowScrollbar( const wxWindow* sb ) const
-    { return ((wxWindow*)m_hScrollBar == sb || (wxWindow*)m_vScrollBar == sb) ; }
-    virtual bool IsClientAreaChild(const wxWindow *child) const
-    {
-        return !MacIsWindowScrollbar(child) && !((wxWindow*)m_growBox==child) &&
-               wxWindowBase::IsClientAreaChild(child);
-    }
-
-    void                MacPostControlCreate(const wxPoint& pos, const wxSize& size) ;
-    wxList&             GetSubcontrols() { return m_subControls; }
-
-    // translate wxWidgets coords into ones suitable
-    // to be passed to CreateControl calls
-    //
-    // returns true if non-default coords are returned, false otherwise
-    bool                MacGetBoundsForControl(const wxPoint& pos,
-                                           const wxSize& size,
-                                           int& x, int& y,
-                                           int& w, int& h , bool adjustForOrigin ) const ;
-
-    // the 'true' OS level control for this wxWindow
-    wxOSXWidgetImpl*    GetPeer() const;
-    
-    // optimization to avoid creating a user pane in wxWindow::Create if we already know
-    // we will replace it with our own peer
-    void                DontCreatePeer();
-
-    // return true unless DontCreatePeer() had been called
-    bool                ShouldCreatePeer() const;
-
-    // sets the native implementation wrapper, can replace an existing peer, use peer = NULL to 
-    // release existing peer
-    void                SetPeer(wxOSXWidgetImpl* peer);
-    
-    // wraps the already existing peer with the wrapper
-    void                SetWrappingPeer(wxOSXWidgetImpl* wrapper);
-
-#if wxOSX_USE_COCOA_OR_IPHONE
-    // the NSView or NSWindow of this window: can be used for both child and
-    // non-owned windows
-    //
-    // this is useful for a few Cocoa function which can work with either views
-    // or windows indiscriminately, e.g. for setting NSViewAnimationTargetKey
-    virtual void *OSXGetViewOrWindow() const;
-#endif // Cocoa
-
-    void *              MacGetCGContextRef() { return m_cgContextRef ; }
-    void                MacSetCGContextRef(void * cg) { m_cgContextRef = cg ; }
-
-    // osx specific event handling common for all osx-ports
-
-    virtual bool        OSXHandleClicked( double timestampsec );
-    virtual bool        OSXHandleKeyEvent( wxKeyEvent& event );
-    virtual void        OSXSimulateFocusEvents();
-
-    bool                IsNativeWindowWrapper() const { return m_isNativeWindowWrapper; }
-    
-    double              GetContentScaleFactor() const ;
-    
-    // internal response to size events
-    virtual void MacOnInternalSize() {}
-
-protected:
-    // For controls like radio buttons which are genuinely composite
-    wxList              m_subControls;
-
-    // the peer object, allowing for cleaner API support
-
-    void *              m_cgContextRef ;
-
-    // cache the clipped rectangles within the window hierarchy
-    void                MacUpdateClippedRects() const ;
-
-    mutable bool        m_cachedClippedRectValid ;
-    mutable wxRect      m_cachedClippedRectWithOuterStructure ;
-    mutable wxRect      m_cachedClippedRect ;
-    mutable wxRect      m_cachedClippedClientRect ;
-    mutable wxRegion    m_cachedClippedRegionWithOuterStructure ;
-    mutable wxRegion    m_cachedClippedRegion ;
-    mutable wxRegion    m_cachedClippedClientRegion ;
-
-    // insets of the mac control from the wx top left corner
-    wxPoint             m_macTopLeftInset ;
-    wxPoint             m_macBottomRightInset ;
-    wxByte              m_macAlpha ;
-
-    wxScrollBar*        m_hScrollBar ;
-    wxScrollBar*        m_vScrollBar ;
-    bool                m_hScrollBarAlwaysShown;
-    bool                m_vScrollBarAlwaysShown;
-    wxWindow*           m_growBox ;
-    wxString            m_label ;
-
-    bool                m_isNativeWindowWrapper;
-
-    // set to true if we do a sharp clip at the content area of this window
-    // must be dynamic as eg a panel normally is not clipping precisely, but if
-    // it becomes the target window of a scrolled window it has to...
-    bool                m_clipChildren ;
-
-    virtual bool        MacIsChildOfClientArea( const wxWindow* child ) const ;
-
-    bool                MacHasScrollBarCorner() const;
-    void                MacCreateScrollBars( long style ) ;
-    void                MacRepositionScrollBars() ;
-    void                MacUpdateControlFont() ;
-
-    // implement the base class pure virtuals
-    virtual void DoGetTextExtent(const wxString& string,
-                                 int *x, int *y,
-                                 int *descent = NULL,
-                                 int *externalLeading = NULL,
-                                 const wxFont *theFont = NULL ) const;
-
-    virtual void DoEnable( bool enable );
-#if wxUSE_MENUS
-    virtual bool DoPopupMenu( wxMenu *menu, int x, int y );
-#endif
-
-    virtual void DoFreeze();
-    virtual void DoThaw();
-
-    virtual wxSize DoGetBestSize() const;
-    virtual wxSize DoGetSizeFromClientSize( const wxSize & size ) const;
-    virtual void DoClientToScreen( int *x, int *y ) const;
-    virtual void DoScreenToClient( int *x, int *y ) const;
-    virtual void DoGetPosition( int *x, int *y ) const;
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual void DoGetClientSize( int *width, int *height ) const;
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-    virtual void DoSetClientSize(int width, int height);
-
-    virtual void DoCaptureMouse();
-    virtual void DoReleaseMouse();
-
-    // move the window to the specified location and resize it: this is called
-    // from both DoSetSize() and DoSetClientSize() and would usually just call
-    // ::MoveWindow() except for composite controls which will want to arrange
-    // themselves inside the given rectangle
-    virtual void DoMoveWindow( int x, int y, int width, int height );
-    virtual void DoSetWindowVariant( wxWindowVariant variant );
-
-#if wxUSE_TOOLTIPS
-    virtual void DoSetToolTip( wxToolTip *tip );
-#endif
-
-    // common part of Show/HideWithEffect()
-    virtual bool OSXShowWithEffect(bool show,
-                                   wxShowEffect effect,
-                                   unsigned timeout);
-
-private:
-    wxOSXWidgetImpl *   m_peer ;
-    // common part of all ctors
-    void Init();
-
-    // show/hide scrollbars as needed, common part of SetScrollbar() and
-    // AlwaysShowScrollbars()
-    void DoUpdateScrollbarVisibility();
-
-    wxDECLARE_NO_COPY_CLASS(wxWindowMac);
-    DECLARE_EVENT_TABLE()
-};
-
-#endif // _WX_WINDOW_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/advprops.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/advprops.h
deleted file mode 100644
index 16930c4bb9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/advprops.h
+++ /dev/null
@@ -1,519 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/propgrid/advprops.h
-// Purpose:     wxPropertyGrid Advanced Properties (font, colour, etc.)
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     2004-09-25
-// Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PROPGRID_ADVPROPS_H_
-#define _WX_PROPGRID_ADVPROPS_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_PROPGRID
-
-#include "wx/propgrid/props.h"
-
-// -----------------------------------------------------------------------
-
-//
-// Additional Value Type Handlers
-//
-bool WXDLLIMPEXP_PROPGRID
-operator==(const wxArrayInt& array1, const wxArrayInt& array2);
-
-//
-// Additional Property Editors
-//
-#if wxUSE_SPINBTN
-WX_PG_DECLARE_EDITOR_WITH_DECL(SpinCtrl,WXDLLIMPEXP_PROPGRID)
-#endif
-
-#if wxUSE_DATEPICKCTRL
-WX_PG_DECLARE_EDITOR_WITH_DECL(DatePickerCtrl,WXDLLIMPEXP_PROPGRID)
-#endif
-
-// -----------------------------------------------------------------------
-
-
-// Web colour is currently unsupported
-#define wxPG_COLOUR_WEB_BASE        0x10000
-//#define wxPG_TO_WEB_COLOUR(A)   ((wxUint32)(A+wxPG_COLOUR_WEB_BASE))
-
-
-#define wxPG_COLOUR_CUSTOM      0xFFFFFF
-#define wxPG_COLOUR_UNSPECIFIED (wxPG_COLOUR_CUSTOM+1)
-
-/** @class wxColourPropertyValue
-
-    Because text, background and other colours tend to differ between
-    platforms, wxSystemColourProperty must be able to select between system
-    colour and, when necessary, to pick a custom one. wxSystemColourProperty
-    value makes this possible.
-*/
-class WXDLLIMPEXP_PROPGRID wxColourPropertyValue : public wxObject
-{
-public:
-    /** An integer value relating to the colour, and which exact
-        meaning depends on the property with which it is used.
-
-        For wxSystemColourProperty:
-
-        Any of wxSYS_COLOUR_XXX, or any web-colour ( use wxPG_TO_WEB_COLOUR
-        macro - (currently unsupported) ), or wxPG_COLOUR_CUSTOM.
-
-        For custom colour properties without values array specified:
-
-        index or wxPG_COLOUR_CUSTOM
-
-        For custom colour properties <b>with</b> values array specified:
-
-        m_arrValues[index] or wxPG_COLOUR_CUSTOM
-    */
-    wxUint32    m_type;
-
-    /** Resulting colour. Should be correct regardless of type. */
-    wxColour    m_colour;
-
-    wxColourPropertyValue()
-        : wxObject()
-    {
-        m_type = 0;
-    }
-
-    virtual ~wxColourPropertyValue()
-    {
-    }
-
-    wxColourPropertyValue( const wxColourPropertyValue& v )
-        : wxObject()
-    {
-        m_type = v.m_type;
-        m_colour = v.m_colour;
-    }
-
-    void Init( wxUint32 type, const wxColour& colour )
-    {
-        m_type = type;
-        m_colour = colour;
-    }
-
-    wxColourPropertyValue( const wxColour& colour )
-        : wxObject()
-    {
-        m_type = wxPG_COLOUR_CUSTOM;
-        m_colour = colour;
-    }
-
-    wxColourPropertyValue( wxUint32 type )
-        : wxObject()
-    {
-        m_type = type;
-    }
-
-    wxColourPropertyValue( wxUint32 type, const wxColour& colour )
-        : wxObject()
-    {
-        Init( type, colour );
-    }
-
-    void operator=(const wxColourPropertyValue& cpv)
-    {
-        if (this != &cpv)
-            Init( cpv.m_type, cpv.m_colour );
-    }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxColourPropertyValue)
-};
-
-
-bool WXDLLIMPEXP_PROPGRID
-operator==(const wxColourPropertyValue&, const wxColourPropertyValue&);
-
-DECLARE_VARIANT_OBJECT_EXPORTED(wxColourPropertyValue, WXDLLIMPEXP_PROPGRID)
-
-// -----------------------------------------------------------------------
-// Declare part of custom colour property macro pairs.
-
-#if wxUSE_IMAGE
-    #include "wx/image.h"
-#endif
-
-// -----------------------------------------------------------------------
-
-/** @class wxFontProperty
-    @ingroup classes
-    Property representing wxFont.
-*/
-class WXDLLIMPEXP_PROPGRID wxFontProperty : public wxPGProperty
-{
-    WX_PG_DECLARE_PROPERTY_CLASS(wxFontProperty)
-public:
-
-    wxFontProperty(const wxString& label = wxPG_LABEL,
-                   const wxString& name = wxPG_LABEL,
-                   const wxFont& value = wxFont());
-    virtual ~wxFontProperty();
-    virtual void OnSetValue();
-    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
-    virtual bool OnEvent( wxPropertyGrid* propgrid,
-                          wxWindow* primary, wxEvent& event );
-    virtual wxVariant ChildChanged( wxVariant& thisValue,
-                                    int childIndex,
-                                    wxVariant& childValue ) const;
-    virtual void RefreshChildren();
-
-protected:
-};
-
-// -----------------------------------------------------------------------
-
-
-/** If set, then match from list is searched for a custom colour. */
-#define wxPG_PROP_TRANSLATE_CUSTOM      wxPG_PROP_CLASS_SPECIFIC_1
-
-
-/** @class wxSystemColourProperty
-    @ingroup classes
-    Has dropdown list of wxWidgets system colours. Value used is
-    of wxColourPropertyValue type.
-*/
-class WXDLLIMPEXP_PROPGRID wxSystemColourProperty : public wxEnumProperty
-{
-    WX_PG_DECLARE_PROPERTY_CLASS(wxSystemColourProperty)
-public:
-
-    wxSystemColourProperty( const wxString& label = wxPG_LABEL,
-                            const wxString& name = wxPG_LABEL,
-                            const wxColourPropertyValue&
-                                value = wxColourPropertyValue() );
-    virtual ~wxSystemColourProperty();
-
-    virtual void OnSetValue();
-    virtual bool IntToValue(wxVariant& variant,
-                            int number,
-                            int argFlags = 0) const;
-
-    /**
-        Override in derived class to customize how colours are printed as
-        strings.
-    */
-    virtual wxString ColourToString( const wxColour& col, int index,
-                                     int argFlags = 0 ) const;
-
-    /** Returns index of entry that triggers colour picker dialog
-        (default is last).
-    */
-    virtual int GetCustomColourIndex() const;
-
-    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
-    virtual bool StringToValue( wxVariant& variant,
-                                const wxString& text,
-                                int argFlags = 0 ) const;
-    virtual bool OnEvent( wxPropertyGrid* propgrid,
-                          wxWindow* primary, wxEvent& event );
-    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
-    virtual wxSize OnMeasureImage( int item ) const;
-    virtual void OnCustomPaint( wxDC& dc,
-                                const wxRect& rect, wxPGPaintData& paintdata );
-
-    // Helper function to show the colour dialog
-    bool QueryColourFromUser( wxVariant& variant ) const;
-
-    /** Default is to use wxSystemSettings::GetColour(index). Override to use
-        custom colour tables etc.
-    */
-    virtual wxColour GetColour( int index ) const;
-
-    wxColourPropertyValue GetVal( const wxVariant* pVariant = NULL ) const;
-
-protected:
-
-    // Special constructors to be used by derived classes.
-    wxSystemColourProperty( const wxString& label, const wxString& name,
-        const wxChar* const* labels, const long* values, wxPGChoices* choicesCache,
-        const wxColourPropertyValue& value );
-    wxSystemColourProperty( const wxString& label, const wxString& name,
-        const wxChar* const* labels, const long* values, wxPGChoices* choicesCache,
-        const wxColour& value );
-
-    void Init( int type, const wxColour& colour );
-
-    // Utility functions for internal use
-    virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const;
-    wxVariant TranslateVal( wxColourPropertyValue& v ) const
-    {
-        return DoTranslateVal( v );
-    }
-    wxVariant TranslateVal( int type, const wxColour& colour ) const
-    {
-        wxColourPropertyValue v(type, colour);
-        return DoTranslateVal( v );
-    }
-
-    // Translates colour to a int value, return wxNOT_FOUND if no match.
-    int ColToInd( const wxColour& colour ) const;
-};
-
-// -----------------------------------------------------------------------
-
-class WXDLLIMPEXP_PROPGRID wxColourProperty : public wxSystemColourProperty
-{
-    WX_PG_DECLARE_PROPERTY_CLASS(wxColourProperty)
-public:
-    wxColourProperty( const wxString& label = wxPG_LABEL,
-                      const wxString& name = wxPG_LABEL,
-                      const wxColour& value = *wxWHITE );
-    virtual ~wxColourProperty();
-
-    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
-    virtual wxColour GetColour( int index ) const;
-
-protected:
-    virtual wxVariant DoTranslateVal( wxColourPropertyValue& v ) const;
-
-private:
-    void Init( wxColour colour );
-};
-
-// -----------------------------------------------------------------------
-
-/** @class wxCursorProperty
-    @ingroup classes
-    Property representing wxCursor.
-*/
-class WXDLLIMPEXP_PROPGRID wxCursorProperty : public wxEnumProperty
-{
-    DECLARE_DYNAMIC_CLASS(wxCursorProperty)
-
-    wxCursorProperty( const wxString& label= wxPG_LABEL,
-                      const wxString& name= wxPG_LABEL,
-                      int value = 0 );
-    virtual ~wxCursorProperty();
-
-    virtual wxSize OnMeasureImage( int item ) const;
-    virtual void OnCustomPaint( wxDC& dc,
-                                const wxRect& rect, wxPGPaintData& paintdata );
-};
-
-// -----------------------------------------------------------------------
-
-#if wxUSE_IMAGE
-
-WXDLLIMPEXP_PROPGRID const wxString& wxPGGetDefaultImageWildcard();
-
-/** @class wxImageFileProperty
-    @ingroup classes
-    Property representing image file(name).
-*/
-class WXDLLIMPEXP_PROPGRID wxImageFileProperty : public wxFileProperty
-{
-    DECLARE_DYNAMIC_CLASS(wxImageFileProperty)
-public:
-
-    wxImageFileProperty( const wxString& label= wxPG_LABEL,
-                         const wxString& name = wxPG_LABEL,
-                         const wxString& value = wxEmptyString);
-    virtual ~wxImageFileProperty();
-
-    virtual void OnSetValue();
-
-    virtual wxSize OnMeasureImage( int item ) const;
-    virtual void OnCustomPaint( wxDC& dc,
-                                const wxRect& rect, wxPGPaintData& paintdata );
-
-protected:
-    wxBitmap*   m_pBitmap; // final thumbnail area
-    wxImage*    m_pImage; // intermediate thumbnail area
-
-private:
-    // Initialize m_pImage using the current file name.
-    void LoadImageFromFile();
-};
-
-#endif
-
-#if wxUSE_CHOICEDLG
-
-/** @class wxMultiChoiceProperty
-    @ingroup classes
-    Property that manages a value resulting from wxMultiChoiceDialog. Value is
-    array of strings. You can get value as array of choice values/indices by
-    calling wxMultiChoiceProperty::GetValueAsArrayInt().
-
-    <b>Supported special attributes:</b>
-    - "UserStringMode": If > 0, allow user to manually enter strings that are
-      not in the list of choices. If this value is 1, user strings are
-      preferably placed in front of valid choices. If value is 2, then those
-      strings will placed behind valid choices.
-*/
-class WXDLLIMPEXP_PROPGRID wxMultiChoiceProperty : public wxPGProperty
-{
-    WX_PG_DECLARE_PROPERTY_CLASS(wxMultiChoiceProperty)
-public:
-
-    wxMultiChoiceProperty( const wxString& label,
-                           const wxString& name,
-                           const wxArrayString& strings,
-                           const wxArrayString& value );
-    wxMultiChoiceProperty( const wxString& label,
-                           const wxString& name,
-                           const wxPGChoices& choices,
-                           const wxArrayString& value = wxArrayString() );
-
-    wxMultiChoiceProperty( const wxString& label = wxPG_LABEL,
-                           const wxString& name = wxPG_LABEL,
-                           const wxArrayString& value = wxArrayString() );
-
-    virtual ~wxMultiChoiceProperty();
-
-    virtual void OnSetValue();
-    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
-    virtual bool StringToValue(wxVariant& variant,
-                               const wxString& text,
-                               int argFlags = 0) const;
-    virtual bool OnEvent( wxPropertyGrid* propgrid,
-                          wxWindow* primary, wxEvent& event );
-
-    wxArrayInt GetValueAsArrayInt() const
-    {
-        return m_choices.GetValuesForStrings(m_value.GetArrayString());
-    }
-
-protected:
-
-    void GenerateValueAsString( wxVariant& value, wxString* target ) const;
-
-    // Returns translation of values into string indices.
-    wxArrayInt GetValueAsIndices() const;
-
-    wxArrayString       m_valueAsStrings;  // Value as array of strings
-
-    // Cache displayed text since generating it is relatively complicated.
-    wxString            m_display;
-};
-
-#endif // wxUSE_CHOICEDLG
-
-// -----------------------------------------------------------------------
-
-#if wxUSE_DATETIME
-
-/** @class wxDateProperty
-    @ingroup classes
-    Property representing wxDateTime.
-
-    <b>Supported special attributes:</b>
-    - "DateFormat": Determines displayed date format.
-    - "PickerStyle": Determines window style used with wxDatePickerCtrl.
-       Default is wxDP_DEFAULT | wxDP_SHOWCENTURY. Using wxDP_ALLOWNONE
-       enables additional support for unspecified property value.
-*/
-class WXDLLIMPEXP_PROPGRID wxDateProperty : public wxPGProperty
-{
-    WX_PG_DECLARE_PROPERTY_CLASS(wxDateProperty)
-public:
-
-    wxDateProperty( const wxString& label = wxPG_LABEL,
-                    const wxString& name = wxPG_LABEL,
-                    const wxDateTime& value = wxDateTime() );
-    virtual ~wxDateProperty();
-
-    virtual void OnSetValue();
-    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
-    virtual bool StringToValue(wxVariant& variant,
-                               const wxString& text,
-                               int argFlags = 0) const;
-
-    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
-
-    void SetFormat( const wxString& format )
-    {
-        m_format = format;
-    }
-
-    const wxString& GetFormat() const
-    {
-        return m_format;
-    }
-
-    void SetDateValue( const wxDateTime& dt )
-    {
-        //m_valueDateTime = dt;
-        m_value = dt;
-    }
-
-    wxDateTime GetDateValue() const
-    {
-        //return m_valueDateTime;
-        return m_value;
-    }
-
-    long GetDatePickerStyle() const
-    {
-        return m_dpStyle;
-    }
-
-protected:
-    wxString        m_format;
-    long            m_dpStyle;  // DatePicker style
-
-    static wxString ms_defaultDateFormat;
-    static wxString DetermineDefaultDateFormat( bool showCentury );
-};
-
-#endif // wxUSE_DATETIME
-
-// -----------------------------------------------------------------------
-
-#if wxUSE_SPINBTN
-
-//
-// Implement an editor control that allows using wxSpinCtrl (actually, a
-// combination of wxTextCtrl and wxSpinButton) to edit value of wxIntProperty
-// and wxFloatProperty (and similar).
-//
-// Note that new editor classes needs to be registered before use. This can be
-// accomplished using wxPGRegisterEditorClass macro, which is used for SpinCtrl
-// in wxPropertyGridInterface::RegisterAdditionalEditors (see below).
-// Registration can also be performed in a constructor of a property that is
-// likely to require the editor in question.
-//
-
-
-#include "wx/spinbutt.h"
-#include "wx/propgrid/editors.h"
-
-
-// NOTE: Regardless that this class inherits from a working editor, it has
-//   all necessary methods to work independently. wxTextCtrl stuff is only
-//   used for event handling here.
-class WXDLLIMPEXP_PROPGRID wxPGSpinCtrlEditor : public wxPGTextCtrlEditor
-{
-    DECLARE_DYNAMIC_CLASS(wxPGSpinCtrlEditor)
-public:
-    virtual ~wxPGSpinCtrlEditor();
-
-    wxString GetName() const;
-    virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
-                                          wxPGProperty* property,
-                                          const wxPoint& pos,
-                                          const wxSize& size) const;
-    virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property,
-        wxWindow* wnd, wxEvent& event ) const;
-
-private:
-    mutable wxString m_tempString;
-};
-
-#endif // wxUSE_SPINBTN
-
-// -----------------------------------------------------------------------
-
-#endif // wxUSE_PROPGRID
-
-#endif // _WX_PROPGRID_ADVPROPS_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/editors.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/editors.h
deleted file mode 100644
index 475d274998..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/editors.h
+++ /dev/null
@@ -1,559 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/propgrid/editors.h
-// Purpose:     wxPropertyGrid editors
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     2007-04-14
-// Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PROPGRID_EDITORS_H_
-#define _WX_PROPGRID_EDITORS_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_PROPGRID
-
-class WXDLLIMPEXP_FWD_PROPGRID wxPGCell;
-class WXDLLIMPEXP_FWD_PROPGRID wxPGProperty;
-class WXDLLIMPEXP_FWD_PROPGRID wxPropertyGrid;
-
-// -----------------------------------------------------------------------
-// wxPGWindowList contains list of editor windows returned by CreateControls.
-
-class wxPGWindowList
-{
-public:
-    wxPGWindowList()
-    {
-        m_primary = m_secondary = NULL;
-    }
-
-    void SetSecondary( wxWindow* secondary ) { m_secondary = secondary; }
-
-    wxWindow*   m_primary;
-    wxWindow*   m_secondary;
-
-    wxPGWindowList( wxWindow* a )
-    {
-        m_primary = a;
-        m_secondary = NULL;
-    }
-    wxPGWindowList( wxWindow* a, wxWindow* b )
-    {
-        m_primary = a;
-        m_secondary = b;
-    }
-};
-
-// -----------------------------------------------------------------------
-
-/** @class wxPGEditor
-
-    Base class for custom wxPropertyGrid editors.
-
-    @remarks
-    - Names of builtin property editors are: TextCtrl, Choice,
-      ComboBox, CheckBox, TextCtrlAndButton, and ChoiceAndButton. Additional
-      editors include SpinCtrl and DatePickerCtrl, but using them requires
-      calling wxPropertyGrid::RegisterAdditionalEditors() prior use.
-
-    - Pointer to builtin editor is available as wxPGEditor_EditorName
-      (eg. wxPGEditor_TextCtrl).
-
-    - To add new editor you need to register it first using static function
-      wxPropertyGrid::RegisterEditorClass(), with code like this:
-        @code
-            wxPGEditor *editorPointer = wxPropertyGrid::RegisterEditorClass(
-                                            new MyEditorClass(), "MyEditor");
-        @endcode
-      After that, wxPropertyGrid will take ownership of the given object, but
-      you should still store editorPointer somewhere, so you can pass it to
-      wxPGProperty::SetEditor(), or return it from
-      wxPGEditor::DoGetEditorClass().
-
-    @library{wxpropgrid}
-    @category{propgrid}
-*/
-class WXDLLIMPEXP_PROPGRID wxPGEditor : public wxObject
-{
-    DECLARE_ABSTRACT_CLASS(wxPGEditor)
-public:
-
-    /** Constructor. */
-    wxPGEditor()
-        : wxObject()
-    {
-        m_clientData = NULL;
-    }
-
-    /** Destructor. */
-    virtual ~wxPGEditor();
-
-    /**
-        Returns pointer to the name of the editor. For example,
-        wxPGEditor_TextCtrl has name "TextCtrl". If you dont' need to access
-        your custom editor by string name, then you do not need to implement
-        this function.
-    */
-    virtual wxString GetName() const;
-
-    /**
-        Instantiates editor controls.
-
-        @param propgrid
-            wxPropertyGrid to which the property belongs (use as parent for
-            control).
-        @param property
-            Property for which this method is called.
-        @param pos
-            Position, inside wxPropertyGrid, to create control(s) to.
-        @param size
-            Initial size for control(s).
-
-        @remarks
-        - Primary control shall use id wxPG_SUBID1, and secondary (button)
-          control shall use wxPG_SUBID2.
-        - Unlike in previous version of wxPropertyGrid, it is no longer
-          necessary to call wxEvtHandler::Connect() for interesting editor
-          events. Instead, all events from control are now automatically
-          forwarded to wxPGEditor::OnEvent() and wxPGProperty::OnEvent().
-    */
-    virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
-                                          wxPGProperty* property,
-                                          const wxPoint& pos,
-                                          const wxSize& size) const = 0;
-
-    /** Loads value from property to the control. */
-    virtual void UpdateControl( wxPGProperty* property,
-                                wxWindow* ctrl ) const = 0;
-
-    /**
-        Used to get the renderer to draw the value with when the control is
-        hidden.
-
-        Default implementation returns g_wxPGDefaultRenderer.
-    */
-    //virtual wxPGCellRenderer* GetCellRenderer() const;
-
-    /** Draws value for given property.
-    */
-    virtual void DrawValue( wxDC& dc,
-                            const wxRect& rect,
-                            wxPGProperty* property,
-                            const wxString& text ) const;
-
-    /** Handles events. Returns true if value in control was modified
-        (see wxPGProperty::OnEvent for more information).
-
-        @remarks wxPropertyGrid will automatically unfocus the editor when
-                wxEVT_TEXT_ENTER is received and when it results in
-                property value being modified. This happens regardless of
-                editor type (ie. behaviour is same for any wxTextCtrl and
-                wxComboBox based editor).
-    */
-    virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property,
-        wxWindow* wnd_primary, wxEvent& event ) const = 0;
-
-    /** Returns value from control, via parameter 'variant'.
-        Usually ends up calling property's StringToValue or IntToValue.
-        Returns true if value was different.
-    */
-    virtual bool GetValueFromControl( wxVariant& variant,
-                                      wxPGProperty* property,
-                                      wxWindow* ctrl ) const;
-
-    /**
-        Sets new appearance for the control. Default implementation
-        sets foreground colour, background colour, font, plus text
-        for wxTextCtrl and wxComboCtrl.
-
-        @param appearance
-            New appearance to be applied.
-
-        @param oldAppearance
-            Previously applied appearance. Used to detect which
-            control attributes need to be changed (e.g. so we only
-            change background colour if really needed).
-
-        @param unspecified
-            @true if the new appearance represents an unspecified
-            property value.
-    */
-    virtual void SetControlAppearance( wxPropertyGrid* pg,
-                                       wxPGProperty* property,
-                                       wxWindow* ctrl,
-                                       const wxPGCell& appearance,
-                                       const wxPGCell& oldAppearance,
-                                       bool unspecified ) const;
-
-    /**
-        Sets value in control to unspecified.
-    */
-    virtual void SetValueToUnspecified( wxPGProperty* property,
-                                        wxWindow* ctrl ) const;
-
-    /** Sets control's value specifically from string. */
-    virtual void SetControlStringValue( wxPGProperty* property,
-                                        wxWindow* ctrl,
-                                        const wxString& txt ) const;
-
-    /** Sets control's value specifically from int (applies to choice etc.). */
-    virtual void SetControlIntValue( wxPGProperty* property,
-                                     wxWindow* ctrl,
-                                     int value ) const;
-
-    /** Inserts item to existing control. Index -1 means appending.
-        Default implementation does nothing. Returns index of item added.
-    */
-    virtual int InsertItem( wxWindow* ctrl,
-                            const wxString& label,
-                            int index ) const;
-
-    /** Deletes item from existing control.
-        Default implementation does nothing.
-    */
-    virtual void DeleteItem( wxWindow* ctrl, int index ) const;
-
-    /** Extra processing when control gains focus. For example, wxTextCtrl
-        based controls should select all text.
-    */
-    virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const;
-
-    /** Returns true if control itself can contain the custom image. Default is
-        to return false.
-    */
-    virtual bool CanContainCustomImage() const;
-
-    //
-    // This member is public so scripting language bindings
-    // wrapper code can access it freely.
-    void*       m_clientData;
-};
-
-
-#define WX_PG_IMPLEMENT_INTERNAL_EDITOR_CLASS(EDITOR,CLASSNAME,BASECLASS) \
-IMPLEMENT_DYNAMIC_CLASS(CLASSNAME, BASECLASS) \
-wxString CLASSNAME::GetName() const \
-{ \
-    return wxS(#EDITOR); \
-} \
-wxPGEditor* wxPGEditor_##EDITOR = NULL;
-
-
-//
-// Following are the built-in editor classes.
-//
-
-class WXDLLIMPEXP_PROPGRID wxPGTextCtrlEditor : public wxPGEditor
-{
-    DECLARE_DYNAMIC_CLASS(wxPGTextCtrlEditor)
-public:
-    wxPGTextCtrlEditor() {}
-    virtual ~wxPGTextCtrlEditor();
-
-    virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
-                                          wxPGProperty* property,
-                                          const wxPoint& pos,
-                                          const wxSize& size) const;
-    virtual void UpdateControl( wxPGProperty* property,
-                                wxWindow* ctrl ) const;
-    virtual bool OnEvent( wxPropertyGrid* propgrid,
-                          wxPGProperty* property,
-                          wxWindow* primaryCtrl,
-                          wxEvent& event ) const;
-    virtual bool GetValueFromControl( wxVariant& variant,
-                                      wxPGProperty* property,
-                                      wxWindow* ctrl ) const;
-
-    virtual wxString GetName() const;
-
-    //virtual wxPGCellRenderer* GetCellRenderer() const;
-    virtual void SetControlStringValue( wxPGProperty* property,
-                                        wxWindow* ctrl,
-                                        const wxString& txt ) const;
-    virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const;
-
-    // Provided so that, for example, ComboBox editor can use the same code
-    // (multiple inheritance would get way too messy).
-    static bool OnTextCtrlEvent( wxPropertyGrid* propgrid,
-                                 wxPGProperty* property,
-                                 wxWindow* ctrl,
-                                 wxEvent& event );
-
-    static bool GetTextCtrlValueFromControl( wxVariant& variant,
-                                             wxPGProperty* property,
-                                             wxWindow* ctrl );
-
-};
-
-
-class WXDLLIMPEXP_PROPGRID wxPGChoiceEditor : public wxPGEditor
-{
-    DECLARE_DYNAMIC_CLASS(wxPGChoiceEditor)
-public:
-    wxPGChoiceEditor() {}
-    virtual ~wxPGChoiceEditor();
-
-    virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
-                                          wxPGProperty* property,
-                                          const wxPoint& pos,
-                                          const wxSize& size) const;
-    virtual void UpdateControl( wxPGProperty* property,
-                                wxWindow* ctrl ) const;
-    virtual bool OnEvent( wxPropertyGrid* propgrid,
-                          wxPGProperty* property,
-                          wxWindow* primaryCtrl,
-                          wxEvent& event ) const;
-    virtual bool GetValueFromControl( wxVariant& variant,
-                                      wxPGProperty* property,
-                                      wxWindow* ctrl ) const;
-    virtual void SetValueToUnspecified( wxPGProperty* property,
-                                        wxWindow* ctrl ) const;
-    virtual wxString GetName() const;
-
-    virtual void SetControlIntValue( wxPGProperty* property,
-                                     wxWindow* ctrl,
-                                     int value ) const;
-    virtual void SetControlStringValue( wxPGProperty* property,
-                                        wxWindow* ctrl,
-                                        const wxString& txt ) const;
-
-    virtual int InsertItem( wxWindow* ctrl,
-                            const wxString& label,
-                            int index ) const;
-    virtual void DeleteItem( wxWindow* ctrl, int index ) const;
-    virtual bool CanContainCustomImage() const;
-
-    // CreateControls calls this with CB_READONLY in extraStyle
-    wxWindow* CreateControlsBase( wxPropertyGrid* propgrid,
-                                  wxPGProperty* property,
-                                  const wxPoint& pos,
-                                  const wxSize& sz,
-                                  long extraStyle ) const;
-
-};
-
-
-class WXDLLIMPEXP_PROPGRID wxPGComboBoxEditor : public wxPGChoiceEditor
-{
-    DECLARE_DYNAMIC_CLASS(wxPGComboBoxEditor)
-public:
-    wxPGComboBoxEditor() {}
-    virtual ~wxPGComboBoxEditor();
-
-    virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
-                                          wxPGProperty* property,
-                                          const wxPoint& pos,
-                                          const wxSize& size) const;
-
-    virtual wxString GetName() const;
-
-    virtual void UpdateControl( wxPGProperty* property, wxWindow* ctrl ) const;
-
-    virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property,
-        wxWindow* ctrl, wxEvent& event ) const;
-
-    virtual bool GetValueFromControl( wxVariant& variant,
-                                      wxPGProperty* property,
-                                      wxWindow* ctrl ) const;
-
-    virtual void OnFocus( wxPGProperty* property, wxWindow* wnd ) const;
-
-};
-
-
-class WXDLLIMPEXP_PROPGRID wxPGChoiceAndButtonEditor : public wxPGChoiceEditor
-{
-public:
-    wxPGChoiceAndButtonEditor() {}
-    virtual ~wxPGChoiceAndButtonEditor();
-    virtual wxString GetName() const;
-
-    virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
-                                          wxPGProperty* property,
-                                          const wxPoint& pos,
-                                          const wxSize& size) const;
-
-    DECLARE_DYNAMIC_CLASS(wxPGChoiceAndButtonEditor)
-};
-
-class WXDLLIMPEXP_PROPGRID
-wxPGTextCtrlAndButtonEditor : public wxPGTextCtrlEditor
-{
-public:
-    wxPGTextCtrlAndButtonEditor() {}
-    virtual ~wxPGTextCtrlAndButtonEditor();
-    virtual wxString GetName() const;
-
-    virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
-                                          wxPGProperty* property,
-                                          const wxPoint& pos,
-                                          const wxSize& size) const;
-
-    DECLARE_DYNAMIC_CLASS(wxPGTextCtrlAndButtonEditor)
-};
-
-
-#if wxPG_INCLUDE_CHECKBOX
-
-//
-// Use custom check box code instead of native control
-// for cleaner (ie. more integrated) look.
-//
-class WXDLLIMPEXP_PROPGRID wxPGCheckBoxEditor : public wxPGEditor
-{
-    DECLARE_DYNAMIC_CLASS(wxPGCheckBoxEditor)
-public:
-    wxPGCheckBoxEditor() {}
-    virtual ~wxPGCheckBoxEditor();
-
-    virtual wxString GetName() const;
-    virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
-                                          wxPGProperty* property,
-                                          const wxPoint& pos,
-                                          const wxSize& size) const;
-    virtual void UpdateControl( wxPGProperty* property,
-                                wxWindow* ctrl ) const;
-    virtual bool OnEvent( wxPropertyGrid* propgrid,
-                          wxPGProperty* property,
-                          wxWindow* primaryCtrl,
-                          wxEvent& event ) const;
-    virtual bool GetValueFromControl( wxVariant& variant,
-                                      wxPGProperty* property,
-                                      wxWindow* ctrl ) const;
-    virtual void SetValueToUnspecified( wxPGProperty* property,
-                                        wxWindow* ctrl ) const;
-
-    virtual void DrawValue( wxDC& dc,
-                            const wxRect& rect,
-                            wxPGProperty* property,
-                            const wxString& text ) const;
-    //virtual wxPGCellRenderer* GetCellRenderer() const;
-
-    virtual void SetControlIntValue( wxPGProperty* property,
-                                     wxWindow* ctrl,
-                                     int value ) const;
-};
-
-#endif
-
-
-// -----------------------------------------------------------------------
-// Editor class registeration macro (mostly for internal use)
-
-#define wxPGRegisterEditorClass(EDITOR) \
-    if ( wxPGEditor_##EDITOR == NULL ) \
-    { \
-        wxPGEditor_##EDITOR = wxPropertyGrid::RegisterEditorClass( \
-                new wxPG##EDITOR##Editor ); \
-    }
-
-// -----------------------------------------------------------------------
-
-/** @class wxPGEditorDialogAdapter
-
-    Derive a class from this to adapt an existing editor dialog or function to
-    be used when editor button of a property is pushed.
-
-    You only need to derive class and implement DoShowDialog() to create and
-    show the dialog, and finally submit the value returned by the dialog
-    via SetValue().
-
-    @library{wxpropgrid}
-    @category{propgrid}
-*/
-class WXDLLIMPEXP_PROPGRID wxPGEditorDialogAdapter : public wxObject
-{
-    DECLARE_ABSTRACT_CLASS(wxPGEditorDialogAdapter)
-public:
-    wxPGEditorDialogAdapter()
-        : wxObject()
-    {
-        m_clientData = NULL;
-    }
-
-    virtual ~wxPGEditorDialogAdapter() { }
-
-    bool ShowDialog( wxPropertyGrid* propGrid, wxPGProperty* property );
-
-    virtual bool DoShowDialog( wxPropertyGrid* propGrid,
-                               wxPGProperty* property ) = 0;
-
-    void SetValue( wxVariant value )
-    {
-        m_value = value;
-    }
-
-    /**
-        This method is typically only used if deriving class from existing
-        adapter with value conversion purposes.
-    */
-    wxVariant& GetValue() { return m_value; }
-
-    //
-    // This member is public so scripting language bindings
-    // wrapper code can access it freely.
-    void*               m_clientData;
-
-private:
-    wxVariant           m_value;
-};
-
-// -----------------------------------------------------------------------
-
-
-/** @class wxPGMultiButton
-
-    This class can be used to have multiple buttons in a property editor.
-    You will need to create a new property editor class, override
-    CreateControls, and have it return wxPGMultiButton instance in
-    wxPGWindowList::SetSecondary().
-*/
-class WXDLLIMPEXP_PROPGRID wxPGMultiButton : public wxWindow
-{
-public:
-    wxPGMultiButton( wxPropertyGrid* pg, const wxSize& sz );
-    virtual ~wxPGMultiButton() {}
-
-    wxWindow* GetButton( unsigned int i ) { return (wxWindow*) m_buttons[i]; }
-    const wxWindow* GetButton( unsigned int i ) const
-        { return (const wxWindow*) m_buttons[i]; }
-
-    /** Utility function to be used in event handlers.
-    */
-    int GetButtonId( unsigned int i ) const { return GetButton(i)->GetId(); }
-
-    /** Returns number of buttons.
-    */
-    unsigned int GetCount() const { return (unsigned int) m_buttons.size(); }
-
-    void Add( const wxString& label, int id = -2 );
-#if wxUSE_BMPBUTTON
-    void Add( const wxBitmap& bitmap, int id = -2 );
-#endif
-
-    wxSize GetPrimarySize() const
-    {
-        return wxSize(m_fullEditorSize.x - m_buttonsWidth, m_fullEditorSize.y);
-    }
-
-    void Finalize( wxPropertyGrid* propGrid, const wxPoint& pos );
-
-protected:
-
-    void DoAddButton( wxWindow* button, const wxSize& sz );
-
-    int GenId( int id ) const;
-
-    wxArrayPtrVoid  m_buttons;
-    wxSize          m_fullEditorSize;
-    int             m_buttonsWidth;
-};
-
-// -----------------------------------------------------------------------
-
-#endif // wxUSE_PROPGRID
-
-#endif // _WX_PROPGRID_EDITORS_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/manager.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/manager.h
deleted file mode 100644
index 12e977b667..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/manager.h
+++ /dev/null
@@ -1,768 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/propgrid/manager.h
-// Purpose:     wxPropertyGridManager
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     2005-01-14
-// Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PROPGRID_MANAGER_H_
-#define _WX_PROPGRID_MANAGER_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_PROPGRID
-
-#include "wx/propgrid/propgrid.h"
-
-#include "wx/dcclient.h"
-#include "wx/scrolwin.h"
-#include "wx/toolbar.h"
-#include "wx/stattext.h"
-#include "wx/button.h"
-#include "wx/textctrl.h"
-#include "wx/dialog.h"
-#include "wx/headerctrl.h"
-
-// -----------------------------------------------------------------------
-
-#ifndef SWIG
-extern WXDLLIMPEXP_DATA_PROPGRID(const char) wxPropertyGridManagerNameStr[];
-#endif
-
-/** @class wxPropertyGridPage
-
-    Holder of property grid page information. You can subclass this and
-    give instance in wxPropertyGridManager::AddPage. It inherits from
-    wxEvtHandler and can be used to process events specific to this
-    page (id of events will still be same as manager's). If you don't
-    want to use it to process all events of the page, you need to
-    return false in the derived wxPropertyGridPage::IsHandlingAllEvents.
-
-    Please note that wxPropertyGridPage lacks many non-const property
-    manipulation functions found in wxPropertyGridManager. Please use
-    parent manager (m_manager member variable) when needed.
-
-    Please note that most member functions are inherited and as such not
-    documented on this page. This means you will probably also want to read
-    wxPropertyGridInterface class reference.
-
-    @section propgridpage_event_handling Event Handling
-
-    wxPropertyGridPage receives events emitted by its wxPropertyGridManager, but
-    only those events that are specific to that page. If
-    wxPropertyGridPage::IsHandlingAllEvents returns false, then unhandled
-    events are sent to the manager's parent, as usual.
-
-    See @ref propgrid_event_handling "wxPropertyGrid Event Handling"
-    for more information.
-
-    @library{wxpropgrid}
-    @category{propgrid}
-*/
-class WXDLLIMPEXP_PROPGRID wxPropertyGridPage : public wxEvtHandler,
-                                                public wxPropertyGridInterface,
-                                                public wxPropertyGridPageState
-{
-    friend class wxPropertyGridManager;
-    DECLARE_CLASS(wxPropertyGridPage)
-public:
-
-    wxPropertyGridPage();
-    virtual ~wxPropertyGridPage();
-
-    /** Deletes all properties on page.
-    */
-    virtual void Clear();
-
-    /**
-        Reduces column sizes to minimum possible that contents are still
-        visibly (naturally some margin space will be applied as well).
-
-        @return
-        Minimum size for the page to still display everything.
-
-        @remarks
-        This function only works properly if size of containing grid was
-        already fairly large.
-
-        Note that you can also get calculated column widths by calling
-        GetColumnWidth() immediately after this function returns.
-    */
-    wxSize FitColumns();
-
-    /** Returns page index in manager;
-    */
-    inline int GetIndex() const;
-
-    /** Returns x-coordinate position of splitter on a page.
-    */
-    int GetSplitterPosition( int col = 0 ) const
-        { return GetStatePtr()->DoGetSplitterPosition(col); }
-
-    /** Returns "root property". It does not have name, etc. and it is not
-        visible. It is only useful for accessing its children.
-    */
-    wxPGProperty* GetRoot() const { return GetStatePtr()->DoGetRoot(); }
-
-    /** Return pointer to contained property grid state.
-    */
-    wxPropertyGridPageState* GetStatePtr()
-    {
-        return this;
-    }
-
-    /** Return pointer to contained property grid state.
-    */
-    const wxPropertyGridPageState* GetStatePtr() const
-    {
-        return this;
-    }
-
-    /**
-        Returns id of the tool bar item that represents this page on
-        wxPropertyGridManager's wxToolBar.
-    */
-    int GetToolId() const
-    {
-        return m_toolId;
-    }
-
-    /** Do any member initialization in this method.
-        @remarks
-        - Called every time the page is added into a manager.
-        - You can add properties to the page here.
-    */
-    virtual void Init() {}
-
-    /** Return false here to indicate unhandled events should be
-        propagated to manager's parent, as normal.
-    */
-    virtual bool IsHandlingAllEvents() const { return true; }
-
-    /** Called every time page is about to be shown.
-        Useful, for instance, creating properties just-in-time.
-    */
-    virtual void OnShow();
-
-    virtual void RefreshProperty( wxPGProperty* p );
-
-    /** Sets splitter position on page.
-        @remarks
-        Splitter position cannot exceed grid size, and therefore setting it
-        during form creation may fail as initial grid size is often smaller
-        than desired splitter position, especially when sizers are being used.
-    */
-    void SetSplitterPosition( int splitterPos, int col = 0 );
-
-protected:
-
-    /** Propagate to other pages.
-    */
-    virtual void DoSetSplitterPosition( int pos,
-                                        int splitterColumn = 0,
-                                        int flags = wxPG_SPLITTER_REFRESH );
-
-    /** Page label (may be referred as name in some parts of documentation).
-        Can be set in constructor, or passed in
-        wxPropertyGridManager::AddPage(), but *not* in both.
-    */
-    wxString                m_label;
-
-    //virtual bool ProcessEvent( wxEvent& event );
-
-    wxPropertyGridManager*  m_manager;
-
-    // Toolbar tool id. Note that this is only valid when the tool bar
-    // exists.
-    int                     m_toolId;
-
-private:
-    bool                    m_isDefault; // is this base page object?
-
-    DECLARE_EVENT_TABLE()
-};
-
-// -----------------------------------------------------------------------
-
-#if wxUSE_HEADERCTRL
-class wxPGHeaderCtrl;
-#endif
-
-
-/** @class wxPropertyGridManager
-
-    wxPropertyGridManager is an efficient multi-page version of wxPropertyGrid,
-    which can optionally have toolbar for mode and page selection, and help
-    text box.
-    Use window flags to select components to include.
-
-    @section propgridmanager_window_styles_ Window Styles
-
-    See @ref propgrid_window_styles.
-
-    @section propgridmanager_event_handling Event Handling
-
-    See @ref propgrid_event_handling "wxPropertyGrid Event Handling"
-    for more information.
-
-    @library{wxpropgrid}
-    @category{propgrid}
-*/
-class WXDLLIMPEXP_PROPGRID
-    wxPropertyGridManager : public wxPanel, public wxPropertyGridInterface
-{
-    DECLARE_CLASS(wxPropertyGridManager)
-    friend class wxPropertyGridPage;
-public:
-
-#ifndef SWIG
-    /**
-        Two step constructor.
-        Call Create when this constructor is called to build up the
-        wxPropertyGridManager.
-      */
-    wxPropertyGridManager();
-#endif
-
-    /** The default constructor. The styles to be used are styles valid for
-        the wxWindow.
-        @see @link wndflags Additional Window Styles@endlink
-    */
-    wxPropertyGridManager( wxWindow *parent, wxWindowID id = wxID_ANY,
-                           const wxPoint& pos = wxDefaultPosition,
-                           const wxSize& size = wxDefaultSize,
-                           long style = wxPGMAN_DEFAULT_STYLE,
-                           const wxString& name = wxPropertyGridManagerNameStr );
-
-    /** Destructor */
-    virtual ~wxPropertyGridManager();
-
-    /** Creates new property page. Note that the first page is not created
-        automatically.
-        @param label
-        A label for the page. This may be shown as a toolbar tooltip etc.
-        @param bmp
-        Bitmap image for toolbar. If wxNullBitmap is used, then a built-in
-        default image is used.
-        @param pageObj
-        wxPropertyGridPage instance. Manager will take ownership of this object.
-        NULL indicates that a default page instance should be created.
-
-        @return
-        Returns pointer to created page.
-
-        @remarks
-        If toolbar is used, it is highly recommended that the pages are
-        added when the toolbar is not turned off using window style flag
-        switching.
-    */
-    wxPropertyGridPage* AddPage( const wxString& label = wxEmptyString,
-                                 const wxBitmap& bmp = wxPG_NULL_BITMAP,
-                                 wxPropertyGridPage* pageObj = NULL )
-    {
-        return InsertPage(-1, label, bmp, pageObj);
-    }
-
-    /** Deletes all all properties and all pages.
-    */
-    virtual void Clear();
-
-    /** Deletes all properties on given page.
-    */
-    void ClearPage( int page );
-
-    /** Forces updating the value of property from the editor control.
-        Returns true if DoPropertyChanged was actually called.
-    */
-    bool CommitChangesFromEditor( wxUint32 flags = 0 )
-    {
-        return m_pPropGrid->CommitChangesFromEditor(flags);
-    }
-
-    /**
-        Two step creation.
-        Whenever the control is created without any parameters, use Create to
-        actually create it. Don't access the control's public methods before
-        this is called.
-        @see @link wndflags Additional Window Styles@endlink
-    */
-    bool Create( wxWindow *parent, wxWindowID id = wxID_ANY,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = wxPGMAN_DEFAULT_STYLE,
-                 const wxString& name = wxPropertyGridManagerNameStr );
-
-    /**
-        Enables or disables (shows/hides) categories according to parameter
-        enable.
-
-        WARNING: Not tested properly, use at your own risk.
-    */
-    bool EnableCategories( bool enable )
-    {
-        long fl = m_windowStyle | wxPG_HIDE_CATEGORIES;
-        if ( enable ) fl = m_windowStyle & ~(wxPG_HIDE_CATEGORIES);
-        SetWindowStyleFlag(fl);
-        return true;
-    }
-
-    /** Selects page, scrolls and/or expands items to ensure that the
-        given item is visible. Returns true if something was actually done.
-    */
-    bool EnsureVisible( wxPGPropArg id );
-
-    /** Returns number of columns on given page. By the default,
-        returns number of columns on current page. */
-    int GetColumnCount( int page = -1 ) const;
-
-    /** Returns height of the description text box. */
-    int GetDescBoxHeight() const;
-
-    /** Returns pointer to the contained wxPropertyGrid. This does not change
-        after wxPropertyGridManager has been created, so you can safely obtain
-        pointer once and use it for the entire lifetime of the instance.
-    */
-    wxPropertyGrid* GetGrid()
-    {
-        wxASSERT(m_pPropGrid);
-        return m_pPropGrid;
-    }
-
-    const wxPropertyGrid* GetGrid() const
-    {
-        wxASSERT(m_pPropGrid);
-        return (const wxPropertyGrid*)m_pPropGrid;
-    }
-
-    /** Returns iterator class instance.
-        @remarks
-        Calling this method in wxPropertyGridManager causes run-time assertion
-        failure. Please only iterate through individual pages or use
-        CreateVIterator().
-    */
-    wxPropertyGridIterator GetIterator( int flags = wxPG_ITERATE_DEFAULT,
-                                        wxPGProperty* firstProp = NULL )
-    {
-        wxFAIL_MSG( "Please only iterate through individual pages "
-                    "or use CreateVIterator()" );
-        return wxPropertyGridInterface::GetIterator( flags, firstProp );
-    }
-
-    wxPropertyGridConstIterator
-    GetIterator(int flags = wxPG_ITERATE_DEFAULT,
-                wxPGProperty* firstProp = NULL) const
-    {
-        wxFAIL_MSG( "Please only iterate through individual pages "
-                    " or use CreateVIterator()" );
-        return wxPropertyGridInterface::GetIterator( flags, firstProp );
-    }
-
-    /** Returns iterator class instance.
-        @remarks
-        Calling this method in wxPropertyGridManager causes run-time assertion
-        failure. Please only iterate through individual pages or use
-        CreateVIterator().
-    */
-    wxPropertyGridIterator GetIterator( int flags, int startPos )
-    {
-        wxFAIL_MSG( "Please only iterate through individual pages "
-                    "or use CreateVIterator()" );
-
-        return wxPropertyGridInterface::GetIterator( flags, startPos );
-    }
-
-    wxPropertyGridConstIterator GetIterator( int flags, int startPos ) const
-    {
-        wxFAIL_MSG( "Please only iterate through individual pages "
-                    "or use CreateVIterator()" );
-        return wxPropertyGridInterface::GetIterator( flags, startPos );
-    }
-
-    /** Similar to GetIterator, but instead returns wxPGVIterator instance,
-        which can be useful for forward-iterating through arbitrary property
-        containers.
-    */
-    virtual wxPGVIterator GetVIterator( int flags ) const;
-
-    /** Returns currently selected page.
-    */
-    wxPropertyGridPage* GetCurrentPage() const
-    {
-        return GetPage(m_selPage);
-    }
-
-    /** Returns page object for given page index.
-    */
-    wxPropertyGridPage* GetPage( unsigned int ind ) const
-    {
-        return m_arrPages[ind];
-    }
-
-    /** Returns page object for given page name.
-    */
-    wxPropertyGridPage* GetPage( const wxString& name ) const
-    {
-        return GetPage(GetPageByName(name));
-    }
-
-    /**
-        Returns index for a page name.
-
-        If no match is found, wxNOT_FOUND is returned.
-     */
-    int GetPageByName( const wxString& name ) const;
-
-    /** Returns index for a relevant propertygrid state.
-
-        If no match is found, wxNOT_FOUND is returned.
-    */
-    int GetPageByState( const wxPropertyGridPageState* pstate ) const;
-
-protected:
-    /** Returns wxPropertyGridPageState of given page, current page's for -1.
-    */
-    virtual wxPropertyGridPageState* GetPageState( int page ) const;
-
-public:
-    /** Returns number of managed pages. */
-    size_t GetPageCount() const;
-
-    /** Returns name of given page. */
-    const wxString& GetPageName( int index ) const;
-
-    /** Returns "root property" of the given page. It does not have name, etc.
-        and it is not visible. It is only useful for accessing its children.
-    */
-    wxPGProperty* GetPageRoot( int index ) const;
-
-    /** Returns index to currently selected page. */
-    int GetSelectedPage() const { return m_selPage; }
-
-    /** Alias for GetSelection(). */
-    wxPGProperty* GetSelectedProperty() const
-    {
-        return GetSelection();
-    }
-
-    /** Shortcut for GetGrid()->GetSelection(). */
-    wxPGProperty* GetSelection() const
-    {
-        return m_pPropGrid->GetSelection();
-    }
-
-    /** Returns a pointer to the toolbar currently associated with the
-        wxPropertyGridManager (if any). */
-    wxToolBar* GetToolBar() const { return m_pToolbar; }
-
-    /** Creates new property page. Note that the first page is not created
-        automatically.
-        @param index
-        Add to this position. -1 will add as the last item.
-        @param label
-        A label for the page. This may be shown as a toolbar tooltip etc.
-        @param bmp
-        Bitmap image for toolbar. If wxNullBitmap is used, then a built-in
-        default image is used.
-        @param pageObj
-        wxPropertyGridPage instance. Manager will take ownership of this object.
-        If NULL, default page object is constructed.
-
-        @return
-        Returns pointer to created page.
-    */
-    virtual wxPropertyGridPage* InsertPage( int index,
-                                            const wxString& label,
-                                            const wxBitmap& bmp = wxNullBitmap,
-                                            wxPropertyGridPage* pageObj = NULL );
-
-    /**
-        Returns true if any property on any page has been modified by the user.
-    */
-    bool IsAnyModified() const;
-
-    /**
-        Returns true if updating is frozen (ie Freeze() called but not yet
-        Thaw() ).
-     */
-    bool IsFrozen() const { return m_pPropGrid->m_frozen > 0; }
-
-    /**
-        Returns true if any property on given page has been modified by the
-        user.
-     */
-    bool IsPageModified( size_t index ) const;
-
-    /**
-        Returns true if property is selected. Since selection is page
-        based, this function checks every page in the manager.
-    */
-    virtual bool IsPropertySelected( wxPGPropArg id ) const;
-
-    virtual void Refresh( bool eraseBackground = true,
-                          const wxRect* rect = (const wxRect*) NULL );
-
-    /** Removes a page.
-        @return
-        Returns false if it was not possible to remove page in question.
-    */
-    virtual bool RemovePage( int page );
-
-    /** Select and displays a given page.
-
-        @param index
-            Index of page being seleced. Can be -1 to select nothing.
-    */
-    void SelectPage( int index );
-
-    /** Select and displays a given page (by label). */
-    void SelectPage( const wxString& label )
-    {
-        int index = GetPageByName(label);
-        wxCHECK_RET( index >= 0, wxT("No page with such name") );
-        SelectPage( index );
-    }
-
-    /** Select and displays a given page. */
-    void SelectPage( wxPropertyGridPage* ptr )
-    {
-        SelectPage( GetPageByState(ptr) );
-    }
-
-    /** Select a property. */
-    bool SelectProperty( wxPGPropArg id, bool focus = false )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-        return p->GetParentState()->DoSelectProperty(p, focus);
-    }
-
-    /**
-        Sets a column title. Default title for column 0 is "Property",
-        and "Value" for column 1.
-
-        @remarks If header is not shown yet, then calling this
-                 member function will make it visible.
-    */
-    void SetColumnTitle( int idx, const wxString& title );
-
-    /**
-        Sets number of columns on given page (default is current page).
-
-        @remarks If you use header, then you should always use this
-                 member function to set the column count, instead of
-                 ones present in wxPropertyGrid or wxPropertyGridPage.
-    */
-    void SetColumnCount( int colCount, int page = -1 );
-
-    /** Sets label and text in description box.
-    */
-    void SetDescription( const wxString& label, const wxString& content );
-
-    /** Sets y coordinate of the description box splitter. */
-    void SetDescBoxHeight( int ht, bool refresh = true );
-
-    /** Moves splitter as left as possible, while still allowing all
-        labels to be shown in full.
-        @param subProps
-        If false, will still allow sub-properties (ie. properties which
-        parent is not root or category) to be cropped.
-        @param allPages
-        If true, takes labels on all pages into account.
-    */
-    void SetSplitterLeft( bool subProps = false, bool allPages = true );
-
-    /** Moves splitter as left as possible on an individual page, while still allowing all
-        labels to be shown in full.
-    */
-    void SetPageSplitterLeft(int page, bool subProps = false);
-
-    /**
-        Sets splitter position on individual page.
-
-        @remarks If you use header, then you should always use this
-                 member function to set the splitter position, instead of
-                 ones present in wxPropertyGrid or wxPropertyGridPage.
-    */
-    void SetPageSplitterPosition( int page, int pos, int column = 0 );
-
-    /**
-        Sets splitter position for all pages.
-
-        @remarks Splitter position cannot exceed grid size, and therefore
-                 setting it during form creation may fail as initial grid
-                 size is often smaller than desired splitter position,
-                 especially when sizers are being used.
-
-                 If you use header, then you should always use this
-                 member function to set the splitter position, instead of
-                 ones present in wxPropertyGrid or wxPropertyGridPage.
-    */
-    void SetSplitterPosition( int pos, int column = 0 );
-
-#if wxUSE_HEADERCTRL
-    /**
-        Show or hide the property grid header control. It is hidden
-        by the default.
-
-        @remarks Grid may look better if you use wxPG_NO_INTERNAL_BORDER
-                 window style when showing a header.
-    */
-    void ShowHeader(bool show = true);
-#endif
-
-protected:
-
-    //
-    // Subclassing helpers
-    //
-
-    /**
-        Creates property grid for the manager. Reimplement in derived class to
-        use subclassed wxPropertyGrid. However, if you do this then you
-        must also use the two-step construction (ie. default constructor and
-        Create() instead of constructor with arguments) when creating the
-        manager.
-    */
-    virtual wxPropertyGrid* CreatePropertyGrid() const;
-
-public:
-    virtual void RefreshProperty( wxPGProperty* p );
-
-    //
-    // Overridden functions - no documentation required.
-    //
-
-    void SetId( wxWindowID winid );
-
-    virtual void Freeze();
-    virtual void Thaw();
-    virtual void SetExtraStyle ( long exStyle );
-    virtual bool SetFont ( const wxFont& font );
-    virtual void SetWindowStyleFlag ( long style );
-    virtual bool Reparent( wxWindowBase *newParent );
-
-protected:
-    virtual wxSize DoGetBestSize() const;
-
-    //
-    // Event handlers
-    //
-    void OnMouseMove( wxMouseEvent &event );
-    void OnMouseClick( wxMouseEvent &event );
-    void OnMouseUp( wxMouseEvent &event );
-    void OnMouseEntry( wxMouseEvent &event );
-
-    void OnPaint( wxPaintEvent &event );
-
-    void OnToolbarClick( wxCommandEvent &event );
-    void OnResize( wxSizeEvent& event );
-    void OnPropertyGridSelect( wxPropertyGridEvent& event );
-    void OnPGColDrag( wxPropertyGridEvent& event );
-
-
-    wxPropertyGrid* m_pPropGrid;
-
-    wxVector<wxPropertyGridPage*>   m_arrPages;
-
-#if wxUSE_TOOLBAR
-    wxToolBar*      m_pToolbar;
-#endif
-#if wxUSE_HEADERCTRL
-    wxPGHeaderCtrl* m_pHeaderCtrl;
-#endif
-    wxStaticText*   m_pTxtHelpCaption;
-    wxStaticText*   m_pTxtHelpContent;
-
-    wxPropertyGridPage*     m_emptyPage;
-
-    wxArrayString   m_columnLabels;
-
-    long            m_iFlags;
-
-    // Selected page index.
-    int             m_selPage;
-
-    int             m_width;
-
-    int             m_height;
-
-    int             m_extraHeight;
-
-    int             m_splitterY;
-
-    int             m_splitterHeight;
-
-    int             m_dragOffset;
-
-    wxCursor        m_cursorSizeNS;
-
-    int             m_nextDescBoxSize;
-
-    // Toolbar tool ids for categorized and alphabetic mode selectors.
-    int             m_categorizedModeToolId;
-    int             m_alphabeticModeToolId;
-
-    unsigned char   m_dragStatus;
-
-    unsigned char   m_onSplitter;
-
-    bool            m_showHeader;
-
-    virtual wxPGProperty* DoGetPropertyByName( const wxString& name ) const;
-
-    /** Select and displays a given page. */
-    virtual bool DoSelectPage( int index );
-
-    // Sets some members to defaults.
-    void Init1();
-
-    // Initializes some members.
-    void Init2( int style );
-
-/*#ifdef __WXMSW__
-    virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
-#endif*/
-
-    virtual bool ProcessEvent( wxEvent& event );
-
-    /** Recalculates new positions for components, according to the
-        given size.
-    */
-    void RecalculatePositions( int width, int height );
-
-    /** (Re)creates/destroys controls, according to the window style bits. */
-    void RecreateControls();
-
-    void UpdateDescriptionBox( int new_splittery, int new_width, int new_height );
-
-    void RepaintDescBoxDecorations( wxDC& dc,
-                                    int newSplitterY,
-                                    int newWidth,
-                                    int newHeight );
-
-    void SetDescribedProperty( wxPGProperty* p );
-
-    // Reimplement these to handle "descboxheight" state item
-    virtual bool SetEditableStateItem( const wxString& name, wxVariant value );
-    virtual wxVariant GetEditableStateItem( const wxString& name ) const;
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-// -----------------------------------------------------------------------
-
-inline int wxPropertyGridPage::GetIndex() const
-{
-    if ( !m_manager )
-        return wxNOT_FOUND;
-    return m_manager->GetPageByState(this);
-}
-
-// -----------------------------------------------------------------------
-
-#endif // wxUSE_PROPGRID
-
-#endif // _WX_PROPGRID_MANAGER_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/property.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/property.h
deleted file mode 100644
index 36356ddd63..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/property.h
+++ /dev/null
@@ -1,2584 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/propgrid/property.h
-// Purpose:     wxPGProperty and related support classes
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     2008-08-23
-// Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PROPGRID_PROPERTY_H_
-#define _WX_PROPGRID_PROPERTY_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_PROPGRID
-
-#include "wx/propgrid/propgriddefs.h"
-
-// -----------------------------------------------------------------------
-
-#define wxNullProperty  ((wxPGProperty*)NULL)
-
-
-/** @class wxPGPaintData
-
-    Contains information relayed to property's OnCustomPaint.
-*/
-struct wxPGPaintData
-{
-    /** wxPropertyGrid. */
-    const wxPropertyGrid*   m_parent;
-
-    /**
-        Normally -1, otherwise index to drop-down list item that has to be
-        drawn.
-     */
-    int                     m_choiceItem;
-
-    /** Set to drawn width in OnCustomPaint (optional). */
-    int                     m_drawnWidth;
-
-    /**
-        In a measure item call, set this to the height of item at m_choiceItem
-        index.
-     */
-    int                     m_drawnHeight;
-};
-
-
-// space between vertical sides of a custom image
-#define wxPG_CUSTOM_IMAGE_SPACINGY      1
-
-// space between caption and selection rectangle,
-#define wxPG_CAPRECTXMARGIN             2
-
-// horizontally and vertically
-#define wxPG_CAPRECTYMARGIN             1
-
-
-/** @class wxPGCellRenderer
-
-    Base class for wxPropertyGrid cell renderers.
-*/
-class WXDLLIMPEXP_PROPGRID wxPGCellRenderer : public wxObjectRefData
-{
-public:
-
-    wxPGCellRenderer()
-        : wxObjectRefData() { }
-    virtual ~wxPGCellRenderer() { }
-
-    // Render flags
-    enum
-    {
-        // We are painting selected item
-        Selected        = 0x00010000,
-
-        // We are painting item in choice popup
-        ChoicePopup     = 0x00020000,
-
-        // We are rendering wxOwnerDrawnComboBox control
-        // (or other owner drawn control, but that is only
-        // officially supported one ATM).
-        Control         = 0x00040000,
-
-        // We are painting a disable property
-        Disabled        = 0x00080000,
-
-        // We are painting selected, disabled, or similar
-        // item that dictates fore- and background colours,
-        // overriding any cell values.
-        DontUseCellFgCol    = 0x00100000,
-        DontUseCellBgCol    = 0x00200000,
-        DontUseCellColours  = DontUseCellFgCol |
-                              DontUseCellBgCol
-    };
-
-    /**
-        Returns @true if rendered something in the foreground (text or
-        bitmap.
-    */
-    virtual bool Render( wxDC& dc,
-                         const wxRect& rect,
-                         const wxPropertyGrid* propertyGrid,
-                         wxPGProperty* property,
-                         int column,
-                         int item,
-                         int flags ) const = 0;
-
-    /** Returns size of the image in front of the editable area.
-        @remarks
-        If property is NULL, then this call is for a custom value. In that case
-        the item is index to wxPropertyGrid's custom values.
-    */
-    virtual wxSize GetImageSize( const wxPGProperty* property,
-                                 int column,
-                                 int item ) const;
-
-    /** Paints property category selection rectangle.
-    */
-    virtual void DrawCaptionSelectionRect( wxDC& dc,
-                                           int x, int y,
-                                           int w, int h ) const;
-
-    /** Utility to draw vertically centered text.
-    */
-    void DrawText( wxDC& dc,
-                   const wxRect& rect,
-                   int imageWidth,
-                   const wxString& text ) const;
-
-    /**
-        Utility to draw editor's value, or vertically aligned text if editor is
-        NULL.
-    */
-    void DrawEditorValue( wxDC& dc, const wxRect& rect,
-                          int xOffset, const wxString& text,
-                          wxPGProperty* property,
-                          const wxPGEditor* editor ) const;
-
-    /** Utility to render cell bitmap and set text colour plus bg brush
-        colour.
-
-        @return Returns image width, which, for instance, can be passed to
-                DrawText.
-    */
-    int PreDrawCell( wxDC& dc,
-                     const wxRect& rect,
-                     const wxPGCell& cell,
-                     int flags ) const;
-
-    /**
-        Utility to be called after drawing is done, to revert whatever
-        changes PreDrawCell() did.
-
-        @param flags
-            Same as those passed to PreDrawCell().
-    */
-    void PostDrawCell( wxDC& dc,
-                       const wxPropertyGrid* propGrid,
-                       const wxPGCell& cell,
-                       int flags ) const;
-};
-
-
-/**
-    @class wxPGDefaultRenderer
-
-    Default cell renderer, that can handles the common
-    scenarios.
-*/
-class WXDLLIMPEXP_PROPGRID wxPGDefaultRenderer : public wxPGCellRenderer
-{
-public:
-    virtual bool Render( wxDC& dc,
-                         const wxRect& rect,
-                         const wxPropertyGrid* propertyGrid,
-                         wxPGProperty* property,
-                         int column,
-                         int item,
-                         int flags ) const;
-
-    virtual wxSize GetImageSize( const wxPGProperty* property,
-                                 int column,
-                                 int item ) const;
-
-protected:
-};
-
-
-class WXDLLIMPEXP_PROPGRID wxPGCellData : public wxObjectRefData
-{
-    friend class wxPGCell;
-public:
-    wxPGCellData();
-
-    void SetText( const wxString& text )
-    {
-        m_text = text;
-        m_hasValidText = true;
-    }
-    void SetBitmap( const wxBitmap& bitmap ) { m_bitmap = bitmap; }
-    void SetFgCol( const wxColour& col ) { m_fgCol = col; }
-    void SetBgCol( const wxColour& col ) { m_bgCol = col; }
-    void SetFont( const wxFont& font ) { m_font = font; }
-
-protected:
-    virtual ~wxPGCellData() { }
-
-    wxString    m_text;
-    wxBitmap    m_bitmap;
-    wxColour    m_fgCol;
-    wxColour    m_bgCol;
-    wxFont      m_font;
-
-    // True if m_text is valid and specified
-    bool        m_hasValidText;
-};
-
-
-/**
-    @class wxPGCell
-
-    Base class for wxPropertyGrid cell information.
-*/
-class WXDLLIMPEXP_PROPGRID wxPGCell : public wxObject
-{
-public:
-    wxPGCell();
-    wxPGCell(const wxPGCell& other)
-        : wxObject(other)
-    {
-    }
-
-    wxPGCell( const wxString& text,
-              const wxBitmap& bitmap = wxNullBitmap,
-              const wxColour& fgCol = wxNullColour,
-              const wxColour& bgCol = wxNullColour );
-
-    virtual ~wxPGCell() { }
-
-    wxPGCellData* GetData()
-    {
-        return (wxPGCellData*) m_refData;
-    }
-
-    const wxPGCellData* GetData() const
-    {
-        return (const wxPGCellData*) m_refData;
-    }
-
-    bool HasText() const
-    {
-        return (m_refData && GetData()->m_hasValidText);
-    }
-
-    /**
-        Sets empty but valid data to this cell object.
-    */
-    void SetEmptyData();
-
-    /**
-        Merges valid data from srcCell into this.
-    */
-    void MergeFrom( const wxPGCell& srcCell );
-
-    void SetText( const wxString& text );
-    void SetBitmap( const wxBitmap& bitmap );
-    void SetFgCol( const wxColour& col );
-
-    /**
-        Sets font of the cell.
-
-        @remarks Because wxPropertyGrid does not support rows of
-                 different height, it makes little sense to change
-                 size of the font. Therefore it is recommended
-                 to use return value of wxPropertyGrid::GetFont()
-                 or wxPropertyGrid::GetCaptionFont() as a basis
-                 for the font that, after modifications, is passed
-                 to this member function.
-    */
-    void SetFont( const wxFont& font );
-
-    void SetBgCol( const wxColour& col );
-
-    const wxString& GetText() const { return GetData()->m_text; }
-    const wxBitmap& GetBitmap() const { return GetData()->m_bitmap; }
-    const wxColour& GetFgCol() const { return GetData()->m_fgCol; }
-
-    /**
-        Returns font of the cell. If no specific font is set for this
-        cell, then the font will be invalid.
-    */
-    const wxFont& GetFont() const { return GetData()->m_font; }
-
-    const wxColour& GetBgCol() const { return GetData()->m_bgCol; }
-
-    wxPGCell& operator=( const wxPGCell& other )
-    {
-        if ( this != &other )
-        {
-            Ref(other);
-        }
-        return *this;
-    }
-
-    // Used mostly internally to figure out if this cell is supposed
-    // to have default values when attached to a grid.
-    bool IsInvalid() const
-    {
-        return ( m_refData == NULL );
-    }
-
-private:
-    virtual wxObjectRefData *CreateRefData() const
-        { return new wxPGCellData(); }
-
-    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
-};
-
-// -----------------------------------------------------------------------
-
-/** @class wxPGAttributeStorage
-
-    wxPGAttributeStorage is somewhat optimized storage for
-      key=variant pairs (ie. a map).
-*/
-class WXDLLIMPEXP_PROPGRID wxPGAttributeStorage
-{
-public:
-    wxPGAttributeStorage();
-    ~wxPGAttributeStorage();
-
-    void Set( const wxString& name, const wxVariant& value );
-    unsigned int GetCount() const { return (unsigned int) m_map.size(); }
-    wxVariant FindValue( const wxString& name ) const
-    {
-        wxPGHashMapS2P::const_iterator it = m_map.find(name);
-        if ( it != m_map.end() )
-        {
-            wxVariantData* data = (wxVariantData*) it->second;
-            data->IncRef();
-            return wxVariant(data, it->first);
-        }
-        return wxVariant();
-    }
-
-    typedef wxPGHashMapS2P::const_iterator const_iterator;
-    const_iterator StartIteration() const
-    {
-        return m_map.begin();
-    }
-    bool GetNext( const_iterator& it, wxVariant& variant ) const
-    {
-        if ( it == m_map.end() )
-            return false;
-
-        wxVariantData* data = (wxVariantData*) it->second;
-        data->IncRef();
-        variant.SetData(data);
-        variant.SetName(it->first);
-        ++it;
-        return true;
-    }
-
-protected:
-    wxPGHashMapS2P  m_map;
-};
-
-
-// -----------------------------------------------------------------------
-
-/** @section propgrid_propflags wxPGProperty Flags
-    @{
-*/
-
-enum wxPGPropertyFlags
-{
-
-/** Indicates bold font.
-*/
-wxPG_PROP_MODIFIED                  = 0x0001,
-
-/** Disables ('greyed' text and editor does not activate) property.
-*/
-wxPG_PROP_DISABLED                  = 0x0002,
-
-/** Hider button will hide this property.
-*/
-wxPG_PROP_HIDDEN                    = 0x0004,
-
-/** This property has custom paint image just in front of its value.
-    If property only draws custom images into a popup list, then this
-    flag should not be set.
-*/
-wxPG_PROP_CUSTOMIMAGE               = 0x0008,
-
-/** Do not create text based editor for this property (but button-triggered
-    dialog and choice are ok).
-*/
-wxPG_PROP_NOEDITOR                  = 0x0010,
-
-/** Property is collapsed, ie. it's children are hidden.
-*/
-wxPG_PROP_COLLAPSED                 = 0x0020,
-
-/**
-    If property is selected, then indicates that validation failed for pending
-    value.
-
-    If property is not selected, that indicates that the actual property
-    value has failed validation (NB: this behaviour is not currently supported,
-    but may be used in future).
-*/
-wxPG_PROP_INVALID_VALUE             = 0x0040,
-
-// 0x0080,
-
-/** Switched via SetWasModified(). Temporary flag - only used when
-    setting/changing property value.
-*/
-wxPG_PROP_WAS_MODIFIED              = 0x0200,
-
-/**
-    If set, then child properties (if any) are private, and should be
-    "invisible" to the application.
-*/
-wxPG_PROP_AGGREGATE                 = 0x0400,
-
-/** If set, then child properties (if any) are copies and should not
-    be deleted in dtor.
-*/
-wxPG_PROP_CHILDREN_ARE_COPIES       = 0x0800,
-
-/**
-    Classifies this item as a non-category.
-
-    Used for faster item type identification.
-*/
-wxPG_PROP_PROPERTY                  = 0x1000,
-
-/**
-    Classifies this item as a category.
-
-    Used for faster item type identification.
-*/
-wxPG_PROP_CATEGORY                  = 0x2000,
-
-/** Classifies this item as a property that has children, but is not aggregate
-    (ie children are not private).
-*/
-wxPG_PROP_MISC_PARENT               = 0x4000,
-
-/** Property is read-only. Editor is still created for wxTextCtrl-based
-    property editors. For others, editor is not usually created because
-    they do implement wxTE_READONLY style or equivalent.
-*/
-wxPG_PROP_READONLY                  = 0x8000,
-
-//
-// NB: FLAGS ABOVE 0x8000 CANNOT BE USED WITH PROPERTY ITERATORS
-//
-
-/** Property's value is composed from values of child properties.
-    @remarks
-    This flag cannot be used with property iterators.
-*/
-wxPG_PROP_COMPOSED_VALUE            = 0x00010000,
-
-/** Common value of property is selectable in editor.
-    @remarks
-    This flag cannot be used with property iterators.
-*/
-wxPG_PROP_USES_COMMON_VALUE         = 0x00020000,
-
-/** Property can be set to unspecified value via editor.
-    Currently, this applies to following properties:
-    - wxIntProperty, wxUIntProperty, wxFloatProperty, wxEditEnumProperty:
-      Clear the text field
-
-    @remarks
-    This flag cannot be used with property iterators.
-
-    @see wxPGProperty::SetAutoUnspecified()
-*/
-wxPG_PROP_AUTO_UNSPECIFIED          = 0x00040000,
-
-/** Indicates the bit useable by derived properties.
-*/
-wxPG_PROP_CLASS_SPECIFIC_1          = 0x00080000,
-
-/** Indicates the bit useable by derived properties.
-*/
-wxPG_PROP_CLASS_SPECIFIC_2          = 0x00100000,
-
-/** Indicates that the property is being deleted and should be ignored.
-*/
-wxPG_PROP_BEING_DELETED             = 0x00200000
-
-};
-
-/** Topmost flag.
-*/
-#define wxPG_PROP_MAX               wxPG_PROP_AUTO_UNSPECIFIED
-
-/** Property with children must have one of these set, otherwise iterators
-    will not work correctly.
-    Code should automatically take care of this, however.
-*/
-#define wxPG_PROP_PARENTAL_FLAGS \
-    ((wxPGPropertyFlags)(wxPG_PROP_AGGREGATE | \
-                         wxPG_PROP_CATEGORY | \
-                         wxPG_PROP_MISC_PARENT))
-
-/** @}
-*/
-
-// Combination of flags that can be stored by GetFlagsAsString
-#define wxPG_STRING_STORED_FLAGS \
-    (wxPG_PROP_DISABLED|wxPG_PROP_HIDDEN|wxPG_PROP_NOEDITOR|wxPG_PROP_COLLAPSED)
-
-// -----------------------------------------------------------------------
-
-/**
-    @section propgrid_property_attributes wxPropertyGrid Property Attribute
-    Identifiers.
-
-    wxPGProperty::SetAttribute() and
-    wxPropertyGridInterface::SetPropertyAttribute() accept one of these as
-    attribute name argument.
-
-    You can use strings instead of constants. However, some of these
-    constants are redefined to use cached strings which may reduce
-    your binary size by some amount.
-
-    @{
-*/
-
-/** Set default value for property.
-*/
-#define wxPG_ATTR_DEFAULT_VALUE           wxS("DefaultValue")
-
-/** Universal, int or double. Minimum value for numeric properties.
-*/
-#define wxPG_ATTR_MIN                     wxS("Min")
-
-/** Universal, int or double. Maximum value for numeric properties.
-*/
-#define wxPG_ATTR_MAX                     wxS("Max")
-
-/** Universal, string. When set, will be shown as text after the displayed
-    text value. Alternatively, if third column is enabled, text will be shown
-    there (for any type of property).
-*/
-#define wxPG_ATTR_UNITS                     wxS("Units")
-
-/** When set, will be shown as 'greyed' text in property's value cell when
-    the actual displayed value is blank.
-*/
-#define wxPG_ATTR_HINT                      wxS("Hint")
-
-#if wxPG_COMPATIBILITY_1_4
-/**
-    @deprecated Use "Hint" (wxPG_ATTR_HINT) instead.
-*/
-#define wxPG_ATTR_INLINE_HELP               wxS("InlineHelp")
-#endif
-
-/** Universal, wxArrayString. Set to enable auto-completion in any
-    wxTextCtrl-based property editor.
-*/
-#define wxPG_ATTR_AUTOCOMPLETE              wxS("AutoComplete")
-
-/** wxBoolProperty and wxFlagsProperty specific. Value type is bool.
-    Default value is False.
-
-    When set to True, bool property will use check box instead of a
-    combo box as its editor control. If you set this attribute
-    for a wxFlagsProperty, it is automatically applied to child
-    bool properties.
-*/
-#define wxPG_BOOL_USE_CHECKBOX              wxS("UseCheckbox")
-
-/** wxBoolProperty and wxFlagsProperty specific. Value type is bool.
-    Default value is False.
-
-    Set to True for the bool property to cycle value on double click
-    (instead of showing the popup listbox). If you set this attribute
-    for a wxFlagsProperty, it is automatically applied to child
-    bool properties.
-*/
-#define wxPG_BOOL_USE_DOUBLE_CLICK_CYCLING  wxS("UseDClickCycling")
-
-/**
-    wxFloatProperty (and similar) specific, int, default -1.
-
-    Sets the (max) precision used when floating point value is rendered as
-    text. The default -1 means infinite precision.
-*/
-#define wxPG_FLOAT_PRECISION                wxS("Precision")
-
-/**
-    The text will be echoed as asterisks (wxTE_PASSWORD will be passed to
-    textctrl etc).
-*/
-#define wxPG_STRING_PASSWORD                wxS("Password")
-
-/** Define base used by a wxUIntProperty. Valid constants are
-    wxPG_BASE_OCT, wxPG_BASE_DEC, wxPG_BASE_HEX and wxPG_BASE_HEXL
-    (lowercase characters).
-*/
-#define wxPG_UINT_BASE                      wxS("Base")
-
-/** Define prefix rendered to wxUIntProperty. Accepted constants
-    wxPG_PREFIX_NONE, wxPG_PREFIX_0x, and wxPG_PREFIX_DOLLAR_SIGN.
-    <b>Note:</b> Only wxPG_PREFIX_NONE works with Decimal and Octal
-    numbers.
-*/
-#define wxPG_UINT_PREFIX                    wxS("Prefix")
-
-/**
-    wxFileProperty/wxImageFileProperty specific, wxChar*, default is
-    detected/varies.
-    Sets the wildcard used in the triggered wxFileDialog. Format is the same.
-*/
-#define wxPG_FILE_WILDCARD                  wxS("Wildcard")
-
-/** wxFileProperty/wxImageFileProperty specific, int, default 1.
-    When 0, only the file name is shown (i.e. drive and directory are hidden).
-*/
-#define wxPG_FILE_SHOW_FULL_PATH            wxS("ShowFullPath")
-
-/** Specific to wxFileProperty and derived properties, wxString, default empty.
-    If set, then the filename is shown relative to the given path string.
-*/
-#define wxPG_FILE_SHOW_RELATIVE_PATH        wxS("ShowRelativePath")
-
-/**
-    Specific to wxFileProperty and derived properties, wxString, default is
-    empty.
-
-    Sets the initial path of where to look for files.
-*/
-#define wxPG_FILE_INITIAL_PATH              wxS("InitialPath")
-
-/** Specific to wxFileProperty and derivatives, wxString, default is empty.
-    Sets a specific title for the dir dialog.
-*/
-#define wxPG_FILE_DIALOG_TITLE              wxS("DialogTitle")
-
-/** Specific to wxFileProperty and derivatives, long, default is 0.
-    Sets a specific wxFileDialog style for the file dialog.
-*/
-#define wxPG_FILE_DIALOG_STYLE              wxS("DialogStyle")
-
-/** Specific to wxDirProperty, wxString, default is empty.
-    Sets a specific message for the dir dialog.
-*/
-#define wxPG_DIR_DIALOG_MESSAGE             wxS("DialogMessage")
-
-/**
-    wxArrayStringProperty's string delimiter character. If this is a quotation
-    mark or hyphen, then strings will be quoted instead (with given
-    character).
-
-    Default delimiter is quotation mark.
-*/
-#define wxPG_ARRAY_DELIMITER                wxS("Delimiter")
-
-/** Sets displayed date format for wxDateProperty.
-*/
-#define wxPG_DATE_FORMAT                    wxS("DateFormat")
-
-/** Sets wxDatePickerCtrl window style used with wxDateProperty. Default
-    is wxDP_DEFAULT | wxDP_SHOWCENTURY.
-*/
-#define wxPG_DATE_PICKER_STYLE              wxS("PickerStyle")
-
-/** SpinCtrl editor, int or double. How much number changes when button is
-    pressed (or up/down on keyboard).
-*/
-#define wxPG_ATTR_SPINCTRL_STEP             wxS("Step")
-
-/** SpinCtrl editor, bool. If true, value wraps at Min/Max.
-*/
-#define wxPG_ATTR_SPINCTRL_WRAP             wxS("Wrap")
-
-/**
-    wxMultiChoiceProperty, int.
-    If 0, no user strings allowed. If 1, user strings appear before list
-    strings. If 2, user strings appear after list string.
-*/
-#define wxPG_ATTR_MULTICHOICE_USERSTRINGMODE    wxS("UserStringMode")
-
-/**
-    wxColourProperty and its kind, int, default 1.
-
-    Setting this attribute to 0 hides custom colour from property's list of
-    choices.
-*/
-#define wxPG_COLOUR_ALLOW_CUSTOM            wxS("AllowCustom")
-
-/**
-    wxColourProperty and its kind: Set to True in order to support editing
-    alpha colour component.
-*/
-#define wxPG_COLOUR_HAS_ALPHA               wxS("HasAlpha")
-
-/** @}
-*/
-
-// Redefine attribute macros to use cached strings
-#undef wxPG_ATTR_DEFAULT_VALUE
-#define wxPG_ATTR_DEFAULT_VALUE           wxPGGlobalVars->m_strDefaultValue
-#undef wxPG_ATTR_MIN
-#define wxPG_ATTR_MIN                     wxPGGlobalVars->m_strMin
-#undef wxPG_ATTR_MAX
-#define wxPG_ATTR_MAX                     wxPGGlobalVars->m_strMax
-#undef wxPG_ATTR_UNITS
-#define wxPG_ATTR_UNITS                   wxPGGlobalVars->m_strUnits
-#undef wxPG_ATTR_HINT
-#define wxPG_ATTR_HINT                    wxPGGlobalVars->m_strHint
-#if wxPG_COMPATIBILITY_1_4
-#undef wxPG_ATTR_INLINE_HELP
-#define wxPG_ATTR_INLINE_HELP             wxPGGlobalVars->m_strInlineHelp
-#endif
-
-// -----------------------------------------------------------------------
-
-/** @class wxPGChoiceEntry
-    Data of a single wxPGChoices choice.
-*/
-class WXDLLIMPEXP_PROPGRID wxPGChoiceEntry : public wxPGCell
-{
-public:
-    wxPGChoiceEntry();
-    wxPGChoiceEntry(const wxPGChoiceEntry& other)
-        : wxPGCell(other)
-    {
-        m_value = other.m_value;
-    }
-    wxPGChoiceEntry( const wxString& label,
-                     int value = wxPG_INVALID_VALUE )
-        : wxPGCell(), m_value(value)
-    {
-        SetText(label);
-    }
-
-    virtual ~wxPGChoiceEntry() { }
-
-    void SetValue( int value ) { m_value = value; }
-    int GetValue() const { return m_value; }
-
-    wxPGChoiceEntry& operator=( const wxPGChoiceEntry& other )
-    {
-        if ( this != &other )
-        {
-            Ref(other);
-        }
-        m_value = other.m_value;
-        return *this;
-    }
-
-protected:
-    int m_value;
-};
-
-
-typedef void* wxPGChoicesId;
-
-class WXDLLIMPEXP_PROPGRID wxPGChoicesData : public wxObjectRefData
-{
-    friend class wxPGChoices;
-public:
-    // Constructor sets m_refCount to 1.
-    wxPGChoicesData();
-
-    void CopyDataFrom( wxPGChoicesData* data );
-
-    wxPGChoiceEntry& Insert( int index, const wxPGChoiceEntry& item );
-
-    // Delete all entries
-    void Clear();
-
-    unsigned int GetCount() const
-    {
-        return (unsigned int) m_items.size();
-    }
-
-    const wxPGChoiceEntry& Item( unsigned int i ) const
-    {
-        wxASSERT_MSG( i < GetCount(), "invalid index" );
-        return m_items[i];
-    }
-
-    wxPGChoiceEntry& Item( unsigned int i )
-    {
-        wxASSERT_MSG( i < GetCount(), "invalid index" );
-        return m_items[i];
-    }
-
-private:
-    wxVector<wxPGChoiceEntry>   m_items;
-
-    virtual ~wxPGChoicesData();
-};
-
-#define wxPGChoicesEmptyData    ((wxPGChoicesData*)NULL)
-
-
-/** @class wxPGChoices
-
-    Helper class for managing choices of wxPropertyGrid properties.
-    Each entry can have label, value, bitmap, text colour, and background
-    colour.
-
-    wxPGChoices uses reference counting, similar to other wxWidgets classes.
-    This means that assignment operator and copy constructor only copy the
-    reference and not the actual data. Use Copy() member function to create a
-    real copy.
-
-    @remarks If you do not specify value for entry, index is used.
-
-    @library{wxpropgrid}
-    @category{propgrid}
-*/
-class WXDLLIMPEXP_PROPGRID wxPGChoices
-{
-public:
-    typedef long ValArrItem;
-
-    /** Default constructor. */
-    wxPGChoices()
-    {
-        Init();
-    }
-
-    /**
-        Copy constructor, uses reference counting. To create a real copy,
-        use Copy() member function instead.
-    */
-    wxPGChoices( const wxPGChoices& a )
-    {
-        if ( a.m_data != wxPGChoicesEmptyData )
-        {
-            m_data = a.m_data;
-            m_data->IncRef();
-        }
-    }
-
-    /**
-        Constructor.
-
-        @param labels
-            Labels for choices
-
-        @param values
-            Values for choices. If NULL, indexes are used.
-    */
-    wxPGChoices( const wxChar* const* labels, const long* values = NULL )
-    {
-        Init();
-        Set(labels,values);
-    }
-
-    /**
-        Constructor.
-
-        @param labels
-            Labels for choices
-
-        @param values
-            Values for choices. If empty, indexes are used.
-    */
-    wxPGChoices( const wxArrayString& labels,
-                 const wxArrayInt& values = wxArrayInt() )
-    {
-        Init();
-        Set(labels,values);
-    }
-
-    /** Simple interface constructor. */
-    wxPGChoices( wxPGChoicesData* data )
-    {
-        wxASSERT(data);
-        m_data = data;
-        data->IncRef();
-    }
-
-    /** Destructor. */
-    ~wxPGChoices()
-    {
-        Free();
-    }
-
-    /**
-        Adds to current.
-
-        If did not have own copies, creates them now. If was empty, identical
-        to set except that creates copies.
-
-        @param labels
-            Labels for added choices.
-
-        @param values
-            Values for added choices. If empty, relevant entry indexes are used.
-    */
-    void Add( const wxChar* const* labels, const ValArrItem* values = NULL );
-
-    /** Version that works with wxArrayString and wxArrayInt. */
-    void Add( const wxArrayString& arr, const wxArrayInt& arrint = wxArrayInt() );
-
-    /**
-        Adds a single choice.
-
-        @param label
-            Label for added choice.
-
-        @param value
-            Value for added choice. If unspecified, index is used.
-    */
-    wxPGChoiceEntry& Add( const wxString& label,
-                          int value = wxPG_INVALID_VALUE );
-
-    /** Adds a single item, with bitmap. */
-    wxPGChoiceEntry& Add( const wxString& label,
-                          const wxBitmap& bitmap,
-                          int value = wxPG_INVALID_VALUE );
-
-    /** Adds a single item with full entry information. */
-    wxPGChoiceEntry& Add( const wxPGChoiceEntry& entry )
-    {
-        return Insert(entry, -1);
-    }
-
-    /** Adds single item. */
-    wxPGChoiceEntry& AddAsSorted( const wxString& label,
-                                  int value = wxPG_INVALID_VALUE );
-
-    /**
-        Assigns choices data, using reference counting. To create a real copy,
-        use Copy() member function instead.
-    */
-    void Assign( const wxPGChoices& a )
-    {
-        AssignData(a.m_data);
-    }
-
-    void AssignData( wxPGChoicesData* data );
-
-    /** Delete all choices. */
-    void Clear();
-
-    /**
-        Returns a real copy of the choices.
-    */
-    wxPGChoices Copy() const
-    {
-        wxPGChoices dst;
-        dst.EnsureData();
-        dst.m_data->CopyDataFrom(m_data);
-        return dst;
-    }
-
-    void EnsureData()
-    {
-        if ( m_data == wxPGChoicesEmptyData )
-            m_data = new wxPGChoicesData();
-    }
-
-    /** Gets a unsigned number identifying this list. */
-    wxPGChoicesId GetId() const { return (wxPGChoicesId) m_data; }
-
-    const wxString& GetLabel( unsigned int ind ) const
-    {
-        return Item(ind).GetText();
-    }
-
-    unsigned int GetCount () const
-    {
-        if ( !m_data )
-            return 0;
-
-        return m_data->GetCount();
-    }
-
-    int GetValue( unsigned int ind ) const { return Item(ind).GetValue(); }
-
-    /** Returns array of values matching the given strings. Unmatching strings
-        result in wxPG_INVALID_VALUE entry in array.
-    */
-    wxArrayInt GetValuesForStrings( const wxArrayString& strings ) const;
-
-    /** Returns array of indices matching given strings. Unmatching strings
-        are added to 'unmatched', if not NULL.
-    */
-    wxArrayInt GetIndicesForStrings( const wxArrayString& strings,
-                                     wxArrayString* unmatched = NULL ) const;
-
-    int Index( const wxString& str ) const;
-    int Index( int val ) const;
-
-    /** Inserts single item. */
-    wxPGChoiceEntry& Insert( const wxString& label,
-                             int index,
-                             int value = wxPG_INVALID_VALUE );
-
-    /** Inserts a single item with full entry information. */
-    wxPGChoiceEntry& Insert( const wxPGChoiceEntry& entry, int index );
-
-    /** Returns false if this is a constant empty set of choices,
-        which should not be modified.
-    */
-    bool IsOk() const
-    {
-        return ( m_data != wxPGChoicesEmptyData );
-    }
-
-    const wxPGChoiceEntry& Item( unsigned int i ) const
-    {
-        wxASSERT( IsOk() );
-        return m_data->Item(i);
-    }
-
-    wxPGChoiceEntry& Item( unsigned int i )
-    {
-        wxASSERT( IsOk() );
-        return m_data->Item(i);
-    }
-
-    /** Removes count items starting at position nIndex. */
-    void RemoveAt(size_t nIndex, size_t count = 1);
-
-    /** Does not create copies for itself.
-        TODO: Deprecate.
-    */
-    void Set( const wxChar* const* labels, const long* values = NULL )
-    {
-        Free();
-        Add(labels,values);
-    }
-
-    /** Version that works with wxArrayString and wxArrayInt. */
-    void Set( const wxArrayString& labels,
-              const wxArrayInt& values = wxArrayInt() )
-    {
-        Free();
-        if ( &values )
-            Add(labels,values);
-        else
-            Add(labels);
-    }
-
-    // Creates exclusive copy of current choices
-    void AllocExclusive();
-
-    // Returns data, increases refcount.
-    wxPGChoicesData* GetData()
-    {
-        wxASSERT( m_data->GetRefCount() != -1 );
-        m_data->IncRef();
-        return m_data;
-    }
-
-    // Returns plain data ptr - no refcounting stuff is done.
-    wxPGChoicesData* GetDataPtr() const { return m_data; }
-
-    // Changes ownership of data to you.
-    wxPGChoicesData* ExtractData()
-    {
-        wxPGChoicesData* data = m_data;
-        m_data = wxPGChoicesEmptyData;
-        return data;
-    }
-
-    wxArrayString GetLabels() const;
-
-    void operator= (const wxPGChoices& a)
-    {
-        if (this != &a)
-            AssignData(a.m_data);
-    }
-
-    wxPGChoiceEntry& operator[](unsigned int i)
-    {
-        return Item(i);
-    }
-
-    const wxPGChoiceEntry& operator[](unsigned int i) const
-    {
-        return Item(i);
-    }
-
-protected:
-    wxPGChoicesData*    m_data;
-
-    void Init();
-    void Free();
-};
-
-// -----------------------------------------------------------------------
-
-/** @class wxPGProperty
-
-    wxPGProperty is base class for all wxPropertyGrid properties.
-
-    NB: Full class overview is now only present in
-        interface/wx/propgrid/property.h.
-
-    @library{wxpropgrid}
-    @category{propgrid}
-*/
-class WXDLLIMPEXP_PROPGRID wxPGProperty : public wxObject
-{
-    friend class wxPropertyGrid;
-    friend class wxPropertyGridInterface;
-    friend class wxPropertyGridPageState;
-    friend class wxPropertyGridPopulator;
-    friend class wxStringProperty;  // Proper "<composed>" support requires this
-
-    DECLARE_ABSTRACT_CLASS(wxPGProperty)
-public:
-    typedef wxUint32 FlagType;
-
-    /**
-        Default constructor.
-    */
-    wxPGProperty();
-
-    /**
-        Constructor.
-
-        All non-abstract property classes should have a constructor with
-        the same first two arguments as this one.
-    */
-    wxPGProperty( const wxString& label, const wxString& name );
-
-    /**
-        Virtual destructor.
-        It is customary for derived properties to implement this.
-    */
-    virtual ~wxPGProperty();
-
-    /** This virtual function is called after m_value has been set.
-
-        @remarks
-        - If m_value was set to Null variant (ie. unspecified value),
-          OnSetValue() will not be called.
-        - m_value may be of any variant type. Typically properties internally
-          support only one variant type, and as such OnSetValue() provides a
-          good opportunity to convert
-          supported values into internal type.
-        - Default implementation does nothing.
-    */
-    virtual void OnSetValue();
-
-    /** Override this to return something else than m_value as the value.
-    */
-    virtual wxVariant DoGetValue() const { return m_value; }
-
-    /** Implement this function in derived class to check the value.
-        Return true if it is ok. Returning false prevents property change events
-        from occurring.
-
-        @remarks
-        - Default implementation always returns true.
-    */
-    virtual bool ValidateValue( wxVariant& value,
-                                wxPGValidationInfo& validationInfo ) const;
-
-    /**
-        Converts text into wxVariant value appropriate for this property.
-
-        @param variant
-            On function entry this is the old value (should not be wxNullVariant
-            in normal cases). Translated value must be assigned back to it.
-
-        @param text
-            Text to be translated into variant.
-
-        @param argFlags
-            If wxPG_FULL_VALUE is set, returns complete, storable value instead
-            of displayable one (they may be different).
-            If wxPG_COMPOSITE_FRAGMENT is set, text is interpreted as a part of
-            composite property string value (as generated by ValueToString()
-            called with this same flag).
-
-        @return Returns @true if resulting wxVariant value was different.
-
-        @remarks Default implementation converts semicolon delimited tokens into
-                child values. Only works for properties with children.
-
-                You might want to take into account that m_value is Null variant
-                if property value is unspecified (which is usually only case if
-                you explicitly enabled that sort behaviour).
-    */
-    virtual bool StringToValue( wxVariant& variant,
-                                const wxString& text,
-                                int argFlags = 0 ) const;
-
-    /**
-        Converts integer (possibly a choice selection) into wxVariant value
-        appropriate for this property.
-
-        @param variant
-            On function entry this is the old value (should not be wxNullVariant
-            in normal cases). Translated value must be assigned back to it.
-
-        @param number
-            Integer to be translated into variant.
-
-        @param argFlags
-            If wxPG_FULL_VALUE is set, returns complete, storable value instead
-            of displayable one.
-
-        @return Returns @true if resulting wxVariant value was different.
-
-        @remarks
-        - If property is not supposed to use choice or spinctrl or other editor
-          with int-based value, it is not necessary to implement this method.
-        - Default implementation simply assign given int to m_value.
-        - If property uses choice control, and displays a dialog on some choice
-          items, then it is preferred to display that dialog in IntToValue
-          instead of OnEvent.
-        - You might want to take into account that m_value is Null variant if
-          property value is unspecified (which is usually only case if you
-          explicitly enabled that sort behaviour).
-    */
-    virtual bool IntToValue( wxVariant& value,
-                             int number,
-                             int argFlags = 0 ) const;
-
-    /**
-        Converts property value into a text representation.
-
-        @param value
-            Value to be converted.
-
-        @param argFlags
-            If 0 (default value), then displayed string is returned.
-            If wxPG_FULL_VALUE is set, returns complete, storable string value
-            instead of displayable. If wxPG_EDITABLE_VALUE is set, returns
-            string value that must be editable in textctrl. If
-            wxPG_COMPOSITE_FRAGMENT is set, returns text that is appropriate to
-            display as a part of string property's composite text
-            representation.
-
-        @remarks Default implementation calls GenerateComposedValue().
-    */
-    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
-
-    /** Converts string to a value, and if successful, calls SetValue() on it.
-        Default behaviour is to do nothing.
-        @param text
-        String to get the value from.
-        @return
-        true if value was changed.
-    */
-    bool SetValueFromString( const wxString& text, int flags = wxPG_PROGRAMMATIC_VALUE );
-
-    /** Converts integer to a value, and if successful, calls SetValue() on it.
-        Default behaviour is to do nothing.
-        @param value
-            Int to get the value from.
-        @param flags
-            If has wxPG_FULL_VALUE, then the value given is a actual value and
-            not an index.
-        @return
-            True if value was changed.
-    */
-    bool SetValueFromInt( long value, int flags = 0 );
-
-    /**
-        Returns size of the custom painted image in front of property.
-
-        This method must be overridden to return non-default value if
-        OnCustomPaint is to be called.
-        @param item
-            Normally -1, but can be an index to the property's list of items.
-        @remarks
-        - Default behaviour is to return wxSize(0,0), which means no image.
-        - Default image width or height is indicated with dimension -1.
-        - You can also return wxPG_DEFAULT_IMAGE_SIZE, i.e. wxSize(-1, -1).
-    */
-    virtual wxSize OnMeasureImage( int item = -1 ) const;
-
-    /**
-        Events received by editor widgets are processed here.
-
-        Note that editor class usually processes most events. Some, such as
-        button press events of TextCtrlAndButton class, can be handled here.
-        Also, if custom handling for regular events is desired, then that can
-        also be done (for example, wxSystemColourProperty custom handles
-        wxEVT_CHOICE to display colour picker dialog when
-        'custom' selection is made).
-
-        If the event causes value to be changed, SetValueInEvent()
-        should be called to set the new value.
-
-        @param event
-        Associated wxEvent.
-        @return
-        Should return true if any changes in value should be reported.
-        @remarks
-        If property uses choice control, and displays a dialog on some choice
-        items, then it is preferred to display that dialog in IntToValue
-        instead of OnEvent.
-    */
-    virtual bool OnEvent( wxPropertyGrid* propgrid,
-                          wxWindow* wnd_primary,
-                          wxEvent& event );
-
-    /**
-        Called after value of a child property has been altered. Must return
-        new value of the whole property (after any alterations warranted by
-        child's new value).
-
-        Note that this function is usually called at the time that value of
-        this property, or given child property, is still pending for change,
-        and as such, result of GetValue() or m_value should not be relied
-        on.
-
-        Sample pseudo-code implementation:
-
-        @code
-        wxVariant MyProperty::ChildChanged( wxVariant& thisValue,
-                                            int childIndex,
-                                            wxVariant& childValue ) const
-        {
-            // Acquire reference to actual type of data stored in variant
-            // (TFromVariant only exists if wxPropertyGrid's wxVariant-macros
-            // were used to create the variant class).
-            T& data = TFromVariant(thisValue);
-
-            // Copy childValue into data.
-            switch ( childIndex )
-            {
-                case 0:
-                    data.SetSubProp1( childvalue.GetLong() );
-                    break;
-                case 1:
-                    data.SetSubProp2( childvalue.GetString() );
-                    break;
-                ...
-            }
-
-            // Return altered data
-            return data;
-        }
-        @endcode
-
-        @param thisValue
-            Value of this property. Changed value should be returned (in
-            previous versions of wxPropertyGrid it was only necessary to
-            write value back to this argument).
-        @param childIndex
-            Index of child changed (you can use Item(childIndex) to get
-            child property).
-        @param childValue
-            (Pending) value of the child property.
-
-        @return
-            Modified value of the whole property.
-    */
-    virtual wxVariant ChildChanged( wxVariant& thisValue,
-                                    int childIndex,
-                                    wxVariant& childValue ) const;
-
-    /** Returns pointer to an instance of used editor.
-    */
-    virtual const wxPGEditor* DoGetEditorClass() const;
-
-    /** Returns pointer to the wxValidator that should be used
-        with the editor of this property (NULL for no validator).
-        Setting validator explicitly via SetPropertyValidator
-        will override this.
-
-        In most situations, code like this should work well
-        (macros are used to maintain one actual validator instance,
-        so on the second call the function exits within the first
-        macro):
-
-        @code
-
-        wxValidator* wxMyPropertyClass::DoGetValidator () const
-        {
-            WX_PG_DOGETVALIDATOR_ENTRY()
-
-            wxMyValidator* validator = new wxMyValidator(...);
-
-            ... prepare validator...
-
-            WX_PG_DOGETVALIDATOR_EXIT(validator)
-        }
-
-        @endcode
-
-        @remarks
-        You can get common filename validator by returning
-        wxFileProperty::GetClassValidator(). wxDirProperty,
-        for example, uses it.
-    */
-    virtual wxValidator* DoGetValidator () const;
-
-    /**
-        Override to paint an image in front of the property value text or
-        drop-down list item (but only if wxPGProperty::OnMeasureImage is
-        overridden as well).
-
-        If property's OnMeasureImage() returns size that has height != 0 but
-        less than row height ( < 0 has special meanings), wxPropertyGrid calls
-        this method to draw a custom image in a limited area in front of the
-        editor control or value text/graphics, and if control has drop-down
-        list, then the image is drawn there as well (even in the case
-        OnMeasureImage() returned higher height than row height).
-
-        NOTE: Following applies when OnMeasureImage() returns a "flexible"
-        height ( using wxPG_FLEXIBLE_SIZE(W,H) macro), which implies variable
-        height items: If rect.x is < 0, then this is a measure item call, which
-        means that dc is invalid and only thing that should be done is to set
-        paintdata.m_drawnHeight to the height of the image of item at index
-        paintdata.m_choiceItem. This call may be done even as often as once
-        every drop-down popup show.
-
-        @param dc
-            wxDC to paint on.
-        @param rect
-            Box reserved for custom graphics. Includes surrounding rectangle,
-            if any. If x is < 0, then this is a measure item call (see above).
-        @param paintdata
-            wxPGPaintData structure with much useful data.
-
-        @remarks
-            - You can actually exceed rect width, but if you do so then
-              paintdata.m_drawnWidth must be set to the full width drawn in
-              pixels.
-            - Due to technical reasons, rect's height will be default even if
-              custom height was reported during measure call.
-            - Brush is guaranteed to be default background colour. It has been
-              already used to clear the background of area being painted. It
-              can be modified.
-            - Pen is guaranteed to be 1-wide 'black' (or whatever is the proper
-              colour) pen for drawing framing rectangle. It can be changed as
-              well.
-
-        @see ValueToString()
-    */
-    virtual void OnCustomPaint( wxDC& dc,
-                                const wxRect& rect,
-                                wxPGPaintData& paintdata );
-
-    /**
-        Returns used wxPGCellRenderer instance for given property column
-        (label=0, value=1).
-
-        Default implementation returns editor's renderer for all columns.
-    */
-    virtual wxPGCellRenderer* GetCellRenderer( int column ) const;
-
-    /** Returns which choice is currently selected. Only applies to properties
-        which have choices.
-
-        Needs to reimplemented in derived class if property value does not
-        map directly to a choice. Integer as index, bool, and string usually do.
-    */
-    virtual int GetChoiceSelection() const;
-
-    /**
-        Refresh values of child properties.
-
-        Automatically called after value is set.
-    */
-    virtual void RefreshChildren();
-
-    /**
-        Reimplement this member function to add special handling for
-        attributes of this property.
-
-        @return Return @false to have the attribute automatically stored in
-                m_attributes. Default implementation simply does that and
-                nothing else.
-
-        @remarks To actually set property attribute values from the
-                 application, use wxPGProperty::SetAttribute() instead.
-    */
-    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
-
-    /** Returns value of an attribute.
-
-        Override if custom handling of attributes is needed.
-
-        Default implementation simply return NULL variant.
-    */
-    virtual wxVariant DoGetAttribute( const wxString& name ) const;
-
-    /** Returns instance of a new wxPGEditorDialogAdapter instance, which is
-        used when user presses the (optional) button next to the editor control;
-
-        Default implementation returns NULL (ie. no action is generated when
-        button is pressed).
-    */
-    virtual wxPGEditorDialogAdapter* GetEditorDialog() const;
-
-    /**
-        Called whenever validation has failed with given pending value.
-
-        @remarks If you implement this in your custom property class, please
-                 remember to call the baser implementation as well, since they
-                 may use it to revert property into pre-change state.
-    */
-    virtual void OnValidationFailure( wxVariant& pendingValue );
-
-    /** Append a new choice to property's list of choices.
-    */
-    int AddChoice( const wxString& label, int value = wxPG_INVALID_VALUE )
-    {
-        return InsertChoice(label, wxNOT_FOUND, value);
-    }
-
-    /**
-        Returns true if children of this property are component values (for
-        instance, points size, face name, and is_underlined are component
-        values of a font).
-    */
-    bool AreChildrenComponents() const
-    {
-        if ( m_flags & (wxPG_PROP_COMPOSED_VALUE|wxPG_PROP_AGGREGATE) )
-            return true;
-
-        return false;
-    }
-
-    /**
-        Deletes children of the property.
-    */
-    void DeleteChildren();
-
-    /**
-        Removes entry from property's wxPGChoices and editor control (if it is
-        active).
-
-        If selected item is deleted, then the value is set to unspecified.
-    */
-    void DeleteChoice( int index );
-
-    /**
-        Enables or disables the property. Disabled property usually appears
-        as having grey text.
-
-        @param enable
-            If @false, property is disabled instead.
-
-        @see wxPropertyGridInterface::EnableProperty()
-    */
-    void Enable( bool enable = true );
-
-    /**
-        Call to enable or disable usage of common value (integer value that can
-        be selected for properties instead of their normal values) for this
-        property.
-
-        Common values are disabled by the default for all properties.
-    */
-    void EnableCommonValue( bool enable = true )
-    {
-        if ( enable ) SetFlag( wxPG_PROP_USES_COMMON_VALUE );
-        else ClearFlag( wxPG_PROP_USES_COMMON_VALUE );
-    }
-
-    /**
-        Composes text from values of child properties.
-    */
-    wxString GenerateComposedValue() const
-    {
-        wxString s;
-        DoGenerateComposedValue(s);
-        return s;
-    }
-
-    /** Returns property's label. */
-    const wxString& GetLabel() const { return m_label; }
-
-    /** Returns property's name with all (non-category, non-root) parents. */
-    wxString GetName() const;
-
-    /**
-        Returns property's base name (ie parent's name is not added in any
-        case)
-     */
-    const wxString& GetBaseName() const { return m_name; }
-
-    /** Returns read-only reference to property's list of choices.
-    */
-    const wxPGChoices& GetChoices() const
-    {
-        return m_choices;
-    }
-
-    /** Returns coordinate to the top y of the property. Note that the
-        position of scrollbars is not taken into account.
-    */
-    int GetY() const;
-
-    wxVariant GetValue() const
-    {
-        return DoGetValue();
-    }
-
-    /** Returns reference to the internal stored value. GetValue is preferred
-        way to get the actual value, since GetValueRef ignores DoGetValue,
-        which may override stored value.
-    */
-    wxVariant& GetValueRef()
-    {
-        return m_value;
-    }
-
-    const wxVariant& GetValueRef() const
-    {
-        return m_value;
-    }
-
-    // Helper function (for wxPython bindings and such) for settings protected
-    // m_value.
-    wxVariant GetValuePlain() const
-    {
-        return m_value;
-    }
-
-    /** Returns text representation of property's value.
-
-        @param argFlags
-            If 0 (default value), then displayed string is returned.
-            If wxPG_FULL_VALUE is set, returns complete, storable string value
-            instead of displayable. If wxPG_EDITABLE_VALUE is set, returns
-            string value that must be editable in textctrl. If
-            wxPG_COMPOSITE_FRAGMENT is set, returns text that is appropriate to
-            display as a part of string property's composite text
-            representation.
-
-        @remarks In older versions, this function used to be overridden to convert
-                 property's value into a string representation. This function is
-                 now handled by ValueToString(), and overriding this function now
-                 will result in run-time assertion failure.
-    */
-    virtual wxString GetValueAsString( int argFlags = 0 ) const;
-
-    /** Synonymous to GetValueAsString().
-
-        @deprecated Use GetValueAsString() instead.
-
-        @see GetValueAsString()
-    */
-    wxDEPRECATED( wxString GetValueString( int argFlags = 0 ) const );
-
-    /**
-        Returns wxPGCell of given column.
-
-        @remarks const version of this member function returns 'default'
-                 wxPGCell object if the property itself didn't hold
-                 cell data.
-    */
-    const wxPGCell& GetCell( unsigned int column ) const;
-
-    /**
-        Returns wxPGCell of given column, creating one if necessary.
-    */
-    wxPGCell& GetCell( unsigned int column )
-    {
-        return GetOrCreateCell(column);
-    }
-
-    /**
-        Returns wxPGCell of given column, creating one if necessary.
-    */
-    wxPGCell& GetOrCreateCell( unsigned int column );
-
-    /** Return number of displayed common values for this property.
-    */
-    int GetDisplayedCommonValueCount() const;
-
-    wxString GetDisplayedString() const
-    {
-        return GetValueAsString(0);
-    }
-
-    /**
-        Returns property's hint text (shown in empty value cell).
-    */
-    inline wxString GetHintText() const;
-
-    /** Returns property grid where property lies. */
-    wxPropertyGrid* GetGrid() const;
-
-    /** Returns owner wxPropertyGrid, but only if one is currently on a page
-        displaying this property. */
-    wxPropertyGrid* GetGridIfDisplayed() const;
-
-    /** Returns highest level non-category, non-root parent. Useful when you
-        have nested wxCustomProperties/wxParentProperties.
-        @remarks
-        Thus, if immediate parent is root or category, this will return the
-        property itself.
-    */
-    wxPGProperty* GetMainParent() const;
-
-    /** Return parent of property */
-    wxPGProperty* GetParent() const { return m_parent; }
-
-    /** Returns true if property has editable wxTextCtrl when selected.
-
-        @remarks
-        Although disabled properties do not displayed editor, they still
-        return True here as being disabled is considered a temporary
-        condition (unlike being read-only or having limited editing enabled).
-    */
-    bool IsTextEditable() const;
-
-    bool IsValueUnspecified() const
-    {
-        return m_value.IsNull();
-    }
-
-    /**
-        Returns non-zero if property has given flag set.
-
-        @see propgrid_propflags
-    */
-    FlagType HasFlag( wxPGPropertyFlags flag ) const
-    {
-        return ( m_flags & flag );
-    }
-
-    /** Returns comma-delimited string of property attributes.
-    */
-    const wxPGAttributeStorage& GetAttributes() const
-    {
-        return m_attributes;
-    }
-
-    /** Returns m_attributes as list wxVariant.
-    */
-    wxVariant GetAttributesAsList() const;
-
-    /**
-        Returns property flags.
-    */
-    FlagType GetFlags() const
-    {
-        return m_flags;
-    }
-
-    const wxPGEditor* GetEditorClass() const;
-
-    wxString GetValueType() const
-    {
-        return m_value.GetType();
-    }
-
-    /** Returns editor used for given column. NULL for no editor.
-    */
-    const wxPGEditor* GetColumnEditor( int column ) const
-    {
-        if ( column == 1 )
-            return GetEditorClass();
-
-        return NULL;
-    }
-
-    /** Returns common value selected for this property. -1 for none.
-    */
-    int GetCommonValue() const
-    {
-        return m_commonValue;
-    }
-
-    /** Returns true if property has even one visible child.
-    */
-    bool HasVisibleChildren() const;
-
-    /**
-        Use this member function to add independent (ie. regular) children to
-        a property.
-
-        @return Inserted childProperty.
-
-        @remarks wxPropertyGrid is not automatically refreshed by this
-                 function.
-
-        @see AddPrivateChild()
-    */
-    wxPGProperty* InsertChild( int index, wxPGProperty* childProperty );
-
-    /** Inserts a new choice to property's list of choices.
-    */
-    int InsertChoice( const wxString& label, int index, int value = wxPG_INVALID_VALUE );
-
-    /**
-        Returns true if this property is actually a wxPropertyCategory.
-    */
-    bool IsCategory() const { return HasFlag(wxPG_PROP_CATEGORY)?true:false; }
-
-    /** Returns true if this property is actually a wxRootProperty.
-    */
-    bool IsRoot() const { return (m_parent == NULL); }
-
-    /** Returns true if this is a sub-property. */
-    bool IsSubProperty() const
-    {
-        wxPGProperty* parent = (wxPGProperty*)m_parent;
-        if ( parent && !parent->IsCategory() )
-            return true;
-        return false;
-    }
-
-    /** Returns last visible sub-property, recursively.
-    */
-    const wxPGProperty* GetLastVisibleSubItem() const;
-
-    wxVariant GetDefaultValue() const;
-
-    int GetMaxLength() const
-    {
-        return (int) m_maxLen;
-    }
-
-    /**
-        Determines, recursively, if all children are not unspecified.
-
-        @param pendingList
-            Assumes members in this wxVariant list as pending
-            replacement values.
-    */
-    bool AreAllChildrenSpecified( wxVariant* pendingList = NULL ) const;
-
-    /** Updates composed values of parent non-category properties, recursively.
-        Returns topmost property updated.
-
-        @remarks
-        - Must not call SetValue() (as can be called in it).
-    */
-    wxPGProperty* UpdateParentValues();
-
-    /** Returns true if containing grid uses wxPG_EX_AUTO_UNSPECIFIED_VALUES.
-    */
-    bool UsesAutoUnspecified() const
-    {
-        return HasFlag(wxPG_PROP_AUTO_UNSPECIFIED)?true:false;
-    }
-
-    wxBitmap* GetValueImage() const
-    {
-        return m_valueBitmap;
-    }
-
-    wxVariant GetAttribute( const wxString& name ) const;
-
-    /**
-        Returns named attribute, as string, if found.
-
-        Otherwise defVal is returned.
-    */
-    wxString GetAttribute( const wxString& name, const wxString& defVal ) const;
-
-    /**
-        Returns named attribute, as long, if found.
-
-        Otherwise defVal is returned.
-    */
-    long GetAttributeAsLong( const wxString& name, long defVal ) const;
-
-    /**
-        Returns named attribute, as double, if found.
-
-        Otherwise defVal is returned.
-    */
-    double GetAttributeAsDouble( const wxString& name, double defVal ) const;
-
-    unsigned int GetDepth() const { return (unsigned int)m_depth; }
-
-    /** Gets flags as a'|' delimited string. Note that flag names are not
-        prepended with 'wxPG_PROP_'.
-        @param flagsMask
-        String will only be made to include flags combined by this parameter.
-    */
-    wxString GetFlagsAsString( FlagType flagsMask ) const;
-
-    /** Returns position in parent's array. */
-    unsigned int GetIndexInParent() const
-    {
-        return (unsigned int)m_arrIndex;
-    }
-
-    /** Hides or reveals the property.
-        @param hide
-            true for hide, false for reveal.
-        @param flags
-            By default changes are applied recursively. Set this paramter
-            wxPG_DONT_RECURSE to prevent this.
-    */
-    bool Hide( bool hide, int flags = wxPG_RECURSE );
-
-    bool IsExpanded() const
-        { return (!(m_flags & wxPG_PROP_COLLAPSED) && GetChildCount()); }
-
-    /** Returns true if all parents expanded.
-    */
-    bool IsVisible() const;
-
-    bool IsEnabled() const { return !(m_flags & wxPG_PROP_DISABLED); }
-
-    /** If property's editor is created this forces its recreation.
-        Useful in SetAttribute etc. Returns true if actually did anything.
-    */
-    bool RecreateEditor();
-
-    /** If property's editor is active, then update it's value.
-    */
-    void RefreshEditor();
-
-    /** Sets an attribute for this property.
-        @param name
-        Text identifier of attribute. See @ref propgrid_property_attributes.
-        @param value
-        Value of attribute.
-    */
-    void SetAttribute( const wxString& name, wxVariant value );
-
-    void SetAttributes( const wxPGAttributeStorage& attributes );
-
-    /**
-        Set if user can change the property's value to unspecified by
-        modifying the value of the editor control (usually by clearing
-        it).  Currently, this can work with following properties:
-        wxIntProperty, wxUIntProperty, wxFloatProperty, wxEditEnumProperty.
-
-        @param enable
-            Whether to enable or disable this behaviour (it is disabled by
-            default).
-    */
-    void SetAutoUnspecified( bool enable = true )
-    {
-        ChangeFlag(wxPG_PROP_AUTO_UNSPECIFIED, enable);
-    }
-
-    /**
-        Sets property's background colour.
-
-        @param colour
-            Background colour to use.
-
-        @param flags
-            Default is wxPG_RECURSE which causes colour to be set recursively.
-            Omit this flag to only set colour for the property in question
-            and not any of its children.
-    */
-    void SetBackgroundColour( const wxColour& colour,
-                              int flags = wxPG_RECURSE );
-
-    /**
-        Sets property's text colour.
-
-        @param colour
-            Text colour to use.
-
-        @param flags
-            Default is wxPG_RECURSE which causes colour to be set recursively.
-            Omit this flag to only set colour for the property in question
-            and not any of its children.
-    */
-    void SetTextColour( const wxColour& colour,
-                        int flags = wxPG_RECURSE );
-
-    /** Set default value of a property. Synonymous to
-
-        @code
-            SetAttribute("DefaultValue", value);
-        @endcode
-    */
-    void SetDefaultValue( wxVariant& value );
-
-    /** Sets editor for a property.
-
-        @param editor
-            For builtin editors, use wxPGEditor_X, where X is builtin editor's
-            name (TextCtrl, Choice, etc. see wxPGEditor documentation for full
-            list).
-
-        For custom editors, use pointer you received from
-        wxPropertyGrid::RegisterEditorClass().
-    */
-    void SetEditor( const wxPGEditor* editor )
-    {
-        m_customEditor = editor;
-    }
-
-    /** Sets editor for a property.
-    */
-    inline void SetEditor( const wxString& editorName );
-
-    /**
-        Sets cell information for given column.
-    */
-    void SetCell( int column, const wxPGCell& cell );
-
-    /** Sets common value selected for this property. -1 for none.
-    */
-    void SetCommonValue( int commonValue )
-    {
-        m_commonValue = commonValue;
-    }
-
-    /** Sets flags from a '|' delimited string. Note that flag names are not
-        prepended with 'wxPG_PROP_'.
-    */
-    void SetFlagsFromString( const wxString& str );
-
-    /** Sets property's "is it modified?" flag. Affects children recursively.
-    */
-    void SetModifiedStatus( bool modified )
-    {
-        SetFlagRecursively(wxPG_PROP_MODIFIED, modified);
-    }
-
-    /** Call in OnEvent(), OnButtonClick() etc. to change the property value
-        based on user input.
-
-        @remarks
-        This method is const since it doesn't actually modify value, but posts
-        given variant as pending value, stored in wxPropertyGrid.
-    */
-    void SetValueInEvent( wxVariant value ) const;
-
-    /**
-        Call this to set value of the property.
-
-        Unlike methods in wxPropertyGrid, this does not automatically update
-        the display.
-
-        @remarks
-        Use wxPropertyGrid::ChangePropertyValue() instead if you need to run
-        through validation process and send property change event.
-
-        If you need to change property value in event, based on user input, use
-        SetValueInEvent() instead.
-
-        @param pList
-            Pointer to list variant that contains child values. Used to
-            indicate which children should be marked as modified.
-
-        @param flags
-            Various flags (for instance, wxPG_SETVAL_REFRESH_EDITOR, which is
-            enabled by default).
-    */
-    void SetValue( wxVariant value, wxVariant* pList = NULL,
-                   int flags = wxPG_SETVAL_REFRESH_EDITOR );
-
-    /** Set wxBitmap in front of the value. This bitmap may be ignored
-        by custom cell renderers.
-    */
-    void SetValueImage( wxBitmap& bmp );
-
-    /** Sets selected choice and changes property value.
-
-        Tries to retain value type, although currently if it is not string,
-        then it is forced to integer.
-    */
-    void SetChoiceSelection( int newValue );
-
-    void SetExpanded( bool expanded )
-    {
-        if ( !expanded ) m_flags |= wxPG_PROP_COLLAPSED;
-        else m_flags &= ~wxPG_PROP_COLLAPSED;
-    }
-
-    /**
-        Sets or clears given property flag. Mainly for internal use.
-
-        @remarks Setting a property flag never has any side-effect, and is
-                 intended almost exclusively for internal use. So, for
-                 example, if you want to disable a property, call
-                 Enable(false) instead of setting wxPG_PROP_DISABLED flag.
-
-        @see HasFlag(), GetFlags()
-    */
-    void ChangeFlag( wxPGPropertyFlags flag, bool set )
-    {
-        if ( set )
-            m_flags |= flag;
-        else
-            m_flags &= ~flag;
-    }
-
-    /**
-        Sets or clears given property flag, recursively. This function is
-        primarily intended for internal use.
-
-        @see ChangeFlag()
-    */
-    void SetFlagRecursively( wxPGPropertyFlags flag, bool set );
-
-    void SetHelpString( const wxString& helpString )
-    {
-        m_helpString = helpString;
-    }
-
-    void SetLabel( const wxString& label ) { m_label = label; }
-
-    void SetName( const wxString& newName );
-
-    /**
-        Changes what sort of parent this property is for its children.
-
-        @param flag
-            Use one of the following values: wxPG_PROP_MISC_PARENT (for
-            generic parents), wxPG_PROP_CATEGORY (for categories), or
-            wxPG_PROP_AGGREGATE (for derived property classes with private
-            children).
-
-        @remarks You generally do not need to call this function.
-    */
-    void SetParentalType( int flag )
-    {
-        m_flags &= ~(wxPG_PROP_PROPERTY|wxPG_PROP_PARENTAL_FLAGS);
-        m_flags |= flag;
-    }
-
-    void SetValueToUnspecified()
-    {
-        wxVariant val;  // Create NULL variant
-        SetValue(val, NULL, wxPG_SETVAL_REFRESH_EDITOR);
-    }
-
-    // Helper function (for wxPython bindings and such) for settings protected
-    // m_value.
-    void SetValuePlain( wxVariant value )
-    {
-        m_value = value;
-    }
-
-#if wxUSE_VALIDATORS
-    /** Sets wxValidator for a property*/
-    void SetValidator( const wxValidator& validator )
-    {
-        m_validator = wxDynamicCast(validator.Clone(),wxValidator);
-    }
-
-    /** Gets assignable version of property's validator. */
-    wxValidator* GetValidator() const
-    {
-        if ( m_validator )
-            return m_validator;
-        return DoGetValidator();
-    }
-#endif // wxUSE_VALIDATORS
-
-    /** Returns client data (void*) of a property.
-    */
-    void* GetClientData() const
-    {
-        return m_clientData;
-    }
-
-    /** Sets client data (void*) of a property.
-        @remarks
-        This untyped client data has to be deleted manually.
-    */
-    void SetClientData( void* clientData )
-    {
-        m_clientData = clientData;
-    }
-
-    /** Returns client object of a property.
-    */
-    void SetClientObject(wxClientData* clientObject)
-    {
-        delete m_clientObject;
-        m_clientObject = clientObject;
-    }
-
-    /** Sets managed client object of a property.
-    */
-    wxClientData *GetClientObject() const { return m_clientObject; }
-
-    /**
-        Sets new set of choices for the property.
-
-        @remarks This operation deselects the property and clears its
-                 value.
-    */
-    bool SetChoices( const wxPGChoices& choices );
-
-    /** Set max length of text in text editor.
-    */
-    inline bool SetMaxLength( int maxLen );
-
-    /** Call with 'false' in OnSetValue to cancel value changes after all
-        (ie. cancel 'true' returned by StringToValue() or IntToValue()).
-    */
-    void SetWasModified( bool set = true )
-    {
-        if ( set ) m_flags |= wxPG_PROP_WAS_MODIFIED;
-        else m_flags &= ~wxPG_PROP_WAS_MODIFIED;
-    }
-
-    const wxString& GetHelpString() const
-    {
-        return m_helpString;
-    }
-
-    // Use, for example, to detect if item is inside collapsed section.
-    bool IsSomeParent( wxPGProperty* candidate_parent ) const;
-
-    /**
-        Adapts list variant into proper value using consecutive
-        ChildChanged-calls.
-    */
-    void AdaptListToValue( wxVariant& list, wxVariant* value ) const;
-
-#if wxPG_COMPATIBILITY_1_4
-    /**
-        Adds a private child property.
-
-        @deprecated Use AddPrivateChild() instead.
-
-        @see AddPrivateChild()
-    */
-    wxDEPRECATED( void AddChild( wxPGProperty* prop ) );
-#endif
-
-    /**
-        Adds a private child property. If you use this instead of
-        wxPropertyGridInterface::Insert() or
-        wxPropertyGridInterface::AppendIn(), then property's parental
-        type will automatically be set up to wxPG_PROP_AGGREGATE. In other
-        words, all properties of this property will become private.
-    */
-    void AddPrivateChild( wxPGProperty* prop );
-
-    /**
-        Appends a new child property.
-    */
-    wxPGProperty* AppendChild( wxPGProperty* prop )
-    {
-        return InsertChild(-1, prop);
-    }
-
-    /** Returns height of children, recursively, and
-        by taking expanded/collapsed status into account.
-
-        iMax is used when finding property y-positions.
-    */
-    int GetChildrenHeight( int lh, int iMax = -1 ) const;
-
-    /** Returns number of child properties */
-    unsigned int GetChildCount() const
-    {
-        return (unsigned int) m_children.size();
-    }
-
-    /** Returns sub-property at index i. */
-    wxPGProperty* Item( unsigned int i ) const
-        { return m_children[i]; }
-
-    /** Returns last sub-property.
-    */
-    wxPGProperty* Last() const { return m_children.back(); }
-
-    /** Returns index of given child property. */
-    int Index( const wxPGProperty* p ) const;
-
-    // Puts correct indexes to children
-    void FixIndicesOfChildren( unsigned int starthere = 0 );
-
-    /**
-        Converts image width into full image offset, with margins.
-    */
-    int GetImageOffset( int imageWidth ) const;
-
-    // Returns wxPropertyGridPageState in which this property resides.
-    wxPropertyGridPageState* GetParentState() const { return m_parentState; }
-
-    wxPGProperty* GetItemAtY( unsigned int y,
-                              unsigned int lh,
-                              unsigned int* nextItemY ) const;
-
-    /** Returns property at given virtual y coordinate.
-    */
-    wxPGProperty* GetItemAtY( unsigned int y ) const;
-
-    /** Returns (direct) child property with given name (or NULL if not found).
-    */
-    wxPGProperty* GetPropertyByName( const wxString& name ) const;
-
-    // Returns various display-related information for given column
-    void GetDisplayInfo( unsigned int column,
-                         int choiceIndex,
-                         int flags,
-                         wxString* pString,
-                         const wxPGCell** pCell );
-
-    static wxString*            sm_wxPG_LABEL;
-
-    /** This member is public so scripting language bindings
-        wrapper code can access it freely.
-    */
-    void*                       m_clientData;
-
-protected:
-
-    /**
-        Sets property cell in fashion that reduces number of exclusive
-        copies of cell data. Used when setting, for instance, same
-        background colour for a number of properties.
-
-        @param firstCol
-            First column to affect.
-
-        @param lastCol
-            Last column to affect.
-
-        @param preparedCell
-            Pre-prepared cell that is used for those which cell data
-            before this matched unmodCellData.
-
-        @param srcData
-            If unmodCellData did not match, valid cell data from this
-            is merged into cell (usually generating new exclusive copy
-            of cell's data).
-
-        @param unmodCellData
-            If cell's cell data matches this, its cell is now set to
-            preparedCell.
-
-        @param ignoreWithFlags
-            Properties with any one of these flags are skipped.
-
-        @param recursively
-            If @true, apply this operation recursively in child properties.
-    */
-    void AdaptiveSetCell( unsigned int firstCol,
-                          unsigned int lastCol,
-                          const wxPGCell& preparedCell,
-                          const wxPGCell& srcData,
-                          wxPGCellData* unmodCellData,
-                          FlagType ignoreWithFlags,
-                          bool recursively );
-
-    /**
-        Makes sure m_cells has size of column+1 (or more).
-    */
-    void EnsureCells( unsigned int column );
-
-    /** Returns (direct) child property with given name (or NULL if not found),
-        with hint index.
-
-        @param hintIndex
-        Start looking for the child at this index.
-
-        @remarks
-        Does not support scope (ie. Parent.Child notation).
-    */
-    wxPGProperty* GetPropertyByNameWH( const wxString& name,
-                                       unsigned int hintIndex ) const;
-
-    /** This is used by Insert etc. */
-    void DoAddChild( wxPGProperty* prop,
-                     int index = -1,
-                     bool correct_mode = true );
-
-    void DoGenerateComposedValue( wxString& text,
-                                  int argFlags = wxPG_VALUE_IS_CURRENT,
-                                  const wxVariantList* valueOverrides = NULL,
-                                  wxPGHashMapS2S* childResults = NULL ) const;
-
-    bool DoHide( bool hide, int flags );
-
-    void DoSetName(const wxString& str) { m_name = str; }
-
-    /** Deletes all sub-properties. */
-    void Empty();
-
-    bool HasCell( unsigned int column ) const
-    {
-        if ( m_cells.size() > column )
-            return true;
-        return false;
-    }
-
-    void InitAfterAdded( wxPropertyGridPageState* pageState,
-                         wxPropertyGrid* propgrid );
-
-    /**
-        Returns true if child property is selected.
-    */
-    bool IsChildSelected( bool recursive = false ) const;
-
-    // Removes child property with given pointer. Does not delete it.
-    void RemoveChild( wxPGProperty* p );
-
-    void DoEnable( bool enable );
-
-    void DoPreAddChild( int index, wxPGProperty* prop );
-
-    void SetParentState( wxPropertyGridPageState* pstate )
-        { m_parentState = pstate; }
-
-    void SetFlag( wxPGPropertyFlags flag )
-    {
-        //
-        // NB: While using wxPGPropertyFlags here makes it difficult to
-        //     combine different flags, it usefully prevents user from
-        //     using incorrect flags (say, wxWindow styles).
-        m_flags |= flag;
-    }
-
-    void ClearFlag( FlagType flag ) { m_flags &= ~(flag); }
-
-    // Called when the property is being removed from the grid and/or
-    // page state (but *not* when it is also deleted).
-    void OnDetached(wxPropertyGridPageState* state,
-                    wxPropertyGrid* propgrid);
-
-    // Call after fixed sub-properties added/removed after creation.
-    // if oldSelInd >= 0 and < new max items, then selection is
-    // moved to it.
-    void SubPropsChanged( int oldSelInd = -1 );
-
-    int GetY2( int lh ) const;
-
-    wxString                    m_label;
-    wxString                    m_name;
-    wxPGProperty*               m_parent;
-    wxPropertyGridPageState*    m_parentState;
-
-    wxClientData*               m_clientObject;
-
-    // Overrides editor returned by property class
-    const wxPGEditor*           m_customEditor;
-#if wxUSE_VALIDATORS
-    // Editor is going to get this validator
-    wxValidator*                m_validator;
-#endif
-    // Show this in front of the value
-    //
-    // TODO: Can bitmap be implemented with wxPGCell?
-    wxBitmap*                   m_valueBitmap;
-
-    wxVariant                   m_value;
-    wxPGAttributeStorage        m_attributes;
-    wxArrayPGProperty           m_children;
-
-    // Extended cell information
-    wxVector<wxPGCell>          m_cells;
-
-    // Choices shown in drop-down list of editor control.
-    wxPGChoices                 m_choices;
-
-    // Help shown in statusbar or help box.
-    wxString                    m_helpString;
-
-    // Index in parent's property array.
-    unsigned int                m_arrIndex;
-
-    // If not -1, then overrides m_value
-    int                         m_commonValue;
-
-    FlagType                    m_flags;
-
-    // Maximum length (mainly for string properties). Could be in some sort of
-    // wxBaseStringProperty, but currently, for maximum flexibility and
-    // compatibility, we'll stick it here. Anyway, we had 3 excess bytes to use
-    // so short int will fit in just fine.
-    short                       m_maxLen;
-
-    // Root has 0, categories etc. at that level 1, etc.
-    unsigned char               m_depth;
-
-    // m_depthBgCol indicates width of background colour between margin and item
-    // (essentially this is category's depth, if none then equals m_depth).
-    unsigned char               m_depthBgCol;
-
-private:
-    // Called in constructors.
-    void Init();
-    void Init( const wxString& label, const wxString& name );
-};
-
-// -----------------------------------------------------------------------
-
-//
-// Property class declaration helper macros
-// (wxPGRootPropertyClass and wxPropertyCategory require this).
-//
-
-#define WX_PG_DECLARE_DOGETEDITORCLASS \
-    virtual const wxPGEditor* DoGetEditorClass() const;
-
-#ifndef WX_PG_DECLARE_PROPERTY_CLASS
-    #define WX_PG_DECLARE_PROPERTY_CLASS(CLASSNAME) \
-        public: \
-            DECLARE_DYNAMIC_CLASS(CLASSNAME) \
-            WX_PG_DECLARE_DOGETEDITORCLASS \
-        private:
-#endif
-
-// Implements sans constructor function. Also, first arg is class name, not
-// property name.
-#define WX_PG_IMPLEMENT_PROPERTY_CLASS_PLAIN(PROPNAME,T,EDITOR) \
-const wxPGEditor* PROPNAME::DoGetEditorClass() const \
-{ \
-    return wxPGEditor_##EDITOR; \
-}
-
-// -----------------------------------------------------------------------
-
-/** @class wxPGRootProperty
-    @ingroup classes
-    Root parent property.
-*/
-class WXDLLIMPEXP_PROPGRID wxPGRootProperty : public wxPGProperty
-{
-public:
-    WX_PG_DECLARE_PROPERTY_CLASS(wxPGRootProperty)
-public:
-
-    /** Constructor. */
-    wxPGRootProperty( const wxString& name = wxS("<Root>") );
-    virtual ~wxPGRootProperty();
-
-    virtual bool StringToValue( wxVariant&, const wxString&, int ) const
-    {
-        return false;
-    }
-
-protected:
-};
-
-// -----------------------------------------------------------------------
-
-/** @class wxPropertyCategory
-    @ingroup classes
-    Category (caption) property.
-*/
-class WXDLLIMPEXP_PROPGRID wxPropertyCategory : public wxPGProperty
-{
-    friend class wxPropertyGrid;
-    friend class wxPropertyGridPageState;
-    WX_PG_DECLARE_PROPERTY_CLASS(wxPropertyCategory)
-public:
-
-    /** Default constructor is only used in special cases. */
-    wxPropertyCategory();
-
-    wxPropertyCategory( const wxString& label,
-                        const wxString& name = wxPG_LABEL );
-    ~wxPropertyCategory();
-
-    int GetTextExtent( const wxWindow* wnd, const wxFont& font ) const;
-
-    virtual wxString ValueToString( wxVariant& value, int argFlags ) const;
-    virtual wxString GetValueAsString( int argFlags = 0 ) const;
-
-protected:
-    void SetTextColIndex( unsigned int colInd )
-        { m_capFgColIndex = (wxByte) colInd; }
-    unsigned int GetTextColIndex() const
-        { return (unsigned int) m_capFgColIndex; }
-
-    void CalculateTextExtent( wxWindow* wnd, const wxFont& font );
-
-    int     m_textExtent;  // pre-calculated length of text
-    wxByte  m_capFgColIndex;  // caption text colour index
-
-private:
-    void Init();
-};
-
-// -----------------------------------------------------------------------
-
-#endif // wxUSE_PROPGRID
-
-#endif // _WX_PROPGRID_PROPERTY_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/propgrid.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/propgrid.h
deleted file mode 100644
index 9b12b2eb71..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/propgrid.h
+++ /dev/null
@@ -1,2698 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/propgrid/propgrid.h
-// Purpose:     wxPropertyGrid
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     2004-09-25
-// Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PROPGRID_PROPGRID_H_
-#define _WX_PROPGRID_PROPGRID_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_PROPGRID
-
-#include "wx/thread.h"
-#include "wx/dcclient.h"
-#include "wx/control.h"
-#include "wx/scrolwin.h"
-#include "wx/tooltip.h"
-#include "wx/datetime.h"
-#include "wx/recguard.h"
-
-#include "wx/propgrid/property.h"
-#include "wx/propgrid/propgridiface.h"
-
-
-#ifndef SWIG
-extern WXDLLIMPEXP_DATA_PROPGRID(const char) wxPropertyGridNameStr[];
-#endif
-
-class wxPGComboBox;
-
-#if wxUSE_STATUSBAR
-class WXDLLIMPEXP_FWD_CORE wxStatusBar;
-#endif
-
-// -----------------------------------------------------------------------
-// Global variables
-// -----------------------------------------------------------------------
-
-// This is required for sharing common global variables.
-class WXDLLIMPEXP_PROPGRID wxPGGlobalVarsClass
-{
-public:
-
-    wxPGGlobalVarsClass();
-    ~wxPGGlobalVarsClass();
-
-#if wxUSE_THREADS
-    // Critical section for handling the globals. Generally it is not needed
-    // since GUI code is supposed to be in single thread. However,
-    // we do want the user to be able to convey wxPropertyGridEvents to other
-    // threads.
-    wxCriticalSection   m_critSect;
-#endif
-
-    // Used by advprops, but here to make things easier.
-    wxString            m_pDefaultImageWildcard;
-
-    // Map of editor class instances (keys are name string).
-    wxPGHashMapS2P      m_mapEditorClasses;
-
-#if wxUSE_VALIDATORS
-    wxVector<wxValidator*>  m_arrValidators; // These wxValidators need to be freed
-#endif
-
-    wxPGHashMapS2P      m_dictPropertyClassInfo; // PropertyName -> ClassInfo
-
-    wxPGChoices*        m_fontFamilyChoices;
-
-    // Replace with your own to affect all properties using default renderer.
-    wxPGCellRenderer*   m_defaultRenderer;
-
-    wxPGChoices         m_boolChoices;
-
-    wxVariant           m_vEmptyString;
-    wxVariant           m_vZero;
-    wxVariant           m_vMinusOne;
-    wxVariant           m_vTrue;
-    wxVariant           m_vFalse;
-
-    // Cached constant strings
-    wxPGCachedString    m_strstring;
-    wxPGCachedString    m_strlong;
-    wxPGCachedString    m_strbool;
-    wxPGCachedString    m_strlist;
-
-    wxPGCachedString    m_strDefaultValue;
-    wxPGCachedString    m_strMin;
-    wxPGCachedString    m_strMax;
-    wxPGCachedString    m_strUnits;
-    wxPGCachedString    m_strHint;
-#if wxPG_COMPATIBILITY_1_4
-    wxPGCachedString    m_strInlineHelp;
-#endif
-
-    // If true then some things are automatically translated
-    bool                m_autoGetTranslation;
-
-    // > 0 if errors cannot or should not be shown in statusbar etc.
-    int                 m_offline;
-
-    int                 m_extraStyle;  // global extra style
-
-    int                 m_warnings;
-
-    int HasExtraStyle( int style ) const { return (m_extraStyle & style); }
-};
-
-extern WXDLLIMPEXP_DATA_PROPGRID(wxPGGlobalVarsClass*) wxPGGlobalVars;
-
-#define wxPGVariant_EmptyString     (wxPGGlobalVars->m_vEmptyString)
-#define wxPGVariant_Zero            (wxPGGlobalVars->m_vZero)
-#define wxPGVariant_MinusOne        (wxPGGlobalVars->m_vMinusOne)
-#define wxPGVariant_True            (wxPGGlobalVars->m_vTrue)
-#define wxPGVariant_False           (wxPGGlobalVars->m_vFalse)
-
-#define wxPGVariant_Bool(A)     (A?wxPGVariant_True:wxPGVariant_False)
-
-// When wxPG is loaded dynamically after the application is already running
-// then the built-in module system won't pick this one up.  Add it manually.
-WXDLLIMPEXP_PROPGRID void wxPGInitResourceModule();
-
-// -----------------------------------------------------------------------
-
-/** @section propgrid_window_styles wxPropertyGrid Window Styles
-
-    SetWindowStyleFlag method can be used to modify some of these at run-time.
-    @{
-*/
-enum wxPG_WINDOW_STYLES
-{
-
-/** This will cause Sort() automatically after an item is added.
-    When inserting a lot of items in this mode, it may make sense to
-    use Freeze() before operations and Thaw() afterwards to increase
-    performance.
-*/
-wxPG_AUTO_SORT                      = 0x00000010,
-
-/** Categories are not initially shown (even if added).
-    IMPORTANT NOTE: If you do not plan to use categories, then this
-    style will waste resources.
-    This flag can also be changed using wxPropertyGrid::EnableCategories method.
-*/
-wxPG_HIDE_CATEGORIES                = 0x00000020,
-
-/* This style combines non-categoric mode and automatic sorting.
-*/
-wxPG_ALPHABETIC_MODE                = (wxPG_HIDE_CATEGORIES|wxPG_AUTO_SORT),
-
-/** Modified values are shown in bold font. Changing this requires Refresh()
-    to show changes.
-*/
-wxPG_BOLD_MODIFIED                  = 0x00000040,
-
-/** Using this style, the column splitters move automatically based on column
-    proportions (default is equal proportion for every column). This behaviour
-    stops once the user manually moves a splitter, and returns when a
-    splitter is double-clicked.
-
-    @see wxPropertyGridInterface::SetColumnProportion().
-*/
-wxPG_SPLITTER_AUTO_CENTER           = 0x00000080,
-
-/** Display tooltips for cell text that cannot be shown completely. If
-    wxUSE_TOOLTIPS is 0, then this doesn't have any effect.
-*/
-wxPG_TOOLTIPS                       = 0x00000100,
-
-/** Disables margin and hides all expand/collapse buttons that would appear
-    outside the margin (for sub-properties). Toggling this style automatically
-    expands all collapsed items.
-*/
-wxPG_HIDE_MARGIN                    = 0x00000200,
-
-/** This style prevents user from moving the splitter.
-*/
-wxPG_STATIC_SPLITTER                = 0x00000400,
-
-/** Combination of other styles that make it impossible for user to modify
-    the layout.
-*/
-wxPG_STATIC_LAYOUT                  = (wxPG_HIDE_MARGIN|wxPG_STATIC_SPLITTER),
-
-/** Disables wxTextCtrl based editors for properties which
-    can be edited in another way.
-
-    Equals calling wxPropertyGrid::LimitPropertyEditing for all added
-    properties.
-*/
-wxPG_LIMITED_EDITING                = 0x00000800,
-
-/** wxPropertyGridManager only: Show toolbar for mode and page selection. */
-wxPG_TOOLBAR                        = 0x00001000,
-
-/** wxPropertyGridManager only: Show adjustable text box showing description
-    or help text, if available, for currently selected property.
-*/
-wxPG_DESCRIPTION                    = 0x00002000,
-
-/** wxPropertyGridManager only: don't show an internal border around the
-    property grid. Recommended if you use a header.
-*/
-wxPG_NO_INTERNAL_BORDER             = 0x00004000
-};
-
-#if wxPG_COMPATIBILITY_1_4
-    // In wxPG 1.4 this was used to enable now-default theme border support
-    // in wxPropertyGridManager.
-    #define wxPG_THEME_BORDER           0x00000000
-#endif
-
-
-enum wxPG_EX_WINDOW_STYLES
-{
-
-/**
-    NOTE: wxPG_EX_xxx are extra window styles and must be set using
-    SetExtraStyle() member function.
-
-    Speeds up switching to wxPG_HIDE_CATEGORIES mode. Initially, if
-    wxPG_HIDE_CATEGORIES is not defined, the non-categorized data storage is
-    not activated, and switching the mode first time becomes somewhat slower.
-    wxPG_EX_INIT_NOCAT activates the non-categorized data storage right away.
-    IMPORTANT NOTE: If you do plan not switching to non-categoric mode, or if
-    you don't plan to use categories at all, then using this style will result
-    in waste of resources.
-
-*/
-wxPG_EX_INIT_NOCAT                  = 0x00001000,
-
-/** Extended window style that sets wxPropertyGridManager toolbar to not
-    use flat style.
-*/
-wxPG_EX_NO_FLAT_TOOLBAR             = 0x00002000,
-
-/** Shows alphabetic/categoric mode buttons from toolbar.
-*/
-wxPG_EX_MODE_BUTTONS                = 0x00008000,
-
-/** Show property help strings as tool tips instead as text on the status bar.
-    You can set the help strings using SetPropertyHelpString member function.
-*/
-wxPG_EX_HELP_AS_TOOLTIPS            = 0x00010000,
-
-/** Prevent TAB from focusing to wxButtons. This behaviour was default
-    in version 1.2.0 and earlier.
-    NOTE! Tabbing to button doesn't work yet. Problem seems to be that on wxMSW
-      atleast the button doesn't properly propagate key events (yes, I'm using
-      wxWANTS_CHARS).
-*/
-//wxPG_EX_NO_TAB_TO_BUTTON            = 0x00020000,
-
-/** Allows relying on native double-buffering.
-*/
-wxPG_EX_NATIVE_DOUBLE_BUFFERING         = 0x00080000,
-
-/** Set this style to let user have ability to set values of properties to
-    unspecified state. Same as setting wxPG_PROP_AUTO_UNSPECIFIED for
-    all properties.
-*/
-wxPG_EX_AUTO_UNSPECIFIED_VALUES         = 0x00200000,
-
-/**
-    If this style is used, built-in attributes (such as wxPG_FLOAT_PRECISION
-    and wxPG_STRING_PASSWORD) are not stored into property's attribute storage
-    (thus they are not readable).
-
-    Note that this option is global, and applies to all wxPG property
-    containers.
-*/
-wxPG_EX_WRITEONLY_BUILTIN_ATTRIBUTES    = 0x00400000,
-
-/** Hides page selection buttons from toolbar.
-*/
-wxPG_EX_HIDE_PAGE_BUTTONS               = 0x01000000,
-
-/** Allows multiple properties to be selected by user (by pressing SHIFT
-    when clicking on a property, or by dragging with left mouse button
-    down).
-
-    You can get array of selected properties with
-    wxPropertyGridInterface::GetSelectedProperties(). In multiple selection
-    mode wxPropertyGridInterface::GetSelection() returns
-    property which has editor active (usually the first one
-    selected). Other useful member functions are ClearSelection(),
-    AddToSelection() and RemoveFromSelection().
-*/
-wxPG_EX_MULTIPLE_SELECTION              = 0x02000000,
-
-/**
-    This enables top-level window tracking which allows wxPropertyGrid to
-    notify the application of last-minute property value changes by user.
-
-    This style is not enabled by default because it may cause crashes when
-    wxPropertyGrid is used in with wxAUI or similar system.
-
-    @remarks If you are not in fact using any system that may change
-             wxPropertyGrid's top-level parent window on its own, then you
-             are recommended to enable this style.
-*/
-wxPG_EX_ENABLE_TLP_TRACKING             = 0x04000000,
-
-/** Don't show divider above toolbar, on Windows.
-*/
-wxPG_EX_NO_TOOLBAR_DIVIDER              = 0x08000000,
-
-/** Show a separator below the toolbar.
-*/
-wxPG_EX_TOOLBAR_SEPARATOR               = 0x10000000
-
-};
-
-#if wxPG_COMPATIBILITY_1_4
-    #define wxPG_EX_DISABLE_TLP_TRACKING    0x00000000
-#endif
-
-/** Combines various styles.
-*/
-#define wxPG_DEFAULT_STYLE          (0)
-
-/** Combines various styles.
-*/
-#define wxPGMAN_DEFAULT_STYLE       (0)
-
-/** @}
-*/
-
-// -----------------------------------------------------------------------
-
-//
-// Ids for sub-controls
-// NB: It should not matter what these are.
-#define wxPG_SUBID1                     2
-#define wxPG_SUBID2                     3
-#define wxPG_SUBID_TEMP1                4
-
-// -----------------------------------------------------------------------
-
-/** @class wxPGCommonValue
-
-    wxPropertyGrid stores information about common values in these
-    records.
-
-    NB: Common value feature is not complete, and thus not mentioned in
-        documentation.
-*/
-class WXDLLIMPEXP_PROPGRID wxPGCommonValue
-{
-public:
-
-    wxPGCommonValue( const wxString& label, wxPGCellRenderer* renderer )
-    {
-        m_label = label;
-        m_renderer = renderer;
-        renderer->IncRef();
-    }
-    virtual ~wxPGCommonValue()
-    {
-        m_renderer->DecRef();
-    }
-
-    virtual wxString GetEditableText() const { return m_label; }
-    const wxString& GetLabel() const { return m_label; }
-    wxPGCellRenderer* GetRenderer() const { return m_renderer; }
-
-protected:
-    wxString            m_label;
-    wxPGCellRenderer*   m_renderer;
-};
-
-// -----------------------------------------------------------------------
-
-/** @section propgrid_vfbflags wxPropertyGrid Validation Failure behaviour Flags
-    @{
-*/
-
-enum wxPG_VALIDATION_FAILURE_BEHAVIOR_FLAGS
-{
-
-/** Prevents user from leaving property unless value is valid. If this
-    behaviour flag is not used, then value change is instead cancelled.
-*/
-wxPG_VFB_STAY_IN_PROPERTY           = 0x01,
-
-/** Calls wxBell() on validation failure.
-*/
-wxPG_VFB_BEEP                       = 0x02,
-
-/** Cell with invalid value will be marked (with red colour).
-*/
-wxPG_VFB_MARK_CELL                  = 0x04,
-
-/**
-    Display a text message explaining the situation.
-
-    To customize the way the message is displayed, you need to
-    reimplement wxPropertyGrid::DoShowPropertyError() in a
-    derived class. Default behaviour is to display the text on
-    the top-level frame's status bar, if present, and otherwise
-    using wxMessageBox.
-*/
-wxPG_VFB_SHOW_MESSAGE               = 0x08,
-
-/**
-    Similar to wxPG_VFB_SHOW_MESSAGE, except always displays the
-    message using wxMessageBox.
-*/
-wxPG_VFB_SHOW_MESSAGEBOX            = 0x10,
-
-/**
-    Similar to wxPG_VFB_SHOW_MESSAGE, except always displays the
-    message on the status bar (when present - you can reimplement
-    wxPropertyGrid::GetStatusBar() in a derived class to specify
-    this yourself).
-*/
-wxPG_VFB_SHOW_MESSAGE_ON_STATUSBAR  = 0x20,
-
-/** Defaults. */
-wxPG_VFB_DEFAULT                    = wxPG_VFB_MARK_CELL |
-                                      wxPG_VFB_SHOW_MESSAGEBOX,
-
-/** Only used internally. */
-wxPG_VFB_UNDEFINED                  = 0x80
-
-};
-
-/** @}
-*/
-
-// Having this as define instead of wxByte typedef makes things easier for
-// wxPython bindings (ignoring and redefining it in SWIG interface file
-// seemed rather tricky)
-#define wxPGVFBFlags unsigned char
-
-/**
-    wxPGValidationInfo
-
-    Used to convey validation information to and from functions that
-    actually perform validation. Mostly used in custom property
-    classes.
-*/
-class WXDLLIMPEXP_PROPGRID wxPGValidationInfo
-{
-    friend class wxPropertyGrid;
-public:
-    wxPGValidationInfo()
-    {
-        m_failureBehavior = 0;
-        m_isFailing = false;
-    }
-
-    ~wxPGValidationInfo()
-    {
-    }
-
-    /**
-        @return Returns failure behaviour which is a combination of
-               @ref propgrid_vfbflags.
-    */
-    wxPGVFBFlags GetFailureBehavior() const
-        { return m_failureBehavior; }
-
-    /**
-        Returns current failure message.
-    */
-    const wxString& GetFailureMessage() const
-        { return m_failureMessage; }
-
-    /**
-        Returns reference to pending value.
-    */
-    wxVariant& GetValue()
-    {
-        wxASSERT(m_pValue);
-        return *m_pValue;
-    }
-
-    /** Set validation failure behaviour
-
-        @param failureBehavior
-            Mixture of @ref propgrid_vfbflags.
-    */
-    void SetFailureBehavior(wxPGVFBFlags failureBehavior)
-        { m_failureBehavior = failureBehavior; }
-
-    /**
-        Set current failure message.
-    */
-    void SetFailureMessage(const wxString& message)
-        { m_failureMessage = message; }
-
-private:
-    /** Value to be validated.
-    */
-    wxVariant*      m_pValue;
-
-    /** Message displayed on validation failure.
-    */
-    wxString        m_failureMessage;
-
-    /** Validation failure behaviour. Use wxPG_VFB_XXX flags.
-    */
-    wxPGVFBFlags    m_failureBehavior;
-
-    // True when validation is currently failing.
-    bool            m_isFailing;
-};
-
-// -----------------------------------------------------------------------
-
-/** @section propgrid_pgactions wxPropertyGrid Action Identifiers
-
-    These are used with wxPropertyGrid::AddActionTrigger() and
-    wxPropertyGrid::ClearActionTriggers().
-    @{
-*/
-
-enum wxPG_KEYBOARD_ACTIONS
-{
-    wxPG_ACTION_INVALID = 0,
-
-    /** Select the next property. */
-    wxPG_ACTION_NEXT_PROPERTY,
-
-    /** Select the previous property. */
-    wxPG_ACTION_PREV_PROPERTY,
-
-    /** Expand the selected property, if it has child items. */
-    wxPG_ACTION_EXPAND_PROPERTY,
-
-    /** Collapse the selected property, if it has child items. */
-    wxPG_ACTION_COLLAPSE_PROPERTY,
-
-    /** Cancel and undo any editing done in the currently active property
-        editor.
-    */
-    wxPG_ACTION_CANCEL_EDIT,
-
-    /** Move focus to the editor control of the currently selected
-        property.
-    */
-    wxPG_ACTION_EDIT,
-
-    /** Causes editor's button (if any) to be pressed. */
-    wxPG_ACTION_PRESS_BUTTON,
-
-    wxPG_ACTION_MAX
-};
-
-/** @}
-*/
-
-// -----------------------------------------------------------------------
-
-
-// wxPropertyGrid::DoSelectProperty flags (selFlags)
-
-// Focuses to created editor
-#define wxPG_SEL_FOCUS                  0x0001
-// Forces deletion and recreation of editor
-#define wxPG_SEL_FORCE                  0x0002
-// For example, doesn't cause EnsureVisible
-#define wxPG_SEL_NONVISIBLE             0x0004
-// Do not validate editor's value before selecting
-#define wxPG_SEL_NOVALIDATE             0x0008
-// Property being deselected is about to be deleted
-#define wxPG_SEL_DELETING               0x0010
-// Property's values was set to unspecified by the user
-#define wxPG_SEL_SETUNSPEC              0x0020
-// Property's event handler changed the value
-#define wxPG_SEL_DIALOGVAL              0x0040
-// Set to disable sending of wxEVT_PG_SELECTED event
-#define wxPG_SEL_DONT_SEND_EVENT        0x0080
-// Don't make any graphics updates
-#define wxPG_SEL_NO_REFRESH             0x0100
-
-// -----------------------------------------------------------------------
-
-// DoSetSplitterPosition() flags
-
-enum wxPG_SET_SPLITTER_POSITION_SPLITTER_FLAGS
-{
-    wxPG_SPLITTER_REFRESH           = 0x0001,
-    wxPG_SPLITTER_ALL_PAGES         = 0x0002,
-    wxPG_SPLITTER_FROM_EVENT        = 0x0004,
-    wxPG_SPLITTER_FROM_AUTO_CENTER  = 0x0008
-};
-
-
-// -----------------------------------------------------------------------
-
-// Internal flags
-#define wxPG_FL_INITIALIZED                 0x0001
-// Set when creating editor controls if it was clicked on.
-#define wxPG_FL_ACTIVATION_BY_CLICK         0x0002
-#define wxPG_FL_DONT_CENTER_SPLITTER        0x0004
-#define wxPG_FL_FOCUSED                     0x0008
-#define wxPG_FL_MOUSE_CAPTURED              0x0010
-#define wxPG_FL_MOUSE_INSIDE                0x0020
-#define wxPG_FL_VALUE_MODIFIED              0x0040
-// don't clear background of m_wndEditor
-#define wxPG_FL_PRIMARY_FILLS_ENTIRE        0x0080
-// currently active editor uses custom image
-#define wxPG_FL_CUR_USES_CUSTOM_IMAGE       0x0100
-// cell colours override selection colours for selected cell
-#define wxPG_FL_CELL_OVERRIDES_SEL          0x0200
-#define wxPG_FL_SCROLLED                    0x0400
-// set when all added/inserted properties get hideable flag
-#define wxPG_FL_ADDING_HIDEABLES            0x0800
-// Disables showing help strings on statusbar.
-#define wxPG_FL_NOSTATUSBARHELP             0x1000
-// Marks that we created the state, so we have to destroy it too.
-#define wxPG_FL_CREATEDSTATE                0x2000
-// Set if scrollbar's existence was detected in last onresize.
-#define wxPG_FL_SCROLLBAR_DETECTED          0x4000
-// Set if wxPGMan requires redrawing of description text box.
-#define wxPG_FL_DESC_REFRESH_REQUIRED       0x8000
-// Set if contained in wxPropertyGridManager
-#define wxPG_FL_IN_MANAGER                  0x00020000
-// Set after wxPropertyGrid is shown in its initial good size
-#define wxPG_FL_GOOD_SIZE_SET               0x00040000
-// Set when in SelectProperty.
-#define wxPG_FL_IN_SELECT_PROPERTY          0x00100000
-// Set when help string is shown in status bar
-#define wxPG_FL_STRING_IN_STATUSBAR         0x00200000
-// Auto sort is enabled (for categorized mode)
-#define wxPG_FL_CATMODE_AUTO_SORT           0x01000000
-// Set after page has been inserted to manager
-#define wxPG_MAN_FL_PAGE_INSERTED           0x02000000
-// Active editor control is abnormally large
-#define wxPG_FL_ABNORMAL_EDITOR             0x04000000
-// Recursion guard for HandleCustomEditorEvent
-#define wxPG_FL_IN_HANDLECUSTOMEDITOREVENT  0x08000000
-#define wxPG_FL_VALUE_CHANGE_IN_EVENT       0x10000000
-// Editor control width should not change on resize
-#define wxPG_FL_FIXED_WIDTH_EDITOR          0x20000000
-// Width of panel can be different than width of grid
-#define wxPG_FL_HAS_VIRTUAL_WIDTH           0x40000000
-// Prevents RecalculateVirtualSize re-entrancy
-#define wxPG_FL_RECALCULATING_VIRTUAL_SIZE  0x80000000
-
-#if !defined(__wxPG_SOURCE_FILE__)
-    // Reduce compile time, but still include in user app
-    #include "wx/propgrid/props.h"
-#endif
-
-// -----------------------------------------------------------------------
-
-/** @class wxPropertyGrid
-
-    wxPropertyGrid is a specialized grid for editing properties
-    such as strings, numbers, flagsets, fonts, and colours. wxPropertySheet
-    used to do the very same thing, but it hasn't been updated for a while
-    and it is currently deprecated.
-
-    Please note that most member functions are inherited and as such not
-    documented on this page. This means you will probably also want to read
-    wxPropertyGridInterface class reference.
-
-    See also @ref overview_propgrid.
-
-    @section propgrid_window_styles_ Window Styles
-
-    See @ref propgrid_window_styles.
-
-    @section propgrid_event_handling Event Handling
-
-    To process input from a propertygrid control, use these event handler
-    macros to direct input to member functions that take a wxPropertyGridEvent
-    argument.
-
-    @beginEventTable{wxPropertyGridEvent}
-    @event{EVT_PG_SELECTED (id, func)}
-        Respond to wxEVT_PG_SELECTED event, generated when a property selection
-        has been changed, either by user action or by indirect program
-        function. For instance, collapsing a parent property programmatically
-        causes any selected child property to become unselected, and may
-        therefore cause this event to be generated.
-    @event{EVT_PG_CHANGING(id, func)}
-        Respond to wxEVT_PG_CHANGING event, generated when property value
-        is about to be changed by user. Use wxPropertyGridEvent::GetValue()
-        to take a peek at the pending value, and wxPropertyGridEvent::Veto()
-        to prevent change from taking place, if necessary.
-    @event{EVT_PG_HIGHLIGHTED(id, func)}
-        Respond to wxEVT_PG_HIGHLIGHTED event, which occurs when mouse
-        moves over a property. Event's property is NULL if hovered area does
-        not belong to any property.
-    @event{EVT_PG_RIGHT_CLICK(id, func)}
-        Respond to wxEVT_PG_RIGHT_CLICK event, which occurs when property is
-        clicked on with right mouse button.
-    @event{EVT_PG_DOUBLE_CLICK(id, func)}
-        Respond to wxEVT_PG_DOUBLE_CLICK event, which occurs when property is
-        double-clicked onwith left mouse button.
-    @event{EVT_PG_ITEM_COLLAPSED(id, func)}
-        Respond to wxEVT_PG_ITEM_COLLAPSED event, generated when user collapses
-        a property or category..
-    @event{EVT_PG_ITEM_EXPANDED(id, func)}
-        Respond to wxEVT_PG_ITEM_EXPANDED event, generated when user expands
-        a property or category..
-    @event{EVT_PG_LABEL_EDIT_BEGIN(id, func)}
-        Respond to wxEVT_PG_LABEL_EDIT_BEGIN event, generated when is about to
-        begin editing a property label. You can veto this event to prevent the
-        action.
-    @event{EVT_PG_LABEL_EDIT_ENDING(id, func)}
-        Respond to wxEVT_PG_LABEL_EDIT_ENDING event, generated when is about to
-        end editing of a property label. You can veto this event to prevent the
-        action.
-    @event{EVT_PG_COL_BEGIN_DRAG(id, func)}
-        Respond to wxEVT_PG_COL_BEGIN_DRAG event, generated when user
-        starts resizing a column - can be vetoed.
-    @event{EVT_PG_COL_DRAGGING,(id, func)}
-        Respond to wxEVT_PG_COL_DRAGGING, event, generated when a
-        column resize by user is in progress. This event is also generated
-        when user double-clicks the splitter in order to recenter
-        it.
-    @event{EVT_PG_COL_END_DRAG(id, func)}
-        Respond to wxEVT_PG_COL_END_DRAG event, generated after column
-        resize by user has finished.
-    @endEventTable
-
-    @remarks
-
-    - Use Freeze() and Thaw() respectively to disable and enable drawing. This
-      will also delay sorting etc. miscellaneous calculations to the last
-      possible moment.
-
-    @library{wxpropgrid}
-    @category{propgrid}
-*/
-class WXDLLIMPEXP_PROPGRID wxPropertyGrid : public wxControl,
-                                            public wxScrollHelper,
-                                            public wxPropertyGridInterface
-{
-    friend class wxPropertyGridEvent;
-    friend class wxPropertyGridPageState;
-    friend class wxPropertyGridInterface;
-    friend class wxPropertyGridManager;
-    friend class wxPGHeaderCtrl;
-
-    DECLARE_DYNAMIC_CLASS(wxPropertyGrid)
-public:
-
-#ifndef SWIG
-    /**
-        Two step constructor.
-
-        Call Create when this constructor is called to build up the
-        wxPropertyGrid
-    */
-    wxPropertyGrid();
-#endif
-
-    /** The default constructor. The styles to be used are styles valid for
-        the wxWindow.
-
-        @see @link wndflags Additional Window Styles @endlink
-    */
-    wxPropertyGrid( wxWindow *parent, wxWindowID id = wxID_ANY,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize,
-                    long style = wxPG_DEFAULT_STYLE,
-                    const wxString& name = wxPropertyGridNameStr );
-
-    /** Destructor */
-    virtual ~wxPropertyGrid();
-
-    /** Adds given key combination to trigger given action.
-
-        Here is a sample code to make Enter key press move focus to
-        the next property.
-
-        @code
-            propGrid->AddActionTrigger(wxPG_ACTION_NEXT_PROPERTY,
-                                       WXK_RETURN);
-            propGrid->DedicateKey(WXK_RETURN);
-        @endcode
-
-        @param action
-            Which action to trigger. See @ref propgrid_keyboard_actions.
-        @param keycode
-            Which keycode triggers the action.
-        @param modifiers
-            Which key event modifiers, in addition to keycode, are needed to
-            trigger the action.
-    */
-    void AddActionTrigger( int action, int keycode, int modifiers = 0 );
-
-    /**
-        Dedicates a specific keycode to wxPropertyGrid. This means that such
-        key presses will not be redirected to editor controls.
-
-        Using this function allows, for example, navigation between
-        properties using arrow keys even when the focus is in the editor
-        control.
-    */
-    void DedicateKey( int keycode )
-    {
-        m_dedicatedKeys.push_back(keycode);
-    }
-
-    /**
-        This static function enables or disables automatic use of
-        wxGetTranslation for following strings: wxEnumProperty list labels,
-        wxFlagsProperty sub-property labels.
-
-        Default is false.
-    */
-    static void AutoGetTranslation( bool enable );
-
-    /**
-        Changes value of a property, as if from an editor.
-
-        Use this instead of SetPropertyValue() if you need the value to run
-        through validation process, and also send the property change event.
-
-        @return
-        Returns true if value was successfully changed.
-    */
-    bool ChangePropertyValue( wxPGPropArg id, wxVariant newValue );
-
-    /**
-        Centers the splitter.
-
-        @param enableAutoResizing
-            If @true, automatic column resizing is enabled (only applicapple
-            if window style wxPG_SPLITTER_AUTO_CENTER is used).
-    */
-    void CenterSplitter( bool enableAutoResizing = false );
-
-    /** Deletes all properties.
-    */
-    virtual void Clear();
-
-    /** Clears action triggers for given action.
-        @param action
-            Which action to trigger. See @link pgactions List of list of
-            wxPropertyGrid actions@endlink.
-    */
-    void ClearActionTriggers( int action );
-
-    /** Forces updating the value of property from the editor control.
-
-        Note that wxEVT_PG_CHANGING and wxEVT_PG_CHANGED are dispatched using
-        ProcessEvent, meaning your event handlers will be called immediately.
-
-        @return
-        Returns true if anything was changed.
-    */
-    virtual bool CommitChangesFromEditor( wxUint32 flags = 0 );
-
-    /**
-        Two step creation.
-
-        Whenever the control is created without any parameters, use Create to
-        actually create it. Don't access the control's public methods before
-        this is called @see @link wndflags Additional Window Styles@endlink
-    */
-    bool Create( wxWindow *parent, wxWindowID id = wxID_ANY,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = wxPG_DEFAULT_STYLE,
-                 const wxString& name = wxPropertyGridNameStr );
-
-    /**
-        Call when editor widget's contents is modified.
-
-        For example, this is called when changes text in wxTextCtrl (used in
-        wxStringProperty and wxIntProperty).
-
-        @remarks
-        This function should only be called by custom properties.
-
-        @see wxPGProperty::OnEvent()
-    */
-    void EditorsValueWasModified() { m_iFlags |= wxPG_FL_VALUE_MODIFIED; }
-
-    /** Reverse of EditorsValueWasModified().
-
-        @remarks
-        This function should only be called by custom properties.
-    */
-    void EditorsValueWasNotModified()
-    {
-        m_iFlags &= ~(wxPG_FL_VALUE_MODIFIED);
-    }
-
-    /**
-        Enables or disables (shows/hides) categories according to parameter
-        enable.
-     */
-    bool EnableCategories( bool enable );
-
-    /** Scrolls and/or expands items to ensure that the given item is visible.
-        Returns true if something was actually done.
-    */
-    bool EnsureVisible( wxPGPropArg id );
-
-    /**
-        Reduces column sizes to minimum possible that contents are still
-        visibly (naturally some margin space will be applied as well).
-
-        @return
-        Minimum size for the grid to still display everything.
-
-        @remarks
-        Does not work well with wxPG_SPLITTER_AUTO_CENTER window style.
-
-        This function only works properly if grid size prior to call was already
-        fairly large.
-
-        Note that you can also get calculated column widths by calling
-        GetState->GetColumnWidth() immediately after this function returns.
-    */
-    wxSize FitColumns()
-    {
-        wxSize sz = m_pState->DoFitColumns();
-        return sz;
-    }
-
-    /**
-        Returns wxWindow that the properties are painted on, and which should
-        be used as the parent for editor controls.
-    */
-    wxWindow* GetPanel()
-    {
-        return this;
-    }
-
-    /** Returns current category caption background colour. */
-    wxColour GetCaptionBackgroundColour() const { return m_colCapBack; }
-
-    wxFont& GetCaptionFont() { return m_captionFont; }
-
-    const wxFont& GetCaptionFont() const { return m_captionFont; }
-
-    /** Returns current category caption text colour. */
-    wxColour GetCaptionForegroundColour() const { return m_colCapFore; }
-
-    /** Returns current cell background colour. */
-    wxColour GetCellBackgroundColour() const { return m_colPropBack; }
-
-    /** Returns current cell text colour when disabled. */
-    wxColour GetCellDisabledTextColour() const { return m_colDisPropFore; }
-
-    /** Returns current cell text colour. */
-    wxColour GetCellTextColour() const { return m_colPropFore; }
-
-    /**
-        Returns number of columns currently on grid.
-    */
-    unsigned int GetColumnCount() const
-    {
-        return (unsigned int) m_pState->m_colWidths.size();
-    }
-
-    /** Returns colour of empty space below properties. */
-    wxColour GetEmptySpaceColour() const { return m_colEmptySpace; }
-
-    /** Returns height of highest characters of used font. */
-    int GetFontHeight() const { return m_fontHeight; }
-
-    /** Returns pointer to itself. Dummy function that enables same kind
-        of code to use wxPropertyGrid and wxPropertyGridManager.
-    */
-    wxPropertyGrid* GetGrid() { return this; }
-
-    /** Returns rectangle of custom paint image.
-    */
-    wxRect GetImageRect( wxPGProperty* p, int item ) const;
-
-    /** Returns size of the custom paint image in front of property.
-        If no argument is given, returns preferred size.
-    */
-    wxSize GetImageSize( wxPGProperty* p = NULL, int item = -1 ) const;
-
-    //@{
-    /** Returns last item which could be iterated using given flags.
-        @param flags
-        See @ref propgrid_iterator_flags.
-    */
-    wxPGProperty* GetLastItem( int flags = wxPG_ITERATE_DEFAULT )
-    {
-        return m_pState->GetLastItem(flags);
-    }
-
-    const wxPGProperty* GetLastItem( int flags = wxPG_ITERATE_DEFAULT ) const
-    {
-        return m_pState->GetLastItem(flags);
-    }
-    //@}
-
-    /** Returns colour of lines between cells. */
-    wxColour GetLineColour() const { return m_colLine; }
-
-    /** Returns background colour of margin. */
-    wxColour GetMarginColour() const { return m_colMargin; }
-
-    /** Returns margin width. */
-    int GetMarginWidth() const { return m_marginWidth; }
-
-    /**
-        Returns most up-to-date value of selected property. This will return
-        value different from GetSelectedProperty()->GetValue() only when text
-        editor is activate and string edited by user represents valid,
-        uncommitted property value.
-    */
-    wxVariant GetUncommittedPropertyValue();
-
-    /** Returns "root property". It does not have name, etc. and it is not
-        visible. It is only useful for accessing its children.
-    */
-    wxPGProperty* GetRoot() const { return m_pState->m_properties; }
-
-    /** Returns height of a single grid row (in pixels). */
-    int GetRowHeight() const { return m_lineHeight; }
-
-    /** Returns currently selected property. */
-    wxPGProperty* GetSelectedProperty() const { return GetSelection(); }
-
-    /** Returns current selection background colour. */
-    wxColour GetSelectionBackgroundColour() const { return m_colSelBack; }
-
-    /** Returns current selection text colour. */
-    wxColour GetSelectionForegroundColour() const { return m_colSelFore; }
-
-    /**
-        Returns current splitter x position.
-    */
-    int GetSplitterPosition( unsigned int splitterIndex = 0 ) const
-    {
-        return m_pState->DoGetSplitterPosition(splitterIndex);
-    }
-
-    /** Returns wxTextCtrl active in currently selected property, if any. Takes
-        into account wxOwnerDrawnComboBox.
-    */
-    wxTextCtrl* GetEditorTextCtrl() const;
-
-    wxPGValidationInfo& GetValidationInfo()
-    {
-        return m_validationInfo;
-    }
-
-    /** Returns current vertical spacing. */
-    int GetVerticalSpacing() const { return (int)m_vspacing; }
-
-    /**
-        Returns @true if a property editor control has focus.
-    */
-    bool IsEditorFocused() const;
-
-    /** Returns true if editor's value was marked modified.
-    */
-    bool IsEditorsValueModified() const
-        { return  ( m_iFlags & wxPG_FL_VALUE_MODIFIED ) ? true : false; }
-
-    /**
-        Returns information about arbitrary position in the grid.
-
-        @param pt
-            Coordinates in the virtual grid space. You may need to use
-            wxScrolled<T>::CalcScrolledPosition() for translating
-            wxPropertyGrid client coordinates into something this member
-            function can use.
-    */
-    wxPropertyGridHitTestResult HitTest( const wxPoint& pt ) const;
-
-    /** Returns true if any property has been modified by the user. */
-    bool IsAnyModified() const { return (m_pState->m_anyModified>0); }
-
-    /**
-        Returns true if updating is frozen (ie Freeze() called but not yet
-        Thaw() ).
-     */
-    bool IsFrozen() const { return (m_frozen>0)?true:false; }
-
-    /**
-        It is recommended that you call this function any time your code causes
-        wxPropertyGrid's top-level parent to change. wxPropertyGrid's OnIdle()
-        handler should be able to detect most changes, but it is not perfect.
-
-        @param newTLP
-            New top-level parent that is about to be set. Old top-level parent
-            window should still exist as the current one.
-
-        @remarks This function is automatically called from wxPropertyGrid::
-                 Reparent() and wxPropertyGridManager::Reparent(). You only
-                 need to use it if you reparent wxPropertyGrid indirectly.
-    */
-    void OnTLPChanging( wxWindow* newTLP );
-
-    /** Redraws given property.
-    */
-    virtual void RefreshProperty( wxPGProperty* p );
-
-    /** Registers a new editor class.
-        @return
-        Pointer to the editor class instance that should be used.
-    */
-    static wxPGEditor* RegisterEditorClass( wxPGEditor* editor,
-                                            bool noDefCheck = false )
-    {
-        return DoRegisterEditorClass(editor, wxEmptyString, noDefCheck);
-    }
-
-    static wxPGEditor* DoRegisterEditorClass( wxPGEditor* editorClass,
-                                              const wxString& editorName,
-                                              bool noDefCheck = false );
-
-    /** Resets all colours to the original system values.
-    */
-    void ResetColours();
-
-    /**
-        Resets column sizes and splitter positions, based on proportions.
-
-        @param enableAutoResizing
-            If @true, automatic column resizing is enabled (only applicapple
-            if window style wxPG_SPLITTER_AUTO_CENTER is used).
-
-        @see wxPropertyGridInterface::SetColumnProportion()
-    */
-    void ResetColumnSizes( bool enableAutoResizing = false );
-
-    /**
-        Selects a property.
-        Editor widget is automatically created, but not focused unless focus is
-        true.
-
-        @param id
-            Property to select.
-
-        @return
-            True if selection finished successfully. Usually only fails if
-            current value in editor is not valid.
-
-        @remarks In wxPropertyGrid 1.4, this member function used to generate
-                 wxEVT_PG_SELECTED. In wxWidgets 2.9 and later, it no longer
-                 does that.
-
-        @remarks This clears any previous selection.
-    */
-    bool SelectProperty( wxPGPropArg id, bool focus = false );
-
-    /**
-        Set entire new selection from given list of properties.
-    */
-    void SetSelection( const wxArrayPGProperty& newSelection )
-    {
-        DoSetSelection( newSelection, wxPG_SEL_DONT_SEND_EVENT );
-    }
-
-    /**
-        Adds given property into selection. If wxPG_EX_MULTIPLE_SELECTION
-        extra style is not used, then this has same effect as
-        calling SelectProperty().
-
-        @remarks Multiple selection is not supported for categories. This
-                 means that if you have properties selected, you cannot
-                 add category to selection, and also if you have category
-                 selected, you cannot add other properties to selection.
-                 This member function will fail silently in these cases,
-                 even returning true.
-    */
-    bool AddToSelection( wxPGPropArg id )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-        return DoAddToSelection(p, wxPG_SEL_DONT_SEND_EVENT);
-    }
-
-    /**
-        Removes given property from selection. If property is not selected,
-        an assertion failure will occur.
-    */
-    bool RemoveFromSelection( wxPGPropArg id )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-        return DoRemoveFromSelection(p, wxPG_SEL_DONT_SEND_EVENT);
-    }
-
-    /**
-        Makes given column editable by user.
-
-        @param editable
-            Using @false here will disable column from being editable.
-    */
-    void MakeColumnEditable( unsigned int column, bool editable = true );
-
-    /**
-        Creates label editor wxTextCtrl for given column, for property
-        that is currently selected. When multiple selection is
-        enabled, this applies to whatever property GetSelection()
-        returns.
-
-        @param colIndex
-            Which column's label to edit. Note that you should not
-            use value 1, which is reserved for property value
-            column.
-
-        @see EndLabelEdit(), MakeColumnEditable()
-    */
-    void BeginLabelEdit( unsigned int column = 0 )
-    {
-        DoBeginLabelEdit(column, wxPG_SEL_DONT_SEND_EVENT);
-    }
-
-    /**
-        Destroys label editor wxTextCtrl, if any.
-
-        @param commit
-            Use @true (default) to store edited label text in
-            property cell data.
-
-        @see BeginLabelEdit(), MakeColumnEditable()
-    */
-    void EndLabelEdit( bool commit = true )
-    {
-        DoEndLabelEdit(commit, wxPG_SEL_DONT_SEND_EVENT);
-    }
-
-    /**
-        Returns currently active label editor, NULL if none.
-    */
-    wxTextCtrl* GetLabelEditor() const
-    {
-        return m_labelEditor;
-    }
-
-    /** Sets category caption background colour. */
-    void SetCaptionBackgroundColour(const wxColour& col);
-
-    /** Sets category caption text colour. */
-    void SetCaptionTextColour(const wxColour& col);
-
-    /** Sets default cell background colour - applies to property cells.
-        Note that appearance of editor widgets may not be affected.
-    */
-    void SetCellBackgroundColour(const wxColour& col);
-
-    /** Sets cell text colour for disabled properties.
-    */
-    void SetCellDisabledTextColour(const wxColour& col);
-
-    /** Sets default cell text colour - applies to property name and value text.
-        Note that appearance of editor widgets may not be affected.
-    */
-    void SetCellTextColour(const wxColour& col);
-
-    /** Set number of columns (2 or more).
-    */
-    void SetColumnCount( int colCount )
-    {
-        m_pState->SetColumnCount(colCount);
-        Refresh();
-    }
-
-    /**
-        Sets the 'current' category - Append will add non-category properties
-        under it.
-    */
-    void SetCurrentCategory( wxPGPropArg id )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG()
-        wxPropertyCategory* pc = wxDynamicCast(p, wxPropertyCategory);
-        wxASSERT(pc);
-        m_pState->m_currentCategory = pc;
-    }
-
-    /** Sets colour of empty space below properties. */
-    void SetEmptySpaceColour(const wxColour& col);
-
-    /** Sets colour of lines between cells. */
-    void SetLineColour(const wxColour& col);
-
-    /** Sets background colour of margin. */
-    void SetMarginColour(const wxColour& col);
-
-    /**
-        Sets selection background colour - applies to selected property name
-        background.
-    */
-    void SetSelectionBackgroundColour(const wxColour& col);
-
-    /**
-        Sets selection foreground colour - applies to selected property name
-        text.
-     */
-    void SetSelectionTextColour(const wxColour& col);
-
-    /** Sets x coordinate of the splitter.
-        @remarks
-        Splitter position cannot exceed grid size, and therefore setting it
-        during form creation may fail as initial grid size is often smaller
-        than desired splitter position, especially when sizers are being used.
-    */
-    void SetSplitterPosition( int newXPos, int col = 0 )
-    {
-        DoSetSplitterPosition(newXPos, col, wxPG_SPLITTER_REFRESH);
-    }
-
-    /**
-        Sets the property sorting function.
-
-        @param sortFunction
-            The sorting function to be used. It should return a value greater
-            than 0 if position of p1 is after p2. So, for instance, when
-            comparing property names, you can use following implementation:
-
-            @code
-                int MyPropertySortFunction(wxPropertyGrid* propGrid,
-                                           wxPGProperty* p1,
-                                           wxPGProperty* p2)
-                {
-                    return p1->GetBaseName().compare( p2->GetBaseName() );
-                }
-            @endcode
-
-        @remarks
-            Default property sort function sorts properties by their labels
-            (case-insensitively).
-
-        @see GetSortFunction, wxPropertyGridInterface::Sort,
-             wxPropertyGridInterface::SortChildren
-    */
-    void SetSortFunction( wxPGSortCallback sortFunction )
-    {
-        m_sortFunction = sortFunction;
-    }
-
-    /**
-        Returns the property sort function (default is @NULL).
-
-        @see SetSortFunction
-    */
-    wxPGSortCallback GetSortFunction() const
-    {
-        return m_sortFunction;
-    }
-
-    /**
-        Sets appearance of value cells representing an unspecified property
-        value. Default appearance is blank.
-
-        @remarks If you set the unspecified value to have any
-                 textual representation, then that will override
-                 "InlineHelp" attribute.
-
-        @see wxPGProperty::SetValueToUnspecified(),
-             wxPGProperty::IsValueUnspecified()
-    */
-    void SetUnspecifiedValueAppearance( const wxPGCell& cell )
-    {
-        m_unspecifiedAppearance = m_propertyDefaultCell;
-        m_unspecifiedAppearance.MergeFrom(cell);
-    }
-
-    /**
-        Returns current appearance of unspecified value cells.
-
-        @see SetUnspecifiedValueAppearance()
-    */
-    const wxPGCell& GetUnspecifiedValueAppearance() const
-    {
-        return m_unspecifiedAppearance;
-    }
-
-    /**
-        Returns (visual) text representation of the unspecified
-        property value.
-
-        @param argFlags For internal use only.
-    */
-    wxString GetUnspecifiedValueText( int argFlags = 0 ) const;
-
-    /** Set virtual width for this particular page. Width -1 indicates that the
-        virtual width should be disabled. */
-    void SetVirtualWidth( int width );
-
-    /**
-        Moves splitter as left as possible, while still allowing all
-        labels to be shown in full.
-
-        @param privateChildrenToo
-            If @false, will still allow private children to be cropped.
-    */
-    void SetSplitterLeft( bool privateChildrenToo = false )
-    {
-        m_pState->SetSplitterLeft(privateChildrenToo);
-    }
-
-    /** Sets vertical spacing. Can be 1, 2, or 3 - a value relative to font
-        height. Value of 2 should be default on most platforms.
-    */
-    void SetVerticalSpacing( int vspacing )
-    {
-        m_vspacing = (unsigned char)vspacing;
-        CalculateFontAndBitmapStuff( vspacing );
-        if ( !m_pState->m_itemsAdded ) Refresh();
-    }
-
-    /** Shows an brief error message that is related to a property. */
-    void ShowPropertyError( wxPGPropArg id, const wxString& msg )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG()
-        DoShowPropertyError(p, msg);
-    }
-
-    /////////////////////////////////////////////////////////////////
-    //
-    // Following methods do not need to be (currently) documented
-    //
-    /////////////////////////////////////////////////////////////////
-
-    bool HasVirtualWidth() const
-        { return (m_iFlags & wxPG_FL_HAS_VIRTUAL_WIDTH) ? true : false; }
-
-    const wxPGCommonValue* GetCommonValue( unsigned int i ) const
-    {
-        return (wxPGCommonValue*) m_commonValues[i];
-    }
-
-    /** Returns number of common values.
-    */
-    unsigned int GetCommonValueCount() const
-    {
-        return (unsigned int) m_commonValues.size();
-    }
-
-    /** Returns label of given common value.
-    */
-    wxString GetCommonValueLabel( unsigned int i ) const
-    {
-        wxASSERT( GetCommonValue(i) );
-        return GetCommonValue(i)->GetLabel();
-    }
-
-    /**
-        Returns index of common value that will truly change value to
-        unspecified.
-    */
-    int GetUnspecifiedCommonValue() const { return m_cvUnspecified; }
-
-    /** Set index of common value that will truly change value to unspecified.
-        Using -1 will set none to have such effect.
-        Default is 0.
-    */
-    void SetUnspecifiedCommonValue( int index ) { m_cvUnspecified = index; }
-
-    /**
-        Shortcut for creating dialog-caller button. Used, for example, by
-        wxFontProperty.
-        @remarks
-        This should only be called by properties.
-    */
-    wxWindow* GenerateEditorButton( const wxPoint& pos, const wxSize& sz );
-
-    /** Fixes position of wxTextCtrl-like control (wxSpinCtrl usually
-        fits as one). Call after control has been created (but before
-        shown).
-    */
-    void FixPosForTextCtrl( wxWindow* ctrl,
-                            unsigned int forColumn = 1,
-                            const wxPoint& offset = wxPoint(0, 0) );
-
-    /** Shortcut for creating text editor widget.
-        @param pos
-            Same as pos given for CreateEditor.
-        @param sz
-            Same as sz given for CreateEditor.
-        @param value
-            Initial text for wxTextCtrl.
-        @param secondary
-            If right-side control, such as button, also created, then create it
-            first and pass it as this parameter.
-        @param extraStyle
-            Extra style flags to pass for wxTextCtrl.
-        @remarks
-        Note that this should generally be called only by new classes derived
-        from wxPGProperty.
-    */
-    wxWindow* GenerateEditorTextCtrl( const wxPoint& pos,
-                                      const wxSize& sz,
-                                      const wxString& value,
-                                      wxWindow* secondary,
-                                      int extraStyle = 0,
-                                      int maxLen = 0,
-                                      unsigned int forColumn = 1 );
-
-    /* Generates both textctrl and button.
-    */
-    wxWindow* GenerateEditorTextCtrlAndButton( const wxPoint& pos,
-        const wxSize& sz, wxWindow** psecondary, int limited_editing,
-        wxPGProperty* property );
-
-    /** Generates position for a widget editor dialog box.
-        @param p
-        Property for which dialog is positioned.
-        @param sz
-        Known or over-approximated size of the dialog.
-        @return
-        Position for dialog.
-    */
-    wxPoint GetGoodEditorDialogPosition( wxPGProperty* p,
-                                         const wxSize& sz );
-
-    // Converts escape sequences in src_str to newlines,
-    // tabs, etc. and copies result to dst_str.
-    static wxString& ExpandEscapeSequences( wxString& dst_str,
-                                            wxString& src_str );
-
-    // Converts newlines, tabs, etc. in src_str to escape
-    // sequences, and copies result to dst_str.
-    static wxString& CreateEscapeSequences( wxString& dst_str,
-                                            wxString& src_str );
-
-    /**
-        Returns rectangle that fully contains properties between and including
-        p1 and p2. Rectangle is in virtual scrolled window coordinates.
-    */
-    wxRect GetPropertyRect( const wxPGProperty* p1,
-                            const wxPGProperty* p2 ) const;
-
-    /** Returns pointer to current active primary editor control (NULL if none).
-    */
-    wxWindow* GetEditorControl() const;
-
-    wxWindow* GetPrimaryEditor() const
-    {
-        return GetEditorControl();
-    }
-
-    /**
-        Returns pointer to current active secondary editor control (NULL if
-        none).
-    */
-    wxWindow* GetEditorControlSecondary() const
-    {
-        return m_wndEditor2;
-    }
-
-    /**
-        Refreshes any active editor control.
-    */
-    void RefreshEditor();
-
-    // Events from editor controls are forward to this function
-    bool HandleCustomEditorEvent( wxEvent &event );
-
-    // Mostly useful for page switching.
-    void SwitchState( wxPropertyGridPageState* pNewState );
-
-    long GetInternalFlags() const { return m_iFlags; }
-    bool HasInternalFlag( long flag ) const
-        { return (m_iFlags & flag) ? true : false; }
-    void SetInternalFlag( long flag ) { m_iFlags |= flag; }
-    void ClearInternalFlag( long flag ) { m_iFlags &= ~(flag); }
-    void IncFrozen() { m_frozen++; }
-    void DecFrozen() { m_frozen--; }
-
-    void OnComboItemPaint( const wxPGComboBox* pCb,
-                           int item,
-                           wxDC* pDc,
-                           wxRect& rect,
-                           int flags );
-
-    /** Standardized double-to-string conversion.
-    */
-    static const wxString& DoubleToString( wxString& target,
-                                           double value,
-                                           int precision,
-                                           bool removeZeroes,
-                                           wxString* precTemplate = NULL );
-
-    /**
-        Call this from wxPGProperty::OnEvent() to cause property value to be
-        changed after the function returns (with true as return value).
-        ValueChangeInEvent() must be used if you wish the application to be
-        able to use wxEVT_PG_CHANGING to potentially veto the given value.
-    */
-    void ValueChangeInEvent( wxVariant variant )
-    {
-        m_changeInEventValue = variant;
-        m_iFlags |= wxPG_FL_VALUE_CHANGE_IN_EVENT;
-    }
-
-    /**
-        You can use this member function, for instance, to detect in
-        wxPGProperty::OnEvent() if wxPGProperty::SetValueInEvent() was
-        already called in wxPGEditor::OnEvent(). It really only detects
-        if was value was changed using wxPGProperty::SetValueInEvent(), which
-        is usually used when a 'picker' dialog is displayed. If value was
-        written by "normal means" in wxPGProperty::StringToValue() or
-        IntToValue(), then this function will return false (on the other hand,
-        wxPGProperty::OnEvent() is not even called in those cases).
-    */
-    bool WasValueChangedInEvent() const
-    {
-        return (m_iFlags & wxPG_FL_VALUE_CHANGE_IN_EVENT) ? true : false;
-    }
-
-    /** Returns true if given event is from first of an array of buttons
-        (as can be in case when wxPGMultiButton is used).
-    */
-    bool IsMainButtonEvent( const wxEvent& event )
-    {
-        return (event.GetEventType() == wxEVT_BUTTON)
-                    && (m_wndSecId == event.GetId());
-    }
-
-    /** Pending value is expected to be passed in PerformValidation().
-    */
-    virtual bool DoPropertyChanged( wxPGProperty* p,
-                                    unsigned int selFlags = 0 );
-
-    /** Called when validation for given property fails.
-        @param invalidValue
-            Value which failed in validation.
-        @return
-            Return true if user is allowed to change to another property even
-            if current has invalid value.
-        @remarks
-        To add your own validation failure behaviour, override
-        wxPropertyGrid::DoOnValidationFailure().
-    */
-    bool OnValidationFailure( wxPGProperty* property,
-                              wxVariant& invalidValue );
-
-    /** Called to indicate property and editor has valid value now.
-    */
-    void OnValidationFailureReset( wxPGProperty* property )
-    {
-        if ( property && property->HasFlag(wxPG_PROP_INVALID_VALUE) )
-        {
-            DoOnValidationFailureReset(property);
-            property->ClearFlag(wxPG_PROP_INVALID_VALUE);
-        }
-        m_validationInfo.m_failureMessage.clear();
-    }
-
-    /**
-        Override in derived class to display error messages in custom manner
-        (these message usually only result from validation failure).
-
-        @remarks If you implement this, then you also need to implement
-                 DoHidePropertyError() - possibly to do nothing, if error
-                 does not need hiding (e.g. it was logged or shown in a
-                 message box).
-
-        @see DoHidePropertyError()
-    */
-    virtual void DoShowPropertyError( wxPGProperty* property,
-                                      const wxString& msg );
-
-    /**
-        Override in derived class to hide an error displayed by
-        DoShowPropertyError().
-
-        @see DoShowPropertyError()
-    */
-    virtual void DoHidePropertyError( wxPGProperty* property );
-
-#if wxUSE_STATUSBAR
-    /**
-        Return wxStatusBar that is used by this wxPropertyGrid. You can
-        reimplement this member function in derived class to override
-        the default behaviour of using the top-level wxFrame's status
-        bar, if any.
-    */
-    virtual wxStatusBar* GetStatusBar();
-#endif
-
-    /** Override to customize property validation failure behaviour.
-        @param invalidValue
-            Value which failed in validation.
-        @return
-            Return true if user is allowed to change to another property even
-            if current has invalid value.
-    */
-    virtual bool DoOnValidationFailure( wxPGProperty* property,
-                                        wxVariant& invalidValue );
-
-    /** Override to customize resetting of property validation failure status.
-        @remarks
-        Property is guaranteed to have flag wxPG_PROP_INVALID_VALUE set.
-    */
-    virtual void DoOnValidationFailureReset( wxPGProperty* property );
-
-    int GetSpacingY() const { return m_spacingy; }
-
-    /**
-        Must be called in wxPGEditor::CreateControls() if primary editor window
-        is wxTextCtrl, just before textctrl is created.
-        @param text
-            Initial text value of created wxTextCtrl.
-    */
-    void SetupTextCtrlValue( const wxString text ) { m_prevTcValue = text; }
-
-    /**
-        Unfocuses or closes editor if one was open, but does not deselect
-        property.
-    */
-    bool UnfocusEditor();
-
-    virtual void SetWindowStyleFlag( long style );
-
-    void DrawItems( const wxPGProperty* p1, const wxPGProperty* p2 );
-
-    void DrawItem( wxPGProperty* p )
-    {
-        DrawItems(p,p);
-    }
-
-    virtual void DrawItemAndChildren( wxPGProperty* p );
-
-    /**
-        Draws item, children, and consequtive parents as long as category is
-        not met.
-     */
-    void DrawItemAndValueRelated( wxPGProperty* p );
-
-protected:
-
-    /**
-        wxPropertyGridPageState used by the grid is created here.
-
-        If grid is used in wxPropertyGridManager, there is no point overriding
-        this - instead, set custom wxPropertyGridPage classes.
-    */
-    virtual wxPropertyGridPageState* CreateState() const;
-
-    enum PerformValidationFlags
-    {
-        SendEvtChanging         = 0x0001,
-        IsStandaloneValidation  = 0x0002   // Not called in response to event
-    };
-
-    /**
-        Runs all validation functionality (includes sending wxEVT_PG_CHANGING).
-        Returns true if all tests passed. Implement in derived class to
-        add additional validation behaviour.
-    */
-    virtual bool PerformValidation( wxPGProperty* p,
-                                    wxVariant& pendingValue,
-                                    int flags = SendEvtChanging );
-
-public:
-
-    // Control font changer helper.
-    void SetCurControlBoldFont();
-
-    wxPGCell& GetPropertyDefaultCell()
-    {
-        return m_propertyDefaultCell;
-    }
-
-    wxPGCell& GetCategoryDefaultCell()
-    {
-        return m_categoryDefaultCell;
-    }
-
-    //
-    // Public methods for semi-public use
-    //
-    bool DoSelectProperty( wxPGProperty* p, unsigned int flags = 0 );
-
-    // Overridden functions.
-    virtual bool Destroy();
-    // Returns property at given y coordinate (relative to grid's top left).
-    wxPGProperty* GetItemAtY( int y ) const { return DoGetItemAtY(y); }
-
-    virtual void Refresh( bool eraseBackground = true,
-                          const wxRect *rect = (const wxRect *) NULL );
-    virtual bool SetFont( const wxFont& font );
-    virtual void Freeze();
-    virtual void SetExtraStyle( long exStyle );
-    virtual void Thaw();
-    virtual bool Reparent( wxWindowBase *newParent );
-
-protected:
-    virtual wxSize DoGetBestSize() const;
-
-#ifndef wxPG_ICON_WIDTH
-    wxBitmap            *m_expandbmp, *m_collbmp;
-#endif
-
-    wxCursor            *m_cursorSizeWE;
-
-    /** wxWindow pointers to editor control(s). */
-    wxWindow            *m_wndEditor;
-    wxWindow            *m_wndEditor2;
-
-    wxBitmap            *m_doubleBuffer;
-
-    /** Local time ms when control was created. */
-    wxLongLong          m_timeCreated;
-
-    /** wxPGProperty::OnEvent can change value by setting this. */
-    wxVariant           m_changeInEventValue;
-
-    /** Id of m_wndEditor2, or its first child, if any. */
-    int                 m_wndSecId;
-
-    /** Extra Y spacing between the items. */
-    int                 m_spacingy;
-
-    /** Control client area width; updated on resize. */
-    int                 m_width;
-
-    /** Control client area height; updated on resize. */
-    int                 m_height;
-
-    /** Current non-client width (needed when auto-centering). */
-    int                 m_ncWidth;
-
-    /** Non-client width (auto-centering helper). */
-    //int                 m_fWidth;
-
-    /** Previously recorded scroll start position. */
-    int                 m_prevVY;
-
-    /**
-        The gutter spacing in front and back of the image.
-        This determines the amount of spacing in front of each item
-     */
-    int                 m_gutterWidth;
-
-    /** Includes separator line. */
-    int                 m_lineHeight;
-
-    /** Gutter*2 + image width. */
-    int                 m_marginWidth;
-
-    // y spacing for expand/collapse button.
-    int                 m_buttonSpacingY;
-
-    /** Extra margin for expanded sub-group items. */
-    int                 m_subgroup_extramargin;
-
-    /**
-        The image width of the [+] icon.
-
-        This is also calculated in the gutter
-     */
-    int                 m_iconWidth;
-
-#ifndef wxPG_ICON_WIDTH
-
-    /**
-        The image height of the [+] icon.
-
-        This is calculated as minimal size and to align
-     */
-    int                 m_iconHeight;
-#endif
-
-    /** Current cursor id. */
-    int                 m_curcursor;
-
-    // Caption font. Same as normal font plus bold style.
-    wxFont              m_captionFont;
-
-    int                 m_fontHeight;  // Height of the font.
-
-    /** m_splitterx when drag began. */
-    int                 m_startingSplitterX;
-
-    /**
-        Index to splitter currently being dragged (0=one after the first
-        column).
-     */
-    int                 m_draggedSplitter;
-
-    /** Changed property, calculated in PerformValidation(). */
-    wxPGProperty*       m_chgInfo_changedProperty;
-
-    /**
-        Lowest property for which editing happened, but which does not have
-        aggregate parent
-     */
-    wxPGProperty*       m_chgInfo_baseChangedProperty;
-
-    /** Changed property value, calculated in PerformValidation(). */
-    wxVariant           m_chgInfo_pendingValue;
-
-    /** Passed to SetValue. */
-    wxVariant           m_chgInfo_valueList;
-
-    /** Validation information. */
-    wxPGValidationInfo  m_validationInfo;
-
-    /** Actions and keys that trigger them. */
-    wxPGHashMapI2I      m_actionTriggers;
-
-    /** Appearance of currently active editor. */
-    wxPGCell            m_editorAppearance;
-
-    /** Appearance of a unspecified value cell. */
-    wxPGCell            m_unspecifiedAppearance;
-
-    /** List of properties to be deleted/removed in idle event handler. */
-    wxArrayPGProperty   m_deletedProperties;
-    wxArrayPGProperty   m_removedProperties;
-
-    /** List of key codes that will not be handed over to editor controls. */
-    // FIXME: Make this a hash set once there is template-based wxHashSet.
-    wxVector<int>       m_dedicatedKeys;
-
-    //
-    // Temporary values
-    //
-
-    /** Bits are used to indicate which colours are customized. */
-    unsigned short      m_coloursCustomized;
-
-    /** x - m_splitterx. */
-    signed char                 m_dragOffset;
-
-    /** 0 = not dragging, 1 = drag just started, 2 = drag in progress */
-    unsigned char       m_dragStatus;
-
-    /** 0 = margin, 1 = label, 2 = value. */
-    unsigned char       m_mouseSide;
-
-    /** True when editor control is focused. */
-    unsigned char       m_editorFocused;
-
-    /** 1 if m_latsCaption is also the bottommost caption. */
-    //unsigned char       m_lastCaptionBottomnest;
-
-    /** Set to 1 when graphics frozen. */
-    unsigned char       m_frozen;
-
-    unsigned char       m_vspacing;
-
-    // Used to track when Alt/Ctrl+Key was consumed.
-    unsigned char       m_keyComboConsumed;
-
-    /** 1 if in DoPropertyChanged() */
-    bool                m_inDoPropertyChanged;
-
-    /** 1 if in CommitChangesFromEditor() */
-    bool                m_inCommitChangesFromEditor;
-
-    /** 1 if in DoSelectProperty() */
-    bool                m_inDoSelectProperty;
-
-    bool                m_inOnValidationFailure;
-
-    wxPGVFBFlags        m_permanentValidationFailureBehavior;  // Set by app
-
-    // DoEditorValidate() recursion guard
-    wxRecursionGuardFlag    m_validatingEditor;
-
-    /** Internal flags - see wxPG_FL_XXX constants. */
-    wxUint32            m_iFlags;
-
-    /** When drawing next time, clear this many item slots at the end. */
-    int                 m_clearThisMany;
-
-    // Mouse is hovering over this column (index)
-    unsigned int        m_colHover;
-
-    // pointer to property that has mouse hovering
-    wxPGProperty*       m_propHover;
-
-    // Active label editor
-    wxTextCtrl*         m_labelEditor;
-
-    // For which property the label editor is active
-    wxPGProperty*       m_labelEditorProperty;
-
-    // EventObject for wxPropertyGridEvents
-    wxWindow*           m_eventObject;
-
-    // What (global) window is currently focused (needed to resolve event
-    // handling mess).
-    wxWindow*           m_curFocused;
-
-    // Event currently being sent - NULL if none at the moment
-    wxPropertyGridEvent*    m_processedEvent;
-
-    // Last known top-level parent
-    wxWindow*           m_tlp;
-
-    // Last closed top-level parent
-    wxWindow*           m_tlpClosed;
-
-    // Local time ms when tlp was closed.
-    wxLongLong          m_tlpClosedTime;
-
-    // Sort function
-    wxPGSortCallback    m_sortFunction;
-
-    // y coordinate of property that mouse hovering
-    int                 m_propHoverY;
-
-    // Which column's editor is selected (usually 1)?
-    unsigned int        m_selColumn;
-
-    // x relative to splitter (needed for resize).
-    int                 m_ctrlXAdjust;
-
-    // lines between cells
-    wxColour            m_colLine;
-    // property labels and values are written in this colour
-    wxColour            m_colPropFore;
-    // or with this colour when disabled
-    wxColour            m_colDisPropFore;
-    // background for m_colPropFore
-    wxColour            m_colPropBack;
-    // text color for captions
-    wxColour            m_colCapFore;
-    // background color for captions
-    wxColour            m_colCapBack;
-    // foreground for selected property
-    wxColour            m_colSelFore;
-    // background for selected property (actually use background color when
-    // control out-of-focus)
-    wxColour            m_colSelBack;
-    // background colour for margin
-    wxColour            m_colMargin;
-    // background colour for empty space below the grid
-    wxColour            m_colEmptySpace;
-
-    // Default property colours
-    wxPGCell            m_propertyDefaultCell;
-
-    // Default property category
-    wxPGCell            m_categoryDefaultCell;
-
-    // Backup of selected property's cells
-    wxVector<wxPGCell>  m_propCellsBackup;
-
-    // NB: These *cannot* be moved to globals.
-
-    // labels when properties use common values
-    wxVector<wxPGCommonValue*>  m_commonValues;
-
-    // array of live events
-    wxVector<wxPropertyGridEvent*>  m_liveEvents;
-
-    // Which cv selection really sets value to unspecified?
-    int                 m_cvUnspecified;
-
-    // Used to skip excess text editor events
-    wxString            m_prevTcValue;
-
-protected:
-
-    // Sets some members to defaults (called constructors).
-    void Init1();
-
-    // Initializes some members (called by Create and complex constructor).
-    void Init2();
-
-    void OnPaint(wxPaintEvent &event );
-
-    // main event receivers
-    void OnMouseMove( wxMouseEvent &event );
-    void OnMouseClick( wxMouseEvent &event );
-    void OnMouseRightClick( wxMouseEvent &event );
-    void OnMouseDoubleClick( wxMouseEvent &event );
-    void OnMouseUp( wxMouseEvent &event );
-    void OnKey( wxKeyEvent &event );
-    void OnResize( wxSizeEvent &event );
-
-    // event handlers
-    bool HandleMouseMove( int x, unsigned int y, wxMouseEvent &event );
-    bool HandleMouseClick( int x, unsigned int y, wxMouseEvent &event );
-    bool HandleMouseRightClick( int x, unsigned int y, wxMouseEvent &event );
-    bool HandleMouseDoubleClick( int x, unsigned int y, wxMouseEvent &event );
-    bool HandleMouseUp( int x, unsigned int y, wxMouseEvent &event );
-    void HandleKeyEvent( wxKeyEvent &event, bool fromChild );
-
-    void OnMouseEntry( wxMouseEvent &event );
-
-    void OnIdle( wxIdleEvent &event );
-    void OnFocusEvent( wxFocusEvent &event );
-    void OnChildFocusEvent( wxChildFocusEvent& event );
-
-    bool OnMouseCommon( wxMouseEvent &event, int* px, int *py );
-    bool OnMouseChildCommon( wxMouseEvent &event, int* px, int *py );
-
-    // sub-control event handlers
-    void OnMouseClickChild( wxMouseEvent &event );
-    void OnMouseRightClickChild( wxMouseEvent &event );
-    void OnMouseMoveChild( wxMouseEvent &event );
-    void OnMouseUpChild( wxMouseEvent &event );
-    void OnChildKeyDown( wxKeyEvent &event );
-
-    void OnCaptureChange( wxMouseCaptureChangedEvent &event );
-
-    void OnScrollEvent( wxScrollWinEvent &event );
-
-    void OnSysColourChanged( wxSysColourChangedEvent &event );
-
-    void OnTLPClose( wxCloseEvent& event );
-
-protected:
-
-    bool AddToSelectionFromInputEvent( wxPGProperty* prop,
-                                       unsigned int colIndex,
-                                       wxMouseEvent* event = NULL,
-                                       int selFlags = 0 );
-
-    /**
-        Adjust the centering of the bitmap icons (collapse / expand) when the
-        caption font changes.
-
-        They need to be centered in the middle of the font, so a bit of deltaY
-        adjustment is needed. On entry, m_captionFont must be set to window
-        font. It will be modified properly.
-      */
-    void CalculateFontAndBitmapStuff( int vspacing );
-
-    wxRect GetEditorWidgetRect( wxPGProperty* p, int column ) const;
-
-    void CorrectEditorWidgetSizeX();
-
-    /** Called in RecalculateVirtualSize() to reposition control
-        on virtual height changes.
-    */
-    void CorrectEditorWidgetPosY();
-
-    int DoDrawItems( wxDC& dc,
-                     const wxRect* itemsRect,
-                     bool isBuffered ) const;
-
-    /** Draws an expand/collapse (ie. +/-) button.
-    */
-    virtual void DrawExpanderButton( wxDC& dc, const wxRect& rect,
-                                     wxPGProperty* property ) const;
-
-    /** Draws items from topitemy to bottomitemy */
-    void DrawItems( wxDC& dc,
-                    unsigned int topItemY,
-                    unsigned int bottomItemY,
-                    const wxRect* itemsRect = NULL );
-
-    // Translate wxKeyEvent to wxPG_ACTION_XXX
-    int KeyEventToActions(wxKeyEvent &event, int* pSecond) const;
-
-    int KeyEventToAction(wxKeyEvent &event) const
-    {
-        return KeyEventToActions(event, NULL);
-    }
-
-    void ImprovedClientToScreen( int* px, int* py );
-
-    // Called by focus event handlers. newFocused is the window that becomes
-    // focused.
-    void HandleFocusChange( wxWindow* newFocused );
-
-    /** Reloads all non-customized colours from system settings. */
-    void RegainColours();
-
-    virtual bool DoEditorValidate();
-
-    // Similar to DoSelectProperty() but also works on columns
-    // other than 1. Does not active editor if column is not
-    // editable.
-    bool DoSelectAndEdit( wxPGProperty* prop,
-                          unsigned int colIndex,
-                          unsigned int selFlags );
-
-    void DoSetSelection( const wxArrayPGProperty& newSelection,
-                         int selFlags = 0 );
-
-    void DoSetSplitterPosition( int newxpos,
-                                int splitterIndex = 0,
-                                int flags = wxPG_SPLITTER_REFRESH );
-
-    bool DoAddToSelection( wxPGProperty* prop,
-                           int selFlags = 0 );
-
-    bool DoRemoveFromSelection( wxPGProperty* prop,
-                                int selFlags = 0 );
-
-    void DoBeginLabelEdit( unsigned int colIndex, int selFlags = 0 );
-    void DoEndLabelEdit( bool commit, int selFlags = 0 );
-    void OnLabelEditorEnterPress( wxCommandEvent& event );
-    void OnLabelEditorKeyPress( wxKeyEvent& event );
-
-    wxPGProperty* DoGetItemAtY( int y ) const;
-
-    void DestroyEditorWnd( wxWindow* wnd );
-    void FreeEditors();
-
-    virtual bool DoExpand( wxPGProperty* p, bool sendEvent = false );
-
-    virtual bool DoCollapse( wxPGProperty* p, bool sendEvent = false );
-
-    // Returns nearest paint visible property (such that will be painted unless
-    // window is scrolled or resized). If given property is paint visible, then
-    // it itself will be returned.
-    wxPGProperty* GetNearestPaintVisible( wxPGProperty* p ) const;
-
-    static void RegisterDefaultEditors();
-
-    // Sets up basic event handling for child control
-    void SetupChildEventHandling( wxWindow* wnd );
-
-    void CustomSetCursor( int type, bool override = false );
-
-    /**
-        Repositions scrollbar and underlying panel according to changed virtual
-        size.
-    */
-    void RecalculateVirtualSize( int forceXPos = -1 );
-
-    void SetEditorAppearance( const wxPGCell& cell,
-                              bool unspecified = false );
-
-    void ResetEditorAppearance()
-    {
-        wxPGCell cell;
-        cell.SetEmptyData();
-        SetEditorAppearance(cell, false);
-    }
-
-    void PrepareAfterItemsAdded();
-
-    /**
-        Send event from the property grid.
-
-        Omit the wxPG_SEL_NOVALIDATE flag to allow vetoing the event
-    */
-    bool SendEvent( int eventType, wxPGProperty* p,
-                    wxVariant* pValue = NULL,
-                    unsigned int selFlags = wxPG_SEL_NOVALIDATE,
-                    unsigned int column = 1 );
-
-    // This function only moves focus to the wxPropertyGrid if it already
-    // was on one of its child controls.
-    void SetFocusOnCanvas();
-
-    bool DoHideProperty( wxPGProperty* p, bool hide, int flags );
-
-private:
-
-    bool ButtonTriggerKeyTest( int action, wxKeyEvent& event );
-
-    DECLARE_EVENT_TABLE()
-};
-
-// -----------------------------------------------------------------------
-//
-// Bunch of inlines that need to resolved after all classes have been defined.
-//
-
-inline bool wxPropertyGridPageState::IsDisplayed() const
-{
-    return ( this == m_pPropGrid->GetState() );
-}
-
-inline unsigned int wxPropertyGridPageState::GetActualVirtualHeight() const
-{
-    return DoGetRoot()->GetChildrenHeight(GetGrid()->GetRowHeight());
-}
-
-inline wxString wxPGProperty::GetHintText() const
-{
-    wxVariant vHintText = GetAttribute(wxPGGlobalVars->m_strHint);
-
-#if wxPG_COMPATIBILITY_1_4
-    // Try the old, deprecated "InlineHelp"
-    if ( vHintText.IsNull() )
-        vHintText = GetAttribute(wxPGGlobalVars->m_strInlineHelp);
-#endif
-
-    if ( !vHintText.IsNull() )
-        return vHintText.GetString();
-
-    return wxEmptyString;
-}
-
-inline int wxPGProperty::GetDisplayedCommonValueCount() const
-{
-    if ( HasFlag(wxPG_PROP_USES_COMMON_VALUE) )
-    {
-        wxPropertyGrid* pg = GetGrid();
-        if ( pg )
-            return (int) pg->GetCommonValueCount();
-    }
-    return 0;
-}
-
-inline void wxPGProperty::SetDefaultValue( wxVariant& value )
-{
-    SetAttribute(wxPG_ATTR_DEFAULT_VALUE, value);
-}
-
-inline void wxPGProperty::SetEditor( const wxString& editorName )
-{
-    m_customEditor = wxPropertyGridInterface::GetEditorByName(editorName);
-}
-
-inline bool wxPGProperty::SetMaxLength( int maxLen )
-{
-    return GetGrid()->SetPropertyMaxLength(this,maxLen);
-}
-
-// -----------------------------------------------------------------------
-
-#define wxPG_BASE_EVT_PRE_ID     1775
-
-#ifndef SWIG
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID, wxEVT_PG_SELECTED, wxPropertyGridEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID, wxEVT_PG_CHANGING, wxPropertyGridEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID, wxEVT_PG_CHANGED, wxPropertyGridEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID, wxEVT_PG_HIGHLIGHTED, wxPropertyGridEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID, wxEVT_PG_RIGHT_CLICK, wxPropertyGridEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID, wxEVT_PG_PAGE_CHANGED, wxPropertyGridEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID, wxEVT_PG_ITEM_COLLAPSED, wxPropertyGridEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID, wxEVT_PG_ITEM_EXPANDED, wxPropertyGridEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID, wxEVT_PG_DOUBLE_CLICK, wxPropertyGridEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID,
-                          wxEVT_PG_LABEL_EDIT_BEGIN, wxPropertyGridEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID,
-                          wxEVT_PG_LABEL_EDIT_ENDING, wxPropertyGridEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID,
-                          wxEVT_PG_COL_BEGIN_DRAG, wxPropertyGridEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID,
-                          wxEVT_PG_COL_DRAGGING, wxPropertyGridEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_PROPGRID,
-                          wxEVT_PG_COL_END_DRAG, wxPropertyGridEvent );
-
-#else
-    enum {
-        wxEVT_PG_SELECTED = wxPG_BASE_EVT_PRE_ID,
-        wxEVT_PG_CHANGING,
-        wxEVT_PG_CHANGED,
-        wxEVT_PG_HIGHLIGHTED,
-        wxEVT_PG_RIGHT_CLICK,
-        wxEVT_PG_PAGE_CHANGED,
-        wxEVT_PG_ITEM_COLLAPSED,
-        wxEVT_PG_ITEM_EXPANDED,
-        wxEVT_PG_DOUBLE_CLICK,
-        wxEVT_PG_LABEL_EDIT_BEGIN,
-        wxEVT_PG_LABEL_EDIT_ENDING,
-        wxEVT_PG_COL_BEGIN_DRAG,
-        wxEVT_PG_COL_DRAGGING,
-        wxEVT_PG_COL_END_DRAG
-    };
-#endif
-
-
-#define wxPG_BASE_EVT_TYPE       wxEVT_PG_SELECTED
-#define wxPG_MAX_EVT_TYPE        (wxPG_BASE_EVT_TYPE+30)
-
-
-#ifndef SWIG
-typedef void (wxEvtHandler::*wxPropertyGridEventFunction)(wxPropertyGridEvent&);
-
-#define EVT_PG_SELECTED(id, fn)              wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_PG_SELECTED, id, -1, wxEVENT_HANDLER_CAST( wxPropertyGridEventFunction, fn ), NULL ),
-#define EVT_PG_CHANGING(id, fn)              wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_PG_CHANGING, id, -1, wxEVENT_HANDLER_CAST( wxPropertyGridEventFunction, fn ), NULL ),
-#define EVT_PG_CHANGED(id, fn)               wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_PG_CHANGED, id, -1, wxEVENT_HANDLER_CAST( wxPropertyGridEventFunction, fn ), NULL ),
-#define EVT_PG_HIGHLIGHTED(id, fn)           wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_PG_HIGHLIGHTED, id, -1, wxEVENT_HANDLER_CAST( wxPropertyGridEventFunction, fn ), NULL ),
-#define EVT_PG_RIGHT_CLICK(id, fn)           wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_PG_RIGHT_CLICK, id, -1, wxEVENT_HANDLER_CAST( wxPropertyGridEventFunction, fn ), NULL ),
-#define EVT_PG_DOUBLE_CLICK(id, fn)          wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_PG_DOUBLE_CLICK, id, -1, wxEVENT_HANDLER_CAST( wxPropertyGridEventFunction, fn ), NULL ),
-#define EVT_PG_PAGE_CHANGED(id, fn)          wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_PG_PAGE_CHANGED, id, -1, wxEVENT_HANDLER_CAST( wxPropertyGridEventFunction, fn ), NULL ),
-#define EVT_PG_ITEM_COLLAPSED(id, fn)        wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_PG_ITEM_COLLAPSED, id, -1, wxEVENT_HANDLER_CAST( wxPropertyGridEventFunction, fn ), NULL ),
-#define EVT_PG_ITEM_EXPANDED(id, fn)         wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_PG_ITEM_EXPANDED, id, -1, wxEVENT_HANDLER_CAST( wxPropertyGridEventFunction, fn ), NULL ),
-#define EVT_PG_LABEL_EDIT_BEGIN(id, fn)      wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_PG_LABEL_EDIT_BEGIN, id, -1, wxEVENT_HANDLER_CAST( wxPropertyGridEventFunction, fn ), NULL ),
-#define EVT_PG_LABEL_EDIT_ENDING(id, fn)     wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_PG_LABEL_EDIT_ENDING, id, -1, wxEVENT_HANDLER_CAST( wxPropertyGridEventFunction, fn ), NULL ),
-#define EVT_PG_COL_BEGIN_DRAG(id, fn)        wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_PG_COL_BEGIN_DRAG, id, -1, wxEVENT_HANDLER_CAST( wxPropertyGridEventFunction, fn ), NULL ),
-#define EVT_PG_COL_DRAGGING(id, fn)          wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_PG_COL_DRAGGING, id, -1, wxEVENT_HANDLER_CAST( wxPropertyGridEventFunction, fn ), NULL ),
-#define EVT_PG_COL_END_DRAG(id, fn)          wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_PG_COL_END_DRAG, id, -1, wxEVENT_HANDLER_CAST( wxPropertyGridEventFunction, fn ), NULL ),
-
-#define wxPropertyGridEventHandler(fn) \
-    wxEVENT_HANDLER_CAST( wxPropertyGridEventFunction, fn )
-
-#endif
-
-
-/** @class wxPropertyGridEvent
-
-    A propertygrid event holds information about events associated with
-    wxPropertyGrid objects.
-
-    @library{wxpropgrid}
-    @category{propgrid}
-*/
-class WXDLLIMPEXP_PROPGRID wxPropertyGridEvent : public wxCommandEvent
-{
-public:
-
-    /** Constructor. */
-    wxPropertyGridEvent(wxEventType commandType=0, int id=0);
-
-    /** Copy constructor. */
-    wxPropertyGridEvent(const wxPropertyGridEvent& event);
-
-    /** Destructor. */
-    ~wxPropertyGridEvent();
-
-    /** Copyer. */
-    virtual wxEvent* Clone() const;
-
-    /**
-        Returns the column index associated with this event.
-        For the column dragging events, it is the column to the left
-        of the splitter being dragged
-    */
-    unsigned int GetColumn() const
-    {
-        return m_column;
-    }
-
-    wxPGProperty* GetMainParent() const
-    {
-        wxASSERT(m_property);
-        return m_property->GetMainParent();
-    }
-
-    /** Returns id of associated property. */
-    wxPGProperty* GetProperty() const
-    {
-        return m_property;
-    }
-
-    wxPGValidationInfo& GetValidationInfo()
-    {
-        wxASSERT(m_validationInfo);
-        return *m_validationInfo;
-    }
-
-    /** Returns true if you can veto the action that the event is signaling.
-    */
-    bool CanVeto() const { return m_canVeto; }
-
-    /**
-        Call this from your event handler to veto action that the event is
-        signaling.
-
-        You can only veto a shutdown if wxPropertyGridEvent::CanVeto returns
-        true.
-        @remarks
-        Currently only wxEVT_PG_CHANGING supports vetoing.
-    */
-    void Veto( bool veto = true ) { m_wasVetoed = veto; }
-
-    /**
-        Returns name of the associated property.
-
-        @remarks Property name is stored in event, so it remains
-                 accessible even after the associated property or
-                 the property grid has been deleted.
-    */
-    wxString GetPropertyName() const
-    {
-        return m_propertyName;
-    }
-
-    /**
-        Returns value of the associated property. Works for all event
-        types, but for wxEVT_PG_CHANGING this member function returns
-        the value that is pending, so you can call Veto() if the
-        value is not satisfactory.
-
-        @remarks Property value is stored in event, so it remains
-                 accessible even after the associated property or
-                 the property grid has been deleted.
-    */
-    wxVariant GetPropertyValue() const
-    {
-        if ( m_validationInfo )
-            return m_validationInfo->GetValue();
-        return m_value;
-    }
-
-    /**
-        Returns value of the associated property.
-
-        @see GetPropertyValue
-    */
-    wxVariant GetValue() const
-    {
-        return GetPropertyValue();
-    }
-
-    /**
-        Set override validation failure behaviour.
-
-        Only effective if Veto was also called, and only allowed if event type
-        is wxEVT_PG_CHANGING.
-    */
-    void SetValidationFailureBehavior( wxPGVFBFlags flags )
-    {
-        wxASSERT( GetEventType() == wxEVT_PG_CHANGING );
-        m_validationInfo->SetFailureBehavior( flags );
-    }
-
-    /** Sets custom failure message for this time only. Only applies if
-        wxPG_VFB_SHOW_MESSAGE is set in validation failure flags.
-    */
-    void SetValidationFailureMessage( const wxString& message )
-    {
-        wxASSERT( GetEventType() == wxEVT_PG_CHANGING );
-        m_validationInfo->SetFailureMessage( message );
-    }
-
-    wxPGVFBFlags GetValidationFailureBehavior() const
-    {
-        wxASSERT( GetEventType() == wxEVT_PG_CHANGING );
-        return m_validationInfo->GetFailureBehavior();
-    }
-
-    void SetColumn( unsigned int column )
-    {
-        m_column = column;
-    }
-
-    void SetCanVeto( bool canVeto ) { m_canVeto = canVeto; }
-    bool WasVetoed() const { return m_wasVetoed; }
-
-    /** Changes the associated property. */
-    void SetProperty( wxPGProperty* p )
-    {
-        m_property = p;
-        if ( p )
-            m_propertyName = p->GetName();
-    }
-
-    void SetPropertyValue( wxVariant value )
-    {
-        m_value = value;
-    }
-
-    void SetPropertyGrid( wxPropertyGrid* pg )
-    {
-        m_pg = pg;
-        OnPropertyGridSet();
-    }
-
-    void SetupValidationInfo()
-    {
-        wxASSERT(m_pg);
-        wxASSERT( GetEventType() == wxEVT_PG_CHANGING );
-        m_validationInfo = &m_pg->GetValidationInfo();
-        m_value = m_validationInfo->GetValue();
-    }
-
-private:
-    void Init();
-    void OnPropertyGridSet();
-    DECLARE_DYNAMIC_CLASS(wxPropertyGridEvent)
-
-    wxPGProperty*       m_property;
-    wxPropertyGrid*     m_pg;
-    wxPGValidationInfo* m_validationInfo;
-
-    wxString            m_propertyName;
-    wxVariant           m_value;
-
-    unsigned int        m_column;
-
-    bool                m_canVeto;
-    bool                m_wasVetoed;
-};
-
-
-// -----------------------------------------------------------------------
-
-/** @class wxPropertyGridPopulator
-    @ingroup classes
-    Allows populating wxPropertyGrid from arbitrary text source.
-*/
-class WXDLLIMPEXP_PROPGRID wxPropertyGridPopulator
-{
-public:
-    /** Default constructor.
-    */
-    wxPropertyGridPopulator();
-
-    /** Destructor. */
-    virtual ~wxPropertyGridPopulator();
-
-    void SetState( wxPropertyGridPageState* state );
-
-    void SetGrid( wxPropertyGrid* pg );
-
-    /** Appends a new property under bottommost parent.
-        @param propClass
-        Property class as string.
-    */
-    wxPGProperty* Add( const wxString& propClass,
-                       const wxString& propLabel,
-                       const wxString& propName,
-                       const wxString* propValue,
-                       wxPGChoices* pChoices = NULL );
-
-    /**
-        Pushes property to the back of parent array (ie it becomes bottommost
-        parent), and starts scanning/adding children for it.
-
-        When finished, parent array is returned to the original state.
-    */
-    void AddChildren( wxPGProperty* property );
-
-    /** Adds attribute to the bottommost property.
-        @param type
-        Allowed values: "string", (same as string), "int", "bool". Empty string
-          mean autodetect.
-    */
-    bool AddAttribute( const wxString& name,
-                       const wxString& type,
-                       const wxString& value );
-
-    /** Called once in AddChildren.
-    */
-    virtual void DoScanForChildren() = 0;
-
-    /**
-        Returns id of parent property for which children can currently be
-        added.
-     */
-    wxPGProperty* GetCurParent() const
-    {
-        return (wxPGProperty*) m_propHierarchy[m_propHierarchy.size()-1];
-    }
-
-    wxPropertyGridPageState* GetState() { return m_state; }
-    const wxPropertyGridPageState* GetState() const { return m_state; }
-
-    /** Like wxString::ToLong, except allows N% in addition of N.
-    */
-    static bool ToLongPCT( const wxString& s, long* pval, long max );
-
-    /** Parses strings of format "choice1"[=value1] ... "choiceN"[=valueN] into
-        wxPGChoices. Registers parsed result using idString (if not empty).
-        Also, if choices with given id already registered, then don't parse but
-        return those choices instead.
-    */
-    wxPGChoices ParseChoices( const wxString& choicesString,
-                              const wxString& idString );
-
-    /** Implement in derived class to do custom process when an error occurs.
-        Default implementation uses wxLogError.
-    */
-    virtual void ProcessError( const wxString& msg );
-
-protected:
-
-    /** Used property grid. */
-    wxPropertyGrid*         m_pg;
-
-    /** Used property grid state. */
-    wxPropertyGridPageState*    m_state;
-
-    /** Tree-hierarchy of added properties (that can have children). */
-    wxArrayPGProperty       m_propHierarchy;
-
-    /** Hashmap for string-id to wxPGChoicesData mapping. */
-    wxPGHashMapS2P          m_dictIdChoices;
-};
-
-// -----------------------------------------------------------------------
-
-//
-// Undefine macros that are not needed outside propertygrid sources
-//
-#ifndef __wxPG_SOURCE_FILE__
-    #undef wxPG_FL_DESC_REFRESH_REQUIRED
-    #undef wxPG_FL_SCROLLBAR_DETECTED
-    #undef wxPG_FL_CREATEDSTATE
-    #undef wxPG_FL_NOSTATUSBARHELP
-    #undef wxPG_FL_SCROLLED
-    #undef wxPG_FL_FOCUS_INSIDE_CHILD
-    #undef wxPG_FL_FOCUS_INSIDE
-    #undef wxPG_FL_MOUSE_INSIDE_CHILD
-    #undef wxPG_FL_CUR_USES_CUSTOM_IMAGE
-    #undef wxPG_FL_PRIMARY_FILLS_ENTIRE
-    #undef wxPG_FL_VALUE_MODIFIED
-    #undef wxPG_FL_MOUSE_INSIDE
-    #undef wxPG_FL_FOCUSED
-    #undef wxPG_FL_MOUSE_CAPTURED
-    #undef wxPG_FL_INITIALIZED
-    #undef wxPG_FL_ACTIVATION_BY_CLICK
-    #undef wxPG_SUPPORT_TOOLTIPS
-    #undef wxPG_ICON_WIDTH
-    #undef wxPG_USE_RENDERER_NATIVE
-// Following are needed by the manager headers
-//    #undef const wxString&
-#endif
-
-// -----------------------------------------------------------------------
-
-#endif
-
-#endif // _WX_PROPGRID_PROPGRID_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/propgriddefs.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/propgriddefs.h
deleted file mode 100644
index ae2e462bf4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/propgriddefs.h
+++ /dev/null
@@ -1,714 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/propgrid/propgriddefs.h
-// Purpose:     wxPropertyGrid miscellaneous definitions
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     2008-08-31
-// Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PROPGRID_PROPGRIDDEFS_H_
-#define _WX_PROPGRID_PROPGRIDDEFS_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_PROPGRID
-
-#include "wx/dynarray.h"
-#include "wx/vector.h"
-#include "wx/hashmap.h"
-#include "wx/variant.h"
-#include "wx/any.h"
-#include "wx/longlong.h"
-#include "wx/clntdata.h"
-
-// -----------------------------------------------------------------------
-
-//
-// Here are some platform dependent defines
-// NOTE: More in propertygrid.cpp
-//
-
-#if defined(__WXMSW__)
-
-    // space between vertical line and value text
-    #define wxPG_XBEFORETEXT            4
-    // space between vertical line and value editor control
-    #define wxPG_XBEFOREWIDGET          1
-
-    // comment to use bitmap buttons
-    #define wxPG_ICON_WIDTH             9
-    // 1 if wxRendererNative should be employed
-    #define wxPG_USE_RENDERER_NATIVE    0
-
-    // Enable tooltips
-    #define wxPG_SUPPORT_TOOLTIPS       1
-
-    // width of optional bitmap/image in front of property
-    #define wxPG_CUSTOM_IMAGE_WIDTH     20
-
-    // 1 if splitter drag detect margin and control cannot overlap
-    #define wxPG_NO_CHILD_EVT_MOTION    0
-
-    #define wxPG_NAT_BUTTON_BORDER_ANY          1
-    #define wxPG_NAT_BUTTON_BORDER_X            1
-    #define wxPG_NAT_BUTTON_BORDER_Y            1
-
-    // If 1 then controls are refreshed explicitly in a few places
-    #define wxPG_REFRESH_CONTROLS 0
-
-#elif defined(__WXGTK__)
-
-    // space between vertical line and value text
-    #define wxPG_XBEFORETEXT            5
-    // space between vertical line and value editor control
-    #define wxPG_XBEFOREWIDGET          1
-
-    // x position adjustment for wxTextCtrl (and like)
-    // NB: Only define wxPG_TEXTCTRLXADJUST for platforms that do not
-    //     (yet) support wxTextEntry::SetMargins() for the left margin.
-    //#define wxPG_TEXTCTRLXADJUST        3
-
-    // comment to use bitmap buttons
-    #define wxPG_ICON_WIDTH             9
-    // 1 if wxRendererNative should be employed
-    #define wxPG_USE_RENDERER_NATIVE    1
-
-    // Enable tooltips
-    #define wxPG_SUPPORT_TOOLTIPS       1
-
-    // width of optional bitmap/image in front of property
-    #define wxPG_CUSTOM_IMAGE_WIDTH     20
-
-    // 1 if splitter drag detect margin and control cannot overlap
-    #define wxPG_NO_CHILD_EVT_MOTION    1
-
-    #define wxPG_NAT_BUTTON_BORDER_ANY      1
-    #define wxPG_NAT_BUTTON_BORDER_X        1
-    #define wxPG_NAT_BUTTON_BORDER_Y        1
-
-    // If 1 then controls are refreshed after selected was drawn.
-    #define wxPG_REFRESH_CONTROLS 1
-
-#elif defined(__WXMAC__)
-
-    // space between vertical line and value text
-    #define wxPG_XBEFORETEXT            4
-    // space between vertical line and value editor widget
-    #define wxPG_XBEFOREWIDGET          1
-
-    // x position adjustment for wxTextCtrl (and like)
-    #define wxPG_TEXTCTRLXADJUST        0
-
-    // comment to use bitmap buttons
-    #define wxPG_ICON_WIDTH             11
-    // 1 if wxRendererNative should be employed
-    #define wxPG_USE_RENDERER_NATIVE    1
-
-    // Enable tooltips
-    #define wxPG_SUPPORT_TOOLTIPS       1
-
-    // width of optional bitmap/image in front of property
-    #define wxPG_CUSTOM_IMAGE_WIDTH     20
-
-    // 1 if splitter drag detect margin and control cannot overlap
-    #define wxPG_NO_CHILD_EVT_MOTION    0
-
-    #define wxPG_NAT_BUTTON_BORDER_ANY      0
-    #define wxPG_NAT_BUTTON_BORDER_X        0
-    #define wxPG_NAT_BUTTON_BORDER_Y        0
-
-    // If 1 then controls are refreshed after selected was drawn.
-    #define wxPG_REFRESH_CONTROLS 0
-
-#else // defaults
-
-    // space between vertical line and value text
-    #define wxPG_XBEFORETEXT            5
-    // space between vertical line and value editor widget
-    #define wxPG_XBEFOREWIDGET          1
-
-    // x position adjustment for wxTextCtrl (and like)
-    #define wxPG_TEXTCTRLXADJUST        3
-
-    // comment to use bitmap buttons
-    #define wxPG_ICON_WIDTH             9
-    // 1 if wxRendererNative should be employed
-    #define wxPG_USE_RENDERER_NATIVE    0
-
-    // Enable tooltips
-    #define wxPG_SUPPORT_TOOLTIPS       0
-
-    // width of optional bitmap/image in front of property
-    #define wxPG_CUSTOM_IMAGE_WIDTH     20
-
-    // 1 if splitter drag detect margin and control cannot overlap
-    #define wxPG_NO_CHILD_EVT_MOTION    1
-
-    #define wxPG_NAT_BUTTON_BORDER_ANY      0
-    #define wxPG_NAT_BUTTON_BORDER_X        0
-    #define wxPG_NAT_BUTTON_BORDER_Y        0
-
-    // If 1 then controls are refreshed after selected was drawn.
-    #define wxPG_REFRESH_CONTROLS 0
-#endif // platform
-
-
-#define wxPG_CONTROL_MARGIN             0 // space between splitter and control
-
-#define wxCC_CUSTOM_IMAGE_MARGIN1       4  // before image
-#define wxCC_CUSTOM_IMAGE_MARGIN2       5  // after image
-
-#define DEFAULT_IMAGE_OFFSET_INCREMENT \
-    (wxCC_CUSTOM_IMAGE_MARGIN1 + wxCC_CUSTOM_IMAGE_MARGIN2)
-
-#define wxPG_DRAG_MARGIN                30
-
-#if wxPG_NO_CHILD_EVT_MOTION
-    #define wxPG_SPLITTERX_DETECTMARGIN1    3 // this much on left
-    #define wxPG_SPLITTERX_DETECTMARGIN2    2 // this much on right
-#else
-    #define wxPG_SPLITTERX_DETECTMARGIN1    3 // this much on left
-    #define wxPG_SPLITTERX_DETECTMARGIN2    2 // this much on right
-#endif
-
-// Use this macro to generate standard custom image height from
-#define wxPG_STD_CUST_IMAGE_HEIGHT(LINEHEIGHT)  (LINEHEIGHT-3)
-
-
-#if defined(__WXWINCE__)
-    #define wxPG_SMALL_SCREEN       1
-#else
-    #define wxPG_SMALL_SCREEN       0
-#endif
-
-
-// Undefine wxPG_ICON_WIDTH to use supplied xpm bitmaps instead
-// (for tree buttons)
-//#undef wxPG_ICON_WIDTH
-
-#if WXWIN_COMPATIBILITY_2_6 || WXWIN_COMPATIBILITY_2_8
-    #define wxPG_COMPATIBILITY_1_4      1
-#else
-    #define wxPG_COMPATIBILITY_1_4      0
-#endif
-
-// Need to force disable tooltips?
-#if !wxUSE_TOOLTIPS
-    #undef wxPG_SUPPORT_TOOLTIPS
-    #define wxPG_SUPPORT_TOOLTIPS       0
-#endif
-
-// Set 1 to include advanced properties (wxFontProperty, wxColourProperty, etc.)
-#ifndef wxPG_INCLUDE_ADVPROPS
-    #define wxPG_INCLUDE_ADVPROPS           1
-#endif
-
-// Set 1 to include checkbox editor class
-#define wxPG_INCLUDE_CHECKBOX           1
-
-// -----------------------------------------------------------------------
-
-
-class wxPGEditor;
-class wxPGProperty;
-class wxPropertyCategory;
-class wxPGChoices;
-class wxPropertyGridPageState;
-class wxPGCell;
-class wxPGCellRenderer;
-class wxPGChoiceEntry;
-class wxPGPropArgCls;
-class wxPropertyGridInterface;
-class wxPropertyGrid;
-class wxPropertyGridEvent;
-class wxPropertyGridManager;
-class wxPGOwnerDrawnComboBox;
-class wxPGEditorDialogAdapter;
-class wxPGValidationInfo;
-
-
-// -----------------------------------------------------------------------
-
-/** @section propgrid_misc wxPropertyGrid Miscellanous
-
-    This section describes some miscellanous values, types and macros.
-    @{
-*/
-
-// Used to tell wxPGProperty to use label as name as well
-#define wxPG_LABEL              (*wxPGProperty::sm_wxPG_LABEL)
-
-// This is the value placed in wxPGProperty::sm_wxPG_LABEL
-#define wxPG_LABEL_STRING       wxS("@!")
-#define wxPG_NULL_BITMAP        wxNullBitmap
-#define wxPG_COLOUR_BLACK       (*wxBLACK)
-
-/** Convert Red, Green and Blue to a single 32-bit value.
-*/
-#define wxPG_COLOUR(R,G,B) ((wxUint32)(R+(G<<8)+(B<<16)))
-
-
-/** If property is supposed to have custom-painted image, then returning
-    this in OnMeasureImage() will usually be enough.
-*/
-#define wxPG_DEFAULT_IMAGE_SIZE             wxSize(-1, -1)
-
-
-/** This callback function is used for sorting properties.
-
-    Call wxPropertyGrid::SetSortFunction() to set it.
-
-    Sort function should return a value greater than 0 if position of p1 is
-    after p2. So, for instance, when comparing property names, you can use
-    following implementation:
-
-        @code
-            int MyPropertySortFunction(wxPropertyGrid* propGrid,
-                                       wxPGProperty* p1,
-                                       wxPGProperty* p2)
-            {
-                return p1->GetBaseName().compare( p2->GetBaseName() );
-            }
-        @endcode
-*/
-typedef int (*wxPGSortCallback)(wxPropertyGrid* propGrid,
-                                wxPGProperty* p1,
-                                wxPGProperty* p2);
-
-
-
-typedef wxString wxPGCachedString;
-
-/** @}
-*/
-
-// -----------------------------------------------------------------------
-
-// Used to indicate wxPGChoices::Add etc that the value is actually not given
-// by the caller.
-#define wxPG_INVALID_VALUE      INT_MAX
-
-// -----------------------------------------------------------------------
-
-WX_DEFINE_TYPEARRAY_WITH_DECL_PTR(wxPGProperty*, wxArrayPGProperty,
-                                  wxBaseArrayPtrVoid,
-                                  class WXDLLIMPEXP_PROPGRID);
-
-WX_DECLARE_STRING_HASH_MAP_WITH_DECL(void*,
-                                     wxPGHashMapS2P,
-                                     class WXDLLIMPEXP_PROPGRID);
-
-WX_DECLARE_STRING_HASH_MAP_WITH_DECL(wxString,
-                                     wxPGHashMapS2S,
-                                     class WXDLLIMPEXP_PROPGRID);
-
-WX_DECLARE_VOIDPTR_HASH_MAP_WITH_DECL(void*,
-                                      wxPGHashMapP2P,
-                                      class WXDLLIMPEXP_PROPGRID);
-
-WX_DECLARE_HASH_MAP_WITH_DECL(wxInt32,
-                              wxInt32,
-                              wxIntegerHash,
-                              wxIntegerEqual,
-                              wxPGHashMapI2I,
-                              class WXDLLIMPEXP_PROPGRID);
-
-// Utility to find if specific item is in a vector. Returns index to
-// the item, or wxNOT_FOUND if not present.
-template<typename CONTAINER, typename T>
-int wxPGFindInVector( CONTAINER vector, const T& item )
-{
-    for ( unsigned int i=0; i<vector.size(); i++ )
-    {
-        if ( vector[i] == item )
-            return (int) i;
-    }
-    return wxNOT_FOUND;
-}
-
-// -----------------------------------------------------------------------
-
-enum wxPG_GETPROPERTYVALUES_FLAGS
-{
-
-/** Flags for wxPropertyGridInterface::GetPropertyValues */
-wxPG_KEEP_STRUCTURE               = 0x00000010,
-
-/** Flags for wxPropertyGrid::SetPropertyAttribute() etc */
-wxPG_RECURSE                      = 0x00000020,
-
-/** Include attributes for GetPropertyValues. */
-wxPG_INC_ATTRIBUTES               = 0x00000040,
-
-/** Used when first starting recursion. */
-wxPG_RECURSE_STARTS               = 0x00000080,
-
-/** Force value change. */
-wxPG_FORCE                        = 0x00000100,
-
-/** Only sort categories and their immediate children.
-    Sorting done by wxPG_AUTO_SORT option uses this.
-*/
-wxPG_SORT_TOP_LEVEL_ONLY          = 0x00000200
-
-};
-
-/** Flags for wxPropertyGrid::SetPropertyAttribute() etc */
-#define wxPG_DONT_RECURSE         0x00000000
-
-// -----------------------------------------------------------------------
-
-// Misc argument flags.
-enum wxPG_MISC_ARG_FLAGS
-{
-    // Get/Store full value instead of displayed value.
-    wxPG_FULL_VALUE                     = 0x00000001,
-
-    wxPG_REPORT_ERROR                   = 0x00000002,
-
-    wxPG_PROPERTY_SPECIFIC              = 0x00000004,
-
-    // Get/Store editable value instead of displayed one (should only be
-    // different in the case of common values)
-    wxPG_EDITABLE_VALUE                 = 0x00000008,
-
-    // Used when dealing with fragments of composite string value
-    wxPG_COMPOSITE_FRAGMENT             = 0x00000010,
-
-    // Means property for which final string value is for cannot really be
-    // edited.
-    wxPG_UNEDITABLE_COMPOSITE_FRAGMENT  = 0x00000020,
-
-    // ValueToString() called from GetValueAsString()
-    // (guarantees that input wxVariant value is current own value)
-    wxPG_VALUE_IS_CURRENT               = 0x00000040,
-
-    // Value is being set programmatically (ie. not by user)
-    wxPG_PROGRAMMATIC_VALUE             = 0x00000080
-};
-
-// -----------------------------------------------------------------------
-
-// wxPGProperty::SetValue() flags
-enum wxPG_SETVALUE_FLAGS
-{
-    wxPG_SETVAL_REFRESH_EDITOR      = 0x0001,
-    wxPG_SETVAL_AGGREGATED          = 0x0002,
-    wxPG_SETVAL_FROM_PARENT         = 0x0004,
-    wxPG_SETVAL_BY_USER             = 0x0008  // Set if value changed by user
-};
-
-// -----------------------------------------------------------------------
-
-//
-// Valid constants for wxPG_UINT_BASE attribute
-// (long because of wxVariant constructor)
-#define wxPG_BASE_OCT                       (long)8
-#define wxPG_BASE_DEC                       (long)10
-#define wxPG_BASE_HEX                       (long)16
-#define wxPG_BASE_HEXL                      (long)32
-
-//
-// Valid constants for wxPG_UINT_PREFIX attribute
-#define wxPG_PREFIX_NONE                    (long)0
-#define wxPG_PREFIX_0x                      (long)1
-#define wxPG_PREFIX_DOLLAR_SIGN             (long)2
-
-// -----------------------------------------------------------------------
-// Editor class.
-
-// Editor accessor (for backwards compatiblity use only).
-#define wxPG_EDITOR(T)          wxPGEditor_##T
-
-// Macro for declaring editor class, with optional impexpdecl part.
-#ifndef WX_PG_DECLARE_EDITOR_WITH_DECL
-
-    #define WX_PG_DECLARE_EDITOR_WITH_DECL(EDITOR,DECL) \
-    extern DECL wxPGEditor* wxPGEditor_##EDITOR; \
-    extern DECL wxPGEditor* wxPGConstruct##EDITOR##EditorClass();
-
-#endif
-
-// Declare editor class.
-#define WX_PG_DECLARE_EDITOR(EDITOR) \
-extern wxPGEditor* wxPGEditor_##EDITOR; \
-extern wxPGEditor* wxPGConstruct##EDITOR##EditorClass();
-
-// Declare builtin editor classes.
-WX_PG_DECLARE_EDITOR_WITH_DECL(TextCtrl,WXDLLIMPEXP_PROPGRID)
-WX_PG_DECLARE_EDITOR_WITH_DECL(Choice,WXDLLIMPEXP_PROPGRID)
-WX_PG_DECLARE_EDITOR_WITH_DECL(ComboBox,WXDLLIMPEXP_PROPGRID)
-WX_PG_DECLARE_EDITOR_WITH_DECL(TextCtrlAndButton,WXDLLIMPEXP_PROPGRID)
-#if wxPG_INCLUDE_CHECKBOX
-WX_PG_DECLARE_EDITOR_WITH_DECL(CheckBox,WXDLLIMPEXP_PROPGRID)
-#endif
-WX_PG_DECLARE_EDITOR_WITH_DECL(ChoiceAndButton,WXDLLIMPEXP_PROPGRID)
-
-// -----------------------------------------------------------------------
-
-#ifndef SWIG
-
-//
-// Macro WXVARIANT allows creation of wxVariant from any type supported by
-// wxWidgets internally, and of all types created using
-// WX_PG_DECLARE_VARIANT_DATA.
-template<class T>
-wxVariant WXVARIANT( const T& WXUNUSED(value) )
-{
-    wxFAIL_MSG("Code should always call specializations of this template");
-    return wxVariant();
-}
-
-template<> inline wxVariant WXVARIANT( const int& value )
-    { return wxVariant((long)value); }
-template<> inline wxVariant WXVARIANT( const long& value )
-    { return wxVariant(value); }
-template<> inline wxVariant WXVARIANT( const bool& value )
-    { return wxVariant(value); }
-template<> inline wxVariant WXVARIANT( const double& value )
-    { return wxVariant(value); }
-template<> inline wxVariant WXVARIANT( const wxArrayString& value )
-    { return wxVariant(value); }
-template<> inline wxVariant WXVARIANT( const wxString& value )
-    { return wxVariant(value); }
-#if wxUSE_LONGLONG
-template<> inline wxVariant WXVARIANT( const wxLongLong& value )
-    { return wxVariant(value); }
-template<> inline wxVariant WXVARIANT( const wxULongLong& value )
-    { return wxVariant(value); }
-#endif
-#if wxUSE_DATETIME
-template<> inline wxVariant WXVARIANT( const wxDateTime& value )
-    { return wxVariant(value); }
-#endif
-
-
-//
-// These are modified versions of DECLARE/WX_PG_IMPLEMENT_VARIANT_DATA
-// macros found in variant.h. Difference are as follows:
-//   * These support non-wxObject data
-//   * These implement classname##RefFromVariant function which returns
-//     reference to data within.
-//   * const char* classname##_VariantType which equals classname.
-//   * WXVARIANT
-//
-#define WX_PG_DECLARE_VARIANT_DATA(classname) \
-    WX_PG_DECLARE_VARIANT_DATA_EXPORTED(classname, wxEMPTY_PARAMETER_VALUE)
-
-#define WX_PG_DECLARE_VARIANT_DATA_EXPORTED(classname,expdecl) \
-expdecl classname& operator << ( classname &object, const wxVariant &variant ); \
-expdecl wxVariant& operator << ( wxVariant &variant, const classname &object ); \
-expdecl const classname& classname##RefFromVariant( const wxVariant& variant ); \
-expdecl classname& classname##RefFromVariant( wxVariant& variant ); \
-template<> inline wxVariant WXVARIANT( const classname& value ) \
-{ \
-    wxVariant variant; \
-    variant << value; \
-    return variant; \
-} \
-extern expdecl const char* classname##_VariantType;
-
-
-#define WX_PG_IMPLEMENT_VARIANT_DATA(classname) \
-    WX_PG_IMPLEMENT_VARIANT_DATA_EXPORTED(classname, wxEMPTY_PARAMETER_VALUE)
-
-// Add getter (ie. classname << variant) separately to allow
-// custom implementations.
-#define WX_PG_IMPLEMENT_VARIANT_DATA_EXPORTED_NO_EQ_NO_GETTER(classname,expdecl) \
-const char* classname##_VariantType = #classname; \
-class classname##VariantData: public wxVariantData \
-{ \
-public:\
-    classname##VariantData() {} \
-    classname##VariantData( const classname &value ) { m_value = value; } \
-\
-    classname &GetValue() { return m_value; } \
-\
-    const classname &GetValue() const { return m_value; } \
-\
-    virtual bool Eq(wxVariantData& data) const; \
-\
-    virtual wxString GetType() const; \
-\
-    virtual wxVariantData* Clone() const { return new classname##VariantData(m_value); } \
-\
-    DECLARE_WXANY_CONVERSION() \
-protected:\
-    classname m_value; \
-};\
-\
-IMPLEMENT_TRIVIAL_WXANY_CONVERSION(classname, classname##VariantData) \
-\
-wxString classname##VariantData::GetType() const\
-{\
-    return wxS(#classname);\
-}\
-\
-expdecl wxVariant& operator << ( wxVariant &variant, const classname &value )\
-{\
-    classname##VariantData *data = new classname##VariantData( value );\
-    variant.SetData( data );\
-    return variant;\
-} \
-expdecl classname& classname##RefFromVariant( wxVariant& variant ) \
-{ \
-    wxASSERT_MSG( variant.GetType() == wxS(#classname), \
-                  wxString::Format("Variant type should have been '%s'" \
-                                   "instead of '%s'", \
-                                   wxS(#classname), \
-                                   variant.GetType().c_str())); \
-    classname##VariantData *data = \
-        (classname##VariantData*) variant.GetData(); \
-    return data->GetValue();\
-} \
-expdecl const classname& classname##RefFromVariant( const wxVariant& variant ) \
-{ \
-    wxASSERT_MSG( variant.GetType() == wxS(#classname), \
-                  wxString::Format("Variant type should have been '%s'" \
-                                   "instead of '%s'", \
-                                   wxS(#classname), \
-                                   variant.GetType().c_str())); \
-    classname##VariantData *data = \
-        (classname##VariantData*) variant.GetData(); \
-    return data->GetValue();\
-}
-
-#define WX_PG_IMPLEMENT_VARIANT_DATA_GETTER(classname, expdecl) \
-expdecl classname& operator << ( classname &value, const wxVariant &variant )\
-{\
-    wxASSERT( variant.GetType() == #classname );\
-    \
-    classname##VariantData *data = (classname##VariantData*) variant.GetData();\
-    value = data->GetValue();\
-    return value;\
-}
-
-#define WX_PG_IMPLEMENT_VARIANT_DATA_EQ(classname, expdecl) \
-bool classname##VariantData::Eq(wxVariantData& data) const \
-{\
-    wxASSERT( GetType() == data.GetType() );\
-\
-    classname##VariantData & otherData = (classname##VariantData &) data;\
-\
-    return otherData.m_value == m_value;\
-}
-
-// implements a wxVariantData-derived class using for the Eq() method the
-// operator== which must have been provided by "classname"
-#define WX_PG_IMPLEMENT_VARIANT_DATA_EXPORTED(classname,expdecl) \
-WX_PG_IMPLEMENT_VARIANT_DATA_EXPORTED_NO_EQ_NO_GETTER(classname,wxEMPTY_PARAMETER_VALUE expdecl) \
-WX_PG_IMPLEMENT_VARIANT_DATA_GETTER(classname,wxEMPTY_PARAMETER_VALUE expdecl) \
-WX_PG_IMPLEMENT_VARIANT_DATA_EQ(classname,wxEMPTY_PARAMETER_VALUE expdecl)
-
-#define WX_PG_IMPLEMENT_VARIANT_DATA(classname) \
-WX_PG_IMPLEMENT_VARIANT_DATA_EXPORTED(classname, wxEMPTY_PARAMETER_VALUE)
-
-// with Eq() implementation that always returns false
-#define WX_PG_IMPLEMENT_VARIANT_DATA_EXPORTED_DUMMY_EQ(classname,expdecl) \
-WX_PG_IMPLEMENT_VARIANT_DATA_EXPORTED_NO_EQ_NO_GETTER(classname,wxEMPTY_PARAMETER_VALUE expdecl) \
-WX_PG_IMPLEMENT_VARIANT_DATA_GETTER(classname,wxEMPTY_PARAMETER_VALUE expdecl) \
-\
-bool classname##VariantData::Eq(wxVariantData& WXUNUSED(data)) const \
-{\
-    return false; \
-}
-
-#define WX_PG_IMPLEMENT_VARIANT_DATA_DUMMY_EQ(classname) \
-WX_PG_IMPLEMENT_VARIANT_DATA_EXPORTED_DUMMY_EQ(classname, wxEMPTY_PARAMETER_VALUE)
-
-WX_PG_DECLARE_VARIANT_DATA_EXPORTED(wxPoint, WXDLLIMPEXP_PROPGRID)
-WX_PG_DECLARE_VARIANT_DATA_EXPORTED(wxSize, WXDLLIMPEXP_PROPGRID)
-WX_PG_DECLARE_VARIANT_DATA_EXPORTED(wxArrayInt, WXDLLIMPEXP_PROPGRID)
-DECLARE_VARIANT_OBJECT_EXPORTED(wxFont, WXDLLIMPEXP_PROPGRID)
-template<> inline wxVariant WXVARIANT( const wxFont& value )
-{
-    wxVariant variant;
-    variant << value;
-    return variant;
-}
-
-template<> inline wxVariant WXVARIANT( const wxColour& value )
-{
-    wxVariant variant;
-    variant << value;
-    return variant;
-}
-
-// Define constants for common wxVariant type strings
-
-#define wxPG_VARIANT_TYPE_STRING        wxPGGlobalVars->m_strstring
-#define wxPG_VARIANT_TYPE_LONG          wxPGGlobalVars->m_strlong
-#define wxPG_VARIANT_TYPE_BOOL          wxPGGlobalVars->m_strbool
-#define wxPG_VARIANT_TYPE_LIST          wxPGGlobalVars->m_strlist
-#define wxPG_VARIANT_TYPE_DOUBLE        wxS("double")
-#define wxPG_VARIANT_TYPE_ARRSTRING     wxS("arrstring")
-#define wxPG_VARIANT_TYPE_DATETIME      wxS("datetime")
-#define wxPG_VARIANT_TYPE_LONGLONG      wxS("longlong")
-#define wxPG_VARIANT_TYPE_ULONGLONG     wxS("ulonglong")
-
-#endif // !SWIG
-
-// -----------------------------------------------------------------------
-
-//
-// Tokenizer macros.
-// NOTE: I have made two versions - worse ones (performance and consistency
-//   wise) use wxStringTokenizer and better ones (may have unfound bugs)
-//   use custom code.
-//
-
-#include "wx/tokenzr.h"
-
-// TOKENIZER1 can be done with wxStringTokenizer
-#define WX_PG_TOKENIZER1_BEGIN(WXSTRING,DELIMITER) \
-    wxStringTokenizer tkz(WXSTRING,DELIMITER,wxTOKEN_RET_EMPTY); \
-    while ( tkz.HasMoreTokens() ) \
-    { \
-        wxString token = tkz.GetNextToken(); \
-        token.Trim(true); \
-        token.Trim(false);
-
-#define WX_PG_TOKENIZER1_END() \
-    }
-
-
-//
-// 2nd version: tokens are surrounded by DELIMITERs (for example, C-style
-// strings). TOKENIZER2 must use custom code (a class) for full compliance with
-// " surrounded strings with \" inside.
-//
-// class implementation is in propgrid.cpp
-//
-
-class WXDLLIMPEXP_PROPGRID wxPGStringTokenizer
-{
-public:
-    wxPGStringTokenizer( const wxString& str, wxChar delimeter );
-    ~wxPGStringTokenizer();
-
-    bool HasMoreTokens(); // not const so we can do some stuff in it
-    wxString GetNextToken();
-
-protected:
-    const wxString*             m_str;
-    wxString::const_iterator    m_curPos;
-    wxString                    m_readyToken;
-    wxUniChar                   m_delimeter;
-};
-
-#define WX_PG_TOKENIZER2_BEGIN(WXSTRING,DELIMITER) \
-    wxPGStringTokenizer tkz(WXSTRING,DELIMITER); \
-    while ( tkz.HasMoreTokens() ) \
-    { \
-        wxString token = tkz.GetNextToken();
-
-#define WX_PG_TOKENIZER2_END() \
-    }
-
-// -----------------------------------------------------------------------
-
-#endif // wxUSE_PROPGRID
-
-#endif // _WX_PROPGRID_PROPGRIDDEFS_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/propgridiface.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/propgridiface.h
deleted file mode 100644
index a553d6dba1..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/propgridiface.h
+++ /dev/null
@@ -1,1396 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/propgrid/propgridiface.h
-// Purpose:     wxPropertyGridInterface class
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     2008-08-24
-// Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_PROPGRID_PROPGRIDIFACE_H__
-#define __WX_PROPGRID_PROPGRIDIFACE_H__
-
-#include "wx/defs.h"
-
-#if wxUSE_PROPGRID
-
-#include "wx/propgrid/property.h"
-#include "wx/propgrid/propgridpagestate.h"
-
-// -----------------------------------------------------------------------
-
-/** @section wxPGPropArgCls
-
-    Most property grid functions have this type as their argument, as it can
-    convey a property by either a pointer or name.
-*/
-class WXDLLIMPEXP_PROPGRID wxPGPropArgCls
-{
-public:
-    wxPGPropArgCls( const wxPGProperty* property )
-    {
-        m_ptr.property = (wxPGProperty*) property;
-        m_flags = IsProperty;
-    }
-    wxPGPropArgCls( const wxString& str )
-    {
-        m_ptr.stringName = &str;
-        m_flags = IsWxString;
-    }
-    wxPGPropArgCls( const wxPGPropArgCls& id )
-    {
-        m_ptr = id.m_ptr;
-        m_flags = id.m_flags;
-    }
-    // This is only needed for wxPython bindings
-    wxPGPropArgCls( wxString* str, bool WXUNUSED(deallocPtr) )
-    {
-        m_ptr.stringName = str;
-        m_flags = IsWxString | OwnsWxString;
-    }
-    ~wxPGPropArgCls()
-    {
-        if ( m_flags & OwnsWxString )
-            delete m_ptr.stringName;
-    }
-    wxPGProperty* GetPtr() const
-    {
-        wxCHECK( m_flags == IsProperty, NULL );
-        return m_ptr.property;
-    }
-    wxPGPropArgCls( const char* str )
-    {
-        m_ptr.charName = str;
-        m_flags = IsCharPtr;
-    }
-    wxPGPropArgCls( const wchar_t* str )
-    {
-        m_ptr.wcharName = str;
-        m_flags = IsWCharPtr;
-    }
-    /** This constructor is required for NULL. */
-    wxPGPropArgCls( int )
-    {
-        m_ptr.property = NULL;
-        m_flags = IsProperty;
-    }
-    wxPGProperty* GetPtr( wxPropertyGridInterface* iface ) const;
-    wxPGProperty* GetPtr( const wxPropertyGridInterface* iface ) const
-    {
-        return GetPtr((wxPropertyGridInterface*)iface);
-    }
-    wxPGProperty* GetPtr0() const { return m_ptr.property; }
-    bool HasName() const { return (m_flags != IsProperty); }
-    const wxString& GetName() const { return *m_ptr.stringName; }
-private:
-
-    enum
-    {
-        IsProperty      = 0x00,
-        IsWxString      = 0x01,
-        IsCharPtr       = 0x02,
-        IsWCharPtr      = 0x04,
-        OwnsWxString    = 0x10
-    };
-
-    union
-    {
-        wxPGProperty* property;
-        const char* charName;
-        const wchar_t* wcharName;
-        const wxString* stringName;
-    } m_ptr;
-    unsigned char m_flags;
-};
-
-typedef const wxPGPropArgCls& wxPGPropArg;
-
-// -----------------------------------------------------------------------
-
-WXDLLIMPEXP_PROPGRID
-void wxPGTypeOperationFailed( const wxPGProperty* p,
-                              const wxString& typestr,
-                              const wxString& op );
-WXDLLIMPEXP_PROPGRID
-void wxPGGetFailed( const wxPGProperty* p, const wxString& typestr );
-
-// -----------------------------------------------------------------------
-
-// Helper macro that does necessary preparations when calling
-// some wxPGProperty's member function.
-#define wxPG_PROP_ARG_CALL_PROLOG_0(PROPERTY) \
-    PROPERTY *p = (PROPERTY*)id.GetPtr(this); \
-    if ( !p ) return;
-
-#define wxPG_PROP_ARG_CALL_PROLOG_RETVAL_0(PROPERTY, RETVAL) \
-    PROPERTY *p = (PROPERTY*)id.GetPtr(this); \
-    if ( !p ) return RETVAL;
-
-#define wxPG_PROP_ARG_CALL_PROLOG() \
-    wxPG_PROP_ARG_CALL_PROLOG_0(wxPGProperty)
-
-#define wxPG_PROP_ARG_CALL_PROLOG_RETVAL(RVAL) \
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL_0(wxPGProperty, RVAL)
-
-#define wxPG_PROP_ID_CONST_CALL_PROLOG() \
-    wxPG_PROP_ARG_CALL_PROLOG_0(const wxPGProperty)
-
-#define wxPG_PROP_ID_CONST_CALL_PROLOG_RETVAL(RVAL) \
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL_0(const wxPGProperty, RVAL)
-
-// -----------------------------------------------------------------------
-
-
-/** @class wxPropertyGridInterface
-
-    Most of the shared property manipulation interface shared by wxPropertyGrid,
-    wxPropertyGridPage, and wxPropertyGridManager is defined in this class.
-
-    @remarks
-    - In separate wxPropertyGrid component this class was known as
-    wxPropertyContainerMethods.
-
-    @library{wxpropgrid}
-    @category{propgrid}
-*/
-class WXDLLIMPEXP_PROPGRID wxPropertyGridInterface
-{
-public:
-
-    /** Destructor */
-    virtual ~wxPropertyGridInterface() { }
-
-    /**
-        Appends property to the list.
-
-        wxPropertyGrid assumes ownership of the object.
-        Becomes child of most recently added category.
-        @remarks
-        - wxPropertyGrid takes the ownership of the property pointer.
-        - If appending a category with name identical to a category already in
-          the wxPropertyGrid, then newly created category is deleted, and most
-          recently added category (under which properties are appended) is set
-          to the one with same name. This allows easier adding of items to same
-          categories in multiple passes.
-        - Does not automatically redraw the control, so you may need to call
-          Refresh when calling this function after control has been shown for
-          the first time.
-    */
-    wxPGProperty* Append( wxPGProperty* property );
-
-    wxPGProperty* AppendIn( wxPGPropArg id, wxPGProperty* newproperty );
-
-    /**
-        In order to add new items into a property with fixed children (for
-        instance, wxFlagsProperty), you need to call this method. After
-        populating has been finished, you need to call EndAddChildren.
-    */
-    void BeginAddChildren( wxPGPropArg id );
-
-    /** Deletes all properties.
-    */
-    virtual void Clear() = 0;
-
-    /**
-        Clears current selection, if any.
-
-        @param validation
-            If set to @false, deselecting the property will always work,
-            even if its editor had invalid value in it.
-
-        @return Returns @true if successful or if there was no selection. May
-                fail if validation was enabled and active editor had invalid
-                value.
-
-        @remarks In wxPropertyGrid 1.4, this member function used to send
-                 wxPG_EVT_SELECTED. In wxWidgets 2.9 and later, it no longer
-                 does that.
-    */
-    bool ClearSelection( bool validation = false );
-
-    /** Resets modified status of all properties.
-    */
-    void ClearModifiedStatus();
-
-    /** Collapses given category or property with children.
-        Returns true if actually collapses.
-    */
-    bool Collapse( wxPGPropArg id );
-
-    /** Collapses all items that can be collapsed.
-
-        @return
-        Return false if failed (may fail if editor value cannot be validated).
-    */
-    bool CollapseAll() { return ExpandAll(false); }
-
-    /**
-        Changes value of a property, as if from an editor.
-        Use this instead of SetPropertyValue() if you need the value to run
-        through validation process, and also send the property change event.
-
-        @return
-        Returns true if value was successfully changed.
-    */
-    bool ChangePropertyValue( wxPGPropArg id, wxVariant newValue );
-
-    /**
-        Removes and deletes a property and any children.
-
-        @param id
-            Pointer or name of a property.
-
-        @remarks If you delete a property in a wxPropertyGrid event
-                 handler, the actual deletion is postponed until the next
-                 idle event.
-
-                 This functions deselects selected property, if any.
-                 Validation failure option wxPG_VFB_STAY_IN_PROPERTY is not
-                 respected, ie. selection is cleared even if editor had
-                 invalid value.
-    */
-    void DeleteProperty( wxPGPropArg id );
-
-    /**
-        Removes a property. Does not delete the property object, but
-        instead returns it.
-
-        @param id
-            Pointer or name of a property.
-
-        @remarks Removed property cannot have any children.
-
-                 Also, if you remove property in a wxPropertyGrid event
-                 handler, the actual removal is postponed until the next
-                 idle event.
-    */
-    wxPGProperty* RemoveProperty( wxPGPropArg id );
-
-    /**
-        Disables a property.
-
-        @see EnableProperty(), wxPGProperty::Enable()
-    */
-    bool DisableProperty( wxPGPropArg id ) { return EnableProperty(id,false); }
-
-    /**
-        Returns true if all property grid data changes have been committed.
-
-        Usually only returns false if value in active editor has been
-        invalidated by a wxValidator.
-    */
-    bool EditorValidate();
-
-    /**
-        Enables or disables property, depending on whether enable is true or
-        false. Disabled property usually appears as having grey text.
-
-        @param id
-            Name or pointer to a property.
-        @param enable
-            If @false, property is disabled instead.
-
-        @see wxPGProperty::Enable()
-     */
-    bool EnableProperty( wxPGPropArg id, bool enable = true );
-
-    /** Called after population of property with fixed children has finished.
-    */
-    void EndAddChildren( wxPGPropArg id );
-
-    /** Expands given category or property with children.
-        Returns true if actually expands.
-    */
-    bool Expand( wxPGPropArg id );
-
-    /** Expands all items that can be expanded.
-    */
-    bool ExpandAll( bool expand = true );
-
-    /** Returns id of first child of given property.
-        @remarks
-        Does not return sub-properties!
-    */
-    wxPGProperty* GetFirstChild( wxPGPropArg id )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxNullProperty)
-
-        if ( !p->GetChildCount() || p->HasFlag(wxPG_PROP_AGGREGATE) )
-            return wxNullProperty;
-
-        return p->Item(0);
-    }
-
-    //@{
-    /** Returns iterator class instance.
-        @param flags
-        See @ref propgrid_iterator_flags. Value wxPG_ITERATE_DEFAULT causes
-        iteration over everything except private child properties.
-        @param firstProp
-            Property to start iteration from. If NULL, then first child of root
-            is used.
-        @param startPos
-            Either wxTOP or wxBOTTOM. wxTOP will indicate that iterations start
-            from the first property from the top, and wxBOTTOM means that the
-            iteration will instead begin from bottommost valid item.
-    */
-    wxPropertyGridIterator GetIterator( int flags = wxPG_ITERATE_DEFAULT,
-                                        wxPGProperty* firstProp = NULL )
-    {
-        return wxPropertyGridIterator( m_pState, flags, firstProp );
-    }
-
-    wxPropertyGridConstIterator
-    GetIterator( int flags = wxPG_ITERATE_DEFAULT,
-                 wxPGProperty* firstProp = NULL ) const
-    {
-        return wxPropertyGridConstIterator( m_pState, flags, firstProp );
-    }
-
-    wxPropertyGridIterator GetIterator( int flags, int startPos )
-    {
-        return wxPropertyGridIterator( m_pState, flags, startPos );
-    }
-
-    wxPropertyGridConstIterator GetIterator( int flags, int startPos ) const
-    {
-        return wxPropertyGridConstIterator( m_pState, flags, startPos );
-    }
-    //@}
-
-    /** Returns id of first item, whether it is a category or property.
-        @param flags
-        @link iteratorflags List of iterator flags@endlink
-    */
-    wxPGProperty* GetFirst( int flags = wxPG_ITERATE_ALL )
-    {
-        wxPropertyGridIterator it( m_pState, flags, wxNullProperty, 1 );
-        return *it;
-    }
-
-    const wxPGProperty* GetFirst( int flags = wxPG_ITERATE_ALL ) const
-    {
-        return ((wxPropertyGridInterface*)this)->GetFirst(flags);
-    }
-
-    /**
-        Returns pointer to a property with given name (case-sensitive).
-        If there is no property with such name, @NULL pointer is returned.
-
-        @remarks Properties which have non-category, non-root parent
-                 cannot be accessed globally by their name. Instead, use
-                 "<property>.<subproperty>" instead of "<subproperty>".
-    */
-    wxPGProperty* GetProperty( const wxString& name ) const
-    {
-        return GetPropertyByName(name);
-    }
-
-    /** Returns map-like storage of property's attributes.
-        @remarks
-        Note that if extra style wxPG_EX_WRITEONLY_BUILTIN_ATTRIBUTES is set,
-        then builtin-attributes are not included in the storage.
-    */
-    const wxPGAttributeStorage& GetPropertyAttributes( wxPGPropArg id ) const
-    {
-        // If 'id' refers to invalid property, then we will return dummy
-        // attributes (ie. root property's attributes, which contents should
-        // should always be empty and of no consequence).
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(m_pState->DoGetRoot()->GetAttributes());
-        return p->GetAttributes();
-    }
-
-    /** Adds to 'targetArr' pointers to properties that have given
-        flags 'flags' set. However, if 'inverse' is set to true, then
-        only properties without given flags are stored.
-        @param flags
-        Property flags to use.
-        @param iterFlags
-        Iterator flags to use. Default is everything expect private children.
-    */
-    void GetPropertiesWithFlag( wxArrayPGProperty* targetArr,
-                                wxPGProperty::FlagType flags,
-                                bool inverse = false,
-                                int iterFlags = wxPG_ITERATE_PROPERTIES |
-                                                wxPG_ITERATE_HIDDEN |
-                                                wxPG_ITERATE_CATEGORIES) const;
-
-    /** Returns value of given attribute. If none found, returns NULL-variant.
-    */
-    wxVariant GetPropertyAttribute( wxPGPropArg id,
-                                    const wxString& attrName ) const
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxNullVariant)
-        return p->GetAttribute(attrName);
-    }
-
-    /** Returns pointer of property's nearest parent category. If no category
-        found, returns NULL.
-    */
-    wxPropertyCategory* GetPropertyCategory( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ID_CONST_CALL_PROLOG_RETVAL(NULL)
-        return m_pState->GetPropertyCategory(p);
-    }
-
-    /** Returns client data (void*) of a property. */
-    void* GetPropertyClientData( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(NULL)
-        return p->GetClientData();
-    }
-
-    /**
-        Returns first property which label matches given string.
-
-        NULL if none found. Note that this operation is extremely slow when
-        compared to GetPropertyByName().
-    */
-    wxPGProperty* GetPropertyByLabel( const wxString& label ) const;
-
-    /** Returns property with given name. NULL if none found.
-    */
-    wxPGProperty* GetPropertyByName( const wxString& name ) const;
-
-    /** Returns child property 'subname' of property 'name'. Same as
-        calling GetPropertyByName("name.subname"), albeit slightly faster.
-    */
-    wxPGProperty* GetPropertyByName( const wxString& name,
-                                     const wxString& subname ) const;
-
-    /** Returns property's editor. */
-    const wxPGEditor* GetPropertyEditor( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(NULL)
-        return p->GetEditorClass();
-    }
-
-    /** Returns help string associated with a property. */
-    wxString GetPropertyHelpString( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(m_emptyString)
-        return p->GetHelpString();
-    }
-
-    /** Returns property's custom value image (NULL of none). */
-    wxBitmap* GetPropertyImage( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(NULL)
-        return p->GetValueImage();
-    }
-
-    /** Returns label of a property. */
-    const wxString& GetPropertyLabel( wxPGPropArg id )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(m_emptyString)
-        return p->GetLabel();
-    }
-
-    /** Returns name of a property, by which it is globally accessible. */
-    wxString GetPropertyName( wxPGProperty* property )
-    {
-        return property->GetName();
-    }
-
-    /** Returns parent item of a property. */
-    wxPGProperty* GetPropertyParent( wxPGPropArg id )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxNullProperty)
-        return p->GetParent();
-    }
-
-#if wxUSE_VALIDATORS
-    /** Returns validator of a property as a reference, which you
-        can pass to any number of SetPropertyValidator.
-    */
-    wxValidator* GetPropertyValidator( wxPGPropArg id )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(NULL)
-        return p->GetValidator();
-    }
-#endif
-
-    /** Returns value as wxVariant. To get wxObject pointer from it,
-        you will have to use WX_PG_VARIANT_TO_WXOBJECT(VARIANT,CLASSNAME) macro.
-
-        If property value is unspecified, Null variant is returned.
-    */
-    wxVariant GetPropertyValue( wxPGPropArg id )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxVariant())
-        return p->GetValue();
-    }
-
-    wxString GetPropertyValueAsString( wxPGPropArg id ) const;
-    long GetPropertyValueAsLong( wxPGPropArg id ) const;
-    unsigned long GetPropertyValueAsULong( wxPGPropArg id ) const
-    {
-        return (unsigned long) GetPropertyValueAsLong(id);
-    }
-    int GetPropertyValueAsInt( wxPGPropArg id ) const
-        { return (int)GetPropertyValueAsLong(id); }
-    bool GetPropertyValueAsBool( wxPGPropArg id ) const;
-    double GetPropertyValueAsDouble( wxPGPropArg id ) const;
-
-#define wxPG_PROP_ID_GETPROPVAL_CALL_PROLOG_RETVAL(TYPENAME, DEFVAL) \
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(DEFVAL) \
-    wxString typeName(wxS(TYPENAME)); \
-    wxVariant value = p->GetValue(); \
-    if ( value.GetType() != typeName ) \
-    { \
-        wxPGGetFailed(p, typeName); \
-        return DEFVAL; \
-    }
-
-#define wxPG_PROP_ID_GETPROPVAL_CALL_PROLOG_RETVAL_WFALLBACK(TYPENAME, DEFVAL) \
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(DEFVAL) \
-    wxVariant value = p->GetValue(); \
-    if ( value.GetType() != wxS(TYPENAME) ) \
-        return DEFVAL; \
-
-    wxArrayString GetPropertyValueAsArrayString( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ID_GETPROPVAL_CALL_PROLOG_RETVAL("arrstring",
-                                                   wxArrayString())
-        return value.GetArrayString();
-    }
-
-#ifdef wxLongLong_t
-    wxLongLong_t GetPropertyValueAsLongLong( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(0)
-        return p->GetValue().GetLongLong().GetValue();
-    }
-
-    wxULongLong_t GetPropertyValueAsULongLong( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(0)
-        return p->GetValue().GetULongLong().GetValue();
-    }
-#endif
-
-    wxArrayInt GetPropertyValueAsArrayInt( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ID_GETPROPVAL_CALL_PROLOG_RETVAL("wxArrayInt",
-                                                   wxArrayInt())
-        wxArrayInt arr;
-        arr << value;
-        return arr;
-    }
-
-#if wxUSE_DATETIME
-    wxDateTime GetPropertyValueAsDateTime( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ID_GETPROPVAL_CALL_PROLOG_RETVAL("datetime",
-                                                   wxDateTime())
-        return value.GetDateTime();
-    }
-#endif
-
-    /** Returns a wxVariant list containing wxVariant versions of all
-        property values. Order is not guaranteed.
-        @param flags
-        Use wxPG_KEEP_STRUCTURE to retain category structure; each sub
-        category will be its own wxVariantList of wxVariant.
-        Use wxPG_INC_ATTRIBUTES to include property attributes as well.
-        Each attribute will be stored as list variant named
-        "@@<propname>@@attr."
-        @remarks
-    */
-    wxVariant GetPropertyValues( const wxString& listname = wxEmptyString,
-        wxPGProperty* baseparent = NULL, long flags = 0 ) const
-    {
-        return m_pState->DoGetPropertyValues(listname, baseparent, flags);
-    }
-
-    /**
-        Returns currently selected property. NULL if none.
-
-        @remarks When wxPG_EX_MULTIPLE_SELECTION extra style is used, this
-                 member function returns the focused property, that is the
-                 one which can have active editor.
-    */
-    wxPGProperty* GetSelection() const;
-
-    /**
-        Returns list of currently selected properties.
-
-        @remarks wxArrayPGProperty should be compatible with std::vector API.
-    */
-    const wxArrayPGProperty& GetSelectedProperties() const
-    {
-        return m_pState->m_selection;
-    }
-
-    wxPropertyGridPageState* GetState() const { return m_pState; }
-
-    /** Similar to GetIterator(), but instead returns wxPGVIterator instance,
-        which can be useful for forward-iterating through arbitrary property
-        containers.
-
-        @param flags
-        See @ref propgrid_iterator_flags.
-    */
-    virtual wxPGVIterator GetVIterator( int flags ) const;
-
-    /** Hides or reveals a property.
-        @param hide
-            If true, hides property, otherwise reveals it.
-        @param flags
-            By default changes are applied recursively. Set this paramter
-            wxPG_DONT_RECURSE to prevent this.
-    */
-    bool HideProperty( wxPGPropArg id,
-                       bool hide = true,
-                       int flags = wxPG_RECURSE );
-
-#if wxPG_INCLUDE_ADVPROPS
-    /** Initializes *all* property types. Causes references to most object
-        files in the library, so calling this may cause significant increase
-        in executable size when linking with static library.
-    */
-    static void InitAllTypeHandlers();
-#else
-    static void InitAllTypeHandlers() { }
-#endif
-
-    //@{
-    /** Inserts property to the property container.
-
-        @param priorThis
-        New property is inserted just prior to this. Available only
-        in the first variant. There are two versions of this function
-        to allow this parameter to be either an id or name to
-        a property.
-
-        @param newproperty
-        Pointer to the inserted property. wxPropertyGrid will take
-        ownership of this object.
-
-        @param parent
-        New property is inserted under this category. Available only
-        in the second variant. There are two versions of this function
-        to allow this parameter to be either an id or name to
-        a property.
-
-        @param index
-        Index under category. Available only in the second variant.
-        If index is < 0, property is appended in category.
-
-        @return
-        Returns id for the property,
-
-        @remarks
-
-        - wxPropertyGrid takes the ownership of the property pointer.
-
-        - While Append may be faster way to add items, make note that when
-          both types of data storage (categoric and
-          non-categoric) are active, Insert becomes even more slow. This is
-          especially true if current mode is non-categoric.
-
-        Example of use:
-
-        @code
-
-            // append category
-            wxPGProperty* my_cat_id = propertygrid->Append(
-                new wxPropertyCategory("My Category") );
-
-            ...
-
-            // insert into category - using second variant
-            wxPGProperty* my_item_id_1 = propertygrid->Insert(
-                my_cat_id, 0, new wxStringProperty("My String 1") );
-
-            // insert before to first item - using first variant
-            wxPGProperty* my_item_id_2 = propertygrid->Insert(
-                my_item_id, new wxStringProperty("My String 2") );
-
-        @endcode
-
-    */
-    wxPGProperty* Insert( wxPGPropArg priorThis, wxPGProperty* newproperty );
-    wxPGProperty* Insert( wxPGPropArg parent,
-                          int index,
-                          wxPGProperty* newproperty );
-    //@}
-
-    /** Returns true if property is a category. */
-    bool IsPropertyCategory( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-        return p->IsCategory();
-    }
-
-    /** Returns true if property is enabled. */
-    bool IsPropertyEnabled( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-        return (!(p->GetFlags() & wxPG_PROP_DISABLED))?true:false;
-    }
-
-    /**
-        Returns true if given property is expanded.
-
-        Naturally, always returns false for properties that cannot be expanded.
-    */
-    bool IsPropertyExpanded( wxPGPropArg id ) const;
-
-    /**
-        Returns true if property has been modified after value set or modify
-        flag clear by software.
-    */
-    bool IsPropertyModified( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-        return ( (p->GetFlags() & wxPG_PROP_MODIFIED) ? true : false );
-    }
-
-    /**
-        Returns true if property is selected.
-    */
-    bool IsPropertySelected( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-        return m_pState->DoIsPropertySelected(p);
-    }
-
-    /**
-        Returns true if property is shown (ie hideproperty with true not
-        called for it).
-    */
-    bool IsPropertyShown( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-        return (!(p->GetFlags() & wxPG_PROP_HIDDEN))?true:false;
-    }
-
-    /** Returns true if property value is set to unspecified.
-    */
-    bool IsPropertyValueUnspecified( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-        return p->IsValueUnspecified();
-    }
-
-    /**
-        Disables (limit = true) or enables (limit = false) wxTextCtrl editor of
-        a property, if it is not the sole mean to edit the value.
-    */
-    void LimitPropertyEditing( wxPGPropArg id, bool limit = true );
-
-    /** If state is shown in it's grid, refresh it now.
-    */
-    virtual void RefreshGrid( wxPropertyGridPageState* state = NULL );
-
-#if wxPG_INCLUDE_ADVPROPS
-    /**
-        Initializes additional property editors (SpinCtrl etc.). Causes
-        references to most object files in the library, so calling this may
-        cause significant increase in executable size when linking with static
-        library.
-    */
-    static void RegisterAdditionalEditors();
-#else
-    static void RegisterAdditionalEditors() { }
-#endif
-
-    /** Replaces property with id with newly created property. For example,
-        this code replaces existing property named "Flags" with one that
-        will have different set of items:
-        @code
-            pg->ReplaceProperty("Flags",
-                wxFlagsProperty("Flags", wxPG_LABEL, newItems))
-        @endcode
-        For more info, see wxPropertyGrid::Insert.
-    */
-    wxPGProperty* ReplaceProperty( wxPGPropArg id, wxPGProperty* property );
-
-    /** @anchor propgridinterface_editablestate_flags
-
-        Flags for wxPropertyGridInterface::SaveEditableState() and
-        wxPropertyGridInterface::RestoreEditableState().
-    */
-    enum EditableStateFlags
-    {
-        /** Include selected property. */
-        SelectionState   = 0x01,
-        /** Include expanded/collapsed property information. */
-        ExpandedState    = 0x02,
-        /** Include scrolled position. */
-        ScrollPosState   = 0x04,
-        /** Include selected page information.
-            Only applies to wxPropertyGridManager. */
-        PageState        = 0x08,
-        /** Include splitter position. Stored for each page. */
-        SplitterPosState = 0x10,
-        /** Include description box size.
-            Only applies to wxPropertyGridManager. */
-        DescBoxState     = 0x20,
-
-        /**
-            Include all supported user editable state information.
-            This is usually the default value. */
-        AllStates        = SelectionState |
-                           ExpandedState |
-                           ScrollPosState |
-                           PageState |
-                           SplitterPosState |
-                           DescBoxState
-    };
-
-    /**
-        Restores user-editable state.
-
-        See also wxPropertyGridInterface::SaveEditableState().
-
-        @param src
-            String generated by SaveEditableState.
-
-        @param restoreStates
-            Which parts to restore from source string. See @ref
-            propgridinterface_editablestate_flags "list of editable state
-            flags".
-
-        @return
-            False if there was problem reading the string.
-
-        @remarks
-        If some parts of state (such as scrolled or splitter position) fail to
-        restore correctly, please make sure that you call this function after
-        wxPropertyGrid size has been set (this may sometimes be tricky when
-        sizers are used).
-    */
-    bool RestoreEditableState( const wxString& src,
-                               int restoreStates = AllStates );
-
-    /**
-        Used to acquire user-editable state (selected property, expanded
-        properties, scrolled position, splitter positions).
-
-        @param includedStates
-        Which parts of state to include. See @ref
-        propgridinterface_editablestate_flags "list of editable state flags".
-    */
-    wxString SaveEditableState( int includedStates = AllStates ) const;
-
-    /**
-        Lets user set the strings listed in the choice dropdown of a
-        wxBoolProperty. Defaults are "True" and "False", so changing them to,
-        say, "Yes" and "No" may be useful in some less technical applications.
-    */
-    static void SetBoolChoices( const wxString& trueChoice,
-                                const wxString& falseChoice );
-
-    /**
-        Set proportion of a auto-stretchable column. wxPG_SPLITTER_AUTO_CENTER
-        window style needs to be used to indicate that columns are auto-
-        resizable.
-
-        @returns Returns @false on failure.
-
-        @remarks You should call this for individual pages of
-                 wxPropertyGridManager (if used).
-
-        @see GetColumnProportion()
-    */
-    bool SetColumnProportion( unsigned int column, int proportion );
-
-    /**
-        Returns auto-resize proportion of the given column.
-
-        @see SetColumnProportion()
-    */
-    int GetColumnProportion( unsigned int column ) const
-    {
-        return m_pState->DoGetColumnProportion(column);
-    }
-
-    /** Sets an attribute for this property.
-        @param name
-            Text identifier of attribute. See @ref propgrid_property_attributes.
-        @param value
-            Value of attribute.
-        @param argFlags
-            Optional. Use wxPG_RECURSE to set the attribute to child properties
-            recursively.
-    */
-    void SetPropertyAttribute( wxPGPropArg id,
-                               const wxString& attrName,
-                               wxVariant value,
-                               long argFlags = 0 )
-    {
-        DoSetPropertyAttribute(id,attrName,value,argFlags);
-    }
-
-    /** Sets property attribute for all applicapple properties.
-        Be sure to use this method only after all properties have been
-        added to the grid.
-    */
-    void SetPropertyAttributeAll( const wxString& attrName, wxVariant value );
-
-    /**
-        Sets background colour of a property.
-
-        @param id
-            Property name or pointer.
-
-        @param colour
-            New background colour.
-
-        @param flags
-            Default is wxPG_RECURSE which causes colour to be set recursively.
-            Omit this flag to only set colour for the property in question
-            and not any of its children.
-    */
-    void SetPropertyBackgroundColour( wxPGPropArg id,
-                                      const wxColour& colour,
-                                      int flags = wxPG_RECURSE );
-
-    /** Resets text and background colours of given property.
-    */
-    void SetPropertyColoursToDefault( wxPGPropArg id );
-
-    /**
-        Sets text colour of a property.
-
-        @param id
-            Property name or pointer.
-
-        @param colour
-            New background colour.
-
-        @param flags
-            Default is wxPG_RECURSE which causes colour to be set recursively.
-            Omit this flag to only set colour for the property in question
-            and not any of its children.
-    */
-    void SetPropertyTextColour( wxPGPropArg id,
-                                const wxColour& col,
-                                int flags = wxPG_RECURSE );
-
-    /**
-        Returns background colour of first cell of a property.
-    */
-    wxColour GetPropertyBackgroundColour( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxColour())
-        return p->GetCell(0).GetBgCol();
-    }
-
-    /**
-        Returns text colour of first cell of a property.
-    */
-    wxColour GetPropertyTextColour( wxPGPropArg id ) const
-    {
-        wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxColour())
-        return p->GetCell(0).GetFgCol();
-    }
-
-    /** Sets text, bitmap, and colours for given column's cell.
-
-        @remarks
-        - You can set label cell by setting column to 0.
-        - You can use wxPG_LABEL as text to use default text for column.
-    */
-    void SetPropertyCell( wxPGPropArg id,
-                          int column,
-                          const wxString& text = wxEmptyString,
-                          const wxBitmap& bitmap = wxNullBitmap,
-                          const wxColour& fgCol = wxNullColour,
-                          const wxColour& bgCol = wxNullColour );
-
-    /** Sets client data (void*) of a property.
-        @remarks
-        This untyped client data has to be deleted manually.
-    */
-    void SetPropertyClientData( wxPGPropArg id, void* clientData )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG()
-        p->SetClientData(clientData);
-    }
-
-    /** Sets editor for a property.
-
-        @param editor
-        For builtin editors, use wxPGEditor_X, where X is builtin editor's
-        name (TextCtrl, Choice, etc. see wxPGEditor documentation for full
-        list).
-
-        For custom editors, use pointer you received from
-        wxPropertyGrid::RegisterEditorClass().
-    */
-    void SetPropertyEditor( wxPGPropArg id, const wxPGEditor* editor )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG()
-        wxCHECK_RET( editor, wxT("unknown/NULL editor") );
-        p->SetEditor(editor);
-        RefreshProperty(p);
-    }
-
-    /** Sets editor control of a property. As editor argument, use
-        editor name string, such as "TextCtrl" or "Choice".
-    */
-    void SetPropertyEditor( wxPGPropArg id, const wxString& editorName )
-    {
-        SetPropertyEditor(id,GetEditorByName(editorName));
-    }
-
-    /** Sets label of a property.
-    */
-    void SetPropertyLabel( wxPGPropArg id, const wxString& newproplabel );
-
-    /**
-        Sets name of a property.
-
-        @param id
-            Name or pointer of property which name to change.
-
-        @param newName
-            New name for property.
-    */
-    void SetPropertyName( wxPGPropArg id, const wxString& newName )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG()
-        m_pState->DoSetPropertyName( p, newName );
-    }
-
-    /**
-        Sets property (and, recursively, its children) to have read-only value.
-        In other words, user cannot change the value in the editor, but they
-        can still copy it.
-        @remarks
-        This is mainly for use with textctrl editor. Not all other editors fully
-        support it.
-        @param flags
-        By default changes are applied recursively. Set this paramter
-        wxPG_DONT_RECURSE to prevent this.
-    */
-    void SetPropertyReadOnly( wxPGPropArg id,
-                              bool set = true,
-                              int flags = wxPG_RECURSE )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG()
-        if ( flags & wxPG_RECURSE )
-            p->SetFlagRecursively(wxPG_PROP_READONLY, set);
-        else
-            p->ChangeFlag(wxPG_PROP_READONLY, set);
-    }
-
-    /** Sets property's value to unspecified.
-        If it has children (it may be category), then the same thing is done to
-        them.
-    */
-    void SetPropertyValueUnspecified( wxPGPropArg id )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG()
-        p->SetValueToUnspecified();
-    }
-
-    /**
-        Sets property values from a list of wxVariants.
-    */
-    void SetPropertyValues( const wxVariantList& list,
-                            wxPGPropArg defaultCategory = wxNullProperty )
-    {
-        wxPGProperty *p;
-        if ( defaultCategory.HasName() ) p = defaultCategory.GetPtr(this);
-        else p = defaultCategory.GetPtr0();
-        m_pState->DoSetPropertyValues(list, p);
-    }
-
-    /**
-        Sets property values from a list of wxVariants.
-    */
-    void SetPropertyValues( const wxVariant& list,
-                            wxPGPropArg defaultCategory = wxNullProperty )
-    {
-        SetPropertyValues(list.GetList(),defaultCategory);
-    }
-
-    /** Associates the help string with property.
-        @remarks
-        By default, text is shown either in the manager's "description"
-        text box or in the status bar. If extra window style
-        wxPG_EX_HELP_AS_TOOLTIPS is used, then the text will appear as a
-        tooltip.
-    */
-    void SetPropertyHelpString( wxPGPropArg id, const wxString& helpString )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG()
-        p->SetHelpString(helpString);
-    }
-
-    /** Set wxBitmap in front of the value.
-        @remarks
-        - Bitmap will be scaled to a size returned by
-        wxPropertyGrid::GetImageSize();
-    */
-    void SetPropertyImage( wxPGPropArg id, wxBitmap& bmp )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG()
-        p->SetValueImage(bmp);
-        RefreshProperty(p);
-    }
-
-    /** Sets max length of property's text.
-    */
-    bool SetPropertyMaxLength( wxPGPropArg id, int maxLen );
-
-#if wxUSE_VALIDATORS
-    /** Sets validator of a property.
-    */
-    void SetPropertyValidator( wxPGPropArg id, const wxValidator& validator )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG()
-        p->SetValidator(validator);
-    }
-#endif
-
-    /** Sets value (long integer) of a property.
-    */
-    void SetPropertyValue( wxPGPropArg id, long value )
-    {
-        wxVariant v(value);
-        SetPropVal( id, v );
-    }
-
-    /** Sets value (integer) of a property.
-    */
-    void SetPropertyValue( wxPGPropArg id, int value )
-    {
-        wxVariant v((long)value);
-        SetPropVal( id, v );
-    }
-    /** Sets value (floating point) of a property.
-    */
-    void SetPropertyValue( wxPGPropArg id, double value )
-    {
-        wxVariant v(value);
-        SetPropVal( id, v );
-    }
-    /** Sets value (bool) of a property.
-    */
-    void SetPropertyValue( wxPGPropArg id, bool value )
-    {
-        wxVariant v(value);
-        SetPropVal( id, v );
-    }
-    void SetPropertyValue( wxPGPropArg id, const wchar_t* value )
-    {
-        SetPropertyValueString( id, wxString(value) );
-    }
-    void SetPropertyValue( wxPGPropArg id, const char* value )
-    {
-        SetPropertyValueString( id, wxString(value) );
-    }
-    void SetPropertyValue( wxPGPropArg id, const wxString& value )
-    {
-        SetPropertyValueString( id, value );
-    }
-
-    /** Sets value (wxArrayString) of a property.
-    */
-    void SetPropertyValue( wxPGPropArg id, const wxArrayString& value )
-    {
-        wxVariant v(value);
-        SetPropVal( id, v );
-    }
-
-#if wxUSE_DATETIME
-    void SetPropertyValue( wxPGPropArg id, const wxDateTime& value )
-    {
-        wxVariant v(value);
-        SetPropVal( id, v );
-    }
-#endif
-
-    /** Sets value (wxObject*) of a property.
-    */
-    void SetPropertyValue( wxPGPropArg id, wxObject* value )
-    {
-        wxVariant v(value);
-        SetPropVal( id, v );
-    }
-
-    void SetPropertyValue( wxPGPropArg id, wxObject& value )
-    {
-        wxVariant v(&value);
-        SetPropVal( id, v );
-    }
-
-#ifdef wxLongLong_t
-    /** Sets value (wxLongLong&) of a property.
-    */
-    void SetPropertyValue( wxPGPropArg id, wxLongLong_t value )
-    {
-        wxVariant v = WXVARIANT(wxLongLong(value));
-        SetPropVal( id, v );
-    }
-    /** Sets value (wxULongLong&) of a property.
-    */
-    void SetPropertyValue( wxPGPropArg id, wxULongLong_t value )
-    {
-        wxVariant v = WXVARIANT(wxULongLong(value));
-        SetPropVal( id, v );
-    }
-#endif
-
-    /** Sets value (wxArrayInt&) of a property.
-    */
-    void SetPropertyValue( wxPGPropArg id, const wxArrayInt& value )
-    {
-        wxVariant v = WXVARIANT(value);
-        SetPropVal( id, v );
-    }
-
-    /** Sets value (wxString) of a property.
-
-        @remarks
-        This method uses wxPGProperty::SetValueFromString, which all properties
-        should implement. This means that there should not be a type error,
-        and instead the string is converted to property's actual value type.
-    */
-    void SetPropertyValueString( wxPGPropArg id, const wxString& value );
-
-    /** Sets value (wxVariant&) of a property.
-
-        @remarks
-        Use wxPropertyGrid::ChangePropertyValue() instead if you need to run
-        through validation process and send property change event.
-    */
-    void SetPropertyValue( wxPGPropArg id, wxVariant value )
-    {
-        SetPropVal( id, value );
-    }
-
-    /** Sets value (wxVariant&) of a property. Same as SetPropertyValue, but
-        accepts reference. */
-    void SetPropVal( wxPGPropArg id, wxVariant& value );
-
-    /** Adjusts how wxPropertyGrid behaves when invalid value is entered
-        in a property.
-        @param vfbFlags
-        See @link vfbflags list of valid flags values@endlink
-    */
-    void SetValidationFailureBehavior( int vfbFlags );
-
-    /**
-        Sorts all properties recursively.
-
-        @param flags
-            This can contain any of the following options:
-              wxPG_SORT_TOP_LEVEL_ONLY: Only sort categories and their
-                immediate children. Sorting done by wxPG_AUTO_SORT option
-                uses this.
-
-        @see SortChildren, wxPropertyGrid::SetSortFunction
-    */
-    void Sort( int flags = 0 );
-
-    /**
-        Sorts children of a property.
-
-        @param id
-            Name or pointer to a property.
-
-        @param flags
-            This can contain any of the following options:
-              wxPG_RECURSE: Sorts recursively.
-
-        @see Sort, wxPropertyGrid::SetSortFunction
-    */
-    void SortChildren( wxPGPropArg id, int flags = 0 )
-    {
-        wxPG_PROP_ARG_CALL_PROLOG()
-        m_pState->DoSortChildren(p, flags);
-    }
-
-    // GetPropertyByName With nice assertion error message.
-    wxPGProperty* GetPropertyByNameA( const wxString& name ) const;
-
-    static wxPGEditor* GetEditorByName( const wxString& editorName );
-
-    // NOTE: This function reselects the property and may cause
-    //       excess flicker, so to just call Refresh() on a rect
-    //       of single property, call DrawItem() instead.
-    virtual void RefreshProperty( wxPGProperty* p ) = 0;
-
-protected:
-
-    bool DoClearSelection( bool validation = false,
-                           int selFlags = 0 );
-
-    /**
-        In derived class, implement to set editable state component with
-        given name to given value.
-    */
-    virtual bool SetEditableStateItem( const wxString& name, wxVariant value )
-    {
-        wxUnusedVar(name);
-        wxUnusedVar(value);
-        return false;
-    }
-
-    /**
-        In derived class, implement to return editable state component with
-        given name.
-    */
-    virtual wxVariant GetEditableStateItem( const wxString& name ) const
-    {
-        wxUnusedVar(name);
-        return wxNullVariant;
-    }
-
-    // Returns page state data for given (sub) page (-1 means current page).
-    virtual wxPropertyGridPageState* GetPageState( int pageIndex ) const
-    {
-        if ( pageIndex <= 0 )
-            return m_pState;
-        return NULL;
-    }
-
-    virtual bool DoSelectPage( int WXUNUSED(index) ) { return true; }
-
-    // Default call's m_pState's BaseGetPropertyByName
-    virtual wxPGProperty* DoGetPropertyByName( const wxString& name ) const;
-
-    // Deriving classes must set this (it must be only or current page).
-    wxPropertyGridPageState*         m_pState;
-
-    // Intermediate version needed due to wxVariant copying inefficiency
-    void DoSetPropertyAttribute( wxPGPropArg id,
-                                 const wxString& name,
-                                 wxVariant& value, long argFlags );
-
-    // Empty string object to return from member functions returning const
-    // wxString&.
-    wxString                    m_emptyString;
-
-private:
-    // Cannot be GetGrid() due to ambiguity issues.
-    wxPropertyGrid* GetPropertyGrid()
-    {
-        if ( !m_pState )
-            return NULL;
-        return m_pState->GetGrid();
-    }
-
-    // Cannot be GetGrid() due to ambiguity issues.
-    const wxPropertyGrid* GetPropertyGrid() const
-    {
-        if ( !m_pState )
-            return NULL;
-
-        return m_pState->GetGrid();
-    }
-
-    friend class wxPropertyGrid;
-    friend class wxPropertyGridManager;
-};
-
-#endif // wxUSE_PROPGRID
-
-#endif // __WX_PROPGRID_PROPGRIDIFACE_H__
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/propgridpagestate.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/propgridpagestate.h
deleted file mode 100644
index 77f38b2891..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/propgridpagestate.h
+++ /dev/null
@@ -1,763 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/propgrid/propgridpagestate.h
-// Purpose:     wxPropertyGridPageState class
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     2008-08-24
-// Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PROPGRID_PROPGRIDPAGESTATE_H_
-#define _WX_PROPGRID_PROPGRIDPAGESTATE_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_PROPGRID
-
-#include "wx/propgrid/property.h"
-
-// -----------------------------------------------------------------------
-
-/** @section propgrid_hittestresult wxPropertyGridHitTestResult
-
-    A return value from wxPropertyGrid::HitTest(),
-    contains all you need to know about an arbitrary location on the grid.
-*/
-class WXDLLIMPEXP_PROPGRID wxPropertyGridHitTestResult
-{
-    friend class wxPropertyGridPageState;
-public:
-    wxPropertyGridHitTestResult()
-    {
-        m_property = NULL;
-        m_column = -1;
-        m_splitter = -1;
-        m_splitterHitOffset = 0;
-    }
-
-    ~wxPropertyGridHitTestResult()
-    {
-    }
-
-    /**
-        Returns column hit. -1 for margin.
-    */
-    int GetColumn() const { return m_column; }
-
-    /**
-        Returns property hit. NULL if empty space below
-        properties was hit instead.
-    */
-    wxPGProperty* GetProperty() const
-    {
-        return m_property;
-    }
-
-    /**
-        Returns index of splitter hit, -1 for none.
-    */
-    int GetSplitter() const { return m_splitter; }
-
-    /**
-        If splitter hit, then this member function
-        returns offset to the exact splitter position.
-    */
-    int GetSplitterHitOffset() const { return m_splitterHitOffset; }
-
-private:
-    /** Property. NULL if empty space below properties was hit */
-    wxPGProperty*   m_property;
-
-    /** Column. -1 for margin. */
-    int             m_column;
-
-    /** Index of splitter hit, -1 for none. */
-    int             m_splitter;
-
-    /** If splitter hit, offset to that */
-    int             m_splitterHitOffset;
-};
-
-// -----------------------------------------------------------------------
-
-#define wxPG_IT_CHILDREN(A)         ((A)<<16)
-
-/** @section propgrid_iterator_flags wxPropertyGridIterator Flags
-    @{
-
-    NOTES: At lower 16-bits, there are flags to check if item will be included.
-    At higher 16-bits, there are same flags, but to instead check if children
-    will be included.
-*/
-
-enum wxPG_ITERATOR_FLAGS
-{
-
-/**
-    Iterate through 'normal' property items (does not include children of
-    aggregate or hidden items by default).
-*/
-wxPG_ITERATE_PROPERTIES = wxPG_PROP_PROPERTY |
-                          wxPG_PROP_MISC_PARENT |
-                          wxPG_PROP_AGGREGATE |
-                          wxPG_PROP_COLLAPSED |
-                          wxPG_IT_CHILDREN(wxPG_PROP_MISC_PARENT) |
-                          wxPG_IT_CHILDREN(wxPG_PROP_CATEGORY),
-
-/** Iterate children of collapsed parents, and individual items that are hidden.
-*/
-wxPG_ITERATE_HIDDEN = wxPG_PROP_HIDDEN |
-                      wxPG_IT_CHILDREN(wxPG_PROP_COLLAPSED),
-
-/**
-    Iterate children of parent that is an aggregate property (ie has fixed
-    children).
-*/
-wxPG_ITERATE_FIXED_CHILDREN = wxPG_IT_CHILDREN(wxPG_PROP_AGGREGATE) |
-                              wxPG_ITERATE_PROPERTIES,
-
-/** Iterate categories.
-    Note that even without this flag, children of categories are still iterated
-    through.
-*/
-wxPG_ITERATE_CATEGORIES = wxPG_PROP_CATEGORY |
-                          wxPG_IT_CHILDREN(wxPG_PROP_CATEGORY) |
-                          wxPG_PROP_COLLAPSED,
-
-wxPG_ITERATE_ALL_PARENTS = wxPG_PROP_MISC_PARENT |
-                           wxPG_PROP_AGGREGATE |
-                           wxPG_PROP_CATEGORY,
-
-wxPG_ITERATE_ALL_PARENTS_RECURSIVELY = wxPG_ITERATE_ALL_PARENTS |
-                                       wxPG_IT_CHILDREN(
-                                                wxPG_ITERATE_ALL_PARENTS),
-
-wxPG_ITERATOR_FLAGS_ALL = wxPG_PROP_PROPERTY |
-                          wxPG_PROP_MISC_PARENT |
-                          wxPG_PROP_AGGREGATE |
-                          wxPG_PROP_HIDDEN |
-                          wxPG_PROP_CATEGORY |
-                          wxPG_PROP_COLLAPSED,
-
-wxPG_ITERATOR_MASK_OP_ITEM = wxPG_ITERATOR_FLAGS_ALL,
-
-// (wxPG_PROP_MISC_PARENT|wxPG_PROP_AGGREGATE|wxPG_PROP_CATEGORY)
-wxPG_ITERATOR_MASK_OP_PARENT = wxPG_ITERATOR_FLAGS_ALL,
-
-/** Combines all flags needed to iterate through visible properties
-    (ie hidden properties and children of collapsed parents are skipped).
-*/
-wxPG_ITERATE_VISIBLE = wxPG_ITERATE_PROPERTIES |
-                       wxPG_PROP_CATEGORY |
-                       wxPG_IT_CHILDREN(wxPG_PROP_AGGREGATE),
-
-/** Iterate all items.
-*/
-wxPG_ITERATE_ALL = wxPG_ITERATE_VISIBLE |
-                   wxPG_ITERATE_HIDDEN,
-
-/** Iterate through individual properties (ie categories and children of
-    aggregate properties are skipped).
-*/
-wxPG_ITERATE_NORMAL = wxPG_ITERATE_PROPERTIES |
-                      wxPG_ITERATE_HIDDEN,
-
-/** Default iterator flags.
-*/
-wxPG_ITERATE_DEFAULT = wxPG_ITERATE_NORMAL
-
-};
-
-/** @}
-*/
-
-
-#define wxPG_ITERATOR_CREATE_MASKS(FLAGS, A, B) \
-    A = (FLAGS ^ wxPG_ITERATOR_MASK_OP_ITEM) & \
-        wxPG_ITERATOR_MASK_OP_ITEM & 0xFFFF; \
-    B = ((FLAGS>>16) ^ wxPG_ITERATOR_MASK_OP_PARENT) & \
-        wxPG_ITERATOR_MASK_OP_PARENT & 0xFFFF;
-
-
-// Macro to test if children of PWC should be iterated through
-#define wxPG_ITERATOR_PARENTEXMASK_TEST(PWC, PARENTMASK) \
-        ( \
-        !(PWC->GetFlags() & PARENTMASK) && \
-        PWC->GetChildCount() \
-        )
-
-
-// Base for wxPropertyGridIterator classes.
-class WXDLLIMPEXP_PROPGRID wxPropertyGridIteratorBase
-{
-public:
-    wxPropertyGridIteratorBase()
-    {
-    }
-
-    void Assign( const wxPropertyGridIteratorBase& it );
-
-    bool AtEnd() const { return m_property == NULL; }
-
-    /** Get current property.
-    */
-    wxPGProperty* GetProperty() const { return m_property; }
-
-    void Init( wxPropertyGridPageState* state,
-               int flags,
-               wxPGProperty* property,
-               int dir = 1 );
-
-    void Init( wxPropertyGridPageState* state,
-               int flags,
-               int startPos = wxTOP,
-               int dir = 0 );
-
-    /** Iterate to the next property.
-    */
-    void Next( bool iterateChildren = true );
-
-    /** Iterate to the previous property.
-    */
-    void Prev();
-
-    /**
-        Set base parent, ie a property when, in which iteration returns, it
-        ends.
-
-        Default base parent is the root of the used wxPropertyGridPageState.
-    */
-    void SetBaseParent( wxPGProperty* baseParent )
-        { m_baseParent = baseParent; }
-
-protected:
-
-    wxPGProperty*               m_property;
-
-private:
-    wxPropertyGridPageState*        m_state;
-    wxPGProperty*               m_baseParent;
-
-    // Masks are used to quickly exclude items
-    int                         m_itemExMask;
-    int                         m_parentExMask;
-};
-
-
-#define wxPG_IMPLEMENT_ITERATOR(CLASS, PROPERTY, STATE) \
-    CLASS( STATE* state, int flags = wxPG_ITERATE_DEFAULT, \
-           PROPERTY* property = NULL, int dir = 1 ) \
-        : wxPropertyGridIteratorBase() \
-        { Init( (wxPropertyGridPageState*)state, flags, \
-                (wxPGProperty*)property, dir ); } \
-    CLASS( STATE* state, int flags, int startPos, int dir = 0 ) \
-        : wxPropertyGridIteratorBase() \
-        { Init( (wxPropertyGridPageState*)state, flags, startPos, dir ); } \
-    CLASS() \
-        : wxPropertyGridIteratorBase() \
-    { \
-        m_property = NULL; \
-    } \
-    CLASS( const CLASS& it ) \
-        : wxPropertyGridIteratorBase( ) \
-    { \
-        Assign(it); \
-    } \
-    ~CLASS() \
-    { \
-    } \
-    const CLASS& operator=( const CLASS& it ) \
-    { \
-        if (this != &it) \
-            Assign(it); \
-        return *this; \
-    } \
-    CLASS& operator++() { Next(); return *this; } \
-    CLASS operator++(int) { CLASS it=*this;Next();return it; } \
-    CLASS& operator--() { Prev(); return *this; } \
-    CLASS operator--(int) { CLASS it=*this;Prev();return it; } \
-    PROPERTY* operator *() const { return (PROPERTY*)m_property; } \
-    static PROPERTY* OneStep( STATE* state, \
-                              int flags = wxPG_ITERATE_DEFAULT, \
-                              PROPERTY* property = NULL, \
-                              int dir = 1 ) \
-    { \
-        CLASS it( state, flags, property, dir ); \
-        if ( property ) \
-        { \
-            if ( dir == 1 ) it.Next(); \
-            else it.Prev(); \
-        } \
-        return *it; \
-    }
-
-
-/** @class wxPropertyGridIterator
-
-    Preferable way to iterate through contents of wxPropertyGrid,
-    wxPropertyGridManager, and wxPropertyGridPage.
-
-    See wxPropertyGridInterface::GetIterator() for more information about usage.
-
-    @library{wxpropgrid}
-    @category{propgrid}
-*/
-class WXDLLIMPEXP_PROPGRID
-    wxPropertyGridIterator : public wxPropertyGridIteratorBase
-{
-public:
-
-    wxPG_IMPLEMENT_ITERATOR(wxPropertyGridIterator,
-                            wxPGProperty,
-                            wxPropertyGridPageState)
-
-protected:
-};
-
-
-// Const version of wxPropertyGridIterator.
-class WXDLLIMPEXP_PROPGRID
-    wxPropertyGridConstIterator : public wxPropertyGridIteratorBase
-{
-public:
-    wxPG_IMPLEMENT_ITERATOR(wxPropertyGridConstIterator,
-                            const wxPGProperty,
-                            const wxPropertyGridPageState)
-
-    /**
-        Additional copy constructor.
-    */
-    wxPropertyGridConstIterator( const wxPropertyGridIterator& other )
-    {
-        Assign(other);
-    }
-
-    /**
-        Additional assignment operator.
-    */
-    const wxPropertyGridConstIterator& operator=( const wxPropertyGridIterator& it )
-    {
-        Assign(it);
-        return *this;
-    }
-
-protected:
-};
-
-// -----------------------------------------------------------------------
-
-/** Base class to derive new viterators.
-*/
-class WXDLLIMPEXP_PROPGRID wxPGVIteratorBase : public wxObjectRefData
-{
-    friend class wxPGVIterator;
-public:
-    wxPGVIteratorBase() { }
-    virtual void Next() = 0;
-protected:
-    virtual ~wxPGVIteratorBase() { }
-
-    wxPropertyGridIterator  m_it;
-};
-
-/** @class wxPGVIterator
-
-    Abstract implementation of a simple iterator. Can only be used
-    to iterate in forward order, and only through the entire container.
-    Used to have functions dealing with all properties work with both
-    wxPropertyGrid and wxPropertyGridManager.
-*/
-class WXDLLIMPEXP_PROPGRID wxPGVIterator
-{
-public:
-    wxPGVIterator() { m_pIt = NULL; }
-    wxPGVIterator( wxPGVIteratorBase* obj ) { m_pIt = obj; }
-    ~wxPGVIterator() { UnRef(); }
-    void UnRef() { if (m_pIt) m_pIt->DecRef(); }
-    wxPGVIterator( const wxPGVIterator& it )
-    {
-        m_pIt = it.m_pIt;
-        m_pIt->IncRef();
-    }
-    const wxPGVIterator& operator=( const wxPGVIterator& it )
-    {
-        if (this != &it)
-        {
-            UnRef();
-            m_pIt = it.m_pIt;
-            m_pIt->IncRef();
-        }
-        return *this;
-    }
-    void Next() { m_pIt->Next(); }
-    bool AtEnd() const { return m_pIt->m_it.AtEnd(); }
-    wxPGProperty* GetProperty() const { return m_pIt->m_it.GetProperty(); }
-protected:
-    wxPGVIteratorBase*  m_pIt;
-};
-
-// -----------------------------------------------------------------------
-
-/** @class wxPropertyGridPageState
-
-    Contains low-level property page information (properties, column widths,
-    etc) of a single wxPropertyGrid or single wxPropertyGridPage. Generally you
-    should not use this class directly, but instead member functions in
-    wxPropertyGridInterface, wxPropertyGrid, wxPropertyGridPage, and
-    wxPropertyGridManager.
-
-    @remarks
-    - In separate wxPropertyGrid component this class was known as
-    wxPropertyGridState.
-    - Currently this class is not implemented in wxPython.
-
-    @library{wxpropgrid}
-    @category{propgrid}
-*/
-class WXDLLIMPEXP_PROPGRID wxPropertyGridPageState
-{
-    friend class wxPGProperty;
-    friend class wxPropertyGrid;
-    friend class wxPGCanvas;
-    friend class wxPropertyGridInterface;
-    friend class wxPropertyGridPage;
-    friend class wxPropertyGridManager;
-public:
-
-    /** Default constructor. */
-    wxPropertyGridPageState();
-
-    /** Destructor. */
-    virtual ~wxPropertyGridPageState();
-
-    /** Makes sure all columns have minimum width.
-    */
-    void CheckColumnWidths( int widthChange = 0 );
-
-    /**
-        Override this member function to add custom behaviour on property
-        deletion.
-    */
-    virtual void DoDelete( wxPGProperty* item, bool doDelete = true );
-
-    wxSize DoFitColumns( bool allowGridResize = false );
-
-    wxPGProperty* DoGetItemAtY( int y ) const;
-
-    /**
-        Override this member function to add custom behaviour on property
-        insertion.
-    */
-    virtual wxPGProperty* DoInsert( wxPGProperty* parent,
-                                    int index,
-                                    wxPGProperty* property );
-
-    /**
-        This needs to be overridden in grid used the manager so that splitter
-        changes can be propagated to other pages.
-    */
-    virtual void DoSetSplitterPosition( int pos,
-                                        int splitterColumn = 0,
-                                        int flags = 0 );
-
-    bool EnableCategories( bool enable );
-
-    /** Make sure virtual height is up-to-date.
-    */
-    void EnsureVirtualHeight()
-    {
-        if ( m_vhCalcPending )
-        {
-            RecalculateVirtualHeight();
-            m_vhCalcPending = 0;
-        }
-    }
-
-    /** Returns (precalculated) height of contained visible properties.
-    */
-    unsigned int GetVirtualHeight() const
-    {
-        wxASSERT( !m_vhCalcPending );
-        return m_virtualHeight;
-    }
-
-    /** Returns (precalculated) height of contained visible properties.
-    */
-    unsigned int GetVirtualHeight()
-    {
-        EnsureVirtualHeight();
-        return m_virtualHeight;
-    }
-
-    /** Returns actual height of contained visible properties.
-        @remarks
-        Mostly used for internal diagnostic purposes.
-    */
-    inline unsigned int GetActualVirtualHeight() const;
-
-    unsigned int GetColumnCount() const
-    {
-        return (unsigned int) m_colWidths.size();
-    }
-
-    int GetColumnMinWidth( int column ) const;
-
-    int GetColumnWidth( unsigned int column ) const
-    {
-        return m_colWidths[column];
-    }
-
-    wxPropertyGrid* GetGrid() const { return m_pPropGrid; }
-
-    /** Returns last item which could be iterated using given flags.
-        @param flags
-        @link iteratorflags List of iterator flags@endlink
-    */
-    wxPGProperty* GetLastItem( int flags = wxPG_ITERATE_DEFAULT );
-
-    const wxPGProperty* GetLastItem( int flags = wxPG_ITERATE_DEFAULT ) const
-    {
-        return ((wxPropertyGridPageState*)this)->GetLastItem(flags);
-    }
-
-    /**
-        Returns currently selected property.
-    */
-    wxPGProperty* GetSelection() const
-    {
-        if ( m_selection.size() == 0 )
-            return NULL;
-        return m_selection[0];
-    }
-
-    void DoSetSelection( wxPGProperty* prop )
-    {
-        m_selection.clear();
-        if ( prop )
-            m_selection.push_back(prop);
-    }
-
-    bool DoClearSelection()
-    {
-        return DoSelectProperty(NULL);
-    }
-
-    void DoRemoveFromSelection( wxPGProperty* prop );
-
-    void DoSetColumnProportion( unsigned int column, int proportion );
-
-    int DoGetColumnProportion( unsigned int column ) const
-    {
-        return m_columnProportions[column];
-    }
-
-    void ResetColumnSizes( int setSplitterFlags );
-
-    wxPropertyCategory* GetPropertyCategory( const wxPGProperty* p ) const;
-
-    wxPGProperty* GetPropertyByLabel( const wxString& name,
-                                      wxPGProperty* parent = NULL ) const;
-
-    wxVariant DoGetPropertyValues( const wxString& listname,
-                                   wxPGProperty* baseparent,
-                                   long flags ) const;
-
-    wxPGProperty* DoGetRoot() const { return m_properties; }
-
-    void DoSetPropertyName( wxPGProperty* p, const wxString& newName );
-
-    // Returns combined width of margin and all the columns
-    int GetVirtualWidth() const
-    {
-        return m_width;
-    }
-
-    /**
-        Returns minimal width for given column so that all images and texts
-        will fit entirely.
-
-        Used by SetSplitterLeft() and DoFitColumns().
-    */
-    int GetColumnFitWidth(wxClientDC& dc,
-                          wxPGProperty* pwc,
-                          unsigned int col,
-                          bool subProps) const;
-
-    int GetColumnFullWidth(wxClientDC &dc, wxPGProperty *p, unsigned int col);
-
-    /**
-        Returns information about arbitrary position in the grid.
-
-        @param pt
-            Logical coordinates in the virtual grid space. Use
-            wxScrolled<T>::CalcUnscrolledPosition() if you need to
-            translate a scrolled position into a logical one.
-    */
-    wxPropertyGridHitTestResult HitTest( const wxPoint& pt ) const;
-
-    /** Returns true if page is visibly displayed.
-    */
-    inline bool IsDisplayed() const;
-
-    bool IsInNonCatMode() const { return (bool)(m_properties == m_abcArray); }
-
-    void DoLimitPropertyEditing( wxPGProperty* p, bool limit = true )
-    {
-        p->SetFlagRecursively(wxPG_PROP_NOEDITOR, limit);
-    }
-
-    bool DoSelectProperty( wxPGProperty* p, unsigned int flags = 0 );
-
-    /** widthChange is non-client.
-    */
-    void OnClientWidthChange( int newWidth,
-                              int widthChange,
-                              bool fromOnResize = false );
-
-    /** Recalculates m_virtualHeight.
-    */
-    void RecalculateVirtualHeight()
-    {
-        m_virtualHeight = GetActualVirtualHeight();
-    }
-
-    void SetColumnCount( int colCount );
-
-    void PropagateColSizeDec( int column, int decrease, int dir );
-
-    bool DoHideProperty( wxPGProperty* p, bool hide, int flags = wxPG_RECURSE );
-
-    bool DoSetPropertyValueString( wxPGProperty* p, const wxString& value );
-
-    bool DoSetPropertyValue( wxPGProperty* p, wxVariant& value );
-
-    bool DoSetPropertyValueWxObjectPtr( wxPGProperty* p, wxObject* value );
-    void DoSetPropertyValues( const wxVariantList& list,
-                              wxPGProperty* default_category );
-
-    void SetSplitterLeft( bool subProps = false );
-
-    /** Set virtual width for this particular page. */
-    void SetVirtualWidth( int width );
-
-    void DoSortChildren( wxPGProperty* p, int flags = 0 );
-    void DoSort( int flags = 0 );
-
-    bool PrepareAfterItemsAdded();
-
-    /** Called after virtual height needs to be recalculated.
-    */
-    void VirtualHeightChanged()
-    {
-        m_vhCalcPending = 1;
-    }
-
-    /** Base append. */
-    wxPGProperty* DoAppend( wxPGProperty* property );
-
-    /** Returns property by its name. */
-    wxPGProperty* BaseGetPropertyByName( const wxString& name ) const;
-
-    /** Called in, for example, wxPropertyGrid::Clear. */
-    void DoClear();
-
-    bool DoIsPropertySelected( wxPGProperty* prop ) const;
-
-    bool DoCollapse( wxPGProperty* p );
-
-    bool DoExpand( wxPGProperty* p );
-
-    void CalculateFontAndBitmapStuff( int vspacing );
-
-protected:
-
-    // Utility to check if two properties are visibly next to each other
-    bool ArePropertiesAdjacent( wxPGProperty* prop1,
-                                wxPGProperty* prop2,
-                                int iterFlags = wxPG_ITERATE_VISIBLE ) const;
-
-    int DoGetSplitterPosition( int splitterIndex = 0 ) const;
-
-    /** Returns column at x coordinate (in GetGrid()->GetPanel()).
-        @param pSplitterHit
-        Give pointer to int that receives index to splitter that is at x.
-        @param pSplitterHitOffset
-        Distance from said splitter.
-    */
-    int HitTestH( int x, int* pSplitterHit, int* pSplitterHitOffset ) const;
-
-    bool PrepareToAddItem( wxPGProperty* property,
-                           wxPGProperty* scheduledParent );
-
-    /** If visible, then this is pointer to wxPropertyGrid.
-        This shall *never* be NULL to indicate that this state is not visible.
-    */
-    wxPropertyGrid*             m_pPropGrid;
-
-    /** Pointer to currently used array. */
-    wxPGProperty*               m_properties;
-
-    /** Array for categoric mode. */
-    wxPGRootProperty            m_regularArray;
-
-    /** Array for root of non-categoric mode. */
-    wxPGRootProperty*           m_abcArray;
-
-    /** Dictionary for name-based access. */
-    wxPGHashMapS2P              m_dictName;
-
-    /** List of column widths (first column does not include margin). */
-    wxArrayInt                  m_colWidths;
-
-    /** List of indices of columns the user can edit by clicking it. */
-    wxArrayInt                  m_editableColumns;
-
-    /** Column proportions */
-    wxArrayInt                  m_columnProportions;
-
-    double                      m_fSplitterX;
-
-    /** Most recently added category. */
-    wxPropertyCategory*         m_currentCategory;
-
-    /** Array of selected property. */
-    wxArrayPGProperty           m_selection;
-
-    /** Virtual width. */
-    int                         m_width;
-
-    /** Indicates total virtual height of visible properties. */
-    unsigned int                m_virtualHeight;
-
-    /** 1 if m_lastCaption is also the bottommost caption. */
-    unsigned char               m_lastCaptionBottomnest;
-
-    /** 1 items appended/inserted, so stuff needs to be done before drawing;
-        If m_virtualHeight == 0, then calcylatey's must be done.
-        Otherwise just sort.
-    */
-    unsigned char               m_itemsAdded;
-
-    /** 1 if any value is modified. */
-    unsigned char               m_anyModified;
-
-    unsigned char               m_vhCalcPending;
-
-    /** True if splitter has been pre-set by the application. */
-    bool                        m_isSplitterPreSet;
-
-    /** Used to (temporarily) disable splitter centering. */
-    bool                        m_dontCenterSplitter;
-
-private:
-    /** Only inits arrays, doesn't migrate things or such. */
-    void InitNonCatMode();
-};
-
-// -----------------------------------------------------------------------
-
-#endif // wxUSE_PROPGRID
-
-#endif // _WX_PROPGRID_PROPGRIDPAGESTATE_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/props.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/props.h
deleted file mode 100644
index ea902d13e6..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/propgrid/props.h
+++ /dev/null
@@ -1,1029 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/propgrid/props.h
-// Purpose:     wxPropertyGrid Property Classes
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     2007-03-28
-// Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PROPGRID_PROPS_H_
-#define _WX_PROPGRID_PROPS_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_PROPGRID
-
-// -----------------------------------------------------------------------
-
-class wxPGArrayEditorDialog;
-
-#include "wx/propgrid/editors.h"
-
-#include "wx/filename.h"
-#include "wx/dialog.h"
-#include "wx/textctrl.h"
-#include "wx/button.h"
-#include "wx/listbox.h"
-#include "wx/valtext.h"
-
-// -----------------------------------------------------------------------
-
-//
-// Property class implementation helper macros.
-//
-
-#define WX_PG_IMPLEMENT_PROPERTY_CLASS(NAME, UPCLASS, T, T_AS_ARG, EDITOR) \
-IMPLEMENT_DYNAMIC_CLASS(NAME, UPCLASS) \
-WX_PG_IMPLEMENT_PROPERTY_CLASS_PLAIN(NAME, T, EDITOR)
-
-// -----------------------------------------------------------------------
-
-//
-// These macros help creating DoGetValidator
-#define WX_PG_DOGETVALIDATOR_ENTRY() \
-    static wxValidator* s_ptr = NULL; \
-    if ( s_ptr ) return s_ptr;
-
-// Common function exit
-#define WX_PG_DOGETVALIDATOR_EXIT(VALIDATOR) \
-    s_ptr = VALIDATOR; \
-    wxPGGlobalVars->m_arrValidators.push_back( VALIDATOR ); \
-    return VALIDATOR;
-
-// -----------------------------------------------------------------------
-
-/** @class wxPGInDialogValidator
-    @ingroup classes
-    Creates and manages a temporary wxTextCtrl for validation purposes.
-    Uses wxPropertyGrid's current editor, if available.
-*/
-class WXDLLIMPEXP_PROPGRID wxPGInDialogValidator
-{
-public:
-    wxPGInDialogValidator()
-    {
-        m_textCtrl = NULL;
-    }
-
-    ~wxPGInDialogValidator()
-    {
-        if ( m_textCtrl )
-            m_textCtrl->Destroy();
-    }
-
-    bool DoValidate( wxPropertyGrid* propGrid,
-                     wxValidator* validator,
-                     const wxString& value );
-
-private:
-    wxTextCtrl*         m_textCtrl;
-};
-
-
-// -----------------------------------------------------------------------
-// Property classes
-// -----------------------------------------------------------------------
-
-#define wxPG_PROP_PASSWORD  wxPG_PROP_CLASS_SPECIFIC_2
-
-/** @class wxStringProperty
-    @ingroup classes
-    Basic property with string value.
-
-    <b>Supported special attributes:</b>
-    - "Password": set to 1 in order to enable wxTE_PASSWORD on the editor.
-
-    @remarks
-    - If value "<composed>" is set, then actual value is formed (or composed)
-      from values of child properties.
-*/
-class WXDLLIMPEXP_PROPGRID wxStringProperty : public wxPGProperty
-{
-    WX_PG_DECLARE_PROPERTY_CLASS(wxStringProperty)
-public:
-    wxStringProperty( const wxString& label = wxPG_LABEL,
-                      const wxString& name = wxPG_LABEL,
-                      const wxString& value = wxEmptyString );
-    virtual ~wxStringProperty();
-
-    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
-    virtual bool StringToValue( wxVariant& variant,
-                                const wxString& text,
-                                int argFlags = 0 ) const;
-
-    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
-
-    /** This is updated so "<composed>" special value can be handled.
-    */
-    virtual void OnSetValue();
-
-protected:
-};
-
-// -----------------------------------------------------------------------
-
-/** Constants used with NumericValidation<>().
-*/
-enum wxPGNumericValidationConstants
-{
-    /** Instead of modifying the value, show an error message.
-    */
-    wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE      = 0,
-
-    /** Modify value, but stick with the limitations.
-    */
-    wxPG_PROPERTY_VALIDATION_SATURATE           = 1,
-
-    /** Modify value, wrap around on overflow.
-    */
-    wxPG_PROPERTY_VALIDATION_WRAP               = 2
-};
-
-// -----------------------------------------------------------------------
-
-#if wxUSE_VALIDATORS
-
-/**
-    A more comprehensive numeric validator class.
-*/
-class WXDLLIMPEXP_PROPGRID wxNumericPropertyValidator : public wxTextValidator
-{
-public:
-    enum NumericType
-    {
-        Signed = 0,
-        Unsigned,
-        Float
-    };
-
-    wxNumericPropertyValidator( NumericType numericType, int base = 10 );
-    virtual ~wxNumericPropertyValidator() { }
-    virtual bool Validate(wxWindow* parent);
-};
-
-#endif // wxUSE_VALIDATORS
-
-
-/** @class wxIntProperty
-    @ingroup classes
-    Basic property with integer value.
-
-    Seamlessly supports 64-bit integer (wxLongLong) on overflow.
-
-    <b>Example how to use seamless 64-bit integer support</b>
-
-      Getting value:
-
-      @code
-          wxLongLong_t value = pg->GetPropertyValueAsLongLong();
-      @endcode
-
-         or
-
-      @code
-          wxLongLong_t value;
-          wxVariant variant = property->GetValue();
-          if ( variant.GetType() == "wxLongLong" )
-              value = wxLongLongFromVariant(variant);
-          else
-              value = variant.GetLong();
-      @endcode
-
-      Setting value:
-
-       @code
-          pg->SetPropertyValue(longLongVal);
-      @endcode
-
-         or
-
-      @code
-          property->SetValue(WXVARIANT(longLongVal));
-      @endcode
-
-
-    <b>Supported special attributes:</b>
-    - "Min", "Max": Specify acceptable value range.
-*/
-class WXDLLIMPEXP_PROPGRID wxIntProperty : public wxPGProperty
-{
-    WX_PG_DECLARE_PROPERTY_CLASS(wxIntProperty)
-public:
-    wxIntProperty( const wxString& label = wxPG_LABEL,
-                   const wxString& name = wxPG_LABEL,
-                   long value = 0 );
-    virtual ~wxIntProperty();
-
-    wxIntProperty( const wxString& label,
-                   const wxString& name,
-                   const wxLongLong& value );
-    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
-    virtual bool StringToValue( wxVariant& variant,
-                                const wxString& text,
-                                int argFlags = 0 ) const;
-    virtual bool ValidateValue( wxVariant& value,
-                                wxPGValidationInfo& validationInfo ) const;
-    virtual bool IntToValue( wxVariant& variant,
-                             int number,
-                             int argFlags = 0 ) const;
-    static wxValidator* GetClassValidator();
-    virtual wxValidator* DoGetValidator() const;
-
-    /** Validation helper.
-    */
-    static bool DoValidation( const wxPGProperty* property,
-                              wxLongLong_t& value,
-                              wxPGValidationInfo* pValidationInfo,
-                              int mode =
-                                wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE );
-
-protected:
-};
-
-// -----------------------------------------------------------------------
-
-/** @class wxUIntProperty
-    @ingroup classes
-    Basic property with unsigned integer value.
-    Seamlessly supports 64-bit integer (wxULongLong) on overflow.
-
-    <b>Supported special attributes:</b>
-    - "Min", "Max": Specify acceptable value range.
-    - "Base": Define base. Valid constants are wxPG_BASE_OCT, wxPG_BASE_DEC,
-    wxPG_BASE_HEX and wxPG_BASE_HEXL (lowercase characters). Arbitrary bases
-    are <b>not</b> supported.
-    - "Prefix": Possible values are wxPG_PREFIX_NONE, wxPG_PREFIX_0x, and
-    wxPG_PREFIX_DOLLAR_SIGN. Only wxPG_PREFIX_NONE works with Decimal and Octal
-    numbers.
-
-    @remarks
-    - For example how to use seamless 64-bit integer support, see wxIntProperty
-    documentation (just use wxULongLong instead of wxLongLong).
-*/
-class WXDLLIMPEXP_PROPGRID wxUIntProperty : public wxPGProperty
-{
-    WX_PG_DECLARE_PROPERTY_CLASS(wxUIntProperty)
-public:
-    wxUIntProperty( const wxString& label = wxPG_LABEL,
-                    const wxString& name = wxPG_LABEL,
-                    unsigned long value = 0 );
-    virtual ~wxUIntProperty();
-    wxUIntProperty( const wxString& label,
-                    const wxString& name,
-                    const wxULongLong& value );
-    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
-    virtual bool StringToValue( wxVariant& variant,
-                                const wxString& text,
-                                int argFlags = 0 ) const;
-    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
-    virtual bool ValidateValue( wxVariant& value,
-                                wxPGValidationInfo& validationInfo ) const;
-    virtual wxValidator* DoGetValidator () const;
-    virtual bool IntToValue( wxVariant& variant,
-                             int number,
-                             int argFlags = 0 ) const;
-protected:
-    wxByte      m_base;
-    wxByte      m_realBase; // translated to 8,16,etc.
-    wxByte      m_prefix;
-private:
-    void Init();
-};
-
-// -----------------------------------------------------------------------
-
-/** @class wxFloatProperty
-    @ingroup classes
-    Basic property with double-precision floating point value.
-
-    <b>Supported special attributes:</b>
-    - "Precision": Sets the (max) precision used when floating point value is
-    rendered as text. The default -1 means infinite precision.
-*/
-class WXDLLIMPEXP_PROPGRID wxFloatProperty : public wxPGProperty
-{
-    WX_PG_DECLARE_PROPERTY_CLASS(wxFloatProperty)
-public:
-    wxFloatProperty( const wxString& label = wxPG_LABEL,
-                     const wxString& name = wxPG_LABEL,
-                     double value = 0.0 );
-    virtual ~wxFloatProperty();
-
-    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
-    virtual bool StringToValue( wxVariant& variant,
-                                const wxString& text,
-                                int argFlags = 0 ) const;
-    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
-    virtual bool ValidateValue( wxVariant& value,
-                                wxPGValidationInfo& validationInfo ) const;
-
-    /** Validation helper.
-    */
-    static bool DoValidation( const wxPGProperty* property,
-                              double& value,
-                              wxPGValidationInfo* pValidationInfo,
-                              int mode =
-                                 wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE );
-    static wxValidator* GetClassValidator();
-    virtual wxValidator* DoGetValidator () const;
-
-protected:
-    int m_precision;
-};
-
-// -----------------------------------------------------------------------
-
-/** @class wxBoolProperty
-    @ingroup classes
-    Basic property with boolean value.
-
-    <b>Supported special attributes:</b>
-    - "UseCheckbox": Set to 1 to use check box editor instead of combo box.
-    - "UseDClickCycling": Set to 1 to cycle combo box instead showing the list.
-*/
-class WXDLLIMPEXP_PROPGRID wxBoolProperty : public wxPGProperty
-{
-    WX_PG_DECLARE_PROPERTY_CLASS(wxBoolProperty)
-public:
-    wxBoolProperty( const wxString& label = wxPG_LABEL,
-                    const wxString& name = wxPG_LABEL,
-                    bool value = false );
-    virtual ~wxBoolProperty();
-
-    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
-    virtual bool StringToValue( wxVariant& variant,
-                                const wxString& text,
-                                int argFlags = 0 ) const;
-    virtual bool IntToValue( wxVariant& variant,
-                             int number, int argFlags = 0 ) const;
-    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
-};
-
-// -----------------------------------------------------------------------
-
-// If set, then selection of choices is static and should not be
-// changed (i.e. returns NULL in GetPropertyChoices).
-#define wxPG_PROP_STATIC_CHOICES    wxPG_PROP_CLASS_SPECIFIC_1
-
-/** @class wxEnumProperty
-    @ingroup classes
-    You can derive custom properties with choices from this class. See
-    wxBaseEnumProperty for remarks.
-
-    @remarks
-    - Updating private index is important. You can do this either by calling
-    SetIndex() in IntToValue, and then letting wxBaseEnumProperty::OnSetValue
-    be called (by not implementing it, or by calling super class function in
-    it) -OR- you can just call SetIndex in OnSetValue.
-*/
-class WXDLLIMPEXP_PROPGRID wxEnumProperty : public wxPGProperty
-{
-    WX_PG_DECLARE_PROPERTY_CLASS(wxEnumProperty)
-public:
-
-#ifndef SWIG
-    wxEnumProperty( const wxString& label = wxPG_LABEL,
-                    const wxString& name = wxPG_LABEL,
-                    const wxChar* const* labels = NULL,
-                    const long* values = NULL,
-                    int value = 0 );
-    wxEnumProperty( const wxString& label,
-                    const wxString& name,
-                    wxPGChoices& choices,
-                    int value = 0 );
-
-    // Special constructor for caching choices (used by derived class)
-    wxEnumProperty( const wxString& label,
-                    const wxString& name,
-                    const wxChar* const* labels,
-                    const long* values,
-                    wxPGChoices* choicesCache,
-                    int value = 0 );
-
-    wxEnumProperty( const wxString& label,
-                    const wxString& name,
-                    const wxArrayString& labels,
-                    const wxArrayInt& values = wxArrayInt(),
-                    int value = 0 );
-#else
-    wxEnumProperty( const wxString& label = wxPG_LABEL,
-                    const wxString& name = wxPG_LABEL,
-                    const wxArrayString& labels = wxArrayString(),
-                    const wxArrayInt& values = wxArrayInt(),
-                    int value = 0 );
-#endif
-
-    virtual ~wxEnumProperty();
-
-    size_t GetItemCount() const { return m_choices.GetCount(); }
-
-    virtual void OnSetValue();
-    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
-    virtual bool StringToValue( wxVariant& variant,
-                                const wxString& text,
-                                int argFlags = 0 ) const;
-    virtual bool ValidateValue( wxVariant& value,
-                                wxPGValidationInfo& validationInfo ) const;
-
-    // If wxPG_FULL_VALUE is not set in flags, then the value is interpreted
-    // as index to choices list. Otherwise, it is actual value.
-    virtual bool IntToValue( wxVariant& variant,
-                             int number,
-                             int argFlags = 0 ) const;
-
-    //
-    // Additional virtuals
-
-    // This must be overridden to have non-index based value
-    virtual int GetIndexForValue( int value ) const;
-
-    // GetChoiceSelection needs to overridden since m_index is
-    // the true index, and various property classes derived from
-    // this take advantage of it.
-    virtual int GetChoiceSelection() const { return m_index; }
-
-    virtual void OnValidationFailure( wxVariant& pendingValue );
-
-protected:
-
-    int GetIndex() const;
-    void SetIndex( int index );
-
-    bool ValueFromString_( wxVariant& value,
-                           const wxString& text,
-                           int argFlags ) const;
-    bool ValueFromInt_( wxVariant& value, int intVal, int argFlags ) const;
-
-    static void ResetNextIndex() { ms_nextIndex = -2; }
-
-private:
-    // This is private so that classes are guaranteed to use GetIndex
-    // for up-to-date index value.
-    int                     m_index;
-
-    // Relies on ValidateValue being called always before OnSetValue
-    static int              ms_nextIndex;
-};
-
-// -----------------------------------------------------------------------
-
-/** @class wxEditEnumProperty
-    @ingroup classes
-    wxEnumProperty with wxString value and writable combo box editor.
-
-    @remarks
-    Uses int value, similar to wxEnumProperty, unless text entered by user is
-    is not in choices (in which case string value is used).
-*/
-class WXDLLIMPEXP_PROPGRID wxEditEnumProperty : public wxEnumProperty
-{
-    WX_PG_DECLARE_PROPERTY_CLASS(wxEditEnumProperty)
-public:
-
-    wxEditEnumProperty( const wxString& label,
-                        const wxString& name,
-                        const wxChar* const* labels,
-                        const long* values,
-                        const wxString& value );
-    wxEditEnumProperty( const wxString& label = wxPG_LABEL,
-                        const wxString& name = wxPG_LABEL,
-                        const wxArrayString& labels = wxArrayString(),
-                        const wxArrayInt& values = wxArrayInt(),
-                        const wxString& value = wxEmptyString );
-    wxEditEnumProperty( const wxString& label,
-                        const wxString& name,
-                        wxPGChoices& choices,
-                        const wxString& value = wxEmptyString );
-
-    // Special constructor for caching choices (used by derived class)
-    wxEditEnumProperty( const wxString& label,
-                        const wxString& name,
-                        const wxChar* const* labels,
-                        const long* values,
-                        wxPGChoices* choicesCache,
-                        const wxString& value );
-
-    virtual ~wxEditEnumProperty();
-
-protected:
-};
-
-// -----------------------------------------------------------------------
-
-/** @class wxFlagsProperty
-    @ingroup classes
-    Represents a bit set that fits in a long integer. wxBoolProperty
-    sub-properties are created for editing individual bits. Textctrl is created
-    to manually edit the flags as a text; a continuous sequence of spaces,
-    commas and semicolons is considered as a flag id separator.
-    <b>Note:</b> When changing "choices" (ie. flag labels) of wxFlagsProperty,
-    you will need to use SetPropertyChoices - otherwise they will not get
-    updated properly.
-*/
-class WXDLLIMPEXP_PROPGRID wxFlagsProperty : public wxPGProperty
-{
-    WX_PG_DECLARE_PROPERTY_CLASS(wxFlagsProperty)
-public:
-
-#ifndef SWIG
-    wxFlagsProperty( const wxString& label,
-                     const wxString& name,
-                     const wxChar* const* labels,
-                     const long* values = NULL,
-                     long value = 0 );
-    wxFlagsProperty( const wxString& label,
-                     const wxString& name,
-                     wxPGChoices& choices,
-                     long value = 0 );
-#endif
-    wxFlagsProperty( const wxString& label = wxPG_LABEL,
-                     const wxString& name = wxPG_LABEL,
-                     const wxArrayString& labels = wxArrayString(),
-                     const wxArrayInt& values = wxArrayInt(),
-                     int value = 0 );
-    virtual ~wxFlagsProperty ();
-
-    virtual void OnSetValue();
-    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
-    virtual bool StringToValue( wxVariant& variant,
-                                const wxString& text,
-                                int flags ) const;
-    virtual wxVariant ChildChanged( wxVariant& thisValue,
-                                    int childIndex,
-                                    wxVariant& childValue ) const;
-    virtual void RefreshChildren();
-    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
-
-    // GetChoiceSelection needs to overridden since m_choices is
-    // used and value is integer, but it is not index.
-    virtual int GetChoiceSelection() const { return wxNOT_FOUND; }
-
-    // helpers
-    size_t GetItemCount() const { return m_choices.GetCount(); }
-    const wxString& GetLabel( size_t ind ) const
-        { return m_choices.GetLabel(static_cast<int>(ind)); }
-
-protected:
-    // Used to detect if choices have been changed
-    wxPGChoicesData*        m_oldChoicesData;
-
-    // Needed to properly mark changed sub-properties
-    long                    m_oldValue;
-
-    // Converts string id to a relevant bit.
-    long IdToBit( const wxString& id ) const;
-
-    // Creates children and sets value.
-    void Init();
-};
-
-// -----------------------------------------------------------------------
-
-/** @class wxPGFileDialogAdapter
-    @ingroup classes
-*/
-class WXDLLIMPEXP_PROPGRID
-    wxPGFileDialogAdapter : public wxPGEditorDialogAdapter
-{
-public:
-    virtual bool DoShowDialog( wxPropertyGrid* propGrid,
-                               wxPGProperty* property );
-};
-
-// -----------------------------------------------------------------------
-
-// Indicates first bit useable by derived properties.
-#define wxPG_PROP_SHOW_FULL_FILENAME  wxPG_PROP_CLASS_SPECIFIC_1
-
-/** @class wxFileProperty
-    @ingroup classes
-    Like wxLongStringProperty, but the button triggers file selector instead.
-
-    <b>Supported special attributes:</b>
-    - "Wildcard": Sets wildcard (see wxFileDialog for format details), "All
-    files..." is default.
-    - "ShowFullPath": Default 1. When 0, only the file name is shown (i.e. drive
-      and directory are hidden).
-    - "ShowRelativePath": If set, then the filename is shown relative to the
-    given path string.
-    - "InitialPath": Sets the initial path of where to look for files.
-    - "DialogTitle": Sets a specific title for the dir dialog.
-*/
-class WXDLLIMPEXP_PROPGRID wxFileProperty : public wxPGProperty
-{
-    friend class wxPGFileDialogAdapter;
-    WX_PG_DECLARE_PROPERTY_CLASS(wxFileProperty)
-public:
-
-    wxFileProperty( const wxString& label = wxPG_LABEL,
-                    const wxString& name = wxPG_LABEL,
-                    const wxString& value = wxEmptyString );
-    virtual ~wxFileProperty ();
-
-    virtual void OnSetValue();
-    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
-    virtual bool StringToValue( wxVariant& variant,
-                                const wxString& text,
-                                int argFlags = 0 ) const;
-    virtual wxPGEditorDialogAdapter* GetEditorDialog() const;
-    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
-
-    static wxValidator* GetClassValidator();
-    virtual wxValidator* DoGetValidator() const;
-
-    /**
-        Returns filename to file represented by current value.
-    */
-    wxFileName GetFileName() const;
-
-protected:
-    wxString    m_wildcard;
-    wxString    m_basePath; // If set, then show path relative to it
-    wxString    m_initialPath; // If set, start the file dialog here
-    wxString    m_dlgTitle; // If set, used as title for file dialog
-    int         m_indFilter; // index to the selected filter
-};
-
-// -----------------------------------------------------------------------
-
-#define wxPG_PROP_NO_ESCAPE     wxPG_PROP_CLASS_SPECIFIC_1
-
-
-/** @class wxPGLongStringDialogAdapter
-    @ingroup classes
-*/
-class WXDLLIMPEXP_PROPGRID
-    wxPGLongStringDialogAdapter : public wxPGEditorDialogAdapter
-{
-public:
-    virtual bool DoShowDialog( wxPropertyGrid* propGrid,
-                               wxPGProperty* property );
-};
-
-
-/** @class wxLongStringProperty
-    @ingroup classes
-    Like wxStringProperty, but has a button that triggers a small text
-    editor dialog.
-*/
-class WXDLLIMPEXP_PROPGRID wxLongStringProperty : public wxPGProperty
-{
-    WX_PG_DECLARE_PROPERTY_CLASS(wxLongStringProperty)
-public:
-
-    wxLongStringProperty( const wxString& label = wxPG_LABEL,
-                          const wxString& name = wxPG_LABEL,
-                          const wxString& value = wxEmptyString );
-    virtual ~wxLongStringProperty();
-
-    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
-    virtual bool StringToValue( wxVariant& variant,
-                                const wxString& text,
-                                int argFlags = 0 ) const;
-    virtual bool OnEvent( wxPropertyGrid* propgrid,
-                          wxWindow* primary, wxEvent& event );
-
-    // Shows string editor dialog. Value to be edited should be read from
-    // value, and if dialog is not cancelled, it should be stored back and true
-    // should be returned if that was the case.
-    virtual bool OnButtonClick( wxPropertyGrid* propgrid, wxString& value );
-
-    static bool DisplayEditorDialog( wxPGProperty* prop,
-                                     wxPropertyGrid* propGrid,
-                                     wxString& value );
-
-protected:
-};
-
-// -----------------------------------------------------------------------
-
-
-/** @class wxDirProperty
-    @ingroup classes
-    Like wxLongStringProperty, but the button triggers dir selector instead.
-
-    <b>Supported special attributes:</b>
-    - "DialogMessage": Sets specific message in the dir selector.
-*/
-class WXDLLIMPEXP_PROPGRID wxDirProperty : public wxLongStringProperty
-{
-    DECLARE_DYNAMIC_CLASS(wxDirProperty)
-public:
-    wxDirProperty( const wxString& name = wxPG_LABEL,
-                   const wxString& label = wxPG_LABEL,
-                   const wxString& value = wxEmptyString );
-    virtual ~wxDirProperty();
-
-    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
-    virtual wxValidator* DoGetValidator() const;
-
-    virtual bool OnButtonClick ( wxPropertyGrid* propGrid, wxString& value );
-
-protected:
-    wxString    m_dlgMessage;
-};
-
-// -----------------------------------------------------------------------
-
-// wxBoolProperty specific flags
-#define wxPG_PROP_USE_CHECKBOX      wxPG_PROP_CLASS_SPECIFIC_1
-// DCC = Double Click Cycles
-#define wxPG_PROP_USE_DCC           wxPG_PROP_CLASS_SPECIFIC_2
-
-
-// -----------------------------------------------------------------------
-
-/** @class wxArrayStringProperty
-    @ingroup classes
-    Property that manages a list of strings.
-*/
-class WXDLLIMPEXP_PROPGRID wxArrayStringProperty : public wxPGProperty
-{
-    WX_PG_DECLARE_PROPERTY_CLASS(wxArrayStringProperty)
-public:
-    wxArrayStringProperty( const wxString& label = wxPG_LABEL,
-                           const wxString& name = wxPG_LABEL,
-                           const wxArrayString& value = wxArrayString() );
-    virtual ~wxArrayStringProperty();
-
-    virtual void OnSetValue();
-    virtual wxString ValueToString( wxVariant& value, int argFlags = 0 ) const;
-    virtual bool StringToValue( wxVariant& variant,
-                                const wxString& text,
-                                int argFlags = 0 ) const;
-    virtual bool OnEvent( wxPropertyGrid* propgrid,
-                          wxWindow* primary, wxEvent& event );
-    virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
-
-    // Implement in derived class for custom array-to-string conversion.
-    virtual void ConvertArrayToString(const wxArrayString& arr,
-                                      wxString* pString,
-                                      const wxUniChar& delimiter) const;
-
-    // Shows string editor dialog. Value to be edited should be read from
-    // value, and if dialog is not cancelled, it should be stored back and true
-    // should be returned if that was the case.
-    virtual bool OnCustomStringEdit( wxWindow* parent, wxString& value );
-
-    // Helper.
-    virtual bool OnButtonClick( wxPropertyGrid* propgrid,
-                                wxWindow* primary,
-                                const wxChar* cbt );
-
-    // Creates wxPGArrayEditorDialog for string editing. Called in OnButtonClick.
-    virtual wxPGArrayEditorDialog* CreateEditorDialog();
-
-    enum ConversionFlags
-    {
-        Escape          = 0x01,
-        QuoteStrings    = 0x02
-    };
-
-    /**
-        Generates contents for string dst based on the contents of
-        wxArrayString src.
-    */
-    static void ArrayStringToString( wxString& dst, const wxArrayString& src,
-                                     wxUniChar delimiter, int flags );
-
-protected:
-    // Previously this was to be implemented in derived class for array-to-
-    // string conversion. Now you should implement ConvertValueToString()
-    // instead.
-    virtual void GenerateValueAsString();
-
-    wxString        m_display; // Cache for displayed text.
-    wxUniChar       m_delimiter;
-};
-
-// -----------------------------------------------------------------------
-
-#define WX_PG_DECLARE_ARRAYSTRING_PROPERTY_WITH_VALIDATOR_WITH_DECL(PROPNAME, \
-                                                                    DECL) \
-DECL PROPNAME : public wxArrayStringProperty \
-{ \
-    WX_PG_DECLARE_PROPERTY_CLASS(PROPNAME) \
-public: \
-    PROPNAME( const wxString& label = wxPG_LABEL, \
-              const wxString& name = wxPG_LABEL, \
-              const wxArrayString& value = wxArrayString() ); \
-    ~PROPNAME(); \
-    virtual bool OnEvent( wxPropertyGrid* propgrid, \
-                          wxWindow* primary, wxEvent& event ); \
-    virtual bool OnCustomStringEdit( wxWindow* parent, wxString& value ); \
-    virtual wxValidator* DoGetValidator() const; \
-};
-
-#define WX_PG_DECLARE_ARRAYSTRING_PROPERTY_WITH_VALIDATOR(PROPNAM) \
-WX_PG_DECLARE_ARRAYSTRING_PROPERTY_WITH_VALIDATOR(PROPNAM, class)
-
-#define WX_PG_IMPLEMENT_ARRAYSTRING_PROPERTY_WITH_VALIDATOR(PROPNAME, \
-                                                            DELIMCHAR, \
-                                                            CUSTBUTTXT) \
-WX_PG_IMPLEMENT_PROPERTY_CLASS(PROPNAME, wxArrayStringProperty, \
-                               wxArrayString, const wxArrayString&, \
-                               TextCtrlAndButton) \
-PROPNAME::PROPNAME( const wxString& label, \
-                    const wxString& name, \
-                    const wxArrayString& value ) \
-    : wxArrayStringProperty(label,name,value) \
-{ \
-    PROPNAME::GenerateValueAsString(); \
-    m_delimiter = DELIMCHAR; \
-} \
-PROPNAME::~PROPNAME() { } \
-bool PROPNAME::OnEvent( wxPropertyGrid* propgrid, \
-                        wxWindow* primary, wxEvent& event ) \
-{ \
-    if ( event.GetEventType() == wxEVT_BUTTON ) \
-        return OnButtonClick(propgrid,primary,(const wxChar*) CUSTBUTTXT); \
-    return false; \
-}
-
-#define WX_PG_DECLARE_ARRAYSTRING_PROPERTY(PROPNAME) \
-WX_PG_DECLARE_ARRAYSTRING_PROPERTY_WITH_VALIDATOR(PROPNAME)
-
-#define WX_PG_DECLARE_ARRAYSTRING_PROPERTY_WITH_DECL(PROPNAME, DECL) \
-WX_PG_DECLARE_ARRAYSTRING_PROPERTY_WITH_VALIDATOR_WITH_DECL(PROPNAME, DECL)
-
-#define WX_PG_IMPLEMENT_ARRAYSTRING_PROPERTY(PROPNAME,DELIMCHAR,CUSTBUTTXT) \
-WX_PG_IMPLEMENT_ARRAYSTRING_PROPERTY_WITH_VALIDATOR(PROPNAME, \
-                                                    DELIMCHAR, \
-                                                    CUSTBUTTXT) \
-wxValidator* PROPNAME::DoGetValidator () const \
-{ return NULL; }
-
-
-// -----------------------------------------------------------------------
-// wxPGArrayEditorDialog
-// -----------------------------------------------------------------------
-
-#if wxUSE_EDITABLELISTBOX
-
-class WXDLLIMPEXP_FWD_ADV wxEditableListBox;
-class WXDLLIMPEXP_FWD_CORE wxListEvent;
-
-#define wxAEDIALOG_STYLE \
-    (wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxOK | wxCANCEL | wxCENTRE)
-
-class WXDLLIMPEXP_PROPGRID wxPGArrayEditorDialog : public wxDialog
-{
-public:
-    wxPGArrayEditorDialog();
-    virtual ~wxPGArrayEditorDialog() { }
-
-    void Init();
-
-    wxPGArrayEditorDialog( wxWindow *parent,
-                         const wxString& message,
-                         const wxString& caption,
-                         long style = wxAEDIALOG_STYLE,
-                         const wxPoint& pos = wxDefaultPosition,
-                         const wxSize& sz = wxDefaultSize );
-
-    bool Create( wxWindow *parent,
-                 const wxString& message,
-                 const wxString& caption,
-                 long style = wxAEDIALOG_STYLE,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& sz = wxDefaultSize );
-
-    void EnableCustomNewAction()
-    {
-        m_hasCustomNewAction = true;
-    }
-
-    /** Set value modified by dialog.
-    */
-    virtual void SetDialogValue( const wxVariant& WXUNUSED(value) )
-    {
-        wxFAIL_MSG(wxT("re-implement this member function in derived class"));
-    }
-
-    /** Return value modified by dialog.
-    */
-    virtual wxVariant GetDialogValue() const
-    {
-        wxFAIL_MSG(wxT("re-implement this member function in derived class"));
-        return wxVariant();
-    }
-
-    /** Override to return wxValidator to be used with the wxTextCtrl
-        in dialog. Note that the validator is used in the standard
-        wx way, ie. it immediately prevents user from entering invalid
-        input.
-
-        @remarks
-        Dialog frees the validator.
-    */
-    virtual wxValidator* GetTextCtrlValidator() const
-    {
-        return NULL;
-    }
-
-    // Returns true if array was actually modified
-    bool IsModified() const { return m_modified; }
-
-    // wxEditableListBox utilities
-    int GetSelection() const;
-
-    // implementation from now on
-    void OnAddClick(wxCommandEvent& event);
-    void OnDeleteClick(wxCommandEvent& event);
-    void OnUpClick(wxCommandEvent& event);
-    void OnDownClick(wxCommandEvent& event);
-    void OnEndLabelEdit(wxListEvent& event);
-    void OnIdle(wxIdleEvent& event);
-
-protected:
-    wxEditableListBox*  m_elb;
-
-    // These are used for focus repair
-    wxWindow*           m_elbSubPanel;
-    wxWindow*           m_lastFocused;
-
-    // A new item, edited by user, is pending at this index.
-    // It will be committed once list ctrl item editing is done.
-    int             m_itemPendingAtIndex;
-
-    bool            m_modified;
-    bool            m_hasCustomNewAction;
-
-    // These must be overridden - must return true on success.
-    virtual wxString ArrayGet( size_t index ) = 0;
-    virtual size_t ArrayGetCount() = 0;
-    virtual bool ArrayInsert( const wxString& str, int index ) = 0;
-    virtual bool ArraySet( size_t index, const wxString& str ) = 0;
-    virtual void ArrayRemoveAt( int index ) = 0;
-    virtual void ArraySwap( size_t first, size_t second ) = 0;
-    virtual bool OnCustomNewAction(wxString* WXUNUSED(resString))
-    {
-        return false;
-    }
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPGArrayEditorDialog)
-    DECLARE_EVENT_TABLE()
-};
-
-#endif // wxUSE_EDITABLELISTBOX
-
-// -----------------------------------------------------------------------
-// wxPGArrayStringEditorDialog
-// -----------------------------------------------------------------------
-
-class WXDLLIMPEXP_PROPGRID
-    wxPGArrayStringEditorDialog : public wxPGArrayEditorDialog
-{
-public:
-    wxPGArrayStringEditorDialog();
-    virtual ~wxPGArrayStringEditorDialog() { }
-
-    void Init();
-
-    virtual void SetDialogValue( const wxVariant& value )
-    {
-        m_array = value.GetArrayString();
-    }
-
-    virtual wxVariant GetDialogValue() const
-    {
-        return m_array;
-    }
-
-    void SetCustomButton( const wxString& custBtText,
-                          wxArrayStringProperty* pcc )
-    {
-        if ( !custBtText.empty() )
-        {
-            EnableCustomNewAction();
-            m_pCallingClass = pcc;
-        }
-    }
-
-    virtual bool OnCustomNewAction(wxString* resString);
-
-protected:
-    wxArrayString   m_array;
-
-    wxArrayStringProperty*     m_pCallingClass;
-
-    virtual wxString ArrayGet( size_t index );
-    virtual size_t ArrayGetCount();
-    virtual bool ArrayInsert( const wxString& str, int index );
-    virtual bool ArraySet( size_t index, const wxString& str );
-    virtual void ArrayRemoveAt( int index );
-    virtual void ArraySwap( size_t first, size_t second );
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxPGArrayStringEditorDialog)
-    DECLARE_EVENT_TABLE()
-};
-
-// -----------------------------------------------------------------------
-
-#endif // wxUSE_PROPGRID
-
-#endif // _WX_PROPGRID_PROPS_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/protocol/file.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/protocol/file.h
deleted file mode 100644
index fd44ce593a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/protocol/file.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/protocol/file.h
-// Purpose:     File protocol
-// Author:      Guilhem Lavaux
-// Modified by:
-// Created:     1997
-// Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_PROTO_FILE_H__
-#define __WX_PROTO_FILE_H__
-
-#include "wx/defs.h"
-
-#if wxUSE_PROTOCOL_FILE
-
-#include "wx/protocol/protocol.h"
-
-class WXDLLIMPEXP_NET wxFileProto: public wxProtocol
-{
-public:
-    wxFileProto();
-    virtual ~wxFileProto();
-
-    bool Abort() { return true; }
-    wxString GetContentType() const { return wxEmptyString; }
-
-    wxInputStream *GetInputStream(const wxString& path);
-
-protected:
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFileProto)
-    DECLARE_PROTOCOL(wxFileProto)
-};
-
-#endif // wxUSE_PROTOCOL_FILE
-
-#endif // __WX_PROTO_FILE_H__
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/protocol/ftp.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/protocol/ftp.h
deleted file mode 100644
index a87a638066..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/protocol/ftp.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/protocol/ftp.h
-// Purpose:     FTP protocol
-// Author:      Vadim Zeitlin
-// Modified by: Mark Johnson, wxWindows@mj10777.de
-//              20000917 : RmDir, GetLastResult, GetList
-// Created:     07/07/1997
-// Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __WX_FTP_H__
-#define __WX_FTP_H__
-
-#include "wx/defs.h"
-
-#if wxUSE_PROTOCOL_FTP
-
-#include "wx/sckaddr.h"
-#include "wx/protocol/protocol.h"
-#include "wx/url.h"
-
-class WXDLLIMPEXP_NET wxFTP : public wxProtocol
-{
-public:
-    enum TransferMode
-    {
-        NONE,       // not set by user explicitly
-        ASCII,
-        BINARY
-    };
-
-    wxFTP();
-    virtual ~wxFTP();
-
-    // Connecting and disconnecting
-    virtual bool Connect(const wxSockAddress& addr, bool wait = true);
-    virtual bool Connect(const wxString& host) { return Connect(host, 0); }
-    virtual bool Connect(const wxString& host, unsigned short port);
-
-    // disconnect
-    virtual bool Close();
-
-    // Parameters set up
-
-    // set transfer mode now
-    void SetPassive(bool pasv) { m_bPassive = pasv; }
-    bool SetBinary() { return SetTransferMode(BINARY); }
-    bool SetAscii() { return SetTransferMode(ASCII); }
-    bool SetTransferMode(TransferMode mode);
-
-    // Generic FTP interface
-
-    // FTP doesn't know the MIME type of the last downloaded/uploaded file
-    virtual wxString GetContentType() const { return wxEmptyString; }
-
-    // the last FTP server reply
-    const wxString& GetLastResult() const { return m_lastResult; }
-
-    // send any FTP command (should be full FTP command line but without
-    // trailing "\r\n") and return its return code
-    char SendCommand(const wxString& command);
-
-    // check that the command returned the given code
-    bool CheckCommand(const wxString& command, char expectedReturn)
-    {
-        // SendCommand() does updates m_lastError
-        return SendCommand(command) == expectedReturn;
-    }
-
-    // Filesystem commands
-    bool ChDir(const wxString& dir);
-    bool MkDir(const wxString& dir);
-    bool RmDir(const wxString& dir);
-    wxString Pwd();
-    bool Rename(const wxString& src, const wxString& dst);
-    bool RmFile(const wxString& path);
-
-    // Get the size of a file in the current dir.
-    // this function tries its best to deliver the size in bytes using BINARY
-    // (the SIZE command reports different sizes depending on whether
-    // type is set to ASCII or BINARY)
-    // returns -1 if file is non-existent or size could not be found
-    int GetFileSize(const wxString& fileName);
-
-       // Check to see if a file exists in the current dir
-    bool FileExists(const wxString& fileName);
-
-    // Download methods
-    bool Abort();
-
-    virtual wxInputStream *GetInputStream(const wxString& path);
-    virtual wxOutputStream *GetOutputStream(const wxString& path);
-
-    // Directory listing
-
-    // get the list of full filenames, the format is fixed: one file name per
-    // line
-    bool GetFilesList(wxArrayString& files,
-                      const wxString& wildcard = wxEmptyString)
-    {
-        return GetList(files, wildcard, false);
-    }
-
-    // get a directory list in server dependent format - this can be shown
-    // directly to the user
-    bool GetDirList(wxArrayString& files,
-                    const wxString& wildcard = wxEmptyString)
-    {
-        return GetList(files, wildcard, true);
-    }
-
-    // equivalent to either GetFilesList() (default) or GetDirList()
-    bool GetList(wxArrayString& files,
-                 const wxString& wildcard = wxEmptyString,
-                 bool details = false);
-
-protected:
-    // this executes a simple ftp command with the given argument and returns
-    // true if it its return code starts with '2'
-    bool DoSimpleCommand(const wxChar *command,
-                         const wxString& arg = wxEmptyString);
-
-    // get the server reply, return the first character of the reply code,
-    // '1'..'5' for normal FTP replies, 0 (*not* '0') if an error occurred
-    char GetResult();
-
-    // check that the result is equal to expected value
-    bool CheckResult(char ch) { return GetResult() == ch; }
-
-    // return the socket to be used, Passive/Active versions are used only by
-    // GetPort()
-    wxSocketBase *GetPort();
-    wxSocketBase *GetPassivePort();
-    wxSocketBase *GetActivePort();
-
-    // helper for GetPort()
-    wxString GetPortCmdArgument(const wxIPV4address& Local, const wxIPV4address& New);
-
-    // accept connection from server in active mode, returns the same socket as
-    // passed in passive mode
-    wxSocketBase *AcceptIfActive(wxSocketBase *sock);
-
-
-    // internal variables:
-
-    wxString        m_lastResult;
-
-    // true if there is an FTP transfer going on
-    bool            m_streaming;
-
-    // although this should be set to ASCII by default according to STD9,
-    // we will use BINARY transfer mode by default for backwards compatibility
-    TransferMode    m_currentTransfermode;
-
-    bool            m_bPassive;
-
-    // following is true when  a read or write times out, we then assume
-    // the connection is dead and abort. we avoid additional delays this way
-    bool            m_bEncounteredError;
-
-
-    friend class wxInputFTPStream;
-    friend class wxOutputFTPStream;
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxFTP)
-    DECLARE_PROTOCOL(wxFTP)
-};
-
-// the trace mask used by assorted wxLogTrace() in ftp code, do
-// wxLog::AddTraceMask(FTP_TRACE_MASK) to see them in output
-#define FTP_TRACE_MASK wxT("ftp")
-
-#endif // wxUSE_PROTOCOL_FTP
-
-#endif // __WX_FTP_H__
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/protocol/http.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/protocol/http.h
deleted file mode 100644
index cfa2e6f944..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/protocol/http.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/protocol/http.h
-// Purpose:     HTTP protocol
-// Author:      Guilhem Lavaux
-// Modified by: Simo Virokannas (authentication, Dec 2005)
-// Created:     August 1997
-// Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-#ifndef _WX_HTTP_H
-#define _WX_HTTP_H
-
-#include "wx/defs.h"
-
-#if wxUSE_PROTOCOL_HTTP
-
-#include "wx/hashmap.h"
-#include "wx/protocol/protocol.h"
-#include "wx/buffer.h"
-
-class WXDLLIMPEXP_NET wxHTTP : public wxProtocol
-{
-public:
-    wxHTTP();
-    virtual ~wxHTTP();
-
-    virtual bool Connect(const wxString& host, unsigned short port);
-    virtual bool Connect(const wxString& host) { return Connect(host, 0); }
-    virtual bool Connect(const wxSockAddress& addr, bool wait);
-    bool Abort();
-
-    wxInputStream *GetInputStream(const wxString& path);
-
-    wxString GetContentType() const;
-    wxString GetHeader(const wxString& header) const;
-    int GetResponse() const { return m_http_response; }
-
-    void SetMethod(const wxString& method) { m_method = method; }
-    void SetHeader(const wxString& header, const wxString& h_data);
-    bool SetPostText(const wxString& contentType,
-                     const wxString& data,
-                     const wxMBConv& conv = wxConvUTF8);
-    bool SetPostBuffer(const wxString& contentType, const wxMemoryBuffer& data);
-    void SetProxyMode(bool on);
-
-    /* Cookies */
-    wxString GetCookie(const wxString& cookie) const;
-    bool HasCookies() const { return m_cookies.size() > 0; }
-
-    // Use the other SetPostBuffer() overload or SetPostText() instead.
-    wxDEPRECATED(void SetPostBuffer(const wxString& post_buf));
-
-protected:
-    typedef wxStringToStringHashMap::iterator wxHeaderIterator;
-    typedef wxStringToStringHashMap::const_iterator wxHeaderConstIterator;
-    typedef wxStringToStringHashMap::iterator wxCookieIterator;
-    typedef wxStringToStringHashMap::const_iterator wxCookieConstIterator;
-
-    bool BuildRequest(const wxString& path, const wxString& method);
-    void SendHeaders();
-    bool ParseHeaders();
-
-    wxString GenerateAuthString(const wxString& user, const wxString& pass) const;
-
-    // find the header in m_headers
-    wxHeaderIterator FindHeader(const wxString& header);
-    wxHeaderConstIterator FindHeader(const wxString& header) const;
-    wxCookieIterator FindCookie(const wxString& cookie);
-    wxCookieConstIterator FindCookie(const wxString& cookie) const;
-
-    // deletes the header value strings
-    void ClearHeaders();
-    void ClearCookies();
-
-    // internal variables:
-
-    wxString m_method;
-    wxStringToStringHashMap m_cookies;
-
-    wxStringToStringHashMap m_headers;
-    bool m_read,
-         m_proxy_mode;
-    wxSockAddress *m_addr;
-    wxMemoryBuffer m_postBuffer;
-    wxString       m_contentType;
-    int m_http_response;
-
-    DECLARE_DYNAMIC_CLASS(wxHTTP)
-    DECLARE_PROTOCOL(wxHTTP)
-    wxDECLARE_NO_COPY_CLASS(wxHTTP);
-};
-
-#endif // wxUSE_PROTOCOL_HTTP
-
-#endif // _WX_HTTP_H
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/protocol/log.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/protocol/log.h
deleted file mode 100644
index df373b928f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/protocol/log.h
+++ /dev/null
@@ -1,54 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/protocol/log.h
-// Purpose:     wxProtocolLog class for logging network exchanges
-// Author:      Troelsk, Vadim Zeitlin
-// Created:     2009-03-06
-// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PROTOCOL_LOG_H_
-#define _WX_PROTOCOL_LOG_H_
-
-#include "wx/string.h"
-
-// ----------------------------------------------------------------------------
-// wxProtocolLog: simple class for logging network requests and responses
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_NET wxProtocolLog
-{
-public:
-    // Create object doing the logging using wxLogTrace() with the specified
-    // trace mask.
-    wxProtocolLog(const wxString& traceMask)
-        : m_traceMask(traceMask)
-    {
-    }
-
-    // Virtual dtor for the base class
-    virtual ~wxProtocolLog() { }
-
-    // Called by wxProtocol-derived classes to actually log something
-    virtual void LogRequest(const wxString& str)
-    {
-        DoLogString("==> " + str);
-    }
-
-    virtual void LogResponse(const wxString& str)
-    {
-        DoLogString("<== " + str);
-    }
-
-protected:
-    // Can be overridden by the derived classes.
-    virtual void DoLogString(const wxString& str);
-
-private:
-    const wxString m_traceMask;
-
-    wxDECLARE_NO_COPY_CLASS(wxProtocolLog);
-};
-
-#endif // _WX_PROTOCOL_LOG_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/protocol/protocol.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/protocol/protocol.h
deleted file mode 100644
index e6a32ef55c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/protocol/protocol.h
+++ /dev/null
@@ -1,177 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/protocol/protocol.h
-// Purpose:     Protocol base class
-// Author:      Guilhem Lavaux
-// Modified by:
-// Created:     10/07/1997
-// Copyright:   (c) 1997, 1998 Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PROTOCOL_PROTOCOL_H
-#define _WX_PROTOCOL_PROTOCOL_H
-
-#include "wx/defs.h"
-
-#if wxUSE_PROTOCOL
-
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/stream.h"
-
-#if wxUSE_SOCKETS
-    #include "wx/socket.h"
-#endif
-
-class WXDLLIMPEXP_FWD_NET wxProtocolLog;
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-typedef enum
-{
-    wxPROTO_NOERR = 0,
-    wxPROTO_NETERR,
-    wxPROTO_PROTERR,
-    wxPROTO_CONNERR,
-    wxPROTO_INVVAL,
-    wxPROTO_NOHNDLR,
-    wxPROTO_NOFILE,
-    wxPROTO_ABRT,
-    wxPROTO_RCNCT,
-    wxPROTO_STREAMING
-} wxProtocolError;
-
-// ----------------------------------------------------------------------------
-// wxProtocol: abstract base class for all protocols
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_NET wxProtocol
-#if wxUSE_SOCKETS
- : public wxSocketClient
-#else
- : public wxObject
-#endif
-{
-public:
-    wxProtocol();
-    virtual ~wxProtocol();
-
-#if wxUSE_SOCKETS
-    bool Reconnect();
-    virtual bool Connect( const wxString& WXUNUSED(host) ) { return false; }
-    virtual bool Connect( const wxSockAddress& addr, bool WXUNUSED(wait) = true)
-        { return wxSocketClient::Connect(addr); }
-
-    // read a '\r\n' terminated line from the given socket and put it in
-    // result (without the terminators)
-    static wxProtocolError ReadLine(wxSocketBase *socket, wxString& result);
-
-    // read a line from this socket - this one can be overridden in the
-    // derived classes if different line termination convention is to be used
-    virtual wxProtocolError ReadLine(wxString& result);
-#endif // wxUSE_SOCKETS
-
-    virtual bool Abort() = 0;
-    virtual wxInputStream *GetInputStream(const wxString& path) = 0;
-    virtual wxString GetContentType() const = 0;
-
-    // the error code
-    virtual wxProtocolError GetError() const { return m_lastError; }
-
-    void SetUser(const wxString& user) { m_username = user; }
-    void SetPassword(const wxString& passwd) { m_password = passwd; }
-
-    virtual void SetDefaultTimeout(wxUint32 Value);
-
-    // override wxSocketBase::SetTimeout function to avoid that the internal
-    // m_uiDefaultTimeout goes out-of-sync:
-    virtual void SetTimeout(long seconds)
-        { SetDefaultTimeout(seconds); }
-
-
-    // logging support: each wxProtocol object may have the associated logger
-    // (by default there is none) which is used to log network requests and
-    // responses
-
-    // set the logger, deleting the old one and taking ownership of this one
-    void SetLog(wxProtocolLog *log);
-
-    // return the current logger, may be NULL
-    wxProtocolLog *GetLog() const { return m_log; }
-
-    // detach the existing logger without deleting it, the caller is
-    // responsible for deleting the returned pointer if it's non-NULL
-    wxProtocolLog *DetachLog()
-    {
-        wxProtocolLog * const log = m_log;
-        m_log = NULL;
-        return log;
-    }
-
-    // these functions forward to the same functions with the same names in
-    // wxProtocolLog if we have a valid logger and do nothing otherwise
-    void LogRequest(const wxString& str);
-    void LogResponse(const wxString& str);
-
-protected:
-    // the timeout associated with the protocol:
-    wxUint32        m_uiDefaultTimeout;
-
-    wxString        m_username;
-    wxString        m_password;
-
-    // this must be always updated by the derived classes!
-    wxProtocolError m_lastError;
-
-private:
-    wxProtocolLog *m_log;
-
-    DECLARE_DYNAMIC_CLASS_NO_COPY(wxProtocol)
-};
-
-// ----------------------------------------------------------------------------
-// macros for protocol classes
-// ----------------------------------------------------------------------------
-
-#define DECLARE_PROTOCOL(class) \
-public: \
-  static wxProtoInfo g_proto_##class;
-
-#define IMPLEMENT_PROTOCOL(class, name, serv, host) \
-wxProtoInfo class::g_proto_##class(name, serv, host, wxCLASSINFO(class)); \
-bool wxProtocolUse##class = true;
-
-#define USE_PROTOCOL(class) \
-    extern bool wxProtocolUse##class ; \
-    static struct wxProtocolUserFor##class \
-    { \
-        wxProtocolUserFor##class() { wxProtocolUse##class = true; } \
-    } wxProtocolDoUse##class;
-
-class WXDLLIMPEXP_NET wxProtoInfo : public wxObject
-{
-public:
-    wxProtoInfo(const wxChar *name,
-                const wxChar *serv_name,
-                const bool need_host1,
-                wxClassInfo *info);
-
-protected:
-    wxProtoInfo *next;
-    wxString m_protoname;
-    wxString prefix;
-    wxString m_servname;
-    wxClassInfo *m_cinfo;
-    bool m_needhost;
-
-    friend class wxURL;
-
-    DECLARE_DYNAMIC_CLASS(wxProtoInfo)
-    wxDECLARE_NO_COPY_CLASS(wxProtoInfo);
-};
-
-#endif // wxUSE_PROTOCOL
-
-#endif // _WX_PROTOCOL_PROTOCOL_H
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/art.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/art.h
deleted file mode 100644
index b951412999..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/art.h
+++ /dev/null
@@ -1,943 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/ribbon/art.h
-// Purpose:     Art providers for ribbon-bar-style interface
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-05-25
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RIBBON_ART_H_
-#define _WX_RIBBON_ART_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_RIBBON
-
-#include "wx/brush.h"
-#include "wx/colour.h"
-#include "wx/font.h"
-#include "wx/pen.h"
-#include "wx/bitmap.h"
-#include "wx/ribbon/bar.h"
-
-class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-
-enum wxRibbonArtSetting
-{
-    wxRIBBON_ART_TAB_SEPARATION_SIZE,
-    wxRIBBON_ART_PAGE_BORDER_LEFT_SIZE,
-    wxRIBBON_ART_PAGE_BORDER_TOP_SIZE,
-    wxRIBBON_ART_PAGE_BORDER_RIGHT_SIZE,
-    wxRIBBON_ART_PAGE_BORDER_BOTTOM_SIZE,
-    wxRIBBON_ART_PANEL_X_SEPARATION_SIZE,
-    wxRIBBON_ART_PANEL_Y_SEPARATION_SIZE,
-    wxRIBBON_ART_TOOL_GROUP_SEPARATION_SIZE,
-    wxRIBBON_ART_GALLERY_BITMAP_PADDING_LEFT_SIZE,
-    wxRIBBON_ART_GALLERY_BITMAP_PADDING_RIGHT_SIZE,
-    wxRIBBON_ART_GALLERY_BITMAP_PADDING_TOP_SIZE,
-    wxRIBBON_ART_GALLERY_BITMAP_PADDING_BOTTOM_SIZE,
-    wxRIBBON_ART_PANEL_LABEL_FONT,
-    wxRIBBON_ART_BUTTON_BAR_LABEL_FONT,
-    wxRIBBON_ART_TAB_LABEL_FONT,
-    wxRIBBON_ART_BUTTON_BAR_LABEL_COLOUR,
-    wxRIBBON_ART_BUTTON_BAR_HOVER_BORDER_COLOUR,
-    wxRIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_TOP_COLOUR,
-    wxRIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR,
-    wxRIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_COLOUR,
-    wxRIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_GRADIENT_COLOUR,
-    wxRIBBON_ART_BUTTON_BAR_ACTIVE_BORDER_COLOUR,
-    wxRIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_TOP_COLOUR,
-    wxRIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR,
-    wxRIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_COLOUR,
-    wxRIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_GRADIENT_COLOUR,
-    wxRIBBON_ART_GALLERY_BORDER_COLOUR,
-    wxRIBBON_ART_GALLERY_HOVER_BACKGROUND_COLOUR,
-    wxRIBBON_ART_GALLERY_BUTTON_BACKGROUND_COLOUR,
-    wxRIBBON_ART_GALLERY_BUTTON_BACKGROUND_GRADIENT_COLOUR,
-    wxRIBBON_ART_GALLERY_BUTTON_BACKGROUND_TOP_COLOUR,
-    wxRIBBON_ART_GALLERY_BUTTON_FACE_COLOUR,
-    wxRIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_COLOUR,
-    wxRIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_GRADIENT_COLOUR,
-    wxRIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_TOP_COLOUR,
-    wxRIBBON_ART_GALLERY_BUTTON_HOVER_FACE_COLOUR,
-    wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_COLOUR,
-    wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_GRADIENT_COLOUR,
-    wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_TOP_COLOUR,
-    wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_FACE_COLOUR,
-    wxRIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_COLOUR,
-    wxRIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_GRADIENT_COLOUR,
-    wxRIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_TOP_COLOUR,
-    wxRIBBON_ART_GALLERY_BUTTON_DISABLED_FACE_COLOUR,
-    wxRIBBON_ART_GALLERY_ITEM_BORDER_COLOUR,
-    wxRIBBON_ART_TAB_LABEL_COLOUR,
-    wxRIBBON_ART_TAB_SEPARATOR_COLOUR,
-    wxRIBBON_ART_TAB_SEPARATOR_GRADIENT_COLOUR,
-    wxRIBBON_ART_TAB_CTRL_BACKGROUND_COLOUR,
-    wxRIBBON_ART_TAB_CTRL_BACKGROUND_GRADIENT_COLOUR,
-    wxRIBBON_ART_TAB_HOVER_BACKGROUND_TOP_COLOUR,
-    wxRIBBON_ART_TAB_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR,
-    wxRIBBON_ART_TAB_HOVER_BACKGROUND_COLOUR,
-    wxRIBBON_ART_TAB_HOVER_BACKGROUND_GRADIENT_COLOUR,
-    wxRIBBON_ART_TAB_ACTIVE_BACKGROUND_TOP_COLOUR,
-    wxRIBBON_ART_TAB_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR,
-    wxRIBBON_ART_TAB_ACTIVE_BACKGROUND_COLOUR,
-    wxRIBBON_ART_TAB_ACTIVE_BACKGROUND_GRADIENT_COLOUR,
-    wxRIBBON_ART_TAB_BORDER_COLOUR,
-    wxRIBBON_ART_PANEL_BORDER_COLOUR,
-    wxRIBBON_ART_PANEL_BORDER_GRADIENT_COLOUR,
-    wxRIBBON_ART_PANEL_MINIMISED_BORDER_COLOUR,
-    wxRIBBON_ART_PANEL_MINIMISED_BORDER_GRADIENT_COLOUR,
-    wxRIBBON_ART_PANEL_LABEL_BACKGROUND_COLOUR,
-    wxRIBBON_ART_PANEL_LABEL_BACKGROUND_GRADIENT_COLOUR,
-    wxRIBBON_ART_PANEL_LABEL_COLOUR,
-    wxRIBBON_ART_PANEL_HOVER_LABEL_BACKGROUND_COLOUR,
-    wxRIBBON_ART_PANEL_HOVER_LABEL_BACKGROUND_GRADIENT_COLOUR,
-    wxRIBBON_ART_PANEL_HOVER_LABEL_COLOUR,
-    wxRIBBON_ART_PANEL_MINIMISED_LABEL_COLOUR,
-    wxRIBBON_ART_PANEL_ACTIVE_BACKGROUND_TOP_COLOUR,
-    wxRIBBON_ART_PANEL_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR,
-    wxRIBBON_ART_PANEL_ACTIVE_BACKGROUND_COLOUR,
-    wxRIBBON_ART_PANEL_ACTIVE_BACKGROUND_GRADIENT_COLOUR,
-    wxRIBBON_ART_PANEL_BUTTON_FACE_COLOUR,
-    wxRIBBON_ART_PANEL_BUTTON_HOVER_FACE_COLOUR,
-
-    wxRIBBON_ART_PAGE_TOGGLE_FACE_COLOUR,
-    wxRIBBON_ART_PAGE_TOGGLE_HOVER_FACE_COLOUR,
-
-    wxRIBBON_ART_PAGE_BORDER_COLOUR,
-    wxRIBBON_ART_PAGE_BACKGROUND_TOP_COLOUR,
-    wxRIBBON_ART_PAGE_BACKGROUND_TOP_GRADIENT_COLOUR,
-    wxRIBBON_ART_PAGE_BACKGROUND_COLOUR,
-    wxRIBBON_ART_PAGE_BACKGROUND_GRADIENT_COLOUR,
-    wxRIBBON_ART_PAGE_HOVER_BACKGROUND_TOP_COLOUR,
-    wxRIBBON_ART_PAGE_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR,
-    wxRIBBON_ART_PAGE_HOVER_BACKGROUND_COLOUR,
-    wxRIBBON_ART_PAGE_HOVER_BACKGROUND_GRADIENT_COLOUR,
-    wxRIBBON_ART_TOOLBAR_BORDER_COLOUR,
-    wxRIBBON_ART_TOOLBAR_HOVER_BORDER_COLOUR,
-    wxRIBBON_ART_TOOLBAR_FACE_COLOUR,
-    wxRIBBON_ART_TOOL_BACKGROUND_TOP_COLOUR,
-    wxRIBBON_ART_TOOL_BACKGROUND_TOP_GRADIENT_COLOUR,
-    wxRIBBON_ART_TOOL_BACKGROUND_COLOUR,
-    wxRIBBON_ART_TOOL_BACKGROUND_GRADIENT_COLOUR,
-    wxRIBBON_ART_TOOL_HOVER_BACKGROUND_TOP_COLOUR,
-    wxRIBBON_ART_TOOL_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR,
-    wxRIBBON_ART_TOOL_HOVER_BACKGROUND_COLOUR,
-    wxRIBBON_ART_TOOL_HOVER_BACKGROUND_GRADIENT_COLOUR,
-    wxRIBBON_ART_TOOL_ACTIVE_BACKGROUND_TOP_COLOUR,
-    wxRIBBON_ART_TOOL_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR,
-    wxRIBBON_ART_TOOL_ACTIVE_BACKGROUND_COLOUR,
-    wxRIBBON_ART_TOOL_ACTIVE_BACKGROUND_GRADIENT_COLOUR,
-    wxRIBBON_ART_BUTTON_BAR_LABEL_DISABLED_COLOUR
-};
-
-enum wxRibbonScrollButtonStyle
-{
-    wxRIBBON_SCROLL_BTN_LEFT = 0,
-    wxRIBBON_SCROLL_BTN_RIGHT = 1,
-    wxRIBBON_SCROLL_BTN_UP = 2,
-    wxRIBBON_SCROLL_BTN_DOWN = 3,
-
-    wxRIBBON_SCROLL_BTN_DIRECTION_MASK = 3,
-
-    wxRIBBON_SCROLL_BTN_NORMAL = 0,
-    wxRIBBON_SCROLL_BTN_HOVERED = 4,
-    wxRIBBON_SCROLL_BTN_ACTIVE = 8,
-
-    wxRIBBON_SCROLL_BTN_STATE_MASK = 12,
-
-    wxRIBBON_SCROLL_BTN_FOR_OTHER = 0,
-    wxRIBBON_SCROLL_BTN_FOR_TABS = 16,
-    wxRIBBON_SCROLL_BTN_FOR_PAGE = 32,
-
-    wxRIBBON_SCROLL_BTN_FOR_MASK = 48
-};
-
-enum wxRibbonButtonKind
-{
-    wxRIBBON_BUTTON_NORMAL    = 1 << 0,
-    wxRIBBON_BUTTON_DROPDOWN  = 1 << 1,
-    wxRIBBON_BUTTON_HYBRID    = wxRIBBON_BUTTON_NORMAL | wxRIBBON_BUTTON_DROPDOWN,
-    wxRIBBON_BUTTON_TOGGLE    = 1 << 2
-};
-
-enum wxRibbonButtonBarButtonState
-{
-    wxRIBBON_BUTTONBAR_BUTTON_SMALL     = 0 << 0,
-    wxRIBBON_BUTTONBAR_BUTTON_MEDIUM    = 1 << 0,
-    wxRIBBON_BUTTONBAR_BUTTON_LARGE     = 2 << 0,
-    wxRIBBON_BUTTONBAR_BUTTON_SIZE_MASK = 3 << 0,
-
-    wxRIBBON_BUTTONBAR_BUTTON_NORMAL_HOVERED    = 1 << 3,
-    wxRIBBON_BUTTONBAR_BUTTON_DROPDOWN_HOVERED  = 1 << 4,
-    wxRIBBON_BUTTONBAR_BUTTON_HOVER_MASK        = wxRIBBON_BUTTONBAR_BUTTON_NORMAL_HOVERED | wxRIBBON_BUTTONBAR_BUTTON_DROPDOWN_HOVERED,
-    wxRIBBON_BUTTONBAR_BUTTON_NORMAL_ACTIVE     = 1 << 5,
-    wxRIBBON_BUTTONBAR_BUTTON_DROPDOWN_ACTIVE   = 1 << 6,
-    wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK       = wxRIBBON_BUTTONBAR_BUTTON_NORMAL_ACTIVE | wxRIBBON_BUTTONBAR_BUTTON_DROPDOWN_ACTIVE,
-    wxRIBBON_BUTTONBAR_BUTTON_DISABLED          = 1 << 7,
-    wxRIBBON_BUTTONBAR_BUTTON_TOGGLED           = 1 << 8,
-    wxRIBBON_BUTTONBAR_BUTTON_STATE_MASK        = 0x1F8
-};
-
-enum wxRibbonGalleryButtonState
-{
-    wxRIBBON_GALLERY_BUTTON_NORMAL,
-    wxRIBBON_GALLERY_BUTTON_HOVERED,
-    wxRIBBON_GALLERY_BUTTON_ACTIVE,
-    wxRIBBON_GALLERY_BUTTON_DISABLED
-};
-
-class wxRibbonBar;
-class wxRibbonPage;
-class wxRibbonPanel;
-class wxRibbonGallery;
-class wxRibbonGalleryItem;
-class wxRibbonPageTabInfo;
-class wxRibbonPageTabInfoArray;
-
-class WXDLLIMPEXP_RIBBON wxRibbonArtProvider
-{
-public:
-    wxRibbonArtProvider();
-    virtual ~wxRibbonArtProvider();
-
-    virtual wxRibbonArtProvider* Clone() const = 0;
-    virtual void SetFlags(long flags) = 0;
-    virtual long GetFlags() const = 0;
-
-    virtual int GetMetric(int id)  const = 0;
-    virtual void SetMetric(int id, int new_val) = 0;
-    virtual void SetFont(int id, const wxFont& font) = 0;
-    virtual wxFont GetFont(int id)  const = 0;
-    virtual wxColour GetColour(int id)  const = 0;
-    virtual void SetColour(int id, const wxColor& colour) = 0;
-    wxColour GetColor(int id) const { return GetColour(id); }
-    void SetColor(int id, const wxColour& color) { SetColour(id, color); }
-    virtual void GetColourScheme(wxColour* primary,
-                        wxColour* secondary,
-                        wxColour* tertiary) const = 0;
-    virtual void SetColourScheme(const wxColour& primary,
-                        const wxColour& secondary,
-                        const wxColour& tertiary) = 0;
-
-    virtual void DrawTabCtrlBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect) = 0;
-
-    virtual void DrawTab(wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRibbonPageTabInfo& tab) = 0;
-
-    virtual void DrawTabSeparator(wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect,
-                        double visibility) = 0;
-
-    virtual void DrawPageBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect) = 0;
-
-    virtual void DrawScrollButton(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect,
-                        long style) = 0;
-
-    virtual void DrawPanelBackground(
-                        wxDC& dc,
-                        wxRibbonPanel* wnd,
-                        const wxRect& rect) = 0;
-
-    virtual void DrawGalleryBackground(
-                        wxDC& dc,
-                        wxRibbonGallery* wnd,
-                        const wxRect& rect) = 0;
-
-    virtual void DrawGalleryItemBackground(
-                        wxDC& dc,
-                        wxRibbonGallery* wnd,
-                        const wxRect& rect,
-                        wxRibbonGalleryItem* item) = 0;
-
-    virtual void DrawMinimisedPanel(
-                        wxDC& dc,
-                        wxRibbonPanel* wnd,
-                        const wxRect& rect,
-                        wxBitmap& bitmap) = 0;
-
-    virtual void DrawButtonBarBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect) = 0;
-
-    virtual void DrawButtonBarButton(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect,
-                        wxRibbonButtonKind kind,
-                        long state,
-                        const wxString& label,
-                        const wxBitmap& bitmap_large,
-                        const wxBitmap& bitmap_small) = 0;
-
-    virtual void DrawToolBarBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect) = 0;
-
-    virtual void DrawToolGroupBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect) = 0;
-
-    virtual void DrawTool(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect,
-                        const wxBitmap& bitmap,
-                        wxRibbonButtonKind kind,
-                        long state) = 0;
-
-    virtual void DrawToggleButton(
-                        wxDC& dc,
-                        wxRibbonBar* wnd,
-                        const wxRect& rect,
-                        wxRibbonDisplayMode mode) = 0;
-
-    virtual void DrawHelpButton(
-                        wxDC& dc,
-                        wxRibbonBar* wnd,
-                        const wxRect& rect) = 0;
-
-    virtual void GetBarTabWidth(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxString& label,
-                        const wxBitmap& bitmap,
-                        int* ideal,
-                        int* small_begin_need_separator,
-                        int* small_must_have_separator,
-                        int* minimum) = 0;
-
-    virtual int GetTabCtrlHeight(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRibbonPageTabInfoArray& pages) = 0;
-
-    virtual wxSize GetScrollButtonMinimumSize(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        long style) = 0;
-
-    virtual wxSize GetPanelSize(
-                        wxDC& dc,
-                        const wxRibbonPanel* wnd,
-                        wxSize client_size,
-                        wxPoint* client_offset) = 0;
-
-    virtual wxSize GetPanelClientSize(
-                        wxDC& dc,
-                        const wxRibbonPanel* wnd,
-                        wxSize size,
-                        wxPoint* client_offset) = 0;
-
-    virtual wxRect GetPanelExtButtonArea(
-                        wxDC& dc,
-                        const wxRibbonPanel* wnd,
-                        wxRect rect) = 0;
-
-    virtual wxSize GetGallerySize(
-                        wxDC& dc,
-                        const wxRibbonGallery* wnd,
-                        wxSize client_size) = 0;
-
-    virtual wxSize GetGalleryClientSize(
-                        wxDC& dc,
-                        const wxRibbonGallery* wnd,
-                        wxSize size,
-                        wxPoint* client_offset,
-                        wxRect* scroll_up_button,
-                        wxRect* scroll_down_button,
-                        wxRect* extension_button) = 0;
-
-    virtual wxRect GetPageBackgroundRedrawArea(
-                        wxDC& dc,
-                        const wxRibbonPage* wnd,
-                        wxSize page_old_size,
-                        wxSize page_new_size) = 0;
-
-    virtual bool GetButtonBarButtonSize(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        wxRibbonButtonKind kind,
-                        wxRibbonButtonBarButtonState size,
-                        const wxString& label,
-                        wxSize bitmap_size_large,
-                        wxSize bitmap_size_small,
-                        wxSize* button_size,
-                        wxRect* normal_region,
-                        wxRect* dropdown_region) = 0;
-
-    virtual wxSize GetMinimisedPanelMinimumSize(
-                        wxDC& dc,
-                        const wxRibbonPanel* wnd,
-                        wxSize* desired_bitmap_size,
-                        wxDirection* expanded_panel_direction) = 0;
-
-    virtual wxSize GetToolSize(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        wxSize bitmap_size,
-                        wxRibbonButtonKind kind,
-                        bool is_first,
-                        bool is_last,
-                        wxRect* dropdown_region) = 0;
-
-    virtual wxRect GetBarToggleButtonArea(const wxRect& rect)= 0;
-
-    virtual wxRect GetRibbonHelpButtonArea(const wxRect& rect) = 0;
-};
-
-class WXDLLIMPEXP_RIBBON wxRibbonMSWArtProvider : public wxRibbonArtProvider
-{
-public:
-    wxRibbonMSWArtProvider(bool set_colour_scheme = true);
-    virtual ~wxRibbonMSWArtProvider();
-
-    wxRibbonArtProvider* Clone() const;
-    void SetFlags(long flags);
-    long GetFlags() const;
-
-    int GetMetric(int id) const;
-    void SetMetric(int id, int new_val);
-    void SetFont(int id, const wxFont& font);
-    wxFont GetFont(int id) const;
-    wxColour GetColour(int id) const;
-    void SetColour(int id, const wxColor& colour);
-    void GetColourScheme(wxColour* primary,
-                         wxColour* secondary,
-                         wxColour* tertiary) const;
-    void SetColourScheme(const wxColour& primary,
-                         const wxColour& secondary,
-                         const wxColour& tertiary);
-
-    int GetTabCtrlHeight(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRibbonPageTabInfoArray& pages);
-
-    void DrawTabCtrlBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect);
-
-    void DrawTab(wxDC& dc,
-                 wxWindow* wnd,
-                 const wxRibbonPageTabInfo& tab);
-
-    void DrawTabSeparator(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect,
-                        double visibility);
-
-    void DrawPageBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect);
-
-    void DrawScrollButton(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect,
-                        long style);
-
-    void DrawPanelBackground(
-                        wxDC& dc,
-                        wxRibbonPanel* wnd,
-                        const wxRect& rect);
-
-    void DrawGalleryBackground(
-                        wxDC& dc,
-                        wxRibbonGallery* wnd,
-                        const wxRect& rect);
-
-    void DrawGalleryItemBackground(
-                        wxDC& dc,
-                        wxRibbonGallery* wnd,
-                        const wxRect& rect,
-                        wxRibbonGalleryItem* item);
-
-    void DrawMinimisedPanel(
-                        wxDC& dc,
-                        wxRibbonPanel* wnd,
-                        const wxRect& rect,
-                        wxBitmap& bitmap);
-
-    void DrawButtonBarBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect);
-
-    void DrawButtonBarButton(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect,
-                        wxRibbonButtonKind kind,
-                        long state,
-                        const wxString& label,
-                        const wxBitmap& bitmap_large,
-                        const wxBitmap& bitmap_small);
-
-    void DrawToolBarBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect);
-
-    void DrawToolGroupBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect);
-
-    void DrawTool(
-                wxDC& dc,
-                wxWindow* wnd,
-                const wxRect& rect,
-                const wxBitmap& bitmap,
-                wxRibbonButtonKind kind,
-                long state);
-
-    void DrawToggleButton(
-                        wxDC& dc,
-                        wxRibbonBar* wnd,
-                        const wxRect& rect,
-                        wxRibbonDisplayMode mode);
-
-    void DrawHelpButton(wxDC& dc,
-                        wxRibbonBar* wnd,
-                        const wxRect& rect);
-
-    void GetBarTabWidth(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxString& label,
-                        const wxBitmap& bitmap,
-                        int* ideal,
-                        int* small_begin_need_separator,
-                        int* small_must_have_separator,
-                        int* minimum);
-
-    wxSize GetScrollButtonMinimumSize(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        long style);
-
-    wxSize GetPanelSize(
-                        wxDC& dc,
-                        const wxRibbonPanel* wnd,
-                        wxSize client_size,
-                        wxPoint* client_offset);
-
-    wxSize GetPanelClientSize(
-                        wxDC& dc,
-                        const wxRibbonPanel* wnd,
-                        wxSize size,
-                        wxPoint* client_offset);
-
-    wxRect GetPanelExtButtonArea(
-                        wxDC& dc,
-                        const wxRibbonPanel* wnd,
-                        wxRect rect);
-
-    wxSize GetGallerySize(
-                        wxDC& dc,
-                        const wxRibbonGallery* wnd,
-                        wxSize client_size);
-
-    wxSize GetGalleryClientSize(
-                        wxDC& dc,
-                        const wxRibbonGallery* wnd,
-                        wxSize size,
-                        wxPoint* client_offset,
-                        wxRect* scroll_up_button,
-                        wxRect* scroll_down_button,
-                        wxRect* extension_button);
-
-    wxRect GetPageBackgroundRedrawArea(
-                        wxDC& dc,
-                        const wxRibbonPage* wnd,
-                        wxSize page_old_size,
-                        wxSize page_new_size);
-
-    bool GetButtonBarButtonSize(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        wxRibbonButtonKind kind,
-                        wxRibbonButtonBarButtonState size,
-                        const wxString& label,
-                        wxSize bitmap_size_large,
-                        wxSize bitmap_size_small,
-                        wxSize* button_size,
-                        wxRect* normal_region,
-                        wxRect* dropdown_region);
-
-    wxSize GetMinimisedPanelMinimumSize(
-                        wxDC& dc,
-                        const wxRibbonPanel* wnd,
-                        wxSize* desired_bitmap_size,
-                        wxDirection* expanded_panel_direction);
-
-    wxSize GetToolSize(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        wxSize bitmap_size,
-                        wxRibbonButtonKind kind,
-                        bool is_first,
-                        bool is_last,
-                        wxRect* dropdown_region);
-
-    wxRect GetBarToggleButtonArea(const wxRect& rect);
-
-    wxRect GetRibbonHelpButtonArea(const wxRect& rect);
-
-protected:
-    void ReallyDrawTabSeparator(wxWindow* wnd, const wxRect& rect, double visibility);
-    void DrawPartialPageBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect,
-        bool allow_hovered = true);
-    void DrawPartialPageBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect,
-         wxRibbonPage* page, wxPoint offset, bool hovered = false);
-    void DrawPanelBorder(wxDC& dc, const wxRect& rect, wxPen& primary_colour,
-        wxPen& secondary_colour);
-    void RemovePanelPadding(wxRect* rect);
-    void DrawDropdownArrow(wxDC& dc, int x, int y, const wxColour& colour);
-    void DrawGalleryBackgroundCommon(wxDC& dc, wxRibbonGallery* wnd,
-                        const wxRect& rect);
-    virtual void DrawGalleryButton(wxDC& dc, wxRect rect,
-        wxRibbonGalleryButtonState state, wxBitmap* bitmaps);
-    void DrawButtonBarButtonForeground(
-                        wxDC& dc,
-                        const wxRect& rect,
-                        wxRibbonButtonKind kind,
-                        long state,
-                        const wxString& label,
-                        const wxBitmap& bitmap_large,
-                        const wxBitmap& bitmap_small);
-    void DrawMinimisedPanelCommon(
-                        wxDC& dc,
-                        wxRibbonPanel* wnd,
-                        const wxRect& rect,
-                        wxRect* preview_rect);
-    void CloneTo(wxRibbonMSWArtProvider* copy) const;
-
-    wxBitmap m_cached_tab_separator;
-    wxBitmap m_gallery_up_bitmap[4];
-    wxBitmap m_gallery_down_bitmap[4];
-    wxBitmap m_gallery_extension_bitmap[4];
-    wxBitmap m_toolbar_drop_bitmap;
-    wxBitmap m_panel_extension_bitmap[2];
-    wxBitmap m_ribbon_toggle_up_bitmap[2];
-    wxBitmap m_ribbon_toggle_down_bitmap[2];
-    wxBitmap m_ribbon_toggle_pin_bitmap[2];
-    wxBitmap m_ribbon_bar_help_button_bitmap[2];
-
-    wxColour m_primary_scheme_colour;
-    wxColour m_secondary_scheme_colour;
-    wxColour m_tertiary_scheme_colour;
-
-    wxColour m_button_bar_label_colour;
-    wxColour m_button_bar_label_disabled_colour;
-    wxColour m_tab_label_colour;
-    wxColour m_tab_separator_colour;
-    wxColour m_tab_separator_gradient_colour;
-    wxColour m_tab_active_background_colour;
-    wxColour m_tab_active_background_gradient_colour;
-    wxColour m_tab_hover_background_colour;
-    wxColour m_tab_hover_background_gradient_colour;
-    wxColour m_tab_hover_background_top_colour;
-    wxColour m_tab_hover_background_top_gradient_colour;
-    wxColour m_panel_label_colour;
-    wxColour m_panel_minimised_label_colour;
-    wxColour m_panel_hover_label_colour;
-    wxColour m_panel_active_background_colour;
-    wxColour m_panel_active_background_gradient_colour;
-    wxColour m_panel_active_background_top_colour;
-    wxColour m_panel_active_background_top_gradient_colour;
-    wxColour m_panel_button_face_colour;
-    wxColour m_panel_button_hover_face_colour;
-    wxColour m_page_toggle_face_colour;
-    wxColour m_page_toggle_hover_face_colour;
-    wxColour m_page_background_colour;
-    wxColour m_page_background_gradient_colour;
-    wxColour m_page_background_top_colour;
-    wxColour m_page_background_top_gradient_colour;
-    wxColour m_page_hover_background_colour;
-    wxColour m_page_hover_background_gradient_colour;
-    wxColour m_page_hover_background_top_colour;
-    wxColour m_page_hover_background_top_gradient_colour;
-    wxColour m_button_bar_hover_background_colour;
-    wxColour m_button_bar_hover_background_gradient_colour;
-    wxColour m_button_bar_hover_background_top_colour;
-    wxColour m_button_bar_hover_background_top_gradient_colour;
-    wxColour m_button_bar_active_background_colour;
-    wxColour m_button_bar_active_background_gradient_colour;
-    wxColour m_button_bar_active_background_top_colour;
-    wxColour m_button_bar_active_background_top_gradient_colour;
-    wxColour m_gallery_button_background_colour;
-    wxColour m_gallery_button_background_gradient_colour;
-    wxColour m_gallery_button_hover_background_colour;
-    wxColour m_gallery_button_hover_background_gradient_colour;
-    wxColour m_gallery_button_active_background_colour;
-    wxColour m_gallery_button_active_background_gradient_colour;
-    wxColour m_gallery_button_disabled_background_colour;
-    wxColour m_gallery_button_disabled_background_gradient_colour;
-    wxColour m_gallery_button_face_colour;
-    wxColour m_gallery_button_hover_face_colour;
-    wxColour m_gallery_button_active_face_colour;
-    wxColour m_gallery_button_disabled_face_colour;
-
-    wxColour m_tool_face_colour;
-    wxColour m_tool_background_top_colour;
-    wxColour m_tool_background_top_gradient_colour;
-    wxColour m_tool_background_colour;
-    wxColour m_tool_background_gradient_colour;
-    wxColour m_tool_hover_background_top_colour;
-    wxColour m_tool_hover_background_top_gradient_colour;
-    wxColour m_tool_hover_background_colour;
-    wxColour m_tool_hover_background_gradient_colour;
-    wxColour m_tool_active_background_top_colour;
-    wxColour m_tool_active_background_top_gradient_colour;
-    wxColour m_tool_active_background_colour;
-    wxColour m_tool_active_background_gradient_colour;
-
-    wxBrush m_tab_ctrl_background_brush;
-    wxBrush m_panel_label_background_brush;
-    wxBrush m_panel_hover_label_background_brush;
-    wxBrush m_panel_hover_button_background_brush;
-    wxBrush m_gallery_hover_background_brush;
-    wxBrush m_gallery_button_background_top_brush;
-    wxBrush m_gallery_button_hover_background_top_brush;
-    wxBrush m_gallery_button_active_background_top_brush;
-    wxBrush m_gallery_button_disabled_background_top_brush;
-    wxBrush m_ribbon_toggle_brush;
-
-    wxFont m_tab_label_font;
-    wxFont m_panel_label_font;
-    wxFont m_button_bar_label_font;
-
-    wxPen m_page_border_pen;
-    wxPen m_panel_border_pen;
-    wxPen m_panel_border_gradient_pen;
-    wxPen m_panel_minimised_border_pen;
-    wxPen m_panel_minimised_border_gradient_pen;
-    wxPen m_panel_hover_button_border_pen;
-    wxPen m_tab_border_pen;
-    wxPen m_button_bar_hover_border_pen;
-    wxPen m_button_bar_active_border_pen;
-    wxPen m_gallery_border_pen;
-    wxPen m_gallery_item_border_pen;
-    wxPen m_toolbar_border_pen;
-    wxPen m_ribbon_toggle_pen;
-
-    double m_cached_tab_separator_visibility;
-    long m_flags;
-
-    int m_tab_separation_size;
-    int m_page_border_left;
-    int m_page_border_top;
-    int m_page_border_right;
-    int m_page_border_bottom;
-    int m_panel_x_separation_size;
-    int m_panel_y_separation_size;
-    int m_tool_group_separation_size;
-    int m_gallery_bitmap_padding_left_size;
-    int m_gallery_bitmap_padding_right_size;
-    int m_gallery_bitmap_padding_top_size;
-    int m_gallery_bitmap_padding_bottom_size;
-    int m_toggle_button_offset;
-    int m_help_button_offset;
-};
-
-class WXDLLIMPEXP_RIBBON wxRibbonAUIArtProvider : public wxRibbonMSWArtProvider
-{
-public:
-    wxRibbonAUIArtProvider();
-    virtual ~wxRibbonAUIArtProvider();
-
-    wxRibbonArtProvider* Clone() const;
-
-    wxColour GetColour(int id) const;
-    void SetColour(int id, const wxColor& colour);
-    void SetColourScheme(const wxColour& primary,
-                         const wxColour& secondary,
-                         const wxColour& tertiary);
-    void SetFont(int id, const wxFont& font);
-
-    wxSize GetScrollButtonMinimumSize(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        long style);
-
-    void DrawScrollButton(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect,
-                        long style);
-
-    wxSize GetPanelSize(
-                        wxDC& dc,
-                        const wxRibbonPanel* wnd,
-                        wxSize client_size,
-                        wxPoint* client_offset);
-
-    wxSize GetPanelClientSize(
-                        wxDC& dc,
-                        const wxRibbonPanel* wnd,
-                        wxSize size,
-                        wxPoint* client_offset);
-
-    wxRect GetPanelExtButtonArea(
-                        wxDC& dc,
-                        const wxRibbonPanel* wnd,
-                        wxRect rect);
-
-    void DrawTabCtrlBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect);
-
-    int GetTabCtrlHeight(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRibbonPageTabInfoArray& pages);
-
-    void GetBarTabWidth(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxString& label,
-                        const wxBitmap& bitmap,
-                        int* ideal,
-                        int* small_begin_need_separator,
-                        int* small_must_have_separator,
-                        int* minimum);
-
-    void DrawTab(wxDC& dc,
-                 wxWindow* wnd,
-                 const wxRibbonPageTabInfo& tab);
-
-    void DrawTabSeparator(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect,
-                        double visibility);
-
-    void DrawPageBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect);
-
-    void DrawPanelBackground(
-                        wxDC& dc,
-                        wxRibbonPanel* wnd,
-                        const wxRect& rect);
-
-    void DrawMinimisedPanel(
-                        wxDC& dc,
-                        wxRibbonPanel* wnd,
-                        const wxRect& rect,
-                        wxBitmap& bitmap);
-
-    void DrawGalleryBackground(
-                        wxDC& dc,
-                        wxRibbonGallery* wnd,
-                        const wxRect& rect);
-
-    void DrawGalleryItemBackground(
-                        wxDC& dc,
-                        wxRibbonGallery* wnd,
-                        const wxRect& rect,
-                        wxRibbonGalleryItem* item);
-
-    void DrawButtonBarBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect);
-
-    void DrawButtonBarButton(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect,
-                        wxRibbonButtonKind kind,
-                        long state,
-                        const wxString& label,
-                        const wxBitmap& bitmap_large,
-                        const wxBitmap& bitmap_small);
-
-    void DrawToolBarBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect);
-
-    void DrawToolGroupBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect);
-
-    void DrawTool(
-                wxDC& dc,
-                wxWindow* wnd,
-                const wxRect& rect,
-                const wxBitmap& bitmap,
-                wxRibbonButtonKind kind,
-                long state);
-
-protected:
-    void DrawPartialPanelBackground(wxDC& dc, wxWindow* wnd,
-        const wxRect& rect);
-    void DrawGalleryButton(wxDC& dc, wxRect rect,
-        wxRibbonGalleryButtonState state, wxBitmap* bitmaps);
-
-    wxColour m_tab_ctrl_background_colour;
-    wxColour m_tab_ctrl_background_gradient_colour;
-    wxColour m_panel_label_background_colour;
-    wxColour m_panel_label_background_gradient_colour;
-    wxColour m_panel_hover_label_background_colour;
-    wxColour m_panel_hover_label_background_gradient_colour;
-
-    wxBrush m_background_brush;
-    wxBrush m_tab_active_top_background_brush;
-    wxBrush m_tab_hover_background_brush;
-    wxBrush m_button_bar_hover_background_brush;
-    wxBrush m_button_bar_active_background_brush;
-    wxBrush m_gallery_button_active_background_brush;
-    wxBrush m_gallery_button_hover_background_brush;
-    wxBrush m_gallery_button_disabled_background_brush;
-    wxBrush m_tool_hover_background_brush;
-    wxBrush m_tool_active_background_brush;
-
-    wxPen m_toolbar_hover_borden_pen;
-
-    wxFont m_tab_active_label_font;
-};
-
-#if defined(__WXMSW__)
-typedef wxRibbonMSWArtProvider wxRibbonDefaultArtProvider;
-#elif defined(__WXOSX_CARBON__) || \
-      defined(__WXOSX_COCOA__) || \
-      defined(__WXOSX_IPHONE__) || \
-      defined(__WXCOCOA__)
-// TODO: Once implemented, change typedef to OSX
-// typedef wxRibbonOSXArtProvider wxRibbonDefaultArtProvider;
-typedef wxRibbonAUIArtProvider wxRibbonDefaultArtProvider;
-#else
-// TODO: Once implemented, change typedef to AUI
-typedef wxRibbonAUIArtProvider wxRibbonDefaultArtProvider;
-#endif
-
-#endif // wxUSE_RIBBON
-
-#endif // _WX_RIBBON_ART_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/art_internal.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/art_internal.h
deleted file mode 100644
index 879b22d866..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/art_internal.h
+++ /dev/null
@@ -1,81 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/ribbon/art_internal.h
-// Purpose:     Helper functions & classes used by ribbon art providers
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-08-04
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RIBBON_ART_INTERNAL_H_
-#define _WX_RIBBON_ART_INTERNAL_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_RIBBON
-
-WXDLLIMPEXP_RIBBON wxColour wxRibbonInterpolateColour(
-                                const wxColour& start_colour,
-                                const wxColour& end_colour,
-                                int position,
-                                int start_position,
-                                int end_position);
-
-WXDLLIMPEXP_RIBBON bool wxRibbonCanLabelBreakAtPosition(
-                                const wxString& label,
-                                size_t pos);
-
-WXDLLIMPEXP_RIBBON void wxRibbonDrawParallelGradientLines(
-                                wxDC& dc,
-                                int nlines,
-                                const wxPoint* line_origins,
-                                int stepx,
-                                int stepy,
-                                int numsteps,
-                                int offset_x,
-                                int offset_y,
-                                const wxColour& start_colour,
-                                const wxColour& end_colour);
-
-WXDLLIMPEXP_RIBBON wxBitmap wxRibbonLoadPixmap(
-                                const char* const* bits,
-                                wxColour fore);
-
-/*
-   HSL colour class, using interface as discussed in wx-dev. Provided mainly
-   for art providers to perform colour scheme calculations in the HSL colour
-   space. If such a class makes it into base / core, then this class should be
-   removed and users switched over to the one in base / core.
-
-   0.0 <= Hue < 360.0
-   0.0 <= Saturation <= 1.0
-   0.0 <= Luminance <= 1.0
-*/
-class WXDLLIMPEXP_RIBBON wxRibbonHSLColour
-{
-public:
-   wxRibbonHSLColour()
-       : hue(0.0), saturation(0.0), luminance(0.0) {}
-   wxRibbonHSLColour(float H, float S, float L)
-       : hue(H), saturation(S), luminance(L) { }
-   wxRibbonHSLColour(const wxColour& C);
-
-   wxColour    ToRGB() const;
-
-   wxRibbonHSLColour& MakeDarker(float delta);
-   wxRibbonHSLColour Darker(float delta) const;
-   wxRibbonHSLColour Lighter(float delta) const;
-   wxRibbonHSLColour Saturated(float delta) const;
-   wxRibbonHSLColour Desaturated(float delta) const;
-   wxRibbonHSLColour ShiftHue(float delta) const;
-
-   float       hue, saturation, luminance;
-};
-
-WXDLLIMPEXP_RIBBON wxRibbonHSLColour wxRibbonShiftLuminance(
-                                wxRibbonHSLColour colour, float amount);
-
-#endif // wxUSE_RIBBON
-
-#endif // _WX_RIBBON_ART_INTERNAL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/bar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/bar.h
deleted file mode 100644
index 2b454543fd..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/bar.h
+++ /dev/null
@@ -1,296 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/ribbon/bar.h
-// Purpose:     Top-level component of the ribbon-bar-style interface
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-05-23
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RIBBON_BAR_H_
-#define _WX_RIBBON_BAR_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_RIBBON
-
-#include "wx/ribbon/control.h"
-#include "wx/ribbon/page.h"
-
-enum wxRibbonBarOption
-{
-    wxRIBBON_BAR_SHOW_PAGE_LABELS    = 1 << 0,
-    wxRIBBON_BAR_SHOW_PAGE_ICONS    = 1 << 1,
-    wxRIBBON_BAR_FLOW_HORIZONTAL    = 0,
-    wxRIBBON_BAR_FLOW_VERTICAL        = 1 << 2,
-    wxRIBBON_BAR_SHOW_PANEL_EXT_BUTTONS = 1 << 3,
-    wxRIBBON_BAR_SHOW_PANEL_MINIMISE_BUTTONS = 1 << 4,
-    wxRIBBON_BAR_ALWAYS_SHOW_TABS = 1 << 5,
-    wxRIBBON_BAR_SHOW_TOGGLE_BUTTON = 1 << 6,
-    wxRIBBON_BAR_SHOW_HELP_BUTTON = 1 << 7,
-
-    wxRIBBON_BAR_DEFAULT_STYLE =  wxRIBBON_BAR_FLOW_HORIZONTAL
-                                | wxRIBBON_BAR_SHOW_PAGE_LABELS
-                                | wxRIBBON_BAR_SHOW_PANEL_EXT_BUTTONS
-                                | wxRIBBON_BAR_SHOW_TOGGLE_BUTTON
-                                | wxRIBBON_BAR_SHOW_HELP_BUTTON,
-
-    wxRIBBON_BAR_FOLDBAR_STYLE =  wxRIBBON_BAR_FLOW_VERTICAL
-                                | wxRIBBON_BAR_SHOW_PAGE_ICONS
-                                | wxRIBBON_BAR_SHOW_PANEL_EXT_BUTTONS
-                                | wxRIBBON_BAR_SHOW_PANEL_MINIMISE_BUTTONS
-};
-
-enum wxRibbonDisplayMode
-{
-    wxRIBBON_BAR_PINNED,
-    wxRIBBON_BAR_MINIMIZED,
-    wxRIBBON_BAR_EXPANDED
-};
-
-class WXDLLIMPEXP_RIBBON wxRibbonBarEvent : public wxNotifyEvent
-{
-public:
-    wxRibbonBarEvent(wxEventType command_type = wxEVT_NULL,
-                       int win_id = 0,
-                       wxRibbonPage* page = NULL)
-        : wxNotifyEvent(command_type, win_id)
-        , m_page(page)
-    {
-    }
-#ifndef SWIG
-    wxRibbonBarEvent(const wxRibbonBarEvent& c) : wxNotifyEvent(c)
-    {
-        m_page = c.m_page;
-    }
-#endif
-    wxEvent *Clone() const { return new wxRibbonBarEvent(*this); }
-
-    wxRibbonPage* GetPage() {return m_page;}
-    void SetPage(wxRibbonPage* page) {m_page = page;}
-
-protected:
-    wxRibbonPage* m_page;
-
-#ifndef SWIG
-private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRibbonBarEvent)
-#endif
-};
-
-class WXDLLIMPEXP_RIBBON wxRibbonPageTabInfo
-{
-public:
-    wxRect rect;
-    wxRibbonPage *page;
-    int ideal_width;
-    int small_begin_need_separator_width;
-    int small_must_have_separator_width;
-    int minimum_width;
-    bool active;
-    bool hovered;
-    bool highlight;
-    bool shown;
-};
-
-#ifndef SWIG
-WX_DECLARE_USER_EXPORTED_OBJARRAY(wxRibbonPageTabInfo, wxRibbonPageTabInfoArray, WXDLLIMPEXP_RIBBON);
-#endif
-
-class WXDLLIMPEXP_RIBBON wxRibbonBar : public wxRibbonControl
-{
-public:
-    wxRibbonBar();
-
-    wxRibbonBar(wxWindow* parent,
-                  wxWindowID id = wxID_ANY,
-                  const wxPoint& pos = wxDefaultPosition,
-                  const wxSize& size = wxDefaultSize,
-                  long style = wxRIBBON_BAR_DEFAULT_STYLE);
-
-    virtual ~wxRibbonBar();
-
-    bool Create(wxWindow* parent,
-                wxWindowID id = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxRIBBON_BAR_DEFAULT_STYLE);
-
-    void SetTabCtrlMargins(int left, int right);
-
-    void SetArtProvider(wxRibbonArtProvider* art);
-
-    bool SetActivePage(size_t page);
-    bool SetActivePage(wxRibbonPage* page);
-    int GetActivePage() const;
-    wxRibbonPage* GetPage(int n);
-    size_t GetPageCount() const;
-    bool DismissExpandedPanel();
-    int GetPageNumber(wxRibbonPage* page) const;
-
-    void DeletePage(size_t n);
-    void ClearPages();
-
-    bool IsPageShown(size_t page) const;
-    void ShowPage(size_t page, bool show = true);
-    void HidePage(size_t page) { ShowPage(page, false); }
-
-    bool IsPageHighlighted(size_t page) const;
-    void AddPageHighlight(size_t page, bool highlight = true);
-    void RemovePageHighlight(size_t page) { AddPageHighlight(page, false); }
-
-    void ShowPanels(bool show = true);
-    void HidePanels() { ShowPanels(false); }
-    bool ArePanelsShown() const { return m_arePanelsShown; }
-
-    virtual bool HasMultiplePages() const { return true; }
-
-    void SetWindowStyleFlag(long style);
-    long GetWindowStyleFlag() const;
-    virtual bool Realize();
-
-    // Implementation only.
-    bool IsToggleButtonHovered() const { return m_toggle_button_hovered; }
-    bool IsHelpButtonHovered() const { return m_help_button_hovered; }
-
-    void HideIfExpanded();
-
-protected:
-    friend class wxRibbonPage;
-
-    virtual wxSize DoGetBestSize() const;
-    wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-    wxRibbonPageTabInfo* HitTestTabs(wxPoint position, int* index = NULL);
-    void HitTestRibbonButton(const wxRect& rect, const wxPoint& position, bool &hover_flag);
-
-    void CommonInit(long style);
-    void AddPage(wxRibbonPage *page);
-    void RecalculateTabSizes();
-    void RecalculateMinSize();
-    void ScrollTabBar(int npixels);
-    void RefreshTabBar();
-    void RepositionPage(wxRibbonPage *page);
-
-    void OnPaint(wxPaintEvent& evt);
-    void OnEraseBackground(wxEraseEvent& evt);
-    void DoEraseBackground(wxDC& dc);
-    void OnSize(wxSizeEvent& evt);
-    void OnMouseLeftDown(wxMouseEvent& evt);
-    void OnMouseLeftUp(wxMouseEvent& evt);
-    void OnMouseMiddleDown(wxMouseEvent& evt);
-    void OnMouseMiddleUp(wxMouseEvent& evt);
-    void OnMouseRightDown(wxMouseEvent& evt);
-    void OnMouseRightUp(wxMouseEvent& evt);
-    void OnMouseMove(wxMouseEvent& evt);
-    void OnMouseLeave(wxMouseEvent& evt);
-    void OnMouseDoubleClick(wxMouseEvent& evt);
-    void DoMouseButtonCommon(wxMouseEvent& evt, wxEventType tab_event_type);
-    void OnKillFocus(wxFocusEvent& evt);
-
-    wxRibbonPageTabInfoArray m_pages;
-    wxRect m_tab_scroll_left_button_rect;
-    wxRect m_tab_scroll_right_button_rect;
-    wxRect m_toggle_button_rect;
-    wxRect m_help_button_rect;
-    long m_flags;
-    int m_tabs_total_width_ideal;
-    int m_tabs_total_width_minimum;
-    int m_tab_margin_left;
-    int m_tab_margin_right;
-    int m_tab_height;
-    int m_tab_scroll_amount;
-    int m_current_page;
-    int m_current_hovered_page;
-    int m_tab_scroll_left_button_state;
-    int m_tab_scroll_right_button_state;
-    bool m_tab_scroll_buttons_shown;
-    bool m_arePanelsShown;
-    bool m_bar_hovered;
-    bool m_toggle_button_hovered;
-    bool m_help_button_hovered;
-
-    wxRibbonDisplayMode m_ribbon_state;
-
-#ifndef SWIG
-    DECLARE_CLASS(wxRibbonBar)
-    DECLARE_EVENT_TABLE()
-#endif
-};
-
-#ifndef SWIG
-
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_RIBBON, wxEVT_RIBBONBAR_PAGE_CHANGED, wxRibbonBarEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_RIBBON, wxEVT_RIBBONBAR_PAGE_CHANGING, wxRibbonBarEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_RIBBON, wxEVT_RIBBONBAR_TAB_MIDDLE_DOWN, wxRibbonBarEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_RIBBON, wxEVT_RIBBONBAR_TAB_MIDDLE_UP, wxRibbonBarEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_RIBBON, wxEVT_RIBBONBAR_TAB_RIGHT_DOWN, wxRibbonBarEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_RIBBON, wxEVT_RIBBONBAR_TAB_RIGHT_UP, wxRibbonBarEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_RIBBON, wxEVT_RIBBONBAR_TAB_LEFT_DCLICK, wxRibbonBarEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_RIBBON, wxEVT_RIBBONBAR_TOGGLED, wxRibbonBarEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_RIBBON, wxEVT_RIBBONBAR_HELP_CLICK, wxRibbonBarEvent);
-
-typedef void (wxEvtHandler::*wxRibbonBarEventFunction)(wxRibbonBarEvent&);
-
-#define wxRibbonBarEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxRibbonBarEventFunction, func)
-
-#define EVT_RIBBONBAR_PAGE_CHANGED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_RIBBONBAR_PAGE_CHANGED, winid, wxRibbonBarEventHandler(fn))
-#define EVT_RIBBONBAR_PAGE_CHANGING(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_RIBBONBAR_PAGE_CHANGING, winid, wxRibbonBarEventHandler(fn))
-#define EVT_RIBBONBAR_TAB_MIDDLE_DOWN(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_RIBBONBAR_TAB_MIDDLE_DOWN, winid, wxRibbonBarEventHandler(fn))
-#define EVT_RIBBONBAR_TAB_MIDDLE_UP(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_RIBBONBAR_TAB_MIDDLE_UP, winid, wxRibbonBarEventHandler(fn))
-#define EVT_RIBBONBAR_TAB_RIGHT_DOWN(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_RIBBONBAR_TAB_RIGHT_DOWN, winid, wxRibbonBarEventHandler(fn))
-#define EVT_RIBBONBAR_TAB_RIGHT_UP(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_RIBBONBAR_TAB_RIGHT_UP, winid, wxRibbonBarEventHandler(fn))
-#define EVT_RIBBONBAR_TAB_LEFT_DCLICK(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_RIBBONBAR_TAB_LEFT_DCLICK, winid, wxRibbonBarEventHandler(fn))
-#define EVT_RIBBONBAR_TOGGLED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_RIBBONBAR_TOGGLED, winid, wxRibbonBarEventHandler(fn))
-#define EVT_RIBBONBAR_HELP_CLICK(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_RIBBONBAR_HELP_CLICK, winid, wxRibbonBarEventHandler(fn))
-#else
-
-// wxpython/swig event work
-%constant wxEventType wxEVT_RIBBONBAR_PAGE_CHANGED;
-%constant wxEventType wxEVT_RIBBONBAR_PAGE_CHANGING;
-%constant wxEventType wxEVT_RIBBONBAR_TAB_MIDDLE_DOWN;
-%constant wxEventType wxEVT_RIBBONBAR_TAB_MIDDLE_UP;
-%constant wxEventType wxEVT_RIBBONBAR_TAB_RIGHT_DOWN;
-%constant wxEventType wxEVT_RIBBONBAR_TAB_RIGHT_UP;
-%constant wxEventType wxEVT_RIBBONBAR_TAB_LEFT_DCLICK;
-%constant wxEventType wxEVT_RIBBONBAR_TOGGLED;
-%constant wxEventType wxEVT_RIBBONBAR_HELP_CLICK;
-
-%pythoncode {
-    EVT_RIBBONBAR_PAGE_CHANGED = wx.PyEventBinder( wxEVT_RIBBONBAR_PAGE_CHANGED, 1 )
-    EVT_RIBBONBAR_PAGE_CHANGING = wx.PyEventBinder( wxEVT_RIBBONBAR_PAGE_CHANGING, 1 )
-    EVT_RIBBONBAR_TAB_MIDDLE_DOWN = wx.PyEventBinder( wxEVT_RIBBONBAR_TAB_MIDDLE_DOWN, 1 )
-    EVT_RIBBONBAR_TAB_MIDDLE_UP = wx.PyEventBinder( wxEVT_RIBBONBAR_TAB_MIDDLE_UP, 1 )
-    EVT_RIBBONBAR_TAB_RIGHT_DOWN = wx.PyEventBinder( wxEVT_RIBBONBAR_TAB_RIGHT_DOWN, 1 )
-    EVT_RIBBONBAR_TAB_RIGHT_UP = wx.PyEventBinder( wxEVT_RIBBONBAR_TAB_RIGHT_UP, 1 )
-    EVT_RIBBONBAR_TAB_LEFT_DCLICK = wx.PyEventBinder( wxEVT_RIBBONBAR_TAB_LEFT_DCLICK, 1 )
-    EVT_RIBBONBAR_TOGGLED = wx.PyEventBinder( wxEVT_RIBBONBAR_TOGGLED, 1 )
-    EVT_RIBBONBAR_HELP_CLICK = wx.PyEventBinder( wxEVT_RIBBONBAR_HELP_CLICK, 1 )
-}
-#endif
-
-// old wxEVT_COMMAND_* constants
-#define wxEVT_COMMAND_RIBBONBAR_PAGE_CHANGED      wxEVT_RIBBONBAR_PAGE_CHANGED
-#define wxEVT_COMMAND_RIBBONBAR_PAGE_CHANGING     wxEVT_RIBBONBAR_PAGE_CHANGING
-#define wxEVT_COMMAND_RIBBONBAR_TAB_MIDDLE_DOWN   wxEVT_RIBBONBAR_TAB_MIDDLE_DOWN
-#define wxEVT_COMMAND_RIBBONBAR_TAB_MIDDLE_UP     wxEVT_RIBBONBAR_TAB_MIDDLE_UP
-#define wxEVT_COMMAND_RIBBONBAR_TAB_RIGHT_DOWN    wxEVT_RIBBONBAR_TAB_RIGHT_DOWN
-#define wxEVT_COMMAND_RIBBONBAR_TAB_RIGHT_UP      wxEVT_RIBBONBAR_TAB_RIGHT_UP
-#define wxEVT_COMMAND_RIBBONBAR_TAB_LEFT_DCLICK   wxEVT_RIBBONBAR_TAB_LEFT_DCLICK
-#define wxEVT_COMMAND_RIBBONBAR_TOGGLED           wxEVT_RIBBONBAR_TOGGLED
-#define wxEVT_COMMAND_RIBBONBAR_HELP_CLICKED      wxEVT_RIBBONBAR_HELP_CLICK
-
-#endif // wxUSE_RIBBON
-
-#endif // _WX_RIBBON_BAR_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/buttonbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/buttonbar.h
deleted file mode 100644
index ab637a104e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/buttonbar.h
+++ /dev/null
@@ -1,268 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/ribbon/buttonbar.h
-// Purpose:     Ribbon control similar to a tool bar
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-07-01
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-#ifndef _WX_RIBBON_BUTTON_BAR_H_
-#define _WX_RIBBON_BUTTON_BAR_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_RIBBON
-
-#include "wx/ribbon/art.h"
-#include "wx/ribbon/control.h"
-#include "wx/dynarray.h"
-
-class wxRibbonButtonBarButtonBase;
-class wxRibbonButtonBarLayout;
-class wxRibbonButtonBarButtonInstance;
-
-WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxRibbonButtonBarLayout*, wxArrayRibbonButtonBarLayout, class WXDLLIMPEXP_RIBBON);
-WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxRibbonButtonBarButtonBase*, wxArrayRibbonButtonBarButtonBase, class WXDLLIMPEXP_RIBBON);
-
-class WXDLLIMPEXP_RIBBON wxRibbonButtonBar : public wxRibbonControl
-{
-public:
-    wxRibbonButtonBar();
-
-    wxRibbonButtonBar(wxWindow* parent,
-                  wxWindowID id = wxID_ANY,
-                  const wxPoint& pos = wxDefaultPosition,
-                  const wxSize& size = wxDefaultSize,
-                  long style = 0);
-
-    virtual ~wxRibbonButtonBar();
-
-    bool Create(wxWindow* parent,
-                wxWindowID id = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0);
-
-    virtual wxRibbonButtonBarButtonBase* AddButton(
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxString& help_string,
-                wxRibbonButtonKind kind = wxRIBBON_BUTTON_NORMAL);
-    // NB: help_string cannot be optional as that would cause the signature
-    // to be identical to the full version of AddButton when 3 arguments are
-    // given.
-
-    virtual wxRibbonButtonBarButtonBase* AddDropdownButton(
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxString& help_string = wxEmptyString);
-
-    virtual wxRibbonButtonBarButtonBase* AddHybridButton(
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxString& help_string = wxEmptyString);
-
-    virtual wxRibbonButtonBarButtonBase* AddToggleButton(
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxString& help_string = wxEmptyString);
-
-    virtual wxRibbonButtonBarButtonBase* AddButton(
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxBitmap& bitmap_small = wxNullBitmap,
-                const wxBitmap& bitmap_disabled = wxNullBitmap,
-                const wxBitmap& bitmap_small_disabled = wxNullBitmap,
-                wxRibbonButtonKind kind = wxRIBBON_BUTTON_NORMAL,
-                const wxString& help_string = wxEmptyString);
-
-    virtual wxRibbonButtonBarButtonBase* InsertButton(
-                size_t pos,
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxString& help_string,
-                wxRibbonButtonKind kind = wxRIBBON_BUTTON_NORMAL);
-
-    virtual wxRibbonButtonBarButtonBase* InsertDropdownButton(
-                size_t pos,
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxString& help_string = wxEmptyString);
-
-    virtual wxRibbonButtonBarButtonBase* InsertHybridButton(
-                size_t pos,
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxString& help_string = wxEmptyString);
-
-    virtual wxRibbonButtonBarButtonBase* InsertToggleButton(
-                size_t pos,
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxString& help_string = wxEmptyString);
-
-    virtual wxRibbonButtonBarButtonBase* InsertButton(
-                size_t pos,
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxBitmap& bitmap_small = wxNullBitmap,
-                const wxBitmap& bitmap_disabled = wxNullBitmap,
-                const wxBitmap& bitmap_small_disabled = wxNullBitmap,
-                wxRibbonButtonKind kind = wxRIBBON_BUTTON_NORMAL,
-                const wxString& help_string = wxEmptyString);
-
-    void SetItemClientObject(wxRibbonButtonBarButtonBase* item, wxClientData* data);
-    wxClientData* GetItemClientObject(const wxRibbonButtonBarButtonBase* item) const;
-    void SetItemClientData(wxRibbonButtonBarButtonBase* item, void* data);
-    void* GetItemClientData(const wxRibbonButtonBarButtonBase* item) const;
-
-    virtual size_t GetButtonCount() const;
-    virtual wxRibbonButtonBarButtonBase *GetItem(size_t n) const;
-    virtual wxRibbonButtonBarButtonBase *GetItemById(int id) const;
-    virtual int GetItemId(wxRibbonButtonBarButtonBase *button) const;
-
-
-    virtual bool Realize();
-    virtual void ClearButtons();
-    virtual bool DeleteButton(int button_id);
-    virtual void EnableButton(int button_id, bool enable = true);
-    virtual void ToggleButton(int button_id, bool checked);
-
-    virtual wxRibbonButtonBarButtonBase *GetActiveItem() const;
-    virtual wxRibbonButtonBarButtonBase *GetHoveredItem() const;
-
-    virtual void SetArtProvider(wxRibbonArtProvider* art);
-    virtual bool IsSizingContinuous() const;
-
-    virtual wxSize GetMinSize() const;
-
-    void SetShowToolTipsForDisabled(bool show);
-    bool GetShowToolTipsForDisabled() const;
-
-protected:
-    friend class wxRibbonButtonBarEvent;
-    virtual wxSize DoGetBestSize() const;
-    wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-    void OnEraseBackground(wxEraseEvent& evt);
-    void OnPaint(wxPaintEvent& evt);
-    void OnSize(wxSizeEvent& evt);
-    void OnMouseMove(wxMouseEvent& evt);
-    void OnMouseEnter(wxMouseEvent& evt);
-    void OnMouseLeave(wxMouseEvent& evt);
-    void OnMouseDown(wxMouseEvent& evt);
-    void OnMouseUp(wxMouseEvent& evt);
-
-    virtual wxSize DoGetNextSmallerSize(wxOrientation direction,
-                                      wxSize relative_to) const;
-    virtual wxSize DoGetNextLargerSize(wxOrientation direction,
-                                     wxSize relative_to) const;
-
-    void CommonInit(long style);
-    void MakeLayouts();
-    bool TryCollapseLayout(wxRibbonButtonBarLayout* original, size_t first_btn, size_t* last_button);
-    static wxBitmap MakeResizedBitmap(const wxBitmap& original, wxSize size);
-    static wxBitmap MakeDisabledBitmap(const wxBitmap& original);
-    void FetchButtonSizeInfo(wxRibbonButtonBarButtonBase* button,
-        wxRibbonButtonBarButtonState size, wxDC& dc);
-    virtual void UpdateWindowUI(long flags);
-
-    wxArrayRibbonButtonBarLayout m_layouts;
-    wxArrayRibbonButtonBarButtonBase m_buttons;
-    wxRibbonButtonBarButtonInstance* m_hovered_button;
-    wxRibbonButtonBarButtonInstance* m_active_button;
-
-    wxPoint m_layout_offset;
-    wxSize m_bitmap_size_large;
-    wxSize m_bitmap_size_small;
-    int m_current_layout;
-    bool m_layouts_valid;
-    bool m_lock_active_state;
-    bool m_show_tooltips_for_disabled;
-
-#ifndef SWIG
-    DECLARE_CLASS(wxRibbonButtonBar)
-    DECLARE_EVENT_TABLE()
-#endif
-};
-
-class WXDLLIMPEXP_RIBBON wxRibbonButtonBarEvent : public wxCommandEvent
-{
-public:
-    wxRibbonButtonBarEvent(wxEventType command_type = wxEVT_NULL,
-                       int win_id = 0,
-                       wxRibbonButtonBar* bar = NULL,
-                       wxRibbonButtonBarButtonBase* button = NULL)
-        : wxCommandEvent(command_type, win_id)
-        , m_bar(bar), m_button(button)
-    {
-    }
-#ifndef SWIG
-    wxRibbonButtonBarEvent(const wxRibbonButtonBarEvent& e) : wxCommandEvent(e)
-    {
-        m_bar = e.m_bar;
-        m_button = e.m_button;
-    }
-#endif
-    wxEvent *Clone() const { return new wxRibbonButtonBarEvent(*this); }
-
-    wxRibbonButtonBar* GetBar() {return m_bar;}
-    wxRibbonButtonBarButtonBase *GetButton() { return m_button; }
-    void SetBar(wxRibbonButtonBar* bar) {m_bar = bar;}
-    void SetButton(wxRibbonButtonBarButtonBase* button) { m_button = button; }
-    bool PopupMenu(wxMenu* menu);
-
-protected:
-    wxRibbonButtonBar* m_bar;
-    wxRibbonButtonBarButtonBase *m_button;
-
-#ifndef SWIG
-private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRibbonButtonBarEvent)
-#endif
-};
-
-#ifndef SWIG
-
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_RIBBON, wxEVT_RIBBONBUTTONBAR_CLICKED, wxRibbonButtonBarEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_RIBBON, wxEVT_RIBBONBUTTONBAR_DROPDOWN_CLICKED, wxRibbonButtonBarEvent);
-
-typedef void (wxEvtHandler::*wxRibbonButtonBarEventFunction)(wxRibbonButtonBarEvent&);
-
-#define wxRibbonButtonBarEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxRibbonButtonBarEventFunction, func)
-
-#define EVT_RIBBONBUTTONBAR_CLICKED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_RIBBONBUTTONBAR_CLICKED, winid, wxRibbonButtonBarEventHandler(fn))
-#define EVT_RIBBONBUTTONBAR_DROPDOWN_CLICKED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_RIBBONBUTTONBAR_DROPDOWN_CLICKED, winid, wxRibbonButtonBarEventHandler(fn))
-#else
-
-// wxpython/swig event work
-%constant wxEventType wxEVT_RIBBONBUTTONBAR_CLICKED;
-%constant wxEventType wxEVT_RIBBONBUTTONBAR_DROPDOWN_CLICKED;
-
-%pythoncode {
-    EVT_RIBBONBUTTONBAR_CLICKED = wx.PyEventBinder( wxEVT_RIBBONBUTTONBAR_CLICKED, 1 )
-    EVT_RIBBONBUTTONBAR_DROPDOWN_CLICKED = wx.PyEventBinder( wxEVT_RIBBONBUTTONBAR_DROPDOWN_CLICKED, 1 )
-}
-#endif
-
-// old wxEVT_COMMAND_* constants
-#define wxEVT_COMMAND_RIBBONBUTTON_CLICKED            wxEVT_RIBBONBUTTONBAR_CLICKED
-#define wxEVT_COMMAND_RIBBONBUTTON_DROPDOWN_CLICKED   wxEVT_RIBBONBUTTONBAR_DROPDOWN_CLICKED
-
-#endif // wxUSE_RIBBON
-
-#endif // _WX_RIBBON_BUTTON_BAR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/control.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/control.h
deleted file mode 100644
index cbd445b8d3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/control.h
+++ /dev/null
@@ -1,83 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/ribbon/control.h
-// Purpose:     Extension of wxControl with common ribbon methods
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-06-05
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RIBBON_CONTROL_H_
-#define _WX_RIBBON_CONTROL_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_RIBBON
-
-#include "wx/control.h"
-#include "wx/dynarray.h"
-
-class wxRibbonBar;
-class wxRibbonArtProvider;
-
-class WXDLLIMPEXP_RIBBON wxRibbonControl : public wxControl
-{
-public:
-    wxRibbonControl() { Init(); }
-
-    wxRibbonControl(wxWindow *parent, wxWindowID id,
-                    const wxPoint& pos = wxDefaultPosition,
-                    const wxSize& size = wxDefaultSize, long style = 0,
-                    const wxValidator& validator = wxDefaultValidator,
-                    const wxString& name = wxControlNameStr)
-    {
-        Init();
-
-        Create(parent, id, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize, long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxControlNameStr);
-
-    virtual void SetArtProvider(wxRibbonArtProvider* art);
-    wxRibbonArtProvider* GetArtProvider() const {return m_art;}
-
-    virtual bool IsSizingContinuous() const {return true;}
-    wxSize GetNextSmallerSize(wxOrientation direction, wxSize relative_to) const;
-    wxSize GetNextLargerSize(wxOrientation direction, wxSize relative_to) const;
-    wxSize GetNextSmallerSize(wxOrientation direction) const;
-    wxSize GetNextLargerSize(wxOrientation direction) const;
-
-    virtual bool Realize();
-    bool Realise() {return Realize();}
-
-    virtual wxRibbonBar* GetAncestorRibbonBar()const;
-
-    // Finds the best width and height given the parent's width and height
-    virtual wxSize GetBestSizeForParentSize(const wxSize& WXUNUSED(parentSize)) const { return GetBestSize(); }
-
-protected:
-    wxRibbonArtProvider* m_art;
-
-    virtual wxSize DoGetNextSmallerSize(wxOrientation direction,
-                                        wxSize relative_to) const;
-    virtual wxSize DoGetNextLargerSize(wxOrientation direction,
-                                       wxSize relative_to) const;
-
-private:
-    void Init() { m_art = NULL; }
-
-#ifndef SWIG
-    DECLARE_CLASS(wxRibbonControl)
-#endif
-};
-
-WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxRibbonControl*, wxArrayRibbonControl, class WXDLLIMPEXP_RIBBON);
-
-#endif // wxUSE_RIBBON
-
-#endif // _WX_RIBBON_CONTROL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/gallery.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/gallery.h
deleted file mode 100644
index 665c69420d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/gallery.h
+++ /dev/null
@@ -1,196 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/ribbon/gallery.h
-// Purpose:     Ribbon control which displays a gallery of items to choose from
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-07-22
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-#ifndef _WX_RIBBON_GALLERY_H_
-#define _WX_RIBBON_GALLERY_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_RIBBON
-
-#include "wx/ribbon/art.h"
-#include "wx/ribbon/control.h"
-
-class wxRibbonGalleryItem;
-
-WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxRibbonGalleryItem*, wxArrayRibbonGalleryItem, class WXDLLIMPEXP_RIBBON);
-
-class WXDLLIMPEXP_RIBBON wxRibbonGallery : public wxRibbonControl
-{
-public:
-    wxRibbonGallery();
-
-    wxRibbonGallery(wxWindow* parent,
-                  wxWindowID id = wxID_ANY,
-                  const wxPoint& pos = wxDefaultPosition,
-                  const wxSize& size = wxDefaultSize,
-                  long style = 0);
-
-    virtual ~wxRibbonGallery();
-
-    bool Create(wxWindow* parent,
-                wxWindowID id = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0);
-
-    void Clear();
-
-    bool IsEmpty() const;
-    unsigned int GetCount() const;
-    wxRibbonGalleryItem* GetItem(unsigned int n);
-    wxRibbonGalleryItem* Append(const wxBitmap& bitmap, int id);
-    wxRibbonGalleryItem* Append(const wxBitmap& bitmap, int id, void* clientData);
-    wxRibbonGalleryItem* Append(const wxBitmap& bitmap, int id, wxClientData* clientData);
-
-    void SetItemClientObject(wxRibbonGalleryItem* item, wxClientData* data);
-    wxClientData* GetItemClientObject(const wxRibbonGalleryItem* item) const;
-    void SetItemClientData(wxRibbonGalleryItem* item, void* data);
-    void* GetItemClientData(const wxRibbonGalleryItem* item) const;
-
-    void SetSelection(wxRibbonGalleryItem* item);
-    wxRibbonGalleryItem* GetSelection() const;
-    wxRibbonGalleryItem* GetHoveredItem() const;
-    wxRibbonGalleryItem* GetActiveItem() const;
-    wxRibbonGalleryButtonState GetUpButtonState() const;
-    wxRibbonGalleryButtonState GetDownButtonState() const;
-    wxRibbonGalleryButtonState GetExtensionButtonState() const;
-
-    bool IsHovered() const;
-    virtual bool IsSizingContinuous() const;
-    virtual bool Realize();
-    virtual bool Layout();
-
-    virtual bool ScrollLines(int lines);
-    bool ScrollPixels(int pixels);
-    void EnsureVisible(const wxRibbonGalleryItem* item);
-
-protected:
-    wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-    void CommonInit(long style);
-    void CalculateMinSize();
-    bool TestButtonHover(const wxRect& rect, wxPoint pos,
-        wxRibbonGalleryButtonState* state);
-
-    void OnEraseBackground(wxEraseEvent& evt);
-    void OnMouseEnter(wxMouseEvent& evt);
-    void OnMouseMove(wxMouseEvent& evt);
-    void OnMouseLeave(wxMouseEvent& evt);
-    void OnMouseDown(wxMouseEvent& evt);
-    void OnMouseUp(wxMouseEvent& evt);
-    void OnMouseDClick(wxMouseEvent& evt);
-    void OnPaint(wxPaintEvent& evt);
-    void OnSize(wxSizeEvent& evt);
-    int GetScrollLineSize() const;
-
-    virtual wxSize DoGetBestSize() const;
-    virtual wxSize DoGetNextSmallerSize(wxOrientation direction,
-                                        wxSize relative_to) const;
-    virtual wxSize DoGetNextLargerSize(wxOrientation direction,
-                                       wxSize relative_to) const;
-
-    wxArrayRibbonGalleryItem m_items;
-    wxRibbonGalleryItem* m_selected_item;
-    wxRibbonGalleryItem* m_hovered_item;
-    wxRibbonGalleryItem* m_active_item;
-    wxSize m_bitmap_size;
-    wxSize m_bitmap_padded_size;
-    wxSize m_best_size;
-    wxRect m_client_rect;
-    wxRect m_scroll_up_button_rect;
-    wxRect m_scroll_down_button_rect;
-    wxRect m_extension_button_rect;
-    const wxRect* m_mouse_active_rect;
-    int m_item_separation_x;
-    int m_item_separation_y;
-    int m_scroll_amount;
-    int m_scroll_limit;
-    wxRibbonGalleryButtonState m_up_button_state;
-    wxRibbonGalleryButtonState m_down_button_state;
-    wxRibbonGalleryButtonState m_extension_button_state;
-    bool m_hovered;
-
-#ifndef SWIG
-    DECLARE_CLASS(wxRibbonGallery)
-    DECLARE_EVENT_TABLE()
-#endif
-};
-
-class WXDLLIMPEXP_RIBBON wxRibbonGalleryEvent : public wxCommandEvent
-{
-public:
-    wxRibbonGalleryEvent(wxEventType command_type = wxEVT_NULL,
-                       int win_id = 0,
-                       wxRibbonGallery* gallery = NULL,
-                       wxRibbonGalleryItem* item = NULL)
-        : wxCommandEvent(command_type, win_id)
-        , m_gallery(gallery), m_item(item)
-    {
-    }
-#ifndef SWIG
-    wxRibbonGalleryEvent(const wxRibbonGalleryEvent& e) : wxCommandEvent(e)
-    {
-        m_gallery = e.m_gallery;
-        m_item = e.m_item;
-    }
-#endif
-    wxEvent *Clone() const { return new wxRibbonGalleryEvent(*this); }
-
-    wxRibbonGallery* GetGallery() {return m_gallery;}
-    wxRibbonGalleryItem* GetGalleryItem() {return m_item;}
-    void SetGallery(wxRibbonGallery* gallery) {m_gallery = gallery;}
-    void SetGalleryItem(wxRibbonGalleryItem* item) {m_item = item;}
-
-protected:
-    wxRibbonGallery* m_gallery;
-    wxRibbonGalleryItem* m_item;
-
-#ifndef SWIG
-private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRibbonGalleryEvent)
-#endif
-};
-
-#ifndef SWIG
-
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_RIBBON, wxEVT_RIBBONGALLERY_HOVER_CHANGED, wxRibbonGalleryEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_RIBBON, wxEVT_RIBBONGALLERY_SELECTED, wxRibbonGalleryEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_RIBBON, wxEVT_RIBBONGALLERY_CLICKED, wxRibbonGalleryEvent);
-
-typedef void (wxEvtHandler::*wxRibbonGalleryEventFunction)(wxRibbonGalleryEvent&);
-
-#define wxRibbonGalleryEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxRibbonGalleryEventFunction, func)
-
-#define EVT_RIBBONGALLERY_HOVER_CHANGED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_RIBBONGALLERY_HOVER_CHANGED, winid, wxRibbonGalleryEventHandler(fn))
-#define EVT_RIBBONGALLERY_SELECTED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_RIBBONGALLERY_SELECTED, winid, wxRibbonGalleryEventHandler(fn))
-#define EVT_RIBBONGALLERY_CLICKED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_RIBBONGALLERY_CLICKED, winid, wxRibbonGalleryEventHandler(fn))
-#else
-
-// wxpython/swig event work
-%constant wxEventType wxEVT_RIBBONGALLERY_HOVER_CHANGED;
-%constant wxEventType wxEVT_RIBBONGALLERY_SELECTED;
-
-%pythoncode {
-    EVT_RIBBONGALLERY_HOVER_CHANGED = wx.PyEventBinder( wxEVT_RIBBONGALLERY_HOVER_CHANGED, 1 )
-    EVT_RIBBONGALLERY_SELECTED = wx.PyEventBinder( wxEVT_RIBBONGALLERY_SELECTED, 1 )
-}
-#endif // SWIG
-
-// old wxEVT_COMMAND_* constants
-#define wxEVT_COMMAND_RIBBONGALLERY_HOVER_CHANGED   wxEVT_RIBBONGALLERY_HOVER_CHANGED
-#define wxEVT_COMMAND_RIBBONGALLERY_SELECTED        wxEVT_RIBBONGALLERY_SELECTED
-#define wxEVT_COMMAND_RIBBONGALLERY_CLICKED         wxEVT_RIBBONGALLERY_CLICKED
-
-#endif // wxUSE_RIBBON
-
-#endif // _WX_RIBBON_GALLERY_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/page.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/page.h
deleted file mode 100644
index 33a961412f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/page.h
+++ /dev/null
@@ -1,105 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/ribbon/page.h
-// Purpose:     Container for ribbon-bar-style interface panels
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-05-25
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RIBBON_PAGE_H_
-#define _WX_RIBBON_PAGE_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_RIBBON
-
-#include "wx/ribbon/control.h"
-#include "wx/ribbon/panel.h"
-#include "wx/bitmap.h"
-
-class wxRibbonBar;
-class wxRibbonPageScrollButton;
-
-class WXDLLIMPEXP_RIBBON wxRibbonPage : public wxRibbonControl
-{
-public:
-    wxRibbonPage();
-
-    wxRibbonPage(wxRibbonBar* parent,
-                 wxWindowID id = wxID_ANY,
-                 const wxString& label = wxEmptyString,
-                 const wxBitmap& icon = wxNullBitmap,
-                 long style = 0);
-
-    virtual ~wxRibbonPage();
-
-    bool Create(wxRibbonBar* parent,
-                wxWindowID id = wxID_ANY,
-                const wxString& label = wxEmptyString,
-                const wxBitmap& icon = wxNullBitmap,
-                long style = 0);
-
-    void SetArtProvider(wxRibbonArtProvider* art);
-
-    wxBitmap& GetIcon() {return m_icon;}
-    virtual wxSize GetMinSize() const;
-    void SetSizeWithScrollButtonAdjustment(int x, int y, int width, int height);
-    void AdjustRectToIncludeScrollButtons(wxRect* rect) const;
-
-    bool DismissExpandedPanel();
-
-    virtual bool Realize();
-    virtual bool Show(bool show = true);
-    virtual bool Layout();
-    virtual bool ScrollLines(int lines);
-    bool ScrollPixels(int pixels);
-    bool ScrollSections(int sections);
-
-    wxOrientation GetMajorAxis() const;
-
-    virtual void RemoveChild(wxWindowBase *child);
-
-    void HideIfExpanded();
-
-protected:
-    virtual wxSize DoGetBestSize() const;
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-    void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-    bool DoActualLayout();
-    void OnEraseBackground(wxEraseEvent& evt);
-    void OnPaint(wxPaintEvent& evt);
-    void OnSize(wxSizeEvent& evt);
-
-    bool ExpandPanels(wxOrientation direction, int maximum_amount);
-    bool CollapsePanels(wxOrientation direction, int minimum_amount);
-    void ShowScrollButtons();
-    void HideScrollButtons();
-
-    void CommonInit(const wxString& label, const wxBitmap& icon);
-    void PopulateSizeCalcArray(wxSize (wxWindow::*get_size)(void) const);
-
-    wxArrayRibbonControl m_collapse_stack;
-    wxBitmap m_icon;
-    wxSize m_old_size;
-    // NB: Scroll button windows are siblings rather than children (to get correct clipping of children)
-    wxRibbonPageScrollButton* m_scroll_left_btn;
-    wxRibbonPageScrollButton* m_scroll_right_btn;
-    wxSize* m_size_calc_array;
-    size_t m_size_calc_array_size;
-    int m_scroll_amount;
-    int m_scroll_amount_limit;
-    int m_size_in_major_axis_for_children;
-    bool m_scroll_buttons_visible;
-
-#ifndef SWIG
-    DECLARE_CLASS(wxRibbonPage)
-    DECLARE_EVENT_TABLE()
-#endif
-};
-
-#endif // wxUSE_RIBBON
-
-#endif // _WX_RIBBON_PAGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/panel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/panel.h
deleted file mode 100644
index fded272c4a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/panel.h
+++ /dev/null
@@ -1,199 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/ribbon/panel.h
-// Purpose:     Ribbon-style container for a group of related tools / controls
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-05-25
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-#ifndef _WX_RIBBON_PANEL_H_
-#define _WX_RIBBON_PANEL_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_RIBBON
-
-#include "wx/bitmap.h"
-#include "wx/ribbon/control.h"
-
-enum wxRibbonPanelOption
-{
-    wxRIBBON_PANEL_NO_AUTO_MINIMISE = 1 << 0,
-    wxRIBBON_PANEL_EXT_BUTTON       = 1 << 3,
-    wxRIBBON_PANEL_MINIMISE_BUTTON  = 1 << 4,
-    wxRIBBON_PANEL_STRETCH          = 1 << 5,
-    wxRIBBON_PANEL_FLEXIBLE         = 1 << 6,
-
-    wxRIBBON_PANEL_DEFAULT_STYLE    = 0
-};
-
-class WXDLLIMPEXP_RIBBON wxRibbonPanel : public wxRibbonControl
-{
-public:
-    wxRibbonPanel();
-
-    wxRibbonPanel(wxWindow* parent,
-                  wxWindowID id = wxID_ANY,
-                  const wxString& label = wxEmptyString,
-                  const wxBitmap& minimised_icon = wxNullBitmap,
-                  const wxPoint& pos = wxDefaultPosition,
-                  const wxSize& size = wxDefaultSize,
-                  long style = wxRIBBON_PANEL_DEFAULT_STYLE);
-
-    virtual ~wxRibbonPanel();
-
-    bool Create(wxWindow* parent,
-                wxWindowID id = wxID_ANY,
-                const wxString& label = wxEmptyString,
-                const wxBitmap& icon = wxNullBitmap,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxRIBBON_PANEL_DEFAULT_STYLE);
-
-    wxBitmap& GetMinimisedIcon() {return m_minimised_icon;}
-    const wxBitmap& GetMinimisedIcon() const {return m_minimised_icon;}
-    bool IsMinimised() const;
-    bool IsMinimised(wxSize at_size) const;
-    bool IsHovered() const;
-    bool IsExtButtonHovered() const;
-    bool CanAutoMinimise() const;
-
-    bool ShowExpanded();
-    bool HideExpanded();
-
-    void SetArtProvider(wxRibbonArtProvider* art);
-
-    virtual bool Realize();
-    virtual bool Layout();
-    virtual wxSize GetMinSize() const;
-
-    virtual bool IsSizingContinuous() const;
-
-    virtual void AddChild(wxWindowBase *child);
-    virtual void RemoveChild(wxWindowBase *child);
-
-    virtual bool HasExtButton() const;
-
-    wxRibbonPanel* GetExpandedDummy();
-    wxRibbonPanel* GetExpandedPanel();
-
-    // Finds the best width and height given the parent's width and height
-    virtual wxSize GetBestSizeForParentSize(const wxSize& parentSize) const;
-
-    long GetFlags() { return m_flags; }
-
-    void HideIfExpanded();
-
-protected:
-    virtual wxSize DoGetBestSize() const;
-    virtual wxSize GetPanelSizerBestSize() const;
-    wxSize  GetPanelSizerMinSize() const;
-    wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-    wxSize GetMinNotMinimisedSize() const;
-
-    virtual wxSize DoGetNextSmallerSize(wxOrientation direction,
-                                      wxSize relative_to) const;
-    virtual wxSize DoGetNextLargerSize(wxOrientation direction,
-                                     wxSize relative_to) const;
-
-    void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
-    void OnSize(wxSizeEvent& evt);
-    void OnEraseBackground(wxEraseEvent& evt);
-    void OnPaint(wxPaintEvent& evt);
-    void OnMouseEnter(wxMouseEvent& evt);
-    void OnMouseEnterChild(wxMouseEvent& evt);
-    void OnMouseLeave(wxMouseEvent& evt);
-    void OnMouseLeaveChild(wxMouseEvent& evt);
-    void OnMouseClick(wxMouseEvent& evt);
-    void OnMotion(wxMouseEvent& evt);
-    void OnKillFocus(wxFocusEvent& evt);
-    void OnChildKillFocus(wxFocusEvent& evt);
-
-    void TestPositionForHover(const wxPoint& pos);
-    bool ShouldSendEventToDummy(wxEvent& evt);
-    virtual bool TryAfter(wxEvent& evt);
-
-    void CommonInit(const wxString& label, const wxBitmap& icon, long style);
-    static wxRect GetExpandedPosition(wxRect panel,
-                                      wxSize expanded_size,
-                                      wxDirection direction);
-
-    wxBitmap m_minimised_icon;
-    wxBitmap m_minimised_icon_resized;
-    wxSize m_smallest_unminimised_size;
-    wxSize m_minimised_size;
-    wxDirection m_preferred_expand_direction;
-    wxRibbonPanel* m_expanded_dummy;
-    wxRibbonPanel* m_expanded_panel;
-    wxWindow* m_child_with_focus;
-    long m_flags;
-    bool m_minimised;
-    bool m_hovered;
-    bool m_ext_button_hovered;
-    wxRect m_ext_button_rect;
-
-#ifndef SWIG
-    DECLARE_CLASS(wxRibbonPanel)
-    DECLARE_EVENT_TABLE()
-#endif
-};
-
-
-class WXDLLIMPEXP_RIBBON wxRibbonPanelEvent : public wxCommandEvent
-{
-public:
-    wxRibbonPanelEvent(wxEventType command_type = wxEVT_NULL,
-                       int win_id = 0,
-                       wxRibbonPanel* panel = NULL)
-        : wxCommandEvent(command_type, win_id)
-        , m_panel(panel)
-    {
-    }
-#ifndef SWIG
-    wxRibbonPanelEvent(const wxRibbonPanelEvent& e) : wxCommandEvent(e)
-    {
-        m_panel = e.m_panel;
-    }
-#endif
-    wxEvent *Clone() const { return new wxRibbonPanelEvent(*this); }
-
-    wxRibbonPanel* GetPanel() {return m_panel;}
-    void SetPanel(wxRibbonPanel* panel) {m_panel = panel;}
-
-protected:
-    wxRibbonPanel* m_panel;
-
-#ifndef SWIG
-private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRibbonPanelEvent)
-#endif
-};
-
-#ifndef SWIG
-
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_RIBBON, wxEVT_RIBBONPANEL_EXTBUTTON_ACTIVATED, wxRibbonPanelEvent);
-
-typedef void (wxEvtHandler::*wxRibbonPanelEventFunction)(wxRibbonPanelEvent&);
-
-#define wxRibbonPanelEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxRibbonPanelEventFunction, func)
-
-#define EVT_RIBBONPANEL_EXTBUTTON_ACTIVATED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_RIBBONPANEL_EXTBUTTON_ACTIVATED, winid, wxRibbonPanelEventHandler(fn))
-#else
-
-// wxpython/swig event work
-%constant wxEventType wxEVT_RIBBONPANEL_EXTBUTTON_ACTIVATED;
-
-%pythoncode {
-    EVT_RIBBONPANEL_EXTBUTTON_ACTIVATED = wx.PyEventBinder( wxEVT_RIBBONPANEL_EXTBUTTON_ACTIVATED, 1 )
-}
-#endif
-
-// old wxEVT_COMMAND_* constants
-#define wxEVT_COMMAND_RIBBONPANEL_EXTBUTTON_ACTIVATED   wxEVT_RIBBONPANEL_EXTBUTTON_ACTIVATED
-
-#endif // wxUSE_RIBBON
-
-#endif // _WX_RIBBON_PANEL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/toolbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/toolbar.h
deleted file mode 100644
index 467de94463..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/ribbon/toolbar.h
+++ /dev/null
@@ -1,263 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/ribbon/toolbar.h
-// Purpose:     Ribbon-style tool bar
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-07-06
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-#ifndef _WX_RIBBON_TOOLBAR_H_
-#define _WX_RIBBON_TOOLBAR_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_RIBBON
-
-#include "wx/ribbon/control.h"
-#include "wx/ribbon/art.h"
-
-class wxRibbonToolBarToolBase;
-class wxRibbonToolBarToolGroup;
-WX_DEFINE_USER_EXPORTED_ARRAY_PTR(wxRibbonToolBarToolGroup*, wxArrayRibbonToolBarToolGroup, class WXDLLIMPEXP_RIBBON);
-
-enum wxRibbonToolBarToolState
-{
-    wxRIBBON_TOOLBAR_TOOL_FIRST             = 1 << 0,
-    wxRIBBON_TOOLBAR_TOOL_LAST              = 1 << 1,
-    wxRIBBON_TOOLBAR_TOOL_POSITION_MASK     = wxRIBBON_TOOLBAR_TOOL_FIRST | wxRIBBON_TOOLBAR_TOOL_LAST,
-
-    wxRIBBON_TOOLBAR_TOOL_NORMAL_HOVERED    = 1 << 3,
-    wxRIBBON_TOOLBAR_TOOL_DROPDOWN_HOVERED  = 1 << 4,
-    wxRIBBON_TOOLBAR_TOOL_HOVER_MASK        = wxRIBBON_TOOLBAR_TOOL_NORMAL_HOVERED | wxRIBBON_TOOLBAR_TOOL_DROPDOWN_HOVERED,
-    wxRIBBON_TOOLBAR_TOOL_NORMAL_ACTIVE     = 1 << 5,
-    wxRIBBON_TOOLBAR_TOOL_DROPDOWN_ACTIVE   = 1 << 6,
-    wxRIBBON_TOOLBAR_TOOL_ACTIVE_MASK       = wxRIBBON_TOOLBAR_TOOL_NORMAL_ACTIVE | wxRIBBON_TOOLBAR_TOOL_DROPDOWN_ACTIVE,
-    wxRIBBON_TOOLBAR_TOOL_DISABLED          = 1 << 7,
-    wxRIBBON_TOOLBAR_TOOL_TOGGLED           = 1 << 8,
-    wxRIBBON_TOOLBAR_TOOL_STATE_MASK        = 0x1F8
-};
-
-
-class WXDLLIMPEXP_RIBBON wxRibbonToolBar : public wxRibbonControl
-{
-public:
-    wxRibbonToolBar();
-
-    wxRibbonToolBar(wxWindow* parent,
-                  wxWindowID id = wxID_ANY,
-                  const wxPoint& pos = wxDefaultPosition,
-                  const wxSize& size = wxDefaultSize,
-                  long style = 0);
-
-    virtual ~wxRibbonToolBar();
-
-    bool Create(wxWindow* parent,
-                wxWindowID id = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0);
-
-    virtual wxRibbonToolBarToolBase* AddTool(
-                int tool_id,
-                const wxBitmap& bitmap,
-                const wxString& help_string,
-                wxRibbonButtonKind kind = wxRIBBON_BUTTON_NORMAL);
-
-    virtual wxRibbonToolBarToolBase* AddDropdownTool(
-                int tool_id,
-                const wxBitmap& bitmap,
-                const wxString& help_string = wxEmptyString);
-
-    virtual wxRibbonToolBarToolBase* AddHybridTool(
-                int tool_id,
-                const wxBitmap& bitmap,
-                const wxString& help_string = wxEmptyString);
-
-    virtual wxRibbonToolBarToolBase* AddToggleTool(
-                int tool_id,
-                const wxBitmap& bitmap,
-                const wxString& help_string = wxEmptyString);
-
-    virtual wxRibbonToolBarToolBase* AddTool(
-                int tool_id,
-                const wxBitmap& bitmap,
-                const wxBitmap& bitmap_disabled = wxNullBitmap,
-                const wxString& help_string = wxEmptyString,
-                wxRibbonButtonKind kind = wxRIBBON_BUTTON_NORMAL,
-                wxObject* client_data = NULL);
-
-    virtual wxRibbonToolBarToolBase* AddSeparator();
-
-    virtual wxRibbonToolBarToolBase* InsertTool(
-                size_t pos,
-                int tool_id,
-                const wxBitmap& bitmap,
-                const wxString& help_string,
-                wxRibbonButtonKind kind = wxRIBBON_BUTTON_NORMAL);
-
-    virtual wxRibbonToolBarToolBase* InsertDropdownTool(
-                size_t pos,
-                int tool_id,
-                const wxBitmap& bitmap,
-                const wxString& help_string = wxEmptyString);
-
-    virtual wxRibbonToolBarToolBase* InsertHybridTool(
-                size_t pos,
-                int tool_id,
-                const wxBitmap& bitmap,
-                const wxString& help_string = wxEmptyString);
-
-    virtual wxRibbonToolBarToolBase* InsertToggleTool(
-                size_t pos,
-                int tool_id,
-                const wxBitmap& bitmap,
-                const wxString& help_string = wxEmptyString);
-
-    virtual wxRibbonToolBarToolBase* InsertTool(
-                size_t pos,
-                int tool_id,
-                const wxBitmap& bitmap,
-                const wxBitmap& bitmap_disabled = wxNullBitmap,
-                const wxString& help_string = wxEmptyString,
-                wxRibbonButtonKind kind = wxRIBBON_BUTTON_NORMAL,
-                wxObject* client_data = NULL);
-
-    virtual wxRibbonToolBarToolBase* InsertSeparator(size_t pos);
-
-    virtual void ClearTools();
-    virtual bool DeleteTool(int tool_id);
-    virtual bool DeleteToolByPos(size_t pos);
-
-    virtual wxRibbonToolBarToolBase* FindById(int tool_id)const;
-    virtual wxRibbonToolBarToolBase* GetToolByPos(size_t pos)const;
-    virtual size_t GetToolCount() const;
-    virtual int GetToolId(const wxRibbonToolBarToolBase* tool)const;
-
-    virtual wxObject* GetToolClientData(int tool_id)const;
-    virtual bool GetToolEnabled(int tool_id)const;
-    virtual wxString GetToolHelpString(int tool_id)const;
-    virtual wxRibbonButtonKind GetToolKind(int tool_id)const;
-    virtual int GetToolPos(int tool_id)const;
-    virtual bool GetToolState(int tool_id)const;
-
-    virtual bool Realize();
-    virtual void SetRows(int nMin, int nMax = -1);
-
-    virtual void SetToolClientData(int tool_id, wxObject* clientData);
-    virtual void SetToolDisabledBitmap(int tool_id, const wxBitmap &bitmap);
-    virtual void SetToolHelpString(int tool_id, const wxString& helpString);
-    virtual void SetToolNormalBitmap(int tool_id, const wxBitmap &bitmap);
-
-    virtual bool IsSizingContinuous() const;
-
-    virtual void EnableTool(int tool_id, bool enable = true);
-    virtual void ToggleTool(int tool_id, bool checked);
-
-    // Finds the best width and height given the parent's width and height
-    virtual wxSize GetBestSizeForParentSize(const wxSize& parentSize) const;
-
-protected:
-    friend class wxRibbonToolBarEvent;
-    virtual wxSize DoGetBestSize() const;
-    wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-    void OnEraseBackground(wxEraseEvent& evt);
-    void OnMouseDown(wxMouseEvent& evt);
-    void OnMouseEnter(wxMouseEvent& evt);
-    void OnMouseLeave(wxMouseEvent& evt);
-    void OnMouseMove(wxMouseEvent& evt);
-    void OnMouseUp(wxMouseEvent& evt);
-    void OnPaint(wxPaintEvent& evt);
-    void OnSize(wxSizeEvent& evt);
-
-    virtual wxSize DoGetNextSmallerSize(wxOrientation direction,
-                                      wxSize relative_to) const;
-    virtual wxSize DoGetNextLargerSize(wxOrientation direction,
-                                     wxSize relative_to) const;
-
-    void CommonInit(long style);
-    void AppendGroup();
-    wxRibbonToolBarToolGroup* InsertGroup(size_t pos);
-    virtual void UpdateWindowUI(long flags);
-
-    static wxBitmap MakeDisabledBitmap(const wxBitmap& original);
-
-    wxArrayRibbonToolBarToolGroup m_groups;
-    wxRibbonToolBarToolBase* m_hover_tool;
-    wxRibbonToolBarToolBase* m_active_tool;
-    wxSize* m_sizes;
-    int m_nrows_min;
-    int m_nrows_max;
-
-#ifndef SWIG
-    DECLARE_CLASS(wxRibbonToolBar)
-    DECLARE_EVENT_TABLE()
-#endif
-};
-
-
-class WXDLLIMPEXP_RIBBON wxRibbonToolBarEvent : public wxCommandEvent
-{
-public:
-    wxRibbonToolBarEvent(wxEventType command_type = wxEVT_NULL,
-                       int win_id = 0,
-                       wxRibbonToolBar* bar = NULL)
-        : wxCommandEvent(command_type, win_id)
-        , m_bar(bar)
-    {
-    }
-#ifndef SWIG
-    wxRibbonToolBarEvent(const wxRibbonToolBarEvent& e) : wxCommandEvent(e)
-    {
-        m_bar = e.m_bar;
-    }
-#endif
-    wxEvent *Clone() const { return new wxRibbonToolBarEvent(*this); }
-
-    wxRibbonToolBar* GetBar() {return m_bar;}
-    void SetBar(wxRibbonToolBar* bar) {m_bar = bar;}
-    bool PopupMenu(wxMenu* menu);
-
-protected:
-    wxRibbonToolBar* m_bar;
-
-#ifndef SWIG
-private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRibbonToolBarEvent)
-#endif
-};
-
-#ifndef SWIG
-
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_RIBBON, wxEVT_RIBBONTOOLBAR_CLICKED, wxRibbonToolBarEvent);
-wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_RIBBON, wxEVT_RIBBONTOOLBAR_DROPDOWN_CLICKED, wxRibbonToolBarEvent);
-
-typedef void (wxEvtHandler::*wxRibbonToolBarEventFunction)(wxRibbonToolBarEvent&);
-
-#define wxRibbonToolBarEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxRibbonToolBarEventFunction, func)
-
-#define EVT_RIBBONTOOLBAR_CLICKED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_RIBBONTOOLBAR_CLICKED, winid, wxRibbonToolBarEventHandler(fn))
-#define EVT_RIBBONTOOLBAR_DROPDOWN_CLICKED(winid, fn) \
-    wx__DECLARE_EVT1(wxEVT_RIBBONTOOLBAR_DROPDOWN_CLICKED, winid, wxRibbonToolBarEventHandler(fn))
-#else
-
-// wxpython/swig event work
-%constant wxEventType wxEVT_RIBBONTOOLBAR_CLICKED;
-%constant wxEventType wxEVT_RIBBONTOOLBAR_DROPDOWN_CLICKED;
-
-%pythoncode {
-    EVT_RIBBONTOOLBAR_CLICKED = wx.PyEventBinder( wxEVT_RIBBONTOOLBAR_CLICKED, 1 )
-    EVT_RIBBONTOOLBAR_DROPDOWN_CLICKED = wx.PyEventBinder( wxEVT_RIBBONTOOLBAR_DROPDOWN_CLICKED, 1 )
-}
-#endif
-
-// old wxEVT_COMMAND_* constants
-#define wxEVT_COMMAND_RIBBONTOOL_CLICKED            wxEVT_RIBBONTOOLBAR_CLICKED
-#define wxEVT_COMMAND_RIBBONTOOL_DROPDOWN_CLICKED   wxEVT_RIBBONTOOLBAR_DROPDOWN_CLICKED
-
-#endif // wxUSE_RIBBON
-
-#endif // _WX_RIBBON_TOOLBAR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextbackgroundpage.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextbackgroundpage.h
deleted file mode 100644
index e73b427882..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextbackgroundpage.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextbackgroundpage.h
-// Purpose:
-// Author:      Julian Smart
-// Modified by:
-// Created:     13/11/2010 11:17:25
-// RCS-ID:
-// Copyright:   (c) Julian Smart
-// Licence:
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _RICHTEXTBACKGROUNDPAGE_H_
-#define _RICHTEXTBACKGROUNDPAGE_H_
-
-/*!
- * Includes
- */
-
-#include "wx/richtext/richtextdialogpage.h"
-
-////@begin includes
-#include "wx/statline.h"
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextColourSwatchCtrl;
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define SYMBOL_WXRICHTEXTBACKGROUNDPAGE_STYLE wxTAB_TRAVERSAL
-#define SYMBOL_WXRICHTEXTBACKGROUNDPAGE_TITLE wxEmptyString
-#define SYMBOL_WXRICHTEXTBACKGROUNDPAGE_IDNAME ID_RICHTEXTBACKGROUNDPAGE
-#define SYMBOL_WXRICHTEXTBACKGROUNDPAGE_SIZE wxSize(400, 300)
-#define SYMBOL_WXRICHTEXTBACKGROUNDPAGE_POSITION wxDefaultPosition
-////@end control identifiers
-
-
-/*!
- * wxRichTextBackgroundPage class declaration
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextBackgroundPage: public wxRichTextDialogPage
-{
-    DECLARE_DYNAMIC_CLASS( wxRichTextBackgroundPage )
-    DECLARE_EVENT_TABLE()
-    DECLARE_HELP_PROVISION()
-
-public:
-    /// Constructors
-    wxRichTextBackgroundPage();
-    wxRichTextBackgroundPage( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTBACKGROUNDPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTBACKGROUNDPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTBACKGROUNDPAGE_SIZE, long style = SYMBOL_WXRICHTEXTBACKGROUNDPAGE_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTBACKGROUNDPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTBACKGROUNDPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTBACKGROUNDPAGE_SIZE, long style = SYMBOL_WXRICHTEXTBACKGROUNDPAGE_STYLE );
-
-    /// Destructor
-    ~wxRichTextBackgroundPage();
-
-    /// Initialises member variables
-    void Init();
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-    /// Gets the attributes from the formatting dialog
-    wxRichTextAttr* GetAttributes();
-
-    /// Data transfer
-    virtual bool TransferDataToWindow();
-    virtual bool TransferDataFromWindow();
-
-    /// Respond to colour swatch click
-    void OnColourSwatch(wxCommandEvent& event);
-
-////@begin wxRichTextBackgroundPage event handler declarations
-
-////@end wxRichTextBackgroundPage event handler declarations
-
-////@begin wxRichTextBackgroundPage member function declarations
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end wxRichTextBackgroundPage member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-////@begin wxRichTextBackgroundPage member variables
-    wxCheckBox* m_backgroundColourCheckBox;
-    wxRichTextColourSwatchCtrl* m_backgroundColourSwatch;
-    /// Control identifiers
-    enum {
-        ID_RICHTEXTBACKGROUNDPAGE = 10845,
-        ID_RICHTEXT_BACKGROUND_COLOUR_CHECKBOX = 10846,
-        ID_RICHTEXT_BACKGROUND_COLOUR_SWATCH = 10847
-    };
-////@end wxRichTextBackgroundPage member variables
-};
-
-#endif
-    // _RICHTEXTBACKGROUNDPAGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextborderspage.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextborderspage.h
deleted file mode 100644
index 347f154fd2..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextborderspage.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextborderspage.h
-// Purpose:     A border editing page for the wxRTC formatting dialog.
-// Author:      Julian Smart
-// Modified by:
-// Created:     21/10/2010 11:34:24
-// RCS-ID:
-// Copyright:   (c) Julian Smart
-// Licence:
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _RICHTEXTBORDERSPAGE_H_
-#define _RICHTEXTBORDERSPAGE_H_
-
-/*!
- * Includes
- */
-
-#include "wx/richtext/richtextdialogpage.h"
-
-////@begin includes
-#include "wx/notebook.h"
-#include "wx/statline.h"
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextColourSwatchCtrl;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextBorderPreviewCtrl;
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define SYMBOL_WXRICHTEXTBORDERSPAGE_STYLE wxTAB_TRAVERSAL
-#define SYMBOL_WXRICHTEXTBORDERSPAGE_TITLE wxEmptyString
-#define SYMBOL_WXRICHTEXTBORDERSPAGE_IDNAME ID_RICHTEXTBORDERSPAGE
-#define SYMBOL_WXRICHTEXTBORDERSPAGE_SIZE wxSize(400, 300)
-#define SYMBOL_WXRICHTEXTBORDERSPAGE_POSITION wxDefaultPosition
-////@end control identifiers
-
-
-/*!
- * wxRichTextBordersPage class declaration
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextBordersPage: public wxRichTextDialogPage
-{
-    DECLARE_DYNAMIC_CLASS( wxRichTextBordersPage )
-    DECLARE_EVENT_TABLE()
-    DECLARE_HELP_PROVISION()
-
-public:
-    /// Constructors
-    wxRichTextBordersPage();
-    wxRichTextBordersPage( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTBORDERSPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTBORDERSPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTBORDERSPAGE_SIZE, long style = SYMBOL_WXRICHTEXTBORDERSPAGE_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTBORDERSPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTBORDERSPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTBORDERSPAGE_SIZE, long style = SYMBOL_WXRICHTEXTBORDERSPAGE_STYLE );
-
-    /// Destructor
-    ~wxRichTextBordersPage();
-
-    /// Initialises member variables
-    void Init();
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-    /// Gets the attributes from the formatting dialog
-    wxRichTextAttr* GetAttributes();
-
-    /// Data transfer
-    virtual bool TransferDataToWindow();
-    virtual bool TransferDataFromWindow();
-
-    /// Updates the synchronization checkboxes to reflect the state of the attributes
-    void UpdateSyncControls();
-
-    /// Updates the preview
-    void OnCommand(wxCommandEvent& event);
-
-    /// Fill style combo
-    virtual void FillStyleComboBox(wxComboBox* styleComboBox);
-
-    /// Set the border controls
-    static void SetBorderValue(wxTextAttrBorder& border, wxTextCtrl* widthValueCtrl, wxComboBox* widthUnitsCtrl, wxCheckBox* checkBox,
-        wxComboBox* styleCtrl, wxRichTextColourSwatchCtrl* colourCtrl, const wxArrayInt& borderStyles);
-
-    /// Get data from the border controls
-    static void GetBorderValue(wxTextAttrBorder& border, wxTextCtrl* widthValueCtrl, wxComboBox* widthUnitsCtrl, wxCheckBox* checkBox,
-        wxComboBox* styleCtrl, wxRichTextColourSwatchCtrl* colourCtrl, const wxArrayInt& borderStyles);
-
-////@begin wxRichTextBordersPage event handler declarations
-
-    /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXT_BORDER_LEFT_CHECKBOX
-    void OnRichtextBorderCheckboxClick( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXT_BORDER_LEFT
-    void OnRichtextBorderLeftValueTextUpdated( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_LEFT
-    void OnRichtextBorderLeftUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_BORDER_LEFT_UNITS
-    void OnRichtextBorderLeftUnitsSelected( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_BORDER_LEFT_STYLE
-    void OnRichtextBorderLeftStyleSelected( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_RIGHT_CHECKBOX
-    void OnRichtextBorderOtherCheckboxUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_RIGHT
-    void OnRichtextBorderRightUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_TOP
-    void OnRichtextBorderTopUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_BOTTOM
-    void OnRichtextBorderBottomUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXT_BORDER_SYNCHRONIZE
-    void OnRichtextBorderSynchronizeClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BORDER_SYNCHRONIZE
-    void OnRichtextBorderSynchronizeUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXT_OUTLINE_LEFT
-    void OnRichtextOutlineLeftTextUpdated( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_LEFT
-    void OnRichtextOutlineLeftUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_OUTLINE_LEFT_UNITS
-    void OnRichtextOutlineLeftUnitsSelected( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXT_OUTLINE_LEFT_STYLE
-    void OnRichtextOutlineLeftStyleSelected( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX
-    void OnRichtextOutlineOtherCheckboxUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_RIGHT
-    void OnRichtextOutlineRightUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_TOP
-    void OnRichtextOutlineTopUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_BOTTOM
-    void OnRichtextOutlineBottomUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_RICHTEXT_OUTLINE_SYNCHRONIZE
-    void OnRichtextOutlineSynchronizeClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_OUTLINE_SYNCHRONIZE
-    void OnRichtextOutlineSynchronizeUpdate( wxUpdateUIEvent& event );
-
-////@end wxRichTextBordersPage event handler declarations
-
-////@begin wxRichTextBordersPage member function declarations
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end wxRichTextBordersPage member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-////@begin wxRichTextBordersPage member variables
-    wxCheckBox* m_leftBorderCheckbox;
-    wxTextCtrl* m_leftBorderWidth;
-    wxComboBox* m_leftBorderWidthUnits;
-    wxComboBox* m_leftBorderStyle;
-    wxRichTextColourSwatchCtrl* m_leftBorderColour;
-    wxCheckBox* m_rightBorderCheckbox;
-    wxTextCtrl* m_rightBorderWidth;
-    wxComboBox* m_rightBorderWidthUnits;
-    wxComboBox* m_rightBorderStyle;
-    wxRichTextColourSwatchCtrl* m_rightBorderColour;
-    wxCheckBox* m_topBorderCheckbox;
-    wxTextCtrl* m_topBorderWidth;
-    wxComboBox* m_topBorderWidthUnits;
-    wxComboBox* m_topBorderStyle;
-    wxRichTextColourSwatchCtrl* m_topBorderColour;
-    wxCheckBox* m_bottomBorderCheckbox;
-    wxTextCtrl* m_bottomBorderWidth;
-    wxComboBox* m_bottomBorderWidthUnits;
-    wxComboBox* m_bottomBorderStyle;
-    wxRichTextColourSwatchCtrl* m_bottomBorderColour;
-    wxCheckBox* m_borderSyncCtrl;
-    wxCheckBox* m_leftOutlineCheckbox;
-    wxTextCtrl* m_leftOutlineWidth;
-    wxComboBox* m_leftOutlineWidthUnits;
-    wxComboBox* m_leftOutlineStyle;
-    wxRichTextColourSwatchCtrl* m_leftOutlineColour;
-    wxCheckBox* m_rightOutlineCheckbox;
-    wxTextCtrl* m_rightOutlineWidth;
-    wxComboBox* m_rightOutlineWidthUnits;
-    wxComboBox* m_rightOutlineStyle;
-    wxRichTextColourSwatchCtrl* m_rightOutlineColour;
-    wxCheckBox* m_topOutlineCheckbox;
-    wxTextCtrl* m_topOutlineWidth;
-    wxComboBox* m_topOutlineWidthUnits;
-    wxComboBox* m_topOutlineStyle;
-    wxRichTextColourSwatchCtrl* m_topOutlineColour;
-    wxCheckBox* m_bottomOutlineCheckbox;
-    wxTextCtrl* m_bottomOutlineWidth;
-    wxComboBox* m_bottomOutlineWidthUnits;
-    wxComboBox* m_bottomOutlineStyle;
-    wxRichTextColourSwatchCtrl* m_bottomOutlineColour;
-    wxCheckBox* m_outlineSyncCtrl;
-    wxRichTextBorderPreviewCtrl* m_borderPreviewCtrl;
-    /// Control identifiers
-    enum {
-        ID_RICHTEXTBORDERSPAGE = 10800,
-        ID_RICHTEXTBORDERSPAGE_NOTEBOOK = 10801,
-        ID_RICHTEXTBORDERSPAGE_BORDERS = 10802,
-        ID_RICHTEXT_BORDER_LEFT_CHECKBOX = 10803,
-        ID_RICHTEXT_BORDER_LEFT = 10804,
-        ID_RICHTEXT_BORDER_LEFT_UNITS = 10805,
-        ID_RICHTEXT_BORDER_LEFT_STYLE = 10806,
-        ID_RICHTEXT_BORDER_LEFT_COLOUR = 10807,
-        ID_RICHTEXT_BORDER_RIGHT_CHECKBOX = 10808,
-        ID_RICHTEXT_BORDER_RIGHT = 10809,
-        ID_RICHTEXT_BORDER_RIGHT_UNITS = 10810,
-        ID_RICHTEXT_BORDER_RIGHT_STYLE = 10811,
-        ID_RICHTEXT_BORDER_RIGHT_COLOUR = 10812,
-        ID_RICHTEXT_BORDER_TOP_CHECKBOX = 10813,
-        ID_RICHTEXT_BORDER_TOP = 10814,
-        ID_RICHTEXT_BORDER_TOP_UNITS = 10815,
-        ID_RICHTEXT_BORDER_TOP_STYLE = 10816,
-        ID_RICHTEXT_BORDER_TOP_COLOUR = 10817,
-        ID_RICHTEXT_BORDER_BOTTOM_CHECKBOX = 10818,
-        ID_RICHTEXT_BORDER_BOTTOM = 10819,
-        ID_RICHTEXT_BORDER_BOTTOM_UNITS = 10820,
-        ID_RICHTEXT_BORDER_BOTTOM_STYLE = 10821,
-        ID_RICHTEXT_BORDER_BOTTOM_COLOUR = 10822,
-        ID_RICHTEXT_BORDER_SYNCHRONIZE = 10845,
-        ID_RICHTEXTBORDERSPAGE_OUTLINE = 10823,
-        ID_RICHTEXT_OUTLINE_LEFT_CHECKBOX = 10824,
-        ID_RICHTEXT_OUTLINE_LEFT = 10825,
-        ID_RICHTEXT_OUTLINE_LEFT_UNITS = 10826,
-        ID_RICHTEXT_OUTLINE_LEFT_STYLE = 10827,
-        ID_RICHTEXT_OUTLINE_LEFT_COLOUR = 10828,
-        ID_RICHTEXT_OUTLINE_RIGHT_CHECKBOX = 10829,
-        ID_RICHTEXT_OUTLINE_RIGHT = 10830,
-        ID_RICHTEXT_OUTLINE_RIGHT_UNITS = 10831,
-        ID_RICHTEXT_OUTLINE_RIGHT_STYLE = 10832,
-        ID_RICHTEXT_OUTLINE_RIGHT_COLOUR = 10833,
-        ID_RICHTEXT_OUTLINE_TOP_CHECKBOX = 10834,
-        ID_RICHTEXT_OUTLINE_TOP = 10835,
-        ID_RICHTEXT_OUTLINE_TOP_UNITS = 10836,
-        ID_RICHTEXT_OUTLINE_TOP_STYLE = 10837,
-        ID_RICHTEXT_OUTLINE_TOP_COLOUR = 10838,
-        ID_RICHTEXT_OUTLINE_BOTTOM_CHECKBOX = 10839,
-        ID_RICHTEXT_OUTLINE_BOTTOM = 10840,
-        ID_RICHTEXT_OUTLINE_BOTTOM_UNITS = 10841,
-        ID_RICHTEXT_OUTLINE_BOTTOM_STYLE = 10842,
-        ID_RICHTEXT_OUTLINE_BOTTOM_COLOUR = 10843,
-        ID_RICHTEXT_OUTLINE_SYNCHRONIZE = 10846,
-        ID_RICHTEXT_BORDER_PREVIEW = 10844
-    };
-////@end wxRichTextBordersPage member variables
-
-    wxArrayInt m_borderStyles;
-    wxArrayString m_borderStyleNames;
-    bool m_ignoreUpdates;
-};
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextBorderPreviewCtrl : public wxWindow
-{
-public:
-    wxRichTextBorderPreviewCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, long style = 0);
-
-    void SetAttributes(wxRichTextAttr* attr) { m_attributes = attr; }
-    wxRichTextAttr* GetAttributes() const { return m_attributes; }
-
-private:
-    wxRichTextAttr* m_attributes;
-
-    void OnPaint(wxPaintEvent& event);
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
-    // _RICHTEXTBORDERSPAGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextbuffer.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextbuffer.h
deleted file mode 100644
index 6b94fdaf49..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextbuffer.h
+++ /dev/null
@@ -1,6715 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextbuffer.h
-// Purpose:     Buffer for wxRichTextCtrl
-// Author:      Julian Smart
-// Modified by:
-// Created:     2005-09-30
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RICHTEXTBUFFER_H_
-#define _WX_RICHTEXTBUFFER_H_
-
-/*
-
-  Data structures
-  ===============
-
-  Data is represented by a hierarchy of objects, all derived from
-  wxRichTextObject.
-
-  The top of the hierarchy is the buffer, a kind of wxRichTextParagraphLayoutBox.
-  These boxes will allow flexible placement of text boxes on a page, but
-  for now there is a single box representing the document, and this box is
-  a wxRichTextParagraphLayoutBox which contains further wxRichTextParagraph
-  objects, each of which can include text and images.
-
-  Each object maintains a range (start and end position) measured
-  from the start of the main parent box.
-  A paragraph object knows its range, and a text fragment knows its range
-  too. So, a character or image in a page has a position relative to the
-  start of the document, and a character in an embedded text box has
-  a position relative to that text box. For now, we will not be dealing with
-  embedded objects but it's something to bear in mind for later.
-
-  Note that internally, a range (5,5) represents a range of one character.
-  In the public wx[Rich]TextCtrl API, this would be passed to e.g. SetSelection
-  as (5,6). A paragraph with one character might have an internal range of (0, 1)
-  since the end of the paragraph takes up one position.
-
-  Layout
-  ======
-
-  When Layout is called on an object, it is given a size which the object
-  must limit itself to, or one or more flexible directions (vertical
-  or horizontal). So for example a centered paragraph is given the page
-  width to play with (minus any margins), but can extend indefinitely
-  in the vertical direction. The implementation of Layout can then
-  cache the calculated size and position within the parent.
-
- */
-
-/*!
- * Includes
- */
-
-#include "wx/defs.h"
-
-#if wxUSE_RICHTEXT
-
-#include "wx/list.h"
-#include "wx/textctrl.h"
-#include "wx/bitmap.h"
-#include "wx/image.h"
-#include "wx/cmdproc.h"
-#include "wx/txtstrm.h"
-#include "wx/variant.h"
-#include "wx/position.h"
-
-#if wxUSE_DATAOBJ
-#include "wx/dataobj.h"
-#endif
-
-// Compatibility
-//#define wxRichTextAttr wxTextAttr
-#define wxTextAttrEx wxTextAttr
-
-// Setting wxRICHTEXT_USE_OWN_CARET to 1 implements a
-// caret reliably without using wxClientDC in case there
-// are platform-specific problems with the generic caret.
-#if defined(__WXGTK__) || defined(__WXMAC__)
-#define wxRICHTEXT_USE_OWN_CARET 1
-#else
-#define wxRICHTEXT_USE_OWN_CARET 0
-#endif
-
-// Switch off for binary compatibility, on for faster drawing
-// Note: this seems to be buggy (overzealous use of extents) so
-// don't use for now
-#define wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING 0
-
-// The following two symbols determine whether an output implementation
-// is present. To switch the relevant one on, set wxRICHTEXT_USE_XMLDOCUMENT_OUTPUT in
-// richtextxml.cpp. By default, the faster direct output implementation is used.
-
-// Include the wxXmlDocument implementation for output
-#define wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT 1
-
-// Include the faster, direct implementation for output
-#define wxRICHTEXT_HAVE_DIRECT_OUTPUT 1
-
-/**
-    The line break character that can be embedded in content.
- */
-
-extern WXDLLIMPEXP_RICHTEXT const wxChar wxRichTextLineBreakChar;
-
-/**
-    File types in wxRichText context.
- */
-enum wxRichTextFileType
-{
-    wxRICHTEXT_TYPE_ANY = 0,
-    wxRICHTEXT_TYPE_TEXT,
-    wxRICHTEXT_TYPE_XML,
-    wxRICHTEXT_TYPE_HTML,
-    wxRICHTEXT_TYPE_RTF,
-    wxRICHTEXT_TYPE_PDF
-};
-
-/*
- * Forward declarations
- */
-
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextCtrl;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextObject;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextImage;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextPlainText;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextCacheObject;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextObjectList;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextLine;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextParagraph;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextFileHandler;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextDrawingHandler;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextField;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextFieldType;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextStyleSheet;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextListStyleDefinition;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextEvent;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextRenderer;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextBuffer;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextXMLHandler;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextParagraphLayoutBox;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextImageBlock;
-class WXDLLIMPEXP_FWD_XML      wxXmlNode;
-class                          wxRichTextFloatCollector;
-class WXDLLIMPEXP_FWD_BASE wxDataInputStream;
-class WXDLLIMPEXP_FWD_BASE wxDataOutputStream;
-
-/**
-    Flags determining the available space, passed to Layout.
- */
-
-#define wxRICHTEXT_FIXED_WIDTH      0x01
-#define wxRICHTEXT_FIXED_HEIGHT     0x02
-#define wxRICHTEXT_VARIABLE_WIDTH   0x04
-#define wxRICHTEXT_VARIABLE_HEIGHT  0x08
-
-// Only lay out the part of the buffer that lies within
-// the rect passed to Layout.
-#define wxRICHTEXT_LAYOUT_SPECIFIED_RECT 0x10
-
-/**
-    Flags to pass to Draw
- */
-
-// Ignore paragraph cache optimization, e.g. for printing purposes
-// where one line may be drawn higher (on the next page) compared
-// with the previous line
-#define wxRICHTEXT_DRAW_IGNORE_CACHE    0x01
-#define wxRICHTEXT_DRAW_SELECTED        0x02
-#define wxRICHTEXT_DRAW_PRINT           0x04
-#define wxRICHTEXT_DRAW_GUIDELINES      0x08
-
-/**
-    Flags returned from hit-testing, or passed to hit-test function.
- */
-enum wxRichTextHitTestFlags
-{
-    // The point was not on this object
-    wxRICHTEXT_HITTEST_NONE =    0x01,
-
-    // The point was before the position returned from HitTest
-    wxRICHTEXT_HITTEST_BEFORE =  0x02,
-
-    // The point was after the position returned from HitTest
-    wxRICHTEXT_HITTEST_AFTER =   0x04,
-
-    // The point was on the position returned from HitTest
-    wxRICHTEXT_HITTEST_ON =      0x08,
-
-    // The point was on space outside content
-    wxRICHTEXT_HITTEST_OUTSIDE = 0x10,
-
-    // Only do hit-testing at the current level (don't traverse into top-level objects)
-    wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS = 0x20,
-
-    // Ignore floating objects
-    wxRICHTEXT_HITTEST_NO_FLOATING_OBJECTS = 0x40,
-
-    // Don't recurse into objects marked as atomic
-    wxRICHTEXT_HITTEST_HONOUR_ATOMIC = 0x80
-};
-
-/**
-    Flags for GetRangeSize.
- */
-
-#define wxRICHTEXT_FORMATTED        0x01
-#define wxRICHTEXT_UNFORMATTED      0x02
-#define wxRICHTEXT_CACHE_SIZE       0x04
-#define wxRICHTEXT_HEIGHT_ONLY      0x08
-
-/**
-    Flags for SetStyle/SetListStyle.
- */
-
-#define wxRICHTEXT_SETSTYLE_NONE            0x00
-
-// Specifies that this operation should be undoable
-#define wxRICHTEXT_SETSTYLE_WITH_UNDO       0x01
-
-// Specifies that the style should not be applied if the
-// combined style at this point is already the style in question.
-#define wxRICHTEXT_SETSTYLE_OPTIMIZE        0x02
-
-// Specifies that the style should only be applied to paragraphs,
-// and not the content. This allows content styling to be
-// preserved independently from that of e.g. a named paragraph style.
-#define wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY 0x04
-
-// Specifies that the style should only be applied to characters,
-// and not the paragraph. This allows content styling to be
-// preserved independently from that of e.g. a named paragraph style.
-#define wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY 0x08
-
-// For SetListStyle only: specifies starting from the given number, otherwise
-// deduces number from existing attributes
-#define wxRICHTEXT_SETSTYLE_RENUMBER        0x10
-
-// For SetListStyle only: specifies the list level for all paragraphs, otherwise
-// the current indentation will be used
-#define wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL   0x20
-
-// Resets the existing style before applying the new style
-#define wxRICHTEXT_SETSTYLE_RESET           0x40
-
-// Removes the given style instead of applying it
-#define wxRICHTEXT_SETSTYLE_REMOVE          0x80
-
-/**
-    Flags for SetProperties.
- */
-
-#define wxRICHTEXT_SETPROPERTIES_NONE            0x00
-
-// Specifies that this operation should be undoable
-#define wxRICHTEXT_SETPROPERTIES_WITH_UNDO       0x01
-
-// Specifies that the properties should only be applied to paragraphs,
-// and not the content.
-#define wxRICHTEXT_SETPROPERTIES_PARAGRAPHS_ONLY 0x02
-
-// Specifies that the properties should only be applied to characters,
-// and not the paragraph.
-#define wxRICHTEXT_SETPROPERTIES_CHARACTERS_ONLY 0x04
-
-// Resets the existing properties before applying the new properties.
-#define wxRICHTEXT_SETPROPERTIES_RESET           0x08
-
-// Removes the given properties instead of applying them.
-#define wxRICHTEXT_SETPROPERTIES_REMOVE          0x10
-
-/**
-    Flags for object insertion.
- */
-
-#define wxRICHTEXT_INSERT_NONE                              0x00
-#define wxRICHTEXT_INSERT_WITH_PREVIOUS_PARAGRAPH_STYLE     0x01
-#define wxRICHTEXT_INSERT_INTERACTIVE                       0x02
-
-// A special flag telling the buffer to keep the first paragraph style
-// as-is, when deleting a paragraph marker. In future we might pass a
-// flag to InsertFragment and DeleteRange to indicate the appropriate mode.
-#define wxTEXT_ATTR_KEEP_FIRST_PARA_STYLE   0x20000000
-
-/**
-    Default superscript/subscript font multiplication factor.
- */
-
-#define wxSCRIPT_MUL_FACTOR             1.5
-
-/**
-    The type for wxTextAttrDimension flags.
- */
-typedef unsigned short wxTextAttrDimensionFlags;
-
-/**
-    Miscellaneous text box flags
- */
-enum wxTextBoxAttrFlags
-{
-    wxTEXT_BOX_ATTR_FLOAT                   = 0x00000001,
-    wxTEXT_BOX_ATTR_CLEAR                   = 0x00000002,
-    wxTEXT_BOX_ATTR_COLLAPSE_BORDERS        = 0x00000004,
-    wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT      = 0x00000008,
-    wxTEXT_BOX_ATTR_BOX_STYLE_NAME          = 0x00000010
-};
-
-/**
-    Whether a value is present, used in dimension flags.
- */
-enum wxTextAttrValueFlags
-{
-    wxTEXT_ATTR_VALUE_VALID               = 0x1000,
-    wxTEXT_ATTR_VALUE_VALID_MASK          = 0x1000
-};
-
-/**
-    Units, included in the dimension value.
- */
-enum wxTextAttrUnits
-{
-    wxTEXT_ATTR_UNITS_TENTHS_MM             = 0x0001,
-    wxTEXT_ATTR_UNITS_PIXELS                = 0x0002,
-    wxTEXT_ATTR_UNITS_PERCENTAGE            = 0x0004,
-    wxTEXT_ATTR_UNITS_POINTS                = 0x0008,
-    wxTEXT_ATTR_UNITS_HUNDREDTHS_POINT      = 0x0100,
-
-    wxTEXT_ATTR_UNITS_MASK                  = 0x010F
-};
-
-/**
-    Position alternatives, included in the dimension flags.
- */
-enum wxTextBoxAttrPosition
-{
-    wxTEXT_BOX_ATTR_POSITION_STATIC         = 0x0000, // Default is static, i.e. as per normal layout
-    wxTEXT_BOX_ATTR_POSITION_RELATIVE       = 0x0010, // Relative to the relevant edge
-    wxTEXT_BOX_ATTR_POSITION_ABSOLUTE       = 0x0020, // Relative to the parent
-    wxTEXT_BOX_ATTR_POSITION_FIXED          = 0x0040, // Relative to the top-level window
-
-    wxTEXT_BOX_ATTR_POSITION_MASK           = 0x00F0
-};
-
-/**
-    @class wxTextAttrDimension
-
-    A class representing a rich text dimension, including units and position.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextAttr, wxRichTextCtrl,  wxTextAttrDimensions
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxTextAttrDimension
-{
-public:
-    /**
-        Default constructor.
-    */
-    wxTextAttrDimension() { Reset(); }
-    /**
-        Constructor taking value and units flag.
-    */
-    wxTextAttrDimension(int value, wxTextAttrUnits units = wxTEXT_ATTR_UNITS_TENTHS_MM) { m_value = value; m_flags = units|wxTEXT_ATTR_VALUE_VALID; }
-
-    /**
-        Resets the dimension value and flags.
-    */
-    void Reset() { m_value = 0; m_flags = 0; }
-
-    /**
-        Partial equality test. If @a weakTest is @true, attributes of this object do not
-        have to be present if those attributes of @a dim are present. If @a weakTest is
-        @false, the function will fail if an attribute is present in @a dim but not
-        in this object.
-    */
-    bool EqPartial(const wxTextAttrDimension& dim, bool weakTest = true) const;
-
-    /** Apply the dimension, but not those identical to @a compareWith if present.
-    */
-    bool Apply(const wxTextAttrDimension& dim, const wxTextAttrDimension* compareWith = NULL);
-
-    /** Collects the attributes that are common to a range of content, building up a note of
-        which attributes are absent in some objects and which clash in some objects.
-    */
-    void CollectCommonAttributes(const wxTextAttrDimension& attr, wxTextAttrDimension& clashingAttr, wxTextAttrDimension& absentAttr);
-
-    /**
-        Equality operator.
-    */
-    bool operator==(const wxTextAttrDimension& dim) const { return m_value == dim.m_value && m_flags == dim.m_flags; }
-
-    /**
-        Returns the integer value of the dimension.
-    */
-    int GetValue() const { return m_value; }
-
-    /**
-        Returns the floating-pointing value of the dimension in mm.
-
-    */
-    float GetValueMM() const { return m_value / 10.0f; }
-
-    /**
-        Sets the value of the dimension in mm.
-    */
-    void SetValueMM(float value) { m_value = (int) ((value * 10.0f) + 0.5f); m_flags |= wxTEXT_ATTR_VALUE_VALID; }
-
-    /**
-        Sets the integer value of the dimension.
-    */
-    void SetValue(int value) { m_value = value; m_flags |= wxTEXT_ATTR_VALUE_VALID; }
-
-    /**
-        Sets the integer value of the dimension, passing dimension flags.
-    */
-    void SetValue(int value, wxTextAttrDimensionFlags flags) { SetValue(value); m_flags = flags; }
-
-    /**
-        Sets the integer value and units.
-    */
-    void SetValue(int value, wxTextAttrUnits units) { m_value = value; m_flags = units | wxTEXT_ATTR_VALUE_VALID; }
-
-    /**
-        Sets the dimension.
-    */
-    void SetValue(const wxTextAttrDimension& dim) { (*this) = dim; }
-
-    /**
-        Gets the units of the dimension.
-    */
-    wxTextAttrUnits GetUnits() const { return (wxTextAttrUnits) (m_flags & wxTEXT_ATTR_UNITS_MASK); }
-
-    /**
-        Sets the units of the dimension.
-    */
-    void SetUnits(wxTextAttrUnits units) { m_flags &= ~wxTEXT_ATTR_UNITS_MASK; m_flags |= units; }
-
-    /**
-        Gets the position flags.
-    */
-    wxTextBoxAttrPosition GetPosition() const { return (wxTextBoxAttrPosition) (m_flags & wxTEXT_BOX_ATTR_POSITION_MASK); }
-
-    /**
-        Sets the position flags.
-    */
-    void SetPosition(wxTextBoxAttrPosition pos) { m_flags &= ~wxTEXT_BOX_ATTR_POSITION_MASK; m_flags |= pos; }
-
-    /**
-        Returns @true if the dimension is valid.
-    */
-    bool IsValid() const { return (m_flags & wxTEXT_ATTR_VALUE_VALID) != 0; }
-
-    /**
-        Sets the valid flag.
-    */
-    void SetValid(bool b) { m_flags &= ~wxTEXT_ATTR_VALUE_VALID_MASK; m_flags |= (b ? wxTEXT_ATTR_VALUE_VALID : 0); }
-
-    /**
-        Gets the dimension flags.
-    */
-    wxTextAttrDimensionFlags GetFlags() const { return m_flags; }
-
-    /**
-        Sets the dimension flags.
-    */
-    void SetFlags(wxTextAttrDimensionFlags flags) { m_flags = flags; }
-
-    int                         m_value;
-    wxTextAttrDimensionFlags    m_flags;
-};
-
-/**
-    @class wxTextAttrDimensions
-    A class for left, right, top and bottom dimensions.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextAttr, wxRichTextCtrl, wxTextAttrDimension
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxTextAttrDimensions
-{
-public:
-    /**
-        Default constructor.
-    */
-    wxTextAttrDimensions() {}
-
-    /**
-        Resets the value and flags for all dimensions.
-    */
-    void Reset() { m_left.Reset(); m_top.Reset(); m_right.Reset(); m_bottom.Reset(); }
-
-    /**
-        Equality operator.
-    */
-    bool operator==(const wxTextAttrDimensions& dims) const { return m_left == dims.m_left && m_top == dims.m_top && m_right == dims.m_right && m_bottom == dims.m_bottom; }
-
-    /**
-        Partial equality test. If @a weakTest is @true, attributes of this object do not
-        have to be present if those attributes of @a dim sare present. If @a weakTest is
-        @false, the function will fail if an attribute is present in @a dims but not
-        in this object.
-
-    */
-    bool EqPartial(const wxTextAttrDimensions& dims, bool weakTest = true) const;
-
-    /**
-        Apply to 'this', but not if the same as @a compareWith.
-
-    */
-    bool Apply(const wxTextAttrDimensions& dims, const wxTextAttrDimensions* compareWith = NULL);
-
-    /**
-        Collects the attributes that are common to a range of content, building up a note of
-        which attributes are absent in some objects and which clash in some objects.
-
-    */
-    void CollectCommonAttributes(const wxTextAttrDimensions& attr, wxTextAttrDimensions& clashingAttr, wxTextAttrDimensions& absentAttr);
-
-    /**
-        Remove specified attributes from this object.
-    */
-    bool RemoveStyle(const wxTextAttrDimensions& attr);
-
-    /**
-        Gets the left dimension.
-    */
-    const wxTextAttrDimension& GetLeft() const { return m_left; }
-    wxTextAttrDimension& GetLeft() { return m_left; }
-
-    /**
-        Gets the right dimension.
-
-    */
-    const wxTextAttrDimension& GetRight() const { return m_right; }
-    wxTextAttrDimension& GetRight() { return m_right; }
-
-    /**
-        Gets the top dimension.
-
-    */
-    const wxTextAttrDimension& GetTop() const { return m_top; }
-    wxTextAttrDimension& GetTop() { return m_top; }
-
-    /**
-        Gets the bottom dimension.
-
-    */
-    const wxTextAttrDimension& GetBottom() const { return m_bottom; }
-    wxTextAttrDimension& GetBottom() { return m_bottom; }
-
-    /**
-        Are all dimensions valid?
-
-    */
-    bool IsValid() const { return m_left.IsValid() && m_top.IsValid() && m_right.IsValid() && m_bottom.IsValid(); }
-
-    wxTextAttrDimension         m_left;
-    wxTextAttrDimension         m_top;
-    wxTextAttrDimension         m_right;
-    wxTextAttrDimension         m_bottom;
-};
-
-/**
-    @class wxTextAttrSize
-    A class for representing width and height.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextAttr, wxRichTextCtrl, wxTextAttrDimension
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxTextAttrSize
-{
-public:
-    /**
-        Default constructor.
-    */
-    wxTextAttrSize() {}
-
-    /**
-        Resets the width and height dimensions.
-    */
-    void Reset() { m_width.Reset(); m_height.Reset(); }
-
-    /**
-        Equality operator.
-    */
-    bool operator==(const wxTextAttrSize& size) const { return m_width == size.m_width && m_height == size.m_height ; }
-
-    /**
-        Partial equality test. If @a weakTest is @true, attributes of this object do not
-        have to be present if those attributes of @a size are present. If @a weakTest is
-        @false, the function will fail if an attribute is present in @a size but not
-        in this object.
-    */
-    bool EqPartial(const wxTextAttrSize& size, bool weakTest = true) const;
-
-    /**
-        Apply to this object, but not if the same as @a compareWith.
-    */
-    bool Apply(const wxTextAttrSize& dims, const wxTextAttrSize* compareWith = NULL);
-
-    /**
-        Collects the attributes that are common to a range of content, building up a note of
-        which attributes are absent in some objects and which clash in some objects.
-    */
-    void CollectCommonAttributes(const wxTextAttrSize& attr, wxTextAttrSize& clashingAttr, wxTextAttrSize& absentAttr);
-
-    /**
-        Removes the specified attributes from this object.
-    */
-    bool RemoveStyle(const wxTextAttrSize& attr);
-
-    /**
-        Returns the width.
-    */
-    wxTextAttrDimension& GetWidth() { return m_width; }
-    const wxTextAttrDimension& GetWidth() const { return m_width; }
-
-    /**
-        Sets the width.
-    */
-    void SetWidth(int value, wxTextAttrDimensionFlags flags) { m_width.SetValue(value, flags); }
-
-    /**
-        Sets the width.
-    */
-    void SetWidth(int value, wxTextAttrUnits units) { m_width.SetValue(value, units); }
-
-    /**
-        Sets the width.
-    */
-    void SetWidth(const wxTextAttrDimension& dim) { m_width.SetValue(dim); }
-
-    /**
-        Gets the height.
-    */
-    wxTextAttrDimension& GetHeight() { return m_height; }
-    const wxTextAttrDimension& GetHeight() const { return m_height; }
-
-    /**
-        Sets the height.
-    */
-    void SetHeight(int value, wxTextAttrDimensionFlags flags) { m_height.SetValue(value, flags); }
-
-    /**
-        Sets the height.
-    */
-    void SetHeight(int value, wxTextAttrUnits units) { m_height.SetValue(value, units); }
-
-    /**
-        Sets the height.
-    */
-    void SetHeight(const wxTextAttrDimension& dim) { m_height.SetValue(dim); }
-
-    /**
-        Is the size valid?
-    */
-    bool IsValid() const { return m_width.IsValid() && m_height.IsValid(); }
-
-    wxTextAttrDimension         m_width;
-    wxTextAttrDimension         m_height;
-};
-
-/**
-    @class wxTextAttrDimensionConverter
-    A class to make it easier to convert dimensions.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextAttr, wxRichTextCtrl, wxTextAttrDimension
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxTextAttrDimensionConverter
-{
-public:
-    /**
-        Constructor.
-    */
-    wxTextAttrDimensionConverter(wxDC& dc, double scale = 1.0, const wxSize& parentSize = wxDefaultSize);
-    /**
-        Constructor.
-    */
-    wxTextAttrDimensionConverter(int ppi, double scale = 1.0, const wxSize& parentSize = wxDefaultSize);
-
-    /**
-        Gets the pixel size for the given dimension.
-    */
-    int GetPixels(const wxTextAttrDimension& dim, int direction = wxHORIZONTAL) const;
-    /**
-        Gets the mm size for the given dimension.
-    */
-    int GetTenthsMM(const wxTextAttrDimension& dim) const;
-
-    /**
-        Converts tenths of a mm to pixels.
-    */
-    int ConvertTenthsMMToPixels(int units) const;
-    /**
-        Converts pixels to tenths of a mm.
-    */
-    int ConvertPixelsToTenthsMM(int pixels) const;
-
-    /**
-        Sets the scale factor.
-    */
-    void SetScale(double scale) { m_scale = scale; }
-    /**
-        Returns the scale factor.
-    */
-    double GetScale() const { return m_scale; }
-
-    /**
-        Sets the ppi.
-    */
-    void SetPPI(int ppi) { m_ppi = ppi; }
-    /**
-        Returns the ppi.
-    */
-    int GetPPI() const { return m_ppi; }
-
-    /**
-        Sets the parent size.
-    */
-    void SetParentSize(const wxSize& parentSize) { m_parentSize = parentSize; }
-    /**
-        Returns the parent size.
-    */
-    const wxSize& GetParentSize() const { return m_parentSize; }
-
-    int     m_ppi;
-    double  m_scale;
-    wxSize  m_parentSize;
-};
-
-/**
-    Border styles, used with wxTextAttrBorder.
- */
-enum wxTextAttrBorderStyle
-{
-    wxTEXT_BOX_ATTR_BORDER_NONE             = 0,
-    wxTEXT_BOX_ATTR_BORDER_SOLID            = 1,
-    wxTEXT_BOX_ATTR_BORDER_DOTTED           = 2,
-    wxTEXT_BOX_ATTR_BORDER_DASHED           = 3,
-    wxTEXT_BOX_ATTR_BORDER_DOUBLE           = 4,
-    wxTEXT_BOX_ATTR_BORDER_GROOVE           = 5,
-    wxTEXT_BOX_ATTR_BORDER_RIDGE            = 6,
-    wxTEXT_BOX_ATTR_BORDER_INSET            = 7,
-    wxTEXT_BOX_ATTR_BORDER_OUTSET           = 8
-};
-
-/**
-    Border style presence flags, used with wxTextAttrBorder.
- */
-enum wxTextAttrBorderFlags
-{
-    wxTEXT_BOX_ATTR_BORDER_STYLE            = 0x0001,
-    wxTEXT_BOX_ATTR_BORDER_COLOUR           = 0x0002
-};
-
-/**
-    Border width symbols for qualitative widths, used with wxTextAttrBorder.
- */
-enum wxTextAttrBorderWidth
-{
-    wxTEXT_BOX_ATTR_BORDER_THIN             = -1,
-    wxTEXT_BOX_ATTR_BORDER_MEDIUM           = -2,
-    wxTEXT_BOX_ATTR_BORDER_THICK            = -3
-};
-
-/**
-    Float styles.
- */
-enum wxTextBoxAttrFloatStyle
-{
-    wxTEXT_BOX_ATTR_FLOAT_NONE              = 0,
-    wxTEXT_BOX_ATTR_FLOAT_LEFT              = 1,
-    wxTEXT_BOX_ATTR_FLOAT_RIGHT             = 2
-};
-
-/**
-    Clear styles.
- */
-enum wxTextBoxAttrClearStyle
-{
-    wxTEXT_BOX_ATTR_CLEAR_NONE              = 0,
-    wxTEXT_BOX_ATTR_CLEAR_LEFT              = 1,
-    wxTEXT_BOX_ATTR_CLEAR_RIGHT             = 2,
-    wxTEXT_BOX_ATTR_CLEAR_BOTH              = 3
-};
-
-/**
-    Collapse mode styles. TODO: can they be switched on per side?
- */
-enum wxTextBoxAttrCollapseMode
-{
-    wxTEXT_BOX_ATTR_COLLAPSE_NONE           = 0,
-    wxTEXT_BOX_ATTR_COLLAPSE_FULL           = 1
-};
-
-/**
-    Vertical alignment values.
- */
-enum wxTextBoxAttrVerticalAlignment
-{
-    wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_NONE =       0,
-    wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_TOP  =       1,
-    wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_CENTRE =     2,
-    wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT_BOTTOM  =    3
-};
-
-/**
-    @class wxTextAttrBorder
-    A class representing a rich text object border.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextAttr, wxRichTextCtrl, wxRichTextAttrBorders
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxTextAttrBorder
-{
-public:
-    /**
-        Default constructor.
-    */
-    wxTextAttrBorder() { Reset(); }
-
-    /**
-        Equality operator.
-    */
-    bool operator==(const wxTextAttrBorder& border) const
-    {
-        return m_flags == border.m_flags && m_borderStyle == border.m_borderStyle &&
-               m_borderColour == border.m_borderColour && m_borderWidth == border.m_borderWidth;
-    }
-
-    /**
-        Resets the border style, colour, width and flags.
-    */
-    void Reset() { m_borderStyle = 0; m_borderColour = 0; m_flags = 0; m_borderWidth.Reset(); }
-
-    /**
-        Partial equality test. If @a weakTest is @true, attributes of this object do not
-        have to be present if those attributes of @a border are present. If @a weakTest is
-        @false, the function will fail if an attribute is present in @a border but not
-        in this object.
-    */
-    bool EqPartial(const wxTextAttrBorder& border, bool weakTest = true) const;
-
-    /**
-        Applies the border to this object, but not if the same as @a compareWith.
-
-    */
-    bool Apply(const wxTextAttrBorder& border, const wxTextAttrBorder* compareWith = NULL);
-
-    /**
-        Removes the specified attributes from this object.
-    */
-    bool RemoveStyle(const wxTextAttrBorder& attr);
-
-    /**
-        Collects the attributes that are common to a range of content, building up a note of
-        which attributes are absent in some objects and which clash in some objects.
-    */
-    void CollectCommonAttributes(const wxTextAttrBorder& attr, wxTextAttrBorder& clashingAttr, wxTextAttrBorder& absentAttr);
-
-    /**
-        Sets the border style.
-    */
-    void SetStyle(int style) { m_borderStyle = style; m_flags |= wxTEXT_BOX_ATTR_BORDER_STYLE; }
-
-    /**
-        Gets the border style.
-
-    */
-    int GetStyle() const { return m_borderStyle; }
-
-    /**
-        Sets the border colour.
-    */
-    void SetColour(unsigned long colour) { m_borderColour = colour; m_flags |= wxTEXT_BOX_ATTR_BORDER_COLOUR; }
-
-    /**
-        Sets the border colour.
-    */
-    void SetColour(const wxColour& colour) { m_borderColour = colour.GetRGB(); m_flags |= wxTEXT_BOX_ATTR_BORDER_COLOUR; }
-
-    /**
-        Gets the colour as a long.
-    */
-    unsigned long GetColourLong() const { return m_borderColour; }
-
-    /**
-        Gets the colour.
-    */
-    wxColour GetColour() const { return wxColour(m_borderColour); }
-
-    /**
-        Gets the border width.
-    */
-    wxTextAttrDimension& GetWidth() { return m_borderWidth; }
-    const wxTextAttrDimension& GetWidth() const { return m_borderWidth; }
-
-    /**
-        Sets the border width.
-    */
-    void SetWidth(const wxTextAttrDimension& width) { m_borderWidth = width; }
-    /**
-        Sets the border width.
-    */
-    void SetWidth(int value, wxTextAttrUnits units = wxTEXT_ATTR_UNITS_TENTHS_MM) { SetWidth(wxTextAttrDimension(value, units)); }
-
-    /**
-        True if the border has a valid style.
-    */
-    bool HasStyle() const { return (m_flags & wxTEXT_BOX_ATTR_BORDER_STYLE) != 0; }
-
-    /**
-        True if the border has a valid colour.
-    */
-    bool HasColour() const { return (m_flags & wxTEXT_BOX_ATTR_BORDER_COLOUR) != 0; }
-
-    /**
-        True if the border has a valid width.
-    */
-    bool HasWidth() const { return m_borderWidth.IsValid(); }
-
-    /**
-        True if the border is valid.
-    */
-    bool IsValid() const { return HasWidth(); }
-
-    /**
-        Set the valid flag for this border.
-    */
-    void MakeValid() { m_borderWidth.SetValid(true); }
-
-    /**
-        True if the border has no attributes set.
-    */
-    bool IsDefault() const { return (m_flags == 0); }
-
-    /**
-        Returns the border flags.
-    */
-    int GetFlags() const { return m_flags; }
-
-    /**
-        Sets the border flags.
-    */
-    void SetFlags(int flags) { m_flags = flags; }
-
-    /**
-        Adds a border flag.
-    */
-    void AddFlag(int flag) { m_flags |= flag; }
-
-    /**
-        Removes a border flag.
-    */
-    void RemoveFlag(int flag) { m_flags &= ~flag; }
-
-    int                         m_borderStyle;
-    unsigned long               m_borderColour;
-    wxTextAttrDimension         m_borderWidth;
-    int                         m_flags;
-};
-
-/**
-    @class wxTextAttrBorders
-    A class representing a rich text object's borders.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextAttr, wxRichTextCtrl, wxRichTextAttrBorder
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxTextAttrBorders
-{
-public:
-    /**
-        Default constructor.
-    */
-    wxTextAttrBorders() { }
-
-    /**
-        Equality operator.
-    */
-    bool operator==(const wxTextAttrBorders& borders) const
-    {
-        return m_left == borders.m_left && m_right == borders.m_right &&
-               m_top == borders.m_top && m_bottom == borders.m_bottom;
-    }
-
-    /**
-        Sets the style of all borders.
-    */
-    void SetStyle(int style);
-
-    /**
-        Sets colour of all borders.
-    */
-    void SetColour(unsigned long colour);
-
-    /**
-        Sets the colour for all borders.
-    */
-    void SetColour(const wxColour& colour);
-
-    /**
-        Sets the width of all borders.
-    */
-    void SetWidth(const wxTextAttrDimension& width);
-
-    /**
-        Sets the width of all borders.
-    */
-    void SetWidth(int value, wxTextAttrUnits units = wxTEXT_ATTR_UNITS_TENTHS_MM) { SetWidth(wxTextAttrDimension(value, units)); }
-
-    /**
-        Resets all borders.
-    */
-    void Reset() { m_left.Reset(); m_right.Reset(); m_top.Reset(); m_bottom.Reset(); }
-
-    /**
-        Partial equality test. If @a weakTest is @true, attributes of this object do not
-        have to be present if those attributes of @a borders are present. If @a weakTest is
-        @false, the function will fail if an attribute is present in @a borders but not
-        in this object.
-    */
-    bool EqPartial(const wxTextAttrBorders& borders, bool weakTest = true) const;
-
-    /**
-        Applies border to this object, but not if the same as @a compareWith.
-    */
-    bool Apply(const wxTextAttrBorders& borders, const wxTextAttrBorders* compareWith = NULL);
-
-    /**
-        Removes the specified attributes from this object.
-    */
-    bool RemoveStyle(const wxTextAttrBorders& attr);
-
-    /**
-        Collects the attributes that are common to a range of content, building up a note of
-        which attributes are absent in some objects and which clash in some objects.
-    */
-    void CollectCommonAttributes(const wxTextAttrBorders& attr, wxTextAttrBorders& clashingAttr, wxTextAttrBorders& absentAttr);
-
-    /**
-        Returns @true if at least one border is valid.
-    */
-    bool IsValid() const { return m_left.IsValid() || m_right.IsValid() || m_top.IsValid() || m_bottom.IsValid(); }
-
-    /**
-        Returns @true if no border attributes were set.
-    */
-    bool IsDefault() const { return m_left.IsDefault() && m_right.IsDefault() && m_top.IsDefault() && m_bottom.IsDefault(); }
-
-    /**
-        Returns the left border.
-    */
-    const wxTextAttrBorder& GetLeft() const { return m_left; }
-    wxTextAttrBorder& GetLeft() { return m_left; }
-
-    /**
-        Returns the right border.
-    */
-    const wxTextAttrBorder& GetRight() const { return m_right; }
-    wxTextAttrBorder& GetRight() { return m_right; }
-
-    /**
-        Returns the top border.
-    */
-    const wxTextAttrBorder& GetTop() const { return m_top; }
-    wxTextAttrBorder& GetTop() { return m_top; }
-
-    /**
-        Returns the bottom border.
-    */
-    const wxTextAttrBorder& GetBottom() const { return m_bottom; }
-    wxTextAttrBorder& GetBottom() { return m_bottom; }
-
-    wxTextAttrBorder m_left, m_right, m_top, m_bottom;
-
-};
-
-/**
-    @class wxTextBoxAttr
-    A class representing the box attributes of a rich text object.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextAttr, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxTextBoxAttr
-{
-public:
-    /**
-        Default constructor.
-    */
-    wxTextBoxAttr() { Init(); }
-
-    /**
-        Copy constructor.
-    */
-    wxTextBoxAttr(const wxTextBoxAttr& attr) { Init(); (*this) = attr; }
-
-    /**
-        Initialises this object.
-    */
-    void Init() { Reset(); }
-
-    /**
-        Resets this object.
-    */
-    void Reset();
-
-    // Copy. Unnecessary since we let it do a binary copy
-    //void Copy(const wxTextBoxAttr& attr);
-
-    // Assignment
-    //void operator= (const wxTextBoxAttr& attr);
-
-    /**
-        Equality test.
-    */
-    bool operator== (const wxTextBoxAttr& attr) const;
-
-    /**
-        Partial equality test, ignoring unset attributes. If @a weakTest is @true, attributes of this object do not
-        have to be present if those attributes of @a attr are present. If @a weakTest is
-        @false, the function will fail if an attribute is present in @a attr but not
-        in this object.
-
-    */
-    bool EqPartial(const wxTextBoxAttr& attr, bool weakTest = true) const;
-
-    /**
-        Merges the given attributes. If @a compareWith is non-NULL, then it will be used
-        to mask out those attributes that are the same in style and @a compareWith, for
-        situations where we don't want to explicitly set inherited attributes.
-    */
-    bool Apply(const wxTextBoxAttr& style, const wxTextBoxAttr* compareWith = NULL);
-
-    /**
-        Collects the attributes that are common to a range of content, building up a note of
-        which attributes are absent in some objects and which clash in some objects.
-    */
-    void CollectCommonAttributes(const wxTextBoxAttr& attr, wxTextBoxAttr& clashingAttr, wxTextBoxAttr& absentAttr);
-
-    /**
-        Removes the specified attributes from this object.
-    */
-    bool RemoveStyle(const wxTextBoxAttr& attr);
-
-    /**
-        Sets the flags.
-    */
-    void SetFlags(int flags) { m_flags = flags; }
-
-    /**
-        Returns the flags.
-    */
-    int GetFlags() const { return m_flags; }
-
-    /**
-        Is this flag present?
-    */
-    bool HasFlag(wxTextBoxAttrFlags flag) const { return (m_flags & flag) != 0; }
-
-    /**
-        Removes this flag.
-    */
-    void RemoveFlag(wxTextBoxAttrFlags flag) { m_flags &= ~flag; }
-
-    /**
-        Adds this flag.
-    */
-    void AddFlag(wxTextBoxAttrFlags flag) { m_flags |= flag; }
-
-    /**
-        Returns @true if no attributes are set.
-    */
-    bool IsDefault() const;
-
-    /**
-        Returns the float mode.
-    */
-    wxTextBoxAttrFloatStyle GetFloatMode() const { return m_floatMode; }
-
-    /**
-        Sets the float mode.
-    */
-    void SetFloatMode(wxTextBoxAttrFloatStyle mode) { m_floatMode = mode; m_flags |= wxTEXT_BOX_ATTR_FLOAT; }
-
-    /**
-        Returns @true if float mode is active.
-    */
-    bool HasFloatMode() const { return HasFlag(wxTEXT_BOX_ATTR_FLOAT); }
-
-    /**
-        Returns @true if this object is floating.
-    */
-    bool IsFloating() const { return HasFloatMode() && GetFloatMode() != wxTEXT_BOX_ATTR_FLOAT_NONE; }
-
-    /**
-        Returns the clear mode - whether to wrap text after object. Currently unimplemented.
-    */
-    wxTextBoxAttrClearStyle GetClearMode() const { return m_clearMode; }
-
-    /**
-        Set the clear mode. Currently unimplemented.
-    */
-    void SetClearMode(wxTextBoxAttrClearStyle mode) { m_clearMode = mode; m_flags |= wxTEXT_BOX_ATTR_CLEAR; }
-
-    /**
-        Returns @true if we have a clear flag.
-    */
-    bool HasClearMode() const { return HasFlag(wxTEXT_BOX_ATTR_CLEAR); }
-
-    /**
-        Returns the collapse mode - whether to collapse borders.
-    */
-    wxTextBoxAttrCollapseMode GetCollapseBorders() const { return m_collapseMode; }
-
-    /**
-        Sets the collapse mode - whether to collapse borders.
-    */
-    void SetCollapseBorders(wxTextBoxAttrCollapseMode collapse) { m_collapseMode = collapse; m_flags |= wxTEXT_BOX_ATTR_COLLAPSE_BORDERS; }
-
-    /**
-        Returns @true if the collapse borders flag is present.
-    */
-    bool HasCollapseBorders() const { return HasFlag(wxTEXT_BOX_ATTR_COLLAPSE_BORDERS); }
-
-    /**
-        Returns the vertical alignment.
-    */
-    wxTextBoxAttrVerticalAlignment GetVerticalAlignment() const { return m_verticalAlignment; }
-
-    /**
-        Sets the vertical alignment.
-    */
-    void SetVerticalAlignment(wxTextBoxAttrVerticalAlignment verticalAlignment) { m_verticalAlignment = verticalAlignment; m_flags |= wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT; }
-
-    /**
-        Returns @true if a vertical alignment flag is present.
-    */
-    bool HasVerticalAlignment() const { return HasFlag(wxTEXT_BOX_ATTR_VERTICAL_ALIGNMENT); }
-
-    /**
-        Returns the margin values.
-    */
-    wxTextAttrDimensions& GetMargins() { return m_margins; }
-    const wxTextAttrDimensions& GetMargins() const { return m_margins; }
-
-    /**
-        Returns the left margin.
-    */
-    wxTextAttrDimension& GetLeftMargin() { return m_margins.m_left; }
-    const wxTextAttrDimension& GetLeftMargin() const { return m_margins.m_left; }
-
-    /**
-        Returns the right margin.
-    */
-    wxTextAttrDimension& GetRightMargin() { return m_margins.m_right; }
-    const wxTextAttrDimension& GetRightMargin() const { return m_margins.m_right; }
-
-    /**
-        Returns the top margin.
-    */
-    wxTextAttrDimension& GetTopMargin() { return m_margins.m_top; }
-    const wxTextAttrDimension& GetTopMargin() const { return m_margins.m_top; }
-
-    /**
-        Returns the bottom margin.
-    */
-    wxTextAttrDimension& GetBottomMargin() { return m_margins.m_bottom; }
-    const wxTextAttrDimension& GetBottomMargin() const { return m_margins.m_bottom; }
-
-    /**
-        Returns the position.
-    */
-    wxTextAttrDimensions& GetPosition() { return m_position; }
-    const wxTextAttrDimensions& GetPosition() const { return m_position; }
-
-    /**
-        Returns the left position.
-    */
-    wxTextAttrDimension& GetLeft() { return m_position.m_left; }
-    const wxTextAttrDimension& GetLeft() const { return m_position.m_left; }
-
-    /**
-        Returns the right position.
-    */
-    wxTextAttrDimension& GetRight() { return m_position.m_right; }
-    const wxTextAttrDimension& GetRight() const { return m_position.m_right; }
-
-    /**
-        Returns the top position.
-    */
-    wxTextAttrDimension& GetTop() { return m_position.m_top; }
-    const wxTextAttrDimension& GetTop() const { return m_position.m_top; }
-
-    /**
-        Returns the bottom position.
-    */
-    wxTextAttrDimension& GetBottom() { return m_position.m_bottom; }
-    const wxTextAttrDimension& GetBottom() const { return m_position.m_bottom; }
-
-    /**
-        Returns the padding values.
-    */
-    wxTextAttrDimensions& GetPadding() { return m_padding; }
-    const wxTextAttrDimensions& GetPadding() const { return m_padding; }
-
-    /**
-        Returns the left padding value.
-    */
-    wxTextAttrDimension& GetLeftPadding() { return m_padding.m_left; }
-    const wxTextAttrDimension& GetLeftPadding() const { return m_padding.m_left; }
-
-    /**
-        Returns the right padding value.
-    */
-    wxTextAttrDimension& GetRightPadding() { return m_padding.m_right; }
-    const wxTextAttrDimension& GetRightPadding() const { return m_padding.m_right; }
-
-    /**
-        Returns the top padding value.
-    */
-    wxTextAttrDimension& GetTopPadding() { return m_padding.m_top; }
-    const wxTextAttrDimension& GetTopPadding() const { return m_padding.m_top; }
-
-    /**
-        Returns the bottom padding value.
-    */
-    wxTextAttrDimension& GetBottomPadding() { return m_padding.m_bottom; }
-    const wxTextAttrDimension& GetBottomPadding() const { return m_padding.m_bottom; }
-
-    /**
-        Returns the borders.
-    */
-    wxTextAttrBorders& GetBorder() { return m_border; }
-    const wxTextAttrBorders& GetBorder() const { return m_border; }
-
-    /**
-        Returns the left border.
-    */
-    wxTextAttrBorder& GetLeftBorder() { return m_border.m_left; }
-    const wxTextAttrBorder& GetLeftBorder() const { return m_border.m_left; }
-
-    /**
-        Returns the top border.
-    */
-    wxTextAttrBorder& GetTopBorder() { return m_border.m_top; }
-    const wxTextAttrBorder& GetTopBorder() const { return m_border.m_top; }
-
-    /**
-        Returns the right border.
-    */
-    wxTextAttrBorder& GetRightBorder() { return m_border.m_right; }
-    const wxTextAttrBorder& GetRightBorder() const { return m_border.m_right; }
-
-    /**
-        Returns the bottom border.
-    */
-    wxTextAttrBorder& GetBottomBorder() { return m_border.m_bottom; }
-    const wxTextAttrBorder& GetBottomBorder() const { return m_border.m_bottom; }
-
-    /**
-        Returns the outline.
-    */
-    wxTextAttrBorders& GetOutline() { return m_outline; }
-    const wxTextAttrBorders& GetOutline() const { return m_outline; }
-
-    /**
-        Returns the left outline.
-    */
-    wxTextAttrBorder& GetLeftOutline() { return m_outline.m_left; }
-    const wxTextAttrBorder& GetLeftOutline() const { return m_outline.m_left; }
-
-    /**
-        Returns the top outline.
-    */
-    wxTextAttrBorder& GetTopOutline() { return m_outline.m_top; }
-    const wxTextAttrBorder& GetTopOutline() const { return m_outline.m_top; }
-
-    /**
-        Returns the right outline.
-    */
-    wxTextAttrBorder& GetRightOutline() { return m_outline.m_right; }
-    const wxTextAttrBorder& GetRightOutline() const { return m_outline.m_right; }
-
-    /**
-        Returns the bottom outline.
-    */
-    wxTextAttrBorder& GetBottomOutline() { return m_outline.m_bottom; }
-    const wxTextAttrBorder& GetBottomOutline() const { return m_outline.m_bottom; }
-
-    /**
-        Returns the object size.
-    */
-    wxTextAttrSize& GetSize() { return m_size; }
-    const wxTextAttrSize& GetSize() const { return m_size; }
-
-    /**
-        Returns the object minimum size.
-    */
-
-    wxTextAttrSize& GetMinSize() { return m_minSize; }
-    const wxTextAttrSize& GetMinSize() const { return m_minSize; }
-
-    /**
-        Returns the object maximum size.
-    */
-
-    wxTextAttrSize& GetMaxSize() { return m_maxSize; }
-    const wxTextAttrSize& GetMaxSize() const { return m_maxSize; }
-
-    /**
-        Sets the object size.
-    */
-    void SetSize(const wxTextAttrSize& sz) { m_size = sz; }
-
-    /**
-        Sets the object minimum size.
-    */
-    void SetMinSize(const wxTextAttrSize& sz) { m_minSize = sz; }
-
-    /**
-        Sets the object maximum size.
-    */
-    void SetMaxSize(const wxTextAttrSize& sz) { m_maxSize = sz; }
-
-    /**
-        Returns the object width.
-    */
-    wxTextAttrDimension& GetWidth() { return m_size.m_width; }
-    const wxTextAttrDimension& GetWidth() const { return m_size.m_width; }
-
-    /**
-        Returns the object height.
-    */
-    wxTextAttrDimension& GetHeight() { return m_size.m_height; }
-    const wxTextAttrDimension& GetHeight() const { return m_size.m_height; }
-
-    /**
-        Returns the box style name.
-    */
-    const wxString& GetBoxStyleName() const { return m_boxStyleName; }
-
-    /**
-        Sets the box style name.
-    */
-    void SetBoxStyleName(const wxString& name) { m_boxStyleName = name; AddFlag(wxTEXT_BOX_ATTR_BOX_STYLE_NAME); }
-
-    /**
-        Returns @true if the box style name is present.
-    */
-    bool HasBoxStyleName() const { return HasFlag(wxTEXT_BOX_ATTR_BOX_STYLE_NAME); }
-
-public:
-
-    int                             m_flags;
-
-    wxTextAttrDimensions            m_margins;
-    wxTextAttrDimensions            m_padding;
-    wxTextAttrDimensions            m_position;
-
-    wxTextAttrSize                  m_size;
-    wxTextAttrSize                  m_minSize;
-    wxTextAttrSize                  m_maxSize;
-
-    wxTextAttrBorders               m_border;
-    wxTextAttrBorders               m_outline;
-
-    wxTextBoxAttrFloatStyle         m_floatMode;
-    wxTextBoxAttrClearStyle         m_clearMode;
-    wxTextBoxAttrCollapseMode       m_collapseMode;
-    wxTextBoxAttrVerticalAlignment  m_verticalAlignment;
-    wxString                        m_boxStyleName;
-};
-
-/**
-    @class wxRichTextAttr
-    A class representing enhanced attributes for rich text objects.
-    This adds a wxTextBoxAttr member to the basic wxTextAttr class.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextAttr, wxTextBoxAttr, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextAttr: public wxTextAttr
-{
-public:
-    /**
-        Constructor taking a wxTextAttr.
-    */
-    wxRichTextAttr(const wxTextAttr& attr) { wxTextAttr::Copy(attr); }
-
-    /**
-        Copy constructor.
-    */
-    wxRichTextAttr(const wxRichTextAttr& attr): wxTextAttr() { Copy(attr); }
-
-    /**
-        Default constructor.
-    */
-    wxRichTextAttr() {}
-
-    /**
-        Copy function.
-    */
-    void Copy(const wxRichTextAttr& attr);
-
-    /**
-        Assignment operator.
-    */
-    void operator=(const wxRichTextAttr& attr) { Copy(attr); }
-
-    /**
-        Assignment operator.
-    */
-    void operator=(const wxTextAttr& attr) { wxTextAttr::Copy(attr); }
-
-    /**
-        Equality test.
-    */
-    bool operator==(const wxRichTextAttr& attr) const;
-
-    /**
-        Partial equality test. If @a weakTest is @true, attributes of this object do not
-        have to be present if those attributes of @a attr are present. If @a weakTest is
-        @false, the function will fail if an attribute is present in @a attr but not
-        in this object.
-    */
-    bool EqPartial(const wxRichTextAttr& attr, bool weakTest = true) const;
-
-    /**
-        Merges the given attributes. If @a compareWith
-        is non-NULL, then it will be used to mask out those attributes that are the same in style
-        and @a compareWith, for situations where we don't want to explicitly set inherited attributes.
-    */
-    bool Apply(const wxRichTextAttr& style, const wxRichTextAttr* compareWith = NULL);
-
-    /**
-        Collects the attributes that are common to a range of content, building up a note of
-        which attributes are absent in some objects and which clash in some objects.
-    */
-    void CollectCommonAttributes(const wxRichTextAttr& attr, wxRichTextAttr& clashingAttr, wxRichTextAttr& absentAttr);
-
-    /**
-        Removes the specified attributes from this object.
-    */
-    bool RemoveStyle(const wxRichTextAttr& attr);
-
-    /**
-        Returns the text box attributes.
-    */
-    wxTextBoxAttr& GetTextBoxAttr() { return m_textBoxAttr; }
-    const wxTextBoxAttr& GetTextBoxAttr() const { return m_textBoxAttr; }
-
-    /**
-        Set the text box attributes.
-    */
-    void SetTextBoxAttr(const wxTextBoxAttr& attr) { m_textBoxAttr = attr; }
-
-    /**
-        Returns @true if no attributes are set.
-    */
-    bool IsDefault() const { return (GetFlags() == 0) && m_textBoxAttr.IsDefault(); }
-
-    wxTextBoxAttr    m_textBoxAttr;
-};
-
-WX_DECLARE_USER_EXPORTED_OBJARRAY(wxRichTextAttr, wxRichTextAttrArray, WXDLLIMPEXP_RICHTEXT);
-
-WX_DECLARE_USER_EXPORTED_OBJARRAY(wxVariant, wxRichTextVariantArray, WXDLLIMPEXP_RICHTEXT);
-
-WX_DECLARE_USER_EXPORTED_OBJARRAY(wxRect, wxRichTextRectArray, WXDLLIMPEXP_RICHTEXT);
-
-/**
-    @class wxRichTextProperties
-    A simple property class using wxVariants. This is used to give each rich text object the
-    ability to store custom properties that can be used by the application.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextBuffer, wxRichTextObject, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextProperties: public wxObject
-{
-DECLARE_DYNAMIC_CLASS(wxRichTextProperties)
-public:
-
-    /**
-        Default constructor.
-    */
-    wxRichTextProperties() {}
-
-    /**
-        Copy constructor.
-    */
-    wxRichTextProperties(const wxRichTextProperties& props): wxObject() { Copy(props); }
-
-    /**
-        Assignment operator.
-    */
-    void operator=(const wxRichTextProperties& props) { Copy(props); }
-
-    /**
-        Equality operator.
-    */
-    bool operator==(const wxRichTextProperties& props) const;
-
-    /**
-        Copies from @a props.
-    */
-    void Copy(const wxRichTextProperties& props) { m_properties = props.m_properties; }
-
-    /**
-        Returns the variant at the given index.
-    */
-    const wxVariant& operator[](size_t idx) const { return m_properties[idx]; }
-
-    /**
-        Returns the variant at the given index.
-    */
-    wxVariant& operator[](size_t idx) { return m_properties[idx]; }
-
-    /**
-        Clears the properties.
-    */
-    void Clear() { m_properties.Clear(); }
-
-    /**
-        Returns the array of variants implementing the properties.
-    */
-    const wxRichTextVariantArray& GetProperties() const { return m_properties; }
-
-    /**
-        Returns the array of variants implementing the properties.
-    */
-    wxRichTextVariantArray& GetProperties() { return m_properties; }
-
-    /**
-        Sets the array of variants.
-    */
-    void SetProperties(const wxRichTextVariantArray& props) { m_properties = props; }
-
-    /**
-        Returns all the property names.
-    */
-    wxArrayString GetPropertyNames() const;
-
-    /**
-        Returns a count of the properties.
-    */
-    size_t GetCount() const { return m_properties.GetCount(); }
-
-    /**
-        Returns @true if the given property is found.
-    */
-    bool HasProperty(const wxString& name) const { return Find(name) != -1; }
-
-    /**
-        Finds the given property.
-    */
-    int Find(const wxString& name) const;
-
-    /**
-        Removes the given property.
-    */
-    bool Remove(const wxString& name);
-
-    /**
-        Gets the property variant by name.
-    */
-    const wxVariant& GetProperty(const wxString& name) const;
-
-    /**
-        Finds or creates a property with the given name, returning a pointer to the variant.
-    */
-    wxVariant* FindOrCreateProperty(const wxString& name);
-
-    /**
-        Gets the value of the named property as a string.
-    */
-    wxString GetPropertyString(const wxString& name) const;
-
-    /**
-        Gets the value of the named property as a long integer.
-    */
-    long GetPropertyLong(const wxString& name) const;
-
-    /**
-        Gets the value of the named property as a boolean.
-    */
-    bool GetPropertyBool(const wxString& name) const;
-
-    /**
-        Gets the value of the named property as a double.
-    */
-    double GetPropertyDouble(const wxString& name) const;
-
-    /**
-        Sets the property by passing a variant which contains a name and value.
-    */
-    void SetProperty(const wxVariant& variant);
-
-    /**
-        Sets a property by name and variant.
-    */
-    void SetProperty(const wxString& name, const wxVariant& variant);
-
-    /**
-        Sets a property by name and string value.
-    */
-    void SetProperty(const wxString& name, const wxString& value);
-
-    /**
-        Sets a property by name and wxChar* value.
-    */
-    void SetProperty(const wxString& name, const wxChar* value) { SetProperty(name, wxString(value)); }
-
-    /**
-        Sets  property by name and long integer value.
-    */
-    void SetProperty(const wxString& name, long value);
-
-    /**
-        Sets  property by name and double value.
-    */
-    void SetProperty(const wxString& name, double value);
-
-    /**
-        Sets  property by name and boolean value.
-    */
-    void SetProperty(const wxString& name, bool value);
-
-    /**
-        Removes the given properties from these properties.
-    */
-    void RemoveProperties(const wxRichTextProperties& properties);
-
-    /**
-        Merges the given properties with these properties.
-    */
-    void MergeProperties(const wxRichTextProperties& properties);
-
-protected:
-    wxRichTextVariantArray  m_properties;
-};
-
-
-/**
-    @class wxRichTextFontTable
-    Manages quick access to a pool of fonts for rendering rich text.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextFontTable: public wxObject
-{
-public:
-    /**
-        Default constructor.
-    */
-    wxRichTextFontTable();
-
-    /**
-        Copy constructor.
-    */
-    wxRichTextFontTable(const wxRichTextFontTable& table);
-    virtual ~wxRichTextFontTable();
-
-    /**
-        Returns @true if the font table is valid.
-    */
-    bool IsOk() const { return m_refData != NULL; }
-
-    /**
-        Finds a font for the given attribute object.
-    */
-    wxFont FindFont(const wxRichTextAttr& fontSpec);
-
-    /**
-        Clears the font table.
-    */
-    void Clear();
-
-    /**
-        Assignment operator.
-    */
-    void operator= (const wxRichTextFontTable& table);
-
-    /**
-        Equality operator.
-    */
-    bool operator == (const wxRichTextFontTable& table) const;
-
-    /**
-        Inequality operator.
-    */
-    bool operator != (const wxRichTextFontTable& table) const { return !(*this == table); }
-
-    /**
-        Set the font scale factor.
-    */
-    void SetFontScale(double fontScale);
-
-protected:
-
-    double m_fontScale;
-
-    DECLARE_DYNAMIC_CLASS(wxRichTextFontTable)
-};
-
-/**
-    @class wxRichTextRange
-
-    This stores beginning and end positions for a range of data.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextRange
-{
-public:
-// Constructors
-
-    /**
-        Default constructor.
-    */
-    wxRichTextRange() { m_start = 0; m_end = 0; }
-
-    /**
-        Constructor taking start and end positions.
-    */
-    wxRichTextRange(long start, long end) { m_start = start; m_end = end; }
-
-    /**
-        Copy constructor.
-    */
-    wxRichTextRange(const wxRichTextRange& range) { m_start = range.m_start; m_end = range.m_end; }
-    ~wxRichTextRange() {}
-
-    /**
-        Assigns @a range to this range.
-    */
-    void operator =(const wxRichTextRange& range) { m_start = range.m_start; m_end = range.m_end; }
-
-    /**
-        Equality operator. Returns @true if @a range is the same as this range.
-    */
-    bool operator ==(const wxRichTextRange& range) const { return (m_start == range.m_start && m_end == range.m_end); }
-
-    /**
-        Inequality operator.
-    */
-    bool operator !=(const wxRichTextRange& range) const { return (m_start != range.m_start || m_end != range.m_end); }
-
-    /**
-        Subtracts a range from this range.
-    */
-    wxRichTextRange operator -(const wxRichTextRange& range) const { return wxRichTextRange(m_start - range.m_start, m_end - range.m_end); }
-
-    /**
-        Adds a range to this range.
-    */
-    wxRichTextRange operator +(const wxRichTextRange& range) const { return wxRichTextRange(m_start + range.m_start, m_end + range.m_end); }
-
-    /**
-        Sets the range start and end positions.
-    */
-    void SetRange(long start, long end) { m_start = start; m_end = end; }
-
-    /**
-        Sets the start position.
-    */
-    void SetStart(long start) { m_start = start; }
-
-    /**
-        Returns the start position.
-    */
-    long GetStart() const { return m_start; }
-
-    /**
-        Sets the end position.
-    */
-    void SetEnd(long end) { m_end = end; }
-
-    /**
-        Gets the end position.
-    */
-    long GetEnd() const { return m_end; }
-
-    /**
-        Returns true if this range is completely outside @a range.
-    */
-    bool IsOutside(const wxRichTextRange& range) const { return range.m_start > m_end || range.m_end < m_start; }
-
-    /**
-        Returns true if this range is completely within @a range.
-    */
-    bool IsWithin(const wxRichTextRange& range) const { return m_start >= range.m_start && m_end <= range.m_end; }
-
-    /**
-        Returns true if @a pos was within the range. Does not match if the range is empty.
-    */
-    bool Contains(long pos) const { return pos >= m_start && pos <= m_end ; }
-
-    /**
-        Limit this range to be within @a range.
-    */
-    bool LimitTo(const wxRichTextRange& range) ;
-
-    /**
-        Gets the length of the range.
-    */
-    long GetLength() const { return m_end - m_start + 1; }
-
-    /**
-        Swaps the start and end.
-    */
-    void Swap() { long tmp = m_start; m_start = m_end; m_end = tmp; }
-
-    /**
-        Converts the API-standard range, whose end is one past the last character in
-        the range, to the internal form, which uses the first and last character
-        positions of the range. In other words, one is subtracted from the end position.
-        (n, n) is the range of a single character.
-    */
-    wxRichTextRange ToInternal() const { return wxRichTextRange(m_start, m_end-1); }
-
-    /**
-        Converts the internal range, which uses the first and last character positions
-        of the range, to the API-standard range, whose end is one past the last
-        character in the range. In other words, one is added to the end position.
-        (n, n+1) is the range of a single character.
-    */
-    wxRichTextRange FromInternal() const { return wxRichTextRange(m_start, m_end+1); }
-
-protected:
-    long m_start;
-    long m_end;
-};
-
-WX_DECLARE_USER_EXPORTED_OBJARRAY(wxRichTextRange, wxRichTextRangeArray, WXDLLIMPEXP_RICHTEXT);
-
-#define wxRICHTEXT_ALL  wxRichTextRange(-2, -2)
-#define wxRICHTEXT_NONE  wxRichTextRange(-1, -1)
-
-#define wxRICHTEXT_NO_SELECTION wxRichTextRange(-2, -2)
-
-/**
-    @class wxRichTextSelection
-
-    Stores selection information. The selection does not have to be contiguous, though currently non-contiguous
-    selections are only supported for a range of table cells (a geometric block of cells can consist
-    of a set of non-contiguous positions).
-
-    The selection consists of an array of ranges, and the container that is the context for the selection. It
-    follows that a single selection object can only represent ranges with the same parent container.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextSelection
-{
-public:
-    /**
-        Copy constructor.
-    */
-    wxRichTextSelection(const wxRichTextSelection& sel) { Copy(sel); }
-
-    /**
-        Creates a selection from a range and a container.
-    */
-    wxRichTextSelection(const wxRichTextRange& range, wxRichTextParagraphLayoutBox* container) { m_ranges.Add(range); m_container = container; }
-
-    /**
-        Default constructor.
-    */
-    wxRichTextSelection() { Reset(); }
-
-    /**
-        Resets the selection.
-    */
-    void Reset() { m_ranges.Clear(); m_container = NULL; }
-
-    /**
-        Sets the selection.
-    */
-
-    void Set(const wxRichTextRange& range, wxRichTextParagraphLayoutBox* container)
-    { m_ranges.Clear(); m_ranges.Add(range); m_container = container; }
-
-    /**
-        Adds a range to the selection.
-    */
-    void Add(const wxRichTextRange& range)
-    { m_ranges.Add(range); }
-
-    /**
-        Sets the selections from an array of ranges and a container object.
-    */
-    void Set(const wxRichTextRangeArray& ranges, wxRichTextParagraphLayoutBox* container)
-    { m_ranges = ranges; m_container = container; }
-
-    /**
-        Copies from @a sel.
-    */
-    void Copy(const wxRichTextSelection& sel)
-    { m_ranges = sel.m_ranges; m_container = sel.m_container; }
-
-    /**
-        Assignment operator.
-    */
-    void operator=(const wxRichTextSelection& sel) { Copy(sel); }
-
-    /**
-        Equality operator.
-    */
-    bool operator==(const wxRichTextSelection& sel) const;
-
-    /**
-        Index operator.
-    */
-    wxRichTextRange operator[](size_t i) const { return GetRange(i); }
-
-    /**
-        Returns the selection ranges.
-    */
-    wxRichTextRangeArray& GetRanges() { return m_ranges; }
-
-    /**
-        Returns the selection ranges.
-    */
-    const wxRichTextRangeArray& GetRanges() const { return m_ranges; }
-
-    /**
-        Sets the selection ranges.
-    */
-    void SetRanges(const wxRichTextRangeArray& ranges) { m_ranges = ranges; }
-
-    /**
-        Returns the number of ranges in the selection.
-    */
-    size_t GetCount() const { return m_ranges.GetCount(); }
-
-    /**
-        Returns the range at the given index.
-
-    */
-    wxRichTextRange GetRange(size_t i) const { return m_ranges[i]; }
-
-    /**
-        Returns the first range if there is one, otherwise wxRICHTEXT_NO_SELECTION.
-    */
-    wxRichTextRange GetRange() const { return (m_ranges.GetCount() > 0) ? (m_ranges[0]) : wxRICHTEXT_NO_SELECTION; }
-
-    /**
-        Sets a single range.
-    */
-    void SetRange(const wxRichTextRange& range) { m_ranges.Clear(); m_ranges.Add(range); }
-
-    /**
-        Returns the container for which the selection is valid.
-    */
-    wxRichTextParagraphLayoutBox* GetContainer() const { return m_container; }
-
-    /**
-        Sets the container for which the selection is valid.
-    */
-    void SetContainer(wxRichTextParagraphLayoutBox* container) { m_container = container; }
-
-    /**
-        Returns @true if the selection is valid.
-    */
-    bool IsValid() const { return m_ranges.GetCount() > 0 && GetContainer(); }
-
-    /**
-        Returns the selection appropriate to the specified object, if any; returns an empty array if none
-        at the level of the object's container.
-    */
-    wxRichTextRangeArray GetSelectionForObject(wxRichTextObject* obj) const;
-
-    /**
-        Returns @true if the given position is within the selection.
-    */
-    bool WithinSelection(long pos, wxRichTextObject* obj) const;
-
-    /**
-        Returns @true if the given position is within the selection.
-
-    */
-    bool WithinSelection(long pos) const { return WithinSelection(pos, m_ranges); }
-
-    /**
-        Returns @true if the given position is within the selection range.
-    */
-    static bool WithinSelection(long pos, const wxRichTextRangeArray& ranges);
-
-    /**
-        Returns @true if the given range is within the selection range.
-    */
-    static bool WithinSelection(const wxRichTextRange& range, const wxRichTextRangeArray& ranges);
-
-    wxRichTextRangeArray            m_ranges;
-    wxRichTextParagraphLayoutBox*   m_container;
-};
-
-/**
-    @class wxRichTextDrawingContext
-
-    A class for passing information to drawing and measuring functions.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextDrawingContext: public wxObject
-{
-    DECLARE_CLASS(wxRichTextDrawingContext)
-public:
-
-    /**
-        Pass the buffer to the context so the context can retrieve information
-        such as virtual attributes.
-    */
-    wxRichTextDrawingContext(wxRichTextBuffer* buffer);
-
-    void Init() { m_buffer = NULL; m_enableVirtualAttributes = true; }
-
-    /**
-        Does this object have virtual attributes?
-        Virtual attributes can be provided for visual cues without
-        affecting the actual styling.
-    */
-    bool HasVirtualAttributes(wxRichTextObject* obj) const;
-
-    /**
-        Returns the virtual attributes for this object.
-        Virtual attributes can be provided for visual cues without
-        affecting the actual styling.
-    */
-    wxRichTextAttr GetVirtualAttributes(wxRichTextObject* obj) const;
-
-    /**
-        Applies any virtual attributes relevant to this object.
-    */
-    bool ApplyVirtualAttributes(wxRichTextAttr& attr, wxRichTextObject* obj) const;
-
-    /**
-        Gets the count for mixed virtual attributes for individual positions within the object.
-        For example, individual characters within a text object may require special highlighting.
-    */
-    int GetVirtualSubobjectAttributesCount(wxRichTextObject* obj) const;
-
-    /**
-        Gets the mixed virtual attributes for individual positions within the object.
-        For example, individual characters within a text object may require special highlighting.
-        The function is passed the count returned by GetVirtualSubobjectAttributesCount.
-    */
-    int GetVirtualSubobjectAttributes(wxRichTextObject* obj, wxArrayInt& positions, wxRichTextAttrArray& attributes) const;
-
-    /**
-        Do we have virtual text for this object? Virtual text allows an application
-        to replace characters in an object for editing and display purposes, for example
-        for highlighting special characters.
-    */
-    bool HasVirtualText(const wxRichTextPlainText* obj) const;
-
-    /**
-        Gets the virtual text for this object.
-    */
-    bool GetVirtualText(const wxRichTextPlainText* obj, wxString& text) const;
-
-    /**
-        Enables virtual attribute processing.
-    */
-
-    void EnableVirtualAttributes(bool b) { m_enableVirtualAttributes = b; }
-
-    /**
-        Returns @true if virtual attribute processing is enabled.
-    */
-
-    bool GetVirtualAttributesEnabled() const { return m_enableVirtualAttributes; }
-
-    wxRichTextBuffer*   m_buffer;
-    bool                m_enableVirtualAttributes;
-};
-
-/**
-    @class wxRichTextObject
-
-    This is the base for drawable rich text objects.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextObject: public wxObject
-{
-    DECLARE_CLASS(wxRichTextObject)
-public:
-    /**
-        Constructor, taking an optional parent pointer.
-    */
-    wxRichTextObject(wxRichTextObject* parent = NULL);
-
-    virtual ~wxRichTextObject();
-
-// Overridables
-
-    /**
-        Draw the item, within the given range. Some objects may ignore the range (for
-        example paragraphs) while others must obey it (lines, to implement wrapping)
-    */
-    virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) = 0;
-
-    /**
-        Lay the item out at the specified position with the given size constraint.
-        Layout must set the cached size. @rect is the available space for the object,
-        and @a parentRect is the container that is used to determine a relative size
-        or position (for example if a text box must be 50% of the parent text box).
-    */
-    virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) = 0;
-
-    /**
-        Hit-testing: returns a flag indicating hit test details, plus
-        information about position. @a contextObj is returned to specify what object
-        position is relevant to, since otherwise there's an ambiguity.
-        @ obj might not be a child of @a contextObj, since we may be referring to the container itself
-        if we have no hit on a child - for example if we click outside an object.
-
-        The function puts the position in @a textPosition if one is found.
-        @a pt is in logical units (a zero y position is at the beginning of the buffer).
-
-        Pass wxRICHTEXT_HITTEST_NO_NESTED_OBJECTS if you only want to consider objects
-        directly under the object you are calling HitTest on. Otherwise, it will recurse
-        and potentially find a nested object.
-
-        @return One of the ::wxRichTextHitTestFlags values.
-    */
-
-    virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0);
-
-    /**
-        Finds the absolute position and row height for the given character position.
-    */
-    virtual bool FindPosition(wxDC& WXUNUSED(dc), wxRichTextDrawingContext& WXUNUSED(context), long WXUNUSED(index), wxPoint& WXUNUSED(pt), int* WXUNUSED(height), bool WXUNUSED(forceLineStart)) { return false; }
-
-    /**
-        Returns the best size, i.e. the ideal starting size for this object irrespective
-        of available space. For a short text string, it will be the size that exactly encloses
-        the text. For a longer string, it might use the parent width for example.
-    */
-    virtual wxSize GetBestSize() const { return m_size; }
-
-    /**
-        Returns the object size for the given range. Returns @false if the range
-        is invalid for this object.
-    */
-
-    virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const  = 0;
-
-    /**
-        Do a split from @a pos, returning an object containing the second part, and setting
-        the first part in 'this'.
-    */
-    virtual wxRichTextObject* DoSplit(long WXUNUSED(pos)) { return NULL; }
-
-    /**
-        Calculates the range of the object. By default, guess that the object is 1 unit long.
-    */
-    virtual void CalculateRange(long start, long& end) { end = start ; m_range.SetRange(start, end); }
-
-    /**
-        Deletes the given range.
-    */
-    virtual bool DeleteRange(const wxRichTextRange& WXUNUSED(range)) { return false; }
-
-    /**
-        Returns @true if the object is empty.
-    */
-    virtual bool IsEmpty() const { return false; }
-
-    /**
-        Returns @true if this class of object is floatable.
-    */
-    virtual bool IsFloatable() const { return false; }
-
-    /**
-        Returns @true if this object is currently floating.
-    */
-    virtual bool IsFloating() const { return GetAttributes().GetTextBoxAttr().IsFloating(); }
-
-    /**
-        Returns the floating direction.
-    */
-    virtual int GetFloatDirection() const { return GetAttributes().GetTextBoxAttr().GetFloatMode(); }
-
-    /**
-        Returns any text in this object for the given range.
-    */
-    virtual wxString GetTextForRange(const wxRichTextRange& WXUNUSED(range)) const { return wxEmptyString; }
-
-    /**
-        Returns @true if this object can merge itself with the given one.
-    */
-    virtual bool CanMerge(wxRichTextObject* WXUNUSED(object), wxRichTextDrawingContext& WXUNUSED(context)) const { return false; }
-
-    /**
-        Returns @true if this object merged itself with the given one.
-        The calling code will then delete the given object.
-    */
-    virtual bool Merge(wxRichTextObject* WXUNUSED(object), wxRichTextDrawingContext& WXUNUSED(context)) { return false; }
-
-    /**
-        JACS
-        Returns @true if this object can potentially be split, by virtue of having
-        different virtual attributes for individual sub-objects.
-    */
-    virtual bool CanSplit(wxRichTextDrawingContext& WXUNUSED(context)) const { return false; }
-
-    /**
-        Returns the final object in the split objects if this object was split due to differences between sub-object virtual attributes.
-        Returns itself if it was not split.
-    */
-    virtual wxRichTextObject* Split(wxRichTextDrawingContext& WXUNUSED(context)) { return this; }
-
-    /**
-        Dump object data to the given output stream for debugging.
-    */
-    virtual void Dump(wxTextOutputStream& stream);
-
-    /**
-        Returns @true if we can edit the object's properties via a GUI.
-    */
-    virtual bool CanEditProperties() const { return false; }
-
-    /**
-        Edits the object's properties via a GUI.
-    */
-    virtual bool EditProperties(wxWindow* WXUNUSED(parent), wxRichTextBuffer* WXUNUSED(buffer)) { return false; }
-
-    /**
-        Returns the label to be used for the properties context menu item.
-    */
-    virtual wxString GetPropertiesMenuLabel() const { return wxEmptyString; }
-
-    /**
-        Returns @true if objects of this class can accept the focus, i.e. a call to SetFocusObject
-        is possible. For example, containers supporting text, such as a text box object, can accept the focus,
-        but a table can't (set the focus to individual cells instead).
-    */
-    virtual bool AcceptsFocus() const { return false; }
-
-#if wxUSE_XML
-    /**
-        Imports this object from XML.
-    */
-    virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse);
-#endif
-
-#if wxRICHTEXT_HAVE_DIRECT_OUTPUT
-    /**
-        Exports this object directly to the given stream, bypassing the creation of a wxXmlNode hierarchy.
-        This method is considerably faster than creating a tree first. However, both versions of ExportXML must be
-        implemented so that if the tree method is made efficient in the future, we can deprecate the
-        more verbose direct output method. Compiled only if wxRICHTEXT_HAVE_DIRECT_OUTPUT is defined (on by default).
-    */
-    virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler);
-#endif
-
-#if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT
-    /**
-        Exports this object to the given parent node, usually creating at least one child node.
-        This method is less efficient than the direct-to-stream method but is retained to allow for
-        switching to this method if we make it more efficient. Compiled only if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT is defined
-        (on by default).
-    */
-    virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler);
-#endif
-
-    /**
-        Returns @true if this object takes note of paragraph attributes (text and image objects don't).
-    */
-    virtual bool UsesParagraphAttributes() const { return true; }
-
-    /**
-        Returns the XML node name of this object. This must be overridden for wxXmlNode-base XML export to work.
-    */
-    virtual wxString GetXMLNodeName() const { return wxT("unknown"); }
-
-    /**
-        Invalidates the object at the given range. With no argument, invalidates the whole object.
-    */
-    virtual void Invalidate(const wxRichTextRange& invalidRange = wxRICHTEXT_ALL);
-
-    /**
-        Returns @true if this object can handle the selections of its children, fOr example a table.
-        Required for composite selection handling to work.
-    */
-    virtual bool HandlesChildSelections() const { return false; }
-
-    /**
-        Returns a selection object specifying the selections between start and end character positions.
-        For example, a table would deduce what cells (of range length 1) are selected when dragging across the table.
-    */
-    virtual wxRichTextSelection GetSelection(long WXUNUSED(start), long WXUNUSED(end)) const { return wxRichTextSelection(); }
-
-// Accessors
-
-    /**
-        Gets the cached object size as calculated by Layout.
-    */
-    virtual wxSize GetCachedSize() const { return m_size; }
-
-    /**
-        Sets the cached object size as calculated by Layout.
-    */
-    virtual void SetCachedSize(const wxSize& sz) { m_size = sz; }
-
-    /**
-        Gets the maximum object size as calculated by Layout. This allows
-        us to fit an object to its contents or allocate extra space if required.
-    */
-    virtual wxSize GetMaxSize() const { return m_maxSize; }
-
-    /**
-        Sets the maximum object size as calculated by Layout. This allows
-        us to fit an object to its contents or allocate extra space if required.
-    */
-    virtual void SetMaxSize(const wxSize& sz) { m_maxSize = sz; }
-
-    /**
-        Gets the minimum object size as calculated by Layout. This allows
-        us to constrain an object to its absolute minimum size if necessary.
-    */
-    virtual wxSize GetMinSize() const { return m_minSize; }
-
-    /**
-        Sets the minimum object size as calculated by Layout. This allows
-        us to constrain an object to its absolute minimum size if necessary.
-    */
-    virtual void SetMinSize(const wxSize& sz) { m_minSize = sz; }
-
-    /**
-        Gets the 'natural' size for an object. For an image, it would be the
-        image size.
-    */
-    virtual wxTextAttrSize GetNaturalSize() const { return wxTextAttrSize(); }
-
-    /**
-        Returns the object position in pixels.
-    */
-    virtual wxPoint GetPosition() const { return m_pos; }
-
-    /**
-        Sets the object position in pixels.
-    */
-    virtual void SetPosition(const wxPoint& pos) { m_pos = pos; }
-
-    /**
-        Returns the absolute object position, by traversing up the child/parent hierarchy.
-        TODO: may not be needed, if all object positions are in fact relative to the
-        top of the coordinate space.
-    */
-    virtual wxPoint GetAbsolutePosition() const;
-
-    /**
-        Returns the rectangle enclosing the object.
-    */
-    virtual wxRect GetRect() const { return wxRect(GetPosition(), GetCachedSize()); }
-
-    /**
-        Sets the object's range within its container.
-    */
-    void SetRange(const wxRichTextRange& range) { m_range = range; }
-
-    /**
-        Returns the object's range.
-    */
-    const wxRichTextRange& GetRange() const { return m_range; }
-
-    /**
-        Returns the object's range.
-    */
-    wxRichTextRange& GetRange() { return m_range; }
-
-    /**
-        Set the object's own range, for a top-level object with its own position space.
-    */
-    void SetOwnRange(const wxRichTextRange& range) { m_ownRange = range; }
-
-    /**
-        Returns the object's own range (valid if top-level).
-    */
-    const wxRichTextRange& GetOwnRange() const { return m_ownRange; }
-
-    /**
-        Returns the object's own range (valid if top-level).
-    */
-    wxRichTextRange& GetOwnRange() { return m_ownRange; }
-
-    /**
-        Returns the object's own range only if a top-level object.
-    */
-    wxRichTextRange GetOwnRangeIfTopLevel() const { return IsTopLevel() ? m_ownRange : m_range; }
-
-    /**
-        Returns @true if this object is composite.
-    */
-    virtual bool IsComposite() const { return false; }
-
-    /**
-        Returns @true if no user editing can be done inside the object. This returns @true for simple objects,
-        @false for most composite objects, but @true for fields, which if composite, should not be user-edited.
-    */
-    virtual bool IsAtomic() const { return true; }
-
-    /**
-        Returns a pointer to the parent object.
-    */
-    virtual wxRichTextObject* GetParent() const { return m_parent; }
-
-    /**
-        Sets the pointer to the parent object.
-    */
-    virtual void SetParent(wxRichTextObject* parent) { m_parent = parent; }
-
-    /**
-        Returns the top-level container of this object.
-        May return itself if it's a container; use GetParentContainer to return
-        a different container.
-    */
-    virtual wxRichTextParagraphLayoutBox* GetContainer() const;
-
-    /**
-        Returns the top-level container of this object.
-        Returns a different container than itself, unless there's no parent, in which case it will return NULL.
-    */
-    virtual wxRichTextParagraphLayoutBox* GetParentContainer() const { return GetParent() ? GetParent()->GetContainer() : GetContainer(); }
-
-    /**
-        Set the margin around the object, in pixels.
-    */
-    virtual void SetMargins(int margin);
-
-    /**
-        Set the margin around the object, in pixels.
-    */
-    virtual void SetMargins(int leftMargin, int rightMargin, int topMargin, int bottomMargin);
-
-    /**
-        Returns the left margin of the object, in pixels.
-    */
-    virtual int GetLeftMargin() const;
-
-    /**
-        Returns the right margin of the object, in pixels.
-    */
-    virtual int GetRightMargin() const;
-
-    /**
-        Returns the top margin of the object, in pixels.
-    */
-    virtual int GetTopMargin() const;
-
-    /**
-        Returns the bottom margin of the object, in pixels.
-    */
-    virtual int GetBottomMargin() const;
-
-    /**
-        Calculates the available content space in the given rectangle, given the
-        margins, border and padding specified in the object's attributes.
-    */
-    virtual wxRect GetAvailableContentArea(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& outerRect) const;
-
-    /**
-        Lays out the object first with a given amount of space, and then if no width was specified in attr,
-        lays out the object again using the minimum size. @a availableParentSpace is the maximum space
-        for the object, whereas @a availableContainerSpace is the container with which relative positions and
-        sizes should be computed. For example, a text box whose space has already been constrained
-        in a previous layout pass to @a availableParentSpace, but should have a width of 50% of @a availableContainerSpace.
-        (If these two rects were the same, a 2nd pass could see the object getting too small.)
-    */
-    virtual bool LayoutToBestSize(wxDC& dc, wxRichTextDrawingContext& context, wxRichTextBuffer* buffer,
-                    const wxRichTextAttr& parentAttr, const wxRichTextAttr& attr,
-                    const wxRect& availableParentSpace, const wxRect& availableContainerSpace, int style);
-
-    /**
-        Adjusts the attributes for virtual attribute provision, collapsed borders, etc.
-    */
-    virtual bool AdjustAttributes(wxRichTextAttr& attr, wxRichTextDrawingContext& context);
-
-    /**
-        Sets the object's attributes.
-    */
-    void SetAttributes(const wxRichTextAttr& attr) { m_attributes = attr; }
-
-    /**
-        Returns the object's attributes.
-    */
-    const wxRichTextAttr& GetAttributes() const { return m_attributes; }
-
-    /**
-        Returns the object's attributes.
-    */
-    wxRichTextAttr& GetAttributes() { return m_attributes; }
-
-    /**
-        Returns the object's properties.
-    */
-    wxRichTextProperties& GetProperties() { return m_properties; }
-
-    /**
-        Returns the object's properties.
-    */
-    const wxRichTextProperties& GetProperties() const { return m_properties; }
-
-    /**
-        Sets the object's properties.
-    */
-    void SetProperties(const wxRichTextProperties& props) { m_properties = props; }
-
-    /**
-        Sets the stored descent value.
-    */
-    void SetDescent(int descent) { m_descent = descent; }
-
-    /**
-        Returns the stored descent value.
-    */
-    int GetDescent() const { return m_descent; }
-
-    /**
-        Returns the containing buffer.
-    */
-    wxRichTextBuffer* GetBuffer() const;
-
-    /**
-        Sets the identifying name for this object as a property using the "name" key.
-    */
-    void SetName(const wxString& name) { m_properties.SetProperty(wxT("name"), name); }
-
-    /**
-        Returns the identifying name for this object from the properties, using the "name" key.
-    */
-    wxString GetName() const { return m_properties.GetPropertyString(wxT("name")); }
-
-    /**
-        Returns @true if this object is top-level, i.e. contains its own paragraphs, such as a text box.
-    */
-    virtual bool IsTopLevel() const { return false; }
-
-    /**
-        Returns @true if the object will be shown, @false otherwise.
-    */
-    bool IsShown() const { return m_show; }
-
-// Operations
-
-    /**
-        Call to show or hide this object. This function does not cause the content to be
-        laid out or redrawn.
-    */
-    virtual void Show(bool show) { m_show = show; }
-
-    /**
-        Clones the object.
-    */
-    virtual wxRichTextObject* Clone() const { return NULL; }
-
-    /**
-        Copies the object.
-    */
-    void Copy(const wxRichTextObject& obj);
-
-    /**
-        Reference-counting allows us to use the same object in multiple
-        lists (not yet used).
-    */
-
-    void Reference() { m_refCount ++; }
-
-    /**
-        Reference-counting allows us to use the same object in multiple
-        lists (not yet used).
-    */
-    void Dereference();
-
-    /**
-        Moves the object recursively, by adding the offset from old to new.
-    */
-    virtual void Move(const wxPoint& pt);
-
-    /**
-        Converts units in tenths of a millimetre to device units.
-    */
-    int ConvertTenthsMMToPixels(wxDC& dc, int units) const;
-
-    /**
-        Converts units in tenths of a millimetre to device units.
-    */
-    static int ConvertTenthsMMToPixels(int ppi, int units, double scale = 1.0);
-
-    /**
-        Convert units in pixels to tenths of a millimetre.
-    */
-    int ConvertPixelsToTenthsMM(wxDC& dc, int pixels) const;
-
-    /**
-        Convert units in pixels to tenths of a millimetre.
-    */
-    static int ConvertPixelsToTenthsMM(int ppi, int pixels, double scale = 1.0);
-
-    /**
-        Draws the borders and background for the given rectangle and attributes.
-        @a boxRect is taken to be the outer margin box, not the box around the content.
-    */
-    static bool DrawBoxAttributes(wxDC& dc, wxRichTextBuffer* buffer, const wxRichTextAttr& attr, const wxRect& boxRect, int flags = 0, wxRichTextObject* obj = NULL);
-
-    /**
-        Draws a border.
-    */
-    static bool DrawBorder(wxDC& dc, wxRichTextBuffer* buffer, const wxTextAttrBorders& attr, const wxRect& rect, int flags = 0);
-
-    /**
-        Returns the various rectangles of the box model in pixels. You can either specify @a contentRect (inner)
-        or @a marginRect (outer), and the other must be the default rectangle (no width or height).
-        Note that the outline doesn't affect the position of the rectangle, it's drawn in whatever space
-        is available.
-    */
-    static bool GetBoxRects(wxDC& dc, wxRichTextBuffer* buffer, const wxRichTextAttr& attr, wxRect& marginRect, wxRect& borderRect, wxRect& contentRect, wxRect& paddingRect, wxRect& outlineRect);
-
-    /**
-        Returns the total margin for the object in pixels, taking into account margin, padding and border size.
-    */
-    static bool GetTotalMargin(wxDC& dc, wxRichTextBuffer* buffer, const wxRichTextAttr& attr, int& leftMargin, int& rightMargin,
-        int& topMargin, int& bottomMargin);
-
-    /**
-        Returns the rectangle which the child has available to it given restrictions specified in the
-        child attribute, e.g. 50% width of the parent, 400 pixels, x position 20% of the parent, etc.
-        availableContainerSpace might be a parent that the cell has to compute its width relative to.
-        E.g. a cell that's 50% of its parent.
-    */
-    static wxRect AdjustAvailableSpace(wxDC& dc, wxRichTextBuffer* buffer, const wxRichTextAttr& parentAttr, const wxRichTextAttr& childAttr,
-        const wxRect& availableParentSpace, const wxRect& availableContainerSpace);
-
-protected:
-    wxSize                  m_size;
-    wxSize                  m_maxSize;
-    wxSize                  m_minSize;
-    wxPoint                 m_pos;
-    int                     m_descent; // Descent for this object (if any)
-    int                     m_refCount;
-    bool                    m_show;
-    wxRichTextObject*       m_parent;
-
-    // The range of this object (start position to end position)
-    wxRichTextRange         m_range;
-
-    // The internal range of this object, if it's a top-level object with its own range space
-    wxRichTextRange         m_ownRange;
-
-    // Attributes
-    wxRichTextAttr          m_attributes;
-
-    // Properties
-    wxRichTextProperties    m_properties;
-};
-
-WX_DECLARE_LIST_WITH_DECL( wxRichTextObject, wxRichTextObjectList, class WXDLLIMPEXP_RICHTEXT );
-
-/**
-    @class wxRichTextCompositeObject
-
-    Objects of this class can contain other objects.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextObject, wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextCompositeObject: public wxRichTextObject
-{
-    DECLARE_CLASS(wxRichTextCompositeObject)
-public:
-// Constructors
-
-    wxRichTextCompositeObject(wxRichTextObject* parent = NULL);
-    virtual ~wxRichTextCompositeObject();
-
-// Overridables
-
-    virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0);
-
-    virtual bool FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart);
-
-    virtual void CalculateRange(long start, long& end);
-
-    virtual bool DeleteRange(const wxRichTextRange& range);
-
-    virtual wxString GetTextForRange(const wxRichTextRange& range) const;
-
-    virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const;
-
-    virtual void Dump(wxTextOutputStream& stream);
-
-    virtual void Invalidate(const wxRichTextRange& invalidRange = wxRICHTEXT_ALL);
-
-// Accessors
-
-    /**
-        Returns the children.
-    */
-    wxRichTextObjectList& GetChildren() { return m_children; }
-    /**
-        Returns the children.
-    */
-    const wxRichTextObjectList& GetChildren() const { return m_children; }
-
-    /**
-        Returns the number of children.
-    */
-    size_t GetChildCount() const ;
-
-    /**
-        Returns the nth child.
-    */
-    wxRichTextObject* GetChild(size_t n) const ;
-
-    /**
-        Returns @true if this object is composite.
-    */
-    virtual bool IsComposite() const { return true; }
-
-    /**
-        Returns @true if no user editing can be done inside the object. This returns @true for simple objects,
-        @false for most composite objects, but @true for fields, which if composite, should not be user-edited.
-    */
-    virtual bool IsAtomic() const { return false; }
-
-    /**
-        Returns true if the buffer is empty.
-    */
-    virtual bool IsEmpty() const { return GetChildCount() == 0; }
-
-    /**
-        Returns the child object at the given character position.
-    */
-    virtual wxRichTextObject* GetChildAtPosition(long pos) const;
-
-// Operations
-
-    void Copy(const wxRichTextCompositeObject& obj);
-
-    void operator= (const wxRichTextCompositeObject& obj) { Copy(obj); }
-
-    /**
-        Appends a child, returning the position.
-    */
-    size_t AppendChild(wxRichTextObject* child) ;
-
-    /**
-        Inserts the child in front of the given object, or at the beginning.
-    */
-    bool InsertChild(wxRichTextObject* child, wxRichTextObject* inFrontOf) ;
-
-    /**
-        Removes and optionally deletes the specified child.
-    */
-    bool RemoveChild(wxRichTextObject* child, bool deleteChild = false) ;
-
-    /**
-        Deletes all the children.
-    */
-    bool DeleteChildren() ;
-
-    /**
-        Recursively merges all pieces that can be merged.
-    */
-    bool Defragment(wxRichTextDrawingContext& context, const wxRichTextRange& range = wxRICHTEXT_ALL);
-
-    /**
-        Moves the object recursively, by adding the offset from old to new.
-    */
-    virtual void Move(const wxPoint& pt);
-
-protected:
-    wxRichTextObjectList    m_children;
-};
-
-/**
-    @class wxRichTextParagraphLayoutBox
-
-    This class knows how to lay out paragraphs.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextCompositeObject, wxRichTextObject, wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextParagraphLayoutBox: public wxRichTextCompositeObject
-{
-    DECLARE_DYNAMIC_CLASS(wxRichTextParagraphLayoutBox)
-public:
-// Constructors
-
-    wxRichTextParagraphLayoutBox(wxRichTextObject* parent = NULL);
-    wxRichTextParagraphLayoutBox(const wxRichTextParagraphLayoutBox& obj): wxRichTextCompositeObject() { Init(); Copy(obj); }
-    ~wxRichTextParagraphLayoutBox();
-
-// Overridables
-
-    virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0);
-
-    virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
-
-    virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style);
-
-    virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const;
-
-    virtual bool DeleteRange(const wxRichTextRange& range);
-
-    virtual wxString GetTextForRange(const wxRichTextRange& range) const;
-
-#if wxUSE_XML
-    virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse);
-#endif
-
-#if wxRICHTEXT_HAVE_DIRECT_OUTPUT
-    virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler);
-#endif
-
-#if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT
-    virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler);
-#endif
-
-    virtual wxString GetXMLNodeName() const { return wxT("paragraphlayout"); }
-
-    virtual bool AcceptsFocus() const { return true; }
-
-// Accessors
-
-    /**
-        Associates a control with the buffer, for operations that for example require refreshing the window.
-    */
-    void SetRichTextCtrl(wxRichTextCtrl* ctrl) { m_ctrl = ctrl; }
-
-    /**
-        Returns the associated control.
-    */
-    wxRichTextCtrl* GetRichTextCtrl() const { return m_ctrl; }
-
-    /**
-        Sets a flag indicating whether the last paragraph is partial or complete.
-    */
-    void SetPartialParagraph(bool partialPara) { m_partialParagraph = partialPara; }
-
-    /**
-        Returns a flag indicating whether the last paragraph is partial or complete.
-    */
-    bool GetPartialParagraph() const { return m_partialParagraph; }
-
-    /**
-        Returns the style sheet associated with the overall buffer.
-    */
-    virtual wxRichTextStyleSheet* GetStyleSheet() const;
-
-    virtual bool IsTopLevel() const { return true; }
-
-// Operations
-
-    /**
-        Submits a command to insert paragraphs.
-    */
-    bool InsertParagraphsWithUndo(wxRichTextBuffer* buffer, long pos, const wxRichTextParagraphLayoutBox& paragraphs, wxRichTextCtrl* ctrl, int flags = 0);
-
-    /**
-        Submits a command to insert the given text.
-    */
-    bool InsertTextWithUndo(wxRichTextBuffer* buffer, long pos, const wxString& text, wxRichTextCtrl* ctrl, int flags = 0);
-
-    /**
-        Submits a command to insert the given text.
-    */
-    bool InsertNewlineWithUndo(wxRichTextBuffer* buffer, long pos, wxRichTextCtrl* ctrl, int flags = 0);
-
-    /**
-        Submits a command to insert the given image.
-    */
-    bool InsertImageWithUndo(wxRichTextBuffer* buffer, long pos, const wxRichTextImageBlock& imageBlock,
-                                                        wxRichTextCtrl* ctrl, int flags, const wxRichTextAttr& textAttr);
-
-    /**
-        Submits a command to insert the given field. Field data can be included in properties.
-
-        @see wxRichTextField, wxRichTextFieldType, wxRichTextFieldTypeStandard
-    */
-    wxRichTextField* InsertFieldWithUndo(wxRichTextBuffer* buffer, long pos, const wxString& fieldType,
-                                                        const wxRichTextProperties& properties,
-                                                        wxRichTextCtrl* ctrl, int flags,
-                                                        const wxRichTextAttr& textAttr);
-
-    /**
-        Returns the style that is appropriate for a new paragraph at this position.
-        If the previous paragraph has a paragraph style name, looks up the next-paragraph
-        style.
-    */
-    wxRichTextAttr GetStyleForNewParagraph(wxRichTextBuffer* buffer, long pos, bool caretPosition = false, bool lookUpNewParaStyle=false) const;
-
-    /**
-        Inserts an object.
-    */
-    wxRichTextObject* InsertObjectWithUndo(wxRichTextBuffer* buffer, long pos, wxRichTextObject *object, wxRichTextCtrl* ctrl, int flags = 0);
-
-    /**
-        Submits a command to delete this range.
-    */
-    bool DeleteRangeWithUndo(const wxRichTextRange& range, wxRichTextCtrl* ctrl, wxRichTextBuffer* buffer);
-
-    /**
-        Draws the floating objects in this buffer.
-    */
-    void DrawFloats(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
-
-    /**
-        Moves an anchored object to another paragraph.
-    */
-    void MoveAnchoredObjectToParagraph(wxRichTextParagraph* from, wxRichTextParagraph* to, wxRichTextObject* obj);
-
-    /**
-        Initializes the object.
-    */
-    void Init();
-
-    /**
-        Clears all the children.
-    */
-    virtual void Clear();
-
-    /**
-        Clears and initializes with one blank paragraph.
-    */
-    virtual void Reset();
-
-    /**
-        Convenience function to add a paragraph of text.
-    */
-    virtual wxRichTextRange AddParagraph(const wxString& text, wxRichTextAttr* paraStyle = NULL);
-
-    /**
-        Convenience function to add an image.
-    */
-    virtual wxRichTextRange AddImage(const wxImage& image, wxRichTextAttr* paraStyle = NULL);
-
-    /**
-        Adds multiple paragraphs, based on newlines.
-    */
-    virtual wxRichTextRange AddParagraphs(const wxString& text, wxRichTextAttr* paraStyle = NULL);
-
-    /**
-        Returns the line at the given position. If @a caretPosition is true, the position is
-        a caret position, which is normally a smaller number.
-    */
-    virtual wxRichTextLine* GetLineAtPosition(long pos, bool caretPosition = false) const;
-
-    /**
-        Returns the line at the given y pixel position, or the last line.
-    */
-    virtual wxRichTextLine* GetLineAtYPosition(int y) const;
-
-    /**
-        Returns the paragraph at the given character or caret position.
-    */
-    virtual wxRichTextParagraph* GetParagraphAtPosition(long pos, bool caretPosition = false) const;
-
-    /**
-        Returns the line size at the given position.
-    */
-    virtual wxSize GetLineSizeAtPosition(long pos, bool caretPosition = false) const;
-
-    /**
-        Given a position, returns the number of the visible line (potentially many to a paragraph),
-        starting from zero at the start of the buffer. We also have to pass a bool (@a startOfLine)
-        that indicates whether the caret is being shown at the end of the previous line or at the start
-        of the next, since the caret can be shown at two visible positions for the same underlying
-        position.
-    */
-    virtual long GetVisibleLineNumber(long pos, bool caretPosition = false, bool startOfLine = false) const;
-
-    /**
-        Given a line number, returns the corresponding wxRichTextLine object.
-    */
-    virtual wxRichTextLine* GetLineForVisibleLineNumber(long lineNumber) const;
-
-    /**
-        Returns the leaf object in a paragraph at this position.
-    */
-    virtual wxRichTextObject* GetLeafObjectAtPosition(long position) const;
-
-    /**
-        Returns the paragraph by number.
-    */
-    virtual wxRichTextParagraph* GetParagraphAtLine(long paragraphNumber) const;
-
-    /**
-        Returns the paragraph for a given line.
-    */
-    virtual wxRichTextParagraph* GetParagraphForLine(wxRichTextLine* line) const;
-
-    /**
-        Returns the length of the paragraph.
-    */
-    virtual int GetParagraphLength(long paragraphNumber) const;
-
-    /**
-        Returns the number of paragraphs.
-    */
-    virtual int GetParagraphCount() const { return static_cast<int>(GetChildCount()); }
-
-    /**
-        Returns the number of visible lines.
-    */
-    virtual int GetLineCount() const;
-
-    /**
-        Returns the text of the paragraph.
-    */
-    virtual wxString GetParagraphText(long paragraphNumber) const;
-
-    /**
-        Converts zero-based line column and paragraph number to a position.
-    */
-    virtual long XYToPosition(long x, long y) const;
-
-    /**
-        Converts a zero-based position to line column and paragraph number.
-    */
-    virtual bool PositionToXY(long pos, long* x, long* y) const;
-
-    /**
-        Sets the attributes for the given range. Pass flags to determine how the
-        attributes are set.
-
-        The end point of range is specified as the last character position of the span
-        of text. So, for example, to set the style for a character at position 5,
-        use the range (5,5).
-        This differs from the wxRichTextCtrl API, where you would specify (5,6).
-
-        @a flags may contain a bit list of the following values:
-        - wxRICHTEXT_SETSTYLE_NONE: no style flag.
-        - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this operation should be
-          undoable.
-        - wxRICHTEXT_SETSTYLE_OPTIMIZE: specifies that the style should not be applied
-          if the combined style at this point is already the style in question.
-        - wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY: specifies that the style should only be
-          applied to paragraphs, and not the content.
-          This allows content styling to be preserved independently from that
-          of e.g. a named paragraph style.
-        - wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY: specifies that the style should only be
-          applied to characters, and not the paragraph.
-          This allows content styling to be preserved independently from that
-          of e.g. a named paragraph style.
-        - wxRICHTEXT_SETSTYLE_RESET: resets (clears) the existing style before applying
-          the new style.
-        - wxRICHTEXT_SETSTYLE_REMOVE: removes the specified style.
-          Only the style flags are used in this operation.
-    */
-    virtual bool SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
-
-    /**
-        Sets the attributes for the given object only, for example the box attributes for a text box.
-    */
-    virtual void SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
-
-    /**
-        Returns the combined text attributes for this position.
-
-        This function gets the @e uncombined style - that is, the attributes associated
-        with the paragraph or character content, and not necessarily the combined
-        attributes you see on the screen. To get the combined attributes, use GetStyle().
-        If you specify (any) paragraph attribute in @e style's flags, this function
-        will fetch the paragraph attributes.
-        Otherwise, it will return the character attributes.
-    */
-    virtual bool GetStyle(long position, wxRichTextAttr& style);
-
-    /**
-        Returns the content (uncombined) attributes for this position.
-    */
-    virtual bool GetUncombinedStyle(long position, wxRichTextAttr& style);
-
-    /**
-        Implementation helper for GetStyle. If combineStyles is true, combine base, paragraph and
-        context attributes.
-    */
-    virtual bool DoGetStyle(long position, wxRichTextAttr& style, bool combineStyles = true);
-
-    /**
-        This function gets a style representing the common, combined attributes in the
-        given range.
-        Attributes which have different values within the specified range will not be
-        included the style flags.
-
-        The function is used to get the attributes to display in the formatting dialog:
-        the user can edit the attributes common to the selection, and optionally specify the
-        values of further attributes to be applied uniformly.
-
-        To apply the edited attributes, you can use SetStyle() specifying
-        the wxRICHTEXT_SETSTYLE_OPTIMIZE flag, which will only apply attributes that
-        are different from the @e combined attributes within the range.
-        So, the user edits the effective, displayed attributes for the range,
-        but his choice won't be applied unnecessarily to content. As an example,
-        say the style for a paragraph specifies bold, but the paragraph text doesn't
-        specify a weight.
-        The combined style is bold, and this is what the user will see on-screen and
-        in the formatting dialog. The user now specifies red text, in addition to bold.
-        When applying with SetStyle(), the content font weight attributes won't be
-        changed to bold because this is already specified by the paragraph.
-        However the text colour attributes @e will be changed to show red.
-    */
-    virtual bool GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style);
-
-    /**
-        Combines @a style with @a currentStyle for the purpose of summarising the attributes of a range of
-        content.
-    */
-    bool CollectStyle(wxRichTextAttr& currentStyle, const wxRichTextAttr& style, wxRichTextAttr& clashingAttr, wxRichTextAttr& absentAttr);
-
-    //@{
-    /**
-        Sets the list attributes for the given range, passing flags to determine how
-        the attributes are set.
-        Either the style definition or the name of the style definition (in the current
-        sheet) can be passed.
-
-        @a flags is a bit list of the following:
-        - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable.
-        - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from
-          @a startFrom, otherwise existing attributes are used.
-        - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used
-          as the level for all paragraphs, otherwise the current indentation will be used.
-
-        @see NumberList(), PromoteList(), ClearListStyle().
-    */
-    virtual bool SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1);
-    virtual bool SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1);
-    //@}
-
-    /**
-        Clears the list style from the given range, clearing list-related attributes
-        and applying any named paragraph style associated with each paragraph.
-
-        @a flags is a bit list of the following:
-        - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable.
-
-        @see SetListStyle(), PromoteList(), NumberList()
-    */
-    virtual bool ClearListStyle(const wxRichTextRange& range, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
-
-    //@{
-    /**
-        Numbers the paragraphs in the given range.
-
-        Pass flags to determine how the attributes are set.
-        Either the style definition or the name of the style definition (in the current
-        sheet) can be passed.
-
-        @a flags is a bit list of the following:
-        - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable.
-        - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from
-          @a startFrom, otherwise existing attributes are used.
-        - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used
-          as the level for all paragraphs, otherwise the current indentation will be used.
-
-        @a def can be NULL to indicate that the existing list style should be used.
-
-        @see SetListStyle(), PromoteList(), ClearListStyle()
-    */
-    virtual bool NumberList(const wxRichTextRange& range, wxRichTextListStyleDefinition* def = NULL, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1);
-    virtual bool NumberList(const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1);
-    //@}
-
-    //@{
-    /**
-        Promotes the list items within the given range.
-        A positive @a promoteBy produces a smaller indent, and a negative number
-        produces a larger indent. Pass flags to determine how the attributes are set.
-        Either the style definition or the name of the style definition (in the current
-        sheet) can be passed.
-
-        @a flags is a bit list of the following:
-        - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable.
-        - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from
-          @a startFrom, otherwise existing attributes are used.
-        - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used
-          as the level for all paragraphs, otherwise the current indentation will be used.
-
-        @see SetListStyle(), SetListStyle(), ClearListStyle()
-    */
-    virtual bool PromoteList(int promoteBy, const wxRichTextRange& range, wxRichTextListStyleDefinition* def = NULL, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int specifiedLevel = -1);
-    virtual bool PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int specifiedLevel = -1);
-    //@}
-
-    /**
-        Helper for NumberList and PromoteList, that does renumbering and promotion simultaneously
-        @a def can be NULL/empty to indicate that the existing list style should be used.
-    */
-    virtual bool DoNumberList(const wxRichTextRange& range, const wxRichTextRange& promotionRange, int promoteBy, wxRichTextListStyleDefinition* def, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1);
-
-    /**
-        Fills in the attributes for numbering a paragraph after previousParagraph.
-    */
-    virtual bool FindNextParagraphNumber(wxRichTextParagraph* previousParagraph, wxRichTextAttr& attr) const;
-
-    /**
-        Sets the properties for the given range, passing flags to determine how the
-        attributes are set. You can merge properties or replace them.
-
-        The end point of range is specified as the last character position of the span
-        of text, plus one. So, for example, to set the properties for a character at
-        position 5, use the range (5,6).
-
-        @a flags may contain a bit list of the following values:
-        - wxRICHTEXT_SETPROPERTIES_NONE: no flag.
-        - wxRICHTEXT_SETPROPERTIES_WITH_UNDO: specifies that this operation should be
-          undoable.
-        - wxRICHTEXT_SETPROPERTIES_PARAGRAPHS_ONLY: specifies that the properties should only be
-          applied to paragraphs, and not the content.
-        - wxRICHTEXT_SETPROPERTIES_CHARACTERS_ONLY: specifies that the properties should only be
-          applied to characters, and not the paragraph.
-        - wxRICHTEXT_SETPROPERTIES_RESET: resets (clears) the existing properties before applying
-          the new properties.
-        - wxRICHTEXT_SETPROPERTIES_REMOVE: removes the specified properties.
-    */
-    virtual bool SetProperties(const wxRichTextRange& range, const wxRichTextProperties& properties, int flags = wxRICHTEXT_SETPROPERTIES_WITH_UNDO);
-
-    /**
-        Sets with undo the properties for the given object.
-    */
-    virtual bool SetObjectPropertiesWithUndo(wxRichTextObject& obj, const wxRichTextProperties& properties, wxRichTextObject* objToSet = NULL);
-
-    /**
-        Test if this whole range has character attributes of the specified kind. If any
-        of the attributes are different within the range, the test fails. You
-        can use this to implement, for example, bold button updating. style must have
-        flags indicating which attributes are of interest.
-    */
-    virtual bool HasCharacterAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const;
-
-    /**
-        Test if this whole range has paragraph attributes of the specified kind. If any
-        of the attributes are different within the range, the test fails. You
-        can use this to implement, for example, centering button updating. style must have
-        flags indicating which attributes are of interest.
-    */
-    virtual bool HasParagraphAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const;
-
-    virtual wxRichTextObject* Clone() const { return new wxRichTextParagraphLayoutBox(*this); }
-
-    /**
-        Prepares the content just before insertion (or after buffer reset).
-        Currently is only called if undo mode is on.
-    */
-    virtual void PrepareContent(wxRichTextParagraphLayoutBox& container);
-
-    /**
-        Insert fragment into this box at the given position. If partialParagraph is true,
-        it is assumed that the last (or only) paragraph is just a piece of data with no paragraph
-        marker.
-    */
-    virtual bool InsertFragment(long position, wxRichTextParagraphLayoutBox& fragment);
-
-    /**
-        Make a copy of the fragment corresponding to the given range, putting it in @a fragment.
-    */
-    virtual bool CopyFragment(const wxRichTextRange& range, wxRichTextParagraphLayoutBox& fragment);
-
-    /**
-        Apply the style sheet to the buffer, for example if the styles have changed.
-    */
-    virtual bool ApplyStyleSheet(wxRichTextStyleSheet* styleSheet);
-
-    void Copy(const wxRichTextParagraphLayoutBox& obj);
-
-    void operator= (const wxRichTextParagraphLayoutBox& obj) { Copy(obj); }
-
-    /**
-        Calculate ranges.
-    */
-    virtual void UpdateRanges();
-
-    /**
-        Get all the text.
-    */
-    virtual wxString GetText() const;
-
-    /**
-        Sets the default style, affecting the style currently being applied
-        (for example, setting the default style to bold will cause subsequently
-        inserted text to be bold).
-
-        This is not cumulative - setting the default style will replace the previous
-        default style.
-
-        Setting it to a default attribute object makes new content take on the 'basic' style.
-    */
-    virtual bool SetDefaultStyle(const wxRichTextAttr& style);
-
-    /**
-        Returns the current default style, affecting the style currently being applied
-        (for example, setting the default style to bold will cause subsequently
-        inserted text to be bold).
-    */
-    virtual const wxRichTextAttr& GetDefaultStyle() const { return m_defaultAttributes; }
-
-    /**
-        Sets the basic (overall) style. This is the style of the whole
-        buffer before further styles are applied, unlike the default style, which
-        only affects the style currently being applied (for example, setting the default
-        style to bold will cause subsequently inserted text to be bold).
-    */
-    virtual void SetBasicStyle(const wxRichTextAttr& style) { m_attributes = style; }
-
-    /**
-        Returns the basic (overall) style.
-
-        This is the style of the whole buffer before further styles are applied,
-        unlike the default style, which only affects the style currently being
-        applied (for example, setting the default style to bold will cause
-        subsequently inserted text to be bold).
-    */
-    virtual const wxRichTextAttr& GetBasicStyle() const { return m_attributes; }
-
-    /**
-        Invalidates the buffer. With no argument, invalidates whole buffer.
-    */
-    virtual void Invalidate(const wxRichTextRange& invalidRange = wxRICHTEXT_ALL);
-
-    /**
-        Do the (in)validation for this object only.
-    */
-    virtual void DoInvalidate(const wxRichTextRange& invalidRange);
-
-    /**
-        Do the (in)validation both up and down the hierarchy.
-    */
-    virtual void InvalidateHierarchy(const wxRichTextRange& invalidRange = wxRICHTEXT_ALL);
-
-    /**
-        Gather information about floating objects. If untilObj is non-NULL,
-        will stop getting information if the current object is this, since we
-        will collect the rest later.
-    */
-    virtual bool UpdateFloatingObjects(const wxRect& availableRect, wxRichTextObject* untilObj = NULL);
-
-    /**
-        Get invalid range, rounding to entire paragraphs if argument is true.
-    */
-    wxRichTextRange GetInvalidRange(bool wholeParagraphs = false) const;
-
-    /**
-        Returns @true if this object needs layout.
-    */
-    bool IsDirty() const { return m_invalidRange != wxRICHTEXT_NONE; }
-
-    /**
-        Returns the wxRichTextFloatCollector of this object.
-    */
-    wxRichTextFloatCollector* GetFloatCollector() { return m_floatCollector; }
-
-    /**
-        Returns the number of floating objects at this level.
-    */
-    int GetFloatingObjectCount() const;
-
-    /**
-        Returns a list of floating objects.
-    */
-    bool GetFloatingObjects(wxRichTextObjectList& objects) const;
-
-protected:
-    wxRichTextCtrl* m_ctrl;
-    wxRichTextAttr  m_defaultAttributes;
-
-    // The invalidated range that will need full layout
-    wxRichTextRange m_invalidRange;
-
-    // Is the last paragraph partial or complete?
-    bool            m_partialParagraph;
-
-    // The floating layout state
-    wxRichTextFloatCollector* m_floatCollector;
-};
-
-/**
-    @class wxRichTextBox
-
-    This class implements a floating or inline text box, containing paragraphs.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextParagraphLayoutBox, wxRichTextObject, wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextBox: public wxRichTextParagraphLayoutBox
-{
-    DECLARE_DYNAMIC_CLASS(wxRichTextBox)
-public:
-// Constructors
-
-    /**
-        Default constructor; optionally pass the parent object.
-    */
-
-    wxRichTextBox(wxRichTextObject* parent = NULL);
-
-    /**
-        Copy constructor.
-    */
-
-    wxRichTextBox(const wxRichTextBox& obj): wxRichTextParagraphLayoutBox() { Copy(obj); }
-
-// Overridables
-
-    virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
-
-    virtual wxString GetXMLNodeName() const { return wxT("textbox"); }
-
-    virtual bool CanEditProperties() const { return true; }
-
-    virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
-
-    virtual wxString GetPropertiesMenuLabel() const { return wxGetTranslation("&Box"); }
-
-// Accessors
-
-// Operations
-
-    virtual wxRichTextObject* Clone() const { return new wxRichTextBox(*this); }
-
-    void Copy(const wxRichTextBox& obj);
-
-protected:
-};
-
-/**
-    @class wxRichTextField
-
-    This class implements the general concept of a field, an object that represents
-    additional functionality such as a footnote, a bookmark, a page number, a table
-    of contents, and so on. Extra information (such as a bookmark name) can be stored
-    in the object properties.
-
-    Drawing, layout, and property editing is delegated to classes derived
-    from wxRichTextFieldType, such as instances of wxRichTextFieldTypeStandard; this makes
-    the use of fields an efficient method of introducing extra functionality, since
-    most of the information required to draw a field (such as a bitmap) is kept centrally
-    in a single field type definition.
-
-    The FieldType property, accessed by SetFieldType/GetFieldType, is used to retrieve
-    the field type definition. So be careful not to overwrite this property.
-
-    wxRichTextField is derived from wxRichTextParagraphLayoutBox, which means that it
-    can contain its own read-only content, refreshed when the application calls the UpdateField
-    function. Whether a field is treated as a composite or a single graphic is determined
-    by the field type definition. If using wxRichTextFieldTypeStandard, passing the display
-    type wxRICHTEXT_FIELD_STYLE_COMPOSITE to the field type definition causes the field
-    to behave like a composite; the other display styles display a simple graphic.
-    When implementing a composite field, you will still need to derive from wxRichTextFieldTypeStandard
-    or wxRichTextFieldType, if only to implement UpdateField to refresh the field content
-    appropriately. wxRichTextFieldTypeStandard is only one possible implementation, but
-    covers common needs especially for simple, static fields using text or a bitmap.
-
-    Register field types on application initialisation with the static function
-    wxRichTextBuffer::AddFieldType. They will be deleted automatically on 
-    application exit.
-
-    An application can write a field to a control with wxRichTextCtrl::WriteField,
-    taking a field type, the properties for the field, and optional attributes.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextFieldTypeStandard, wxRichTextFieldType, wxRichTextParagraphLayoutBox, wxRichTextProperties, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextField: public wxRichTextParagraphLayoutBox
-{
-    DECLARE_DYNAMIC_CLASS(wxRichTextField)
-public:
-// Constructors
-
-    /**
-        Default constructor; optionally pass the parent object.
-    */
-
-    wxRichTextField(const wxString& fieldType = wxEmptyString, wxRichTextObject* parent = NULL);
-
-    /**
-        Copy constructor.
-    */
-
-    wxRichTextField(const wxRichTextField& obj): wxRichTextParagraphLayoutBox() { Copy(obj); }
-
-// Overridables
-
-    virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
-
-    virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style);
-
-    virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const;
-
-    virtual wxString GetXMLNodeName() const { return wxT("field"); }
-
-    virtual bool CanEditProperties() const;
-
-    virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
-
-    virtual wxString GetPropertiesMenuLabel() const;
-
-    virtual bool AcceptsFocus() const { return false; }
-
-    virtual void CalculateRange(long start, long& end);
-
-    /**
-        If a field has children, we don't want the user to be able to edit it.
-    */
-    virtual bool IsAtomic() const { return true; }
-
-    virtual bool IsEmpty() const { return false; }
-
-    virtual bool IsTopLevel() const;
-
-// Accessors
-
-    void SetFieldType(const wxString& fieldType) { GetProperties().SetProperty(wxT("FieldType"), fieldType); }
-    wxString GetFieldType() const { return GetProperties().GetPropertyString(wxT("FieldType")); }
-
-// Operations
-
-    /**
-        Update the field; delegated to the associated field type. This would typically expand the field to its value,
-        if this is a dynamically changing and/or composite field.
-     */
-    virtual bool UpdateField(wxRichTextBuffer* buffer);
-
-    virtual wxRichTextObject* Clone() const { return new wxRichTextField(*this); }
-
-    void Copy(const wxRichTextField& obj);
-
-protected:
-};
-
-/**
-    @class wxRichTextFieldType
-
-    The base class for custom field types. Each type definition handles one
-    field type. Override functions to provide drawing, layout, updating and
-    property editing functionality for a field.
-
-    Register field types on application initialisation with the static function
-    wxRichTextBuffer::AddFieldType. They will be deleted automatically on
-    application exit.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextFieldTypeStandard, wxRichTextField, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextFieldType: public wxObject
-{
-    DECLARE_CLASS(wxRichTextFieldType)
-public:
-    /**
-        Creates a field type definition.
-    */
-    wxRichTextFieldType(const wxString& name = wxEmptyString)
-        : m_name(name)
-        { }
-
-    /**
-        Copy constructor.
-    */
-    wxRichTextFieldType(const wxRichTextFieldType& fieldType)
-        : wxObject(fieldType)
-    { Copy(fieldType); }
-
-    void Copy(const wxRichTextFieldType& fieldType) { m_name = fieldType.m_name; }
-
-    /**
-        Draw the item, within the given range. Some objects may ignore the range (for
-        example paragraphs) while others must obey it (lines, to implement wrapping)
-    */
-    virtual bool Draw(wxRichTextField* obj, wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style) = 0;
-
-    /**
-        Lay the item out at the specified position with the given size constraint.
-        Layout must set the cached size. @rect is the available space for the object,
-        and @a parentRect is the container that is used to determine a relative size
-        or position (for example if a text box must be 50% of the parent text box).
-    */
-    virtual bool Layout(wxRichTextField* obj, wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style) = 0;
-
-    /**
-        Returns the object size for the given range. Returns @false if the range
-        is invalid for this object.
-    */
-    virtual bool GetRangeSize(wxRichTextField* obj, const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const = 0;
-
-    /**
-        Returns @true if we can edit the object's properties via a GUI.
-    */
-    virtual bool CanEditProperties(wxRichTextField* WXUNUSED(obj)) const { return false; }
-
-    /**
-        Edits the object's properties via a GUI.
-    */
-    virtual bool EditProperties(wxRichTextField* WXUNUSED(obj), wxWindow* WXUNUSED(parent), wxRichTextBuffer* WXUNUSED(buffer)) { return false; }
-
-    /**
-        Returns the label to be used for the properties context menu item.
-    */
-    virtual wxString GetPropertiesMenuLabel(wxRichTextField* WXUNUSED(obj)) const { return wxEmptyString; }
-
-    /**
-        Update the field. This would typically expand the field to its value,
-        if this is a dynamically changing and/or composite field.
-     */
-    virtual bool UpdateField(wxRichTextBuffer* WXUNUSED(buffer), wxRichTextField* WXUNUSED(obj)) { return false; }
-
-    /**
-        Returns @true if this object is top-level, i.e. contains its own paragraphs, such as a text box.
-    */
-    virtual bool IsTopLevel(wxRichTextField* WXUNUSED(obj)) const { return true; }
-
-    /**
-        Sets the field type name. There should be a unique name per field type object.
-    */
-    void SetName(const wxString& name) { m_name = name; }
-
-    /**
-        Returns the field type name. There should be a unique name per field type object.
-    */
-    wxString GetName() const { return m_name; }
-
-protected:
-
-    wxString  m_name;
-};
-
-WX_DECLARE_STRING_HASH_MAP(wxRichTextFieldType*, wxRichTextFieldTypeHashMap);
-
-/**
-    @class wxRichTextFieldTypeStandard
-
-    A field type that can handle fields with text or bitmap labels, with a small range
-    of styles for implementing rectangular fields and fields that can be used for start
-    and end tags.
-
-    The border, text and background colours can be customised; the default is
-    white text on a black background.
-
-    The following display styles can be used.
-
-    @beginStyleTable
-    @style{wxRICHTEXT_FIELD_STYLE_COMPOSITE}
-           Creates a composite field; you will probably need to derive a new class to implement UpdateField.
-    @style{wxRICHTEXT_FIELD_STYLE_RECTANGLE}
-           Shows a rounded rectangle background.
-    @style{wxRICHTEXT_FIELD_STYLE_NO_BORDER}
-           Suppresses the background and border; mostly used with a bitmap label.
-    @style{wxRICHTEXT_FIELD_STYLE_START_TAG}
-           Shows a start tag background, with the pointy end facing right.
-    @style{wxRICHTEXT_FIELD_STYLE_END_TAG}
-           Shows an end tag background, with the pointy end facing left.
-    @endStyleTable
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextFieldType, wxRichTextField, wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextFieldTypeStandard: public wxRichTextFieldType
-{
-    DECLARE_CLASS(wxRichTextFieldTypeStandard)
-public:
-
-    // Display style types
-    enum { wxRICHTEXT_FIELD_STYLE_COMPOSITE = 0x01,
-           wxRICHTEXT_FIELD_STYLE_RECTANGLE = 0x02,
-           wxRICHTEXT_FIELD_STYLE_NO_BORDER = 0x04,
-           wxRICHTEXT_FIELD_STYLE_START_TAG = 0x08,
-           wxRICHTEXT_FIELD_STYLE_END_TAG = 0x10
-         };
-
-    /**
-        Constructor, creating a field type definition with a text label.
-
-        @param parent
-            The name of the type definition. This must be unique, and is the type
-            name used when adding a field to a control.
-        @param label
-            The text label to be shown on the field.
-        @param displayStyle
-            The display style: one of wxRICHTEXT_FIELD_STYLE_RECTANGLE,
-            wxRICHTEXT_FIELD_STYLE_NO_BORDER, wxRICHTEXT_FIELD_STYLE_START_TAG,
-            wxRICHTEXT_FIELD_STYLE_END_TAG.
-
-    */
-    wxRichTextFieldTypeStandard(const wxString& name, const wxString& label, int displayStyle = wxRICHTEXT_FIELD_STYLE_RECTANGLE);
-
-    /**
-        Constructor, creating a field type definition with a bitmap label.
-
-        @param parent
-            The name of the type definition. This must be unique, and is the type
-            name used when adding a field to a control.
-        @param label
-            The bitmap label to be shown on the field.
-        @param displayStyle
-            The display style: one of wxRICHTEXT_FIELD_STYLE_RECTANGLE,
-            wxRICHTEXT_FIELD_STYLE_NO_BORDER, wxRICHTEXT_FIELD_STYLE_START_TAG,
-            wxRICHTEXT_FIELD_STYLE_END_TAG.
-
-    */
-    wxRichTextFieldTypeStandard(const wxString& name, const wxBitmap& bitmap, int displayStyle = wxRICHTEXT_FIELD_STYLE_NO_BORDER);
-
-    /**
-        The default constructor.
-
-    */
-    wxRichTextFieldTypeStandard() { Init(); }
-
-    /**
-        The copy constructor.
-
-    */
-    wxRichTextFieldTypeStandard(const wxRichTextFieldTypeStandard& field)
-        : wxRichTextFieldType(field)
-    { Copy(field); }
-
-    /**
-        Initialises the object.
-    */
-    void Init();
-
-    /**
-        Copies the object.
-    */
-    void Copy(const wxRichTextFieldTypeStandard& field);
-
-    /**
-        The assignment operator.
-    */
-    void operator=(const wxRichTextFieldTypeStandard& field) { Copy(field); }
-
-    /**
-        Draw the item, within the given range. Some objects may ignore the range (for
-        example paragraphs) while others must obey it (lines, to implement wrapping)
-    */
-    virtual bool Draw(wxRichTextField* obj, wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
-
-    /**
-        Lay the item out at the specified position with the given size constraint.
-        Layout must set the cached size. @rect is the available space for the object,
-        and @a parentRect is the container that is used to determine a relative size
-        or position (for example if a text box must be 50% of the parent text box).
-    */
-    virtual bool Layout(wxRichTextField* obj, wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style);
-
-    /**
-        Returns the object size for the given range. Returns @false if the range
-        is invalid for this object.
-    */
-    virtual bool GetRangeSize(wxRichTextField* obj, const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const;
-
-    /**
-        Get the size of the field, given the label, font size, and so on.
-    */
-    wxSize GetSize(wxRichTextField* obj, wxDC& dc, wxRichTextDrawingContext& context, int style) const;
-
-    /**
-        Returns @true if the display type is wxRICHTEXT_FIELD_STYLE_COMPOSITE, @false otherwise.
-    */
-    virtual bool IsTopLevel(wxRichTextField* WXUNUSED(obj)) const { return (GetDisplayStyle() & wxRICHTEXT_FIELD_STYLE_COMPOSITE) != 0; }
-
-    /**
-        Sets the text label for fields of this type.
-    */
-    void SetLabel(const wxString& label) { m_label = label; }
-
-    /**
-        Returns the text label for fields of this type.
-    */
-    const wxString& GetLabel() const { return m_label; }
-
-    /**
-        Sets the bitmap label for fields of this type.
-    */
-    void SetBitmap(const wxBitmap& bitmap) { m_bitmap = bitmap; }
-
-    /**
-        Gets the bitmap label for fields of this type.
-    */
-    const wxBitmap& GetBitmap() const { return m_bitmap; }
-
-    /**
-        Gets the display style for fields of this type.
-    */
-    int GetDisplayStyle() const { return m_displayStyle; }
-
-    /**
-        Sets the display style for fields of this type.
-    */
-    void SetDisplayStyle(int displayStyle) { m_displayStyle = displayStyle; }
-
-    /**
-        Gets the font used for drawing the text label.
-    */
-    const wxFont& GetFont() const { return m_font; }
-
-    /**
-        Sets the font used for drawing the text label.
-    */
-    void SetFont(const wxFont& font) { m_font = font; }
-
-    /**
-        Gets the colour used for drawing the text label.
-    */
-    const wxColour& GetTextColour() const { return m_textColour; }
-
-    /**
-        Sets the colour used for drawing the text label.
-    */
-    void SetTextColour(const wxColour& colour) { m_textColour = colour; }
-
-    /**
-        Gets the colour used for drawing the field border.
-    */
-    const wxColour& GetBorderColour() const { return m_borderColour; }
-
-    /**
-        Sets the colour used for drawing the field border.
-    */
-    void SetBorderColour(const wxColour& colour) { m_borderColour = colour; }
-
-    /**
-        Gets the colour used for drawing the field background.
-    */
-    const wxColour& GetBackgroundColour() const { return m_backgroundColour; }
-
-    /**
-        Sets the colour used for drawing the field background.
-    */
-    void SetBackgroundColour(const wxColour& colour) { m_backgroundColour = colour; }
-
-    /**
-        Sets the vertical padding (the distance between the border and the text).
-    */
-    void SetVerticalPadding(int padding) { m_verticalPadding = padding; }
-
-    /**
-        Gets the vertical padding (the distance between the border and the text).
-    */
-    int GetVerticalPadding() const { return m_verticalPadding; }
-
-    /**
-        Sets the horizontal padding (the distance between the border and the text).
-    */
-    void SetHorizontalPadding(int padding) { m_horizontalPadding = padding; }
-
-    /**
-        Sets the horizontal padding (the distance between the border and the text).
-    */
-    int GetHorizontalPadding() const { return m_horizontalPadding; }
-
-    /**
-        Sets the horizontal margin surrounding the field object.
-    */
-    void SetHorizontalMargin(int margin) { m_horizontalMargin = margin; }
-
-    /**
-        Gets the horizontal margin surrounding the field object.
-    */
-    int GetHorizontalMargin() const { return m_horizontalMargin; }
-
-    /**
-        Sets the vertical margin surrounding the field object.
-    */
-    void SetVerticalMargin(int margin) { m_verticalMargin = margin; }
-
-    /**
-        Gets the vertical margin surrounding the field object.
-    */
-    int GetVerticalMargin() const { return m_verticalMargin; }
-
-protected:
-
-    wxString    m_label;
-    int         m_displayStyle;
-    wxFont      m_font;
-    wxColour    m_textColour;
-    wxColour    m_borderColour;
-    wxColour    m_backgroundColour;
-    int         m_verticalPadding;
-    int         m_horizontalPadding;
-    int         m_horizontalMargin;
-    int         m_verticalMargin;
-    wxBitmap    m_bitmap;
-};
-
-/**
-    @class wxRichTextLine
-
-    This object represents a line in a paragraph, and stores
-    offsets from the start of the paragraph representing the
-    start and end positions of the line.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextLine
-{
-public:
-// Constructors
-
-    wxRichTextLine(wxRichTextParagraph* parent);
-    wxRichTextLine(const wxRichTextLine& obj) { Init( NULL); Copy(obj); }
-    virtual ~wxRichTextLine() {}
-
-// Overridables
-
-// Accessors
-
-    /**
-        Sets the range associated with this line.
-    */
-    void SetRange(const wxRichTextRange& range) { m_range = range; }
-    /**
-        Sets the range associated with this line.
-    */
-    void SetRange(long from, long to) { m_range = wxRichTextRange(from, to); }
-
-    /**
-        Returns the parent paragraph.
-    */
-    wxRichTextParagraph* GetParent() { return m_parent; }
-
-    /**
-        Returns the range.
-    */
-    const wxRichTextRange& GetRange() const { return m_range; }
-    /**
-        Returns the range.
-    */
-    wxRichTextRange& GetRange() { return m_range; }
-
-    /**
-        Returns the absolute range.
-    */
-    wxRichTextRange GetAbsoluteRange() const;
-
-    /**
-        Returns the line size as calculated by Layout.
-    */
-    virtual wxSize GetSize() const { return m_size; }
-
-    /**
-        Sets the line size as calculated by Layout.
-    */
-    virtual void SetSize(const wxSize& sz) { m_size = sz; }
-
-    /**
-        Returns the object position relative to the parent.
-    */
-    virtual wxPoint GetPosition() const { return m_pos; }
-
-    /**
-        Sets the object position relative to the parent.
-    */
-    virtual void SetPosition(const wxPoint& pos) { m_pos = pos; }
-
-    /**
-        Returns the absolute object position.
-    */
-    virtual wxPoint GetAbsolutePosition() const;
-
-    /**
-        Returns the rectangle enclosing the line.
-    */
-    virtual wxRect GetRect() const { return wxRect(GetAbsolutePosition(), GetSize()); }
-
-    /**
-        Sets the stored descent.
-    */
-    void SetDescent(int descent) { m_descent = descent; }
-
-    /**
-        Returns the stored descent.
-    */
-    int GetDescent() const { return m_descent; }
-
-#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING
-    wxArrayInt& GetObjectSizes() { return m_objectSizes; }
-    const wxArrayInt& GetObjectSizes() const { return m_objectSizes; }
-#endif
-
-// Operations
-
-    /**
-        Initialises the object.
-    */
-    void Init(wxRichTextParagraph* parent);
-
-    /**
-        Copies from @a obj.
-    */
-    void Copy(const wxRichTextLine& obj);
-
-    virtual wxRichTextLine* Clone() const { return new wxRichTextLine(*this); }
-
-protected:
-
-    // The range of the line (start position to end position)
-    // This is relative to the parent paragraph.
-    wxRichTextRange     m_range;
-
-    // Size and position measured relative to top of paragraph
-    wxPoint             m_pos;
-    wxSize              m_size;
-
-    // Maximum descent for this line (location of text baseline)
-    int                 m_descent;
-
-    // The parent object
-    wxRichTextParagraph* m_parent;
-
-#if wxRICHTEXT_USE_OPTIMIZED_LINE_DRAWING
-    wxArrayInt          m_objectSizes;
-#endif
-};
-
-WX_DECLARE_LIST_WITH_DECL( wxRichTextLine, wxRichTextLineList , class WXDLLIMPEXP_RICHTEXT );
-
-/**
-    @class wxRichTextParagraph
-
-    This object represents a single paragraph containing various objects such as text content, images, and further paragraph layout objects.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextParagraph: public wxRichTextCompositeObject
-{
-    DECLARE_DYNAMIC_CLASS(wxRichTextParagraph)
-public:
-// Constructors
-
-    /**
-        Constructor taking a parent and style.
-    */
-    wxRichTextParagraph(wxRichTextObject* parent = NULL, wxRichTextAttr* style = NULL);
-    /**
-        Constructor taking a text string, a parent and paragraph and character attributes.
-    */
-    wxRichTextParagraph(const wxString& text, wxRichTextObject* parent = NULL, wxRichTextAttr* paraStyle = NULL, wxRichTextAttr* charStyle = NULL);
-    virtual ~wxRichTextParagraph();
-    wxRichTextParagraph(const wxRichTextParagraph& obj): wxRichTextCompositeObject() { Copy(obj); }
-
-// Overridables
-
-    virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
-
-    virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style);
-
-    virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const;
-
-    virtual bool FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart);
-
-    virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0);
-
-    virtual void CalculateRange(long start, long& end);
-
-    virtual wxString GetXMLNodeName() const { return wxT("paragraph"); }
-
-// Accessors
-
-    /**
-        Returns the cached lines.
-    */
-    wxRichTextLineList& GetLines() { return m_cachedLines; }
-
-// Operations
-
-    /**
-        Copies the object.
-    */
-    void Copy(const wxRichTextParagraph& obj);
-
-    virtual wxRichTextObject* Clone() const { return new wxRichTextParagraph(*this); }
-
-    /**
-        Clears the cached lines.
-    */
-    void ClearLines();
-
-// Implementation
-
-    /**
-        Applies paragraph styles such as centering to the wrapped lines.
-    */
-    virtual void ApplyParagraphStyle(wxRichTextLine* line, const wxRichTextAttr& attr, const wxRect& rect, wxDC& dc);
-
-    /**
-        Inserts text at the given position.
-    */
-    virtual bool InsertText(long pos, const wxString& text);
-
-    /**
-        Splits an object at this position if necessary, and returns
-        the previous object, or NULL if inserting at the beginning.
-    */
-    virtual wxRichTextObject* SplitAt(long pos, wxRichTextObject** previousObject = NULL);
-
-    /**
-        Moves content to a list from this point.
-    */
-    virtual void MoveToList(wxRichTextObject* obj, wxList& list);
-
-    /**
-        Adds content back from a list.
-    */
-    virtual void MoveFromList(wxList& list);
-
-    /**
-        Returns the plain text searching from the start or end of the range.
-        The resulting string may be shorter than the range given.
-    */
-    bool GetContiguousPlainText(wxString& text, const wxRichTextRange& range, bool fromStart = true);
-
-    /**
-        Finds a suitable wrap position. @a wrapPosition is the last position in the line to the left
-        of the split.
-    */
-    bool FindWrapPosition(const wxRichTextRange& range, wxDC& dc, wxRichTextDrawingContext& context, int availableSpace, long& wrapPosition, wxArrayInt* partialExtents);
-
-    /**
-        Finds the object at the given position.
-    */
-    wxRichTextObject* FindObjectAtPosition(long position);
-
-    /**
-        Returns the bullet text for this paragraph.
-    */
-    wxString GetBulletText();
-
-    /**
-        Allocates or reuses a line object.
-    */
-    wxRichTextLine* AllocateLine(int pos);
-
-    /**
-        Clears remaining unused line objects, if any.
-    */
-    bool ClearUnusedLines(int lineCount);
-
-    /**
-        Returns combined attributes of the base style, paragraph style and character style. We use this to dynamically
-        retrieve the actual style.
-    */
-    wxRichTextAttr GetCombinedAttributes(const wxRichTextAttr& contentStyle, bool includingBoxAttr = false) const;
-
-    /**
-        Returns the combined attributes of the base style and paragraph style.
-    */
-    wxRichTextAttr GetCombinedAttributes(bool includingBoxAttr = false) const;
-
-    /**
-        Returns the first position from pos that has a line break character.
-    */
-    long GetFirstLineBreakPosition(long pos);
-
-    /**
-        Creates a default tabstop array.
-    */
-    static void InitDefaultTabs();
-
-    /**
-        Clears the default tabstop array.
-    */
-    static void ClearDefaultTabs();
-
-    /**
-        Returns the default tabstop array.
-    */
-    static const wxArrayInt& GetDefaultTabs() { return sm_defaultTabs; }
-
-    /**
-        Lays out the floating objects.
-    */
-    void LayoutFloat(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style, wxRichTextFloatCollector* floatCollector);
-
-protected:
-
-    // The lines that make up the wrapped paragraph
-    wxRichTextLineList m_cachedLines;
-
-    // Default tabstops
-    static wxArrayInt  sm_defaultTabs;
-
-friend class wxRichTextFloatCollector;
-};
-
-/**
-    @class wxRichTextPlainText
-
-    This object represents a single piece of text.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextPlainText: public wxRichTextObject
-{
-    DECLARE_DYNAMIC_CLASS(wxRichTextPlainText)
-public:
-// Constructors
-
-    /**
-        Constructor.
-    */
-    wxRichTextPlainText(const wxString& text = wxEmptyString, wxRichTextObject* parent = NULL, wxRichTextAttr* style = NULL);
-
-    /**
-        Copy constructor.
-    */
-    wxRichTextPlainText(const wxRichTextPlainText& obj): wxRichTextObject() { Copy(obj); }
-
-// Overridables
-
-    virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
-
-    virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style);
-
-    virtual bool AdjustAttributes(wxRichTextAttr& attr, wxRichTextDrawingContext& context);
-
-    virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const;
-
-    virtual wxString GetTextForRange(const wxRichTextRange& range) const;
-
-    virtual wxRichTextObject* DoSplit(long pos);
-
-    virtual void CalculateRange(long start, long& end);
-
-    virtual bool DeleteRange(const wxRichTextRange& range);
-
-    virtual bool IsEmpty() const { return m_text.empty(); }
-
-    virtual bool CanMerge(wxRichTextObject* object, wxRichTextDrawingContext& context) const;
-
-    virtual bool Merge(wxRichTextObject* object, wxRichTextDrawingContext& context);
-
-    virtual void Dump(wxTextOutputStream& stream);
-
-    virtual bool CanSplit(wxRichTextDrawingContext& context) const;
-
-    virtual wxRichTextObject* Split(wxRichTextDrawingContext& context);
-
-    /**
-        Get the first position from pos that has a line break character.
-    */
-    long GetFirstLineBreakPosition(long pos);
-
-    /// Does this object take note of paragraph attributes? Text and image objects don't.
-    virtual bool UsesParagraphAttributes() const { return false; }
-
-#if wxUSE_XML
-    virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse);
-#endif
-
-#if wxRICHTEXT_HAVE_DIRECT_OUTPUT
-    virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler);
-#endif
-
-#if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT
-    virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler);
-#endif
-
-    virtual wxString GetXMLNodeName() const { return wxT("text"); }
-
-// Accessors
-
-    /**
-        Returns the text.
-    */
-    const wxString& GetText() const { return m_text; }
-
-    /**
-        Sets the text.
-    */
-    void SetText(const wxString& text) { m_text = text; }
-
-// Operations
-
-    // Copies the text object,
-    void Copy(const wxRichTextPlainText& obj);
-
-    // Clones the text object.
-    virtual wxRichTextObject* Clone() const { return new wxRichTextPlainText(*this); }
-
-private:
-    bool DrawTabbedString(wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, wxString& str, wxCoord& x, wxCoord& y, bool selected);
-
-protected:
-    wxString    m_text;
-};
-
-/**
-    @class wxRichTextImageBlock
-
-    This class stores information about an image, in binary in-memory form.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextImageBlock: public wxObject
-{
-public:
-    /**
-        Constructor.
-    */
-    wxRichTextImageBlock();
-
-    /**
-        Copy constructor.
-    */
-    wxRichTextImageBlock(const wxRichTextImageBlock& block);
-    virtual ~wxRichTextImageBlock();
-
-    /**
-        Initialises the block.
-    */
-    void Init();
-
-    /**
-        Clears the block.
-    */
-
-    void Clear();
-
-    /**
-        Load the original image into a memory block.
-        If the image is not a JPEG, we must convert it into a JPEG
-        to conserve space.
-        If it's not a JPEG we can make use of @a image, already scaled, so we don't have to
-        load the image a second time.
-    */
-    virtual bool MakeImageBlock(const wxString& filename, wxBitmapType imageType,
-                                wxImage& image, bool convertToJPEG = true);
-
-    /**
-        Make an image block from the wxImage in the given
-        format.
-    */
-    virtual bool MakeImageBlock(wxImage& image, wxBitmapType imageType, int quality = 80);
-
-    /**
-        Uses a const wxImage for efficiency, but can't set quality (only relevant for JPEG)
-    */
-    virtual bool MakeImageBlockDefaultQuality(const wxImage& image, wxBitmapType imageType);
-
-    /**
-        Makes the image block.
-    */
-    virtual bool DoMakeImageBlock(const wxImage& image, wxBitmapType imageType);
-
-    /**
-        Writes the block to a file.
-    */
-    bool Write(const wxString& filename);
-
-    /**
-        Writes the data in hex to a stream.
-    */
-    bool WriteHex(wxOutputStream& stream);
-
-    /**
-        Reads the data in hex from a stream.
-    */
-    bool ReadHex(wxInputStream& stream, int length, wxBitmapType imageType);
-
-    /**
-        Copy from @a block.
-    */
-    void Copy(const wxRichTextImageBlock& block);
-
-    // Load a wxImage from the block
-    /**
-    */
-    bool Load(wxImage& image);
-
-// Operators
-
-    /**
-        Assignment operation.
-    */
-    void operator=(const wxRichTextImageBlock& block);
-
-// Accessors
-
-    /**
-        Returns the raw data.
-    */
-    unsigned char* GetData() const { return m_data; }
-
-    /**
-        Returns the data size in bytes.
-    */
-    size_t GetDataSize() const { return m_dataSize; }
-
-    /**
-        Returns the image type.
-    */
-    wxBitmapType GetImageType() const { return m_imageType; }
-
-    /**
-    */
-    void SetData(unsigned char* image) { m_data = image; }
-
-    /**
-        Sets the data size.
-    */
-    void SetDataSize(size_t size) { m_dataSize = size; }
-
-    /**
-        Sets the image type.
-    */
-    void SetImageType(wxBitmapType imageType) { m_imageType = imageType; }
-
-    /**
-        Returns @true if the data is non-NULL.
-    */
-    bool IsOk() const { return GetData() != NULL; }
-    bool Ok() const { return IsOk(); }
-
-    /**
-        Gets the extension for the block's type.
-    */
-    wxString GetExtension() const;
-
-/// Implementation
-
-    /**
-        Allocates and reads from a stream as a block of memory.
-    */
-    static unsigned char* ReadBlock(wxInputStream& stream, size_t size);
-
-    /**
-        Allocates and reads from a file as a block of memory.
-    */
-    static unsigned char* ReadBlock(const wxString& filename, size_t size);
-
-    /**
-        Writes a memory block to stream.
-    */
-    static bool WriteBlock(wxOutputStream& stream, unsigned char* block, size_t size);
-
-    /**
-        Writes a memory block to a file.
-    */
-    static bool WriteBlock(const wxString& filename, unsigned char* block, size_t size);
-
-protected:
-    // Size in bytes of the image stored.
-    // This is in the raw, original form such as a JPEG file.
-    unsigned char*      m_data;
-    size_t              m_dataSize;
-    wxBitmapType        m_imageType;
-};
-
-/**
-    @class wxRichTextImage
-
-    This class implements a graphic object.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextBuffer, wxRichTextCtrl, wxRichTextImageBlock
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextImage: public wxRichTextObject
-{
-    DECLARE_DYNAMIC_CLASS(wxRichTextImage)
-public:
-// Constructors
-
-    /**
-        Default constructor.
-    */
-    wxRichTextImage(wxRichTextObject* parent = NULL): wxRichTextObject(parent) { Init(); }
-
-    /**
-        Creates a wxRichTextImage from a wxImage.
-    */
-    wxRichTextImage(const wxImage& image, wxRichTextObject* parent = NULL, wxRichTextAttr* charStyle = NULL);
-
-    /**
-        Creates a wxRichTextImage from an image block.
-    */
-    wxRichTextImage(const wxRichTextImageBlock& imageBlock, wxRichTextObject* parent = NULL, wxRichTextAttr* charStyle = NULL);
-
-    /**
-        Copy constructor.
-    */
-    wxRichTextImage(const wxRichTextImage& obj): wxRichTextObject(obj) { Copy(obj); }
-
-    /**
-        Destructor.
-    */
-    ~wxRichTextImage();
-
-    /**
-        Initialisation.
-    */
-    void Init();
-
-// Overridables
-
-    virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
-
-    virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style);
-
-    virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const;
-
-    /**
-        Returns the 'natural' size for this object - the image size.
-    */
-    virtual wxTextAttrSize GetNaturalSize() const;
-
-    virtual bool IsEmpty() const { return false; /* !m_imageBlock.IsOk(); */ }
-
-    virtual bool CanEditProperties() const { return true; }
-
-    virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
-
-    virtual wxString GetPropertiesMenuLabel() const { return wxGetTranslation("&Picture"); }
-
-    virtual bool UsesParagraphAttributes() const { return false; }
-
-#if wxUSE_XML
-    virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse);
-#endif
-
-#if wxRICHTEXT_HAVE_DIRECT_OUTPUT
-    virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler);
-#endif
-
-#if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT
-    virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler);
-#endif
-
-    // Images can be floatable (optionally).
-    virtual bool IsFloatable() const { return true; }
-
-    virtual wxString GetXMLNodeName() const { return wxT("image"); }
-
-// Accessors
-
-    /**
-        Returns the image cache (a scaled bitmap).
-    */
-    const wxBitmap& GetImageCache() const { return m_imageCache; }
-
-    /**
-        Sets the image cache.
-    */
-    void SetImageCache(const wxBitmap& bitmap) { m_imageCache = bitmap; m_originalImageSize = wxSize(bitmap.GetWidth(), bitmap.GetHeight()); }
-
-    /**
-        Resets the image cache.
-    */
-    void ResetImageCache() { m_imageCache = wxNullBitmap; m_originalImageSize = wxSize(-1, -1); }
-
-    /**
-        Returns the image block containing the raw data.
-    */
-    wxRichTextImageBlock& GetImageBlock() { return m_imageBlock; }
-
-// Operations
-
-    /**
-        Copies the image object.
-    */
-    void Copy(const wxRichTextImage& obj);
-
-    /**
-        Clones the image object.
-    */
-    virtual wxRichTextObject* Clone() const { return new wxRichTextImage(*this); }
-
-    /**
-        Creates a cached image at the required size.
-    */
-    virtual bool LoadImageCache(wxDC& dc, bool resetCache = false, const wxSize& parentSize = wxDefaultSize);
-
-    /**
-        Gets the original image size.
-    */
-    wxSize GetOriginalImageSize() const { return m_originalImageSize; }
-
-    /**
-        Sets the original image size.
-    */
-    void SetOriginalImageSize(const wxSize& sz) { m_originalImageSize = sz; }
-
-protected:
-    wxRichTextImageBlock    m_imageBlock;
-    wxBitmap                m_imageCache;
-    wxSize                  m_originalImageSize;
-};
-
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextCommand;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextAction;
-
-/**
-    @class wxRichTextBuffer
-
-    This is a kind of paragraph layout box, used to represent the whole buffer.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextParagraphLayoutBox, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextBuffer: public wxRichTextParagraphLayoutBox
-{
-    DECLARE_DYNAMIC_CLASS(wxRichTextBuffer)
-public:
-// Constructors
-
-    /**
-        Default constructor.
-    */
-    wxRichTextBuffer() { Init(); }
-
-    /**
-        Copy constructor.
-    */
-    wxRichTextBuffer(const wxRichTextBuffer& obj): wxRichTextParagraphLayoutBox() { Init(); Copy(obj); }
-
-    virtual ~wxRichTextBuffer() ;
-
-// Accessors
-
-    /**
-        Returns the command processor.
-        A text buffer always creates its own command processor when it is initialized.
-    */
-    wxCommandProcessor* GetCommandProcessor() const { return m_commandProcessor; }
-
-    /**
-        Sets style sheet, if any. This will allow the application to use named character and paragraph
-        styles found in the style sheet.
-
-        Neither the buffer nor the control owns the style sheet so must be deleted by the application.
-    */
-    void SetStyleSheet(wxRichTextStyleSheet* styleSheet) { m_styleSheet = styleSheet; }
-
-    /**
-        Returns the style sheet.
-    */
-    virtual wxRichTextStyleSheet* GetStyleSheet() const { return m_styleSheet; }
-
-    /**
-        Sets the style sheet and sends a notification of the change.
-    */
-    bool SetStyleSheetAndNotify(wxRichTextStyleSheet* sheet);
-
-    /**
-        Pushes the style sheet to the top of the style sheet stack.
-    */
-    bool PushStyleSheet(wxRichTextStyleSheet* styleSheet);
-
-    /**
-        Pops the style sheet from the top of the style sheet stack.
-    */
-    wxRichTextStyleSheet* PopStyleSheet();
-
-    /**
-        Returns the table storing fonts, for quick access and font reuse.
-    */
-    wxRichTextFontTable& GetFontTable() { return m_fontTable; }
-
-    /**
-        Returns the table storing fonts, for quick access and font reuse.
-    */
-    const wxRichTextFontTable& GetFontTable() const { return m_fontTable; }
-
-    /**
-        Sets table storing fonts, for quick access and font reuse.
-    */
-    void SetFontTable(const wxRichTextFontTable& table) { m_fontTable = table; }
-
-    /**
-        Sets the scale factor for displaying fonts, for example for more comfortable
-        editing.
-    */
-    void SetFontScale(double fontScale);
-
-    /**
-        Returns the scale factor for displaying fonts, for example for more comfortable
-        editing.
-    */
-    double GetFontScale() const { return m_fontScale; }
-
-    /**
-        Sets the scale factor for displaying certain dimensions such as indentation and
-        inter-paragraph spacing. This can be useful when editing in a small control
-        where you still want legible text, but a minimum of wasted white space.
-    */
-    void SetDimensionScale(double dimScale);
-
-    /**
-        Returns the scale factor for displaying certain dimensions such as indentation
-        and inter-paragraph spacing.
-    */
-    double GetDimensionScale() const { return m_dimensionScale; }
-
-// Operations
-
-    /**
-        Initialisation.
-    */
-    void Init();
-
-    /**
-        Clears the buffer, adds an empty paragraph, and clears the command processor.
-    */
-    virtual void ResetAndClearCommands();
-
-#if wxUSE_FFILE && wxUSE_STREAMS
-    //@{
-    /**
-        Loads content from a file.
-        Not all handlers will implement file loading.
-    */
-    virtual bool LoadFile(const wxString& filename, wxRichTextFileType type = wxRICHTEXT_TYPE_ANY);
-    //@}
-
-    //@{
-    /**
-        Saves content to a file.
-        Not all handlers will implement file saving.
-    */
-    virtual bool SaveFile(const wxString& filename, wxRichTextFileType type = wxRICHTEXT_TYPE_ANY);
-    //@}
-#endif // wxUSE_FFILE
-
-#if wxUSE_STREAMS
-    //@{
-    /**
-        Loads content from a stream.
-        Not all handlers will implement loading from a stream.
-    */
-    virtual bool LoadFile(wxInputStream& stream, wxRichTextFileType type = wxRICHTEXT_TYPE_ANY);
-    //@}
-
-    //@{
-    /**
-        Saves content to a stream.
-        Not all handlers will implement saving to a stream.
-    */
-    virtual bool SaveFile(wxOutputStream& stream, wxRichTextFileType type = wxRICHTEXT_TYPE_ANY);
-    //@}
-#endif // wxUSE_STREAMS
-
-    /**
-        Sets the handler flags, controlling loading and saving.
-    */
-    void SetHandlerFlags(int flags) { m_handlerFlags = flags; }
-
-    /**
-        Gets the handler flags, controlling loading and saving.
-    */
-    int GetHandlerFlags() const { return m_handlerFlags; }
-
-    /**
-        Convenience function to add a paragraph of text.
-    */
-    virtual wxRichTextRange AddParagraph(const wxString& text, wxRichTextAttr* paraStyle = NULL) { Modify(); return wxRichTextParagraphLayoutBox::AddParagraph(text, paraStyle); }
-
-    /**
-        Begin collapsing undo/redo commands. Note that this may not work properly
-        if combining commands that delete or insert content, changing ranges for
-        subsequent actions.
-
-        @a cmdName should be the name of the combined command that will appear
-        next to Undo and Redo in the edit menu.
-    */
-    virtual bool BeginBatchUndo(const wxString& cmdName);
-
-    /**
-        End collapsing undo/redo commands.
-    */
-    virtual bool EndBatchUndo();
-
-    /**
-        Returns @true if we are collapsing commands.
-    */
-    virtual bool BatchingUndo() const { return m_batchedCommandDepth > 0; }
-
-    /**
-        Submit the action immediately, or delay according to whether collapsing is on.
-    */
-    virtual bool SubmitAction(wxRichTextAction* action);
-
-    /**
-        Returns the collapsed command.
-    */
-    virtual wxRichTextCommand* GetBatchedCommand() const { return m_batchedCommand; }
-
-    /**
-        Begin suppressing undo/redo commands. The way undo is suppressed may be implemented
-        differently by each command. If not dealt with by a command implementation, then
-        it will be implemented automatically by not storing the command in the undo history
-        when the action is submitted to the command processor.
-    */
-    virtual bool BeginSuppressUndo();
-
-    /**
-        End suppressing undo/redo commands.
-    */
-    virtual bool EndSuppressUndo();
-
-    /**
-        Are we suppressing undo??
-    */
-    virtual bool SuppressingUndo() const { return m_suppressUndo > 0; }
-
-    /**
-        Copy the range to the clipboard.
-    */
-    virtual bool CopyToClipboard(const wxRichTextRange& range);
-
-    /**
-        Paste the clipboard content to the buffer.
-    */
-    virtual bool PasteFromClipboard(long position);
-
-    /**
-        Returns @true if we can paste from the clipboard.
-    */
-    virtual bool CanPasteFromClipboard() const;
-
-    /**
-        Begin using a style.
-    */
-    virtual bool BeginStyle(const wxRichTextAttr& style);
-
-    /**
-        End the style.
-    */
-    virtual bool EndStyle();
-
-    /**
-        End all styles.
-    */
-    virtual bool EndAllStyles();
-
-    /**
-        Clears the style stack.
-    */
-    virtual void ClearStyleStack();
-
-    /**
-        Returns the size of the style stack, for example to check correct nesting.
-    */
-    virtual size_t GetStyleStackSize() const { return m_attributeStack.GetCount(); }
-
-    /**
-        Begins using bold.
-    */
-    bool BeginBold();
-
-    /**
-        Ends using bold.
-    */
-    bool EndBold() { return EndStyle(); }
-
-    /**
-        Begins using italic.
-    */
-    bool BeginItalic();
-
-    /**
-        Ends using italic.
-    */
-    bool EndItalic() { return EndStyle(); }
-
-    /**
-        Begins using underline.
-    */
-    bool BeginUnderline();
-
-    /**
-        Ends using underline.
-    */
-    bool EndUnderline() { return EndStyle(); }
-
-    /**
-        Begins using point size.
-    */
-    bool BeginFontSize(int pointSize);
-
-    /**
-        Ends using point size.
-    */
-    bool EndFontSize() { return EndStyle(); }
-
-    /**
-        Begins using this font.
-    */
-    bool BeginFont(const wxFont& font);
-
-    /**
-        Ends using a font.
-    */
-    bool EndFont() { return EndStyle(); }
-
-    /**
-        Begins using this colour.
-    */
-    bool BeginTextColour(const wxColour& colour);
-
-    /**
-        Ends using a colour.
-    */
-    bool EndTextColour() { return EndStyle(); }
-
-    /**
-        Begins using alignment.
-    */
-    bool BeginAlignment(wxTextAttrAlignment alignment);
-
-    /**
-        Ends alignment.
-    */
-    bool EndAlignment() { return EndStyle(); }
-
-    /**
-        Begins using @a leftIndent for the left indent, and optionally @a leftSubIndent for
-        the sub-indent. Both are expressed in tenths of a millimetre.
-
-        The sub-indent is an offset from the left of the paragraph, and is used for all
-        but the first line in a paragraph. A positive value will cause the first line to appear
-        to the left of the subsequent lines, and a negative value will cause the first line to be
-        indented relative to the subsequent lines.
-    */
-    bool BeginLeftIndent(int leftIndent, int leftSubIndent = 0);
-
-    /**
-        Ends left indent.
-    */
-    bool EndLeftIndent() { return EndStyle(); }
-
-    /**
-        Begins a right indent, specified in tenths of a millimetre.
-    */
-    bool BeginRightIndent(int rightIndent);
-
-    /**
-        Ends right indent.
-    */
-    bool EndRightIndent() { return EndStyle(); }
-
-    /**
-        Begins paragraph spacing; pass the before-paragraph and after-paragraph spacing
-        in tenths of a millimetre.
-    */
-    bool BeginParagraphSpacing(int before, int after);
-
-    /**
-        Ends paragraph spacing.
-    */
-    bool EndParagraphSpacing() { return EndStyle(); }
-
-    /**
-        Begins line spacing using the specified value. @e spacing is a multiple, where
-        10 means single-spacing, 15 means 1.5 spacing, and 20 means double spacing.
-
-        The ::wxTextAttrLineSpacing enumeration values are defined for convenience.
-    */
-    bool BeginLineSpacing(int lineSpacing);
-
-    /**
-        Ends line spacing.
-    */
-    bool EndLineSpacing() { return EndStyle(); }
-
-    /**
-        Begins numbered bullet.
-
-        This call will be needed for each item in the list, and the
-        application should take care of incrementing the numbering.
-
-        @a bulletNumber is a number, usually starting with 1.
-        @a leftIndent and @a leftSubIndent are values in tenths of a millimetre.
-        @a bulletStyle is a bitlist of the following values:
-
-        wxRichTextBuffer uses indentation to render a bulleted item.
-        The left indent is the distance between the margin and the bullet.
-        The content of the paragraph, including the first line, starts
-        at leftMargin + leftSubIndent.
-        So the distance between the left edge of the bullet and the
-        left of the actual paragraph is leftSubIndent.
-    */
-    bool BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD);
-
-    /**
-        Ends numbered bullet.
-    */
-    bool EndNumberedBullet() { return EndStyle(); }
-
-    /**
-        Begins applying a symbol bullet, using a character from the current font.
-
-        See BeginNumberedBullet() for an explanation of how indentation is used
-        to render the bulleted paragraph.
-    */
-    bool BeginSymbolBullet(const wxString& symbol, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_SYMBOL);
-
-    /**
-        Ends symbol bullet.
-    */
-    bool EndSymbolBullet() { return EndStyle(); }
-
-    /**
-        Begins applying a standard bullet, using one of the standard bullet names
-        (currently @c standard/circle or @c standard/square.
-
-        See BeginNumberedBullet() for an explanation of how indentation is used to
-        render the bulleted paragraph.
-    */
-    bool BeginStandardBullet(const wxString& bulletName, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_STANDARD);
-
-    /**
-        Ends standard bullet.
-    */
-    bool EndStandardBullet() { return EndStyle(); }
-
-    /**
-        Begins named character style.
-    */
-    bool BeginCharacterStyle(const wxString& characterStyle);
-
-    /**
-        Ends named character style.
-    */
-    bool EndCharacterStyle() { return EndStyle(); }
-
-    /**
-        Begins named paragraph style.
-    */
-    bool BeginParagraphStyle(const wxString& paragraphStyle);
-
-    /**
-        Ends named character style.
-    */
-    bool EndParagraphStyle() { return EndStyle(); }
-
-    /**
-        Begins named list style.
-
-        Optionally, you can also pass a level and a number.
-    */
-    bool BeginListStyle(const wxString& listStyle, int level = 1, int number = 1);
-
-    /**
-        Ends named character style.
-    */
-    bool EndListStyle() { return EndStyle(); }
-
-    /**
-        Begins applying wxTEXT_ATTR_URL to the content.
-
-        Pass a URL and optionally, a character style to apply, since it is common
-        to mark a URL with a familiar style such as blue text with underlining.
-    */
-    bool BeginURL(const wxString& url, const wxString& characterStyle = wxEmptyString);
-
-    /**
-        Ends URL.
-    */
-    bool EndURL() { return EndStyle(); }
-
-// Event handling
-
-    /**
-        Adds an event handler.
-
-        A buffer associated with a control has the control as the only event handler,
-        but the application is free to add more if further notification is required.
-        All handlers are notified of an event originating from the buffer, such as
-        the replacement of a style sheet during loading.
-
-        The buffer never deletes any of the event handlers, unless RemoveEventHandler()
-        is called with @true as the second argument.
-    */
-    bool AddEventHandler(wxEvtHandler* handler);
-
-    /**
-        Removes an event handler from the buffer's list of handlers, deleting the
-        object if @a deleteHandler is @true.
-    */
-    bool RemoveEventHandler(wxEvtHandler* handler, bool deleteHandler = false);
-
-    /**
-        Clear event handlers.
-    */
-    void ClearEventHandlers();
-
-    /**
-        Send event to event handlers. If sendToAll is true, will send to all event handlers,
-        otherwise will stop at the first successful one.
-    */
-    bool SendEvent(wxEvent& event, bool sendToAll = true);
-
-// Implementation
-
-    virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0);
-
-    /**
-        Copies the buffer.
-    */
-    void Copy(const wxRichTextBuffer& obj);
-
-    /**
-        Assignment operator.
-    */
-    void operator= (const wxRichTextBuffer& obj) { Copy(obj); }
-
-    /**
-        Clones the buffer.
-    */
-    virtual wxRichTextObject* Clone() const { return new wxRichTextBuffer(*this); }
-
-    /**
-        Submits a command to insert paragraphs.
-    */
-    bool InsertParagraphsWithUndo(long pos, const wxRichTextParagraphLayoutBox& paragraphs, wxRichTextCtrl* ctrl, int flags = 0);
-
-    /**
-        Submits a command to insert the given text.
-    */
-    bool InsertTextWithUndo(long pos, const wxString& text, wxRichTextCtrl* ctrl, int flags = 0);
-
-    /**
-        Submits a command to insert a newline.
-    */
-    bool InsertNewlineWithUndo(long pos, wxRichTextCtrl* ctrl, int flags = 0);
-
-    /**
-        Submits a command to insert the given image.
-    */
-    bool InsertImageWithUndo(long pos, const wxRichTextImageBlock& imageBlock, wxRichTextCtrl* ctrl, int flags = 0,
-            const wxRichTextAttr& textAttr = wxRichTextAttr());
-
-    /**
-        Submits a command to insert an object.
-    */
-    wxRichTextObject* InsertObjectWithUndo(long pos, wxRichTextObject *object, wxRichTextCtrl* ctrl, int flags);
-
-    /**
-        Submits a command to delete this range.
-    */
-    bool DeleteRangeWithUndo(const wxRichTextRange& range, wxRichTextCtrl* ctrl);
-
-    /**
-        Mark modified.
-    */
-    void Modify(bool modify = true) { m_modified = modify; }
-
-    /**
-        Returns @true if the buffer was modified.
-    */
-    bool IsModified() const { return m_modified; }
-
-    //@{
-    /**
-        Dumps contents of buffer for debugging purposes.
-    */
-    virtual void Dump();
-    virtual void Dump(wxTextOutputStream& stream) { wxRichTextParagraphLayoutBox::Dump(stream); }
-    //@}
-
-    /**
-        Returns the file handlers.
-    */
-    static wxList& GetHandlers() { return sm_handlers; }
-
-    /**
-        Adds a file handler to the end.
-    */
-    static void AddHandler(wxRichTextFileHandler *handler);
-
-    /**
-        Inserts a file handler at the front.
-    */
-    static void InsertHandler(wxRichTextFileHandler *handler);
-
-    /**
-        Removes a file handler.
-    */
-    static bool RemoveHandler(const wxString& name);
-
-    /**
-        Finds a file handler by name.
-    */
-    static wxRichTextFileHandler *FindHandler(const wxString& name);
-
-    /**
-        Finds a file handler by extension and type.
-    */
-    static wxRichTextFileHandler *FindHandler(const wxString& extension, wxRichTextFileType imageType);
-
-    /**
-        Finds a handler by filename or, if supplied, type.
-    */
-    static wxRichTextFileHandler *FindHandlerFilenameOrType(const wxString& filename,
-                                                            wxRichTextFileType imageType);
-
-    /**
-        Finds a handler by type.
-    */
-    static wxRichTextFileHandler *FindHandler(wxRichTextFileType imageType);
-
-    /**
-        Gets a wildcard incorporating all visible handlers. If @a types is present,
-        it will be filled with the file type corresponding to each filter. This can be
-        used to determine the type to pass to LoadFile given a selected filter.
-    */
-    static wxString GetExtWildcard(bool combine = false, bool save = false, wxArrayInt* types = NULL);
-
-    /**
-        Clean up file handlers.
-    */
-    static void CleanUpHandlers();
-
-    /**
-        Initialise the standard file handlers.
-        Currently, only the plain text loading/saving handler is initialised by default.
-    */
-    static void InitStandardHandlers();
-
-    /**
-        Returns the drawing handlers.
-    */
-    static wxList& GetDrawingHandlers() { return sm_drawingHandlers; }
-
-    /**
-        Adds a drawing handler to the end.
-    */
-    static void AddDrawingHandler(wxRichTextDrawingHandler *handler);
-
-    /**
-        Inserts a drawing handler at the front.
-    */
-    static void InsertDrawingHandler(wxRichTextDrawingHandler *handler);
-
-    /**
-        Removes a drawing handler.
-    */
-    static bool RemoveDrawingHandler(const wxString& name);
-
-    /**
-        Finds a drawing handler by name.
-    */
-    static wxRichTextDrawingHandler *FindDrawingHandler(const wxString& name);
-
-    /**
-        Clean up drawing handlers.
-    */
-    static void CleanUpDrawingHandlers();
-
-    /**
-        Returns the field types.
-    */
-    static wxRichTextFieldTypeHashMap& GetFieldTypes() { return sm_fieldTypes; }
-
-    /**
-        Adds a field type.
-
-        @see RemoveFieldType(), FindFieldType(), wxRichTextField, wxRichTextFieldType, wxRichTextFieldTypeStandard
-
-    */
-    static void AddFieldType(wxRichTextFieldType *fieldType);
-
-    /**
-        Removes a field type by name.
-
-        @see AddFieldType(), FindFieldType(), wxRichTextField, wxRichTextFieldType, wxRichTextFieldTypeStandard
-    */
-    static bool RemoveFieldType(const wxString& name);
-
-    /**
-        Finds a field type by name.
-
-        @see RemoveFieldType(), AddFieldType(), wxRichTextField, wxRichTextFieldType, wxRichTextFieldTypeStandard
-    */
-    static wxRichTextFieldType *FindFieldType(const wxString& name);
-
-    /**
-        Cleans up field types.
-    */
-    static void CleanUpFieldTypes();
-
-    /**
-        Returns the renderer object.
-    */
-    static wxRichTextRenderer* GetRenderer() { return sm_renderer; }
-
-    /**
-        Sets @a renderer as the object to be used to render certain aspects of the
-        content, such as bullets.
-
-        You can override default rendering by deriving a new class from
-        wxRichTextRenderer or wxRichTextStdRenderer, overriding one or more
-        virtual functions, and setting an instance of the class using this function.
-    */
-    static void SetRenderer(wxRichTextRenderer* renderer);
-
-    /**
-        Returns the minimum margin between bullet and paragraph in 10ths of a mm.
-    */
-    static int GetBulletRightMargin() { return sm_bulletRightMargin; }
-
-    /**
-        Sets the minimum margin between bullet and paragraph in 10ths of a mm.
-    */
-    static void SetBulletRightMargin(int margin) { sm_bulletRightMargin = margin; }
-
-    /**
-        Returns the factor to multiply by character height to get a reasonable bullet size.
-    */
-    static float GetBulletProportion() { return sm_bulletProportion; }
-
-    /**
-        Sets the factor to multiply by character height to get a reasonable bullet size.
-    */
-    static void SetBulletProportion(float prop) { sm_bulletProportion = prop; }
-
-    /**
-        Returns the scale factor for calculating dimensions.
-    */
-    double GetScale() const { return m_scale; }
-
-    /**
-        Sets the scale factor for calculating dimensions.
-    */
-    void SetScale(double scale) { m_scale = scale; }
-
-    /**
-        Sets the floating layout mode. Pass @false to speed up editing by not performing
-        floating layout. This setting affects all buffers.
-
-    */
-    static void SetFloatingLayoutMode(bool mode) { sm_floatingLayoutMode = mode; }
-
-    /**
-        Returns the floating layout mode. The default is @true, where objects
-        are laid out according to their floating status.
-    */
-    static bool GetFloatingLayoutMode() { return sm_floatingLayoutMode; }
-
-protected:
-
-    /// Command processor
-    wxCommandProcessor*     m_commandProcessor;
-
-    /// Table storing fonts
-    wxRichTextFontTable     m_fontTable;
-
-    /// Has been modified?
-    bool                    m_modified;
-
-    /// Collapsed command stack
-    int                     m_batchedCommandDepth;
-
-    /// Name for collapsed command
-    wxString                m_batchedCommandsName;
-
-    /// Current collapsed command accumulating actions
-    wxRichTextCommand*      m_batchedCommand;
-
-    /// Whether to suppress undo
-    int                     m_suppressUndo;
-
-    /// Style sheet, if any
-    wxRichTextStyleSheet*   m_styleSheet;
-
-    /// List of event handlers that will be notified of events
-    wxList                  m_eventHandlers;
-
-    /// Stack of attributes for convenience functions
-    wxList                  m_attributeStack;
-
-    /// Flags to be passed to handlers
-    int                     m_handlerFlags;
-
-    /// File handlers
-    static wxList           sm_handlers;
-
-    /// Drawing handlers
-    static wxList           sm_drawingHandlers;
-
-    /// Field types
-    static wxRichTextFieldTypeHashMap sm_fieldTypes;
-
-    /// Renderer
-    static wxRichTextRenderer* sm_renderer;
-
-    /// Minimum margin between bullet and paragraph in 10ths of a mm
-    static int              sm_bulletRightMargin;
-
-    /// Factor to multiply by character height to get a reasonable bullet size
-    static float            sm_bulletProportion;
-
-    /// Floating layout mode, @true by default
-    static bool             sm_floatingLayoutMode;
-
-    /// Scaling factor in use: needed to calculate correct dimensions when printing
-    double                  m_scale;
-
-    /// Font scale for adjusting the text size when editing
-    double                  m_fontScale;
-
-    /// Dimension scale for reducing redundant whitespace when editing
-    double                  m_dimensionScale;
-};
-
-/**
-    @class wxRichTextCell
-
-    wxRichTextCell is the cell in a table.
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextCell: public wxRichTextBox
-{
-    DECLARE_DYNAMIC_CLASS(wxRichTextCell)
-public:
-// Constructors
-
-    /**
-        Default constructor; optionally pass the parent object.
-    */
-
-    wxRichTextCell(wxRichTextObject* parent = NULL);
-
-    /**
-        Copy constructor.
-    */
-
-    wxRichTextCell(const wxRichTextCell& obj): wxRichTextBox() { Copy(obj); }
-
-// Overridables
-
-    virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
-
-    virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0);
-
-    virtual bool AdjustAttributes(wxRichTextAttr& attr, wxRichTextDrawingContext& context);
-
-    virtual wxString GetXMLNodeName() const { return wxT("cell"); }
-
-    virtual bool CanEditProperties() const { return true; }
-
-    virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
-
-    virtual wxString GetPropertiesMenuLabel() const { return wxGetTranslation("&Cell"); }
-
-// Accessors
-
-    int GetColSpan() const;
-
-    void SetColSpan(long span) { GetProperties().SetProperty(wxT("colspan"), span); }
-
-    int GetRowSpan() const;
-
-    void SetRowSpan(long span) { GetProperties().SetProperty(wxT("rowspan"), span); }
-
-// Operations
-
-    virtual wxRichTextObject* Clone() const { return new wxRichTextCell(*this); }
-
-    void Copy(const wxRichTextCell& obj);
-
-protected:
-};
-
-/**
-    @class wxRichTextTable
-
-    wxRichTextTable represents a table with arbitrary columns and rows.
- */
-
-WX_DEFINE_ARRAY_PTR(wxRichTextObject*, wxRichTextObjectPtrArray);
-WX_DECLARE_USER_EXPORTED_OBJARRAY(wxRichTextObjectPtrArray, wxRichTextObjectPtrArrayArray, WXDLLIMPEXP_RICHTEXT);
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextTable: public wxRichTextBox
-{
-    DECLARE_DYNAMIC_CLASS(wxRichTextTable)
-public:
-
-// Constructors
-
-    /**
-        Default constructor; optionally pass the parent object.
-    */
-
-    wxRichTextTable(wxRichTextObject* parent = NULL);
-
-    /**
-        Copy constructor.
-    */
-
-    wxRichTextTable(const wxRichTextTable& obj): wxRichTextBox() { Copy(obj); }
-
-// Overridables
-
-    virtual bool Draw(wxDC& dc, wxRichTextDrawingContext& context, const wxRichTextRange& range, const wxRichTextSelection& selection, const wxRect& rect, int descent, int style);
-
-    virtual int HitTest(wxDC& dc, wxRichTextDrawingContext& context, const wxPoint& pt, long& textPosition, wxRichTextObject** obj, wxRichTextObject** contextObj, int flags = 0);
-
-    virtual bool AdjustAttributes(wxRichTextAttr& attr, wxRichTextDrawingContext& context);
-
-    virtual wxString GetXMLNodeName() const { return wxT("table"); }
-
-    virtual bool Layout(wxDC& dc, wxRichTextDrawingContext& context, const wxRect& rect, const wxRect& parentRect, int style);
-
-    virtual bool GetRangeSize(const wxRichTextRange& range, wxSize& size, int& descent, wxDC& dc, wxRichTextDrawingContext& context, int flags, const wxPoint& position = wxPoint(0,0), const wxSize& parentSize = wxDefaultSize, wxArrayInt* partialExtents = NULL) const;
-
-    virtual bool DeleteRange(const wxRichTextRange& range);
-
-    virtual wxString GetTextForRange(const wxRichTextRange& range) const;
-
-#if wxUSE_XML
-    virtual bool ImportFromXML(wxRichTextBuffer* buffer, wxXmlNode* node, wxRichTextXMLHandler* handler, bool* recurse);
-#endif
-
-#if wxRICHTEXT_HAVE_DIRECT_OUTPUT
-    virtual bool ExportXML(wxOutputStream& stream, int indent, wxRichTextXMLHandler* handler);
-#endif
-
-#if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT
-    virtual bool ExportXML(wxXmlNode* parent, wxRichTextXMLHandler* handler);
-#endif
-
-    virtual bool FindPosition(wxDC& dc, wxRichTextDrawingContext& context, long index, wxPoint& pt, int* height, bool forceLineStart);
-
-    virtual void CalculateRange(long start, long& end);
-
-    // Can this object handle the selections of its children? FOr example, a table.
-    virtual bool HandlesChildSelections() const { return true; }
-
-    /// Returns a selection object specifying the selections between start and end character positions.
-    /// For example, a table would deduce what cells (of range length 1) are selected when dragging across the table.
-    virtual wxRichTextSelection GetSelection(long start, long end) const;
-
-    virtual bool CanEditProperties() const { return true; }
-
-    virtual bool EditProperties(wxWindow* parent, wxRichTextBuffer* buffer);
-
-    virtual wxString GetPropertiesMenuLabel() const { return wxGetTranslation("&Table"); }
-
-    // Returns true if objects of this class can accept the focus, i.e. a call to SetFocusObject
-    // is possible. For example, containers supporting text, such as a text box object, can accept the focus,
-    // but a table can't (set the focus to individual cells instead).
-    virtual bool AcceptsFocus() const { return false; }
-
-// Accessors
-
-    /**
-        Returns the cells array.
-    */
-    const wxRichTextObjectPtrArrayArray& GetCells() const { return m_cells; }
-
-    /**
-        Returns the cells array.
-    */
-    wxRichTextObjectPtrArrayArray& GetCells() { return m_cells; }
-
-    /**
-        Returns the row count.
-    */
-    int GetRowCount() const { return m_rowCount; }
-
-    /**
-        Sets the row count.
-    */
-    void SetRowCount(int count) { m_rowCount = count; }
-
-    /**
-        Returns the column count.
-    */
-    int GetColumnCount() const { return m_colCount; }
-
-    /**
-        Sets the column count.
-    */
-    void SetColumnCount(int count) { m_colCount = count; }
-
-    /**
-        Returns the cell at the given row/column position.
-    */
-    virtual wxRichTextCell* GetCell(int row, int col) const;
-
-    /**
-        Returns the cell at the given character position (in the range of the table).
-    */
-    virtual wxRichTextCell* GetCell(long pos) const;
-
-    /**
-        Returns the row/column for a given character position.
-    */
-    virtual bool GetCellRowColumnPosition(long pos, int& row, int& col) const;
-
-    /**
-        Returns the coordinates of the cell with keyboard focus, or (-1,-1) if none.
-    */    
-    virtual wxPosition GetFocusedCell() const;
-
-// Operations
-
-    /**
-        Clears the table.
-    */
-
-    virtual void ClearTable();
-
-    /**
-        Creates a table of the given dimensions.
-    */
-
-    virtual bool CreateTable(int rows, int cols);
-
-    /**
-        Sets the attributes for the cells specified by the selection.
-    */
-
-    virtual bool SetCellStyle(const wxRichTextSelection& selection, const wxRichTextAttr& style, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
-
-    /**
-        Deletes rows from the given row position.
-    */
-
-    virtual bool DeleteRows(int startRow, int noRows = 1);
-
-    /**
-        Deletes columns from the given column position.
-    */
-
-    virtual bool DeleteColumns(int startCol, int noCols = 1);
-
-    /**
-        Adds rows from the given row position.
-    */
-
-    virtual bool AddRows(int startRow, int noRows = 1, const wxRichTextAttr& attr = wxRichTextAttr());
-
-    /**
-        Adds columns from the given column position.
-    */
-
-    virtual bool AddColumns(int startCol, int noCols = 1, const wxRichTextAttr& attr = wxRichTextAttr());
-
-    // Makes a clone of this object.
-    virtual wxRichTextObject* Clone() const { return new wxRichTextTable(*this); }
-
-    // Copies this object.
-    void Copy(const wxRichTextTable& obj);
-
-protected:
-
-    int m_rowCount;
-    int m_colCount;
-
-    // An array of rows, each of which is a wxRichTextObjectPtrArray containing
-    // the cell objects. The cell objects are also children of this object.
-    // Problem: if boxes are immediate children of a box, this will cause problems
-    // with wxRichTextParagraphLayoutBox functions (and functions elsewhere) that
-    // expect to find just paragraphs. May have to adjust the way we handle the
-    // hierarchy to accept non-paragraph objects in a paragraph layout box.
-    // We'll be overriding much wxRichTextParagraphLayoutBox functionality so this
-    // may not be such a problem. Perhaps the table should derive from a different
-    // class?
-    wxRichTextObjectPtrArrayArray   m_cells;
-};
-
-/** @class wxRichTextTableBlock
-
-    Stores the coordinates for a block of cells.
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextTableBlock
-{
-public:
-    wxRichTextTableBlock() { Init(); }
-    wxRichTextTableBlock(int colStart, int colEnd, int rowStart, int rowEnd)
-    { Init(); m_colStart = colStart; m_colEnd = colEnd; m_rowStart = rowStart; m_rowEnd = rowEnd; }
-    wxRichTextTableBlock(const wxRichTextTableBlock& block) { Copy(block); }
-
-    void Init() { m_colStart = 0; m_colEnd = 0; m_rowStart = 0; m_rowEnd = 0; }
-    
-    void Copy(const wxRichTextTableBlock& block)
-    {
-        m_colStart = block.m_colStart; m_colEnd = block.m_colEnd; m_rowStart = block.m_rowStart; m_rowEnd = block.m_rowEnd;
-    }
-    void operator=(const wxRichTextTableBlock& block) { Copy(block); }
-    bool operator==(const wxRichTextTableBlock& block)
-    { return m_colStart == block.m_colStart && m_colEnd == block.m_colEnd && m_rowStart == block.m_rowStart && m_rowEnd == block.m_rowEnd; }
-
-    /// Computes the block given a table (perhaps about to be edited) and a rich text control
-    /// that may have a selection. If no selection, the whole table is used. If just the whole content
-    /// of one cell is selected, this cell only is used. If the cell contents is not selected and
-    /// requireCellSelection is @false, the focused cell will count as a selected cell.
-    bool ComputeBlockForSelection(wxRichTextTable* table, wxRichTextCtrl* ctrl, bool requireCellSelection = true);
-
-    /// Does this block represent the whole table?
-    bool IsWholeTable(wxRichTextTable* table) const;
-
-    /// Returns the cell focused in the table, if any
-    static wxRichTextCell* GetFocusedCell(wxRichTextCtrl* ctrl);
-
-    int& ColStart() { return m_colStart; }
-    int ColStart() const { return m_colStart; }
-
-    int& ColEnd() { return m_colEnd; }
-    int ColEnd() const { return m_colEnd; }
-
-    int& RowStart() { return m_rowStart; }
-    int RowStart() const { return m_rowStart; }
-
-    int& RowEnd() { return m_rowEnd; }
-    int RowEnd() const { return m_rowEnd; }
-
-    int m_colStart, m_colEnd, m_rowStart, m_rowEnd;
-};
-
-/**
-    The command identifiers for Do/Undo.
-*/
-
-enum wxRichTextCommandId
-{
-    wxRICHTEXT_INSERT,
-    wxRICHTEXT_DELETE,
-    wxRICHTEXT_CHANGE_ATTRIBUTES,
-    wxRICHTEXT_CHANGE_STYLE,
-    wxRICHTEXT_CHANGE_PROPERTIES,
-    wxRICHTEXT_CHANGE_OBJECT
-};
-
-/**
-    @class wxRichTextObjectAddress
-
-    A class for specifying an object anywhere in an object hierarchy,
-    without using a pointer, necessary since wxRTC commands may delete
-    and recreate sub-objects so physical object addresses change. An array
-    of positions (one per hierarchy level) is used.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextCommand
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextObjectAddress
-{
-public:
-    /**
-        Creates the address given a container and an object.
-    */
-    wxRichTextObjectAddress(wxRichTextParagraphLayoutBox* topLevelContainer, wxRichTextObject* obj) { Create(topLevelContainer, obj); }
-    /**
-    */
-    wxRichTextObjectAddress() { Init(); }
-    /**
-    */
-    wxRichTextObjectAddress(const wxRichTextObjectAddress& address) { Copy(address); }
-
-    void Init() {}
-
-    /**
-        Copies the address.
-    */
-    void Copy(const wxRichTextObjectAddress& address) { m_address = address.m_address; }
-
-    /**
-        Assignment operator.
-    */
-    void operator=(const wxRichTextObjectAddress& address) { Copy(address); }
-
-    /**
-        Returns the object specified by the address, given a top level container.
-    */
-    wxRichTextObject* GetObject(wxRichTextParagraphLayoutBox* topLevelContainer) const;
-
-    /**
-        Creates the address given a container and an object.
-    */
-    bool Create(wxRichTextParagraphLayoutBox* topLevelContainer, wxRichTextObject* obj);
-
-    /**
-        Returns the array of integers representing the object address.
-    */
-    wxArrayInt& GetAddress() { return m_address; }
-
-    /**
-        Returns the array of integers representing the object address.
-    */
-    const wxArrayInt& GetAddress() const { return m_address; }
-
-    /**
-        Sets the address from an array of integers.
-    */
-    void SetAddress(const wxArrayInt& address) { m_address = address; }
-
-protected:
-
-    wxArrayInt  m_address;
-};
-
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextAction;
-
-/**
-    @class wxRichTextCommand
-
-    Implements a command on the undo/redo stack. A wxRichTextCommand object contains one or more wxRichTextAction
-    objects, allowing aggregation of a number of operations into one command.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextAction
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextCommand: public wxCommand
-{
-public:
-    /**
-        Constructor for one action.
-    */
-    wxRichTextCommand(const wxString& name, wxRichTextCommandId id, wxRichTextBuffer* buffer,
-        wxRichTextParagraphLayoutBox* container, wxRichTextCtrl* ctrl, bool ignoreFirstTime = false);
-
-    /**
-        Constructor for multiple actions.
-    */
-    wxRichTextCommand(const wxString& name);
-
-    virtual ~wxRichTextCommand();
-
-    /**
-        Performs the command.
-    */
-    bool Do();
-
-    /**
-        Undoes the command.
-    */
-    bool Undo();
-
-    /**
-        Adds an action to the action list.
-    */
-    void AddAction(wxRichTextAction* action);
-
-    /**
-        Clears the action list.
-    */
-    void ClearActions();
-
-    /**
-        Returns the action list.
-    */
-    wxList& GetActions() { return m_actions; }
-
-protected:
-
-    wxList  m_actions;
-};
-
-/**
-    @class wxRichTextAction
-
-    Implements a part of a command.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextCommand
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextAction: public wxObject
-{
-public:
-    /**
-        Constructor. @a buffer is the top-level buffer, while @a container is the object within
-        which the action is taking place. In the simplest case, they are the same.
-    */
-    wxRichTextAction(wxRichTextCommand* cmd, const wxString& name, wxRichTextCommandId id,
-        wxRichTextBuffer* buffer, wxRichTextParagraphLayoutBox* container,
-        wxRichTextCtrl* ctrl, bool ignoreFirstTime = false);
-
-    virtual ~wxRichTextAction();
-
-    /**
-        Performs the action.
-    */
-    bool Do();
-
-    /**
-        Undoes the action.
-    */
-    bool Undo();
-
-    /**
-        Updates the control appearance, optimizing if possible given information from the call to Layout.
-    */
-    void UpdateAppearance(long caretPosition, bool sendUpdateEvent = false,
-                            wxArrayInt* optimizationLineCharPositions = NULL, wxArrayInt* optimizationLineYPositions = NULL, bool isDoCmd = true);
-
-    /**
-        Replaces the buffer paragraphs with the given fragment.
-    */
-    void ApplyParagraphs(const wxRichTextParagraphLayoutBox& fragment);
-
-    /**
-        Returns the new fragments.
-    */
-    wxRichTextParagraphLayoutBox& GetNewParagraphs() { return m_newParagraphs; }
-
-    /**
-        Returns the old fragments.
-    */
-    wxRichTextParagraphLayoutBox& GetOldParagraphs() { return m_oldParagraphs; }
-
-    /**
-        Returns the attributes, for single-object commands.
-    */
-    wxRichTextAttr& GetAttributes() { return m_attributes; }
-
-    /**
-        Returns the object to replace the one at the position defined by the container address
-        and the action's range start position.
-    */
-    wxRichTextObject* GetObject() const { return m_object; }
-
-    /**
-        Stores the object to replace the one at the position defined by the container address
-        without making an address for it (cf SetObject() and MakeObject()).
-    */
-    void StoreObject(wxRichTextObject* obj) { m_object = obj; }
-
-    /**
-        Sets the object to replace the one at the position defined by the container address
-        and the action's range start position.
-    */
-    void SetObject(wxRichTextObject* obj) { m_object = obj; m_objectAddress.Create(m_buffer, m_object); }
-
-    /**
-        Makes an address from the given object.
-    */
-    void MakeObject(wxRichTextObject* obj) { m_objectAddress.Create(m_buffer, obj); }
-
-    /**
-        Sets the existing and new objects, for use with wxRICHTEXT_CHANGE_OBJECT.
-    */
-    void SetOldAndNewObjects(wxRichTextObject* oldObj, wxRichTextObject* newObj) { SetObject(oldObj); StoreObject(newObj); }
-
-    /**
-        Calculate arrays for refresh optimization.
-    */
-    void CalculateRefreshOptimizations(wxArrayInt& optimizationLineCharPositions, wxArrayInt& optimizationLineYPositions);
-
-    /**
-        Sets the position used for e.g. insertion.
-    */
-    void SetPosition(long pos) { m_position = pos; }
-
-    /**
-        Returns the position used for e.g. insertion.
-    */
-    long GetPosition() const { return m_position; }
-
-    /**
-        Sets the range for e.g. deletion.
-    */
-    void SetRange(const wxRichTextRange& range) { m_range = range; }
-
-    /**
-        Returns the range for e.g. deletion.
-    */
-    const wxRichTextRange& GetRange() const { return m_range; }
-
-    /**
-        Returns the address (nested position) of the container within the buffer being manipulated.
-    */
-    wxRichTextObjectAddress& GetContainerAddress() { return m_containerAddress; }
-
-    /**
-        Returns the address (nested position) of the container within the buffer being manipulated.
-    */
-    const wxRichTextObjectAddress& GetContainerAddress() const { return m_containerAddress; }
-
-    /**
-        Sets the address (nested position) of the container within the buffer being manipulated.
-    */
-    void SetContainerAddress(const wxRichTextObjectAddress& address) { m_containerAddress = address; }
-
-    /**
-        Sets the address (nested position) of the container within the buffer being manipulated.
-    */
-    void SetContainerAddress(wxRichTextParagraphLayoutBox* container, wxRichTextObject* obj) { m_containerAddress.Create(container, obj); }
-
-    /**
-        Returns the container that this action refers to, using the container address and top-level buffer.
-    */
-    wxRichTextParagraphLayoutBox* GetContainer() const;
-
-    /**
-        Returns the action name.
-    */
-    const wxString& GetName() const { return m_name; }
-
-    /**
-        Instructs the first Do() command should be skipped as it's already been applied.
-    */
-    void SetIgnoreFirstTime(bool b) { m_ignoreThis = b; }
-
-    /**
-        Returns true if the first Do() command should be skipped as it's already been applied.
-    */
-    bool GetIgnoreFirstTime() const { return m_ignoreThis; }
-
-protected:
-    // Action name
-    wxString                        m_name;
-
-    // Buffer
-    wxRichTextBuffer*               m_buffer;
-
-    // The address (nested position) of the container being manipulated.
-    // This is necessary because objects are deleted, and we can't
-    // therefore store actual pointers.
-    wxRichTextObjectAddress         m_containerAddress;
-
-    // Control
-    wxRichTextCtrl*                 m_ctrl;
-
-    // Stores the new paragraphs
-    wxRichTextParagraphLayoutBox    m_newParagraphs;
-
-    // Stores the old paragraphs
-    wxRichTextParagraphLayoutBox    m_oldParagraphs;
-
-    // Stores an object to replace the one at the position
-    // defined by the container address and the action's range start position.
-    wxRichTextObject*               m_object;
-
-    // Stores the attributes
-    wxRichTextAttr                  m_attributes;
-
-    // The address of the object being manipulated (used for changing an individual object or its attributes)
-    wxRichTextObjectAddress         m_objectAddress;
-
-    // Stores the old attributes
-    // wxRichTextAttr                  m_oldAttributes;
-
-    // The affected range
-    wxRichTextRange                 m_range;
-
-    // The insertion point for this command
-    long                            m_position;
-
-    // Ignore 1st 'Do' operation because we already did it
-    bool                            m_ignoreThis;
-
-    // The command identifier
-    wxRichTextCommandId             m_cmdId;
-};
-
-/*!
- * Handler flags
- */
-
-// Include style sheet when loading and saving
-#define wxRICHTEXT_HANDLER_INCLUDE_STYLESHEET       0x0001
-
-// Save images to memory file system in HTML handler
-#define wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_MEMORY    0x0010
-
-// Save images to files in HTML handler
-#define wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_FILES     0x0020
-
-// Save images as inline base64 data in HTML handler
-#define wxRICHTEXT_HANDLER_SAVE_IMAGES_TO_BASE64    0x0040
-
-// Don't write header and footer (or BODY), so we can include the fragment
-// in a larger document
-#define wxRICHTEXT_HANDLER_NO_HEADER_FOOTER         0x0080
-
-// Convert the more common face names to names that will work on the current platform
-// in a larger document
-#define wxRICHTEXT_HANDLER_CONVERT_FACENAMES        0x0100
-
-/**
-    @class wxRichTextFileHandler
-
-    The base class for file handlers.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextFileHandler: public wxObject
-{
-    DECLARE_CLASS(wxRichTextFileHandler)
-public:
-    /**
-        Creates a file handler object.
-    */
-    wxRichTextFileHandler(const wxString& name = wxEmptyString, const wxString& ext = wxEmptyString, int type = 0)
-        : m_name(name), m_extension(ext), m_type(type), m_flags(0), m_visible(true)
-        { }
-
-#if wxUSE_STREAMS
-    /**
-        Loads the buffer from a stream.
-        Not all handlers will implement file loading.
-    */
-    bool LoadFile(wxRichTextBuffer *buffer, wxInputStream& stream)
-    { return DoLoadFile(buffer, stream); }
-
-    /**
-        Saves the buffer to a stream.
-        Not all handlers will implement file saving.
-    */
-    bool SaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream)
-    { return DoSaveFile(buffer, stream); }
-#endif
-
-#if wxUSE_FFILE && wxUSE_STREAMS
-    /**
-        Loads the buffer from a file.
-    */
-    virtual bool LoadFile(wxRichTextBuffer *buffer, const wxString& filename);
-
-    /**
-        Saves the buffer to a file.
-    */
-    virtual bool SaveFile(wxRichTextBuffer *buffer, const wxString& filename);
-#endif // wxUSE_STREAMS && wxUSE_STREAMS
-
-    /**
-        Returns @true if we handle this filename (if using files). By default, checks the extension.
-    */
-    virtual bool CanHandle(const wxString& filename) const;
-
-    /**
-        Returns @true if we can save using this handler.
-    */
-    virtual bool CanSave() const { return false; }
-
-    /**
-        Returns @true if we can load using this handler.
-    */
-    virtual bool CanLoad() const { return false; }
-
-    /**
-        Returns @true if this handler should be visible to the user.
-    */
-    virtual bool IsVisible() const { return m_visible; }
-
-    /**
-        Sets whether the handler should be visible to the user (via the application's
-        load and save dialogs).
-    */
-    virtual void SetVisible(bool visible) { m_visible = visible; }
-
-    /**
-        Sets the name of the handler.
-    */
-    void SetName(const wxString& name) { m_name = name; }
-
-    /**
-        Returns the name of the handler.
-    */
-    wxString GetName() const { return m_name; }
-
-    /**
-        Sets the default extension to recognise.
-    */
-    void SetExtension(const wxString& ext) { m_extension = ext; }
-
-    /**
-        Returns the default extension to recognise.
-    */
-    wxString GetExtension() const { return m_extension; }
-
-    /**
-        Sets the handler type.
-    */
-    void SetType(int type) { m_type = type; }
-
-    /**
-        Returns the handler type.
-    */
-    int GetType() const { return m_type; }
-
-    /**
-        Sets flags that change the behaviour of loading or saving.
-        See the documentation for each handler class to see what flags are relevant
-        for each handler.
-
-        You call this function directly if you are using a file handler explicitly
-        (without going through the text control or buffer LoadFile/SaveFile API).
-        Or, you can call the control or buffer's SetHandlerFlags function to set
-        the flags that will be used for subsequent load and save operations.
-    */
-    void SetFlags(int flags) { m_flags = flags; }
-
-    /**
-        Returns flags controlling how loading and saving is done.
-    */
-    int GetFlags() const { return m_flags; }
-
-    /**
-        Sets the encoding to use when saving a file. If empty, a suitable encoding is chosen.
-    */
-    void SetEncoding(const wxString& encoding) { m_encoding = encoding; }
-
-    /**
-        Returns the encoding to use when saving a file. If empty, a suitable encoding is chosen.
-    */
-    const wxString& GetEncoding() const { return m_encoding; }
-
-protected:
-
-#if wxUSE_STREAMS
-    /**
-        Override to load content from @a stream into @a buffer.
-    */
-    virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream) = 0;
-
-    /**
-        Override to save content to @a stream from @a buffer.
-    */
-    virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream) = 0;
-#endif
-
-    wxString  m_name;
-    wxString  m_encoding;
-    wxString  m_extension;
-    int       m_type;
-    int       m_flags;
-    bool      m_visible;
-};
-
-/**
-    @class wxRichTextPlainTextHandler
-
-    Implements saving a buffer to plain text.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextFileHandler, wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextPlainTextHandler: public wxRichTextFileHandler
-{
-    DECLARE_CLASS(wxRichTextPlainTextHandler)
-public:
-    wxRichTextPlainTextHandler(const wxString& name = wxT("Text"),
-                               const wxString& ext = wxT("txt"),
-                               wxRichTextFileType type = wxRICHTEXT_TYPE_TEXT)
-        : wxRichTextFileHandler(name, ext, type)
-        { }
-
-    // Can we save using this handler?
-    virtual bool CanSave() const { return true; }
-
-    // Can we load using this handler?
-    virtual bool CanLoad() const { return true; }
-
-protected:
-
-#if wxUSE_STREAMS
-    virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream);
-    virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream);
-#endif
-
-};
-
-/**
-    @class wxRichTextDrawingHandler
-
-    The base class for custom drawing handlers.
-    Currently, drawing handlers can provide virtual attributes.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextDrawingHandler: public wxObject
-{
-    DECLARE_CLASS(wxRichTextDrawingHandler)
-public:
-    /**
-        Creates a drawing handler object.
-    */
-    wxRichTextDrawingHandler(const wxString& name = wxEmptyString)
-        : m_name(name)
-        { }
-
-    /**
-        Returns @true if this object has virtual attributes that we can provide.
-    */
-    virtual bool HasVirtualAttributes(wxRichTextObject* obj) const = 0;
-
-    /**
-        Provides virtual attributes that we can provide.
-    */
-    virtual bool GetVirtualAttributes(wxRichTextAttr& attr, wxRichTextObject* obj) const = 0;
-
-    /**
-        Gets the count for mixed virtual attributes for individual positions within the object.
-        For example, individual characters within a text object may require special highlighting.
-    */
-    virtual int GetVirtualSubobjectAttributesCount(wxRichTextObject* obj) const = 0;
-
-    /**
-        Gets the mixed virtual attributes for individual positions within the object.
-        For example, individual characters within a text object may require special highlighting.
-        Returns the number of virtual attributes found.
-    */
-    virtual int GetVirtualSubobjectAttributes(wxRichTextObject* obj, wxArrayInt& positions, wxRichTextAttrArray& attributes) const = 0;
-
-    /**
-        Do we have virtual text for this object? Virtual text allows an application
-        to replace characters in an object for editing and display purposes, for example
-        for highlighting special characters.
-    */
-    virtual bool HasVirtualText(const wxRichTextPlainText* obj) const = 0;
-
-    /**
-        Gets the virtual text for this object.
-    */
-    virtual bool GetVirtualText(const wxRichTextPlainText* obj, wxString& text) const = 0;
-
-    /**
-        Sets the name of the handler.
-    */
-    void SetName(const wxString& name) { m_name = name; }
-
-    /**
-        Returns the name of the handler.
-    */
-    wxString GetName() const { return m_name; }
-
-protected:
-
-    wxString  m_name;
-};
-
-#if wxUSE_DATAOBJ
-
-/**
-    @class wxRichTextBufferDataObject
-
-    Implements a rich text data object for clipboard transfer.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxDataObjectSimple, wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextBufferDataObject: public wxDataObjectSimple
-{
-public:
-    /**
-        The constructor doesn't copy the pointer, so it shouldn't go away while this object
-        is alive.
-    */
-    wxRichTextBufferDataObject(wxRichTextBuffer* richTextBuffer = NULL);
-    virtual ~wxRichTextBufferDataObject();
-
-    /**
-        After a call to this function, the buffer is owned by the caller and it
-        is responsible for deleting it.
-    */
-    wxRichTextBuffer* GetRichTextBuffer();
-
-    /**
-        Returns the id for the new data format.
-    */
-    static const wxChar* GetRichTextBufferFormatId() { return ms_richTextBufferFormatId; }
-
-    // base class pure virtuals
-
-    virtual wxDataFormat GetPreferredFormat(Direction dir) const;
-    virtual size_t GetDataSize() const;
-    virtual bool GetDataHere(void *pBuf) const;
-    virtual bool SetData(size_t len, const void *buf);
-
-    // prevent warnings
-
-    virtual size_t GetDataSize(const wxDataFormat&) const { return GetDataSize(); }
-    virtual bool GetDataHere(const wxDataFormat&, void *buf) const { return GetDataHere(buf); }
-    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf) { return SetData(len, buf); }
-
-private:
-    wxDataFormat            m_formatRichTextBuffer;     // our custom format
-    wxRichTextBuffer*       m_richTextBuffer;           // our data
-    static const wxChar*    ms_richTextBufferFormatId;  // our format id
-};
-
-#endif
-
-/**
-    @class wxRichTextRenderer
-
-    This class isolates some common drawing functionality.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextRenderer: public wxObject
-{
-public:
-    /**
-        Constructor.
-    */
-    wxRichTextRenderer() {}
-    virtual ~wxRichTextRenderer() {}
-
-    /**
-        Draws a standard bullet, as specified by the value of GetBulletName. This function should be overridden.
-    */
-    virtual bool DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect) = 0;
-
-    /**
-        Draws a bullet that can be described by text, such as numbered or symbol bullets. This function should be overridden.
-    */
-    virtual bool DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, const wxString& text) = 0;
-
-    /**
-        Draws a bitmap bullet, where the bullet bitmap is specified by the value of GetBulletName. This function should be overridden.
-    */
-    virtual bool DrawBitmapBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect) = 0;
-
-    /**
-        Enumerate the standard bullet names currently supported. This function should be overridden.
-    */
-    virtual bool EnumerateStandardBulletNames(wxArrayString& bulletNames) = 0;
-};
-
-/**
-    @class wxRichTextStdRenderer
-
-    The standard renderer for drawing bullets.
-
-    @library{wxrichtext}
-    @category{richtext}
-
-    @see wxRichTextRenderer, wxRichTextBuffer, wxRichTextCtrl
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextStdRenderer: public wxRichTextRenderer
-{
-public:
-    /**
-        Constructor.
-    */
-    wxRichTextStdRenderer() {}
-
-    // Draw a standard bullet, as specified by the value of GetBulletName
-    virtual bool DrawStandardBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect);
-
-    // Draw a bullet that can be described by text, such as numbered or symbol bullets
-    virtual bool DrawTextBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect, const wxString& text);
-
-    // Draw a bitmap bullet, where the bullet bitmap is specified by the value of GetBulletName
-    virtual bool DrawBitmapBullet(wxRichTextParagraph* paragraph, wxDC& dc, const wxRichTextAttr& attr, const wxRect& rect);
-
-    // Enumerate the standard bullet names currently supported
-    virtual bool EnumerateStandardBulletNames(wxArrayString& bulletNames);
-};
-
-/*!
- * Utilities
- *
- */
-
-inline bool wxRichTextHasStyle(int flags, int style)
-{
-    return ((flags & style) == style);
-}
-
-/// Compare two attribute objects
-WXDLLIMPEXP_RICHTEXT bool wxTextAttrEq(const wxRichTextAttr& attr1, const wxRichTextAttr& attr2);
-WXDLLIMPEXP_RICHTEXT bool wxTextAttrEq(const wxRichTextAttr& attr1, const wxRichTextAttr& attr2);
-
-/// Apply one style to another
-WXDLLIMPEXP_RICHTEXT bool wxRichTextApplyStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style, wxRichTextAttr* compareWith = NULL);
-
-// Remove attributes
-WXDLLIMPEXP_RICHTEXT bool wxRichTextRemoveStyle(wxRichTextAttr& destStyle, const wxRichTextAttr& style);
-
-/// Combine two bitlists
-WXDLLIMPEXP_RICHTEXT bool wxRichTextCombineBitlists(int& valueA, int valueB, int& flagsA, int flagsB);
-
-/// Compare two bitlists
-WXDLLIMPEXP_RICHTEXT bool wxRichTextBitlistsEqPartial(int valueA, int valueB, int flags);
-
-/// Split into paragraph and character styles
-WXDLLIMPEXP_RICHTEXT bool wxRichTextSplitParaCharStyles(const wxRichTextAttr& style, wxRichTextAttr& parStyle, wxRichTextAttr& charStyle);
-
-/// Compare tabs
-WXDLLIMPEXP_RICHTEXT bool wxRichTextTabsEq(const wxArrayInt& tabs1, const wxArrayInt& tabs2);
-
-/// Convert a decimal to Roman numerals
-WXDLLIMPEXP_RICHTEXT wxString wxRichTextDecimalToRoman(long n);
-
-// Collects the attributes that are common to a range of content, building up a note of
-// which attributes are absent in some objects and which clash in some objects.
-WXDLLIMPEXP_RICHTEXT void wxTextAttrCollectCommonAttributes(wxTextAttr& currentStyle, const wxTextAttr& attr, wxTextAttr& clashingAttr, wxTextAttr& absentAttr);
-
-WXDLLIMPEXP_RICHTEXT void wxRichTextModuleInit();
-
-#endif
-    // wxUSE_RICHTEXT
-
-#endif
-    // _WX_RICHTEXTBUFFER_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextbulletspage.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextbulletspage.h
deleted file mode 100644
index 4cf6b7745a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextbulletspage.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextbulletspage.h
-// Purpose:
-// Author:      Julian Smart
-// Modified by:
-// Created:     10/4/2006 10:32:31 AM
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _RICHTEXTBULLETSPAGE_H_
-#define _RICHTEXTBULLETSPAGE_H_
-
-/*!
- * Includes
- */
-
-#include "wx/richtext/richtextdialogpage.h"
-#include "wx/spinbutt.h"        // for wxSpinEvent
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-class wxSpinCtrl;
-class wxRichTextCtrl;
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define SYMBOL_WXRICHTEXTBULLETSPAGE_STYLE wxRESIZE_BORDER|wxTAB_TRAVERSAL
-#define SYMBOL_WXRICHTEXTBULLETSPAGE_TITLE wxEmptyString
-#define SYMBOL_WXRICHTEXTBULLETSPAGE_IDNAME ID_RICHTEXTBULLETSPAGE
-#define SYMBOL_WXRICHTEXTBULLETSPAGE_SIZE wxSize(400, 300)
-#define SYMBOL_WXRICHTEXTBULLETSPAGE_POSITION wxDefaultPosition
-////@end control identifiers
-
-/*!
- * wxRichTextBulletsPage class declaration
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextBulletsPage: public wxRichTextDialogPage
-{
-    DECLARE_DYNAMIC_CLASS( wxRichTextBulletsPage )
-    DECLARE_EVENT_TABLE()
-    DECLARE_HELP_PROVISION()
-
-public:
-    /// Constructors
-    wxRichTextBulletsPage( );
-    wxRichTextBulletsPage( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTBULLETSPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTBULLETSPAGE_SIZE, long style = SYMBOL_WXRICHTEXTBULLETSPAGE_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTBULLETSPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTBULLETSPAGE_SIZE, long style = SYMBOL_WXRICHTEXTBULLETSPAGE_STYLE );
-
-    /// Initialise members
-    void Init();
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-    /// Updates the bullets preview
-    void UpdatePreview();
-
-    /// Transfer data from/to window
-    virtual bool TransferDataFromWindow();
-    virtual bool TransferDataToWindow();
-
-    /// Gets the attributes associated with the main formatting dialog
-    wxRichTextAttr* GetAttributes();
-
-    /// Update for symbol-related controls
-    void OnSymbolUpdate( wxUpdateUIEvent& event );
-
-    /// Update for number-related controls
-    void OnNumberUpdate( wxUpdateUIEvent& event );
-
-    /// Update for standard bullet-related controls
-    void OnStandardBulletUpdate( wxUpdateUIEvent& event );
-
-////@begin wxRichTextBulletsPage event handler declarations
-
-    /// wxEVT_LISTBOX event handler for ID_RICHTEXTBULLETSPAGE_STYLELISTBOX
-    void OnStylelistboxSelected( wxCommandEvent& event );
-
-    /// wxEVT_CHECKBOX event handler for ID_RICHTEXTBULLETSPAGE_PERIODCTRL
-    void OnPeriodctrlClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_PERIODCTRL
-    void OnPeriodctrlUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_CHECKBOX event handler for ID_RICHTEXTBULLETSPAGE_PARENTHESESCTRL
-    void OnParenthesesctrlClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_PARENTHESESCTRL
-    void OnParenthesesctrlUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_CHECKBOX event handler for ID_RICHTEXTBULLETSPAGE_RIGHTPARENTHESISCTRL
-    void OnRightParenthesisCtrlClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_RIGHTPARENTHESISCTRL
-    void OnRightParenthesisCtrlUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_COMBOBOX event handler for ID_RICHTEXTBULLETSPAGE_BULLETALIGNMENTCTRL
-    void OnBulletAlignmentCtrlSelected( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_SYMBOLSTATIC
-    void OnSymbolstaticUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_COMBOBOX event handler for ID_RICHTEXTBULLETSPAGE_SYMBOLCTRL
-    void OnSymbolctrlSelected( wxCommandEvent& event );
-
-    /// wxEVT_TEXT event handler for ID_RICHTEXTBULLETSPAGE_SYMBOLCTRL
-    void OnSymbolctrlUpdated( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_SYMBOLCTRL
-    void OnSymbolctrlUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_BUTTON event handler for ID_RICHTEXTBULLETSPAGE_CHOOSE_SYMBOL
-    void OnChooseSymbolClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_CHOOSE_SYMBOL
-    void OnChooseSymbolUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_COMBOBOX event handler for ID_RICHTEXTBULLETSPAGE_SYMBOLFONTCTRL
-    void OnSymbolfontctrlSelected( wxCommandEvent& event );
-
-    /// wxEVT_TEXT event handler for ID_RICHTEXTBULLETSPAGE_SYMBOLFONTCTRL
-    void OnSymbolfontctrlUpdated( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_SYMBOLFONTCTRL
-    void OnSymbolfontctrlUIUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_NAMESTATIC
-    void OnNamestaticUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_COMBOBOX event handler for ID_RICHTEXTBULLETSPAGE_NAMECTRL
-    void OnNamectrlSelected( wxCommandEvent& event );
-
-    /// wxEVT_TEXT event handler for ID_RICHTEXTBULLETSPAGE_NAMECTRL
-    void OnNamectrlUpdated( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_NAMECTRL
-    void OnNamectrlUIUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_NUMBERSTATIC
-    void OnNumberstaticUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_SPINCTRL event handler for ID_RICHTEXTBULLETSPAGE_NUMBERCTRL
-    void OnNumberctrlUpdated( wxSpinEvent& event );
-
-    /// wxEVT_SCROLL_LINEUP event handler for ID_RICHTEXTBULLETSPAGE_NUMBERCTRL
-    void OnNumberctrlUp( wxSpinEvent& event );
-
-    /// wxEVT_SCROLL_LINEDOWN event handler for ID_RICHTEXTBULLETSPAGE_NUMBERCTRL
-    void OnNumberctrlDown( wxSpinEvent& event );
-
-    /// wxEVT_TEXT event handler for ID_RICHTEXTBULLETSPAGE_NUMBERCTRL
-    void OnNumberctrlTextUpdated( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTBULLETSPAGE_NUMBERCTRL
-    void OnNumberctrlUpdate( wxUpdateUIEvent& event );
-
-////@end wxRichTextBulletsPage event handler declarations
-
-////@begin wxRichTextBulletsPage member function declarations
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end wxRichTextBulletsPage member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-////@begin wxRichTextBulletsPage member variables
-    wxListBox* m_styleListBox;
-    wxCheckBox* m_periodCtrl;
-    wxCheckBox* m_parenthesesCtrl;
-    wxCheckBox* m_rightParenthesisCtrl;
-    wxComboBox* m_bulletAlignmentCtrl;
-    wxComboBox* m_symbolCtrl;
-    wxComboBox* m_symbolFontCtrl;
-    wxComboBox* m_bulletNameCtrl;
-    wxSpinCtrl* m_numberCtrl;
-    wxRichTextCtrl* m_previewCtrl;
-    /// Control identifiers
-    enum {
-        ID_RICHTEXTBULLETSPAGE = 10300,
-        ID_RICHTEXTBULLETSPAGE_STYLELISTBOX = 10305,
-        ID_RICHTEXTBULLETSPAGE_PERIODCTRL = 10313,
-        ID_RICHTEXTBULLETSPAGE_PARENTHESESCTRL = 10311,
-        ID_RICHTEXTBULLETSPAGE_RIGHTPARENTHESISCTRL = 10306,
-        ID_RICHTEXTBULLETSPAGE_BULLETALIGNMENTCTRL = 10315,
-        ID_RICHTEXTBULLETSPAGE_SYMBOLSTATIC = 10301,
-        ID_RICHTEXTBULLETSPAGE_SYMBOLCTRL = 10307,
-        ID_RICHTEXTBULLETSPAGE_CHOOSE_SYMBOL = 10308,
-        ID_RICHTEXTBULLETSPAGE_SYMBOLFONTCTRL = 10309,
-        ID_RICHTEXTBULLETSPAGE_NAMESTATIC = 10303,
-        ID_RICHTEXTBULLETSPAGE_NAMECTRL = 10304,
-        ID_RICHTEXTBULLETSPAGE_NUMBERSTATIC = 10302,
-        ID_RICHTEXTBULLETSPAGE_NUMBERCTRL = 10310,
-        ID_RICHTEXTBULLETSPAGE_PREVIEW_CTRL = 10314
-    };
-////@end wxRichTextBulletsPage member variables
-
-    bool m_hasBulletStyle;
-    bool m_hasBulletNumber;
-    bool m_hasBulletSymbol;
-    bool m_dontUpdate;
-};
-
-#endif
-    // _RICHTEXTBULLETSPAGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextctrl.h
deleted file mode 100644
index 93e26d6bc9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextctrl.h
+++ /dev/null
@@ -1,2638 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextctrl.h
-// Purpose:     A rich edit control
-// Author:      Julian Smart
-// Modified by:
-// Created:     2005-09-30
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RICHTEXTCTRL_H_
-#define _WX_RICHTEXTCTRL_H_
-
-#include "wx/richtext/richtextbuffer.h"
-
-#if wxUSE_RICHTEXT
-
-#include "wx/scrolwin.h"
-#include "wx/caret.h"
-
-#include "wx/textctrl.h"
-
-#if wxUSE_DRAG_AND_DROP
-#include "wx/dnd.h"
-#endif
-
-#if !defined(__WXGTK__) && !defined(__WXMAC__)
-#define wxRICHTEXT_BUFFERED_PAINTING 1
-#else
-#define wxRICHTEXT_BUFFERED_PAINTING 0
-#endif
-
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextStyleDefinition;
-
-/*
- * Styles and flags
- */
-
-/**
-    Styles
-*/
-
-#define wxRE_READONLY          0x0010
-#define wxRE_MULTILINE         0x0020
-#define wxRE_CENTRE_CARET      0x8000
-#define wxRE_CENTER_CARET      wxRE_CENTRE_CARET
-
-/**
-    Flags
-*/
-
-#define wxRICHTEXT_SHIFT_DOWN  0x01
-#define wxRICHTEXT_CTRL_DOWN   0x02
-#define wxRICHTEXT_ALT_DOWN    0x04
-
-/**
-    Extra flags
-*/
-
-// Don't draw guide lines around boxes and tables
-#define wxRICHTEXT_EX_NO_GUIDELINES 0x00000100
-
-
-/*
-    Defaults
-*/
-
-#define wxRICHTEXT_DEFAULT_OVERALL_SIZE wxSize(-1, -1)
-#define wxRICHTEXT_DEFAULT_IMAGE_SIZE wxSize(80, 80)
-#define wxRICHTEXT_DEFAULT_SPACING 3
-#define wxRICHTEXT_DEFAULT_MARGIN 3
-#define wxRICHTEXT_DEFAULT_UNFOCUSSED_BACKGROUND wxColour(175, 175, 175)
-#define wxRICHTEXT_DEFAULT_FOCUSSED_BACKGROUND wxColour(140, 140, 140)
-#define wxRICHTEXT_DEFAULT_UNSELECTED_BACKGROUND wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)
-#define wxRICHTEXT_DEFAULT_TYPE_COLOUR wxColour(0, 0, 200)
-#define wxRICHTEXT_DEFAULT_FOCUS_RECT_COLOUR wxColour(100, 80, 80)
-#define wxRICHTEXT_DEFAULT_CARET_WIDTH 2
-// Minimum buffer size before delayed layout kicks in
-#define wxRICHTEXT_DEFAULT_DELAYED_LAYOUT_THRESHOLD 20000
-// Milliseconds before layout occurs after resize
-#define wxRICHTEXT_DEFAULT_LAYOUT_INTERVAL 50
-
-/* Identifiers
- */
-#define wxID_RICHTEXT_PROPERTIES1   (wxID_HIGHEST + 1)
-#define wxID_RICHTEXT_PROPERTIES2   (wxID_HIGHEST + 2)
-#define wxID_RICHTEXT_PROPERTIES3   (wxID_HIGHEST + 3)
-
-/*
-    Normal selection occurs initially and as user drags within one container.
-    Common ancestor selection occurs when the user starts dragging across containers
-    that have a common ancestor, for example the cells in a table.
- */
-
-enum wxRichTextCtrlSelectionState
-{
-    wxRichTextCtrlSelectionState_Normal,
-    wxRichTextCtrlSelectionState_CommonAncestor
-};
-
-/**
-    @class wxRichTextContextMenuPropertiesInfo
-
-    wxRichTextContextMenuPropertiesInfo keeps track of objects that appear in the context menu,
-    whose properties are available to be edited.
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextContextMenuPropertiesInfo
-{
-public:
-    /**
-        Constructor.
-    */
-    wxRichTextContextMenuPropertiesInfo() { Init(); }
-
-// Operations
-
-    /**
-        Initialisation.
-    */
-    void Init() {}
-
-    /**
-        Adds an item.
-    */
-    bool AddItem(const wxString& label, wxRichTextObject* obj);
-
-    /**
-        Returns the number of menu items that were added.
-    */
-    int AddMenuItems(wxMenu* menu, int startCmd = wxID_RICHTEXT_PROPERTIES1) const;
-
-    /**
-        Adds appropriate menu items for the current container and clicked on object
-        (and container's parent, if appropriate).
-    */
-    int AddItems(wxRichTextCtrl* ctrl, wxRichTextObject* container, wxRichTextObject* obj);
-
-    /**
-        Clears the items.
-    */
-    void Clear() { m_objects.Clear(); m_labels.Clear(); }
-
-// Accessors
-
-    /**
-        Returns the nth label.
-    */
-    wxString GetLabel(int n) const { return m_labels[n]; }
-
-    /**
-        Returns the nth object.
-    */
-    wxRichTextObject* GetObject(int n) const { return m_objects[n]; }
-
-    /**
-        Returns the array of objects.
-    */
-    wxRichTextObjectPtrArray& GetObjects() { return m_objects; }
-
-    /**
-        Returns the array of objects.
-    */
-    const wxRichTextObjectPtrArray& GetObjects() const { return m_objects; }
-
-    /**
-        Returns the array of labels.
-    */
-    wxArrayString& GetLabels() { return m_labels; }
-
-    /**
-        Returns the array of labels.
-    */
-    const wxArrayString& GetLabels() const { return m_labels; }
-
-    /**
-        Returns the number of items.
-    */
-    int GetCount() const { return m_objects.GetCount(); }
-
-    wxRichTextObjectPtrArray    m_objects;
-    wxArrayString               m_labels;
-};
-
-/**
-    @class wxRichTextCtrl
-
-    wxRichTextCtrl provides a generic, ground-up implementation of a text control
-    capable of showing multiple styles and images.
-
-    wxRichTextCtrl sends notification events: see wxRichTextEvent.
-
-    It also sends the standard wxTextCtrl events @c wxEVT_TEXT_ENTER and
-    @c wxEVT_TEXT, and wxTextUrlEvent when URL content is clicked.
-
-    For more information, see the @ref overview_richtextctrl.
-
-    @beginStyleTable
-    @style{wxRE_CENTRE_CARET}
-           The control will try to keep the caret line centred vertically while editing.
-           wxRE_CENTER_CARET is a synonym for this style.
-    @style{wxRE_MULTILINE}
-           The control will be multiline (mandatory).
-    @style{wxRE_READONLY}
-           The control will not be editable.
-    @endStyleTable
-
-    @library{wxrichtext}
-    @category{richtext}
-    @appearance{richtextctrl.png}
-
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextCtrl : public wxControl,
-                                            public wxTextCtrlIface,
-                                            public wxScrollHelper
-{
-    DECLARE_DYNAMIC_CLASS( wxRichTextCtrl )
-    DECLARE_EVENT_TABLE()
-
-public:
-// Constructors
-
-    /**
-        Default constructor.
-    */
-    wxRichTextCtrl( );
-
-    /**
-        Constructor, creating and showing a rich text control.
-
-        @param parent
-            Parent window. Must not be @NULL.
-        @param id
-            Window identifier. The value @c wxID_ANY indicates a default value.
-        @param value
-            Default string.
-        @param pos
-            Window position.
-        @param size
-            Window size.
-        @param style
-            Window style.
-        @param validator
-            Window validator.
-        @param name
-            Window name.
-
-        @see Create(), wxValidator
-    */
-    wxRichTextCtrl( wxWindow* parent, wxWindowID id = -1, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-        long style = wxRE_MULTILINE, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTextCtrlNameStr);
-
-    /**
-        Destructor.
-    */
-    virtual ~wxRichTextCtrl( );
-
-// Operations
-
-    /**
-        Creates the underlying window.
-    */
-    bool Create( wxWindow* parent, wxWindowID id = -1, const wxString& value = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-        long style = wxRE_MULTILINE, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxTextCtrlNameStr );
-
-    /**
-        Initialises the members of the control.
-    */
-    void Init();
-
-// Accessors
-
-    /**
-        Gets the text for the given range.
-        The end point of range is specified as the last character position of
-        the span of text, plus one.
-    */
-    virtual wxString GetRange(long from, long to) const;
-
-    /**
-        Returns the length of the specified line in characters.
-    */
-    virtual int GetLineLength(long lineNo) const ;
-
-    /**
-        Returns the text for the given line.
-    */
-    virtual wxString GetLineText(long lineNo) const ;
-
-    /**
-        Returns the number of lines in the buffer.
-    */
-    virtual int GetNumberOfLines() const ;
-
-    /**
-        Returns @true if the buffer has been modified.
-    */
-    virtual bool IsModified() const ;
-
-    /**
-        Returns @true if the control is editable.
-    */
-    virtual bool IsEditable() const ;
-
-    /**
-        Returns @true if the control is single-line.
-        Currently wxRichTextCtrl does not support single-line editing.
-    */
-    bool IsSingleLine() const { return !HasFlag(wxRE_MULTILINE); }
-
-    /**
-        Returns @true if the control is multiline.
-    */
-    bool IsMultiLine() const { return !IsSingleLine(); }
-
-    //@{
-    /**
-        Returns the range of the current selection.
-        The end point of range is specified as the last character position of the span
-        of text, plus one.
-        If the return values @a from and @a to are the same, there is no selection.
-    */
-    virtual void GetSelection(long* from, long* to) const;
-    const wxRichTextSelection& GetSelection() const { return m_selection; }
-    wxRichTextSelection& GetSelection() { return m_selection; }
-    //@}
-
-    /**
-        Returns the text within the current selection range, if any.
-    */
-    virtual wxString GetStringSelection() const;
-
-    /**
-        Gets the current filename associated with the control.
-    */
-    wxString GetFilename() const { return m_filename; }
-
-    /**
-        Sets the current filename.
-    */
-    void SetFilename(const wxString& filename) { m_filename = filename; }
-
-    /**
-        Sets the size of the buffer beyond which layout is delayed during resizing.
-        This optimizes sizing for large buffers. The default is 20000.
-    */
-    void SetDelayedLayoutThreshold(long threshold) { m_delayedLayoutThreshold = threshold; }
-
-    /**
-        Gets the size of the buffer beyond which layout is delayed during resizing.
-        This optimizes sizing for large buffers. The default is 20000.
-    */
-    long GetDelayedLayoutThreshold() const { return m_delayedLayoutThreshold; }
-
-    /**
-        Gets the flag indicating that full layout is required.
-    */
-    bool GetFullLayoutRequired() const { return m_fullLayoutRequired; }
-
-    /**
-        Sets the flag indicating that full layout is required.
-    */
-    void SetFullLayoutRequired(bool b) { m_fullLayoutRequired = b; }
-
-    /**
-        Returns the last time full layout was performed.
-    */
-    wxLongLong GetFullLayoutTime() const { return m_fullLayoutTime; }
-
-    /**
-        Sets the last time full layout was performed.
-    */
-    void SetFullLayoutTime(wxLongLong t) { m_fullLayoutTime = t; }
-
-    /**
-        Returns the position that should be shown when full (delayed) layout is performed.
-    */
-    long GetFullLayoutSavedPosition() const { return m_fullLayoutSavedPosition; }
-
-    /**
-        Sets the position that should be shown when full (delayed) layout is performed.
-    */
-    void SetFullLayoutSavedPosition(long p) { m_fullLayoutSavedPosition = p; }
-
-    /**
-        Forces any pending layout due to delayed, partial layout when the control
-        was resized.
-    */
-    void ForceDelayedLayout();
-
-    /**
-        Sets the text (normal) cursor.
-    */
-    void SetTextCursor(const wxCursor& cursor ) { m_textCursor = cursor; }
-
-    /**
-        Returns the text (normal) cursor.
-    */
-    wxCursor GetTextCursor() const { return m_textCursor; }
-
-    /**
-        Sets the cursor to be used over URLs.
-    */
-    void SetURLCursor(const wxCursor& cursor ) { m_urlCursor = cursor; }
-
-    /**
-        Returns the cursor to be used over URLs.
-    */
-    wxCursor GetURLCursor() const { return m_urlCursor; }
-
-    /**
-        Returns @true if we are showing the caret position at the start of a line
-        instead of at the end of the previous one.
-    */
-    bool GetCaretAtLineStart() const { return m_caretAtLineStart; }
-
-    /**
-        Sets a flag to remember that we are showing the caret position at the start of a line
-        instead of at the end of the previous one.
-    */
-    void SetCaretAtLineStart(bool atStart) { m_caretAtLineStart = atStart; }
-
-    /**
-        Returns @true if we are dragging a selection.
-    */
-    bool GetDragging() const { return m_dragging; }
-
-    /**
-        Sets a flag to remember if we are dragging a selection.
-    */
-    void SetDragging(bool dragging) { m_dragging = dragging; }
-
-#if wxUSE_DRAG_AND_DROP
-    /**
-        Are we trying to start Drag'n'Drop?
-    */
-    bool GetPreDrag() const { return m_preDrag; }
-
-    /**
-        Set if we're trying to start Drag'n'Drop
-    */
-    void SetPreDrag(bool pd) { m_preDrag = pd; }
-
-    /**
-        Get the possible Drag'n'Drop start point
-    */
-    const wxPoint GetDragStartPoint() const { return m_dragStartPoint; }
-
-    /**
-        Set the possible Drag'n'Drop start point
-    */
-    void SetDragStartPoint(wxPoint sp) { m_dragStartPoint = sp; }
-
-#if wxUSE_DATETIME
-    /**
-        Get the possible Drag'n'Drop start time
-    */
-    const wxDateTime GetDragStartTime() const { return m_dragStartTime; }
-
-    /**
-        Set the possible Drag'n'Drop start time
-    */
-    void SetDragStartTime(wxDateTime st) { m_dragStartTime = st; }
-#endif // wxUSE_DATETIME
-
-#endif // wxUSE_DRAG_AND_DROP
-
-#if wxRICHTEXT_BUFFERED_PAINTING
-    //@{
-    /**
-        Returns the buffer bitmap if using buffered painting.
-    */
-    const wxBitmap& GetBufferBitmap() const { return m_bufferBitmap; }
-    wxBitmap& GetBufferBitmap() { return m_bufferBitmap; }
-    //@}
-#endif
-
-    /**
-        Returns the current context menu.
-    */
-    wxMenu* GetContextMenu() const { return m_contextMenu; }
-
-    /**
-        Sets the current context menu.
-    */
-    void SetContextMenu(wxMenu* menu);
-
-    /**
-        Returns an anchor so we know how to extend the selection.
-        It's a caret position since it's between two characters.
-    */
-    long GetSelectionAnchor() const { return m_selectionAnchor; }
-
-    /**
-        Sets an anchor so we know how to extend the selection.
-        It's a caret position since it's between two characters.
-    */
-    void SetSelectionAnchor(long anchor) { m_selectionAnchor = anchor; }
-
-    /**
-        Returns the anchor object if selecting multiple containers.
-    */
-    wxRichTextObject* GetSelectionAnchorObject() const { return m_selectionAnchorObject; }
-
-    /**
-        Sets the anchor object if selecting multiple containers.
-    */
-    void SetSelectionAnchorObject(wxRichTextObject* anchor) { m_selectionAnchorObject = anchor; }
-
-    //@{
-    /**
-        Returns an object that stores information about context menu property item(s),
-        in order to communicate between the context menu event handler and the code
-        that responds to it. The wxRichTextContextMenuPropertiesInfo stores one
-        item for each object that could respond to a property-editing event. If
-        objects are nested, several might be editable.
-    */
-    wxRichTextContextMenuPropertiesInfo& GetContextMenuPropertiesInfo() { return m_contextMenuPropertiesInfo; }
-    const wxRichTextContextMenuPropertiesInfo& GetContextMenuPropertiesInfo() const { return m_contextMenuPropertiesInfo; }
-    //@}
-
-    /**
-        Returns the wxRichTextObject object that currently has the editing focus.
-        If there are no composite objects, this will be the top-level buffer.
-    */
-    wxRichTextParagraphLayoutBox* GetFocusObject() const { return m_focusObject; }
-
-    /**
-        Sets m_focusObject without making any alterations.
-    */
-    void StoreFocusObject(wxRichTextParagraphLayoutBox* obj) { m_focusObject = obj; }
-
-    /**
-        Sets the wxRichTextObject object that currently has the editing focus.
-    */
-    bool SetFocusObject(wxRichTextParagraphLayoutBox* obj, bool setCaretPosition = true);
-
-// Operations
-
-    /**
-        Invalidates the whole buffer to trigger painting later.
-    */
-    void Invalidate() { GetBuffer().Invalidate(wxRICHTEXT_ALL); }
-
-    /**
-        Clears the buffer content, leaving a single empty paragraph. Cannot be undone.
-    */
-    virtual void Clear();
-
-    /**
-        Replaces the content in the specified range with the string specified by
-        @a value.
-    */
-    virtual void Replace(long from, long to, const wxString& value);
-
-    /**
-        Removes the content in the specified range.
-    */
-    virtual void Remove(long from, long to);
-
-#ifdef DOXYGEN
-    /**
-        Loads content into the control's buffer using the given type.
-
-        If the specified type is wxRICHTEXT_TYPE_ANY, the type is deduced from
-        the filename extension.
-
-        This function looks for a suitable wxRichTextFileHandler object.
-    */
-    bool LoadFile(const wxString& file,
-                  int type = wxRICHTEXT_TYPE_ANY);
-#endif
-
-#if wxUSE_FFILE && wxUSE_STREAMS
-    /**
-        Helper function for LoadFile(). Loads content into the control's buffer using the given type.
-
-        If the specified type is wxRICHTEXT_TYPE_ANY, the type is deduced from
-        the filename extension.
-
-        This function looks for a suitable wxRichTextFileHandler object.
-    */
-    virtual bool DoLoadFile(const wxString& file, int fileType);
-#endif // wxUSE_FFILE && wxUSE_STREAMS
-
-#ifdef DOXYGEN
-    /**
-        Saves the buffer content using the given type.
-
-        If the specified type is wxRICHTEXT_TYPE_ANY, the type is deduced from
-        the filename extension.
-
-        This function looks for a suitable wxRichTextFileHandler object.
-    */
-    bool SaveFile(const wxString& file = wxEmptyString,
-                  int type = wxRICHTEXT_TYPE_ANY);
-#endif
-
-#if wxUSE_FFILE && wxUSE_STREAMS
-    /**
-        Helper function for SaveFile(). Saves the buffer content using the given type.
-
-        If the specified type is wxRICHTEXT_TYPE_ANY, the type is deduced from
-        the filename extension.
-
-        This function looks for a suitable wxRichTextFileHandler object.
-    */
-    virtual bool DoSaveFile(const wxString& file = wxEmptyString,
-                            int fileType = wxRICHTEXT_TYPE_ANY);
-#endif // wxUSE_FFILE && wxUSE_STREAMS
-
-    /**
-        Sets flags that change the behaviour of loading or saving.
-
-        See the documentation for each handler class to see what flags are
-        relevant for each handler.
-    */
-    void SetHandlerFlags(int flags) { GetBuffer().SetHandlerFlags(flags); }
-
-    /**
-        Returns flags that change the behaviour of loading or saving.
-        See the documentation for each handler class to see what flags are
-        relevant for each handler.
-    */
-    int GetHandlerFlags() const { return GetBuffer().GetHandlerFlags(); }
-
-    /**
-        Marks the buffer as modified.
-    */
-    virtual void MarkDirty();
-
-    /**
-        Sets the buffer's modified status to @false, and clears the buffer's command
-        history.
-    */
-    virtual void DiscardEdits();
-
-    /**
-        Sets the maximum number of characters that may be entered in a single line
-        text control. For compatibility only; currently does nothing.
-    */
-    virtual void SetMaxLength(unsigned long WXUNUSED(len)) { }
-
-    /**
-        Writes text at the current position.
-    */
-    virtual void WriteText(const wxString& text);
-
-    /**
-        Sets the insertion point to the end of the buffer and writes the text.
-    */
-    virtual void AppendText(const wxString& text);
-
-    //@{
-    /**
-        Gets the attributes at the given position.
-        This function gets the combined style - that is, the style you see on the
-        screen as a result of combining base style, paragraph style and character
-        style attributes.
-
-        To get the character or paragraph style alone, use GetUncombinedStyle().
-
-        @beginWxPerlOnly
-        In wxPerl this method is implemented as GetStyle(@a position)
-        returning a 2-element list (ok, attr).
-        @endWxPerlOnly
-    */
-    virtual bool GetStyle(long position, wxTextAttr& style);
-    virtual bool GetStyle(long position, wxRichTextAttr& style);
-    virtual bool GetStyle(long position, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container);
-    //@}
-
-    //@{
-    /**
-        Sets the attributes for the given range.
-        The end point of range is specified as the last character position of the span
-        of text, plus one.
-
-        So, for example, to set the style for a character at position 5, use the range
-        (5,6).
-    */
-    virtual bool SetStyle(long start, long end, const wxTextAttr& style);
-    virtual bool SetStyle(long start, long end, const wxRichTextAttr& style);
-    virtual bool SetStyle(const wxRichTextRange& range, const wxTextAttr& style);
-    virtual bool SetStyle(const wxRichTextRange& range, const wxRichTextAttr& style);
-    //@}
-
-    /**
-        Sets the attributes for a single object
-    */
-    virtual void SetStyle(wxRichTextObject *obj, const wxRichTextAttr& textAttr, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
-
-    //@{
-    /**
-        Gets the attributes common to the specified range.
-        Attributes that differ in value within the range will not be included
-        in @a style flags.
-
-        @beginWxPerlOnly
-        In wxPerl this method is implemented as GetStyleForRange(@a position)
-        returning a 2-element list (ok, attr).
-        @endWxPerlOnly
-    */
-    virtual bool GetStyleForRange(const wxRichTextRange& range, wxTextAttr& style);
-    virtual bool GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style);
-    virtual bool GetStyleForRange(const wxRichTextRange& range, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container);
-    //@}
-
-    /**
-        Sets the attributes for the given range, passing flags to determine how the
-        attributes are set.
-
-        The end point of range is specified as the last character position of the span
-        of text, plus one. So, for example, to set the style for a character at
-        position 5, use the range (5,6).
-
-        @a flags may contain a bit list of the following values:
-        - wxRICHTEXT_SETSTYLE_NONE: no style flag.
-        - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this operation should be
-          undoable.
-        - wxRICHTEXT_SETSTYLE_OPTIMIZE: specifies that the style should not be applied
-          if the combined style at this point is already the style in question.
-        - wxRICHTEXT_SETSTYLE_PARAGRAPHS_ONLY: specifies that the style should only be
-          applied to paragraphs, and not the content.
-          This allows content styling to be preserved independently from that
-          of e.g. a named paragraph style.
-        - wxRICHTEXT_SETSTYLE_CHARACTERS_ONLY: specifies that the style should only be
-          applied to characters, and not the paragraph.
-          This allows content styling to be preserved independently from that
-          of e.g. a named paragraph style.
-        - wxRICHTEXT_SETSTYLE_RESET: resets (clears) the existing style before applying
-          the new style.
-        - wxRICHTEXT_SETSTYLE_REMOVE: removes the specified style. Only the style flags
-          are used in this operation.
-    */
-    virtual bool SetStyleEx(const wxRichTextRange& range, const wxRichTextAttr& style, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
-
-    //@{
-    /**
-        Gets the attributes at the given position.
-        This function gets the @e uncombined style - that is, the attributes associated
-        with the paragraph or character content, and not necessarily the combined
-        attributes you see on the screen.
-        To get the combined attributes, use GetStyle().
-
-        If you specify (any) paragraph attribute in @e style's flags, this function
-        will fetch the paragraph attributes.
-        Otherwise, it will return the character attributes.
-
-        @beginWxPerlOnly
-        In wxPerl this method is implemented as GetUncombinedStyle(@a position)
-        returning a 2-element list (ok, attr).
-        @endWxPerlOnly
-    */
-    virtual bool GetUncombinedStyle(long position, wxRichTextAttr& style);
-    virtual bool GetUncombinedStyle(long position, wxRichTextAttr& style, wxRichTextParagraphLayoutBox* container);
-    //@}
-
-    //@{
-    /**
-        Sets the current default style, which can be used to change how subsequently
-        inserted text is displayed.
-    */
-    virtual bool SetDefaultStyle(const wxTextAttr& style);
-    virtual bool SetDefaultStyle(const wxRichTextAttr& style);
-    //@}
-
-    /**
-        Returns the current default style, which can be used to change how subsequently
-        inserted text is displayed.
-    */
-    virtual const wxRichTextAttr& GetDefaultStyleEx() const;
-
-    //virtual const wxTextAttr& GetDefaultStyle() const;
-
-    //@{
-    /**
-        Sets the list attributes for the given range, passing flags to determine how
-        the attributes are set.
-
-        Either the style definition or the name of the style definition (in the current
-        sheet) can be passed.
-        @a flags is a bit list of the following:
-        - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable.
-        - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from
-          @a startFrom, otherwise existing attributes are used.
-        - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used
-          as the level for all paragraphs, otherwise the current indentation will be used.
-
-        @see NumberList(), PromoteList(), ClearListStyle().
-    */
-    virtual bool SetListStyle(const wxRichTextRange& range, wxRichTextListStyleDefinition* def, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1);
-    virtual bool SetListStyle(const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1);
-    //@}
-
-    /**
-        Clears the list style from the given range, clearing list-related attributes
-        and applying any named paragraph style associated with each paragraph.
-
-        @a flags is a bit list of the following:
-        - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable.
-
-        @see SetListStyle(), PromoteList(), NumberList().
-    */
-    virtual bool ClearListStyle(const wxRichTextRange& range, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
-
-    //@{
-    /**
-        Numbers the paragraphs in the given range.
-        Pass flags to determine how the attributes are set.
-
-        Either the style definition or the name of the style definition (in the current
-        sheet) can be passed.
-
-        @a flags is a bit list of the following:
-        - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable.
-        - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from
-          @a startFrom, otherwise existing attributes are used.
-        - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used
-          as the level for all paragraphs, otherwise the current indentation will be used.
-
-        @see SetListStyle(), PromoteList(), ClearListStyle().
-    */
-    virtual bool NumberList(const wxRichTextRange& range, wxRichTextListStyleDefinition* def = NULL, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1);
-    virtual bool NumberList(const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int startFrom = 1, int specifiedLevel = -1);
-    //@}
-
-    //@{
-    /**
-        Promotes or demotes the paragraphs in the given range.
-        A positive @a promoteBy produces a smaller indent, and a negative number
-        produces a larger indent. Pass flags to determine how the attributes are set.
-        Either the style definition or the name of the style definition (in the current
-        sheet) can be passed.
-
-        @a flags is a bit list of the following:
-        - wxRICHTEXT_SETSTYLE_WITH_UNDO: specifies that this command will be undoable.
-        - wxRICHTEXT_SETSTYLE_RENUMBER: specifies that numbering should start from
-          @a startFrom, otherwise existing attributes are used.
-        - wxRICHTEXT_SETSTYLE_SPECIFY_LEVEL: specifies that @a listLevel should be used
-        as the level for all paragraphs, otherwise the current indentation will be used.
-
-        @see SetListStyle(), @see SetListStyle(), ClearListStyle().
-    */
-    virtual bool PromoteList(int promoteBy, const wxRichTextRange& range, wxRichTextListStyleDefinition* def = NULL, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int specifiedLevel = -1);
-    virtual bool PromoteList(int promoteBy, const wxRichTextRange& range, const wxString& defName, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO, int specifiedLevel = -1);
-    //@}
-
-    /**
-        Sets the properties for the given range, passing flags to determine how the
-        attributes are set. You can merge properties or replace them.
-
-        The end point of range is specified as the last character position of the span
-        of text, plus one. So, for example, to set the properties for a character at
-        position 5, use the range (5,6).
-
-        @a flags may contain a bit list of the following values:
-        - wxRICHTEXT_SETSPROPERTIES_NONE: no flag.
-        - wxRICHTEXT_SETPROPERTIES_WITH_UNDO: specifies that this operation should be
-          undoable.
-        - wxRICHTEXT_SETPROPERTIES_PARAGRAPHS_ONLY: specifies that the properties should only be
-          applied to paragraphs, and not the content.
-        - wxRICHTEXT_SETPROPERTIES_CHARACTERS_ONLY: specifies that the properties should only be
-          applied to characters, and not the paragraph.
-        - wxRICHTEXT_SETPROPERTIES_RESET: resets (clears) the existing properties before applying
-          the new properties.
-        - wxRICHTEXT_SETPROPERTIES_REMOVE: removes the specified properties.
-    */
-    virtual bool SetProperties(const wxRichTextRange& range, const wxRichTextProperties& properties, int flags = wxRICHTEXT_SETPROPERTIES_WITH_UNDO);
-
-    /**
-        Deletes the content within the given range.
-    */
-    virtual bool Delete(const wxRichTextRange& range);
-
-    /**
-        Translates from column and line number to position.
-    */
-    virtual long XYToPosition(long x, long y) const;
-
-    /**
-        Converts a text position to zero-based column and line numbers.
-    */
-    virtual bool PositionToXY(long pos, long *x, long *y) const;
-
-    /**
-        Scrolls the buffer so that the given position is in view.
-    */
-    virtual void ShowPosition(long pos);
-
-    //@{
-    /**
-        Finds the character at the given position in pixels.
-        @a pt is in device coords (not adjusted for the client area origin nor for
-        scrolling).
-    */
-    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const;
-    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
-                                            wxTextCoord *col,
-                                            wxTextCoord *row) const;
-
-    /**
-        Finds the container at the given point, which is in screen coordinates.
-    */
-    wxRichTextParagraphLayoutBox* FindContainerAtPoint(const wxPoint pt, long& position, int& hit, wxRichTextObject* hitObj, int flags = 0);
-    //@}
-
-#if wxUSE_DRAG_AND_DROP
-    /**
-        Does the 'drop' of Drag'n'Drop.
-    */
-    void OnDrop(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y), wxDragResult def, wxDataObject* DataObj);
-#endif
-
-// Clipboard operations
-
-    /**
-        Copies the selected content (if any) to the clipboard.
-    */
-    virtual void Copy();
-
-    /**
-        Copies the selected content (if any) to the clipboard and deletes the selection.
-        This is undoable.
-    */
-    virtual void Cut();
-
-    /**
-        Pastes content from the clipboard to the buffer.
-    */
-    virtual void Paste();
-
-    /**
-        Deletes the content in the selection, if any. This is undoable.
-    */
-    virtual void DeleteSelection();
-
-    /**
-        Returns @true if selected content can be copied to the clipboard.
-    */
-    virtual bool CanCopy() const;
-
-    /**
-        Returns @true if selected content can be copied to the clipboard and deleted.
-    */
-    virtual bool CanCut() const;
-
-    /**
-        Returns @true if the clipboard content can be pasted to the buffer.
-    */
-    virtual bool CanPaste() const;
-
-    /**
-        Returns @true if selected content can be deleted.
-    */
-    virtual bool CanDeleteSelection() const;
-
-    /**
-        Undoes the command at the top of the command history, if there is one.
-    */
-    virtual void Undo();
-
-    /**
-        Redoes the current command.
-    */
-    virtual void Redo();
-
-    /**
-        Returns @true if there is a command in the command history that can be undone.
-    */
-    virtual bool CanUndo() const;
-
-    /**
-        Returns @true if there is a command in the command history that can be redone.
-    */
-    virtual bool CanRedo() const;
-
-    /**
-        Sets the insertion point and causes the current editing style to be taken from
-        the new position (unlike wxRichTextCtrl::SetCaretPosition).
-    */
-    virtual void SetInsertionPoint(long pos);
-
-    /**
-        Sets the insertion point to the end of the text control.
-    */
-    virtual void SetInsertionPointEnd();
-
-    /**
-        Returns the current insertion point.
-    */
-    virtual long GetInsertionPoint() const;
-
-    /**
-        Returns the last position in the buffer.
-    */
-    virtual wxTextPos GetLastPosition() const;
-
-    //@{
-    /**
-        Sets the selection to the given range.
-        The end point of range is specified as the last character position of the span
-        of text, plus one.
-
-        So, for example, to set the selection for a character at position 5, use the
-        range (5,6).
-    */
-    virtual void SetSelection(long from, long to);
-    void SetSelection(const wxRichTextSelection& sel) { m_selection = sel; }
-    //@}
-
-    /**
-        Makes the control editable, or not.
-    */
-    virtual void SetEditable(bool editable);
-
-    /**
-        Returns @true if there is a selection and the object containing the selection
-        was the same as the current focus object.
-    */
-    virtual bool HasSelection() const;
-
-    /**
-        Returns @true if there was a selection, whether or not the current focus object
-        is the same as the selection's container object.
-    */
-    virtual bool HasUnfocusedSelection() const;
-
-    //@{
-    /**
-        Write a bitmap or image at the current insertion point.
-        Supply an optional type to use for internal and file storage of the raw data.
-    */
-    virtual bool WriteImage(const wxImage& image, wxBitmapType bitmapType = wxBITMAP_TYPE_PNG,
-                            const wxRichTextAttr& textAttr = wxRichTextAttr());
-
-    virtual bool WriteImage(const wxBitmap& bitmap, wxBitmapType bitmapType = wxBITMAP_TYPE_PNG,
-                            const wxRichTextAttr& textAttr = wxRichTextAttr());
-    //@}
-
-    /**
-        Loads an image from a file and writes it at the current insertion point.
-    */
-    virtual bool WriteImage(const wxString& filename, wxBitmapType bitmapType,
-                            const wxRichTextAttr& textAttr = wxRichTextAttr());
-
-    /**
-        Writes an image block at the current insertion point.
-    */
-    virtual bool WriteImage(const wxRichTextImageBlock& imageBlock,
-                            const wxRichTextAttr& textAttr = wxRichTextAttr());
-
-    /**
-        Write a text box at the current insertion point, returning the text box.
-        You can then call SetFocusObject() to set the focus to the new object.
-    */
-    virtual wxRichTextBox* WriteTextBox(const wxRichTextAttr& textAttr = wxRichTextAttr());
-
-    /**
-        Writes a field at the current insertion point.
-
-        @param fieldType
-            The field type, matching an existing field type definition.
-        @param properties
-            Extra data for the field.
-        @param textAttr
-            Optional attributes.
-
-        @see wxRichTextField, wxRichTextFieldType, wxRichTextFieldTypeStandard
-    */
-    virtual wxRichTextField* WriteField(const wxString& fieldType, const wxRichTextProperties& properties,
-                            const wxRichTextAttr& textAttr = wxRichTextAttr());
-
-    /**
-        Write a table at the current insertion point, returning the table.
-        You can then call SetFocusObject() to set the focus to the new object.
-    */
-    virtual wxRichTextTable* WriteTable(int rows, int cols, const wxRichTextAttr& tableAttr = wxRichTextAttr(), const wxRichTextAttr& cellAttr = wxRichTextAttr());
-
-    /**
-        Inserts a new paragraph at the current insertion point. @see LineBreak().
-    */
-    virtual bool Newline();
-
-    /**
-        Inserts a line break at the current insertion point.
-
-        A line break forces wrapping within a paragraph, and can be introduced by
-        using this function, by appending the wxChar value @b  wxRichTextLineBreakChar
-        to text content, or by typing Shift-Return.
-    */
-    virtual bool LineBreak();
-
-    /**
-        Sets the basic (overall) style.
-
-        This is the style of the whole buffer before further styles are applied,
-        unlike the default style, which only affects the style currently being
-        applied (for example, setting the default style to bold will cause
-        subsequently inserted text to be bold).
-    */
-    virtual void SetBasicStyle(const wxRichTextAttr& style) { GetBuffer().SetBasicStyle(style); }
-
-    /**
-        Gets the basic (overall) style.
-
-        This is the style of the whole buffer before further styles are applied,
-        unlike the default style, which only affects the style currently being
-        applied (for example, setting the default style to bold will cause
-        subsequently inserted text to be bold).
-    */
-    virtual const wxRichTextAttr& GetBasicStyle() const { return GetBuffer().GetBasicStyle(); }
-
-    /**
-        Begins applying a style.
-    */
-    virtual bool BeginStyle(const wxRichTextAttr& style) { return GetBuffer().BeginStyle(style); }
-
-    /**
-        Ends the current style.
-    */
-    virtual bool EndStyle() { return GetBuffer().EndStyle(); }
-
-    /**
-        Ends application of all styles in the current style stack.
-    */
-    virtual bool EndAllStyles() { return GetBuffer().EndAllStyles(); }
-
-    /**
-        Begins using bold.
-    */
-    bool BeginBold() { return GetBuffer().BeginBold(); }
-
-    /**
-        Ends using bold.
-    */
-    bool EndBold()  { return GetBuffer().EndBold(); }
-
-    /**
-        Begins using italic.
-    */
-    bool BeginItalic() { return GetBuffer().BeginItalic(); }
-
-    /**
-        Ends using italic.
-    */
-    bool EndItalic() { return GetBuffer().EndItalic(); }
-
-    /**
-        Begins using underlining.
-    */
-    bool BeginUnderline() { return GetBuffer().BeginUnderline(); }
-
-    /**
-        End applying underlining.
-    */
-    bool EndUnderline() { return GetBuffer().EndUnderline(); }
-
-    /**
-        Begins using the given point size.
-    */
-    bool BeginFontSize(int pointSize) { return GetBuffer().BeginFontSize(pointSize); }
-
-    /**
-        Ends using a point size.
-    */
-    bool EndFontSize() { return GetBuffer().EndFontSize(); }
-
-    /**
-        Begins using this font.
-    */
-    bool BeginFont(const wxFont& font) { return GetBuffer().BeginFont(font); }
-
-    /**
-        Ends using a font.
-    */
-    bool EndFont() { return GetBuffer().EndFont(); }
-
-    /**
-        Begins using this colour.
-    */
-    bool BeginTextColour(const wxColour& colour) { return GetBuffer().BeginTextColour(colour); }
-
-    /**
-        Ends applying a text colour.
-    */
-    bool EndTextColour() { return GetBuffer().EndTextColour(); }
-
-    /**
-        Begins using alignment.
-        For alignment values, see wxTextAttr.
-    */
-    bool BeginAlignment(wxTextAttrAlignment alignment) { return GetBuffer().BeginAlignment(alignment); }
-
-    /**
-        Ends alignment.
-    */
-    bool EndAlignment() { return GetBuffer().EndAlignment(); }
-
-    /**
-        Begins applying a left indent and subindent in tenths of a millimetre.
-        The subindent is an offset from the left edge of the paragraph, and is
-        used for all but the first line in a paragraph. A positive value will
-        cause the first line to appear to the left of the subsequent lines, and
-        a negative value will cause the first line to be indented to the right
-        of the subsequent lines.
-
-        wxRichTextBuffer uses indentation to render a bulleted item. The
-        content of the paragraph, including the first line, starts at the
-        @a leftIndent plus the @a leftSubIndent.
-
-        @param leftIndent
-            The distance between the margin and the bullet.
-        @param leftSubIndent
-             The distance between the left edge of the bullet and the left edge
-             of the actual paragraph.
-    */
-    bool BeginLeftIndent(int leftIndent, int leftSubIndent = 0) { return GetBuffer().BeginLeftIndent(leftIndent, leftSubIndent); }
-
-    /**
-        Ends left indent.
-    */
-    bool EndLeftIndent() { return GetBuffer().EndLeftIndent(); }
-
-    /**
-        Begins a right indent, specified in tenths of a millimetre.
-    */
-    bool BeginRightIndent(int rightIndent) { return GetBuffer().BeginRightIndent(rightIndent); }
-
-    /**
-        Ends right indent.
-    */
-    bool EndRightIndent() { return GetBuffer().EndRightIndent(); }
-
-    /**
-        Begins paragraph spacing; pass the before-paragraph and after-paragraph spacing
-        in tenths of a millimetre.
-    */
-    bool BeginParagraphSpacing(int before, int after) { return GetBuffer().BeginParagraphSpacing(before, after); }
-
-    /**
-        Ends paragraph spacing.
-    */
-    bool EndParagraphSpacing() { return GetBuffer().EndParagraphSpacing(); }
-
-    /**
-        Begins appling line spacing. @e spacing is a multiple, where 10 means
-        single-spacing, 15 means 1.5 spacing, and 20 means double spacing.
-
-        The ::wxTextAttrLineSpacing constants are defined for convenience.
-    */
-    bool BeginLineSpacing(int lineSpacing) { return GetBuffer().BeginLineSpacing(lineSpacing); }
-
-    /**
-        Ends line spacing.
-    */
-    bool EndLineSpacing() { return GetBuffer().EndLineSpacing(); }
-
-    /**
-        Begins a numbered bullet.
-
-        This call will be needed for each item in the list, and the
-        application should take care of incrementing the numbering.
-
-        @a bulletNumber is a number, usually starting with 1.
-        @a leftIndent and @a leftSubIndent are values in tenths of a millimetre.
-        @a bulletStyle is a bitlist of the  ::wxTextAttrBulletStyle values.
-
-        wxRichTextBuffer uses indentation to render a bulleted item.
-        The left indent is the distance between the margin and the bullet.
-        The content of the paragraph, including the first line, starts
-        at leftMargin + leftSubIndent.
-        So the distance between the left edge of the bullet and the
-        left of the actual paragraph is leftSubIndent.
-    */
-    bool BeginNumberedBullet(int bulletNumber, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_ARABIC|wxTEXT_ATTR_BULLET_STYLE_PERIOD)
-    { return GetBuffer().BeginNumberedBullet(bulletNumber, leftIndent, leftSubIndent, bulletStyle); }
-
-    /**
-        Ends application of a numbered bullet.
-    */
-    bool EndNumberedBullet() { return GetBuffer().EndNumberedBullet(); }
-
-    /**
-        Begins applying a symbol bullet, using a character from the current font.
-        See BeginNumberedBullet() for an explanation of how indentation is used
-        to render the bulleted paragraph.
-    */
-    bool BeginSymbolBullet(const wxString& symbol, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_SYMBOL)
-    { return GetBuffer().BeginSymbolBullet(symbol, leftIndent, leftSubIndent, bulletStyle); }
-
-    /**
-        Ends applying a symbol bullet.
-    */
-    bool EndSymbolBullet() { return GetBuffer().EndSymbolBullet(); }
-
-    /**
-        Begins applying a symbol bullet.
-    */
-    bool BeginStandardBullet(const wxString& bulletName, int leftIndent, int leftSubIndent, int bulletStyle = wxTEXT_ATTR_BULLET_STYLE_STANDARD)
-    { return GetBuffer().BeginStandardBullet(bulletName, leftIndent, leftSubIndent, bulletStyle); }
-
-    /**
-        Begins applying a standard bullet.
-    */
-    bool EndStandardBullet() { return GetBuffer().EndStandardBullet(); }
-
-    /**
-        Begins using the named character style.
-    */
-    bool BeginCharacterStyle(const wxString& characterStyle) { return GetBuffer().BeginCharacterStyle(characterStyle); }
-
-    /**
-        Ends application of a named character style.
-    */
-    bool EndCharacterStyle() { return GetBuffer().EndCharacterStyle(); }
-
-    /**
-        Begins applying the named paragraph style.
-    */
-    bool BeginParagraphStyle(const wxString& paragraphStyle) { return GetBuffer().BeginParagraphStyle(paragraphStyle); }
-
-    /**
-        Ends application of a named paragraph style.
-    */
-    bool EndParagraphStyle() { return GetBuffer().EndParagraphStyle(); }
-
-    /**
-        Begins using a specified list style.
-        Optionally, you can also pass a level and a number.
-    */
-    bool BeginListStyle(const wxString& listStyle, int level = 1, int number = 1) { return GetBuffer().BeginListStyle(listStyle, level, number); }
-
-    /**
-        Ends using a specified list style.
-    */
-    bool EndListStyle() { return GetBuffer().EndListStyle(); }
-
-    /**
-        Begins applying wxTEXT_ATTR_URL to the content.
-
-        Pass a URL and optionally, a character style to apply, since it is common
-        to mark a URL with a familiar style such as blue text with underlining.
-    */
-    bool BeginURL(const wxString& url, const wxString& characterStyle = wxEmptyString) { return GetBuffer().BeginURL(url, characterStyle); }
-
-    /**
-        Ends applying a URL.
-    */
-    bool EndURL() { return GetBuffer().EndURL(); }
-
-    /**
-        Sets the default style to the style under the cursor.
-    */
-    bool SetDefaultStyleToCursorStyle();
-
-    /**
-        Cancels any selection.
-    */
-    virtual void SelectNone();
-
-    /**
-        Selects the word at the given character position.
-    */
-    virtual bool SelectWord(long position);
-
-    /**
-        Returns the selection range in character positions. -1, -1 means no selection.
-
-        The range is in API convention, i.e. a single character selection is denoted
-        by (n, n+1)
-    */
-    wxRichTextRange GetSelectionRange() const;
-
-    /**
-        Sets the selection to the given range.
-        The end point of range is specified as the last character position of the span
-        of text, plus one.
-
-        So, for example, to set the selection for a character at position 5, use the
-        range (5,6).
-    */
-    void SetSelectionRange(const wxRichTextRange& range);
-
-    /**
-        Returns the selection range in character positions. -2, -2 means no selection
-        -1, -1 means select everything.
-        The range is in internal format, i.e. a single character selection is denoted
-        by (n, n)
-    */
-    wxRichTextRange GetInternalSelectionRange() const { return m_selection.GetRange(); }
-
-    /**
-        Sets the selection range in character positions. -2, -2 means no selection
-        -1, -1 means select everything.
-        The range is in internal format, i.e. a single character selection is denoted
-        by (n, n)
-    */
-    void SetInternalSelectionRange(const wxRichTextRange& range) { m_selection.Set(range, GetFocusObject()); }
-
-    /**
-        Adds a new paragraph of text to the end of the buffer.
-    */
-    virtual wxRichTextRange AddParagraph(const wxString& text);
-
-    /**
-        Adds an image to the control's buffer.
-    */
-    virtual wxRichTextRange AddImage(const wxImage& image);
-
-    /**
-        Lays out the buffer, which must be done before certain operations, such as
-        setting the caret position.
-        This function should not normally be required by the application.
-    */
-    virtual bool LayoutContent(bool onlyVisibleRect = false);
-
-    /**
-        Move the caret to the given character position.
-
-        Please note that this does not update the current editing style
-        from the new position; to do that, call wxRichTextCtrl::SetInsertionPoint instead.
-    */
-    virtual bool MoveCaret(long pos, bool showAtLineStart = false, wxRichTextParagraphLayoutBox* container = NULL);
-
-    /**
-        Moves right.
-    */
-    virtual bool MoveRight(int noPositions = 1, int flags = 0);
-
-    /**
-        Moves left.
-    */
-    virtual bool MoveLeft(int noPositions = 1, int flags = 0);
-
-    /**
-        Moves to the start of the paragraph.
-    */
-    virtual bool MoveUp(int noLines = 1, int flags = 0);
-
-    /**
-        Moves the caret down.
-    */
-    virtual bool MoveDown(int noLines = 1, int flags = 0);
-
-    /**
-        Moves to the end of the line.
-    */
-    virtual bool MoveToLineEnd(int flags = 0);
-
-    /**
-        Moves to the start of the line.
-    */
-    virtual bool MoveToLineStart(int flags = 0);
-
-    /**
-        Moves to the end of the paragraph.
-    */
-    virtual bool MoveToParagraphEnd(int flags = 0);
-
-    /**
-        Moves to the start of the paragraph.
-    */
-    virtual bool MoveToParagraphStart(int flags = 0);
-
-    /**
-        Moves to the start of the buffer.
-    */
-    virtual bool MoveHome(int flags = 0);
-
-    /**
-        Moves to the end of the buffer.
-    */
-    virtual bool MoveEnd(int flags = 0);
-
-    /**
-        Moves one or more pages up.
-    */
-    virtual bool PageUp(int noPages = 1, int flags = 0);
-
-    /**
-        Moves one or more pages down.
-    */
-    virtual bool PageDown(int noPages = 1, int flags = 0);
-
-    /**
-        Moves a number of words to the left.
-    */
-    virtual bool WordLeft(int noPages = 1, int flags = 0);
-
-    /**
-        Move a nuber of words to the right.
-    */
-    virtual bool WordRight(int noPages = 1, int flags = 0);
-
-    //@{
-    /**
-        Returns the buffer associated with the control.
-    */
-    wxRichTextBuffer& GetBuffer() { return m_buffer; }
-    const wxRichTextBuffer& GetBuffer() const { return m_buffer; }
-    //@}
-
-    /**
-        Starts batching undo history for commands.
-    */
-    virtual bool BeginBatchUndo(const wxString& cmdName) { return m_buffer.BeginBatchUndo(cmdName); }
-
-    /**
-        Ends batching undo command history.
-    */
-    virtual bool EndBatchUndo() { return m_buffer.EndBatchUndo(); }
-
-    /**
-        Returns @true if undo commands are being batched.
-    */
-    virtual bool BatchingUndo() const { return m_buffer.BatchingUndo(); }
-
-    /**
-        Starts suppressing undo history for commands.
-    */
-    virtual bool BeginSuppressUndo() { return m_buffer.BeginSuppressUndo(); }
-
-    /**
-        Ends suppressing undo command history.
-    */
-    virtual bool EndSuppressUndo() { return m_buffer.EndSuppressUndo(); }
-
-    /**
-        Returns @true if undo history suppression is on.
-    */
-    virtual bool SuppressingUndo() const { return m_buffer.SuppressingUndo(); }
-
-    /**
-        Test if this whole range has character attributes of the specified kind.
-        If any of the attributes are different within the range, the test fails.
-
-        You can use this to implement, for example, bold button updating.
-        @a style must have flags indicating which attributes are of interest.
-    */
-    virtual bool HasCharacterAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const
-    {
-        return GetFocusObject()->HasCharacterAttributes(range.ToInternal(), style);
-    }
-
-    /**
-        Test if this whole range has paragraph attributes of the specified kind.
-        If any of the attributes are different within the range, the test fails.
-        You can use this to implement, for example, centering button updating.
-        @a style must have flags indicating which attributes are of interest.
-    */
-    virtual bool HasParagraphAttributes(const wxRichTextRange& range, const wxRichTextAttr& style) const
-    {
-        return GetFocusObject()->HasParagraphAttributes(range.ToInternal(), style);
-    }
-
-    /**
-        Returns @true if all of the selection, or the content at the caret position, is bold.
-    */
-    virtual bool IsSelectionBold();
-
-    /**
-        Returns @true if all of the selection, or the content at the caret position, is italic.
-    */
-    virtual bool IsSelectionItalics();
-
-    /**
-        Returns @true if all of the selection, or the content at the caret position, is underlined.
-    */
-    virtual bool IsSelectionUnderlined();
-
-    /**
-        Returns @true if all of the selection, or the content at the current caret position, has the supplied wxTextAttrEffects flag(s).
-    */
-    virtual bool DoesSelectionHaveTextEffectFlag(int flag);
-
-    /**
-        Returns @true if all of the selection, or the content at the caret position, is aligned according to the specified flag.
-    */
-    virtual bool IsSelectionAligned(wxTextAttrAlignment alignment);
-
-    /**
-        Apples bold to the selection or default style (undoable).
-    */
-    virtual bool ApplyBoldToSelection();
-
-    /**
-        Applies italic to the selection or default style (undoable).
-    */
-    virtual bool ApplyItalicToSelection();
-
-    /**
-        Applies underline to the selection or default style (undoable).
-    */
-    virtual bool ApplyUnderlineToSelection();
-
-    /**
-        Applies one or more wxTextAttrEffects flags to the selection (undoable).
-        If there is no selection, it is applied to the default style.
-    */
-    virtual bool ApplyTextEffectToSelection(int flags);
-
-    /**
-        Applies the given alignment to the selection or the default style (undoable).
-        For alignment values, see wxTextAttr.
-    */
-    virtual bool ApplyAlignmentToSelection(wxTextAttrAlignment alignment);
-
-    /**
-        Applies the style sheet to the buffer, matching paragraph styles in the sheet
-        against named styles in the buffer.
-
-        This might be useful if the styles have changed.
-        If @a sheet is @NULL, the sheet set with SetStyleSheet() is used.
-        Currently this applies paragraph styles only.
-    */
-    virtual bool ApplyStyle(wxRichTextStyleDefinition* def);
-
-    /**
-        Sets the style sheet associated with the control.
-        A style sheet allows named character and paragraph styles to be applied.
-    */
-    void SetStyleSheet(wxRichTextStyleSheet* styleSheet) { GetBuffer().SetStyleSheet(styleSheet); }
-
-    /**
-        Returns the style sheet associated with the control, if any.
-        A style sheet allows named character and paragraph styles to be applied.
-    */
-    wxRichTextStyleSheet* GetStyleSheet() const { return GetBuffer().GetStyleSheet(); }
-
-    /**
-        Push the style sheet to top of stack.
-    */
-    bool PushStyleSheet(wxRichTextStyleSheet* styleSheet) { return GetBuffer().PushStyleSheet(styleSheet); }
-
-    /**
-        Pops the style sheet from top of stack.
-    */
-    wxRichTextStyleSheet* PopStyleSheet() { return GetBuffer().PopStyleSheet(); }
-
-    /**
-        Applies the style sheet to the buffer, for example if the styles have changed.
-    */
-    bool ApplyStyleSheet(wxRichTextStyleSheet* styleSheet = NULL);
-
-    /**
-        Shows the given context menu, optionally adding appropriate property-editing commands for the current position in the object hierarchy.
-    */
-    virtual bool ShowContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands = true);
-
-    /**
-        Prepares the context menu, optionally adding appropriate property-editing commands.
-        Returns the number of property commands added.
-    */
-    virtual int PrepareContextMenu(wxMenu* menu, const wxPoint& pt, bool addPropertyCommands = true);
-
-    /**
-        Returns @true if we can edit the object's properties via a GUI.
-    */
-    virtual bool CanEditProperties(wxRichTextObject* obj) const { return obj->CanEditProperties(); }
-
-    /**
-        Edits the object's properties via a GUI.
-    */
-    virtual bool EditProperties(wxRichTextObject* obj, wxWindow* parent) { return obj->EditProperties(parent, & GetBuffer()); }
-
-    /**
-        Gets the object's properties menu label.
-    */
-    virtual wxString GetPropertiesMenuLabel(wxRichTextObject* obj) { return obj->GetPropertiesMenuLabel(); }
-
-    /**
-        Prepares the content just before insertion (or after buffer reset). Called by the same function in wxRichTextBuffer.
-        Currently is only called if undo mode is on.
-    */
-    virtual void PrepareContent(wxRichTextParagraphLayoutBox& WXUNUSED(container)) {}
-
-    /**
-        Can we delete this range?
-        Sends an event to the control.
-    */
-    virtual bool CanDeleteRange(wxRichTextParagraphLayoutBox& container, const wxRichTextRange& range) const;
-
-    /**
-        Can we insert content at this position?
-        Sends an event to the control.
-    */
-    virtual bool CanInsertContent(wxRichTextParagraphLayoutBox& container, long pos) const;
-
-    /**
-        Enable or disable the vertical scrollbar.
-    */
-    virtual void EnableVerticalScrollbar(bool enable);
-
-    /**
-        Returns @true if the vertical scrollbar is enabled.
-    */
-    virtual bool GetVerticalScrollbarEnabled() const { return m_verticalScrollbarEnabled; }
-
-    /**
-        Sets the scale factor for displaying fonts, for example for more comfortable
-        editing.
-    */
-    void SetFontScale(double fontScale, bool refresh = false);
-
-    /**
-        Returns the scale factor for displaying fonts, for example for more comfortable
-        editing.
-    */
-    double GetFontScale() const { return GetBuffer().GetFontScale(); }
-
-    /**
-        Sets the scale factor for displaying certain dimensions such as indentation and
-        inter-paragraph spacing. This can be useful when editing in a small control
-        where you still want legible text, but a minimum of wasted white space.
-    */
-    void SetDimensionScale(double dimScale, bool refresh = false);
-
-    /**
-        Returns the scale factor for displaying certain dimensions such as indentation
-        and inter-paragraph spacing.
-    */
-    double GetDimensionScale() const { return GetBuffer().GetDimensionScale(); }
-
-    /**
-        Sets an overall scale factor for displaying and editing the content.
-    */
-    void SetScale(double scale, bool refresh = false);
-
-    /**
-        Returns an overall scale factor for displaying and editing the content.
-    */
-    double GetScale() const { return m_scale; }
-
-    /**
-        Returns an unscaled point.
-    */
-    wxPoint GetUnscaledPoint(const wxPoint& pt) const;
-
-    /**
-        Returns a scaled point.
-    */
-    wxPoint GetScaledPoint(const wxPoint& pt) const;
-
-    /**
-        Returns an unscaled size.
-    */
-    wxSize GetUnscaledSize(const wxSize& sz) const;
-
-    /**
-        Returns a scaled size.
-    */
-    wxSize GetScaledSize(const wxSize& sz) const;
-
-    /**
-        Returns an unscaled rectangle.
-    */
-    wxRect GetUnscaledRect(const wxRect& rect) const;
-
-    /**
-        Returns a scaled rectangle.
-    */
-    wxRect GetScaledRect(const wxRect& rect) const;
-
-    /**
-        Returns @true if this control can use virtual attributes and virtual text.
-        The default is @false.
-    */
-    bool GetVirtualAttributesEnabled() const { return m_useVirtualAttributes; }
-
-    /**
-        Pass @true to let the control use virtual attributes.
-        The default is @false.
-    */
-    void EnableVirtualAttributes(bool b) { m_useVirtualAttributes = b; }
-
-// Command handlers
-
-    /**
-        Sends the event to the control.
-    */
-    void Command(wxCommandEvent& event);
-
-    /**
-        Loads the first dropped file.
-    */
-    void OnDropFiles(wxDropFilesEvent& event);
-
-    void OnCaptureLost(wxMouseCaptureLostEvent& event);
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-    /**
-        Standard handler for the wxID_CUT command.
-    */
-    void OnCut(wxCommandEvent& event);
-
-    /**
-        Standard handler for the wxID_COPY command.
-    */
-    void OnCopy(wxCommandEvent& event);
-
-    /**
-        Standard handler for the wxID_PASTE command.
-    */
-    void OnPaste(wxCommandEvent& event);
-
-    /**
-        Standard handler for the wxID_UNDO command.
-    */
-    void OnUndo(wxCommandEvent& event);
-
-    /**
-        Standard handler for the wxID_REDO command.
-    */
-    void OnRedo(wxCommandEvent& event);
-
-    /**
-        Standard handler for the wxID_SELECTALL command.
-    */
-    void OnSelectAll(wxCommandEvent& event);
-
-    /**
-        Standard handler for property commands.
-    */
-    void OnProperties(wxCommandEvent& event);
-
-    /**
-        Standard handler for the wxID_CLEAR command.
-    */
-    void OnClear(wxCommandEvent& event);
-
-    /**
-        Standard update handler for the wxID_CUT command.
-    */
-    void OnUpdateCut(wxUpdateUIEvent& event);
-
-    /**
-        Standard update handler for the wxID_COPY command.
-    */
-    void OnUpdateCopy(wxUpdateUIEvent& event);
-
-    /**
-        Standard update handler for the wxID_PASTE command.
-    */
-    void OnUpdatePaste(wxUpdateUIEvent& event);
-
-    /**
-        Standard update handler for the wxID_UNDO command.
-    */
-    void OnUpdateUndo(wxUpdateUIEvent& event);
-
-    /**
-        Standard update handler for the wxID_REDO command.
-    */
-    void OnUpdateRedo(wxUpdateUIEvent& event);
-
-    /**
-        Standard update handler for the wxID_SELECTALL command.
-    */
-    void OnUpdateSelectAll(wxUpdateUIEvent& event);
-
-    /**
-        Standard update handler for property commands.
-    */
-
-    void OnUpdateProperties(wxUpdateUIEvent& event);
-
-    /**
-        Standard update handler for the wxID_CLEAR command.
-    */
-    void OnUpdateClear(wxUpdateUIEvent& event);
-
-    /**
-        Shows a standard context menu with undo, redo, cut, copy, paste, clear, and
-        select all commands.
-    */
-    void OnContextMenu(wxContextMenuEvent& event);
-
-// Event handlers
-
-    // Painting
-    void OnPaint(wxPaintEvent& event);
-    void OnEraseBackground(wxEraseEvent& event);
-
-    // Left-click
-    void OnLeftClick(wxMouseEvent& event);
-
-    // Left-up
-    void OnLeftUp(wxMouseEvent& event);
-
-    // Motion
-    void OnMoveMouse(wxMouseEvent& event);
-
-    // Left-double-click
-    void OnLeftDClick(wxMouseEvent& event);
-
-    // Middle-click
-    void OnMiddleClick(wxMouseEvent& event);
-
-    // Right-click
-    void OnRightClick(wxMouseEvent& event);
-
-    // Key press
-    void OnChar(wxKeyEvent& event);
-
-    // Sizing
-    void OnSize(wxSizeEvent& event);
-
-    // Setting/losing focus
-    void OnSetFocus(wxFocusEvent& event);
-    void OnKillFocus(wxFocusEvent& event);
-
-    // Idle-time processing
-    void OnIdle(wxIdleEvent& event);
-
-    // Scrolling
-    void OnScroll(wxScrollWinEvent& event);
-
-    /**
-        Sets the font, and also the basic and default attributes
-        (see wxRichTextCtrl::SetDefaultStyle).
-    */
-    virtual bool SetFont(const wxFont& font);
-
-    /**
-        A helper function setting up scrollbars, for example after a resize.
-    */
-    virtual void SetupScrollbars(bool atTop = false);
-
-    /**
-        Helper function implementing keyboard navigation.
-    */
-    virtual bool KeyboardNavigate(int keyCode, int flags);
-
-    /**
-        Paints the background.
-    */
-    virtual void PaintBackground(wxDC& dc);
-
-    /**
-        Other user defined painting after everything else (i.e. all text) is painted.
-
-        @since 2.9.1
-    */
-    virtual void PaintAboveContent(wxDC& WXUNUSED(dc)) {}
-
-#if wxRICHTEXT_BUFFERED_PAINTING
-    /**
-        Recreates the buffer bitmap if necessary.
-    */
-    virtual bool RecreateBuffer(const wxSize& size = wxDefaultSize);
-#endif
-
-    // Write text
-    virtual void DoWriteText(const wxString& value, int flags = 0);
-
-    // Should we inherit colours?
-    virtual bool ShouldInheritColours() const { return false; }
-
-    /**
-        Internal function to position the visible caret according to the current caret
-        position.
-    */
-    virtual void PositionCaret(wxRichTextParagraphLayoutBox* container = NULL);
-
-    /**
-        Helper function for extending the selection, returning @true if the selection
-        was changed. Selections are in caret positions.
-    */
-    virtual bool ExtendSelection(long oldPosition, long newPosition, int flags);
-
-    /**
-        Scrolls @a position into view. This function takes a caret position.
-    */
-    virtual bool ScrollIntoView(long position, int keyCode);
-
-    /**
-        Refreshes the area affected by a selection change.
-    */
-    bool RefreshForSelectionChange(const wxRichTextSelection& oldSelection, const wxRichTextSelection& newSelection);
-
-    /**
-        Sets the caret position.
-
-        The caret position is the character position just before the caret.
-        A value of -1 means the caret is at the start of the buffer.
-        Please note that this does not update the current editing style
-        from the new position or cause the actual caret to be refreshed; to do that,
-        call wxRichTextCtrl::SetInsertionPoint instead.
-    */
-    void SetCaretPosition(long position, bool showAtLineStart = false) ;
-
-    /**
-        Returns the current caret position.
-    */
-    long GetCaretPosition() const { return m_caretPosition; }
-
-    /**
-        The adjusted caret position is the character position adjusted to take
-        into account whether we're at the start of a paragraph, in which case
-        style information should be taken from the next position, not current one.
-    */
-    long GetAdjustedCaretPosition(long caretPos) const;
-
-    /**
-        Move the caret one visual step forward: this may mean setting a flag
-        and keeping the same position if we're going from the end of one line
-        to the start of the next, which may be the exact same caret position.
-    */
-    void MoveCaretForward(long oldPosition) ;
-
-    /**
-        Move the caret one visual step forward: this may mean setting a flag
-        and keeping the same position if we're going from the end of one line
-        to the start of the next, which may be the exact same caret position.
-    */
-    void MoveCaretBack(long oldPosition) ;
-
-    /**
-        Returns the caret height and position for the given character position.
-        If container is null, the current focus object will be used.
-
-        @beginWxPerlOnly
-        In wxPerl this method is implemented as
-        GetCaretPositionForIndex(@a position) returning a
-        2-element list (ok, rect).
-        @endWxPerlOnly
-    */
-    bool GetCaretPositionForIndex(long position, wxRect& rect, wxRichTextParagraphLayoutBox* container = NULL);
-
-    /**
-        Internal helper function returning the line for the visible caret position.
-        If the caret is shown at the very end of the line, it means the next character
-        is actually on the following line.
-        So this function gets the line we're expecting to find if this is the case.
-    */
-    wxRichTextLine* GetVisibleLineForCaretPosition(long caretPosition) const;
-
-    /**
-        Gets the command processor associated with the control's buffer.
-    */
-    wxCommandProcessor* GetCommandProcessor() const { return GetBuffer().GetCommandProcessor(); }
-
-    /**
-        Deletes content if there is a selection, e.g. when pressing a key.
-        Returns the new caret position in @e newPos, or leaves it if there
-        was no action. This is undoable.
-
-        @beginWxPerlOnly
-        In wxPerl this method takes no arguments and returns a 2-element
-        list (ok, newPos).
-        @endWxPerlOnly
-    */
-    bool DeleteSelectedContent(long* newPos= NULL);
-
-    /**
-        Transforms logical (unscrolled) position to physical window position.
-    */
-    wxPoint GetPhysicalPoint(const wxPoint& ptLogical) const;
-
-    /**
-        Transforms physical window position to logical (unscrolled) position.
-    */
-    wxPoint GetLogicalPoint(const wxPoint& ptPhysical) const;
-
-    /**
-        Helper function for finding the caret position for the next word.
-        Direction is 1 (forward) or -1 (backwards).
-    */
-    virtual long FindNextWordPosition(int direction = 1) const;
-
-    /**
-        Returns @true if the given position is visible on the screen.
-    */
-    bool IsPositionVisible(long pos) const;
-
-    /**
-        Returns the first visible position in the current view.
-    */
-    long GetFirstVisiblePosition() const;
-
-    /**
-        Returns the caret position since the default formatting was changed. As
-        soon as this position changes, we no longer reflect the default style
-        in the UI. A value of -2 means that we should only reflect the style of the
-        content under the caret.
-    */
-    long GetCaretPositionForDefaultStyle() const { return m_caretPositionForDefaultStyle; }
-
-    /**
-        Set the caret position for the default style that the user is selecting.
-    */
-    void SetCaretPositionForDefaultStyle(long pos) { m_caretPositionForDefaultStyle = pos; }
-
-    /**
-        Returns @true if the user has recently set the default style without moving
-        the caret, and therefore the UI needs to reflect the default style and not
-        the style at the caret.
-
-        Below is an example of code that uses this function to determine whether the UI
-        should show that the current style is bold.
-
-        @see SetAndShowDefaultStyle().
-    */
-    bool IsDefaultStyleShowing() const { return m_caretPositionForDefaultStyle != -2; }
-
-    /**
-        Sets @a attr as the default style and tells the control that the UI should
-        reflect this attribute until the user moves the caret.
-
-        @see IsDefaultStyleShowing().
-    */
-    void SetAndShowDefaultStyle(const wxRichTextAttr& attr)
-    {
-        SetDefaultStyle(attr);
-        SetCaretPositionForDefaultStyle(GetCaretPosition());
-    }
-
-    /**
-        Returns the first visible point in the window.
-    */
-    wxPoint GetFirstVisiblePoint() const;
-
-#ifdef DOXYGEN
-    /**
-        Returns the content of the entire control as a string.
-    */
-    virtual wxString GetValue() const;
-
-    /**
-        Replaces existing content with the given text.
-    */
-    virtual void SetValue(const wxString& value);
-
-    /**
-        Call this function to prevent refresh and allow fast updates, and then Thaw() to
-        refresh the control.
-    */
-    void Freeze();
-
-    /**
-        Call this function to end a Freeze and refresh the display.
-    */
-    void Thaw();
-
-    /**
-        Returns @true if Freeze has been called without a Thaw.
-    */
-    bool IsFrozen() const;
-
-#endif
-
-// Implementation
-
-    /**
-        Processes the back key.
-    */
-    virtual bool ProcessBackKey(wxKeyEvent& event, int flags);
-
-    /**
-        Given a character position at which there is a list style, find the range
-        encompassing the same list style by looking backwards and forwards.
-    */
-    virtual wxRichTextRange FindRangeForList(long pos, bool& isNumberedList);
-
-    /**
-        Sets up the caret for the given position and container, after a mouse click.
-    */
-    bool SetCaretPositionAfterClick(wxRichTextParagraphLayoutBox* container, long position, int hitTestFlags, bool extendSelection = false);
-
-    /**
-        Find the caret position for the combination of hit-test flags and character position.
-        Returns the caret position and also an indication of where to place the caret (caretLineStart)
-        since this is ambiguous (same position used for end of line and start of next).
-    */
-    long FindCaretPositionForCharacterPosition(long position, int hitTestFlags, wxRichTextParagraphLayoutBox* container,
-                                                   bool& caretLineStart);
-
-    /**
-        Processes mouse movement in order to change the cursor
-    */
-    virtual bool ProcessMouseMovement(wxRichTextParagraphLayoutBox* container, wxRichTextObject* obj, long position, const wxPoint& pos);
-
-    /**
-        Font names take a long time to retrieve, so cache them (on demand).
-    */
-    static const wxArrayString& GetAvailableFontNames();
-
-    /**
-        Clears the cache of available font names.
-    */
-    static void ClearAvailableFontNames();
-
-    WX_FORWARD_TO_SCROLL_HELPER()
-
-    // implement wxTextEntry methods
-    virtual wxString DoGetValue() const;
-
-protected:
-    // implement the wxTextEntry pure virtual method
-    virtual wxWindow *GetEditableWindow() { return this; }
-
-    // margins functions
-    virtual bool DoSetMargins(const wxPoint& pt);
-    virtual wxPoint DoGetMargins() const;
-
-     // FIXME: this does not work, it allows this code to compile but will fail
-     //        during run-time
-#ifndef __WXUNIVERSAL__
-#ifdef __WXMSW__
-    virtual WXHWND GetEditHWND() const { return GetHWND(); }
-#endif
-#ifdef __WXMOTIF__
-    virtual WXWidget GetTextWidget() const { return NULL; }
-#endif
-#ifdef __WXGTK20__
-    virtual GtkEditable *GetEditable() const { return NULL; }
-    virtual GtkEntry *GetEntry() const { return NULL; }
-#endif
-#endif // !__WXUNIVERSAL__
-
-// Overrides
-protected:
-
-    /**
-        Currently this simply returns @c wxSize(10, 10).
-    */
-    virtual wxSize DoGetBestSize() const ;
-
-    virtual void DoSetValue(const wxString& value, int flags = 0);
-
-    virtual void DoThaw();
-
-
-// Data members
-protected:
-#if wxRICHTEXT_BUFFERED_PAINTING
-    /// Buffer bitmap
-    wxBitmap                m_bufferBitmap;
-#endif
-
-    /// Text buffer
-    wxRichTextBuffer        m_buffer;
-
-    wxMenu*                 m_contextMenu;
-
-    /// Caret position (1 less than the character position, so -1 is the
-    /// first caret position).
-    long                    m_caretPosition;
-
-    /// Caret position when the default formatting has been changed. As
-    /// soon as this position changes, we no longer reflect the default style
-    /// in the UI.
-    long                    m_caretPositionForDefaultStyle;
-
-    /// Selection range in character positions. -2, -2 means no selection.
-    wxRichTextSelection     m_selection;
-
-    wxRichTextCtrlSelectionState m_selectionState;
-
-    /// Anchor so we know how to extend the selection
-    /// It's a caret position since it's between two characters.
-    long                    m_selectionAnchor;
-
-    /// Anchor object if selecting multiple container objects, such as grid cells.
-    wxRichTextObject*       m_selectionAnchorObject;
-
-    /// Are we editable?
-    bool                    m_editable;
-
-    /// Can we use virtual attributes and virtual text?
-    bool                    m_useVirtualAttributes;
-
-    /// Is the vertical scrollbar enabled?
-    bool                    m_verticalScrollbarEnabled;
-
-    /// Are we showing the caret position at the start of a line
-    /// instead of at the end of the previous one?
-    bool                    m_caretAtLineStart;
-
-    /// Are we dragging (i.e. extending) a selection?
-    bool                    m_dragging;
-
-#if wxUSE_DRAG_AND_DROP
-    /// Are we trying to start Drag'n'Drop?
-    bool m_preDrag;
-
-    /// Initial position when starting Drag'n'Drop
-    wxPoint m_dragStartPoint;
-
-#if wxUSE_DATETIME
-    /// Initial time when starting Drag'n'Drop
-  wxDateTime m_dragStartTime;
-#endif // wxUSE_DATETIME
-#endif // wxUSE_DRAG_AND_DROP
-
-    /// Do we need full layout in idle?
-    bool                    m_fullLayoutRequired;
-    wxLongLong              m_fullLayoutTime;
-    long                    m_fullLayoutSavedPosition;
-
-    /// Threshold for doing delayed layout
-    long                    m_delayedLayoutThreshold;
-
-    /// Cursors
-    wxCursor                m_textCursor;
-    wxCursor                m_urlCursor;
-
-    static wxArrayString    sm_availableFontNames;
-
-    wxRichTextContextMenuPropertiesInfo m_contextMenuPropertiesInfo;
-
-    /// The object that currently has the editing focus
-    wxRichTextParagraphLayoutBox* m_focusObject;
-
-    /// An overall scale factor
-    double                  m_scale;
-};
-
-#if wxUSE_DRAG_AND_DROP
-class WXDLLIMPEXP_RICHTEXT wxRichTextDropSource : public wxDropSource
-{
-public:
-    wxRichTextDropSource(wxDataObject& data, wxRichTextCtrl* tc)
-        : wxDropSource(data, tc), m_rtc(tc) {}
-
-protected:
-    bool GiveFeedback(wxDragResult effect);
-
-    wxRichTextCtrl* m_rtc;
-};
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextDropTarget : public wxDropTarget
-{
-public:
-  wxRichTextDropTarget(wxRichTextCtrl* tc)
-    : wxDropTarget(new wxRichTextBufferDataObject(new wxRichTextBuffer)), m_rtc(tc) {}
-
-    virtual wxDragResult OnData(wxCoord x, wxCoord y, wxDragResult def)
-    {
-        if ( !GetData() )
-            return wxDragNone;
-        m_rtc->OnDrop(x, y, def, m_dataObject);
-        return def;
-    }
-
-protected:
-    wxRichTextCtrl* m_rtc;
-};
-#endif // wxUSE_DRAG_AND_DROP
-
-/**
-    @class wxRichTextEvent
-
-    This is the event class for wxRichTextCtrl notifications.
-
-    @beginEventTable{wxRichTextEvent}
-    @event{EVT_RICHTEXT_LEFT_CLICK(id, func)}
-        Process a @c wxEVT_RICHTEXT_LEFT_CLICK event, generated when the user
-        releases the left mouse button over an object.
-    @event{EVT_RICHTEXT_RIGHT_CLICK(id, func)}
-        Process a @c wxEVT_RICHTEXT_RIGHT_CLICK event, generated when the user
-        releases the right mouse button over an object.
-    @event{EVT_RICHTEXT_MIDDLE_CLICK(id, func)}
-        Process a @c wxEVT_RICHTEXT_MIDDLE_CLICK event, generated when the user
-        releases the middle mouse button over an object.
-    @event{EVT_RICHTEXT_LEFT_DCLICK(id, func)}
-        Process a @c wxEVT_RICHTEXT_LEFT_DCLICK event, generated when the user
-        double-clicks an object.
-    @event{EVT_RICHTEXT_RETURN(id, func)}
-        Process a @c wxEVT_RICHTEXT_RETURN event, generated when the user
-        presses the return key. Valid event functions: GetFlags, GetPosition.
-    @event{EVT_RICHTEXT_CHARACTER(id, func)}
-        Process a @c wxEVT_RICHTEXT_CHARACTER event, generated when the user
-        presses a character key. Valid event functions: GetFlags, GetPosition, GetCharacter.
-    @event{EVT_RICHTEXT_CONSUMING_CHARACTER(id, func)}
-        Process a @c wxEVT_RICHTEXT_CONSUMING_CHARACTER event, generated when the user
-        presses a character key but before it is processed and inserted into the control.
-        Call Veto to prevent normal processing. Valid event functions: GetFlags, GetPosition,
-        GetCharacter, Veto.
-    @event{EVT_RICHTEXT_DELETE(id, func)}
-        Process a @c wxEVT_RICHTEXT_DELETE event, generated when the user
-        presses the backspace or delete key. Valid event functions: GetFlags, GetPosition.
-    @event{EVT_RICHTEXT_STYLE_CHANGED(id, func)}
-        Process a @c wxEVT_RICHTEXT_STYLE_CHANGED event, generated when
-        styling has been applied to the control. Valid event functions: GetPosition, GetRange.
-    @event{EVT_RICHTEXT_STYLESHEET_CHANGED(id, func)}
-        Process a @c wxEVT_RICHTEXT_STYLESHEET_CHANGING event, generated
-        when the control's stylesheet has changed, for example the user added,
-        edited or deleted a style. Valid event functions: GetRange, GetPosition.
-    @event{EVT_RICHTEXT_STYLESHEET_REPLACING(id, func)}
-        Process a @c wxEVT_RICHTEXT_STYLESHEET_REPLACING event, generated
-        when the control's stylesheet is about to be replaced, for example when
-        a file is loaded into the control.
-        Valid event functions: Veto, GetOldStyleSheet, GetNewStyleSheet.
-    @event{EVT_RICHTEXT_STYLESHEET_REPLACED(id, func)}
-        Process a @c wxEVT_RICHTEXT_STYLESHEET_REPLACED event, generated
-        when the control's stylesheet has been replaced, for example when a file
-        is loaded into the control.
-        Valid event functions: GetOldStyleSheet, GetNewStyleSheet.
-    @event{EVT_RICHTEXT_PROPERTIES_CHANGED(id, func)}
-        Process a @c wxEVT_RICHTEXT_PROPERTIES_CHANGED event, generated when
-        properties have been applied to the control. Valid event functions: GetPosition, GetRange.
-    @event{EVT_RICHTEXT_CONTENT_INSERTED(id, func)}
-        Process a @c wxEVT_RICHTEXT_CONTENT_INSERTED event, generated when
-        content has been inserted into the control.
-        Valid event functions: GetPosition, GetRange.
-    @event{EVT_RICHTEXT_CONTENT_DELETED(id, func)}
-        Process a @c wxEVT_RICHTEXT_CONTENT_DELETED event, generated when
-        content has been deleted from the control.
-        Valid event functions: GetPosition, GetRange.
-    @event{EVT_RICHTEXT_BUFFER_RESET(id, func)}
-        Process a @c wxEVT_RICHTEXT_BUFFER_RESET event, generated when the
-        buffer has been reset by deleting all content.
-        You can use this to set a default style for the first new paragraph.
-    @event{EVT_RICHTEXT_SELECTION_CHANGED(id, func)}
-        Process a @c wxEVT_RICHTEXT_SELECTION_CHANGED event, generated when the
-        selection range has changed.
-    @event{EVT_RICHTEXT_FOCUS_OBJECT_CHANGED(id, func)}
-        Process a @c wxEVT_RICHTEXT_FOCUS_OBJECT_CHANGED event, generated when the
-        current focus object has changed.
-    @endEventTable
-
-    @library{wxrichtext}
-    @category{events,richtext}
-*/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextEvent : public wxNotifyEvent
-{
-public:
-    /**
-        Constructor.
-
-        @param commandType
-            The type of the event.
-        @param id
-            Window identifier. The value @c wxID_ANY indicates a default value.
-    */
-    wxRichTextEvent(wxEventType commandType = wxEVT_NULL, int winid = 0)
-        : wxNotifyEvent(commandType, winid),
-        m_flags(0), m_position(-1), m_oldStyleSheet(NULL), m_newStyleSheet(NULL),
-        m_char((wxChar) 0), m_container(NULL), m_oldContainer(NULL)
-        { }
-
-    /**
-        Copy constructor.
-    */
-    wxRichTextEvent(const wxRichTextEvent& event)
-        : wxNotifyEvent(event),
-        m_flags(event.m_flags), m_position(-1),
-        m_oldStyleSheet(event.m_oldStyleSheet), m_newStyleSheet(event.m_newStyleSheet),
-        m_char((wxChar) 0), m_container(event.m_container), m_oldContainer(event.m_oldContainer)
-        { }
-
-    /**
-        Returns the buffer position at which the event occured.
-    */
-    long GetPosition() const { return m_position; }
-
-    /**
-        Sets the buffer position variable.
-    */
-    void SetPosition(long pos) { m_position = pos; }
-
-    /**
-        Returns flags indicating modifier keys pressed.
-
-        Possible values are @c wxRICHTEXT_CTRL_DOWN, @c wxRICHTEXT_SHIFT_DOWN, and @c wxRICHTEXT_ALT_DOWN.
-    */
-    int GetFlags() const { return m_flags; }
-
-    /**
-        Sets flags indicating modifier keys pressed.
-
-        Possible values are @c wxRICHTEXT_CTRL_DOWN, @c wxRICHTEXT_SHIFT_DOWN, and @c wxRICHTEXT_ALT_DOWN.
-    */
-    void SetFlags(int flags) { m_flags = flags; }
-
-    /**
-        Returns the old style sheet.
-
-        Can be used in a @c wxEVT_RICHTEXT_STYLESHEET_CHANGING or
-        @c wxEVT_RICHTEXT_STYLESHEET_CHANGED event handler.
-    */
-    wxRichTextStyleSheet* GetOldStyleSheet() const { return m_oldStyleSheet; }
-
-    /**
-        Sets the old style sheet variable.
-    */
-    void SetOldStyleSheet(wxRichTextStyleSheet* sheet) { m_oldStyleSheet = sheet; }
-
-    /**
-        Returns the new style sheet.
-
-        Can be used in a @c wxEVT_RICHTEXT_STYLESHEET_CHANGING or
-        @c wxEVT_RICHTEXT_STYLESHEET_CHANGED event handler.
-    */
-    wxRichTextStyleSheet* GetNewStyleSheet() const { return m_newStyleSheet; }
-
-    /**
-        Sets the new style sheet variable.
-    */
-    void SetNewStyleSheet(wxRichTextStyleSheet* sheet) { m_newStyleSheet = sheet; }
-
-    /**
-        Gets the range for the current operation.
-    */
-    const wxRichTextRange& GetRange() const { return m_range; }
-
-    /**
-        Sets the range variable.
-    */
-    void SetRange(const wxRichTextRange& range) { m_range = range; }
-
-    /**
-        Returns the character pressed, within a @c wxEVT_RICHTEXT_CHARACTER event.
-    */
-    wxChar GetCharacter() const { return m_char; }
-
-    /**
-        Sets the character variable.
-    */
-    void SetCharacter(wxChar ch) { m_char = ch; }
-
-    /**
-        Returns the container for which the event is relevant.
-    */
-    wxRichTextParagraphLayoutBox* GetContainer() const { return m_container; }
-
-    /**
-        Sets the container for which the event is relevant.
-    */
-    void SetContainer(wxRichTextParagraphLayoutBox* container) { m_container = container; }
-
-    /**
-        Returns the old container, for a focus change event.
-    */
-    wxRichTextParagraphLayoutBox* GetOldContainer() const { return m_oldContainer; }
-
-    /**
-        Sets the old container, for a focus change event.
-    */
-    void SetOldContainer(wxRichTextParagraphLayoutBox* container) { m_oldContainer = container; }
-
-    virtual wxEvent *Clone() const { return new wxRichTextEvent(*this); }
-
-protected:
-    int                             m_flags;
-    long                            m_position;
-    wxRichTextStyleSheet*           m_oldStyleSheet;
-    wxRichTextStyleSheet*           m_newStyleSheet;
-    wxRichTextRange                 m_range;
-    wxChar                          m_char;
-    wxRichTextParagraphLayoutBox*   m_container;
-    wxRichTextParagraphLayoutBox*   m_oldContainer;
-
-private:
-    DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRichTextEvent)
-};
-
-/*!
- * wxRichTextCtrl events
- */
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_LEFT_CLICK, wxRichTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_RIGHT_CLICK, wxRichTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_MIDDLE_CLICK, wxRichTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_LEFT_DCLICK, wxRichTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_RETURN, wxRichTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_CHARACTER, wxRichTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_CONSUMING_CHARACTER, wxRichTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_DELETE, wxRichTextEvent );
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_STYLESHEET_CHANGING, wxRichTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_STYLESHEET_CHANGED, wxRichTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_STYLESHEET_REPLACING, wxRichTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_STYLESHEET_REPLACED, wxRichTextEvent );
-
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_CONTENT_INSERTED, wxRichTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_CONTENT_DELETED, wxRichTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_STYLE_CHANGED, wxRichTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_PROPERTIES_CHANGED, wxRichTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_SELECTION_CHANGED, wxRichTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_BUFFER_RESET, wxRichTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_RICHTEXT, wxEVT_RICHTEXT_FOCUS_OBJECT_CHANGED, wxRichTextEvent );
-
-typedef void (wxEvtHandler::*wxRichTextEventFunction)(wxRichTextEvent&);
-
-#define wxRichTextEventHandler(func) \
-    wxEVENT_HANDLER_CAST(wxRichTextEventFunction, func)
-
-#define EVT_RICHTEXT_LEFT_CLICK(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_LEFT_CLICK, id, -1, wxRichTextEventHandler( fn ), NULL ),
-#define EVT_RICHTEXT_RIGHT_CLICK(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_RIGHT_CLICK, id, -1, wxRichTextEventHandler( fn ), NULL ),
-#define EVT_RICHTEXT_MIDDLE_CLICK(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_MIDDLE_CLICK, id, -1, wxRichTextEventHandler( fn ), NULL ),
-#define EVT_RICHTEXT_LEFT_DCLICK(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_LEFT_DCLICK, id, -1, wxRichTextEventHandler( fn ), NULL ),
-#define EVT_RICHTEXT_RETURN(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_RETURN, id, -1, wxRichTextEventHandler( fn ), NULL ),
-#define EVT_RICHTEXT_CHARACTER(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_CHARACTER, id, -1, wxRichTextEventHandler( fn ), NULL ),
-#define EVT_RICHTEXT_CONSUMING_CHARACTER(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_CONSUMING_CHARACTER, id, -1, wxRichTextEventHandler( fn ), NULL ),
-#define EVT_RICHTEXT_DELETE(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_DELETE, id, -1, wxRichTextEventHandler( fn ), NULL ),
-
-#define EVT_RICHTEXT_STYLESHEET_CHANGING(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_STYLESHEET_CHANGING, id, -1, wxRichTextEventHandler( fn ), NULL ),
-#define EVT_RICHTEXT_STYLESHEET_CHANGED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_STYLESHEET_CHANGED, id, -1, wxRichTextEventHandler( fn ), NULL ),
-#define EVT_RICHTEXT_STYLESHEET_REPLACING(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_STYLESHEET_REPLACING, id, -1, wxRichTextEventHandler( fn ), NULL ),
-#define EVT_RICHTEXT_STYLESHEET_REPLACED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_STYLESHEET_REPLACED, id, -1, wxRichTextEventHandler( fn ), NULL ),
-
-#define EVT_RICHTEXT_CONTENT_INSERTED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_CONTENT_INSERTED, id, -1, wxRichTextEventHandler( fn ), NULL ),
-#define EVT_RICHTEXT_CONTENT_DELETED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_CONTENT_DELETED, id, -1, wxRichTextEventHandler( fn ), NULL ),
-#define EVT_RICHTEXT_STYLE_CHANGED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_STYLE_CHANGED, id, -1, wxRichTextEventHandler( fn ), NULL ),
-#define EVT_RICHTEXT_PROPERTIES_CHANGED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_PROPERTIES_CHANGED, id, -1, wxRichTextEventHandler( fn ), NULL ),
-#define EVT_RICHTEXT_SELECTION_CHANGED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_SELECTION_CHANGED, id, -1, wxRichTextEventHandler( fn ), NULL ),
-#define EVT_RICHTEXT_BUFFER_RESET(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_BUFFER_RESET, id, -1, wxRichTextEventHandler( fn ), NULL ),
-#define EVT_RICHTEXT_FOCUS_OBJECT_CHANGED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_RICHTEXT_FOCUS_OBJECT_CHANGED, id, -1, wxRichTextEventHandler( fn ), NULL ),
-
-// old wxEVT_COMMAND_* constants
-#define wxEVT_COMMAND_RICHTEXT_LEFT_CLICK             wxEVT_RICHTEXT_LEFT_CLICK
-#define wxEVT_COMMAND_RICHTEXT_RIGHT_CLICK            wxEVT_RICHTEXT_RIGHT_CLICK
-#define wxEVT_COMMAND_RICHTEXT_MIDDLE_CLICK           wxEVT_RICHTEXT_MIDDLE_CLICK
-#define wxEVT_COMMAND_RICHTEXT_LEFT_DCLICK            wxEVT_RICHTEXT_LEFT_DCLICK
-#define wxEVT_COMMAND_RICHTEXT_RETURN                 wxEVT_RICHTEXT_RETURN
-#define wxEVT_COMMAND_RICHTEXT_CHARACTER              wxEVT_RICHTEXT_CHARACTER
-#define wxEVT_COMMAND_RICHTEXT_DELETE                 wxEVT_RICHTEXT_DELETE
-#define wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGING    wxEVT_RICHTEXT_STYLESHEET_CHANGING
-#define wxEVT_COMMAND_RICHTEXT_STYLESHEET_CHANGED     wxEVT_RICHTEXT_STYLESHEET_CHANGED
-#define wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACING   wxEVT_RICHTEXT_STYLESHEET_REPLACING
-#define wxEVT_COMMAND_RICHTEXT_STYLESHEET_REPLACED    wxEVT_RICHTEXT_STYLESHEET_REPLACED
-#define wxEVT_COMMAND_RICHTEXT_CONTENT_INSERTED       wxEVT_RICHTEXT_CONTENT_INSERTED
-#define wxEVT_COMMAND_RICHTEXT_CONTENT_DELETED        wxEVT_RICHTEXT_CONTENT_DELETED
-#define wxEVT_COMMAND_RICHTEXT_STYLE_CHANGED          wxEVT_RICHTEXT_STYLE_CHANGED
-#define wxEVT_COMMAND_RICHTEXT_PROPERTIES_CHANGED     wxEVT_RICHTEXT_PROPERTIES_CHANGED
-#define wxEVT_COMMAND_RICHTEXT_SELECTION_CHANGED      wxEVT_RICHTEXT_SELECTION_CHANGED
-#define wxEVT_COMMAND_RICHTEXT_BUFFER_RESET           wxEVT_RICHTEXT_BUFFER_RESET
-#define wxEVT_COMMAND_RICHTEXT_FOCUS_OBJECT_CHANGED   wxEVT_RICHTEXT_FOCUS_OBJECT_CHANGED
-
-#endif
-    // wxUSE_RICHTEXT
-
-#endif
-    // _WX_RICHTEXTCTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextdialogpage.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextdialogpage.h
deleted file mode 100644
index 206fd3e915..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextdialogpage.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextdialogpage.h
-// Purpose:     Formatting dialog page base class for wxRTC
-// Author:      Julian Smart
-// Modified by:
-// Created:     2010-11-14
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows Licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RICHTEXTDIALOGPAGE_H_
-#define _WX_RICHTEXTDIALOGPAGE_H_
-
-#if wxUSE_RICHTEXT
-
-#include "wx/panel.h"
-#include "wx/richtext/richtextuicustomization.h"
-
-/**
-    @class wxRichTextDialogPage
-    The base class for formatting dialog pages.
- **/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextDialogPage: public wxPanel
-{
-public:
-    DECLARE_CLASS(wxRichTextDialogPage)
-    wxRichTextDialogPage() {}
-    wxRichTextDialogPage(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0)
-    {
-        Create(parent, id, pos, size, style);
-    }
-
-    DECLARE_BASE_CLASS_HELP_PROVISION()
-};
-
-#endif
-    // wxUSE_RICHTEXT
-
-#endif
-    // _WX_RICHTEXTDIALOGPAGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextfontpage.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextfontpage.h
deleted file mode 100644
index 25e8e5e98d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextfontpage.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextfontpage.h
-// Purpose:     Font page for wxRichTextFormattingDialog
-// Author:      Julian Smart
-// Modified by:
-// Created:     2006-10-02
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _RICHTEXTFONTPAGE_H_
-#define _RICHTEXTFONTPAGE_H_
-
-/*!
- * Includes
- */
-
-#include "wx/richtext/richtextdialogpage.h"
-
-////@begin includes
-#include "wx/spinbutt.h"
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-class wxSpinButton;
-class wxBoxSizer;
-class wxRichTextFontListBox;
-class wxRichTextColourSwatchCtrl;
-class wxRichTextFontPreviewCtrl;
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define SYMBOL_WXRICHTEXTFONTPAGE_STYLE wxTAB_TRAVERSAL
-#define SYMBOL_WXRICHTEXTFONTPAGE_TITLE wxEmptyString
-#define SYMBOL_WXRICHTEXTFONTPAGE_IDNAME ID_RICHTEXTFONTPAGE
-#define SYMBOL_WXRICHTEXTFONTPAGE_SIZE wxSize(200, 100)
-#define SYMBOL_WXRICHTEXTFONTPAGE_POSITION wxDefaultPosition
-////@end control identifiers
-
-/*!
- * wxRichTextFontPage class declaration
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextFontPage: public wxRichTextDialogPage
-{
-    DECLARE_DYNAMIC_CLASS( wxRichTextFontPage )
-    DECLARE_EVENT_TABLE()
-    DECLARE_HELP_PROVISION()
-
-public:
-    /// Constructors
-    wxRichTextFontPage( );
-    wxRichTextFontPage( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTFONTPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTFONTPAGE_SIZE, long style = SYMBOL_WXRICHTEXTFONTPAGE_STYLE );
-
-    /// Initialise members
-    void Init();
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTFONTPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTFONTPAGE_SIZE, long style = SYMBOL_WXRICHTEXTFONTPAGE_STYLE );
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-    /// Transfer data from/to window
-    virtual bool TransferDataFromWindow();
-    virtual bool TransferDataToWindow();
-
-    /// Updates the font preview
-    void UpdatePreview();
-
-    void OnFaceListBoxSelected( wxCommandEvent& event );
-    void OnColourClicked( wxCommandEvent& event );
-
-    /// Gets the attributes associated with the main formatting dialog
-    wxRichTextAttr* GetAttributes();
-
-////@begin wxRichTextFontPage event handler declarations
-
-    /// wxEVT_IDLE event handler for ID_RICHTEXTFONTPAGE
-    void OnIdle( wxIdleEvent& event );
-
-    /// wxEVT_TEXT event handler for ID_RICHTEXTFONTPAGE_FACETEXTCTRL
-    void OnFaceTextCtrlUpdated( wxCommandEvent& event );
-
-    /// wxEVT_TEXT event handler for ID_RICHTEXTFONTPAGE_SIZETEXTCTRL
-    void OnSizeTextCtrlUpdated( wxCommandEvent& event );
-
-    /// wxEVT_SCROLL_LINEUP event handler for ID_RICHTEXTFONTPAGE_SPINBUTTONS
-    void OnRichtextfontpageSpinbuttonsUp( wxSpinEvent& event );
-
-    /// wxEVT_SCROLL_LINEDOWN event handler for ID_RICHTEXTFONTPAGE_SPINBUTTONS
-    void OnRichtextfontpageSpinbuttonsDown( wxSpinEvent& event );
-
-    /// wxEVT_CHOICE event handler for ID_RICHTEXTFONTPAGE_SIZE_UNITS
-    void OnRichtextfontpageSizeUnitsSelected( wxCommandEvent& event );
-
-    /// wxEVT_LISTBOX event handler for ID_RICHTEXTFONTPAGE_SIZELISTBOX
-    void OnSizeListBoxSelected( wxCommandEvent& event );
-
-    /// wxEVT_COMBOBOX event handler for ID_RICHTEXTFONTPAGE_STYLECTRL
-    void OnStyleCtrlSelected( wxCommandEvent& event );
-
-    /// wxEVT_COMBOBOX event handler for ID_RICHTEXTFONTPAGE_WEIGHTCTRL
-    void OnWeightCtrlSelected( wxCommandEvent& event );
-
-    /// wxEVT_COMBOBOX event handler for ID_RICHTEXTFONTPAGE_UNDERLINING_CTRL
-    void OnUnderliningCtrlSelected( wxCommandEvent& event );
-
-    /// wxEVT_CHECKBOX event handler for ID_RICHTEXTFONTPAGE_STRIKETHROUGHCTRL
-    void OnStrikethroughctrlClick( wxCommandEvent& event );
-
-    /// wxEVT_CHECKBOX event handler for ID_RICHTEXTFONTPAGE_CAPSCTRL
-    void OnCapsctrlClick( wxCommandEvent& event );
-
-    /// wxEVT_CHECKBOX event handler for ID_RICHTEXTFONTPAGE_SUPERSCRIPT
-    void OnRichtextfontpageSuperscriptClick( wxCommandEvent& event );
-
-    /// wxEVT_CHECKBOX event handler for ID_RICHTEXTFONTPAGE_SUBSCRIPT
-    void OnRichtextfontpageSubscriptClick( wxCommandEvent& event );
-
-////@end wxRichTextFontPage event handler declarations
-
-////@begin wxRichTextFontPage member function declarations
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end wxRichTextFontPage member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-////@begin wxRichTextFontPage member variables
-    wxTextCtrl* m_faceTextCtrl;
-    wxTextCtrl* m_sizeTextCtrl;
-    wxSpinButton* m_fontSizeSpinButtons;
-    wxChoice* m_sizeUnitsCtrl;
-    wxBoxSizer* m_fontListBoxParent;
-    wxRichTextFontListBox* m_faceListBox;
-    wxListBox* m_sizeListBox;
-    wxComboBox* m_styleCtrl;
-    wxComboBox* m_weightCtrl;
-    wxComboBox* m_underliningCtrl;
-    wxCheckBox* m_textColourLabel;
-    wxRichTextColourSwatchCtrl* m_colourCtrl;
-    wxCheckBox* m_bgColourLabel;
-    wxRichTextColourSwatchCtrl* m_bgColourCtrl;
-    wxCheckBox* m_strikethroughCtrl;
-    wxCheckBox* m_capitalsCtrl;
-    wxCheckBox* m_smallCapitalsCtrl;
-    wxCheckBox* m_superscriptCtrl;
-    wxCheckBox* m_subscriptCtrl;
-    wxRichTextFontPreviewCtrl* m_previewCtrl;
-    /// Control identifiers
-    enum {
-        ID_RICHTEXTFONTPAGE = 10000,
-        ID_RICHTEXTFONTPAGE_FACETEXTCTRL = 10001,
-        ID_RICHTEXTFONTPAGE_SIZETEXTCTRL = 10002,
-        ID_RICHTEXTFONTPAGE_SPINBUTTONS = 10003,
-        ID_RICHTEXTFONTPAGE_SIZE_UNITS = 10004,
-        ID_RICHTEXTFONTPAGE_FACELISTBOX = 10005,
-        ID_RICHTEXTFONTPAGE_SIZELISTBOX = 10006,
-        ID_RICHTEXTFONTPAGE_STYLECTRL = 10007,
-        ID_RICHTEXTFONTPAGE_WEIGHTCTRL = 10008,
-        ID_RICHTEXTFONTPAGE_UNDERLINING_CTRL = 10009,
-        ID_RICHTEXTFONTPAGE_COLOURCTRL_LABEL = 10010,
-        ID_RICHTEXTFONTPAGE_COLOURCTRL = 10011,
-        ID_RICHTEXTFONTPAGE_BGCOLOURCTRL_LABEL = 10012,
-        ID_RICHTEXTFONTPAGE_BGCOLOURCTRL = 10013,
-        ID_RICHTEXTFONTPAGE_STRIKETHROUGHCTRL = 10014,
-        ID_RICHTEXTFONTPAGE_CAPSCTRL = 10015,
-        ID_RICHTEXTFONTPAGE_SMALLCAPSCTRL = 10016,
-        ID_RICHTEXTFONTPAGE_SUPERSCRIPT = 10017,
-        ID_RICHTEXTFONTPAGE_SUBSCRIPT = 10018,
-        ID_RICHTEXTFONTPAGE_PREVIEWCTRL = 10019
-    };
-////@end wxRichTextFontPage member variables
-
-    bool m_dontUpdate;
-    bool m_colourPresent;
-    bool m_bgColourPresent;
-};
-
-#endif
-    // _RICHTEXTFONTPAGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextformatdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextformatdlg.h
deleted file mode 100644
index 18a91bbceb..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextformatdlg.h
+++ /dev/null
@@ -1,360 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextformatdlg.h
-// Purpose:     Formatting dialog for wxRichTextCtrl
-// Author:      Julian Smart
-// Modified by:
-// Created:     2006-10-01
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RICHTEXTFORMATDLG_H_
-#define _WX_RICHTEXTFORMATDLG_H_
-
-/*!
- * Includes
- */
-
-#include "wx/defs.h"
-
-#if wxUSE_RICHTEXT
-
-#include "wx/propdlg.h"
-#include "wx/bookctrl.h"
-#include "wx/withimages.h"
-
-#if wxUSE_HTML
-#include "wx/htmllbox.h"
-#endif
-
-#include "wx/richtext/richtextbuffer.h"
-#include "wx/richtext/richtextstyles.h"
-#include "wx/richtext/richtextuicustomization.h"
-
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextFormattingDialog;
-class WXDLLIMPEXP_FWD_CORE wxComboBox;
-class WXDLLIMPEXP_FWD_CORE wxCheckBox;
-
-/*!
- * Flags determining the pages and buttons to be created in the dialog
- */
-
-#define wxRICHTEXT_FORMAT_STYLE_EDITOR      0x0001
-#define wxRICHTEXT_FORMAT_FONT              0x0002
-#define wxRICHTEXT_FORMAT_TABS              0x0004
-#define wxRICHTEXT_FORMAT_BULLETS           0x0008
-#define wxRICHTEXT_FORMAT_INDENTS_SPACING   0x0010
-#define wxRICHTEXT_FORMAT_LIST_STYLE        0x0020
-#define wxRICHTEXT_FORMAT_MARGINS           0x0040
-#define wxRICHTEXT_FORMAT_SIZE              0x0080
-#define wxRICHTEXT_FORMAT_BORDERS           0x0100
-#define wxRICHTEXT_FORMAT_BACKGROUND        0x0200
-
-#define wxRICHTEXT_FORMAT_HELP_BUTTON       0x1000
-
-/*!
- * Indices for bullet styles in list control
- */
-
-enum {
-    wxRICHTEXT_BULLETINDEX_NONE = 0,
-    wxRICHTEXT_BULLETINDEX_ARABIC,
-    wxRICHTEXT_BULLETINDEX_UPPER_CASE,
-    wxRICHTEXT_BULLETINDEX_LOWER_CASE,
-    wxRICHTEXT_BULLETINDEX_UPPER_CASE_ROMAN,
-    wxRICHTEXT_BULLETINDEX_LOWER_CASE_ROMAN,
-    wxRICHTEXT_BULLETINDEX_OUTLINE,
-    wxRICHTEXT_BULLETINDEX_SYMBOL,
-    wxRICHTEXT_BULLETINDEX_BITMAP,
-    wxRICHTEXT_BULLETINDEX_STANDARD
-};
-
-/*!
- * Shorthand for common combinations of pages
- */
-
-#define wxRICHTEXT_FORMAT_PARAGRAPH         (wxRICHTEXT_FORMAT_INDENTS_SPACING | wxRICHTEXT_FORMAT_BULLETS | wxRICHTEXT_FORMAT_TABS | wxRICHTEXT_FORMAT_FONT)
-#define wxRICHTEXT_FORMAT_CHARACTER         (wxRICHTEXT_FORMAT_FONT)
-#define wxRICHTEXT_FORMAT_STYLE             (wxRICHTEXT_FORMAT_PARAGRAPH | wxRICHTEXT_FORMAT_STYLE_EDITOR)
-
-/*!
- * Factory for formatting dialog
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextFormattingDialogFactory: public wxObject
-{
-public:
-    wxRichTextFormattingDialogFactory() {}
-    virtual ~wxRichTextFormattingDialogFactory() {}
-
-// Overridables
-
-    /// Create all pages, under the dialog's book control, also calling AddPage
-    virtual bool CreatePages(long pages, wxRichTextFormattingDialog* dialog);
-
-    /// Create a page, given a page identifier
-    virtual wxPanel* CreatePage(int page, wxString& title, wxRichTextFormattingDialog* dialog);
-
-    /// Enumerate all available page identifiers
-    virtual int GetPageId(int i) const;
-
-    /// Get the number of available page identifiers
-    virtual int GetPageIdCount() const;
-
-    /// Get the image index for the given page identifier
-    virtual int GetPageImage(int WXUNUSED(id)) const { return -1; }
-
-    /// Invoke help for the dialog
-    virtual bool ShowHelp(int page, wxRichTextFormattingDialog* dialog);
-
-    /// Set the sheet style, called at the start of wxRichTextFormattingDialog::Create
-    virtual bool SetSheetStyle(wxRichTextFormattingDialog* dialog);
-
-    /// Create the main dialog buttons
-    virtual bool CreateButtons(wxRichTextFormattingDialog* dialog);
-};
-
-/*!
- * Formatting dialog for a wxRichTextCtrl
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextFormattingDialog: public wxPropertySheetDialog,
-                                                       public wxWithImages
-{
-DECLARE_CLASS(wxRichTextFormattingDialog)
-DECLARE_HELP_PROVISION()
-
-public:
-    enum { Option_AllowPixelFontSize = 0x0001 };
-
-    wxRichTextFormattingDialog() { Init(); }
-
-    wxRichTextFormattingDialog(long flags, wxWindow* parent, const wxString& title = wxGetTranslation(wxT("Formatting")), wxWindowID id = wxID_ANY,
-        const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize,
-        long style = wxDEFAULT_DIALOG_STYLE)
-    {
-        Init();
-        Create(flags, parent, title, id, pos, sz, style);
-    }
-
-    ~wxRichTextFormattingDialog();
-
-    void Init();
-
-    bool Create(long flags, wxWindow* parent, const wxString& title = wxGetTranslation(wxT("Formatting")), wxWindowID id = wxID_ANY,
-        const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize,
-        long style = wxDEFAULT_DIALOG_STYLE);
-
-    /// Get attributes from the given range
-    virtual bool GetStyle(wxRichTextCtrl* ctrl, const wxRichTextRange& range);
-
-    /// Set the attributes and optionally update the display
-    virtual bool SetStyle(const wxRichTextAttr& style, bool update = true);
-
-    /// Set the style definition and optionally update the display
-    virtual bool SetStyleDefinition(const wxRichTextStyleDefinition& styleDef, wxRichTextStyleSheet* sheet, bool update = true);
-
-    /// Get the style definition, if any
-    virtual wxRichTextStyleDefinition* GetStyleDefinition() const { return m_styleDefinition; }
-
-    /// Get the style sheet, if any
-    virtual wxRichTextStyleSheet* GetStyleSheet() const { return m_styleSheet; }
-
-    /// Update the display
-    virtual bool UpdateDisplay();
-
-    /// Apply attributes to the given range
-    virtual bool ApplyStyle(wxRichTextCtrl* ctrl, const wxRichTextRange& range, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO|wxRICHTEXT_SETSTYLE_OPTIMIZE);
-
-    /// Apply attributes to the object being edited, if any
-    virtual bool ApplyStyle(wxRichTextCtrl* ctrl, int flags = wxRICHTEXT_SETSTYLE_WITH_UNDO);
-
-    /// Gets and sets the attributes
-    const wxRichTextAttr& GetAttributes() const { return m_attributes; }
-    wxRichTextAttr& GetAttributes() { return m_attributes; }
-    void SetAttributes(const wxRichTextAttr& attr) { m_attributes = attr; }
-
-    /// Sets the dialog options, determining what the interface presents to the user.
-    /// Currently the only option is Option_AllowPixelFontSize.
-    void SetOptions(int options) { m_options = options; }
-
-    /// Gets the dialog options, determining what the interface presents to the user.
-    /// Currently the only option is Option_AllowPixelFontSize.
-    int GetOptions() const { return m_options; }
-
-    /// Returns @true if the given option is present.
-    bool HasOption(int option) const { return (m_options & option) != 0; }
-
-    /// If editing the attributes for a particular object, such as an image,
-    /// set the object so the code can initialize attributes such as size correctly.
-    wxRichTextObject* GetObject() const { return m_object; }
-    void SetObject(wxRichTextObject* obj) { m_object = obj; }
-
-    /// Transfers the data and from to the window
-    virtual bool TransferDataToWindow();
-    virtual bool TransferDataFromWindow();
-
-    /// Apply the styles when a different tab is selected, so the previews are
-    /// up to date
-    void OnTabChanged(wxBookCtrlEvent& event);
-
-    /// Respond to help command
-    void OnHelp(wxCommandEvent& event);
-    void OnUpdateHelp(wxUpdateUIEvent& event);
-
-    /// Get/set formatting factory object
-    static void SetFormattingDialogFactory(wxRichTextFormattingDialogFactory* factory);
-    static wxRichTextFormattingDialogFactory* GetFormattingDialogFactory() { return ms_FormattingDialogFactory; }
-
-    /// Helper for pages to get the top-level dialog
-    static wxRichTextFormattingDialog* GetDialog(wxWindow* win);
-
-    /// Helper for pages to get the attributes
-    static wxRichTextAttr* GetDialogAttributes(wxWindow* win);
-
-    /// Helper for pages to get the reset attributes
-    static wxRichTextAttr* GetDialogResetAttributes(wxWindow* win);
-
-    /// Helper for pages to get the style
-    static wxRichTextStyleDefinition* GetDialogStyleDefinition(wxWindow* win);
-
-    /// Should we show tooltips?
-    static bool ShowToolTips() { return sm_showToolTips; }
-
-    /// Determines whether tooltips will be shown
-    static void SetShowToolTips(bool show) { sm_showToolTips = show; }
-
-    /// Set the dimension into the value and units controls. Optionally pass units to
-    /// specify the ordering of units in the combobox.
-    static void SetDimensionValue(wxTextAttrDimension& dim, wxTextCtrl* valueCtrl, wxComboBox* unitsCtrl, wxCheckBox* checkBox, wxArrayInt* units = NULL);
-
-    /// Get the dimension from the value and units controls Optionally pass units to
-    /// specify the ordering of units in the combobox.
-    static void GetDimensionValue(wxTextAttrDimension& dim, wxTextCtrl* valueCtrl, wxComboBox* unitsCtrl, wxCheckBox* checkBox, wxArrayInt* units = NULL);
-
-    /// Convert from a string to a dimension integer.
-    static bool ConvertFromString(const wxString& str, int& ret, int unit);
-
-    /// Map book control page index to our page id
-    void AddPageId(int id) { m_pageIds.Add(id); }
-
-    /// Find a page by class
-    wxWindow* FindPage(wxClassInfo* info) const;
-
-protected:
-
-    wxRichTextAttr                              m_attributes;
-    wxRichTextStyleDefinition*                  m_styleDefinition;
-    wxRichTextStyleSheet*                       m_styleSheet;
-    wxRichTextObject*                           m_object;
-    wxArrayInt                                  m_pageIds; // mapping of book control indexes to page ids
-    int                                         m_options; // UI options
-
-    static wxRichTextFormattingDialogFactory*   ms_FormattingDialogFactory;
-    static bool                                 sm_showToolTips;
-
-DECLARE_EVENT_TABLE()
-};
-
-//-----------------------------------------------------------------------------
-// helper class - wxRichTextFontPreviewCtrl
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextFontPreviewCtrl : public wxWindow
-{
-public:
-    wxRichTextFontPreviewCtrl(wxWindow *parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& sz = wxDefaultSize, long style = 0);
-
-    void SetTextEffects(int effects) { m_textEffects = effects; }
-    int GetTextEffects() const { return m_textEffects; }
-
-private:
-    int m_textEffects;
-
-    void OnPaint(wxPaintEvent& event);
-    DECLARE_EVENT_TABLE()
-};
-
-/*
- * A control for displaying a small preview of a colour or bitmap
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextColourSwatchCtrl: public wxControl
-{
-    DECLARE_CLASS(wxRichTextColourSwatchCtrl)
-public:
-    wxRichTextColourSwatchCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0);
-    ~wxRichTextColourSwatchCtrl();
-
-    void OnMouseEvent(wxMouseEvent& event);
-
-    void SetColour(const wxColour& colour) { m_colour = colour; SetBackgroundColour(m_colour); }
-
-    wxColour& GetColour() { return m_colour; }
-
-    virtual wxSize DoGetBestSize() const { return GetSize(); }
-
-protected:
-    wxColour    m_colour;
-
-DECLARE_EVENT_TABLE()
-};
-
-/*!
- * wxRichTextFontListBox class declaration
- * A listbox to display fonts.
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextFontListBox: public wxHtmlListBox
-{
-    DECLARE_CLASS(wxRichTextFontListBox)
-    DECLARE_EVENT_TABLE()
-
-public:
-    wxRichTextFontListBox()
-    {
-        Init();
-    }
-    wxRichTextFontListBox(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0);
-    virtual ~wxRichTextFontListBox();
-
-    void Init()
-    {
-    }
-
-    bool Create(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0);
-
-    /// Creates a suitable HTML fragment for a font
-    wxString CreateHTML(const wxString& facename) const;
-
-    /// Get font name for index
-    wxString GetFaceName(size_t i) const ;
-
-    /// Set selection for string, returning the index.
-    int SetFaceNameSelection(const wxString& name);
-
-    /// Updates the font list
-    void UpdateFonts();
-
-    /// Does this face name exist?
-    bool HasFaceName(const wxString& faceName) const { return m_faceNames.Index(faceName) != wxNOT_FOUND; }
-
-    /// Returns the array of face names
-    const wxArrayString& GetFaceNames() const { return m_faceNames; }
-
-protected:
-    /// Returns the HTML for this item
-    virtual wxString OnGetItem(size_t n) const;
-
-private:
-
-    wxArrayString           m_faceNames;
-};
-
-#endif
-    // wxUSE_RICHTEXT
-
-#endif
-    // _WX_RICHTEXTFORMATDLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtexthtml.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtexthtml.h
deleted file mode 100644
index 9761384f81..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtexthtml.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtexthtml.h
-// Purpose:     HTML I/O for wxRichTextCtrl
-// Author:      Julian Smart
-// Modified by:
-// Created:     2005-09-30
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RICHTEXTHTML_H_
-#define _WX_RICHTEXTHTML_H_
-
-/*!
- * Includes
- */
-
-#include "wx/richtext/richtextbuffer.h"
-
-// Use CSS styles where applicable, otherwise use non-CSS workarounds
-#define wxRICHTEXT_HANDLER_USE_CSS 0x1000
-
-/*!
- * wxRichTextHTMLHandler
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextHTMLHandler: public wxRichTextFileHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxRichTextHTMLHandler)
-public:
-    wxRichTextHTMLHandler(const wxString& name = wxT("HTML"), const wxString& ext = wxT("html"), int type = wxRICHTEXT_TYPE_HTML);
-
-    /// Can we save using this handler?
-    virtual bool CanSave() const { return true; }
-
-    /// Can we load using this handler?
-    virtual bool CanLoad() const { return false; }
-
-    /// Can we handle this filename (if using files)? By default, checks the extension.
-    virtual bool CanHandle(const wxString& filename) const;
-
-// Accessors and operations unique to this handler
-
-    /// Set and get the list of image locations generated by the last operation
-    void SetTemporaryImageLocations(const wxArrayString& locations) { m_imageLocations = locations; }
-    const wxArrayString& GetTemporaryImageLocations() const { return m_imageLocations; }
-
-    /// Clear the image locations generated by the last operation
-    void ClearTemporaryImageLocations() { m_imageLocations.Clear(); }
-
-    /// Delete the in-memory or temporary files generated by the last operation
-    bool DeleteTemporaryImages();
-
-    /// Delete the in-memory or temporary files generated by the last operation. This is a static
-    /// function that can be used to delete the saved locations from an earlier operation,
-    /// for example after the user has viewed the HTML file.
-    static bool DeleteTemporaryImages(int flags, const wxArrayString& imageLocations);
-
-    /// Reset the file counter, in case, for example, the same names are required each time
-    static void SetFileCounter(int counter) { sm_fileCounter = counter; }
-
-    /// Set and get the directory for storing temporary files. If empty, the system
-    /// temporary directory will be used.
-    void SetTempDir(const wxString& tempDir) { m_tempDir = tempDir; }
-    const wxString& GetTempDir() const { return m_tempDir; }
-
-    /// Set and get mapping from point size to HTML font size. There should be 7 elements,
-    /// one for each HTML font size, each element specifying the maximum point size for that
-    /// HTML font size. E.g. 8, 10, 13, 17, 22, 29, 100
-    void SetFontSizeMapping(const wxArrayInt& fontSizeMapping) { m_fontSizeMapping = fontSizeMapping; }
-    wxArrayInt GetFontSizeMapping() const { return m_fontSizeMapping; }
-
-protected:
-
-// Implementation
-
-#if wxUSE_STREAMS
-    virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream);
-    virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream);
-
-    /// Output character formatting
-    void BeginCharacterFormatting(const wxRichTextAttr& currentStyle, const wxRichTextAttr& thisStyle, const wxRichTextAttr& paraStyle, wxTextOutputStream& stream );
-    void EndCharacterFormatting(const wxRichTextAttr& currentStyle, const wxRichTextAttr& thisStyle, const wxRichTextAttr& paraStyle, wxTextOutputStream& stream );
-
-    /// Output paragraph formatting
-    void BeginParagraphFormatting(const wxRichTextAttr& currentStyle, const wxRichTextAttr& thisStyle, wxTextOutputStream& stream);
-    void EndParagraphFormatting(const wxRichTextAttr& currentStyle, const wxRichTextAttr& thisStyle, wxTextOutputStream& stream);
-
-    /// Output font tag
-    void OutputFont(const wxRichTextAttr& style, wxTextOutputStream& stream);
-
-    /// Closes lists to level (-1 means close all)
-    void CloseLists(int level, wxTextOutputStream& str);
-
-    /// Writes an image to its base64 equivalent, or to the memory filesystem, or to a file
-    void WriteImage(wxRichTextImage* image, wxOutputStream& stream);
-
-    /// Converts from pt to size property compatible height
-    long PtToSize(long size);
-
-    /// Typical base64 encoder
-    wxChar* b64enc(unsigned char* input, size_t in_len);
-
-    /// Gets the mime type of the given wxBITMAP_TYPE
-    const wxChar* GetMimeType(int imageType);
-
-    /// Gets the html equivalent of the specified value
-    wxString GetAlignment(const wxRichTextAttr& thisStyle);
-
-    /// Generates   array for indentations
-    wxString SymbolicIndent(long indent);
-
-    /// Finds the html equivalent of the specified bullet
-    int TypeOfList(const wxRichTextAttr& thisStyle, wxString& tag);
-#endif
-
-// Data members
-
-    wxRichTextBuffer* m_buffer;
-
-    /// Indentation values of the table tags
-    wxArrayInt      m_indents;
-
-    /// Stack of list types: 0 = ol, 1 = ul
-    wxArrayInt      m_listTypes;
-
-    /// Is there any opened font tag?
-    bool            m_font;
-
-    /// Are we in a table?
-    bool            m_inTable;
-
-    /// A list of the image files or in-memory images created by the last operation.
-    wxArrayString   m_imageLocations;
-
-    /// A location for the temporary files
-    wxString        m_tempDir;
-
-    /// A mapping from point size to HTML font size
-    wxArrayInt      m_fontSizeMapping;
-
-    /// A counter for generating filenames
-    static int      sm_fileCounter;
-};
-
-#endif
-    // _WX_RICHTEXTXML_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextimagedlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextimagedlg.h
deleted file mode 100644
index 96d67aecc0..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextimagedlg.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextimagedlg.h
-// Purpose:
-// Author:      Mingquan Yang
-// Modified by: Julian Smart
-// Created:     Wed 02 Jun 2010 11:27:23 CST
-// RCS-ID:
-// Copyright:   (c) Mingquan Yang, Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#include "wx/dialog.h"
-
-#ifndef _RICHTEXTIMAGEDLG_H_
-#define _RICHTEXTIMAGEDLG_H_
-
-/*!
- * Forward declarations
- */
-
-class WXDLLIMPEXP_FWD_CORE wxButton;
-class WXDLLIMPEXP_FWD_CORE wxComboBox;
-class WXDLLIMPEXP_FWD_CORE wxCheckBox;
-class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
-
-/*!
- * Includes
- */
-
-#include "wx/richtext/richtextbuffer.h"
-#include "wx/richtext/richtextformatdlg.h"
-
-/*!
- * Control identifiers
- */
-
-#define SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_STYLE wxDEFAULT_DIALOG_STYLE|wxTAB_TRAVERSAL
-#define SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_TITLE wxGetTranslation("Object Properties")
-#define SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_IDNAME ID_RICHTEXTOBJECTPROPERTIESDIALOG
-#define SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_SIZE wxSize(400, 300)
-#define SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_POSITION wxDefaultPosition
-
-/*!
- * wxRichTextObjectPropertiesDialog class declaration
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextObjectPropertiesDialog: public wxRichTextFormattingDialog
-{    
-    DECLARE_DYNAMIC_CLASS( wxRichTextObjectPropertiesDialog )
-    DECLARE_EVENT_TABLE()
-
-public:
-    /// Constructors
-    wxRichTextObjectPropertiesDialog();
-    wxRichTextObjectPropertiesDialog( wxRichTextObject* obj, wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_IDNAME, const wxString& caption = SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_SIZE, long style = SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_STYLE );
-
-    /// Creation
-    bool Create( wxRichTextObject* obj, wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_IDNAME, const wxString& caption = SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_SIZE, long style = SYMBOL_WXRICHTEXTOBJECTPROPERTIESDIALOG_STYLE );
-
-    /// Destructor
-    ~wxRichTextObjectPropertiesDialog();
-
-    /// Initialises member variables
-    void Init();
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-////@begin wxRichTextObjectPropertiesDialog event handler declarations
-
-////@end wxRichTextObjectPropertiesDialog event handler declarations
-
-////@begin wxRichTextObjectPropertiesDialog member function declarations
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end wxRichTextObjectPropertiesDialog member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-////@begin wxRichTextObjectPropertiesDialog member variables
-    /// Control identifiers
-    enum {
-        ID_RICHTEXTOBJECTPROPERTIESDIALOG = 10650
-    };
-////@end wxRichTextObjectPropertiesDialog member variables
-};
-
-#endif
-    // _RICHTEXTIMAGEDLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextindentspage.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextindentspage.h
deleted file mode 100644
index 8a5f3cb31c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextindentspage.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextindentspage.h
-// Purpose:
-// Author:      Julian Smart
-// Modified by:
-// Created:     10/3/2006 2:28:21 PM
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _RICHTEXTINDENTSPAGE_H_
-#define _RICHTEXTINDENTSPAGE_H_
-
-/*!
- * Includes
- */
-
-#include "wx/richtext/richtextdialogpage.h"
-
-////@begin includes
-#include "wx/statline.h"
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-class wxRichTextCtrl;
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_STYLE wxRESIZE_BORDER|wxTAB_TRAVERSAL
-#define SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_TITLE wxEmptyString
-#define SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_IDNAME ID_RICHTEXTINDENTSSPACINGPAGE
-#define SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_SIZE wxSize(400, 300)
-#define SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_POSITION wxDefaultPosition
-////@end control identifiers
-
-/*!
- * wxRichTextIndentsSpacingPage class declaration
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextIndentsSpacingPage: public wxRichTextDialogPage
-{
-    DECLARE_DYNAMIC_CLASS( wxRichTextIndentsSpacingPage )
-    DECLARE_EVENT_TABLE()
-    DECLARE_HELP_PROVISION()
-
-public:
-    /// Constructors
-    wxRichTextIndentsSpacingPage( );
-    wxRichTextIndentsSpacingPage( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_SIZE, long style = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_SIZE, long style = SYMBOL_WXRICHTEXTINDENTSSPACINGPAGE_STYLE );
-
-    /// Initialise members
-    void Init();
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-    /// Transfer data from/to window
-    virtual bool TransferDataFromWindow();
-    virtual bool TransferDataToWindow();
-
-    /// Updates the paragraph preview
-    void UpdatePreview();
-
-    /// Gets the attributes associated with the main formatting dialog
-    wxRichTextAttr* GetAttributes();
-
-////@begin wxRichTextIndentsSpacingPage event handler declarations
-
-    /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_LEFT
-    void OnAlignmentLeftSelected( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_RIGHT
-    void OnAlignmentRightSelected( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_JUSTIFIED
-    void OnAlignmentJustifiedSelected( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_CENTRED
-    void OnAlignmentCentredSelected( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_RADIOBUTTON_SELECTED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_INDETERMINATE
-    void OnAlignmentIndeterminateSelected( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT
-    void OnIndentLeftUpdated( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST
-    void OnIndentLeftFirstUpdated( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT
-    void OnIndentRightUpdated( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_OUTLINELEVEL
-    void OnRichtextOutlinelevelSelected( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE
-    void OnSpacingBeforeUpdated( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_TEXT_UPDATED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER
-    void OnSpacingAfterUpdated( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_COMBOBOX_SELECTED event handler for ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE
-    void OnSpacingLineSelected( wxCommandEvent& event );
-
-////@end wxRichTextIndentsSpacingPage event handler declarations
-
-////@begin wxRichTextIndentsSpacingPage member function declarations
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end wxRichTextIndentsSpacingPage member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-////@begin wxRichTextIndentsSpacingPage member variables
-    wxRadioButton* m_alignmentLeft;
-    wxRadioButton* m_alignmentRight;
-    wxRadioButton* m_alignmentJustified;
-    wxRadioButton* m_alignmentCentred;
-    wxRadioButton* m_alignmentIndeterminate;
-    wxTextCtrl* m_indentLeft;
-    wxTextCtrl* m_indentLeftFirst;
-    wxTextCtrl* m_indentRight;
-    wxComboBox* m_outlineLevelCtrl;
-    wxTextCtrl* m_spacingBefore;
-    wxTextCtrl* m_spacingAfter;
-    wxComboBox* m_spacingLine;
-    wxCheckBox* m_pageBreakCtrl;
-    wxRichTextCtrl* m_previewCtrl;
-    /// Control identifiers
-    enum {
-        ID_RICHTEXTINDENTSSPACINGPAGE = 10100,
-        ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_LEFT = 10102,
-        ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_RIGHT = 10110,
-        ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_JUSTIFIED = 10111,
-        ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_CENTRED = 10112,
-        ID_RICHTEXTINDENTSSPACINGPAGE_ALIGNMENT_INDETERMINATE = 10101,
-        ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT = 10103,
-        ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_LEFT_FIRST = 10104,
-        ID_RICHTEXTINDENTSSPACINGPAGE_INDENT_RIGHT = 10113,
-        ID_RICHTEXTINDENTSSPACINGPAGE_OUTLINELEVEL = 10105,
-        ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_BEFORE = 10114,
-        ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_AFTER = 10116,
-        ID_RICHTEXTINDENTSSPACINGPAGE_SPACING_LINE = 10115,
-        ID_RICHTEXTINDENTSSPACINGPAGE_PAGEBREAK = 10106,
-        ID_RICHTEXTINDENTSSPACINGPAGE_PREVIEW_CTRL = 10109
-    };
-////@end wxRichTextIndentsSpacingPage member variables
-
-    bool m_dontUpdate;
-};
-
-#endif
-    // _RICHTEXTINDENTSPAGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextliststylepage.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextliststylepage.h
deleted file mode 100644
index c63b7f6dc8..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextliststylepage.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextliststylepage.h
-// Purpose:
-// Author:      Julian Smart
-// Modified by:
-// Created:     10/18/2006 11:36:37 AM
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _RICHTEXTLISTSTYLEPAGE_H_
-#define _RICHTEXTLISTSTYLEPAGE_H_
-
-/*!
- * Includes
- */
-
-#include "wx/richtext/richtextdialogpage.h"
-
-////@begin includes
-#include "wx/spinctrl.h"
-#include "wx/notebook.h"
-#include "wx/statline.h"
-////@end includes
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define SYMBOL_WXRICHTEXTLISTSTYLEPAGE_STYLE wxRESIZE_BORDER|wxTAB_TRAVERSAL
-#define SYMBOL_WXRICHTEXTLISTSTYLEPAGE_TITLE wxEmptyString
-#define SYMBOL_WXRICHTEXTLISTSTYLEPAGE_IDNAME ID_RICHTEXTLISTSTYLEPAGE
-#define SYMBOL_WXRICHTEXTLISTSTYLEPAGE_SIZE wxSize(400, 300)
-#define SYMBOL_WXRICHTEXTLISTSTYLEPAGE_POSITION wxDefaultPosition
-////@end control identifiers
-
-/*!
- * wxRichTextListStylePage class declaration
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextListStylePage: public wxRichTextDialogPage
-{
-    DECLARE_DYNAMIC_CLASS( wxRichTextListStylePage )
-    DECLARE_EVENT_TABLE()
-    DECLARE_HELP_PROVISION()
-
-public:
-    /// Constructors
-    wxRichTextListStylePage( );
-    wxRichTextListStylePage( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_SIZE, long style = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_SIZE, long style = SYMBOL_WXRICHTEXTLISTSTYLEPAGE_STYLE );
-
-    /// Initialises member variables
-    void Init();
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-    /// Updates the bullets preview
-    void UpdatePreview();
-
-    /// Transfer data from/to window
-    virtual bool TransferDataFromWindow();
-    virtual bool TransferDataToWindow();
-
-    /// Get attributes for selected level
-    wxRichTextAttr* GetAttributesForSelection();
-
-    /// Update for symbol-related controls
-    void OnSymbolUpdate( wxUpdateUIEvent& event );
-
-    /// Update for number-related controls
-    void OnNumberUpdate( wxUpdateUIEvent& event );
-
-    /// Update for standard bullet-related controls
-    void OnStandardBulletUpdate( wxUpdateUIEvent& event );
-
-    /// Just transfer to the window
-    void DoTransferDataToWindow();
-
-    /// Transfer from the window and preview
-    void TransferAndPreview();
-
-////@begin wxRichTextListStylePage event handler declarations
-
-    /// wxEVT_SPINCTRL event handler for ID_RICHTEXTLISTSTYLEPAGE_LEVEL
-    void OnLevelUpdated( wxSpinEvent& event );
-
-    /// wxEVT_SCROLL_LINEUP event handler for ID_RICHTEXTLISTSTYLEPAGE_LEVEL
-    void OnLevelUp( wxSpinEvent& event );
-
-    /// wxEVT_SCROLL_LINEDOWN event handler for ID_RICHTEXTLISTSTYLEPAGE_LEVEL
-    void OnLevelDown( wxSpinEvent& event );
-
-    /// wxEVT_TEXT event handler for ID_RICHTEXTLISTSTYLEPAGE_LEVEL
-    void OnLevelTextUpdated( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_LEVEL
-    void OnLevelUIUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_BUTTON event handler for ID_RICHTEXTLISTSTYLEPAGE_CHOOSE_FONT
-    void OnChooseFontClick( wxCommandEvent& event );
-
-    /// wxEVT_LISTBOX event handler for ID_RICHTEXTLISTSTYLEPAGE_STYLELISTBOX
-    void OnStylelistboxSelected( wxCommandEvent& event );
-
-    /// wxEVT_CHECKBOX event handler for ID_RICHTEXTLISTSTYLEPAGE_PERIODCTRL
-    void OnPeriodctrlClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_PERIODCTRL
-    void OnPeriodctrlUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_CHECKBOX event handler for ID_RICHTEXTLISTSTYLEPAGE_PARENTHESESCTRL
-    void OnParenthesesctrlClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_PARENTHESESCTRL
-    void OnParenthesesctrlUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_CHECKBOX event handler for ID_RICHTEXTLISTSTYLEPAGE_RIGHTPARENTHESISCTRL
-    void OnRightParenthesisCtrlClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_RIGHTPARENTHESISCTRL
-    void OnRightParenthesisCtrlUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_COMBOBOX event handler for ID_RICHTEXTLISTSTYLEPAGE_BULLETALIGNMENTCTRL
-    void OnBulletAlignmentCtrlSelected( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_SYMBOLSTATIC
-    void OnSymbolstaticUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_COMBOBOX event handler for ID_RICHTEXTLISTSTYLEPAGE_SYMBOLCTRL
-    void OnSymbolctrlSelected( wxCommandEvent& event );
-
-    /// wxEVT_TEXT event handler for ID_RICHTEXTLISTSTYLEPAGE_SYMBOLCTRL
-    void OnSymbolctrlUpdated( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_SYMBOLCTRL
-    void OnSymbolctrlUIUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_BUTTON event handler for ID_RICHTEXTLISTSTYLEPAGE_CHOOSE_SYMBOL
-    void OnChooseSymbolClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_CHOOSE_SYMBOL
-    void OnChooseSymbolUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_COMBOBOX event handler for ID_RICHTEXTLISTSTYLEPAGE_SYMBOLFONTCTRL
-    void OnSymbolfontctrlSelected( wxCommandEvent& event );
-
-    /// wxEVT_TEXT event handler for ID_RICHTEXTLISTSTYLEPAGE_SYMBOLFONTCTRL
-    void OnSymbolfontctrlUpdated( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_SYMBOLFONTCTRL
-    void OnSymbolfontctrlUIUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_NAMESTATIC
-    void OnNamestaticUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_COMBOBOX event handler for ID_RICHTEXTLISTSTYLEPAGE_NAMECTRL
-    void OnNamectrlSelected( wxCommandEvent& event );
-
-    /// wxEVT_TEXT event handler for ID_RICHTEXTLISTSTYLEPAGE_NAMECTRL
-    void OnNamectrlUpdated( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTLISTSTYLEPAGE_NAMECTRL
-    void OnNamectrlUIUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_RADIOBUTTON event handler for ID_RICHTEXTLISTSTYLEPAGE_ALIGNLEFT
-    void OnRichtextliststylepageAlignleftSelected( wxCommandEvent& event );
-
-    /// wxEVT_RADIOBUTTON event handler for ID_RICHTEXTLISTSTYLEPAGE_ALIGNRIGHT
-    void OnRichtextliststylepageAlignrightSelected( wxCommandEvent& event );
-
-    /// wxEVT_RADIOBUTTON event handler for ID_RICHTEXTLISTSTYLEPAGE_JUSTIFIED
-    void OnRichtextliststylepageJustifiedSelected( wxCommandEvent& event );
-
-    /// wxEVT_RADIOBUTTON event handler for ID_RICHTEXTLISTSTYLEPAGE_CENTERED
-    void OnRichtextliststylepageCenteredSelected( wxCommandEvent& event );
-
-    /// wxEVT_RADIOBUTTON event handler for ID_RICHTEXTLISTSTYLEPAGE_ALIGNINDETERMINATE
-    void OnRichtextliststylepageAlignindeterminateSelected( wxCommandEvent& event );
-
-    /// wxEVT_TEXT event handler for ID_RICHTEXTLISTSTYLEPAGE_INDENTLEFT
-    void OnIndentLeftUpdated( wxCommandEvent& event );
-
-    /// wxEVT_TEXT event handler for ID_RICHTEXTLISTSTYLEPAGE_INDENTFIRSTLINE
-    void OnIndentFirstLineUpdated( wxCommandEvent& event );
-
-    /// wxEVT_TEXT event handler for ID_RICHTEXTLISTSTYLEPAGE_INDENTRIGHT
-    void OnIndentRightUpdated( wxCommandEvent& event );
-
-    /// wxEVT_TEXT event handler for ID_RICHTEXTLISTSTYLEPAGE_SPACINGBEFORE
-    void OnSpacingBeforeUpdated( wxCommandEvent& event );
-
-    /// wxEVT_TEXT event handler for ID_RICHTEXTLISTSTYLEPAGE_SPACINGAFTER
-    void OnSpacingAfterUpdated( wxCommandEvent& event );
-
-    /// wxEVT_COMBOBOX event handler for ID_RICHTEXTLISTSTYLEPAGE_LINESPACING
-    void OnLineSpacingSelected( wxCommandEvent& event );
-
-////@end wxRichTextListStylePage event handler declarations
-
-////@begin wxRichTextListStylePage member function declarations
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end wxRichTextListStylePage member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-////@begin wxRichTextListStylePage member variables
-    wxSpinCtrl* m_levelCtrl;
-    wxListBox* m_styleListBox;
-    wxCheckBox* m_periodCtrl;
-    wxCheckBox* m_parenthesesCtrl;
-    wxCheckBox* m_rightParenthesisCtrl;
-    wxComboBox* m_bulletAlignmentCtrl;
-    wxComboBox* m_symbolCtrl;
-    wxComboBox* m_symbolFontCtrl;
-    wxComboBox* m_bulletNameCtrl;
-    wxRadioButton* m_alignmentLeft;
-    wxRadioButton* m_alignmentRight;
-    wxRadioButton* m_alignmentJustified;
-    wxRadioButton* m_alignmentCentred;
-    wxRadioButton* m_alignmentIndeterminate;
-    wxTextCtrl* m_indentLeft;
-    wxTextCtrl* m_indentLeftFirst;
-    wxTextCtrl* m_indentRight;
-    wxTextCtrl* m_spacingBefore;
-    wxTextCtrl* m_spacingAfter;
-    wxComboBox* m_spacingLine;
-    wxRichTextCtrl* m_previewCtrl;
-    /// Control identifiers
-    enum {
-        ID_RICHTEXTLISTSTYLEPAGE = 10616,
-        ID_RICHTEXTLISTSTYLEPAGE_LEVEL = 10617,
-        ID_RICHTEXTLISTSTYLEPAGE_CHOOSE_FONT = 10604,
-        ID_RICHTEXTLISTSTYLEPAGE_NOTEBOOK = 10618,
-        ID_RICHTEXTLISTSTYLEPAGE_BULLETS = 10619,
-        ID_RICHTEXTLISTSTYLEPAGE_STYLELISTBOX = 10620,
-        ID_RICHTEXTLISTSTYLEPAGE_PERIODCTRL = 10627,
-        ID_RICHTEXTLISTSTYLEPAGE_PARENTHESESCTRL = 10626,
-        ID_RICHTEXTLISTSTYLEPAGE_RIGHTPARENTHESISCTRL = 10602,
-        ID_RICHTEXTLISTSTYLEPAGE_BULLETALIGNMENTCTRL = 10603,
-        ID_RICHTEXTLISTSTYLEPAGE_SYMBOLSTATIC = 10621,
-        ID_RICHTEXTLISTSTYLEPAGE_SYMBOLCTRL = 10622,
-        ID_RICHTEXTLISTSTYLEPAGE_CHOOSE_SYMBOL = 10623,
-        ID_RICHTEXTLISTSTYLEPAGE_SYMBOLFONTCTRL = 10625,
-        ID_RICHTEXTLISTSTYLEPAGE_NAMESTATIC = 10600,
-        ID_RICHTEXTLISTSTYLEPAGE_NAMECTRL = 10601,
-        ID_RICHTEXTLISTSTYLEPAGE_SPACING = 10628,
-        ID_RICHTEXTLISTSTYLEPAGE_ALIGNLEFT = 10629,
-        ID_RICHTEXTLISTSTYLEPAGE_ALIGNRIGHT = 10630,
-        ID_RICHTEXTLISTSTYLEPAGE_JUSTIFIED = 10631,
-        ID_RICHTEXTLISTSTYLEPAGE_CENTERED = 10632,
-        ID_RICHTEXTLISTSTYLEPAGE_ALIGNINDETERMINATE = 10633,
-        ID_RICHTEXTLISTSTYLEPAGE_INDENTLEFT = 10634,
-        ID_RICHTEXTLISTSTYLEPAGE_INDENTFIRSTLINE = 10635,
-        ID_RICHTEXTLISTSTYLEPAGE_INDENTRIGHT = 10636,
-        ID_RICHTEXTLISTSTYLEPAGE_SPACINGBEFORE = 10637,
-        ID_RICHTEXTLISTSTYLEPAGE_SPACINGAFTER = 10638,
-        ID_RICHTEXTLISTSTYLEPAGE_LINESPACING = 10639,
-        ID_RICHTEXTLISTSTYLEPAGE_RICHTEXTCTRL = 10640
-    };
-////@end wxRichTextListStylePage member variables
-
-    bool m_dontUpdate;
-    int m_currentLevel;
-};
-
-#endif
-    // _RICHTEXTLISTSTYLEPAGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextmarginspage.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextmarginspage.h
deleted file mode 100644
index 336316c269..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextmarginspage.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextmarginspage.h
-// Purpose:     
-// Author:      Julian Smart
-// Modified by: 
-// Created:     20/10/2010 10:27:34
-// RCS-ID:      
-// Copyright:   (c) Julian Smart
-// Licence:     
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _RICHTEXTMARGINSPAGE_H_
-#define _RICHTEXTMARGINSPAGE_H_
-
-
-/*!
- * Includes
- */
-
-#include "wx/richtext/richtextdialogpage.h"
-
-////@begin includes
-#include "wx/statline.h"
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define SYMBOL_WXRICHTEXTMARGINSPAGE_STYLE wxTAB_TRAVERSAL
-#define SYMBOL_WXRICHTEXTMARGINSPAGE_TITLE wxEmptyString
-#define SYMBOL_WXRICHTEXTMARGINSPAGE_IDNAME ID_WXRICHTEXTMARGINSPAGE
-#define SYMBOL_WXRICHTEXTMARGINSPAGE_SIZE wxSize(400, 300)
-#define SYMBOL_WXRICHTEXTMARGINSPAGE_POSITION wxDefaultPosition
-////@end control identifiers
-
-
-/*!
- * wxRichTextMarginsPage class declaration
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextMarginsPage: public wxRichTextDialogPage
-{    
-    DECLARE_DYNAMIC_CLASS( wxRichTextMarginsPage )
-    DECLARE_EVENT_TABLE()
-    DECLARE_HELP_PROVISION()
-
-public:
-    /// Constructors
-    wxRichTextMarginsPage();
-    wxRichTextMarginsPage( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTMARGINSPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTMARGINSPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTMARGINSPAGE_SIZE, long style = SYMBOL_WXRICHTEXTMARGINSPAGE_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTMARGINSPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTMARGINSPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTMARGINSPAGE_SIZE, long style = SYMBOL_WXRICHTEXTMARGINSPAGE_STYLE );
-
-    /// Destructor
-    ~wxRichTextMarginsPage();
-
-    /// Initialises member variables
-    void Init();
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-    /// Gets the attributes from the formatting dialog
-    wxRichTextAttr* GetAttributes();
-    
-    /// Data transfer
-    virtual bool TransferDataToWindow();
-    virtual bool TransferDataFromWindow();
-    
-////@begin wxRichTextMarginsPage event handler declarations
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_LEFT_MARGIN
-    void OnRichtextLeftMarginUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_RIGHT_MARGIN
-    void OnRichtextRightMarginUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_TOP_MARGIN
-    void OnRichtextTopMarginUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BOTTOM_MARGIN
-    void OnRichtextBottomMarginUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_LEFT_PADDING
-    void OnRichtextLeftPaddingUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_RIGHT_PADDING
-    void OnRichtextRightPaddingUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_TOP_PADDING
-    void OnRichtextTopPaddingUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BOTTOM_PADDING
-    void OnRichtextBottomPaddingUpdate( wxUpdateUIEvent& event );
-
-////@end wxRichTextMarginsPage event handler declarations
-
-////@begin wxRichTextMarginsPage member function declarations
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end wxRichTextMarginsPage member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-////@begin wxRichTextMarginsPage member variables
-    wxCheckBox* m_leftMarginCheckbox;
-    wxTextCtrl* m_marginLeft;
-    wxComboBox* m_unitsMarginLeft;
-    wxCheckBox* m_rightMarginCheckbox;
-    wxTextCtrl* m_marginRight;
-    wxComboBox* m_unitsMarginRight;
-    wxCheckBox* m_topMarginCheckbox;
-    wxTextCtrl* m_marginTop;
-    wxComboBox* m_unitsMarginTop;
-    wxCheckBox* m_bottomMarginCheckbox;
-    wxTextCtrl* m_marginBottom;
-    wxComboBox* m_unitsMarginBottom;
-    wxCheckBox* m_leftPaddingCheckbox;
-    wxTextCtrl* m_paddingLeft;
-    wxComboBox* m_unitsPaddingLeft;
-    wxCheckBox* m_rightPaddingCheckbox;
-    wxTextCtrl* m_paddingRight;
-    wxComboBox* m_unitsPaddingRight;
-    wxCheckBox* m_topPaddingCheckbox;
-    wxTextCtrl* m_paddingTop;
-    wxComboBox* m_unitsPaddingTop;
-    wxCheckBox* m_bottomPaddingCheckbox;
-    wxTextCtrl* m_paddingBottom;
-    wxComboBox* m_unitsPaddingBottom;
-    /// Control identifiers
-    enum {
-        ID_WXRICHTEXTMARGINSPAGE = 10750,
-        ID_RICHTEXT_LEFT_MARGIN_CHECKBOX = 10751,
-        ID_RICHTEXT_LEFT_MARGIN = 10752,
-        ID_RICHTEXT_LEFT_MARGIN_UNITS = 10753,
-        ID_RICHTEXT_RIGHT_MARGIN_CHECKBOX = 10754,
-        ID_RICHTEXT_RIGHT_MARGIN = 10755,
-        ID_RICHTEXT_RIGHT_MARGIN_UNITS = 10756,
-        ID_RICHTEXT_TOP_MARGIN_CHECKBOX = 10757,
-        ID_RICHTEXT_TOP_MARGIN = 10758,
-        ID_RICHTEXT_TOP_MARGIN_UNITS = 10759,
-        ID_RICHTEXT_BOTTOM_MARGIN_CHECKBOX = 10760,
-        ID_RICHTEXT_BOTTOM_MARGIN = 10761,
-        ID_RICHTEXT_BOTTOM_MARGIN_UNITS = 10762,
-        ID_RICHTEXT_LEFT_PADDING_CHECKBOX = 10763,
-        ID_RICHTEXT_LEFT_PADDING = 10764,
-        ID_RICHTEXT_LEFT_PADDING_UNITS = 10765,
-        ID_RICHTEXT_RIGHT_PADDING_CHECKBOX = 10766,
-        ID_RICHTEXT_RIGHT_PADDING = 10767,
-        ID_RICHTEXT_RIGHT_PADDING_UNITS = 10768,
-        ID_RICHTEXT_TOP_PADDING_CHECKBOX = 10769,
-        ID_RICHTEXT_TOP_PADDING = 10770,
-        ID_RICHTEXT_TOP_PADDING_UNITS = 10771,
-        ID_RICHTEXT_BOTTOM_PADDING_CHECKBOX = 10772,
-        ID_RICHTEXT_BOTTOM_PADDING = 10773,
-        ID_RICHTEXT_BOTTOM_PADDING_UNITS = 10774
-    };
-////@end wxRichTextMarginsPage member variables
-
-    bool    m_ignoreUpdates;
-};
-
-#endif
-    // _RICHTEXTMARGINSPAGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextprint.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextprint.h
deleted file mode 100644
index 5dceccf319..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextprint.h
+++ /dev/null
@@ -1,251 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextprint.h
-// Purpose:     Rich text printing classes
-// Author:      Julian Smart
-// Created:     2006-10-23
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RICHTEXTPRINT_H_
-#define _WX_RICHTEXTPRINT_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_RICHTEXT & wxUSE_PRINTING_ARCHITECTURE
-
-#include "wx/richtext/richtextbuffer.h"
-
-#include "wx/print.h"
-#include "wx/printdlg.h"
-
-#define wxRICHTEXT_PRINT_MAX_PAGES 99999
-
-// Header/footer page identifiers
-enum wxRichTextOddEvenPage {
-    wxRICHTEXT_PAGE_ODD,
-    wxRICHTEXT_PAGE_EVEN,
-    wxRICHTEXT_PAGE_ALL
-};
-
-// Header/footer text locations
-enum wxRichTextPageLocation {
-    wxRICHTEXT_PAGE_LEFT,
-    wxRICHTEXT_PAGE_CENTRE,
-    wxRICHTEXT_PAGE_RIGHT
-};
-
-/*!
- * Header/footer data
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextHeaderFooterData: public wxObject
-{
-public:
-    wxRichTextHeaderFooterData() { Init(); }
-    wxRichTextHeaderFooterData(const wxRichTextHeaderFooterData& data): wxObject() { Copy(data); }
-
-    /// Initialise
-    void Init() { m_headerMargin = 20; m_footerMargin = 20; m_showOnFirstPage = true; }
-
-    /// Copy
-    void Copy(const wxRichTextHeaderFooterData& data);
-
-    /// Assignment
-    void operator= (const wxRichTextHeaderFooterData& data) { Copy(data); }
-
-    /// Set/get header text, e.g. wxRICHTEXT_PAGE_ODD, wxRICHTEXT_PAGE_LEFT
-    void SetHeaderText(const wxString& text, wxRichTextOddEvenPage page = wxRICHTEXT_PAGE_ALL, wxRichTextPageLocation location = wxRICHTEXT_PAGE_CENTRE);
-    wxString GetHeaderText(wxRichTextOddEvenPage page = wxRICHTEXT_PAGE_EVEN, wxRichTextPageLocation location = wxRICHTEXT_PAGE_CENTRE) const;
-
-    /// Set/get footer text, e.g. wxRICHTEXT_PAGE_ODD, wxRICHTEXT_PAGE_LEFT
-    void SetFooterText(const wxString& text, wxRichTextOddEvenPage page = wxRICHTEXT_PAGE_ALL, wxRichTextPageLocation location = wxRICHTEXT_PAGE_CENTRE);
-    wxString GetFooterText(wxRichTextOddEvenPage page = wxRICHTEXT_PAGE_EVEN, wxRichTextPageLocation location = wxRICHTEXT_PAGE_CENTRE) const;
-
-    /// Set/get text
-    void SetText(const wxString& text, int headerFooter, wxRichTextOddEvenPage page, wxRichTextPageLocation location);
-    wxString GetText(int headerFooter, wxRichTextOddEvenPage page, wxRichTextPageLocation location) const;
-
-    /// Set/get margins between text and header or footer, in tenths of a millimeter
-    void SetMargins(int headerMargin, int footerMargin) { m_headerMargin = headerMargin; m_footerMargin = footerMargin; }
-    int GetHeaderMargin() const { return m_headerMargin; }
-    int GetFooterMargin() const { return m_footerMargin; }
-
-    /// Set/get whether to show header or footer on first page
-    void SetShowOnFirstPage(bool showOnFirstPage) { m_showOnFirstPage = showOnFirstPage; }
-    bool GetShowOnFirstPage() const { return m_showOnFirstPage; }
-
-    /// Clear all text
-    void Clear();
-
-    /// Set/get font
-    void SetFont(const wxFont& font) { m_font = font; }
-    const wxFont& GetFont() const { return m_font; }
-
-    /// Set/get colour
-    void SetTextColour(const wxColour& col) { m_colour = col; }
-    const wxColour& GetTextColour() const { return m_colour; }
-
-    DECLARE_CLASS(wxRichTextHeaderFooterData)
-
-private:
-
-    // Strings for left, centre, right, top, bottom, odd, even
-    wxString    m_text[12];
-    wxFont      m_font;
-    wxColour    m_colour;
-    int         m_headerMargin;
-    int         m_footerMargin;
-    bool        m_showOnFirstPage;
-};
-
-/*!
- * wxRichTextPrintout
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextPrintout : public wxPrintout
-{
-public:
-    wxRichTextPrintout(const wxString& title = wxGetTranslation("Printout"));
-    virtual ~wxRichTextPrintout();
-
-    /// The buffer to print
-    void SetRichTextBuffer(wxRichTextBuffer* buffer) { m_richTextBuffer = buffer; }
-    wxRichTextBuffer* GetRichTextBuffer() const { return m_richTextBuffer; }
-
-    /// Set/get header/footer data
-    void SetHeaderFooterData(const wxRichTextHeaderFooterData& data) { m_headerFooterData = data; }
-    const wxRichTextHeaderFooterData& GetHeaderFooterData() const { return m_headerFooterData; }
-
-    /// Sets margins in 10ths of millimetre. Defaults to 1 inch for margins.
-    void SetMargins(int top = 254, int bottom = 254, int left = 254, int right = 254);
-
-    /// Calculate scaling and rectangles, setting the device context scaling
-    void CalculateScaling(wxDC* dc, wxRect& textRect, wxRect& headerRect, wxRect& footerRect);
-
-    // wxPrintout virtual functions
-    virtual bool OnPrintPage(int page);
-    virtual bool HasPage(int page);
-    virtual void GetPageInfo(int *minPage, int *maxPage, int *selPageFrom, int *selPageTo);
-    virtual bool OnBeginDocument(int startPage, int endPage);
-    virtual void OnPreparePrinting();
-
-private:
-
-    /// Renders one page into dc
-    void RenderPage(wxDC *dc, int page);
-
-    /// Substitute keywords
-    static bool SubstituteKeywords(wxString& str, const wxString& title, int pageNum, int pageCount);
-
-private:
-
-    wxRichTextBuffer*           m_richTextBuffer;
-    int                         m_numPages;
-    wxArrayInt                  m_pageBreaksStart;
-    wxArrayInt                  m_pageBreaksEnd;
-    wxArrayInt                  m_pageYOffsets;
-    int                         m_marginLeft, m_marginTop, m_marginRight, m_marginBottom;
-
-    wxRichTextHeaderFooterData  m_headerFooterData;
-
-    wxDECLARE_NO_COPY_CLASS(wxRichTextPrintout);
-};
-
-/*
- *! wxRichTextPrinting
- * A simple interface to perform wxRichTextBuffer printing.
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextPrinting : public wxObject
-{
-public:
-    wxRichTextPrinting(const wxString& name = wxGetTranslation("Printing"), wxWindow *parentWindow = NULL);
-    virtual ~wxRichTextPrinting();
-
-    /// Preview the file or buffer
-#if wxUSE_FFILE && wxUSE_STREAMS
-    bool PreviewFile(const wxString& richTextFile);
-#endif
-    bool PreviewBuffer(const wxRichTextBuffer& buffer);
-
-    /// Print the file or buffer
-#if wxUSE_FFILE && wxUSE_STREAMS
-    bool PrintFile(const wxString& richTextFile, bool showPrintDialog = true);
-#endif
-    bool PrintBuffer(const wxRichTextBuffer& buffer, bool showPrintDialog = true);
-
-    /// Shows page setup dialog
-    void PageSetup();
-
-    /// Set/get header/footer data
-    void SetHeaderFooterData(const wxRichTextHeaderFooterData& data) { m_headerFooterData = data; }
-    const wxRichTextHeaderFooterData& GetHeaderFooterData() const { return m_headerFooterData; }
-
-    /// Set/get header text, e.g. wxRICHTEXT_PAGE_ODD, wxRICHTEXT_PAGE_LEFT
-    void SetHeaderText(const wxString& text, wxRichTextOddEvenPage page = wxRICHTEXT_PAGE_ALL, wxRichTextPageLocation location = wxRICHTEXT_PAGE_CENTRE);
-    wxString GetHeaderText(wxRichTextOddEvenPage page = wxRICHTEXT_PAGE_EVEN, wxRichTextPageLocation location = wxRICHTEXT_PAGE_CENTRE) const;
-
-    /// Set/get footer text, e.g. wxRICHTEXT_PAGE_ODD, wxRICHTEXT_PAGE_LEFT
-    void SetFooterText(const wxString& text, wxRichTextOddEvenPage page = wxRICHTEXT_PAGE_ALL, wxRichTextPageLocation location = wxRICHTEXT_PAGE_CENTRE);
-    wxString GetFooterText(wxRichTextOddEvenPage page = wxRICHTEXT_PAGE_EVEN, wxRichTextPageLocation location = wxRICHTEXT_PAGE_CENTRE) const;
-
-    /// Show header/footer on first page, or not
-    void SetShowOnFirstPage(bool show) { m_headerFooterData.SetShowOnFirstPage(show); }
-
-    /// Set the font
-    void SetHeaderFooterFont(const wxFont& font) { m_headerFooterData.SetFont(font); }
-
-    /// Set the colour
-    void SetHeaderFooterTextColour(const wxColour& font) { m_headerFooterData.SetTextColour(font); }
-
-    /// Get print and page setup data
-    wxPrintData *GetPrintData();
-    wxPageSetupDialogData *GetPageSetupData() { return m_pageSetupData; }
-
-    /// Set print and page setup data
-    void SetPrintData(const wxPrintData& printData);
-    void SetPageSetupData(const wxPageSetupDialogData& pageSetupData);
-
-    /// Set the rich text buffer pointer, deleting the existing object if present
-    void SetRichTextBufferPreview(wxRichTextBuffer* buf);
-    wxRichTextBuffer* GetRichTextBufferPreview() const { return m_richTextBufferPreview; }
-
-    void SetRichTextBufferPrinting(wxRichTextBuffer* buf);
-    wxRichTextBuffer* GetRichTextBufferPrinting() const { return m_richTextBufferPrinting; }
-
-    /// Set/get the parent window
-    void SetParentWindow(wxWindow* parent) { m_parentWindow = parent; }
-    wxWindow* GetParentWindow() const { return m_parentWindow; }
-
-    /// Set/get the title
-    void SetTitle(const wxString& title) { m_title = title; }
-    const wxString& GetTitle() const { return m_title; }
-
-    /// Set/get the preview rect
-    void SetPreviewRect(const wxRect& rect) { m_previewRect = rect; }
-    const wxRect& GetPreviewRect() const { return m_previewRect; }
-
-protected:
-    virtual wxRichTextPrintout *CreatePrintout();
-    virtual bool DoPreview(wxRichTextPrintout *printout1, wxRichTextPrintout *printout2);
-    virtual bool DoPrint(wxRichTextPrintout *printout, bool showPrintDialog);
-
-private:
-    wxPrintData*                m_printData;
-    wxPageSetupDialogData*      m_pageSetupData;
-
-    wxRichTextHeaderFooterData  m_headerFooterData;
-    wxString                    m_title;
-    wxWindow*                   m_parentWindow;
-    wxRichTextBuffer*           m_richTextBufferPreview;
-    wxRichTextBuffer*           m_richTextBufferPrinting;
-    wxRect                      m_previewRect;
-
-    wxDECLARE_NO_COPY_CLASS(wxRichTextPrinting);
-};
-
-#endif  // wxUSE_RICHTEXT & wxUSE_PRINTING_ARCHITECTURE
-
-#endif // _WX_RICHTEXTPRINT_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextsizepage.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextsizepage.h
deleted file mode 100644
index dfba99fd6a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextsizepage.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextsizepage.h
-// Purpose:
-// Author:      Julian Smart
-// Modified by:
-// Created:     20/10/2010 10:23:24
-// RCS-ID:
-// Copyright:   (c) Julian Smart
-// Licence:
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _RICHTEXTSIZEPAGE_H_
-#define _RICHTEXTSIZEPAGE_H_
-
-/*!
- * Includes
- */
-
-#include "wx/richtext/richtextdialogpage.h"
-#include "wx/sizer.h"
-
-////@begin includes
-#include "wx/statline.h"
-#include "wx/valgen.h"
-////@end includes
-#include "wx/stattext.h"
-
-/*!
- * Forward declarations
- */
-
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define SYMBOL_WXRICHTEXTSIZEPAGE_STYLE wxTAB_TRAVERSAL
-#define SYMBOL_WXRICHTEXTSIZEPAGE_TITLE wxEmptyString
-#define SYMBOL_WXRICHTEXTSIZEPAGE_IDNAME ID_WXRICHTEXTSIZEPAGE
-#define SYMBOL_WXRICHTEXTSIZEPAGE_SIZE wxSize(400, 300)
-#define SYMBOL_WXRICHTEXTSIZEPAGE_POSITION wxDefaultPosition
-////@end control identifiers
-
-
-/*!
- * wxRichTextSizePage class declaration
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextSizePage: public wxRichTextDialogPage
-{
-    DECLARE_DYNAMIC_CLASS( wxRichTextSizePage )
-    DECLARE_EVENT_TABLE()
-    DECLARE_HELP_PROVISION()
-
-public:
-    /// Constructors
-    wxRichTextSizePage();
-    wxRichTextSizePage( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTSIZEPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTSIZEPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSIZEPAGE_SIZE, long style = SYMBOL_WXRICHTEXTSIZEPAGE_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = SYMBOL_WXRICHTEXTSIZEPAGE_IDNAME, const wxPoint& pos = SYMBOL_WXRICHTEXTSIZEPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSIZEPAGE_SIZE, long style = SYMBOL_WXRICHTEXTSIZEPAGE_STYLE );
-
-    /// Destructor
-    ~wxRichTextSizePage();
-
-    /// Initialises member variables
-    void Init();
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-    /// Gets the attributes from the formatting dialog
-    wxRichTextAttr* GetAttributes();
-
-    /// Data transfer
-    virtual bool TransferDataToWindow();
-    virtual bool TransferDataFromWindow();
-
-    /// Show/hide position controls
-    static void ShowPositionControls(bool show) { sm_showPositionControls = show; }
-
-    /// Show/hide minimum and maximum size controls
-    static void ShowMinMaxSizeControls(bool show) { sm_showMinMaxSizeControls = show; }
-
-    /// Show/hide position mode controls
-    static void ShowPositionModeControls(bool show) { sm_showPositionModeControls = show; }
-
-    /// Show/hide right/bottom position controls
-    static void ShowRightBottomPositionControls(bool show) { sm_showRightBottomPositionControls = show; }
-
-    /// Show/hide floating and alignment controls
-    static void ShowFloatingAndAlignmentControls(bool show) { sm_showFloatingAndAlignmentControls = show; }
-
-    /// Show/hide floating controls
-    static void ShowFloatingControls(bool show) { sm_showFloatingControls = show; }
-
-    /// Show/hide alignment controls
-    static void ShowAlignmentControls(bool show) { sm_showAlignmentControls = show; }
-
-    /// Enable the position and size units
-    static void EnablePositionAndSizeUnits(bool enable) { sm_enablePositionAndSizeUnits = enable; }
-
-    /// Enable the checkboxes for position and size
-    static void EnablePositionAndSizeCheckboxes(bool enable) { sm_enablePositionAndSizeCheckboxes = enable; }
-
-////@begin wxRichTextSizePage event handler declarations
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX
-    void OnRichtextVerticalAlignmentComboboxUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_WIDTH
-    void OnRichtextWidthUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_UNITS_W
-    void OnRichtextWidthUnitsUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_HEIGHT
-    void OnRichtextHeightUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_UNITS_H
-    void OnRichtextHeightUnitsUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_MIN_WIDTH
-    void OnRichtextMinWidthUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_MIN_HEIGHT
-    void OnRichtextMinHeightUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_MAX_WIDTH
-    void OnRichtextMaxWidthUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_MAX_HEIGHT
-    void OnRichtextMaxHeightUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_LEFT
-    void OnRichtextLeftUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_LEFT_UNITS
-    void OnRichtextLeftUnitsUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_TOP
-    void OnRichtextTopUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_TOP_UNITS
-    void OnRichtextTopUnitsUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_RIGHT
-    void OnRichtextRightUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_RIGHT_UNITS
-    void OnRichtextRightUnitsUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BOTTOM
-    void OnRichtextBottomUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXT_BOTTOM_UNITS
-    void OnRichtextBottomUnitsUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RICHTEXT_PARA_UP
-    void OnRichtextParaUpClick( wxCommandEvent& event );
-
-    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RICHTEXT_PARA_DOWN
-    void OnRichtextParaDownClick( wxCommandEvent& event );
-
-////@end wxRichTextSizePage event handler declarations
-
-////@begin wxRichTextSizePage member function declarations
-
-    int GetPositionMode() const { return m_positionMode ; }
-    void SetPositionMode(int value) { m_positionMode = value ; }
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end wxRichTextSizePage member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-////@begin wxRichTextSizePage member variables
-    wxBoxSizer* m_parentSizer;
-    wxBoxSizer* m_floatingAlignmentSizer;
-    wxBoxSizer* m_floatingSizer;
-    wxChoice* m_float;
-    wxBoxSizer* m_alignmentSizer;
-    wxCheckBox* m_verticalAlignmentCheckbox;
-    wxChoice* m_verticalAlignmentComboBox;
-    wxFlexGridSizer* m_sizeSizer;
-    wxBoxSizer* m_widthSizer;
-    wxCheckBox* m_widthCheckbox;
-    wxStaticText* m_widthLabel;
-    wxTextCtrl* m_width;
-    wxComboBox* m_unitsW;
-    wxBoxSizer* m_heightSizer;
-    wxCheckBox* m_heightCheckbox;
-    wxStaticText* m_heightLabel;
-    wxTextCtrl* m_height;
-    wxComboBox* m_unitsH;
-    wxCheckBox* m_minWidthCheckbox;
-    wxBoxSizer* m_minWidthSizer;
-    wxTextCtrl* m_minWidth;
-    wxComboBox* m_unitsMinW;
-    wxCheckBox* m_minHeightCheckbox;
-    wxBoxSizer* m_minHeightSizer;
-    wxTextCtrl* m_minHeight;
-    wxComboBox* m_unitsMinH;
-    wxCheckBox* m_maxWidthCheckbox;
-    wxBoxSizer* m_maxWidthSizer;
-    wxTextCtrl* m_maxWidth;
-    wxComboBox* m_unitsMaxW;
-    wxCheckBox* m_maxHeightCheckbox;
-    wxBoxSizer* m_maxHeightSizer;
-    wxTextCtrl* m_maxHeight;
-    wxComboBox* m_unitsMaxH;
-    wxBoxSizer* m_positionControls;
-    wxBoxSizer* m_moveObjectParentSizer;
-    wxBoxSizer* m_positionModeSizer;
-    wxChoice* m_positionModeCtrl;
-    wxFlexGridSizer* m_positionGridSizer;
-    wxBoxSizer* m_leftSizer;
-    wxCheckBox* m_positionLeftCheckbox;
-    wxStaticText* m_leftLabel;
-    wxTextCtrl* m_left;
-    wxComboBox* m_unitsLeft;
-    wxBoxSizer* m_topSizer;
-    wxCheckBox* m_positionTopCheckbox;
-    wxStaticText* m_topLabel;
-    wxTextCtrl* m_top;
-    wxComboBox* m_unitsTop;
-    wxBoxSizer* m_rightSizer;
-    wxCheckBox* m_positionRightCheckbox;
-    wxStaticText* m_rightLabel;
-    wxBoxSizer* m_rightPositionSizer;
-    wxTextCtrl* m_right;
-    wxComboBox* m_unitsRight;
-    wxBoxSizer* m_bottomSizer;
-    wxCheckBox* m_positionBottomCheckbox;
-    wxStaticText* m_bottomLabel;
-    wxBoxSizer* m_bottomPositionSizer;
-    wxTextCtrl* m_bottom;
-    wxComboBox* m_unitsBottom;
-    wxBoxSizer* m_moveObjectSizer;
-    int m_positionMode;
-    /// Control identifiers
-    enum {
-        ID_WXRICHTEXTSIZEPAGE = 10700,
-        ID_RICHTEXT_FLOATING_MODE = 10701,
-        ID_RICHTEXT_VERTICAL_ALIGNMENT_CHECKBOX = 10708,
-        ID_RICHTEXT_VERTICAL_ALIGNMENT_COMBOBOX = 10709,
-        ID_RICHTEXT_WIDTH_CHECKBOX = 10702,
-        ID_RICHTEXT_WIDTH = 10703,
-        ID_RICHTEXT_UNITS_W = 10704,
-        ID_RICHTEXT_HEIGHT_CHECKBOX = 10705,
-        ID_RICHTEXT_HEIGHT = 10706,
-        ID_RICHTEXT_UNITS_H = 10707,
-        ID_RICHTEXT_MIN_WIDTH_CHECKBOX = 10715,
-        ID_RICHTEXT_MIN_WIDTH = 10716,
-        ID_RICHTEXT_UNITS_MIN_W = 10717,
-        ID_RICHTEXT_MIN_HEIGHT_CHECKBOX = 10718,
-        ID_RICHTEXT_MIN_HEIGHT = 10719,
-        ID_RICHTEXT_UNITS_MIN_H = 10720,
-        ID_RICHTEXT_MAX_WIDTH_CHECKBOX = 10721,
-        ID_RICHTEXT_MAX_WIDTH = 10722,
-        ID_RICHTEXT_UNITS_MAX_W = 10723,
-        ID_RICHTEXT_MAX_HEIGHT_CHECKBOX = 10724,
-        ID_RICHTEXT_MAX_HEIGHT = 10725,
-        ID_RICHTEXT_UNITS_MAX_H = 10726,
-        ID_RICHTEXT_POSITION_MODE = 10735,
-        ID_RICHTEXT_LEFT_CHECKBOX = 10710,
-        ID_RICHTEXT_LEFT = 10711,
-        ID_RICHTEXT_LEFT_UNITS = 10712,
-        ID_RICHTEXT_TOP_CHECKBOX = 10710,
-        ID_RICHTEXT_TOP = 10728,
-        ID_RICHTEXT_TOP_UNITS = 10729,
-        ID_RICHTEXT_RIGHT_CHECKBOX = 10727,
-        ID_RICHTEXT_RIGHT = 10730,
-        ID_RICHTEXT_RIGHT_UNITS = 10731,
-        ID_RICHTEXT_BOTTOM_CHECKBOX = 10732,
-        ID_RICHTEXT_BOTTOM = 10733,
-        ID_RICHTEXT_BOTTOM_UNITS = 10734,
-        ID_RICHTEXT_PARA_UP = 10713,
-        ID_RICHTEXT_PARA_DOWN = 10714
-    };
-////@end wxRichTextSizePage member variables
-
-    static bool sm_showFloatingControls;
-    static bool sm_showPositionControls;
-    static bool sm_showMinMaxSizeControls;
-    static bool sm_showPositionModeControls;
-    static bool sm_showRightBottomPositionControls;
-    static bool sm_showAlignmentControls;
-    static bool sm_showFloatingAndAlignmentControls;
-    static bool sm_enablePositionAndSizeUnits;
-    static bool sm_enablePositionAndSizeCheckboxes;
-};
-
-#endif
-    // _RICHTEXTSIZEPAGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextstyledlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextstyledlg.h
deleted file mode 100644
index f3d002bae6..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextstyledlg.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextstyledlg.h
-// Purpose:
-// Author:      Julian Smart
-// Modified by:
-// Created:     10/5/2006 12:05:31 PM
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _RICHTEXTSTYLEDLG_H_
-#define _RICHTEXTSTYLEDLG_H_
-
-/*!
- * Includes
- */
-
-#include "wx/richtext/richtextuicustomization.h"
-
-////@begin includes
-////@end includes
-
-#include "wx/richtext/richtextbuffer.h"
-#include "wx/richtext/richtextstyles.h"
-#include "wx/richtext/richtextctrl.h"
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-class wxBoxSizer;
-class wxRichTextStyleListCtrl;
-class wxRichTextCtrl;
-class wxStdDialogButtonSizer;
-////@end forward declarations
-
-class WXDLLIMPEXP_FWD_CORE wxButton;
-class WXDLLIMPEXP_FWD_CORE wxCheckBox;
-
-/*!
- * Control identifiers
- */
-
-#define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_STYLE wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU|wxCLOSE_BOX
-#define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_TITLE wxGetTranslation("Style Organiser")
-#define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_IDNAME ID_RICHTEXTSTYLEORGANISERDIALOG
-#define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_SIZE wxSize(400, 300)
-#define SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_POSITION wxDefaultPosition
-
-/*!
- * Flags for specifying permitted operations
- */
-
-#define wxRICHTEXT_ORGANISER_DELETE_STYLES  0x0001
-#define wxRICHTEXT_ORGANISER_CREATE_STYLES  0x0002
-#define wxRICHTEXT_ORGANISER_APPLY_STYLES   0x0004
-#define wxRICHTEXT_ORGANISER_EDIT_STYLES    0x0008
-#define wxRICHTEXT_ORGANISER_RENAME_STYLES  0x0010
-#define wxRICHTEXT_ORGANISER_OK_CANCEL      0x0020
-#define wxRICHTEXT_ORGANISER_RENUMBER       0x0040
-
-// The permitted style types to show
-#define wxRICHTEXT_ORGANISER_SHOW_CHARACTER 0x0100
-#define wxRICHTEXT_ORGANISER_SHOW_PARAGRAPH 0x0200
-#define wxRICHTEXT_ORGANISER_SHOW_LIST      0x0400
-#define wxRICHTEXT_ORGANISER_SHOW_BOX       0x0800
-#define wxRICHTEXT_ORGANISER_SHOW_ALL       0x1000
-
-// Common combinations
-#define wxRICHTEXT_ORGANISER_ORGANISE (wxRICHTEXT_ORGANISER_SHOW_ALL|wxRICHTEXT_ORGANISER_DELETE_STYLES|wxRICHTEXT_ORGANISER_CREATE_STYLES|wxRICHTEXT_ORGANISER_APPLY_STYLES|wxRICHTEXT_ORGANISER_EDIT_STYLES|wxRICHTEXT_ORGANISER_RENAME_STYLES)
-#define wxRICHTEXT_ORGANISER_BROWSE (wxRICHTEXT_ORGANISER_SHOW_ALL|wxRICHTEXT_ORGANISER_OK_CANCEL)
-#define wxRICHTEXT_ORGANISER_BROWSE_NUMBERING (wxRICHTEXT_ORGANISER_SHOW_LIST|wxRICHTEXT_ORGANISER_OK_CANCEL|wxRICHTEXT_ORGANISER_RENUMBER)
-
-/*!
- * wxRichTextStyleOrganiserDialog class declaration
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextStyleOrganiserDialog: public wxDialog
-{
-    DECLARE_DYNAMIC_CLASS( wxRichTextStyleOrganiserDialog )
-    DECLARE_EVENT_TABLE()
-    DECLARE_HELP_PROVISION()
-
-public:
-    /// Constructors
-    wxRichTextStyleOrganiserDialog( );
-    wxRichTextStyleOrganiserDialog( int flags, wxRichTextStyleSheet* sheet, wxRichTextCtrl* ctrl, wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& caption = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_SIZE, long style = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_STYLE );
-
-    /// Creation
-    bool Create( int flags, wxRichTextStyleSheet* sheet, wxRichTextCtrl* ctrl, wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& caption = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_SIZE, long style = SYMBOL_WXRICHTEXTSTYLEORGANISERDIALOG_STYLE );
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-    /// Initialise member variables
-    void Init();
-
-    /// Transfer data from/to window
-    virtual bool TransferDataFromWindow();
-    virtual bool TransferDataToWindow();
-
-    /// Set/get style sheet
-    void SetStyleSheet(wxRichTextStyleSheet* sheet) { m_richTextStyleSheet = sheet; }
-    wxRichTextStyleSheet* GetStyleSheet() const { return m_richTextStyleSheet; }
-
-    /// Set/get control
-    void SetRichTextCtrl(wxRichTextCtrl* ctrl) { m_richTextCtrl = ctrl; }
-    wxRichTextCtrl* GetRichTextCtrl() const { return m_richTextCtrl; }
-
-    /// Set/get flags
-    void SetFlags(int flags) { m_flags = flags; }
-    int GetFlags() const { return m_flags; }
-
-    /// Show preview for given or selected preview
-    void ShowPreview(int sel = -1);
-
-    /// Clears the preview
-    void ClearPreview();
-
-    /// List selection
-    void OnListSelection(wxCommandEvent& event);
-
-    /// Get/set restart numbering boolean
-    bool GetRestartNumbering() const { return m_restartNumbering; }
-    void SetRestartNumbering(bool restartNumbering) { m_restartNumbering = restartNumbering; }
-
-    /// Get selected style name or definition
-    wxString GetSelectedStyle() const;
-    wxRichTextStyleDefinition* GetSelectedStyleDefinition() const;
-
-    /// Apply the style
-    bool ApplyStyle(wxRichTextCtrl* ctrl = NULL);
-
-    /// Should we show tooltips?
-    static bool ShowToolTips() { return sm_showToolTips; }
-
-    /// Determines whether tooltips will be shown
-    static void SetShowToolTips(bool show) { sm_showToolTips = show; }
-
-////@begin wxRichTextStyleOrganiserDialog event handler declarations
-
-    /// wxEVT_BUTTON event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_CHAR
-    void OnNewCharClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_CHAR
-    void OnNewCharUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_BUTTON event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_PARA
-    void OnNewParaClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_PARA
-    void OnNewParaUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_BUTTON event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_LIST
-    void OnNewListClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_LIST
-    void OnNewListUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_BUTTON event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_BOX
-    void OnNewBoxClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_BOX
-    void OnNewBoxUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_BUTTON event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_APPLY
-    void OnApplyClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_APPLY
-    void OnApplyUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_BUTTON event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_RENAME
-    void OnRenameClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_RENAME
-    void OnRenameUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_BUTTON event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_EDIT
-    void OnEditClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_EDIT
-    void OnEditUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_BUTTON event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_DELETE
-    void OnDeleteClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEORGANISERDIALOG_DELETE
-    void OnDeleteUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_BUTTON event handler for wxID_HELP
-    void OnHelpClick( wxCommandEvent& event );
-
-////@end wxRichTextStyleOrganiserDialog event handler declarations
-
-////@begin wxRichTextStyleOrganiserDialog member function declarations
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end wxRichTextStyleOrganiserDialog member function declarations
-
-////@begin wxRichTextStyleOrganiserDialog member variables
-    wxBoxSizer* m_innerSizer;
-    wxBoxSizer* m_buttonSizerParent;
-    wxRichTextStyleListCtrl* m_stylesListBox;
-    wxRichTextCtrl* m_previewCtrl;
-    wxBoxSizer* m_buttonSizer;
-    wxButton* m_newCharacter;
-    wxButton* m_newParagraph;
-    wxButton* m_newList;
-    wxButton* m_newBox;
-    wxButton* m_applyStyle;
-    wxButton* m_renameStyle;
-    wxButton* m_editStyle;
-    wxButton* m_deleteStyle;
-    wxButton* m_closeButton;
-    wxBoxSizer* m_bottomButtonSizer;
-    wxCheckBox* m_restartNumberingCtrl;
-    wxStdDialogButtonSizer* m_stdButtonSizer;
-    wxButton* m_okButton;
-    wxButton* m_cancelButton;
-    /// Control identifiers
-    enum {
-        ID_RICHTEXTSTYLEORGANISERDIALOG = 10500,
-        ID_RICHTEXTSTYLEORGANISERDIALOG_STYLES = 10501,
-        ID_RICHTEXTSTYLEORGANISERDIALOG_CURRENT_STYLE = 10510,
-        ID_RICHTEXTSTYLEORGANISERDIALOG_PREVIEW = 10509,
-        ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_CHAR = 10504,
-        ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_PARA = 10505,
-        ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_LIST = 10508,
-        ID_RICHTEXTSTYLEORGANISERDIALOG_NEW_BOX = 10512,
-        ID_RICHTEXTSTYLEORGANISERDIALOG_APPLY = 10503,
-        ID_RICHTEXTSTYLEORGANISERDIALOG_RENAME = 10502,
-        ID_RICHTEXTSTYLEORGANISERDIALOG_EDIT = 10506,
-        ID_RICHTEXTSTYLEORGANISERDIALOG_DELETE = 10507,
-        ID_RICHTEXTSTYLEORGANISERDIALOG_RESTART_NUMBERING = 10511
-    };
-////@end wxRichTextStyleOrganiserDialog member variables
-
-private:
-
-    wxRichTextCtrl*         m_richTextCtrl;
-    wxRichTextStyleSheet*   m_richTextStyleSheet;
-
-    bool                    m_dontUpdate;
-    int                     m_flags;
-    static bool             sm_showToolTips;
-    bool                    m_restartNumbering;
-};
-
-#endif
-    // _RICHTEXTSTYLEDLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextstylepage.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextstylepage.h
deleted file mode 100644
index fe45ba045b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextstylepage.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextstylepage.h
-// Purpose:
-// Author:      Julian Smart
-// Modified by:
-// Created:     10/5/2006 11:34:55 AM
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _RICHTEXTSTYLEPAGE_H_
-#define _RICHTEXTSTYLEPAGE_H_
-
-#include "wx/richtext/richtextdialogpage.h"
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define SYMBOL_WXRICHTEXTSTYLEPAGE_STYLE wxRESIZE_BORDER|wxTAB_TRAVERSAL
-#define SYMBOL_WXRICHTEXTSTYLEPAGE_TITLE wxEmptyString
-#define SYMBOL_WXRICHTEXTSTYLEPAGE_IDNAME ID_RICHTEXTSTYLEPAGE
-#define SYMBOL_WXRICHTEXTSTYLEPAGE_SIZE wxSize(400, 300)
-#define SYMBOL_WXRICHTEXTSTYLEPAGE_POSITION wxDefaultPosition
-////@end control identifiers
-
-/*!
- * wxRichTextStylePage class declaration
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextStylePage: public wxRichTextDialogPage
-{
-    DECLARE_DYNAMIC_CLASS( wxRichTextStylePage )
-    DECLARE_EVENT_TABLE()
-    DECLARE_HELP_PROVISION()
-
-public:
-    /// Constructors
-    wxRichTextStylePage( );
-    wxRichTextStylePage( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTSTYLEPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSTYLEPAGE_SIZE, long style = SYMBOL_WXRICHTEXTSTYLEPAGE_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTSTYLEPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTSTYLEPAGE_SIZE, long style = SYMBOL_WXRICHTEXTSTYLEPAGE_STYLE );
-
-    /// Initialise members
-    void Init();
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-    /// Transfer data from/to window
-    virtual bool TransferDataFromWindow();
-    virtual bool TransferDataToWindow();
-
-    /// Gets the attributes associated with the main formatting dialog
-    wxRichTextAttr* GetAttributes();
-
-////@begin wxRichTextStylePage event handler declarations
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTSTYLEPAGE_NEXT_STYLE
-    void OnNextStyleUpdate( wxUpdateUIEvent& event );
-
-////@end wxRichTextStylePage event handler declarations
-
-////@begin wxRichTextStylePage member function declarations
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end wxRichTextStylePage member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-////@begin wxRichTextStylePage member variables
-    wxTextCtrl* m_styleName;
-    wxComboBox* m_basedOn;
-    wxComboBox* m_nextStyle;
-    /// Control identifiers
-    enum {
-        ID_RICHTEXTSTYLEPAGE = 10403,
-        ID_RICHTEXTSTYLEPAGE_STYLE_NAME = 10404,
-        ID_RICHTEXTSTYLEPAGE_BASED_ON = 10405,
-        ID_RICHTEXTSTYLEPAGE_NEXT_STYLE = 10406
-    };
-////@end wxRichTextStylePage member variables
-};
-
-#endif
-    // _RICHTEXTSTYLEPAGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextstyles.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextstyles.h
deleted file mode 100644
index 4293ccf76c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextstyles.h
+++ /dev/null
@@ -1,760 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextstyles.h
-// Purpose:     Style management for wxRichTextCtrl
-// Author:      Julian Smart
-// Modified by:
-// Created:     2005-09-30
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RICHTEXTSTYLES_H_
-#define _WX_RICHTEXTSTYLES_H_
-
-/*!
- * Includes
- */
-
-#include "wx/defs.h"
-
-#if wxUSE_RICHTEXT
-
-#include "wx/richtext/richtextbuffer.h"
-
-#if wxUSE_HTML
-#include "wx/htmllbox.h"
-#endif
-
-#if wxUSE_COMBOCTRL
-#include "wx/combo.h"
-#endif
-
-#include "wx/choice.h"
-
-/*!
- * Forward declarations
- */
-
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextCtrl;
-class WXDLLIMPEXP_FWD_RICHTEXT wxRichTextBuffer;
-
-/*!
- * wxRichTextStyleDefinition class declaration
- * A base class for paragraph and character styles.
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextStyleDefinition: public wxObject
-{
-    DECLARE_CLASS(wxRichTextStyleDefinition)
-public:
-
-    /// Copy constructors
-    wxRichTextStyleDefinition(const wxRichTextStyleDefinition& def)
-    : wxObject()
-    {
-        Init();
-        Copy(def);
-    }
-
-    /// Default constructor
-    wxRichTextStyleDefinition(const wxString& name = wxEmptyString) { Init(); m_name = name; }
-
-    /// Destructor
-    virtual ~wxRichTextStyleDefinition() {}
-
-    /// Initialises members
-    void Init() {}
-
-    /// Copies from def
-    void Copy(const wxRichTextStyleDefinition& def);
-
-    /// Equality test
-    bool Eq(const wxRichTextStyleDefinition& def) const;
-
-    /// Assignment operator
-    void operator =(const wxRichTextStyleDefinition& def) { Copy(def); }
-
-    /// Equality operator
-    bool operator ==(const wxRichTextStyleDefinition& def) const { return Eq(def); }
-
-    /// Override to clone the object
-    virtual wxRichTextStyleDefinition* Clone() const = 0;
-
-    /// Sets and gets the name of the style
-    void SetName(const wxString& name) { m_name = name; }
-    const wxString& GetName() const { return m_name; }
-
-    /// Sets and gets the style description
-    void SetDescription(const wxString& descr) { m_description = descr; }
-    const wxString& GetDescription() const { return m_description; }
-
-    /// Sets and gets the name of the style that this style is based on
-    void SetBaseStyle(const wxString& name) { m_baseStyle = name; }
-    const wxString& GetBaseStyle() const { return m_baseStyle; }
-
-    /// Sets and gets the style
-    void SetStyle(const wxRichTextAttr& style) { m_style = style; }
-    const wxRichTextAttr& GetStyle() const { return m_style; }
-    wxRichTextAttr& GetStyle() { return m_style; }
-
-    /// Gets the style combined with the base style
-    virtual wxRichTextAttr GetStyleMergedWithBase(const wxRichTextStyleSheet* sheet) const;
-
-    /**
-        Returns the definition's properties.
-    */
-    wxRichTextProperties& GetProperties() { return m_properties; }
-
-    /**
-        Returns the definition's properties.
-    */
-    const wxRichTextProperties& GetProperties() const { return m_properties; }
-
-    /**
-        Sets the definition's properties.
-    */
-    void SetProperties(const wxRichTextProperties& props) { m_properties = props; }
-
-protected:
-    wxString                m_name;
-    wxString                m_baseStyle;
-    wxString                m_description;
-    wxRichTextAttr          m_style;
-    wxRichTextProperties    m_properties;
-};
-
-/*!
- * wxRichTextCharacterStyleDefinition class declaration
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextCharacterStyleDefinition: public wxRichTextStyleDefinition
-{
-    DECLARE_DYNAMIC_CLASS(wxRichTextCharacterStyleDefinition)
-public:
-
-    /// Copy constructor
-    wxRichTextCharacterStyleDefinition(const wxRichTextCharacterStyleDefinition& def): wxRichTextStyleDefinition(def) {}
-
-    /// Default constructor
-    wxRichTextCharacterStyleDefinition(const wxString& name = wxEmptyString):
-        wxRichTextStyleDefinition(name) {}
-
-    /// Destructor
-    virtual ~wxRichTextCharacterStyleDefinition() {}
-
-    /// Clones the object
-    virtual wxRichTextStyleDefinition* Clone() const { return new wxRichTextCharacterStyleDefinition(*this); }
-
-protected:
-};
-
-/*!
- * wxRichTextParagraphStyleDefinition class declaration
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextParagraphStyleDefinition: public wxRichTextStyleDefinition
-{
-    DECLARE_DYNAMIC_CLASS(wxRichTextParagraphStyleDefinition)
-public:
-
-    /// Copy constructor
-    wxRichTextParagraphStyleDefinition(const wxRichTextParagraphStyleDefinition& def): wxRichTextStyleDefinition(def) { m_nextStyle = def.m_nextStyle; }
-
-    /// Default constructor
-    wxRichTextParagraphStyleDefinition(const wxString& name = wxEmptyString):
-        wxRichTextStyleDefinition(name) {}
-
-    // Destructor
-    virtual ~wxRichTextParagraphStyleDefinition() {}
-
-    /// Sets and gets the next style
-    void SetNextStyle(const wxString& name) { m_nextStyle = name; }
-    const wxString& GetNextStyle() const { return m_nextStyle; }
-
-    /// Copies from def
-    void Copy(const wxRichTextParagraphStyleDefinition& def);
-
-    /// Assignment operator
-    void operator =(const wxRichTextParagraphStyleDefinition& def) { Copy(def); }
-
-    /// Equality operator
-    bool operator ==(const wxRichTextParagraphStyleDefinition& def) const;
-
-    /// Clones the object
-    virtual wxRichTextStyleDefinition* Clone() const { return new wxRichTextParagraphStyleDefinition(*this); }
-
-protected:
-
-    /// The next style to use when adding a paragraph after this style.
-    wxString    m_nextStyle;
-};
-
-/*!
- * wxRichTextListStyleDefinition class declaration
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextListStyleDefinition: public wxRichTextParagraphStyleDefinition
-{
-    DECLARE_DYNAMIC_CLASS(wxRichTextListStyleDefinition)
-public:
-
-    /// Copy constructor
-    wxRichTextListStyleDefinition(const wxRichTextListStyleDefinition& def): wxRichTextParagraphStyleDefinition(def) { Init(); Copy(def); }
-
-    /// Default constructor
-    wxRichTextListStyleDefinition(const wxString& name = wxEmptyString):
-        wxRichTextParagraphStyleDefinition(name) { Init(); }
-
-    /// Destructor
-    virtual ~wxRichTextListStyleDefinition() {}
-
-    /// Copies from def
-    void Copy(const wxRichTextListStyleDefinition& def);
-
-    /// Assignment operator
-    void operator =(const wxRichTextListStyleDefinition& def) { Copy(def); }
-
-    /// Equality operator
-    bool operator ==(const wxRichTextListStyleDefinition& def) const;
-
-    /// Clones the object
-    virtual wxRichTextStyleDefinition* Clone() const { return new wxRichTextListStyleDefinition(*this); }
-
-    /// Sets/gets the attributes for the given level
-    void SetLevelAttributes(int i, const wxRichTextAttr& attr);
-    wxRichTextAttr* GetLevelAttributes(int i);
-    const wxRichTextAttr* GetLevelAttributes(int i) const;
-
-    /// Convenience function for setting the major attributes for a list level specification
-    void SetAttributes(int i, int leftIndent, int leftSubIndent, int bulletStyle, const wxString& bulletSymbol = wxEmptyString);
-
-    /// Finds the level corresponding to the given indentation
-    int FindLevelForIndent(int indent) const;
-
-    /// Combine the base and list style with a paragraph style, using the given indent (from which
-    /// an appropriate level is found)
-    wxRichTextAttr CombineWithParagraphStyle(int indent, const wxRichTextAttr& paraStyle, wxRichTextStyleSheet* styleSheet = NULL);
-
-    /// Combine the base and list style, using the given indent (from which
-    /// an appropriate level is found)
-    wxRichTextAttr GetCombinedStyle(int indent, wxRichTextStyleSheet* styleSheet = NULL);
-
-    /// Combine the base and list style, using the given level from which
-    /// an appropriate level is found)
-    wxRichTextAttr GetCombinedStyleForLevel(int level, wxRichTextStyleSheet* styleSheet = NULL);
-
-    /// Gets the number of available levels
-    int GetLevelCount() const { return 10; }
-
-    /// Is this a numbered list?
-    bool IsNumbered(int i) const;
-
-protected:
-
-    /// The styles for each level (up to 10)
-    wxRichTextAttr m_levelStyles[10];
-};
-
-/*!
- * wxRichTextBoxStyleDefinition class declaration, for box attributes in objects such as wxRichTextBox.
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextBoxStyleDefinition: public wxRichTextStyleDefinition
-{
-    DECLARE_DYNAMIC_CLASS(wxRichTextBoxStyleDefinition)
-public:
-
-    /// Copy constructor
-    wxRichTextBoxStyleDefinition(const wxRichTextBoxStyleDefinition& def): wxRichTextStyleDefinition(def) { Copy(def); }
-
-    /// Default constructor
-    wxRichTextBoxStyleDefinition(const wxString& name = wxEmptyString):
-        wxRichTextStyleDefinition(name) {}
-
-    // Destructor
-    virtual ~wxRichTextBoxStyleDefinition() {}
-
-    /// Copies from def
-    void Copy(const wxRichTextBoxStyleDefinition& def);
-
-    /// Assignment operator
-    void operator =(const wxRichTextBoxStyleDefinition& def) { Copy(def); }
-
-    /// Equality operator
-    bool operator ==(const wxRichTextBoxStyleDefinition& def) const;
-
-    /// Clones the object
-    virtual wxRichTextStyleDefinition* Clone() const { return new wxRichTextBoxStyleDefinition(*this); }
-
-protected:
-};
-
-/*!
- * The style sheet
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextStyleSheet: public wxObject
-{
-    DECLARE_CLASS( wxRichTextStyleSheet )
-
-public:
-    /// Constructors
-    wxRichTextStyleSheet(const wxRichTextStyleSheet& sheet)
-    : wxObject()
-    {
-        Init();
-        Copy(sheet);
-    }
-    wxRichTextStyleSheet() { Init(); }
-    virtual ~wxRichTextStyleSheet();
-
-    /// Initialisation
-    void Init();
-
-    /// Copy
-    void Copy(const wxRichTextStyleSheet& sheet);
-
-    /// Assignment
-    void operator=(const wxRichTextStyleSheet& sheet) { Copy(sheet); }
-
-    /// Equality
-    bool operator==(const wxRichTextStyleSheet& sheet) const;
-
-    /// Add a definition to the character style list
-    bool AddCharacterStyle(wxRichTextCharacterStyleDefinition* def);
-
-    /// Add a definition to the paragraph style list
-    bool AddParagraphStyle(wxRichTextParagraphStyleDefinition* def);
-
-    /// Add a definition to the list style list
-    bool AddListStyle(wxRichTextListStyleDefinition* def);
-
-    /// Add a definition to the box style list
-    bool AddBoxStyle(wxRichTextBoxStyleDefinition* def);
-
-    /// Add a definition to the appropriate style list
-    bool AddStyle(wxRichTextStyleDefinition* def);
-
-    /// Remove a character style
-    bool RemoveCharacterStyle(wxRichTextStyleDefinition* def, bool deleteStyle = false) { return RemoveStyle(m_characterStyleDefinitions, def, deleteStyle); }
-
-    /// Remove a paragraph style
-    bool RemoveParagraphStyle(wxRichTextStyleDefinition* def, bool deleteStyle = false) { return RemoveStyle(m_paragraphStyleDefinitions, def, deleteStyle); }
-
-    /// Remove a list style
-    bool RemoveListStyle(wxRichTextStyleDefinition* def, bool deleteStyle = false) { return RemoveStyle(m_listStyleDefinitions, def, deleteStyle); }
-
-    /// Remove a box style
-    bool RemoveBoxStyle(wxRichTextStyleDefinition* def, bool deleteStyle = false) { return RemoveStyle(m_boxStyleDefinitions, def, deleteStyle); }
-
-    /// Remove a style
-    bool RemoveStyle(wxRichTextStyleDefinition* def, bool deleteStyle = false);
-
-    /// Find a character definition by name
-    wxRichTextCharacterStyleDefinition* FindCharacterStyle(const wxString& name, bool recurse = true) const { return (wxRichTextCharacterStyleDefinition*) FindStyle(m_characterStyleDefinitions, name, recurse); }
-
-    /// Find a paragraph definition by name
-    wxRichTextParagraphStyleDefinition* FindParagraphStyle(const wxString& name, bool recurse = true) const { return (wxRichTextParagraphStyleDefinition*) FindStyle(m_paragraphStyleDefinitions, name, recurse); }
-
-    /// Find a list definition by name
-    wxRichTextListStyleDefinition* FindListStyle(const wxString& name, bool recurse = true) const { return (wxRichTextListStyleDefinition*) FindStyle(m_listStyleDefinitions, name, recurse); }
-
-    /// Find a box definition by name
-    wxRichTextBoxStyleDefinition* FindBoxStyle(const wxString& name, bool recurse = true) const { return (wxRichTextBoxStyleDefinition*) FindStyle(m_boxStyleDefinitions, name, recurse); }
-
-    /// Find any definition by name
-    wxRichTextStyleDefinition* FindStyle(const wxString& name, bool recurse = true) const;
-
-    /// Return the number of character styles
-    size_t GetCharacterStyleCount() const { return m_characterStyleDefinitions.GetCount(); }
-
-    /// Return the number of paragraph styles
-    size_t GetParagraphStyleCount() const { return m_paragraphStyleDefinitions.GetCount(); }
-
-    /// Return the number of list styles
-    size_t GetListStyleCount() const { return m_listStyleDefinitions.GetCount(); }
-
-    /// Return the number of box styles
-    size_t GetBoxStyleCount() const { return m_boxStyleDefinitions.GetCount(); }
-
-    /// Return the nth character style
-    wxRichTextCharacterStyleDefinition* GetCharacterStyle(size_t n) const { return (wxRichTextCharacterStyleDefinition*) m_characterStyleDefinitions.Item(n)->GetData(); }
-
-    /// Return the nth paragraph style
-    wxRichTextParagraphStyleDefinition* GetParagraphStyle(size_t n) const { return (wxRichTextParagraphStyleDefinition*) m_paragraphStyleDefinitions.Item(n)->GetData(); }
-
-    /// Return the nth list style
-    wxRichTextListStyleDefinition* GetListStyle(size_t n) const { return (wxRichTextListStyleDefinition*) m_listStyleDefinitions.Item(n)->GetData(); }
-
-    /// Return the nth box style
-    wxRichTextBoxStyleDefinition* GetBoxStyle(size_t n) const { return (wxRichTextBoxStyleDefinition*) m_boxStyleDefinitions.Item(n)->GetData(); }
-
-    /// Delete all styles
-    void DeleteStyles();
-
-    /// Insert into list of style sheets
-    bool InsertSheet(wxRichTextStyleSheet* before);
-
-    /// Append to list of style sheets
-    bool AppendSheet(wxRichTextStyleSheet* after);
-
-    /// Unlink from the list of style sheets
-    void Unlink();
-
-    /// Get/set next sheet
-    wxRichTextStyleSheet* GetNextSheet() const { return m_nextSheet; }
-    void SetNextSheet(wxRichTextStyleSheet* sheet) { m_nextSheet = sheet; }
-
-    /// Get/set previous sheet
-    wxRichTextStyleSheet* GetPreviousSheet() const { return m_previousSheet; }
-    void SetPreviousSheet(wxRichTextStyleSheet* sheet) { m_previousSheet = sheet; }
-
-    /// Sets and gets the name of the style sheet
-    void SetName(const wxString& name) { m_name = name; }
-    const wxString& GetName() const { return m_name; }
-
-    /// Sets and gets the style description
-    void SetDescription(const wxString& descr) { m_description = descr; }
-    const wxString& GetDescription() const { return m_description; }
-
-    /**
-        Returns the sheet's properties.
-    */
-    wxRichTextProperties& GetProperties() { return m_properties; }
-
-    /**
-        Returns the sheet's properties.
-    */
-    const wxRichTextProperties& GetProperties() const { return m_properties; }
-
-    /**
-        Sets the sheet's properties.
-    */
-    void SetProperties(const wxRichTextProperties& props) { m_properties = props; }
-
-/// Implementation
-
-    /// Add a definition to one of the style lists
-    bool AddStyle(wxList& list, wxRichTextStyleDefinition* def);
-
-    /// Remove a style
-    bool RemoveStyle(wxList& list, wxRichTextStyleDefinition* def, bool deleteStyle);
-
-    /// Find a definition by name
-    wxRichTextStyleDefinition* FindStyle(const wxList& list, const wxString& name, bool recurse = true) const;
-
-protected:
-
-    wxString                m_description;
-    wxString                m_name;
-
-    wxList                  m_characterStyleDefinitions;
-    wxList                  m_paragraphStyleDefinitions;
-    wxList                  m_listStyleDefinitions;
-    wxList                  m_boxStyleDefinitions;
-
-    wxRichTextStyleSheet*   m_previousSheet;
-    wxRichTextStyleSheet*   m_nextSheet;
-    wxRichTextProperties    m_properties;
-};
-
-#if wxUSE_HTML
-/*!
- * wxRichTextStyleListBox class declaration
- * A listbox to display styles.
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextStyleListBox: public wxHtmlListBox
-{
-    DECLARE_CLASS(wxRichTextStyleListBox)
-    DECLARE_EVENT_TABLE()
-
-public:
-    /// Which type of style definition is currently showing?
-    enum wxRichTextStyleType
-    {
-        wxRICHTEXT_STYLE_ALL,
-        wxRICHTEXT_STYLE_PARAGRAPH,
-        wxRICHTEXT_STYLE_CHARACTER,
-        wxRICHTEXT_STYLE_LIST,
-        wxRICHTEXT_STYLE_BOX
-    };
-
-    wxRichTextStyleListBox()
-    {
-        Init();
-    }
-    wxRichTextStyleListBox(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0);
-    virtual ~wxRichTextStyleListBox();
-
-    void Init()
-    {
-        m_styleSheet = NULL;
-        m_richTextCtrl = NULL;
-        m_applyOnSelection = false;
-        m_styleType = wxRICHTEXT_STYLE_PARAGRAPH;
-        m_autoSetSelection = true;
-    }
-
-    bool Create(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0);
-
-    /// Creates a suitable HTML fragment for a definition
-    wxString CreateHTML(wxRichTextStyleDefinition* def) const;
-
-    /// Associates the control with a style sheet
-    void SetStyleSheet(wxRichTextStyleSheet* styleSheet) { m_styleSheet = styleSheet; }
-    wxRichTextStyleSheet* GetStyleSheet() const { return m_styleSheet; }
-
-    /// Associates the control with a wxRichTextCtrl
-    void SetRichTextCtrl(wxRichTextCtrl* ctrl) { m_richTextCtrl = ctrl; }
-    wxRichTextCtrl* GetRichTextCtrl() const { return m_richTextCtrl; }
-
-    /// Get style for index
-    wxRichTextStyleDefinition* GetStyle(size_t i) const ;
-
-    /// Get index for style name
-    int GetIndexForStyle(const wxString& name) const ;
-
-    /// Set selection for string, returning the index.
-    int SetStyleSelection(const wxString& name);
-
-    /// Updates the list
-    void UpdateStyles();
-
-    /// Apply the style
-    void ApplyStyle(int i);
-
-    /// Left click
-    void OnLeftDown(wxMouseEvent& event);
-
-    /// Left double-click
-    void OnLeftDoubleClick(wxMouseEvent& event);
-
-    /// Auto-select from style under caret in idle time
-    void OnIdle(wxIdleEvent& event);
-
-    /// Convert units in tends of a millimetre to device units
-    int ConvertTenthsMMToPixels(wxDC& dc, int units) const;
-
-    /// Can we set the selection based on the editor caret position?
-    /// Need to override this if being used in a combobox popup
-    virtual bool CanAutoSetSelection() { return m_autoSetSelection; }
-    virtual void SetAutoSetSelection(bool autoSet) { m_autoSetSelection = autoSet; }
-
-    /// Set whether the style should be applied as soon as the item is selected (the default)
-    void SetApplyOnSelection(bool applyOnSel) { m_applyOnSelection = applyOnSel; }
-    bool GetApplyOnSelection() const { return m_applyOnSelection; }
-
-    /// Set the style type to display
-    void SetStyleType(wxRichTextStyleType styleType) { m_styleType = styleType; UpdateStyles(); }
-    wxRichTextStyleType GetStyleType() const { return m_styleType; }
-
-    /// Helper for listbox and combo control
-    static wxString GetStyleToShowInIdleTime(wxRichTextCtrl* ctrl, wxRichTextStyleType styleType);
-
-protected:
-    /// Returns the HTML for this item
-    virtual wxString OnGetItem(size_t n) const;
-
-private:
-
-    wxRichTextStyleSheet*   m_styleSheet;
-    wxRichTextCtrl*         m_richTextCtrl;
-    bool                    m_applyOnSelection; // if true, applies style on selection
-    wxRichTextStyleType     m_styleType; // style type to display
-    bool                    m_autoSetSelection;
-    wxArrayString           m_styleNames;
-};
-
-/*!
- * wxRichTextStyleListCtrl class declaration
- * This is a container for the list control plus a combobox to switch between
- * style types.
- */
-
-#define wxRICHTEXTSTYLELIST_HIDE_TYPE_SELECTOR     0x1000
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextStyleListCtrl: public wxControl
-{
-    DECLARE_CLASS(wxRichTextStyleListCtrl)
-    DECLARE_EVENT_TABLE()
-
-public:
-
-    /// Constructors
-    wxRichTextStyleListCtrl()
-    {
-        Init();
-    }
-
-    wxRichTextStyleListCtrl(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0);
-
-    /// Constructors
-    virtual ~wxRichTextStyleListCtrl();
-
-    /// Member initialisation
-    void Init()
-    {
-        m_styleListBox = NULL;
-        m_styleChoice = NULL;
-        m_dontUpdate = false;
-    }
-
-    /// Creates the windows
-    bool Create(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0);
-
-    /// Updates the style list box
-    void UpdateStyles();
-
-    /// Associates the control with a style sheet
-    void SetStyleSheet(wxRichTextStyleSheet* styleSheet);
-    wxRichTextStyleSheet* GetStyleSheet() const;
-
-    /// Associates the control with a wxRichTextCtrl
-    void SetRichTextCtrl(wxRichTextCtrl* ctrl);
-    wxRichTextCtrl* GetRichTextCtrl() const;
-
-    /// Set/get the style type to display
-    void SetStyleType(wxRichTextStyleListBox::wxRichTextStyleType styleType);
-    wxRichTextStyleListBox::wxRichTextStyleType GetStyleType() const;
-
-    /// Get the choice index for style type
-    int StyleTypeToIndex(wxRichTextStyleListBox::wxRichTextStyleType styleType);
-
-    /// Get the style type for choice index
-    wxRichTextStyleListBox::wxRichTextStyleType StyleIndexToType(int i);
-
-    /// Get the listbox
-    wxRichTextStyleListBox* GetStyleListBox() const { return m_styleListBox; }
-
-    /// Get the choice
-    wxChoice* GetStyleChoice() const { return m_styleChoice; }
-
-    /// React to style type choice
-    void OnChooseType(wxCommandEvent& event);
-
-    /// Lay out the controls
-    void OnSize(wxSizeEvent& event);
-
-private:
-
-    wxRichTextStyleListBox* m_styleListBox;
-    wxChoice*               m_styleChoice;
-    bool                    m_dontUpdate;
-};
-
-#if wxUSE_COMBOCTRL
-
-/*!
- * Style drop-down for a wxComboCtrl
- */
-
-class wxRichTextStyleComboPopup : public wxRichTextStyleListBox, public wxComboPopup
-{
-public:
-    virtual void Init()
-    {
-        m_itemHere = -1; // hot item in list
-        m_value = -1;
-    }
-
-    virtual bool Create( wxWindow* parent );
-
-    virtual wxWindow *GetControl() { return this; }
-
-    virtual void SetStringValue( const wxString& s );
-
-    virtual wxString GetStringValue() const;
-
-    /// Can we set the selection based on the editor caret position?
-    // virtual bool CanAutoSetSelection() { return ((m_combo == NULL) || !m_combo->IsPopupShown()); }
-    virtual bool CanAutoSetSelection() { return false; }
-
-    //
-    // Popup event handlers
-    //
-
-    // Mouse hot-tracking
-    void OnMouseMove(wxMouseEvent& event);
-
-    // On mouse left, set the value and close the popup
-    void OnMouseClick(wxMouseEvent& WXUNUSED(event));
-
-protected:
-
-    int             m_itemHere; // hot item in popup
-    int             m_value;
-
-private:
-    DECLARE_EVENT_TABLE()
-};
-
-/*!
- * wxRichTextStyleComboCtrl
- * A combo for applying styles.
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextStyleComboCtrl: public wxComboCtrl
-{
-    DECLARE_CLASS(wxRichTextStyleComboCtrl)
-    DECLARE_EVENT_TABLE()
-
-public:
-    wxRichTextStyleComboCtrl()
-    {
-        Init();
-    }
-
-    wxRichTextStyleComboCtrl(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = wxCB_READONLY)
-    {
-        Init();
-        Create(parent, id, pos, size, style);
-    }
-
-    virtual ~wxRichTextStyleComboCtrl() {}
-
-    void Init()
-    {
-        m_stylePopup = NULL;
-    }
-
-    bool Create(wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize, long style = 0);
-
-    /// Updates the list
-    void UpdateStyles() { m_stylePopup->UpdateStyles(); }
-
-    /// Associates the control with a style sheet
-    void SetStyleSheet(wxRichTextStyleSheet* styleSheet) { m_stylePopup->SetStyleSheet(styleSheet); }
-    wxRichTextStyleSheet* GetStyleSheet() const { return m_stylePopup->GetStyleSheet(); }
-
-    /// Associates the control with a wxRichTextCtrl
-    void SetRichTextCtrl(wxRichTextCtrl* ctrl) { m_stylePopup->SetRichTextCtrl(ctrl); }
-    wxRichTextCtrl* GetRichTextCtrl() const { return m_stylePopup->GetRichTextCtrl(); }
-
-    /// Gets the style popup
-    wxRichTextStyleComboPopup* GetStylePopup() const { return m_stylePopup; }
-
-    /// Auto-select from style under caret in idle time
-    void OnIdle(wxIdleEvent& event);
-
-protected:
-    wxRichTextStyleComboPopup*  m_stylePopup;
-};
-
-#endif
-    // wxUSE_COMBOCTRL
-
-#endif
-    // wxUSE_HTML
-
-#endif
-    // wxUSE_RICHTEXT
-
-#endif
-    // _WX_RICHTEXTSTYLES_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextsymboldlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextsymboldlg.h
deleted file mode 100644
index 1dedf65960..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextsymboldlg.h
+++ /dev/null
@@ -1,375 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextsymboldlg.h
-// Purpose:
-// Author:      Julian Smart
-// Modified by:
-// Created:     10/5/2006 3:11:58 PM
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _RICHTEXTSYMBOLDLG_H_
-#define _RICHTEXTSYMBOLDLG_H_
-
-/*!
- * Includes
- */
-
-#include "wx/richtext/richtextuicustomization.h"
-#include "wx/dialog.h"
-#include "wx/vscroll.h"
-
-/*!
- * Forward declarations
- */
-
-class WXDLLIMPEXP_FWD_CORE wxStaticText;
-class WXDLLIMPEXP_FWD_CORE wxComboBox;
-class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
-
-////@begin forward declarations
-class wxSymbolListCtrl;
-class wxStdDialogButtonSizer;
-////@end forward declarations
-
-// __UNICODE__ is a symbol used by DialogBlocks-generated code.
-#ifndef __UNICODE__
-#if wxUSE_UNICODE
-#define __UNICODE__
-#endif
-#endif
-
-/*!
- * Symbols
- */
-
-#define SYMBOL_WXSYMBOLPICKERDIALOG_STYLE (wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxCLOSE_BOX)
-#define SYMBOL_WXSYMBOLPICKERDIALOG_TITLE wxGetTranslation("Symbols")
-#define SYMBOL_WXSYMBOLPICKERDIALOG_IDNAME ID_SYMBOLPICKERDIALOG
-#define SYMBOL_WXSYMBOLPICKERDIALOG_SIZE wxSize(400, 300)
-#define SYMBOL_WXSYMBOLPICKERDIALOG_POSITION wxDefaultPosition
-
-/*!
- * wxSymbolPickerDialog class declaration
- */
-
-class WXDLLIMPEXP_RICHTEXT wxSymbolPickerDialog: public wxDialog
-{
-    DECLARE_DYNAMIC_CLASS( wxSymbolPickerDialog )
-    DECLARE_EVENT_TABLE()
-    DECLARE_HELP_PROVISION()
-
-public:
-    /// Constructors
-    wxSymbolPickerDialog( );
-    wxSymbolPickerDialog( const wxString& symbol, const wxString& fontName, const wxString& normalTextFont,
-        wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& caption = SYMBOL_WXSYMBOLPICKERDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXSYMBOLPICKERDIALOG_POSITION, const wxSize& size = SYMBOL_WXSYMBOLPICKERDIALOG_SIZE, long style = SYMBOL_WXSYMBOLPICKERDIALOG_STYLE );
-
-    /// Creation
-    bool Create( const wxString& symbol, const wxString& fontName, const wxString& normalTextFont,
-        wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& caption = SYMBOL_WXSYMBOLPICKERDIALOG_TITLE, const wxPoint& pos = SYMBOL_WXSYMBOLPICKERDIALOG_POSITION, const wxSize& size = SYMBOL_WXSYMBOLPICKERDIALOG_SIZE, long style = SYMBOL_WXSYMBOLPICKERDIALOG_STYLE );
-
-    /// Initialises members variables
-    void Init();
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-    /// Update the display
-    void UpdateSymbolDisplay(bool updateSymbolList = true, bool showAtSubset = true);
-
-    /// Respond to symbol selection
-    void OnSymbolSelected( wxCommandEvent& event );
-
-    /// Set Unicode mode
-    void SetUnicodeMode(bool unicodeMode);
-
-    /// Show at the current subset selection
-    void ShowAtSubset();
-
-    /// Get the selected symbol character
-    int GetSymbolChar() const;
-
-    /// Is there a selection?
-    bool HasSelection() const { return !m_symbol.IsEmpty(); }
-
-    /// Specifying normal text?
-    bool UseNormalFont() const { return m_fontName.IsEmpty(); }
-
-    /// Should we show tooltips?
-    static bool ShowToolTips() { return sm_showToolTips; }
-
-    /// Determines whether tooltips will be shown
-    static void SetShowToolTips(bool show) { sm_showToolTips = show; }
-
-    /// Data transfer
-    virtual bool TransferDataToWindow();
-
-////@begin wxSymbolPickerDialog event handler declarations
-
-    /// wxEVT_COMBOBOX event handler for ID_SYMBOLPICKERDIALOG_FONT
-    void OnFontCtrlSelected( wxCommandEvent& event );
-
-#if defined(__UNICODE__)
-    /// wxEVT_COMBOBOX event handler for ID_SYMBOLPICKERDIALOG_SUBSET
-    void OnSubsetSelected( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_SYMBOLPICKERDIALOG_SUBSET
-    void OnSymbolpickerdialogSubsetUpdate( wxUpdateUIEvent& event );
-
-#endif
-#if defined(__UNICODE__)
-    /// wxEVT_COMBOBOX event handler for ID_SYMBOLPICKERDIALOG_FROM
-    void OnFromUnicodeSelected( wxCommandEvent& event );
-
-#endif
-    /// wxEVT_UPDATE_UI event handler for wxID_OK
-    void OnOkUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_BUTTON event handler for wxID_HELP
-    void OnHelpClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for wxID_HELP
-    void OnHelpUpdate( wxUpdateUIEvent& event );
-
-////@end wxSymbolPickerDialog event handler declarations
-
-////@begin wxSymbolPickerDialog member function declarations
-
-    wxString GetFontName() const { return m_fontName ; }
-    void SetFontName(wxString value) { m_fontName = value ; }
-
-    bool GetFromUnicode() const { return m_fromUnicode ; }
-    void SetFromUnicode(bool value) { m_fromUnicode = value ; }
-
-    wxString GetNormalTextFontName() const { return m_normalTextFontName ; }
-    void SetNormalTextFontName(wxString value) { m_normalTextFontName = value ; }
-
-    wxString GetSymbol() const { return m_symbol ; }
-    void SetSymbol(wxString value) { m_symbol = value ; }
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end wxSymbolPickerDialog member function declarations
-
-////@begin wxSymbolPickerDialog member variables
-    wxComboBox* m_fontCtrl;
-#if defined(__UNICODE__)
-    wxComboBox* m_subsetCtrl;
-#endif
-    wxSymbolListCtrl* m_symbolsCtrl;
-    wxStaticText* m_symbolStaticCtrl;
-    wxTextCtrl* m_characterCodeCtrl;
-#if defined(__UNICODE__)
-    wxComboBox* m_fromUnicodeCtrl;
-#endif
-    wxStdDialogButtonSizer* m_stdButtonSizer;
-    wxString m_fontName;
-    bool m_fromUnicode;
-    wxString m_normalTextFontName;
-    wxString m_symbol;
-    /// Control identifiers
-    enum {
-        ID_SYMBOLPICKERDIALOG = 10600,
-        ID_SYMBOLPICKERDIALOG_FONT = 10602,
-        ID_SYMBOLPICKERDIALOG_SUBSET = 10605,
-        ID_SYMBOLPICKERDIALOG_LISTCTRL = 10608,
-        ID_SYMBOLPICKERDIALOG_CHARACTERCODE = 10601,
-        ID_SYMBOLPICKERDIALOG_FROM = 10603
-    };
-////@end wxSymbolPickerDialog member variables
-
-    bool m_dontUpdate;
-    static bool             sm_showToolTips;
-};
-
-/*!
- * The scrolling symbol list.
- */
-
-class WXDLLIMPEXP_RICHTEXT wxSymbolListCtrl : public wxVScrolledWindow
-{
-public:
-    // constructors and such
-    // ---------------------
-
-    // default constructor, you must call Create() later
-    wxSymbolListCtrl() { Init(); }
-
-    // normal constructor which calls Create() internally
-    wxSymbolListCtrl(wxWindow *parent,
-               wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxPanelNameStr)
-    {
-        Init();
-
-        (void)Create(parent, id, pos, size, style, name);
-    }
-
-    // really creates the control and sets the initial number of items in it
-    // (which may be changed later with SetItemCount())
-    //
-    // returns true on success or false if the control couldn't be created
-    bool Create(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr);
-
-    // dtor does some internal cleanup
-    virtual ~wxSymbolListCtrl();
-
-
-    // accessors
-    // ---------
-
-    // set the current font
-    virtual bool SetFont(const wxFont& font);
-
-    // set Unicode/ASCII mode
-    void SetUnicodeMode(bool unicodeMode);
-
-    // get the index of the currently selected item or wxNOT_FOUND if there is no selection
-    int GetSelection() const;
-
-    // is this item selected?
-    bool IsSelected(int item) const;
-
-    // is this item the current one?
-    bool IsCurrentItem(int item) const { return item == m_current; }
-
-    // get the margins around each cell
-    wxPoint GetMargins() const { return m_ptMargins; }
-
-    // get the background colour of selected cells
-    const wxColour& GetSelectionBackground() const { return m_colBgSel; }
-
-    // operations
-    // ----------
-
-    // set the selection to the specified item, if it is wxNOT_FOUND the
-    // selection is unset
-    void SetSelection(int selection);
-
-    // make this item visible
-    void EnsureVisible(int item);
-
-    // set the margins: horizontal margin is the distance between the window
-    // border and the item contents while vertical margin is half of the
-    // distance between items
-    //
-    // by default both margins are 0
-    void SetMargins(const wxPoint& pt);
-    void SetMargins(wxCoord x, wxCoord y) { SetMargins(wxPoint(x, y)); }
-
-    // set the cell size
-    void SetCellSize(const wxSize& sz) { m_cellSize = sz; }
-    const wxSize& GetCellSize() const { return m_cellSize; }
-
-    // change the background colour of the selected cells
-    void SetSelectionBackground(const wxColour& col);
-
-    virtual wxVisualAttributes GetDefaultAttributes() const
-    {
-        return GetClassDefaultAttributes(GetWindowVariant());
-    }
-
-    static wxVisualAttributes
-    GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
-
-    // Get min/max symbol values
-    int GetMinSymbolValue() const { return m_minSymbolValue; }
-    int GetMaxSymbolValue() const { return m_maxSymbolValue; }
-
-    // Respond to size change
-    void OnSize(wxSizeEvent& event);
-
-protected:
-
-    // draws a line of symbols
-    virtual void OnDrawItem(wxDC& dc, const wxRect& rect, size_t n) const;
-
-    // gets the line height
-    virtual wxCoord OnGetRowHeight(size_t line) const;
-
-    // event handlers
-    void OnPaint(wxPaintEvent& event);
-    void OnKeyDown(wxKeyEvent& event);
-    void OnLeftDown(wxMouseEvent& event);
-    void OnLeftDClick(wxMouseEvent& event);
-
-    // common part of all ctors
-    void Init();
-
-    // send the wxEVT_LISTBOX event
-    void SendSelectedEvent();
-
-    // change the current item (in single selection listbox it also implicitly
-    // changes the selection); current may be wxNOT_FOUND in which case there
-    // will be no current item any more
-    //
-    // return true if the current item changed, false otherwise
-    bool DoSetCurrent(int current);
-
-    // flags for DoHandleItemClick
-    enum
-    {
-        ItemClick_Shift = 1,        // item shift-clicked
-        ItemClick_Ctrl  = 2,        //       ctrl
-        ItemClick_Kbd   = 4         // item selected from keyboard
-    };
-
-    // common part of keyboard and mouse handling processing code
-    void DoHandleItemClick(int item, int flags);
-
-    // calculate line number from symbol value
-    int SymbolValueToLineNumber(int item);
-
-    // initialise control from current min/max values
-    void SetupCtrl(bool scrollToSelection = true);
-
-    // hit testing
-    int HitTest(const wxPoint& pt);
-
-private:
-    // the current item or wxNOT_FOUND
-    int m_current;
-
-    // margins
-    wxPoint     m_ptMargins;
-
-    // the selection bg colour
-    wxColour    m_colBgSel;
-
-    // double buffer
-    wxBitmap*   m_doubleBuffer;
-
-    // cell size
-    wxSize      m_cellSize;
-
-    // minimum and maximum symbol value
-    int         m_minSymbolValue;
-
-    // minimum and maximum symbol value
-    int         m_maxSymbolValue;
-
-    // number of items per line
-    int         m_symbolsPerLine;
-
-    // Unicode/ASCII mode
-    bool        m_unicodeMode;
-
-    DECLARE_EVENT_TABLE()
-    wxDECLARE_NO_COPY_CLASS(wxSymbolListCtrl);
-    DECLARE_ABSTRACT_CLASS(wxSymbolListCtrl)
-};
-
-#endif
-    // _RICHTEXTSYMBOLDLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtexttabspage.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtexttabspage.h
deleted file mode 100644
index e1beb426f1..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtexttabspage.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtexttabspage.h
-// Purpose:
-// Author:      Julian Smart
-// Modified by:
-// Created:     10/4/2006 8:03:20 AM
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _RICHTEXTTABSPAGE_H_
-#define _RICHTEXTTABSPAGE_H_
-
-/*!
- * Includes
- */
-
-#include "wx/richtext/richtextdialogpage.h"
-
-////@begin includes
-////@end includes
-
-/*!
- * Forward declarations
- */
-
-////@begin forward declarations
-////@end forward declarations
-
-/*!
- * Control identifiers
- */
-
-////@begin control identifiers
-#define SYMBOL_WXRICHTEXTTABSPAGE_STYLE wxRESIZE_BORDER|wxTAB_TRAVERSAL
-#define SYMBOL_WXRICHTEXTTABSPAGE_TITLE wxEmptyString
-#define SYMBOL_WXRICHTEXTTABSPAGE_IDNAME ID_RICHTEXTTABSPAGE
-#define SYMBOL_WXRICHTEXTTABSPAGE_SIZE wxSize(400, 300)
-#define SYMBOL_WXRICHTEXTTABSPAGE_POSITION wxDefaultPosition
-////@end control identifiers
-
-/*!
- * wxRichTextTabsPage class declaration
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextTabsPage: public wxRichTextDialogPage
-{
-    DECLARE_DYNAMIC_CLASS( wxRichTextTabsPage )
-    DECLARE_EVENT_TABLE()
-    DECLARE_HELP_PROVISION()
-
-public:
-    /// Constructors
-    wxRichTextTabsPage( );
-    wxRichTextTabsPage( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTTABSPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTTABSPAGE_SIZE, long style = SYMBOL_WXRICHTEXTTABSPAGE_STYLE );
-
-    /// Creation
-    bool Create( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = SYMBOL_WXRICHTEXTTABSPAGE_POSITION, const wxSize& size = SYMBOL_WXRICHTEXTTABSPAGE_SIZE, long style = SYMBOL_WXRICHTEXTTABSPAGE_STYLE );
-
-    /// Creates the controls and sizers
-    void CreateControls();
-
-    /// Initialise members
-    void Init();
-
-    /// Transfer data from/to window
-    virtual bool TransferDataFromWindow();
-    virtual bool TransferDataToWindow();
-
-    /// Sorts the tab array
-    virtual void SortTabs();
-
-    /// Gets the attributes associated with the main formatting dialog
-    wxRichTextAttr* GetAttributes();
-
-////@begin wxRichTextTabsPage event handler declarations
-
-    /// wxEVT_LISTBOX event handler for ID_RICHTEXTTABSPAGE_TABLIST
-    void OnTablistSelected( wxCommandEvent& event );
-
-    /// wxEVT_BUTTON event handler for ID_RICHTEXTTABSPAGE_NEW_TAB
-    void OnNewTabClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTTABSPAGE_NEW_TAB
-    void OnNewTabUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_BUTTON event handler for ID_RICHTEXTTABSPAGE_DELETE_TAB
-    void OnDeleteTabClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTTABSPAGE_DELETE_TAB
-    void OnDeleteTabUpdate( wxUpdateUIEvent& event );
-
-    /// wxEVT_BUTTON event handler for ID_RICHTEXTTABSPAGE_DELETE_ALL_TABS
-    void OnDeleteAllTabsClick( wxCommandEvent& event );
-
-    /// wxEVT_UPDATE_UI event handler for ID_RICHTEXTTABSPAGE_DELETE_ALL_TABS
-    void OnDeleteAllTabsUpdate( wxUpdateUIEvent& event );
-
-////@end wxRichTextTabsPage event handler declarations
-
-////@begin wxRichTextTabsPage member function declarations
-
-    /// Retrieves bitmap resources
-    wxBitmap GetBitmapResource( const wxString& name );
-
-    /// Retrieves icon resources
-    wxIcon GetIconResource( const wxString& name );
-////@end wxRichTextTabsPage member function declarations
-
-    /// Should we show tooltips?
-    static bool ShowToolTips();
-
-////@begin wxRichTextTabsPage member variables
-    wxTextCtrl* m_tabEditCtrl;
-    wxListBox* m_tabListCtrl;
-    /// Control identifiers
-    enum {
-        ID_RICHTEXTTABSPAGE = 10200,
-        ID_RICHTEXTTABSPAGE_TABEDIT = 10213,
-        ID_RICHTEXTTABSPAGE_TABLIST = 10214,
-        ID_RICHTEXTTABSPAGE_NEW_TAB = 10201,
-        ID_RICHTEXTTABSPAGE_DELETE_TAB = 10202,
-        ID_RICHTEXTTABSPAGE_DELETE_ALL_TABS = 10203
-    };
-////@end wxRichTextTabsPage member variables
-
-    bool m_tabsPresent;
-};
-
-#endif
-    // _RICHTEXTTABSPAGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextuicustomization.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextuicustomization.h
deleted file mode 100644
index 92c42d7b1f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextuicustomization.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextuicustomization.h
-// Purpose:     UI customization base class for wxRTC
-// Author:      Julian Smart
-// Modified by:
-// Created:     2010-11-14
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows Licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RICHTEXTUICUSTOMIZATION_H_
-#define _WX_RICHTEXTUICUSTOMIZATION_H_
-
-#if wxUSE_RICHTEXT
-
-#include "wx/window.h"
-
-/**
-    @class wxRichTextUICustomization
-    The base class for functionality to plug in to various rich text control dialogs,
-    currently allowing the application to respond to Help button clicks without the
-    need to derive new dialog classes.
-
-    The application will typically have calls like this in its initialisation:
-
-    wxRichTextFormattingDialog::GetHelpInfo().SetHelpId(ID_HELP_FORMATTINGDIALOG);
-    wxRichTextFormattingDialog::GetHelpInfo().SetUICustomization(& wxGetApp().GetRichTextUICustomization());
-    wxRichTextBordersPage::GetHelpInfo().SetHelpId(ID_HELP_BORDERSPAGE);
-    
-    Only the wxRichTextFormattingDialog class needs to have its customization object and help id set,
-    though the application set them for individual pages if it wants.
- **/
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextUICustomization
-{
-public:
-    wxRichTextUICustomization() {}
-    virtual ~wxRichTextUICustomization() {}
-
-    /// Show the help given the current active window, and a help topic id.
-    virtual bool ShowHelp(wxWindow* win, long id) = 0;
-};
-
-/**
-    @class wxRichTextHelpInfo
-    This class is used as a static member of dialogs, to store the help topic for the dialog
-    and also the customization object that will allow help to be shown appropriately for the application.
- **/
-  
-class WXDLLIMPEXP_RICHTEXT wxRichTextHelpInfo
-{
-public:
-    wxRichTextHelpInfo()
-    {
-        m_helpTopic = -1;
-        m_uiCustomization = NULL;        
-    }
-    virtual ~wxRichTextHelpInfo() {}
-        
-    virtual bool ShowHelp(wxWindow* win)
-    {
-        if ( !m_uiCustomization || m_helpTopic == -1 )
-            return false;
-
-        return m_uiCustomization->ShowHelp(win, m_helpTopic);
-    }
-
-    /// Get the help topic identifier.
-    long GetHelpId() const { return m_helpTopic; }
-
-    /// Set the help topic identifier.
-    void SetHelpId(long id) { m_helpTopic = id; }
-
-    /// Get the UI customization object.
-    wxRichTextUICustomization* GetUICustomization() const { return m_uiCustomization; }
-
-    /// Set the UI customization object.
-    void SetUICustomization(wxRichTextUICustomization* customization) { m_uiCustomization = customization; }
-
-    /// Is there a valid help topic id?
-    bool HasHelpId() const { return m_helpTopic != -1; }
-
-    /// Is there a valid customization object?
-    bool HasUICustomization() const { return m_uiCustomization != NULL; }
-
-protected:
-    wxRichTextUICustomization*  m_uiCustomization;
-    long                        m_helpTopic;
-};
-
-/// Add this to the base class of dialogs
-
-#define DECLARE_BASE_CLASS_HELP_PROVISION() \
-    virtual long GetHelpId() const = 0; \
-    virtual wxRichTextUICustomization* GetUICustomization() const = 0; \
-    virtual bool ShowHelp(wxWindow* win) = 0;
-
-/// A macro to make it easy to add help topic provision and UI customization
-/// to a class. Optionally, add virtual functions to a base class
-/// using DECLARE_BASE_CLASS_HELP_PROVISION. This means that the formatting dialog
-/// can obtain help topics from its individual pages without needing
-/// to know in advance what page classes are being used, allowing for extension
-/// of the formatting dialog.
-
-#define DECLARE_HELP_PROVISION() \
-    virtual long GetHelpId() const { return sm_helpInfo.GetHelpId(); } \
-    virtual void SetHelpId(long id) { sm_helpInfo.SetHelpId(id); } \
-    virtual wxRichTextUICustomization* GetUICustomization() const { return sm_helpInfo.GetUICustomization(); } \
-    virtual void SetUICustomization(wxRichTextUICustomization* customization) { sm_helpInfo.SetUICustomization(customization); } \
-    virtual bool ShowHelp(wxWindow* win) { return sm_helpInfo.ShowHelp(win); } \
-public: \
-    static wxRichTextHelpInfo& GetHelpInfo() { return sm_helpInfo; }\
-protected: \
-    static wxRichTextHelpInfo sm_helpInfo; \
-public:
-
-/// Add this to the implementation file for each dialog that needs help provision.
-
-#define IMPLEMENT_HELP_PROVISION(theClass) \
-    wxRichTextHelpInfo theClass::sm_helpInfo;
-
-#endif
-    // wxUSE_RICHTEXT
-
-#endif
-    // _WX_RICHTEXTUICUSTOMIZATION_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextxml.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextxml.h
deleted file mode 100644
index 013aa97693..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/richtext/richtextxml.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/richtext/richtextxml.h
-// Purpose:     XML and HTML I/O for wxRichTextCtrl
-// Author:      Julian Smart
-// Modified by:
-// Created:     2005-09-30
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_RICHTEXTXML_H_
-#define _WX_RICHTEXTXML_H_
-
-/*!
- * Includes
- */
-
-#include "wx/hashmap.h"
-#include "wx/richtext/richtextbuffer.h"
-#include "wx/richtext/richtextstyles.h"
-
-#if wxUSE_RICHTEXT && wxUSE_XML
-
-/*!
-    @class wxRichTextXMLHelper
-    A utility class to help with XML import/export, that can be used outside
-    saving a buffer if needed.
- */
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextXMLHelper: public wxObject
-{
-public:
-    wxRichTextXMLHelper() { Init(); }
-    wxRichTextXMLHelper(const wxString& enc) { Init(); SetupForSaving(enc); }
-    ~wxRichTextXMLHelper();
-
-    void Init();
-
-    void SetupForSaving(const wxString& enc);
-
-    void Clear();
-
-    void SetFileEncoding(const wxString& encoding) { m_fileEncoding = encoding; }
-    const wxString& GetFileEncoding() const { return m_fileEncoding; }
-
-    // Convert a colour to a 6-digit hex string
-    static wxString ColourToHexString(const wxColour& col);
-
-    // Convert 6-digit hex string to a colour
-    static wxColour HexStringToColour(const wxString& hex);
-
-    static wxString MakeString(const int& v) { return wxString::Format(wxT("%d"), v); }
-    static wxString MakeString(const long& v) { return wxString::Format(wxT("%ld"), v); }
-    static wxString MakeString(const double& v) { return wxString::Format(wxT("%.2f"), (float) v); }
-    static wxString MakeString(const wxString& s) { return s; }
-    static wxString MakeString(const wxColour& col) { return wxT("#") + ColourToHexString(col); }
-
-    static bool HasParam(wxXmlNode* node, const wxString& param);
-    static wxXmlNode *GetParamNode(wxXmlNode* node, const wxString& param);
-    static wxString GetNodeContent(wxXmlNode *node);
-    static wxString GetParamValue(wxXmlNode *node, const wxString& param);
-    static wxString GetText(wxXmlNode *node, const wxString& param = wxEmptyString);
-    static wxXmlNode* FindNode(wxXmlNode* node, const wxString& name);
-
-    static wxString AttributeToXML(const wxString& str);
-
-    static bool RichTextFixFaceName(wxString& facename);
-    static long ColourStringToLong(const wxString& colStr);
-    static wxTextAttrDimension ParseDimension(const wxString& dimStr);
-
-    // Make a string from the given property. This can be overridden for custom variants.
-    virtual wxString MakeStringFromProperty(const wxVariant& var);
-
-    // Create a proprty from the string read from the XML file.
-    virtual wxVariant MakePropertyFromString(const wxString& name, const wxString& value, const wxString& type);
-
-    // Import properties
-    virtual bool ImportProperties(wxRichTextProperties& properties, wxXmlNode* node);
-
-    virtual bool ImportStyle(wxRichTextAttr& attr, wxXmlNode* node, bool isPara = false);
-    virtual bool ImportStyleDefinition(wxRichTextStyleSheet* sheet, wxXmlNode* node);
-
-    // Get flags, as per handler flags
-    int GetFlags() const { return m_flags; }
-    void SetFlags(int flags) { m_flags = flags; }
-
-#if wxRICHTEXT_HAVE_DIRECT_OUTPUT
-    // write string to output
-    static void OutputString(wxOutputStream& stream, const wxString& str,
-                                wxMBConv *convMem, wxMBConv *convFile);
-
-    static void OutputIndentation(wxOutputStream& stream, int indent);
-
-    // Same as above, but create entities first.
-    // Translates '<' to "<", '>' to ">" and '&' to "&"
-    static void OutputStringEnt(wxOutputStream& stream, const wxString& str,
-                            wxMBConv *convMem, wxMBConv *convFile);
-
-    void OutputString(wxOutputStream& stream, const wxString& str);
-    void OutputStringEnt(wxOutputStream& stream, const wxString& str);
-    
-    static void AddString(wxString& str, const int& v) { str << wxString::Format(wxT("%d"), v); }
-    static void AddString(wxString& str, const long& v) { str << wxString::Format(wxT("%ld"), v); }
-    static void AddString(wxString& str, const double& v) { str << wxString::Format(wxT("%.2f"), (float) v); }
-    static void AddString(wxString& str, const wxChar* s) { str << s; }
-    static void AddString(wxString& str, const wxString& s) { str << s; }
-    static void AddString(wxString& str, const wxColour& col) { str << wxT("#") << ColourToHexString(col); }
-
-    static void AddAttribute(wxString& str, const wxString& name, const int& v);
-    static void AddAttribute(wxString& str, const wxString& name, const long& v);
-    static void AddAttribute(wxString& str, const wxString& name, const double& v);
-    static void AddAttribute(wxString& str, const wxString& name, const wxChar* s);
-    static void AddAttribute(wxString& str, const wxString& name, const wxString& s);
-    static void AddAttribute(wxString& str, const wxString& name, const wxColour& col);
-    static void AddAttribute(wxString& str, const wxString& name, const wxTextAttrDimension& dim);
-    static void AddAttribute(wxString& str, const wxString& rootName, const wxTextAttrDimensions& dims);
-    static void AddAttribute(wxString& str, const wxString& rootName, const wxTextAttrBorder& border);
-    static void AddAttribute(wxString& str, const wxString& rootName, const wxTextAttrBorders& borders);
-
-    /// Create a string containing style attributes
-    static wxString AddAttributes(const wxRichTextAttr& attr, bool isPara = false);
-    virtual bool ExportStyleDefinition(wxOutputStream& stream, wxRichTextStyleDefinition* def, int level);
-
-    virtual bool WriteProperties(wxOutputStream& stream, const wxRichTextProperties& properties, int level);
-#endif
-
-#if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT
-    static void AddAttribute(wxXmlNode* node, const wxString& name, const int& v);
-    static void AddAttribute(wxXmlNode* node, const wxString& name, const long& v);
-    static void AddAttribute(wxXmlNode* node, const wxString& name, const double& v);
-    static void AddAttribute(wxXmlNode* node, const wxString& name, const wxString& s);
-    static void AddAttribute(wxXmlNode* node, const wxString& name, const wxColour& col);
-    static void AddAttribute(wxXmlNode* node, const wxString& name, const wxTextAttrDimension& dim);
-    static void AddAttribute(wxXmlNode* node, const wxString& rootName, const wxTextAttrDimensions& dims);
-    static void AddAttribute(wxXmlNode* node, const wxString& rootName, const wxTextAttrBorder& border);
-    static void AddAttribute(wxXmlNode* node, const wxString& rootName, const wxTextAttrBorders& borders);
-
-    static bool AddAttributes(wxXmlNode* node, wxRichTextAttr& attr, bool isPara = false);
-
-    virtual bool ExportStyleDefinition(wxXmlNode* parent, wxRichTextStyleDefinition* def);
-
-    // Write the properties
-    virtual bool WriteProperties(wxXmlNode* node, const wxRichTextProperties& properties);
-#endif
-
-public:
-
-#if wxRICHTEXT_HAVE_DIRECT_OUTPUT
-    // Used during saving
-    wxMBConv*   m_convMem;
-    wxMBConv*   m_convFile;
-    bool        m_deleteConvFile;
-#endif
-
-    wxString    m_fileEncoding;
-    int         m_flags;
-};
-
-/*!
-    @class wxRichTextXMLHandler
-
-    Implements XML loading and saving. Two methods of saving are included:
-    writing directly to a text stream, and populating an wxXmlDocument
-    before writing it. The former method is considerably faster, so we favour
-    that one, even though the code is a little less elegant.
- */
-
-class WXDLLIMPEXP_FWD_XML wxXmlNode;
-class WXDLLIMPEXP_FWD_XML wxXmlDocument;
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextXMLHandler: public wxRichTextFileHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxRichTextXMLHandler)
-public:
-    wxRichTextXMLHandler(const wxString& name = wxT("XML"), const wxString& ext = wxT("xml"), int type = wxRICHTEXT_TYPE_XML)
-        : wxRichTextFileHandler(name, ext, type)
-        { Init(); }
-
-    void Init();
-
-#if wxUSE_STREAMS
-
-#if wxRICHTEXT_HAVE_DIRECT_OUTPUT
-    /// Recursively export an object
-    bool ExportXML(wxOutputStream& stream, wxRichTextObject& obj, int level);
-#endif
-
-#if wxRICHTEXT_HAVE_XMLDOCUMENT_OUTPUT
-    bool ExportXML(wxXmlNode* parent, wxRichTextObject& obj);
-#endif
-
-    /// Recursively import an object
-    bool ImportXML(wxRichTextBuffer* buffer, wxRichTextObject* obj, wxXmlNode* node);
-#endif
-
-    /// Creates an object given an XML element name
-    virtual wxRichTextObject* CreateObjectForXMLName(wxRichTextObject* parent, const wxString& name) const;
-
-    /// Can we save using this handler?
-    virtual bool CanSave() const { return true; }
-
-    /// Can we load using this handler?
-    virtual bool CanLoad() const { return true; }
-
-    /// Returns the XML helper object, implementing functionality
-    /// that can be reused elsewhere.
-    wxRichTextXMLHelper& GetHelper() { return m_helper; }
-
-// Implementation
-
-    /**
-        Call with XML node name, C++ class name so that wxRTC can read in the node.
-        If you add a custom object, call this.
-    */
-    static void RegisterNodeName(const wxString& nodeName, const wxString& className) { sm_nodeNameToClassMap[nodeName] = className; }
-
-    /**
-        Cleans up the mapping between node name and C++ class.
-    */
-    static void ClearNodeToClassMap() { sm_nodeNameToClassMap.clear(); }
-
-protected:
-#if wxUSE_STREAMS
-    virtual bool DoLoadFile(wxRichTextBuffer *buffer, wxInputStream& stream);
-    virtual bool DoSaveFile(wxRichTextBuffer *buffer, wxOutputStream& stream);
-#endif
-
-    wxRichTextXMLHelper m_helper;
-
-    static wxStringToStringHashMap sm_nodeNameToClassMap;
-};
-
-#endif
-    // wxUSE_RICHTEXT && wxUSE_XML
-
-#endif
-    // _WX_RICHTEXTXML_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/stc/private.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/stc/private.h
deleted file mode 100644
index 3624bb779f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/stc/private.h
+++ /dev/null
@@ -1,54 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Name:        wx/stc/private.h
-// Purpose:     Private declarations for wxSTC
-// Author:      Robin Dunn
-// Created:     2007-07-15
-// Copyright:   (c) 2000 by Total Control Software
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_STC_PRIVATE_H_
-#define _WX_STC_PRIVATE_H_
-
-#include "wx/defs.h"
-#include "wx/string.h"
-
-//----------------------------------------------------------------------
-// Utility functions used within wxSTC
-
-#if wxUSE_UNICODE
-
-extern wxString stc2wx(const char* str);
-extern wxString stc2wx(const char* str, size_t len);
-extern wxCharBuffer wx2stc(const wxString& str);
-
-// This function takes both wxString and wxCharBuffer because it uses either
-// one or the other of them depending on the build mode. In Unicode it uses the
-// length of the already converted buffer to avoid doing the conversion again
-// just to compute the length.
-inline size_t wx2stclen(const wxString& WXUNUSED(str), const wxCharBuffer& buf)
-{
-    return buf.length() - 1;
-}
-
-#else // not UNICODE
-
-inline wxString stc2wx(const char* str) {
-    return wxString(str);
-}
-inline wxString stc2wx(const char* str, size_t len) {
-    return wxString(str, len);
-}
-inline const char* wx2stc(const wxString& str) {
-    return str.mbc_str();
-}
-
-// As explained above, the buffer argument is only used in Unicode build.
-inline size_t wx2stclen(const wxString& str, const char* WXUNUSED(buf))
-{
-    return str.length();
-}
-
-#endif // UNICODE
-
-#endif // _WX_STC_PRIVATE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/stc/stc.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/stc/stc.h
deleted file mode 100644
index 7ffab648bd..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/stc/stc.h
+++ /dev/null
@@ -1,5013 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-// Name:        wx/stc/stc.h
-// Purpose:     A wxWidgets implementation of Scintilla.  This class is the
-//              one meant to be used directly by wx applications.  It does not
-//              derive directly from the Scintilla classes, and in fact there
-//              is no mention of Scintilla classes at all in this header.
-//              This class delegates all method calls and events to the
-//              Scintilla objects and so forth.  This allows the use of
-//              Scintilla without polluting the namespace with all the
-//              classes and itentifiers from Scintilla.
-//
-// Author:      Robin Dunn
-//
-// Created:     13-Jan-2000
-// Copyright:   (c) 2000 by Total Control Software
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-/*
-    IMPORTANT: include/wx/stc/stc.h is generated by src/stc/gen_iface.py from
-               src/stc/stc.h.in, don't edit stc.h file as your changes will be
-               lost after the next regeneration, edit stc.h.in and rerun the
-               gen_iface.py script instead!
-
-               Parts of this file generated by the script are found in between
-               the special "{{{" and "}}}" markers, the rest of it is copied
-               verbatim from src.h.in.
- */
-
-#ifndef _WX_STC_STC_H_
-#define _WX_STC_STC_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_STC
-
-#include "wx/control.h"
-#include "wx/dnd.h"
-#include "wx/stopwatch.h"
-#include "wx/versioninfo.h"
-
-#include "wx/textentry.h"
-#if wxUSE_TEXTCTRL
-    #include "wx/textctrl.h"
-#endif // wxUSE_TEXTCTRL
-
-class WXDLLIMPEXP_FWD_CORE wxScrollBar;
-
-// SWIG can't handle "#if" type of conditionals, only "#ifdef"
-#ifdef SWIG
-#define STC_USE_DND 1
-#else
-#if wxUSE_DRAG_AND_DROP
-#define STC_USE_DND 1
-#endif
-#endif
-
-//----------------------------------------------------------------------
-// STC constants generated section {{{
-
-#define wxSTC_INVALID_POSITION -1
-
-/// Define start of Scintilla messages to be greater than all Windows edit (EM_*) messages
-/// as many EM_ messages can be used although that use is deprecated.
-#define wxSTC_START 2000
-#define wxSTC_OPTIONAL_START 3000
-#define wxSTC_LEXER_START 4000
-#define wxSTC_WS_INVISIBLE 0
-#define wxSTC_WS_VISIBLEALWAYS 1
-#define wxSTC_WS_VISIBLEAFTERINDENT 2
-#define wxSTC_EOL_CRLF 0
-#define wxSTC_EOL_CR 1
-#define wxSTC_EOL_LF 2
-
-/// The SC_CP_UTF8 value can be used to enter Unicode mode.
-/// This is the same value as CP_UTF8 in Windows
-#define wxSTC_CP_UTF8 65001
-#define wxSTC_MARKER_MAX 31
-#define wxSTC_MARK_CIRCLE 0
-#define wxSTC_MARK_ROUNDRECT 1
-#define wxSTC_MARK_ARROW 2
-#define wxSTC_MARK_SMALLRECT 3
-#define wxSTC_MARK_SHORTARROW 4
-#define wxSTC_MARK_EMPTY 5
-#define wxSTC_MARK_ARROWDOWN 6
-#define wxSTC_MARK_MINUS 7
-#define wxSTC_MARK_PLUS 8
-
-/// Shapes used for outlining column.
-#define wxSTC_MARK_VLINE 9
-#define wxSTC_MARK_LCORNER 10
-#define wxSTC_MARK_TCORNER 11
-#define wxSTC_MARK_BOXPLUS 12
-#define wxSTC_MARK_BOXPLUSCONNECTED 13
-#define wxSTC_MARK_BOXMINUS 14
-#define wxSTC_MARK_BOXMINUSCONNECTED 15
-#define wxSTC_MARK_LCORNERCURVE 16
-#define wxSTC_MARK_TCORNERCURVE 17
-#define wxSTC_MARK_CIRCLEPLUS 18
-#define wxSTC_MARK_CIRCLEPLUSCONNECTED 19
-#define wxSTC_MARK_CIRCLEMINUS 20
-#define wxSTC_MARK_CIRCLEMINUSCONNECTED 21
-
-/// Invisible mark that only sets the line background colour.
-#define wxSTC_MARK_BACKGROUND 22
-#define wxSTC_MARK_DOTDOTDOT 23
-#define wxSTC_MARK_ARROWS 24
-#define wxSTC_MARK_PIXMAP 25
-#define wxSTC_MARK_FULLRECT 26
-#define wxSTC_MARK_LEFTRECT 27
-#define wxSTC_MARK_AVAILABLE 28
-#define wxSTC_MARK_UNDERLINE 29
-#define wxSTC_MARK_RGBAIMAGE 30
-#define wxSTC_MARK_CHARACTER 10000
-
-/// Markers used for outlining column.
-#define wxSTC_MARKNUM_FOLDEREND 25
-#define wxSTC_MARKNUM_FOLDEROPENMID 26
-#define wxSTC_MARKNUM_FOLDERMIDTAIL 27
-#define wxSTC_MARKNUM_FOLDERTAIL 28
-#define wxSTC_MARKNUM_FOLDERSUB 29
-#define wxSTC_MARKNUM_FOLDER 30
-#define wxSTC_MARKNUM_FOLDEROPEN 31
-#define wxSTC_MASK_FOLDERS 0xFE000000
-#define wxSTC_MARGIN_SYMBOL 0
-#define wxSTC_MARGIN_NUMBER 1
-#define wxSTC_MARGIN_BACK 2
-#define wxSTC_MARGIN_FORE 3
-#define wxSTC_MARGIN_TEXT 4
-#define wxSTC_MARGIN_RTEXT 5
-
-/// Styles in range 32..38 are predefined for parts of the UI and are not used as normal styles.
-/// Style 39 is for future use.
-#define wxSTC_STYLE_DEFAULT 32
-#define wxSTC_STYLE_LINENUMBER 33
-#define wxSTC_STYLE_BRACELIGHT 34
-#define wxSTC_STYLE_BRACEBAD 35
-#define wxSTC_STYLE_CONTROLCHAR 36
-#define wxSTC_STYLE_INDENTGUIDE 37
-#define wxSTC_STYLE_CALLTIP 38
-#define wxSTC_STYLE_LASTPREDEFINED 39
-#define wxSTC_STYLE_MAX 255
-
-/// Character set identifiers are used in StyleSetCharacterSet.
-/// The values are the same as the Windows *_CHARSET values.
-#define wxSTC_CHARSET_ANSI 0
-#define wxSTC_CHARSET_DEFAULT 1
-#define wxSTC_CHARSET_BALTIC 186
-#define wxSTC_CHARSET_CHINESEBIG5 136
-#define wxSTC_CHARSET_EASTEUROPE 238
-#define wxSTC_CHARSET_GB2312 134
-#define wxSTC_CHARSET_GREEK 161
-#define wxSTC_CHARSET_HANGUL 129
-#define wxSTC_CHARSET_MAC 77
-#define wxSTC_CHARSET_OEM 255
-#define wxSTC_CHARSET_RUSSIAN 204
-#define wxSTC_CHARSET_CYRILLIC 1251
-#define wxSTC_CHARSET_SHIFTJIS 128
-#define wxSTC_CHARSET_SYMBOL 2
-#define wxSTC_CHARSET_TURKISH 162
-#define wxSTC_CHARSET_JOHAB 130
-#define wxSTC_CHARSET_HEBREW 177
-#define wxSTC_CHARSET_ARABIC 178
-#define wxSTC_CHARSET_VIETNAMESE 163
-#define wxSTC_CHARSET_THAI 222
-#define wxSTC_CHARSET_8859_15 1000
-#define wxSTC_CASE_MIXED 0
-#define wxSTC_CASE_UPPER 1
-#define wxSTC_CASE_LOWER 2
-#define wxSTC_FONT_SIZE_MULTIPLIER 100
-#define wxSTC_WEIGHT_NORMAL 400
-#define wxSTC_WEIGHT_SEMIBOLD 600
-#define wxSTC_WEIGHT_BOLD 700
-
-/// Indicator style enumeration and some constants
-#define wxSTC_INDIC_PLAIN 0
-#define wxSTC_INDIC_SQUIGGLE 1
-#define wxSTC_INDIC_TT 2
-#define wxSTC_INDIC_DIAGONAL 3
-#define wxSTC_INDIC_STRIKE 4
-#define wxSTC_INDIC_HIDDEN 5
-#define wxSTC_INDIC_BOX 6
-#define wxSTC_INDIC_ROUNDBOX 7
-#define wxSTC_INDIC_STRAIGHTBOX 8
-#define wxSTC_INDIC_DASH 9
-#define wxSTC_INDIC_DOTS 10
-#define wxSTC_INDIC_SQUIGGLELOW 11
-#define wxSTC_INDIC_DOTBOX 12
-#define wxSTC_INDIC_MAX 31
-#define wxSTC_INDIC_CONTAINER 8
-#define wxSTC_INDIC0_MASK 0x20
-#define wxSTC_INDIC1_MASK 0x40
-#define wxSTC_INDIC2_MASK 0x80
-#define wxSTC_INDICS_MASK 0xE0
-#define wxSTC_IV_NONE 0
-#define wxSTC_IV_REAL 1
-#define wxSTC_IV_LOOKFORWARD 2
-#define wxSTC_IV_LOOKBOTH 3
-
-/// PrintColourMode - use same colours as screen.
-#define wxSTC_PRINT_NORMAL 0
-
-/// PrintColourMode - invert the light value of each style for printing.
-#define wxSTC_PRINT_INVERTLIGHT 1
-
-/// PrintColourMode - force black text on white background for printing.
-#define wxSTC_PRINT_BLACKONWHITE 2
-
-/// PrintColourMode - text stays coloured, but all background is forced to be white for printing.
-#define wxSTC_PRINT_COLOURONWHITE 3
-
-/// PrintColourMode - only the default-background is forced to be white for printing.
-#define wxSTC_PRINT_COLOURONWHITEDEFAULTBG 4
-#define wxSTC_FIND_WHOLEWORD 2
-#define wxSTC_FIND_MATCHCASE 4
-#define wxSTC_FIND_WORDSTART 0x00100000
-#define wxSTC_FIND_REGEXP 0x00200000
-#define wxSTC_FIND_POSIX 0x00400000
-#define wxSTC_FOLDLEVELBASE 0x400
-#define wxSTC_FOLDLEVELWHITEFLAG 0x1000
-#define wxSTC_FOLDLEVELHEADERFLAG 0x2000
-#define wxSTC_FOLDLEVELNUMBERMASK 0x0FFF
-#define wxSTC_FOLDFLAG_LINEBEFORE_EXPANDED 0x0002
-#define wxSTC_FOLDFLAG_LINEBEFORE_CONTRACTED 0x0004
-#define wxSTC_FOLDFLAG_LINEAFTER_EXPANDED 0x0008
-#define wxSTC_FOLDFLAG_LINEAFTER_CONTRACTED 0x0010
-#define wxSTC_FOLDFLAG_LEVELNUMBERS 0x0040
-#define wxSTC_TIME_FOREVER 10000000
-#define wxSTC_WRAP_NONE 0
-#define wxSTC_WRAP_WORD 1
-#define wxSTC_WRAP_CHAR 2
-#define wxSTC_WRAPVISUALFLAG_NONE 0x0000
-#define wxSTC_WRAPVISUALFLAG_END 0x0001
-#define wxSTC_WRAPVISUALFLAG_START 0x0002
-#define wxSTC_WRAPVISUALFLAG_MARGIN 0x0004
-#define wxSTC_WRAPVISUALFLAGLOC_DEFAULT 0x0000
-#define wxSTC_WRAPVISUALFLAGLOC_END_BY_TEXT 0x0001
-#define wxSTC_WRAPVISUALFLAGLOC_START_BY_TEXT 0x0002
-#define wxSTC_WRAPINDENT_FIXED 0
-#define wxSTC_WRAPINDENT_SAME 1
-#define wxSTC_WRAPINDENT_INDENT 2
-#define wxSTC_CACHE_NONE 0
-#define wxSTC_CACHE_CARET 1
-#define wxSTC_CACHE_PAGE 2
-#define wxSTC_CACHE_DOCUMENT 3
-
-/// Control font anti-aliasing.
-#define wxSTC_EFF_QUALITY_MASK 0xF
-#define wxSTC_EFF_QUALITY_DEFAULT 0
-#define wxSTC_EFF_QUALITY_NON_ANTIALIASED 1
-#define wxSTC_EFF_QUALITY_ANTIALIASED 2
-#define wxSTC_EFF_QUALITY_LCD_OPTIMIZED 3
-#define wxSTC_MULTIPASTE_ONCE 0
-#define wxSTC_MULTIPASTE_EACH 1
-#define wxSTC_EDGE_NONE 0
-#define wxSTC_EDGE_LINE 1
-#define wxSTC_EDGE_BACKGROUND 2
-#define wxSTC_STATUS_OK 0
-#define wxSTC_STATUS_FAILURE 1
-#define wxSTC_STATUS_BADALLOC 2
-#define wxSTC_CURSORNORMAL -1
-#define wxSTC_CURSORARROW 2
-#define wxSTC_CURSORWAIT 4
-#define wxSTC_CURSORREVERSEARROW 7
-
-/// Constants for use with SetVisiblePolicy, similar to SetCaretPolicy.
-#define wxSTC_VISIBLE_SLOP 0x01
-#define wxSTC_VISIBLE_STRICT 0x04
-
-/// Caret policy, used by SetXCaretPolicy and SetYCaretPolicy.
-/// If CARET_SLOP is set, we can define a slop value: caretSlop.
-/// This value defines an unwanted zone (UZ) where the caret is... unwanted.
-/// This zone is defined as a number of pixels near the vertical margins,
-/// and as a number of lines near the horizontal margins.
-/// By keeping the caret away from the edges, it is seen within its context,
-/// so it is likely that the identifier that the caret is on can be completely seen,
-/// and that the current line is seen with some of the lines following it which are
-/// often dependent on that line.
-#define wxSTC_CARET_SLOP 0x01
-
-/// If CARET_STRICT is set, the policy is enforced... strictly.
-/// The caret is centred on the display if slop is not set,
-/// and cannot go in the UZ if slop is set.
-#define wxSTC_CARET_STRICT 0x04
-
-/// If CARET_JUMPS is set, the display is moved more energetically
-/// so the caret can move in the same direction longer before the policy is applied again.
-#define wxSTC_CARET_JUMPS 0x10
-
-/// If CARET_EVEN is not set, instead of having symmetrical UZs,
-/// the left and bottom UZs are extended up to right and top UZs respectively.
-/// This way, we favour the displaying of useful information: the begining of lines,
-/// where most code reside, and the lines after the caret, eg. the body of a function.
-#define wxSTC_CARET_EVEN 0x08
-#define wxSTC_SEL_STREAM 0
-#define wxSTC_SEL_RECTANGLE 1
-#define wxSTC_SEL_LINES 2
-#define wxSTC_SEL_THIN 3
-#define wxSTC_CASEINSENSITIVEBEHAVIOUR_RESPECTCASE 0
-#define wxSTC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE 1
-#define wxSTC_CARETSTICKY_OFF 0
-#define wxSTC_CARETSTICKY_ON 1
-#define wxSTC_CARETSTICKY_WHITESPACE 2
-#define wxSTC_ALPHA_TRANSPARENT 0
-#define wxSTC_ALPHA_OPAQUE 255
-#define wxSTC_ALPHA_NOALPHA 256
-#define wxSTC_CARETSTYLE_INVISIBLE 0
-#define wxSTC_CARETSTYLE_LINE 1
-#define wxSTC_CARETSTYLE_BLOCK 2
-#define wxSTC_MARGINOPTION_NONE 0
-#define wxSTC_MARGINOPTION_SUBLINESELECT 1
-#define wxSTC_ANNOTATION_HIDDEN 0
-#define wxSTC_ANNOTATION_STANDARD 1
-#define wxSTC_ANNOTATION_BOXED 2
-#define wxSTC_UNDO_MAY_COALESCE 1
-#define wxSTC_SCVS_NONE 0
-#define wxSTC_SCVS_RECTANGULARSELECTION 1
-#define wxSTC_SCVS_USERACCESSIBLE 2
-#define wxSTC_TECHNOLOGY_DEFAULT 0
-#define wxSTC_TECHNOLOGY_DIRECTWRITE 1
-
-/// Maximum value of keywordSet parameter of SetKeyWords.
-#define wxSTC_KEYWORDSET_MAX 8
-#define wxSTC_TYPE_BOOLEAN 0
-#define wxSTC_TYPE_INTEGER 1
-#define wxSTC_TYPE_STRING 2
-
-/// Notifications
-/// Type of modification and the action which caused the modification.
-/// These are defined as a bit mask to make it easy to specify which notifications are wanted.
-/// One bit is set from each of SC_MOD_* and SC_PERFORMED_*.
-#define wxSTC_MOD_INSERTTEXT 0x1
-#define wxSTC_MOD_DELETETEXT 0x2
-#define wxSTC_MOD_CHANGESTYLE 0x4
-#define wxSTC_MOD_CHANGEFOLD 0x8
-#define wxSTC_PERFORMED_USER 0x10
-#define wxSTC_PERFORMED_UNDO 0x20
-#define wxSTC_PERFORMED_REDO 0x40
-#define wxSTC_MULTISTEPUNDOREDO 0x80
-#define wxSTC_LASTSTEPINUNDOREDO 0x100
-#define wxSTC_MOD_CHANGEMARKER 0x200
-#define wxSTC_MOD_BEFOREINSERT 0x400
-#define wxSTC_MOD_BEFOREDELETE 0x800
-#define wxSTC_MULTILINEUNDOREDO 0x1000
-#define wxSTC_STARTACTION 0x2000
-#define wxSTC_MOD_CHANGEINDICATOR 0x4000
-#define wxSTC_MOD_CHANGELINESTATE 0x8000
-#define wxSTC_MOD_CHANGEMARGIN 0x10000
-#define wxSTC_MOD_CHANGEANNOTATION 0x20000
-#define wxSTC_MOD_CONTAINER 0x40000
-#define wxSTC_MOD_LEXERSTATE 0x80000
-#define wxSTC_MODEVENTMASKALL 0xFFFFF
-#define wxSTC_UPDATE_CONTENT 0x1
-#define wxSTC_UPDATE_SELECTION 0x2
-#define wxSTC_UPDATE_V_SCROLL 0x4
-#define wxSTC_UPDATE_H_SCROLL 0x8
-
-/// Symbolic key codes and modifier flags.
-/// ASCII and other printable characters below 256.
-/// Extended keys above 300.
-#define wxSTC_KEY_DOWN 300
-#define wxSTC_KEY_UP 301
-#define wxSTC_KEY_LEFT 302
-#define wxSTC_KEY_RIGHT 303
-#define wxSTC_KEY_HOME 304
-#define wxSTC_KEY_END 305
-#define wxSTC_KEY_PRIOR 306
-#define wxSTC_KEY_NEXT 307
-#define wxSTC_KEY_DELETE 308
-#define wxSTC_KEY_INSERT 309
-#define wxSTC_KEY_ESCAPE 7
-#define wxSTC_KEY_BACK 8
-#define wxSTC_KEY_TAB 9
-#define wxSTC_KEY_RETURN 13
-#define wxSTC_KEY_ADD 310
-#define wxSTC_KEY_SUBTRACT 311
-#define wxSTC_KEY_DIVIDE 312
-#define wxSTC_KEY_WIN 313
-#define wxSTC_KEY_RWIN 314
-#define wxSTC_KEY_MENU 315
-#define wxSTC_SCMOD_NORM 0
-#define wxSTC_SCMOD_SHIFT 1
-#define wxSTC_SCMOD_CTRL 2
-#define wxSTC_SCMOD_ALT 4
-#define wxSTC_SCMOD_SUPER 8
-#define wxSTC_SCMOD_META 16
-
-/// For SciLexer.h
-#define wxSTC_LEX_CONTAINER 0
-#define wxSTC_LEX_NULL 1
-#define wxSTC_LEX_PYTHON 2
-#define wxSTC_LEX_CPP 3
-#define wxSTC_LEX_HTML 4
-#define wxSTC_LEX_XML 5
-#define wxSTC_LEX_PERL 6
-#define wxSTC_LEX_SQL 7
-#define wxSTC_LEX_VB 8
-#define wxSTC_LEX_PROPERTIES 9
-#define wxSTC_LEX_ERRORLIST 10
-#define wxSTC_LEX_MAKEFILE 11
-#define wxSTC_LEX_BATCH 12
-#define wxSTC_LEX_XCODE 13
-#define wxSTC_LEX_LATEX 14
-#define wxSTC_LEX_LUA 15
-#define wxSTC_LEX_DIFF 16
-#define wxSTC_LEX_CONF 17
-#define wxSTC_LEX_PASCAL 18
-#define wxSTC_LEX_AVE 19
-#define wxSTC_LEX_ADA 20
-#define wxSTC_LEX_LISP 21
-#define wxSTC_LEX_RUBY 22
-#define wxSTC_LEX_EIFFEL 23
-#define wxSTC_LEX_EIFFELKW 24
-#define wxSTC_LEX_TCL 25
-#define wxSTC_LEX_NNCRONTAB 26
-#define wxSTC_LEX_BULLANT 27
-#define wxSTC_LEX_VBSCRIPT 28
-#define wxSTC_LEX_BAAN 31
-#define wxSTC_LEX_MATLAB 32
-#define wxSTC_LEX_SCRIPTOL 33
-#define wxSTC_LEX_ASM 34
-#define wxSTC_LEX_CPPNOCASE 35
-#define wxSTC_LEX_FORTRAN 36
-#define wxSTC_LEX_F77 37
-#define wxSTC_LEX_CSS 38
-#define wxSTC_LEX_POV 39
-#define wxSTC_LEX_LOUT 40
-#define wxSTC_LEX_ESCRIPT 41
-#define wxSTC_LEX_PS 42
-#define wxSTC_LEX_NSIS 43
-#define wxSTC_LEX_MMIXAL 44
-#define wxSTC_LEX_CLW 45
-#define wxSTC_LEX_CLWNOCASE 46
-#define wxSTC_LEX_LOT 47
-#define wxSTC_LEX_YAML 48
-#define wxSTC_LEX_TEX 49
-#define wxSTC_LEX_METAPOST 50
-#define wxSTC_LEX_POWERBASIC 51
-#define wxSTC_LEX_FORTH 52
-#define wxSTC_LEX_ERLANG 53
-#define wxSTC_LEX_OCTAVE 54
-#define wxSTC_LEX_MSSQL 55
-#define wxSTC_LEX_VERILOG 56
-#define wxSTC_LEX_KIX 57
-#define wxSTC_LEX_GUI4CLI 58
-#define wxSTC_LEX_SPECMAN 59
-#define wxSTC_LEX_AU3 60
-#define wxSTC_LEX_APDL 61
-#define wxSTC_LEX_BASH 62
-#define wxSTC_LEX_ASN1 63
-#define wxSTC_LEX_VHDL 64
-#define wxSTC_LEX_CAML 65
-#define wxSTC_LEX_BLITZBASIC 66
-#define wxSTC_LEX_PUREBASIC 67
-#define wxSTC_LEX_HASKELL 68
-#define wxSTC_LEX_PHPSCRIPT 69
-#define wxSTC_LEX_TADS3 70
-#define wxSTC_LEX_REBOL 71
-#define wxSTC_LEX_SMALLTALK 72
-#define wxSTC_LEX_FLAGSHIP 73
-#define wxSTC_LEX_CSOUND 74
-#define wxSTC_LEX_FREEBASIC 75
-#define wxSTC_LEX_INNOSETUP 76
-#define wxSTC_LEX_OPAL 77
-#define wxSTC_LEX_SPICE 78
-#define wxSTC_LEX_D 79
-#define wxSTC_LEX_CMAKE 80
-#define wxSTC_LEX_GAP 81
-#define wxSTC_LEX_PLM 82
-#define wxSTC_LEX_PROGRESS 83
-#define wxSTC_LEX_ABAQUS 84
-#define wxSTC_LEX_ASYMPTOTE 85
-#define wxSTC_LEX_R 86
-#define wxSTC_LEX_MAGIK 87
-#define wxSTC_LEX_POWERSHELL 88
-#define wxSTC_LEX_MYSQL 89
-#define wxSTC_LEX_PO 90
-#define wxSTC_LEX_TAL 91
-#define wxSTC_LEX_COBOL 92
-#define wxSTC_LEX_TACL 93
-#define wxSTC_LEX_SORCUS 94
-#define wxSTC_LEX_POWERPRO 95
-#define wxSTC_LEX_NIMROD 96
-#define wxSTC_LEX_SML 97
-#define wxSTC_LEX_MARKDOWN 98
-#define wxSTC_LEX_TXT2TAGS 99
-#define wxSTC_LEX_A68K 100
-#define wxSTC_LEX_MODULA 101
-#define wxSTC_LEX_COFFEESCRIPT 102
-#define wxSTC_LEX_TCMD 103
-#define wxSTC_LEX_AVS 104
-#define wxSTC_LEX_ECL 105
-#define wxSTC_LEX_OSCRIPT 106
-#define wxSTC_LEX_VISUALPROLOG 107
-
-/// When a lexer specifies its language as SCLEX_AUTOMATIC it receives a
-/// value assigned in sequence from SCLEX_AUTOMATIC+1.
-#define wxSTC_LEX_AUTOMATIC 1000
-
-/// Lexical states for SCLEX_PYTHON
-#define wxSTC_P_DEFAULT 0
-#define wxSTC_P_COMMENTLINE 1
-#define wxSTC_P_NUMBER 2
-#define wxSTC_P_STRING 3
-#define wxSTC_P_CHARACTER 4
-#define wxSTC_P_WORD 5
-#define wxSTC_P_TRIPLE 6
-#define wxSTC_P_TRIPLEDOUBLE 7
-#define wxSTC_P_CLASSNAME 8
-#define wxSTC_P_DEFNAME 9
-#define wxSTC_P_OPERATOR 10
-#define wxSTC_P_IDENTIFIER 11
-#define wxSTC_P_COMMENTBLOCK 12
-#define wxSTC_P_STRINGEOL 13
-#define wxSTC_P_WORD2 14
-#define wxSTC_P_DECORATOR 15
-
-/// Lexical states for SCLEX_CPP
-#define wxSTC_C_DEFAULT 0
-#define wxSTC_C_COMMENT 1
-#define wxSTC_C_COMMENTLINE 2
-#define wxSTC_C_COMMENTDOC 3
-#define wxSTC_C_NUMBER 4
-#define wxSTC_C_WORD 5
-#define wxSTC_C_STRING 6
-#define wxSTC_C_CHARACTER 7
-#define wxSTC_C_UUID 8
-#define wxSTC_C_PREPROCESSOR 9
-#define wxSTC_C_OPERATOR 10
-#define wxSTC_C_IDENTIFIER 11
-#define wxSTC_C_STRINGEOL 12
-#define wxSTC_C_VERBATIM 13
-#define wxSTC_C_REGEX 14
-#define wxSTC_C_COMMENTLINEDOC 15
-#define wxSTC_C_WORD2 16
-#define wxSTC_C_COMMENTDOCKEYWORD 17
-#define wxSTC_C_COMMENTDOCKEYWORDERROR 18
-#define wxSTC_C_GLOBALCLASS 19
-#define wxSTC_C_STRINGRAW 20
-#define wxSTC_C_TRIPLEVERBATIM 21
-#define wxSTC_C_HASHQUOTEDSTRING 22
-#define wxSTC_C_PREPROCESSORCOMMENT 23
-
-/// Lexical states for SCLEX_D
-#define wxSTC_D_DEFAULT 0
-#define wxSTC_D_COMMENT 1
-#define wxSTC_D_COMMENTLINE 2
-#define wxSTC_D_COMMENTDOC 3
-#define wxSTC_D_COMMENTNESTED 4
-#define wxSTC_D_NUMBER 5
-#define wxSTC_D_WORD 6
-#define wxSTC_D_WORD2 7
-#define wxSTC_D_WORD3 8
-#define wxSTC_D_TYPEDEF 9
-#define wxSTC_D_STRING 10
-#define wxSTC_D_STRINGEOL 11
-#define wxSTC_D_CHARACTER 12
-#define wxSTC_D_OPERATOR 13
-#define wxSTC_D_IDENTIFIER 14
-#define wxSTC_D_COMMENTLINEDOC 15
-#define wxSTC_D_COMMENTDOCKEYWORD 16
-#define wxSTC_D_COMMENTDOCKEYWORDERROR 17
-#define wxSTC_D_STRINGB 18
-#define wxSTC_D_STRINGR 19
-#define wxSTC_D_WORD5 20
-#define wxSTC_D_WORD6 21
-#define wxSTC_D_WORD7 22
-
-/// Lexical states for SCLEX_TCL
-#define wxSTC_TCL_DEFAULT 0
-#define wxSTC_TCL_COMMENT 1
-#define wxSTC_TCL_COMMENTLINE 2
-#define wxSTC_TCL_NUMBER 3
-#define wxSTC_TCL_WORD_IN_QUOTE 4
-#define wxSTC_TCL_IN_QUOTE 5
-#define wxSTC_TCL_OPERATOR 6
-#define wxSTC_TCL_IDENTIFIER 7
-#define wxSTC_TCL_SUBSTITUTION 8
-#define wxSTC_TCL_SUB_BRACE 9
-#define wxSTC_TCL_MODIFIER 10
-#define wxSTC_TCL_EXPAND 11
-#define wxSTC_TCL_WORD 12
-#define wxSTC_TCL_WORD2 13
-#define wxSTC_TCL_WORD3 14
-#define wxSTC_TCL_WORD4 15
-#define wxSTC_TCL_WORD5 16
-#define wxSTC_TCL_WORD6 17
-#define wxSTC_TCL_WORD7 18
-#define wxSTC_TCL_WORD8 19
-#define wxSTC_TCL_COMMENT_BOX 20
-#define wxSTC_TCL_BLOCK_COMMENT 21
-
-/// Lexical states for SCLEX_HTML, SCLEX_XML
-#define wxSTC_H_DEFAULT 0
-#define wxSTC_H_TAG 1
-#define wxSTC_H_TAGUNKNOWN 2
-#define wxSTC_H_ATTRIBUTE 3
-#define wxSTC_H_ATTRIBUTEUNKNOWN 4
-#define wxSTC_H_NUMBER 5
-#define wxSTC_H_DOUBLESTRING 6
-#define wxSTC_H_SINGLESTRING 7
-#define wxSTC_H_OTHER 8
-#define wxSTC_H_COMMENT 9
-#define wxSTC_H_ENTITY 10
-
-/// XML and ASP
-#define wxSTC_H_TAGEND 11
-#define wxSTC_H_XMLSTART 12
-#define wxSTC_H_XMLEND 13
-#define wxSTC_H_SCRIPT 14
-#define wxSTC_H_ASP 15
-#define wxSTC_H_ASPAT 16
-#define wxSTC_H_CDATA 17
-#define wxSTC_H_QUESTION 18
-
-/// More HTML
-#define wxSTC_H_VALUE 19
-
-/// X-Code
-#define wxSTC_H_XCCOMMENT 20
-
-/// SGML
-#define wxSTC_H_SGML_DEFAULT 21
-#define wxSTC_H_SGML_COMMAND 22
-#define wxSTC_H_SGML_1ST_PARAM 23
-#define wxSTC_H_SGML_DOUBLESTRING 24
-#define wxSTC_H_SGML_SIMPLESTRING 25
-#define wxSTC_H_SGML_ERROR 26
-#define wxSTC_H_SGML_SPECIAL 27
-#define wxSTC_H_SGML_ENTITY 28
-#define wxSTC_H_SGML_COMMENT 29
-#define wxSTC_H_SGML_1ST_PARAM_COMMENT 30
-#define wxSTC_H_SGML_BLOCK_DEFAULT 31
-
-/// Embedded Javascript
-#define wxSTC_HJ_START 40
-#define wxSTC_HJ_DEFAULT 41
-#define wxSTC_HJ_COMMENT 42
-#define wxSTC_HJ_COMMENTLINE 43
-#define wxSTC_HJ_COMMENTDOC 44
-#define wxSTC_HJ_NUMBER 45
-#define wxSTC_HJ_WORD 46
-#define wxSTC_HJ_KEYWORD 47
-#define wxSTC_HJ_DOUBLESTRING 48
-#define wxSTC_HJ_SINGLESTRING 49
-#define wxSTC_HJ_SYMBOLS 50
-#define wxSTC_HJ_STRINGEOL 51
-#define wxSTC_HJ_REGEX 52
-
-/// ASP Javascript
-#define wxSTC_HJA_START 55
-#define wxSTC_HJA_DEFAULT 56
-#define wxSTC_HJA_COMMENT 57
-#define wxSTC_HJA_COMMENTLINE 58
-#define wxSTC_HJA_COMMENTDOC 59
-#define wxSTC_HJA_NUMBER 60
-#define wxSTC_HJA_WORD 61
-#define wxSTC_HJA_KEYWORD 62
-#define wxSTC_HJA_DOUBLESTRING 63
-#define wxSTC_HJA_SINGLESTRING 64
-#define wxSTC_HJA_SYMBOLS 65
-#define wxSTC_HJA_STRINGEOL 66
-#define wxSTC_HJA_REGEX 67
-
-/// Embedded VBScript
-#define wxSTC_HB_START 70
-#define wxSTC_HB_DEFAULT 71
-#define wxSTC_HB_COMMENTLINE 72
-#define wxSTC_HB_NUMBER 73
-#define wxSTC_HB_WORD 74
-#define wxSTC_HB_STRING 75
-#define wxSTC_HB_IDENTIFIER 76
-#define wxSTC_HB_STRINGEOL 77
-
-/// ASP VBScript
-#define wxSTC_HBA_START 80
-#define wxSTC_HBA_DEFAULT 81
-#define wxSTC_HBA_COMMENTLINE 82
-#define wxSTC_HBA_NUMBER 83
-#define wxSTC_HBA_WORD 84
-#define wxSTC_HBA_STRING 85
-#define wxSTC_HBA_IDENTIFIER 86
-#define wxSTC_HBA_STRINGEOL 87
-
-/// Embedded Python
-#define wxSTC_HP_START 90
-#define wxSTC_HP_DEFAULT 91
-#define wxSTC_HP_COMMENTLINE 92
-#define wxSTC_HP_NUMBER 93
-#define wxSTC_HP_STRING 94
-#define wxSTC_HP_CHARACTER 95
-#define wxSTC_HP_WORD 96
-#define wxSTC_HP_TRIPLE 97
-#define wxSTC_HP_TRIPLEDOUBLE 98
-#define wxSTC_HP_CLASSNAME 99
-#define wxSTC_HP_DEFNAME 100
-#define wxSTC_HP_OPERATOR 101
-#define wxSTC_HP_IDENTIFIER 102
-
-/// PHP
-#define wxSTC_HPHP_COMPLEX_VARIABLE 104
-
-/// ASP Python
-#define wxSTC_HPA_START 105
-#define wxSTC_HPA_DEFAULT 106
-#define wxSTC_HPA_COMMENTLINE 107
-#define wxSTC_HPA_NUMBER 108
-#define wxSTC_HPA_STRING 109
-#define wxSTC_HPA_CHARACTER 110
-#define wxSTC_HPA_WORD 111
-#define wxSTC_HPA_TRIPLE 112
-#define wxSTC_HPA_TRIPLEDOUBLE 113
-#define wxSTC_HPA_CLASSNAME 114
-#define wxSTC_HPA_DEFNAME 115
-#define wxSTC_HPA_OPERATOR 116
-#define wxSTC_HPA_IDENTIFIER 117
-
-/// PHP
-#define wxSTC_HPHP_DEFAULT 118
-#define wxSTC_HPHP_HSTRING 119
-#define wxSTC_HPHP_SIMPLESTRING 120
-#define wxSTC_HPHP_WORD 121
-#define wxSTC_HPHP_NUMBER 122
-#define wxSTC_HPHP_VARIABLE 123
-#define wxSTC_HPHP_COMMENT 124
-#define wxSTC_HPHP_COMMENTLINE 125
-#define wxSTC_HPHP_HSTRING_VARIABLE 126
-#define wxSTC_HPHP_OPERATOR 127
-
-/// Lexical states for SCLEX_PERL
-#define wxSTC_PL_DEFAULT 0
-#define wxSTC_PL_ERROR 1
-#define wxSTC_PL_COMMENTLINE 2
-#define wxSTC_PL_POD 3
-#define wxSTC_PL_NUMBER 4
-#define wxSTC_PL_WORD 5
-#define wxSTC_PL_STRING 6
-#define wxSTC_PL_CHARACTER 7
-#define wxSTC_PL_PUNCTUATION 8
-#define wxSTC_PL_PREPROCESSOR 9
-#define wxSTC_PL_OPERATOR 10
-#define wxSTC_PL_IDENTIFIER 11
-#define wxSTC_PL_SCALAR 12
-#define wxSTC_PL_ARRAY 13
-#define wxSTC_PL_HASH 14
-#define wxSTC_PL_SYMBOLTABLE 15
-#define wxSTC_PL_VARIABLE_INDEXER 16
-#define wxSTC_PL_REGEX 17
-#define wxSTC_PL_REGSUBST 18
-#define wxSTC_PL_LONGQUOTE 19
-#define wxSTC_PL_BACKTICKS 20
-#define wxSTC_PL_DATASECTION 21
-#define wxSTC_PL_HERE_DELIM 22
-#define wxSTC_PL_HERE_Q 23
-#define wxSTC_PL_HERE_QQ 24
-#define wxSTC_PL_HERE_QX 25
-#define wxSTC_PL_STRING_Q 26
-#define wxSTC_PL_STRING_QQ 27
-#define wxSTC_PL_STRING_QX 28
-#define wxSTC_PL_STRING_QR 29
-#define wxSTC_PL_STRING_QW 30
-#define wxSTC_PL_POD_VERB 31
-#define wxSTC_PL_SUB_PROTOTYPE 40
-#define wxSTC_PL_FORMAT_IDENT 41
-#define wxSTC_PL_FORMAT 42
-#define wxSTC_PL_STRING_VAR 43
-#define wxSTC_PL_XLAT 44
-#define wxSTC_PL_REGEX_VAR 54
-#define wxSTC_PL_REGSUBST_VAR 55
-#define wxSTC_PL_BACKTICKS_VAR 57
-#define wxSTC_PL_HERE_QQ_VAR 61
-#define wxSTC_PL_HERE_QX_VAR 62
-#define wxSTC_PL_STRING_QQ_VAR 64
-#define wxSTC_PL_STRING_QX_VAR 65
-#define wxSTC_PL_STRING_QR_VAR 66
-
-/// Lexical states for SCLEX_RUBY
-#define wxSTC_RB_DEFAULT 0
-#define wxSTC_RB_ERROR 1
-#define wxSTC_RB_COMMENTLINE 2
-#define wxSTC_RB_POD 3
-#define wxSTC_RB_NUMBER 4
-#define wxSTC_RB_WORD 5
-#define wxSTC_RB_STRING 6
-#define wxSTC_RB_CHARACTER 7
-#define wxSTC_RB_CLASSNAME 8
-#define wxSTC_RB_DEFNAME 9
-#define wxSTC_RB_OPERATOR 10
-#define wxSTC_RB_IDENTIFIER 11
-#define wxSTC_RB_REGEX 12
-#define wxSTC_RB_GLOBAL 13
-#define wxSTC_RB_SYMBOL 14
-#define wxSTC_RB_MODULE_NAME 15
-#define wxSTC_RB_INSTANCE_VAR 16
-#define wxSTC_RB_CLASS_VAR 17
-#define wxSTC_RB_BACKTICKS 18
-#define wxSTC_RB_DATASECTION 19
-#define wxSTC_RB_HERE_DELIM 20
-#define wxSTC_RB_HERE_Q 21
-#define wxSTC_RB_HERE_QQ 22
-#define wxSTC_RB_HERE_QX 23
-#define wxSTC_RB_STRING_Q 24
-#define wxSTC_RB_STRING_QQ 25
-#define wxSTC_RB_STRING_QX 26
-#define wxSTC_RB_STRING_QR 27
-#define wxSTC_RB_STRING_QW 28
-#define wxSTC_RB_WORD_DEMOTED 29
-#define wxSTC_RB_STDIN 30
-#define wxSTC_RB_STDOUT 31
-#define wxSTC_RB_STDERR 40
-#define wxSTC_RB_UPPER_BOUND 41
-
-/// Lexical states for SCLEX_VB, SCLEX_VBSCRIPT, SCLEX_POWERBASIC
-#define wxSTC_B_DEFAULT 0
-#define wxSTC_B_COMMENT 1
-#define wxSTC_B_NUMBER 2
-#define wxSTC_B_KEYWORD 3
-#define wxSTC_B_STRING 4
-#define wxSTC_B_PREPROCESSOR 5
-#define wxSTC_B_OPERATOR 6
-#define wxSTC_B_IDENTIFIER 7
-#define wxSTC_B_DATE 8
-#define wxSTC_B_STRINGEOL 9
-#define wxSTC_B_KEYWORD2 10
-#define wxSTC_B_KEYWORD3 11
-#define wxSTC_B_KEYWORD4 12
-#define wxSTC_B_CONSTANT 13
-#define wxSTC_B_ASM 14
-#define wxSTC_B_LABEL 15
-#define wxSTC_B_ERROR 16
-#define wxSTC_B_HEXNUMBER 17
-#define wxSTC_B_BINNUMBER 18
-
-/// Lexical states for SCLEX_PROPERTIES
-#define wxSTC_PROPS_DEFAULT 0
-#define wxSTC_PROPS_COMMENT 1
-#define wxSTC_PROPS_SECTION 2
-#define wxSTC_PROPS_ASSIGNMENT 3
-#define wxSTC_PROPS_DEFVAL 4
-#define wxSTC_PROPS_KEY 5
-
-/// Lexical states for SCLEX_LATEX
-#define wxSTC_L_DEFAULT 0
-#define wxSTC_L_COMMAND 1
-#define wxSTC_L_TAG 2
-#define wxSTC_L_MATH 3
-#define wxSTC_L_COMMENT 4
-#define wxSTC_L_TAG2 5
-#define wxSTC_L_MATH2 6
-#define wxSTC_L_COMMENT2 7
-#define wxSTC_L_VERBATIM 8
-#define wxSTC_L_SHORTCMD 9
-#define wxSTC_L_SPECIAL 10
-#define wxSTC_L_CMDOPT 11
-#define wxSTC_L_ERROR 12
-
-/// Lexical states for SCLEX_LUA
-#define wxSTC_LUA_DEFAULT 0
-#define wxSTC_LUA_COMMENT 1
-#define wxSTC_LUA_COMMENTLINE 2
-#define wxSTC_LUA_COMMENTDOC 3
-#define wxSTC_LUA_NUMBER 4
-#define wxSTC_LUA_WORD 5
-#define wxSTC_LUA_STRING 6
-#define wxSTC_LUA_CHARACTER 7
-#define wxSTC_LUA_LITERALSTRING 8
-#define wxSTC_LUA_PREPROCESSOR 9
-#define wxSTC_LUA_OPERATOR 10
-#define wxSTC_LUA_IDENTIFIER 11
-#define wxSTC_LUA_STRINGEOL 12
-#define wxSTC_LUA_WORD2 13
-#define wxSTC_LUA_WORD3 14
-#define wxSTC_LUA_WORD4 15
-#define wxSTC_LUA_WORD5 16
-#define wxSTC_LUA_WORD6 17
-#define wxSTC_LUA_WORD7 18
-#define wxSTC_LUA_WORD8 19
-#define wxSTC_LUA_LABEL 20
-
-/// Lexical states for SCLEX_ERRORLIST
-#define wxSTC_ERR_DEFAULT 0
-#define wxSTC_ERR_PYTHON 1
-#define wxSTC_ERR_GCC 2
-#define wxSTC_ERR_MS 3
-#define wxSTC_ERR_CMD 4
-#define wxSTC_ERR_BORLAND 5
-#define wxSTC_ERR_PERL 6
-#define wxSTC_ERR_NET 7
-#define wxSTC_ERR_LUA 8
-#define wxSTC_ERR_CTAG 9
-#define wxSTC_ERR_DIFF_CHANGED 10
-#define wxSTC_ERR_DIFF_ADDITION 11
-#define wxSTC_ERR_DIFF_DELETION 12
-#define wxSTC_ERR_DIFF_MESSAGE 13
-#define wxSTC_ERR_PHP 14
-#define wxSTC_ERR_ELF 15
-#define wxSTC_ERR_IFC 16
-#define wxSTC_ERR_IFORT 17
-#define wxSTC_ERR_ABSF 18
-#define wxSTC_ERR_TIDY 19
-#define wxSTC_ERR_JAVA_STACK 20
-#define wxSTC_ERR_VALUE 21
-
-/// Lexical states for SCLEX_BATCH
-#define wxSTC_BAT_DEFAULT 0
-#define wxSTC_BAT_COMMENT 1
-#define wxSTC_BAT_WORD 2
-#define wxSTC_BAT_LABEL 3
-#define wxSTC_BAT_HIDE 4
-#define wxSTC_BAT_COMMAND 5
-#define wxSTC_BAT_IDENTIFIER 6
-#define wxSTC_BAT_OPERATOR 7
-
-/// Lexical states for SCLEX_TCMD
-#define wxSTC_TCMD_DEFAULT 0
-#define wxSTC_TCMD_COMMENT 1
-#define wxSTC_TCMD_WORD 2
-#define wxSTC_TCMD_LABEL 3
-#define wxSTC_TCMD_HIDE 4
-#define wxSTC_TCMD_COMMAND 5
-#define wxSTC_TCMD_IDENTIFIER 6
-#define wxSTC_TCMD_OPERATOR 7
-#define wxSTC_TCMD_ENVIRONMENT 8
-#define wxSTC_TCMD_EXPANSION 9
-#define wxSTC_TCMD_CLABEL 10
-
-/// Lexical states for SCLEX_MAKEFILE
-#define wxSTC_MAKE_DEFAULT 0
-#define wxSTC_MAKE_COMMENT 1
-#define wxSTC_MAKE_PREPROCESSOR 2
-#define wxSTC_MAKE_IDENTIFIER 3
-#define wxSTC_MAKE_OPERATOR 4
-#define wxSTC_MAKE_TARGET 5
-#define wxSTC_MAKE_IDEOL 9
-
-/// Lexical states for SCLEX_DIFF
-#define wxSTC_DIFF_DEFAULT 0
-#define wxSTC_DIFF_COMMENT 1
-#define wxSTC_DIFF_COMMAND 2
-#define wxSTC_DIFF_HEADER 3
-#define wxSTC_DIFF_POSITION 4
-#define wxSTC_DIFF_DELETED 5
-#define wxSTC_DIFF_ADDED 6
-#define wxSTC_DIFF_CHANGED 7
-
-/// Lexical states for SCLEX_CONF (Apache Configuration Files Lexer)
-#define wxSTC_CONF_DEFAULT 0
-#define wxSTC_CONF_COMMENT 1
-#define wxSTC_CONF_NUMBER 2
-#define wxSTC_CONF_IDENTIFIER 3
-#define wxSTC_CONF_EXTENSION 4
-#define wxSTC_CONF_PARAMETER 5
-#define wxSTC_CONF_STRING 6
-#define wxSTC_CONF_OPERATOR 7
-#define wxSTC_CONF_IP 8
-#define wxSTC_CONF_DIRECTIVE 9
-
-/// Lexical states for SCLEX_AVE, Avenue
-#define wxSTC_AVE_DEFAULT 0
-#define wxSTC_AVE_COMMENT 1
-#define wxSTC_AVE_NUMBER 2
-#define wxSTC_AVE_WORD 3
-#define wxSTC_AVE_STRING 6
-#define wxSTC_AVE_ENUM 7
-#define wxSTC_AVE_STRINGEOL 8
-#define wxSTC_AVE_IDENTIFIER 9
-#define wxSTC_AVE_OPERATOR 10
-#define wxSTC_AVE_WORD1 11
-#define wxSTC_AVE_WORD2 12
-#define wxSTC_AVE_WORD3 13
-#define wxSTC_AVE_WORD4 14
-#define wxSTC_AVE_WORD5 15
-#define wxSTC_AVE_WORD6 16
-
-/// Lexical states for SCLEX_ADA
-#define wxSTC_ADA_DEFAULT 0
-#define wxSTC_ADA_WORD 1
-#define wxSTC_ADA_IDENTIFIER 2
-#define wxSTC_ADA_NUMBER 3
-#define wxSTC_ADA_DELIMITER 4
-#define wxSTC_ADA_CHARACTER 5
-#define wxSTC_ADA_CHARACTEREOL 6
-#define wxSTC_ADA_STRING 7
-#define wxSTC_ADA_STRINGEOL 8
-#define wxSTC_ADA_LABEL 9
-#define wxSTC_ADA_COMMENTLINE 10
-#define wxSTC_ADA_ILLEGAL 11
-
-/// Lexical states for SCLEX_BAAN
-#define wxSTC_BAAN_DEFAULT 0
-#define wxSTC_BAAN_COMMENT 1
-#define wxSTC_BAAN_COMMENTDOC 2
-#define wxSTC_BAAN_NUMBER 3
-#define wxSTC_BAAN_WORD 4
-#define wxSTC_BAAN_STRING 5
-#define wxSTC_BAAN_PREPROCESSOR 6
-#define wxSTC_BAAN_OPERATOR 7
-#define wxSTC_BAAN_IDENTIFIER 8
-#define wxSTC_BAAN_STRINGEOL 9
-#define wxSTC_BAAN_WORD2 10
-
-/// Lexical states for SCLEX_LISP
-#define wxSTC_LISP_DEFAULT 0
-#define wxSTC_LISP_COMMENT 1
-#define wxSTC_LISP_NUMBER 2
-#define wxSTC_LISP_KEYWORD 3
-#define wxSTC_LISP_KEYWORD_KW 4
-#define wxSTC_LISP_SYMBOL 5
-#define wxSTC_LISP_STRING 6
-#define wxSTC_LISP_STRINGEOL 8
-#define wxSTC_LISP_IDENTIFIER 9
-#define wxSTC_LISP_OPERATOR 10
-#define wxSTC_LISP_SPECIAL 11
-#define wxSTC_LISP_MULTI_COMMENT 12
-
-/// Lexical states for SCLEX_EIFFEL and SCLEX_EIFFELKW
-#define wxSTC_EIFFEL_DEFAULT 0
-#define wxSTC_EIFFEL_COMMENTLINE 1
-#define wxSTC_EIFFEL_NUMBER 2
-#define wxSTC_EIFFEL_WORD 3
-#define wxSTC_EIFFEL_STRING 4
-#define wxSTC_EIFFEL_CHARACTER 5
-#define wxSTC_EIFFEL_OPERATOR 6
-#define wxSTC_EIFFEL_IDENTIFIER 7
-#define wxSTC_EIFFEL_STRINGEOL 8
-
-/// Lexical states for SCLEX_NNCRONTAB (nnCron crontab Lexer)
-#define wxSTC_NNCRONTAB_DEFAULT 0
-#define wxSTC_NNCRONTAB_COMMENT 1
-#define wxSTC_NNCRONTAB_TASK 2
-#define wxSTC_NNCRONTAB_SECTION 3
-#define wxSTC_NNCRONTAB_KEYWORD 4
-#define wxSTC_NNCRONTAB_MODIFIER 5
-#define wxSTC_NNCRONTAB_ASTERISK 6
-#define wxSTC_NNCRONTAB_NUMBER 7
-#define wxSTC_NNCRONTAB_STRING 8
-#define wxSTC_NNCRONTAB_ENVIRONMENT 9
-#define wxSTC_NNCRONTAB_IDENTIFIER 10
-
-/// Lexical states for SCLEX_FORTH (Forth Lexer)
-#define wxSTC_FORTH_DEFAULT 0
-#define wxSTC_FORTH_COMMENT 1
-#define wxSTC_FORTH_COMMENT_ML 2
-#define wxSTC_FORTH_IDENTIFIER 3
-#define wxSTC_FORTH_CONTROL 4
-#define wxSTC_FORTH_KEYWORD 5
-#define wxSTC_FORTH_DEFWORD 6
-#define wxSTC_FORTH_PREWORD1 7
-#define wxSTC_FORTH_PREWORD2 8
-#define wxSTC_FORTH_NUMBER 9
-#define wxSTC_FORTH_STRING 10
-#define wxSTC_FORTH_LOCALE 11
-
-/// Lexical states for SCLEX_MATLAB
-#define wxSTC_MATLAB_DEFAULT 0
-#define wxSTC_MATLAB_COMMENT 1
-#define wxSTC_MATLAB_COMMAND 2
-#define wxSTC_MATLAB_NUMBER 3
-#define wxSTC_MATLAB_KEYWORD 4
-
-/// single quoted string
-#define wxSTC_MATLAB_STRING 5
-#define wxSTC_MATLAB_OPERATOR 6
-#define wxSTC_MATLAB_IDENTIFIER 7
-#define wxSTC_MATLAB_DOUBLEQUOTESTRING 8
-
-/// Lexical states for SCLEX_SCRIPTOL
-#define wxSTC_SCRIPTOL_DEFAULT 0
-#define wxSTC_SCRIPTOL_WHITE 1
-#define wxSTC_SCRIPTOL_COMMENTLINE 2
-#define wxSTC_SCRIPTOL_PERSISTENT 3
-#define wxSTC_SCRIPTOL_CSTYLE 4
-#define wxSTC_SCRIPTOL_COMMENTBLOCK 5
-#define wxSTC_SCRIPTOL_NUMBER 6
-#define wxSTC_SCRIPTOL_STRING 7
-#define wxSTC_SCRIPTOL_CHARACTER 8
-#define wxSTC_SCRIPTOL_STRINGEOL 9
-#define wxSTC_SCRIPTOL_KEYWORD 10
-#define wxSTC_SCRIPTOL_OPERATOR 11
-#define wxSTC_SCRIPTOL_IDENTIFIER 12
-#define wxSTC_SCRIPTOL_TRIPLE 13
-#define wxSTC_SCRIPTOL_CLASSNAME 14
-#define wxSTC_SCRIPTOL_PREPROCESSOR 15
-
-/// Lexical states for SCLEX_ASM
-#define wxSTC_ASM_DEFAULT 0
-#define wxSTC_ASM_COMMENT 1
-#define wxSTC_ASM_NUMBER 2
-#define wxSTC_ASM_STRING 3
-#define wxSTC_ASM_OPERATOR 4
-#define wxSTC_ASM_IDENTIFIER 5
-#define wxSTC_ASM_CPUINSTRUCTION 6
-#define wxSTC_ASM_MATHINSTRUCTION 7
-#define wxSTC_ASM_REGISTER 8
-#define wxSTC_ASM_DIRECTIVE 9
-#define wxSTC_ASM_DIRECTIVEOPERAND 10
-#define wxSTC_ASM_COMMENTBLOCK 11
-#define wxSTC_ASM_CHARACTER 12
-#define wxSTC_ASM_STRINGEOL 13
-#define wxSTC_ASM_EXTINSTRUCTION 14
-#define wxSTC_ASM_COMMENTDIRECTIVE 15
-
-/// Lexical states for SCLEX_FORTRAN
-#define wxSTC_F_DEFAULT 0
-#define wxSTC_F_COMMENT 1
-#define wxSTC_F_NUMBER 2
-#define wxSTC_F_STRING1 3
-#define wxSTC_F_STRING2 4
-#define wxSTC_F_STRINGEOL 5
-#define wxSTC_F_OPERATOR 6
-#define wxSTC_F_IDENTIFIER 7
-#define wxSTC_F_WORD 8
-#define wxSTC_F_WORD2 9
-#define wxSTC_F_WORD3 10
-#define wxSTC_F_PREPROCESSOR 11
-#define wxSTC_F_OPERATOR2 12
-#define wxSTC_F_LABEL 13
-#define wxSTC_F_CONTINUATION 14
-
-/// Lexical states for SCLEX_CSS
-#define wxSTC_CSS_DEFAULT 0
-#define wxSTC_CSS_TAG 1
-#define wxSTC_CSS_CLASS 2
-#define wxSTC_CSS_PSEUDOCLASS 3
-#define wxSTC_CSS_UNKNOWN_PSEUDOCLASS 4
-#define wxSTC_CSS_OPERATOR 5
-#define wxSTC_CSS_IDENTIFIER 6
-#define wxSTC_CSS_UNKNOWN_IDENTIFIER 7
-#define wxSTC_CSS_VALUE 8
-#define wxSTC_CSS_COMMENT 9
-#define wxSTC_CSS_ID 10
-#define wxSTC_CSS_IMPORTANT 11
-#define wxSTC_CSS_DIRECTIVE 12
-#define wxSTC_CSS_DOUBLESTRING 13
-#define wxSTC_CSS_SINGLESTRING 14
-#define wxSTC_CSS_IDENTIFIER2 15
-#define wxSTC_CSS_ATTRIBUTE 16
-#define wxSTC_CSS_IDENTIFIER3 17
-#define wxSTC_CSS_PSEUDOELEMENT 18
-#define wxSTC_CSS_EXTENDED_IDENTIFIER 19
-#define wxSTC_CSS_EXTENDED_PSEUDOCLASS 20
-#define wxSTC_CSS_EXTENDED_PSEUDOELEMENT 21
-#define wxSTC_CSS_MEDIA 22
-#define wxSTC_CSS_VARIABLE 23
-
-/// Lexical states for SCLEX_POV
-#define wxSTC_POV_DEFAULT 0
-#define wxSTC_POV_COMMENT 1
-#define wxSTC_POV_COMMENTLINE 2
-#define wxSTC_POV_NUMBER 3
-#define wxSTC_POV_OPERATOR 4
-#define wxSTC_POV_IDENTIFIER 5
-#define wxSTC_POV_STRING 6
-#define wxSTC_POV_STRINGEOL 7
-#define wxSTC_POV_DIRECTIVE 8
-#define wxSTC_POV_BADDIRECTIVE 9
-#define wxSTC_POV_WORD2 10
-#define wxSTC_POV_WORD3 11
-#define wxSTC_POV_WORD4 12
-#define wxSTC_POV_WORD5 13
-#define wxSTC_POV_WORD6 14
-#define wxSTC_POV_WORD7 15
-#define wxSTC_POV_WORD8 16
-
-/// Lexical states for SCLEX_LOUT
-#define wxSTC_LOUT_DEFAULT 0
-#define wxSTC_LOUT_COMMENT 1
-#define wxSTC_LOUT_NUMBER 2
-#define wxSTC_LOUT_WORD 3
-#define wxSTC_LOUT_WORD2 4
-#define wxSTC_LOUT_WORD3 5
-#define wxSTC_LOUT_WORD4 6
-#define wxSTC_LOUT_STRING 7
-#define wxSTC_LOUT_OPERATOR 8
-#define wxSTC_LOUT_IDENTIFIER 9
-#define wxSTC_LOUT_STRINGEOL 10
-
-/// Lexical states for SCLEX_ESCRIPT
-#define wxSTC_ESCRIPT_DEFAULT 0
-#define wxSTC_ESCRIPT_COMMENT 1
-#define wxSTC_ESCRIPT_COMMENTLINE 2
-#define wxSTC_ESCRIPT_COMMENTDOC 3
-#define wxSTC_ESCRIPT_NUMBER 4
-#define wxSTC_ESCRIPT_WORD 5
-#define wxSTC_ESCRIPT_STRING 6
-#define wxSTC_ESCRIPT_OPERATOR 7
-#define wxSTC_ESCRIPT_IDENTIFIER 8
-#define wxSTC_ESCRIPT_BRACE 9
-#define wxSTC_ESCRIPT_WORD2 10
-#define wxSTC_ESCRIPT_WORD3 11
-
-/// Lexical states for SCLEX_PS
-#define wxSTC_PS_DEFAULT 0
-#define wxSTC_PS_COMMENT 1
-#define wxSTC_PS_DSC_COMMENT 2
-#define wxSTC_PS_DSC_VALUE 3
-#define wxSTC_PS_NUMBER 4
-#define wxSTC_PS_NAME 5
-#define wxSTC_PS_KEYWORD 6
-#define wxSTC_PS_LITERAL 7
-#define wxSTC_PS_IMMEVAL 8
-#define wxSTC_PS_PAREN_ARRAY 9
-#define wxSTC_PS_PAREN_DICT 10
-#define wxSTC_PS_PAREN_PROC 11
-#define wxSTC_PS_TEXT 12
-#define wxSTC_PS_HEXSTRING 13
-#define wxSTC_PS_BASE85STRING 14
-#define wxSTC_PS_BADSTRINGCHAR 15
-
-/// Lexical states for SCLEX_NSIS
-#define wxSTC_NSIS_DEFAULT 0
-#define wxSTC_NSIS_COMMENT 1
-#define wxSTC_NSIS_STRINGDQ 2
-#define wxSTC_NSIS_STRINGLQ 3
-#define wxSTC_NSIS_STRINGRQ 4
-#define wxSTC_NSIS_FUNCTION 5
-#define wxSTC_NSIS_VARIABLE 6
-#define wxSTC_NSIS_LABEL 7
-#define wxSTC_NSIS_USERDEFINED 8
-#define wxSTC_NSIS_SECTIONDEF 9
-#define wxSTC_NSIS_SUBSECTIONDEF 10
-#define wxSTC_NSIS_IFDEFINEDEF 11
-#define wxSTC_NSIS_MACRODEF 12
-#define wxSTC_NSIS_STRINGVAR 13
-#define wxSTC_NSIS_NUMBER 14
-#define wxSTC_NSIS_SECTIONGROUP 15
-#define wxSTC_NSIS_PAGEEX 16
-#define wxSTC_NSIS_FUNCTIONDEF 17
-#define wxSTC_NSIS_COMMENTBOX 18
-
-/// Lexical states for SCLEX_MMIXAL
-#define wxSTC_MMIXAL_LEADWS 0
-#define wxSTC_MMIXAL_COMMENT 1
-#define wxSTC_MMIXAL_LABEL 2
-#define wxSTC_MMIXAL_OPCODE 3
-#define wxSTC_MMIXAL_OPCODE_PRE 4
-#define wxSTC_MMIXAL_OPCODE_VALID 5
-#define wxSTC_MMIXAL_OPCODE_UNKNOWN 6
-#define wxSTC_MMIXAL_OPCODE_POST 7
-#define wxSTC_MMIXAL_OPERANDS 8
-#define wxSTC_MMIXAL_NUMBER 9
-#define wxSTC_MMIXAL_REF 10
-#define wxSTC_MMIXAL_CHAR 11
-#define wxSTC_MMIXAL_STRING 12
-#define wxSTC_MMIXAL_REGISTER 13
-#define wxSTC_MMIXAL_HEX 14
-#define wxSTC_MMIXAL_OPERATOR 15
-#define wxSTC_MMIXAL_SYMBOL 16
-#define wxSTC_MMIXAL_INCLUDE 17
-
-/// Lexical states for SCLEX_CLW
-#define wxSTC_CLW_DEFAULT 0
-#define wxSTC_CLW_LABEL 1
-#define wxSTC_CLW_COMMENT 2
-#define wxSTC_CLW_STRING 3
-#define wxSTC_CLW_USER_IDENTIFIER 4
-#define wxSTC_CLW_INTEGER_CONSTANT 5
-#define wxSTC_CLW_REAL_CONSTANT 6
-#define wxSTC_CLW_PICTURE_STRING 7
-#define wxSTC_CLW_KEYWORD 8
-#define wxSTC_CLW_COMPILER_DIRECTIVE 9
-#define wxSTC_CLW_RUNTIME_EXPRESSIONS 10
-#define wxSTC_CLW_BUILTIN_PROCEDURES_FUNCTION 11
-#define wxSTC_CLW_STRUCTURE_DATA_TYPE 12
-#define wxSTC_CLW_ATTRIBUTE 13
-#define wxSTC_CLW_STANDARD_EQUATE 14
-#define wxSTC_CLW_ERROR 15
-#define wxSTC_CLW_DEPRECATED 16
-
-/// Lexical states for SCLEX_LOT
-#define wxSTC_LOT_DEFAULT 0
-#define wxSTC_LOT_HEADER 1
-#define wxSTC_LOT_BREAK 2
-#define wxSTC_LOT_SET 3
-#define wxSTC_LOT_PASS 4
-#define wxSTC_LOT_FAIL 5
-#define wxSTC_LOT_ABORT 6
-
-/// Lexical states for SCLEX_YAML
-#define wxSTC_YAML_DEFAULT 0
-#define wxSTC_YAML_COMMENT 1
-#define wxSTC_YAML_IDENTIFIER 2
-#define wxSTC_YAML_KEYWORD 3
-#define wxSTC_YAML_NUMBER 4
-#define wxSTC_YAML_REFERENCE 5
-#define wxSTC_YAML_DOCUMENT 6
-#define wxSTC_YAML_TEXT 7
-#define wxSTC_YAML_ERROR 8
-#define wxSTC_YAML_OPERATOR 9
-
-/// Lexical states for SCLEX_TEX
-#define wxSTC_TEX_DEFAULT 0
-#define wxSTC_TEX_SPECIAL 1
-#define wxSTC_TEX_GROUP 2
-#define wxSTC_TEX_SYMBOL 3
-#define wxSTC_TEX_COMMAND 4
-#define wxSTC_TEX_TEXT 5
-#define wxSTC_METAPOST_DEFAULT 0
-#define wxSTC_METAPOST_SPECIAL 1
-#define wxSTC_METAPOST_GROUP 2
-#define wxSTC_METAPOST_SYMBOL 3
-#define wxSTC_METAPOST_COMMAND 4
-#define wxSTC_METAPOST_TEXT 5
-#define wxSTC_METAPOST_EXTRA 6
-
-/// Lexical states for SCLEX_ERLANG
-#define wxSTC_ERLANG_DEFAULT 0
-#define wxSTC_ERLANG_COMMENT 1
-#define wxSTC_ERLANG_VARIABLE 2
-#define wxSTC_ERLANG_NUMBER 3
-#define wxSTC_ERLANG_KEYWORD 4
-#define wxSTC_ERLANG_STRING 5
-#define wxSTC_ERLANG_OPERATOR 6
-#define wxSTC_ERLANG_ATOM 7
-#define wxSTC_ERLANG_FUNCTION_NAME 8
-#define wxSTC_ERLANG_CHARACTER 9
-#define wxSTC_ERLANG_MACRO 10
-#define wxSTC_ERLANG_RECORD 11
-#define wxSTC_ERLANG_PREPROC 12
-#define wxSTC_ERLANG_NODE_NAME 13
-#define wxSTC_ERLANG_COMMENT_FUNCTION 14
-#define wxSTC_ERLANG_COMMENT_MODULE 15
-#define wxSTC_ERLANG_COMMENT_DOC 16
-#define wxSTC_ERLANG_COMMENT_DOC_MACRO 17
-#define wxSTC_ERLANG_ATOM_QUOTED 18
-#define wxSTC_ERLANG_MACRO_QUOTED 19
-#define wxSTC_ERLANG_RECORD_QUOTED 20
-#define wxSTC_ERLANG_NODE_NAME_QUOTED 21
-#define wxSTC_ERLANG_BIFS 22
-#define wxSTC_ERLANG_MODULES 23
-#define wxSTC_ERLANG_MODULES_ATT 24
-#define wxSTC_ERLANG_UNKNOWN 31
-
-/// Lexical states for SCLEX_OCTAVE are identical to MatLab
-/// Lexical states for SCLEX_MSSQL
-#define wxSTC_MSSQL_DEFAULT 0
-#define wxSTC_MSSQL_COMMENT 1
-#define wxSTC_MSSQL_LINE_COMMENT 2
-#define wxSTC_MSSQL_NUMBER 3
-#define wxSTC_MSSQL_STRING 4
-#define wxSTC_MSSQL_OPERATOR 5
-#define wxSTC_MSSQL_IDENTIFIER 6
-#define wxSTC_MSSQL_VARIABLE 7
-#define wxSTC_MSSQL_COLUMN_NAME 8
-#define wxSTC_MSSQL_STATEMENT 9
-#define wxSTC_MSSQL_DATATYPE 10
-#define wxSTC_MSSQL_SYSTABLE 11
-#define wxSTC_MSSQL_GLOBAL_VARIABLE 12
-#define wxSTC_MSSQL_FUNCTION 13
-#define wxSTC_MSSQL_STORED_PROCEDURE 14
-#define wxSTC_MSSQL_DEFAULT_PREF_DATATYPE 15
-#define wxSTC_MSSQL_COLUMN_NAME_2 16
-
-/// Lexical states for SCLEX_VERILOG
-#define wxSTC_V_DEFAULT 0
-#define wxSTC_V_COMMENT 1
-#define wxSTC_V_COMMENTLINE 2
-#define wxSTC_V_COMMENTLINEBANG 3
-#define wxSTC_V_NUMBER 4
-#define wxSTC_V_WORD 5
-#define wxSTC_V_STRING 6
-#define wxSTC_V_WORD2 7
-#define wxSTC_V_WORD3 8
-#define wxSTC_V_PREPROCESSOR 9
-#define wxSTC_V_OPERATOR 10
-#define wxSTC_V_IDENTIFIER 11
-#define wxSTC_V_STRINGEOL 12
-#define wxSTC_V_USER 19
-
-/// Lexical states for SCLEX_KIX
-#define wxSTC_KIX_DEFAULT 0
-#define wxSTC_KIX_COMMENT 1
-#define wxSTC_KIX_STRING1 2
-#define wxSTC_KIX_STRING2 3
-#define wxSTC_KIX_NUMBER 4
-#define wxSTC_KIX_VAR 5
-#define wxSTC_KIX_MACRO 6
-#define wxSTC_KIX_KEYWORD 7
-#define wxSTC_KIX_FUNCTIONS 8
-#define wxSTC_KIX_OPERATOR 9
-#define wxSTC_KIX_IDENTIFIER 31
-
-/// Lexical states for SCLEX_GUI4CLI
-#define wxSTC_GC_DEFAULT 0
-#define wxSTC_GC_COMMENTLINE 1
-#define wxSTC_GC_COMMENTBLOCK 2
-#define wxSTC_GC_GLOBAL 3
-#define wxSTC_GC_EVENT 4
-#define wxSTC_GC_ATTRIBUTE 5
-#define wxSTC_GC_CONTROL 6
-#define wxSTC_GC_COMMAND 7
-#define wxSTC_GC_STRING 8
-#define wxSTC_GC_OPERATOR 9
-
-/// Lexical states for SCLEX_SPECMAN
-#define wxSTC_SN_DEFAULT 0
-#define wxSTC_SN_CODE 1
-#define wxSTC_SN_COMMENTLINE 2
-#define wxSTC_SN_COMMENTLINEBANG 3
-#define wxSTC_SN_NUMBER 4
-#define wxSTC_SN_WORD 5
-#define wxSTC_SN_STRING 6
-#define wxSTC_SN_WORD2 7
-#define wxSTC_SN_WORD3 8
-#define wxSTC_SN_PREPROCESSOR 9
-#define wxSTC_SN_OPERATOR 10
-#define wxSTC_SN_IDENTIFIER 11
-#define wxSTC_SN_STRINGEOL 12
-#define wxSTC_SN_REGEXTAG 13
-#define wxSTC_SN_SIGNAL 14
-#define wxSTC_SN_USER 19
-
-/// Lexical states for SCLEX_AU3
-#define wxSTC_AU3_DEFAULT 0
-#define wxSTC_AU3_COMMENT 1
-#define wxSTC_AU3_COMMENTBLOCK 2
-#define wxSTC_AU3_NUMBER 3
-#define wxSTC_AU3_FUNCTION 4
-#define wxSTC_AU3_KEYWORD 5
-#define wxSTC_AU3_MACRO 6
-#define wxSTC_AU3_STRING 7
-#define wxSTC_AU3_OPERATOR 8
-#define wxSTC_AU3_VARIABLE 9
-#define wxSTC_AU3_SENT 10
-#define wxSTC_AU3_PREPROCESSOR 11
-#define wxSTC_AU3_SPECIAL 12
-#define wxSTC_AU3_EXPAND 13
-#define wxSTC_AU3_COMOBJ 14
-#define wxSTC_AU3_UDF 15
-
-/// Lexical states for SCLEX_APDL
-#define wxSTC_APDL_DEFAULT 0
-#define wxSTC_APDL_COMMENT 1
-#define wxSTC_APDL_COMMENTBLOCK 2
-#define wxSTC_APDL_NUMBER 3
-#define wxSTC_APDL_STRING 4
-#define wxSTC_APDL_OPERATOR 5
-#define wxSTC_APDL_WORD 6
-#define wxSTC_APDL_PROCESSOR 7
-#define wxSTC_APDL_COMMAND 8
-#define wxSTC_APDL_SLASHCOMMAND 9
-#define wxSTC_APDL_STARCOMMAND 10
-#define wxSTC_APDL_ARGUMENT 11
-#define wxSTC_APDL_FUNCTION 12
-
-/// Lexical states for SCLEX_BASH
-#define wxSTC_SH_DEFAULT 0
-#define wxSTC_SH_ERROR 1
-#define wxSTC_SH_COMMENTLINE 2
-#define wxSTC_SH_NUMBER 3
-#define wxSTC_SH_WORD 4
-#define wxSTC_SH_STRING 5
-#define wxSTC_SH_CHARACTER 6
-#define wxSTC_SH_OPERATOR 7
-#define wxSTC_SH_IDENTIFIER 8
-#define wxSTC_SH_SCALAR 9
-#define wxSTC_SH_PARAM 10
-#define wxSTC_SH_BACKTICKS 11
-#define wxSTC_SH_HERE_DELIM 12
-#define wxSTC_SH_HERE_Q 13
-
-/// Lexical states for SCLEX_ASN1
-#define wxSTC_ASN1_DEFAULT 0
-#define wxSTC_ASN1_COMMENT 1
-#define wxSTC_ASN1_IDENTIFIER 2
-#define wxSTC_ASN1_STRING 3
-#define wxSTC_ASN1_OID 4
-#define wxSTC_ASN1_SCALAR 5
-#define wxSTC_ASN1_KEYWORD 6
-#define wxSTC_ASN1_ATTRIBUTE 7
-#define wxSTC_ASN1_DESCRIPTOR 8
-#define wxSTC_ASN1_TYPE 9
-#define wxSTC_ASN1_OPERATOR 10
-
-/// Lexical states for SCLEX_VHDL
-#define wxSTC_VHDL_DEFAULT 0
-#define wxSTC_VHDL_COMMENT 1
-#define wxSTC_VHDL_COMMENTLINEBANG 2
-#define wxSTC_VHDL_NUMBER 3
-#define wxSTC_VHDL_STRING 4
-#define wxSTC_VHDL_OPERATOR 5
-#define wxSTC_VHDL_IDENTIFIER 6
-#define wxSTC_VHDL_STRINGEOL 7
-#define wxSTC_VHDL_KEYWORD 8
-#define wxSTC_VHDL_STDOPERATOR 9
-#define wxSTC_VHDL_ATTRIBUTE 10
-#define wxSTC_VHDL_STDFUNCTION 11
-#define wxSTC_VHDL_STDPACKAGE 12
-#define wxSTC_VHDL_STDTYPE 13
-#define wxSTC_VHDL_USERWORD 14
-
-/// Lexical states for SCLEX_CAML
-#define wxSTC_CAML_DEFAULT 0
-#define wxSTC_CAML_IDENTIFIER 1
-#define wxSTC_CAML_TAGNAME 2
-#define wxSTC_CAML_KEYWORD 3
-#define wxSTC_CAML_KEYWORD2 4
-#define wxSTC_CAML_KEYWORD3 5
-#define wxSTC_CAML_LINENUM 6
-#define wxSTC_CAML_OPERATOR 7
-#define wxSTC_CAML_NUMBER 8
-#define wxSTC_CAML_CHAR 9
-#define wxSTC_CAML_WHITE 10
-#define wxSTC_CAML_STRING 11
-#define wxSTC_CAML_COMMENT 12
-#define wxSTC_CAML_COMMENT1 13
-#define wxSTC_CAML_COMMENT2 14
-#define wxSTC_CAML_COMMENT3 15
-
-/// Lexical states for SCLEX_HASKELL
-#define wxSTC_HA_DEFAULT 0
-#define wxSTC_HA_IDENTIFIER 1
-#define wxSTC_HA_KEYWORD 2
-#define wxSTC_HA_NUMBER 3
-#define wxSTC_HA_STRING 4
-#define wxSTC_HA_CHARACTER 5
-#define wxSTC_HA_CLASS 6
-#define wxSTC_HA_MODULE 7
-#define wxSTC_HA_CAPITAL 8
-#define wxSTC_HA_DATA 9
-#define wxSTC_HA_IMPORT 10
-#define wxSTC_HA_OPERATOR 11
-#define wxSTC_HA_INSTANCE 12
-#define wxSTC_HA_COMMENTLINE 13
-#define wxSTC_HA_COMMENTBLOCK 14
-#define wxSTC_HA_COMMENTBLOCK2 15
-#define wxSTC_HA_COMMENTBLOCK3 16
-
-/// Lexical states of SCLEX_TADS3
-#define wxSTC_T3_DEFAULT 0
-#define wxSTC_T3_X_DEFAULT 1
-#define wxSTC_T3_PREPROCESSOR 2
-#define wxSTC_T3_BLOCK_COMMENT 3
-#define wxSTC_T3_LINE_COMMENT 4
-#define wxSTC_T3_OPERATOR 5
-#define wxSTC_T3_KEYWORD 6
-#define wxSTC_T3_NUMBER 7
-#define wxSTC_T3_IDENTIFIER 8
-#define wxSTC_T3_S_STRING 9
-#define wxSTC_T3_D_STRING 10
-#define wxSTC_T3_X_STRING 11
-#define wxSTC_T3_LIB_DIRECTIVE 12
-#define wxSTC_T3_MSG_PARAM 13
-#define wxSTC_T3_HTML_TAG 14
-#define wxSTC_T3_HTML_DEFAULT 15
-#define wxSTC_T3_HTML_STRING 16
-#define wxSTC_T3_USER1 17
-#define wxSTC_T3_USER2 18
-#define wxSTC_T3_USER3 19
-#define wxSTC_T3_BRACE 20
-
-/// Lexical states for SCLEX_REBOL
-#define wxSTC_REBOL_DEFAULT 0
-#define wxSTC_REBOL_COMMENTLINE 1
-#define wxSTC_REBOL_COMMENTBLOCK 2
-#define wxSTC_REBOL_PREFACE 3
-#define wxSTC_REBOL_OPERATOR 4
-#define wxSTC_REBOL_CHARACTER 5
-#define wxSTC_REBOL_QUOTEDSTRING 6
-#define wxSTC_REBOL_BRACEDSTRING 7
-#define wxSTC_REBOL_NUMBER 8
-#define wxSTC_REBOL_PAIR 9
-#define wxSTC_REBOL_TUPLE 10
-#define wxSTC_REBOL_BINARY 11
-#define wxSTC_REBOL_MONEY 12
-#define wxSTC_REBOL_ISSUE 13
-#define wxSTC_REBOL_TAG 14
-#define wxSTC_REBOL_FILE 15
-#define wxSTC_REBOL_EMAIL 16
-#define wxSTC_REBOL_URL 17
-#define wxSTC_REBOL_DATE 18
-#define wxSTC_REBOL_TIME 19
-#define wxSTC_REBOL_IDENTIFIER 20
-#define wxSTC_REBOL_WORD 21
-#define wxSTC_REBOL_WORD2 22
-#define wxSTC_REBOL_WORD3 23
-#define wxSTC_REBOL_WORD4 24
-#define wxSTC_REBOL_WORD5 25
-#define wxSTC_REBOL_WORD6 26
-#define wxSTC_REBOL_WORD7 27
-#define wxSTC_REBOL_WORD8 28
-
-/// Lexical states for SCLEX_SQL
-#define wxSTC_SQL_DEFAULT 0
-#define wxSTC_SQL_COMMENT 1
-#define wxSTC_SQL_COMMENTLINE 2
-#define wxSTC_SQL_COMMENTDOC 3
-#define wxSTC_SQL_NUMBER 4
-#define wxSTC_SQL_WORD 5
-#define wxSTC_SQL_STRING 6
-#define wxSTC_SQL_CHARACTER 7
-#define wxSTC_SQL_SQLPLUS 8
-#define wxSTC_SQL_SQLPLUS_PROMPT 9
-#define wxSTC_SQL_OPERATOR 10
-#define wxSTC_SQL_IDENTIFIER 11
-#define wxSTC_SQL_SQLPLUS_COMMENT 13
-#define wxSTC_SQL_COMMENTLINEDOC 15
-#define wxSTC_SQL_WORD2 16
-#define wxSTC_SQL_COMMENTDOCKEYWORD 17
-#define wxSTC_SQL_COMMENTDOCKEYWORDERROR 18
-#define wxSTC_SQL_USER1 19
-#define wxSTC_SQL_USER2 20
-#define wxSTC_SQL_USER3 21
-#define wxSTC_SQL_USER4 22
-#define wxSTC_SQL_QUOTEDIDENTIFIER 23
-
-/// Lexical states for SCLEX_SMALLTALK
-#define wxSTC_ST_DEFAULT 0
-#define wxSTC_ST_STRING 1
-#define wxSTC_ST_NUMBER 2
-#define wxSTC_ST_COMMENT 3
-#define wxSTC_ST_SYMBOL 4
-#define wxSTC_ST_BINARY 5
-#define wxSTC_ST_BOOL 6
-#define wxSTC_ST_SELF 7
-#define wxSTC_ST_SUPER 8
-#define wxSTC_ST_NIL 9
-#define wxSTC_ST_GLOBAL 10
-#define wxSTC_ST_RETURN 11
-#define wxSTC_ST_SPECIAL 12
-#define wxSTC_ST_KWSEND 13
-#define wxSTC_ST_ASSIGN 14
-#define wxSTC_ST_CHARACTER 15
-#define wxSTC_ST_SPEC_SEL 16
-
-/// Lexical states for SCLEX_FLAGSHIP (clipper)
-#define wxSTC_FS_DEFAULT 0
-#define wxSTC_FS_COMMENT 1
-#define wxSTC_FS_COMMENTLINE 2
-#define wxSTC_FS_COMMENTDOC 3
-#define wxSTC_FS_COMMENTLINEDOC 4
-#define wxSTC_FS_COMMENTDOCKEYWORD 5
-#define wxSTC_FS_COMMENTDOCKEYWORDERROR 6
-#define wxSTC_FS_KEYWORD 7
-#define wxSTC_FS_KEYWORD2 8
-#define wxSTC_FS_KEYWORD3 9
-#define wxSTC_FS_KEYWORD4 10
-#define wxSTC_FS_NUMBER 11
-#define wxSTC_FS_STRING 12
-#define wxSTC_FS_PREPROCESSOR 13
-#define wxSTC_FS_OPERATOR 14
-#define wxSTC_FS_IDENTIFIER 15
-#define wxSTC_FS_DATE 16
-#define wxSTC_FS_STRINGEOL 17
-#define wxSTC_FS_CONSTANT 18
-#define wxSTC_FS_WORDOPERATOR 19
-#define wxSTC_FS_DISABLEDCODE 20
-#define wxSTC_FS_DEFAULT_C 21
-#define wxSTC_FS_COMMENTDOC_C 22
-#define wxSTC_FS_COMMENTLINEDOC_C 23
-#define wxSTC_FS_KEYWORD_C 24
-#define wxSTC_FS_KEYWORD2_C 25
-#define wxSTC_FS_NUMBER_C 26
-#define wxSTC_FS_STRING_C 27
-#define wxSTC_FS_PREPROCESSOR_C 28
-#define wxSTC_FS_OPERATOR_C 29
-#define wxSTC_FS_IDENTIFIER_C 30
-#define wxSTC_FS_STRINGEOL_C 31
-
-/// Lexical states for SCLEX_CSOUND
-#define wxSTC_CSOUND_DEFAULT 0
-#define wxSTC_CSOUND_COMMENT 1
-#define wxSTC_CSOUND_NUMBER 2
-#define wxSTC_CSOUND_OPERATOR 3
-#define wxSTC_CSOUND_INSTR 4
-#define wxSTC_CSOUND_IDENTIFIER 5
-#define wxSTC_CSOUND_OPCODE 6
-#define wxSTC_CSOUND_HEADERSTMT 7
-#define wxSTC_CSOUND_USERKEYWORD 8
-#define wxSTC_CSOUND_COMMENTBLOCK 9
-#define wxSTC_CSOUND_PARAM 10
-#define wxSTC_CSOUND_ARATE_VAR 11
-#define wxSTC_CSOUND_KRATE_VAR 12
-#define wxSTC_CSOUND_IRATE_VAR 13
-#define wxSTC_CSOUND_GLOBAL_VAR 14
-#define wxSTC_CSOUND_STRINGEOL 15
-
-/// Lexical states for SCLEX_INNOSETUP
-#define wxSTC_INNO_DEFAULT 0
-#define wxSTC_INNO_COMMENT 1
-#define wxSTC_INNO_KEYWORD 2
-#define wxSTC_INNO_PARAMETER 3
-#define wxSTC_INNO_SECTION 4
-#define wxSTC_INNO_PREPROC 5
-#define wxSTC_INNO_INLINE_EXPANSION 6
-#define wxSTC_INNO_COMMENT_PASCAL 7
-#define wxSTC_INNO_KEYWORD_PASCAL 8
-#define wxSTC_INNO_KEYWORD_USER 9
-#define wxSTC_INNO_STRING_DOUBLE 10
-#define wxSTC_INNO_STRING_SINGLE 11
-#define wxSTC_INNO_IDENTIFIER 12
-
-/// Lexical states for SCLEX_OPAL
-#define wxSTC_OPAL_SPACE 0
-#define wxSTC_OPAL_COMMENT_BLOCK 1
-#define wxSTC_OPAL_COMMENT_LINE 2
-#define wxSTC_OPAL_INTEGER 3
-#define wxSTC_OPAL_KEYWORD 4
-#define wxSTC_OPAL_SORT 5
-#define wxSTC_OPAL_STRING 6
-#define wxSTC_OPAL_PAR 7
-#define wxSTC_OPAL_BOOL_CONST 8
-#define wxSTC_OPAL_DEFAULT 32
-
-/// Lexical states for SCLEX_SPICE
-#define wxSTC_SPICE_DEFAULT 0
-#define wxSTC_SPICE_IDENTIFIER 1
-#define wxSTC_SPICE_KEYWORD 2
-#define wxSTC_SPICE_KEYWORD2 3
-#define wxSTC_SPICE_KEYWORD3 4
-#define wxSTC_SPICE_NUMBER 5
-#define wxSTC_SPICE_DELIMITER 6
-#define wxSTC_SPICE_VALUE 7
-#define wxSTC_SPICE_COMMENTLINE 8
-
-/// Lexical states for SCLEX_CMAKE
-#define wxSTC_CMAKE_DEFAULT 0
-#define wxSTC_CMAKE_COMMENT 1
-#define wxSTC_CMAKE_STRINGDQ 2
-#define wxSTC_CMAKE_STRINGLQ 3
-#define wxSTC_CMAKE_STRINGRQ 4
-#define wxSTC_CMAKE_COMMANDS 5
-#define wxSTC_CMAKE_PARAMETERS 6
-#define wxSTC_CMAKE_VARIABLE 7
-#define wxSTC_CMAKE_USERDEFINED 8
-#define wxSTC_CMAKE_WHILEDEF 9
-#define wxSTC_CMAKE_FOREACHDEF 10
-#define wxSTC_CMAKE_IFDEFINEDEF 11
-#define wxSTC_CMAKE_MACRODEF 12
-#define wxSTC_CMAKE_STRINGVAR 13
-#define wxSTC_CMAKE_NUMBER 14
-
-/// Lexical states for SCLEX_GAP
-#define wxSTC_GAP_DEFAULT 0
-#define wxSTC_GAP_IDENTIFIER 1
-#define wxSTC_GAP_KEYWORD 2
-#define wxSTC_GAP_KEYWORD2 3
-#define wxSTC_GAP_KEYWORD3 4
-#define wxSTC_GAP_KEYWORD4 5
-#define wxSTC_GAP_STRING 6
-#define wxSTC_GAP_CHAR 7
-#define wxSTC_GAP_OPERATOR 8
-#define wxSTC_GAP_COMMENT 9
-#define wxSTC_GAP_NUMBER 10
-#define wxSTC_GAP_STRINGEOL 11
-
-/// Lexical state for SCLEX_PLM
-#define wxSTC_PLM_DEFAULT 0
-#define wxSTC_PLM_COMMENT 1
-#define wxSTC_PLM_STRING 2
-#define wxSTC_PLM_NUMBER 3
-#define wxSTC_PLM_IDENTIFIER 4
-#define wxSTC_PLM_OPERATOR 5
-#define wxSTC_PLM_CONTROL 6
-#define wxSTC_PLM_KEYWORD 7
-
-/// Lexical state for SCLEX_PROGRESS
-#define wxSTC_4GL_DEFAULT 0
-#define wxSTC_4GL_NUMBER 1
-#define wxSTC_4GL_WORD 2
-#define wxSTC_4GL_STRING 3
-#define wxSTC_4GL_CHARACTER 4
-#define wxSTC_4GL_PREPROCESSOR 5
-#define wxSTC_4GL_OPERATOR 6
-#define wxSTC_4GL_IDENTIFIER 7
-#define wxSTC_4GL_BLOCK 8
-#define wxSTC_4GL_END 9
-#define wxSTC_4GL_COMMENT1 10
-#define wxSTC_4GL_COMMENT2 11
-#define wxSTC_4GL_COMMENT3 12
-#define wxSTC_4GL_COMMENT4 13
-#define wxSTC_4GL_COMMENT5 14
-#define wxSTC_4GL_COMMENT6 15
-#define wxSTC_4GL_DEFAULT_ 16
-#define wxSTC_4GL_NUMBER_ 17
-#define wxSTC_4GL_WORD_ 18
-#define wxSTC_4GL_STRING_ 19
-#define wxSTC_4GL_CHARACTER_ 20
-#define wxSTC_4GL_PREPROCESSOR_ 21
-#define wxSTC_4GL_OPERATOR_ 22
-#define wxSTC_4GL_IDENTIFIER_ 23
-#define wxSTC_4GL_BLOCK_ 24
-#define wxSTC_4GL_END_ 25
-#define wxSTC_4GL_COMMENT1_ 26
-#define wxSTC_4GL_COMMENT2_ 27
-#define wxSTC_4GL_COMMENT3_ 28
-#define wxSTC_4GL_COMMENT4_ 29
-#define wxSTC_4GL_COMMENT5_ 30
-#define wxSTC_4GL_COMMENT6_ 31
-
-/// Lexical states for SCLEX_ABAQUS
-#define wxSTC_ABAQUS_DEFAULT 0
-#define wxSTC_ABAQUS_COMMENT 1
-#define wxSTC_ABAQUS_COMMENTBLOCK 2
-#define wxSTC_ABAQUS_NUMBER 3
-#define wxSTC_ABAQUS_STRING 4
-#define wxSTC_ABAQUS_OPERATOR 5
-#define wxSTC_ABAQUS_WORD 6
-#define wxSTC_ABAQUS_PROCESSOR 7
-#define wxSTC_ABAQUS_COMMAND 8
-#define wxSTC_ABAQUS_SLASHCOMMAND 9
-#define wxSTC_ABAQUS_STARCOMMAND 10
-#define wxSTC_ABAQUS_ARGUMENT 11
-#define wxSTC_ABAQUS_FUNCTION 12
-
-/// Lexical states for SCLEX_ASYMPTOTE
-#define wxSTC_ASY_DEFAULT 0
-#define wxSTC_ASY_COMMENT 1
-#define wxSTC_ASY_COMMENTLINE 2
-#define wxSTC_ASY_NUMBER 3
-#define wxSTC_ASY_WORD 4
-#define wxSTC_ASY_STRING 5
-#define wxSTC_ASY_CHARACTER 6
-#define wxSTC_ASY_OPERATOR 7
-#define wxSTC_ASY_IDENTIFIER 8
-#define wxSTC_ASY_STRINGEOL 9
-#define wxSTC_ASY_COMMENTLINEDOC 10
-#define wxSTC_ASY_WORD2 11
-
-/// Lexical states for SCLEX_R
-#define wxSTC_R_DEFAULT 0
-#define wxSTC_R_COMMENT 1
-#define wxSTC_R_KWORD 2
-#define wxSTC_R_BASEKWORD 3
-#define wxSTC_R_OTHERKWORD 4
-#define wxSTC_R_NUMBER 5
-#define wxSTC_R_STRING 6
-#define wxSTC_R_STRING2 7
-#define wxSTC_R_OPERATOR 8
-#define wxSTC_R_IDENTIFIER 9
-#define wxSTC_R_INFIX 10
-#define wxSTC_R_INFIXEOL 11
-
-/// Lexical state for SCLEX_MAGIKSF
-#define wxSTC_MAGIK_DEFAULT 0
-#define wxSTC_MAGIK_COMMENT 1
-#define wxSTC_MAGIK_HYPER_COMMENT 16
-#define wxSTC_MAGIK_STRING 2
-#define wxSTC_MAGIK_CHARACTER 3
-#define wxSTC_MAGIK_NUMBER 4
-#define wxSTC_MAGIK_IDENTIFIER 5
-#define wxSTC_MAGIK_OPERATOR 6
-#define wxSTC_MAGIK_FLOW 7
-#define wxSTC_MAGIK_CONTAINER 8
-#define wxSTC_MAGIK_BRACKET_BLOCK 9
-#define wxSTC_MAGIK_BRACE_BLOCK 10
-#define wxSTC_MAGIK_SQBRACKET_BLOCK 11
-#define wxSTC_MAGIK_UNKNOWN_KEYWORD 12
-#define wxSTC_MAGIK_KEYWORD 13
-#define wxSTC_MAGIK_PRAGMA 14
-#define wxSTC_MAGIK_SYMBOL 15
-
-/// Lexical state for SCLEX_POWERSHELL
-#define wxSTC_POWERSHELL_DEFAULT 0
-#define wxSTC_POWERSHELL_COMMENT 1
-#define wxSTC_POWERSHELL_STRING 2
-#define wxSTC_POWERSHELL_CHARACTER 3
-#define wxSTC_POWERSHELL_NUMBER 4
-#define wxSTC_POWERSHELL_VARIABLE 5
-#define wxSTC_POWERSHELL_OPERATOR 6
-#define wxSTC_POWERSHELL_IDENTIFIER 7
-#define wxSTC_POWERSHELL_KEYWORD 8
-#define wxSTC_POWERSHELL_CMDLET 9
-#define wxSTC_POWERSHELL_ALIAS 10
-#define wxSTC_POWERSHELL_FUNCTION 11
-#define wxSTC_POWERSHELL_USER1 12
-#define wxSTC_POWERSHELL_COMMENTSTREAM 13
-
-/// Lexical state for SCLEX_MYSQL
-#define wxSTC_MYSQL_DEFAULT 0
-#define wxSTC_MYSQL_COMMENT 1
-#define wxSTC_MYSQL_COMMENTLINE 2
-#define wxSTC_MYSQL_VARIABLE 3
-#define wxSTC_MYSQL_SYSTEMVARIABLE 4
-#define wxSTC_MYSQL_KNOWNSYSTEMVARIABLE 5
-#define wxSTC_MYSQL_NUMBER 6
-#define wxSTC_MYSQL_MAJORKEYWORD 7
-#define wxSTC_MYSQL_KEYWORD 8
-#define wxSTC_MYSQL_DATABASEOBJECT 9
-#define wxSTC_MYSQL_PROCEDUREKEYWORD 10
-#define wxSTC_MYSQL_STRING 11
-#define wxSTC_MYSQL_SQSTRING 12
-#define wxSTC_MYSQL_DQSTRING 13
-#define wxSTC_MYSQL_OPERATOR 14
-#define wxSTC_MYSQL_FUNCTION 15
-#define wxSTC_MYSQL_IDENTIFIER 16
-#define wxSTC_MYSQL_QUOTEDIDENTIFIER 17
-#define wxSTC_MYSQL_USER1 18
-#define wxSTC_MYSQL_USER2 19
-#define wxSTC_MYSQL_USER3 20
-#define wxSTC_MYSQL_HIDDENCOMMAND 21
-
-/// Lexical state for SCLEX_PO
-#define wxSTC_PO_DEFAULT 0
-#define wxSTC_PO_COMMENT 1
-#define wxSTC_PO_MSGID 2
-#define wxSTC_PO_MSGID_TEXT 3
-#define wxSTC_PO_MSGSTR 4
-#define wxSTC_PO_MSGSTR_TEXT 5
-#define wxSTC_PO_MSGCTXT 6
-#define wxSTC_PO_MSGCTXT_TEXT 7
-#define wxSTC_PO_FUZZY 8
-
-/// Lexical states for SCLEX_PASCAL
-#define wxSTC_PAS_DEFAULT 0
-#define wxSTC_PAS_IDENTIFIER 1
-#define wxSTC_PAS_COMMENT 2
-#define wxSTC_PAS_COMMENT2 3
-#define wxSTC_PAS_COMMENTLINE 4
-#define wxSTC_PAS_PREPROCESSOR 5
-#define wxSTC_PAS_PREPROCESSOR2 6
-#define wxSTC_PAS_NUMBER 7
-#define wxSTC_PAS_HEXNUMBER 8
-#define wxSTC_PAS_WORD 9
-#define wxSTC_PAS_STRING 10
-#define wxSTC_PAS_STRINGEOL 11
-#define wxSTC_PAS_CHARACTER 12
-#define wxSTC_PAS_OPERATOR 13
-#define wxSTC_PAS_ASM 14
-
-/// Lexical state for SCLEX_SORCUS
-#define wxSTC_SORCUS_DEFAULT 0
-#define wxSTC_SORCUS_COMMAND 1
-#define wxSTC_SORCUS_PARAMETER 2
-#define wxSTC_SORCUS_COMMENTLINE 3
-#define wxSTC_SORCUS_STRING 4
-#define wxSTC_SORCUS_STRINGEOL 5
-#define wxSTC_SORCUS_IDENTIFIER 6
-#define wxSTC_SORCUS_OPERATOR 7
-#define wxSTC_SORCUS_NUMBER 8
-#define wxSTC_SORCUS_CONSTANT 9
-
-/// Lexical state for SCLEX_POWERPRO
-#define wxSTC_POWERPRO_DEFAULT 0
-#define wxSTC_POWERPRO_COMMENTBLOCK 1
-#define wxSTC_POWERPRO_COMMENTLINE 2
-#define wxSTC_POWERPRO_NUMBER 3
-#define wxSTC_POWERPRO_WORD 4
-#define wxSTC_POWERPRO_WORD2 5
-#define wxSTC_POWERPRO_WORD3 6
-#define wxSTC_POWERPRO_WORD4 7
-#define wxSTC_POWERPRO_DOUBLEQUOTEDSTRING 8
-#define wxSTC_POWERPRO_SINGLEQUOTEDSTRING 9
-#define wxSTC_POWERPRO_LINECONTINUE 10
-#define wxSTC_POWERPRO_OPERATOR 11
-#define wxSTC_POWERPRO_IDENTIFIER 12
-#define wxSTC_POWERPRO_STRINGEOL 13
-#define wxSTC_POWERPRO_VERBATIM 14
-#define wxSTC_POWERPRO_ALTQUOTE 15
-#define wxSTC_POWERPRO_FUNCTION 16
-
-/// Lexical states for SCLEX_SML
-#define wxSTC_SML_DEFAULT 0
-#define wxSTC_SML_IDENTIFIER 1
-#define wxSTC_SML_TAGNAME 2
-#define wxSTC_SML_KEYWORD 3
-#define wxSTC_SML_KEYWORD2 4
-#define wxSTC_SML_KEYWORD3 5
-#define wxSTC_SML_LINENUM 6
-#define wxSTC_SML_OPERATOR 7
-#define wxSTC_SML_NUMBER 8
-#define wxSTC_SML_CHAR 9
-#define wxSTC_SML_STRING 11
-#define wxSTC_SML_COMMENT 12
-#define wxSTC_SML_COMMENT1 13
-#define wxSTC_SML_COMMENT2 14
-#define wxSTC_SML_COMMENT3 15
-
-/// Lexical state for SCLEX_MARKDOWN
-#define wxSTC_MARKDOWN_DEFAULT 0
-#define wxSTC_MARKDOWN_LINE_BEGIN 1
-#define wxSTC_MARKDOWN_STRONG1 2
-#define wxSTC_MARKDOWN_STRONG2 3
-#define wxSTC_MARKDOWN_EM1 4
-#define wxSTC_MARKDOWN_EM2 5
-#define wxSTC_MARKDOWN_HEADER1 6
-#define wxSTC_MARKDOWN_HEADER2 7
-#define wxSTC_MARKDOWN_HEADER3 8
-#define wxSTC_MARKDOWN_HEADER4 9
-#define wxSTC_MARKDOWN_HEADER5 10
-#define wxSTC_MARKDOWN_HEADER6 11
-#define wxSTC_MARKDOWN_PRECHAR 12
-#define wxSTC_MARKDOWN_ULIST_ITEM 13
-#define wxSTC_MARKDOWN_OLIST_ITEM 14
-#define wxSTC_MARKDOWN_BLOCKQUOTE 15
-#define wxSTC_MARKDOWN_STRIKEOUT 16
-#define wxSTC_MARKDOWN_HRULE 17
-#define wxSTC_MARKDOWN_LINK 18
-#define wxSTC_MARKDOWN_CODE 19
-#define wxSTC_MARKDOWN_CODE2 20
-#define wxSTC_MARKDOWN_CODEBK 21
-
-/// Lexical state for SCLEX_TXT2TAGS
-#define wxSTC_TXT2TAGS_DEFAULT 0
-#define wxSTC_TXT2TAGS_LINE_BEGIN 1
-#define wxSTC_TXT2TAGS_STRONG1 2
-#define wxSTC_TXT2TAGS_STRONG2 3
-#define wxSTC_TXT2TAGS_EM1 4
-#define wxSTC_TXT2TAGS_EM2 5
-#define wxSTC_TXT2TAGS_HEADER1 6
-#define wxSTC_TXT2TAGS_HEADER2 7
-#define wxSTC_TXT2TAGS_HEADER3 8
-#define wxSTC_TXT2TAGS_HEADER4 9
-#define wxSTC_TXT2TAGS_HEADER5 10
-#define wxSTC_TXT2TAGS_HEADER6 11
-#define wxSTC_TXT2TAGS_PRECHAR 12
-#define wxSTC_TXT2TAGS_ULIST_ITEM 13
-#define wxSTC_TXT2TAGS_OLIST_ITEM 14
-#define wxSTC_TXT2TAGS_BLOCKQUOTE 15
-#define wxSTC_TXT2TAGS_STRIKEOUT 16
-#define wxSTC_TXT2TAGS_HRULE 17
-#define wxSTC_TXT2TAGS_LINK 18
-#define wxSTC_TXT2TAGS_CODE 19
-#define wxSTC_TXT2TAGS_CODE2 20
-#define wxSTC_TXT2TAGS_CODEBK 21
-#define wxSTC_TXT2TAGS_COMMENT 22
-#define wxSTC_TXT2TAGS_OPTION 23
-#define wxSTC_TXT2TAGS_PREPROC 24
-#define wxSTC_TXT2TAGS_POSTPROC 25
-
-/// Lexical states for SCLEX_A68K
-#define wxSTC_A68K_DEFAULT 0
-#define wxSTC_A68K_COMMENT 1
-#define wxSTC_A68K_NUMBER_DEC 2
-#define wxSTC_A68K_NUMBER_BIN 3
-#define wxSTC_A68K_NUMBER_HEX 4
-#define wxSTC_A68K_STRING1 5
-#define wxSTC_A68K_OPERATOR 6
-#define wxSTC_A68K_CPUINSTRUCTION 7
-#define wxSTC_A68K_EXTINSTRUCTION 8
-#define wxSTC_A68K_REGISTER 9
-#define wxSTC_A68K_DIRECTIVE 10
-#define wxSTC_A68K_MACRO_ARG 11
-#define wxSTC_A68K_LABEL 12
-#define wxSTC_A68K_STRING2 13
-#define wxSTC_A68K_IDENTIFIER 14
-#define wxSTC_A68K_MACRO_DECLARATION 15
-#define wxSTC_A68K_COMMENT_WORD 16
-#define wxSTC_A68K_COMMENT_SPECIAL 17
-#define wxSTC_A68K_COMMENT_DOXYGEN 18
-
-/// Lexical states for SCLEX_MODULA
-#define wxSTC_MODULA_DEFAULT 0
-#define wxSTC_MODULA_COMMENT 1
-#define wxSTC_MODULA_DOXYCOMM 2
-#define wxSTC_MODULA_DOXYKEY 3
-#define wxSTC_MODULA_KEYWORD 4
-#define wxSTC_MODULA_RESERVED 5
-#define wxSTC_MODULA_NUMBER 6
-#define wxSTC_MODULA_BASENUM 7
-#define wxSTC_MODULA_FLOAT 8
-#define wxSTC_MODULA_STRING 9
-#define wxSTC_MODULA_STRSPEC 10
-#define wxSTC_MODULA_CHAR 11
-#define wxSTC_MODULA_CHARSPEC 12
-#define wxSTC_MODULA_PROC 13
-#define wxSTC_MODULA_PRAGMA 14
-#define wxSTC_MODULA_PRGKEY 15
-#define wxSTC_MODULA_OPERATOR 16
-#define wxSTC_MODULA_BADSTR 17
-
-/// Lexical states for SCLEX_COFFEESCRIPT
-#define wxSTC_COFFEESCRIPT_DEFAULT 0
-#define wxSTC_COFFEESCRIPT_COMMENT 1
-#define wxSTC_COFFEESCRIPT_COMMENTLINE 2
-#define wxSTC_COFFEESCRIPT_COMMENTDOC 3
-#define wxSTC_COFFEESCRIPT_NUMBER 4
-#define wxSTC_COFFEESCRIPT_WORD 5
-#define wxSTC_COFFEESCRIPT_STRING 6
-#define wxSTC_COFFEESCRIPT_CHARACTER 7
-#define wxSTC_COFFEESCRIPT_UUID 8
-#define wxSTC_COFFEESCRIPT_PREPROCESSOR 9
-#define wxSTC_COFFEESCRIPT_OPERATOR 10
-#define wxSTC_COFFEESCRIPT_IDENTIFIER 11
-#define wxSTC_COFFEESCRIPT_STRINGEOL 12
-#define wxSTC_COFFEESCRIPT_VERBATIM 13
-#define wxSTC_COFFEESCRIPT_REGEX 14
-#define wxSTC_COFFEESCRIPT_COMMENTLINEDOC 15
-#define wxSTC_COFFEESCRIPT_WORD2 16
-#define wxSTC_COFFEESCRIPT_COMMENTDOCKEYWORD 17
-#define wxSTC_COFFEESCRIPT_COMMENTDOCKEYWORDERROR 18
-#define wxSTC_COFFEESCRIPT_GLOBALCLASS 19
-#define wxSTC_COFFEESCRIPT_STRINGRAW 20
-#define wxSTC_COFFEESCRIPT_TRIPLEVERBATIM 21
-#define wxSTC_COFFEESCRIPT_HASHQUOTEDSTRING 22
-#define wxSTC_COFFEESCRIPT_COMMENTBLOCK 22
-#define wxSTC_COFFEESCRIPT_VERBOSE_REGEX 23
-#define wxSTC_COFFEESCRIPT_VERBOSE_REGEX_COMMENT 24
-
-/// Lexical states for SCLEX_AVS
-#define wxSTC_AVS_DEFAULT 0
-#define wxSTC_AVS_COMMENTBLOCK 1
-#define wxSTC_AVS_COMMENTBLOCKN 2
-#define wxSTC_AVS_COMMENTLINE 3
-#define wxSTC_AVS_NUMBER 4
-#define wxSTC_AVS_OPERATOR 5
-#define wxSTC_AVS_IDENTIFIER 6
-#define wxSTC_AVS_STRING 7
-#define wxSTC_AVS_TRIPLESTRING 8
-#define wxSTC_AVS_KEYWORD 9
-#define wxSTC_AVS_FILTER 10
-#define wxSTC_AVS_PLUGIN 11
-#define wxSTC_AVS_FUNCTION 12
-#define wxSTC_AVS_CLIPPROP 13
-#define wxSTC_AVS_USERDFN 14
-
-/// Lexical states for SCLEX_ECL
-#define wxSTC_ECL_DEFAULT 0
-#define wxSTC_ECL_COMMENT 1
-#define wxSTC_ECL_COMMENTLINE 2
-#define wxSTC_ECL_NUMBER 3
-#define wxSTC_ECL_STRING 4
-#define wxSTC_ECL_WORD0 5
-#define wxSTC_ECL_OPERATOR 6
-#define wxSTC_ECL_CHARACTER 7
-#define wxSTC_ECL_UUID 8
-#define wxSTC_ECL_PREPROCESSOR 9
-#define wxSTC_ECL_UNKNOWN 10
-#define wxSTC_ECL_IDENTIFIER 11
-#define wxSTC_ECL_STRINGEOL 12
-#define wxSTC_ECL_VERBATIM 13
-#define wxSTC_ECL_REGEX 14
-#define wxSTC_ECL_COMMENTLINEDOC 15
-#define wxSTC_ECL_WORD1 16
-#define wxSTC_ECL_COMMENTDOCKEYWORD 17
-#define wxSTC_ECL_COMMENTDOCKEYWORDERROR 18
-#define wxSTC_ECL_WORD2 19
-#define wxSTC_ECL_WORD3 20
-#define wxSTC_ECL_WORD4 21
-#define wxSTC_ECL_WORD5 22
-#define wxSTC_ECL_COMMENTDOC 23
-#define wxSTC_ECL_ADDED 24
-#define wxSTC_ECL_DELETED 25
-#define wxSTC_ECL_CHANGED 26
-#define wxSTC_ECL_MOVED 27
-
-/// Lexical states for SCLEX_OSCRIPT
-#define wxSTC_OSCRIPT_DEFAULT 0
-#define wxSTC_OSCRIPT_LINE_COMMENT 1
-#define wxSTC_OSCRIPT_BLOCK_COMMENT 2
-#define wxSTC_OSCRIPT_DOC_COMMENT 3
-#define wxSTC_OSCRIPT_PREPROCESSOR 4
-#define wxSTC_OSCRIPT_NUMBER 5
-#define wxSTC_OSCRIPT_SINGLEQUOTE_STRING 6
-#define wxSTC_OSCRIPT_DOUBLEQUOTE_STRING 7
-#define wxSTC_OSCRIPT_CONSTANT 8
-#define wxSTC_OSCRIPT_IDENTIFIER 9
-#define wxSTC_OSCRIPT_GLOBAL 10
-#define wxSTC_OSCRIPT_KEYWORD 11
-#define wxSTC_OSCRIPT_OPERATOR 12
-#define wxSTC_OSCRIPT_LABEL 13
-#define wxSTC_OSCRIPT_TYPE 14
-#define wxSTC_OSCRIPT_FUNCTION 15
-#define wxSTC_OSCRIPT_OBJECT 16
-#define wxSTC_OSCRIPT_PROPERTY 17
-#define wxSTC_OSCRIPT_METHOD 18
-
-/// Lexical states for SCLEX_VISUALPROLOG
-#define wxSTC_VISUALPROLOG_DEFAULT 0
-#define wxSTC_VISUALPROLOG_KEY_MAJOR 1
-#define wxSTC_VISUALPROLOG_KEY_MINOR 2
-#define wxSTC_VISUALPROLOG_KEY_DIRECTIVE 3
-#define wxSTC_VISUALPROLOG_COMMENT_BLOCK 4
-#define wxSTC_VISUALPROLOG_COMMENT_LINE 5
-#define wxSTC_VISUALPROLOG_COMMENT_KEY 6
-#define wxSTC_VISUALPROLOG_COMMENT_KEY_ERROR 7
-#define wxSTC_VISUALPROLOG_IDENTIFIER 8
-#define wxSTC_VISUALPROLOG_VARIABLE 9
-#define wxSTC_VISUALPROLOG_ANONYMOUS 10
-#define wxSTC_VISUALPROLOG_NUMBER 11
-#define wxSTC_VISUALPROLOG_OPERATOR 12
-#define wxSTC_VISUALPROLOG_CHARACTER 13
-#define wxSTC_VISUALPROLOG_CHARACTER_TOO_MANY 14
-#define wxSTC_VISUALPROLOG_CHARACTER_ESCAPE_ERROR 15
-#define wxSTC_VISUALPROLOG_STRING 16
-#define wxSTC_VISUALPROLOG_STRING_ESCAPE 17
-#define wxSTC_VISUALPROLOG_STRING_ESCAPE_ERROR 18
-#define wxSTC_VISUALPROLOG_STRING_EOL_OPEN 19
-#define wxSTC_VISUALPROLOG_STRING_VERBATIM 20
-#define wxSTC_VISUALPROLOG_STRING_VERBATIM_SPECIAL 21
-#define wxSTC_VISUALPROLOG_STRING_VERBATIM_EOL 22
-
-//}}}
-//----------------------------------------------------------------------
-
-//----------------------------------------------------------------------
-// Commands that can be bound to keystrokes section {{{
-
-
-/// Redoes the next action on the undo history.
-#define wxSTC_CMD_REDO 2011
-
-/// Select all the text in the document.
-#define wxSTC_CMD_SELECTALL 2013
-
-/// Undo one action in the undo history.
-#define wxSTC_CMD_UNDO 2176
-
-/// Cut the selection to the clipboard.
-#define wxSTC_CMD_CUT 2177
-
-/// Copy the selection to the clipboard.
-#define wxSTC_CMD_COPY 2178
-
-/// Paste the contents of the clipboard into the document replacing the selection.
-#define wxSTC_CMD_PASTE 2179
-
-/// Clear the selection.
-#define wxSTC_CMD_CLEAR 2180
-
-/// Move caret down one line.
-#define wxSTC_CMD_LINEDOWN 2300
-
-/// Move caret down one line extending selection to new caret position.
-#define wxSTC_CMD_LINEDOWNEXTEND 2301
-
-/// Move caret up one line.
-#define wxSTC_CMD_LINEUP 2302
-
-/// Move caret up one line extending selection to new caret position.
-#define wxSTC_CMD_LINEUPEXTEND 2303
-
-/// Move caret left one character.
-#define wxSTC_CMD_CHARLEFT 2304
-
-/// Move caret left one character extending selection to new caret position.
-#define wxSTC_CMD_CHARLEFTEXTEND 2305
-
-/// Move caret right one character.
-#define wxSTC_CMD_CHARRIGHT 2306
-
-/// Move caret right one character extending selection to new caret position.
-#define wxSTC_CMD_CHARRIGHTEXTEND 2307
-
-/// Move caret left one word.
-#define wxSTC_CMD_WORDLEFT 2308
-
-/// Move caret left one word extending selection to new caret position.
-#define wxSTC_CMD_WORDLEFTEXTEND 2309
-
-/// Move caret right one word.
-#define wxSTC_CMD_WORDRIGHT 2310
-
-/// Move caret right one word extending selection to new caret position.
-#define wxSTC_CMD_WORDRIGHTEXTEND 2311
-
-/// Move caret to first position on line.
-#define wxSTC_CMD_HOME 2312
-
-/// Move caret to first position on line extending selection to new caret position.
-#define wxSTC_CMD_HOMEEXTEND 2313
-
-/// Move caret to last position on line.
-#define wxSTC_CMD_LINEEND 2314
-
-/// Move caret to last position on line extending selection to new caret position.
-#define wxSTC_CMD_LINEENDEXTEND 2315
-
-/// Move caret to first position in document.
-#define wxSTC_CMD_DOCUMENTSTART 2316
-
-/// Move caret to first position in document extending selection to new caret position.
-#define wxSTC_CMD_DOCUMENTSTARTEXTEND 2317
-
-/// Move caret to last position in document.
-#define wxSTC_CMD_DOCUMENTEND 2318
-
-/// Move caret to last position in document extending selection to new caret position.
-#define wxSTC_CMD_DOCUMENTENDEXTEND 2319
-
-/// Move caret one page up.
-#define wxSTC_CMD_PAGEUP 2320
-
-/// Move caret one page up extending selection to new caret position.
-#define wxSTC_CMD_PAGEUPEXTEND 2321
-
-/// Move caret one page down.
-#define wxSTC_CMD_PAGEDOWN 2322
-
-/// Move caret one page down extending selection to new caret position.
-#define wxSTC_CMD_PAGEDOWNEXTEND 2323
-
-/// Switch from insert to overtype mode or the reverse.
-#define wxSTC_CMD_EDITTOGGLEOVERTYPE 2324
-
-/// Cancel any modes such as call tip or auto-completion list display.
-#define wxSTC_CMD_CANCEL 2325
-
-/// Delete the selection or if no selection, the character before the caret.
-#define wxSTC_CMD_DELETEBACK 2326
-
-/// If selection is empty or all on one line replace the selection with a tab character.
-/// If more than one line selected, indent the lines.
-#define wxSTC_CMD_TAB 2327
-
-/// Dedent the selected lines.
-#define wxSTC_CMD_BACKTAB 2328
-
-/// Insert a new line, may use a CRLF, CR or LF depending on EOL mode.
-#define wxSTC_CMD_NEWLINE 2329
-
-/// Insert a Form Feed character.
-#define wxSTC_CMD_FORMFEED 2330
-
-/// Move caret to before first visible character on line.
-/// If already there move to first character on line.
-#define wxSTC_CMD_VCHOME 2331
-
-/// Like VCHome but extending selection to new caret position.
-#define wxSTC_CMD_VCHOMEEXTEND 2332
-
-/// Magnify the displayed text by increasing the sizes by 1 point.
-#define wxSTC_CMD_ZOOMIN 2333
-
-/// Make the displayed text smaller by decreasing the sizes by 1 point.
-#define wxSTC_CMD_ZOOMOUT 2334
-
-/// Delete the word to the left of the caret.
-#define wxSTC_CMD_DELWORDLEFT 2335
-
-/// Delete the word to the right of the caret.
-#define wxSTC_CMD_DELWORDRIGHT 2336
-
-/// Delete the word to the right of the caret, but not the trailing non-word characters.
-#define wxSTC_CMD_DELWORDRIGHTEND 2518
-
-/// Cut the line containing the caret.
-#define wxSTC_CMD_LINECUT 2337
-
-/// Delete the line containing the caret.
-#define wxSTC_CMD_LINEDELETE 2338
-
-/// Switch the current line with the previous.
-#define wxSTC_CMD_LINETRANSPOSE 2339
-
-/// Duplicate the current line.
-#define wxSTC_CMD_LINEDUPLICATE 2404
-
-/// Transform the selection to lower case.
-#define wxSTC_CMD_LOWERCASE 2340
-
-/// Transform the selection to upper case.
-#define wxSTC_CMD_UPPERCASE 2341
-
-/// Scroll the document down, keeping the caret visible.
-#define wxSTC_CMD_LINESCROLLDOWN 2342
-
-/// Scroll the document up, keeping the caret visible.
-#define wxSTC_CMD_LINESCROLLUP 2343
-
-/// Delete the selection or if no selection, the character before the caret.
-/// Will not delete the character before at the start of a line.
-#define wxSTC_CMD_DELETEBACKNOTLINE 2344
-
-/// Move caret to first position on display line.
-#define wxSTC_CMD_HOMEDISPLAY 2345
-
-/// Move caret to first position on display line extending selection to
-/// new caret position.
-#define wxSTC_CMD_HOMEDISPLAYEXTEND 2346
-
-/// Move caret to last position on display line.
-#define wxSTC_CMD_LINEENDDISPLAY 2347
-
-/// Move caret to last position on display line extending selection to new
-/// caret position.
-#define wxSTC_CMD_LINEENDDISPLAYEXTEND 2348
-
-/// These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
-/// except they behave differently when word-wrap is enabled:
-/// They go first to the start / end of the display line, like (Home|LineEnd)Display
-/// The difference is that, the cursor is already at the point, it goes on to the start
-/// or end of the document line, as appropriate for (Home|LineEnd|VCHome)(Extend)?.
-#define wxSTC_CMD_HOMEWRAP 2349
-#define wxSTC_CMD_HOMEWRAPEXTEND 2450
-#define wxSTC_CMD_LINEENDWRAP 2451
-#define wxSTC_CMD_LINEENDWRAPEXTEND 2452
-#define wxSTC_CMD_VCHOMEWRAP 2453
-#define wxSTC_CMD_VCHOMEWRAPEXTEND 2454
-
-/// Copy the line containing the caret.
-#define wxSTC_CMD_LINECOPY 2455
-
-/// Move to the previous change in capitalisation.
-#define wxSTC_CMD_WORDPARTLEFT 2390
-
-/// Move to the previous change in capitalisation extending selection
-/// to new caret position.
-#define wxSTC_CMD_WORDPARTLEFTEXTEND 2391
-
-/// Move to the change next in capitalisation.
-#define wxSTC_CMD_WORDPARTRIGHT 2392
-
-/// Move to the next change in capitalisation extending selection
-/// to new caret position.
-#define wxSTC_CMD_WORDPARTRIGHTEXTEND 2393
-
-/// Delete back from the current position to the start of the line.
-#define wxSTC_CMD_DELLINELEFT 2395
-
-/// Delete forwards from the current position to the end of the line.
-#define wxSTC_CMD_DELLINERIGHT 2396
-
-/// Move caret between paragraphs (delimited by empty lines).
-#define wxSTC_CMD_PARADOWN 2413
-#define wxSTC_CMD_PARADOWNEXTEND 2414
-#define wxSTC_CMD_PARAUP 2415
-#define wxSTC_CMD_PARAUPEXTEND 2416
-
-/// Move caret down one line, extending rectangular selection to new caret position.
-#define wxSTC_CMD_LINEDOWNRECTEXTEND 2426
-
-/// Move caret up one line, extending rectangular selection to new caret position.
-#define wxSTC_CMD_LINEUPRECTEXTEND 2427
-
-/// Move caret left one character, extending rectangular selection to new caret position.
-#define wxSTC_CMD_CHARLEFTRECTEXTEND 2428
-
-/// Move caret right one character, extending rectangular selection to new caret position.
-#define wxSTC_CMD_CHARRIGHTRECTEXTEND 2429
-
-/// Move caret to first position on line, extending rectangular selection to new caret position.
-#define wxSTC_CMD_HOMERECTEXTEND 2430
-
-/// Move caret to before first visible character on line.
-/// If already there move to first character on line.
-/// In either case, extend rectangular selection to new caret position.
-#define wxSTC_CMD_VCHOMERECTEXTEND 2431
-
-/// Move caret to last position on line, extending rectangular selection to new caret position.
-#define wxSTC_CMD_LINEENDRECTEXTEND 2432
-
-/// Move caret one page up, extending rectangular selection to new caret position.
-#define wxSTC_CMD_PAGEUPRECTEXTEND 2433
-
-/// Move caret one page down, extending rectangular selection to new caret position.
-#define wxSTC_CMD_PAGEDOWNRECTEXTEND 2434
-
-/// Move caret to top of page, or one page up if already at top of page.
-#define wxSTC_CMD_STUTTEREDPAGEUP 2435
-
-/// Move caret to top of page, or one page up if already at top of page, extending selection to new caret position.
-#define wxSTC_CMD_STUTTEREDPAGEUPEXTEND 2436
-
-/// Move caret to bottom of page, or one page down if already at bottom of page.
-#define wxSTC_CMD_STUTTEREDPAGEDOWN 2437
-
-/// Move caret to bottom of page, or one page down if already at bottom of page, extending selection to new caret position.
-#define wxSTC_CMD_STUTTEREDPAGEDOWNEXTEND 2438
-
-/// Move caret left one word, position cursor at end of word.
-#define wxSTC_CMD_WORDLEFTEND 2439
-
-/// Move caret left one word, position cursor at end of word, extending selection to new caret position.
-#define wxSTC_CMD_WORDLEFTENDEXTEND 2440
-
-/// Move caret right one word, position cursor at end of word.
-#define wxSTC_CMD_WORDRIGHTEND 2441
-
-/// Move caret right one word, position cursor at end of word, extending selection to new caret position.
-#define wxSTC_CMD_WORDRIGHTENDEXTEND 2442
-
-/// Centre current line in window.
-#define wxSTC_CMD_VERTICALCENTRECARET 2619
-
-/// Move the selected lines up one line, shifting the line above after the selection
-#define wxSTC_CMD_MOVESELECTEDLINESUP 2620
-
-/// Move the selected lines down one line, shifting the line below before the selection
-#define wxSTC_CMD_MOVESELECTEDLINESDOWN 2621
-
-/// Scroll to start of document.
-#define wxSTC_CMD_SCROLLTOSTART 2628
-
-/// Scroll to end of document.
-#define wxSTC_CMD_SCROLLTOEND 2629
-
-//}}}
-//----------------------------------------------------------------------
-
-class  ScintillaWX;                      // forward declare
-class  WordList;
-struct SCNotification;
-
-#ifndef SWIG
-extern WXDLLIMPEXP_DATA_STC(const char) wxSTCNameStr[];
-class  WXDLLIMPEXP_FWD_STC wxStyledTextCtrl;
-class  WXDLLIMPEXP_FWD_STC wxStyledTextEvent;
-#endif
-
-//----------------------------------------------------------------------
-
-class WXDLLIMPEXP_STC wxStyledTextCtrl : public wxControl,
-#if wxUSE_TEXTCTRL
-                                         public wxTextCtrlIface
-#else // !wxUSE_TEXTCTRL
-                                         public wxTextEntryBase
-#endif // wxUSE_TEXTCTRL/!wxUSE_TEXTCTRL
-{
-public:
-
-#ifdef SWIG
-    %pythonAppend wxStyledTextCtrl   "self._setOORInfo(self)"
-    %pythonAppend wxStyledTextCtrl() ""
-
-    wxStyledTextCtrl(wxWindow *parent, wxWindowID id=wxID_ANY,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize, long style = 0,
-                     const wxString& name = wxPySTCNameStr);
-    %RenameCtor(PreStyledTextCtrl,  wxStyledTextCtrl());
-
-#else
-    wxStyledTextCtrl(wxWindow *parent, wxWindowID id=wxID_ANY,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize, long style = 0,
-                     const wxString& name = wxSTCNameStr);
-    wxStyledTextCtrl() { m_swx = NULL; }
-    ~wxStyledTextCtrl();
-
-#endif
-
-    bool Create(wxWindow *parent, wxWindowID id=wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize, long style = 0,
-                const wxString& name = wxSTCNameStr);
-
-
-    //----------------------------------------------------------------------
-    // Generated method declaration section {{{
-
-
-    // Add text to the document at current position.
-    void AddText(const wxString& text);
-
-    // Add array of cells to document.
-    void AddStyledText(const wxMemoryBuffer& data);
-
-    // Insert string at a position.
-    void InsertText(int pos, const wxString& text);
-
-    // Delete all text in the document.
-    void ClearAll();
-
-    // Delete a range of text in the document.
-    void DeleteRange(int pos, int deleteLength);
-
-    // Set all style bytes to 0, remove all folding information.
-    void ClearDocumentStyle();
-
-    // Returns the number of bytes in the document.
-    int GetLength() const;
-
-    // Returns the character byte at the position.
-    int GetCharAt(int pos) const;
-
-    // Returns the position of the caret.
-    int GetCurrentPos() const;
-
-    // Returns the position of the opposite end of the selection to the caret.
-    int GetAnchor() const;
-
-    // Returns the style byte at the position.
-    int GetStyleAt(int pos) const;
-
-    // Redoes the next action on the undo history.
-    void Redo();
-
-    // Choose between collecting actions into the undo
-    // history and discarding them.
-    void SetUndoCollection(bool collectUndo);
-
-    // Select all the text in the document.
-    void SelectAll();
-
-    // Remember the current position in the undo history as the position
-    // at which the document was saved.
-    void SetSavePoint();
-
-    // Retrieve a buffer of cells.
-    wxMemoryBuffer GetStyledText(int startPos, int endPos);
-
-    // Are there any redoable actions in the undo history?
-    bool CanRedo() const;
-
-    // Retrieve the line number at which a particular marker is located.
-    int MarkerLineFromHandle(int handle);
-
-    // Delete a marker.
-    void MarkerDeleteHandle(int handle);
-
-    // Is undo history being collected?
-    bool GetUndoCollection() const;
-
-    // Are white space characters currently visible?
-    // Returns one of SCWS_* constants.
-    int GetViewWhiteSpace() const;
-
-    // Make white space characters invisible, always visible or visible outside indentation.
-    void SetViewWhiteSpace(int viewWS);
-
-    // Find the position from a point within the window.
-    int PositionFromPoint(wxPoint pt) const;
-
-    // Find the position from a point within the window but return
-    // INVALID_POSITION if not close to text.
-    int PositionFromPointClose(int x, int y);
-
-    // Set caret to start of a line and ensure it is visible.
-    void GotoLine(int line);
-
-    // Set caret to a position and ensure it is visible.
-    void GotoPos(int pos);
-
-    // Set the selection anchor to a position. The anchor is the opposite
-    // end of the selection from the caret.
-    void SetAnchor(int posAnchor);
-
-    // Retrieve the text of the line containing the caret.
-    // Returns the index of the caret on the line.
-    #ifdef SWIG
-    wxString GetCurLine(int* OUTPUT);
-#else
-    wxString GetCurLine(int* linePos=NULL);
-#endif
-
-    // Retrieve the position of the last correctly styled character.
-    int GetEndStyled() const;
-
-    // Convert all line endings in the document to one mode.
-    void ConvertEOLs(int eolMode);
-
-    // Retrieve the current end of line mode - one of CRLF, CR, or LF.
-    int GetEOLMode() const;
-
-    // Set the current end of line mode.
-    void SetEOLMode(int eolMode);
-
-    // Set the current styling position to pos and the styling mask to mask.
-    // The styling mask can be used to protect some bits in each styling byte from modification.
-    void StartStyling(int pos, int mask);
-
-    // Change style from current styling position for length characters to a style
-    // and move the current styling position to after this newly styled segment.
-    void SetStyling(int length, int style);
-
-    // Is drawing done first into a buffer or direct to the screen?
-    bool GetBufferedDraw() const;
-
-    // If drawing is buffered then each line of text is drawn into a bitmap buffer
-    // before drawing it to the screen to avoid flicker.
-    void SetBufferedDraw(bool buffered);
-
-    // Change the visible size of a tab to be a multiple of the width of a space character.
-    void SetTabWidth(int tabWidth);
-
-    // Retrieve the visible size of a tab.
-    int GetTabWidth() const;
-
-    // Set the code page used to interpret the bytes of the document as characters.
-    void SetCodePage(int codePage);
-
-    // Set the symbol used for a particular marker number,
-    // and optionally the fore and background colours.
-    void MarkerDefine(int markerNumber, int markerSymbol,
-                const wxColour& foreground = wxNullColour,
-                const wxColour& background = wxNullColour);
-
-    // Set the foreground colour used for a particular marker number.
-    void MarkerSetForeground(int markerNumber, const wxColour& fore);
-
-    // Set the background colour used for a particular marker number.
-    void MarkerSetBackground(int markerNumber, const wxColour& back);
-
-    // Set the background colour used for a particular marker number when its folding block is selected.
-    void MarkerSetBackgroundSelected(int markerNumber, const wxColour& back);
-
-    // Enable/disable highlight for current folding bloc (smallest one that contains the caret)
-    void MarkerEnableHighlight(bool enabled);
-
-    // Add a marker to a line, returning an ID which can be used to find or delete the marker.
-    int MarkerAdd(int line, int markerNumber);
-
-    // Delete a marker from a line.
-    void MarkerDelete(int line, int markerNumber);
-
-    // Delete all markers with a particular number from all lines.
-    void MarkerDeleteAll(int markerNumber);
-
-    // Get a bit mask of all the markers set on a line.
-    int MarkerGet(int line);
-
-    // Find the next line at or after lineStart that includes a marker in mask.
-    // Return -1 when no more lines.
-    int MarkerNext(int lineStart, int markerMask);
-
-    // Find the previous line before lineStart that includes a marker in mask.
-    int MarkerPrevious(int lineStart, int markerMask);
-
-    // Define a marker from a bitmap
-    void MarkerDefineBitmap(int markerNumber, const wxBitmap& bmp);
-
-    // Add a set of markers to a line.
-    void MarkerAddSet(int line, int set);
-
-    // Set the alpha used for a marker that is drawn in the text area, not the margin.
-    void MarkerSetAlpha(int markerNumber, int alpha);
-
-    // Set a margin to be either numeric or symbolic.
-    void SetMarginType(int margin, int marginType);
-
-    // Retrieve the type of a margin.
-    int GetMarginType(int margin) const;
-
-    // Set the width of a margin to a width expressed in pixels.
-    void SetMarginWidth(int margin, int pixelWidth);
-
-    // Retrieve the width of a margin in pixels.
-    int GetMarginWidth(int margin) const;
-
-    // Set a mask that determines which markers are displayed in a margin.
-    void SetMarginMask(int margin, int mask);
-
-    // Retrieve the marker mask of a margin.
-    int GetMarginMask(int margin) const;
-
-    // Make a margin sensitive or insensitive to mouse clicks.
-    void SetMarginSensitive(int margin, bool sensitive);
-
-    // Retrieve the mouse click sensitivity of a margin.
-    bool GetMarginSensitive(int margin) const;
-
-    // Set the cursor shown when the mouse is inside a margin.
-    void SetMarginCursor(int margin, int cursor);
-
-    // Retrieve the cursor shown in a margin.
-    int GetMarginCursor(int margin) const;
-
-    // Clear all the styles and make equivalent to the global default style.
-    void StyleClearAll();
-
-    // Set the foreground colour of a style.
-    void StyleSetForeground(int style, const wxColour& fore);
-
-    // Set the background colour of a style.
-    void StyleSetBackground(int style, const wxColour& back);
-
-    // Set a style to be bold or not.
-    void StyleSetBold(int style, bool bold);
-
-    // Set a style to be italic or not.
-    void StyleSetItalic(int style, bool italic);
-
-    // Set the size of characters of a style.
-    void StyleSetSize(int style, int sizePoints);
-
-    // Set the font of a style.
-    void StyleSetFaceName(int style, const wxString& fontName);
-
-    // Set a style to have its end of line filled or not.
-    void StyleSetEOLFilled(int style, bool filled);
-
-    // Reset the default style to its state at startup
-    void StyleResetDefault();
-
-    // Set a style to be underlined or not.
-    void StyleSetUnderline(int style, bool underline);
-
-    // Get the foreground colour of a style.
-    wxColour StyleGetForeground(int style) const;
-
-    // Get the background colour of a style.
-    wxColour StyleGetBackground(int style) const;
-
-    // Get is a style bold or not.
-    bool StyleGetBold(int style) const;
-
-    // Get is a style italic or not.
-    bool StyleGetItalic(int style) const;
-
-    // Get the size of characters of a style.
-    int StyleGetSize(int style) const;
-
-    // Get the font facename of a style
-    wxString StyleGetFaceName(int style);
-
-    // Get is a style to have its end of line filled or not.
-    bool StyleGetEOLFilled(int style) const;
-
-    // Get is a style underlined or not.
-    bool StyleGetUnderline(int style) const;
-
-    // Get is a style mixed case, or to force upper or lower case.
-    int StyleGetCase(int style) const;
-
-    // Get the character set of the font in a style.
-    int StyleGetCharacterSet(int style) const;
-
-    // Get is a style visible or not.
-    bool StyleGetVisible(int style) const;
-
-    // Get is a style changeable or not (read only).
-    // Experimental feature, currently buggy.
-    bool StyleGetChangeable(int style) const;
-
-    // Get is a style a hotspot or not.
-    bool StyleGetHotSpot(int style) const;
-
-    // Set a style to be mixed case, or to force upper or lower case.
-    void StyleSetCase(int style, int caseForce);
-
-    // Set the size of characters of a style. Size is in points multiplied by 100.
-    void StyleSetSizeFractional(int style, int caseForce);
-
-    // Get the size of characters of a style in points multiplied by 100
-    int StyleGetSizeFractional(int style) const;
-
-    // Set the weight of characters of a style.
-    void StyleSetWeight(int style, int weight);
-
-    // Get the weight of characters of a style.
-    int StyleGetWeight(int style) const;
-
-    // Set a style to be a hotspot or not.
-    void StyleSetHotSpot(int style, bool hotspot);
-
-    // Set the foreground colour of the main and additional selections and whether to use this setting.
-    void SetSelForeground(bool useSetting, const wxColour& fore);
-
-    // Set the background colour of the main and additional selections and whether to use this setting.
-    void SetSelBackground(bool useSetting, const wxColour& back);
-
-    // Get the alpha of the selection.
-    int GetSelAlpha() const;
-
-    // Set the alpha of the selection.
-    void SetSelAlpha(int alpha);
-
-    // Is the selection end of line filled?
-    bool GetSelEOLFilled() const;
-
-    // Set the selection to have its end of line filled or not.
-    void SetSelEOLFilled(bool filled);
-
-    // Set the foreground colour of the caret.
-    void SetCaretForeground(const wxColour& fore);
-
-    // When key+modifier combination km is pressed perform msg.
-    void CmdKeyAssign(int key, int modifiers, int cmd);
-
-    // When key+modifier combination km is pressed do nothing.
-    void CmdKeyClear(int key, int modifiers);
-
-    // Drop all key mappings.
-    void CmdKeyClearAll();
-
-    // Set the styles for a segment of the document.
-    void SetStyleBytes(int length, char* styleBytes);
-
-    // Set a style to be visible or not.
-    void StyleSetVisible(int style, bool visible);
-
-    // Get the time in milliseconds that the caret is on and off.
-    int GetCaretPeriod() const;
-
-    // Get the time in milliseconds that the caret is on and off. 0 = steady on.
-    void SetCaretPeriod(int periodMilliseconds);
-
-    // Set the set of characters making up words for when moving or selecting by word.
-    // First sets defaults like SetCharsDefault.
-    void SetWordChars(const wxString& characters);
-
-    // Get the set of characters making up words for when moving or selecting by word.
-    wxString GetWordChars() const;
-
-    // Start a sequence of actions that is undone and redone as a unit.
-    // May be nested.
-    void BeginUndoAction();
-
-    // End a sequence of actions that is undone and redone as a unit.
-    void EndUndoAction();
-
-    // Set an indicator to plain, squiggle or TT.
-    void IndicatorSetStyle(int indic, int style);
-
-    // Retrieve the style of an indicator.
-    int IndicatorGetStyle(int indic) const;
-
-    // Set the foreground colour of an indicator.
-    void IndicatorSetForeground(int indic, const wxColour& fore);
-
-    // Retrieve the foreground colour of an indicator.
-    wxColour IndicatorGetForeground(int indic) const;
-
-    // Set an indicator to draw under text or over(default).
-    void IndicatorSetUnder(int indic, bool under);
-
-    // Retrieve whether indicator drawn under or over text.
-    bool IndicatorGetUnder(int indic) const;
-
-    // Set the foreground colour of all whitespace and whether to use this setting.
-    void SetWhitespaceForeground(bool useSetting, const wxColour& fore);
-
-    // Set the background colour of all whitespace and whether to use this setting.
-    void SetWhitespaceBackground(bool useSetting, const wxColour& back);
-
-    // Set the size of the dots used to mark space characters.
-    void SetWhitespaceSize(int size);
-
-    // Get the size of the dots used to mark space characters.
-    int GetWhitespaceSize() const;
-
-    // Divide each styling byte into lexical class bits (default: 5) and indicator
-    // bits (default: 3). If a lexer requires more than 32 lexical states, then this
-    // is used to expand the possible states.
-    void SetStyleBits(int bits);
-
-    // Retrieve number of bits in style bytes used to hold the lexical state.
-    int GetStyleBits() const;
-
-    // Used to hold extra styling information for each line.
-    void SetLineState(int line, int state);
-
-    // Retrieve the extra styling information for a line.
-    int GetLineState(int line) const;
-
-    // Retrieve the last line number that has line state.
-    int GetMaxLineState() const;
-
-    // Is the background of the line containing the caret in a different colour?
-    bool GetCaretLineVisible() const;
-
-    // Display the background of the line containing the caret in a different colour.
-    void SetCaretLineVisible(bool show);
-
-    // Get the colour of the background of the line containing the caret.
-    wxColour GetCaretLineBackground() const;
-
-    // Set the colour of the background of the line containing the caret.
-    void SetCaretLineBackground(const wxColour& back);
-
-    // Set a style to be changeable or not (read only).
-    // Experimental feature, currently buggy.
-    void StyleSetChangeable(int style, bool changeable);
-
-    // Display a auto-completion list.
-    // The lenEntered parameter indicates how many characters before
-    // the caret should be used to provide context.
-    void AutoCompShow(int lenEntered, const wxString& itemList);
-
-    // Remove the auto-completion list from the screen.
-    void AutoCompCancel();
-
-    // Is there an auto-completion list visible?
-    bool AutoCompActive();
-
-    // Retrieve the position of the caret when the auto-completion list was displayed.
-    int AutoCompPosStart();
-
-    // User has selected an item so remove the list and insert the selection.
-    void AutoCompComplete();
-
-    // Define a set of character that when typed cancel the auto-completion list.
-    void AutoCompStops(const wxString& characterSet);
-
-    // Change the separator character in the string setting up an auto-completion list.
-    // Default is space but can be changed if items contain space.
-    void AutoCompSetSeparator(int separatorCharacter);
-
-    // Retrieve the auto-completion list separator character.
-    int AutoCompGetSeparator() const;
-
-    // Select the item in the auto-completion list that starts with a string.
-    void AutoCompSelect(const wxString& text);
-
-    // Should the auto-completion list be cancelled if the user backspaces to a
-    // position before where the box was created.
-    void AutoCompSetCancelAtStart(bool cancel);
-
-    // Retrieve whether auto-completion cancelled by backspacing before start.
-    bool AutoCompGetCancelAtStart() const;
-
-    // Define a set of characters that when typed will cause the autocompletion to
-    // choose the selected item.
-    void AutoCompSetFillUps(const wxString& characterSet);
-
-    // Should a single item auto-completion list automatically choose the item.
-    void AutoCompSetChooseSingle(bool chooseSingle);
-
-    // Retrieve whether a single item auto-completion list automatically choose the item.
-    bool AutoCompGetChooseSingle() const;
-
-    // Set whether case is significant when performing auto-completion searches.
-    void AutoCompSetIgnoreCase(bool ignoreCase);
-
-    // Retrieve state of ignore case flag.
-    bool AutoCompGetIgnoreCase() const;
-
-    // Display a list of strings and send notification when user chooses one.
-    void UserListShow(int listType, const wxString& itemList);
-
-    // Set whether or not autocompletion is hidden automatically when nothing matches.
-    void AutoCompSetAutoHide(bool autoHide);
-
-    // Retrieve whether or not autocompletion is hidden automatically when nothing matches.
-    bool AutoCompGetAutoHide() const;
-
-    // Set whether or not autocompletion deletes any word characters
-    // after the inserted text upon completion.
-    void AutoCompSetDropRestOfWord(bool dropRestOfWord);
-
-    // Retrieve whether or not autocompletion deletes any word characters
-    // after the inserted text upon completion.
-    bool AutoCompGetDropRestOfWord() const;
-
-    // Register an image for use in autocompletion lists.
-    void RegisterImage(int type, const wxBitmap& bmp);
-
-    // Clear all the registered images.
-    void ClearRegisteredImages();
-
-    // Retrieve the auto-completion list type-separator character.
-    int AutoCompGetTypeSeparator() const;
-
-    // Change the type-separator character in the string setting up an auto-completion list.
-    // Default is '?' but can be changed if items contain '?'.
-    void AutoCompSetTypeSeparator(int separatorCharacter);
-
-    // Set the maximum width, in characters, of auto-completion and user lists.
-    // Set to 0 to autosize to fit longest item, which is the default.
-    void AutoCompSetMaxWidth(int characterCount);
-
-    // Get the maximum width, in characters, of auto-completion and user lists.
-    int AutoCompGetMaxWidth() const;
-
-    // Set the maximum height, in rows, of auto-completion and user lists.
-    // The default is 5 rows.
-    void AutoCompSetMaxHeight(int rowCount);
-
-    // Set the maximum height, in rows, of auto-completion and user lists.
-    int AutoCompGetMaxHeight() const;
-
-    // Set the number of spaces used for one level of indentation.
-    void SetIndent(int indentSize);
-
-    // Retrieve indentation size.
-    int GetIndent() const;
-
-    // Indentation will only use space characters if useTabs is false, otherwise
-    // it will use a combination of tabs and spaces.
-    void SetUseTabs(bool useTabs);
-
-    // Retrieve whether tabs will be used in indentation.
-    bool GetUseTabs() const;
-
-    // Change the indentation of a line to a number of columns.
-    void SetLineIndentation(int line, int indentSize);
-
-    // Retrieve the number of columns that a line is indented.
-    int GetLineIndentation(int line) const;
-
-    // Retrieve the position before the first non indentation character on a line.
-    int GetLineIndentPosition(int line) const;
-
-    // Retrieve the column number of a position, taking tab width into account.
-    int GetColumn(int pos) const;
-
-    // Count characters between two positions.
-    int CountCharacters(int startPos, int endPos);
-
-    // Show or hide the horizontal scroll bar.
-    void SetUseHorizontalScrollBar(bool show);
-
-    // Is the horizontal scroll bar visible?
-    bool GetUseHorizontalScrollBar() const;
-
-    // Show or hide indentation guides.
-    void SetIndentationGuides(int indentView);
-
-    // Are the indentation guides visible?
-    int GetIndentationGuides() const;
-
-    // Set the highlighted indentation guide column.
-    // 0 = no highlighted guide.
-    void SetHighlightGuide(int column);
-
-    // Get the highlighted indentation guide column.
-    int GetHighlightGuide() const;
-
-    // Get the position after the last visible characters on a line.
-    int GetLineEndPosition(int line) const;
-
-    // Get the code page used to interpret the bytes of the document as characters.
-    int GetCodePage() const;
-
-    // Get the foreground colour of the caret.
-    wxColour GetCaretForeground() const;
-
-    // In read-only mode?
-    bool GetReadOnly() const;
-
-    // Sets the position of the caret.
-    void SetCurrentPos(int pos);
-
-    // Sets the position that starts the selection - this becomes the anchor.
-    void SetSelectionStart(int pos);
-
-    // Returns the position at the start of the selection.
-    int GetSelectionStart() const;
-
-    // Sets the position that ends the selection - this becomes the currentPosition.
-    void SetSelectionEnd(int pos);
-
-    // Returns the position at the end of the selection.
-    int GetSelectionEnd() const;
-
-    // Set caret to a position, while removing any existing selection.
-    void SetEmptySelection(int pos);
-
-    // Sets the print magnification added to the point size of each style for printing.
-    void SetPrintMagnification(int magnification);
-
-    // Returns the print magnification.
-    int GetPrintMagnification() const;
-
-    // Modify colours when printing for clearer printed text.
-    void SetPrintColourMode(int mode);
-
-    // Returns the print colour mode.
-    int GetPrintColourMode() const;
-
-    // Find some text in the document.
-    int FindText(int minPos, int maxPos, const wxString& text, int flags=0);
-
-    // On Windows, will draw the document into a display context such as a printer.
-    int FormatRange(bool   doDraw,
-               int    startPos,
-               int    endPos,
-               wxDC*  draw,
-               wxDC*  target,
-               wxRect renderRect,
-               wxRect pageRect);
-
-    // Retrieve the display line at the top of the display.
-    int GetFirstVisibleLine() const;
-
-    // Retrieve the contents of a line.
-    wxString GetLine(int line) const;
-
-    // Returns the number of lines in the document. There is always at least one.
-    int GetLineCount() const;
-
-    // Sets the size in pixels of the left margin.
-    void SetMarginLeft(int pixelWidth);
-
-    // Returns the size in pixels of the left margin.
-    int GetMarginLeft() const;
-
-    // Sets the size in pixels of the right margin.
-    void SetMarginRight(int pixelWidth);
-
-    // Returns the size in pixels of the right margin.
-    int GetMarginRight() const;
-
-    // Is the document different from when it was last saved?
-    bool GetModify() const;
-
-    // Retrieve the selected text.
-    wxString GetSelectedText();
-
-    // Retrieve a range of text.
-    wxString GetTextRange(int startPos, int endPos);
-
-    // Draw the selection in normal style or with selection highlighted.
-    void HideSelection(bool normal);
-
-    // Retrieve the line containing a position.
-    int LineFromPosition(int pos) const;
-
-    // Retrieve the position at the start of a line.
-    int PositionFromLine(int line) const;
-
-    // Scroll horizontally and vertically.
-    void LineScroll(int columns, int lines);
-
-    // Ensure the caret is visible.
-    void EnsureCaretVisible();
-
-    // Replace the selected text with the argument text.
-    void ReplaceSelection(const wxString& text);
-
-    // Set to read only or read write.
-    void SetReadOnly(bool readOnly);
-
-    // Will a paste succeed?
-    bool CanPaste() const;
-
-    // Are there any undoable actions in the undo history?
-    bool CanUndo() const;
-
-    // Delete the undo history.
-    void EmptyUndoBuffer();
-
-    // Undo one action in the undo history.
-    void Undo();
-
-    // Cut the selection to the clipboard.
-    void Cut();
-
-    // Copy the selection to the clipboard.
-    void Copy();
-
-    // Paste the contents of the clipboard into the document replacing the selection.
-    void Paste();
-
-    // Clear the selection.
-    void Clear();
-
-    // Replace the contents of the document with the argument text.
-    void SetText(const wxString& text);
-
-    // Retrieve all the text in the document.
-    wxString GetText() const;
-
-    // Retrieve the number of characters in the document.
-    int GetTextLength() const;
-
-    // Set to overtype (true) or insert mode.
-    void SetOvertype(bool overtype);
-
-    // Returns true if overtype mode is active otherwise false is returned.
-    bool GetOvertype() const;
-
-    // Set the width of the insert mode caret.
-    void SetCaretWidth(int pixelWidth);
-
-    // Returns the width of the insert mode caret.
-    int GetCaretWidth() const;
-
-    // Sets the position that starts the target which is used for updating the
-    // document without affecting the scroll position.
-    void SetTargetStart(int pos);
-
-    // Get the position that starts the target.
-    int GetTargetStart() const;
-
-    // Sets the position that ends the target which is used for updating the
-    // document without affecting the scroll position.
-    void SetTargetEnd(int pos);
-
-    // Get the position that ends the target.
-    int GetTargetEnd() const;
-
-    // Replace the target text with the argument text.
-    // Text is counted so it can contain NULs.
-    // Returns the length of the replacement text.
-    int ReplaceTarget(const wxString& text);
-
-    // Replace the target text with the argument text after \\d processing.
-    // Text is counted so it can contain NULs.
-    // Looks for \\d where d is between 1 and 9 and replaces these with the strings
-    // matched in the last search operation which were surrounded by \( and \).
-    // Returns the length of the replacement text including any change
-    // caused by processing the \\d patterns.
-    int ReplaceTargetRE(const wxString& text);
-
-    // Search for a counted string in the target and set the target to the found
-    // range. Text is counted so it can contain NULs.
-    // Returns length of range or -1 for failure in which case target is not moved.
-    int SearchInTarget(const wxString& text);
-
-    // Set the search flags used by SearchInTarget.
-    void SetSearchFlags(int flags);
-
-    // Get the search flags used by SearchInTarget.
-    int GetSearchFlags() const;
-
-    // Show a call tip containing a definition near position pos.
-    void CallTipShow(int pos, const wxString& definition);
-
-    // Remove the call tip from the screen.
-    void CallTipCancel();
-
-    // Is there an active call tip?
-    bool CallTipActive();
-
-    // Retrieve the position where the caret was before displaying the call tip.
-    int CallTipPosAtStart();
-
-    // Highlight a segment of the definition.
-    void CallTipSetHighlight(int start, int end);
-
-    // Set the background colour for the call tip.
-    void CallTipSetBackground(const wxColour& back);
-
-    // Set the foreground colour for the call tip.
-    void CallTipSetForeground(const wxColour& fore);
-
-    // Set the foreground colour for the highlighted part of the call tip.
-    void CallTipSetForegroundHighlight(const wxColour& fore);
-
-    // Enable use of STYLE_CALLTIP and set call tip tab size in pixels.
-    void CallTipUseStyle(int tabSize);
-
-    // Set position of calltip, above or below text.
-    void CallTipSetPosition(bool above);
-
-    // Find the display line of a document line taking hidden lines into account.
-    int VisibleFromDocLine(int line);
-
-    // Find the document line of a display line taking hidden lines into account.
-    int DocLineFromVisible(int lineDisplay);
-
-    // The number of display lines needed to wrap a document line
-    int WrapCount(int line);
-
-    // Set the fold level of a line.
-    // This encodes an integer level along with flags indicating whether the
-    // line is a header and whether it is effectively white space.
-    void SetFoldLevel(int line, int level);
-
-    // Retrieve the fold level of a line.
-    int GetFoldLevel(int line) const;
-
-    // Find the last child line of a header line.
-    int GetLastChild(int line, int level) const;
-
-    // Find the parent line of a child line.
-    int GetFoldParent(int line) const;
-
-    // Make a range of lines visible.
-    void ShowLines(int lineStart, int lineEnd);
-
-    // Make a range of lines invisible.
-    void HideLines(int lineStart, int lineEnd);
-
-    // Is a line visible?
-    bool GetLineVisible(int line) const;
-
-    // Are all lines visible?
-    bool GetAllLinesVisible() const;
-
-    // Show the children of a header line.
-    void SetFoldExpanded(int line, bool expanded);
-
-    // Is a header line expanded?
-    bool GetFoldExpanded(int line) const;
-
-    // Switch a header line between expanded and contracted.
-    void ToggleFold(int line);
-
-    // Ensure a particular line is visible by expanding any header line hiding it.
-    void EnsureVisible(int line);
-
-    // Set some style options for folding.
-    void SetFoldFlags(int flags);
-
-    // Ensure a particular line is visible by expanding any header line hiding it.
-    // Use the currently set visibility policy to determine which range to display.
-    void EnsureVisibleEnforcePolicy(int line);
-
-    // Sets whether a tab pressed when caret is within indentation indents.
-    void SetTabIndents(bool tabIndents);
-
-    // Does a tab pressed when caret is within indentation indent?
-    bool GetTabIndents() const;
-
-    // Sets whether a backspace pressed when caret is within indentation unindents.
-    void SetBackSpaceUnIndents(bool bsUnIndents);
-
-    // Does a backspace pressed when caret is within indentation unindent?
-    bool GetBackSpaceUnIndents() const;
-
-    // Sets the time the mouse must sit still to generate a mouse dwell event.
-    void SetMouseDwellTime(int periodMilliseconds);
-
-    // Retrieve the time the mouse must sit still to generate a mouse dwell event.
-    int GetMouseDwellTime() const;
-
-    // Get position of start of word.
-    int WordStartPosition(int pos, bool onlyWordCharacters);
-
-    // Get position of end of word.
-    int WordEndPosition(int pos, bool onlyWordCharacters);
-
-    // Sets whether text is word wrapped.
-    void SetWrapMode(int mode);
-
-    // Retrieve whether text is word wrapped.
-    int GetWrapMode() const;
-
-    // Set the display mode of visual flags for wrapped lines.
-    void SetWrapVisualFlags(int wrapVisualFlags);
-
-    // Retrive the display mode of visual flags for wrapped lines.
-    int GetWrapVisualFlags() const;
-
-    // Set the location of visual flags for wrapped lines.
-    void SetWrapVisualFlagsLocation(int wrapVisualFlagsLocation);
-
-    // Retrive the location of visual flags for wrapped lines.
-    int GetWrapVisualFlagsLocation() const;
-
-    // Set the start indent for wrapped lines.
-    void SetWrapStartIndent(int indent);
-
-    // Retrive the start indent for wrapped lines.
-    int GetWrapStartIndent() const;
-
-    // Sets how wrapped sublines are placed. Default is fixed.
-    void SetWrapIndentMode(int mode);
-
-    // Retrieve how wrapped sublines are placed. Default is fixed.
-    int GetWrapIndentMode() const;
-
-    // Sets the degree of caching of layout information.
-    void SetLayoutCache(int mode);
-
-    // Retrieve the degree of caching of layout information.
-    int GetLayoutCache() const;
-
-    // Sets the document width assumed for scrolling.
-    void SetScrollWidth(int pixelWidth);
-
-    // Retrieve the document width assumed for scrolling.
-    int GetScrollWidth() const;
-
-    // Sets whether the maximum width line displayed is used to set scroll width.
-    void SetScrollWidthTracking(bool tracking);
-
-    // Retrieve whether the scroll width tracks wide lines.
-    bool GetScrollWidthTracking() const;
-
-    // Measure the pixel width of some text in a particular style.
-    // NUL terminated text argument.
-    // Does not handle tab or control characters.
-    int TextWidth(int style, const wxString& text);
-
-    // Sets the scroll range so that maximum scroll position has
-    // the last line at the bottom of the view (default).
-    // Setting this to false allows scrolling one page below the last line.
-    void SetEndAtLastLine(bool endAtLastLine);
-
-    // Retrieve whether the maximum scroll position has the last
-    // line at the bottom of the view.
-    bool GetEndAtLastLine() const;
-
-    // Retrieve the height of a particular line of text in pixels.
-    int TextHeight(int line);
-
-    // Show or hide the vertical scroll bar.
-    void SetUseVerticalScrollBar(bool show);
-
-    // Is the vertical scroll bar visible?
-    bool GetUseVerticalScrollBar() const;
-
-    // Append a string to the end of the document without changing the selection.
-    void AppendText(const wxString& text);
-
-    // Is drawing done in two phases with backgrounds drawn before foregrounds?
-    bool GetTwoPhaseDraw() const;
-
-    // In twoPhaseDraw mode, drawing is performed in two phases, first the background
-    // and then the foreground. This avoids chopping off characters that overlap the next run.
-    void SetTwoPhaseDraw(bool twoPhase);
-
-    // Scroll so that a display line is at the top of the display.
-    void SetFirstVisibleLine(int lineDisplay);
-
-    // Change the effect of pasting when there are multiple selections.
-    void SetMultiPaste(int multiPaste);
-
-    // Retrieve the effect of pasting when there are multiple selections.
-    int GetMultiPaste() const;
-
-    // Retrieve the value of a tag from a regular expression search.
-    wxString GetTag(int tagNumber) const;
-
-    // Make the target range start and end be the same as the selection range start and end.
-    void TargetFromSelection();
-
-    // Join the lines in the target.
-    void LinesJoin();
-
-    // Split the lines in the target into lines that are less wide than pixelWidth
-    // where possible.
-    void LinesSplit(int pixelWidth);
-
-    // Set the colours used as a chequerboard pattern in the fold margin
-    void SetFoldMarginColour(bool useSetting, const wxColour& back);
-    void SetFoldMarginHiColour(bool useSetting, const wxColour& fore);
-
-    // Move caret down one line.
-    void LineDown();
-
-    // Move caret down one line extending selection to new caret position.
-    void LineDownExtend();
-
-    // Move caret up one line.
-    void LineUp();
-
-    // Move caret up one line extending selection to new caret position.
-    void LineUpExtend();
-
-    // Move caret left one character.
-    void CharLeft();
-
-    // Move caret left one character extending selection to new caret position.
-    void CharLeftExtend();
-
-    // Move caret right one character.
-    void CharRight();
-
-    // Move caret right one character extending selection to new caret position.
-    void CharRightExtend();
-
-    // Move caret left one word.
-    void WordLeft();
-
-    // Move caret left one word extending selection to new caret position.
-    void WordLeftExtend();
-
-    // Move caret right one word.
-    void WordRight();
-
-    // Move caret right one word extending selection to new caret position.
-    void WordRightExtend();
-
-    // Move caret to first position on line.
-    void Home();
-
-    // Move caret to first position on line extending selection to new caret position.
-    void HomeExtend();
-
-    // Move caret to last position on line.
-    void LineEnd();
-
-    // Move caret to last position on line extending selection to new caret position.
-    void LineEndExtend();
-
-    // Move caret to first position in document.
-    void DocumentStart();
-
-    // Move caret to first position in document extending selection to new caret position.
-    void DocumentStartExtend();
-
-    // Move caret to last position in document.
-    void DocumentEnd();
-
-    // Move caret to last position in document extending selection to new caret position.
-    void DocumentEndExtend();
-
-    // Move caret one page up.
-    void PageUp();
-
-    // Move caret one page up extending selection to new caret position.
-    void PageUpExtend();
-
-    // Move caret one page down.
-    void PageDown();
-
-    // Move caret one page down extending selection to new caret position.
-    void PageDownExtend();
-
-    // Switch from insert to overtype mode or the reverse.
-    void EditToggleOvertype();
-
-    // Cancel any modes such as call tip or auto-completion list display.
-    void Cancel();
-
-    // Delete the selection or if no selection, the character before the caret.
-    void DeleteBack();
-
-    // If selection is empty or all on one line replace the selection with a tab character.
-    // If more than one line selected, indent the lines.
-    void Tab();
-
-    // Dedent the selected lines.
-    void BackTab();
-
-    // Insert a new line, may use a CRLF, CR or LF depending on EOL mode.
-    void NewLine();
-
-    // Insert a Form Feed character.
-    void FormFeed();
-
-    // Move caret to before first visible character on line.
-    // If already there move to first character on line.
-    void VCHome();
-
-    // Like VCHome but extending selection to new caret position.
-    void VCHomeExtend();
-
-    // Magnify the displayed text by increasing the sizes by 1 point.
-    void ZoomIn();
-
-    // Make the displayed text smaller by decreasing the sizes by 1 point.
-    void ZoomOut();
-
-    // Delete the word to the left of the caret.
-    void DelWordLeft();
-
-    // Delete the word to the right of the caret.
-    void DelWordRight();
-
-    // Delete the word to the right of the caret, but not the trailing non-word characters.
-    void DelWordRightEnd();
-
-    // Cut the line containing the caret.
-    void LineCut();
-
-    // Delete the line containing the caret.
-    void LineDelete();
-
-    // Switch the current line with the previous.
-    void LineTranspose();
-
-    // Duplicate the current line.
-    void LineDuplicate();
-
-    // Transform the selection to lower case.
-    void LowerCase();
-
-    // Transform the selection to upper case.
-    void UpperCase();
-
-    // Scroll the document down, keeping the caret visible.
-    void LineScrollDown();
-
-    // Scroll the document up, keeping the caret visible.
-    void LineScrollUp();
-
-    // Delete the selection or if no selection, the character before the caret.
-    // Will not delete the character before at the start of a line.
-    void DeleteBackNotLine();
-
-    // Move caret to first position on display line.
-    void HomeDisplay();
-
-    // Move caret to first position on display line extending selection to
-    // new caret position.
-    void HomeDisplayExtend();
-
-    // Move caret to last position on display line.
-    void LineEndDisplay();
-
-    // Move caret to last position on display line extending selection to new
-    // caret position.
-    void LineEndDisplayExtend();
-
-    // These are like their namesakes Home(Extend)?, LineEnd(Extend)?, VCHome(Extend)?
-    // except they behave differently when word-wrap is enabled:
-    // They go first to the start / end of the display line, like (Home|LineEnd)Display
-    // The difference is that, the cursor is already at the point, it goes on to the start
-    // or end of the document line, as appropriate for (Home|LineEnd|VCHome)(Extend)?.
-    void HomeWrap();
-    void HomeWrapExtend();
-    void LineEndWrap();
-    void LineEndWrapExtend();
-    void VCHomeWrap();
-    void VCHomeWrapExtend();
-
-    // Copy the line containing the caret.
-    void LineCopy();
-
-    // Move the caret inside current view if it's not there already.
-    void MoveCaretInsideView();
-
-    // How many characters are on a line, including end of line characters?
-    int LineLength(int line) const;
-
-    // Highlight the characters at two positions.
-    void BraceHighlight(int pos1, int pos2);
-
-    // Use specified indicator to highlight matching braces instead of changing their style.
-    void BraceHighlightIndicator(bool useBraceHighlightIndicator, int indicator);
-
-    // Highlight the character at a position indicating there is no matching brace.
-    void BraceBadLight(int pos);
-
-    // Use specified indicator to highlight non matching brace instead of changing its style.
-    void BraceBadLightIndicator(bool useBraceBadLightIndicator, int indicator);
-
-    // Find the position of a matching brace or INVALID_POSITION if no match.
-    int BraceMatch(int pos);
-
-    // Are the end of line characters visible?
-    bool GetViewEOL() const;
-
-    // Make the end of line characters visible or invisible.
-    void SetViewEOL(bool visible);
-
-    // Retrieve a pointer to the document object.
-    void* GetDocPointer();
-
-    // Change the document object used.
-    void SetDocPointer(void* docPointer);
-
-    // Set which document modification events are sent to the container.
-    void SetModEventMask(int mask);
-
-    // Retrieve the column number which text should be kept within.
-    int GetEdgeColumn() const;
-
-    // Set the column number of the edge.
-    // If text goes past the edge then it is highlighted.
-    void SetEdgeColumn(int column);
-
-    // Retrieve the edge highlight mode.
-    int GetEdgeMode() const;
-
-    // The edge may be displayed by a line (EDGE_LINE) or by highlighting text that
-    // goes beyond it (EDGE_BACKGROUND) or not displayed at all (EDGE_NONE).
-    void SetEdgeMode(int mode);
-
-    // Retrieve the colour used in edge indication.
-    wxColour GetEdgeColour() const;
-
-    // Change the colour used in edge indication.
-    void SetEdgeColour(const wxColour& edgeColour);
-
-    // Sets the current caret position to be the search anchor.
-    void SearchAnchor();
-
-    // Find some text starting at the search anchor.
-    // Does not ensure the selection is visible.
-    int SearchNext(int flags, const wxString& text);
-
-    // Find some text starting at the search anchor and moving backwards.
-    // Does not ensure the selection is visible.
-    int SearchPrev(int flags, const wxString& text);
-
-    // Retrieves the number of lines completely visible.
-    int LinesOnScreen() const;
-
-    // Set whether a pop up menu is displayed automatically when the user presses
-    // the wrong mouse button.
-    void UsePopUp(bool allowPopUp);
-
-    // Is the selection rectangular? The alternative is the more common stream selection.
-    bool SelectionIsRectangle() const;
-
-    // Set the zoom level. This number of points is added to the size of all fonts.
-    // It may be positive to magnify or negative to reduce.
-    void SetZoom(int zoom);
-
-    // Retrieve the zoom level.
-    int GetZoom() const;
-
-    // Create a new document object.
-    // Starts with reference count of 1 and not selected into editor.
-    void* CreateDocument();
-
-    // Extend life of document.
-    void AddRefDocument(void* docPointer);
-
-    // Release a reference to the document, deleting document if it fades to black.
-    void ReleaseDocument(void* docPointer);
-
-    // Get which document modification events are sent to the container.
-    int GetModEventMask() const;
-
-    // Change internal focus flag.
-    void SetSTCFocus(bool focus);
-
-    // Get internal focus flag.
-    bool GetSTCFocus() const;
-
-    // Change error status - 0 = OK.
-    void SetStatus(int statusCode);
-
-    // Get error status.
-    int GetStatus() const;
-
-    // Set whether the mouse is captured when its button is pressed.
-    void SetMouseDownCaptures(bool captures);
-
-    // Get whether mouse gets captured.
-    bool GetMouseDownCaptures() const;
-
-    // Sets the cursor to one of the SC_CURSOR* values.
-    void SetSTCCursor(int cursorType);
-
-    // Get cursor type.
-    int GetSTCCursor() const;
-
-    // Change the way control characters are displayed:
-    // If symbol is < 32, keep the drawn way, else, use the given character.
-    void SetControlCharSymbol(int symbol);
-
-    // Get the way control characters are displayed.
-    int GetControlCharSymbol() const;
-
-    // Move to the previous change in capitalisation.
-    void WordPartLeft();
-
-    // Move to the previous change in capitalisation extending selection
-    // to new caret position.
-    void WordPartLeftExtend();
-
-    // Move to the change next in capitalisation.
-    void WordPartRight();
-
-    // Move to the next change in capitalisation extending selection
-    // to new caret position.
-    void WordPartRightExtend();
-
-    // Set the way the display area is determined when a particular line
-    // is to be moved to by Find, FindNext, GotoLine, etc.
-    void SetVisiblePolicy(int visiblePolicy, int visibleSlop);
-
-    // Delete back from the current position to the start of the line.
-    void DelLineLeft();
-
-    // Delete forwards from the current position to the end of the line.
-    void DelLineRight();
-
-    // Get and Set the xOffset (ie, horizontal scroll position).
-    void SetXOffset(int newOffset);
-    int GetXOffset() const;
-
-    // Set the last x chosen value to be the caret x position.
-    void ChooseCaretX();
-
-    // Set the way the caret is kept visible when going sideways.
-    // The exclusion zone is given in pixels.
-    void SetXCaretPolicy(int caretPolicy, int caretSlop);
-
-    // Set the way the line the caret is on is kept visible.
-    // The exclusion zone is given in lines.
-    void SetYCaretPolicy(int caretPolicy, int caretSlop);
-
-    // Set printing to line wrapped (SC_WRAP_WORD) or not line wrapped (SC_WRAP_NONE).
-    void SetPrintWrapMode(int mode);
-
-    // Is printing line wrapped?
-    int GetPrintWrapMode() const;
-
-    // Set a fore colour for active hotspots.
-    void SetHotspotActiveForeground(bool useSetting, const wxColour& fore);
-
-    // Get the fore colour for active hotspots.
-    wxColour GetHotspotActiveForeground() const;
-
-    // Set a back colour for active hotspots.
-    void SetHotspotActiveBackground(bool useSetting, const wxColour& back);
-
-    // Get the back colour for active hotspots.
-    wxColour GetHotspotActiveBackground() const;
-
-    // Enable / Disable underlining active hotspots.
-    void SetHotspotActiveUnderline(bool underline);
-
-    // Get whether underlining for active hotspots.
-    bool GetHotspotActiveUnderline() const;
-
-    // Limit hotspots to single line so hotspots on two lines don't merge.
-    void SetHotspotSingleLine(bool singleLine);
-
-    // Get the HotspotSingleLine property
-    bool GetHotspotSingleLine() const;
-
-    // Move caret between paragraphs (delimited by empty lines).
-    void ParaDown();
-    void ParaDownExtend();
-    void ParaUp();
-    void ParaUpExtend();
-
-    // Given a valid document position, return the previous position taking code
-    // page into account. Returns 0 if passed 0.
-    int PositionBefore(int pos);
-
-    // Given a valid document position, return the next position taking code
-    // page into account. Maximum value returned is the last position in the document.
-    int PositionAfter(int pos);
-
-    // Copy a range of text to the clipboard. Positions are clipped into the document.
-    void CopyRange(int start, int end);
-
-    // Copy argument text to the clipboard.
-    void CopyText(int length, const wxString& text);
-
-    // Set the selection mode to stream (SC_SEL_STREAM) or rectangular (SC_SEL_RECTANGLE/SC_SEL_THIN) or
-    // by lines (SC_SEL_LINES).
-    void SetSelectionMode(int mode);
-
-    // Get the mode of the current selection.
-    int GetSelectionMode() const;
-
-    // Retrieve the position of the start of the selection at the given line (INVALID_POSITION if no selection on this line).
-    int GetLineSelStartPosition(int line);
-
-    // Retrieve the position of the end of the selection at the given line (INVALID_POSITION if no selection on this line).
-    int GetLineSelEndPosition(int line);
-
-    // Move caret down one line, extending rectangular selection to new caret position.
-    void LineDownRectExtend();
-
-    // Move caret up one line, extending rectangular selection to new caret position.
-    void LineUpRectExtend();
-
-    // Move caret left one character, extending rectangular selection to new caret position.
-    void CharLeftRectExtend();
-
-    // Move caret right one character, extending rectangular selection to new caret position.
-    void CharRightRectExtend();
-
-    // Move caret to first position on line, extending rectangular selection to new caret position.
-    void HomeRectExtend();
-
-    // Move caret to before first visible character on line.
-    // If already there move to first character on line.
-    // In either case, extend rectangular selection to new caret position.
-    void VCHomeRectExtend();
-
-    // Move caret to last position on line, extending rectangular selection to new caret position.
-    void LineEndRectExtend();
-
-    // Move caret one page up, extending rectangular selection to new caret position.
-    void PageUpRectExtend();
-
-    // Move caret one page down, extending rectangular selection to new caret position.
-    void PageDownRectExtend();
-
-    // Move caret to top of page, or one page up if already at top of page.
-    void StutteredPageUp();
-
-    // Move caret to top of page, or one page up if already at top of page, extending selection to new caret position.
-    void StutteredPageUpExtend();
-
-    // Move caret to bottom of page, or one page down if already at bottom of page.
-    void StutteredPageDown();
-
-    // Move caret to bottom of page, or one page down if already at bottom of page, extending selection to new caret position.
-    void StutteredPageDownExtend();
-
-    // Move caret left one word, position cursor at end of word.
-    void WordLeftEnd();
-
-    // Move caret left one word, position cursor at end of word, extending selection to new caret position.
-    void WordLeftEndExtend();
-
-    // Move caret right one word, position cursor at end of word.
-    void WordRightEnd();
-
-    // Move caret right one word, position cursor at end of word, extending selection to new caret position.
-    void WordRightEndExtend();
-
-    // Set the set of characters making up whitespace for when moving or selecting by word.
-    // Should be called after SetWordChars.
-    void SetWhitespaceChars(const wxString& characters);
-
-    // Get the set of characters making up whitespace for when moving or selecting by word.
-    wxString GetWhitespaceChars() const;
-
-    // Set the set of characters making up punctuation characters
-    // Should be called after SetWordChars.
-    void SetPunctuationChars(const wxString& characters);
-
-    // Get the set of characters making up punctuation characters
-    wxString GetPunctuationChars() const;
-
-    // Reset the set of characters for whitespace and word characters to the defaults.
-    void SetCharsDefault();
-
-    // Get currently selected item position in the auto-completion list
-    int AutoCompGetCurrent() const;
-
-    // Set auto-completion case insensitive behaviour to either prefer case-sensitive matches or have no preference.
-    void AutoCompSetCaseInsensitiveBehaviour(int behaviour);
-
-    // Get auto-completion case insensitive behaviour.
-    int AutoCompGetCaseInsensitiveBehaviour() const;
-
-    // Enlarge the document to a particular size of text bytes.
-    void Allocate(int bytes);
-
-    // Find the position of a column on a line taking into account tabs and
-    // multi-byte characters. If beyond end of line, return line end position.
-    int FindColumn(int line, int column);
-
-    // Can the caret preferred x position only be changed by explicit movement commands?
-    int GetCaretSticky() const;
-
-    // Stop the caret preferred x position changing when the user types.
-    void SetCaretSticky(int useCaretStickyBehaviour);
-
-    // Switch between sticky and non-sticky: meant to be bound to a key.
-    void ToggleCaretSticky();
-
-    // Enable/Disable convert-on-paste for line endings
-    void SetPasteConvertEndings(bool convert);
-
-    // Get convert-on-paste setting
-    bool GetPasteConvertEndings() const;
-
-    // Duplicate the selection. If selection empty duplicate the line containing the caret.
-    void SelectionDuplicate();
-
-    // Set background alpha of the caret line.
-    void SetCaretLineBackAlpha(int alpha);
-
-    // Get the background alpha of the caret line.
-    int GetCaretLineBackAlpha() const;
-
-    // Set the style of the caret to be drawn.
-    void SetCaretStyle(int caretStyle);
-
-    // Returns the current style of the caret.
-    int GetCaretStyle() const;
-
-    // Set the indicator used for IndicatorFillRange and IndicatorClearRange
-    void SetIndicatorCurrent(int indicator);
-
-    // Get the current indicator
-    int GetIndicatorCurrent() const;
-
-    // Set the value used for IndicatorFillRange
-    void SetIndicatorValue(int value);
-
-    // Get the current indicator value
-    int GetIndicatorValue() const;
-
-    // Turn a indicator on over a range.
-    void IndicatorFillRange(int position, int fillLength);
-
-    // Turn a indicator off over a range.
-    void IndicatorClearRange(int position, int clearLength);
-
-    // Are any indicators present at position?
-    int IndicatorAllOnFor(int position);
-
-    // What value does a particular indicator have at at a position?
-    int IndicatorValueAt(int indicator, int position);
-
-    // Where does a particular indicator start?
-    int IndicatorStart(int indicator, int position);
-
-    // Where does a particular indicator end?
-    int IndicatorEnd(int indicator, int position);
-
-    // Set number of entries in position cache
-    void SetPositionCacheSize(int size);
-
-    // How many entries are allocated to the position cache?
-    int GetPositionCacheSize() const;
-
-    // Copy the selection, if selection empty copy the line with the caret
-    void CopyAllowLine();
-
-    // Compact the document buffer and return a read-only pointer to the
-    // characters in the document.
-    const char* GetCharacterPointer() const;
-
-    // Return a read-only pointer to a range of characters in the document.
-    // May move the gap so that the range is contiguous, but will only move up
-    // to rangeLength bytes.
-    const char* GetRangePointer(int position, int rangeLength) const;
-
-    // Return a position which, to avoid performance costs, should not be within
-    // the range of a call to GetRangePointer.
-    int GetGapPosition() const;
-
-    // Always interpret keyboard input as Unicode
-    void SetKeysUnicode(bool keysUnicode);
-
-    // Are keys always interpreted as Unicode?
-    bool GetKeysUnicode() const;
-
-    // Set the alpha fill colour of the given indicator.
-    void IndicatorSetAlpha(int indicator, int alpha);
-
-    // Get the alpha fill colour of the given indicator.
-    int IndicatorGetAlpha(int indicator) const;
-
-    // Set the alpha outline colour of the given indicator.
-    void IndicatorSetOutlineAlpha(int indicator, int alpha);
-
-    // Get the alpha outline colour of the given indicator.
-    int IndicatorGetOutlineAlpha(int indicator) const;
-
-    // Set extra ascent for each line
-    void SetExtraAscent(int extraAscent);
-
-    // Get extra ascent for each line
-    int GetExtraAscent() const;
-
-    // Set extra descent for each line
-    void SetExtraDescent(int extraDescent);
-
-    // Get extra descent for each line
-    int GetExtraDescent() const;
-
-    // Which symbol was defined for markerNumber with MarkerDefine
-    int GetMarkerSymbolDefined(int markerNumber);
-
-    // Set the text in the text margin for a line
-    void MarginSetText(int line, const wxString& text);
-
-    // Get the text in the text margin for a line
-    wxString MarginGetText(int line) const;
-
-    // Set the style number for the text margin for a line
-    void MarginSetStyle(int line, int style);
-
-    // Get the style number for the text margin for a line
-    int MarginGetStyle(int line) const;
-
-    // Set the style in the text margin for a line
-    void MarginSetStyles(int line, const wxString& styles);
-
-    // Get the styles in the text margin for a line
-    wxString MarginGetStyles(int line) const;
-
-    // Clear the margin text on all lines
-    void MarginTextClearAll();
-
-    // Get the start of the range of style numbers used for margin text
-    void MarginSetStyleOffset(int style);
-
-    // Get the start of the range of style numbers used for margin text
-    int MarginGetStyleOffset() const;
-
-    // Set the margin options.
-    void SetMarginOptions(int marginOptions);
-
-    // Get the margin options.
-    int GetMarginOptions() const;
-
-    // Set the annotation text for a line
-    void AnnotationSetText(int line, const wxString& text);
-
-    // Get the annotation text for a line
-    wxString AnnotationGetText(int line) const;
-
-    // Set the style number for the annotations for a line
-    void AnnotationSetStyle(int line, int style);
-
-    // Get the style number for the annotations for a line
-    int AnnotationGetStyle(int line) const;
-
-    // Set the annotation styles for a line
-    void AnnotationSetStyles(int line, const wxString& styles);
-
-    // Get the annotation styles for a line
-    wxString AnnotationGetStyles(int line) const;
-
-    // Get the number of annotation lines for a line
-    int AnnotationGetLines(int line) const;
-
-    // Clear the annotations from all lines
-    void AnnotationClearAll();
-
-    // Set the visibility for the annotations for a view
-    void AnnotationSetVisible(int visible);
-
-    // Get the visibility for the annotations for a view
-    int AnnotationGetVisible() const;
-
-    // Get the start of the range of style numbers used for annotations
-    void AnnotationSetStyleOffset(int style);
-
-    // Get the start of the range of style numbers used for annotations
-    int AnnotationGetStyleOffset() const;
-
-    // Add a container action to the undo stack
-    void AddUndoAction(int token, int flags);
-
-    // Find the position of a character from a point within the window.
-    int CharPositionFromPoint(int x, int y);
-
-    // Find the position of a character from a point within the window.
-    // Return INVALID_POSITION if not close to text.
-    int CharPositionFromPointClose(int x, int y);
-
-    // Set whether multiple selections can be made
-    void SetMultipleSelection(bool multipleSelection);
-
-    // Whether multiple selections can be made
-    bool GetMultipleSelection() const;
-
-    // Set whether typing can be performed into multiple selections
-    void SetAdditionalSelectionTyping(bool additionalSelectionTyping);
-
-    // Whether typing can be performed into multiple selections
-    bool GetAdditionalSelectionTyping() const;
-
-    // Set whether additional carets will blink
-    void SetAdditionalCaretsBlink(bool additionalCaretsBlink);
-
-    // Whether additional carets will blink
-    bool GetAdditionalCaretsBlink() const;
-
-    // Set whether additional carets are visible
-    void SetAdditionalCaretsVisible(bool additionalCaretsBlink);
-
-    // Whether additional carets are visible
-    bool GetAdditionalCaretsVisible() const;
-
-    // How many selections are there?
-    int GetSelections() const;
-
-    // Clear selections to a single empty stream selection
-    void ClearSelections();
-
-    // Add a selection
-    int AddSelection(int caret, int anchor);
-
-    // Set the main selection
-    void SetMainSelection(int selection);
-
-    // Which selection is the main selection
-    int GetMainSelection() const;
-    void SetSelectionNCaret(int selection, int pos);
-    int GetSelectionNCaret(int selection) const;
-    void SetSelectionNAnchor(int selection, int posAnchor);
-    int GetSelectionNAnchor(int selection) const;
-    void SetSelectionNCaretVirtualSpace(int selection, int space);
-    int GetSelectionNCaretVirtualSpace(int selection) const;
-    void SetSelectionNAnchorVirtualSpace(int selection, int space);
-    int GetSelectionNAnchorVirtualSpace(int selection) const;
-
-    // Sets the position that starts the selection - this becomes the anchor.
-    void SetSelectionNStart(int selection, int pos);
-
-    // Returns the position at the start of the selection.
-    int GetSelectionNStart(int selection) const;
-
-    // Sets the position that ends the selection - this becomes the currentPosition.
-    void SetSelectionNEnd(int selection, int pos);
-
-    // Returns the position at the end of the selection.
-    int GetSelectionNEnd(int selection) const;
-    void SetRectangularSelectionCaret(int pos);
-    int GetRectangularSelectionCaret() const;
-    void SetRectangularSelectionAnchor(int posAnchor);
-    int GetRectangularSelectionAnchor() const;
-    void SetRectangularSelectionCaretVirtualSpace(int space);
-    int GetRectangularSelectionCaretVirtualSpace() const;
-    void SetRectangularSelectionAnchorVirtualSpace(int space);
-    int GetRectangularSelectionAnchorVirtualSpace() const;
-    void SetVirtualSpaceOptions(int virtualSpaceOptions);
-    int GetVirtualSpaceOptions() const;
-
-    // On GTK+, allow selecting the modifier key to use for mouse-based
-    // rectangular selection. Often the window manager requires Alt+Mouse Drag
-    // for moving windows.
-    // Valid values are SCMOD_CTRL(default), SCMOD_ALT, or SCMOD_SUPER.
-    void SetRectangularSelectionModifier(int modifier);
-
-    // Get the modifier key used for rectangular selection.
-    int GetRectangularSelectionModifier() const;
-
-    // Set the foreground colour of additional selections.
-    // Must have previously called SetSelFore with non-zero first argument for this to have an effect.
-    void SetAdditionalSelForeground(const wxColour& fore);
-
-    // Set the background colour of additional selections.
-    // Must have previously called SetSelBack with non-zero first argument for this to have an effect.
-    void SetAdditionalSelBackground(const wxColour& back);
-
-    // Set the alpha of the selection.
-    void SetAdditionalSelAlpha(int alpha);
-
-    // Get the alpha of the selection.
-    int GetAdditionalSelAlpha() const;
-
-    // Set the foreground colour of additional carets.
-    void SetAdditionalCaretForeground(const wxColour& fore);
-
-    // Get the foreground colour of additional carets.
-    wxColour GetAdditionalCaretForeground() const;
-
-    // Set the main selection to the next selection.
-    void RotateSelection();
-
-    // Swap that caret and anchor of the main selection.
-    void SwapMainAnchorCaret();
-
-    // Indicate that the internal state of a lexer has changed over a range and therefore
-    // there may be a need to redraw.
-    int ChangeLexerState(int start, int end);
-
-    // Find the next line at or after lineStart that is a contracted fold header line.
-    // Return -1 when no more lines.
-    int ContractedFoldNext(int lineStart);
-
-    // Centre current line in window.
-    void VerticalCentreCaret();
-
-    // Move the selected lines up one line, shifting the line above after the selection
-    void MoveSelectedLinesUp();
-
-    // Move the selected lines down one line, shifting the line below before the selection
-    void MoveSelectedLinesDown();
-
-    // Set the identifier reported as idFrom in notification messages.
-    void SetIdentifier(int identifier);
-
-    // Get the identifier.
-    int GetIdentifier() const;
-
-    // Set the width for future RGBA image data.
-    void RGBAImageSetWidth(int width);
-
-    // Set the height for future RGBA image data.
-    void RGBAImageSetHeight(int height);
-
-    // Define a marker from RGBA data.
-    // It has the width and height from RGBAImageSetWidth/Height
-    void MarkerDefineRGBAImage(int markerNumber, const unsigned char* pixels);
-
-    // Register an RGBA image for use in autocompletion lists.
-    // It has the width and height from RGBAImageSetWidth/Height
-    void RegisterRGBAImage(int type, const unsigned char* pixels);
-
-    // Scroll to start of document.
-    void ScrollToStart();
-
-    // Scroll to end of document.
-    void ScrollToEnd();
-
-    // Set the technology used.
-    void SetTechnology(int technology);
-
-    // Get the tech.
-    int GetTechnology() const;
-
-    // Create an ILoader*.
-    void* CreateLoader(int bytes) const;
-
-    // Start notifying the container of all key presses and commands.
-    void StartRecord();
-
-    // Stop notifying the container of all key presses and commands.
-    void StopRecord();
-
-    // Set the lexing language of the document.
-    void SetLexer(int lexer);
-
-    // Retrieve the lexing language of the document.
-    int GetLexer() const;
-
-    // Colourise a segment of the document using the current lexing language.
-    void Colourise(int start, int end);
-
-    // Set up a value that may be used by a lexer for some optional feature.
-    void SetProperty(const wxString& key, const wxString& value);
-
-    // Set up the key words used by the lexer.
-    void SetKeyWords(int keywordSet, const wxString& keyWords);
-
-    // Set the lexing language of the document based on string name.
-    void SetLexerLanguage(const wxString& language);
-
-    // Retrieve a 'property' value previously set with SetProperty.
-    wxString GetProperty(const wxString& key);
-
-    // Retrieve a 'property' value previously set with SetProperty,
-    // with '$()' variable replacement on returned buffer.
-    wxString GetPropertyExpanded(const wxString& key);
-
-    // Retrieve a 'property' value previously set with SetProperty,
-    // interpreted as an int AFTER any '$()' variable replacement.
-    int GetPropertyInt(const wxString& key) const;
-
-    // Retrieve the number of bits the current lexer needs for styling.
-    int GetStyleBitsNeeded() const;
-
-    // For private communication between an application and a known lexer.
-    void* PrivateLexerCall(int operation, void* pointer);
-
-    // Retrieve a '\n' separated list of properties understood by the current lexer.
-    wxString PropertyNames() const;
-
-    // Retrieve the type of a property.
-    int PropertyType(const wxString& name);
-
-    // Describe a property.
-    wxString DescribeProperty(const wxString& name) const;
-
-    // Retrieve a '\n' separated list of descriptions of the keyword sets understood by the current lexer.
-    wxString DescribeKeyWordSets() const;
-
-    //}}}
-    //----------------------------------------------------------------------
-
-    // Manually declared methods
-
-    // Returns the line number of the line with the caret.
-    int GetCurrentLine();
-
-    // Extract style settings from a spec-string which is composed of one or
-    // more of the following comma separated elements:
-    //
-    //      bold                    turns on bold
-    //      italic                  turns on italics
-    //      fore:[name or #RRGGBB]  sets the foreground colour
-    //      back:[name or #RRGGBB]  sets the background colour
-    //      face:[facename]         sets the font face name to use
-    //      size:[num]              sets the font size in points
-    //      eol                     turns on eol filling
-    //      underline               turns on underlining
-    //
-    void StyleSetSpec(int styleNum, const wxString& spec);
-
-
-    // Get the font of a style.
-    wxFont StyleGetFont(int style);
-
-
-    // Set style size, face, bold, italic, and underline attributes from
-    // a wxFont's attributes.
-    void StyleSetFont(int styleNum, wxFont& font);
-
-
-
-    // Set all font style attributes at once.
-    void StyleSetFontAttr(int styleNum, int size,
-                          const wxString& faceName,
-                          bool bold, bool italic,
-                          bool underline,
-                          wxFontEncoding encoding=wxFONTENCODING_DEFAULT);
-
-
-    // Set the character set of the font in a style.  Converts the Scintilla
-    // character set values to a wxFontEncoding.
-    void StyleSetCharacterSet(int style, int characterSet);
-
-    // Set the font encoding to be used by a style.
-    void StyleSetFontEncoding(int style, wxFontEncoding encoding);
-
-
-    // Perform one of the operations defined by the wxSTC_CMD_* constants.
-    void CmdKeyExecute(int cmd);
-
-
-    // Set the left and right margin in the edit area, measured in pixels.
-    void SetMargins(int left, int right);
-
-
-    // Retrieve the point in the window where a position is displayed.
-    wxPoint PointFromPosition(int pos);
-
-
-    // Scroll enough to make the given line visible
-    void ScrollToLine(int line);
-
-
-    // Scroll enough to make the given column visible
-    void ScrollToColumn(int column);
-
-
-    // Send a message to Scintilla
-    //
-    // NB: this method is not really const as it can modify the control but it
-    //     has to be declared as such as it's called from both const and
-    //     non-const methods and we can't distinguish between the two
-    wxIntPtr SendMsg(int msg, wxUIntPtr wp=0, wxIntPtr lp=0) const;
-
-
-    // Set the vertical scrollbar to use instead of the ont that's built-in.
-    void SetVScrollBar(wxScrollBar* bar);
-
-
-    // Set the horizontal scrollbar to use instead of the ont that's built-in.
-    void SetHScrollBar(wxScrollBar* bar);
-
-    // Can be used to prevent the EVT_CHAR handler from adding the char
-    bool GetLastKeydownProcessed() { return m_lastKeyDownConsumed; }
-    void SetLastKeydownProcessed(bool val) { m_lastKeyDownConsumed = val; }
-
-    // if we derive from wxTextAreaBase it already provides these methods
-#if !wxUSE_TEXTCTRL
-    // Write the contents of the editor to filename
-    bool SaveFile(const wxString& filename);
-
-    // Load the contents of filename into the editor
-    bool LoadFile(const wxString& filename);
-#endif // !wxUSE_TEXTCTRL
-
-#ifdef STC_USE_DND
-    // Allow for simulating a DnD DragOver
-    wxDragResult DoDragOver(wxCoord x, wxCoord y, wxDragResult def);
-
-    // Allow for simulating a DnD DropText
-    bool DoDropText(long x, long y, const wxString& data);
-#endif
-
-    // Specify whether anti-aliased fonts should be used.  Will have no effect
-    // on some platforms, but on some (wxMac for example) can greatly improve
-    // performance.
-    void SetUseAntiAliasing(bool useAA);
-
-    // Returns the current UseAntiAliasing setting.
-    bool GetUseAntiAliasing();
-
-    // Clear annotations from the given line.
-    void AnnotationClearLine(int line);
-
-
-
-    // The following methods are nearly equivalent to their similarly named
-    // cousins above.  The difference is that these methods bypass wxString
-    // and always use a char* even if used in a unicode build of wxWidgets.
-    // In that case the character data will be utf-8 encoded since that is
-    // what is used internally by Scintilla in unicode builds.
-
-    // Add text to the document at current position.
-    void AddTextRaw(const char* text, int length=-1);
-
-    // Insert string at a position.
-    void InsertTextRaw(int pos, const char* text);
-
-    // Retrieve the text of the line containing the caret.
-    // Returns the index of the caret on the line.
-#ifdef SWIG
-    wxCharBuffer GetCurLineRaw(int* OUTPUT);
-#else
-    wxCharBuffer GetCurLineRaw(int* linePos=NULL);
-#endif
-
-    // Retrieve the contents of a line.
-    wxCharBuffer GetLineRaw(int line);
-
-    // Retrieve the selected text.
-    wxCharBuffer GetSelectedTextRaw();
-
-    // Retrieve a range of text.
-    wxCharBuffer GetTextRangeRaw(int startPos, int endPos);
-
-    // Replace the contents of the document with the argument text.
-    void SetTextRaw(const char* text);
-
-    // Retrieve all the text in the document.
-    wxCharBuffer GetTextRaw();
-
-    // Append a string to the end of the document without changing the selection.
-    void AppendTextRaw(const char* text, int length=-1);
-
-#ifdef SWIG
-    %pythoncode "_stc_utf8_methods.py"
-#endif
-
-
-    // implement wxTextEntryBase pure virtual methods
-    // ----------------------------------------------
-
-    virtual void WriteText(const wxString& text)
-    {
-        ReplaceSelection(text);
-    }
-
-    virtual void Remove(long from, long to)
-    {
-        Replace(from, to, "");
-    }
-    virtual void Replace(long from, long to, const wxString& text)
-    {
-        SetTargetStart((int)from);
-        SetTargetEnd((int)to);
-        ReplaceTarget(text);
-    }
-
-    /*
-        These functions are already declared in the generated section.
-
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
-
-    virtual void Undo();
-    virtual void Redo();
-
-    virtual bool CanUndo() const;
-    virtual bool CanRedo() const;
-
-    */
-
-    virtual void SetInsertionPoint(long pos)
-    {
-        SetCurrentPos(int(pos == -1 ? GetLastPosition() : pos));
-    }
-    virtual long GetInsertionPoint() const { return GetCurrentPos(); }
-    virtual long GetLastPosition() const { return GetTextLength(); }
-
-    virtual void SetSelection(long from, long to)
-    {
-        if ( from == -1 && to == -1 )
-        {
-            SelectAll();
-        }
-        else
-        {
-            SetSelectionStart((int)from);
-            SetSelectionEnd((int)to);
-        }
-    }
-
-    virtual void SelectNone()
-    {
-        ClearSelections();
-    }
-
-#ifdef SWIG
-    void GetSelection(long* OUTPUT, long* OUTPUT) const;
-#else
-    virtual void GetSelection(long *from, long *to) const
-    {
-        if ( from )
-            *from = GetSelectionStart();
-        if ( to )
-            *to = GetSelectionEnd();
-    }
-
-    // kept for compatibility only
-    void GetSelection(int *from, int *to)
-    {
-        long f, t;
-        GetSelection(&f, &t);
-        if ( from )
-            *from = (int)f;
-        if ( to )
-            *to = (int)t;
-    }
-#endif
-
-    virtual bool IsEditable() const { return !GetReadOnly(); }
-    virtual void SetEditable(bool editable) { SetReadOnly(!editable); }
-
-    // implement wxTextAreaBase pure virtual methods
-    // ---------------------------------------------
-
-    virtual int GetLineLength(long lineNo) const { return static_cast<int>(GetLineText(lineNo).length()); }
-    virtual wxString GetLineText(long lineNo) const
-    {
-        wxString text = GetLine(static_cast<int>(lineNo));
-        size_t lastNewLine = text.find_last_not_of(wxS("\r\n"));
-
-        if ( lastNewLine != wxString::npos )
-            text.erase(lastNewLine + 1); // remove trailing cr+lf
-        else
-            text.clear();
-        return text;
-    }
-    virtual int GetNumberOfLines() const { return GetLineCount(); }
-
-    virtual bool IsModified() const { return GetModify(); }
-    virtual void MarkDirty() { wxFAIL_MSG("not implemented"); }
-    virtual void DiscardEdits() { SetSavePoint(); }
-
-    virtual bool SetStyle(long WXUNUSED(start), long WXUNUSED(end),
-                          const wxTextAttr& WXUNUSED(style))
-    {
-        wxFAIL_MSG("not implemented");
-
-        return false;
-    }
-
-    virtual bool GetStyle(long WXUNUSED(position), wxTextAttr& WXUNUSED(style))
-    {
-        wxFAIL_MSG("not implemented");
-
-        return false;
-    }
-
-    virtual bool SetDefaultStyle(const wxTextAttr& WXUNUSED(style))
-    {
-        wxFAIL_MSG("not implemented");
-
-        return false;
-    }
-
-    virtual long XYToPosition(long x, long y) const
-    {
-        long pos = PositionFromLine((int)y);
-        pos += x;
-        return pos;
-    }
-
-    virtual bool PositionToXY(long pos, long *x, long *y) const
-    {
-        int l = LineFromPosition((int)pos);
-        if ( l == -1 )
-            return false;
-
-        if ( x )
-            *x = pos - PositionFromLine(l);
-
-        if ( y )
-            *y = l;
-
-        return true;
-    }
-
-    virtual void ShowPosition(long pos) { GotoPos((int)pos); }
-
-    // FIXME-VC6: can't use wxWindow here because of "error C2603: illegal
-    //            access declaration: 'wxWindow' is not a direct base of
-    //            'wxStyledTextCtrl'" with VC6
-    using wxControl::HitTest;
-
-    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const
-    {
-        const long l = PositionFromPoint(pt);
-        if ( l == -1 )
-            return wxTE_HT_BELOW; // we don't really know where it was
-
-        if ( pos )
-            *pos = l;
-
-        return wxTE_HT_ON_TEXT;
-    }
-
-    // just unhide it
-    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
-                                            wxTextCoord *col,
-                                            wxTextCoord *row) const
-    {
-        return wxTextAreaBase::HitTest(pt, col, row);
-    }
-
-    static wxVersionInfo GetLibraryVersionInfo();
-
-protected:
-    virtual void DoSetValue(const wxString& value, int flags);
-    virtual wxString DoGetValue() const { return GetText(); }
-    virtual wxWindow *GetEditableWindow() { return this; }
-
-#ifndef SWIG
-    virtual bool DoLoadFile(const wxString& file, int fileType);
-    virtual bool DoSaveFile(const wxString& file, int fileType);
-
-    // Event handlers
-    void OnPaint(wxPaintEvent& evt);
-    void OnScrollWin(wxScrollWinEvent& evt);
-    void OnScroll(wxScrollEvent& evt);
-    void OnSize(wxSizeEvent& evt);
-    void OnMouseLeftDown(wxMouseEvent& evt);
-    void OnMouseMove(wxMouseEvent& evt);
-    void OnMouseLeftUp(wxMouseEvent& evt);
-    void OnMouseRightUp(wxMouseEvent& evt);
-    void OnMouseMiddleUp(wxMouseEvent& evt);
-    void OnContextMenu(wxContextMenuEvent& evt);
-    void OnMouseWheel(wxMouseEvent& evt);
-    void OnChar(wxKeyEvent& evt);
-    void OnKeyDown(wxKeyEvent& evt);
-    void OnLoseFocus(wxFocusEvent& evt);
-    void OnGainFocus(wxFocusEvent& evt);
-    void OnSysColourChanged(wxSysColourChangedEvent& evt);
-    void OnEraseBackground(wxEraseEvent& evt);
-    void OnMenu(wxCommandEvent& evt);
-    void OnListBox(wxCommandEvent& evt);
-    void OnIdle(wxIdleEvent& evt);
-
-    virtual wxSize DoGetBestSize() const;
-
-    // Turn notifications from Scintilla into events
-    void NotifyChange();
-    void NotifyParent(SCNotification* scn);
-
-private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxStyledTextCtrl)
-
-protected:
-
-    ScintillaWX*        m_swx;
-    wxStopWatch         m_stopWatch;
-    wxScrollBar*        m_vScrollBar;
-    wxScrollBar*        m_hScrollBar;
-
-    bool                m_lastKeyDownConsumed;
-
-    friend class ScintillaWX;
-    friend class Platform;
-#endif // !SWIG
-};
-
-//----------------------------------------------------------------------
-
-class WXDLLIMPEXP_STC wxStyledTextEvent : public wxCommandEvent {
-public:
-    wxStyledTextEvent(wxEventType commandType=0, int id=0);
-#ifndef SWIG
-    wxStyledTextEvent(const wxStyledTextEvent& event);
-#endif
-    ~wxStyledTextEvent() {}
-
-    void SetPosition(int pos)             { m_position = pos; }
-    void SetKey(int k)                    { m_key = k; }
-    void SetModifiers(int m)              { m_modifiers = m; }
-    void SetModificationType(int t)       { m_modificationType = t; }
-    void SetText(const wxString& t)       { m_text = t; }
-    void SetLength(int len)               { m_length = len; }
-    void SetLinesAdded(int num)           { m_linesAdded = num; }
-    void SetLine(int val)                 { m_line = val; }
-    void SetFoldLevelNow(int val)         { m_foldLevelNow = val; }
-    void SetFoldLevelPrev(int val)        { m_foldLevelPrev = val; }
-    void SetMargin(int val)               { m_margin = val; }
-    void SetMessage(int val)              { m_message = val; }
-    void SetWParam(int val)               { m_wParam = val; }
-    void SetLParam(int val)               { m_lParam = val; }
-    void SetListType(int val)             { m_listType = val; }
-    void SetX(int val)                    { m_x = val; }
-    void SetY(int val)                    { m_y = val; }
-    void SetToken(int val)                { m_token = val; }
-    void SetAnnotationLinesAdded(int val) { m_annotationLinesAdded = val; }
-    void SetUpdated(int val)              { m_updated = val; }
-#ifdef  STC_USE_DND
-    void SetDragText(const wxString& val) { m_dragText = val; }
-    void SetDragFlags(int flags)          { m_dragFlags = flags; }
-    void SetDragResult(wxDragResult val)  { m_dragResult = val; }
-
-    // This method is kept mainly for backwards compatibility, use
-    // SetDragFlags() in the new code.
-    void SetDragAllowMove(bool allow)
-    {
-        if ( allow )
-            m_dragFlags |= wxDrag_AllowMove;
-        else
-            m_dragFlags &= ~(wxDrag_AllowMove | wxDrag_DefaultMove);
-    }
-#endif
-
-    int  GetPosition() const         { return m_position; }
-    int  GetKey()  const             { return m_key; }
-    int  GetModifiers() const        { return m_modifiers; }
-    int  GetModificationType() const { return m_modificationType; }
-    wxString GetText() const         { return m_text; }
-    int  GetLength() const           { return m_length; }
-    int  GetLinesAdded() const       { return m_linesAdded; }
-    int  GetLine() const             { return m_line; }
-    int  GetFoldLevelNow() const     { return m_foldLevelNow; }
-    int  GetFoldLevelPrev() const    { return m_foldLevelPrev; }
-    int  GetMargin() const           { return m_margin; }
-    int  GetMessage() const          { return m_message; }
-    int  GetWParam() const           { return m_wParam; }
-    int  GetLParam() const           { return m_lParam; }
-    int  GetListType() const         { return m_listType; }
-    int  GetX() const                { return m_x; }
-    int  GetY() const                { return m_y; }
-    int  GetToken() const                 { return m_token; }
-    int  GetAnnotationsLinesAdded() const { return m_annotationLinesAdded; }
-    int  GetUpdated() const               { return m_updated; }
-    
-#ifdef STC_USE_DND
-    wxString GetDragText()           { return m_dragText; }
-    int GetDragFlags()               { return m_dragFlags; }
-    wxDragResult GetDragResult()     { return m_dragResult; }
-
-    bool GetDragAllowMove() { return (GetDragFlags() & wxDrag_AllowMove) != 0; }
-#endif
-
-    bool GetShift() const;
-    bool GetControl() const;
-    bool GetAlt() const;
-
-    virtual wxEvent* Clone() const { return new wxStyledTextEvent(*this); }
-
-#ifndef SWIG
-private:
-    DECLARE_DYNAMIC_CLASS(wxStyledTextEvent)
-
-    int  m_position;
-    int  m_key;
-    int  m_modifiers;
-
-    int  m_modificationType;    // wxEVT_STC_MODIFIED
-    wxString m_text;
-    int  m_length;
-    int  m_linesAdded;
-    int  m_line;
-    int  m_foldLevelNow;
-    int  m_foldLevelPrev;
-
-    int  m_margin;              // wxEVT_STC_MARGINCLICK
-
-    int  m_message;             // wxEVT_STC_MACRORECORD
-    int  m_wParam;
-    int  m_lParam;
-
-    int m_listType;
-    int m_x;
-    int m_y;
-
-    int m_token;                // wxEVT_STC__MODIFIED with SC_MOD_CONTAINER 
-    int m_annotationLinesAdded; // wxEVT_STC_MODIFIED with SC_MOD_CHANGEANNOTATION 
-    int m_updated;              // wxEVT_STC_UPDATEUI
-
-
-#if wxUSE_DRAG_AND_DROP
-    wxString m_dragText;        // wxEVT_STC_START_DRAG, wxEVT_STC_DO_DROP
-    int      m_dragFlags;       // wxEVT_STC_START_DRAG
-    wxDragResult m_dragResult;  // wxEVT_STC_DRAG_OVER,wxEVT_STC_DO_DROP
-#endif
-#endif
-};
-
-
-
-#ifndef SWIG
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_CHANGE, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_STYLENEEDED, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_CHARADDED, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_SAVEPOINTREACHED, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_SAVEPOINTLEFT, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_ROMODIFYATTEMPT, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_KEY, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_DOUBLECLICK, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_UPDATEUI, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_MODIFIED, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_MACRORECORD, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_MARGINCLICK, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_NEEDSHOWN, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_PAINTED, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_USERLISTSELECTION, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_URIDROPPED, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_DWELLSTART, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_DWELLEND, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_START_DRAG, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_DRAG_OVER, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_DO_DROP, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_ZOOM, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_CLICK, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_DCLICK, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_CALLTIP_CLICK, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_SELECTION, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_INDICATOR_CLICK, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_INDICATOR_RELEASE, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_CANCELLED, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_AUTOCOMP_CHAR_DELETED, wxStyledTextEvent );
-wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_STC, wxEVT_STC_HOTSPOT_RELEASE_CLICK, wxStyledTextEvent );
-#else
-    enum {
-        wxEVT_STC_CHANGE,
-        wxEVT_STC_STYLENEEDED,
-        wxEVT_STC_CHARADDED,
-        wxEVT_STC_SAVEPOINTREACHED,
-        wxEVT_STC_SAVEPOINTLEFT,
-        wxEVT_STC_ROMODIFYATTEMPT,
-        wxEVT_STC_KEY,
-        wxEVT_STC_DOUBLECLICK,
-        wxEVT_STC_UPDATEUI,
-        wxEVT_STC_MODIFIED,
-        wxEVT_STC_MACRORECORD,
-        wxEVT_STC_MARGINCLICK,
-        wxEVT_STC_NEEDSHOWN,
-        wxEVT_STC_PAINTED,
-        wxEVT_STC_USERLISTSELECTION,
-        wxEVT_STC_URIDROPPED,
-        wxEVT_STC_DWELLSTART,
-        wxEVT_STC_DWELLEND,
-        wxEVT_STC_START_DRAG,
-        wxEVT_STC_DRAG_OVER,
-        wxEVT_STC_DO_DROP,
-        wxEVT_STC_ZOOM,
-        wxEVT_STC_HOTSPOT_CLICK,
-        wxEVT_STC_HOTSPOT_DCLICK,
-        wxEVT_STC_CALLTIP_CLICK,
-        wxEVT_STC_AUTOCOMP_SELECTION,
-        wxEVT_STC_INDICATOR_CLICK,
-        wxEVT_STC_INDICATOR_RELEASE,
-        wxEVT_STC_AUTOCOMP_CANCELLED,
-        wxEVT_STC_AUTOCOMP_CHAR_DELETED,
-        wxEVT_STC_HOTSPOT_RELEASE_CLICK
-    };
-#endif
-
-
-
-#ifndef SWIG
-typedef void (wxEvtHandler::*wxStyledTextEventFunction)(wxStyledTextEvent&);
-
-#define wxStyledTextEventHandler( func ) \
-    wxEVENT_HANDLER_CAST( wxStyledTextEventFunction, func )
-
-#define EVT_STC_CHANGE(id, fn)             wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHANGE,                id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_STYLENEEDED(id, fn)        wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_STYLENEEDED,           id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_CHARADDED(id, fn)          wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CHARADDED,             id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_SAVEPOINTREACHED(id, fn)   wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTREACHED,      id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_SAVEPOINTLEFT(id, fn)      wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_SAVEPOINTLEFT,         id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_ROMODIFYATTEMPT(id, fn)    wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ROMODIFYATTEMPT,       id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_KEY(id, fn)                wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_KEY,                   id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_DOUBLECLICK(id, fn)        wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DOUBLECLICK,           id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_UPDATEUI(id, fn)           wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_UPDATEUI,              id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_MODIFIED(id, fn)           wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MODIFIED,              id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_MACRORECORD(id, fn)        wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MACRORECORD,           id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_MARGINCLICK(id, fn)        wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_MARGINCLICK,           id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_NEEDSHOWN(id, fn)          wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_NEEDSHOWN,             id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_PAINTED(id, fn)            wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_PAINTED,               id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_USERLISTSELECTION(id, fn)  wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_USERLISTSELECTION,     id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_URIDROPPED(id, fn)         wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_URIDROPPED,            id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_DWELLSTART(id, fn)         wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLSTART,            id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_DWELLEND(id, fn)           wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DWELLEND,              id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_START_DRAG(id, fn)         wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_START_DRAG,            id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_DRAG_OVER(id, fn)          wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DRAG_OVER,             id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_DO_DROP(id, fn)            wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_DO_DROP,               id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_ZOOM(id, fn)               wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_ZOOM,                  id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_HOTSPOT_CLICK(id, fn)      wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_CLICK,         id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_HOTSPOT_DCLICK(id, fn)     wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_DCLICK,        id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_CALLTIP_CLICK(id, fn)      wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_CALLTIP_CLICK,         id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_AUTOCOMP_SELECTION(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_SELECTION,    id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_INDICATOR_CLICK(id, fn)    wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_INDICATOR_CLICK,       id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_INDICATOR_RELEASE(id, fn)  wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_INDICATOR_RELEASE,     id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_AUTOCOMP_CANCELLED(id, fn)    wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_CANCELLED,    id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_AUTOCOMP_CHAR_DELETED(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_AUTOCOMP_CHAR_DELETED, id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-#define EVT_STC_HOTSPOT_RELEASE_CLICK(id, fn) wxDECLARE_EVENT_TABLE_ENTRY( wxEVT_STC_HOTSPOT_RELEASE_CLICK, id, wxID_ANY, wxStyledTextEventHandler( fn ), (wxObject *) NULL ),
-
-#endif
-
-#endif // wxUSE_STC
-
-#endif // _WX_STC_STC_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/anybutton.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/anybutton.h
deleted file mode 100644
index d519e6a468..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/anybutton.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/anybutton.h
-// Purpose:     wxAnyButton class
-// Author:      Vadim Zeitlin
-// Created:     2000-08-15 (extracted from button.h)
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_ANYBUTTON_H_
-#define _WX_UNIV_ANYBUTTON_H_
-
-// ----------------------------------------------------------------------------
-// Common button functionality
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxAnyButton : public wxAnyButtonBase
-{
-public:
-    wxAnyButton() {}
-
-    virtual ~wxAnyButton() {}
-
-protected:
-    // choose the default border for this window
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_STATIC; }
-
-private:
-    wxDECLARE_NO_COPY_CLASS(wxAnyButton);
-};
-
-#endif // _WX_UNIV_ANYBUTTON_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/app.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/app.h
deleted file mode 100644
index 2d946d54e2..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/app.h
+++ /dev/null
@@ -1,20 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/app.h
-// Purpose:     wxUniversalApp class extends wxApp for wxUniv port
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     06.08.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_APP_H_
-#define _WX_UNIX_APP_H_
-
-class WXDLLIMPEXP_CORE wxUniversalApp : public wxApp
-{
-public:
-};
-
-#endif // _WX_UNIX_APP_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/bmpbuttn.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/bmpbuttn.h
deleted file mode 100644
index 832f199b1a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/bmpbuttn.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/bmpbuttn.h
-// Purpose:     wxBitmapButton class for wxUniversal
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     25.08.00
-// Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_BMPBUTTN_H_
-#define _WX_UNIV_BMPBUTTN_H_
-
-class WXDLLIMPEXP_CORE wxBitmapButton : public wxBitmapButtonBase
-{
-public:
-    wxBitmapButton() { }
-
-    wxBitmapButton(wxWindow *parent,
-                   wxWindowID id,
-                   const wxBitmap& bitmap,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = 0,
-                   const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxButtonNameStr)
-    {
-        Create(parent, id, bitmap, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxBitmap& bitmap,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr);
-
-    virtual void SetMargins(int x, int y)
-    {
-        SetBitmapMargins(x, y);
-
-        wxBitmapButtonBase::SetMargins(x, y);
-    }
-
-    virtual bool Enable(bool enable = true);
-
-    virtual bool SetCurrent(bool doit = true);
-
-    virtual void Press();
-    virtual void Release();
-
-protected:
-    void OnSetFocus(wxFocusEvent& event);
-    void OnKillFocus(wxFocusEvent& event);
-
-    // called when one of the bitmap is changed by user
-    virtual void OnSetBitmap();
-
-    // set bitmap to the given one if it's ok or to the normal bitmap and
-    // return true if the bitmap really changed
-    bool ChangeBitmap(const wxBitmap& bmp);
-
-private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxBitmapButton)
-};
-
-#endif // _WX_UNIV_BMPBUTTN_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/button.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/button.h
deleted file mode 100644
index 56e66c5db5..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/button.h
+++ /dev/null
@@ -1,139 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/button.h
-// Purpose:     wxButton for wxUniversal
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     15.08.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_BUTTON_H_
-#define _WX_UNIV_BUTTON_H_
-
-class WXDLLIMPEXP_FWD_CORE wxInputHandler;
-
-#include "wx/bitmap.h"
-
-// ----------------------------------------------------------------------------
-// the actions supported by this control
-// ----------------------------------------------------------------------------
-
-#define wxACTION_BUTTON_TOGGLE  wxT("toggle")    // press/release the button
-#define wxACTION_BUTTON_PRESS   wxT("press")     // press the button
-#define wxACTION_BUTTON_RELEASE wxT("release")   // release the button
-#define wxACTION_BUTTON_CLICK   wxT("click")     // generate button click event
-
-// ----------------------------------------------------------------------------
-// wxButton: a push button
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxButton : public wxButtonBase
-{
-public:
-    wxButton() { Init(); }
-    wxButton(wxWindow *parent,
-             wxWindowID id,
-             const wxBitmap& bitmap,
-             const wxString& label = wxEmptyString,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = 0,
-             const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxButtonNameStr)
-    {
-        Init();
-
-        Create(parent, id, bitmap, label, pos, size, style, validator, name);
-    }
-
-    wxButton(wxWindow *parent,
-             wxWindowID id,
-             const wxString& label = wxEmptyString,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = 0,
-             const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxButtonNameStr)
-    {
-        Init();
-
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& label = wxEmptyString,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr)
-    {
-        return Create(parent, id, wxNullBitmap, label,
-                      pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxBitmap& bitmap,
-                const wxString& label = wxEmptyString,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxButtonNameStr);
-
-    virtual ~wxButton();
-
-    virtual wxWindow *SetDefault();
-
-    virtual bool IsPressed() const { return m_isPressed; }
-    virtual bool IsDefault() const { return m_isDefault; }
-
-    // wxButton actions
-    virtual void Toggle();
-    virtual void Press();
-    virtual void Release();
-    virtual void Click();
-
-    virtual bool PerformAction(const wxControlAction& action,
-                               long numArg = -1,
-                               const wxString& strArg = wxEmptyString);
-
-    virtual bool CanBeHighlighted() const { return true; }
-
-    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
-    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
-    {
-        return GetStdInputHandler(handlerDef);
-    }
-
-
-protected:
-    virtual wxSize DoGetBestClientSize() const;
-
-    virtual bool DoDrawBackground(wxDC& dc);
-    virtual void DoDraw(wxControlRenderer *renderer);
-
-    virtual void DoSetBitmap(const wxBitmap& bitmap, State which);
-    virtual void DoSetBitmapMargins(wxCoord x, wxCoord y);
-
-    // common part of all ctors
-    void Init();
-
-    // current state
-    bool m_isPressed,
-         m_isDefault;
-
-    // the (optional) image to show and the margins around it
-    wxBitmap m_bitmap;
-    wxCoord  m_marginBmpX,
-             m_marginBmpY;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxButton)
-};
-
-#endif // _WX_UNIV_BUTTON_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/checkbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/checkbox.h
deleted file mode 100644
index b10fa93712..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/checkbox.h
+++ /dev/null
@@ -1,149 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/checkbox.h
-// Purpose:     wxCheckBox declaration
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     07.09.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_CHECKBOX_H_
-#define _WX_UNIV_CHECKBOX_H_
-
-#include "wx/button.h" // for wxStdButtonInputHandler
-
-// ----------------------------------------------------------------------------
-// the actions supported by wxCheckBox
-// ----------------------------------------------------------------------------
-
-#define wxACTION_CHECKBOX_CHECK   wxT("check")   // SetValue(true)
-#define wxACTION_CHECKBOX_CLEAR   wxT("clear")   // SetValue(false)
-#define wxACTION_CHECKBOX_TOGGLE  wxT("toggle")  // toggle the check state
-
-// additionally it accepts wxACTION_BUTTON_PRESS and RELEASE
-
-// ----------------------------------------------------------------------------
-// wxCheckBox
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxCheckBox : public wxCheckBoxBase
-{
-public:
-    // checkbox constants
-    enum State
-    {
-        State_Normal,
-        State_Pressed,
-        State_Disabled,
-        State_Current,
-        State_Max
-    };
-
-    enum Status
-    {
-        Status_Checked,
-        Status_Unchecked,
-        Status_3rdState,
-        Status_Max
-    };
-
-    // constructors
-    wxCheckBox() { Init(); }
-
-    wxCheckBox(wxWindow *parent,
-               wxWindowID id,
-               const wxString& label,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxCheckBoxNameStr)
-    {
-        Init();
-
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& label,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxCheckBoxNameStr);
-
-    // implement the checkbox interface
-    virtual void SetValue(bool value);
-    virtual bool GetValue() const;
-
-    // set/get the bitmaps to use for the checkbox indicator
-    void SetBitmap(const wxBitmap& bmp, State state, Status status);
-    virtual wxBitmap GetBitmap(State state, Status status) const;
-
-    // wxCheckBox actions
-    void Toggle();
-    virtual void Press();
-    virtual void Release();
-    virtual void ChangeValue(bool value);
-
-    // overridden base class virtuals
-    virtual bool IsPressed() const { return m_isPressed; }
-
-    virtual bool PerformAction(const wxControlAction& action,
-                               long numArg = -1,
-                               const wxString& strArg = wxEmptyString);
-
-    virtual bool CanBeHighlighted() const { return true; }
-    virtual wxInputHandler *CreateStdInputHandler(wxInputHandler *handlerDef);
-    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
-    {
-        return CreateStdInputHandler(handlerDef);
-    }
-
-protected:
-    virtual void DoSet3StateValue(wxCheckBoxState WXUNUSED(state));
-    virtual wxCheckBoxState DoGet3StateValue() const;
-
-    virtual void DoDraw(wxControlRenderer *renderer);
-    virtual wxSize DoGetBestClientSize() const;
-
-    // get the size of the bitmap using either the current one or the default
-    // one (query renderer then)
-    virtual wxSize GetBitmapSize() const;
-
-    // common part of all ctors
-    void Init();
-
-    // send command event notifying about the checkbox state change
-    virtual void SendEvent();
-
-    // called when the checkbox becomes checked - radio button hook
-    virtual void OnCheck();
-
-    // get the state corresponding to the flags (combination of wxCONTROL_XXX)
-    wxCheckBox::State GetState(int flags) const;
-
-    // directly access the bitmaps array without trying to find a valid bitmap
-    // to use as GetBitmap() does
-    wxBitmap DoGetBitmap(State state, Status status) const
-        { return m_bitmaps[state][status]; }
-
-    // get the current status
-    Status GetStatus() const { return m_status; }
-
-private:
-    // the current check status
-    Status m_status;
-
-    // the bitmaps to use for the different states
-    wxBitmap m_bitmaps[State_Max][Status_Max];
-
-    // is the checkbox currently pressed?
-    bool m_isPressed;
-
-    DECLARE_DYNAMIC_CLASS(wxCheckBox)
-};
-
-#endif // _WX_UNIV_CHECKBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/checklst.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/checklst.h
deleted file mode 100644
index 68030084d9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/checklst.h
+++ /dev/null
@@ -1,110 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/checklst.h
-// Purpose:     wxCheckListBox class for wxUniversal
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     12.09.00
-// Copyright:   (c) Vadim Zeitlin
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_CHECKLST_H_
-#define _WX_UNIV_CHECKLST_H_
-
-// ----------------------------------------------------------------------------
-// actions
-// ----------------------------------------------------------------------------
-
-#define wxACTION_CHECKLISTBOX_TOGGLE wxT("toggle")
-
-// ----------------------------------------------------------------------------
-// wxCheckListBox
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase
-{
-public:
-    // ctors
-    wxCheckListBox() { Init(); }
-
-    wxCheckListBox(wxWindow *parent,
-                   wxWindowID id,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   int nStrings = 0,
-                   const wxString choices[] = NULL,
-                   long style = 0,
-                   const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxListBoxNameStr)
-    {
-        Init();
-
-        Create(parent, id, pos, size, nStrings, choices, style, validator, name);
-    }
-    wxCheckListBox(wxWindow *parent,
-                   wxWindowID id,
-                   const wxPoint& pos,
-                   const wxSize& size,
-                   const wxArrayString& choices,
-                   long style = 0,
-                   const wxValidator& validator = wxDefaultValidator,
-                   const wxString& name = wxListBoxNameStr);
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                int nStrings = 0,
-                const wxString choices[] = (const wxString *) NULL,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos,
-                const wxSize& size,
-                const wxArrayString& choices,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
-
-    // implement check list box methods
-    virtual bool IsChecked(unsigned int item) const;
-    virtual void Check(unsigned int item, bool check = true);
-
-    // and input handling
-    virtual bool PerformAction(const wxControlAction& action,
-                               long numArg = -1l,
-                               const wxString& strArg = wxEmptyString);
-
-    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
-    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
-    {
-        return GetStdInputHandler(handlerDef);
-    }
-
-protected:
-    // override all methods which add/delete items to update m_checks array as
-    // well
-    virtual void OnItemInserted(unsigned int pos);
-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual void DoClear();
-
-    // draw the check items instead of the usual ones
-    virtual void DoDrawRange(wxControlRenderer *renderer,
-                             int itemFirst, int itemLast);
-
-    // take them also into account for size calculation
-    virtual wxSize DoGetBestClientSize() const;
-
-    // common part of all ctors
-    void Init();
-
-private:
-    // the array containing the checked status of the items
-    wxArrayInt m_checks;
-
-    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
-};
-
-#endif // _WX_UNIV_CHECKLST_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/chkconf.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/chkconf.h
deleted file mode 100644
index 45667dc31e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/chkconf.h
+++ /dev/null
@@ -1,127 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/chkconf.h
-// Purpose:     wxUniversal-specific configuration options checks
-// Author:      Vadim Zeitlin
-// Created:     2006-09-28 (extracted from wx/chkconf.h)
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_CHKCONF_H_
-#define _WX_UNIV_CHKCONF_H_
-
-#if wxUSE_OWNER_DRAWN
-    /*
-        It is not clear if owner-drawn code makes much sense for wxUniv in the
-        first place but in any case it doesn't link currently (at least under
-        wxMSW but probably elsewhere too) as there is no wxUniv-specific
-        wxOwnerDrawnBase implementation so disable it for now.
-    */
-    #undef wxUSE_OWNER_DRAWN
-    #define wxUSE_OWNER_DRAWN 0
-#endif /* wxUSE_OWNER_DRAWN */
-
-#if (wxUSE_COMBOBOX || wxUSE_MENUS) && !wxUSE_POPUPWIN
-#    ifdef wxABORT_ON_CONFIG_ERROR
-#        error "wxUSE_POPUPWIN must be defined to use comboboxes/menus"
-#    else
-#        undef wxUSE_POPUPWIN
-#        define wxUSE_POPUPWIN 1
-#    endif
-#endif
-
-#if wxUSE_COMBOBOX
-#   if !wxUSE_LISTBOX
-#        ifdef wxABORT_ON_CONFIG_ERROR
-#            error "wxComboBox requires wxListBox in wxUniversal"
-#        else
-#            undef wxUSE_LISTBOX
-#            define wxUSE_LISTBOX 1
-#        endif
-#   endif
-#endif /* wxUSE_COMBOBOX */
-
-#if wxUSE_RADIOBTN
-#   if !wxUSE_CHECKBOX
-#        ifdef wxABORT_ON_CONFIG_ERROR
-#            error "wxUSE_RADIOBTN requires wxUSE_CHECKBOX in wxUniversal"
-#        else
-#            undef wxUSE_CHECKBOX
-#            define wxUSE_CHECKBOX 1
-#        endif
-#   endif
-#endif /* wxUSE_RADIOBTN */
-
-#if wxUSE_TEXTCTRL
-#    if !wxUSE_CARET
-#        ifdef wxABORT_ON_CONFIG_ERROR
-#            error "wxTextCtrl requires wxCaret in wxUniversal"
-#        else
-#            undef wxUSE_CARET
-#            define wxUSE_CARET 1
-#        endif
-#    endif /* wxUSE_CARET */
-
-#    if !wxUSE_SCROLLBAR
-#        ifdef wxABORT_ON_CONFIG_ERROR
-#            error "wxTextCtrl requires wxScrollBar in wxUniversal"
-#        else
-#            undef wxUSE_SCROLLBAR
-#            define wxUSE_SCROLLBAR 1
-#        endif
-#    endif /* wxUSE_SCROLLBAR */
-#endif /* wxUSE_TEXTCTRL */
-
-
-/* Themes checks */
-#ifndef wxUSE_ALL_THEMES
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_ALL_THEMES must be defined"
-#   else
-#       define wxUSE_ALL_THEMES 1
-#   endif
-#endif /* wxUSE_ALL_THEMES */
-
-#ifndef wxUSE_THEME_GTK
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_THEME_GTK must be defined"
-#   else
-#       define wxUSE_THEME_GTK 1
-#   endif
-#endif /* wxUSE_THEME_GTK */
-
-#ifndef wxUSE_THEME_METAL
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_THEME_METAL must be defined"
-#   else
-#       define wxUSE_THEME_METAL 1
-#   endif
-#endif /* wxUSE_THEME_METAL */
-
-#ifndef wxUSE_THEME_MONO
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_THEME_MONO must be defined"
-#   else
-#       define wxUSE_THEME_MONO 1
-#   endif
-#endif /* wxUSE_THEME_MONO */
-
-#ifndef wxUSE_THEME_WIN32
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxUSE_THEME_WIN32 must be defined"
-#   else
-#       define wxUSE_THEME_WIN32 1
-#   endif
-#endif /* wxUSE_THEME_WIN32 */
-
-#if !wxUSE_ALL_THEMES && wxUSE_THEME_METAL && !wxUSE_THEME_WIN32
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "Metal theme requires Win32 one"
-#   else
-#       undef wxUSE_THEME_WIN32
-#       define wxUSE_THEME_WIN32 1
-#   endif
-#endif /* wxUSE_THEME_METAL && !wxUSE_THEME_WIN32 */
-
-#endif /* _WX_UNIV_CHKCONF_H_ */
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/choice.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/choice.h
deleted file mode 100644
index 3578198331..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/choice.h
+++ /dev/null
@@ -1,63 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/choice.h
-// Purpose:     the universal choice
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     30.08.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_CHOICE_H_
-#define _WX_UNIV_CHOICE_H_
-
-#include "wx/combobox.h"
-
-// VS: This is only a *temporary* implementation, real wxChoice should not
-//     derive from wxComboBox and may have different l&f
-class WXDLLIMPEXP_CORE wxChoice : public wxComboBox
-{
-public:
-    wxChoice() {}
-    wxChoice(wxWindow *parent, wxWindowID id,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            int n = 0, const wxString choices[] = (const wxString *) NULL,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr)
-    {
-        Create(parent, id, pos, size, n, choices, style, validator, name);
-    }
-    wxChoice(wxWindow *parent, wxWindowID id,
-            const wxPoint& pos,
-            const wxSize& size,
-            const wxArrayString& choices,
-            long style = 0,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxChoiceNameStr);
-
-    bool Create(wxWindow *parent, wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                int n = 0, const wxString choices[] = NULL,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxChoiceNameStr);
-    bool Create(wxWindow *parent, wxWindowID id,
-                const wxPoint& pos,
-                const wxSize& size,
-                const wxArrayString& choices,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxChoiceNameStr);
-
-private:
-    void OnComboBox(wxCommandEvent &event);
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxChoice)
-};
-
-
-#endif // _WX_UNIV_CHOICE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/colschem.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/colschem.h
deleted file mode 100644
index 5c5ea7c73f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/colschem.h
+++ /dev/null
@@ -1,102 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/colschem.h
-// Purpose:     wxColourScheme class provides the colours to use for drawing
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     19.08.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_COLSCHEM_H_
-#define _WX_UNIV_COLSCHEM_H_
-
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-
-#include "wx/colour.h"
-#include "wx/checkbox.h"
-
-// ----------------------------------------------------------------------------
-// wxColourScheme
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxColourScheme
-{
-public:
-    // the standard colours
-    enum StdColour
-    {
-        // the background colour for a window
-        WINDOW,
-
-        // the different background and text colours for the control
-        CONTROL,
-        CONTROL_PRESSED,
-        CONTROL_CURRENT,
-
-        // the label text for the normal and the disabled state
-        CONTROL_TEXT,
-        CONTROL_TEXT_DISABLED,
-        CONTROL_TEXT_DISABLED_SHADOW,
-
-        // the scrollbar background colour for the normal and pressed states
-        SCROLLBAR,
-        SCROLLBAR_PRESSED,
-
-        // the background and text colour for the highlighted item
-        HIGHLIGHT,
-        HIGHLIGHT_TEXT,
-
-        // these colours are used for drawing the shadows of 3D objects
-        SHADOW_DARK,
-        SHADOW_HIGHLIGHT,
-        SHADOW_IN,
-        SHADOW_OUT,
-
-        // the titlebar background colours for the normal and focused states
-        TITLEBAR,
-        TITLEBAR_ACTIVE,
-
-        // the titlebar text colours
-        TITLEBAR_TEXT,
-        TITLEBAR_ACTIVE_TEXT,
-
-        // the default gauge fill colour
-        GAUGE,
-
-        // desktop background colour (only used by framebuffer ports)
-        DESKTOP,
-
-        // wxFrame's background colour
-        FRAME,
-
-        MAX
-    };
-
-    // get a standard colour
-    virtual wxColour Get(StdColour col) const = 0;
-
-    // get the background colour for the given window
-    virtual wxColour GetBackground(wxWindow *win) const = 0;
-
-    // virtual dtor for any base class
-    virtual ~wxColourScheme() {}
-};
-
-// some people just can't spell it correctly :-)
-typedef wxColourScheme wxColorScheme;
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-// retrieve the default colour from the theme or the given scheme
-#define wxSCHEME_COLOUR(scheme, what) scheme->Get(wxColorScheme::what)
-#define wxTHEME_COLOUR(what) \
-    wxSCHEME_COLOUR(wxTheme::Get()->GetColourScheme(), what)
-
-// get the background colour for the window in the current theme
-#define wxTHEME_BG_COLOUR(win) \
-    wxTheme::Get()->GetColourScheme()->GetBackground(win)
-
-#endif // _WX_UNIV_COLSCHEM_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/combobox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/combobox.h
deleted file mode 100644
index 44b0406b2d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/combobox.h
+++ /dev/null
@@ -1,193 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/combobox.h
-// Purpose:     the universal combobox
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     30.08.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef _WX_UNIV_COMBOBOX_H_
-#define _WX_UNIV_COMBOBOX_H_
-
-#include "wx/combo.h"
-
-class WXDLLIMPEXP_FWD_CORE wxListBox;
-
-// ----------------------------------------------------------------------------
-// NB: some actions supported by this control are in wx/generic/combo.h
-// ----------------------------------------------------------------------------
-
-// choose the next/prev/specified (by numArg) item
-#define wxACTION_COMBOBOX_SELECT_NEXT wxT("next")
-#define wxACTION_COMBOBOX_SELECT_PREV wxT("prev")
-#define wxACTION_COMBOBOX_SELECT      wxT("select")
-
-
-// ----------------------------------------------------------------------------
-// wxComboBox: a combination of text control and a listbox
-// ----------------------------------------------------------------------------
-
-// NB: Normally we'd like wxComboBox to inherit from wxComboBoxBase, but here
-//     we can't really do that since both wxComboBoxBase and wxComboCtrl inherit
-//     from wxTextCtrl.
-class WXDLLIMPEXP_CORE wxComboBox :
-    public wxWindowWithItems<wxComboCtrl, wxItemContainer>
-{
-public:
-    // ctors and such
-    wxComboBox() { Init(); }
-
-    wxComboBox(wxWindow *parent,
-               wxWindowID id,
-               const wxString& value = wxEmptyString,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               int n = 0,
-               const wxString choices[] = (const wxString *) NULL,
-               long style = 0,
-               const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxComboBoxNameStr)
-    {
-        Init();
-
-        (void)Create(parent, id, value, pos, size, n, choices,
-                     style, validator, name);
-    }
-    wxComboBox(wxWindow *parent,
-               wxWindowID id,
-               const wxString& value,
-               const wxPoint& pos,
-               const wxSize& size,
-               const wxArrayString& choices,
-               long style = 0,
-               const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxComboBoxNameStr);
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& value = wxEmptyString,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                int n = 0,
-                const wxString choices[] = (const wxString *) NULL,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxComboBoxNameStr);
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& value,
-                const wxPoint& pos,
-                const wxSize& size,
-                const wxArrayString& choices,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxComboBoxNameStr);
-
-    virtual ~wxComboBox();
-
-    // the wxUniversal-specific methods
-    // --------------------------------
-
-    // implement the combobox interface
-
-    // wxTextCtrl methods
-    virtual wxString GetValue() const { return DoGetValue(); }
-    virtual void SetValue(const wxString& value);
-    virtual void WriteText(const wxString& value);
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
-    virtual void SetInsertionPoint(long pos);
-    virtual void SetInsertionPointEnd();
-    virtual long GetInsertionPoint() const;
-    virtual wxTextPos GetLastPosition() const;
-    virtual void Replace(long from, long to, const wxString& value);
-    virtual void Remove(long from, long to);
-    virtual void SetSelection(long from, long to);
-    virtual void GetSelection(long *from, long *to) const;
-    virtual void SetEditable(bool editable);
-    virtual bool IsEditable() const;
-
-    virtual void Undo();
-    virtual void Redo();
-    virtual void SelectAll();
-
-    virtual bool CanCopy() const;
-    virtual bool CanCut() const;
-    virtual bool CanPaste() const;
-    virtual bool CanUndo() const;
-    virtual bool CanRedo() const;
-
-    // override these methods to disambiguate between two base classes versions
-    virtual void Clear()
-    {
-        wxComboCtrl::Clear();
-        wxItemContainer::Clear();
-    }
-
-    // See wxComboBoxBase discussion of IsEmpty().
-    bool IsListEmpty() const { return wxItemContainer::IsEmpty(); }
-    bool IsTextEmpty() const { return wxTextEntry::IsEmpty(); }
-
-    // wxControlWithItems methods
-    virtual void DoClear();
-    virtual void DoDeleteOneItem(unsigned int n);
-    virtual unsigned int GetCount() const;
-    virtual wxString GetString(unsigned int n) const;
-    virtual void SetString(unsigned int n, const wxString& s);
-    virtual int FindString(const wxString& s, bool bCase = false) const;
-    virtual void SetSelection(int n);
-    virtual int GetSelection() const;
-    virtual wxString GetStringSelection() const;
-
-    // we have our own input handler and our own actions
-    // (but wxComboCtrl already handled Popup/Dismiss)
-    /*
-    virtual bool PerformAction(const wxControlAction& action,
-                               long numArg = 0l,
-                               const wxString& strArg = wxEmptyString);
-    */
-
-    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
-    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
-    {
-        return GetStdInputHandler(handlerDef);
-    }
-
-    // we delegate our client data handling to wxListBox which we use for the
-    // items, so override this and other methods dealing with the client data
-    virtual wxClientDataType GetClientDataType() const;
-    virtual void SetClientDataType(wxClientDataType clientDataItemsType);
-
-protected:
-    virtual wxString DoGetValue() const;
-
-    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
-                              unsigned int pos,
-                              void **clientData, wxClientDataType type);
-
-    virtual void DoSetItemClientData(unsigned int n, void* clientData);
-    virtual void* DoGetItemClientData(unsigned int n) const;
-
-
-    // common part of all ctors
-    void Init();
-
-    // get the associated listbox
-    wxListBox *GetLBox() const { return m_lbox; }
-
-private:
-    // implement wxTextEntry pure virtual method
-    virtual wxWindow *GetEditableWindow() { return this; }
-
-    // the popup listbox
-    wxListBox *m_lbox;
-
-    //DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxComboBox)
-};
-
-#endif // _WX_UNIV_COMBOBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/control.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/control.h
deleted file mode 100644
index 442946d048..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/control.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/control.h
-// Purpose:     universal wxControl: adds handling of mnemonics
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     14.08.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_CONTROL_H_
-#define _WX_UNIV_CONTROL_H_
-
-class WXDLLIMPEXP_FWD_CORE wxControlRenderer;
-class WXDLLIMPEXP_FWD_CORE wxInputHandler;
-class WXDLLIMPEXP_FWD_CORE wxRenderer;
-
-// we must include it as most/all control classes derive their handlers from
-// it
-#include "wx/univ/inphand.h"
-
-#include "wx/univ/inpcons.h"
-
-// ----------------------------------------------------------------------------
-// wxControlAction: the action is currently just a string which identifies it,
-// later it might become an atom (i.e. an opaque handler to string).
-// ----------------------------------------------------------------------------
-
-typedef wxString wxControlAction;
-
-// the list of actions which apply to all controls (other actions are defined
-// in the controls headers)
-
-#define wxACTION_NONE    wxT("")           // no action to perform
-
-// ----------------------------------------------------------------------------
-// wxControl: the base class for all GUI controls
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxControl : public wxControlBase, public wxInputConsumer
-{
-public:
-    wxControl() { Init(); }
-
-    wxControl(wxWindow *parent,
-              wxWindowID id,
-              const wxPoint& pos = wxDefaultPosition,
-              const wxSize& size = wxDefaultSize, long style = 0,
-              const wxValidator& validator = wxDefaultValidator,
-              const wxString& name = wxControlNameStr)
-    {
-        Init();
-
-        Create(parent, id, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize, long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxControlNameStr);
-
-    // this function will filter out '&' characters and will put the
-    // accelerator char (the one immediately after '&') into m_chAccel
-    virtual void SetLabel(const wxString& label);
-
-    // return the current label
-    virtual wxString GetLabel() const { return m_label; }
-
-    // wxUniversal-specific methods
-
-    // return the index of the accel char in the label or -1 if none
-    int GetAccelIndex() const { return m_indexAccel; }
-
-    // return the accel char itself or 0 if none
-    wxChar GetAccelChar() const
-    {
-        return m_indexAccel == -1 ? wxT('\0') : (wxChar)m_label[m_indexAccel];
-    }
-
-    virtual wxWindow *GetInputWindow() const { return (wxWindow*)this; }
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    // set m_label and m_indexAccel and refresh the control to show the new
-    // label (but, unlike SetLabel(), don't call the base class SetLabel() thus
-    // avoiding to change wxControlBase::m_labelOrig)
-    void UnivDoSetLabel(const wxString& label);
-
-private:
-    // label and accel info
-    wxString   m_label;
-    int        m_indexAccel;
-
-    DECLARE_DYNAMIC_CLASS(wxControl)
-    DECLARE_EVENT_TABLE()
-    WX_DECLARE_INPUT_CONSUMER()
-};
-
-#endif // _WX_UNIV_CONTROL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/custombgwin.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/custombgwin.h
deleted file mode 100644
index 61d236f7b6..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/custombgwin.h
+++ /dev/null
@@ -1,36 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/custombgwin.h
-// Purpose:     wxUniv implementation of wxCustomBackgroundWindow.
-// Author:      Vadim Zeitlin
-// Created:     2011-10-10
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_CUSTOMBGWIN_H_
-#define _WX_UNIV_CUSTOMBGWIN_H_
-
-// ----------------------------------------------------------------------------
-// wxCustomBackgroundWindow
-// ----------------------------------------------------------------------------
-
-template <class W>
-class wxCustomBackgroundWindow : public W,
-                                 public wxCustomBackgroundWindowBase
-{
-public:
-    typedef W BaseWindowClass;
-
-    wxCustomBackgroundWindow() { }
-
-protected:
-    virtual void DoSetBackgroundBitmap(const wxBitmap& bmp)
-    {
-        // We have support for background bitmap even at the base class level.
-        BaseWindowClass::SetBackground(bmp, wxALIGN_NOT, wxTILE);
-    }
-
-    wxDECLARE_NO_COPY_TEMPLATE_CLASS(wxCustomBackgroundWindow, W);
-};
-
-#endif // _WX_UNIV_CUSTOMBGWIN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/dialog.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/dialog.h
deleted file mode 100644
index d4f860b6fe..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/dialog.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/dialog.h
-// Purpose:     wxDialog class
-// Author:      Vaclav Slavik
-// Created:     2001/09/16
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_DIALOG_H_
-#define _WX_UNIV_DIALOG_H_
-
-extern WXDLLIMPEXP_DATA_CORE(const char) wxDialogNameStr[];
-class WXDLLIMPEXP_FWD_CORE wxWindowDisabler;
-class WXDLLIMPEXP_FWD_CORE wxEventLoop;
-
-// Dialog boxes
-class WXDLLIMPEXP_CORE wxDialog : public wxDialogBase
-{
-public:
-    wxDialog() { Init(); }
-
-    // Constructor with no modal flag - the new convention.
-    wxDialog(wxWindow *parent, wxWindowID id,
-             const wxString& title,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = wxDEFAULT_DIALOG_STYLE,
-             const wxString& name = wxDialogNameStr)
-    {
-        Init();
-        Create(parent, id, title, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent, wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_DIALOG_STYLE,
-                const wxString& name = wxDialogNameStr);
-
-    virtual ~wxDialog();
-
-    // is the dialog in modal state right now?
-    virtual bool IsModal() const;
-
-    // For now, same as Show(true) but returns return code
-    virtual int ShowModal();
-
-    // may be called to terminate the dialog with the given return code
-    virtual void EndModal(int retCode);
-
-    // returns true if we're in a modal loop
-    bool IsModalShowing() const;
-
-    virtual bool Show(bool show = true);
-
-    // implementation only from now on
-    // -------------------------------
-
-    // event handlers
-    void OnCloseWindow(wxCloseEvent& event);
-    void OnOK(wxCommandEvent& event);
-    void OnApply(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event);
-
-protected:
-    // common part of all ctors
-    void Init();
-
-private:
-    // while we are showing a modal dialog we disable the other windows using
-    // this object
-    wxWindowDisabler *m_windowDisabler;
-
-    // modal dialog runs its own event loop
-    wxEventLoop *m_eventLoop;
-
-    // is modal right now?
-    bool m_isShowingModal;
-
-    DECLARE_DYNAMIC_CLASS(wxDialog)
-    DECLARE_EVENT_TABLE()
-};
-
-#endif
-    // _WX_UNIV_DIALOG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/frame.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/frame.h
deleted file mode 100644
index 526640f4dc..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/frame.h
+++ /dev/null
@@ -1,88 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/frame.h
-// Purpose:     wxFrame class for wxUniversal
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     19.05.01
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_FRAME_H_
-#define _WX_UNIV_FRAME_H_
-
-// ----------------------------------------------------------------------------
-// wxFrame
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxFrame : public wxFrameBase
-{
-public:
-    wxFrame() {}
-    wxFrame(wxWindow *parent,
-            wxWindowID id,
-            const wxString& title,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxDEFAULT_FRAME_STYLE,
-            const wxString& name = wxFrameNameStr)
-    {
-        Create(parent, id, title, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
-
-    virtual wxPoint GetClientAreaOrigin() const;
-    virtual bool Enable(bool enable = true);
-
-#if wxUSE_STATUSBAR
-    virtual wxStatusBar* CreateStatusBar(int number = 1,
-                                         long style = wxSTB_DEFAULT_STYLE,
-                                         wxWindowID id = 0,
-                                         const wxString& name = wxStatusLineNameStr);
-#endif // wxUSE_STATUSBAR
-
-#if wxUSE_TOOLBAR
-    // create main toolbar bycalling OnCreateToolBar()
-    virtual wxToolBar* CreateToolBar(long style = -1,
-                                     wxWindowID id = wxID_ANY,
-                                     const wxString& name = wxToolBarNameStr);
-#endif // wxUSE_TOOLBAR
-
-    virtual wxSize GetMinSize() const;
-
-protected:
-    void OnSize(wxSizeEvent& event);
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-    virtual void DoGetClientSize(int *width, int *height) const;
-    virtual void DoSetClientSize(int width, int height);
-
-#if wxUSE_MENUS
-    // override to update menu bar position when the frame size changes
-    virtual void PositionMenuBar();
-    virtual void DetachMenuBar();
-    virtual void AttachMenuBar(wxMenuBar *menubar);
-#endif // wxUSE_MENUS
-
-#if wxUSE_STATUSBAR
-    // override to update statusbar position when the frame size changes
-    virtual void PositionStatusBar();
-#endif // wxUSE_MENUS
-
-protected:
-#if wxUSE_TOOLBAR
-    virtual void PositionToolBar();
-#endif // wxUSE_TOOLBAR
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxFrame)
-};
-
-#endif // _WX_UNIV_FRAME_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/gauge.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/gauge.h
deleted file mode 100644
index 4b88175f39..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/gauge.h
+++ /dev/null
@@ -1,74 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/gauge.h
-// Purpose:     wxUniversal wxGauge declaration
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     20.02.01
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_GAUGE_H_
-#define _WX_UNIV_GAUGE_H_
-
-// ----------------------------------------------------------------------------
-// wxGauge: a progress bar
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxGauge : public wxGaugeBase
-{
-public:
-    wxGauge() { Init(); }
-
-    wxGauge(wxWindow *parent,
-            wxWindowID id,
-            int range,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxGA_HORIZONTAL,
-            const wxValidator& validator = wxDefaultValidator,
-            const wxString& name = wxGaugeNameStr)
-    {
-        Init();
-
-        (void)Create(parent, id, range, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                int range,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxGA_HORIZONTAL,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxGaugeNameStr);
-
-    // implement base class virtuals
-    virtual void SetRange(int range);
-    virtual void SetValue(int pos);
-
-    // wxUniv-specific methods
-
-    // is it a smooth progress bar or a discrete one?
-    bool IsSmooth() const { return (GetWindowStyle() & wxGA_SMOOTH) != 0; }
-
-    // is it a vertica; progress bar or a horizontal one?
-    bool IsVertical() const { return (GetWindowStyle() & wxGA_VERTICAL) != 0; }
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    // return the def border for a progress bar
-    virtual wxBorder GetDefaultBorder() const;
-
-    // return the default size
-    virtual wxSize DoGetBestClientSize() const;
-
-    // draw the control
-    virtual void DoDraw(wxControlRenderer *renderer);
-
-    DECLARE_DYNAMIC_CLASS(wxGauge)
-};
-
-#endif // _WX_UNIV_GAUGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/inpcons.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/inpcons.h
deleted file mode 100644
index 033d17b0ce..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/inpcons.h
+++ /dev/null
@@ -1,152 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/inpcons.h
-// Purpose:     wxInputConsumer: mix-in class for input handling
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     14.08.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_INPCONS_H_
-#define _WX_UNIV_INPCONS_H_
-
-class WXDLLIMPEXP_FWD_CORE wxInputHandler;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-
-#include "wx/object.h"
-#include "wx/event.h"
-
-// ----------------------------------------------------------------------------
-// wxControlAction: the action is currently just a string which identifies it,
-// later it might become an atom (i.e. an opaque handler to string).
-// ----------------------------------------------------------------------------
-
-typedef wxString wxControlAction;
-
-// the list of actions which apply to all controls (other actions are defined
-// in the controls headers)
-
-#define wxACTION_NONE    wxT("")           // no action to perform
-
-// ----------------------------------------------------------------------------
-// wxInputConsumer: mix-in class for handling wxControlActions (used by
-// wxControl and wxTopLevelWindow).
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxInputConsumer
-{
-public:
-    wxInputConsumer() { m_inputHandler = NULL; }
-    virtual ~wxInputConsumer() { }
-
-    // get the input handler
-    wxInputHandler *GetInputHandler() const { return m_inputHandler; }
-
-    // perform a control-dependent action: an action may have an optional
-    // numeric and another (also optional) string argument whose interpretation
-    // depends on the action
-    //
-    // NB: we might use ellipsis in PerformAction() declaration but this
-    //     wouldn't be more efficient than always passing 2 unused parameters
-    //     but would be more difficult. Another solution would be to have
-    //     several overloaded versions but this will expose the problem of
-    //     virtual function hiding we don't have here.
-    virtual bool PerformAction(const wxControlAction& action,
-                               long numArg = -1l,
-                               const wxString& strArg = wxEmptyString);
-
-    // get the window to work with (usually the class wxInputConsumer was mixed into)
-    virtual wxWindow *GetInputWindow() const = 0;
-
-    // this function must be implemented in any classes process input (i.e. not
-    // static controls) to create the standard input handler for the concrete
-    // class deriving from this mix-in
-    //
-    // the parameter is the default input handler which should receive all
-    // unprocessed input (i.e. typically handlerDef is passed to
-    // wxStdInputHandler ctor) or it may be NULL
-    //
-    // the returned pointer will not be deleted by caller so it must either
-    // point to a static object or be deleted on program termination
-    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef);
-
-
-protected:
-    // event handlers
-    void OnMouse(wxMouseEvent& event);
-    void OnKeyDown(wxKeyEvent& event);
-    void OnKeyUp(wxKeyEvent& event);
-    void OnFocus(wxFocusEvent& event);
-    void OnActivate(wxActivateEvent& event);
-
-    // create input handler by name, fall back to GetStdInputHandler() if
-    // the current theme doesn't define any specific handler of this type
-    void CreateInputHandler(const wxString& inphandler);
-
-private:
-    // the input processor (we never delete it)
-    wxInputHandler *m_inputHandler;
-};
-
-
-// ----------------------------------------------------------------------------
-// macros which must be used by the classes derived from wxInputConsumer mix-in
-// ----------------------------------------------------------------------------
-
-// declare the methods to be forwarded
-#define WX_DECLARE_INPUT_CONSUMER() \
-private: \
-    void OnMouse(wxMouseEvent& event); \
-    void OnKeyDown(wxKeyEvent& event); \
-    void OnKeyUp(wxKeyEvent& event); \
-    void OnFocus(wxFocusEvent& event); \
-public: /* because of docview :-( */ \
-    void OnActivate(wxActivateEvent& event); \
-private:
-
-// implement the event table entries for wxControlContainer
-#define WX_EVENT_TABLE_INPUT_CONSUMER(classname) \
-    EVT_KEY_DOWN(classname::OnKeyDown) \
-    EVT_KEY_UP(classname::OnKeyUp) \
-    EVT_MOUSE_EVENTS(classname::OnMouse) \
-    EVT_SET_FOCUS(classname::OnFocus) \
-    EVT_KILL_FOCUS(classname::OnFocus) \
-    EVT_ACTIVATE(classname::OnActivate)
-
-// Forward event handlers to wxInputConsumer
-//
-// (We can't use them directly, because wxIC has virtual methods, which forces
-// the compiler to include (at least) two vtables into wxControl, one for the
-// wxWindow-wxControlBase-wxControl branch and one for the wxIC mix-in.
-// Consequently, the "this" pointer has different value when in wxControl's
-// and wxIC's method, even though the instance stays same. This doesn't matter
-// so far as member pointers aren't used, but that's not wxControl's case.
-// When we add an event table entry (= use a member pointer) pointing to
-// wxIC's OnXXX method, GCC compiles code that executes wxIC::OnXXX with the
-// version of "this" that belongs to wxControl, not wxIC! In our particular
-// case, the effect is that m_handler is NULL (probably same memory
-// area as the_other_vtable's_this->m_refObj) and input handling doesn't work.)
-#define WX_FORWARD_TO_INPUT_CONSUMER(classname) \
-    void classname::OnMouse(wxMouseEvent& event) \
-    { \
-        wxInputConsumer::OnMouse(event); \
-    } \
-    void classname::OnKeyDown(wxKeyEvent& event) \
-    { \
-        wxInputConsumer::OnKeyDown(event); \
-    } \
-    void classname::OnKeyUp(wxKeyEvent& event) \
-    { \
-        wxInputConsumer::OnKeyUp(event); \
-    } \
-    void classname::OnFocus(wxFocusEvent& event) \
-    { \
-        wxInputConsumer::OnFocus(event); \
-    } \
-    void classname::OnActivate(wxActivateEvent& event) \
-    { \
-        wxInputConsumer::OnActivate(event); \
-    }
-
-#endif // _WX_UNIV_INPCONS_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/inphand.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/inphand.h
deleted file mode 100644
index 00604afaa2..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/inphand.h
+++ /dev/null
@@ -1,115 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/inphand.h
-// Purpose:     wxInputHandler class maps the keyboard and mouse events to the
-//              actions which then are performed by the control
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     18.08.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_INPHAND_H_
-#define _WX_UNIV_INPHAND_H_
-
-#include "wx/univ/inpcons.h"         // for wxControlAction(s)
-
-// ----------------------------------------------------------------------------
-// types of the standard input handlers which can be passed to
-// wxTheme::GetInputHandler()
-// ----------------------------------------------------------------------------
-
-#define wxINP_HANDLER_DEFAULT           wxT("")
-#define wxINP_HANDLER_BUTTON            wxT("button")
-#define wxINP_HANDLER_CHECKBOX          wxT("checkbox")
-#define wxINP_HANDLER_CHECKLISTBOX      wxT("checklistbox")
-#define wxINP_HANDLER_COMBOBOX          wxT("combobox")
-#define wxINP_HANDLER_LISTBOX           wxT("listbox")
-#define wxINP_HANDLER_NOTEBOOK          wxT("notebook")
-#define wxINP_HANDLER_RADIOBTN          wxT("radiobtn")
-#define wxINP_HANDLER_SCROLLBAR         wxT("scrollbar")
-#define wxINP_HANDLER_SLIDER            wxT("slider")
-#define wxINP_HANDLER_SPINBTN           wxT("spinbtn")
-#define wxINP_HANDLER_STATUSBAR         wxT("statusbar")
-#define wxINP_HANDLER_TEXTCTRL          wxT("textctrl")
-#define wxINP_HANDLER_TOOLBAR           wxT("toolbar")
-#define wxINP_HANDLER_TOPLEVEL          wxT("toplevel")
-
-// ----------------------------------------------------------------------------
-// wxInputHandler: maps the events to the actions
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxInputHandler : public wxObject
-{
-public:
-    // map a keyboard event to one or more actions (pressed == true if the key
-    // was pressed, false if released), returns true if something was done
-    virtual bool HandleKey(wxInputConsumer *consumer,
-                           const wxKeyEvent& event,
-                           bool pressed) = 0;
-
-    // map a mouse (click) event to one or more actions
-    virtual bool HandleMouse(wxInputConsumer *consumer,
-                             const wxMouseEvent& event) = 0;
-
-    // handle mouse movement (or enter/leave) event: it is separated from
-    // HandleMouse() for convenience as many controls don't care about mouse
-    // movements at all
-    virtual bool HandleMouseMove(wxInputConsumer *consumer,
-                                 const wxMouseEvent& event);
-
-    // do something with focus set/kill event: this is different from
-    // HandleMouseMove() as the mouse maybe over the control without it having
-    // focus
-    //
-    // return true to refresh the control, false otherwise
-    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event);
-
-    // react to the app getting/losing activation
-    //
-    // return true to refresh the control, false otherwise
-    virtual bool HandleActivation(wxInputConsumer *consumer, bool activated);
-
-    // virtual dtor for any base class
-    virtual ~wxInputHandler();
-};
-
-// ----------------------------------------------------------------------------
-// wxStdInputHandler is just a base class for all other "standard" handlers
-// and also provides the way to chain input handlers together
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxStdInputHandler : public wxInputHandler
-{
-public:
-    wxStdInputHandler(wxInputHandler *handler) : m_handler(handler) { }
-
-    virtual bool HandleKey(wxInputConsumer *consumer,
-                           const wxKeyEvent& event,
-                           bool pressed)
-    {
-        return m_handler ? m_handler->HandleKey(consumer, event, pressed)
-                         : false;
-    }
-
-    virtual bool HandleMouse(wxInputConsumer *consumer,
-                             const wxMouseEvent& event)
-    {
-        return m_handler ? m_handler->HandleMouse(consumer, event) : false;
-    }
-
-    virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event)
-    {
-        return m_handler ? m_handler->HandleMouseMove(consumer, event) : false;
-    }
-
-    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event)
-    {
-        return m_handler ? m_handler->HandleFocus(consumer, event) : false;
-    }
-
-private:
-    wxInputHandler *m_handler;
-};
-
-#endif // _WX_UNIV_INPHAND_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/listbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/listbox.h
deleted file mode 100644
index 2a94ffae9d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/listbox.h
+++ /dev/null
@@ -1,304 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/listbox.h
-// Purpose:     the universal listbox
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     30.08.00
-// Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_LISTBOX_H_
-#define _WX_UNIV_LISTBOX_H_
-
-#include "wx/scrolwin.h"    // for wxScrollHelper
-#include "wx/dynarray.h"
-#include "wx/arrstr.h"
-
-// ----------------------------------------------------------------------------
-// the actions supported by this control
-// ----------------------------------------------------------------------------
-
-// change the current item
-#define wxACTION_LISTBOX_SETFOCUS   wxT("setfocus")  // select the item
-#define wxACTION_LISTBOX_MOVEDOWN   wxT("down")      // select item below
-#define wxACTION_LISTBOX_MOVEUP     wxT("up")        // select item above
-#define wxACTION_LISTBOX_PAGEDOWN   wxT("pagedown")  // go page down
-#define wxACTION_LISTBOX_PAGEUP     wxT("pageup")    // go page up
-#define wxACTION_LISTBOX_START      wxT("start")     // go to first item
-#define wxACTION_LISTBOX_END        wxT("end")       // go to last item
-#define wxACTION_LISTBOX_FIND       wxT("find")      // find item by 1st letter
-
-// do something with the current item
-#define wxACTION_LISTBOX_ACTIVATE   wxT("activate")  // activate (choose)
-#define wxACTION_LISTBOX_TOGGLE     wxT("toggle")    // togglee selected state
-#define wxACTION_LISTBOX_SELECT     wxT("select")    // sel this, unsel others
-#define wxACTION_LISTBOX_SELECTADD  wxT("selectadd") // add to selection
-#define wxACTION_LISTBOX_UNSELECT   wxT("unselect")  // unselect
-#define wxACTION_LISTBOX_ANCHOR     wxT("selanchor") // anchor selection
-
-// do something with the selection globally (not for single selection ones)
-#define wxACTION_LISTBOX_SELECTALL   wxT("selectall")   // select all items
-#define wxACTION_LISTBOX_UNSELECTALL wxT("unselectall") // unselect all items
-#define wxACTION_LISTBOX_SELTOGGLE   wxT("togglesel")   // invert the selection
-#define wxACTION_LISTBOX_EXTENDSEL   wxT("extend")      // extend to item
-
-// ----------------------------------------------------------------------------
-// wxListBox: a list of selectable items
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxListBox : public wxListBoxBase, public wxScrollHelper
-{
-public:
-    // ctors and such
-    wxListBox() : wxScrollHelper(this) { Init(); }
-    wxListBox(wxWindow *parent,
-              wxWindowID id,
-              const wxPoint& pos = wxDefaultPosition,
-              const wxSize& size = wxDefaultSize,
-              int n = 0, const wxString choices[] = (const wxString *) NULL,
-              long style = 0,
-              const wxValidator& validator = wxDefaultValidator,
-              const wxString& name = wxListBoxNameStr )
-        : wxScrollHelper(this)
-    {
-        Init();
-
-        Create(parent, id, pos, size, n, choices, style, validator, name);
-    }
-    wxListBox(wxWindow *parent,
-              wxWindowID id,
-              const wxPoint& pos,
-              const wxSize& size,
-              const wxArrayString& choices,
-              long style = 0,
-              const wxValidator& validator = wxDefaultValidator,
-              const wxString& name = wxListBoxNameStr );
-
-    virtual ~wxListBox();
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                int n = 0, const wxString choices[] = (const wxString *) NULL,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos,
-                const wxSize& size,
-                const wxArrayString& choices,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxListBoxNameStr);
-
-    // implement the listbox interface defined by wxListBoxBase
-    virtual void DoClear();
-    virtual void DoDeleteOneItem(unsigned int n);
-
-    virtual unsigned int GetCount() const;
-    virtual wxString GetString(unsigned int n) const;
-    virtual void SetString(unsigned int n, const wxString& s);
-    virtual int FindString(const wxString& s, bool bCase = false) const;
-
-    virtual bool IsSelected(int n) const
-        { return m_selections.Index(n) != wxNOT_FOUND; }
-    virtual int GetSelection() const;
-    virtual int GetSelections(wxArrayInt& aSelections) const;
-
-protected:
-    virtual void DoSetSelection(int n, bool select);
-
-    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
-                              unsigned int pos,
-                              void **clientData,
-                              wxClientDataType type);
-
-    // universal wxComboBox implementation internally uses wxListBox
-    friend class WXDLLIMPEXP_FWD_CORE wxComboBox;
-
-    virtual void DoSetFirstItem(int n);
-
-    virtual void DoSetItemClientData(unsigned int n, void* clientData);
-    virtual void* DoGetItemClientData(unsigned int n) const;
-
-public:
-    // override some more base class methods
-    virtual bool SetFont(const wxFont& font);
-
-    // the wxUniversal-specific methods
-    // --------------------------------
-
-    // the current item is the same as the selected one for wxLB_SINGLE
-    // listboxes but for the other ones it is just the focused item which may
-    // be selected or not
-    int GetCurrentItem() const { return m_current; }
-    void SetCurrentItem(int n);
-
-    // select the item which is diff items below the current one
-    void ChangeCurrent(int diff);
-
-    // activate (i.e. send a LISTBOX_DOUBLECLICKED message) the specified or
-    // current (if -1) item
-    void Activate(int item = -1);
-
-    // select or unselect the specified or current (if -1) item
-    void DoSelect(int item = -1, bool sel = true);
-
-    // more readable wrapper
-    void DoUnselect(int item) { DoSelect(item, false); }
-
-    // select an item and send a notification about it
-    void SelectAndNotify(int item);
-
-    // ensure that the given item is visible by scrolling it into view
-    virtual void EnsureVisible(int n);
-
-    // find the first item [strictly] after the current one which starts with
-    // the given string and make it the current one, return true if the current
-    // item changed
-    bool FindItem(const wxString& prefix, bool strictlyAfter = false);
-    bool FindNextItem(const wxString& prefix) { return FindItem(prefix, true); }
-
-    // extend the selection to span the range from the anchor (see below) to
-    // the specified or current item
-    void ExtendSelection(int itemTo = -1);
-
-    // make this item the new selection anchor: extending selection with
-    // ExtendSelection() will work with it
-    void AnchorSelection(int itemFrom) { m_selAnchor = itemFrom; }
-
-    // get, calculating it if necessary, the number of items per page, the
-    // height of each line and the max width of an item
-    int GetItemsPerPage() const;
-    wxCoord GetLineHeight() const;
-    wxCoord GetMaxWidth() const;
-
-    // override the wxControl virtual methods
-    virtual bool PerformAction(const wxControlAction& action,
-                               long numArg = 0l,
-                               const wxString& strArg = wxEmptyString);
-
-    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
-    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
-    {
-        return GetStdInputHandler(handlerDef);
-    }
-
-    // idle processing
-    virtual void OnInternalIdle();
-
-protected:
-    // geometry
-    virtual wxSize DoGetBestClientSize() const;
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-
-    virtual void DoDraw(wxControlRenderer *renderer);
-    virtual wxBorder GetDefaultBorder() const;
-
-    // special hook for wxCheckListBox which allows it to update its internal
-    // data when a new item is inserted into the listbox
-    virtual void OnItemInserted(unsigned int WXUNUSED(pos)) { }
-
-
-    // common part of all ctors
-    void Init();
-
-    // event handlers
-    void OnSize(wxSizeEvent& event);
-
-    // refresh the given item(s) or everything
-    void RefreshItems(int from, int count);
-    void RefreshItem(int n);
-    void RefreshFromItemToEnd(int n);
-    void RefreshAll();
-
-    // send an event of the given type (using m_current by default)
-    bool SendEvent(wxEventType type, int item = -1);
-
-    // calculate the number of items per page using our current size
-    void CalcItemsPerPage();
-
-    // can/should we have a horz scrollbar?
-    bool HasHorzScrollbar() const
-        { return (m_windowStyle & wxLB_HSCROLL) != 0; }
-
-    // redraw the items in the given range only: called from DoDraw()
-    virtual void DoDrawRange(wxControlRenderer *renderer,
-                             int itemFirst, int itemLast);
-
-    // update the scrollbars and then ensure that the item is visible
-    void DoEnsureVisible(int n);
-
-    // mark horz scrollbar for updating
-    void RefreshHorzScrollbar();
-
-    // update (show/hide/adjust) the scrollbars
-    void UpdateScrollbars();
-
-    // refresh the items specified by m_updateCount and m_updateFrom
-    void UpdateItems();
-
-    // the array containing all items (it is sorted if the listbox has
-    // wxLB_SORT style)
-    union
-    {
-        wxArrayString *unsorted;
-        wxSortedArrayString *sorted;
-    } m_strings;
-
-    // this array contains the indices of the selected items (for the single
-    // selection listboxes only the first element of it is used and contains
-    // the current selection)
-    wxArrayInt m_selections;
-
-    // and this one the client data (either void or wxClientData)
-    wxArrayPtrVoid m_itemsClientData;
-
-    // the current item
-    int m_current;
-
-private:
-    // the range of elements which must be updated: if m_updateCount is 0 no
-    // update is needed, if it is -1 everything must be updated, otherwise
-    // m_updateCount items starting from m_updateFrom have to be redrawn
-    int m_updateFrom,
-        m_updateCount;
-
-    // the height of one line in the listbox (all lines have the same height)
-    wxCoord m_lineHeight;
-
-    // the maximal width of a listbox item and the item which has it
-    wxCoord m_maxWidth;
-    int m_maxWidthItem;
-
-    // the extents of horz and vert scrollbars
-    int m_scrollRangeX,
-        m_scrollRangeY;
-
-    // the number of items per page
-    size_t m_itemsPerPage;
-
-    // if the number of items has changed we may need to show/hide the
-    // scrollbar
-    bool m_updateScrollbarX, m_updateScrollbarY,
-         m_showScrollbarX, m_showScrollbarY;
-
-    // if the current item has changed, we might need to scroll if it went out
-    // of the window
-    bool m_currentChanged;
-
-    // the anchor from which the selection is extended for the listboxes with
-    // wxLB_EXTENDED style - this is set to the last item which was selected
-    // by not extending the selection but by choosing it directly
-    int m_selAnchor;
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxListBox)
-};
-
-#endif // _WX_UNIV_LISTBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/menu.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/menu.h
deleted file mode 100644
index 4525825ec5..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/menu.h
+++ /dev/null
@@ -1,274 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/menu.h
-// Purpose:     wxMenu and wxMenuBar classes for wxUniversal
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     05.05.01
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_MENU_H_
-#define _WX_UNIV_MENU_H_
-
-#if wxUSE_ACCEL
-    #include "wx/accel.h"
-#endif // wxUSE_ACCEL
-
-#include "wx/dynarray.h"
-
-// fwd declarations
-class WXDLLIMPEXP_FWD_CORE wxMenuInfo;
-WX_DECLARE_EXPORTED_OBJARRAY(wxMenuInfo, wxMenuInfoArray);
-
-class WXDLLIMPEXP_FWD_CORE wxMenuGeometryInfo;
-class WXDLLIMPEXP_FWD_CORE wxPopupMenuWindow;
-class WXDLLIMPEXP_FWD_CORE wxRenderer;
-
-// ----------------------------------------------------------------------------
-// wxMenu
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMenu : public wxMenuBase
-{
-public:
-    // ctors and dtor
-    wxMenu(const wxString& title, long style = 0)
-        : wxMenuBase(title, style) { Init(); }
-
-    wxMenu(long style = 0) : wxMenuBase(style) { Init(); }
-
-    virtual ~wxMenu();
-
-    // called by wxMenuItem when an item of this menu changes
-    void RefreshItem(wxMenuItem *item);
-
-    // does the menu have any items?
-    bool IsEmpty() const { return !GetMenuItems().GetFirst(); }
-
-    // show this menu at the given position (in screen coords) and optionally
-    // select its first item
-    void Popup(const wxPoint& pos, const wxSize& size,
-               bool selectFirst = true);
-
-    // dismiss the menu
-    void Dismiss();
-
-    // override the base class methods to connect/disconnect event handlers
-    virtual void Attach(wxMenuBarBase *menubar);
-    virtual void Detach();
-
-    // implementation only from here
-
-    // do as if this item were clicked, return true if the resulting event was
-    // processed, false otherwise
-    bool ClickItem(wxMenuItem *item);
-
-    // process the key event, return true if done
-    bool ProcessKeyDown(int key);
-
-#if wxUSE_ACCEL
-    // find the item for the given accel and generate an event if found
-    bool ProcessAccelEvent(const wxKeyEvent& event);
-#endif // wxUSE_ACCEL
-
-protected:
-    // implement base class virtuals
-    virtual wxMenuItem* DoAppend(wxMenuItem *item);
-    virtual wxMenuItem* DoInsert(size_t pos, wxMenuItem *item);
-    virtual wxMenuItem* DoRemove(wxMenuItem *item);
-
-    // common part of DoAppend and DoInsert
-    void OnItemAdded(wxMenuItem *item);
-
-    // called by wxPopupMenuWindow when the window is hidden
-    void OnDismiss(bool dismissParent);
-
-    // return true if the menu is currently shown on screen
-    bool IsShown() const;
-
-    // get the menu geometry info
-    const wxMenuGeometryInfo& GetGeometryInfo() const;
-
-    // forget old menu geometry info
-    void InvalidateGeometryInfo();
-
-    // return either the menubar or the invoking window, normally never NULL
-    wxWindow *GetRootWindow() const;
-
-    // get the renderer we use for drawing: either the one of the menu bar or
-    // the one of the window if we're a popup menu
-    wxRenderer *GetRenderer() const;
-
-#if wxUSE_ACCEL
-    // add/remove accel for the given menu item
-    void AddAccelFor(wxMenuItem *item);
-    void RemoveAccelFor(wxMenuItem *item);
-#endif // wxUSE_ACCEL
-
-private:
-    // common part of all ctors
-    void Init();
-
-    // terminate the current radio group, if any
-    void EndRadioGroup();
-
-    // the exact menu geometry is defined by a struct derived from this one
-    // which is opaque and defined by the renderer
-    wxMenuGeometryInfo *m_geometry;
-
-    // the menu shown on screen or NULL if not currently shown
-    wxPopupMenuWindow *m_popupMenu;
-
-#if wxUSE_ACCEL
-    // the accel table for this menu
-    wxAcceleratorTable m_accelTable;
-#endif // wxUSE_ACCEL
-
-    // the position of the first item in the current radio group or -1
-    int m_startRadioGroup;
-
-    // it calls out OnDismiss()
-    friend class wxPopupMenuWindow;
-    DECLARE_DYNAMIC_CLASS(wxMenu)
-};
-
-// ----------------------------------------------------------------------------
-// wxMenuBar
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMenuBar : public wxMenuBarBase
-{
-public:
-    // ctors and dtor
-    wxMenuBar(long WXUNUSED(style) = 0) { Init(); }
-    wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long style = 0);
-    virtual ~wxMenuBar();
-
-    // implement base class virtuals
-    virtual bool Append( wxMenu *menu, const wxString &title );
-    virtual bool Insert(size_t pos, wxMenu *menu, const wxString& title);
-    virtual wxMenu *Replace(size_t pos, wxMenu *menu, const wxString& title);
-    virtual wxMenu *Remove(size_t pos);
-
-    virtual void EnableTop(size_t pos, bool enable);
-    virtual bool IsEnabledTop(size_t pos) const;
-
-    virtual void SetMenuLabel(size_t pos, const wxString& label);
-    virtual wxString GetMenuLabel(size_t pos) const;
-
-    virtual void Attach(wxFrame *frame);
-    virtual void Detach();
-
-    // get the next item for the givan accel letter (used by wxFrame), return
-    // -1 if none
-    //
-    // if unique is not NULL, filled with true if there is only one item with
-    // this accel, false if two or more
-    int FindNextItemForAccel(int idxStart,
-                             int keycode,
-                             bool *unique = NULL) const;
-
-    // called by wxFrame to set focus to or open the given menu
-    void SelectMenu(size_t pos);
-    void PopupMenu(size_t pos);
-
-#if wxUSE_ACCEL
-    // find the item for the given accel and generate an event if found
-    bool ProcessAccelEvent(const wxKeyEvent& event);
-#endif // wxUSE_ACCEL
-
-    // called by wxMenu when it is dismissed
-    void OnDismissMenu(bool dismissMenuBar = false);
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    // event handlers
-    void OnLeftDown(wxMouseEvent& event);
-    void OnMouseMove(wxMouseEvent& event);
-    void OnKeyDown(wxKeyEvent& event);
-    void OnKillFocus(wxFocusEvent& event);
-
-    // process the mouse move event, return true if we did, false to continue
-    // processing as usual
-    //
-    // the coordinates are client coordinates of menubar, convert if necessary
-    bool ProcessMouseEvent(const wxPoint& pt);
-
-    // called when the menu bar loses mouse capture - it is not hidden unlike
-    // menus, but it doesn't have modal status any longer
-    void OnDismiss();
-
-    // draw the menubar
-    virtual void DoDraw(wxControlRenderer *renderer);
-
-    // menubar geometry
-    virtual wxSize DoGetBestClientSize() const;
-
-    // has the menubar been created already?
-    bool IsCreated() const { return m_frameLast != NULL; }
-
-    // "fast" version of GetMenuCount()
-    size_t GetCount() const { return m_menuInfos.GetCount(); }
-
-    // get the (total) width of the specified menu
-    wxCoord GetItemWidth(size_t pos) const;
-
-    // get the rect of the item
-    wxRect GetItemRect(size_t pos) const;
-
-    // get the menu from the given point or -1 if none
-    int GetMenuFromPoint(const wxPoint& pos) const;
-
-    // refresh the given item
-    void RefreshItem(size_t pos);
-
-    // refresh all items after this one (including it)
-    void RefreshAllItemsAfter(size_t pos);
-
-    // hide the currently shown menu and show this one
-    void DoSelectMenu(size_t pos);
-
-    // popup the currently selected menu
-    void PopupCurrentMenu(bool selectFirst = true);
-
-    // hide the currently selected menu
-    void DismissMenu();
-
-    // do we show a menu currently?
-    bool IsShowingMenu() const { return m_menuShown != 0; }
-
-    // we don't want to have focus except while selecting from menu
-    void GiveAwayFocus();
-
-    // Release the mouse capture if we have it
-    bool ReleaseMouseCapture();
-
-    // the array containing extra menu info we need
-    wxMenuInfoArray m_menuInfos;
-
-    // the current item (only used when menubar has focus)
-    int m_current;
-
-private:
-    // the last frame to which we were attached, NULL initially
-    wxFrame *m_frameLast;
-
-    // the currently shown menu or NULL
-    wxMenu *m_menuShown;
-
-    // should be showing the menu? this is subtly different from m_menuShown !=
-    // NULL as the menu which should be shown may be disabled in which case we
-    // don't show it - but will do as soon as the focus shifts to another menu
-    bool m_shouldShowMenu;
-
-    // it calls out ProcessMouseEvent()
-    friend class wxPopupMenuWindow;
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxMenuBar)
-};
-
-#endif // _WX_UNIV_MENU_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/menuitem.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/menuitem.h
deleted file mode 100644
index e6a11ea44a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/menuitem.h
+++ /dev/null
@@ -1,126 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/menuitem.h
-// Purpose:     wxMenuItem class for wxUniversal
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     05.05.01
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_MENUITEM_H_
-#define _WX_UNIV_MENUITEM_H_
-
-// ----------------------------------------------------------------------------
-// wxMenuItem implements wxMenuItemBase
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMenuItem : public wxMenuItemBase
-{
-public:
-    // ctor & dtor
-    wxMenuItem(wxMenu *parentMenu = NULL,
-               int id = wxID_SEPARATOR,
-               const wxString& name = wxEmptyString,
-               const wxString& help = wxEmptyString,
-               wxItemKind kind = wxITEM_NORMAL,
-               wxMenu *subMenu = NULL);
-    virtual ~wxMenuItem();
-
-    // override base class virtuals to update the item appearance on screen
-    virtual void SetItemLabel(const wxString& text);
-    virtual void SetCheckable(bool checkable);
-
-    virtual void Enable(bool enable = true);
-    virtual void Check(bool check = true);
-
-    // we add some extra functions which are also available under MSW from
-    // wxOwnerDrawn class - they will be moved to wxMenuItemBase later
-    // hopefully
-    void SetBitmaps(const wxBitmap& bmpChecked,
-                    const wxBitmap& bmpUnchecked = wxNullBitmap);
-    void SetBitmap(const wxBitmap& bmp) { SetBitmaps(bmp); }
-    const wxBitmap& GetBitmap(bool checked = true) const
-      { return checked ? m_bmpChecked : m_bmpUnchecked; }
-
-    void SetDisabledBitmap( const wxBitmap& bmpDisabled )
-      { m_bmpDisabled = bmpDisabled; }
-    const wxBitmap& GetDisabledBitmap() const
-      { return m_bmpDisabled; }
-
-    // mark item as belonging to the given radio group
-    void SetAsRadioGroupStart();
-    void SetRadioGroupStart(int start);
-    void SetRadioGroupEnd(int end);
-
-    // wxUniv-specific methods for implementation only starting from here
-
-    // get the accel index of our label or -1 if none
-    int GetAccelIndex() const { return m_indexAccel; }
-
-    // get the accel string (displayed to the right of the label)
-    const wxString& GetAccelString() const { return m_strAccel; }
-
-    // set/get the y coord and the height of this item: note that it must be
-    // set first and retrieved later, the item doesn't calculate it itself
-    void SetGeometry(wxCoord y, wxCoord height)
-    {
-        m_posY = y;
-        m_height = height;
-    }
-
-    wxCoord GetPosition() const
-    {
-        wxASSERT_MSG( m_posY != wxDefaultCoord, wxT("must call SetHeight first!") );
-
-        return m_posY;
-    }
-
-    wxCoord GetHeight() const
-    {
-        wxASSERT_MSG( m_height != wxDefaultCoord, wxT("must call SetHeight first!") );
-
-        return m_height;
-    }
-
-protected:
-    // notify the menu about the change in this item
-    inline void NotifyMenu();
-
-    // set the accel index and string from text
-    void UpdateAccelInfo();
-
-    // the bitmaps (may be invalid, then they're not used)
-    wxBitmap m_bmpChecked,
-             m_bmpUnchecked,
-             m_bmpDisabled;
-
-    // the positions of the first and last items of the radio group this item
-    // belongs to or -1: start is the radio group start and is valid for all
-    // but first radio group items (m_isRadioGroupStart == false), end is valid
-    // only for the first one
-    union
-    {
-        int start;
-        int end;
-    } m_radioGroup;
-
-    // does this item start a radio group?
-    bool m_isRadioGroupStart;
-
-    // the position of the accelerator in our label, -1 if none
-    int m_indexAccel;
-
-    // the accel string (i.e. "Ctrl-Q" or "Alt-F1")
-    wxString m_strAccel;
-
-    // the position and height of the displayed item
-    wxCoord m_posY,
-            m_height;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxMenuItem)
-};
-
-#endif // _WX_UNIV_MENUITEM_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/notebook.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/notebook.h
deleted file mode 100644
index 2c7a161c1f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/notebook.h
+++ /dev/null
@@ -1,251 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/notebook.h
-// Purpose:     universal version of wxNotebook
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     01.02.01
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_NOTEBOOK_H_
-#define _WX_UNIV_NOTEBOOK_H_
-
-#include "wx/arrstr.h"
-
-class WXDLLIMPEXP_FWD_CORE wxSpinButton;
-
-// ----------------------------------------------------------------------------
-// the actions supported by this control
-// ----------------------------------------------------------------------------
-
-// change the page: to the next/previous/given one
-#define wxACTION_NOTEBOOK_NEXT      wxT("nexttab")
-#define wxACTION_NOTEBOOK_PREV      wxT("prevtab")
-#define wxACTION_NOTEBOOK_GOTO      wxT("gototab")
-
-// ----------------------------------------------------------------------------
-// wxNotebook
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxNotebook : public wxNotebookBase
-{
-public:
-    // ctors and such
-    // --------------
-
-    wxNotebook() { Init(); }
-
-    wxNotebook(wxWindow *parent,
-               wxWindowID id,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxNotebookNameStr)
-    {
-        Init();
-
-        (void)Create(parent, id, pos, size, style, name);
-    }
-
-    // quasi ctor
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxNotebookNameStr);
-
-    // dtor
-    virtual ~wxNotebook();
-
-    // implement wxNotebookBase pure virtuals
-    // --------------------------------------
-
-    virtual int SetSelection(size_t nPage) { return DoSetSelection(nPage, SetSelection_SendEvent); }
-
-    // changes selected page without sending events
-    int ChangeSelection(size_t nPage) { return DoSetSelection(nPage); }
-
-    virtual bool SetPageText(size_t nPage, const wxString& strText);
-    virtual wxString GetPageText(size_t nPage) const;
-
-    virtual int GetPageImage(size_t nPage) const;
-    virtual bool SetPageImage(size_t nPage, int nImage);
-
-    virtual void SetPageSize(const wxSize& size);
-    virtual void SetPadding(const wxSize& padding);
-    virtual void SetTabSize(const wxSize& sz);
-
-    virtual wxSize CalcSizeFromPage(const wxSize& sizePage) const;
-
-    virtual bool DeleteAllPages();
-
-    virtual bool InsertPage(size_t nPage,
-                            wxNotebookPage *pPage,
-                            const wxString& strText,
-                            bool bSelect = false,
-                            int imageId = NO_IMAGE);
-
-    // style tests
-    // -----------
-
-    // return true if all tabs have the same width
-    bool FixedSizeTabs() const { return HasFlag(wxNB_FIXEDWIDTH); }
-
-    // return wxTOP/wxBOTTOM/wxRIGHT/wxLEFT
-    wxDirection GetTabOrientation() const;
-
-    // return true if the notebook has tabs at the sidesand not at the top (or
-    // bottom) as usual
-    bool IsVertical() const;
-
-    // hit testing
-    // -----------
-
-    virtual int HitTest(const wxPoint& pt, long *flags = NULL) const;
-
-    // input handling
-    // --------------
-
-    virtual bool PerformAction(const wxControlAction& action,
-                               long numArg = 0l,
-                               const wxString& strArg = wxEmptyString);
-
-    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
-    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
-    {
-        return GetStdInputHandler(handlerDef);
-    }
-
-    // refresh the currently selected tab
-    void RefreshCurrent();
-
-protected:
-    virtual wxNotebookPage *DoRemovePage(size_t nPage);
-
-    // drawing
-    virtual void DoDraw(wxControlRenderer *renderer);
-    void DoDrawTab(wxDC& dc, const wxRect& rect, size_t n);
-
-    // resizing
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-
-    int DoSetSelection(size_t nPage, int flags = 0);
-
-    // common part of all ctors
-    void Init();
-
-    // resize the tab to fit its title (and icon if any)
-    void ResizeTab(int page);
-
-    // recalculate the geometry of the notebook completely
-    void Relayout();
-
-    // is the spin button currently shown?
-    bool HasSpinBtn() const;
-
-    // calculate last (fully) visible tab: updates m_lastVisible
-    void CalcLastVisibleTab();
-
-    // show or hide the spin control for tabs scrolling depending on whether it
-    // is needed or not
-    void UpdateSpinBtn();
-
-    // position the spin button
-    void PositionSpinBtn();
-
-    // refresh the given tab only
-    void RefreshTab(int page, bool forceSelected = false);
-
-    // refresh all tabs
-    void RefreshAllTabs();
-
-    // get the tab rect (inefficient, don't use this in a loop)
-    wxRect GetTabRect(int page) const;
-
-    // get the rectangle containing all tabs
-    wxRect GetAllTabsRect() const;
-
-    // get the part occupied by the tabs - slightly smaller than
-    // GetAllTabsRect() because the tabs may be indented from it
-    wxRect GetTabsPart() const;
-
-    // calculate the tab size (without padding)
-    wxSize CalcTabSize(int page) const;
-
-    // get the (cached) size of a tab
-    void GetTabSize(int page, wxCoord *w, wxCoord *h) const;
-
-    // get the (cached) width of the tab
-    wxCoord GetTabWidth(int page) const
-        { return FixedSizeTabs() ? m_widthMax : m_widths[page]; }
-
-    // return true if the tab has an associated image
-    bool HasImage(int page) const
-        { return HasImageList() && m_images[page] != -1; }
-
-    // get the part of the notebook reserved for the pages (slightly larger
-    // than GetPageRect() as we draw a border and leave marginin between)
-    wxRect GetPagePart() const;
-
-    // get the page rect in our client coords
-    wxRect GetPageRect() const;
-
-    // get our client size from the page size
-    wxSize GetSizeForPage(const wxSize& size) const;
-
-    // scroll the tabs so that the first page shown becomes the given one
-    void ScrollTo(size_t page);
-
-    // scroll the tabs so that the first page shown becomes the given one
-    void ScrollLastTo(size_t page);
-
-    // the pages titles
-    wxArrayString m_titles;
-
-    // the spin button to change the pages
-    wxSpinButton *m_spinbtn;
-
-    // the offset of the first page shown (may be changed with m_spinbtn)
-    wxCoord m_offset;
-
-    // the first and last currently visible tabs: the name is not completely
-    // accurate as m_lastVisible is, in fact, the first tab which is *not*
-    // visible: so the visible tabs are those with indexes such that
-    // m_firstVisible <= n < m_lastVisible
-    size_t m_firstVisible,
-           m_lastVisible;
-
-    // the last fully visible item, usually just m_lastVisible - 1 but may be
-    // different from it
-    size_t m_lastFullyVisible;
-
-    // the height of tabs in a normal notebook or the width of tabs in a
-    // notebook with tabs on a side
-    wxCoord m_heightTab;
-
-    // the biggest height (or width) of a notebook tab (used only if
-    // FixedSizeTabs()) or -1 if not calculated yet
-    wxCoord m_widthMax;
-
-    // the cached widths (or heights) of tabs
-    wxArrayInt m_widths;
-
-    // the icon indices
-    wxArrayInt m_images;
-
-    // the accel indexes for labels
-    wxArrayInt m_accels;
-
-    // the padding
-    wxSize m_sizePad;
-
-    DECLARE_DYNAMIC_CLASS(wxNotebook)
-};
-
-#endif // _WX_UNIV_NOTEBOOK_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/panel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/panel.h
deleted file mode 100644
index 626a6c3577..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/panel.h
+++ /dev/null
@@ -1,50 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/panel.h
-// Purpose:     wxUniversal-specific wxPanel class.
-// Author:      Vadim Zeitlin
-// Created:     2011-03-18
-// Copyright:   (c) 2011 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_PANEL_H_
-#define _WX_UNIV_PANEL_H_
-
-// ----------------------------------------------------------------------------
-// wxPanel
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPanel : public wxPanelBase
-{
-public:
-    wxPanel() { }
-
-    wxPanel(wxWindow *parent,
-            wxWindowID winid = wxID_ANY,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-            const wxString& name = wxPanelNameStr)
-    {
-        Create(parent, winid, pos, size, style, name);
-    }
-
-    virtual bool IsCanvasWindow() const { return true; }
-
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_CONSTRUCTOR(
-    wxPanel(wxWindow *parent,
-            int x, int y, int width, int height,
-            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-            const wxString& name = wxPanelNameStr)
-    {
-        Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), style, name);
-    }
-    )
-#endif // WXWIN_COMPATIBILITY_2_8
-
-private:
-    wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPanel);
-};
-
-#endif // _WX_UNIV_PANEL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/radiobox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/radiobox.h
deleted file mode 100644
index a0e3fd9832..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/radiobox.h
+++ /dev/null
@@ -1,152 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/radiobox.h
-// Purpose:     wxRadioBox declaration
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     11.09.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_RADIOBOX_H_
-#define _WX_UNIV_RADIOBOX_H_
-
-class WXDLLIMPEXP_FWD_CORE wxRadioButton;
-
-#include "wx/statbox.h"
-#include "wx/dynarray.h"
-
-WX_DEFINE_EXPORTED_ARRAY_PTR(wxRadioButton *, wxArrayRadioButtons);
-
-// ----------------------------------------------------------------------------
-// wxRadioBox: a box full of radio buttons
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxRadioBox : public wxStaticBox,
-                               public wxRadioBoxBase
-{
-public:
-    // wxRadioBox construction
-    wxRadioBox() { Init(); }
-
-    wxRadioBox(wxWindow *parent,
-               wxWindowID id,
-               const wxString& title,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               int n = 0, const wxString *choices = NULL,
-               int majorDim = 0,
-               long style = wxRA_SPECIFY_COLS,
-               const wxValidator& val = wxDefaultValidator,
-               const wxString& name = wxRadioBoxNameStr)
-    {
-        Init();
-
-        (void)Create(parent, id, title, pos, size, n, choices,
-                     majorDim, style, val, name);
-    }
-    wxRadioBox(wxWindow *parent,
-               wxWindowID id,
-               const wxString& title,
-               const wxPoint& pos,
-               const wxSize& size,
-               const wxArrayString& choices,
-               int majorDim = 0,
-               long style = wxRA_SPECIFY_COLS,
-               const wxValidator& val = wxDefaultValidator,
-               const wxString& name = wxRadioBoxNameStr);
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                int n = 0, const wxString *choices = NULL,
-                int majorDim = 0,
-                long style = wxRA_SPECIFY_COLS,
-                const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxRadioBoxNameStr);
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos,
-                const wxSize& size,
-                const wxArrayString& choices,
-                int majorDim = 0,
-                long style = wxRA_SPECIFY_COLS,
-                const wxValidator& val = wxDefaultValidator,
-                const wxString& name = wxRadioBoxNameStr);
-
-    virtual ~wxRadioBox();
-
-    // implement wxRadioBox interface
-    virtual void SetSelection(int n);
-    virtual int GetSelection() const;
-
-    virtual unsigned int GetCount() const
-        { return (unsigned int)m_buttons.GetCount(); }
-
-    virtual wxString GetString(unsigned int n) const;
-    virtual void SetString(unsigned int n, const wxString& label);
-
-    virtual bool Enable(unsigned int n, bool enable = true);
-    virtual bool Show(unsigned int n, bool show = true);
-
-    virtual bool IsItemEnabled(unsigned int n) const;
-    virtual bool IsItemShown(unsigned int n) const;
-
-    // we also override the wxControl methods to avoid virtual function hiding
-    virtual bool Enable(bool enable = true);
-    virtual bool Show(bool show = true);
-    virtual wxString GetLabel() const;
-    virtual void SetLabel(const wxString& label);
-
-    // we inherit a version always returning false from wxStaticBox, override
-    // it to behave normally
-    virtual bool AcceptsFocus() const { return wxControl::AcceptsFocus(); }
-
-#if wxUSE_TOOLTIPS
-    virtual void DoSetToolTip( wxToolTip *tip );
-#endif // wxUSE_TOOLTIPS
-
-    // wxUniversal-only methods
-
-    // another Append() version
-    void Append(int n, const wxString *choices);
-
-    // implementation only: called by wxRadioHookHandler
-    void OnRadioButton(wxEvent& event);
-    bool OnKeyDown(wxKeyEvent& event);
-
-protected:
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-    // override the base class methods dealing with window positioning/sizing
-    // as we must move/size the buttons as well
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-    virtual wxSize DoGetBestClientSize() const;
-
-    // generate a radiobutton click event for the current item
-    void SendRadioEvent();
-
-    // common part of all ctors
-    void Init();
-
-    // calculate the max size of all buttons
-    wxSize GetMaxButtonSize() const;
-
-    // the currently selected radio button or -1
-    int m_selection;
-
-    // all radio buttons
-    wxArrayRadioButtons m_buttons;
-
-    // the event handler which is used to translate radiobutton events into
-    // radiobox one
-    wxEvtHandler *m_evtRadioHook;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxRadioBox)
-};
-
-#endif // _WX_UNIV_RADIOBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/radiobut.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/radiobut.h
deleted file mode 100644
index d7423d0c07..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/radiobut.h
+++ /dev/null
@@ -1,77 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/radiobut.h
-// Purpose:     wxRadioButton declaration
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     10.09.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_RADIOBUT_H_
-#define _WX_UNIV_RADIOBUT_H_
-
-#include "wx/checkbox.h"
-
-// ----------------------------------------------------------------------------
-// wxRadioButton
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxRadioButton : public wxCheckBox
-{
-public:
-    // constructors
-    wxRadioButton() { Init(); }
-
-    wxRadioButton(wxWindow *parent,
-                  wxWindowID id,
-                  const wxString& label,
-                  const wxPoint& pos = wxDefaultPosition,
-                  const wxSize& size = wxDefaultSize,
-                  long style = 0,
-                  const wxValidator& validator = wxDefaultValidator,
-                  const wxString& name = wxRadioButtonNameStr)
-    {
-        Init();
-
-        Create(parent, id, label, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& label,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxRadioButtonNameStr);
-
-    // override some base class methods
-    virtual void ChangeValue(bool value);
-
-protected:
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-    // implement our own drawing
-    virtual void DoDraw(wxControlRenderer *renderer);
-
-    // we use the radio button bitmaps for size calculation
-    virtual wxSize GetBitmapSize() const;
-
-    // the radio button can only be cleared using this method, not
-    // ChangeValue() above - and it is protected as it can only be called by
-    // another radiobutton
-    void ClearValue();
-
-    // called when the radio button becomes checked: we clear all the buttons
-    // in the same group with us here
-    virtual void OnCheck();
-
-    // send event about radio button selection
-    virtual void SendEvent();
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxRadioButton)
-};
-
-#endif // _WX_UNIV_RADIOBUT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/renderer.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/renderer.h
deleted file mode 100644
index 46f31682cf..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/renderer.h
+++ /dev/null
@@ -1,926 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/renderer.h
-// Purpose:     wxRenderer class declaration
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     06.08.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_RENDERER_H_
-#define _WX_UNIV_RENDERER_H_
-
-/*
-   wxRenderer class is used to draw all wxWidgets controls. This is an ABC and
-   the look of the application is determined by the concrete derivation of
-   wxRenderer used in the program.
-
-   It also contains a few static methods which may be used by the concrete
-   renderers and provide the functionality which is often similar or identical
-   in all renderers (using inheritance here would be more restrictive as the
-   given concrete renderer may need an arbitrary subset of the base class
-   methods).
-
-   Finally note that wxRenderer supersedes wxRendererNative in wxUniv build and
-   includes the latters functionality (which it may delegate to the generic
-   implementation of the latter or reimplement itself).
- */
-
-#include "wx/renderer.h"
-
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLIMPEXP_FWD_CORE wxCheckListBox;
-
-#if wxUSE_LISTBOX
-    class WXDLLIMPEXP_FWD_CORE wxListBox;
-#endif // wxUSE_LISTBOX
-
-#if wxUSE_MENUS
-   class WXDLLIMPEXP_FWD_CORE wxMenu;
-   class WXDLLIMPEXP_FWD_CORE wxMenuGeometryInfo;
-#endif // wxUSE_MENUS
-
-class WXDLLIMPEXP_FWD_CORE wxScrollBar;
-
-#if wxUSE_TEXTCTRL
-    class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
-#endif
-
-#if wxUSE_GAUGE
-    class WXDLLIMPEXP_FWD_CORE wxGauge;
-#endif // wxUSE_GAUGE
-
-#include "wx/string.h"
-#include "wx/gdicmn.h"
-#include "wx/icon.h"
-
-// helper class used by wxMenu-related functions
-class WXDLLIMPEXP_CORE wxMenuGeometryInfo
-{
-public:
-    // get the total size of the menu
-    virtual wxSize GetSize() const = 0;
-
-    virtual ~wxMenuGeometryInfo();
-};
-
-// ----------------------------------------------------------------------------
-// wxRenderer: abstract renderers interface
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxRenderer : public wxDelegateRendererNative
-{
-public:
-    // drawing functions
-    // -----------------
-
-    // draw the controls background
-    virtual void DrawBackground(wxDC& dc,
-                                const wxColour& col,
-                                const wxRect& rect,
-                                int flags,
-                                wxWindow *window = NULL) = 0;
-
-    // draw the button surface
-    virtual void DrawButtonSurface(wxDC& dc,
-                                   const wxColour& col,
-                                   const wxRect& rect,
-                                   int flags) = 0;
-
-    // draw the label inside the given rectangle with the specified alignment
-    // and optionally emphasize the character with the given index
-    virtual void DrawLabel(wxDC& dc,
-                           const wxString& label,
-                           const wxRect& rect,
-                           int flags = 0,
-                           int alignment = wxALIGN_LEFT | wxALIGN_TOP,
-                           int indexAccel = -1,
-                           wxRect *rectBounds = NULL) = 0;
-
-    // same but also draw a bitmap if it is valid
-    virtual void DrawButtonLabel(wxDC& dc,
-                                 const wxString& label,
-                                 const wxBitmap& image,
-                                 const wxRect& rect,
-                                 int flags = 0,
-                                 int alignment = wxALIGN_LEFT | wxALIGN_TOP,
-                                 int indexAccel = -1,
-                                 wxRect *rectBounds = NULL) = 0;
-
-
-    // draw the border and optionally return the rectangle containing the
-    // region inside the border
-    virtual void DrawBorder(wxDC& dc,
-                            wxBorder border,
-                            const wxRect& rect,
-                            int flags = 0,
-                            wxRect *rectIn = NULL) = 0;
-
-    // draw text control border (I hate to have a separate method for this but
-    // it is needed to accommodate GTK+)
-    virtual void DrawTextBorder(wxDC& dc,
-                                wxBorder border,
-                                const wxRect& rect,
-                                int flags = 0,
-                                wxRect *rectIn = NULL) = 0;
-
-    // draw push button border and return the rectangle left for the label
-    virtual void DrawButtonBorder(wxDC& dc,
-                                  const wxRect& rect,
-                                  int flags = 0,
-                                  wxRect *rectIn = NULL) = 0;
-
-    // draw a horizontal line
-    virtual void DrawHorizontalLine(wxDC& dc,
-                                    wxCoord y, wxCoord x1, wxCoord x2) = 0;
-
-    // draw a vertical line
-    virtual void DrawVerticalLine(wxDC& dc,
-                                  wxCoord x, wxCoord y1, wxCoord y2) = 0;
-
-    // draw a frame with the label (horizontal alignment can be specified)
-    virtual void DrawFrame(wxDC& dc,
-                           const wxString& label,
-                           const wxRect& rect,
-                           int flags = 0,
-                           int alignment = wxALIGN_LEFT,
-                           int indexAccel = -1) = 0;
-
-    // draw an arrow in the given direction
-    virtual void DrawArrow(wxDC& dc,
-                           wxDirection dir,
-                           const wxRect& rect,
-                           int flags = 0) = 0;
-
-    // draw a scrollbar arrow (may be the same as arrow but may be not)
-    virtual void DrawScrollbarArrow(wxDC& dc,
-                                    wxDirection dir,
-                                    const wxRect& rect,
-                                    int flags = 0) = 0;
-
-    // draw the scrollbar thumb
-    virtual void DrawScrollbarThumb(wxDC& dc,
-                                    wxOrientation orient,
-                                    const wxRect& rect,
-                                    int flags = 0) = 0;
-
-    // draw a (part of) scrollbar shaft
-    virtual void DrawScrollbarShaft(wxDC& dc,
-                                    wxOrientation orient,
-                                    const wxRect& rect,
-                                    int flags = 0) = 0;
-
-    // draw the rectangle in the corner between two scrollbars
-    virtual void DrawScrollCorner(wxDC& dc,
-                                  const wxRect& rect) = 0;
-
-    // draw an item of a wxListBox
-    virtual void DrawItem(wxDC& dc,
-                          const wxString& label,
-                          const wxRect& rect,
-                          int flags = 0) = 0;
-
-    // draw an item of a wxCheckListBox
-    virtual void DrawCheckItem(wxDC& dc,
-                               const wxString& label,
-                               const wxBitmap& bitmap,
-                               const wxRect& rect,
-                               int flags = 0) = 0;
-
-    // draw a checkbutton (bitmap may be invalid to use default one)
-    virtual void DrawCheckButton(wxDC& dc,
-                                 const wxString& label,
-                                 const wxBitmap& bitmap,
-                                 const wxRect& rect,
-                                 int flags = 0,
-                                 wxAlignment align = wxALIGN_LEFT,
-                                 int indexAccel = -1) = 0;
-
-    // draw a radio button
-    virtual void DrawRadioButton(wxDC& dc,
-                                 const wxString& label,
-                                 const wxBitmap& bitmap,
-                                 const wxRect& rect,
-                                 int flags = 0,
-                                 wxAlignment align = wxALIGN_LEFT,
-                                 int indexAccel = -1) = 0;
-
-#if wxUSE_TOOLBAR
-    // draw a toolbar button (label may be empty, bitmap may be invalid, if
-    // both conditions are true this function draws a separator)
-    virtual void DrawToolBarButton(wxDC& dc,
-                                   const wxString& label,
-                                   const wxBitmap& bitmap,
-                                   const wxRect& rect,
-                                   int flags = 0,
-                                   long style = 0,
-                                   int tbarStyle = 0) = 0;
-#endif // wxUSE_TOOLBAR
-
-#if wxUSE_TEXTCTRL
-    // draw a (part of) line in the text control
-    virtual void DrawTextLine(wxDC& dc,
-                              const wxString& text,
-                              const wxRect& rect,
-                              int selStart = -1,
-                              int selEnd = -1,
-                              int flags = 0) = 0;
-
-    // draw a line wrap indicator
-    virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect) = 0;
-#endif // wxUSE_TEXTCTRL
-
-#if wxUSE_NOTEBOOK
-    // draw a notebook tab
-    virtual void DrawTab(wxDC& dc,
-                         const wxRect& rect,
-                         wxDirection dir,
-                         const wxString& label,
-                         const wxBitmap& bitmap = wxNullBitmap,
-                         int flags = 0,
-                         int indexAccel = -1) = 0;
-#endif // wxUSE_NOTEBOOK
-
-#if wxUSE_SLIDER
-
-    // draw the slider shaft
-    virtual void DrawSliderShaft(wxDC& dc,
-                                 const wxRect& rect,
-                                 int lenThumb,
-                                 wxOrientation orient,
-                                 int flags = 0,
-                                 long style = 0,
-                                 wxRect *rectShaft = NULL) = 0;
-
-    // draw the slider thumb
-    virtual void DrawSliderThumb(wxDC& dc,
-                                 const wxRect& rect,
-                                 wxOrientation orient,
-                                 int flags = 0,
-                                 long style = 0) = 0;
-
-    // draw the slider ticks
-    virtual void DrawSliderTicks(wxDC& dc,
-                                 const wxRect& rect,
-                                 int lenThumb,
-                                 wxOrientation orient,
-                                 int start,
-                                 int end,
-                                 int step = 1,
-                                 int flags = 0,
-                                 long style = 0) = 0;
-#endif // wxUSE_SLIDER
-
-#if wxUSE_MENUS
-    // draw a menu bar item
-    virtual void DrawMenuBarItem(wxDC& dc,
-                                 const wxRect& rect,
-                                 const wxString& label,
-                                 int flags = 0,
-                                 int indexAccel = -1) = 0;
-
-    // draw a menu item (also used for submenus if flags has ISSUBMENU flag)
-    //
-    // the geometryInfo is calculated by GetMenuGeometry() function from below
-    virtual void DrawMenuItem(wxDC& dc,
-                              wxCoord y,
-                              const wxMenuGeometryInfo& geometryInfo,
-                              const wxString& label,
-                              const wxString& accel,
-                              const wxBitmap& bitmap = wxNullBitmap,
-                              int flags = 0,
-                              int indexAccel = -1) = 0;
-
-    // draw a menu bar separator
-    virtual void DrawMenuSeparator(wxDC& dc,
-                                   wxCoord y,
-                                   const wxMenuGeometryInfo& geomInfo) = 0;
-#endif // wxUSE_MENUS
-
-#if wxUSE_STATUSBAR
-    // draw a status bar field: wxCONTROL_ISDEFAULT bit in the flags is
-    // interpreted specially and means "draw the status bar grip" here
-    virtual void DrawStatusField(wxDC& dc,
-                                 const wxRect& rect,
-                                 const wxString& label,
-                                 int flags = 0, int style = 0) = 0;
-#endif // wxUSE_STATUSBAR
-
-    // draw complete frame/dialog titlebar
-    virtual void DrawFrameTitleBar(wxDC& dc,
-                                   const wxRect& rect,
-                                   const wxString& title,
-                                   const wxIcon& icon,
-                                   int flags,
-                                   int specialButton = 0,
-                                   int specialButtonFlags = 0) = 0;
-
-    // draw frame borders
-    virtual void DrawFrameBorder(wxDC& dc,
-                                 const wxRect& rect,
-                                 int flags) = 0;
-
-    // draw frame titlebar background
-    virtual void DrawFrameBackground(wxDC& dc,
-                                     const wxRect& rect,
-                                     int flags) = 0;
-
-    // draw frame title
-    virtual void DrawFrameTitle(wxDC& dc,
-                                const wxRect& rect,
-                                const wxString& title,
-                                int flags) = 0;
-
-    // draw frame icon
-    virtual void DrawFrameIcon(wxDC& dc,
-                               const wxRect& rect,
-                               const wxIcon& icon,
-                               int flags) = 0;
-
-    // draw frame buttons
-    virtual void DrawFrameButton(wxDC& dc,
-                                 wxCoord x, wxCoord y,
-                                 int button,
-                                 int flags = 0) = 0;
-
-    // misc functions
-    // --------------
-
-#if wxUSE_COMBOBOX
-    // return the bitmaps to use for combobox button
-    virtual void GetComboBitmaps(wxBitmap *bmpNormal,
-                                 wxBitmap *bmpFocus,
-                                 wxBitmap *bmpPressed,
-                                 wxBitmap *bmpDisabled) = 0;
-#endif // wxUSE_COMBOBOX
-
-    // geometry functions
-    // ------------------
-
-    // get the dimensions of the border: rect.x/y contain the width/height of
-    // the left/top side, width/heigh - of the right/bottom one
-    virtual wxRect GetBorderDimensions(wxBorder border) const = 0;
-
-    // the scrollbars may be drawn either inside the window border or outside
-    // it - this function is used to decide how to draw them
-    virtual bool AreScrollbarsInsideBorder() const = 0;
-
-    // adjust the size of the control of the given class: for most controls,
-    // this just takes into account the border, but for some (buttons, for
-    // example) it is more complicated - the result being, in any case, that
-    // the control looks "nice" if it uses the adjusted rectangle
-    virtual void AdjustSize(wxSize *size, const wxWindow *window) = 0;
-
-#if wxUSE_SCROLLBAR
-    // get the size of a scrollbar arrow
-    virtual wxSize GetScrollbarArrowSize() const = 0;
-#endif // wxUSE_SCROLLBAR
-
-    // get the height of a listbox item from the base font height
-    virtual wxCoord GetListboxItemHeight(wxCoord fontHeight) = 0;
-
-    // get the size of a checkbox/radio button bitmap
-    virtual wxSize GetCheckBitmapSize() const = 0;
-    virtual wxSize GetRadioBitmapSize() const = 0;
-    virtual wxCoord GetCheckItemMargin() const = 0;
-
-#if wxUSE_TOOLBAR
-    // get the standard size of a toolbar button and also return the size of
-    // a toolbar separator in the provided pointer
-    virtual wxSize GetToolBarButtonSize(wxCoord *separator) const = 0;
-
-    // get the margins between/around the toolbar buttons
-    virtual wxSize GetToolBarMargin() const = 0;
-#endif // wxUSE_TOOLBAR
-
-#if wxUSE_TEXTCTRL
-    // convert between text rectangle and client rectangle for text controls:
-    // the former is typicall smaller to leave margins around text
-    virtual wxRect GetTextTotalArea(const wxTextCtrl *text,
-                                    const wxRect& rectText) const = 0;
-
-    // extra space is for line indicators
-    virtual wxRect GetTextClientArea(const wxTextCtrl *text,
-                                     const wxRect& rectTotal,
-                                     wxCoord *extraSpaceBeyond) const = 0;
-#endif // wxUSE_TEXTCTRL
-
-#if wxUSE_NOTEBOOK
-    // get the overhang of a selected tab
-    virtual wxSize GetTabIndent() const = 0;
-
-    // get the padding around the text in a tab
-    virtual wxSize GetTabPadding() const = 0;
-#endif // wxUSE_NOTEBOOK
-
-#if wxUSE_SLIDER
-    // get the default size of the slider in lesser dimension (i.e. height of a
-    // horizontal slider or width of a vertical one)
-    virtual wxCoord GetSliderDim() const = 0;
-
-    // get the length of the slider ticks displayed along side slider
-    virtual wxCoord GetSliderTickLen() const = 0;
-
-    // get the slider shaft rect from the total slider rect
-    virtual wxRect GetSliderShaftRect(const wxRect& rect,
-                                      int lenThumb,
-                                      wxOrientation orient,
-                                      long style = 0) const = 0;
-
-    // get the size of the slider thumb for the given total slider rect
-    virtual wxSize GetSliderThumbSize(const wxRect& rect,
-                                      int lenThumb,
-                                      wxOrientation orient) const = 0;
-#endif // wxUSE_SLIDER
-
-    // get the size of one progress bar step (in horz and vertical directions)
-    virtual wxSize GetProgressBarStep() const = 0;
-
-#if wxUSE_MENUS
-    // get the size of rectangle to use in the menubar for the given text rect
-    virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const = 0;
-
-    // get the struct storing all layout info needed to draw all menu items
-    // (this can't be calculated for each item separately as they should be
-    // aligned)
-    //
-    // the returned pointer must be deleted by the caller
-    virtual wxMenuGeometryInfo *GetMenuGeometry(wxWindow *win,
-                                                const wxMenu& menu) const = 0;
-#endif // wxUSE_MENUS
-
-#if wxUSE_STATUSBAR
-    // get the borders around the status bar fields (x and y fields of the
-    // return value)
-    virtual wxSize GetStatusBarBorders() const = 0;
-
-    // get the border between the status bar fields
-    virtual wxCoord GetStatusBarBorderBetweenFields() const = 0;
-
-    // get the mergin between a field and its border
-    virtual wxSize GetStatusBarFieldMargins() const = 0;
-#endif // wxUSE_STATUSBAR
-
-    // get client area rectangle of top level window (i.e. subtract
-    // decorations from given rectangle)
-    virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const = 0;
-
-    // get size of whole top level window, given size of its client area size
-    virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const = 0;
-
-    // get the minimal size of top level window
-    virtual wxSize GetFrameMinSize(int flags) const = 0;
-
-    // get titlebar icon size
-    virtual wxSize GetFrameIconSize() const = 0;
-
-    // returns one of wxHT_TOPLEVEL_XXX constants
-    virtual int HitTestFrame(const wxRect& rect,
-                             const wxPoint& pt,
-                             int flags = 0) const = 0;
-
-    // virtual dtor for any base class
-    virtual ~wxRenderer();
-};
-
-// ----------------------------------------------------------------------------
-// wxDelegateRenderer: it is impossible to inherit from any of standard
-// renderers as their declarations are in private code, but you can use this
-// class to override only some of the Draw() functions - all the other ones
-// will be left to the original renderer
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDelegateRenderer : public wxRenderer
-{
-public:
-    wxDelegateRenderer(wxRenderer *renderer) : m_renderer(renderer) { }
-
-    virtual void DrawBackground(wxDC& dc,
-                                const wxColour& col,
-                                const wxRect& rect,
-                                int flags,
-                                wxWindow *window = NULL )
-        { m_renderer->DrawBackground(dc, col, rect, flags, window ); }
-    virtual void DrawButtonSurface(wxDC& dc,
-                                   const wxColour& col,
-                                   const wxRect& rect,
-                                   int flags)
-        { m_renderer->DrawButtonSurface(dc, col, rect, flags); }
-    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0)
-        { m_renderer->DrawFocusRect(win, dc, rect, flags); }
-    virtual void DrawLabel(wxDC& dc,
-                           const wxString& label,
-                           const wxRect& rect,
-                           int flags = 0,
-                           int align = wxALIGN_LEFT | wxALIGN_TOP,
-                           int indexAccel = -1,
-                           wxRect *rectBounds = NULL)
-        { m_renderer->DrawLabel(dc, label, rect,
-                                flags, align, indexAccel, rectBounds); }
-    virtual void DrawButtonLabel(wxDC& dc,
-                                 const wxString& label,
-                                 const wxBitmap& image,
-                                 const wxRect& rect,
-                                 int flags = 0,
-                                 int align = wxALIGN_LEFT | wxALIGN_TOP,
-                                 int indexAccel = -1,
-                                 wxRect *rectBounds = NULL)
-        { m_renderer->DrawButtonLabel(dc, label, image, rect,
-                                      flags, align, indexAccel, rectBounds); }
-    virtual void DrawBorder(wxDC& dc,
-                            wxBorder border,
-                            const wxRect& rect,
-                            int flags = 0,
-                            wxRect *rectIn = NULL)
-        { m_renderer->DrawBorder(dc, border, rect, flags, rectIn); }
-    virtual void DrawTextBorder(wxDC& dc,
-                                wxBorder border,
-                                const wxRect& rect,
-                                int flags = 0,
-                                wxRect *rectIn = NULL)
-        { m_renderer->DrawTextBorder(dc, border, rect, flags, rectIn); }
-    virtual void DrawButtonBorder(wxDC& dc,
-                                  const wxRect& rect,
-                                  int flags = 0,
-                                  wxRect *rectIn = NULL)
-        { m_renderer->DrawButtonBorder(dc, rect, flags, rectIn); }
-    virtual void DrawFrame(wxDC& dc,
-                           const wxString& label,
-                           const wxRect& rect,
-                           int flags = 0,
-                           int align = wxALIGN_LEFT,
-                           int indexAccel = -1)
-        { m_renderer->DrawFrame(dc, label, rect, flags, align, indexAccel); }
-    virtual void DrawHorizontalLine(wxDC& dc,
-                                    wxCoord y, wxCoord x1, wxCoord x2)
-        { m_renderer->DrawHorizontalLine(dc, y, x1, x2); }
-    virtual void DrawVerticalLine(wxDC& dc,
-                                  wxCoord x, wxCoord y1, wxCoord y2)
-        { m_renderer->DrawVerticalLine(dc, x, y1, y2); }
-    virtual void DrawArrow(wxDC& dc,
-                           wxDirection dir,
-                           const wxRect& rect,
-                           int flags = 0)
-        { m_renderer->DrawArrow(dc, dir, rect, flags); }
-    virtual void DrawScrollbarArrow(wxDC& dc,
-                           wxDirection dir,
-                           const wxRect& rect,
-                           int flags = 0)
-        { m_renderer->DrawScrollbarArrow(dc, dir, rect, flags); }
-    virtual void DrawScrollbarThumb(wxDC& dc,
-                                    wxOrientation orient,
-                                    const wxRect& rect,
-                                    int flags = 0)
-        { m_renderer->DrawScrollbarThumb(dc, orient, rect, flags); }
-    virtual void DrawScrollbarShaft(wxDC& dc,
-                                    wxOrientation orient,
-                                    const wxRect& rect,
-                                    int flags = 0)
-        { m_renderer->DrawScrollbarShaft(dc, orient, rect, flags); }
-    virtual void DrawScrollCorner(wxDC& dc,
-                                  const wxRect& rect)
-        { m_renderer->DrawScrollCorner(dc, rect); }
-    virtual void DrawItem(wxDC& dc,
-                          const wxString& label,
-                          const wxRect& rect,
-                          int flags = 0)
-        { m_renderer->DrawItem(dc, label, rect, flags); }
-    virtual void DrawCheckItem(wxDC& dc,
-                               const wxString& label,
-                               const wxBitmap& bitmap,
-                               const wxRect& rect,
-                               int flags = 0)
-        { m_renderer->DrawCheckItem(dc, label, bitmap, rect, flags); }
-    virtual void DrawCheckButton(wxDC& dc,
-                                 const wxString& label,
-                                 const wxBitmap& bitmap,
-                                 const wxRect& rect,
-                                 int flags = 0,
-                                 wxAlignment align = wxALIGN_LEFT,
-                                 int indexAccel = -1)
-        { m_renderer->DrawCheckButton(dc, label, bitmap, rect,
-                                      flags, align, indexAccel); }
-    virtual void DrawRadioButton(wxDC& dc,
-                                 const wxString& label,
-                                 const wxBitmap& bitmap,
-                                 const wxRect& rect,
-                                 int flags = 0,
-                                 wxAlignment align = wxALIGN_LEFT,
-                                 int indexAccel = -1)
-        { m_renderer->DrawRadioButton(dc, label, bitmap, rect,
-                                      flags, align, indexAccel); }
-#if wxUSE_TOOLBAR
-    virtual void DrawToolBarButton(wxDC& dc,
-                                   const wxString& label,
-                                   const wxBitmap& bitmap,
-                                   const wxRect& rect,
-                                   int flags = 0,
-                                   long style = 0,
-                                   int tbarStyle = 0)
-        { m_renderer->DrawToolBarButton(dc, label, bitmap, rect, flags, style, tbarStyle); }
-#endif // wxUSE_TOOLBAR
-
-#if wxUSE_TEXTCTRL
-    virtual void DrawTextLine(wxDC& dc,
-                              const wxString& text,
-                              const wxRect& rect,
-                              int selStart = -1,
-                              int selEnd = -1,
-                              int flags = 0)
-        { m_renderer->DrawTextLine(dc, text, rect, selStart, selEnd, flags); }
-    virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect)
-        { m_renderer->DrawLineWrapMark(dc, rect); }
-#endif // wxUSE_TEXTCTRL
-
-#if wxUSE_NOTEBOOK
-    virtual void DrawTab(wxDC& dc,
-                         const wxRect& rect,
-                         wxDirection dir,
-                         const wxString& label,
-                         const wxBitmap& bitmap = wxNullBitmap,
-                         int flags = 0,
-                         int accel = -1)
-        { m_renderer->DrawTab(dc, rect, dir, label, bitmap, flags, accel); }
-#endif // wxUSE_NOTEBOOK
-
-#if wxUSE_SLIDER
-
-    virtual void DrawSliderShaft(wxDC& dc,
-                                 const wxRect& rect,
-                                 int lenThumb,
-                                 wxOrientation orient,
-                                 int flags = 0,
-                                 long style = 0,
-                                 wxRect *rectShaft = NULL)
-        { m_renderer->DrawSliderShaft(dc, rect, lenThumb, orient, flags, style, rectShaft); }
-    virtual void DrawSliderThumb(wxDC& dc,
-                                 const wxRect& rect,
-                                 wxOrientation orient,
-                                 int flags = 0,
-                                 long style = 0)
-        { m_renderer->DrawSliderThumb(dc, rect, orient, flags, style); }
-    virtual void DrawSliderTicks(wxDC& dc,
-                                 const wxRect& rect,
-                                 int lenThumb,
-                                 wxOrientation orient,
-                                 int start,
-                                 int end,
-                                 int WXUNUSED(step) = 1,
-                                 int flags = 0,
-                                 long style = 0)
-        { m_renderer->DrawSliderTicks(dc, rect, lenThumb, orient,
-                                      start, end, start, flags, style); }
-#endif // wxUSE_SLIDER
-
-#if wxUSE_MENUS
-    virtual void DrawMenuBarItem(wxDC& dc,
-                                 const wxRect& rect,
-                                 const wxString& label,
-                                 int flags = 0,
-                                 int indexAccel = -1)
-        { m_renderer->DrawMenuBarItem(dc, rect, label, flags, indexAccel); }
-    virtual void DrawMenuItem(wxDC& dc,
-                              wxCoord y,
-                              const wxMenuGeometryInfo& gi,
-                              const wxString& label,
-                              const wxString& accel,
-                              const wxBitmap& bitmap = wxNullBitmap,
-                              int flags = 0,
-                              int indexAccel = -1)
-        { m_renderer->DrawMenuItem(dc, y, gi, label, accel,
-                                   bitmap, flags, indexAccel); }
-    virtual void DrawMenuSeparator(wxDC& dc,
-                                   wxCoord y,
-                                   const wxMenuGeometryInfo& geomInfo)
-        { m_renderer->DrawMenuSeparator(dc, y, geomInfo); }
-#endif // wxUSE_MENUS
-
-#if wxUSE_STATUSBAR
-    virtual void DrawStatusField(wxDC& dc,
-                                 const wxRect& rect,
-                                 const wxString& label,
-                                 int flags = 0, int style = 0)
-        { m_renderer->DrawStatusField(dc, rect, label, flags, style); }
-#endif // wxUSE_STATUSBAR
-
-    virtual void DrawFrameTitleBar(wxDC& dc,
-                                   const wxRect& rect,
-                                   const wxString& title,
-                                   const wxIcon& icon,
-                                   int flags,
-                                   int specialButton = 0,
-                                   int specialButtonFlag = 0)
-        { m_renderer->DrawFrameTitleBar(dc, rect, title, icon, flags,
-                                        specialButton, specialButtonFlag); }
-    virtual void DrawFrameBorder(wxDC& dc,
-                                 const wxRect& rect,
-                                 int flags)
-        { m_renderer->DrawFrameBorder(dc, rect, flags); }
-    virtual void DrawFrameBackground(wxDC& dc,
-                                     const wxRect& rect,
-                                     int flags)
-        { m_renderer->DrawFrameBackground(dc, rect, flags); }
-    virtual void DrawFrameTitle(wxDC& dc,
-                                const wxRect& rect,
-                                const wxString& title,
-                                int flags)
-        { m_renderer->DrawFrameTitle(dc, rect, title, flags); }
-    virtual void DrawFrameIcon(wxDC& dc,
-                               const wxRect& rect,
-                               const wxIcon& icon,
-                               int flags)
-        { m_renderer->DrawFrameIcon(dc, rect, icon, flags); }
-    virtual void DrawFrameButton(wxDC& dc,
-                                 wxCoord x, wxCoord y,
-                                 int button,
-                                 int flags = 0)
-        { m_renderer->DrawFrameButton(dc, x, y, button, flags); }
-
-#if wxUSE_COMBOBOX
-    virtual void GetComboBitmaps(wxBitmap *bmpNormal,
-                                 wxBitmap *bmpFocus,
-                                 wxBitmap *bmpPressed,
-                                 wxBitmap *bmpDisabled)
-        { m_renderer->GetComboBitmaps(bmpNormal, bmpFocus,
-                                      bmpPressed, bmpDisabled); }
-#endif // wxUSE_COMBOBOX
-
-    virtual void AdjustSize(wxSize *size, const wxWindow *window)
-        { m_renderer->AdjustSize(size, window); }
-    virtual wxRect GetBorderDimensions(wxBorder border) const
-        { return m_renderer->GetBorderDimensions(border); }
-    virtual bool AreScrollbarsInsideBorder() const
-        { return m_renderer->AreScrollbarsInsideBorder(); }
-
-#if wxUSE_SCROLLBAR
-    virtual wxSize GetScrollbarArrowSize() const
-        { return m_renderer->GetScrollbarArrowSize(); }
-#endif // wxUSE_SCROLLBAR
-
-    virtual wxCoord GetListboxItemHeight(wxCoord fontHeight)
-        { return m_renderer->GetListboxItemHeight(fontHeight); }
-    virtual wxSize GetCheckBitmapSize() const
-        { return m_renderer->GetCheckBitmapSize(); }
-    virtual wxSize GetRadioBitmapSize() const
-        { return m_renderer->GetRadioBitmapSize(); }
-    virtual wxCoord GetCheckItemMargin() const
-        { return m_renderer->GetCheckItemMargin(); }
-
-#if wxUSE_TOOLBAR
-    virtual wxSize GetToolBarButtonSize(wxCoord *separator) const
-        { return m_renderer->GetToolBarButtonSize(separator); }
-    virtual wxSize GetToolBarMargin() const
-        { return m_renderer->GetToolBarMargin(); }
-#endif // wxUSE_TOOLBAR
-
-#if wxUSE_TEXTCTRL
-    virtual wxRect GetTextTotalArea(const wxTextCtrl *text,
-                                    const wxRect& rect) const
-        { return m_renderer->GetTextTotalArea(text, rect); }
-    virtual wxRect GetTextClientArea(const wxTextCtrl *text,
-                                     const wxRect& rect,
-                                     wxCoord *extraSpaceBeyond) const
-        { return m_renderer->GetTextClientArea(text, rect, extraSpaceBeyond); }
-#endif // wxUSE_TEXTCTRL
-
-#if wxUSE_NOTEBOOK
-    virtual wxSize GetTabIndent() const { return m_renderer->GetTabIndent(); }
-    virtual wxSize GetTabPadding() const { return m_renderer->GetTabPadding(); }
-#endif // wxUSE_NOTEBOOK
-
-#if wxUSE_SLIDER
-    virtual wxCoord GetSliderDim() const
-        { return m_renderer->GetSliderDim(); }
-    virtual wxCoord GetSliderTickLen() const
-        { return m_renderer->GetSliderTickLen(); }
-
-    virtual wxRect GetSliderShaftRect(const wxRect& rect,
-                                      int lenThumb,
-                                      wxOrientation orient,
-                                      long style = 0) const
-        { return m_renderer->GetSliderShaftRect(rect, lenThumb, orient, style); }
-    virtual wxSize GetSliderThumbSize(const wxRect& rect,
-                                      int lenThumb,
-                                      wxOrientation orient) const
-        { return m_renderer->GetSliderThumbSize(rect, lenThumb, orient); }
-#endif // wxUSE_SLIDER
-
-    virtual wxSize GetProgressBarStep() const
-        { return m_renderer->GetProgressBarStep(); }
-
-#if wxUSE_MENUS
-    virtual wxSize GetMenuBarItemSize(const wxSize& sizeText) const
-        { return m_renderer->GetMenuBarItemSize(sizeText); }
-    virtual wxMenuGeometryInfo *GetMenuGeometry(wxWindow *win,
-                                                const wxMenu& menu) const
-        { return m_renderer->GetMenuGeometry(win, menu); }
-#endif // wxUSE_MENUS
-
-#if wxUSE_STATUSBAR
-    virtual wxSize GetStatusBarBorders() const
-        { return m_renderer->GetStatusBarBorders(); }
-    virtual wxCoord GetStatusBarBorderBetweenFields() const
-        { return m_renderer->GetStatusBarBorderBetweenFields(); }
-    virtual wxSize GetStatusBarFieldMargins() const
-        { return m_renderer->GetStatusBarFieldMargins(); }
-#endif // wxUSE_STATUSBAR
-
-    virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const
-        { return m_renderer->GetFrameClientArea(rect, flags); }
-    virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const
-        { return m_renderer->GetFrameTotalSize(clientSize, flags); }
-    virtual wxSize GetFrameMinSize(int flags) const
-        { return m_renderer->GetFrameMinSize(flags); }
-    virtual wxSize GetFrameIconSize() const
-        { return m_renderer->GetFrameIconSize(); }
-    virtual int HitTestFrame(const wxRect& rect,
-                             const wxPoint& pt,
-                             int flags) const
-        { return m_renderer->HitTestFrame(rect, pt, flags); }
-
-    virtual int  DrawHeaderButton(wxWindow *win,
-                                  wxDC& dc,
-                                  const wxRect& rect,
-                                  int flags = 0,
-                                  wxHeaderSortIconType sortIcon = wxHDR_SORT_ICON_NONE,
-                                  wxHeaderButtonParams* params = NULL)
-        { return m_renderer->DrawHeaderButton(win, dc, rect, flags, sortIcon, params); }
-    virtual void DrawTreeItemButton(wxWindow *win,
-                                    wxDC& dc,
-                                    const wxRect& rect,
-                                    int flags = 0)
-        { m_renderer->DrawTreeItemButton(win, dc, rect, flags); }
-
-protected:
-    wxRenderer *m_renderer;
-};
-
-// ----------------------------------------------------------------------------
-// wxControlRenderer: wraps the wxRenderer functions in a form easy to use from
-// OnPaint()
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxControlRenderer
-{
-public:
-    // create a renderer for this dc with this "fundamental" renderer
-    wxControlRenderer(wxWindow *control, wxDC& dc, wxRenderer *renderer);
-
-    // operations
-    void DrawLabel();
-    void DrawButtonLabel(const wxBitmap& bitmap = wxNullBitmap,
-                         wxCoord marginX = 0, wxCoord marginY = 0);
-#if wxUSE_LISTBOX
-    void DrawItems(const wxListBox *listbox,
-                   size_t itemFirst, size_t itemLast);
-#endif // wxUSE_LISTBOX
-#if wxUSE_CHECKLISTBOX
-    void DrawCheckItems(const wxCheckListBox *listbox,
-                        size_t itemFirst, size_t itemLast);
-#endif // wxUSE_CHECKLISTBOX
-    void DrawButtonBorder();
-    // the line must be either horizontal or vertical
-    void DrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
-    void DrawFrame();
-    void DrawBitmap(const wxBitmap& bitmap);
-    void DrawBackgroundBitmap();
-    void DrawScrollbar(const wxScrollBar *scrollbar, int thumbPosOld);
-#if wxUSE_GAUGE
-    void DrawProgressBar(const wxGauge *gauge);
-#endif // wxUSE_GAUGE
-
-    // accessors
-    wxWindow *GetWindow() const { return m_window; }
-    wxRenderer *GetRenderer() const { return m_renderer; }
-
-    wxDC& GetDC() { return m_dc; }
-
-    const wxRect& GetRect() const { return m_rect; }
-    wxRect& GetRect() { return m_rect; }
-
-    // static helpers
-    static void DrawBitmap(wxDC &dc,
-                           const wxBitmap& bitmap,
-                           const wxRect& rect,
-                           int alignment = wxALIGN_CENTRE |
-                                           wxALIGN_CENTRE_VERTICAL,
-                           wxStretch stretch = wxSTRETCH_NOT);
-
-private:
-
-#if wxUSE_LISTBOX
-    // common part of DrawItems() and DrawCheckItems()
-    void DoDrawItems(const wxListBox *listbox,
-                     size_t itemFirst, size_t itemLast,
-                     bool isCheckLbox = false);
-#endif // wxUSE_LISTBOX
-
-    wxWindow *m_window;
-    wxRenderer *m_renderer;
-    wxDC& m_dc;
-    wxRect m_rect;
-};
-
-#endif // _WX_UNIV_RENDERER_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/scrarrow.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/scrarrow.h
deleted file mode 100644
index 6e6997c687..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/scrarrow.h
+++ /dev/null
@@ -1,111 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/scrarrow.h
-// Purpose:     wxScrollArrows class
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     22.01.01
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_SCRARROW_H_
-#define _WX_UNIV_SCRARROW_H_
-
-// ----------------------------------------------------------------------------
-// wxScrollArrows is not a control but just a class containing the common
-// functionality of scroll arrows, whether part of scrollbars, spin ctrls or
-// anything else.
-//
-// To customize its behaviour, wxScrollArrows doesn't use any virtual methods
-// but instead a callback pointer to a wxControlWithArrows object which is used
-// for all control-dependent stuff. Thus, to use wxScrollArrows, you just need
-// to derive from the wxControlWithArrows interface and implement its methods.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxControlWithArrows;
-class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLIMPEXP_FWD_CORE wxMouseEvent;
-class WXDLLIMPEXP_FWD_CORE wxRect;
-class WXDLLIMPEXP_FWD_CORE wxRenderer;
-
-// ----------------------------------------------------------------------------
-// wxScrollArrows: an abstraction of scrollbar arrow
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxScrollArrows
-{
-public:
-    enum Arrow
-    {
-        Arrow_None = -1,
-        Arrow_First,        // left or top
-        Arrow_Second,       // right or bottom
-        Arrow_Max
-    };
-
-    // ctor requires a back pointer to wxControlWithArrows
-    wxScrollArrows(wxControlWithArrows *control);
-
-    // draws the arrow on the given DC in the given rectangle, uses
-    // wxControlWithArrows::GetArrowState() to get its current state
-    void DrawArrow(Arrow arrow, wxDC& dc, const wxRect& rect,
-                   bool scrollbarLike = false) const;
-
-    // process a mouse move, enter or leave event, possibly calling
-    // wxControlWithArrows::SetArrowState() if
-    // wxControlWithArrows::HitTestArrow() says that the mouse has left/entered
-    // an arrow
-    bool HandleMouseMove(const wxMouseEvent& event) const;
-
-    // process a mouse click event
-    bool HandleMouse(const wxMouseEvent& event) const;
-
-    // dtor
-    ~wxScrollArrows();
-
-private:
-    // set or clear the wxCONTROL_CURRENT flag for the arrow
-    void UpdateCurrentFlag(Arrow arrow, Arrow arrowCur) const;
-
-    // the main control
-    wxControlWithArrows *m_control;
-
-    // the data for the mouse capture
-    struct wxScrollArrowCaptureData *m_captureData;
-};
-
-// ----------------------------------------------------------------------------
-// wxControlWithArrows: interface implemented by controls using wxScrollArrows
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxControlWithArrows
-{
-public:
-    virtual ~wxControlWithArrows() {}
-
-    // get the renderer to use for drawing the arrows
-    virtual wxRenderer *GetRenderer() const = 0;
-
-    // get the controls window (used for mouse capturing)
-    virtual wxWindow *GetWindow() = 0;
-
-    // get the orientation of the arrows (vertical or horizontal)
-    virtual bool IsVertical() const = 0;
-
-    // get the state of this arrow as combination of wxCONTROL_XXX flags
-    virtual int GetArrowState(wxScrollArrows::Arrow arrow) const = 0;
-
-    // set or clear the specified flag in the arrow state: this function is
-    // responsible for refreshing the control
-    virtual void SetArrowFlag(wxScrollArrows::Arrow arrow,
-                              int flag, bool set = true) = 0;
-
-    // hit testing: return on which arrow the point is (or Arrow_None)
-    virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const = 0;
-
-    // called when the arrow is pressed, return true to continue scrolling and
-    // false to stop it
-    virtual bool OnArrow(wxScrollArrows::Arrow arrow) = 0;
-};
-
-#endif // _WX_UNIV_SCRARROW_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/scrolbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/scrolbar.h
deleted file mode 100644
index c82692f9fe..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/scrolbar.h
+++ /dev/null
@@ -1,282 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/scrolbar.h
-// Purpose:     wxScrollBar for wxUniversal
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     20.08.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_SCROLBAR_H_
-#define _WX_UNIV_SCROLBAR_H_
-
-class WXDLLIMPEXP_FWD_CORE wxScrollTimer;
-
-#include "wx/univ/scrarrow.h"
-#include "wx/renderer.h"
-
-// ----------------------------------------------------------------------------
-// the actions supported by this control
-// ----------------------------------------------------------------------------
-
-// scroll the bar
-#define wxACTION_SCROLL_START       wxT("start")     // to the beginning
-#define wxACTION_SCROLL_END         wxT("end")       // to the end
-#define wxACTION_SCROLL_LINE_UP     wxT("lineup")    // one line up/left
-#define wxACTION_SCROLL_PAGE_UP     wxT("pageup")    // one page up/left
-#define wxACTION_SCROLL_LINE_DOWN   wxT("linedown")  // one line down/right
-#define wxACTION_SCROLL_PAGE_DOWN   wxT("pagedown")  // one page down/right
-
-// the scrollbar thumb may be dragged
-#define wxACTION_SCROLL_THUMB_DRAG      wxT("thumbdrag")
-#define wxACTION_SCROLL_THUMB_MOVE      wxT("thumbmove")
-#define wxACTION_SCROLL_THUMB_RELEASE   wxT("thumbrelease")
-
-// ----------------------------------------------------------------------------
-// wxScrollBar
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxScrollBar : public wxScrollBarBase,
-                                public wxControlWithArrows
-{
-public:
-    // scrollbar elements: they correspond to wxHT_SCROLLBAR_XXX constants but
-    // start from 0 which allows to use them as array indices
-    enum Element
-    {
-        Element_Arrow_Line_1,
-        Element_Arrow_Line_2,
-        Element_Arrow_Page_1,
-        Element_Arrow_Page_2,
-        Element_Thumb,
-        Element_Bar_1,
-        Element_Bar_2,
-        Element_Max
-    };
-
-    wxScrollBar();
-    wxScrollBar(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxSB_HORIZONTAL,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxScrollBarNameStr);
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxSB_HORIZONTAL,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxScrollBarNameStr);
-
-    virtual ~wxScrollBar();
-
-    // implement base class pure virtuals
-    virtual int GetThumbPosition() const;
-    virtual int GetThumbSize() const;
-    virtual int GetPageSize() const;
-    virtual int GetRange() const;
-
-    virtual void SetThumbPosition(int thumbPos);
-    virtual void SetScrollbar(int position, int thumbSize,
-                              int range, int pageSize,
-                              bool refresh = true);
-
-    // wxScrollBar actions
-    void ScrollToStart();
-    void ScrollToEnd();
-    bool ScrollLines(int nLines);
-    bool ScrollPages(int nPages);
-
-    virtual bool PerformAction(const wxControlAction& action,
-                               long numArg = 0,
-                               const wxString& strArg = wxEmptyString);
-
-    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
-    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
-    {
-        return GetStdInputHandler(handlerDef);
-    }
-
-    // scrollbars around a normal window should not receive the focus
-    virtual bool AcceptsFocus() const;
-
-    // wxScrollBar sub elements state (combination of wxCONTROL_XXX)
-    void SetState(Element which, int flags);
-    int GetState(Element which) const;
-
-    // implement wxControlWithArrows methods
-    virtual wxRenderer *GetRenderer() const { return m_renderer; }
-    virtual wxWindow *GetWindow() { return this; }
-    virtual bool IsVertical() const { return wxScrollBarBase::IsVertical(); }
-    virtual int GetArrowState(wxScrollArrows::Arrow arrow) const;
-    virtual void SetArrowFlag(wxScrollArrows::Arrow arrow, int flag, bool set);
-    virtual bool OnArrow(wxScrollArrows::Arrow arrow);
-    virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const;
-
-    // for wxControlRenderer::DrawScrollbar() only
-    const wxScrollArrows& GetArrows() const { return m_arrows; }
-
-    // returns one of wxHT_SCROLLBAR_XXX constants
-    wxHitTest HitTestBar(const wxPoint& pt) const;
-
-    // idle processing
-    virtual void OnInternalIdle();
-
-protected:
-    virtual wxSize DoGetBestClientSize() const;
-    virtual void DoDraw(wxControlRenderer *renderer);
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-    // forces update of thumb's visual appearence (does nothing if m_dirty=false)
-    void UpdateThumb();
-
-    // SetThumbPosition() helper
-    void DoSetThumb(int thumbPos);
-
-    // common part of all ctors
-    void Init();
-
-    // is this scrollbar attached to a window or a standalone control?
-    bool IsStandalone() const;
-
-    // scrollbar geometry methods:
-
-    // gets the bounding box for a scrollbar element for the given (by default
-    // - current) thumb position
-    wxRect GetScrollbarRect(wxScrollBar::Element elem, int thumbPos = -1) const;
-
-    // returns the size of the scrollbar shaft excluding the arrows
-    wxCoord GetScrollbarSize() const;
-
-    // translate the scrollbar position (in logical units) into physical
-    // coordinate (in pixels) and the other way round
-    wxCoord ScrollbarToPixel(int thumbPos = -1);
-    int PixelToScrollbar(wxCoord coord);
-
-    // return the starting and ending positions, in pixels, of the thumb of a
-    // scrollbar with the given logical position, thumb size and range and the
-    // given physical length
-    static void GetScrollBarThumbSize(wxCoord length,
-                                      int thumbPos,
-                                      int thumbSize,
-                                      int range,
-                                      wxCoord *thumbStart,
-                                      wxCoord *thumbEnd);
-
-private:
-    // total range of the scrollbar in logical units
-    int m_range;
-
-    // the current and previous (after last refresh - this is used for
-    // repainting optimisation) size of the thumb in logical units (from 0 to
-    // m_range) and its position (from 0 to m_range - m_thumbSize)
-    int m_thumbSize,
-        m_thumbPos,
-        m_thumbPosOld;
-
-    // the page size, i.e. the number of lines by which to scroll when page
-    // up/down action is performed
-    int m_pageSize;
-
-    // the state of the sub elements
-    int m_elementsState[Element_Max];
-
-    // the dirty flag: if set, scrollbar must be updated
-    bool m_dirty;
-
-    // the object handling the arrows
-    wxScrollArrows m_arrows;
-
-    friend WXDLLIMPEXP_CORE class wxControlRenderer; // for geometry methods
-    friend class wxStdScrollBarInputHandler; // for geometry methods
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxScrollBar)
-};
-
-// ----------------------------------------------------------------------------
-// Standard scrollbar input handler which can be used as a base class
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxStdScrollBarInputHandler : public wxStdInputHandler
-{
-public:
-    // constructor takes a renderer (used for scrollbar hit testing) and the
-    // base handler to which all unhandled events are forwarded
-    wxStdScrollBarInputHandler(wxRenderer *renderer,
-                               wxInputHandler *inphand);
-
-    virtual bool HandleKey(wxInputConsumer *consumer,
-                           const wxKeyEvent& event,
-                           bool pressed);
-    virtual bool HandleMouse(wxInputConsumer *consumer,
-                             const wxMouseEvent& event);
-    virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event);
-
-    virtual ~wxStdScrollBarInputHandler();
-
-    // this method is called by wxScrollBarTimer only and may be overridden
-    //
-    // return true to continue scrolling, false to stop the timer
-    virtual bool OnScrollTimer(wxScrollBar *scrollbar,
-                               const wxControlAction& action);
-
-protected:
-    // return true if the mouse button can be used to activate scrollbar, false
-    // if not (any button under GTK+ unlike left button only which is default)
-    virtual bool IsAllowedButton(int button) const
-        { return button == wxMOUSE_BTN_LEFT; }
-
-    // set or clear the specified flag on the scrollbar element corresponding
-    // to m_htLast
-    void SetElementState(wxScrollBar *scrollbar, int flag, bool doIt);
-
-    // [un]highlight the scrollbar element corresponding to m_htLast
-    virtual void Highlight(wxScrollBar *scrollbar, bool doIt)
-        { SetElementState(scrollbar, wxCONTROL_CURRENT, doIt); }
-
-    // [un]press the scrollbar element corresponding to m_htLast
-    virtual void Press(wxScrollBar *scrollbar, bool doIt)
-        { SetElementState(scrollbar, wxCONTROL_PRESSED, doIt); }
-
-    // stop scrolling because we reached the end point
-    void StopScrolling(wxScrollBar *scrollbar);
-
-    // get the mouse coordinates in the scrollbar direction from the event
-    wxCoord GetMouseCoord(const wxScrollBar *scrollbar,
-                          const wxMouseEvent& event) const;
-
-    // generate a "thumb move" action for this mouse event
-    void HandleThumbMove(wxScrollBar *scrollbar, const wxMouseEvent& event);
-
-
-    // the window (scrollbar) which has capture or NULL and the flag telling if
-    // the mouse is inside the element which captured it or not
-    wxWindow *m_winCapture;
-    bool      m_winHasMouse;
-    int       m_btnCapture;  // the mouse button which has captured mouse
-
-    // the position where we started scrolling by page
-    wxPoint m_ptStartScrolling;
-
-    // one of wxHT_SCROLLBAR_XXX value: where has the mouse been last time?
-    wxHitTest m_htLast;
-
-    // the renderer (we use it only for hit testing)
-    wxRenderer *m_renderer;
-
-    // the offset of the top/left of the scrollbar relative to the mouse to
-    // keep during the thumb drag
-    int m_ofsMouse;
-
-    // the timer for generating scroll events when the mouse stays pressed on
-    // a scrollbar
-    wxScrollTimer *m_timerScroll;
-};
-
-#endif // _WX_UNIV_SCROLBAR_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/scrthumb.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/scrthumb.h
deleted file mode 100644
index 3da2e716e4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/scrthumb.h
+++ /dev/null
@@ -1,139 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/scrthumb.h
-// Purpose:     wxScrollThumb class
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     12.02.01
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_SCRTHUMB_H_
-#define _WX_UNIV_SCRTHUMB_H_
-
-// ----------------------------------------------------------------------------
-// wxScrollThumb is not a control but just a class containing the common
-// functionality of scroll thumb such as used by scrollbars, sliders and maybe
-// other (user) controls
-//
-// This class is similar to wxScrollThumb.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxControlWithThumb;
-class WXDLLIMPEXP_FWD_CORE wxMouseEvent;
-class WXDLLIMPEXP_FWD_CORE wxRect;
-class WXDLLIMPEXP_FWD_CORE wxScrollTimer;
-
-#include "wx/timer.h"
-
-// ----------------------------------------------------------------------------
-// wxScrollThumb: an abstraction of scrollbar thumb
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxScrollThumb
-{
-public:
-    enum Shaft
-    {
-        Shaft_None = -1,
-        Shaft_Above,    // or to the left of the thumb
-        Shaft_Below,    // or to the right of the thumb
-        Shaft_Thumb,    // on the thumb
-        Shaft_Max
-    };
-
-    // ctor requires a back pointer to wxControlWithThumb
-    wxScrollThumb(wxControlWithThumb *control);
-
-    // process a mouse click: will capture the mouse if the button was pressed
-    // on either the thumb (start dragging it then) or the shaft (start
-    // scrolling)
-    bool HandleMouse(const wxMouseEvent& event) const;
-
-    // process a mouse move
-    bool HandleMouseMove(const wxMouseEvent& event) const;
-
-    // dtor
-    ~wxScrollThumb();
-
-private:
-    // do we have the mouse capture?
-    bool HasCapture() const { return m_captureData != NULL; }
-
-    // get the coord of this event in the direction we're interested in (y for
-    // vertical shaft or x for horizontal ones)
-    wxCoord GetMouseCoord(const wxMouseEvent& event) const;
-
-    // get the position of the thumb corresponding to the current mouse
-    // position (can only be called while we're dragging the thumb!)
-    int GetThumbPos(const wxMouseEvent& event) const;
-
-    // the main control
-    wxControlWithThumb *m_control;
-
-    // the part of it where the mouse currently is
-    Shaft m_shaftPart;
-
-    // the data for the mouse capture
-    struct WXDLLIMPEXP_FWD_CORE wxScrollThumbCaptureData *m_captureData;
-};
-
-// ----------------------------------------------------------------------------
-// wxControlWithThumb: interface implemented by controls using wxScrollThumb
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxControlWithThumb
-{
-public:
-    virtual ~wxControlWithThumb() {}
-
-    // simple accessors
-    // ----------------
-
-    // get the controls window (used for mouse capturing)
-    virtual wxWindow *GetWindow() = 0;
-
-    // get the orientation of the shaft (vertical or horizontal)
-    virtual bool IsVertical() const = 0;
-
-    // geometry functions
-    // ------------------
-
-    // hit testing: return part of the shaft the point is in (or Shaft_None)
-    virtual wxScrollThumb::Shaft HitTest(const wxPoint& pt) const = 0;
-
-    // get the current position in pixels of the thumb
-    virtual wxCoord ThumbPosToPixel() const = 0;
-
-    // transform from pixel offset to the thumb logical position
-    virtual int PixelToThumbPos(wxCoord x) const = 0;
-
-    // callbacks
-    // ---------
-
-    // set or clear the specified flag in the arrow state: this function is
-    // responsible for refreshing the control
-    virtual void SetShaftPartState(wxScrollThumb::Shaft shaftPart,
-                                   int flag,
-                                   bool set = true) = 0;
-
-    // called when the user starts dragging the thumb
-    virtual void OnThumbDragStart(int pos) = 0;
-
-    // called while the user drags the thumb
-    virtual void OnThumbDrag(int pos) = 0;
-
-    // called when the user stops dragging the thumb
-    virtual void OnThumbDragEnd(int pos) = 0;
-
-    // called before starting to call OnPageScroll() - gives the control the
-    // possibility to remember its current state
-    virtual void OnPageScrollStart() = 0;
-
-    // called while the user keeps the mouse pressed above/below the thumb,
-    // return true to continue scrollign and false to stop it (e.g. because the
-    // scrollbar has reached the top/bottom)
-    virtual bool OnPageScroll(int pageInc) = 0;
-};
-
-#endif // _WX_UNIV_SCRTHUMB_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/scrtimer.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/scrtimer.h
deleted file mode 100644
index 3d3f059dc5..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/scrtimer.h
+++ /dev/null
@@ -1,50 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/scrtimer.h
-// Purpose:     wxScrollTimer: small helper class for wxScrollArrow/Thumb
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     18.02.01
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_SCRTIMER_H
-#define _WX_UNIV_SCRTIMER_H
-
-// NB: this class is implemented in scrolbar.cpp
-
-#include "wx/defs.h"
-
-#if wxUSE_TIMER
-
-#include "wx/timer.h"
-
-// ----------------------------------------------------------------------------
-// wxScrollTimer: the timer used when the arrow or scrollbar shaft is kept
-// pressed
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxScrollTimer : public wxTimer
-{
-public:
-    // default ctor
-    wxScrollTimer();
-
-    // start generating the events
-    void StartAutoScroll();
-
-    // the base class method
-    virtual void Notify();
-
-protected:
-    // to implement in derived classes: perform the scroll action and return
-    // true to continue scrolling or false to stop
-    virtual bool DoNotify() = 0;
-
-    // should we skip the next timer event?
-    bool m_skipNext;
-};
-
-#endif // wxUSE_TIMER
-
-#endif // _WX_UNIV_SCRTIMER_H
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/setup.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/setup.h
deleted file mode 100644
index f9dc3951e3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/setup.h
+++ /dev/null
@@ -1,1673 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/setup.h
-// Purpose:     Configuration for the universal build of the library
-// Author:      Julian Smart
-// Created:     01/02/97
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SETUP_H_
-#define _WX_SETUP_H_
-
-/* --- start common options --- */
-// ----------------------------------------------------------------------------
-// global settings
-// ----------------------------------------------------------------------------
-
-// define this to 0 when building wxBase library - this can also be done from
-// makefile/project file overriding the value here
-#ifndef wxUSE_GUI
-    #define wxUSE_GUI            1
-#endif // wxUSE_GUI
-
-// ----------------------------------------------------------------------------
-// compatibility settings
-// ----------------------------------------------------------------------------
-
-// This setting determines the compatibility with 2.6 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_6 0
-
-// This setting determines the compatibility with 2.8 API: set it to 0 to
-// flag all cases of using deprecated functions.
-//
-// Default is 1 but please try building your code with 0 as the default will
-// change to 0 in the next version and the deprecated functions will disappear
-// in the version after it completely.
-//
-// Recommended setting: 0 (please update your code)
-#define WXWIN_COMPATIBILITY_2_8 1
-
-// MSW-only: Set to 0 for accurate dialog units, else 1 for old behaviour when
-// default system font is used for wxWindow::GetCharWidth/Height() instead of
-// the current font.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxDIALOG_UNIT_COMPATIBILITY   0
-
-// ----------------------------------------------------------------------------
-// debugging settings
-// ----------------------------------------------------------------------------
-
-// wxDEBUG_LEVEL will be defined as 1 in wx/debug.h so normally there is no
-// need to define it here. You may do it for two reasons: either completely
-// disable/compile out the asserts in release version (then do it inside #ifdef
-// NDEBUG) or, on the contrary, enable more asserts, including the usually
-// disabled ones, in the debug build (then do it inside #ifndef NDEBUG)
-//
-// #ifdef NDEBUG
-//  #define wxDEBUG_LEVEL 0
-// #else
-//  #define wxDEBUG_LEVEL 2
-// #endif
-
-// wxHandleFatalExceptions() may be used to catch the program faults at run
-// time and, instead of terminating the program with a usual GPF message box,
-// call the user-defined wxApp::OnFatalException() function. If you set
-// wxUSE_ON_FATAL_EXCEPTION to 0, wxHandleFatalExceptions() will not work.
-//
-// This setting is for Win32 only and can only be enabled if your compiler
-// supports Win32 structured exception handling (currently only VC++ does)
-//
-// Default is 1
-//
-// Recommended setting: 1 if your compiler supports it.
-#define wxUSE_ON_FATAL_EXCEPTION 1
-
-// Set this to 1 to be able to generate a human-readable (unlike
-// machine-readable minidump created by wxCrashReport::Generate()) stack back
-// trace when your program crashes using wxStackWalker
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_STACKWALKER 1
-
-// Set this to 1 to compile in wxDebugReport class which allows you to create
-// and optionally upload to your web site a debug report consisting of back
-// trace of the crash (if wxUSE_STACKWALKER == 1) and other information.
-//
-// Default is 1 if supported by the compiler.
-//
-// Recommended setting: 1, it is compiled into a separate library so there
-//                         is no overhead if you don't use it
-#define wxUSE_DEBUGREPORT 1
-
-// Generic comment about debugging settings: they are very useful if you don't
-// use any other memory leak detection tools such as Purify/BoundsChecker, but
-// are probably redundant otherwise. Also, Visual C++ CRT has the same features
-// as wxWidgets memory debugging subsystem built in since version 5.0 and you
-// may prefer to use it instead of built in memory debugging code because it is
-// faster and more fool proof.
-//
-// Using VC++ CRT memory debugging is enabled by default in debug build (_DEBUG
-// is defined) if wxUSE_GLOBAL_MEMORY_OPERATORS is *not* enabled (i.e. is 0)
-// and if __NO_VC_CRTDBG__ is not defined.
-
-// The rest of the options in this section are obsolete and not supported,
-// enable them at your own risk.
-
-// If 1, enables wxDebugContext, for writing error messages to file, etc. If
-// __WXDEBUG__ is not defined, will still use the normal memory operators.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_CONTEXT 0
-
-// If 1, enables debugging versions of wxObject::new and wxObject::delete *IF*
-// __WXDEBUG__ is also defined.
-//
-// WARNING: this code may not work with all architectures, especially if
-// alignment is an issue. This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 1 if you are not using a memory debugging tool, else 0
-#define wxUSE_MEMORY_TRACING 0
-
-// In debug mode, cause new and delete to be redefined globally.
-// If this causes problems (e.g. link errors which is a common problem
-// especially if you use another library which also redefines the global new
-// and delete), set this to 0.
-// This switch is currently ignored for mingw / cygwin
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 0
-
-// In debug mode, causes new to be defined to be WXDEBUG_NEW (see object.h). If
-// this causes problems (e.g. link errors), set this to 0. You may need to set
-// this to 0 if using templates (at least for VC++). This switch is currently
-// ignored for MinGW/Cygwin.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_DEBUG_NEW_ALWAYS 0
-
-
-// ----------------------------------------------------------------------------
-// Unicode support
-// ----------------------------------------------------------------------------
-
-// These settings are obsolete: the library is always built in Unicode mode
-// now, only set wxUSE_UNICODE to 0 to compile legacy code in ANSI mode if
-// absolutely necessary -- updating it is strongly recommended as the ANSI mode
-// will disappear completely in future wxWidgets releases.
-#ifndef wxUSE_UNICODE
-    #define wxUSE_UNICODE 1
-#endif
-
-// wxUSE_WCHAR_T is required by wxWidgets now, don't change.
-#define wxUSE_WCHAR_T 1
-
-// ----------------------------------------------------------------------------
-// global features
-// ----------------------------------------------------------------------------
-
-// Compile library in exception-safe mode? If set to 1, the library will try to
-// behave correctly in presence of exceptions (even though it still will not
-// use the exceptions itself) and notify the user code about any unhandled
-// exceptions. If set to 0, propagation of the exceptions through the library
-// code will lead to undefined behaviour -- but the code itself will be
-// slightly smaller and faster.
-//
-// Note that like wxUSE_THREADS this option is automatically set to 0 if
-// wxNO_EXCEPTIONS is defined.
-//
-// Default is 1
-//
-// Recommended setting: depends on whether you intend to use C++ exceptions
-//                      in your own code (1 if you do, 0 if you don't)
-#define wxUSE_EXCEPTIONS    1
-
-// Set wxUSE_EXTENDED_RTTI to 1 to use extended RTTI
-//
-// Default is 0
-//
-// Recommended setting: 0 (this is still work in progress...)
-#define wxUSE_EXTENDED_RTTI 0
-
-// Support for message/error logging. This includes wxLogXXX() functions and
-// wxLog and derived classes. Don't set this to 0 unless you really know what
-// you are doing.
-//
-// Default is 1
-//
-// Recommended setting: 1 (always)
-#define wxUSE_LOG 1
-
-// Recommended setting: 1
-#define wxUSE_LOGWINDOW 1
-
-// Recommended setting: 1
-#define wxUSE_LOGGUI 1
-
-// Recommended setting: 1
-#define wxUSE_LOG_DIALOG 1
-
-// Support for command line parsing using wxCmdLineParser class.
-//
-// Default is 1
-//
-// Recommended setting: 1 (can be set to 0 if you don't use the cmd line)
-#define wxUSE_CMDLINE_PARSER 1
-
-// Support for multithreaded applications: if 1, compile in thread classes
-// (thread.h) and make the library a bit more thread safe. Although thread
-// support is quite stable by now, you may still consider recompiling the
-// library without it if you have no use for it - this will result in a
-// somewhat smaller and faster operation.
-//
-// Notice that if wxNO_THREADS is defined, wxUSE_THREADS is automatically reset
-// to 0 in wx/chkconf.h, so, for example, if you set USE_THREADS to 0 in
-// build/msw/config.* file this value will have no effect.
-//
-// Default is 1
-//
-// Recommended setting: 0 unless you do plan to develop MT applications
-#define wxUSE_THREADS 1
-
-// If enabled, compiles wxWidgets streams classes
-//
-// wx stream classes are used for image IO, process IO redirection, network
-// protocols implementation and much more and so disabling this results in a
-// lot of other functionality being lost.
-//
-// Default is 1
-//
-// Recommended setting: 1 as setting it to 0 disables many other things
-#define wxUSE_STREAMS       1
-
-// Support for positional parameters (e.g. %1$d, %2$s ...) in wxVsnprintf.
-// Note that if the system's implementation does not support positional
-// parameters, setting this to 1 forces the use of the wxWidgets implementation
-// of wxVsnprintf. The standard vsnprintf() supports positional parameters on
-// many Unix systems but usually doesn't under Windows.
-//
-// Positional parameters are very useful when translating a program since using
-// them in formatting strings allow translators to correctly reorder the
-// translated sentences.
-//
-// Default is 1
-//
-// Recommended setting: 1 if you want to support multiple languages
-#define wxUSE_PRINTF_POS_PARAMS      1
-
-// Enable the use of compiler-specific thread local storage keyword, if any.
-// This is used for wxTLS_XXX() macros implementation and normally should use
-// the compiler-provided support as it's simpler and more efficient, but is
-// disabled under Windows in wx/msw/chkconf.h as it can't be used if wxWidgets
-// is used in a dynamically loaded Win32 DLL (i.e. using LoadLibrary()) under
-// XP as this triggers a bug in compiler TLS support that results in crashes
-// when any TLS variables are used.
-//
-// If you're absolutely sure that your build of wxWidgets is never going to be
-// used in such situation, either because it's not going to be linked from any
-// kind of plugin or because you only target Vista or later systems, you can
-// set this to 2 to force the use of compiler TLS even under MSW.
-//
-// Default is 1 meaning that compiler TLS is used only if it's 100% safe.
-//
-// Recommended setting: 2 if you want to have maximal performance and don't
-// care about the scenario described above.
-#define wxUSE_COMPILER_TLS 1
-
-// ----------------------------------------------------------------------------
-// Interoperability with the standard library.
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_STL to 1 to enable maximal interoperability with the standard
-// library, even at the cost of backwards compatibility.
-//
-// Default is 0
-//
-// Recommended setting: 0 as the options below already provide a relatively
-// good level of interoperability and changing this option arguably isn't worth
-// diverging from the official builds of the library.
-#define wxUSE_STL 0
-
-// This is not a real option but is used as the default value for
-// wxUSE_STD_IOSTREAM, wxUSE_STD_STRING and wxUSE_STD_CONTAINERS.
-//
-// Currently the Digital Mars and Watcom compilers come without standard C++
-// library headers by default, wxUSE_STD_STRING can be set to 1 if you do have
-// them (e.g. from STLPort).
-//
-// VC++ 5.0 does include standard C++ library headers, however they produce
-// many warnings that can't be turned off when compiled at warning level 4.
-#if defined(__DMC__) || defined(__WATCOMC__) \
-        || (defined(_MSC_VER) && _MSC_VER < 1200)
-    #define wxUSE_STD_DEFAULT  0
-#else
-    #define wxUSE_STD_DEFAULT  1
-#endif
-
-// Use standard C++ containers to implement wxVector<>, wxStack<>, wxDList<>
-// and wxHashXXX<> classes. If disabled, wxWidgets own (mostly compatible but
-// usually more limited) implementations are used which allows to avoid the
-// dependency on the C++ run-time library.
-//
-// Notice that the compilers mentioned in wxUSE_STD_DEFAULT comment above don't
-// support using standard containers and that VC6 needs non-default options for
-// such build to avoid getting "fatal error C1076: compiler limit : internal
-// heap limit reached; use /Zm to specify a higher limit" in its own standard
-// headers, so you need to ensure you do increase the heap size before enabling
-// this option for this compiler.
-//
-// Default is 0 for compatibility reasons.
-//
-// Recommended setting: 1 unless compatibility with the official wxWidgets
-// build and/or the existing code is a concern.
-#define wxUSE_STD_CONTAINERS 0
-
-// Use standard C++ streams if 1 instead of wx streams in some places. If
-// disabled, wx streams are used everywhere and wxWidgets doesn't depend on the
-// standard streams library.
-//
-// Notice that enabling this does not replace wx streams with std streams
-// everywhere, in a lot of places wx streams are used no matter what.
-//
-// Default is 1 if compiler supports it.
-//
-// Recommended setting: 1 if you use the standard streams anyhow and so
-//                      dependency on the standard streams library is not a
-//                      problem
-#define wxUSE_STD_IOSTREAM  wxUSE_STD_DEFAULT
-
-// Enable minimal interoperability with the standard C++ string class if 1.
-// "Minimal" means that wxString can be constructed from std::string or
-// std::wstring but can't be implicitly converted to them. You need to enable
-// the option below for the latter.
-//
-// Default is 1 for most compilers.
-//
-// Recommended setting: 1 unless you want to ensure your program doesn't use
-//                      the standard C++ library at all.
-#define wxUSE_STD_STRING  wxUSE_STD_DEFAULT
-
-// Make wxString as much interchangeable with std::[w]string as possible, in
-// particular allow implicit conversion of wxString to either of these classes.
-// This comes at a price (or a benefit, depending on your point of view) of not
-// allowing implicit conversion to "const char *" and "const wchar_t *".
-//
-// Because a lot of existing code relies on these conversions, this option is
-// disabled by default but can be enabled for your build if you don't care
-// about compatibility.
-//
-// Default is 0 if wxUSE_STL has its default value or 1 if it is enabled.
-//
-// Recommended setting: 0 to remain compatible with the official builds of
-// wxWidgets.
-#define wxUSE_STD_STRING_CONV_IN_WXSTRING wxUSE_STL
-
-// VC++ 4.2 and above allows <iostream> and <iostream.h> but you can't mix
-// them. Set this option to 1 to use <iostream.h>, 0 to use <iostream>.
-//
-// Note that newer compilers (including VC++ 7.1 and later) don't support
-// wxUSE_IOSTREAMH == 1 and so <iostream> will be used anyhow.
-//
-// Default is 0.
-//
-// Recommended setting: 0, only set to 1 if you use a really old compiler
-#define wxUSE_IOSTREAMH     0
-
-
-// ----------------------------------------------------------------------------
-// non GUI features selection
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_LONGLONG to 1 to compile the wxLongLong class. This is a 64 bit
-// integer which is implemented in terms of native 64 bit integers if any or
-// uses emulation otherwise.
-//
-// This class is required by wxDateTime and so you should enable it if you want
-// to use wxDateTime. For most modern platforms, it will use the native 64 bit
-// integers in which case (almost) all of its functions are inline and it
-// almost does not take any space, so there should be no reason to switch it
-// off.
-//
-// Recommended setting: 1
-#define wxUSE_LONGLONG      1
-
-// Set wxUSE_BASE64 to 1, to compile in Base64 support. This is required for
-// storing binary data in wxConfig on most platforms.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_BASE64        1
-
-// Set this to 1 to be able to use wxEventLoop even in console applications
-// (i.e. using base library only, without GUI). This is mostly useful for
-// processing socket events but is also necessary to use timers in console
-// applications
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_CONSOLE_EVENTLOOP 1
-
-// Set wxUSE_(F)FILE to 1 to compile wx(F)File classes. wxFile uses low level
-// POSIX functions for file access, wxFFile uses ANSI C stdio.h functions.
-//
-// Default is 1
-//
-// Recommended setting: 1 (wxFile is highly recommended as it is required by
-// i18n code, wxFileConfig and others)
-#define wxUSE_FILE          1
-#define wxUSE_FFILE         1
-
-// Use wxFSVolume class providing access to the configured/active mount points
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely disabled if you don't use it)
-#define wxUSE_FSVOLUME      1
-
-// Use wxStandardPaths class which allows to retrieve some standard locations
-// in the file system
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be disabled to save space, but not much)
-#define wxUSE_STDPATHS      1
-
-// use wxTextBuffer class: required by wxTextFile
-#define wxUSE_TEXTBUFFER    1
-
-// use wxTextFile class: requires wxFile and wxTextBuffer, required by
-// wxFileConfig
-#define wxUSE_TEXTFILE      1
-
-// i18n support: _() macro, wxLocale class. Requires wxTextFile.
-#define wxUSE_INTL          1
-
-// Provide wxFoo_l() functions similar to standard foo() functions but taking
-// an extra locale parameter.
-//
-// Notice that this is fully implemented only for the systems providing POSIX
-// xlocale support or Microsoft Visual C++ >= 8 (which provides proprietary
-// almost-equivalent of xlocale functions), otherwise wxFoo_l() functions will
-// only work for the current user locale and "C" locale. You can use
-// wxHAS_XLOCALE_SUPPORT to test whether the full support is available.
-//
-// Default is 1
-//
-// Recommended setting: 1 but may be disabled if you are writing programs
-// running only in C locale anyhow
-#define wxUSE_XLOCALE       1
-
-// Set wxUSE_DATETIME to 1 to compile the wxDateTime and related classes which
-// allow to manipulate dates, times and time intervals. wxDateTime replaces the
-// old wxTime and wxDate classes which are still provided for backwards
-// compatibility (and implemented in terms of wxDateTime).
-//
-// Note that this class is relatively new and is still officially in alpha
-// stage because some features are not yet (fully) implemented. It is already
-// quite useful though and should only be disabled if you are aiming at
-// absolutely minimal version of the library.
-//
-// Requires: wxUSE_LONGLONG
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_DATETIME      1
-
-// Set wxUSE_TIMER to 1 to compile wxTimer class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_TIMER         1
-
-// Use wxStopWatch clas.
-//
-// Default is 1
-//
-// Recommended setting: 1 (needed by wxSocket)
-#define wxUSE_STOPWATCH     1
-
-// Set wxUSE_FSWATCHER to 1 if you want to enable wxFileSystemWatcher
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FSWATCHER     1
-
-// Setting wxUSE_CONFIG to 1 enables the use of wxConfig and related classes
-// which allow the application to store its settings in the persistent
-// storage. Setting this to 1 will also enable on-demand creation of the
-// global config object in wxApp.
-//
-// See also wxUSE_CONFIG_NATIVE below.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG        1
-
-// If wxUSE_CONFIG is 1, you may choose to use either the native config
-// classes under Windows (using .INI files under Win16 and the registry under
-// Win32) or the portable text file format used by the config classes under
-// Unix.
-//
-// Default is 1 to use native classes. Note that you may still use
-// wxFileConfig even if you set this to 1 - just the config object created by
-// default for the applications needs will be a wxRegConfig or wxIniConfig and
-// not wxFileConfig.
-//
-// Recommended setting: 1
-#define wxUSE_CONFIG_NATIVE   1
-
-// If wxUSE_DIALUP_MANAGER is 1, compile in wxDialUpManager class which allows
-// to connect/disconnect from the network and be notified whenever the dial-up
-// network connection is established/terminated. Requires wxUSE_DYNAMIC_LOADER.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DIALUP_MANAGER   1
-
-// Compile in classes for run-time DLL loading and function calling.
-// Required by wxUSE_DIALUP_MANAGER.
-//
-// This setting is for Win32 only
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DYNLIB_CLASS    1
-
-// experimental, don't use for now
-#define wxUSE_DYNAMIC_LOADER  1
-
-// Set to 1 to use socket classes
-#define wxUSE_SOCKETS       1
-
-// Set to 1 to use ipv6 socket classes (requires wxUSE_SOCKETS)
-//
-// Notice that currently setting this option under Windows will result in
-// programs which can only run on recent OS versions (with ws2_32.dll
-// installed) which is why it is disabled by default.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need IPv6 support
-#define wxUSE_IPV6          0
-
-// Set to 1 to enable virtual file systems (required by wxHTML)
-#define wxUSE_FILESYSTEM    1
-
-// Set to 1 to enable virtual ZIP filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ZIP        1
-
-// Set to 1 to enable virtual archive filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_ARCHIVE    1
-
-// Set to 1 to enable virtual Internet filesystem (requires wxUSE_FILESYSTEM)
-#define wxUSE_FS_INET       1
-
-// wxArchive classes for accessing archives such as zip and tar
-#define wxUSE_ARCHIVE_STREAMS     1
-
-// Set to 1 to compile wxZipInput/OutputStream classes.
-#define wxUSE_ZIPSTREAM     1
-
-// Set to 1 to compile wxTarInput/OutputStream classes.
-#define wxUSE_TARSTREAM     1
-
-// Set to 1 to compile wxZlibInput/OutputStream classes. Also required by
-// wxUSE_LIBPNG
-#define wxUSE_ZLIB          1
-
-// If enabled, the code written by Apple will be used to write, in a portable
-// way, float on the disk. See extended.c for the license which is different
-// from wxWidgets one.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you don't like the license terms (unlikely)
-#define wxUSE_APPLE_IEEE          1
-
-// Joystick support class
-#define wxUSE_JOYSTICK            1
-
-// wxFontEnumerator class
-#define wxUSE_FONTENUM 1
-
-// wxFontMapper class
-#define wxUSE_FONTMAP 1
-
-// wxMimeTypesManager class
-#define wxUSE_MIMETYPE 1
-
-// wxProtocol and related classes: if you want to use either of wxFTP, wxHTTP
-// or wxURL you need to set this to 1.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_PROTOCOL 1
-
-// The settings for the individual URL schemes
-#define wxUSE_PROTOCOL_FILE 1
-#define wxUSE_PROTOCOL_FTP 1
-#define wxUSE_PROTOCOL_HTTP 1
-
-// Define this to use wxURL class.
-#define wxUSE_URL 1
-
-// Define this to use native platform url and protocol support.
-// Currently valid only for MS-Windows.
-// Note: if you set this to 1, you can open ftp/http/gopher sites
-// and obtain a valid input stream for these sites
-// even when you set wxUSE_PROTOCOL_FTP/HTTP to 0.
-// Doing so reduces the code size.
-//
-// This code is experimental and subject to change.
-#define wxUSE_URL_NATIVE 0
-
-// Support for wxVariant class used in several places throughout the library,
-// notably in wxDataViewCtrl API.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size as much as
-// possible in which case setting this to 0 can gain up to 100KB.
-#define wxUSE_VARIANT 1
-
-// Support for wxAny class, the successor for wxVariant.
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you want to reduce the library size by a small amount,
-// or your compiler cannot for some reason cope with complexity of templates used.
-#define wxUSE_ANY 1
-
-// Support for regular expression matching via wxRegEx class: enable this to
-// use POSIX regular expressions in your code. You need to compile regex
-// library from src/regex to use it under Windows.
-//
-// Default is 0
-//
-// Recommended setting: 1 if your compiler supports it, if it doesn't please
-// contribute us a makefile for src/regex for it
-#define wxUSE_REGEX       1
-
-// wxSystemOptions class
-#define wxUSE_SYSTEM_OPTIONS 1
-
-// wxSound class
-#define wxUSE_SOUND      1
-
-// Use wxMediaCtrl
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_MEDIACTRL     1
-
-// Use wxWidget's XRC XML-based resource system.  Recommended.
-//
-// Default is 1
-//
-// Recommended setting: 1 (requires wxUSE_XML)
-#define wxUSE_XRC       1
-
-// XML parsing classes. Note that their API will change in the future, so
-// using wxXmlDocument and wxXmlNode in your app is not recommended.
-//
-// Default is the same as wxUSE_XRC, i.e. 1 by default.
-//
-// Recommended setting: 1 (required by XRC)
-#define wxUSE_XML       wxUSE_XRC
-
-// Use wxWidget's AUI docking system
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_AUI       1
-
-// Use wxWidget's Ribbon classes for interfaces
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_RIBBON    1
-
-// Use wxPropertyGrid.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_PROPGRID  1
-
-// Use wxStyledTextCtrl, a wxWidgets implementation of Scintilla.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STC 1
-
-// Use wxWidget's web viewing classes
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_WEBVIEW 1
-
-// Use the IE wxWebView backend
-//
-// Default is 1 on MSW
-//
-// Recommended setting: 1
-#ifdef __WXMSW__
-#define wxUSE_WEBVIEW_IE 1
-#else
-#define wxUSE_WEBVIEW_IE 0
-#endif
-
-// Use the WebKit wxWebView backend
-//
-// Default is 1 on GTK and OSX
-//
-// Recommended setting: 1
-#if defined(__WXGTK__) || defined(__WXOSX__)
-#define wxUSE_WEBVIEW_WEBKIT 1
-#else
-#define wxUSE_WEBVIEW_WEBKIT 0
-#endif
-
-// Enable the new wxGraphicsPath and wxGraphicsContext classes for an advanced
-// 2D drawing API.  (Still somewhat experimental)
-//
-// Please note that on Windows gdiplus.dll is loaded dynamically which means
-// that nothing special needs to be done as long as you don't use
-// wxGraphicsContext at all or only use it on XP and later systems but you
-// still do need to distribute it yourself for an application using
-// wxGraphicsContext to be runnable on pre-XP systems.
-//
-// Default is 1 except if you're using a non-Microsoft compiler under Windows
-// as only MSVC7+ is known to ship with gdiplus.h. For other compilers (e.g.
-// mingw32) you may need to install the headers (and just the headers)
-// yourself. If you do, change the setting below manually.
-//
-// Recommended setting: 1 if supported by the compilation environment
-
-// notice that we can't use wxCHECK_VISUALC_VERSION() here as this file is
-// included from wx/platform.h before wxCHECK_VISUALC_VERSION() is defined
-#ifdef _MSC_VER
-#   if _MSC_VER >= 1310
-        // MSVC7.1+ comes with new enough Platform SDK, enable
-        // wxGraphicsContext support for it
-#       define wxUSE_GRAPHICS_CONTEXT 1
-#   else
-        // MSVC 6 didn't include GDI+ headers so disable by default, enable it
-        // here if you use MSVC 6 with a newer SDK
-#       define wxUSE_GRAPHICS_CONTEXT 0
-#   endif
-#else
-    // Disable support for other Windows compilers, enable it if your compiler
-    // comes with new enough SDK or you installed the headers manually.
-    //
-    // Notice that this will be set by configure under non-Windows platforms
-    // anyhow so the value there is not important.
-#   define wxUSE_GRAPHICS_CONTEXT 0
-#endif
-
-// Enable wxGraphicsContext implementation using Cairo library.
-//
-// This is not needed under Windows and detected automatically by configure
-// under other systems, however you may set this to 1 manually if you installed
-// Cairo under Windows yourself and prefer to use it instead the native GDI+
-// implementation.
-//
-// Default is 0
-//
-// Recommended setting: 0
-#define wxUSE_CAIRO 0
-
-
-// ----------------------------------------------------------------------------
-// Individual GUI controls
-// ----------------------------------------------------------------------------
-
-// You must set wxUSE_CONTROLS to 1 if you are using any controls at all
-// (without it, wxControl class is not compiled)
-//
-// Default is 1
-//
-// Recommended setting: 1 (don't change except for very special programs)
-#define wxUSE_CONTROLS     1
-
-// Support markup in control labels, i.e. provide wxControl::SetLabelMarkup().
-// Currently markup is supported only by a few controls and only some ports but
-// their number will increase with time.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you want to save on code size)
-#define wxUSE_MARKUP       1
-
-// wxPopupWindow class is a top level transient window. It is currently used
-// to implement wxTipWindow
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0 if you don't wxUSE_TIPWINDOW)
-#define wxUSE_POPUPWIN     1
-
-// wxTipWindow allows to implement the custom tooltips, it is used by the
-// context help classes. Requires wxUSE_POPUPWIN.
-//
-// Default is 1
-//
-// Recommended setting: 1 (may be set to 0)
-#define wxUSE_TIPWINDOW    1
-
-// Each of the settings below corresponds to one wxWidgets control. They are
-// all switched on by default but may be disabled if you are sure that your
-// program (including any standard dialogs it can show!) doesn't need them and
-// if you desperately want to save some space. If you use any of these you must
-// set wxUSE_CONTROLS as well.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_ANIMATIONCTRL 1   // wxAnimationCtrl
-#define wxUSE_BANNERWINDOW  1   // wxBannerWindow
-#define wxUSE_BUTTON        1   // wxButton
-#define wxUSE_BMPBUTTON     1   // wxBitmapButton
-#define wxUSE_CALENDARCTRL  1   // wxCalendarCtrl
-#define wxUSE_CHECKBOX      1   // wxCheckBox
-#define wxUSE_CHECKLISTBOX  1   // wxCheckListBox (requires wxUSE_OWNER_DRAWN)
-#define wxUSE_CHOICE        1   // wxChoice
-#define wxUSE_COLLPANE      1   // wxCollapsiblePane
-#define wxUSE_COLOURPICKERCTRL 1    // wxColourPickerCtrl
-#define wxUSE_COMBOBOX      1   // wxComboBox
-#define wxUSE_COMMANDLINKBUTTON 1   // wxCommandLinkButton
-#define wxUSE_DATAVIEWCTRL  1   // wxDataViewCtrl
-#define wxUSE_DATEPICKCTRL  1   // wxDatePickerCtrl
-#define wxUSE_DIRPICKERCTRL 1   // wxDirPickerCtrl
-#define wxUSE_EDITABLELISTBOX 1 // wxEditableListBox
-#define wxUSE_FILECTRL      1   // wxFileCtrl
-#define wxUSE_FILEPICKERCTRL 1  // wxFilePickerCtrl
-#define wxUSE_FONTPICKERCTRL 1  // wxFontPickerCtrl
-#define wxUSE_GAUGE         1   // wxGauge
-#define wxUSE_HEADERCTRL    1   // wxHeaderCtrl
-#define wxUSE_HYPERLINKCTRL 1   // wxHyperlinkCtrl
-#define wxUSE_LISTBOX       1   // wxListBox
-#define wxUSE_LISTCTRL      1   // wxListCtrl
-#define wxUSE_RADIOBOX      1   // wxRadioBox
-#define wxUSE_RADIOBTN      1   // wxRadioButton
-#define wxUSE_RICHMSGDLG    1   // wxRichMessageDialog
-#define wxUSE_SCROLLBAR     1   // wxScrollBar
-#define wxUSE_SEARCHCTRL    1   // wxSearchCtrl
-#define wxUSE_SLIDER        1   // wxSlider
-#define wxUSE_SPINBTN       1   // wxSpinButton
-#define wxUSE_SPINCTRL      1   // wxSpinCtrl
-#define wxUSE_STATBOX       1   // wxStaticBox
-#define wxUSE_STATLINE      1   // wxStaticLine
-#define wxUSE_STATTEXT      1   // wxStaticText
-#define wxUSE_STATBMP       1   // wxStaticBitmap
-#define wxUSE_TEXTCTRL      1   // wxTextCtrl
-#define wxUSE_TIMEPICKCTRL  1   // wxTimePickerCtrl
-#define wxUSE_TOGGLEBTN     1   // requires wxButton
-#define wxUSE_TREECTRL      1   // wxTreeCtrl
-#define wxUSE_TREELISTCTRL  1   // wxTreeListCtrl
-
-// Use a status bar class? Depending on the value of wxUSE_NATIVE_STATUSBAR
-// below either wxStatusBar95 or a generic wxStatusBar will be used.
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_STATUSBAR    1
-
-// Two status bar implementations are available under Win32: the generic one
-// or the wrapper around native control. For native look and feel the native
-// version should be used.
-//
-// Default is 1 for the platforms where native status bar is supported.
-//
-// Recommended setting: 1 (there is no advantage in using the generic one)
-#define wxUSE_NATIVE_STATUSBAR        1
-
-// wxToolBar related settings: if wxUSE_TOOLBAR is 0, don't compile any toolbar
-// classes at all. Otherwise, use the native toolbar class unless
-// wxUSE_TOOLBAR_NATIVE is 0.
-//
-// Default is 1 for all settings.
-//
-// Recommended setting: 1 for wxUSE_TOOLBAR and wxUSE_TOOLBAR_NATIVE.
-#define wxUSE_TOOLBAR 1
-#define wxUSE_TOOLBAR_NATIVE 1
-
-// wxNotebook is a control with several "tabs" located on one of its sides. It
-// may be used to logically organise the data presented to the user instead of
-// putting everything in one huge dialog. It replaces wxTabControl and related
-// classes of wxWin 1.6x.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTEBOOK 1
-
-// wxListbook control is similar to wxNotebook but uses wxListCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_LISTBOOK 1
-
-// wxChoicebook control is similar to wxNotebook but uses wxChoice instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CHOICEBOOK 1
-
-// wxTreebook control is similar to wxNotebook but uses wxTreeCtrl instead of
-// the tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TREEBOOK 1
-
-// wxToolbook control is similar to wxNotebook but uses wxToolBar instead of
-// tabs
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLBOOK 1
-
-// wxTaskBarIcon is a small notification icon shown in the system toolbar or
-// dock.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be set to 0 if you don't need it)
-#define wxUSE_TASKBARICON 1
-
-// wxGrid class
-//
-// Default is 1, set to 0 to cut down compilation time and binaries size if you
-// don't use it.
-//
-// Recommended setting: 1
-//
-#define wxUSE_GRID         1
-
-// wxMiniFrame class: a frame with narrow title bar
-//
-// Default is 1.
-//
-// Recommended setting: 1 (it doesn't cost almost anything)
-#define wxUSE_MINIFRAME 1
-
-// wxComboCtrl and related classes: combobox with custom popup window and
-// not necessarily a listbox.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 except for wxUniv where it
-//                      it used by wxComboBox
-#define wxUSE_COMBOCTRL 1
-
-// wxOwnerDrawnComboBox is a custom combobox allowing to paint the combobox
-// items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0, except where it is
-//                      needed as a base class for generic wxBitmapComboBox.
-#define wxUSE_ODCOMBOBOX 1
-
-// wxBitmapComboBox is a combobox that can have images in front of text items.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0
-#define wxUSE_BITMAPCOMBOBOX 1
-
-// wxRearrangeCtrl is a wxCheckListBox with two buttons allowing to move items
-// up and down in it. It is also used as part of wxRearrangeDialog.
-//
-// Default is 1.
-//
-// Recommended setting: 1 but can be safely set to 0 (currently used only by
-// wxHeaderCtrl)
-#define wxUSE_REARRANGECTRL 1
-
-// ----------------------------------------------------------------------------
-// Miscellaneous GUI stuff
-// ----------------------------------------------------------------------------
-
-// wxAcceleratorTable/Entry classes and support for them in wxMenu(Bar)
-#define wxUSE_ACCEL 1
-
-// Use the standard art provider. The icons returned by this provider are
-// embedded into the library as XPMs so disabling it reduces the library size
-// somewhat but this should only be done if you use your own custom art
-// provider returning the icons or never use any icons not provided by the
-// native art provider (which might not be implemented at all for some
-// platforms) or by the Tango icons provider (if it's not itself disabled
-// below).
-//
-// Default is 1.
-//
-// Recommended setting: 1 unless you use your own custom art provider.
-#define wxUSE_ARTPROVIDER_STD 1
-
-// Use art provider providing Tango icons: this art provider has higher quality
-// icons than the default ones using smaller size XPM icons without
-// transparency but the embedded PNG icons add to the library size.
-//
-// Default is 1 under non-GTK ports. Under wxGTK the native art provider using
-// the GTK+ stock icons replaces it so it is normally not necessary.
-//
-// Recommended setting: 1 but can be turned off to reduce the library size.
-#define wxUSE_ARTPROVIDER_TANGO 1
-
-// Hotkey support (currently Windows only)
-#define wxUSE_HOTKEY 1
-
-// Use wxCaret: a class implementing a "cursor" in a text control (called caret
-// under Windows).
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can be safely set to 0, not used by the library)
-#define wxUSE_CARET         1
-
-// Use wxDisplay class: it allows enumerating all displays on a system and
-// their geometries as well as finding the display on which the given point or
-// window lies.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need it, can be safely set to 0 otherwise
-#define wxUSE_DISPLAY       1
-
-// Miscellaneous geometry code: needed for Canvas library
-#define wxUSE_GEOMETRY            1
-
-// Use wxImageList. This class is needed by wxNotebook, wxTreeCtrl and
-// wxListCtrl.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (set it to 0 if you don't use any of the controls
-// enumerated above, then this class is mostly useless too)
-#define wxUSE_IMAGLIST      1
-
-// Use wxInfoBar class.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be disabled without problems as nothing
-// depends on it)
-#define wxUSE_INFOBAR       1
-
-// Use wxMenu, wxMenuBar, wxMenuItem.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (can't be disabled under MSW)
-#define wxUSE_MENUS         1
-
-// Use wxNotificationMessage.
-//
-// wxNotificationMessage allows to show non-intrusive messages to the user
-// using balloons, banners, popups or whatever is the appropriate method for
-// the current platform.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_NOTIFICATION_MESSAGE 1
-
-// wxPreferencesEditor provides a common API for different ways of presenting
-// the standard "Preferences" or "Properties" dialog under different platforms
-// (e.g. some use modal dialogs, some use modeless ones; some apply the changes
-// immediately while others require an explicit "Apply" button).
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely disabled if you don't use it)
-#define wxUSE_PREFERENCES_EDITOR 1
-
-// wxRichToolTip is a customizable tooltip class which has more functionality
-// than the stock (but native, unlike this class) wxToolTip.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (but can be safely set to 0 if you don't need it)
-#define wxUSE_RICHTOOLTIP 1
-
-// Use wxSashWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SASH          1
-
-// Use wxSplitterWindow class.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_SPLITTER      1
-
-// Use wxToolTip and wxWindow::Set/GetToolTip() methods.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_TOOLTIPS      1
-
-// wxValidator class and related methods
-#define wxUSE_VALIDATORS 1
-
-// Use reference counted ID management: this means that wxWidgets will track
-// the automatically allocated ids (those used when you use wxID_ANY when
-// creating a window, menu or toolbar item &c) instead of just supposing that
-// the program never runs out of them. This is mostly useful only under wxMSW
-// where the total ids range is limited to SHRT_MIN..SHRT_MAX and where
-// long-running programs can run into problems with ids reuse without this. On
-// the other platforms, where the ids have the full int range, this shouldn't
-// be necessary.
-#ifdef __WXMSW__
-#define wxUSE_AUTOID_MANAGEMENT 1
-#else
-#define wxUSE_AUTOID_MANAGEMENT 0
-#endif
-
-// ----------------------------------------------------------------------------
-// common dialogs
-// ----------------------------------------------------------------------------
-
-// On rare occasions (e.g. using DJGPP) may want to omit common dialogs (e.g.
-// file selector, printer dialog). Switching this off also switches off the
-// printing architecture and interactive wxPrinterDC.
-//
-// Default is 1
-//
-// Recommended setting: 1 (unless it really doesn't work)
-#define wxUSE_COMMON_DIALOGS 1
-
-// wxBusyInfo displays window with message when app is busy. Works in same way
-// as wxBusyCursor
-#define wxUSE_BUSYINFO      1
-
-// Use single/multiple choice dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_CHOICEDLG     1
-
-// Use colour picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_COLOURDLG     1
-
-// wxDirDlg class for getting a directory name from user
-#define wxUSE_DIRDLG 1
-
-// TODO: setting to choose the generic or native one
-
-// Use file open/save dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in many places in the library itself)
-#define wxUSE_FILEDLG       1
-
-// Use find/replace dialogs.
-//
-// Default is 1
-//
-// Recommended setting: 1 (but may be safely set to 0)
-#define wxUSE_FINDREPLDLG       1
-
-// Use font picker dialog
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_FONTDLG       1
-
-// Use wxMessageDialog and wxMessageBox.
-//
-// Default is 1
-//
-// Recommended setting: 1 (used in the library itself)
-#define wxUSE_MSGDLG        1
-
-// progress dialog class for lengthy operations
-#define wxUSE_PROGRESSDLG 1
-
-// support for startup tips (wxShowTip &c)
-#define wxUSE_STARTUP_TIPS 1
-
-// text entry dialog and wxGetTextFromUser function
-#define wxUSE_TEXTDLG 1
-
-// number entry dialog
-#define wxUSE_NUMBERDLG 1
-
-// splash screen class
-#define wxUSE_SPLASH 1
-
-// wizards
-#define wxUSE_WIZARDDLG 1
-
-// Compile in wxAboutBox() function showing the standard "About" dialog.
-//
-// Default is 1
-//
-// Recommended setting: 1 but can be set to 0 to save some space if you don't
-//                      use this function
-#define wxUSE_ABOUTDLG 1
-
-// wxFileHistory class
-//
-// Default is 1
-//
-// Recommended setting: 1
-#define wxUSE_FILE_HISTORY 1
-
-// ----------------------------------------------------------------------------
-// Metafiles support
-// ----------------------------------------------------------------------------
-
-// Windows supports the graphics format known as metafile which is, though not
-// portable, is widely used under Windows and so is supported by wxWin (under
-// Windows only, of course). Win16 (Win3.1) used the so-called "Window
-// MetaFiles" or WMFs which were replaced with "Enhanced MetaFiles" or EMFs in
-// Win32 (Win9x, NT, 2000). Both of these are supported in wxWin and, by
-// default, WMFs will be used under Win16 and EMFs under Win32. This may be
-// changed by setting wxUSE_WIN_METAFILES_ALWAYS to 1 and/or setting
-// wxUSE_ENH_METAFILE to 0. You may also set wxUSE_METAFILE to 0 to not compile
-// in any metafile related classes at all.
-//
-// Default is 1 for wxUSE_ENH_METAFILE and 0 for wxUSE_WIN_METAFILES_ALWAYS.
-//
-// Recommended setting: default or 0 for everything for portable programs.
-#define wxUSE_METAFILE              1
-#define wxUSE_ENH_METAFILE          1
-#define wxUSE_WIN_METAFILES_ALWAYS  0
-
-// ----------------------------------------------------------------------------
-// Big GUI components
-// ----------------------------------------------------------------------------
-
-// Set to 0 to disable MDI support.
-//
-// Requires wxUSE_NOTEBOOK under platforms other than MSW.
-//
-// Default is 1.
-//
-// Recommended setting: 1, can be safely set to 0.
-#define wxUSE_MDI 1
-
-// Set to 0 to disable document/view architecture
-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
-
-// Set to 0 to disable MDI document/view architecture
-//
-// Requires wxUSE_MDI && wxUSE_DOC_VIEW_ARCHITECTURE
-#define wxUSE_MDI_ARCHITECTURE    1
-
-// Set to 0 to disable print/preview architecture code
-#define wxUSE_PRINTING_ARCHITECTURE  1
-
-// wxHTML sublibrary allows to display HTML in wxWindow programs and much,
-// much more.
-//
-// Default is 1.
-//
-// Recommended setting: 1 (wxHTML is great!), set to 0 if you want compile a
-// smaller library.
-#define wxUSE_HTML          1
-
-// Setting wxUSE_GLCANVAS to 1 enables OpenGL support. You need to have OpenGL
-// headers and libraries to be able to compile the library with wxUSE_GLCANVAS
-// set to 1 and, under Windows, also to add opengl32.lib and glu32.lib to the
-// list of libraries used to link your application (although this is done
-// implicitly for Microsoft Visual C++ users).
-//
-// Default is 1 unless the compiler is known to ship without the necessary
-// headers (Digital Mars) or the platform doesn't support OpenGL (Windows CE).
-//
-// Recommended setting: 1 if you intend to use OpenGL, can be safely set to 0
-// otherwise.
-#define wxUSE_GLCANVAS       1
-
-// wxRichTextCtrl allows editing of styled text.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 if you want compile a
-// smaller library.
-#define wxUSE_RICHTEXT       1
-
-// ----------------------------------------------------------------------------
-// Data transfer
-// ----------------------------------------------------------------------------
-
-// Use wxClipboard class for clipboard copy/paste.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_CLIPBOARD     1
-
-// Use wxDataObject and related classes. Needed for clipboard and OLE drag and
-// drop
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DATAOBJ       1
-
-// Use wxDropTarget and wxDropSource classes for drag and drop (this is
-// different from "built in" drag and drop in wxTreeCtrl which is always
-// available). Requires wxUSE_DATAOBJ.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_DRAG_AND_DROP 1
-
-// Use wxAccessible for enhanced and customisable accessibility.
-// Depends on wxUSE_OLE.
-//
-// Default is 0.
-//
-// Recommended setting (at present): 0
-#define wxUSE_ACCESSIBILITY 0
-
-// ----------------------------------------------------------------------------
-// miscellaneous settings
-// ----------------------------------------------------------------------------
-
-// wxSingleInstanceChecker class allows to verify at startup if another program
-// instance is running.
-//
-// Default is 1
-//
-// Recommended setting: 1 (the class is tiny, disabling it won't save much
-// space)
-#define wxUSE_SNGLINST_CHECKER  1
-
-#define wxUSE_DRAGIMAGE 1
-
-#define wxUSE_IPC         1
-                                // 0 for no interprocess comms
-#define wxUSE_HELP        1
-                                // 0 for no help facility
-
-// Should we use MS HTML help for wxHelpController? If disabled, neither
-// wxCHMHelpController nor wxBestHelpController are available.
-//
-// Default is 1 under MSW, 0 is always used for the other platforms.
-//
-// Recommended setting: 1, only set to 0 if you have trouble compiling
-// wxCHMHelpController (could be a problem with really ancient compilers)
-#define wxUSE_MS_HTML_HELP 1
-
-
-// Use wxHTML-based help controller?
-#define wxUSE_WXHTML_HELP 1
-
-#define wxUSE_CONSTRAINTS 1
-                                // 0 for no window layout constraint system
-
-#define wxUSE_SPLINES     1
-                                // 0 for no splines
-
-#define wxUSE_MOUSEWHEEL        1
-                                // Include mouse wheel support
-
-// Compile wxUIActionSimulator class?
-#define wxUSE_UIACTIONSIMULATOR 1
-
-// ----------------------------------------------------------------------------
-// wxDC classes for various output formats
-// ----------------------------------------------------------------------------
-
-// Set to 1 for PostScript device context.
-#define wxUSE_POSTSCRIPT  0
-
-// Set to 1 to use font metric files in GetTextExtent
-#define wxUSE_AFM_FOR_POSTSCRIPT 1
-
-// Set to 1 to compile in support for wxSVGFileDC, a wxDC subclass which allows
-// to create files in SVG (Scalable Vector Graphics) format.
-#define wxUSE_SVG 1
-
-// Should wxDC provide SetTransformMatrix() and related methods?
-//
-// Default is 1 but can be set to 0 if this functionality is not used. Notice
-// that currently only wxMSW supports this so setting this to 0 doesn't change
-// much for non-MSW platforms (although it will still save a few bytes
-// probably).
-//
-// Recommended setting: 1.
-#define wxUSE_DC_TRANSFORM_MATRIX 1
-
-// ----------------------------------------------------------------------------
-// image format support
-// ----------------------------------------------------------------------------
-
-// wxImage supports many different image formats which can be configured at
-// compile-time. BMP is always supported, others are optional and can be safely
-// disabled if you don't plan to use images in such format sometimes saving
-// substantial amount of code in the final library.
-//
-// Some formats require an extra library which is included in wxWin sources
-// which is mentioned if it is the case.
-
-// Set to 1 for wxImage support (recommended).
-#define wxUSE_IMAGE         1
-
-// Set to 1 for PNG format support (requires libpng). Also requires wxUSE_ZLIB.
-#define wxUSE_LIBPNG        1
-
-// Set to 1 for JPEG format support (requires libjpeg)
-#define wxUSE_LIBJPEG       1
-
-// Set to 1 for TIFF format support (requires libtiff)
-#define wxUSE_LIBTIFF       1
-
-// Set to 1 for TGA format support (loading only)
-#define wxUSE_TGA           1
-
-// Set to 1 for GIF format support
-#define wxUSE_GIF           1
-
-// Set to 1 for PNM format support
-#define wxUSE_PNM           1
-
-// Set to 1 for PCX format support
-#define wxUSE_PCX           1
-
-// Set to 1 for IFF format support (Amiga format)
-#define wxUSE_IFF           0
-
-// Set to 1 for XPM format support
-#define wxUSE_XPM           1
-
-// Set to 1 for MS Icons and Cursors format support
-#define wxUSE_ICO_CUR       1
-
-// Set to 1 to compile in wxPalette class
-#define wxUSE_PALETTE       1
-
-// ----------------------------------------------------------------------------
-// wxUniversal-only options
-// ----------------------------------------------------------------------------
-
-// Set to 1 to enable compilation of all themes, this is the default
-#define wxUSE_ALL_THEMES    1
-
-// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES
-// is unset, if it is set these options are not used; notice that metal theme
-// uses Win32 one
-#define wxUSE_THEME_GTK     0
-#define wxUSE_THEME_METAL   0
-#define wxUSE_THEME_MONO    0
-#define wxUSE_THEME_WIN32   0
-
-
-/* --- end common options --- */
-
-/* --- start MSW options --- */
-// ----------------------------------------------------------------------------
-// Windows-only settings
-// ----------------------------------------------------------------------------
-
-// Set wxUSE_UNICODE_MSLU to 1 if you're compiling wxWidgets in Unicode mode
-// and want to run your programs under Windows 9x and not only NT/2000/XP.
-// This setting enables use of unicows.dll from MSLU (MS Layer for Unicode, see
-// http://www.microsoft.com/globaldev/handson/dev/mslu_announce.mspx). Note
-// that you will have to modify the makefiles to include unicows.lib import
-// library as the first library (see installation instructions in install.txt
-// to learn how to do it when building the library or samples).
-//
-// If your compiler doesn't have unicows.lib, you can get a version of it at
-// http://libunicows.sourceforge.net
-//
-// Default is 0
-//
-// Recommended setting: 0 (1 if you want to deploy Unicode apps on 9x systems)
-#ifndef wxUSE_UNICODE_MSLU
-    #define wxUSE_UNICODE_MSLU 0
-#endif
-
-// Set this to 1 if you want to use wxWidgets and MFC in the same program. This
-// will override some other settings (see below)
-//
-// Default is 0.
-//
-// Recommended setting: 0 unless you really have to use MFC
-#define wxUSE_MFC           0
-
-// Set this to 1 for generic OLE support: this is required for drag-and-drop,
-// clipboard, OLE Automation. Only set it to 0 if your compiler is very old and
-// can't compile/doesn't have the OLE headers.
-//
-// Default is 1.
-//
-// Recommended setting: 1
-#define wxUSE_OLE           1
-
-// Set this to 1 to enable wxAutomationObject class.
-//
-// Default is 1.
-//
-// Recommended setting: 1 if you need to control other applications via OLE
-// Automation, can be safely set to 0 otherwise
-#define wxUSE_OLE_AUTOMATION 1
-
-// Set this to 1 to enable wxActiveXContainer class allowing to embed OLE
-// controls in wx.
-//
-// Default is 1.
-//
-// Recommended setting: 1, required by wxMediaCtrl
-#define wxUSE_ACTIVEX 1
-
-// wxDC caching implementation
-#define wxUSE_DC_CACHEING 1
-
-// Set this to 1 to enable wxDIB class used internally for manipulating
-// wxBitmap data.
-//
-// Default is 1, set it to 0 only if you don't use wxImage neither
-//
-// Recommended setting: 1 (without it conversion to/from wxImage won't work)
-#define wxUSE_WXDIB 1
-
-// Set to 0 to disable PostScript print/preview architecture code under Windows
-// (just use Windows printing).
-#define wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW 1
-
-// Set this to 1 to compile in wxRegKey class.
-//
-// Default is 1
-//
-// Recommended setting: 1, this is used internally by wx in a few places
-#define wxUSE_REGKEY 1
-
-// Set this to 1 to use RICHEDIT controls for wxTextCtrl with style wxTE_RICH
-// which allows to put more than ~32Kb of text in it even under Win9x (NT
-// doesn't have such limitation).
-//
-// Default is 1 for compilers which support it
-//
-// Recommended setting: 1, only set it to 0 if your compiler doesn't have
-//                      or can't compile <richedit.h>
-#define wxUSE_RICHEDIT  1
-
-// Set this to 1 to use extra features of richedit v2 and later controls
-//
-// Default is 1 for compilers which support it
-//
-// Recommended setting: 1
-#define wxUSE_RICHEDIT2 1
-
-// Set this to 1 to enable support for the owner-drawn menu and listboxes. This
-// is required by wxUSE_CHECKLISTBOX.
-//
-// Default is 1.
-//
-// Recommended setting: 1, set to 0 for a small library size reduction
-#define wxUSE_OWNER_DRAWN 1
-
-// Set this to 1 to enable MSW-specific wxTaskBarIcon::ShowBalloon() method. It
-// is required by native wxNotificationMessage implementation.
-//
-// Default is 1 but disabled in wx/msw/chkconf.h if SDK is too old to contain
-// the necessary declarations.
-//
-// Recommended setting: 1, set to 0 for a tiny library size reduction
-#define wxUSE_TASKBARICON_BALLOONS 1
-
-// Set to 1 to compile MS Windows XP theme engine support
-#define wxUSE_UXTHEME           1
-
-// Set to 1 to use InkEdit control (Tablet PC), if available
-#define wxUSE_INKEDIT  0
-
-// Set to 1 to enable .INI files based wxConfig implementation (wxIniConfig)
-//
-// Default is 0.
-//
-// Recommended setting: 0, nobody uses .INI files any more
-#define wxUSE_INICONF 0
-
-// ----------------------------------------------------------------------------
-// Generic versions of native controls
-// ----------------------------------------------------------------------------
-
-// Set this to 1 to be able to use wxDatePickerCtrlGeneric in addition to the
-// native wxDatePickerCtrl
-//
-// Default is 0.
-//
-// Recommended setting: 0, this is mainly used for testing
-#define wxUSE_DATEPICKCTRL_GENERIC 0
-
-// ----------------------------------------------------------------------------
-// Crash debugging helpers
-// ----------------------------------------------------------------------------
-
-// Set this to 1 to be able to use wxCrashReport::Generate() to create mini
-// dumps of your program when it crashes (or at any other moment)
-//
-// Default is 1 if supported by the compiler (VC++ and recent BC++ only).
-//
-// Recommended setting: 1, set to 0 if your programs never crash
-#define wxUSE_CRASHREPORT 1
-/* --- end MSW options --- */
-
-/* --- start wxUniv options --- */
-// ----------------------------------------------------------------------------
-// wxUniversal-only options
-// ----------------------------------------------------------------------------
-
-// Set to 1 to enable compilation of all themes, this is the default
-#define wxUSE_ALL_THEMES    1
-
-// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES
-// is unset, if it is set these options are not used; notice that metal theme
-// uses Win32 one
-#define wxUSE_THEME_GTK     0
-#define wxUSE_THEME_METAL   0
-#define wxUSE_THEME_MONO    0
-#define wxUSE_THEME_WIN32   0
-/* --- end wxUniv options --- */
-
-#endif // _WX_SETUP_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/setup_inc.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/setup_inc.h
deleted file mode 100644
index 79d524e5f7..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/setup_inc.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/setup_inc.h
-// Purpose:     wxUniversal-specific setup.h options (this file is not used
-//              directly, it is injected by build/update-setup-h in the
-//              generated include/wx/univ/setup0.h)
-// Author:      Vadim Zeitlin
-// Created:     2008-02-03
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// ----------------------------------------------------------------------------
-// wxUniversal-only options
-// ----------------------------------------------------------------------------
-
-// Set to 1 to enable compilation of all themes, this is the default
-#define wxUSE_ALL_THEMES    1
-
-// Set to 1 to enable the compilation of individual theme if wxUSE_ALL_THEMES
-// is unset, if it is set these options are not used; notice that metal theme
-// uses Win32 one
-#define wxUSE_THEME_GTK     0
-#define wxUSE_THEME_METAL   0
-#define wxUSE_THEME_MONO    0
-#define wxUSE_THEME_WIN32   0
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/slider.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/slider.h
deleted file mode 100644
index fadab4d12f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/slider.h
+++ /dev/null
@@ -1,227 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/slider.h
-// Purpose:     wxSlider control for wxUniversal
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     09.02.01
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_SLIDER_H_
-#define _WX_UNIV_SLIDER_H_
-
-#include "wx/univ/scrthumb.h"
-
-// ----------------------------------------------------------------------------
-// the actions supported by this control
-// ----------------------------------------------------------------------------
-
-// our actions are the same as scrollbars
-
-#define wxACTION_SLIDER_START       wxT("start")     // to the beginning
-#define wxACTION_SLIDER_END         wxT("end")       // to the end
-#define wxACTION_SLIDER_LINE_UP     wxT("lineup")    // one line up/left
-#define wxACTION_SLIDER_PAGE_UP     wxT("pageup")    // one page up/left
-#define wxACTION_SLIDER_LINE_DOWN   wxT("linedown")  // one line down/right
-#define wxACTION_SLIDER_PAGE_DOWN   wxT("pagedown")  // one page down/right
-#define wxACTION_SLIDER_PAGE_CHANGE wxT("pagechange")// change page by numArg
-
-#define wxACTION_SLIDER_THUMB_DRAG      wxT("thumbdrag")
-#define wxACTION_SLIDER_THUMB_MOVE      wxT("thumbmove")
-#define wxACTION_SLIDER_THUMB_RELEASE   wxT("thumbrelease")
-
-// ----------------------------------------------------------------------------
-// wxSlider
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxSlider : public wxSliderBase,
-                             public wxControlWithThumb
-{
-public:
-    // ctors and such
-    wxSlider();
-
-    wxSlider(wxWindow *parent,
-             wxWindowID id,
-             int value, int minValue, int maxValue,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = wxSL_HORIZONTAL,
-             const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxSliderNameStr);
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                int value, int minValue, int maxValue,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxSL_HORIZONTAL,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxSliderNameStr);
-
-    // implement base class pure virtuals
-    virtual int GetValue() const;
-    virtual void SetValue(int value);
-
-    virtual void SetRange(int minValue, int maxValue);
-    virtual int GetMin() const;
-    virtual int GetMax() const;
-
-    virtual void SetLineSize(int lineSize);
-    virtual void SetPageSize(int pageSize);
-    virtual int GetLineSize() const;
-    virtual int GetPageSize() const;
-
-    virtual void SetThumbLength(int lenPixels);
-    virtual int GetThumbLength() const;
-
-    virtual int GetTickFreq() const { return m_tickFreq; }
-
-    // wxUniv-specific methods
-    // -----------------------
-
-    // is this a vertical slider?
-    bool IsVert() const { return (GetWindowStyle() & wxSL_VERTICAL) != 0; }
-
-    // get the slider orientation
-    wxOrientation GetOrientation() const
-        { return IsVert() ? wxVERTICAL : wxHORIZONTAL; }
-
-    // do we have labels?
-    bool HasLabels() const
-        { return ((GetWindowStyle() & wxSL_LABELS) != 0) &&
-                 ((GetWindowStyle() & (wxSL_TOP|wxSL_BOTTOM|wxSL_LEFT|wxSL_RIGHT)) != 0); }
-
-    // do we have ticks?
-    bool HasTicks() const
-        { return ((GetWindowStyle() & wxSL_TICKS) != 0) &&
-                 ((GetWindowStyle() & (wxSL_TOP|wxSL_BOTTOM|wxSL_LEFT|wxSL_RIGHT|wxSL_BOTH)) != 0); }
-
-    // implement wxControlWithThumb interface
-    virtual wxWindow *GetWindow() { return this; }
-    virtual bool IsVertical() const { return IsVert(); }
-
-    virtual wxScrollThumb::Shaft HitTest(const wxPoint& pt) const;
-    virtual wxCoord ThumbPosToPixel() const;
-    virtual int PixelToThumbPos(wxCoord x) const;
-
-    virtual void SetShaftPartState(wxScrollThumb::Shaft shaftPart,
-                                   int flag,
-                                   bool set = true);
-
-    virtual void OnThumbDragStart(int pos);
-    virtual void OnThumbDrag(int pos);
-    virtual void OnThumbDragEnd(int pos);
-    virtual void OnPageScrollStart();
-    virtual bool OnPageScroll(int pageInc);
-
-    // for wxStdSliderInputHandler
-    wxScrollThumb& GetThumb() { return m_thumb; }
-
-    virtual bool PerformAction(const wxControlAction& action,
-                               long numArg = 0,
-                               const wxString& strArg = wxEmptyString);
-
-    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
-    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
-    {
-        return GetStdInputHandler(handlerDef);
-    }
-
-protected:
-    enum
-    {
-        INVALID_THUMB_VALUE = -0xffff
-    };
-
-    // Platform-specific implementation of SetTickFreq
-    virtual void DoSetTickFreq(int freq);
-
-    // overridden base class virtuals
-    virtual wxSize DoGetBestClientSize() const;
-    virtual void DoDraw(wxControlRenderer *renderer);
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-    // event handlers
-    void OnSize(wxSizeEvent& event);
-
-    // common part of all ctors
-    void Init();
-
-    // normalize the value to fit in the range
-    int NormalizeValue(int value) const;
-
-    // change the value by the given increment, return true if really changed
-    bool ChangeValueBy(int inc);
-
-    // change the value to the given one
-    bool ChangeValueTo(int value);
-
-    // is the value inside the range?
-    bool IsInRange(int value) { return (value >= m_min) && (value <= m_max); }
-
-    // format the value for printing as label
-    virtual wxString FormatValue(int value) const;
-
-    // calculate max label size
-    wxSize CalcLabelSize() const;
-
-    // calculate m_rectLabel/Slider
-    void CalcGeometry();
-
-    // get the thumb size
-    wxSize GetThumbSize() const;
-
-    // get the shaft rect (uses m_rectSlider which is supposed to be calculated)
-    wxRect GetShaftRect() const;
-
-    // calc the current thumb position using the shaft rect (if the pointer is
-    // NULL, we calculate it here too)
-    void CalcThumbRect(const wxRect *rectShaft,
-                       wxRect *rectThumbOut,
-                       wxRect *rectLabelOut,
-                       int value = INVALID_THUMB_VALUE) const;
-
-    // return the slider rect calculating it if needed
-    const wxRect& GetSliderRect() const;
-
-    // refresh the current thumb position
-    void RefreshThumb();
-
-private:
-    // get the default thumb size (without using m_thumbSize)
-    wxSize GetDefaultThumbSize() const;
-
-    // the object which manages our thumb
-    wxScrollThumb m_thumb;
-
-    // the slider range and value
-    int m_min,
-        m_max,
-        m_value;
-
-    // the tick frequence (default is 1)
-    int m_tickFreq;
-
-    // the line and page increments (logical units)
-    int m_lineSize,
-        m_pageSize;
-
-    // the size of the thumb (in pixels)
-    int m_thumbSize;
-
-    // the part of the client area reserved for the label, the ticks and the
-    // part for the slider itself
-    wxRect m_rectLabel,
-           m_rectTicks,
-           m_rectSlider;
-
-    // the state of the thumb (wxCONTROL_XXX constants sum)
-    int m_thumbFlags;
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxSlider)
-};
-
-#endif // _WX_UNIV_SLIDER_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/spinbutt.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/spinbutt.h
deleted file mode 100644
index 1ae4ccba7c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/spinbutt.h
+++ /dev/null
@@ -1,121 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/spinbutt.h
-// Purpose:     universal version of wxSpinButton
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     21.01.01
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_SPINBUTT_H_
-#define _WX_UNIV_SPINBUTT_H_
-
-#include "wx/univ/scrarrow.h"
-
-// ----------------------------------------------------------------------------
-// wxSpinButton
-// ----------------------------------------------------------------------------
-
-// actions supported by this control
-#define wxACTION_SPIN_INC    wxT("inc")
-#define wxACTION_SPIN_DEC    wxT("dec")
-
-class WXDLLIMPEXP_CORE wxSpinButton : public wxSpinButtonBase,
-                                 public wxControlWithArrows
-{
-public:
-    wxSpinButton();
-    wxSpinButton(wxWindow *parent,
-                 wxWindowID id = wxID_ANY,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
-                 const wxString& name = wxSPIN_BUTTON_NAME);
-
-    bool Create(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxSP_VERTICAL | wxSP_ARROW_KEYS,
-                const wxString& name = wxSPIN_BUTTON_NAME);
-
-    // implement wxSpinButtonBase methods
-    virtual int GetValue() const;
-    virtual void SetValue(int val);
-    virtual void SetRange(int minVal, int maxVal);
-
-    // implement wxControlWithArrows methods
-    virtual wxRenderer *GetRenderer() const { return m_renderer; }
-    virtual wxWindow *GetWindow() { return this; }
-    virtual bool IsVertical() const { return wxSpinButtonBase::IsVertical(); }
-    virtual int GetArrowState(wxScrollArrows::Arrow arrow) const;
-    virtual void SetArrowFlag(wxScrollArrows::Arrow arrow, int flag, bool set);
-    virtual bool OnArrow(wxScrollArrows::Arrow arrow);
-    virtual wxScrollArrows::Arrow HitTestArrow(const wxPoint& pt) const;
-
-    // for wxStdSpinButtonInputHandler
-    const wxScrollArrows& GetArrows() { return m_arrows; }
-
-    virtual bool PerformAction(const wxControlAction& action,
-                               long numArg = 0,
-                               const wxString& strArg = wxEmptyString);
-
-    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
-    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
-    {
-        return GetStdInputHandler(handlerDef);
-    }
-
-protected:
-    virtual wxSize DoGetBestClientSize() const;
-    virtual void DoDraw(wxControlRenderer *renderer);
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-    // the common part of all ctors
-    void Init();
-
-    // normalize the value to fit into min..max range
-    int NormalizeValue(int value) const;
-
-    // change the value by +1/-1 and send the event, return true if value was
-    // changed
-    bool ChangeValue(int inc);
-
-    // get the rectangles for our 2 arrows
-    void CalcArrowRects(wxRect *rect1, wxRect *rect2) const;
-
-    // the current controls value
-    int m_value;
-
-private:
-    // the object which manages our arrows
-    wxScrollArrows m_arrows;
-
-    // the state (combination of wxCONTROL_XXX flags) of the arrows
-    int m_arrowsState[wxScrollArrows::Arrow_Max];
-
-    DECLARE_DYNAMIC_CLASS(wxSpinButton)
-};
-
-// ----------------------------------------------------------------------------
-// wxStdSpinButtonInputHandler: manages clicks on them (use arrows like
-// wxStdScrollBarInputHandler) and processes keyboard events too
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxStdSpinButtonInputHandler : public wxStdInputHandler
-{
-public:
-    wxStdSpinButtonInputHandler(wxInputHandler *inphand);
-
-    virtual bool HandleKey(wxInputConsumer *consumer,
-                           const wxKeyEvent& event,
-                           bool pressed);
-    virtual bool HandleMouse(wxInputConsumer *consumer,
-                             const wxMouseEvent& event);
-    virtual bool HandleMouseMove(wxInputConsumer *consumer,
-                                 const wxMouseEvent& event);
-};
-
-#endif // _WX_UNIV_SPINBUTT_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/statbmp.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/statbmp.h
deleted file mode 100644
index c649653915..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/statbmp.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/statbmp.h
-// Purpose:     wxStaticBitmap class for wxUniversal
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     25.08.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_STATBMP_H_
-#define _WX_UNIV_STATBMP_H_
-
-#include "wx/bitmap.h"
-
-// ----------------------------------------------------------------------------
-// wxStaticBitmap
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxStaticBitmap : public wxStaticBitmapBase
-{
-public:
-    wxStaticBitmap()
-    {
-    }
-
-    wxStaticBitmap(wxWindow *parent,
-                   const wxBitmap& label,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = 0)
-    {
-        Create(parent, wxID_ANY, label, pos, size, style);
-    }
-
-    wxStaticBitmap(wxWindow *parent,
-                   wxWindowID id,
-                   const wxBitmap& label,
-                   const wxPoint& pos = wxDefaultPosition,
-                   const wxSize& size = wxDefaultSize,
-                   long style = 0,
-                   const wxString& name = wxStaticBitmapNameStr)
-    {
-        Create(parent, id, label, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxBitmap& label,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxStaticBitmapNameStr);
-
-    virtual void SetBitmap(const wxBitmap& bitmap);
-    virtual void SetIcon(const wxIcon& icon);
-    virtual wxBitmap GetBitmap() const { return m_bitmap; }
-
-    wxIcon GetIcon() const;
-
-    virtual bool HasTransparentBackground() { return true; }
-
-protected:
-    virtual void DoDraw(wxControlRenderer *renderer);
-
-private:
-    // the bitmap which we show
-    wxBitmap m_bitmap;
-
-    DECLARE_DYNAMIC_CLASS(wxStaticBitmap)
-};
-
-#endif // _WX_UNIV_STATBMP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/statbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/statbox.h
deleted file mode 100644
index 081c9d6e66..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/statbox.h
+++ /dev/null
@@ -1,64 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/statbox.h
-// Purpose:     wxStaticBox declaration
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     15.08.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_STATBOX_H_
-#define _WX_UNIV_STATBOX_H_
-
-class WXDLLIMPEXP_CORE wxStaticBox : public wxStaticBoxBase
-{
-public:
-    wxStaticBox() { }
-
-    wxStaticBox(wxWindow *parent,
-                const wxString& label,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize)
-    {
-        Create(parent, wxID_ANY, label, pos, size);
-    }
-
-    wxStaticBox(wxWindow *parent, wxWindowID id,
-                const wxString& label,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxStaticBoxNameStr)
-    {
-        Create(parent, id, label, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& label,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxStaticBoxNameStr);
-
-    // the origin of the static box is inside the border and under the label:
-    // take account of this
-    virtual wxPoint GetBoxAreaOrigin() const;
-
-    // returning true from here ensures that we act as a container window for
-    // our children
-    virtual bool IsStaticBox() const { return true; }
-
-protected:
-    // draw the control
-    virtual void DoDraw(wxControlRenderer *renderer);
-
-    // get the size of the border
-    wxRect GetBorderGeometry() const;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxStaticBox)
-};
-
-#endif // _WX_UNIV_STATBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/statline.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/statline.h
deleted file mode 100644
index 6801d6c124..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/statline.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/statline.h
-// Purpose:     wxStaticLine class for wxUniversal
-// Author:      Vadim Zeitlin
-// Created:     28.06.99
-// Copyright:   (c) 1999 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_STATLINE_H_
-#define _WX_UNIV_STATLINE_H_
-
-class WXDLLIMPEXP_CORE wxStaticLine : public wxStaticLineBase
-{
-public:
-    // constructors and pseudo-constructors
-    wxStaticLine() { }
-
-    wxStaticLine(wxWindow *parent,
-                 const wxPoint &pos,
-                 wxCoord length,
-                 long style = wxLI_HORIZONTAL)
-    {
-        Create(parent, wxID_ANY, pos,
-               style & wxLI_VERTICAL ? wxSize(wxDefaultCoord, length)
-                                     : wxSize(length, wxDefaultCoord),
-               style);
-    }
-
-    wxStaticLine(wxWindow *parent,
-                 wxWindowID id = wxID_ANY,
-                 const wxPoint &pos = wxDefaultPosition,
-                 const wxSize &size = wxDefaultSize,
-                 long style = wxLI_HORIZONTAL,
-                 const wxString &name = wxStaticLineNameStr )
-    {
-        Create(parent, id, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                const wxPoint &pos = wxDefaultPosition,
-                const wxSize &size = wxDefaultSize,
-                long style = wxLI_HORIZONTAL,
-                const wxString &name = wxStaticLineNameStr );
-
-protected:
-    virtual void DoDraw(wxControlRenderer *renderer);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxStaticLine)
-};
-
-#endif // _WX_UNIV_STATLINE_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/stattext.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/stattext.h
deleted file mode 100644
index f2e27bb3b5..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/stattext.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/stattext.h
-// Purpose:     wxStaticText
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     14.08.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_STATTEXT_H_
-#define _WX_UNIV_STATTEXT_H_
-
-#include "wx/generic/stattextg.h"
-
-class WXDLLIMPEXP_CORE wxStaticText : public wxGenericStaticText
-{
-public:
-    wxStaticText() { }
-
-    // usual ctor
-    wxStaticText(wxWindow *parent,
-                 const wxString& label,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize)
-    {
-        Create(parent, wxID_ANY, label, pos, size, 0, wxStaticTextNameStr);
-    }
-
-    // full form
-    wxStaticText(wxWindow *parent,
-                 wxWindowID id,
-                 const wxString& label,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = 0,
-                 const wxString &name = wxStaticTextNameStr)
-    {
-        Create(parent, id, label, pos, size, style, name);
-    }
-
-    // function ctor
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString &label,
-                const wxPoint &pos = wxDefaultPosition,
-                const wxSize &size = wxDefaultSize,
-                long style = 0,
-                const wxString &name = wxStaticTextNameStr);
-
-    // implementation only from now on
-
-    virtual void SetLabel(const wxString& label);
-
-    virtual bool IsFocused() const { return false; }
-
-protected:
-    // draw the control
-    virtual void DoDraw(wxControlRenderer *renderer);
-
-    virtual void DoSetLabel(const wxString& str);
-    virtual wxString DoGetLabel() const;
-
-    DECLARE_DYNAMIC_CLASS(wxStaticText)
-};
-
-#endif // _WX_UNIV_STATTEXT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/statusbr.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/statusbr.h
deleted file mode 100644
index 89dd8bf255..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/statusbr.h
+++ /dev/null
@@ -1,99 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/statusbr.h
-// Purpose:     wxStatusBarUniv: wxStatusBar for wxUniversal declaration
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     14.10.01
-// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_STATUSBR_H_
-#define _WX_UNIV_STATUSBR_H_
-
-#include "wx/univ/inpcons.h"
-#include "wx/arrstr.h"
-
-// ----------------------------------------------------------------------------
-// wxStatusBarUniv: a window near the bottom of the frame used for status info
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxStatusBarUniv : public wxStatusBarBase
-{
-public:
-    wxStatusBarUniv() { Init(); }
-
-    wxStatusBarUniv(wxWindow *parent,
-                    wxWindowID id = wxID_ANY,
-                    long style = wxSTB_DEFAULT_STYLE,
-                    const wxString& name = wxPanelNameStr)
-    {
-        Init();
-
-        (void)Create(parent, id, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                long style = wxSTB_DEFAULT_STYLE,
-                const wxString& name = wxPanelNameStr);
-
-    // implement base class methods
-    virtual void SetFieldsCount(int number = 1, const int *widths = NULL);
-    virtual void SetStatusWidths(int n, const int widths[]);
-
-    virtual bool GetFieldRect(int i, wxRect& rect) const;
-    virtual void SetMinHeight(int height);
-
-    virtual int GetBorderX() const;
-    virtual int GetBorderY() const;
-
-    // wxInputConsumer pure virtual
-    virtual wxWindow *GetInputWindow() const
-        { return const_cast<wxStatusBar*>(this); }
-
-protected:
-    virtual void DoUpdateStatusText(int i);
-
-    // recalculate the field widths
-    void OnSize(wxSizeEvent& event);
-
-    // draw the statusbar
-    virtual void DoDraw(wxControlRenderer *renderer);
-
-    // tell them about our preferred height
-    virtual wxSize DoGetBestSize() const;
-
-    // override DoSetSize() to prevent the status bar height from changing
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-
-    // get the (fixed) status bar height
-    wxCoord GetHeight() const;
-
-    // get the rectangle containing all the fields and the border between them
-    //
-    // also updates m_widthsAbs if necessary
-    wxRect GetTotalFieldRect(wxCoord *borderBetweenFields);
-
-    // get the rect for this field without ani side effects (see code)
-    wxRect DoGetFieldRect(int n) const;
-
-    // common part of all ctors
-    void Init();
-
-private:
-    // the current status fields strings
-    //wxArrayString m_statusText;
-
-    // the absolute status fields widths
-    wxArrayInt m_widthsAbs;
-
-    DECLARE_DYNAMIC_CLASS(wxStatusBarUniv)
-    DECLARE_EVENT_TABLE()
-    WX_DECLARE_INPUT_CONSUMER()
-};
-
-#endif // _WX_UNIV_STATUSBR_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/stdrend.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/stdrend.h
deleted file mode 100644
index 66ca413218..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/stdrend.h
+++ /dev/null
@@ -1,352 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/stdrend.h
-// Purpose:     wxStdRenderer class declaration
-// Author:      Vadim Zeitlin
-// Created:     2006-09-18
-// Copyright:   (c) 2006 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_STDREND_H_
-#define _WX_UNIV_STDREND_H_
-
-#include "wx/univ/renderer.h"
-#include "wx/pen.h"
-
-class WXDLLIMPEXP_FWD_CORE wxColourScheme;
-
-// ----------------------------------------------------------------------------
-// wxStdRenderer: implements as much of wxRenderer API as possible generically
-// ----------------------------------------------------------------------------
-
-class wxStdRenderer : public wxRenderer
-{
-public:
-    // the renderer will use the given scheme, whose lifetime must be at least
-    // as long as of this object itself, to choose the colours for drawing
-    wxStdRenderer(const wxColourScheme *scheme);
-
-    virtual void DrawBackground(wxDC& dc,
-                                const wxColour& col,
-                                const wxRect& rect,
-                                int flags = 0,
-                                wxWindow *window = NULL);
-    virtual void DrawButtonSurface(wxDC& dc,
-                                   const wxColour& col,
-                                   const wxRect& rect,
-                                   int flags);
-
-
-    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
-
-    virtual void DrawLabel(wxDC& dc,
-                           const wxString& label,
-                           const wxRect& rect,
-                           int flags = 0,
-                           int alignment = wxALIGN_LEFT | wxALIGN_TOP,
-                           int indexAccel = -1,
-                           wxRect *rectBounds = NULL);
-    virtual void DrawButtonLabel(wxDC& dc,
-                                 const wxString& label,
-                                 const wxBitmap& image,
-                                 const wxRect& rect,
-                                 int flags = 0,
-                                 int alignment = wxALIGN_LEFT | wxALIGN_TOP,
-                                 int indexAccel = -1,
-                                 wxRect *rectBounds = NULL);
-
-
-    virtual void DrawBorder(wxDC& dc,
-                            wxBorder border,
-                            const wxRect& rect,
-                            int flags = 0,
-                            wxRect *rectIn = NULL);
-    virtual void DrawTextBorder(wxDC& dc,
-                                wxBorder border,
-                                const wxRect& rect,
-                                int flags = 0,
-                                wxRect *rectIn = NULL);
-
-    virtual void DrawHorizontalLine(wxDC& dc,
-                                    wxCoord y, wxCoord x1, wxCoord x2);
-    virtual void DrawVerticalLine(wxDC& dc,
-                                  wxCoord x, wxCoord y1, wxCoord y2);
-    virtual void DrawFrame(wxDC& dc,
-                           const wxString& label,
-                           const wxRect& rect,
-                           int flags = 0,
-                           int alignment = wxALIGN_LEFT,
-                           int indexAccel = -1);
-
-
-    virtual void DrawItem(wxDC& dc,
-                          const wxString& label,
-                          const wxRect& rect,
-                          int flags = 0);
-    virtual void DrawCheckItem(wxDC& dc,
-                               const wxString& label,
-                               const wxBitmap& bitmap,
-                               const wxRect& rect,
-                               int flags = 0);
-
-    virtual void DrawCheckButton(wxDC& dc,
-                                 const wxString& label,
-                                 const wxBitmap& bitmap,
-                                 const wxRect& rect,
-                                 int flags = 0,
-                                 wxAlignment align = wxALIGN_LEFT,
-                                 int indexAccel = -1);
-    virtual void DrawRadioButton(wxDC& dc,
-                                 const wxString& label,
-                                 const wxBitmap& bitmap,
-                                 const wxRect& rect,
-                                 int flags = 0,
-                                 wxAlignment align = wxALIGN_LEFT,
-                                 int indexAccel = -1);
-
-    virtual void DrawScrollbarArrow(wxDC& dc,
-                                    wxDirection dir,
-                                    const wxRect& rect,
-                                    int flags = 0);
-    virtual void DrawScrollCorner(wxDC& dc,
-                                  const wxRect& rect);
-
-#if wxUSE_TEXTCTRL
-    virtual void DrawTextLine(wxDC& dc,
-                              const wxString& text,
-                              const wxRect& rect,
-                              int selStart = -1,
-                              int selEnd = -1,
-                              int flags = 0);
-
-    virtual void DrawLineWrapMark(wxDC& dc, const wxRect& rect);
-
-    virtual wxRect GetTextTotalArea(const wxTextCtrl *text,
-                                    const wxRect& rect) const;
-    virtual wxRect GetTextClientArea(const wxTextCtrl *text,
-                                     const wxRect& rect,
-                                     wxCoord *extraSpaceBeyond) const;
-#endif // wxUSE_TEXTCTRL
-
-    virtual wxRect GetBorderDimensions(wxBorder border) const;
-
-    virtual bool AreScrollbarsInsideBorder() const;
-
-    virtual void AdjustSize(wxSize *size, const wxWindow *window);
-
-    virtual wxCoord GetListboxItemHeight(wxCoord fontHeight);
-
-#if wxUSE_STATUSBAR
-    virtual void DrawStatusField(wxDC& dc,
-                                 const wxRect& rect,
-                                 const wxString& label,
-                                 int flags = 0, int style = 0);
-
-    virtual wxSize GetStatusBarBorders() const;
-
-    virtual wxCoord GetStatusBarBorderBetweenFields() const;
-
-    virtual wxSize GetStatusBarFieldMargins() const;
-#endif // wxUSE_STATUSBAR
-
-    virtual wxCoord GetCheckItemMargin() const { return 0; }
-
-
-    virtual void DrawFrameTitleBar(wxDC& dc,
-                                   const wxRect& rect,
-                                   const wxString& title,
-                                   const wxIcon& icon,
-                                   int flags,
-                                   int specialButton = 0,
-                                   int specialButtonFlag = 0);
-    virtual void DrawFrameBorder(wxDC& dc,
-                                 const wxRect& rect,
-                                 int flags);
-    virtual void DrawFrameBackground(wxDC& dc,
-                                     const wxRect& rect,
-                                     int flags);
-    virtual void DrawFrameTitle(wxDC& dc,
-                                const wxRect& rect,
-                                const wxString& title,
-                                int flags);
-    virtual void DrawFrameIcon(wxDC& dc,
-                               const wxRect& rect,
-                               const wxIcon& icon,
-                               int flags);
-    virtual void DrawFrameButton(wxDC& dc,
-                                 wxCoord x, wxCoord y,
-                                 int button,
-                                 int flags = 0);
-
-    virtual wxRect GetFrameClientArea(const wxRect& rect, int flags) const;
-
-    virtual wxSize GetFrameTotalSize(const wxSize& clientSize, int flags) const;
-
-    virtual wxSize GetFrameMinSize(int flags) const;
-
-    virtual wxSize GetFrameIconSize() const;
-
-    virtual int HitTestFrame(const wxRect& rect,
-                             const wxPoint& pt,
-                             int flags = 0) const;
-protected:
-    // various constants
-    enum ArrowDirection
-    {
-        Arrow_Left,
-        Arrow_Right,
-        Arrow_Up,
-        Arrow_Down,
-        Arrow_Max
-    };
-
-    enum ArrowStyle
-    {
-        Arrow_Normal,
-        Arrow_Disabled,
-        Arrow_Pressed,
-        Arrow_Inverted,
-        Arrow_InvertedDisabled,
-        Arrow_StateMax
-    };
-
-    enum FrameButtonType
-    {
-        FrameButton_Close,
-        FrameButton_Minimize,
-        FrameButton_Maximize,
-        FrameButton_Restore,
-        FrameButton_Help,
-        FrameButton_Max
-    };
-
-    enum IndicatorType
-    {
-        IndicatorType_Check,
-        IndicatorType_Radio,
-        IndicatorType_MaxCtrl,
-        IndicatorType_Menu = IndicatorType_MaxCtrl,
-        IndicatorType_Max
-    };
-
-    enum IndicatorState
-    {
-        IndicatorState_Normal,
-        IndicatorState_Pressed, // this one is for check/radioboxes
-        IndicatorState_Disabled,
-        IndicatorState_MaxCtrl,
-
-        // the rest of the states are valid for menu items only
-        IndicatorState_Selected = IndicatorState_Pressed,
-        IndicatorState_SelectedDisabled = IndicatorState_MaxCtrl,
-        IndicatorState_MaxMenu
-    };
-
-    enum IndicatorStatus
-    {
-        IndicatorStatus_Checked,
-        IndicatorStatus_Unchecked,
-        IndicatorStatus_Undetermined,
-        IndicatorStatus_Max
-    };
-
-    // translate the appropriate bits in flags to the above enum elements
-    static void GetIndicatorsFromFlags(int flags,
-                                       IndicatorState& state,
-                                       IndicatorStatus& status);
-
-    // translate wxDirection to ArrowDirection
-    static ArrowDirection GetArrowDirection(wxDirection dir);
-
-
-    // fill the rectangle with a brush of given colour (must be valid)
-    void DrawSolidRect(wxDC& dc, const wxColour& col, const wxRect& rect);
-
-
-    // all the functions in this section adjust the rect parameter to
-    // correspond to the interiour of the drawn area
-
-        // draw complete rectangle
-    void DrawRect(wxDC& dc, wxRect *rect, const wxPen& pen);
-
-        // draw the rectange using the first pen for the left and top sides
-        // and the second one for the bottom and right ones
-    void DrawShadedRect(wxDC& dc, wxRect *rect,
-                        const wxPen& pen1, const wxPen& pen2);
-
-        // border drawing routines, may be overridden in the derived class
-    virtual void DrawRaisedBorder(wxDC& dc, wxRect *rect);
-    virtual void DrawSunkenBorder(wxDC& dc, wxRect *rect);
-    virtual void DrawAntiSunkenBorder(wxDC& dc, wxRect *rect);
-    virtual void DrawBoxBorder(wxDC& dc, wxRect *rect);
-    virtual void DrawStaticBorder(wxDC& dc, wxRect *rect);
-    virtual void DrawExtraBorder(wxDC& dc, wxRect *rect);
-
-
-    // draw the frame with non-empty label inside the given rectText
-    virtual void DrawFrameWithLabel(wxDC& dc,
-                                    const wxString& label,
-                                    const wxRect& rectFrame,
-                                    const wxRect& rectText,
-                                    int flags,
-                                    int alignment,
-                                    int indexAccel);
-
-    // draw the (static box) frame without the part corresponding to rectLabel
-    void DrawFrameWithoutLabel(wxDC& dc,
-                               const wxRect& rectFrame,
-                               const wxRect& rectLabel);
-
-
-    // draw the bitmap for a check item (which is by default the same as check
-    // box one but may be different)
-    virtual void DrawCheckItemBitmap(wxDC& dc,
-                                     const wxBitmap& bitmap,
-                                     const wxRect& rect,
-                                     int flags);
-
-    // common routine for drawing check and radio buttons
-    void DrawCheckOrRadioButton(wxDC& dc,
-                                const wxString& label,
-                                const wxBitmap& bitmap,
-                                const wxRect& rect,
-                                int flags,
-                                wxAlignment align,
-                                int indexAccel);
-
-    // return the check/radio bitmap for the given flags
-    virtual wxBitmap GetRadioBitmap(int flags) = 0;
-    virtual wxBitmap GetCheckBitmap(int flags) = 0;
-
-    // return the frame icon bitmap
-    virtual wxBitmap GetFrameButtonBitmap(FrameButtonType type) = 0;
-
-    // get the width of either normal or resizable frame border depending on
-    // whether flags contains wxTOPLEVEL_RESIZEABLE bit
-    //
-    // notice that these methods only make sense with standard border drawing
-    // code which uses the borders of the same width on all sides, this is why
-    // they are only present here and not in wxRenderer itself
-    virtual int GetFrameBorderWidth(int flags) const;
-
-#if wxUSE_TEXTCTRL
-    // return the width of the border around the text area in the text control
-    virtual int GetTextBorderWidth(const wxTextCtrl *text) const;
-#endif // wxUSE_TEXTCTRL
-
-    // GDI objects we often use
-    wxPen m_penBlack,
-          m_penDarkGrey,
-          m_penLightGrey,
-          m_penHighlight;
-
-    wxFont m_titlebarFont;
-
-    // the colours we use, they never change currently so we don't have to ever
-    // update m_penXXX objects above
-    const wxColourScheme * const m_scheme;
-
-    wxDECLARE_NO_COPY_CLASS(wxStdRenderer);
-};
-
-#endif // _WX_UNIV_STDREND_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/textctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/textctrl.h
deleted file mode 100644
index 1c2565a852..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/textctrl.h
+++ /dev/null
@@ -1,532 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/textctrl.h
-// Purpose:     wxTextCtrl class
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     15.09.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_TEXTCTRL_H_
-#define _WX_UNIV_TEXTCTRL_H_
-
-class WXDLLIMPEXP_FWD_CORE wxCaret;
-class WXDLLIMPEXP_FWD_CORE wxTextCtrlCommandProcessor;
-
-#include "wx/scrolwin.h"    // for wxScrollHelper
-
-#include "wx/univ/inphand.h"
-
-// ----------------------------------------------------------------------------
-// wxTextCtrl actions
-// ----------------------------------------------------------------------------
-
-// cursor movement and also selection and delete operations
-#define wxACTION_TEXT_GOTO          wxT("goto")  // to pos in numArg
-#define wxACTION_TEXT_FIRST         wxT("first") // go to pos 0
-#define wxACTION_TEXT_LAST          wxT("last")  // go to last pos
-#define wxACTION_TEXT_HOME          wxT("home")
-#define wxACTION_TEXT_END           wxT("end")
-#define wxACTION_TEXT_LEFT          wxT("left")
-#define wxACTION_TEXT_RIGHT         wxT("right")
-#define wxACTION_TEXT_UP            wxT("up")
-#define wxACTION_TEXT_DOWN          wxT("down")
-#define wxACTION_TEXT_WORD_LEFT     wxT("wordleft")
-#define wxACTION_TEXT_WORD_RIGHT    wxT("wordright")
-#define wxACTION_TEXT_PAGE_UP       wxT("pageup")
-#define wxACTION_TEXT_PAGE_DOWN     wxT("pagedown")
-
-// clipboard operations
-#define wxACTION_TEXT_COPY          wxT("copy")
-#define wxACTION_TEXT_CUT           wxT("cut")
-#define wxACTION_TEXT_PASTE         wxT("paste")
-
-// insert text at the cursor position: the text is in strArg of PerformAction
-#define wxACTION_TEXT_INSERT        wxT("insert")
-
-// if the action starts with either of these prefixes and the rest of the
-// string is one of the movement commands, it means to select/delete text from
-// the current cursor position to the new one
-#define wxACTION_TEXT_PREFIX_SEL    wxT("sel")
-#define wxACTION_TEXT_PREFIX_DEL    wxT("del")
-
-// mouse selection
-#define wxACTION_TEXT_ANCHOR_SEL    wxT("anchorsel")
-#define wxACTION_TEXT_EXTEND_SEL    wxT("extendsel")
-#define wxACTION_TEXT_SEL_WORD      wxT("wordsel")
-#define wxACTION_TEXT_SEL_LINE      wxT("linesel")
-
-// undo or redo
-#define wxACTION_TEXT_UNDO          wxT("undo")
-#define wxACTION_TEXT_REDO          wxT("redo")
-
-// ----------------------------------------------------------------------------
-// wxTextCtrl
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxTextCtrl : public wxTextCtrlBase,
-                               public wxScrollHelper
-{
-public:
-    // creation
-    // --------
-
-    wxTextCtrl() : wxScrollHelper(this) { Init(); }
-
-    wxTextCtrl(wxWindow *parent,
-               wxWindowID id,
-               const wxString& value = wxEmptyString,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxValidator& validator = wxDefaultValidator,
-               const wxString& name = wxTextCtrlNameStr)
-        : wxScrollHelper(this)
-    {
-        Init();
-
-        Create(parent, id, value, pos, size, style, validator, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& value = wxEmptyString,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxTextCtrlNameStr);
-
-    virtual ~wxTextCtrl();
-
-    // implement base class pure virtuals
-    // ----------------------------------
-
-    virtual int GetLineLength(wxTextCoord lineNo) const;
-    virtual wxString GetLineText(wxTextCoord lineNo) const;
-    virtual int GetNumberOfLines() const;
-
-    virtual bool IsModified() const;
-    virtual bool IsEditable() const;
-
-    // If the return values from and to are the same, there is no selection.
-    virtual void GetSelection(wxTextPos* from, wxTextPos* to) const;
-
-    // operations
-    // ----------
-
-    // editing
-    virtual void Clear();
-    virtual void Replace(wxTextPos from, wxTextPos to, const wxString& value);
-    virtual void Remove(wxTextPos from, wxTextPos to);
-
-    // sets/clears the dirty flag
-    virtual void MarkDirty();
-    virtual void DiscardEdits();
-
-    // writing text inserts it at the current position, appending always
-    // inserts it at the end
-    virtual void WriteText(const wxString& text);
-    virtual void AppendText(const wxString& text);
-
-    // translate between the position (which is just an index in the text ctrl
-    // considering all its contents as a single strings) and (x, y) coordinates
-    // which represent (logical, i.e. unwrapped) column and line.
-    virtual wxTextPos XYToPosition(wxTextCoord x, wxTextCoord y) const;
-    virtual bool PositionToXY(wxTextPos pos,
-                              wxTextCoord *x, wxTextCoord *y) const;
-
-    // wxUniv-specific: find a screen position (in client coordinates) of the
-    // given text position or of the caret
-    bool PositionToLogicalXY(wxTextPos pos, wxCoord *x, wxCoord *y) const;
-    bool PositionToDeviceXY(wxTextPos pos, wxCoord *x, wxCoord *y) const;
-    wxPoint GetCaretPosition() const;
-
-    virtual void ShowPosition(wxTextPos pos);
-
-    // Clipboard operations
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
-
-    // Undo/redo
-    virtual void Undo();
-    virtual void Redo();
-
-    virtual bool CanUndo() const;
-    virtual bool CanRedo() const;
-
-    // Insertion point
-    virtual void SetInsertionPoint(wxTextPos pos);
-    virtual void SetInsertionPointEnd();
-    virtual wxTextPos GetInsertionPoint() const;
-    virtual wxTextPos GetLastPosition() const;
-
-    virtual void SetSelection(wxTextPos from, wxTextPos to);
-    virtual void SetEditable(bool editable);
-
-    // wxUniv-specific methods
-    // -----------------------
-
-    // caret stuff
-    virtual void ShowCaret(bool show = true);
-    void HideCaret() { ShowCaret(false); }
-    void CreateCaret(); // for the current font size
-
-    // helpers for cursor movement
-    wxTextPos GetWordStart() const;
-    wxTextPos GetWordEnd() const;
-
-    // selection helpers
-    bool HasSelection() const
-        { return m_selStart != -1 && m_selEnd > m_selStart; }
-    void ClearSelection();
-    void RemoveSelection();
-    wxString GetSelectionText() const;
-
-    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt, long *pos) const;
-    virtual wxTextCtrlHitTestResult HitTest(const wxPoint& pt,
-                                            wxTextCoord *col,
-                                            wxTextCoord *row) const;
-
-    // find the character at this position in the given line, return value as
-    // for HitTest()
-    //
-    // NB: x is the logical coord (client and unscrolled)
-    wxTextCtrlHitTestResult HitTestLine(const wxString& line,
-                                        wxCoord x,
-                                        wxTextCoord *colOut) const;
-
-    // bring the given position into view
-    void ShowHorzPosition(wxCoord pos);
-
-    // scroll the window horizontally so that the first character shown is in
-    // position pos
-    void ScrollText(wxTextCoord col);
-
-    // adjust the DC for horz text control scrolling too
-    virtual void DoPrepareDC(wxDC& dc);
-
-    // implementation only from now on
-    // -------------------------------
-
-    // override this to take into account our scrollbar-less scrolling
-    virtual void CalcUnscrolledPosition(int x, int y, int *xx, int *yy) const;
-    virtual void CalcScrolledPosition(int x, int y, int *xx, int *yy) const;
-
-    // perform an action
-    virtual bool PerformAction(const wxControlAction& action,
-                               long numArg = -1,
-                               const wxString& strArg = wxEmptyString);
-
-    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
-    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
-    {
-        return GetStdInputHandler(handlerDef);
-    }
-
-    // override these methods to handle the caret
-    virtual bool SetFont(const wxFont &font);
-    virtual bool Enable(bool enable = true);
-
-    // more readable flag testing methods
-    bool IsPassword() const { return HasFlag(wxTE_PASSWORD); }
-    bool WrapLines() const { return m_wrapLines; }
-
-    // only for wxStdTextCtrlInputHandler
-    void RefreshSelection();
-
-    // override wxScrollHelper method to prevent (auto)scrolling beyond the end
-    // of line
-    virtual bool SendAutoScrollEvents(wxScrollWinEvent& event) const;
-
-    // idle processing
-    virtual void OnInternalIdle();
-
-protected:
-    // ensure we have correct default border
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_SUNKEN; }
-
-    // override base class methods
-    virtual void DoDrawBorder(wxDC& dc, const wxRect& rect);
-    virtual void DoDraw(wxControlRenderer *renderer);
-
-    // calc the size from the text extent
-    virtual wxSize DoGetBestClientSize() const;
-
-    // implements Set/ChangeValue()
-    virtual void DoSetValue(const wxString& value, int flags = 0);
-    virtual wxString DoGetValue() const;
-
-    // common part of all ctors
-    void Init();
-
-    // drawing
-    // -------
-
-    // draw the text in the given rectangle
-    void DoDrawTextInRect(wxDC& dc, const wxRect& rectUpdate);
-
-    // draw the line wrap marks in this rect
-    void DoDrawLineWrapMarks(wxDC& dc, const wxRect& rectUpdate);
-
-    // line/row geometry calculations
-    // ------------------------------
-
-    // get the extent (width) of the text
-    wxCoord GetTextWidth(const wxString& text) const;
-
-    // get the logical text width (accounting for scrolling)
-    wxCoord GetTotalWidth() const;
-
-    // get total number of rows (different from number of lines if the lines
-    // can be wrapped)
-    wxTextCoord GetRowCount() const;
-
-    // find the number of rows in this line (only if WrapLines())
-    wxTextCoord GetRowsPerLine(wxTextCoord line) const;
-
-    // get the starting row of the given line
-    wxTextCoord GetFirstRowOfLine(wxTextCoord line) const;
-
-    // get the row following this line
-    wxTextCoord GetRowAfterLine(wxTextCoord line) const;
-
-    // refresh functions
-    // -----------------
-
-    // the text area is the part of the window in which the text can be
-    // displayed, i.e. part of it inside the margins and the real text area is
-    // the area in which the text *is* currently displayed: for example, in the
-    // multiline control case the text area can have extra space at the bottom
-    // which is not tall enough for another line and which is then not included
-    // into the real text area
-    wxRect GetRealTextArea() const;
-
-    // refresh the text in the given (in logical coords) rect
-    void RefreshTextRect(const wxRect& rect, bool textOnly = true);
-
-    // refresh the line wrap marks for the given range of lines (inclusive)
-    void RefreshLineWrapMarks(wxTextCoord rowFirst, wxTextCoord rowLast);
-
-    // refresh the text in the given range (in logical coords) of this line, if
-    // width is 0, refresh to the end of line
-    void RefreshPixelRange(wxTextCoord line, wxCoord start, wxCoord width);
-
-    // refresh the text in the given range (in text coords) in this line
-    void RefreshColRange(wxTextCoord line, wxTextPos start, size_t count);
-
-    // refresh the text from in the given line range (inclusive)
-    void RefreshLineRange(wxTextCoord lineFirst, wxTextCoord lineLast);
-
-    // refresh the text in the given range which can span multiple lines
-    // (this method accepts arguments in any order)
-    void RefreshTextRange(wxTextPos start, wxTextPos end);
-
-    // get the text to show: either the text itself or the text replaced with
-    // starts for wxTE_PASSWORD control
-    wxString GetTextToShow(const wxString& text) const;
-
-    // find the row in this line where the given position (counted from the
-    // start of line) is
-    wxTextCoord GetRowInLine(wxTextCoord line,
-                             wxTextCoord col,
-                             wxTextCoord *colRowStart = NULL) const;
-
-    // find the number of characters of a line before it wraps
-    // (and optionally also the real width of the line)
-    size_t GetPartOfWrappedLine(const wxChar* text,
-                                wxCoord *widthReal = NULL) const;
-
-    // get the start and end of the selection for this line: if the line is
-    // outside the selection, both will be -1 and false will be returned
-    bool GetSelectedPartOfLine(wxTextCoord line,
-                               wxTextPos *start, wxTextPos *end) const;
-
-    // update the text rect: the zone inside our client rect (its coords are
-    // client coords) which contains the text
-    void UpdateTextRect();
-
-    // calculate the last visible position
-    void UpdateLastVisible();
-
-    // move caret to the given position unconditionally
-    // (SetInsertionPoint() does nothing if the position didn't change)
-    void DoSetInsertionPoint(wxTextPos pos);
-
-    // move caret to the new position without updating the display (for
-    // internal use only)
-    void MoveInsertionPoint(wxTextPos pos);
-
-    // set the caret to its initial (default) position
-    void InitInsertionPoint();
-
-    // get the width of the longest line in pixels
-    wxCoord GetMaxWidth() const;
-
-    // force recalculation of the max line width
-    void RecalcMaxWidth();
-
-    // update the max width after the given line was modified
-    void UpdateMaxWidth(wxTextCoord line);
-
-    // hit testing
-    // -----------
-
-    // HitTest2() is more efficient than 2 consecutive HitTest()s with the same
-    // line (i.e. y) and it also returns the offset of the starting position in
-    // pixels
-    //
-    // as the last hack, this function accepts either logical or device (by
-    // default) coords depending on devCoords flag
-    wxTextCtrlHitTestResult HitTest2(wxCoord y,
-                                     wxCoord x1,
-                                     wxCoord x2,
-                                     wxTextCoord *row,
-                                     wxTextCoord *colStart,
-                                     wxTextCoord *colEnd,
-                                     wxTextCoord *colRowStart,
-                                     bool devCoords = true) const;
-
-    // HitTest() version which takes the logical text coordinates and not the
-    // device ones
-    wxTextCtrlHitTestResult HitTestLogical(const wxPoint& pos,
-                                           wxTextCoord *col,
-                                           wxTextCoord *row) const;
-
-    // get the line and the row in this line corresponding to the given row,
-    // return true if ok and false if row is out of range
-    //
-    // NB: this function can only be called for controls which wrap lines
-    bool GetLineAndRow(wxTextCoord row,
-                       wxTextCoord *line,
-                       wxTextCoord *rowInLine) const;
-
-    // get the height of one line (the same for all lines)
-    wxCoord GetLineHeight() const
-    {
-        // this one should be already precalculated
-        wxASSERT_MSG( m_heightLine != -1, wxT("should have line height") );
-
-        return m_heightLine;
-    }
-
-    // get the average char width
-    wxCoord GetAverageWidth() const { return m_widthAvg; }
-
-    // recalc the line height and char width (to call when the font changes)
-    void RecalcFontMetrics();
-
-    // vertical scrolling helpers
-    // --------------------------
-
-    // all these functions are for multi line controls only
-
-    // get the number of visible lines
-    size_t GetLinesPerPage() const;
-
-    // return the position above the cursor or INVALID_POS_VALUE
-    wxTextPos GetPositionAbove();
-
-    // return the position below the cursor or INVALID_POS_VALUE
-    wxTextPos GetPositionBelow();
-
-    // event handlers
-    // --------------
-    void OnChar(wxKeyEvent& event);
-    void OnSize(wxSizeEvent& event);
-
-    // return the struct containing control-type dependent data
-    struct wxTextSingleLineData& SData() { return *m_data.sdata; }
-    struct wxTextMultiLineData& MData() { return *m_data.mdata; }
-    struct wxTextWrappedData& WData() { return *m_data.wdata; }
-    const wxTextSingleLineData& SData() const { return *m_data.sdata; }
-    const wxTextMultiLineData& MData() const { return *m_data.mdata; }
-    const wxTextWrappedData& WData() const { return *m_data.wdata; }
-
-    // clipboard operations (unlike the versions without Do prefix, they have a
-    // return code)
-    bool DoCut();
-    bool DoPaste();
-
-private:
-    // all these methods are for multiline text controls only
-
-    // update the scrollbars (only called from OnIdle)
-    void UpdateScrollbars();
-
-    // get read only access to the lines of multiline control
-    inline const wxArrayString& GetLines() const;
-    inline size_t GetLineCount() const;
-
-    // replace a line (returns true if the number of rows in thel ine changed)
-    bool ReplaceLine(wxTextCoord line, const wxString& text);
-
-    // remove a line
-    void RemoveLine(wxTextCoord line);
-
-    // insert a line at this position
-    void InsertLine(wxTextCoord line, const wxString& text);
-
-    // calculate geometry of this line
-    void LayoutLine(wxTextCoord line, class wxWrappedLineData& lineData) const;
-
-    // calculate geometry of all lines until the given one
-    void LayoutLines(wxTextCoord lineLast) const;
-
-    // the initially specified control size
-    wxSize m_sizeInitial;
-
-    // the global control text
-    wxString m_value;
-
-    // current position
-    wxTextPos m_curPos;
-    wxTextCoord m_curCol,
-                m_curRow;
-
-    // last position (only used by GetLastPosition())
-    wxTextPos m_posLast;
-
-    // selection
-    wxTextPos m_selAnchor,
-              m_selStart,
-              m_selEnd;
-
-    // flags
-    bool m_isModified:1,
-         m_isEditable:1,
-         m_hasCaret:1,
-         m_wrapLines:1; // can't be changed after creation
-
-    // the rectangle (in client coordinates) to draw text inside
-    wxRect m_rectText;
-
-    // the height of one line (cached value of GetCharHeight)
-    wxCoord m_heightLine;
-
-    // and the average char width (cached value of GetCharWidth)
-    wxCoord m_widthAvg;
-
-    // we have some data which depends on the kind of control (single or multi
-    // line)
-    union
-    {
-        wxTextSingleLineData *sdata;
-        wxTextMultiLineData *mdata;
-        wxTextWrappedData *wdata;
-        void *data;
-    } m_data;
-
-    // the object to which we delegate our undo/redo implementation
-    wxTextCtrlCommandProcessor *m_cmdProcessor;
-
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxTextCtrl)
-
-    friend class wxWrappedLineData;
-};
-
-#endif // _WX_UNIV_TEXTCTRL_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/tglbtn.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/tglbtn.h
deleted file mode 100644
index 7485c19c5b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/tglbtn.h
+++ /dev/null
@@ -1,69 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/tglbtn.h
-// Purpose:     wxToggleButton for wxUniversal
-// Author:      Vadim Zeitlin
-// Modified by: David Bjorkevik
-// Created:     16.05.06
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_TGLBTN_H_
-#define _WX_UNIV_TGLBTN_H_
-
-#include "wx/button.h"
-
-// ----------------------------------------------------------------------------
-// wxToggleButton: a push button
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxToggleButton: public wxButton
-{
-public:
-    wxToggleButton();
-
-    wxToggleButton(wxWindow *parent,
-             wxWindowID id,
-             const wxBitmap& bitmap,
-             const wxString& label = wxEmptyString,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = 0,
-             const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxCheckBoxNameStr);
-
-    wxToggleButton(wxWindow *parent,
-             wxWindowID id,
-             const wxString& label = wxEmptyString,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = 0,
-             const wxValidator& validator = wxDefaultValidator,
-             const wxString& name = wxCheckBoxNameStr);
-
-    virtual ~wxToggleButton();
-
-    virtual bool IsPressed() const { return m_isPressed || m_value; }
-
-    // wxToggleButton actions
-    virtual void Toggle();
-    virtual void Click();
-
-    // Get/set the value
-    void SetValue(bool state);
-    bool GetValue() const { return m_value; }
-
-protected:
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-    // the current value
-    bool m_value;
-
-private:
-    // common part of all ctors
-    void Init();
-
-    DECLARE_DYNAMIC_CLASS(wxToggleButton)
-};
-
-#endif // _WX_UNIV_TGLBTN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/theme.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/theme.h
deleted file mode 100644
index 6d18deeb6a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/theme.h
+++ /dev/null
@@ -1,201 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/theme.h
-// Purpose:     wxTheme class manages all configurable aspects of the
-//              application including the look (wxRenderer), feel
-//              (wxInputHandler) and the colours (wxColourScheme)
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     06.08.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_THEME_H_
-#define _WX_UNIV_THEME_H_
-
-#include "wx/string.h"
-
-// ----------------------------------------------------------------------------
-// wxTheme
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxArtProvider;
-class WXDLLIMPEXP_FWD_CORE wxColourScheme;
-class WXDLLIMPEXP_FWD_CORE wxInputConsumer;
-class WXDLLIMPEXP_FWD_CORE wxInputHandler;
-class WXDLLIMPEXP_FWD_CORE wxRenderer;
-struct WXDLLIMPEXP_FWD_CORE wxThemeInfo;
-
-class WXDLLIMPEXP_CORE wxTheme
-{
-public:
-    // static methods
-    // --------------
-
-    // create the default theme
-    static bool CreateDefault();
-
-    // create the theme by name (will return NULL if not found)
-    static wxTheme *Create(const wxString& name);
-
-    // change the current scheme
-    static wxTheme *Set(wxTheme *theme);
-
-    // get the current theme (never NULL)
-    static wxTheme *Get() { return ms_theme; }
-
-    // the theme methods
-    // -----------------
-
-    // get the renderer implementing all the control-drawing operations in
-    // this theme
-    virtual wxRenderer *GetRenderer() = 0;
-
-    // get the art provider to be used together with this theme
-    virtual wxArtProvider *GetArtProvider() = 0;
-
-    // get the input handler of the given type, forward to the standard one
-    virtual wxInputHandler *GetInputHandler(const wxString& handlerType,
-                                            wxInputConsumer *consumer) = 0;
-
-    // get the colour scheme for the control with this name
-    virtual wxColourScheme *GetColourScheme() = 0;
-
-    // implementation only from now on
-    // -------------------------------
-
-    virtual ~wxTheme();
-
-private:
-    // the list of descriptions of all known themes
-    static wxThemeInfo *ms_allThemes;
-
-    // the current theme
-    static wxTheme *ms_theme;
-    friend struct wxThemeInfo;
-};
-
-// ----------------------------------------------------------------------------
-// wxDelegateTheme: it is impossible to inherit from any of standard
-// themes as their declarations are in private code, but you can use this
-// class to override only some of their functions - all the other ones
-// will be left to the original theme
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDelegateTheme : public wxTheme
-{
-public:
-    wxDelegateTheme(const wxString& theme);
-    virtual ~wxDelegateTheme();
-
-    virtual wxRenderer *GetRenderer();
-    virtual wxArtProvider *GetArtProvider();
-    virtual wxInputHandler *GetInputHandler(const wxString& control,
-                                            wxInputConsumer *consumer);
-    virtual wxColourScheme *GetColourScheme();
-
-protected:
-    // gets or creates theme and sets m_theme to point to it,
-    // returns true on success
-    bool GetOrCreateTheme();
-
-    wxString    m_themeName;
-    wxTheme    *m_theme;
-};
-
-// ----------------------------------------------------------------------------
-// dynamic theme creation helpers
-// ----------------------------------------------------------------------------
-
-struct WXDLLIMPEXP_CORE wxThemeInfo
-{
-    typedef wxTheme *(*Constructor)();
-
-    // theme name and (user readable) description
-    wxString name, desc;
-
-    // the function to create a theme object
-    Constructor ctor;
-
-    // next node in the linked list or NULL
-    wxThemeInfo *next;
-
-    // constructor for the struct itself
-    wxThemeInfo(Constructor ctor, const wxString& name, const wxString& desc);
-};
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-// to use a standard theme insert this macro into one of the application files:
-// without it, an over optimizing linker may discard the object module
-// containing the theme implementation entirely
-#define WX_USE_THEME(themename)                                             \
-    /* this indirection makes it possible to pass macro as the argument */  \
-    WX_USE_THEME_IMPL(themename)
-
-#define WX_USE_THEME_IMPL(themename)                                        \
-    extern WXDLLIMPEXP_DATA_CORE(bool) wxThemeUse##themename;                    \
-    static struct wxThemeUserFor##themename                                 \
-    {                                                                       \
-        wxThemeUserFor##themename() { wxThemeUse##themename = true; }       \
-    } wxThemeDoUse##themename
-
-// to declare a new theme, this macro must be used in the class declaration
-#define WX_DECLARE_THEME(themename)                                         \
-    private:                                                                \
-        static wxThemeInfo ms_info##themename;                              \
-    public:                                                                 \
-        const wxThemeInfo *GetThemeInfo() const                             \
-            { return &ms_info##themename; }
-
-// and this one must be inserted in the source file
-#define WX_IMPLEMENT_THEME(classname, themename, themedesc)                 \
-    WXDLLIMPEXP_DATA_CORE(bool) wxThemeUse##themename = true;                    \
-    wxTheme *wxCtorFor##themename() { return new classname; }               \
-    wxThemeInfo classname::ms_info##themename(wxCtorFor##themename,         \
-                                              wxT( #themename ), themedesc)
-
-// ----------------------------------------------------------------------------
-// determine default theme
-// ----------------------------------------------------------------------------
-
-#if wxUSE_ALL_THEMES
-    #undef  wxUSE_THEME_WIN32
-    #define wxUSE_THEME_WIN32  1
-    #undef  wxUSE_THEME_GTK
-    #define wxUSE_THEME_GTK    1
-    #undef  wxUSE_THEME_MONO
-    #define wxUSE_THEME_MONO   1
-    #undef  wxUSE_THEME_METAL
-    #define wxUSE_THEME_METAL  1
-#endif // wxUSE_ALL_THEMES
-
-// determine the default theme to use:
-#if defined(__WXGTK__) && wxUSE_THEME_GTK
-    #define wxUNIV_DEFAULT_THEME gtk
-#elif defined(__WXDFB__) && wxUSE_THEME_MONO
-    // use mono theme for DirectFB port because it cannot correctly
-    // render neither win32 nor gtk themes yet:
-    #define wxUNIV_DEFAULT_THEME mono
-#endif
-
-// if no theme was picked, get any theme compiled in (sorted by
-// quality/completeness of the theme):
-#ifndef wxUNIV_DEFAULT_THEME
-    #if wxUSE_THEME_WIN32
-        #define wxUNIV_DEFAULT_THEME win32
-    #elif wxUSE_THEME_GTK
-        #define wxUNIV_DEFAULT_THEME gtk
-    #elif wxUSE_THEME_MONO
-        #define wxUNIV_DEFAULT_THEME mono
-    #endif
-    // If nothing matches, no themes are compiled and the app must provide
-    // some theme itself
-    // (note that wxUSE_THEME_METAL depends on win32 theme, so we don't have to
-    // try it)
-    //
-#endif // !wxUNIV_DEFAULT_THEME
-
-#endif // _WX_UNIV_THEME_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/toolbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/toolbar.h
deleted file mode 100644
index 2ff1831800..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/toolbar.h
+++ /dev/null
@@ -1,138 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/toolbar.h
-// Purpose:     wxToolBar declaration
-// Author:      Robert Roebling
-// Modified by:
-// Created:     10.09.00
-// Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_TOOLBAR_H_
-#define _WX_UNIV_TOOLBAR_H_
-
-#include "wx/button.h"      // for wxStdButtonInputHandler
-
-class WXDLLIMPEXP_FWD_CORE wxToolBarTool;
-
-// ----------------------------------------------------------------------------
-// the actions supported by this control
-// ----------------------------------------------------------------------------
-
-#define wxACTION_TOOLBAR_TOGGLE  wxACTION_BUTTON_TOGGLE
-#define wxACTION_TOOLBAR_PRESS   wxACTION_BUTTON_PRESS
-#define wxACTION_TOOLBAR_RELEASE wxACTION_BUTTON_RELEASE
-#define wxACTION_TOOLBAR_CLICK   wxACTION_BUTTON_CLICK
-#define wxACTION_TOOLBAR_ENTER   wxT("enter")     // highlight the tool
-#define wxACTION_TOOLBAR_LEAVE   wxT("leave")     // unhighlight the tool
-
-// ----------------------------------------------------------------------------
-// wxToolBar
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxToolBar : public wxToolBarBase
-{
-public:
-    // construction/destruction
-    wxToolBar() { Init(); }
-    wxToolBar(wxWindow *parent,
-              wxWindowID id,
-              const wxPoint& pos = wxDefaultPosition,
-              const wxSize& size = wxDefaultSize,
-              long style = 0,
-              const wxString& name = wxToolBarNameStr)
-    {
-        Init();
-
-        Create(parent, id, pos, size, style, name);
-    }
-
-    bool Create( wxWindow *parent,
-                 wxWindowID id,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = 0,
-                 const wxString& name = wxToolBarNameStr );
-
-    virtual ~wxToolBar();
-
-    virtual bool Realize();
-
-    virtual void SetWindowStyleFlag( long style );
-
-    virtual wxToolBarToolBase *FindToolForPosition(wxCoord x, wxCoord y) const;
-
-    virtual void SetToolShortHelp(int id, const wxString& helpString);
-
-    virtual void SetMargins(int x, int y);
-    void SetMargins(const wxSize& size)
-        { SetMargins((int) size.x, (int) size.y); }
-
-    virtual bool PerformAction(const wxControlAction& action,
-                               long numArg = -1,
-                               const wxString& strArg = wxEmptyString);
-    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
-    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
-    {
-        return GetStdInputHandler(handlerDef);
-    }
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    // implement base class pure virtuals
-    virtual bool DoInsertTool(size_t pos, wxToolBarToolBase *tool);
-    virtual bool DoDeleteTool(size_t pos, wxToolBarToolBase *tool);
-
-    virtual void DoEnableTool(wxToolBarToolBase *tool, bool enable);
-    virtual void DoToggleTool(wxToolBarToolBase *tool, bool toggle);
-    virtual void DoSetToggle(wxToolBarToolBase *tool, bool toggle);
-
-    virtual wxToolBarToolBase *CreateTool(int id,
-                                          const wxString& label,
-                                          const wxBitmap& bmpNormal,
-                                          const wxBitmap& bmpDisabled,
-                                          wxItemKind kind,
-                                          wxObject *clientData,
-                                          const wxString& shortHelp,
-                                          const wxString& longHelp);
-    virtual wxToolBarToolBase *CreateTool(wxControl *control,
-                                          const wxString& label);
-
-    virtual wxSize DoGetBestClientSize() const;
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-    virtual void DoDraw(wxControlRenderer *renderer);
-
-    // get the bounding rect for the given tool
-    wxRect GetToolRect(wxToolBarToolBase *tool) const;
-
-    // redraw the given tool
-    void RefreshTool(wxToolBarToolBase *tool);
-
-    // (re)calculate the tool positions, should only be called if it is
-    // necessary to do it, i.e. m_needsLayout == true
-    void DoLayout();
-
-    // get the rect limits depending on the orientation: top/bottom for a
-    // vertical toolbar, left/right for a horizontal one
-    void GetRectLimits(const wxRect& rect, wxCoord *start, wxCoord *end) const;
-
-private:
-    // have we calculated the positions of our tools?
-    bool m_needsLayout;
-
-    // the width of a separator
-    wxCoord m_widthSeparator;
-
-    // the total size of all toolbar elements
-    wxCoord m_maxWidth,
-            m_maxHeight;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxToolBar)
-};
-
-#endif // _WX_UNIV_TOOLBAR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/toplevel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/toplevel.h
deleted file mode 100644
index 84fc34c49a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/toplevel.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/toplevel.h
-// Purpose:     Top level window, abstraction of wxFrame and wxDialog
-// Author:      Vaclav Slavik
-// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef __WX_UNIV_TOPLEVEL_H__
-#define __WX_UNIV_TOPLEVEL_H__
-
-#include "wx/univ/inpcons.h"
-#include "wx/univ/inphand.h"
-#include "wx/icon.h"
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-// frame decorations type flags used in wxRenderer and wxColourScheme
-enum
-{
-    wxTOPLEVEL_ACTIVE          = 0x00000001,
-    wxTOPLEVEL_MAXIMIZED       = 0x00000002,
-    wxTOPLEVEL_TITLEBAR        = 0x00000004,
-    wxTOPLEVEL_ICON            = 0x00000008,
-    wxTOPLEVEL_RESIZEABLE      = 0x00000010,
-    wxTOPLEVEL_BORDER          = 0x00000020,
-    wxTOPLEVEL_BUTTON_CLOSE    = 0x01000000,
-    wxTOPLEVEL_BUTTON_MAXIMIZE = 0x02000000,
-    wxTOPLEVEL_BUTTON_ICONIZE =  0x04000000,
-    wxTOPLEVEL_BUTTON_RESTORE  = 0x08000000,
-    wxTOPLEVEL_BUTTON_HELP     = 0x10000000
-};
-
-// frame hit test return values:
-enum
-{
-    wxHT_TOPLEVEL_NOWHERE         = 0x00000000,
-    wxHT_TOPLEVEL_CLIENT_AREA     = 0x00000001,
-    wxHT_TOPLEVEL_ICON            = 0x00000002,
-    wxHT_TOPLEVEL_TITLEBAR        = 0x00000004,
-
-    wxHT_TOPLEVEL_BORDER_N        = 0x00000010,
-    wxHT_TOPLEVEL_BORDER_S        = 0x00000020,
-    wxHT_TOPLEVEL_BORDER_E        = 0x00000040,
-    wxHT_TOPLEVEL_BORDER_W        = 0x00000080,
-    wxHT_TOPLEVEL_BORDER_NE       = wxHT_TOPLEVEL_BORDER_N | wxHT_TOPLEVEL_BORDER_E,
-    wxHT_TOPLEVEL_BORDER_SE       = wxHT_TOPLEVEL_BORDER_S | wxHT_TOPLEVEL_BORDER_E,
-    wxHT_TOPLEVEL_BORDER_NW       = wxHT_TOPLEVEL_BORDER_N | wxHT_TOPLEVEL_BORDER_W,
-    wxHT_TOPLEVEL_BORDER_SW       = wxHT_TOPLEVEL_BORDER_S | wxHT_TOPLEVEL_BORDER_W,
-    wxHT_TOPLEVEL_ANY_BORDER      = 0x000000F0,
-
-    wxHT_TOPLEVEL_BUTTON_CLOSE    = /*0x01000000*/ wxTOPLEVEL_BUTTON_CLOSE,
-    wxHT_TOPLEVEL_BUTTON_MAXIMIZE = /*0x02000000*/ wxTOPLEVEL_BUTTON_MAXIMIZE,
-    wxHT_TOPLEVEL_BUTTON_ICONIZE =  /*0x04000000*/ wxTOPLEVEL_BUTTON_ICONIZE,
-    wxHT_TOPLEVEL_BUTTON_RESTORE  = /*0x08000000*/ wxTOPLEVEL_BUTTON_RESTORE,
-    wxHT_TOPLEVEL_BUTTON_HELP     = /*0x10000000*/ wxTOPLEVEL_BUTTON_HELP,
-    wxHT_TOPLEVEL_ANY_BUTTON      =   0x1F000000
-};
-
-// Flags for interactive frame manipulation functions (only in wxUniversal):
-enum
-{
-    wxINTERACTIVE_MOVE           = 0x00000001,
-    wxINTERACTIVE_RESIZE         = 0x00000002,
-    wxINTERACTIVE_RESIZE_S       = 0x00000010,
-    wxINTERACTIVE_RESIZE_N       = 0x00000020,
-    wxINTERACTIVE_RESIZE_W       = 0x00000040,
-    wxINTERACTIVE_RESIZE_E       = 0x00000080,
-    wxINTERACTIVE_WAIT_FOR_INPUT = 0x10000000
-};
-
-// ----------------------------------------------------------------------------
-// the actions supported by this control
-// ----------------------------------------------------------------------------
-
-#define wxACTION_TOPLEVEL_ACTIVATE       wxT("activate")   // (de)activate the frame
-#define wxACTION_TOPLEVEL_BUTTON_PRESS   wxT("pressbtn")   // press titlebar btn
-#define wxACTION_TOPLEVEL_BUTTON_RELEASE wxT("releasebtn") // press titlebar btn
-#define wxACTION_TOPLEVEL_BUTTON_CLICK   wxT("clickbtn")   // press titlebar btn
-#define wxACTION_TOPLEVEL_MOVE           wxT("move")       // move the frame
-#define wxACTION_TOPLEVEL_RESIZE         wxT("resize")     // resize the frame
-
-//-----------------------------------------------------------------------------
-// wxTopLevelWindow
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxTopLevelWindow : public wxTopLevelWindowNative,
-                                     public wxInputConsumer
-{
-public:
-    // construction
-    wxTopLevelWindow() { Init(); }
-    wxTopLevelWindow(wxWindow *parent,
-                     wxWindowID id,
-                     const wxString& title,
-                     const wxPoint& pos = wxDefaultPosition,
-                     const wxSize& size = wxDefaultSize,
-                     long style = wxDEFAULT_FRAME_STYLE,
-                     const wxString& name = wxFrameNameStr)
-    {
-        Init();
-
-        Create(parent, id, title, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
-
-    // wxUniv-specific methods: do [not] use native decorations for this (or
-    // all) window(s)
-    //
-    // notice that this has no effect if the system doesn't support any native
-    // decorations anyhow and that by default native decorations are used
-    //
-    // if UseNativeDecorations() is used, it must be called before Create()
-    static void UseNativeDecorationsByDefault(bool native = true);
-    void UseNativeDecorations(bool native = true);
-    bool IsUsingNativeDecorations() const;
-
-
-    // implement base class pure virtuals
-    virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL);
-    virtual wxPoint GetClientAreaOrigin() const;
-    virtual void SetIcons(const wxIconBundle& icons);
-
-    // implementation from now on
-    // --------------------------
-
-    // tests for frame's part at given point
-    long HitTest(const wxPoint& pt) const;
-
-    virtual bool PerformAction(const wxControlAction& action,
-                               long numArg = -1,
-                               const wxString& strArg = wxEmptyString);
-
-    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
-    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
-    {
-        return GetStdInputHandler(handlerDef);
-    }
-
-    // move/resize the frame interactively, i.e. let the user do it
-    virtual void InteractiveMove(int flags = wxINTERACTIVE_MOVE);
-
-    virtual wxSize GetMinSize() const;
-
-    virtual wxWindow *GetInputWindow() const { return const_cast<wxTopLevelWindow*>(this); }
-
-protected:
-    virtual void DoGetClientSize(int *width, int *height) const;
-    virtual void DoSetClientSize(int width, int height);
-
-    // handle titlebar button click event
-    virtual void ClickTitleBarButton(long button);
-
-    // return wxTOPLEVEL_xxx combination based on current state of the frame
-    long GetDecorationsStyle() const;
-
-    // common part of all ctors
-    void Init();
-
-    void RefreshTitleBar();
-    void OnNcPaint(wxNcPaintEvent& event);
-    void OnSystemMenu(wxCommandEvent& event);
-
-    // true if wxTLW should render decorations (aka titlebar) itself
-    static int ms_drawDecorations;
-    // true if wxTLW can be iconized
-    static int ms_canIconize;
-
-    // true if we're using native decorations
-    bool m_usingNativeDecorations;
-    // true for currently active frame
-    bool m_isActive;
-    // version of icon for titlebar (16x16)
-    wxIcon m_titlebarIcon;
-    // saved window style in fullscreen mdoe
-    long m_fsSavedStyle;
-    // currently pressed titlebar button
-    long m_pressedButton;
-
-    DECLARE_DYNAMIC_CLASS(wxTopLevelWindow)
-    DECLARE_EVENT_TABLE()
-    WX_DECLARE_INPUT_CONSUMER()
-};
-
-#endif // __WX_UNIV_TOPLEVEL_H__
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/window.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/window.h
deleted file mode 100644
index d34077af92..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/univ/window.h
+++ /dev/null
@@ -1,291 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/univ/window.h
-// Purpose:     wxWindow class which is the base class for all
-//              wxUniv port controls, it supports the customization of the
-//              window drawing and input processing.
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     06.08.00
-// Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIV_WINDOW_H_
-#define _WX_UNIV_WINDOW_H_
-
-#include "wx/bitmap.h"      // for m_bitmapBg
-
-class WXDLLIMPEXP_FWD_CORE wxControlRenderer;
-class WXDLLIMPEXP_FWD_CORE wxEventLoop;
-
-#if wxUSE_MENUS
-    class WXDLLIMPEXP_FWD_CORE wxMenu;
-    class WXDLLIMPEXP_FWD_CORE wxMenuBar;
-#endif // wxUSE_MENUS
-
-class WXDLLIMPEXP_FWD_CORE wxRenderer;
-
-#if wxUSE_SCROLLBAR
-    class WXDLLIMPEXP_FWD_CORE wxScrollBar;
-#endif // wxUSE_SCROLLBAR
-
-#ifdef __WXX11__
-#define wxUSE_TWO_WINDOWS 1
-#else
-#define wxUSE_TWO_WINDOWS 0
-#endif
-
-// ----------------------------------------------------------------------------
-// wxWindow
-// ----------------------------------------------------------------------------
-
-#if defined(__WXMSW__)
-#define wxWindowNative wxWindowMSW
-#elif defined(__WXGTK__)
-#define wxWindowNative wxWindowGTK
-#elif defined(__WXX11__)
-#define wxWindowNative wxWindowX11
-#elif defined(__WXMAC__)
-#define wxWindowNative wxWindowMac
-#endif
-
-class WXDLLIMPEXP_CORE wxWindow : public wxWindowNative
-{
-public:
-    // ctors and create functions
-    // ---------------------------
-
-    wxWindow() { Init(); }
-
-    wxWindow(wxWindow *parent,
-             wxWindowID id,
-             const wxPoint& pos = wxDefaultPosition,
-             const wxSize& size = wxDefaultSize,
-             long style = 0,
-             const wxString& name = wxPanelNameStr)
-        : wxWindowNative(parent, id, pos, size, style | wxCLIP_CHILDREN, name)
-        { Init(); }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxPanelNameStr);
-
-    virtual ~wxWindow();
-
-    // background pixmap support
-    // -------------------------
-
-    virtual void SetBackground(const wxBitmap& bitmap,
-                               int alignment = wxALIGN_CENTRE,
-                               wxStretch stretch = wxSTRETCH_NOT);
-
-    const wxBitmap& GetBackgroundBitmap(int *alignment = NULL,
-                                        wxStretch *stretch = NULL) const;
-
-    // scrollbars: we (re)implement it ourselves using our own scrollbars
-    // instead of the native ones
-    // ------------------------------------------------------------------
-
-    virtual void SetScrollbar(int orient,
-                              int pos,
-                              int page,
-                              int range,
-                              bool refresh = true );
-    virtual void SetScrollPos(int orient, int pos, bool refresh = true);
-    virtual int GetScrollPos(int orient) const;
-    virtual int GetScrollThumb(int orient) const;
-    virtual int GetScrollRange(int orient) const;
-    virtual void ScrollWindow(int dx, int dy,
-                              const wxRect* rect = NULL);
-
-    // take into account the borders here
-    virtual wxPoint GetClientAreaOrigin() const;
-
-    // popup menu support
-    // ------------------
-
-    // NB: all menu related functions are implemented in menu.cpp
-
-#if wxUSE_MENUS
-    // this is wxUniv-specific private method to be used only by wxMenu
-    void DismissPopupMenu();
-#endif // wxUSE_MENUS
-
-    // miscellaneous other methods
-    // ---------------------------
-
-    // get the state information
-    virtual bool IsFocused() const;
-    virtual bool IsCurrent() const;
-    virtual bool IsPressed() const;
-    virtual bool IsDefault() const;
-
-    // return all state flags at once (combination of wxCONTROL_XXX values)
-    int GetStateFlags() const;
-
-    // set the "highlighted" flag and return true if it changed
-    virtual bool SetCurrent(bool doit = true);
-
-#if wxUSE_SCROLLBAR
-    // get the scrollbar (may be NULL) for the given orientation
-    wxScrollBar *GetScrollbar(int orient) const
-    {
-        return orient & wxVERTICAL ? m_scrollbarVert : m_scrollbarHorz;
-    }
-#endif // wxUSE_SCROLLBAR
-
-    // methods used by wxColourScheme to choose the colours for this window
-    // --------------------------------------------------------------------
-
-    // return true if this is a panel/canvas window which contains other
-    // controls only
-    virtual bool IsCanvasWindow() const { return false; }
-
-    // return true if this control can be highlighted when the mouse is over
-    // it (the theme decides itself whether it is really highlighted or not)
-    virtual bool CanBeHighlighted() const { return false; }
-
-    // return true if we should use the colours/fonts returned by the
-    // corresponding GetXXX() methods instead of the default ones
-    bool UseFgCol() const { return m_hasFgCol; }
-    bool UseFont() const { return m_hasFont; }
-
-    // return true if this window serves as a container for the other windows
-    // only and doesn't get any input itself
-    virtual bool IsStaticBox() const { return false; }
-
-    // returns the (low level) renderer to use for drawing the control by
-    // querying the current theme
-    wxRenderer *GetRenderer() const { return m_renderer; }
-
-    // scrolling helper: like ScrollWindow() except that it doesn't refresh the
-    // uncovered window areas but returns the rectangle to update (don't call
-    // this with both dx and dy non zero)
-    wxRect ScrollNoRefresh(int dx, int dy, const wxRect *rect = NULL);
-
-    // after scrollbars are added or removed they must be refreshed by calling
-    // this function
-    void RefreshScrollbars();
-
-    // erase part of the control
-    virtual void EraseBackground(wxDC& dc, const wxRect& rect);
-
-    // overridden base class methods
-    // -----------------------------
-
-    // the rect coordinates are, for us, in client coords, but if no rect is
-    // specified, the entire window is refreshed
-    virtual void Refresh(bool eraseBackground = true,
-                         const wxRect *rect = (const wxRect *) NULL);
-
-    // we refresh the window when it is dis/enabled
-    virtual bool Enable(bool enable = true);
-
-    // should we use the standard control colours or not?
-    virtual bool ShouldInheritColours() const { return false; }
-
-    virtual bool IsClientAreaChild(const wxWindow *child) const
-    {
-#if wxUSE_SCROLLBAR
-        if ( child == (wxWindow*)m_scrollbarHorz ||
-             child == (wxWindow*)m_scrollbarVert )
-            return false;
-#endif
-        return wxWindowNative::IsClientAreaChild(child);
-    }
-
-protected:
-    // common part of all ctors
-    void Init();
-
-#if wxUSE_MENUS
-    virtual bool DoPopupMenu(wxMenu *menu, int x, int y);
-#endif // wxUSE_MENUS
-
-    // we deal with the scrollbars in these functions
-    virtual void DoSetClientSize(int width, int height);
-    virtual void DoGetClientSize(int *width, int *height) const;
-    virtual wxHitTest DoHitTest(wxCoord x, wxCoord y) const;
-
-    // event handlers
-    void OnSize(wxSizeEvent& event);
-    void OnNcPaint(wxNcPaintEvent& event);
-    void OnPaint(wxPaintEvent& event);
-    void OnErase(wxEraseEvent& event);
-
-#if wxUSE_ACCEL || wxUSE_MENUS
-    void OnKeyDown(wxKeyEvent& event);
-#endif // wxUSE_ACCEL
-
-#if wxUSE_MENUS
-    void OnChar(wxKeyEvent& event);
-    void OnKeyUp(wxKeyEvent& event);
-#endif // wxUSE_MENUS
-
-    // draw the control background, return true if done
-    virtual bool DoDrawBackground(wxDC& dc);
-
-    // draw the controls border
-    virtual void DoDrawBorder(wxDC& dc, const wxRect& rect);
-
-    // draw the controls contents
-    virtual void DoDraw(wxControlRenderer *renderer);
-
-    // override the base class method to return the size of the window borders
-    virtual wxSize DoGetBorderSize() const;
-
-    // adjust the size of the window to take into account its borders
-    wxSize AdjustSize(const wxSize& size) const;
-
-    // put the scrollbars along the edges of the window
-    void PositionScrollbars();
-
-#if wxUSE_MENUS
-    // return the menubar of the parent frame or NULL
-    wxMenuBar *GetParentFrameMenuBar() const;
-#endif // wxUSE_MENUS
-
-    // the renderer we use
-    wxRenderer *m_renderer;
-
-    // background bitmap info
-    wxBitmap  m_bitmapBg;
-    int       m_alignBgBitmap;
-    wxStretch m_stretchBgBitmap;
-
-    // old size
-    wxSize m_oldSize;
-
-    // is the mouse currently inside the window?
-    bool m_isCurrent:1;
-
-#ifdef __WXMSW__
-public:
-    // override MSWWindowProc() to process WM_NCHITTEST
-    WXLRESULT MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam);
-#endif // __WXMSW__
-
-private:
-
-#if wxUSE_SCROLLBAR
-    // the window scrollbars
-    wxScrollBar *m_scrollbarHorz,
-                *m_scrollbarVert;
-#endif // wxUSE_SCROLLBAR
-
-#if wxUSE_MENUS
-    // the current modal event loop for the popup menu we show or NULL
-    static wxEventLoop *ms_evtLoopPopup;
-
-    // the last window over which Alt was pressed (used by OnKeyUp)
-    static wxWindow *ms_winLastAltPress;
-#endif // wxUSE_MENUS
-
-    DECLARE_DYNAMIC_CLASS(wxWindow)
-    DECLARE_EVENT_TABLE()
-};
-
-#endif // _WX_UNIV_WINDOW_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/app.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/app.h
deleted file mode 100644
index f14df9ec3f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/app.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/app.h
-// Purpose:     wxAppConsole implementation for Unix
-// Author:      Lukasz Michalski
-// Created:     28/01/2005
-// Copyright:   (c) Lukasz Michalski
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-//Ensure that sigset_t is being defined
-#include <signal.h>
-
-class wxFDIODispatcher;
-class wxFDIOHandler;
-class wxWakeUpPipe;
-
-// wxApp subclass implementing event processing for console applications
-class WXDLLIMPEXP_BASE wxAppConsole : public wxAppConsoleBase
-{
-public:
-    wxAppConsole();
-    virtual ~wxAppConsole();
-
-    // override base class initialization
-    virtual bool Initialize(int& argc, wxChar** argv);
-
-
-    // Unix-specific: Unix signal handling
-    // -----------------------------------
-
-    // type of the function which can be registered as signal handler: notice
-    // that it isn't really a signal handler, i.e. it's not subject to the
-    // usual signal handlers constraints, because it is called later from
-    // CheckSignal() and not when the signal really occurs
-    typedef void (*SignalHandler)(int);
-
-    // Set signal handler for the given signal, SIG_DFL or SIG_IGN can be used
-    // instead of a function pointer
-    //
-    // Return true if handler was installed, false on error
-    bool SetSignalHandler(int signal, SignalHandler handler);
-
-    // Check if any Unix signals arrived since the last call and execute
-    // handlers for them
-    void CheckSignal();
-
-    // Register the signal wake up pipe with the given dispatcher.
-    //
-    // This is used by wxExecute(wxEXEC_NOEVENTS) implementation only.
-    //
-    // The pointer to the handler used for processing events on this descriptor
-    // is returned so that it can be deleted when we no longer needed it.
-    wxFDIOHandler* RegisterSignalWakeUpPipe(wxFDIODispatcher& dispatcher);
-
-private:
-    // signal handler set up by SetSignalHandler() for all signals we handle,
-    // it just adds the signal to m_signalsCaught -- the real processing is
-    // done later, when CheckSignal() is called
-    static void HandleSignal(int signal);
-
-
-    // signals for which HandleSignal() had been called (reset from
-    // CheckSignal())
-    sigset_t m_signalsCaught;
-
-    // the signal handlers
-    WX_DECLARE_HASH_MAP(int, SignalHandler, wxIntegerHash, wxIntegerEqual, SignalHandlerHash);
-    SignalHandlerHash m_signalHandlerHash;
-
-    // pipe used for wake up signal handling: if a signal arrives while we're
-    // blocking for input, writing to this pipe triggers a call to our CheckSignal()
-    wxWakeUpPipe *m_signalWakeUpPipe;
-};
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/apptbase.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/apptbase.h
deleted file mode 100644
index 6ce6f152c3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/apptbase.h
+++ /dev/null
@@ -1,67 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/apptbase.h
-// Purpose:     declaration of wxAppTraits for Unix systems
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     23.06.2003
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_APPTBASE_H_
-#define _WX_UNIX_APPTBASE_H_
-
-#include "wx/evtloop.h"
-#include "wx/evtloopsrc.h"
-
-class wxExecuteData;
-class wxFDIOManager;
-class wxEventLoopSourcesManagerBase;
-
-// ----------------------------------------------------------------------------
-// wxAppTraits: the Unix version adds extra hooks needed by Unix code
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxAppTraits : public wxAppTraitsBase
-{
-public:
-    // wxExecute() support methods
-    // ---------------------------
-
-    // Wait for the process termination and return its exit code or -1 on error.
-    //
-    // Notice that this is only used when execData.flags contains wxEXEC_SYNC
-    // and does not contain wxEXEC_NOEVENTS, i.e. when we need to really wait
-    // until the child process exit and dispatch the events while doing it.
-    virtual int WaitForChild(wxExecuteData& execData);
-
-#if wxUSE_SOCKETS
-    // return a pointer to the object which should be used to integrate
-    // monitoring of the file descriptors to the event loop (currently this is
-    // used for the sockets only but should be used for arbitrary event loop
-    // sources in the future)
-    //
-    // this object may be different for the console and GUI applications
-    //
-    // the pointer is not deleted by the caller as normally it points to a
-    // static variable
-    virtual wxFDIOManager *GetFDIOManager();
-#endif // wxUSE_SOCKETS
-
-#if wxUSE_CONSOLE_EVENTLOOP
-    // Return a non-NULL pointer to the object responsible for managing the
-    // event loop sources in this kind of application.
-    virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager();
-#endif // wxUSE_CONSOLE_EVENTLOOP
-
-protected:
-    // Wait for the process termination by running the given event loop until
-    // this happens.
-    //
-    // This is used by the public WaitForChild() after creating the event loop
-    // of the appropriate kind.
-    int RunLoopUntilChildExit(wxExecuteData& execData, wxEventLoopBase& loop);
-};
-
-#endif // _WX_UNIX_APPTBASE_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/apptrait.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/apptrait.h
deleted file mode 100644
index 3fbe4d82da..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/apptrait.h
+++ /dev/null
@@ -1,94 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/apptrait.h
-// Purpose:     standard implementations of wxAppTraits for Unix
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     23.06.2003
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_APPTRAIT_H_
-#define _WX_UNIX_APPTRAIT_H_
-
-// ----------------------------------------------------------------------------
-// wxGUI/ConsoleAppTraits: must derive from wxAppTraits, not wxAppTraitsBase
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxConsoleAppTraits : public wxConsoleAppTraitsBase
-{
-public:
-#if wxUSE_CONSOLE_EVENTLOOP
-    virtual wxEventLoopBase *CreateEventLoop();
-#endif // wxUSE_CONSOLE_EVENTLOOP
-#if wxUSE_TIMER
-    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
-#endif
-};
-
-#if wxUSE_GUI
-
-// GTK+ and Motif integrate sockets and child processes monitoring directly in
-// their main loop, the other Unix ports do it at wxEventLoop level and so use
-// the non-GUI traits and don't need anything here
-//
-// TODO: Should we use XtAddInput() for wxX11 too? Or, vice versa, if there is
-//       no advantage in doing this compared to the generic way currently used
-//       by wxX11, should we continue to use GTK/Motif-specific stuff?
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
-    #define wxHAS_GUI_FDIOMANAGER
-    #define wxHAS_GUI_PROCESS_CALLBACKS
-#endif // ports using wxFDIOManager
-
-#if defined(__WXMAC__)
-    #define wxHAS_GUI_PROCESS_CALLBACKS
-    #define wxHAS_GUI_SOCKET_MANAGER
-#endif
-
-class WXDLLIMPEXP_CORE wxGUIAppTraits : public wxGUIAppTraitsBase
-{
-public:
-    virtual wxEventLoopBase *CreateEventLoop();
-    virtual int WaitForChild(wxExecuteData& execData);
-#if wxUSE_TIMER
-    virtual wxTimerImpl *CreateTimerImpl(wxTimer *timer);
-#endif
-#if wxUSE_THREADS && defined(__WXGTK20__)
-    virtual void MutexGuiEnter();
-    virtual void MutexGuiLeave();
-#endif
-
-#if (defined(__WXMAC__) || defined(__WXCOCOA__)) && wxUSE_STDPATHS
-    virtual wxStandardPaths& GetStandardPaths();
-#endif
-    virtual wxPortId GetToolkitVersion(int *majVer = NULL, int *minVer = NULL) const;
-
-#ifdef __WXGTK20__
-    virtual wxString GetDesktopEnvironment() const;
-    virtual wxString GetStandardCmdLineOptions(wxArrayString& names,
-                                               wxArrayString& desc) const;
-#endif // __WXGTK20____
-
-#if defined(__WXGTK20__)
-    virtual bool ShowAssertDialog(const wxString& msg);
-#endif
-
-#if wxUSE_SOCKETS
-
-#ifdef wxHAS_GUI_SOCKET_MANAGER
-    virtual wxSocketManager *GetSocketManager();
-#endif
-
-#ifdef wxHAS_GUI_FDIOMANAGER
-    virtual wxFDIOManager *GetFDIOManager();
-#endif
-
-#endif // wxUSE_SOCKETS
-
-    virtual wxEventLoopSourcesManagerBase* GetEventLoopSourcesManager();
-};
-
-#endif // wxUSE_GUI
-
-#endif // _WX_UNIX_APPTRAIT_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/chkconf.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/chkconf.h
deleted file mode 100644
index b8a1904133..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/chkconf.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Name:        wx/unix/chkconf.h
- * Purpose:     Unix-specific config settings consistency checks
- * Author:      Vadim Zeitlin
- * Created:     2007-07-14
- * Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwidgets.org>
- * Licence:     wxWindows licence
- */
-
-/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
-
-#if wxUSE_CONSOLE_EVENTLOOP
-#   if !wxUSE_SELECT_DISPATCHER && !wxUSE_EPOLL_DISPATCHER
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxSelect/EpollDispatcher needed for console event loop"
-#       else
-#           undef wxUSE_SELECT_DISPATCHER
-#           define wxUSE_SELECT_DISPATCHER 1
-#       endif
-#   endif
-#endif /* wxUSE_CONSOLE_EVENTLOOP */
-
-#if wxUSE_FSWATCHER
-#   if !defined(wxHAS_INOTIFY) && !defined(wxHAS_KQUEUE)
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "wxFileSystemWatcher requires either inotify() or kqueue()"
-#       else
-#           undef wxUSE_FSWATCHER
-#           define wxUSE_FSWATCHER 0
-#       endif
-#   endif
-#endif /* wxUSE_FSWATCHER */
-
-#if wxUSE_GSTREAMER
-#   if !wxUSE_THREADS
-#       ifdef wxABORT_ON_CONFIG_ERROR
-#           error "GStreamer requires threads"
-#       else
-#           undef wxUSE_GSTREAMER
-#           define wxUSE_GSTREAMER 0
-#       endif
-#   endif
-#endif /* wxUSE_GSTREAMER */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/evtloop.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/evtloop.h
deleted file mode 100644
index 2b91c72375..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/evtloop.h
+++ /dev/null
@@ -1,62 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/evtloop.h
-// Purpose:     declares wxEventLoop class
-// Author:      Lukasz Michalski (lm@zork.pl)
-// Created:     2007-05-07
-// Copyright:   (c) 2007 Lukasz Michalski
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_EVTLOOP_H_
-#define _WX_UNIX_EVTLOOP_H_
-
-#if wxUSE_CONSOLE_EVENTLOOP
-
-// ----------------------------------------------------------------------------
-// wxConsoleEventLoop
-// ----------------------------------------------------------------------------
-
-class wxEventLoopSource;
-class wxFDIODispatcher;
-class wxWakeUpPipeMT;
-
-class WXDLLIMPEXP_BASE wxConsoleEventLoop
-#ifdef __WXOSX__
-: public wxCFEventLoop
-#else
-: public wxEventLoopManual
-#endif
-{
-public:
-    // initialize the event loop, use IsOk() to check if we were successful
-    wxConsoleEventLoop();
-    virtual ~wxConsoleEventLoop();
-
-    // implement base class pure virtuals
-    virtual bool Pending() const;
-    virtual bool Dispatch();
-    virtual int DispatchTimeout(unsigned long timeout);
-    virtual void WakeUp();
-    virtual bool IsOk() const { return m_dispatcher != NULL; }
-    virtual bool YieldFor(long WXUNUSED(eventsToProcess)) { return true; }
-
-protected:
-    virtual void OnNextIteration();
-
-private:
-    // pipe used for wake up messages: when a child thread wants to wake up
-    // the event loop in the main thread it writes to this pipe
-    wxWakeUpPipeMT *m_wakeupPipe;
-
-    // the event loop source used to monitor this pipe
-    wxEventLoopSource* m_wakeupSource;
-
-    // either wxSelectDispatcher or wxEpollDispatcher
-    wxFDIODispatcher *m_dispatcher;
-
-    wxDECLARE_NO_COPY_CLASS(wxConsoleEventLoop);
-};
-
-#endif // wxUSE_CONSOLE_EVENTLOOP
-
-#endif // _WX_UNIX_EVTLOOP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/evtloopsrc.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/evtloopsrc.h
deleted file mode 100644
index 4c2cfec167..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/evtloopsrc.h
+++ /dev/null
@@ -1,48 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/evtloopsrc.h
-// Purpose:     wxUnixEventLoopSource class
-// Author:      Vadim Zeitlin
-// Created:     2009-10-21
-// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_EVTLOOPSRC_H_
-#define _WX_UNIX_EVTLOOPSRC_H_
-
-class wxFDIODispatcher;
-class wxFDIOHandler;
-
-// ----------------------------------------------------------------------------
-// wxUnixEventLoopSource: wxEventLoopSource for Unix-like toolkits using fds
-// ----------------------------------------------------------------------------
-
-class wxUnixEventLoopSource : public wxEventLoopSource
-{
-public:
-    // dispatcher and fdioHandler are only used here to allow us to unregister
-    // from the event loop when we're destroyed
-    wxUnixEventLoopSource(wxFDIODispatcher *dispatcher,
-                          wxFDIOHandler *fdioHandler,
-                          int fd,
-                          wxEventLoopSourceHandler *handler,
-                          int flags)
-        : wxEventLoopSource(handler, flags),
-          m_dispatcher(dispatcher),
-          m_fdioHandler(fdioHandler),
-          m_fd(fd)
-    {
-    }
-
-    virtual ~wxUnixEventLoopSource();
-
-private:
-    wxFDIODispatcher * const m_dispatcher;
-    wxFDIOHandler * const m_fdioHandler;
-    const int m_fd;
-
-    wxDECLARE_NO_COPY_CLASS(wxUnixEventLoopSource);
-};
-
-#endif // _WX_UNIX_EVTLOOPSRC_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/execute.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/execute.h
deleted file mode 100644
index 9756c00a7d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/execute.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/execute.h
-// Purpose:     private details of wxExecute() implementation
-// Author:      Vadim Zeitlin
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart, Vadim Zeitlin
-//              (c) 2013 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_EXECUTE_H
-#define _WX_UNIX_EXECUTE_H
-
-#include "wx/app.h"
-#include "wx/hashmap.h"
-#include "wx/process.h"
-
-#if wxUSE_STREAMS
-    #include "wx/unix/pipe.h"
-    #include "wx/private/streamtempinput.h"
-#endif
-
-class wxEventLoopBase;
-
-// Information associated with a running child process.
-class wxExecuteData
-{
-public:
-    wxExecuteData()
-    {
-        flags =
-        pid = 0;
-        exitcode = -1;
-
-        process = NULL;
-
-        syncEventLoop = NULL;
-
-#if wxUSE_STREAMS
-        fdOut =
-        fdErr = wxPipe::INVALID_FD;
-#endif // wxUSE_STREAMS
-    }
-
-    // This must be called in the parent process as soon as fork() returns to
-    // update us with the effective child PID. It also ensures that we handle
-    // SIGCHLD to be able to detect when this PID exits, so wxTheApp must be
-    // available.
-    void OnStart(int pid);
-
-    // Called when the child process exits.
-    void OnExit(int exitcode);
-
-    // Return true if we should (or already did) redirect the child IO.
-    bool IsRedirected() const { return process && process->IsRedirected(); }
-
-
-    // wxExecute() flags
-    int flags;
-
-    // the pid of the child process
-    int pid;
-
-    // The exit code of the process, set once the child terminates.
-    int exitcode;
-
-    // the associated process object or NULL
-    wxProcess *process;
-
-    // Local event loop used to wait for the child process termination in
-    // synchronous execution case. We can't create it ourselves as its exact
-    // type depends on the application kind (console/GUI), so we rely on
-    // wxAppTraits setting up this pointer to point to the appropriate object.
-    wxEventLoopBase *syncEventLoop;
-
-#if wxUSE_STREAMS
-    // the input buffer bufOut is connected to stdout, this is why it is
-    // called bufOut and not bufIn
-    wxStreamTempInputBuffer bufOut,
-                            bufErr;
-
-    // the corresponding FDs, -1 if not redirected
-    int fdOut,
-        fdErr;
-#endif // wxUSE_STREAMS
-
-
-private:
-    // SIGCHLD signal handler that checks whether any of the currently running
-    // children have exited.
-    static void OnSomeChildExited(int sig);
-
-    // All currently running child processes indexed by their PID.
-    //
-    // Notice that the container doesn't own its elements.
-    WX_DECLARE_HASH_MAP(int, wxExecuteData*, wxIntegerHash, wxIntegerEqual,
-                        ChildProcessesData);
-    static ChildProcessesData ms_childProcesses;
-
-    wxDECLARE_NO_COPY_CLASS(wxExecuteData);
-};
-
-#endif // _WX_UNIX_EXECUTE_H
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/fontutil.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/fontutil.h
deleted file mode 100644
index 64cb3a3ccd..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/fontutil.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/fontutil.h
-// Purpose:     font-related helper functions for Unix/X11
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     05.11.99
-// Copyright:   (c) wxWidgets team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_FONTUTIL_H_
-#define _WX_UNIX_FONTUTIL_H_
-
-#ifdef __X__
-    typedef WXFontStructPtr wxNativeFont;
-#elif defined(__WXGTK__)
-    typedef GdkFont *wxNativeFont;
-#else
-    #error "Unsupported toolkit"
-#endif
-
-// returns the handle of the nearest available font or 0
-extern wxNativeFont
-wxLoadQueryNearestFont(int pointSize,
-                       int family,
-                       int style,
-                       int weight,
-                       bool underlined,
-                       const wxString &facename,
-                       wxFontEncoding encoding,
-                       wxString* xFontName = NULL);
-
-// returns the font specified by the given XLFD
-extern wxNativeFont wxLoadFont(const wxString& fontSpec);
-
-#endif // _WX_UNIX_FONTUTIL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/fswatcher_inotify.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/fswatcher_inotify.h
deleted file mode 100644
index 1881966053..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/fswatcher_inotify.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/fswatcher_inotify.h
-// Purpose:     wxInotifyFileSystemWatcher
-// Author:      Bartosz Bekier
-// Created:     2009-05-26
-// Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FSWATCHER_UNIX_H_
-#define _WX_FSWATCHER_UNIX_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_FSWATCHER
-
-class WXDLLIMPEXP_BASE wxInotifyFileSystemWatcher :
-        public wxFileSystemWatcherBase
-{
-public:
-    wxInotifyFileSystemWatcher();
-
-    wxInotifyFileSystemWatcher(const wxFileName& path,
-                               int events = wxFSW_EVENT_ALL);
-
-    virtual ~wxInotifyFileSystemWatcher();
-
-    void OnDirDeleted(const wxString& path);
-
-protected:
-    bool Init();
-};
-
-#endif
-
-#endif /* _WX_FSWATCHER_UNIX_H_ */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/fswatcher_kqueue.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/fswatcher_kqueue.h
deleted file mode 100644
index a324eb7efd..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/fswatcher_kqueue.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/fswatcher_kqueue.h
-// Purpose:     wxKqueueFileSystemWatcher
-// Author:      Bartosz Bekier
-// Created:     2009-05-26
-// Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FSWATCHER_KQUEUE_H_
-#define _WX_FSWATCHER_KQUEUE_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_FSWATCHER
-
-class WXDLLIMPEXP_BASE wxKqueueFileSystemWatcher :
-        public wxFileSystemWatcherBase
-{
-public:
-    wxKqueueFileSystemWatcher();
-
-    wxKqueueFileSystemWatcher(const wxFileName& path,
-                              int events = wxFSW_EVENT_ALL);
-
-    virtual ~wxKqueueFileSystemWatcher();
-
-protected:
-    bool Init();
-};
-
-#endif
-
-#endif /* _WX_FSWATCHER_OSX_H_ */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/glx11.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/glx11.h
deleted file mode 100644
index 34ed4dd46d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/glx11.h
+++ /dev/null
@@ -1,164 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/glx11.h
-// Purpose:     class common for all X11-based wxGLCanvas implementations
-// Author:      Vadim Zeitlin
-// Created:     2007-04-15
-// Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_GLX11_H_
-#define _WX_UNIX_GLX11_H_
-
-#include <GL/glx.h>
-
-// ----------------------------------------------------------------------------
-// wxGLContext
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_GL wxGLContext : public wxGLContextBase
-{
-public:
-    wxGLContext(wxGLCanvas *win, const wxGLContext *other = NULL);
-    virtual ~wxGLContext();
-
-    virtual bool SetCurrent(const wxGLCanvas& win) const;
-
-private:
-    // attach context to the drawable or unset it (if NULL)
-    static bool MakeCurrent(GLXDrawable drawable, GLXContext context);
-
-    GLXContext m_glContext;
-
-    DECLARE_CLASS(wxGLContext)
-};
-
-// ----------------------------------------------------------------------------
-// wxGLCanvasX11
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_GL wxGLCanvasX11 : public wxGLCanvasBase
-{
-public:
-    // initialization and dtor
-    // -----------------------
-
-    // default ctor doesn't do anything, InitVisual() must be called
-    wxGLCanvasX11();
-
-    // initializes the XVisualInfo corresponding to the given attributes
-    bool InitVisual(const int *attribList);
-
-    // frees XVisualInfo info
-    virtual ~wxGLCanvasX11();
-
-
-    // implement wxGLCanvasBase methods
-    // --------------------------------
-
-    virtual bool SwapBuffers();
-
-
-    // X11-specific methods
-    // --------------------
-
-    // return GLX version: 13 means 1.3 &c
-    static int GetGLXVersion();
-
-    // return true if multisample extension is available
-    static bool IsGLXMultiSampleAvailable();
-
-    // get the X11 handle of this window
-    virtual Window GetXWindow() const = 0;
-
-
-    // override some wxWindow methods
-    // ------------------------------
-
-    // return true only if the window is realized: OpenGL context can't be
-    // created until we are
-    virtual bool IsShownOnScreen() const;
-
-
-    // implementation only from now on
-    // -------------------------------
-
-    // get the GLXFBConfig/XVisualInfo we use
-    GLXFBConfig *GetGLXFBConfig() const { return m_fbc; }
-    XVisualInfo *GetXVisualInfo() const { return m_vi; }
-
-    // initialize the global default GL visual, return false if matching visual
-    // not found
-    static bool InitDefaultVisualInfo(const int *attribList);
-
-    // get the default GL X11 visual (may be NULL, shouldn't be freed by caller)
-    static XVisualInfo *GetDefaultXVisualInfo() { return ms_glVisualInfo; }
-
-    // free the global GL visual, called by wxGLApp
-    static void FreeDefaultVisualInfo();
-
-    // initializes XVisualInfo (in any case) and, if supported, GLXFBConfig
-    //
-    // returns false if XVisualInfo couldn't be initialized, otherwise caller
-    // is responsible for freeing the pointers
-    static bool InitXVisualInfo(const int *attribList,
-                                GLXFBConfig **pFBC, XVisualInfo **pXVisual);
-
-private:
-    // fills in glattrs with attributes defined by wxattrs which must be
-    // 0-terminated if it is non-NULL
-    //
-    // n is the max size of glattrs, false is returned if we overflow it, it
-    // should be at least 16 to accommodate the default attributes
-    static bool ConvertWXAttrsToGL(const int *wxattrs, int *glattrs, size_t n);
-
-
-    // this is only used if it's supported i.e. if GL >= 1.3
-    GLXFBConfig *m_fbc;
-
-    // used for all GL versions, obtained from GLXFBConfig for GL >= 1.3
-    XVisualInfo *m_vi;
-
-    // the global/default versions of the above
-    static GLXFBConfig *ms_glFBCInfo;
-    static XVisualInfo *ms_glVisualInfo;
-};
-
-// ----------------------------------------------------------------------------
-// wxGLApp
-// ----------------------------------------------------------------------------
-
-// this is used in wx/glcanvas.h, prevent it from defining a generic wxGLApp
-#define wxGL_APP_DEFINED
-
-class WXDLLIMPEXP_GL wxGLApp : public wxGLAppBase
-{
-public:
-    wxGLApp() : wxGLAppBase() { }
-
-    // implement wxGLAppBase method
-    virtual bool InitGLVisual(const int *attribList)
-    {
-        return wxGLCanvasX11::InitDefaultVisualInfo(attribList);
-    }
-
-    // and implement this wxGTK::wxApp method too
-    virtual void *GetXVisualInfo()
-    {
-        return wxGLCanvasX11::GetDefaultXVisualInfo();
-    }
-
-    // and override this wxApp method to clean up
-    virtual int OnExit()
-    {
-        wxGLCanvasX11::FreeDefaultVisualInfo();
-
-        return wxGLAppBase::OnExit();
-    }
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxGLApp)
-};
-
-#endif // _WX_UNIX_GLX11_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/joystick.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/joystick.h
deleted file mode 100644
index ef7a5db223..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/joystick.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/joystick.h
-// Purpose:     wxJoystick class
-// Author:      Guilhem Lavaux
-// Modified by:
-// Created:     01/02/97
-// Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_JOYSTICK_H_
-#define _WX_UNIX_JOYSTICK_H_
-
-#include "wx/event.h"
-
-class WXDLLIMPEXP_FWD_CORE wxJoystickThread;
-
-class WXDLLIMPEXP_ADV wxJoystick: public wxObject
-{
-    DECLARE_DYNAMIC_CLASS(wxJoystick)
-        public:
-    /*
-     * Public interface
-     */
-
-    wxJoystick(int joystick = wxJOYSTICK1);
-    virtual ~wxJoystick();
-
-    // Attributes
-    ////////////////////////////////////////////////////////////////////////////
-
-    wxPoint GetPosition() const;
-    int GetPosition(unsigned axis) const;
-    bool GetButtonState(unsigned button) const;
-    int GetZPosition() const;
-    int GetButtonState() const;
-    int GetPOVPosition() const;
-    int GetPOVCTSPosition() const;
-    int GetRudderPosition() const;
-    int GetUPosition() const;
-    int GetVPosition() const;
-    int GetMovementThreshold() const;
-    void SetMovementThreshold(int threshold) ;
-
-    // Capabilities
-    ////////////////////////////////////////////////////////////////////////////
-
-    bool IsOk() const; // Checks that the joystick is functioning
-    static int GetNumberJoysticks() ;
-    int GetManufacturerId() const ;
-    int GetProductId() const ;
-    wxString GetProductName() const ;
-    int GetXMin() const;
-    int GetYMin() const;
-    int GetZMin() const;
-    int GetXMax() const;
-    int GetYMax() const;
-    int GetZMax() const;
-    int GetNumberButtons() const;
-    int GetNumberAxes() const;
-    int GetMaxButtons() const;
-    int GetMaxAxes() const;
-    int GetPollingMin() const;
-    int GetPollingMax() const;
-    int GetRudderMin() const;
-    int GetRudderMax() const;
-    int GetUMin() const;
-    int GetUMax() const;
-    int GetVMin() const;
-    int GetVMax() const;
-
-    bool HasRudder() const;
-    bool HasZ() const;
-    bool HasU() const;
-    bool HasV() const;
-    bool HasPOV() const;
-    bool HasPOV4Dir() const;
-    bool HasPOVCTS() const;
-
-    // Operations
-    ////////////////////////////////////////////////////////////////////////////
-
-    // pollingFreq = 0 means that movement events are sent when above the threshold.
-    // If pollingFreq > 0, events are received every this many milliseconds.
-    bool SetCapture(wxWindow* win, int pollingFreq = 0);
-    bool ReleaseCapture();
-
-protected:
-    int                 m_device;
-    int                 m_joystick;
-    wxJoystickThread*   m_thread;
-};
-
-#endif // _WX_UNIX_JOYSTICK_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/mimetype.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/mimetype.h
deleted file mode 100644
index df76534aa5..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/mimetype.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/mimetype.h
-// Purpose:     classes and functions to manage MIME types
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     23.09.98
-// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows licence (part of wxExtra library)
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MIMETYPE_IMPL_H
-#define _MIMETYPE_IMPL_H
-
-#include "wx/mimetype.h"
-
-#if wxUSE_MIMETYPE
-
-class wxMimeTypeCommands;
-
-WX_DEFINE_ARRAY_PTR(wxMimeTypeCommands *, wxMimeCommandsArray);
-
-// this is the real wxMimeTypesManager for Unix
-class WXDLLIMPEXP_BASE wxMimeTypesManagerImpl
-{
-public:
-    // ctor and dtor
-    wxMimeTypesManagerImpl();
-    virtual ~wxMimeTypesManagerImpl();
-
-    // load all data into memory - done when it is needed for the first time
-    void Initialize(int mailcapStyles = wxMAILCAP_ALL,
-                    const wxString& extraDir = wxEmptyString);
-
-    // and delete the data here
-    void ClearData();
-
-    // implement containing class functions
-    wxFileType *GetFileTypeFromExtension(const wxString& ext);
-    wxFileType *GetFileTypeFromMimeType(const wxString& mimeType);
-
-    size_t EnumAllFileTypes(wxArrayString& mimetypes);
-
-    void AddFallback(const wxFileTypeInfo& filetype);
-
-    // add information about the given mimetype
-    void AddMimeTypeInfo(const wxString& mimetype,
-                         const wxString& extensions,
-                         const wxString& description);
-    void AddMailcapInfo(const wxString& strType,
-                        const wxString& strOpenCmd,
-                        const wxString& strPrintCmd,
-                        const wxString& strTest,
-                        const wxString& strDesc);
-
-    // add a new record to the user .mailcap/.mime.types files
-    wxFileType *Associate(const wxFileTypeInfo& ftInfo);
-    // remove association
-    bool Unassociate(wxFileType *ft);
-
-    // accessors
-        // get the string containing space separated extensions for the given
-        // file type
-    wxString GetExtension(size_t index) { return m_aExtensions[index]; }
-
-protected:
-    void InitIfNeeded();
-
-    wxArrayString m_aTypes,         // MIME types
-                  m_aDescriptions,  // descriptions (just some text)
-                  m_aExtensions,    // space separated list of extensions
-                  m_aIcons;         // Icon filenames
-
-    // verb=command pairs for this file type
-    wxMimeCommandsArray m_aEntries;
-
-    // are we initialized?
-    bool m_initialized;
-
-    wxString GetCommand(const wxString &verb, size_t nIndex) const;
-
-    // Read XDG *.desktop file
-    void LoadXDGApp(const wxString& filename);
-    // Scan XDG directory
-    void LoadXDGAppsFilesFromDir(const wxString& dirname);
-
-    // Load XDG globs files
-    void LoadXDGGlobs(const wxString& filename);
-
-    // functions used to do associations
-    virtual int AddToMimeData(const wxString& strType,
-                      const wxString& strIcon,
-                      wxMimeTypeCommands *entry,
-                      const wxArrayString& strExtensions,
-                      const wxString& strDesc,
-                      bool replaceExisting = true);
-    virtual bool DoAssociation(const wxString& strType,
-                       const wxString& strIcon,
-                       wxMimeTypeCommands *entry,
-                       const wxArrayString& strExtensions,
-                       const wxString& strDesc);
-
-    // give it access to m_aXXX variables
-    friend class WXDLLIMPEXP_FWD_BASE wxFileTypeImpl;
-};
-
-class WXDLLIMPEXP_BASE wxFileTypeImpl
-{
-public:
-    // initialization functions
-    // this is used to construct a list of mimetypes which match;
-    // if built with GetFileTypeFromMimetype index 0 has the exact match and
-    // index 1 the type / * match
-    // if built with GetFileTypeFromExtension, index 0 has the mimetype for
-    // the first extension found, index 1 for the second and so on
-
-    void Init(wxMimeTypesManagerImpl *manager, size_t index)
-        { m_manager = manager; m_index.Add(index); }
-
-    // accessors
-    bool GetExtensions(wxArrayString& extensions);
-    bool GetMimeType(wxString *mimeType) const
-        { *mimeType = m_manager->m_aTypes[m_index[0]]; return true; }
-    bool GetMimeTypes(wxArrayString& mimeTypes) const;
-    bool GetIcon(wxIconLocation *iconLoc) const;
-
-    bool GetDescription(wxString *desc) const
-        { *desc = m_manager->m_aDescriptions[m_index[0]]; return true; }
-
-    bool GetOpenCommand(wxString *openCmd,
-                        const wxFileType::MessageParameters& params) const
-    {
-        *openCmd = GetExpandedCommand(wxT("open"), params);
-        return (! openCmd -> IsEmpty() );
-    }
-
-    bool GetPrintCommand(wxString *printCmd,
-                         const wxFileType::MessageParameters& params) const
-    {
-        *printCmd = GetExpandedCommand(wxT("print"), params);
-        return (! printCmd -> IsEmpty() );
-    }
-
-        // return the number of commands defined for this file type, 0 if none
-    size_t GetAllCommands(wxArrayString *verbs, wxArrayString *commands,
-                          const wxFileType::MessageParameters& params) const;
-
-
-    // remove the record for this file type
-    // probably a mistake to come here, use wxMimeTypesManager.Unassociate (ft) instead
-    bool Unassociate(wxFileType *ft)
-    {
-        return m_manager->Unassociate(ft);
-    }
-
-    // set an arbitrary command, ask confirmation if it already exists and
-    // overwriteprompt is TRUE
-    bool SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt = true);
-    bool SetDefaultIcon(const wxString& strIcon = wxEmptyString, int index = 0);
-
-private:
-    wxString
-    GetExpandedCommand(const wxString & verb,
-                       const wxFileType::MessageParameters& params) const;
-
-    wxMimeTypesManagerImpl *m_manager;
-    wxArrayInt              m_index; // in the wxMimeTypesManagerImpl arrays
-};
-
-#endif // wxUSE_MIMETYPE
-
-#endif // _MIMETYPE_IMPL_H
-
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/pipe.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/pipe.h
deleted file mode 100644
index 1bde4228a7..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/pipe.h
+++ /dev/null
@@ -1,102 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/pipe.h
-// Purpose:     wxPipe class
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     24.06.2003 (extracted from src/unix/utilsunx.cpp)
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_PIPE_H_
-#define _WX_UNIX_PIPE_H_
-
-#include <unistd.h>
-#include <fcntl.h>
-
-#include "wx/log.h"
-#include "wx/intl.h"
-
-// ----------------------------------------------------------------------------
-// wxPipe: this class encapsulates pipe() system call
-// ----------------------------------------------------------------------------
-
-class wxPipe
-{
-public:
-    // the symbolic names for the pipe ends
-    enum Direction
-    {
-        Read,
-        Write
-    };
-
-    enum
-    {
-        INVALID_FD = -1
-    };
-
-    // default ctor doesn't do anything
-    wxPipe() { m_fds[Read] = m_fds[Write] = INVALID_FD; }
-
-    // create the pipe, return TRUE if ok, FALSE on error
-    bool Create()
-    {
-        if ( pipe(m_fds) == -1 )
-        {
-            wxLogSysError(wxGetTranslation("Pipe creation failed"));
-
-            return false;
-        }
-
-        return true;
-    }
-
-    // switch the given end of the pipe to non-blocking IO
-    bool MakeNonBlocking(Direction which)
-    {
-        const int flags = fcntl(m_fds[which], F_GETFL, 0);
-        if ( flags == -1 )
-            return false;
-
-        return fcntl(m_fds[which], F_SETFL, flags | O_NONBLOCK) == 0;
-    }
-
-    // return TRUE if we were created successfully
-    bool IsOk() const { return m_fds[Read] != INVALID_FD; }
-
-    // return the descriptor for one of the pipe ends
-    int operator[](Direction which) const { return m_fds[which]; }
-
-    // detach a descriptor, meaning that the pipe dtor won't close it, and
-    // return it
-    int Detach(Direction which)
-    {
-        int fd = m_fds[which];
-        m_fds[which] = INVALID_FD;
-
-        return fd;
-    }
-
-    // close the pipe descriptors
-    void Close()
-    {
-        for ( size_t n = 0; n < WXSIZEOF(m_fds); n++ )
-        {
-            if ( m_fds[n] != INVALID_FD )
-            {
-                close(m_fds[n]);
-                m_fds[n] = INVALID_FD;
-            }
-        }
-    }
-
-    // dtor closes the pipe descriptors
-    ~wxPipe() { Close(); }
-
-private:
-    int m_fds[2];
-};
-
-#endif // _WX_UNIX_PIPE_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private.h
deleted file mode 100644
index fafc5435db..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private.h
+++ /dev/null
@@ -1,19 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/private.h
-// Purpose:     miscellaneous private things for Unix wx ports
-// Author:      Vadim Zeitlin
-// Created:     2005-09-25
-// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_PRIVATE_H_
-#define _WX_UNIX_PRIVATE_H_
-
-// this file is currently empty as its original contents was moved to
-// include/wx/private/fd.h but let's keep it for now in case we need it for
-// something again in the future
-#include "wx/private/fd.h"
-
-#endif // _WX_UNIX_PRIVATE_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/epolldispatcher.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/epolldispatcher.h
deleted file mode 100644
index c73411f221..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/epolldispatcher.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/private/epolldispatcher.h
-// Purpose:     wxEpollDispatcher class
-// Authors:     Lukasz Michalski
-// Created:     April 2007
-// Copyright:   (c) Lukasz Michalski
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRIVATE_EPOLLDISPATCHER_H_
-#define _WX_PRIVATE_EPOLLDISPATCHER_H_
-
-#include "wx/defs.h"
-
-#ifdef wxUSE_EPOLL_DISPATCHER
-
-#include "wx/private/fdiodispatcher.h"
-
-struct epoll_event;
-
-class WXDLLIMPEXP_BASE wxEpollDispatcher : public wxFDIODispatcher
-{
-public:
-    // create a new instance of this class, can return NULL if
-    // epoll() is not supported on this system
-    //
-    // the caller should delete the returned pointer
-    static wxEpollDispatcher *Create();
-
-    virtual ~wxEpollDispatcher();
-
-    // implement base class pure virtual methods
-    virtual bool RegisterFD(int fd, wxFDIOHandler* handler, int flags = wxFDIO_ALL);
-    virtual bool ModifyFD(int fd, wxFDIOHandler* handler, int flags = wxFDIO_ALL);
-    virtual bool UnregisterFD(int fd);
-    virtual bool HasPending() const;
-    virtual int Dispatch(int timeout = TIMEOUT_INFINITE);
-
-private:
-    // ctor is private, use Create()
-    wxEpollDispatcher(int epollDescriptor);
-
-    // common part of HasPending() and Dispatch(): calls epoll_wait() with the
-    // given timeout
-    int DoPoll(epoll_event *events, int numEvents, int timeout) const;
-
-
-    int m_epollDescriptor;
-};
-
-#endif // wxUSE_EPOLL_DISPATCHER
-
-#endif // _WX_PRIVATE_SOCKETEVTDISPATCH_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/executeiohandler.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/executeiohandler.h
deleted file mode 100644
index 2a7c2d7aa3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/executeiohandler.h
+++ /dev/null
@@ -1,136 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/private/executeiohandler.h
-// Purpose:     IO handler class for the FD used by wxExecute() under Unix
-// Author:      Rob Bresalier, Vadim Zeitlin
-// Created:     2013-01-06
-// Copyright:   (c) 2013 Rob Bresalier, Vadim Zeitlin
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_PRIVATE_EXECUTEIOHANDLER_H_
-#define _WX_UNIX_PRIVATE_EXECUTEIOHANDLER_H_
-
-#include "wx/private/streamtempinput.h"
-
-// This class handles IO events on the pipe FD connected to the child process
-// stdout/stderr and is used by wxExecute().
-//
-// Currently it can derive from either wxEventLoopSourceHandler or
-// wxFDIOHandler depending on the kind of dispatcher/event loop it is used
-// with. In the future, when we get rid of wxFDIOHandler entirely, it will
-// derive from wxEventLoopSourceHandler only.
-template <class T>
-class wxExecuteIOHandlerBase : public T
-{
-public:
-    wxExecuteIOHandlerBase(int fd, wxStreamTempInputBuffer& buf)
-        : m_fd(fd),
-          m_buf(buf)
-    {
-        m_callbackDisabled = false;
-    }
-
-    // Called when the associated descriptor is available for reading.
-    virtual void OnReadWaiting()
-    {
-        // Sync process, process all data coming at us from the pipe so that
-        // the pipe does not get full and cause a deadlock situation.
-        m_buf.Update();
-
-        if ( m_buf.Eof() )
-            DisableCallback();
-    }
-
-    // These methods are never called as we only monitor the associated FD for
-    // reading, but we still must implement them as they're pure virtual in the
-    // base class.
-    virtual void OnWriteWaiting() { }
-    virtual void OnExceptionWaiting() { }
-
-    // Disable any future calls to our OnReadWaiting(), can be called when
-    // we're sure that no more input is forthcoming.
-    void DisableCallback()
-    {
-        if ( !m_callbackDisabled )
-        {
-            m_callbackDisabled = true;
-
-            DoDisable();
-        }
-    }
-
-protected:
-    const int m_fd;
-
-private:
-    virtual void DoDisable() = 0;
-
-    wxStreamTempInputBuffer& m_buf;
-
-    // If true, DisableCallback() had been already called.
-    bool m_callbackDisabled;
-
-    wxDECLARE_NO_COPY_CLASS(wxExecuteIOHandlerBase);
-};
-
-// This is the version used with wxFDIODispatcher, which must be passed to the
-// ctor in order to register this handler with it.
-class wxExecuteFDIOHandler : public wxExecuteIOHandlerBase<wxFDIOHandler>
-{
-public:
-    wxExecuteFDIOHandler(wxFDIODispatcher& dispatcher,
-                         int fd,
-                         wxStreamTempInputBuffer& buf)
-        : wxExecuteIOHandlerBase<wxFDIOHandler>(fd, buf),
-          m_dispatcher(dispatcher)
-    {
-        dispatcher.RegisterFD(fd, this, wxFDIO_INPUT);
-    }
-
-    virtual ~wxExecuteFDIOHandler()
-    {
-        DisableCallback();
-    }
-
-private:
-    virtual void DoDisable()
-    {
-        m_dispatcher.UnregisterFD(m_fd);
-    }
-
-    wxFDIODispatcher& m_dispatcher;
-
-    wxDECLARE_NO_COPY_CLASS(wxExecuteFDIOHandler);
-};
-
-// And this is the version used with an event loop. As AddSourceForFD() is
-// static, we don't require passing the event loop to the ctor but an event
-// loop must be running to handle our events.
-class wxExecuteEventLoopSourceHandler
-    : public wxExecuteIOHandlerBase<wxEventLoopSourceHandler>
-{
-public:
-    wxExecuteEventLoopSourceHandler(int fd, wxStreamTempInputBuffer& buf)
-        : wxExecuteIOHandlerBase<wxEventLoopSourceHandler>(fd, buf)
-    {
-        m_source = wxEventLoop::AddSourceForFD(fd, this, wxEVENT_SOURCE_INPUT);
-    }
-
-    virtual ~wxExecuteEventLoopSourceHandler()
-    {
-        DisableCallback();
-    }
-
-private:
-    virtual void DoDisable()
-    {
-        delete m_source;
-        m_source = NULL;
-    }
-
-    wxEventLoopSource* m_source;
-
-    wxDECLARE_NO_COPY_CLASS(wxExecuteEventLoopSourceHandler);
-};
-
-#endif // _WX_UNIX_PRIVATE_EXECUTEIOHANDLER_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/fdiounix.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/fdiounix.h
deleted file mode 100644
index 2807821e19..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/fdiounix.h
+++ /dev/null
@@ -1,27 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/private/fdiounix.h
-// Purpose:     wxFDIOManagerUnix class used by console Unix applications
-// Author:      Vadim Zeitlin
-// Created:     2009-08-17
-// Copyright:   (c) 2009 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _UNIX_PRIVATE_FDIOUNIX_H_
-#define _UNIX_PRIVATE_FDIOUNIX_H_
-
-#include "wx/private/fdiomanager.h"
-
-// ----------------------------------------------------------------------------
-// wxFDIOManagerUnix: implement wxFDIOManager interface using wxFDIODispatcher
-// ----------------------------------------------------------------------------
-
-class wxFDIOManagerUnix : public wxFDIOManager
-{
-public:
-    virtual int AddInput(wxFDIOHandler *handler, int fd, Direction d);
-    virtual void RemoveInput(wxFDIOHandler *handler, int fd, Direction d);
-};
-
-#endif // _UNIX_PRIVATE_FDIOUNIX_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/fswatcher_inotify.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/fswatcher_inotify.h
deleted file mode 100644
index 249450eb50..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/fswatcher_inotify.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/private/fswatcher_inotify.h
-// Purpose:     File system watcher impl classes
-// Author:      Bartosz Bekier
-// Created:     2009-05-26
-// Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef WX_UNIX_PRIVATE_FSWATCHER_INOTIFY_H_
-#define WX_UNIX_PRIVATE_FSWATCHER_INOTIFY_H_
-
-#include "wx/filename.h"
-#include "wx/evtloopsrc.h"
-
-// ============================================================================
-// wxFSWatcherEntry implementation & helper declarations
-// ============================================================================
-
-class wxFSWatcherImplUNIX;
-
-class wxFSWatchEntry : public wxFSWatchInfo
-{
-public:
-    wxFSWatchEntry(const wxFSWatchInfo& winfo) :
-        wxFSWatchInfo(winfo)
-    {
-    }
-
-    int GetWatchDescriptor() const
-    {
-        return m_wd;
-    }
-
-    void SetWatchDescriptor(int wd)
-    {
-        m_wd = wd;
-    }
-
-private:
-    int m_wd;
-
-    wxDECLARE_NO_COPY_CLASS(wxFSWatchEntry);
-};
-
-
-// ============================================================================
-// wxFSWSourceHandler helper class
-// ============================================================================
-
-class wxFSWatcherImplUnix;
-
-/**
- * Handler for handling i/o from inotify descriptor
- */
-class wxFSWSourceHandler : public wxEventLoopSourceHandler
-{
-public:
-    wxFSWSourceHandler(wxFSWatcherImplUnix* service) :
-        m_service(service)
-    {  }
-
-    virtual void OnReadWaiting();
-    virtual void OnWriteWaiting();
-    virtual void OnExceptionWaiting();
-
-protected:
-    wxFSWatcherImplUnix* m_service;
-};
-
-#endif /* WX_UNIX_PRIVATE_FSWATCHER_INOTIFY_H_ */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/fswatcher_kqueue.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/fswatcher_kqueue.h
deleted file mode 100644
index de3d489a38..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/fswatcher_kqueue.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/private/fswatcher_kqueue.h
-// Purpose:     File system watcher impl classes
-// Author:      Bartosz Bekier
-// Created:     2009-05-26
-// Copyright:   (c) 2009 Bartosz Bekier <bartosz.bekier@gmail.com>
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef WX_UNIX_PRIVATE_FSWATCHER_KQUEUE_H_
-#define WX_UNIX_PRIVATE_FSWATCHER_KQUEUE_H_
-
-#include <fcntl.h>
-#include <unistd.h>
-#include "wx/dir.h"
-#include "wx/debug.h"
-#include "wx/arrstr.h"
-
-// ============================================================================
-// wxFSWatcherEntry implementation & helper declarations
-// ============================================================================
-
-class wxFSWatcherImplKqueue;
-
-class wxFSWatchEntryKq : public wxFSWatchInfo
-{
-public:
-    struct wxDirState
-    {
-        wxDirState(const wxFSWatchInfo& winfo)
-        {
-            if (!wxDir::Exists(winfo.GetPath()))
-                return;
-
-            wxDir dir(winfo.GetPath());
-            wxCHECK_RET( dir.IsOpened(),
-                  wxString::Format("Unable to open dir '%s'", winfo.GetPath()));
-
-            wxString filename;
-            bool ret = dir.GetFirst(&filename);
-            while (ret)
-            {
-                files.push_back(filename);
-                ret = dir.GetNext(&filename);
-            }
-        }
-
-        wxSortedArrayString files;
-    };
-
-    wxFSWatchEntryKq(const wxFSWatchInfo& winfo) :
-        wxFSWatchInfo(winfo), m_lastState(winfo)
-    {
-        m_fd = wxOpen(m_path, O_RDONLY, 0);
-        if (m_fd == -1)
-        {
-            wxLogSysError(_("Unable to open path '%s'"), m_path);
-        }
-    }
-
-    virtual ~wxFSWatchEntryKq()
-    {
-        (void) Close();
-    }
-
-    bool Close()
-    {
-        if (!IsOk())
-            return false;
-
-        int ret = close(m_fd);
-        if (ret == -1)
-        {
-            wxLogSysError(_("Unable to close path '%s'"), m_path);
-        }
-        m_fd = -1;
-
-        return ret != -1;
-    }
-
-    bool IsOk() const
-    {
-        return m_fd != -1;
-    }
-
-    int GetFileDescriptor() const
-    {
-        return m_fd;
-    }
-
-    void RefreshState()
-    {
-        m_lastState = wxDirState(*this);
-    }
-
-    const wxDirState& GetLastState() const
-    {
-        return m_lastState;
-    }
-
-private:
-    int m_fd;
-    wxDirState m_lastState;
-
-    wxDECLARE_NO_COPY_CLASS(wxFSWatchEntryKq);
-};
-
-#endif /* WX_UNIX_PRIVATE_FSWATCHER_KQUEUE_H_ */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/pipestream.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/pipestream.h
deleted file mode 100644
index 313a271741..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/pipestream.h
+++ /dev/null
@@ -1,37 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/private/pipestream.h
-// Purpose:     Unix wxPipeInputStream and wxPipeOutputStream declarations
-// Author:      Vadim Zeitlin
-// Created:     2013-06-08 (extracted from wx/unix/pipe.h)
-// Copyright:   (c) 2013 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_PRIVATE_PIPESTREAM_H_
-#define _WX_UNIX_PRIVATE_PIPESTREAM_H_
-
-#include "wx/wfstream.h"
-
-class wxPipeInputStream : public wxFileInputStream
-{
-public:
-    wxEXPLICIT wxPipeInputStream(int fd) : wxFileInputStream(fd) { }
-
-    // return true if the pipe is still opened
-    bool IsOpened() const { return !Eof(); }
-
-    // return true if we have anything to read, don't block
-    virtual bool CanRead() const;
-};
-
-class wxPipeOutputStream : public wxFileOutputStream
-{
-public:
-    wxPipeOutputStream(int fd) : wxFileOutputStream(fd) { }
-
-    // Override the base class version to ignore "pipe full" errors: this is
-    // not an error for this class.
-    size_t OnSysWrite(const void *buffer, size_t size);
-};
-
-#endif // _WX_UNIX_PRIVATE_PIPESTREAM_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/sockunix.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/sockunix.h
deleted file mode 100644
index 642ef43bfa..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/sockunix.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/private/sockunix.h
-// Purpose:     wxSocketImpl implementation for Unix systems
-// Authors:     Guilhem Lavaux, Vadim Zeitlin
-// Created:     April 1997
-// Copyright:   (c) 1997 Guilhem Lavaux
-//              (c) 2008 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_GSOCKUNX_H_
-#define _WX_UNIX_GSOCKUNX_H_
-
-#include <unistd.h>
-#include <sys/ioctl.h>
-
-// Under older (Open)Solaris versions FIONBIO is declared in this header only.
-// In the newer versions it's included by sys/ioctl.h but it's simpler to just
-// include it always instead of testing for whether it is or not.
-#ifdef __SOLARIS__
-    #include <sys/filio.h>
-#endif
-
-#include "wx/private/fdiomanager.h"
-
-class wxSocketImplUnix : public wxSocketImpl,
-                         public wxFDIOHandler
-{
-public:
-    wxSocketImplUnix(wxSocketBase& wxsocket)
-        : wxSocketImpl(wxsocket)
-    {
-        m_fds[0] =
-        m_fds[1] = -1;
-    }
-
-    virtual wxSocketError GetLastError() const;
-
-    virtual void ReenableEvents(wxSocketEventFlags flags)
-    {
-        // enable the notifications about input/output being available again in
-        // case they were disabled by OnRead/WriteWaiting()
-        //
-        // notice that we'd like to enable the events here only if there is
-        // nothing more left on the socket right now as otherwise we're going
-        // to get a "ready for whatever" notification immediately (well, during
-        // the next event loop iteration) and disable the event back again
-        // which is rather inefficient but unfortunately doing it like this
-        // doesn't work because the existing code (e.g. src/common/sckipc.cpp)
-        // expects to keep getting notifications about the data available from
-        // the socket even if it didn't read all the data the last time, so we
-        // absolutely have to continue generating them
-        EnableEvents(flags);
-    }
-
-    // wxFDIOHandler methods
-    virtual void OnReadWaiting();
-    virtual void OnWriteWaiting();
-    virtual void OnExceptionWaiting();
-    virtual bool IsOk() const { return m_fd != INVALID_SOCKET; }
-
-private:
-    virtual void DoClose()
-    {
-        DisableEvents();
-
-        close(m_fd);
-    }
-
-    virtual void UnblockAndRegisterWithEventLoop()
-    {
-        int trueArg = 1;
-        ioctl(m_fd, FIONBIO, &trueArg);
-
-        EnableEvents();
-    }
-
-    // enable or disable notifications for socket input/output events
-    void EnableEvents(int flags = wxSOCKET_INPUT_FLAG | wxSOCKET_OUTPUT_FLAG)
-        { DoEnableEvents(flags, true); }
-    void DisableEvents(int flags = wxSOCKET_INPUT_FLAG | wxSOCKET_OUTPUT_FLAG)
-        { DoEnableEvents(flags, false); }
-
-    // really enable or disable socket input/output events
-    void DoEnableEvents(int flags, bool enable);
-
-protected:
-    // descriptors for input and output event notification channels associated
-    // with the socket
-    int m_fds[2];
-
-private:
-    // notify the associated wxSocket about a change in socket state and shut
-    // down the socket if the event is wxSOCKET_LOST
-    void OnStateChange(wxSocketNotify event);
-
-    // check if there is any input available, return 1 if yes, 0 if no or -1 on
-    // error
-    int CheckForInput();
-
-
-    // give it access to our m_fds
-    friend class wxSocketFDBasedManager;
-};
-
-// A version of wxSocketManager which uses FDs for socket IO: it is used by
-// Unix console applications and some X11-like ports (wxGTK and wxMotif but not
-// wxX11 currently) which implement their own port-specific wxFDIOManagers
-class wxSocketFDBasedManager : public wxSocketManager
-{
-public:
-    wxSocketFDBasedManager()
-    {
-        m_fdioManager = NULL;
-    }
-
-    virtual bool OnInit();
-    virtual void OnExit() { }
-
-    virtual wxSocketImpl *CreateSocket(wxSocketBase& wxsocket)
-    {
-        return new wxSocketImplUnix(wxsocket);
-    }
-
-    virtual void Install_Callback(wxSocketImpl *socket_, wxSocketNotify event);
-    virtual void Uninstall_Callback(wxSocketImpl *socket_, wxSocketNotify event);
-
-protected:
-    // get the FD index corresponding to the given wxSocketNotify
-    wxFDIOManager::Direction
-    GetDirForEvent(wxSocketImpl *socket, wxSocketNotify event);
-
-    // access the FDs we store
-    int& FD(wxSocketImplUnix *socket, wxFDIOManager::Direction d)
-    {
-        return socket->m_fds[d];
-    }
-
-    wxFDIOManager *m_fdioManager;
-
-    wxDECLARE_NO_COPY_CLASS(wxSocketFDBasedManager);
-};
-
-#endif  /* _WX_UNIX_GSOCKUNX_H_ */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/timer.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/timer.h
deleted file mode 100644
index 6275b53d91..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/timer.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/private/timer.h
-// Purpose:     wxTimer for wxBase (unix)
-// Author:      Lukasz Michalski
-// Created:     15/01/2005
-// Copyright:   (c) Lukasz Michalski
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_PRIVATE_TIMER_H_
-#define _WX_UNIX_PRIVATE_TIMER_H_
-
-#if wxUSE_TIMER
-
-#include "wx/private/timer.h"
-
-// the type used for milliseconds is large enough for microseconds too but
-// introduce a synonym for it to avoid confusion
-typedef wxMilliClock_t wxUsecClock_t;
-
-// ----------------------------------------------------------------------------
-// wxTimer implementation class for Unix platforms
-// ----------------------------------------------------------------------------
-
-// NB: we have to export at least this symbol from the shared library, because
-//     it's used by wxDFB's wxCore
-class WXDLLIMPEXP_BASE wxUnixTimerImpl : public wxTimerImpl
-{
-public:
-    wxUnixTimerImpl(wxTimer *timer);
-    virtual ~wxUnixTimerImpl();
-
-    virtual bool IsRunning() const;
-    virtual bool Start(int milliseconds = -1, bool oneShot = false);
-    virtual void Stop();
-
-    // for wxTimerScheduler only: resets the internal flag indicating that the
-    // timer is running
-    void MarkStopped()
-    {
-        wxASSERT_MSG( m_isRunning, wxT("stopping non-running timer?") );
-
-        m_isRunning = false;
-    }
-
-private:
-    bool m_isRunning;
-};
-
-// ----------------------------------------------------------------------------
-// wxTimerSchedule: information about a single timer, used by wxTimerScheduler
-// ----------------------------------------------------------------------------
-
-struct wxTimerSchedule
-{
-    wxTimerSchedule(wxUnixTimerImpl *timer, wxUsecClock_t expiration)
-        : m_timer(timer),
-          m_expiration(expiration)
-    {
-    }
-
-    // the timer itself (we don't own this pointer)
-    wxUnixTimerImpl *m_timer;
-
-    // the time of its next expiration, in usec
-    wxUsecClock_t m_expiration;
-};
-
-// the linked list of all active timers, we keep it sorted by expiration time
-WX_DECLARE_LIST(wxTimerSchedule, wxTimerList);
-
-// ----------------------------------------------------------------------------
-// wxTimerScheduler: class responsible for updating all timers
-// ----------------------------------------------------------------------------
-
-class wxTimerScheduler
-{
-public:
-    // get the unique timer scheduler instance
-    static wxTimerScheduler& Get()
-    {
-        if ( !ms_instance )
-            ms_instance = new wxTimerScheduler;
-
-        return *ms_instance;
-    }
-
-    // must be called on shutdown to delete the global timer scheduler
-    static void Shutdown()
-    {
-        if ( ms_instance )
-        {
-            delete ms_instance;
-            ms_instance = NULL;
-        }
-    }
-
-    // adds timer which should expire at the given absolute time to the list
-    void AddTimer(wxUnixTimerImpl *timer, wxUsecClock_t expiration);
-
-    // remove timer from the list, called automatically from timer dtor
-    void RemoveTimer(wxUnixTimerImpl *timer);
-
-
-    // the functions below are used by the event loop implementation to monitor
-    // and notify timers:
-
-    // if this function returns true, the time remaining until the next time
-    // expiration is returned in the provided parameter (always positive or 0)
-    //
-    // it returns false if there are no timers
-    bool GetNext(wxUsecClock_t *remaining) const;
-
-    // trigger the timer event for all timers which have expired, return true
-    // if any did
-    bool NotifyExpired();
-
-private:
-    // ctor and dtor are private, this is a singleton class only created by
-    // Get() and destroyed by Shutdown()
-    wxTimerScheduler() { }
-    ~wxTimerScheduler();
-
-    // add the given timer schedule to the list in the right place
-    //
-    // we take ownership of the pointer "s" which must be heap-allocated
-    void DoAddTimer(wxTimerSchedule *s);
-
-
-    // the list of all currently active timers sorted by expiration
-    wxTimerList m_timers;
-
-    static wxTimerScheduler *ms_instance;
-};
-
-#endif // wxUSE_TIMER
-
-#endif // _WX_UNIX_PRIVATE_TIMER_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/wakeuppipe.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/wakeuppipe.h
deleted file mode 100644
index 5bd6db870a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/private/wakeuppipe.h
+++ /dev/null
@@ -1,97 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/private/wakeuppipe.h
-// Purpose:     Helper class allowing to wake up the main thread.
-// Author:      Vadim Zeitlin
-// Created:     2013-06-09 (extracted from src/unix/evtloopunix.cpp)
-// Copyright:   (c) 2013 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_PRIVATE_WAKEUPPIPE_H_
-#define _WX_UNIX_PRIVATE_WAKEUPPIPE_H_
-
-#include "wx/unix/pipe.h"
-#include "wx/evtloopsrc.h"
-
-// ----------------------------------------------------------------------------
-// wxWakeUpPipe: allows to wake up the event loop by writing to it
-// ----------------------------------------------------------------------------
-
-// This class is not MT-safe, see wxWakeUpPipeMT below for a wake up pipe
-// usable from other threads.
-
-class wxWakeUpPipe : public wxEventLoopSourceHandler
-{
-public:
-    // Create and initialize the pipe.
-    //
-    // It's the callers responsibility to add the read end of this pipe,
-    // returned by GetReadFd(), to the code blocking on input.
-    wxWakeUpPipe();
-
-    // Wake up the blocking operation involving this pipe.
-    //
-    // It simply writes to the write end of the pipe.
-    //
-    // As indicated by its name, this method does no locking and so can be
-    // called only from the main thread.
-    void WakeUpNoLock();
-
-    // Same as WakeUp() but without locking.
-
-    // Return the read end of the pipe.
-    int GetReadFd() { return m_pipe[wxPipe::Read]; }
-
-
-    // Implement wxEventLoopSourceHandler pure virtual methods
-    virtual void OnReadWaiting();
-    virtual void OnWriteWaiting() { }
-    virtual void OnExceptionWaiting() { }
-
-private:
-    wxPipe m_pipe;
-
-    // This flag is set to true after writing to the pipe and reset to false
-    // after reading from it in the main thread. Having it allows us to avoid
-    // overflowing the pipe with too many writes if the main thread can't keep
-    // up with reading from it.
-    bool m_pipeIsEmpty;
-};
-
-// ----------------------------------------------------------------------------
-// wxWakeUpPipeMT: thread-safe version of wxWakeUpPipe
-// ----------------------------------------------------------------------------
-
-// This class can be used from multiple threads, i.e. its WakeUp() can be
-// called concurrently.
-
-class wxWakeUpPipeMT : public wxWakeUpPipe
-{
-#if wxUSE_THREADS
-public:
-    wxWakeUpPipeMT() { }
-
-    // Thread-safe wrapper around WakeUpNoLock(): can be called from another
-    // thread to wake up the main one.
-    void WakeUp()
-    {
-        wxCriticalSectionLocker lock(m_pipeLock);
-
-        WakeUpNoLock();
-    }
-
-    virtual void OnReadWaiting()
-    {
-        wxCriticalSectionLocker lock(m_pipeLock);
-
-        wxWakeUpPipe::OnReadWaiting();
-    }
-
-private:
-    // Protects access to m_pipeIsEmpty.
-    wxCriticalSection m_pipeLock;
-
-#endif // wxUSE_THREADS
-};
-
-#endif // _WX_UNIX_PRIVATE_WAKEUPPIPE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/sound.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/sound.h
deleted file mode 100644
index 76efeae3dc..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/sound.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/sound.h
-// Purpose:     wxSound class
-// Author:      Julian Smart, Vaclav Slavik
-// Modified by:
-// Created:     25/10/98
-// Copyright:   (c) Julian Smart, Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_SOUND_H_
-#define _WX_SOUND_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_SOUND
-
-#include "wx/object.h"
-
-// ----------------------------------------------------------------------------
-// wxSound: simple audio playback class
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_ADV wxSoundBackend;
-class WXDLLIMPEXP_FWD_ADV wxSound;
-class WXDLLIMPEXP_FWD_BASE wxDynamicLibrary;
-
-/// Sound data, as loaded from .wav file:
-class WXDLLIMPEXP_ADV wxSoundData
-{
-public:
-    wxSoundData() : m_refCnt(1) {}
-    void IncRef();
-    void DecRef();
-
-    // .wav header information:
-    unsigned m_channels;       // num of channels (mono:1, stereo:2)
-    unsigned m_samplingRate;
-    unsigned m_bitsPerSample;  // if 8, then m_data contains unsigned 8bit
-                               // samples (wxUint8), if 16 then signed 16bit
-                               // (wxInt16)
-    unsigned m_samples;        // length in samples:
-
-    // wave data:
-    size_t   m_dataBytes;
-    wxUint8 *m_data;           // m_dataBytes bytes of data
-
-private:
-    ~wxSoundData();
-    unsigned m_refCnt;
-    wxUint8 *m_dataWithHeader; // ditto, but prefixed with .wav header
-    friend class wxSound;
-};
-
-
-/// Simple sound class:
-class WXDLLIMPEXP_ADV wxSound : public wxSoundBase
-{
-public:
-    wxSound();
-    wxSound(const wxString& fileName, bool isResource = false);
-    wxSound(size_t size, const void* data);
-    virtual ~wxSound();
-
-    // Create from resource or file
-    bool Create(const wxString& fileName, bool isResource = false);
-    // Create from data
-    bool Create(size_t size, const void* data);
-
-    bool IsOk() const { return m_data != NULL; }
-
-    // Stop playing any sound
-    static void Stop();
-
-    // Returns true if a sound is being played
-    static bool IsPlaying();
-
-    // for internal use
-    static void UnloadBackend();
-
-protected:
-    bool DoPlay(unsigned flags) const;
-
-    static void EnsureBackend();
-    void Free();
-    bool LoadWAV(const void* data, size_t length, bool copyData);
-
-    static wxSoundBackend *ms_backend;
-#if wxUSE_LIBSDL && wxUSE_PLUGINS
-    // FIXME - temporary, until we have plugins architecture
-    static wxDynamicLibrary *ms_backendSDL;
-#endif
-
-private:
-    wxSoundData *m_data;
-};
-
-
-// ----------------------------------------------------------------------------
-// wxSoundBackend:
-// ----------------------------------------------------------------------------
-
-// This is interface to sound playing implementation. There are multiple
-// sound architectures in use on Unix platforms and wxWidgets can use several
-// of them for playback, depending on their availability at runtime; hence
-// the need for backends. This class is for use by wxWidgets and people writing
-// additional backends only, it is _not_ for use by applications!
-
-// Structure that holds playback status information
-struct wxSoundPlaybackStatus
-{
-    // playback is in progress
-    bool m_playing;
-    // main thread called wxSound::Stop()
-    bool m_stopRequested;
-};
-
-// Audio backend interface
-class WXDLLIMPEXP_ADV wxSoundBackend
-{
-public:
-    virtual ~wxSoundBackend() {}
-
-    // Returns the name of the backend (e.g. "Open Sound System")
-    virtual wxString GetName() const = 0;
-
-    // Returns priority (higher priority backends are tried first)
-    virtual int GetPriority() const = 0;
-
-    // Checks if the backend's audio system is available and the backend can
-    // be used for playback
-    virtual bool IsAvailable() const = 0;
-
-    // Returns true if the backend is capable of playing sound asynchronously.
-    // If false, then wxWidgets creates a playback thread and handles async
-    // playback, otherwise it is left up to the backend (will usually be more
-    // effective).
-    virtual bool HasNativeAsyncPlayback() const = 0;
-
-    // Plays the sound. flags are same flags as those passed to wxSound::Play.
-    // The function should periodically check the value of
-    // status->m_stopRequested and terminate if it is set to true (it may
-    // be modified by another thread)
-    virtual bool Play(wxSoundData *data, unsigned flags,
-                      volatile wxSoundPlaybackStatus *status) = 0;
-
-    // Stops playback (if something is played).
-    virtual void Stop() = 0;
-
-    // Returns true if the backend is playing anything at the moment.
-    // (This method is never called for backends that don't support async
-    // playback.)
-    virtual bool IsPlaying() const = 0;
-};
-
-
-#endif // wxUSE_SOUND
-
-#endif // _WX_SOUND_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/stackwalk.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/stackwalk.h
deleted file mode 100644
index e99741934a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/stackwalk.h
+++ /dev/null
@@ -1,98 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/stackwalk.h
-// Purpose:     declaration of wxStackWalker for Unix
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     2005-01-19
-// Copyright:   (c) 2005 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_STACKWALK_H_
-#define _WX_UNIX_STACKWALK_H_
-
-// ----------------------------------------------------------------------------
-// wxStackFrame
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxStackFrame : public wxStackFrameBase
-{
-    friend class wxStackWalker;
-
-public:
-    // arguments are the stack depth of this frame, its address and the return
-    // value of backtrace_symbols() for it
-    //
-    // NB: we don't copy syminfo pointer so it should have lifetime at least as
-    //     long as ours
-    wxStackFrame(size_t level = 0, void *address = NULL, const char *syminfo = NULL)
-        : wxStackFrameBase(level, address)
-    {
-        m_syminfo = syminfo;
-    }
-
-protected:
-    virtual void OnGetName();
-
-    // optimized for the 2 step initialization done by wxStackWalker
-    void Set(const wxString &name, const wxString &filename, const char* syminfo,
-             size_t level, size_t numLine, void *address)
-    {
-        m_level = level;
-        m_name = name;
-        m_filename = filename;
-        m_syminfo = syminfo;
-
-        m_line = numLine;
-        m_address = address;
-    }
-
-private:
-    const char *m_syminfo;
-};
-
-// ----------------------------------------------------------------------------
-// wxStackWalker
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxStackWalker : public wxStackWalkerBase
-{
-public:
-    // we need the full path to the program executable to be able to use
-    // addr2line, normally we can retrieve it from wxTheApp but if wxTheApp
-    // doesn't exist or doesn't have the correct value, the path may be given
-    // explicitly
-    wxStackWalker(const char *argv0 = NULL)
-    {
-        ms_exepath = wxString::FromAscii(argv0);
-    }
-
-    ~wxStackWalker()
-    {
-        FreeStack();
-    }
-
-    virtual void Walk(size_t skip = 1, size_t maxDepth = wxSTACKWALKER_MAX_DEPTH);
-#if wxUSE_ON_FATAL_EXCEPTION
-    virtual void WalkFromException(size_t maxDepth = wxSTACKWALKER_MAX_DEPTH) { Walk(2, maxDepth); }
-#endif // wxUSE_ON_FATAL_EXCEPTION
-
-    static const wxString& GetExePath() { return ms_exepath; }
-
-
-    // these two may be used to save the stack at some point (fast operation)
-    // and then process it later (slow operation)
-    void SaveStack(size_t maxDepth);
-    void ProcessFrames(size_t skip);
-    void FreeStack();
-
-private:
-    int InitFrames(wxStackFrame *arr, size_t n, void **addresses, char **syminfo);
-
-    static wxString ms_exepath;
-    static void *ms_addresses[];
-    static char **ms_symbols;
-    static int m_depth;
-};
-
-#endif // _WX_UNIX_STACKWALK_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/stdpaths.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/stdpaths.h
deleted file mode 100644
index 2f111992a3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/stdpaths.h
+++ /dev/null
@@ -1,63 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/stdpaths.h
-// Purpose:     wxStandardPaths for Unix systems
-// Author:      Vadim Zeitlin
-// Modified by:
-// Created:     2004-10-19
-// Copyright:   (c) 2004 Vadim Zeitlin <vadim@wxwindows.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_STDPATHS_H_
-#define _WX_UNIX_STDPATHS_H_
-
-// ----------------------------------------------------------------------------
-// wxStandardPaths
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_BASE wxStandardPaths : public wxStandardPathsBase
-{
-public:
-    // tries to determine the installation prefix automatically (Linux only right
-    // now) and returns /usr/local if it failed
-    void DetectPrefix();
-
-    // set the program installation directory which is /usr/local by default
-    //
-    // under some systems (currently only Linux) the program directory can be
-    // determined automatically but for portable programs you should always set
-    // it explicitly
-    void SetInstallPrefix(const wxString& prefix);
-
-    // get the program installation prefix
-    //
-    // if the prefix had been previously by SetInstallPrefix, returns that
-    // value, otherwise calls DetectPrefix()
-    wxString GetInstallPrefix() const;
-
-
-    // implement base class pure virtuals
-    virtual wxString GetExecutablePath() const;
-    virtual wxString GetConfigDir() const;
-    virtual wxString GetUserConfigDir() const;
-    virtual wxString GetDataDir() const;
-    virtual wxString GetLocalDataDir() const;
-    virtual wxString GetUserDataDir() const;
-    virtual wxString GetPluginsDir() const;
-    virtual wxString GetLocalizedResourcesDir(const wxString& lang,
-                                              ResourceCat category) const;
-#ifndef __VMS
-    virtual wxString GetDocumentsDir() const;
-#endif
-
-protected:
-    // Ctor is protected, use wxStandardPaths::Get() instead of instantiating
-    // objects of this class directly.
-    wxStandardPaths() { }
-
-private:
-    wxString m_prefix;
-};
-
-#endif // _WX_UNIX_STDPATHS_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/taskbarx11.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/taskbarx11.h
deleted file mode 100644
index 02a9200941..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/taskbarx11.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/////////////////////////////////////////////////////////////////////////
-// File:        wx/unix/taskbarx11.h
-// Purpose:     Defines wxTaskBarIcon class for most common X11 desktops
-// Author:      Vaclav Slavik
-// Modified by:
-// Created:     04/04/2003
-// Copyright:   (c) Vaclav Slavik, 2003
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_TASKBAR_H_
-#define _WX_UNIX_TASKBAR_H_
-
-class WXDLLIMPEXP_FWD_ADV wxTaskBarIconArea;
-
-class WXDLLIMPEXP_ADV wxTaskBarIcon: public wxTaskBarIconBase
-{
-public:
-    wxTaskBarIcon();
-    virtual ~wxTaskBarIcon();
-
-    // Accessors:
-    bool IsOk() const;
-    bool IsIconInstalled() const;
-
-    // Operations:
-    bool SetIcon(const wxIcon& icon, const wxString& tooltip = wxEmptyString);
-    bool RemoveIcon();
-    bool PopupMenu(wxMenu *menu);
-
-protected:
-    wxTaskBarIconArea *m_iconWnd;
-
-private:
-    void OnDestroy(wxWindowDestroyEvent&);
-
-    DECLARE_DYNAMIC_CLASS(wxTaskBarIcon)
-};
-
-#endif // _WX_UNIX_TASKBAR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/tls.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/tls.h
deleted file mode 100644
index ce61e6fff7..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/tls.h
+++ /dev/null
@@ -1,65 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/tls.h
-// Purpose:     Pthreads implementation of wxTlsValue<>
-// Author:      Vadim Zeitlin
-// Created:     2008-08-08
-// Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_TLS_H_
-#define _WX_UNIX_TLS_H_
-
-#include <pthread.h>
-
-// ----------------------------------------------------------------------------
-// wxTlsKey is a helper class encapsulating the TLS value index
-// ----------------------------------------------------------------------------
-
-class wxTlsKey
-{
-public:
-    // ctor allocates a new key and possibly registering a destructor function
-    // for it
-    wxTlsKey(wxTlsDestructorFunction destructor)
-    {
-        m_destructor = destructor;
-        if ( pthread_key_create(&m_key, destructor) != 0 )
-            m_key = 0;
-    }
-
-    // return true if the key was successfully allocated
-    bool IsOk() const { return m_key != 0; }
-
-    // get the key value, there is no error return
-    void *Get() const
-    {
-        return pthread_getspecific(m_key);
-    }
-
-    // change the key value, return true if ok
-    bool Set(void *value)
-    {
-        void *old = Get();
-        if ( old )
-            m_destructor(old);
-
-        return pthread_setspecific(m_key, value) == 0;
-    }
-
-    // free the key
-    ~wxTlsKey()
-    {
-        if ( IsOk() )
-            pthread_key_delete(m_key);
-    }
-
-private:
-    wxTlsDestructorFunction m_destructor;
-    pthread_key_t m_key;
-
-    wxDECLARE_NO_COPY_CLASS(wxTlsKey);
-};
-
-#endif // _WX_UNIX_TLS_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/utilsx11.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/utilsx11.h
deleted file mode 100644
index 29898372fa..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/unix/utilsx11.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/unix/utilsx11.h
-// Purpose:     Miscellaneous X11 functions
-// Author:      Mattia Barbon, Vaclav Slavik, Vadim Zeitlin
-// Modified by:
-// Created:     25.03.02
-// Copyright:   (c) wxWidgets team
-//              (c) 2010 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_UNIX_UTILSX11_H_
-#define _WX_UNIX_UTILSX11_H_
-
-#include "wx/defs.h"
-#include "wx/gdicmn.h"
-
-#include <X11/Xlib.h>
-
-// NB: Content of this header is for wxWidgets' private use! It is not
-//     part of public API and may be modified or even disappear in the future!
-
-#if defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXX11__)
-
-#if defined(__WXGTK__)
-typedef void WXDisplay;
-typedef void* WXWindow;
-#endif
-typedef unsigned long WXKeySym;
-
-int wxCharCodeXToWX(WXKeySym keySym);
-WXKeySym wxCharCodeWXToX(int id);
-
-class wxIconBundle;
-
-void wxSetIconsX11( WXDisplay* display, WXWindow window,
-                    const wxIconBundle& ib );
-
-
-enum wxX11FullScreenMethod
-{
-    wxX11_FS_AUTODETECT = 0,
-    wxX11_FS_WMSPEC,
-    wxX11_FS_KDE,
-    wxX11_FS_GENERIC
-};
-
-wxX11FullScreenMethod wxGetFullScreenMethodX11(WXDisplay* display,
-                                               WXWindow rootWindow);
-
-void wxSetFullScreenStateX11(WXDisplay* display, WXWindow rootWindow,
-                             WXWindow window, bool show, wxRect *origSize,
-                             wxX11FullScreenMethod method);
-
-
-// Class wrapping X11 Display: it opens it in ctor and closes it in dtor.
-class wxX11Display
-{
-public:
-    wxX11Display() { m_dpy = XOpenDisplay(NULL); }
-    ~wxX11Display() { if ( m_dpy ) XCloseDisplay(m_dpy); }
-
-    operator Display *() const { return m_dpy; }
-
-    // Using DefaultRootWindow() with an object of wxX11Display class doesn't
-    // compile because it is a macro which tries to cast wxX11Display so
-    // provide a convenient helper.
-    Window DefaultRoot() const { return DefaultRootWindow(m_dpy); }
-
-private:
-    Display *m_dpy;
-
-    wxDECLARE_NO_COPY_CLASS(wxX11Display);
-};
-
-#endif // __WXMOTIF__, __WXGTK__, __WXX11__
-
-#endif // _WX_UNIX_UTILSX11_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/app.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/app.h
deleted file mode 100644
index 807786b498..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/app.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/app.h
-// Purpose:     wxApp class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_X11_APP_H_
-#define _WX_X11_APP_H_
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-#include "wx/gdicmn.h"
-#include "wx/event.h"
-
-// ----------------------------------------------------------------------------
-// forward declarations
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxFrame;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLIMPEXP_FWD_CORE wxApp;
-class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
-class WXDLLIMPEXP_FWD_BASE wxLog;
-class WXDLLIMPEXP_FWD_CORE wxXVisualInfo;
-
-// ----------------------------------------------------------------------------
-// the wxApp class for wxX11 - see wxAppBase for more details
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxApp : public wxAppBase
-{
-public:
-    wxApp();
-    virtual ~wxApp();
-
-    // override base class (pure) virtuals
-    // -----------------------------------
-
-    virtual void Exit();
-
-    virtual void WakeUpIdle();
-
-    virtual bool OnInitGui();
-
-    // implementation from now on
-    // --------------------------
-
-    // Processes an X event.
-    virtual bool ProcessXEvent(WXEvent* event);
-
-public:
-    // Implementation
-    virtual bool Initialize(int& argc, wxChar **argv);
-    virtual void CleanUp();
-
-    WXWindow       GetTopLevelWidget() const { return m_topLevelWidget; }
-    WXColormap     GetMainColormap(WXDisplay* display);
-    long           GetMaxRequestSize() const { return m_maxRequestSize; }
-
-    // This handler is called when a property change event occurs
-    virtual bool HandlePropertyChange(WXEvent *event);
-
-    // Values that can be passed on the command line.
-    // Returns -1, -1 if none specified.
-    const wxSize& GetInitialSize() const { return m_initialSize; }
-    bool GetShowIconic() const { return m_showIconic; }
-
-#if wxUSE_UNICODE
-    // Global context for Pango layout. Either use X11
-    // or use Xft rendering according to GDK_USE_XFT
-    // environment variable
-    PangoContext* GetPangoContext();
-#endif
-
-    wxXVisualInfo* GetVisualInfo(WXDisplay* WXUNUSED(display))
-    {
-        // this should be implemented correctly for wxBitmap to work
-        // with multiple display
-        return m_visualInfo;
-    }
-
-public:
-    static long           sm_lastMessageTime;
-    bool                  m_showIconic;
-    wxSize                m_initialSize;
-
-#if !wxUSE_NANOX
-    wxXVisualInfo*        m_visualInfo;
-#endif
-
-protected:
-    WXWindow              m_topLevelWidget;
-    WXColormap            m_mainColormap;
-    long                  m_maxRequestSize;
-
-    DECLARE_DYNAMIC_CLASS(wxApp)
-};
-
-#endif // _WX_X11_APP_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/bitmap.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/bitmap.h
deleted file mode 100644
index 23ac823faf..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/bitmap.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/bitmap.h
-// Purpose:     wxBitmap class
-// Author:      Julian Smart, Robert Roebling
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart, Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BITMAP_H_
-#define _WX_BITMAP_H_
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/palette.h"
-#include "wx/gdiobj.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxMask;
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLIMPEXP_FWD_CORE wxImage;
-
-//-----------------------------------------------------------------------------
-// wxMask
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxMask: public wxObject
-{
-public:
-    wxMask();
-    wxMask(const wxMask& mask);
-    wxMask( const wxBitmap& bitmap, const wxColour& colour );
-    wxMask( const wxBitmap& bitmap, int paletteIndex );
-    wxMask( const wxBitmap& bitmap );
-    virtual ~wxMask();
-
-    bool Create( const wxBitmap& bitmap, const wxColour& colour );
-    bool Create( const wxBitmap& bitmap, int paletteIndex );
-    bool Create( const wxBitmap& bitmap );
-
-    // implementation
-    WXPixmap GetBitmap() const              { return m_bitmap; }
-    void SetBitmap( WXPixmap bitmap )       { m_bitmap = bitmap; }
-
-    WXDisplay *GetDisplay() const           { return m_display; }
-    void SetDisplay( WXDisplay *display )   { m_display = display; }
-
-private:
-    WXPixmap    m_bitmap;
-    WXDisplay  *m_display;
-    wxSize m_size;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxMask)
-};
-
-//-----------------------------------------------------------------------------
-// wxBitmap
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
-{
-public:
-    wxBitmap() {}
-    wxBitmap( int width, int height, int depth = -1 ) { Create( width, height, depth ); }
-    wxBitmap( const wxSize& sz, int depth = -1 ) { Create( sz, depth ); }
-
-    wxBitmap( const char bits[], int width, int height, int depth = 1 );
-    wxBitmap( const char* const* bits );
-#ifdef wxNEEDS_CHARPP
-    // needed for old GCC
-    wxBitmap(char** data)
-    {
-        *this = wxBitmap(const_cast<const char* const*>(data));
-    }
-#endif
-    wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
-    virtual ~wxBitmap();
-
-    static void InitStandardHandlers();
-
-    bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH);
-    bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH)
-        { return Create(sz.GetWidth(), sz.GetHeight(), depth); }
-    bool Create(int width, int height, const wxDC& WXUNUSED(dc))
-        { return Create(width,height); }
-
-    bool Create(const void* data, wxBitmapType type,
-                int width, int height, int depth = -1);
-    // create the wxBitmap using a _copy_ of the pixmap
-    bool Create(WXPixmap pixmap);
-
-    int GetHeight() const;
-    int GetWidth() const;
-    int GetDepth() const;
-
-#if wxUSE_IMAGE
-    wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
-    wxImage ConvertToImage() const;
-    bool CreateFromImage(const wxImage& image, int depth = -1);
-#endif // wxUSE_IMAGE
-
-    // copies the contents and mask of the given (colour) icon to the bitmap
-    virtual bool CopyFromIcon(const wxIcon& icon);
-
-    wxMask *GetMask() const;
-    void SetMask( wxMask *mask );
-
-    wxBitmap GetSubBitmap( const wxRect& rect ) const;
-
-    bool SaveFile( const wxString &name, wxBitmapType type, const wxPalette *palette = NULL ) const;
-    bool LoadFile( const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
-
-    wxPalette *GetPalette() const;
-    wxPalette *GetColourMap() const
-        { return GetPalette(); }
-    virtual void SetPalette(const wxPalette& palette);
-
-    // implementation
-    // --------------
-
-    void SetHeight( int height );
-    void SetWidth( int width );
-    void SetDepth( int depth );
-    void SetPixmap( WXPixmap pixmap );
-    void SetBitmap( WXPixmap bitmap );
-
-    WXPixmap GetPixmap() const;
-    WXPixmap GetBitmap() const;
-
-    WXPixmap GetDrawable() const;
-
-    WXDisplay *GetDisplay() const;
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxBitmap)
-};
-
-#endif // _WX_BITMAP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/brush.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/brush.h
deleted file mode 100644
index 093ffd4de9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/brush.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/brush.h
-// Purpose:     wxBrush class
-// Author:      Julian Smart, Robert Roebling
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart, Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_BRUSH_H_
-#define _WX_BRUSH_H_
-
-#include "wx/gdiobj.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxBrush;
-class WXDLLIMPEXP_FWD_CORE wxColour;
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-
-//-----------------------------------------------------------------------------
-// wxBrush
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBrush : public wxBrushBase
-{
-public:
-    wxBrush() { }
-
-    wxBrush( const wxColour &colour, wxBrushStyle style = wxBRUSHSTYLE_SOLID );
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxBrush(const wxColour& col, int style) );
-#endif
-    wxBrush( const wxBitmap &stippleBitmap );
-    virtual ~wxBrush();
-
-    bool operator==(const wxBrush& brush) const;
-    bool operator!=(const wxBrush& brush) const { return !(*this == brush); }
-
-    wxBrushStyle GetStyle() const;
-    wxColour GetColour() const;
-    wxBitmap *GetStipple() const;
-
-    void SetColour( const wxColour& col );
-    void SetColour( unsigned char r, unsigned char g, unsigned char b );
-    void SetStyle( wxBrushStyle style );
-    void SetStipple( const wxBitmap& stipple );
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
-        { SetStyle((wxBrushStyle)style); }
-#endif
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-    DECLARE_DYNAMIC_CLASS(wxBrush)
-};
-
-#endif // _WX_BRUSH_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/chkconf.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/chkconf.h
deleted file mode 100644
index c552e838fb..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/chkconf.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Name:        wx/x11/chkconf.h
- * Purpose:     Compiler-specific configuration checking
- * Author:      Julian Smart
- * Modified by:
- * Created:     01/02/97
- * Copyright:   (c) Julian Smart
- * Licence:     wxWindows licence
- */
-
-/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
-
-#ifndef _WX_X11_CHKCONF_H_
-#define _WX_X11_CHKCONF_H_
-
-/* wxPalette is always needed */
-#if !wxUSE_PALETTE
-#   error "wxX11 requires wxUSE_PALETTE=1"
-#endif
-
-#if wxUSE_SOCKETS && !wxUSE_SELECT_DISPATCHER
-#   ifdef wxABORT_ON_CONFIG_ERROR
-#       error "wxSocket requires wxSelectDispatcher in wxX11"
-#   else
-#       undef wxUSE_SELECT_DISPATCHER
-#       define wxUSE_SELECT_DISPATCHER 1
-#   endif
-#endif
-
-#endif /* _WX_X11_CHKCONF_H_ */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/clipbrd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/clipbrd.h
deleted file mode 100644
index bba17ab1db..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/clipbrd.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/clipbrd.h
-// Purpose:     Clipboard functionality.
-// Author:      Robert Roebling
-// Created:     17/09/98
-// Copyright:   (c) Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_X11_CLIPBRD_H_
-#define _WX_X11_CLIPBRD_H_
-
-#if wxUSE_CLIPBOARD
-
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/dataobj.h"
-#include "wx/control.h"
-#include "wx/module.h"
-
-// ----------------------------------------------------------------------------
-// wxClipboard
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxClipboard : public wxClipboardBase
-{
-public:
-    wxClipboard();
-    virtual ~wxClipboard();
-
-    // open the clipboard before SetData() and GetData()
-    virtual bool Open();
-
-    // close the clipboard after SetData() and GetData()
-    virtual void Close();
-
-    // query whether the clipboard is opened
-    virtual bool IsOpened() const;
-
-    // set the clipboard data. all other formats will be deleted.
-    virtual bool SetData( wxDataObject *data );
-
-    // add to the clipboard data.
-    virtual bool AddData( wxDataObject *data );
-
-    // ask if data in correct format is available
-    virtual bool IsSupported( const wxDataFormat& format );
-
-    // fill data with data on the clipboard (if available)
-    virtual bool GetData( wxDataObject& data );
-
-    // clears wxTheClipboard and the system's clipboard if possible
-    virtual void Clear();
-
-    // implementation from now on
-    bool              m_open;
-    bool              m_ownsClipboard;
-    bool              m_ownsPrimarySelection;
-    wxDataObject     *m_data;
-
-    WXWindow          m_clipboardWidget;  /* for getting and offering data */
-    WXWindow          m_targetsWidget;    /* for getting list of supported formats */
-    bool              m_waiting;          /* querying data or formats is asynchronous */
-
-    bool              m_formatSupported;
-    Atom              m_targetRequested;
-    wxDataObject     *m_receivedData;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxClipboard)
-};
-
-#endif // wxUSE_CLIPBOARD
-
-#endif // _WX_X11_CLIPBRD_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/colour.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/colour.h
deleted file mode 100644
index c9a06e6c09..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/colour.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/colour.h
-// Purpose:     wxColour class
-// Author:      Julian Smart, Robert Roebling
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart, Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_COLOUR_H_
-#define _WX_COLOUR_H_
-
-#include "wx/defs.h"
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/gdiobj.h"
-#include "wx/palette.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxDC;
-class WXDLLIMPEXP_FWD_CORE wxPaintDC;
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-
-class WXDLLIMPEXP_FWD_CORE wxColour;
-
-//-----------------------------------------------------------------------------
-// wxColour
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxColour : public wxColourBase
-{
-public:
-    // constructors
-    // ------------
-    DEFINE_STD_WXCOLOUR_CONSTRUCTORS
-
-    virtual ~wxColour();
-
-    bool operator==(const wxColour& col) const;
-    bool operator!=(const wxColour& col) const { return !(*this == col); }
-
-    unsigned char Red() const;
-    unsigned char Green() const;
-    unsigned char Blue() const;
-
-    // Implementation part
-
-    void CalcPixel( WXColormap cmap );
-    unsigned long GetPixel() const;
-    WXColor *GetColor() const;
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-    virtual void
-    InitRGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
-
-    virtual bool FromString(const wxString& str);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxColour)
-};
-
-#endif // _WX_COLOUR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/cursor.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/cursor.h
deleted file mode 100644
index a4595ae31f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/cursor.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/cursor.h
-// Purpose:     wxCursor class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_CURSOR_H_
-#define _WX_CURSOR_H_
-
-#include "wx/gdiobj.h"
-#include "wx/gdicmn.h"
-#include "wx/colour.h"
-
-class WXDLLIMPEXP_FWD_CORE wxImage;
-
-//-----------------------------------------------------------------------------
-// wxCursor
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxCursor : public wxGDIObject
-{
-public:
-    wxCursor();
-    wxCursor(wxStockCursor id) { InitFromStock(id); }
-#if WXWIN_COMPATIBILITY_2_8
-    wxCursor(int id) { InitFromStock((wxStockCursor)id); }
-#endif
-#if wxUSE_IMAGE
-    wxCursor( const wxImage & image );
-#endif
-
-    wxCursor(const wxString& name,
-             wxBitmapType type = wxCURSOR_DEFAULT_TYPE,
-             int hotSpotX = 0, int hotSpotY = 0);
-    virtual ~wxCursor();
-
-    // implementation
-
-    WXCursor GetCursor() const;
-
-protected:
-    void InitFromStock(wxStockCursor);
-
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxCursor)
-};
-
-#endif // _WX_CURSOR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dataform.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dataform.h
deleted file mode 100644
index f07f017bdf..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dataform.h
+++ /dev/null
@@ -1,64 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/dataform.h
-// Purpose:     declaration of the wxDataFormat class
-// Author:      Robert Roebling
-// Modified by:
-// Created:     19.10.99 (extracted from motif/dataobj.h)
-// Copyright:   (c) 1999 Robert Roebling
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_X11_DATAFORM_H
-#define _WX_X11_DATAFORM_H
-
-class WXDLLIMPEXP_CORE wxDataFormat
-{
-public:
-    // the clipboard formats under Xt are Atoms
-    typedef Atom NativeFormat;
-
-    wxDataFormat();
-    wxDataFormat( wxDataFormatId type );
-    wxDataFormat( const wxString &id );
-    wxDataFormat( NativeFormat format );
-
-    wxDataFormat& operator=(NativeFormat format)
-        { SetId(format); return *this; }
-
-    // comparison (must have both versions)
-    bool operator==(NativeFormat format) const
-        { return m_format == (NativeFormat)format; }
-    bool operator!=(NativeFormat format) const
-        { return m_format != (NativeFormat)format; }
-    bool operator==(wxDataFormatId format) const
-        { return m_type == (wxDataFormatId)format; }
-    bool operator!=(wxDataFormatId format) const
-        { return m_type != (wxDataFormatId)format; }
-
-    // explicit and implicit conversions to NativeFormat which is one of
-    // standard data types (implicit conversion is useful for preserving the
-    // compatibility with old code)
-    NativeFormat GetFormatId() const { return m_format; }
-    operator NativeFormat() const { return m_format; }
-
-    void SetId( NativeFormat format );
-
-    // string ids are used for custom types - this SetId() must be used for
-    // application-specific formats
-    wxString GetId() const;
-    void SetId( const wxString& id );
-
-    // implementation
-    wxDataFormatId GetType() const;
-
-private:
-    wxDataFormatId   m_type;
-    NativeFormat     m_format;
-
-    void PrepareFormats();
-    void SetType( wxDataFormatId type );
-};
-
-
-#endif // _WX_X11_DATAFORM_H
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dataobj.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dataobj.h
deleted file mode 100644
index b2efffc0e6..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dataobj.h
+++ /dev/null
@@ -1,29 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/dataobj.h
-// Purpose:     declaration of the wxDataObject class for Motif
-// Author:      Julian Smart
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_X11_DATAOBJ_H_
-#define _WX_X11_DATAOBJ_H_
-
-// ----------------------------------------------------------------------------
-// wxDataObject is the same as wxDataObjectBase under wxMotif
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDataObject : public wxDataObjectBase
-{
-public:
-    wxDataObject();
-
-#ifdef __DARWIN__
-    virtual ~wxDataObject() { }
-#endif
-
-    virtual bool IsSupportedFormat( const wxDataFormat& format, Direction dir = Get ) const;
-};
-
-#endif //_WX_X11_DATAOBJ_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dataobj2.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dataobj2.h
deleted file mode 100644
index aef39218d8..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dataobj2.h
+++ /dev/null
@@ -1,92 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/dataobj2.h
-// Purpose:     declaration of standard wxDataObjectSimple-derived classes
-// Author:      Robert Roebling
-// Created:     19.10.99 (extracted from gtk/dataobj.h)
-// Copyright:   (c) 1998, 1999 Vadim Zeitlin, Robert Roebling
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_X11_DATAOBJ2_H_
-#define _WX_X11_DATAOBJ2_H_
-
-// ----------------------------------------------------------------------------
-// wxBitmapDataObject is a specialization of wxDataObject for bitmaps
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxBitmapDataObject : public wxBitmapDataObjectBase
-{
-public:
-    // ctors
-    wxBitmapDataObject();
-    wxBitmapDataObject(const wxBitmap& bitmap);
-
-    // destr
-    virtual ~wxBitmapDataObject();
-
-    // override base class virtual to update PNG data too
-    virtual void SetBitmap(const wxBitmap& bitmap);
-
-    // implement base class pure virtuals
-    // ----------------------------------
-
-    virtual size_t GetDataSize() const { return m_pngSize; }
-    virtual bool GetDataHere(void *buf) const;
-    virtual bool SetData(size_t len, const void *buf);
-    // Must provide overloads to avoid hiding them (and warnings about it)
-    virtual size_t GetDataSize(const wxDataFormat&) const
-    {
-        return GetDataSize();
-    }
-    virtual bool GetDataHere(const wxDataFormat&, void *buf) const
-    {
-        return GetDataHere(buf);
-    }
-    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
-    {
-        return SetData(len, buf);
-    }
-
-protected:
-    void Init() { m_pngData = NULL; m_pngSize = 0; }
-    void Clear() { free(m_pngData); }
-    void ClearAll() { Clear(); Init(); }
-
-    size_t      m_pngSize;
-    void       *m_pngData;
-
-    void DoConvertToPng();
-};
-
-// ----------------------------------------------------------------------------
-// wxFileDataObject is a specialization of wxDataObject for file names
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxFileDataObject : public wxFileDataObjectBase
-{
-public:
-    // implement base class pure virtuals
-    // ----------------------------------
-
-    void AddFile( const wxString &filename );
-
-    virtual size_t GetDataSize() const;
-    virtual bool GetDataHere(void *buf) const;
-    virtual bool SetData(size_t len, const void *buf);
-    // Must provide overloads to avoid hiding them (and warnings about it)
-    virtual size_t GetDataSize(const wxDataFormat&) const
-    {
-        return GetDataSize();
-    }
-    virtual bool GetDataHere(const wxDataFormat&, void *buf) const
-    {
-        return GetDataHere(buf);
-    }
-    virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
-    {
-        return SetData(len, buf);
-    }
-};
-
-#endif // _WX_X11_DATAOBJ2_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dc.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dc.h
deleted file mode 100644
index 0640f1c19a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dc.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/dc.h
-// Purpose:     wxDC class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DC_H_
-#define _WX_DC_H_
-
-#include "wx/pen.h"
-#include "wx/brush.h"
-#include "wx/icon.h"
-#include "wx/font.h"
-#include "wx/gdicmn.h"
-
-//-----------------------------------------------------------------------------
-// wxDC
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxX11DCImpl : public wxDCImpl
-{
-public:
-    wxX11DCImpl( wxDC *owner );
-    virtual ~wxX11DCImpl() { }
-
-    virtual wxSize GetPPI() const;
-
-protected:
-    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
-        wxCoord width, wxCoord height);
-    virtual void DoGetSizeMM(int* width, int* height) const;
-
-    // implementation
-    wxCoord XDEV2LOG(wxCoord x) const       { return DeviceToLogicalX(x); }
-    wxCoord XDEV2LOGREL(wxCoord x) const    { return DeviceToLogicalXRel(x); }
-    wxCoord YDEV2LOG(wxCoord y) const       { return DeviceToLogicalY(y); }
-    wxCoord YDEV2LOGREL(wxCoord y) const    { return DeviceToLogicalYRel(y); }
-    wxCoord XLOG2DEV(wxCoord x) const       { return LogicalToDeviceX(x); }
-    wxCoord XLOG2DEVREL(wxCoord x) const    { return LogicalToDeviceXRel(x); }
-    wxCoord YLOG2DEV(wxCoord y) const       { return LogicalToDeviceY(y); }
-    wxCoord YLOG2DEVREL(wxCoord y) const    { return LogicalToDeviceYRel(y); }
-
-private:
-    DECLARE_CLASS(wxX11DCImpl)
-};
-
-#endif
-// _WX_DC_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dcclient.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dcclient.h
deleted file mode 100644
index 08f540217a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dcclient.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/dcclient.h
-// Purpose:     wxClientDC, wxPaintDC and wxWindowDC classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DCCLIENT_H_
-#define _WX_DCCLIENT_H_
-
-#include "wx/dc.h"
-#include "wx/dcclient.h"
-#include "wx/x11/dc.h"
-#include "wx/region.h"
-
-// -----------------------------------------------------------------------------
-// fwd declarations
-// -----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-
-//-----------------------------------------------------------------------------
-// wxWindowDCImpl
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxWindowDCImpl : public wxX11DCImpl
-{
-public:
-    wxWindowDCImpl( wxDC *owner );
-    wxWindowDCImpl( wxDC *owner, wxWindow *win );
-
-    virtual ~wxWindowDCImpl();
-
-    virtual bool CanDrawBitmap() const { return true; }
-    virtual bool CanGetTextExtent() const { return true; }
-
-protected:
-    virtual void DoGetSize(int *width, int *height) const;
-    virtual bool DoFloodFill( wxCoord x, wxCoord y, const wxColour& col,
-                              wxFloodFillStyle style = wxFLOOD_SURFACE );
-    virtual bool DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const;
-
-    virtual void DoDrawPoint(wxCoord x, wxCoord y);
-    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
-
-    virtual void DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y );
-    virtual void DoDrawBitmap( const wxBitmap &bitmap, wxCoord x, wxCoord y,
-                               bool useMask = false );
-
-    virtual void DoDrawArc(wxCoord x1, wxCoord y1,
-        wxCoord x2, wxCoord y2,
-        wxCoord xc, wxCoord yc);
-    virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
-        double sa, double ea);
-
-    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-    virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
-        wxCoord width, wxCoord height,
-        double radius);
-    virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
-
-    virtual void DoCrossHair(wxCoord x, wxCoord y);
-
-    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
-    virtual void DoDrawRotatedText(const wxString &text, wxCoord x, wxCoord y, double angle);
-
-    virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
-        wxDC *source, wxCoord xsrc, wxCoord ysrc,
-        wxRasterOperationMode rop = wxCOPY, bool useMask = false,
-        wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
-
-    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
-        wxCoord width, wxCoord height);
-    virtual void DoSetDeviceClippingRegion(const wxRegion& region);
-
-    virtual void DoDrawLines(int n, const wxPoint points[],
-        wxCoord xoffset, wxCoord yoffset);
-    virtual void DoDrawPolygon(int n, const wxPoint points[],
-        wxCoord xoffset, wxCoord yoffset,
-        wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
-
-
-public:
-    virtual void Clear();
-
-    virtual void SetFont(const wxFont& font);
-    virtual void SetPen(const wxPen& pen);
-    virtual void SetBrush(const wxBrush& brush);
-    virtual void SetBackground(const wxBrush& brush);
-    virtual void SetBackgroundMode(int mode);
-    virtual void SetPalette(const wxPalette& palette);
-    virtual void SetLogicalFunction( wxRasterOperationMode function );
-
-    virtual void SetTextForeground(const wxColour& colour);
-    virtual void SetTextBackground(const wxColour& colour);
-
-    virtual wxCoord GetCharHeight() const;
-    virtual wxCoord GetCharWidth() const;
-
-    virtual int GetDepth() const;
-    virtual wxSize GetPPI() const;
-
-    virtual void DestroyClippingRegion();
-    WXWindow GetX11Window() const { return m_x11window; }
-
-    virtual void ComputeScaleAndOrigin();
-
-protected:
-    // implementation
-    // --------------
-    virtual void DoGetTextExtent(const wxString& string,
-        wxCoord *x, wxCoord *y,
-        wxCoord *descent = NULL,
-        wxCoord *externalLeading = NULL,
-        const wxFont *theFont = NULL) const;
-
-    void Init();
-
-    WXDisplay    *m_display;
-    WXWindow      m_x11window;
-    WXGC          m_penGC;
-    WXGC          m_brushGC;
-    WXGC          m_textGC;
-    WXGC          m_bgGC;
-    WXColormap    m_cmap;
-    bool          m_isMemDC;
-    bool          m_isScreenDC;
-    wxRegion      m_currentClippingRegion;
-    wxRegion      m_paintClippingRegion;
-
-#if wxUSE_UNICODE
-    PangoContext *m_context;
-    PangoFontDescription *m_fontdesc;
-#endif
-
-    void SetUpDC();
-    void Destroy();
-
-private:
-    DECLARE_CLASS(wxWindowDCImpl)
-};
-
-//-----------------------------------------------------------------------------
-// wxClientDC
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxClientDCImpl : public wxWindowDCImpl
-{
-public:
-    wxClientDCImpl( wxDC *owner ) : wxWindowDCImpl( owner ) { }
-    wxClientDCImpl( wxDC *owner, wxWindow *win );
-
-protected:
-    virtual void DoGetSize(int *width, int *height) const;
-
-private:
-    DECLARE_CLASS(wxClientDCImpl)
-};
-
-//-----------------------------------------------------------------------------
-// wxPaintDC
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPaintDCImpl : public wxClientDCImpl
-{
-public:
-    wxPaintDCImpl( wxDC *owner ) : wxClientDCImpl( owner ) { }
-    wxPaintDCImpl( wxDC *owner, wxWindow *win );
-
-private:
-    DECLARE_CLASS(wxPaintDCImpl)
-};
-
-#endif
-// _WX_DCCLIENT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dcmemory.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dcmemory.h
deleted file mode 100644
index a912b85634..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dcmemory.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/dcmemory.h
-// Purpose:     wxMemoryDC class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DCMEMORY_H_
-#define _WX_DCMEMORY_H_
-
-#include "wx/dc.h"
-#include "wx/dcmemory.h"
-#include "wx/x11/dcclient.h"
-
-class WXDLLIMPEXP_CORE wxMemoryDCImpl : public wxWindowDCImpl
-{
-public:
-    wxMemoryDCImpl( wxDC* owner );
-    wxMemoryDCImpl( wxDC* owner, wxBitmap& bitmap);
-    wxMemoryDCImpl( wxDC* owner, wxDC *dc );
-    virtual ~wxMemoryDCImpl();
-
-    virtual const wxBitmap& GetSelectedBitmap() const;
-    virtual wxBitmap& GetSelectedBitmap();
-
-    // implementation
-    wxBitmap  m_selected;
-
-protected:
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual void DoSelect(const wxBitmap& bitmap);
-
-private:
-    void Init();
-
-private:
-    DECLARE_CLASS(wxMemoryDCImpl)
-};
-
-#endif
-// _WX_DCMEMORY_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dcprint.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dcprint.h
deleted file mode 100644
index f1bce1873f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dcprint.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/dcprint.h
-// Purpose:     wxPrinterDC class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DCPRINT_H_
-#define _WX_DCPRINT_H_
-
-#include "wx/dc.h"
-
-class WXDLLIMPEXP_CORE wxPrinterDC: public wxDC
-{
-public:
-    DECLARE_CLASS(wxPrinterDC)
-
-    // Create a printer DC
-    wxPrinterDC(const wxString& driver, const wxString& device, const wxString& output, bool interactive = TRUE, wxPrintOrientation orientation = wxPORTRAIT);
-
-    virtual ~wxPrinterDC();
-};
-
-#endif
-    // _WX_DCPRINT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dcscreen.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dcscreen.h
deleted file mode 100644
index 2f1dbdca7e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dcscreen.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/dcscreen.h
-// Purpose:     wxScreenDC class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DCSCREEN_H_
-#define _WX_DCSCREEN_H_
-
-#include "wx/dcclient.h"
-#include "wx/x11/dcclient.h"
-
-//-----------------------------------------------------------------------------
-// wxScreenDC
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxScreenDCImpl : public wxPaintDCImpl
-{
-public:
-    wxScreenDCImpl( wxDC *owner);
-    virtual ~wxScreenDCImpl();
-
-protected:
-    virtual void DoGetSize(int *width, int *height) const;
-
-private:
-    DECLARE_CLASS(wxScreenDCImpl)
-};
-
-
-#endif
-    // _WX_DCSCREEN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dnd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dnd.h
deleted file mode 100644
index 76073d5e59..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/dnd.h
+++ /dev/null
@@ -1,172 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/dnd.h
-// Purpose:     declaration of wxDropTarget, wxDropSource classes
-// Author:      Julian Smart
-// Copyright:   (c) 1998 Vadim Zeitlin, Robert Roebling, Julian Smart
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_DND_H_
-#define _WX_DND_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_DRAG_AND_DROP
-
-#include "wx/object.h"
-#include "wx/string.h"
-#include "wx/dataobj.h"
-#include "wx/cursor.h"
-
-//-------------------------------------------------------------------------
-// classes
-//-------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-
-class WXDLLIMPEXP_FWD_CORE wxDropTarget;
-class WXDLLIMPEXP_FWD_CORE wxTextDropTarget;
-class WXDLLIMPEXP_FWD_CORE wxFileDropTarget;
-class WXDLLIMPEXP_FWD_CORE wxPrivateDropTarget;
-
-class WXDLLIMPEXP_FWD_CORE wxDropSource;
-
-//-------------------------------------------------------------------------
-// wxDropTarget
-//-------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxDropTarget: public wxObject
-{
-public:
-
-    wxDropTarget();
-    virtual ~wxDropTarget();
-
-    virtual void OnEnter() { }
-    virtual void OnLeave() { }
-    virtual bool OnDrop( long x, long y, const void *data, size_t size ) = 0;
-
-    // Override these to indicate what kind of data you support:
-
-    virtual size_t GetFormatCount() const = 0;
-    virtual wxDataFormat GetFormat(size_t n) const = 0;
-
-    // implementation
-};
-
-//-------------------------------------------------------------------------
-// wxTextDropTarget
-//-------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxTextDropTarget: public wxDropTarget
-{
-public:
-
-    wxTextDropTarget() {}
-    virtual bool OnDrop( long x, long y, const void *data, size_t size );
-    virtual bool OnDropText( long x, long y, const char *psz );
-
-protected:
-
-    virtual size_t GetFormatCount() const;
-    virtual wxDataFormat GetFormat(size_t n) const;
-};
-
-//-------------------------------------------------------------------------
-// wxPrivateDropTarget
-//-------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPrivateDropTarget: public wxDropTarget
-{
-public:
-
-    wxPrivateDropTarget();
-
-    // you have to override OnDrop to get at the data
-
-    // the string ID identifies the format of clipboard or DnD data. a word
-    // processor would e.g. add a wxTextDataObject and a wxPrivateDataObject
-    // to the clipboard - the latter with the Id "WXWORD_FORMAT".
-
-    void SetId( const wxString& id )
-    { m_id = id; }
-
-    wxString GetId()
-    { return m_id; }
-
-private:
-
-    virtual size_t GetFormatCount() const;
-    virtual wxDataFormat GetFormat(size_t n) const;
-
-    wxString   m_id;
-};
-
-// ----------------------------------------------------------------------------
-// A drop target which accepts files (dragged from File Manager or Explorer)
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxFileDropTarget: public wxDropTarget
-{
-public:
-
-    wxFileDropTarget() {}
-
-    virtual bool OnDrop( long x, long y, const void *data, size_t size );
-    virtual bool OnDropFiles( long x, long y,
-        size_t nFiles, const char * const aszFiles[] );
-
-protected:
-
-    virtual size_t GetFormatCount() const;
-    virtual wxDataFormat GetFormat(size_t n) const;
-};
-
-//-------------------------------------------------------------------------
-// wxDropSource
-//-------------------------------------------------------------------------
-
-enum wxDragResult
-{
-    wxDragError,    // error prevented the d&d operation from completing
-        wxDragNone,     // drag target didn't accept the data
-        wxDragCopy,     // the data was successfully copied
-        wxDragMove,     // the data was successfully moved
-        wxDragCancel    // the operation was cancelled by user (not an error)
-};
-
-class WXDLLIMPEXP_CORE wxDropSource: public wxObject
-{
-public:
-
-    wxDropSource( wxWindow *win );
-    wxDropSource( wxDataObject &data, wxWindow *win );
-
-    virtual ~wxDropSource(void);
-
-    void SetData( wxDataObject &data  );
-    wxDragResult DoDragDrop(int flags = wxDrag_CopyOnly);
-
-    virtual bool GiveFeedback( wxDragResult WXUNUSED(effect), bool WXUNUSED(bScrolling) ) { return TRUE; }
-
-    // implementation
-#if 0
-    void RegisterWindow(void);
-    void UnregisterWindow(void);
-
-    wxWindow      *m_window;
-    wxDragResult   m_retValue;
-    wxDataObject  *m_data;
-
-    wxCursor      m_defaultCursor;
-    wxCursor      m_goaheadCursor;
-#endif
-};
-
-#endif
-
-// wxUSE_DRAG_AND_DROP
-
-#endif
-//_WX_DND_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/font.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/font.h
deleted file mode 100644
index faa21e4c80..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/font.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/font.h
-// Purpose:     wxFont class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_FONT_H_
-#define _WX_FONT_H_
-
-class wxXFont;
-
-// Font
-class WXDLLIMPEXP_CORE wxFont : public wxFontBase
-{
-public:
-    // ctors and such
-    wxFont() { }
-
-    wxFont(const wxFontInfo& info)
-    {
-        Create(info.GetPointSize(),
-               info.GetFamily(),
-               info.GetStyle(),
-               info.GetWeight(),
-               info.IsUnderlined(),
-               info.GetFaceName(),
-               info.GetEncoding());
-
-        if ( info.IsUsingSizeInPixels() )
-            SetPixelSize(info.GetPixelSize());
-    }
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxFont(int size,
-           int family,
-           int style,
-           int weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        (void)Create(size, (wxFontFamily)family, (wxFontStyle)style, (wxFontWeight)weight, underlined, face, encoding);
-    }
-#endif
-
-    wxFont(int size,
-           wxFontFamily family,
-           wxFontStyle style,
-           wxFontWeight weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        Create(size, family, style, weight, underlined, face, encoding);
-    }
-
-    wxFont(const wxSize& pixelSize,
-           wxFontFamily family,
-           wxFontStyle style,
-           wxFontWeight weight,
-           bool underlined = false,
-           const wxString& face = wxEmptyString,
-           wxFontEncoding encoding = wxFONTENCODING_DEFAULT)
-    {
-        Create(10, family, style, weight, underlined, face, encoding);
-        SetPixelSize(pixelSize);
-    }
-
-    bool Create(int size,
-                wxFontFamily family,
-                wxFontStyle style,
-                wxFontWeight weight,
-                bool underlined = false,
-                const wxString& face = wxEmptyString,
-                wxFontEncoding encoding = wxFONTENCODING_DEFAULT);
-
-    wxFont(const wxNativeFontInfo& info);
-
-    // FIXME: I added the ! to make it compile;
-    // is this right? - JACS
-#if !wxUSE_UNICODE
-    bool Create(const wxString& fontname,
-        wxFontEncoding fontenc = wxFONTENCODING_DEFAULT);
-#endif
-    // DELETEME: no longer seems to be implemented.
-    // bool Create(const wxNativeFontInfo& fontinfo);
-
-    virtual ~wxFont();
-
-    // implement base class pure virtuals
-    virtual int GetPointSize() const;
-    virtual wxFontStyle GetStyle() const;
-    virtual wxFontWeight GetWeight() const;
-    virtual bool GetUnderlined() const;
-    virtual wxString GetFaceName() const;
-    virtual wxFontEncoding GetEncoding() const;
-    virtual const wxNativeFontInfo *GetNativeFontInfo() const;
-
-    virtual bool IsFixedWidth() const;
-
-    virtual void SetPointSize(int pointSize);
-    virtual void SetFamily(wxFontFamily family);
-    virtual void SetStyle(wxFontStyle style);
-    virtual void SetWeight(wxFontWeight weight);
-    virtual bool SetFaceName(const wxString& faceName);
-    virtual void SetUnderlined(bool underlined);
-    virtual void SetEncoding(wxFontEncoding encoding);
-
-    wxDECLARE_COMMON_FONT_METHODS();
-
-    // Implementation
-
-#if wxUSE_PANGO
-#else
-    // Find an existing, or create a new, XFontStruct
-    // based on this wxFont and the given scale. Append the
-    // font to list in the private data for future reference.
-
-    // TODO This is a fairly basic implementation, that doesn't
-    // allow for different facenames, and also doesn't do a mapping
-    // between 'standard' facenames (e.g. Arial, Helvetica, Times Roman etc.)
-    // and the fonts that are available on a particular system.
-    // Maybe we need to scan the user's machine to build up a profile
-    // of the fonts and a mapping file.
-
-    // Return font struct, and optionally the Motif font list
-    wxXFont *GetInternalFont(double scale = 1.0,
-        WXDisplay* display = NULL) const;
-
-    // Helper function for convenient access of the above.
-    WXFontStructPtr GetFontStruct(double scale = 1.0,
-        WXDisplay* display = NULL) const;
-#endif
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-    virtual void DoSetNativeFontInfo( const wxNativeFontInfo& info );
-    virtual wxFontFamily DoGetFamily() const;
-
-    void Unshare();
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxFont)
-};
-
-#endif
-    // _WX_FONT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/glcanvas.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/glcanvas.h
deleted file mode 100644
index b16b6beaea..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/glcanvas.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/glcanvas.h
-// Purpose:     wxGLCanvas, for using OpenGL with wxWidgets 2.0 for Motif.
-//              Uses the GLX extension.
-// Author:      Julian Smart and Wolfram Gloger
-// Modified by:
-// Created:     1995, 1999
-// Copyright:   (c) Julian Smart, Wolfram Gloger
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_GLCANVAS_H_
-#define _WX_GLCANVAS_H_
-
-#include "wx/unix/glx11.h"
-
-class WXDLLIMPEXP_GL wxGLCanvas : public wxGLCanvasX11
-{
-public:
-    wxGLCanvas(wxWindow *parent,
-               wxWindowID id = wxID_ANY,
-               const int *attribList = NULL,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = 0,
-               const wxString& name = wxGLCanvasName,
-               const wxPalette& palette = wxNullPalette);
-
-    bool Create(wxWindow *parent,
-                wxWindowID id = wxID_ANY,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = 0,
-                const wxString& name = wxGLCanvasName,
-                const int *attribList = NULL,
-                const wxPalette& palette = wxNullPalette);
-
-    // implement wxGLCanvasX11 methods
-    // --------------------------------
-
-    virtual Window GetXWindow() const;
-
-protected:
-    virtual int GetColourIndex(const wxColour& col);
-
-    DECLARE_CLASS(wxGLCanvas)
-};
-
-#endif // _WX_GLCANVAS_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/joystick.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/joystick.h
deleted file mode 100644
index 8e9d4c433d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/joystick.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/joystick.h
-// Purpose:     wxJoystick class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_JOYSTICK_H_
-#define _WX_JOYSTICK_H_
-
-#include "wx/event.h"
-
-class WXDLLIMPEXP_ADV wxJoystick: public wxObject
-{
-    DECLARE_DYNAMIC_CLASS(wxJoystick)
-public:
-/*
-* Public interface
-    */
-
-    wxJoystick(int joystick = wxJOYSTICK1) { m_joystick = joystick; }
-
-    // Attributes
-    ////////////////////////////////////////////////////////////////////////////
-
-    wxPoint GetPosition() const;
-    int GetZPosition() const;
-    int GetButtonState() const;
-    int GetPOVPosition() const;
-    int GetPOVCTSPosition() const;
-    int GetRudderPosition() const;
-    int GetUPosition() const;
-    int GetVPosition() const;
-    int GetMovementThreshold() const;
-    void SetMovementThreshold(int threshold) ;
-
-    // Capabilities
-    ////////////////////////////////////////////////////////////////////////////
-
-    bool IsOk() const; // Checks that the joystick is functioning
-    static int GetNumberJoysticks() ;
-    int GetManufacturerId() const ;
-    int GetProductId() const ;
-    wxString GetProductName() const ;
-    int GetXMin() const;
-    int GetYMin() const;
-    int GetZMin() const;
-    int GetXMax() const;
-    int GetYMax() const;
-    int GetZMax() const;
-    int GetNumberButtons() const;
-    int GetNumberAxes() const;
-    int GetMaxButtons() const;
-    int GetMaxAxes() const;
-    int GetPollingMin() const;
-    int GetPollingMax() const;
-    int GetRudderMin() const;
-    int GetRudderMax() const;
-    int GetUMin() const;
-    int GetUMax() const;
-    int GetVMin() const;
-    int GetVMax() const;
-
-    bool HasRudder() const;
-    bool HasZ() const;
-    bool HasU() const;
-    bool HasV() const;
-    bool HasPOV() const;
-    bool HasPOV4Dir() const;
-    bool HasPOVCTS() const;
-
-    // Operations
-    ////////////////////////////////////////////////////////////////////////////
-
-    // pollingFreq = 0 means that movement events are sent when above the threshold.
-    // If pollingFreq > 0, events are received every this many milliseconds.
-    bool SetCapture(wxWindow* win, int pollingFreq = 0);
-    bool ReleaseCapture();
-
-protected:
-    int       m_joystick;
-};
-
-#endif
-    // _WX_JOYSTICK_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/minifram.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/minifram.h
deleted file mode 100644
index 55d4699e40..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/minifram.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/minifram.h
-// Purpose:     wxMiniFrame class. A small frame for e.g. floating toolbars.
-//              If there is no equivalent on your platform, just make it a
-//              normal frame.
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_MINIFRAM_H_
-#define _WX_MINIFRAM_H_
-
-#include "wx/frame.h"
-
-class WXDLLIMPEXP_CORE wxMiniFrame: public wxFrame {
-
-    DECLARE_DYNAMIC_CLASS(wxMiniFrame)
-
-public:
-    inline wxMiniFrame() {}
-    inline wxMiniFrame(wxWindow *parent,
-        wxWindowID id,
-        const wxString& title,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = wxDEFAULT_FRAME_STYLE|wxTINY_CAPTION,
-        const wxString& name = wxFrameNameStr)
-    {
-        // Use wxFrame constructor in absence of more specific code.
-        Create(parent, id, title, pos, size, style, name);
-    }
-
-    virtual ~wxMiniFrame() {}
-protected:
-};
-
-#endif
-    // _WX_MINIFRAM_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/nanox/X11/Xatom.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/nanox/X11/Xatom.h
deleted file mode 100644
index 60fba84c97..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/nanox/X11/Xatom.h
+++ /dev/null
@@ -1,6 +0,0 @@
-
-/*
- * Xlib compatibility
- */
-
-/* Nothing yet */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/nanox/X11/Xlib.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/nanox/X11/Xlib.h
deleted file mode 100644
index 0e3aed4d23..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/nanox/X11/Xlib.h
+++ /dev/null
@@ -1,356 +0,0 @@
-/*
- * Xlib compatibility
- */
-
-#ifndef _DUMMY_XLIBH_
-#define _DUMMY_XLIBH_
-
-/* Move away the typedef in XtoNX.h */
-#define XFontStruct XFontStruct1
-#include <XtoNX.h>
-#undef XFontStruct
-#undef XCharStruct
-
-/* Data types */
-
-typedef GR_PALETTE* Colormap;
-typedef GR_DRAW_ID Drawable ;
-typedef int Status;
-typedef unsigned long VisualID;
-typedef int Bool;
-typedef long XID;
-typedef GR_SCANCODE KeySym;
-typedef GR_EVENT_KEYSTROKE XKeyEvent;
-typedef struct {
-    GR_FONT_INFO info;
-    GR_FONT_ID fid;
-} XFontStruct;
-typedef struct {
-    short	lbearing;	/* origin to left edge of raster */
-    short	rbearing;	/* origin to right edge of raster */
-    short	width;		/* advance to next char's origin */
-    short	ascent;		/* baseline to top edge of raster */
-    short	descent;	/* baseline to bottom edge of raster */
-    unsigned short attributes;	/* per char flags (not predefined) */
-} XCharStruct;
-
-/* Configure window value mask bits */
-#define   CWX                         (1<<0)
-#define   CWY                         (1<<1)
-#define   CWWidth                     (1<<2)
-#define   CWHeight                    (1<<3)
-#define   CWBorderWidth               (1<<4)
-#define   CWSibling                   (1<<5)
-#define   CWStackMode                 (1<<6)
-
-/* Values */
-
-typedef struct {
-        int x, y;
-        int width, height;
-        int border_width;
-        Window sibling;
-        int stack_mode;
-} XWindowChanges;
-
-/* typedef unsigned long Time; */
-
-#define Success 0
-#define GrabSuccess Success
-#define GrabNotViewable (Success+1)
-#define InputOutput 1
-#define InputOnly 2
-#define IsUnmapped              0
-#define IsUnviewable            1
-#define IsViewable              2
-/* Is this right? */
-#define PropertyChangeMask GR_EVENT_MASK_SELECTION_CHANGED
-#define GraphicsExpose GR_EVENT_TYPE_EXPOSURE
-#define GraphicsExposeMask GR_EVENT_MASK_EXPOSURE
-#define ColormapChangeMask 0
-#define FillSolid 0
-#define LineSolid 0
-#define LineOnOffDash 0
-#define CapNotLast 0
-#define CapRound 0
-#define CapProjecting 0
-#define CapButt 0
-#define JoinRound 0
-#define JoinBevel 0
-#define JoinMiter 0
-#define IncludeInferiors 0
-#define ClipByChildren 0
-#define DoRed 0
-#define DoGreen 0
-#define DoBlue 0
-#define NoEventMask GR_EVENT_MASK_NONE
-#define RevertToParent 0
-#define CurrentTime 0
-#define GrabModeAsync 0
-
-#define GXcopy GR_MODE_COPY
-#define GXclear GR_MODE_CLEAR
-#ifndef GXxor
-#define GXxor GR_MODE_OR
-#endif
-#define GXinvert GR_MODE_INVERT
-#define GXorReverse GR_MODE_ORREVERSE
-#define GXandReverse GR_MODE_ANDREVERSE
-#define GXand GR_MODE_AND
-#define GXor GR_MODE_OR
-#define GXandInverted GR_MODE_ANDINVERTED
-#define GXnoop GR_MODE_NOOP
-#define GXnor GR_MODE_NOR
-#define GXequiv GR_MODE_EQUIV
-#define GXcopyInverted GR_MODE_COPYINVERTED
-#define GXorInverted GR_MODE_ORINVERTED
-#define GXnand GR_MODE_NAND
-#define GXset GR_MODE_SET
-
-#define XSynchronize(display,sync)
-#define XDefaultRootWindow(d) GR_ROOT_WINDOW_ID
-#define RootWindowOfScreen(s) GR_ROOT_WINDOW_ID
-#define XFreePixmap(d, p) GrDestroyWindow(p)
-#define XFreeCursor(d, c) GrDestroyCursor(c)
-#define XFreeGC(d, gc) GrDestroyGC(gc)
-#define XSetBackground(d, gc, c) GrSetGCBackground(gc, c)
-#define DefaultVisual(d, s) (NULL)
-#define DefaultColormap(d, s) DefaultColormapOfScreen(NULL)
-#define DefaultScreenOfDisplay(d) 0
-#define XSetFillStyle(d, gc, s) wxNoop()
-#define XSetLineAttributes(d, gc, a, b, c, e) wxNoop()
-#define XSetClipMask(d, gc, m) wxNoop()
-#define XSetTSOrigin(d, gc, x, y) wxNoop()
-#define XFillArc(d, w, gc, x, y, rx, ry, a1, a2) GrArcAngle(w, gc, x, y, rx, ry, a1, a2, GR_PIE)
-#define XDrawArc(d, w, gc, x, y, rx, ry, a1, a2) GrArcAngle(w, gc, x, y, rx, ry, a1, a2, GR_ARC)
-#define XDrawPoint(d, w, gc, x, y) GrPoint(w, gc, x, y)
-#define XFillPolygon(d, w, gc, p, n, s, m) GrFillPoly(w, gc, n, p)
-#define XDrawRectangle(d, w, gc, x, y, width, height) GrRect(w, gc, x, y, width, height)
-#define XSetClipOrigin(d, gc, x, y) GrSetGCClipOrigin(gc, x, y)
-#define XSetRegion(d, gc, r) GrSetGCRegion(gc, r)
-#define XSetTile(d, gc, p) wxNoop()
-#define XSetStipple(d, gc, p) wxNoop()
-#define XSetSubwindowMode(d, gc, mode) wxNoop()
-#define XFreeColormap(d, cmap) wxNoop()
-#define XSetTransientForHint(d, w, p) wxNoop()
-#define XUnionRegion(sr1,sr2,r)	GrUnionRegion(r,sr1,sr2)
-#define XIntersectRegion(sr1,sr2,r)	GrIntersectRegion(r,sr1,sr2)
-#define XEqualRegion(r1, r2) GrEqualRegion(r1, r2)
-#define XEmptyRegion(r) GrEmptyRegion(r)
-#define XOffsetRegion(r, x, y) GrOffsetRegion(r, x, y)
-#define XClipBox(r, rect) GrGetRegionBox(r, rect)
-#define XPointInRegion(r, x, y) GrPointInRegion(r, x, y)
-#define XXorRegion(sr1, sr2, r) GrXorRegion(r, sr1, sr2)
-/* TODO: Cannot find equivalent for this. */
-#define XIconifyWindow(d, w, s) 0
-#define XCreateWindowWithColor(d,p,x,y,w,h,bw,depth,cl,vis,backColor,foreColor) \
-			GrNewWindow(p,x,y,w,h,bw,backColor,foreColor)
-#define XLookupString(event, buf, len, sym, status) (*sym = (event)->scancode)
-#define XBell(a, b) GrBell()
-#define DisplayWidthMM(d, s) 100
-#define DisplayHeightMM(d, s) 100
-
-/* These defines are wrongly defined in XtoNX.h, IMHO,
- * since they reference a static global.
- * Redefined as functions, below.
- */
-
-#undef DisplayWidth
-#undef DisplayHeight
-#undef DefaultDepth
-
-/*
- * Data structure used by color operations
- */
-typedef struct {
-	unsigned long pixel;
-	unsigned short red, green, blue;
-	char flags;  /* do_red, do_green, do_blue */
-	char pad;
-} XColor;
-
-typedef struct {
-	int type;
-	Display *display;	/* Display the event was read from */
-	XID resourceid;		/* resource id */
-	unsigned long serial;	/* serial number of failed request */
-	unsigned char error_code;	/* error code of failed request */
-	unsigned char request_code;	/* Major op-code of failed request */
-	unsigned char minor_code;	/* Minor op-code of failed request */
-} XErrorEvent;
-
-/*
- * Visual structure; contains information about colormapping possible.
- */
-typedef struct {
-	void *ext_data;	/* hook for extension to hang data */
-	VisualID visualid;	/* visual id of this visual */
-#if defined(__cplusplus) || defined(c_plusplus)
-	int c_class;		/* C++ class of screen (monochrome, etc.) */
-#else
-	int class;		/* class of screen (monochrome, etc.) */
-#endif
-	unsigned long red_mask, green_mask, blue_mask;	/* mask values */
-	int bits_per_rgb;	/* log base 2 of distinct color values */
-	int map_entries;	/* color map entries */
-} Visual;
-
-/*
- * Depth structure; contains information for each possible depth.
- */	
-typedef struct {
-	int depth;		/* this depth (Z) of the depth */
-	int nvisuals;		/* number of Visual types at this depth */
-	Visual *visuals;	/* list of visuals possible at this depth */
-} Depth;
-
-/*
- * Information about the screen.  The contents of this structure are
- * implementation dependent.  A Screen should be treated as opaque
- * by application code.
- */
-
-struct _XDisplay;		/* Forward declare before use for C++ */
-
-typedef struct {
-	void *ext_data;	/* hook for extension to hang data */
-	struct _XDisplay *display;/* back pointer to display structure */
-	Window root;		/* Root window id. */
-	int width, height;	/* width and height of screen */
-	int mwidth, mheight;	/* width and height of  in millimeters */
-	int ndepths;		/* number of depths possible */
-	Depth *depths;		/* list of allowable depths on the screen */
-	int root_depth;		/* bits per pixel */
-	Visual *root_visual;	/* root visual */
-	GC default_gc;		/* GC for the root root visual */
-	Colormap cmap;		/* default color map */
-	unsigned long white_pixel;
-	unsigned long black_pixel;	/* White and Black pixel values */
-	int max_maps, min_maps;	/* max and min color maps */
-	int backing_store;	/* Never, WhenMapped, Always */
-	Bool save_unders;	
-	long root_input_mask;	/* initial root input mask */
-} Screen;
-
-
-typedef struct {
-     int x, y;		      /* location of window */
-     int width, height;       /* width and height of window */
-     int border_width;	      /* border width of window */
-     int depth; 	      /* depth of window */
-     Visual *visual;	      /* the associated visual structure */
-     Window root;	      /* root of screen containing window */
-     int _class; 	      /* InputOutput, InputOnly*/
-     int bit_gravity;	      /* one of the bit gravity values */
-     int win_gravity;	      /* one of the window gravity values */
-     int backing_store;       /* NotUseful, WhenMapped, Always */
-     unsigned long backing_planes;/* planes to be preserved if possible */
-     unsigned long backing_pixel;/* value to be used when restoring planes */
-     Bool save_under;	      /* boolean, should bits under be saved? */
-     Colormap colormap;       /* color map to be associated with window */
-     Bool map_installed;      /* boolean, is color map currently installed*/
-     int map_state;	      /* IsUnmapped, IsUnviewable, IsViewable */
-     long all_event_masks;    /* set of events all people have interest in*/
-     long your_event_mask;    /* my event mask */
-     long do_not_propagate_mask;/* set of events that should not propagate */
-     Bool override_redirect;  /* boolean value for override-redirect */
-     Screen *screen;	      /* back pointer to correct screen */
-} XWindowAttributes;
-
-typedef int (*XErrorHandler) (	    /* WARNING, this type not in Xlib spec */
-    Display*		/* display */,
-    XErrorEvent*	/* error_event */
-);
-
-/* events*/
-
-/* What should this be? */
-#if 0
-#ifndef ResizeRequest
-#define ResizeRequest ??
-#endif
-#endif
-
-#ifndef MotionNotify
-#define MotionNotify GR_EVENT_TYPE_MOUSE_POSITION
-#define PointerMotionMask GR_EVENT_MASK_MOUSE_POSITION
-#endif
-
-#define ButtonMotionMask GR_EVENT_MASK_MOUSE_POSITION
-#define KeymapStateMask 0
-#define StructureNotifyMask GR_EVENT_MASK_UPDATE
-
-#ifdef ConfigureNotify
-/* XtoNX.h gets it wrong */
-#undef ConfigureNotify
-#endif
-#define ConfigureNotify GR_EVENT_TYPE_UPDATE
-
-#ifndef FocusIn
-#define FocusIn GR_EVENT_TYPE_FOCUS_IN
-#define FocusOut GR_EVENT_TYPE_FOCUS_OUT
-#define FocusChangeMask GR_EVENT_MASK_FOCUS_IN|GR_EVENT_MASK_FOCUS_OUT
-#endif
-
-/* Fuunctions */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-Display *XOpenDisplay(char *name);
-Colormap DefaultColormapOfScreen(Screen* /* screen */) ;
-int XSetGraphicsExposures( Display* /* display */, GC /* gc */, Bool /* graphics_exposures */) ;
-int XWarpPointer( Display* /* display */, Window /* srcW */, Window /* destW */,
-                 int /* srcX */, int /* srcY */,
-                 unsigned int /* srcWidth */,
-                 unsigned int /* srcHeight */,
-                 int destX, int destY);
-int XSetInputFocus(Display* /* display */, Window focus, int /* revert_to */, Time /* time */) ;
-int XGetInputFocus(Display* /* display */, Window* /* focus_return */, int* /* revert_to_return */) ;
-int XGrabPointer(Display* /* display */, Window /* grab_window */,
-                 Bool /* owner_events */, unsigned int /* event_mask */,
-                 int /* pointer_mode */, int /* keyboard_mode */,
-                 Window /* confine_to */, Cursor /* cursor */, Time /* time */) ;
-int XUngrabPointer(Display* /* display */, Time /* time */) ;
-int XCopyArea(Display* /* display */, Drawable src, Drawable dest, GC gc,
-              int src_x, int src_y, unsigned int width, unsigned int height,
-              int dest_x, int dest_y) ;
-int XCopyPlane(Display* /* display */, Drawable src, Drawable dest, GC gc,
-              int src_x, int src_y, unsigned int width, unsigned int height,
-              int dest_x, int dest_y, unsigned long /* plane */) ;
-
-XErrorHandler XSetErrorHandler (XErrorHandler /* handler */);
-Screen *XScreenOfDisplay(Display* /* display */,
-                         int /* screen_number */);
-int DisplayWidth(Display* /* display */, int /* screen */);
-int DisplayHeight(Display* /* display */, int /* screen */);
-int DefaultDepth(Display* /* display */, int /* screen */);
-int XAllocColor(Display* /* display */, Colormap /* cmap */,
-                XColor* color);
-int XParseColor(Display* display, Colormap cmap,
-                const char* cname, XColor* color);
-int XDrawLine(Display* display, Window win, GC gc,
-              int x1, int y1, int x2, int y2);
-int XTextExtents( XFontStruct* font, char* s, int len, int* direction,
-        int* ascent, int* descent2, XCharStruct* overall);
-int XPending(Display *d);
-XFontStruct* XLoadQueryFont(Display* display, const char* fontSpec);
-int XFreeFont(Display* display, XFontStruct* fontStruct);
-int XQueryColor(Display* display, Colormap cmap, XColor* color);
-Status XGetWindowAttributes(Display* display, Window w,
-                            XWindowAttributes* window_attributes);
-
-int XConfigureWindow(Display* display, Window w, int mask, XWindowChanges* changes);
-int XTranslateCoordinates(Display* display, Window srcWindow, Window destWindow, int srcX, int srcY, int* destX, int* destY, Window* childReturn);
-
-void wxNoop();
-
-#ifdef __cplusplus
-}
-#endif
-
-#define XMaxRequestSize(display) 16384
-
-#endif
-  /* _DUMMY_XLIBH_ */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/nanox/X11/Xutil.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/nanox/X11/Xutil.h
deleted file mode 100644
index adf6bea03e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/nanox/X11/Xutil.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * Xlib compatibility
- */
-
-/* Nothing yet */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/palette.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/palette.h
deleted file mode 100644
index b9d31513d7..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/palette.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/palette.h
-// Purpose:     wxPalette class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PALETTE_H_
-#define _WX_PALETTE_H_
-
-#include "wx/list.h"
-
-class WXDLLIMPEXP_FWD_CORE wxPalette;
-
-// Palette for one display
-class wxXPalette : public wxObject
-{
-    DECLARE_DYNAMIC_CLASS(wxXPalette)
-
-public:
-    wxXPalette();
-
-    WXDisplay*        m_display;
-    int               m_pix_array_n;
-    unsigned long*    m_pix_array;
-    WXColormap        m_cmap;
-    bool              m_destroyable;
-};
-
-class WXDLLIMPEXP_CORE wxPaletteRefData: public wxGDIRefData
-{
-    friend class WXDLLIMPEXP_FWD_CORE wxPalette;
-public:
-    wxPaletteRefData();
-    virtual ~wxPaletteRefData();
-
-protected:
-    wxList  m_palettes;
-};
-
-#define M_PALETTEDATA ((wxPaletteRefData *)m_refData)
-
-class WXDLLIMPEXP_CORE wxPalette : public wxPaletteBase
-{
-    DECLARE_DYNAMIC_CLASS(wxPalette)
-
-public:
-    wxPalette();
-
-    wxPalette(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
-    virtual ~wxPalette();
-    bool Create(int n, const unsigned char *red, const unsigned char *green, const unsigned char *blue);
-    int GetPixel(unsigned char red, unsigned char green, unsigned char blue) const;
-    bool GetRGB(int pixel, unsigned char *red, unsigned char *green, unsigned char *blue) const;
-
-    // X-specific
-    WXColormap GetXColormap(WXDisplay* display = NULL) const;
-    bool TransferBitmap(void *data, int depth, int size);
-    bool TransferBitmap8(unsigned char *data, unsigned long size, void *dest, unsigned int bpp);
-    unsigned long *GetXPixArray(WXDisplay* display, int *pix_array_n);
-    void PutXColormap(WXDisplay* display, WXColormap cmap, bool destroyable);
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-};
-
-#endif // _WX_PALETTE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/pen.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/pen.h
deleted file mode 100644
index 31f0b20e98..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/pen.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/pen.h
-// Purpose:     wxPen class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PEN_H_
-#define _WX_PEN_H_
-
-#include "wx/gdicmn.h"
-#include "wx/gdiobj.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxPen;
-class WXDLLIMPEXP_FWD_CORE wxColour;
-class WXDLLIMPEXP_FWD_CORE wxBitmap;
-
-typedef char wxX11Dash;
-
-//-----------------------------------------------------------------------------
-// wxPen
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPen: public wxPenBase
-{
-public:
-    wxPen() { }
-
-    wxPen( const wxColour &colour, int width = 1, wxPenStyle style = wxPENSTYLE_SOLID );
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( wxPen(const wxColour& col, int width, int style) );
-#endif
-
-    wxPen( const wxBitmap &stipple, int width );
-    virtual ~wxPen();
-
-    bool operator == ( const wxPen& pen ) const;
-    bool operator != (const wxPen& pen) const { return !(*this == pen); }
-
-    void SetColour( const wxColour &colour );
-    void SetColour( unsigned char red, unsigned char green, unsigned char blue );
-    void SetCap( wxPenCap capStyle );
-    void SetJoin( wxPenJoin joinStyle );
-    void SetStyle( wxPenStyle style );
-    void SetWidth( int width );
-    void SetDashes( int number_of_dashes, const wxDash *dash );
-    void SetStipple( const wxBitmap& stipple );
-
-    wxColour GetColour() const;
-    wxPenCap GetCap() const;
-    wxPenJoin GetJoin() const;
-    wxPenStyle GetStyle() const;
-    int GetWidth() const;
-    int GetDashes(wxDash **ptr) const;
-    int GetDashCount() const;
-    wxDash* GetDash() const;
-    wxBitmap* GetStipple() const;
-
-#if FUTURE_WXWIN_COMPATIBILITY_3_0
-    wxDEPRECATED_FUTURE( void SetStyle(int style) )
-        { SetStyle((wxPenStyle)style); }
-#endif
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-    DECLARE_DYNAMIC_CLASS(wxPen)
-};
-
-#endif // _WX_PEN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/popupwin.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/popupwin.h
deleted file mode 100644
index 9038e79680..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/popupwin.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/popupwin.h
-// Purpose:
-// Author:      Robert Roebling
-// Created:
-// Copyright:   (c) 2001 Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __GTKPOPUPWINH__
-#define __GTKPOPUPWINH__
-
-#include "wx/defs.h"
-#include "wx/panel.h"
-#include "wx/icon.h"
-
-//-----------------------------------------------------------------------------
-// wxPopUpWindow
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxPopupWindow: public wxPopupWindowBase
-{
-public:
-    wxPopupWindow() { }
-    virtual ~wxPopupWindow() ;
-
-    wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
-        { (void)Create(parent, flags); }
-
-    bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
-
-    virtual bool Show( bool show = TRUE );
-
-protected:
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-    virtual void DoSetSize(int x, int y,
-                           int width, int height,
-                           int sizeFlags = wxSIZE_AUTO);
-
-private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxPopupWindow)
-};
-
-#endif // __GTKPOPUPWINDOWH__
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/print.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/print.h
deleted file mode 100644
index 8f878dfa3e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/print.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/print.h
-// Purpose:     wxPrinter, wxPrintPreview classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRINT_H_
-#define _WX_PRINT_H_
-
-#include "wx/prntbase.h"
-
-/*
-* Represents the printer: manages printing a wxPrintout object
-*/
-
-class WXDLLIMPEXP_CORE wxPrinter: public wxPrinterBase
-{
-    DECLARE_DYNAMIC_CLASS(wxPrinter)
-
-public:
-    wxPrinter(wxPrintData *data = NULL);
-    virtual ~wxPrinter();
-
-    virtual bool Print(wxWindow *parent, wxPrintout *printout, bool prompt = TRUE);
-    virtual bool PrintDialog(wxWindow *parent);
-    virtual bool Setup(wxWindow *parent);
-};
-
-/*
-* wxPrintPreview
-* Programmer creates an object of this class to preview a wxPrintout.
-*/
-
-class WXDLLIMPEXP_CORE wxPrintPreview: public wxPrintPreviewBase
-{
-    DECLARE_CLASS(wxPrintPreview)
-
-public:
-    wxPrintPreview(wxPrintout *printout, wxPrintout *printoutForPrinting = NULL, wxPrintData *data = NULL);
-    virtual ~wxPrintPreview();
-
-    virtual bool Print(bool interactive);
-    virtual void DetermineScaling();
-};
-
-#endif
-    // _WX_PRINT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/private.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/private.h
deleted file mode 100644
index d1436aec45..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/private.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/private.h
-// Purpose:     Private declarations for X11 port
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRIVATE_H_
-#define _WX_PRIVATE_H_
-
-#include "wx/defs.h"
-#include "wx/hashmap.h"
-#include "wx/utils.h"
-#if defined( __cplusplus ) && defined( __VMS )
-#pragma message disable nosimpint
-#endif
-#include "X11/Xlib.h"
-#include "X11/Xatom.h"
-#include "X11/Xutil.h"
-#if defined( __cplusplus ) && defined( __VMS )
-#pragma message enable nosimpint
-#endif
-
-// Include common declarations
-#include "wx/x11/privx.h"
-
-#if wxUSE_PANGO
-#include <pango/pango.h>
-#endif
-
-class WXDLLIMPEXP_FWD_CORE wxMouseEvent;
-class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-
-// ----------------------------------------------------------------------------
-// Some Unicode <-> UTF8 macros stolen from GTK
-// ----------------------------------------------------------------------------
-
-#if wxUSE_UNICODE
-    #define wxGTK_CONV(s) wxConvUTF8.cWX2MB(s)
-    #define wxGTK_CONV_BACK(s) wxConvUTF8.cMB2WX(s)
-#else
-    #define wxGTK_CONV(s) s.c_str()
-    #define wxGTK_CONV_BACK(s) s
-#endif
-
-// ----------------------------------------------------------------------------
-// we maintain a hash table which contains the mapping from Widget to wxWindow
-// corresponding to the window for this widget
-// ----------------------------------------------------------------------------
-
-WX_DECLARE_HASH_MAP(Window, wxWindow *, wxIntegerHash, wxIntegerEqual, wxWindowHash);
-
-// these hashes are defined in app.cpp
-extern wxWindowHash *wxWidgetHashTable;
-extern wxWindowHash *wxClientWidgetHashTable;
-
-extern void wxDeleteWindowFromTable(Window w);
-extern wxWindow *wxGetWindowFromTable(Window w);
-extern bool wxAddWindowToTable(Window w, wxWindow *win);
-
-extern void wxDeleteClientWindowFromTable(Window w);
-extern wxWindow *wxGetClientWindowFromTable(Window w);
-extern bool wxAddClientWindowToTable(Window w, wxWindow *win);
-
-// ----------------------------------------------------------------------------
-// TranslateXXXEvent() functions - translate X event to wxWindow one
-// ----------------------------------------------------------------------------
-extern bool wxTranslateMouseEvent(wxMouseEvent& wxevent, wxWindow *win, Window window, XEvent *xevent);
-extern bool wxTranslateKeyEvent(wxKeyEvent& wxevent, wxWindow *win, Window window, XEvent *xevent, bool isAscii = FALSE);
-
-extern Window wxGetWindowParent(Window window);
-
-// Set the window manager decorations according to the
-// given wxWidgets style
-bool wxSetWMDecorations(Window w, long style);
-bool wxMWMIsRunning(Window w);
-
-#endif
-// _WX_PRIVATE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/private/wrapxkb.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/private/wrapxkb.h
deleted file mode 100644
index d13100e7dc..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/private/wrapxkb.h
+++ /dev/null
@@ -1,24 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/private/wrapxkb.h
-// Purpose:     Private header wrapping X11/XKBlib.h inclusion.
-// Author:      Vadim Zeitlin
-// Created:     2012-05-07
-// Copyright:   (c) 2012 Vadim Zeitlin <vadim@wxwidgets.org>
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _X11_PRIVATE_WRAPXKB_H_
-#define _X11_PRIVATE_WRAPXKB_H_
-
-#ifdef HAVE_X11_XKBLIB_H
-    /* under HP-UX and Solaris 2.6, at least, XKBlib.h defines structures with
-     * field named "explicit" - which is, of course, an error for a C++
-     * compiler. To be on the safe side, just redefine it everywhere. */
-    #define explicit __wx_explicit
-
-    #include <X11/XKBlib.h>
-
-    #undef explicit
-#endif // HAVE_X11_XKBLIB_H
-
-#endif // _X11_PRIVATE_WRAPXKB_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/privx.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/privx.h
deleted file mode 100644
index c4de8021ea..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/privx.h
+++ /dev/null
@@ -1,169 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/privx.h
-// Purpose:     Private declarations common to X11 and Motif ports
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_PRIVX_H_
-#define _WX_PRIVX_H_
-
-#include "wx/defs.h"
-#include "wx/utils.h"
-#include "wx/colour.h"
-
-#if defined( __cplusplus ) && defined( __VMS )
-#pragma message disable nosimpint
-#endif
-#include "X11/Xlib.h"
-#include "X11/Xatom.h"
-#include "X11/Xutil.h"
-#if defined( __cplusplus ) && defined( __VMS )
-#pragma message enable nosimpint
-#endif
-
-class WXDLLIMPEXP_FWD_CORE wxMouseEvent;
-class WXDLLIMPEXP_FWD_CORE wxKeyEvent;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLIMPEXP_FWD_CORE wxRegion;
-
-// ----------------------------------------------------------------------------
-// key events related functions
-// ----------------------------------------------------------------------------
-
-WXPixel wxGetBestMatchingPixel(Display *display, XColor *desiredColor, Colormap cmap);
-Pixmap XCreateInsensitivePixmap( Display *display, Pixmap pixmap );
-
-extern XColor g_itemColors[];
-extern int wxComputeColours (Display *display, const wxColour * back, const wxColour * fore);
-
-// For convenience
-inline Display* wxGlobalDisplay() { return (Display*) wxGetDisplay(); }
-
-#define wxMAX_RGB           0xff
-#define wxMAX_SV            1000
-#define wxSIGN(x)           ((x < 0) ? -x : x)
-#define wxH_WEIGHT          4
-#define wxS_WEIGHT          1
-#define wxV_WEIGHT          2
-
-typedef struct wx_hsv {
-                        int h,s,v;
-                      } wxHSV;
-
-#define wxMax3(x,y,z) ((x > y) ? ((x > z) ? x : z) : ((y > z) ? y : z))
-#define wxMin3(x,y,z) ((x < y) ? ((x < z) ? x : z) : ((y < z) ? y : z))
-
-void wxHSVToXColor(wxHSV *hsv,XColor *xcolor);
-void wxXColorToHSV(wxHSV *hsv,XColor *xcolor);
-void wxAllocNearestColor(Display *display,Colormap colormap,XColor *xcolor);
-void wxAllocColor(Display *display,Colormap colormap,XColor *xcolor);
-
-// For debugging
-wxString wxGetXEventName(XEvent& event);
-
-#if wxUSE_NANOX
-#define XEventGetWindow(event) event->general.wid
-#define XEventGetType(event) event->general.type
-#define XConfigureEventGetX(event) ((int) event->update.x)
-#define XConfigureEventGetY(event) ((int) event->update.y)
-#define XConfigureEventGetWidth(event) ((int) event->update.width)
-#define XConfigureEventGetHeight(event) ((int) event->update.height)
-#define XExposeEventGetX(event) event->exposure.x
-#define XExposeEventGetY(event) event->exposure.y
-#define XExposeEventGetWidth(event) event->exposure.width
-#define XExposeEventGetHeight(event) event->exposure.height
-#define XButtonEventGetTime(event) (wxGetLocalTime())
-#define XButtonEventLChanged(event) (event->button.changebuttons & GR_BUTTON_L)
-#define XButtonEventMChanged(event) (event->button.changebuttons & GR_BUTTON_M)
-#define XButtonEventRChanged(event) (event->button.changebuttons & GR_BUTTON_R)
-#define XButtonEventLIsDown(x) ((x)->button.buttons & GR_BUTTON_L)
-#define XButtonEventMIsDown(x) ((x)->button.buttons & GR_BUTTON_M)
-#define XButtonEventRIsDown(x) ((x)->button.buttons & GR_BUTTON_R)
-#define XButtonEventShiftIsDown(x) (x->button.modifiers & MWKMOD_SHIFT)
-#define XButtonEventCtrlIsDown(x) (x->button.modifiers & MWKMOD_CTRL)
-#define XButtonEventAltIsDown(x) (x->button.modifiers & MWKMOD_ALT)
-#define XButtonEventMetaIsDown(x) (x->button.modifiers & MWKMOD_META)
-#define XButtonEventGetX(event) (event->button.x)
-#define XButtonEventGetY(event) (event->button.y)
-#define XKeyEventGetTime(event) (wxGetLocalTime())
-#define XKeyEventGetX(event) (event->keystroke.x)
-#define XKeyEventGetY(event) (event->keystroke.y)
-#define XKeyEventShiftIsDown(x) (x->keystroke.modifiers & MWKMOD_SHIFT)
-#define XKeyEventCtrlIsDown(x) (x->keystroke.modifiers & MWKMOD_CTRL)
-#define XKeyEventAltIsDown(x) (x->keystroke.modifiers & MWKMOD_ALT)
-#define XKeyEventMetaIsDown(x) (x->keystroke.modifiers & MWKMOD_META)
-#define XFontStructGetAscent(f) f->info.baseline
-
-#else
-
-#define XEventGetWindow(event) event->xany.window
-#define XEventGetType(event) event->xany.type
-#define XConfigureEventGetX(event) event->xconfigure.x
-#define XConfigureEventGetY(event) event->xconfigure.y
-#define XConfigureEventGetWidth(event) event->xconfigure.width
-#define XConfigureEventGetHeight(event) event->xconfigure.height
-#define XExposeEventGetX(event) event->xexpose.x
-#define XExposeEventGetY(event) event->xexpose.y
-#define XExposeEventGetWidth(event) event->xexpose.width
-#define XExposeEventGetHeight(event) event->xexpose.height
-#define XButtonEventGetTime(event) (event->xbutton.time)
-#define XButtonEventLChanged(event) (event->xbutton.button == Button1)
-#define XButtonEventMChanged(event) (event->xbutton.button == Button2)
-#define XButtonEventRChanged(event) (event->xbutton.button == Button3)
-#define XButtonEventLIsDown(x) ((x)->xbutton.state & Button1Mask)
-#define XButtonEventMIsDown(x) ((x)->xbutton.state & Button2Mask)
-#define XButtonEventRIsDown(x) ((x)->xbutton.state & Button3Mask)
-#define XButtonEventShiftIsDown(x) (x->xbutton.state & ShiftMask)
-#define XButtonEventCtrlIsDown(x) (x->xbutton.state & ControlMask)
-#define XButtonEventAltIsDown(x) (x->xbutton.state & Mod3Mask)
-#define XButtonEventMetaIsDown(x) (x->xbutton.state & Mod1Mask)
-#define XButtonEventGetX(event) (event->xbutton.x)
-#define XButtonEventGetY(event) (event->xbutton.y)
-#define XKeyEventGetTime(event) (event->xkey.time)
-#define XKeyEventShiftIsDown(x) (x->xkey.state & ShiftMask)
-#define XKeyEventCtrlIsDown(x) (x->xkey.state & ControlMask)
-#define XKeyEventAltIsDown(x) (x->xkey.state & Mod3Mask)
-#define XKeyEventMetaIsDown(x) (x->xkey.state & Mod1Mask)
-#define XKeyEventGetX(event) (event->xkey.x)
-#define XKeyEventGetY(event) (event->xkey.y)
-#define XFontStructGetAscent(f) f->ascent
-#endif
-
-// ----------------------------------------------------------------------------
-// Misc functions
-// ----------------------------------------------------------------------------
-
-bool wxDoSetShape( Display* xdisplay, Window xwindow, const wxRegion& region );
-
-class WXDLLIMPEXP_CORE wxXVisualInfo
-{
-public:
-    wxXVisualInfo();
-    ~wxXVisualInfo();
-    void Init( Display* dpy, XVisualInfo* visualInfo );
-
-    int                   m_visualType;   // TrueColor, DirectColor etc.
-    int                   m_visualDepth;
-    int                   m_visualColormapSize;
-    void                 *m_visualColormap;
-    int                   m_visualScreen;
-    unsigned long         m_visualRedMask;
-    unsigned long         m_visualGreenMask;
-    unsigned long         m_visualBlueMask;
-    int                   m_visualRedShift;
-    int                   m_visualGreenShift;
-    int                   m_visualBlueShift;
-    int                   m_visualRedPrec;
-    int                   m_visualGreenPrec;
-    int                   m_visualBluePrec;
-
-    unsigned char        *m_colorCube;
-};
-
-bool wxFillXVisualInfo( wxXVisualInfo* vi, Display* dpy );
-
-#endif // _WX_PRIVX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/region.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/region.h
deleted file mode 100644
index f01b876b4b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/region.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/region.h
-// Purpose:     wxRegion class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart, Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_REGION_H_
-#define _WX_REGION_H_
-
-#include "wx/list.h"
-
-// ----------------------------------------------------------------------------
-// wxRegion
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxRegion : public wxRegionBase
-{
-public:
-    wxRegion() { }
-
-    wxRegion( wxCoord x, wxCoord y, wxCoord w, wxCoord h )
-    {
-        InitRect(x, y, w, h);
-    }
-
-    wxRegion( const wxPoint& topLeft, const wxPoint& bottomRight )
-    {
-        InitRect(topLeft.x, topLeft.y,
-                 bottomRight.x - topLeft.x, bottomRight.y - topLeft.y);
-    }
-
-    wxRegion( const wxRect& rect )
-    {
-        InitRect(rect.x, rect.y, rect.width, rect.height);
-    }
-
-    wxRegion( size_t n, const wxPoint *points, wxPolygonFillMode fillStyle = wxODDEVEN_RULE );
-
-    wxRegion( const wxBitmap& bmp)
-    {
-        Union(bmp);
-    }
-    wxRegion( const wxBitmap& bmp,
-              const wxColour& transColour, int tolerance = 0)
-    {
-        Union(bmp, transColour, tolerance);
-    }
-
-    virtual ~wxRegion();
-
-    // wxRegionBase methods
-    virtual void Clear();
-    virtual bool IsEmpty() const;
-
-public:
-    WXRegion *GetX11Region() const;
-
-protected:
-    virtual wxGDIRefData *CreateGDIRefData() const;
-    virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const;
-
-    // wxRegionBase pure virtuals
-    virtual bool DoIsEqual(const wxRegion& region) const;
-    virtual bool DoGetBox(wxCoord& x, wxCoord& y, wxCoord& w, wxCoord& h) const;
-    virtual wxRegionContain DoContainsPoint(wxCoord x, wxCoord y) const;
-    virtual wxRegionContain DoContainsRect(const wxRect& rect) const;
-
-    virtual bool DoOffset(wxCoord x, wxCoord y);
-    virtual bool DoUnionWithRect(const wxRect& rect);
-    virtual bool DoUnionWithRegion(const wxRegion& region);
-    virtual bool DoIntersect(const wxRegion& region);
-    virtual bool DoSubtract(const wxRegion& region);
-    virtual bool DoXor(const wxRegion& region);
-
-    // common part of ctors for a rectangle region
-    void InitRect(wxCoord x, wxCoord y, wxCoord w, wxCoord h);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxRegion)
-};
-
-// ----------------------------------------------------------------------------
-// wxRegionIterator: decomposes a region into rectangles
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxRegionIterator: public wxObject
-{
-public:
-    wxRegionIterator();
-    wxRegionIterator(const wxRegion& region);
-
-    void Reset() { m_current = 0u; }
-    void Reset(const wxRegion& region);
-
-    operator bool () const;
-    bool HaveRects() const;
-
-    void operator ++ ();
-    void operator ++ (int);
-
-    wxCoord GetX() const;
-    wxCoord GetY() const;
-    wxCoord GetW() const;
-    wxCoord GetWidth() const { return GetW(); }
-    wxCoord GetH() const;
-    wxCoord GetHeight() const { return GetH(); }
-    wxRect GetRect() const;
-
-private:
-    size_t   m_current;
-    wxRegion m_region;
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxRegionIterator)
-};
-
-#endif
-// _WX_REGION_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/reparent.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/reparent.h
deleted file mode 100644
index 43a1b8d34b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/reparent.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/reparent.h
-// Purpose:     Reparenting classes
-// Author:      Julian Smart
-// Modified by:
-// Created:     2002-03-09
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_REPARENT_H_
-#define _WX_REPARENT_H_
-
-#include "wx/window.h"
-
-/*
- * This class helps to reparent a specific window
- */
-
-class WXDLLIMPEXP_FWD_CORE wxAdoptedWindow;
-class WXDLLIMPEXP_CORE wxReparenter: public wxObject
-{
-public:
-    wxReparenter() {}
-
-    // We assume that toReparent has had its X window set
-    // appropriately. toReparent is typically a wxAdoptedWindow.
-    bool Reparent(wxWindow* newParent, wxAdoptedWindow* toReparent);
-
-    // Wait for an appropriate window to be created.
-    // If exactMatch is FALSE, a substring match is OK.
-    // If windowName is empty, then wait for the next overrideRedirect window.
-    bool WaitAndReparent(wxWindow* newParent, wxAdoptedWindow* toReparent,
-                         const wxString& windowName = wxEmptyString,
-                         bool exactMatch = TRUE);
-
-protected:
-
-    bool ProcessXEvent(WXEvent* event);
-    WXWindow FindAClientWindow(WXWindow window, const wxString& name);
-
-    static bool sm_done;
-    static wxAdoptedWindow* sm_toReparent;
-    static wxWindow* sm_newParent;
-    static wxString  sm_name;
-    static bool      sm_exactMatch;
-};
-
-/*
- * A window that adopts its handle from the native
- * toolkit. It has no parent until reparented.
- */
-
-class WXDLLIMPEXP_CORE wxAdoptedWindow: public wxWindow
-{
-  public:
-    wxAdoptedWindow();
-    wxAdoptedWindow(WXWindow window);
-    virtual ~wxAdoptedWindow();
-
-    void SetHandle(WXWindow window) { m_mainWindow = window; m_clientWindow = window; }
-    WXWindow GetHandle() const { return X11GetMainWindow(); }
-};
-
-#endif
-// _WX_REPARENT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/textctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/textctrl.h
deleted file mode 100644
index 5ed6683076..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/textctrl.h
+++ /dev/null
@@ -1,385 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/textctrl.h
-// Purpose:
-// Author:      Robert Roebling
-// Created:     01/02/97
-// Copyright:   (c) 1998 Robert Roebling
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __X11TEXTCTRLH__
-#define __X11TEXTCTRLH__
-
-// Set to 1 to use wxUniv's implementation, 0
-// to use wxX11's.
-#define wxUSE_UNIV_TEXTCTRL 1
-
-#if wxUSE_UNIV_TEXTCTRL
-#include "wx/univ/textctrl.h"
-#else
-
-#include "wx/scrolwin.h"
-#include "wx/arrstr.h"
-
-//-----------------------------------------------------------------------------
-// classes
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_FWD_CORE wxTextCtrl;
-
-//-----------------------------------------------------------------------------
-// helpers
-//-----------------------------------------------------------------------------
-
-enum wxSourceUndo
-{
-    wxSOURCE_UNDO_LINE,
-    wxSOURCE_UNDO_ENTER,
-    wxSOURCE_UNDO_BACK,
-    wxSOURCE_UNDO_INSERT_LINE,
-    wxSOURCE_UNDO_DELETE,
-    wxSOURCE_UNDO_PASTE
-};
-
-class wxSourceUndoStep: public wxObject
-{
-public:
-    wxSourceUndoStep( wxSourceUndo type, int y1, int y2, wxTextCtrl *owner );
-
-    void Undo();
-
-    wxSourceUndo    m_type;
-    int             m_y1;
-    int             m_y2;
-    int             m_cursorX;
-    int             m_cursorY;
-    wxTextCtrl     *m_owner;
-    wxString        m_text;
-    wxArrayString   m_lines;
-};
-
-class wxSourceLine
-{
-public:
-    wxSourceLine( const wxString &text = wxEmptyString )
-    {
-        m_text = text;
-    }
-
-    wxString       m_text;
-};
-
-WX_DECLARE_OBJARRAY(wxSourceLine, wxSourceLineArray);
-
-enum wxSourceLanguage
-{
-    wxSOURCE_LANG_NONE,
-    wxSOURCE_LANG_CPP,
-    wxSOURCE_LANG_PERL,
-    wxSOURCE_LANG_PYTHON
-};
-
-//-----------------------------------------------------------------------------
-// wxTextCtrl
-//-----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxTextCtrl: public wxTextCtrlBase, public wxScrollHelper
-{
-public:
-    wxTextCtrl() { Init(); }
-    wxTextCtrl(wxWindow *parent,
-               wxWindowID id,
-               const wxString &value = wxEmptyString,
-               const wxPoint &pos = wxDefaultPosition,
-               const wxSize &size = wxDefaultSize,
-               long style = 0,
-               const wxValidator& validator = wxDefaultValidator,
-               const wxString &name = wxTextCtrlNameStr);
-    virtual ~wxTextCtrl();
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString &value = wxEmptyString,
-                const wxPoint &pos = wxDefaultPosition,
-                const wxSize &size = wxDefaultSize,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString &name = wxTextCtrlNameStr);
-
-    // required for scrolling with wxScrollHelper
-    // ------------------------------------------
-
-    virtual void PrepareDC(wxDC& dc) { DoPrepareDC(dc); }
-
-    // implement base class pure virtuals
-    // ----------------------------------
-
-    virtual void ChangeValue(const wxString &value);
-
-    virtual int GetLineLength(long lineNo) const;
-    virtual wxString GetLineText(long lineNo) const;
-    virtual int GetNumberOfLines() const;
-
-    virtual bool IsModified() const;
-    virtual bool IsEditable() const;
-
-    // more readable flag testing methods
-    // ----------------------------------
-
-    bool IsPassword() const { return (GetWindowStyle() & wxTE_PASSWORD) != 0; }
-    bool WrapLines() const { return false; }
-
-    // If the return values from and to are the same, there is no selection.
-    virtual void GetSelection(long* from, long* to) const;
-
-    // operations
-    // ----------
-
-    // editing
-    virtual void Clear();
-    virtual void Replace(long from, long to, const wxString& value);
-    virtual void Remove(long from, long to);
-
-    // clears the dirty flag
-    virtual void DiscardEdits();
-
-    virtual void SetMaxLength(unsigned long len);
-
-    // writing text inserts it at the current position, appending always
-    // inserts it at the end
-    virtual void WriteText(const wxString& text);
-    virtual void AppendText(const wxString& text);
-
-    // apply text attribute to the range of text (only works with richedit
-    // controls)
-    virtual bool SetStyle(long start, long end, const wxTextAttr& style);
-
-    // translate between the position (which is just an index in the text ctrl
-    // considering all its contents as a single strings) and (x, y) coordinates
-    // which represent column and line.
-    virtual long XYToPosition(long x, long y) const;
-    virtual bool PositionToXY(long pos, long *x, long *y) const;
-
-    virtual void ShowPosition(long pos);
-
-    // Clipboard operations
-    virtual void Copy();
-    virtual void Cut();
-    virtual void Paste();
-
-    // Undo/redo
-    virtual void Undo();
-    virtual void Redo() {}
-
-    virtual bool CanUndo() const    { return (m_undos.GetCount() > 0); }
-    virtual bool CanRedo() const    { return false; }
-
-    // Insertion point
-    virtual void SetInsertionPoint(long pos);
-    virtual void SetInsertionPointEnd();
-    virtual long GetInsertionPoint() const;
-    virtual wxTextPos GetLastPosition() const;
-
-    virtual void SetSelection(long from, long to);
-    virtual void SetEditable(bool editable);
-
-    virtual bool Enable( bool enable = true );
-
-    void OnCut(wxCommandEvent& event);
-    void OnCopy(wxCommandEvent& event);
-    void OnPaste(wxCommandEvent& event);
-    void OnUndo(wxCommandEvent& event);
-    void OnRedo(wxCommandEvent& event);
-
-    void OnUpdateCut(wxUpdateUIEvent& event);
-    void OnUpdateCopy(wxUpdateUIEvent& event);
-    void OnUpdatePaste(wxUpdateUIEvent& event);
-    void OnUpdateUndo(wxUpdateUIEvent& event);
-    void OnUpdateRedo(wxUpdateUIEvent& event);
-
-    bool SetFont(const wxFont& font);
-    bool SetForegroundColour(const wxColour& colour);
-    bool SetBackgroundColour(const wxColour& colour);
-
-    void SetModified() { m_modified = true; }
-
-    // textctrl specific scrolling
-    virtual bool ScrollLines(int lines);
-    virtual bool ScrollPages(int pages);
-
-    // not part of the wxTextCtrl API from now on..
-
-    void SetLanguage( wxSourceLanguage lang = wxSOURCE_LANG_NONE );
-
-    void Delete();
-    void DeleteLine();
-
-    void Indent();
-    void Unindent();
-
-    bool HasSelection();
-    void ClearSelection();
-
-    int GetCursorX()                        { return m_cursorX; }
-    int GetCursorY()                        { return m_cursorY; }
-    bool IsModified()                       { return m_modified; }
-    bool OverwriteMode()                    { return m_overwrite; }
-
-    // implementation from now on...
-
-    int PosToPixel( int line, int pos );
-    int PixelToPos( int line, int pixel );
-
-    void SearchForBrackets();
-
-    void DoChar( char c );
-    void DoBack();
-    void DoDelete();
-    void DoReturn();
-    void DoDClick();
-
-    wxString GetNextToken( wxString &line, size_t &pos );
-
-    void DrawLinePart( wxDC &dc, int x, int y, const wxString &toDraw, const wxString &origin, const wxColour &colour);
-    void DrawLine( wxDC &dc, int x, int y, const wxString &line, int lineNum );
-    void OnPaint( wxPaintEvent &event );
-    void OnEraseBackground( wxEraseEvent &event );
-    void OnMouse( wxMouseEvent &event );
-    void OnChar( wxKeyEvent &event );
-    void OnSetFocus( wxFocusEvent& event );
-    void OnKillFocus( wxFocusEvent& event );
-
-    void OnInternalIdle();
-    void RefreshLine( int n );
-    void RefreshDown( int n );
-    void MoveCursor( int new_x, int new_y, bool shift = false, bool centre = false );
-    void MyAdjustScrollbars();
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    virtual wxSize DoGetBestSize() const;
-
-    virtual void DoSetValue(const wxString& value, int flags = 0);
-
-    friend class wxSourceUndoStep;
-
-    wxSourceLineArray  m_lines;
-
-    wxFont             m_sourceFont;
-    wxColour           m_sourceColour;
-    wxColour           m_commentColour;
-    wxColour           m_stringColour;
-
-    int                m_cursorX;
-    int                m_cursorY;
-
-    int                m_selStartX,m_selStartY;
-    int                m_selEndX,m_selEndY;
-
-    int                m_lineHeight;
-    int                m_charWidth;
-
-    int                m_longestLine;
-
-    bool               m_overwrite;
-    bool               m_modified;
-    bool               m_editable;
-    bool               m_ignoreInput;
-
-    wxArrayString      m_keywords;
-    wxColour           m_keywordColour;
-
-    wxArrayString      m_defines;
-    wxColour           m_defineColour;
-
-    wxArrayString      m_variables;
-    wxColour           m_variableColour;
-
-    wxSourceLanguage   m_lang;
-
-    wxList             m_undos;
-
-    bool               m_capturing;
-
-    int                m_bracketX;
-    int                m_bracketY;
-
-private:
-    DECLARE_EVENT_TABLE()
-    DECLARE_DYNAMIC_CLASS(wxTextCtrl);
-};
-
-//-----------------------------------------------------------------------------
-// this is superfluous here but helps to compile
-//-----------------------------------------------------------------------------
-
-// cursor movement and also selection and delete operations
-#define wxACTION_TEXT_GOTO          wxT("goto")  // to pos in numArg
-#define wxACTION_TEXT_FIRST         wxT("first") // go to pos 0
-#define wxACTION_TEXT_LAST          wxT("last")  // go to last pos
-#define wxACTION_TEXT_HOME          wxT("home")
-#define wxACTION_TEXT_END           wxT("end")
-#define wxACTION_TEXT_LEFT          wxT("left")
-#define wxACTION_TEXT_RIGHT         wxT("right")
-#define wxACTION_TEXT_UP            wxT("up")
-#define wxACTION_TEXT_DOWN          wxT("down")
-#define wxACTION_TEXT_WORD_LEFT     wxT("wordleft")
-#define wxACTION_TEXT_WORD_RIGHT    wxT("wordright")
-#define wxACTION_TEXT_PAGE_UP       wxT("pageup")
-#define wxACTION_TEXT_PAGE_DOWN     wxT("pagedown")
-
-// clipboard operations
-#define wxACTION_TEXT_COPY          wxT("copy")
-#define wxACTION_TEXT_CUT           wxT("cut")
-#define wxACTION_TEXT_PASTE         wxT("paste")
-
-// insert text at the cursor position: the text is in strArg of PerformAction
-#define wxACTION_TEXT_INSERT        wxT("insert")
-
-// if the action starts with either of these prefixes and the rest of the
-// string is one of the movement commands, it means to select/delete text from
-// the current cursor position to the new one
-#define wxACTION_TEXT_PREFIX_SEL    wxT("sel")
-#define wxACTION_TEXT_PREFIX_DEL    wxT("del")
-
-// mouse selection
-#define wxACTION_TEXT_ANCHOR_SEL    wxT("anchorsel")
-#define wxACTION_TEXT_EXTEND_SEL    wxT("extendsel")
-#define wxACTION_TEXT_SEL_WORD      wxT("wordsel")
-#define wxACTION_TEXT_SEL_LINE      wxT("linesel")
-
-// undo or redo
-#define wxACTION_TEXT_UNDO          wxT("undo")
-#define wxACTION_TEXT_REDO          wxT("redo")
-
-// ----------------------------------------------------------------------------
-// wxTextCtrl types
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxStdTextCtrlInputHandler : public wxStdInputHandler
-{
-public:
-    wxStdTextCtrlInputHandler(wxInputHandler *inphand) : wxStdInputHandler(inphand) {}
-
-    virtual bool HandleKey(wxInputConsumer *consumer,
-                           const wxKeyEvent& event,
-                           bool pressed) { return false; }
-    virtual bool HandleMouse(wxInputConsumer *consumer, const wxMouseEvent& event) { return false; }
-    virtual bool HandleMouseMove(wxInputConsumer *consumer, const wxMouseEvent& event) { return false; }
-    virtual bool HandleFocus(wxInputConsumer *consumer, const wxFocusEvent& event) { return false; }
-
-protected:
-    // get the position of the mouse click
-    static wxTextPos HitTest(const wxTextCtrl *text, const wxPoint& pos) { return 0; }
-
-    // capture data
-    wxTextCtrl *m_winCapture;
-};
-
-#endif
-// wxUSE_UNIV_TEXTCTRL
-
-#endif // __X11TEXTCTRLH__
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/toplevel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/toplevel.h
deleted file mode 100644
index 0eec73778b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/toplevel.h
+++ /dev/null
@@ -1,116 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/toplevel.h
-// Purpose:     wxTopLevelWindowX11 is the X11 implementation of wxTLW
-// Author:      Julian Smart
-// Modified by:
-// Created:     20.09.01
-// Copyright:   (c) 2002 Julian Smart
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_X11_TOPLEVEL_H_
-#define _WX_X11_TOPLEVEL_H_
-
-// ----------------------------------------------------------------------------
-// wxTopLevelWindowX11
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxTopLevelWindowX11 : public wxTopLevelWindowBase
-{
-public:
-    // constructors and such
-    wxTopLevelWindowX11() { Init(); }
-
-    wxTopLevelWindowX11(wxWindow *parent,
-                        wxWindowID id,
-                        const wxString& title,
-                        const wxPoint& pos = wxDefaultPosition,
-                        const wxSize& size = wxDefaultSize,
-                        long style = wxDEFAULT_FRAME_STYLE,
-                        const wxString& name = wxFrameNameStr)
-    {
-        Init();
-
-        (void)Create(parent, id, title, pos, size, style, name);
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& title,
-                const wxPoint& pos = wxDefaultPosition,
-                const wxSize& size = wxDefaultSize,
-                long style = wxDEFAULT_FRAME_STYLE,
-                const wxString& name = wxFrameNameStr);
-
-    virtual ~wxTopLevelWindowX11();
-
-    // implement base class pure virtuals
-    virtual void Maximize(bool maximize = true);
-    virtual bool IsMaximized() const;
-    virtual void Iconize(bool iconize = true);
-    virtual bool IsIconized() const;
-    virtual void SetIcons(const wxIconBundle& icons);
-    virtual void Restore();
-
-    virtual bool Show( bool show = true );
-
-    virtual bool ShowFullScreen( bool show, long style = wxFULLSCREEN_ALL );
-    virtual bool IsFullScreen() const { return m_fsIsShowing; }
-
-    virtual void SetTitle( const wxString& title);
-    virtual wxString GetTitle() const;
-
-    // implementation
-    void SetNeedResizeInIdle( bool set = true )
-        { m_needResizeInIdle = set; }
-    void SetConfigureGeometry( int x, int y, int width, int height )
-        { m_x = x; m_y = y; m_width = width; m_height = height; }
-
-    virtual bool SetShape(const wxRegion& region);
-
-    // For implementation purposes - sometimes decorations make the
-    // client area smaller
-    virtual wxPoint GetClientAreaOrigin() const;
-
-    virtual void OnInternalIdle();
-
-protected:
-    // common part of all ctors
-    void Init();
-
-    // set the icon for the window
-    void DoSetIcon( const wxIcon& icon );
-
-    // For implementation of delayed resize events
-    bool m_needResizeInIdle;
-
-    virtual void DoGetClientSize( int *width, int *height ) const;
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual void DoSetClientSize(int width, int height);
-    virtual void DoSetSize(int x, int y,
-        int width, int height,
-        int sizeFlags = wxSIZE_AUTO);
-    virtual void DoGetPosition( int *x, int *y ) const;
-
-    // Is the frame currently iconized?
-    bool m_iconized;
-
-    // Should the frame be maximized when it will be shown? set by Maximize()
-    // when it is called while the frame is hidden
-    bool m_maximizeOnShow;
-
-    // Data to save/restore when calling ShowFullScreen
-    long                  m_fsStyle;   // Passed to ShowFullScreen
-    wxRect                m_fsOldSize;
-    bool                  m_fsIsMaximized;
-    bool                  m_fsIsShowing;
-    wxString              m_title;
-
-    // Geometry
-    int                   m_x,m_y,m_width,m_height;
-};
-
-// list of all frames and modeless dialogs
-//extern WXDLLIMPEXP_DATA_CORE(wxWindowList) wxModelessWindows;
-
-#endif // _WX_X11_TOPLEVEL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/window.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/window.h
deleted file mode 100644
index b17c53eadf..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/x11/window.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/x11/window.h
-// Purpose:     wxWindow class
-// Author:      Julian Smart
-// Modified by:
-// Created:     17/09/98
-// Copyright:   (c) Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_WINDOW_H_
-#define _WX_WINDOW_H_
-
-#include "wx/region.h"
-
-// ----------------------------------------------------------------------------
-// wxWindow class for Motif - see also wxWindowBase
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxWindowX11 : public wxWindowBase
-{
-    friend class WXDLLIMPEXP_FWD_CORE wxDC;
-    friend class WXDLLIMPEXP_FWD_CORE wxWindowDC;
-
-public:
-    wxWindowX11() { Init(); }
-
-    wxWindowX11(wxWindow *parent,
-        wxWindowID id,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxPanelNameStr)
-    {
-        Init();
-        Create(parent, id, pos, size, style, name);
-    }
-
-    virtual ~wxWindowX11();
-
-    bool Create(wxWindow *parent,
-        wxWindowID id,
-        const wxPoint& pos = wxDefaultPosition,
-        const wxSize& size = wxDefaultSize,
-        long style = 0,
-        const wxString& name = wxPanelNameStr);
-
-    virtual void Raise();
-    virtual void Lower();
-
-    virtual void SetLabel(const wxString& label);
-    virtual wxString GetLabel() const;
-
-    virtual bool Show( bool show = true );
-    virtual bool Enable( bool enable = true );
-
-    virtual void SetFocus();
-
-    virtual void WarpPointer(int x, int y);
-
-    virtual void Refresh( bool eraseBackground = true,
-                          const wxRect *rect = (const wxRect *) NULL );
-    virtual void Update();
-
-    virtual bool SetBackgroundColour( const wxColour &colour );
-    virtual bool SetForegroundColour( const wxColour &colour );
-
-    virtual bool SetCursor( const wxCursor &cursor );
-    virtual bool SetFont( const wxFont &font );
-
-    virtual int GetCharHeight() const;
-    virtual int GetCharWidth() const;
-
-    virtual void ScrollWindow( int dx, int dy, const wxRect* rect = NULL );
-
-#if wxUSE_DRAG_AND_DROP
-    virtual void SetDropTarget( wxDropTarget *dropTarget );
-#endif // wxUSE_DRAG_AND_DROP
-
-    // Accept files for dragging
-    virtual void DragAcceptFiles(bool accept);
-
-    // Get the unique identifier of a window
-    virtual WXWindow GetHandle() const { return X11GetMainWindow(); }
-
-    // implementation from now on
-    // --------------------------
-
-    // accessors
-    // ---------
-
-    // Get main X11 window
-    virtual WXWindow X11GetMainWindow() const;
-
-    // Get X11 window representing the client area
-    virtual WXWindow GetClientAreaWindow() const;
-
-    void SetLastClick(int button, long timestamp)
-        { m_lastButton = button; m_lastTS = timestamp; }
-
-    int GetLastClickedButton() const { return m_lastButton; }
-    long GetLastClickTime() const { return m_lastTS; }
-
-    // Gives window a chance to do something in response to a size message, e.g.
-    // arrange status bar, toolbar etc.
-    virtual bool PreResize();
-
-    // Generates paint events from m_updateRegion
-    void SendPaintEvents();
-
-    // Generates paint events from flag
-    void SendNcPaintEvents();
-
-    // Generates erase events from m_clearRegion
-    void SendEraseEvents();
-
-    // Clip to paint region?
-    bool GetClipPaintRegion() { return m_clipPaintRegion; }
-
-    // Return clear region
-    wxRegion &GetClearRegion() { return m_clearRegion; }
-
-    void NeedUpdateNcAreaInIdle( bool update = true ) { m_updateNcArea = update; }
-
-    // Inserting into main window instead of client
-    // window. This is mostly for a wxWindow's own
-    // scrollbars.
-    void SetInsertIntoMain( bool insert = true ) { m_insertIntoMain = insert; }
-    bool GetInsertIntoMain() { return m_insertIntoMain; }
-
-    // sets the fore/background colour for the given widget
-    static void DoChangeForegroundColour(WXWindow widget, wxColour& foregroundColour);
-    static void DoChangeBackgroundColour(WXWindow widget, wxColour& backgroundColour, bool changeArmColour = false);
-
-    // I don't want users to override what's done in idle so everything that
-    // has to be done in idle time in order for wxX11 to work is done in
-    // OnInternalIdle
-    virtual void OnInternalIdle();
-
-protected:
-    // Responds to colour changes: passes event on to children.
-    void OnSysColourChanged(wxSysColourChangedEvent& event);
-
-    // For double-click detection
-    long   m_lastTS;         // last timestamp
-    int    m_lastButton;     // last pressed button
-
-protected:
-    WXWindow              m_mainWindow;
-    WXWindow              m_clientWindow;
-    bool                  m_insertIntoMain;
-
-    bool                  m_winCaptured;
-    wxRegion              m_clearRegion;
-    bool                  m_clipPaintRegion;
-    bool                  m_updateNcArea;
-    bool                  m_needsInputFocus; // Input focus set in OnIdle
-
-    // implement the base class pure virtuals
-    virtual void DoGetTextExtent(const wxString& string,
-                                 int *x, int *y,
-                                 int *descent = NULL,
-                                 int *externalLeading = NULL,
-                                 const wxFont *font = NULL) const;
-    virtual void DoClientToScreen( int *x, int *y ) const;
-    virtual void DoScreenToClient( int *x, int *y ) const;
-    virtual void DoGetPosition( int *x, int *y ) const;
-    virtual void DoGetSize( int *width, int *height ) const;
-    virtual void DoGetClientSize( int *width, int *height ) const;
-    virtual void DoSetSize(int x, int y,
-        int width, int height,
-        int sizeFlags = wxSIZE_AUTO);
-    virtual void DoSetClientSize(int width, int height);
-    virtual void DoMoveWindow(int x, int y, int width, int height);
-    virtual void DoSetSizeHints(int minW, int minH,
-        int maxW, int maxH,
-        int incW, int incH);
-    virtual void DoCaptureMouse();
-    virtual void DoReleaseMouse();
-
-#if wxUSE_TOOLTIPS
-    virtual void DoSetToolTip( wxToolTip *tip );
-#endif // wxUSE_TOOLTIPS
-
-private:
-    // common part of all ctors
-    void Init();
-
-    DECLARE_DYNAMIC_CLASS(wxWindowX11)
-    wxDECLARE_NO_COPY_CLASS(wxWindowX11);
-    DECLARE_EVENT_TABLE()
-};
-
-// ----------------------------------------------------------------------------
-// A little class to switch off `size optimization' while an instance of the
-// object exists: this may be useful to temporarily disable the optimisation
-// which consists to do nothing when the new size is equal to the old size -
-// although quite useful usually to avoid flicker, sometimes it leads to
-// undesired effects.
-//
-// Usage: create an instance of this class on the stack to disable the size
-// optimisation, it will be reenabled as soon as the object goes out from scope.
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_CORE wxNoOptimize
-{
-public:
-    wxNoOptimize() { ms_count++; }
-    ~wxNoOptimize() { ms_count--; }
-
-    static bool CanOptimize() { return ms_count == 0; }
-
-protected:
-    static int ms_count;
-};
-
-#endif // _WX_WINDOW_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xml/xml.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xml/xml.h
deleted file mode 100644
index 6187e12c35..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xml/xml.h
+++ /dev/null
@@ -1,325 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xml/xml.h
-// Purpose:     wxXmlDocument - XML parser & data holder class
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifndef _WX_XML_H_
-#define _WX_XML_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_XML
-
-#include "wx/string.h"
-#include "wx/object.h"
-#include "wx/list.h"
-#include "wx/versioninfo.h"
-
-#ifdef WXMAKINGDLL_XML
-    #define WXDLLIMPEXP_XML WXEXPORT
-#elif defined(WXUSINGDLL)
-    #define WXDLLIMPEXP_XML WXIMPORT
-#else // not making nor using DLL
-    #define WXDLLIMPEXP_XML
-#endif
-
-class WXDLLIMPEXP_FWD_XML wxXmlNode;
-class WXDLLIMPEXP_FWD_XML wxXmlAttribute;
-class WXDLLIMPEXP_FWD_XML wxXmlDocument;
-class WXDLLIMPEXP_FWD_XML wxXmlIOHandler;
-class WXDLLIMPEXP_FWD_BASE wxInputStream;
-class WXDLLIMPEXP_FWD_BASE wxOutputStream;
-
-// Represents XML node type.
-enum wxXmlNodeType
-{
-    // note: values are synchronized with xmlElementType from libxml
-    wxXML_ELEMENT_NODE       =  1,
-    wxXML_ATTRIBUTE_NODE     =  2,
-    wxXML_TEXT_NODE          =  3,
-    wxXML_CDATA_SECTION_NODE =  4,
-    wxXML_ENTITY_REF_NODE    =  5,
-    wxXML_ENTITY_NODE        =  6,
-    wxXML_PI_NODE            =  7,
-    wxXML_COMMENT_NODE       =  8,
-    wxXML_DOCUMENT_NODE      =  9,
-    wxXML_DOCUMENT_TYPE_NODE = 10,
-    wxXML_DOCUMENT_FRAG_NODE = 11,
-    wxXML_NOTATION_NODE      = 12,
-    wxXML_HTML_DOCUMENT_NODE = 13
-};
-
-
-// Represents node property(ies).
-// Example: in <img src="hello.gif" id="3"/> "src" is property with value
-//          "hello.gif" and "id" is prop. with value "3".
-
-class WXDLLIMPEXP_XML wxXmlAttribute
-{
-public:
-    wxXmlAttribute() : m_next(NULL) {}
-    wxXmlAttribute(const wxString& name, const wxString& value,
-                  wxXmlAttribute *next = NULL)
-            : m_name(name), m_value(value), m_next(next) {}
-    virtual ~wxXmlAttribute() {}
-
-    const wxString& GetName() const { return m_name; }
-    const wxString& GetValue() const { return m_value; }
-    wxXmlAttribute *GetNext() const { return m_next; }
-
-    void SetName(const wxString& name) { m_name = name; }
-    void SetValue(const wxString& value) { m_value = value; }
-    void SetNext(wxXmlAttribute *next) { m_next = next; }
-
-private:
-    wxString m_name;
-    wxString m_value;
-    wxXmlAttribute *m_next;
-};
-
-#if WXWIN_COMPATIBILITY_2_8
-    // NB: #define is used instead of typedef so that forward declarations
-    //     continue to work
-    #define wxXmlProperty wxXmlAttribute
-#endif
-
-
-// Represents node in XML document. Node has name and may have content and
-// attributes. Most common node types are wxXML_TEXT_NODE (name and attributes
-// are irrelevant) and wxXML_ELEMENT_NODE (e.g. in <title>hi there is
-// element with name="title", irrelevant content and one child (wxXML_TEXT_NODE
-// with content="hi").
-//
-// If wxUSE_UNICODE is 0, all strings are encoded in the encoding given to Load
-// (default is UTF-8).
-
-class WXDLLIMPEXP_XML wxXmlNode
-{
-public:
-    wxXmlNode()
-        : m_attrs(NULL), m_parent(NULL), m_children(NULL), m_next(NULL),
-          m_lineNo(-1), m_noConversion(false)
-    {
-    }
-
-    wxXmlNode(wxXmlNode *parent, wxXmlNodeType type,
-              const wxString& name, const wxString& content = wxEmptyString,
-              wxXmlAttribute *attrs = NULL, wxXmlNode *next = NULL,
-              int lineNo = -1);
-
-    virtual ~wxXmlNode();
-
-    // copy ctor & operator=. Note that this does NOT copy siblings
-    // and parent pointer, i.e. m_parent and m_next will be NULL
-    // after using copy ctor and are never unmodified by operator=.
-    // On the other hand, it DOES copy children and attributes.
-    wxXmlNode(const wxXmlNode& node);
-    wxXmlNode& operator=(const wxXmlNode& node);
-
-    // user-friendly creation:
-    wxXmlNode(wxXmlNodeType type, const wxString& name,
-              const wxString& content = wxEmptyString,
-              int lineNo = -1);
-    virtual void AddChild(wxXmlNode *child);
-    virtual bool InsertChild(wxXmlNode *child, wxXmlNode *followingNode);
-    virtual bool InsertChildAfter(wxXmlNode *child, wxXmlNode *precedingNode);
-    virtual bool RemoveChild(wxXmlNode *child);
-    virtual void AddAttribute(const wxString& name, const wxString& value);
-    virtual bool DeleteAttribute(const wxString& name);
-
-    // access methods:
-    wxXmlNodeType GetType() const { return m_type; }
-    const wxString& GetName() const { return m_name; }
-    const wxString& GetContent() const { return m_content; }
-
-    bool IsWhitespaceOnly() const;
-    int GetDepth(wxXmlNode *grandparent = NULL) const;
-
-    // Gets node content from wxXML_ENTITY_NODE
-    // The problem is, content is represented as
-    // wxXML_ENTITY_NODE name="tag", content=""
-    //    |-- wxXML_TEXT_NODE or
-    //        wxXML_CDATA_SECTION_NODE name="" content="content"
-    wxString GetNodeContent() const;
-
-    wxXmlNode *GetParent() const { return m_parent; }
-    wxXmlNode *GetNext() const { return m_next; }
-    wxXmlNode *GetChildren() const { return m_children; }
-
-    wxXmlAttribute *GetAttributes() const { return m_attrs; }
-    bool GetAttribute(const wxString& attrName, wxString *value) const;
-    wxString GetAttribute(const wxString& attrName,
-                          const wxString& defaultVal = wxEmptyString) const;
-    bool HasAttribute(const wxString& attrName) const;
-
-    int GetLineNumber() const { return m_lineNo; }
-
-    void SetType(wxXmlNodeType type) { m_type = type; }
-    void SetName(const wxString& name) { m_name = name; }
-    void SetContent(const wxString& con) { m_content = con; }
-
-    void SetParent(wxXmlNode *parent) { m_parent = parent; }
-    void SetNext(wxXmlNode *next) { m_next = next; }
-    void SetChildren(wxXmlNode *child) { m_children = child; }
-
-    void SetAttributes(wxXmlAttribute *attr) { m_attrs = attr; }
-    virtual void AddAttribute(wxXmlAttribute *attr);
-
-    // If true, don't do encoding conversion to improve efficiency - node content is ACII text
-    bool GetNoConversion() const { return m_noConversion; }
-    void SetNoConversion(bool noconversion) { m_noConversion = noconversion; }
-
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED( inline wxXmlAttribute *GetProperties() const );
-    wxDEPRECATED( inline bool GetPropVal(const wxString& propName,
-                                         wxString *value) const );
-    wxDEPRECATED( inline wxString GetPropVal(const wxString& propName,
-                                             const wxString& defaultVal) const );
-    wxDEPRECATED( inline bool HasProp(const wxString& propName) const );
-
-    wxDEPRECATED( inline void SetProperties(wxXmlAttribute *prop) );
-#endif // WXWIN_COMPATIBILITY_2_8
-
-    // The following three functions are backward compatibility, but because
-    // they were virtual, we must make it possible to override them. This
-    // is done by calling e.g. AddProperty() from AddAttribute(), so we have
-    // to keep AddProperty() even if 2.8 compatibility is off. To prevent
-    // old code from compiling in that case, we make them private and
-    // non-virtual. (This can be removed when WXWIN_COMPATIBILITY_2_8 is
-    // removed, we'll have just *Attribute versions then.)
-#if WXWIN_COMPATIBILITY_2_8
-    wxDEPRECATED_BUT_USED_INTERNALLY(
-        virtual void AddProperty(const wxString& name, const wxString& value) );
-    wxDEPRECATED_BUT_USED_INTERNALLY(
-        virtual bool DeleteProperty(const wxString& name) );
-    wxDEPRECATED_BUT_USED_INTERNALLY(
-        virtual void AddProperty(wxXmlAttribute *attr) );
-#else
-private:
-    void AddProperty(const wxString& name, const wxString& value);
-    bool DeleteProperty(const wxString& name);
-    void AddProperty(wxXmlAttribute *attr);
-#endif // WXWIN_COMPATIBILITY_2_8/!WXWIN_COMPATIBILITY_2_8
-
-private:
-    wxXmlNodeType m_type;
-    wxString m_name;
-    wxString m_content;
-    wxXmlAttribute *m_attrs;
-    wxXmlNode *m_parent, *m_children, *m_next;
-    int m_lineNo; // line number in original file, or -1
-    bool m_noConversion; // don't do encoding conversion - node is plain text
-
-    void DoFree();
-    void DoCopy(const wxXmlNode& node);
-};
-
-#if WXWIN_COMPATIBILITY_2_8
-inline wxXmlAttribute *wxXmlNode::GetProperties() const
-    { return GetAttributes(); }
-inline bool wxXmlNode::GetPropVal(const wxString& propName,
-                                  wxString *value) const
-    { return GetAttribute(propName, value); }
-inline wxString wxXmlNode::GetPropVal(const wxString& propName,
-                                      const wxString& defaultVal) const
-    { return GetAttribute(propName, defaultVal); }
-inline bool wxXmlNode::HasProp(const wxString& propName) const
-    { return HasAttribute(propName); }
-inline void wxXmlNode::SetProperties(wxXmlAttribute *prop)
-    { SetAttributes(prop); }
-#endif // WXWIN_COMPATIBILITY_2_8
-
-
-
-// special indentation value for wxXmlDocument::Save
-#define wxXML_NO_INDENTATION           (-1)
-
-// flags for wxXmlDocument::Load
-enum wxXmlDocumentLoadFlag
-{
-    wxXMLDOC_NONE = 0,
-    wxXMLDOC_KEEP_WHITESPACE_NODES = 1
-};
-
-
-// This class holds XML data/document as parsed by XML parser.
-
-class WXDLLIMPEXP_XML wxXmlDocument : public wxObject
-{
-public:
-    wxXmlDocument();
-    wxXmlDocument(const wxString& filename,
-                  const wxString& encoding = wxT("UTF-8"));
-    wxXmlDocument(wxInputStream& stream,
-                  const wxString& encoding = wxT("UTF-8"));
-    virtual ~wxXmlDocument() { wxDELETE(m_docNode); }
-
-    wxXmlDocument(const wxXmlDocument& doc);
-    wxXmlDocument& operator=(const wxXmlDocument& doc);
-
-    // Parses .xml file and loads data. Returns TRUE on success, FALSE
-    // otherwise.
-    virtual bool Load(const wxString& filename,
-                      const wxString& encoding = wxT("UTF-8"), int flags = wxXMLDOC_NONE);
-    virtual bool Load(wxInputStream& stream,
-                      const wxString& encoding = wxT("UTF-8"), int flags = wxXMLDOC_NONE);
-
-    // Saves document as .xml file.
-    virtual bool Save(const wxString& filename, int indentstep = 2) const;
-    virtual bool Save(wxOutputStream& stream, int indentstep = 2) const;
-
-    bool IsOk() const { return GetRoot() != NULL; }
-
-    // Returns root node of the document.
-    wxXmlNode *GetRoot() const;
-    // Returns the document node.
-    wxXmlNode *GetDocumentNode() const { return m_docNode; }
-
-
-    // Returns version of document (may be empty).
-    const wxString& GetVersion() const { return m_version; }
-    // Returns encoding of document (may be empty).
-    // Note: this is the encoding original file was saved in, *not* the
-    // encoding of in-memory representation!
-    const wxString& GetFileEncoding() const { return m_fileEncoding; }
-
-    // Write-access methods:
-    wxXmlNode *DetachDocumentNode() { wxXmlNode *old=m_docNode; m_docNode=NULL; return old; }
-    void SetDocumentNode(wxXmlNode *node) { wxDELETE(m_docNode); m_docNode = node; }
-    wxXmlNode *DetachRoot();
-    void SetRoot(wxXmlNode *node);
-    void SetVersion(const wxString& version) { m_version = version; }
-    void SetFileEncoding(const wxString& encoding) { m_fileEncoding = encoding; }
-    void AppendToProlog(wxXmlNode *node);
-
-#if !wxUSE_UNICODE
-    // Returns encoding of in-memory representation of the document
-    // (same as passed to Load or ctor, defaults to UTF-8).
-    // NB: this is meaningless in Unicode build where data are stored as wchar_t*
-    wxString GetEncoding() const { return m_encoding; }
-    void SetEncoding(const wxString& enc) { m_encoding = enc; }
-#endif
-
-    static wxVersionInfo GetLibraryVersionInfo();
-
-private:
-    wxString   m_version;
-    wxString   m_fileEncoding;
-#if !wxUSE_UNICODE
-    wxString   m_encoding;
-#endif
-    wxXmlNode *m_docNode;
-
-    void DoCopy(const wxXmlDocument& doc);
-
-    DECLARE_CLASS(wxXmlDocument)
-};
-
-#endif // wxUSE_XML
-
-#endif // _WX_XML_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_all.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_all.h
deleted file mode 100644
index 0afe3dbb32..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_all.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_all.h
-// Purpose:     includes all xh_*.h files
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_ALL_H_
-#define _WX_XH_ALL_H_
-
-
-// Existing handlers:
-
-#include "wx/xrc/xh_animatctrl.h"
-#include "wx/xrc/xh_bannerwindow.h"
-#include "wx/xrc/xh_bmp.h"
-#include "wx/xrc/xh_bmpbt.h"
-#include "wx/xrc/xh_bmpcbox.h"
-#include "wx/xrc/xh_bttn.h"
-#include "wx/xrc/xh_cald.h"
-#include "wx/xrc/xh_chckb.h"
-#include "wx/xrc/xh_chckl.h"
-#include "wx/xrc/xh_choic.h"
-#include "wx/xrc/xh_choicbk.h"
-#include "wx/xrc/xh_clrpicker.h"
-#include "wx/xrc/xh_cmdlinkbn.h"
-#include "wx/xrc/xh_collpane.h"
-#include "wx/xrc/xh_combo.h"
-#include "wx/xrc/xh_comboctrl.h"
-#include "wx/xrc/xh_datectrl.h"
-#include "wx/xrc/xh_dirpicker.h"
-#include "wx/xrc/xh_dlg.h"
-#include "wx/xrc/xh_editlbox.h"
-#include "wx/xrc/xh_filectrl.h"
-#include "wx/xrc/xh_filepicker.h"
-#include "wx/xrc/xh_fontpicker.h"
-#include "wx/xrc/xh_frame.h"
-#include "wx/xrc/xh_gauge.h"
-#include "wx/xrc/xh_gdctl.h"
-#include "wx/xrc/xh_grid.h"
-#include "wx/xrc/xh_html.h"
-#include "wx/xrc/xh_htmllbox.h"
-#include "wx/xrc/xh_hyperlink.h"
-#include "wx/xrc/xh_listb.h"
-#include "wx/xrc/xh_listc.h"
-#include "wx/xrc/xh_listbk.h"
-#include "wx/xrc/xh_mdi.h"
-#include "wx/xrc/xh_menu.h"
-#include "wx/xrc/xh_notbk.h"
-#include "wx/xrc/xh_odcombo.h"
-#include "wx/xrc/xh_panel.h"
-#include "wx/xrc/xh_propdlg.h"
-#include "wx/xrc/xh_radbt.h"
-#include "wx/xrc/xh_radbx.h"
-#include "wx/xrc/xh_scrol.h"
-#include "wx/xrc/xh_scwin.h"
-#include "wx/xrc/xh_sizer.h"
-#include "wx/xrc/xh_slidr.h"
-#include "wx/xrc/xh_spin.h"
-#include "wx/xrc/xh_split.h"
-#include "wx/xrc/xh_srchctrl.h"
-#include "wx/xrc/xh_statbar.h"
-#include "wx/xrc/xh_stbox.h"
-#include "wx/xrc/xh_stbmp.h"
-#include "wx/xrc/xh_sttxt.h"
-#include "wx/xrc/xh_stlin.h"
-#include "wx/xrc/xh_text.h"
-#include "wx/xrc/xh_tglbtn.h"
-#include "wx/xrc/xh_timectrl.h"
-#include "wx/xrc/xh_toolb.h"
-#include "wx/xrc/xh_toolbk.h"
-#include "wx/xrc/xh_tree.h"
-#include "wx/xrc/xh_treebk.h"
-#include "wx/xrc/xh_unkwn.h"
-#include "wx/xrc/xh_wizrd.h"
-
-#endif // _WX_XH_ALL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_animatctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_animatctrl.h
deleted file mode 100644
index cd618b5b35..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_animatctrl.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_animatctrl.h
-// Purpose:     XML resource handler for wxAnimationCtrl
-// Author:      Francesco Montorsi
-// Created:     2006-10-15
-// Copyright:   (c) 2006 Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_ANIMATIONCTRL_H_
-#define _WX_XH_ANIMATIONCTRL_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_ANIMATIONCTRL
-
-class WXDLLIMPEXP_XRC wxAnimationCtrlXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxAnimationCtrlXmlHandler)
-
-public:
-    wxAnimationCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_ANIMATIONCTRL
-
-#endif // _WX_XH_ANIMATIONCTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_auinotbk.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_auinotbk.h
deleted file mode 100644
index 66aa234d56..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_auinotbk.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_auinotbk.h
-// Purpose:     XML resource handler for wxAuiNotebook
-// Author:      Steve Lamerton
-// Created:     2009-06-12
-// Copyright:   (c) 2009 Steve Lamerton
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XRC_XH_AUINOTEBOOK_H_
-#define _WX_XRC_XH_AUINOTEBOOK_H_
-
-#include "wx/xrc/xmlres.h"
-
-class WXDLLIMPEXP_FWD_AUI wxAuiNotebook;
-
-#if wxUSE_XRC && wxUSE_AUI
-
-class WXDLLIMPEXP_AUI wxAuiNotebookXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxAuiNotebookXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_isInside;
-    wxAuiNotebook *m_notebook;
-
-    wxDECLARE_DYNAMIC_CLASS(wxAuiNotebookXmlHandler);
-};
-
-#endif // wxUSE_XRC && wxUSE_AUI
-
-#endif // _WX_XRC_XH_AUINOTEBOOK_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_bannerwindow.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_bannerwindow.h
deleted file mode 100644
index 1a570ebb85..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_bannerwindow.h
+++ /dev/null
@@ -1,30 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_bannerwindow.h
-// Purpose:     Declaration of wxBannerWindow XRC handler.
-// Author:      Vadim Zeitlin
-// Created:     2011-08-16
-// Copyright:   (c) 2011 Vadim Zeitlin 
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_BANNERWINDOW_H_
-#define _WX_XH_BANNERWINDOW_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_BANNERWINDOW
-
-class WXDLLIMPEXP_XRC wxBannerWindowXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxBannerWindowXmlHandler();
-
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-    wxDECLARE_DYNAMIC_CLASS(wxBannerWindowXmlHandler);
-};
-
-#endif // wxUSE_XRC && wxUSE_BANNERWINDOW
-
-#endif // _WX_XH_BANNERWINDOW_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_bmp.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_bmp.h
deleted file mode 100644
index ddc8cba440..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_bmp.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_bmp.h
-// Purpose:     XML resource handler for wxBitmap and wxIcon
-// Author:      Vaclav Slavik
-// Created:     2000/09/00
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_BMP_H_
-#define _WX_XH_BMP_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC
-
-class WXDLLIMPEXP_XRC wxBitmapXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxBitmapXmlHandler)
-
-public:
-    wxBitmapXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-class WXDLLIMPEXP_XRC wxIconXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxIconXmlHandler)
-
-public:
-    wxIconXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC
-
-#endif // _WX_XH_BMP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_bmpbt.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_bmpbt.h
deleted file mode 100644
index 7fcc100de0..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_bmpbt.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_bmpbt.h
-// Purpose:     XML resource handler for bitmap buttons
-// Author:      Brian Gavin
-// Created:     2000/03/05
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_BMPBT_H_
-#define _WX_XH_BMPBT_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_BMPBUTTON
-
-class WXDLLIMPEXP_XRC wxBitmapButtonXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxBitmapButtonXmlHandler)
-
-public:
-    wxBitmapButtonXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_BMPBUTTON
-
-#endif // _WX_XH_BMPBT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_bmpcbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_bmpcbox.h
deleted file mode 100644
index 2e3e548cd1..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_bmpcbox.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_bmpcbox.h
-// Purpose:     XML resource handler for wxBitmapComboBox
-// Author:      Jaakko Salli
-// Created:     Sep-10-2006
-// Copyright:   (c) 2006 Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_BMPCBOX_H_
-#define _WX_XH_BMPCBOX_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_BITMAPCOMBOBOX
-
-class WXDLLIMPEXP_FWD_ADV wxBitmapComboBox;
-
-class WXDLLIMPEXP_XRC wxBitmapComboBoxXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxBitmapComboBoxXmlHandler)
-
-public:
-    wxBitmapComboBoxXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    wxBitmapComboBox*    m_combobox;
-    bool                m_isInside;
-};
-
-#endif // wxUSE_XRC && wxUSE_BITMAPCOMBOBOX
-
-#endif // _WX_XH_BMPCBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_bttn.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_bttn.h
deleted file mode 100644
index bc82924bec..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_bttn.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_bttn.h
-// Purpose:     XML resource handler for buttons
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_BTTN_H_
-#define _WX_XH_BTTN_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_BUTTON
-
-class WXDLLIMPEXP_XRC wxButtonXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxButtonXmlHandler)
-
-public:
-    wxButtonXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_BUTTON
-
-#endif // _WX_XH_BTTN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_cald.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_cald.h
deleted file mode 100644
index 4507738a18..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_cald.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_cald.h
-// Purpose:     XML resource handler for wxCalendarCtrl
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_CALD_H_
-#define _WX_XH_CALD_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_CALENDARCTRL
-
-class WXDLLIMPEXP_XRC wxCalendarCtrlXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler)
-
-public:
-    wxCalendarCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_CALENDARCTRL
-
-#endif // _WX_XH_CALD_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_chckb.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_chckb.h
deleted file mode 100644
index dba1dae4c9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_chckb.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_chckb.h
-// Purpose:     XML resource handler for wxCheckBox
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_CHCKB_H_
-#define _WX_XH_CHCKB_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_CHECKBOX
-
-class WXDLLIMPEXP_XRC wxCheckBoxXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxCheckBoxXmlHandler)
-
-public:
-    wxCheckBoxXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_CHECKBOX
-
-#endif // _WX_XH_CHECKBOX_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_chckl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_chckl.h
deleted file mode 100644
index 19725dde00..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_chckl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_chckl.h
-// Purpose:     XML resource handler for wxCheckListBox
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_CHCKL_H_
-#define _WX_XH_CHCKL_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_CHECKLISTBOX
-
-class WXDLLIMPEXP_XRC wxCheckListBoxXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxCheckListBoxXmlHandler)
-
-public:
-    wxCheckListBoxXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_insideBox;
-    wxArrayString strList;
-};
-
-#endif // wxUSE_XRC && wxUSE_CHECKLISTBOX
-
-#endif // _WX_XH_CHECKLIST_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_choic.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_choic.h
deleted file mode 100644
index e7115f8027..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_choic.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_choic.h
-// Purpose:     XML resource handler for wxChoice
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_CHOIC_H_
-#define _WX_XH_CHOIC_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_CHOICE
-
-class WXDLLIMPEXP_XRC wxChoiceXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxChoiceXmlHandler)
-
-public:
-    wxChoiceXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_insideBox;
-    wxArrayString strList;
-};
-
-#endif // wxUSE_XRC && wxUSE_CHOICE
-
-#endif // _WX_XH_CHOIC_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_choicbk.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_choicbk.h
deleted file mode 100644
index 20c5346eb3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_choicbk.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_choicbk.h
-// Purpose:     XML resource handler for wxChoicebook
-// Author:      Vaclav Slavik
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_CHOICEBK_H_
-#define _WX_XH_CHOICEBK_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_CHOICEBOOK
-
-class WXDLLIMPEXP_FWD_CORE wxChoicebook;
-
-class WXDLLIMPEXP_XRC wxChoicebookXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxChoicebookXmlHandler)
-
-public:
-    wxChoicebookXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_isInside;
-    wxChoicebook *m_choicebook;
-};
-
-#endif // wxUSE_XRC && wxUSE_CHOICEBOOK
-
-#endif // _WX_XH_CHOICEBK_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_clrpicker.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_clrpicker.h
deleted file mode 100644
index 9925ba0c41..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_clrpicker.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_clrpicker.h
-// Purpose:     XML resource handler for wxColourPickerCtrl
-// Author:      Francesco Montorsi
-// Created:     2006-04-17
-// Copyright:   (c) 2006 Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_CLRPICKERCTRL_H_
-#define _WX_XH_CLRPICKERCTRL_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_COLOURPICKERCTRL
-
-class WXDLLIMPEXP_XRC wxColourPickerCtrlXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxColourPickerCtrlXmlHandler)
-
-public:
-    wxColourPickerCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_COLOURPICKERCTRL
-
-#endif // _WX_XH_CLRPICKERCTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_cmdlinkbn.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_cmdlinkbn.h
deleted file mode 100644
index 8f45960f29..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_cmdlinkbn.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_cmdlinkbn.h
-// Purpose:     XML resource handler for command link buttons
-// Author:      Kinaou Herve
-// Created:     2010-10-20
-// Copyright:   (c) 2010 wxWidgets development team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_CMDLINKBN_H_
-#define _WX_XH_CMDLINKBN_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_COMMANDLINKBUTTON
-
-class WXDLLIMPEXP_XRC wxCommandLinkButtonXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxCommandLinkButtonXmlHandler();
-
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    wxDECLARE_DYNAMIC_CLASS(wxCommandLinkButtonXmlHandler);
-};
-
-#endif // wxUSE_XRC && wxUSE_COMMANDLINKBUTTON
-
-#endif // _WX_XH_CMDLINKBN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_collpane.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_collpane.h
deleted file mode 100644
index f93c237174..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_collpane.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_collpane.h
-// Purpose:     XML resource handler for wxCollapsiblePane
-// Author:      Francesco Montorsi
-// Created:     2006-10-27
-// Copyright:   (c) 2006 Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_COLLPANE_H_
-#define _WX_XH_COLLPANE_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_COLLPANE
-
-class WXDLLIMPEXP_FWD_CORE wxCollapsiblePane;
-
-class WXDLLIMPEXP_XRC wxCollapsiblePaneXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxCollapsiblePaneXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_isInside;
-    wxCollapsiblePane *m_collpane;
-
-    DECLARE_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler)
-};
-
-#endif // wxUSE_XRC && wxUSE_COLLPANE
-
-#endif // _WX_XH_COLLPANE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_combo.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_combo.h
deleted file mode 100644
index df688a3361..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_combo.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_combo.h
-// Purpose:     XML resource handler for wxComboBox
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_COMBO_H_
-#define _WX_XH_COMBO_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_COMBOBOX
-
-class WXDLLIMPEXP_XRC wxComboBoxXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxComboBoxXmlHandler)
-
-public:
-    wxComboBoxXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_insideBox;
-    wxArrayString strList;
-};
-
-#endif // wxUSE_XRC && wxUSE_COMBOBOX
-
-#endif // _WX_XH_COMBO_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_comboctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_comboctrl.h
deleted file mode 100644
index a11c0276c8..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_comboctrl.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_comboctrl.h
-// Purpose:     XML resource handler for wxComboBox
-// Author:      Jaakko Salli
-// Created:     2009/01/25
-// Copyright:   (c) 2009 Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_COMBOCTRL_H_
-#define _WX_XH_COMBOCTRL_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_COMBOCTRL
-
-class WXDLLIMPEXP_XRC wxComboCtrlXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxComboCtrlXmlHandler)
-
-public:
-    wxComboCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-};
-
-#endif // wxUSE_XRC && wxUSE_COMBOCTRL
-
-#endif // _WX_XH_COMBOCTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_datectrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_datectrl.h
deleted file mode 100644
index e13c5c3676..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_datectrl.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_datectrl.h
-// Purpose:     XML resource handler for wxDatePickerCtrl
-// Author:      Vaclav Slavik
-// Created:     2005-02-07
-// Copyright:   (c) 2005 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_DATECTRL_H_
-#define _WX_XH_DATECTRL_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_DATEPICKCTRL
-
-class WXDLLIMPEXP_XRC wxDateCtrlXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxDateCtrlXmlHandler)
-
-public:
-    wxDateCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_DATEPICKCTRL
-
-#endif // _WX_XH_DATECTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_dirpicker.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_dirpicker.h
deleted file mode 100644
index b77540e36d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_dirpicker.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_dirpicker.h
-// Purpose:     XML resource handler for wxDirPickerCtrl
-// Author:      Francesco Montorsi
-// Created:     2006-04-17
-// Copyright:   (c) 2006 Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_DIRPICKERCTRL_H_
-#define _WX_XH_DIRPICKERCTRL_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_DIRPICKERCTRL
-
-class WXDLLIMPEXP_XRC wxDirPickerCtrlXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxDirPickerCtrlXmlHandler)
-
-public:
-    wxDirPickerCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_DIRPICKERCTRL
-
-#endif // _WX_XH_DIRPICKERCTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_dlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_dlg.h
deleted file mode 100644
index 903f643181..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_dlg.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_dlg.h
-// Purpose:     XML resource handler for dialogs
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_DLG_H_
-#define _WX_XH_DLG_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC
-
-class WXDLLIMPEXP_XRC wxDialogXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxDialogXmlHandler)
-
-public:
-    wxDialogXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC
-
-#endif // _WX_XH_DLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_editlbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_editlbox.h
deleted file mode 100644
index 0baa85df89..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_editlbox.h
+++ /dev/null
@@ -1,39 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_editlbox.h
-// Purpose:     declaration of wxEditableListBox XRC handler
-// Author:      Vadim Zeitlin
-// Created:     2009-06-04
-// Copyright:   (c) 2009 Vadim Zeitlin 
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XRC_XH_EDITLBOX_H_
-#define _WX_XRC_XH_EDITLBOX_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_EDITABLELISTBOX
-
-// ----------------------------------------------------------------------------
-// wxEditableListBoxXmlHandler: XRC handler for wxEditableListBox
-// ----------------------------------------------------------------------------
-
-class WXDLLIMPEXP_XRC wxEditableListBoxXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxEditableListBoxXmlHandler();
-
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_insideBox;
-    wxArrayString m_items;
-
-    DECLARE_DYNAMIC_CLASS(wxEditableListBoxXmlHandler)
-};
-
-#endif // wxUSE_XRC && wxUSE_EDITABLELISTBOX
-
-#endif // _WX_XRC_XH_EDITLBOX_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_filectrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_filectrl.h
deleted file mode 100644
index 97f9984ffb..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_filectrl.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_filectrl.h
-// Purpose:     XML resource handler for wxFileCtrl
-// Author:      Kinaou Hervé
-// Created:     2009-05-11
-// Copyright:   (c) 2009 wxWidgets development team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_FILECTRL_H_
-#define _WX_XH_FILECTRL_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_FILECTRL
-
-class WXDLLIMPEXP_XRC wxFileCtrlXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxFileCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    DECLARE_DYNAMIC_CLASS(wxFileCtrlXmlHandler)
-};
-
-#endif // wxUSE_XRC && wxUSE_FILECTRL
-
-#endif // _WX_XH_FILEPICKERCTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_filepicker.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_filepicker.h
deleted file mode 100644
index 31ab0a4c53..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_filepicker.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_filepicker.h
-// Purpose:     XML resource handler for wxFilePickerCtrl
-// Author:      Francesco Montorsi
-// Created:     2006-04-17
-// Copyright:   (c) 2006 Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_FILEPICKERCTRL_H_
-#define _WX_XH_FILEPICKERCTRL_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_FILEPICKERCTRL
-
-class WXDLLIMPEXP_XRC wxFilePickerCtrlXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxFilePickerCtrlXmlHandler)
-
-public:
-    wxFilePickerCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_FILEPICKERCTRL
-
-#endif // _WX_XH_FILEPICKERCTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_fontpicker.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_fontpicker.h
deleted file mode 100644
index 481adfb74e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_fontpicker.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_fontpicker.h
-// Purpose:     XML resource handler for wxFontPickerCtrl
-// Author:      Francesco Montorsi
-// Created:     2006-04-17
-// Copyright:   (c) 2006 Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_FONTPICKERCTRL_H_
-#define _WX_XH_FONTPICKERCTRL_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_FONTPICKERCTRL
-
-class WXDLLIMPEXP_XRC wxFontPickerCtrlXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxFontPickerCtrlXmlHandler)
-
-public:
-    wxFontPickerCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_FONTPICKERCTRL
-
-#endif // _WX_XH_FONTPICKERCTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_frame.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_frame.h
deleted file mode 100644
index 16ee6aa484..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_frame.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_frame.h
-// Purpose:     XML resource handler for wxFrame
-// Author:      Vaclav Slavik & Aleks.
-// Created:     2000/03/05
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_FRAME_H_
-#define _WX_XH_FRAME_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC
-
-class WXDLLIMPEXP_XRC wxFrameXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxFrameXmlHandler)
-
-public:
-    wxFrameXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC
-
-#endif // _WX_XH_FRAME_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_gauge.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_gauge.h
deleted file mode 100644
index 26eaa5b072..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_gauge.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_gauge.h
-// Purpose:     XML resource handler for wxGauge
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_GAUGE_H_
-#define _WX_XH_GAUGE_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_GAUGE
-
-class WXDLLIMPEXP_XRC wxGaugeXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxGaugeXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-    DECLARE_DYNAMIC_CLASS(wxGaugeXmlHandler)
-};
-
-#endif // wxUSE_XRC && wxUSE_GAUGE
-
-#endif // _WX_XH_GAUGE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_gdctl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_gdctl.h
deleted file mode 100644
index bc746690fb..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_gdctl.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_gdctl.h
-// Purpose:     XML resource handler for wxGenericDirCtrl
-// Author:      Markus Greither
-// Created:     2002/01/20
-// Copyright:   (c) 2002 Markus Greither
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_GDCTL_H_
-#define _WX_XH_GDCTL_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_DIRDLG
-
-class WXDLLIMPEXP_XRC wxGenericDirCtrlXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler)
-
-public:
-    wxGenericDirCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_DIRDLG
-
-#endif // _WX_XH_GDCTL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_grid.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_grid.h
deleted file mode 100644
index 3d62705749..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_grid.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_grid.h
-// Purpose:     XML resource handler for wxGrid
-// Author:      Agron Selimaj
-// Created:     2005/08/11
-// Copyright:   (c) 2005 Agron Selimaj, Freepour Controls Inc.
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_GRD_H_
-#define _WX_XH_GRD_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_GRID
-
-class WXDLLIMPEXP_XRC wxGridXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxGridXmlHandler)
-
-public:
-    wxGridXmlHandler();
-
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_GRID
-
-#endif // _WX_XH_GRD_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_html.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_html.h
deleted file mode 100644
index 2c08a4b98f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_html.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_html.h
-// Purpose:     XML resource handler for wxHtmlWindow
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_HTML_H_
-#define _WX_XH_HTML_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_HTML
-
-class WXDLLIMPEXP_XRC wxHtmlWindowXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxHtmlWindowXmlHandler)
-
-public:
-    wxHtmlWindowXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_HTML
-
-#endif // _WX_XH_HTML_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_htmllbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_htmllbox.h
deleted file mode 100644
index fb3539d9c5..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_htmllbox.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_htmllbox.h
-// Purpose:     XML resource handler for wxSimpleHtmlListBox
-// Author:      Francesco Montorsi
-// Created:     2006/10/21
-// Copyright:   (c) 2006 Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_SIMPLEHTMLLISTBOX_H_
-#define _WX_XH_SIMPLEHTMLLISTBOX_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_HTML
-
-class WXDLLIMPEXP_XRC wxSimpleHtmlListBoxXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxSimpleHtmlListBoxXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_insideBox;
-    wxArrayString strList;
-
-    DECLARE_DYNAMIC_CLASS(wxSimpleHtmlListBoxXmlHandler)
-};
-
-#endif // wxUSE_XRC && wxUSE_HTML
-
-#endif // _WX_XH_SIMPLEHTMLLISTBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_hyperlink.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_hyperlink.h
deleted file mode 100644
index 4793668e35..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_hyperlink.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_hyperlink.h
-// Purpose:     Hyperlink control (wxAdv)
-// Author:      David Norris 
-// Modified by: Ryan Norton, Francesco Montorsi
-// Created:     04/02/2005
-// Copyright:   (c) 2005 David Norris
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_HYPERLINKH__
-#define _WX_XH_HYPERLINKH__
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_HYPERLINKCTRL
-
-class WXDLLIMPEXP_XRC wxHyperlinkCtrlXmlHandler : public wxXmlResourceHandler
-{
-    // Register with wxWindows' dynamic class subsystem.
-    DECLARE_DYNAMIC_CLASS(wxHyperlinkCtrlXmlHandler)
-
-public:
-    // Constructor.
-    wxHyperlinkCtrlXmlHandler();
-
-    // Creates the control and returns a pointer to it.
-    virtual wxObject *DoCreateResource();
-
-    // Returns true if we know how to create a control for the given node.
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_HYPERLINKCTRL
-
-#endif // _WX_XH_HYPERLINKH__
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_listb.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_listb.h
deleted file mode 100644
index c73c993de6..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_listb.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_listb.h
-// Purpose:     XML resource handler for wxListbox
-// Author:      Bob Mitchell & Vaclav Slavik
-// Created:     2000/07/29
-// Copyright:   (c) 2000 Bob Mitchell & Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_LISTB_H_
-#define _WX_XH_LISTB_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_LISTBOX
-
-class WXDLLIMPEXP_XRC wxListBoxXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxListBoxXmlHandler)
-
-public:
-    wxListBoxXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_insideBox;
-    wxArrayString strList;
-};
-
-#endif // wxUSE_XRC && wxUSE_LISTBOX
-
-#endif // _WX_XH_LISTB_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_listbk.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_listbk.h
deleted file mode 100644
index 7aa2e0b2f3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_listbk.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_listbk.h
-// Purpose:     XML resource handler for wxListbook
-// Author:      Vaclav Slavik
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_LISTBK_H_
-#define _WX_XH_LISTBK_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_LISTBOOK
-
-class WXDLLIMPEXP_FWD_CORE wxListbook;
-
-class WXDLLIMPEXP_XRC wxListbookXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxListbookXmlHandler)
-
-public:
-    wxListbookXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_isInside;
-    wxListbook *m_listbook;
-};
-
-#endif // wxUSE_XRC && wxUSE_LISTBOOK
-
-#endif // _WX_XH_LISTBK_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_listc.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_listc.h
deleted file mode 100644
index b2b927e1db..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_listc.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_listc.h
-// Purpose:     XML resource handler for wxListCtrl
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_LISTC_H_
-#define _WX_XH_LISTC_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_LISTCTRL
-
-class WXDLLIMPEXP_FWD_CORE wxListCtrl;
-class WXDLLIMPEXP_FWD_CORE wxListItem;
-
-class WXDLLIMPEXP_XRC wxListCtrlXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxListCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    // handlers for wxListCtrl itself and its listcol and listitem children
-    wxListCtrl *HandleListCtrl();
-    void HandleListCol();
-    void HandleListItem();
-
-    // common part to HandleList{Col,Item}()
-    void HandleCommonItemAttrs(wxListItem& item);
-
-    // gets the items image index in the corresponding image list (normal if
-    // which is wxIMAGE_LIST_NORMAL or small if it is wxIMAGE_LIST_SMALL)
-    long GetImageIndex(wxListCtrl *listctrl, int which);
-
-    DECLARE_DYNAMIC_CLASS(wxListCtrlXmlHandler)
-};
-
-#endif // wxUSE_XRC && wxUSE_LISTCTRL
-
-#endif // _WX_XH_LISTC_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_mdi.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_mdi.h
deleted file mode 100644
index 6634318386..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_mdi.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_mdi.h
-// Purpose:     XML resource handler for wxMDI
-// Author:      David M. Falkinder & Vaclav Slavik
-// Created:     14/02/2005
-// Copyright:   (c) 2005 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_MDI_H_
-#define _WX_XH_MDI_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_MDI
-
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-
-class WXDLLIMPEXP_XRC wxMdiXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxMdiXmlHandler)
-
-public:
-    wxMdiXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    wxWindow *CreateFrame();
-};
-
-#endif // wxUSE_XRC && wxUSE_MDI
-
-#endif // _WX_XH_MDI_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_menu.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_menu.h
deleted file mode 100644
index b06fee39fe..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_menu.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_menu.h
-// Purpose:     XML resource handler for menus/menubars
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_MENU_H_
-#define _WX_XH_MENU_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_MENUS
-
-class WXDLLIMPEXP_XRC wxMenuXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxMenuXmlHandler)
-
-public:
-    wxMenuXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_insideMenu;
-};
-
-class WXDLLIMPEXP_XRC wxMenuBarXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandler)
-
-public:
-    wxMenuBarXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_MENUS
-
-#endif // _WX_XH_MENU_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_notbk.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_notbk.h
deleted file mode 100644
index aa24fc8716..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_notbk.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_notbk.h
-// Purpose:     XML resource handler for wxNotebook
-// Author:      Vaclav Slavik
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_NOTBK_H_
-#define _WX_XH_NOTBK_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_NOTEBOOK
-
-class WXDLLIMPEXP_FWD_CORE wxNotebook;
-
-class WXDLLIMPEXP_XRC wxNotebookXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxNotebookXmlHandler)
-
-public:
-    wxNotebookXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_isInside;
-    wxNotebook *m_notebook;
-};
-
-#endif // wxUSE_XRC && wxUSE_NOTEBOOK
-
-#endif // _WX_XH_NOTBK_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_odcombo.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_odcombo.h
deleted file mode 100644
index d639f4108a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_odcombo.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_odcombo.h
-// Purpose:     XML resource handler for wxOwnerDrawnComboBox
-// Author:      Alex Bligh - based on wx/xrc/xh_combo.h
-// Created:     2006/06/19
-// Copyright:   (c) 2006 Alex Bligh
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_ODCOMBO_H_
-#define _WX_XH_ODCOMBO_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_ODCOMBOBOX
-
-class WXDLLIMPEXP_XRC wxOwnerDrawnComboBoxXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxOwnerDrawnComboBoxXmlHandler)
-
-public:
-    wxOwnerDrawnComboBoxXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_insideBox;
-    wxArrayString strList;
-};
-
-#endif // wxUSE_XRC && wxUSE_ODCOMBOBOX
-
-#endif // _WX_XH_ODCOMBO_H_
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_panel.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_panel.h
deleted file mode 100644
index d5ee1a4542..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_panel.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_panel.h
-// Purpose:     XML resource handler for wxPanel
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_PANEL_H_
-#define _WX_XH_PANEL_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC
-
-class WXDLLIMPEXP_XRC wxPanelXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxPanelXmlHandler)
-
-public:
-    wxPanelXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC
-
-#endif // _WX_XH_PANEL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_propdlg.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_propdlg.h
deleted file mode 100644
index 0be363f63e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_propdlg.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_propdlg.h
-// Purpose:     XML resource handler for wxPropertySheetDialog
-// Author:      Sander Berents
-// Created:     2007/07/12
-// Copyright:   (c) 2007 Sander Berents
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_PROPDLG_H_
-#define _WX_XH_PROPDLG_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC
-
-class WXDLLIMPEXP_FWD_ADV wxPropertySheetDialog;
-
-class WXDLLIMPEXP_XRC wxPropertySheetDialogXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxPropertySheetDialogXmlHandler)
-
-public:
-    wxPropertySheetDialogXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_isInside;
-    wxPropertySheetDialog *m_dialog;
-};
-
-#endif // wxUSE_XRC
-
-#endif // _WX_XH_PROPDLG_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_radbt.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_radbt.h
deleted file mode 100644
index 7d21f99a3c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_radbt.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_radbt.h
-// Purpose:     XML resource handler for wxRadioButton
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_RADBT_H_
-#define _WX_XH_RADBT_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_RADIOBTN
-
-class WXDLLIMPEXP_XRC wxRadioButtonXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxRadioButtonXmlHandler)
-
-public:
-    wxRadioButtonXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_RADIOBOX
-
-#endif // _WX_XH_RADBT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_radbx.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_radbx.h
deleted file mode 100644
index 5df1ac1ac6..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_radbx.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_radbx.h
-// Purpose:     XML resource handler for wxRadioBox
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_RADBX_H_
-#define _WX_XH_RADBX_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_RADIOBOX
-
-class WXDLLIMPEXP_XRC wxRadioBoxXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxRadioBoxXmlHandler)
-
-public:
-    wxRadioBoxXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_insideBox;
-
-    // the items labels
-    wxArrayString m_labels;
-
-#if wxUSE_TOOLTIPS
-    // the items tooltips
-    wxArrayString m_tooltips;
-#endif // wxUSE_TOOLTIPS
-
-    // the item help text
-    wxArrayString m_helptexts;
-    wxArrayInt    m_helptextSpecified;
-
-    // if the corresponding array element is 1, the radiobox item is
-    // disabled/hidden
-    wxArrayInt m_isEnabled,
-               m_isShown;
-};
-
-#endif // wxUSE_XRC && wxUSE_RADIOBOX
-
-#endif // _WX_XH_RADBX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_ribbon.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_ribbon.h
deleted file mode 100644
index b9737c8212..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_ribbon.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_ribbon.h
-// Purpose:     XML resource handler for wxRibbon related classes
-// Author:      Armel Asselin
-// Created:     2010-04-23
-// Copyright:   (c) 2010 Armel Asselin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XRC_XH_RIBBON_H_
-#define _WX_XRC_XH_RIBBON_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_RIBBON
-
-class WXDLLIMPEXP_FWD_RIBBON wxRibbonControl;
-
-class WXDLLIMPEXP_RIBBON wxRibbonXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxRibbonXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    const wxClassInfo *m_isInside;
-
-    bool IsRibbonControl (wxXmlNode *node);
-
-    wxObject* Handle_buttonbar();
-    wxObject* Handle_button();
-    wxObject* Handle_control();
-    wxObject* Handle_page();
-    wxObject* Handle_gallery();
-    wxObject* Handle_galleryitem();
-    wxObject* Handle_panel();
-    wxObject* Handle_bar();
-
-    void Handle_RibbonArtProvider(wxRibbonControl *control);
-
-    wxDECLARE_DYNAMIC_CLASS(wxRibbonXmlHandler);
-};
-
-#endif // wxUSE_XRC && wxUSE_RIBBON
-
-#endif // _WX_XRC_XH_RIBBON_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_richtext.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_richtext.h
deleted file mode 100644
index 1c52cbbcb1..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_richtext.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_richtext.h
-// Purpose:     XML resource handler for wxRichTextCtrl
-// Author:      Julian Smart
-// Created:     2006-11-08
-// Copyright:   (c) 2006 Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_RICHTEXT_H_
-#define _WX_XH_RICHTEXT_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_RICHTEXT
-
-class WXDLLIMPEXP_RICHTEXT wxRichTextCtrlXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxRichTextCtrlXmlHandler)
-
-public:
-    wxRichTextCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_RICHTEXT
-
-#endif // _WX_XH_RICHTEXT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_scrol.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_scrol.h
deleted file mode 100644
index 0599c5a9cd..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_scrol.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_scrol.h
-// Purpose:     XML resource handler for wxScrollBar
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_SCROL_H_
-#define _WX_XH_SCROL_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_SCROLLBAR
-
-class WXDLLIMPEXP_XRC wxScrollBarXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxScrollBarXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-    DECLARE_DYNAMIC_CLASS(wxScrollBarXmlHandler)
-};
-
-#endif // wxUSE_XRC && wxUSE_SCROLLBAR
-
-#endif // _WX_XH_SCROL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_scwin.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_scwin.h
deleted file mode 100644
index c2e370016f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_scwin.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_scwin.h
-// Purpose:     XML resource handler for wxScrolledWindow
-// Author:      Vaclav Slavik
-// Created:     2002/10/18
-// Copyright:   (c) 2002 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_SCWIN_H_
-#define _WX_XH_SCWIN_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC
-
-class WXDLLIMPEXP_XRC wxScrolledWindowXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxScrolledWindowXmlHandler)
-
-public:
-    wxScrolledWindowXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC
-
-#endif // _WX_XH_SCWIN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_sizer.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_sizer.h
deleted file mode 100644
index e04947a14c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_sizer.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_sizer.h
-// Purpose:     XML resource handler for wxBoxSizer
-// Author:      Vaclav Slavik
-// Created:     2000/04/24
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_SIZER_H_
-#define _WX_XH_SIZER_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC
-
-#include "wx/sizer.h"
-#include "wx/gbsizer.h"
-
-class WXDLLIMPEXP_XRC wxSizerXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxSizerXmlHandler)
-
-public:
-    wxSizerXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-protected:
-    virtual wxSizer* DoCreateSizer(const wxString& name);
-    virtual bool IsSizerNode(wxXmlNode *node) const;
-
-private:
-    bool m_isInside;
-    bool m_isGBS;
-
-    wxSizer *m_parentSizer;
-
-
-    wxObject* Handle_sizeritem();
-    wxObject* Handle_spacer();
-    wxObject* Handle_sizer();
-    wxSizer*  Handle_wxBoxSizer();
-#if wxUSE_STATBOX
-    wxSizer*  Handle_wxStaticBoxSizer();
-#endif
-    wxSizer*  Handle_wxGridSizer();
-    wxFlexGridSizer* Handle_wxFlexGridSizer();
-    wxGridBagSizer* Handle_wxGridBagSizer();
-    wxSizer*  Handle_wxWrapSizer();
-
-    bool ValidateGridSizerChildren();
-    void SetFlexibleMode(wxFlexGridSizer* fsizer);
-    void SetGrowables(wxFlexGridSizer* fsizer, const wxChar* param, bool rows);
-    wxGBPosition GetGBPos(const wxString& param);
-    wxGBSpan GetGBSpan(const wxString& param);
-    wxSizerItem* MakeSizerItem();
-    void SetSizerItemAttributes(wxSizerItem* sitem);
-    void AddSizerItem(wxSizerItem* sitem);
-};
-
-#if wxUSE_BUTTON
-
-class WXDLLIMPEXP_XRC wxStdDialogButtonSizerXmlHandler
-    : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxStdDialogButtonSizerXmlHandler)
-
-public:
-    wxStdDialogButtonSizerXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_isInside;
-    wxStdDialogButtonSizer *m_parentSizer;
-};
-
-#endif // wxUSE_BUTTON
-
-#endif // wxUSE_XRC
-
-#endif // _WX_XH_SIZER_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_slidr.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_slidr.h
deleted file mode 100644
index 0e209089f5..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_slidr.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_slidr.h
-// Purpose:     XML resource handler for wxSlider
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_SLIDR_H_
-#define _WX_XH_SLIDR_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_SLIDER
-
-class WXDLLIMPEXP_XRC wxSliderXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxSliderXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-    DECLARE_DYNAMIC_CLASS(wxSliderXmlHandler)
-};
-
-#endif // wxUSE_XRC && wxUSE_SLIDER
-
-#endif // _WX_XH_SLIDR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_spin.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_spin.h
deleted file mode 100644
index 7525ba4cd9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_spin.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_spin.h
-// Purpose:     XML resource handler for wxSpinButton and wxSpinCtrl
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_SPIN_H_
-#define _WX_XH_SPIN_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC
-
-#if wxUSE_SPINBTN
-
-class WXDLLIMPEXP_XRC wxSpinButtonXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxSpinButtonXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-    DECLARE_DYNAMIC_CLASS(wxSpinButtonXmlHandler)
-};
-
-#endif // wxUSE_SPINBTN
-
-
-#if wxUSE_SPINCTRL
-
-class WXDLLIMPEXP_XRC wxSpinCtrlXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxSpinCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-    DECLARE_DYNAMIC_CLASS(wxSpinCtrlXmlHandler)
-};
-
-#endif // wxUSE_SPINCTRL
-
-#endif // wxUSE_XRC
-
-#endif // _WX_XH_SPIN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_split.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_split.h
deleted file mode 100644
index 7f682dd73d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_split.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_split.h
-// Purpose:     XRC resource for wxSplitterWindow
-// Author:      panga@freemail.hu, Vaclav Slavik
-// Created:     2003/01/26
-// Copyright:   (c) 2003 panga@freemail.hu, Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_SPLIT_H_
-#define _WX_XH_SPLIT_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_SPLITTER
-
-class WXDLLIMPEXP_XRC wxSplitterWindowXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxSplitterWindowXmlHandler)
-
-public:
-    wxSplitterWindowXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_SPLITTER
-
-#endif // _WX_XH_SPLIT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_srchctrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_srchctrl.h
deleted file mode 100644
index 82f93538e0..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_srchctrl.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_srchctl.h
-// Purpose:     XRC resource handler for wxSearchCtrl
-// Author:      Sander Berents
-// Created:     2007/07/12
-// Copyright:   (c) 2007 Sander Berents
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_SRCH_H_
-#define _WX_XH_SRCH_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_SEARCHCTRL
-
-class WXDLLIMPEXP_XRC wxSearchCtrlXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxSearchCtrlXmlHandler();
-
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-    DECLARE_DYNAMIC_CLASS(wxSearchCtrlXmlHandler)
-};
-
-#endif // wxUSE_XRC && wxUSE_SEARCHCTRL
-
-#endif // _WX_XH_SRCH_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_statbar.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_statbar.h
deleted file mode 100644
index 58c4ff4b42..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_statbar.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_statbar.h
-// Purpose:     XML resource handler for wxStatusBar
-// Author:      Brian Ravnsgaard Riis
-// Created:     2004/01/21
-// Copyright:   (c) 2004 Brian Ravnsgaard Riis
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_STATBAR_H_
-#define _WX_XH_STATBAR_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_STATUSBAR
-
-class WXDLLIMPEXP_XRC wxStatusBarXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxStatusBarXmlHandler)
-
-public:
-    wxStatusBarXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_STATUSBAR
-
-#endif // _WX_XH_STATBAR_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_stbmp.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_stbmp.h
deleted file mode 100644
index 42a564fcdf..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_stbmp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_stbmp.h
-// Purpose:     XML resource handler for wxStaticBitmap
-// Author:      Vaclav Slavik
-// Created:     2000/04/22
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_STBMP_H_
-#define _WX_XH_STBMP_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_STATBMP
-
-class WXDLLIMPEXP_XRC wxStaticBitmapXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxStaticBitmapXmlHandler)
-
-public:
-    wxStaticBitmapXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_STATBMP
-
-#endif // _WX_XH_STBMP_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_stbox.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_stbox.h
deleted file mode 100644
index 43f6c25ac6..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_stbox.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_stbox.h
-// Purpose:     XML resource handler for wxStaticBox
-// Author:      Brian Gavin
-// Created:     2000/09/00
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_STBOX_H_
-#define _WX_XH_STBOX_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_STATBOX
-
-class WXDLLIMPEXP_XRC wxStaticBoxXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxStaticBoxXmlHandler)
-
-public:
-    wxStaticBoxXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_STATBOX
-
-#endif // _WX_XH_STBOX_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_stlin.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_stlin.h
deleted file mode 100644
index 9efa3cb884..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_stlin.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_stlin.h
-// Purpose:     XML resource handler for wxStaticLine
-// Author:      Vaclav Slavik
-// Created:     2000/09/00
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_STLIN_H_
-#define _WX_XH_STLIN_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_STATLINE
-
-class WXDLLIMPEXP_XRC wxStaticLineXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxStaticLineXmlHandler)
-
-public:
-    wxStaticLineXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_STATLINE
-
-#endif // _WX_XH_STLIN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_sttxt.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_sttxt.h
deleted file mode 100644
index 4d99ec25e7..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_sttxt.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_sttxt.h
-// Purpose:     XML resource handler for wxStaticText
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Bob Mitchell
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_STTXT_H_
-#define _WX_XH_STTXT_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_STATTEXT
-
-class WXDLLIMPEXP_XRC wxStaticTextXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxStaticTextXmlHandler)
-
-public:
-    wxStaticTextXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_STATTEXT
-
-#endif // _WX_XH_STTXT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_text.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_text.h
deleted file mode 100644
index 9a7649d37c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_text.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_text.h
-// Purpose:     XML resource handler for wxTextCtrl
-// Author:      Aleksandras Gluchovas
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Aleksandras Gluchovas
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_TEXT_H_
-#define _WX_XH_TEXT_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_TEXTCTRL
-
-class WXDLLIMPEXP_XRC wxTextCtrlXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxTextCtrlXmlHandler)
-
-public:
-    wxTextCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_TEXTCTRL
-
-#endif // _WX_XH_TEXT_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_tglbtn.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_tglbtn.h
deleted file mode 100644
index 6c6c9a2cd3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_tglbtn.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_tglbtn.h
-// Purpose:     XML resource handler for wxToggleButton
-// Author:      Julian Smart
-// Created:     2004-08-30
-// Copyright:   (c) 2004 Julian Smart
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_TGLBTN_H_
-#define _WX_XH_TGLBTN_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_TOGGLEBTN
-
-class WXDLLIMPEXP_XRC wxToggleButtonXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxToggleButtonXmlHandler)
-
-public:
-    wxToggleButtonXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-protected:
-    virtual void DoCreateToggleButton(wxObject *control);
-#if !defined(__WXUNIVERSAL__) && !defined(__WXMOTIF__) && !defined(__WXPM__) && !(defined(__WXGTK__) && !defined(__WXGTK20__))
-    virtual void DoCreateBitmapToggleButton(wxObject *control);
-#endif
-};
-
-#endif // wxUSE_XRC && wxUSE_TOGGLEBTN
-
-#endif // _WX_XH_TGLBTN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_timectrl.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_timectrl.h
deleted file mode 100644
index d04b1bf123..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_timectrl.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_timectrl.h
-// Purpose:     XML resource handler for wxTimePickerCtrl
-// Author:      Vadim Zeitlin
-// Created:     2011-09-22
-// Copyright:   (c) 2011 Vadim Zeitlin 
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_TIMECTRL_H_
-#define _WX_XH_TIMECTRL_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_TIMEPICKCTRL
-
-class WXDLLIMPEXP_XRC wxTimeCtrlXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxTimeCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    wxDECLARE_DYNAMIC_CLASS(wxTimeCtrlXmlHandler);
-};
-
-#endif // wxUSE_XRC && wxUSE_TIMEPICKCTRL
-
-#endif // _WX_XH_TIMECTRL_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_toolb.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_toolb.h
deleted file mode 100644
index 6b936dcb29..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_toolb.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_toolb.h
-// Purpose:     XML resource handler for wxToolBar
-// Author:      Vaclav Slavik
-// Created:     2000/08/11
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_TOOLB_H_
-#define _WX_XH_TOOLB_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_TOOLBAR
-
-class WXDLLIMPEXP_FWD_CORE wxToolBar;
-
-class WXDLLIMPEXP_XRC wxToolBarXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxToolBarXmlHandler)
-
-public:
-    wxToolBarXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_isInside;
-    wxToolBar *m_toolbar;
-    wxSize m_toolSize;
-};
-
-#endif // wxUSE_XRC && wxUSE_TOOLBAR
-
-#endif // _WX_XH_TOOLB_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_toolbk.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_toolbk.h
deleted file mode 100644
index 16aa174d67..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_toolbk.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_toolbk.h
-// Purpose:     XML resource handler for wxToolbook
-// Author:      Andrea Zanellato
-// Created:     2009/12/12
-// Copyright:   (c) 2010 wxWidgets development team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_TOOLBK_H_
-#define _WX_XH_TOOLBK_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_TOOLBOOK
-
-class WXDLLIMPEXP_FWD_CORE wxToolbook;
-
-class WXDLLIMPEXP_XRC wxToolbookXmlHandler : public wxXmlResourceHandler
-{
-public:
-    wxToolbookXmlHandler();
-
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    bool m_isInside;
-    wxToolbook *m_toolbook;
-
-    wxDECLARE_DYNAMIC_CLASS(wxToolbookXmlHandler);
-};
-
-#endif // wxUSE_XRC && wxUSE_TOOLBOOK
-
-#endif // _WX_XH_TOOLBK_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_tree.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_tree.h
deleted file mode 100644
index aa1b633b51..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_tree.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_tree.h
-// Purpose:     XML resource handler for wxTreeCtrl
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_TREE_H_
-#define _WX_XH_TREE_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_TREECTRL
-
-class WXDLLIMPEXP_XRC wxTreeCtrlXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxTreeCtrlXmlHandler)
-
-public:
-    wxTreeCtrlXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC && wxUSE_TREECTRL
-
-#endif // _WX_XH_TREE_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_treebk.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_treebk.h
deleted file mode 100644
index f5f11342f1..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_treebk.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_treebk.h
-// Purpose:     XML resource handler for wxTreebook
-// Author:      Evgeniy Tarassov
-// Created:     2005/09/28
-// Copyright:   (c) 2005 TT-Solutions 
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_TREEBK_H_
-#define _WX_XH_TREEBK_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_TREEBOOK
-
-class  WXDLLIMPEXP_FWD_CORE wxTreebook;
-#include "wx/dynarray.h"
-
-WX_DEFINE_USER_EXPORTED_ARRAY_SIZE_T(size_t, wxArrayTbkPageIndexes,
-                                     class WXDLLIMPEXP_XRC);
-
-// ---------------------------------------------------------------------
-// wxTreebookXmlHandler class
-// ---------------------------------------------------------------------
-// Resource xml structure have to be almost the "same" as for wxNotebook
-// except the additional (size_t)depth parameter for treebookpage nodes
-// which indicates the depth of the page in the tree.
-// There is only one logical constraint on this parameter :
-// it cannot be greater than the previous page depth plus one
-class WXDLLIMPEXP_XRC wxTreebookXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxTreebookXmlHandler)
-
-public:
-    wxTreebookXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    wxTreebook *m_tbk;
-    wxArrayTbkPageIndexes m_treeContext;
-    bool m_isInside;
-};
-
-
-// Example:
-// -------
-// Label
-// \--First
-// |  \--Second
-// \--Third
-//
-//
-//  ...
-//  
-//    
-//      
-//      
-//      0
-//    
-//    
-//      
-//      
-//      1
-//    
-//    
-//      
-//      
-//      2
-//    
-//    
-//      
-//      
-//      1
-//    
-//  
-//  ...
-//
-
-#endif // wxUSE_XRC && wxUSE_TREEBOOK
-
-#endif // _WX_XH_TREEBK_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_unkwn.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_unkwn.h
deleted file mode 100644
index e417b4d39a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_unkwn.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_unkwn.h
-// Purpose:     XML resource handler for unknown widget
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_UNKWN_H_
-#define _WX_XH_UNKWN_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC
-
-class WXDLLIMPEXP_XRC wxUnknownWidgetXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxUnknownWidgetXmlHandler)
-
-public:
-    wxUnknownWidgetXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-};
-
-#endif // wxUSE_XRC
-
-#endif // _WX_XH_UNKWN_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_wizrd.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_wizrd.h
deleted file mode 100644
index 486cf5d963..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xh_wizrd.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xh_wizrd.h
-// Purpose:     XML resource handler for wxWizard
-// Author:      Vaclav Slavik
-// Created:     2003/03/02
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XH_WIZRD_H_
-#define _WX_XH_WIZRD_H_
-
-#include "wx/xrc/xmlres.h"
-
-#if wxUSE_XRC && wxUSE_WIZARDDLG
-
-class WXDLLIMPEXP_FWD_ADV wxWizard;
-class WXDLLIMPEXP_FWD_ADV wxWizardPageSimple;
-
-class WXDLLIMPEXP_XRC wxWizardXmlHandler : public wxXmlResourceHandler
-{
-    DECLARE_DYNAMIC_CLASS(wxWizardXmlHandler)
-
-public:
-    wxWizardXmlHandler();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
-
-private:
-    wxWizard *m_wizard;
-    wxWizardPageSimple *m_lastSimplePage;
-};
-
-#endif // wxUSE_XRC && wxUSE_WIZARDDLG
-
-#endif // _WX_XH_WIZRD_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xmlres.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xmlres.h
deleted file mode 100644
index 8924bcc391..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xmlres.h
+++ /dev/null
@@ -1,647 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xmlres.h
-// Purpose:     XML resources
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XMLRES_H_
-#define _WX_XMLRES_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_XRC
-
-#include "wx/string.h"
-#include "wx/dynarray.h"
-#include "wx/arrstr.h"
-#include "wx/datetime.h"
-#include "wx/list.h"
-#include "wx/gdicmn.h"
-#include "wx/filesys.h"
-#include "wx/bitmap.h"
-#include "wx/icon.h"
-#include "wx/artprov.h"
-#include "wx/colour.h"
-#include "wx/vector.h"
-
-#include "wx/xrc/xmlreshandler.h"
-
-class WXDLLIMPEXP_FWD_BASE wxFileName;
-
-class WXDLLIMPEXP_FWD_CORE wxIconBundle;
-class WXDLLIMPEXP_FWD_CORE wxImageList;
-class WXDLLIMPEXP_FWD_CORE wxMenu;
-class WXDLLIMPEXP_FWD_CORE wxMenuBar;
-class WXDLLIMPEXP_FWD_CORE wxDialog;
-class WXDLLIMPEXP_FWD_CORE wxPanel;
-class WXDLLIMPEXP_FWD_CORE wxWindow;
-class WXDLLIMPEXP_FWD_CORE wxFrame;
-class WXDLLIMPEXP_FWD_CORE wxToolBar;
-
-class WXDLLIMPEXP_FWD_XML wxXmlDocument;
-class WXDLLIMPEXP_FWD_XML wxXmlNode;
-class WXDLLIMPEXP_FWD_XRC wxXmlSubclassFactory;
-class wxXmlSubclassFactories;
-class wxXmlResourceModule;
-class wxXmlResourceDataRecords;
-
-// These macros indicate current version of XML resources (this information is
-// encoded in root node of XRC file as "version" property).
-//
-// Rules for increasing version number:
-//   - change it only if you made incompatible change to the format. Addition
-//     of new attribute to control handler is _not_ incompatible change, because
-//     older versions of the library may ignore it.
-//   - if you change version number, follow these steps:
-//       - set major, minor and release numbers to respective version numbers of
-//         the wxWidgets library (see wx/version.h)
-//       - reset revision to 0 unless the first three are same as before,
-//         in which case you should increase revision by one
-#define WX_XMLRES_CURRENT_VERSION_MAJOR            2
-#define WX_XMLRES_CURRENT_VERSION_MINOR            5
-#define WX_XMLRES_CURRENT_VERSION_RELEASE          3
-#define WX_XMLRES_CURRENT_VERSION_REVISION         0
-#define WX_XMLRES_CURRENT_VERSION_STRING       wxT("2.5.3.0")
-
-#define WX_XMLRES_CURRENT_VERSION \
-                (WX_XMLRES_CURRENT_VERSION_MAJOR * 256*256*256 + \
-                 WX_XMLRES_CURRENT_VERSION_MINOR * 256*256 + \
-                 WX_XMLRES_CURRENT_VERSION_RELEASE * 256 + \
-                 WX_XMLRES_CURRENT_VERSION_REVISION)
-
-enum wxXmlResourceFlags
-{
-    wxXRC_USE_LOCALE     = 1,
-    wxXRC_NO_SUBCLASSING = 2,
-    wxXRC_NO_RELOADING   = 4
-};
-
-// This class holds XML resources from one or more .xml files
-// (or derived forms, either binary or zipped -- see manual for
-// details).
-class WXDLLIMPEXP_XRC wxXmlResource : public wxObject
-{
-public:
-    // Constructor.
-    // Flags: wxXRC_USE_LOCALE
-    //              translatable strings will be translated via _()
-    //              using the given domain if specified
-    //        wxXRC_NO_SUBCLASSING
-    //              subclass property of object nodes will be ignored
-    //              (useful for previews in XRC editors)
-    //        wxXRC_NO_RELOADING
-    //              don't check the modification time of the XRC files and
-    //              reload them if they have changed on disk
-    wxXmlResource(int flags = wxXRC_USE_LOCALE,
-                  const wxString& domain = wxEmptyString);
-
-    // Constructor.
-    // Flags: wxXRC_USE_LOCALE
-    //              translatable strings will be translated via _()
-    //              using the given domain if specified
-    //        wxXRC_NO_SUBCLASSING
-    //              subclass property of object nodes will be ignored
-    //              (useful for previews in XRC editors)
-    wxXmlResource(const wxString& filemask, int flags = wxXRC_USE_LOCALE,
-                  const wxString& domain = wxEmptyString);
-
-    // Destructor.
-    virtual ~wxXmlResource();
-
-    // Loads resources from XML files that match given filemask.
-    // This method understands wxFileSystem URLs if wxUSE_FILESYS.
-    bool Load(const wxString& filemask);
-
-    // Loads resources from single XRC file.
-    bool LoadFile(const wxFileName& file);
-
-    // Loads all XRC files from a directory.
-    bool LoadAllFiles(const wxString& dirname);
-
-    // Unload resource from the given XML file (wildcards not allowed)
-    bool Unload(const wxString& filename);
-
-    // Initialize handlers for all supported controls/windows. This will
-    // make the executable quite big because it forces linking against
-    // most of the wxWidgets library.
-    void InitAllHandlers();
-
-    // Initialize only a specific handler (or custom handler). Convention says
-    // that handler name is equal to the control's name plus 'XmlHandler', for
-    // example wxTextCtrlXmlHandler, wxHtmlWindowXmlHandler. The XML resource
-    // compiler (xmlres) can create include file that contains initialization
-    // code for all controls used within the resource.
-    void AddHandler(wxXmlResourceHandler *handler);
-
-    // Add a new handler at the beginning of the handler list
-    void InsertHandler(wxXmlResourceHandler *handler);
-
-    // Removes all handlers
-    void ClearHandlers();
-
-    // Registers subclasses factory for use in XRC. This function is not meant
-    // for public use, please see the comment above wxXmlSubclassFactory
-    // definition.
-    static void AddSubclassFactory(wxXmlSubclassFactory *factory);
-
-    // Loads menu from resource. Returns NULL on failure.
-    wxMenu *LoadMenu(const wxString& name);
-
-    // Loads menubar from resource. Returns NULL on failure.
-    wxMenuBar *LoadMenuBar(wxWindow *parent, const wxString& name);
-
-    // Loads menubar from resource. Returns NULL on failure.
-    wxMenuBar *LoadMenuBar(const wxString& name) { return LoadMenuBar(NULL, name); }
-
-#if wxUSE_TOOLBAR
-    // Loads a toolbar.
-    wxToolBar *LoadToolBar(wxWindow *parent, const wxString& name);
-#endif
-
-    // Loads a dialog. dlg points to parent window (if any).
-    wxDialog *LoadDialog(wxWindow *parent, const wxString& name);
-
-    // Loads a dialog. dlg points to parent window (if any). This form
-    // is used to finish creation of already existing instance (main reason
-    // for this is that you may want to use derived class with new event table)
-    // Example (typical usage):
-    //      MyDialog dlg;
-    //      wxTheXmlResource->LoadDialog(&dlg, mainFrame, "my_dialog");
-    //      dlg->ShowModal();
-    bool LoadDialog(wxDialog *dlg, wxWindow *parent, const wxString& name);
-
-    // Loads a panel. panel points to parent window (if any).
-    wxPanel *LoadPanel(wxWindow *parent, const wxString& name);
-
-    // Loads a panel. panel points to parent window (if any). This form
-    // is used to finish creation of already existing instance.
-    bool LoadPanel(wxPanel *panel, wxWindow *parent, const wxString& name);
-
-    // Loads a frame.
-    wxFrame *LoadFrame(wxWindow* parent, const wxString& name);
-    bool LoadFrame(wxFrame* frame, wxWindow *parent, const wxString& name);
-
-    // Load an object from the resource specifying both the resource name and
-    // the classname.  This lets you load nonstandard container windows.
-    wxObject *LoadObject(wxWindow *parent, const wxString& name,
-                         const wxString& classname)
-    {
-        return DoLoadObject(parent, name, classname, false /* !recursive */);
-    }
-
-    // Load an object from the resource specifying both the resource name and
-    // the classname.  This form lets you finish the creation of an existing
-    // instance.
-    bool LoadObject(wxObject *instance,
-                    wxWindow *parent,
-                    const wxString& name,
-                    const wxString& classname)
-    {
-        return DoLoadObject(instance, parent, name, classname, false);
-    }
-
-    // These versions of LoadObject() look for the object with the given name
-    // recursively (breadth first) and can be used to instantiate an individual
-    // control defined anywhere in an XRC file. No check is done that the name
-    // is unique, it's up to the caller to ensure this.
-    wxObject *LoadObjectRecursively(wxWindow *parent,
-                                    const wxString& name,
-                                    const wxString& classname)
-    {
-        return DoLoadObject(parent, name, classname, true /* recursive */);
-    }
-
-    bool LoadObjectRecursively(wxObject *instance,
-                               wxWindow *parent,
-                               const wxString& name,
-                               const wxString& classname)
-    {
-        return DoLoadObject(instance, parent, name, classname, true);
-    }
-
-    // Loads a bitmap resource from a file.
-    wxBitmap LoadBitmap(const wxString& name);
-
-    // Loads an icon resource from a file.
-    wxIcon LoadIcon(const wxString& name);
-
-    // Attaches an unknown control to the given panel/window/dialog.
-    // Unknown controls are used in conjunction with .
-    bool AttachUnknownControl(const wxString& name, wxWindow *control,
-                              wxWindow *parent = NULL);
-
-    // Returns a numeric ID that is equivalent to the string ID used in an XML
-    // resource. If an unknown str_id is requested (i.e. other than wxID_XXX
-    // or integer), a new record is created which associates the given string
-    // with a number. If value_if_not_found == wxID_NONE, the number is obtained via
-    // wxWindow::NewControlId(). Otherwise value_if_not_found is used.
-    // Macro XRCID(name) is provided for convenient use in event tables.
-    static int GetXRCID(const wxString& str_id, int value_if_not_found = wxID_NONE)
-        { return DoGetXRCID(str_id.mb_str(), value_if_not_found); }
-
-    // version for internal use only
-    static int DoGetXRCID(const char *str_id, int value_if_not_found = wxID_NONE);
-
-
-    // Find the string ID with the given numeric value, returns an empty string
-    // if no such ID is found.
-    //
-    // Notice that unlike GetXRCID(), which is fast, this operation is slow as
-    // it checks all the IDs used in XRC.
-    static wxString FindXRCIDById(int numId);
-
-
-    // Returns version information (a.b.c.d = d+ 256*c + 256^2*b + 256^3*a).
-    long GetVersion() const { return m_version; }
-
-    // Compares resources version to argument. Returns -1 if resources version
-    // is less than the argument, +1 if greater and 0 if they equal.
-    int CompareVersion(int major, int minor, int release, int revision) const
-    {
-        long diff = GetVersion() -
-                    (major*256*256*256 + minor*256*256 + release*256 + revision);
-        if ( diff < 0 )
-            return -1;
-        else if ( diff > 0 )
-            return +1;
-        else
-            return 0;
-    }
-
-    //// Singleton accessors.
-
-    // Gets the global resources object or creates one if none exists.
-    static wxXmlResource *Get();
-
-    // Sets the global resources object and returns a pointer to the previous one (may be NULL).
-    static wxXmlResource *Set(wxXmlResource *res);
-
-    // Returns flags, which may be a bitlist of wxXRC_USE_LOCALE and wxXRC_NO_SUBCLASSING.
-    int GetFlags() const { return m_flags; }
-    // Set flags after construction.
-    void SetFlags(int flags) { m_flags = flags; }
-
-    // Get/Set the domain to be passed to the translation functions, defaults
-    // to empty string (no domain).
-    const wxString& GetDomain() const { return m_domain; }
-    void SetDomain(const wxString& domain);
-
-
-    // This function returns the wxXmlNode containing the definition of the
-    // object with the given name or NULL.
-    //
-    // It can be used to access additional information defined in the XRC file
-    // and not used by wxXmlResource itself.
-    const wxXmlNode *GetResourceNode(const wxString& name) const
-        { return GetResourceNodeAndLocation(name, wxString(), true); }
-
-protected:
-    // reports input error at position 'context'
-    void ReportError(const wxXmlNode *context, const wxString& message);
-
-    // override this in derived class to customize errors reporting
-    virtual void DoReportError(const wxString& xrcFile, const wxXmlNode *position,
-                               const wxString& message);
-
-    // Load the contents of a single file and returns its contents as a new
-    // wxXmlDocument (which will be owned by caller) on success or NULL.
-    wxXmlDocument *DoLoadFile(const wxString& file);
-
-    // Scans the resources list for unloaded files and loads them. Also reloads
-    // files that have been modified since last loading.
-    bool UpdateResources();
-
-
-    // Common implementation of GetResourceNode() and FindResource(): searches
-    // all top-level or all (if recursive == true) nodes if all loaded XRC
-    // files and returns the node, if found, as well as the path of the file it
-    // was found in if path is non-NULL
-    wxXmlNode *GetResourceNodeAndLocation(const wxString& name,
-                                          const wxString& classname,
-                                          bool recursive = false,
-                                          wxString *path = NULL) const;
-
-
-    // Note that these functions are used outside of wxWidgets itself, e.g.
-    // there are several known cases of inheriting from wxXmlResource just to
-    // be able to call FindResource() so we keep them for compatibility even if
-    // their names are not really consistent with GetResourceNode() public
-    // function and FindResource() is also non-const because it changes the
-    // current path of m_curFileSystem to ensure that relative paths work
-    // correctly when CreateResFromNode() is called immediately afterwards
-    // (something const public function intentionally does not do)
-
-    // Returns the node containing the resource with the given name and class
-    // name unless it's empty (then any class matches) or NULL if not found.
-    wxXmlNode *FindResource(const wxString& name, const wxString& classname,
-                            bool recursive = false);
-
-    // Helper function used by FindResource() to look under the given node.
-    wxXmlNode *DoFindResource(wxXmlNode *parent, const wxString& name,
-                              const wxString& classname, bool recursive) const;
-
-    // Creates a resource from information in the given node
-    // (Uses only 'handlerToUse' if != NULL)
-    wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent,
-                                wxObject *instance = NULL,
-                                wxXmlResourceHandler *handlerToUse = NULL)
-    {
-        return node ? DoCreateResFromNode(*node, parent, instance, handlerToUse)
-                    : NULL;
-    }
-
-    // Helper of Load() and Unload(): returns the URL corresponding to the
-    // given file if it's indeed a file, otherwise returns the original string
-    // unmodified
-    static wxString ConvertFileNameToURL(const wxString& filename);
-
-    // loading resources from archives is impossible without wxFileSystem
-#if wxUSE_FILESYSTEM
-    // Another helper: detect if the filename is a ZIP or XRS file
-    static bool IsArchive(const wxString& filename);
-#endif // wxUSE_FILESYSTEM
-
-private:
-    wxXmlResourceDataRecords& Data() { return *m_data; }
-    const wxXmlResourceDataRecords& Data() const { return *m_data; }
-
-    // the real implementation of CreateResFromNode(): this should be only
-    // called if node is non-NULL
-    wxObject *DoCreateResFromNode(wxXmlNode& node,
-                                  wxObject *parent,
-                                  wxObject *instance,
-                                  wxXmlResourceHandler *handlerToUse = NULL);
-
-    // common part of LoadObject() and LoadObjectRecursively()
-    wxObject *DoLoadObject(wxWindow *parent,
-                           const wxString& name,
-                           const wxString& classname,
-                           bool recursive);
-    bool DoLoadObject(wxObject *instance,
-                      wxWindow *parent,
-                      const wxString& name,
-                      const wxString& classname,
-                      bool recursive);
-
-private:
-    long m_version;
-
-    int m_flags;
-    wxVector m_handlers;
-    wxXmlResourceDataRecords *m_data;
-#if wxUSE_FILESYSTEM
-    wxFileSystem m_curFileSystem;
-    wxFileSystem& GetCurFileSystem() { return m_curFileSystem; }
-#endif
-
-    // domain to pass to translation functions, if any.
-    wxString m_domain;
-
-    friend class wxXmlResourceHandlerImpl;
-    friend class wxXmlResourceModule;
-    friend class wxIdRangeManager;
-    friend class wxIdRange;
-
-    static wxXmlSubclassFactories *ms_subclassFactories;
-
-    // singleton instance:
-    static wxXmlResource *ms_instance;
-};
-
-
-// This macro translates string identifier (as used in XML resource,
-// e.g. ...) to integer id that is needed by
-// wxWidgets event tables.
-// Example:
-//    BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-//       EVT_MENU(XRCID("quit"), MyFrame::OnQuit)
-//       EVT_MENU(XRCID("about"), MyFrame::OnAbout)
-//       EVT_MENU(XRCID("new"), MyFrame::OnNew)
-//       EVT_MENU(XRCID("open"), MyFrame::OnOpen)
-//    END_EVENT_TABLE()
-
-#define XRCID(str_id) \
-    wxXmlResource::DoGetXRCID(str_id)
-
-
-// This macro returns pointer to particular control in dialog
-// created using XML resources. You can use it to set/get values from
-// controls.
-// Example:
-//    wxDialog dlg;
-//    wxXmlResource::Get()->LoadDialog(&dlg, mainFrame, "my_dialog");
-//    XRCCTRL(dlg, "my_textctrl", wxTextCtrl)->SetValue(wxT("default value"));
-
-#define XRCCTRL(window, id, type) \
-    (wxStaticCast((window).FindWindow(XRCID(id)), type))
-
-// This macro returns pointer to sizer item
-// Example:
-//
-// 
-//   400, 300
-// 
-//
-// wxSizerItem* item = XRCSIZERITEM(*this, "area")
-
-#define XRCSIZERITEM(window, id) \
-    ((window).GetSizer() ? (window).GetSizer()->GetItemById(XRCID(id)) : NULL)
-
-
-// wxXmlResourceHandlerImpl is the back-end of the wxXmlResourceHander class to
-// really implementing all its functionality. It is defined in the "xrc"
-// library unlike wxXmlResourceHandler itself which is defined in "core" to
-// allow inheriting from it in the code from the other libraries too.
-
-class WXDLLIMPEXP_XRC wxXmlResourceHandlerImpl : public wxXmlResourceHandlerImplBase
-{
-public:
-    // Constructor.
-    wxXmlResourceHandlerImpl(wxXmlResourceHandler *handler);
-
-    // Destructor.
-    virtual ~wxXmlResourceHandlerImpl() {}
-
-    // Creates an object (menu, dialog, control, ...) from an XML node.
-    // Should check for validity.
-    // parent is a higher-level object (usually window, dialog or panel)
-    // that is often necessary to create the resource.
-    // If instance is non-NULL it should not create a new instance via 'new' but
-    // should rather use this one, and call its Create method.
-    wxObject *CreateResource(wxXmlNode *node, wxObject *parent,
-                             wxObject *instance);
-
-
-    // --- Handy methods:
-
-    // Returns true if the node has a property class equal to classname,
-    // e.g. .
-    bool IsOfClass(wxXmlNode *node, const wxString& classname) const;
-
-    // Gets node content from wxXML_ENTITY_NODE
-    // The problem is, content is represented as
-    // wxXML_ENTITY_NODE name="tag", content=""
-    //    |-- wxXML_TEXT_NODE or
-    //        wxXML_CDATA_SECTION_NODE name="" content="content"
-    wxString GetNodeContent(const wxXmlNode *node);
-
-    // Check to see if a parameter exists.
-    bool HasParam(const wxString& param);
-
-    // Finds the node or returns NULL.
-    wxXmlNode *GetParamNode(const wxString& param);
-
-    // Finds the parameter value or returns the empty string.
-    wxString GetParamValue(const wxString& param);
-
-    // Returns the parameter value from given node.
-    wxString GetParamValue(const wxXmlNode* node);
-
-    // Gets style flags from text in form "flag | flag2| flag3 |..."
-    // Only understands flags added with AddStyle
-    int GetStyle(const wxString& param = wxT("style"), int defaults = 0);
-
-    // Gets text from param and does some conversions:
-    // - replaces \n, \r, \t by respective chars (according to C syntax)
-    // - replaces _ by & and __ by _ (needed for _File => &File because of XML)
-    // - calls wxGetTranslations (unless disabled in wxXmlResource)
-    wxString GetText(const wxString& param, bool translate = true);
-
-    // Returns the XRCID.
-    int GetID();
-
-    // Returns the resource name.
-    wxString GetName();
-
-    // Gets a bool flag (1, t, yes, on, true are true, everything else is false).
-    bool GetBool(const wxString& param, bool defaultv = false);
-
-    // Gets an integer value from the parameter.
-    long GetLong(const wxString& param, long defaultv = 0);
-
-    // Gets a float value from the parameter.
-    float GetFloat(const wxString& param, float defaultv = 0);
-
-    // Gets colour in HTML syntax (#RRGGBB).
-    wxColour GetColour(const wxString& param, const wxColour& defaultv = wxNullColour);
-
-    // Gets the size (may be in dialog units).
-    wxSize GetSize(const wxString& param = wxT("size"),
-                   wxWindow *windowToUse = NULL);
-
-    // Gets the position (may be in dialog units).
-    wxPoint GetPosition(const wxString& param = wxT("pos"));
-
-    // Gets a dimension (may be in dialog units).
-    wxCoord GetDimension(const wxString& param, wxCoord defaultv = 0,
-                         wxWindow *windowToUse = NULL);
-
-    // Gets a direction, complains if the value is invalid.
-    wxDirection GetDirection(const wxString& param, wxDirection dirDefault = wxLEFT);
-
-    // Gets a bitmap.
-    wxBitmap GetBitmap(const wxString& param = wxT("bitmap"),
-                       const wxArtClient& defaultArtClient = wxART_OTHER,
-                       wxSize size = wxDefaultSize);
-
-    // Gets a bitmap from an XmlNode.
-    wxBitmap GetBitmap(const wxXmlNode* node,
-                       const wxArtClient& defaultArtClient = wxART_OTHER,
-                       wxSize size = wxDefaultSize);
-
-    // Gets an icon.
-    wxIcon GetIcon(const wxString& param = wxT("icon"),
-                   const wxArtClient& defaultArtClient = wxART_OTHER,
-                   wxSize size = wxDefaultSize);
-
-    // Gets an icon from an XmlNode.
-    wxIcon GetIcon(const wxXmlNode* node,
-                   const wxArtClient& defaultArtClient = wxART_OTHER,
-                   wxSize size = wxDefaultSize);
-
-    // Gets an icon bundle.
-    wxIconBundle GetIconBundle(const wxString& param,
-                               const wxArtClient& defaultArtClient = wxART_OTHER);
-
-    // Gets an image list.
-    wxImageList *GetImageList(const wxString& param = wxT("imagelist"));
-
-#if wxUSE_ANIMATIONCTRL
-    // Gets an animation.
-    wxAnimation* GetAnimation(const wxString& param = wxT("animation"));
-#endif
-
-    // Gets a font.
-    wxFont GetFont(const wxString& param = wxT("font"), wxWindow* parent = NULL);
-
-    // Gets the value of a boolean attribute (only "0" and "1" are valid values)
-    bool GetBoolAttr(const wxString& attr, bool defaultv);
-
-
-    // Sets common window options.
-    void SetupWindow(wxWindow *wnd);
-
-    // Creates children.
-    void CreateChildren(wxObject *parent, bool this_hnd_only = false);
-
-    // Helper function.
-    void CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode = NULL);
-
-    // Creates a resource from a node.
-    wxObject *CreateResFromNode(wxXmlNode *node,
-                                wxObject *parent, wxObject *instance = NULL);
-
-    // helper
-#if wxUSE_FILESYSTEM
-    wxFileSystem& GetCurFileSystem();
-#endif
-
-    // reports input error at position 'context'
-    void ReportError(wxXmlNode *context, const wxString& message);
-    // reports input error at m_node
-    void ReportError(const wxString& message);
-    // reports input error when parsing parameter with given name
-    void ReportParamError(const wxString& param, const wxString& message);
-};
-
-
-// Programmer-friendly macros for writing XRC handlers:
-
-#define XRC_MAKE_INSTANCE(variable, classname) \
-   classname *variable = NULL; \
-   if (m_instance) \
-       variable = wxStaticCast(m_instance, classname); \
-   if (!variable) \
-       variable = new classname;
-
-
-// FIXME -- remove this $%^#$%#$@# as soon as Ron checks his changes in!!
-WXDLLIMPEXP_XRC void wxXmlInitResourceModule();
-
-
-// This class is used to create instances of XRC "object" nodes with "subclass"
-// property. It is _not_ supposed to be used by XRC users, you should instead
-// register your subclasses via wxWidgets' RTTI mechanism. This class is useful
-// only for language bindings developer who need a way to implement subclassing
-// in wxWidgets ports that don't support wxRTTI (e.g. wxPython).
-class WXDLLIMPEXP_XRC wxXmlSubclassFactory
-{
-public:
-    // Try to create instance of given class and return it, return NULL on
-    // failure:
-    virtual wxObject *Create(const wxString& className) = 0;
-    virtual ~wxXmlSubclassFactory() {}
-};
-
-
-/* -------------------------------------------------------------------------
-   Backward compatibility macros. Do *NOT* use, they may disappear in future
-   versions of the XRC library!
-   ------------------------------------------------------------------------- */
-
-#endif // wxUSE_XRC
-
-#endif // _WX_XMLRES_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xmlreshandler.h b/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xmlreshandler.h
deleted file mode 100644
index 7aa12b7bc6..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/include/wx/xrc/xmlreshandler.h
+++ /dev/null
@@ -1,389 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        wx/xrc/xmlreshandler.cpp
-// Purpose:     XML resource handler
-// Author:      Steven Lamerton
-// Created:     2011/01/26
-// RCS-ID:      $id$
-// Copyright:   (c) 2011 Steven Lamerton
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XRC_XMLRESHANDLER_H_
-#define _WX_XRC_XMLRESHANDLER_H_
-
-#include "wx/defs.h"
-
-#if wxUSE_XRC
-
-#include "wx/string.h"
-#include "wx/artprov.h"
-#include "wx/colour.h"
-#include "wx/filesys.h"
-#include "wx/imaglist.h"
-#include "wx/window.h"
-
-class WXDLLIMPEXP_FWD_ADV wxAnimation;
-
-class WXDLLIMPEXP_FWD_XML wxXmlNode;
-class WXDLLIMPEXP_FWD_XML wxXmlResource;
-
-class WXDLLIMPEXP_FWD_CORE wxXmlResourceHandler;
-
-// Helper macro used by the classes derived from wxXmlResourceHandler but also
-// by wxXmlResourceHandler implementation itself.
-#define XRC_ADD_STYLE(style) AddStyle(wxT(#style), style)
-
-// Abstract base class for the implementation object used by
-// wxXmlResourceHandlerImpl. The real implementation is in
-// wxXmlResourceHandlerImpl class in the "xrc" library while this class is in
-// the "core" itself -- but it is so small that it doesn't matter.
-
-class WXDLLIMPEXP_CORE wxXmlResourceHandlerImplBase : public wxObject
-{
-public:
-    // Constructor.
-    wxXmlResourceHandlerImplBase(wxXmlResourceHandler *handler)
-        : m_handler(handler)
-    {}
-
-    // Destructor.
-    virtual ~wxXmlResourceHandlerImplBase() {}
-
-    virtual wxObject *CreateResource(wxXmlNode *node, wxObject *parent,
-                                     wxObject *instance) = 0;
-    virtual bool IsOfClass(wxXmlNode *node, const wxString& classname) const = 0;
-    virtual wxString GetNodeContent(const wxXmlNode *node) = 0;
-    virtual bool HasParam(const wxString& param) = 0;
-    virtual wxXmlNode *GetParamNode(const wxString& param) = 0;
-    virtual wxString GetParamValue(const wxString& param) = 0;
-    virtual wxString GetParamValue(const wxXmlNode* node) = 0;
-    virtual int GetStyle(const wxString& param = wxT("style"), int defaults = 0) = 0;
-    virtual wxString GetText(const wxString& param, bool translate = true) = 0;
-    virtual int GetID() = 0;
-    virtual wxString GetName() = 0;
-    virtual bool GetBool(const wxString& param, bool defaultv = false) = 0;
-    virtual long GetLong(const wxString& param, long defaultv = 0) = 0;
-    virtual float GetFloat(const wxString& param, float defaultv = 0) = 0;
-    virtual wxColour GetColour(const wxString& param,
-                               const wxColour& defaultv = wxNullColour) = 0;
-    virtual wxSize GetSize(const wxString& param = wxT("size"),
-                           wxWindow *windowToUse = NULL) = 0;
-    virtual wxPoint GetPosition(const wxString& param = wxT("pos")) = 0;
-    virtual wxCoord GetDimension(const wxString& param, wxCoord defaultv = 0,
-                                 wxWindow *windowToUse = NULL) = 0;
-    virtual wxDirection GetDirection(const wxString& param, wxDirection dir = wxLEFT) = 0;
-    virtual wxBitmap GetBitmap(const wxString& param = wxT("bitmap"),
-                               const wxArtClient& defaultArtClient = wxART_OTHER,
-                               wxSize size = wxDefaultSize) = 0;
-    virtual wxBitmap GetBitmap(const wxXmlNode* node,
-                               const wxArtClient& defaultArtClient = wxART_OTHER,
-                               wxSize size = wxDefaultSize) = 0;
-    virtual wxIcon GetIcon(const wxString& param = wxT("icon"),
-                           const wxArtClient& defaultArtClient = wxART_OTHER,
-                           wxSize size = wxDefaultSize) = 0;
-    virtual wxIcon GetIcon(const wxXmlNode* node,
-                           const wxArtClient& defaultArtClient = wxART_OTHER,
-                           wxSize size = wxDefaultSize) = 0;
-    virtual wxIconBundle GetIconBundle(const wxString& param,
-                                       const wxArtClient& defaultArtClient = wxART_OTHER) = 0;
-    virtual wxImageList *GetImageList(const wxString& param = wxT("imagelist")) = 0;
-
-#if wxUSE_ANIMATIONCTRL
-    virtual wxAnimation* GetAnimation(const wxString& param = wxT("animation")) = 0;
-#endif
-
-    virtual wxFont GetFont(const wxString& param = wxT("font"), wxWindow* parent = NULL) = 0;
-    virtual bool GetBoolAttr(const wxString& attr, bool defaultv) = 0;
-    virtual void SetupWindow(wxWindow *wnd) = 0;
-    virtual void CreateChildren(wxObject *parent, bool this_hnd_only = false) = 0;
-    virtual void CreateChildrenPrivately(wxObject *parent,
-                                         wxXmlNode *rootnode = NULL) = 0;
-    virtual wxObject *CreateResFromNode(wxXmlNode *node, wxObject *parent,
-                                        wxObject *instance = NULL) = 0;
-
-#if wxUSE_FILESYSTEM
-    virtual wxFileSystem& GetCurFileSystem() = 0;
-#endif
-    virtual void ReportError(wxXmlNode *context, const wxString& message) = 0;
-    virtual void ReportError(const wxString& message) = 0;
-    virtual void ReportParamError(const wxString& param, const wxString& message) = 0;
-
-    wxXmlResourceHandler* GetHandler() { return m_handler; }
-
-protected:
-    wxXmlResourceHandler *m_handler;
-};
-
-// Base class for all XRC handlers.
-//
-// Notice that this class is defined in the core library itself and so can be
-// used as the base class by classes in any GUI library. However to actually be
-// usable, it needs to be registered with wxXmlResource which implies linking
-// the application with the xrc library.
-//
-// Also note that all the methods forwarding to GetImpl() are documented only
-// in wxXmlResourceHandlerImpl in wx/xrc/xmlres.h to avoid duplication.
-
-class WXDLLIMPEXP_CORE wxXmlResourceHandler : public wxObject
-{
-public:
-    // Constructor creates an unusable object, before anything can be done with
-    // it, SetImpl() needs to be called as done by wxXmlResource::AddHandler().
-    wxXmlResourceHandler()
-    {
-        m_node = NULL;
-        m_parent =
-        m_instance = NULL;
-        m_parentAsWindow = NULL;
-        m_resource = NULL;
-
-        m_impl = NULL;
-    }
-
-    // This should be called exactly once.
-    void SetImpl(wxXmlResourceHandlerImplBase* impl)
-    {
-        wxASSERT_MSG( !m_impl, wxS("Should be called exactly once") );
-
-        m_impl = impl;
-    }
-
-
-    // Destructor.
-    virtual ~wxXmlResourceHandler()
-    {
-        delete m_impl;
-    }
-
-    wxObject *CreateResource(wxXmlNode *node, wxObject *parent,
-                             wxObject *instance)
-    {
-        return GetImpl()->CreateResource(node, parent, instance);
-    }
-
-    // This one is called from CreateResource after variables
-    // were filled.
-    virtual wxObject *DoCreateResource() = 0;
-
-    // Returns true if it understands this node and can create
-    // a resource from it, false otherwise.
-    virtual bool CanHandle(wxXmlNode *node) = 0;
-
-
-    void SetParentResource(wxXmlResource *res)
-    {
-        m_resource = res;
-    }
-
-
-    // These methods are not forwarded to wxXmlResourceHandlerImpl because they
-    // are called from the derived classes ctors and so before SetImpl() can be
-    // called.
-
-    // Add a style flag (e.g. wxMB_DOCKABLE) to the list of flags
-    // understood by this handler.
-    void AddStyle(const wxString& name, int value);
-
-    // Add styles common to all wxWindow-derived classes.
-    void AddWindowStyles();
-
-protected:
-    // Everything else is simply forwarded to wxXmlResourceHandlerImpl.
-    void ReportError(wxXmlNode *context, const wxString& message)
-    {
-        GetImpl()->ReportError(context, message);
-    }
-    void ReportError(const wxString& message)
-    {
-        GetImpl()->ReportError(message);
-    }
-    void ReportParamError(const wxString& param, const wxString& message)
-    {
-        GetImpl()->ReportParamError(param, message);
-    }
-
-    bool IsOfClass(wxXmlNode *node, const wxString& classname) const
-    {
-        return GetImpl()->IsOfClass(node, classname);
-    }
-    wxString GetNodeContent(const wxXmlNode *node)
-    {
-        return GetImpl()->GetNodeContent(node);
-    }
-    bool HasParam(const wxString& param)
-    {
-        return GetImpl()->HasParam(param);
-    }
-
-    wxXmlNode *GetParamNode(const wxString& param)
-    {
-        return GetImpl()->GetParamNode(param);
-    }
-    wxString GetParamValue(const wxString& param)
-    {
-        return GetImpl()->GetParamValue(param);
-    }
-    wxString GetParamValue(const wxXmlNode* node)
-    {
-        return GetImpl()->GetParamValue(node);
-    }
-    int GetStyle(const wxString& param = wxT("style"), int defaults = 0)
-    {
-        return GetImpl()->GetStyle(param, defaults);
-    }
-    wxString GetText(const wxString& param, bool translate = true)
-    {
-        return GetImpl()->GetText(param, translate);
-    }
-    int GetID() const
-    {
-        return GetImpl()->GetID();
-    }
-    wxString GetName()
-    {
-        return GetImpl()->GetName();
-    }
-    bool GetBool(const wxString& param, bool defaultv = false)
-    {
-        return GetImpl()->GetBool(param, defaultv);
-    }
-    long GetLong(const wxString& param, long defaultv = 0)
-    {
-        return GetImpl()->GetLong(param, defaultv);
-    }
-    float GetFloat(const wxString& param, float defaultv = 0)
-    {
-        return GetImpl()->GetFloat(param, defaultv);
-    }
-    wxColour GetColour(const wxString& param,
-                       const wxColour& defaultv = wxNullColour)
-    {
-        return GetImpl()->GetColour(param, defaultv);
-    }
-    wxSize GetSize(const wxString& param = wxT("size"),
-                   wxWindow *windowToUse = NULL)
-    {
-        return GetImpl()->GetSize(param, windowToUse);
-    }
-    wxPoint GetPosition(const wxString& param = wxT("pos"))
-    {
-        return GetImpl()->GetPosition(param);
-    }
-    wxCoord GetDimension(const wxString& param, wxCoord defaultv = 0,
-                         wxWindow *windowToUse = NULL)
-    {
-        return GetImpl()->GetDimension(param, defaultv, windowToUse);
-    }
-    wxDirection GetDirection(const wxString& param, wxDirection dir = wxLEFT)
-    {
-        return GetImpl()->GetDirection(param, dir);
-    }
-    wxBitmap GetBitmap(const wxString& param = wxT("bitmap"),
-                       const wxArtClient& defaultArtClient = wxART_OTHER,
-                       wxSize size = wxDefaultSize)
-    {
-        return GetImpl()->GetBitmap(param, defaultArtClient, size);
-    }
-    wxBitmap GetBitmap(const wxXmlNode* node,
-                       const wxArtClient& defaultArtClient = wxART_OTHER,
-                       wxSize size = wxDefaultSize)
-    {
-        return GetImpl()->GetBitmap(node, defaultArtClient, size);
-    }
-    wxIcon GetIcon(const wxString& param = wxT("icon"),
-                   const wxArtClient& defaultArtClient = wxART_OTHER,
-                   wxSize size = wxDefaultSize)
-    {
-        return GetImpl()->GetIcon(param, defaultArtClient, size);
-    }
-    wxIcon GetIcon(const wxXmlNode* node,
-                   const wxArtClient& defaultArtClient = wxART_OTHER,
-                   wxSize size = wxDefaultSize)
-    {
-        return GetImpl()->GetIcon(node, defaultArtClient, size);
-    }
-    wxIconBundle GetIconBundle(const wxString& param,
-                               const wxArtClient& defaultArtClient = wxART_OTHER)
-    {
-        return GetImpl()->GetIconBundle(param, defaultArtClient);
-    }
-    wxImageList *GetImageList(const wxString& param = wxT("imagelist"))
-    {
-        return GetImpl()->GetImageList(param);
-    }
-
-#if wxUSE_ANIMATIONCTRL
-    wxAnimation* GetAnimation(const wxString& param = wxT("animation"))
-    {
-        return GetImpl()->GetAnimation(param);
-    }
-#endif
-
-    wxFont GetFont(const wxString& param = wxT("font"),
-                   wxWindow* parent = NULL)
-    {
-        return GetImpl()->GetFont(param, parent);
-    }
-    bool GetBoolAttr(const wxString& attr, bool defaultv)
-    {
-        return GetImpl()->GetBoolAttr(attr, defaultv);
-    }
-    void SetupWindow(wxWindow *wnd)
-    {
-        GetImpl()->SetupWindow(wnd);
-    }
-    void CreateChildren(wxObject *parent, bool this_hnd_only = false)
-    {
-        GetImpl()->CreateChildren(parent, this_hnd_only);
-    }
-    void CreateChildrenPrivately(wxObject *parent, wxXmlNode *rootnode = NULL)
-    {
-        GetImpl()->CreateChildrenPrivately(parent, rootnode);
-    }
-    wxObject *CreateResFromNode(wxXmlNode *node,
-                                wxObject *parent, wxObject *instance = NULL)
-    {
-        return GetImpl()->CreateResFromNode(node, parent, instance);
-    }
-
-#if wxUSE_FILESYSTEM
-    wxFileSystem& GetCurFileSystem()
-    {
-        return GetImpl()->GetCurFileSystem();
-    }
-#endif
-
-    // Variables (filled by CreateResource)
-    wxXmlNode *m_node;
-    wxString m_class;
-    wxObject *m_parent, *m_instance;
-    wxWindow *m_parentAsWindow;
-    wxXmlResource *m_resource;
-
-    // provide method access to those member variables
-    wxXmlResource* GetResource() const        { return m_resource; }
-    wxXmlNode* GetNode() const                { return m_node; }
-    wxString GetClass() const                 { return m_class; }
-    wxObject* GetParent() const               { return m_parent; }
-    wxObject* GetInstance() const             { return m_instance; }
-    wxWindow* GetParentAsWindow() const       { return m_parentAsWindow; }
-
-    
-    wxArrayString m_styleNames;
-    wxArrayInt m_styleValues;
-
-    friend class wxXmlResourceHandlerImpl;
-
-private:
-    // This is supposed to never return NULL because SetImpl() should have been
-    // called.
-    wxXmlResourceHandlerImplBase* GetImpl() const;
-
-    wxXmlResourceHandlerImplBase *m_impl;
-
-    wxDECLARE_ABSTRACT_CLASS(wxXmlResourceHandler);
-};
-
-#endif // wxUSE_XRC
-
-#endif // _WX_XRC_XMLRESHANDLER_H_
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/MAKEFILE.VA b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/MAKEFILE.VA
deleted file mode 100644
index ddaef8bd49..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/MAKEFILE.VA
+++ /dev/null
@@ -1,335 +0,0 @@
-#
-# File:      makefile.vc
-# Author:    David Webster
-# Created:   1999
-# Updated:
-# Copyright:
-# Licence:   wxWindows Licence
-# "%W% %G%"
-#
-# Makefile : Builds os2jpeg.lib library for OS/2 3.0/4.0
-
-# Suffixes
-OBJSUFF=obj
-SRCSUFF=cpp
-
-OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP__ /D__WXPM__ /DJPEGLOCAL /Ss /Q /N100 /Tdc
-OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16
-OS2LIBFLAGS=/NOL /NOE
-OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
-
-!if "$(WXMAKINGDLL)" != "0"
-EXTRADLLFLAGS=/DWXMAKINGDLL=1 /Ge- /D__OS2DLL__
-EXTRALNKFLAGS=/DLL
-!endif
-
-# Change WXDIR or WXWIN to wherever wxWindows is found
-WXDIR = $(WXWIN)
-
-OS2JPEGDIR=$(WXDIR)\src\jpeg
-OS2JPEGINC=$(WINJPEGDIR)
-!if "$(WXMAKINGDLL)" != "1"
-OS2JPEGLIB=$(WXDIR)\lib\os2jpeg.lib
-!else
-OS2JPEGLIB=$(WXDIR)\lib\os2jpeg.dll
-!endif
-
-TEMP1TGT=$(WXDIR)\lib\os2jpeg1.lib
-TEMP2TGT=$(WXDIR)\lib\os2jpeg2.lib
-
-INC=-I$(WXDIR)\src\jpeg -I$(WXDIR)\Include
-!ifndef FINAL
-FINAL=0
-!endif
-
-!if "$(NOPCH)" == "1"
-PCH=
-PRECOMP=
-MAKEPRECOMP=
-!else
-PCH=$(WXLIBNAME).pch
-PRECOMP=/Si$(PCH)
-MAKEPRECOMP=/Fi$(PCH)
-!endif
-
-!if "$(FINAL)" == "0"
-!if "$(WXMAKINGDLL)" == "1"
-D=DebugOS2DLL
-!else
-D=DebugOS2
-!endif
-
-OPT =
-DEBUG_FLAGS= /Ti /D__WXDEBUG__ #/Fb
-LINK_DEBUG_FLAGS=/DEBUG
-CRTFLAG=/Gm /Gd
-!else
-# /O1 - smallest code
-# /O2 - fastest code
-!if "$(WXMAKINGDLL)" == "1"
-D=RelseOS2DLL
-!else
-D=RelseOS2
-!endif
-OPT = /O+ /Oc /G5
-DEBUG_FLAGS=
-LINK_DEBUG_FLAGS=/RELEASE
-CRTFLAG=/Gm /Gd
-!endif
-
-!if [md $(OS2JPEGDIR)\$D]
-!endif
-
-CPPFLAGS=$(OS2FLAGS) $(EXTRADLLFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(INC) $(OPT) $(CRTFLAG)
-LINKFKAGS=$(OS2LINKFLAGS) $(EXTRALNKFLAGS)
-
-{..\jpeg}.c{..\jpeg\$D}.obj:
-    @echo $<
-    icc @<<
-$(CPPFLAGS) /Fo$@ /Tp $<
-<<
-
-SYSDEPMEM= ..\jpeg\$D\jmemnobs.obj
-
-# library object files common to compression and decompression
-COMOBJECTS= \
-  ..\jpeg\$D\jcomapi.obj \
-  ..\jpeg\$D\jutils.obj \
-  ..\jpeg\$D\jerror.obj \
-  ..\jpeg\$D\jmemmgr.obj \
-  $(SYSDEPMEM)
-
-COMLIBOBJS= \
-  jcomapi.obj \
-  jutils.obj \
-  jerror.obj \
-  jmemmgr.obj \
-  jmemnobs
-
-# compression library object files
-CLIBOBJECTS= \
-  ..\jpeg\$D\jcapimin.obj \
-  ..\jpeg\$D\jcapistd.obj \
-  ..\jpeg\$D\jctrans.obj \
-  ..\jpeg\$D\jcparam.obj \
-  ..\jpeg\$D\jdatadst.obj \
-  ..\jpeg\$D\jcinit.obj \
-  ..\jpeg\$D\jcmaster.obj \
-  ..\jpeg\$D\jcmarker.obj \
-  ..\jpeg\$D\jcmainct.obj \
-  ..\jpeg\$D\jcprepct.obj \
-  ..\jpeg\$D\jccoefct.obj \
-  ..\jpeg\$D\jccolor.obj \
-  ..\jpeg\$D\jcsample.obj \
-  ..\jpeg\$D\jchuff.obj \
-  ..\jpeg\$D\jcphuff.obj \
-  ..\jpeg\$D\jcdctmgr.obj \
-  ..\jpeg\$D\jfdctfst.obj \
-  ..\jpeg\$D\jfdctflt.obj \
-  ..\jpeg\$D\jfdctint.obj
-
-CLIBLIBOBJS= \
-  jcapimin.obj \
-  jcapistd.obj \
-  jctrans.obj \
-  jcparam.obj \
-  jdatadst.obj \
-  jcinit.obj \
-  jcmaster.obj \
-  jcmarker.obj \
-  jcmainct.obj \
-  jcprepct.obj \
-  jccoefct.obj \
-  jccolor.obj \
-  jcsample.obj \
-  jchuff.obj \
-  jcphuff.obj \
-  jcdctmgr.obj \
-  jfdctfst.obj \
-  jfdctflt.obj \
-  jfdctint.obj
-
-# decompression library object files
-DLIBOBJECTS= \
-  ..\jpeg\$D\jdapimin.obj \
-  ..\jpeg\$D\jdapistd.obj \
-  ..\jpeg\$D\jdtrans.obj \
-  ..\jpeg\$D\jdatasrc.obj \
-  ..\jpeg\$D\jdmaster.obj \
-  ..\jpeg\$D\jdinput.obj \
-  ..\jpeg\$D\jdmarker.obj \
-  ..\jpeg\$D\jdhuff.obj \
-  ..\jpeg\$D\jdphuff.obj \
-  ..\jpeg\$D\jdmainct.obj \
-  ..\jpeg\$D\jdcoefct.obj \
-  ..\jpeg\$D\jdpostct.obj \
-  ..\jpeg\$D\jddctmgr.obj \
-  ..\jpeg\$D\jidctfst.obj \
-  ..\jpeg\$D\jidctflt.obj \
-  ..\jpeg\$D\jidctint.obj \
-  ..\jpeg\$D\jidctred.obj \
-  ..\jpeg\$D\jdsample.obj \
-  ..\jpeg\$D\jdcolor.obj \
-  ..\jpeg\$D\jquant1.obj \
-  ..\jpeg\$D\jquant2.obj \
-  ..\jpeg\$D\jdmerge.obj
-
-DLIBLIBOBJS= \
-  jdapimin.obj \
-  jdapistd.obj \
-  jdtrans.obj \
-  jdatasrc.obj \
-  jdmaster.obj \
-  jdinput.obj \
-  jdmarker.obj \
-  jdhuff.obj \
-  jdphuff.obj \
-  jdmainct.obj \
-  jdcoefct.obj \
-  jdpostct.obj \
-  jddctmgr.obj \
-  jidctfst.obj \
-  jidctflt.obj \
-  jidctint.obj \
-  jidctred.obj \
-  jdsample.obj \
-  jdcolor.obj \
-  jquant1.obj \
-  jquant2.obj \
-  jdmerge.obj
-
-# These objectfiles are included in libjpeg.lib
-OBJECTS=  $(COMOBJECTS) $(CLIBOBJECTS) $(DLIBOBJECTS)
-
-# object files for sample applications (excluding library files)
-COBJECTS= \
-  ..\jpeg\$D\cjpeg.obj \
-  ..\jpeg\$D\rdppm.obj \
-  ..\jpeg\$D\rdgif.obj \
-  ..\jpeg\$D\rdtarga.obj \
-  ..\jpeg\$D\rdrle.obj \
-  ..\jpeg\$D\rdbmp.obj \
-  ..\jpeg\$D\rdswitch.obj \
-  ..\jpeg\$D\cdjpeg.obj
-
-DOBJECTS= \
-  ..\jpeg\$D\djpeg.obj \
-  ..\jpeg\$D\wrppm.obj \
-  ..\jpeg\$D\wrgif.obj \
-  ..\jpeg\$D\wrtarga.obj \
-  ..\jpeg\$D\wrrle.obj \
-  ..\jpeg\$D\wrbmp.obj \
-  ..\jpeg\$D\rdcolmap.obj \
-  ..\jpeg\$D\cdjpeg.obj
-
-TROBJECTS= \
-  ..\jpeg\$D\jpegtran.obj \
-  ..\jpeg\$D\rdswitch.obj \
-  ..\jpeg\$D\cdjpeg.obj \
-  ..\jpeg\$D\transupp.obj
-
-all:  $(OBJECTS) $(OS2JPEGLIB)
-
-$(COMLIBOBJS):
-  copy ..\jpeg\$D\jcomapi.obj
-  copy ..\jpeg\$D\jutils.obj
-  copy ..\jpeg\$D\jerror.obj
-  copy ..\jpeg\$D\jmemmgr.obj
-  copy ..\jpeg\$D\jmemnobs.obj
-
-$(CLIBLIBOBJS):
-  copy ..\jpeg\$D\jcapimin.obj
-  copy ..\jpeg\$D\jcapistd.obj
-  copy ..\jpeg\$D\jctrans.obj
-  copy ..\jpeg\$D\jcparam.obj
-  copy ..\jpeg\$D\jdatadst.obj
-  copy ..\jpeg\$D\jcinit.obj
-  copy ..\jpeg\$D\jcmaster.obj
-  copy ..\jpeg\$D\jcmarker.obj
-  copy ..\jpeg\$D\jcmainct.obj
-  copy ..\jpeg\$D\jcprepct.obj
-  copy ..\jpeg\$D\jccoefct.obj
-  copy ..\jpeg\$D\jccolor.obj
-  copy ..\jpeg\$D\jcsample.obj
-  copy ..\jpeg\$D\jchuff.obj
-  copy ..\jpeg\$D\jcphuff.obj
-  copy ..\jpeg\$D\jcdctmgr.obj
-  copy ..\jpeg\$D\jfdctfst.obj
-  copy ..\jpeg\$D\jfdctflt.obj
-  copy ..\jpeg\$D\jfdctint.obj
-
-$(DLIBLIBOBJS):
-  copy ..\jpeg\$D\jdapimin.obj
-  copy ..\jpeg\$D\jdapistd.obj
-  copy ..\jpeg\$D\jdtrans.obj
-  copy ..\jpeg\$D\jdatasrc.obj
-  copy ..\jpeg\$D\jdmaster.obj
-  copy ..\jpeg\$D\jdinput.obj
-  copy ..\jpeg\$D\jdmarker.obj
-  copy ..\jpeg\$D\jdhuff.obj
-  copy ..\jpeg\$D\jdphuff.obj
-  copy ..\jpeg\$D\jdmainct.obj
-  copy ..\jpeg\$D\jdcoefct.obj
-  copy ..\jpeg\$D\jdpostct.obj
-  copy ..\jpeg\$D\jddctmgr.obj
-  copy ..\jpeg\$D\jidctfst.obj
-  copy ..\jpeg\$D\jidctflt.obj
-  copy ..\jpeg\$D\jidctint.obj
-  copy ..\jpeg\$D\jidctred.obj
-  copy ..\jpeg\$D\jdsample.obj
-  copy ..\jpeg\$D\jdcolor.obj
-  copy ..\jpeg\$D\jquant1.obj
-  copy ..\jpeg\$D\jquant2.obj
-  copy ..\jpeg\$D\jdmerge.obj
-
-!if "$(WXMAKINGDLL)" != "1"
-
-$(WXDIR)\lib\os2jpeg1.lib: \
-    $(COMLIBOBJS) \
-    $(CLIBLIBOBJS)
- -touch $(WXDIR)\lib\os2jpeg1.lib
- -del $(WXDIR)\lib\os2jpeg1.lib
- ilib $(OS2LIBFLAGS) $@ @<<
-    $**;
-<<
-
-$(WXDIR)\lib\os2jpeg2.lib: $(DLIBLIBOBJS)
- -touch $(WXDIR)\lib\os2jpeg2.lib
- -del $(WXDIR)\lib\os2jpeg2.lib
- ilib $(OS2LIBFLAGS) $@ @<<
-    $**;
-<<
-
-$(WXDIR)\lib\os2jpeg.lib: \
-    $(TEMP1TGT) \
-    $(TEMP2TGT)
- -touch $(WXDIR)\lib\os2jpeg.lib
- -del $(WXDIR)\lib\os2jpeg.lib
- ilib $(OS2LIBFLAGS) $@ @<<
-    $**;
-<<
-  del *.obj
-  del $(TEMP1TGT)
-  del $(TEMP2TGT)
-
-!else
-
-# Update the dynamic link library
-$(WXDIR)\lib\os2jpeg.dll: $(OBJECTS)
-    icc @<<
-    /B" $(LINKFLAGS)" /Fe$@
-    $(LIBS)
-    $(OBJECTS)
-    $(WXDIR)\src\os2\os2jpeg.def
-<<
-    implib $(WXDIR)\lib\os2jpegd.lib $(WXDIR)\src\os2\os2jpeg.def
-
-!endif
-
-clean:
-        del      $(OS2JPEGLIB)
-        erase /N $(OS2JPEGDIR)\$D
-        rd       $(OS2JPEGDIR)\$D
-
-cleanall:     clean
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/README b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/README
deleted file mode 100644
index 86cc20669d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/README
+++ /dev/null
@@ -1,385 +0,0 @@
-The Independent JPEG Group's JPEG software
-==========================================
-
-README for release 6b of 27-Mar-1998
-====================================
-
-This distribution contains the sixth public release of the Independent JPEG
-Group's free JPEG software.  You are welcome to redistribute this software and
-to use it for any purpose, subject to the conditions under LEGAL ISSUES, below.
-
-Serious users of this software (particularly those incorporating it into
-larger programs) should contact IJG at jpeg-info@uunet.uu.net to be added to
-our electronic mailing list.  Mailing list members are notified of updates
-and have a chance to participate in technical discussions, etc.
-
-This software is the work of Tom Lane, Philip Gladstone, Jim Boucher,
-Lee Crocker, Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi,
-Guido Vollbeding, Ge' Weijers, and other members of the Independent JPEG
-Group.
-
-IJG is not affiliated with the official ISO JPEG standards committee.
-
-
-DOCUMENTATION ROADMAP
-=====================
-
-This file contains the following sections:
-
-OVERVIEW            General description of JPEG and the IJG software.
-LEGAL ISSUES        Copyright, lack of warranty, terms of distribution.
-REFERENCES          Where to learn more about JPEG.
-ARCHIVE LOCATIONS   Where to find newer versions of this software.
-RELATED SOFTWARE    Other stuff you should get.
-FILE FORMAT WARS    Software *not* to get.
-TO DO               Plans for future IJG releases.
-
-Other documentation files in the distribution are:
-
-User documentation:
-  install.doc       How to configure and install the IJG software.
-  usage.doc         Usage instructions for cjpeg, djpeg, jpegtran,
-                    rdjpgcom, and wrjpgcom.
-  *.1               Unix-style man pages for programs (same info as usage.doc).
-  wizard.doc        Advanced usage instructions for JPEG wizards only.
-  change.log        Version-to-version change highlights.
-Programmer and internal documentation:
-  libjpeg.doc       How to use the JPEG library in your own programs.
-  example.c         Sample code for calling the JPEG library.
-  structure.doc     Overview of the JPEG library's internal structure.
-  filelist.doc      Road map of IJG files.
-  coderules.doc     Coding style rules --- please read if you contribute code.
-
-Please read at least the files install.doc and usage.doc.  Useful information
-can also be found in the JPEG FAQ (Frequently Asked Questions) article.  See
-ARCHIVE LOCATIONS below to find out where to obtain the FAQ article.
-
-If you want to understand how the JPEG code works, we suggest reading one or
-more of the REFERENCES, then looking at the documentation files (in roughly
-the order listed) before diving into the code.
-
-
-OVERVIEW
-========
-
-This package contains C software to implement JPEG image compression and
-decompression.  JPEG (pronounced "jay-peg") is a standardized compression
-method for full-color and gray-scale images.  JPEG is intended for compressing
-"real-world" scenes; line drawings, cartoons and other non-realistic images
-are not its strong suit.  JPEG is lossy, meaning that the output image is not
-exactly identical to the input image.  Hence you must not use JPEG if you
-have to have identical output bits.  However, on typical photographic images,
-very good compression levels can be obtained with no visible change, and
-remarkably high compression levels are possible if you can tolerate a
-low-quality image.  For more details, see the references, or just experiment
-with various compression settings.
-
-This software implements JPEG baseline, extended-sequential, and progressive
-compression processes.  Provision is made for supporting all variants of these
-processes, although some uncommon parameter settings aren't implemented yet.
-For legal reasons, we are not distributing code for the arithmetic-coding
-variants of JPEG; see LEGAL ISSUES.  We have made no provision for supporting
-the hierarchical or lossless processes defined in the standard.
-
-We provide a set of library routines for reading and writing JPEG image files,
-plus two sample applications "cjpeg" and "djpeg", which use the library to
-perform conversion between JPEG and some other popular image file formats.
-The library is intended to be reused in other applications.
-
-In order to support file conversion and viewing software, we have included
-considerable functionality beyond the bare JPEG coding/decoding capability;
-for example, the color quantization modules are not strictly part of JPEG
-decoding, but they are essential for output to colormapped file formats or
-colormapped displays.  These extra functions can be compiled out of the
-library if not required for a particular application.  We have also included
-"jpegtran", a utility for lossless transcoding between different JPEG
-processes, and "rdjpgcom" and "wrjpgcom", two simple applications for
-inserting and extracting textual comments in JFIF files.
-
-The emphasis in designing this software has been on achieving portability and
-flexibility, while also making it fast enough to be useful.  In particular,
-the software is not intended to be read as a tutorial on JPEG.  (See the
-REFERENCES section for introductory material.)  Rather, it is intended to
-be reliable, portable, industrial-strength code.  We do not claim to have
-achieved that goal in every aspect of the software, but we strive for it.
-
-We welcome the use of this software as a component of commercial products.
-No royalty is required, but we do ask for an acknowledgement in product
-documentation, as described under LEGAL ISSUES.
-
-
-LEGAL ISSUES
-============
-
-In plain English:
-
-1. We don't promise that this software works.  (But if you find any bugs,
-   please let us know!)
-2. You can use this software for whatever you want.  You don't have to pay us.
-3. You may not pretend that you wrote this software.  If you use it in a
-   program, you must acknowledge somewhere in your documentation that
-   you've used the IJG code.
-
-In legalese:
-
-The authors make NO WARRANTY or representation, either express or implied,
-with respect to this software, its quality, accuracy, merchantability, or
-fitness for a particular purpose.  This software is provided "AS IS", and you,
-its user, assume the entire risk as to its quality and accuracy.
-
-This software is copyright (C) 1991-1998, Thomas G. Lane.
-All Rights Reserved except as specified below.
-
-Permission is hereby granted to use, copy, modify, and distribute this
-software (or portions thereof) for any purpose, without fee, subject to these
-conditions:
-(1) If any part of the source code for this software is distributed, then this
-README file must be included, with this copyright and no-warranty notice
-unaltered; and any additions, deletions, or changes to the original files
-must be clearly indicated in accompanying documentation.
-(2) If only executable code is distributed, then the accompanying
-documentation must state that "this software is based in part on the work of
-the Independent JPEG Group".
-(3) Permission for use of this software is granted only if the user accepts
-full responsibility for any undesirable consequences; the authors accept
-NO LIABILITY for damages of any kind.
-
-These conditions apply to any software derived from or based on the IJG code,
-not just to the unmodified library.  If you use our work, you ought to
-acknowledge us.
-
-Permission is NOT granted for the use of any IJG author's name or company name
-in advertising or publicity relating to this software or products derived from
-it.  This software may be referred to only as "the Independent JPEG Group's
-software".
-
-We specifically permit and encourage the use of this software as the basis of
-commercial products, provided that all warranty or liability claims are
-assumed by the product vendor.
-
-
-ansi2knr.c is included in this distribution by permission of L. Peter Deutsch,
-sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA.
-ansi2knr.c is NOT covered by the above copyright and conditions, but instead
-by the usual distribution terms of the Free Software Foundation; principally,
-that you must include source code if you redistribute it.  (See the file
-ansi2knr.c for full details.)  However, since ansi2knr.c is not needed as part
-of any program generated from the IJG code, this does not limit you more than
-the foregoing paragraphs do.
-
-The Unix configuration script "configure" was produced with GNU Autoconf.
-It is copyright by the Free Software Foundation but is freely distributable.
-The same holds for its supporting scripts (config.guess, config.sub,
-ltconfig, ltmain.sh).  Another support script, install-sh, is copyright
-by M.I.T. but is also freely distributable.
-
-It appears that the arithmetic coding option of the JPEG spec is covered by
-patents owned by IBM, AT&T, and Mitsubishi.  Hence arithmetic coding cannot
-legally be used without obtaining one or more licenses.  For this reason,
-support for arithmetic coding has been removed from the free JPEG software.
-(Since arithmetic coding provides only a marginal gain over the unpatented
-Huffman mode, it is unlikely that very many implementations will support it.)
-So far as we are aware, there are no patent restrictions on the remaining
-code.
-
-The IJG distribution formerly included code to read and write GIF files.
-To avoid entanglement with the Unisys LZW patent, GIF reading support has
-been removed altogether, and the GIF writer has been simplified to produce
-"uncompressed GIFs".  This technique does not use the LZW algorithm; the
-resulting GIF files are larger than usual, but are readable by all standard
-GIF decoders.
-
-We are required to state that
-    "The Graphics Interchange Format(c) is the Copyright property of
-    CompuServe Incorporated.  GIF(sm) is a Service Mark property of
-    CompuServe Incorporated."
-
-
-REFERENCES
-==========
-
-We highly recommend reading one or more of these references before trying to
-understand the innards of the JPEG software.
-
-The best short technical introduction to the JPEG compression algorithm is
-	Wallace, Gregory K.  "The JPEG Still Picture Compression Standard",
-	Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.
-(Adjacent articles in that issue discuss MPEG motion picture compression,
-applications of JPEG, and related topics.)  If you don't have the CACM issue
-handy, a PostScript file containing a revised version of Wallace's article is
-available at ftp://ftp.uu.net/graphics/jpeg/wallace.ps.gz.  The file (actually
-a preprint for an article that appeared in IEEE Trans. Consumer Electronics)
-omits the sample images that appeared in CACM, but it includes corrections
-and some added material.  Note: the Wallace article is copyright ACM and IEEE,
-and it may not be used for commercial purposes.
-
-A somewhat less technical, more leisurely introduction to JPEG can be found in
-"The Data Compression Book" by Mark Nelson and Jean-loup Gailly, published by
-M&T Books (New York), 2nd ed. 1996, ISBN 1-55851-434-1.  This book provides
-good explanations and example C code for a multitude of compression methods
-including JPEG.  It is an excellent source if you are comfortable reading C
-code but don't know much about data compression in general.  The book's JPEG
-sample code is far from industrial-strength, but when you are ready to look
-at a full implementation, you've got one here...
-
-The best full description of JPEG is the textbook "JPEG Still Image Data
-Compression Standard" by William B. Pennebaker and Joan L. Mitchell, published
-by Van Nostrand Reinhold, 1993, ISBN 0-442-01272-1.  Price US$59.95, 638 pp.
-The book includes the complete text of the ISO JPEG standards (DIS 10918-1
-and draft DIS 10918-2).  This is by far the most complete exposition of JPEG
-in existence, and we highly recommend it.
-
-The JPEG standard itself is not available electronically; you must order a
-paper copy through ISO or ITU.  (Unless you feel a need to own a certified
-official copy, we recommend buying the Pennebaker and Mitchell book instead;
-it's much cheaper and includes a great deal of useful explanatory material.)
-In the USA, copies of the standard may be ordered from ANSI Sales at (212)
-642-4900, or from Global Engineering Documents at (800) 854-7179.  (ANSI
-doesn't take credit card orders, but Global does.)  It's not cheap: as of
-1992, ANSI was charging $95 for Part 1 and $47 for Part 2, plus 7%
-shipping/handling.  The standard is divided into two parts, Part 1 being the
-actual specification, while Part 2 covers compliance testing methods.  Part 1
-is titled "Digital Compression and Coding of Continuous-tone Still Images,
-Part 1: Requirements and guidelines" and has document numbers ISO/IEC IS
-10918-1, ITU-T T.81.  Part 2 is titled "Digital Compression and Coding of
-Continuous-tone Still Images, Part 2: Compliance testing" and has document
-numbers ISO/IEC IS 10918-2, ITU-T T.83.
-
-Some extensions to the original JPEG standard are defined in JPEG Part 3,
-a newer ISO standard numbered ISO/IEC IS 10918-3 and ITU-T T.84.  IJG
-currently does not support any Part 3 extensions.
-
-The JPEG standard does not specify all details of an interchangeable file
-format.  For the omitted details we follow the "JFIF" conventions, revision
-1.02.  A copy of the JFIF spec is available from:
-	Literature Department
-	C-Cube Microsystems, Inc.
-	1778 McCarthy Blvd.
-	Milpitas, CA 95035
-	phone (408) 944-6300,  fax (408) 944-6314
-A PostScript version of this document is available by FTP at
-ftp://ftp.uu.net/graphics/jpeg/jfif.ps.gz.  There is also a plain text
-version at ftp://ftp.uu.net/graphics/jpeg/jfif.txt.gz, but it is missing
-the figures.
-
-The TIFF 6.0 file format specification can be obtained by FTP from
-ftp://ftp.sgi.com/graphics/tiff/TIFF6.ps.gz.  The JPEG incorporation scheme
-found in the TIFF 6.0 spec of 3-June-92 has a number of serious problems.
-IJG does not recommend use of the TIFF 6.0 design (TIFF Compression tag 6).
-Instead, we recommend the JPEG design proposed by TIFF Technical Note #2
-(Compression tag 7).  Copies of this Note can be obtained from ftp.sgi.com or
-from ftp://ftp.uu.net/graphics/jpeg/.  It is expected that the next revision
-of the TIFF spec will replace the 6.0 JPEG design with the Note's design.
-Although IJG's own code does not support TIFF/JPEG, the free libtiff library
-uses our library to implement TIFF/JPEG per the Note.  libtiff is available
-from ftp://ftp.sgi.com/graphics/tiff/.
-
-
-ARCHIVE LOCATIONS
-=================
-
-The "official" archive site for this software is ftp.uu.net (Internet
-address 192.48.96.9).  The most recent released version can always be found
-there in directory graphics/jpeg.  This particular version will be archived
-as ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz.  If you don't have
-direct Internet access, UUNET's archives are also available via UUCP; contact
-help@uunet.uu.net for information on retrieving files that way.
-
-Numerous Internet sites maintain copies of the UUNET files.  However, only
-ftp.uu.net is guaranteed to have the latest official version.
-
-You can also obtain this software in DOS-compatible "zip" archive format from
-the SimTel archives (ftp://ftp.simtel.net/pub/simtelnet/msdos/graphics/), or
-on CompuServe in the Graphics Support forum (GO CIS:GRAPHSUP), library 12
-"JPEG Tools".  Again, these versions may sometimes lag behind the ftp.uu.net
-release.
-
-The JPEG FAQ (Frequently Asked Questions) article is a useful source of
-general information about JPEG.  It is updated constantly and therefore is
-not included in this distribution.  The FAQ is posted every two weeks to
-Usenet newsgroups comp.graphics.misc, news.answers, and other groups.
-It is available on the World Wide Web at http://www.faqs.org/faqs/jpeg-faq/
-and other news.answers archive sites, including the official news.answers
-archive at rtfm.mit.edu: ftp://rtfm.mit.edu/pub/usenet/news.answers/jpeg-faq/.
-If you don't have Web or FTP access, send e-mail to mail-server@rtfm.mit.edu
-with body
-	send usenet/news.answers/jpeg-faq/part1
-	send usenet/news.answers/jpeg-faq/part2
-
-
-RELATED SOFTWARE
-================
-
-Numerous viewing and image manipulation programs now support JPEG.  (Quite a
-few of them use this library to do so.)  The JPEG FAQ described above lists
-some of the more popular free and shareware viewers, and tells where to
-obtain them on Internet.
-
-If you are on a Unix machine, we highly recommend Jef Poskanzer's free
-PBMPLUS software, which provides many useful operations on PPM-format image
-files.  In particular, it can convert PPM images to and from a wide range of
-other formats, thus making cjpeg/djpeg considerably more useful.  The latest
-version is distributed by the NetPBM group, and is available from numerous
-sites, notably ftp://wuarchive.wustl.edu/graphics/graphics/packages/NetPBM/.
-Unfortunately PBMPLUS/NETPBM is not nearly as portable as the IJG software is;
-you are likely to have difficulty making it work on any non-Unix machine.
-
-A different free JPEG implementation, written by the PVRG group at Stanford,
-is available from ftp://havefun.stanford.edu/pub/jpeg/.  This program
-is designed for research and experimentation rather than production use;
-it is slower, harder to use, and less portable than the IJG code, but it
-is easier to read and modify.  Also, the PVRG code supports lossless JPEG,
-which we do not.  (On the other hand, it doesn't do progressive JPEG.)
-
-
-FILE FORMAT WARS
-================
-
-Some JPEG programs produce files that are not compatible with our library.
-The root of the problem is that the ISO JPEG committee failed to specify a
-concrete file format.  Some vendors "filled in the blanks" on their own,
-creating proprietary formats that no one else could read.  (For example, none
-of the early commercial JPEG implementations for the Macintosh were able to
-exchange compressed files.)
-
-The file format we have adopted is called JFIF (see REFERENCES).  This format
-has been agreed to by a number of major commercial JPEG vendors, and it has
-become the de facto standard.  JFIF is a minimal or "low end" representation.
-We recommend the use of TIFF/JPEG (TIFF revision 6.0 as modified by TIFF
-Technical Note #2) for "high end" applications that need to record a lot of
-additional data about an image.  TIFF/JPEG is fairly new and not yet widely
-supported, unfortunately.
-
-The upcoming JPEG Part 3 standard defines a file format called SPIFF.
-SPIFF is interoperable with JFIF, in the sense that most JFIF decoders should
-be able to read the most common variant of SPIFF.  SPIFF has some technical
-advantages over JFIF, but its major claim to fame is simply that it is an
-official standard rather than an informal one.  At this point it is unclear
-whether SPIFF will supersede JFIF or whether JFIF will remain the de-facto
-standard.  IJG intends to support SPIFF once the standard is frozen, but we
-have not decided whether it should become our default output format or not.
-(In any case, our decoder will remain capable of reading JFIF indefinitely.)
-
-Various proprietary file formats incorporating JPEG compression also exist.
-We have little or no sympathy for the existence of these formats.  Indeed,
-one of the original reasons for developing this free software was to help
-force convergence on common, open format standards for JPEG files.  Don't
-use a proprietary file format!
-
-
-TO DO
-=====
-
-The major thrust for v7 will probably be improvement of visual quality.
-The current method for scaling the quantization tables is known not to be
-very good at low Q values.  We also intend to investigate block boundary
-smoothing, "poor man's variable quantization", and other means of improving
-quality-vs-file-size performance without sacrificing compatibility.
-
-In future versions, we are considering supporting some of the upcoming JPEG
-Part 3 extensions --- principally, variable quantization and the SPIFF file
-format.
-
-As always, speeding things up is of great interest.
-
-Please send bug reports, offers of help, etc. to jpeg-info@uunet.uu.net.
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/ansi2knr.1 b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/ansi2knr.1
deleted file mode 100644
index f9ee5a631c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/ansi2knr.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.TH ANSI2KNR 1 "19 Jan 1996"
-.SH NAME
-ansi2knr \- convert ANSI C to Kernighan & Ritchie C
-.SH SYNOPSIS
-.I ansi2knr
-[--varargs] input_file [output_file]
-.SH DESCRIPTION
-If no output_file is supplied, output goes to stdout.
-.br
-There are no error messages.
-.sp
-.I ansi2knr
-recognizes function definitions by seeing a non-keyword identifier at the left
-margin, followed by a left parenthesis, with a right parenthesis as the last
-character on the line, and with a left brace as the first token on the
-following line (ignoring possible intervening comments).  It will recognize a
-multi-line header provided that no intervening line ends with a left or right
-brace or a semicolon.  These algorithms ignore whitespace and comments, except
-that the function name must be the first thing on the line.
-.sp
-The following constructs will confuse it:
-.br
-     - Any other construct that starts at the left margin and follows the
-above syntax (such as a macro or function call).
-.br
-     - Some macros that tinker with the syntax of the function header.
-.sp
-The --varargs switch is obsolete, and is recognized only for
-backwards compatibility.  The present version of
-.I ansi2knr
-will always attempt to convert a ... argument to va_alist and va_dcl.
-.SH AUTHOR
-L. Peter Deutsch  wrote the original ansi2knr and
-continues to maintain the current version; most of the code in the current
-version is his work.  ansi2knr also includes contributions by Francois
-Pinard  and Jim Avera .
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/ansi2knr.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/ansi2knr.c
deleted file mode 100644
index 4e05fc2d32..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/ansi2knr.c
+++ /dev/null
@@ -1,693 +0,0 @@
-/* ansi2knr.c */
-/* Convert ANSI C function definitions to K&R ("traditional C") syntax */
-
-/*
-ansi2knr is distributed in the hope that it will be useful, but WITHOUT ANY
-WARRANTY.  No author or distributor accepts responsibility to anyone for the
-consequences of using it or for whether it serves any particular purpose or
-works at all, unless he says so in writing.  Refer to the GNU General Public
-License (the "GPL") for full details.
-
-Everyone is granted permission to copy, modify and redistribute ansi2knr,
-but only under the conditions described in the GPL.  A copy of this license
-is supposed to have been given to you along with ansi2knr so you can know
-your rights and responsibilities.  It should be in a file named COPYLEFT.
-[In the IJG distribution, the GPL appears below, not in a separate file.]
-Among other things, the copyright notice and this notice must be preserved
-on all copies.
-
-We explicitly state here what we believe is already implied by the GPL: if
-the ansi2knr program is distributed as a separate set of sources and a
-separate executable file which are aggregated on a storage medium together
-with another program, this in itself does not bring the other program under
-the GPL, nor does the mere fact that such a program or the procedures for
-constructing it invoke the ansi2knr executable bring any other part of the
-program under the GPL.
-*/
-
-/*
----------- Here is the GNU GPL file COPYLEFT, referred to above ----------
------ These terms do NOT apply to the JPEG software itself; see README ------
-
-		    GHOSTSCRIPT GENERAL PUBLIC LICENSE
-		    (Clarified 11 Feb 1988)
-
- Copyright (C) 1988 Richard M. Stallman
- Everyone is permitted to copy and distribute verbatim copies of this
- license, but changing it is not allowed.  You can also use this wording
- to make the terms for other programs.
-
-  The license agreements of most software companies keep you at the
-mercy of those companies.  By contrast, our general public license is
-intended to give everyone the right to share Ghostscript.  To make sure
-that you get the rights we want you to have, we need to make
-restrictions that forbid anyone to deny you these rights or to ask you
-to surrender the rights.  Hence this license agreement.
-
-  Specifically, we want to make sure that you have the right to give
-away copies of Ghostscript, that you receive source code or else can get
-it if you want it, that you can change Ghostscript or use pieces of it
-in new free programs, and that you know you can do these things.
-
-  To make sure that everyone has such rights, we have to forbid you to
-deprive anyone else of these rights.  For example, if you distribute
-copies of Ghostscript, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must tell them their rights.
-
-  Also, for our own protection, we must make certain that everyone finds
-out that there is no warranty for Ghostscript.  If Ghostscript is
-modified by someone else and passed on, we want its recipients to know
-that what they have is not what we distributed, so that any problems
-introduced by others will not reflect on our reputation.
-
-  Therefore we (Richard M. Stallman and the Free Software Foundation,
-Inc.) make the following terms which say what you must do to be allowed
-to distribute or change Ghostscript.
-
-
-			COPYING POLICIES
-
-  1. You may copy and distribute verbatim copies of Ghostscript source
-code as you receive it, in any medium, provided that you conspicuously
-and appropriately publish on each copy a valid copyright and license
-notice "Copyright (C) 1989 Aladdin Enterprises.  All rights reserved.
-Distributed by Free Software Foundation, Inc." (or with whatever year is
-appropriate); keep intact the notices on all files that refer to this
-License Agreement and to the absence of any warranty; and give any other
-recipients of the Ghostscript program a copy of this License Agreement
-along with the program.  You may charge a distribution fee for the
-physical act of transferring a copy.
-
-  2. You may modify your copy or copies of Ghostscript or any portion of
-it, and copy and distribute such modifications under the terms of
-Paragraph 1 above, provided that you also do the following:
-
-    a) cause the modified files to carry prominent notices stating
-    that you changed the files and the date of any change; and
-
-    b) cause the whole of any work that you distribute or publish,
-    that in whole or in part contains or is a derivative of Ghostscript
-    or any part thereof, to be licensed at no charge to all third
-    parties on terms identical to those contained in this License
-    Agreement (except that you may choose to grant more extensive
-    warranty protection to some or all third parties, at your option).
-
-    c) You may charge a distribution fee for the physical act of
-    transferring a copy, and you may at your option offer warranty
-    protection in exchange for a fee.
-
-Mere aggregation of another unrelated program with this program (or its
-derivative) on a volume of a storage or distribution medium does not bring
-the other program under the scope of these terms.
-
-  3. You may copy and distribute Ghostscript (or a portion or derivative
-of it, under Paragraph 2) in object code or executable form under the
-terms of Paragraphs 1 and 2 above provided that you also do one of the
-following:
-
-    a) accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of
-    Paragraphs 1 and 2 above; or,
-
-    b) accompany it with a written offer, valid for at least three
-    years, to give any third party free (except for a nominal
-    shipping charge) a complete machine-readable copy of the
-    corresponding source code, to be distributed under the terms of
-    Paragraphs 1 and 2 above; or,
-
-    c) accompany it with the information you received as to where the
-    corresponding source code may be obtained.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form alone.)
-
-For an executable file, complete source code means all the source code for
-all modules it contains; but, as a special exception, it need not include
-source code for modules which are standard libraries that accompany the
-operating system on which the executable file runs.
-
-  4. You may not copy, sublicense, distribute or transfer Ghostscript
-except as expressly provided under this License Agreement.  Any attempt
-otherwise to copy, sublicense, distribute or transfer Ghostscript is
-void and your rights to use the program under this License agreement
-shall be automatically terminated.  However, parties who have received
-computer software programs from you with this License Agreement will not
-have their licenses terminated so long as such parties remain in full
-compliance.
-
-  5. If you wish to incorporate parts of Ghostscript into other free
-programs whose distribution conditions are different, write to the Free
-Software Foundation at 675 Mass Ave, Cambridge, MA 02139.  We have not
-yet worked out a simple rule that can be stated here, but we will often
-permit this.  We will be guided by the two goals of preserving the free
-status of all derivatives of our free software and of promoting the
-sharing and reuse of software.
-
-Your comments and suggestions about our licensing policies and our
-software are welcome!  Please contact the Free Software Foundation,
-Inc., 675 Mass Ave, Cambridge, MA 02139, or call (617) 876-3296.
-
-		       NO WARRANTY
-
-  BECAUSE GHOSTSCRIPT IS LICENSED FREE OF CHARGE, WE PROVIDE ABSOLUTELY
-NO WARRANTY, TO THE EXTENT PERMITTED BY APPLICABLE STATE LAW.  EXCEPT
-WHEN OTHERWISE STATED IN WRITING, FREE SOFTWARE FOUNDATION, INC, RICHARD
-M. STALLMAN, ALADDIN ENTERPRISES, L. PETER DEUTSCH, AND/OR OTHER PARTIES
-PROVIDE GHOSTSCRIPT "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
-EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE
-ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF GHOSTSCRIPT IS WITH
-YOU.  SHOULD GHOSTSCRIPT PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
-NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW WILL RICHARD M.
-STALLMAN, THE FREE SOFTWARE FOUNDATION, INC., L. PETER DEUTSCH, ALADDIN
-ENTERPRISES, AND/OR ANY OTHER PARTY WHO MAY MODIFY AND REDISTRIBUTE
-GHOSTSCRIPT AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING
-ANY LOST PROFITS, LOST MONIES, OR OTHER SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
-(INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED
-INACCURATE OR LOSSES SUSTAINED BY THIRD PARTIES OR A FAILURE OF THE
-PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS) GHOSTSCRIPT, EVEN IF YOU
-HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES, OR FOR ANY CLAIM
-BY ANY OTHER PARTY.
-
--------------------- End of file COPYLEFT ------------------------------
-*/
-
-/*
- * Usage:
-	ansi2knr input_file [output_file]
- * If no output_file is supplied, output goes to stdout.
- * There are no error messages.
- *
- * ansi2knr recognizes function definitions by seeing a non-keyword
- * identifier at the left margin, followed by a left parenthesis,
- * with a right parenthesis as the last character on the line,
- * and with a left brace as the first token on the following line
- * (ignoring possible intervening comments).
- * It will recognize a multi-line header provided that no intervening
- * line ends with a left or right brace or a semicolon.
- * These algorithms ignore whitespace and comments, except that
- * the function name must be the first thing on the line.
- * The following constructs will confuse it:
- *	- Any other construct that starts at the left margin and
- *	    follows the above syntax (such as a macro or function call).
- *	- Some macros that tinker with the syntax of the function header.
- */
-
-/*
- * The original and principal author of ansi2knr is L. Peter Deutsch
- * .  Other authors are noted in the change history
- * that follows (in reverse chronological order):
-	lpd 96-01-21 added code to cope with not HAVE_CONFIG_H and with
-		compilers that don't understand void, as suggested by
-		Tom Lane
-	lpd 96-01-15 changed to require that the first non-comment token
-		on the line following a function header be a left brace,
-		to reduce sensitivity to macros, as suggested by Tom Lane
-		
-	lpd 95-06-22 removed #ifndefs whose sole purpose was to define
-		undefined preprocessor symbols as 0; changed all #ifdefs
-		for configuration symbols to #ifs
-	lpd 95-04-05 changed copyright notice to make it clear that
-		including ansi2knr in a program does not bring the entire
-		program under the GPL
-	lpd 94-12-18 added conditionals for systems where ctype macros
-		don't handle 8-bit characters properly, suggested by
-		Francois Pinard ;
-		removed --varargs switch (this is now the default)
-	lpd 94-10-10 removed CONFIG_BROKETS conditional
-	lpd 94-07-16 added some conditionals to help GNU `configure',
-		suggested by Francois Pinard ;
-		properly erase prototype args in function parameters,
-		contributed by Jim Avera ;
-		correct error in writeblanks (it shouldn't erase EOLs)
-	lpd 89-xx-xx original version
- */
-
-/* Most of the conditionals here are to make ansi2knr work with */
-/* or without the GNU configure machinery. */
-
-#if HAVE_CONFIG_H
-# include 
-#endif
-
-#include 
-#include 
-
-#if HAVE_CONFIG_H
-
-/*
-   For properly autoconfiguring ansi2knr, use AC_CONFIG_HEADER(config.h).
-   This will define HAVE_CONFIG_H and so, activate the following lines.
- */
-
-# if STDC_HEADERS || HAVE_STRING_H
-#  include 
-# else
-#  include 
-# endif
-
-#else /* not HAVE_CONFIG_H */
-
-/* Otherwise do it the hard way */
-
-# ifdef BSD
-#  include 
-# else
-#  ifdef VMS
-    extern int strlen(), strncmp();
-#  else
-#   include 
-#  endif
-# endif
-
-#endif /* not HAVE_CONFIG_H */
-
-#if STDC_HEADERS
-# include 
-#else
-/*
-   malloc and free should be declared in stdlib.h,
-   but if you've got a K&R compiler, they probably aren't.
- */
-# ifdef MSDOS
-#  include 
-# else
-#  ifdef VMS
-     extern char *malloc();
-     extern void free();
-#  else
-     extern char *malloc();
-     extern int free();
-#  endif
-# endif
-
-#endif
-
-/*
- * The ctype macros don't always handle 8-bit characters correctly.
- * Compensate for this here.
- */
-#ifdef isascii
-#  undef HAVE_ISASCII		/* just in case */
-#  define HAVE_ISASCII 1
-#else
-#endif
-#if STDC_HEADERS || !HAVE_ISASCII
-#  define is_ascii(c) 1
-#else
-#  define is_ascii(c) isascii(c)
-#endif
-
-#define is_space(c) (is_ascii(c) && isspace(c))
-#define is_alpha(c) (is_ascii(c) && isalpha(c))
-#define is_alnum(c) (is_ascii(c) && isalnum(c))
-
-/* Scanning macros */
-#define isidchar(ch) (is_alnum(ch) || (ch) == '_')
-#define isidfirstchar(ch) (is_alpha(ch) || (ch) == '_')
-
-/* Forward references */
-char *skipspace();
-int writeblanks();
-int test1();
-int convert1();
-
-/* The main program */
-int
-main(argc, argv)
-    int argc;
-    char *argv[];
-{	FILE *in, *out;
-#define bufsize 5000			/* arbitrary size */
-	char *buf;
-	char *line;
-	char *more;
-	/*
-	 * In previous versions, ansi2knr recognized a --varargs switch.
-	 * If this switch was supplied, ansi2knr would attempt to convert
-	 * a ... argument to va_alist and va_dcl; if this switch was not
-	 * supplied, ansi2knr would simply drop any such arguments.
-	 * Now, ansi2knr always does this conversion, and we only
-	 * check for this switch for backward compatibility.
-	 */
-	int convert_varargs = 1;
-
-	if ( argc > 1 && argv[1][0] == '-' )
-	  {	if ( !strcmp(argv[1], "--varargs") )
-		  {	convert_varargs = 1;
-			argc--;
-			argv++;
-		  }
-		else
-		  {	fprintf(stderr, "Unrecognized switch: %s\n", argv[1]);
-			exit(1);
-		  }
-	  }
-	switch ( argc )
-	   {
-	default:
-		printf("Usage: ansi2knr input_file [output_file]\n");
-		exit(0);
-	case 2:
-		out = stdout;
-		break;
-	case 3:
-		out = fopen(argv[2], "w");
-		if ( out == NULL )
-		   {	fprintf(stderr, "Cannot open output file %s\n", argv[2]);
-			exit(1);
-		   }
-	   }
-	in = fopen(argv[1], "r");
-	if ( in == NULL )
-	   {	fprintf(stderr, "Cannot open input file %s\n", argv[1]);
-		exit(1);
-	   }
-	fprintf(out, "#line 1 \"%s\"\n", argv[1]);
-	buf = malloc(bufsize);
-	line = buf;
-	while ( fgets(line, (unsigned)(buf + bufsize - line), in) != NULL )
-	   {
-test:		line += strlen(line);
-		switch ( test1(buf) )
-		   {
-		case 2:			/* a function header */
-			convert1(buf, out, 1, convert_varargs);
-			break;
-		case 1:			/* a function */
-			/* Check for a { at the start of the next line. */
-			more = ++line;
-f:			if ( line >= buf + (bufsize - 1) ) /* overflow check */
-			  goto wl;
-			if ( fgets(line, (unsigned)(buf + bufsize - line), in) == NULL )
-			  goto wl;
-			switch ( *skipspace(more, 1) )
-			  {
-			  case '{':
-			    /* Definitely a function header. */
-			    convert1(buf, out, 0, convert_varargs);
-			    fputs(more, out);
-			    break;
-			  case 0:
-			    /* The next line was blank or a comment: */
-			    /* keep scanning for a non-comment. */
-			    line += strlen(line);
-			    goto f;
-			  default:
-			    /* buf isn't a function header, but */
-			    /* more might be. */
-			    fputs(buf, out);
-			    strcpy(buf, more);
-			    line = buf;
-			    goto test;
-			  }
-			break;
-		case -1:		/* maybe the start of a function */
-			if ( line != buf + (bufsize - 1) ) /* overflow check */
-			  continue;
-			/* falls through */
-		default:		/* not a function */
-wl:			fputs(buf, out);
-			break;
-		   }
-		line = buf;
-	   }
-	if ( line != buf )
-	  fputs(buf, out);
-	free(buf);
-	fclose(out);
-	fclose(in);
-	return 0;
-}
-
-/* Skip over space and comments, in either direction. */
-char *
-skipspace(p, dir)
-    register char *p;
-    register int dir;			/* 1 for forward, -1 for backward */
-{	for ( ; ; )
-	   {	while ( is_space(*p) )
-		  p += dir;
-		if ( !(*p == '/' && p[dir] == '*') )
-		  break;
-		p += dir;  p += dir;
-		while ( !(*p == '*' && p[dir] == '/') )
-		   {	if ( *p == 0 )
-			  return p;	/* multi-line comment?? */
-			p += dir;
-		   }
-		p += dir;  p += dir;
-	   }
-	return p;
-}
-
-/*
- * Write blanks over part of a string.
- * Don't overwrite end-of-line characters.
- */
-int
-writeblanks(start, end)
-    char *start;
-    char *end;
-{	char *p;
-	for ( p = start; p < end; p++ )
-	  if ( *p != '\r' && *p != '\n' )
-	    *p = ' ';
-	return 0;
-}
-
-/*
- * Test whether the string in buf is a function definition.
- * The string may contain and/or end with a newline.
- * Return as follows:
- *	0 - definitely not a function definition;
- *	1 - definitely a function definition;
- *	2 - definitely a function prototype (NOT USED);
- *	-1 - may be the beginning of a function definition,
- *		append another line and look again.
- * The reason we don't attempt to convert function prototypes is that
- * Ghostscript's declaration-generating macros look too much like
- * prototypes, and confuse the algorithms.
- */
-int
-test1(buf)
-    char *buf;
-{	register char *p = buf;
-	char *bend;
-	char *endfn;
-	int contin;
-
-	if ( !isidfirstchar(*p) )
-	  return 0;		/* no name at left margin */
-	bend = skipspace(buf + strlen(buf) - 1, -1);
-	switch ( *bend )
-	   {
-	   case ';': contin = 0 /*2*/; break;
-	   case ')': contin = 1; break;
-	   case '{': return 0;		/* not a function */
-	   case '}': return 0;		/* not a function */
-	   default: contin = -1;
-	   }
-	while ( isidchar(*p) )
-	  p++;
-	endfn = p;
-	p = skipspace(p, 1);
-	if ( *p++ != '(' )
-	  return 0;		/* not a function */
-	p = skipspace(p, 1);
-	if ( *p == ')' )
-	  return 0;		/* no parameters */
-	/* Check that the apparent function name isn't a keyword. */
-	/* We only need to check for keywords that could be followed */
-	/* by a left parenthesis (which, unfortunately, is most of them). */
-	   {	static char *words[] =
-		   {	"asm", "auto", "case", "char", "const", "double",
-			"extern", "float", "for", "if", "int", "long",
-			"register", "return", "short", "signed", "sizeof",
-			"static", "switch", "typedef", "unsigned",
-			"void", "volatile", "while", 0
-		   };
-		char **key = words;
-		char *kp;
-		int len = endfn - buf;
-
-		while ( (kp = *key) != 0 )
-		   {	if ( strlen(kp) == len && !strncmp(kp, buf, len) )
-			  return 0;	/* name is a keyword */
-			key++;
-		   }
-	   }
-	return contin;
-}
-
-/* Convert a recognized function definition or header to K&R syntax. */
-int
-convert1(buf, out, header, convert_varargs)
-    char *buf;
-    FILE *out;
-    int header;			/* Boolean */
-    int convert_varargs;	/* Boolean */
-{	char *endfn;
-	register char *p;
-	char **breaks;
-	unsigned num_breaks = 2;	/* for testing */
-	char **btop;
-	char **bp;
-	char **ap;
-	char *vararg = 0;
-
-	/* Pre-ANSI implementations don't agree on whether strchr */
-	/* is called strchr or index, so we open-code it here. */
-	for ( endfn = buf; *(endfn++) != '('; )
-	  ;
-top:	p = endfn;
-	breaks = (char **)malloc(sizeof(char *) * num_breaks * 2);
-	if ( breaks == 0 )
-	   {	/* Couldn't allocate break table, give up */
-		fprintf(stderr, "Unable to allocate break table!\n");
-		fputs(buf, out);
-		return -1;
-	   }
-	btop = breaks + num_breaks * 2 - 2;
-	bp = breaks;
-	/* Parse the argument list */
-	do
-	   {	int level = 0;
-		char *lp = NULL;
-		char *rp;
-		char *end = NULL;
-
-		if ( bp >= btop )
-		   {	/* Filled up break table. */
-			/* Allocate a bigger one and start over. */
-			free((char *)breaks);
-			num_breaks <<= 1;
-			goto top;
-		   }
-		*bp++ = p;
-		/* Find the end of the argument */
-		for ( ; end == NULL; p++ )
-		   {	switch(*p)
-			   {
-			   case ',':
-				if ( !level ) end = p;
-				break;
-			   case '(':
-				if ( !level ) lp = p;
-				level++;
-				break;
-			   case ')':
-				if ( --level < 0 ) end = p;
-				else rp = p;
-				break;
-			   case '/':
-				p = skipspace(p, 1) - 1;
-				break;
-			   default:
-				;
-			   }
-		   }
-		/* Erase any embedded prototype parameters. */
-		if ( lp )
-		  writeblanks(lp + 1, rp);
-		p--;			/* back up over terminator */
-		/* Find the name being declared. */
-		/* This is complicated because of procedure and */
-		/* array modifiers. */
-		for ( ; ; )
-		   {	p = skipspace(p - 1, -1);
-			switch ( *p )
-			   {
-			   case ']':	/* skip array dimension(s) */
-			   case ')':	/* skip procedure args OR name */
-			   {	int level = 1;
-				while ( level )
-				 switch ( *--p )
-				   {
-				   case ']': case ')': level++; break;
-				   case '[': case '(': level--; break;
-				   case '/': p = skipspace(p, -1) + 1; break;
-				   default: ;
-				   }
-			   }
-				if ( *p == '(' && *skipspace(p + 1, 1) == '*' )
-				   {	/* We found the name being declared */
-					while ( !isidfirstchar(*p) )
-					  p = skipspace(p, 1) + 1;
-					goto found;
-				   }
-				break;
-			   default:
-				goto found;
-			   }
-		   }
-found:		if ( *p == '.' && p[-1] == '.' && p[-2] == '.' )
-		  {	if ( convert_varargs )
-			  {	*bp++ = "va_alist";
-				vararg = p-2;
-			  }
-			else
-			  {	p++;
-				if ( bp == breaks + 1 )	/* sole argument */
-				  writeblanks(breaks[0], p);
-				else
-				  writeblanks(bp[-1] - 1, p);
-				bp--;
-			  }
-		   }
-		else
-		   {	while ( isidchar(*p) ) p--;
-			*bp++ = p+1;
-		   }
-		p = end;
-	   }
-	while ( *p++ == ',' );
-	*bp = p;
-	/* Make a special check for 'void' arglist */
-	if ( bp == breaks+2 )
-	   {	p = skipspace(breaks[0], 1);
-		if ( !strncmp(p, "void", 4) )
-		   {	p = skipspace(p+4, 1);
-			if ( p == breaks[2] - 1 )
-			   {	bp = breaks;	/* yup, pretend arglist is empty */
-				writeblanks(breaks[0], p + 1);
-			   }
-		   }
-	   }
-	/* Put out the function name and left parenthesis. */
-	p = buf;
-	while ( p != endfn ) putc(*p, out), p++;
-	/* Put out the declaration. */
-	if ( header )
-	  {	fputs(");", out);
-		for ( p = breaks[0]; *p; p++ )
-		  if ( *p == '\r' || *p == '\n' )
-		    putc(*p, out);
-	  }
-	else
-	  {	for ( ap = breaks+1; ap < bp; ap += 2 )
-		  {	p = *ap;
-			while ( isidchar(*p) )
-			  putc(*p, out), p++;
-			if ( ap < bp - 1 )
-			  fputs(", ", out);
-		  }
-		fputs(")  ", out);
-		/* Put out the argument declarations */
-		for ( ap = breaks+2; ap <= bp; ap += 2 )
-		  (*ap)[-1] = ';';
-		if ( vararg != 0 )
-		  {	*vararg = 0;
-			fputs(breaks[0], out);		/* any prior args */
-			fputs("va_dcl", out);		/* the final arg */
-			fputs(bp[0], out);
-		  }
-		else
-		  fputs(breaks[0], out);
-	  }
-	free((char *)breaks);
-	return 0;
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcapimin.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcapimin.c
deleted file mode 100644
index 270a353685..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcapimin.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * jcapimin.c
- *
- * Copyright (C) 1994-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains application interface code for the compression half
- * of the JPEG library.  These are the "minimum" API routines that may be
- * needed in either the normal full-compression case or the transcoding-only
- * case.
- *
- * Most of the routines intended to be called directly by an application
- * are in this file or in jcapistd.c.  But also see jcparam.c for
- * parameter-setup helper routines, jcomapi.c for routines shared by
- * compression and decompression, and jctrans.c for the transcoding case.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/*
- * Initialization of a JPEG compression object.
- * The error manager must already be set up (in case memory manager fails).
- */
-
-GLOBAL(void)
-jpeg_CreateCompress (j_compress_ptr cinfo, int version, size_t structsize)
-{
-  int i;
-
-  /* Guard against version mismatches between library and caller. */
-  cinfo->mem = NULL;		/* so jpeg_destroy knows mem mgr not called */
-  if (version != JPEG_LIB_VERSION)
-    ERREXIT2(cinfo, JERR_BAD_LIB_VERSION, JPEG_LIB_VERSION, version);
-  if (structsize != SIZEOF(struct jpeg_compress_struct))
-    ERREXIT2(cinfo, JERR_BAD_STRUCT_SIZE, 
-	     (int) SIZEOF(struct jpeg_compress_struct), (int) structsize);
-
-  /* For debugging purposes, we zero the whole master structure.
-   * But the application has already set the err pointer, and may have set
-   * client_data, so we have to save and restore those fields.
-   * Note: if application hasn't set client_data, tools like Purify may
-   * complain here.
-   */
-  {
-    struct jpeg_error_mgr * err = cinfo->err;
-    void * client_data = cinfo->client_data; /* ignore Purify complaint here */
-    MEMZERO(cinfo, SIZEOF(struct jpeg_compress_struct));
-    cinfo->err = err;
-    cinfo->client_data = client_data;
-  }
-  cinfo->is_decompressor = FALSE;
-
-  /* Initialize a memory manager instance for this object */
-  jinit_memory_mgr((j_common_ptr) cinfo);
-
-  /* Zero out pointers to permanent structures. */
-  cinfo->progress = NULL;
-  cinfo->dest = NULL;
-
-  cinfo->comp_info = NULL;
-
-  for (i = 0; i < NUM_QUANT_TBLS; i++)
-    cinfo->quant_tbl_ptrs[i] = NULL;
-
-  for (i = 0; i < NUM_HUFF_TBLS; i++) {
-    cinfo->dc_huff_tbl_ptrs[i] = NULL;
-    cinfo->ac_huff_tbl_ptrs[i] = NULL;
-  }
-
-  cinfo->script_space = NULL;
-
-  cinfo->input_gamma = 1.0;	/* in case application forgets */
-
-  /* OK, I'm ready */
-  cinfo->global_state = CSTATE_START;
-}
-
-
-/*
- * Destruction of a JPEG compression object
- */
-
-GLOBAL(void)
-jpeg_destroy_compress (j_compress_ptr cinfo)
-{
-  jpeg_destroy((j_common_ptr) cinfo); /* use common routine */
-}
-
-
-/*
- * Abort processing of a JPEG compression operation,
- * but don't destroy the object itself.
- */
-
-GLOBAL(void)
-jpeg_abort_compress (j_compress_ptr cinfo)
-{
-  jpeg_abort((j_common_ptr) cinfo); /* use common routine */
-}
-
-
-/*
- * Forcibly suppress or un-suppress all quantization and Huffman tables.
- * Marks all currently defined tables as already written (if suppress)
- * or not written (if !suppress).  This will control whether they get emitted
- * by a subsequent jpeg_start_compress call.
- *
- * This routine is exported for use by applications that want to produce
- * abbreviated JPEG datastreams.  It logically belongs in jcparam.c, but
- * since it is called by jpeg_start_compress, we put it here --- otherwise
- * jcparam.o would be linked whether the application used it or not.
- */
-
-GLOBAL(void)
-jpeg_suppress_tables (j_compress_ptr cinfo, wxjpeg_boolean suppress)
-{
-  int i;
-  JQUANT_TBL * qtbl;
-  JHUFF_TBL * htbl;
-
-  for (i = 0; i < NUM_QUANT_TBLS; i++) {
-    if ((qtbl = cinfo->quant_tbl_ptrs[i]) != NULL)
-      qtbl->sent_table = suppress;
-  }
-
-  for (i = 0; i < NUM_HUFF_TBLS; i++) {
-    if ((htbl = cinfo->dc_huff_tbl_ptrs[i]) != NULL)
-      htbl->sent_table = suppress;
-    if ((htbl = cinfo->ac_huff_tbl_ptrs[i]) != NULL)
-      htbl->sent_table = suppress;
-  }
-}
-
-
-/*
- * Finish JPEG compression.
- *
- * If a multipass operating mode was selected, this may do a great deal of
- * work including most of the actual output.
- */
-
-GLOBAL(void)
-jpeg_finish_compress (j_compress_ptr cinfo)
-{
-  JDIMENSION iMCU_row;
-
-  if (cinfo->global_state == CSTATE_SCANNING ||
-      cinfo->global_state == CSTATE_RAW_OK) {
-    /* Terminate first pass */
-    if (cinfo->next_scanline < cinfo->image_height)
-      ERREXIT(cinfo, JERR_TOO_LITTLE_DATA);
-    (*cinfo->master->finish_pass) (cinfo);
-  } else if (cinfo->global_state != CSTATE_WRCOEFS)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  /* Perform any remaining passes */
-  while (! cinfo->master->is_last_pass) {
-    (*cinfo->master->prepare_for_pass) (cinfo);
-    for (iMCU_row = 0; iMCU_row < cinfo->total_iMCU_rows; iMCU_row++) {
-      if (cinfo->progress != NULL) {
-	cinfo->progress->pass_counter = (long) iMCU_row;
-	cinfo->progress->pass_limit = (long) cinfo->total_iMCU_rows;
-	(*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-      }
-      /* We bypass the main controller and invoke coef controller directly;
-       * all work is being done from the coefficient buffer.
-       */
-      if (! (*cinfo->coef->compress_data) (cinfo, (JSAMPIMAGE) NULL))
-	ERREXIT(cinfo, JERR_CANT_SUSPEND);
-    }
-    (*cinfo->master->finish_pass) (cinfo);
-  }
-  /* Write EOI, do final cleanup */
-  (*cinfo->marker->write_file_trailer) (cinfo);
-  (*cinfo->dest->term_destination) (cinfo);
-  /* We can use jpeg_abort to release memory and reset global_state */
-  jpeg_abort((j_common_ptr) cinfo);
-}
-
-
-/*
- * Write a special marker.
- * This is only recommended for writing COM or APPn markers.
- * Must be called after jpeg_start_compress() and before
- * first call to jpeg_write_scanlines() or jpeg_write_raw_data().
- */
-
-GLOBAL(void)
-jpeg_write_marker (j_compress_ptr cinfo, int marker,
-		   const JOCTET *dataptr, unsigned int datalen)
-{
-  JMETHOD(void, write_marker_byte, (j_compress_ptr info, int val));
-
-  if (cinfo->next_scanline != 0 ||
-      (cinfo->global_state != CSTATE_SCANNING &&
-       cinfo->global_state != CSTATE_RAW_OK &&
-       cinfo->global_state != CSTATE_WRCOEFS))
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  (*cinfo->marker->write_marker_header) (cinfo, marker, datalen);
-  write_marker_byte = cinfo->marker->write_marker_byte;	/* copy for speed */
-  while (datalen--) {
-    (*write_marker_byte) (cinfo, *dataptr);
-    dataptr++;
-  }
-}
-
-/* Same, but piecemeal. */
-
-GLOBAL(void)
-jpeg_write_m_header (j_compress_ptr cinfo, int marker, unsigned int datalen)
-{
-  if (cinfo->next_scanline != 0 ||
-      (cinfo->global_state != CSTATE_SCANNING &&
-       cinfo->global_state != CSTATE_RAW_OK &&
-       cinfo->global_state != CSTATE_WRCOEFS))
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  (*cinfo->marker->write_marker_header) (cinfo, marker, datalen);
-}
-
-GLOBAL(void)
-jpeg_write_m_byte (j_compress_ptr cinfo, int val)
-{
-  (*cinfo->marker->write_marker_byte) (cinfo, val);
-}
-
-
-/*
- * Alternate compression function: just write an abbreviated table file.
- * Before calling this, all parameters and a data destination must be set up.
- *
- * To produce a pair of files containing abbreviated tables and abbreviated
- * image data, one would proceed as follows:
- *
- *		initialize JPEG object
- *		set JPEG parameters
- *		set destination to table file
- *		jpeg_write_tables(cinfo);
- *		set destination to image file
- *		jpeg_start_compress(cinfo, FALSE);
- *		write data...
- *		jpeg_finish_compress(cinfo);
- *
- * jpeg_write_tables has the side effect of marking all tables written
- * (same as jpeg_suppress_tables(..., TRUE)).  Thus a subsequent start_compress
- * will not re-emit the tables unless it is passed write_all_tables=TRUE.
- */
-
-GLOBAL(void)
-jpeg_write_tables (j_compress_ptr cinfo)
-{
-  if (cinfo->global_state != CSTATE_START)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  /* (Re)initialize error mgr and destination modules */
-  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
-  (*cinfo->dest->init_destination) (cinfo);
-  /* Initialize the marker writer ... bit of a crock to do it here. */
-  jinit_marker_writer(cinfo);
-  /* Write them tables! */
-  (*cinfo->marker->write_tables_only) (cinfo);
-  /* And clean up. */
-  (*cinfo->dest->term_destination) (cinfo);
-  /*
-   * In library releases up through v6a, we called jpeg_abort() here to free
-   * any working memory allocated by the destination manager and marker
-   * writer.  Some applications had a problem with that: they allocated space
-   * of their own from the library memory manager, and didn't want it to go
-   * away during write_tables.  So now we do nothing.  This will cause a
-   * memory leak if an app calls write_tables repeatedly without doing a full
-   * compression cycle or otherwise resetting the JPEG object.  However, that
-   * seems less bad than unexpectedly freeing memory in the normal case.
-   * An app that prefers the old behavior can call jpeg_abort for itself after
-   * each call to jpeg_write_tables().
-   */
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcapistd.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcapistd.c
deleted file mode 100644
index c138b7c12d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcapistd.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * jcapistd.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains application interface code for the compression half
- * of the JPEG library.  These are the "standard" API routines that are
- * used in the normal full-compression case.  They are not used by a
- * transcoding-only application.  Note that if an application links in
- * jpeg_start_compress, it will end up linking in the entire compressor.
- * We thus must separate this file from jcapimin.c to avoid linking the
- * whole compression library into a transcoder.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/*
- * Compression initialization.
- * Before calling this, all parameters and a data destination must be set up.
- *
- * We require a write_all_tables parameter as a failsafe check when writing
- * multiple datastreams from the same compression object.  Since prior runs
- * will have left all the tables marked sent_table=TRUE, a subsequent run
- * would emit an abbreviated stream (no tables) by default.  This may be what
- * is wanted, but for safety's sake it should not be the default behavior:
- * programmers should have to make a deliberate choice to emit abbreviated
- * images.  Therefore the documentation and examples should encourage people
- * to pass write_all_tables=TRUE; then it will take active thought to do the
- * wrong thing.
- */
-
-GLOBAL(void)
-jpeg_start_compress (j_compress_ptr cinfo, wxjpeg_boolean write_all_tables)
-{
-  if (cinfo->global_state != CSTATE_START)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  if (write_all_tables)
-    jpeg_suppress_tables(cinfo, FALSE);	/* mark all tables to be written */
-
-  /* (Re)initialize error mgr and destination modules */
-  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
-  (*cinfo->dest->init_destination) (cinfo);
-  /* Perform master selection of active modules */
-  jinit_compress_master(cinfo);
-  /* Set up for the first pass */
-  (*cinfo->master->prepare_for_pass) (cinfo);
-  /* Ready for application to drive first pass through jpeg_write_scanlines
-   * or jpeg_write_raw_data.
-   */
-  cinfo->next_scanline = 0;
-  cinfo->global_state = (cinfo->raw_data_in ? CSTATE_RAW_OK : CSTATE_SCANNING);
-}
-
-
-/*
- * Write some scanlines of data to the JPEG compressor.
- *
- * The return value will be the number of lines actually written.
- * This should be less than the supplied num_lines only in case that
- * the data destination module has requested suspension of the compressor,
- * or if more than image_height scanlines are passed in.
- *
- * Note: we warn about excess calls to jpeg_write_scanlines() since
- * this likely signals an application programmer error.  However,
- * excess scanlines passed in the last valid call are *silently* ignored,
- * so that the application need not adjust num_lines for end-of-image
- * when using a multiple-scanline buffer.
- */
-
-GLOBAL(JDIMENSION)
-jpeg_write_scanlines (j_compress_ptr cinfo, JSAMPARRAY scanlines,
-		      JDIMENSION num_lines)
-{
-  JDIMENSION row_ctr, rows_left;
-
-  if (cinfo->global_state != CSTATE_SCANNING)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  if (cinfo->next_scanline >= cinfo->image_height)
-    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
-
-  /* Call progress monitor hook if present */
-  if (cinfo->progress != NULL) {
-    cinfo->progress->pass_counter = (long) cinfo->next_scanline;
-    cinfo->progress->pass_limit = (long) cinfo->image_height;
-    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-  }
-
-  /* Give master control module another chance if this is first call to
-   * jpeg_write_scanlines.  This lets output of the frame/scan headers be
-   * delayed so that application can write COM, etc, markers between
-   * jpeg_start_compress and jpeg_write_scanlines.
-   */
-  if (cinfo->master->call_pass_startup)
-    (*cinfo->master->pass_startup) (cinfo);
-
-  /* Ignore any extra scanlines at bottom of image. */
-  rows_left = cinfo->image_height - cinfo->next_scanline;
-  if (num_lines > rows_left)
-    num_lines = rows_left;
-
-  row_ctr = 0;
-  (*cinfo->main->process_data) (cinfo, scanlines, &row_ctr, num_lines);
-  cinfo->next_scanline += row_ctr;
-  return row_ctr;
-}
-
-
-/*
- * Alternate entry point to write raw data.
- * Processes exactly one iMCU row per call, unless suspended.
- */
-
-GLOBAL(JDIMENSION)
-jpeg_write_raw_data (j_compress_ptr cinfo, JSAMPIMAGE data,
-		     JDIMENSION num_lines)
-{
-  JDIMENSION lines_per_iMCU_row;
-
-  if (cinfo->global_state != CSTATE_RAW_OK)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  if (cinfo->next_scanline >= cinfo->image_height) {
-    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
-    return 0;
-  }
-
-  /* Call progress monitor hook if present */
-  if (cinfo->progress != NULL) {
-    cinfo->progress->pass_counter = (long) cinfo->next_scanline;
-    cinfo->progress->pass_limit = (long) cinfo->image_height;
-    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-  }
-
-  /* Give master control module another chance if this is first call to
-   * jpeg_write_raw_data.  This lets output of the frame/scan headers be
-   * delayed so that application can write COM, etc, markers between
-   * jpeg_start_compress and jpeg_write_raw_data.
-   */
-  if (cinfo->master->call_pass_startup)
-    (*cinfo->master->pass_startup) (cinfo);
-
-  /* Verify that at least one iMCU row has been passed. */
-  lines_per_iMCU_row = cinfo->max_v_samp_factor * DCTSIZE;
-  if (num_lines < lines_per_iMCU_row)
-    ERREXIT(cinfo, JERR_BUFFER_SIZE);
-
-  /* Directly compress the row. */
-  if (! (*cinfo->coef->compress_data) (cinfo, data)) {
-    /* If compressor did not consume the whole row, suspend processing. */
-    return 0;
-  }
-
-  /* OK, we processed one iMCU row. */
-  cinfo->next_scanline += lines_per_iMCU_row;
-  return lines_per_iMCU_row;
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jccoefct.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jccoefct.c
deleted file mode 100644
index 3315f21b32..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jccoefct.c
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * jccoefct.c
- *
- * Copyright (C) 1994-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the coefficient buffer controller for compression.
- * This controller is the top level of the JPEG compressor proper.
- * The coefficient buffer lies between forward-DCT and entropy encoding steps.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* We use a full-image coefficient buffer when doing Huffman optimization,
- * and also for writing multiple-scan JPEG files.  In all cases, the DCT
- * step is run during the first pass, and subsequent passes need only read
- * the buffered coefficients.
- */
-#ifdef ENTROPY_OPT_SUPPORTED
-#define FULL_COEF_BUFFER_SUPPORTED
-#else
-#ifdef C_MULTISCAN_FILES_SUPPORTED
-#define FULL_COEF_BUFFER_SUPPORTED
-#endif
-#endif
-
-
-/* Private buffer controller object */
-
-typedef struct {
-  struct jpeg_c_coef_controller pub; /* public fields */
-
-  JDIMENSION iMCU_row_num;	/* iMCU row # within image */
-  JDIMENSION mcu_ctr;		/* counts MCUs processed in current row */
-  int MCU_vert_offset;		/* counts MCU rows within iMCU row */
-  int MCU_rows_per_iMCU_row;	/* number of such rows needed */
-
-  /* For single-pass compression, it's sufficient to buffer just one MCU
-   * (although this may prove a bit slow in practice).  We allocate a
-   * workspace of C_MAX_BLOCKS_IN_MCU coefficient blocks, and reuse it for each
-   * MCU constructed and sent.  (On 80x86, the workspace is FAR even though
-   * it's not really very big; this is to keep the module interfaces unchanged
-   * when a large coefficient buffer is necessary.)
-   * In multi-pass modes, this array points to the current MCU's blocks
-   * within the virtual arrays.
-   */
-  JBLOCKROW MCU_buffer[C_MAX_BLOCKS_IN_MCU];
-
-  /* In multi-pass modes, we need a virtual block array for each component. */
-  jvirt_barray_ptr whole_image[MAX_COMPONENTS];
-} my_coef_controller;
-
-typedef my_coef_controller * my_coef_ptr;
-
-
-/* Forward declarations */
-METHODDEF(wxjpeg_boolean) compress_data
-    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
-#ifdef FULL_COEF_BUFFER_SUPPORTED
-METHODDEF(wxjpeg_boolean) compress_first_pass
-    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
-METHODDEF(wxjpeg_boolean) compress_output
-    JPP((j_compress_ptr cinfo, JSAMPIMAGE input_buf));
-#endif
-
-
-LOCAL(void)
-start_iMCU_row (j_compress_ptr cinfo)
-/* Reset within-iMCU-row counters for a new row */
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-
-  /* In an interleaved scan, an MCU row is the same as an iMCU row.
-   * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
-   * But at the bottom of the image, process only what's left.
-   */
-  if (cinfo->comps_in_scan > 1) {
-    coef->MCU_rows_per_iMCU_row = 1;
-  } else {
-    if (coef->iMCU_row_num < (cinfo->total_iMCU_rows-1))
-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;
-    else
-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;
-  }
-
-  coef->mcu_ctr = 0;
-  coef->MCU_vert_offset = 0;
-}
-
-
-/*
- * Initialize for a processing pass.
- */
-
-METHODDEF(void)
-start_pass_coef (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-
-  coef->iMCU_row_num = 0;
-  start_iMCU_row(cinfo);
-
-  switch (pass_mode) {
-  case JBUF_PASS_THRU:
-    if (coef->whole_image[0] != NULL)
-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    coef->pub.compress_data = compress_data;
-    break;
-#ifdef FULL_COEF_BUFFER_SUPPORTED
-  case JBUF_SAVE_AND_PASS:
-    if (coef->whole_image[0] == NULL)
-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    coef->pub.compress_data = compress_first_pass;
-    break;
-  case JBUF_CRANK_DEST:
-    if (coef->whole_image[0] == NULL)
-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    coef->pub.compress_data = compress_output;
-    break;
-#endif
-  default:
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    break;
-  }
-}
-
-
-/*
- * Process some data in the single-pass case.
- * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
- * per call, ie, v_samp_factor block rows for each component in the image.
- * Returns TRUE if the iMCU row is completed, FALSE if suspended.
- *
- * NB: input_buf contains a plane for each component in image,
- * which we index according to the component's SOF position.
- */
-
-METHODDEF(wxjpeg_boolean)
-compress_data (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION MCU_col_num;	/* index of current MCU within row */
-  JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;
-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
-  int blkn, bi, ci, yindex, yoffset, blockcnt;
-  JDIMENSION ypos, xpos;
-  jpeg_component_info *compptr;
-
-  /* Loop to write as much as one whole iMCU row */
-  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
-       yoffset++) {
-    for (MCU_col_num = coef->mcu_ctr; MCU_col_num <= last_MCU_col;
-	 MCU_col_num++) {
-      /* Determine where data comes from in input_buf and do the DCT thing.
-       * Each call on forward_DCT processes a horizontal row of DCT blocks
-       * as wide as an MCU; we rely on having allocated the MCU_buffer[] blocks
-       * sequentially.  Dummy blocks at the right or bottom edge are filled in
-       * specially.  The data in them does not matter for image reconstruction,
-       * so we fill them with values that will encode to the smallest amount of
-       * data, viz: all zeroes in the AC entries, DC entries equal to previous
-       * block's DC value.  (Thanks to Thomas Kinsman for this idea.)
-       */
-      blkn = 0;
-      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-	compptr = cinfo->cur_comp_info[ci];
-	blockcnt = (MCU_col_num < last_MCU_col) ? compptr->MCU_width
-						: compptr->last_col_width;
-	xpos = MCU_col_num * compptr->MCU_sample_width;
-	ypos = yoffset * DCTSIZE; /* ypos == (yoffset+yindex) * DCTSIZE */
-	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
-	  if (coef->iMCU_row_num < last_iMCU_row ||
-	      yoffset+yindex < compptr->last_row_height) {
-	    (*cinfo->fdct->forward_DCT) (cinfo, compptr,
-					 input_buf[compptr->component_index],
-					 coef->MCU_buffer[blkn],
-					 ypos, xpos, (JDIMENSION) blockcnt);
-	    if (blockcnt < compptr->MCU_width) {
-	      /* Create some dummy blocks at the right edge of the image. */
-	      jzero_far((void FAR *) coef->MCU_buffer[blkn + blockcnt],
-			(compptr->MCU_width - blockcnt) * SIZEOF(JBLOCK));
-	      for (bi = blockcnt; bi < compptr->MCU_width; bi++) {
-		coef->MCU_buffer[blkn+bi][0][0] = coef->MCU_buffer[blkn+bi-1][0][0];
-	      }
-	    }
-	  } else {
-	    /* Create a row of dummy blocks at the bottom of the image. */
-	    jzero_far((void FAR *) coef->MCU_buffer[blkn],
-		      compptr->MCU_width * SIZEOF(JBLOCK));
-	    for (bi = 0; bi < compptr->MCU_width; bi++) {
-	      coef->MCU_buffer[blkn+bi][0][0] = coef->MCU_buffer[blkn-1][0][0];
-	    }
-	  }
-	  blkn += compptr->MCU_width;
-	  ypos += DCTSIZE;
-	}
-      }
-      /* Try to write the MCU.  In event of a suspension failure, we will
-       * re-DCT the MCU on restart (a bit inefficient, could be fixed...)
-       */
-      if (! (*cinfo->entropy->encode_mcu) (cinfo, coef->MCU_buffer)) {
-	/* Suspension forced; update state counters and exit */
-	coef->MCU_vert_offset = yoffset;
-	coef->mcu_ctr = MCU_col_num;
-	return FALSE;
-      }
-    }
-    /* Completed an MCU row, but perhaps not an iMCU row */
-    coef->mcu_ctr = 0;
-  }
-  /* Completed the iMCU row, advance counters for next one */
-  coef->iMCU_row_num++;
-  start_iMCU_row(cinfo);
-  return TRUE;
-}
-
-
-#ifdef FULL_COEF_BUFFER_SUPPORTED
-
-/*
- * Process some data in the first pass of a multi-pass case.
- * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
- * per call, ie, v_samp_factor block rows for each component in the image.
- * This amount of data is read from the source buffer, DCT'd and quantized,
- * and saved into the virtual arrays.  We also generate suitable dummy blocks
- * as needed at the right and lower edges.  (The dummy blocks are constructed
- * in the virtual arrays, which have been padded appropriately.)  This makes
- * it possible for subsequent passes not to worry about real vs. dummy blocks.
- *
- * We must also emit the data to the entropy encoder.  This is conveniently
- * done by calling compress_output() after we've loaded the current strip
- * of the virtual arrays.
- *
- * NB: input_buf contains a plane for each component in image.  All
- * components are DCT'd and loaded into the virtual arrays in this pass.
- * However, it may be that only a subset of the components are emitted to
- * the entropy encoder during this first pass; be careful about looking
- * at the scan-dependent variables (MCU dimensions, etc).
- */
-
-METHODDEF(wxjpeg_boolean)
-compress_first_pass (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
-  JDIMENSION blocks_across, MCUs_across, MCUindex;
-  int bi, ci, h_samp_factor, block_row, block_rows, ndummy;
-  JCOEF lastDC;
-  jpeg_component_info *compptr;
-  JBLOCKARRAY buffer;
-  JBLOCKROW thisblockrow, lastblockrow;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Align the virtual buffer for this component. */
-    buffer = (*cinfo->mem->access_virt_barray)
-      ((j_common_ptr) cinfo, coef->whole_image[ci],
-       coef->iMCU_row_num * compptr->v_samp_factor,
-       (JDIMENSION) compptr->v_samp_factor, TRUE);
-    /* Count non-dummy DCT block rows in this iMCU row. */
-    if (coef->iMCU_row_num < last_iMCU_row)
-      block_rows = compptr->v_samp_factor;
-    else {
-      /* NB: can't use last_row_height here, since may not be set! */
-      block_rows = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
-      if (block_rows == 0) block_rows = compptr->v_samp_factor;
-    }
-    blocks_across = compptr->width_in_blocks;
-    h_samp_factor = compptr->h_samp_factor;
-    /* Count number of dummy blocks to be added at the right margin. */
-    ndummy = (int) (blocks_across % h_samp_factor);
-    if (ndummy > 0)
-      ndummy = h_samp_factor - ndummy;
-    /* Perform DCT for all non-dummy blocks in this iMCU row.  Each call
-     * on forward_DCT processes a complete horizontal row of DCT blocks.
-     */
-    for (block_row = 0; block_row < block_rows; block_row++) {
-      thisblockrow = buffer[block_row];
-      (*cinfo->fdct->forward_DCT) (cinfo, compptr,
-				   input_buf[ci], thisblockrow,
-				   (JDIMENSION) (block_row * DCTSIZE),
-				   (JDIMENSION) 0, blocks_across);
-      if (ndummy > 0) {
-	/* Create dummy blocks at the right edge of the image. */
-	thisblockrow += blocks_across; /* => first dummy block */
-	jzero_far((void FAR *) thisblockrow, ndummy * SIZEOF(JBLOCK));
-	lastDC = thisblockrow[-1][0];
-	for (bi = 0; bi < ndummy; bi++) {
-	  thisblockrow[bi][0] = lastDC;
-	}
-      }
-    }
-    /* If at end of image, create dummy block rows as needed.
-     * The tricky part here is that within each MCU, we want the DC values
-     * of the dummy blocks to match the last real block's DC value.
-     * This squeezes a few more bytes out of the resulting file...
-     */
-    if (coef->iMCU_row_num == last_iMCU_row) {
-      blocks_across += ndummy;	/* include lower right corner */
-      MCUs_across = blocks_across / h_samp_factor;
-      for (block_row = block_rows; block_row < compptr->v_samp_factor;
-	   block_row++) {
-	thisblockrow = buffer[block_row];
-	lastblockrow = buffer[block_row-1];
-	jzero_far((void FAR *) thisblockrow,
-		  (size_t) (blocks_across * SIZEOF(JBLOCK)));
-	for (MCUindex = 0; MCUindex < MCUs_across; MCUindex++) {
-	  lastDC = lastblockrow[h_samp_factor-1][0];
-	  for (bi = 0; bi < h_samp_factor; bi++) {
-	    thisblockrow[bi][0] = lastDC;
-	  }
-	  thisblockrow += h_samp_factor; /* advance to next MCU in row */
-	  lastblockrow += h_samp_factor;
-	}
-      }
-    }
-  }
-  /* NB: compress_output will increment iMCU_row_num if successful.
-   * A suspension return will result in redoing all the work above next time.
-   */
-
-  /* Emit data to the entropy encoder, sharing code with subsequent passes */
-  return compress_output(cinfo, input_buf);
-}
-
-
-/*
- * Process some data in subsequent passes of a multi-pass case.
- * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
- * per call, ie, v_samp_factor block rows for each component in the scan.
- * The data is obtained from the virtual arrays and fed to the entropy coder.
- * Returns TRUE if the iMCU row is completed, FALSE if suspended.
- *
- * NB: input_buf is ignored; it is likely to be a NULL pointer.
- */
-
-METHODDEF(wxjpeg_boolean)
-compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION MCU_col_num;	/* index of current MCU within row */
-  int blkn, ci, xindex, yindex, yoffset;
-  JDIMENSION start_col;
-  JBLOCKARRAY buffer[MAX_COMPS_IN_SCAN];
-  JBLOCKROW buffer_ptr;
-  jpeg_component_info *compptr;
-
-  /* Align the virtual buffers for the components used in this scan.
-   * NB: during first pass, this is safe only because the buffers will
-   * already be aligned properly, so jmemmgr.c won't need to do any I/O.
-   */
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    buffer[ci] = (*cinfo->mem->access_virt_barray)
-      ((j_common_ptr) cinfo, coef->whole_image[compptr->component_index],
-       coef->iMCU_row_num * compptr->v_samp_factor,
-       (JDIMENSION) compptr->v_samp_factor, FALSE);
-  }
-
-  /* Loop to process one whole iMCU row */
-  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
-       yoffset++) {
-    for (MCU_col_num = coef->mcu_ctr; MCU_col_num < cinfo->MCUs_per_row;
-	 MCU_col_num++) {
-      /* Construct list of pointers to DCT blocks belonging to this MCU */
-      blkn = 0;			/* index of current DCT block within MCU */
-      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-	compptr = cinfo->cur_comp_info[ci];
-	start_col = MCU_col_num * compptr->MCU_width;
-	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
-	  buffer_ptr = buffer[ci][yindex+yoffset] + start_col;
-	  for (xindex = 0; xindex < compptr->MCU_width; xindex++) {
-	    coef->MCU_buffer[blkn++] = buffer_ptr++;
-	  }
-	}
-      }
-      /* Try to write the MCU. */
-      if (! (*cinfo->entropy->encode_mcu) (cinfo, coef->MCU_buffer)) {
-	/* Suspension forced; update state counters and exit */
-	coef->MCU_vert_offset = yoffset;
-	coef->mcu_ctr = MCU_col_num;
-	return FALSE;
-      }
-    }
-    /* Completed an MCU row, but perhaps not an iMCU row */
-    coef->mcu_ctr = 0;
-  }
-  /* Completed the iMCU row, advance counters for next one */
-  coef->iMCU_row_num++;
-  start_iMCU_row(cinfo);
-  return TRUE;
-}
-
-#endif /* FULL_COEF_BUFFER_SUPPORTED */
-
-
-/*
- * Initialize coefficient buffer controller.
- */
-
-GLOBAL(void)
-jinit_c_coef_controller (j_compress_ptr cinfo, wxjpeg_boolean need_full_buffer)
-{
-  my_coef_ptr coef;
-
-  coef = (my_coef_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_coef_controller));
-  cinfo->coef = (struct jpeg_c_coef_controller *) coef;
-  coef->pub.start_pass = start_pass_coef;
-
-  /* Create the coefficient buffer. */
-  if (need_full_buffer) {
-#ifdef FULL_COEF_BUFFER_SUPPORTED
-    /* Allocate a full-image virtual array for each component, */
-    /* padded to a multiple of samp_factor DCT blocks in each direction. */
-    int ci;
-    jpeg_component_info *compptr;
-
-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	 ci++, compptr++) {
-      coef->whole_image[ci] = (*cinfo->mem->request_virt_barray)
-	((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
-	 (JDIMENSION) jround_up((long) compptr->width_in_blocks,
-				(long) compptr->h_samp_factor),
-	 (JDIMENSION) jround_up((long) compptr->height_in_blocks,
-				(long) compptr->v_samp_factor),
-	 (JDIMENSION) compptr->v_samp_factor);
-    }
-#else
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-#endif
-  } else {
-    /* We only need a single-MCU buffer. */
-    JBLOCKROW buffer;
-    int i;
-
-    buffer = (JBLOCKROW)
-      (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  C_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));
-    for (i = 0; i < C_MAX_BLOCKS_IN_MCU; i++) {
-      coef->MCU_buffer[i] = buffer + i;
-    }
-    coef->whole_image[0] = NULL; /* flag for no virtual arrays */
-  }
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jccolor.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jccolor.c
deleted file mode 100644
index 2f74cc2a39..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jccolor.c
+++ /dev/null
@@ -1,459 +0,0 @@
-/*
- * jccolor.c
- *
- * Copyright (C) 1991-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains input colorspace conversion routines.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Private subobject */
-
-typedef struct {
-  struct jpeg_color_converter pub; /* public fields */
-
-  /* Private state for RGB->YCC conversion */
-  JPEG_INT32 * rgb_ycc_tab;		/* => table for RGB to YCbCr conversion */
-} my_color_converter;
-
-typedef my_color_converter * my_cconvert_ptr;
-
-
-/**************** RGB -> YCbCr conversion: most common case **************/
-
-/*
- * YCbCr is defined per CCIR 601-1, except that Cb and Cr are
- * normalized to the range 0..MAXJSAMPLE rather than -0.5 .. 0.5.
- * The conversion equations to be implemented are therefore
- *	Y  =  0.29900 * R + 0.58700 * G + 0.11400 * B
- *	Cb = -0.16874 * R - 0.33126 * G + 0.50000 * B  + CENTERJSAMPLE
- *	Cr =  0.50000 * R - 0.41869 * G - 0.08131 * B  + CENTERJSAMPLE
- * (These numbers are derived from TIFF 6.0 section 21, dated 3-June-92.)
- * Note: older versions of the IJG code used a zero offset of MAXJSAMPLE/2,
- * rather than CENTERJSAMPLE, for Cb and Cr.  This gave equal positive and
- * negative swings for Cb/Cr, but meant that grayscale values (Cb=Cr=0)
- * were not represented exactly.  Now we sacrifice exact representation of
- * maximum red and maximum blue in order to get exact grayscales.
- *
- * To avoid floating-point arithmetic, we represent the fractional constants
- * as integers scaled up by 2^16 (about 4 digits precision); we have to divide
- * the products by 2^16, with appropriate rounding, to get the correct answer.
- *
- * For even more speed, we avoid doing any multiplications in the inner loop
- * by precalculating the constants times R,G,B for all possible values.
- * For 8-bit JSAMPLEs this is very reasonable (only 256 entries per table);
- * for 12-bit samples it is still acceptable.  It's not very reasonable for
- * 16-bit samples, but if you want lossless storage you shouldn't be changing
- * colorspace anyway.
- * The CENTERJSAMPLE offsets and the rounding fudge-factor of 0.5 are included
- * in the tables to save adding them separately in the inner loop.
- */
-
-#define SCALEBITS	16	/* speediest right-shift on some machines */
-#define CBCR_OFFSET	((JPEG_INT32) CENTERJSAMPLE << SCALEBITS)
-#define ONE_HALF	((JPEG_INT32) 1 << (SCALEBITS-1))
-#define FIX(x)		((JPEG_INT32) ((x) * (1L< Y section */
-#define G_Y_OFF		(1*(MAXJSAMPLE+1))	/* offset to G => Y section */
-#define B_Y_OFF		(2*(MAXJSAMPLE+1))	/* etc. */
-#define R_CB_OFF	(3*(MAXJSAMPLE+1))
-#define G_CB_OFF	(4*(MAXJSAMPLE+1))
-#define B_CB_OFF	(5*(MAXJSAMPLE+1))
-#define R_CR_OFF	B_CB_OFF		/* B=>Cb, R=>Cr are the same */
-#define G_CR_OFF	(6*(MAXJSAMPLE+1))
-#define B_CR_OFF	(7*(MAXJSAMPLE+1))
-#define TABLE_SIZE	(8*(MAXJSAMPLE+1))
-
-
-/*
- * Initialize for RGB->YCC colorspace conversion.
- */
-
-METHODDEF(void)
-rgb_ycc_start (j_compress_ptr cinfo)
-{
-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
-  JPEG_INT32 * rgb_ycc_tab;
-  JPEG_INT32 i;
-
-  /* Allocate and fill in the conversion tables. */
-  cconvert->rgb_ycc_tab = rgb_ycc_tab = (JPEG_INT32 *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(TABLE_SIZE * SIZEOF(JPEG_INT32)));
-
-  for (i = 0; i <= MAXJSAMPLE; i++) {
-    rgb_ycc_tab[i+R_Y_OFF] = FIX(0.29900) * i;
-    rgb_ycc_tab[i+G_Y_OFF] = FIX(0.58700) * i;
-    rgb_ycc_tab[i+B_Y_OFF] = FIX(0.11400) * i     + ONE_HALF;
-    rgb_ycc_tab[i+R_CB_OFF] = (-FIX(0.16874)) * i;
-    rgb_ycc_tab[i+G_CB_OFF] = (-FIX(0.33126)) * i;
-    /* We use a rounding fudge-factor of 0.5-epsilon for Cb and Cr.
-     * This ensures that the maximum output will round to MAXJSAMPLE
-     * not MAXJSAMPLE+1, and thus that we don't have to range-limit.
-     */
-    rgb_ycc_tab[i+B_CB_OFF] = FIX(0.50000) * i    + CBCR_OFFSET + ONE_HALF-1;
-/*  B=>Cb and R=>Cr tables are the same
-    rgb_ycc_tab[i+R_CR_OFF] = FIX(0.50000) * i    + CBCR_OFFSET + ONE_HALF-1;
-*/
-    rgb_ycc_tab[i+G_CR_OFF] = (-FIX(0.41869)) * i;
-    rgb_ycc_tab[i+B_CR_OFF] = (-FIX(0.08131)) * i;
-  }
-}
-
-
-/*
- * Convert some rows of samples to the JPEG colorspace.
- *
- * Note that we change from the application's interleaved-pixel format
- * to our internal noninterleaved, one-plane-per-component format.
- * The input buffer is therefore three times as wide as the output buffer.
- *
- * A starting row offset is provided only for the output buffer.  The caller
- * can easily adjust the passed input_buf value to accommodate any row
- * offset required on that side.
- */
-
-METHODDEF(void)
-rgb_ycc_convert (j_compress_ptr cinfo,
-		 JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
-		 JDIMENSION output_row, int num_rows)
-{
-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
-  register int r, g, b;
-  register JPEG_INT32 * ctab = cconvert->rgb_ycc_tab;
-  register JSAMPROW inptr;
-  register JSAMPROW outptr0, outptr1, outptr2;
-  register JDIMENSION col;
-  JDIMENSION num_cols = cinfo->image_width;
-
-  while (--num_rows >= 0) {
-    inptr = *input_buf++;
-    outptr0 = output_buf[0][output_row];
-    outptr1 = output_buf[1][output_row];
-    outptr2 = output_buf[2][output_row];
-    output_row++;
-    for (col = 0; col < num_cols; col++) {
-      r = GETJSAMPLE(inptr[RGB_RED]);
-      g = GETJSAMPLE(inptr[RGB_GREEN]);
-      b = GETJSAMPLE(inptr[RGB_BLUE]);
-      inptr += RGB_PIXELSIZE;
-      /* If the inputs are 0..MAXJSAMPLE, the outputs of these equations
-       * must be too; we do not need an explicit range-limiting operation.
-       * Hence the value being shifted is never negative, and we don't
-       * need the general RIGHT_SHIFT macro.
-       */
-      /* Y */
-      outptr0[col] = (JSAMPLE)
-		((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])
-		 >> SCALEBITS);
-      /* Cb */
-      outptr1[col] = (JSAMPLE)
-		((ctab[r+R_CB_OFF] + ctab[g+G_CB_OFF] + ctab[b+B_CB_OFF])
-		 >> SCALEBITS);
-      /* Cr */
-      outptr2[col] = (JSAMPLE)
-		((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF])
-		 >> SCALEBITS);
-    }
-  }
-}
-
-
-/**************** Cases other than RGB -> YCbCr **************/
-
-
-/*
- * Convert some rows of samples to the JPEG colorspace.
- * This version handles RGB->grayscale conversion, which is the same
- * as the RGB->Y portion of RGB->YCbCr.
- * We assume rgb_ycc_start has been called (we only use the Y tables).
- */
-
-METHODDEF(void)
-rgb_gray_convert (j_compress_ptr cinfo,
-		  JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
-		  JDIMENSION output_row, int num_rows)
-{
-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
-  register int r, g, b;
-  register JPEG_INT32 * ctab = cconvert->rgb_ycc_tab;
-  register JSAMPROW inptr;
-  register JSAMPROW outptr;
-  register JDIMENSION col;
-  JDIMENSION num_cols = cinfo->image_width;
-
-  while (--num_rows >= 0) {
-    inptr = *input_buf++;
-    outptr = output_buf[0][output_row];
-    output_row++;
-    for (col = 0; col < num_cols; col++) {
-      r = GETJSAMPLE(inptr[RGB_RED]);
-      g = GETJSAMPLE(inptr[RGB_GREEN]);
-      b = GETJSAMPLE(inptr[RGB_BLUE]);
-      inptr += RGB_PIXELSIZE;
-      /* Y */
-      outptr[col] = (JSAMPLE)
-		((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])
-		 >> SCALEBITS);
-    }
-  }
-}
-
-
-/*
- * Convert some rows of samples to the JPEG colorspace.
- * This version handles Adobe-style CMYK->YCCK conversion,
- * where we convert R=1-C, G=1-M, and B=1-Y to YCbCr using the same
- * conversion as above, while passing K (black) unchanged.
- * We assume rgb_ycc_start has been called.
- */
-
-METHODDEF(void)
-cmyk_ycck_convert (j_compress_ptr cinfo,
-		   JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
-		   JDIMENSION output_row, int num_rows)
-{
-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
-  register int r, g, b;
-  register JPEG_INT32 * ctab = cconvert->rgb_ycc_tab;
-  register JSAMPROW inptr;
-  register JSAMPROW outptr0, outptr1, outptr2, outptr3;
-  register JDIMENSION col;
-  JDIMENSION num_cols = cinfo->image_width;
-
-  while (--num_rows >= 0) {
-    inptr = *input_buf++;
-    outptr0 = output_buf[0][output_row];
-    outptr1 = output_buf[1][output_row];
-    outptr2 = output_buf[2][output_row];
-    outptr3 = output_buf[3][output_row];
-    output_row++;
-    for (col = 0; col < num_cols; col++) {
-      r = MAXJSAMPLE - GETJSAMPLE(inptr[0]);
-      g = MAXJSAMPLE - GETJSAMPLE(inptr[1]);
-      b = MAXJSAMPLE - GETJSAMPLE(inptr[2]);
-      /* K passes through as-is */
-      outptr3[col] = inptr[3];	/* don't need GETJSAMPLE here */
-      inptr += 4;
-      /* If the inputs are 0..MAXJSAMPLE, the outputs of these equations
-       * must be too; we do not need an explicit range-limiting operation.
-       * Hence the value being shifted is never negative, and we don't
-       * need the general RIGHT_SHIFT macro.
-       */
-      /* Y */
-      outptr0[col] = (JSAMPLE)
-		((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])
-		 >> SCALEBITS);
-      /* Cb */
-      outptr1[col] = (JSAMPLE)
-		((ctab[r+R_CB_OFF] + ctab[g+G_CB_OFF] + ctab[b+B_CB_OFF])
-		 >> SCALEBITS);
-      /* Cr */
-      outptr2[col] = (JSAMPLE)
-		((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF])
-		 >> SCALEBITS);
-    }
-  }
-}
-
-
-/*
- * Convert some rows of samples to the JPEG colorspace.
- * This version handles grayscale output with no conversion.
- * The source can be either plain grayscale or YCbCr (since Y == gray).
- */
-
-METHODDEF(void)
-grayscale_convert (j_compress_ptr cinfo,
-		   JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
-		   JDIMENSION output_row, int num_rows)
-{
-  register JSAMPROW inptr;
-  register JSAMPROW outptr;
-  register JDIMENSION col;
-  JDIMENSION num_cols = cinfo->image_width;
-  int instride = cinfo->input_components;
-
-  while (--num_rows >= 0) {
-    inptr = *input_buf++;
-    outptr = output_buf[0][output_row];
-    output_row++;
-    for (col = 0; col < num_cols; col++) {
-      outptr[col] = inptr[0];	/* don't need GETJSAMPLE() here */
-      inptr += instride;
-    }
-  }
-}
-
-
-/*
- * Convert some rows of samples to the JPEG colorspace.
- * This version handles multi-component colorspaces without conversion.
- * We assume input_components == num_components.
- */
-
-METHODDEF(void)
-null_convert (j_compress_ptr cinfo,
-	      JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
-	      JDIMENSION output_row, int num_rows)
-{
-  register JSAMPROW inptr;
-  register JSAMPROW outptr;
-  register JDIMENSION col;
-  register int ci;
-  int nc = cinfo->num_components;
-  JDIMENSION num_cols = cinfo->image_width;
-
-  while (--num_rows >= 0) {
-    /* It seems fastest to make a separate pass for each component. */
-    for (ci = 0; ci < nc; ci++) {
-      inptr = *input_buf;
-      outptr = output_buf[ci][output_row];
-      for (col = 0; col < num_cols; col++) {
-	outptr[col] = inptr[ci]; /* don't need GETJSAMPLE() here */
-	inptr += nc;
-      }
-    }
-    input_buf++;
-    output_row++;
-  }
-}
-
-
-/*
- * Empty method for start_pass.
- */
-
-METHODDEF(void)
-null_method (j_compress_ptr cinfo)
-{
-  /* no work needed */
-}
-
-
-/*
- * Module initialization routine for input colorspace conversion.
- */
-
-GLOBAL(void)
-jinit_color_converter (j_compress_ptr cinfo)
-{
-  my_cconvert_ptr cconvert;
-
-  cconvert = (my_cconvert_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_color_converter));
-  cinfo->cconvert = (struct jpeg_color_converter *) cconvert;
-  /* set start_pass to null method until we find out differently */
-  cconvert->pub.start_pass = null_method;
-
-  /* Make sure input_components agrees with in_color_space */
-  switch (cinfo->in_color_space) {
-  case JCS_GRAYSCALE:
-    if (cinfo->input_components != 1)
-      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
-    break;
-
-  case JCS_RGB:
-#if RGB_PIXELSIZE != 3
-    if (cinfo->input_components != RGB_PIXELSIZE)
-      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
-    break;
-#endif /* else share code with YCbCr */
-
-  case JCS_YCbCr:
-    if (cinfo->input_components != 3)
-      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
-    break;
-
-  case JCS_CMYK:
-  case JCS_YCCK:
-    if (cinfo->input_components != 4)
-      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
-    break;
-
-  default:			/* JCS_UNKNOWN can be anything */
-    if (cinfo->input_components < 1)
-      ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
-    break;
-  }
-
-  /* Check num_components, set conversion method based on requested space */
-  switch (cinfo->jpeg_color_space) {
-  case JCS_GRAYSCALE:
-    if (cinfo->num_components != 1)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    if (cinfo->in_color_space == JCS_GRAYSCALE)
-      cconvert->pub.color_convert = grayscale_convert;
-    else if (cinfo->in_color_space == JCS_RGB) {
-      cconvert->pub.start_pass = rgb_ycc_start;
-      cconvert->pub.color_convert = rgb_gray_convert;
-    } else if (cinfo->in_color_space == JCS_YCbCr)
-      cconvert->pub.color_convert = grayscale_convert;
-    else
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-
-  case JCS_RGB:
-    if (cinfo->num_components != 3)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    if (cinfo->in_color_space == JCS_RGB && RGB_PIXELSIZE == 3)
-      cconvert->pub.color_convert = null_convert;
-    else
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-
-  case JCS_YCbCr:
-    if (cinfo->num_components != 3)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    if (cinfo->in_color_space == JCS_RGB) {
-      cconvert->pub.start_pass = rgb_ycc_start;
-      cconvert->pub.color_convert = rgb_ycc_convert;
-    } else if (cinfo->in_color_space == JCS_YCbCr)
-      cconvert->pub.color_convert = null_convert;
-    else
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-
-  case JCS_CMYK:
-    if (cinfo->num_components != 4)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    if (cinfo->in_color_space == JCS_CMYK)
-      cconvert->pub.color_convert = null_convert;
-    else
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-
-  case JCS_YCCK:
-    if (cinfo->num_components != 4)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    if (cinfo->in_color_space == JCS_CMYK) {
-      cconvert->pub.start_pass = rgb_ycc_start;
-      cconvert->pub.color_convert = cmyk_ycck_convert;
-    } else if (cinfo->in_color_space == JCS_YCCK)
-      cconvert->pub.color_convert = null_convert;
-    else
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-
-  default:			/* allow null conversion of JCS_UNKNOWN */
-    if (cinfo->jpeg_color_space != cinfo->in_color_space ||
-	cinfo->num_components != cinfo->input_components)
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    cconvert->pub.color_convert = null_convert;
-    break;
-  }
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcdctmgr.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcdctmgr.c
deleted file mode 100644
index 03ffc8ae41..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcdctmgr.c
+++ /dev/null
@@ -1,387 +0,0 @@
-/*
- * jcdctmgr.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the forward-DCT management logic.
- * This code selects a particular DCT implementation to be used,
- * and it performs related housekeeping chores including coefficient
- * quantization.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-
-/* Private subobject for this module */
-
-typedef struct {
-  struct jpeg_forward_dct pub;	/* public fields */
-
-  /* Pointer to the DCT routine actually in use */
-  forward_DCT_method_ptr do_dct;
-
-  /* The actual post-DCT divisors --- not identical to the quant table
-   * entries, because of scaling (especially for an unnormalized DCT).
-   * Each table is given in normal array order.
-   */
-  DCTELEM * divisors[NUM_QUANT_TBLS];
-
-#ifdef DCT_FLOAT_SUPPORTED
-  /* Same as above for the floating-point case. */
-  float_DCT_method_ptr do_float_dct;
-  FAST_FLOAT * float_divisors[NUM_QUANT_TBLS];
-#endif
-} my_fdct_controller;
-
-typedef my_fdct_controller * my_fdct_ptr;
-
-
-/*
- * Initialize for a processing pass.
- * Verify that all referenced Q-tables are present, and set up
- * the divisor table for each one.
- * In the current implementation, DCT of all components is done during
- * the first pass, even if only some components will be output in the
- * first scan.  Hence all components should be examined here.
- */
-
-METHODDEF(void)
-start_pass_fdctmgr (j_compress_ptr cinfo)
-{
-  my_fdct_ptr fdct = (my_fdct_ptr) cinfo->fdct;
-  int ci, qtblno, i;
-  jpeg_component_info *compptr;
-  JQUANT_TBL * qtbl;
-  DCTELEM * dtbl;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    qtblno = compptr->quant_tbl_no;
-    /* Make sure specified quantization table is present */
-    if (qtblno < 0 || qtblno >= NUM_QUANT_TBLS ||
-	cinfo->quant_tbl_ptrs[qtblno] == NULL)
-      ERREXIT1(cinfo, JERR_NO_QUANT_TABLE, qtblno);
-    qtbl = cinfo->quant_tbl_ptrs[qtblno];
-    /* Compute divisors for this quant table */
-    /* We may do this more than once for same table, but it's not a big deal */
-    switch (cinfo->dct_method) {
-#ifdef DCT_ISLOW_SUPPORTED
-    case JDCT_ISLOW:
-      /* For LL&M IDCT method, divisors are equal to raw quantization
-       * coefficients multiplied by 8 (to counteract scaling).
-       */
-      if (fdct->divisors[qtblno] == NULL) {
-	fdct->divisors[qtblno] = (DCTELEM *)
-	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				      DCTSIZE2 * SIZEOF(DCTELEM));
-      }
-      dtbl = fdct->divisors[qtblno];
-      for (i = 0; i < DCTSIZE2; i++) {
-	dtbl[i] = ((DCTELEM) qtbl->quantval[i]) << 3;
-      }
-      break;
-#endif
-#ifdef DCT_IFAST_SUPPORTED
-    case JDCT_IFAST:
-      {
-	/* For AA&N IDCT method, divisors are equal to quantization
-	 * coefficients scaled by scalefactor[row]*scalefactor[col], where
-	 *   scalefactor[0] = 1
-	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7
-	 * We apply a further scale factor of 8.
-	 */
-#define CONST_BITS 14
-	static const INT16 aanscales[DCTSIZE2] = {
-	  /* precomputed values scaled up by 14 bits */
-	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
-	  22725, 31521, 29692, 26722, 22725, 17855, 12299,  6270,
-	  21407, 29692, 27969, 25172, 21407, 16819, 11585,  5906,
-	  19266, 26722, 25172, 22654, 19266, 15137, 10426,  5315,
-	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
-	  12873, 17855, 16819, 15137, 12873, 10114,  6967,  3552,
-	   8867, 12299, 11585, 10426,  8867,  6967,  4799,  2446,
-	   4520,  6270,  5906,  5315,  4520,  3552,  2446,  1247
-	};
-	SHIFT_TEMPS
-
-	if (fdct->divisors[qtblno] == NULL) {
-	  fdct->divisors[qtblno] = (DCTELEM *)
-	    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-					DCTSIZE2 * SIZEOF(DCTELEM));
-	}
-	dtbl = fdct->divisors[qtblno];
-	for (i = 0; i < DCTSIZE2; i++) {
-	  dtbl[i] = (DCTELEM)
-	    DESCALE(MULTIPLY16V16((JPEG_INT32) qtbl->quantval[i],
-				  (JPEG_INT32) aanscales[i]),
-		    CONST_BITS-3);
-	}
-      }
-      break;
-#endif
-#ifdef DCT_FLOAT_SUPPORTED
-    case JDCT_FLOAT:
-      {
-	/* For float AA&N IDCT method, divisors are equal to quantization
-	 * coefficients scaled by scalefactor[row]*scalefactor[col], where
-	 *   scalefactor[0] = 1
-	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7
-	 * We apply a further scale factor of 8.
-	 * What's actually stored is 1/divisor so that the inner loop can
-	 * use a multiplication rather than a division.
-	 */
-	FAST_FLOAT * fdtbl;
-	int row, col;
-	static const double aanscalefactor[DCTSIZE] = {
-	  1.0, 1.387039845, 1.306562965, 1.175875602,
-	  1.0, 0.785694958, 0.541196100, 0.275899379
-	};
-
-	if (fdct->float_divisors[qtblno] == NULL) {
-	  fdct->float_divisors[qtblno] = (FAST_FLOAT *)
-	    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-					DCTSIZE2 * SIZEOF(FAST_FLOAT));
-	}
-	fdtbl = fdct->float_divisors[qtblno];
-	i = 0;
-	for (row = 0; row < DCTSIZE; row++) {
-	  for (col = 0; col < DCTSIZE; col++) {
-	    fdtbl[i] = (FAST_FLOAT)
-	      (1.0 / (((double) qtbl->quantval[i] *
-		       aanscalefactor[row] * aanscalefactor[col] * 8.0)));
-	    i++;
-	  }
-	}
-      }
-      break;
-#endif
-    default:
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-      break;
-    }
-  }
-}
-
-
-/*
- * Perform forward DCT on one or more blocks of a component.
- *
- * The input samples are taken from the sample_data[] array starting at
- * position start_row/start_col, and moving to the right for any additional
- * blocks. The quantized coefficients are returned in coef_blocks[].
- */
-
-METHODDEF(void)
-forward_DCT (j_compress_ptr cinfo, jpeg_component_info * compptr,
-	     JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
-	     JDIMENSION start_row, JDIMENSION start_col,
-	     JDIMENSION num_blocks)
-/* This version is used for integer DCT implementations. */
-{
-  /* This routine is heavily used, so it's worth coding it tightly. */
-  my_fdct_ptr fdct = (my_fdct_ptr) cinfo->fdct;
-  forward_DCT_method_ptr do_dct = fdct->do_dct;
-  DCTELEM * divisors = fdct->divisors[compptr->quant_tbl_no];
-  DCTELEM workspace[DCTSIZE2];	/* work area for FDCT subroutine */
-  JDIMENSION bi;
-
-  sample_data += start_row;	/* fold in the vertical offset once */
-
-  for (bi = 0; bi < num_blocks; bi++, start_col += DCTSIZE) {
-    /* Load data into workspace, applying unsigned->signed conversion */
-    { register DCTELEM *workspaceptr;
-      register JSAMPROW elemptr;
-      register int elemr;
-
-      workspaceptr = workspace;
-      for (elemr = 0; elemr < DCTSIZE; elemr++) {
-	elemptr = sample_data[elemr] + start_col;
-#if DCTSIZE == 8		/* unroll the inner loop */
-	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-	*workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-#else
-	{ register int elemc;
-	  for (elemc = DCTSIZE; elemc > 0; elemc--) {
-	    *workspaceptr++ = GETJSAMPLE(*elemptr++) - CENTERJSAMPLE;
-	  }
-	}
-#endif
-      }
-    }
-
-    /* Perform the DCT */
-    (*do_dct) (workspace);
-
-    /* Quantize/descale the coefficients, and store into coef_blocks[] */
-    { register DCTELEM temp, qval;
-      register int i;
-      register JCOEFPTR output_ptr = coef_blocks[bi];
-
-      for (i = 0; i < DCTSIZE2; i++) {
-	qval = divisors[i];
-	temp = workspace[i];
-	/* Divide the coefficient value by qval, ensuring proper rounding.
-	 * Since C does not specify the direction of rounding for negative
-	 * quotients, we have to force the dividend positive for portability.
-	 *
-	 * In most files, at least half of the output values will be zero
-	 * (at default quantization settings, more like three-quarters...)
-	 * so we should ensure that this case is fast.  On many machines,
-	 * a comparison is enough cheaper than a divide to make a special test
-	 * a win.  Since both inputs will be nonnegative, we need only test
-	 * for a < b to discover whether a/b is 0.
-	 * If your machine's division is fast enough, define FAST_DIVIDE.
-	 */
-#ifdef FAST_DIVIDE
-#define DIVIDE_BY(a,b)	a /= b
-#else
-#define DIVIDE_BY(a,b)	if (a >= b) a /= b; else a = 0
-#endif
-	if (temp < 0) {
-	  temp = -temp;
-	  temp += qval>>1;	/* for rounding */
-	  DIVIDE_BY(temp, qval);
-	  temp = -temp;
-	} else {
-	  temp += qval>>1;	/* for rounding */
-	  DIVIDE_BY(temp, qval);
-	}
-	output_ptr[i] = (JCOEF) temp;
-      }
-    }
-  }
-}
-
-
-#ifdef DCT_FLOAT_SUPPORTED
-
-METHODDEF(void)
-forward_DCT_float (j_compress_ptr cinfo, jpeg_component_info * compptr,
-		   JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
-		   JDIMENSION start_row, JDIMENSION start_col,
-		   JDIMENSION num_blocks)
-/* This version is used for floating-point DCT implementations. */
-{
-  /* This routine is heavily used, so it's worth coding it tightly. */
-  my_fdct_ptr fdct = (my_fdct_ptr) cinfo->fdct;
-  float_DCT_method_ptr do_dct = fdct->do_float_dct;
-  FAST_FLOAT * divisors = fdct->float_divisors[compptr->quant_tbl_no];
-  FAST_FLOAT workspace[DCTSIZE2]; /* work area for FDCT subroutine */
-  JDIMENSION bi;
-
-  sample_data += start_row;	/* fold in the vertical offset once */
-
-  for (bi = 0; bi < num_blocks; bi++, start_col += DCTSIZE) {
-    /* Load data into workspace, applying unsigned->signed conversion */
-    { register FAST_FLOAT *workspaceptr;
-      register JSAMPROW elemptr;
-      register int elemr;
-
-      workspaceptr = workspace;
-      for (elemr = 0; elemr < DCTSIZE; elemr++) {
-	elemptr = sample_data[elemr] + start_col;
-#if DCTSIZE == 8		/* unroll the inner loop */
-	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-	*workspaceptr++ = (FAST_FLOAT)(GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-#else
-	{ register int elemc;
-	  for (elemc = DCTSIZE; elemc > 0; elemc--) {
-	    *workspaceptr++ = (FAST_FLOAT)
-	      (GETJSAMPLE(*elemptr++) - CENTERJSAMPLE);
-	  }
-	}
-#endif
-      }
-    }
-
-    /* Perform the DCT */
-    (*do_dct) (workspace);
-
-    /* Quantize/descale the coefficients, and store into coef_blocks[] */
-    { register FAST_FLOAT temp;
-      register int i;
-      register JCOEFPTR output_ptr = coef_blocks[bi];
-
-      for (i = 0; i < DCTSIZE2; i++) {
-	/* Apply the quantization and scaling factor */
-	temp = workspace[i] * divisors[i];
-	/* Round to nearest integer.
-	 * Since C does not specify the direction of rounding for negative
-	 * quotients, we have to force the dividend positive for portability.
-	 * The maximum coefficient size is +-16K (for 12-bit data), so this
-	 * code should work for either 16-bit or 32-bit ints.
-	 */
-	output_ptr[i] = (JCOEF) ((int) (temp + (FAST_FLOAT) 16384.5) - 16384);
-      }
-    }
-  }
-}
-
-#endif /* DCT_FLOAT_SUPPORTED */
-
-
-/*
- * Initialize FDCT manager.
- */
-
-GLOBAL(void)
-jinit_forward_dct (j_compress_ptr cinfo)
-{
-  my_fdct_ptr fdct;
-  int i;
-
-  fdct = (my_fdct_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_fdct_controller));
-  cinfo->fdct = (struct jpeg_forward_dct *) fdct;
-  fdct->pub.start_pass = start_pass_fdctmgr;
-
-  switch (cinfo->dct_method) {
-#ifdef DCT_ISLOW_SUPPORTED
-  case JDCT_ISLOW:
-    fdct->pub.forward_DCT = forward_DCT;
-    fdct->do_dct = jpeg_fdct_islow;
-    break;
-#endif
-#ifdef DCT_IFAST_SUPPORTED
-  case JDCT_IFAST:
-    fdct->pub.forward_DCT = forward_DCT;
-    fdct->do_dct = jpeg_fdct_ifast;
-    break;
-#endif
-#ifdef DCT_FLOAT_SUPPORTED
-  case JDCT_FLOAT:
-    fdct->pub.forward_DCT = forward_DCT_float;
-    fdct->do_float_dct = jpeg_fdct_float;
-    break;
-#endif
-  default:
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-    break;
-  }
-
-  /* Mark divisor tables unallocated */
-  for (i = 0; i < NUM_QUANT_TBLS; i++) {
-    fdct->divisors[i] = NULL;
-#ifdef DCT_FLOAT_SUPPORTED
-    fdct->float_divisors[i] = NULL;
-#endif
-  }
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jchuff.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jchuff.c
deleted file mode 100644
index 45b3d2b6fb..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jchuff.c
+++ /dev/null
@@ -1,909 +0,0 @@
-/*
- * jchuff.c
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains Huffman entropy encoding routines.
- *
- * Much of the complexity here has to do with supporting output suspension.
- * If the data destination module demands suspension, we want to be able to
- * back up to the start of the current MCU.  To do this, we copy state
- * variables into local working storage, and update them back to the
- * permanent JPEG objects only upon successful completion of an MCU.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jchuff.h"		/* Declarations shared with jcphuff.c */
-
-
-/* Expanded entropy encoder object for Huffman encoding.
- *
- * The savable_state subrecord contains fields that change within an MCU,
- * but must not be updated permanently until we complete the MCU.
- */
-
-typedef struct {
-  JPEG_INT32 put_buffer;		/* current bit-accumulation buffer */
-  int put_bits;			/* # of bits now in it */
-  int last_dc_val[MAX_COMPS_IN_SCAN]; /* last DC coef for each component */
-} savable_state;
-
-/* This macro is to work around compilers with missing or broken
- * structure assignment.  You'll need to fix this code if you have
- * such a compiler and you change MAX_COMPS_IN_SCAN.
- */
-
-#ifndef NO_STRUCT_ASSIGN
-#define ASSIGN_STATE(dest,src)  ((dest) = (src))
-#else
-#if MAX_COMPS_IN_SCAN == 4
-#define ASSIGN_STATE(dest,src)  \
-	((dest).put_buffer = (src).put_buffer, \
-	 (dest).put_bits = (src).put_bits, \
-	 (dest).last_dc_val[0] = (src).last_dc_val[0], \
-	 (dest).last_dc_val[1] = (src).last_dc_val[1], \
-	 (dest).last_dc_val[2] = (src).last_dc_val[2], \
-	 (dest).last_dc_val[3] = (src).last_dc_val[3])
-#endif
-#endif
-
-
-typedef struct {
-  struct jpeg_entropy_encoder pub; /* public fields */
-
-  savable_state saved;		/* Bit buffer & DC state at start of MCU */
-
-  /* These fields are NOT loaded into local working state. */
-  unsigned int restarts_to_go;	/* MCUs left in this restart interval */
-  int next_restart_num;		/* next restart number to write (0-7) */
-
-  /* Pointers to derived tables (these workspaces have image lifespan) */
-  c_derived_tbl * dc_derived_tbls[NUM_HUFF_TBLS];
-  c_derived_tbl * ac_derived_tbls[NUM_HUFF_TBLS];
-
-#ifdef ENTROPY_OPT_SUPPORTED	/* Statistics tables for optimization */
-  long * dc_count_ptrs[NUM_HUFF_TBLS];
-  long * ac_count_ptrs[NUM_HUFF_TBLS];
-#endif
-} huff_entropy_encoder;
-
-typedef huff_entropy_encoder * huff_entropy_ptr;
-
-/* Working state while writing an MCU.
- * This struct contains all the fields that are needed by subroutines.
- */
-
-typedef struct {
-  JOCTET * next_output_byte;	/* => next byte to write in buffer */
-  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
-  savable_state cur;		/* Current bit buffer & DC state */
-  j_compress_ptr cinfo;		/* dump_buffer needs access to this */
-} working_state;
-
-
-/* Forward declarations */
-METHODDEF(wxjpeg_boolean) encode_mcu_huff JPP((j_compress_ptr cinfo,
-					JBLOCKROW *MCU_data));
-METHODDEF(void) finish_pass_huff JPP((j_compress_ptr cinfo));
-#ifdef ENTROPY_OPT_SUPPORTED
-METHODDEF(wxjpeg_boolean) encode_mcu_gather JPP((j_compress_ptr cinfo,
-					  JBLOCKROW *MCU_data));
-METHODDEF(void) finish_pass_gather JPP((j_compress_ptr cinfo));
-#endif
-
-
-/*
- * Initialize for a Huffman-compressed scan.
- * If gather_statistics is TRUE, we do not output anything during the scan,
- * just count the Huffman symbols used and generate Huffman code tables.
- */
-
-METHODDEF(void)
-start_pass_huff (j_compress_ptr cinfo, wxjpeg_boolean gather_statistics)
-{
-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
-  int ci, dctbl, actbl;
-  jpeg_component_info * compptr;
-
-  if (gather_statistics) {
-#ifdef ENTROPY_OPT_SUPPORTED
-    entropy->pub.encode_mcu = encode_mcu_gather;
-    entropy->pub.finish_pass = finish_pass_gather;
-#else
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-  } else {
-    entropy->pub.encode_mcu = encode_mcu_huff;
-    entropy->pub.finish_pass = finish_pass_huff;
-  }
-
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    dctbl = compptr->dc_tbl_no;
-    actbl = compptr->ac_tbl_no;
-    if (gather_statistics) {
-#ifdef ENTROPY_OPT_SUPPORTED
-      /* Check for invalid table indexes */
-      /* (make_c_derived_tbl does this in the other path) */
-      if (dctbl < 0 || dctbl >= NUM_HUFF_TBLS)
-	ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, dctbl);
-      if (actbl < 0 || actbl >= NUM_HUFF_TBLS)
-	ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, actbl);
-      /* Allocate and zero the statistics tables */
-      /* Note that jpeg_gen_optimal_table expects 257 entries in each table! */
-      if (entropy->dc_count_ptrs[dctbl] == NULL)
-	entropy->dc_count_ptrs[dctbl] = (long *)
-	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				      257 * SIZEOF(long));
-      MEMZERO(entropy->dc_count_ptrs[dctbl], 257 * SIZEOF(long));
-      if (entropy->ac_count_ptrs[actbl] == NULL)
-	entropy->ac_count_ptrs[actbl] = (long *)
-	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				      257 * SIZEOF(long));
-      MEMZERO(entropy->ac_count_ptrs[actbl], 257 * SIZEOF(long));
-#endif
-    } else {
-      /* Compute derived values for Huffman tables */
-      /* We may do this more than once for a table, but it's not expensive */
-      jpeg_make_c_derived_tbl(cinfo, TRUE, dctbl,
-			      & entropy->dc_derived_tbls[dctbl]);
-      jpeg_make_c_derived_tbl(cinfo, FALSE, actbl,
-			      & entropy->ac_derived_tbls[actbl]);
-    }
-    /* Initialize DC predictions to 0 */
-    entropy->saved.last_dc_val[ci] = 0;
-  }
-
-  /* Initialize bit buffer to empty */
-  entropy->saved.put_buffer = 0;
-  entropy->saved.put_bits = 0;
-
-  /* Initialize restart stuff */
-  entropy->restarts_to_go = cinfo->restart_interval;
-  entropy->next_restart_num = 0;
-}
-
-
-/*
- * Compute the derived values for a Huffman table.
- * This routine also performs some validation checks on the table.
- *
- * Note this is also used by jcphuff.c.
- */
-
-GLOBAL(void)
-jpeg_make_c_derived_tbl (j_compress_ptr cinfo, wxjpeg_boolean isDC, int tblno,
-			 c_derived_tbl ** pdtbl)
-{
-  JHUFF_TBL *htbl;
-  c_derived_tbl *dtbl;
-  int p, i, l, lastp, si, maxsymbol;
-  char huffsize[257];
-  unsigned int huffcode[257];
-  unsigned int code;
-
-  /* Note that huffsize[] and huffcode[] are filled in code-length order,
-   * paralleling the order of the symbols themselves in htbl->huffval[].
-   */
-
-  /* Find the input Huffman table */
-  if (tblno < 0 || tblno >= NUM_HUFF_TBLS)
-    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);
-  htbl =
-    isDC ? cinfo->dc_huff_tbl_ptrs[tblno] : cinfo->ac_huff_tbl_ptrs[tblno];
-  if (htbl == NULL)
-    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);
-
-  /* Allocate a workspace if we haven't already done so. */
-  if (*pdtbl == NULL)
-    *pdtbl = (c_derived_tbl *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  SIZEOF(c_derived_tbl));
-  dtbl = *pdtbl;
-  
-  /* Figure C.1: make table of Huffman code length for each symbol */
-
-  p = 0;
-  for (l = 1; l <= 16; l++) {
-    i = (int) htbl->bits[l];
-    if (i < 0 || p + i > 256)	/* protect against table overrun */
-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
-    while (i--)
-      huffsize[p++] = (char) l;
-  }
-  huffsize[p] = 0;
-  lastp = p;
-  
-  /* Figure C.2: generate the codes themselves */
-  /* We also validate that the counts represent a legal Huffman code tree. */
-
-  code = 0;
-  si = huffsize[0];
-  p = 0;
-  while (huffsize[p]) {
-    while (((int) huffsize[p]) == si) {
-      huffcode[p++] = code;
-      code++;
-    }
-    /* code is now 1 more than the last code used for codelength si; but
-     * it must still fit in si bits, since no code is allowed to be all ones.
-     */
-    if (((JPEG_INT32) code) >= (((JPEG_INT32) 1) << si))
-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
-    code <<= 1;
-    si++;
-  }
-  
-  /* Figure C.3: generate encoding tables */
-  /* These are code and size indexed by symbol value */
-
-  /* Set all codeless symbols to have code length 0;
-   * this lets us detect duplicate VAL entries here, and later
-   * allows emit_bits to detect any attempt to emit such symbols.
-   */
-  MEMZERO(dtbl->ehufsi, SIZEOF(dtbl->ehufsi));
-
-  /* This is also a convenient place to check for out-of-range
-   * and duplicated VAL entries.  We allow 0..255 for AC symbols
-   * but only 0..15 for DC.  (We could constrain them further
-   * based on data depth and mode, but this seems enough.)
-   */
-  maxsymbol = isDC ? 15 : 255;
-
-  for (p = 0; p < lastp; p++) {
-    i = htbl->huffval[p];
-    if (i < 0 || i > maxsymbol || dtbl->ehufsi[i])
-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
-    dtbl->ehufco[i] = huffcode[p];
-    dtbl->ehufsi[i] = huffsize[p];
-  }
-}
-
-
-/* Outputting bytes to the file */
-
-/* Emit a byte, taking 'action' if must suspend. */
-#define emit_byte(state,val,action)  \
-	{ *(state)->next_output_byte++ = (JOCTET) (val);  \
-	  if (--(state)->free_in_buffer == 0)  \
-	    if (! dump_buffer(state))  \
-	      { action; } }
-
-
-LOCAL(wxjpeg_boolean)
-dump_buffer (working_state * state)
-/* Empty the output buffer; return TRUE if successful, FALSE if must suspend */
-{
-  struct jpeg_destination_mgr * dest = state->cinfo->dest;
-
-  if (! (*dest->empty_output_buffer) (state->cinfo))
-    return FALSE;
-  /* After a successful buffer dump, must reset buffer pointers */
-  state->next_output_byte = dest->next_output_byte;
-  state->free_in_buffer = dest->free_in_buffer;
-  return TRUE;
-}
-
-
-/* Outputting bits to the file */
-
-/* Only the right 24 bits of put_buffer are used; the valid bits are
- * left-justified in this part.  At most 16 bits can be passed to emit_bits
- * in one call, and we never retain more than 7 bits in put_buffer
- * between calls, so 24 bits are sufficient.
- */
-
-INLINE
-LOCAL(wxjpeg_boolean)
-emit_bits (working_state * state, unsigned int code, int size)
-/* Emit some bits; return TRUE if successful, FALSE if must suspend */
-{
-  /* This routine is heavily used, so it's worth coding tightly. */
-  register JPEG_INT32 put_buffer = (JPEG_INT32) code;
-  register int put_bits = state->cur.put_bits;
-
-  /* if size is 0, caller used an invalid Huffman table entry */
-  if (size == 0)
-    ERREXIT(state->cinfo, JERR_HUFF_MISSING_CODE);
-
-  put_buffer &= (((JPEG_INT32) 1)<cur.put_buffer; /* and merge with old buffer contents */
-  
-  while (put_bits >= 8) {
-    int c = (int) ((put_buffer >> 16) & 0xFF);
-    
-    emit_byte(state, c, return FALSE);
-    if (c == 0xFF) {		/* need to stuff a zero byte? */
-      emit_byte(state, 0, return FALSE);
-    }
-    put_buffer <<= 8;
-    put_bits -= 8;
-  }
-
-  state->cur.put_buffer = put_buffer; /* update state variables */
-  state->cur.put_bits = put_bits;
-
-  return TRUE;
-}
-
-
-LOCAL(wxjpeg_boolean)
-flush_bits (working_state * state)
-{
-  if (! emit_bits(state, 0x7F, 7)) /* fill any partial byte with ones */
-    return FALSE;
-  state->cur.put_buffer = 0;	/* and reset bit-buffer to empty */
-  state->cur.put_bits = 0;
-  return TRUE;
-}
-
-
-/* Encode a single block's worth of coefficients */
-
-LOCAL(wxjpeg_boolean)
-encode_one_block (working_state * state, JCOEFPTR block, int last_dc_val,
-		  c_derived_tbl *dctbl, c_derived_tbl *actbl)
-{
-  register int temp, temp2;
-  register int nbits;
-  register int k, r, i;
-  
-  /* Encode the DC coefficient difference per section F.1.2.1 */
-  
-  temp = temp2 = block[0] - last_dc_val;
-
-  if (temp < 0) {
-    temp = -temp;		/* temp is abs value of input */
-    /* For a negative input, want temp2 = bitwise complement of abs(input) */
-    /* This code assumes we are on a two's complement machine */
-    temp2--;
-  }
-  
-  /* Find the number of bits needed for the magnitude of the coefficient */
-  nbits = 0;
-  while (temp) {
-    nbits++;
-    temp >>= 1;
-  }
-  /* Check for out-of-range coefficient values.
-   * Since we're encoding a difference, the range limit is twice as much.
-   */
-  if (nbits > MAX_COEF_BITS+1)
-    ERREXIT(state->cinfo, JERR_BAD_DCT_COEF);
-  
-  /* Emit the Huffman-coded symbol for the number of bits */
-  if (! emit_bits(state, dctbl->ehufco[nbits], dctbl->ehufsi[nbits]))
-    return FALSE;
-
-  /* Emit that number of bits of the value, if positive, */
-  /* or the complement of its magnitude, if negative. */
-  if (nbits)			/* emit_bits rejects calls with size 0 */
-    if (! emit_bits(state, (unsigned int) temp2, nbits))
-      return FALSE;
-
-  /* Encode the AC coefficients per section F.1.2.2 */
-  
-  r = 0;			/* r = run length of zeros */
-  
-  for (k = 1; k < DCTSIZE2; k++) {
-    if ((temp = block[jpeg_natural_order[k]]) == 0) {
-      r++;
-    } else {
-      /* if run length > 15, must emit special run-length-16 codes (0xF0) */
-      while (r > 15) {
-	if (! emit_bits(state, actbl->ehufco[0xF0], actbl->ehufsi[0xF0]))
-	  return FALSE;
-	r -= 16;
-      }
-
-      temp2 = temp;
-      if (temp < 0) {
-	temp = -temp;		/* temp is abs value of input */
-	/* This code assumes we are on a two's complement machine */
-	temp2--;
-      }
-      
-      /* Find the number of bits needed for the magnitude of the coefficient */
-      nbits = 1;		/* there must be at least one 1 bit */
-      while ((temp >>= 1))
-	nbits++;
-      /* Check for out-of-range coefficient values */
-      if (nbits > MAX_COEF_BITS)
-	ERREXIT(state->cinfo, JERR_BAD_DCT_COEF);
-      
-      /* Emit Huffman symbol for run length / number of bits */
-      i = (r << 4) + nbits;
-      if (! emit_bits(state, actbl->ehufco[i], actbl->ehufsi[i]))
-	return FALSE;
-
-      /* Emit that number of bits of the value, if positive, */
-      /* or the complement of its magnitude, if negative. */
-      if (! emit_bits(state, (unsigned int) temp2, nbits))
-	return FALSE;
-      
-      r = 0;
-    }
-  }
-
-  /* If the last coef(s) were zero, emit an end-of-block code */
-  if (r > 0)
-    if (! emit_bits(state, actbl->ehufco[0], actbl->ehufsi[0]))
-      return FALSE;
-
-  return TRUE;
-}
-
-
-/*
- * Emit a restart marker & resynchronize predictions.
- */
-
-LOCAL(wxjpeg_boolean)
-emit_restart (working_state * state, int restart_num)
-{
-  int ci;
-
-  if (! flush_bits(state))
-    return FALSE;
-
-  emit_byte(state, 0xFF, return FALSE);
-  emit_byte(state, JPEG_RST0 + restart_num, return FALSE);
-
-  /* Re-initialize DC predictions to 0 */
-  for (ci = 0; ci < state->cinfo->comps_in_scan; ci++)
-    state->cur.last_dc_val[ci] = 0;
-
-  /* The restart counter is not updated until we successfully write the MCU. */
-
-  return TRUE;
-}
-
-
-/*
- * Encode and output one MCU's worth of Huffman-compressed coefficients.
- */
-
-METHODDEF(wxjpeg_boolean)
-encode_mcu_huff (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
-{
-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
-  working_state state;
-  int blkn, ci;
-  jpeg_component_info * compptr;
-
-  /* Load up working state */
-  state.next_output_byte = cinfo->dest->next_output_byte;
-  state.free_in_buffer = cinfo->dest->free_in_buffer;
-  ASSIGN_STATE(state.cur, entropy->saved);
-  state.cinfo = cinfo;
-
-  /* Emit restart marker if needed */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0)
-      if (! emit_restart(&state, entropy->next_restart_num))
-	return FALSE;
-  }
-
-  /* Encode the MCU data blocks */
-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
-    ci = cinfo->MCU_membership[blkn];
-    compptr = cinfo->cur_comp_info[ci];
-    if (! encode_one_block(&state,
-			   MCU_data[blkn][0], state.cur.last_dc_val[ci],
-			   entropy->dc_derived_tbls[compptr->dc_tbl_no],
-			   entropy->ac_derived_tbls[compptr->ac_tbl_no]))
-      return FALSE;
-    /* Update last_dc_val */
-    state.cur.last_dc_val[ci] = MCU_data[blkn][0][0];
-  }
-
-  /* Completed MCU, so update state */
-  cinfo->dest->next_output_byte = state.next_output_byte;
-  cinfo->dest->free_in_buffer = state.free_in_buffer;
-  ASSIGN_STATE(entropy->saved, state.cur);
-
-  /* Update restart-interval state too */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0) {
-      entropy->restarts_to_go = cinfo->restart_interval;
-      entropy->next_restart_num++;
-      entropy->next_restart_num &= 7;
-    }
-    entropy->restarts_to_go--;
-  }
-
-  return TRUE;
-}
-
-
-/*
- * Finish up at the end of a Huffman-compressed scan.
- */
-
-METHODDEF(void)
-finish_pass_huff (j_compress_ptr cinfo)
-{
-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
-  working_state state;
-
-  /* Load up working state ... flush_bits needs it */
-  state.next_output_byte = cinfo->dest->next_output_byte;
-  state.free_in_buffer = cinfo->dest->free_in_buffer;
-  ASSIGN_STATE(state.cur, entropy->saved);
-  state.cinfo = cinfo;
-
-  /* Flush out the last data */
-  if (! flush_bits(&state))
-    ERREXIT(cinfo, JERR_CANT_SUSPEND);
-
-  /* Update state */
-  cinfo->dest->next_output_byte = state.next_output_byte;
-  cinfo->dest->free_in_buffer = state.free_in_buffer;
-  ASSIGN_STATE(entropy->saved, state.cur);
-}
-
-
-/*
- * Huffman coding optimization.
- *
- * We first scan the supplied data and count the number of uses of each symbol
- * that is to be Huffman-coded. (This process MUST agree with the code above.)
- * Then we build a Huffman coding tree for the observed counts.
- * Symbols which are not needed at all for the particular image are not
- * assigned any code, which saves space in the DHT marker as well as in
- * the compressed data.
- */
-
-#ifdef ENTROPY_OPT_SUPPORTED
-
-
-/* Process a single block's worth of coefficients */
-
-LOCAL(void)
-htest_one_block (j_compress_ptr cinfo, JCOEFPTR block, int last_dc_val,
-		 long dc_counts[], long ac_counts[])
-{
-  register int temp;
-  register int nbits;
-  register int k, r;
-  
-  /* Encode the DC coefficient difference per section F.1.2.1 */
-  
-  temp = block[0] - last_dc_val;
-  if (temp < 0)
-    temp = -temp;
-  
-  /* Find the number of bits needed for the magnitude of the coefficient */
-  nbits = 0;
-  while (temp) {
-    nbits++;
-    temp >>= 1;
-  }
-  /* Check for out-of-range coefficient values.
-   * Since we're encoding a difference, the range limit is twice as much.
-   */
-  if (nbits > MAX_COEF_BITS+1)
-    ERREXIT(cinfo, JERR_BAD_DCT_COEF);
-
-  /* Count the Huffman symbol for the number of bits */
-  dc_counts[nbits]++;
-  
-  /* Encode the AC coefficients per section F.1.2.2 */
-  
-  r = 0;			/* r = run length of zeros */
-  
-  for (k = 1; k < DCTSIZE2; k++) {
-    if ((temp = block[jpeg_natural_order[k]]) == 0) {
-      r++;
-    } else {
-      /* if run length > 15, must emit special run-length-16 codes (0xF0) */
-      while (r > 15) {
-	ac_counts[0xF0]++;
-	r -= 16;
-      }
-      
-      /* Find the number of bits needed for the magnitude of the coefficient */
-      if (temp < 0)
-	temp = -temp;
-      
-      /* Find the number of bits needed for the magnitude of the coefficient */
-      nbits = 1;		/* there must be at least one 1 bit */
-      while ((temp >>= 1))
-	nbits++;
-      /* Check for out-of-range coefficient values */
-      if (nbits > MAX_COEF_BITS)
-	ERREXIT(cinfo, JERR_BAD_DCT_COEF);
-      
-      /* Count Huffman symbol for run length / number of bits */
-      ac_counts[(r << 4) + nbits]++;
-      
-      r = 0;
-    }
-  }
-
-  /* If the last coef(s) were zero, emit an end-of-block code */
-  if (r > 0)
-    ac_counts[0]++;
-}
-
-
-/*
- * Trial-encode one MCU's worth of Huffman-compressed coefficients.
- * No data is actually output, so no suspension return is possible.
- */
-
-METHODDEF(wxjpeg_boolean)
-encode_mcu_gather (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
-{
-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
-  int blkn, ci;
-  jpeg_component_info * compptr;
-
-  /* Take care of restart intervals if needed */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0) {
-      /* Re-initialize DC predictions to 0 */
-      for (ci = 0; ci < cinfo->comps_in_scan; ci++)
-	entropy->saved.last_dc_val[ci] = 0;
-      /* Update restart state */
-      entropy->restarts_to_go = cinfo->restart_interval;
-    }
-    entropy->restarts_to_go--;
-  }
-
-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
-    ci = cinfo->MCU_membership[blkn];
-    compptr = cinfo->cur_comp_info[ci];
-    htest_one_block(cinfo, MCU_data[blkn][0], entropy->saved.last_dc_val[ci],
-		    entropy->dc_count_ptrs[compptr->dc_tbl_no],
-		    entropy->ac_count_ptrs[compptr->ac_tbl_no]);
-    entropy->saved.last_dc_val[ci] = MCU_data[blkn][0][0];
-  }
-
-  return TRUE;
-}
-
-
-/*
- * Generate the best Huffman code table for the given counts, fill htbl.
- * Note this is also used by jcphuff.c.
- *
- * The JPEG standard requires that no symbol be assigned a codeword of all
- * one bits (so that padding bits added at the end of a compressed segment
- * can't look like a valid code).  Because of the canonical ordering of
- * codewords, this just means that there must be an unused slot in the
- * longest codeword length category.  Section K.2 of the JPEG spec suggests
- * reserving such a slot by pretending that symbol 256 is a valid symbol
- * with count 1.  In theory that's not optimal; giving it count zero but
- * including it in the symbol set anyway should give a better Huffman code.
- * But the theoretically better code actually seems to come out worse in
- * practice, because it produces more all-ones bytes (which incur stuffed
- * zero bytes in the final file).  In any case the difference is tiny.
- *
- * The JPEG standard requires Huffman codes to be no more than 16 bits long.
- * If some symbols have a very small but nonzero probability, the Huffman tree
- * must be adjusted to meet the code length restriction.  We currently use
- * the adjustment method suggested in JPEG section K.2.  This method is *not*
- * optimal; it may not choose the best possible limited-length code.  But
- * typically only very-low-frequency symbols will be given less-than-optimal
- * lengths, so the code is almost optimal.  Experimental comparisons against
- * an optimal limited-length-code algorithm indicate that the difference is
- * microscopic --- usually less than a hundredth of a percent of total size.
- * So the extra complexity of an optimal algorithm doesn't seem worthwhile.
- */
-
-GLOBAL(void)
-jpeg_gen_optimal_table (j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[])
-{
-#define MAX_CLEN 32		/* assumed maximum initial code length */
-  UINT8 bits[MAX_CLEN+1];	/* bits[k] = # of symbols with code length k */
-  int codesize[257];		/* codesize[k] = code length of symbol k */
-  int others[257];		/* next symbol in current branch of tree */
-  int c1, c2;
-  int p, i, j;
-  long v;
-
-  /* This algorithm is explained in section K.2 of the JPEG standard */
-
-  MEMZERO(bits, SIZEOF(bits));
-  MEMZERO(codesize, SIZEOF(codesize));
-  for (i = 0; i < 257; i++)
-    others[i] = -1;		/* init links to empty */
-  
-  freq[256] = 1;		/* make sure 256 has a nonzero count */
-  /* Including the pseudo-symbol 256 in the Huffman procedure guarantees
-   * that no real symbol is given code-value of all ones, because 256
-   * will be placed last in the largest codeword category.
-   */
-
-  /* Huffman's basic algorithm to assign optimal code lengths to symbols */
-
-  for (;;) {
-    /* Find the smallest nonzero frequency, set c1 = its symbol */
-    /* In case of ties, take the larger symbol number */
-    c1 = -1;
-    v = 1000000000L;
-    for (i = 0; i <= 256; i++) {
-      if (freq[i] && freq[i] <= v) {
-	v = freq[i];
-	c1 = i;
-      }
-    }
-
-    /* Find the next smallest nonzero frequency, set c2 = its symbol */
-    /* In case of ties, take the larger symbol number */
-    c2 = -1;
-    v = 1000000000L;
-    for (i = 0; i <= 256; i++) {
-      if (freq[i] && freq[i] <= v && i != c1) {
-	v = freq[i];
-	c2 = i;
-      }
-    }
-
-    /* Done if we've merged everything into one frequency */
-    if (c2 < 0)
-      break;
-    
-    /* Else merge the two counts/trees */
-    freq[c1] += freq[c2];
-    freq[c2] = 0;
-
-    /* Increment the codesize of everything in c1's tree branch */
-    codesize[c1]++;
-    while (others[c1] >= 0) {
-      c1 = others[c1];
-      codesize[c1]++;
-    }
-    
-    others[c1] = c2;		/* chain c2 onto c1's tree branch */
-    
-    /* Increment the codesize of everything in c2's tree branch */
-    codesize[c2]++;
-    while (others[c2] >= 0) {
-      c2 = others[c2];
-      codesize[c2]++;
-    }
-  }
-
-  /* Now count the number of symbols of each code length */
-  for (i = 0; i <= 256; i++) {
-    if (codesize[i]) {
-      /* The JPEG standard seems to think that this can't happen, */
-      /* but I'm paranoid... */
-      if (codesize[i] > MAX_CLEN)
-	ERREXIT(cinfo, JERR_HUFF_CLEN_OVERFLOW);
-
-      bits[codesize[i]]++;
-    }
-  }
-
-  /* JPEG doesn't allow symbols with code lengths over 16 bits, so if the pure
-   * Huffman procedure assigned any such lengths, we must adjust the coding.
-   * Here is what the JPEG spec says about how this next bit works:
-   * Since symbols are paired for the longest Huffman code, the symbols are
-   * removed from this length category two at a time.  The prefix for the pair
-   * (which is one bit shorter) is allocated to one of the pair; then,
-   * skipping the BITS entry for that prefix length, a code word from the next
-   * shortest nonzero BITS entry is converted into a prefix for two code words
-   * one bit longer.
-   */
-  
-  for (i = MAX_CLEN; i > 16; i--) {
-    while (bits[i] > 0) {
-      j = i - 2;		/* find length of new prefix to be used */
-      while (bits[j] == 0)
-	j--;
-      
-      bits[i] -= 2;		/* remove two symbols */
-      bits[i-1]++;		/* one goes in this length */
-      bits[j+1] += 2;		/* two new symbols in this length */
-      bits[j]--;		/* symbol of this length is now a prefix */
-    }
-  }
-
-  /* Remove the count for the pseudo-symbol 256 from the largest codelength */
-  while (bits[i] == 0)		/* find largest codelength still in use */
-    i--;
-  bits[i]--;
-  
-  /* Return final symbol counts (only for lengths 0..16) */
-  MEMCOPY(htbl->bits, bits, SIZEOF(htbl->bits));
-  
-  /* Return a list of the symbols sorted by code length */
-  /* It's not real clear to me why we don't need to consider the codelength
-   * changes made above, but the JPEG spec seems to think this works.
-   */
-  p = 0;
-  for (i = 1; i <= MAX_CLEN; i++) {
-    for (j = 0; j <= 255; j++) {
-      if (codesize[j] == i) {
-	htbl->huffval[p] = (UINT8) j;
-	p++;
-      }
-    }
-  }
-
-  /* Set sent_table FALSE so updated table will be written to JPEG file. */
-  htbl->sent_table = FALSE;
-}
-
-
-/*
- * Finish up a statistics-gathering pass and create the new Huffman tables.
- */
-
-METHODDEF(void)
-finish_pass_gather (j_compress_ptr cinfo)
-{
-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
-  int ci, dctbl, actbl;
-  jpeg_component_info * compptr;
-  JHUFF_TBL **htblptr;
-  wxjpeg_boolean did_dc[NUM_HUFF_TBLS];
-  wxjpeg_boolean did_ac[NUM_HUFF_TBLS];
-
-  /* It's important not to apply jpeg_gen_optimal_table more than once
-   * per table, because it clobbers the input frequency counts!
-   */
-  MEMZERO(did_dc, SIZEOF(did_dc));
-  MEMZERO(did_ac, SIZEOF(did_ac));
-
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    dctbl = compptr->dc_tbl_no;
-    actbl = compptr->ac_tbl_no;
-    if (! did_dc[dctbl]) {
-      htblptr = & cinfo->dc_huff_tbl_ptrs[dctbl];
-      if (*htblptr == NULL)
-	*htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
-      jpeg_gen_optimal_table(cinfo, *htblptr, entropy->dc_count_ptrs[dctbl]);
-      did_dc[dctbl] = TRUE;
-    }
-    if (! did_ac[actbl]) {
-      htblptr = & cinfo->ac_huff_tbl_ptrs[actbl];
-      if (*htblptr == NULL)
-	*htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
-      jpeg_gen_optimal_table(cinfo, *htblptr, entropy->ac_count_ptrs[actbl]);
-      did_ac[actbl] = TRUE;
-    }
-  }
-}
-
-
-#endif /* ENTROPY_OPT_SUPPORTED */
-
-
-/*
- * Module initialization routine for Huffman entropy encoding.
- */
-
-GLOBAL(void)
-jinit_huff_encoder (j_compress_ptr cinfo)
-{
-  huff_entropy_ptr entropy;
-  int i;
-
-  entropy = (huff_entropy_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(huff_entropy_encoder));
-  cinfo->entropy = (struct jpeg_entropy_encoder *) entropy;
-  entropy->pub.start_pass = start_pass_huff;
-
-  /* Mark tables unallocated */
-  for (i = 0; i < NUM_HUFF_TBLS; i++) {
-    entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;
-#ifdef ENTROPY_OPT_SUPPORTED
-    entropy->dc_count_ptrs[i] = entropy->ac_count_ptrs[i] = NULL;
-#endif
-  }
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jchuff.h b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jchuff.h
deleted file mode 100644
index 881962ad52..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jchuff.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * jchuff.h
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains declarations for Huffman entropy encoding routines
- * that are shared between the sequential encoder (jchuff.c) and the
- * progressive encoder (jcphuff.c).  No other modules need to see these.
- */
-
-/* The legal range of a DCT coefficient is
- *  -1024 .. +1023  for 8-bit data;
- * -16384 .. +16383 for 12-bit data.
- * Hence the magnitude should always fit in 10 or 14 bits respectively.
- */
-
-#if BITS_IN_JSAMPLE == 8
-#define MAX_COEF_BITS 10
-#else
-#define MAX_COEF_BITS 14
-#endif
-
-/* Derived data constructed for each Huffman table */
-
-typedef struct {
-  unsigned int ehufco[256];	/* code for each symbol */
-  char ehufsi[256];		/* length of code for each symbol */
-  /* If no code has been allocated for a symbol S, ehufsi[S] contains 0 */
-} c_derived_tbl;
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jpeg_make_c_derived_tbl	jMkCDerived
-#define jpeg_gen_optimal_table	jGenOptTbl
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-/* Expand a Huffman table definition into the derived format */
-EXTERN(void) jpeg_make_c_derived_tbl
-	JPP((j_compress_ptr cinfo, wxjpeg_boolean isDC, int tblno,
-	     c_derived_tbl ** pdtbl));
-
-/* Generate an optimal table definition given the specified counts */
-EXTERN(void) jpeg_gen_optimal_table
-	JPP((j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[]));
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcinit.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcinit.c
deleted file mode 100644
index b9e68a9adc..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcinit.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * jcinit.c
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains initialization logic for the JPEG compressor.
- * This routine is in charge of selecting the modules to be executed and
- * making an initialization call to each one.
- *
- * Logically, this code belongs in jcmaster.c.  It's split out because
- * linking this routine implies linking the entire compression library.
- * For a transcoding-only application, we want to be able to use jcmaster.c
- * without linking in the whole library.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/*
- * Master selection of compression modules.
- * This is done once at the start of processing an image.  We determine
- * which modules will be used and give them appropriate initialization calls.
- */
-
-GLOBAL(void)
-jinit_compress_master (j_compress_ptr cinfo)
-{
-  /* Initialize master control (includes parameter checking/processing) */
-  jinit_c_master_control(cinfo, FALSE /* full compression */);
-
-  /* Preprocessing */
-  if (! cinfo->raw_data_in) {
-    jinit_color_converter(cinfo);
-    jinit_downsampler(cinfo);
-    jinit_c_prep_controller(cinfo, FALSE /* never need full buffer here */);
-  }
-  /* Forward DCT */
-  jinit_forward_dct(cinfo);
-  /* Entropy encoding: either Huffman or arithmetic coding. */
-  if (cinfo->arith_code) {
-    ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
-  } else {
-    if (cinfo->progressive_mode) {
-#ifdef C_PROGRESSIVE_SUPPORTED
-      jinit_phuff_encoder(cinfo);
-#else
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-    } else
-      jinit_huff_encoder(cinfo);
-  }
-
-  /* Need a full-image coefficient buffer in any multi-pass mode. */
-  jinit_c_coef_controller(cinfo,
-		(wxjpeg_boolean) (cinfo->num_scans > 1 || cinfo->optimize_coding));
-  jinit_c_main_controller(cinfo, FALSE /* never need full buffer here */);
-
-  jinit_marker_writer(cinfo);
-
-  /* We can now tell the memory manager to allocate virtual arrays. */
-  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);
-
-  /* Write the datastream header (SOI) immediately.
-   * Frame and scan headers are postponed till later.
-   * This lets application insert special markers after the SOI.
-   */
-  (*cinfo->marker->write_file_header) (cinfo);
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcmainct.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcmainct.c
deleted file mode 100644
index 42846cb517..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcmainct.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * jcmainct.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the main buffer controller for compression.
- * The main buffer lies between the pre-processor and the JPEG
- * compressor proper; it holds downsampled data in the JPEG colorspace.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Note: currently, there is no operating mode in which a full-image buffer
- * is needed at this step.  If there were, that mode could not be used with
- * "raw data" input, since this module is bypassed in that case.  However,
- * we've left the code here for possible use in special applications.
- */
-#undef FULL_MAIN_BUFFER_SUPPORTED
-
-
-/* Private buffer controller object */
-
-typedef struct {
-  struct jpeg_c_main_controller pub; /* public fields */
-
-  JDIMENSION cur_iMCU_row;	/* number of current iMCU row */
-  JDIMENSION rowgroup_ctr;	/* counts row groups received in iMCU row */
-  wxjpeg_boolean suspended;		/* remember if we suspended output */
-  J_BUF_MODE pass_mode;		/* current operating mode */
-
-  /* If using just a strip buffer, this points to the entire set of buffers
-   * (we allocate one for each component).  In the full-image case, this
-   * points to the currently accessible strips of the virtual arrays.
-   */
-  JSAMPARRAY buffer[MAX_COMPONENTS];
-
-#ifdef FULL_MAIN_BUFFER_SUPPORTED
-  /* If using full-image storage, this array holds pointers to virtual-array
-   * control blocks for each component.  Unused if not full-image storage.
-   */
-  jvirt_sarray_ptr whole_image[MAX_COMPONENTS];
-#endif
-} my_main_controller;
-
-typedef my_main_controller * my_main_ptr;
-
-
-/* Forward declarations */
-METHODDEF(void) process_data_simple_main
-	JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,
-	     JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));
-#ifdef FULL_MAIN_BUFFER_SUPPORTED
-METHODDEF(void) process_data_buffer_main
-	JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,
-	     JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));
-#endif
-
-
-/*
- * Initialize for a processing pass.
- */
-
-METHODDEF(void)
-start_pass_main (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
-{
-  my_main_ptr mymain = (my_main_ptr) cinfo->main;
-
-  /* Do nothing in raw-data mode. */
-  if (cinfo->raw_data_in)
-    return;
-
-  mymain->cur_iMCU_row = 0;	/* initialize counters */
-  mymain->rowgroup_ctr = 0;
-  mymain->suspended = FALSE;
-  mymain->pass_mode = pass_mode;	/* save mode for use by process_data */
-
-  switch (pass_mode) {
-  case JBUF_PASS_THRU:
-#ifdef FULL_MAIN_BUFFER_SUPPORTED
-    if (mymain->whole_image[0] != NULL)
-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-#endif
-    mymain->pub.process_data = process_data_simple_main;
-    break;
-#ifdef FULL_MAIN_BUFFER_SUPPORTED
-  case JBUF_SAVE_SOURCE:
-  case JBUF_CRANK_DEST:
-  case JBUF_SAVE_AND_PASS:
-    if (mymain->whole_image[0] == NULL)
-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    mymain->pub.process_data = process_data_buffer_main;
-    break;
-#endif
-  default:
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    break;
-  }
-}
-
-
-/*
- * Process some data.
- * This routine handles the simple pass-through mode,
- * where we have only a strip buffer.
- */
-
-METHODDEF(void)
-process_data_simple_main (j_compress_ptr cinfo,
-			  JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-			  JDIMENSION in_rows_avail)
-{
-  my_main_ptr mymain = (my_main_ptr) cinfo->main;
-
-  while (mymain->cur_iMCU_row < cinfo->total_iMCU_rows) {
-    /* Read input data if we haven't filled the main buffer yet */
-    if (mymain->rowgroup_ctr < DCTSIZE)
-      (*cinfo->prep->pre_process_data) (cinfo,
-					input_buf, in_row_ctr, in_rows_avail,
-					mymain->buffer, &mymain->rowgroup_ctr,
-					(JDIMENSION) DCTSIZE);
-
-    /* If we don't have a full iMCU row buffered, return to application for
-     * more data.  Note that preprocessor will always pad to fill the iMCU row
-     * at the bottom of the image.
-     */
-    if (mymain->rowgroup_ctr != DCTSIZE)
-      return;
-
-    /* Send the completed row to the compressor */
-    if (! (*cinfo->coef->compress_data) (cinfo, mymain->buffer)) {
-      /* If compressor did not consume the whole row, then we must need to
-       * suspend processing and return to the application.  In this situation
-       * we pretend we didn't yet consume the last input row; otherwise, if
-       * it happened to be the last row of the image, the application would
-       * think we were done.
-       */
-      if (! mymain->suspended) {
-	(*in_row_ctr)--;
-	mymain->suspended = TRUE;
-      }
-      return;
-    }
-    /* We did finish the row.  Undo our little suspension hack if a previous
-     * call suspended; then mark the main buffer empty.
-     */
-    if (mymain->suspended) {
-      (*in_row_ctr)++;
-      mymain->suspended = FALSE;
-    }
-    mymain->rowgroup_ctr = 0;
-    mymain->cur_iMCU_row++;
-  }
-}
-
-
-#ifdef FULL_MAIN_BUFFER_SUPPORTED
-
-/*
- * Process some data.
- * This routine handles all of the modes that use a full-size buffer.
- */
-
-METHODDEF(void)
-process_data_buffer_main (j_compress_ptr cinfo,
-			  JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-			  JDIMENSION in_rows_avail)
-{
-  my_main_ptr mymain = (my_main_ptr) cinfo->main;
-  int ci;
-  jpeg_component_info *compptr;
-  wxjpeg_boolean writing = (mymain->pass_mode != JBUF_CRANK_DEST);
-
-  while (mymain->cur_iMCU_row < cinfo->total_iMCU_rows) {
-    /* Realign the virtual buffers if at the start of an iMCU row. */
-    if (mymain->rowgroup_ctr == 0) {
-      for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	   ci++, compptr++) {
-	mymain->buffer[ci] = (*cinfo->mem->access_virt_sarray)
-	  ((j_common_ptr) cinfo, mymain->whole_image[ci],
-	   mymain->cur_iMCU_row * (compptr->v_samp_factor * DCTSIZE),
-	   (JDIMENSION) (compptr->v_samp_factor * DCTSIZE), writing);
-      }
-      /* In a read pass, pretend we just read some source data. */
-      if (! writing) {
-	*in_row_ctr += cinfo->max_v_samp_factor * DCTSIZE;
-	mymain->rowgroup_ctr = DCTSIZE;
-      }
-    }
-
-    /* If a write pass, read input data until the current iMCU row is full. */
-    /* Note: preprocessor will pad if necessary to fill the last iMCU row. */
-    if (writing) {
-      (*cinfo->prep->pre_process_data) (cinfo,
-					input_buf, in_row_ctr, in_rows_avail,
-					mymain->buffer, &mymain->rowgroup_ctr,
-					(JDIMENSION) DCTSIZE);
-      /* Return to application if we need more data to fill the iMCU row. */
-      if (mymain->rowgroup_ctr < DCTSIZE)
-	return;
-    }
-
-    /* Emit data, unless this is a sink-only pass. */
-    if (mymain->pass_mode != JBUF_SAVE_SOURCE) {
-      if (! (*cinfo->coef->compress_data) (cinfo, mymain->buffer)) {
-	/* If compressor did not consume the whole row, then we must need to
-	 * suspend processing and return to the application.  In this situation
-	 * we pretend we didn't yet consume the last input row; otherwise, if
-	 * it happened to be the last row of the image, the application would
-	 * think we were done.
-	 */
-	if (! mymain->suspended) {
-	  (*in_row_ctr)--;
-	  mymain->suspended = TRUE;
-	}
-	return;
-      }
-      /* We did finish the row.  Undo our little suspension hack if a previous
-       * call suspended; then mark the main buffer empty.
-       */
-      if (mymain->suspended) {
-	(*in_row_ctr)++;
-	mymain->suspended = FALSE;
-      }
-    }
-
-    /* If get here, we are done with this iMCU row.  Mark buffer empty. */
-    mymain->rowgroup_ctr = 0;
-    mymain->cur_iMCU_row++;
-  }
-}
-
-#endif /* FULL_MAIN_BUFFER_SUPPORTED */
-
-
-/*
- * Initialize main buffer controller.
- */
-
-GLOBAL(void)
-jinit_c_main_controller (j_compress_ptr cinfo, wxjpeg_boolean need_full_buffer)
-{
-  my_main_ptr mymain;
-  int ci;
-  jpeg_component_info *compptr;
-
-  mymain = (my_main_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_main_controller));
-  cinfo->main = (struct jpeg_c_main_controller *) mymain;
-  mymain->pub.start_pass = start_pass_main;
-
-  /* We don't need to create a buffer in raw-data mode. */
-  if (cinfo->raw_data_in)
-    return;
-
-  /* Create the buffer.  It holds downsampled data, so each component
-   * may be of a different size.
-   */
-  if (need_full_buffer) {
-#ifdef FULL_MAIN_BUFFER_SUPPORTED
-    /* Allocate a full-image virtual array for each component */
-    /* Note we pad the bottom to a multiple of the iMCU height */
-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	 ci++, compptr++) {
-      mymain->whole_image[ci] = (*cinfo->mem->request_virt_sarray)
-	((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
-	 compptr->width_in_blocks * DCTSIZE,
-	 (JDIMENSION) jround_up((long) compptr->height_in_blocks,
-				(long) compptr->v_samp_factor) * DCTSIZE,
-	 (JDIMENSION) (compptr->v_samp_factor * DCTSIZE));
-    }
-#else
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-#endif
-  } else {
-#ifdef FULL_MAIN_BUFFER_SUPPORTED
-    mymain->whole_image[0] = NULL; /* flag for no virtual arrays */
-#endif
-    /* Allocate a strip buffer for each component */
-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	 ci++, compptr++) {
-      mymain->buffer[ci] = (*cinfo->mem->alloc_sarray)
-	((j_common_ptr) cinfo, JPOOL_IMAGE,
-	 compptr->width_in_blocks * DCTSIZE,
-	 (JDIMENSION) (compptr->v_samp_factor * DCTSIZE));
-    }
-  }
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcmarker.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcmarker.c
deleted file mode 100644
index b6d987af88..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcmarker.c
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
- * jcmarker.c
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains routines to write JPEG datastream markers.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-typedef enum {			/* JPEG marker codes */
-  M_SOF0  = 0xc0,
-  M_SOF1  = 0xc1,
-  M_SOF2  = 0xc2,
-  M_SOF3  = 0xc3,
-  
-  M_SOF5  = 0xc5,
-  M_SOF6  = 0xc6,
-  M_SOF7  = 0xc7,
-  
-  M_JPG   = 0xc8,
-  M_SOF9  = 0xc9,
-  M_SOF10 = 0xca,
-  M_SOF11 = 0xcb,
-  
-  M_SOF13 = 0xcd,
-  M_SOF14 = 0xce,
-  M_SOF15 = 0xcf,
-  
-  M_DHT   = 0xc4,
-  
-  M_DAC   = 0xcc,
-  
-  M_RST0  = 0xd0,
-  M_RST1  = 0xd1,
-  M_RST2  = 0xd2,
-  M_RST3  = 0xd3,
-  M_RST4  = 0xd4,
-  M_RST5  = 0xd5,
-  M_RST6  = 0xd6,
-  M_RST7  = 0xd7,
-  
-  M_SOI   = 0xd8,
-  M_EOI   = 0xd9,
-  M_SOS   = 0xda,
-  M_DQT   = 0xdb,
-  M_DNL   = 0xdc,
-  M_DRI   = 0xdd,
-  M_DHP   = 0xde,
-  M_EXP   = 0xdf,
-  
-  M_APP0  = 0xe0,
-  M_APP1  = 0xe1,
-  M_APP2  = 0xe2,
-  M_APP3  = 0xe3,
-  M_APP4  = 0xe4,
-  M_APP5  = 0xe5,
-  M_APP6  = 0xe6,
-  M_APP7  = 0xe7,
-  M_APP8  = 0xe8,
-  M_APP9  = 0xe9,
-  M_APP10 = 0xea,
-  M_APP11 = 0xeb,
-  M_APP12 = 0xec,
-  M_APP13 = 0xed,
-  M_APP14 = 0xee,
-  M_APP15 = 0xef,
-  
-  M_JPG0  = 0xf0,
-  M_JPG13 = 0xfd,
-  M_COM   = 0xfe,
-  
-  M_TEM   = 0x01,
-  
-  M_ERROR = 0x100
-} JPEG_MARKER;
-
-
-/* Private state */
-
-typedef struct {
-  struct jpeg_marker_writer pub; /* public fields */
-
-  unsigned int last_restart_interval; /* last DRI value emitted; 0 after SOI */
-} my_marker_writer;
-
-typedef my_marker_writer * my_marker_ptr;
-
-
-/*
- * Basic output routines.
- *
- * Note that we do not support suspension while writing a marker.
- * Therefore, an application using suspension must ensure that there is
- * enough buffer space for the initial markers (typ. 600-700 bytes) before
- * calling jpeg_start_compress, and enough space to write the trailing EOI
- * (a few bytes) before calling jpeg_finish_compress.  Multipass compression
- * modes are not supported at all with suspension, so those two are the only
- * points where markers will be written.
- */
-
-LOCAL(void)
-emit_byte (j_compress_ptr cinfo, int val)
-/* Emit a byte */
-{
-  struct jpeg_destination_mgr * dest = cinfo->dest;
-
-  *(dest->next_output_byte)++ = (JOCTET) val;
-  if (--dest->free_in_buffer == 0) {
-    if (! (*dest->empty_output_buffer) (cinfo))
-      ERREXIT(cinfo, JERR_CANT_SUSPEND);
-  }
-}
-
-
-LOCAL(void)
-emit_marker (j_compress_ptr cinfo, JPEG_MARKER mark)
-/* Emit a marker code */
-{
-  emit_byte(cinfo, 0xFF);
-  emit_byte(cinfo, (int) mark);
-}
-
-
-LOCAL(void)
-emit_2bytes (j_compress_ptr cinfo, int value)
-/* Emit a 2-byte integer; these are always MSB first in JPEG files */
-{
-  emit_byte(cinfo, (value >> 8) & 0xFF);
-  emit_byte(cinfo, value & 0xFF);
-}
-
-
-/*
- * Routines to write specific marker types.
- */
-
-LOCAL(int)
-emit_dqt (j_compress_ptr cinfo, int index)
-/* Emit a DQT marker */
-/* Returns the precision used (0 = 8bits, 1 = 16bits) for baseline checking */
-{
-  JQUANT_TBL * qtbl = cinfo->quant_tbl_ptrs[index];
-  int prec;
-  int i;
-
-  if (qtbl == NULL)
-    ERREXIT1(cinfo, JERR_NO_QUANT_TABLE, index);
-
-  prec = 0;
-  for (i = 0; i < DCTSIZE2; i++) {
-    if (qtbl->quantval[i] > 255)
-      prec = 1;
-  }
-
-  if (! qtbl->sent_table) {
-    emit_marker(cinfo, M_DQT);
-
-    emit_2bytes(cinfo, prec ? DCTSIZE2*2 + 1 + 2 : DCTSIZE2 + 1 + 2);
-
-    emit_byte(cinfo, index + (prec<<4));
-
-    for (i = 0; i < DCTSIZE2; i++) {
-      /* The table entries must be emitted in zigzag order. */
-      unsigned int qval = qtbl->quantval[jpeg_natural_order[i]];
-      if (prec)
-	emit_byte(cinfo, (int) (qval >> 8));
-      emit_byte(cinfo, (int) (qval & 0xFF));
-    }
-
-    qtbl->sent_table = TRUE;
-  }
-
-  return prec;
-}
-
-
-LOCAL(void)
-emit_dht (j_compress_ptr cinfo, int index, wxjpeg_boolean is_ac)
-/* Emit a DHT marker */
-{
-  JHUFF_TBL * htbl;
-  int length, i;
-  
-  if (is_ac) {
-    htbl = cinfo->ac_huff_tbl_ptrs[index];
-    index += 0x10;		/* output index has AC bit set */
-  } else {
-    htbl = cinfo->dc_huff_tbl_ptrs[index];
-  }
-
-  if (htbl == NULL)
-    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, index);
-  
-  if (! htbl->sent_table) {
-    emit_marker(cinfo, M_DHT);
-    
-    length = 0;
-    for (i = 1; i <= 16; i++)
-      length += htbl->bits[i];
-    
-    emit_2bytes(cinfo, length + 2 + 1 + 16);
-    emit_byte(cinfo, index);
-    
-    for (i = 1; i <= 16; i++)
-      emit_byte(cinfo, htbl->bits[i]);
-    
-    for (i = 0; i < length; i++)
-      emit_byte(cinfo, htbl->huffval[i]);
-    
-    htbl->sent_table = TRUE;
-  }
-}
-
-
-LOCAL(void)
-emit_dac (j_compress_ptr cinfo)
-/* Emit a DAC marker */
-/* Since the useful info is so small, we want to emit all the tables in */
-/* one DAC marker.  Therefore this routine does its own scan of the table. */
-{
-#ifdef C_ARITH_CODING_SUPPORTED
-  char dc_in_use[NUM_ARITH_TBLS];
-  char ac_in_use[NUM_ARITH_TBLS];
-  int length, i;
-  jpeg_component_info *compptr;
-  
-  for (i = 0; i < NUM_ARITH_TBLS; i++)
-    dc_in_use[i] = ac_in_use[i] = 0;
-  
-  for (i = 0; i < cinfo->comps_in_scan; i++) {
-    compptr = cinfo->cur_comp_info[i];
-    dc_in_use[compptr->dc_tbl_no] = 1;
-    ac_in_use[compptr->ac_tbl_no] = 1;
-  }
-  
-  length = 0;
-  for (i = 0; i < NUM_ARITH_TBLS; i++)
-    length += dc_in_use[i] + ac_in_use[i];
-  
-  emit_marker(cinfo, M_DAC);
-  
-  emit_2bytes(cinfo, length*2 + 2);
-  
-  for (i = 0; i < NUM_ARITH_TBLS; i++) {
-    if (dc_in_use[i]) {
-      emit_byte(cinfo, i);
-      emit_byte(cinfo, cinfo->arith_dc_L[i] + (cinfo->arith_dc_U[i]<<4));
-    }
-    if (ac_in_use[i]) {
-      emit_byte(cinfo, i + 0x10);
-      emit_byte(cinfo, cinfo->arith_ac_K[i]);
-    }
-  }
-#endif /* C_ARITH_CODING_SUPPORTED */
-}
-
-
-LOCAL(void)
-emit_dri (j_compress_ptr cinfo)
-/* Emit a DRI marker */
-{
-  emit_marker(cinfo, M_DRI);
-  
-  emit_2bytes(cinfo, 4);	/* fixed length */
-
-  emit_2bytes(cinfo, (int) cinfo->restart_interval);
-}
-
-
-LOCAL(void)
-emit_sof (j_compress_ptr cinfo, JPEG_MARKER code)
-/* Emit a SOF marker */
-{
-  int ci;
-  jpeg_component_info *compptr;
-  
-  emit_marker(cinfo, code);
-  
-  emit_2bytes(cinfo, 3 * cinfo->num_components + 2 + 5 + 1); /* length */
-
-  /* Make sure image isn't bigger than SOF field can handle */
-  if ((long) cinfo->image_height > 65535L ||
-      (long) cinfo->image_width > 65535L)
-    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) 65535);
-
-  emit_byte(cinfo, cinfo->data_precision);
-  emit_2bytes(cinfo, (int) cinfo->image_height);
-  emit_2bytes(cinfo, (int) cinfo->image_width);
-
-  emit_byte(cinfo, cinfo->num_components);
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    emit_byte(cinfo, compptr->component_id);
-    emit_byte(cinfo, (compptr->h_samp_factor << 4) + compptr->v_samp_factor);
-    emit_byte(cinfo, compptr->quant_tbl_no);
-  }
-}
-
-
-LOCAL(void)
-emit_sos (j_compress_ptr cinfo)
-/* Emit a SOS marker */
-{
-  int i, td, ta;
-  jpeg_component_info *compptr;
-  
-  emit_marker(cinfo, M_SOS);
-  
-  emit_2bytes(cinfo, 2 * cinfo->comps_in_scan + 2 + 1 + 3); /* length */
-  
-  emit_byte(cinfo, cinfo->comps_in_scan);
-  
-  for (i = 0; i < cinfo->comps_in_scan; i++) {
-    compptr = cinfo->cur_comp_info[i];
-    emit_byte(cinfo, compptr->component_id);
-    td = compptr->dc_tbl_no;
-    ta = compptr->ac_tbl_no;
-    if (cinfo->progressive_mode) {
-      /* Progressive mode: only DC or only AC tables are used in one scan;
-       * furthermore, Huffman coding of DC refinement uses no table at all.
-       * We emit 0 for unused field(s); this is recommended by the P&M text
-       * but does not seem to be specified in the standard.
-       */
-      if (cinfo->Ss == 0) {
-	ta = 0;			/* DC scan */
-	if (cinfo->Ah != 0 && !cinfo->arith_code)
-	  td = 0;		/* no DC table either */
-      } else {
-	td = 0;			/* AC scan */
-      }
-    }
-    emit_byte(cinfo, (td << 4) + ta);
-  }
-
-  emit_byte(cinfo, cinfo->Ss);
-  emit_byte(cinfo, cinfo->Se);
-  emit_byte(cinfo, (cinfo->Ah << 4) + cinfo->Al);
-}
-
-
-LOCAL(void)
-emit_jfif_app0 (j_compress_ptr cinfo)
-/* Emit a JFIF-compliant APP0 marker */
-{
-  /*
-   * Length of APP0 block	(2 bytes)
-   * Block ID			(4 bytes - ASCII "JFIF")
-   * Zero byte			(1 byte to terminate the ID string)
-   * Version Major, Minor	(2 bytes - major first)
-   * Units			(1 byte - 0x00 = none, 0x01 = inch, 0x02 = cm)
-   * Xdpu			(2 bytes - dots per unit horizontal)
-   * Ydpu			(2 bytes - dots per unit vertical)
-   * Thumbnail X size		(1 byte)
-   * Thumbnail Y size		(1 byte)
-   */
-  
-  emit_marker(cinfo, M_APP0);
-  
-  emit_2bytes(cinfo, 2 + 4 + 1 + 2 + 1 + 2 + 2 + 1 + 1); /* length */
-
-  emit_byte(cinfo, 0x4A);	/* Identifier: ASCII "JFIF" */
-  emit_byte(cinfo, 0x46);
-  emit_byte(cinfo, 0x49);
-  emit_byte(cinfo, 0x46);
-  emit_byte(cinfo, 0);
-  emit_byte(cinfo, cinfo->JFIF_major_version); /* Version fields */
-  emit_byte(cinfo, cinfo->JFIF_minor_version);
-  emit_byte(cinfo, cinfo->density_unit); /* Pixel size information */
-  emit_2bytes(cinfo, (int) cinfo->X_density);
-  emit_2bytes(cinfo, (int) cinfo->Y_density);
-  emit_byte(cinfo, 0);		/* No thumbnail image */
-  emit_byte(cinfo, 0);
-}
-
-
-LOCAL(void)
-emit_adobe_app14 (j_compress_ptr cinfo)
-/* Emit an Adobe APP14 marker */
-{
-  /*
-   * Length of APP14 block	(2 bytes)
-   * Block ID			(5 bytes - ASCII "Adobe")
-   * Version Number		(2 bytes - currently 100)
-   * Flags0			(2 bytes - currently 0)
-   * Flags1			(2 bytes - currently 0)
-   * Color transform		(1 byte)
-   *
-   * Although Adobe TN 5116 mentions Version = 101, all the Adobe files
-   * now in circulation seem to use Version = 100, so that's what we write.
-   *
-   * We write the color transform byte as 1 if the JPEG color space is
-   * YCbCr, 2 if it's YCCK, 0 otherwise.  Adobe's definition has to do with
-   * whether the encoder performed a transformation, which is pretty useless.
-   */
-  
-  emit_marker(cinfo, M_APP14);
-  
-  emit_2bytes(cinfo, 2 + 5 + 2 + 2 + 2 + 1); /* length */
-
-  emit_byte(cinfo, 0x41);	/* Identifier: ASCII "Adobe" */
-  emit_byte(cinfo, 0x64);
-  emit_byte(cinfo, 0x6F);
-  emit_byte(cinfo, 0x62);
-  emit_byte(cinfo, 0x65);
-  emit_2bytes(cinfo, 100);	/* Version */
-  emit_2bytes(cinfo, 0);	/* Flags0 */
-  emit_2bytes(cinfo, 0);	/* Flags1 */
-  switch (cinfo->jpeg_color_space) {
-  case JCS_YCbCr:
-    emit_byte(cinfo, 1);	/* Color transform = 1 */
-    break;
-  case JCS_YCCK:
-    emit_byte(cinfo, 2);	/* Color transform = 2 */
-    break;
-  default:
-    emit_byte(cinfo, 0);	/* Color transform = 0 */
-    break;
-  }
-}
-
-
-/*
- * These routines allow writing an arbitrary marker with parameters.
- * The only intended use is to emit COM or APPn markers after calling
- * write_file_header and before calling write_frame_header.
- * Other uses are not guaranteed to produce desirable results.
- * Counting the parameter bytes properly is the caller's responsibility.
- */
-
-METHODDEF(void)
-write_marker_header (j_compress_ptr cinfo, int marker, unsigned int datalen)
-/* Emit an arbitrary marker header */
-{
-  if (datalen > (unsigned int) 65533)		/* safety check */
-    ERREXIT(cinfo, JERR_BAD_LENGTH);
-
-  emit_marker(cinfo, (JPEG_MARKER) marker);
-
-  emit_2bytes(cinfo, (int) (datalen + 2));	/* total length */
-}
-
-METHODDEF(void)
-write_marker_byte (j_compress_ptr cinfo, int val)
-/* Emit one byte of marker parameters following write_marker_header */
-{
-  emit_byte(cinfo, val);
-}
-
-
-/*
- * Write datastream header.
- * This consists of an SOI and optional APPn markers.
- * We recommend use of the JFIF marker, but not the Adobe marker,
- * when using YCbCr or grayscale data.  The JFIF marker should NOT
- * be used for any other JPEG colorspace.  The Adobe marker is helpful
- * to distinguish RGB, CMYK, and YCCK colorspaces.
- * Note that an application can write additional header markers after
- * jpeg_start_compress returns.
- */
-
-METHODDEF(void)
-write_file_header (j_compress_ptr cinfo)
-{
-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
-
-  emit_marker(cinfo, M_SOI);	/* first the SOI */
-
-  /* SOI is defined to reset restart interval to 0 */
-  marker->last_restart_interval = 0;
-
-  if (cinfo->write_JFIF_header)	/* next an optional JFIF APP0 */
-    emit_jfif_app0(cinfo);
-  if (cinfo->write_Adobe_marker) /* next an optional Adobe APP14 */
-    emit_adobe_app14(cinfo);
-}
-
-
-/*
- * Write frame header.
- * This consists of DQT and SOFn markers.
- * Note that we do not emit the SOF until we have emitted the DQT(s).
- * This avoids compatibility problems with incorrect implementations that
- * try to error-check the quant table numbers as soon as they see the SOF.
- */
-
-METHODDEF(void)
-write_frame_header (j_compress_ptr cinfo)
-{
-  int ci, prec;
-  wxjpeg_boolean is_baseline;
-  jpeg_component_info *compptr;
-  
-  /* Emit DQT for each quantization table.
-   * Note that emit_dqt() suppresses any duplicate tables.
-   */
-  prec = 0;
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    prec += emit_dqt(cinfo, compptr->quant_tbl_no);
-  }
-  /* now prec is nonzero iff there are any 16-bit quant tables. */
-
-  /* Check for a non-baseline specification.
-   * Note we assume that Huffman table numbers won't be changed later.
-   */
-  if (cinfo->arith_code || cinfo->progressive_mode ||
-      cinfo->data_precision != 8) {
-    is_baseline = FALSE;
-  } else {
-    is_baseline = TRUE;
-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	 ci++, compptr++) {
-      if (compptr->dc_tbl_no > 1 || compptr->ac_tbl_no > 1)
-	is_baseline = FALSE;
-    }
-    if (prec && is_baseline) {
-      is_baseline = FALSE;
-      /* If it's baseline except for quantizer size, warn the user */
-      TRACEMS(cinfo, 0, JTRC_16BIT_TABLES);
-    }
-  }
-
-  /* Emit the proper SOF marker */
-  if (cinfo->arith_code) {
-    emit_sof(cinfo, M_SOF9);	/* SOF code for arithmetic coding */
-  } else {
-    if (cinfo->progressive_mode)
-      emit_sof(cinfo, M_SOF2);	/* SOF code for progressive Huffman */
-    else if (is_baseline)
-      emit_sof(cinfo, M_SOF0);	/* SOF code for baseline implementation */
-    else
-      emit_sof(cinfo, M_SOF1);	/* SOF code for non-baseline Huffman file */
-  }
-}
-
-
-/*
- * Write scan header.
- * This consists of DHT or DAC markers, optional DRI, and SOS.
- * Compressed data will be written following the SOS.
- */
-
-METHODDEF(void)
-write_scan_header (j_compress_ptr cinfo)
-{
-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
-  int i;
-  jpeg_component_info *compptr;
-
-  if (cinfo->arith_code) {
-    /* Emit arith conditioning info.  We may have some duplication
-     * if the file has multiple scans, but it's so small it's hardly
-     * worth worrying about.
-     */
-    emit_dac(cinfo);
-  } else {
-    /* Emit Huffman tables.
-     * Note that emit_dht() suppresses any duplicate tables.
-     */
-    for (i = 0; i < cinfo->comps_in_scan; i++) {
-      compptr = cinfo->cur_comp_info[i];
-      if (cinfo->progressive_mode) {
-	/* Progressive mode: only DC or only AC tables are used in one scan */
-	if (cinfo->Ss == 0) {
-	  if (cinfo->Ah == 0)	/* DC needs no table for refinement scan */
-	    emit_dht(cinfo, compptr->dc_tbl_no, FALSE);
-	} else {
-	  emit_dht(cinfo, compptr->ac_tbl_no, TRUE);
-	}
-      } else {
-	/* Sequential mode: need both DC and AC tables */
-	emit_dht(cinfo, compptr->dc_tbl_no, FALSE);
-	emit_dht(cinfo, compptr->ac_tbl_no, TRUE);
-      }
-    }
-  }
-
-  /* Emit DRI if required --- note that DRI value could change for each scan.
-   * We avoid wasting space with unnecessary DRIs, however.
-   */
-  if (cinfo->restart_interval != marker->last_restart_interval) {
-    emit_dri(cinfo);
-    marker->last_restart_interval = cinfo->restart_interval;
-  }
-
-  emit_sos(cinfo);
-}
-
-
-/*
- * Write datastream trailer.
- */
-
-METHODDEF(void)
-write_file_trailer (j_compress_ptr cinfo)
-{
-  emit_marker(cinfo, M_EOI);
-}
-
-
-/*
- * Write an abbreviated table-specification datastream.
- * This consists of SOI, DQT and DHT tables, and EOI.
- * Any table that is defined and not marked sent_table = TRUE will be
- * emitted.  Note that all tables will be marked sent_table = TRUE at exit.
- */
-
-METHODDEF(void)
-write_tables_only (j_compress_ptr cinfo)
-{
-  int i;
-
-  emit_marker(cinfo, M_SOI);
-
-  for (i = 0; i < NUM_QUANT_TBLS; i++) {
-    if (cinfo->quant_tbl_ptrs[i] != NULL)
-      (void) emit_dqt(cinfo, i);
-  }
-
-  if (! cinfo->arith_code) {
-    for (i = 0; i < NUM_HUFF_TBLS; i++) {
-      if (cinfo->dc_huff_tbl_ptrs[i] != NULL)
-	emit_dht(cinfo, i, FALSE);
-      if (cinfo->ac_huff_tbl_ptrs[i] != NULL)
-	emit_dht(cinfo, i, TRUE);
-    }
-  }
-
-  emit_marker(cinfo, M_EOI);
-}
-
-
-/*
- * Initialize the marker writer module.
- */
-
-GLOBAL(void)
-jinit_marker_writer (j_compress_ptr cinfo)
-{
-  my_marker_ptr marker;
-
-  /* Create the subobject */
-  marker = (my_marker_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_marker_writer));
-  cinfo->marker = (struct jpeg_marker_writer *) marker;
-  /* Initialize method pointers */
-  marker->pub.write_file_header = write_file_header;
-  marker->pub.write_frame_header = write_frame_header;
-  marker->pub.write_scan_header = write_scan_header;
-  marker->pub.write_file_trailer = write_file_trailer;
-  marker->pub.write_tables_only = write_tables_only;
-  marker->pub.write_marker_header = write_marker_header;
-  marker->pub.write_marker_byte = write_marker_byte;
-  /* Initialize private state */
-  marker->last_restart_interval = 0;
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcmaster.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcmaster.c
deleted file mode 100644
index af887794ca..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcmaster.c
+++ /dev/null
@@ -1,590 +0,0 @@
-/*
- * jcmaster.c
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains master control logic for the JPEG compressor.
- * These routines are concerned with parameter validation, initial setup,
- * and inter-pass control (determining the number of passes and the work 
- * to be done in each pass).
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Private state */
-
-typedef enum {
-	main_pass,		/* input data, also do first output step */
-	huff_opt_pass,		/* Huffman code optimization pass */
-	output_pass		/* data output pass */
-} c_pass_type;
-
-typedef struct {
-  struct jpeg_comp_master pub;	/* public fields */
-
-  c_pass_type pass_type;	/* the type of the current pass */
-
-  int pass_number;		/* # of passes completed */
-  int total_passes;		/* total # of passes needed */
-
-  int scan_number;		/* current index in scan_info[] */
-} my_comp_master;
-
-typedef my_comp_master * my_master_ptr;
-
-
-/*
- * Support routines that do various essential calculations.
- */
-
-LOCAL(void)
-initial_setup (j_compress_ptr cinfo)
-/* Do computations that are needed before master selection phase */
-{
-  int ci;
-  jpeg_component_info *compptr;
-  long samplesperrow;
-  JDIMENSION jd_samplesperrow;
-
-  /* Sanity check on image dimensions */
-  if (cinfo->image_height <= 0 || cinfo->image_width <= 0
-      || cinfo->num_components <= 0 || cinfo->input_components <= 0)
-    ERREXIT(cinfo, JERR_EMPTY_IMAGE);
-
-  /* Make sure image isn't bigger than I can handle */
-  if ((long) cinfo->image_height > (long) JPEG_MAX_DIMENSION ||
-      (long) cinfo->image_width > (long) JPEG_MAX_DIMENSION)
-    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) JPEG_MAX_DIMENSION);
-
-  /* Width of an input scanline must be representable as JDIMENSION. */
-  samplesperrow = (long) cinfo->image_width * (long) cinfo->input_components;
-  jd_samplesperrow = (JDIMENSION) samplesperrow;
-  if ((long) jd_samplesperrow != samplesperrow)
-    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
-
-  /* For now, precision must match compiled-in value... */
-  if (cinfo->data_precision != BITS_IN_JSAMPLE)
-    ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision);
-
-  /* Check that number of components won't exceed internal array sizes */
-  if (cinfo->num_components > MAX_COMPONENTS)
-    ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,
-	     MAX_COMPONENTS);
-
-  /* Compute maximum sampling factors; check factor validity */
-  cinfo->max_h_samp_factor = 1;
-  cinfo->max_v_samp_factor = 1;
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    if (compptr->h_samp_factor<=0 || compptr->h_samp_factor>MAX_SAMP_FACTOR ||
-	compptr->v_samp_factor<=0 || compptr->v_samp_factor>MAX_SAMP_FACTOR)
-      ERREXIT(cinfo, JERR_BAD_SAMPLING);
-    cinfo->max_h_samp_factor = MAX(cinfo->max_h_samp_factor,
-				   compptr->h_samp_factor);
-    cinfo->max_v_samp_factor = MAX(cinfo->max_v_samp_factor,
-				   compptr->v_samp_factor);
-  }
-
-  /* Compute dimensions of components */
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Fill in the correct component_index value; don't rely on application */
-    compptr->component_index = ci;
-    /* For compression, we never do DCT scaling. */
-    compptr->DCT_scaled_size = DCTSIZE;
-    /* Size in DCT blocks */
-    compptr->width_in_blocks = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,
-		    (long) (cinfo->max_h_samp_factor * DCTSIZE));
-    compptr->height_in_blocks = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,
-		    (long) (cinfo->max_v_samp_factor * DCTSIZE));
-    /* Size in samples */
-    compptr->downsampled_width = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,
-		    (long) cinfo->max_h_samp_factor);
-    compptr->downsampled_height = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,
-		    (long) cinfo->max_v_samp_factor);
-    /* Mark component needed (this flag isn't actually used for compression) */
-    compptr->component_needed = TRUE;
-  }
-
-  /* Compute number of fully interleaved MCU rows (number of times that
-   * main controller will call coefficient controller).
-   */
-  cinfo->total_iMCU_rows = (JDIMENSION)
-    jdiv_round_up((long) cinfo->image_height,
-		  (long) (cinfo->max_v_samp_factor*DCTSIZE));
-}
-
-
-#ifdef C_MULTISCAN_FILES_SUPPORTED
-
-LOCAL(void)
-validate_script (j_compress_ptr cinfo)
-/* Verify that the scan script in cinfo->scan_info[] is valid; also
- * determine whether it uses progressive JPEG, and set cinfo->progressive_mode.
- */
-{
-  const jpeg_scan_info * scanptr;
-  int scanno, ncomps, ci, coefi, thisi;
-  int Ss, Se, Ah, Al;
-  wxjpeg_boolean component_sent[MAX_COMPONENTS];
-#ifdef C_PROGRESSIVE_SUPPORTED
-  int * last_bitpos_ptr;
-  int last_bitpos[MAX_COMPONENTS][DCTSIZE2];
-  /* -1 until that coefficient has been seen; then last Al for it */
-#endif
-
-  if (cinfo->num_scans <= 0)
-    ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, 0);
-
-  /* For sequential JPEG, all scans must have Ss=0, Se=DCTSIZE2-1;
-   * for progressive JPEG, no scan can have this.
-   */
-  scanptr = cinfo->scan_info;
-  if (scanptr->Ss != 0 || scanptr->Se != DCTSIZE2-1) {
-#ifdef C_PROGRESSIVE_SUPPORTED
-    cinfo->progressive_mode = TRUE;
-    last_bitpos_ptr = & last_bitpos[0][0];
-    for (ci = 0; ci < cinfo->num_components; ci++) 
-      for (coefi = 0; coefi < DCTSIZE2; coefi++)
-	*last_bitpos_ptr++ = -1;
-#else
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-  } else {
-    cinfo->progressive_mode = FALSE;
-    for (ci = 0; ci < cinfo->num_components; ci++) 
-      component_sent[ci] = FALSE;
-  }
-
-  for (scanno = 1; scanno <= cinfo->num_scans; scanptr++, scanno++) {
-    /* Validate component indexes */
-    ncomps = scanptr->comps_in_scan;
-    if (ncomps <= 0 || ncomps > MAX_COMPS_IN_SCAN)
-      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, ncomps, MAX_COMPS_IN_SCAN);
-    for (ci = 0; ci < ncomps; ci++) {
-      thisi = scanptr->component_index[ci];
-      if (thisi < 0 || thisi >= cinfo->num_components)
-	ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, scanno);
-      /* Components must appear in SOF order within each scan */
-      if (ci > 0 && thisi <= scanptr->component_index[ci-1])
-	ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, scanno);
-    }
-    /* Validate progression parameters */
-    Ss = scanptr->Ss;
-    Se = scanptr->Se;
-    Ah = scanptr->Ah;
-    Al = scanptr->Al;
-    if (cinfo->progressive_mode) {
-#ifdef C_PROGRESSIVE_SUPPORTED
-      /* The JPEG spec simply gives the ranges 0..13 for Ah and Al, but that
-       * seems wrong: the upper bound ought to depend on data precision.
-       * Perhaps they really meant 0..N+1 for N-bit precision.
-       * Here we allow 0..10 for 8-bit data; Al larger than 10 results in
-       * out-of-range reconstructed DC values during the first DC scan,
-       * which might cause problems for some decoders.
-       */
-#if BITS_IN_JSAMPLE == 8
-#define MAX_AH_AL 10
-#else
-#define MAX_AH_AL 13
-#endif
-      if (Ss < 0 || Ss >= DCTSIZE2 || Se < Ss || Se >= DCTSIZE2 ||
-	  Ah < 0 || Ah > MAX_AH_AL || Al < 0 || Al > MAX_AH_AL)
-	ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
-      if (Ss == 0) {
-	if (Se != 0)		/* DC and AC together not OK */
-	  ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
-      } else {
-	if (ncomps != 1)	/* AC scans must be for only one component */
-	  ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
-      }
-      for (ci = 0; ci < ncomps; ci++) {
-	last_bitpos_ptr = & last_bitpos[scanptr->component_index[ci]][0];
-	if (Ss != 0 && last_bitpos_ptr[0] < 0) /* AC without prior DC scan */
-	  ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
-	for (coefi = Ss; coefi <= Se; coefi++) {
-	  if (last_bitpos_ptr[coefi] < 0) {
-	    /* first scan of this coefficient */
-	    if (Ah != 0)
-	      ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
-	  } else {
-	    /* not first scan */
-	    if (Ah != last_bitpos_ptr[coefi] || Al != Ah-1)
-	      ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
-	  }
-	  last_bitpos_ptr[coefi] = Al;
-	}
-      }
-#endif
-    } else {
-      /* For sequential JPEG, all progression parameters must be these: */
-      if (Ss != 0 || Se != DCTSIZE2-1 || Ah != 0 || Al != 0)
-	ERREXIT1(cinfo, JERR_BAD_PROG_SCRIPT, scanno);
-      /* Make sure components are not sent twice */
-      for (ci = 0; ci < ncomps; ci++) {
-	thisi = scanptr->component_index[ci];
-	if (component_sent[thisi])
-	  ERREXIT1(cinfo, JERR_BAD_SCAN_SCRIPT, scanno);
-	component_sent[thisi] = TRUE;
-      }
-    }
-  }
-
-  /* Now verify that everything got sent. */
-  if (cinfo->progressive_mode) {
-#ifdef C_PROGRESSIVE_SUPPORTED
-    /* For progressive mode, we only check that at least some DC data
-     * got sent for each component; the spec does not require that all bits
-     * of all coefficients be transmitted.  Would it be wiser to enforce
-     * transmission of all coefficient bits??
-     */
-    for (ci = 0; ci < cinfo->num_components; ci++) {
-      if (last_bitpos[ci][0] < 0)
-	ERREXIT(cinfo, JERR_MISSING_DATA);
-    }
-#endif
-  } else {
-    for (ci = 0; ci < cinfo->num_components; ci++) {
-      if (! component_sent[ci])
-	ERREXIT(cinfo, JERR_MISSING_DATA);
-    }
-  }
-}
-
-#endif /* C_MULTISCAN_FILES_SUPPORTED */
-
-
-LOCAL(void)
-select_scan_parameters (j_compress_ptr cinfo)
-/* Set up the scan parameters for the current scan */
-{
-  int ci;
-
-#ifdef C_MULTISCAN_FILES_SUPPORTED
-  if (cinfo->scan_info != NULL) {
-    /* Prepare for current scan --- the script is already validated */
-    my_master_ptr master = (my_master_ptr) cinfo->master;
-    const jpeg_scan_info * scanptr = cinfo->scan_info + master->scan_number;
-
-    cinfo->comps_in_scan = scanptr->comps_in_scan;
-    for (ci = 0; ci < scanptr->comps_in_scan; ci++) {
-      cinfo->cur_comp_info[ci] =
-	&cinfo->comp_info[scanptr->component_index[ci]];
-    }
-    cinfo->Ss = scanptr->Ss;
-    cinfo->Se = scanptr->Se;
-    cinfo->Ah = scanptr->Ah;
-    cinfo->Al = scanptr->Al;
-  }
-  else
-#endif
-  {
-    /* Prepare for single sequential-JPEG scan containing all components */
-    if (cinfo->num_components > MAX_COMPS_IN_SCAN)
-      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,
-	       MAX_COMPS_IN_SCAN);
-    cinfo->comps_in_scan = cinfo->num_components;
-    for (ci = 0; ci < cinfo->num_components; ci++) {
-      cinfo->cur_comp_info[ci] = &cinfo->comp_info[ci];
-    }
-    cinfo->Ss = 0;
-    cinfo->Se = DCTSIZE2-1;
-    cinfo->Ah = 0;
-    cinfo->Al = 0;
-  }
-}
-
-
-LOCAL(void)
-per_scan_setup (j_compress_ptr cinfo)
-/* Do computations that are needed before processing a JPEG scan */
-/* cinfo->comps_in_scan and cinfo->cur_comp_info[] are already set */
-{
-  int ci, mcublks, tmp;
-  jpeg_component_info *compptr;
-  
-  if (cinfo->comps_in_scan == 1) {
-    
-    /* Noninterleaved (single-component) scan */
-    compptr = cinfo->cur_comp_info[0];
-    
-    /* Overall image size in MCUs */
-    cinfo->MCUs_per_row = compptr->width_in_blocks;
-    cinfo->MCU_rows_in_scan = compptr->height_in_blocks;
-    
-    /* For noninterleaved scan, always one block per MCU */
-    compptr->MCU_width = 1;
-    compptr->MCU_height = 1;
-    compptr->MCU_blocks = 1;
-    compptr->MCU_sample_width = DCTSIZE;
-    compptr->last_col_width = 1;
-    /* For noninterleaved scans, it is convenient to define last_row_height
-     * as the number of block rows present in the last iMCU row.
-     */
-    tmp = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
-    if (tmp == 0) tmp = compptr->v_samp_factor;
-    compptr->last_row_height = tmp;
-    
-    /* Prepare array describing MCU composition */
-    cinfo->blocks_in_MCU = 1;
-    cinfo->MCU_membership[0] = 0;
-    
-  } else {
-    
-    /* Interleaved (multi-component) scan */
-    if (cinfo->comps_in_scan <= 0 || cinfo->comps_in_scan > MAX_COMPS_IN_SCAN)
-      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->comps_in_scan,
-	       MAX_COMPS_IN_SCAN);
-    
-    /* Overall image size in MCUs */
-    cinfo->MCUs_per_row = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width,
-		    (long) (cinfo->max_h_samp_factor*DCTSIZE));
-    cinfo->MCU_rows_in_scan = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height,
-		    (long) (cinfo->max_v_samp_factor*DCTSIZE));
-    
-    cinfo->blocks_in_MCU = 0;
-    
-    for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-      compptr = cinfo->cur_comp_info[ci];
-      /* Sampling factors give # of blocks of component in each MCU */
-      compptr->MCU_width = compptr->h_samp_factor;
-      compptr->MCU_height = compptr->v_samp_factor;
-      compptr->MCU_blocks = compptr->MCU_width * compptr->MCU_height;
-      compptr->MCU_sample_width = compptr->MCU_width * DCTSIZE;
-      /* Figure number of non-dummy blocks in last MCU column & row */
-      tmp = (int) (compptr->width_in_blocks % compptr->MCU_width);
-      if (tmp == 0) tmp = compptr->MCU_width;
-      compptr->last_col_width = tmp;
-      tmp = (int) (compptr->height_in_blocks % compptr->MCU_height);
-      if (tmp == 0) tmp = compptr->MCU_height;
-      compptr->last_row_height = tmp;
-      /* Prepare array describing MCU composition */
-      mcublks = compptr->MCU_blocks;
-      if (cinfo->blocks_in_MCU + mcublks > C_MAX_BLOCKS_IN_MCU)
-	ERREXIT(cinfo, JERR_BAD_MCU_SIZE);
-      while (mcublks-- > 0) {
-	cinfo->MCU_membership[cinfo->blocks_in_MCU++] = ci;
-      }
-    }
-    
-  }
-
-  /* Convert restart specified in rows to actual MCU count. */
-  /* Note that count must fit in 16 bits, so we provide limiting. */
-  if (cinfo->restart_in_rows > 0) {
-    long nominal = (long) cinfo->restart_in_rows * (long) cinfo->MCUs_per_row;
-    cinfo->restart_interval = (unsigned int) MIN(nominal, 65535L);
-  }
-}
-
-
-/*
- * Per-pass setup.
- * This is called at the beginning of each pass.  We determine which modules
- * will be active during this pass and give them appropriate start_pass calls.
- * We also set is_last_pass to indicate whether any more passes will be
- * required.
- */
-
-METHODDEF(void)
-prepare_for_pass (j_compress_ptr cinfo)
-{
-  my_master_ptr master = (my_master_ptr) cinfo->master;
-
-  switch (master->pass_type) {
-  case main_pass:
-    /* Initial pass: will collect input data, and do either Huffman
-     * optimization or data output for the first scan.
-     */
-    select_scan_parameters(cinfo);
-    per_scan_setup(cinfo);
-    if (! cinfo->raw_data_in) {
-      (*cinfo->cconvert->start_pass) (cinfo);
-      (*cinfo->downsample->start_pass) (cinfo);
-      (*cinfo->prep->start_pass) (cinfo, JBUF_PASS_THRU);
-    }
-    (*cinfo->fdct->start_pass) (cinfo);
-    (*cinfo->entropy->start_pass) (cinfo, cinfo->optimize_coding);
-    (*cinfo->coef->start_pass) (cinfo,
-				(master->total_passes > 1 ?
-				 JBUF_SAVE_AND_PASS : JBUF_PASS_THRU));
-    (*cinfo->main->start_pass) (cinfo, JBUF_PASS_THRU);
-    if (cinfo->optimize_coding) {
-      /* No immediate data output; postpone writing frame/scan headers */
-      master->pub.call_pass_startup = FALSE;
-    } else {
-      /* Will write frame/scan headers at first jpeg_write_scanlines call */
-      master->pub.call_pass_startup = TRUE;
-    }
-    break;
-#ifdef ENTROPY_OPT_SUPPORTED
-  case huff_opt_pass:
-    /* Do Huffman optimization for a scan after the first one. */
-    select_scan_parameters(cinfo);
-    per_scan_setup(cinfo);
-    if (cinfo->Ss != 0 || cinfo->Ah == 0 || cinfo->arith_code) {
-      (*cinfo->entropy->start_pass) (cinfo, TRUE);
-      (*cinfo->coef->start_pass) (cinfo, JBUF_CRANK_DEST);
-      master->pub.call_pass_startup = FALSE;
-      break;
-    }
-    /* Special case: Huffman DC refinement scans need no Huffman table
-     * and therefore we can skip the optimization pass for them.
-     */
-    master->pass_type = output_pass;
-    master->pass_number++;
-    /*FALLTHROUGH*/
-#endif
-  case output_pass:
-    /* Do a data-output pass. */
-    /* We need not repeat per-scan setup if prior optimization pass did it. */
-    if (! cinfo->optimize_coding) {
-      select_scan_parameters(cinfo);
-      per_scan_setup(cinfo);
-    }
-    (*cinfo->entropy->start_pass) (cinfo, FALSE);
-    (*cinfo->coef->start_pass) (cinfo, JBUF_CRANK_DEST);
-    /* We emit frame/scan headers now */
-    if (master->scan_number == 0)
-      (*cinfo->marker->write_frame_header) (cinfo);
-    (*cinfo->marker->write_scan_header) (cinfo);
-    master->pub.call_pass_startup = FALSE;
-    break;
-  default:
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-  }
-
-  master->pub.is_last_pass = (master->pass_number == master->total_passes-1);
-
-  /* Set up progress monitor's pass info if present */
-  if (cinfo->progress != NULL) {
-    cinfo->progress->completed_passes = master->pass_number;
-    cinfo->progress->total_passes = master->total_passes;
-  }
-}
-
-
-/*
- * Special start-of-pass hook.
- * This is called by jpeg_write_scanlines if call_pass_startup is TRUE.
- * In single-pass processing, we need this hook because we don't want to
- * write frame/scan headers during jpeg_start_compress; we want to let the
- * application write COM markers etc. between jpeg_start_compress and the
- * jpeg_write_scanlines loop.
- * In multi-pass processing, this routine is not used.
- */
-
-METHODDEF(void)
-pass_startup (j_compress_ptr cinfo)
-{
-  cinfo->master->call_pass_startup = FALSE; /* reset flag so call only once */
-
-  (*cinfo->marker->write_frame_header) (cinfo);
-  (*cinfo->marker->write_scan_header) (cinfo);
-}
-
-
-/*
- * Finish up at end of pass.
- */
-
-METHODDEF(void)
-finish_pass_master (j_compress_ptr cinfo)
-{
-  my_master_ptr master = (my_master_ptr) cinfo->master;
-
-  /* The entropy coder always needs an end-of-pass call,
-   * either to analyze statistics or to flush its output buffer.
-   */
-  (*cinfo->entropy->finish_pass) (cinfo);
-
-  /* Update state for next pass */
-  switch (master->pass_type) {
-  case main_pass:
-    /* next pass is either output of scan 0 (after optimization)
-     * or output of scan 1 (if no optimization).
-     */
-    master->pass_type = output_pass;
-    if (! cinfo->optimize_coding)
-      master->scan_number++;
-    break;
-  case huff_opt_pass:
-    /* next pass is always output of current scan */
-    master->pass_type = output_pass;
-    break;
-  case output_pass:
-    /* next pass is either optimization or output of next scan */
-    if (cinfo->optimize_coding)
-      master->pass_type = huff_opt_pass;
-    master->scan_number++;
-    break;
-  }
-
-  master->pass_number++;
-}
-
-
-/*
- * Initialize master compression control.
- */
-
-GLOBAL(void)
-jinit_c_master_control (j_compress_ptr cinfo, wxjpeg_boolean transcode_only)
-{
-  my_master_ptr master;
-
-  master = (my_master_ptr)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  SIZEOF(my_comp_master));
-  cinfo->master = (struct jpeg_comp_master *) master;
-  master->pub.prepare_for_pass = prepare_for_pass;
-  master->pub.pass_startup = pass_startup;
-  master->pub.finish_pass = finish_pass_master;
-  master->pub.is_last_pass = FALSE;
-
-  /* Validate parameters, determine derived values */
-  initial_setup(cinfo);
-
-  if (cinfo->scan_info != NULL) {
-#ifdef C_MULTISCAN_FILES_SUPPORTED
-    validate_script(cinfo);
-#else
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-  } else {
-    cinfo->progressive_mode = FALSE;
-    cinfo->num_scans = 1;
-  }
-
-  if (cinfo->progressive_mode)	/*  TEMPORARY HACK ??? */
-    cinfo->optimize_coding = TRUE; /* assume default tables no good for progressive mode */
-
-  /* Initialize my private state */
-  if (transcode_only) {
-    /* no main pass in transcoding */
-    if (cinfo->optimize_coding)
-      master->pass_type = huff_opt_pass;
-    else
-      master->pass_type = output_pass;
-  } else {
-    /* for normal compression, first pass is always this type: */
-    master->pass_type = main_pass;
-  }
-  master->scan_number = 0;
-  master->pass_number = 0;
-  if (cinfo->optimize_coding)
-    master->total_passes = cinfo->num_scans * 2;
-  else
-    master->total_passes = cinfo->num_scans;
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcomapi.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcomapi.c
deleted file mode 100644
index 9b1fa7568a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcomapi.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * jcomapi.c
- *
- * Copyright (C) 1994-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains application interface routines that are used for both
- * compression and decompression.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/*
- * Abort processing of a JPEG compression or decompression operation,
- * but don't destroy the object itself.
- *
- * For this, we merely clean up all the nonpermanent memory pools.
- * Note that temp files (virtual arrays) are not allowed to belong to
- * the permanent pool, so we will be able to close all temp files here.
- * Closing a data source or destination, if necessary, is the application's
- * responsibility.
- */
-
-GLOBAL(void)
-jpeg_abort (j_common_ptr cinfo)
-{
-  int pool;
-
-  /* Do nothing if called on a not-initialized or destroyed JPEG object. */
-  if (cinfo->mem == NULL)
-    return;
-
-  /* Releasing pools in reverse order might help avoid fragmentation
-   * with some (brain-damaged) malloc libraries.
-   */
-  for (pool = JPOOL_NUMPOOLS-1; pool > JPOOL_PERMANENT; pool--) {
-    (*cinfo->mem->free_pool) (cinfo, pool);
-  }
-
-  /* Reset overall state for possible reuse of object */
-  if (cinfo->is_decompressor) {
-    cinfo->global_state = DSTATE_START;
-    /* Try to keep application from accessing now-deleted marker list.
-     * A bit kludgy to do it here, but this is the most central place.
-     */
-    ((j_decompress_ptr) cinfo)->marker_list = NULL;
-  } else {
-    cinfo->global_state = CSTATE_START;
-  }
-}
-
-
-/*
- * Destruction of a JPEG object.
- *
- * Everything gets deallocated except the master jpeg_compress_struct itself
- * and the error manager struct.  Both of these are supplied by the application
- * and must be freed, if necessary, by the application.  (Often they are on
- * the stack and so don't need to be freed anyway.)
- * Closing a data source or destination, if necessary, is the application's
- * responsibility.
- */
-
-GLOBAL(void)
-jpeg_destroy (j_common_ptr cinfo)
-{
-  /* We need only tell the memory manager to release everything. */
-  /* NB: mem pointer is NULL if memory mgr failed to initialize. */
-  if (cinfo->mem != NULL)
-    (*cinfo->mem->self_destruct) (cinfo);
-  cinfo->mem = NULL;		/* be safe if jpeg_destroy is called twice */
-  cinfo->global_state = 0;	/* mark it destroyed */
-}
-
-
-/*
- * Convenience routines for allocating quantization and Huffman tables.
- * (Would jutils.c be a more reasonable place to put these?)
- */
-
-GLOBAL(JQUANT_TBL *)
-jpeg_alloc_quant_table (j_common_ptr cinfo)
-{
-  JQUANT_TBL *tbl;
-
-  tbl = (JQUANT_TBL *)
-    (*cinfo->mem->alloc_small) (cinfo, JPOOL_PERMANENT, SIZEOF(JQUANT_TBL));
-  tbl->sent_table = FALSE;	/* make sure this is false in any new table */
-  return tbl;
-}
-
-
-GLOBAL(JHUFF_TBL *)
-jpeg_alloc_huff_table (j_common_ptr cinfo)
-{
-  JHUFF_TBL *tbl;
-
-  tbl = (JHUFF_TBL *)
-    (*cinfo->mem->alloc_small) (cinfo, JPOOL_PERMANENT, SIZEOF(JHUFF_TBL));
-  tbl->sent_table = FALSE;	/* make sure this is false in any new table */
-  return tbl;
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jconfig.h b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jconfig.h
deleted file mode 100644
index c8afdeb56e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jconfig.h
+++ /dev/null
@@ -1,81 +0,0 @@
-#if defined(_WIN32) || defined(__OS2__)
-#include "jconfig.vc"
-#else
-
-/* jconfig.h.  Generated automatically by configure.  */
-/* jconfig.cfg --- source file edited by configure script */
-/* see jconfig.doc for explanations */
-
-/* use wxWidgets' configure */
-#include "wx/setup.h"
-
-#define HAVE_PROTOTYPES
-#define HAVE_UNSIGNED_CHAR
-#define HAVE_UNSIGNED_SHORT
-#undef void
-#undef const
-
-/* use wxWidgets' configure */
-/* #undef CHAR_IS_UNSIGNED */
-#ifdef __CHAR_UNSIGNED__
-  #ifndef CHAR_IS_UNSIGNED
-    #define CHAR_IS_UNSIGNED
-  #endif
-#else
-  #undef CHAR_IS_UNSIGNED
-#endif
-
-#ifndef HAVE_STDDEF_H
-#define HAVE_STDDEF_H
-#endif
-
-#ifndef HAVE_STDLIB_H
-#define HAVE_STDLIB_H
-#endif
-
-#undef NEED_BSD_STRINGS
-#undef NEED_SYS_TYPES_H
-#undef NEED_FAR_POINTERS
-#undef NEED_SHORT_EXTERNAL_NAMES
-/* Define this if you get warnings about undefined structures. */
-#undef INCOMPLETE_TYPES_BROKEN
-
-#ifdef JPEG_INTERNALS
-
-#undef RIGHT_SHIFT_IS_UNSIGNED
-
-/* use wxWidgets' configure */
-/* #define INLINE __inline__ */
-#if defined(__VISAGECPP__) && (__IBMCPP__ >= 400 || __IBMC__ >= 400)
-#define INLINE
-#elif defined(__WATCOMC__)
-#define INLINE
-#else
-#define INLINE inline
-#endif
-
-/* These are for configuring the JPEG memory manager. */
-#undef DEFAULT_MAX_MEM
-#undef NO_MKTEMP
-
-#endif /* JPEG_INTERNALS */
-
-#ifdef JPEG_CJPEG_DJPEG
-
-#define BMP_SUPPORTED		/* BMP image file format */
-#define GIF_SUPPORTED		/* GIF image file format */
-#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
-#undef RLE_SUPPORTED		/* Utah RLE image file format */
-#define TARGA_SUPPORTED		/* Targa image file format */
-
-#undef TWO_FILE_COMMANDLINE
-#undef NEED_SIGNAL_CATCHER
-#undef DONT_USE_B_MODE
-
-/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
-#undef PROGRESS_REPORT
-
-#endif /* JPEG_CJPEG_DJPEG */
-#endif
-    /* _MSC_VER */
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jconfig.vc b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jconfig.vc
deleted file mode 100644
index 2f4da14c54..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jconfig.vc
+++ /dev/null
@@ -1,45 +0,0 @@
-/* jconfig.vc --- jconfig.h for Microsoft Visual C++ on Windows 95 or NT. */
-/* see jconfig.doc for explanations */
-
-#define HAVE_PROTOTYPES
-#define HAVE_UNSIGNED_CHAR
-#define HAVE_UNSIGNED_SHORT
-/* #define void char */
-/* #define const */
-#undef CHAR_IS_UNSIGNED
-#define HAVE_STDDEF_H
-#define HAVE_STDLIB_H
-#undef NEED_BSD_STRINGS
-#undef NEED_SYS_TYPES_H
-#undef NEED_FAR_POINTERS	/* we presume a 32-bit flat memory model */
-#undef NEED_SHORT_EXTERNAL_NAMES
-#undef INCOMPLETE_TYPES_BROKEN
-
-/* Define "boolean" as unsigned char, not int, per Windows custom */
-#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
-typedef unsigned char boolean;
-#endif
-#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
-
-
-#ifdef JPEG_INTERNALS
-
-#undef RIGHT_SHIFT_IS_UNSIGNED
-
-#endif /* JPEG_INTERNALS */
-
-#ifdef JPEG_CJPEG_DJPEG
-
-#define BMP_SUPPORTED		/* BMP image file format */
-#define GIF_SUPPORTED		/* GIF image file format */
-#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
-#undef RLE_SUPPORTED		/* Utah RLE image file format */
-#define TARGA_SUPPORTED		/* Targa image file format */
-
-#define TWO_FILE_COMMANDLINE	/* optional */
-#define USE_SETMODE		/* Microsoft has setmode() */
-#undef NEED_SIGNAL_CATCHER
-#undef DONT_USE_B_MODE
-#undef PROGRESS_REPORT		/* optional */
-
-#endif /* JPEG_CJPEG_DJPEG */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcparam.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcparam.c
deleted file mode 100644
index 046bd87e06..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcparam.c
+++ /dev/null
@@ -1,610 +0,0 @@
-/*
- * jcparam.c
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains optional default-setting code for the JPEG compressor.
- * Applications do not have to use this file, but those that don't use it
- * must know a lot more about the innards of the JPEG code.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/*
- * Quantization table setup routines
- */
-
-GLOBAL(void)
-jpeg_add_quant_table (j_compress_ptr cinfo, int which_tbl,
-		      const unsigned int *basic_table,
-		      int scale_factor, wxjpeg_boolean force_baseline)
-/* Define a quantization table equal to the basic_table times
- * a scale factor (given as a percentage).
- * If force_baseline is TRUE, the computed quantization table entries
- * are limited to 1..255 for JPEG baseline compatibility.
- */
-{
-  JQUANT_TBL ** qtblptr;
-  int i;
-  long temp;
-
-  /* Safety check to ensure start_compress not called yet. */
-  if (cinfo->global_state != CSTATE_START)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  if (which_tbl < 0 || which_tbl >= NUM_QUANT_TBLS)
-    ERREXIT1(cinfo, JERR_DQT_INDEX, which_tbl);
-
-  qtblptr = & cinfo->quant_tbl_ptrs[which_tbl];
-
-  if (*qtblptr == NULL)
-    *qtblptr = jpeg_alloc_quant_table((j_common_ptr) cinfo);
-
-  for (i = 0; i < DCTSIZE2; i++) {
-    temp = ((long) basic_table[i] * scale_factor + 50L) / 100L;
-    /* limit the values to the valid range */
-    if (temp <= 0L) temp = 1L;
-    if (temp > 32767L) temp = 32767L; /* max quantizer needed for 12 bits */
-    if (force_baseline && temp > 255L)
-      temp = 255L;		/* limit to baseline range if requested */
-    (*qtblptr)->quantval[i] = (UINT16) temp;
-  }
-
-  /* Initialize sent_table FALSE so table will be written to JPEG file. */
-  (*qtblptr)->sent_table = FALSE;
-}
-
-
-GLOBAL(void)
-jpeg_set_linear_quality (j_compress_ptr cinfo, int scale_factor,
-			 wxjpeg_boolean force_baseline)
-/* Set or change the 'quality' (quantization) setting, using default tables
- * and a straight percentage-scaling quality scale.  In most cases it's better
- * to use jpeg_set_quality (below); this entry point is provided for
- * applications that insist on a linear percentage scaling.
- */
-{
-  /* These are the sample quantization tables given in JPEG spec section K.1.
-   * The spec says that the values given produce "good" quality, and
-   * when divided by 2, "very good" quality.
-   */
-  static const unsigned int std_luminance_quant_tbl[DCTSIZE2] = {
-    16,  11,  10,  16,  24,  40,  51,  61,
-    12,  12,  14,  19,  26,  58,  60,  55,
-    14,  13,  16,  24,  40,  57,  69,  56,
-    14,  17,  22,  29,  51,  87,  80,  62,
-    18,  22,  37,  56,  68, 109, 103,  77,
-    24,  35,  55,  64,  81, 104, 113,  92,
-    49,  64,  78,  87, 103, 121, 120, 101,
-    72,  92,  95,  98, 112, 100, 103,  99
-  };
-  static const unsigned int std_chrominance_quant_tbl[DCTSIZE2] = {
-    17,  18,  24,  47,  99,  99,  99,  99,
-    18,  21,  26,  66,  99,  99,  99,  99,
-    24,  26,  56,  99,  99,  99,  99,  99,
-    47,  66,  99,  99,  99,  99,  99,  99,
-    99,  99,  99,  99,  99,  99,  99,  99,
-    99,  99,  99,  99,  99,  99,  99,  99,
-    99,  99,  99,  99,  99,  99,  99,  99,
-    99,  99,  99,  99,  99,  99,  99,  99
-  };
-
-  /* Set up two quantization tables using the specified scaling */
-  jpeg_add_quant_table(cinfo, 0, std_luminance_quant_tbl,
-		       scale_factor, force_baseline);
-  jpeg_add_quant_table(cinfo, 1, std_chrominance_quant_tbl,
-		       scale_factor, force_baseline);
-}
-
-
-GLOBAL(int)
-jpeg_quality_scaling (int quality)
-/* Convert a user-specified quality rating to a percentage scaling factor
- * for an underlying quantization table, using our recommended scaling curve.
- * The input 'quality' factor should be 0 (terrible) to 100 (very good).
- */
-{
-  /* Safety limit on quality factor.  Convert 0 to 1 to avoid zero divide. */
-  if (quality <= 0) quality = 1;
-  if (quality > 100) quality = 100;
-
-  /* The basic table is used as-is (scaling 100) for a quality of 50.
-   * Qualities 50..100 are converted to scaling percentage 200 - 2*Q;
-   * note that at Q=100 the scaling is 0, which will cause jpeg_add_quant_table
-   * to make all the table entries 1 (hence, minimum quantization loss).
-   * Qualities 1..50 are converted to scaling percentage 5000/Q.
-   */
-  if (quality < 50)
-    quality = 5000 / quality;
-  else
-    quality = 200 - quality*2;
-
-  return quality;
-}
-
-
-GLOBAL(void)
-jpeg_set_quality (j_compress_ptr cinfo, int quality, wxjpeg_boolean force_baseline)
-/* Set or change the 'quality' (quantization) setting, using default tables.
- * This is the standard quality-adjusting entry point for typical user
- * interfaces; only those who want detailed control over quantization tables
- * would use the preceding three routines directly.
- */
-{
-  /* Convert user 0-100 rating to percentage scaling */
-  quality = jpeg_quality_scaling(quality);
-
-  /* Set up standard quality tables */
-  jpeg_set_linear_quality(cinfo, quality, force_baseline);
-}
-
-
-/*
- * Huffman table setup routines
- */
-
-LOCAL(void)
-add_huff_table (j_compress_ptr cinfo,
-		JHUFF_TBL **htblptr, const UINT8 *bits, const UINT8 *val)
-/* Define a Huffman table */
-{
-  int nsymbols, len;
-
-  if (*htblptr == NULL)
-    *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
-
-  /* Copy the number-of-symbols-of-each-code-length counts */
-  MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits));
-
-  /* Validate the counts.  We do this here mainly so we can copy the right
-   * number of symbols from the val[] array, without risking marching off
-   * the end of memory.  jchuff.c will do a more thorough test later.
-   */
-  nsymbols = 0;
-  for (len = 1; len <= 16; len++)
-    nsymbols += bits[len];
-  if (nsymbols < 1 || nsymbols > 256)
-    ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
-
-  MEMCOPY((*htblptr)->huffval, val, nsymbols * SIZEOF(UINT8));
-
-  /* Initialize sent_table FALSE so table will be written to JPEG file. */
-  (*htblptr)->sent_table = FALSE;
-}
-
-
-LOCAL(void)
-std_huff_tables (j_compress_ptr cinfo)
-/* Set up the standard Huffman tables (cf. JPEG standard section K.3) */
-/* IMPORTANT: these are only valid for 8-bit data precision! */
-{
-  static const UINT8 bits_dc_luminance[17] =
-    { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 };
-  static const UINT8 val_dc_luminance[] =
-    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
-  
-  static const UINT8 bits_dc_chrominance[17] =
-    { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 };
-  static const UINT8 val_dc_chrominance[] =
-    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
-  
-  static const UINT8 bits_ac_luminance[17] =
-    { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d };
-  static const UINT8 val_ac_luminance[] =
-    { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
-      0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
-      0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
-      0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
-      0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
-      0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
-      0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
-      0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
-      0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
-      0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
-      0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
-      0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
-      0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
-      0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-      0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
-      0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
-      0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
-      0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
-      0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
-      0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
-      0xf9, 0xfa };
-  
-  static const UINT8 bits_ac_chrominance[17] =
-    { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 };
-  static const UINT8 val_ac_chrominance[] =
-    { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
-      0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
-      0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
-      0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
-      0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
-      0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
-      0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
-      0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
-      0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
-      0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
-      0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
-      0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-      0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
-      0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
-      0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
-      0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
-      0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
-      0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
-      0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
-      0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
-      0xf9, 0xfa };
-  
-  add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[0],
-		 bits_dc_luminance, val_dc_luminance);
-  add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[0],
-		 bits_ac_luminance, val_ac_luminance);
-  add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[1],
-		 bits_dc_chrominance, val_dc_chrominance);
-  add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[1],
-		 bits_ac_chrominance, val_ac_chrominance);
-}
-
-
-/*
- * Default parameter setup for compression.
- *
- * Applications that don't choose to use this routine must do their
- * own setup of all these parameters.  Alternately, you can call this
- * to establish defaults and then alter parameters selectively.  This
- * is the recommended approach since, if we add any new parameters,
- * your code will still work (they'll be set to reasonable defaults).
- */
-
-GLOBAL(void)
-jpeg_set_defaults (j_compress_ptr cinfo)
-{
-  int i;
-
-  /* Safety check to ensure start_compress not called yet. */
-  if (cinfo->global_state != CSTATE_START)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  /* Allocate comp_info array large enough for maximum component count.
-   * Array is made permanent in case application wants to compress
-   * multiple images at same param settings.
-   */
-  if (cinfo->comp_info == NULL)
-    cinfo->comp_info = (jpeg_component_info *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-				  MAX_COMPONENTS * SIZEOF(jpeg_component_info));
-
-  /* Initialize everything not dependent on the color space */
-
-  cinfo->data_precision = BITS_IN_JSAMPLE;
-  /* Set up two quantization tables using default quality of 75 */
-  jpeg_set_quality(cinfo, 75, TRUE);
-  /* Set up two Huffman tables */
-  std_huff_tables(cinfo);
-
-  /* Initialize default arithmetic coding conditioning */
-  for (i = 0; i < NUM_ARITH_TBLS; i++) {
-    cinfo->arith_dc_L[i] = 0;
-    cinfo->arith_dc_U[i] = 1;
-    cinfo->arith_ac_K[i] = 5;
-  }
-
-  /* Default is no multiple-scan output */
-  cinfo->scan_info = NULL;
-  cinfo->num_scans = 0;
-
-  /* Expect normal source image, not raw downsampled data */
-  cinfo->raw_data_in = FALSE;
-
-  /* Use Huffman coding, not arithmetic coding, by default */
-  cinfo->arith_code = FALSE;
-
-  /* By default, don't do extra passes to optimize entropy coding */
-  cinfo->optimize_coding = FALSE;
-  /* The standard Huffman tables are only valid for 8-bit data precision.
-   * If the precision is higher, force optimization on so that usable
-   * tables will be computed.  This test can be removed if default tables
-   * are supplied that are valid for the desired precision.
-   */
-  if (cinfo->data_precision > 8)
-    cinfo->optimize_coding = TRUE;
-
-  /* By default, use the simpler non-cosited sampling alignment */
-  cinfo->CCIR601_sampling = FALSE;
-
-  /* No input smoothing */
-  cinfo->smoothing_factor = 0;
-
-  /* DCT algorithm preference */
-  cinfo->dct_method = JDCT_DEFAULT;
-
-  /* No restart markers */
-  cinfo->restart_interval = 0;
-  cinfo->restart_in_rows = 0;
-
-  /* Fill in default JFIF marker parameters.  Note that whether the marker
-   * will actually be written is determined by jpeg_set_colorspace.
-   *
-   * By default, the library emits JFIF version code 1.01.
-   * An application that wants to emit JFIF 1.02 extension markers should set
-   * JFIF_minor_version to 2.  We could probably get away with just defaulting
-   * to 1.02, but there may still be some decoders in use that will complain
-   * about that; saying 1.01 should minimize compatibility problems.
-   */
-  cinfo->JFIF_major_version = 1; /* Default JFIF version = 1.01 */
-  cinfo->JFIF_minor_version = 1;
-  cinfo->density_unit = 0;	/* Pixel size is unknown by default */
-  cinfo->X_density = 1;		/* Pixel aspect ratio is square by default */
-  cinfo->Y_density = 1;
-
-  /* Choose JPEG colorspace based on input space, set defaults accordingly */
-
-  jpeg_default_colorspace(cinfo);
-}
-
-
-/*
- * Select an appropriate JPEG colorspace for in_color_space.
- */
-
-GLOBAL(void)
-jpeg_default_colorspace (j_compress_ptr cinfo)
-{
-  switch (cinfo->in_color_space) {
-  case JCS_GRAYSCALE:
-    jpeg_set_colorspace(cinfo, JCS_GRAYSCALE);
-    break;
-  case JCS_RGB:
-    jpeg_set_colorspace(cinfo, JCS_YCbCr);
-    break;
-  case JCS_YCbCr:
-    jpeg_set_colorspace(cinfo, JCS_YCbCr);
-    break;
-  case JCS_CMYK:
-    jpeg_set_colorspace(cinfo, JCS_CMYK); /* By default, no translation */
-    break;
-  case JCS_YCCK:
-    jpeg_set_colorspace(cinfo, JCS_YCCK);
-    break;
-  case JCS_UNKNOWN:
-    jpeg_set_colorspace(cinfo, JCS_UNKNOWN);
-    break;
-  default:
-    ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE);
-  }
-}
-
-
-/*
- * Set the JPEG colorspace, and choose colorspace-dependent default values.
- */
-
-GLOBAL(void)
-jpeg_set_colorspace (j_compress_ptr cinfo, J_COLOR_SPACE colorspace)
-{
-  jpeg_component_info * compptr;
-  int ci;
-
-#define SET_COMP(index,id,hsamp,vsamp,quant,dctbl,actbl)  \
-  (compptr = &cinfo->comp_info[index], \
-   compptr->component_id = (id), \
-   compptr->h_samp_factor = (hsamp), \
-   compptr->v_samp_factor = (vsamp), \
-   compptr->quant_tbl_no = (quant), \
-   compptr->dc_tbl_no = (dctbl), \
-   compptr->ac_tbl_no = (actbl) )
-
-  /* Safety check to ensure start_compress not called yet. */
-  if (cinfo->global_state != CSTATE_START)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  /* For all colorspaces, we use Q and Huff tables 0 for luminance components,
-   * tables 1 for chrominance components.
-   */
-
-  cinfo->jpeg_color_space = colorspace;
-
-  cinfo->write_JFIF_header = FALSE; /* No marker for non-JFIF colorspaces */
-  cinfo->write_Adobe_marker = FALSE; /* write no Adobe marker by default */
-
-  switch (colorspace) {
-  case JCS_GRAYSCALE:
-    cinfo->write_JFIF_header = TRUE; /* Write a JFIF marker */
-    cinfo->num_components = 1;
-    /* JFIF specifies component ID 1 */
-    SET_COMP(0, 1, 1,1, 0, 0,0);
-    break;
-  case JCS_RGB:
-    cinfo->write_Adobe_marker = TRUE; /* write Adobe marker to flag RGB */
-    cinfo->num_components = 3;
-    SET_COMP(0, 0x52 /* 'R' */, 1,1, 0, 0,0);
-    SET_COMP(1, 0x47 /* 'G' */, 1,1, 0, 0,0);
-    SET_COMP(2, 0x42 /* 'B' */, 1,1, 0, 0,0);
-    break;
-  case JCS_YCbCr:
-    cinfo->write_JFIF_header = TRUE; /* Write a JFIF marker */
-    cinfo->num_components = 3;
-    /* JFIF specifies component IDs 1,2,3 */
-    /* We default to 2x2 subsamples of chrominance */
-    SET_COMP(0, 1, 2,2, 0, 0,0);
-    SET_COMP(1, 2, 1,1, 1, 1,1);
-    SET_COMP(2, 3, 1,1, 1, 1,1);
-    break;
-  case JCS_CMYK:
-    cinfo->write_Adobe_marker = TRUE; /* write Adobe marker to flag CMYK */
-    cinfo->num_components = 4;
-    SET_COMP(0, 0x43 /* 'C' */, 1,1, 0, 0,0);
-    SET_COMP(1, 0x4D /* 'M' */, 1,1, 0, 0,0);
-    SET_COMP(2, 0x59 /* 'Y' */, 1,1, 0, 0,0);
-    SET_COMP(3, 0x4B /* 'K' */, 1,1, 0, 0,0);
-    break;
-  case JCS_YCCK:
-    cinfo->write_Adobe_marker = TRUE; /* write Adobe marker to flag YCCK */
-    cinfo->num_components = 4;
-    SET_COMP(0, 1, 2,2, 0, 0,0);
-    SET_COMP(1, 2, 1,1, 1, 1,1);
-    SET_COMP(2, 3, 1,1, 1, 1,1);
-    SET_COMP(3, 4, 2,2, 0, 0,0);
-    break;
-  case JCS_UNKNOWN:
-    cinfo->num_components = cinfo->input_components;
-    if (cinfo->num_components < 1 || cinfo->num_components > MAX_COMPONENTS)
-      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,
-	       MAX_COMPONENTS);
-    for (ci = 0; ci < cinfo->num_components; ci++) {
-      SET_COMP(ci, ci, 1,1, 0, 0,0);
-    }
-    break;
-  default:
-    ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-  }
-}
-
-
-#ifdef C_PROGRESSIVE_SUPPORTED
-
-LOCAL(jpeg_scan_info *)
-fill_a_scan (jpeg_scan_info * scanptr, int ci,
-	     int Ss, int Se, int Ah, int Al)
-/* Support routine: generate one scan for specified component */
-{
-  scanptr->comps_in_scan = 1;
-  scanptr->component_index[0] = ci;
-  scanptr->Ss = Ss;
-  scanptr->Se = Se;
-  scanptr->Ah = Ah;
-  scanptr->Al = Al;
-  scanptr++;
-  return scanptr;
-}
-
-LOCAL(jpeg_scan_info *)
-fill_scans (jpeg_scan_info * scanptr, int ncomps,
-	    int Ss, int Se, int Ah, int Al)
-/* Support routine: generate one scan for each component */
-{
-  int ci;
-
-  for (ci = 0; ci < ncomps; ci++) {
-    scanptr->comps_in_scan = 1;
-    scanptr->component_index[0] = ci;
-    scanptr->Ss = Ss;
-    scanptr->Se = Se;
-    scanptr->Ah = Ah;
-    scanptr->Al = Al;
-    scanptr++;
-  }
-  return scanptr;
-}
-
-LOCAL(jpeg_scan_info *)
-fill_dc_scans (jpeg_scan_info * scanptr, int ncomps, int Ah, int Al)
-/* Support routine: generate interleaved DC scan if possible, else N scans */
-{
-  int ci;
-
-  if (ncomps <= MAX_COMPS_IN_SCAN) {
-    /* Single interleaved DC scan */
-    scanptr->comps_in_scan = ncomps;
-    for (ci = 0; ci < ncomps; ci++)
-      scanptr->component_index[ci] = ci;
-    scanptr->Ss = scanptr->Se = 0;
-    scanptr->Ah = Ah;
-    scanptr->Al = Al;
-    scanptr++;
-  } else {
-    /* Noninterleaved DC scan for each component */
-    scanptr = fill_scans(scanptr, ncomps, 0, 0, Ah, Al);
-  }
-  return scanptr;
-}
-
-
-/*
- * Create a recommended progressive-JPEG script.
- * cinfo->num_components and cinfo->jpeg_color_space must be correct.
- */
-
-GLOBAL(void)
-jpeg_simple_progression (j_compress_ptr cinfo)
-{
-  int ncomps = cinfo->num_components;
-  int nscans;
-  jpeg_scan_info * scanptr;
-
-  /* Safety check to ensure start_compress not called yet. */
-  if (cinfo->global_state != CSTATE_START)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  /* Figure space needed for script.  Calculation must match code below! */
-  if (ncomps == 3 && cinfo->jpeg_color_space == JCS_YCbCr) {
-    /* Custom script for YCbCr color images. */
-    nscans = 10;
-  } else {
-    /* All-purpose script for other color spaces. */
-    if (ncomps > MAX_COMPS_IN_SCAN)
-      nscans = 6 * ncomps;	/* 2 DC + 4 AC scans per component */
-    else
-      nscans = 2 + 4 * ncomps;	/* 2 DC scans; 4 AC scans per component */
-  }
-
-  /* Allocate space for script.
-   * We need to put it in the permanent pool in case the application performs
-   * multiple compressions without changing the settings.  To avoid a memory
-   * leak if jpeg_simple_progression is called repeatedly for the same JPEG
-   * object, we try to re-use previously allocated space, and we allocate
-   * enough space to handle YCbCr even if initially asked for grayscale.
-   */
-  if (cinfo->script_space == NULL || cinfo->script_space_size < nscans) {
-    cinfo->script_space_size = MAX(nscans, 10);
-    cinfo->script_space = (jpeg_scan_info *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-			cinfo->script_space_size * SIZEOF(jpeg_scan_info));
-  }
-  scanptr = cinfo->script_space;
-  cinfo->scan_info = scanptr;
-  cinfo->num_scans = nscans;
-
-  if (ncomps == 3 && cinfo->jpeg_color_space == JCS_YCbCr) {
-    /* Custom script for YCbCr color images. */
-    /* Initial DC scan */
-    scanptr = fill_dc_scans(scanptr, ncomps, 0, 1);
-    /* Initial AC scan: get some luma data out in a hurry */
-    scanptr = fill_a_scan(scanptr, 0, 1, 5, 0, 2);
-    /* Chroma data is too small to be worth expending many scans on */
-    scanptr = fill_a_scan(scanptr, 2, 1, 63, 0, 1);
-    scanptr = fill_a_scan(scanptr, 1, 1, 63, 0, 1);
-    /* Complete spectral selection for luma AC */
-    scanptr = fill_a_scan(scanptr, 0, 6, 63, 0, 2);
-    /* Refine next bit of luma AC */
-    scanptr = fill_a_scan(scanptr, 0, 1, 63, 2, 1);
-    /* Finish DC successive approximation */
-    scanptr = fill_dc_scans(scanptr, ncomps, 1, 0);
-    /* Finish AC successive approximation */
-    scanptr = fill_a_scan(scanptr, 2, 1, 63, 1, 0);
-    scanptr = fill_a_scan(scanptr, 1, 1, 63, 1, 0);
-    /* Luma bottom bit comes last since it's usually largest scan */
-    scanptr = fill_a_scan(scanptr, 0, 1, 63, 1, 0);
-  } else {
-    /* All-purpose script for other color spaces. */
-    /* Successive approximation first pass */
-    scanptr = fill_dc_scans(scanptr, ncomps, 0, 1);
-    scanptr = fill_scans(scanptr, ncomps, 1, 5, 0, 2);
-    scanptr = fill_scans(scanptr, ncomps, 6, 63, 0, 2);
-    /* Successive approximation second pass */
-    scanptr = fill_scans(scanptr, ncomps, 1, 63, 2, 1);
-    /* Successive approximation final pass */
-    scanptr = fill_dc_scans(scanptr, ncomps, 1, 0);
-    scanptr = fill_scans(scanptr, ncomps, 1, 63, 1, 0);
-  }
-}
-
-#endif /* C_PROGRESSIVE_SUPPORTED */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcphuff.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcphuff.c
deleted file mode 100644
index 84e53f4032..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcphuff.c
+++ /dev/null
@@ -1,833 +0,0 @@
-/*
- * jcphuff.c
- *
- * Copyright (C) 1995-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains Huffman entropy encoding routines for progressive JPEG.
- *
- * We do not support output suspension in this module, since the library
- * currently does not allow multiple-scan files to be written with output
- * suspension.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jchuff.h"		/* Declarations shared with jchuff.c */
-
-#ifdef C_PROGRESSIVE_SUPPORTED
-
-/* Expanded entropy encoder object for progressive Huffman encoding. */
-
-typedef struct {
-  struct jpeg_entropy_encoder pub; /* public fields */
-
-  /* Mode flag: TRUE for optimization, FALSE for actual data output */
-  wxjpeg_boolean gather_statistics;
-
-  /* Bit-level coding status.
-   * next_output_byte/free_in_buffer are local copies of cinfo->dest fields.
-   */
-  JOCTET * next_output_byte;	/* => next byte to write in buffer */
-  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
-  JPEG_INT32 put_buffer;		/* current bit-accumulation buffer */
-  int put_bits;			/* # of bits now in it */
-  j_compress_ptr cinfo;		/* link to cinfo (needed for dump_buffer) */
-
-  /* Coding status for DC components */
-  int last_dc_val[MAX_COMPS_IN_SCAN]; /* last DC coef for each component */
-
-  /* Coding status for AC components */
-  int ac_tbl_no;		/* the table number of the single component */
-  unsigned int EOBRUN;		/* run length of EOBs */
-  unsigned int BE;		/* # of buffered correction bits before MCU */
-  char * bit_buffer;		/* buffer for correction bits (1 per char) */
-  /* packing correction bits tightly would save some space but cost time... */
-
-  unsigned int restarts_to_go;	/* MCUs left in this restart interval */
-  int next_restart_num;		/* next restart number to write (0-7) */
-
-  /* Pointers to derived tables (these workspaces have image lifespan).
-   * Since any one scan codes only DC or only AC, we only need one set
-   * of tables, not one for DC and one for AC.
-   */
-  c_derived_tbl * derived_tbls[NUM_HUFF_TBLS];
-
-  /* Statistics tables for optimization; again, one set is enough */
-  long * count_ptrs[NUM_HUFF_TBLS];
-} phuff_entropy_encoder;
-
-typedef phuff_entropy_encoder * phuff_entropy_ptr;
-
-/* MAX_CORR_BITS is the number of bits the AC refinement correction-bit
- * buffer can hold.  Larger sizes may slightly improve compression, but
- * 1000 is already well into the realm of overkill.
- * The minimum safe size is 64 bits.
- */
-
-#define MAX_CORR_BITS  1000	/* Max # of correction bits I can buffer */
-
-/* IRIGHT_SHIFT is like RIGHT_SHIFT, but works on int rather than INT32.
- * We assume that int right shift is unsigned if INT32 right shift is,
- * which should be safe.
- */
-
-#ifdef RIGHT_SHIFT_IS_UNSIGNED
-#define ISHIFT_TEMPS	int ishift_temp;
-#define IRIGHT_SHIFT(x,shft)  \
-	((ishift_temp = (x)) < 0 ? \
-	 (ishift_temp >> (shft)) | ((~0) << (16-(shft))) : \
-	 (ishift_temp >> (shft)))
-#else
-#define ISHIFT_TEMPS
-#define IRIGHT_SHIFT(x,shft)	((x) >> (shft))
-#endif
-
-/* Forward declarations */
-METHODDEF(wxjpeg_boolean) encode_mcu_DC_first JPP((j_compress_ptr cinfo,
-					    JBLOCKROW *MCU_data));
-METHODDEF(wxjpeg_boolean) encode_mcu_AC_first JPP((j_compress_ptr cinfo,
-					    JBLOCKROW *MCU_data));
-METHODDEF(wxjpeg_boolean) encode_mcu_DC_refine JPP((j_compress_ptr cinfo,
-					     JBLOCKROW *MCU_data));
-METHODDEF(wxjpeg_boolean) encode_mcu_AC_refine JPP((j_compress_ptr cinfo,
-					     JBLOCKROW *MCU_data));
-METHODDEF(void) finish_pass_phuff JPP((j_compress_ptr cinfo));
-METHODDEF(void) finish_pass_gather_phuff JPP((j_compress_ptr cinfo));
-
-
-/*
- * Initialize for a Huffman-compressed scan using progressive JPEG.
- */
-
-METHODDEF(void)
-start_pass_phuff (j_compress_ptr cinfo, wxjpeg_boolean gather_statistics)
-{  
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  wxjpeg_boolean is_DC_band;
-  int ci, tbl;
-  jpeg_component_info * compptr;
-
-  entropy->cinfo = cinfo;
-  entropy->gather_statistics = gather_statistics;
-
-  is_DC_band = (cinfo->Ss == 0);
-
-  /* We assume jcmaster.c already validated the scan parameters. */
-
-  /* Select execution routines */
-  if (cinfo->Ah == 0) {
-    if (is_DC_band)
-      entropy->pub.encode_mcu = encode_mcu_DC_first;
-    else
-      entropy->pub.encode_mcu = encode_mcu_AC_first;
-  } else {
-    if (is_DC_band)
-      entropy->pub.encode_mcu = encode_mcu_DC_refine;
-    else {
-      entropy->pub.encode_mcu = encode_mcu_AC_refine;
-      /* AC refinement needs a correction bit buffer */
-      if (entropy->bit_buffer == NULL)
-	entropy->bit_buffer = (char *)
-	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				      MAX_CORR_BITS * SIZEOF(char));
-    }
-  }
-  if (gather_statistics)
-    entropy->pub.finish_pass = finish_pass_gather_phuff;
-  else
-    entropy->pub.finish_pass = finish_pass_phuff;
-
-  /* Only DC coefficients may be interleaved, so cinfo->comps_in_scan = 1
-   * for AC coefficients.
-   */
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    /* Initialize DC predictions to 0 */
-    entropy->last_dc_val[ci] = 0;
-    /* Get table index */
-    if (is_DC_band) {
-      if (cinfo->Ah != 0)	/* DC refinement needs no table */
-	continue;
-      tbl = compptr->dc_tbl_no;
-    } else {
-      entropy->ac_tbl_no = tbl = compptr->ac_tbl_no;
-    }
-    if (gather_statistics) {
-      /* Check for invalid table index */
-      /* (make_c_derived_tbl does this in the other path) */
-      if (tbl < 0 || tbl >= NUM_HUFF_TBLS)
-        ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tbl);
-      /* Allocate and zero the statistics tables */
-      /* Note that jpeg_gen_optimal_table expects 257 entries in each table! */
-      if (entropy->count_ptrs[tbl] == NULL)
-	entropy->count_ptrs[tbl] = (long *)
-	  (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				      257 * SIZEOF(long));
-      MEMZERO(entropy->count_ptrs[tbl], 257 * SIZEOF(long));
-    } else {
-      /* Compute derived values for Huffman table */
-      /* We may do this more than once for a table, but it's not expensive */
-      jpeg_make_c_derived_tbl(cinfo, is_DC_band, tbl,
-			      & entropy->derived_tbls[tbl]);
-    }
-  }
-
-  /* Initialize AC stuff */
-  entropy->EOBRUN = 0;
-  entropy->BE = 0;
-
-  /* Initialize bit buffer to empty */
-  entropy->put_buffer = 0;
-  entropy->put_bits = 0;
-
-  /* Initialize restart stuff */
-  entropy->restarts_to_go = cinfo->restart_interval;
-  entropy->next_restart_num = 0;
-}
-
-
-/* Outputting bytes to the file.
- * NB: these must be called only when actually outputting,
- * that is, entropy->gather_statistics == FALSE.
- */
-
-/* Emit a byte */
-#define emit_byte(entropy,val)  \
-	{ *(entropy)->next_output_byte++ = (JOCTET) (val);  \
-	  if (--(entropy)->free_in_buffer == 0)  \
-	    dump_buffer(entropy); }
-
-
-LOCAL(void)
-dump_buffer (phuff_entropy_ptr entropy)
-/* Empty the output buffer; we do not support suspension in this module. */
-{
-  struct jpeg_destination_mgr * dest = entropy->cinfo->dest;
-
-  if (! (*dest->empty_output_buffer) (entropy->cinfo))
-    ERREXIT(entropy->cinfo, JERR_CANT_SUSPEND);
-  /* After a successful buffer dump, must reset buffer pointers */
-  entropy->next_output_byte = dest->next_output_byte;
-  entropy->free_in_buffer = dest->free_in_buffer;
-}
-
-
-/* Outputting bits to the file */
-
-/* Only the right 24 bits of put_buffer are used; the valid bits are
- * left-justified in this part.  At most 16 bits can be passed to emit_bits
- * in one call, and we never retain more than 7 bits in put_buffer
- * between calls, so 24 bits are sufficient.
- */
-
-INLINE
-LOCAL(void)
-emit_bits (phuff_entropy_ptr entropy, unsigned int code, int size)
-/* Emit some bits, unless we are in gather mode */
-{
-  /* This routine is heavily used, so it's worth coding tightly. */
-  register JPEG_INT32 put_buffer = (JPEG_INT32) code;
-  register int put_bits = entropy->put_bits;
-
-  /* if size is 0, caller used an invalid Huffman table entry */
-  if (size == 0)
-    ERREXIT(entropy->cinfo, JERR_HUFF_MISSING_CODE);
-
-  if (entropy->gather_statistics)
-    return;			/* do nothing if we're only getting stats */
-
-  put_buffer &= (((JPEG_INT32) 1)<put_buffer; /* and merge with old buffer contents */
-
-  while (put_bits >= 8) {
-    int c = (int) ((put_buffer >> 16) & 0xFF);
-    
-    emit_byte(entropy, c);
-    if (c == 0xFF) {		/* need to stuff a zero byte? */
-      emit_byte(entropy, 0);
-    }
-    put_buffer <<= 8;
-    put_bits -= 8;
-  }
-
-  entropy->put_buffer = put_buffer; /* update variables */
-  entropy->put_bits = put_bits;
-}
-
-
-LOCAL(void)
-flush_bits (phuff_entropy_ptr entropy)
-{
-  emit_bits(entropy, 0x7F, 7); /* fill any partial byte with ones */
-  entropy->put_buffer = 0;     /* and reset bit-buffer to empty */
-  entropy->put_bits = 0;
-}
-
-
-/*
- * Emit (or just count) a Huffman symbol.
- */
-
-INLINE
-LOCAL(void)
-emit_symbol (phuff_entropy_ptr entropy, int tbl_no, int symbol)
-{
-  if (entropy->gather_statistics)
-    entropy->count_ptrs[tbl_no][symbol]++;
-  else {
-    c_derived_tbl * tbl = entropy->derived_tbls[tbl_no];
-    emit_bits(entropy, tbl->ehufco[symbol], tbl->ehufsi[symbol]);
-  }
-}
-
-
-/*
- * Emit bits from a correction bit buffer.
- */
-
-LOCAL(void)
-emit_buffered_bits (phuff_entropy_ptr entropy, char * bufstart,
-		    unsigned int nbits)
-{
-  if (entropy->gather_statistics)
-    return;			/* no real work */
-
-  while (nbits > 0) {
-    emit_bits(entropy, (unsigned int) (*bufstart), 1);
-    bufstart++;
-    nbits--;
-  }
-}
-
-
-/*
- * Emit any pending EOBRUN symbol.
- */
-
-LOCAL(void)
-emit_eobrun (phuff_entropy_ptr entropy)
-{
-  register int temp, nbits;
-
-  if (entropy->EOBRUN > 0) {	/* if there is any pending EOBRUN */
-    temp = entropy->EOBRUN;
-    nbits = 0;
-    while ((temp >>= 1))
-      nbits++;
-    /* safety check: shouldn't happen given limited correction-bit buffer */
-    if (nbits > 14)
-      ERREXIT(entropy->cinfo, JERR_HUFF_MISSING_CODE);
-
-    emit_symbol(entropy, entropy->ac_tbl_no, nbits << 4);
-    if (nbits)
-      emit_bits(entropy, entropy->EOBRUN, nbits);
-
-    entropy->EOBRUN = 0;
-
-    /* Emit any buffered correction bits */
-    emit_buffered_bits(entropy, entropy->bit_buffer, entropy->BE);
-    entropy->BE = 0;
-  }
-}
-
-
-/*
- * Emit a restart marker & resynchronize predictions.
- */
-
-LOCAL(void)
-emit_restart (phuff_entropy_ptr entropy, int restart_num)
-{
-  int ci;
-
-  emit_eobrun(entropy);
-
-  if (! entropy->gather_statistics) {
-    flush_bits(entropy);
-    emit_byte(entropy, 0xFF);
-    emit_byte(entropy, JPEG_RST0 + restart_num);
-  }
-
-  if (entropy->cinfo->Ss == 0) {
-    /* Re-initialize DC predictions to 0 */
-    for (ci = 0; ci < entropy->cinfo->comps_in_scan; ci++)
-      entropy->last_dc_val[ci] = 0;
-  } else {
-    /* Re-initialize all AC-related fields to 0 */
-    entropy->EOBRUN = 0;
-    entropy->BE = 0;
-  }
-}
-
-
-/*
- * MCU encoding for DC initial scan (either spectral selection,
- * or first pass of successive approximation).
- */
-
-METHODDEF(wxjpeg_boolean)
-encode_mcu_DC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
-{
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  register int temp, temp2;
-  register int nbits;
-  int blkn, ci;
-  int Al = cinfo->Al;
-  JBLOCKROW block;
-  jpeg_component_info * compptr;
-  ISHIFT_TEMPS
-
-  entropy->next_output_byte = cinfo->dest->next_output_byte;
-  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
-
-  /* Emit restart marker if needed */
-  if (cinfo->restart_interval)
-    if (entropy->restarts_to_go == 0)
-      emit_restart(entropy, entropy->next_restart_num);
-
-  /* Encode the MCU data blocks */
-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
-    block = MCU_data[blkn];
-    ci = cinfo->MCU_membership[blkn];
-    compptr = cinfo->cur_comp_info[ci];
-
-    /* Compute the DC value after the required point transform by Al.
-     * This is simply an arithmetic right shift.
-     */
-    temp2 = IRIGHT_SHIFT((int) ((*block)[0]), Al);
-
-    /* DC differences are figured on the point-transformed values. */
-    temp = temp2 - entropy->last_dc_val[ci];
-    entropy->last_dc_val[ci] = temp2;
-
-    /* Encode the DC coefficient difference per section G.1.2.1 */
-    temp2 = temp;
-    if (temp < 0) {
-      temp = -temp;		/* temp is abs value of input */
-      /* For a negative input, want temp2 = bitwise complement of abs(input) */
-      /* This code assumes we are on a two's complement machine */
-      temp2--;
-    }
-    
-    /* Find the number of bits needed for the magnitude of the coefficient */
-    nbits = 0;
-    while (temp) {
-      nbits++;
-      temp >>= 1;
-    }
-    /* Check for out-of-range coefficient values.
-     * Since we're encoding a difference, the range limit is twice as much.
-     */
-    if (nbits > MAX_COEF_BITS+1)
-      ERREXIT(cinfo, JERR_BAD_DCT_COEF);
-    
-    /* Count/emit the Huffman-coded symbol for the number of bits */
-    emit_symbol(entropy, compptr->dc_tbl_no, nbits);
-    
-    /* Emit that number of bits of the value, if positive, */
-    /* or the complement of its magnitude, if negative. */
-    if (nbits)			/* emit_bits rejects calls with size 0 */
-      emit_bits(entropy, (unsigned int) temp2, nbits);
-  }
-
-  cinfo->dest->next_output_byte = entropy->next_output_byte;
-  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
-
-  /* Update restart-interval state too */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0) {
-      entropy->restarts_to_go = cinfo->restart_interval;
-      entropy->next_restart_num++;
-      entropy->next_restart_num &= 7;
-    }
-    entropy->restarts_to_go--;
-  }
-
-  return TRUE;
-}
-
-
-/*
- * MCU encoding for AC initial scan (either spectral selection,
- * or first pass of successive approximation).
- */
-
-METHODDEF(wxjpeg_boolean)
-encode_mcu_AC_first (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
-{
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  register int temp, temp2;
-  register int nbits;
-  register int r, k;
-  int Se = cinfo->Se;
-  int Al = cinfo->Al;
-  JBLOCKROW block;
-
-  entropy->next_output_byte = cinfo->dest->next_output_byte;
-  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
-
-  /* Emit restart marker if needed */
-  if (cinfo->restart_interval)
-    if (entropy->restarts_to_go == 0)
-      emit_restart(entropy, entropy->next_restart_num);
-
-  /* Encode the MCU data block */
-  block = MCU_data[0];
-
-  /* Encode the AC coefficients per section G.1.2.2, fig. G.3 */
-  
-  r = 0;			/* r = run length of zeros */
-   
-  for (k = cinfo->Ss; k <= Se; k++) {
-    if ((temp = (*block)[jpeg_natural_order[k]]) == 0) {
-      r++;
-      continue;
-    }
-    /* We must apply the point transform by Al.  For AC coefficients this
-     * is an integer division with rounding towards 0.  To do this portably
-     * in C, we shift after obtaining the absolute value; so the code is
-     * interwoven with finding the abs value (temp) and output bits (temp2).
-     */
-    if (temp < 0) {
-      temp = -temp;		/* temp is abs value of input */
-      temp >>= Al;		/* apply the point transform */
-      /* For a negative coef, want temp2 = bitwise complement of abs(coef) */
-      temp2 = ~temp;
-    } else {
-      temp >>= Al;		/* apply the point transform */
-      temp2 = temp;
-    }
-    /* Watch out for case that nonzero coef is zero after point transform */
-    if (temp == 0) {
-      r++;
-      continue;
-    }
-
-    /* Emit any pending EOBRUN */
-    if (entropy->EOBRUN > 0)
-      emit_eobrun(entropy);
-    /* if run length > 15, must emit special run-length-16 codes (0xF0) */
-    while (r > 15) {
-      emit_symbol(entropy, entropy->ac_tbl_no, 0xF0);
-      r -= 16;
-    }
-
-    /* Find the number of bits needed for the magnitude of the coefficient */
-    nbits = 1;			/* there must be at least one 1 bit */
-    while ((temp >>= 1))
-      nbits++;
-    /* Check for out-of-range coefficient values */
-    if (nbits > MAX_COEF_BITS)
-      ERREXIT(cinfo, JERR_BAD_DCT_COEF);
-
-    /* Count/emit Huffman symbol for run length / number of bits */
-    emit_symbol(entropy, entropy->ac_tbl_no, (r << 4) + nbits);
-
-    /* Emit that number of bits of the value, if positive, */
-    /* or the complement of its magnitude, if negative. */
-    emit_bits(entropy, (unsigned int) temp2, nbits);
-
-    r = 0;			/* reset zero run length */
-  }
-
-  if (r > 0) {			/* If there are trailing zeroes, */
-    entropy->EOBRUN++;		/* count an EOB */
-    if (entropy->EOBRUN == 0x7FFF)
-      emit_eobrun(entropy);	/* force it out to avoid overflow */
-  }
-
-  cinfo->dest->next_output_byte = entropy->next_output_byte;
-  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
-
-  /* Update restart-interval state too */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0) {
-      entropy->restarts_to_go = cinfo->restart_interval;
-      entropy->next_restart_num++;
-      entropy->next_restart_num &= 7;
-    }
-    entropy->restarts_to_go--;
-  }
-
-  return TRUE;
-}
-
-
-/*
- * MCU encoding for DC successive approximation refinement scan.
- * Note: we assume such scans can be multi-component, although the spec
- * is not very clear on the point.
- */
-
-METHODDEF(wxjpeg_boolean)
-encode_mcu_DC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
-{
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  register int temp;
-  int blkn;
-  int Al = cinfo->Al;
-  JBLOCKROW block;
-
-  entropy->next_output_byte = cinfo->dest->next_output_byte;
-  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
-
-  /* Emit restart marker if needed */
-  if (cinfo->restart_interval)
-    if (entropy->restarts_to_go == 0)
-      emit_restart(entropy, entropy->next_restart_num);
-
-  /* Encode the MCU data blocks */
-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
-    block = MCU_data[blkn];
-
-    /* We simply emit the Al'th bit of the DC coefficient value. */
-    temp = (*block)[0];
-    emit_bits(entropy, (unsigned int) (temp >> Al), 1);
-  }
-
-  cinfo->dest->next_output_byte = entropy->next_output_byte;
-  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
-
-  /* Update restart-interval state too */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0) {
-      entropy->restarts_to_go = cinfo->restart_interval;
-      entropy->next_restart_num++;
-      entropy->next_restart_num &= 7;
-    }
-    entropy->restarts_to_go--;
-  }
-
-  return TRUE;
-}
-
-
-/*
- * MCU encoding for AC successive approximation refinement scan.
- */
-
-METHODDEF(wxjpeg_boolean)
-encode_mcu_AC_refine (j_compress_ptr cinfo, JBLOCKROW *MCU_data)
-{
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  register int temp;
-  register int r, k;
-  int EOB;
-  char *BR_buffer;
-  unsigned int BR;
-  int Se = cinfo->Se;
-  int Al = cinfo->Al;
-  JBLOCKROW block;
-  int absvalues[DCTSIZE2];
-
-  entropy->next_output_byte = cinfo->dest->next_output_byte;
-  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
-
-  /* Emit restart marker if needed */
-  if (cinfo->restart_interval)
-    if (entropy->restarts_to_go == 0)
-      emit_restart(entropy, entropy->next_restart_num);
-
-  /* Encode the MCU data block */
-  block = MCU_data[0];
-
-  /* It is convenient to make a pre-pass to determine the transformed
-   * coefficients' absolute values and the EOB position.
-   */
-  EOB = 0;
-  for (k = cinfo->Ss; k <= Se; k++) {
-    temp = (*block)[jpeg_natural_order[k]];
-    /* We must apply the point transform by Al.  For AC coefficients this
-     * is an integer division with rounding towards 0.  To do this portably
-     * in C, we shift after obtaining the absolute value.
-     */
-    if (temp < 0)
-      temp = -temp;		/* temp is abs value of input */
-    temp >>= Al;		/* apply the point transform */
-    absvalues[k] = temp;	/* save abs value for main pass */
-    if (temp == 1)
-      EOB = k;			/* EOB = index of last newly-nonzero coef */
-  }
-
-  /* Encode the AC coefficients per section G.1.2.3, fig. G.7 */
-  
-  r = 0;			/* r = run length of zeros */
-  BR = 0;			/* BR = count of buffered bits added now */
-  BR_buffer = entropy->bit_buffer + entropy->BE; /* Append bits to buffer */
-
-  for (k = cinfo->Ss; k <= Se; k++) {
-    if ((temp = absvalues[k]) == 0) {
-      r++;
-      continue;
-    }
-
-    /* Emit any required ZRLs, but not if they can be folded into EOB */
-    while (r > 15 && k <= EOB) {
-      /* emit any pending EOBRUN and the BE correction bits */
-      emit_eobrun(entropy);
-      /* Emit ZRL */
-      emit_symbol(entropy, entropy->ac_tbl_no, 0xF0);
-      r -= 16;
-      /* Emit buffered correction bits that must be associated with ZRL */
-      emit_buffered_bits(entropy, BR_buffer, BR);
-      BR_buffer = entropy->bit_buffer; /* BE bits are gone now */
-      BR = 0;
-    }
-
-    /* If the coef was previously nonzero, it only needs a correction bit.
-     * NOTE: a straight translation of the spec's figure G.7 would suggest
-     * that we also need to test r > 15.  But if r > 15, we can only get here
-     * if k > EOB, which implies that this coefficient is not 1.
-     */
-    if (temp > 1) {
-      /* The correction bit is the next bit of the absolute value. */
-      BR_buffer[BR++] = (char) (temp & 1);
-      continue;
-    }
-
-    /* Emit any pending EOBRUN and the BE correction bits */
-    emit_eobrun(entropy);
-
-    /* Count/emit Huffman symbol for run length / number of bits */
-    emit_symbol(entropy, entropy->ac_tbl_no, (r << 4) + 1);
-
-    /* Emit output bit for newly-nonzero coef */
-    temp = ((*block)[jpeg_natural_order[k]] < 0) ? 0 : 1;
-    emit_bits(entropy, (unsigned int) temp, 1);
-
-    /* Emit buffered correction bits that must be associated with this code */
-    emit_buffered_bits(entropy, BR_buffer, BR);
-    BR_buffer = entropy->bit_buffer; /* BE bits are gone now */
-    BR = 0;
-    r = 0;			/* reset zero run length */
-  }
-
-  if (r > 0 || BR > 0) {	/* If there are trailing zeroes, */
-    entropy->EOBRUN++;		/* count an EOB */
-    entropy->BE += BR;		/* concat my correction bits to older ones */
-    /* We force out the EOB if we risk either:
-     * 1. overflow of the EOB counter;
-     * 2. overflow of the correction bit buffer during the next MCU.
-     */
-    if (entropy->EOBRUN == 0x7FFF || entropy->BE > (MAX_CORR_BITS-DCTSIZE2+1))
-      emit_eobrun(entropy);
-  }
-
-  cinfo->dest->next_output_byte = entropy->next_output_byte;
-  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
-
-  /* Update restart-interval state too */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0) {
-      entropy->restarts_to_go = cinfo->restart_interval;
-      entropy->next_restart_num++;
-      entropy->next_restart_num &= 7;
-    }
-    entropy->restarts_to_go--;
-  }
-
-  return TRUE;
-}
-
-
-/*
- * Finish up at the end of a Huffman-compressed progressive scan.
- */
-
-METHODDEF(void)
-finish_pass_phuff (j_compress_ptr cinfo)
-{   
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-
-  entropy->next_output_byte = cinfo->dest->next_output_byte;
-  entropy->free_in_buffer = cinfo->dest->free_in_buffer;
-
-  /* Flush out any buffered data */
-  emit_eobrun(entropy);
-  flush_bits(entropy);
-
-  cinfo->dest->next_output_byte = entropy->next_output_byte;
-  cinfo->dest->free_in_buffer = entropy->free_in_buffer;
-}
-
-
-/*
- * Finish up a statistics-gathering pass and create the new Huffman tables.
- */
-
-METHODDEF(void)
-finish_pass_gather_phuff (j_compress_ptr cinfo)
-{
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  wxjpeg_boolean is_DC_band;
-  int ci, tbl;
-  jpeg_component_info * compptr;
-  JHUFF_TBL **htblptr;
-  wxjpeg_boolean did[NUM_HUFF_TBLS];
-
-  /* Flush out buffered data (all we care about is counting the EOB symbol) */
-  emit_eobrun(entropy);
-
-  is_DC_band = (cinfo->Ss == 0);
-
-  /* It's important not to apply jpeg_gen_optimal_table more than once
-   * per table, because it clobbers the input frequency counts!
-   */
-  MEMZERO(did, SIZEOF(did));
-
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    if (is_DC_band) {
-      if (cinfo->Ah != 0)	/* DC refinement needs no table */
-	continue;
-      tbl = compptr->dc_tbl_no;
-    } else {
-      tbl = compptr->ac_tbl_no;
-    }
-    if (! did[tbl]) {
-      if (is_DC_band)
-        htblptr = & cinfo->dc_huff_tbl_ptrs[tbl];
-      else
-        htblptr = & cinfo->ac_huff_tbl_ptrs[tbl];
-      if (*htblptr == NULL)
-        *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
-      jpeg_gen_optimal_table(cinfo, *htblptr, entropy->count_ptrs[tbl]);
-      did[tbl] = TRUE;
-    }
-  }
-}
-
-
-/*
- * Module initialization routine for progressive Huffman entropy encoding.
- */
-
-GLOBAL(void)
-jinit_phuff_encoder (j_compress_ptr cinfo)
-{
-  phuff_entropy_ptr entropy;
-  int i;
-
-  entropy = (phuff_entropy_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(phuff_entropy_encoder));
-  cinfo->entropy = (struct jpeg_entropy_encoder *) entropy;
-  entropy->pub.start_pass = start_pass_phuff;
-
-  /* Mark tables unallocated */
-  for (i = 0; i < NUM_HUFF_TBLS; i++) {
-    entropy->derived_tbls[i] = NULL;
-    entropy->count_ptrs[i] = NULL;
-  }
-  entropy->bit_buffer = NULL;	/* needed only in AC refinement scan */
-}
-
-#endif /* C_PROGRESSIVE_SUPPORTED */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcprepct.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcprepct.c
deleted file mode 100644
index d106242057..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcprepct.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * jcprepct.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the compression preprocessing controller.
- * This controller manages the color conversion, downsampling,
- * and edge expansion steps.
- *
- * Most of the complexity here is associated with buffering input rows
- * as required by the downsampler.  See the comments at the head of
- * jcsample.c for the downsampler's needs.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* At present, jcsample.c can request context rows only for smoothing.
- * In the future, we might also need context rows for CCIR601 sampling
- * or other more-complex downsampling procedures.  The code to support
- * context rows should be compiled only if needed.
- */
-#ifdef INPUT_SMOOTHING_SUPPORTED
-#define CONTEXT_ROWS_SUPPORTED
-#endif
-
-
-/*
- * For the simple (no-context-row) case, we just need to buffer one
- * row group's worth of pixels for the downsampling step.  At the bottom of
- * the image, we pad to a full row group by replicating the last pixel row.
- * The downsampler's last output row is then replicated if needed to pad
- * out to a full iMCU row.
- *
- * When providing context rows, we must buffer three row groups' worth of
- * pixels.  Three row groups are physically allocated, but the row pointer
- * arrays are made five row groups high, with the extra pointers above and
- * below "wrapping around" to point to the last and first real row groups.
- * This allows the downsampler to access the proper context rows.
- * At the top and bottom of the image, we create dummy context rows by
- * copying the first or last real pixel row.  This copying could be avoided
- * by pointer hacking as is done in jdmainct.c, but it doesn't seem worth the
- * trouble on the compression side.
- */
-
-
-/* Private buffer controller object */
-
-typedef struct {
-  struct jpeg_c_prep_controller pub; /* public fields */
-
-  /* Downsampling input buffer.  This buffer holds color-converted data
-   * until we have enough to do a downsample step.
-   */
-  JSAMPARRAY color_buf[MAX_COMPONENTS];
-
-  JDIMENSION rows_to_go;	/* counts rows remaining in source image */
-  int next_buf_row;		/* index of next row to store in color_buf */
-
-#ifdef CONTEXT_ROWS_SUPPORTED	/* only needed for context case */
-  int this_row_group;		/* starting row index of group to process */
-  int next_buf_stop;		/* downsample when we reach this index */
-#endif
-} my_prep_controller;
-
-typedef my_prep_controller * my_prep_ptr;
-
-
-/*
- * Initialize for a processing pass.
- */
-
-METHODDEF(void)
-start_pass_prep (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
-{
-  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;
-
-  if (pass_mode != JBUF_PASS_THRU)
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-
-  /* Initialize total-height counter for detecting bottom of image */
-  prep->rows_to_go = cinfo->image_height;
-  /* Mark the conversion buffer empty */
-  prep->next_buf_row = 0;
-#ifdef CONTEXT_ROWS_SUPPORTED
-  /* Preset additional state variables for context mode.
-   * These aren't used in non-context mode, so we needn't test which mode.
-   */
-  prep->this_row_group = 0;
-  /* Set next_buf_stop to stop after two row groups have been read in. */
-  prep->next_buf_stop = 2 * cinfo->max_v_samp_factor;
-#endif
-}
-
-
-/*
- * Expand an image vertically from height input_rows to height output_rows,
- * by duplicating the bottom row.
- */
-
-LOCAL(void)
-expand_bottom_edge (JSAMPARRAY image_data, JDIMENSION num_cols,
-		    int input_rows, int output_rows)
-{
-  register int row;
-
-  for (row = input_rows; row < output_rows; row++) {
-    jcopy_sample_rows(image_data, input_rows-1, image_data, row,
-		      1, num_cols);
-  }
-}
-
-
-/*
- * Process some data in the simple no-context case.
- *
- * Preprocessor output data is counted in "row groups".  A row group
- * is defined to be v_samp_factor sample rows of each component.
- * Downsampling will produce this much data from each max_v_samp_factor
- * input rows.
- */
-
-METHODDEF(void)
-pre_process_data (j_compress_ptr cinfo,
-		  JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-		  JDIMENSION in_rows_avail,
-		  JSAMPIMAGE output_buf, JDIMENSION *out_row_group_ctr,
-		  JDIMENSION out_row_groups_avail)
-{
-  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;
-  int numrows, ci;
-  JDIMENSION inrows;
-  jpeg_component_info * compptr;
-
-  while (*in_row_ctr < in_rows_avail &&
-	 *out_row_group_ctr < out_row_groups_avail) {
-    /* Do color conversion to fill the conversion buffer. */
-    inrows = in_rows_avail - *in_row_ctr;
-    numrows = cinfo->max_v_samp_factor - prep->next_buf_row;
-    numrows = (int) MIN((JDIMENSION) numrows, inrows);
-    (*cinfo->cconvert->color_convert) (cinfo, input_buf + *in_row_ctr,
-				       prep->color_buf,
-				       (JDIMENSION) prep->next_buf_row,
-				       numrows);
-    *in_row_ctr += numrows;
-    prep->next_buf_row += numrows;
-    prep->rows_to_go -= numrows;
-    /* If at bottom of image, pad to fill the conversion buffer. */
-    if (prep->rows_to_go == 0 &&
-	prep->next_buf_row < cinfo->max_v_samp_factor) {
-      for (ci = 0; ci < cinfo->num_components; ci++) {
-	expand_bottom_edge(prep->color_buf[ci], cinfo->image_width,
-			   prep->next_buf_row, cinfo->max_v_samp_factor);
-      }
-      prep->next_buf_row = cinfo->max_v_samp_factor;
-    }
-    /* If we've filled the conversion buffer, empty it. */
-    if (prep->next_buf_row == cinfo->max_v_samp_factor) {
-      (*cinfo->downsample->downsample) (cinfo,
-					prep->color_buf, (JDIMENSION) 0,
-					output_buf, *out_row_group_ctr);
-      prep->next_buf_row = 0;
-      (*out_row_group_ctr)++;
-    }
-    /* If at bottom of image, pad the output to a full iMCU height.
-     * Note we assume the caller is providing a one-iMCU-height output buffer!
-     */
-    if (prep->rows_to_go == 0 &&
-	*out_row_group_ctr < out_row_groups_avail) {
-      for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	   ci++, compptr++) {
-	expand_bottom_edge(output_buf[ci],
-			   compptr->width_in_blocks * DCTSIZE,
-			   (int) (*out_row_group_ctr * compptr->v_samp_factor),
-			   (int) (out_row_groups_avail * compptr->v_samp_factor));
-      }
-      *out_row_group_ctr = out_row_groups_avail;
-      break;			/* can exit outer loop without test */
-    }
-  }
-}
-
-
-#ifdef CONTEXT_ROWS_SUPPORTED
-
-/*
- * Process some data in the context case.
- */
-
-METHODDEF(void)
-pre_process_context (j_compress_ptr cinfo,
-		     JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-		     JDIMENSION in_rows_avail,
-		     JSAMPIMAGE output_buf, JDIMENSION *out_row_group_ctr,
-		     JDIMENSION out_row_groups_avail)
-{
-  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;
-  int numrows, ci;
-  int buf_height = cinfo->max_v_samp_factor * 3;
-  JDIMENSION inrows;
-
-  while (*out_row_group_ctr < out_row_groups_avail) {
-    if (*in_row_ctr < in_rows_avail) {
-      /* Do color conversion to fill the conversion buffer. */
-      inrows = in_rows_avail - *in_row_ctr;
-      numrows = prep->next_buf_stop - prep->next_buf_row;
-      numrows = (int) MIN((JDIMENSION) numrows, inrows);
-      (*cinfo->cconvert->color_convert) (cinfo, input_buf + *in_row_ctr,
-					 prep->color_buf,
-					 (JDIMENSION) prep->next_buf_row,
-					 numrows);
-      /* Pad at top of image, if first time through */
-      if (prep->rows_to_go == cinfo->image_height) {
-	for (ci = 0; ci < cinfo->num_components; ci++) {
-	  int row;
-	  for (row = 1; row <= cinfo->max_v_samp_factor; row++) {
-	    jcopy_sample_rows(prep->color_buf[ci], 0,
-			      prep->color_buf[ci], -row,
-			      1, cinfo->image_width);
-	  }
-	}
-      }
-      *in_row_ctr += numrows;
-      prep->next_buf_row += numrows;
-      prep->rows_to_go -= numrows;
-    } else {
-      /* Return for more data, unless we are at the bottom of the image. */
-      if (prep->rows_to_go != 0)
-	break;
-      /* When at bottom of image, pad to fill the conversion buffer. */
-      if (prep->next_buf_row < prep->next_buf_stop) {
-	for (ci = 0; ci < cinfo->num_components; ci++) {
-	  expand_bottom_edge(prep->color_buf[ci], cinfo->image_width,
-			     prep->next_buf_row, prep->next_buf_stop);
-	}
-	prep->next_buf_row = prep->next_buf_stop;
-      }
-    }
-    /* If we've gotten enough data, downsample a row group. */
-    if (prep->next_buf_row == prep->next_buf_stop) {
-      (*cinfo->downsample->downsample) (cinfo,
-					prep->color_buf,
-					(JDIMENSION) prep->this_row_group,
-					output_buf, *out_row_group_ctr);
-      (*out_row_group_ctr)++;
-      /* Advance pointers with wraparound as necessary. */
-      prep->this_row_group += cinfo->max_v_samp_factor;
-      if (prep->this_row_group >= buf_height)
-	prep->this_row_group = 0;
-      if (prep->next_buf_row >= buf_height)
-	prep->next_buf_row = 0;
-      prep->next_buf_stop = prep->next_buf_row + cinfo->max_v_samp_factor;
-    }
-  }
-}
-
-
-/*
- * Create the wrapped-around downsampling input buffer needed for context mode.
- */
-
-LOCAL(void)
-create_context_buffer (j_compress_ptr cinfo)
-{
-  my_prep_ptr prep = (my_prep_ptr) cinfo->prep;
-  int rgroup_height = cinfo->max_v_samp_factor;
-  int ci, i;
-  jpeg_component_info * compptr;
-  JSAMPARRAY true_buffer, fake_buffer;
-
-  /* Grab enough space for fake row pointers for all the components;
-   * we need five row groups' worth of pointers for each component.
-   */
-  fake_buffer = (JSAMPARRAY)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(cinfo->num_components * 5 * rgroup_height) *
-				SIZEOF(JSAMPROW));
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Allocate the actual buffer space (3 row groups) for this component.
-     * We make the buffer wide enough to allow the downsampler to edge-expand
-     * horizontally within the buffer, if it so chooses.
-     */
-    true_buffer = (*cinfo->mem->alloc_sarray)
-      ((j_common_ptr) cinfo, JPOOL_IMAGE,
-       (JDIMENSION) (((long) compptr->width_in_blocks * DCTSIZE *
-		      cinfo->max_h_samp_factor) / compptr->h_samp_factor),
-       (JDIMENSION) (3 * rgroup_height));
-    /* Copy true buffer row pointers into the middle of the fake row array */
-    MEMCOPY(fake_buffer + rgroup_height, true_buffer,
-	    3 * rgroup_height * SIZEOF(JSAMPROW));
-    /* Fill in the above and below wraparound pointers */
-    for (i = 0; i < rgroup_height; i++) {
-      fake_buffer[i] = true_buffer[2 * rgroup_height + i];
-      fake_buffer[4 * rgroup_height + i] = true_buffer[i];
-    }
-    prep->color_buf[ci] = fake_buffer + rgroup_height;
-    fake_buffer += 5 * rgroup_height; /* point to space for next component */
-  }
-}
-
-#endif /* CONTEXT_ROWS_SUPPORTED */
-
-
-/*
- * Initialize preprocessing controller.
- */
-
-GLOBAL(void)
-jinit_c_prep_controller (j_compress_ptr cinfo, wxjpeg_boolean need_full_buffer)
-{
-  my_prep_ptr prep;
-  int ci;
-  jpeg_component_info * compptr;
-
-  if (need_full_buffer)		/* safety check */
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-
-  prep = (my_prep_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_prep_controller));
-  cinfo->prep = (struct jpeg_c_prep_controller *) prep;
-  prep->pub.start_pass = start_pass_prep;
-
-  /* Allocate the color conversion buffer.
-   * We make the buffer wide enough to allow the downsampler to edge-expand
-   * horizontally within the buffer, if it so chooses.
-   */
-  if (cinfo->downsample->need_context_rows) {
-    /* Set up to provide context rows */
-#ifdef CONTEXT_ROWS_SUPPORTED
-    prep->pub.pre_process_data = pre_process_context;
-    create_context_buffer(cinfo);
-#else
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-  } else {
-    /* No context, just make it tall enough for one row group */
-    prep->pub.pre_process_data = pre_process_data;
-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	 ci++, compptr++) {
-      prep->color_buf[ci] = (*cinfo->mem->alloc_sarray)
-	((j_common_ptr) cinfo, JPOOL_IMAGE,
-	 (JDIMENSION) (((long) compptr->width_in_blocks * DCTSIZE *
-			cinfo->max_h_samp_factor) / compptr->h_samp_factor),
-	 (JDIMENSION) cinfo->max_v_samp_factor);
-    }
-  }
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcsample.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcsample.c
deleted file mode 100644
index 5cc2999c17..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jcsample.c
+++ /dev/null
@@ -1,519 +0,0 @@
-/*
- * jcsample.c
- *
- * Copyright (C) 1991-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains downsampling routines.
- *
- * Downsampling input data is counted in "row groups".  A row group
- * is defined to be max_v_samp_factor pixel rows of each component,
- * from which the downsampler produces v_samp_factor sample rows.
- * A single row group is processed in each call to the downsampler module.
- *
- * The downsampler is responsible for edge-expansion of its output data
- * to fill an integral number of DCT blocks horizontally.  The source buffer
- * may be modified if it is helpful for this purpose (the source buffer is
- * allocated wide enough to correspond to the desired output width).
- * The caller (the prep controller) is responsible for vertical padding.
- *
- * The downsampler may request "context rows" by setting need_context_rows
- * during startup.  In this case, the input arrays will contain at least
- * one row group's worth of pixels above and below the passed-in data;
- * the caller will create dummy rows at image top and bottom by replicating
- * the first or last real pixel row.
- *
- * An excellent reference for image resampling is
- *   Digital Image Warping, George Wolberg, 1990.
- *   Pub. by IEEE Computer Society Press, Los Alamitos, CA. ISBN 0-8186-8944-7.
- *
- * The downsampling algorithm used here is a simple average of the source
- * pixels covered by the output pixel.  The hi-falutin sampling literature
- * refers to this as a "box filter".  In general the characteristics of a box
- * filter are not very good, but for the specific cases we normally use (1:1
- * and 2:1 ratios) the box is equivalent to a "triangle filter" which is not
- * nearly so bad.  If you intend to use other sampling ratios, you'd be well
- * advised to improve this code.
- *
- * A simple input-smoothing capability is provided.  This is mainly intended
- * for cleaning up color-dithered GIF input files (if you find it inadequate,
- * we suggest using an external filtering program such as pnmconvol).  When
- * enabled, each input pixel P is replaced by a weighted sum of itself and its
- * eight neighbors.  P's weight is 1-8*SF and each neighbor's weight is SF,
- * where SF = (smoothing_factor / 1024).
- * Currently, smoothing is only supported for 2h2v sampling factors.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Pointer to routine to downsample a single component */
-typedef JMETHOD(void, downsample1_ptr,
-		(j_compress_ptr cinfo, jpeg_component_info * compptr,
-		 JSAMPARRAY input_data, JSAMPARRAY output_data));
-
-/* Private subobject */
-
-typedef struct {
-  struct jpeg_downsampler pub;	/* public fields */
-
-  /* Downsampling method pointers, one per component */
-  downsample1_ptr methods[MAX_COMPONENTS];
-} my_downsampler;
-
-typedef my_downsampler * my_downsample_ptr;
-
-
-/*
- * Initialize for a downsampling pass.
- */
-
-METHODDEF(void)
-start_pass_downsample (j_compress_ptr cinfo)
-{
-  /* no work for now */
-}
-
-
-/*
- * Expand a component horizontally from width input_cols to width output_cols,
- * by duplicating the rightmost samples.
- */
-
-LOCAL(void)
-expand_right_edge (JSAMPARRAY image_data, int num_rows,
-		   JDIMENSION input_cols, JDIMENSION output_cols)
-{
-  register JSAMPROW ptr;
-  register JSAMPLE pixval;
-  register int count;
-  int row;
-  int numcols = (int) (output_cols - input_cols);
-
-  if (numcols > 0) {
-    for (row = 0; row < num_rows; row++) {
-      ptr = image_data[row] + input_cols;
-      pixval = ptr[-1];		/* don't need GETJSAMPLE() here */
-      for (count = numcols; count > 0; count--)
-	*ptr++ = pixval;
-    }
-  }
-}
-
-
-/*
- * Do downsampling for a whole row group (all components).
- *
- * In this version we simply downsample each component independently.
- */
-
-METHODDEF(void)
-sep_downsample (j_compress_ptr cinfo,
-		JSAMPIMAGE input_buf, JDIMENSION in_row_index,
-		JSAMPIMAGE output_buf, JDIMENSION out_row_group_index)
-{
-  my_downsample_ptr downsample = (my_downsample_ptr) cinfo->downsample;
-  int ci;
-  jpeg_component_info * compptr;
-  JSAMPARRAY in_ptr, out_ptr;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    in_ptr = input_buf[ci] + in_row_index;
-    out_ptr = output_buf[ci] + (out_row_group_index * compptr->v_samp_factor);
-    (*downsample->methods[ci]) (cinfo, compptr, in_ptr, out_ptr);
-  }
-}
-
-
-/*
- * Downsample pixel values of a single component.
- * One row group is processed per call.
- * This version handles arbitrary integral sampling ratios, without smoothing.
- * Note that this version is not actually used for customary sampling ratios.
- */
-
-METHODDEF(void)
-int_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
-		JSAMPARRAY input_data, JSAMPARRAY output_data)
-{
-  int inrow, outrow, h_expand, v_expand, numpix, numpix2, h, v;
-  JDIMENSION outcol, outcol_h;	/* outcol_h == outcol*h_expand */
-  JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
-  JSAMPROW inptr, outptr;
-  JPEG_INT32 outvalue;
-
-  h_expand = cinfo->max_h_samp_factor / compptr->h_samp_factor;
-  v_expand = cinfo->max_v_samp_factor / compptr->v_samp_factor;
-  numpix = h_expand * v_expand;
-  numpix2 = numpix/2;
-
-  /* Expand input data enough to let all the output samples be generated
-   * by the standard loop.  Special-casing padded output would be more
-   * efficient.
-   */
-  expand_right_edge(input_data, cinfo->max_v_samp_factor,
-		    cinfo->image_width, output_cols * h_expand);
-
-  inrow = 0;
-  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
-    outptr = output_data[outrow];
-    for (outcol = 0, outcol_h = 0; outcol < output_cols;
-	 outcol++, outcol_h += h_expand) {
-      outvalue = 0;
-      for (v = 0; v < v_expand; v++) {
-	inptr = input_data[inrow+v] + outcol_h;
-	for (h = 0; h < h_expand; h++) {
-	  outvalue += (JPEG_INT32) GETJSAMPLE(*inptr++);
-	}
-      }
-      *outptr++ = (JSAMPLE) ((outvalue + numpix2) / numpix);
-    }
-    inrow += v_expand;
-  }
-}
-
-
-/*
- * Downsample pixel values of a single component.
- * This version handles the special case of a full-size component,
- * without smoothing.
- */
-
-METHODDEF(void)
-fullsize_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
-		     JSAMPARRAY input_data, JSAMPARRAY output_data)
-{
-  /* Copy the data */
-  jcopy_sample_rows(input_data, 0, output_data, 0,
-		    cinfo->max_v_samp_factor, cinfo->image_width);
-  /* Edge-expand */
-  expand_right_edge(output_data, cinfo->max_v_samp_factor,
-		    cinfo->image_width, compptr->width_in_blocks * DCTSIZE);
-}
-
-
-/*
- * Downsample pixel values of a single component.
- * This version handles the common case of 2:1 horizontal and 1:1 vertical,
- * without smoothing.
- *
- * A note about the "bias" calculations: when rounding fractional values to
- * integer, we do not want to always round 0.5 up to the next integer.
- * If we did that, we'd introduce a noticeable bias towards larger values.
- * Instead, this code is arranged so that 0.5 will be rounded up or down at
- * alternate pixel locations (a simple ordered dither pattern).
- */
-
-METHODDEF(void)
-h2v1_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
-		 JSAMPARRAY input_data, JSAMPARRAY output_data)
-{
-  int outrow;
-  JDIMENSION outcol;
-  JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
-  register JSAMPROW inptr, outptr;
-  register int bias;
-
-  /* Expand input data enough to let all the output samples be generated
-   * by the standard loop.  Special-casing padded output would be more
-   * efficient.
-   */
-  expand_right_edge(input_data, cinfo->max_v_samp_factor,
-		    cinfo->image_width, output_cols * 2);
-
-  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
-    outptr = output_data[outrow];
-    inptr = input_data[outrow];
-    bias = 0;			/* bias = 0,1,0,1,... for successive samples */
-    for (outcol = 0; outcol < output_cols; outcol++) {
-      *outptr++ = (JSAMPLE) ((GETJSAMPLE(*inptr) + GETJSAMPLE(inptr[1])
-			      + bias) >> 1);
-      bias ^= 1;		/* 0=>1, 1=>0 */
-      inptr += 2;
-    }
-  }
-}
-
-
-/*
- * Downsample pixel values of a single component.
- * This version handles the standard case of 2:1 horizontal and 2:1 vertical,
- * without smoothing.
- */
-
-METHODDEF(void)
-h2v2_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
-		 JSAMPARRAY input_data, JSAMPARRAY output_data)
-{
-  int inrow, outrow;
-  JDIMENSION outcol;
-  JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
-  register JSAMPROW inptr0, inptr1, outptr;
-  register int bias;
-
-  /* Expand input data enough to let all the output samples be generated
-   * by the standard loop.  Special-casing padded output would be more
-   * efficient.
-   */
-  expand_right_edge(input_data, cinfo->max_v_samp_factor,
-		    cinfo->image_width, output_cols * 2);
-
-  inrow = 0;
-  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
-    outptr = output_data[outrow];
-    inptr0 = input_data[inrow];
-    inptr1 = input_data[inrow+1];
-    bias = 1;			/* bias = 1,2,1,2,... for successive samples */
-    for (outcol = 0; outcol < output_cols; outcol++) {
-      *outptr++ = (JSAMPLE) ((GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +
-			      GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1])
-			      + bias) >> 2);
-      bias ^= 3;		/* 1=>2, 2=>1 */
-      inptr0 += 2; inptr1 += 2;
-    }
-    inrow += 2;
-  }
-}
-
-
-#ifdef INPUT_SMOOTHING_SUPPORTED
-
-/*
- * Downsample pixel values of a single component.
- * This version handles the standard case of 2:1 horizontal and 2:1 vertical,
- * with smoothing.  One row of context is required.
- */
-
-METHODDEF(void)
-h2v2_smooth_downsample (j_compress_ptr cinfo, jpeg_component_info * compptr,
-			JSAMPARRAY input_data, JSAMPARRAY output_data)
-{
-  int inrow, outrow;
-  JDIMENSION colctr;
-  JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
-  register JSAMPROW inptr0, inptr1, above_ptr, below_ptr, outptr;
-  JPEG_INT32 membersum, neighsum, memberscale, neighscale;
-
-  /* Expand input data enough to let all the output samples be generated
-   * by the standard loop.  Special-casing padded output would be more
-   * efficient.
-   */
-  expand_right_edge(input_data - 1, cinfo->max_v_samp_factor + 2,
-		    cinfo->image_width, output_cols * 2);
-
-  /* We don't bother to form the individual "smoothed" input pixel values;
-   * we can directly compute the output which is the average of the four
-   * smoothed values.  Each of the four member pixels contributes a fraction
-   * (1-8*SF) to its own smoothed image and a fraction SF to each of the three
-   * other smoothed pixels, therefore a total fraction (1-5*SF)/4 to the final
-   * output.  The four corner-adjacent neighbor pixels contribute a fraction
-   * SF to just one smoothed pixel, or SF/4 to the final output; while the
-   * eight edge-adjacent neighbors contribute SF to each of two smoothed
-   * pixels, or SF/2 overall.  In order to use integer arithmetic, these
-   * factors are scaled by 2^16 = 65536.
-   * Also recall that SF = smoothing_factor / 1024.
-   */
-
-  memberscale = 16384 - cinfo->smoothing_factor * 80; /* scaled (1-5*SF)/4 */
-  neighscale = cinfo->smoothing_factor * 16; /* scaled SF/4 */
-
-  inrow = 0;
-  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
-    outptr = output_data[outrow];
-    inptr0 = input_data[inrow];
-    inptr1 = input_data[inrow+1];
-    above_ptr = input_data[inrow-1];
-    below_ptr = input_data[inrow+2];
-
-    /* Special case for first column: pretend column -1 is same as column 0 */
-    membersum = GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +
-		GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1]);
-    neighsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[1]) +
-	       GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[1]) +
-	       GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[2]) +
-	       GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[2]);
-    neighsum += neighsum;
-    neighsum += GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[2]) +
-		GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[2]);
-    membersum = membersum * memberscale + neighsum * neighscale;
-    *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);
-    inptr0 += 2; inptr1 += 2; above_ptr += 2; below_ptr += 2;
-
-    for (colctr = output_cols - 2; colctr > 0; colctr--) {
-      /* sum of pixels directly mapped to this output element */
-      membersum = GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +
-		  GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1]);
-      /* sum of edge-neighbor pixels */
-      neighsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[1]) +
-		 GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[1]) +
-		 GETJSAMPLE(inptr0[-1]) + GETJSAMPLE(inptr0[2]) +
-		 GETJSAMPLE(inptr1[-1]) + GETJSAMPLE(inptr1[2]);
-      /* The edge-neighbors count twice as much as corner-neighbors */
-      neighsum += neighsum;
-      /* Add in the corner-neighbors */
-      neighsum += GETJSAMPLE(above_ptr[-1]) + GETJSAMPLE(above_ptr[2]) +
-		  GETJSAMPLE(below_ptr[-1]) + GETJSAMPLE(below_ptr[2]);
-      /* form final output scaled up by 2^16 */
-      membersum = membersum * memberscale + neighsum * neighscale;
-      /* round, descale and output it */
-      *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);
-      inptr0 += 2; inptr1 += 2; above_ptr += 2; below_ptr += 2;
-    }
-
-    /* Special case for last column */
-    membersum = GETJSAMPLE(*inptr0) + GETJSAMPLE(inptr0[1]) +
-		GETJSAMPLE(*inptr1) + GETJSAMPLE(inptr1[1]);
-    neighsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(above_ptr[1]) +
-	       GETJSAMPLE(*below_ptr) + GETJSAMPLE(below_ptr[1]) +
-	       GETJSAMPLE(inptr0[-1]) + GETJSAMPLE(inptr0[1]) +
-	       GETJSAMPLE(inptr1[-1]) + GETJSAMPLE(inptr1[1]);
-    neighsum += neighsum;
-    neighsum += GETJSAMPLE(above_ptr[-1]) + GETJSAMPLE(above_ptr[1]) +
-		GETJSAMPLE(below_ptr[-1]) + GETJSAMPLE(below_ptr[1]);
-    membersum = membersum * memberscale + neighsum * neighscale;
-    *outptr = (JSAMPLE) ((membersum + 32768) >> 16);
-
-    inrow += 2;
-  }
-}
-
-
-/*
- * Downsample pixel values of a single component.
- * This version handles the special case of a full-size component,
- * with smoothing.  One row of context is required.
- */
-
-METHODDEF(void)
-fullsize_smooth_downsample (j_compress_ptr cinfo, jpeg_component_info *compptr,
-			    JSAMPARRAY input_data, JSAMPARRAY output_data)
-{
-  int outrow;
-  JDIMENSION colctr;
-  JDIMENSION output_cols = compptr->width_in_blocks * DCTSIZE;
-  register JSAMPROW inptr, above_ptr, below_ptr, outptr;
-  JPEG_INT32 membersum, neighsum, memberscale, neighscale;
-  int colsum, lastcolsum, nextcolsum;
-
-  /* Expand input data enough to let all the output samples be generated
-   * by the standard loop.  Special-casing padded output would be more
-   * efficient.
-   */
-  expand_right_edge(input_data - 1, cinfo->max_v_samp_factor + 2,
-		    cinfo->image_width, output_cols);
-
-  /* Each of the eight neighbor pixels contributes a fraction SF to the
-   * smoothed pixel, while the main pixel contributes (1-8*SF).  In order
-   * to use integer arithmetic, these factors are multiplied by 2^16 = 65536.
-   * Also recall that SF = smoothing_factor / 1024.
-   */
-
-  memberscale = 65536L - cinfo->smoothing_factor * 512L; /* scaled 1-8*SF */
-  neighscale = cinfo->smoothing_factor * 64; /* scaled SF */
-
-  for (outrow = 0; outrow < compptr->v_samp_factor; outrow++) {
-    outptr = output_data[outrow];
-    inptr = input_data[outrow];
-    above_ptr = input_data[outrow-1];
-    below_ptr = input_data[outrow+1];
-
-    /* Special case for first column */
-    colsum = GETJSAMPLE(*above_ptr++) + GETJSAMPLE(*below_ptr++) +
-	     GETJSAMPLE(*inptr);
-    membersum = GETJSAMPLE(*inptr++);
-    nextcolsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(*below_ptr) +
-		 GETJSAMPLE(*inptr);
-    neighsum = colsum + (colsum - membersum) + nextcolsum;
-    membersum = membersum * memberscale + neighsum * neighscale;
-    *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);
-    lastcolsum = colsum; colsum = nextcolsum;
-
-    for (colctr = output_cols - 2; colctr > 0; colctr--) {
-      membersum = GETJSAMPLE(*inptr++);
-      above_ptr++; below_ptr++;
-      nextcolsum = GETJSAMPLE(*above_ptr) + GETJSAMPLE(*below_ptr) +
-		   GETJSAMPLE(*inptr);
-      neighsum = lastcolsum + (colsum - membersum) + nextcolsum;
-      membersum = membersum * memberscale + neighsum * neighscale;
-      *outptr++ = (JSAMPLE) ((membersum + 32768) >> 16);
-      lastcolsum = colsum; colsum = nextcolsum;
-    }
-
-    /* Special case for last column */
-    membersum = GETJSAMPLE(*inptr);
-    neighsum = lastcolsum + (colsum - membersum) + colsum;
-    membersum = membersum * memberscale + neighsum * neighscale;
-    *outptr = (JSAMPLE) ((membersum + 32768) >> 16);
-
-  }
-}
-
-#endif /* INPUT_SMOOTHING_SUPPORTED */
-
-
-/*
- * Module initialization routine for downsampling.
- * Note that we must select a routine for each component.
- */
-
-GLOBAL(void)
-jinit_downsampler (j_compress_ptr cinfo)
-{
-  my_downsample_ptr downsample;
-  int ci;
-  jpeg_component_info * compptr;
-  wxjpeg_boolean smoothok = TRUE;
-
-  downsample = (my_downsample_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_downsampler));
-  cinfo->downsample = (struct jpeg_downsampler *) downsample;
-  downsample->pub.start_pass = start_pass_downsample;
-  downsample->pub.downsample = sep_downsample;
-  downsample->pub.need_context_rows = FALSE;
-
-  if (cinfo->CCIR601_sampling)
-    ERREXIT(cinfo, JERR_CCIR601_NOTIMPL);
-
-  /* Verify we can handle the sampling factors, and set up method pointers */
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    if (compptr->h_samp_factor == cinfo->max_h_samp_factor &&
-	compptr->v_samp_factor == cinfo->max_v_samp_factor) {
-#ifdef INPUT_SMOOTHING_SUPPORTED
-      if (cinfo->smoothing_factor) {
-	downsample->methods[ci] = fullsize_smooth_downsample;
-	downsample->pub.need_context_rows = TRUE;
-      } else
-#endif
-	downsample->methods[ci] = fullsize_downsample;
-    } else if (compptr->h_samp_factor * 2 == cinfo->max_h_samp_factor &&
-	       compptr->v_samp_factor == cinfo->max_v_samp_factor) {
-      smoothok = FALSE;
-      downsample->methods[ci] = h2v1_downsample;
-    } else if (compptr->h_samp_factor * 2 == cinfo->max_h_samp_factor &&
-	       compptr->v_samp_factor * 2 == cinfo->max_v_samp_factor) {
-#ifdef INPUT_SMOOTHING_SUPPORTED
-      if (cinfo->smoothing_factor) {
-	downsample->methods[ci] = h2v2_smooth_downsample;
-	downsample->pub.need_context_rows = TRUE;
-      } else
-#endif
-	downsample->methods[ci] = h2v2_downsample;
-    } else if ((cinfo->max_h_samp_factor % compptr->h_samp_factor) == 0 &&
-	       (cinfo->max_v_samp_factor % compptr->v_samp_factor) == 0) {
-      smoothok = FALSE;
-      downsample->methods[ci] = int_downsample;
-    } else
-      ERREXIT(cinfo, JERR_FRACT_SAMPLE_NOTIMPL);
-  }
-
-#ifdef INPUT_SMOOTHING_SUPPORTED
-  if (cinfo->smoothing_factor && !smoothok)
-    TRACEMS(cinfo, 0, JTRC_SMOOTH_NOTIMPL);
-#endif
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jctrans.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jctrans.c
deleted file mode 100644
index c5bb27f321..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jctrans.c
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
- * jctrans.c
- *
- * Copyright (C) 1995-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains library routines for transcoding compression,
- * that is, writing raw DCT coefficient arrays to an output JPEG file.
- * The routines in jcapimin.c will also be needed by a transcoder.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Forward declarations */
-LOCAL(void) transencode_master_selection
-	JPP((j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays));
-LOCAL(void) transencode_coef_controller
-	JPP((j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays));
-
-#if defined(__VISAGECPP__)
-/* Visual Age fixups for multiple declarations */
-#  define start_pass_coef   start_pass_coef2 /* already in jccoeft.c */
-#  define compress_output   compress_output2 /* already in jccoeft.c */
-#endif
-
-
-/*
- * Compression initialization for writing raw-coefficient data.
- * Before calling this, all parameters and a data destination must be set up.
- * Call jpeg_finish_compress() to actually write the data.
- *
- * The number of passed virtual arrays must match cinfo->num_components.
- * Note that the virtual arrays need not be filled or even realized at
- * the time write_coefficients is called; indeed, if the virtual arrays
- * were requested from this compression object's memory manager, they
- * typically will be realized during this routine and filled afterwards.
- */
-
-GLOBAL(void)
-jpeg_write_coefficients (j_compress_ptr cinfo, jvirt_barray_ptr * coef_arrays)
-{
-  if (cinfo->global_state != CSTATE_START)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  /* Mark all tables to be written */
-  jpeg_suppress_tables(cinfo, FALSE);
-  /* (Re)initialize error mgr and destination modules */
-  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
-  (*cinfo->dest->init_destination) (cinfo);
-  /* Perform master selection of active modules */
-  transencode_master_selection(cinfo, coef_arrays);
-  /* Wait for jpeg_finish_compress() call */
-  cinfo->next_scanline = 0;	/* so jpeg_write_marker works */
-  cinfo->global_state = CSTATE_WRCOEFS;
-}
-
-
-/*
- * Initialize the compression object with default parameters,
- * then copy from the source object all parameters needed for lossless
- * transcoding.  Parameters that can be varied without loss (such as
- * scan script and Huffman optimization) are left in their default states.
- */
-
-GLOBAL(void)
-jpeg_copy_critical_parameters (j_decompress_ptr srcinfo,
-			       j_compress_ptr dstinfo)
-{
-  JQUANT_TBL ** qtblptr;
-  jpeg_component_info *incomp, *outcomp;
-  JQUANT_TBL *c_quant, *slot_quant;
-  int tblno, ci, coefi;
-
-  /* Safety check to ensure start_compress not called yet. */
-  if (dstinfo->global_state != CSTATE_START)
-    ERREXIT1(dstinfo, JERR_BAD_STATE, dstinfo->global_state);
-  /* Copy fundamental image dimensions */
-  dstinfo->image_width = srcinfo->image_width;
-  dstinfo->image_height = srcinfo->image_height;
-  dstinfo->input_components = srcinfo->num_components;
-  dstinfo->in_color_space = srcinfo->jpeg_color_space;
-  /* Initialize all parameters to default values */
-  jpeg_set_defaults(dstinfo);
-  /* jpeg_set_defaults may choose wrong colorspace, eg YCbCr if input is RGB.
-   * Fix it to get the right header markers for the image colorspace.
-   */
-  jpeg_set_colorspace(dstinfo, srcinfo->jpeg_color_space);
-  dstinfo->data_precision = srcinfo->data_precision;
-  dstinfo->CCIR601_sampling = srcinfo->CCIR601_sampling;
-  /* Copy the source's quantization tables. */
-  for (tblno = 0; tblno < NUM_QUANT_TBLS; tblno++) {
-    if (srcinfo->quant_tbl_ptrs[tblno] != NULL) {
-      qtblptr = & dstinfo->quant_tbl_ptrs[tblno];
-      if (*qtblptr == NULL)
-	*qtblptr = jpeg_alloc_quant_table((j_common_ptr) dstinfo);
-      MEMCOPY((*qtblptr)->quantval,
-	      srcinfo->quant_tbl_ptrs[tblno]->quantval,
-	      SIZEOF((*qtblptr)->quantval));
-      (*qtblptr)->sent_table = FALSE;
-    }
-  }
-  /* Copy the source's per-component info.
-   * Note we assume jpeg_set_defaults has allocated the dest comp_info array.
-   */
-  dstinfo->num_components = srcinfo->num_components;
-  if (dstinfo->num_components < 1 || dstinfo->num_components > MAX_COMPONENTS)
-    ERREXIT2(dstinfo, JERR_COMPONENT_COUNT, dstinfo->num_components,
-	     MAX_COMPONENTS);
-  for (ci = 0, incomp = srcinfo->comp_info, outcomp = dstinfo->comp_info;
-       ci < dstinfo->num_components; ci++, incomp++, outcomp++) {
-    outcomp->component_id = incomp->component_id;
-    outcomp->h_samp_factor = incomp->h_samp_factor;
-    outcomp->v_samp_factor = incomp->v_samp_factor;
-    outcomp->quant_tbl_no = incomp->quant_tbl_no;
-    /* Make sure saved quantization table for component matches the qtable
-     * slot.  If not, the input file re-used this qtable slot.
-     * IJG encoder currently cannot duplicate this.
-     */
-    tblno = outcomp->quant_tbl_no;
-    if (tblno < 0 || tblno >= NUM_QUANT_TBLS ||
-	srcinfo->quant_tbl_ptrs[tblno] == NULL)
-      ERREXIT1(dstinfo, JERR_NO_QUANT_TABLE, tblno);
-    slot_quant = srcinfo->quant_tbl_ptrs[tblno];
-    c_quant = incomp->quant_table;
-    if (c_quant != NULL) {
-      for (coefi = 0; coefi < DCTSIZE2; coefi++) {
-	if (c_quant->quantval[coefi] != slot_quant->quantval[coefi])
-	  ERREXIT1(dstinfo, JERR_MISMATCHED_QUANT_TABLE, tblno);
-      }
-    }
-    /* Note: we do not copy the source's Huffman table assignments;
-     * instead we rely on jpeg_set_colorspace to have made a suitable choice.
-     */
-  }
-  /* Also copy JFIF version and resolution information, if available.
-   * Strictly speaking this isn't "critical" info, but it's nearly
-   * always appropriate to copy it if available.  In particular,
-   * if the application chooses to copy JFIF 1.02 extension markers from
-   * the source file, we need to copy the version to make sure we don't
-   * emit a file that has 1.02 extensions but a claimed version of 1.01.
-   * We will *not*, however, copy version info from mislabeled "2.01" files.
-   */
-  if (srcinfo->saw_JFIF_marker) {
-    if (srcinfo->JFIF_major_version == 1) {
-      dstinfo->JFIF_major_version = srcinfo->JFIF_major_version;
-      dstinfo->JFIF_minor_version = srcinfo->JFIF_minor_version;
-    }
-    dstinfo->density_unit = srcinfo->density_unit;
-    dstinfo->X_density = srcinfo->X_density;
-    dstinfo->Y_density = srcinfo->Y_density;
-  }
-}
-
-
-/*
- * Master selection of compression modules for transcoding.
- * This substitutes for jcinit.c's initialization of the full compressor.
- */
-
-LOCAL(void)
-transencode_master_selection (j_compress_ptr cinfo,
-			      jvirt_barray_ptr * coef_arrays)
-{
-  /* Although we don't actually use input_components for transcoding,
-   * jcmaster.c's initial_setup will complain if input_components is 0.
-   */
-  cinfo->input_components = 1;
-  /* Initialize master control (includes parameter checking/processing) */
-  jinit_c_master_control(cinfo, TRUE /* transcode only */);
-
-  /* Entropy encoding: either Huffman or arithmetic coding. */
-  if (cinfo->arith_code) {
-    ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
-  } else {
-    if (cinfo->progressive_mode) {
-#ifdef C_PROGRESSIVE_SUPPORTED
-      jinit_phuff_encoder(cinfo);
-#else
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-    } else
-      jinit_huff_encoder(cinfo);
-  }
-
-  /* We need a special coefficient buffer controller. */
-  transencode_coef_controller(cinfo, coef_arrays);
-
-  jinit_marker_writer(cinfo);
-
-  /* We can now tell the memory manager to allocate virtual arrays. */
-  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);
-
-  /* Write the datastream header (SOI, JFIF) immediately.
-   * Frame and scan headers are postponed till later.
-   * This lets application insert special markers after the SOI.
-   */
-  (*cinfo->marker->write_file_header) (cinfo);
-}
-
-
-/*
- * The rest of this file is a special implementation of the coefficient
- * buffer controller.  This is similar to jccoefct.c, but it handles only
- * output from presupplied virtual arrays.  Furthermore, we generate any
- * dummy padding blocks on-the-fly rather than expecting them to be present
- * in the arrays.
- */
-
-/* Private buffer controller object */
-
-typedef struct {
-  struct jpeg_c_coef_controller pub; /* public fields */
-
-  JDIMENSION iMCU_row_num;	/* iMCU row # within image */
-  JDIMENSION mcu_ctr;		/* counts MCUs processed in current row */
-  int MCU_vert_offset;		/* counts MCU rows within iMCU row */
-  int MCU_rows_per_iMCU_row;	/* number of such rows needed */
-
-  /* Virtual block array for each component. */
-  jvirt_barray_ptr * whole_image;
-
-  /* Workspace for constructing dummy blocks at right/bottom edges. */
-  JBLOCKROW dummy_buffer[C_MAX_BLOCKS_IN_MCU];
-} my_coef_controller;
-
-typedef my_coef_controller * my_coef_ptr;
-
-
-LOCAL(void)
-start_iMCU_row (j_compress_ptr cinfo)
-/* Reset within-iMCU-row counters for a new row */
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-
-  /* In an interleaved scan, an MCU row is the same as an iMCU row.
-   * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
-   * But at the bottom of the image, process only what's left.
-   */
-  if (cinfo->comps_in_scan > 1) {
-    coef->MCU_rows_per_iMCU_row = 1;
-  } else {
-    if (coef->iMCU_row_num < (cinfo->total_iMCU_rows-1))
-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;
-    else
-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;
-  }
-
-  coef->mcu_ctr = 0;
-  coef->MCU_vert_offset = 0;
-}
-
-/*
- * Initialize for a processing pass.
- */
-
-METHODDEF(void)
-start_pass_coef (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-
-  if (pass_mode != JBUF_CRANK_DEST)
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-
-  coef->iMCU_row_num = 0;
-  start_iMCU_row(cinfo);
-}
-
-
-/*
- * Process some data.
- * We process the equivalent of one fully interleaved MCU row ("iMCU" row)
- * per call, ie, v_samp_factor block rows for each component in the scan.
- * The data is obtained from the virtual arrays and fed to the entropy coder.
- * Returns TRUE if the iMCU row is completed, FALSE if suspended.
- *
- * NB: input_buf is ignored; it is likely to be a NULL pointer.
- */
-
-METHODDEF(wxjpeg_boolean)
-compress_output (j_compress_ptr cinfo, JSAMPIMAGE input_buf)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION MCU_col_num;	/* index of current MCU within row */
-  JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;
-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
-  int blkn, ci, xindex, yindex, yoffset, blockcnt;
-  JDIMENSION start_col;
-  JBLOCKARRAY buffer[MAX_COMPS_IN_SCAN];
-  JBLOCKROW MCU_buffer[C_MAX_BLOCKS_IN_MCU];
-  JBLOCKROW buffer_ptr;
-  jpeg_component_info *compptr;
-
-  /* Align the virtual buffers for the components used in this scan. */
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    buffer[ci] = (*cinfo->mem->access_virt_barray)
-      ((j_common_ptr) cinfo, coef->whole_image[compptr->component_index],
-       coef->iMCU_row_num * compptr->v_samp_factor,
-       (JDIMENSION) compptr->v_samp_factor, FALSE);
-  }
-
-  /* Loop to process one whole iMCU row */
-  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
-       yoffset++) {
-    for (MCU_col_num = coef->mcu_ctr; MCU_col_num < cinfo->MCUs_per_row;
-	 MCU_col_num++) {
-      /* Construct list of pointers to DCT blocks belonging to this MCU */
-      blkn = 0;			/* index of current DCT block within MCU */
-      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-	compptr = cinfo->cur_comp_info[ci];
-	start_col = MCU_col_num * compptr->MCU_width;
-	blockcnt = (MCU_col_num < last_MCU_col) ? compptr->MCU_width
-						: compptr->last_col_width;
-	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
-	  if (coef->iMCU_row_num < last_iMCU_row ||
-	      yindex+yoffset < compptr->last_row_height) {
-	    /* Fill in pointers to real blocks in this row */
-	    buffer_ptr = buffer[ci][yindex+yoffset] + start_col;
-	    for (xindex = 0; xindex < blockcnt; xindex++)
-	      MCU_buffer[blkn++] = buffer_ptr++;
-	  } else {
-	    /* At bottom of image, need a whole row of dummy blocks */
-	    xindex = 0;
-	  }
-	  /* Fill in any dummy blocks needed in this row.
-	   * Dummy blocks are filled in the same way as in jccoefct.c:
-	   * all zeroes in the AC entries, DC entries equal to previous
-	   * block's DC value.  The init routine has already zeroed the
-	   * AC entries, so we need only set the DC entries correctly.
-	   */
-	  for (; xindex < compptr->MCU_width; xindex++) {
-	    MCU_buffer[blkn] = coef->dummy_buffer[blkn];
-	    MCU_buffer[blkn][0][0] = MCU_buffer[blkn-1][0][0];
-	    blkn++;
-	  }
-	}
-      }
-      /* Try to write the MCU. */
-      if (! (*cinfo->entropy->encode_mcu) (cinfo, MCU_buffer)) {
-	/* Suspension forced; update state counters and exit */
-	coef->MCU_vert_offset = yoffset;
-	coef->mcu_ctr = MCU_col_num;
-	return FALSE;
-      }
-    }
-    /* Completed an MCU row, but perhaps not an iMCU row */
-    coef->mcu_ctr = 0;
-  }
-  /* Completed the iMCU row, advance counters for next one */
-  coef->iMCU_row_num++;
-  start_iMCU_row(cinfo);
-  return TRUE;
-}
-
-
-/*
- * Initialize coefficient buffer controller.
- *
- * Each passed coefficient array must be the right size for that
- * coefficient: width_in_blocks wide and height_in_blocks high,
- * with unitheight at least v_samp_factor.
- */
-
-LOCAL(void)
-transencode_coef_controller (j_compress_ptr cinfo,
-			     jvirt_barray_ptr * coef_arrays)
-{
-  my_coef_ptr coef;
-  JBLOCKROW buffer;
-  int i;
-
-  coef = (my_coef_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_coef_controller));
-  cinfo->coef = (struct jpeg_c_coef_controller *) coef;
-  coef->pub.start_pass = start_pass_coef;
-  coef->pub.compress_data = compress_output;
-
-  /* Save pointer to virtual arrays */
-  coef->whole_image = coef_arrays;
-
-  /* Allocate and pre-zero space for dummy DCT blocks. */
-  buffer = (JBLOCKROW)
-    (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				C_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));
-  jzero_far((void FAR *) buffer, C_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));
-  for (i = 0; i < C_MAX_BLOCKS_IN_MCU; i++) {
-    coef->dummy_buffer[i] = buffer + i;
-  }
-}
-
-#if defined(__VISAGECPP__)
-#  ifdef start_pass_coef2
-#   undef start_pass_coef2
-#  endif
-#  ifdef compress_output2
-#    undef compress_output2
-#  endif
-#endif
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdapimin.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdapimin.c
deleted file mode 100644
index 5c8474f018..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdapimin.c
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- * jdapimin.c
- *
- * Copyright (C) 1994-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains application interface code for the decompression half
- * of the JPEG library.  These are the "minimum" API routines that may be
- * needed in either the normal full-decompression case or the
- * transcoding-only case.
- *
- * Most of the routines intended to be called directly by an application
- * are in this file or in jdapistd.c.  But also see jcomapi.c for routines
- * shared by compression and decompression, and jdtrans.c for the transcoding
- * case.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/*
- * Initialization of a JPEG decompression object.
- * The error manager must already be set up (in case memory manager fails).
- */
-
-GLOBAL(void)
-jpeg_CreateDecompress (j_decompress_ptr cinfo, int version, size_t structsize)
-{
-  int i;
-
-  /* Guard against version mismatches between library and caller. */
-  cinfo->mem = NULL;		/* so jpeg_destroy knows mem mgr not called */
-  if (version != JPEG_LIB_VERSION)
-    ERREXIT2(cinfo, JERR_BAD_LIB_VERSION, JPEG_LIB_VERSION, version);
-  if (structsize != SIZEOF(struct jpeg_decompress_struct))
-    ERREXIT2(cinfo, JERR_BAD_STRUCT_SIZE, 
-	     (int) SIZEOF(struct jpeg_decompress_struct), (int) structsize);
-
-  /* For debugging purposes, we zero the whole master structure.
-   * But the application has already set the err pointer, and may have set
-   * client_data, so we have to save and restore those fields.
-   * Note: if application hasn't set client_data, tools like Purify may
-   * complain here.
-   */
-  {
-    struct jpeg_error_mgr * err = cinfo->err;
-    void * client_data = cinfo->client_data; /* ignore Purify complaint here */
-    MEMZERO(cinfo, SIZEOF(struct jpeg_decompress_struct));
-    cinfo->err = err;
-    cinfo->client_data = client_data;
-  }
-  cinfo->is_decompressor = TRUE;
-
-  /* Initialize a memory manager instance for this object */
-  jinit_memory_mgr((j_common_ptr) cinfo);
-
-  /* Zero out pointers to permanent structures. */
-  cinfo->progress = NULL;
-  cinfo->src = NULL;
-
-  for (i = 0; i < NUM_QUANT_TBLS; i++)
-    cinfo->quant_tbl_ptrs[i] = NULL;
-
-  for (i = 0; i < NUM_HUFF_TBLS; i++) {
-    cinfo->dc_huff_tbl_ptrs[i] = NULL;
-    cinfo->ac_huff_tbl_ptrs[i] = NULL;
-  }
-
-  /* Initialize marker processor so application can override methods
-   * for COM, APPn markers before calling jpeg_read_header.
-   */
-  cinfo->marker_list = NULL;
-  jinit_marker_reader(cinfo);
-
-  /* And initialize the overall input controller. */
-  jinit_input_controller(cinfo);
-
-  /* OK, I'm ready */
-  cinfo->global_state = DSTATE_START;
-}
-
-
-/*
- * Destruction of a JPEG decompression object
- */
-
-GLOBAL(void)
-jpeg_destroy_decompress (j_decompress_ptr cinfo)
-{
-  jpeg_destroy((j_common_ptr) cinfo); /* use common routine */
-}
-
-
-/*
- * Abort processing of a JPEG decompression operation,
- * but don't destroy the object itself.
- */
-
-GLOBAL(void)
-jpeg_abort_decompress (j_decompress_ptr cinfo)
-{
-  jpeg_abort((j_common_ptr) cinfo); /* use common routine */
-}
-
-
-/*
- * Set default decompression parameters.
- */
-
-LOCAL(void)
-default_decompress_parms (j_decompress_ptr cinfo)
-{
-  /* Guess the input colorspace, and set output colorspace accordingly. */
-  /* (Wish JPEG committee had provided a real way to specify this...) */
-  /* Note application may override our guesses. */
-  switch (cinfo->num_components) {
-  case 1:
-    cinfo->jpeg_color_space = JCS_GRAYSCALE;
-    cinfo->out_color_space = JCS_GRAYSCALE;
-    break;
-    
-  case 3:
-    if (cinfo->saw_JFIF_marker) {
-      cinfo->jpeg_color_space = JCS_YCbCr; /* JFIF implies YCbCr */
-    } else if (cinfo->saw_Adobe_marker) {
-      switch (cinfo->Adobe_transform) {
-      case 0:
-	cinfo->jpeg_color_space = JCS_RGB;
-	break;
-      case 1:
-	cinfo->jpeg_color_space = JCS_YCbCr;
-	break;
-      default:
-	WARNMS1(cinfo, JWRN_ADOBE_XFORM, cinfo->Adobe_transform);
-	cinfo->jpeg_color_space = JCS_YCbCr; /* assume it's YCbCr */
-	break;
-      }
-    } else {
-      /* Saw no special markers, try to guess from the component IDs */
-      int cid0 = cinfo->comp_info[0].component_id;
-      int cid1 = cinfo->comp_info[1].component_id;
-      int cid2 = cinfo->comp_info[2].component_id;
-
-      if (cid0 == 1 && cid1 == 2 && cid2 == 3)
-	cinfo->jpeg_color_space = JCS_YCbCr; /* assume JFIF w/out marker */
-      else if (cid0 == 82 && cid1 == 71 && cid2 == 66)
-	cinfo->jpeg_color_space = JCS_RGB; /* ASCII 'R', 'G', 'B' */
-      else {
-	TRACEMS3(cinfo, 1, JTRC_UNKNOWN_IDS, cid0, cid1, cid2);
-	cinfo->jpeg_color_space = JCS_YCbCr; /* assume it's YCbCr */
-      }
-    }
-    /* Always guess RGB is proper output colorspace. */
-    cinfo->out_color_space = JCS_RGB;
-    break;
-    
-  case 4:
-    if (cinfo->saw_Adobe_marker) {
-      switch (cinfo->Adobe_transform) {
-      case 0:
-	cinfo->jpeg_color_space = JCS_CMYK;
-	break;
-      case 2:
-	cinfo->jpeg_color_space = JCS_YCCK;
-	break;
-      default:
-	WARNMS1(cinfo, JWRN_ADOBE_XFORM, cinfo->Adobe_transform);
-	cinfo->jpeg_color_space = JCS_YCCK; /* assume it's YCCK */
-	break;
-      }
-    } else {
-      /* No special markers, assume straight CMYK. */
-      cinfo->jpeg_color_space = JCS_CMYK;
-    }
-    cinfo->out_color_space = JCS_CMYK;
-    break;
-    
-  default:
-    cinfo->jpeg_color_space = JCS_UNKNOWN;
-    cinfo->out_color_space = JCS_UNKNOWN;
-    break;
-  }
-
-  /* Set defaults for other decompression parameters. */
-  cinfo->scale_num = 1;		/* 1:1 scaling */
-  cinfo->scale_denom = 1;
-  cinfo->output_gamma = 1.0;
-  cinfo->buffered_image = FALSE;
-  cinfo->raw_data_out = FALSE;
-  cinfo->dct_method = JDCT_DEFAULT;
-  cinfo->do_fancy_upsampling = TRUE;
-  cinfo->do_block_smoothing = TRUE;
-  cinfo->quantize_colors = FALSE;
-  /* We set these in case application only sets quantize_colors. */
-  cinfo->dither_mode = JDITHER_FS;
-#ifdef QUANT_2PASS_SUPPORTED
-  cinfo->two_pass_quantize = TRUE;
-#else
-  cinfo->two_pass_quantize = FALSE;
-#endif
-  cinfo->desired_number_of_colors = 256;
-  cinfo->colormap = NULL;
-  /* Initialize for no mode change in buffered-image mode. */
-  cinfo->enable_1pass_quant = FALSE;
-  cinfo->enable_external_quant = FALSE;
-  cinfo->enable_2pass_quant = FALSE;
-}
-
-
-/*
- * Decompression startup: read start of JPEG datastream to see what's there.
- * Need only initialize JPEG object and supply a data source before calling.
- *
- * This routine will read as far as the first SOS marker (ie, actual start of
- * compressed data), and will save all tables and parameters in the JPEG
- * object.  It will also initialize the decompression parameters to default
- * values, and finally return JPEG_HEADER_OK.  On return, the application may
- * adjust the decompression parameters and then call jpeg_start_decompress.
- * (Or, if the application only wanted to determine the image parameters,
- * the data need not be decompressed.  In that case, call jpeg_abort or
- * jpeg_destroy to release any temporary space.)
- * If an abbreviated (tables only) datastream is presented, the routine will
- * return JPEG_HEADER_TABLES_ONLY upon reaching EOI.  The application may then
- * re-use the JPEG object to read the abbreviated image datastream(s).
- * It is unnecessary (but OK) to call jpeg_abort in this case.
- * The JPEG_SUSPENDED return code only occurs if the data source module
- * requests suspension of the decompressor.  In this case the application
- * should load more source data and then re-call jpeg_read_header to resume
- * processing.
- * If a non-suspending data source is used and require_image is TRUE, then the
- * return code need not be inspected since only JPEG_HEADER_OK is possible.
- *
- * This routine is now just a front end to jpeg_consume_input, with some
- * extra error checking.
- */
-
-GLOBAL(int)
-jpeg_read_header (j_decompress_ptr cinfo, wxjpeg_boolean require_image)
-{
-  int retcode;
-
-  if (cinfo->global_state != DSTATE_START &&
-      cinfo->global_state != DSTATE_INHEADER)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  retcode = jpeg_consume_input(cinfo);
-
-  switch (retcode) {
-  case JPEG_REACHED_SOS:
-    retcode = JPEG_HEADER_OK;
-    break;
-  case JPEG_REACHED_EOI:
-    if (require_image)		/* Complain if application wanted an image */
-      ERREXIT(cinfo, JERR_NO_IMAGE);
-    /* Reset to start state; it would be safer to require the application to
-     * call jpeg_abort, but we can't change it now for compatibility reasons.
-     * A side effect is to free any temporary memory (there shouldn't be any).
-     */
-    jpeg_abort((j_common_ptr) cinfo); /* sets state = DSTATE_START */
-    retcode = JPEG_HEADER_TABLES_ONLY;
-    break;
-  case JPEG_SUSPENDED:
-    /* no work */
-    break;
-  }
-
-  return retcode;
-}
-
-
-/*
- * Consume data in advance of what the decompressor requires.
- * This can be called at any time once the decompressor object has
- * been created and a data source has been set up.
- *
- * This routine is essentially a state machine that handles a couple
- * of critical state-transition actions, namely initial setup and
- * transition from header scanning to ready-for-start_decompress.
- * All the actual input is done via the input controller's consume_input
- * method.
- */
-
-GLOBAL(int)
-jpeg_consume_input (j_decompress_ptr cinfo)
-{
-  int retcode = JPEG_SUSPENDED;
-
-  /* NB: every possible DSTATE value should be listed in this switch */
-  switch (cinfo->global_state) {
-  case DSTATE_START:
-    /* Start-of-datastream actions: reset appropriate modules */
-    (*cinfo->inputctl->reset_input_controller) (cinfo);
-    /* Initialize application's data source module */
-    (*cinfo->src->init_source) (cinfo);
-    cinfo->global_state = DSTATE_INHEADER;
-    /*FALLTHROUGH*/
-  case DSTATE_INHEADER:
-    retcode = (*cinfo->inputctl->consume_input) (cinfo);
-    if (retcode == JPEG_REACHED_SOS) { /* Found SOS, prepare to decompress */
-      /* Set up default parameters based on header data */
-      default_decompress_parms(cinfo);
-      /* Set global state: ready for start_decompress */
-      cinfo->global_state = DSTATE_READY;
-    }
-    break;
-  case DSTATE_READY:
-    /* Can't advance past first SOS until start_decompress is called */
-    retcode = JPEG_REACHED_SOS;
-    break;
-  case DSTATE_PRELOAD:
-  case DSTATE_PRESCAN:
-  case DSTATE_SCANNING:
-  case DSTATE_RAW_OK:
-  case DSTATE_BUFIMAGE:
-  case DSTATE_BUFPOST:
-  case DSTATE_STOPPING:
-    retcode = (*cinfo->inputctl->consume_input) (cinfo);
-    break;
-  default:
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  }
-  return retcode;
-}
-
-
-/*
- * Have we finished reading the input file?
- */
-
-GLOBAL(wxjpeg_boolean)
-jpeg_input_complete (j_decompress_ptr cinfo)
-{
-  /* Check for valid jpeg object */
-  if (cinfo->global_state < DSTATE_START ||
-      cinfo->global_state > DSTATE_STOPPING)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  return cinfo->inputctl->eoi_reached;
-}
-
-
-/*
- * Is there more than one scan?
- */
-
-GLOBAL(wxjpeg_boolean)
-jpeg_has_multiple_scans (j_decompress_ptr cinfo)
-{
-  /* Only valid after jpeg_read_header completes */
-  if (cinfo->global_state < DSTATE_READY ||
-      cinfo->global_state > DSTATE_STOPPING)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  return cinfo->inputctl->has_multiple_scans;
-}
-
-
-/*
- * Finish JPEG decompression.
- *
- * This will normally just verify the file trailer and release temp storage.
- *
- * Returns FALSE if suspended.  The return value need be inspected only if
- * a suspending data source is used.
- */
-
-GLOBAL(wxjpeg_boolean)
-jpeg_finish_decompress (j_decompress_ptr cinfo)
-{
-  if ((cinfo->global_state == DSTATE_SCANNING ||
-       cinfo->global_state == DSTATE_RAW_OK) && ! cinfo->buffered_image) {
-    /* Terminate final pass of non-buffered mode */
-    if (cinfo->output_scanline < cinfo->output_height)
-      ERREXIT(cinfo, JERR_TOO_LITTLE_DATA);
-    (*cinfo->master->finish_output_pass) (cinfo);
-    cinfo->global_state = DSTATE_STOPPING;
-  } else if (cinfo->global_state == DSTATE_BUFIMAGE) {
-    /* Finishing after a buffered-image operation */
-    cinfo->global_state = DSTATE_STOPPING;
-  } else if (cinfo->global_state != DSTATE_STOPPING) {
-    /* STOPPING = repeat call after a suspension, anything else is error */
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  }
-  /* Read until EOI */
-  while (! cinfo->inputctl->eoi_reached) {
-    if ((*cinfo->inputctl->consume_input) (cinfo) == JPEG_SUSPENDED)
-      return FALSE;		/* Suspend, come back later */
-  }
-  /* Do final cleanup */
-  (*cinfo->src->term_source) (cinfo);
-  /* We can use jpeg_abort to release memory and reset global_state */
-  jpeg_abort((j_common_ptr) cinfo);
-  return TRUE;
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdapistd.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdapistd.c
deleted file mode 100644
index 9c995b4d87..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdapistd.c
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * jdapistd.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains application interface code for the decompression half
- * of the JPEG library.  These are the "standard" API routines that are
- * used in the normal full-decompression case.  They are not used by a
- * transcoding-only application.  Note that if an application links in
- * jpeg_start_decompress, it will end up linking in the entire decompressor.
- * We thus must separate this file from jdapimin.c to avoid linking the
- * whole decompression library into a transcoder.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Forward declarations */
-LOCAL(wxjpeg_boolean) output_pass_setup JPP((j_decompress_ptr cinfo));
-
-
-/*
- * Decompression initialization.
- * jpeg_read_header must be completed before calling this.
- *
- * If a multipass operating mode was selected, this will do all but the
- * last pass, and thus may take a great deal of time.
- *
- * Returns FALSE if suspended.  The return value need be inspected only if
- * a suspending data source is used.
- */
-
-GLOBAL(wxjpeg_boolean)
-jpeg_start_decompress (j_decompress_ptr cinfo)
-{
-  if (cinfo->global_state == DSTATE_READY) {
-    /* First call: initialize master control, select active modules */
-    jinit_master_decompress(cinfo);
-    if (cinfo->buffered_image) {
-      /* No more work here; expecting jpeg_start_output next */
-      cinfo->global_state = DSTATE_BUFIMAGE;
-      return TRUE;
-    }
-    cinfo->global_state = DSTATE_PRELOAD;
-  }
-  if (cinfo->global_state == DSTATE_PRELOAD) {
-    /* If file has multiple scans, absorb them all into the coef buffer */
-    if (cinfo->inputctl->has_multiple_scans) {
-#ifdef D_MULTISCAN_FILES_SUPPORTED
-      for (;;) {
-	int retcode;
-	/* Call progress monitor hook if present */
-	if (cinfo->progress != NULL)
-	  (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-	/* Absorb some more input */
-	retcode = (*cinfo->inputctl->consume_input) (cinfo);
-	if (retcode == JPEG_SUSPENDED)
-	  return FALSE;
-	if (retcode == JPEG_REACHED_EOI)
-	  break;
-	/* Advance progress counter if appropriate */
-	if (cinfo->progress != NULL &&
-	    (retcode == JPEG_ROW_COMPLETED || retcode == JPEG_REACHED_SOS)) {
-	  if (++cinfo->progress->pass_counter >= cinfo->progress->pass_limit) {
-	    /* jdmaster underestimated number of scans; ratchet up one scan */
-	    cinfo->progress->pass_limit += (long) cinfo->total_iMCU_rows;
-	  }
-	}
-      }
-#else
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif /* D_MULTISCAN_FILES_SUPPORTED */
-    }
-    cinfo->output_scan_number = cinfo->input_scan_number;
-  } else if (cinfo->global_state != DSTATE_PRESCAN)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  /* Perform any dummy output passes, and set up for the final pass */
-  return output_pass_setup(cinfo);
-}
-
-
-/*
- * Set up for an output pass, and perform any dummy pass(es) needed.
- * Common subroutine for jpeg_start_decompress and jpeg_start_output.
- * Entry: global_state = DSTATE_PRESCAN only if previously suspended.
- * Exit: If done, returns TRUE and sets global_state for proper output mode.
- *       If suspended, returns FALSE and sets global_state = DSTATE_PRESCAN.
- */
-
-LOCAL(wxjpeg_boolean)
-output_pass_setup (j_decompress_ptr cinfo)
-{
-  if (cinfo->global_state != DSTATE_PRESCAN) {
-    /* First call: do pass setup */
-    (*cinfo->master->prepare_for_output_pass) (cinfo);
-    cinfo->output_scanline = 0;
-    cinfo->global_state = DSTATE_PRESCAN;
-  }
-  /* Loop over any required dummy passes */
-  while (cinfo->master->is_dummy_pass) {
-#ifdef QUANT_2PASS_SUPPORTED
-    /* Crank through the dummy pass */
-    while (cinfo->output_scanline < cinfo->output_height) {
-      JDIMENSION last_scanline;
-      /* Call progress monitor hook if present */
-      if (cinfo->progress != NULL) {
-	cinfo->progress->pass_counter = (long) cinfo->output_scanline;
-	cinfo->progress->pass_limit = (long) cinfo->output_height;
-	(*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-      }
-      /* Process some data */
-      last_scanline = cinfo->output_scanline;
-      (*cinfo->main->process_data) (cinfo, (JSAMPARRAY) NULL,
-				    &cinfo->output_scanline, (JDIMENSION) 0);
-      if (cinfo->output_scanline == last_scanline)
-	return FALSE;		/* No progress made, must suspend */
-    }
-    /* Finish up dummy pass, and set up for another one */
-    (*cinfo->master->finish_output_pass) (cinfo);
-    (*cinfo->master->prepare_for_output_pass) (cinfo);
-    cinfo->output_scanline = 0;
-#else
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif /* QUANT_2PASS_SUPPORTED */
-  }
-  /* Ready for application to drive output pass through
-   * jpeg_read_scanlines or jpeg_read_raw_data.
-   */
-  cinfo->global_state = cinfo->raw_data_out ? DSTATE_RAW_OK : DSTATE_SCANNING;
-  return TRUE;
-}
-
-
-/*
- * Read some scanlines of data from the JPEG decompressor.
- *
- * The return value will be the number of lines actually read.
- * This may be less than the number requested in several cases,
- * including bottom of image, data source suspension, and operating
- * modes that emit multiple scanlines at a time.
- *
- * Note: we warn about excess calls to jpeg_read_scanlines() since
- * this likely signals an application programmer error.  However,
- * an oversize buffer (max_lines > scanlines remaining) is not an error.
- */
-
-GLOBAL(JDIMENSION)
-jpeg_read_scanlines (j_decompress_ptr cinfo, JSAMPARRAY scanlines,
-		     JDIMENSION max_lines)
-{
-  JDIMENSION row_ctr;
-
-  if (cinfo->global_state != DSTATE_SCANNING)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  if (cinfo->output_scanline >= cinfo->output_height) {
-    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
-    return 0;
-  }
-
-  /* Call progress monitor hook if present */
-  if (cinfo->progress != NULL) {
-    cinfo->progress->pass_counter = (long) cinfo->output_scanline;
-    cinfo->progress->pass_limit = (long) cinfo->output_height;
-    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-  }
-
-  /* Process some data */
-  row_ctr = 0;
-  (*cinfo->main->process_data) (cinfo, scanlines, &row_ctr, max_lines);
-  cinfo->output_scanline += row_ctr;
-  return row_ctr;
-}
-
-
-/*
- * Alternate entry point to read raw data.
- * Processes exactly one iMCU row per call, unless suspended.
- */
-
-GLOBAL(JDIMENSION)
-jpeg_read_raw_data (j_decompress_ptr cinfo, JSAMPIMAGE data,
-		    JDIMENSION max_lines)
-{
-  JDIMENSION lines_per_iMCU_row;
-
-  if (cinfo->global_state != DSTATE_RAW_OK)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  if (cinfo->output_scanline >= cinfo->output_height) {
-    WARNMS(cinfo, JWRN_TOO_MUCH_DATA);
-    return 0;
-  }
-
-  /* Call progress monitor hook if present */
-  if (cinfo->progress != NULL) {
-    cinfo->progress->pass_counter = (long) cinfo->output_scanline;
-    cinfo->progress->pass_limit = (long) cinfo->output_height;
-    (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-  }
-
-  /* Verify that at least one iMCU row can be returned. */
-  lines_per_iMCU_row = cinfo->max_v_samp_factor * cinfo->min_DCT_scaled_size;
-  if (max_lines < lines_per_iMCU_row)
-    ERREXIT(cinfo, JERR_BUFFER_SIZE);
-
-  /* Decompress directly into user's buffer. */
-  if (! (*cinfo->coef->decompress_data) (cinfo, data))
-    return 0;			/* suspension forced, can do nothing more */
-
-  /* OK, we processed one iMCU row. */
-  cinfo->output_scanline += lines_per_iMCU_row;
-  return lines_per_iMCU_row;
-}
-
-
-/* Additional entry points for buffered-image mode. */
-
-#ifdef D_MULTISCAN_FILES_SUPPORTED
-
-/*
- * Initialize for an output pass in buffered-image mode.
- */
-
-GLOBAL(wxjpeg_boolean)
-jpeg_start_output (j_decompress_ptr cinfo, int scan_number)
-{
-  if (cinfo->global_state != DSTATE_BUFIMAGE &&
-      cinfo->global_state != DSTATE_PRESCAN)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  /* Limit scan number to valid range */
-  if (scan_number <= 0)
-    scan_number = 1;
-  if (cinfo->inputctl->eoi_reached &&
-      scan_number > cinfo->input_scan_number)
-    scan_number = cinfo->input_scan_number;
-  cinfo->output_scan_number = scan_number;
-  /* Perform any dummy output passes, and set up for the real pass */
-  return output_pass_setup(cinfo);
-}
-
-
-/*
- * Finish up after an output pass in buffered-image mode.
- *
- * Returns FALSE if suspended.  The return value need be inspected only if
- * a suspending data source is used.
- */
-
-GLOBAL(wxjpeg_boolean)
-jpeg_finish_output (j_decompress_ptr cinfo)
-{
-  if ((cinfo->global_state == DSTATE_SCANNING ||
-       cinfo->global_state == DSTATE_RAW_OK) && cinfo->buffered_image) {
-    /* Terminate this pass. */
-    /* We do not require the whole pass to have been completed. */
-    (*cinfo->master->finish_output_pass) (cinfo);
-    cinfo->global_state = DSTATE_BUFPOST;
-  } else if (cinfo->global_state != DSTATE_BUFPOST) {
-    /* BUFPOST = repeat call after a suspension, anything else is error */
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  }
-  /* Read markers looking for SOS or EOI */
-  while (cinfo->input_scan_number <= cinfo->output_scan_number &&
-	 ! cinfo->inputctl->eoi_reached) {
-    if ((*cinfo->inputctl->consume_input) (cinfo) == JPEG_SUSPENDED)
-      return FALSE;		/* Suspend, come back later */
-  }
-  cinfo->global_state = DSTATE_BUFIMAGE;
-  return TRUE;
-}
-
-#endif /* D_MULTISCAN_FILES_SUPPORTED */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdatadst.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdatadst.c
deleted file mode 100644
index 053431fa66..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdatadst.c
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * jdatadst.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains compression data destination routines for the case of
- * emitting JPEG data to a file (or any stdio stream).  While these routines
- * are sufficient for most applications, some will want to use a different
- * destination manager.
- * IMPORTANT: we assume that fwrite() will correctly transcribe an array of
- * JOCTETs into 8-bit-wide elements on external storage.  If char is wider
- * than 8 bits on your machine, you may need to do some tweaking.
- */
-
-/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jerror.h"
-
-
-/* Expanded data destination object for stdio output */
-
-typedef struct {
-  struct jpeg_destination_mgr pub; /* public fields */
-
-  FILE * outfile;		/* target stream */
-  JOCTET * buffer;		/* start of buffer */
-} my_destination_mgr;
-
-typedef my_destination_mgr * my_dest_ptr;
-
-#define OUTPUT_BUF_SIZE  4096	/* choose an efficiently fwrite'able size */
-
-
-/*
- * Initialize destination --- called by jpeg_start_compress
- * before any data is actually written.
- */
-
-METHODDEF(void)
-init_destination (j_compress_ptr cinfo)
-{
-  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
-
-  /* Allocate the output buffer --- it will be released when done with image */
-  dest->buffer = (JOCTET *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  OUTPUT_BUF_SIZE * SIZEOF(JOCTET));
-
-  dest->pub.next_output_byte = dest->buffer;
-  dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
-}
-
-
-/*
- * Empty the output buffer --- called whenever buffer fills up.
- *
- * In typical applications, this should write the entire output buffer
- * (ignoring the current state of next_output_byte & free_in_buffer),
- * reset the pointer & count to the start of the buffer, and return TRUE
- * indicating that the buffer has been dumped.
- *
- * In applications that need to be able to suspend compression due to output
- * overrun, a FALSE return indicates that the buffer cannot be emptied now.
- * In this situation, the compressor will return to its caller (possibly with
- * an indication that it has not accepted all the supplied scanlines).  The
- * application should resume compression after it has made more room in the
- * output buffer.  Note that there are substantial restrictions on the use of
- * suspension --- see the documentation.
- *
- * When suspending, the compressor will back up to a convenient restart point
- * (typically the start of the current MCU). next_output_byte & free_in_buffer
- * indicate where the restart point will be if the current call returns FALSE.
- * Data beyond this point will be regenerated after resumption, so do not
- * write it out when emptying the buffer externally.
- */
-
-METHODDEF(wxjpeg_boolean)
-empty_output_buffer (j_compress_ptr cinfo)
-{
-  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
-
-  if (JFWRITE(dest->outfile, dest->buffer, OUTPUT_BUF_SIZE) !=
-      (size_t) OUTPUT_BUF_SIZE)
-    ERREXIT(cinfo, JERR_FILE_WRITE);
-
-  dest->pub.next_output_byte = dest->buffer;
-  dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
-
-  return TRUE;
-}
-
-
-/*
- * Terminate destination --- called by jpeg_finish_compress
- * after all data has been written.  Usually needs to flush buffer.
- *
- * NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
- * application must deal with any cleanup that should happen even
- * for error exit.
- */
-
-METHODDEF(void)
-term_destination (j_compress_ptr cinfo)
-{
-  my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
-  size_t datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer;
-
-  /* Write any data remaining in the buffer */
-  if (datacount > 0) {
-    if (JFWRITE(dest->outfile, dest->buffer, datacount) != datacount)
-      ERREXIT(cinfo, JERR_FILE_WRITE);
-  }
-  fflush(dest->outfile);
-  /* Make sure we wrote the output file OK */
-  if (ferror(dest->outfile))
-    ERREXIT(cinfo, JERR_FILE_WRITE);
-}
-
-
-/*
- * Prepare for output to a stdio stream.
- * The caller must have already opened the stream, and is responsible
- * for closing it after finishing compression.
- */
-
-GLOBAL(void)
-jpeg_stdio_dest (j_compress_ptr cinfo, FILE * outfile)
-{
-  my_dest_ptr dest;
-
-  /* The destination object is made permanent so that multiple JPEG images
-   * can be written to the same file without re-executing jpeg_stdio_dest.
-   * This makes it dangerous to use this manager and a different destination
-   * manager serially with the same JPEG object, because their private object
-   * sizes may be different.  Caveat programmer.
-   */
-  if (cinfo->dest == NULL) {	/* first time for this JPEG object? */
-    cinfo->dest = (struct jpeg_destination_mgr *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-				  SIZEOF(my_destination_mgr));
-  }
-
-  dest = (my_dest_ptr) cinfo->dest;
-  dest->pub.init_destination = init_destination;
-  dest->pub.empty_output_buffer = empty_output_buffer;
-  dest->pub.term_destination = term_destination;
-  dest->outfile = outfile;
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdatasrc.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdatasrc.c
deleted file mode 100644
index 09a43300aa..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdatasrc.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * jdatasrc.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains decompression data source routines for the case of
- * reading JPEG data from a file (or any stdio stream).  While these routines
- * are sufficient for most applications, some will want to use a different
- * source manager.
- * IMPORTANT: we assume that fread() will correctly transcribe an array of
- * JOCTETs from 8-bit-wide elements on external storage.  If char is wider
- * than 8 bits on your machine, you may need to do some tweaking.
- */
-
-/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jerror.h"
-
-
-/* Expanded data source object for stdio input */
-
-typedef struct {
-  struct jpeg_source_mgr pub;	/* public fields */
-
-  FILE * infile;		/* source stream */
-  JOCTET * buffer;		/* start of buffer */
-  wxjpeg_boolean start_of_file;	/* have we gotten any data yet? */
-} my_source_mgr;
-
-typedef my_source_mgr * my_src_ptr;
-
-#define INPUT_BUF_SIZE  4096	/* choose an efficiently fread'able size */
-
-
-/*
- * Initialize source --- called by jpeg_read_header
- * before any data is actually read.
- */
-
-METHODDEF(void)
-init_source (j_decompress_ptr cinfo)
-{
-  my_src_ptr src = (my_src_ptr) cinfo->src;
-
-  /* We reset the empty-input-file flag for each image,
-   * but we don't clear the input buffer.
-   * This is correct behavior for reading a series of images from one source.
-   */
-  src->start_of_file = TRUE;
-}
-
-
-/*
- * Fill the input buffer --- called whenever buffer is emptied.
- *
- * In typical applications, this should read fresh data into the buffer
- * (ignoring the current state of next_input_byte & bytes_in_buffer),
- * reset the pointer & count to the start of the buffer, and return TRUE
- * indicating that the buffer has been reloaded.  It is not necessary to
- * fill the buffer entirely, only to obtain at least one more byte.
- *
- * There is no such thing as an EOF return.  If the end of the file has been
- * reached, the routine has a choice of ERREXIT() or inserting fake data into
- * the buffer.  In most cases, generating a warning message and inserting a
- * fake EOI marker is the best course of action --- this will allow the
- * decompressor to output however much of the image is there.  However,
- * the resulting error message is misleading if the real problem is an empty
- * input file, so we handle that case specially.
- *
- * In applications that need to be able to suspend compression due to input
- * not being available yet, a FALSE return indicates that no more data can be
- * obtained right now, but more may be forthcoming later.  In this situation,
- * the decompressor will return to its caller (with an indication of the
- * number of scanlines it has read, if any).  The application should resume
- * decompression after it has loaded more data into the input buffer.  Note
- * that there are substantial restrictions on the use of suspension --- see
- * the documentation.
- *
- * When suspending, the decompressor will back up to a convenient restart point
- * (typically the start of the current MCU). next_input_byte & bytes_in_buffer
- * indicate where the restart point will be if the current call returns FALSE.
- * Data beyond this point must be rescanned after resumption, so move it to
- * the front of the buffer rather than discarding it.
- */
-
-METHODDEF(wxjpeg_boolean)
-fill_input_buffer (j_decompress_ptr cinfo)
-{
-  my_src_ptr src = (my_src_ptr) cinfo->src;
-  size_t nbytes;
-
-  nbytes = JFREAD(src->infile, src->buffer, INPUT_BUF_SIZE);
-
-  if (nbytes <= 0) {
-    if (src->start_of_file)	/* Treat empty input file as fatal error */
-      ERREXIT(cinfo, JERR_INPUT_EMPTY);
-    WARNMS(cinfo, JWRN_JPEG_EOF);
-    /* Insert a fake EOI marker */
-    src->buffer[0] = (JOCTET) 0xFF;
-    src->buffer[1] = (JOCTET) JPEG_EOI;
-    nbytes = 2;
-  }
-
-  src->pub.next_input_byte = src->buffer;
-  src->pub.bytes_in_buffer = nbytes;
-  src->start_of_file = FALSE;
-
-  return TRUE;
-}
-
-
-/*
- * Skip data --- used to skip over a potentially large amount of
- * uninteresting data (such as an APPn marker).
- *
- * Writers of suspendable-input applications must note that skip_input_data
- * is not granted the right to give a suspension return.  If the skip extends
- * beyond the data currently in the buffer, the buffer can be marked empty so
- * that the next read will cause a fill_input_buffer call that can suspend.
- * Arranging for additional bytes to be discarded before reloading the input
- * buffer is the application writer's problem.
- */
-
-METHODDEF(void)
-skip_input_data (j_decompress_ptr cinfo, long num_bytes)
-{
-  my_src_ptr src = (my_src_ptr) cinfo->src;
-
-  /* Just a dumb implementation for now.  Could use fseek() except
-   * it doesn't work on pipes.  Not clear that being smart is worth
-   * any trouble anyway --- large skips are infrequent.
-   */
-  if (num_bytes > 0) {
-    while (num_bytes > (long) src->pub.bytes_in_buffer) {
-      num_bytes -= (long) src->pub.bytes_in_buffer;
-      (void) fill_input_buffer(cinfo);
-      /* note we assume that fill_input_buffer will never return FALSE,
-       * so suspension need not be handled.
-       */
-    }
-    src->pub.next_input_byte += (size_t) num_bytes;
-    src->pub.bytes_in_buffer -= (size_t) num_bytes;
-  }
-}
-
-
-/*
- * An additional method that can be provided by data source modules is the
- * resync_to_restart method for error recovery in the presence of RST markers.
- * For the moment, this source module just uses the default resync method
- * provided by the JPEG library.  That method assumes that no backtracking
- * is possible.
- */
-
-
-/*
- * Terminate source --- called by jpeg_finish_decompress
- * after all data has been read.  Often a no-op.
- *
- * NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
- * application must deal with any cleanup that should happen even
- * for error exit.
- */
-
-METHODDEF(void)
-term_source (j_decompress_ptr cinfo)
-{
-  /* no work necessary here */
-}
-
-
-/*
- * Prepare for input from a stdio stream.
- * The caller must have already opened the stream, and is responsible
- * for closing it after finishing decompression.
- */
-
-GLOBAL(void)
-jpeg_stdio_src (j_decompress_ptr cinfo, FILE * infile)
-{
-  my_src_ptr src;
-
-  /* The source object and input buffer are made permanent so that a series
-   * of JPEG images can be read from the same file by calling jpeg_stdio_src
-   * only before the first one.  (If we discarded the buffer at the end of
-   * one image, we'd likely lose the start of the next one.)
-   * This makes it unsafe to use this manager and a different source
-   * manager serially with the same JPEG object.  Caveat programmer.
-   */
-  if (cinfo->src == NULL) {	/* first time for this JPEG object? */
-    cinfo->src = (struct jpeg_source_mgr *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-				  SIZEOF(my_source_mgr));
-    src = (my_src_ptr) cinfo->src;
-    src->buffer = (JOCTET *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-				  INPUT_BUF_SIZE * SIZEOF(JOCTET));
-  }
-
-  src = (my_src_ptr) cinfo->src;
-  src->pub.init_source = init_source;
-  src->pub.fill_input_buffer = fill_input_buffer;
-  src->pub.skip_input_data = skip_input_data;
-  src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
-  src->pub.term_source = term_source;
-  src->infile = infile;
-  src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */
-  src->pub.next_input_byte = NULL; /* until buffer loaded */
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdcoefct.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdcoefct.c
deleted file mode 100644
index e5c3636e46..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdcoefct.c
+++ /dev/null
@@ -1,745 +0,0 @@
-/*
- * jdcoefct.c
- *
- * Copyright (C) 1994-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the coefficient buffer controller for decompression.
- * This controller is the top level of the JPEG decompressor proper.
- * The coefficient buffer lies between entropy decoding and inverse-DCT steps.
- *
- * In buffered-image mode, this controller is the interface between
- * input-oriented processing and output-oriented processing.
- * Also, the input side (only) is used when reading a file for transcoding.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-/* Block smoothing is only applicable for progressive JPEG, so: */
-#ifndef D_PROGRESSIVE_SUPPORTED
-#undef BLOCK_SMOOTHING_SUPPORTED
-#endif
-
-/* Private buffer controller object */
-
-typedef struct {
-  struct jpeg_d_coef_controller pub; /* public fields */
-
-  /* These variables keep track of the current location of the input side. */
-  /* cinfo->input_iMCU_row is also used for this. */
-  JDIMENSION MCU_ctr;		/* counts MCUs processed in current row */
-  int MCU_vert_offset;		/* counts MCU rows within iMCU row */
-  int MCU_rows_per_iMCU_row;	/* number of such rows needed */
-
-  /* The output side's location is represented by cinfo->output_iMCU_row. */
-
-  /* In single-pass modes, it's sufficient to buffer just one MCU.
-   * We allocate a workspace of D_MAX_BLOCKS_IN_MCU coefficient blocks,
-   * and let the entropy decoder write into that workspace each time.
-   * (On 80x86, the workspace is FAR even though it's not really very big;
-   * this is to keep the module interfaces unchanged when a large coefficient
-   * buffer is necessary.)
-   * In multi-pass modes, this array points to the current MCU's blocks
-   * within the virtual arrays; it is used only by the input side.
-   */
-  JBLOCKROW MCU_buffer[D_MAX_BLOCKS_IN_MCU];
-
-#ifdef D_MULTISCAN_FILES_SUPPORTED
-  /* In multi-pass modes, we need a virtual block array for each component. */
-  jvirt_barray_ptr whole_image[MAX_COMPONENTS];
-#endif
-
-#ifdef BLOCK_SMOOTHING_SUPPORTED
-  /* When doing block smoothing, we latch coefficient Al values here */
-  int * coef_bits_latch;
-#define SAVED_COEFS  6		/* we save coef_bits[0..5] */
-#endif
-} my_coef_controller;
-
-typedef my_coef_controller * my_coef_ptr;
-
-/* Forward declarations */
-METHODDEF(int) decompress_onepass
-	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
-#ifdef D_MULTISCAN_FILES_SUPPORTED
-METHODDEF(int) decompress_data
-	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
-#endif
-#ifdef BLOCK_SMOOTHING_SUPPORTED
-LOCAL(wxjpeg_boolean) smoothing_ok JPP((j_decompress_ptr cinfo));
-METHODDEF(int) decompress_smooth_data
-	JPP((j_decompress_ptr cinfo, JSAMPIMAGE output_buf));
-#endif
-
-
-LOCAL(void)
-start_iMCU_row (j_decompress_ptr cinfo)
-/* Reset within-iMCU-row counters for a new row (input side) */
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-
-  /* In an interleaved scan, an MCU row is the same as an iMCU row.
-   * In a noninterleaved scan, an iMCU row has v_samp_factor MCU rows.
-   * But at the bottom of the image, process only what's left.
-   */
-  if (cinfo->comps_in_scan > 1) {
-    coef->MCU_rows_per_iMCU_row = 1;
-  } else {
-    if (cinfo->input_iMCU_row < (cinfo->total_iMCU_rows-1))
-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->v_samp_factor;
-    else
-      coef->MCU_rows_per_iMCU_row = cinfo->cur_comp_info[0]->last_row_height;
-  }
-
-  coef->MCU_ctr = 0;
-  coef->MCU_vert_offset = 0;
-}
-
-
-/*
- * Initialize for an input processing pass.
- */
-
-METHODDEF(void)
-#if defined(__VISAGECPP__)
-start_input_pass2 (j_decompress_ptr cinfo)
-#else
-start_input_pass (j_decompress_ptr cinfo)
-#endif
-{
-  cinfo->input_iMCU_row = 0;
-  start_iMCU_row(cinfo);
-}
-
-/*
- * Initialize for an output processing pass.
- */
-
-METHODDEF(void)
-start_output_pass (j_decompress_ptr cinfo)
-{
-#ifdef BLOCK_SMOOTHING_SUPPORTED
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-
-  /* If multipass, check to see whether to use block smoothing on this pass */
-  if (coef->pub.coef_arrays != NULL) {
-    if (cinfo->do_block_smoothing && smoothing_ok(cinfo))
-      coef->pub.decompress_data = decompress_smooth_data;
-    else
-      coef->pub.decompress_data = decompress_data;
-  }
-#endif
-  cinfo->output_iMCU_row = 0;
-}
-
-
-/*
- * Decompress and return some data in the single-pass case.
- * Always attempts to emit one fully interleaved MCU row ("iMCU" row).
- * Input and output must run in lockstep since we have only a one-MCU buffer.
- * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.
- *
- * NB: output_buf contains a plane for each component in image,
- * which we index according to the component's SOF position.
- */
-
-METHODDEF(int)
-decompress_onepass (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION MCU_col_num;	/* index of current MCU within row */
-  JDIMENSION last_MCU_col = cinfo->MCUs_per_row - 1;
-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
-  int blkn, ci, xindex, yindex, yoffset, useful_width;
-  JSAMPARRAY output_ptr;
-  JDIMENSION start_col, output_col;
-  jpeg_component_info *compptr;
-  inverse_DCT_method_ptr inverse_DCT;
-
-  /* Loop to process as much as one whole iMCU row */
-  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
-       yoffset++) {
-    for (MCU_col_num = coef->MCU_ctr; MCU_col_num <= last_MCU_col;
-	 MCU_col_num++) {
-      /* Try to fetch an MCU.  Entropy decoder expects buffer to be zeroed. */
-      jzero_far((void FAR *) coef->MCU_buffer[0],
-		(size_t) (cinfo->blocks_in_MCU * SIZEOF(JBLOCK)));
-      if (! (*cinfo->entropy->decode_mcu) (cinfo, coef->MCU_buffer)) {
-	/* Suspension forced; update state counters and exit */
-	coef->MCU_vert_offset = yoffset;
-	coef->MCU_ctr = MCU_col_num;
-	return JPEG_SUSPENDED;
-      }
-      /* Determine where data should go in output_buf and do the IDCT thing.
-       * We skip dummy blocks at the right and bottom edges (but blkn gets
-       * incremented past them!).  Note the inner loop relies on having
-       * allocated the MCU_buffer[] blocks sequentially.
-       */
-      blkn = 0;			/* index of current DCT block within MCU */
-      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-	compptr = cinfo->cur_comp_info[ci];
-	/* Don't bother to IDCT an uninteresting component. */
-	if (! compptr->component_needed) {
-	  blkn += compptr->MCU_blocks;
-	  continue;
-	}
-	inverse_DCT = cinfo->idct->inverse_DCT[compptr->component_index];
-	useful_width = (MCU_col_num < last_MCU_col) ? compptr->MCU_width
-						    : compptr->last_col_width;
-	output_ptr = output_buf[compptr->component_index] +
-	  yoffset * compptr->DCT_scaled_size;
-	start_col = MCU_col_num * compptr->MCU_sample_width;
-	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
-	  if (cinfo->input_iMCU_row < last_iMCU_row ||
-	      yoffset+yindex < compptr->last_row_height) {
-	    output_col = start_col;
-	    for (xindex = 0; xindex < useful_width; xindex++) {
-	      (*inverse_DCT) (cinfo, compptr,
-			      (JCOEFPTR) coef->MCU_buffer[blkn+xindex],
-			      output_ptr, output_col);
-	      output_col += compptr->DCT_scaled_size;
-	    }
-	  }
-	  blkn += compptr->MCU_width;
-	  output_ptr += compptr->DCT_scaled_size;
-	}
-      }
-    }
-    /* Completed an MCU row, but perhaps not an iMCU row */
-    coef->MCU_ctr = 0;
-  }
-  /* Completed the iMCU row, advance counters for next one */
-  cinfo->output_iMCU_row++;
-  if (++(cinfo->input_iMCU_row) < cinfo->total_iMCU_rows) {
-    start_iMCU_row(cinfo);
-    return JPEG_ROW_COMPLETED;
-  }
-  /* Completed the scan */
-  (*cinfo->inputctl->finish_input_pass) (cinfo);
-  return JPEG_SCAN_COMPLETED;
-}
-
-
-/*
- * Dummy consume-input routine for single-pass operation.
- */
-
-METHODDEF(int)
-dummy_consume_data (j_decompress_ptr cinfo)
-{
-  return JPEG_SUSPENDED;	/* Always indicate nothing was done */
-}
-
-
-#ifdef D_MULTISCAN_FILES_SUPPORTED
-
-/*
- * Consume input data and store it in the full-image coefficient buffer.
- * We read as much as one fully interleaved MCU row ("iMCU" row) per call,
- * ie, v_samp_factor block rows for each component in the scan.
- * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.
- */
-
-METHODDEF(int)
-consume_data (j_decompress_ptr cinfo)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION MCU_col_num;	/* index of current MCU within row */
-  int blkn, ci, xindex, yindex, yoffset;
-  JDIMENSION start_col;
-  JBLOCKARRAY buffer[MAX_COMPS_IN_SCAN];
-  JBLOCKROW buffer_ptr;
-  jpeg_component_info *compptr;
-
-  /* Align the virtual buffers for the components used in this scan. */
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    buffer[ci] = (*cinfo->mem->access_virt_barray)
-      ((j_common_ptr) cinfo, coef->whole_image[compptr->component_index],
-       cinfo->input_iMCU_row * compptr->v_samp_factor,
-       (JDIMENSION) compptr->v_samp_factor, TRUE);
-    /* Note: entropy decoder expects buffer to be zeroed,
-     * but this is handled automatically by the memory manager
-     * because we requested a pre-zeroed array.
-     */
-  }
-
-  /* Loop to process one whole iMCU row */
-  for (yoffset = coef->MCU_vert_offset; yoffset < coef->MCU_rows_per_iMCU_row;
-       yoffset++) {
-    for (MCU_col_num = coef->MCU_ctr; MCU_col_num < cinfo->MCUs_per_row;
-	 MCU_col_num++) {
-      /* Construct list of pointers to DCT blocks belonging to this MCU */
-      blkn = 0;			/* index of current DCT block within MCU */
-      for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-	compptr = cinfo->cur_comp_info[ci];
-	start_col = MCU_col_num * compptr->MCU_width;
-	for (yindex = 0; yindex < compptr->MCU_height; yindex++) {
-	  buffer_ptr = buffer[ci][yindex+yoffset] + start_col;
-	  for (xindex = 0; xindex < compptr->MCU_width; xindex++) {
-	    coef->MCU_buffer[blkn++] = buffer_ptr++;
-	  }
-	}
-      }
-      /* Try to fetch the MCU. */
-      if (! (*cinfo->entropy->decode_mcu) (cinfo, coef->MCU_buffer)) {
-	/* Suspension forced; update state counters and exit */
-	coef->MCU_vert_offset = yoffset;
-	coef->MCU_ctr = MCU_col_num;
-	return JPEG_SUSPENDED;
-      }
-    }
-    /* Completed an MCU row, but perhaps not an iMCU row */
-    coef->MCU_ctr = 0;
-  }
-  /* Completed the iMCU row, advance counters for next one */
-  if (++(cinfo->input_iMCU_row) < cinfo->total_iMCU_rows) {
-    start_iMCU_row(cinfo);
-    return JPEG_ROW_COMPLETED;
-  }
-  /* Completed the scan */
-  (*cinfo->inputctl->finish_input_pass) (cinfo);
-  return JPEG_SCAN_COMPLETED;
-}
-
-
-/*
- * Decompress and return some data in the multi-pass case.
- * Always attempts to emit one fully interleaved MCU row ("iMCU" row).
- * Return value is JPEG_ROW_COMPLETED, JPEG_SCAN_COMPLETED, or JPEG_SUSPENDED.
- *
- * NB: output_buf contains a plane for each component in image.
- */
-
-METHODDEF(int)
-decompress_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
-  JDIMENSION block_num;
-  int ci, block_row, block_rows;
-  JBLOCKARRAY buffer;
-  JBLOCKROW buffer_ptr;
-  JSAMPARRAY output_ptr;
-  JDIMENSION output_col;
-  jpeg_component_info *compptr;
-  inverse_DCT_method_ptr inverse_DCT;
-
-  /* Force some input to be done if we are getting ahead of the input. */
-  while (cinfo->input_scan_number < cinfo->output_scan_number ||
-	 (cinfo->input_scan_number == cinfo->output_scan_number &&
-	  cinfo->input_iMCU_row <= cinfo->output_iMCU_row)) {
-    if ((*cinfo->inputctl->consume_input)(cinfo) == JPEG_SUSPENDED)
-      return JPEG_SUSPENDED;
-  }
-
-  /* OK, output from the virtual arrays. */
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Don't bother to IDCT an uninteresting component. */
-    if (! compptr->component_needed)
-      continue;
-    /* Align the virtual buffer for this component. */
-    buffer = (*cinfo->mem->access_virt_barray)
-      ((j_common_ptr) cinfo, coef->whole_image[ci],
-       cinfo->output_iMCU_row * compptr->v_samp_factor,
-       (JDIMENSION) compptr->v_samp_factor, FALSE);
-    /* Count non-dummy DCT block rows in this iMCU row. */
-    if (cinfo->output_iMCU_row < last_iMCU_row)
-      block_rows = compptr->v_samp_factor;
-    else {
-      /* NB: can't use last_row_height here; it is input-side-dependent! */
-      block_rows = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
-      if (block_rows == 0) block_rows = compptr->v_samp_factor;
-    }
-    inverse_DCT = cinfo->idct->inverse_DCT[ci];
-    output_ptr = output_buf[ci];
-    /* Loop over all DCT blocks to be processed. */
-    for (block_row = 0; block_row < block_rows; block_row++) {
-      buffer_ptr = buffer[block_row];
-      output_col = 0;
-      for (block_num = 0; block_num < compptr->width_in_blocks; block_num++) {
-	(*inverse_DCT) (cinfo, compptr, (JCOEFPTR) buffer_ptr,
-			output_ptr, output_col);
-	buffer_ptr++;
-	output_col += compptr->DCT_scaled_size;
-      }
-      output_ptr += compptr->DCT_scaled_size;
-    }
-  }
-
-  if (++(cinfo->output_iMCU_row) < cinfo->total_iMCU_rows)
-    return JPEG_ROW_COMPLETED;
-  return JPEG_SCAN_COMPLETED;
-}
-
-#endif /* D_MULTISCAN_FILES_SUPPORTED */
-
-
-#ifdef BLOCK_SMOOTHING_SUPPORTED
-
-/*
- * This code applies interblock smoothing as described by section K.8
- * of the JPEG standard: the first 5 AC coefficients are estimated from
- * the DC values of a DCT block and its 8 neighboring blocks.
- * We apply smoothing only for progressive JPEG decoding, and only if
- * the coefficients it can estimate are not yet known to full precision.
- */
-
-/* Natural-order array positions of the first 5 zigzag-order coefficients */
-#define Q01_POS  1
-#define Q10_POS  8
-#define Q20_POS  16
-#define Q11_POS  9
-#define Q02_POS  2
-
-/*
- * Determine whether block smoothing is applicable and safe.
- * We also latch the current states of the coef_bits[] entries for the
- * AC coefficients; otherwise, if the input side of the decompressor
- * advances into a new scan, we might think the coefficients are known
- * more accurately than they really are.
- */
-
-LOCAL(wxjpeg_boolean)
-smoothing_ok (j_decompress_ptr cinfo)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  wxjpeg_boolean smoothing_useful = FALSE;
-  int ci, coefi;
-  jpeg_component_info *compptr;
-  JQUANT_TBL * qtable;
-  int * coef_bits;
-  int * coef_bits_latch;
-
-  if (! cinfo->progressive_mode || cinfo->coef_bits == NULL)
-    return FALSE;
-
-  /* Allocate latch area if not already done */
-  if (coef->coef_bits_latch == NULL)
-    coef->coef_bits_latch = (int *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  cinfo->num_components *
-				  (SAVED_COEFS * SIZEOF(int)));
-  coef_bits_latch = coef->coef_bits_latch;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* All components' quantization values must already be latched. */
-    if ((qtable = compptr->quant_table) == NULL)
-      return FALSE;
-    /* Verify DC & first 5 AC quantizers are nonzero to avoid zero-divide. */
-    if (qtable->quantval[0] == 0 ||
-	qtable->quantval[Q01_POS] == 0 ||
-	qtable->quantval[Q10_POS] == 0 ||
-	qtable->quantval[Q20_POS] == 0 ||
-	qtable->quantval[Q11_POS] == 0 ||
-	qtable->quantval[Q02_POS] == 0)
-      return FALSE;
-    /* DC values must be at least partly known for all components. */
-    coef_bits = cinfo->coef_bits[ci];
-    if (coef_bits[0] < 0)
-      return FALSE;
-    /* Block smoothing is helpful if some AC coefficients remain inaccurate. */
-    for (coefi = 1; coefi <= 5; coefi++) {
-      coef_bits_latch[coefi] = coef_bits[coefi];
-      if (coef_bits[coefi] != 0)
-	smoothing_useful = TRUE;
-    }
-    coef_bits_latch += SAVED_COEFS;
-  }
-
-  return smoothing_useful;
-}
-
-
-/*
- * Variant of decompress_data for use when doing block smoothing.
- */
-
-METHODDEF(int)
-decompress_smooth_data (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
-{
-  my_coef_ptr coef = (my_coef_ptr) cinfo->coef;
-  JDIMENSION last_iMCU_row = cinfo->total_iMCU_rows - 1;
-  JDIMENSION block_num, last_block_column;
-  int ci, block_row, block_rows, access_rows;
-  JBLOCKARRAY buffer;
-  JBLOCKROW buffer_ptr, prev_block_row, next_block_row;
-  JSAMPARRAY output_ptr;
-  JDIMENSION output_col;
-  jpeg_component_info *compptr;
-  inverse_DCT_method_ptr inverse_DCT;
-  wxjpeg_boolean first_row, last_row;
-  JBLOCK workspace;
-  int *coef_bits;
-  JQUANT_TBL *quanttbl;
-  JPEG_INT32 Q00,Q01,Q02,Q10,Q11,Q20, num;
-  int DC1,DC2,DC3,DC4,DC5,DC6,DC7,DC8,DC9;
-  int Al, pred;
-
-  /* Force some input to be done if we are getting ahead of the input. */
-  while (cinfo->input_scan_number <= cinfo->output_scan_number &&
-	 ! cinfo->inputctl->eoi_reached) {
-    if (cinfo->input_scan_number == cinfo->output_scan_number) {
-      /* If input is working on current scan, we ordinarily want it to
-       * have completed the current row.  But if input scan is DC,
-       * we want it to keep one row ahead so that next block row's DC
-       * values are up to date.
-       */
-      JDIMENSION delta = (cinfo->Ss == 0) ? 1 : 0;
-      if (cinfo->input_iMCU_row > cinfo->output_iMCU_row+delta)
-	break;
-    }
-    if ((*cinfo->inputctl->consume_input)(cinfo) == JPEG_SUSPENDED)
-      return JPEG_SUSPENDED;
-  }
-
-  /* OK, output from the virtual arrays. */
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Don't bother to IDCT an uninteresting component. */
-    if (! compptr->component_needed)
-      continue;
-    /* Count non-dummy DCT block rows in this iMCU row. */
-    if (cinfo->output_iMCU_row < last_iMCU_row) {
-      block_rows = compptr->v_samp_factor;
-      access_rows = block_rows * 2; /* this and next iMCU row */
-      last_row = FALSE;
-    } else {
-      /* NB: can't use last_row_height here; it is input-side-dependent! */
-      block_rows = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
-      if (block_rows == 0) block_rows = compptr->v_samp_factor;
-      access_rows = block_rows; /* this iMCU row only */
-      last_row = TRUE;
-    }
-    /* Align the virtual buffer for this component. */
-    if (cinfo->output_iMCU_row > 0) {
-      access_rows += compptr->v_samp_factor; /* prior iMCU row too */
-      buffer = (*cinfo->mem->access_virt_barray)
-	((j_common_ptr) cinfo, coef->whole_image[ci],
-	 (cinfo->output_iMCU_row - 1) * compptr->v_samp_factor,
-	 (JDIMENSION) access_rows, FALSE);
-      buffer += compptr->v_samp_factor;	/* point to current iMCU row */
-      first_row = FALSE;
-    } else {
-      buffer = (*cinfo->mem->access_virt_barray)
-	((j_common_ptr) cinfo, coef->whole_image[ci],
-	 (JDIMENSION) 0, (JDIMENSION) access_rows, FALSE);
-      first_row = TRUE;
-    }
-    /* Fetch component-dependent info */
-    coef_bits = coef->coef_bits_latch + (ci * SAVED_COEFS);
-    quanttbl = compptr->quant_table;
-    Q00 = quanttbl->quantval[0];
-    Q01 = quanttbl->quantval[Q01_POS];
-    Q10 = quanttbl->quantval[Q10_POS];
-    Q20 = quanttbl->quantval[Q20_POS];
-    Q11 = quanttbl->quantval[Q11_POS];
-    Q02 = quanttbl->quantval[Q02_POS];
-    inverse_DCT = cinfo->idct->inverse_DCT[ci];
-    output_ptr = output_buf[ci];
-    /* Loop over all DCT blocks to be processed. */
-    for (block_row = 0; block_row < block_rows; block_row++) {
-      buffer_ptr = buffer[block_row];
-      if (first_row && block_row == 0)
-	prev_block_row = buffer_ptr;
-      else
-	prev_block_row = buffer[block_row-1];
-      if (last_row && block_row == block_rows-1)
-	next_block_row = buffer_ptr;
-      else
-	next_block_row = buffer[block_row+1];
-      /* We fetch the surrounding DC values using a sliding-register approach.
-       * Initialize all nine here so as to do the right thing on narrow pics.
-       */
-      DC1 = DC2 = DC3 = (int) prev_block_row[0][0];
-      DC4 = DC5 = DC6 = (int) buffer_ptr[0][0];
-      DC7 = DC8 = DC9 = (int) next_block_row[0][0];
-      output_col = 0;
-      last_block_column = compptr->width_in_blocks - 1;
-      for (block_num = 0; block_num <= last_block_column; block_num++) {
-	/* Fetch current DCT block into workspace so we can modify it. */
-	jcopy_block_row(buffer_ptr, (JBLOCKROW) workspace, (JDIMENSION) 1);
-	/* Update DC values */
-	if (block_num < last_block_column) {
-	  DC3 = (int) prev_block_row[1][0];
-	  DC6 = (int) buffer_ptr[1][0];
-	  DC9 = (int) next_block_row[1][0];
-	}
-	/* Compute coefficient estimates per K.8.
-	 * An estimate is applied only if coefficient is still zero,
-	 * and is not known to be fully accurate.
-	 */
-	/* AC01 */
-	if ((Al=coef_bits[1]) != 0 && workspace[1] == 0) {
-	  num = 36 * Q00 * (DC4 - DC6);
-	  if (num >= 0) {
-	    pred = (int) (((Q01<<7) + num) / (Q01<<8));
-	    if (Al > 0 && pred >= (1< 0 && pred >= (1<= 0) {
-	    pred = (int) (((Q10<<7) + num) / (Q10<<8));
-	    if (Al > 0 && pred >= (1< 0 && pred >= (1<= 0) {
-	    pred = (int) (((Q20<<7) + num) / (Q20<<8));
-	    if (Al > 0 && pred >= (1< 0 && pred >= (1<= 0) {
-	    pred = (int) (((Q11<<7) + num) / (Q11<<8));
-	    if (Al > 0 && pred >= (1< 0 && pred >= (1<= 0) {
-	    pred = (int) (((Q02<<7) + num) / (Q02<<8));
-	    if (Al > 0 && pred >= (1< 0 && pred >= (1<DCT_scaled_size;
-      }
-      output_ptr += compptr->DCT_scaled_size;
-    }
-  }
-
-  if (++(cinfo->output_iMCU_row) < cinfo->total_iMCU_rows)
-    return JPEG_ROW_COMPLETED;
-  return JPEG_SCAN_COMPLETED;
-}
-
-#endif /* BLOCK_SMOOTHING_SUPPORTED */
-
-
-/*
- * Initialize coefficient buffer controller.
- */
-
-GLOBAL(void)
-jinit_d_coef_controller (j_decompress_ptr cinfo, wxjpeg_boolean need_full_buffer)
-{
-  my_coef_ptr coef;
-
-  coef = (my_coef_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_coef_controller));
-  cinfo->coef = (struct jpeg_d_coef_controller *) coef;
-#if defined(__VISAGECPP__)
-  coef->pub.start_input_pass2 = start_input_pass2;
-#else
-  coef->pub.start_input_pass = start_input_pass;
-#endif
-
-  coef->pub.start_output_pass = start_output_pass;
-#ifdef BLOCK_SMOOTHING_SUPPORTED
-  coef->coef_bits_latch = NULL;
-#endif
-
-  /* Create the coefficient buffer. */
-  if (need_full_buffer) {
-#ifdef D_MULTISCAN_FILES_SUPPORTED
-    /* Allocate a full-image virtual array for each component, */
-    /* padded to a multiple of samp_factor DCT blocks in each direction. */
-    /* Note we ask for a pre-zeroed array. */
-    int ci, access_rows;
-    jpeg_component_info *compptr;
-
-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	 ci++, compptr++) {
-      access_rows = compptr->v_samp_factor;
-#ifdef BLOCK_SMOOTHING_SUPPORTED
-      /* If block smoothing could be used, need a bigger window */
-      if (cinfo->progressive_mode)
-	access_rows *= 3;
-#endif
-      coef->whole_image[ci] = (*cinfo->mem->request_virt_barray)
-	((j_common_ptr) cinfo, JPOOL_IMAGE, TRUE,
-	 (JDIMENSION) jround_up((long) compptr->width_in_blocks,
-				(long) compptr->h_samp_factor),
-	 (JDIMENSION) jround_up((long) compptr->height_in_blocks,
-				(long) compptr->v_samp_factor),
-	 (JDIMENSION) access_rows);
-    }
-    coef->pub.consume_data = consume_data;
-    coef->pub.decompress_data = decompress_data;
-    coef->pub.coef_arrays = coef->whole_image; /* link to virtual arrays */
-#else
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-  } else {
-    /* We only need a single-MCU buffer. */
-    JBLOCKROW buffer;
-    int i;
-
-    buffer = (JBLOCKROW)
-      (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  D_MAX_BLOCKS_IN_MCU * SIZEOF(JBLOCK));
-    for (i = 0; i < D_MAX_BLOCKS_IN_MCU; i++) {
-      coef->MCU_buffer[i] = buffer + i;
-    }
-    coef->pub.consume_data = dummy_consume_data;
-    coef->pub.decompress_data = decompress_onepass;
-    coef->pub.coef_arrays = NULL; /* flag for no virtual arrays */
-  }
-}
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdcolor.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdcolor.c
deleted file mode 100644
index cca2842297..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdcolor.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/*
- * jdcolor.c
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains output colorspace conversion routines.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-#if defined(__VISAGECPP__)
-/* Visual Age fixups for multiple declarations */
-#  define null_convert   null_convert2 /* already in jcmaint.c */
-#  define grayscale_convert   grayscale_convert2 /* already in jcmaint.c */
-#endif
-
-/* Private subobject */
-
-typedef struct {
-  struct jpeg_color_deconverter pub; /* public fields */
-
-  /* Private state for YCC->RGB conversion */
-  int * Cr_r_tab;		/* => table for Cr to R conversion */
-  int * Cb_b_tab;		/* => table for Cb to B conversion */
-  JPEG_INT32 * Cr_g_tab;		/* => table for Cr to G conversion */
-  JPEG_INT32 * Cb_g_tab;		/* => table for Cb to G conversion */
-} my_color_deconverter;
-
-typedef my_color_deconverter * my_cconvert_ptr;
-
-
-/**************** YCbCr -> RGB conversion: most common case **************/
-
-/*
- * YCbCr is defined per CCIR 601-1, except that Cb and Cr are
- * normalized to the range 0..MAXJSAMPLE rather than -0.5 .. 0.5.
- * The conversion equations to be implemented are therefore
- *	R = Y                + 1.40200 * Cr
- *	G = Y - 0.34414 * Cb - 0.71414 * Cr
- *	B = Y + 1.77200 * Cb
- * where Cb and Cr represent the incoming values less CENTERJSAMPLE.
- * (These numbers are derived from TIFF 6.0 section 21, dated 3-June-92.)
- *
- * To avoid floating-point arithmetic, we represent the fractional constants
- * as integers scaled up by 2^16 (about 4 digits precision); we have to divide
- * the products by 2^16, with appropriate rounding, to get the correct answer.
- * Notice that Y, being an integral input, does not contribute any fraction
- * so it need not participate in the rounding.
- *
- * For even more speed, we avoid doing any multiplications in the inner loop
- * by precalculating the constants times Cb and Cr for all possible values.
- * For 8-bit JSAMPLEs this is very reasonable (only 256 entries per table);
- * for 12-bit samples it is still acceptable.  It's not very reasonable for
- * 16-bit samples, but if you want lossless storage you shouldn't be changing
- * colorspace anyway.
- * The Cr=>R and Cb=>B values can be rounded to integers in advance; the
- * values for the G calculation are left scaled up, since we must add them
- * together before rounding.
- */
-
-#define SCALEBITS	16	/* speediest right-shift on some machines */
-#define ONE_HALF	((JPEG_INT32) 1 << (SCALEBITS-1))
-#define FIX(x)		((JPEG_INT32) ((x) * (1L<RGB colorspace conversion.
- */
-
-LOCAL(void)
-build_ycc_rgb_table (j_decompress_ptr cinfo)
-{
-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
-  int i;
-  JPEG_INT32 x;
-  SHIFT_TEMPS
-
-  cconvert->Cr_r_tab = (int *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(MAXJSAMPLE+1) * SIZEOF(int));
-  cconvert->Cb_b_tab = (int *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(MAXJSAMPLE+1) * SIZEOF(int));
-  cconvert->Cr_g_tab = (JPEG_INT32 *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(MAXJSAMPLE+1) * SIZEOF(JPEG_INT32));
-  cconvert->Cb_g_tab = (JPEG_INT32 *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(MAXJSAMPLE+1) * SIZEOF(JPEG_INT32));
-
-  for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
-    /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */
-    /* The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE */
-    /* Cr=>R value is nearest int to 1.40200 * x */
-    cconvert->Cr_r_tab[i] = (int)
-		    RIGHT_SHIFT(FIX(1.40200) * x + ONE_HALF, SCALEBITS);
-    /* Cb=>B value is nearest int to 1.77200 * x */
-    cconvert->Cb_b_tab[i] = (int)
-		    RIGHT_SHIFT(FIX(1.77200) * x + ONE_HALF, SCALEBITS);
-    /* Cr=>G value is scaled-up -0.71414 * x */
-    cconvert->Cr_g_tab[i] = (- FIX(0.71414)) * x;
-    /* Cb=>G value is scaled-up -0.34414 * x */
-    /* We also add in ONE_HALF so that need not do it in inner loop */
-    cconvert->Cb_g_tab[i] = (- FIX(0.34414)) * x + ONE_HALF;
-  }
-}
-
-
-/*
- * Convert some rows of samples to the output colorspace.
- *
- * Note that we change from noninterleaved, one-plane-per-component format
- * to interleaved-pixel format.  The output buffer is therefore three times
- * as wide as the input buffer.
- * A starting row offset is provided only for the input buffer.  The caller
- * can easily adjust the passed output_buf value to accommodate any row
- * offset required on that side.
- */
-
-METHODDEF(void)
-ycc_rgb_convert (j_decompress_ptr cinfo,
-		 JSAMPIMAGE input_buf, JDIMENSION input_row,
-		 JSAMPARRAY output_buf, int num_rows)
-{
-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
-  register int y, cb, cr;
-  register JSAMPROW outptr;
-  register JSAMPROW inptr0, inptr1, inptr2;
-  register JDIMENSION col;
-  JDIMENSION num_cols = cinfo->output_width;
-  /* copy these pointers into registers if possible */
-  register JSAMPLE * range_limit = cinfo->sample_range_limit;
-  register int * Crrtab = cconvert->Cr_r_tab;
-  register int * Cbbtab = cconvert->Cb_b_tab;
-  register JPEG_INT32 * Crgtab = cconvert->Cr_g_tab;
-  register JPEG_INT32 * Cbgtab = cconvert->Cb_g_tab;
-  SHIFT_TEMPS
-
-  while (--num_rows >= 0) {
-    inptr0 = input_buf[0][input_row];
-    inptr1 = input_buf[1][input_row];
-    inptr2 = input_buf[2][input_row];
-    input_row++;
-    outptr = *output_buf++;
-    for (col = 0; col < num_cols; col++) {
-      y  = GETJSAMPLE(inptr0[col]);
-      cb = GETJSAMPLE(inptr1[col]);
-      cr = GETJSAMPLE(inptr2[col]);
-      /* Range-limiting is essential due to noise introduced by DCT losses. */
-      outptr[RGB_RED] =   range_limit[y + Crrtab[cr]];
-      outptr[RGB_GREEN] = range_limit[y +
-			      ((int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr],
-						 SCALEBITS))];
-      outptr[RGB_BLUE] =  range_limit[y + Cbbtab[cb]];
-      outptr += RGB_PIXELSIZE;
-    }
-  }
-}
-
-
-/**************** Cases other than YCbCr -> RGB **************/
-
-
-/*
- * Color conversion for no colorspace change: just copy the data,
- * converting from separate-planes to interleaved representation.
- */
-
-METHODDEF(void)
-null_convert (j_decompress_ptr cinfo,
-	      JSAMPIMAGE input_buf, JDIMENSION input_row,
-	      JSAMPARRAY output_buf, int num_rows)
-{
-  register JSAMPROW inptr, outptr;
-  register JDIMENSION count;
-  register int num_components = cinfo->num_components;
-  JDIMENSION num_cols = cinfo->output_width;
-  int ci;
-
-  while (--num_rows >= 0) {
-    for (ci = 0; ci < num_components; ci++) {
-      inptr = input_buf[ci][input_row];
-      outptr = output_buf[0] + ci;
-      for (count = num_cols; count > 0; count--) {
-	*outptr = *inptr++;	/* needn't bother with GETJSAMPLE() here */
-	outptr += num_components;
-      }
-    }
-    input_row++;
-    output_buf++;
-  }
-}
-
-
-/*
- * Color conversion for grayscale: just copy the data.
- * This also works for YCbCr -> grayscale conversion, in which
- * we just copy the Y (luminance) component and ignore chrominance.
- */
-
-METHODDEF(void)
-grayscale_convert (j_decompress_ptr cinfo,
-		   JSAMPIMAGE input_buf, JDIMENSION input_row,
-		   JSAMPARRAY output_buf, int num_rows)
-{
-  jcopy_sample_rows(input_buf[0], (int) input_row, output_buf, 0,
-		    num_rows, cinfo->output_width);
-}
-
-
-/*
- * Convert grayscale to RGB: just duplicate the graylevel three times.
- * This is provided to support applications that don't want to cope
- * with grayscale as a separate case.
- */
-
-METHODDEF(void)
-gray_rgb_convert (j_decompress_ptr cinfo,
-		  JSAMPIMAGE input_buf, JDIMENSION input_row,
-		  JSAMPARRAY output_buf, int num_rows)
-{
-  register JSAMPROW inptr, outptr;
-  register JDIMENSION col;
-  JDIMENSION num_cols = cinfo->output_width;
-
-  while (--num_rows >= 0) {
-    inptr = input_buf[0][input_row++];
-    outptr = *output_buf++;
-    for (col = 0; col < num_cols; col++) {
-      /* We can dispense with GETJSAMPLE() here */
-      outptr[RGB_RED] = outptr[RGB_GREEN] = outptr[RGB_BLUE] = inptr[col];
-      outptr += RGB_PIXELSIZE;
-    }
-  }
-}
-
-
-/*
- * Adobe-style YCCK->CMYK conversion.
- * We convert YCbCr to R=1-C, G=1-M, and B=1-Y using the same
- * conversion as above, while passing K (black) unchanged.
- * We assume build_ycc_rgb_table has been called.
- */
-
-METHODDEF(void)
-ycck_cmyk_convert (j_decompress_ptr cinfo,
-		   JSAMPIMAGE input_buf, JDIMENSION input_row,
-		   JSAMPARRAY output_buf, int num_rows)
-{
-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
-  register int y, cb, cr;
-  register JSAMPROW outptr;
-  register JSAMPROW inptr0, inptr1, inptr2, inptr3;
-  register JDIMENSION col;
-  JDIMENSION num_cols = cinfo->output_width;
-  /* copy these pointers into registers if possible */
-  register JSAMPLE * range_limit = cinfo->sample_range_limit;
-  register int * Crrtab = cconvert->Cr_r_tab;
-  register int * Cbbtab = cconvert->Cb_b_tab;
-  register JPEG_INT32 * Crgtab = cconvert->Cr_g_tab;
-  register JPEG_INT32 * Cbgtab = cconvert->Cb_g_tab;
-  SHIFT_TEMPS
-
-  while (--num_rows >= 0) {
-    inptr0 = input_buf[0][input_row];
-    inptr1 = input_buf[1][input_row];
-    inptr2 = input_buf[2][input_row];
-    inptr3 = input_buf[3][input_row];
-    input_row++;
-    outptr = *output_buf++;
-    for (col = 0; col < num_cols; col++) {
-      y  = GETJSAMPLE(inptr0[col]);
-      cb = GETJSAMPLE(inptr1[col]);
-      cr = GETJSAMPLE(inptr2[col]);
-      /* Range-limiting is essential due to noise introduced by DCT losses. */
-      outptr[0] = range_limit[MAXJSAMPLE - (y + Crrtab[cr])];	/* red */
-      outptr[1] = range_limit[MAXJSAMPLE - (y +			/* green */
-			      ((int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr],
-						 SCALEBITS)))];
-      outptr[2] = range_limit[MAXJSAMPLE - (y + Cbbtab[cb])];	/* blue */
-      /* K passes through unchanged */
-      outptr[3] = inptr3[col];	/* don't need GETJSAMPLE here */
-      outptr += 4;
-    }
-  }
-}
-
-
-/*
- * Empty method for start_pass.
- */
-
-METHODDEF(void)
-start_pass_dcolor (j_decompress_ptr cinfo)
-{
-  /* no work needed */
-}
-
-
-/*
- * Module initialization routine for output colorspace conversion.
- */
-
-GLOBAL(void)
-jinit_color_deconverter (j_decompress_ptr cinfo)
-{
-  my_cconvert_ptr cconvert;
-  int ci;
-
-  cconvert = (my_cconvert_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_color_deconverter));
-  cinfo->cconvert = (struct jpeg_color_deconverter *) cconvert;
-  cconvert->pub.start_pass = start_pass_dcolor;
-
-  /* Make sure num_components agrees with jpeg_color_space */
-  switch (cinfo->jpeg_color_space) {
-  case JCS_GRAYSCALE:
-    if (cinfo->num_components != 1)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    break;
-
-  case JCS_RGB:
-  case JCS_YCbCr:
-    if (cinfo->num_components != 3)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    break;
-
-  case JCS_CMYK:
-  case JCS_YCCK:
-    if (cinfo->num_components != 4)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    break;
-
-  default:			/* JCS_UNKNOWN can be anything */
-    if (cinfo->num_components < 1)
-      ERREXIT(cinfo, JERR_BAD_J_COLORSPACE);
-    break;
-  }
-
-  /* Set out_color_components and conversion method based on requested space.
-   * Also clear the component_needed flags for any unused components,
-   * so that earlier pipeline stages can avoid useless computation.
-   */
-
-  switch (cinfo->out_color_space) {
-  case JCS_GRAYSCALE:
-    cinfo->out_color_components = 1;
-    if (cinfo->jpeg_color_space == JCS_GRAYSCALE ||
-	cinfo->jpeg_color_space == JCS_YCbCr) {
-      cconvert->pub.color_convert = grayscale_convert;
-      /* For color->grayscale conversion, only the Y (0) component is needed */
-      for (ci = 1; ci < cinfo->num_components; ci++)
-	cinfo->comp_info[ci].component_needed = FALSE;
-    } else
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-
-  case JCS_RGB:
-    cinfo->out_color_components = RGB_PIXELSIZE;
-    if (cinfo->jpeg_color_space == JCS_YCbCr) {
-      cconvert->pub.color_convert = ycc_rgb_convert;
-      build_ycc_rgb_table(cinfo);
-    } else if (cinfo->jpeg_color_space == JCS_GRAYSCALE) {
-      cconvert->pub.color_convert = gray_rgb_convert;
-    } else if (cinfo->jpeg_color_space == JCS_RGB && RGB_PIXELSIZE == 3) {
-      cconvert->pub.color_convert = null_convert;
-    } else
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-
-  case JCS_CMYK:
-    cinfo->out_color_components = 4;
-    if (cinfo->jpeg_color_space == JCS_YCCK) {
-      cconvert->pub.color_convert = ycck_cmyk_convert;
-      build_ycc_rgb_table(cinfo);
-    } else if (cinfo->jpeg_color_space == JCS_CMYK) {
-      cconvert->pub.color_convert = null_convert;
-    } else
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-
-  default:
-    /* Permit null conversion to same output space */
-    if (cinfo->out_color_space == cinfo->jpeg_color_space) {
-      cinfo->out_color_components = cinfo->num_components;
-      cconvert->pub.color_convert = null_convert;
-    } else			/* unsupported non-null conversion */
-      ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL);
-    break;
-  }
-
-  if (cinfo->quantize_colors)
-    cinfo->output_components = 1; /* single colormapped output component */
-  else
-    cinfo->output_components = cinfo->out_color_components;
-}
-
-#if defined(__VISAGECPP__)
-#  ifdef null_convert2
-#   undef null_convert2
-#  endif
-#  ifdef grayscale_convert2
-#   undef grayscale_convert2
-#  endif
-#endif
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdct.h b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdct.h
deleted file mode 100644
index 42180f390e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdct.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * jdct.h
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This include file contains common declarations for the forward and
- * inverse DCT modules.  These declarations are private to the DCT managers
- * (jcdctmgr.c, jddctmgr.c) and the individual DCT algorithms.
- * The individual DCT algorithms are kept in separate files to ease 
- * machine-dependent tuning (e.g., assembly coding).
- */
-
-
-/*
- * A forward DCT routine is given a pointer to a work area of type DCTELEM[];
- * the DCT is to be performed in-place in that buffer.  Type DCTELEM is int
- * for 8-bit samples, INT32 for 12-bit samples.  (NOTE: Floating-point DCT
- * implementations use an array of type FAST_FLOAT, instead.)
- * The DCT inputs are expected to be signed (range +-CENTERJSAMPLE).
- * The DCT outputs are returned scaled up by a factor of 8; they therefore
- * have a range of +-8K for 8-bit data, +-128K for 12-bit data.  This
- * convention improves accuracy in integer implementations and saves some
- * work in floating-point ones.
- * Quantization of the output coefficients is done by jcdctmgr.c.
- */
-
-#if BITS_IN_JSAMPLE == 8
-typedef int DCTELEM;		/* 16 or 32 bits is fine */
-#else
-typedef JPEG_INT32 DCTELEM;		/* must have 32 bits */
-#endif
-
-typedef JMETHOD(void, forward_DCT_method_ptr, (DCTELEM * data));
-typedef JMETHOD(void, float_DCT_method_ptr, (FAST_FLOAT * data));
-
-
-/*
- * An inverse DCT routine is given a pointer to the input JBLOCK and a pointer
- * to an output sample array.  The routine must dequantize the input data as
- * well as perform the IDCT; for dequantization, it uses the multiplier table
- * pointed to by compptr->dct_table.  The output data is to be placed into the
- * sample array starting at a specified column.  (Any row offset needed will
- * be applied to the array pointer before it is passed to the IDCT code.)
- * Note that the number of samples emitted by the IDCT routine is
- * DCT_scaled_size * DCT_scaled_size.
- */
-
-/* typedef inverse_DCT_method_ptr is declared in jpegint.h */
-
-/*
- * Each IDCT routine has its own ideas about the best dct_table element type.
- */
-
-typedef MULTIPLIER ISLOW_MULT_TYPE; /* short or int, whichever is faster */
-#if BITS_IN_JSAMPLE == 8
-typedef MULTIPLIER IFAST_MULT_TYPE; /* 16 bits is OK, use short if faster */
-#define IFAST_SCALE_BITS  2	/* fractional bits in scale factors */
-#else
-typedef JPEG_INT32 IFAST_MULT_TYPE;	/* need 32 bits for scaled quantizers */
-#define IFAST_SCALE_BITS  13	/* fractional bits in scale factors */
-#endif
-typedef FAST_FLOAT FLOAT_MULT_TYPE; /* preferred floating type */
-
-
-/*
- * Each IDCT routine is responsible for range-limiting its results and
- * converting them to unsigned form (0..MAXJSAMPLE).  The raw outputs could
- * be quite far out of range if the input data is corrupt, so a bulletproof
- * range-limiting step is required.  We use a mask-and-table-lookup method
- * to do the combined operations quickly.  See the comments with
- * prepare_range_limit_table (in jdmaster.c) for more info.
- */
-
-#define IDCT_range_limit(cinfo)  ((cinfo)->sample_range_limit + CENTERJSAMPLE)
-
-#define RANGE_MASK  (MAXJSAMPLE * 4 + 3) /* 2 bits wider than legal samples */
-
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jpeg_fdct_islow		jFDislow
-#define jpeg_fdct_ifast		jFDifast
-#define jpeg_fdct_float		jFDfloat
-#define jpeg_idct_islow		jRDislow
-#define jpeg_idct_ifast		jRDifast
-#define jpeg_idct_float		jRDfloat
-#define jpeg_idct_4x4		jRD4x4
-#define jpeg_idct_2x2		jRD2x2
-#define jpeg_idct_1x1		jRD1x1
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-/* Extern declarations for the forward and inverse DCT routines. */
-
-EXTERN(void) jpeg_fdct_islow JPP((DCTELEM * data));
-EXTERN(void) jpeg_fdct_ifast JPP((DCTELEM * data));
-EXTERN(void) jpeg_fdct_float JPP((FAST_FLOAT * data));
-
-EXTERN(void) jpeg_idct_islow
-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
-EXTERN(void) jpeg_idct_ifast
-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
-EXTERN(void) jpeg_idct_float
-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
-EXTERN(void) jpeg_idct_4x4
-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
-EXTERN(void) jpeg_idct_2x2
-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
-EXTERN(void) jpeg_idct_1x1
-    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	 JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
-
-
-/*
- * Macros for handling fixed-point arithmetic; these are used by many
- * but not all of the DCT/IDCT modules.
- *
- * All values are expected to be of type INT32.
- * Fractional constants are scaled left by CONST_BITS bits.
- * CONST_BITS is defined within each module using these macros,
- * and may differ from one module to the next.
- */
-
-#define ONE	((JPEG_INT32) 1)
-#define CONST_SCALE (ONE << CONST_BITS)
-
-/* Convert a positive real constant to an integer scaled by CONST_SCALE.
- * Caution: some C compilers fail to reduce "FIX(constant)" at compile time,
- * thus causing a lot of useless floating-point operations at run time.
- */
-
-#define FIX(x)	((JPEG_INT32) ((x) * CONST_SCALE + 0.5))
-
-/* Descale and correctly round an INT32 value that's scaled by N bits.
- * We assume RIGHT_SHIFT rounds towards minus infinity, so adding
- * the fudge factor is correct for either sign of X.
- */
-
-#define DESCALE(x,n)  RIGHT_SHIFT((x) + (ONE << ((n)-1)), n)
-
-/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.
- * This macro is used only when the two inputs will actually be no more than
- * 16 bits wide, so that a 16x16->32 bit multiply can be used instead of a
- * full 32x32 multiply.  This provides a useful speedup on many machines.
- * Unfortunately there is no way to specify a 16x16->32 multiply portably
- * in C, but some C compilers will do the right thing if you provide the
- * correct combination of casts.
- */
-
-#ifdef SHORTxSHORT_32		/* may work if 'int' is 32 bits */
-#define MULTIPLY16C16(var,const)  (((INT16) (var)) * ((INT16) (const)))
-#endif
-#ifdef SHORTxLCONST_32		/* known to work with Microsoft C 6.0 */
-#define MULTIPLY16C16(var,const)  (((INT16) (var)) * ((JPEG_INT32) (const)))
-#endif
-
-#ifndef MULTIPLY16C16		/* default definition */
-#define MULTIPLY16C16(var,const)  ((var) * (const))
-#endif
-
-/* Same except both inputs are variables. */
-
-#ifdef SHORTxSHORT_32		/* may work if 'int' is 32 bits */
-#define MULTIPLY16V16(var1,var2)  (((INT16) (var1)) * ((INT16) (var2)))
-#endif
-
-#ifndef MULTIPLY16V16		/* default definition */
-#define MULTIPLY16V16(var1,var2)  ((var1) * (var2))
-#endif
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jddctmgr.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jddctmgr.c
deleted file mode 100644
index e27cc3d511..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jddctmgr.c
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * jddctmgr.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the inverse-DCT management logic.
- * This code selects a particular IDCT implementation to be used,
- * and it performs related housekeeping chores.  No code in this file
- * is executed per IDCT step, only during output pass setup.
- *
- * Note that the IDCT routines are responsible for performing coefficient
- * dequantization as well as the IDCT proper.  This module sets up the
- * dequantization multiplier table needed by the IDCT routine.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-
-/*
- * The decompressor input side (jdinput.c) saves away the appropriate
- * quantization table for each component at the start of the first scan
- * involving that component.  (This is necessary in order to correctly
- * decode files that reuse Q-table slots.)
- * When we are ready to make an output pass, the saved Q-table is converted
- * to a multiplier table that will actually be used by the IDCT routine.
- * The multiplier table contents are IDCT-method-dependent.  To support
- * application changes in IDCT method between scans, we can remake the
- * multiplier tables if necessary.
- * In buffered-image mode, the first output pass may occur before any data
- * has been seen for some components, and thus before their Q-tables have
- * been saved away.  To handle this case, multiplier tables are preset
- * to zeroes; the result of the IDCT will be a neutral gray level.
- */
-
-
-/* Private subobject for this module */
-
-typedef struct {
-  struct jpeg_inverse_dct pub;	/* public fields */
-
-  /* This array contains the IDCT method code that each multiplier table
-   * is currently set up for, or -1 if it's not yet set up.
-   * The actual multiplier tables are pointed to by dct_table in the
-   * per-component comp_info structures.
-   */
-  int cur_method[MAX_COMPONENTS];
-} my_idct_controller;
-
-typedef my_idct_controller * my_idct_ptr;
-
-
-/* Allocated multiplier tables: big enough for any supported variant */
-
-typedef union {
-  ISLOW_MULT_TYPE islow_array[DCTSIZE2];
-#ifdef DCT_IFAST_SUPPORTED
-  IFAST_MULT_TYPE ifast_array[DCTSIZE2];
-#endif
-#ifdef DCT_FLOAT_SUPPORTED
-  FLOAT_MULT_TYPE float_array[DCTSIZE2];
-#endif
-} multiplier_table;
-
-
-/* The current scaled-IDCT routines require ISLOW-style multiplier tables,
- * so be sure to compile that code if either ISLOW or SCALING is requested.
- */
-#ifdef DCT_ISLOW_SUPPORTED
-#define PROVIDE_ISLOW_TABLES
-#else
-#ifdef IDCT_SCALING_SUPPORTED
-#define PROVIDE_ISLOW_TABLES
-#endif
-#endif
-
-
-/*
- * Prepare for an output pass.
- * Here we select the proper IDCT routine for each component and build
- * a matching multiplier table.
- */
-
-METHODDEF(void)
-start_pass (j_decompress_ptr cinfo)
-{
-  my_idct_ptr idct = (my_idct_ptr) cinfo->idct;
-  int ci, i;
-  jpeg_component_info *compptr;
-  int method = 0;
-  inverse_DCT_method_ptr method_ptr = NULL;
-  JQUANT_TBL * qtbl;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Select the proper IDCT routine for this component's scaling */
-    switch (compptr->DCT_scaled_size) {
-#ifdef IDCT_SCALING_SUPPORTED
-    case 1:
-      method_ptr = jpeg_idct_1x1;
-      method = JDCT_ISLOW;	/* jidctred uses islow-style table */
-      break;
-    case 2:
-      method_ptr = jpeg_idct_2x2;
-      method = JDCT_ISLOW;	/* jidctred uses islow-style table */
-      break;
-    case 4:
-      method_ptr = jpeg_idct_4x4;
-      method = JDCT_ISLOW;	/* jidctred uses islow-style table */
-      break;
-#endif
-    case DCTSIZE:
-      switch (cinfo->dct_method) {
-#ifdef DCT_ISLOW_SUPPORTED
-      case JDCT_ISLOW:
-	method_ptr = jpeg_idct_islow;
-	method = JDCT_ISLOW;
-	break;
-#endif
-#ifdef DCT_IFAST_SUPPORTED
-      case JDCT_IFAST:
-	method_ptr = jpeg_idct_ifast;
-	method = JDCT_IFAST;
-	break;
-#endif
-#ifdef DCT_FLOAT_SUPPORTED
-      case JDCT_FLOAT:
-	method_ptr = jpeg_idct_float;
-	method = JDCT_FLOAT;
-	break;
-#endif
-      default:
-	ERREXIT(cinfo, JERR_NOT_COMPILED);
-	break;
-      }
-      break;
-    default:
-      ERREXIT1(cinfo, JERR_BAD_DCTSIZE, compptr->DCT_scaled_size);
-      break;
-    }
-    idct->pub.inverse_DCT[ci] = method_ptr;
-    /* Create multiplier table from quant table.
-     * However, we can skip this if the component is uninteresting
-     * or if we already built the table.  Also, if no quant table
-     * has yet been saved for the component, we leave the
-     * multiplier table all-zero; we'll be reading zeroes from the
-     * coefficient controller's buffer anyway.
-     */
-    if (! compptr->component_needed || idct->cur_method[ci] == method)
-      continue;
-    qtbl = compptr->quant_table;
-    if (qtbl == NULL)		/* happens if no data yet for component */
-      continue;
-    idct->cur_method[ci] = method;
-    switch (method) {
-#ifdef PROVIDE_ISLOW_TABLES
-    case JDCT_ISLOW:
-      {
-	/* For LL&M IDCT method, multipliers are equal to raw quantization
-	 * coefficients, but are stored as ints to ensure access efficiency.
-	 */
-	ISLOW_MULT_TYPE * ismtbl = (ISLOW_MULT_TYPE *) compptr->dct_table;
-	for (i = 0; i < DCTSIZE2; i++) {
-	  ismtbl[i] = (ISLOW_MULT_TYPE) qtbl->quantval[i];
-	}
-      }
-      break;
-#endif
-#ifdef DCT_IFAST_SUPPORTED
-    case JDCT_IFAST:
-      {
-	/* For AA&N IDCT method, multipliers are equal to quantization
-	 * coefficients scaled by scalefactor[row]*scalefactor[col], where
-	 *   scalefactor[0] = 1
-	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7
-	 * For integer operation, the multiplier table is to be scaled by
-	 * IFAST_SCALE_BITS.
-	 */
-	IFAST_MULT_TYPE * ifmtbl = (IFAST_MULT_TYPE *) compptr->dct_table;
-#define CONST_BITS 14
-	static const INT16 aanscales[DCTSIZE2] = {
-	  /* precomputed values scaled up by 14 bits */
-	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
-	  22725, 31521, 29692, 26722, 22725, 17855, 12299,  6270,
-	  21407, 29692, 27969, 25172, 21407, 16819, 11585,  5906,
-	  19266, 26722, 25172, 22654, 19266, 15137, 10426,  5315,
-	  16384, 22725, 21407, 19266, 16384, 12873,  8867,  4520,
-	  12873, 17855, 16819, 15137, 12873, 10114,  6967,  3552,
-	   8867, 12299, 11585, 10426,  8867,  6967,  4799,  2446,
-	   4520,  6270,  5906,  5315,  4520,  3552,  2446,  1247
-	};
-	SHIFT_TEMPS
-
-	for (i = 0; i < DCTSIZE2; i++) {
-	  ifmtbl[i] = (IFAST_MULT_TYPE)
-	    DESCALE(MULTIPLY16V16((JPEG_INT32) qtbl->quantval[i],
-				  (JPEG_INT32) aanscales[i]),
-		    CONST_BITS-IFAST_SCALE_BITS);
-	}
-      }
-      break;
-#endif
-#ifdef DCT_FLOAT_SUPPORTED
-    case JDCT_FLOAT:
-      {
-	/* For float AA&N IDCT method, multipliers are equal to quantization
-	 * coefficients scaled by scalefactor[row]*scalefactor[col], where
-	 *   scalefactor[0] = 1
-	 *   scalefactor[k] = cos(k*PI/16) * sqrt(2)    for k=1..7
-	 */
-	FLOAT_MULT_TYPE * fmtbl = (FLOAT_MULT_TYPE *) compptr->dct_table;
-	int row, col;
-	static const double aanscalefactor[DCTSIZE] = {
-	  1.0, 1.387039845, 1.306562965, 1.175875602,
-	  1.0, 0.785694958, 0.541196100, 0.275899379
-	};
-
-	i = 0;
-	for (row = 0; row < DCTSIZE; row++) {
-	  for (col = 0; col < DCTSIZE; col++) {
-	    fmtbl[i] = (FLOAT_MULT_TYPE)
-	      ((double) qtbl->quantval[i] *
-	       aanscalefactor[row] * aanscalefactor[col]);
-	    i++;
-	  }
-	}
-      }
-      break;
-#endif
-    default:
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-      break;
-    }
-  }
-}
-
-
-/*
- * Initialize IDCT manager.
- */
-
-GLOBAL(void)
-jinit_inverse_dct (j_decompress_ptr cinfo)
-{
-  my_idct_ptr idct;
-  int ci;
-  jpeg_component_info *compptr;
-
-  idct = (my_idct_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_idct_controller));
-  cinfo->idct = (struct jpeg_inverse_dct *) idct;
-  idct->pub.start_pass = start_pass;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Allocate and pre-zero a multiplier table for each component */
-    compptr->dct_table =
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  SIZEOF(multiplier_table));
-    MEMZERO(compptr->dct_table, SIZEOF(multiplier_table));
-    /* Mark multiplier table not yet set up for any method */
-    idct->cur_method[ci] = -1;
-  }
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdhuff.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdhuff.c
deleted file mode 100644
index dccbc52b42..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdhuff.c
+++ /dev/null
@@ -1,651 +0,0 @@
-/*
- * jdhuff.c
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains Huffman entropy decoding routines.
- *
- * Much of the complexity here has to do with supporting input suspension.
- * If the data source module demands suspension, we want to be able to back
- * up to the start of the current MCU.  To do this, we copy state variables
- * into local working storage, and update them back to the permanent
- * storage only upon successful completion of an MCU.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdhuff.h"		/* Declarations shared with jdphuff.c */
-
-
-/*
- * Expanded entropy decoder object for Huffman decoding.
- *
- * The savable_state subrecord contains fields that change within an MCU,
- * but must not be updated permanently until we complete the MCU.
- */
-
-typedef struct {
-  int last_dc_val[MAX_COMPS_IN_SCAN]; /* last DC coef for each component */
-} savable_state;
-
-/* This macro is to work around compilers with missing or broken
- * structure assignment.  You'll need to fix this code if you have
- * such a compiler and you change MAX_COMPS_IN_SCAN.
- */
-
-#ifndef NO_STRUCT_ASSIGN
-#define ASSIGN_STATE(dest,src)  ((dest) = (src))
-#else
-#if MAX_COMPS_IN_SCAN == 4
-#define ASSIGN_STATE(dest,src)  \
-	((dest).last_dc_val[0] = (src).last_dc_val[0], \
-	 (dest).last_dc_val[1] = (src).last_dc_val[1], \
-	 (dest).last_dc_val[2] = (src).last_dc_val[2], \
-	 (dest).last_dc_val[3] = (src).last_dc_val[3])
-#endif
-#endif
-
-
-typedef struct {
-  struct jpeg_entropy_decoder pub; /* public fields */
-
-  /* These fields are loaded into local variables at start of each MCU.
-   * In case of suspension, we exit WITHOUT updating them.
-   */
-  bitread_perm_state bitstate;	/* Bit buffer at start of MCU */
-  savable_state saved;		/* Other state at start of MCU */
-
-  /* These fields are NOT loaded into local working state. */
-  unsigned int restarts_to_go;	/* MCUs left in this restart interval */
-
-  /* Pointers to derived tables (these workspaces have image lifespan) */
-  d_derived_tbl * dc_derived_tbls[NUM_HUFF_TBLS];
-  d_derived_tbl * ac_derived_tbls[NUM_HUFF_TBLS];
-
-  /* Precalculated info set up by start_pass for use in decode_mcu: */
-
-  /* Pointers to derived tables to be used for each block within an MCU */
-  d_derived_tbl * dc_cur_tbls[D_MAX_BLOCKS_IN_MCU];
-  d_derived_tbl * ac_cur_tbls[D_MAX_BLOCKS_IN_MCU];
-  /* Whether we care about the DC and AC coefficient values for each block */
-  wxjpeg_boolean dc_needed[D_MAX_BLOCKS_IN_MCU];
-  wxjpeg_boolean ac_needed[D_MAX_BLOCKS_IN_MCU];
-} huff_entropy_decoder;
-
-typedef huff_entropy_decoder * huff_entropy_ptr;
-
-
-/*
- * Initialize for a Huffman-compressed scan.
- */
-
-METHODDEF(void)
-start_pass_huff_decoder (j_decompress_ptr cinfo)
-{
-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
-  int ci, blkn, dctbl, actbl;
-  jpeg_component_info * compptr;
-
-  /* Check that the scan parameters Ss, Se, Ah/Al are OK for sequential JPEG.
-   * This ought to be an error condition, but we make it a warning because
-   * there are some baseline files out there with all zeroes in these bytes.
-   */
-  if (cinfo->Ss != 0 || cinfo->Se != DCTSIZE2-1 ||
-      cinfo->Ah != 0 || cinfo->Al != 0)
-    WARNMS(cinfo, JWRN_NOT_SEQUENTIAL);
-
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    dctbl = compptr->dc_tbl_no;
-    actbl = compptr->ac_tbl_no;
-    /* Compute derived values for Huffman tables */
-    /* We may do this more than once for a table, but it's not expensive */
-    jpeg_make_d_derived_tbl(cinfo, TRUE, dctbl,
-			    & entropy->dc_derived_tbls[dctbl]);
-    jpeg_make_d_derived_tbl(cinfo, FALSE, actbl,
-			    & entropy->ac_derived_tbls[actbl]);
-    /* Initialize DC predictions to 0 */
-    entropy->saved.last_dc_val[ci] = 0;
-  }
-
-  /* Precalculate decoding info for each block in an MCU of this scan */
-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
-    ci = cinfo->MCU_membership[blkn];
-    compptr = cinfo->cur_comp_info[ci];
-    /* Precalculate which table to use for each block */
-    entropy->dc_cur_tbls[blkn] = entropy->dc_derived_tbls[compptr->dc_tbl_no];
-    entropy->ac_cur_tbls[blkn] = entropy->ac_derived_tbls[compptr->ac_tbl_no];
-    /* Decide whether we really care about the coefficient values */
-    if (compptr->component_needed) {
-      entropy->dc_needed[blkn] = TRUE;
-      /* we don't need the ACs if producing a 1/8th-size image */
-      entropy->ac_needed[blkn] = (compptr->DCT_scaled_size > 1);
-    } else {
-      entropy->dc_needed[blkn] = entropy->ac_needed[blkn] = FALSE;
-    }
-  }
-
-  /* Initialize bitread state variables */
-  entropy->bitstate.bits_left = 0;
-  entropy->bitstate.get_buffer = 0; /* unnecessary, but keeps Purify quiet */
-  entropy->pub.insufficient_data = FALSE;
-
-  /* Initialize restart counter */
-  entropy->restarts_to_go = cinfo->restart_interval;
-}
-
-
-/*
- * Compute the derived values for a Huffman table.
- * This routine also performs some validation checks on the table.
- *
- * Note this is also used by jdphuff.c.
- */
-
-GLOBAL(void)
-jpeg_make_d_derived_tbl (j_decompress_ptr cinfo, wxjpeg_boolean isDC, int tblno,
-			 d_derived_tbl ** pdtbl)
-{
-  JHUFF_TBL *htbl;
-  d_derived_tbl *dtbl;
-  int p, i, l, si, numsymbols;
-  int lookbits, ctr;
-  char huffsize[257];
-  unsigned int huffcode[257];
-  unsigned int code;
-
-  /* Note that huffsize[] and huffcode[] are filled in code-length order,
-   * paralleling the order of the symbols themselves in htbl->huffval[].
-   */
-
-  /* Find the input Huffman table */
-  if (tblno < 0 || tblno >= NUM_HUFF_TBLS)
-    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);
-  htbl =
-    isDC ? cinfo->dc_huff_tbl_ptrs[tblno] : cinfo->ac_huff_tbl_ptrs[tblno];
-  if (htbl == NULL)
-    ERREXIT1(cinfo, JERR_NO_HUFF_TABLE, tblno);
-
-  /* Allocate a workspace if we haven't already done so. */
-  if (*pdtbl == NULL)
-    *pdtbl = (d_derived_tbl *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  SIZEOF(d_derived_tbl));
-  dtbl = *pdtbl;
-  dtbl->pub = htbl;		/* fill in back link */
-  
-  /* Figure C.1: make table of Huffman code length for each symbol */
-
-  p = 0;
-  for (l = 1; l <= 16; l++) {
-    i = (int) htbl->bits[l];
-    if (i < 0 || p + i > 256)	/* protect against table overrun */
-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
-    while (i--)
-      huffsize[p++] = (char) l;
-  }
-  huffsize[p] = 0;
-  numsymbols = p;
-  
-  /* Figure C.2: generate the codes themselves */
-  /* We also validate that the counts represent a legal Huffman code tree. */
-  
-  code = 0;
-  si = huffsize[0];
-  p = 0;
-  while (huffsize[p]) {
-    while (((int) huffsize[p]) == si) {
-      huffcode[p++] = code;
-      code++;
-    }
-    /* code is now 1 more than the last code used for codelength si; but
-     * it must still fit in si bits, since no code is allowed to be all ones.
-     */
-    if (((JPEG_INT32) code) >= (((JPEG_INT32) 1) << si))
-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
-    code <<= 1;
-    si++;
-  }
-
-  /* Figure F.15: generate decoding tables for bit-sequential decoding */
-
-  p = 0;
-  for (l = 1; l <= 16; l++) {
-    if (htbl->bits[l]) {
-      /* valoffset[l] = huffval[] index of 1st symbol of code length l,
-       * minus the minimum code of length l
-       */
-      dtbl->valoffset[l] = (JPEG_INT32) p - (JPEG_INT32) huffcode[p];
-      p += htbl->bits[l];
-      dtbl->maxcode[l] = huffcode[p-1]; /* maximum code of length l */
-    } else {
-      dtbl->maxcode[l] = -1;	/* -1 if no codes of this length */
-    }
-  }
-  dtbl->maxcode[17] = 0xFFFFFL; /* ensures jpeg_huff_decode terminates */
-
-  /* Compute lookahead tables to speed up decoding.
-   * First we set all the table entries to 0, indicating "too long";
-   * then we iterate through the Huffman codes that are short enough and
-   * fill in all the entries that correspond to bit sequences starting
-   * with that code.
-   */
-
-  MEMZERO(dtbl->look_nbits, SIZEOF(dtbl->look_nbits));
-
-  p = 0;
-  for (l = 1; l <= HUFF_LOOKAHEAD; l++) {
-    for (i = 1; i <= (int) htbl->bits[l]; i++, p++) {
-      /* l = current code's length, p = its index in huffcode[] & huffval[]. */
-      /* Generate left-justified code followed by all possible bit sequences */
-      lookbits = huffcode[p] << (HUFF_LOOKAHEAD-l);
-      for (ctr = 1 << (HUFF_LOOKAHEAD-l); ctr > 0; ctr--) {
-	dtbl->look_nbits[lookbits] = l;
-	dtbl->look_sym[lookbits] = htbl->huffval[p];
-	lookbits++;
-      }
-    }
-  }
-
-  /* Validate symbols as being reasonable.
-   * For AC tables, we make no check, but accept all byte values 0..255.
-   * For DC tables, we require the symbols to be in range 0..15.
-   * (Tighter bounds could be applied depending on the data depth and mode,
-   * but this is sufficient to ensure safe decoding.)
-   */
-  if (isDC) {
-    for (i = 0; i < numsymbols; i++) {
-      int sym = htbl->huffval[i];
-      if (sym < 0 || sym > 15)
-	ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
-    }
-  }
-}
-
-
-/*
- * Out-of-line code for bit fetching (shared with jdphuff.c).
- * See jdhuff.h for info about usage.
- * Note: current values of get_buffer and bits_left are passed as parameters,
- * but are returned in the corresponding fields of the state struct.
- *
- * On most machines MIN_GET_BITS should be 25 to allow the full 32-bit width
- * of get_buffer to be used.  (On machines with wider words, an even larger
- * buffer could be used.)  However, on some machines 32-bit shifts are
- * quite slow and take time proportional to the number of places shifted.
- * (This is true with most PC compilers, for instance.)  In this case it may
- * be a win to set MIN_GET_BITS to the minimum value of 15.  This reduces the
- * average shift distance at the cost of more calls to jpeg_fill_bit_buffer.
- */
-
-#ifdef SLOW_SHIFT_32
-#define MIN_GET_BITS  15	/* minimum allowable value */
-#else
-#define MIN_GET_BITS  (BIT_BUF_SIZE-7)
-#endif
-
-
-GLOBAL(wxjpeg_boolean)
-jpeg_fill_bit_buffer (bitread_working_state * state,
-		      register bit_buf_type get_buffer, register int bits_left,
-		      int nbits)
-/* Load up the bit buffer to a depth of at least nbits */
-{
-  /* Copy heavily used state fields into locals (hopefully registers) */
-  register const JOCTET * next_input_byte = state->next_input_byte;
-  register size_t bytes_in_buffer = state->bytes_in_buffer;
-  j_decompress_ptr cinfo = state->cinfo;
-
-  /* Attempt to load at least MIN_GET_BITS bits into get_buffer. */
-  /* (It is assumed that no request will be for more than that many bits.) */
-  /* We fail to do so only if we hit a marker or are forced to suspend. */
-
-  if (cinfo->unread_marker == 0) {	/* cannot advance past a marker */
-    while (bits_left < MIN_GET_BITS) {
-      register int c;
-
-      /* Attempt to read a byte */
-      if (bytes_in_buffer == 0) {
-	if (! (*cinfo->src->fill_input_buffer) (cinfo))
-	  return FALSE;
-	next_input_byte = cinfo->src->next_input_byte;
-	bytes_in_buffer = cinfo->src->bytes_in_buffer;
-      }
-      bytes_in_buffer--;
-      c = GETJOCTET(*next_input_byte++);
-
-      /* If it's 0xFF, check and discard stuffed zero byte */
-      if (c == 0xFF) {
-	/* Loop here to discard any padding FF's on terminating marker,
-	 * so that we can save a valid unread_marker value.  NOTE: we will
-	 * accept multiple FF's followed by a 0 as meaning a single FF data
-	 * byte.  This data pattern is not valid according to the standard.
-	 */
-	do {
-	  if (bytes_in_buffer == 0) {
-	    if (! (*cinfo->src->fill_input_buffer) (cinfo))
-	      return FALSE;
-	    next_input_byte = cinfo->src->next_input_byte;
-	    bytes_in_buffer = cinfo->src->bytes_in_buffer;
-	  }
-	  bytes_in_buffer--;
-	  c = GETJOCTET(*next_input_byte++);
-	} while (c == 0xFF);
-
-	if (c == 0) {
-	  /* Found FF/00, which represents an FF data byte */
-	  c = 0xFF;
-	} else {
-	  /* Oops, it's actually a marker indicating end of compressed data.
-	   * Save the marker code for later use.
-	   * Fine point: it might appear that we should save the marker into
-	   * bitread working state, not straight into permanent state.  But
-	   * once we have hit a marker, we cannot need to suspend within the
-	   * current MCU, because we will read no more bytes from the data
-	   * source.  So it is OK to update permanent state right away.
-	   */
-	  cinfo->unread_marker = c;
-	  /* See if we need to insert some fake zero bits. */
-	  goto no_more_bytes;
-	}
-      }
-
-      /* OK, load c into get_buffer */
-      get_buffer = (get_buffer << 8) | c;
-      bits_left += 8;
-    } /* end while */
-  } else {
-  no_more_bytes:
-    /* We get here if we've read the marker that terminates the compressed
-     * data segment.  There should be enough bits in the buffer register
-     * to satisfy the request; if so, no problem.
-     */
-    if (nbits > bits_left) {
-      /* Uh-oh.  Report corrupted data to user and stuff zeroes into
-       * the data stream, so that we can produce some kind of image.
-       * We use a nonvolatile flag to ensure that only one warning message
-       * appears per data segment.
-       */
-      if (! cinfo->entropy->insufficient_data) {
-	WARNMS(cinfo, JWRN_HIT_MARKER);
-	cinfo->entropy->insufficient_data = TRUE;
-      }
-      /* Fill the buffer with zero bits */
-      get_buffer <<= MIN_GET_BITS - bits_left;
-      bits_left = MIN_GET_BITS;
-    }
-  }
-
-  /* Unload the local registers */
-  state->next_input_byte = next_input_byte;
-  state->bytes_in_buffer = bytes_in_buffer;
-  state->get_buffer = get_buffer;
-  state->bits_left = bits_left;
-
-  return TRUE;
-}
-
-
-/*
- * Out-of-line code for Huffman code decoding.
- * See jdhuff.h for info about usage.
- */
-
-GLOBAL(int)
-jpeg_huff_decode (bitread_working_state * state,
-		  register bit_buf_type get_buffer, register int bits_left,
-		  d_derived_tbl * htbl, int min_bits)
-{
-  register int l = min_bits;
-  register JPEG_INT32 code;
-
-  /* HUFF_DECODE has determined that the code is at least min_bits */
-  /* bits long, so fetch that many bits in one swoop. */
-
-  CHECK_BIT_BUFFER(*state, l, return -1);
-  code = GET_BITS(l);
-
-  /* Collect the rest of the Huffman code one bit at a time. */
-  /* This is per Figure F.16 in the JPEG spec. */
-
-  while (code > htbl->maxcode[l]) {
-    code <<= 1;
-    CHECK_BIT_BUFFER(*state, 1, return -1);
-    code |= GET_BITS(1);
-    l++;
-  }
-
-  /* Unload the local registers */
-  state->get_buffer = get_buffer;
-  state->bits_left = bits_left;
-
-  /* With garbage input we may reach the sentinel value l = 17. */
-
-  if (l > 16) {
-    WARNMS(state->cinfo, JWRN_HUFF_BAD_CODE);
-    return 0;			/* fake a zero as the safest result */
-  }
-
-  return htbl->pub->huffval[ (int) (code + htbl->valoffset[l]) ];
-}
-
-
-/*
- * Figure F.12: extend sign bit.
- * On some machines, a shift and add will be faster than a table lookup.
- */
-
-#ifdef AVOID_TABLES
-
-#define HUFF_EXTEND(x,s)  ((x) < (1<<((s)-1)) ? (x) + (((-1)<<(s)) + 1) : (x))
-
-#else
-
-#define HUFF_EXTEND(x,s)  ((x) < extend_test[s] ? (x) + extend_offset[s] : (x))
-
-static const int extend_test[16] =   /* entry n is 2**(n-1) */
-  { 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
-    0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
-
-static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
-  { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
-    ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
-    ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
-    ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
-
-#endif /* AVOID_TABLES */
-
-
-/*
- * Check for a restart marker & resynchronize decoder.
- * Returns FALSE if must suspend.
- */
-
-LOCAL(wxjpeg_boolean)
-process_restart (j_decompress_ptr cinfo)
-{
-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
-  int ci;
-
-  /* Throw away any unused bits remaining in bit buffer; */
-  /* include any full bytes in next_marker's count of discarded bytes */
-  cinfo->marker->discarded_bytes += entropy->bitstate.bits_left / 8;
-  entropy->bitstate.bits_left = 0;
-
-  /* Advance past the RSTn marker */
-  if (! (*cinfo->marker->read_restart_marker) (cinfo))
-    return FALSE;
-
-  /* Re-initialize DC predictions to 0 */
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++)
-    entropy->saved.last_dc_val[ci] = 0;
-
-  /* Reset restart counter */
-  entropy->restarts_to_go = cinfo->restart_interval;
-
-  /* Reset out-of-data flag, unless read_restart_marker left us smack up
-   * against a marker.  In that case we will end up treating the next data
-   * segment as empty, and we can avoid producing bogus output pixels by
-   * leaving the flag set.
-   */
-  if (cinfo->unread_marker == 0)
-    entropy->pub.insufficient_data = FALSE;
-
-  return TRUE;
-}
-
-
-/*
- * Decode and return one MCU's worth of Huffman-compressed coefficients.
- * The coefficients are reordered from zigzag order into natural array order,
- * but are not dequantized.
- *
- * The i'th block of the MCU is stored into the block pointed to by
- * MCU_data[i].  WE ASSUME THIS AREA HAS BEEN ZEROED BY THE CALLER.
- * (Wholesale zeroing is usually a little faster than retail...)
- *
- * Returns FALSE if data source requested suspension.  In that case no
- * changes have been made to permanent state.  (Exception: some output
- * coefficients may already have been assigned.  This is harmless for
- * this module, since we'll just re-assign them on the next call.)
- */
-
-METHODDEF(wxjpeg_boolean)
-decode_mcu (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{
-  huff_entropy_ptr entropy = (huff_entropy_ptr) cinfo->entropy;
-  int blkn;
-  BITREAD_STATE_VARS;
-  savable_state state;
-
-  /* Process restart marker if needed; may have to suspend */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0)
-      if (! process_restart(cinfo))
-	return FALSE;
-  }
-
-  /* If we've run out of data, just leave the MCU set to zeroes.
-   * This way, we return uniform gray for the remainder of the segment.
-   */
-  if (! entropy->pub.insufficient_data) {
-
-    /* Load up working state */
-    BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
-    ASSIGN_STATE(state, entropy->saved);
-
-    /* Outer loop handles each block in the MCU */
-
-    for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
-      JBLOCKROW block = MCU_data[blkn];
-      d_derived_tbl * dctbl = entropy->dc_cur_tbls[blkn];
-      d_derived_tbl * actbl = entropy->ac_cur_tbls[blkn];
-      register int s, k, r;
-
-      /* Decode a single block's worth of coefficients */
-
-      /* Section F.2.2.1: decode the DC coefficient difference */
-      HUFF_DECODE(s, br_state, dctbl, return FALSE, label1);
-      if (s) {
-	CHECK_BIT_BUFFER(br_state, s, return FALSE);
-	r = GET_BITS(s);
-	s = HUFF_EXTEND(r, s);
-      }
-
-      if (entropy->dc_needed[blkn]) {
-	/* Convert DC difference to actual value, update last_dc_val */
-	int ci = cinfo->MCU_membership[blkn];
-	s += state.last_dc_val[ci];
-	state.last_dc_val[ci] = s;
-	/* Output the DC coefficient (assumes jpeg_natural_order[0] = 0) */
-	(*block)[0] = (JCOEF) s;
-      }
-
-      if (entropy->ac_needed[blkn]) {
-
-	/* Section F.2.2.2: decode the AC coefficients */
-	/* Since zeroes are skipped, output area must be cleared beforehand */
-	for (k = 1; k < DCTSIZE2; k++) {
-	  HUFF_DECODE(s, br_state, actbl, return FALSE, label2);
-      
-	  r = s >> 4;
-	  s &= 15;
-      
-	  if (s) {
-	    k += r;
-	    CHECK_BIT_BUFFER(br_state, s, return FALSE);
-	    r = GET_BITS(s);
-	    s = HUFF_EXTEND(r, s);
-	    /* Output coefficient in natural (dezigzagged) order.
-	     * Note: the extra entries in jpeg_natural_order[] will save us
-	     * if k >= DCTSIZE2, which could happen if the data is corrupted.
-	     */
-	    (*block)[jpeg_natural_order[k]] = (JCOEF) s;
-	  } else {
-	    if (r != 15)
-	      break;
-	    k += 15;
-	  }
-	}
-
-      } else {
-
-	/* Section F.2.2.2: decode the AC coefficients */
-	/* In this path we just discard the values */
-	for (k = 1; k < DCTSIZE2; k++) {
-	  HUFF_DECODE(s, br_state, actbl, return FALSE, label3);
-      
-	  r = s >> 4;
-	  s &= 15;
-      
-	  if (s) {
-	    k += r;
-	    CHECK_BIT_BUFFER(br_state, s, return FALSE);
-	    DROP_BITS(s);
-	  } else {
-	    if (r != 15)
-	      break;
-	    k += 15;
-	  }
-	}
-
-      }
-    }
-
-    /* Completed MCU, so update state */
-    BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
-    ASSIGN_STATE(entropy->saved, state);
-  }
-
-  /* Account for restart interval (no-op if not using restarts) */
-  entropy->restarts_to_go--;
-
-  return TRUE;
-}
-
-
-/*
- * Module initialization routine for Huffman entropy decoding.
- */
-
-GLOBAL(void)
-jinit_huff_decoder (j_decompress_ptr cinfo)
-{
-  huff_entropy_ptr entropy;
-  int i;
-
-  entropy = (huff_entropy_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(huff_entropy_decoder));
-  cinfo->entropy = (struct jpeg_entropy_decoder *) entropy;
-  entropy->pub.start_pass = start_pass_huff_decoder;
-  entropy->pub.decode_mcu = decode_mcu;
-
-  /* Mark tables unallocated */
-  for (i = 0; i < NUM_HUFF_TBLS; i++) {
-    entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL;
-  }
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdhuff.h b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdhuff.h
deleted file mode 100644
index 9e9e87daec..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdhuff.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * jdhuff.h
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains declarations for Huffman entropy decoding routines
- * that are shared between the sequential decoder (jdhuff.c) and the
- * progressive decoder (jdphuff.c).  No other modules need to see these.
- */
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jpeg_make_d_derived_tbl	jMkDDerived
-#define jpeg_fill_bit_buffer	jFilBitBuf
-#define jpeg_huff_decode	jHufDecode
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/* Derived data constructed for each Huffman table */
-
-#define HUFF_LOOKAHEAD	8	/* # of bits of lookahead */
-
-typedef struct {
-  /* Basic tables: (element [0] of each array is unused) */
-  JPEG_INT32 maxcode[18];		/* largest code of length k (-1 if none) */
-  /* (maxcode[17] is a sentinel to ensure jpeg_huff_decode terminates) */
-  JPEG_INT32 valoffset[17];		/* huffval[] offset for codes of length k */
-  /* valoffset[k] = huffval[] index of 1st symbol of code length k, less
-   * the smallest code of length k; so given a code of length k, the
-   * corresponding symbol is huffval[code + valoffset[k]]
-   */
-
-  /* Link to public Huffman table (needed only in jpeg_huff_decode) */
-  JHUFF_TBL *pub;
-
-  /* Lookahead tables: indexed by the next HUFF_LOOKAHEAD bits of
-   * the input data stream.  If the next Huffman code is no more
-   * than HUFF_LOOKAHEAD bits long, we can obtain its length and
-   * the corresponding symbol directly from these tables.
-   */
-  int look_nbits[1< 32 bits on your machine, and shifting/masking longs is
- * reasonably fast, making bit_buf_type be long and setting BIT_BUF_SIZE
- * appropriately should be a win.  Unfortunately we can't define the size
- * with something like  #define BIT_BUF_SIZE (sizeof(bit_buf_type)*8)
- * because not all machines measure sizeof in 8-bit bytes.
- */
-
-typedef struct {		/* Bitreading state saved across MCUs */
-  bit_buf_type get_buffer;	/* current bit-extraction buffer */
-  int bits_left;		/* # of unused bits in it */
-} bitread_perm_state;
-
-typedef struct {		/* Bitreading working state within an MCU */
-  /* Current data source location */
-  /* We need a copy, rather than munging the original, in case of suspension */
-  const JOCTET * next_input_byte; /* => next byte to read from source */
-  size_t bytes_in_buffer;	/* # of bytes remaining in source buffer */
-  /* Bit input buffer --- note these values are kept in register variables,
-   * not in this struct, inside the inner loops.
-   */
-  bit_buf_type get_buffer;	/* current bit-extraction buffer */
-  int bits_left;		/* # of unused bits in it */
-  /* Pointer needed by jpeg_fill_bit_buffer. */
-  j_decompress_ptr cinfo;	/* back link to decompress master record */
-} bitread_working_state;
-
-/* Macros to declare and load/save bitread local variables. */
-#define BITREAD_STATE_VARS  \
-	register bit_buf_type get_buffer;  \
-	register int bits_left;  \
-	bitread_working_state br_state
-
-#define BITREAD_LOAD_STATE(cinfop,permstate)  \
-	br_state.cinfo = cinfop; \
-	br_state.next_input_byte = cinfop->src->next_input_byte; \
-	br_state.bytes_in_buffer = cinfop->src->bytes_in_buffer; \
-	get_buffer = permstate.get_buffer; \
-	bits_left = permstate.bits_left;
-
-#define BITREAD_SAVE_STATE(cinfop,permstate)  \
-	cinfop->src->next_input_byte = br_state.next_input_byte; \
-	cinfop->src->bytes_in_buffer = br_state.bytes_in_buffer; \
-	permstate.get_buffer = get_buffer; \
-	permstate.bits_left = bits_left
-
-/*
- * These macros provide the in-line portion of bit fetching.
- * Use CHECK_BIT_BUFFER to ensure there are N bits in get_buffer
- * before using GET_BITS, PEEK_BITS, or DROP_BITS.
- * The variables get_buffer and bits_left are assumed to be locals,
- * but the state struct might not be (jpeg_huff_decode needs this).
- *	CHECK_BIT_BUFFER(state,n,action);
- *		Ensure there are N bits in get_buffer; if suspend, take action.
- *      val = GET_BITS(n);
- *		Fetch next N bits.
- *      val = PEEK_BITS(n);
- *		Fetch next N bits without removing them from the buffer.
- *	DROP_BITS(n);
- *		Discard next N bits.
- * The value N should be a simple variable, not an expression, because it
- * is evaluated multiple times.
- */
-
-#define CHECK_BIT_BUFFER(state,nbits,action) \
-	{ if (bits_left < (nbits)) {  \
-	    if (! jpeg_fill_bit_buffer(&(state),get_buffer,bits_left,nbits))  \
-	      { action; }  \
-	    get_buffer = (state).get_buffer; bits_left = (state).bits_left; } }
-
-#define GET_BITS(nbits) \
-	(((int) (get_buffer >> (bits_left -= (nbits)))) & ((1<<(nbits))-1))
-
-#define PEEK_BITS(nbits) \
-	(((int) (get_buffer >> (bits_left -  (nbits)))) & ((1<<(nbits))-1))
-
-#define DROP_BITS(nbits) \
-	(bits_left -= (nbits))
-
-/* Load up the bit buffer to a depth of at least nbits */
-EXTERN(wxjpeg_boolean) jpeg_fill_bit_buffer
-	JPP((bitread_working_state * state, register bit_buf_type get_buffer,
-	     register int bits_left, int nbits));
-
-
-/*
- * Code for extracting next Huffman-coded symbol from input bit stream.
- * Again, this is time-critical and we make the main paths be macros.
- *
- * We use a lookahead table to process codes of up to HUFF_LOOKAHEAD bits
- * without looping.  Usually, more than 95% of the Huffman codes will be 8
- * or fewer bits long.  The few overlength codes are handled with a loop,
- * which need not be inline code.
- *
- * Notes about the HUFF_DECODE macro:
- * 1. Near the end of the data segment, we may fail to get enough bits
- *    for a lookahead.  In that case, we do it the hard way.
- * 2. If the lookahead table contains no entry, the next code must be
- *    more than HUFF_LOOKAHEAD bits long.
- * 3. jpeg_huff_decode returns -1 if forced to suspend.
- */
-
-#define HUFF_DECODE(result,state,htbl,failaction,slowlabel) \
-{ register int nb, look; \
-  if (bits_left < HUFF_LOOKAHEAD) { \
-    if (! jpeg_fill_bit_buffer(&state,get_buffer,bits_left, 0)) {failaction;} \
-    get_buffer = state.get_buffer; bits_left = state.bits_left; \
-    if (bits_left < HUFF_LOOKAHEAD) { \
-      nb = 1; goto slowlabel; \
-    } \
-  } \
-  look = PEEK_BITS(HUFF_LOOKAHEAD); \
-  if ((nb = htbl->look_nbits[look]) != 0) { \
-    DROP_BITS(nb); \
-    result = htbl->look_sym[look]; \
-  } else { \
-    nb = HUFF_LOOKAHEAD+1; \
-slowlabel: \
-    if ((result=jpeg_huff_decode(&state,get_buffer,bits_left,htbl,nb)) < 0) \
-	{ failaction; } \
-    get_buffer = state.get_buffer; bits_left = state.bits_left; \
-  } \
-}
-
-/* Out-of-line case for Huffman code fetching */
-EXTERN(int) jpeg_huff_decode
-	JPP((bitread_working_state * state, register bit_buf_type get_buffer,
-	     register int bits_left, d_derived_tbl * htbl, int min_bits));
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdinput.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdinput.c
deleted file mode 100644
index c89b75de58..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdinput.c
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * jdinput.c
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains input control logic for the JPEG decompressor.
- * These routines are concerned with controlling the decompressor's input
- * processing (marker reading and coefficient decoding).  The actual input
- * reading is done in jdmarker.c, jdhuff.c, and jdphuff.c.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-/* Private state */
-
-typedef struct {
-  struct jpeg_input_controller pub; /* public fields */
-
-  wxjpeg_boolean inheaders;		/* TRUE until first SOS is reached */
-} my_input_controller;
-
-typedef my_input_controller * my_inputctl_ptr;
-
-
-/* Forward declarations */
-METHODDEF(int) consume_markers JPP((j_decompress_ptr cinfo));
-
-
-/*
- * Routines to calculate various quantities related to the size of the image.
- */
-
-LOCAL(void)
-initial_setup (j_decompress_ptr cinfo)
-/* Called once, when first SOS marker is reached */
-{
-  int ci;
-  jpeg_component_info *compptr;
-
-  /* Make sure image isn't bigger than I can handle */
-  if ((long) cinfo->image_height > (long) JPEG_MAX_DIMENSION ||
-      (long) cinfo->image_width > (long) JPEG_MAX_DIMENSION)
-    ERREXIT1(cinfo, JERR_IMAGE_TOO_BIG, (unsigned int) JPEG_MAX_DIMENSION);
-
-  /* For now, precision must match compiled-in value... */
-  if (cinfo->data_precision != BITS_IN_JSAMPLE)
-    ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision);
-
-  /* Check that number of components won't exceed internal array sizes */
-  if (cinfo->num_components > MAX_COMPONENTS)
-    ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->num_components,
-	     MAX_COMPONENTS);
-
-  /* Compute maximum sampling factors; check factor validity */
-  cinfo->max_h_samp_factor = 1;
-  cinfo->max_v_samp_factor = 1;
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    if (compptr->h_samp_factor<=0 || compptr->h_samp_factor>MAX_SAMP_FACTOR ||
-	compptr->v_samp_factor<=0 || compptr->v_samp_factor>MAX_SAMP_FACTOR)
-      ERREXIT(cinfo, JERR_BAD_SAMPLING);
-    cinfo->max_h_samp_factor = MAX(cinfo->max_h_samp_factor,
-				   compptr->h_samp_factor);
-    cinfo->max_v_samp_factor = MAX(cinfo->max_v_samp_factor,
-				   compptr->v_samp_factor);
-  }
-
-  /* We initialize DCT_scaled_size and min_DCT_scaled_size to DCTSIZE.
-   * In the full decompressor, this will be overridden by jdmaster.c;
-   * but in the transcoder, jdmaster.c is not used, so we must do it here.
-   */
-  cinfo->min_DCT_scaled_size = DCTSIZE;
-
-  /* Compute dimensions of components */
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    compptr->DCT_scaled_size = DCTSIZE;
-    /* Size in DCT blocks */
-    compptr->width_in_blocks = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,
-		    (long) (cinfo->max_h_samp_factor * DCTSIZE));
-    compptr->height_in_blocks = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,
-		    (long) (cinfo->max_v_samp_factor * DCTSIZE));
-    /* downsampled_width and downsampled_height will also be overridden by
-     * jdmaster.c if we are doing full decompression.  The transcoder library
-     * doesn't use these values, but the calling application might.
-     */
-    /* Size in samples */
-    compptr->downsampled_width = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width * (long) compptr->h_samp_factor,
-		    (long) cinfo->max_h_samp_factor);
-    compptr->downsampled_height = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height * (long) compptr->v_samp_factor,
-		    (long) cinfo->max_v_samp_factor);
-    /* Mark component needed, until color conversion says otherwise */
-    compptr->component_needed = TRUE;
-    /* Mark no quantization table yet saved for component */
-    compptr->quant_table = NULL;
-  }
-
-  /* Compute number of fully interleaved MCU rows. */
-  cinfo->total_iMCU_rows = (JDIMENSION)
-    jdiv_round_up((long) cinfo->image_height,
-		  (long) (cinfo->max_v_samp_factor*DCTSIZE));
-
-  /* Decide whether file contains multiple scans */
-  if (cinfo->comps_in_scan < cinfo->num_components || cinfo->progressive_mode)
-    cinfo->inputctl->has_multiple_scans = TRUE;
-  else
-    cinfo->inputctl->has_multiple_scans = FALSE;
-}
-
-
-LOCAL(void)
-per_scan_setup (j_decompress_ptr cinfo)
-/* Do computations that are needed before processing a JPEG scan */
-/* cinfo->comps_in_scan and cinfo->cur_comp_info[] were set from SOS marker */
-{
-  int ci, mcublks, tmp;
-  jpeg_component_info *compptr;
-
-  if (cinfo->comps_in_scan == 1) {
-
-    /* Noninterleaved (single-component) scan */
-    compptr = cinfo->cur_comp_info[0];
-
-    /* Overall image size in MCUs */
-    cinfo->MCUs_per_row = compptr->width_in_blocks;
-    cinfo->MCU_rows_in_scan = compptr->height_in_blocks;
-
-    /* For noninterleaved scan, always one block per MCU */
-    compptr->MCU_width = 1;
-    compptr->MCU_height = 1;
-    compptr->MCU_blocks = 1;
-    compptr->MCU_sample_width = compptr->DCT_scaled_size;
-    compptr->last_col_width = 1;
-    /* For noninterleaved scans, it is convenient to define last_row_height
-     * as the number of block rows present in the last iMCU row.
-     */
-    tmp = (int) (compptr->height_in_blocks % compptr->v_samp_factor);
-    if (tmp == 0) tmp = compptr->v_samp_factor;
-    compptr->last_row_height = tmp;
-
-    /* Prepare array describing MCU composition */
-    cinfo->blocks_in_MCU = 1;
-    cinfo->MCU_membership[0] = 0;
-
-  } else {
-
-    /* Interleaved (multi-component) scan */
-    if (cinfo->comps_in_scan <= 0 || cinfo->comps_in_scan > MAX_COMPS_IN_SCAN)
-      ERREXIT2(cinfo, JERR_COMPONENT_COUNT, cinfo->comps_in_scan,
-	       MAX_COMPS_IN_SCAN);
-
-    /* Overall image size in MCUs */
-    cinfo->MCUs_per_row = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width,
-		    (long) (cinfo->max_h_samp_factor*DCTSIZE));
-    cinfo->MCU_rows_in_scan = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height,
-		    (long) (cinfo->max_v_samp_factor*DCTSIZE));
-
-    cinfo->blocks_in_MCU = 0;
-
-    for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-      compptr = cinfo->cur_comp_info[ci];
-      /* Sampling factors give # of blocks of component in each MCU */
-      compptr->MCU_width = compptr->h_samp_factor;
-      compptr->MCU_height = compptr->v_samp_factor;
-      compptr->MCU_blocks = compptr->MCU_width * compptr->MCU_height;
-      compptr->MCU_sample_width = compptr->MCU_width * compptr->DCT_scaled_size;
-      /* Figure number of non-dummy blocks in last MCU column & row */
-      tmp = (int) (compptr->width_in_blocks % compptr->MCU_width);
-      if (tmp == 0) tmp = compptr->MCU_width;
-      compptr->last_col_width = tmp;
-      tmp = (int) (compptr->height_in_blocks % compptr->MCU_height);
-      if (tmp == 0) tmp = compptr->MCU_height;
-      compptr->last_row_height = tmp;
-      /* Prepare array describing MCU composition */
-      mcublks = compptr->MCU_blocks;
-      if (cinfo->blocks_in_MCU + mcublks > D_MAX_BLOCKS_IN_MCU)
-	ERREXIT(cinfo, JERR_BAD_MCU_SIZE);
-      while (mcublks-- > 0) {
-	cinfo->MCU_membership[cinfo->blocks_in_MCU++] = ci;
-      }
-    }
-
-  }
-}
-
-
-/*
- * Save away a copy of the Q-table referenced by each component present
- * in the current scan, unless already saved during a prior scan.
- *
- * In a multiple-scan JPEG file, the encoder could assign different components
- * the same Q-table slot number, but change table definitions between scans
- * so that each component uses a different Q-table.  (The IJG encoder is not
- * currently capable of doing this, but other encoders might.)  Since we want
- * to be able to dequantize all the components at the end of the file, this
- * means that we have to save away the table actually used for each component.
- * We do this by copying the table at the start of the first scan containing
- * the component.
- * The JPEG spec prohibits the encoder from changing the contents of a Q-table
- * slot between scans of a component using that slot.  If the encoder does so
- * anyway, this decoder will simply use the Q-table values that were current
- * at the start of the first scan for the component.
- *
- * The decompressor output side looks only at the saved quant tables,
- * not at the current Q-table slots.
- */
-
-LOCAL(void)
-latch_quant_tables (j_decompress_ptr cinfo)
-{
-  int ci, qtblno;
-  jpeg_component_info *compptr;
-  JQUANT_TBL * qtbl;
-
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    /* No work if we already saved Q-table for this component */
-    if (compptr->quant_table != NULL)
-      continue;
-    /* Make sure specified quantization table is present */
-    qtblno = compptr->quant_tbl_no;
-    if (qtblno < 0 || qtblno >= NUM_QUANT_TBLS ||
-	cinfo->quant_tbl_ptrs[qtblno] == NULL)
-      ERREXIT1(cinfo, JERR_NO_QUANT_TABLE, qtblno);
-    /* OK, save away the quantization table */
-    qtbl = (JQUANT_TBL *)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  SIZEOF(JQUANT_TBL));
-    MEMCOPY(qtbl, cinfo->quant_tbl_ptrs[qtblno], SIZEOF(JQUANT_TBL));
-    compptr->quant_table = qtbl;
-  }
-}
-
-
-/*
- * Initialize the input modules to read a scan of compressed data.
- * The first call to this is done by jdmaster.c after initializing
- * the entire decompressor (during jpeg_start_decompress).
- * Subsequent calls come from consume_markers, below.
- */
-
-METHODDEF(void)
-start_input_pass (j_decompress_ptr cinfo)
-{
-  per_scan_setup(cinfo);
-  latch_quant_tables(cinfo);
-  (*cinfo->entropy->start_pass) (cinfo);
-#if defined(__VISAGECPP__)
-  (*cinfo->coef->start_input_pass2) (cinfo);
-#else
-  (*cinfo->coef->start_input_pass) (cinfo);
-#endif
-  cinfo->inputctl->consume_input = cinfo->coef->consume_data;
-}
-
-
-/*
- * Finish up after inputting a compressed-data scan.
- * This is called by the coefficient controller after it's read all
- * the expected data of the scan.
- */
-
-METHODDEF(void)
-finish_input_pass (j_decompress_ptr cinfo)
-{
-  cinfo->inputctl->consume_input = consume_markers;
-}
-
-
-/*
- * Read JPEG markers before, between, or after compressed-data scans.
- * Change state as necessary when a new scan is reached.
- * Return value is JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
- *
- * The consume_input method pointer points either here or to the
- * coefficient controller's consume_data routine, depending on whether
- * we are reading a compressed data segment or inter-segment markers.
- */
-
-METHODDEF(int)
-consume_markers (j_decompress_ptr cinfo)
-{
-  my_inputctl_ptr inputctl = (my_inputctl_ptr) cinfo->inputctl;
-  int val;
-
-  if (inputctl->pub.eoi_reached) /* After hitting EOI, read no further */
-    return JPEG_REACHED_EOI;
-
-  val = (*cinfo->marker->read_markers) (cinfo);
-
-  switch (val) {
-  case JPEG_REACHED_SOS:	/* Found SOS */
-    if (inputctl->inheaders) {	/* 1st SOS */
-      initial_setup(cinfo);
-      inputctl->inheaders = FALSE;
-      /* Note: start_input_pass must be called by jdmaster.c
-       * before any more input can be consumed.  jdapimin.c is
-       * responsible for enforcing this sequencing.
-       */
-    } else {			/* 2nd or later SOS marker */
-      if (! inputctl->pub.has_multiple_scans)
-	ERREXIT(cinfo, JERR_EOI_EXPECTED); /* Oops, I wasn't expecting this! */
-      start_input_pass(cinfo);
-    }
-    break;
-  case JPEG_REACHED_EOI:	/* Found EOI */
-    inputctl->pub.eoi_reached = TRUE;
-    if (inputctl->inheaders) {	/* Tables-only datastream, apparently */
-      if (cinfo->marker->saw_SOF)
-	ERREXIT(cinfo, JERR_SOF_NO_SOS);
-    } else {
-      /* Prevent infinite loop in coef ctlr's decompress_data routine
-       * if user set output_scan_number larger than number of scans.
-       */
-      if (cinfo->output_scan_number > cinfo->input_scan_number)
-	cinfo->output_scan_number = cinfo->input_scan_number;
-    }
-    break;
-  case JPEG_SUSPENDED:
-    break;
-  }
-
-  return val;
-}
-
-
-/*
- * Reset state to begin a fresh datastream.
- */
-
-METHODDEF(void)
-reset_input_controller (j_decompress_ptr cinfo)
-{
-  my_inputctl_ptr inputctl = (my_inputctl_ptr) cinfo->inputctl;
-
-  inputctl->pub.consume_input = consume_markers;
-  inputctl->pub.has_multiple_scans = FALSE; /* "unknown" would be better */
-  inputctl->pub.eoi_reached = FALSE;
-  inputctl->inheaders = TRUE;
-  /* Reset other modules */
-  (*cinfo->err->reset_error_mgr) ((j_common_ptr) cinfo);
-  (*cinfo->marker->reset_marker_reader) (cinfo);
-  /* Reset progression state -- would be cleaner if entropy decoder did this */
-  cinfo->coef_bits = NULL;
-}
-
-
-/*
- * Initialize the input controller module.
- * This is called only once, when the decompression object is created.
- */
-
-GLOBAL(void)
-jinit_input_controller (j_decompress_ptr cinfo)
-{
-  my_inputctl_ptr inputctl;
-
-  /* Create subobject in permanent pool */
-  inputctl = (my_inputctl_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-				SIZEOF(my_input_controller));
-  cinfo->inputctl = (struct jpeg_input_controller *) inputctl;
-  /* Initialize method pointers */
-  inputctl->pub.consume_input = consume_markers;
-  inputctl->pub.reset_input_controller = reset_input_controller;
-  inputctl->pub.start_input_pass = start_input_pass;
-  inputctl->pub.finish_input_pass = finish_input_pass;
-  /* Initialize state: can't use reset_input_controller since we don't
-   * want to try to reset other modules yet.
-   */
-  inputctl->pub.has_multiple_scans = FALSE; /* "unknown" would be better */
-  inputctl->pub.eoi_reached = FALSE;
-  inputctl->inheaders = TRUE;
-}
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdmainct.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdmainct.c
deleted file mode 100644
index cd55e8ce1c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdmainct.c
+++ /dev/null
@@ -1,529 +0,0 @@
-/*
- * jdmainct.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the main buffer controller for decompression.
- * The main buffer lies between the JPEG decompressor proper and the
- * post-processor; it holds downsampled data in the JPEG colorspace.
- *
- * Note that this code is bypassed in raw-data mode, since the application
- * supplies the equivalent of the main buffer in that case.
- */
-
-/* suppress the warnings about using main for the variable names */
-#define main jpegMain
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-/*
- * In the current system design, the main buffer need never be a full-image
- * buffer; any full-height buffers will be found inside the coefficient or
- * postprocessing controllers.  Nonetheless, the main controller is not
- * trivial.  Its responsibility is to provide context rows for upsampling/
- * rescaling, and doing this in an efficient fashion is a bit tricky.
- *
- * Postprocessor input data is counted in "row groups".  A row group
- * is defined to be (v_samp_factor * DCT_scaled_size / min_DCT_scaled_size)
- * sample rows of each component.  (We require DCT_scaled_size values to be
- * chosen such that these numbers are integers.  In practice DCT_scaled_size
- * values will likely be powers of two, so we actually have the stronger
- * condition that DCT_scaled_size / min_DCT_scaled_size is an integer.)
- * Upsampling will typically produce max_v_samp_factor pixel rows from each
- * row group (times any additional scale factor that the upsampler is
- * applying).
- *
- * The coefficient controller will deliver data to us one iMCU row at a time;
- * each iMCU row contains v_samp_factor * DCT_scaled_size sample rows, or
- * exactly min_DCT_scaled_size row groups.  (This amount of data corresponds
- * to one row of MCUs when the image is fully interleaved.)  Note that the
- * number of sample rows varies across components, but the number of row
- * groups does not.  Some garbage sample rows may be included in the last iMCU
- * row at the bottom of the image.
- *
- * Depending on the vertical scaling algorithm used, the upsampler may need
- * access to the sample row(s) above and below its current input row group.
- * The upsampler is required to set need_context_rows TRUE at global selection
- * time if so.  When need_context_rows is FALSE, this controller can simply
- * obtain one iMCU row at a time from the coefficient controller and dole it
- * out as row groups to the postprocessor.
- *
- * When need_context_rows is TRUE, this controller guarantees that the buffer
- * passed to postprocessing contains at least one row group's worth of samples
- * above and below the row group(s) being processed.  Note that the context
- * rows "above" the first passed row group appear at negative row offsets in
- * the passed buffer.  At the top and bottom of the image, the required
- * context rows are manufactured by duplicating the first or last real sample
- * row; this avoids having special cases in the upsampling inner loops.
- *
- * The amount of context is fixed at one row group just because that's a
- * convenient number for this controller to work with.  The existing
- * upsamplers really only need one sample row of context.  An upsampler
- * supporting arbitrary output rescaling might wish for more than one row
- * group of context when shrinking the image; tough, we don't handle that.
- * (This is justified by the assumption that downsizing will be handled mostly
- * by adjusting the DCT_scaled_size values, so that the actual scale factor at
- * the upsample step needn't be much less than one.)
- *
- * To provide the desired context, we have to retain the last two row groups
- * of one iMCU row while reading in the next iMCU row.  (The last row group
- * can't be processed until we have another row group for its below-context,
- * and so we have to save the next-to-last group too for its above-context.)
- * We could do this most simply by copying data around in our buffer, but
- * that'd be very slow.  We can avoid copying any data by creating a rather
- * strange pointer structure.  Here's how it works.  We allocate a workspace
- * consisting of M+2 row groups (where M = min_DCT_scaled_size is the number
- * of row groups per iMCU row).  We create two sets of redundant pointers to
- * the workspace.  Labeling the physical row groups 0 to M+1, the synthesized
- * pointer lists look like this:
- *                   M+1                          M-1
- * master pointer --> 0         master pointer --> 0
- *                    1                            1
- *                   ...                          ...
- *                   M-3                          M-3
- *                   M-2                           M
- *                   M-1                          M+1
- *                    M                           M-2
- *                   M+1                          M-1
- *                    0                            0
- * We read alternate iMCU rows using each master pointer; thus the last two
- * row groups of the previous iMCU row remain un-overwritten in the workspace.
- * The pointer lists are set up so that the required context rows appear to
- * be adjacent to the proper places when we pass the pointer lists to the
- * upsampler.
- *
- * The above pictures describe the normal state of the pointer lists.
- * At top and bottom of the image, we diddle the pointer lists to duplicate
- * the first or last sample row as necessary (this is cheaper than copying
- * sample rows around).
- *
- * This scheme breaks down if M < 2, ie, min_DCT_scaled_size is 1.  In that
- * situation each iMCU row provides only one row group so the buffering logic
- * must be different (eg, we must read two iMCU rows before we can emit the
- * first row group).  For now, we simply do not support providing context
- * rows when min_DCT_scaled_size is 1.  That combination seems unlikely to
- * be worth providing --- if someone wants a 1/8th-size preview, they probably
- * want it quick and dirty, so a context-free upsampler is sufficient.
- */
-
-
-/* Private buffer controller object */
-
-typedef struct {
-  struct jpeg_d_main_controller pub; /* public fields */
-
-  /* Pointer to allocated workspace (M or M+2 row groups). */
-  JSAMPARRAY buffer[MAX_COMPONENTS];
-
-  wxjpeg_boolean buffer_full;		/* Have we gotten an iMCU row from decoder? */
-  JDIMENSION rowgroup_ctr;	/* counts row groups output to postprocessor */
-
-  /* Remaining fields are only used in the context case. */
-
-  /* These are the master pointers to the funny-order pointer lists. */
-  JSAMPIMAGE xbuffer[2];	/* pointers to weird pointer lists */
-
-  int whichptr;			/* indicates which pointer set is now in use */
-  int context_state;		/* process_data state machine status */
-  JDIMENSION rowgroups_avail;	/* row groups available to postprocessor */
-  JDIMENSION iMCU_row_ctr;	/* counts iMCU rows to detect image top/bot */
-} my_main_controller;
-
-typedef my_main_controller * my_main_ptr;
-
-/* context_state values: */
-#define CTX_PREPARE_FOR_IMCU	0	/* need to prepare for MCU row */
-#define CTX_PROCESS_IMCU	1	/* feeding iMCU to postprocessor */
-#define CTX_POSTPONED_ROW	2	/* feeding postponed row group */
-
-
-#if defined(__VISAGECPP__)
-/* Visual Age fixups for multiple declarations */
-#  define start_pass_main   start_pass_main2 /* already in jcmaint.c */
-#  define process_data_simple_main process_data_simple_main2 /* already in jcmaint.c */
-#endif
-
-/* Forward declarations */
-METHODDEF(void) process_data_simple_main
-	JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,
-	     JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail));
-METHODDEF(void) process_data_context_main
-	JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,
-	     JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail));
-#ifdef QUANT_2PASS_SUPPORTED
-METHODDEF(void) process_data_crank_post
-	JPP((j_decompress_ptr cinfo, JSAMPARRAY output_buf,
-	     JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail));
-#endif
-
-
-LOCAL(void)
-alloc_funny_pointers (j_decompress_ptr cinfo)
-/* Allocate space for the funny pointer lists.
- * This is done only once, not once per pass.
- */
-{
-  my_main_ptr main = (my_main_ptr) cinfo->main;
-  int ci, rgroup;
-  int M = cinfo->min_DCT_scaled_size;
-  jpeg_component_info *compptr;
-  JSAMPARRAY xbuf;
-
-  /* Get top-level space for component array pointers.
-   * We alloc both arrays with one call to save a few cycles.
-   */
-  main->xbuffer[0] = (JSAMPIMAGE)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				cinfo->num_components * 2 * SIZEOF(JSAMPARRAY));
-  main->xbuffer[1] = main->xbuffer[0] + cinfo->num_components;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    rgroup = (compptr->v_samp_factor * compptr->DCT_scaled_size) /
-      cinfo->min_DCT_scaled_size; /* height of a row group of component */
-    /* Get space for pointer lists --- M+4 row groups in each list.
-     * We alloc both pointer lists with one call to save a few cycles.
-     */
-    xbuf = (JSAMPARRAY)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  2 * (rgroup * (M + 4)) * SIZEOF(JSAMPROW));
-    xbuf += rgroup;		/* want one row group at negative offsets */
-    main->xbuffer[0][ci] = xbuf;
-    xbuf += rgroup * (M + 4);
-    main->xbuffer[1][ci] = xbuf;
-  }
-}
-
-
-LOCAL(void)
-make_funny_pointers (j_decompress_ptr cinfo)
-/* Create the funny pointer lists discussed in the comments above.
- * The actual workspace is already allocated (in main->buffer),
- * and the space for the pointer lists is allocated too.
- * This routine just fills in the curiously ordered lists.
- * This will be repeated at the beginning of each pass.
- */
-{
-  my_main_ptr main = (my_main_ptr) cinfo->main;
-  int ci, i, rgroup;
-  int M = cinfo->min_DCT_scaled_size;
-  jpeg_component_info *compptr;
-  JSAMPARRAY buf, xbuf0, xbuf1;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    rgroup = (compptr->v_samp_factor * compptr->DCT_scaled_size) /
-      cinfo->min_DCT_scaled_size; /* height of a row group of component */
-    xbuf0 = main->xbuffer[0][ci];
-    xbuf1 = main->xbuffer[1][ci];
-    /* First copy the workspace pointers as-is */
-    buf = main->buffer[ci];
-    for (i = 0; i < rgroup * (M + 2); i++) {
-      xbuf0[i] = xbuf1[i] = buf[i];
-    }
-    /* In the second list, put the last four row groups in swapped order */
-    for (i = 0; i < rgroup * 2; i++) {
-      xbuf1[rgroup*(M-2) + i] = buf[rgroup*M + i];
-      xbuf1[rgroup*M + i] = buf[rgroup*(M-2) + i];
-    }
-    /* The wraparound pointers at top and bottom will be filled later
-     * (see set_wraparound_pointers, below).  Initially we want the "above"
-     * pointers to duplicate the first actual data line.  This only needs
-     * to happen in xbuffer[0].
-     */
-    for (i = 0; i < rgroup; i++) {
-      xbuf0[i - rgroup] = xbuf0[0];
-    }
-  }
-}
-
-
-LOCAL(void)
-set_wraparound_pointers (j_decompress_ptr cinfo)
-/* Set up the "wraparound" pointers at top and bottom of the pointer lists.
- * This changes the pointer list state from top-of-image to the normal state.
- */
-{
-  my_main_ptr main = (my_main_ptr) cinfo->main;
-  int ci, i, rgroup;
-  int M = cinfo->min_DCT_scaled_size;
-  jpeg_component_info *compptr;
-  JSAMPARRAY xbuf0, xbuf1;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    rgroup = (compptr->v_samp_factor * compptr->DCT_scaled_size) /
-      cinfo->min_DCT_scaled_size; /* height of a row group of component */
-    xbuf0 = main->xbuffer[0][ci];
-    xbuf1 = main->xbuffer[1][ci];
-    for (i = 0; i < rgroup; i++) {
-      xbuf0[i - rgroup] = xbuf0[rgroup*(M+1) + i];
-      xbuf1[i - rgroup] = xbuf1[rgroup*(M+1) + i];
-      xbuf0[rgroup*(M+2) + i] = xbuf0[i];
-      xbuf1[rgroup*(M+2) + i] = xbuf1[i];
-    }
-  }
-}
-
-
-LOCAL(void)
-set_bottom_pointers (j_decompress_ptr cinfo)
-/* Change the pointer lists to duplicate the last sample row at the bottom
- * of the image.  whichptr indicates which xbuffer holds the final iMCU row.
- * Also sets rowgroups_avail to indicate number of nondummy row groups in row.
- */
-{
-  my_main_ptr main = (my_main_ptr) cinfo->main;
-  int ci, i, rgroup, iMCUheight, rows_left;
-  jpeg_component_info *compptr;
-  JSAMPARRAY xbuf;
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Count sample rows in one iMCU row and in one row group */
-    iMCUheight = compptr->v_samp_factor * compptr->DCT_scaled_size;
-    rgroup = iMCUheight / cinfo->min_DCT_scaled_size;
-    /* Count nondummy sample rows remaining for this component */
-    rows_left = (int) (compptr->downsampled_height % (JDIMENSION) iMCUheight);
-    if (rows_left == 0) rows_left = iMCUheight;
-    /* Count nondummy row groups.  Should get same answer for each component,
-     * so we need only do it once.
-     */
-    if (ci == 0) {
-      main->rowgroups_avail = (JDIMENSION) ((rows_left-1) / rgroup + 1);
-    }
-    /* Duplicate the last real sample row rgroup*2 times; this pads out the
-     * last partial rowgroup and ensures at least one full rowgroup of context.
-     */
-    xbuf = main->xbuffer[main->whichptr][ci];
-    for (i = 0; i < rgroup * 2; i++) {
-      xbuf[rows_left + i] = xbuf[rows_left-1];
-    }
-  }
-}
-
-
-/*
- * Initialize for a processing pass.
- */
-
-METHODDEF(void)
-start_pass_main (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)
-{
-  my_main_ptr main = (my_main_ptr) cinfo->main;
-
-  switch (pass_mode) {
-  case JBUF_PASS_THRU:
-    if (cinfo->upsample->need_context_rows) {
-      main->pub.process_data = process_data_context_main;
-      make_funny_pointers(cinfo); /* Create the xbuffer[] lists */
-      main->whichptr = 0;	/* Read first iMCU row into xbuffer[0] */
-      main->context_state = CTX_PREPARE_FOR_IMCU;
-      main->iMCU_row_ctr = 0;
-    } else {
-      /* Simple case with no context needed */
-      main->pub.process_data = process_data_simple_main;
-    }
-    main->buffer_full = FALSE;	/* Mark buffer empty */
-    main->rowgroup_ctr = 0;
-    break;
-#ifdef QUANT_2PASS_SUPPORTED
-  case JBUF_CRANK_DEST:
-    /* For last pass of 2-pass quantization, just crank the postprocessor */
-    main->pub.process_data = process_data_crank_post;
-    break;
-#endif
-  default:
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    break;
-  }
-}
-
-
-/*
- * Process some data.
- * This handles the simple case where no context is required.
- */
-
-METHODDEF(void)
-process_data_simple_main (j_decompress_ptr cinfo,
-			  JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-			  JDIMENSION out_rows_avail)
-{
-  my_main_ptr main = (my_main_ptr) cinfo->main;
-  JDIMENSION rowgroups_avail;
-
-  /* Read input data if we haven't filled the main buffer yet */
-  if (! main->buffer_full) {
-    if (! (*cinfo->coef->decompress_data) (cinfo, main->buffer))
-      return;			/* suspension forced, can do nothing more */
-    main->buffer_full = TRUE;	/* OK, we have an iMCU row to work with */
-  }
-
-  /* There are always min_DCT_scaled_size row groups in an iMCU row. */
-  rowgroups_avail = (JDIMENSION) cinfo->min_DCT_scaled_size;
-  /* Note: at the bottom of the image, we may pass extra garbage row groups
-   * to the postprocessor.  The postprocessor has to check for bottom
-   * of image anyway (at row resolution), so no point in us doing it too.
-   */
-
-  /* Feed the postprocessor */
-  (*cinfo->post->post_process_data) (cinfo, main->buffer,
-				     &main->rowgroup_ctr, rowgroups_avail,
-				     output_buf, out_row_ctr, out_rows_avail);
-
-  /* Has postprocessor consumed all the data yet? If so, mark buffer empty */
-  if (main->rowgroup_ctr >= rowgroups_avail) {
-    main->buffer_full = FALSE;
-    main->rowgroup_ctr = 0;
-  }
-}
-
-
-/*
- * Process some data.
- * This handles the case where context rows must be provided.
- */
-
-METHODDEF(void)
-process_data_context_main (j_decompress_ptr cinfo,
-			   JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-			   JDIMENSION out_rows_avail)
-{
-  my_main_ptr main = (my_main_ptr) cinfo->main;
-
-  /* Read input data if we haven't filled the main buffer yet */
-  if (! main->buffer_full) {
-    if (! (*cinfo->coef->decompress_data) (cinfo,
-					   main->xbuffer[main->whichptr]))
-      return;			/* suspension forced, can do nothing more */
-    main->buffer_full = TRUE;	/* OK, we have an iMCU row to work with */
-    main->iMCU_row_ctr++;	/* count rows received */
-  }
-
-  /* Postprocessor typically will not swallow all the input data it is handed
-   * in one call (due to filling the output buffer first).  Must be prepared
-   * to exit and restart.  This switch lets us keep track of how far we got.
-   * Note that each case falls through to the next on successful completion.
-   */
-  switch (main->context_state) {
-  case CTX_POSTPONED_ROW:
-    /* Call postprocessor using previously set pointers for postponed row */
-    (*cinfo->post->post_process_data) (cinfo, main->xbuffer[main->whichptr],
-			&main->rowgroup_ctr, main->rowgroups_avail,
-			output_buf, out_row_ctr, out_rows_avail);
-    if (main->rowgroup_ctr < main->rowgroups_avail)
-      return;			/* Need to suspend */
-    main->context_state = CTX_PREPARE_FOR_IMCU;
-    if (*out_row_ctr >= out_rows_avail)
-      return;			/* Postprocessor exactly filled output buf */
-    /*FALLTHROUGH*/
-  case CTX_PREPARE_FOR_IMCU:
-    /* Prepare to process first M-1 row groups of this iMCU row */
-    main->rowgroup_ctr = 0;
-    main->rowgroups_avail = (JDIMENSION) (cinfo->min_DCT_scaled_size - 1);
-    /* Check for bottom of image: if so, tweak pointers to "duplicate"
-     * the last sample row, and adjust rowgroups_avail to ignore padding rows.
-     */
-    if (main->iMCU_row_ctr == cinfo->total_iMCU_rows)
-      set_bottom_pointers(cinfo);
-    main->context_state = CTX_PROCESS_IMCU;
-    /*FALLTHROUGH*/
-  case CTX_PROCESS_IMCU:
-    /* Call postprocessor using previously set pointers */
-    (*cinfo->post->post_process_data) (cinfo, main->xbuffer[main->whichptr],
-			&main->rowgroup_ctr, main->rowgroups_avail,
-			output_buf, out_row_ctr, out_rows_avail);
-    if (main->rowgroup_ctr < main->rowgroups_avail)
-      return;			/* Need to suspend */
-    /* After the first iMCU, change wraparound pointers to normal state */
-    if (main->iMCU_row_ctr == 1)
-      set_wraparound_pointers(cinfo);
-    /* Prepare to load new iMCU row using other xbuffer list */
-    main->whichptr ^= 1;	/* 0=>1 or 1=>0 */
-    main->buffer_full = FALSE;
-    /* Still need to process last row group of this iMCU row, */
-    /* which is saved at index M+1 of the other xbuffer */
-    main->rowgroup_ctr = (JDIMENSION) (cinfo->min_DCT_scaled_size + 1);
-    main->rowgroups_avail = (JDIMENSION) (cinfo->min_DCT_scaled_size + 2);
-    main->context_state = CTX_POSTPONED_ROW;
-  }
-}
-
-
-/*
- * Process some data.
- * Final pass of two-pass quantization: just call the postprocessor.
- * Source data will be the postprocessor controller's internal buffer.
- */
-
-#ifdef QUANT_2PASS_SUPPORTED
-
-METHODDEF(void)
-process_data_crank_post (j_decompress_ptr cinfo,
-			 JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-			 JDIMENSION out_rows_avail)
-{
-  (*cinfo->post->post_process_data) (cinfo, (JSAMPIMAGE) NULL,
-				     (JDIMENSION *) NULL, (JDIMENSION) 0,
-				     output_buf, out_row_ctr, out_rows_avail);
-}
-
-#endif /* QUANT_2PASS_SUPPORTED */
-
-
-/*
- * Initialize main buffer controller.
- */
-
-GLOBAL(void)
-jinit_d_main_controller (j_decompress_ptr cinfo, wxjpeg_boolean need_full_buffer)
-{
-  my_main_ptr main;
-  int ci, rgroup, ngroups;
-  jpeg_component_info *compptr;
-
-  main = (my_main_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_main_controller));
-  cinfo->main = (struct jpeg_d_main_controller *) main;
-  main->pub.start_pass = start_pass_main;
-
-  if (need_full_buffer)		/* shouldn't happen */
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-
-  /* Allocate the workspace.
-   * ngroups is the number of row groups we need.
-   */
-  if (cinfo->upsample->need_context_rows) {
-    if (cinfo->min_DCT_scaled_size < 2) /* unsupported, see comments above */
-      ERREXIT(cinfo, JERR_NOTIMPL);
-    alloc_funny_pointers(cinfo); /* Alloc space for xbuffer[] lists */
-    ngroups = cinfo->min_DCT_scaled_size + 2;
-  } else {
-    ngroups = cinfo->min_DCT_scaled_size;
-  }
-
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    rgroup = (compptr->v_samp_factor * compptr->DCT_scaled_size) /
-      cinfo->min_DCT_scaled_size; /* height of a row group of component */
-    main->buffer[ci] = (*cinfo->mem->alloc_sarray)
-			((j_common_ptr) cinfo, JPOOL_IMAGE,
-			 compptr->width_in_blocks * compptr->DCT_scaled_size,
-			 (JDIMENSION) (rgroup * ngroups));
-  }
-}
-
-#if defined(__VISAGECPP__)
-#  ifdef start_pass_main2
-#   undef start_pass_main2
-#  endif
-#  ifdef process_data_simple_main2
-#   undef process_data_simple_main2
-#  endif
-#endif
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdmarker.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdmarker.c
deleted file mode 100644
index 39bed54224..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdmarker.c
+++ /dev/null
@@ -1,1360 +0,0 @@
-/*
- * jdmarker.c
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains routines to decode JPEG datastream markers.
- * Most of the complexity arises from our desire to support input
- * suspension: if not all of the data for a marker is available,
- * we must exit back to the application.  On resumption, we reprocess
- * the marker.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-typedef enum {			/* JPEG marker codes */
-  M_SOF0  = 0xc0,
-  M_SOF1  = 0xc1,
-  M_SOF2  = 0xc2,
-  M_SOF3  = 0xc3,
-  
-  M_SOF5  = 0xc5,
-  M_SOF6  = 0xc6,
-  M_SOF7  = 0xc7,
-  
-  M_JPG   = 0xc8,
-  M_SOF9  = 0xc9,
-  M_SOF10 = 0xca,
-  M_SOF11 = 0xcb,
-  
-  M_SOF13 = 0xcd,
-  M_SOF14 = 0xce,
-  M_SOF15 = 0xcf,
-  
-  M_DHT   = 0xc4,
-  
-  M_DAC   = 0xcc,
-  
-  M_RST0  = 0xd0,
-  M_RST1  = 0xd1,
-  M_RST2  = 0xd2,
-  M_RST3  = 0xd3,
-  M_RST4  = 0xd4,
-  M_RST5  = 0xd5,
-  M_RST6  = 0xd6,
-  M_RST7  = 0xd7,
-  
-  M_SOI   = 0xd8,
-  M_EOI   = 0xd9,
-  M_SOS   = 0xda,
-  M_DQT   = 0xdb,
-  M_DNL   = 0xdc,
-  M_DRI   = 0xdd,
-  M_DHP   = 0xde,
-  M_EXP   = 0xdf,
-  
-  M_APP0  = 0xe0,
-  M_APP1  = 0xe1,
-  M_APP2  = 0xe2,
-  M_APP3  = 0xe3,
-  M_APP4  = 0xe4,
-  M_APP5  = 0xe5,
-  M_APP6  = 0xe6,
-  M_APP7  = 0xe7,
-  M_APP8  = 0xe8,
-  M_APP9  = 0xe9,
-  M_APP10 = 0xea,
-  M_APP11 = 0xeb,
-  M_APP12 = 0xec,
-  M_APP13 = 0xed,
-  M_APP14 = 0xee,
-  M_APP15 = 0xef,
-  
-  M_JPG0  = 0xf0,
-  M_JPG13 = 0xfd,
-  M_COM   = 0xfe,
-  
-  M_TEM   = 0x01,
-  
-  M_ERROR = 0x100
-} JPEG_MARKER;
-
-
-/* Private state */
-
-typedef struct {
-  struct jpeg_marker_reader pub; /* public fields */
-
-  /* Application-overridable marker processing methods */
-  jpeg_marker_parser_method process_COM;
-  jpeg_marker_parser_method process_APPn[16];
-
-  /* Limit on marker data length to save for each marker type */
-  unsigned int length_limit_COM;
-  unsigned int length_limit_APPn[16];
-
-  /* Status of COM/APPn marker saving */
-  jpeg_saved_marker_ptr cur_marker;	/* NULL if not processing a marker */
-  unsigned int bytes_read;		/* data bytes read so far in marker */
-  /* Note: cur_marker is not linked into marker_list until it's all read. */
-} my_marker_reader;
-
-typedef my_marker_reader * my_marker_ptr;
-
-
-/*
- * Macros for fetching data from the data source module.
- *
- * At all times, cinfo->src->next_input_byte and ->bytes_in_buffer reflect
- * the current restart point; we update them only when we have reached a
- * suitable place to restart if a suspension occurs.
- */
-
-/* Declare and initialize local copies of input pointer/count */
-#define INPUT_VARS(cinfo)  \
-	struct jpeg_source_mgr * datasrc = (cinfo)->src;  \
-	const JOCTET * next_input_byte = datasrc->next_input_byte;  \
-	size_t bytes_in_buffer = datasrc->bytes_in_buffer
-
-/* Unload the local copies --- do this only at a restart boundary */
-#define INPUT_SYNC(cinfo)  \
-	( datasrc->next_input_byte = next_input_byte,  \
-	  datasrc->bytes_in_buffer = bytes_in_buffer )
-
-/* Reload the local copies --- used only in MAKE_BYTE_AVAIL */
-#define INPUT_RELOAD(cinfo)  \
-	( next_input_byte = datasrc->next_input_byte,  \
-	  bytes_in_buffer = datasrc->bytes_in_buffer )
-
-/* Internal macro for INPUT_BYTE and INPUT_2BYTES: make a byte available.
- * Note we do *not* do INPUT_SYNC before calling fill_input_buffer,
- * but we must reload the local copies after a successful fill.
- */
-#define MAKE_BYTE_AVAIL(cinfo,action)  \
-	if (bytes_in_buffer == 0) {  \
-	  if (! (*datasrc->fill_input_buffer) (cinfo))  \
-	    { action; }  \
-	  INPUT_RELOAD(cinfo);  \
-	}
-
-/* Read a byte into variable V.
- * If must suspend, take the specified action (typically "return FALSE").
- */
-#define INPUT_BYTE(cinfo,V,action)  \
-	MAKESTMT( MAKE_BYTE_AVAIL(cinfo,action); \
-		  bytes_in_buffer--; \
-		  V = GETJOCTET(*next_input_byte++); )
-
-/* As above, but read two bytes interpreted as an unsigned 16-bit integer.
- * V should be declared unsigned int or perhaps INT32.
- */
-#define INPUT_2BYTES(cinfo,V,action)  \
-	MAKESTMT( MAKE_BYTE_AVAIL(cinfo,action); \
-		  bytes_in_buffer--; \
-		  V = ((unsigned int) GETJOCTET(*next_input_byte++)) << 8; \
-		  MAKE_BYTE_AVAIL(cinfo,action); \
-		  bytes_in_buffer--; \
-		  V += GETJOCTET(*next_input_byte++); )
-
-
-/*
- * Routines to process JPEG markers.
- *
- * Entry condition: JPEG marker itself has been read and its code saved
- *   in cinfo->unread_marker; input restart point is just after the marker.
- *
- * Exit: if return TRUE, have read and processed any parameters, and have
- *   updated the restart point to point after the parameters.
- *   If return FALSE, was forced to suspend before reaching end of
- *   marker parameters; restart point has not been moved.  Same routine
- *   will be called again after application supplies more input data.
- *
- * This approach to suspension assumes that all of a marker's parameters
- * can fit into a single input bufferload.  This should hold for "normal"
- * markers.  Some COM/APPn markers might have large parameter segments
- * that might not fit.  If we are simply dropping such a marker, we use
- * skip_input_data to get past it, and thereby put the problem on the
- * source manager's shoulders.  If we are saving the marker's contents
- * into memory, we use a slightly different convention: when forced to
- * suspend, the marker processor updates the restart point to the end of
- * what it's consumed (ie, the end of the buffer) before returning FALSE.
- * On resumption, cinfo->unread_marker still contains the marker code,
- * but the data source will point to the next chunk of marker data.
- * The marker processor must retain internal state to deal with this.
- *
- * Note that we don't bother to avoid duplicate trace messages if a
- * suspension occurs within marker parameters.  Other side effects
- * require more care.
- */
-
-
-LOCAL(wxjpeg_boolean)
-get_soi (j_decompress_ptr cinfo)
-/* Process an SOI marker */
-{
-  int i;
-  
-  TRACEMS(cinfo, 1, JTRC_SOI);
-
-  if (cinfo->marker->saw_SOI)
-    ERREXIT(cinfo, JERR_SOI_DUPLICATE);
-
-  /* Reset all parameters that are defined to be reset by SOI */
-
-  for (i = 0; i < NUM_ARITH_TBLS; i++) {
-    cinfo->arith_dc_L[i] = 0;
-    cinfo->arith_dc_U[i] = 1;
-    cinfo->arith_ac_K[i] = 5;
-  }
-  cinfo->restart_interval = 0;
-
-  /* Set initial assumptions for colorspace etc */
-
-  cinfo->jpeg_color_space = JCS_UNKNOWN;
-  cinfo->CCIR601_sampling = FALSE; /* Assume non-CCIR sampling??? */
-
-  cinfo->saw_JFIF_marker = FALSE;
-  cinfo->JFIF_major_version = 1; /* set default JFIF APP0 values */
-  cinfo->JFIF_minor_version = 1;
-  cinfo->density_unit = 0;
-  cinfo->X_density = 1;
-  cinfo->Y_density = 1;
-  cinfo->saw_Adobe_marker = FALSE;
-  cinfo->Adobe_transform = 0;
-
-  cinfo->marker->saw_SOI = TRUE;
-
-  return TRUE;
-}
-
-
-LOCAL(wxjpeg_boolean)
-get_sof (j_decompress_ptr cinfo, wxjpeg_boolean is_prog, wxjpeg_boolean is_arith)
-/* Process a SOFn marker */
-{
-  JPEG_INT32 length;
-  int c, ci;
-  jpeg_component_info * compptr;
-  INPUT_VARS(cinfo);
-
-  cinfo->progressive_mode = is_prog;
-  cinfo->arith_code = is_arith;
-
-  INPUT_2BYTES(cinfo, length, return FALSE);
-
-  INPUT_BYTE(cinfo, cinfo->data_precision, return FALSE);
-  INPUT_2BYTES(cinfo, cinfo->image_height, return FALSE);
-  INPUT_2BYTES(cinfo, cinfo->image_width, return FALSE);
-  INPUT_BYTE(cinfo, cinfo->num_components, return FALSE);
-
-  length -= 8;
-
-  TRACEMS4(cinfo, 1, JTRC_SOF, cinfo->unread_marker,
-	   (int) cinfo->image_width, (int) cinfo->image_height,
-	   cinfo->num_components);
-
-  if (cinfo->marker->saw_SOF)
-    ERREXIT(cinfo, JERR_SOF_DUPLICATE);
-
-  /* We don't support files in which the image height is initially specified */
-  /* as 0 and is later redefined by DNL.  As long as we have to check that,  */
-  /* might as well have a general sanity check. */
-  if (cinfo->image_height <= 0 || cinfo->image_width <= 0
-      || cinfo->num_components <= 0)
-    ERREXIT(cinfo, JERR_EMPTY_IMAGE);
-
-  if (length != (cinfo->num_components * 3))
-    ERREXIT(cinfo, JERR_BAD_LENGTH);
-
-  if (cinfo->comp_info == NULL)	/* do only once, even if suspend */
-    cinfo->comp_info = (jpeg_component_info *) (*cinfo->mem->alloc_small)
-			((j_common_ptr) cinfo, JPOOL_IMAGE,
-			 cinfo->num_components * SIZEOF(jpeg_component_info));
-  
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    compptr->component_index = ci;
-    INPUT_BYTE(cinfo, compptr->component_id, return FALSE);
-    INPUT_BYTE(cinfo, c, return FALSE);
-    compptr->h_samp_factor = (c >> 4) & 15;
-    compptr->v_samp_factor = (c     ) & 15;
-    INPUT_BYTE(cinfo, compptr->quant_tbl_no, return FALSE);
-
-    TRACEMS4(cinfo, 1, JTRC_SOF_COMPONENT,
-	     compptr->component_id, compptr->h_samp_factor,
-	     compptr->v_samp_factor, compptr->quant_tbl_no);
-  }
-
-  cinfo->marker->saw_SOF = TRUE;
-
-  INPUT_SYNC(cinfo);
-  return TRUE;
-}
-
-
-LOCAL(wxjpeg_boolean)
-get_sos (j_decompress_ptr cinfo)
-/* Process a SOS marker */
-{
-  JPEG_INT32 length;
-  int i, ci, n, c, cc;
-  jpeg_component_info * compptr;
-  INPUT_VARS(cinfo);
-
-  if (! cinfo->marker->saw_SOF)
-    ERREXIT(cinfo, JERR_SOS_NO_SOF);
-
-  INPUT_2BYTES(cinfo, length, return FALSE);
-
-  INPUT_BYTE(cinfo, n, return FALSE); /* Number of components */
-
-  TRACEMS1(cinfo, 1, JTRC_SOS, n);
-
-  if (length != (n * 2 + 6) || n < 1 || n > MAX_COMPS_IN_SCAN)
-    ERREXIT(cinfo, JERR_BAD_LENGTH);
-
-  cinfo->comps_in_scan = n;
-
-  /* Collect the component-spec parameters */
-
-  for (i = 0; i < n; i++) {
-    INPUT_BYTE(cinfo, cc, return FALSE);
-    INPUT_BYTE(cinfo, c, return FALSE);
-    
-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	 ci++, compptr++) {
-      if (cc == compptr->component_id)
-	goto id_found;
-    }
-
-    ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);
-
-  id_found:
-
-    cinfo->cur_comp_info[i] = compptr;
-    compptr->dc_tbl_no = (c >> 4) & 15;
-    compptr->ac_tbl_no = (c     ) & 15;
-    
-    TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,
-	     compptr->dc_tbl_no, compptr->ac_tbl_no);
-  }
-
-  /* Collect the additional scan parameters Ss, Se, Ah/Al. */
-  INPUT_BYTE(cinfo, c, return FALSE);
-  cinfo->Ss = c;
-  INPUT_BYTE(cinfo, c, return FALSE);
-  cinfo->Se = c;
-  INPUT_BYTE(cinfo, c, return FALSE);
-  cinfo->Ah = (c >> 4) & 15;
-  cinfo->Al = (c     ) & 15;
-
-  TRACEMS4(cinfo, 1, JTRC_SOS_PARAMS, cinfo->Ss, cinfo->Se,
-	   cinfo->Ah, cinfo->Al);
-
-  /* Prepare to scan data & restart markers */
-  cinfo->marker->next_restart_num = 0;
-
-  /* Count another SOS marker */
-  cinfo->input_scan_number++;
-
-  INPUT_SYNC(cinfo);
-  return TRUE;
-}
-
-
-#ifdef D_ARITH_CODING_SUPPORTED
-
-LOCAL(wxjpeg_boolean)
-get_dac (j_decompress_ptr cinfo)
-/* Process a DAC marker */
-{
-  JPEG_INT32 length;
-  int index, val;
-  INPUT_VARS(cinfo);
-
-  INPUT_2BYTES(cinfo, length, return FALSE);
-  length -= 2;
-  
-  while (length > 0) {
-    INPUT_BYTE(cinfo, index, return FALSE);
-    INPUT_BYTE(cinfo, val, return FALSE);
-
-    length -= 2;
-
-    TRACEMS2(cinfo, 1, JTRC_DAC, index, val);
-
-    if (index < 0 || index >= (2*NUM_ARITH_TBLS))
-      ERREXIT1(cinfo, JERR_DAC_INDEX, index);
-
-    if (index >= NUM_ARITH_TBLS) { /* define AC table */
-      cinfo->arith_ac_K[index-NUM_ARITH_TBLS] = (UINT8) val;
-    } else {			/* define DC table */
-      cinfo->arith_dc_L[index] = (UINT8) (val & 0x0F);
-      cinfo->arith_dc_U[index] = (UINT8) (val >> 4);
-      if (cinfo->arith_dc_L[index] > cinfo->arith_dc_U[index])
-	ERREXIT1(cinfo, JERR_DAC_VALUE, val);
-    }
-  }
-
-  if (length != 0)
-    ERREXIT(cinfo, JERR_BAD_LENGTH);
-
-  INPUT_SYNC(cinfo);
-  return TRUE;
-}
-
-#else /* ! D_ARITH_CODING_SUPPORTED */
-
-#define get_dac(cinfo)  skip_variable(cinfo)
-
-#endif /* D_ARITH_CODING_SUPPORTED */
-
-
-LOCAL(wxjpeg_boolean)
-get_dht (j_decompress_ptr cinfo)
-/* Process a DHT marker */
-{
-  JPEG_INT32 length;
-  UINT8 bits[17];
-  UINT8 huffval[256];
-  int i, index, count;
-  JHUFF_TBL **htblptr;
-  INPUT_VARS(cinfo);
-
-  INPUT_2BYTES(cinfo, length, return FALSE);
-  length -= 2;
-  
-  while (length > 16) {
-    INPUT_BYTE(cinfo, index, return FALSE);
-
-    TRACEMS1(cinfo, 1, JTRC_DHT, index);
-      
-    bits[0] = 0;
-    count = 0;
-    for (i = 1; i <= 16; i++) {
-      INPUT_BYTE(cinfo, bits[i], return FALSE);
-      count += bits[i];
-    }
-
-    length -= 1 + 16;
-
-    TRACEMS8(cinfo, 2, JTRC_HUFFBITS,
-	     bits[1], bits[2], bits[3], bits[4],
-	     bits[5], bits[6], bits[7], bits[8]);
-    TRACEMS8(cinfo, 2, JTRC_HUFFBITS,
-	     bits[9], bits[10], bits[11], bits[12],
-	     bits[13], bits[14], bits[15], bits[16]);
-
-    /* Here we just do minimal validation of the counts to avoid walking
-     * off the end of our table space.  jdhuff.c will check more carefully.
-     */
-    if (count > 256 || ((JPEG_INT32) count) > length)
-      ERREXIT(cinfo, JERR_BAD_HUFF_TABLE);
-
-    for (i = 0; i < count; i++)
-      INPUT_BYTE(cinfo, huffval[i], return FALSE);
-
-    length -= count;
-
-    if (index & 0x10) {		/* AC table definition */
-      index -= 0x10;
-      htblptr = &cinfo->ac_huff_tbl_ptrs[index];
-    } else {			/* DC table definition */
-      htblptr = &cinfo->dc_huff_tbl_ptrs[index];
-    }
-
-    if (index < 0 || index >= NUM_HUFF_TBLS)
-      ERREXIT1(cinfo, JERR_DHT_INDEX, index);
-
-    if (*htblptr == NULL)
-      *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
-  
-    MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits));
-    MEMCOPY((*htblptr)->huffval, huffval, SIZEOF((*htblptr)->huffval));
-  }
-
-  if (length != 0)
-    ERREXIT(cinfo, JERR_BAD_LENGTH);
-
-  INPUT_SYNC(cinfo);
-  return TRUE;
-}
-
-
-LOCAL(wxjpeg_boolean)
-get_dqt (j_decompress_ptr cinfo)
-/* Process a DQT marker */
-{
-  JPEG_INT32 length;
-  int n, i, prec;
-  unsigned int tmp;
-  JQUANT_TBL *quant_ptr;
-  INPUT_VARS(cinfo);
-
-  INPUT_2BYTES(cinfo, length, return FALSE);
-  length -= 2;
-
-  while (length > 0) {
-    INPUT_BYTE(cinfo, n, return FALSE);
-    prec = n >> 4;
-    n &= 0x0F;
-
-    TRACEMS2(cinfo, 1, JTRC_DQT, n, prec);
-
-    if (n >= NUM_QUANT_TBLS)
-      ERREXIT1(cinfo, JERR_DQT_INDEX, n);
-      
-    if (cinfo->quant_tbl_ptrs[n] == NULL)
-      cinfo->quant_tbl_ptrs[n] = jpeg_alloc_quant_table((j_common_ptr) cinfo);
-    quant_ptr = cinfo->quant_tbl_ptrs[n];
-
-    for (i = 0; i < DCTSIZE2; i++) {
-      if (prec)
-	INPUT_2BYTES(cinfo, tmp, return FALSE);
-      else
-	INPUT_BYTE(cinfo, tmp, return FALSE);
-      /* We convert the zigzag-order table to natural array order. */
-      quant_ptr->quantval[jpeg_natural_order[i]] = (UINT16) tmp;
-    }
-
-    if (cinfo->err->trace_level >= 2) {
-      for (i = 0; i < DCTSIZE2; i += 8) {
-	TRACEMS8(cinfo, 2, JTRC_QUANTVALS,
-		 quant_ptr->quantval[i],   quant_ptr->quantval[i+1],
-		 quant_ptr->quantval[i+2], quant_ptr->quantval[i+3],
-		 quant_ptr->quantval[i+4], quant_ptr->quantval[i+5],
-		 quant_ptr->quantval[i+6], quant_ptr->quantval[i+7]);
-      }
-    }
-
-    length -= DCTSIZE2+1;
-    if (prec) length -= DCTSIZE2;
-  }
-
-  if (length != 0)
-    ERREXIT(cinfo, JERR_BAD_LENGTH);
-
-  INPUT_SYNC(cinfo);
-  return TRUE;
-}
-
-
-LOCAL(wxjpeg_boolean)
-get_dri (j_decompress_ptr cinfo)
-/* Process a DRI marker */
-{
-  JPEG_INT32 length;
-  unsigned int tmp;
-  INPUT_VARS(cinfo);
-
-  INPUT_2BYTES(cinfo, length, return FALSE);
-  
-  if (length != 4)
-    ERREXIT(cinfo, JERR_BAD_LENGTH);
-
-  INPUT_2BYTES(cinfo, tmp, return FALSE);
-
-  TRACEMS1(cinfo, 1, JTRC_DRI, tmp);
-
-  cinfo->restart_interval = tmp;
-
-  INPUT_SYNC(cinfo);
-  return TRUE;
-}
-
-
-/*
- * Routines for processing APPn and COM markers.
- * These are either saved in memory or discarded, per application request.
- * APP0 and APP14 are specially checked to see if they are
- * JFIF and Adobe markers, respectively.
- */
-
-#define APP0_DATA_LEN	14	/* Length of interesting data in APP0 */
-#define APP14_DATA_LEN	12	/* Length of interesting data in APP14 */
-#define APPN_DATA_LEN	14	/* Must be the largest of the above!! */
-
-
-LOCAL(void)
-examine_app0 (j_decompress_ptr cinfo, JOCTET FAR * data,
-	      unsigned int datalen, JPEG_INT32 remaining)
-/* Examine first few bytes from an APP0.
- * Take appropriate action if it is a JFIF marker.
- * datalen is # of bytes at data[], remaining is length of rest of marker data.
- */
-{
-  JPEG_INT32 totallen = (JPEG_INT32) datalen + remaining;
-
-  if (datalen >= APP0_DATA_LEN &&
-      GETJOCTET(data[0]) == 0x4A &&
-      GETJOCTET(data[1]) == 0x46 &&
-      GETJOCTET(data[2]) == 0x49 &&
-      GETJOCTET(data[3]) == 0x46 &&
-      GETJOCTET(data[4]) == 0) {
-    /* Found JFIF APP0 marker: save info */
-    cinfo->saw_JFIF_marker = TRUE;
-    cinfo->JFIF_major_version = GETJOCTET(data[5]);
-    cinfo->JFIF_minor_version = GETJOCTET(data[6]);
-    cinfo->density_unit = GETJOCTET(data[7]);
-    cinfo->X_density = (GETJOCTET(data[8]) << 8) + GETJOCTET(data[9]);
-    cinfo->Y_density = (GETJOCTET(data[10]) << 8) + GETJOCTET(data[11]);
-    /* Check version.
-     * Major version must be 1, anything else signals an incompatible change.
-     * (We used to treat this as an error, but now it's a nonfatal warning,
-     * because some bozo at Hijaak couldn't read the spec.)
-     * Minor version should be 0..2, but process anyway if newer.
-     */
-    if (cinfo->JFIF_major_version != 1)
-      WARNMS2(cinfo, JWRN_JFIF_MAJOR,
-	      cinfo->JFIF_major_version, cinfo->JFIF_minor_version);
-    /* Generate trace messages */
-    TRACEMS5(cinfo, 1, JTRC_JFIF,
-	     cinfo->JFIF_major_version, cinfo->JFIF_minor_version,
-	     cinfo->X_density, cinfo->Y_density, cinfo->density_unit);
-    /* Validate thumbnail dimensions and issue appropriate messages */
-    if (GETJOCTET(data[12]) | GETJOCTET(data[13]))
-      TRACEMS2(cinfo, 1, JTRC_JFIF_THUMBNAIL,
-	       GETJOCTET(data[12]), GETJOCTET(data[13]));
-    totallen -= APP0_DATA_LEN;
-    if (totallen !=
-	((JPEG_INT32)GETJOCTET(data[12]) * (JPEG_INT32)GETJOCTET(data[13]) * (JPEG_INT32) 3))
-      TRACEMS1(cinfo, 1, JTRC_JFIF_BADTHUMBNAILSIZE, (int) totallen);
-  } else if (datalen >= 6 &&
-      GETJOCTET(data[0]) == 0x4A &&
-      GETJOCTET(data[1]) == 0x46 &&
-      GETJOCTET(data[2]) == 0x58 &&
-      GETJOCTET(data[3]) == 0x58 &&
-      GETJOCTET(data[4]) == 0) {
-    /* Found JFIF "JFXX" extension APP0 marker */
-    /* The library doesn't actually do anything with these,
-     * but we try to produce a helpful trace message.
-     */
-    switch (GETJOCTET(data[5])) {
-    case 0x10:
-      TRACEMS1(cinfo, 1, JTRC_THUMB_JPEG, (int) totallen);
-      break;
-    case 0x11:
-      TRACEMS1(cinfo, 1, JTRC_THUMB_PALETTE, (int) totallen);
-      break;
-    case 0x13:
-      TRACEMS1(cinfo, 1, JTRC_THUMB_RGB, (int) totallen);
-      break;
-    default:
-      TRACEMS2(cinfo, 1, JTRC_JFIF_EXTENSION,
-	       GETJOCTET(data[5]), (int) totallen);
-      break;
-    }
-  } else {
-    /* Start of APP0 does not match "JFIF" or "JFXX", or too short */
-    TRACEMS1(cinfo, 1, JTRC_APP0, (int) totallen);
-  }
-}
-
-
-LOCAL(void)
-examine_app14 (j_decompress_ptr cinfo, JOCTET FAR * data,
-	       unsigned int datalen, JPEG_INT32 remaining)
-/* Examine first few bytes from an APP14.
- * Take appropriate action if it is an Adobe marker.
- * datalen is # of bytes at data[], remaining is length of rest of marker data.
- */
-{
-  unsigned int version, flags0, flags1, transform;
-
-  if (datalen >= APP14_DATA_LEN &&
-      GETJOCTET(data[0]) == 0x41 &&
-      GETJOCTET(data[1]) == 0x64 &&
-      GETJOCTET(data[2]) == 0x6F &&
-      GETJOCTET(data[3]) == 0x62 &&
-      GETJOCTET(data[4]) == 0x65) {
-    /* Found Adobe APP14 marker */
-    version = (GETJOCTET(data[5]) << 8) + GETJOCTET(data[6]);
-    flags0 = (GETJOCTET(data[7]) << 8) + GETJOCTET(data[8]);
-    flags1 = (GETJOCTET(data[9]) << 8) + GETJOCTET(data[10]);
-    transform = GETJOCTET(data[11]);
-    TRACEMS4(cinfo, 1, JTRC_ADOBE, version, flags0, flags1, transform);
-    cinfo->saw_Adobe_marker = TRUE;
-    cinfo->Adobe_transform = (UINT8) transform;
-  } else {
-    /* Start of APP14 does not match "Adobe", or too short */
-    TRACEMS1(cinfo, 1, JTRC_APP14, (int) (datalen + remaining));
-  }
-}
-
-
-METHODDEF(wxjpeg_boolean)
-get_interesting_appn (j_decompress_ptr cinfo)
-/* Process an APP0 or APP14 marker without saving it */
-{
-  JPEG_INT32 length;
-  JOCTET b[APPN_DATA_LEN];
-  unsigned int i, numtoread;
-  INPUT_VARS(cinfo);
-
-  INPUT_2BYTES(cinfo, length, return FALSE);
-  length -= 2;
-
-  /* get the interesting part of the marker data */
-  if (length >= APPN_DATA_LEN)
-    numtoread = APPN_DATA_LEN;
-  else if (length > 0)
-    numtoread = (unsigned int) length;
-  else
-    numtoread = 0;
-  for (i = 0; i < numtoread; i++)
-    INPUT_BYTE(cinfo, b[i], return FALSE);
-  length -= numtoread;
-
-  /* process it */
-  switch (cinfo->unread_marker) {
-  case M_APP0:
-    examine_app0(cinfo, (JOCTET FAR *) b, numtoread, length);
-    break;
-  case M_APP14:
-    examine_app14(cinfo, (JOCTET FAR *) b, numtoread, length);
-    break;
-  default:
-    /* can't get here unless jpeg_save_markers chooses wrong processor */
-    ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, cinfo->unread_marker);
-    break;
-  }
-
-  /* skip any remaining data -- could be lots */
-  INPUT_SYNC(cinfo);
-  if (length > 0)
-    (*cinfo->src->skip_input_data) (cinfo, (long) length);
-
-  return TRUE;
-}
-
-
-#ifdef SAVE_MARKERS_SUPPORTED
-
-METHODDEF(wxjpeg_boolean)
-save_marker (j_decompress_ptr cinfo)
-/* Save an APPn or COM marker into the marker list */
-{
-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
-  jpeg_saved_marker_ptr cur_marker = marker->cur_marker;
-  unsigned int bytes_read, data_length;
-  JOCTET FAR * data;
-  JPEG_INT32 length = 0;
-  INPUT_VARS(cinfo);
-
-  if (cur_marker == NULL) {
-    /* begin reading a marker */
-    INPUT_2BYTES(cinfo, length, return FALSE);
-    length -= 2;
-    if (length >= 0) {		/* watch out for bogus length word */
-      /* figure out how much we want to save */
-      unsigned int limit;
-      if (cinfo->unread_marker == (int) M_COM)
-	limit = marker->length_limit_COM;
-      else
-	limit = marker->length_limit_APPn[cinfo->unread_marker - (int) M_APP0];
-      if ((unsigned int) length < limit)
-	limit = (unsigned int) length;
-      /* allocate and initialize the marker item */
-      cur_marker = (jpeg_saved_marker_ptr)
-	(*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				    SIZEOF(struct jpeg_marker_struct) + limit);
-      cur_marker->next = NULL;
-      cur_marker->marker = (UINT8) cinfo->unread_marker;
-      cur_marker->original_length = (unsigned int) length;
-      cur_marker->data_length = limit;
-      /* data area is just beyond the jpeg_marker_struct */
-      data = cur_marker->data = (JOCTET FAR *) (cur_marker + 1);
-      marker->cur_marker = cur_marker;
-      marker->bytes_read = 0;
-      bytes_read = 0;
-      data_length = limit;
-    } else {
-      /* deal with bogus length word */
-      bytes_read = data_length = 0;
-      data = NULL;
-    }
-  } else {
-    /* resume reading a marker */
-    bytes_read = marker->bytes_read;
-    data_length = cur_marker->data_length;
-    data = cur_marker->data + bytes_read;
-  }
-
-  while (bytes_read < data_length) {
-    INPUT_SYNC(cinfo);		/* move the restart point to here */
-    marker->bytes_read = bytes_read;
-    /* If there's not at least one byte in buffer, suspend */
-    MAKE_BYTE_AVAIL(cinfo, return FALSE);
-    /* Copy bytes with reasonable rapidity */
-    while (bytes_read < data_length && bytes_in_buffer > 0) {
-      *data++ = *next_input_byte++;
-      bytes_in_buffer--;
-      bytes_read++;
-    }
-  }
-
-  /* Done reading what we want to read */
-  if (cur_marker != NULL) {	/* will be NULL if bogus length word */
-    /* Add new marker to end of list */
-    if (cinfo->marker_list == NULL) {
-      cinfo->marker_list = cur_marker;
-    } else {
-      jpeg_saved_marker_ptr prev = cinfo->marker_list;
-      while (prev->next != NULL)
-	prev = prev->next;
-      prev->next = cur_marker;
-    }
-    /* Reset pointer & calc remaining data length */
-    data = cur_marker->data;
-    length = cur_marker->original_length - data_length;
-  }
-  /* Reset to initial state for next marker */
-  marker->cur_marker = NULL;
-
-  /* Process the marker if interesting; else just make a generic trace msg */
-  switch (cinfo->unread_marker) {
-  case M_APP0:
-    examine_app0(cinfo, data, data_length, length);
-    break;
-  case M_APP14:
-    examine_app14(cinfo, data, data_length, length);
-    break;
-  default:
-    TRACEMS2(cinfo, 1, JTRC_MISC_MARKER, cinfo->unread_marker,
-	     (int) (data_length + length));
-    break;
-  }
-
-  /* skip any remaining data -- could be lots */
-  INPUT_SYNC(cinfo);		/* do before skip_input_data */
-  if (length > 0)
-    (*cinfo->src->skip_input_data) (cinfo, (long) length);
-
-  return TRUE;
-}
-
-#endif /* SAVE_MARKERS_SUPPORTED */
-
-
-METHODDEF(wxjpeg_boolean)
-skip_variable (j_decompress_ptr cinfo)
-/* Skip over an unknown or uninteresting variable-length marker */
-{
-  JPEG_INT32 length;
-  INPUT_VARS(cinfo);
-
-  INPUT_2BYTES(cinfo, length, return FALSE);
-  length -= 2;
-  
-  TRACEMS2(cinfo, 1, JTRC_MISC_MARKER, cinfo->unread_marker, (int) length);
-
-  INPUT_SYNC(cinfo);		/* do before skip_input_data */
-  if (length > 0)
-    (*cinfo->src->skip_input_data) (cinfo, (long) length);
-
-  return TRUE;
-}
-
-
-/*
- * Find the next JPEG marker, save it in cinfo->unread_marker.
- * Returns FALSE if had to suspend before reaching a marker;
- * in that case cinfo->unread_marker is unchanged.
- *
- * Note that the result might not be a valid marker code,
- * but it will never be 0 or FF.
- */
-
-LOCAL(wxjpeg_boolean)
-next_marker (j_decompress_ptr cinfo)
-{
-  int c;
-  INPUT_VARS(cinfo);
-
-  for (;;) {
-    INPUT_BYTE(cinfo, c, return FALSE);
-    /* Skip any non-FF bytes.
-     * This may look a bit inefficient, but it will not occur in a valid file.
-     * We sync after each discarded byte so that a suspending data source
-     * can discard the byte from its buffer.
-     */
-    while (c != 0xFF) {
-      cinfo->marker->discarded_bytes++;
-      INPUT_SYNC(cinfo);
-      INPUT_BYTE(cinfo, c, return FALSE);
-    }
-    /* This loop swallows any duplicate FF bytes.  Extra FFs are legal as
-     * pad bytes, so don't count them in discarded_bytes.  We assume there
-     * will not be so many consecutive FF bytes as to overflow a suspending
-     * data source's input buffer.
-     */
-    do {
-      INPUT_BYTE(cinfo, c, return FALSE);
-    } while (c == 0xFF);
-    if (c != 0)
-      break;			/* found a valid marker, exit loop */
-    /* Reach here if we found a stuffed-zero data sequence (FF/00).
-     * Discard it and loop back to try again.
-     */
-    cinfo->marker->discarded_bytes += 2;
-    INPUT_SYNC(cinfo);
-  }
-
-  if (cinfo->marker->discarded_bytes != 0) {
-    WARNMS2(cinfo, JWRN_EXTRANEOUS_DATA, cinfo->marker->discarded_bytes, c);
-    cinfo->marker->discarded_bytes = 0;
-  }
-
-  cinfo->unread_marker = c;
-
-  INPUT_SYNC(cinfo);
-  return TRUE;
-}
-
-
-LOCAL(wxjpeg_boolean)
-first_marker (j_decompress_ptr cinfo)
-/* Like next_marker, but used to obtain the initial SOI marker. */
-/* For this marker, we do not allow preceding garbage or fill; otherwise,
- * we might well scan an entire input file before realizing it ain't JPEG.
- * If an application wants to process non-JFIF files, it must seek to the
- * SOI before calling the JPEG library.
- */
-{
-  int c, c2;
-  INPUT_VARS(cinfo);
-
-  INPUT_BYTE(cinfo, c, return FALSE);
-  INPUT_BYTE(cinfo, c2, return FALSE);
-  if (c != 0xFF || c2 != (int) M_SOI)
-    ERREXIT2(cinfo, JERR_NO_SOI, c, c2);
-
-  cinfo->unread_marker = c2;
-
-  INPUT_SYNC(cinfo);
-  return TRUE;
-}
-
-
-/*
- * Read markers until SOS or EOI.
- *
- * Returns same codes as are defined for jpeg_consume_input:
- * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
- */
-
-METHODDEF(int)
-read_markers (j_decompress_ptr cinfo)
-{
-  /* Outer loop repeats once for each marker. */
-  for (;;) {
-    /* Collect the marker proper, unless we already did. */
-    /* NB: first_marker() enforces the requirement that SOI appear first. */
-    if (cinfo->unread_marker == 0) {
-      if (! cinfo->marker->saw_SOI) {
-	if (! first_marker(cinfo))
-	  return JPEG_SUSPENDED;
-      } else {
-	if (! next_marker(cinfo))
-	  return JPEG_SUSPENDED;
-      }
-    }
-    /* At this point cinfo->unread_marker contains the marker code and the
-     * input point is just past the marker proper, but before any parameters.
-     * A suspension will cause us to return with this state still true.
-     */
-    switch (cinfo->unread_marker) {
-    case M_SOI:
-      if (! get_soi(cinfo))
-	return JPEG_SUSPENDED;
-      break;
-
-    case M_SOF0:		/* Baseline */
-    case M_SOF1:		/* Extended sequential, Huffman */
-      if (! get_sof(cinfo, FALSE, FALSE))
-	return JPEG_SUSPENDED;
-      break;
-
-    case M_SOF2:		/* Progressive, Huffman */
-      if (! get_sof(cinfo, TRUE, FALSE))
-	return JPEG_SUSPENDED;
-      break;
-
-    case M_SOF9:		/* Extended sequential, arithmetic */
-      if (! get_sof(cinfo, FALSE, TRUE))
-	return JPEG_SUSPENDED;
-      break;
-
-    case M_SOF10:		/* Progressive, arithmetic */
-      if (! get_sof(cinfo, TRUE, TRUE))
-	return JPEG_SUSPENDED;
-      break;
-
-    /* Currently unsupported SOFn types */
-    case M_SOF3:		/* Lossless, Huffman */
-    case M_SOF5:		/* Differential sequential, Huffman */
-    case M_SOF6:		/* Differential progressive, Huffman */
-    case M_SOF7:		/* Differential lossless, Huffman */
-    case M_JPG:			/* Reserved for JPEG extensions */
-    case M_SOF11:		/* Lossless, arithmetic */
-    case M_SOF13:		/* Differential sequential, arithmetic */
-    case M_SOF14:		/* Differential progressive, arithmetic */
-    case M_SOF15:		/* Differential lossless, arithmetic */
-      ERREXIT1(cinfo, JERR_SOF_UNSUPPORTED, cinfo->unread_marker);
-      break;
-
-    case M_SOS:
-      if (! get_sos(cinfo))
-	return JPEG_SUSPENDED;
-      cinfo->unread_marker = 0;	/* processed the marker */
-      return JPEG_REACHED_SOS;
-    
-    case M_EOI:
-      TRACEMS(cinfo, 1, JTRC_EOI);
-      cinfo->unread_marker = 0;	/* processed the marker */
-      return JPEG_REACHED_EOI;
-      
-    case M_DAC:
-      if (! get_dac(cinfo))
-	return JPEG_SUSPENDED;
-      break;
-      
-    case M_DHT:
-      if (! get_dht(cinfo))
-	return JPEG_SUSPENDED;
-      break;
-      
-    case M_DQT:
-      if (! get_dqt(cinfo))
-	return JPEG_SUSPENDED;
-      break;
-      
-    case M_DRI:
-      if (! get_dri(cinfo))
-	return JPEG_SUSPENDED;
-      break;
-      
-    case M_APP0:
-    case M_APP1:
-    case M_APP2:
-    case M_APP3:
-    case M_APP4:
-    case M_APP5:
-    case M_APP6:
-    case M_APP7:
-    case M_APP8:
-    case M_APP9:
-    case M_APP10:
-    case M_APP11:
-    case M_APP12:
-    case M_APP13:
-    case M_APP14:
-    case M_APP15:
-      if (! (*((my_marker_ptr) cinfo->marker)->process_APPn[
-		cinfo->unread_marker - (int) M_APP0]) (cinfo))
-	return JPEG_SUSPENDED;
-      break;
-      
-    case M_COM:
-      if (! (*((my_marker_ptr) cinfo->marker)->process_COM) (cinfo))
-	return JPEG_SUSPENDED;
-      break;
-
-    case M_RST0:		/* these are all parameterless */
-    case M_RST1:
-    case M_RST2:
-    case M_RST3:
-    case M_RST4:
-    case M_RST5:
-    case M_RST6:
-    case M_RST7:
-    case M_TEM:
-      TRACEMS1(cinfo, 1, JTRC_PARMLESS_MARKER, cinfo->unread_marker);
-      break;
-
-    case M_DNL:			/* Ignore DNL ... perhaps the wrong thing */
-      if (! skip_variable(cinfo))
-	return JPEG_SUSPENDED;
-      break;
-
-    default:			/* must be DHP, EXP, JPGn, or RESn */
-      /* For now, we treat the reserved markers as fatal errors since they are
-       * likely to be used to signal incompatible JPEG Part 3 extensions.
-       * Once the JPEG 3 version-number marker is well defined, this code
-       * ought to change!
-       */
-      ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, cinfo->unread_marker);
-      break;
-    }
-    /* Successfully processed marker, so reset state variable */
-    cinfo->unread_marker = 0;
-  } /* end loop */
-}
-
-
-/*
- * Read a restart marker, which is expected to appear next in the datastream;
- * if the marker is not there, take appropriate recovery action.
- * Returns FALSE if suspension is required.
- *
- * This is called by the entropy decoder after it has read an appropriate
- * number of MCUs.  cinfo->unread_marker may be nonzero if the entropy decoder
- * has already read a marker from the data source.  Under normal conditions
- * cinfo->unread_marker will be reset to 0 before returning; if not reset,
- * it holds a marker which the decoder will be unable to read past.
- */
-
-METHODDEF(wxjpeg_boolean)
-read_restart_marker (j_decompress_ptr cinfo)
-{
-  /* Obtain a marker unless we already did. */
-  /* Note that next_marker will complain if it skips any data. */
-  if (cinfo->unread_marker == 0) {
-    if (! next_marker(cinfo))
-      return FALSE;
-  }
-
-  if (cinfo->unread_marker ==
-      ((int) M_RST0 + cinfo->marker->next_restart_num)) {
-    /* Normal case --- swallow the marker and let entropy decoder continue */
-    TRACEMS1(cinfo, 3, JTRC_RST, cinfo->marker->next_restart_num);
-    cinfo->unread_marker = 0;
-  } else {
-    /* Uh-oh, the restart markers have been messed up. */
-    /* Let the data source manager determine how to resync. */
-    if (! (*cinfo->src->resync_to_restart) (cinfo,
-					    cinfo->marker->next_restart_num))
-      return FALSE;
-  }
-
-  /* Update next-restart state */
-  cinfo->marker->next_restart_num = (cinfo->marker->next_restart_num + 1) & 7;
-
-  return TRUE;
-}
-
-
-/*
- * This is the default resync_to_restart method for data source managers
- * to use if they don't have any better approach.  Some data source managers
- * may be able to back up, or may have additional knowledge about the data
- * which permits a more intelligent recovery strategy; such managers would
- * presumably supply their own resync method.
- *
- * read_restart_marker calls resync_to_restart if it finds a marker other than
- * the restart marker it was expecting.  (This code is *not* used unless
- * a nonzero restart interval has been declared.)  cinfo->unread_marker is
- * the marker code actually found (might be anything, except 0 or FF).
- * The desired restart marker number (0..7) is passed as a parameter.
- * This routine is supposed to apply whatever error recovery strategy seems
- * appropriate in order to position the input stream to the next data segment.
- * Note that cinfo->unread_marker is treated as a marker appearing before
- * the current data-source input point; usually it should be reset to zero
- * before returning.
- * Returns FALSE if suspension is required.
- *
- * This implementation is substantially constrained by wanting to treat the
- * input as a data stream; this means we can't back up.  Therefore, we have
- * only the following actions to work with:
- *   1. Simply discard the marker and let the entropy decoder resume at next
- *      byte of file.
- *   2. Read forward until we find another marker, discarding intervening
- *      data.  (In theory we could look ahead within the current bufferload,
- *      without having to discard data if we don't find the desired marker.
- *      This idea is not implemented here, in part because it makes behavior
- *      dependent on buffer size and chance buffer-boundary positions.)
- *   3. Leave the marker unread (by failing to zero cinfo->unread_marker).
- *      This will cause the entropy decoder to process an empty data segment,
- *      inserting dummy zeroes, and then we will reprocess the marker.
- *
- * #2 is appropriate if we think the desired marker lies ahead, while #3 is
- * appropriate if the found marker is a future restart marker (indicating
- * that we have missed the desired restart marker, probably because it got
- * corrupted).
- * We apply #2 or #3 if the found marker is a restart marker no more than
- * two counts behind or ahead of the expected one.  We also apply #2 if the
- * found marker is not a legal JPEG marker code (it's certainly bogus data).
- * If the found marker is a restart marker more than 2 counts away, we do #1
- * (too much risk that the marker is erroneous; with luck we will be able to
- * resync at some future point).
- * For any valid non-restart JPEG marker, we apply #3.  This keeps us from
- * overrunning the end of a scan.  An implementation limited to single-scan
- * files might find it better to apply #2 for markers other than EOI, since
- * any other marker would have to be bogus data in that case.
- */
-
-GLOBAL(wxjpeg_boolean)
-jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired)
-{
-  int marker = cinfo->unread_marker;
-  int action = 1;
-  
-  /* Always put up a warning. */
-  WARNMS2(cinfo, JWRN_MUST_RESYNC, marker, desired);
-  
-  /* Outer loop handles repeated decision after scanning forward. */
-  for (;;) {
-    if (marker < (int) M_SOF0)
-      action = 2;		/* invalid marker */
-    else if (marker < (int) M_RST0 || marker > (int) M_RST7)
-      action = 3;		/* valid non-restart marker */
-    else {
-      if (marker == ((int) M_RST0 + ((desired+1) & 7)) ||
-	  marker == ((int) M_RST0 + ((desired+2) & 7)))
-	action = 3;		/* one of the next two expected restarts */
-      else if (marker == ((int) M_RST0 + ((desired-1) & 7)) ||
-	       marker == ((int) M_RST0 + ((desired-2) & 7)))
-	action = 2;		/* a prior restart, so advance */
-      else
-	action = 1;		/* desired restart or too far away */
-    }
-    TRACEMS2(cinfo, 4, JTRC_RECOVERY_ACTION, marker, action);
-    switch (action) {
-    case 1:
-      /* Discard marker and let entropy decoder resume processing. */
-      cinfo->unread_marker = 0;
-      return TRUE;
-    case 2:
-      /* Scan to the next marker, and repeat the decision loop. */
-      if (! next_marker(cinfo))
-	return FALSE;
-      marker = cinfo->unread_marker;
-      break;
-    case 3:
-      /* Return without advancing past this marker. */
-      /* Entropy decoder will be forced to process an empty segment. */
-      return TRUE;
-    }
-  } /* end loop */
-}
-
-
-/*
- * Reset marker processing state to begin a fresh datastream.
- */
-
-METHODDEF(void)
-reset_marker_reader (j_decompress_ptr cinfo)
-{
-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
-
-  cinfo->comp_info = NULL;		/* until allocated by get_sof */
-  cinfo->input_scan_number = 0;		/* no SOS seen yet */
-  cinfo->unread_marker = 0;		/* no pending marker */
-  marker->pub.saw_SOI = FALSE;		/* set internal state too */
-  marker->pub.saw_SOF = FALSE;
-  marker->pub.discarded_bytes = 0;
-  marker->cur_marker = NULL;
-}
-
-
-/*
- * Initialize the marker reader module.
- * This is called only once, when the decompression object is created.
- */
-
-GLOBAL(void)
-jinit_marker_reader (j_decompress_ptr cinfo)
-{
-  my_marker_ptr marker;
-  int i;
-
-  /* Create subobject in permanent pool */
-  marker = (my_marker_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-				SIZEOF(my_marker_reader));
-  cinfo->marker = (struct jpeg_marker_reader *) marker;
-  /* Initialize public method pointers */
-  marker->pub.reset_marker_reader = reset_marker_reader;
-  marker->pub.read_markers = read_markers;
-  marker->pub.read_restart_marker = read_restart_marker;
-  /* Initialize COM/APPn processing.
-   * By default, we examine and then discard APP0 and APP14,
-   * but simply discard COM and all other APPn.
-   */
-  marker->process_COM = skip_variable;
-  marker->length_limit_COM = 0;
-  for (i = 0; i < 16; i++) {
-    marker->process_APPn[i] = skip_variable;
-    marker->length_limit_APPn[i] = 0;
-  }
-  marker->process_APPn[0] = get_interesting_appn;
-  marker->process_APPn[14] = get_interesting_appn;
-  /* Reset marker processing state */
-  reset_marker_reader(cinfo);
-}
-
-
-/*
- * Control saving of COM and APPn markers into marker_list.
- */
-
-#ifdef SAVE_MARKERS_SUPPORTED
-
-GLOBAL(void)
-jpeg_save_markers (j_decompress_ptr cinfo, int marker_code,
-		   unsigned int length_limit)
-{
-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
-  long maxlength;
-  jpeg_marker_parser_method processor;
-
-  /* Length limit mustn't be larger than what we can allocate
-   * (should only be a concern in a 16-bit environment).
-   */
-  maxlength = cinfo->mem->max_alloc_chunk - SIZEOF(struct jpeg_marker_struct);
-  if (((long) length_limit) > maxlength)
-    length_limit = (unsigned int) maxlength;
-
-  /* Choose processor routine to use.
-   * APP0/APP14 have special requirements.
-   */
-  if (length_limit) {
-    processor = save_marker;
-    /* If saving APP0/APP14, save at least enough for our internal use. */
-    if (marker_code == (int) M_APP0 && length_limit < APP0_DATA_LEN)
-      length_limit = APP0_DATA_LEN;
-    else if (marker_code == (int) M_APP14 && length_limit < APP14_DATA_LEN)
-      length_limit = APP14_DATA_LEN;
-  } else {
-    processor = skip_variable;
-    /* If discarding APP0/APP14, use our regular on-the-fly processor. */
-    if (marker_code == (int) M_APP0 || marker_code == (int) M_APP14)
-      processor = get_interesting_appn;
-  }
-
-  if (marker_code == (int) M_COM) {
-    marker->process_COM = processor;
-    marker->length_limit_COM = length_limit;
-  } else if (marker_code >= (int) M_APP0 && marker_code <= (int) M_APP15) {
-    marker->process_APPn[marker_code - (int) M_APP0] = processor;
-    marker->length_limit_APPn[marker_code - (int) M_APP0] = length_limit;
-  } else
-    ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code);
-}
-
-#endif /* SAVE_MARKERS_SUPPORTED */
-
-
-/*
- * Install a special processing method for COM or APPn markers.
- */
-
-GLOBAL(void)
-jpeg_set_marker_processor (j_decompress_ptr cinfo, int marker_code,
-			   jpeg_marker_parser_method routine)
-{
-  my_marker_ptr marker = (my_marker_ptr) cinfo->marker;
-
-  if (marker_code == (int) M_COM)
-    marker->process_COM = routine;
-  else if (marker_code >= (int) M_APP0 && marker_code <= (int) M_APP15)
-    marker->process_APPn[marker_code - (int) M_APP0] = routine;
-  else
-    ERREXIT1(cinfo, JERR_UNKNOWN_MARKER, marker_code);
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdmaster.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdmaster.c
deleted file mode 100644
index d68747631a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdmaster.c
+++ /dev/null
@@ -1,557 +0,0 @@
-/*
- * jdmaster.c
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains master control logic for the JPEG decompressor.
- * These routines are concerned with selecting the modules to be executed
- * and with determining the number of passes and the work to be done in each
- * pass.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-/* Private state */
-
-typedef struct {
-  struct jpeg_decomp_master pub; /* public fields */
-
-  int pass_number;		/* # of passes completed */
-
-  wxjpeg_boolean using_merged_upsample; /* TRUE if using merged upsample/cconvert */
-
-  /* Saved references to initialized quantizer modules,
-   * in case we need to switch modes.
-   */
-  struct jpeg_color_quantizer * quantizer_1pass;
-  struct jpeg_color_quantizer * quantizer_2pass;
-} my_decomp_master;
-
-typedef my_decomp_master * my_master_ptr;
-
-
-/*
- * Determine whether merged upsample/color conversion should be used.
- * CRUCIAL: this must match the actual capabilities of jdmerge.c!
- */
-
-LOCAL(wxjpeg_boolean)
-use_merged_upsample (j_decompress_ptr cinfo)
-{
-#ifdef UPSAMPLE_MERGING_SUPPORTED
-  /* Merging is the equivalent of plain box-filter upsampling */
-  if (cinfo->do_fancy_upsampling || cinfo->CCIR601_sampling)
-    return FALSE;
-  /* jdmerge.c only supports YCC=>RGB color conversion */
-  if (cinfo->jpeg_color_space != JCS_YCbCr || cinfo->num_components != 3 ||
-      cinfo->out_color_space != JCS_RGB ||
-      cinfo->out_color_components != RGB_PIXELSIZE)
-    return FALSE;
-  /* and it only handles 2h1v or 2h2v sampling ratios */
-  if (cinfo->comp_info[0].h_samp_factor != 2 ||
-      cinfo->comp_info[1].h_samp_factor != 1 ||
-      cinfo->comp_info[2].h_samp_factor != 1 ||
-      cinfo->comp_info[0].v_samp_factor >  2 ||
-      cinfo->comp_info[1].v_samp_factor != 1 ||
-      cinfo->comp_info[2].v_samp_factor != 1)
-    return FALSE;
-  /* furthermore, it doesn't work if we've scaled the IDCTs differently */
-  if (cinfo->comp_info[0].DCT_scaled_size != cinfo->min_DCT_scaled_size ||
-      cinfo->comp_info[1].DCT_scaled_size != cinfo->min_DCT_scaled_size ||
-      cinfo->comp_info[2].DCT_scaled_size != cinfo->min_DCT_scaled_size)
-    return FALSE;
-  /* ??? also need to test for upsample-time rescaling, when & if supported */
-  return TRUE;			/* by golly, it'll work... */
-#else
-  return FALSE;
-#endif
-}
-
-
-/*
- * Compute output image dimensions and related values.
- * NOTE: this is exported for possible use by application.
- * Hence it mustn't do anything that can't be done twice.
- * Also note that it may be called before the master module is initialized!
- */
-
-GLOBAL(void)
-jpeg_calc_output_dimensions (j_decompress_ptr cinfo)
-/* Do computations that are needed before master selection phase */
-{
-#ifdef IDCT_SCALING_SUPPORTED
-  int ci;
-  jpeg_component_info *compptr;
-#endif
-
-  /* Prevent application from calling me at wrong times */
-  if (cinfo->global_state != DSTATE_READY)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-#ifdef IDCT_SCALING_SUPPORTED
-
-  /* Compute actual output image dimensions and DCT scaling choices. */
-  if (cinfo->scale_num * 8 <= cinfo->scale_denom) {
-    /* Provide 1/8 scaling */
-    cinfo->output_width = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width, 8L);
-    cinfo->output_height = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height, 8L);
-    cinfo->min_DCT_scaled_size = 1;
-  } else if (cinfo->scale_num * 4 <= cinfo->scale_denom) {
-    /* Provide 1/4 scaling */
-    cinfo->output_width = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width, 4L);
-    cinfo->output_height = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height, 4L);
-    cinfo->min_DCT_scaled_size = 2;
-  } else if (cinfo->scale_num * 2 <= cinfo->scale_denom) {
-    /* Provide 1/2 scaling */
-    cinfo->output_width = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width, 2L);
-    cinfo->output_height = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height, 2L);
-    cinfo->min_DCT_scaled_size = 4;
-  } else {
-    /* Provide 1/1 scaling */
-    cinfo->output_width = cinfo->image_width;
-    cinfo->output_height = cinfo->image_height;
-    cinfo->min_DCT_scaled_size = DCTSIZE;
-  }
-  /* In selecting the actual DCT scaling for each component, we try to
-   * scale up the chroma components via IDCT scaling rather than upsampling.
-   * This saves time if the upsampler gets to use 1:1 scaling.
-   * Note this code assumes that the supported DCT scalings are powers of 2.
-   */
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    int ssize = cinfo->min_DCT_scaled_size;
-    while (ssize < DCTSIZE &&
-	   (compptr->h_samp_factor * ssize * 2 <=
-	    cinfo->max_h_samp_factor * cinfo->min_DCT_scaled_size) &&
-	   (compptr->v_samp_factor * ssize * 2 <=
-	    cinfo->max_v_samp_factor * cinfo->min_DCT_scaled_size)) {
-      ssize = ssize * 2;
-    }
-    compptr->DCT_scaled_size = ssize;
-  }
-
-  /* Recompute downsampled dimensions of components;
-   * application needs to know these if using raw downsampled data.
-   */
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Size in samples, after IDCT scaling */
-    compptr->downsampled_width = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_width *
-		    (long) (compptr->h_samp_factor * compptr->DCT_scaled_size),
-		    (long) (cinfo->max_h_samp_factor * DCTSIZE));
-    compptr->downsampled_height = (JDIMENSION)
-      jdiv_round_up((long) cinfo->image_height *
-		    (long) (compptr->v_samp_factor * compptr->DCT_scaled_size),
-		    (long) (cinfo->max_v_samp_factor * DCTSIZE));
-  }
-
-#else /* !IDCT_SCALING_SUPPORTED */
-
-  /* Hardwire it to "no scaling" */
-  cinfo->output_width = cinfo->image_width;
-  cinfo->output_height = cinfo->image_height;
-  /* jdinput.c has already initialized DCT_scaled_size to DCTSIZE,
-   * and has computed unscaled downsampled_width and downsampled_height.
-   */
-
-#endif /* IDCT_SCALING_SUPPORTED */
-
-  /* Report number of components in selected colorspace. */
-  /* Probably this should be in the color conversion module... */
-  switch (cinfo->out_color_space) {
-  case JCS_GRAYSCALE:
-    cinfo->out_color_components = 1;
-    break;
-  case JCS_RGB:
-#if RGB_PIXELSIZE != 3
-    cinfo->out_color_components = RGB_PIXELSIZE;
-    break;
-#endif /* else share code with YCbCr */
-  case JCS_YCbCr:
-    cinfo->out_color_components = 3;
-    break;
-  case JCS_CMYK:
-  case JCS_YCCK:
-    cinfo->out_color_components = 4;
-    break;
-  default:			/* else must be same colorspace as in file */
-    cinfo->out_color_components = cinfo->num_components;
-    break;
-  }
-  cinfo->output_components = (cinfo->quantize_colors ? 1 :
-			      cinfo->out_color_components);
-
-  /* See if upsampler will want to emit more than one row at a time */
-  if (use_merged_upsample(cinfo))
-    cinfo->rec_outbuf_height = cinfo->max_v_samp_factor;
-  else
-    cinfo->rec_outbuf_height = 1;
-}
-
-
-/*
- * Several decompression processes need to range-limit values to the range
- * 0..MAXJSAMPLE; the input value may fall somewhat outside this range
- * due to noise introduced by quantization, roundoff error, etc.  These
- * processes are inner loops and need to be as fast as possible.  On most
- * machines, particularly CPUs with pipelines or instruction prefetch,
- * a (subscript-check-less) C table lookup
- *		x = sample_range_limit[x];
- * is faster than explicit tests
- *		if (x < 0)  x = 0;
- *		else if (x > MAXJSAMPLE)  x = MAXJSAMPLE;
- * These processes all use a common table prepared by the routine below.
- *
- * For most steps we can mathematically guarantee that the initial value
- * of x is within MAXJSAMPLE+1 of the legal range, so a table running from
- * -(MAXJSAMPLE+1) to 2*MAXJSAMPLE+1 is sufficient.  But for the initial
- * limiting step (just after the IDCT), a wildly out-of-range value is
- * possible if the input data is corrupt.  To avoid any chance of indexing
- * off the end of memory and getting a bad-pointer trap, we perform the
- * post-IDCT limiting thus:
- *		x = range_limit[x & MASK];
- * where MASK is 2 bits wider than legal sample data, ie 10 bits for 8-bit
- * samples.  Under normal circumstances this is more than enough range and
- * a correct output will be generated; with bogus input data the mask will
- * cause wraparound, and we will safely generate a bogus-but-in-range output.
- * For the post-IDCT step, we want to convert the data from signed to unsigned
- * representation by adding CENTERJSAMPLE at the same time that we limit it.
- * So the post-IDCT limiting table ends up looking like this:
- *   CENTERJSAMPLE,CENTERJSAMPLE+1,...,MAXJSAMPLE,
- *   MAXJSAMPLE (repeat 2*(MAXJSAMPLE+1)-CENTERJSAMPLE times),
- *   0          (repeat 2*(MAXJSAMPLE+1)-CENTERJSAMPLE times),
- *   0,1,...,CENTERJSAMPLE-1
- * Negative inputs select values from the upper half of the table after
- * masking.
- *
- * We can save some space by overlapping the start of the post-IDCT table
- * with the simpler range limiting table.  The post-IDCT table begins at
- * sample_range_limit + CENTERJSAMPLE.
- *
- * Note that the table is allocated in near data space on PCs; it's small
- * enough and used often enough to justify this.
- */
-
-LOCAL(void)
-prepare_range_limit_table (j_decompress_ptr cinfo)
-/* Allocate and fill in the sample_range_limit table */
-{
-  JSAMPLE * table;
-  int i;
-
-  table = (JSAMPLE *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-		(5 * (MAXJSAMPLE+1) + CENTERJSAMPLE) * SIZEOF(JSAMPLE));
-  table += (MAXJSAMPLE+1);	/* allow negative subscripts of simple table */
-  cinfo->sample_range_limit = table;
-  /* First segment of "simple" table: limit[x] = 0 for x < 0 */
-  MEMZERO(table - (MAXJSAMPLE+1), (MAXJSAMPLE+1) * SIZEOF(JSAMPLE));
-  /* Main part of "simple" table: limit[x] = x */
-  for (i = 0; i <= MAXJSAMPLE; i++)
-    table[i] = (JSAMPLE) i;
-  table += CENTERJSAMPLE;	/* Point to where post-IDCT table starts */
-  /* End of simple table, rest of first half of post-IDCT table */
-  for (i = CENTERJSAMPLE; i < 2*(MAXJSAMPLE+1); i++)
-    table[i] = MAXJSAMPLE;
-  /* Second half of post-IDCT table */
-  MEMZERO(table + (2 * (MAXJSAMPLE+1)),
-	  (2 * (MAXJSAMPLE+1) - CENTERJSAMPLE) * SIZEOF(JSAMPLE));
-  MEMCOPY(table + (4 * (MAXJSAMPLE+1) - CENTERJSAMPLE),
-	  cinfo->sample_range_limit, CENTERJSAMPLE * SIZEOF(JSAMPLE));
-}
-
-
-/*
- * Master selection of decompression modules.
- * This is done once at jpeg_start_decompress time.  We determine
- * which modules will be used and give them appropriate initialization calls.
- * We also initialize the decompressor input side to begin consuming data.
- *
- * Since jpeg_read_header has finished, we know what is in the SOF
- * and (first) SOS markers.  We also have all the application parameter
- * settings.
- */
-
-LOCAL(void)
-master_selection (j_decompress_ptr cinfo)
-{
-  my_master_ptr master = (my_master_ptr) cinfo->master;
-  wxjpeg_boolean use_c_buffer;
-  long samplesperrow;
-  JDIMENSION jd_samplesperrow;
-
-  /* Initialize dimensions and other stuff */
-  jpeg_calc_output_dimensions(cinfo);
-  prepare_range_limit_table(cinfo);
-
-  /* Width of an output scanline must be representable as JDIMENSION. */
-  samplesperrow = (long) cinfo->output_width * (long) cinfo->out_color_components;
-  jd_samplesperrow = (JDIMENSION) samplesperrow;
-  if ((long) jd_samplesperrow != samplesperrow)
-    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
-
-  /* Initialize my private state */
-  master->pass_number = 0;
-  master->using_merged_upsample = use_merged_upsample(cinfo);
-
-  /* Color quantizer selection */
-  master->quantizer_1pass = NULL;
-  master->quantizer_2pass = NULL;
-  /* No mode changes if not using buffered-image mode. */
-  if (! cinfo->quantize_colors || ! cinfo->buffered_image) {
-    cinfo->enable_1pass_quant = FALSE;
-    cinfo->enable_external_quant = FALSE;
-    cinfo->enable_2pass_quant = FALSE;
-  }
-  if (cinfo->quantize_colors) {
-    if (cinfo->raw_data_out)
-      ERREXIT(cinfo, JERR_NOTIMPL);
-    /* 2-pass quantizer only works in 3-component color space. */
-    if (cinfo->out_color_components != 3) {
-      cinfo->enable_1pass_quant = TRUE;
-      cinfo->enable_external_quant = FALSE;
-      cinfo->enable_2pass_quant = FALSE;
-      cinfo->colormap = NULL;
-    } else if (cinfo->colormap != NULL) {
-      cinfo->enable_external_quant = TRUE;
-    } else if (cinfo->two_pass_quantize) {
-      cinfo->enable_2pass_quant = TRUE;
-    } else {
-      cinfo->enable_1pass_quant = TRUE;
-    }
-
-    if (cinfo->enable_1pass_quant) {
-#ifdef QUANT_1PASS_SUPPORTED
-      jinit_1pass_quantizer(cinfo);
-      master->quantizer_1pass = cinfo->cquantize;
-#else
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-    }
-
-    /* We use the 2-pass code to map to external colormaps. */
-    if (cinfo->enable_2pass_quant || cinfo->enable_external_quant) {
-#ifdef QUANT_2PASS_SUPPORTED
-      jinit_2pass_quantizer(cinfo);
-      master->quantizer_2pass = cinfo->cquantize;
-#else
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-    }
-    /* If both quantizers are initialized, the 2-pass one is left active;
-     * this is necessary for starting with quantization to an external map.
-     */
-  }
-
-  /* Post-processing: in particular, color conversion first */
-  if (! cinfo->raw_data_out) {
-    if (master->using_merged_upsample) {
-#ifdef UPSAMPLE_MERGING_SUPPORTED
-      jinit_merged_upsampler(cinfo); /* does color conversion too */
-#else
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-    } else {
-      jinit_color_deconverter(cinfo);
-      jinit_upsampler(cinfo);
-    }
-    jinit_d_post_controller(cinfo, cinfo->enable_2pass_quant);
-  }
-  /* Inverse DCT */
-  jinit_inverse_dct(cinfo);
-  /* Entropy decoding: either Huffman or arithmetic coding. */
-  if (cinfo->arith_code) {
-    ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
-  } else {
-    if (cinfo->progressive_mode) {
-#ifdef D_PROGRESSIVE_SUPPORTED
-      jinit_phuff_decoder(cinfo);
-#else
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-    } else
-      jinit_huff_decoder(cinfo);
-  }
-
-  /* Initialize principal buffer controllers. */
-  use_c_buffer = cinfo->inputctl->has_multiple_scans || cinfo->buffered_image;
-  jinit_d_coef_controller(cinfo, use_c_buffer);
-
-  if (! cinfo->raw_data_out)
-    jinit_d_main_controller(cinfo, FALSE /* never need full buffer here */);
-
-  /* We can now tell the memory manager to allocate virtual arrays. */
-  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);
-
-  /* Initialize input side of decompressor to consume first scan. */
-  (*cinfo->inputctl->start_input_pass) (cinfo);
-
-#ifdef D_MULTISCAN_FILES_SUPPORTED
-  /* If jpeg_start_decompress will read the whole file, initialize
-   * progress monitoring appropriately.  The input step is counted
-   * as one pass.
-   */
-  if (cinfo->progress != NULL && ! cinfo->buffered_image &&
-      cinfo->inputctl->has_multiple_scans) {
-    int nscans;
-    /* Estimate number of scans to set pass_limit. */
-    if (cinfo->progressive_mode) {
-      /* Arbitrarily estimate 2 interleaved DC scans + 3 AC scans/component. */
-      nscans = 2 + 3 * cinfo->num_components;
-    } else {
-      /* For a nonprogressive multiscan file, estimate 1 scan per component. */
-      nscans = cinfo->num_components;
-    }
-    cinfo->progress->pass_counter = 0L;
-    cinfo->progress->pass_limit = (long) cinfo->total_iMCU_rows * nscans;
-    cinfo->progress->completed_passes = 0;
-    cinfo->progress->total_passes = (cinfo->enable_2pass_quant ? 3 : 2);
-    /* Count the input pass as done */
-    master->pass_number++;
-  }
-#endif /* D_MULTISCAN_FILES_SUPPORTED */
-}
-
-
-/*
- * Per-pass setup.
- * This is called at the beginning of each output pass.  We determine which
- * modules will be active during this pass and give them appropriate
- * start_pass calls.  We also set is_dummy_pass to indicate whether this
- * is a "real" output pass or a dummy pass for color quantization.
- * (In the latter case, jdapistd.c will crank the pass to completion.)
- */
-
-METHODDEF(void)
-prepare_for_output_pass (j_decompress_ptr cinfo)
-{
-  my_master_ptr master = (my_master_ptr) cinfo->master;
-
-  if (master->pub.is_dummy_pass) {
-#ifdef QUANT_2PASS_SUPPORTED
-    /* Final pass of 2-pass quantization */
-    master->pub.is_dummy_pass = FALSE;
-    (*cinfo->cquantize->start_pass) (cinfo, FALSE);
-    (*cinfo->post->start_pass) (cinfo, JBUF_CRANK_DEST);
-    (*cinfo->main->start_pass) (cinfo, JBUF_CRANK_DEST);
-#else
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif /* QUANT_2PASS_SUPPORTED */
-  } else {
-    if (cinfo->quantize_colors && cinfo->colormap == NULL) {
-      /* Select new quantization method */
-      if (cinfo->two_pass_quantize && cinfo->enable_2pass_quant) {
-	cinfo->cquantize = master->quantizer_2pass;
-	master->pub.is_dummy_pass = TRUE;
-      } else if (cinfo->enable_1pass_quant) {
-	cinfo->cquantize = master->quantizer_1pass;
-      } else {
-	ERREXIT(cinfo, JERR_MODE_CHANGE);
-      }
-    }
-    (*cinfo->idct->start_pass) (cinfo);
-    (*cinfo->coef->start_output_pass) (cinfo);
-    if (! cinfo->raw_data_out) {
-      if (! master->using_merged_upsample)
-	(*cinfo->cconvert->start_pass) (cinfo);
-      (*cinfo->upsample->start_pass) (cinfo);
-      if (cinfo->quantize_colors)
-	(*cinfo->cquantize->start_pass) (cinfo, master->pub.is_dummy_pass);
-      (*cinfo->post->start_pass) (cinfo,
-	    (master->pub.is_dummy_pass ? JBUF_SAVE_AND_PASS : JBUF_PASS_THRU));
-      (*cinfo->main->start_pass) (cinfo, JBUF_PASS_THRU);
-    }
-  }
-
-  /* Set up progress monitor's pass info if present */
-  if (cinfo->progress != NULL) {
-    cinfo->progress->completed_passes = master->pass_number;
-    cinfo->progress->total_passes = master->pass_number +
-				    (master->pub.is_dummy_pass ? 2 : 1);
-    /* In buffered-image mode, we assume one more output pass if EOI not
-     * yet reached, but no more passes if EOI has been reached.
-     */
-    if (cinfo->buffered_image && ! cinfo->inputctl->eoi_reached) {
-      cinfo->progress->total_passes += (cinfo->enable_2pass_quant ? 2 : 1);
-    }
-  }
-}
-
-
-/*
- * Finish up at end of an output pass.
- */
-
-METHODDEF(void)
-finish_output_pass (j_decompress_ptr cinfo)
-{
-  my_master_ptr master = (my_master_ptr) cinfo->master;
-
-  if (cinfo->quantize_colors)
-    (*cinfo->cquantize->finish_pass) (cinfo);
-  master->pass_number++;
-}
-
-
-#ifdef D_MULTISCAN_FILES_SUPPORTED
-
-/*
- * Switch to a new external colormap between output passes.
- */
-
-GLOBAL(void)
-jpeg_new_colormap (j_decompress_ptr cinfo)
-{
-  my_master_ptr master = (my_master_ptr) cinfo->master;
-
-  /* Prevent application from calling me at wrong times */
-  if (cinfo->global_state != DSTATE_BUFIMAGE)
-    ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-
-  if (cinfo->quantize_colors && cinfo->enable_external_quant &&
-      cinfo->colormap != NULL) {
-    /* Select 2-pass quantizer for external colormap use */
-    cinfo->cquantize = master->quantizer_2pass;
-    /* Notify quantizer of colormap change */
-    (*cinfo->cquantize->new_color_map) (cinfo);
-    master->pub.is_dummy_pass = FALSE; /* just in case */
-  } else
-    ERREXIT(cinfo, JERR_MODE_CHANGE);
-}
-
-#endif /* D_MULTISCAN_FILES_SUPPORTED */
-
-
-/*
- * Initialize master decompression control and select active modules.
- * This is performed at the start of jpeg_start_decompress.
- */
-
-GLOBAL(void)
-jinit_master_decompress (j_decompress_ptr cinfo)
-{
-  my_master_ptr master;
-
-  master = (my_master_ptr)
-      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				  SIZEOF(my_decomp_master));
-  cinfo->master = (struct jpeg_decomp_master *) master;
-  master->pub.prepare_for_output_pass = prepare_for_output_pass;
-  master->pub.finish_output_pass = finish_output_pass;
-
-  master->pub.is_dummy_pass = FALSE;
-
-  master_selection(cinfo);
-}
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdmerge.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdmerge.c
deleted file mode 100644
index 55eab36217..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdmerge.c
+++ /dev/null
@@ -1,399 +0,0 @@
-/*
- * jdmerge.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains code for merged upsampling/color conversion.
- *
- * This file combines functions from jdsample.c and jdcolor.c;
- * read those files first to understand what's going on.
- *
- * When the chroma components are to be upsampled by simple replication
- * (ie, box filtering), we can save some work in color conversion by
- * calculating all the output pixels corresponding to a pair of chroma
- * samples at one time.  In the conversion equations
- *	R = Y           + K1 * Cr
- *	G = Y + K2 * Cb + K3 * Cr
- *	B = Y + K4 * Cb
- * only the Y term varies among the group of pixels corresponding to a pair
- * of chroma samples, so the rest of the terms can be calculated just once.
- * At typical sampling ratios, this eliminates half or three-quarters of the
- * multiplications needed for color conversion.
- *
- * This file currently provides implementations for the following cases:
- *	YCbCr => RGB color conversion only.
- *	Sampling ratios of 2h1v or 2h2v.
- *	No scaling needed at upsample time.
- *	Corner-aligned (non-CCIR601) sampling alignment.
- * Other special cases could be added, but in most applications these are
- * the only common cases.  (For uncommon cases we fall back on the more
- * general code in jdsample.c and jdcolor.c.)
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-#ifdef UPSAMPLE_MERGING_SUPPORTED
-
-
-/* Private subobject */
-
-typedef struct {
-  struct jpeg_upsampler pub;	/* public fields */
-
-  /* Pointer to routine to do actual upsampling/conversion of one row group */
-  JMETHOD(void, upmethod, (j_decompress_ptr cinfo,
-			   JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
-			   JSAMPARRAY output_buf));
-
-  /* Private state for YCC->RGB conversion */
-  int * Cr_r_tab;		/* => table for Cr to R conversion */
-  int * Cb_b_tab;		/* => table for Cb to B conversion */
-  JPEG_INT32 * Cr_g_tab;		/* => table for Cr to G conversion */
-  JPEG_INT32 * Cb_g_tab;		/* => table for Cb to G conversion */
-
-  /* For 2:1 vertical sampling, we produce two output rows at a time.
-   * We need a "spare" row buffer to hold the second output row if the
-   * application provides just a one-row buffer; we also use the spare
-   * to discard the dummy last row if the image height is odd.
-   */
-  JSAMPROW spare_row;
-  wxjpeg_boolean spare_full;		/* T if spare buffer is occupied */
-
-  JDIMENSION out_row_width;	/* samples per output row */
-  JDIMENSION rows_to_go;	/* counts rows remaining in image */
-} my_upsampler;
-
-typedef my_upsampler * my_upsample_ptr;
-
-#define SCALEBITS	16	/* speediest right-shift on some machines */
-#define ONE_HALF	((JPEG_INT32) 1 << (SCALEBITS-1))
-#define FIX(x)		((JPEG_INT32) ((x) * (1L<RGB colorspace conversion.
- * This is taken directly from jdcolor.c; see that file for more info.
- */
-
-LOCAL(void)
-build_ycc_rgb_table (j_decompress_ptr cinfo)
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-  int i;
-  JPEG_INT32 x;
-  SHIFT_TEMPS
-
-  upsample->Cr_r_tab = (int *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(MAXJSAMPLE+1) * SIZEOF(int));
-  upsample->Cb_b_tab = (int *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(MAXJSAMPLE+1) * SIZEOF(int));
-  upsample->Cr_g_tab = (JPEG_INT32 *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(MAXJSAMPLE+1) * SIZEOF(JPEG_INT32));
-  upsample->Cb_g_tab = (JPEG_INT32 *)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				(MAXJSAMPLE+1) * SIZEOF(JPEG_INT32));
-
-  for (i = 0, x = -CENTERJSAMPLE; i <= MAXJSAMPLE; i++, x++) {
-    /* i is the actual input pixel value, in the range 0..MAXJSAMPLE */
-    /* The Cb or Cr value we are thinking of is x = i - CENTERJSAMPLE */
-    /* Cr=>R value is nearest int to 1.40200 * x */
-    upsample->Cr_r_tab[i] = (int)
-		    RIGHT_SHIFT(FIX(1.40200) * x + ONE_HALF, SCALEBITS);
-    /* Cb=>B value is nearest int to 1.77200 * x */
-    upsample->Cb_b_tab[i] = (int)
-		    RIGHT_SHIFT(FIX(1.77200) * x + ONE_HALF, SCALEBITS);
-    /* Cr=>G value is scaled-up -0.71414 * x */
-    upsample->Cr_g_tab[i] = (- FIX(0.71414)) * x;
-    /* Cb=>G value is scaled-up -0.34414 * x */
-    /* We also add in ONE_HALF so that need not do it in inner loop */
-    upsample->Cb_g_tab[i] = (- FIX(0.34414)) * x + ONE_HALF;
-  }
-}
-
-
-/*
- * Initialize for an upsampling pass.
- */
-
-METHODDEF(void)
-start_pass_merged_upsample (j_decompress_ptr cinfo)
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-
-  /* Mark the spare buffer empty */
-  upsample->spare_full = FALSE;
-  /* Initialize total-height counter for detecting bottom of image */
-  upsample->rows_to_go = cinfo->output_height;
-}
-
-
-/*
- * Control routine to do upsampling (and color conversion).
- *
- * The control routine just handles the row buffering considerations.
- */
-
-METHODDEF(void)
-merged_2v_upsample (j_decompress_ptr cinfo,
-		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-		    JDIMENSION in_row_groups_avail,
-		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-		    JDIMENSION out_rows_avail)
-/* 2:1 vertical sampling case: may need a spare row. */
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-  JSAMPROW work_ptrs[2];
-  JDIMENSION num_rows;		/* number of rows returned to caller */
-
-  if (upsample->spare_full) {
-    /* If we have a spare row saved from a previous cycle, just return it. */
-    jcopy_sample_rows(& upsample->spare_row, 0, output_buf + *out_row_ctr, 0,
-		      1, upsample->out_row_width);
-    num_rows = 1;
-    upsample->spare_full = FALSE;
-  } else {
-    /* Figure number of rows to return to caller. */
-    num_rows = 2;
-    /* Not more than the distance to the end of the image. */
-    if (num_rows > upsample->rows_to_go)
-      num_rows = upsample->rows_to_go;
-    /* And not more than what the client can accept: */
-    out_rows_avail -= *out_row_ctr;
-    if (num_rows > out_rows_avail)
-      num_rows = out_rows_avail;
-    /* Create output pointer array for upsampler. */
-    work_ptrs[0] = output_buf[*out_row_ctr];
-    if (num_rows > 1) {
-      work_ptrs[1] = output_buf[*out_row_ctr + 1];
-    } else {
-      work_ptrs[1] = upsample->spare_row;
-      upsample->spare_full = TRUE;
-    }
-    /* Now do the upsampling. */
-    (*upsample->upmethod) (cinfo, input_buf, *in_row_group_ctr, work_ptrs);
-  }
-
-  /* Adjust counts */
-  *out_row_ctr += num_rows;
-  upsample->rows_to_go -= num_rows;
-  /* When the buffer is emptied, declare this input row group consumed */
-  if (! upsample->spare_full)
-    (*in_row_group_ctr)++;
-}
-
-
-METHODDEF(void)
-merged_1v_upsample (j_decompress_ptr cinfo,
-		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-		    JDIMENSION in_row_groups_avail,
-		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-		    JDIMENSION out_rows_avail)
-/* 1:1 vertical sampling case: much easier, never need a spare row. */
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-
-  /* Just do the upsampling. */
-  (*upsample->upmethod) (cinfo, input_buf, *in_row_group_ctr,
-			 output_buf + *out_row_ctr);
-  /* Adjust counts */
-  (*out_row_ctr)++;
-  (*in_row_group_ctr)++;
-}
-
-
-/*
- * These are the routines invoked by the control routines to do
- * the actual upsampling/conversion.  One row group is processed per call.
- *
- * Note: since we may be writing directly into application-supplied buffers,
- * we have to be honest about the output width; we can't assume the buffer
- * has been rounded up to an even width.
- */
-
-
-/*
- * Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical.
- */
-
-METHODDEF(void)
-h2v1_merged_upsample (j_decompress_ptr cinfo,
-		      JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
-		      JSAMPARRAY output_buf)
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-  register int y, cred, cgreen, cblue;
-  int cb, cr;
-  register JSAMPROW outptr;
-  JSAMPROW inptr0, inptr1, inptr2;
-  JDIMENSION col;
-  /* copy these pointers into registers if possible */
-  register JSAMPLE * range_limit = cinfo->sample_range_limit;
-  int * Crrtab = upsample->Cr_r_tab;
-  int * Cbbtab = upsample->Cb_b_tab;
-  JPEG_INT32 * Crgtab = upsample->Cr_g_tab;
-  JPEG_INT32 * Cbgtab = upsample->Cb_g_tab;
-  SHIFT_TEMPS
-
-  inptr0 = input_buf[0][in_row_group_ctr];
-  inptr1 = input_buf[1][in_row_group_ctr];
-  inptr2 = input_buf[2][in_row_group_ctr];
-  outptr = output_buf[0];
-  /* Loop for each pair of output pixels */
-  for (col = cinfo->output_width >> 1; col > 0; col--) {
-    /* Do the chroma part of the calculation */
-    cb = GETJSAMPLE(*inptr1++);
-    cr = GETJSAMPLE(*inptr2++);
-    cred = Crrtab[cr];
-    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
-    cblue = Cbbtab[cb];
-    /* Fetch 2 Y values and emit 2 pixels */
-    y  = GETJSAMPLE(*inptr0++);
-    outptr[RGB_RED] =   range_limit[y + cred];
-    outptr[RGB_GREEN] = range_limit[y + cgreen];
-    outptr[RGB_BLUE] =  range_limit[y + cblue];
-    outptr += RGB_PIXELSIZE;
-    y  = GETJSAMPLE(*inptr0++);
-    outptr[RGB_RED] =   range_limit[y + cred];
-    outptr[RGB_GREEN] = range_limit[y + cgreen];
-    outptr[RGB_BLUE] =  range_limit[y + cblue];
-    outptr += RGB_PIXELSIZE;
-  }
-  /* If image width is odd, do the last output column separately */
-  if (cinfo->output_width & 1) {
-    cb = GETJSAMPLE(*inptr1);
-    cr = GETJSAMPLE(*inptr2);
-    cred = Crrtab[cr];
-    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
-    cblue = Cbbtab[cb];
-    y  = GETJSAMPLE(*inptr0);
-    outptr[RGB_RED] =   range_limit[y + cred];
-    outptr[RGB_GREEN] = range_limit[y + cgreen];
-    outptr[RGB_BLUE] =  range_limit[y + cblue];
-  }
-}
-
-/*
- * Upsample and color convert for the case of 2:1 horizontal and 2:1 vertical.
- */
-
-METHODDEF(void)
-h2v2_merged_upsample (j_decompress_ptr cinfo,
-		      JSAMPIMAGE input_buf, JDIMENSION in_row_group_ctr,
-		      JSAMPARRAY output_buf)
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-  register int y, cred, cgreen, cblue;
-  int cb, cr;
-  register JSAMPROW outptr0, outptr1;
-  JSAMPROW inptr00, inptr01, inptr1, inptr2;
-  JDIMENSION col;
-  /* copy these pointers into registers if possible */
-  register JSAMPLE * range_limit = cinfo->sample_range_limit;
-  int * Crrtab = upsample->Cr_r_tab;
-  int * Cbbtab = upsample->Cb_b_tab;
-  JPEG_INT32 * Crgtab = upsample->Cr_g_tab;
-  JPEG_INT32 * Cbgtab = upsample->Cb_g_tab;
-  SHIFT_TEMPS
-
-  inptr00 = input_buf[0][in_row_group_ctr*2];
-  inptr01 = input_buf[0][in_row_group_ctr*2 + 1];
-  inptr1 = input_buf[1][in_row_group_ctr];
-  inptr2 = input_buf[2][in_row_group_ctr];
-  outptr0 = output_buf[0];
-  outptr1 = output_buf[1];
-  /* Loop for each group of output pixels */
-  for (col = cinfo->output_width >> 1; col > 0; col--) {
-    /* Do the chroma part of the calculation */
-    cb = GETJSAMPLE(*inptr1++);
-    cr = GETJSAMPLE(*inptr2++);
-    cred = Crrtab[cr];
-    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
-    cblue = Cbbtab[cb];
-    /* Fetch 4 Y values and emit 4 pixels */
-    y  = GETJSAMPLE(*inptr00++);
-    outptr0[RGB_RED] =   range_limit[y + cred];
-    outptr0[RGB_GREEN] = range_limit[y + cgreen];
-    outptr0[RGB_BLUE] =  range_limit[y + cblue];
-    outptr0 += RGB_PIXELSIZE;
-    y  = GETJSAMPLE(*inptr00++);
-    outptr0[RGB_RED] =   range_limit[y + cred];
-    outptr0[RGB_GREEN] = range_limit[y + cgreen];
-    outptr0[RGB_BLUE] =  range_limit[y + cblue];
-    outptr0 += RGB_PIXELSIZE;
-    y  = GETJSAMPLE(*inptr01++);
-    outptr1[RGB_RED] =   range_limit[y + cred];
-    outptr1[RGB_GREEN] = range_limit[y + cgreen];
-    outptr1[RGB_BLUE] =  range_limit[y + cblue];
-    outptr1 += RGB_PIXELSIZE;
-    y  = GETJSAMPLE(*inptr01++);
-    outptr1[RGB_RED] =   range_limit[y + cred];
-    outptr1[RGB_GREEN] = range_limit[y + cgreen];
-    outptr1[RGB_BLUE] =  range_limit[y + cblue];
-    outptr1 += RGB_PIXELSIZE;
-  }
-  /* If image width is odd, do the last output column separately */
-  if (cinfo->output_width & 1) {
-    cb = GETJSAMPLE(*inptr1);
-    cr = GETJSAMPLE(*inptr2);
-    cred = Crrtab[cr];
-    cgreen = (int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], SCALEBITS);
-    cblue = Cbbtab[cb];
-    y  = GETJSAMPLE(*inptr00);
-    outptr0[RGB_RED] =   range_limit[y + cred];
-    outptr0[RGB_GREEN] = range_limit[y + cgreen];
-    outptr0[RGB_BLUE] =  range_limit[y + cblue];
-    y  = GETJSAMPLE(*inptr01);
-    outptr1[RGB_RED] =   range_limit[y + cred];
-    outptr1[RGB_GREEN] = range_limit[y + cgreen];
-    outptr1[RGB_BLUE] =  range_limit[y + cblue];
-  }
-}
-
-
-/*
- * Module initialization routine for merged upsampling/color conversion.
- *
- * NB: this is called under the conditions determined by use_merged_upsample()
- * in jdmaster.c.  That routine MUST correspond to the actual capabilities
- * of this module; no safety checks are made here.
- */
-
-GLOBAL(void)
-jinit_merged_upsampler (j_decompress_ptr cinfo)
-{
-  my_upsample_ptr upsample;
-
-  upsample = (my_upsample_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_upsampler));
-  cinfo->upsample = (struct jpeg_upsampler *) upsample;
-  upsample->pub.start_pass = start_pass_merged_upsample;
-  upsample->pub.need_context_rows = FALSE;
-
-  upsample->out_row_width = cinfo->output_width * cinfo->out_color_components;
-
-  if (cinfo->max_v_samp_factor == 2) {
-    upsample->pub.upsample = merged_2v_upsample;
-    upsample->upmethod = h2v2_merged_upsample;
-    /* Allocate a spare row buffer */
-    upsample->spare_row = (JSAMPROW)
-      (*cinfo->mem->alloc_large) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-		(size_t) (upsample->out_row_width * SIZEOF(JSAMPLE)));
-  } else {
-    upsample->pub.upsample = merged_1v_upsample;
-    upsample->upmethod = h2v1_merged_upsample;
-    /* No spare row needed */
-    upsample->spare_row = NULL;
-  }
-
-  build_ycc_rgb_table(cinfo);
-}
-
-#endif /* UPSAMPLE_MERGING_SUPPORTED */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdphuff.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdphuff.c
deleted file mode 100644
index 96b4364e45..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdphuff.c
+++ /dev/null
@@ -1,668 +0,0 @@
-/*
- * jdphuff.c
- *
- * Copyright (C) 1995-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains Huffman entropy decoding routines for progressive JPEG.
- *
- * Much of the complexity here has to do with supporting input suspension.
- * If the data source module demands suspension, we want to be able to back
- * up to the start of the current MCU.  To do this, we copy state variables
- * into local working storage, and update them back to the permanent
- * storage only upon successful completion of an MCU.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdhuff.h"		/* Declarations shared with jdhuff.c */
-
-
-#ifdef D_PROGRESSIVE_SUPPORTED
-
-/*
- * Expanded entropy decoder object for progressive Huffman decoding.
- *
- * The savable_state subrecord contains fields that change within an MCU,
- * but must not be updated permanently until we complete the MCU.
- */
-
-typedef struct {
-  unsigned int EOBRUN;			/* remaining EOBs in EOBRUN */
-  int last_dc_val[MAX_COMPS_IN_SCAN];	/* last DC coef for each component */
-} savable_state;
-
-/* This macro is to work around compilers with missing or broken
- * structure assignment.  You'll need to fix this code if you have
- * such a compiler and you change MAX_COMPS_IN_SCAN.
- */
-
-#ifndef NO_STRUCT_ASSIGN
-#define ASSIGN_STATE(dest,src)  ((dest) = (src))
-#else
-#if MAX_COMPS_IN_SCAN == 4
-#define ASSIGN_STATE(dest,src)  \
-	((dest).EOBRUN = (src).EOBRUN, \
-	 (dest).last_dc_val[0] = (src).last_dc_val[0], \
-	 (dest).last_dc_val[1] = (src).last_dc_val[1], \
-	 (dest).last_dc_val[2] = (src).last_dc_val[2], \
-	 (dest).last_dc_val[3] = (src).last_dc_val[3])
-#endif
-#endif
-
-
-typedef struct {
-  struct jpeg_entropy_decoder pub; /* public fields */
-
-  /* These fields are loaded into local variables at start of each MCU.
-   * In case of suspension, we exit WITHOUT updating them.
-   */
-  bitread_perm_state bitstate;	/* Bit buffer at start of MCU */
-  savable_state saved;		/* Other state at start of MCU */
-
-  /* These fields are NOT loaded into local working state. */
-  unsigned int restarts_to_go;	/* MCUs left in this restart interval */
-
-  /* Pointers to derived tables (these workspaces have image lifespan) */
-  d_derived_tbl * derived_tbls[NUM_HUFF_TBLS];
-
-  d_derived_tbl * ac_derived_tbl; /* active table during an AC scan */
-} phuff_entropy_decoder;
-
-typedef phuff_entropy_decoder * phuff_entropy_ptr;
-
-/* Forward declarations */
-METHODDEF(wxjpeg_boolean) decode_mcu_DC_first JPP((j_decompress_ptr cinfo,
-					    JBLOCKROW *MCU_data));
-METHODDEF(wxjpeg_boolean) decode_mcu_AC_first JPP((j_decompress_ptr cinfo,
-					    JBLOCKROW *MCU_data));
-METHODDEF(wxjpeg_boolean) decode_mcu_DC_refine JPP((j_decompress_ptr cinfo,
-					     JBLOCKROW *MCU_data));
-METHODDEF(wxjpeg_boolean) decode_mcu_AC_refine JPP((j_decompress_ptr cinfo,
-					     JBLOCKROW *MCU_data));
-
-
-/*
- * Initialize for a Huffman-compressed scan.
- */
-
-METHODDEF(void)
-start_pass_phuff_decoder (j_decompress_ptr cinfo)
-{
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  wxjpeg_boolean is_DC_band, bad;
-  int ci, coefi, tbl;
-  int *coef_bit_ptr;
-  jpeg_component_info * compptr;
-
-  is_DC_band = (cinfo->Ss == 0);
-
-  /* Validate scan parameters */
-  bad = FALSE;
-  if (is_DC_band) {
-    if (cinfo->Se != 0)
-      bad = TRUE;
-  } else {
-    /* need not check Ss/Se < 0 since they came from unsigned bytes */
-    if (cinfo->Ss > cinfo->Se || cinfo->Se >= DCTSIZE2)
-      bad = TRUE;
-    /* AC scans may have only one component */
-    if (cinfo->comps_in_scan != 1)
-      bad = TRUE;
-  }
-  if (cinfo->Ah != 0) {
-    /* Successive approximation refinement scan: must have Al = Ah-1. */
-    if (cinfo->Al != cinfo->Ah-1)
-      bad = TRUE;
-  }
-  if (cinfo->Al > 13)		/* need not check for < 0 */
-    bad = TRUE;
-  /* Arguably the maximum Al value should be less than 13 for 8-bit precision,
-   * but the spec doesn't say so, and we try to be liberal about what we
-   * accept.  Note: large Al values could result in out-of-range DC
-   * coefficients during early scans, leading to bizarre displays due to
-   * overflows in the IDCT math.  But we won't crash.
-   */
-  if (bad)
-    ERREXIT4(cinfo, JERR_BAD_PROGRESSION,
-	     cinfo->Ss, cinfo->Se, cinfo->Ah, cinfo->Al);
-  /* Update progression status, and verify that scan order is legal.
-   * Note that inter-scan inconsistencies are treated as warnings
-   * not fatal errors ... not clear if this is right way to behave.
-   */
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    int cindex = cinfo->cur_comp_info[ci]->component_index;
-    coef_bit_ptr = & cinfo->coef_bits[cindex][0];
-    if (!is_DC_band && coef_bit_ptr[0] < 0) /* AC without prior DC scan */
-      WARNMS2(cinfo, JWRN_BOGUS_PROGRESSION, cindex, 0);
-    for (coefi = cinfo->Ss; coefi <= cinfo->Se; coefi++) {
-      int expected = (coef_bit_ptr[coefi] < 0) ? 0 : coef_bit_ptr[coefi];
-      if (cinfo->Ah != expected)
-	WARNMS2(cinfo, JWRN_BOGUS_PROGRESSION, cindex, coefi);
-      coef_bit_ptr[coefi] = cinfo->Al;
-    }
-  }
-
-  /* Select MCU decoding routine */
-  if (cinfo->Ah == 0) {
-    if (is_DC_band)
-      entropy->pub.decode_mcu = decode_mcu_DC_first;
-    else
-      entropy->pub.decode_mcu = decode_mcu_AC_first;
-  } else {
-    if (is_DC_band)
-      entropy->pub.decode_mcu = decode_mcu_DC_refine;
-    else
-      entropy->pub.decode_mcu = decode_mcu_AC_refine;
-  }
-
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++) {
-    compptr = cinfo->cur_comp_info[ci];
-    /* Make sure requested tables are present, and compute derived tables.
-     * We may build same derived table more than once, but it's not expensive.
-     */
-    if (is_DC_band) {
-      if (cinfo->Ah == 0) {	/* DC refinement needs no table */
-	tbl = compptr->dc_tbl_no;
-	jpeg_make_d_derived_tbl(cinfo, TRUE, tbl,
-				& entropy->derived_tbls[tbl]);
-      }
-    } else {
-      tbl = compptr->ac_tbl_no;
-      jpeg_make_d_derived_tbl(cinfo, FALSE, tbl,
-			      & entropy->derived_tbls[tbl]);
-      /* remember the single active table */
-      entropy->ac_derived_tbl = entropy->derived_tbls[tbl];
-    }
-    /* Initialize DC predictions to 0 */
-    entropy->saved.last_dc_val[ci] = 0;
-  }
-
-  /* Initialize bitread state variables */
-  entropy->bitstate.bits_left = 0;
-  entropy->bitstate.get_buffer = 0; /* unnecessary, but keeps Purify quiet */
-  entropy->pub.insufficient_data = FALSE;
-
-  /* Initialize private state variables */
-  entropy->saved.EOBRUN = 0;
-
-  /* Initialize restart counter */
-  entropy->restarts_to_go = cinfo->restart_interval;
-}
-
-
-/*
- * Figure F.12: extend sign bit.
- * On some machines, a shift and add will be faster than a table lookup.
- */
-
-#ifdef AVOID_TABLES
-
-#define HUFF_EXTEND(x,s)  ((x) < (1<<((s)-1)) ? (x) + (((-1)<<(s)) + 1) : (x))
-
-#else
-
-#define HUFF_EXTEND(x,s)  ((x) < extend_test[s] ? (x) + extend_offset[s] : (x))
-
-static const int extend_test[16] =   /* entry n is 2**(n-1) */
-  { 0, 0x0001, 0x0002, 0x0004, 0x0008, 0x0010, 0x0020, 0x0040, 0x0080,
-    0x0100, 0x0200, 0x0400, 0x0800, 0x1000, 0x2000, 0x4000 };
-
-static const int extend_offset[16] = /* entry n is (-1 << n) + 1 */
-  { 0, ((-1)<<1) + 1, ((-1)<<2) + 1, ((-1)<<3) + 1, ((-1)<<4) + 1,
-    ((-1)<<5) + 1, ((-1)<<6) + 1, ((-1)<<7) + 1, ((-1)<<8) + 1,
-    ((-1)<<9) + 1, ((-1)<<10) + 1, ((-1)<<11) + 1, ((-1)<<12) + 1,
-    ((-1)<<13) + 1, ((-1)<<14) + 1, ((-1)<<15) + 1 };
-
-#endif /* AVOID_TABLES */
-
-
-/*
- * Check for a restart marker & resynchronize decoder.
- * Returns FALSE if must suspend.
- */
-
-LOCAL(wxjpeg_boolean)
-process_restart (j_decompress_ptr cinfo)
-{
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  int ci;
-
-  /* Throw away any unused bits remaining in bit buffer; */
-  /* include any full bytes in next_marker's count of discarded bytes */
-  cinfo->marker->discarded_bytes += entropy->bitstate.bits_left / 8;
-  entropy->bitstate.bits_left = 0;
-
-  /* Advance past the RSTn marker */
-  if (! (*cinfo->marker->read_restart_marker) (cinfo))
-    return FALSE;
-
-  /* Re-initialize DC predictions to 0 */
-  for (ci = 0; ci < cinfo->comps_in_scan; ci++)
-    entropy->saved.last_dc_val[ci] = 0;
-  /* Re-init EOB run count, too */
-  entropy->saved.EOBRUN = 0;
-
-  /* Reset restart counter */
-  entropy->restarts_to_go = cinfo->restart_interval;
-
-  /* Reset out-of-data flag, unless read_restart_marker left us smack up
-   * against a marker.  In that case we will end up treating the next data
-   * segment as empty, and we can avoid producing bogus output pixels by
-   * leaving the flag set.
-   */
-  if (cinfo->unread_marker == 0)
-    entropy->pub.insufficient_data = FALSE;
-
-  return TRUE;
-}
-
-
-/*
- * Huffman MCU decoding.
- * Each of these routines decodes and returns one MCU's worth of
- * Huffman-compressed coefficients. 
- * The coefficients are reordered from zigzag order into natural array order,
- * but are not dequantized.
- *
- * The i'th block of the MCU is stored into the block pointed to by
- * MCU_data[i].  WE ASSUME THIS AREA IS INITIALLY ZEROED BY THE CALLER.
- *
- * We return FALSE if data source requested suspension.  In that case no
- * changes have been made to permanent state.  (Exception: some output
- * coefficients may already have been assigned.  This is harmless for
- * spectral selection, since we'll just re-assign them on the next call.
- * Successive approximation AC refinement has to be more careful, however.)
- */
-
-/*
- * MCU decoding for DC initial scan (either spectral selection,
- * or first pass of successive approximation).
- */
-
-METHODDEF(wxjpeg_boolean)
-decode_mcu_DC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{   
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  int Al = cinfo->Al;
-  register int s, r;
-  int blkn, ci;
-  JBLOCKROW block;
-  BITREAD_STATE_VARS;
-  savable_state state;
-  d_derived_tbl * tbl;
-  jpeg_component_info * compptr;
-
-  /* Process restart marker if needed; may have to suspend */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0)
-      if (! process_restart(cinfo))
-	return FALSE;
-  }
-
-  /* If we've run out of data, just leave the MCU set to zeroes.
-   * This way, we return uniform gray for the remainder of the segment.
-   */
-  if (! entropy->pub.insufficient_data) {
-
-    /* Load up working state */
-    BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
-    ASSIGN_STATE(state, entropy->saved);
-
-    /* Outer loop handles each block in the MCU */
-
-    for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
-      block = MCU_data[blkn];
-      ci = cinfo->MCU_membership[blkn];
-      compptr = cinfo->cur_comp_info[ci];
-      tbl = entropy->derived_tbls[compptr->dc_tbl_no];
-
-      /* Decode a single block's worth of coefficients */
-
-      /* Section F.2.2.1: decode the DC coefficient difference */
-      HUFF_DECODE(s, br_state, tbl, return FALSE, label1);
-      if (s) {
-	CHECK_BIT_BUFFER(br_state, s, return FALSE);
-	r = GET_BITS(s);
-	s = HUFF_EXTEND(r, s);
-      }
-
-      /* Convert DC difference to actual value, update last_dc_val */
-      s += state.last_dc_val[ci];
-      state.last_dc_val[ci] = s;
-      /* Scale and output the coefficient (assumes jpeg_natural_order[0]=0) */
-      (*block)[0] = (JCOEF) (s << Al);
-    }
-
-    /* Completed MCU, so update state */
-    BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
-    ASSIGN_STATE(entropy->saved, state);
-  }
-
-  /* Account for restart interval (no-op if not using restarts) */
-  entropy->restarts_to_go--;
-
-  return TRUE;
-}
-
-
-/*
- * MCU decoding for AC initial scan (either spectral selection,
- * or first pass of successive approximation).
- */
-
-METHODDEF(wxjpeg_boolean)
-decode_mcu_AC_first (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{   
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  int Se = cinfo->Se;
-  int Al = cinfo->Al;
-  register int s, k, r;
-  unsigned int EOBRUN;
-  JBLOCKROW block;
-  BITREAD_STATE_VARS;
-  d_derived_tbl * tbl;
-
-  /* Process restart marker if needed; may have to suspend */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0)
-      if (! process_restart(cinfo))
-	return FALSE;
-  }
-
-  /* If we've run out of data, just leave the MCU set to zeroes.
-   * This way, we return uniform gray for the remainder of the segment.
-   */
-  if (! entropy->pub.insufficient_data) {
-
-    /* Load up working state.
-     * We can avoid loading/saving bitread state if in an EOB run.
-     */
-    EOBRUN = entropy->saved.EOBRUN;	/* only part of saved state we need */
-
-    /* There is always only one block per MCU */
-
-    if (EOBRUN > 0)		/* if it's a band of zeroes... */
-      EOBRUN--;			/* ...process it now (we do nothing) */
-    else {
-      BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
-      block = MCU_data[0];
-      tbl = entropy->ac_derived_tbl;
-
-      for (k = cinfo->Ss; k <= Se; k++) {
-	HUFF_DECODE(s, br_state, tbl, return FALSE, label2);
-	r = s >> 4;
-	s &= 15;
-	if (s) {
-	  k += r;
-	  CHECK_BIT_BUFFER(br_state, s, return FALSE);
-	  r = GET_BITS(s);
-	  s = HUFF_EXTEND(r, s);
-	  /* Scale and output coefficient in natural (dezigzagged) order */
-	  (*block)[jpeg_natural_order[k]] = (JCOEF) (s << Al);
-	} else {
-	  if (r == 15) {	/* ZRL */
-	    k += 15;		/* skip 15 zeroes in band */
-	  } else {		/* EOBr, run length is 2^r + appended bits */
-	    EOBRUN = 1 << r;
-	    if (r) {		/* EOBr, r > 0 */
-	      CHECK_BIT_BUFFER(br_state, r, return FALSE);
-	      r = GET_BITS(r);
-	      EOBRUN += r;
-	    }
-	    EOBRUN--;		/* this band is processed at this moment */
-	    break;		/* force end-of-band */
-	  }
-	}
-      }
-
-      BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
-    }
-
-    /* Completed MCU, so update state */
-    entropy->saved.EOBRUN = EOBRUN;	/* only part of saved state we need */
-  }
-
-  /* Account for restart interval (no-op if not using restarts) */
-  entropy->restarts_to_go--;
-
-  return TRUE;
-}
-
-
-/*
- * MCU decoding for DC successive approximation refinement scan.
- * Note: we assume such scans can be multi-component, although the spec
- * is not very clear on the point.
- */
-
-METHODDEF(wxjpeg_boolean)
-decode_mcu_DC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{   
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  int p1 = 1 << cinfo->Al;	/* 1 in the bit position being coded */
-  int blkn;
-  JBLOCKROW block;
-  BITREAD_STATE_VARS;
-
-  /* Process restart marker if needed; may have to suspend */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0)
-      if (! process_restart(cinfo))
-	return FALSE;
-  }
-
-  /* Not worth the cycles to check insufficient_data here,
-   * since we will not change the data anyway if we read zeroes.
-   */
-
-  /* Load up working state */
-  BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
-
-  /* Outer loop handles each block in the MCU */
-
-  for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) {
-    block = MCU_data[blkn];
-
-    /* Encoded data is simply the next bit of the two's-complement DC value */
-    CHECK_BIT_BUFFER(br_state, 1, return FALSE);
-    if (GET_BITS(1))
-      (*block)[0] |= p1;
-    /* Note: since we use |=, repeating the assignment later is safe */
-  }
-
-  /* Completed MCU, so update state */
-  BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
-
-  /* Account for restart interval (no-op if not using restarts) */
-  entropy->restarts_to_go--;
-
-  return TRUE;
-}
-
-
-/*
- * MCU decoding for AC successive approximation refinement scan.
- */
-
-METHODDEF(wxjpeg_boolean)
-decode_mcu_AC_refine (j_decompress_ptr cinfo, JBLOCKROW *MCU_data)
-{   
-  phuff_entropy_ptr entropy = (phuff_entropy_ptr) cinfo->entropy;
-  int Se = cinfo->Se;
-  int p1 = 1 << cinfo->Al;	/* 1 in the bit position being coded */
-  int m1 = (-1) << cinfo->Al;	/* -1 in the bit position being coded */
-  register int s, k, r;
-  unsigned int EOBRUN;
-  JBLOCKROW block;
-  JCOEFPTR thiscoef;
-  BITREAD_STATE_VARS;
-  d_derived_tbl * tbl;
-  int num_newnz;
-  int newnz_pos[DCTSIZE2];
-
-  /* Process restart marker if needed; may have to suspend */
-  if (cinfo->restart_interval) {
-    if (entropy->restarts_to_go == 0)
-      if (! process_restart(cinfo))
-	return FALSE;
-  }
-
-  /* If we've run out of data, don't modify the MCU.
-   */
-  if (! entropy->pub.insufficient_data) {
-
-    /* Load up working state */
-    BITREAD_LOAD_STATE(cinfo,entropy->bitstate);
-    EOBRUN = entropy->saved.EOBRUN; /* only part of saved state we need */
-
-    /* There is always only one block per MCU */
-    block = MCU_data[0];
-    tbl = entropy->ac_derived_tbl;
-
-    /* If we are forced to suspend, we must undo the assignments to any newly
-     * nonzero coefficients in the block, because otherwise we'd get confused
-     * next time about which coefficients were already nonzero.
-     * But we need not undo addition of bits to already-nonzero coefficients;
-     * instead, we can test the current bit to see if we already did it.
-     */
-    num_newnz = 0;
-
-    /* initialize coefficient loop counter to start of band */
-    k = cinfo->Ss;
-
-    if (EOBRUN == 0) {
-      for (; k <= Se; k++) {
-	HUFF_DECODE(s, br_state, tbl, goto undoit, label3);
-	r = s >> 4;
-	s &= 15;
-	if (s) {
-	  if (s != 1)		/* size of new coef should always be 1 */
-	    WARNMS(cinfo, JWRN_HUFF_BAD_CODE);
-	  CHECK_BIT_BUFFER(br_state, 1, goto undoit);
-	  if (GET_BITS(1))
-	    s = p1;		/* newly nonzero coef is positive */
-	  else
-	    s = m1;		/* newly nonzero coef is negative */
-	} else {
-	  if (r != 15) {
-	    EOBRUN = 1 << r;	/* EOBr, run length is 2^r + appended bits */
-	    if (r) {
-	      CHECK_BIT_BUFFER(br_state, r, goto undoit);
-	      r = GET_BITS(r);
-	      EOBRUN += r;
-	    }
-	    break;		/* rest of block is handled by EOB logic */
-	  }
-	  /* note s = 0 for processing ZRL */
-	}
-	/* Advance over already-nonzero coefs and r still-zero coefs,
-	 * appending correction bits to the nonzeroes.  A correction bit is 1
-	 * if the absolute value of the coefficient must be increased.
-	 */
-	do {
-	  thiscoef = *block + jpeg_natural_order[k];
-	  if (*thiscoef != 0) {
-	    CHECK_BIT_BUFFER(br_state, 1, goto undoit);
-	    if (GET_BITS(1)) {
-	      if ((*thiscoef & p1) == 0) { /* do nothing if already set it */
-		if (*thiscoef >= 0)
-		  *thiscoef += p1;
-		else
-		  *thiscoef += m1;
-	      }
-	    }
-	  } else {
-	    if (--r < 0)
-	      break;		/* reached target zero coefficient */
-	  }
-	  k++;
-	} while (k <= Se);
-	if (s) {
-	  int pos = jpeg_natural_order[k];
-	  /* Output newly nonzero coefficient */
-	  (*block)[pos] = (JCOEF) s;
-	  /* Remember its position in case we have to suspend */
-	  newnz_pos[num_newnz++] = pos;
-	}
-      }
-    }
-
-    if (EOBRUN > 0) {
-      /* Scan any remaining coefficient positions after the end-of-band
-       * (the last newly nonzero coefficient, if any).  Append a correction
-       * bit to each already-nonzero coefficient.  A correction bit is 1
-       * if the absolute value of the coefficient must be increased.
-       */
-      for (; k <= Se; k++) {
-	thiscoef = *block + jpeg_natural_order[k];
-	if (*thiscoef != 0) {
-	  CHECK_BIT_BUFFER(br_state, 1, goto undoit);
-	  if (GET_BITS(1)) {
-	    if ((*thiscoef & p1) == 0) { /* do nothing if already changed it */
-	      if (*thiscoef >= 0)
-		*thiscoef += p1;
-	      else
-		*thiscoef += m1;
-	    }
-	  }
-	}
-      }
-      /* Count one block completed in EOB run */
-      EOBRUN--;
-    }
-
-    /* Completed MCU, so update state */
-    BITREAD_SAVE_STATE(cinfo,entropy->bitstate);
-    entropy->saved.EOBRUN = EOBRUN; /* only part of saved state we need */
-  }
-
-  /* Account for restart interval (no-op if not using restarts) */
-  entropy->restarts_to_go--;
-
-  return TRUE;
-
-undoit:
-  /* Re-zero any output coefficients that we made newly nonzero */
-  while (num_newnz > 0)
-    (*block)[newnz_pos[--num_newnz]] = 0;
-
-  return FALSE;
-}
-
-
-/*
- * Module initialization routine for progressive Huffman entropy decoding.
- */
-
-GLOBAL(void)
-jinit_phuff_decoder (j_decompress_ptr cinfo)
-{
-  phuff_entropy_ptr entropy;
-  int *coef_bit_ptr;
-  int ci, i;
-
-  entropy = (phuff_entropy_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(phuff_entropy_decoder));
-  cinfo->entropy = (struct jpeg_entropy_decoder *) entropy;
-  entropy->pub.start_pass = start_pass_phuff_decoder;
-
-  /* Mark derived tables unallocated */
-  for (i = 0; i < NUM_HUFF_TBLS; i++) {
-    entropy->derived_tbls[i] = NULL;
-  }
-
-  /* Create progression status table */
-  cinfo->coef_bits = (int (*)[DCTSIZE2])
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				cinfo->num_components*DCTSIZE2*SIZEOF(int));
-  coef_bit_ptr = & cinfo->coef_bits[0][0];
-  for (ci = 0; ci < cinfo->num_components; ci++) 
-    for (i = 0; i < DCTSIZE2; i++)
-      *coef_bit_ptr++ = -1;
-}
-
-#endif /* D_PROGRESSIVE_SUPPORTED */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdpostct.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdpostct.c
deleted file mode 100644
index e6bcd4a9c3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdpostct.c
+++ /dev/null
@@ -1,290 +0,0 @@
-/*
- * jdpostct.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the decompression postprocessing controller.
- * This controller manages the upsampling, color conversion, and color
- * quantization/reduction steps; specifically, it controls the buffering
- * between upsample/color conversion and color quantization/reduction.
- *
- * If no color quantization/reduction is required, then this module has no
- * work to do, and it just hands off to the upsample/color conversion code.
- * An integrated upsample/convert/quantize process would replace this module
- * entirely.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Private buffer controller object */
-
-typedef struct {
-  struct jpeg_d_post_controller pub; /* public fields */
-
-  /* Color quantization source buffer: this holds output data from
-   * the upsample/color conversion step to be passed to the quantizer.
-   * For two-pass color quantization, we need a full-image buffer;
-   * for one-pass operation, a strip buffer is sufficient.
-   */
-  jvirt_sarray_ptr whole_image;	/* virtual array, or NULL if one-pass */
-  JSAMPARRAY buffer;		/* strip buffer, or current strip of virtual */
-  JDIMENSION strip_height;	/* buffer size in rows */
-  /* for two-pass mode only: */
-  JDIMENSION starting_row;	/* row # of first row in current strip */
-  JDIMENSION next_row;		/* index of next row to fill/empty in strip */
-} my_post_controller;
-
-typedef my_post_controller * my_post_ptr;
-
-
-/* Forward declarations */
-METHODDEF(void) post_process_1pass
-	JPP((j_decompress_ptr cinfo,
-	     JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-	     JDIMENSION in_row_groups_avail,
-	     JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-	     JDIMENSION out_rows_avail));
-#ifdef QUANT_2PASS_SUPPORTED
-METHODDEF(void) post_process_prepass
-	JPP((j_decompress_ptr cinfo,
-	     JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-	     JDIMENSION in_row_groups_avail,
-	     JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-	     JDIMENSION out_rows_avail));
-METHODDEF(void) post_process_2pass
-	JPP((j_decompress_ptr cinfo,
-	     JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-	     JDIMENSION in_row_groups_avail,
-	     JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-	     JDIMENSION out_rows_avail));
-#endif
-
-
-/*
- * Initialize for a processing pass.
- */
-
-METHODDEF(void)
-start_pass_dpost (j_decompress_ptr cinfo, J_BUF_MODE pass_mode)
-{
-  my_post_ptr post = (my_post_ptr) cinfo->post;
-
-  switch (pass_mode) {
-  case JBUF_PASS_THRU:
-    if (cinfo->quantize_colors) {
-      /* Single-pass processing with color quantization. */
-      post->pub.post_process_data = post_process_1pass;
-      /* We could be doing buffered-image output before starting a 2-pass
-       * color quantization; in that case, jinit_d_post_controller did not
-       * allocate a strip buffer.  Use the virtual-array buffer as workspace.
-       */
-      if (post->buffer == NULL) {
-	post->buffer = (*cinfo->mem->access_virt_sarray)
-	  ((j_common_ptr) cinfo, post->whole_image,
-	   (JDIMENSION) 0, post->strip_height, TRUE);
-      }
-    } else {
-      /* For single-pass processing without color quantization,
-       * I have no work to do; just call the upsampler directly.
-       */
-      post->pub.post_process_data = cinfo->upsample->upsample;
-    }
-    break;
-#ifdef QUANT_2PASS_SUPPORTED
-  case JBUF_SAVE_AND_PASS:
-    /* First pass of 2-pass quantization */
-    if (post->whole_image == NULL)
-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    post->pub.post_process_data = post_process_prepass;
-    break;
-  case JBUF_CRANK_DEST:
-    /* Second pass of 2-pass quantization */
-    if (post->whole_image == NULL)
-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    post->pub.post_process_data = post_process_2pass;
-    break;
-#endif /* QUANT_2PASS_SUPPORTED */
-  default:
-    ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    break;
-  }
-  post->starting_row = post->next_row = 0;
-}
-
-
-/*
- * Process some data in the one-pass (strip buffer) case.
- * This is used for color precision reduction as well as one-pass quantization.
- */
-
-METHODDEF(void)
-post_process_1pass (j_decompress_ptr cinfo,
-		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-		    JDIMENSION in_row_groups_avail,
-		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-		    JDIMENSION out_rows_avail)
-{
-  my_post_ptr post = (my_post_ptr) cinfo->post;
-  JDIMENSION num_rows, max_rows;
-
-  /* Fill the buffer, but not more than what we can dump out in one go. */
-  /* Note we rely on the upsampler to detect bottom of image. */
-  max_rows = out_rows_avail - *out_row_ctr;
-  if (max_rows > post->strip_height)
-    max_rows = post->strip_height;
-  num_rows = 0;
-  (*cinfo->upsample->upsample) (cinfo,
-		input_buf, in_row_group_ctr, in_row_groups_avail,
-		post->buffer, &num_rows, max_rows);
-  /* Quantize and emit data. */
-  (*cinfo->cquantize->color_quantize) (cinfo,
-		post->buffer, output_buf + *out_row_ctr, (int) num_rows);
-  *out_row_ctr += num_rows;
-}
-
-
-#ifdef QUANT_2PASS_SUPPORTED
-
-/*
- * Process some data in the first pass of 2-pass quantization.
- */
-
-METHODDEF(void)
-post_process_prepass (j_decompress_ptr cinfo,
-		      JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-		      JDIMENSION in_row_groups_avail,
-		      JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-		      JDIMENSION out_rows_avail)
-{
-  my_post_ptr post = (my_post_ptr) cinfo->post;
-  JDIMENSION old_next_row, num_rows;
-
-  /* Reposition virtual buffer if at start of strip. */
-  if (post->next_row == 0) {
-    post->buffer = (*cinfo->mem->access_virt_sarray)
-	((j_common_ptr) cinfo, post->whole_image,
-	 post->starting_row, post->strip_height, TRUE);
-  }
-
-  /* Upsample some data (up to a strip height's worth). */
-  old_next_row = post->next_row;
-  (*cinfo->upsample->upsample) (cinfo,
-		input_buf, in_row_group_ctr, in_row_groups_avail,
-		post->buffer, &post->next_row, post->strip_height);
-
-  /* Allow quantizer to scan new data.  No data is emitted, */
-  /* but we advance out_row_ctr so outer loop can tell when we're done. */
-  if (post->next_row > old_next_row) {
-    num_rows = post->next_row - old_next_row;
-    (*cinfo->cquantize->color_quantize) (cinfo, post->buffer + old_next_row,
-					 (JSAMPARRAY) NULL, (int) num_rows);
-    *out_row_ctr += num_rows;
-  }
-
-  /* Advance if we filled the strip. */
-  if (post->next_row >= post->strip_height) {
-    post->starting_row += post->strip_height;
-    post->next_row = 0;
-  }
-}
-
-
-/*
- * Process some data in the second pass of 2-pass quantization.
- */
-
-METHODDEF(void)
-post_process_2pass (j_decompress_ptr cinfo,
-		    JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-		    JDIMENSION in_row_groups_avail,
-		    JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-		    JDIMENSION out_rows_avail)
-{
-  my_post_ptr post = (my_post_ptr) cinfo->post;
-  JDIMENSION num_rows, max_rows;
-
-  /* Reposition virtual buffer if at start of strip. */
-  if (post->next_row == 0) {
-    post->buffer = (*cinfo->mem->access_virt_sarray)
-	((j_common_ptr) cinfo, post->whole_image,
-	 post->starting_row, post->strip_height, FALSE);
-  }
-
-  /* Determine number of rows to emit. */
-  num_rows = post->strip_height - post->next_row; /* available in strip */
-  max_rows = out_rows_avail - *out_row_ctr; /* available in output area */
-  if (num_rows > max_rows)
-    num_rows = max_rows;
-  /* We have to check bottom of image here, can't depend on upsampler. */
-  max_rows = cinfo->output_height - post->starting_row;
-  if (num_rows > max_rows)
-    num_rows = max_rows;
-
-  /* Quantize and emit data. */
-  (*cinfo->cquantize->color_quantize) (cinfo,
-		post->buffer + post->next_row, output_buf + *out_row_ctr,
-		(int) num_rows);
-  *out_row_ctr += num_rows;
-
-  /* Advance if we filled the strip. */
-  post->next_row += num_rows;
-  if (post->next_row >= post->strip_height) {
-    post->starting_row += post->strip_height;
-    post->next_row = 0;
-  }
-}
-
-#endif /* QUANT_2PASS_SUPPORTED */
-
-
-/*
- * Initialize postprocessing controller.
- */
-
-GLOBAL(void)
-jinit_d_post_controller (j_decompress_ptr cinfo, wxjpeg_boolean need_full_buffer)
-{
-  my_post_ptr post;
-
-  post = (my_post_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_post_controller));
-  cinfo->post = (struct jpeg_d_post_controller *) post;
-  post->pub.start_pass = start_pass_dpost;
-  post->whole_image = NULL;	/* flag for no virtual arrays */
-  post->buffer = NULL;		/* flag for no strip buffer */
-
-  /* Create the quantization buffer, if needed */
-  if (cinfo->quantize_colors) {
-    /* The buffer strip height is max_v_samp_factor, which is typically
-     * an efficient number of rows for upsampling to return.
-     * (In the presence of output rescaling, we might want to be smarter?)
-     */
-    post->strip_height = (JDIMENSION) cinfo->max_v_samp_factor;
-    if (need_full_buffer) {
-      /* Two-pass color quantization: need full-image storage. */
-      /* We round up the number of rows to a multiple of the strip height. */
-#ifdef QUANT_2PASS_SUPPORTED
-      post->whole_image = (*cinfo->mem->request_virt_sarray)
-	((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
-	 cinfo->output_width * cinfo->out_color_components,
-	 (JDIMENSION) jround_up((long) cinfo->output_height,
-				(long) post->strip_height),
-	 post->strip_height);
-#else
-      ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-#endif /* QUANT_2PASS_SUPPORTED */
-    } else {
-      /* One-pass color quantization: just make a strip buffer. */
-      post->buffer = (*cinfo->mem->alloc_sarray)
-	((j_common_ptr) cinfo, JPOOL_IMAGE,
-	 cinfo->output_width * cinfo->out_color_components,
-	 post->strip_height);
-    }
-  }
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdsample.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdsample.c
deleted file mode 100644
index 8c8fc1713c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdsample.c
+++ /dev/null
@@ -1,478 +0,0 @@
-/*
- * jdsample.c
- *
- * Copyright (C) 1991-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains upsampling routines.
- *
- * Upsampling input data is counted in "row groups".  A row group
- * is defined to be (v_samp_factor * DCT_scaled_size / min_DCT_scaled_size)
- * sample rows of each component.  Upsampling will normally produce
- * max_v_samp_factor pixel rows from each row group (but this could vary
- * if the upsampler is applying a scale factor of its own).
- *
- * An excellent reference for image resampling is
- *   Digital Image Warping, George Wolberg, 1990.
- *   Pub. by IEEE Computer Society Press, Los Alamitos, CA. ISBN 0-8186-8944-7.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Pointer to routine to upsample a single component */
-typedef JMETHOD(void, upsample1_ptr,
-		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		 JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr));
-
-/* Private subobject */
-
-typedef struct {
-  struct jpeg_upsampler pub;	/* public fields */
-
-  /* Color conversion buffer.  When using separate upsampling and color
-   * conversion steps, this buffer holds one upsampled row group until it
-   * has been color converted and output.
-   * Note: we do not allocate any storage for component(s) which are full-size,
-   * ie do not need rescaling.  The corresponding entry of color_buf[] is
-   * simply set to point to the input data array, thereby avoiding copying.
-   */
-  JSAMPARRAY color_buf[MAX_COMPONENTS];
-
-  /* Per-component upsampling method pointers */
-  upsample1_ptr methods[MAX_COMPONENTS];
-
-  int next_row_out;		/* counts rows emitted from color_buf */
-  JDIMENSION rows_to_go;	/* counts rows remaining in image */
-
-  /* Height of an input row group for each component. */
-  int rowgroup_height[MAX_COMPONENTS];
-
-  /* These arrays save pixel expansion factors so that int_expand need not
-   * recompute them each time.  They are unused for other upsampling methods.
-   */
-  UINT8 h_expand[MAX_COMPONENTS];
-  UINT8 v_expand[MAX_COMPONENTS];
-} my_upsampler;
-
-typedef my_upsampler * my_upsample_ptr;
-
-
-/*
- * Initialize for an upsampling pass.
- */
-
-METHODDEF(void)
-start_pass_upsample (j_decompress_ptr cinfo)
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-
-  /* Mark the conversion buffer empty */
-  upsample->next_row_out = cinfo->max_v_samp_factor;
-  /* Initialize total-height counter for detecting bottom of image */
-  upsample->rows_to_go = cinfo->output_height;
-}
-
-
-/*
- * Control routine to do upsampling (and color conversion).
- *
- * In this version we upsample each component independently.
- * We upsample one row group into the conversion buffer, then apply
- * color conversion a row at a time.
- */
-
-METHODDEF(void)
-sep_upsample (j_decompress_ptr cinfo,
-	      JSAMPIMAGE input_buf, JDIMENSION *in_row_group_ctr,
-	      JDIMENSION in_row_groups_avail,
-	      JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-	      JDIMENSION out_rows_avail)
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-  int ci;
-  jpeg_component_info * compptr;
-  JDIMENSION num_rows;
-
-  /* Fill the conversion buffer, if it's empty */
-  if (upsample->next_row_out >= cinfo->max_v_samp_factor) {
-    for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-	 ci++, compptr++) {
-      /* Invoke per-component upsample method.  Notice we pass a POINTER
-       * to color_buf[ci], so that fullsize_upsample can change it.
-       */
-      (*upsample->methods[ci]) (cinfo, compptr,
-	input_buf[ci] + (*in_row_group_ctr * upsample->rowgroup_height[ci]),
-	upsample->color_buf + ci);
-    }
-    upsample->next_row_out = 0;
-  }
-
-  /* Color-convert and emit rows */
-
-  /* How many we have in the buffer: */
-  num_rows = (JDIMENSION) (cinfo->max_v_samp_factor - upsample->next_row_out);
-  /* Not more than the distance to the end of the image.  Need this test
-   * in case the image height is not a multiple of max_v_samp_factor:
-   */
-  if (num_rows > upsample->rows_to_go) 
-    num_rows = upsample->rows_to_go;
-  /* And not more than what the client can accept: */
-  out_rows_avail -= *out_row_ctr;
-  if (num_rows > out_rows_avail)
-    num_rows = out_rows_avail;
-
-  (*cinfo->cconvert->color_convert) (cinfo, upsample->color_buf,
-				     (JDIMENSION) upsample->next_row_out,
-				     output_buf + *out_row_ctr,
-				     (int) num_rows);
-
-  /* Adjust counts */
-  *out_row_ctr += num_rows;
-  upsample->rows_to_go -= num_rows;
-  upsample->next_row_out += num_rows;
-  /* When the buffer is emptied, declare this input row group consumed */
-  if (upsample->next_row_out >= cinfo->max_v_samp_factor)
-    (*in_row_group_ctr)++;
-}
-
-
-/*
- * These are the routines invoked by sep_upsample to upsample pixel values
- * of a single component.  One row group is processed per call.
- */
-
-
-/*
- * For full-size components, we just make color_buf[ci] point at the
- * input buffer, and thus avoid copying any data.  Note that this is
- * safe only because sep_upsample doesn't declare the input row group
- * "consumed" until we are done color converting and emitting it.
- */
-
-METHODDEF(void)
-fullsize_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		   JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
-{
-  *output_data_ptr = input_data;
-}
-
-
-/*
- * This is a no-op version used for "uninteresting" components.
- * These components will not be referenced by color conversion.
- */
-
-METHODDEF(void)
-noop_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	       JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
-{
-  *output_data_ptr = NULL;	/* safety check */
-}
-
-
-/*
- * This version handles any integral sampling ratios.
- * This is not used for typical JPEG files, so it need not be fast.
- * Nor, for that matter, is it particularly accurate: the algorithm is
- * simple replication of the input pixel onto the corresponding output
- * pixels.  The hi-falutin sampling literature refers to this as a
- * "box filter".  A box filter tends to introduce visible artifacts,
- * so if you are actually going to use 3:1 or 4:1 sampling ratios
- * you would be well advised to improve this code.
- */
-
-METHODDEF(void)
-int_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	      JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
-{
-  my_upsample_ptr upsample = (my_upsample_ptr) cinfo->upsample;
-  JSAMPARRAY output_data = *output_data_ptr;
-  register JSAMPROW inptr, outptr;
-  register JSAMPLE invalue;
-  register int h;
-  JSAMPROW outend;
-  int h_expand, v_expand;
-  int inrow, outrow;
-
-  h_expand = upsample->h_expand[compptr->component_index];
-  v_expand = upsample->v_expand[compptr->component_index];
-
-  inrow = outrow = 0;
-  while (outrow < cinfo->max_v_samp_factor) {
-    /* Generate one output row with proper horizontal expansion */
-    inptr = input_data[inrow];
-    outptr = output_data[outrow];
-    outend = outptr + cinfo->output_width;
-    while (outptr < outend) {
-      invalue = *inptr++;	/* don't need GETJSAMPLE() here */
-      for (h = h_expand; h > 0; h--) {
-	*outptr++ = invalue;
-      }
-    }
-    /* Generate any additional output rows by duplicating the first one */
-    if (v_expand > 1) {
-      jcopy_sample_rows(output_data, outrow, output_data, outrow+1,
-			v_expand-1, cinfo->output_width);
-    }
-    inrow++;
-    outrow += v_expand;
-  }
-}
-
-
-/*
- * Fast processing for the common case of 2:1 horizontal and 1:1 vertical.
- * It's still a box filter.
- */
-
-METHODDEF(void)
-h2v1_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	       JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
-{
-  JSAMPARRAY output_data = *output_data_ptr;
-  register JSAMPROW inptr, outptr;
-  register JSAMPLE invalue;
-  JSAMPROW outend;
-  int inrow;
-
-  for (inrow = 0; inrow < cinfo->max_v_samp_factor; inrow++) {
-    inptr = input_data[inrow];
-    outptr = output_data[inrow];
-    outend = outptr + cinfo->output_width;
-    while (outptr < outend) {
-      invalue = *inptr++;	/* don't need GETJSAMPLE() here */
-      *outptr++ = invalue;
-      *outptr++ = invalue;
-    }
-  }
-}
-
-
-/*
- * Fast processing for the common case of 2:1 horizontal and 2:1 vertical.
- * It's still a box filter.
- */
-
-METHODDEF(void)
-h2v2_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	       JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
-{
-  JSAMPARRAY output_data = *output_data_ptr;
-  register JSAMPROW inptr, outptr;
-  register JSAMPLE invalue;
-  JSAMPROW outend;
-  int inrow, outrow;
-
-  inrow = outrow = 0;
-  while (outrow < cinfo->max_v_samp_factor) {
-    inptr = input_data[inrow];
-    outptr = output_data[outrow];
-    outend = outptr + cinfo->output_width;
-    while (outptr < outend) {
-      invalue = *inptr++;	/* don't need GETJSAMPLE() here */
-      *outptr++ = invalue;
-      *outptr++ = invalue;
-    }
-    jcopy_sample_rows(output_data, outrow, output_data, outrow+1,
-		      1, cinfo->output_width);
-    inrow++;
-    outrow += 2;
-  }
-}
-
-
-/*
- * Fancy processing for the common case of 2:1 horizontal and 1:1 vertical.
- *
- * The upsampling algorithm is linear interpolation between pixel centers,
- * also known as a "triangle filter".  This is a good compromise between
- * speed and visual quality.  The centers of the output pixels are 1/4 and 3/4
- * of the way between input pixel centers.
- *
- * A note about the "bias" calculations: when rounding fractional values to
- * integer, we do not want to always round 0.5 up to the next integer.
- * If we did that, we'd introduce a noticeable bias towards larger values.
- * Instead, this code is arranged so that 0.5 will be rounded up or down at
- * alternate pixel locations (a simple ordered dither pattern).
- */
-
-METHODDEF(void)
-h2v1_fancy_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		     JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
-{
-  JSAMPARRAY output_data = *output_data_ptr;
-  register JSAMPROW inptr, outptr;
-  register int invalue;
-  register JDIMENSION colctr;
-  int inrow;
-
-  for (inrow = 0; inrow < cinfo->max_v_samp_factor; inrow++) {
-    inptr = input_data[inrow];
-    outptr = output_data[inrow];
-    /* Special case for first column */
-    invalue = GETJSAMPLE(*inptr++);
-    *outptr++ = (JSAMPLE) invalue;
-    *outptr++ = (JSAMPLE) ((invalue * 3 + GETJSAMPLE(*inptr) + 2) >> 2);
-
-    for (colctr = compptr->downsampled_width - 2; colctr > 0; colctr--) {
-      /* General case: 3/4 * nearer pixel + 1/4 * further pixel */
-      invalue = GETJSAMPLE(*inptr++) * 3;
-      *outptr++ = (JSAMPLE) ((invalue + GETJSAMPLE(inptr[-2]) + 1) >> 2);
-      *outptr++ = (JSAMPLE) ((invalue + GETJSAMPLE(*inptr) + 2) >> 2);
-    }
-
-    /* Special case for last column */
-    invalue = GETJSAMPLE(*inptr);
-    *outptr++ = (JSAMPLE) ((invalue * 3 + GETJSAMPLE(inptr[-1]) + 1) >> 2);
-    *outptr++ = (JSAMPLE) invalue;
-  }
-}
-
-
-/*
- * Fancy processing for the common case of 2:1 horizontal and 2:1 vertical.
- * Again a triangle filter; see comments for h2v1 case, above.
- *
- * It is OK for us to reference the adjacent input rows because we demanded
- * context from the main buffer controller (see initialization code).
- */
-
-METHODDEF(void)
-h2v2_fancy_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		     JSAMPARRAY input_data, JSAMPARRAY * output_data_ptr)
-{
-  JSAMPARRAY output_data = *output_data_ptr;
-  register JSAMPROW inptr0, inptr1, outptr;
-#if BITS_IN_JSAMPLE == 8
-  register int thiscolsum, lastcolsum, nextcolsum;
-#else
-  register JPEG_INT32 thiscolsum, lastcolsum, nextcolsum;
-#endif
-  register JDIMENSION colctr;
-  int inrow, outrow, v;
-
-  inrow = outrow = 0;
-  while (outrow < cinfo->max_v_samp_factor) {
-    for (v = 0; v < 2; v++) {
-      /* inptr0 points to nearest input row, inptr1 points to next nearest */
-      inptr0 = input_data[inrow];
-      if (v == 0)		/* next nearest is row above */
-	inptr1 = input_data[inrow-1];
-      else			/* next nearest is row below */
-	inptr1 = input_data[inrow+1];
-      outptr = output_data[outrow++];
-
-      /* Special case for first column */
-      thiscolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++);
-      nextcolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++);
-      *outptr++ = (JSAMPLE) ((thiscolsum * 4 + 8) >> 4);
-      *outptr++ = (JSAMPLE) ((thiscolsum * 3 + nextcolsum + 7) >> 4);
-      lastcolsum = thiscolsum; thiscolsum = nextcolsum;
-
-      for (colctr = compptr->downsampled_width - 2; colctr > 0; colctr--) {
-	/* General case: 3/4 * nearer pixel + 1/4 * further pixel in each */
-	/* dimension, thus 9/16, 3/16, 3/16, 1/16 overall */
-	nextcolsum = GETJSAMPLE(*inptr0++) * 3 + GETJSAMPLE(*inptr1++);
-	*outptr++ = (JSAMPLE) ((thiscolsum * 3 + lastcolsum + 8) >> 4);
-	*outptr++ = (JSAMPLE) ((thiscolsum * 3 + nextcolsum + 7) >> 4);
-	lastcolsum = thiscolsum; thiscolsum = nextcolsum;
-      }
-
-      /* Special case for last column */
-      *outptr++ = (JSAMPLE) ((thiscolsum * 3 + lastcolsum + 8) >> 4);
-      *outptr++ = (JSAMPLE) ((thiscolsum * 4 + 7) >> 4);
-    }
-    inrow++;
-  }
-}
-
-
-/*
- * Module initialization routine for upsampling.
- */
-
-GLOBAL(void)
-jinit_upsampler (j_decompress_ptr cinfo)
-{
-  my_upsample_ptr upsample;
-  int ci;
-  jpeg_component_info * compptr;
-  wxjpeg_boolean need_buffer, do_fancy;
-  int h_in_group, v_in_group, h_out_group, v_out_group;
-
-  upsample = (my_upsample_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_upsampler));
-  cinfo->upsample = (struct jpeg_upsampler *) upsample;
-  upsample->pub.start_pass = start_pass_upsample;
-  upsample->pub.upsample = sep_upsample;
-  upsample->pub.need_context_rows = FALSE; /* until we find out differently */
-
-  if (cinfo->CCIR601_sampling)	/* this isn't supported */
-    ERREXIT(cinfo, JERR_CCIR601_NOTIMPL);
-
-  /* jdmainct.c doesn't support context rows when min_DCT_scaled_size = 1,
-   * so don't ask for it.
-   */
-  do_fancy = cinfo->do_fancy_upsampling && cinfo->min_DCT_scaled_size > 1;
-
-  /* Verify we can handle the sampling factors, select per-component methods,
-   * and create storage as needed.
-   */
-  for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-       ci++, compptr++) {
-    /* Compute size of an "input group" after IDCT scaling.  This many samples
-     * are to be converted to max_h_samp_factor * max_v_samp_factor pixels.
-     */
-    h_in_group = (compptr->h_samp_factor * compptr->DCT_scaled_size) /
-		 cinfo->min_DCT_scaled_size;
-    v_in_group = (compptr->v_samp_factor * compptr->DCT_scaled_size) /
-		 cinfo->min_DCT_scaled_size;
-    h_out_group = cinfo->max_h_samp_factor;
-    v_out_group = cinfo->max_v_samp_factor;
-    upsample->rowgroup_height[ci] = v_in_group; /* save for use later */
-    need_buffer = TRUE;
-    if (! compptr->component_needed) {
-      /* Don't bother to upsample an uninteresting component. */
-      upsample->methods[ci] = noop_upsample;
-      need_buffer = FALSE;
-    } else if (h_in_group == h_out_group && v_in_group == v_out_group) {
-      /* Fullsize components can be processed without any work. */
-      upsample->methods[ci] = fullsize_upsample;
-      need_buffer = FALSE;
-    } else if (h_in_group * 2 == h_out_group &&
-	       v_in_group == v_out_group) {
-      /* Special cases for 2h1v upsampling */
-      if (do_fancy && compptr->downsampled_width > 2)
-	upsample->methods[ci] = h2v1_fancy_upsample;
-      else
-	upsample->methods[ci] = h2v1_upsample;
-    } else if (h_in_group * 2 == h_out_group &&
-	       v_in_group * 2 == v_out_group) {
-      /* Special cases for 2h2v upsampling */
-      if (do_fancy && compptr->downsampled_width > 2) {
-	upsample->methods[ci] = h2v2_fancy_upsample;
-	upsample->pub.need_context_rows = TRUE;
-      } else
-	upsample->methods[ci] = h2v2_upsample;
-    } else if ((h_out_group % h_in_group) == 0 &&
-	       (v_out_group % v_in_group) == 0) {
-      /* Generic integral-factors upsampling method */
-      upsample->methods[ci] = int_upsample;
-      upsample->h_expand[ci] = (UINT8) (h_out_group / h_in_group);
-      upsample->v_expand[ci] = (UINT8) (v_out_group / v_in_group);
-    } else
-      ERREXIT(cinfo, JERR_FRACT_SAMPLE_NOTIMPL);
-    if (need_buffer) {
-      upsample->color_buf[ci] = (*cinfo->mem->alloc_sarray)
-	((j_common_ptr) cinfo, JPOOL_IMAGE,
-	 (JDIMENSION) jround_up((long) cinfo->output_width,
-				(long) cinfo->max_h_samp_factor),
-	 (JDIMENSION) cinfo->max_v_samp_factor);
-    }
-  }
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdtrans.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdtrans.c
deleted file mode 100644
index d22388684f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jdtrans.c
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * jdtrans.c
- *
- * Copyright (C) 1995-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains library routines for transcoding decompression,
- * that is, reading raw DCT coefficient arrays from an input JPEG file.
- * The routines in jdapimin.c will also be needed by a transcoder.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/* Forward declarations */
-LOCAL(void) transdecode_master_selection JPP((j_decompress_ptr cinfo));
-
-
-/*
- * Read the coefficient arrays from a JPEG file.
- * jpeg_read_header must be completed before calling this.
- *
- * The entire image is read into a set of virtual coefficient-block arrays,
- * one per component.  The return value is a pointer to the array of
- * virtual-array descriptors.  These can be manipulated directly via the
- * JPEG memory manager, or handed off to jpeg_write_coefficients().
- * To release the memory occupied by the virtual arrays, call
- * jpeg_finish_decompress() when done with the data.
- *
- * An alternative usage is to simply obtain access to the coefficient arrays
- * during a buffered-image-mode decompression operation.  This is allowed
- * after any jpeg_finish_output() call.  The arrays can be accessed until
- * jpeg_finish_decompress() is called.  (Note that any call to the library
- * may reposition the arrays, so don't rely on access_virt_barray() results
- * to stay valid across library calls.)
- *
- * Returns NULL if suspended.  This case need be checked only if
- * a suspending data source is used.
- */
-
-GLOBAL(jvirt_barray_ptr *)
-jpeg_read_coefficients (j_decompress_ptr cinfo)
-{
-  if (cinfo->global_state == DSTATE_READY) {
-    /* First call: initialize active modules */
-    transdecode_master_selection(cinfo);
-    cinfo->global_state = DSTATE_RDCOEFS;
-  }
-  if (cinfo->global_state == DSTATE_RDCOEFS) {
-    /* Absorb whole file into the coef buffer */
-    for (;;) {
-      int retcode;
-      /* Call progress monitor hook if present */
-      if (cinfo->progress != NULL)
-	(*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
-      /* Absorb some more input */
-      retcode = (*cinfo->inputctl->consume_input) (cinfo);
-      if (retcode == JPEG_SUSPENDED)
-	return NULL;
-      if (retcode == JPEG_REACHED_EOI)
-	break;
-      /* Advance progress counter if appropriate */
-      if (cinfo->progress != NULL &&
-	  (retcode == JPEG_ROW_COMPLETED || retcode == JPEG_REACHED_SOS)) {
-	if (++cinfo->progress->pass_counter >= cinfo->progress->pass_limit) {
-	  /* startup underestimated number of scans; ratchet up one scan */
-	  cinfo->progress->pass_limit += (long) cinfo->total_iMCU_rows;
-	}
-      }
-    }
-    /* Set state so that jpeg_finish_decompress does the right thing */
-    cinfo->global_state = DSTATE_STOPPING;
-  }
-  /* At this point we should be in state DSTATE_STOPPING if being used
-   * standalone, or in state DSTATE_BUFIMAGE if being invoked to get access
-   * to the coefficients during a full buffered-image-mode decompression.
-   */
-  if ((cinfo->global_state == DSTATE_STOPPING ||
-       cinfo->global_state == DSTATE_BUFIMAGE) && cinfo->buffered_image) {
-    return cinfo->coef->coef_arrays;
-  }
-  /* Oops, improper usage */
-  ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
-  return NULL;			/* keep compiler happy */
-}
-
-
-/*
- * Master selection of decompression modules for transcoding.
- * This substitutes for jdmaster.c's initialization of the full decompressor.
- */
-
-LOCAL(void)
-transdecode_master_selection (j_decompress_ptr cinfo)
-{
-  /* This is effectively a buffered-image operation. */
-  cinfo->buffered_image = TRUE;
-
-  /* Entropy decoding: either Huffman or arithmetic coding. */
-  if (cinfo->arith_code) {
-    ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
-  } else {
-    if (cinfo->progressive_mode) {
-#ifdef D_PROGRESSIVE_SUPPORTED
-      jinit_phuff_decoder(cinfo);
-#else
-      ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
-    } else
-      jinit_huff_decoder(cinfo);
-  }
-
-  /* Always get a full-image coefficient buffer. */
-  jinit_d_coef_controller(cinfo, TRUE);
-
-  /* We can now tell the memory manager to allocate virtual arrays. */
-  (*cinfo->mem->realize_virt_arrays) ((j_common_ptr) cinfo);
-
-  /* Initialize input side of decompressor to consume first scan. */
-  (*cinfo->inputctl->start_input_pass) (cinfo);
-  /* Initialize progress monitoring. */
-  if (cinfo->progress != NULL) {
-    int nscans;
-    /* Estimate number of scans to set pass_limit. */
-    if (cinfo->progressive_mode) {
-      /* Arbitrarily estimate 2 interleaved DC scans + 3 AC scans/component. */
-      nscans = 2 + 3 * cinfo->num_components;
-    } else if (cinfo->inputctl->has_multiple_scans) {
-      /* For a nonprogressive multiscan file, estimate 1 scan per component. */
-      nscans = cinfo->num_components;
-    } else {
-      nscans = 1;
-    }
-    cinfo->progress->pass_counter = 0L;
-    cinfo->progress->pass_limit = (long) cinfo->total_iMCU_rows * nscans;
-    cinfo->progress->completed_passes = 0;
-    cinfo->progress->total_passes = 1;
-  }
-}
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jerror.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jerror.c
deleted file mode 100644
index 660c4a6dd8..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jerror.c
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * jerror.c
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains simple error-reporting and trace-message routines.
- * These are suitable for Unix-like systems and others where writing to
- * stderr is the right thing to do.  Many applications will want to replace
- * some or all of these routines.
- *
- * If you define USE_WINDOWS_MESSAGEBOX in jconfig.h or in the makefile,
- * you get a Windows-specific hack to display error messages in a dialog box.
- * It ain't much, but it beats dropping error messages into the bit bucket,
- * which is what happens to output to stderr under most Windows C compilers.
- *
- * These routines are used by both the compression and decompression code.
- */
-
-/* this is not a core library module, so it doesn't define JPEG_INTERNALS */
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jversion.h"
-#include "jerror.h"
-
-#ifdef USE_WINDOWS_MESSAGEBOX
-#include 
-#endif
-
-#ifndef EXIT_FAILURE		/* define exit() codes if not provided */
-#define EXIT_FAILURE  1
-#endif
-
-
-/*
- * Create the message string table.
- * We do this from the master message list in jerror.h by re-reading
- * jerror.h with a suitable definition for macro JMESSAGE.
- * The message table is made an external symbol just in case any applications
- * want to refer to it directly.
- */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jpeg_std_message_table	jMsgTable
-#endif
-
-#define JMESSAGE(code,string)	string ,
-
-const char * const jpeg_std_message_table[] = {
-#include "jerror.h"
-  NULL
-};
-
-
-/*
- * Error exit handler: must not return to caller.
- *
- * Applications may override this if they want to get control back after
- * an error.  Typically one would longjmp somewhere instead of exiting.
- * The setjmp buffer can be made a private field within an expanded error
- * handler object.  Note that the info needed to generate an error message
- * is stored in the error object, so you can generate the message now or
- * later, at your convenience.
- * You should make sure that the JPEG object is cleaned up (with jpeg_abort
- * or jpeg_destroy) at some point.
- */
-
-METHODDEF(void)
-error_exit (j_common_ptr cinfo)
-{
-  /* Always display the message */
-  (*cinfo->err->output_message) (cinfo);
-
-  /* Let the memory manager delete any temp files before we die */
-  jpeg_destroy(cinfo);
-
-  exit(EXIT_FAILURE);
-}
-
-
-/*
- * Actual output of an error or trace message.
- * Applications may override this method to send JPEG messages somewhere
- * other than stderr.
- *
- * On Windows, printing to stderr is generally completely useless,
- * so we provide optional code to produce an error-dialog popup.
- * Most Windows applications will still prefer to override this routine,
- * but if they don't, it'll do something at least marginally useful.
- *
- * NOTE: to use the library in an environment that doesn't support the
- * C stdio library, you may have to delete the call to fprintf() entirely,
- * not just not use this routine.
- */
-
-METHODDEF(void)
-output_message (j_common_ptr cinfo)
-{
-  char buffer[JMSG_LENGTH_MAX];
-
-  /* Create the message */
-  (*cinfo->err->format_message) (cinfo, buffer);
-
-#ifdef USE_WINDOWS_MESSAGEBOX
-  /* Display it in a message dialog box */
-  MessageBox(GetActiveWindow(), buffer, "JPEG Library Error",
-	     MB_OK | MB_ICONERROR);
-#else
-  /* Send it to stderr, adding a newline */
-  fprintf(stderr, "%s\n", buffer);
-#endif
-}
-
-
-/*
- * Decide whether to emit a trace or warning message.
- * msg_level is one of:
- *   -1: recoverable corrupt-data warning, may want to abort.
- *    0: important advisory messages (always display to user).
- *    1: first level of tracing detail.
- *    2,3,...: successively more detailed tracing messages.
- * An application might override this method if it wanted to abort on warnings
- * or change the policy about which messages to display.
- */
-
-METHODDEF(void)
-emit_message (j_common_ptr cinfo, int msg_level)
-{
-  struct jpeg_error_mgr * err = cinfo->err;
-
-  if (msg_level < 0) {
-    /* It's a warning message.  Since corrupt files may generate many warnings,
-     * the policy implemented here is to show only the first warning,
-     * unless trace_level >= 3.
-     */
-    if (err->num_warnings == 0 || err->trace_level >= 3)
-      (*err->output_message) (cinfo);
-    /* Always count warnings in num_warnings. */
-    err->num_warnings++;
-  } else {
-    /* It's a trace message.  Show it if trace_level >= msg_level. */
-    if (err->trace_level >= msg_level)
-      (*err->output_message) (cinfo);
-  }
-}
-
-
-/*
- * Format a message string for the most recent JPEG error or message.
- * The message is stored into buffer, which should be at least JMSG_LENGTH_MAX
- * characters.  Note that no '\n' character is added to the string.
- * Few applications should need to override this method.
- */
-
-METHODDEF(void)
-format_message (j_common_ptr cinfo, char * buffer)
-{
-  struct jpeg_error_mgr * err = cinfo->err;
-  int msg_code = err->msg_code;
-  const char * msgtext = NULL;
-  const char * msgptr;
-  char ch;
-  wxjpeg_boolean isstring;
-
-  /* Look up message string in proper table */
-  if (msg_code > 0 && msg_code <= err->last_jpeg_message) {
-    msgtext = err->jpeg_message_table[msg_code];
-  } else if (err->addon_message_table != NULL &&
-	     msg_code >= err->first_addon_message &&
-	     msg_code <= err->last_addon_message) {
-    msgtext = err->addon_message_table[msg_code - err->first_addon_message];
-  }
-
-  /* Defend against bogus message number */
-  if (msgtext == NULL) {
-    err->msg_parm.i[0] = msg_code;
-    msgtext = err->jpeg_message_table[0];
-  }
-
-  /* Check for string parameter, as indicated by %s in the message text */
-  isstring = FALSE;
-  msgptr = msgtext;
-  while ((ch = *msgptr++) != '\0') {
-    if (ch == '%') {
-      if (*msgptr == 's') isstring = TRUE;
-      break;
-    }
-  }
-
-  /* Format the message into the passed buffer */
-  if (isstring)
-    sprintf(buffer, msgtext, err->msg_parm.s);
-  else
-    sprintf(buffer, msgtext,
-	    err->msg_parm.i[0], err->msg_parm.i[1],
-	    err->msg_parm.i[2], err->msg_parm.i[3],
-	    err->msg_parm.i[4], err->msg_parm.i[5],
-	    err->msg_parm.i[6], err->msg_parm.i[7]);
-}
-
-
-/*
- * Reset error state variables at start of a new image.
- * This is called during compression startup to reset trace/error
- * processing to default state, without losing any application-specific
- * method pointers.  An application might possibly want to override
- * this method if it has additional error processing state.
- */
-
-METHODDEF(void)
-reset_error_mgr (j_common_ptr cinfo)
-{
-  cinfo->err->num_warnings = 0;
-  /* trace_level is not reset since it is an application-supplied parameter */
-  cinfo->err->msg_code = 0;	/* may be useful as a flag for "no error" */
-}
-
-
-/*
- * Fill in the standard error-handling methods in a jpeg_error_mgr object.
- * Typical call is:
- *	struct jpeg_compress_struct cinfo;
- *	struct jpeg_error_mgr err;
- *
- *	cinfo.err = jpeg_std_error(&err);
- * after which the application may override some of the methods.
- */
-
-GLOBAL(struct jpeg_error_mgr *)
-jpeg_std_error (struct jpeg_error_mgr * err)
-{
-  err->error_exit = error_exit;
-  err->emit_message = emit_message;
-  err->output_message = output_message;
-  err->format_message = format_message;
-  err->reset_error_mgr = reset_error_mgr;
-
-  err->trace_level = 0;		/* default = no tracing */
-  err->num_warnings = 0;	/* no warnings emitted yet */
-  err->msg_code = 0;		/* may be useful as a flag for "no error" */
-
-  /* Initialize message table pointers */
-  err->jpeg_message_table = jpeg_std_message_table;
-  err->last_jpeg_message = (int) JMSG_LASTMSGCODE - 1;
-
-  err->addon_message_table = NULL;
-  err->first_addon_message = 0;	/* for safety */
-  err->last_addon_message = 0;
-
-  return err;
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jerror.h b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jerror.h
deleted file mode 100644
index fc2fffeac2..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jerror.h
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * jerror.h
- *
- * Copyright (C) 1994-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file defines the error and message codes for the JPEG library.
- * Edit this file to add new codes, or to translate the message strings to
- * some other language.
- * A set of error-reporting macros are defined too.  Some applications using
- * the JPEG library may wish to include this file to get the error codes
- * and/or the macros.
- */
-
-/*
- * To define the enum list of message codes, include this file without
- * defining macro JMESSAGE.  To create a message string table, include it
- * again with a suitable JMESSAGE definition (see jerror.c for an example).
- */
-#ifndef JMESSAGE
-#ifndef JERROR_H
-/* First time through, define the enum list */
-#define JMAKE_ENUM_LIST
-#else
-/* Repeated inclusions of this file are no-ops unless JMESSAGE is defined */
-#define JMESSAGE(code,string)
-#endif /* JERROR_H */
-#endif /* JMESSAGE */
-
-#ifdef JMAKE_ENUM_LIST
-
-typedef enum {
-
-#define JMESSAGE(code,string)	code ,
-
-#endif /* JMAKE_ENUM_LIST */
-
-JMESSAGE(JMSG_NOMESSAGE, "Bogus message code %d") /* Must be first entry! */
-
-/* For maintenance convenience, list is alphabetical by message code name */
-JMESSAGE(JERR_ARITH_NOTIMPL,
-	 "Sorry, there are legal restrictions on arithmetic coding")
-JMESSAGE(JERR_BAD_ALIGN_TYPE, "ALIGN_TYPE is wrong, please fix")
-JMESSAGE(JERR_BAD_ALLOC_CHUNK, "MAX_ALLOC_CHUNK is wrong, please fix")
-JMESSAGE(JERR_BAD_BUFFER_MODE, "Bogus buffer control mode")
-JMESSAGE(JERR_BAD_COMPONENT_ID, "Invalid component ID %d in SOS")
-JMESSAGE(JERR_BAD_DCT_COEF, "DCT coefficient out of range")
-JMESSAGE(JERR_BAD_DCTSIZE, "IDCT output block size %d not supported")
-JMESSAGE(JERR_BAD_HUFF_TABLE, "Bogus Huffman table definition")
-JMESSAGE(JERR_BAD_IN_COLORSPACE, "Bogus input colorspace")
-JMESSAGE(JERR_BAD_J_COLORSPACE, "Bogus JPEG colorspace")
-JMESSAGE(JERR_BAD_LENGTH, "Bogus marker length")
-JMESSAGE(JERR_BAD_LIB_VERSION,
-	 "Wrong JPEG library version: library is %d, caller expects %d")
-JMESSAGE(JERR_BAD_MCU_SIZE, "Sampling factors too large for interleaved scan")
-JMESSAGE(JERR_BAD_POOL_ID, "Invalid memory pool code %d")
-JMESSAGE(JERR_BAD_PRECISION, "Unsupported JPEG data precision %d")
-JMESSAGE(JERR_BAD_PROGRESSION,
-	 "Invalid progressive parameters Ss=%d Se=%d Ah=%d Al=%d")
-JMESSAGE(JERR_BAD_PROG_SCRIPT,
-	 "Invalid progressive parameters at scan script entry %d")
-JMESSAGE(JERR_BAD_SAMPLING, "Bogus sampling factors")
-JMESSAGE(JERR_BAD_SCAN_SCRIPT, "Invalid scan script at entry %d")
-JMESSAGE(JERR_BAD_STATE, "Improper call to JPEG library in state %d")
-JMESSAGE(JERR_BAD_STRUCT_SIZE,
-	 "JPEG parameter struct mismatch: library thinks size is %u, caller expects %u")
-JMESSAGE(JERR_BAD_VIRTUAL_ACCESS, "Bogus virtual array access")
-JMESSAGE(JERR_BUFFER_SIZE, "Buffer passed to JPEG library is too small")
-JMESSAGE(JERR_CANT_SUSPEND, "Suspension not allowed here")
-JMESSAGE(JERR_CCIR601_NOTIMPL, "CCIR601 sampling not implemented yet")
-JMESSAGE(JERR_COMPONENT_COUNT, "Too many color components: %d, max %d")
-JMESSAGE(JERR_CONVERSION_NOTIMPL, "Unsupported color conversion request")
-JMESSAGE(JERR_DAC_INDEX, "Bogus DAC index %d")
-JMESSAGE(JERR_DAC_VALUE, "Bogus DAC value 0x%x")
-JMESSAGE(JERR_DHT_INDEX, "Bogus DHT index %d")
-JMESSAGE(JERR_DQT_INDEX, "Bogus DQT index %d")
-JMESSAGE(JERR_EMPTY_IMAGE, "Empty JPEG image (DNL not supported)")
-JMESSAGE(JERR_EMS_READ, "Read from EMS failed")
-JMESSAGE(JERR_EMS_WRITE, "Write to EMS failed")
-JMESSAGE(JERR_EOI_EXPECTED, "Didn't expect more than one scan")
-JMESSAGE(JERR_FILE_READ, "Input file read error")
-JMESSAGE(JERR_FILE_WRITE, "Output file write error --- out of disk space?")
-JMESSAGE(JERR_FRACT_SAMPLE_NOTIMPL, "Fractional sampling not implemented yet")
-JMESSAGE(JERR_HUFF_CLEN_OVERFLOW, "Huffman code size table overflow")
-JMESSAGE(JERR_HUFF_MISSING_CODE, "Missing Huffman code table entry")
-JMESSAGE(JERR_IMAGE_TOO_BIG, "Maximum supported image dimension is %u pixels")
-JMESSAGE(JERR_INPUT_EMPTY, "Empty input file")
-JMESSAGE(JERR_INPUT_EOF, "Premature end of input file")
-JMESSAGE(JERR_MISMATCHED_QUANT_TABLE,
-	 "Cannot transcode due to multiple use of quantization table %d")
-JMESSAGE(JERR_MISSING_DATA, "Scan script does not transmit all data")
-JMESSAGE(JERR_MODE_CHANGE, "Invalid color quantization mode change")
-JMESSAGE(JERR_NOTIMPL, "Not implemented yet")
-JMESSAGE(JERR_NOT_COMPILED, "Requested feature was omitted at compile time")
-JMESSAGE(JERR_NO_BACKING_STORE, "Backing store not supported")
-JMESSAGE(JERR_NO_HUFF_TABLE, "Huffman table 0x%02x was not defined")
-JMESSAGE(JERR_NO_IMAGE, "JPEG datastream contains no image")
-JMESSAGE(JERR_NO_QUANT_TABLE, "Quantization table 0x%02x was not defined")
-JMESSAGE(JERR_NO_SOI, "Not a JPEG file: starts with 0x%02x 0x%02x")
-JMESSAGE(JERR_OUT_OF_MEMORY, "Insufficient memory (case %d)")
-JMESSAGE(JERR_QUANT_COMPONENTS,
-	 "Cannot quantize more than %d color components")
-JMESSAGE(JERR_QUANT_FEW_COLORS, "Cannot quantize to fewer than %d colors")
-JMESSAGE(JERR_QUANT_MANY_COLORS, "Cannot quantize to more than %d colors")
-JMESSAGE(JERR_SOF_DUPLICATE, "Invalid JPEG file structure: two SOF markers")
-JMESSAGE(JERR_SOF_NO_SOS, "Invalid JPEG file structure: missing SOS marker")
-JMESSAGE(JERR_SOF_UNSUPPORTED, "Unsupported JPEG process: SOF type 0x%02x")
-JMESSAGE(JERR_SOI_DUPLICATE, "Invalid JPEG file structure: two SOI markers")
-JMESSAGE(JERR_SOS_NO_SOF, "Invalid JPEG file structure: SOS before SOF")
-JMESSAGE(JERR_TFILE_CREATE, "Failed to create temporary file %s")
-JMESSAGE(JERR_TFILE_READ, "Read failed on temporary file")
-JMESSAGE(JERR_TFILE_SEEK, "Seek failed on temporary file")
-JMESSAGE(JERR_TFILE_WRITE,
-	 "Write failed on temporary file --- out of disk space?")
-JMESSAGE(JERR_TOO_LITTLE_DATA, "Application transferred too few scanlines")
-JMESSAGE(JERR_UNKNOWN_MARKER, "Unsupported marker type 0x%02x")
-JMESSAGE(JERR_VIRTUAL_BUG, "Virtual array controller messed up")
-JMESSAGE(JERR_WIDTH_OVERFLOW, "Image too wide for this implementation")
-JMESSAGE(JERR_XMS_READ, "Read from XMS failed")
-JMESSAGE(JERR_XMS_WRITE, "Write to XMS failed")
-JMESSAGE(JMSG_COPYRIGHT, JCOPYRIGHT)
-JMESSAGE(JMSG_VERSION, JVERSION)
-JMESSAGE(JTRC_16BIT_TABLES,
-	 "Caution: quantization tables are too coarse for baseline JPEG")
-JMESSAGE(JTRC_ADOBE,
-	 "Adobe APP14 marker: version %d, flags 0x%04x 0x%04x, transform %d")
-JMESSAGE(JTRC_APP0, "Unknown APP0 marker (not JFIF), length %u")
-JMESSAGE(JTRC_APP14, "Unknown APP14 marker (not Adobe), length %u")
-JMESSAGE(JTRC_DAC, "Define Arithmetic Table 0x%02x: 0x%02x")
-JMESSAGE(JTRC_DHT, "Define Huffman Table 0x%02x")
-JMESSAGE(JTRC_DQT, "Define Quantization Table %d  precision %d")
-JMESSAGE(JTRC_DRI, "Define Restart Interval %u")
-JMESSAGE(JTRC_EMS_CLOSE, "Freed EMS handle %u")
-JMESSAGE(JTRC_EMS_OPEN, "Obtained EMS handle %u")
-JMESSAGE(JTRC_EOI, "End Of Image")
-JMESSAGE(JTRC_HUFFBITS, "        %3d %3d %3d %3d %3d %3d %3d %3d")
-JMESSAGE(JTRC_JFIF, "JFIF APP0 marker: version %d.%02d, density %dx%d  %d")
-JMESSAGE(JTRC_JFIF_BADTHUMBNAILSIZE,
-	 "Warning: thumbnail image size does not match data length %u")
-JMESSAGE(JTRC_JFIF_EXTENSION,
-	 "JFIF extension marker: type 0x%02x, length %u")
-JMESSAGE(JTRC_JFIF_THUMBNAIL, "    with %d x %d thumbnail image")
-JMESSAGE(JTRC_MISC_MARKER, "Miscellaneous marker 0x%02x, length %u")
-JMESSAGE(JTRC_PARMLESS_MARKER, "Unexpected marker 0x%02x")
-JMESSAGE(JTRC_QUANTVALS, "        %4u %4u %4u %4u %4u %4u %4u %4u")
-JMESSAGE(JTRC_QUANT_3_NCOLORS, "Quantizing to %d = %d*%d*%d colors")
-JMESSAGE(JTRC_QUANT_NCOLORS, "Quantizing to %d colors")
-JMESSAGE(JTRC_QUANT_SELECTED, "Selected %d colors for quantization")
-JMESSAGE(JTRC_RECOVERY_ACTION, "At marker 0x%02x, recovery action %d")
-JMESSAGE(JTRC_RST, "RST%d")
-JMESSAGE(JTRC_SMOOTH_NOTIMPL,
-	 "Smoothing not supported with nonstandard sampling ratios")
-JMESSAGE(JTRC_SOF, "Start Of Frame 0x%02x: width=%u, height=%u, components=%d")
-JMESSAGE(JTRC_SOF_COMPONENT, "    Component %d: %dhx%dv q=%d")
-JMESSAGE(JTRC_SOI, "Start of Image")
-JMESSAGE(JTRC_SOS, "Start Of Scan: %d components")
-JMESSAGE(JTRC_SOS_COMPONENT, "    Component %d: dc=%d ac=%d")
-JMESSAGE(JTRC_SOS_PARAMS, "  Ss=%d, Se=%d, Ah=%d, Al=%d")
-JMESSAGE(JTRC_TFILE_CLOSE, "Closed temporary file %s")
-JMESSAGE(JTRC_TFILE_OPEN, "Opened temporary file %s")
-JMESSAGE(JTRC_THUMB_JPEG,
-	 "JFIF extension marker: JPEG-compressed thumbnail image, length %u")
-JMESSAGE(JTRC_THUMB_PALETTE,
-	 "JFIF extension marker: palette thumbnail image, length %u")
-JMESSAGE(JTRC_THUMB_RGB,
-	 "JFIF extension marker: RGB thumbnail image, length %u")
-JMESSAGE(JTRC_UNKNOWN_IDS,
-	 "Unrecognized component IDs %d %d %d, assuming YCbCr")
-JMESSAGE(JTRC_XMS_CLOSE, "Freed XMS handle %u")
-JMESSAGE(JTRC_XMS_OPEN, "Obtained XMS handle %u")
-JMESSAGE(JWRN_ADOBE_XFORM, "Unknown Adobe color transform code %d")
-JMESSAGE(JWRN_BOGUS_PROGRESSION,
-	 "Inconsistent progression sequence for component %d coefficient %d")
-JMESSAGE(JWRN_EXTRANEOUS_DATA,
-	 "Corrupt JPEG data: %u extraneous bytes before marker 0x%02x")
-JMESSAGE(JWRN_HIT_MARKER, "Corrupt JPEG data: premature end of data segment")
-JMESSAGE(JWRN_HUFF_BAD_CODE, "Corrupt JPEG data: bad Huffman code")
-JMESSAGE(JWRN_JFIF_MAJOR, "Warning: unknown JFIF revision number %d.%02d")
-JMESSAGE(JWRN_JPEG_EOF, "Premature end of JPEG file")
-JMESSAGE(JWRN_MUST_RESYNC,
-	 "Corrupt JPEG data: found marker 0x%02x instead of RST%d")
-JMESSAGE(JWRN_NOT_SEQUENTIAL, "Invalid SOS parameters for sequential JPEG")
-JMESSAGE(JWRN_TOO_MUCH_DATA, "Application transferred too many scanlines")
-
-#ifdef JMAKE_ENUM_LIST
-
-  JMSG_LASTMSGCODE
-} J_MESSAGE_CODE;
-
-#undef JMAKE_ENUM_LIST
-#endif /* JMAKE_ENUM_LIST */
-
-/* Zap JMESSAGE macro so that future re-inclusions do nothing by default */
-#undef JMESSAGE
-
-
-#ifndef JERROR_H
-#define JERROR_H
-
-/* Macros to simplify using the error and trace message stuff */
-/* The first parameter is either type of cinfo pointer */
-
-/* Fatal errors (print message and exit) */
-#define ERREXIT(cinfo,code)  \
-  ((cinfo)->err->msg_code = (code), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXIT1(cinfo,code,p1)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXIT2(cinfo,code,p1,p2)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXIT3(cinfo,code,p1,p2,p3)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (cinfo)->err->msg_parm.i[2] = (p3), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXIT4(cinfo,code,p1,p2,p3,p4)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (cinfo)->err->msg_parm.i[2] = (p3), \
-   (cinfo)->err->msg_parm.i[3] = (p4), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-#define ERREXITS(cinfo,code,str)  \
-  ((cinfo)->err->msg_code = (code), \
-   strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \
-   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
-
-#define MAKESTMT(stuff)		do { stuff } while (0)
-
-/* Nonfatal errors (we can keep going, but the data is probably corrupt) */
-#define WARNMS(cinfo,code)  \
-  ((cinfo)->err->msg_code = (code), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
-#define WARNMS1(cinfo,code,p1)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
-#define WARNMS2(cinfo,code,p1,p2)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
-
-/* Informational/debugging messages */
-#define TRACEMS(cinfo,lvl,code)  \
-  ((cinfo)->err->msg_code = (code), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
-#define TRACEMS1(cinfo,lvl,code,p1)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
-#define TRACEMS2(cinfo,lvl,code,p1,p2)  \
-  ((cinfo)->err->msg_code = (code), \
-   (cinfo)->err->msg_parm.i[0] = (p1), \
-   (cinfo)->err->msg_parm.i[1] = (p2), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
-#define TRACEMS3(cinfo,lvl,code,p1,p2,p3)  \
-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); \
-	   (cinfo)->err->msg_code = (code); \
-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
-#define TRACEMS4(cinfo,lvl,code,p1,p2,p3,p4)  \
-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
-	   (cinfo)->err->msg_code = (code); \
-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
-#define TRACEMS5(cinfo,lvl,code,p1,p2,p3,p4,p5)  \
-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
-	   _mp[4] = (p5); \
-	   (cinfo)->err->msg_code = (code); \
-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
-#define TRACEMS8(cinfo,lvl,code,p1,p2,p3,p4,p5,p6,p7,p8)  \
-  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
-	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
-	   _mp[4] = (p5); _mp[5] = (p6); _mp[6] = (p7); _mp[7] = (p8); \
-	   (cinfo)->err->msg_code = (code); \
-	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
-#define TRACEMSS(cinfo,lvl,code,str)  \
-  ((cinfo)->err->msg_code = (code), \
-   strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \
-   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
-
-#endif /* JERROR_H */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jfdctflt.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jfdctflt.c
deleted file mode 100644
index 79d7a00787..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jfdctflt.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * jfdctflt.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains a floating-point implementation of the
- * forward DCT (Discrete Cosine Transform).
- *
- * This implementation should be more accurate than either of the integer
- * DCT implementations.  However, it may not give the same results on all
- * machines because of differences in roundoff behavior.  Speed will depend
- * on the hardware's floating point capacity.
- *
- * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT
- * on each column.  Direct algorithms are also available, but they are
- * much more complex and seem not to be any faster when reduced to code.
- *
- * This implementation is based on Arai, Agui, and Nakajima's algorithm for
- * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in
- * Japanese, but the algorithm is described in the Pennebaker & Mitchell
- * JPEG textbook (see REFERENCES section in file README).  The following code
- * is based directly on figure 4-8 in P&M.
- * While an 8-point DCT cannot be done in less than 11 multiplies, it is
- * possible to arrange the computation so that many of the multiplies are
- * simple scalings of the final outputs.  These multiplies can then be
- * folded into the multiplications or divisions by the JPEG quantization
- * table entries.  The AA&N method leaves only 5 multiplies and 29 adds
- * to be done in the DCT itself.
- * The primary disadvantage of this method is that with a fixed-point
- * implementation, accuracy is lost due to imprecise representation of the
- * scaled quantization values.  However, that problem does not arise if
- * we use floating point arithmetic.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-#ifdef DCT_FLOAT_SUPPORTED
-
-
-/*
- * This module is specialized to the case DCTSIZE = 8.
- */
-
-#if DCTSIZE != 8
-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
-#endif
-
-
-/*
- * Perform the forward DCT on one block of samples.
- */
-
-GLOBAL(void)
-jpeg_fdct_float (FAST_FLOAT * data)
-{
-  FAST_FLOAT tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
-  FAST_FLOAT tmp10, tmp11, tmp12, tmp13;
-  FAST_FLOAT z1, z2, z3, z4, z5, z11, z13;
-  FAST_FLOAT *dataptr;
-  int ctr;
-
-  /* Pass 1: process rows. */
-
-  dataptr = data;
-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
-    tmp0 = dataptr[0] + dataptr[7];
-    tmp7 = dataptr[0] - dataptr[7];
-    tmp1 = dataptr[1] + dataptr[6];
-    tmp6 = dataptr[1] - dataptr[6];
-    tmp2 = dataptr[2] + dataptr[5];
-    tmp5 = dataptr[2] - dataptr[5];
-    tmp3 = dataptr[3] + dataptr[4];
-    tmp4 = dataptr[3] - dataptr[4];
-    
-    /* Even part */
-    
-    tmp10 = tmp0 + tmp3;	/* phase 2 */
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    dataptr[0] = tmp10 + tmp11; /* phase 3 */
-    dataptr[4] = tmp10 - tmp11;
-    
-    z1 = (tmp12 + tmp13) * ((FAST_FLOAT) 0.707106781); /* c4 */
-    dataptr[2] = tmp13 + z1;	/* phase 5 */
-    dataptr[6] = tmp13 - z1;
-    
-    /* Odd part */
-
-    tmp10 = tmp4 + tmp5;	/* phase 2 */
-    tmp11 = tmp5 + tmp6;
-    tmp12 = tmp6 + tmp7;
-
-    /* The rotator is modified from fig 4-8 to avoid extra negations. */
-    z5 = (tmp10 - tmp12) * ((FAST_FLOAT) 0.382683433); /* c6 */
-    z2 = ((FAST_FLOAT) 0.541196100) * tmp10 + z5; /* c2-c6 */
-    z4 = ((FAST_FLOAT) 1.306562965) * tmp12 + z5; /* c2+c6 */
-    z3 = tmp11 * ((FAST_FLOAT) 0.707106781); /* c4 */
-
-    z11 = tmp7 + z3;		/* phase 5 */
-    z13 = tmp7 - z3;
-
-    dataptr[5] = z13 + z2;	/* phase 6 */
-    dataptr[3] = z13 - z2;
-    dataptr[1] = z11 + z4;
-    dataptr[7] = z11 - z4;
-
-    dataptr += DCTSIZE;		/* advance pointer to next row */
-  }
-
-  /* Pass 2: process columns. */
-
-  dataptr = data;
-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];
-    tmp7 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];
-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];
-    tmp6 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];
-    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];
-    tmp5 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];
-    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];
-    tmp4 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];
-    
-    /* Even part */
-    
-    tmp10 = tmp0 + tmp3;	/* phase 2 */
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    dataptr[DCTSIZE*0] = tmp10 + tmp11; /* phase 3 */
-    dataptr[DCTSIZE*4] = tmp10 - tmp11;
-    
-    z1 = (tmp12 + tmp13) * ((FAST_FLOAT) 0.707106781); /* c4 */
-    dataptr[DCTSIZE*2] = tmp13 + z1; /* phase 5 */
-    dataptr[DCTSIZE*6] = tmp13 - z1;
-    
-    /* Odd part */
-
-    tmp10 = tmp4 + tmp5;	/* phase 2 */
-    tmp11 = tmp5 + tmp6;
-    tmp12 = tmp6 + tmp7;
-
-    /* The rotator is modified from fig 4-8 to avoid extra negations. */
-    z5 = (tmp10 - tmp12) * ((FAST_FLOAT) 0.382683433); /* c6 */
-    z2 = ((FAST_FLOAT) 0.541196100) * tmp10 + z5; /* c2-c6 */
-    z4 = ((FAST_FLOAT) 1.306562965) * tmp12 + z5; /* c2+c6 */
-    z3 = tmp11 * ((FAST_FLOAT) 0.707106781); /* c4 */
-
-    z11 = tmp7 + z3;		/* phase 5 */
-    z13 = tmp7 - z3;
-
-    dataptr[DCTSIZE*5] = z13 + z2; /* phase 6 */
-    dataptr[DCTSIZE*3] = z13 - z2;
-    dataptr[DCTSIZE*1] = z11 + z4;
-    dataptr[DCTSIZE*7] = z11 - z4;
-
-    dataptr++;			/* advance pointer to next column */
-  }
-}
-
-#endif /* DCT_FLOAT_SUPPORTED */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jfdctfst.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jfdctfst.c
deleted file mode 100644
index 37900ec90f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jfdctfst.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * jfdctfst.c
- *
- * Copyright (C) 1994-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains a fast, not so accurate integer implementation of the
- * forward DCT (Discrete Cosine Transform).
- *
- * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT
- * on each column.  Direct algorithms are also available, but they are
- * much more complex and seem not to be any faster when reduced to code.
- *
- * This implementation is based on Arai, Agui, and Nakajima's algorithm for
- * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in
- * Japanese, but the algorithm is described in the Pennebaker & Mitchell
- * JPEG textbook (see REFERENCES section in file README).  The following code
- * is based directly on figure 4-8 in P&M.
- * While an 8-point DCT cannot be done in less than 11 multiplies, it is
- * possible to arrange the computation so that many of the multiplies are
- * simple scalings of the final outputs.  These multiplies can then be
- * folded into the multiplications or divisions by the JPEG quantization
- * table entries.  The AA&N method leaves only 5 multiplies and 29 adds
- * to be done in the DCT itself.
- * The primary disadvantage of this method is that with fixed-point math,
- * accuracy is lost due to imprecise representation of the scaled
- * quantization values.  The smaller the quantization table entry, the less
- * precise the scaled value, so this implementation does worse with high-
- * quality-setting files than with low-quality ones.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-#ifdef DCT_IFAST_SUPPORTED
-
-
-/*
- * This module is specialized to the case DCTSIZE = 8.
- */
-
-#if DCTSIZE != 8
-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
-#endif
-
-
-/* Scaling decisions are generally the same as in the LL&M algorithm;
- * see jfdctint.c for more details.  However, we choose to descale
- * (right shift) multiplication products as soon as they are formed,
- * rather than carrying additional fractional bits into subsequent additions.
- * This compromises accuracy slightly, but it lets us save a few shifts.
- * More importantly, 16-bit arithmetic is then adequate (for 8-bit samples)
- * everywhere except in the multiplications proper; this saves a good deal
- * of work on 16-bit-int machines.
- *
- * Again to save a few shifts, the intermediate results between pass 1 and
- * pass 2 are not upscaled, but are represented only to integral precision.
- *
- * A final compromise is to represent the multiplicative constants to only
- * 8 fractional bits, rather than 13.  This saves some shifting work on some
- * machines, and may also reduce the cost of multiplication (since there
- * are fewer one-bits in the constants).
- */
-
-#define CONST_BITS  8
-
-
-/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
- * causing a lot of useless floating-point operations at run time.
- * To get around this we use the following pre-calculated constants.
- * If you change CONST_BITS you may want to add appropriate values.
- * (With a reasonable C compiler, you can just rely on the FIX() macro...)
- */
-
-#if CONST_BITS == 8
-#define FIX_0_382683433  ((JPEG_INT32)   98)		/* FIX(0.382683433) */
-#define FIX_0_541196100  ((JPEG_INT32)  139)		/* FIX(0.541196100) */
-#define FIX_0_707106781  ((JPEG_INT32)  181)		/* FIX(0.707106781) */
-#define FIX_1_306562965  ((JPEG_INT32)  334)		/* FIX(1.306562965) */
-#else
-#define FIX_0_382683433  FIX(0.382683433)
-#define FIX_0_541196100  FIX(0.541196100)
-#define FIX_0_707106781  FIX(0.707106781)
-#define FIX_1_306562965  FIX(1.306562965)
-#endif
-
-
-/* We can gain a little more speed, with a further compromise in accuracy,
- * by omitting the addition in a descaling shift.  This yields an incorrectly
- * rounded result half the time...
- */
-
-#ifndef USE_ACCURATE_ROUNDING
-#undef DESCALE
-#define DESCALE(x,n)  RIGHT_SHIFT(x, n)
-#endif
-
-
-/* Multiply a DCTELEM variable by an INT32 constant, and immediately
- * descale to yield a DCTELEM result.
- */
-
-#define MULTIPLY(var,const)  ((DCTELEM) DESCALE((var) * (const), CONST_BITS))
-
-
-/*
- * Perform the forward DCT on one block of samples.
- */
-
-GLOBAL(void)
-jpeg_fdct_ifast (DCTELEM * data)
-{
-  DCTELEM tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
-  DCTELEM tmp10, tmp11, tmp12, tmp13;
-  DCTELEM z1, z2, z3, z4, z5, z11, z13;
-  DCTELEM *dataptr;
-  int ctr;
-  SHIFT_TEMPS
-
-  /* Pass 1: process rows. */
-
-  dataptr = data;
-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
-    tmp0 = dataptr[0] + dataptr[7];
-    tmp7 = dataptr[0] - dataptr[7];
-    tmp1 = dataptr[1] + dataptr[6];
-    tmp6 = dataptr[1] - dataptr[6];
-    tmp2 = dataptr[2] + dataptr[5];
-    tmp5 = dataptr[2] - dataptr[5];
-    tmp3 = dataptr[3] + dataptr[4];
-    tmp4 = dataptr[3] - dataptr[4];
-    
-    /* Even part */
-    
-    tmp10 = tmp0 + tmp3;	/* phase 2 */
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    dataptr[0] = tmp10 + tmp11; /* phase 3 */
-    dataptr[4] = tmp10 - tmp11;
-    
-    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_707106781); /* c4 */
-    dataptr[2] = tmp13 + z1;	/* phase 5 */
-    dataptr[6] = tmp13 - z1;
-    
-    /* Odd part */
-
-    tmp10 = tmp4 + tmp5;	/* phase 2 */
-    tmp11 = tmp5 + tmp6;
-    tmp12 = tmp6 + tmp7;
-
-    /* The rotator is modified from fig 4-8 to avoid extra negations. */
-    z5 = MULTIPLY(tmp10 - tmp12, FIX_0_382683433); /* c6 */
-    z2 = MULTIPLY(tmp10, FIX_0_541196100) + z5; /* c2-c6 */
-    z4 = MULTIPLY(tmp12, FIX_1_306562965) + z5; /* c2+c6 */
-    z3 = MULTIPLY(tmp11, FIX_0_707106781); /* c4 */
-
-    z11 = tmp7 + z3;		/* phase 5 */
-    z13 = tmp7 - z3;
-
-    dataptr[5] = z13 + z2;	/* phase 6 */
-    dataptr[3] = z13 - z2;
-    dataptr[1] = z11 + z4;
-    dataptr[7] = z11 - z4;
-
-    dataptr += DCTSIZE;		/* advance pointer to next row */
-  }
-
-  /* Pass 2: process columns. */
-
-  dataptr = data;
-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];
-    tmp7 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];
-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];
-    tmp6 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];
-    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];
-    tmp5 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];
-    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];
-    tmp4 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];
-    
-    /* Even part */
-    
-    tmp10 = tmp0 + tmp3;	/* phase 2 */
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    dataptr[DCTSIZE*0] = tmp10 + tmp11; /* phase 3 */
-    dataptr[DCTSIZE*4] = tmp10 - tmp11;
-    
-    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_707106781); /* c4 */
-    dataptr[DCTSIZE*2] = tmp13 + z1; /* phase 5 */
-    dataptr[DCTSIZE*6] = tmp13 - z1;
-    
-    /* Odd part */
-
-    tmp10 = tmp4 + tmp5;	/* phase 2 */
-    tmp11 = tmp5 + tmp6;
-    tmp12 = tmp6 + tmp7;
-
-    /* The rotator is modified from fig 4-8 to avoid extra negations. */
-    z5 = MULTIPLY(tmp10 - tmp12, FIX_0_382683433); /* c6 */
-    z2 = MULTIPLY(tmp10, FIX_0_541196100) + z5; /* c2-c6 */
-    z4 = MULTIPLY(tmp12, FIX_1_306562965) + z5; /* c2+c6 */
-    z3 = MULTIPLY(tmp11, FIX_0_707106781); /* c4 */
-
-    z11 = tmp7 + z3;		/* phase 5 */
-    z13 = tmp7 - z3;
-
-    dataptr[DCTSIZE*5] = z13 + z2; /* phase 6 */
-    dataptr[DCTSIZE*3] = z13 - z2;
-    dataptr[DCTSIZE*1] = z11 + z4;
-    dataptr[DCTSIZE*7] = z11 - z4;
-
-    dataptr++;			/* advance pointer to next column */
-  }
-}
-
-#endif /* DCT_IFAST_SUPPORTED */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jfdctint.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jfdctint.c
deleted file mode 100644
index 4543b2e861..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jfdctint.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * jfdctint.c
- *
- * Copyright (C) 1991-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains a slow-but-accurate integer implementation of the
- * forward DCT (Discrete Cosine Transform).
- *
- * A 2-D DCT can be done by 1-D DCT on each row followed by 1-D DCT
- * on each column.  Direct algorithms are also available, but they are
- * much more complex and seem not to be any faster when reduced to code.
- *
- * This implementation is based on an algorithm described in
- *   C. Loeffler, A. Ligtenberg and G. Moschytz, "Practical Fast 1-D DCT
- *   Algorithms with 11 Multiplications", Proc. Int'l. Conf. on Acoustics,
- *   Speech, and Signal Processing 1989 (ICASSP '89), pp. 988-991.
- * The primary algorithm described there uses 11 multiplies and 29 adds.
- * We use their alternate method with 12 multiplies and 32 adds.
- * The advantage of this method is that no data path contains more than one
- * multiplication; this allows a very simple and accurate implementation in
- * scaled fixed-point arithmetic, with a minimal number of shifts.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-#ifdef DCT_ISLOW_SUPPORTED
-
-
-/*
- * This module is specialized to the case DCTSIZE = 8.
- */
-
-#if DCTSIZE != 8
-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
-#endif
-
-
-/*
- * The poop on this scaling stuff is as follows:
- *
- * Each 1-D DCT step produces outputs which are a factor of sqrt(N)
- * larger than the true DCT outputs.  The final outputs are therefore
- * a factor of N larger than desired; since N=8 this can be cured by
- * a simple right shift at the end of the algorithm.  The advantage of
- * this arrangement is that we save two multiplications per 1-D DCT,
- * because the y0 and y4 outputs need not be divided by sqrt(N).
- * In the IJG code, this factor of 8 is removed by the quantization step
- * (in jcdctmgr.c), NOT in this module.
- *
- * We have to do addition and subtraction of the integer inputs, which
- * is no problem, and multiplication by fractional constants, which is
- * a problem to do in integer arithmetic.  We multiply all the constants
- * by CONST_SCALE and convert them to integer constants (thus retaining
- * CONST_BITS bits of precision in the constants).  After doing a
- * multiplication we have to divide the product by CONST_SCALE, with proper
- * rounding, to produce the correct output.  This division can be done
- * cheaply as a right shift of CONST_BITS bits.  We postpone shifting
- * as long as possible so that partial sums can be added together with
- * full fractional precision.
- *
- * The outputs of the first pass are scaled up by PASS1_BITS bits so that
- * they are represented to better-than-integral precision.  These outputs
- * require BITS_IN_JSAMPLE + PASS1_BITS + 3 bits; this fits in a 16-bit word
- * with the recommended scaling.  (For 12-bit sample data, the intermediate
- * array is INT32 anyway.)
- *
- * To avoid overflow of the 32-bit intermediate results in pass 2, we must
- * have BITS_IN_JSAMPLE + CONST_BITS + PASS1_BITS <= 26.  Error analysis
- * shows that the values given below are the most effective.
- */
-
-#if BITS_IN_JSAMPLE == 8
-#define CONST_BITS  13
-#define PASS1_BITS  2
-#else
-#define CONST_BITS  13
-#define PASS1_BITS  1		/* lose a little precision to avoid overflow */
-#endif
-
-/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
- * causing a lot of useless floating-point operations at run time.
- * To get around this we use the following pre-calculated constants.
- * If you change CONST_BITS you may want to add appropriate values.
- * (With a reasonable C compiler, you can just rely on the FIX() macro...)
- */
-
-#if CONST_BITS == 13
-#define FIX_0_298631336  ((JPEG_INT32)  2446)	/* FIX(0.298631336) */
-#define FIX_0_390180644  ((JPEG_INT32)  3196)	/* FIX(0.390180644) */
-#define FIX_0_541196100  ((JPEG_INT32)  4433)	/* FIX(0.541196100) */
-#define FIX_0_765366865  ((JPEG_INT32)  6270)	/* FIX(0.765366865) */
-#define FIX_0_899976223  ((JPEG_INT32)  7373)	/* FIX(0.899976223) */
-#define FIX_1_175875602  ((JPEG_INT32)  9633)	/* FIX(1.175875602) */
-#define FIX_1_501321110  ((JPEG_INT32)  12299)	/* FIX(1.501321110) */
-#define FIX_1_847759065  ((JPEG_INT32)  15137)	/* FIX(1.847759065) */
-#define FIX_1_961570560  ((JPEG_INT32)  16069)	/* FIX(1.961570560) */
-#define FIX_2_053119869  ((JPEG_INT32)  16819)	/* FIX(2.053119869) */
-#define FIX_2_562915447  ((JPEG_INT32)  20995)	/* FIX(2.562915447) */
-#define FIX_3_072711026  ((JPEG_INT32)  25172)	/* FIX(3.072711026) */
-#else
-#define FIX_0_298631336  FIX(0.298631336)
-#define FIX_0_390180644  FIX(0.390180644)
-#define FIX_0_541196100  FIX(0.541196100)
-#define FIX_0_765366865  FIX(0.765366865)
-#define FIX_0_899976223  FIX(0.899976223)
-#define FIX_1_175875602  FIX(1.175875602)
-#define FIX_1_501321110  FIX(1.501321110)
-#define FIX_1_847759065  FIX(1.847759065)
-#define FIX_1_961570560  FIX(1.961570560)
-#define FIX_2_053119869  FIX(2.053119869)
-#define FIX_2_562915447  FIX(2.562915447)
-#define FIX_3_072711026  FIX(3.072711026)
-#endif
-
-
-/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.
- * For 8-bit samples with the recommended scaling, all the variable
- * and constant values involved are no more than 16 bits wide, so a
- * 16x16->32 bit multiply can be used instead of a full 32x32 multiply.
- * For 12-bit samples, a full 32-bit multiplication will be needed.
- */
-
-#if BITS_IN_JSAMPLE == 8
-#define MULTIPLY(var,const)  MULTIPLY16C16(var,const)
-#else
-#define MULTIPLY(var,const)  ((var) * (const))
-#endif
-
-
-/*
- * Perform the forward DCT on one block of samples.
- */
-
-GLOBAL(void)
-jpeg_fdct_islow (DCTELEM * data)
-{
-  JPEG_INT32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
-  JPEG_INT32 tmp10, tmp11, tmp12, tmp13;
-  JPEG_INT32 z1, z2, z3, z4, z5;
-  DCTELEM *dataptr;
-  int ctr;
-  SHIFT_TEMPS
-
-  /* Pass 1: process rows. */
-  /* Note results are scaled up by sqrt(8) compared to a true DCT; */
-  /* furthermore, we scale the results by 2**PASS1_BITS. */
-
-  dataptr = data;
-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
-    tmp0 = dataptr[0] + dataptr[7];
-    tmp7 = dataptr[0] - dataptr[7];
-    tmp1 = dataptr[1] + dataptr[6];
-    tmp6 = dataptr[1] - dataptr[6];
-    tmp2 = dataptr[2] + dataptr[5];
-    tmp5 = dataptr[2] - dataptr[5];
-    tmp3 = dataptr[3] + dataptr[4];
-    tmp4 = dataptr[3] - dataptr[4];
-    
-    /* Even part per LL&M figure 1 --- note that published figure is faulty;
-     * rotator "sqrt(2)*c1" should be "sqrt(2)*c6".
-     */
-    
-    tmp10 = tmp0 + tmp3;
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    dataptr[0] = (DCTELEM) ((tmp10 + tmp11) << PASS1_BITS);
-    dataptr[4] = (DCTELEM) ((tmp10 - tmp11) << PASS1_BITS);
-    
-    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);
-    dataptr[2] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp13, FIX_0_765366865),
-				   CONST_BITS-PASS1_BITS);
-    dataptr[6] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp12, - FIX_1_847759065),
-				   CONST_BITS-PASS1_BITS);
-    
-    /* Odd part per figure 8 --- note paper omits factor of sqrt(2).
-     * cK represents cos(K*pi/16).
-     * i0..i3 in the paper are tmp4..tmp7 here.
-     */
-    
-    z1 = tmp4 + tmp7;
-    z2 = tmp5 + tmp6;
-    z3 = tmp4 + tmp6;
-    z4 = tmp5 + tmp7;
-    z5 = MULTIPLY(z3 + z4, FIX_1_175875602); /* sqrt(2) * c3 */
-    
-    tmp4 = MULTIPLY(tmp4, FIX_0_298631336); /* sqrt(2) * (-c1+c3+c5-c7) */
-    tmp5 = MULTIPLY(tmp5, FIX_2_053119869); /* sqrt(2) * ( c1+c3-c5+c7) */
-    tmp6 = MULTIPLY(tmp6, FIX_3_072711026); /* sqrt(2) * ( c1+c3+c5-c7) */
-    tmp7 = MULTIPLY(tmp7, FIX_1_501321110); /* sqrt(2) * ( c1+c3-c5-c7) */
-    z1 = MULTIPLY(z1, - FIX_0_899976223); /* sqrt(2) * (c7-c3) */
-    z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */
-    z3 = MULTIPLY(z3, - FIX_1_961570560); /* sqrt(2) * (-c3-c5) */
-    z4 = MULTIPLY(z4, - FIX_0_390180644); /* sqrt(2) * (c5-c3) */
-    
-    z3 += z5;
-    z4 += z5;
-    
-    dataptr[7] = (DCTELEM) DESCALE(tmp4 + z1 + z3, CONST_BITS-PASS1_BITS);
-    dataptr[5] = (DCTELEM) DESCALE(tmp5 + z2 + z4, CONST_BITS-PASS1_BITS);
-    dataptr[3] = (DCTELEM) DESCALE(tmp6 + z2 + z3, CONST_BITS-PASS1_BITS);
-    dataptr[1] = (DCTELEM) DESCALE(tmp7 + z1 + z4, CONST_BITS-PASS1_BITS);
-    
-    dataptr += DCTSIZE;		/* advance pointer to next row */
-  }
-
-  /* Pass 2: process columns.
-   * We remove the PASS1_BITS scaling, but leave the results scaled up
-   * by an overall factor of 8.
-   */
-
-  dataptr = data;
-  for (ctr = DCTSIZE-1; ctr >= 0; ctr--) {
-    tmp0 = dataptr[DCTSIZE*0] + dataptr[DCTSIZE*7];
-    tmp7 = dataptr[DCTSIZE*0] - dataptr[DCTSIZE*7];
-    tmp1 = dataptr[DCTSIZE*1] + dataptr[DCTSIZE*6];
-    tmp6 = dataptr[DCTSIZE*1] - dataptr[DCTSIZE*6];
-    tmp2 = dataptr[DCTSIZE*2] + dataptr[DCTSIZE*5];
-    tmp5 = dataptr[DCTSIZE*2] - dataptr[DCTSIZE*5];
-    tmp3 = dataptr[DCTSIZE*3] + dataptr[DCTSIZE*4];
-    tmp4 = dataptr[DCTSIZE*3] - dataptr[DCTSIZE*4];
-    
-    /* Even part per LL&M figure 1 --- note that published figure is faulty;
-     * rotator "sqrt(2)*c1" should be "sqrt(2)*c6".
-     */
-    
-    tmp10 = tmp0 + tmp3;
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    dataptr[DCTSIZE*0] = (DCTELEM) DESCALE(tmp10 + tmp11, PASS1_BITS);
-    dataptr[DCTSIZE*4] = (DCTELEM) DESCALE(tmp10 - tmp11, PASS1_BITS);
-    
-    z1 = MULTIPLY(tmp12 + tmp13, FIX_0_541196100);
-    dataptr[DCTSIZE*2] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp13, FIX_0_765366865),
-					   CONST_BITS+PASS1_BITS);
-    dataptr[DCTSIZE*6] = (DCTELEM) DESCALE(z1 + MULTIPLY(tmp12, - FIX_1_847759065),
-					   CONST_BITS+PASS1_BITS);
-    
-    /* Odd part per figure 8 --- note paper omits factor of sqrt(2).
-     * cK represents cos(K*pi/16).
-     * i0..i3 in the paper are tmp4..tmp7 here.
-     */
-    
-    z1 = tmp4 + tmp7;
-    z2 = tmp5 + tmp6;
-    z3 = tmp4 + tmp6;
-    z4 = tmp5 + tmp7;
-    z5 = MULTIPLY(z3 + z4, FIX_1_175875602); /* sqrt(2) * c3 */
-    
-    tmp4 = MULTIPLY(tmp4, FIX_0_298631336); /* sqrt(2) * (-c1+c3+c5-c7) */
-    tmp5 = MULTIPLY(tmp5, FIX_2_053119869); /* sqrt(2) * ( c1+c3-c5+c7) */
-    tmp6 = MULTIPLY(tmp6, FIX_3_072711026); /* sqrt(2) * ( c1+c3+c5-c7) */
-    tmp7 = MULTIPLY(tmp7, FIX_1_501321110); /* sqrt(2) * ( c1+c3-c5-c7) */
-    z1 = MULTIPLY(z1, - FIX_0_899976223); /* sqrt(2) * (c7-c3) */
-    z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */
-    z3 = MULTIPLY(z3, - FIX_1_961570560); /* sqrt(2) * (-c3-c5) */
-    z4 = MULTIPLY(z4, - FIX_0_390180644); /* sqrt(2) * (c5-c3) */
-    
-    z3 += z5;
-    z4 += z5;
-    
-    dataptr[DCTSIZE*7] = (DCTELEM) DESCALE(tmp4 + z1 + z3,
-					   CONST_BITS+PASS1_BITS);
-    dataptr[DCTSIZE*5] = (DCTELEM) DESCALE(tmp5 + z2 + z4,
-					   CONST_BITS+PASS1_BITS);
-    dataptr[DCTSIZE*3] = (DCTELEM) DESCALE(tmp6 + z2 + z3,
-					   CONST_BITS+PASS1_BITS);
-    dataptr[DCTSIZE*1] = (DCTELEM) DESCALE(tmp7 + z1 + z4,
-					   CONST_BITS+PASS1_BITS);
-    
-    dataptr++;			/* advance pointer to next column */
-  }
-}
-
-#endif /* DCT_ISLOW_SUPPORTED */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jidctflt.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jidctflt.c
deleted file mode 100644
index a0f22c295c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jidctflt.c
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * jidctflt.c
- *
- * Copyright (C) 1994-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains a floating-point implementation of the
- * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine
- * must also perform dequantization of the input coefficients.
- *
- * This implementation should be more accurate than either of the integer
- * IDCT implementations.  However, it may not give the same results on all
- * machines because of differences in roundoff behavior.  Speed will depend
- * on the hardware's floating point capacity.
- *
- * A 2-D IDCT can be done by 1-D IDCT on each column followed by 1-D IDCT
- * on each row (or vice versa, but it's more convenient to emit a row at
- * a time).  Direct algorithms are also available, but they are much more
- * complex and seem not to be any faster when reduced to code.
- *
- * This implementation is based on Arai, Agui, and Nakajima's algorithm for
- * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in
- * Japanese, but the algorithm is described in the Pennebaker & Mitchell
- * JPEG textbook (see REFERENCES section in file README).  The following code
- * is based directly on figure 4-8 in P&M.
- * While an 8-point DCT cannot be done in less than 11 multiplies, it is
- * possible to arrange the computation so that many of the multiplies are
- * simple scalings of the final outputs.  These multiplies can then be
- * folded into the multiplications or divisions by the JPEG quantization
- * table entries.  The AA&N method leaves only 5 multiplies and 29 adds
- * to be done in the DCT itself.
- * The primary disadvantage of this method is that with a fixed-point
- * implementation, accuracy is lost due to imprecise representation of the
- * scaled quantization values.  However, that problem does not arise if
- * we use floating point arithmetic.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-#ifdef DCT_FLOAT_SUPPORTED
-
-
-/*
- * This module is specialized to the case DCTSIZE = 8.
- */
-
-#if DCTSIZE != 8
-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
-#endif
-
-
-/* Dequantize a coefficient by multiplying it by the multiplier-table
- * entry; produce a float result.
- */
-
-#define DEQUANTIZE(coef,quantval)  (((FAST_FLOAT) (coef)) * (quantval))
-
-
-/*
- * Perform dequantization and inverse DCT on one block of coefficients.
- */
-
-GLOBAL(void)
-jpeg_idct_float (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		 JCOEFPTR coef_block,
-		 JSAMPARRAY output_buf, JDIMENSION output_col)
-{
-  FAST_FLOAT tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
-  FAST_FLOAT tmp10, tmp11, tmp12, tmp13;
-  FAST_FLOAT z5, z10, z11, z12, z13;
-  JCOEFPTR inptr;
-  FLOAT_MULT_TYPE * quantptr;
-  FAST_FLOAT * wsptr;
-  JSAMPROW outptr;
-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
-  int ctr;
-  FAST_FLOAT workspace[DCTSIZE2]; /* buffers data between passes */
-  SHIFT_TEMPS
-
-  /* Pass 1: process columns from input, store into work array. */
-
-  inptr = coef_block;
-  quantptr = (FLOAT_MULT_TYPE *) compptr->dct_table;
-  wsptr = workspace;
-  for (ctr = DCTSIZE; ctr > 0; ctr--) {
-    /* Due to quantization, we will usually find that many of the input
-     * coefficients are zero, especially the AC terms.  We can exploit this
-     * by short-circuiting the IDCT calculation for any column in which all
-     * the AC terms are zero.  In that case each output is equal to the
-     * DC coefficient (with scale factor as needed).
-     * With typical images and quantization tables, half or more of the
-     * column DCT calculations can be simplified this way.
-     */
-    
-    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&
-	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*4] == 0 &&
-	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*6] == 0 &&
-	inptr[DCTSIZE*7] == 0) {
-      /* AC terms all zero */
-      FAST_FLOAT dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
-      
-      wsptr[DCTSIZE*0] = dcval;
-      wsptr[DCTSIZE*1] = dcval;
-      wsptr[DCTSIZE*2] = dcval;
-      wsptr[DCTSIZE*3] = dcval;
-      wsptr[DCTSIZE*4] = dcval;
-      wsptr[DCTSIZE*5] = dcval;
-      wsptr[DCTSIZE*6] = dcval;
-      wsptr[DCTSIZE*7] = dcval;
-      
-      inptr++;			/* advance pointers to next column */
-      quantptr++;
-      wsptr++;
-      continue;
-    }
-    
-    /* Even part */
-
-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
-    tmp1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);
-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);
-    tmp3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);
-
-    tmp10 = tmp0 + tmp2;	/* phase 3 */
-    tmp11 = tmp0 - tmp2;
-
-    tmp13 = tmp1 + tmp3;	/* phases 5-3 */
-    tmp12 = (tmp1 - tmp3) * ((FAST_FLOAT) 1.414213562) - tmp13; /* 2*c4 */
-
-    tmp0 = tmp10 + tmp13;	/* phase 2 */
-    tmp3 = tmp10 - tmp13;
-    tmp1 = tmp11 + tmp12;
-    tmp2 = tmp11 - tmp12;
-    
-    /* Odd part */
-
-    tmp4 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
-    tmp5 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
-    tmp6 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
-    tmp7 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
-
-    z13 = tmp6 + tmp5;		/* phase 6 */
-    z10 = tmp6 - tmp5;
-    z11 = tmp4 + tmp7;
-    z12 = tmp4 - tmp7;
-
-    tmp7 = z11 + z13;		/* phase 5 */
-    tmp11 = (z11 - z13) * ((FAST_FLOAT) 1.414213562); /* 2*c4 */
-
-    z5 = (z10 + z12) * ((FAST_FLOAT) 1.847759065); /* 2*c2 */
-    tmp10 = ((FAST_FLOAT) 1.082392200) * z12 - z5; /* 2*(c2-c6) */
-    tmp12 = ((FAST_FLOAT) -2.613125930) * z10 + z5; /* -2*(c2+c6) */
-
-    tmp6 = tmp12 - tmp7;	/* phase 2 */
-    tmp5 = tmp11 - tmp6;
-    tmp4 = tmp10 + tmp5;
-
-    wsptr[DCTSIZE*0] = tmp0 + tmp7;
-    wsptr[DCTSIZE*7] = tmp0 - tmp7;
-    wsptr[DCTSIZE*1] = tmp1 + tmp6;
-    wsptr[DCTSIZE*6] = tmp1 - tmp6;
-    wsptr[DCTSIZE*2] = tmp2 + tmp5;
-    wsptr[DCTSIZE*5] = tmp2 - tmp5;
-    wsptr[DCTSIZE*4] = tmp3 + tmp4;
-    wsptr[DCTSIZE*3] = tmp3 - tmp4;
-
-    inptr++;			/* advance pointers to next column */
-    quantptr++;
-    wsptr++;
-  }
-  
-  /* Pass 2: process rows from work array, store into output array. */
-  /* Note that we must descale the results by a factor of 8 == 2**3. */
-
-  wsptr = workspace;
-  for (ctr = 0; ctr < DCTSIZE; ctr++) {
-    outptr = output_buf[ctr] + output_col;
-    /* Rows of zeroes can be exploited in the same way as we did with columns.
-     * However, the column calculation has created many nonzero AC terms, so
-     * the simplification applies less often (typically 5% to 10% of the time).
-     * And testing floats for zero is relatively expensive, so we don't bother.
-     */
-    
-    /* Even part */
-
-    tmp10 = wsptr[0] + wsptr[4];
-    tmp11 = wsptr[0] - wsptr[4];
-
-    tmp13 = wsptr[2] + wsptr[6];
-    tmp12 = (wsptr[2] - wsptr[6]) * ((FAST_FLOAT) 1.414213562) - tmp13;
-
-    tmp0 = tmp10 + tmp13;
-    tmp3 = tmp10 - tmp13;
-    tmp1 = tmp11 + tmp12;
-    tmp2 = tmp11 - tmp12;
-
-    /* Odd part */
-
-    z13 = wsptr[5] + wsptr[3];
-    z10 = wsptr[5] - wsptr[3];
-    z11 = wsptr[1] + wsptr[7];
-    z12 = wsptr[1] - wsptr[7];
-
-    tmp7 = z11 + z13;
-    tmp11 = (z11 - z13) * ((FAST_FLOAT) 1.414213562);
-
-    z5 = (z10 + z12) * ((FAST_FLOAT) 1.847759065); /* 2*c2 */
-    tmp10 = ((FAST_FLOAT) 1.082392200) * z12 - z5; /* 2*(c2-c6) */
-    tmp12 = ((FAST_FLOAT) -2.613125930) * z10 + z5; /* -2*(c2+c6) */
-
-    tmp6 = tmp12 - tmp7;
-    tmp5 = tmp11 - tmp6;
-    tmp4 = tmp10 + tmp5;
-
-    /* Final output stage: scale down by a factor of 8 and range-limit */
-
-    outptr[0] = range_limit[(int) DESCALE((JPEG_INT32) (tmp0 + tmp7), 3)
-			    & RANGE_MASK];
-    outptr[7] = range_limit[(int) DESCALE((JPEG_INT32) (tmp0 - tmp7), 3)
-			    & RANGE_MASK];
-    outptr[1] = range_limit[(int) DESCALE((JPEG_INT32) (tmp1 + tmp6), 3)
-			    & RANGE_MASK];
-    outptr[6] = range_limit[(int) DESCALE((JPEG_INT32) (tmp1 - tmp6), 3)
-			    & RANGE_MASK];
-    outptr[2] = range_limit[(int) DESCALE((JPEG_INT32) (tmp2 + tmp5), 3)
-			    & RANGE_MASK];
-    outptr[5] = range_limit[(int) DESCALE((JPEG_INT32) (tmp2 - tmp5), 3)
-			    & RANGE_MASK];
-    outptr[4] = range_limit[(int) DESCALE((JPEG_INT32) (tmp3 + tmp4), 3)
-			    & RANGE_MASK];
-    outptr[3] = range_limit[(int) DESCALE((JPEG_INT32) (tmp3 - tmp4), 3)
-			    & RANGE_MASK];
-    
-    wsptr += DCTSIZE;		/* advance pointer to next row */
-  }
-}
-
-#endif /* DCT_FLOAT_SUPPORTED */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jidctfst.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jidctfst.c
deleted file mode 100644
index d388b61783..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jidctfst.c
+++ /dev/null
@@ -1,368 +0,0 @@
-/*
- * jidctfst.c
- *
- * Copyright (C) 1994-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains a fast, not so accurate integer implementation of the
- * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine
- * must also perform dequantization of the input coefficients.
- *
- * A 2-D IDCT can be done by 1-D IDCT on each column followed by 1-D IDCT
- * on each row (or vice versa, but it's more convenient to emit a row at
- * a time).  Direct algorithms are also available, but they are much more
- * complex and seem not to be any faster when reduced to code.
- *
- * This implementation is based on Arai, Agui, and Nakajima's algorithm for
- * scaled DCT.  Their original paper (Trans. IEICE E-71(11):1095) is in
- * Japanese, but the algorithm is described in the Pennebaker & Mitchell
- * JPEG textbook (see REFERENCES section in file README).  The following code
- * is based directly on figure 4-8 in P&M.
- * While an 8-point DCT cannot be done in less than 11 multiplies, it is
- * possible to arrange the computation so that many of the multiplies are
- * simple scalings of the final outputs.  These multiplies can then be
- * folded into the multiplications or divisions by the JPEG quantization
- * table entries.  The AA&N method leaves only 5 multiplies and 29 adds
- * to be done in the DCT itself.
- * The primary disadvantage of this method is that with fixed-point math,
- * accuracy is lost due to imprecise representation of the scaled
- * quantization values.  The smaller the quantization table entry, the less
- * precise the scaled value, so this implementation does worse with high-
- * quality-setting files than with low-quality ones.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-#ifdef DCT_IFAST_SUPPORTED
-
-
-/*
- * This module is specialized to the case DCTSIZE = 8.
- */
-
-#if DCTSIZE != 8
-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
-#endif
-
-
-/* Scaling decisions are generally the same as in the LL&M algorithm;
- * see jidctint.c for more details.  However, we choose to descale
- * (right shift) multiplication products as soon as they are formed,
- * rather than carrying additional fractional bits into subsequent additions.
- * This compromises accuracy slightly, but it lets us save a few shifts.
- * More importantly, 16-bit arithmetic is then adequate (for 8-bit samples)
- * everywhere except in the multiplications proper; this saves a good deal
- * of work on 16-bit-int machines.
- *
- * The dequantized coefficients are not integers because the AA&N scaling
- * factors have been incorporated.  We represent them scaled up by PASS1_BITS,
- * so that the first and second IDCT rounds have the same input scaling.
- * For 8-bit JSAMPLEs, we choose IFAST_SCALE_BITS = PASS1_BITS so as to
- * avoid a descaling shift; this compromises accuracy rather drastically
- * for small quantization table entries, but it saves a lot of shifts.
- * For 12-bit JSAMPLEs, there's no hope of using 16x16 multiplies anyway,
- * so we use a much larger scaling factor to preserve accuracy.
- *
- * A final compromise is to represent the multiplicative constants to only
- * 8 fractional bits, rather than 13.  This saves some shifting work on some
- * machines, and may also reduce the cost of multiplication (since there
- * are fewer one-bits in the constants).
- */
-
-#if BITS_IN_JSAMPLE == 8
-#define CONST_BITS  8
-#define PASS1_BITS  2
-#else
-#define CONST_BITS  8
-#define PASS1_BITS  1		/* lose a little precision to avoid overflow */
-#endif
-
-/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
- * causing a lot of useless floating-point operations at run time.
- * To get around this we use the following pre-calculated constants.
- * If you change CONST_BITS you may want to add appropriate values.
- * (With a reasonable C compiler, you can just rely on the FIX() macro...)
- */
-
-#if CONST_BITS == 8
-#define FIX_1_082392200  ((JPEG_INT32)  277)		/* FIX(1.082392200) */
-#define FIX_1_414213562  ((JPEG_INT32)  362)		/* FIX(1.414213562) */
-#define FIX_1_847759065  ((JPEG_INT32)  473)		/* FIX(1.847759065) */
-#define FIX_2_613125930  ((JPEG_INT32)  669)		/* FIX(2.613125930) */
-#else
-#define FIX_1_082392200  FIX(1.082392200)
-#define FIX_1_414213562  FIX(1.414213562)
-#define FIX_1_847759065  FIX(1.847759065)
-#define FIX_2_613125930  FIX(2.613125930)
-#endif
-
-
-/* We can gain a little more speed, with a further compromise in accuracy,
- * by omitting the addition in a descaling shift.  This yields an incorrectly
- * rounded result half the time...
- */
-
-#ifndef USE_ACCURATE_ROUNDING
-#undef DESCALE
-#define DESCALE(x,n)  RIGHT_SHIFT(x, n)
-#endif
-
-
-/* Multiply a DCTELEM variable by an INT32 constant, and immediately
- * descale to yield a DCTELEM result.
- */
-
-#define MULTIPLY(var,const)  ((DCTELEM) DESCALE((var) * (const), CONST_BITS))
-
-
-/* Dequantize a coefficient by multiplying it by the multiplier-table
- * entry; produce a DCTELEM result.  For 8-bit data a 16x16->16
- * multiplication will do.  For 12-bit data, the multiplier table is
- * declared INT32, so a 32-bit multiply will be used.
- */
-
-#if BITS_IN_JSAMPLE == 8
-#define DEQUANTIZE(coef,quantval)  (((IFAST_MULT_TYPE) (coef)) * (quantval))
-#else
-#define DEQUANTIZE(coef,quantval)  \
-	DESCALE((coef)*(quantval), IFAST_SCALE_BITS-PASS1_BITS)
-#endif
-
-
-/* Like DESCALE, but applies to a DCTELEM and produces an int.
- * We assume that int right shift is unsigned if INT32 right shift is.
- */
-
-#ifdef RIGHT_SHIFT_IS_UNSIGNED
-#define ISHIFT_TEMPS	DCTELEM ishift_temp;
-#if BITS_IN_JSAMPLE == 8
-#define DCTELEMBITS  16		/* DCTELEM may be 16 or 32 bits */
-#else
-#define DCTELEMBITS  32		/* DCTELEM must be 32 bits */
-#endif
-#define IRIGHT_SHIFT(x,shft)  \
-    ((ishift_temp = (x)) < 0 ? \
-     (ishift_temp >> (shft)) | ((~((DCTELEM) 0)) << (DCTELEMBITS-(shft))) : \
-     (ishift_temp >> (shft)))
-#else
-#define ISHIFT_TEMPS
-#define IRIGHT_SHIFT(x,shft)	((x) >> (shft))
-#endif
-
-#ifdef USE_ACCURATE_ROUNDING
-#define IDESCALE(x,n)  ((int) IRIGHT_SHIFT((x) + (1 << ((n)-1)), n))
-#else
-#define IDESCALE(x,n)  ((int) IRIGHT_SHIFT(x, n))
-#endif
-
-
-/*
- * Perform dequantization and inverse DCT on one block of coefficients.
- */
-
-GLOBAL(void)
-jpeg_idct_ifast (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		 JCOEFPTR coef_block,
-		 JSAMPARRAY output_buf, JDIMENSION output_col)
-{
-  DCTELEM tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
-  DCTELEM tmp10, tmp11, tmp12, tmp13;
-  DCTELEM z5, z10, z11, z12, z13;
-  JCOEFPTR inptr;
-  IFAST_MULT_TYPE * quantptr;
-  int * wsptr;
-  JSAMPROW outptr;
-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
-  int ctr;
-  int workspace[DCTSIZE2];	/* buffers data between passes */
-  SHIFT_TEMPS			/* for DESCALE */
-  ISHIFT_TEMPS			/* for IDESCALE */
-
-  /* Pass 1: process columns from input, store into work array. */
-
-  inptr = coef_block;
-  quantptr = (IFAST_MULT_TYPE *) compptr->dct_table;
-  wsptr = workspace;
-  for (ctr = DCTSIZE; ctr > 0; ctr--) {
-    /* Due to quantization, we will usually find that many of the input
-     * coefficients are zero, especially the AC terms.  We can exploit this
-     * by short-circuiting the IDCT calculation for any column in which all
-     * the AC terms are zero.  In that case each output is equal to the
-     * DC coefficient (with scale factor as needed).
-     * With typical images and quantization tables, half or more of the
-     * column DCT calculations can be simplified this way.
-     */
-    
-    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&
-	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*4] == 0 &&
-	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*6] == 0 &&
-	inptr[DCTSIZE*7] == 0) {
-      /* AC terms all zero */
-      int dcval = (int) DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
-
-      wsptr[DCTSIZE*0] = dcval;
-      wsptr[DCTSIZE*1] = dcval;
-      wsptr[DCTSIZE*2] = dcval;
-      wsptr[DCTSIZE*3] = dcval;
-      wsptr[DCTSIZE*4] = dcval;
-      wsptr[DCTSIZE*5] = dcval;
-      wsptr[DCTSIZE*6] = dcval;
-      wsptr[DCTSIZE*7] = dcval;
-      
-      inptr++;			/* advance pointers to next column */
-      quantptr++;
-      wsptr++;
-      continue;
-    }
-    
-    /* Even part */
-
-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
-    tmp1 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);
-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);
-    tmp3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);
-
-    tmp10 = tmp0 + tmp2;	/* phase 3 */
-    tmp11 = tmp0 - tmp2;
-
-    tmp13 = tmp1 + tmp3;	/* phases 5-3 */
-    tmp12 = MULTIPLY(tmp1 - tmp3, FIX_1_414213562) - tmp13; /* 2*c4 */
-
-    tmp0 = tmp10 + tmp13;	/* phase 2 */
-    tmp3 = tmp10 - tmp13;
-    tmp1 = tmp11 + tmp12;
-    tmp2 = tmp11 - tmp12;
-    
-    /* Odd part */
-
-    tmp4 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
-    tmp5 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
-    tmp6 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
-    tmp7 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
-
-    z13 = tmp6 + tmp5;		/* phase 6 */
-    z10 = tmp6 - tmp5;
-    z11 = tmp4 + tmp7;
-    z12 = tmp4 - tmp7;
-
-    tmp7 = z11 + z13;		/* phase 5 */
-    tmp11 = MULTIPLY(z11 - z13, FIX_1_414213562); /* 2*c4 */
-
-    z5 = MULTIPLY(z10 + z12, FIX_1_847759065); /* 2*c2 */
-    tmp10 = MULTIPLY(z12, FIX_1_082392200) - z5; /* 2*(c2-c6) */
-    tmp12 = MULTIPLY(z10, - FIX_2_613125930) + z5; /* -2*(c2+c6) */
-
-    tmp6 = tmp12 - tmp7;	/* phase 2 */
-    tmp5 = tmp11 - tmp6;
-    tmp4 = tmp10 + tmp5;
-
-    wsptr[DCTSIZE*0] = (int) (tmp0 + tmp7);
-    wsptr[DCTSIZE*7] = (int) (tmp0 - tmp7);
-    wsptr[DCTSIZE*1] = (int) (tmp1 + tmp6);
-    wsptr[DCTSIZE*6] = (int) (tmp1 - tmp6);
-    wsptr[DCTSIZE*2] = (int) (tmp2 + tmp5);
-    wsptr[DCTSIZE*5] = (int) (tmp2 - tmp5);
-    wsptr[DCTSIZE*4] = (int) (tmp3 + tmp4);
-    wsptr[DCTSIZE*3] = (int) (tmp3 - tmp4);
-
-    inptr++;			/* advance pointers to next column */
-    quantptr++;
-    wsptr++;
-  }
-  
-  /* Pass 2: process rows from work array, store into output array. */
-  /* Note that we must descale the results by a factor of 8 == 2**3, */
-  /* and also undo the PASS1_BITS scaling. */
-
-  wsptr = workspace;
-  for (ctr = 0; ctr < DCTSIZE; ctr++) {
-    outptr = output_buf[ctr] + output_col;
-    /* Rows of zeroes can be exploited in the same way as we did with columns.
-     * However, the column calculation has created many nonzero AC terms, so
-     * the simplification applies less often (typically 5% to 10% of the time).
-     * On machines with very fast multiplication, it's possible that the
-     * test takes more time than it's worth.  In that case this section
-     * may be commented out.
-     */
-    
-#ifndef NO_ZERO_ROW_TEST
-    if (wsptr[1] == 0 && wsptr[2] == 0 && wsptr[3] == 0 && wsptr[4] == 0 &&
-	wsptr[5] == 0 && wsptr[6] == 0 && wsptr[7] == 0) {
-      /* AC terms all zero */
-      JSAMPLE dcval = range_limit[IDESCALE(wsptr[0], PASS1_BITS+3)
-				  & RANGE_MASK];
-      
-      outptr[0] = dcval;
-      outptr[1] = dcval;
-      outptr[2] = dcval;
-      outptr[3] = dcval;
-      outptr[4] = dcval;
-      outptr[5] = dcval;
-      outptr[6] = dcval;
-      outptr[7] = dcval;
-
-      wsptr += DCTSIZE;		/* advance pointer to next row */
-      continue;
-    }
-#endif
-    
-    /* Even part */
-
-    tmp10 = ((DCTELEM) wsptr[0] + (DCTELEM) wsptr[4]);
-    tmp11 = ((DCTELEM) wsptr[0] - (DCTELEM) wsptr[4]);
-
-    tmp13 = ((DCTELEM) wsptr[2] + (DCTELEM) wsptr[6]);
-    tmp12 = MULTIPLY((DCTELEM) wsptr[2] - (DCTELEM) wsptr[6], FIX_1_414213562)
-	    - tmp13;
-
-    tmp0 = tmp10 + tmp13;
-    tmp3 = tmp10 - tmp13;
-    tmp1 = tmp11 + tmp12;
-    tmp2 = tmp11 - tmp12;
-
-    /* Odd part */
-
-    z13 = (DCTELEM) wsptr[5] + (DCTELEM) wsptr[3];
-    z10 = (DCTELEM) wsptr[5] - (DCTELEM) wsptr[3];
-    z11 = (DCTELEM) wsptr[1] + (DCTELEM) wsptr[7];
-    z12 = (DCTELEM) wsptr[1] - (DCTELEM) wsptr[7];
-
-    tmp7 = z11 + z13;		/* phase 5 */
-    tmp11 = MULTIPLY(z11 - z13, FIX_1_414213562); /* 2*c4 */
-
-    z5 = MULTIPLY(z10 + z12, FIX_1_847759065); /* 2*c2 */
-    tmp10 = MULTIPLY(z12, FIX_1_082392200) - z5; /* 2*(c2-c6) */
-    tmp12 = MULTIPLY(z10, - FIX_2_613125930) + z5; /* -2*(c2+c6) */
-
-    tmp6 = tmp12 - tmp7;	/* phase 2 */
-    tmp5 = tmp11 - tmp6;
-    tmp4 = tmp10 + tmp5;
-
-    /* Final output stage: scale down by a factor of 8 and range-limit */
-
-    outptr[0] = range_limit[IDESCALE(tmp0 + tmp7, PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[7] = range_limit[IDESCALE(tmp0 - tmp7, PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[1] = range_limit[IDESCALE(tmp1 + tmp6, PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[6] = range_limit[IDESCALE(tmp1 - tmp6, PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[2] = range_limit[IDESCALE(tmp2 + tmp5, PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[5] = range_limit[IDESCALE(tmp2 - tmp5, PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[4] = range_limit[IDESCALE(tmp3 + tmp4, PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[3] = range_limit[IDESCALE(tmp3 - tmp4, PASS1_BITS+3)
-			    & RANGE_MASK];
-
-    wsptr += DCTSIZE;		/* advance pointer to next row */
-  }
-}
-
-#endif /* DCT_IFAST_SUPPORTED */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jidctint.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jidctint.c
deleted file mode 100644
index 2783c23027..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jidctint.c
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * jidctint.c
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains a slow-but-accurate integer implementation of the
- * inverse DCT (Discrete Cosine Transform).  In the IJG code, this routine
- * must also perform dequantization of the input coefficients.
- *
- * A 2-D IDCT can be done by 1-D IDCT on each column followed by 1-D IDCT
- * on each row (or vice versa, but it's more convenient to emit a row at
- * a time).  Direct algorithms are also available, but they are much more
- * complex and seem not to be any faster when reduced to code.
- *
- * This implementation is based on an algorithm described in
- *   C. Loeffler, A. Ligtenberg and G. Moschytz, "Practical Fast 1-D DCT
- *   Algorithms with 11 Multiplications", Proc. Int'l. Conf. on Acoustics,
- *   Speech, and Signal Processing 1989 (ICASSP '89), pp. 988-991.
- * The primary algorithm described there uses 11 multiplies and 29 adds.
- * We use their alternate method with 12 multiplies and 32 adds.
- * The advantage of this method is that no data path contains more than one
- * multiplication; this allows a very simple and accurate implementation in
- * scaled fixed-point arithmetic, with a minimal number of shifts.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-#ifdef DCT_ISLOW_SUPPORTED
-
-
-/*
- * This module is specialized to the case DCTSIZE = 8.
- */
-
-#if DCTSIZE != 8
-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
-#endif
-
-
-/*
- * The poop on this scaling stuff is as follows:
- *
- * Each 1-D IDCT step produces outputs which are a factor of sqrt(N)
- * larger than the true IDCT outputs.  The final outputs are therefore
- * a factor of N larger than desired; since N=8 this can be cured by
- * a simple right shift at the end of the algorithm.  The advantage of
- * this arrangement is that we save two multiplications per 1-D IDCT,
- * because the y0 and y4 inputs need not be divided by sqrt(N).
- *
- * We have to do addition and subtraction of the integer inputs, which
- * is no problem, and multiplication by fractional constants, which is
- * a problem to do in integer arithmetic.  We multiply all the constants
- * by CONST_SCALE and convert them to integer constants (thus retaining
- * CONST_BITS bits of precision in the constants).  After doing a
- * multiplication we have to divide the product by CONST_SCALE, with proper
- * rounding, to produce the correct output.  This division can be done
- * cheaply as a right shift of CONST_BITS bits.  We postpone shifting
- * as long as possible so that partial sums can be added together with
- * full fractional precision.
- *
- * The outputs of the first pass are scaled up by PASS1_BITS bits so that
- * they are represented to better-than-integral precision.  These outputs
- * require BITS_IN_JSAMPLE + PASS1_BITS + 3 bits; this fits in a 16-bit word
- * with the recommended scaling.  (To scale up 12-bit sample data further, an
- * intermediate INT32 array would be needed.)
- *
- * To avoid overflow of the 32-bit intermediate results in pass 2, we must
- * have BITS_IN_JSAMPLE + CONST_BITS + PASS1_BITS <= 26.  Error analysis
- * shows that the values given below are the most effective.
- */
-
-#if BITS_IN_JSAMPLE == 8
-#define CONST_BITS  13
-#define PASS1_BITS  2
-#else
-#define CONST_BITS  13
-#define PASS1_BITS  1		/* lose a little precision to avoid overflow */
-#endif
-
-/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
- * causing a lot of useless floating-point operations at run time.
- * To get around this we use the following pre-calculated constants.
- * If you change CONST_BITS you may want to add appropriate values.
- * (With a reasonable C compiler, you can just rely on the FIX() macro...)
- */
-
-#if CONST_BITS == 13
-#define FIX_0_298631336  ((JPEG_INT32)  2446)	/* FIX(0.298631336) */
-#define FIX_0_390180644  ((JPEG_INT32)  3196)	/* FIX(0.390180644) */
-#define FIX_0_541196100  ((JPEG_INT32)  4433)	/* FIX(0.541196100) */
-#define FIX_0_765366865  ((JPEG_INT32)  6270)	/* FIX(0.765366865) */
-#define FIX_0_899976223  ((JPEG_INT32)  7373)	/* FIX(0.899976223) */
-#define FIX_1_175875602  ((JPEG_INT32)  9633)	/* FIX(1.175875602) */
-#define FIX_1_501321110  ((JPEG_INT32)  12299)	/* FIX(1.501321110) */
-#define FIX_1_847759065  ((JPEG_INT32)  15137)	/* FIX(1.847759065) */
-#define FIX_1_961570560  ((JPEG_INT32)  16069)	/* FIX(1.961570560) */
-#define FIX_2_053119869  ((JPEG_INT32)  16819)	/* FIX(2.053119869) */
-#define FIX_2_562915447  ((JPEG_INT32)  20995)	/* FIX(2.562915447) */
-#define FIX_3_072711026  ((JPEG_INT32)  25172)	/* FIX(3.072711026) */
-#else
-#define FIX_0_298631336  FIX(0.298631336)
-#define FIX_0_390180644  FIX(0.390180644)
-#define FIX_0_541196100  FIX(0.541196100)
-#define FIX_0_765366865  FIX(0.765366865)
-#define FIX_0_899976223  FIX(0.899976223)
-#define FIX_1_175875602  FIX(1.175875602)
-#define FIX_1_501321110  FIX(1.501321110)
-#define FIX_1_847759065  FIX(1.847759065)
-#define FIX_1_961570560  FIX(1.961570560)
-#define FIX_2_053119869  FIX(2.053119869)
-#define FIX_2_562915447  FIX(2.562915447)
-#define FIX_3_072711026  FIX(3.072711026)
-#endif
-
-
-/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.
- * For 8-bit samples with the recommended scaling, all the variable
- * and constant values involved are no more than 16 bits wide, so a
- * 16x16->32 bit multiply can be used instead of a full 32x32 multiply.
- * For 12-bit samples, a full 32-bit multiplication will be needed.
- */
-
-#if BITS_IN_JSAMPLE == 8
-#define MULTIPLY(var,const)  MULTIPLY16C16(var,const)
-#else
-#define MULTIPLY(var,const)  ((var) * (const))
-#endif
-
-
-/* Dequantize a coefficient by multiplying it by the multiplier-table
- * entry; produce an int result.  In this module, both inputs and result
- * are 16 bits or less, so either int or short multiply will work.
- */
-
-#define DEQUANTIZE(coef,quantval)  (((ISLOW_MULT_TYPE) (coef)) * (quantval))
-
-
-/*
- * Perform dequantization and inverse DCT on one block of coefficients.
- */
-
-GLOBAL(void)
-jpeg_idct_islow (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		 JCOEFPTR coef_block,
-		 JSAMPARRAY output_buf, JDIMENSION output_col)
-{
-  JPEG_INT32 tmp0, tmp1, tmp2, tmp3;
-  JPEG_INT32 tmp10, tmp11, tmp12, tmp13;
-  JPEG_INT32 z1, z2, z3, z4, z5;
-  JCOEFPTR inptr;
-  ISLOW_MULT_TYPE * quantptr;
-  int * wsptr;
-  JSAMPROW outptr;
-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
-  int ctr;
-  int workspace[DCTSIZE2];	/* buffers data between passes */
-  SHIFT_TEMPS
-
-  /* Pass 1: process columns from input, store into work array. */
-  /* Note results are scaled up by sqrt(8) compared to a true IDCT; */
-  /* furthermore, we scale the results by 2**PASS1_BITS. */
-
-  inptr = coef_block;
-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;
-  wsptr = workspace;
-  for (ctr = DCTSIZE; ctr > 0; ctr--) {
-    /* Due to quantization, we will usually find that many of the input
-     * coefficients are zero, especially the AC terms.  We can exploit this
-     * by short-circuiting the IDCT calculation for any column in which all
-     * the AC terms are zero.  In that case each output is equal to the
-     * DC coefficient (with scale factor as needed).
-     * With typical images and quantization tables, half or more of the
-     * column DCT calculations can be simplified this way.
-     */
-    
-    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&
-	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*4] == 0 &&
-	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*6] == 0 &&
-	inptr[DCTSIZE*7] == 0) {
-      /* AC terms all zero */
-      int dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]) << PASS1_BITS;
-      
-      wsptr[DCTSIZE*0] = dcval;
-      wsptr[DCTSIZE*1] = dcval;
-      wsptr[DCTSIZE*2] = dcval;
-      wsptr[DCTSIZE*3] = dcval;
-      wsptr[DCTSIZE*4] = dcval;
-      wsptr[DCTSIZE*5] = dcval;
-      wsptr[DCTSIZE*6] = dcval;
-      wsptr[DCTSIZE*7] = dcval;
-      
-      inptr++;			/* advance pointers to next column */
-      quantptr++;
-      wsptr++;
-      continue;
-    }
-    
-    /* Even part: reverse the even part of the forward DCT. */
-    /* The rotator is sqrt(2)*c(-6). */
-    
-    z2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);
-    z3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);
-    
-    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);
-    tmp2 = z1 + MULTIPLY(z3, - FIX_1_847759065);
-    tmp3 = z1 + MULTIPLY(z2, FIX_0_765366865);
-    
-    z2 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
-    z3 = DEQUANTIZE(inptr[DCTSIZE*4], quantptr[DCTSIZE*4]);
-
-    tmp0 = (z2 + z3) << CONST_BITS;
-    tmp1 = (z2 - z3) << CONST_BITS;
-    
-    tmp10 = tmp0 + tmp3;
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    /* Odd part per figure 8; the matrix is unitary and hence its
-     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.
-     */
-    
-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
-    tmp1 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
-    tmp2 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
-    tmp3 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
-    
-    z1 = tmp0 + tmp3;
-    z2 = tmp1 + tmp2;
-    z3 = tmp0 + tmp2;
-    z4 = tmp1 + tmp3;
-    z5 = MULTIPLY(z3 + z4, FIX_1_175875602); /* sqrt(2) * c3 */
-    
-    tmp0 = MULTIPLY(tmp0, FIX_0_298631336); /* sqrt(2) * (-c1+c3+c5-c7) */
-    tmp1 = MULTIPLY(tmp1, FIX_2_053119869); /* sqrt(2) * ( c1+c3-c5+c7) */
-    tmp2 = MULTIPLY(tmp2, FIX_3_072711026); /* sqrt(2) * ( c1+c3+c5-c7) */
-    tmp3 = MULTIPLY(tmp3, FIX_1_501321110); /* sqrt(2) * ( c1+c3-c5-c7) */
-    z1 = MULTIPLY(z1, - FIX_0_899976223); /* sqrt(2) * (c7-c3) */
-    z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */
-    z3 = MULTIPLY(z3, - FIX_1_961570560); /* sqrt(2) * (-c3-c5) */
-    z4 = MULTIPLY(z4, - FIX_0_390180644); /* sqrt(2) * (c5-c3) */
-    
-    z3 += z5;
-    z4 += z5;
-    
-    tmp0 += z1 + z3;
-    tmp1 += z2 + z4;
-    tmp2 += z2 + z3;
-    tmp3 += z1 + z4;
-    
-    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */
-    
-    wsptr[DCTSIZE*0] = (int) DESCALE(tmp10 + tmp3, CONST_BITS-PASS1_BITS);
-    wsptr[DCTSIZE*7] = (int) DESCALE(tmp10 - tmp3, CONST_BITS-PASS1_BITS);
-    wsptr[DCTSIZE*1] = (int) DESCALE(tmp11 + tmp2, CONST_BITS-PASS1_BITS);
-    wsptr[DCTSIZE*6] = (int) DESCALE(tmp11 - tmp2, CONST_BITS-PASS1_BITS);
-    wsptr[DCTSIZE*2] = (int) DESCALE(tmp12 + tmp1, CONST_BITS-PASS1_BITS);
-    wsptr[DCTSIZE*5] = (int) DESCALE(tmp12 - tmp1, CONST_BITS-PASS1_BITS);
-    wsptr[DCTSIZE*3] = (int) DESCALE(tmp13 + tmp0, CONST_BITS-PASS1_BITS);
-    wsptr[DCTSIZE*4] = (int) DESCALE(tmp13 - tmp0, CONST_BITS-PASS1_BITS);
-    
-    inptr++;			/* advance pointers to next column */
-    quantptr++;
-    wsptr++;
-  }
-  
-  /* Pass 2: process rows from work array, store into output array. */
-  /* Note that we must descale the results by a factor of 8 == 2**3, */
-  /* and also undo the PASS1_BITS scaling. */
-
-  wsptr = workspace;
-  for (ctr = 0; ctr < DCTSIZE; ctr++) {
-    outptr = output_buf[ctr] + output_col;
-    /* Rows of zeroes can be exploited in the same way as we did with columns.
-     * However, the column calculation has created many nonzero AC terms, so
-     * the simplification applies less often (typically 5% to 10% of the time).
-     * On machines with very fast multiplication, it's possible that the
-     * test takes more time than it's worth.  In that case this section
-     * may be commented out.
-     */
-    
-#ifndef NO_ZERO_ROW_TEST
-    if (wsptr[1] == 0 && wsptr[2] == 0 && wsptr[3] == 0 && wsptr[4] == 0 &&
-	wsptr[5] == 0 && wsptr[6] == 0 && wsptr[7] == 0) {
-      /* AC terms all zero */
-      JSAMPLE dcval = range_limit[(int) DESCALE((JPEG_INT32) wsptr[0], PASS1_BITS+3)
-				  & RANGE_MASK];
-      
-      outptr[0] = dcval;
-      outptr[1] = dcval;
-      outptr[2] = dcval;
-      outptr[3] = dcval;
-      outptr[4] = dcval;
-      outptr[5] = dcval;
-      outptr[6] = dcval;
-      outptr[7] = dcval;
-
-      wsptr += DCTSIZE;		/* advance pointer to next row */
-      continue;
-    }
-#endif
-    
-    /* Even part: reverse the even part of the forward DCT. */
-    /* The rotator is sqrt(2)*c(-6). */
-    
-    z2 = (JPEG_INT32) wsptr[2];
-    z3 = (JPEG_INT32) wsptr[6];
-    
-    z1 = MULTIPLY(z2 + z3, FIX_0_541196100);
-    tmp2 = z1 + MULTIPLY(z3, - FIX_1_847759065);
-    tmp3 = z1 + MULTIPLY(z2, FIX_0_765366865);
-    
-    tmp0 = ((JPEG_INT32) wsptr[0] + (JPEG_INT32) wsptr[4]) << CONST_BITS;
-    tmp1 = ((JPEG_INT32) wsptr[0] - (JPEG_INT32) wsptr[4]) << CONST_BITS;
-    
-    tmp10 = tmp0 + tmp3;
-    tmp13 = tmp0 - tmp3;
-    tmp11 = tmp1 + tmp2;
-    tmp12 = tmp1 - tmp2;
-    
-    /* Odd part per figure 8; the matrix is unitary and hence its
-     * transpose is its inverse.  i0..i3 are y7,y5,y3,y1 respectively.
-     */
-    
-    tmp0 = (JPEG_INT32) wsptr[7];
-    tmp1 = (JPEG_INT32) wsptr[5];
-    tmp2 = (JPEG_INT32) wsptr[3];
-    tmp3 = (JPEG_INT32) wsptr[1];
-    
-    z1 = tmp0 + tmp3;
-    z2 = tmp1 + tmp2;
-    z3 = tmp0 + tmp2;
-    z4 = tmp1 + tmp3;
-    z5 = MULTIPLY(z3 + z4, FIX_1_175875602); /* sqrt(2) * c3 */
-    
-    tmp0 = MULTIPLY(tmp0, FIX_0_298631336); /* sqrt(2) * (-c1+c3+c5-c7) */
-    tmp1 = MULTIPLY(tmp1, FIX_2_053119869); /* sqrt(2) * ( c1+c3-c5+c7) */
-    tmp2 = MULTIPLY(tmp2, FIX_3_072711026); /* sqrt(2) * ( c1+c3+c5-c7) */
-    tmp3 = MULTIPLY(tmp3, FIX_1_501321110); /* sqrt(2) * ( c1+c3-c5-c7) */
-    z1 = MULTIPLY(z1, - FIX_0_899976223); /* sqrt(2) * (c7-c3) */
-    z2 = MULTIPLY(z2, - FIX_2_562915447); /* sqrt(2) * (-c1-c3) */
-    z3 = MULTIPLY(z3, - FIX_1_961570560); /* sqrt(2) * (-c3-c5) */
-    z4 = MULTIPLY(z4, - FIX_0_390180644); /* sqrt(2) * (c5-c3) */
-    
-    z3 += z5;
-    z4 += z5;
-    
-    tmp0 += z1 + z3;
-    tmp1 += z2 + z4;
-    tmp2 += z2 + z3;
-    tmp3 += z1 + z4;
-    
-    /* Final output stage: inputs are tmp10..tmp13, tmp0..tmp3 */
-    
-    outptr[0] = range_limit[(int) DESCALE(tmp10 + tmp3,
-					  CONST_BITS+PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[7] = range_limit[(int) DESCALE(tmp10 - tmp3,
-					  CONST_BITS+PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[1] = range_limit[(int) DESCALE(tmp11 + tmp2,
-					  CONST_BITS+PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[6] = range_limit[(int) DESCALE(tmp11 - tmp2,
-					  CONST_BITS+PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[2] = range_limit[(int) DESCALE(tmp12 + tmp1,
-					  CONST_BITS+PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[5] = range_limit[(int) DESCALE(tmp12 - tmp1,
-					  CONST_BITS+PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[3] = range_limit[(int) DESCALE(tmp13 + tmp0,
-					  CONST_BITS+PASS1_BITS+3)
-			    & RANGE_MASK];
-    outptr[4] = range_limit[(int) DESCALE(tmp13 - tmp0,
-					  CONST_BITS+PASS1_BITS+3)
-			    & RANGE_MASK];
-    
-    wsptr += DCTSIZE;		/* advance pointer to next row */
-  }
-}
-
-#endif /* DCT_ISLOW_SUPPORTED */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jidctred.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jidctred.c
deleted file mode 100644
index efda35aeb5..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jidctred.c
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
- * jidctred.c
- *
- * Copyright (C) 1994-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains inverse-DCT routines that produce reduced-size output:
- * either 4x4, 2x2, or 1x1 pixels from an 8x8 DCT block.
- *
- * The implementation is based on the Loeffler, Ligtenberg and Moschytz (LL&M)
- * algorithm used in jidctint.c.  We simply replace each 8-to-8 1-D IDCT step
- * with an 8-to-4 step that produces the four averages of two adjacent outputs
- * (or an 8-to-2 step producing two averages of four outputs, for 2x2 output).
- * These steps were derived by computing the corresponding values at the end
- * of the normal LL&M code, then simplifying as much as possible.
- *
- * 1x1 is trivial: just take the DC coefficient divided by 8.
- *
- * See jidctint.c for additional comments.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jdct.h"		/* Private declarations for DCT subsystem */
-
-#ifdef IDCT_SCALING_SUPPORTED
-
-
-/*
- * This module is specialized to the case DCTSIZE = 8.
- */
-
-#if DCTSIZE != 8
-  Sorry, this code only copes with 8x8 DCTs. /* deliberate syntax err */
-#endif
-
-
-/* Scaling is the same as in jidctint.c. */
-
-#if BITS_IN_JSAMPLE == 8
-#define CONST_BITS  13
-#define PASS1_BITS  2
-#else
-#define CONST_BITS  13
-#define PASS1_BITS  1		/* lose a little precision to avoid overflow */
-#endif
-
-/* Some C compilers fail to reduce "FIX(constant)" at compile time, thus
- * causing a lot of useless floating-point operations at run time.
- * To get around this we use the following pre-calculated constants.
- * If you change CONST_BITS you may want to add appropriate values.
- * (With a reasonable C compiler, you can just rely on the FIX() macro...)
- */
-
-#if CONST_BITS == 13
-#define FIX_0_211164243  ((JPEG_INT32)  1730)	/* FIX(0.211164243) */
-#define FIX_0_509795579  ((JPEG_INT32)  4176)	/* FIX(0.509795579) */
-#define FIX_0_601344887  ((JPEG_INT32)  4926)	/* FIX(0.601344887) */
-#define FIX_0_720959822  ((JPEG_INT32)  5906)	/* FIX(0.720959822) */
-#define FIX_0_765366865  ((JPEG_INT32)  6270)	/* FIX(0.765366865) */
-#define FIX_0_850430095  ((JPEG_INT32)  6967)	/* FIX(0.850430095) */
-#define FIX_0_899976223  ((JPEG_INT32)  7373)	/* FIX(0.899976223) */
-#define FIX_1_061594337  ((JPEG_INT32)  8697)	/* FIX(1.061594337) */
-#define FIX_1_272758580  ((JPEG_INT32)  10426)	/* FIX(1.272758580) */
-#define FIX_1_451774981  ((JPEG_INT32)  11893)	/* FIX(1.451774981) */
-#define FIX_1_847759065  ((JPEG_INT32)  15137)	/* FIX(1.847759065) */
-#define FIX_2_172734803  ((JPEG_INT32)  17799)	/* FIX(2.172734803) */
-#define FIX_2_562915447  ((JPEG_INT32)  20995)	/* FIX(2.562915447) */
-#define FIX_3_624509785  ((JPEG_INT32)  29692)	/* FIX(3.624509785) */
-#else
-#define FIX_0_211164243  FIX(0.211164243)
-#define FIX_0_509795579  FIX(0.509795579)
-#define FIX_0_601344887  FIX(0.601344887)
-#define FIX_0_720959822  FIX(0.720959822)
-#define FIX_0_765366865  FIX(0.765366865)
-#define FIX_0_850430095  FIX(0.850430095)
-#define FIX_0_899976223  FIX(0.899976223)
-#define FIX_1_061594337  FIX(1.061594337)
-#define FIX_1_272758580  FIX(1.272758580)
-#define FIX_1_451774981  FIX(1.451774981)
-#define FIX_1_847759065  FIX(1.847759065)
-#define FIX_2_172734803  FIX(2.172734803)
-#define FIX_2_562915447  FIX(2.562915447)
-#define FIX_3_624509785  FIX(3.624509785)
-#endif
-
-
-/* Multiply an INT32 variable by an INT32 constant to yield an INT32 result.
- * For 8-bit samples with the recommended scaling, all the variable
- * and constant values involved are no more than 16 bits wide, so a
- * 16x16->32 bit multiply can be used instead of a full 32x32 multiply.
- * For 12-bit samples, a full 32-bit multiplication will be needed.
- */
-
-#if BITS_IN_JSAMPLE == 8
-#define MULTIPLY(var,const)  MULTIPLY16C16(var,const)
-#else
-#define MULTIPLY(var,const)  ((var) * (const))
-#endif
-
-
-/* Dequantize a coefficient by multiplying it by the multiplier-table
- * entry; produce an int result.  In this module, both inputs and result
- * are 16 bits or less, so either int or short multiply will work.
- */
-
-#define DEQUANTIZE(coef,quantval)  (((ISLOW_MULT_TYPE) (coef)) * (quantval))
-
-
-/*
- * Perform dequantization and inverse DCT on one block of coefficients,
- * producing a reduced-size 4x4 output block.
- */
-
-GLOBAL(void)
-jpeg_idct_4x4 (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	       JCOEFPTR coef_block,
-	       JSAMPARRAY output_buf, JDIMENSION output_col)
-{
-  JPEG_INT32 tmp0, tmp2, tmp10, tmp12;
-  JPEG_INT32 z1, z2, z3, z4;
-  JCOEFPTR inptr;
-  ISLOW_MULT_TYPE * quantptr;
-  int * wsptr;
-  JSAMPROW outptr;
-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
-  int ctr;
-  int workspace[DCTSIZE*4];	/* buffers data between passes */
-  SHIFT_TEMPS
-
-  /* Pass 1: process columns from input, store into work array. */
-
-  inptr = coef_block;
-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;
-  wsptr = workspace;
-  for (ctr = DCTSIZE; ctr > 0; inptr++, quantptr++, wsptr++, ctr--) {
-    /* Don't bother to process column 4, because second pass won't use it */
-    if (ctr == DCTSIZE-4)
-      continue;
-    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*2] == 0 &&
-	inptr[DCTSIZE*3] == 0 && inptr[DCTSIZE*5] == 0 &&
-	inptr[DCTSIZE*6] == 0 && inptr[DCTSIZE*7] == 0) {
-      /* AC terms all zero; we need not examine term 4 for 4x4 output */
-      int dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]) << PASS1_BITS;
-      
-      wsptr[DCTSIZE*0] = dcval;
-      wsptr[DCTSIZE*1] = dcval;
-      wsptr[DCTSIZE*2] = dcval;
-      wsptr[DCTSIZE*3] = dcval;
-      
-      continue;
-    }
-    
-    /* Even part */
-    
-    tmp0 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
-    tmp0 <<= (CONST_BITS+1);
-    
-    z2 = DEQUANTIZE(inptr[DCTSIZE*2], quantptr[DCTSIZE*2]);
-    z3 = DEQUANTIZE(inptr[DCTSIZE*6], quantptr[DCTSIZE*6]);
-
-    tmp2 = MULTIPLY(z2, FIX_1_847759065) + MULTIPLY(z3, - FIX_0_765366865);
-    
-    tmp10 = tmp0 + tmp2;
-    tmp12 = tmp0 - tmp2;
-    
-    /* Odd part */
-    
-    z1 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
-    z2 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
-    z3 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
-    z4 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
-    
-    tmp0 = MULTIPLY(z1, - FIX_0_211164243) /* sqrt(2) * (c3-c1) */
-	 + MULTIPLY(z2, FIX_1_451774981) /* sqrt(2) * (c3+c7) */
-	 + MULTIPLY(z3, - FIX_2_172734803) /* sqrt(2) * (-c1-c5) */
-	 + MULTIPLY(z4, FIX_1_061594337); /* sqrt(2) * (c5+c7) */
-    
-    tmp2 = MULTIPLY(z1, - FIX_0_509795579) /* sqrt(2) * (c7-c5) */
-	 + MULTIPLY(z2, - FIX_0_601344887) /* sqrt(2) * (c5-c1) */
-	 + MULTIPLY(z3, FIX_0_899976223) /* sqrt(2) * (c3-c7) */
-	 + MULTIPLY(z4, FIX_2_562915447); /* sqrt(2) * (c1+c3) */
-
-    /* Final output stage */
-    
-    wsptr[DCTSIZE*0] = (int) DESCALE(tmp10 + tmp2, CONST_BITS-PASS1_BITS+1);
-    wsptr[DCTSIZE*3] = (int) DESCALE(tmp10 - tmp2, CONST_BITS-PASS1_BITS+1);
-    wsptr[DCTSIZE*1] = (int) DESCALE(tmp12 + tmp0, CONST_BITS-PASS1_BITS+1);
-    wsptr[DCTSIZE*2] = (int) DESCALE(tmp12 - tmp0, CONST_BITS-PASS1_BITS+1);
-  }
-  
-  /* Pass 2: process 4 rows from work array, store into output array. */
-
-  wsptr = workspace;
-  for (ctr = 0; ctr < 4; ctr++) {
-    outptr = output_buf[ctr] + output_col;
-    /* It's not clear whether a zero row test is worthwhile here ... */
-
-#ifndef NO_ZERO_ROW_TEST
-    if (wsptr[1] == 0 && wsptr[2] == 0 && wsptr[3] == 0 &&
-	wsptr[5] == 0 && wsptr[6] == 0 && wsptr[7] == 0) {
-      /* AC terms all zero */
-      JSAMPLE dcval = range_limit[(int) DESCALE((JPEG_INT32) wsptr[0], PASS1_BITS+3)
-				  & RANGE_MASK];
-      
-      outptr[0] = dcval;
-      outptr[1] = dcval;
-      outptr[2] = dcval;
-      outptr[3] = dcval;
-      
-      wsptr += DCTSIZE;		/* advance pointer to next row */
-      continue;
-    }
-#endif
-    
-    /* Even part */
-    
-    tmp0 = ((JPEG_INT32) wsptr[0]) << (CONST_BITS+1);
-    
-    tmp2 = MULTIPLY((JPEG_INT32) wsptr[2], FIX_1_847759065)
-	 + MULTIPLY((JPEG_INT32) wsptr[6], - FIX_0_765366865);
-    
-    tmp10 = tmp0 + tmp2;
-    tmp12 = tmp0 - tmp2;
-    
-    /* Odd part */
-    
-    z1 = (JPEG_INT32) wsptr[7];
-    z2 = (JPEG_INT32) wsptr[5];
-    z3 = (JPEG_INT32) wsptr[3];
-    z4 = (JPEG_INT32) wsptr[1];
-    
-    tmp0 = MULTIPLY(z1, - FIX_0_211164243) /* sqrt(2) * (c3-c1) */
-	 + MULTIPLY(z2, FIX_1_451774981) /* sqrt(2) * (c3+c7) */
-	 + MULTIPLY(z3, - FIX_2_172734803) /* sqrt(2) * (-c1-c5) */
-	 + MULTIPLY(z4, FIX_1_061594337); /* sqrt(2) * (c5+c7) */
-    
-    tmp2 = MULTIPLY(z1, - FIX_0_509795579) /* sqrt(2) * (c7-c5) */
-	 + MULTIPLY(z2, - FIX_0_601344887) /* sqrt(2) * (c5-c1) */
-	 + MULTIPLY(z3, FIX_0_899976223) /* sqrt(2) * (c3-c7) */
-	 + MULTIPLY(z4, FIX_2_562915447); /* sqrt(2) * (c1+c3) */
-
-    /* Final output stage */
-    
-    outptr[0] = range_limit[(int) DESCALE(tmp10 + tmp2,
-					  CONST_BITS+PASS1_BITS+3+1)
-			    & RANGE_MASK];
-    outptr[3] = range_limit[(int) DESCALE(tmp10 - tmp2,
-					  CONST_BITS+PASS1_BITS+3+1)
-			    & RANGE_MASK];
-    outptr[1] = range_limit[(int) DESCALE(tmp12 + tmp0,
-					  CONST_BITS+PASS1_BITS+3+1)
-			    & RANGE_MASK];
-    outptr[2] = range_limit[(int) DESCALE(tmp12 - tmp0,
-					  CONST_BITS+PASS1_BITS+3+1)
-			    & RANGE_MASK];
-    
-    wsptr += DCTSIZE;		/* advance pointer to next row */
-  }
-}
-
-
-/*
- * Perform dequantization and inverse DCT on one block of coefficients,
- * producing a reduced-size 2x2 output block.
- */
-
-GLOBAL(void)
-jpeg_idct_2x2 (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	       JCOEFPTR coef_block,
-	       JSAMPARRAY output_buf, JDIMENSION output_col)
-{
-  JPEG_INT32 tmp0, tmp10, z1;
-  JCOEFPTR inptr;
-  ISLOW_MULT_TYPE * quantptr;
-  int * wsptr;
-  JSAMPROW outptr;
-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
-  int ctr;
-  int workspace[DCTSIZE*2];	/* buffers data between passes */
-  SHIFT_TEMPS
-
-  /* Pass 1: process columns from input, store into work array. */
-
-  inptr = coef_block;
-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;
-  wsptr = workspace;
-  for (ctr = DCTSIZE; ctr > 0; inptr++, quantptr++, wsptr++, ctr--) {
-    /* Don't bother to process columns 2,4,6 */
-    if (ctr == DCTSIZE-2 || ctr == DCTSIZE-4 || ctr == DCTSIZE-6)
-      continue;
-    if (inptr[DCTSIZE*1] == 0 && inptr[DCTSIZE*3] == 0 &&
-	inptr[DCTSIZE*5] == 0 && inptr[DCTSIZE*7] == 0) {
-      /* AC terms all zero; we need not examine terms 2,4,6 for 2x2 output */
-      int dcval = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]) << PASS1_BITS;
-      
-      wsptr[DCTSIZE*0] = dcval;
-      wsptr[DCTSIZE*1] = dcval;
-      
-      continue;
-    }
-    
-    /* Even part */
-    
-    z1 = DEQUANTIZE(inptr[DCTSIZE*0], quantptr[DCTSIZE*0]);
-    tmp10 = z1 << (CONST_BITS+2);
-    
-    /* Odd part */
-
-    z1 = DEQUANTIZE(inptr[DCTSIZE*7], quantptr[DCTSIZE*7]);
-    tmp0 = MULTIPLY(z1, - FIX_0_720959822); /* sqrt(2) * (c7-c5+c3-c1) */
-    z1 = DEQUANTIZE(inptr[DCTSIZE*5], quantptr[DCTSIZE*5]);
-    tmp0 += MULTIPLY(z1, FIX_0_850430095); /* sqrt(2) * (-c1+c3+c5+c7) */
-    z1 = DEQUANTIZE(inptr[DCTSIZE*3], quantptr[DCTSIZE*3]);
-    tmp0 += MULTIPLY(z1, - FIX_1_272758580); /* sqrt(2) * (-c1+c3-c5-c7) */
-    z1 = DEQUANTIZE(inptr[DCTSIZE*1], quantptr[DCTSIZE*1]);
-    tmp0 += MULTIPLY(z1, FIX_3_624509785); /* sqrt(2) * (c1+c3+c5+c7) */
-
-    /* Final output stage */
-    
-    wsptr[DCTSIZE*0] = (int) DESCALE(tmp10 + tmp0, CONST_BITS-PASS1_BITS+2);
-    wsptr[DCTSIZE*1] = (int) DESCALE(tmp10 - tmp0, CONST_BITS-PASS1_BITS+2);
-  }
-  
-  /* Pass 2: process 2 rows from work array, store into output array. */
-
-  wsptr = workspace;
-  for (ctr = 0; ctr < 2; ctr++) {
-    outptr = output_buf[ctr] + output_col;
-    /* It's not clear whether a zero row test is worthwhile here ... */
-
-#ifndef NO_ZERO_ROW_TEST
-    if (wsptr[1] == 0 && wsptr[3] == 0 && wsptr[5] == 0 && wsptr[7] == 0) {
-      /* AC terms all zero */
-      JSAMPLE dcval = range_limit[(int) DESCALE((JPEG_INT32) wsptr[0], PASS1_BITS+3)
-				  & RANGE_MASK];
-      
-      outptr[0] = dcval;
-      outptr[1] = dcval;
-      
-      wsptr += DCTSIZE;		/* advance pointer to next row */
-      continue;
-    }
-#endif
-    
-    /* Even part */
-    
-    tmp10 = ((JPEG_INT32) wsptr[0]) << (CONST_BITS+2);
-    
-    /* Odd part */
-
-    tmp0 = MULTIPLY((JPEG_INT32) wsptr[7], - FIX_0_720959822) /* sqrt(2) * (c7-c5+c3-c1) */
-	 + MULTIPLY((JPEG_INT32) wsptr[5], FIX_0_850430095) /* sqrt(2) * (-c1+c3+c5+c7) */
-	 + MULTIPLY((JPEG_INT32) wsptr[3], - FIX_1_272758580) /* sqrt(2) * (-c1+c3-c5-c7) */
-	 + MULTIPLY((JPEG_INT32) wsptr[1], FIX_3_624509785); /* sqrt(2) * (c1+c3+c5+c7) */
-
-    /* Final output stage */
-    
-    outptr[0] = range_limit[(int) DESCALE(tmp10 + tmp0,
-					  CONST_BITS+PASS1_BITS+3+2)
-			    & RANGE_MASK];
-    outptr[1] = range_limit[(int) DESCALE(tmp10 - tmp0,
-					  CONST_BITS+PASS1_BITS+3+2)
-			    & RANGE_MASK];
-    
-    wsptr += DCTSIZE;		/* advance pointer to next row */
-  }
-}
-
-
-/*
- * Perform dequantization and inverse DCT on one block of coefficients,
- * producing a reduced-size 1x1 output block.
- */
-
-GLOBAL(void)
-jpeg_idct_1x1 (j_decompress_ptr cinfo, jpeg_component_info * compptr,
-	       JCOEFPTR coef_block,
-	       JSAMPARRAY output_buf, JDIMENSION output_col)
-{
-  int dcval;
-  ISLOW_MULT_TYPE * quantptr;
-  JSAMPLE *range_limit = IDCT_range_limit(cinfo);
-  SHIFT_TEMPS
-
-  /* We hardly need an inverse DCT routine for this: just take the
-   * average pixel value, which is one-eighth of the DC coefficient.
-   */
-  quantptr = (ISLOW_MULT_TYPE *) compptr->dct_table;
-  dcval = DEQUANTIZE(coef_block[0], quantptr[0]);
-  dcval = (int) DESCALE((JPEG_INT32) dcval, 3);
-
-  output_buf[0][output_col] = range_limit[dcval & RANGE_MASK];
-}
-
-#endif /* IDCT_SCALING_SUPPORTED */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jinclude.h b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jinclude.h
deleted file mode 100644
index 0a4f15146a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jinclude.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * jinclude.h
- *
- * Copyright (C) 1991-1994, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file exists to provide a single place to fix any problems with
- * including the wrong system include files.  (Common problems are taken
- * care of by the standard jconfig symbols, but on really weird systems
- * you may have to edit this file.)
- *
- * NOTE: this file is NOT intended to be included by applications using the
- * JPEG library.  Most applications need only include jpeglib.h.
- */
-
-
-/* Include auto-config file to find out which system include files we need. */
-
-#include "jconfig.h"		/* auto configuration options */
-#define JCONFIG_INCLUDED	/* so that jpeglib.h doesn't do it again */
-
-/*
- * We need the NULL macro and size_t typedef.
- * On an ANSI-conforming system it is sufficient to include .
- * Otherwise, we get them from  or ; we may have to
- * pull in  as well.
- * Note that the core JPEG library does not require ;
- * only the default error handler and data source/destination modules do.
- * But we must pull it in because of the references to FILE in jpeglib.h.
- * You can remove those references if you want to compile without .
- */
-
-#ifdef HAVE_STDDEF_H
-#include 
-#endif
-
-#ifdef HAVE_STDLIB_H
-#include 
-#endif
-
-#ifdef NEED_SYS_TYPES_H
-#include 
-#endif
-
-#include 
-
-/*
- * We need memory copying and zeroing functions, plus strncpy().
- * ANSI and System V implementations declare these in .
- * BSD doesn't have the mem() functions, but it does have bcopy()/bzero().
- * Some systems may declare memset and memcpy in .
- *
- * NOTE: we assume the size parameters to these functions are of type size_t.
- * Change the casts in these macros if not!
- */
-
-#ifdef NEED_BSD_STRINGS
-
-#include 
-#define MEMZERO(target,size)	bzero((void *)(target), (size_t)(size))
-#define MEMCOPY(dest,src,size)	bcopy((const void *)(src), (void *)(dest), (size_t)(size))
-
-#else /* not BSD, assume ANSI/SysV string lib */
-
-#include 
-#define MEMZERO(target,size)	memset((void *)(target), 0, (size_t)(size))
-#define MEMCOPY(dest,src,size)	memcpy((void *)(dest), (const void *)(src), (size_t)(size))
-
-#endif
-
-/*
- * In ANSI C, and indeed any rational implementation, size_t is also the
- * type returned by sizeof().  However, it seems there are some irrational
- * implementations out there, in which sizeof() returns an int even though
- * size_t is defined as long or unsigned long.  To ensure consistent results
- * we always use this SIZEOF() macro in place of using sizeof() directly.
- */
-
-#define SIZEOF(object)	((size_t) sizeof(object))
-
-/*
- * The modules that use fread() and fwrite() always invoke them through
- * these macros.  On some systems you may need to twiddle the argument casts.
- * CAUTION: argument order is different from underlying functions!
- */
-
-#define JFREAD(file,buf,sizeofbuf)  \
-  ((size_t) fread((void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
-#define JFWRITE(file,buf,sizeofbuf)  \
-  ((size_t) fwrite((const void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemansi.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemansi.c
deleted file mode 100644
index 2d93e49625..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemansi.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * jmemansi.c
- *
- * Copyright (C) 1992-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file provides a simple generic implementation of the system-
- * dependent portion of the JPEG memory manager.  This implementation
- * assumes that you have the ANSI-standard library routine tmpfile().
- * Also, the problem of determining the amount of memory available
- * is shoved onto the user.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jmemsys.h"		/* import the system-dependent declarations */
-
-#ifndef HAVE_STDLIB_H		/*  should declare malloc(),free() */
-extern void * malloc JPP((size_t size));
-extern void free JPP((void *ptr));
-#endif
-
-#ifndef SEEK_SET		/* pre-ANSI systems may not define this; */
-#define SEEK_SET  0		/* if not, assume 0 is correct */
-#endif
-
-
-/*
- * Memory allocation and freeing are controlled by the regular library
- * routines malloc() and free().
- */
-
-GLOBAL(void *)
-jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)
-{
-  return (void *) malloc(sizeofobject);
-}
-
-GLOBAL(void)
-jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
-{
-  free(object);
-}
-
-
-/*
- * "Large" objects are treated the same as "small" ones.
- * NB: although we include FAR keywords in the routine declarations,
- * this file won't actually work in 80x86 small/medium model; at least,
- * you probably won't be able to process useful-size images in only 64KB.
- */
-
-GLOBAL(void FAR *)
-jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)
-{
-  return (void FAR *) malloc(sizeofobject);
-}
-
-GLOBAL(void)
-jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
-{
-  free(object);
-}
-
-
-/*
- * This routine computes the total memory space available for allocation.
- * It's impossible to do this in a portable way; our current solution is
- * to make the user tell us (with a default value set at compile time).
- * If you can actually get the available space, it's a good idea to subtract
- * a slop factor of 5% or so.
- */
-
-#ifndef DEFAULT_MAX_MEM		/* so can override from makefile */
-#define DEFAULT_MAX_MEM		1000000L /* default: one megabyte */
-#endif
-
-GLOBAL(long)
-jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
-		    long max_bytes_needed, long already_allocated)
-{
-  return cinfo->mem->max_memory_to_use - already_allocated;
-}
-
-
-/*
- * Backing store (temporary file) management.
- * Backing store objects are only used when the value returned by
- * jpeg_mem_available is less than the total space needed.  You can dispense
- * with these routines if you have plenty of virtual memory; see jmemnobs.c.
- */
-
-
-METHODDEF(void)
-read_backing_store (j_common_ptr cinfo, backing_store_ptr info,
-		    void FAR * buffer_address,
-		    long file_offset, long byte_count)
-{
-  if (fseek(info->temp_file, file_offset, SEEK_SET))
-    ERREXIT(cinfo, JERR_TFILE_SEEK);
-  if (JFREAD(info->temp_file, buffer_address, byte_count)
-      != (size_t) byte_count)
-    ERREXIT(cinfo, JERR_TFILE_READ);
-}
-
-
-METHODDEF(void)
-write_backing_store (j_common_ptr cinfo, backing_store_ptr info,
-		     void FAR * buffer_address,
-		     long file_offset, long byte_count)
-{
-  if (fseek(info->temp_file, file_offset, SEEK_SET))
-    ERREXIT(cinfo, JERR_TFILE_SEEK);
-  if (JFWRITE(info->temp_file, buffer_address, byte_count)
-      != (size_t) byte_count)
-    ERREXIT(cinfo, JERR_TFILE_WRITE);
-}
-
-
-METHODDEF(void)
-close_backing_store (j_common_ptr cinfo, backing_store_ptr info)
-{
-  fclose(info->temp_file);
-  /* Since this implementation uses tmpfile() to create the file,
-   * no explicit file deletion is needed.
-   */
-}
-
-
-/*
- * Initial opening of a backing-store object.
- *
- * This version uses tmpfile(), which constructs a suitable file name
- * behind the scenes.  We don't have to use info->temp_name[] at all;
- * indeed, we can't even find out the actual name of the temp file.
- */
-
-GLOBAL(void)
-jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
-			 long total_bytes_needed)
-{
-  if ((info->temp_file = tmpfile()) == NULL)
-    ERREXITS(cinfo, JERR_TFILE_CREATE, "");
-  info->read_backing_store = read_backing_store;
-  info->write_backing_store = write_backing_store;
-  info->close_backing_store = close_backing_store;
-}
-
-
-/*
- * These routines take care of any system-dependent initialization and
- * cleanup required.
- */
-
-GLOBAL(long)
-jpeg_mem_init (j_common_ptr cinfo)
-{
-  return DEFAULT_MAX_MEM;	/* default for max_memory_to_use */
-}
-
-GLOBAL(void)
-jpeg_mem_term (j_common_ptr cinfo)
-{
-  /* no work */
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemdos.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemdos.c
deleted file mode 100644
index d64835d57c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemdos.c
+++ /dev/null
@@ -1,638 +0,0 @@
-/*
- * jmemdos.c
- *
- * Copyright (C) 1992-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file provides an MS-DOS-compatible implementation of the system-
- * dependent portion of the JPEG memory manager.  Temporary data can be
- * stored in extended or expanded memory as well as in regular DOS files.
- *
- * If you use this file, you must be sure that NEED_FAR_POINTERS is defined
- * if you compile in a small-data memory model; it should NOT be defined if
- * you use a large-data memory model.  This file is not recommended if you
- * are using a flat-memory-space 386 environment such as DJGCC or Watcom C.
- * Also, this code will NOT work if struct fields are aligned on greater than
- * 2-byte boundaries.
- *
- * Based on code contributed by Ge' Weijers.
- */
-
-/*
- * If you have both extended and expanded memory, you may want to change the
- * order in which they are tried in jopen_backing_store.  On a 286 machine
- * expanded memory is usually faster, since extended memory access involves
- * an expensive protected-mode-and-back switch.  On 386 and better, extended
- * memory is usually faster.  As distributed, the code tries extended memory
- * first (what? not everyone has a 386? :-).
- *
- * You can disable use of extended/expanded memory entirely by altering these
- * definitions or overriding them from the Makefile (eg, -DEMS_SUPPORTED=0).
- */
-
-#ifndef XMS_SUPPORTED
-#define XMS_SUPPORTED  1
-#endif
-#ifndef EMS_SUPPORTED
-#define EMS_SUPPORTED  1
-#endif
-
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jmemsys.h"		/* import the system-dependent declarations */
-
-#ifndef HAVE_STDLIB_H		/*  should declare these */
-extern void * malloc JPP((size_t size));
-extern void free JPP((void *ptr));
-extern char * getenv JPP((const char * name));
-#endif
-
-#ifdef NEED_FAR_POINTERS
-
-#ifdef __TURBOC__
-/* These definitions work for Borland C (Turbo C) */
-#include 		/* need farmalloc(), farfree() */
-#define far_malloc(x)	farmalloc(x)
-#define far_free(x)	farfree(x)
-#else
-/* These definitions work for Microsoft C and compatible compilers */
-#include 		/* need _fmalloc(), _ffree() */
-#define far_malloc(x)	_fmalloc(x)
-#define far_free(x)	_ffree(x)
-#endif
-
-#else /* not NEED_FAR_POINTERS */
-
-#define far_malloc(x)	malloc(x)
-#define far_free(x)	free(x)
-
-#endif /* NEED_FAR_POINTERS */
-
-#ifdef DONT_USE_B_MODE		/* define mode parameters for fopen() */
-#define READ_BINARY	"r"
-#else
-#define READ_BINARY	"rb"
-#endif
-
-#ifndef USE_MSDOS_MEMMGR	/* make sure user got configuration right */
-  You forgot to define USE_MSDOS_MEMMGR in jconfig.h. /* deliberate syntax error */
-#endif
-
-#if MAX_ALLOC_CHUNK >= 65535L	/* make sure jconfig.h got this right */
-  MAX_ALLOC_CHUNK should be less than 64K. /* deliberate syntax error */
-#endif
-
-
-/*
- * Declarations for assembly-language support routines (see jmemdosa.asm).
- *
- * The functions are declared "far" as are all their pointer arguments;
- * this ensures the assembly source code will work regardless of the
- * compiler memory model.  We assume "short" is 16 bits, "long" is 32.
- */
-
-typedef void far * XMSDRIVER;	/* actually a pointer to code */
-typedef struct {		/* registers for calling XMS driver */
-	unsigned short ax, dx, bx;
-	void far * ds_si;
-      } XMScontext;
-typedef struct {		/* registers for calling EMS driver */
-	unsigned short ax, dx, bx;
-	void far * ds_si;
-      } EMScontext;
-
-extern short far jdos_open JPP((short far * handle, char far * filename));
-extern short far jdos_close JPP((short handle));
-extern short far jdos_seek JPP((short handle, long offset));
-extern short far jdos_read JPP((short handle, void far * buffer,
-				unsigned short count));
-extern short far jdos_write JPP((short handle, void far * buffer,
-				 unsigned short count));
-extern void far jxms_getdriver JPP((XMSDRIVER far *));
-extern void far jxms_calldriver JPP((XMSDRIVER, XMScontext far *));
-extern short far jems_available JPP((void));
-extern void far jems_calldriver JPP((EMScontext far *));
-
-
-/*
- * Selection of a file name for a temporary file.
- * This is highly system-dependent, and you may want to customize it.
- */
-
-static int next_file_num;	/* to distinguish among several temp files */
-
-LOCAL(void)
-select_file_name (char * fname)
-{
-  const char * env;
-  char * ptr;
-  FILE * tfile;
-
-  /* Keep generating file names till we find one that's not in use */
-  for (;;) {
-    /* Get temp directory name from environment TMP or TEMP variable;
-     * if none, use "."
-     */
-    if ((env = (const char *) getenv("TMP")) == NULL)
-      if ((env = (const char *) getenv("TEMP")) == NULL)
-	env = ".";
-    if (*env == '\0')		/* null string means "." */
-      env = ".";
-    ptr = fname;		/* copy name to fname */
-    while (*env != '\0')
-      *ptr++ = *env++;
-    if (ptr[-1] != '\\' && ptr[-1] != '/')
-      *ptr++ = '\\';		/* append backslash if not in env variable */
-    /* Append a suitable file name */
-    next_file_num++;		/* advance counter */
-    sprintf(ptr, "JPG%03d.TMP", next_file_num);
-    /* Probe to see if file name is already in use */
-    if ((tfile = fopen(fname, READ_BINARY)) == NULL)
-      break;
-    fclose(tfile);		/* oops, it's there; close tfile & try again */
-  }
-}
-
-
-/*
- * Near-memory allocation and freeing are controlled by the regular library
- * routines malloc() and free().
- */
-
-GLOBAL(void *)
-jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)
-{
-  return (void *) malloc(sizeofobject);
-}
-
-GLOBAL(void)
-jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
-{
-  free(object);
-}
-
-
-/*
- * "Large" objects are allocated in far memory, if possible
- */
-
-GLOBAL(void FAR *)
-jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)
-{
-  return (void FAR *) far_malloc(sizeofobject);
-}
-
-GLOBAL(void)
-jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
-{
-  far_free(object);
-}
-
-
-/*
- * This routine computes the total memory space available for allocation.
- * It's impossible to do this in a portable way; our current solution is
- * to make the user tell us (with a default value set at compile time).
- * If you can actually get the available space, it's a good idea to subtract
- * a slop factor of 5% or so.
- */
-
-#ifndef DEFAULT_MAX_MEM		/* so can override from makefile */
-#define DEFAULT_MAX_MEM		300000L /* for total usage about 450K */
-#endif
-
-GLOBAL(long)
-jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
-		    long max_bytes_needed, long already_allocated)
-{
-  return cinfo->mem->max_memory_to_use - already_allocated;
-}
-
-
-/*
- * Backing store (temporary file) management.
- * Backing store objects are only used when the value returned by
- * jpeg_mem_available is less than the total space needed.  You can dispense
- * with these routines if you have plenty of virtual memory; see jmemnobs.c.
- */
-
-/*
- * For MS-DOS we support three types of backing storage:
- *   1. Conventional DOS files.  We access these by direct DOS calls rather
- *      than via the stdio package.  This provides a bit better performance,
- *      but the real reason is that the buffers to be read or written are FAR.
- *      The stdio library for small-data memory models can't cope with that.
- *   2. Extended memory, accessed per the XMS V2.0 specification.
- *   3. Expanded memory, accessed per the LIM/EMS 4.0 specification.
- * You'll need copies of those specs to make sense of the related code.
- * The specs are available by Internet FTP from the SIMTEL archives 
- * (oak.oakland.edu and its various mirror sites).  See files
- * pub/msdos/microsoft/xms20.arc and pub/msdos/info/limems41.zip.
- */
-
-
-/*
- * Access methods for a DOS file.
- */
-
-
-METHODDEF(void)
-read_file_store (j_common_ptr cinfo, backing_store_ptr info,
-		 void FAR * buffer_address,
-		 long file_offset, long byte_count)
-{
-  if (jdos_seek(info->handle.file_handle, file_offset))
-    ERREXIT(cinfo, JERR_TFILE_SEEK);
-  /* Since MAX_ALLOC_CHUNK is less than 64K, byte_count will be too. */
-  if (byte_count > 65535L)	/* safety check */
-    ERREXIT(cinfo, JERR_BAD_ALLOC_CHUNK);
-  if (jdos_read(info->handle.file_handle, buffer_address,
-		(unsigned short) byte_count))
-    ERREXIT(cinfo, JERR_TFILE_READ);
-}
-
-
-METHODDEF(void)
-write_file_store (j_common_ptr cinfo, backing_store_ptr info,
-		  void FAR * buffer_address,
-		  long file_offset, long byte_count)
-{
-  if (jdos_seek(info->handle.file_handle, file_offset))
-    ERREXIT(cinfo, JERR_TFILE_SEEK);
-  /* Since MAX_ALLOC_CHUNK is less than 64K, byte_count will be too. */
-  if (byte_count > 65535L)	/* safety check */
-    ERREXIT(cinfo, JERR_BAD_ALLOC_CHUNK);
-  if (jdos_write(info->handle.file_handle, buffer_address,
-		 (unsigned short) byte_count))
-    ERREXIT(cinfo, JERR_TFILE_WRITE);
-}
-
-
-METHODDEF(void)
-close_file_store (j_common_ptr cinfo, backing_store_ptr info)
-{
-  jdos_close(info->handle.file_handle);	/* close the file */
-  remove(info->temp_name);	/* delete the file */
-/* If your system doesn't have remove(), try unlink() instead.
- * remove() is the ANSI-standard name for this function, but
- * unlink() was more common in pre-ANSI systems.
- */
-  TRACEMSS(cinfo, 1, JTRC_TFILE_CLOSE, info->temp_name);
-}
-
-
-LOCAL(wxjpeg_boolean)
-open_file_store (j_common_ptr cinfo, backing_store_ptr info,
-		 long total_bytes_needed)
-{
-  short handle;
-
-  select_file_name(info->temp_name);
-  if (jdos_open((short far *) & handle, (char far *) info->temp_name)) {
-    /* might as well exit since jpeg_open_backing_store will fail anyway */
-    ERREXITS(cinfo, JERR_TFILE_CREATE, info->temp_name);
-    return FALSE;
-  }
-  info->handle.file_handle = handle;
-  info->read_backing_store = read_file_store;
-  info->write_backing_store = write_file_store;
-  info->close_backing_store = close_file_store;
-  TRACEMSS(cinfo, 1, JTRC_TFILE_OPEN, info->temp_name);
-  return TRUE;			/* succeeded */
-}
-
-
-/*
- * Access methods for extended memory.
- */
-
-#if XMS_SUPPORTED
-
-static XMSDRIVER xms_driver;	/* saved address of XMS driver */
-
-typedef union {			/* either long offset or real-mode pointer */
-	long offset;
-	void far * ptr;
-      } XMSPTR;
-
-typedef struct {		/* XMS move specification structure */
-	long length;
-	XMSH src_handle;
-	XMSPTR src;
-	XMSH dst_handle;
-	XMSPTR dst;
-      } XMSspec;
-
-#define ODD(X)	(((X) & 1L) != 0)
-
-
-METHODDEF(void)
-read_xms_store (j_common_ptr cinfo, backing_store_ptr info,
-		void FAR * buffer_address,
-		long file_offset, long byte_count)
-{
-  XMScontext ctx;
-  XMSspec spec;
-  char endbuffer[2];
-
-  /* The XMS driver can't cope with an odd length, so handle the last byte
-   * specially if byte_count is odd.  We don't expect this to be common.
-   */
-
-  spec.length = byte_count & (~ 1L);
-  spec.src_handle = info->handle.xms_handle;
-  spec.src.offset = file_offset;
-  spec.dst_handle = 0;
-  spec.dst.ptr = buffer_address;
-  
-  ctx.ds_si = (void far *) & spec;
-  ctx.ax = 0x0b00;		/* EMB move */
-  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);
-  if (ctx.ax != 1)
-    ERREXIT(cinfo, JERR_XMS_READ);
-
-  if (ODD(byte_count)) {
-    read_xms_store(cinfo, info, (void FAR *) endbuffer,
-		   file_offset + byte_count - 1L, 2L);
-    ((char FAR *) buffer_address)[byte_count - 1L] = endbuffer[0];
-  }
-}
-
-
-METHODDEF(void)
-write_xms_store (j_common_ptr cinfo, backing_store_ptr info,
-		 void FAR * buffer_address,
-		 long file_offset, long byte_count)
-{
-  XMScontext ctx;
-  XMSspec spec;
-  char endbuffer[2];
-
-  /* The XMS driver can't cope with an odd length, so handle the last byte
-   * specially if byte_count is odd.  We don't expect this to be common.
-   */
-
-  spec.length = byte_count & (~ 1L);
-  spec.src_handle = 0;
-  spec.src.ptr = buffer_address;
-  spec.dst_handle = info->handle.xms_handle;
-  spec.dst.offset = file_offset;
-
-  ctx.ds_si = (void far *) & spec;
-  ctx.ax = 0x0b00;		/* EMB move */
-  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);
-  if (ctx.ax != 1)
-    ERREXIT(cinfo, JERR_XMS_WRITE);
-
-  if (ODD(byte_count)) {
-    read_xms_store(cinfo, info, (void FAR *) endbuffer,
-		   file_offset + byte_count - 1L, 2L);
-    endbuffer[0] = ((char FAR *) buffer_address)[byte_count - 1L];
-    write_xms_store(cinfo, info, (void FAR *) endbuffer,
-		    file_offset + byte_count - 1L, 2L);
-  }
-}
-
-
-METHODDEF(void)
-close_xms_store (j_common_ptr cinfo, backing_store_ptr info)
-{
-  XMScontext ctx;
-
-  ctx.dx = info->handle.xms_handle;
-  ctx.ax = 0x0a00;
-  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);
-  TRACEMS1(cinfo, 1, JTRC_XMS_CLOSE, info->handle.xms_handle);
-  /* we ignore any error return from the driver */
-}
-
-
-LOCAL(wxjpeg_boolean)
-open_xms_store (j_common_ptr cinfo, backing_store_ptr info,
-		long total_bytes_needed)
-{
-  XMScontext ctx;
-
-  /* Get address of XMS driver */
-  jxms_getdriver((XMSDRIVER far *) & xms_driver);
-  if (xms_driver == NULL)
-    return FALSE;		/* no driver to be had */
-
-  /* Get version number, must be >= 2.00 */
-  ctx.ax = 0x0000;
-  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);
-  if (ctx.ax < (unsigned short) 0x0200)
-    return FALSE;
-
-  /* Try to get space (expressed in kilobytes) */
-  ctx.dx = (unsigned short) ((total_bytes_needed + 1023L) >> 10);
-  ctx.ax = 0x0900;
-  jxms_calldriver(xms_driver, (XMScontext far *) & ctx);
-  if (ctx.ax != 1)
-    return FALSE;
-
-  /* Succeeded, save the handle and away we go */
-  info->handle.xms_handle = ctx.dx;
-  info->read_backing_store = read_xms_store;
-  info->write_backing_store = write_xms_store;
-  info->close_backing_store = close_xms_store;
-  TRACEMS1(cinfo, 1, JTRC_XMS_OPEN, ctx.dx);
-  return TRUE;			/* succeeded */
-}
-
-#endif /* XMS_SUPPORTED */
-
-
-/*
- * Access methods for expanded memory.
- */
-
-#if EMS_SUPPORTED
-
-/* The EMS move specification structure requires word and long fields aligned
- * at odd byte boundaries.  Some compilers will align struct fields at even
- * byte boundaries.  While it's usually possible to force byte alignment,
- * that causes an overall performance penalty and may pose problems in merging
- * JPEG into a larger application.  Instead we accept some rather dirty code
- * here.  Note this code would fail if the hardware did not allow odd-byte
- * word & long accesses, but all 80x86 CPUs do.
- */
-
-typedef void far * EMSPTR;
-
-typedef union {			/* EMS move specification structure */
-	long length;		/* It's easy to access first 4 bytes */
-	char bytes[18];		/* Misaligned fields in here! */
-      } EMSspec;
-
-/* Macros for accessing misaligned fields */
-#define FIELD_AT(spec,offset,type)  (*((type *) &(spec.bytes[offset])))
-#define SRC_TYPE(spec)		FIELD_AT(spec,4,char)
-#define SRC_HANDLE(spec)	FIELD_AT(spec,5,EMSH)
-#define SRC_OFFSET(spec)	FIELD_AT(spec,7,unsigned short)
-#define SRC_PAGE(spec)		FIELD_AT(spec,9,unsigned short)
-#define SRC_PTR(spec)		FIELD_AT(spec,7,EMSPTR)
-#define DST_TYPE(spec)		FIELD_AT(spec,11,char)
-#define DST_HANDLE(spec)	FIELD_AT(spec,12,EMSH)
-#define DST_OFFSET(spec)	FIELD_AT(spec,14,unsigned short)
-#define DST_PAGE(spec)		FIELD_AT(spec,16,unsigned short)
-#define DST_PTR(spec)		FIELD_AT(spec,14,EMSPTR)
-
-#define EMSPAGESIZE	16384L	/* gospel, see the EMS specs */
-
-#define HIBYTE(W)  (((W) >> 8) & 0xFF)
-#define LOBYTE(W)  ((W) & 0xFF)
-
-
-METHODDEF(void)
-read_ems_store (j_common_ptr cinfo, backing_store_ptr info,
-		void FAR * buffer_address,
-		long file_offset, long byte_count)
-{
-  EMScontext ctx;
-  EMSspec spec;
-
-  spec.length = byte_count;
-  SRC_TYPE(spec) = 1;
-  SRC_HANDLE(spec) = info->handle.ems_handle;
-  SRC_PAGE(spec)   = (unsigned short) (file_offset / EMSPAGESIZE);
-  SRC_OFFSET(spec) = (unsigned short) (file_offset % EMSPAGESIZE);
-  DST_TYPE(spec) = 0;
-  DST_HANDLE(spec) = 0;
-  DST_PTR(spec)    = buffer_address;
-  
-  ctx.ds_si = (void far *) & spec;
-  ctx.ax = 0x5700;		/* move memory region */
-  jems_calldriver((EMScontext far *) & ctx);
-  if (HIBYTE(ctx.ax) != 0)
-    ERREXIT(cinfo, JERR_EMS_READ);
-}
-
-
-METHODDEF(void)
-write_ems_store (j_common_ptr cinfo, backing_store_ptr info,
-		 void FAR * buffer_address,
-		 long file_offset, long byte_count)
-{
-  EMScontext ctx;
-  EMSspec spec;
-
-  spec.length = byte_count;
-  SRC_TYPE(spec) = 0;
-  SRC_HANDLE(spec) = 0;
-  SRC_PTR(spec)    = buffer_address;
-  DST_TYPE(spec) = 1;
-  DST_HANDLE(spec) = info->handle.ems_handle;
-  DST_PAGE(spec)   = (unsigned short) (file_offset / EMSPAGESIZE);
-  DST_OFFSET(spec) = (unsigned short) (file_offset % EMSPAGESIZE);
-  
-  ctx.ds_si = (void far *) & spec;
-  ctx.ax = 0x5700;		/* move memory region */
-  jems_calldriver((EMScontext far *) & ctx);
-  if (HIBYTE(ctx.ax) != 0)
-    ERREXIT(cinfo, JERR_EMS_WRITE);
-}
-
-
-METHODDEF(void)
-close_ems_store (j_common_ptr cinfo, backing_store_ptr info)
-{
-  EMScontext ctx;
-
-  ctx.ax = 0x4500;
-  ctx.dx = info->handle.ems_handle;
-  jems_calldriver((EMScontext far *) & ctx);
-  TRACEMS1(cinfo, 1, JTRC_EMS_CLOSE, info->handle.ems_handle);
-  /* we ignore any error return from the driver */
-}
-
-
-LOCAL(wxjpeg_boolean)
-open_ems_store (j_common_ptr cinfo, backing_store_ptr info,
-		long total_bytes_needed)
-{
-  EMScontext ctx;
-
-  /* Is EMS driver there? */
-  if (! jems_available())
-    return FALSE;
-
-  /* Get status, make sure EMS is OK */
-  ctx.ax = 0x4000;
-  jems_calldriver((EMScontext far *) & ctx);
-  if (HIBYTE(ctx.ax) != 0)
-    return FALSE;
-
-  /* Get version, must be >= 4.0 */
-  ctx.ax = 0x4600;
-  jems_calldriver((EMScontext far *) & ctx);
-  if (HIBYTE(ctx.ax) != 0 || LOBYTE(ctx.ax) < 0x40)
-    return FALSE;
-
-  /* Try to allocate requested space */
-  ctx.ax = 0x4300;
-  ctx.bx = (unsigned short) ((total_bytes_needed + EMSPAGESIZE-1L) / EMSPAGESIZE);
-  jems_calldriver((EMScontext far *) & ctx);
-  if (HIBYTE(ctx.ax) != 0)
-    return FALSE;
-
-  /* Succeeded, save the handle and away we go */
-  info->handle.ems_handle = ctx.dx;
-  info->read_backing_store = read_ems_store;
-  info->write_backing_store = write_ems_store;
-  info->close_backing_store = close_ems_store;
-  TRACEMS1(cinfo, 1, JTRC_EMS_OPEN, ctx.dx);
-  return TRUE;			/* succeeded */
-}
-
-#endif /* EMS_SUPPORTED */
-
-
-/*
- * Initial opening of a backing-store object.
- */
-
-GLOBAL(void)
-jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
-			 long total_bytes_needed)
-{
-  /* Try extended memory, then expanded memory, then regular file. */
-#if XMS_SUPPORTED
-  if (open_xms_store(cinfo, info, total_bytes_needed))
-    return;
-#endif
-#if EMS_SUPPORTED
-  if (open_ems_store(cinfo, info, total_bytes_needed))
-    return;
-#endif
-  if (open_file_store(cinfo, info, total_bytes_needed))
-    return;
-  ERREXITS(cinfo, JERR_TFILE_CREATE, "");
-}
-
-
-/*
- * These routines take care of any system-dependent initialization and
- * cleanup required.
- */
-
-GLOBAL(long)
-jpeg_mem_init (j_common_ptr cinfo)
-{
-  next_file_num = 0;		/* initialize temp file name generator */
-  return DEFAULT_MAX_MEM;	/* default for max_memory_to_use */
-}
-
-GLOBAL(void)
-jpeg_mem_term (j_common_ptr cinfo)
-{
-  /* Microsoft C, at least in v6.00A, will not successfully reclaim freed
-   * blocks of size > 32Kbytes unless we give it a kick in the rear, like so:
-   */
-#ifdef NEED_FHEAPMIN
-  _fheapmin();
-#endif
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemdosa.asm b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemdosa.asm
deleted file mode 100644
index ecd43729fe..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemdosa.asm
+++ /dev/null
@@ -1,379 +0,0 @@
-;
-; jmemdosa.asm
-;
-; Copyright (C) 1992, Thomas G. Lane.
-; This file is part of the Independent JPEG Group's software.
-; For conditions of distribution and use, see the accompanying README file.
-;
-; This file contains low-level interface routines to support the MS-DOS
-; backing store manager (jmemdos.c).  Routines are provided to access disk
-; files through direct DOS calls, and to access XMS and EMS drivers.
-;
-; This file should assemble with Microsoft's MASM or any compatible
-; assembler (including Borland's Turbo Assembler).  If you haven't got
-; a compatible assembler, better fall back to jmemansi.c or jmemname.c.
-;
-; To minimize dependence on the C compiler's register usage conventions,
-; we save and restore all 8086 registers, even though most compilers only
-; require SI,DI,DS to be preserved.  Also, we use only 16-bit-wide return
-; values, which everybody returns in AX.
-;
-; Based on code contributed by Ge' Weijers.
-;
-
-JMEMDOSA_TXT	segment byte public 'CODE'
-
-		assume	cs:JMEMDOSA_TXT
-
-		public	_jdos_open
-		public	_jdos_close
-		public	_jdos_seek
-		public	_jdos_read
-		public	_jdos_write
-		public	_jxms_getdriver
-		public	_jxms_calldriver
-		public	_jems_available
-		public	_jems_calldriver
-
-;
-; short far jdos_open (short far * handle, char far * filename)
-;
-; Create and open a temporary file
-;
-_jdos_open	proc	far
-		push	bp			; linkage
-		mov 	bp,sp
-		push	si			; save all registers for safety
-		push	di
-		push	bx
-		push	cx
-		push	dx
-		push	es
-		push	ds
-		mov	cx,0			; normal file attributes
-		lds	dx,dword ptr [bp+10]	; get filename pointer
-		mov	ah,3ch			; create file
-		int	21h
-		jc	open_err		; if failed, return error code
-		lds	bx,dword ptr [bp+6]	; get handle pointer
-		mov	word ptr [bx],ax	; save the handle
-		xor	ax,ax			; return zero for OK
-open_err:	pop	ds			; restore registers and exit
-		pop	es
-		pop	dx
-		pop	cx
-		pop	bx
-		pop	di
-		pop	si
-		pop 	bp
-		ret
-_jdos_open	endp
-
-
-;
-; short far jdos_close (short handle)
-;
-; Close the file handle
-;
-_jdos_close	proc	far
-		push	bp			; linkage
-		mov 	bp,sp
-		push	si			; save all registers for safety
-		push	di
-		push	bx
-		push	cx
-		push	dx
-		push	es
-		push	ds
-		mov	bx,word ptr [bp+6]	; file handle
-		mov	ah,3eh			; close file
-		int	21h
-		jc	close_err		; if failed, return error code
-		xor	ax,ax			; return zero for OK
-close_err:	pop	ds			; restore registers and exit
-		pop	es
-		pop	dx
-		pop	cx
-		pop	bx
-		pop	di
-		pop	si
-		pop 	bp
-		ret
-_jdos_close	endp
-
-
-;
-; short far jdos_seek (short handle, long offset)
-;
-; Set file position
-;
-_jdos_seek	proc	far
-		push	bp			; linkage
-		mov 	bp,sp
-		push	si			; save all registers for safety
-		push	di
-		push	bx
-		push	cx
-		push	dx
-		push	es
-		push	ds
-		mov	bx,word ptr [bp+6]	; file handle
-		mov	dx,word ptr [bp+8]	; LS offset
-		mov	cx,word ptr [bp+10]	; MS offset
-		mov	ax,4200h		; absolute seek
-		int	21h
-		jc	seek_err		; if failed, return error code
-		xor	ax,ax			; return zero for OK
-seek_err:	pop	ds			; restore registers and exit
-		pop	es
-		pop	dx
-		pop	cx
-		pop	bx
-		pop	di
-		pop	si
-		pop 	bp
-		ret
-_jdos_seek	endp
-
-
-;
-; short far jdos_read (short handle, void far * buffer, unsigned short count)
-;
-; Read from file
-;
-_jdos_read	proc	far
-		push	bp			; linkage
-		mov 	bp,sp
-		push	si			; save all registers for safety
-		push	di
-		push	bx
-		push	cx
-		push	dx
-		push	es
-		push	ds
-		mov	bx,word ptr [bp+6]	; file handle
-		lds	dx,dword ptr [bp+8]	; buffer address
-		mov	cx,word ptr [bp+12]	; number of bytes
-		mov	ah,3fh			; read file
-		int	21h
-		jc	read_err		; if failed, return error code
-		cmp	ax,word ptr [bp+12]	; make sure all bytes were read
-		je	read_ok
-		mov	ax,1			; else return 1 for not OK
-		jmp	short read_err
-read_ok:	xor	ax,ax			; return zero for OK
-read_err:	pop	ds			; restore registers and exit
-		pop	es
-		pop	dx
-		pop	cx
-		pop	bx
-		pop	di
-		pop	si
-		pop 	bp
-		ret
-_jdos_read	endp
-
-
-;
-; short far jdos_write (short handle, void far * buffer, unsigned short count)
-;
-; Write to file
-;
-_jdos_write	proc	far
-		push	bp			; linkage
-		mov 	bp,sp
-		push	si			; save all registers for safety
-		push	di
-		push	bx
-		push	cx
-		push	dx
-		push	es
-		push	ds
-		mov	bx,word ptr [bp+6]	; file handle
-		lds	dx,dword ptr [bp+8]	; buffer address
-		mov	cx,word ptr [bp+12]	; number of bytes
-		mov	ah,40h			; write file
-		int	21h
-		jc	write_err		; if failed, return error code
-		cmp	ax,word ptr [bp+12]	; make sure all bytes written
-		je	write_ok
-		mov	ax,1			; else return 1 for not OK
-		jmp	short write_err
-write_ok:	xor	ax,ax			; return zero for OK
-write_err:	pop	ds			; restore registers and exit
-		pop	es
-		pop	dx
-		pop	cx
-		pop	bx
-		pop	di
-		pop	si
-		pop 	bp
-		ret
-_jdos_write	endp
-
-
-;
-; void far jxms_getdriver (XMSDRIVER far *)
-;
-; Get the address of the XMS driver, or NULL if not available
-;
-_jxms_getdriver	proc	far
-		push	bp			; linkage
-		mov 	bp,sp
-		push	si			; save all registers for safety
-		push	di
-		push	bx
-		push	cx
-		push	dx
-		push	es
-		push	ds
-		mov 	ax,4300h		; call multiplex interrupt with
-		int	2fh			; a magic cookie, hex 4300
-		cmp 	al,80h			; AL should contain hex 80
-		je	xmsavail
-		xor 	dx,dx			; no XMS driver available
-		xor 	ax,ax			; return a nil pointer
-		jmp	short xmsavail_done
-xmsavail:	mov 	ax,4310h		; fetch driver address with
-		int	2fh			; another magic cookie
-		mov 	dx,es			; copy address to dx:ax
-		mov 	ax,bx
-xmsavail_done:	les 	bx,dword ptr [bp+6]	; get pointer to return value
-		mov	word ptr es:[bx],ax
-		mov	word ptr es:[bx+2],dx
-		pop	ds			; restore registers and exit
-		pop	es
-		pop	dx
-		pop	cx
-		pop	bx
-		pop	di
-		pop	si
-		pop	bp
-		ret
-_jxms_getdriver	endp
-
-
-;
-; void far jxms_calldriver (XMSDRIVER, XMScontext far *)
-;
-; The XMScontext structure contains values for the AX,DX,BX,SI,DS registers.
-; These are loaded, the XMS call is performed, and the new values of the
-; AX,DX,BX registers are written back to the context structure.
-;
-_jxms_calldriver 	proc	far
-		push	bp			; linkage
-		mov 	bp,sp
-		push	si			; save all registers for safety
-		push	di
-		push	bx
-		push	cx
-		push	dx
-		push	es
-		push	ds
-		les 	bx,dword ptr [bp+10]	; get XMScontext pointer
-		mov 	ax,word ptr es:[bx]	; load registers
-		mov 	dx,word ptr es:[bx+2]
-		mov 	si,word ptr es:[bx+6]
-		mov 	ds,word ptr es:[bx+8]
-		mov 	bx,word ptr es:[bx+4]
-		call	dword ptr [bp+6]	; call the driver
-		mov	cx,bx			; save returned BX for a sec
-		les 	bx,dword ptr [bp+10]	; get XMScontext pointer
-		mov 	word ptr es:[bx],ax	; put back ax,dx,bx
-		mov 	word ptr es:[bx+2],dx
-		mov 	word ptr es:[bx+4],cx
-		pop	ds			; restore registers and exit
-		pop	es
-		pop	dx
-		pop	cx
-		pop	bx
-		pop	di
-		pop	si
-		pop 	bp
-		ret
-_jxms_calldriver 	endp
-
-
-;
-; short far jems_available (void)
-;
-; Have we got an EMS driver? (this comes straight from the EMS 4.0 specs)
-;
-_jems_available	proc	far
-		push	si			; save all registers for safety
-		push	di
-		push	bx
-		push	cx
-		push	dx
-		push	es
-		push	ds
-		mov	ax,3567h		; get interrupt vector 67h
-		int	21h
-		push	cs
-		pop	ds
-		mov	di,000ah		; check offs 10 in returned seg
-		lea	si,ASCII_device_name	; against literal string
-		mov	cx,8
-		cld
-		repe cmpsb
-		jne	no_ems
-		mov	ax,1			; match, it's there
-		jmp	short avail_done
-no_ems:		xor	ax,ax			; it's not there
-avail_done:	pop	ds			; restore registers and exit
-		pop	es
-		pop	dx
-		pop	cx
-		pop	bx
-		pop	di
-		pop	si
-		ret
-
-ASCII_device_name	db	"EMMXXXX0"
-
-_jems_available	endp
-
-
-;
-; void far jems_calldriver (EMScontext far *)
-;
-; The EMScontext structure contains values for the AX,DX,BX,SI,DS registers.
-; These are loaded, the EMS trap is performed, and the new values of the
-; AX,DX,BX registers are written back to the context structure.
-;
-_jems_calldriver	proc far
-		push	bp			; linkage
-		mov 	bp,sp
-		push	si			; save all registers for safety
-		push	di
-		push	bx
-		push	cx
-		push	dx
-		push	es
-		push	ds
-		les 	bx,dword ptr [bp+6]	; get EMScontext pointer
-		mov 	ax,word ptr es:[bx]	; load registers
-		mov 	dx,word ptr es:[bx+2]
-		mov 	si,word ptr es:[bx+6]
-		mov 	ds,word ptr es:[bx+8]
-		mov 	bx,word ptr es:[bx+4]
-		int	67h			; call the EMS driver
-		mov	cx,bx			; save returned BX for a sec
-		les 	bx,dword ptr [bp+6]	; get EMScontext pointer
-		mov 	word ptr es:[bx],ax	; put back ax,dx,bx
-		mov 	word ptr es:[bx+2],dx
-		mov 	word ptr es:[bx+4],cx
-		pop	ds			; restore registers and exit
-		pop	es
-		pop	dx
-		pop	cx
-		pop	bx
-		pop	di
-		pop	si
-		pop 	bp
-		ret
-_jems_calldriver	endp
-
-JMEMDOSA_TXT	ends
-
-		end
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemmac.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemmac.c
deleted file mode 100644
index 106f9bea05..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemmac.c
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * jmemmac.c
- *
- * Copyright (C) 1992-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * jmemmac.c provides an Apple Macintosh implementation of the system-
- * dependent portion of the JPEG memory manager.
- *
- * If you use jmemmac.c, then you must define USE_MAC_MEMMGR in the
- * JPEG_INTERNALS part of jconfig.h.
- *
- * jmemmac.c uses the Macintosh toolbox routines NewPtr and DisposePtr
- * instead of malloc and free.  It accurately determines the amount of
- * memory available by using CompactMem.  Notice that if left to its
- * own devices, this code can chew up all available space in the
- * application's zone, with the exception of the rather small "slop"
- * factor computed in jpeg_mem_available().  The application can ensure
- * that more space is left over by reducing max_memory_to_use.
- *
- * Large images are swapped to disk using temporary files and System 7.0+'s
- * temporary folder functionality.
- *
- * Note that jmemmac.c depends on two features of MacOS that were first
- * introduced in System 7: FindFolder and the FSSpec-based calls.
- * If your application uses jmemmac.c and is run under System 6 or earlier,
- * and the jpeg library decides it needs a temporary file, it will abort,
- * printing error messages about requiring System 7.  (If no temporary files
- * are created, it will run fine.)
- *
- * If you want to use jmemmac.c in an application that might be used with
- * System 6 or earlier, then you should remove dependencies on FindFolder
- * and the FSSpec calls.  You will need to replace FindFolder with some
- * other mechanism for finding a place to put temporary files, and you
- * should replace the FSSpec calls with their HFS equivalents:
- *
- *     FSpDelete     ->  HDelete
- *     FSpGetFInfo   ->  HGetFInfo
- *     FSpCreate     ->  HCreate
- *     FSpOpenDF     ->  HOpen      *** Note: not HOpenDF ***
- *     FSMakeFSSpec  ->  (fill in spec by hand.)
- *
- * (Use HOpen instead of HOpenDF.  HOpen is just a glue-interface to PBHOpen,
- * which is on all HFS macs.  HOpenDF is a System 7 addition which avoids the
- * ages-old problem of names starting with a period.)
- *
- * Contributed by Sam Bushell (jsam@iagu.on.net) and
- * Dan Gildor (gyld@in-touch.com).
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jmemsys.h"    /* import the system-dependent declarations */
-
-#ifndef USE_MAC_MEMMGR	/* make sure user got configuration right */
-  You forgot to define USE_MAC_MEMMGR in jconfig.h. /* deliberate syntax error */
-#endif
-
-#include      /* we use the MacOS memory manager */
-#include       /* we use the MacOS File stuff */
-#include     /* we use the MacOS HFS stuff */
-#include      /* for smSystemScript */
-#include     /* we use Gestalt to test for specific functionality */
-
-#ifndef TEMP_FILE_NAME		/* can override from jconfig.h or Makefile */
-#define TEMP_FILE_NAME  "JPG%03d.TMP"
-#endif
-
-static int next_file_num;	/* to distinguish among several temp files */
-
-
-/*
- * Memory allocation and freeing are controlled by the MacOS library
- * routines NewPtr() and DisposePtr(), which allocate fixed-address
- * storage.  Unfortunately, the IJG library isn't smart enough to cope
- * with relocatable storage.
- */
-
-GLOBAL(void *)
-jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)
-{
-  return (void *) NewPtr(sizeofobject);
-}
-
-GLOBAL(void)
-jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
-{
-  DisposePtr((Ptr) object);
-}
-
-
-/*
- * "Large" objects are treated the same as "small" ones.
- * NB: we include FAR keywords in the routine declarations simply for
- * consistency with the rest of the IJG code; FAR should expand to empty
- * on rational architectures like the Mac.
- */
-
-GLOBAL(void FAR *)
-jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)
-{
-  return (void FAR *) NewPtr(sizeofobject);
-}
-
-GLOBAL(void)
-jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
-{
-  DisposePtr((Ptr) object);
-}
-
-
-/*
- * This routine computes the total memory space available for allocation.
- */
-
-GLOBAL(long)
-jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
-		    long max_bytes_needed, long already_allocated)
-{
-  long limit = cinfo->mem->max_memory_to_use - already_allocated;
-  long slop, mem;
-
-  /* Don't ask for more than what application has told us we may use */
-  if (max_bytes_needed > limit && limit > 0)
-    max_bytes_needed = limit;
-  /* Find whether there's a big enough free block in the heap.
-   * CompactMem tries to create a contiguous block of the requested size,
-   * and then returns the size of the largest free block (which could be
-   * much more or much less than we asked for).
-   * We add some slop to ensure we don't use up all available memory.
-   */
-  slop = max_bytes_needed / 16 + 32768L;
-  mem = CompactMem(max_bytes_needed + slop) - slop;
-  if (mem < 0)
-    mem = 0;			/* sigh, couldn't even get the slop */
-  /* Don't take more than the application says we can have */
-  if (mem > limit && limit > 0)
-    mem = limit;
-  return mem;
-}
-
-
-/*
- * Backing store (temporary file) management.
- * Backing store objects are only used when the value returned by
- * jpeg_mem_available is less than the total space needed.  You can dispense
- * with these routines if you have plenty of virtual memory; see jmemnobs.c.
- */
-
-
-METHODDEF(void)
-read_backing_store (j_common_ptr cinfo, backing_store_ptr info,
-		    void FAR * buffer_address,
-		    long file_offset, long byte_count)
-{
-  long bytes = byte_count;
-  long retVal;
-
-  if ( SetFPos ( info->temp_file, fsFromStart, file_offset ) != noErr )
-    ERREXIT(cinfo, JERR_TFILE_SEEK);
-
-  retVal = FSRead ( info->temp_file, &bytes,
-		    (unsigned char *) buffer_address );
-  if ( retVal != noErr || bytes != byte_count )
-    ERREXIT(cinfo, JERR_TFILE_READ);
-}
-
-
-METHODDEF(void)
-write_backing_store (j_common_ptr cinfo, backing_store_ptr info,
-		     void FAR * buffer_address,
-		     long file_offset, long byte_count)
-{
-  long bytes = byte_count;
-  long retVal;
-
-  if ( SetFPos ( info->temp_file, fsFromStart, file_offset ) != noErr )
-    ERREXIT(cinfo, JERR_TFILE_SEEK);
-
-  retVal = FSWrite ( info->temp_file, &bytes,
-		     (unsigned char *) buffer_address );
-  if ( retVal != noErr || bytes != byte_count )
-    ERREXIT(cinfo, JERR_TFILE_WRITE);
-}
-
-
-METHODDEF(void)
-close_backing_store (j_common_ptr cinfo, backing_store_ptr info)
-{
-  FSClose ( info->temp_file );
-  FSpDelete ( &(info->tempSpec) );
-}
-
-
-/*
- * Initial opening of a backing-store object.
- *
- * This version uses FindFolder to find the Temporary Items folder,
- * and puts the temporary file in there.
- */
-
-GLOBAL(void)
-jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
-			 long total_bytes_needed)
-{
-  short         tmpRef, vRefNum;
-  long          dirID;
-  FInfo         finderInfo;
-  FSSpec        theSpec;
-  Str255        fName;
-  OSErr         osErr;
-  long          gestaltResponse = 0;
-
-  /* Check that FSSpec calls are available. */
-  osErr = Gestalt( gestaltFSAttr, &gestaltResponse );
-  if ( ( osErr != noErr )
-       || !( gestaltResponse & (1<temp_name, TEMP_FILE_NAME, next_file_num);
-    strcpy ( (Ptr)fName+1, info->temp_name );
-    *fName = strlen (info->temp_name);
-    osErr = FSMakeFSSpec ( vRefNum, dirID, fName, &theSpec );
-
-    if ( (osErr = FSpGetFInfo ( &theSpec, &finderInfo ) ) != noErr )
-      break;
-  }
-
-  osErr = FSpCreate ( &theSpec, '????', '????', smSystemScript );
-  if ( osErr != noErr )
-    ERREXITS(cinfo, JERR_TFILE_CREATE, info->temp_name);
-
-  osErr = FSpOpenDF ( &theSpec, fsRdWrPerm, &(info->temp_file) );
-  if ( osErr != noErr )
-    ERREXITS(cinfo, JERR_TFILE_CREATE, info->temp_name);
-
-  info->tempSpec = theSpec;
-
-  info->read_backing_store = read_backing_store;
-  info->write_backing_store = write_backing_store;
-  info->close_backing_store = close_backing_store;
-  TRACEMSS(cinfo, 1, JTRC_TFILE_OPEN, info->temp_name);
-}
-
-
-/*
- * These routines take care of any system-dependent initialization and
- * cleanup required.
- */
-
-GLOBAL(long)
-jpeg_mem_init (j_common_ptr cinfo)
-{
-  next_file_num = 0;
-
-  /* max_memory_to_use will be initialized to FreeMem()'s result;
-   * the calling application might later reduce it, for example
-   * to leave room to invoke multiple JPEG objects.
-   * Note that FreeMem returns the total number of free bytes;
-   * it may not be possible to allocate a single block of this size.
-   */
-  return FreeMem();
-}
-
-GLOBAL(void)
-jpeg_mem_term (j_common_ptr cinfo)
-{
-  /* no work */
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemmgr.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemmgr.c
deleted file mode 100644
index 173d9ded61..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemmgr.c
+++ /dev/null
@@ -1,1118 +0,0 @@
-/*
- * jmemmgr.c
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains the JPEG system-independent memory management
- * routines.  This code is usable across a wide variety of machines; most
- * of the system dependencies have been isolated in a separate file.
- * The major functions provided here are:
- *   * pool-based allocation and freeing of memory;
- *   * policy decisions about how to divide available memory among the
- *     virtual arrays;
- *   * control logic for swapping virtual arrays between main memory and
- *     backing storage.
- * The separate system-dependent file provides the actual backing-storage
- * access code, and it contains the policy decision about how much total
- * main memory to use.
- * This file is system-dependent in the sense that some of its functions
- * are unnecessary in some systems.  For example, if there is enough virtual
- * memory so that backing storage will never be used, much of the virtual
- * array control logic could be removed.  (Of course, if you have that much
- * memory then you shouldn't care about a little bit of unused code...)
- */
-
-#define JPEG_INTERNALS
-#define AM_MEMORY_MANAGER	/* we define jvirt_Xarray_control structs */
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jmemsys.h"		/* import the system-dependent declarations */
-
-#ifndef NO_GETENV
-#ifndef HAVE_STDLIB_H		/*  should declare getenv() */
-extern char * getenv JPP((const char * name));
-#endif
-#endif
-
-
-/*
- * Some important notes:
- *   The allocation routines provided here must never return NULL.
- *   They should exit to error_exit if unsuccessful.
- *
- *   It's not a good idea to try to merge the sarray and barray routines,
- *   even though they are textually almost the same, because samples are
- *   usually stored as bytes while coefficients are shorts or ints.  Thus,
- *   in machines where byte pointers have a different representation from
- *   word pointers, the resulting machine code could not be the same.
- */
-
-
-/*
- * Many machines require storage alignment: longs must start on 4-byte
- * boundaries, doubles on 8-byte boundaries, etc.  On such machines, malloc()
- * always returns pointers that are multiples of the worst-case alignment
- * requirement, and we had better do so too.
- * There isn't any really portable way to determine the worst-case alignment
- * requirement.  This module assumes that the alignment requirement is
- * multiples of sizeof(ALIGN_TYPE).
- * By default, we define ALIGN_TYPE as double.  This is necessary on some
- * workstations (where doubles really do need 8-byte alignment) and will work
- * fine on nearly everything.  If your machine has lesser alignment needs,
- * you can save a few bytes by making ALIGN_TYPE smaller.
- * The only place I know of where this will NOT work is certain Macintosh
- * 680x0 compilers that define double as a 10-byte IEEE extended float.
- * Doing 10-byte alignment is counterproductive because longwords won't be
- * aligned well.  Put "#define ALIGN_TYPE long" in jconfig.h if you have
- * such a compiler.
- */
-
-#ifndef ALIGN_TYPE		/* so can override from jconfig.h */
-#define ALIGN_TYPE  double
-#endif
-
-
-/*
- * We allocate objects from "pools", where each pool is gotten with a single
- * request to jpeg_get_small() or jpeg_get_large().  There is no per-object
- * overhead within a pool, except for alignment padding.  Each pool has a
- * header with a link to the next pool of the same class.
- * Small and large pool headers are identical except that the latter's
- * link pointer must be FAR on 80x86 machines.
- * Notice that the "real" header fields are union'ed with a dummy ALIGN_TYPE
- * field.  This forces the compiler to make SIZEOF(small_pool_hdr) a multiple
- * of the alignment requirement of ALIGN_TYPE.
- */
-
-typedef union small_pool_struct * small_pool_ptr;
-
-typedef union small_pool_struct {
-  struct {
-    small_pool_ptr next;	/* next in list of pools */
-    size_t bytes_used;		/* how many bytes already used within pool */
-    size_t bytes_left;		/* bytes still available in this pool */
-  } hdr;
-  ALIGN_TYPE dummy;		/* included in union to ensure alignment */
-} small_pool_hdr;
-
-typedef union large_pool_struct FAR * large_pool_ptr;
-
-typedef union large_pool_struct {
-  struct {
-    large_pool_ptr next;	/* next in list of pools */
-    size_t bytes_used;		/* how many bytes already used within pool */
-    size_t bytes_left;		/* bytes still available in this pool */
-  } hdr;
-  ALIGN_TYPE dummy;		/* included in union to ensure alignment */
-} large_pool_hdr;
-
-
-/*
- * Here is the full definition of a memory manager object.
- */
-
-typedef struct {
-  struct jpeg_memory_mgr pub;	/* public fields */
-
-  /* Each pool identifier (lifetime class) names a linked list of pools. */
-  small_pool_ptr small_list[JPOOL_NUMPOOLS];
-  large_pool_ptr large_list[JPOOL_NUMPOOLS];
-
-  /* Since we only have one lifetime class of virtual arrays, only one
-   * linked list is necessary (for each datatype).  Note that the virtual
-   * array control blocks being linked together are actually stored somewhere
-   * in the small-pool list.
-   */
-  jvirt_sarray_ptr virt_sarray_list;
-  jvirt_barray_ptr virt_barray_list;
-
-  /* This counts total space obtained from jpeg_get_small/large */
-  long total_space_allocated;
-
-  /* alloc_sarray and alloc_barray set this value for use by virtual
-   * array routines.
-   */
-  JDIMENSION last_rowsperchunk;	/* from most recent alloc_sarray/barray */
-} my_memory_mgr;
-
-typedef my_memory_mgr * my_mem_ptr;
-
-
-/*
- * The control blocks for virtual arrays.
- * Note that these blocks are allocated in the "small" pool area.
- * System-dependent info for the associated backing store (if any) is hidden
- * inside the backing_store_info struct.
- */
-
-struct jvirt_sarray_control {
-  JSAMPARRAY mem_buffer;	/* => the in-memory buffer */
-  JDIMENSION rows_in_array;	/* total virtual array height */
-  JDIMENSION samplesperrow;	/* width of array (and of memory buffer) */
-  JDIMENSION maxaccess;		/* max rows accessed by access_virt_sarray */
-  JDIMENSION rows_in_mem;	/* height of memory buffer */
-  JDIMENSION rowsperchunk;	/* allocation chunk size in mem_buffer */
-  JDIMENSION cur_start_row;	/* first logical row # in the buffer */
-  JDIMENSION first_undef_row;	/* row # of first uninitialized row */
-  wxjpeg_boolean pre_zero;		/* pre-zero mode requested? */
-  wxjpeg_boolean dirty;		/* do current buffer contents need written? */
-  wxjpeg_boolean b_s_open;		/* is backing-store data valid? */
-  jvirt_sarray_ptr next;	/* link to next virtual sarray control block */
-  backing_store_info b_s_info;	/* System-dependent control info */
-};
-
-struct jvirt_barray_control {
-  JBLOCKARRAY mem_buffer;	/* => the in-memory buffer */
-  JDIMENSION rows_in_array;	/* total virtual array height */
-  JDIMENSION blocksperrow;	/* width of array (and of memory buffer) */
-  JDIMENSION maxaccess;		/* max rows accessed by access_virt_barray */
-  JDIMENSION rows_in_mem;	/* height of memory buffer */
-  JDIMENSION rowsperchunk;	/* allocation chunk size in mem_buffer */
-  JDIMENSION cur_start_row;	/* first logical row # in the buffer */
-  JDIMENSION first_undef_row;	/* row # of first uninitialized row */
-  wxjpeg_boolean pre_zero;		/* pre-zero mode requested? */
-  wxjpeg_boolean dirty;		/* do current buffer contents need written? */
-  wxjpeg_boolean b_s_open;		/* is backing-store data valid? */
-  jvirt_barray_ptr next;	/* link to next virtual barray control block */
-  backing_store_info b_s_info;	/* System-dependent control info */
-};
-
-
-#ifdef MEM_STATS		/* optional extra stuff for statistics */
-
-LOCAL(void)
-print_mem_stats (j_common_ptr cinfo, int pool_id)
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  small_pool_ptr shdr_ptr;
-  large_pool_ptr lhdr_ptr;
-
-  /* Since this is only a debugging stub, we can cheat a little by using
-   * fprintf directly rather than going through the trace message code.
-   * This is helpful because message parm array can't handle longs.
-   */
-  fprintf(stderr, "Freeing pool %d, total space = %ld\n",
-	  pool_id, mem->total_space_allocated);
-
-  for (lhdr_ptr = mem->large_list[pool_id]; lhdr_ptr != NULL;
-       lhdr_ptr = lhdr_ptr->hdr.next) {
-    fprintf(stderr, "  Large chunk used %ld\n",
-	    (long) lhdr_ptr->hdr.bytes_used);
-  }
-
-  for (shdr_ptr = mem->small_list[pool_id]; shdr_ptr != NULL;
-       shdr_ptr = shdr_ptr->hdr.next) {
-    fprintf(stderr, "  Small chunk used %ld free %ld\n",
-	    (long) shdr_ptr->hdr.bytes_used,
-	    (long) shdr_ptr->hdr.bytes_left);
-  }
-}
-
-#endif /* MEM_STATS */
-
-
-LOCAL(void)
-out_of_memory (j_common_ptr cinfo, int which)
-/* Report an out-of-memory error and stop execution */
-/* If we compiled MEM_STATS support, report alloc requests before dying */
-{
-#ifdef MEM_STATS
-  cinfo->err->trace_level = 2;	/* force self_destruct to report stats */
-#endif
-  ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, which);
-}
-
-
-/*
- * Allocation of "small" objects.
- *
- * For these, we use pooled storage.  When a new pool must be created,
- * we try to get enough space for the current request plus a "slop" factor,
- * where the slop will be the amount of leftover space in the new pool.
- * The speed vs. space tradeoff is largely determined by the slop values.
- * A different slop value is provided for each pool class (lifetime),
- * and we also distinguish the first pool of a class from later ones.
- * NOTE: the values given work fairly well on both 16- and 32-bit-int
- * machines, but may be too small if longs are 64 bits or more.
- */
-
-static const size_t first_pool_slop[JPOOL_NUMPOOLS] = 
-{
-	1600,			/* first PERMANENT pool */
-	16000			/* first IMAGE pool */
-};
-
-static const size_t extra_pool_slop[JPOOL_NUMPOOLS] = 
-{
-	0,			/* additional PERMANENT pools */
-	5000			/* additional IMAGE pools */
-};
-
-#define MIN_SLOP  50		/* greater than 0 to avoid futile looping */
-
-
-METHODDEF(void *)
-alloc_small (j_common_ptr cinfo, int pool_id, size_t sizeofobject)
-/* Allocate a "small" object */
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  small_pool_ptr hdr_ptr, prev_hdr_ptr;
-  char * data_ptr;
-  size_t odd_bytes, min_request, slop;
-
-  /* Check for unsatisfiable request (do now to ensure no overflow below) */
-  if (sizeofobject > (size_t) (MAX_ALLOC_CHUNK-SIZEOF(small_pool_hdr)))
-    out_of_memory(cinfo, 1);	/* request exceeds malloc's ability */
-
-  /* Round up the requested size to a multiple of SIZEOF(ALIGN_TYPE) */
-  odd_bytes = sizeofobject % SIZEOF(ALIGN_TYPE);
-  if (odd_bytes > 0)
-    sizeofobject += SIZEOF(ALIGN_TYPE) - odd_bytes;
-
-  /* See if space is available in any existing pool */
-  if (pool_id < 0 || pool_id >= JPOOL_NUMPOOLS)
-    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
-  prev_hdr_ptr = NULL;
-  hdr_ptr = mem->small_list[pool_id];
-  while (hdr_ptr != NULL) {
-    if (hdr_ptr->hdr.bytes_left >= sizeofobject)
-      break;			/* found pool with enough space */
-    prev_hdr_ptr = hdr_ptr;
-    hdr_ptr = hdr_ptr->hdr.next;
-  }
-
-  /* Time to make a new pool? */
-  if (hdr_ptr == NULL) {
-    /* min_request is what we need now, slop is what will be leftover */
-    min_request = sizeofobject + SIZEOF(small_pool_hdr);
-    if (prev_hdr_ptr == NULL)	/* first pool in class? */
-      slop = first_pool_slop[pool_id];
-    else
-      slop = extra_pool_slop[pool_id];
-    /* Don't ask for more than MAX_ALLOC_CHUNK */
-    if (slop > (size_t) (MAX_ALLOC_CHUNK-min_request))
-      slop = (size_t) (MAX_ALLOC_CHUNK-min_request);
-    /* Try to get space, if fail reduce slop and try again */
-    for (;;) {
-      hdr_ptr = (small_pool_ptr) jpeg_get_small(cinfo, min_request + slop);
-      if (hdr_ptr != NULL)
-	break;
-      slop /= 2;
-      if (slop < MIN_SLOP)	/* give up when it gets real small */
-	out_of_memory(cinfo, 2); /* jpeg_get_small failed */
-    }
-    mem->total_space_allocated += min_request + slop;
-    /* Success, initialize the new pool header and add to end of list */
-    hdr_ptr->hdr.next = NULL;
-    hdr_ptr->hdr.bytes_used = 0;
-    hdr_ptr->hdr.bytes_left = sizeofobject + slop;
-    if (prev_hdr_ptr == NULL)	/* first pool in class? */
-      mem->small_list[pool_id] = hdr_ptr;
-    else
-      prev_hdr_ptr->hdr.next = hdr_ptr;
-  }
-
-  /* OK, allocate the object from the current pool */
-  data_ptr = (char *) (hdr_ptr + 1); /* point to first data byte in pool */
-  data_ptr += hdr_ptr->hdr.bytes_used; /* point to place for object */
-  hdr_ptr->hdr.bytes_used += sizeofobject;
-  hdr_ptr->hdr.bytes_left -= sizeofobject;
-
-  return (void *) data_ptr;
-}
-
-
-/*
- * Allocation of "large" objects.
- *
- * The external semantics of these are the same as "small" objects,
- * except that FAR pointers are used on 80x86.  However the pool
- * management heuristics are quite different.  We assume that each
- * request is large enough that it may as well be passed directly to
- * jpeg_get_large; the pool management just links everything together
- * so that we can free it all on demand.
- * Note: the major use of "large" objects is in JSAMPARRAY and JBLOCKARRAY
- * structures.  The routines that create these structures (see below)
- * deliberately bunch rows together to ensure a large request size.
- */
-
-METHODDEF(void FAR *)
-alloc_large (j_common_ptr cinfo, int pool_id, size_t sizeofobject)
-/* Allocate a "large" object */
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  large_pool_ptr hdr_ptr;
-  size_t odd_bytes;
-
-  /* Check for unsatisfiable request (do now to ensure no overflow below) */
-  if (sizeofobject > (size_t) (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)))
-    out_of_memory(cinfo, 3);	/* request exceeds malloc's ability */
-
-  /* Round up the requested size to a multiple of SIZEOF(ALIGN_TYPE) */
-  odd_bytes = sizeofobject % SIZEOF(ALIGN_TYPE);
-  if (odd_bytes > 0)
-    sizeofobject += SIZEOF(ALIGN_TYPE) - odd_bytes;
-
-  /* Always make a new pool */
-  if (pool_id < 0 || pool_id >= JPOOL_NUMPOOLS)
-    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
-
-  hdr_ptr = (large_pool_ptr) jpeg_get_large(cinfo, sizeofobject +
-					    SIZEOF(large_pool_hdr));
-  if (hdr_ptr == NULL)
-    out_of_memory(cinfo, 4);	/* jpeg_get_large failed */
-  mem->total_space_allocated += sizeofobject + SIZEOF(large_pool_hdr);
-
-  /* Success, initialize the new pool header and add to list */
-  hdr_ptr->hdr.next = mem->large_list[pool_id];
-  /* We maintain space counts in each pool header for statistical purposes,
-   * even though they are not needed for allocation.
-   */
-  hdr_ptr->hdr.bytes_used = sizeofobject;
-  hdr_ptr->hdr.bytes_left = 0;
-  mem->large_list[pool_id] = hdr_ptr;
-
-  return (void FAR *) (hdr_ptr + 1); /* point to first data byte in pool */
-}
-
-
-/*
- * Creation of 2-D sample arrays.
- * The pointers are in near heap, the samples themselves in FAR heap.
- *
- * To minimize allocation overhead and to allow I/O of large contiguous
- * blocks, we allocate the sample rows in groups of as many rows as possible
- * without exceeding MAX_ALLOC_CHUNK total bytes per allocation request.
- * NB: the virtual array control routines, later in this file, know about
- * this chunking of rows.  The rowsperchunk value is left in the mem manager
- * object so that it can be saved away if this sarray is the workspace for
- * a virtual array.
- */
-
-METHODDEF(JSAMPARRAY)
-alloc_sarray (j_common_ptr cinfo, int pool_id,
-	      JDIMENSION samplesperrow, JDIMENSION numrows)
-/* Allocate a 2-D sample array */
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  JSAMPARRAY result;
-  JSAMPROW workspace;
-  JDIMENSION rowsperchunk, currow, i;
-  long ltemp;
-
-  /* Calculate max # of rows allowed in one allocation chunk */
-  ltemp = (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)) /
-	  ((long) samplesperrow * SIZEOF(JSAMPLE));
-  if (ltemp <= 0)
-    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
-  if (ltemp < (long) numrows)
-    rowsperchunk = (JDIMENSION) ltemp;
-  else
-    rowsperchunk = numrows;
-  mem->last_rowsperchunk = rowsperchunk;
-
-  /* Get space for row pointers (small object) */
-  result = (JSAMPARRAY) alloc_small(cinfo, pool_id,
-				    (size_t) (numrows * SIZEOF(JSAMPROW)));
-
-  /* Get the rows themselves (large objects) */
-  currow = 0;
-  while (currow < numrows) {
-    rowsperchunk = MIN(rowsperchunk, numrows - currow);
-    workspace = (JSAMPROW) alloc_large(cinfo, pool_id,
-	(size_t) ((size_t) rowsperchunk * (size_t) samplesperrow
-		  * SIZEOF(JSAMPLE)));
-    for (i = rowsperchunk; i > 0; i--) {
-      result[currow++] = workspace;
-      workspace += samplesperrow;
-    }
-  }
-
-  return result;
-}
-
-
-/*
- * Creation of 2-D coefficient-block arrays.
- * This is essentially the same as the code for sample arrays, above.
- */
-
-METHODDEF(JBLOCKARRAY)
-alloc_barray (j_common_ptr cinfo, int pool_id,
-	      JDIMENSION blocksperrow, JDIMENSION numrows)
-/* Allocate a 2-D coefficient-block array */
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  JBLOCKARRAY result;
-  JBLOCKROW workspace;
-  JDIMENSION rowsperchunk, currow, i;
-  long ltemp;
-
-  /* Calculate max # of rows allowed in one allocation chunk */
-  ltemp = (MAX_ALLOC_CHUNK-SIZEOF(large_pool_hdr)) /
-	  ((long) blocksperrow * SIZEOF(JBLOCK));
-  if (ltemp <= 0)
-    ERREXIT(cinfo, JERR_WIDTH_OVERFLOW);
-  if (ltemp < (long) numrows)
-    rowsperchunk = (JDIMENSION) ltemp;
-  else
-    rowsperchunk = numrows;
-  mem->last_rowsperchunk = rowsperchunk;
-
-  /* Get space for row pointers (small object) */
-  result = (JBLOCKARRAY) alloc_small(cinfo, pool_id,
-				     (size_t) (numrows * SIZEOF(JBLOCKROW)));
-
-  /* Get the rows themselves (large objects) */
-  currow = 0;
-  while (currow < numrows) {
-    rowsperchunk = MIN(rowsperchunk, numrows - currow);
-    workspace = (JBLOCKROW) alloc_large(cinfo, pool_id,
-	(size_t) ((size_t) rowsperchunk * (size_t) blocksperrow
-		  * SIZEOF(JBLOCK)));
-    for (i = rowsperchunk; i > 0; i--) {
-      result[currow++] = workspace;
-      workspace += blocksperrow;
-    }
-  }
-
-  return result;
-}
-
-
-/*
- * About virtual array management:
- *
- * The above "normal" array routines are only used to allocate strip buffers
- * (as wide as the image, but just a few rows high).  Full-image-sized buffers
- * are handled as "virtual" arrays.  The array is still accessed a strip at a
- * time, but the memory manager must save the whole array for repeated
- * accesses.  The intended implementation is that there is a strip buffer in
- * memory (as high as is possible given the desired memory limit), plus a
- * backing file that holds the rest of the array.
- *
- * The request_virt_array routines are told the total size of the image and
- * the maximum number of rows that will be accessed at once.  The in-memory
- * buffer must be at least as large as the maxaccess value.
- *
- * The request routines create control blocks but not the in-memory buffers.
- * That is postponed until realize_virt_arrays is called.  At that time the
- * total amount of space needed is known (approximately, anyway), so free
- * memory can be divided up fairly.
- *
- * The access_virt_array routines are responsible for making a specific strip
- * area accessible (after reading or writing the backing file, if necessary).
- * Note that the access routines are told whether the caller intends to modify
- * the accessed strip; during a read-only pass this saves having to rewrite
- * data to disk.  The access routines are also responsible for pre-zeroing
- * any newly accessed rows, if pre-zeroing was requested.
- *
- * In current usage, the access requests are usually for nonoverlapping
- * strips; that is, successive access start_row numbers differ by exactly
- * num_rows = maxaccess.  This means we can get good performance with simple
- * buffer dump/reload logic, by making the in-memory buffer be a multiple
- * of the access height; then there will never be accesses across bufferload
- * boundaries.  The code will still work with overlapping access requests,
- * but it doesn't handle bufferload overlaps very efficiently.
- */
-
-
-METHODDEF(jvirt_sarray_ptr)
-request_virt_sarray (j_common_ptr cinfo, int pool_id, wxjpeg_boolean pre_zero,
-		     JDIMENSION samplesperrow, JDIMENSION numrows,
-		     JDIMENSION maxaccess)
-/* Request a virtual 2-D sample array */
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  jvirt_sarray_ptr result;
-
-  /* Only IMAGE-lifetime virtual arrays are currently supported */
-  if (pool_id != JPOOL_IMAGE)
-    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
-
-  /* get control block */
-  result = (jvirt_sarray_ptr) alloc_small(cinfo, pool_id,
-					  SIZEOF(struct jvirt_sarray_control));
-
-  result->mem_buffer = NULL;	/* marks array not yet realized */
-  result->rows_in_array = numrows;
-  result->samplesperrow = samplesperrow;
-  result->maxaccess = maxaccess;
-  result->pre_zero = pre_zero;
-  result->b_s_open = FALSE;	/* no associated backing-store object */
-  result->next = mem->virt_sarray_list; /* add to list of virtual arrays */
-  mem->virt_sarray_list = result;
-
-  return result;
-}
-
-
-METHODDEF(jvirt_barray_ptr)
-request_virt_barray (j_common_ptr cinfo, int pool_id, wxjpeg_boolean pre_zero,
-		     JDIMENSION blocksperrow, JDIMENSION numrows,
-		     JDIMENSION maxaccess)
-/* Request a virtual 2-D coefficient-block array */
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  jvirt_barray_ptr result;
-
-  /* Only IMAGE-lifetime virtual arrays are currently supported */
-  if (pool_id != JPOOL_IMAGE)
-    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
-
-  /* get control block */
-  result = (jvirt_barray_ptr) alloc_small(cinfo, pool_id,
-					  SIZEOF(struct jvirt_barray_control));
-
-  result->mem_buffer = NULL;	/* marks array not yet realized */
-  result->rows_in_array = numrows;
-  result->blocksperrow = blocksperrow;
-  result->maxaccess = maxaccess;
-  result->pre_zero = pre_zero;
-  result->b_s_open = FALSE;	/* no associated backing-store object */
-  result->next = mem->virt_barray_list; /* add to list of virtual arrays */
-  mem->virt_barray_list = result;
-
-  return result;
-}
-
-
-METHODDEF(void)
-realize_virt_arrays (j_common_ptr cinfo)
-/* Allocate the in-memory buffers for any unrealized virtual arrays */
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  long space_per_minheight, maximum_space, avail_mem;
-  long minheights, max_minheights;
-  jvirt_sarray_ptr sptr;
-  jvirt_barray_ptr bptr;
-
-  /* Compute the minimum space needed (maxaccess rows in each buffer)
-   * and the maximum space needed (full image height in each buffer).
-   * These may be of use to the system-dependent jpeg_mem_available routine.
-   */
-  space_per_minheight = 0;
-  maximum_space = 0;
-  for (sptr = mem->virt_sarray_list; sptr != NULL; sptr = sptr->next) {
-    if (sptr->mem_buffer == NULL) { /* if not realized yet */
-      space_per_minheight += (long) sptr->maxaccess *
-			     (long) sptr->samplesperrow * SIZEOF(JSAMPLE);
-      maximum_space += (long) sptr->rows_in_array *
-		       (long) sptr->samplesperrow * SIZEOF(JSAMPLE);
-    }
-  }
-  for (bptr = mem->virt_barray_list; bptr != NULL; bptr = bptr->next) {
-    if (bptr->mem_buffer == NULL) { /* if not realized yet */
-      space_per_minheight += (long) bptr->maxaccess *
-			     (long) bptr->blocksperrow * SIZEOF(JBLOCK);
-      maximum_space += (long) bptr->rows_in_array *
-		       (long) bptr->blocksperrow * SIZEOF(JBLOCK);
-    }
-  }
-
-  if (space_per_minheight <= 0)
-    return;			/* no unrealized arrays, no work */
-
-  /* Determine amount of memory to actually use; this is system-dependent. */
-  avail_mem = jpeg_mem_available(cinfo, space_per_minheight, maximum_space,
-				 mem->total_space_allocated);
-
-  /* If the maximum space needed is available, make all the buffers full
-   * height; otherwise parcel it out with the same number of minheights
-   * in each buffer.
-   */
-  if (avail_mem >= maximum_space)
-    max_minheights = 1000000000L;
-  else {
-    max_minheights = avail_mem / space_per_minheight;
-    /* If there doesn't seem to be enough space, try to get the minimum
-     * anyway.  This allows a "stub" implementation of jpeg_mem_available().
-     */
-    if (max_minheights <= 0)
-      max_minheights = 1;
-  }
-
-  /* Allocate the in-memory buffers and initialize backing store as needed. */
-
-  for (sptr = mem->virt_sarray_list; sptr != NULL; sptr = sptr->next) {
-    if (sptr->mem_buffer == NULL) { /* if not realized yet */
-      minheights = ((long) sptr->rows_in_array - 1L) / sptr->maxaccess + 1L;
-      if (minheights <= max_minheights) {
-	/* This buffer fits in memory */
-	sptr->rows_in_mem = sptr->rows_in_array;
-      } else {
-	/* It doesn't fit in memory, create backing store. */
-	sptr->rows_in_mem = (JDIMENSION) (max_minheights * sptr->maxaccess);
-	jpeg_open_backing_store(cinfo, & sptr->b_s_info,
-				(long) sptr->rows_in_array *
-				(long) sptr->samplesperrow *
-				(long) SIZEOF(JSAMPLE));
-	sptr->b_s_open = TRUE;
-      }
-      sptr->mem_buffer = alloc_sarray(cinfo, JPOOL_IMAGE,
-				      sptr->samplesperrow, sptr->rows_in_mem);
-      sptr->rowsperchunk = mem->last_rowsperchunk;
-      sptr->cur_start_row = 0;
-      sptr->first_undef_row = 0;
-      sptr->dirty = FALSE;
-    }
-  }
-
-  for (bptr = mem->virt_barray_list; bptr != NULL; bptr = bptr->next) {
-    if (bptr->mem_buffer == NULL) { /* if not realized yet */
-      minheights = ((long) bptr->rows_in_array - 1L) / bptr->maxaccess + 1L;
-      if (minheights <= max_minheights) {
-	/* This buffer fits in memory */
-	bptr->rows_in_mem = bptr->rows_in_array;
-      } else {
-	/* It doesn't fit in memory, create backing store. */
-	bptr->rows_in_mem = (JDIMENSION) (max_minheights * bptr->maxaccess);
-	jpeg_open_backing_store(cinfo, & bptr->b_s_info,
-				(long) bptr->rows_in_array *
-				(long) bptr->blocksperrow *
-				(long) SIZEOF(JBLOCK));
-	bptr->b_s_open = TRUE;
-      }
-      bptr->mem_buffer = alloc_barray(cinfo, JPOOL_IMAGE,
-				      bptr->blocksperrow, bptr->rows_in_mem);
-      bptr->rowsperchunk = mem->last_rowsperchunk;
-      bptr->cur_start_row = 0;
-      bptr->first_undef_row = 0;
-      bptr->dirty = FALSE;
-    }
-  }
-}
-
-
-LOCAL(void)
-do_sarray_io (j_common_ptr cinfo, jvirt_sarray_ptr ptr, wxjpeg_boolean writing)
-/* Do backing store read or write of a virtual sample array */
-{
-  long bytesperrow, file_offset, byte_count, rows, thisrow, i;
-
-  bytesperrow = (long) ptr->samplesperrow * SIZEOF(JSAMPLE);
-  file_offset = ptr->cur_start_row * bytesperrow;
-  /* Loop to read or write each allocation chunk in mem_buffer */
-  for (i = 0; i < (long) ptr->rows_in_mem; i += ptr->rowsperchunk) {
-    /* One chunk, but check for short chunk at end of buffer */
-    rows = MIN((long) ptr->rowsperchunk, (long) ptr->rows_in_mem - i);
-    /* Transfer no more than is currently defined */
-    thisrow = (long) ptr->cur_start_row + i;
-    rows = MIN(rows, (long) ptr->first_undef_row - thisrow);
-    /* Transfer no more than fits in file */
-    rows = MIN(rows, (long) ptr->rows_in_array - thisrow);
-    if (rows <= 0)		/* this chunk might be past end of file! */
-      break;
-    byte_count = rows * bytesperrow;
-    if (writing)
-      (*ptr->b_s_info.write_backing_store) (cinfo, & ptr->b_s_info,
-					    (void FAR *) ptr->mem_buffer[i],
-					    file_offset, byte_count);
-    else
-      (*ptr->b_s_info.read_backing_store) (cinfo, & ptr->b_s_info,
-					   (void FAR *) ptr->mem_buffer[i],
-					   file_offset, byte_count);
-    file_offset += byte_count;
-  }
-}
-
-
-LOCAL(void)
-do_barray_io (j_common_ptr cinfo, jvirt_barray_ptr ptr, wxjpeg_boolean writing)
-/* Do backing store read or write of a virtual coefficient-block array */
-{
-  long bytesperrow, file_offset, byte_count, rows, thisrow, i;
-
-  bytesperrow = (long) ptr->blocksperrow * SIZEOF(JBLOCK);
-  file_offset = ptr->cur_start_row * bytesperrow;
-  /* Loop to read or write each allocation chunk in mem_buffer */
-  for (i = 0; i < (long) ptr->rows_in_mem; i += ptr->rowsperchunk) {
-    /* One chunk, but check for short chunk at end of buffer */
-    rows = MIN((long) ptr->rowsperchunk, (long) ptr->rows_in_mem - i);
-    /* Transfer no more than is currently defined */
-    thisrow = (long) ptr->cur_start_row + i;
-    rows = MIN(rows, (long) ptr->first_undef_row - thisrow);
-    /* Transfer no more than fits in file */
-    rows = MIN(rows, (long) ptr->rows_in_array - thisrow);
-    if (rows <= 0)		/* this chunk might be past end of file! */
-      break;
-    byte_count = rows * bytesperrow;
-    if (writing)
-      (*ptr->b_s_info.write_backing_store) (cinfo, & ptr->b_s_info,
-					    (void FAR *) ptr->mem_buffer[i],
-					    file_offset, byte_count);
-    else
-      (*ptr->b_s_info.read_backing_store) (cinfo, & ptr->b_s_info,
-					   (void FAR *) ptr->mem_buffer[i],
-					   file_offset, byte_count);
-    file_offset += byte_count;
-  }
-}
-
-
-METHODDEF(JSAMPARRAY)
-access_virt_sarray (j_common_ptr cinfo, jvirt_sarray_ptr ptr,
-		    JDIMENSION start_row, JDIMENSION num_rows,
-		    wxjpeg_boolean writable)
-/* Access the part of a virtual sample array starting at start_row */
-/* and extending for num_rows rows.  writable is true if  */
-/* caller intends to modify the accessed area. */
-{
-  JDIMENSION end_row = start_row + num_rows;
-  JDIMENSION undef_row;
-
-  /* debugging check */
-  if (end_row > ptr->rows_in_array || num_rows > ptr->maxaccess ||
-      ptr->mem_buffer == NULL)
-    ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
-
-  /* Make the desired part of the virtual array accessible */
-  if (start_row < ptr->cur_start_row ||
-      end_row > ptr->cur_start_row+ptr->rows_in_mem) {
-    if (! ptr->b_s_open)
-      ERREXIT(cinfo, JERR_VIRTUAL_BUG);
-    /* Flush old buffer contents if necessary */
-    if (ptr->dirty) {
-      do_sarray_io(cinfo, ptr, TRUE);
-      ptr->dirty = FALSE;
-    }
-    /* Decide what part of virtual array to access.
-     * Algorithm: if target address > current window, assume forward scan,
-     * load starting at target address.  If target address < current window,
-     * assume backward scan, load so that target area is top of window.
-     * Note that when switching from forward write to forward read, will have
-     * start_row = 0, so the limiting case applies and we load from 0 anyway.
-     */
-    if (start_row > ptr->cur_start_row) {
-      ptr->cur_start_row = start_row;
-    } else {
-      /* use long arithmetic here to avoid overflow & unsigned problems */
-      long ltemp;
-
-      ltemp = (long) end_row - (long) ptr->rows_in_mem;
-      if (ltemp < 0)
-	ltemp = 0;		/* don't fall off front end of file */
-      ptr->cur_start_row = (JDIMENSION) ltemp;
-    }
-    /* Read in the selected part of the array.
-     * During the initial write pass, we will do no actual read
-     * because the selected part is all undefined.
-     */
-    do_sarray_io(cinfo, ptr, FALSE);
-  }
-  /* Ensure the accessed part of the array is defined; prezero if needed.
-   * To improve locality of access, we only prezero the part of the array
-   * that the caller is about to access, not the entire in-memory array.
-   */
-  if (ptr->first_undef_row < end_row) {
-    if (ptr->first_undef_row < start_row) {
-      if (writable)		/* writer skipped over a section of array */
-	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
-      undef_row = start_row;	/* but reader is allowed to read ahead */
-    } else {
-      undef_row = ptr->first_undef_row;
-    }
-    if (writable)
-      ptr->first_undef_row = end_row;
-    if (ptr->pre_zero) {
-      size_t bytesperrow = (size_t) ptr->samplesperrow * SIZEOF(JSAMPLE);
-      undef_row -= ptr->cur_start_row; /* make indexes relative to buffer */
-      end_row -= ptr->cur_start_row;
-      while (undef_row < end_row) {
-	jzero_far((void FAR *) ptr->mem_buffer[undef_row], bytesperrow);
-	undef_row++;
-      }
-    } else {
-      if (! writable)		/* reader looking at undefined data */
-	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
-    }
-  }
-  /* Flag the buffer dirty if caller will write in it */
-  if (writable)
-    ptr->dirty = TRUE;
-  /* Return address of proper part of the buffer */
-  return ptr->mem_buffer + (start_row - ptr->cur_start_row);
-}
-
-
-METHODDEF(JBLOCKARRAY)
-access_virt_barray (j_common_ptr cinfo, jvirt_barray_ptr ptr,
-		    JDIMENSION start_row, JDIMENSION num_rows,
-		    wxjpeg_boolean writable)
-/* Access the part of a virtual block array starting at start_row */
-/* and extending for num_rows rows.  writable is true if  */
-/* caller intends to modify the accessed area. */
-{
-  JDIMENSION end_row = start_row + num_rows;
-  JDIMENSION undef_row;
-
-  /* debugging check */
-  if (end_row > ptr->rows_in_array || num_rows > ptr->maxaccess ||
-      ptr->mem_buffer == NULL)
-    ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
-
-  /* Make the desired part of the virtual array accessible */
-  if (start_row < ptr->cur_start_row ||
-      end_row > ptr->cur_start_row+ptr->rows_in_mem) {
-    if (! ptr->b_s_open)
-      ERREXIT(cinfo, JERR_VIRTUAL_BUG);
-    /* Flush old buffer contents if necessary */
-    if (ptr->dirty) {
-      do_barray_io(cinfo, ptr, TRUE);
-      ptr->dirty = FALSE;
-    }
-    /* Decide what part of virtual array to access.
-     * Algorithm: if target address > current window, assume forward scan,
-     * load starting at target address.  If target address < current window,
-     * assume backward scan, load so that target area is top of window.
-     * Note that when switching from forward write to forward read, will have
-     * start_row = 0, so the limiting case applies and we load from 0 anyway.
-     */
-    if (start_row > ptr->cur_start_row) {
-      ptr->cur_start_row = start_row;
-    } else {
-      /* use long arithmetic here to avoid overflow & unsigned problems */
-      long ltemp;
-
-      ltemp = (long) end_row - (long) ptr->rows_in_mem;
-      if (ltemp < 0)
-	ltemp = 0;		/* don't fall off front end of file */
-      ptr->cur_start_row = (JDIMENSION) ltemp;
-    }
-    /* Read in the selected part of the array.
-     * During the initial write pass, we will do no actual read
-     * because the selected part is all undefined.
-     */
-    do_barray_io(cinfo, ptr, FALSE);
-  }
-  /* Ensure the accessed part of the array is defined; prezero if needed.
-   * To improve locality of access, we only prezero the part of the array
-   * that the caller is about to access, not the entire in-memory array.
-   */
-  if (ptr->first_undef_row < end_row) {
-    if (ptr->first_undef_row < start_row) {
-      if (writable)		/* writer skipped over a section of array */
-	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
-      undef_row = start_row;	/* but reader is allowed to read ahead */
-    } else {
-      undef_row = ptr->first_undef_row;
-    }
-    if (writable)
-      ptr->first_undef_row = end_row;
-    if (ptr->pre_zero) {
-      size_t bytesperrow = (size_t) ptr->blocksperrow * SIZEOF(JBLOCK);
-      undef_row -= ptr->cur_start_row; /* make indexes relative to buffer */
-      end_row -= ptr->cur_start_row;
-      while (undef_row < end_row) {
-	jzero_far((void FAR *) ptr->mem_buffer[undef_row], bytesperrow);
-	undef_row++;
-      }
-    } else {
-      if (! writable)		/* reader looking at undefined data */
-	ERREXIT(cinfo, JERR_BAD_VIRTUAL_ACCESS);
-    }
-  }
-  /* Flag the buffer dirty if caller will write in it */
-  if (writable)
-    ptr->dirty = TRUE;
-  /* Return address of proper part of the buffer */
-  return ptr->mem_buffer + (start_row - ptr->cur_start_row);
-}
-
-
-/*
- * Release all objects belonging to a specified pool.
- */
-
-METHODDEF(void)
-free_pool (j_common_ptr cinfo, int pool_id)
-{
-  my_mem_ptr mem = (my_mem_ptr) cinfo->mem;
-  small_pool_ptr shdr_ptr;
-  large_pool_ptr lhdr_ptr;
-  size_t space_freed;
-
-  if (pool_id < 0 || pool_id >= JPOOL_NUMPOOLS)
-    ERREXIT1(cinfo, JERR_BAD_POOL_ID, pool_id);	/* safety check */
-
-#ifdef MEM_STATS
-  if (cinfo->err->trace_level > 1)
-    print_mem_stats(cinfo, pool_id); /* print pool's memory usage statistics */
-#endif
-
-  /* If freeing IMAGE pool, close any virtual arrays first */
-  if (pool_id == JPOOL_IMAGE) {
-    jvirt_sarray_ptr sptr;
-    jvirt_barray_ptr bptr;
-
-    for (sptr = mem->virt_sarray_list; sptr != NULL; sptr = sptr->next) {
-      if (sptr->b_s_open) {	/* there may be no backing store */
-	sptr->b_s_open = FALSE;	/* prevent recursive close if error */
-	(*sptr->b_s_info.close_backing_store) (cinfo, & sptr->b_s_info);
-      }
-    }
-    mem->virt_sarray_list = NULL;
-    for (bptr = mem->virt_barray_list; bptr != NULL; bptr = bptr->next) {
-      if (bptr->b_s_open) {	/* there may be no backing store */
-	bptr->b_s_open = FALSE;	/* prevent recursive close if error */
-	(*bptr->b_s_info.close_backing_store) (cinfo, & bptr->b_s_info);
-      }
-    }
-    mem->virt_barray_list = NULL;
-  }
-
-  /* Release large objects */
-  lhdr_ptr = mem->large_list[pool_id];
-  mem->large_list[pool_id] = NULL;
-
-  while (lhdr_ptr != NULL) {
-    large_pool_ptr next_lhdr_ptr = lhdr_ptr->hdr.next;
-    space_freed = lhdr_ptr->hdr.bytes_used +
-		  lhdr_ptr->hdr.bytes_left +
-		  SIZEOF(large_pool_hdr);
-    jpeg_free_large(cinfo, (void FAR *) lhdr_ptr, space_freed);
-    mem->total_space_allocated -= space_freed;
-    lhdr_ptr = next_lhdr_ptr;
-  }
-
-  /* Release small objects */
-  shdr_ptr = mem->small_list[pool_id];
-  mem->small_list[pool_id] = NULL;
-
-  while (shdr_ptr != NULL) {
-    small_pool_ptr next_shdr_ptr = shdr_ptr->hdr.next;
-    space_freed = shdr_ptr->hdr.bytes_used +
-		  shdr_ptr->hdr.bytes_left +
-		  SIZEOF(small_pool_hdr);
-    jpeg_free_small(cinfo, (void *) shdr_ptr, space_freed);
-    mem->total_space_allocated -= space_freed;
-    shdr_ptr = next_shdr_ptr;
-  }
-}
-
-
-/*
- * Close up shop entirely.
- * Note that this cannot be called unless cinfo->mem is non-NULL.
- */
-
-METHODDEF(void)
-self_destruct (j_common_ptr cinfo)
-{
-  int pool;
-
-  /* Close all backing store, release all memory.
-   * Releasing pools in reverse order might help avoid fragmentation
-   * with some (brain-damaged) malloc libraries.
-   */
-  for (pool = JPOOL_NUMPOOLS-1; pool >= JPOOL_PERMANENT; pool--) {
-    free_pool(cinfo, pool);
-  }
-
-  /* Release the memory manager control block too. */
-  jpeg_free_small(cinfo, (void *) cinfo->mem, SIZEOF(my_memory_mgr));
-  cinfo->mem = NULL;		/* ensures I will be called only once */
-
-  jpeg_mem_term(cinfo);		/* system-dependent cleanup */
-}
-
-
-/*
- * Memory manager initialization.
- * When this is called, only the error manager pointer is valid in cinfo!
- */
-
-GLOBAL(void)
-jinit_memory_mgr (j_common_ptr cinfo)
-{
-  my_mem_ptr mem;
-  long max_to_use;
-  int pool;
-  size_t test_mac;
-
-  cinfo->mem = NULL;		/* for safety if init fails */
-
-  /* Check for configuration errors.
-   * SIZEOF(ALIGN_TYPE) should be a power of 2; otherwise, it probably
-   * doesn't reflect any real hardware alignment requirement.
-   * The test is a little tricky: for X>0, X and X-1 have no one-bits
-   * in common if and only if X is a power of 2, ie has only one one-bit.
-   * Some compilers may give an "unreachable code" warning here; ignore it.
-   */
-  if ((SIZEOF(ALIGN_TYPE) & (SIZEOF(ALIGN_TYPE)-1)) != 0)
-    ERREXIT(cinfo, JERR_BAD_ALIGN_TYPE);
-  /* MAX_ALLOC_CHUNK must be representable as type size_t, and must be
-   * a multiple of SIZEOF(ALIGN_TYPE).
-   * Again, an "unreachable code" warning may be ignored here.
-   * But a "constant too large" warning means you need to fix MAX_ALLOC_CHUNK.
-   */
-  test_mac = (size_t) MAX_ALLOC_CHUNK;
-  if ((long) test_mac != MAX_ALLOC_CHUNK ||
-      (MAX_ALLOC_CHUNK % SIZEOF(ALIGN_TYPE)) != 0)
-    ERREXIT(cinfo, JERR_BAD_ALLOC_CHUNK);
-
-  max_to_use = jpeg_mem_init(cinfo); /* system-dependent initialization */
-
-  /* Attempt to allocate memory manager's control block */
-  mem = (my_mem_ptr) jpeg_get_small(cinfo, SIZEOF(my_memory_mgr));
-
-  if (mem == NULL) {
-    jpeg_mem_term(cinfo);	/* system-dependent cleanup */
-    ERREXIT1(cinfo, JERR_OUT_OF_MEMORY, 0);
-  }
-
-  /* OK, fill in the method pointers */
-  mem->pub.alloc_small = alloc_small;
-  mem->pub.alloc_large = alloc_large;
-  mem->pub.alloc_sarray = alloc_sarray;
-  mem->pub.alloc_barray = alloc_barray;
-  mem->pub.request_virt_sarray = request_virt_sarray;
-  mem->pub.request_virt_barray = request_virt_barray;
-  mem->pub.realize_virt_arrays = realize_virt_arrays;
-  mem->pub.access_virt_sarray = access_virt_sarray;
-  mem->pub.access_virt_barray = access_virt_barray;
-  mem->pub.free_pool = free_pool;
-  mem->pub.self_destruct = self_destruct;
-
-  /* Make MAX_ALLOC_CHUNK accessible to other modules */
-  mem->pub.max_alloc_chunk = MAX_ALLOC_CHUNK;
-
-  /* Initialize working state */
-  mem->pub.max_memory_to_use = max_to_use;
-
-  for (pool = JPOOL_NUMPOOLS-1; pool >= JPOOL_PERMANENT; pool--) {
-    mem->small_list[pool] = NULL;
-    mem->large_list[pool] = NULL;
-  }
-  mem->virt_sarray_list = NULL;
-  mem->virt_barray_list = NULL;
-
-  mem->total_space_allocated = SIZEOF(my_memory_mgr);
-
-  /* Declare ourselves open for business */
-  cinfo->mem = & mem->pub;
-
-  /* Check for an environment variable JPEGMEM; if found, override the
-   * default max_memory setting from jpeg_mem_init.  Note that the
-   * surrounding application may again override this value.
-   * If your system doesn't support getenv(), define NO_GETENV to disable
-   * this feature.
-   */
-#ifndef NO_GETENV
-  { char * memenv;
-
-    if ((memenv = getenv("JPEGMEM")) != NULL) {
-      char ch = 'x';
-
-      if (sscanf(memenv, "%ld%c", &max_to_use, &ch) > 0) {
-	if (ch == 'm' || ch == 'M')
-	  max_to_use *= 1000L;
-	mem->pub.max_memory_to_use = max_to_use * 1000L;
-      }
-    }
-  }
-#endif
-
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemname.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemname.c
deleted file mode 100644
index ed96dee1bc..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemname.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * jmemname.c
- *
- * Copyright (C) 1992-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file provides a generic implementation of the system-dependent
- * portion of the JPEG memory manager.  This implementation assumes that
- * you must explicitly construct a name for each temp file.
- * Also, the problem of determining the amount of memory available
- * is shoved onto the user.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jmemsys.h"		/* import the system-dependent declarations */
-
-#ifndef HAVE_STDLIB_H		/*  should declare malloc(),free() */
-extern void * malloc JPP((size_t size));
-extern void free JPP((void *ptr));
-#endif
-
-#ifndef SEEK_SET		/* pre-ANSI systems may not define this; */
-#define SEEK_SET  0		/* if not, assume 0 is correct */
-#endif
-
-#ifdef DONT_USE_B_MODE		/* define mode parameters for fopen() */
-#define READ_BINARY	"r"
-#define RW_BINARY	"w+"
-#else
-#ifdef VMS			/* VMS is very nonstandard */
-#define READ_BINARY	"rb", "ctx=stm"
-#define RW_BINARY	"w+b", "ctx=stm"
-#else				/* standard ANSI-compliant case */
-#define READ_BINARY	"rb"
-#define RW_BINARY	"w+b"
-#endif
-#endif
-
-
-/*
- * Selection of a file name for a temporary file.
- * This is system-dependent!
- *
- * The code as given is suitable for most Unix systems, and it is easily
- * modified for most non-Unix systems.  Some notes:
- *  1.  The temp file is created in the directory named by TEMP_DIRECTORY.
- *      The default value is /usr/tmp, which is the conventional place for
- *      creating large temp files on Unix.  On other systems you'll probably
- *      want to change the file location.  You can do this by editing the
- *      #define, or (preferred) by defining TEMP_DIRECTORY in jconfig.h.
- *
- *  2.  If you need to change the file name as well as its location,
- *      you can override the TEMP_FILE_NAME macro.  (Note that this is
- *      actually a printf format string; it must contain %s and %d.)
- *      Few people should need to do this.
- *
- *  3.  mktemp() is used to ensure that multiple processes running
- *      simultaneously won't select the same file names.  If your system
- *      doesn't have mktemp(), define NO_MKTEMP to do it the hard way.
- *      (If you don't have , also define NO_ERRNO_H.)
- *
- *  4.  You probably want to define NEED_SIGNAL_CATCHER so that cjpeg.c/djpeg.c
- *      will cause the temp files to be removed if you stop the program early.
- */
-
-#ifndef TEMP_DIRECTORY		/* can override from jconfig.h or Makefile */
-#define TEMP_DIRECTORY  "/usr/tmp/" /* recommended setting for Unix */
-#endif
-
-static int next_file_num;	/* to distinguish among several temp files */
-
-#ifdef NO_MKTEMP
-
-#ifndef TEMP_FILE_NAME		/* can override from jconfig.h or Makefile */
-#define TEMP_FILE_NAME  "%sJPG%03d.TMP"
-#endif
-
-#ifndef NO_ERRNO_H
-#include 		/* to define ENOENT */
-#endif
-
-/* ANSI C specifies that errno is a macro, but on older systems it's more
- * likely to be a plain int variable.  And not all versions of errno.h
- * bother to declare it, so we have to in order to be most portable.  Thus:
- */
-#ifndef errno
-extern int errno;
-#endif
-
-
-LOCAL(void)
-select_file_name (char * fname)
-{
-  FILE * tfile;
-
-  /* Keep generating file names till we find one that's not in use */
-  for (;;) {
-    next_file_num++;		/* advance counter */
-    sprintf(fname, TEMP_FILE_NAME, TEMP_DIRECTORY, next_file_num);
-    if ((tfile = fopen(fname, READ_BINARY)) == NULL) {
-      /* fopen could have failed for a reason other than the file not
-       * being there; for example, file there but unreadable.
-       * If  isn't available, then we cannot test the cause.
-       */
-#ifdef ENOENT
-      if (errno != ENOENT)
-	continue;
-#endif
-      break;
-    }
-    fclose(tfile);		/* oops, it's there; close tfile & try again */
-  }
-}
-
-#else /* ! NO_MKTEMP */
-
-/* Note that mktemp() requires the initial filename to end in six X's */
-#ifndef TEMP_FILE_NAME		/* can override from jconfig.h or Makefile */
-#define TEMP_FILE_NAME  "%sJPG%dXXXXXX"
-#endif
-
-LOCAL(void)
-select_file_name (char * fname)
-{
-  next_file_num++;		/* advance counter */
-  sprintf(fname, TEMP_FILE_NAME, TEMP_DIRECTORY, next_file_num);
-  mktemp(fname);		/* make sure file name is unique */
-  /* mktemp replaces the trailing XXXXXX with a unique string of characters */
-}
-
-#endif /* NO_MKTEMP */
-
-
-/*
- * Memory allocation and freeing are controlled by the regular library
- * routines malloc() and free().
- */
-
-GLOBAL(void *)
-jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)
-{
-  return (void *) malloc(sizeofobject);
-}
-
-GLOBAL(void)
-jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
-{
-  free(object);
-}
-
-
-/*
- * "Large" objects are treated the same as "small" ones.
- * NB: although we include FAR keywords in the routine declarations,
- * this file won't actually work in 80x86 small/medium model; at least,
- * you probably won't be able to process useful-size images in only 64KB.
- */
-
-GLOBAL(void FAR *)
-jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)
-{
-  return (void FAR *) malloc(sizeofobject);
-}
-
-GLOBAL(void)
-jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
-{
-  free(object);
-}
-
-
-/*
- * This routine computes the total memory space available for allocation.
- * It's impossible to do this in a portable way; our current solution is
- * to make the user tell us (with a default value set at compile time).
- * If you can actually get the available space, it's a good idea to subtract
- * a slop factor of 5% or so.
- */
-
-#ifndef DEFAULT_MAX_MEM		/* so can override from makefile */
-#define DEFAULT_MAX_MEM		1000000L /* default: one megabyte */
-#endif
-
-GLOBAL(long)
-jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
-		    long max_bytes_needed, long already_allocated)
-{
-  return cinfo->mem->max_memory_to_use - already_allocated;
-}
-
-
-/*
- * Backing store (temporary file) management.
- * Backing store objects are only used when the value returned by
- * jpeg_mem_available is less than the total space needed.  You can dispense
- * with these routines if you have plenty of virtual memory; see jmemnobs.c.
- */
-
-
-METHODDEF(void)
-read_backing_store (j_common_ptr cinfo, backing_store_ptr info,
-		    void FAR * buffer_address,
-		    long file_offset, long byte_count)
-{
-  if (fseek(info->temp_file, file_offset, SEEK_SET))
-    ERREXIT(cinfo, JERR_TFILE_SEEK);
-  if (JFREAD(info->temp_file, buffer_address, byte_count)
-      != (size_t) byte_count)
-    ERREXIT(cinfo, JERR_TFILE_READ);
-}
-
-
-METHODDEF(void)
-write_backing_store (j_common_ptr cinfo, backing_store_ptr info,
-		     void FAR * buffer_address,
-		     long file_offset, long byte_count)
-{
-  if (fseek(info->temp_file, file_offset, SEEK_SET))
-    ERREXIT(cinfo, JERR_TFILE_SEEK);
-  if (JFWRITE(info->temp_file, buffer_address, byte_count)
-      != (size_t) byte_count)
-    ERREXIT(cinfo, JERR_TFILE_WRITE);
-}
-
-
-METHODDEF(void)
-close_backing_store (j_common_ptr cinfo, backing_store_ptr info)
-{
-  fclose(info->temp_file);	/* close the file */
-  unlink(info->temp_name);	/* delete the file */
-/* If your system doesn't have unlink(), use remove() instead.
- * remove() is the ANSI-standard name for this function, but if
- * your system was ANSI you'd be using jmemansi.c, right?
- */
-  TRACEMSS(cinfo, 1, JTRC_TFILE_CLOSE, info->temp_name);
-}
-
-
-/*
- * Initial opening of a backing-store object.
- */
-
-GLOBAL(void)
-jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
-			 long total_bytes_needed)
-{
-  select_file_name(info->temp_name);
-  if ((info->temp_file = fopen(info->temp_name, RW_BINARY)) == NULL)
-    ERREXITS(cinfo, JERR_TFILE_CREATE, info->temp_name);
-  info->read_backing_store = read_backing_store;
-  info->write_backing_store = write_backing_store;
-  info->close_backing_store = close_backing_store;
-  TRACEMSS(cinfo, 1, JTRC_TFILE_OPEN, info->temp_name);
-}
-
-
-/*
- * These routines take care of any system-dependent initialization and
- * cleanup required.
- */
-
-GLOBAL(long)
-jpeg_mem_init (j_common_ptr cinfo)
-{
-  next_file_num = 0;		/* initialize temp file name generator */
-  return DEFAULT_MAX_MEM;	/* default for max_memory_to_use */
-}
-
-GLOBAL(void)
-jpeg_mem_term (j_common_ptr cinfo)
-{
-  /* no work */
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemnobs.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemnobs.c
deleted file mode 100644
index eb8c337725..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemnobs.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * jmemnobs.c
- *
- * Copyright (C) 1992-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file provides a really simple implementation of the system-
- * dependent portion of the JPEG memory manager.  This implementation
- * assumes that no backing-store files are needed: all required space
- * can be obtained from malloc().
- * This is very portable in the sense that it'll compile on almost anything,
- * but you'd better have lots of main memory (or virtual memory) if you want
- * to process big images.
- * Note that the max_memory_to_use option is ignored by this implementation.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-#include "jmemsys.h"		/* import the system-dependent declarations */
-
-#ifndef HAVE_STDLIB_H		/*  should declare malloc(),free() */
-extern void * malloc JPP((size_t size));
-extern void free JPP((void *ptr));
-#endif
-
-
-/*
- * Memory allocation and freeing are controlled by the regular library
- * routines malloc() and free().
- */
-
-GLOBAL(void *)
-jpeg_get_small (j_common_ptr cinfo, size_t sizeofobject)
-{
-  return (void *) malloc(sizeofobject);
-}
-
-GLOBAL(void)
-jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
-{
-  free(object);
-}
-
-
-/*
- * "Large" objects are treated the same as "small" ones.
- * NB: although we include FAR keywords in the routine declarations,
- * this file won't actually work in 80x86 small/medium model; at least,
- * you probably won't be able to process useful-size images in only 64KB.
- */
-
-GLOBAL(void FAR *)
-jpeg_get_large (j_common_ptr cinfo, size_t sizeofobject)
-{
-  return (void FAR *) malloc(sizeofobject);
-}
-
-GLOBAL(void)
-jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
-{
-  free(object);
-}
-
-
-/*
- * This routine computes the total memory space available for allocation.
- * Here we always say, "we got all you want bud!"
- */
-
-GLOBAL(long)
-jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
-		    long max_bytes_needed, long already_allocated)
-{
-  return max_bytes_needed;
-}
-
-
-/*
- * Backing store (temporary file) management.
- * Since jpeg_mem_available always promised the moon,
- * this should never be called and we can just error out.
- */
-
-GLOBAL(void)
-jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
-			 long total_bytes_needed)
-{
-  ERREXIT(cinfo, JERR_NO_BACKING_STORE);
-}
-
-
-/*
- * These routines take care of any system-dependent initialization and
- * cleanup required.  Here, there isn't any.
- */
-
-GLOBAL(long)
-jpeg_mem_init (j_common_ptr cinfo)
-{
-  return 0;			/* just set max_memory_to_use to 0 */
-}
-
-GLOBAL(void)
-jpeg_mem_term (j_common_ptr cinfo)
-{
-  /* no work */
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemsys.h b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemsys.h
deleted file mode 100644
index 6c3c6d348f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmemsys.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * jmemsys.h
- *
- * Copyright (C) 1992-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This include file defines the interface between the system-independent
- * and system-dependent portions of the JPEG memory manager.  No other
- * modules need include it.  (The system-independent portion is jmemmgr.c;
- * there are several different versions of the system-dependent portion.)
- *
- * This file works as-is for the system-dependent memory managers supplied
- * in the IJG distribution.  You may need to modify it if you write a
- * custom memory manager.  If system-dependent changes are needed in
- * this file, the best method is to #ifdef them based on a configuration
- * symbol supplied in jconfig.h, as we have done with USE_MSDOS_MEMMGR
- * and USE_MAC_MEMMGR.
- */
-
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jpeg_get_small		jGetSmall
-#define jpeg_free_small		jFreeSmall
-#define jpeg_get_large		jGetLarge
-#define jpeg_free_large		jFreeLarge
-#define jpeg_mem_available	jMemAvail
-#define jpeg_open_backing_store	jOpenBackStore
-#define jpeg_mem_init		jMemInit
-#define jpeg_mem_term		jMemTerm
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/*
- * These two functions are used to allocate and release small chunks of
- * memory.  (Typically the total amount requested through jpeg_get_small is
- * no more than 20K or so; this will be requested in chunks of a few K each.)
- * Behavior should be the same as for the standard library functions malloc
- * and free; in particular, jpeg_get_small must return NULL on failure.
- * On most systems, these ARE malloc and free.  jpeg_free_small is passed the
- * size of the object being freed, just in case it's needed.
- * On an 80x86 machine using small-data memory model, these manage near heap.
- */
-
-EXTERN(void *) jpeg_get_small JPP((j_common_ptr cinfo, size_t sizeofobject));
-EXTERN(void) jpeg_free_small JPP((j_common_ptr cinfo, void * object,
-				  size_t sizeofobject));
-
-/*
- * These two functions are used to allocate and release large chunks of
- * memory (up to the total free space designated by jpeg_mem_available).
- * The interface is the same as above, except that on an 80x86 machine,
- * far pointers are used.  On most other machines these are identical to
- * the jpeg_get/free_small routines; but we keep them separate anyway,
- * in case a different allocation strategy is desirable for large chunks.
- */
-
-EXTERN(void FAR *) jpeg_get_large JPP((j_common_ptr cinfo,
-				       size_t sizeofobject));
-EXTERN(void) jpeg_free_large JPP((j_common_ptr cinfo, void FAR * object,
-				  size_t sizeofobject));
-
-/*
- * The macro MAX_ALLOC_CHUNK designates the maximum number of bytes that may
- * be requested in a single call to jpeg_get_large (and jpeg_get_small for that
- * matter, but that case should never come into play).  This macro is needed
- * to model the 64Kb-segment-size limit of far addressing on 80x86 machines.
- * On those machines, we expect that jconfig.h will provide a proper value.
- * On machines with 32-bit flat address spaces, any large constant may be used.
- *
- * NB: jmemmgr.c expects that MAX_ALLOC_CHUNK will be representable as type
- * size_t and will be a multiple of sizeof(align_type).
- */
-
-#ifndef MAX_ALLOC_CHUNK		/* may be overridden in jconfig.h */
-#define MAX_ALLOC_CHUNK  1000000000L
-#endif
-
-/*
- * This routine computes the total space still available for allocation by
- * jpeg_get_large.  If more space than this is needed, backing store will be
- * used.  NOTE: any memory already allocated must not be counted.
- *
- * There is a minimum space requirement, corresponding to the minimum
- * feasible buffer sizes; jmemmgr.c will request that much space even if
- * jpeg_mem_available returns zero.  The maximum space needed, enough to hold
- * all working storage in memory, is also passed in case it is useful.
- * Finally, the total space already allocated is passed.  If no better
- * method is available, cinfo->mem->max_memory_to_use - already_allocated
- * is often a suitable calculation.
- *
- * It is OK for jpeg_mem_available to underestimate the space available
- * (that'll just lead to more backing-store access than is really necessary).
- * However, an overestimate will lead to failure.  Hence it's wise to subtract
- * a slop factor from the true available space.  5% should be enough.
- *
- * On machines with lots of virtual memory, any large constant may be returned.
- * Conversely, zero may be returned to always use the minimum amount of memory.
- */
-
-EXTERN(long) jpeg_mem_available JPP((j_common_ptr cinfo,
-				     long min_bytes_needed,
-				     long max_bytes_needed,
-				     long already_allocated));
-
-
-/*
- * This structure holds whatever state is needed to access a single
- * backing-store object.  The read/write/close method pointers are called
- * by jmemmgr.c to manipulate the backing-store object; all other fields
- * are private to the system-dependent backing store routines.
- */
-
-#define TEMP_NAME_LENGTH   64	/* max length of a temporary file's name */
-
-
-#ifdef USE_MSDOS_MEMMGR		/* DOS-specific junk */
-
-typedef unsigned short XMSH;	/* type of extended-memory handles */
-typedef unsigned short EMSH;	/* type of expanded-memory handles */
-
-typedef union {
-  short file_handle;		/* DOS file handle if it's a temp file */
-  XMSH xms_handle;		/* handle if it's a chunk of XMS */
-  EMSH ems_handle;		/* handle if it's a chunk of EMS */
-} handle_union;
-
-#endif /* USE_MSDOS_MEMMGR */
-
-#ifdef USE_MAC_MEMMGR		/* Mac-specific junk */
-#include 
-#endif /* USE_MAC_MEMMGR */
-
-
-typedef struct backing_store_struct * backing_store_ptr;
-
-typedef struct backing_store_struct {
-  /* Methods for reading/writing/closing this backing-store object */
-  JMETHOD(void, read_backing_store, (j_common_ptr cinfo,
-				     backing_store_ptr info,
-				     void FAR * buffer_address,
-				     long file_offset, long byte_count));
-  JMETHOD(void, write_backing_store, (j_common_ptr cinfo,
-				      backing_store_ptr info,
-				      void FAR * buffer_address,
-				      long file_offset, long byte_count));
-  JMETHOD(void, close_backing_store, (j_common_ptr cinfo,
-				      backing_store_ptr info));
-
-  /* Private fields for system-dependent backing-store management */
-#ifdef USE_MSDOS_MEMMGR
-  /* For the MS-DOS manager (jmemdos.c), we need: */
-  handle_union handle;		/* reference to backing-store storage object */
-  char temp_name[TEMP_NAME_LENGTH]; /* name if it's a file */
-#else
-#ifdef USE_MAC_MEMMGR
-  /* For the Mac manager (jmemmac.c), we need: */
-  short temp_file;		/* file reference number to temp file */
-  FSSpec tempSpec;		/* the FSSpec for the temp file */
-  char temp_name[TEMP_NAME_LENGTH]; /* name if it's a file */
-#else
-  /* For a typical implementation with temp files, we need: */
-  FILE * temp_file;		/* stdio reference to temp file */
-  char temp_name[TEMP_NAME_LENGTH]; /* name of temp file */
-#endif
-#endif
-} backing_store_info;
-
-
-/*
- * Initial opening of a backing-store object.  This must fill in the
- * read/write/close pointers in the object.  The read/write routines
- * may take an error exit if the specified maximum file size is exceeded.
- * (If jpeg_mem_available always returns a large value, this routine can
- * just take an error exit.)
- */
-
-EXTERN(void) jpeg_open_backing_store JPP((j_common_ptr cinfo,
-					  backing_store_ptr info,
-					  long total_bytes_needed));
-
-
-/*
- * These routines take care of any system-dependent initialization and
- * cleanup required.  jpeg_mem_init will be called before anything is
- * allocated (and, therefore, nothing in cinfo is of use except the error
- * manager pointer).  It should return a suitable default value for
- * max_memory_to_use; this may subsequently be overridden by the surrounding
- * application.  (Note that max_memory_to_use is only important if
- * jpeg_mem_available chooses to consult it ... no one else will.)
- * jpeg_mem_term may assume that all requested memory has been freed and that
- * all opened backing-store objects have been closed.
- */
-
-EXTERN(long) jpeg_mem_init JPP((j_common_ptr cinfo));
-EXTERN(void) jpeg_mem_term JPP((j_common_ptr cinfo));
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmorecfg.h b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmorecfg.h
deleted file mode 100644
index c4a5d33b08..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jmorecfg.h
+++ /dev/null
@@ -1,420 +0,0 @@
-/*
- * jmorecfg.h
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains additional configuration options that customize the
- * JPEG software for special applications or support machine-dependent
- * optimizations.  Most users will not need to touch this file.
- */
-
-
-/*
- * Define BITS_IN_JSAMPLE as either
- *   8   for 8-bit sample values (the usual setting)
- *   12  for 12-bit sample values
- * Only 8 and 12 are legal data precisions for lossy JPEG according to the
- * JPEG standard, and the IJG code does not support anything else!
- * We do not support run-time selection of data precision, sorry.
- */
-
-#define BITS_IN_JSAMPLE  8	/* use 8 or 12 */
-
-
-/*
- * Maximum number of components (color channels) allowed in JPEG image.
- * To meet the letter of the JPEG spec, set this to 255.  However, darn
- * few applications need more than 4 channels (maybe 5 for CMYK + alpha
- * mask).  We recommend 10 as a reasonable compromise; use 4 if you are
- * really short on memory.  (Each allowed component costs a hundred or so
- * bytes of storage, whether actually used in an image or not.)
- */
-
-#define MAX_COMPONENTS  10	/* maximum number of image components */
-
-
-/*
- * Basic data types.
- * You may need to change these if you have a machine with unusual data
- * type sizes; for example, "char" not 8 bits, "short" not 16 bits,
- * or "long" not 32 bits.  We don't care whether "int" is 16 or 32 bits,
- * but it had better be at least 16.
- */
-
-/* Representation of a single sample (pixel element value).
- * We frequently allocate large arrays of these, so it's important to keep
- * them small.  But if you have memory to burn and access to char or short
- * arrays is very slow on your hardware, you might want to change these.
- */
-
-#if BITS_IN_JSAMPLE == 8
-/* JSAMPLE should be the smallest type that will hold the values 0..255.
- * You can use a signed char by having GETJSAMPLE mask it with 0xFF.
- */
-
-#ifdef HAVE_UNSIGNED_CHAR
-
-typedef unsigned char JSAMPLE;
-#define GETJSAMPLE(value)  ((int) (value))
-
-#else /* not HAVE_UNSIGNED_CHAR */
-
-typedef char JSAMPLE;
-#ifdef CHAR_IS_UNSIGNED
-#define GETJSAMPLE(value)  ((int) (value))
-#else
-#define GETJSAMPLE(value)  ((int) (value) & 0xFF)
-#endif /* CHAR_IS_UNSIGNED */
-
-#endif /* HAVE_UNSIGNED_CHAR */
-
-#define MAXJSAMPLE	255
-#define CENTERJSAMPLE	128
-
-#endif /* BITS_IN_JSAMPLE == 8 */
-
-
-#if BITS_IN_JSAMPLE == 12
-/* JSAMPLE should be the smallest type that will hold the values 0..4095.
- * On nearly all machines "short" will do nicely.
- */
-
-typedef short JSAMPLE;
-#define GETJSAMPLE(value)  ((int) (value))
-
-#define MAXJSAMPLE	4095
-#define CENTERJSAMPLE	2048
-
-#endif /* BITS_IN_JSAMPLE == 12 */
-
-
-/* Representation of a DCT frequency coefficient.
- * This should be a signed value of at least 16 bits; "short" is usually OK.
- * Again, we allocate large arrays of these, but you can change to int
- * if you have memory to burn and "short" is really slow.
- */
-
-typedef short JCOEF;
-
-
-/* Compressed datastreams are represented as arrays of JOCTET.
- * These must be EXACTLY 8 bits wide, at least once they are written to
- * external storage.  Note that when using the stdio data source/destination
- * managers, this is also the data type passed to fread/fwrite.
- */
-
-#ifdef HAVE_UNSIGNED_CHAR
-
-typedef unsigned char JOCTET;
-#define GETJOCTET(value)  (value)
-
-#else /* not HAVE_UNSIGNED_CHAR */
-
-typedef char JOCTET;
-#ifdef CHAR_IS_UNSIGNED
-#define GETJOCTET(value)  (value)
-#else
-#define GETJOCTET(value)  ((value) & 0xFF)
-#endif /* CHAR_IS_UNSIGNED */
-
-#endif /* HAVE_UNSIGNED_CHAR */
-
-
-/* These typedefs are used for various table entries and so forth.
- * They must be at least as wide as specified; but making them too big
- * won't cost a huge amount of memory, so we don't provide special
- * extraction code like we did for JSAMPLE.  (In other words, these
- * typedefs live at a different point on the speed/space tradeoff curve.)
- */
-
-/* UINT8 must hold at least the values 0..255. */
-#ifndef __WINE_BASETSD_H
-
-#ifdef HAVE_UNSIGNED_CHAR
-typedef unsigned char UINT8;
-#else /* not HAVE_UNSIGNED_CHAR */
-#ifdef CHAR_IS_UNSIGNED
-typedef char UINT8;
-#else /* not CHAR_IS_UNSIGNED */
-typedef short UINT8;
-#endif /* CHAR_IS_UNSIGNED */
-#endif /* HAVE_UNSIGNED_CHAR */
-
-/* UINT16 must hold at least the values 0..65535. */
-
-#ifdef HAVE_UNSIGNED_SHORT
-typedef unsigned short UINT16;
-#else /* not HAVE_UNSIGNED_SHORT */
-typedef unsigned int UINT16;
-#endif /* HAVE_UNSIGNED_SHORT */
-
-/* INT16 must hold at least the values -32768..32767. */
-
-#ifndef XMD_H			/* X11/xmd.h correctly defines INT16 */
-typedef short INT16;
-#endif
-
-#endif /* __WINE_BASETSD_H */
-
-/* INT32 must hold at least signed 32-bit values. */
-
-/*
-    VZ: due to the horrible mess resulting in INT32 being defined in windows.h
-        for some compilers but not for the other ones, I have globally replace
-        INT32 with JPEG_INT32 in libjpeg code to avoid the eight level ifdef
-        which used to be here. The problem is that, of course, now we'll have
-        conflicts when upgrading to the next libjpeg release -- however
-        considering their frequency (1 in the last 5 years) it seems that
-        it is not too high a price to pay for the clean compilation with all
-        versions of mingw32 and cygwin
- */
-typedef long JPEG_INT32;
-
-/* Datatype used for image dimensions.  The JPEG standard only supports
- * images up to 64K*64K due to 16-bit fields in SOF markers.  Therefore
- * "unsigned int" is sufficient on all machines.  However, if you need to
- * handle larger images and you don't mind deviating from the spec, you
- * can change this datatype.
- */
-
-typedef unsigned int JDIMENSION;
-
-#define JPEG_MAX_DIMENSION  65500L  /* a tad under 64K to prevent overflows */
-
-
-/* These macros are used in all function definitions and extern declarations.
- * You could modify them if you need to change function linkage conventions;
- * in particular, you'll need to do that to make the library a Windows DLL.
- * Another application is to make all functions global for use with debuggers
- * or code profilers that require it.
- */
-
-#if defined(__VISAGECPP__)
-#define JPEG_CALLING_CONV _Optlink
-#else /* !Visual Age C++ */
-#define JPEG_CALLING_CONV
-#endif
-
-/* We can't declare a static function as extern "C" as we need to do in C++
- * programs, so suppress static in METHODDEF when using C++.
- */
-#if defined(__cplusplus)
-#define JPEG_METHOD_LINKAGE
-#else /* !__cplusplus */
-#define JPEG_METHOD_LINKAGE static
-#endif
-
-/* a function called through method pointers: */
-#define METHODDEF(type)		JPEG_METHOD_LINKAGE type JPEG_CALLING_CONV
-/* a function used only in its module: */
-#define LOCAL(type)		static type JPEG_CALLING_CONV
-/* a function referenced thru EXTERNs: */
-#define GLOBAL(type)		type
-/* a reference to a GLOBAL function: */
-#define EXTERN(type)		extern type JPEG_CALLING_CONV
-
-/* This macro is used to declare a "method", that is, a function pointer.
- * We want to supply prototype parameters if the compiler can cope.
- * Note that the arglist parameter must be parenthesized!
- * Again, you can customize this if you need special linkage keywords.
- */
-
-#if defined(__VISAGECPP__) /* need this for /common/imagjpeg.obj but not loclly */
-#ifdef HAVE_PROTOTYPES
-#define JMETHOD(type,methodname,arglist)  type (_Optlink *methodname) arglist
-#else
-#define JMETHOD(type,methodname,arglist)  type (_Optlink *methodname) ()
-#endif
-
-#else
-
-#ifdef HAVE_PROTOTYPES
-#define JMETHOD(type,methodname,arglist)  type (*methodname) arglist
-#else
-#define JMETHOD(type,methodname,arglist)  type (*methodname) ()
-#endif
-
-#endif
-
-/* Here is the pseudo-keyword for declaring pointers that must be "far"
- * on 80x86 machines.  Most of the specialized coding for 80x86 is handled
- * by just saying "FAR *" where such a pointer is needed.  In a few places
- * explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol.
- */
-
-#ifdef NEED_FAR_POINTERS
-#define FAR  far
-#else
-#ifndef FAR
-#define FAR
-#endif
-#endif
-
-
-/*
- * On a few systems, type boolean and/or its values FALSE, TRUE may appear
- * in standard header files.  Or you may have conflicts with application-
- * specific header files that you want to include together with these files.
- * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
- */
-
-#if 0
-#ifndef HAVE_BOOLEAN
-typedef int boolean;
-#endif
-#endif
-
-/*
- * Notes about boolean above:
- *
- * The main conflict we see is with the Windows headers of some compilers that
- * have a different definition of boolean. Therefore boolean has been replaced
- * with wxjpeg_boolean throughout the jpeg sources. The alternative would have
- * been to make the definition here the same as the Windows definition. It's
- * not enough to just define HAVE_BOOLEAN when using the jpeg library, the
- * definition of boolean must match when the jpeg library is compiled too.
- *
- * System jepg libs won't have this type, of course, so to use test
- * HAVE_WXJPEG_BOOLEAN and fall back to boolean when not defined.
- */
-
-typedef int wxjpeg_boolean;
-#define HAVE_WXJPEG_BOOLEAN
-
-#ifndef FALSE			/* in case these macros already exist */
-#define FALSE	0		/* values of boolean */
-#endif
-#ifndef TRUE
-#define TRUE	1
-#endif
-
-
-/*
- * The remaining options affect code selection within the JPEG library,
- * but they don't need to be visible to most applications using the library.
- * To minimize application namespace pollution, the symbols won't be
- * defined unless JPEG_INTERNALS or JPEG_INTERNAL_OPTIONS has been defined.
- */
-
-#ifdef JPEG_INTERNALS
-#define JPEG_INTERNAL_OPTIONS
-#endif
-
-#ifdef JPEG_INTERNAL_OPTIONS
-
-
-/*
- * These defines indicate whether to include various optional functions.
- * Undefining some of these symbols will produce a smaller but less capable
- * library.  Note that you can leave certain source files out of the
- * compilation/linking process if you've #undef'd the corresponding symbols.
- * (You may HAVE to do that if your compiler doesn't like null source files.)
- */
-
-/* Arithmetic coding is unsupported for legal reasons.  Complaints to IBM. */
-
-/* Capability options common to encoder and decoder: */
-
-#define DCT_ISLOW_SUPPORTED	/* slow but accurate integer algorithm */
-#define DCT_IFAST_SUPPORTED	/* faster, less accurate integer method */
-#define DCT_FLOAT_SUPPORTED	/* floating-point: accurate, fast on fast HW */
-
-/* Encoder capability options: */
-
-#undef  C_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
-#define C_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
-#define C_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/
-#define ENTROPY_OPT_SUPPORTED	    /* Optimization of entropy coding parms? */
-/* Note: if you selected 12-bit data precision, it is dangerous to turn off
- * ENTROPY_OPT_SUPPORTED.  The standard Huffman tables are only good for 8-bit
- * precision, so jchuff.c normally uses entropy optimization to compute
- * usable tables for higher precision.  If you don't want to do optimization,
- * you'll have to supply different default Huffman tables.
- * The exact same statements apply for progressive JPEG: the default tables
- * don't work for progressive mode.  (This may get fixed, however.)
- */
-#define INPUT_SMOOTHING_SUPPORTED   /* Input image smoothing option? */
-
-/* Decoder capability options: */
-
-#undef  D_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
-#define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
-#define D_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/
-#define SAVE_MARKERS_SUPPORTED	    /* jpeg_save_markers() needed? */
-#define BLOCK_SMOOTHING_SUPPORTED   /* Block smoothing? (Progressive only) */
-#define IDCT_SCALING_SUPPORTED	    /* Output rescaling via IDCT? */
-#undef  UPSAMPLE_SCALING_SUPPORTED  /* Output rescaling at upsample stage? */
-#define UPSAMPLE_MERGING_SUPPORTED  /* Fast path for sloppy upsampling? */
-#define QUANT_1PASS_SUPPORTED	    /* 1-pass color quantization? */
-#define QUANT_2PASS_SUPPORTED	    /* 2-pass color quantization? */
-
-/* more capability options later, no doubt */
-
-
-/*
- * Ordering of RGB data in scanlines passed to or from the application.
- * If your application wants to deal with data in the order B,G,R, just
- * change these macros.  You can also deal with formats such as R,G,B,X
- * (one extra byte per pixel) by changing RGB_PIXELSIZE.  Note that changing
- * the offsets will also change the order in which colormap data is organized.
- * RESTRICTIONS:
- * 1. The sample applications cjpeg,djpeg do NOT support modified RGB formats.
- * 2. These macros only affect RGB<=>YCbCr color conversion, so they are not
- *    useful if you are using JPEG color spaces other than YCbCr or grayscale.
- * 3. The color quantizer modules will not behave desirably if RGB_PIXELSIZE
- *    is not 3 (they don't understand about dummy color components!).  So you
- *    can't use color quantization if you change that value.
- */
-
-#define RGB_RED		0	/* Offset of Red in an RGB scanline element */
-#define RGB_GREEN	1	/* Offset of Green */
-#define RGB_BLUE	2	/* Offset of Blue */
-#define RGB_PIXELSIZE	3	/* JSAMPLEs per RGB scanline element */
-
-
-/* Definitions for speed-related optimizations. */
-
-
-/* If your compiler supports inline functions, define INLINE
- * as the inline keyword; otherwise define it as empty.
- */
-
-#ifndef INLINE
-#ifdef __GNUC__			/* for instance, GNU C knows about inline */
-#define INLINE __inline__
-#endif
-#ifndef INLINE
-#define INLINE			/* default is to define it as empty */
-#endif
-#endif
-
-
-/* On some machines (notably 68000 series) "int" is 32 bits, but multiplying
- * two 16-bit shorts is faster than multiplying two ints.  Define MULTIPLIER
- * as short on such a machine.  MULTIPLIER must be at least 16 bits wide.
- */
-
-#ifndef MULTIPLIER
-#define MULTIPLIER  int		/* type for fastest integer multiply */
-#endif
-
-
-/* FAST_FLOAT should be either float or double, whichever is done faster
- * by your compiler.  (Note that this type is only used in the floating point
- * DCT routines, so it only matters if you've defined DCT_FLOAT_SUPPORTED.)
- * Typically, float is faster in ANSI C compilers, while double is faster in
- * pre-ANSI compilers (because they insist on converting to double anyway).
- * The code below therefore chooses float if we have ANSI-style prototypes.
- */
-
-#ifndef FAST_FLOAT
-#ifdef HAVE_PROTOTYPES
-#define FAST_FLOAT  float
-#else
-#define FAST_FLOAT  double
-#endif
-#endif
-
-#endif /* JPEG_INTERNAL_OPTIONS */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jpeg_CW_Prefix.h b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jpeg_CW_Prefix.h
deleted file mode 100644
index 92afda8c10..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jpeg_CW_Prefix.h
+++ /dev/null
@@ -1,6 +0,0 @@
-// Special configuration file for building jpeg under CodeWarrior
-
-
-//#define HAVE_BOOLEAN
-
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jpegint.h b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jpegint.h
deleted file mode 100644
index 7928ae3c50..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jpegint.h
+++ /dev/null
@@ -1,400 +0,0 @@
-/*
- * jpegint.h
- *
- * Copyright (C) 1991-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file provides common declarations for the various JPEG modules.
- * These declarations are considered internal to the JPEG library; most
- * applications using the library shouldn't need to include this file.
- */
-
-
-/* Declarations for both compression & decompression */
-
-typedef enum {			/* Operating modes for buffer controllers */
-	JBUF_PASS_THRU,		/* Plain stripwise operation */
-	/* Remaining modes require a full-image buffer to have been created */
-	JBUF_SAVE_SOURCE,	/* Run source subobject only, save output */
-	JBUF_CRANK_DEST,	/* Run dest subobject only, using saved data */
-	JBUF_SAVE_AND_PASS	/* Run both subobjects, save output */
-} J_BUF_MODE;
-
-/* Values of global_state field (jdapi.c has some dependencies on ordering!) */
-#define CSTATE_START	100	/* after create_compress */
-#define CSTATE_SCANNING	101	/* start_compress done, write_scanlines OK */
-#define CSTATE_RAW_OK	102	/* start_compress done, write_raw_data OK */
-#define CSTATE_WRCOEFS	103	/* jpeg_write_coefficients done */
-#define DSTATE_START	200	/* after create_decompress */
-#define DSTATE_INHEADER	201	/* reading header markers, no SOS yet */
-#define DSTATE_READY	202	/* found SOS, ready for start_decompress */
-#define DSTATE_PRELOAD	203	/* reading multiscan file in start_decompress*/
-#define DSTATE_PRESCAN	204	/* performing dummy pass for 2-pass quant */
-#define DSTATE_SCANNING	205	/* start_decompress done, read_scanlines OK */
-#define DSTATE_RAW_OK	206	/* start_decompress done, read_raw_data OK */
-#define DSTATE_BUFIMAGE	207	/* expecting jpeg_start_output */
-#define DSTATE_BUFPOST	208	/* looking for SOS/EOI in jpeg_finish_output */
-#define DSTATE_RDCOEFS	209	/* reading file in jpeg_read_coefficients */
-#define DSTATE_STOPPING	210	/* looking for EOI in jpeg_finish_decompress */
-
-
-/* Declarations for compression modules */
-
-/* Master control module */
-struct jpeg_comp_master {
-  JMETHOD(void, prepare_for_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, pass_startup, (j_compress_ptr cinfo));
-  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  wxjpeg_boolean call_pass_startup;	/* True if pass_startup must be called */
-  wxjpeg_boolean is_last_pass;		/* True during last pass */
-};
-
-/* Main buffer control (downsampled-data buffer) */
-struct jpeg_c_main_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, process_data, (j_compress_ptr cinfo,
-			       JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-			       JDIMENSION in_rows_avail));
-};
-
-/* Compression preprocessing (downsampling input buffer control) */
-struct jpeg_c_prep_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, pre_process_data, (j_compress_ptr cinfo,
-				   JSAMPARRAY input_buf,
-				   JDIMENSION *in_row_ctr,
-				   JDIMENSION in_rows_avail,
-				   JSAMPIMAGE output_buf,
-				   JDIMENSION *out_row_group_ctr,
-				   JDIMENSION out_row_groups_avail));
-};
-
-/* Coefficient buffer control */
-struct jpeg_c_coef_controller {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(wxjpeg_boolean, compress_data, (j_compress_ptr cinfo,
-				   JSAMPIMAGE input_buf));
-};
-
-/* Colorspace conversion */
-struct jpeg_color_converter {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, color_convert, (j_compress_ptr cinfo,
-				JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
-				JDIMENSION output_row, int num_rows));
-};
-
-/* Downsampling */
-struct jpeg_downsampler {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  JMETHOD(void, downsample, (j_compress_ptr cinfo,
-			     JSAMPIMAGE input_buf, JDIMENSION in_row_index,
-			     JSAMPIMAGE output_buf,
-			     JDIMENSION out_row_group_index));
-
-  wxjpeg_boolean need_context_rows;	/* TRUE if need rows above & below */
-};
-
-/* Forward DCT (also controls coefficient quantization) */
-struct jpeg_forward_dct {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo));
-  /* perhaps this should be an array??? */
-  JMETHOD(void, forward_DCT, (j_compress_ptr cinfo,
-			      jpeg_component_info * compptr,
-			      JSAMPARRAY sample_data, JBLOCKROW coef_blocks,
-			      JDIMENSION start_row, JDIMENSION start_col,
-			      JDIMENSION num_blocks));
-};
-
-/* Entropy encoding */
-struct jpeg_entropy_encoder {
-  JMETHOD(void, start_pass, (j_compress_ptr cinfo, wxjpeg_boolean gather_statistics));
-  JMETHOD(wxjpeg_boolean, encode_mcu, (j_compress_ptr cinfo, JBLOCKROW *MCU_data));
-  JMETHOD(void, finish_pass, (j_compress_ptr cinfo));
-};
-
-/* Marker writing */
-struct jpeg_marker_writer {
-  JMETHOD(void, write_file_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_frame_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_scan_header, (j_compress_ptr cinfo));
-  JMETHOD(void, write_file_trailer, (j_compress_ptr cinfo));
-  JMETHOD(void, write_tables_only, (j_compress_ptr cinfo));
-  /* These routines are exported to allow insertion of extra markers */
-  /* Probably only COM and APPn markers should be written this way */
-  JMETHOD(void, write_marker_header, (j_compress_ptr cinfo, int marker,
-				      unsigned int datalen));
-  JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val));
-};
-
-
-/* Declarations for decompression modules */
-
-/* Master control module */
-struct jpeg_decomp_master {
-  JMETHOD(void, prepare_for_output_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, finish_output_pass, (j_decompress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  wxjpeg_boolean is_dummy_pass;	/* True during 1st pass for 2-pass quant */
-};
-
-/* Input control module */
-struct jpeg_input_controller {
-  JMETHOD(int, consume_input, (j_decompress_ptr cinfo));
-  JMETHOD(void, reset_input_controller, (j_decompress_ptr cinfo));
-  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, finish_input_pass, (j_decompress_ptr cinfo));
-
-  /* State variables made visible to other modules */
-  wxjpeg_boolean has_multiple_scans;	/* True if file has multiple scans */
-  wxjpeg_boolean eoi_reached;		/* True when EOI has been consumed */
-};
-
-/* Main buffer control (downsampled-data buffer) */
-struct jpeg_d_main_controller {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, process_data, (j_decompress_ptr cinfo,
-			       JSAMPARRAY output_buf, JDIMENSION *out_row_ctr,
-			       JDIMENSION out_rows_avail));
-};
-
-/* Coefficient buffer control */
-struct jpeg_d_coef_controller {
-#if defined(__VISAGECPP__)
-  /* the start input pass in jdcoeft must have a different name than the
-  // one in jdtrans under VisualAge or else we get a dup symbol error
-  */
-  JMETHOD(void, start_input_pass2, (j_decompress_ptr cinfo));
-#else
-  JMETHOD(void, start_input_pass, (j_decompress_ptr cinfo));
-#endif
-
-  JMETHOD(int, consume_data, (j_decompress_ptr cinfo));
-  JMETHOD(void, start_output_pass, (j_decompress_ptr cinfo));
-  JMETHOD(int, decompress_data, (j_decompress_ptr cinfo,
-				 JSAMPIMAGE output_buf));
-  /* Pointer to array of coefficient virtual arrays, or NULL if none */
-  jvirt_barray_ptr *coef_arrays;
-};
-
-/* Decompression postprocessing (color quantization buffer control) */
-struct jpeg_d_post_controller {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, J_BUF_MODE pass_mode));
-  JMETHOD(void, post_process_data, (j_decompress_ptr cinfo,
-				    JSAMPIMAGE input_buf,
-				    JDIMENSION *in_row_group_ctr,
-				    JDIMENSION in_row_groups_avail,
-				    JSAMPARRAY output_buf,
-				    JDIMENSION *out_row_ctr,
-				    JDIMENSION out_rows_avail));
-};
-
-/* Marker reading & parsing */
-struct jpeg_marker_reader {
-  JMETHOD(void, reset_marker_reader, (j_decompress_ptr cinfo));
-  /* Read markers until SOS or EOI.
-   * Returns same codes as are defined for jpeg_consume_input:
-   * JPEG_SUSPENDED, JPEG_REACHED_SOS, or JPEG_REACHED_EOI.
-   */
-  JMETHOD(int, read_markers, (j_decompress_ptr cinfo));
-  /* Read a restart marker --- exported for use by entropy decoder only */
-  jpeg_marker_parser_method read_restart_marker;
-
-  /* State of marker reader --- nominally internal, but applications
-   * supplying COM or APPn handlers might like to know the state.
-   */
-  wxjpeg_boolean saw_SOI;		/* found SOI? */
-  wxjpeg_boolean saw_SOF;		/* found SOF? */
-  int next_restart_num;		/* next restart number expected (0-7) */
-  unsigned int discarded_bytes;	/* # of bytes skipped looking for a marker */
-};
-
-/* Entropy decoding */
-struct jpeg_entropy_decoder {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(wxjpeg_boolean, decode_mcu, (j_decompress_ptr cinfo,
-				JBLOCKROW *MCU_data));
-
-  /* This is here to share code between baseline and progressive decoders; */
-  /* other modules probably should not use it */
-  wxjpeg_boolean insufficient_data;	/* set TRUE after emitting warning */
-};
-
-/* Inverse DCT (also performs dequantization) */
-typedef JMETHOD(void, inverse_DCT_method_ptr,
-		(j_decompress_ptr cinfo, jpeg_component_info * compptr,
-		 JCOEFPTR coef_block,
-		 JSAMPARRAY output_buf, JDIMENSION output_col));
-
-struct jpeg_inverse_dct {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  /* It is useful to allow each component to have a separate IDCT method. */
-  inverse_DCT_method_ptr inverse_DCT[MAX_COMPONENTS];
-};
-
-/* Upsampling (note that upsampler must also call color converter) */
-struct jpeg_upsampler {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, upsample, (j_decompress_ptr cinfo,
-			   JSAMPIMAGE input_buf,
-			   JDIMENSION *in_row_group_ctr,
-			   JDIMENSION in_row_groups_avail,
-			   JSAMPARRAY output_buf,
-			   JDIMENSION *out_row_ctr,
-			   JDIMENSION out_rows_avail));
-
-  wxjpeg_boolean need_context_rows;	/* TRUE if need rows above & below */
-};
-
-/* Colorspace conversion */
-struct jpeg_color_deconverter {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, color_convert, (j_decompress_ptr cinfo,
-				JSAMPIMAGE input_buf, JDIMENSION input_row,
-				JSAMPARRAY output_buf, int num_rows));
-};
-
-/* Color quantization or color precision reduction */
-struct jpeg_color_quantizer {
-  JMETHOD(void, start_pass, (j_decompress_ptr cinfo, wxjpeg_boolean is_pre_scan));
-  JMETHOD(void, color_quantize, (j_decompress_ptr cinfo,
-				 JSAMPARRAY input_buf, JSAMPARRAY output_buf,
-				 int num_rows));
-  JMETHOD(void, finish_pass, (j_decompress_ptr cinfo));
-  JMETHOD(void, new_color_map, (j_decompress_ptr cinfo));
-};
-
-
-/* Miscellaneous useful macros */
-
-#undef MAX
-#define MAX(a,b)	((a) > (b) ? (a) : (b))
-#undef MIN
-#define MIN(a,b)	((a) < (b) ? (a) : (b))
-
-
-/* We assume that right shift corresponds to signed division by 2 with
- * rounding towards minus infinity.  This is correct for typical "arithmetic
- * shift" instructions that shift in copies of the sign bit.  But some
- * C compilers implement >> with an unsigned shift.  For these machines you
- * must define RIGHT_SHIFT_IS_UNSIGNED.
- * RIGHT_SHIFT provides a proper signed right shift of an INT32 quantity.
- * It is only applied with constant shift counts.  SHIFT_TEMPS must be
- * included in the variables of any routine using RIGHT_SHIFT.
- */
-
-#ifdef RIGHT_SHIFT_IS_UNSIGNED
-#define SHIFT_TEMPS	JPEG_INT32 shift_temp;
-#define RIGHT_SHIFT(x,shft)  \
-	((shift_temp = (x)) < 0 ? \
-	 (shift_temp >> (shft)) | ((~((JPEG_INT32) 0)) << (32-(shft))) : \
-	 (shift_temp >> (shft)))
-#else
-#define SHIFT_TEMPS
-#define RIGHT_SHIFT(x,shft)	((x) >> (shft))
-#endif
-
-
-/* Short forms of external names for systems with brain-damaged linkers. */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jinit_compress_master	jICompress
-#define jinit_c_master_control	jICMaster
-#define jinit_c_main_controller	jICMainC
-#define jinit_c_prep_controller	jICPrepC
-#define jinit_c_coef_controller	jICCoefC
-#define jinit_color_converter	jICColor
-#define jinit_downsampler	jIDownsampler
-#define jinit_forward_dct	jIFDCT
-#define jinit_huff_encoder	jIHEncoder
-#define jinit_phuff_encoder	jIPHEncoder
-#define jinit_marker_writer	jIMWriter
-#define jinit_master_decompress	jIDMaster
-#define jinit_d_main_controller	jIDMainC
-#define jinit_d_coef_controller	jIDCoefC
-#define jinit_d_post_controller	jIDPostC
-#define jinit_input_controller	jIInCtlr
-#define jinit_marker_reader	jIMReader
-#define jinit_huff_decoder	jIHDecoder
-#define jinit_phuff_decoder	jIPHDecoder
-#define jinit_inverse_dct	jIIDCT
-#define jinit_upsampler		jIUpsampler
-#define jinit_color_deconverter	jIDColor
-#define jinit_1pass_quantizer	jI1Quant
-#define jinit_2pass_quantizer	jI2Quant
-#define jinit_merged_upsampler	jIMUpsampler
-#define jinit_memory_mgr	jIMemMgr
-#define jdiv_round_up		jDivRound
-#define jround_up		jRound
-#define jcopy_sample_rows	jCopySamples
-#define jcopy_block_row		jCopyBlocks
-#define jzero_far		jZeroFar
-#define jpeg_zigzag_order	jZIGTable
-#define jpeg_natural_order	jZAGTable
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/* Compression module initialization routines */
-EXTERN(void) jinit_compress_master JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_c_master_control JPP((j_compress_ptr cinfo,
-					 wxjpeg_boolean transcode_only));
-EXTERN(void) jinit_c_main_controller JPP((j_compress_ptr cinfo,
-					  wxjpeg_boolean need_full_buffer));
-EXTERN(void) jinit_c_prep_controller JPP((j_compress_ptr cinfo,
-					  wxjpeg_boolean need_full_buffer));
-EXTERN(void) jinit_c_coef_controller JPP((j_compress_ptr cinfo,
-					  wxjpeg_boolean need_full_buffer));
-EXTERN(void) jinit_color_converter JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_downsampler JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_forward_dct JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_huff_encoder JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_phuff_encoder JPP((j_compress_ptr cinfo));
-EXTERN(void) jinit_marker_writer JPP((j_compress_ptr cinfo));
-/* Decompression module initialization routines */
-EXTERN(void) jinit_master_decompress JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_d_main_controller JPP((j_decompress_ptr cinfo,
-					  wxjpeg_boolean need_full_buffer));
-EXTERN(void) jinit_d_coef_controller JPP((j_decompress_ptr cinfo,
-					  wxjpeg_boolean need_full_buffer));
-EXTERN(void) jinit_d_post_controller JPP((j_decompress_ptr cinfo,
-					  wxjpeg_boolean need_full_buffer));
-EXTERN(void) jinit_input_controller JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_marker_reader JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_huff_decoder JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_phuff_decoder JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_inverse_dct JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_upsampler JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_color_deconverter JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_1pass_quantizer JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_2pass_quantizer JPP((j_decompress_ptr cinfo));
-EXTERN(void) jinit_merged_upsampler JPP((j_decompress_ptr cinfo));
-/* Memory manager initialization */
-EXTERN(void) jinit_memory_mgr JPP((j_common_ptr cinfo));
-
-/* Utility routines in jutils.c */
-EXTERN(long) jdiv_round_up JPP((long a, long b));
-EXTERN(long) jround_up JPP((long a, long b));
-EXTERN(void) jcopy_sample_rows JPP((JSAMPARRAY input_array, int source_row,
-				    JSAMPARRAY output_array, int dest_row,
-				    int num_rows, JDIMENSION num_cols));
-EXTERN(void) jcopy_block_row JPP((JBLOCKROW input_row, JBLOCKROW output_row,
-				  JDIMENSION num_blocks));
-EXTERN(void) jzero_far JPP((void FAR * target, size_t bytestozero));
-/* Constant tables in jutils.c */
-#if 0				/* This table is not actually needed in v6a */
-extern const int jpeg_zigzag_order[]; /* natural coef order to zigzag order */
-#endif
-extern const int jpeg_natural_order[]; /* zigzag coef order to natural order */
-
-/* Suppress undefined-structure complaints if necessary. */
-
-#ifdef INCOMPLETE_TYPES_BROKEN
-#ifndef AM_MEMORY_MANAGER	/* only jmemmgr.c defines these */
-struct jvirt_sarray_control { long dummy; };
-struct jvirt_barray_control { long dummy; };
-#endif
-#endif /* INCOMPLETE_TYPES_BROKEN */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jpeglib.h b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jpeglib.h
deleted file mode 100644
index 4677c7e053..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jpeglib.h
+++ /dev/null
@@ -1,1096 +0,0 @@
-/*
- * jpeglib.h
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file defines the application interface for the JPEG library.
- * Most applications using the library need only include this file,
- * and perhaps jerror.h if they want to know the exact error codes.
- */
-
-#ifndef JPEGLIB_H
-#define JPEGLIB_H
-
-/*
- * First we include the configuration files that record how this
- * installation of the JPEG library is set up.  jconfig.h can be
- * generated automatically for many systems.  jmorecfg.h contains
- * manual configuration options that most people need not worry about.
- */
-
-#ifndef JCONFIG_INCLUDED	/* in case jinclude.h already did */
-#include "jconfig.h"		/* widely used configuration options */
-#endif
-#include "jmorecfg.h"		/* seldom changed options */
-
-
-/* Version ID for the JPEG library.
- * Might be useful for tests like "#if JPEG_LIB_VERSION >= 60".
- */
-
-#define JPEG_LIB_VERSION  62	/* Version 6b */
-
-
-/* Various constants determining the sizes of things.
- * All of these are specified by the JPEG standard, so don't change them
- * if you want to be compatible.
- */
-
-#define DCTSIZE		    8	/* The basic DCT block is 8x8 samples */
-#define DCTSIZE2	    64	/* DCTSIZE squared; # of elements in a block */
-#define NUM_QUANT_TBLS      4	/* Quantization tables are numbered 0..3 */
-#define NUM_HUFF_TBLS       4	/* Huffman tables are numbered 0..3 */
-#define NUM_ARITH_TBLS      16	/* Arith-coding tables are numbered 0..15 */
-#define MAX_COMPS_IN_SCAN   4	/* JPEG limit on # of components in one scan */
-#define MAX_SAMP_FACTOR     4	/* JPEG limit on sampling factors */
-/* Unfortunately, some bozo at Adobe saw no reason to be bound by the standard;
- * the PostScript DCT filter can emit files with many more than 10 blocks/MCU.
- * If you happen to run across such a file, you can up D_MAX_BLOCKS_IN_MCU
- * to handle it.  We even let you do this from the jconfig.h file.  However,
- * we strongly discourage changing C_MAX_BLOCKS_IN_MCU; just because Adobe
- * sometimes emits noncompliant files doesn't mean you should too.
- */
-#define C_MAX_BLOCKS_IN_MCU   10 /* compressor's limit on blocks per MCU */
-#ifndef D_MAX_BLOCKS_IN_MCU
-#define D_MAX_BLOCKS_IN_MCU   10 /* decompressor's limit on blocks per MCU */
-#endif
-
-
-/* Data structures for images (arrays of samples and of DCT coefficients).
- * On 80x86 machines, the image arrays are too big for near pointers,
- * but the pointer arrays can fit in near memory.
- */
-
-typedef JSAMPLE FAR *JSAMPROW;	/* ptr to one image row of pixel samples. */
-typedef JSAMPROW *JSAMPARRAY;	/* ptr to some rows (a 2-D sample array) */
-typedef JSAMPARRAY *JSAMPIMAGE;	/* a 3-D sample array: top index is color */
-
-typedef JCOEF JBLOCK[DCTSIZE2];	/* one block of coefficients */
-typedef JBLOCK FAR *JBLOCKROW;	/* pointer to one row of coefficient blocks */
-typedef JBLOCKROW *JBLOCKARRAY;		/* a 2-D array of coefficient blocks */
-typedef JBLOCKARRAY *JBLOCKIMAGE;	/* a 3-D array of coefficient blocks */
-
-typedef JCOEF FAR *JCOEFPTR;	/* useful in a couple of places */
-
-
-/* Types for JPEG compression parameters and working tables. */
-
-
-/* DCT coefficient quantization tables. */
-
-typedef struct {
-  /* This array gives the coefficient quantizers in natural array order
-   * (not the zigzag order in which they are stored in a JPEG DQT marker).
-   * CAUTION: IJG versions prior to v6a kept this array in zigzag order.
-   */
-  UINT16 quantval[DCTSIZE2];	/* quantization step for each coefficient */
-  /* This field is used only during compression.  It's initialized FALSE when
-   * the table is created, and set TRUE when it's been output to the file.
-   * You could suppress output of a table by setting this to TRUE.
-   * (See jpeg_suppress_tables for an example.)
-   */
-  wxjpeg_boolean sent_table;		/* TRUE when table has been output */
-} JQUANT_TBL;
-
-
-/* Huffman coding tables. */
-
-typedef struct {
-  /* These two fields directly represent the contents of a JPEG DHT marker */
-  UINT8 bits[17];		/* bits[k] = # of symbols with codes of */
-				/* length k bits; bits[0] is unused */
-  UINT8 huffval[256];		/* The symbols, in order of incr code length */
-  /* This field is used only during compression.  It's initialized FALSE when
-   * the table is created, and set TRUE when it's been output to the file.
-   * You could suppress output of a table by setting this to TRUE.
-   * (See jpeg_suppress_tables for an example.)
-   */
-  wxjpeg_boolean sent_table;		/* TRUE when table has been output */
-} JHUFF_TBL;
-
-
-/* Basic info about one component (color channel). */
-
-typedef struct {
-  /* These values are fixed over the whole image. */
-  /* For compression, they must be supplied by parameter setup; */
-  /* for decompression, they are read from the SOF marker. */
-  int component_id;		/* identifier for this component (0..255) */
-  int component_index;		/* its index in SOF or cinfo->comp_info[] */
-  int h_samp_factor;		/* horizontal sampling factor (1..4) */
-  int v_samp_factor;		/* vertical sampling factor (1..4) */
-  int quant_tbl_no;		/* quantization table selector (0..3) */
-  /* These values may vary between scans. */
-  /* For compression, they must be supplied by parameter setup; */
-  /* for decompression, they are read from the SOS marker. */
-  /* The decompressor output side may not use these variables. */
-  int dc_tbl_no;		/* DC entropy table selector (0..3) */
-  int ac_tbl_no;		/* AC entropy table selector (0..3) */
-
-  /* Remaining fields should be treated as private by applications. */
-
-  /* These values are computed during compression or decompression startup: */
-  /* Component's size in DCT blocks.
-   * Any dummy blocks added to complete an MCU are not counted; therefore
-   * these values do not depend on whether a scan is interleaved or not.
-   */
-  JDIMENSION width_in_blocks;
-  JDIMENSION height_in_blocks;
-  /* Size of a DCT block in samples.  Always DCTSIZE for compression.
-   * For decompression this is the size of the output from one DCT block,
-   * reflecting any scaling we choose to apply during the IDCT step.
-   * Values of 1,2,4,8 are likely to be supported.  Note that different
-   * components may receive different IDCT scalings.
-   */
-  int DCT_scaled_size;
-  /* The downsampled dimensions are the component's actual, unpadded number
-   * of samples at the main buffer (preprocessing/compression interface), thus
-   * downsampled_width = ceil(image_width * Hi/Hmax)
-   * and similarly for height.  For decompression, IDCT scaling is included, so
-   * downsampled_width = ceil(image_width * Hi/Hmax * DCT_scaled_size/DCTSIZE)
-   */
-  JDIMENSION downsampled_width;	 /* actual width in samples */
-  JDIMENSION downsampled_height; /* actual height in samples */
-  /* This flag is used only for decompression.  In cases where some of the
-   * components will be ignored (eg grayscale output from YCbCr image),
-   * we can skip most computations for the unused components.
-   */
-  wxjpeg_boolean component_needed;	/* do we need the value of this component? */
-
-  /* These values are computed before starting a scan of the component. */
-  /* The decompressor output side may not use these variables. */
-  int MCU_width;		/* number of blocks per MCU, horizontally */
-  int MCU_height;		/* number of blocks per MCU, vertically */
-  int MCU_blocks;		/* MCU_width * MCU_height */
-  int MCU_sample_width;		/* MCU width in samples, MCU_width*DCT_scaled_size */
-  int last_col_width;		/* # of non-dummy blocks across in last MCU */
-  int last_row_height;		/* # of non-dummy blocks down in last MCU */
-
-  /* Saved quantization table for component; NULL if none yet saved.
-   * See jdinput.c comments about the need for this information.
-   * This field is currently used only for decompression.
-   */
-  JQUANT_TBL * quant_table;
-
-  /* Private per-component storage for DCT or IDCT subsystem. */
-  void * dct_table;
-} jpeg_component_info;
-
-
-/* The script for encoding a multiple-scan file is an array of these: */
-
-typedef struct {
-  int comps_in_scan;		/* number of components encoded in this scan */
-  int component_index[MAX_COMPS_IN_SCAN]; /* their SOF/comp_info[] indexes */
-  int Ss, Se;			/* progressive JPEG spectral selection parms */
-  int Ah, Al;			/* progressive JPEG successive approx. parms */
-} jpeg_scan_info;
-
-/* The decompressor can save APPn and COM markers in a list of these: */
-
-typedef struct jpeg_marker_struct FAR * jpeg_saved_marker_ptr;
-
-struct jpeg_marker_struct {
-  jpeg_saved_marker_ptr next;	/* next in list, or NULL */
-  UINT8 marker;			/* marker code: JPEG_COM, or JPEG_APP0+n */
-  unsigned int original_length;	/* # bytes of data in the file */
-  unsigned int data_length;	/* # bytes of data saved at data[] */
-  JOCTET FAR * data;		/* the data contained in the marker */
-  /* the marker length word is not counted in data_length or original_length */
-};
-
-/* Known color spaces. */
-
-typedef enum {
-	JCS_UNKNOWN,		/* error/unspecified */
-	JCS_GRAYSCALE,		/* monochrome */
-	JCS_RGB,		/* red/green/blue */
-	JCS_YCbCr,		/* Y/Cb/Cr (also known as YUV) */
-	JCS_CMYK,		/* C/M/Y/K */
-	JCS_YCCK		/* Y/Cb/Cr/K */
-} J_COLOR_SPACE;
-
-/* DCT/IDCT algorithm options. */
-
-typedef enum {
-	JDCT_ISLOW,		/* slow but accurate integer algorithm */
-	JDCT_IFAST,		/* faster, less accurate integer method */
-	JDCT_FLOAT		/* floating-point: accurate, fast on fast HW */
-} J_DCT_METHOD;
-
-#ifndef JDCT_DEFAULT		/* may be overridden in jconfig.h */
-#define JDCT_DEFAULT  JDCT_ISLOW
-#endif
-#ifndef JDCT_FASTEST		/* may be overridden in jconfig.h */
-#define JDCT_FASTEST  JDCT_IFAST
-#endif
-
-/* Dithering options for decompression. */
-
-typedef enum {
-	JDITHER_NONE,		/* no dithering */
-	JDITHER_ORDERED,	/* simple ordered dither */
-	JDITHER_FS		/* Floyd-Steinberg error diffusion dither */
-} J_DITHER_MODE;
-
-
-/* Common fields between JPEG compression and decompression master structs. */
-
-#define jpeg_common_fields \
-  struct jpeg_error_mgr * err;	/* Error handler module */\
-  struct jpeg_memory_mgr * mem;	/* Memory manager module */\
-  struct jpeg_progress_mgr * progress; /* Progress monitor, or NULL if none */\
-  void * client_data;		/* Available for use by application */\
-  wxjpeg_boolean is_decompressor;	/* So common code can tell which is which */\
-  int global_state		/* For checking call sequence validity */
-
-/* Routines that are to be used by both halves of the library are declared
- * to receive a pointer to this structure.  There are no actual instances of
- * jpeg_common_struct, only of jpeg_compress_struct and jpeg_decompress_struct.
- */
-struct jpeg_common_struct {
-  jpeg_common_fields;		/* Fields common to both master struct types */
-  /* Additional fields follow in an actual jpeg_compress_struct or
-   * jpeg_decompress_struct.  All three structs must agree on these
-   * initial fields!  (This would be a lot cleaner in C++.)
-   */
-};
-
-typedef struct jpeg_common_struct * j_common_ptr;
-typedef struct jpeg_compress_struct * j_compress_ptr;
-typedef struct jpeg_decompress_struct * j_decompress_ptr;
-
-
-/* Master record for a compression instance */
-
-struct jpeg_compress_struct {
-  jpeg_common_fields;		/* Fields shared with jpeg_decompress_struct */
-
-  /* Destination for compressed data */
-  struct jpeg_destination_mgr * dest;
-
-  /* Description of source image --- these fields must be filled in by
-   * outer application before starting compression.  in_color_space must
-   * be correct before you can even call jpeg_set_defaults().
-   */
-
-  JDIMENSION image_width;	/* input image width */
-  JDIMENSION image_height;	/* input image height */
-  int input_components;		/* # of color components in input image */
-  J_COLOR_SPACE in_color_space;	/* colorspace of input image */
-
-  double input_gamma;		/* image gamma of input image */
-
-  /* Compression parameters --- these fields must be set before calling
-   * jpeg_start_compress().  We recommend calling jpeg_set_defaults() to
-   * initialize everything to reasonable defaults, then changing anything
-   * the application specifically wants to change.  That way you won't get
-   * burnt when new parameters are added.  Also note that there are several
-   * helper routines to simplify changing parameters.
-   */
-
-  int data_precision;		/* bits of precision in image data */
-
-  int num_components;		/* # of color components in JPEG image */
-  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */
-
-  jpeg_component_info * comp_info;
-  /* comp_info[i] describes component that appears i'th in SOF */
-
-  JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS];
-  /* ptrs to coefficient quantization tables, or NULL if not defined */
-
-  JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  /* ptrs to Huffman coding tables, or NULL if not defined */
-
-  UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */
-  UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */
-  UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */
-
-  int num_scans;		/* # of entries in scan_info array */
-  const jpeg_scan_info * scan_info; /* script for multi-scan file, or NULL */
-  /* The default value of scan_info is NULL, which causes a single-scan
-   * sequential JPEG file to be emitted.  To create a multi-scan file,
-   * set num_scans and scan_info to point to an array of scan definitions.
-   */
-
-  wxjpeg_boolean raw_data_in;		/* TRUE=caller supplies downsampled data */
-  wxjpeg_boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
-  wxjpeg_boolean optimize_coding;	/* TRUE=optimize entropy encoding parms */
-  wxjpeg_boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
-  int smoothing_factor;		/* 1..100, or 0 for no input smoothing */
-  J_DCT_METHOD dct_method;	/* DCT algorithm selector */
-
-  /* The restart interval can be specified in absolute MCUs by setting
-   * restart_interval, or in MCU rows by setting restart_in_rows
-   * (in which case the correct restart_interval will be figured
-   * for each scan).
-   */
-  unsigned int restart_interval; /* MCUs per restart, or 0 for no restart */
-  int restart_in_rows;		/* if > 0, MCU rows per restart interval */
-
-  /* Parameters controlling emission of special markers. */
-
-  wxjpeg_boolean write_JFIF_header;	/* should a JFIF marker be written? */
-  UINT8 JFIF_major_version;	/* What to write for the JFIF version number */
-  UINT8 JFIF_minor_version;
-  /* These three values are not used by the JPEG code, merely copied */
-  /* into the JFIF APP0 marker.  density_unit can be 0 for unknown, */
-  /* 1 for dots/inch, or 2 for dots/cm.  Note that the pixel aspect */
-  /* ratio is defined by X_density/Y_density even when density_unit=0. */
-  UINT8 density_unit;		/* JFIF code for pixel size units */
-  UINT16 X_density;		/* Horizontal pixel density */
-  UINT16 Y_density;		/* Vertical pixel density */
-  wxjpeg_boolean write_Adobe_marker;	/* should an Adobe marker be written? */
-
-  /* State variable: index of next scanline to be written to
-   * jpeg_write_scanlines().  Application may use this to control its
-   * processing loop, e.g., "while (next_scanline < image_height)".
-   */
-
-  JDIMENSION next_scanline;	/* 0 .. image_height-1  */
-
-  /* Remaining fields are known throughout compressor, but generally
-   * should not be touched by a surrounding application.
-   */
-
-  /*
-   * These fields are computed during compression startup
-   */
-  wxjpeg_boolean progressive_mode;	/* TRUE if scan script uses progressive mode */
-  int max_h_samp_factor;	/* largest h_samp_factor */
-  int max_v_samp_factor;	/* largest v_samp_factor */
-
-  JDIMENSION total_iMCU_rows;	/* # of iMCU rows to be input to coef ctlr */
-  /* The coefficient controller receives data in units of MCU rows as defined
-   * for fully interleaved scans (whether the JPEG file is interleaved or not).
-   * There are v_samp_factor * DCTSIZE sample rows of each component in an
-   * "iMCU" (interleaved MCU) row.
-   */
-
-  /*
-   * These fields are valid during any one scan.
-   * They describe the components and MCUs actually appearing in the scan.
-   */
-  int comps_in_scan;		/* # of JPEG components in this scan */
-  jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN];
-  /* *cur_comp_info[i] describes component that appears i'th in SOS */
-
-  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */
-  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */
-
-  int blocks_in_MCU;		/* # of DCT blocks per MCU */
-  int MCU_membership[C_MAX_BLOCKS_IN_MCU];
-  /* MCU_membership[i] is index in cur_comp_info of component owning */
-  /* i'th block in an MCU */
-
-  int Ss, Se, Ah, Al;		/* progressive JPEG parameters for scan */
-
-  /*
-   * Links to compression subobjects (methods and private variables of modules)
-   */
-  struct jpeg_comp_master * master;
-  struct jpeg_c_main_controller * main;
-  struct jpeg_c_prep_controller * prep;
-  struct jpeg_c_coef_controller * coef;
-  struct jpeg_marker_writer * marker;
-  struct jpeg_color_converter * cconvert;
-  struct jpeg_downsampler * downsample;
-  struct jpeg_forward_dct * fdct;
-  struct jpeg_entropy_encoder * entropy;
-  jpeg_scan_info * script_space; /* workspace for jpeg_simple_progression */
-  int script_space_size;
-};
-
-
-/* Master record for a decompression instance */
-
-struct jpeg_decompress_struct {
-  jpeg_common_fields;		/* Fields shared with jpeg_compress_struct */
-
-  /* Source of compressed data */
-  struct jpeg_source_mgr * src;
-
-  /* Basic description of image --- filled in by jpeg_read_header(). */
-  /* Application may inspect these values to decide how to process image. */
-
-  JDIMENSION image_width;	/* nominal image width (from SOF marker) */
-  JDIMENSION image_height;	/* nominal image height */
-  int num_components;		/* # of color components in JPEG image */
-  J_COLOR_SPACE jpeg_color_space; /* colorspace of JPEG image */
-
-  /* Decompression processing parameters --- these fields must be set before
-   * calling jpeg_start_decompress().  Note that jpeg_read_header() initializes
-   * them to default values.
-   */
-
-  J_COLOR_SPACE out_color_space; /* colorspace for output */
-
-  unsigned int scale_num, scale_denom; /* fraction by which to scale image */
-
-  double output_gamma;		/* image gamma wanted in output */
-
-  wxjpeg_boolean buffered_image;	/* TRUE=multiple output passes */
-  wxjpeg_boolean raw_data_out;		/* TRUE=downsampled data wanted */
-
-  J_DCT_METHOD dct_method;	/* IDCT algorithm selector */
-  wxjpeg_boolean do_fancy_upsampling;	/* TRUE=apply fancy upsampling */
-  wxjpeg_boolean do_block_smoothing;	/* TRUE=apply interblock smoothing */
-
-  wxjpeg_boolean quantize_colors;	/* TRUE=colormapped output wanted */
-  /* the following are ignored if not quantize_colors: */
-  J_DITHER_MODE dither_mode;	/* type of color dithering to use */
-  wxjpeg_boolean two_pass_quantize;	/* TRUE=use two-pass color quantization */
-  int desired_number_of_colors;	/* max # colors to use in created colormap */
-  /* these are significant only in buffered-image mode: */
-  wxjpeg_boolean enable_1pass_quant;	/* enable future use of 1-pass quantizer */
-  wxjpeg_boolean enable_external_quant;/* enable future use of external colormap */
-  wxjpeg_boolean enable_2pass_quant;	/* enable future use of 2-pass quantizer */
-
-  /* Description of actual output image that will be returned to application.
-   * These fields are computed by jpeg_start_decompress().
-   * You can also use jpeg_calc_output_dimensions() to determine these values
-   * in advance of calling jpeg_start_decompress().
-   */
-
-  JDIMENSION output_width;	/* scaled image width */
-  JDIMENSION output_height;	/* scaled image height */
-  int out_color_components;	/* # of color components in out_color_space */
-  int output_components;	/* # of color components returned */
-  /* output_components is 1 (a colormap index) when quantizing colors;
-   * otherwise it equals out_color_components.
-   */
-  int rec_outbuf_height;	/* min recommended height of scanline buffer */
-  /* If the buffer passed to jpeg_read_scanlines() is less than this many rows
-   * high, space and time will be wasted due to unnecessary data copying.
-   * Usually rec_outbuf_height will be 1 or 2, at most 4.
-   */
-
-  /* When quantizing colors, the output colormap is described by these fields.
-   * The application can supply a colormap by setting colormap non-NULL before
-   * calling jpeg_start_decompress; otherwise a colormap is created during
-   * jpeg_start_decompress or jpeg_start_output.
-   * The map has out_color_components rows and actual_number_of_colors columns.
-   */
-  int actual_number_of_colors;	/* number of entries in use */
-  JSAMPARRAY colormap;		/* The color map as a 2-D pixel array */
-
-  /* State variables: these variables indicate the progress of decompression.
-   * The application may examine these but must not modify them.
-   */
-
-  /* Row index of next scanline to be read from jpeg_read_scanlines().
-   * Application may use this to control its processing loop, e.g.,
-   * "while (output_scanline < output_height)".
-   */
-  JDIMENSION output_scanline;	/* 0 .. output_height-1  */
-
-  /* Current input scan number and number of iMCU rows completed in scan.
-   * These indicate the progress of the decompressor input side.
-   */
-  int input_scan_number;	/* Number of SOS markers seen so far */
-  JDIMENSION input_iMCU_row;	/* Number of iMCU rows completed */
-
-  /* The "output scan number" is the notional scan being displayed by the
-   * output side.  The decompressor will not allow output scan/row number
-   * to get ahead of input scan/row, but it can fall arbitrarily far behind.
-   */
-  int output_scan_number;	/* Nominal scan number being displayed */
-  JDIMENSION output_iMCU_row;	/* Number of iMCU rows read */
-
-  /* Current progression status.  coef_bits[c][i] indicates the precision
-   * with which component c's DCT coefficient i (in zigzag order) is known.
-   * It is -1 when no data has yet been received, otherwise it is the point
-   * transform (shift) value for the most recent scan of the coefficient
-   * (thus, 0 at completion of the progression).
-   * This pointer is NULL when reading a non-progressive file.
-   */
-  int (*coef_bits)[DCTSIZE2];	/* -1 or current Al value for each coef */
-
-  /* Internal JPEG parameters --- the application usually need not look at
-   * these fields.  Note that the decompressor output side may not use
-   * any parameters that can change between scans.
-   */
-
-  /* Quantization and Huffman tables are carried forward across input
-   * datastreams when processing abbreviated JPEG datastreams.
-   */
-
-  JQUANT_TBL * quant_tbl_ptrs[NUM_QUANT_TBLS];
-  /* ptrs to coefficient quantization tables, or NULL if not defined */
-
-  JHUFF_TBL * dc_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  JHUFF_TBL * ac_huff_tbl_ptrs[NUM_HUFF_TBLS];
-  /* ptrs to Huffman coding tables, or NULL if not defined */
-
-  /* These parameters are never carried across datastreams, since they
-   * are given in SOF/SOS markers or defined to be reset by SOI.
-   */
-
-  int data_precision;		/* bits of precision in image data */
-
-  jpeg_component_info * comp_info;
-  /* comp_info[i] describes component that appears i'th in SOF */
-
-  wxjpeg_boolean progressive_mode;	/* TRUE if SOFn specifies progressive mode */
-  wxjpeg_boolean arith_code;		/* TRUE=arithmetic coding, FALSE=Huffman */
-
-  UINT8 arith_dc_L[NUM_ARITH_TBLS]; /* L values for DC arith-coding tables */
-  UINT8 arith_dc_U[NUM_ARITH_TBLS]; /* U values for DC arith-coding tables */
-  UINT8 arith_ac_K[NUM_ARITH_TBLS]; /* Kx values for AC arith-coding tables */
-
-  unsigned int restart_interval; /* MCUs per restart interval, or 0 for no restart */
-
-  /* These fields record data obtained from optional markers recognized by
-   * the JPEG library.
-   */
-  wxjpeg_boolean saw_JFIF_marker;	/* TRUE iff a JFIF APP0 marker was found */
-  /* Data copied from JFIF marker; only valid if saw_JFIF_marker is TRUE: */
-  UINT8 JFIF_major_version;	/* JFIF version number */
-  UINT8 JFIF_minor_version;
-  UINT8 density_unit;		/* JFIF code for pixel size units */
-  UINT16 X_density;		/* Horizontal pixel density */
-  UINT16 Y_density;		/* Vertical pixel density */
-  wxjpeg_boolean saw_Adobe_marker;	/* TRUE iff an Adobe APP14 marker was found */
-  UINT8 Adobe_transform;	/* Color transform code from Adobe marker */
-
-  wxjpeg_boolean CCIR601_sampling;	/* TRUE=first samples are cosited */
-
-  /* Aside from the specific data retained from APPn markers known to the
-   * library, the uninterpreted contents of any or all APPn and COM markers
-   * can be saved in a list for examination by the application.
-   */
-  jpeg_saved_marker_ptr marker_list; /* Head of list of saved markers */
-
-  /* Remaining fields are known throughout decompressor, but generally
-   * should not be touched by a surrounding application.
-   */
-
-  /*
-   * These fields are computed during decompression startup
-   */
-  int max_h_samp_factor;	/* largest h_samp_factor */
-  int max_v_samp_factor;	/* largest v_samp_factor */
-
-  int min_DCT_scaled_size;	/* smallest DCT_scaled_size of any component */
-
-  JDIMENSION total_iMCU_rows;	/* # of iMCU rows in image */
-  /* The coefficient controller's input and output progress is measured in
-   * units of "iMCU" (interleaved MCU) rows.  These are the same as MCU rows
-   * in fully interleaved JPEG scans, but are used whether the scan is
-   * interleaved or not.  We define an iMCU row as v_samp_factor DCT block
-   * rows of each component.  Therefore, the IDCT output contains
-   * v_samp_factor*DCT_scaled_size sample rows of a component per iMCU row.
-   */
-
-  JSAMPLE * sample_range_limit; /* table for fast range-limiting */
-
-  /*
-   * These fields are valid during any one scan.
-   * They describe the components and MCUs actually appearing in the scan.
-   * Note that the decompressor output side must not use these fields.
-   */
-  int comps_in_scan;		/* # of JPEG components in this scan */
-  jpeg_component_info * cur_comp_info[MAX_COMPS_IN_SCAN];
-  /* *cur_comp_info[i] describes component that appears i'th in SOS */
-
-  JDIMENSION MCUs_per_row;	/* # of MCUs across the image */
-  JDIMENSION MCU_rows_in_scan;	/* # of MCU rows in the image */
-
-  int blocks_in_MCU;		/* # of DCT blocks per MCU */
-  int MCU_membership[D_MAX_BLOCKS_IN_MCU];
-  /* MCU_membership[i] is index in cur_comp_info of component owning */
-  /* i'th block in an MCU */
-
-  int Ss, Se, Ah, Al;		/* progressive JPEG parameters for scan */
-
-  /* This field is shared between entropy decoder and marker parser.
-   * It is either zero or the code of a JPEG marker that has been
-   * read from the data source, but has not yet been processed.
-   */
-  int unread_marker;
-
-  /*
-   * Links to decompression subobjects (methods, private variables of modules)
-   */
-  struct jpeg_decomp_master * master;
-  struct jpeg_d_main_controller * main;
-  struct jpeg_d_coef_controller * coef;
-  struct jpeg_d_post_controller * post;
-  struct jpeg_input_controller * inputctl;
-  struct jpeg_marker_reader * marker;
-  struct jpeg_entropy_decoder * entropy;
-  struct jpeg_inverse_dct * idct;
-  struct jpeg_upsampler * upsample;
-  struct jpeg_color_deconverter * cconvert;
-  struct jpeg_color_quantizer * cquantize;
-};
-
-
-/* "Object" declarations for JPEG modules that may be supplied or called
- * directly by the surrounding application.
- * As with all objects in the JPEG library, these structs only define the
- * publicly visible methods and state variables of a module.  Additional
- * private fields may exist after the public ones.
- */
-
-
-/* Error handler object */
-
-struct jpeg_error_mgr {
-  /* Error exit handler: does not return to caller */
-  JMETHOD(void, error_exit, (j_common_ptr cinfo));
-  /* Conditionally emit a trace or warning message */
-  JMETHOD(void, emit_message, (j_common_ptr cinfo, int msg_level));
-  /* Routine that actually outputs a trace or error message */
-  JMETHOD(void, output_message, (j_common_ptr cinfo));
-  /* Format a message string for the most recent JPEG error or message */
-  JMETHOD(void, format_message, (j_common_ptr cinfo, char * buffer));
-#define JMSG_LENGTH_MAX  200	/* recommended size of format_message buffer */
-  /* Reset error state variables at start of a new image */
-  JMETHOD(void, reset_error_mgr, (j_common_ptr cinfo));
-
-  /* The message ID code and any parameters are saved here.
-   * A message can have one string parameter or up to 8 int parameters.
-   */
-  int msg_code;
-#define JMSG_STR_PARM_MAX  80
-  union {
-    int i[8];
-    char s[JMSG_STR_PARM_MAX];
-  } msg_parm;
-
-  /* Standard state variables for error facility */
-
-  int trace_level;		/* max msg_level that will be displayed */
-
-  /* For recoverable corrupt-data errors, we emit a warning message,
-   * but keep going unless emit_message chooses to abort.  emit_message
-   * should count warnings in num_warnings.  The surrounding application
-   * can check for bad data by seeing if num_warnings is nonzero at the
-   * end of processing.
-   */
-  long num_warnings;		/* number of corrupt-data warnings */
-
-  /* These fields point to the table(s) of error message strings.
-   * An application can change the table pointer to switch to a different
-   * message list (typically, to change the language in which errors are
-   * reported).  Some applications may wish to add additional error codes
-   * that will be handled by the JPEG library error mechanism; the second
-   * table pointer is used for this purpose.
-   *
-   * First table includes all errors generated by JPEG library itself.
-   * Error code 0 is reserved for a "no such error string" message.
-   */
-  const char * const * jpeg_message_table; /* Library errors */
-  int last_jpeg_message;    /* Table contains strings 0..last_jpeg_message */
-  /* Second table can be added by application (see cjpeg/djpeg for example).
-   * It contains strings numbered first_addon_message..last_addon_message.
-   */
-  const char * const * addon_message_table; /* Non-library errors */
-  int first_addon_message;	/* code for first string in addon table */
-  int last_addon_message;	/* code for last string in addon table */
-};
-
-
-/* Progress monitor object */
-
-struct jpeg_progress_mgr {
-  JMETHOD(void, progress_monitor, (j_common_ptr cinfo));
-
-  long pass_counter;		/* work units completed in this pass */
-  long pass_limit;		/* total number of work units in this pass */
-  int completed_passes;		/* passes completed so far */
-  int total_passes;		/* total number of passes expected */
-};
-
-
-/* Data destination object for compression */
-
-struct jpeg_destination_mgr {
-  JOCTET * next_output_byte;	/* => next byte to write in buffer */
-  size_t free_in_buffer;	/* # of byte spaces remaining in buffer */
-
-  JMETHOD(void, init_destination, (j_compress_ptr cinfo));
-  JMETHOD(wxjpeg_boolean, empty_output_buffer, (j_compress_ptr cinfo));
-  JMETHOD(void, term_destination, (j_compress_ptr cinfo));
-};
-
-
-/* Data source object for decompression */
-
-struct jpeg_source_mgr {
-  const JOCTET * next_input_byte; /* => next byte to read from buffer */
-  size_t bytes_in_buffer;	/* # of bytes remaining in buffer */
-
-  JMETHOD(void, init_source, (j_decompress_ptr cinfo));
-  JMETHOD(wxjpeg_boolean, fill_input_buffer, (j_decompress_ptr cinfo));
-  JMETHOD(void, skip_input_data, (j_decompress_ptr cinfo, long num_bytes));
-  JMETHOD(wxjpeg_boolean, resync_to_restart, (j_decompress_ptr cinfo, int desired));
-  JMETHOD(void, term_source, (j_decompress_ptr cinfo));
-};
-
-
-/* Memory manager object.
- * Allocates "small" objects (a few K total), "large" objects (tens of K),
- * and "really big" objects (virtual arrays with backing store if needed).
- * The memory manager does not allow individual objects to be freed; rather,
- * each created object is assigned to a pool, and whole pools can be freed
- * at once.  This is faster and more convenient than remembering exactly what
- * to free, especially where malloc()/free() are not too speedy.
- * NB: alloc routines never return NULL.  They exit to error_exit if not
- * successful.
- */
-
-#define JPOOL_PERMANENT	0	/* lasts until master record is destroyed */
-#define JPOOL_IMAGE	1	/* lasts until done with image/datastream */
-#define JPOOL_NUMPOOLS	2
-
-typedef struct jvirt_sarray_control * jvirt_sarray_ptr;
-typedef struct jvirt_barray_control * jvirt_barray_ptr;
-
-
-struct jpeg_memory_mgr {
-  /* Method pointers */
-  JMETHOD(void *, alloc_small, (j_common_ptr cinfo, int pool_id,
-				size_t sizeofobject));
-  JMETHOD(void FAR *, alloc_large, (j_common_ptr cinfo, int pool_id,
-				     size_t sizeofobject));
-  JMETHOD(JSAMPARRAY, alloc_sarray, (j_common_ptr cinfo, int pool_id,
-				     JDIMENSION samplesperrow,
-				     JDIMENSION numrows));
-  JMETHOD(JBLOCKARRAY, alloc_barray, (j_common_ptr cinfo, int pool_id,
-				      JDIMENSION blocksperrow,
-				      JDIMENSION numrows));
-  JMETHOD(jvirt_sarray_ptr, request_virt_sarray, (j_common_ptr cinfo,
-						  int pool_id,
-						  wxjpeg_boolean pre_zero,
-						  JDIMENSION samplesperrow,
-						  JDIMENSION numrows,
-						  JDIMENSION maxaccess));
-  JMETHOD(jvirt_barray_ptr, request_virt_barray, (j_common_ptr cinfo,
-						  int pool_id,
-						  wxjpeg_boolean pre_zero,
-						  JDIMENSION blocksperrow,
-						  JDIMENSION numrows,
-						  JDIMENSION maxaccess));
-  JMETHOD(void, realize_virt_arrays, (j_common_ptr cinfo));
-  JMETHOD(JSAMPARRAY, access_virt_sarray, (j_common_ptr cinfo,
-					   jvirt_sarray_ptr ptr,
-					   JDIMENSION start_row,
-					   JDIMENSION num_rows,
-					   wxjpeg_boolean writable));
-  JMETHOD(JBLOCKARRAY, access_virt_barray, (j_common_ptr cinfo,
-					    jvirt_barray_ptr ptr,
-					    JDIMENSION start_row,
-					    JDIMENSION num_rows,
-					    wxjpeg_boolean writable));
-  JMETHOD(void, free_pool, (j_common_ptr cinfo, int pool_id));
-  JMETHOD(void, self_destruct, (j_common_ptr cinfo));
-
-  /* Limit on memory allocation for this JPEG object.  (Note that this is
-   * merely advisory, not a guaranteed maximum; it only affects the space
-   * used for virtual-array buffers.)  May be changed by outer application
-   * after creating the JPEG object.
-   */
-  long max_memory_to_use;
-
-  /* Maximum allocation request accepted by alloc_large. */
-  long max_alloc_chunk;
-};
-
-
-/* Routine signature for application-supplied marker processing methods.
- * Need not pass marker code since it is stored in cinfo->unread_marker.
- */
-typedef JMETHOD(wxjpeg_boolean, jpeg_marker_parser_method, (j_decompress_ptr cinfo));
-
-
-/* Declarations for routines called by application.
- * The JPP macro hides prototype parameters from compilers that can't cope.
- * Note JPP requires double parentheses.
- */
-
-#ifdef HAVE_PROTOTYPES
-#define JPP(arglist)	arglist
-#else
-#define JPP(arglist)	()
-#endif
-
-
-/* Short forms of external names for systems with brain-damaged linkers.
- * We shorten external names to be unique in the first six letters, which
- * is good enough for all known systems.
- * (If your compiler itself needs names to be unique in less than 15
- * characters, you are out of luck.  Get a better compiler.)
- */
-
-#ifdef NEED_SHORT_EXTERNAL_NAMES
-#define jpeg_std_error		jStdError
-#define jpeg_CreateCompress	jCreaCompress
-#define jpeg_CreateDecompress	jCreaDecompress
-#define jpeg_destroy_compress	jDestCompress
-#define jpeg_destroy_decompress	jDestDecompress
-#define jpeg_stdio_dest		jStdDest
-#define jpeg_stdio_src		jStdSrc
-#define jpeg_set_defaults	jSetDefaults
-#define jpeg_set_colorspace	jSetColorspace
-#define jpeg_default_colorspace	jDefColorspace
-#define jpeg_set_quality	jSetQuality
-#define jpeg_set_linear_quality	jSetLQuality
-#define jpeg_add_quant_table	jAddQuantTable
-#define jpeg_quality_scaling	jQualityScaling
-#define jpeg_simple_progression	jSimProgress
-#define jpeg_suppress_tables	jSuppressTables
-#define jpeg_alloc_quant_table	jAlcQTable
-#define jpeg_alloc_huff_table	jAlcHTable
-#define jpeg_start_compress	jStrtCompress
-#define jpeg_write_scanlines	jWrtScanlines
-#define jpeg_finish_compress	jFinCompress
-#define jpeg_write_raw_data	jWrtRawData
-#define jpeg_write_marker	jWrtMarker
-#define jpeg_write_m_header	jWrtMHeader
-#define jpeg_write_m_byte	jWrtMByte
-#define jpeg_write_tables	jWrtTables
-#define jpeg_read_header	jReadHeader
-#define jpeg_start_decompress	jStrtDecompress
-#define jpeg_read_scanlines	jReadScanlines
-#define jpeg_finish_decompress	jFinDecompress
-#define jpeg_read_raw_data	jReadRawData
-#define jpeg_has_multiple_scans	jHasMultScn
-#define jpeg_start_output	jStrtOutput
-#define jpeg_finish_output	jFinOutput
-#define jpeg_input_complete	jInComplete
-#define jpeg_new_colormap	jNewCMap
-#define jpeg_consume_input	jConsumeInput
-#define jpeg_calc_output_dimensions	jCalcDimensions
-#define jpeg_save_markers	jSaveMarkers
-#define jpeg_set_marker_processor	jSetMarker
-#define jpeg_read_coefficients	jReadCoefs
-#define jpeg_write_coefficients	jWrtCoefs
-#define jpeg_copy_critical_parameters	jCopyCrit
-#define jpeg_abort_compress	jAbrtCompress
-#define jpeg_abort_decompress	jAbrtDecompress
-#define jpeg_abort		jAbort
-#define jpeg_destroy		jDestroy
-#define jpeg_resync_to_restart	jResyncRestart
-#endif /* NEED_SHORT_EXTERNAL_NAMES */
-
-
-/* Default error-management setup */
-EXTERN(struct jpeg_error_mgr *) jpeg_std_error
-	JPP((struct jpeg_error_mgr * err));
-
-/* Initialization of JPEG compression objects.
- * jpeg_create_compress() and jpeg_create_decompress() are the exported
- * names that applications should call.  These expand to calls on
- * jpeg_CreateCompress and jpeg_CreateDecompress with additional information
- * passed for version mismatch checking.
- * NB: you must set up the error-manager BEFORE calling jpeg_create_xxx.
- */
-#define jpeg_create_compress(cinfo) \
-    jpeg_CreateCompress((cinfo), JPEG_LIB_VERSION, \
-			(size_t) sizeof(struct jpeg_compress_struct))
-#define jpeg_create_decompress(cinfo) \
-    jpeg_CreateDecompress((cinfo), JPEG_LIB_VERSION, \
-			  (size_t) sizeof(struct jpeg_decompress_struct))
-EXTERN(void) jpeg_CreateCompress JPP((j_compress_ptr cinfo,
-				      int version, size_t structsize));
-EXTERN(void) jpeg_CreateDecompress JPP((j_decompress_ptr cinfo,
-					int version, size_t structsize));
-/* Destruction of JPEG compression objects */
-EXTERN(void) jpeg_destroy_compress JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_destroy_decompress JPP((j_decompress_ptr cinfo));
-
-/* Standard data source and destination managers: stdio streams. */
-/* Caller is responsible for opening the file before and closing after. */
-EXTERN(void) jpeg_stdio_dest JPP((j_compress_ptr cinfo, FILE * outfile));
-EXTERN(void) jpeg_stdio_src JPP((j_decompress_ptr cinfo, FILE * infile));
-
-/* Default parameter setup for compression */
-EXTERN(void) jpeg_set_defaults JPP((j_compress_ptr cinfo));
-/* Compression parameter setup aids */
-EXTERN(void) jpeg_set_colorspace JPP((j_compress_ptr cinfo,
-				      J_COLOR_SPACE colorspace));
-EXTERN(void) jpeg_default_colorspace JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_set_quality JPP((j_compress_ptr cinfo, int quality,
-				   wxjpeg_boolean force_baseline));
-EXTERN(void) jpeg_set_linear_quality JPP((j_compress_ptr cinfo,
-					  int scale_factor,
-					  wxjpeg_boolean force_baseline));
-EXTERN(void) jpeg_add_quant_table JPP((j_compress_ptr cinfo, int which_tbl,
-				       const unsigned int *basic_table,
-				       int scale_factor,
-				       wxjpeg_boolean force_baseline));
-EXTERN(int) jpeg_quality_scaling JPP((int quality));
-EXTERN(void) jpeg_simple_progression JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_suppress_tables JPP((j_compress_ptr cinfo,
-				       wxjpeg_boolean suppress));
-EXTERN(JQUANT_TBL *) jpeg_alloc_quant_table JPP((j_common_ptr cinfo));
-EXTERN(JHUFF_TBL *) jpeg_alloc_huff_table JPP((j_common_ptr cinfo));
-
-/* Main entry points for compression */
-EXTERN(void) jpeg_start_compress JPP((j_compress_ptr cinfo,
-				      wxjpeg_boolean write_all_tables));
-EXTERN(JDIMENSION) jpeg_write_scanlines JPP((j_compress_ptr cinfo,
-					     JSAMPARRAY scanlines,
-					     JDIMENSION num_lines));
-EXTERN(void) jpeg_finish_compress JPP((j_compress_ptr cinfo));
-
-/* Replaces jpeg_write_scanlines when writing raw downsampled data. */
-EXTERN(JDIMENSION) jpeg_write_raw_data JPP((j_compress_ptr cinfo,
-					    JSAMPIMAGE data,
-					    JDIMENSION num_lines));
-
-/* Write a special marker.  See libjpeg.doc concerning safe usage. */
-EXTERN(void) jpeg_write_marker
-	JPP((j_compress_ptr cinfo, int marker,
-	     const JOCTET * dataptr, unsigned int datalen));
-/* Same, but piecemeal. */
-EXTERN(void) jpeg_write_m_header
-	JPP((j_compress_ptr cinfo, int marker, unsigned int datalen));
-EXTERN(void) jpeg_write_m_byte
-	JPP((j_compress_ptr cinfo, int val));
-
-/* Alternate compression function: just write an abbreviated table file */
-EXTERN(void) jpeg_write_tables JPP((j_compress_ptr cinfo));
-
-/* Decompression startup: read start of JPEG datastream to see what's there */
-EXTERN(int) jpeg_read_header JPP((j_decompress_ptr cinfo,
-				  wxjpeg_boolean require_image));
-/* Return value is one of: */
-#define JPEG_SUSPENDED		0 /* Suspended due to lack of input data */
-#define JPEG_HEADER_OK		1 /* Found valid image datastream */
-#define JPEG_HEADER_TABLES_ONLY	2 /* Found valid table-specs-only datastream */
-/* If you pass require_image = TRUE (normal case), you need not check for
- * a TABLES_ONLY return code; an abbreviated file will cause an error exit.
- * JPEG_SUSPENDED is only possible if you use a data source module that can
- * give a suspension return (the stdio source module doesn't).
- */
-
-/* Main entry points for decompression */
-EXTERN(wxjpeg_boolean) jpeg_start_decompress JPP((j_decompress_ptr cinfo));
-EXTERN(JDIMENSION) jpeg_read_scanlines JPP((j_decompress_ptr cinfo,
-					    JSAMPARRAY scanlines,
-					    JDIMENSION max_lines));
-EXTERN(wxjpeg_boolean) jpeg_finish_decompress JPP((j_decompress_ptr cinfo));
-
-/* Replaces jpeg_read_scanlines when reading raw downsampled data. */
-EXTERN(JDIMENSION) jpeg_read_raw_data JPP((j_decompress_ptr cinfo,
-					   JSAMPIMAGE data,
-					   JDIMENSION max_lines));
-
-/* Additional entry points for buffered-image mode. */
-EXTERN(wxjpeg_boolean) jpeg_has_multiple_scans JPP((j_decompress_ptr cinfo));
-EXTERN(wxjpeg_boolean) jpeg_start_output JPP((j_decompress_ptr cinfo,
-				       int scan_number));
-EXTERN(wxjpeg_boolean) jpeg_finish_output JPP((j_decompress_ptr cinfo));
-EXTERN(wxjpeg_boolean) jpeg_input_complete JPP((j_decompress_ptr cinfo));
-EXTERN(void) jpeg_new_colormap JPP((j_decompress_ptr cinfo));
-EXTERN(int) jpeg_consume_input JPP((j_decompress_ptr cinfo));
-/* Return value is one of: */
-/* #define JPEG_SUSPENDED	0    Suspended due to lack of input data */
-#define JPEG_REACHED_SOS	1 /* Reached start of new scan */
-#define JPEG_REACHED_EOI	2 /* Reached end of image */
-#define JPEG_ROW_COMPLETED	3 /* Completed one iMCU row */
-#define JPEG_SCAN_COMPLETED	4 /* Completed last iMCU row of a scan */
-
-/* Precalculate output dimensions for current decompression parameters. */
-EXTERN(void) jpeg_calc_output_dimensions JPP((j_decompress_ptr cinfo));
-
-/* Control saving of COM and APPn markers into marker_list. */
-EXTERN(void) jpeg_save_markers
-	JPP((j_decompress_ptr cinfo, int marker_code,
-	     unsigned int length_limit));
-
-/* Install a special processing method for COM or APPn markers. */
-EXTERN(void) jpeg_set_marker_processor
-	JPP((j_decompress_ptr cinfo, int marker_code,
-	     jpeg_marker_parser_method routine));
-
-/* Read or write raw DCT coefficients --- useful for lossless transcoding. */
-EXTERN(jvirt_barray_ptr *) jpeg_read_coefficients JPP((j_decompress_ptr cinfo));
-EXTERN(void) jpeg_write_coefficients JPP((j_compress_ptr cinfo,
-					  jvirt_barray_ptr * coef_arrays));
-EXTERN(void) jpeg_copy_critical_parameters JPP((j_decompress_ptr srcinfo,
-						j_compress_ptr dstinfo));
-
-/* If you choose to abort compression or decompression before completing
- * jpeg_finish_(de)compress, then you need to clean up to release memory,
- * temporary files, etc.  You can just call jpeg_destroy_(de)compress
- * if you're done with the JPEG object, but if you want to clean it up and
- * reuse it, call this:
- */
-EXTERN(void) jpeg_abort_compress JPP((j_compress_ptr cinfo));
-EXTERN(void) jpeg_abort_decompress JPP((j_decompress_ptr cinfo));
-
-/* Generic versions of jpeg_abort and jpeg_destroy that work on either
- * flavor of JPEG object.  These may be more convenient in some places.
- */
-EXTERN(void) jpeg_abort JPP((j_common_ptr cinfo));
-EXTERN(void) jpeg_destroy JPP((j_common_ptr cinfo));
-
-/* Default restart-marker-resync procedure for use by data source modules */
-EXTERN(wxjpeg_boolean) jpeg_resync_to_restart JPP((j_decompress_ptr cinfo,
-					    int desired));
-
-
-/* These marker codes are exported since applications and data source modules
- * are likely to want to use them.
- */
-
-#define JPEG_RST0	0xD0	/* RST0 marker code */
-#define JPEG_EOI	0xD9	/* EOI marker code */
-#define JPEG_APP0	0xE0	/* APP0 marker code */
-#define JPEG_COM	0xFE	/* COM marker code */
-
-
-/* If we have a brain-damaged compiler that emits warnings (or worse, errors)
- * for structure definitions that are never filled in, keep it quiet by
- * supplying dummy definitions for the various substructures.
- */
-
-#ifdef INCOMPLETE_TYPES_BROKEN
-#ifndef JPEG_INTERNALS		/* will be defined in jpegint.h */
-struct jvirt_sarray_control { long dummy; };
-struct jvirt_barray_control { long dummy; };
-struct jpeg_comp_master { long dummy; };
-struct jpeg_c_main_controller { long dummy; };
-struct jpeg_c_prep_controller { long dummy; };
-struct jpeg_c_coef_controller { long dummy; };
-struct jpeg_marker_writer { long dummy; };
-struct jpeg_color_converter { long dummy; };
-struct jpeg_downsampler { long dummy; };
-struct jpeg_forward_dct { long dummy; };
-struct jpeg_entropy_encoder { long dummy; };
-struct jpeg_decomp_master { long dummy; };
-struct jpeg_d_main_controller { long dummy; };
-struct jpeg_d_coef_controller { long dummy; };
-struct jpeg_d_post_controller { long dummy; };
-struct jpeg_input_controller { long dummy; };
-struct jpeg_marker_reader { long dummy; };
-struct jpeg_entropy_decoder { long dummy; };
-struct jpeg_inverse_dct { long dummy; };
-struct jpeg_upsampler { long dummy; };
-struct jpeg_color_deconverter { long dummy; };
-struct jpeg_color_quantizer { long dummy; };
-#endif /* JPEG_INTERNALS */
-#endif /* INCOMPLETE_TYPES_BROKEN */
-
-
-/*
- * The JPEG library modules define JPEG_INTERNALS before including this file.
- * The internal structure declarations are read only when that is true.
- * Applications using the library should not include jpegint.h, but may wish
- * to include jerror.h.
- */
-
-#ifdef JPEG_INTERNALS
-#include "jpegint.h"		/* fetch private declarations */
-#include "jerror.h"		/* fetch error codes too */
-#endif
-
-#endif /* JPEGLIB_H */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jpegtran.1 b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jpegtran.1
deleted file mode 100644
index 6de18e2af9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jpegtran.1
+++ /dev/null
@@ -1,238 +0,0 @@
-.TH JPEGTRAN 1 "3 August 1997"
-.SH NAME
-jpegtran \- lossless transformation of JPEG files
-.SH SYNOPSIS
-.B jpegtran
-[
-.I options
-]
-[
-.I filename
-]
-.LP
-.SH DESCRIPTION
-.LP
-.B jpegtran
-performs various useful transformations of JPEG files.
-It can translate the coded representation from one variant of JPEG to another,
-for example from baseline JPEG to progressive JPEG or vice versa.  It can also
-perform some rearrangements of the image data, for example turning an image
-from landscape to portrait format by rotation.
-.PP
-.B jpegtran
-works by rearranging the compressed data (DCT coefficients), without
-ever fully decoding the image.  Therefore, its transformations are lossless:
-there is no image degradation at all, which would not be true if you used
-.B djpeg
-followed by
-.B cjpeg
-to accomplish the same conversion.  But by the same token,
-.B jpegtran
-cannot perform lossy operations such as changing the image quality.
-.PP
-.B jpegtran
-reads the named JPEG/JFIF file, or the standard input if no file is
-named, and produces a JPEG/JFIF file on the standard output.
-.SH OPTIONS
-All switch names may be abbreviated; for example,
-.B \-optimize
-may be written
-.B \-opt
-or
-.BR \-o .
-Upper and lower case are equivalent.
-British spellings are also accepted (e.g.,
-.BR \-optimise ),
-though for brevity these are not mentioned below.
-.PP
-To specify the coded JPEG representation used in the output file,
-.B jpegtran
-accepts a subset of the switches recognized by
-.BR cjpeg :
-.TP
-.B \-optimize
-Perform optimization of entropy encoding parameters.
-.TP
-.B \-progressive
-Create progressive JPEG file.
-.TP
-.BI \-restart " N"
-Emit a JPEG restart marker every N MCU rows, or every N MCU blocks if "B" is
-attached to the number.
-.TP
-.BI \-scans " file"
-Use the scan script given in the specified text file.
-.PP
-See
-.BR cjpeg (1)
-for more details about these switches.
-If you specify none of these switches, you get a plain baseline-JPEG output
-file.  The quality setting and so forth are determined by the input file.
-.PP
-The image can be losslessly transformed by giving one of these switches:
-.TP
-.B \-flip horizontal
-Mirror image horizontally (left-right).
-.TP
-.B \-flip vertical
-Mirror image vertically (top-bottom).
-.TP
-.B \-rotate 90
-Rotate image 90 degrees clockwise.
-.TP
-.B \-rotate 180
-Rotate image 180 degrees.
-.TP
-.B \-rotate 270
-Rotate image 270 degrees clockwise (or 90 ccw).
-.TP
-.B \-transpose
-Transpose image (across UL-to-LR axis).
-.TP
-.B \-transverse
-Transverse transpose (across UR-to-LL axis).
-.PP
-The transpose transformation has no restrictions regarding image dimensions.
-The other transformations operate rather oddly if the image dimensions are not
-a multiple of the iMCU size (usually 8 or 16 pixels), because they can only
-transform complete blocks of DCT coefficient data in the desired way.
-.PP
-.BR jpegtran 's
-default behavior when transforming an odd-size image is designed
-to preserve exact reversibility and mathematical consistency of the
-transformation set.  As stated, transpose is able to flip the entire image
-area.  Horizontal mirroring leaves any partial iMCU column at the right edge
-untouched, but is able to flip all rows of the image.  Similarly, vertical
-mirroring leaves any partial iMCU row at the bottom edge untouched, but is
-able to flip all columns.  The other transforms can be built up as sequences
-of transpose and flip operations; for consistency, their actions on edge
-pixels are defined to be the same as the end result of the corresponding
-transpose-and-flip sequence.
-.PP
-For practical use, you may prefer to discard any untransformable edge pixels
-rather than having a strange-looking strip along the right and/or bottom edges
-of a transformed image.  To do this, add the
-.B \-trim
-switch:
-.TP
-.B \-trim
-Drop non-transformable edge blocks.
-.PP
-Obviously, a transformation with
-.B \-trim
-is not reversible, so strictly speaking
-.B jpegtran
-with this switch is not lossless.  Also, the expected mathematical
-equivalences between the transformations no longer hold.  For example,
-.B \-rot 270 -trim
-trims only the bottom edge, but
-.B \-rot 90 -trim
-followed by
-.B \-rot 180 -trim
-trims both edges.
-.PP
-Another not-strictly-lossless transformation switch is:
-.TP
-.B \-grayscale
-Force grayscale output.
-.PP
-This option discards the chrominance channels if the input image is YCbCr
-(ie, a standard color JPEG), resulting in a grayscale JPEG file.  The
-luminance channel is preserved exactly, so this is a better method of reducing
-to grayscale than decompression, conversion, and recompression.  This switch
-is particularly handy for fixing a monochrome picture that was mistakenly
-encoded as a color JPEG.  (In such a case, the space savings from getting rid
-of the near-empty chroma channels won't be large; but the decoding time for
-a grayscale JPEG is substantially less than that for a color JPEG.)
-.PP
-.B jpegtran
-also recognizes these switches that control what to do with "extra" markers,
-such as comment blocks:
-.TP
-.B \-copy none
-Copy no extra markers from source file.  This setting suppresses all
-comments and other excess baggage present in the source file.
-.TP
-.B \-copy comments
-Copy only comment markers.  This setting copies comments from the source file,
-but discards any other inessential data.
-.TP
-.B \-copy all
-Copy all extra markers.  This setting preserves miscellaneous markers
-found in the source file, such as JFIF thumbnails and Photoshop settings.
-In some files these extra markers can be sizable.
-.PP
-The default behavior is
-.BR "\-copy comments" .
-(Note: in IJG releases v6 and v6a,
-.B jpegtran
-always did the equivalent of
-.BR "\-copy none" .)
-.PP
-Additional switches recognized by jpegtran are:
-.TP
-.BI \-maxmemory " N"
-Set limit for amount of memory to use in processing large images.  Value is
-in thousands of bytes, or millions of bytes if "M" is attached to the
-number.  For example,
-.B \-max 4m
-selects 4000000 bytes.  If more space is needed, temporary files will be used.
-.TP
-.BI \-outfile " name"
-Send output image to the named file, not to standard output.
-.TP
-.B \-verbose
-Enable debug printout.  More
-.BR \-v 's
-give more output.  Also, version information is printed at startup.
-.TP
-.B \-debug
-Same as
-.BR \-verbose .
-.SH EXAMPLES
-.LP
-This example converts a baseline JPEG file to progressive form:
-.IP
-.B jpegtran \-progressive
-.I foo.jpg
-.B >
-.I fooprog.jpg
-.PP
-This example rotates an image 90 degrees clockwise, discarding any
-unrotatable edge pixels:
-.IP
-.B jpegtran \-rot 90 -trim
-.I foo.jpg
-.B >
-.I foo90.jpg
-.SH ENVIRONMENT
-.TP
-.B JPEGMEM
-If this environment variable is set, its value is the default memory limit.
-The value is specified as described for the
-.B \-maxmemory
-switch.
-.B JPEGMEM
-overrides the default value specified when the program was compiled, and
-itself is overridden by an explicit
-.BR \-maxmemory .
-.SH SEE ALSO
-.BR cjpeg (1),
-.BR djpeg (1),
-.BR rdjpgcom (1),
-.BR wrjpgcom (1)
-.br
-Wallace, Gregory K.  "The JPEG Still Picture Compression Standard",
-Communications of the ACM, April 1991 (vol. 34, no. 4), pp. 30-44.
-.SH AUTHOR
-Independent JPEG Group
-.SH BUGS
-Arithmetic coding is not supported for legal reasons.
-.PP
-The transform options can't transform odd-size images perfectly.  Use
-.B \-trim
-if you don't like the results without it.
-.PP
-The entire image is read into memory and then written out again, even in
-cases where this isn't really necessary.  Expect swapping on large images,
-especially when using the more complex transform options.
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jpegtran.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jpegtran.c
deleted file mode 100644
index c81a626561..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jpegtran.c
+++ /dev/null
@@ -1,504 +0,0 @@
-/*
- * jpegtran.c
- *
- * Copyright (C) 1995-1997, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains a command-line user interface for JPEG transcoding.
- * It is very similar to cjpeg.c, but provides lossless transcoding between
- * different JPEG file formats.  It also provides some lossless and sort-of-
- * lossless transformations of JPEG data.
- */
-
-#include "cdjpeg.h"		/* Common decls for cjpeg/djpeg applications */
-#include "transupp.h"		/* Support routines for jpegtran */
-#include "jversion.h"		/* for version message */
-
-#ifdef USE_CCOMMAND		/* command-line reader for Macintosh */
-#ifdef __MWERKS__
-#include               /* Metrowerks needs this */
-#include 		/* ... and this */
-#endif
-#ifdef THINK_C
-#include 		/* Think declares it here */
-#endif
-#endif
-
-
-/*
- * Argument-parsing code.
- * The switch parser is designed to be useful with DOS-style command line
- * syntax, ie, intermixed switches and file names, where only the switches
- * to the left of a given file name affect processing of that file.
- * The main program in this file doesn't actually use this capability...
- */
-
-
-static const char * progname;	/* program name for error messages */
-static char * outfilename;	/* for -outfile switch */
-static JCOPY_OPTION copyoption;	/* -copy switch */
-static jpeg_transform_info transformoption; /* image transformation options */
-
-
-LOCAL(void)
-usage (void)
-/* complain about bad command line */
-{
-  fprintf(stderr, "usage: %s [switches] ", progname);
-#ifdef TWO_FILE_COMMANDLINE
-  fprintf(stderr, "inputfile outputfile\n");
-#else
-  fprintf(stderr, "[inputfile]\n");
-#endif
-
-  fprintf(stderr, "Switches (names may be abbreviated):\n");
-  fprintf(stderr, "  -copy none     Copy no extra markers from source file\n");
-  fprintf(stderr, "  -copy comments Copy only comment markers (default)\n");
-  fprintf(stderr, "  -copy all      Copy all extra markers\n");
-#ifdef ENTROPY_OPT_SUPPORTED
-  fprintf(stderr, "  -optimize      Optimize Huffman table (smaller file, but slow compression)\n");
-#endif
-#ifdef C_PROGRESSIVE_SUPPORTED
-  fprintf(stderr, "  -progressive   Create progressive JPEG file\n");
-#endif
-#if TRANSFORMS_SUPPORTED
-  fprintf(stderr, "Switches for modifying the image:\n");
-  fprintf(stderr, "  -grayscale     Reduce to grayscale (omit color data)\n");
-  fprintf(stderr, "  -flip [horizontal|vertical]  Mirror image (left-right or top-bottom)\n");
-  fprintf(stderr, "  -rotate [90|180|270]         Rotate image (degrees clockwise)\n");
-  fprintf(stderr, "  -transpose     Transpose image\n");
-  fprintf(stderr, "  -transverse    Transverse transpose image\n");
-  fprintf(stderr, "  -trim          Drop non-transformable edge blocks\n");
-#endif /* TRANSFORMS_SUPPORTED */
-  fprintf(stderr, "Switches for advanced users:\n");
-  fprintf(stderr, "  -restart N     Set restart interval in rows, or in blocks with B\n");
-  fprintf(stderr, "  -maxmemory N   Maximum memory to use (in kbytes)\n");
-  fprintf(stderr, "  -outfile name  Specify name for output file\n");
-  fprintf(stderr, "  -verbose  or  -debug   Emit debug output\n");
-  fprintf(stderr, "Switches for wizards:\n");
-#ifdef C_ARITH_CODING_SUPPORTED
-  fprintf(stderr, "  -arithmetic    Use arithmetic coding\n");
-#endif
-#ifdef C_MULTISCAN_FILES_SUPPORTED
-  fprintf(stderr, "  -scans file    Create multi-scan JPEG per script file\n");
-#endif
-  exit(EXIT_FAILURE);
-}
-
-
-LOCAL(void)
-select_transform (JXFORM_CODE transform)
-/* Silly little routine to detect multiple transform options,
- * which we can't handle.
- */
-{
-#if TRANSFORMS_SUPPORTED
-  if (transformoption.transform == JXFORM_NONE ||
-      transformoption.transform == transform) {
-    transformoption.transform = transform;
-  } else {
-    fprintf(stderr, "%s: can only do one image transformation at a time\n",
-	    progname);
-    usage();
-  }
-#else
-  fprintf(stderr, "%s: sorry, image transformation was not compiled\n",
-	  progname);
-  exit(EXIT_FAILURE);
-#endif
-}
-
-
-LOCAL(int)
-parse_switches (j_compress_ptr cinfo, int argc, char **argv,
-		int last_file_arg_seen, wxjpeg_boolean for_real)
-/* Parse optional switches.
- * Returns argv[] index of first file-name argument (== argc if none).
- * Any file names with indexes <= last_file_arg_seen are ignored;
- * they have presumably been processed in a previous iteration.
- * (Pass 0 for last_file_arg_seen on the first or only iteration.)
- * for_real is FALSE on the first (dummy) pass; we may skip any expensive
- * processing.
- */
-{
-  int argn;
-  char * arg;
-  wxjpeg_boolean simple_progressive;
-  char * scansarg = NULL;	/* saves -scans parm if any */
-
-  /* Set up default JPEG parameters. */
-  simple_progressive = FALSE;
-  outfilename = NULL;
-  copyoption = JCOPYOPT_DEFAULT;
-  transformoption.transform = JXFORM_NONE;
-  transformoption.trim = FALSE;
-  transformoption.force_grayscale = FALSE;
-  cinfo->err->trace_level = 0;
-
-  /* Scan command line options, adjust parameters */
-
-  for (argn = 1; argn < argc; argn++) {
-    arg = argv[argn];
-    if (*arg != '-') {
-      /* Not a switch, must be a file name argument */
-      if (argn <= last_file_arg_seen) {
-	outfilename = NULL;	/* -outfile applies to just one input file */
-	continue;		/* ignore this name if previously processed */
-      }
-      break;			/* else done parsing switches */
-    }
-    arg++;			/* advance past switch marker character */
-
-    if (keymatch(arg, "arithmetic", 1)) {
-      /* Use arithmetic coding. */
-#ifdef C_ARITH_CODING_SUPPORTED
-      cinfo->arith_code = TRUE;
-#else
-      fprintf(stderr, "%s: sorry, arithmetic coding not supported\n",
-	      progname);
-      exit(EXIT_FAILURE);
-#endif
-
-    } else if (keymatch(arg, "copy", 1)) {
-      /* Select which extra markers to copy. */
-      if (++argn >= argc)	/* advance to next argument */
-	usage();
-      if (keymatch(argv[argn], "none", 1)) {
-	copyoption = JCOPYOPT_NONE;
-      } else if (keymatch(argv[argn], "comments", 1)) {
-	copyoption = JCOPYOPT_COMMENTS;
-      } else if (keymatch(argv[argn], "all", 1)) {
-	copyoption = JCOPYOPT_ALL;
-      } else
-	usage();
-
-    } else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {
-      /* Enable debug printouts. */
-      /* On first -d, print version identification */
-      static wxjpeg_boolean printed_version = FALSE;
-
-      if (! printed_version) {
-	fprintf(stderr, "Independent JPEG Group's JPEGTRAN, version %s\n%s\n",
-		JVERSION, JCOPYRIGHT);
-	printed_version = TRUE;
-      }
-      cinfo->err->trace_level++;
-
-    } else if (keymatch(arg, "flip", 1)) {
-      /* Mirror left-right or top-bottom. */
-      if (++argn >= argc)	/* advance to next argument */
-	usage();
-      if (keymatch(argv[argn], "horizontal", 1))
-	select_transform(JXFORM_FLIP_H);
-      else if (keymatch(argv[argn], "vertical", 1))
-	select_transform(JXFORM_FLIP_V);
-      else
-	usage();
-
-    } else if (keymatch(arg, "grayscale", 1) || keymatch(arg, "greyscale",1)) {
-      /* Force to grayscale. */
-#if TRANSFORMS_SUPPORTED
-      transformoption.force_grayscale = TRUE;
-#else
-      select_transform(JXFORM_NONE);	/* force an error */
-#endif
-
-    } else if (keymatch(arg, "maxmemory", 3)) {
-      /* Maximum memory in Kb (or Mb with 'm'). */
-      long lval;
-      char ch = 'x';
-
-      if (++argn >= argc)	/* advance to next argument */
-	usage();
-      if (sscanf(argv[argn], "%ld%c", &lval, &ch) < 1)
-	usage();
-      if (ch == 'm' || ch == 'M')
-	lval *= 1000L;
-      cinfo->mem->max_memory_to_use = lval * 1000L;
-
-    } else if (keymatch(arg, "optimize", 1) || keymatch(arg, "optimise", 1)) {
-      /* Enable entropy parm optimization. */
-#ifdef ENTROPY_OPT_SUPPORTED
-      cinfo->optimize_coding = TRUE;
-#else
-      fprintf(stderr, "%s: sorry, entropy optimization was not compiled\n",
-	      progname);
-      exit(EXIT_FAILURE);
-#endif
-
-    } else if (keymatch(arg, "outfile", 4)) {
-      /* Set output file name. */
-      if (++argn >= argc)	/* advance to next argument */
-	usage();
-      outfilename = argv[argn];	/* save it away for later use */
-
-    } else if (keymatch(arg, "progressive", 1)) {
-      /* Select simple progressive mode. */
-#ifdef C_PROGRESSIVE_SUPPORTED
-      simple_progressive = TRUE;
-      /* We must postpone execution until num_components is known. */
-#else
-      fprintf(stderr, "%s: sorry, progressive output was not compiled\n",
-	      progname);
-      exit(EXIT_FAILURE);
-#endif
-
-    } else if (keymatch(arg, "restart", 1)) {
-      /* Restart interval in MCU rows (or in MCUs with 'b'). */
-      long lval;
-      char ch = 'x';
-
-      if (++argn >= argc)	/* advance to next argument */
-	usage();
-      if (sscanf(argv[argn], "%ld%c", &lval, &ch) < 1)
-	usage();
-      if (lval < 0 || lval > 65535L)
-	usage();
-      if (ch == 'b' || ch == 'B') {
-	cinfo->restart_interval = (unsigned int) lval;
-	cinfo->restart_in_rows = 0; /* else prior '-restart n' overrides me */
-      } else {
-	cinfo->restart_in_rows = (int) lval;
-	/* restart_interval will be computed during startup */
-      }
-
-    } else if (keymatch(arg, "rotate", 2)) {
-      /* Rotate 90, 180, or 270 degrees (measured clockwise). */
-      if (++argn >= argc)	/* advance to next argument */
-	usage();
-      if (keymatch(argv[argn], "90", 2))
-	select_transform(JXFORM_ROT_90);
-      else if (keymatch(argv[argn], "180", 3))
-	select_transform(JXFORM_ROT_180);
-      else if (keymatch(argv[argn], "270", 3))
-	select_transform(JXFORM_ROT_270);
-      else
-	usage();
-
-    } else if (keymatch(arg, "scans", 1)) {
-      /* Set scan script. */
-#ifdef C_MULTISCAN_FILES_SUPPORTED
-      if (++argn >= argc)	/* advance to next argument */
-	usage();
-      scansarg = argv[argn];
-      /* We must postpone reading the file in case -progressive appears. */
-#else
-      fprintf(stderr, "%s: sorry, multi-scan output was not compiled\n",
-	      progname);
-      exit(EXIT_FAILURE);
-#endif
-
-    } else if (keymatch(arg, "transpose", 1)) {
-      /* Transpose (across UL-to-LR axis). */
-      select_transform(JXFORM_TRANSPOSE);
-
-    } else if (keymatch(arg, "transverse", 6)) {
-      /* Transverse transpose (across UR-to-LL axis). */
-      select_transform(JXFORM_TRANSVERSE);
-
-    } else if (keymatch(arg, "trim", 3)) {
-      /* Trim off any partial edge MCUs that the transform can't handle. */
-      transformoption.trim = TRUE;
-
-    } else {
-      usage();			/* bogus switch */
-    }
-  }
-
-  /* Post-switch-scanning cleanup */
-
-  if (for_real) {
-
-#ifdef C_PROGRESSIVE_SUPPORTED
-    if (simple_progressive)	/* process -progressive; -scans can override */
-      jpeg_simple_progression(cinfo);
-#endif
-
-#ifdef C_MULTISCAN_FILES_SUPPORTED
-    if (scansarg != NULL)	/* process -scans if it was present */
-      if (! read_scan_script(cinfo, scansarg))
-	usage();
-#endif
-  }
-
-  return argn;			/* return index of next arg (file name) */
-}
-
-
-/*
- * The main program.
- */
-
-int
-main (int argc, char **argv)
-{
-  struct jpeg_decompress_struct srcinfo;
-  struct jpeg_compress_struct dstinfo;
-  struct jpeg_error_mgr jsrcerr, jdsterr;
-#ifdef PROGRESS_REPORT
-  struct cdjpeg_progress_mgr progress;
-#endif
-  jvirt_barray_ptr * src_coef_arrays;
-  jvirt_barray_ptr * dst_coef_arrays;
-  int file_index;
-  FILE * input_file;
-  FILE * output_file;
-
-  /* On Mac, fetch a command line. */
-#ifdef USE_CCOMMAND
-  argc = ccommand(&argv);
-#endif
-
-  progname = argv[0];
-  if (progname == NULL || progname[0] == 0)
-    progname = "jpegtran";	/* in case C library doesn't provide it */
-
-  /* Initialize the JPEG decompression object with default error handling. */
-  srcinfo.err = jpeg_std_error(&jsrcerr);
-  jpeg_create_decompress(&srcinfo);
-  /* Initialize the JPEG compression object with default error handling. */
-  dstinfo.err = jpeg_std_error(&jdsterr);
-  jpeg_create_compress(&dstinfo);
-
-  /* Now safe to enable signal catcher.
-   * Note: we assume only the decompression object will have virtual arrays.
-   */
-#ifdef NEED_SIGNAL_CATCHER
-  enable_signal_catcher((j_common_ptr) &srcinfo);
-#endif
-
-  /* Scan command line to find file names.
-   * It is convenient to use just one switch-parsing routine, but the switch
-   * values read here are mostly ignored; we will rescan the switches after
-   * opening the input file.  Also note that most of the switches affect the
-   * destination JPEG object, so we parse into that and then copy over what
-   * needs to affects the source too.
-   */
-
-  file_index = parse_switches(&dstinfo, argc, argv, 0, FALSE);
-  jsrcerr.trace_level = jdsterr.trace_level;
-  srcinfo.mem->max_memory_to_use = dstinfo.mem->max_memory_to_use;
-
-#ifdef TWO_FILE_COMMANDLINE
-  /* Must have either -outfile switch or explicit output file name */
-  if (outfilename == NULL) {
-    if (file_index != argc-2) {
-      fprintf(stderr, "%s: must name one input and one output file\n",
-	      progname);
-      usage();
-    }
-    outfilename = argv[file_index+1];
-  } else {
-    if (file_index != argc-1) {
-      fprintf(stderr, "%s: must name one input and one output file\n",
-	      progname);
-      usage();
-    }
-  }
-#else
-  /* Unix style: expect zero or one file name */
-  if (file_index < argc-1) {
-    fprintf(stderr, "%s: only one input file\n", progname);
-    usage();
-  }
-#endif /* TWO_FILE_COMMANDLINE */
-
-  /* Open the input file. */
-  if (file_index < argc) {
-    if ((input_file = fopen(argv[file_index], READ_BINARY)) == NULL) {
-      fprintf(stderr, "%s: can't open %s\n", progname, argv[file_index]);
-      exit(EXIT_FAILURE);
-    }
-  } else {
-    /* default input file is stdin */
-    input_file = read_stdin();
-  }
-
-  /* Open the output file. */
-  if (outfilename != NULL) {
-    if ((output_file = fopen(outfilename, WRITE_BINARY)) == NULL) {
-      fprintf(stderr, "%s: can't open %s\n", progname, outfilename);
-      exit(EXIT_FAILURE);
-    }
-  } else {
-    /* default output file is stdout */
-    output_file = write_stdout();
-  }
-
-#ifdef PROGRESS_REPORT
-  start_progress_monitor((j_common_ptr) &dstinfo, &progress);
-#endif
-
-  /* Specify data source for decompression */
-  jpeg_stdio_src(&srcinfo, input_file);
-
-  /* Enable saving of extra markers that we want to copy */
-  jcopy_markers_setup(&srcinfo, copyoption);
-
-  /* Read file header */
-  (void) jpeg_read_header(&srcinfo, TRUE);
-
-  /* Any space needed by a transform option must be requested before
-   * jpeg_read_coefficients so that memory allocation will be done right.
-   */
-#if TRANSFORMS_SUPPORTED
-  jtransform_request_workspace(&srcinfo, &transformoption);
-#endif
-
-  /* Read source file as DCT coefficients */
-  src_coef_arrays = jpeg_read_coefficients(&srcinfo);
-
-  /* Initialize destination compression parameters from source values */
-  jpeg_copy_critical_parameters(&srcinfo, &dstinfo);
-
-  /* Adjust destination parameters if required by transform options;
-   * also find out which set of coefficient arrays will hold the output.
-   */
-#if TRANSFORMS_SUPPORTED
-  dst_coef_arrays = jtransform_adjust_parameters(&srcinfo, &dstinfo,
-						 src_coef_arrays,
-						 &transformoption);
-#else
-  dst_coef_arrays = src_coef_arrays;
-#endif
-
-  /* Adjust default compression parameters by re-parsing the options */
-  file_index = parse_switches(&dstinfo, argc, argv, 0, TRUE);
-
-  /* Specify data destination for compression */
-  jpeg_stdio_dest(&dstinfo, output_file);
-
-  /* Start compressor (note no image data is actually written here) */
-  jpeg_write_coefficients(&dstinfo, dst_coef_arrays);
-
-  /* Copy to the output file any extra markers that we want to preserve */
-  jcopy_markers_execute(&srcinfo, &dstinfo, copyoption);
-
-  /* Execute image transformation, if any */
-#if TRANSFORMS_SUPPORTED
-  jtransform_execute_transformation(&srcinfo, &dstinfo,
-				    src_coef_arrays,
-				    &transformoption);
-#endif
-
-  /* Finish compression and release memory */
-  jpeg_finish_compress(&dstinfo);
-  jpeg_destroy_compress(&dstinfo);
-  (void) jpeg_finish_decompress(&srcinfo);
-  jpeg_destroy_decompress(&srcinfo);
-
-  /* Close files, if we opened them */
-  if (input_file != stdin)
-    fclose(input_file);
-  if (output_file != stdout)
-    fclose(output_file);
-
-#ifdef PROGRESS_REPORT
-  end_progress_monitor((j_common_ptr) &dstinfo);
-#endif
-
-  /* All done. */
-  exit(jsrcerr.num_warnings + jdsterr.num_warnings ?EXIT_WARNING:EXIT_SUCCESS);
-  return 0;			/* suppress no-return-value warnings */
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jquant1.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jquant1.c
deleted file mode 100644
index f6d221f5f9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jquant1.c
+++ /dev/null
@@ -1,856 +0,0 @@
-/*
- * jquant1.c
- *
- * Copyright (C) 1991-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains 1-pass color quantization (color mapping) routines.
- * These routines provide mapping to a fixed color map using equally spaced
- * color values.  Optional Floyd-Steinberg or ordered dithering is available.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-#ifdef QUANT_1PASS_SUPPORTED
-
-
-/*
- * The main purpose of 1-pass quantization is to provide a fast, if not very
- * high quality, colormapped output capability.  A 2-pass quantizer usually
- * gives better visual quality; however, for quantized grayscale output this
- * quantizer is perfectly adequate.  Dithering is highly recommended with this
- * quantizer, though you can turn it off if you really want to.
- *
- * In 1-pass quantization the colormap must be chosen in advance of seeing the
- * image.  We use a map consisting of all combinations of Ncolors[i] color
- * values for the i'th component.  The Ncolors[] values are chosen so that
- * their product, the total number of colors, is no more than that requested.
- * (In most cases, the product will be somewhat less.)
- *
- * Since the colormap is orthogonal, the representative value for each color
- * component can be determined without considering the other components;
- * then these indexes can be combined into a colormap index by a standard
- * N-dimensional-array-subscript calculation.  Most of the arithmetic involved
- * can be precalculated and stored in the lookup table colorindex[].
- * colorindex[i][j] maps pixel value j in component i to the nearest
- * representative value (grid plane) for that component; this index is
- * multiplied by the array stride for component i, so that the
- * index of the colormap entry closest to a given pixel value is just
- *    sum( colorindex[component-number][pixel-component-value] )
- * Aside from being fast, this scheme allows for variable spacing between
- * representative values with no additional lookup cost.
- *
- * If gamma correction has been applied in color conversion, it might be wise
- * to adjust the color grid spacing so that the representative colors are
- * equidistant in linear space.  At this writing, gamma correction is not
- * implemented by jdcolor, so nothing is done here.
- */
-
-
-/* Declarations for ordered dithering.
- *
- * We use a standard 16x16 ordered dither array.  The basic concept of ordered
- * dithering is described in many references, for instance Dale Schumacher's
- * chapter II.2 of Graphics Gems II (James Arvo, ed. Academic Press, 1991).
- * In place of Schumacher's comparisons against a "threshold" value, we add a
- * "dither" value to the input pixel and then round the result to the nearest
- * output value.  The dither value is equivalent to (0.5 - threshold) times
- * the distance between output values.  For ordered dithering, we assume that
- * the output colors are equally spaced; if not, results will probably be
- * worse, since the dither may be too much or too little at a given point.
- *
- * The normal calculation would be to form pixel value + dither, range-limit
- * this to 0..MAXJSAMPLE, and then index into the colorindex table as usual.
- * We can skip the separate range-limiting step by extending the colorindex
- * table in both directions.
- */
-
-#define ODITHER_SIZE  16	/* dimension of dither matrix */
-/* NB: if ODITHER_SIZE is not a power of 2, ODITHER_MASK uses will break */
-#define ODITHER_CELLS (ODITHER_SIZE*ODITHER_SIZE)	/* # cells in matrix */
-#define ODITHER_MASK  (ODITHER_SIZE-1) /* mask for wrapping around counters */
-
-typedef int ODITHER_MATRIX[ODITHER_SIZE][ODITHER_SIZE];
-typedef int (*ODITHER_MATRIX_PTR)[ODITHER_SIZE];
-
-static const UINT8 base_dither_matrix[ODITHER_SIZE][ODITHER_SIZE] = {
-  /* Bayer's order-4 dither array.  Generated by the code given in
-   * Stephen Hawley's article "Ordered Dithering" in Graphics Gems I.
-   * The values in this array must range from 0 to ODITHER_CELLS-1.
-   */
-  {   0,192, 48,240, 12,204, 60,252,  3,195, 51,243, 15,207, 63,255 },
-  { 128, 64,176,112,140, 76,188,124,131, 67,179,115,143, 79,191,127 },
-  {  32,224, 16,208, 44,236, 28,220, 35,227, 19,211, 47,239, 31,223 },
-  { 160, 96,144, 80,172,108,156, 92,163, 99,147, 83,175,111,159, 95 },
-  {   8,200, 56,248,  4,196, 52,244, 11,203, 59,251,  7,199, 55,247 },
-  { 136, 72,184,120,132, 68,180,116,139, 75,187,123,135, 71,183,119 },
-  {  40,232, 24,216, 36,228, 20,212, 43,235, 27,219, 39,231, 23,215 },
-  { 168,104,152, 88,164,100,148, 84,171,107,155, 91,167,103,151, 87 },
-  {   2,194, 50,242, 14,206, 62,254,  1,193, 49,241, 13,205, 61,253 },
-  { 130, 66,178,114,142, 78,190,126,129, 65,177,113,141, 77,189,125 },
-  {  34,226, 18,210, 46,238, 30,222, 33,225, 17,209, 45,237, 29,221 },
-  { 162, 98,146, 82,174,110,158, 94,161, 97,145, 81,173,109,157, 93 },
-  {  10,202, 58,250,  6,198, 54,246,  9,201, 57,249,  5,197, 53,245 },
-  { 138, 74,186,122,134, 70,182,118,137, 73,185,121,133, 69,181,117 },
-  {  42,234, 26,218, 38,230, 22,214, 41,233, 25,217, 37,229, 21,213 },
-  { 170,106,154, 90,166,102,150, 86,169,105,153, 89,165,101,149, 85 }
-};
-
-
-/* Declarations for Floyd-Steinberg dithering.
- *
- * Errors are accumulated into the array fserrors[], at a resolution of
- * 1/16th of a pixel count.  The error at a given pixel is propagated
- * to its not-yet-processed neighbors using the standard F-S fractions,
- *		...	(here)	7/16
- *		3/16	5/16	1/16
- * We work left-to-right on even rows, right-to-left on odd rows.
- *
- * We can get away with a single array (holding one row's worth of errors)
- * by using it to store the current row's errors at pixel columns not yet
- * processed, but the next row's errors at columns already processed.  We
- * need only a few extra variables to hold the errors immediately around the
- * current column.  (If we are lucky, those variables are in registers, but
- * even if not, they're probably cheaper to access than array elements are.)
- *
- * The fserrors[] array is indexed [component#][position].
- * We provide (#columns + 2) entries per component; the extra entry at each
- * end saves us from special-casing the first and last pixels.
- *
- * Note: on a wide image, we might not have enough room in a PC's near data
- * segment to hold the error array; so it is allocated with alloc_large.
- */
-
-#if BITS_IN_JSAMPLE == 8
-typedef INT16 FSERROR;		/* 16 bits should be enough */
-typedef int LOCFSERROR;		/* use 'int' for calculation temps */
-#else
-typedef JPEG_INT32 FSERROR;		/* may need more than 16 bits */
-typedef JPEG_INT32 LOCFSERROR;	/* be sure calculation temps are big enough */
-#endif
-
-typedef FSERROR FAR *FSERRPTR;	/* pointer to error array (in FAR storage!) */
-
-
-/* Private subobject */
-
-#define MAX_Q_COMPS 4		/* max components I can handle */
-
-typedef struct {
-  struct jpeg_color_quantizer pub; /* public fields */
-
-  /* Initially allocated colormap is saved here */
-  JSAMPARRAY sv_colormap;	/* The color map as a 2-D pixel array */
-  int sv_actual;		/* number of entries in use */
-
-  JSAMPARRAY colorindex;	/* Precomputed mapping for speed */
-  /* colorindex[i][j] = index of color closest to pixel value j in component i,
-   * premultiplied as described above.  Since colormap indexes must fit into
-   * JSAMPLEs, the entries of this array will too.
-   */
-  wxjpeg_boolean is_padded;		/* is the colorindex padded for odither? */
-
-  int Ncolors[MAX_Q_COMPS];	/* # of values alloced to each component */
-
-  /* Variables for ordered dithering */
-  int row_index;		/* cur row's vertical index in dither matrix */
-  ODITHER_MATRIX_PTR odither[MAX_Q_COMPS]; /* one dither array per component */
-
-  /* Variables for Floyd-Steinberg dithering */
-  FSERRPTR fserrors[MAX_Q_COMPS]; /* accumulated errors */
-  wxjpeg_boolean on_odd_row;		/* flag to remember which row we are on */
-} my_cquantizer;
-
-typedef my_cquantizer * my_cquantize_ptr;
-
-
-/*
- * Policy-making subroutines for create_colormap and create_colorindex.
- * These routines determine the colormap to be used.  The rest of the module
- * only assumes that the colormap is orthogonal.
- *
- *  * select_ncolors decides how to divvy up the available colors
- *    among the components.
- *  * output_value defines the set of representative values for a component.
- *  * largest_input_value defines the mapping from input values to
- *    representative values for a component.
- * Note that the latter two routines may impose different policies for
- * different components, though this is not currently done.
- */
-
-
-LOCAL(int)
-select_ncolors (j_decompress_ptr cinfo, int Ncolors[])
-/* Determine allocation of desired colors to components, */
-/* and fill in Ncolors[] array to indicate choice. */
-/* Return value is total number of colors (product of Ncolors[] values). */
-{
-  int nc = cinfo->out_color_components; /* number of color components */
-  int max_colors = cinfo->desired_number_of_colors;
-  int total_colors, iroot, i, j;
-  wxjpeg_boolean changed;
-  long temp;
-  static const int RGB_order[3] = { RGB_GREEN, RGB_RED, RGB_BLUE };
-
-  /* We can allocate at least the nc'th root of max_colors per component. */
-  /* Compute floor(nc'th root of max_colors). */
-  iroot = 1;
-  do {
-    iroot++;
-    temp = iroot;		/* set temp = iroot ** nc */
-    for (i = 1; i < nc; i++)
-      temp *= iroot;
-  } while (temp <= (long) max_colors); /* repeat till iroot exceeds root */
-  iroot--;			/* now iroot = floor(root) */
-
-  /* Must have at least 2 color values per component */
-  if (iroot < 2)
-    ERREXIT1(cinfo, JERR_QUANT_FEW_COLORS, (int) temp);
-
-  /* Initialize to iroot color values for each component */
-  total_colors = 1;
-  for (i = 0; i < nc; i++) {
-    Ncolors[i] = iroot;
-    total_colors *= iroot;
-  }
-  /* We may be able to increment the count for one or more components without
-   * exceeding max_colors, though we know not all can be incremented.
-   * Sometimes, the first component can be incremented more than once!
-   * (Example: for 16 colors, we start at 2*2*2, go to 3*2*2, then 4*2*2.)
-   * In RGB colorspace, try to increment G first, then R, then B.
-   */
-  do {
-    changed = FALSE;
-    for (i = 0; i < nc; i++) {
-      j = (cinfo->out_color_space == JCS_RGB ? RGB_order[i] : i);
-      /* calculate new total_colors if Ncolors[j] is incremented */
-      temp = total_colors / Ncolors[j];
-      temp *= Ncolors[j]+1;	/* done in long arith to avoid oflo */
-      if (temp > (long) max_colors)
-	break;			/* won't fit, done with this pass */
-      Ncolors[j]++;		/* OK, apply the increment */
-      total_colors = (int) temp;
-      changed = TRUE;
-    }
-  } while (changed);
-
-  return total_colors;
-}
-
-
-LOCAL(int)
-output_value (j_decompress_ptr cinfo, int ci, int j, int maxj)
-/* Return j'th output value, where j will range from 0 to maxj */
-/* The output values must fall in 0..MAXJSAMPLE in increasing order */
-{
-  /* We always provide values 0 and MAXJSAMPLE for each component;
-   * any additional values are equally spaced between these limits.
-   * (Forcing the upper and lower values to the limits ensures that
-   * dithering can't produce a color outside the selected gamut.)
-   */
-  return (int) (((JPEG_INT32) j * MAXJSAMPLE + maxj/2) / maxj);
-}
-
-
-LOCAL(int)
-largest_input_value (j_decompress_ptr cinfo, int ci, int j, int maxj)
-/* Return largest input value that should map to j'th output value */
-/* Must have largest(j=0) >= 0, and largest(j=maxj) >= MAXJSAMPLE */
-{
-  /* Breakpoints are halfway between values returned by output_value */
-  return (int) (((JPEG_INT32) (2*j + 1) * MAXJSAMPLE + maxj) / (2*maxj));
-}
-
-
-/*
- * Create the colormap.
- */
-
-LOCAL(void)
-create_colormap (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  JSAMPARRAY colormap;		/* Created colormap */
-  int total_colors;		/* Number of distinct output colors */
-  int i,j,k, nci, blksize, blkdist, ptr, val;
-
-  /* Select number of colors for each component */
-  total_colors = select_ncolors(cinfo, cquantize->Ncolors);
-
-  /* Report selected color counts */
-  if (cinfo->out_color_components == 3)
-    TRACEMS4(cinfo, 1, JTRC_QUANT_3_NCOLORS,
-	     total_colors, cquantize->Ncolors[0],
-	     cquantize->Ncolors[1], cquantize->Ncolors[2]);
-  else
-    TRACEMS1(cinfo, 1, JTRC_QUANT_NCOLORS, total_colors);
-
-  /* Allocate and fill in the colormap. */
-  /* The colors are ordered in the map in standard row-major order, */
-  /* i.e. rightmost (highest-indexed) color changes most rapidly. */
-
-  colormap = (*cinfo->mem->alloc_sarray)
-    ((j_common_ptr) cinfo, JPOOL_IMAGE,
-     (JDIMENSION) total_colors, (JDIMENSION) cinfo->out_color_components);
-
-  /* blksize is number of adjacent repeated entries for a component */
-  /* blkdist is distance between groups of identical entries for a component */
-  blkdist = total_colors;
-
-  for (i = 0; i < cinfo->out_color_components; i++) {
-    /* fill in colormap entries for i'th color component */
-    nci = cquantize->Ncolors[i]; /* # of distinct values for this color */
-    blksize = blkdist / nci;
-    for (j = 0; j < nci; j++) {
-      /* Compute j'th output value (out of nci) for component */
-      val = output_value(cinfo, i, j, nci-1);
-      /* Fill in all colormap entries that have this value of this component */
-      for (ptr = j * blksize; ptr < total_colors; ptr += blkdist) {
-	/* fill in blksize entries beginning at ptr */
-	for (k = 0; k < blksize; k++)
-	  colormap[i][ptr+k] = (JSAMPLE) val;
-      }
-    }
-    blkdist = blksize;		/* blksize of this color is blkdist of next */
-  }
-
-  /* Save the colormap in private storage,
-   * where it will survive color quantization mode changes.
-   */
-  cquantize->sv_colormap = colormap;
-  cquantize->sv_actual = total_colors;
-}
-
-
-/*
- * Create the color index table.
- */
-
-LOCAL(void)
-create_colorindex (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  JSAMPROW indexptr;
-  int i,j,k, nci, blksize, val, pad;
-
-  /* For ordered dither, we pad the color index tables by MAXJSAMPLE in
-   * each direction (input index values can be -MAXJSAMPLE .. 2*MAXJSAMPLE).
-   * This is not necessary in the other dithering modes.  However, we
-   * flag whether it was done in case user changes dithering mode.
-   */
-  if (cinfo->dither_mode == JDITHER_ORDERED) {
-    pad = MAXJSAMPLE*2;
-    cquantize->is_padded = TRUE;
-  } else {
-    pad = 0;
-    cquantize->is_padded = FALSE;
-  }
-
-  cquantize->colorindex = (*cinfo->mem->alloc_sarray)
-    ((j_common_ptr) cinfo, JPOOL_IMAGE,
-     (JDIMENSION) (MAXJSAMPLE+1 + pad),
-     (JDIMENSION) cinfo->out_color_components);
-
-  /* blksize is number of adjacent repeated entries for a component */
-  blksize = cquantize->sv_actual;
-
-  for (i = 0; i < cinfo->out_color_components; i++) {
-    /* fill in colorindex entries for i'th color component */
-    nci = cquantize->Ncolors[i]; /* # of distinct values for this color */
-    blksize = blksize / nci;
-
-    /* adjust colorindex pointers to provide padding at negative indexes. */
-    if (pad)
-      cquantize->colorindex[i] += MAXJSAMPLE;
-
-    /* in loop, val = index of current output value, */
-    /* and k = largest j that maps to current val */
-    indexptr = cquantize->colorindex[i];
-    val = 0;
-    k = largest_input_value(cinfo, i, 0, nci-1);
-    for (j = 0; j <= MAXJSAMPLE; j++) {
-      while (j > k)		/* advance val if past boundary */
-	k = largest_input_value(cinfo, i, ++val, nci-1);
-      /* premultiply so that no multiplication needed in main processing */
-      indexptr[j] = (JSAMPLE) (val * blksize);
-    }
-    /* Pad at both ends if necessary */
-    if (pad)
-      for (j = 1; j <= MAXJSAMPLE; j++) {
-	indexptr[-j] = indexptr[0];
-	indexptr[MAXJSAMPLE+j] = indexptr[MAXJSAMPLE];
-      }
-  }
-}
-
-
-/*
- * Create an ordered-dither array for a component having ncolors
- * distinct output values.
- */
-
-LOCAL(ODITHER_MATRIX_PTR)
-make_odither_array (j_decompress_ptr cinfo, int ncolors)
-{
-  ODITHER_MATRIX_PTR odither;
-  int j,k;
-  JPEG_INT32 num,den;
-
-  odither = (ODITHER_MATRIX_PTR)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(ODITHER_MATRIX));
-  /* The inter-value distance for this color is MAXJSAMPLE/(ncolors-1).
-   * Hence the dither value for the matrix cell with fill order f
-   * (f=0..N-1) should be (N-1-2*f)/(2*N) * MAXJSAMPLE/(ncolors-1).
-   * On 16-bit-int machine, be careful to avoid overflow.
-   */
-  den = 2 * ODITHER_CELLS * ((JPEG_INT32) (ncolors - 1));
-  for (j = 0; j < ODITHER_SIZE; j++) {
-    for (k = 0; k < ODITHER_SIZE; k++) {
-      num = ((JPEG_INT32) (ODITHER_CELLS-1 - 2*((int)base_dither_matrix[j][k])))
-	    * MAXJSAMPLE;
-      /* Ensure round towards zero despite C's lack of consistency
-       * about rounding negative values in integer division...
-       */
-      odither[j][k] = (int) (num<0 ? -((-num)/den) : num/den);
-    }
-  }
-  return odither;
-}
-
-
-/*
- * Create the ordered-dither tables.
- * Components having the same number of representative colors may 
- * share a dither table.
- */
-
-LOCAL(void)
-create_odither_tables (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  ODITHER_MATRIX_PTR odither;
-  int i, j, nci;
-
-  for (i = 0; i < cinfo->out_color_components; i++) {
-    nci = cquantize->Ncolors[i]; /* # of distinct values for this color */
-    odither = NULL;		/* search for matching prior component */
-    for (j = 0; j < i; j++) {
-      if (nci == cquantize->Ncolors[j]) {
-	odither = cquantize->odither[j];
-	break;
-      }
-    }
-    if (odither == NULL)	/* need a new table? */
-      odither = make_odither_array(cinfo, nci);
-    cquantize->odither[i] = odither;
-  }
-}
-
-
-/*
- * Map some rows of pixels to the output colormapped representation.
- */
-
-METHODDEF(void)
-color_quantize (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
-		JSAMPARRAY output_buf, int num_rows)
-/* General case, no dithering */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  JSAMPARRAY colorindex = cquantize->colorindex;
-  register int pixcode, ci;
-  register JSAMPROW ptrin, ptrout;
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-  register int nc = cinfo->out_color_components;
-
-  for (row = 0; row < num_rows; row++) {
-    ptrin = input_buf[row];
-    ptrout = output_buf[row];
-    for (col = width; col > 0; col--) {
-      pixcode = 0;
-      for (ci = 0; ci < nc; ci++) {
-	pixcode += GETJSAMPLE(colorindex[ci][GETJSAMPLE(*ptrin++)]);
-      }
-      *ptrout++ = (JSAMPLE) pixcode;
-    }
-  }
-}
-
-
-METHODDEF(void)
-color_quantize3 (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
-		 JSAMPARRAY output_buf, int num_rows)
-/* Fast path for out_color_components==3, no dithering */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  register int pixcode;
-  register JSAMPROW ptrin, ptrout;
-  JSAMPROW colorindex0 = cquantize->colorindex[0];
-  JSAMPROW colorindex1 = cquantize->colorindex[1];
-  JSAMPROW colorindex2 = cquantize->colorindex[2];
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-
-  for (row = 0; row < num_rows; row++) {
-    ptrin = input_buf[row];
-    ptrout = output_buf[row];
-    for (col = width; col > 0; col--) {
-      pixcode  = GETJSAMPLE(colorindex0[GETJSAMPLE(*ptrin++)]);
-      pixcode += GETJSAMPLE(colorindex1[GETJSAMPLE(*ptrin++)]);
-      pixcode += GETJSAMPLE(colorindex2[GETJSAMPLE(*ptrin++)]);
-      *ptrout++ = (JSAMPLE) pixcode;
-    }
-  }
-}
-
-
-METHODDEF(void)
-quantize_ord_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
-		     JSAMPARRAY output_buf, int num_rows)
-/* General case, with ordered dithering */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  register JSAMPROW input_ptr;
-  register JSAMPROW output_ptr;
-  JSAMPROW colorindex_ci;
-  int * dither;			/* points to active row of dither matrix */
-  int row_index, col_index;	/* current indexes into dither matrix */
-  int nc = cinfo->out_color_components;
-  int ci;
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-
-  for (row = 0; row < num_rows; row++) {
-    /* Initialize output values to 0 so can process components separately */
-    jzero_far((void FAR *) output_buf[row],
-	      (size_t) (width * SIZEOF(JSAMPLE)));
-    row_index = cquantize->row_index;
-    for (ci = 0; ci < nc; ci++) {
-      input_ptr = input_buf[row] + ci;
-      output_ptr = output_buf[row];
-      colorindex_ci = cquantize->colorindex[ci];
-      dither = cquantize->odither[ci][row_index];
-      col_index = 0;
-
-      for (col = width; col > 0; col--) {
-	/* Form pixel value + dither, range-limit to 0..MAXJSAMPLE,
-	 * select output value, accumulate into output code for this pixel.
-	 * Range-limiting need not be done explicitly, as we have extended
-	 * the colorindex table to produce the right answers for out-of-range
-	 * inputs.  The maximum dither is +- MAXJSAMPLE; this sets the
-	 * required amount of padding.
-	 */
-	*output_ptr += colorindex_ci[GETJSAMPLE(*input_ptr)+dither[col_index]];
-	input_ptr += nc;
-	output_ptr++;
-	col_index = (col_index + 1) & ODITHER_MASK;
-      }
-    }
-    /* Advance row index for next row */
-    row_index = (row_index + 1) & ODITHER_MASK;
-    cquantize->row_index = row_index;
-  }
-}
-
-
-METHODDEF(void)
-quantize3_ord_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
-		      JSAMPARRAY output_buf, int num_rows)
-/* Fast path for out_color_components==3, with ordered dithering */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  register int pixcode;
-  register JSAMPROW input_ptr;
-  register JSAMPROW output_ptr;
-  JSAMPROW colorindex0 = cquantize->colorindex[0];
-  JSAMPROW colorindex1 = cquantize->colorindex[1];
-  JSAMPROW colorindex2 = cquantize->colorindex[2];
-  int * dither0;		/* points to active row of dither matrix */
-  int * dither1;
-  int * dither2;
-  int row_index, col_index;	/* current indexes into dither matrix */
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-
-  for (row = 0; row < num_rows; row++) {
-    row_index = cquantize->row_index;
-    input_ptr = input_buf[row];
-    output_ptr = output_buf[row];
-    dither0 = cquantize->odither[0][row_index];
-    dither1 = cquantize->odither[1][row_index];
-    dither2 = cquantize->odither[2][row_index];
-    col_index = 0;
-
-    for (col = width; col > 0; col--) {
-      pixcode  = GETJSAMPLE(colorindex0[GETJSAMPLE(*input_ptr++) +
-					dither0[col_index]]);
-      pixcode += GETJSAMPLE(colorindex1[GETJSAMPLE(*input_ptr++) +
-					dither1[col_index]]);
-      pixcode += GETJSAMPLE(colorindex2[GETJSAMPLE(*input_ptr++) +
-					dither2[col_index]]);
-      *output_ptr++ = (JSAMPLE) pixcode;
-      col_index = (col_index + 1) & ODITHER_MASK;
-    }
-    row_index = (row_index + 1) & ODITHER_MASK;
-    cquantize->row_index = row_index;
-  }
-}
-
-
-METHODDEF(void)
-quantize_fs_dither (j_decompress_ptr cinfo, JSAMPARRAY input_buf,
-		    JSAMPARRAY output_buf, int num_rows)
-/* General case, with Floyd-Steinberg dithering */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  register LOCFSERROR cur;	/* current error or pixel value */
-  LOCFSERROR belowerr;		/* error for pixel below cur */
-  LOCFSERROR bpreverr;		/* error for below/prev col */
-  LOCFSERROR bnexterr;		/* error for below/next col */
-  LOCFSERROR delta;
-  register FSERRPTR errorptr;	/* => fserrors[] at column before current */
-  register JSAMPROW input_ptr;
-  register JSAMPROW output_ptr;
-  JSAMPROW colorindex_ci;
-  JSAMPROW colormap_ci;
-  int pixcode;
-  int nc = cinfo->out_color_components;
-  int dir;			/* 1 for left-to-right, -1 for right-to-left */
-  int dirnc;			/* dir * nc */
-  int ci;
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-  JSAMPLE *range_limit = cinfo->sample_range_limit;
-  SHIFT_TEMPS
-
-  for (row = 0; row < num_rows; row++) {
-    /* Initialize output values to 0 so can process components separately */
-    jzero_far((void FAR *) output_buf[row],
-	      (size_t) (width * SIZEOF(JSAMPLE)));
-    for (ci = 0; ci < nc; ci++) {
-      input_ptr = input_buf[row] + ci;
-      output_ptr = output_buf[row];
-      if (cquantize->on_odd_row) {
-	/* work right to left in this row */
-	input_ptr += (width-1) * nc; /* so point to rightmost pixel */
-	output_ptr += width-1;
-	dir = -1;
-	dirnc = -nc;
-	errorptr = cquantize->fserrors[ci] + (width+1); /* => entry after last column */
-      } else {
-	/* work left to right in this row */
-	dir = 1;
-	dirnc = nc;
-	errorptr = cquantize->fserrors[ci]; /* => entry before first column */
-      }
-      colorindex_ci = cquantize->colorindex[ci];
-      colormap_ci = cquantize->sv_colormap[ci];
-      /* Preset error values: no error propagated to first pixel from left */
-      cur = 0;
-      /* and no error propagated to row below yet */
-      belowerr = bpreverr = 0;
-
-      for (col = width; col > 0; col--) {
-	/* cur holds the error propagated from the previous pixel on the
-	 * current line.  Add the error propagated from the previous line
-	 * to form the complete error correction term for this pixel, and
-	 * round the error term (which is expressed * 16) to an integer.
-	 * RIGHT_SHIFT rounds towards minus infinity, so adding 8 is correct
-	 * for either sign of the error value.
-	 * Note: errorptr points to *previous* column's array entry.
-	 */
-	cur = RIGHT_SHIFT(cur + errorptr[dir] + 8, 4);
-	/* Form pixel value + error, and range-limit to 0..MAXJSAMPLE.
-	 * The maximum error is +- MAXJSAMPLE; this sets the required size
-	 * of the range_limit array.
-	 */
-	cur += GETJSAMPLE(*input_ptr);
-	cur = GETJSAMPLE(range_limit[cur]);
-	/* Select output value, accumulate into output code for this pixel */
-	pixcode = GETJSAMPLE(colorindex_ci[cur]);
-	*output_ptr += (JSAMPLE) pixcode;
-	/* Compute actual representation error at this pixel */
-	/* Note: we can do this even though we don't have the final */
-	/* pixel code, because the colormap is orthogonal. */
-	cur -= GETJSAMPLE(colormap_ci[pixcode]);
-	/* Compute error fractions to be propagated to adjacent pixels.
-	 * Add these into the running sums, and simultaneously shift the
-	 * next-line error sums left by 1 column.
-	 */
-	bnexterr = cur;
-	delta = cur * 2;
-	cur += delta;		/* form error * 3 */
-	errorptr[0] = (FSERROR) (bpreverr + cur);
-	cur += delta;		/* form error * 5 */
-	bpreverr = belowerr + cur;
-	belowerr = bnexterr;
-	cur += delta;		/* form error * 7 */
-	/* At this point cur contains the 7/16 error value to be propagated
-	 * to the next pixel on the current line, and all the errors for the
-	 * next line have been shifted over. We are therefore ready to move on.
-	 */
-	input_ptr += dirnc;	/* advance input ptr to next column */
-	output_ptr += dir;	/* advance output ptr to next column */
-	errorptr += dir;	/* advance errorptr to current column */
-      }
-      /* Post-loop cleanup: we must unload the final error value into the
-       * final fserrors[] entry.  Note we need not unload belowerr because
-       * it is for the dummy column before or after the actual array.
-       */
-      errorptr[0] = (FSERROR) bpreverr; /* unload prev err into array */
-    }
-    cquantize->on_odd_row = (cquantize->on_odd_row ? FALSE : TRUE);
-  }
-}
-
-
-/*
- * Allocate workspace for Floyd-Steinberg errors.
- */
-
-LOCAL(void)
-alloc_fs_workspace (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  size_t arraysize;
-  int i;
-
-  arraysize = (size_t) ((cinfo->output_width + 2) * SIZEOF(FSERROR));
-  for (i = 0; i < cinfo->out_color_components; i++) {
-    cquantize->fserrors[i] = (FSERRPTR)
-      (*cinfo->mem->alloc_large)((j_common_ptr) cinfo, JPOOL_IMAGE, arraysize);
-  }
-}
-
-
-/*
- * Initialize for one-pass color quantization.
- */
-
-METHODDEF(void)
-start_pass_1_quant (j_decompress_ptr cinfo, wxjpeg_boolean is_pre_scan)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  size_t arraysize;
-  int i;
-
-  /* Install my colormap. */
-  cinfo->colormap = cquantize->sv_colormap;
-  cinfo->actual_number_of_colors = cquantize->sv_actual;
-
-  /* Initialize for desired dithering mode. */
-  switch (cinfo->dither_mode) {
-  case JDITHER_NONE:
-    if (cinfo->out_color_components == 3)
-      cquantize->pub.color_quantize = color_quantize3;
-    else
-      cquantize->pub.color_quantize = color_quantize;
-    break;
-  case JDITHER_ORDERED:
-    if (cinfo->out_color_components == 3)
-      cquantize->pub.color_quantize = quantize3_ord_dither;
-    else
-      cquantize->pub.color_quantize = quantize_ord_dither;
-    cquantize->row_index = 0;	/* initialize state for ordered dither */
-    /* If user changed to ordered dither from another mode,
-     * we must recreate the color index table with padding.
-     * This will cost extra space, but probably isn't very likely.
-     */
-    if (! cquantize->is_padded)
-      create_colorindex(cinfo);
-    /* Create ordered-dither tables if we didn't already. */
-    if (cquantize->odither[0] == NULL)
-      create_odither_tables(cinfo);
-    break;
-  case JDITHER_FS:
-    cquantize->pub.color_quantize = quantize_fs_dither;
-    cquantize->on_odd_row = FALSE; /* initialize state for F-S dither */
-    /* Allocate Floyd-Steinberg workspace if didn't already. */
-    if (cquantize->fserrors[0] == NULL)
-      alloc_fs_workspace(cinfo);
-    /* Initialize the propagated errors to zero. */
-    arraysize = (size_t) ((cinfo->output_width + 2) * SIZEOF(FSERROR));
-    for (i = 0; i < cinfo->out_color_components; i++)
-      jzero_far((void FAR *) cquantize->fserrors[i], arraysize);
-    break;
-  default:
-    ERREXIT(cinfo, JERR_NOT_COMPILED);
-    break;
-  }
-}
-
-
-/*
- * Finish up at the end of the pass.
- */
-
-METHODDEF(void)
-finish_pass_1_quant (j_decompress_ptr cinfo)
-{
-  /* no work in 1-pass case */
-}
-
-
-/*
- * Switch to a new external colormap between output passes.
- * Shouldn't get to this module!
- */
-
-METHODDEF(void)
-new_color_map_1_quant (j_decompress_ptr cinfo)
-{
-  ERREXIT(cinfo, JERR_MODE_CHANGE);
-}
-
-
-/*
- * Module initialization routine for 1-pass color quantization.
- */
-
-GLOBAL(void)
-jinit_1pass_quantizer (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize;
-
-  cquantize = (my_cquantize_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_cquantizer));
-  cinfo->cquantize = (struct jpeg_color_quantizer *) cquantize;
-  cquantize->pub.start_pass = start_pass_1_quant;
-  cquantize->pub.finish_pass = finish_pass_1_quant;
-  cquantize->pub.new_color_map = new_color_map_1_quant;
-  cquantize->fserrors[0] = NULL; /* Flag FS workspace not allocated */
-  cquantize->odither[0] = NULL;	/* Also flag odither arrays not allocated */
-
-  /* Make sure my internal arrays won't overflow */
-  if (cinfo->out_color_components > MAX_Q_COMPS)
-    ERREXIT1(cinfo, JERR_QUANT_COMPONENTS, MAX_Q_COMPS);
-  /* Make sure colormap indexes can be represented by JSAMPLEs */
-  if (cinfo->desired_number_of_colors > (MAXJSAMPLE+1))
-    ERREXIT1(cinfo, JERR_QUANT_MANY_COLORS, MAXJSAMPLE+1);
-
-  /* Create the colormap and color index table. */
-  create_colormap(cinfo);
-  create_colorindex(cinfo);
-
-  /* Allocate Floyd-Steinberg workspace now if requested.
-   * We do this now since it is FAR storage and may affect the memory
-   * manager's space calculations.  If the user changes to FS dither
-   * mode in a later pass, we will allocate the space then, and will
-   * possibly overrun the max_memory_to_use setting.
-   */
-  if (cinfo->dither_mode == JDITHER_FS)
-    alloc_fs_workspace(cinfo);
-}
-
-#endif /* QUANT_1PASS_SUPPORTED */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jquant2.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jquant2.c
deleted file mode 100644
index b9c66a325c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jquant2.c
+++ /dev/null
@@ -1,1310 +0,0 @@
-/*
- * jquant2.c
- *
- * Copyright (C) 1991-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains 2-pass color quantization (color mapping) routines.
- * These routines provide selection of a custom color map for an image,
- * followed by mapping of the image to that color map, with optional
- * Floyd-Steinberg dithering.
- * It is also possible to use just the second pass to map to an arbitrary
- * externally-given color map.
- *
- * Note: ordered dithering is not supported, since there isn't any fast
- * way to compute intercolor distances; it's unclear that ordered dither's
- * fundamental assumptions even hold with an irregularly spaced color map.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-#ifdef QUANT_2PASS_SUPPORTED
-
-
-/*
- * This module implements the well-known Heckbert paradigm for color
- * quantization.  Most of the ideas used here can be traced back to
- * Heckbert's seminal paper
- *   Heckbert, Paul.  "Color Image Quantization for Frame Buffer Display",
- *   Proc. SIGGRAPH '82, Computer Graphics v.16 #3 (July 1982), pp 297-304.
- *
- * In the first pass over the image, we accumulate a histogram showing the
- * usage count of each possible color.  To keep the histogram to a reasonable
- * size, we reduce the precision of the input; typical practice is to retain
- * 5 or 6 bits per color, so that 8 or 4 different input values are counted
- * in the same histogram cell.
- *
- * Next, the color-selection step begins with a box representing the whole
- * color space, and repeatedly splits the "largest" remaining box until we
- * have as many boxes as desired colors.  Then the mean color in each
- * remaining box becomes one of the possible output colors.
- * 
- * The second pass over the image maps each input pixel to the closest output
- * color (optionally after applying a Floyd-Steinberg dithering correction).
- * This mapping is logically trivial, but making it go fast enough requires
- * considerable care.
- *
- * Heckbert-style quantizers vary a good deal in their policies for choosing
- * the "largest" box and deciding where to cut it.  The particular policies
- * used here have proved out well in experimental comparisons, but better ones
- * may yet be found.
- *
- * In earlier versions of the IJG code, this module quantized in YCbCr color
- * space, processing the raw upsampled data without a color conversion step.
- * This allowed the color conversion math to be done only once per colormap
- * entry, not once per pixel.  However, that optimization precluded other
- * useful optimizations (such as merging color conversion with upsampling)
- * and it also interfered with desired capabilities such as quantizing to an
- * externally-supplied colormap.  We have therefore abandoned that approach.
- * The present code works in the post-conversion color space, typically RGB.
- *
- * To improve the visual quality of the results, we actually work in scaled
- * RGB space, giving G distances more weight than R, and R in turn more than
- * B.  To do everything in integer math, we must use integer scale factors.
- * The 2/3/1 scale factors used here correspond loosely to the relative
- * weights of the colors in the NTSC grayscale equation.
- * If you want to use this code to quantize a non-RGB color space, you'll
- * probably need to change these scale factors.
- */
-
-#define R_SCALE 2		/* scale R distances by this much */
-#define G_SCALE 3		/* scale G distances by this much */
-#define B_SCALE 1		/* and B by this much */
-
-/* Relabel R/G/B as components 0/1/2, respecting the RGB ordering defined
- * in jmorecfg.h.  As the code stands, it will do the right thing for R,G,B
- * and B,G,R orders.  If you define some other weird order in jmorecfg.h,
- * you'll get compile errors until you extend this logic.  In that case
- * you'll probably want to tweak the histogram sizes too.
- */
-
-#if RGB_RED == 0
-#define C0_SCALE R_SCALE
-#endif
-#if RGB_BLUE == 0
-#define C0_SCALE B_SCALE
-#endif
-#if RGB_GREEN == 1
-#define C1_SCALE G_SCALE
-#endif
-#if RGB_RED == 2
-#define C2_SCALE R_SCALE
-#endif
-#if RGB_BLUE == 2
-#define C2_SCALE B_SCALE
-#endif
-
-
-/*
- * First we have the histogram data structure and routines for creating it.
- *
- * The number of bits of precision can be adjusted by changing these symbols.
- * We recommend keeping 6 bits for G and 5 each for R and B.
- * If you have plenty of memory and cycles, 6 bits all around gives marginally
- * better results; if you are short of memory, 5 bits all around will save
- * some space but degrade the results.
- * To maintain a fully accurate histogram, we'd need to allocate a "long"
- * (preferably unsigned long) for each cell.  In practice this is overkill;
- * we can get by with 16 bits per cell.  Few of the cell counts will overflow,
- * and clamping those that do overflow to the maximum value will give close-
- * enough results.  This reduces the recommended histogram size from 256Kb
- * to 128Kb, which is a useful savings on PC-class machines.
- * (In the second pass the histogram space is re-used for pixel mapping data;
- * in that capacity, each cell must be able to store zero to the number of
- * desired colors.  16 bits/cell is plenty for that too.)
- * Since the JPEG code is intended to run in small memory model on 80x86
- * machines, we can't just allocate the histogram in one chunk.  Instead
- * of a true 3-D array, we use a row of pointers to 2-D arrays.  Each
- * pointer corresponds to a C0 value (typically 2^5 = 32 pointers) and
- * each 2-D array has 2^6*2^5 = 2048 or 2^6*2^6 = 4096 entries.  Note that
- * on 80x86 machines, the pointer row is in near memory but the actual
- * arrays are in far memory (same arrangement as we use for image arrays).
- */
-
-#define MAXNUMCOLORS  (MAXJSAMPLE+1) /* maximum size of colormap */
-
-/* These will do the right thing for either R,G,B or B,G,R color order,
- * but you may not like the results for other color orders.
- */
-#define HIST_C0_BITS  5		/* bits of precision in R/B histogram */
-#define HIST_C1_BITS  6		/* bits of precision in G histogram */
-#define HIST_C2_BITS  5		/* bits of precision in B/R histogram */
-
-/* Number of elements along histogram axes. */
-#define HIST_C0_ELEMS  (1<cquantize;
-  register JSAMPROW ptr;
-  register histptr histp;
-  register hist3d histogram = cquantize->histogram;
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-
-  for (row = 0; row < num_rows; row++) {
-    ptr = input_buf[row];
-    for (col = width; col > 0; col--) {
-      /* get pixel value and index into the histogram */
-      histp = & histogram[GETJSAMPLE(ptr[0]) >> C0_SHIFT]
-			 [GETJSAMPLE(ptr[1]) >> C1_SHIFT]
-			 [GETJSAMPLE(ptr[2]) >> C2_SHIFT];
-      /* increment, check for overflow and undo increment if so. */
-      if (++(*histp) <= 0)
-	(*histp)--;
-      ptr += 3;
-    }
-  }
-}
-
-
-/*
- * Next we have the really interesting routines: selection of a colormap
- * given the completed histogram.
- * These routines work with a list of "boxes", each representing a rectangular
- * subset of the input color space (to histogram precision).
- */
-
-typedef struct {
-  /* The bounds of the box (inclusive); expressed as histogram indexes */
-  int c0min, c0max;
-  int c1min, c1max;
-  int c2min, c2max;
-  /* The volume (actually 2-norm) of the box */
-  JPEG_INT32 volume;
-  /* The number of nonzero histogram cells within this box */
-  long colorcount;
-} box;
-
-typedef box * boxptr;
-
-
-LOCAL(boxptr)
-find_biggest_color_pop (boxptr boxlist, int numboxes)
-/* Find the splittable box with the largest color population */
-/* Returns NULL if no splittable boxes remain */
-{
-  register boxptr boxp;
-  register int i;
-  register long maxc = 0;
-  boxptr which = NULL;
-  
-  for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {
-    if (boxp->colorcount > maxc && boxp->volume > 0) {
-      which = boxp;
-      maxc = boxp->colorcount;
-    }
-  }
-  return which;
-}
-
-
-LOCAL(boxptr)
-find_biggest_volume (boxptr boxlist, int numboxes)
-/* Find the splittable box with the largest (scaled) volume */
-/* Returns NULL if no splittable boxes remain */
-{
-  register boxptr boxp;
-  register int i;
-  register JPEG_INT32 maxv = 0;
-  boxptr which = NULL;
-  
-  for (i = 0, boxp = boxlist; i < numboxes; i++, boxp++) {
-    if (boxp->volume > maxv) {
-      which = boxp;
-      maxv = boxp->volume;
-    }
-  }
-  return which;
-}
-
-
-LOCAL(void)
-update_box (j_decompress_ptr cinfo, boxptr boxp)
-/* Shrink the min/max bounds of a box to enclose only nonzero elements, */
-/* and recompute its volume and population */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-  histptr histp;
-  int c0,c1,c2;
-  int c0min,c0max,c1min,c1max,c2min,c2max;
-  JPEG_INT32 dist0,dist1,dist2;
-  long ccount;
-  
-  c0min = boxp->c0min;  c0max = boxp->c0max;
-  c1min = boxp->c1min;  c1max = boxp->c1max;
-  c2min = boxp->c2min;  c2max = boxp->c2max;
-  
-  if (c0max > c0min)
-    for (c0 = c0min; c0 <= c0max; c0++)
-      for (c1 = c1min; c1 <= c1max; c1++) {
-	histp = & histogram[c0][c1][c2min];
-	for (c2 = c2min; c2 <= c2max; c2++)
-	  if (*histp++ != 0) {
-	    boxp->c0min = c0min = c0;
-	    goto have_c0min;
-	  }
-      }
- have_c0min:
-  if (c0max > c0min)
-    for (c0 = c0max; c0 >= c0min; c0--)
-      for (c1 = c1min; c1 <= c1max; c1++) {
-	histp = & histogram[c0][c1][c2min];
-	for (c2 = c2min; c2 <= c2max; c2++)
-	  if (*histp++ != 0) {
-	    boxp->c0max = c0max = c0;
-	    goto have_c0max;
-	  }
-      }
- have_c0max:
-  if (c1max > c1min)
-    for (c1 = c1min; c1 <= c1max; c1++)
-      for (c0 = c0min; c0 <= c0max; c0++) {
-	histp = & histogram[c0][c1][c2min];
-	for (c2 = c2min; c2 <= c2max; c2++)
-	  if (*histp++ != 0) {
-	    boxp->c1min = c1min = c1;
-	    goto have_c1min;
-	  }
-      }
- have_c1min:
-  if (c1max > c1min)
-    for (c1 = c1max; c1 >= c1min; c1--)
-      for (c0 = c0min; c0 <= c0max; c0++) {
-	histp = & histogram[c0][c1][c2min];
-	for (c2 = c2min; c2 <= c2max; c2++)
-	  if (*histp++ != 0) {
-	    boxp->c1max = c1max = c1;
-	    goto have_c1max;
-	  }
-      }
- have_c1max:
-  if (c2max > c2min)
-    for (c2 = c2min; c2 <= c2max; c2++)
-      for (c0 = c0min; c0 <= c0max; c0++) {
-	histp = & histogram[c0][c1min][c2];
-	for (c1 = c1min; c1 <= c1max; c1++, histp += HIST_C2_ELEMS)
-	  if (*histp != 0) {
-	    boxp->c2min = c2min = c2;
-	    goto have_c2min;
-	  }
-      }
- have_c2min:
-  if (c2max > c2min)
-    for (c2 = c2max; c2 >= c2min; c2--)
-      for (c0 = c0min; c0 <= c0max; c0++) {
-	histp = & histogram[c0][c1min][c2];
-	for (c1 = c1min; c1 <= c1max; c1++, histp += HIST_C2_ELEMS)
-	  if (*histp != 0) {
-	    boxp->c2max = c2max = c2;
-	    goto have_c2max;
-	  }
-      }
- have_c2max:
-
-  /* Update box volume.
-   * We use 2-norm rather than real volume here; this biases the method
-   * against making long narrow boxes, and it has the side benefit that
-   * a box is splittable iff norm > 0.
-   * Since the differences are expressed in histogram-cell units,
-   * we have to shift back to JSAMPLE units to get consistent distances;
-   * after which, we scale according to the selected distance scale factors.
-   */
-  dist0 = ((c0max - c0min) << C0_SHIFT) * C0_SCALE;
-  dist1 = ((c1max - c1min) << C1_SHIFT) * C1_SCALE;
-  dist2 = ((c2max - c2min) << C2_SHIFT) * C2_SCALE;
-  boxp->volume = dist0*dist0 + dist1*dist1 + dist2*dist2;
-  
-  /* Now scan remaining volume of box and compute population */
-  ccount = 0;
-  for (c0 = c0min; c0 <= c0max; c0++)
-    for (c1 = c1min; c1 <= c1max; c1++) {
-      histp = & histogram[c0][c1][c2min];
-      for (c2 = c2min; c2 <= c2max; c2++, histp++)
-	if (*histp != 0) {
-	  ccount++;
-	}
-    }
-  boxp->colorcount = ccount;
-}
-
-
-LOCAL(int)
-median_cut (j_decompress_ptr cinfo, boxptr boxlist, int numboxes,
-	    int desired_colors)
-/* Repeatedly select and split the largest box until we have enough boxes */
-{
-  int n,lb;
-  int c0,c1,c2,cmax;
-  register boxptr b1,b2;
-
-  while (numboxes < desired_colors) {
-    /* Select box to split.
-     * Current algorithm: by population for first half, then by volume.
-     */
-    if (numboxes*2 <= desired_colors) {
-      b1 = find_biggest_color_pop(boxlist, numboxes);
-    } else {
-      b1 = find_biggest_volume(boxlist, numboxes);
-    }
-    if (b1 == NULL)		/* no splittable boxes left! */
-      break;
-    b2 = &boxlist[numboxes];	/* where new box will go */
-    /* Copy the color bounds to the new box. */
-    b2->c0max = b1->c0max; b2->c1max = b1->c1max; b2->c2max = b1->c2max;
-    b2->c0min = b1->c0min; b2->c1min = b1->c1min; b2->c2min = b1->c2min;
-    /* Choose which axis to split the box on.
-     * Current algorithm: longest scaled axis.
-     * See notes in update_box about scaling distances.
-     */
-    c0 = ((b1->c0max - b1->c0min) << C0_SHIFT) * C0_SCALE;
-    c1 = ((b1->c1max - b1->c1min) << C1_SHIFT) * C1_SCALE;
-    c2 = ((b1->c2max - b1->c2min) << C2_SHIFT) * C2_SCALE;
-    /* We want to break any ties in favor of green, then red, blue last.
-     * This code does the right thing for R,G,B or B,G,R color orders only.
-     */
-#if RGB_RED == 0
-    cmax = c1; n = 1;
-    if (c0 > cmax) { cmax = c0; n = 0; }
-    if (c2 > cmax) { n = 2; }
-#else
-    cmax = c1; n = 1;
-    if (c2 > cmax) { cmax = c2; n = 2; }
-    if (c0 > cmax) { n = 0; }
-#endif
-    /* Choose split point along selected axis, and update box bounds.
-     * Current algorithm: split at halfway point.
-     * (Since the box has been shrunk to minimum volume,
-     * any split will produce two nonempty subboxes.)
-     * Note that lb value is max for lower box, so must be < old max.
-     */
-    switch (n) {
-    case 0:
-      lb = (b1->c0max + b1->c0min) / 2;
-      b1->c0max = lb;
-      b2->c0min = lb+1;
-      break;
-    case 1:
-      lb = (b1->c1max + b1->c1min) / 2;
-      b1->c1max = lb;
-      b2->c1min = lb+1;
-      break;
-    case 2:
-      lb = (b1->c2max + b1->c2min) / 2;
-      b1->c2max = lb;
-      b2->c2min = lb+1;
-      break;
-    }
-    /* Update stats for boxes */
-    update_box(cinfo, b1);
-    update_box(cinfo, b2);
-    numboxes++;
-  }
-  return numboxes;
-}
-
-
-LOCAL(void)
-compute_color (j_decompress_ptr cinfo, boxptr boxp, int icolor)
-/* Compute representative color for a box, put it in colormap[icolor] */
-{
-  /* Current algorithm: mean weighted by pixels (not colors) */
-  /* Note it is important to get the rounding correct! */
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-  histptr histp;
-  int c0,c1,c2;
-  int c0min,c0max,c1min,c1max,c2min,c2max;
-  long count;
-  long total = 0;
-  long c0total = 0;
-  long c1total = 0;
-  long c2total = 0;
-  
-  c0min = boxp->c0min;  c0max = boxp->c0max;
-  c1min = boxp->c1min;  c1max = boxp->c1max;
-  c2min = boxp->c2min;  c2max = boxp->c2max;
-  
-  for (c0 = c0min; c0 <= c0max; c0++)
-    for (c1 = c1min; c1 <= c1max; c1++) {
-      histp = & histogram[c0][c1][c2min];
-      for (c2 = c2min; c2 <= c2max; c2++) {
-	if ((count = *histp++) != 0) {
-	  total += count;
-	  c0total += ((c0 << C0_SHIFT) + ((1<>1)) * count;
-	  c1total += ((c1 << C1_SHIFT) + ((1<>1)) * count;
-	  c2total += ((c2 << C2_SHIFT) + ((1<>1)) * count;
-	}
-      }
-    }
-  
-  cinfo->colormap[0][icolor] = (JSAMPLE) ((c0total + (total>>1)) / total);
-  cinfo->colormap[1][icolor] = (JSAMPLE) ((c1total + (total>>1)) / total);
-  cinfo->colormap[2][icolor] = (JSAMPLE) ((c2total + (total>>1)) / total);
-}
-
-
-LOCAL(void)
-select_colors (j_decompress_ptr cinfo, int desired_colors)
-/* Master routine for color selection */
-{
-  boxptr boxlist;
-  int numboxes;
-  int i;
-
-  /* Allocate workspace for box list */
-  boxlist = (boxptr) (*cinfo->mem->alloc_small)
-    ((j_common_ptr) cinfo, JPOOL_IMAGE, desired_colors * SIZEOF(box));
-  /* Initialize one box containing whole space */
-  numboxes = 1;
-  boxlist[0].c0min = 0;
-  boxlist[0].c0max = MAXJSAMPLE >> C0_SHIFT;
-  boxlist[0].c1min = 0;
-  boxlist[0].c1max = MAXJSAMPLE >> C1_SHIFT;
-  boxlist[0].c2min = 0;
-  boxlist[0].c2max = MAXJSAMPLE >> C2_SHIFT;
-  /* Shrink it to actually-used volume and set its statistics */
-  update_box(cinfo, & boxlist[0]);
-  /* Perform median-cut to produce final box list */
-  numboxes = median_cut(cinfo, boxlist, numboxes, desired_colors);
-  /* Compute the representative color for each box, fill colormap */
-  for (i = 0; i < numboxes; i++)
-    compute_color(cinfo, & boxlist[i], i);
-  cinfo->actual_number_of_colors = numboxes;
-  TRACEMS1(cinfo, 1, JTRC_QUANT_SELECTED, numboxes);
-}
-
-
-/*
- * These routines are concerned with the time-critical task of mapping input
- * colors to the nearest color in the selected colormap.
- *
- * We re-use the histogram space as an "inverse color map", essentially a
- * cache for the results of nearest-color searches.  All colors within a
- * histogram cell will be mapped to the same colormap entry, namely the one
- * closest to the cell's center.  This may not be quite the closest entry to
- * the actual input color, but it's almost as good.  A zero in the cache
- * indicates we haven't found the nearest color for that cell yet; the array
- * is cleared to zeroes before starting the mapping pass.  When we find the
- * nearest color for a cell, its colormap index plus one is recorded in the
- * cache for future use.  The pass2 scanning routines call fill_inverse_cmap
- * when they need to use an unfilled entry in the cache.
- *
- * Our method of efficiently finding nearest colors is based on the "locally
- * sorted search" idea described by Heckbert and on the incremental distance
- * calculation described by Spencer W. Thomas in chapter III.1 of Graphics
- * Gems II (James Arvo, ed.  Academic Press, 1991).  Thomas points out that
- * the distances from a given colormap entry to each cell of the histogram can
- * be computed quickly using an incremental method: the differences between
- * distances to adjacent cells themselves differ by a constant.  This allows a
- * fairly fast implementation of the "brute force" approach of computing the
- * distance from every colormap entry to every histogram cell.  Unfortunately,
- * it needs a work array to hold the best-distance-so-far for each histogram
- * cell (because the inner loop has to be over cells, not colormap entries).
- * The work array elements have to be INT32s, so the work array would need
- * 256Kb at our recommended precision.  This is not feasible in DOS machines.
- *
- * To get around these problems, we apply Thomas' method to compute the
- * nearest colors for only the cells within a small subbox of the histogram.
- * The work array need be only as big as the subbox, so the memory usage
- * problem is solved.  Furthermore, we need not fill subboxes that are never
- * referenced in pass2; many images use only part of the color gamut, so a
- * fair amount of work is saved.  An additional advantage of this
- * approach is that we can apply Heckbert's locality criterion to quickly
- * eliminate colormap entries that are far away from the subbox; typically
- * three-fourths of the colormap entries are rejected by Heckbert's criterion,
- * and we need not compute their distances to individual cells in the subbox.
- * The speed of this approach is heavily influenced by the subbox size: too
- * small means too much overhead, too big loses because Heckbert's criterion
- * can't eliminate as many colormap entries.  Empirically the best subbox
- * size seems to be about 1/512th of the histogram (1/8th in each direction).
- *
- * Thomas' article also describes a refined method which is asymptotically
- * faster than the brute-force method, but it is also far more complex and
- * cannot efficiently be applied to small subboxes.  It is therefore not
- * useful for programs intended to be portable to DOS machines.  On machines
- * with plenty of memory, filling the whole histogram in one shot with Thomas'
- * refined method might be faster than the present code --- but then again,
- * it might not be any faster, and it's certainly more complicated.
- */
-
-
-/* log2(histogram cells in update box) for each axis; this can be adjusted */
-#define BOX_C0_LOG  (HIST_C0_BITS-3)
-#define BOX_C1_LOG  (HIST_C1_BITS-3)
-#define BOX_C2_LOG  (HIST_C2_BITS-3)
-
-#define BOX_C0_ELEMS  (1<actual_number_of_colors;
-  int maxc0, maxc1, maxc2;
-  int centerc0, centerc1, centerc2;
-  int i, x, ncolors;
-  JPEG_INT32 minmaxdist, min_dist, max_dist, tdist;
-  JPEG_INT32 mindist[MAXNUMCOLORS];	/* min distance to colormap entry i */
-
-  /* Compute true coordinates of update box's upper corner and center.
-   * Actually we compute the coordinates of the center of the upper-corner
-   * histogram cell, which are the upper bounds of the volume we care about.
-   * Note that since ">>" rounds down, the "center" values may be closer to
-   * min than to max; hence comparisons to them must be "<=", not "<".
-   */
-  maxc0 = minc0 + ((1 << BOX_C0_SHIFT) - (1 << C0_SHIFT));
-  centerc0 = (minc0 + maxc0) >> 1;
-  maxc1 = minc1 + ((1 << BOX_C1_SHIFT) - (1 << C1_SHIFT));
-  centerc1 = (minc1 + maxc1) >> 1;
-  maxc2 = minc2 + ((1 << BOX_C2_SHIFT) - (1 << C2_SHIFT));
-  centerc2 = (minc2 + maxc2) >> 1;
-
-  /* For each color in colormap, find:
-   *  1. its minimum squared-distance to any point in the update box
-   *     (zero if color is within update box);
-   *  2. its maximum squared-distance to any point in the update box.
-   * Both of these can be found by considering only the corners of the box.
-   * We save the minimum distance for each color in mindist[];
-   * only the smallest maximum distance is of interest.
-   */
-  minmaxdist = 0x7FFFFFFFL;
-
-  for (i = 0; i < numcolors; i++) {
-    /* We compute the squared-c0-distance term, then add in the other two. */
-    x = GETJSAMPLE(cinfo->colormap[0][i]);
-    if (x < minc0) {
-      tdist = (x - minc0) * C0_SCALE;
-      min_dist = tdist*tdist;
-      tdist = (x - maxc0) * C0_SCALE;
-      max_dist = tdist*tdist;
-    } else if (x > maxc0) {
-      tdist = (x - maxc0) * C0_SCALE;
-      min_dist = tdist*tdist;
-      tdist = (x - minc0) * C0_SCALE;
-      max_dist = tdist*tdist;
-    } else {
-      /* within cell range so no contribution to min_dist */
-      min_dist = 0;
-      if (x <= centerc0) {
-	tdist = (x - maxc0) * C0_SCALE;
-	max_dist = tdist*tdist;
-      } else {
-	tdist = (x - minc0) * C0_SCALE;
-	max_dist = tdist*tdist;
-      }
-    }
-
-    x = GETJSAMPLE(cinfo->colormap[1][i]);
-    if (x < minc1) {
-      tdist = (x - minc1) * C1_SCALE;
-      min_dist += tdist*tdist;
-      tdist = (x - maxc1) * C1_SCALE;
-      max_dist += tdist*tdist;
-    } else if (x > maxc1) {
-      tdist = (x - maxc1) * C1_SCALE;
-      min_dist += tdist*tdist;
-      tdist = (x - minc1) * C1_SCALE;
-      max_dist += tdist*tdist;
-    } else {
-      /* within cell range so no contribution to min_dist */
-      if (x <= centerc1) {
-	tdist = (x - maxc1) * C1_SCALE;
-	max_dist += tdist*tdist;
-      } else {
-	tdist = (x - minc1) * C1_SCALE;
-	max_dist += tdist*tdist;
-      }
-    }
-
-    x = GETJSAMPLE(cinfo->colormap[2][i]);
-    if (x < minc2) {
-      tdist = (x - minc2) * C2_SCALE;
-      min_dist += tdist*tdist;
-      tdist = (x - maxc2) * C2_SCALE;
-      max_dist += tdist*tdist;
-    } else if (x > maxc2) {
-      tdist = (x - maxc2) * C2_SCALE;
-      min_dist += tdist*tdist;
-      tdist = (x - minc2) * C2_SCALE;
-      max_dist += tdist*tdist;
-    } else {
-      /* within cell range so no contribution to min_dist */
-      if (x <= centerc2) {
-	tdist = (x - maxc2) * C2_SCALE;
-	max_dist += tdist*tdist;
-      } else {
-	tdist = (x - minc2) * C2_SCALE;
-	max_dist += tdist*tdist;
-      }
-    }
-
-    mindist[i] = min_dist;	/* save away the results */
-    if (max_dist < minmaxdist)
-      minmaxdist = max_dist;
-  }
-
-  /* Now we know that no cell in the update box is more than minmaxdist
-   * away from some colormap entry.  Therefore, only colors that are
-   * within minmaxdist of some part of the box need be considered.
-   */
-  ncolors = 0;
-  for (i = 0; i < numcolors; i++) {
-    if (mindist[i] <= minmaxdist)
-      colorlist[ncolors++] = (JSAMPLE) i;
-  }
-  return ncolors;
-}
-
-
-LOCAL(void)
-find_best_colors (j_decompress_ptr cinfo, int minc0, int minc1, int minc2,
-		  int numcolors, JSAMPLE colorlist[], JSAMPLE bestcolor[])
-/* Find the closest colormap entry for each cell in the update box,
- * given the list of candidate colors prepared by find_nearby_colors.
- * Return the indexes of the closest entries in the bestcolor[] array.
- * This routine uses Thomas' incremental distance calculation method to
- * find the distance from a colormap entry to successive cells in the box.
- */
-{
-  int ic0, ic1, ic2;
-  int i, icolor;
-  register JPEG_INT32 * bptr;	/* pointer into bestdist[] array */
-  JSAMPLE * cptr;		/* pointer into bestcolor[] array */
-  JPEG_INT32 dist0, dist1;		/* initial distance values */
-  register JPEG_INT32 dist2;		/* current distance in inner loop */
-  JPEG_INT32 xx0, xx1;		/* distance increments */
-  register JPEG_INT32 xx2;
-  JPEG_INT32 inc0, inc1, inc2;	/* initial values for increments */
-  /* This array holds the distance to the nearest-so-far color for each cell */
-  JPEG_INT32 bestdist[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS];
-
-  /* Initialize best-distance for each cell of the update box */
-  bptr = bestdist;
-  for (i = BOX_C0_ELEMS*BOX_C1_ELEMS*BOX_C2_ELEMS-1; i >= 0; i--)
-    *bptr++ = 0x7FFFFFFFL;
-  
-  /* For each color selected by find_nearby_colors,
-   * compute its distance to the center of each cell in the box.
-   * If that's less than best-so-far, update best distance and color number.
-   */
-  
-  /* Nominal steps between cell centers ("x" in Thomas article) */
-#define STEP_C0  ((1 << C0_SHIFT) * C0_SCALE)
-#define STEP_C1  ((1 << C1_SHIFT) * C1_SCALE)
-#define STEP_C2  ((1 << C2_SHIFT) * C2_SCALE)
-  
-  for (i = 0; i < numcolors; i++) {
-    icolor = GETJSAMPLE(colorlist[i]);
-    /* Compute (square of) distance from minc0/c1/c2 to this color */
-    inc0 = (minc0 - GETJSAMPLE(cinfo->colormap[0][icolor])) * C0_SCALE;
-    dist0 = inc0*inc0;
-    inc1 = (minc1 - GETJSAMPLE(cinfo->colormap[1][icolor])) * C1_SCALE;
-    dist0 += inc1*inc1;
-    inc2 = (minc2 - GETJSAMPLE(cinfo->colormap[2][icolor])) * C2_SCALE;
-    dist0 += inc2*inc2;
-    /* Form the initial difference increments */
-    inc0 = inc0 * (2 * STEP_C0) + STEP_C0 * STEP_C0;
-    inc1 = inc1 * (2 * STEP_C1) + STEP_C1 * STEP_C1;
-    inc2 = inc2 * (2 * STEP_C2) + STEP_C2 * STEP_C2;
-    /* Now loop over all cells in box, updating distance per Thomas method */
-    bptr = bestdist;
-    cptr = bestcolor;
-    xx0 = inc0;
-    for (ic0 = BOX_C0_ELEMS-1; ic0 >= 0; ic0--) {
-      dist1 = dist0;
-      xx1 = inc1;
-      for (ic1 = BOX_C1_ELEMS-1; ic1 >= 0; ic1--) {
-	dist2 = dist1;
-	xx2 = inc2;
-	for (ic2 = BOX_C2_ELEMS-1; ic2 >= 0; ic2--) {
-	  if (dist2 < *bptr) {
-	    *bptr = dist2;
-	    *cptr = (JSAMPLE) icolor;
-	  }
-	  dist2 += xx2;
-	  xx2 += 2 * STEP_C2 * STEP_C2;
-	  bptr++;
-	  cptr++;
-	}
-	dist1 += xx1;
-	xx1 += 2 * STEP_C1 * STEP_C1;
-      }
-      dist0 += xx0;
-      xx0 += 2 * STEP_C0 * STEP_C0;
-    }
-  }
-}
-
-
-LOCAL(void)
-fill_inverse_cmap (j_decompress_ptr cinfo, int c0, int c1, int c2)
-/* Fill the inverse-colormap entries in the update box that contains */
-/* histogram cell c0/c1/c2.  (Only that one cell MUST be filled, but */
-/* we can fill as many others as we wish.) */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-  int minc0, minc1, minc2;	/* lower left corner of update box */
-  int ic0, ic1, ic2;
-  register JSAMPLE * cptr;	/* pointer into bestcolor[] array */
-  register histptr cachep;	/* pointer into main cache array */
-  /* This array lists the candidate colormap indexes. */
-  JSAMPLE colorlist[MAXNUMCOLORS];
-  int numcolors;		/* number of candidate colors */
-  /* This array holds the actually closest colormap index for each cell. */
-  JSAMPLE bestcolor[BOX_C0_ELEMS * BOX_C1_ELEMS * BOX_C2_ELEMS];
-
-  /* Convert cell coordinates to update box ID */
-  c0 >>= BOX_C0_LOG;
-  c1 >>= BOX_C1_LOG;
-  c2 >>= BOX_C2_LOG;
-
-  /* Compute true coordinates of update box's origin corner.
-   * Actually we compute the coordinates of the center of the corner
-   * histogram cell, which are the lower bounds of the volume we care about.
-   */
-  minc0 = (c0 << BOX_C0_SHIFT) + ((1 << C0_SHIFT) >> 1);
-  minc1 = (c1 << BOX_C1_SHIFT) + ((1 << C1_SHIFT) >> 1);
-  minc2 = (c2 << BOX_C2_SHIFT) + ((1 << C2_SHIFT) >> 1);
-  
-  /* Determine which colormap entries are close enough to be candidates
-   * for the nearest entry to some cell in the update box.
-   */
-  numcolors = find_nearby_colors(cinfo, minc0, minc1, minc2, colorlist);
-
-  /* Determine the actually nearest colors. */
-  find_best_colors(cinfo, minc0, minc1, minc2, numcolors, colorlist,
-		   bestcolor);
-
-  /* Save the best color numbers (plus 1) in the main cache array */
-  c0 <<= BOX_C0_LOG;		/* convert ID back to base cell indexes */
-  c1 <<= BOX_C1_LOG;
-  c2 <<= BOX_C2_LOG;
-  cptr = bestcolor;
-  for (ic0 = 0; ic0 < BOX_C0_ELEMS; ic0++) {
-    for (ic1 = 0; ic1 < BOX_C1_ELEMS; ic1++) {
-      cachep = & histogram[c0+ic0][c1+ic1][c2];
-      for (ic2 = 0; ic2 < BOX_C2_ELEMS; ic2++) {
-	*cachep++ = (histcell) (GETJSAMPLE(*cptr++) + 1);
-      }
-    }
-  }
-}
-
-
-/*
- * Map some rows of pixels to the output colormapped representation.
- */
-
-METHODDEF(void)
-pass2_no_dither (j_decompress_ptr cinfo,
-		 JSAMPARRAY input_buf, JSAMPARRAY output_buf, int num_rows)
-/* This version performs no dithering */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-  register JSAMPROW inptr, outptr;
-  register histptr cachep;
-  register int c0, c1, c2;
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-
-  for (row = 0; row < num_rows; row++) {
-    inptr = input_buf[row];
-    outptr = output_buf[row];
-    for (col = width; col > 0; col--) {
-      /* get pixel value and index into the cache */
-      c0 = GETJSAMPLE(*inptr++) >> C0_SHIFT;
-      c1 = GETJSAMPLE(*inptr++) >> C1_SHIFT;
-      c2 = GETJSAMPLE(*inptr++) >> C2_SHIFT;
-      cachep = & histogram[c0][c1][c2];
-      /* If we have not seen this color before, find nearest colormap entry */
-      /* and update the cache */
-      if (*cachep == 0)
-	fill_inverse_cmap(cinfo, c0,c1,c2);
-      /* Now emit the colormap index for this cell */
-      *outptr++ = (JSAMPLE) (*cachep - 1);
-    }
-  }
-}
-
-
-METHODDEF(void)
-pass2_fs_dither (j_decompress_ptr cinfo,
-		 JSAMPARRAY input_buf, JSAMPARRAY output_buf, int num_rows)
-/* This version performs Floyd-Steinberg dithering */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-  register LOCFSERROR cur0, cur1, cur2;	/* current error or pixel value */
-  LOCFSERROR belowerr0, belowerr1, belowerr2; /* error for pixel below cur */
-  LOCFSERROR bpreverr0, bpreverr1, bpreverr2; /* error for below/prev col */
-  register FSERRPTR errorptr;	/* => fserrors[] at column before current */
-  JSAMPROW inptr;		/* => current input pixel */
-  JSAMPROW outptr;		/* => current output pixel */
-  histptr cachep;
-  int dir;			/* +1 or -1 depending on direction */
-  int dir3;			/* 3*dir, for advancing inptr & errorptr */
-  int row;
-  JDIMENSION col;
-  JDIMENSION width = cinfo->output_width;
-  JSAMPLE *range_limit = cinfo->sample_range_limit;
-  int *error_limit = cquantize->error_limiter;
-  JSAMPROW colormap0 = cinfo->colormap[0];
-  JSAMPROW colormap1 = cinfo->colormap[1];
-  JSAMPROW colormap2 = cinfo->colormap[2];
-  SHIFT_TEMPS
-
-  for (row = 0; row < num_rows; row++) {
-    inptr = input_buf[row];
-    outptr = output_buf[row];
-    if (cquantize->on_odd_row) {
-      /* work right to left in this row */
-      inptr += (width-1) * 3;	/* so point to rightmost pixel */
-      outptr += width-1;
-      dir = -1;
-      dir3 = -3;
-      errorptr = cquantize->fserrors + (width+1)*3; /* => entry after last column */
-      cquantize->on_odd_row = FALSE; /* flip for next time */
-    } else {
-      /* work left to right in this row */
-      dir = 1;
-      dir3 = 3;
-      errorptr = cquantize->fserrors; /* => entry before first real column */
-      cquantize->on_odd_row = TRUE; /* flip for next time */
-    }
-    /* Preset error values: no error propagated to first pixel from left */
-    cur0 = cur1 = cur2 = 0;
-    /* and no error propagated to row below yet */
-    belowerr0 = belowerr1 = belowerr2 = 0;
-    bpreverr0 = bpreverr1 = bpreverr2 = 0;
-
-    for (col = width; col > 0; col--) {
-      /* curN holds the error propagated from the previous pixel on the
-       * current line.  Add the error propagated from the previous line
-       * to form the complete error correction term for this pixel, and
-       * round the error term (which is expressed * 16) to an integer.
-       * RIGHT_SHIFT rounds towards minus infinity, so adding 8 is correct
-       * for either sign of the error value.
-       * Note: errorptr points to *previous* column's array entry.
-       */
-      cur0 = RIGHT_SHIFT(cur0 + errorptr[dir3+0] + 8, 4);
-      cur1 = RIGHT_SHIFT(cur1 + errorptr[dir3+1] + 8, 4);
-      cur2 = RIGHT_SHIFT(cur2 + errorptr[dir3+2] + 8, 4);
-      /* Limit the error using transfer function set by init_error_limit.
-       * See comments with init_error_limit for rationale.
-       */
-      cur0 = error_limit[cur0];
-      cur1 = error_limit[cur1];
-      cur2 = error_limit[cur2];
-      /* Form pixel value + error, and range-limit to 0..MAXJSAMPLE.
-       * The maximum error is +- MAXJSAMPLE (or less with error limiting);
-       * this sets the required size of the range_limit array.
-       */
-      cur0 += GETJSAMPLE(inptr[0]);
-      cur1 += GETJSAMPLE(inptr[1]);
-      cur2 += GETJSAMPLE(inptr[2]);
-      cur0 = GETJSAMPLE(range_limit[cur0]);
-      cur1 = GETJSAMPLE(range_limit[cur1]);
-      cur2 = GETJSAMPLE(range_limit[cur2]);
-      /* Index into the cache with adjusted pixel value */
-      cachep = & histogram[cur0>>C0_SHIFT][cur1>>C1_SHIFT][cur2>>C2_SHIFT];
-      /* If we have not seen this color before, find nearest colormap */
-      /* entry and update the cache */
-      if (*cachep == 0)
-	fill_inverse_cmap(cinfo, cur0>>C0_SHIFT,cur1>>C1_SHIFT,cur2>>C2_SHIFT);
-      /* Now emit the colormap index for this cell */
-      { register int pixcode = *cachep - 1;
-	*outptr = (JSAMPLE) pixcode;
-	/* Compute representation error for this pixel */
-	cur0 -= GETJSAMPLE(colormap0[pixcode]);
-	cur1 -= GETJSAMPLE(colormap1[pixcode]);
-	cur2 -= GETJSAMPLE(colormap2[pixcode]);
-      }
-      /* Compute error fractions to be propagated to adjacent pixels.
-       * Add these into the running sums, and simultaneously shift the
-       * next-line error sums left by 1 column.
-       */
-      { register LOCFSERROR bnexterr, delta;
-
-	bnexterr = cur0;	/* Process component 0 */
-	delta = cur0 * 2;
-	cur0 += delta;		/* form error * 3 */
-	errorptr[0] = (FSERROR) (bpreverr0 + cur0);
-	cur0 += delta;		/* form error * 5 */
-	bpreverr0 = belowerr0 + cur0;
-	belowerr0 = bnexterr;
-	cur0 += delta;		/* form error * 7 */
-	bnexterr = cur1;	/* Process component 1 */
-	delta = cur1 * 2;
-	cur1 += delta;		/* form error * 3 */
-	errorptr[1] = (FSERROR) (bpreverr1 + cur1);
-	cur1 += delta;		/* form error * 5 */
-	bpreverr1 = belowerr1 + cur1;
-	belowerr1 = bnexterr;
-	cur1 += delta;		/* form error * 7 */
-	bnexterr = cur2;	/* Process component 2 */
-	delta = cur2 * 2;
-	cur2 += delta;		/* form error * 3 */
-	errorptr[2] = (FSERROR) (bpreverr2 + cur2);
-	cur2 += delta;		/* form error * 5 */
-	bpreverr2 = belowerr2 + cur2;
-	belowerr2 = bnexterr;
-	cur2 += delta;		/* form error * 7 */
-      }
-      /* At this point curN contains the 7/16 error value to be propagated
-       * to the next pixel on the current line, and all the errors for the
-       * next line have been shifted over.  We are therefore ready to move on.
-       */
-      inptr += dir3;		/* Advance pixel pointers to next column */
-      outptr += dir;
-      errorptr += dir3;		/* advance errorptr to current column */
-    }
-    /* Post-loop cleanup: we must unload the final error values into the
-     * final fserrors[] entry.  Note we need not unload belowerrN because
-     * it is for the dummy column before or after the actual array.
-     */
-    errorptr[0] = (FSERROR) bpreverr0; /* unload prev errs into array */
-    errorptr[1] = (FSERROR) bpreverr1;
-    errorptr[2] = (FSERROR) bpreverr2;
-  }
-}
-
-
-/*
- * Initialize the error-limiting transfer function (lookup table).
- * The raw F-S error computation can potentially compute error values of up to
- * +- MAXJSAMPLE.  But we want the maximum correction applied to a pixel to be
- * much less, otherwise obviously wrong pixels will be created.  (Typical
- * effects include weird fringes at color-area boundaries, isolated bright
- * pixels in a dark area, etc.)  The standard advice for avoiding this problem
- * is to ensure that the "corners" of the color cube are allocated as output
- * colors; then repeated errors in the same direction cannot cause cascading
- * error buildup.  However, that only prevents the error from getting
- * completely out of hand; Aaron Giles reports that error limiting improves
- * the results even with corner colors allocated.
- * A simple clamping of the error values to about +- MAXJSAMPLE/8 works pretty
- * well, but the smoother transfer function used below is even better.  Thanks
- * to Aaron Giles for this idea.
- */
-
-LOCAL(void)
-init_error_limit (j_decompress_ptr cinfo)
-/* Allocate and fill in the error_limiter table */
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  int * table;
-  int in, out;
-
-  table = (int *) (*cinfo->mem->alloc_small)
-    ((j_common_ptr) cinfo, JPOOL_IMAGE, (MAXJSAMPLE*2+1) * SIZEOF(int));
-  table += MAXJSAMPLE;		/* so can index -MAXJSAMPLE .. +MAXJSAMPLE */
-  cquantize->error_limiter = table;
-
-#define STEPSIZE ((MAXJSAMPLE+1)/16)
-  /* Map errors 1:1 up to +- MAXJSAMPLE/16 */
-  out = 0;
-  for (in = 0; in < STEPSIZE; in++, out++) {
-    table[in] = out; table[-in] = -out;
-  }
-  /* Map errors 1:2 up to +- 3*MAXJSAMPLE/16 */
-  for (; in < STEPSIZE*3; in++, out += (in&1) ? 0 : 1) {
-    table[in] = out; table[-in] = -out;
-  }
-  /* Clamp the rest to final out value (which is (MAXJSAMPLE+1)/8) */
-  for (; in <= MAXJSAMPLE; in++) {
-    table[in] = out; table[-in] = -out;
-  }
-#undef STEPSIZE
-}
-
-
-/*
- * Finish up at the end of each pass.
- */
-
-METHODDEF(void)
-finish_pass1 (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-
-  /* Select the representative colors and fill in cinfo->colormap */
-  cinfo->colormap = cquantize->sv_colormap;
-  select_colors(cinfo, cquantize->desired);
-  /* Force next pass to zero the color index table */
-  cquantize->needs_zeroed = TRUE;
-}
-
-
-METHODDEF(void)
-finish_pass2 (j_decompress_ptr cinfo)
-{
-  /* no work */
-}
-
-
-/*
- * Initialize for each processing pass.
- */
-
-METHODDEF(void)
-start_pass_2_quant (j_decompress_ptr cinfo, wxjpeg_boolean is_pre_scan)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-  hist3d histogram = cquantize->histogram;
-  int i;
-
-  /* Only F-S dithering or no dithering is supported. */
-  /* If user asks for ordered dither, give him F-S. */
-  if (cinfo->dither_mode != JDITHER_NONE)
-    cinfo->dither_mode = JDITHER_FS;
-
-  if (is_pre_scan) {
-    /* Set up method pointers */
-    cquantize->pub.color_quantize = prescan_quantize;
-    cquantize->pub.finish_pass = finish_pass1;
-    cquantize->needs_zeroed = TRUE; /* Always zero histogram */
-  } else {
-    /* Set up method pointers */
-    if (cinfo->dither_mode == JDITHER_FS)
-      cquantize->pub.color_quantize = pass2_fs_dither;
-    else
-      cquantize->pub.color_quantize = pass2_no_dither;
-    cquantize->pub.finish_pass = finish_pass2;
-
-    /* Make sure color count is acceptable */
-    i = cinfo->actual_number_of_colors;
-    if (i < 1)
-      ERREXIT1(cinfo, JERR_QUANT_FEW_COLORS, 1);
-    if (i > MAXNUMCOLORS)
-      ERREXIT1(cinfo, JERR_QUANT_MANY_COLORS, MAXNUMCOLORS);
-
-    if (cinfo->dither_mode == JDITHER_FS) {
-      size_t arraysize = (size_t) ((cinfo->output_width + 2) *
-				   (3 * SIZEOF(FSERROR)));
-      /* Allocate Floyd-Steinberg workspace if we didn't already. */
-      if (cquantize->fserrors == NULL)
-	cquantize->fserrors = (FSERRPTR) (*cinfo->mem->alloc_large)
-	  ((j_common_ptr) cinfo, JPOOL_IMAGE, arraysize);
-      /* Initialize the propagated errors to zero. */
-      jzero_far((void FAR *) cquantize->fserrors, arraysize);
-      /* Make the error-limit table if we didn't already. */
-      if (cquantize->error_limiter == NULL)
-	init_error_limit(cinfo);
-      cquantize->on_odd_row = FALSE;
-    }
-
-  }
-  /* Zero the histogram or inverse color map, if necessary */
-  if (cquantize->needs_zeroed) {
-    for (i = 0; i < HIST_C0_ELEMS; i++) {
-      jzero_far((void FAR *) histogram[i],
-		HIST_C1_ELEMS*HIST_C2_ELEMS * SIZEOF(histcell));
-    }
-    cquantize->needs_zeroed = FALSE;
-  }
-}
-
-
-/*
- * Switch to a new external colormap between output passes.
- */
-
-METHODDEF(void)
-new_color_map_2_quant (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize = (my_cquantize_ptr) cinfo->cquantize;
-
-  /* Reset the inverse color map */
-  cquantize->needs_zeroed = TRUE;
-}
-
-
-/*
- * Module initialization routine for 2-pass color quantization.
- */
-
-GLOBAL(void)
-jinit_2pass_quantizer (j_decompress_ptr cinfo)
-{
-  my_cquantize_ptr cquantize;
-  int i;
-
-  cquantize = (my_cquantize_ptr)
-    (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-				SIZEOF(my_cquantizer));
-  cinfo->cquantize = (struct jpeg_color_quantizer *) cquantize;
-  cquantize->pub.start_pass = start_pass_2_quant;
-  cquantize->pub.new_color_map = new_color_map_2_quant;
-  cquantize->fserrors = NULL;	/* flag optional arrays not allocated */
-  cquantize->error_limiter = NULL;
-
-  /* Make sure jdmaster didn't give me a case I can't handle */
-  if (cinfo->out_color_components != 3)
-    ERREXIT(cinfo, JERR_NOTIMPL);
-
-  /* Allocate the histogram/inverse colormap storage */
-  cquantize->histogram = (hist3d) (*cinfo->mem->alloc_small)
-    ((j_common_ptr) cinfo, JPOOL_IMAGE, HIST_C0_ELEMS * SIZEOF(hist2d));
-  for (i = 0; i < HIST_C0_ELEMS; i++) {
-    cquantize->histogram[i] = (hist2d) (*cinfo->mem->alloc_large)
-      ((j_common_ptr) cinfo, JPOOL_IMAGE,
-       HIST_C1_ELEMS*HIST_C2_ELEMS * SIZEOF(histcell));
-  }
-  cquantize->needs_zeroed = TRUE; /* histogram is garbage now */
-
-  /* Allocate storage for the completed colormap, if required.
-   * We do this now since it is FAR storage and may affect
-   * the memory manager's space calculations.
-   */
-  if (cinfo->enable_2pass_quant) {
-    /* Make sure color count is acceptable */
-    int desired = cinfo->desired_number_of_colors;
-    /* Lower bound on # of colors ... somewhat arbitrary as long as > 0 */
-    if (desired < 8)
-      ERREXIT1(cinfo, JERR_QUANT_FEW_COLORS, 8);
-    /* Make sure colormap indexes can be represented by JSAMPLEs */
-    if (desired > MAXNUMCOLORS)
-      ERREXIT1(cinfo, JERR_QUANT_MANY_COLORS, MAXNUMCOLORS);
-    cquantize->sv_colormap = (*cinfo->mem->alloc_sarray)
-      ((j_common_ptr) cinfo,JPOOL_IMAGE, (JDIMENSION) desired, (JDIMENSION) 3);
-    cquantize->desired = desired;
-  } else
-    cquantize->sv_colormap = NULL;
-
-  /* Only F-S dithering or no dithering is supported. */
-  /* If user asks for ordered dither, give him F-S. */
-  if (cinfo->dither_mode != JDITHER_NONE)
-    cinfo->dither_mode = JDITHER_FS;
-
-  /* Allocate Floyd-Steinberg workspace if necessary.
-   * This isn't really needed until pass 2, but again it is FAR storage.
-   * Although we will cope with a later change in dither_mode,
-   * we do not promise to honor max_memory_to_use if dither_mode changes.
-   */
-  if (cinfo->dither_mode == JDITHER_FS) {
-    cquantize->fserrors = (FSERRPTR) (*cinfo->mem->alloc_large)
-      ((j_common_ptr) cinfo, JPOOL_IMAGE,
-       (size_t) ((cinfo->output_width + 2) * (3 * SIZEOF(FSERROR))));
-    /* Might as well create the error-limiting table too. */
-    init_error_limit(cinfo);
-  }
-}
-
-#endif /* QUANT_2PASS_SUPPORTED */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jutils.c b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jutils.c
deleted file mode 100644
index d18a955562..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jutils.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * jutils.c
- *
- * Copyright (C) 1991-1996, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains tables and miscellaneous utility routines needed
- * for both compression and decompression.
- * Note we prefix all global names with "j" to minimize conflicts with
- * a surrounding application.
- */
-
-#define JPEG_INTERNALS
-#include "jinclude.h"
-#include "jpeglib.h"
-
-
-/*
- * jpeg_zigzag_order[i] is the zigzag-order position of the i'th element
- * of a DCT block read in natural order (left to right, top to bottom).
- */
-
-#if 0				/* This table is not actually needed in v6a */
-
-const int jpeg_zigzag_order[DCTSIZE2] = {
-   0,  1,  5,  6, 14, 15, 27, 28,
-   2,  4,  7, 13, 16, 26, 29, 42,
-   3,  8, 12, 17, 25, 30, 41, 43,
-   9, 11, 18, 24, 31, 40, 44, 53,
-  10, 19, 23, 32, 39, 45, 52, 54,
-  20, 22, 33, 38, 46, 51, 55, 60,
-  21, 34, 37, 47, 50, 56, 59, 61,
-  35, 36, 48, 49, 57, 58, 62, 63
-};
-
-#endif
-
-/*
- * jpeg_natural_order[i] is the natural-order position of the i'th element
- * of zigzag order.
- *
- * When reading corrupted data, the Huffman decoders could attempt
- * to reference an entry beyond the end of this array (if the decoded
- * zero run length reaches past the end of the block).  To prevent
- * wild stores without adding an inner-loop test, we put some extra
- * "63"s after the real entries.  This will cause the extra coefficient
- * to be stored in location 63 of the block, not somewhere random.
- * The worst case would be a run-length of 15, which means we need 16
- * fake entries.
- */
-
-const int jpeg_natural_order[DCTSIZE2+16] = {
-  0,  1,  8, 16,  9,  2,  3, 10,
- 17, 24, 32, 25, 18, 11,  4,  5,
- 12, 19, 26, 33, 40, 48, 41, 34,
- 27, 20, 13,  6,  7, 14, 21, 28,
- 35, 42, 49, 56, 57, 50, 43, 36,
- 29, 22, 15, 23, 30, 37, 44, 51,
- 58, 59, 52, 45, 38, 31, 39, 46,
- 53, 60, 61, 54, 47, 55, 62, 63,
- 63, 63, 63, 63, 63, 63, 63, 63, /* extra entries for safety in decoder */
- 63, 63, 63, 63, 63, 63, 63, 63
-};
-
-
-/*
- * Arithmetic utilities
- */
-
-GLOBAL(long)
-jdiv_round_up (long a, long b)
-/* Compute a/b rounded up to next integer, ie, ceil(a/b) */
-/* Assumes a >= 0, b > 0 */
-{
-  return (a + b - 1L) / b;
-}
-
-
-GLOBAL(long)
-jround_up (long a, long b)
-/* Compute a rounded up to next multiple of b, ie, ceil(a/b)*b */
-/* Assumes a >= 0, b > 0 */
-{
-  a += b - 1L;
-  return a - (a % b);
-}
-
-
-/* On normal machines we can apply MEMCOPY() and MEMZERO() to sample arrays
- * and coefficient-block arrays.  This won't work on 80x86 because the arrays
- * are FAR and we're assuming a small-pointer memory model.  However, some
- * DOS compilers provide far-pointer versions of memcpy() and memset() even
- * in the small-model libraries.  These will be used if USE_FMEM is defined.
- * Otherwise, the routines below do it the hard way.  (The performance cost
- * is not all that great, because these routines aren't very heavily used.)
- */
-
-#ifndef NEED_FAR_POINTERS	/* normal case, same as regular macros */
-#define FMEMCOPY(dest,src,size)	MEMCOPY(dest,src,size)
-#define FMEMZERO(target,size)	MEMZERO(target,size)
-#else				/* 80x86 case, define if we can */
-#ifdef USE_FMEM
-#define FMEMCOPY(dest,src,size)	_fmemcpy((void FAR *)(dest), (const void FAR *)(src), (size_t)(size))
-#define FMEMZERO(target,size)	_fmemset((void FAR *)(target), 0, (size_t)(size))
-#endif
-#endif
-
-
-GLOBAL(void)
-jcopy_sample_rows (JSAMPARRAY input_array, int source_row,
-		   JSAMPARRAY output_array, int dest_row,
-		   int num_rows, JDIMENSION num_cols)
-/* Copy some rows of samples from one place to another.
- * num_rows rows are copied from input_array[source_row++]
- * to output_array[dest_row++]; these areas may overlap for duplication.
- * The source and destination arrays must be at least as wide as num_cols.
- */
-{
-  register JSAMPROW inptr, outptr;
-#ifdef FMEMCOPY
-  register size_t count = (size_t) (num_cols * SIZEOF(JSAMPLE));
-#else
-  register JDIMENSION count;
-#endif
-  register int row;
-
-  input_array += source_row;
-  output_array += dest_row;
-
-  for (row = num_rows; row > 0; row--) {
-    inptr = *input_array++;
-    outptr = *output_array++;
-#ifdef FMEMCOPY
-    FMEMCOPY(outptr, inptr, count);
-#else
-    for (count = num_cols; count > 0; count--)
-      *outptr++ = *inptr++;	/* needn't bother with GETJSAMPLE() here */
-#endif
-  }
-}
-
-
-GLOBAL(void)
-jcopy_block_row (JBLOCKROW input_row, JBLOCKROW output_row,
-		 JDIMENSION num_blocks)
-/* Copy a row of coefficient blocks from one place to another. */
-{
-#ifdef FMEMCOPY
-  FMEMCOPY(output_row, input_row, num_blocks * (DCTSIZE2 * SIZEOF(JCOEF)));
-#else
-  register JCOEFPTR inptr, outptr;
-  register long count;
-
-  inptr = (JCOEFPTR) input_row;
-  outptr = (JCOEFPTR) output_row;
-  for (count = (long) num_blocks * DCTSIZE2; count > 0; count--) {
-    *outptr++ = *inptr++;
-  }
-#endif
-}
-
-
-GLOBAL(void)
-jzero_far (void FAR * target, size_t bytestozero)
-/* Zero out a chunk of FAR memory. */
-/* This might be sample-array data, block-array data, or alloc_large data. */
-{
-#ifdef FMEMZERO
-  FMEMZERO(target, bytestozero);
-#else
-  register char FAR * ptr = (char FAR *) target;
-  register size_t count;
-
-  for (count = bytestozero; count > 0; count--) {
-    *ptr++ = 0;
-  }
-#endif
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jversion.h b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jversion.h
deleted file mode 100644
index 6472c58d35..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/jversion.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * jversion.h
- *
- * Copyright (C) 1991-1998, Thomas G. Lane.
- * This file is part of the Independent JPEG Group's software.
- * For conditions of distribution and use, see the accompanying README file.
- *
- * This file contains software version identification.
- */
-
-
-#define JVERSION	"6b  27-Mar-1998"
-
-#define JCOPYRIGHT	"Copyright (C) 1998, Thomas G. Lane"
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/makefile.unx b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/makefile.unx
deleted file mode 100644
index bcf905ee69..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/makefile.unx
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-# File:		makefile.unx
-# Author:	Julian Smart
-# Created:	1999
-# Updated:	
-# Copyright:	(c) 1999
-#
-#
-# Makefile for OGL library, Unix
-
-include ../make.env
-
-JPEGLIB=$(WXDIR)/lib/libjpeg$(GUISUFFIX).a
-
-all:    $(JPEGLIB)
-
-# Define library objects
-OBJECTS=\
-  jcomapi.o jutils.o jerror.o jmemmgr.o jmemnobs.o \
-  jcapimin.o jcapistd.o jctrans.o jcparam.o jdatadst.o \
-        jcinit.o jcmaster.o jcmarker.o jcmainct.o jcprepct.o \
-        jccoefct.o jccolor.o jcsample.o jchuff.o jcphuff.o \
-        jcdctmgr.o jfdctfst.o jfdctflt.o jfdctint.o \
-  jdapimin.o jdapistd.o jdtrans.o jdatasrc.o \
-        jdmaster.o jdinput.o jdmarker.o jdhuff.o jdphuff.o \
-        jdmainct.o jdcoefct.o jdpostct.o jddctmgr.o jidctfst.o \
-        jidctflt.o jidctint.o jidctred.o jdsample.o jdcolor.o \
-        jquant1.o jquant2.o jdmerge.o
-
-$(JPEGLIB) : $(OBJECTS)
-	ar $(AROPTIONS) $@ $(OBJECTS)
-	$(RANLIB) $@
-
-clean:
-	rm -f $(OBJECTS) $(JPEGLIB)
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/makefile.vc b/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/makefile.vc
deleted file mode 100644
index 6bc16cbd1a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/jpeg/makefile.vc
+++ /dev/null
@@ -1,201 +0,0 @@
-# Makefile for Independent JPEG Group's software
-
-# This makefile is for Microsoft Visual C++ on Windows NT (and 95?).
-# It builds the IJG library as a statically linkable library (.LIB),
-# and builds the sample applications as console-mode apps.
-# Thanks to Xingong Chang, Raymond Everly and others.
-
-# Read installation instructions before saying "nmake" !!
-# To build an optimized library without debug info, say "nmake nodebug=1".
-
-# Put here the object file name for the correct system-dependent memory
-# manager file.  For NT we suggest jmemnobs.obj, which expects the OS to
-# provide adequate virtual memory.
-SYSDEPMEM= $D\jmemnobs.obj
-
-# miscellaneous OS-dependent stuff
-# file deletion command
-!if "$(RM)" == ""
-RM= erase
-!endif
-
-# End of configurable options.
-
-# source files: JPEG library proper
-LIBSOURCES= jcapimin.c \
-        jcapistd.c \
-        jccoefct.c \
-        jccolor.c \
-        jcdctmgr.c \
-        jchuff.c \
-        jcinit.c \
-        jcmainct.c \
-        jcmarker.c \
-        jcmaster.c \
-        jcomapi.c \
-        jcparam.c \
-        jcphuff.c \
-        jcprepct.c \
-        jcsample.c \
-        jctrans.c \
-        jdapimin.c \
-        jdapistd.c \
-        jdatadst.c \
-        jdatasrc.c \
-        jdcoefct.c \
-        jdcolor.c \
-        jddctmgr.c \
-        jdhuff.c \
-        jdinput.c \
-        jdmainct.c \
-        jdmarker.c \
-        jdmaster.c \
-        jdmerge.c \
-        jdphuff.c \
-        jdpostct.c \
-        jdsample.c \
-        jdtrans.c \
-        jerror.c \
-        jfdctflt.c \
-        jfdctfst.c \
-        jfdctint.c \
-        jidctflt.c \
-        jidctfst.c \
-        jidctint.c \
-        jidctred.c \
-        jquant1.c \
-        jquant2.c \
-        jutils.c \
-        jmemmgr.c
-
-# memmgr back ends: compile only one of these into a working library
-SYSDEPSOURCES= jmemansi.c jmemname.c jmemnobs.c jmemdos.c jmemmac.c
-
-# source files: cjpeg/djpeg/jpegtran applications, also rdjpgcom/wrjpgcom
-APPSOURCES= cjpeg.c djpeg.c jpegtran.c rdjpgcom.c wrjpgcom.c cdjpeg.c \
-        rdcolmap.c rdswitch.c transupp.c rdppm.c wrppm.c rdgif.c wrgif.c \
-        rdtarga.c wrtarga.c rdbmp.c wrbmp.c rdrle.c wrrle.c
-
-SOURCES= $(LIBSOURCES) $(SYSDEPSOURCES) $(APPSOURCES)
-
-# files included by source files
-INCLUDES= jchuff.h jdhuff.h jdct.h jerror.h jinclude.h jmemsys.h jmorecfg.h \
-        jpegint.h jpeglib.h jversion.h cdjpeg.h cderror.h transupp.h
-
-# documentation, test, and support files
-DOCS= README install.doc usage.doc cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 \
-        wrjpgcom.1 wizard.doc example.c libjpeg.doc structure.doc \
-        coderules.doc filelist.doc change.log
-
-MKFILES= configure makefile.cfg makefile.ansi makefile.unix makefile.bcc \
-        makefile.mc6 makefile.dj makefile.wat makefile.vc makelib.ds \
-        makeapps.ds makeproj.mac makcjpeg.st makdjpeg.st makljpeg.st \
-        maktjpeg.st makefile.manx makefile.sas makefile.mms makefile.vms \
-        makvms.opt
-
-CONFIGFILES= jconfig.cfg jconfig.bcc jconfig.mc6 jconfig.dj jconfig.wat \
-        jconfig.vc jconfig.mac jconfig.st jconfig.manx jconfig.sas \
-        jconfig.vms
-
-CONFIGUREFILES= config.guess config.sub install-sh ltconfig ltmain.sh
-OTHERFILES= jconfig.doc ckconfig.c ansi2knr.c ansi2knr.1 jmemdosa.asm
-TESTFILES= testorig.jpg testimg.ppm testimg.bmp testimg.jpg testprog.jpg \
-        testimgp.jpg
-DISTFILES= $(DOCS) $(MKFILES) $(CONFIGFILES) $(SOURCES) $(INCLUDES) \
-        $(CONFIGUREFILES) $(OTHERFILES) $(TESTFILES)
-
-# library object files common to compression and decompression
-COMOBJECTS= $D\jcomapi.obj $D\jutils.obj $D\jerror.obj $D\jmemmgr.obj $(SYSDEPMEM)
-
-# compression library object files
-CLIBOBJECTS= $D\jcapimin.obj \
-             $D\jcapistd.obj \
-             $D\jctrans.obj \
-             $D\jcparam.obj \
-             $D\jdatadst.obj \
-             $D\jcinit.obj \
-             $D\jcmaster.obj \
-             $D\jcmarker.obj \
-             $D\jcmainct.obj \
-             $D\jcprepct.obj \
-             $D\jccoefct.obj \
-             $D\jccolor.obj \
-             $D\jcsample.obj \
-             $D\jchuff.obj \
-             $D\jcphuff.obj \
-             $D\jcdctmgr.obj \
-             $D\jfdctfst.obj \
-             $D\jfdctflt.obj \
-             $D\jfdctint.obj
-
-# decompression library object files
-DLIBOBJECTS= $D\jdapimin.obj \
-             $D\jdapistd.obj \
-             $D\jdtrans.obj \
-             $D\jdatasrc.obj \
-             $D\jdmaster.obj \
-             $D\jdinput.obj \
-             $D\jdmarker.obj \
-             $D\jdhuff.obj \
-             $D\jdphuff.obj \
-             $D\jdmainct.obj \
-             $D\jdcoefct.obj \
-             $D\jdpostct.obj \
-             $D\jddctmgr.obj \
-             $D\jidctfst.obj \
-             $D\jidctflt.obj \
-             $D\jidctint.obj \
-             $D\jidctred.obj \
-             $D\jdsample.obj \
-             $D\jdcolor.obj \
-             $D\jquant1.obj \
-             $D\jquant2.obj \
-             $D\jdmerge.obj
-# These objectfiles are included in libjpeg.lib
-OBJECTS= $(CLIBOBJECTS) $(DLIBOBJECTS) $(COMOBJECTS)
-
-# object files for sample applications (excluding library files)
-COBJECTS= $D\cjpeg.obj \
-          $D\rdppm.obj \
-          $D\rdgif.obj \
-          $D\rdtarga.obj \
-          $D\rdrle.obj \
-          $D\rdbmp.obj \
-          $D\rdswitch.obj \
-          $D\cdjpeg.obj
-
-DOBJECTS= $D\djpeg.obj \
-          $D\wrppm.obj \
-          $D\wrgif.obj \
-          $D\wrtarga.obj \
-          $D\wrrle.obj \
-          $D\wrbmp.obj \
-          $D\rdcolmap.obj \
-          $D\cdjpeg.obj
-
-TROBJECTS= $D\jpegtran.obj \
-           $D\rdswitch.obj \
-           $D\cdjpeg.obj \
-           $D\transupp.obj
-
-!if "$(FINAL)" == "1"
-LIBTARGET=..\..\lib\jpeg.lib
-!else if "$(FINAL)" == "hybrid"
-LIBTARGET=..\..\lib\jpegh.lib
-!else
-LIBTARGET=..\..\lib\jpegd.lib
-!endif
-
-# Note: we have to put this first, to override the default definition
-# which doesn't work because there are too many files on the command line.
-# This means that we must explicitly use the 'all' target when making
-# jpeg.lib, because of the ordering of targets.
-
-defaulttarget:
-    echo Please use the 'all' target for this makefile.
-
-
-# Pull in standard variable definitions
-
-!include ..\makelib.vc
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/ANNOUNCE b/3rdparty/wxwidgets3.0-3.0.1/src/png/ANNOUNCE
deleted file mode 100644
index 37a4b49397..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/ANNOUNCE
+++ /dev/null
@@ -1,49 +0,0 @@
-
-Libpng 1.6.2 - April 25, 2013
-
-This is a public release of libpng, intended for use in production codes.
-
-Files available for download:
-
-Source files with LF line endings (for Unix/Linux) and with a
-"configure" script
-
-   libpng-1.6.2.tar.xz (LZMA-compressed, recommended)
-   libpng-1.6.2.tar.gz
-
-Source files with CRLF line endings (for Windows), without the
-"configure" script
-
-   lpng162.7z  (LZMA-compressed, recommended)
-   lpng162.zip
-
-Other information:
-
-   libpng-1.6.2-README.txt
-   libpng-1.6.2-LICENSE.txt
-
-Changes since the last public release (1.6.1):
-
-  Updated documentation of 1.5.x to 1.6.x changes in iCCP chunk handling.
-  Fixed incorrect warning of excess deflate data. End condition - the
-    warning would be produced if the end of the deflate stream wasn't read
-    in the last row.  The warning is harmless.
-  Corrected the test on user transform changes on read. It was in the
-    png_set of the transform function, but that doesn't matter unless the
-    transform function changes the rowbuf size, and that is only valid if
-    transform_info is called.
-  Corrected a misplaced closing bracket in contrib/libtests/pngvalid.c
-    (Flavio Medeiros).
-  Corrected length written to uncompressed iTXt chunks (Samuli Suominen).
-  Added contrib/tools/fixitxt.c, to repair the erroneous iTXt chunk length
-    written by libpng-1.6.0 and 1.6.1.
-  Disallow storing sRGB information when the sRGB is not supported.
-  Merge pngtest.c with libpng-1.7.0
-
-Send comments/corrections/commendations to png-mng-implement at lists.sf.net
-(subscription required; visit
-https://lists.sourceforge.net/lists/listinfo/png-mng-implement
-to subscribe)
-or to glennrp at users.sourceforge.net
-
-Glenn R-P
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/INSTALL b/3rdparty/wxwidgets3.0-3.0.1/src/png/INSTALL
deleted file mode 100644
index f987378009..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/INSTALL
+++ /dev/null
@@ -1,170 +0,0 @@
-
-Installing libpng
-
-On Unix/Linux and similar systems, you can simply type
-
-    ./configure [--prefix=/path]
-    make check
-    make install
-
-and ignore the rest of this document.
-
-If configure does not work on your system, or if you have a need to
-change configure.ac or Makefile.am, and you have a reasonably
-up-to-date set of tools, running ./autogen.sh in a git clone before
-running ./configure may fix the problem.  To be really sure that you
-aren't using any of the included pre-built scripts, you can do this:
-
-    ./configure --enable-maintainer-mode
-    make maintainer-clean
-    ./autogen.sh --maintainer --clean
-    ./autogen.sh --maintainer
-    ./configure [--prefix=/path] [other options]
-    make
-    make install
-    make check
-
-Instead, you can use one of the custom-built makefiles in the
-"scripts" directory
-
-    cp scripts/makefile.system makefile
-    make test
-    make install
-
-The files that are presently available in the scripts directory
-are listed and described in scripts/README.txt.
-
-Or you can use one of the "projects" in the "projects" directory.
-
-Before installing libpng, you must first install zlib, if it
-is not already on your system.  zlib can usually be found
-wherever you got libpng.  zlib can be placed in another directory,
-at the same level as libpng.
-
-If your system already has a preinstalled zlib you will still need
-to have access to the zlib.h and zconf.h include files that
-correspond to the version of zlib that's installed.
-
-If you wish to test with a particular zlib that is not first in the
-standard library search path, put ZLIBLIB, ZLIBINC, CPPFLAGS, LDFLAGS,
-and LD_LIBRARY_PATH in your environment before running "make test"
-or "make distcheck":
-
-ZLIBLIB=/path/to/lib export ZLIBLIB
-ZLIBINC=/path/to/include export ZLIBINC
-CPPFLAGS="-I$ZLIBINC" export CPPFLAGS
-LDFLAGS="-L$ZLIBLIB" export LDFLAGS
-LD_LIBRARY_PATH="$ZLIBLIB:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH
-
-If you are using one of the makefile scripts, put ZLIBLIB and ZLIBINC
-in your environment and type "make ZLIBLIB=$ZLIBLIB ZLIBINC=$ZLIBINC test".
-
-If you want to use "cmake" (see www.cmake.org), type
-
-   cmake . -DCMAKE_INSTALL_PREFIX=/path
-   make
-   make install
-
-You can rename the directories that you downloaded (they
-might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.7"
-or "zlib127") so that you have directories called "zlib" and "libpng".
-
-Your directory structure should look like this:
-
-   ..       (the parent directory)
-      libpng  (this directory)
-          INSTALL (this file)
-          README
-          *.h
-          *.c
-          CMakeLists.txt    =>  "cmake" script
-          configuration files:
-             configure.ac, configure, Makefile.am, Makefile.in,
-             autogen.sh, config.guess, ltmain.sh, missing, libpng.pc.in,
-             libpng-config.in, aclocal.m4, config.h.in, config.sub,
-             depcomp, install-sh, mkinstalldirs, test-pngtest.sh
-          contrib
-             gregbook
-             libtests
-             pngminim
-             pngminus
-             pngsuite
-             visupng
-          projects
-             visualc71
-             vstudio
-          scripts
-             makefile.*
-             *.def (module definition files)
-             etc.
-          pngtest.png
-          etc.
-      zlib
-          README
-          *.h
-          *.c
-          contrib
-          etc.
-
-If the line endings in the files look funny, you may wish to get the other
-distribution of libpng.  It is available in both tar.gz (UNIX style line
-endings) and zip (DOS style line endings) formats.
-
-If you are building libpng with MSVC, you can enter the
-libpng projects\visualc6 or visualc71 directory and follow the instructions
-in README.txt.
-
-Otherwise enter the zlib directory and follow the instructions in zlib/README,
-then come back here and run "configure" or choose the appropriate
-makefile.sys in the scripts directory.
-
-Copy the file (or files) that you need from the
-scripts directory into this directory, for example
-
-   MSDOS example: copy scripts\makefile.msc makefile
-   UNIX example:    cp scripts/makefile.std makefile
-
-Read the makefile to see if you need to change any source or
-target directories to match your preferences.
-
-Then read pnglibconf.dfa to see if you want to make any configuration
-changes.
-
-Then just run "make" which will create the libpng library in
-this directory and "make test" which will run a quick test that reads
-the "pngtest.png" file and writes a "pngout.png" file that should be
-identical to it.  Look for "9782 zero samples" in the output of the
-test.  For more confidence, you can run another test by typing
-"pngtest pngnow.png" and looking for "289 zero samples" in the output.
-Also, you can run "pngtest -m contrib/pngsuite/*.png" and compare
-your output with the result shown in contrib/pngsuite/README.
-
-Most of the makefiles will allow you to run "make install" to
-put the library in its final resting place (if you want to
-do that, run "make install" in the zlib directory first if necessary).
-Some also allow you to run "make test-installed" after you have
-run "make install".
-
-Further information can be found in the README and libpng-manual.txt
-files, in the individual makefiles, in png.h, and the manual pages
-libpng.3 and png.5.
-
-Using the ./configure script -- 16 December 2002.
-=================================================
-
-The ./configure script should work compatibly with what scripts/makefile.*
-did, however there are some options you might need to add to configure
-explicitly, which previously was done semi-automatically (if you didn't edit
-scripts/makefile.* yourself, that is)
-
-CFLAGS="-Wall -O -funroll-loops \
--malign-loops=2 -malign-functions=2" ./configure --prefix=/usr/include \
---with-pkgconfigdir=/usr/lib/pkgconfig --includedir=/usr/include
-
-You can alternatively specify --includedir=/usr/include, /usr/local/include,
-/usr/include/libpng%NN%, or whatever.
-
-If you find that the configure script is out-of-date or is not supporting
-your platform properly, try running autogen.sh to regenerate "configure",
-"Makefile.in", and the other configuration files. Then try configure again.
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/Makefile.am b/3rdparty/wxwidgets3.0-3.0.1/src/png/Makefile.am
deleted file mode 100644
index a2cd2c10bb..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/Makefile.am
+++ /dev/null
@@ -1,295 +0,0 @@
-# Makefile.am:
-#   Source file for Makefile.in (and hence Makefile)
-#
-
-PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
-
-ACLOCAL_AMFLAGS = -I scripts
-
-# test programs - run on make check, make distcheck
-check_PROGRAMS= pngtest pngunknown pngstest pngvalid
-
-pngtest_SOURCES = pngtest.c
-pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-
-pngvalid_SOURCES = contrib/libtests/pngvalid.c
-pngvalid_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-
-pngstest_SOURCES = contrib/libtests/pngstest.c
-pngstest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-
-pngunknown_SOURCES = contrib/libtests/pngunknown.c
-pngunknown_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-
-# Generally these are single line shell scripts to run a test with a particular
-# set of parameters:
-TESTS =\
-   tests/pngtest\
-   tests/pngvalid-gamma-16-to-8 tests/pngvalid-gamma-alpha-mode\
-   tests/pngvalid-gamma-background tests/pngvalid-gamma-expand16-alpha-mode\
-   tests/pngvalid-gamma-expand16-background\
-   tests/pngvalid-gamma-expand16-transform tests/pngvalid-gamma-sbit\
-   tests/pngvalid-gamma-threshold tests/pngvalid-gamma-transform\
-   tests/pngvalid-progressive-interlace-size\
-   tests/pngvalid-progressive-interlace-standard\
-   tests/pngvalid-progressive-interlace-transform\
-   tests/pngvalid-progressive-standard tests/pngvalid-standard\
-   tests/pngstest-0g01 tests/pngstest-0g02 tests/pngstest-0g04\
-   tests/pngstest-0g08 tests/pngstest-0g16 tests/pngstest-2c08\
-   tests/pngstest-2c16 tests/pngstest-3p01 tests/pngstest-3p02\
-   tests/pngstest-3p04 tests/pngstest-3p08 tests/pngstest-4a08\
-   tests/pngstest-4a16 tests/pngstest-6a08 tests/pngstest-6a16\
-   tests/pngstest-error tests/pngunknown-IDAT\
-   tests/pngunknown-discard tests/pngunknown-if-safe tests/pngunknown-sAPI\
-   tests/pngunknown-sTER tests/pngunknown-save tests/pngunknown-vpAg
-
-# These tests are expected, and required, to fail:
-XFAIL_TESTS = tests/pngstest-error
-
-# man pages
-dist_man_MANS= libpng.3 libpngpf.3 png.5
-
-# generate the -config scripts if required
-binconfigs= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config
-EXTRA_SCRIPTS= libpng-config libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config
-bin_SCRIPTS= @binconfigs@
-
-# rules to build libpng, only build the old library on request
-lib_LTLIBRARIES=libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-# EXTRA_LTLIBRARIES= libpng.la
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngerror.c\
-	pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c pngrutil.c\
-	pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c\
-	png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h pngstruct.h pngusr.dfa
-
-if PNG_ARM_NEON
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES += arm/arm_init.c\
-	arm/filter_neon.S
-endif
-
-nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h
-
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined -export-dynamic \
-	-version-number @PNGLIB_MAJOR@@PNGLIB_MINOR@:@PNGLIB_RELEASE@:0
-
-if HAVE_LD_VERSION_SCRIPT
-#   Versioned symbols and restricted exports
-if HAVE_SOLARIS_LD
-  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -Wl,-M -Wl,libpng.vers
-else
-  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -Wl,--version-script=libpng.vers
-endif
-
-  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.vers
-else
-#   Only restricted exports when possible
-  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -export-symbols libpng.sym
-  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.sym
-endif
-
-#distribute headers in /usr/include/libpng/*
-pkgincludedir= $(includedir)/$(PNGLIB_BASENAME)
-pkginclude_HEADERS= png.h pngconf.h
-nodist_pkginclude_HEADERS= pnglibconf.h
-
-# pkg-config stuff, note that libpng.pc is always required in order
-# to get the correct library
-pkgconfigdir = @pkgconfigdir@
-pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc
-
-# Extra source distribution files, '${srcdir}' is used below to stop build files
-# from those directories being included.  This only works if the configure is
-# not done in the source directory!
-EXTRA_DIST= \
-	ANNOUNCE CHANGES INSTALL LICENSE README TODO \
-	pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
-	${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \
-	$(TESTS) $(XFAIL_TESTS) tests/pngstest \
-	CMakeLists.txt example.c libpng-manual.txt
-
-SCRIPT_CLEANFILES=scripts/*.out scripts/*.chk scripts/pnglibconf.dfn
-
-CLEANFILES= *.tf? pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc \
-	libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers libpng.sym \
-	check.new pnglibconf.* pngprefix.h symbols.new pngtest-log.txt \
-	$(SCRIPT_CLEANFILES)
-
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
-config.sub configure depcomp install-sh ltmain.sh missing
-
-# PNG_COPTS give extra options for the C compiler to be used on all compilation
-# steps (unless targe_CFLAGS is specified; that will take precedence over
-# AM_CFLAGS)
-PNG_COPTS = @PNG_COPTS@
-AM_CFLAGS = ${PNG_COPTS}
-
-# DFNCPP is normally just CPP - the C preprocessor - but on Solaris and maybe
-# other operating systems (NeXT?) the C preprocessor selected by configure
-# checks input tokens for validity - effectively it performs part of the ANSI-C
-# parsing - and therefore fails with the .df files.  configure.ac has special
-# checks for this and sets DFNCPP appropriately.
-DFNCPP = @DFNCPP@
-
-SUFFIXES = .chk .dfn .out
-
-$(PNGLIB_BASENAME).pc: libpng.pc
-	cp libpng.pc $@
-
-$(PNGLIB_BASENAME)-config: libpng-config
-	cp libpng-config $@
-
-scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h
-scripts/prefix.out: png.h pngconf.h pnglibconf.out
-scripts/symbols.out: png.h pngconf.h $(srcdir)/scripts/pnglibconf.h.prebuilt
-scripts/intprefix.out: pnglibconf.h
-
-libpng.sym: scripts/sym.out
-	rm -f $@
-	cp $? $@
-libpng.vers: scripts/vers.out
-	rm -f $@
-	cp $? $@
-
-if DO_PNG_PREFIX
-# Rename functions in scripts/prefix.out with a PNG_PREFIX prefix.
-# Rename macros in scripts/macro.lst from PNG_PREFIXpng_ to PNG_ (the actual
-# implementation of the macro).
-pnglibconf.h: pnglibconf.out scripts/prefix.out scripts/macro.lst
-	rm -f $@
-	$(AWK) 's==0 && NR>1{print prev}\
-	   s==0{prev=$$0}\
-	   s==1{print "#define", $$1, "@PNG_PREFIX@" $$1}\
-	   s==2{print "#define @PNG_PREFIX@png_" $$1, "PNG_" $$1}\
-	   END{print prev}' s=0 pnglibconf.out s=1 scripts/prefix.out\
-	   s=2 ${srcdir}/scripts/macro.lst >pnglibconf.tf8
-	mv pnglibconf.tf8 $@
-
-pngprefix.h: scripts/intprefix.out
-	rm -f pngprefix.tf1
-	$(AWK) '{print "#define", $$1, "@PNG_PREFIX@" $$1}' $? >pngprefix.tf1
-	mv pngprefix.tf1 $@
-else
-pnglibconf.h: pnglibconf.out
-	rm -f $@
-	cp $? $@
-
-pngprefix.h: # is empty
-	:>$@
-endif
-
-$(srcdir)/scripts/pnglibconf.h.prebuilt:
-	@echo "Attempting to build $@" >&2
-	@echo "This is a machine generated file, but if you want to make" >&2
-	@echo "a new one simply make 'scripts/pnglibconf.out' and copy that" >&2
-	@exit 1
-
-# The following is necessary to ensure that the local pnglibconf.h is used, not
-# an installed one (this can happen immediately after on a clean system if
-# 'make test' is the first thing the user does.)
-contrib/libtests/pngstest.o contrib/libtests/pngvalid.o pngtest.o: pnglibconf.h
-contrib/libtests/pngunknown.o: pnglibconf.h
-
-# We must use -DPNG_NO_USE_READ_MACROS here even when the library may actually
-# be built with PNG_USE_READ_MACROS; this prevents the read macros from
-# interfering with the symbol file format.
-SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\
-		-DPNGLIB_VERSION='@PNGLIB_VERSION@'\
-		-DSYMBOL_PREFIX='$(SYMBOL_PREFIX)'\
-		-DPNG_NO_USE_READ_MACROS -DPNG_BUILDING_SYMBOL_TABLE
-
-if DO_PNG_PREFIX
-SYMBOL_CFLAGS += -DPNG_PREFIX='@PNG_PREFIX@'
-endif
-
-.dfn.out:
-	rm -f $@ $*.c $*.tf[12]
-	test -d scripts || mkdir scripts || test -d scripts
-	echo '#include "$<"' >$*.c
-	$(DFNCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)\
-	    $(CPPFLAGS) $(SYMBOL_CFLAGS) $*.c > $*.tf1
-	$(AWK) -f "${srcdir}/scripts/dfn.awk" out="$*.tf2" $*.tf1 1>&2
-	rm -f $*.c $*.tf1
-	mv $*.tf2 $@
-
-# The .dfn file for pnglibconf.h is machine generated
-pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA)
-	rm -f $@ $*.tf[45]
-	$(AWK) -f ${srcdir}/scripts/options.awk out=$*.tf4 version=search\
-	    ${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
-	    ${srcdir}/pngusr.dfa $(DFA_XTRA) 1>&2
-	$(AWK) -f ${srcdir}/scripts/options.awk out=$*.tf5 $*.tf4 1>&2
-	rm $*.tf4
-	mv $*.tf5 $@
-
-# Symbol checks (.def and .out files should match)
-scripts/symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/symbols.out
-
-.out.chk:
-	rm -f $@ $*.new
-	$(AWK) -f ${srcdir}/scripts/checksym.awk ${srcdir}/scripts/${*F}.def\
-	    of="$*.new" $< >&2
-	mv $*.new $@
-
-# used on demand to regenerate the standard header, CPPFLAGS should
-# be empty - no non-standard defines
-scripts/pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h
-	rm -f $@ pnglibconf.tf[67]
-	test -z "$(CPPFLAGS)"
-	echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\
-	$(AWK) -f ${srcdir}/scripts/options.awk out=pnglibconf.tf6\
-	    logunsupported=1 version=search ${srcdir}/pngconf.h -\
-	    ${srcdir}/scripts/pnglibconf.dfa 1>&2
-	$(AWK) -f ${srcdir}/scripts/options.awk out=pnglibconf.tf7\
-	    pnglibconf.tf6 1>&2
-	rm pnglibconf.tf6
-	mv pnglibconf.tf7 $@
-
-$(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS): png.h pngconf.h \
-	pnglibconf.h pngpriv.h pngdebug.h pnginfo.h pngstruct.h pngprefix.h
-
-test: check-am
-
-# Extra checks
-check: scripts/symbols.chk
-
-# Don't distribute the generated script files
-dist-hook:
-	cd '$(top_distdir)'; rm -f $(SCRIPT_CLEANFILES)
-
-# install the .../include headers as links to the new ones
-install-data-hook:
-	cd '$(DESTDIR)$(includedir)'; rm -f png.h pngconf.h pnglibconf.h
-	cd '$(DESTDIR)$(includedir)'; $(LN_S) $(PNGLIB_BASENAME)/png.h png.h
-	cd '$(DESTDIR)$(includedir)'; $(LN_S) $(PNGLIB_BASENAME)/pngconf.h \
-		pngconf.h
-	cd '$(DESTDIR)$(includedir)'; $(LN_S) $(PNGLIB_BASENAME)/pnglibconf.h \
-		pnglibconf.h
-	cd '$(DESTDIR)$(pkgconfigdir)'; rm -f libpng.pc
-	cd '$(DESTDIR)$(pkgconfigdir)'; $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
-
-# do evil things to libpng to cause libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ to be used
-install-exec-hook:
-	cd '$(DESTDIR)$(bindir)'; rm -f libpng-config
-	cd '$(DESTDIR)$(bindir)';\
-	   $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
-	@set -x;\
-	cd '$(DESTDIR)$(libdir)';\
-	for ext in a la so so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@\
-	   sl dylib dll.a; do\
-		rm -f libpng.$$ext;\
-                if test -f $(PNGLIB_BASENAME).$$ext; then\
-                       $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
-                fi;\
-	done
-
-uninstall-hook:
-	cd '$(DESTDIR)$(includedir)'; rm -f png.h pngconf.h pnglibconf.h
-	rm -f '$(DESTDIR)$(pkgconfigdir)/libpng.pc'
-	rm -f '$(DESTDIR)$(bindir)/libpng-config'
-	rm -f '$(DESTDIR)$(libdir)/libpng.a'
-	rm -f '$(DESTDIR)$(libdir)/libpng.la'
-	rm -f '$(DESTDIR)$(libdir)/libpng.so'
-	rm -f '$(DESTDIR)$(libdir)/libpng.so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@'
-	rm -f '$(DESTDIR)$(libdir)/libpng.sl'
-	rm -f '$(DESTDIR)$(libdir)/libpng.dylib'
-	rm -f '$(DESTDIR)$(libdir)/libpng.dll.a'
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/Makefile.in b/3rdparty/wxwidgets3.0-3.0.1/src/png/Makefile.in
deleted file mode 100644
index 80ac70a842..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/Makefile.in
+++ /dev/null
@@ -1,2091 +0,0 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# Makefile.am:
-#   Source file for Makefile.in (and hence Makefile)
-#
-
-
-
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-check_PROGRAMS = pngtest$(EXEEXT) pngunknown$(EXEEXT) \
-	pngstest$(EXEEXT) pngvalid$(EXEEXT)
-@PNG_ARM_NEON_TRUE@am__append_1 = arm/arm_init.c\
-@PNG_ARM_NEON_TRUE@	arm/filter_neon.S
-
-
-#   Versioned symbols and restricted exports
-@HAVE_LD_VERSION_SCRIPT_TRUE@@HAVE_SOLARIS_LD_TRUE@am__append_2 = -Wl,-M -Wl,libpng.vers
-@HAVE_LD_VERSION_SCRIPT_TRUE@@HAVE_SOLARIS_LD_FALSE@am__append_3 = -Wl,--version-script=libpng.vers
-#   Only restricted exports when possible
-@HAVE_LD_VERSION_SCRIPT_FALSE@am__append_4 = -export-symbols libpng.sym
-@DO_PNG_PREFIX_TRUE@am__append_5 = -DPNG_PREFIX='@PNG_PREFIX@'
-subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in $(srcdir)/libpng.pc.in \
-	$(srcdir)/libpng-config.in depcomp $(dist_man_MANS) \
-	$(pkginclude_HEADERS) test-driver INSTALL README TODO \
-	config.guess config.sub install-sh missing ltmain.sh
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/scripts/libtool.m4 \
-	$(top_srcdir)/scripts/ltoptions.m4 \
-	$(top_srcdir)/scripts/ltsugar.m4 \
-	$(top_srcdir)/scripts/ltversion.m4 \
-	$(top_srcdir)/scripts/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = libpng.pc libpng-config
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" \
-	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)" \
-	"$(DESTDIR)$(pkgincludedir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LIBADD =
-am__libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES_DIST = png.c \
-	pngerror.c pngget.c pngmem.c pngpread.c pngread.c pngrio.c \
-	pngrtran.c pngrutil.c pngset.c pngtrans.c pngwio.c pngwrite.c \
-	pngwtran.c pngwutil.c png.h pngconf.h pngdebug.h pnginfo.h \
-	pngpriv.h pngstruct.h pngusr.dfa arm/arm_init.c \
-	arm/filter_neon.S
-@PNG_ARM_NEON_TRUE@am__objects_1 = arm_init.lo filter_neon.lo
-am_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS = png.lo pngerror.lo \
-	pngget.lo pngmem.lo pngpread.lo pngread.lo pngrio.lo \
-	pngrtran.lo pngrutil.lo pngset.lo pngtrans.lo pngwio.lo \
-	pngwrite.lo pngwtran.lo pngwutil.lo $(am__objects_1)
-nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS =
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS =  \
-	$(am_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS) \
-	$(nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LINK = $(LIBTOOL) $(AM_V_lt) \
-	--tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
-	$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS) $(LDFLAGS) -o \
-	$@
-am_pngstest_OBJECTS = pngstest.$(OBJEXT)
-pngstest_OBJECTS = $(am_pngstest_OBJECTS)
-pngstest_DEPENDENCIES = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-am_pngtest_OBJECTS = pngtest.$(OBJEXT)
-pngtest_OBJECTS = $(am_pngtest_OBJECTS)
-pngtest_DEPENDENCIES = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-am_pngunknown_OBJECTS = pngunknown.$(OBJEXT)
-pngunknown_OBJECTS = $(am_pngunknown_OBJECTS)
-pngunknown_DEPENDENCIES = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-am_pngvalid_OBJECTS = pngvalid.$(OBJEXT)
-pngvalid_OBJECTS = $(am_pngvalid_OBJECTS)
-pngvalid_DEPENDENCIES = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-SCRIPTS = $(bin_SCRIPTS)
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)
-LTCPPASCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CCASFLAGS) $(CCASFLAGS)
-AM_V_CPPAS = $(am__v_CPPAS_@AM_V@)
-am__v_CPPAS_ = $(am__v_CPPAS_@AM_DEFAULT_V@)
-am__v_CPPAS_0 = @echo "  CPPAS   " $@;
-am__v_CPPAS_1 = 
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-SOURCES = $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES) \
-	$(nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES) \
-	$(pngstest_SOURCES) $(pngtest_SOURCES) $(pngunknown_SOURCES) \
-	$(pngvalid_SOURCES)
-DIST_SOURCES =  \
-	$(am__libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES_DIST) \
-	$(pngstest_SOURCES) $(pngtest_SOURCES) $(pngunknown_SOURCES) \
-	$(pngvalid_SOURCES)
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-man3dir = $(mandir)/man3
-man5dir = $(mandir)/man5
-NROFF = nroff
-MANS = $(dist_man_MANS)
-DATA = $(pkgconfig_DATA)
-HEADERS = $(nodist_pkginclude_HEADERS) $(pkginclude_HEADERS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-	$(LISP)config.h.in
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
-AM_RECURSIVE_TARGETS = cscope check recheck
-am__tty_colors_dummy = \
-  mgn= red= grn= lgn= blu= brg= std=; \
-  am__color_tests=no
-am__tty_colors = { \
-  $(am__tty_colors_dummy); \
-  if test "X$(AM_COLOR_TESTS)" = Xno; then \
-    am__color_tests=no; \
-  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
-    am__color_tests=yes; \
-  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
-    am__color_tests=yes; \
-  fi; \
-  if test $$am__color_tests = yes; then \
-    red=''; \
-    grn=''; \
-    lgn=''; \
-    blu=''; \
-    mgn=''; \
-    brg=''; \
-    std=''; \
-  fi; \
-}
-am__recheck_rx = ^[ 	]*:recheck:[ 	]*
-am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
-am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
-# A command that, given a newline-separated list of test names on the
-# standard input, print the name of the tests that are to be re-run
-# upon "make recheck".
-am__list_recheck_tests = $(AWK) '{ \
-  recheck = 1; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-        { \
-          if ((getline line2 < ($$0 ".log")) < 0) \
-	    recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
-        { \
-          recheck = 0; \
-          break; \
-        } \
-      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
-        { \
-          break; \
-        } \
-    }; \
-  if (recheck) \
-    print $$0; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# A command that, given a newline-separated list of test names on the
-# standard input, create the global log from their .trs and .log files.
-am__create_global_log = $(AWK) ' \
-function fatal(msg) \
-{ \
-  print "fatal: making $@: " msg | "cat >&2"; \
-  exit 1; \
-} \
-function rst_section(header) \
-{ \
-  print header; \
-  len = length(header); \
-  for (i = 1; i <= len; i = i + 1) \
-    printf "="; \
-  printf "\n\n"; \
-} \
-{ \
-  copy_in_global_log = 1; \
-  global_test_result = "RUN"; \
-  while ((rc = (getline line < ($$0 ".trs"))) != 0) \
-    { \
-      if (rc < 0) \
-         fatal("failed to read from " $$0 ".trs"); \
-      if (line ~ /$(am__global_test_result_rx)/) \
-        { \
-          sub("$(am__global_test_result_rx)", "", line); \
-          sub("[ 	]*$$", "", line); \
-          global_test_result = line; \
-        } \
-      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
-        copy_in_global_log = 0; \
-    }; \
-  if (copy_in_global_log) \
-    { \
-      rst_section(global_test_result ": " $$0); \
-      while ((rc = (getline line < ($$0 ".log"))) != 0) \
-      { \
-        if (rc < 0) \
-          fatal("failed to read from " $$0 ".log"); \
-        print line; \
-      }; \
-      printf "\n"; \
-    }; \
-  close ($$0 ".trs"); \
-  close ($$0 ".log"); \
-}'
-# Restructured Text title.
-am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
-# Solaris 10 'make', and several other traditional 'make' implementations,
-# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
-# by disabling -e (using the XSI extension "set +e") if it's set.
-am__sh_e_setup = case $$- in *e*) set +e;; esac
-# Default flags passed to test drivers.
-am__common_driver_flags = \
-  --color-tests "$$am__color_tests" \
-  --enable-hard-errors "$$am__enable_hard_errors" \
-  --expect-failure "$$am__expect_failure"
-# To be inserted before the command running the test.  Creates the
-# directory for the log if needed.  Stores in $dir the directory
-# containing $f, in $tst the test, in $log the log.  Executes the
-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
-# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
-# will run the test scripts (or their associated LOG_COMPILER, if
-# thy have one).
-am__check_pre = \
-$(am__sh_e_setup);					\
-$(am__vpath_adj_setup) $(am__vpath_adj)			\
-$(am__tty_colors);					\
-srcdir=$(srcdir); export srcdir;			\
-case "$@" in						\
-  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
-    *) am__odir=.;; 					\
-esac;							\
-test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
-  || $(MKDIR_P) "$$am__odir" || exit $$?;		\
-if test -f "./$$f"; then dir=./;			\
-elif test -f "$$f"; then dir=;				\
-else dir="$(srcdir)/"; fi;				\
-tst=$$dir$$f; log='$@'; 				\
-if test -n '$(DISABLE_HARD_ERRORS)'; then		\
-  am__enable_hard_errors=no; 				\
-else							\
-  am__enable_hard_errors=yes; 				\
-fi; 							\
-case " $(XFAIL_TESTS) " in				\
-  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-    am__expect_failure=yes;;				\
-  *)							\
-    am__expect_failure=no;;				\
-esac; 							\
-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
-# A shell command to get the names of the tests scripts with any registered
-# extension removed (i.e., equivalently, the names of the test logs, with
-# the '.log' extension removed).  The result is saved in the shell variable
-# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
-# since that might cause problem with VPATH rewrites for suffix-less tests.
-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
-am__set_TESTS_bases = \
-  bases='$(TEST_LOGS)'; \
-  bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
-  bases=`echo $$bases`
-RECHECK_LOGS = $(TEST_LOGS)
-TEST_SUITE_LOG = test-suite.log
-TEST_EXTENSIONS = @EXEEXT@ .test
-LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
-LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
-am__set_b = \
-  case '$@' in \
-    */*) \
-      case '$*' in \
-        */*) b='$*';; \
-          *) b=`echo '$@' | sed 's/\.log$$//'`; \
-       esac;; \
-    *) \
-      b='$*';; \
-  esac
-am__test_logs1 = $(TESTS:=.log)
-am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
-TEST_LOGS = $(am__test_logs2:.test.log=.log)
-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
-TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
-	$(TEST_LOG_FLAGS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
-GZIP_ENV = --best
-DIST_TARGETS = dist-xz dist-gzip
-distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
-
-#distribute headers in /usr/include/libpng/*
-pkgincludedir = $(includedir)/$(PNGLIB_BASENAME)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AS = @AS@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCAS = @CCAS@
-CCASDEPMODE = @CCASDEPMODE@
-CCASFLAGS = @CCASFLAGS@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-
-# DFNCPP is normally just CPP - the C preprocessor - but on Solaris and maybe
-# other operating systems (NeXT?) the C preprocessor selected by configure
-# checks input tokens for validity - effectively it performs part of the ANSI-C
-# parsing - and therefore fails with the .df files.  configure.ac has special
-# checks for this and sets DFNCPP appropriately.
-DFNCPP = @DFNCPP@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PNGLIB_MAJOR = @PNGLIB_MAJOR@
-PNGLIB_MINOR = @PNGLIB_MINOR@
-PNGLIB_RELEASE = @PNGLIB_RELEASE@
-PNGLIB_VERSION = @PNGLIB_VERSION@
-
-# PNG_COPTS give extra options for the C compiler to be used on all compilation
-# steps (unless targe_CFLAGS is specified; that will take precedence over
-# AM_CFLAGS)
-PNG_COPTS = @PNG_COPTS@
-PNG_PREFIX = @PNG_PREFIX@
-POW_LIB = @POW_LIB@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SYMBOL_PREFIX = @SYMBOL_PREFIX@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-
-# generate the -config scripts if required
-binconfigs = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-
-# pkg-config stuff, note that libpng.pc is always required in order
-# to get the correct library
-pkgconfigdir = @pkgconfigdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-PNGLIB_BASENAME = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
-ACLOCAL_AMFLAGS = -I scripts
-pngtest_SOURCES = pngtest.c
-pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-pngvalid_SOURCES = contrib/libtests/pngvalid.c
-pngvalid_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-pngstest_SOURCES = contrib/libtests/pngstest.c
-pngstest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-pngunknown_SOURCES = contrib/libtests/pngunknown.c
-pngunknown_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-
-# Generally these are single line shell scripts to run a test with a particular
-# set of parameters:
-TESTS = \
-   tests/pngtest\
-   tests/pngvalid-gamma-16-to-8 tests/pngvalid-gamma-alpha-mode\
-   tests/pngvalid-gamma-background tests/pngvalid-gamma-expand16-alpha-mode\
-   tests/pngvalid-gamma-expand16-background\
-   tests/pngvalid-gamma-expand16-transform tests/pngvalid-gamma-sbit\
-   tests/pngvalid-gamma-threshold tests/pngvalid-gamma-transform\
-   tests/pngvalid-progressive-interlace-size\
-   tests/pngvalid-progressive-interlace-standard\
-   tests/pngvalid-progressive-interlace-transform\
-   tests/pngvalid-progressive-standard tests/pngvalid-standard\
-   tests/pngstest-0g01 tests/pngstest-0g02 tests/pngstest-0g04\
-   tests/pngstest-0g08 tests/pngstest-0g16 tests/pngstest-2c08\
-   tests/pngstest-2c16 tests/pngstest-3p01 tests/pngstest-3p02\
-   tests/pngstest-3p04 tests/pngstest-3p08 tests/pngstest-4a08\
-   tests/pngstest-4a16 tests/pngstest-6a08 tests/pngstest-6a16\
-   tests/pngstest-error tests/pngunknown-IDAT\
-   tests/pngunknown-discard tests/pngunknown-if-safe tests/pngunknown-sAPI\
-   tests/pngunknown-sTER tests/pngunknown-save tests/pngunknown-vpAg
-
-
-# These tests are expected, and required, to fail:
-XFAIL_TESTS = tests/pngstest-error
-
-# man pages
-dist_man_MANS = libpng.3 libpngpf.3 png.5
-EXTRA_SCRIPTS = libpng-config libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config
-bin_SCRIPTS = @binconfigs@
-
-# rules to build libpng, only build the old library on request
-lib_LTLIBRARIES = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
-# EXTRA_LTLIBRARIES= libpng.la
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngerror.c \
-	pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c \
-	pngrutil.c pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c \
-	pngwutil.c png.h pngconf.h pngdebug.h pnginfo.h pngpriv.h \
-	pngstruct.h pngusr.dfa $(am__append_1)
-nodist_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = pnglibconf.h
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined \
-	-export-dynamic -version-number \
-	@PNGLIB_MAJOR@@PNGLIB_MINOR@:@PNGLIB_RELEASE@:0 \
-	$(am__append_2) $(am__append_3) $(am__append_4)
-@HAVE_LD_VERSION_SCRIPT_FALSE@libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.sym
-@HAVE_LD_VERSION_SCRIPT_TRUE@libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.vers
-pkginclude_HEADERS = png.h pngconf.h
-nodist_pkginclude_HEADERS = pnglibconf.h
-pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc
-
-# Extra source distribution files, '${srcdir}' is used below to stop build files
-# from those directories being included.  This only works if the configure is
-# not done in the source directory!
-EXTRA_DIST = \
-	ANNOUNCE CHANGES INSTALL LICENSE README TODO \
-	pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
-	${srcdir}/contrib ${srcdir}/projects ${srcdir}/scripts \
-	$(TESTS) $(XFAIL_TESTS) tests/pngstest \
-	CMakeLists.txt example.c libpng-manual.txt
-
-SCRIPT_CLEANFILES = scripts/*.out scripts/*.chk scripts/pnglibconf.dfn
-CLEANFILES = *.tf? pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc \
-	libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers libpng.sym \
-	check.new pnglibconf.* pngprefix.h symbols.new pngtest-log.txt \
-	$(SCRIPT_CLEANFILES)
-
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
-config.sub configure depcomp install-sh ltmain.sh missing
-
-AM_CFLAGS = ${PNG_COPTS}
-SUFFIXES = .chk .dfn .out
-
-# We must use -DPNG_NO_USE_READ_MACROS here even when the library may actually
-# be built with PNG_USE_READ_MACROS; this prevents the read macros from
-# interfering with the symbol file format.
-SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0' \
-	-DPNGLIB_VERSION='@PNGLIB_VERSION@' \
-	-DSYMBOL_PREFIX='$(SYMBOL_PREFIX)' -DPNG_NO_USE_READ_MACROS \
-	-DPNG_BUILDING_SYMBOL_TABLE $(am__append_5)
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .chk .dfn .out .S .c .lo .log .o .obj .test .test$(EXEEXT) .trs
-am--refresh: Makefile
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-
-config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-libpng.pc: $(top_builddir)/config.status $(srcdir)/libpng.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-libpng-config: $(top_builddir)/config.status $(srcdir)/libpng-config.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-	}
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; \
-	locs=`for p in $$list; do echo $$p; done | \
-	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
-	      sort -u`; \
-	test -z "$$locs" || { \
-	  echo rm -f $${locs}; \
-	  rm -f $${locs}; \
-	}
-
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la: $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS) $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES) $(EXTRA_libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LINK) -rpath $(libdir) $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS) $(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LIBADD) $(LIBS)
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
-pngstest$(EXEEXT): $(pngstest_OBJECTS) $(pngstest_DEPENDENCIES) $(EXTRA_pngstest_DEPENDENCIES) 
-	@rm -f pngstest$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(pngstest_OBJECTS) $(pngstest_LDADD) $(LIBS)
-
-pngtest$(EXEEXT): $(pngtest_OBJECTS) $(pngtest_DEPENDENCIES) $(EXTRA_pngtest_DEPENDENCIES) 
-	@rm -f pngtest$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(pngtest_OBJECTS) $(pngtest_LDADD) $(LIBS)
-
-pngunknown$(EXEEXT): $(pngunknown_OBJECTS) $(pngunknown_DEPENDENCIES) $(EXTRA_pngunknown_DEPENDENCIES) 
-	@rm -f pngunknown$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(pngunknown_OBJECTS) $(pngunknown_LDADD) $(LIBS)
-
-pngvalid$(EXEEXT): $(pngvalid_OBJECTS) $(pngvalid_DEPENDENCIES) $(EXTRA_pngvalid_DEPENDENCIES) 
-	@rm -f pngvalid$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(pngvalid_OBJECTS) $(pngvalid_LDADD) $(LIBS)
-install-binSCRIPTS: $(bin_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-binSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/arm_init.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter_neon.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/png.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngerror.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngget.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngmem.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngpread.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngread.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngrio.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngrtran.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngrutil.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngset.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngstest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngtest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngtrans.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngunknown.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngvalid.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngwio.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngwrite.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngwtran.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pngwutil.Plo@am__quote@
-
-.S.o:
-@am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)$(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCCAS_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ $<
-
-.S.obj:
-@am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)$(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCCAS_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.S.lo:
-@am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)$(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCCAS_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(LTCPPASCOMPILE) -c -o $@ $<
-
-filter_neon.lo: arm/filter_neon.S
-@am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -MT filter_neon.lo -MD -MP -MF $(DEPDIR)/filter_neon.Tpo -c -o filter_neon.lo `test -f 'arm/filter_neon.S' || echo '$(srcdir)/'`arm/filter_neon.S
-@am__fastdepCCAS_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/filter_neon.Tpo $(DEPDIR)/filter_neon.Plo
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS)source='arm/filter_neon.S' object='filter_neon.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@	DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCCAS_FALSE@	$(AM_V_CPPAS@am__nodep@)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o filter_neon.lo `test -f 'arm/filter_neon.S' || echo '$(srcdir)/'`arm/filter_neon.S
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
-
-arm_init.lo: arm/arm_init.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT arm_init.lo -MD -MP -MF $(DEPDIR)/arm_init.Tpo -c -o arm_init.lo `test -f 'arm/arm_init.c' || echo '$(srcdir)/'`arm/arm_init.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/arm_init.Tpo $(DEPDIR)/arm_init.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='arm/arm_init.c' object='arm_init.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o arm_init.lo `test -f 'arm/arm_init.c' || echo '$(srcdir)/'`arm/arm_init.c
-
-pngstest.o: contrib/libtests/pngstest.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pngstest.o -MD -MP -MF $(DEPDIR)/pngstest.Tpo -c -o pngstest.o `test -f 'contrib/libtests/pngstest.c' || echo '$(srcdir)/'`contrib/libtests/pngstest.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pngstest.Tpo $(DEPDIR)/pngstest.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='contrib/libtests/pngstest.c' object='pngstest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pngstest.o `test -f 'contrib/libtests/pngstest.c' || echo '$(srcdir)/'`contrib/libtests/pngstest.c
-
-pngstest.obj: contrib/libtests/pngstest.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pngstest.obj -MD -MP -MF $(DEPDIR)/pngstest.Tpo -c -o pngstest.obj `if test -f 'contrib/libtests/pngstest.c'; then $(CYGPATH_W) 'contrib/libtests/pngstest.c'; else $(CYGPATH_W) '$(srcdir)/contrib/libtests/pngstest.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pngstest.Tpo $(DEPDIR)/pngstest.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='contrib/libtests/pngstest.c' object='pngstest.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pngstest.obj `if test -f 'contrib/libtests/pngstest.c'; then $(CYGPATH_W) 'contrib/libtests/pngstest.c'; else $(CYGPATH_W) '$(srcdir)/contrib/libtests/pngstest.c'; fi`
-
-pngunknown.o: contrib/libtests/pngunknown.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pngunknown.o -MD -MP -MF $(DEPDIR)/pngunknown.Tpo -c -o pngunknown.o `test -f 'contrib/libtests/pngunknown.c' || echo '$(srcdir)/'`contrib/libtests/pngunknown.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pngunknown.Tpo $(DEPDIR)/pngunknown.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='contrib/libtests/pngunknown.c' object='pngunknown.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pngunknown.o `test -f 'contrib/libtests/pngunknown.c' || echo '$(srcdir)/'`contrib/libtests/pngunknown.c
-
-pngunknown.obj: contrib/libtests/pngunknown.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pngunknown.obj -MD -MP -MF $(DEPDIR)/pngunknown.Tpo -c -o pngunknown.obj `if test -f 'contrib/libtests/pngunknown.c'; then $(CYGPATH_W) 'contrib/libtests/pngunknown.c'; else $(CYGPATH_W) '$(srcdir)/contrib/libtests/pngunknown.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pngunknown.Tpo $(DEPDIR)/pngunknown.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='contrib/libtests/pngunknown.c' object='pngunknown.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pngunknown.obj `if test -f 'contrib/libtests/pngunknown.c'; then $(CYGPATH_W) 'contrib/libtests/pngunknown.c'; else $(CYGPATH_W) '$(srcdir)/contrib/libtests/pngunknown.c'; fi`
-
-pngvalid.o: contrib/libtests/pngvalid.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pngvalid.o -MD -MP -MF $(DEPDIR)/pngvalid.Tpo -c -o pngvalid.o `test -f 'contrib/libtests/pngvalid.c' || echo '$(srcdir)/'`contrib/libtests/pngvalid.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pngvalid.Tpo $(DEPDIR)/pngvalid.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='contrib/libtests/pngvalid.c' object='pngvalid.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pngvalid.o `test -f 'contrib/libtests/pngvalid.c' || echo '$(srcdir)/'`contrib/libtests/pngvalid.c
-
-pngvalid.obj: contrib/libtests/pngvalid.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pngvalid.obj -MD -MP -MF $(DEPDIR)/pngvalid.Tpo -c -o pngvalid.obj `if test -f 'contrib/libtests/pngvalid.c'; then $(CYGPATH_W) 'contrib/libtests/pngvalid.c'; else $(CYGPATH_W) '$(srcdir)/contrib/libtests/pngvalid.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pngvalid.Tpo $(DEPDIR)/pngvalid.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='contrib/libtests/pngvalid.c' object='pngvalid.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pngvalid.obj `if test -f 'contrib/libtests/pngvalid.c'; then $(CYGPATH_W) 'contrib/libtests/pngvalid.c'; else $(CYGPATH_W) '$(srcdir)/contrib/libtests/pngvalid.c'; fi`
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool config.lt
-install-man3: $(dist_man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(dist_man_MANS)'; \
-	test -n "$(man3dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.3[a-z]*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man3dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man3dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man3:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man3dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.3[a-z]*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir)
-install-man5: $(dist_man_MANS)
-	@$(NORMAL_INSTALL)
-	@list1=''; \
-	list2='$(dist_man_MANS)'; \
-	test -n "$(man5dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.5[a-z]*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man5:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man5dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.5[a-z]*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
-install-pkgconfigDATA: $(pkgconfig_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
-	done
-
-uninstall-pkgconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
-install-nodist_pkgincludeHEADERS: $(nodist_pkginclude_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(nodist_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
-	done
-
-uninstall-nodist_pkgincludeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(nodist_pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
-install-pkgincludeHEADERS: $(pkginclude_HEADERS)
-	@$(NORMAL_INSTALL)
-	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(pkgincludedir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(pkgincludedir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(pkgincludedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(pkgincludedir)" || exit $$?; \
-	done
-
-uninstall-pkgincludeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-am
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-am
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscope: cscope.files
-	test ! -s cscope.files \
-	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-clean-cscope:
-	-rm -f cscope.files
-cscope.files: clean-cscope cscopelist
-cscopelist: cscopelist-am
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-
-# Recover from deleted '.trs' file; this should ensure that
-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
-# both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
-# to avoid problems with "make -n".
-.log.trs:
-	rm -f $< $@
-	$(MAKE) $(AM_MAKEFLAGS) $<
-
-# Leading 'am--fnord' is there to ensure the list of targets does not
-# expand to empty, as could happen e.g. with make check TESTS=''.
-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
-am--force-recheck:
-	@:
-
-$(TEST_SUITE_LOG): $(TEST_LOGS)
-	@$(am__set_TESTS_bases); \
-	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
-	redo_bases=`for i in $$bases; do \
-	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
-	            done`; \
-	if test -n "$$redo_bases"; then \
-	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
-	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
-	  if $(am__make_dryrun); then :; else \
-	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
-	  fi; \
-	fi; \
-	if test -n "$$am__remaking_logs"; then \
-	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
-	       "recursion detected" >&2; \
-	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
-	fi; \
-	if $(am__make_dryrun); then :; else \
-	  st=0;  \
-	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
-	  for i in $$redo_bases; do \
-	    test -f $$i.trs && test -r $$i.trs \
-	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
-	    test -f $$i.log && test -r $$i.log \
-	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
-	  done; \
-	  test $$st -eq 0 || exit 1; \
-	fi
-	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
-	ws='[ 	]'; \
-	results=`for b in $$bases; do echo $$b.trs; done`; \
-	test -n "$$results" || results=/dev/null; \
-	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
-	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
-	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
-	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
-	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
-	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
-	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
-	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
-	  success=true; \
-	else \
-	  success=false; \
-	fi; \
-	br='==================='; br=$$br$$br$$br$$br; \
-	result_count () \
-	{ \
-	    if test x"$$1" = x"--maybe-color"; then \
-	      maybe_colorize=yes; \
-	    elif test x"$$1" = x"--no-color"; then \
-	      maybe_colorize=no; \
-	    else \
-	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
-	    fi; \
-	    shift; \
-	    desc=$$1 count=$$2; \
-	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
-	      color_start=$$3 color_end=$$std; \
-	    else \
-	      color_start= color_end=; \
-	    fi; \
-	    echo "$${color_start}# $$desc $$count$${color_end}"; \
-	}; \
-	create_testsuite_report () \
-	{ \
-	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
-	  result_count $$1 "PASS: " $$pass  "$$grn"; \
-	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
-	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
-	  result_count $$1 "FAIL: " $$fail  "$$red"; \
-	  result_count $$1 "XPASS:" $$xpass "$$red"; \
-	  result_count $$1 "ERROR:" $$error "$$mgn"; \
-	}; \
-	{								\
-	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
-	    $(am__rst_title);						\
-	  create_testsuite_report --no-color;				\
-	  echo;								\
-	  echo ".. contents:: :depth: 2";				\
-	  echo;								\
-	  for b in $$bases; do echo $$b; done				\
-	    | $(am__create_global_log);					\
-	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
-	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
-	if $$success; then						\
-	  col="$$grn";							\
-	 else								\
-	  col="$$red";							\
-	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
-	fi;								\
-	echo "$${col}$$br$${std}"; 					\
-	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
-	echo "$${col}$$br$${std}"; 					\
-	create_testsuite_report --maybe-color;				\
-	echo "$$col$$br$$std";						\
-	if $$success; then :; else					\
-	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
-	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
-	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
-	  fi;								\
-	  echo "$$col$$br$$std";					\
-	fi;								\
-	$$success || exit 1
-
-check-TESTS:
-	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
-	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
-	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
-	exit $$?;
-recheck: all $(check_PROGRAMS)
-	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-	@set +e; $(am__set_TESTS_bases); \
-	bases=`for i in $$bases; do echo $$i; done \
-	         | $(am__list_recheck_tests)` || exit 1; \
-	log_list=`for i in $$bases; do echo $$i.log; done`; \
-	log_list=`echo $$log_list`; \
-	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
-	        am__force_recheck=am--force-recheck \
-	        TEST_LOGS="$$log_list"; \
-	exit $$?
-tests/pngtest.log: tests/pngtest
-	@p='tests/pngtest'; \
-	b='tests/pngtest'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngvalid-gamma-16-to-8.log: tests/pngvalid-gamma-16-to-8
-	@p='tests/pngvalid-gamma-16-to-8'; \
-	b='tests/pngvalid-gamma-16-to-8'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngvalid-gamma-alpha-mode.log: tests/pngvalid-gamma-alpha-mode
-	@p='tests/pngvalid-gamma-alpha-mode'; \
-	b='tests/pngvalid-gamma-alpha-mode'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngvalid-gamma-background.log: tests/pngvalid-gamma-background
-	@p='tests/pngvalid-gamma-background'; \
-	b='tests/pngvalid-gamma-background'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngvalid-gamma-expand16-alpha-mode.log: tests/pngvalid-gamma-expand16-alpha-mode
-	@p='tests/pngvalid-gamma-expand16-alpha-mode'; \
-	b='tests/pngvalid-gamma-expand16-alpha-mode'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngvalid-gamma-expand16-background.log: tests/pngvalid-gamma-expand16-background
-	@p='tests/pngvalid-gamma-expand16-background'; \
-	b='tests/pngvalid-gamma-expand16-background'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngvalid-gamma-expand16-transform.log: tests/pngvalid-gamma-expand16-transform
-	@p='tests/pngvalid-gamma-expand16-transform'; \
-	b='tests/pngvalid-gamma-expand16-transform'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngvalid-gamma-sbit.log: tests/pngvalid-gamma-sbit
-	@p='tests/pngvalid-gamma-sbit'; \
-	b='tests/pngvalid-gamma-sbit'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngvalid-gamma-threshold.log: tests/pngvalid-gamma-threshold
-	@p='tests/pngvalid-gamma-threshold'; \
-	b='tests/pngvalid-gamma-threshold'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngvalid-gamma-transform.log: tests/pngvalid-gamma-transform
-	@p='tests/pngvalid-gamma-transform'; \
-	b='tests/pngvalid-gamma-transform'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngvalid-progressive-interlace-size.log: tests/pngvalid-progressive-interlace-size
-	@p='tests/pngvalid-progressive-interlace-size'; \
-	b='tests/pngvalid-progressive-interlace-size'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngvalid-progressive-interlace-standard.log: tests/pngvalid-progressive-interlace-standard
-	@p='tests/pngvalid-progressive-interlace-standard'; \
-	b='tests/pngvalid-progressive-interlace-standard'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngvalid-progressive-interlace-transform.log: tests/pngvalid-progressive-interlace-transform
-	@p='tests/pngvalid-progressive-interlace-transform'; \
-	b='tests/pngvalid-progressive-interlace-transform'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngvalid-progressive-standard.log: tests/pngvalid-progressive-standard
-	@p='tests/pngvalid-progressive-standard'; \
-	b='tests/pngvalid-progressive-standard'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngvalid-standard.log: tests/pngvalid-standard
-	@p='tests/pngvalid-standard'; \
-	b='tests/pngvalid-standard'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngstest-0g01.log: tests/pngstest-0g01
-	@p='tests/pngstest-0g01'; \
-	b='tests/pngstest-0g01'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngstest-0g02.log: tests/pngstest-0g02
-	@p='tests/pngstest-0g02'; \
-	b='tests/pngstest-0g02'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngstest-0g04.log: tests/pngstest-0g04
-	@p='tests/pngstest-0g04'; \
-	b='tests/pngstest-0g04'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngstest-0g08.log: tests/pngstest-0g08
-	@p='tests/pngstest-0g08'; \
-	b='tests/pngstest-0g08'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngstest-0g16.log: tests/pngstest-0g16
-	@p='tests/pngstest-0g16'; \
-	b='tests/pngstest-0g16'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngstest-2c08.log: tests/pngstest-2c08
-	@p='tests/pngstest-2c08'; \
-	b='tests/pngstest-2c08'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngstest-2c16.log: tests/pngstest-2c16
-	@p='tests/pngstest-2c16'; \
-	b='tests/pngstest-2c16'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngstest-3p01.log: tests/pngstest-3p01
-	@p='tests/pngstest-3p01'; \
-	b='tests/pngstest-3p01'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngstest-3p02.log: tests/pngstest-3p02
-	@p='tests/pngstest-3p02'; \
-	b='tests/pngstest-3p02'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngstest-3p04.log: tests/pngstest-3p04
-	@p='tests/pngstest-3p04'; \
-	b='tests/pngstest-3p04'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngstest-3p08.log: tests/pngstest-3p08
-	@p='tests/pngstest-3p08'; \
-	b='tests/pngstest-3p08'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngstest-4a08.log: tests/pngstest-4a08
-	@p='tests/pngstest-4a08'; \
-	b='tests/pngstest-4a08'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngstest-4a16.log: tests/pngstest-4a16
-	@p='tests/pngstest-4a16'; \
-	b='tests/pngstest-4a16'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngstest-6a08.log: tests/pngstest-6a08
-	@p='tests/pngstest-6a08'; \
-	b='tests/pngstest-6a08'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngstest-6a16.log: tests/pngstest-6a16
-	@p='tests/pngstest-6a16'; \
-	b='tests/pngstest-6a16'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngstest-error.log: tests/pngstest-error
-	@p='tests/pngstest-error'; \
-	b='tests/pngstest-error'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngunknown-IDAT.log: tests/pngunknown-IDAT
-	@p='tests/pngunknown-IDAT'; \
-	b='tests/pngunknown-IDAT'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngunknown-discard.log: tests/pngunknown-discard
-	@p='tests/pngunknown-discard'; \
-	b='tests/pngunknown-discard'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngunknown-if-safe.log: tests/pngunknown-if-safe
-	@p='tests/pngunknown-if-safe'; \
-	b='tests/pngunknown-if-safe'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngunknown-sAPI.log: tests/pngunknown-sAPI
-	@p='tests/pngunknown-sAPI'; \
-	b='tests/pngunknown-sAPI'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngunknown-sTER.log: tests/pngunknown-sTER
-	@p='tests/pngunknown-sTER'; \
-	b='tests/pngunknown-sTER'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngunknown-save.log: tests/pngunknown-save
-	@p='tests/pngunknown-save'; \
-	b='tests/pngunknown-save'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-tests/pngunknown-vpAg.log: tests/pngunknown-vpAg
-	@p='tests/pngunknown-vpAg'; \
-	b='tests/pngunknown-vpAg'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-.test.log:
-	@p='$<'; \
-	$(am__set_b); \
-	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
-@am__EXEEXT_TRUE@.test$(EXEEXT).log:
-@am__EXEEXT_TRUE@	@p='$<'; \
-@am__EXEEXT_TRUE@	$(am__set_b); \
-@am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
-@am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
-@am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
-@am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	test -d "$(distdir)" || mkdir "$(distdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -755 \
-		-exec chmod u+rwx,go+rx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__post_remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__post_remove_distdir)
-
-dist-lzip: distdir
-	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__post_remove_distdir)
-dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__post_remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__post_remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__post_remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__post_remove_distdir)
-
-dist dist-all:
-	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
-	$(am__post_remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lz*) \
-	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
-	*.tar.xz*) \
-	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir)
-	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-	  && cd "$$am__cwd" \
-	  || exit 1
-	$(am__post_remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@test -n '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: trying to run $@ with an empty' \
-	       '$$(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	$(am__cd) '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) $(HEADERS) \
-		config.h
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pkgincludedir)" "$(DESTDIR)$(pkgincludedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
-	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
-	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-checkPROGRAMS clean-generic clean-libLTLIBRARIES \
-	clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-man install-nodist_pkgincludeHEADERS \
-	install-pkgconfigDATA install-pkgincludeHEADERS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binSCRIPTS install-libLTLIBRARIES
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man: install-man3 install-man5
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-binSCRIPTS uninstall-libLTLIBRARIES \
-	uninstall-man uninstall-nodist_pkgincludeHEADERS \
-	uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-uninstall-man: uninstall-man3 uninstall-man5
-
-.MAKE: all check-am install-am install-data-am install-exec-am \
-	install-strip uninstall-am
-
-.PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-TESTS \
-	check-am clean clean-checkPROGRAMS clean-cscope clean-generic \
-	clean-libLTLIBRARIES clean-libtool cscope cscopelist-am ctags \
-	ctags-am dist dist-all dist-bzip2 dist-gzip dist-hook \
-	dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \
-	distclean distclean-compile distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-binSCRIPTS install-data \
-	install-data-am install-data-hook install-dvi install-dvi-am \
-	install-exec install-exec-am install-exec-hook install-html \
-	install-html-am install-info install-info-am \
-	install-libLTLIBRARIES install-man install-man3 install-man5 \
-	install-nodist_pkgincludeHEADERS install-pdf install-pdf-am \
-	install-pkgconfigDATA install-pkgincludeHEADERS install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am recheck tags tags-am \
-	uninstall uninstall-am uninstall-binSCRIPTS uninstall-hook \
-	uninstall-libLTLIBRARIES uninstall-man uninstall-man3 \
-	uninstall-man5 uninstall-nodist_pkgincludeHEADERS \
-	uninstall-pkgconfigDATA uninstall-pkgincludeHEADERS
-
-
-$(PNGLIB_BASENAME).pc: libpng.pc
-	cp libpng.pc $@
-
-$(PNGLIB_BASENAME)-config: libpng-config
-	cp libpng-config $@
-
-scripts/sym.out scripts/vers.out: png.h pngconf.h pnglibconf.h
-scripts/prefix.out: png.h pngconf.h pnglibconf.out
-scripts/symbols.out: png.h pngconf.h $(srcdir)/scripts/pnglibconf.h.prebuilt
-scripts/intprefix.out: pnglibconf.h
-
-libpng.sym: scripts/sym.out
-	rm -f $@
-	cp $? $@
-libpng.vers: scripts/vers.out
-	rm -f $@
-	cp $? $@
-
-# Rename functions in scripts/prefix.out with a PNG_PREFIX prefix.
-# Rename macros in scripts/macro.lst from PNG_PREFIXpng_ to PNG_ (the actual
-# implementation of the macro).
-@DO_PNG_PREFIX_TRUE@pnglibconf.h: pnglibconf.out scripts/prefix.out scripts/macro.lst
-@DO_PNG_PREFIX_TRUE@	rm -f $@
-@DO_PNG_PREFIX_TRUE@	$(AWK) 's==0 && NR>1{print prev}\
-@DO_PNG_PREFIX_TRUE@	   s==0{prev=$$0}\
-@DO_PNG_PREFIX_TRUE@	   s==1{print "#define", $$1, "@PNG_PREFIX@" $$1}\
-@DO_PNG_PREFIX_TRUE@	   s==2{print "#define @PNG_PREFIX@png_" $$1, "PNG_" $$1}\
-@DO_PNG_PREFIX_TRUE@	   END{print prev}' s=0 pnglibconf.out s=1 scripts/prefix.out\
-@DO_PNG_PREFIX_TRUE@	   s=2 ${srcdir}/scripts/macro.lst >pnglibconf.tf8
-@DO_PNG_PREFIX_TRUE@	mv pnglibconf.tf8 $@
-
-@DO_PNG_PREFIX_TRUE@pngprefix.h: scripts/intprefix.out
-@DO_PNG_PREFIX_TRUE@	rm -f pngprefix.tf1
-@DO_PNG_PREFIX_TRUE@	$(AWK) '{print "#define", $$1, "@PNG_PREFIX@" $$1}' $? >pngprefix.tf1
-@DO_PNG_PREFIX_TRUE@	mv pngprefix.tf1 $@
-@DO_PNG_PREFIX_FALSE@pnglibconf.h: pnglibconf.out
-@DO_PNG_PREFIX_FALSE@	rm -f $@
-@DO_PNG_PREFIX_FALSE@	cp $? $@
-
-@DO_PNG_PREFIX_FALSE@pngprefix.h: # is empty
-@DO_PNG_PREFIX_FALSE@	:>$@
-
-$(srcdir)/scripts/pnglibconf.h.prebuilt:
-	@echo "Attempting to build $@" >&2
-	@echo "This is a machine generated file, but if you want to make" >&2
-	@echo "a new one simply make 'scripts/pnglibconf.out' and copy that" >&2
-	@exit 1
-
-# The following is necessary to ensure that the local pnglibconf.h is used, not
-# an installed one (this can happen immediately after on a clean system if
-# 'make test' is the first thing the user does.)
-contrib/libtests/pngstest.o contrib/libtests/pngvalid.o pngtest.o: pnglibconf.h
-contrib/libtests/pngunknown.o: pnglibconf.h
-
-.dfn.out:
-	rm -f $@ $*.c $*.tf[12]
-	test -d scripts || mkdir scripts || test -d scripts
-	echo '#include "$<"' >$*.c
-	$(DFNCPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)\
-	    $(CPPFLAGS) $(SYMBOL_CFLAGS) $*.c > $*.tf1
-	$(AWK) -f "${srcdir}/scripts/dfn.awk" out="$*.tf2" $*.tf1 1>&2
-	rm -f $*.c $*.tf1
-	mv $*.tf2 $@
-
-# The .dfn file for pnglibconf.h is machine generated
-pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h pngusr.dfa $(DFA_XTRA)
-	rm -f $@ $*.tf[45]
-	$(AWK) -f ${srcdir}/scripts/options.awk out=$*.tf4 version=search\
-	    ${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
-	    ${srcdir}/pngusr.dfa $(DFA_XTRA) 1>&2
-	$(AWK) -f ${srcdir}/scripts/options.awk out=$*.tf5 $*.tf4 1>&2
-	rm $*.tf4
-	mv $*.tf5 $@
-
-# Symbol checks (.def and .out files should match)
-scripts/symbols.chk: scripts/checksym.awk scripts/symbols.def scripts/symbols.out
-
-.out.chk:
-	rm -f $@ $*.new
-	$(AWK) -f ${srcdir}/scripts/checksym.awk ${srcdir}/scripts/${*F}.def\
-	    of="$*.new" $< >&2
-	mv $*.new $@
-
-# used on demand to regenerate the standard header, CPPFLAGS should
-# be empty - no non-standard defines
-scripts/pnglibconf.dfn: scripts/pnglibconf.dfa scripts/options.awk pngconf.h
-	rm -f $@ pnglibconf.tf[67]
-	test -z "$(CPPFLAGS)"
-	echo "com @PNGLIB_VERSION@ STANDARD API DEFINITION" |\
-	$(AWK) -f ${srcdir}/scripts/options.awk out=pnglibconf.tf6\
-	    logunsupported=1 version=search ${srcdir}/pngconf.h -\
-	    ${srcdir}/scripts/pnglibconf.dfa 1>&2
-	$(AWK) -f ${srcdir}/scripts/options.awk out=pnglibconf.tf7\
-	    pnglibconf.tf6 1>&2
-	rm pnglibconf.tf6
-	mv pnglibconf.tf7 $@
-
-$(libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_OBJECTS): png.h pngconf.h \
-	pnglibconf.h pngpriv.h pngdebug.h pnginfo.h pngstruct.h pngprefix.h
-
-test: check-am
-
-# Extra checks
-check: scripts/symbols.chk
-
-# Don't distribute the generated script files
-dist-hook:
-	cd '$(top_distdir)'; rm -f $(SCRIPT_CLEANFILES)
-
-# install the .../include headers as links to the new ones
-install-data-hook:
-	cd '$(DESTDIR)$(includedir)'; rm -f png.h pngconf.h pnglibconf.h
-	cd '$(DESTDIR)$(includedir)'; $(LN_S) $(PNGLIB_BASENAME)/png.h png.h
-	cd '$(DESTDIR)$(includedir)'; $(LN_S) $(PNGLIB_BASENAME)/pngconf.h \
-		pngconf.h
-	cd '$(DESTDIR)$(includedir)'; $(LN_S) $(PNGLIB_BASENAME)/pnglibconf.h \
-		pnglibconf.h
-	cd '$(DESTDIR)$(pkgconfigdir)'; rm -f libpng.pc
-	cd '$(DESTDIR)$(pkgconfigdir)'; $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
-
-# do evil things to libpng to cause libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ to be used
-install-exec-hook:
-	cd '$(DESTDIR)$(bindir)'; rm -f libpng-config
-	cd '$(DESTDIR)$(bindir)';\
-	   $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
-	@set -x;\
-	cd '$(DESTDIR)$(libdir)';\
-	for ext in a la so so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@\
-	   sl dylib dll.a; do\
-		rm -f libpng.$$ext;\
-                if test -f $(PNGLIB_BASENAME).$$ext; then\
-                       $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
-                fi;\
-	done
-
-uninstall-hook:
-	cd '$(DESTDIR)$(includedir)'; rm -f png.h pngconf.h pnglibconf.h
-	rm -f '$(DESTDIR)$(pkgconfigdir)/libpng.pc'
-	rm -f '$(DESTDIR)$(bindir)/libpng-config'
-	rm -f '$(DESTDIR)$(libdir)/libpng.a'
-	rm -f '$(DESTDIR)$(libdir)/libpng.la'
-	rm -f '$(DESTDIR)$(libdir)/libpng.so'
-	rm -f '$(DESTDIR)$(libdir)/libpng.so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@'
-	rm -f '$(DESTDIR)$(libdir)/libpng.sl'
-	rm -f '$(DESTDIR)$(libdir)/libpng.dylib'
-	rm -f '$(DESTDIR)$(libdir)/libpng.dll.a'
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/aclocal.m4 b/3rdparty/wxwidgets3.0-3.0.1/src/png/aclocal.m4
deleted file mode 100644
index eaa1ce9396..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/aclocal.m4
+++ /dev/null
@@ -1,1100 +0,0 @@
-# generated automatically by aclocal 1.13.3 -*- Autoconf -*-
-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
-[m4_warning([this file was generated for autoconf 2.69.
-You have another version of autoconf.  It may work, but is not guaranteed to.
-If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-# (This private macro should not be called outside this file.)
-AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.13'
-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
-dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.13.3], [],
-      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-])
-
-# _AM_AUTOCONF_VERSION(VERSION)
-# -----------------------------
-# aclocal traces this macro to find the Autoconf version.
-# This is a private macro too.  Using m4_define simplifies
-# the logic in aclocal, which can simply ignore this definition.
-m4_define([_AM_AUTOCONF_VERSION], [])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.13.3])dnl
-m4_ifndef([AC_AUTOCONF_VERSION],
-  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-
-# Figure out how to run the assembler.                      -*- Autoconf -*-
-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_AS
-# ----------
-AC_DEFUN([AM_PROG_AS],
-[# By default we simply use the C compiler to build assembly code.
-AC_REQUIRE([AC_PROG_CC])
-test "${CCAS+set}" = set || CCAS=$CC
-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
-AC_ARG_VAR([CCAS],      [assembler compiler command (defaults to CC)])
-AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
-_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
-])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
-# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is '.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ([2.52])dnl
- m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-
-# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
-      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
-      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
-      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
-      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                    [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  am__universal=false
-  m4_case([$1], [CC],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac],
-    [CXX],
-    [case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac])
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE([dependency-tracking], [dnl
-AS_HELP_STRING(
-  [--enable-dependency-tracking],
-  [do not reject slow dependency extractors])
-AS_HELP_STRING(
-  [--disable-dependency-tracking],
-  [speeds up one-time build])])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
-  # Older Autoconf quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.65])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[AC_DIAGNOSE([obsolete],
-             [$0: two- and three-arguments forms are deprecated.])
-m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(
-  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
-  [ok:ok],,
-  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
- AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-AM_MISSING_PROG([AUTOCONF], [autoconf])
-AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-AM_MISSING_PROG([AUTOHEADER], [autoheader])
-AM_MISSING_PROG([MAKEINFO], [makeinfo])
-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# 
-# 
-AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-			     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES([CC])],
-		  [m4_define([AC_PROG_CC],
-			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES([CXX])],
-		  [m4_define([AC_PROG_CXX],
-			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES([OBJC])],
-		  [m4_define([AC_PROG_OBJC],
-			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
-		  [_AM_DEPENDENCIES([OBJCXX])],
-		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
-])
-AC_REQUIRE([AM_SILENT_RULES])dnl
-dnl The testsuite driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
-dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
-AC_CONFIG_COMMANDS_PRE(dnl
-[m4_provide_if([_AM_COMPILER_EXEEXT],
-  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
-
-dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-dnl mangled by Autoconf and run in a shell conditional statement.
-m4_define([_AC_COMPILER_EXEEXT],
-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_arg=$1
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-AC_SUBST([install_sh])])
-
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MAINTAINER_MODE([DEFAULT-MODE])
-# ----------------------------------
-# Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless 'enable' is passed literally.
-# For symmetry, 'disable' may be passed as well.  Anyway, the user
-# can override the default with the --enable/--disable switch.
-AC_DEFUN([AM_MAINTAINER_MODE],
-[m4_case(m4_default([$1], [disable]),
-       [enable], [m4_define([am_maintainer_other], [disable])],
-       [disable], [m4_define([am_maintainer_other], [enable])],
-       [m4_define([am_maintainer_other], [enable])
-        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
-  AC_ARG_ENABLE([maintainer-mode],
-    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
-      am_maintainer_other[ make rules and dependencies not useful
-      (and sometimes confusing) to the casual installer])],
-    [USE_MAINTAINER_MODE=$enableval],
-    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST([MAINT])dnl
-]
-)
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it is modern enough.
-# If it is, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-AC_REQUIRE_AUX_FILE([missing])dnl
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
-else
-  am_missing_run=
-  AC_MSG_WARN(['missing' script is too old or missing])
-fi
-])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# --------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[[\\\"\#\$\&\'\`$am_lf]]*)
-    AC_MSG_ERROR([unsafe absolute working directory name]);;
-esac
-case $srcdir in
-  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
-esac
-
-# Do 'set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$[*]" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$[*]" != "X $srcdir/configure conftest.file" \
-	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment])
-     fi
-     if test "$[2]" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT([yes])
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-AC_CONFIG_COMMANDS_PRE(
-  [AC_MSG_CHECKING([that generated files are newer than configure])
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   AC_MSG_RESULT([done])])
-rm -f conftest.file
-])
-
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
-AS_HELP_STRING(
-  [--enable-silent-rules],
-  [less verbose build output (undo: "make V=1")])
-AS_HELP_STRING(
-  [--disable-silent-rules],
-  [verbose build output (undo: "make V=0")])dnl
-])
-case $enable_silent_rules in @%:@ (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
-dnl
-dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
-dnl do not support nested variable expansions.
-dnl See automake bug#9928 and bug#10237.
-am_make=${MAKE-make}
-AC_CACHE_CHECK([whether $am_make supports nested variables],
-   [am_cv_make_support_nested_variables],
-   [if AS_ECHO([['TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi])
-if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using '$V' instead of '$(V)' breaks IRIX make.
-  AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
-])
-
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor 'install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in "make install-strip", and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of 'v7', 'ustar', or 'pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-#
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AC_SUBST([AMTAR], ['$${TAR-tar}'])
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-
-m4_if([$1], [v7],
-  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-
-  [m4_case([$1],
-    [ustar],
-     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
-      # There is notably a 21 bits limit for the UID and the GID.  In fact,
-      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
-      # and bug#13588).
-      am_max_uid=2097151 # 2^21 - 1
-      am_max_gid=$am_max_uid
-      # The $UID and $GID variables are not portable, so we need to resort
-      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
-      # below are definitely unexpected, so allow the users to see them
-      # (that is, avoid stderr redirection).
-      am_uid=`id -u || echo unknown`
-      am_gid=`id -g || echo unknown`
-      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
-      if test $am_uid -le $am_max_uid; then
-         AC_MSG_RESULT([yes])
-      else
-         AC_MSG_RESULT([no])
-         _am_tools=none
-      fi
-      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
-      if test $am_gid -le $am_max_gid; then
-         AC_MSG_RESULT([yes])
-      else
-        AC_MSG_RESULT([no])
-        _am_tools=none
-      fi],
-
-  [pax],
-    [],
-
-  [m4_fatal([Unknown tar format])])
-
-  AC_MSG_CHECKING([how to create a $1 tar archive])
-
-  # Go ahead even if we have the value already cached.  We do so because we
-  # need to set the values for the 'am__tar' and 'am__untar' variables.
-  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
-
-  for _am_tool in $_am_tools; do
-    case $_am_tool in
-    gnutar)
-      for _am_tar in tar gnutar gtar; do
-        AM_RUN_LOG([$_am_tar --version]) && break
-      done
-      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-      am__untar="$_am_tar -xf -"
-      ;;
-    plaintar)
-      # Must skip GNU tar: if it does not support --format= it doesn't create
-      # ustar tarball either.
-      (tar --version) >/dev/null 2>&1 && continue
-      am__tar='tar chf - "$$tardir"'
-      am__tar_='tar chf - "$tardir"'
-      am__untar='tar xf -'
-      ;;
-    pax)
-      am__tar='pax -L -x $1 -w "$$tardir"'
-      am__tar_='pax -L -x $1 -w "$tardir"'
-      am__untar='pax -r'
-      ;;
-    cpio)
-      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-      am__untar='cpio -i -H $1 -d'
-      ;;
-    none)
-      am__tar=false
-      am__tar_=false
-      am__untar=false
-      ;;
-    esac
-
-    # If the value was cached, stop now.  We just wanted to have am__tar
-    # and am__untar set.
-    test -n "${am_cv_prog_tar_$1}" && break
-
-    # tar/untar a dummy directory, and stop if the command works.
-    rm -rf conftest.dir
-    mkdir conftest.dir
-    echo GrepMe > conftest.dir/file
-    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-    rm -rf conftest.dir
-    if test -s conftest.tar; then
-      AM_RUN_LOG([$am__untar /dev/null 2>&1 && break
-    fi
-  done
-  rm -rf conftest.dir
-
-  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
-m4_include([scripts/libtool.m4])
-m4_include([scripts/ltoptions.m4])
-m4_include([scripts/ltsugar.m4])
-m4_include([scripts/ltversion.m4])
-m4_include([scripts/lt~obsolete.m4])
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/arm/arm_init.c b/3rdparty/wxwidgets3.0-3.0.1/src/png/arm/arm_init.c
deleted file mode 100644
index 795dd49388..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/arm/arm_init.c
+++ /dev/null
@@ -1,219 +0,0 @@
-
-/* arm_init.c - NEON optimised filter functions
- *
- * Copyright (c) 2013 Glenn Randers-Pehrson
- * Written by Mans Rullgard, 2011.
- * Last changed in libpng 1.5.15 [March 28, 2013]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-/* Below, after checking __linux__, various non-C90 POSIX 1003.1 functions are
- * called.
- */
-#define _POSIX_SOURCE 1
-
-#include "../pngpriv.h"
-
-#ifdef PNG_ARM_NEON_SUPPORTED
-#ifdef PNG_ARM_NEON_CHECK_SUPPORTED /* Do run-time checks */
-#include  /* for sig_atomic_t */
-
-#ifdef __ANDROID__
-/* Linux provides access to information about CPU capabilites via
- * /proc/self/auxv, however Android blocks this while still claiming to be
- * Linux.  The Andoid NDK, however, provides appropriate support.
- *
- * Documentation: http://www.kandroid.org/ndk/docs/CPU-ARM-NEON.html
- */
-#include 
-
-static int
-png_have_neon(png_structp png_ptr)
-{
-   /* This is a whole lot easier than the mess below, however it is probably
-    * implemented as below, therefore it is better to cache the result (these
-    * function calls may be slow!)
-    */
-   PNG_UNUSED(png_ptr)
-   return android_getCpuFamily() == ANDROID_CPU_FAMILY_ARM &&
-      (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
-}
-#elif defined(__linux__)
-/* The generic __linux__ implementation requires reading /proc/self/auxv and
- * looking at each element for one that records NEON capabilities.
- */
-#include  /* for POSIX 1003.1 */
-#include   /* for EINTR */
-
-#include 
-#include 
-#include 
-#include 
-#include 
-
-/* A read call may be interrupted, in which case it returns -1 and sets errno to
- * EINTR if nothing was done, otherwise (if something was done) a partial read
- * may result.
- */
-static size_t
-safe_read(png_structp png_ptr, int fd, void *buffer_in, size_t nbytes)
-{
-   size_t ntotal = 0;
-   char *buffer = png_voidcast(char*, buffer_in);
-
-   while (nbytes > 0)
-   {
-      unsigned int nread;
-      int iread;
-
-      /* Passing nread > INT_MAX to read is implementation defined in POSIX
-       * 1003.1, therefore despite the unsigned argument portable code must
-       * limit the value to INT_MAX!
-       */
-      if (nbytes > INT_MAX)
-         nread = INT_MAX;
-
-      else
-         nread = (unsigned int)/*SAFE*/nbytes;
-
-      iread = read(fd, buffer, nread);
-
-      if (iread == -1)
-      {
-         /* This is the devil in the details, a read can terminate early with 0
-          * bytes read because of EINTR, yet it still returns -1 otherwise end
-          * of file cannot be distinguished.
-          */
-         if (errno != EINTR)
-         {
-            png_warning(png_ptr, "/proc read failed");
-            return 0; /* I.e. a permanent failure */
-         }
-      }
-
-      else if (iread < 0)
-      {
-         /* Not a valid 'read' result: */
-         png_warning(png_ptr, "OS /proc read bug");
-         return 0;
-      }
-
-      else if (iread > 0)
-      {
-         /* Continue reading until a permanent failure, or EOF */
-         buffer += iread;
-         nbytes -= (unsigned int)/*SAFE*/iread;
-         ntotal += (unsigned int)/*SAFE*/iread;
-      }
-
-      else
-         return ntotal;
-   }
-
-   return ntotal; /* nbytes == 0 */
-}
-
-static int
-png_have_neon(png_structp png_ptr)
-{
-   int fd = open("/proc/self/auxv", O_RDONLY);
-   Elf32_auxv_t aux;
-
-   /* Failsafe: failure to open means no NEON */
-   if (fd == -1)
-   {
-      png_warning(png_ptr, "/proc/self/auxv open failed");
-      return 0;
-   }
-
-   while (safe_read(png_ptr, fd, &aux, sizeof aux) == sizeof aux)
-   {
-      if (aux.a_type == AT_HWCAP && (aux.a_un.a_val & HWCAP_NEON) != 0)
-      {
-         close(fd);
-         return 1;
-      }
-   }
-
-   close(fd);
-   return 0;
-}
-#else
-   /* We don't know how to do a run-time check on this system */
-#  error "no support for run-time ARM NEON checks"
-#endif /* OS checks */
-#endif /* PNG_ARM_NEON_CHECK_SUPPORTED */
-
-#ifndef PNG_ALIGNED_MEMORY_SUPPORTED
-#  error "ALIGNED_MEMORY is required; set: -DPNG_ALIGNED_MEMORY_SUPPORTED"
-#endif
-
-void
-png_init_filter_functions_neon(png_structp pp, unsigned int bpp)
-{
-#ifdef PNG_ARM_NEON_API_SUPPORTED
-   switch ((pp->options >> PNG_ARM_NEON) & 3)
-   {
-      case PNG_OPTION_UNSET:
-         /* Allow the run-time check to execute if it has been enabled -
-          * thus both API and CHECK can be turned on.  If it isn't supported
-          * this case will fall through to the 'default' below, which just
-          * returns.
-          */
-#endif /* PNG_ARM_NEON_API_SUPPORTED */
-#ifdef PNG_ARM_NEON_CHECK_SUPPORTED
-         {
-            static volatile sig_atomic_t no_neon = -1; /* not checked */
-
-            if (no_neon < 0)
-               no_neon = !png_have_neon(pp);
-
-            if (no_neon)
-               return;
-         }
-#ifdef PNG_ARM_NEON_API_SUPPORTED
-         break;
-#endif
-#endif /* PNG_ARM_NEON_CHECK_SUPPORTED */
-#ifdef PNG_ARM_NEON_API_SUPPORTED
-      case PNG_OPTION_ON:
-         /* Option turned on */
-         break;
-
-      default: /* OFF or INVALID */
-         return;
-   }
-#endif
-
-   /* IMPORTANT: any new external functions used here must be declared using
-    * PNG_INTERNAL_FUNCTION in ../pngpriv.h.  This is required so that the
-    * 'prefix' option to configure works:
-    *
-    *    ./configure --with-libpng-prefix=foobar_
-    *
-    * Verify you have got this right by running the above command, doing a build
-    * and examining pngprefix.h; it must contain a #define for every external
-    * function you add.  (Notice that this happens automatically for the
-    * initialization function.)
-    */
-   pp->read_filter[PNG_FILTER_VALUE_UP-1] = png_read_filter_row_up_neon;
-
-   if (bpp == 3)
-   {
-      pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub3_neon;
-      pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg3_neon;
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
-         png_read_filter_row_paeth3_neon;
-   }
-
-   else if (bpp == 4)
-   {
-      pp->read_filter[PNG_FILTER_VALUE_SUB-1] = png_read_filter_row_sub4_neon;
-      pp->read_filter[PNG_FILTER_VALUE_AVG-1] = png_read_filter_row_avg4_neon;
-      pp->read_filter[PNG_FILTER_VALUE_PAETH-1] =
-          png_read_filter_row_paeth4_neon;
-   }
-}
-#endif /* FILTER_OPTIMIZATIONS && __arm__ && __ARM_NEON__ */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/arm/filter_neon.S b/3rdparty/wxwidgets3.0-3.0.1/src/png/arm/filter_neon.S
deleted file mode 100644
index 72420a9e34..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/arm/filter_neon.S
+++ /dev/null
@@ -1,235 +0,0 @@
-
-/* filter_neon.S - NEON optimised filter functions
- *
- * Copyright (c) 2011 Glenn Randers-Pehrson
- * Written by Mans Rullgard, 2011.
- * Last changed in libpng 1.5.7 [December 15, 2011]
- *
- * This code is released under the libpng license.
- * For conditions of distribution and use, see the disclaimer
- * and license in png.h
- */
-
-/* This is required to get the symbol renames, which are #defines, and also
- * includes the value of PNG_FILTER_OPTIMIZATIONS.
- */
-#define PNG_VERSION_INFO_ONLY
-#include "../pngpriv.h"
-
-#if defined(PNG_FILTER_OPTIMIZATIONS) && defined(__arm__) && \
-   defined(__ARM_NEON__)
-#if defined(__linux__) && defined(__ELF__)
-.section .note.GNU-stack,"",%progbits /* mark stack as non-executable */
-#endif
-
-#ifdef __ELF__
-#   define ELF
-#else
-#   define ELF @
-#endif
-
-        .arch armv7-a
-        .fpu  neon
-
-.macro  func    name, export=0
-    .macro endfunc
-ELF     .size   \name, . - \name
-        .endfunc
-        .purgem endfunc
-    .endm
-        .text
-    .if \export
-        .global \name
-    .endif
-ELF     .type   \name, STT_FUNC
-        .func   \name
-\name:
-.endm
-
-func    png_read_filter_row_sub4_neon, export=1
-        ldr             r3,  [r0, #4]           @ rowbytes
-        vmov.i8         d3,  #0
-1:
-        vld4.32         {d4[],d5[],d6[],d7[]},    [r1,:128]
-        vadd.u8         d0,  d3,  d4
-        vadd.u8         d1,  d0,  d5
-        vadd.u8         d2,  d1,  d6
-        vadd.u8         d3,  d2,  d7
-        vst4.32         {d0[0],d1[0],d2[0],d3[0]},[r1,:128]!
-        subs            r3,  r3,  #16
-        bgt             1b
-
-        bx              lr
-endfunc
-
-func    png_read_filter_row_sub3_neon, export=1
-        ldr             r3,  [r0, #4]           @ rowbytes
-        vmov.i8         d3,  #0
-        mov             r0,  r1
-        mov             r2,  #3
-        mov             r12, #12
-        vld1.8          {q11},    [r0], r12
-1:
-        vext.8          d5,  d22, d23, #3
-        vadd.u8         d0,  d3,  d22
-        vext.8          d6,  d22, d23, #6
-        vadd.u8         d1,  d0,  d5
-        vext.8          d7,  d23, d23, #1
-        vld1.8          {q11},    [r0], r12
-        vst1.32         {d0[0]},  [r1,:32], r2
-        vadd.u8         d2,  d1,  d6
-        vst1.32         {d1[0]},  [r1], r2
-        vadd.u8         d3,  d2,  d7
-        vst1.32         {d2[0]},  [r1], r2
-        vst1.32         {d3[0]},  [r1], r2
-        subs            r3,  r3,  #12
-        bgt             1b
-
-        bx              lr
-endfunc
-
-func    png_read_filter_row_up_neon, export=1
-        ldr             r3,  [r0, #4]           @ rowbytes
-1:
-        vld1.8          {q0}, [r1,:128]
-        vld1.8          {q1}, [r2,:128]!
-        vadd.u8         q0,  q0,  q1
-        vst1.8          {q0}, [r1,:128]!
-        subs            r3,  r3,  #16
-        bgt             1b
-
-        bx              lr
-endfunc
-
-func    png_read_filter_row_avg4_neon, export=1
-        ldr             r12, [r0, #4]           @ rowbytes
-        vmov.i8         d3,  #0
-1:
-        vld4.32         {d4[],d5[],d6[],d7[]},    [r1,:128]
-        vld4.32         {d16[],d17[],d18[],d19[]},[r2,:128]!
-        vhadd.u8        d0,  d3,  d16
-        vadd.u8         d0,  d0,  d4
-        vhadd.u8        d1,  d0,  d17
-        vadd.u8         d1,  d1,  d5
-        vhadd.u8        d2,  d1,  d18
-        vadd.u8         d2,  d2,  d6
-        vhadd.u8        d3,  d2,  d19
-        vadd.u8         d3,  d3,  d7
-        vst4.32         {d0[0],d1[0],d2[0],d3[0]},[r1,:128]!
-        subs            r12, r12, #16
-        bgt             1b
-
-        bx              lr
-endfunc
-
-func    png_read_filter_row_avg3_neon, export=1
-        push            {r4,lr}
-        ldr             r12, [r0, #4]           @ rowbytes
-        vmov.i8         d3,  #0
-        mov             r0,  r1
-        mov             r4,  #3
-        mov             lr,  #12
-        vld1.8          {q11},    [r0], lr
-1:
-        vld1.8          {q10},    [r2], lr
-        vext.8          d5,  d22, d23, #3
-        vhadd.u8        d0,  d3,  d20
-        vext.8          d17, d20, d21, #3
-        vadd.u8         d0,  d0,  d22
-        vext.8          d6,  d22, d23, #6
-        vhadd.u8        d1,  d0,  d17
-        vext.8          d18, d20, d21, #6
-        vadd.u8         d1,  d1,  d5
-        vext.8          d7,  d23, d23, #1
-        vld1.8          {q11},    [r0], lr
-        vst1.32         {d0[0]},  [r1,:32], r4
-        vhadd.u8        d2,  d1,  d18
-        vst1.32         {d1[0]},  [r1], r4
-        vext.8          d19, d21, d21, #1
-        vadd.u8         d2,  d2,  d6
-        vhadd.u8        d3,  d2,  d19
-        vst1.32         {d2[0]},  [r1], r4
-        vadd.u8         d3,  d3,  d7
-        vst1.32         {d3[0]},  [r1], r4
-        subs            r12, r12, #12
-        bgt             1b
-
-        pop             {r4,pc}
-endfunc
-
-.macro  paeth           rx,  ra,  rb,  rc
-        vaddl.u8        q12, \ra, \rb           @ a + b
-        vaddl.u8        q15, \rc, \rc           @ 2*c
-        vabdl.u8        q13, \rb, \rc           @ pa
-        vabdl.u8        q14, \ra, \rc           @ pb
-        vabd.u16        q15, q12, q15           @ pc
-        vcle.u16        q12, q13, q14           @ pa <= pb
-        vcle.u16        q13, q13, q15           @ pa <= pc
-        vcle.u16        q14, q14, q15           @ pb <= pc
-        vand            q12, q12, q13           @ pa <= pb && pa <= pc
-        vmovn.u16       d28, q14
-        vmovn.u16       \rx, q12
-        vbsl            d28, \rb, \rc
-        vbsl            \rx, \ra, d28
-.endm
-
-func    png_read_filter_row_paeth4_neon, export=1
-        ldr             r12, [r0, #4]           @ rowbytes
-        vmov.i8         d3,  #0
-        vmov.i8         d20, #0
-1:
-        vld4.32         {d4[],d5[],d6[],d7[]},    [r1,:128]
-        vld4.32         {d16[],d17[],d18[],d19[]},[r2,:128]!
-        paeth           d0,  d3,  d16, d20
-        vadd.u8         d0,  d0,  d4
-        paeth           d1,  d0,  d17, d16
-        vadd.u8         d1,  d1,  d5
-        paeth           d2,  d1,  d18, d17
-        vadd.u8         d2,  d2,  d6
-        paeth           d3,  d2,  d19, d18
-        vmov            d20, d19
-        vadd.u8         d3,  d3,  d7
-        vst4.32         {d0[0],d1[0],d2[0],d3[0]},[r1,:128]!
-        subs            r12, r12, #16
-        bgt             1b
-
-        bx              lr
-endfunc
-
-func    png_read_filter_row_paeth3_neon, export=1
-        push            {r4,lr}
-        ldr             r12, [r0, #4]           @ rowbytes
-        vmov.i8         d3,  #0
-        vmov.i8         d4,  #0
-        mov             r0,  r1
-        mov             r4,  #3
-        mov             lr,  #12
-        vld1.8          {q11},    [r0], lr
-1:
-        vld1.8          {q10},    [r2], lr
-        paeth           d0,  d3,  d20, d4
-        vext.8          d5,  d22, d23, #3
-        vadd.u8         d0,  d0,  d22
-        vext.8          d17, d20, d21, #3
-        paeth           d1,  d0,  d17, d20
-        vst1.32         {d0[0]},  [r1,:32], r4
-        vext.8          d6,  d22, d23, #6
-        vadd.u8         d1,  d1,  d5
-        vext.8          d18, d20, d21, #6
-        paeth           d2,  d1,  d18, d17
-        vext.8          d7,  d23, d23, #1
-        vld1.8          {q11},    [r0], lr
-        vst1.32         {d1[0]},  [r1], r4
-        vadd.u8         d2,  d2,  d6
-        vext.8          d19, d21, d21, #1
-        paeth           d3,  d2,  d19, d18
-        vst1.32         {d2[0]},  [r1], r4
-        vmov            d4,  d19
-        vadd.u8         d3,  d3,  d7
-        vst1.32         {d3[0]},  [r1], r4
-        subs            r12, r12, #12
-        bgt             1b
-
-        pop             {r4,pc}
-endfunc
-#endif /* FILTER_OPTIMIZATIONS && __arm__ && __ARM_NEON__ */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/autogen.sh b/3rdparty/wxwidgets3.0-3.0.1/src/png/autogen.sh
deleted file mode 100755
index decf0f56f8..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/autogen.sh
+++ /dev/null
@@ -1,219 +0,0 @@
-#! /bin/sh
-#
-# Run 'autoreconf' to build 'configure', 'Makefile.in' and other configure
-# control files.
-#
-# The first time this is run on a GIT checkout the only files that exist are
-# configure.ac and Makefile.am; all of the autotools support scripts are
-# missing.  They are instantiated with autoreconf --force --install.
-#
-# For regular ("tarball") distributions all the files should exist.  We do not
-# want them to be updated *under any circumstances*.  It should never be
-# necessary to rune autogen.sh because ./configure --enable-maintainer-mode says
-# what to do if Makeile.am or configure.ac are changed.
-#
-# It is *probably* OK to update the files on a GIT checkout, because they have
-# come from the local tools, but leave that to the user who is assumed to know
-# whether it is ok or required.
-#
-# This script is intended to work without arguments, there are, however, hidden
-# arguments for (a) use while testing the script and (b) to fix up systems that
-# have been broken.  If (b) is required the script prompts for the correct
-# options.  For this reason the options are *NOT* documented in the help; this
-# is deliberate; UTSL.
-#
-clean=
-maintainer=
-while test $# -gt 0
-do
-   case "$1" in
-      --maintainer)
-         maintainer=1;;
-
-      --clean)
-         clean=1;;
-
-      *)
-         exec >&2
-         echo "$0: usage: ./autogen.sh"
-         if test -d .git
-         then
-            echo "  ./autogen.sh generates the configure script and"
-            echo "  Makefile.in, or refreshes them after changes to Makefile.am"
-            echo "  or configure.ac.  You may prefer to just run autoreconf."
-         elif test -z "$maintainer"
-         then
-            echo "  DO NOT RUN THIS SCRIPT."
-            echo "  If you need to change Makefile.am or configure.ac then you"
-            echo "  also need to run ./configure --enable-maintainer-mode and"
-            echo "  use the appropriate autotools, *NOT* this script, to update"
-            echo "  everything, please check the documentation of autoreconf."
-            echo "  WARNING: libpng is intentionally generated with a known,"
-            echo "  fixed, set of autotools.  It is known *NOT* to work with"
-            echo "  the collection of autotools distributed on highly reputable"
-            echo "  operating systems."
-            echo "  Remember: autotools is GNU software, you are expected to"
-            echo "  pay for support."
-         else
-            echo "  You have run autogen.sh with --maintainer enabled and you"
-            echo "  are not using a GIT distribution, then you have given an"
-            echo "  unrecognized argument.  This is not good. --maintainer"
-            echo "  switches off any assumptions that you might not know what"
-            echo "  you are doing."
-         fi
-         exit 1;;
-   esac
-
-   shift
-done
-#
-# First check for a set of the autotools files; if absent then this is assumed
-# to be a GIT version and the local autotools must be used.  If present this
-# is a tarball distribution and the script should not be used.  If partially
-# present bad things are happening.
-#
-# The autotools generated files:
-libpng_autotools_files="Makefile.in aclocal.m4 config.guess config.h.in\
-   config.sub configure depcomp install-sh ltmain.sh missing test-driver"
-#
-# These are separate because 'maintainer-clean' does not remove them.
-libpng_libtool_files="scripts/libtool.m4 scripts/ltoptions.m4\
-   scripts/ltsugar.m4 scripts/ltversion.m4 scripts/lt~obsolete.m4"
-
-libpng_autotools_dirs="autom4te.cache" # not required
-#
-# The configure generated files:
-libpng_configure_files="Makefile config.h config.log config.status\
-   libpng-config libpng.pc libtool stamp-h1"
-
-libpng_configure_dirs=".deps"
-#
-# We must remove the configure generated files as well as the autotools
-# generated files if autotools are regenerated because otherwise if configure
-# has been run without "--enable-maintainer-mode" make can do a partial update
-# of Makefile.  These functions do the two bits of cleaning.
-clean_autotools(){
-   rm -rf $libpng_autotools_files $libpng_libtool_files $libpng_autotools_dirs
-}
-
-clean_configure(){
-   rm -rf $libpng_configure_files $libpng_configure_dirs
-}
-#
-# Clean: remove everything (this is to help with testing)
-if test -n "$clean"
-then
-   clean_configure
-   if test -n "$maintainer"
-   then
-      clean_autotools
-   fi
-
-   exit 0
-fi
-#
-# Validate the distribution.
-libpng_autotools_file_found=
-libpng_autotools_file_missing=
-for file in $libpng_autotools_files
-do
-   if test -f  "$file"
-   then
-      libpng_autotools_file_found=1
-   else
-      libpng_autotools_file_missing=1
-   fi
-done
-#
-# Presence of one of these does not *invalidate* missing, but absence
-# invalidates found.
-for file in $libpng_libtool_files
-do
-   if test ! -f "$file"
-   then
-      libpng_autotools_file_missing=1
-   fi
-done
-#
-# The cache directory doesn't matter - it will be regenerated and does not exist
-# anyway in a tarball.
-#
-# Either everything is missing or everything is there, the --maintainer option
-# just changes this so that the mode is set to generate all the files.
-mode=
-if test -z "$libpng_autotools_file_found" -o -n "$maintainer"
-then
-   mode="autoreconf"
-else
-   if test -n "$libpng_autotools_file_missing"
-   then
-      mode="broken"
-   else
-      mode="configure"
-   fi
-fi
-#
-# So:
-case "$mode" in
-   autoreconf)
-      # Clean in case configure files exist
-      clean_configure
-      clean_autotools
-      # Everything must be initialized, so use --force
-      if autoreconf --warnings=all --force --install
-      then
-         missing=
-         for file in $libpng_autotools_files
-         do
-            test -f "$file" || missing=1
-         done
-         # ignore the cache directory
-         test -z "$missing" || {
-            exec >&2
-            echo "autoreconf was run, but did not produce all the expected"
-            echo "files.  It is likely that your autotools installation is"
-            echo "not compatible with that expected by libpng."
-            exit 1
-         }
-      else
-         exec >&2
-         echo "autoreconf failed: your version of autotools is incompatible"
-         echo "with this libpng version.  Please use a distributed archive"
-         echo "(which includes the autotools generated files) and run configure"
-         echo "instead."
-         exit 1
-      fi;;
-
-   configure)
-      if test -d .git
-      then
-         exec >&2
-         echo "ERROR: running autoreconf on an initialized sytem"
-         echo "  This is not necessary; it is only necessary to remake the"
-         echo "  autotools generated files if Makefile.am or configure.ac"
-         echo "  change and make does the right thing with:"
-         echo
-         echo "     ./configure --enable-maintainer-mode."
-         echo
-         echo "  You can run autoreconf yourself if you don't like maintainer"
-         echo "  mode and you can also just run autoreconf -f -i to initialize"
-         echo "  everything in the first place; this script is only for"
-         echo "  compatiblity with prior releases."
-         exit 1
-      else
-         exec >&2
-         echo "autogen.sh is intended only to generate 'configure' on systems"
-         echo "that do not have it.  You have a complete 'configure', if you"
-         echo "need to change Makefile.am or configure.ac you also need to"
-         echo "run configure with the --enable-maintainer-mode option."
-         exit 1
-      fi;;
-
-   broken)
-      exec >&2
-      echo "Your system has a partial set of autotools generated files."
-      echo "autogen.sh is unable to proceed.  The full set of files is"
-      echo "contained in the libpng 'tar' distribution archive and you do"
-      echo "not need to run autogen.sh if you use it."
-      exit 1;;
-esac
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/config.guess b/3rdparty/wxwidgets3.0-3.0.1/src/png/config.guess
deleted file mode 100755
index 120cc0d239..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/config.guess
+++ /dev/null
@@ -1,1552 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
-
-timestamp='2013-05-16'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see .
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-#
-# Originally written by Per Bothner.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-#
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
-
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to ."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-case "${UNAME_SYSTEM}" in
-Linux|GNU|GNU/*)
-	# If the system lacks a compiler, then just pick glibc.
-	# We could probably try harder.
-	LIBC=gnu
-
-	eval $set_cc_for_build
-	cat <<-EOF > $dummy.c
-	#include 
-	#if defined(__UCLIBC__)
-	LIBC=uclibc
-	#elif defined(__dietlibc__)
-	LIBC=dietlibc
-	#else
-	LIBC=gnu
-	#endif
-	EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	;;
-esac
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-		os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:Bitrig:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm*:riscos:*:*|arm*:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH="x86_64"
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include   /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
-	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include 
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[4567])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-			esac ;;
-		    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
-
-		#define _HPUX_SOURCE
-		#include 
-		#include 
-
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
-
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include 
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW64*:*)
-	echo ${UNAME_MACHINE}-pc-mingw64
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:*)
-	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    aarch64_be:Linux:*:*)
-	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arc:Linux:*:* | arceb:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
-	    else
-		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
-	    fi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
-    crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
-	exit ;;
-    frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    i*86:Linux:*:*)
-	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
-	;;
-    or1k:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-${LIBC}
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
-	exit ;;
-    sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
-	exit ;;
-    x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
-	exit ;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says 
-	echo i586-unisys-sysv4
-	exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes .
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
-	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-	exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    x86_64:Haiku:*:*)
-	echo x86_64-unknown-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	eval $set_cc_for_build
-	if test "$UNAME_PROCESSOR" = unknown ; then
-	    UNAME_PROCESSOR=powerpc
-	fi
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		case $UNAME_PROCESSOR in
-		    i386) UNAME_PROCESSOR=x86_64 ;;
-		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
-		esac
-	    fi
-	fi
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSE-*:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-    x86_64:VMkernel:*:*)
-	echo ${UNAME_MACHINE}-unknown-esx
-	exit ;;
-esac
-
-eval $set_cc_for_build
-cat >$dummy.c <
-# include 
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include 
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include 
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 < in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/config.h.in b/3rdparty/wxwidgets3.0-3.0.1/src/png/config.h.in
deleted file mode 100644
index 713869b39b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/config.h.in
+++ /dev/null
@@ -1,112 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the  header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the `feenableexcept' function. */
-#undef HAVE_FEENABLEEXCEPT
-
-/* Define to 1 if you have the  header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `m' library (-lm). */
-#undef HAVE_LIBM
-
-/* Define to 1 if you have the `z' library (-lz). */
-#undef HAVE_LIBZ
-
-/* Define to 1 if you have the  header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `memset' function. */
-#undef HAVE_MEMSET
-
-/* Define to 1 if you have the `pow' function. */
-#undef HAVE_POW
-
-/* Define to 1 if you have the  header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the  header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the  header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the  header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the  header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the  header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the  header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Turn on ARM Neon optimizations at run-time */
-#undef PNG_ARM_NEON_API_SUPPORTED
-
-/* Check for ARM Neon support at run-time */
-#undef PNG_ARM_NEON_CHECK_SUPPORTED
-
-/* Enable ARM Neon optimizations */
-#undef PNG_ARM_NEON_SUPPORTED
-
-/* Disable ARM Neon optimizations */
-#undef PNG_NO_ARM_NEON
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if your  declares `struct tm'. */
-#undef TM_IN_SYS_TIME
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to the equivalent of the C99 'restrict' keyword, or to
-   nothing if this is not supported.  Do not define if restrict is
-   supported directly.  */
-#undef restrict
-/* Work around a bug in Sun C++: it does not support _Restrict or
-   __restrict__, even though the corresponding Sun C compiler ends up with
-   "#define restrict _Restrict" or "#define restrict __restrict__" in the
-   previous line.  Perhaps some future version of Sun C++ will work with
-   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
-#if defined __SUNPRO_CC && !defined __RESTRICT
-# define _Restrict
-# define __restrict__
-#endif
-
-/* Define to `unsigned int' if  does not define. */
-#undef size_t
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/config.sub b/3rdparty/wxwidgets3.0-3.0.1/src/png/config.sub
deleted file mode 100755
index 8b612ab89d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/config.sub
+++ /dev/null
@@ -1,1788 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
-
-timestamp='2013-04-24'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, see .
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that
-# program.  This Exception is an additional permission under section 7
-# of the GNU General Public License, version 3 ("GPLv3").
-
-
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to ."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright 1992-2013 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  android-linux)
-    os=-linux-android
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze*)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*178)
-		os=-lynxos178
-		;;
-	-lynx*5)
-		os=-lynxos5
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| aarch64 | aarch64_be \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arceb \
-	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
-	| avr | avr32 \
-	| be32 | be64 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipsr5900 | mipsr5900el \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 | nios2eb | nios2el \
-	| ns16k | ns32k \
-	| open8 \
-	| or1k | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pyramid \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-	xgate)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	xscaleeb)
-		basic_machine=armeb-unknown
-		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| aarch64-* | aarch64_be-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-	| microblaze-* | microblazeel-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipsr5900-* | mipsr5900el-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* | nios2eb-* | nios2el-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pyramid-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze*)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw64)
-		basic_machine=x86_64-pc
-		os=-mingw64
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i386-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
-		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos | rdos64)
-		basic_machine=x86_64-pc
-		os=-rdos
-		;;
-	rdos32)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
-		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* | -plan9* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-	-nacl*)
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	score-*)
-		os=-elf
-		;;
-	spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
-	hexagon-*)
-		os=-elf
-		;;
-	tic54x-*)
-		os=-coff
-		;;
-	tic55x-*)
-		os=-coff
-		;;
-	tic6x-*)
-		os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or1k-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-cnk*|-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/configure b/3rdparty/wxwidgets3.0-3.0.1/src/png/configure
deleted file mode 100755
index 67cc967eae..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/configure
+++ /dev/null
@@ -1,15188 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libpng 1.6.2.
-#
-# Report bugs to .
-#
-#
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-# Use a proper internal environment variable to ensure we don't fall
-  # into an infinite loop, continuously re-executing ourselves.
-  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
-    _as_can_reexec=no; export _as_can_reexec;
-    # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
-  fi
-  # We don't want this to propagate to other subprocesses.
-          { _as_can_reexec=; unset _as_can_reexec;}
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1
-test -x / || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1
-
-  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
-      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  export CONFIG_SHELL
-             # We cannot yet assume a decent shell, so we have to provide a
-# neutralization value for shells without unset; and this also
-# works around shells that cannot unset nonexistent variables.
-# Preserve -v and -x to the replacement shell.
-BASH_ENV=/dev/null
-ENV=/dev/null
-(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-case $- in # ((((
-  *v*x* | *x*v* ) as_opts=-vx ;;
-  *v* ) as_opts=-v ;;
-  *x* ) as_opts=-x ;;
-  * ) as_opts= ;;
-esac
-exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
-# Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: png-mng-implement@lists.sourceforge.net about your
-$0: system, including any error possibly output before this
-$0: message. Then install a modern shell, or manually run
-$0: the script under such a shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
-  # already done that, so ensure we don't try to do so again and fall
-  # in an infinite loop.  This has already happened in practice.
-  _as_can_reexec=no; export _as_can_reexec
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-
-test -n "$DJDIR" || exec 7<&0 &1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME='libpng'
-PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.6.2'
-PACKAGE_STRING='libpng 1.6.2'
-PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
-PACKAGE_URL=''
-
-ac_unique_file="pngget.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include 
-#ifdef HAVE_SYS_TYPES_H
-# include 
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include 
-#endif
-#ifdef STDC_HEADERS
-# include 
-# include 
-#else
-# ifdef HAVE_STDLIB_H
-#  include 
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include 
-# endif
-# include 
-#endif
-#ifdef HAVE_STRINGS_H
-# include 
-#endif
-#ifdef HAVE_INTTYPES_H
-# include 
-#endif
-#ifdef HAVE_STDINT_H
-# include 
-#endif
-#ifdef HAVE_UNISTD_H
-# include 
-#endif"
-
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-PNG_ARM_NEON_FALSE
-PNG_ARM_NEON_TRUE
-DO_PNG_PREFIX_FALSE
-DO_PNG_PREFIX_TRUE
-PNG_PREFIX
-binconfigs
-pkgconfigdir
-PNGLIB_RELEASE
-PNGLIB_MINOR
-PNGLIB_MAJOR
-PNGLIB_VERSION
-SYMBOL_PREFIX
-HAVE_LD_VERSION_SCRIPT_FALSE
-HAVE_LD_VERSION_SCRIPT_TRUE
-HAVE_SOLARIS_LD_FALSE
-HAVE_SOLARIS_LD_TRUE
-LIBOBJS
-POW_LIB
-PNG_COPTS
-DFNCPP
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-MANIFEST_TOOL
-RANLIB
-ac_ct_AR
-AR
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LIBTOOL
-OBJDUMP
-DLLTOOL
-AS
-LN_S
-CPP
-LD
-FGREP
-EGREP
-GREP
-SED
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-am__fastdepCCAS_FALSE
-am__fastdepCCAS_TRUE
-CCASDEPMODE
-CCASFLAGS
-CCAS
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-am__nodep
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_silent_rules
-enable_maintainer_mode
-enable_dependency_tracking
-with_gnu_ld
-enable_shared
-enable_static
-with_pic
-enable_fast_install
-with_sysroot
-enable_libtool_lock
-enable_werror
-with_zlib_prefix
-with_pkgconfigdir
-with_binconfigs
-with_libpng_prefix
-enable_arm_neon
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CCAS
-CCASFLAGS
-CPP
-PNG_COPTS'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures libpng 1.6.2 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/libpng]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of libpng 1.6.2:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-silent-rules   less verbose build output (undo: "make V=1")
-  --disable-silent-rules  verbose build output (undo: "make V=0")
-  --enable-maintainer-mode
-                          enable make rules and dependencies not useful (and
-                          sometimes confusing) to the casual installer
-  --enable-dependency-tracking
-                          do not reject slow dependency extractors
-  --disable-dependency-tracking
-                          speeds up one-time build
-  --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-static[=PKGS]  build static libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-werror[=OPT] Pass -Werror or the given argument to the compiler
-                          if it is supported
-  --enable-arm-neon     Enable ARM NEON optimizations: =off, check, api, on:
-                          off: disable the optimizations; check: use internal
-                          checking code (deprecated and poorly supported);
-                          api: disable by default, enable by a call to
-                          png_set_option; on: turn on unconditionally. The
-                          default is 'on' if __ARM_NEON__ is defined,
-                          otherwise 'off'.
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-sysroot=DIR Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).
-  --with-zlib-prefix    prefix that may have been used in installed zlib
-  --with-pkgconfigdir   Use the specified pkgconfig dir (default is
-                          libdir/pkgconfig)
-  --with-binconfigs     Generate shell libpng-config scripts as well as
-                          pkg-config data [default=yes]
-  --with-libpng-prefix  prefix libpng exported function (API) names with the
-                          given value
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L if you have libraries in a
-              nonstandard directory 
-  LIBS        libraries to pass to the linker, e.g. -l
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I if
-              you have headers in a nonstandard directory 
-  CCAS        assembler compiler command (defaults to CC)
-  CCASFLAGS   assembler compiler flags (defaults to CFLAGS)
-  CPP         C preprocessor
-  PNG_COPTS   additional flags for the C compiler, use this for options that
-              would cause configure itself to fail
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to .
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-libpng configure 1.6.2
-generated by GNU Autoconf 2.69
-
-Copyright (C) 2012 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case  declares $2.
-   For example, HP-UX 11i  declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer  to  if __STDC__ is defined, since
-     exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include 
-#else
-# include 
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
-# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
-# -------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_c_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_type
-cat >config.log <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by libpng $as_me 1.6.2, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-# libpng does not follow GNU file name conventions (hence 'foreign')
-# color-tests requires automake 1.11 or later
-# silent-rules requires automake 1.11 or later
-# dist-xz requires automake 1.11 or later
-# 1.12.2 fixes a security issue in 1.11.2 and 1.12.1
-# 1.13 is required for parallel tests
-am__api_version='1.13'
-
-ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
-esac
-
-# Do 'set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-     if test "$*" = "X"; then
-	# -L didn't work.
-	set X `ls -t "$srcdir/configure" conftest.file`
-     fi
-     if test "$*" != "X $srcdir/configure conftest.file" \
-	&& test "$*" != "X conftest.file $srcdir/configure"; then
-
-	# If neither matched, then we have a broken ls.  This can happen
-	# if, for instance, CONFIG_SHELL is bash and it inherits a
-	# broken ls alias from the environment.  This has actually
-	# happened.  Such a system could not be considered "sane".
-	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-  alias in your environment" "$LINENO" 5
-     fi
-     if test "$2" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-
-rm -f conftest.file
-
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
-  am_missing_run="$MISSING "
-else
-  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip".  However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
-  enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in # (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=1;;
-esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AM_BACKSLASH='\'
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='libpng'
- VERSION='1.6.2'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-# For better backward compatibility.  To be removed once Automake 1.9.x
-# dies out for good.  For more background, see:
-# 
-# 
-mkdir_p='$(MKDIR_P)'
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
-
-
-# We'll loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar  pax cpio none'
-
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-
-
-
-
-
-
-# The following line causes --disable-maintainer-mode to be the default to
-# configure, this is necessary because libpng distributions cannot rely on the
-# time stamps of the autotools generated files being correct
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
-
-PNGLIB_VERSION=1.6.2
-PNGLIB_MAJOR=1
-PNGLIB_MINOR=6
-PNGLIB_RELEASE=2
-
-
-
-ac_config_headers="$ac_config_headers config.h"
-
-
-# Checks for programs.
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include 
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include 
-#include 
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-# By default we simply use the C compiler to build assembly code.
-
-test "${CCAS+set}" = set || CCAS=$CC
-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
-
-
-
-depcc="$CCAS"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CCAS_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named 'D' -- because '-MD' means "put the output
-  # in D".
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CCAS_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
-      # Solaris 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with '-c' and '-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle '-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs.
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # After this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested.
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok '-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CCAS_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CCAS_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CCAS_dependencies_compiler_type" >&6; }
-CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then
-  am__fastdepCCAS_TRUE=
-  am__fastdepCCAS_FALSE='#'
-else
-  am__fastdepCCAS_TRUE='#'
-  am__fastdepCCAS_FALSE=
-fi
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_SED" || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_FGREP" || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO ""
-}
-
-case "$ECHO" in
-  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 &5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 &5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer  to  if __STDC__ is defined, since
-  #  exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include 
-#else
-# include 
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include 
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer  to  if __STDC__ is defined, since
-  #  exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include 
-#else
-# include 
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include 
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.4.2'
-macro_revision='1.3337'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in dumpbin "link -dump"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$DUMPBIN" && break
-  done
-fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in dumpbin "link -dump"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
-
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-    i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len" && \
-	test undefined != "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-
-
-
-
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-if ${lt_cv_to_host_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-
-fi
-
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-if ${lt_cv_to_tool_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  #assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-
-fi
-
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    if test "$GCC" != yes; then
-      reload_cmds=false
-    fi
-    ;;
-  darwin*)
-    if test "$GCC" = yes; then
-      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-    else
-      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-    fi
-    ;;
-esac
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix[4-9]*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi[45]*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump',
-  # unless we find 'file', for example because we are cross-compiling.
-  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
-  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[3-9]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-  ;;
-esac
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in ar
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$AR" && break
-  done
-fi
-if test -z "$AR"; then
-  ac_ct_AR=$AR
-  for ac_prog in ar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_AR" && break
-done
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-fi
-
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-$as_echo_n "checking for archiver @FILE support... " >&6; }
-if ${lt_cv_ar_at_file+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ar_at_file=no
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-$as_echo "$lt_cv_ar_at_file" >&6; }
-
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-test -z "$STRIP" && STRIP=:
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-test -z "$RANLIB" && RANLIB=:
-
-
-
-
-
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris*)
-  symcode='[BDRT]'
-  ;;
-sco3.2v5*)
-  symcode='[DT]'
-  ;;
-sysv4.2uw2*)
-  symcode='[DT]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[ABDT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK '"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-$as_echo_n "checking for sysroot... " >&6; }
-
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
-  withval=$with_sysroot;
-else
-  with_sysroot=no
-fi
-
-
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
-   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
-   ;;
-esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-$as_echo "${lt_sysroot:-no}" >&6; }
-
-
-
-
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
-fi
-
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
-	      *x86-64*)
-		LD="${LD-ld} -m elf32_x86_64"
-		;;
-	      *)
-		LD="${LD-ld} -m elf_i386"
-		;;
-	    esac
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_cc_needs_belf=yes
-else
-  lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
-set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MANIFEST_TOOL"; then
-  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
-if test -n "$MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-$as_echo "$MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
-  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
-  # Extract the first word of "mt", so it can be a program name with args.
-set dummy mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_MANIFEST_TOOL"; then
-  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
-if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_MANIFEST_TOOL" = x; then
-    MANIFEST_TOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
-  fi
-else
-  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
-fi
-
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if ${lt_cv_path_mainfest_tool+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&5
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
-fi
-
-
-
-
-
-
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&5
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&5
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if ${lt_cv_ld_force_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cru libconftest.a conftest.o" >&5
-      $AR cru libconftest.a conftest.o 2>&5
-      echo "$RANLIB libconftest.a" >&5
-      $RANLIB libconftest.a 2>&5
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&5
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&5
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
-    case $host_os in
-    rhapsody* | darwin1.[012])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[012]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include 
-#include 
-#include 
-#include 
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include 
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include 
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include 
-#include 
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-# Set options
-enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AS="${ac_tool_prefix}as"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AS=$ac_cv_prog_AS
-if test -n "$AS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
-$as_echo "$AS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_AS"; then
-  ac_ct_AS=$AS
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AS+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AS"; then
-  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AS="as"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AS=$ac_cv_prog_ac_ct_AS
-if test -n "$ac_ct_AS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
-$as_echo "$ac_ct_AS" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_AS" = x; then
-    AS="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AS=$ac_ct_AS
-  fi
-else
-  AS="$ac_cv_prog_AS"
-fi
-
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-  ;;
-esac
-
-test -z "$AS" && AS=as
-
-
-
-
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-        enable_dlopen=no
-
-
-
-            # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_shared=yes
-fi
-
-
-
-
-
-
-
-
-
-  # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=yes
-fi
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  pic_mode=default
-fi
-
-
-test -z "$pic_mode" && pic_mode=default
-
-
-
-
-
-
-
-  # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
-  enableval=$enable_fast_install; p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-for cc_temp in $compiler""; do
-  case $cc_temp in
-    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
-    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-
-
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-
-lt_prog_compiler_no_builtin_flag=
-
-if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-  *)
-    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-  esac
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-
-
-
-
-
-  lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[3-9]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl='-Xlinker '
-      if test -n "$lt_prog_compiler_pic"; then
-        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='--shared'
-	lt_prog_compiler_static='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	lt_prog_compiler_wl='-Wl,-Wl,,'
-	lt_prog_compiler_pic='-PIC'
-	lt_prog_compiler_static='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-qpic'
-	lt_prog_compiler_static='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Wl,'
-	  ;;
-        *Intel*\ [CF]*Compiler*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fPIC'
-	  lt_prog_compiler_static='-static'
-	  ;;
-	*Portland\ Group*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fpic'
-	  lt_prog_compiler_static='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag=
-  always_export_symbols=no
-  archive_cmds=
-  archive_expsym_cmds=
-  compiler_needs_object=no
-  enable_shared_with_static_runtimes=no
-  export_dynamic_flag_spec=
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic=no
-  hardcode_direct=no
-  hardcode_direct_absolute=no
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_separator=
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  inherit_rpath=no
-  link_all_deplibs=unknown
-  module_cmds=
-  module_expsym_cmds=
-  old_archive_from_new_cmds=
-  old_archive_from_expsyms_cmds=
-  thread_safe_flag_spec=
-  whole_archive_flag_spec=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  linux* | k*bsd*-gnu | gnu*)
-    link_all_deplibs=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
-	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[3-9]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach  says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='${wl}--export-all-symbols'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  whole_archive_flag_spec=
-	  tmp_sharedflag='--shared' ;;
-	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  compiler_needs_object=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    ld_shlibs=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix[4-9]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_direct_absolute=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      file_list_spec='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  hardcode_direct=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L=yes
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_libdir_separator=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-	link_all_deplibs=no
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      export_dynamic_flag_spec='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec='$convenience'
-	  fi
-	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	always_export_symbols=yes
-	file_list_spec='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
-	enable_shared_with_static_runtimes=yes
-	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	old_postinstall_cmds='chmod 644 $oldlib'
-	postlink_cmds='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	old_archive_from_new_cmds='true'
-	# FIXME: Should let the user specify the lib program.
-	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	enable_shared_with_static_runtimes=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc=no
-  hardcode_direct=no
-  hardcode_automatic=yes
-  hardcode_shlibpath_var=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec=''
-  fi
-  link_all_deplibs=yes
-  allow_undefined_flag="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-
-  else
-  ld_shlibs=no
-  fi
-
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if ${lt_cv_prog_compiler__b+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler__b=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS -b"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler__b=yes
-       fi
-     else
-       lt_cv_prog_compiler__b=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
-
-if test x"$lt_cv_prog_compiler__b" = xyes; then
-    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-else
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-fi
-
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	*)
-	  hardcode_direct=yes
-	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int foo (void) { return 0; }
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_irix_exported_symbol=yes
-else
-  lt_cv_irix_exported_symbol=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS="$save_LDFLAGS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      link_all_deplibs=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct=yes
-	hardcode_shlibpath_var=no
-	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_separator=:
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-R,$libdir'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl
-	  pic_flag=$lt_prog_compiler_pic
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag
-	  allow_undefined_flag=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc=no
-	  else
-	    lt_cv_archive_cmds_need_lc=yes
-	  fi
-	  allow_undefined_flag=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[lt_foo]++; }
-  if (lt_freq[lt_foo] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[4-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib.so
-      # instead of lib.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[45]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[23].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
-  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[3-9]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
-   test -n "$runpath_var" ||
-   test "X$hardcode_automatic" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$hardcode_direct" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
-
-if test "$hardcode_action" = relink ||
-   test "$inherit_rpath" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-
-
-
-
-
-  if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-    ;;
-
-  *)
-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_svld_dlopen=yes
-else
-  ac_cv_lib_svld_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_dld_link=yes
-else
-  ac_cv_lib_dld_dld_link=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include 
-#endif
-
-#include 
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include 
-#endif
-
-#include 
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}
-_LT_EOF
-  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-striplib=
-old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-  # Report which library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[4-9]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-
-
-# Some awks crash when confronted with pnglibconf.dfa, do a test run now
-# to make sure this doesn't happen
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that AWK works" >&5
-$as_echo_n "checking that AWK works... " >&6; }
-if ${AWK} -f ${srcdir}/scripts/options.awk out="/dev/null" version=search\
-   ${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
-   ${srcdir}/pngusr.dfa 1>&2
-then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-else
-   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 1 "failed
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-# This is a remnant of the old cc -E validation, where it may have been
-# necessary to use a different preprocessor for .dfn files
-DFNCPP="$CPP"
-
-
-# -Werror cannot be passed to GCC in CFLAGS because configure will fail (it
-# checks the compiler with a program that generates a warning), add the
-# following option to deal with this
-
-# Check whether --enable-werror was given.
-if test "${enable_werror+set}" = set; then :
-  enableval=$enable_werror; test "$enable_werror" = "yes" && enable_werror="-Werror"
-    if test "$enable_werror" != "no"; then
-      sav_CFLAGS="$CFLAGS"
-      CFLAGS="$enable_werror $CFLAGS"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler allows $enable_werror" >&5
-$as_echo_n "checking if the compiler allows $enable_werror... " >&6; }
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-            int main(int argc, char **argv){
-            return argv[argc-1][0];
-            }
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-         PNG_COPTS="$PNG_COPTS $enable_werror"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-      CFLAGS="$sav_CFLAGS"
-    fi
-fi
-
-
-# Checks for header files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include 
-#include 
-#include 
-#include 
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include 
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include 
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include 
-#include 
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-
-# Checks for typedefs, structures, and compiler characteristics.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this sort of thing.  */
-  typedef int charset[2];
-  const charset cs = { 0, 0 };
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *pcpcc;
-  char **ppc;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  pcpcc = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++pcpcc;
-  ppc = (char**) pcpcc;
-  pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this sort of thing.  */
-    char tx;
-    char *t = &tx;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-    *t++ = 0;
-    if (s) return 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; } bx;
-    struct s *b = &bx; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-    if (!foo) return 0;
-  }
-  return !cs[0] && !zero.x;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_const=yes
-else
-  ac_cv_c_const=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-$as_echo "$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
-
-$as_echo "#define const /**/" >>confdefs.h
-
-fi
-
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include 
-#include 
-
-int
-main ()
-{
-struct tm tm;
-				     int *p = &tm.tm_sec;
-				     return !p;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_struct_tm=time.h
-else
-  ac_cv_struct_tm=sys/time.h
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-$as_echo "$ac_cv_struct_tm" >&6; }
-if test $ac_cv_struct_tm = sys/time.h; then
-
-$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
-$as_echo_n "checking for C/C++ restrict keyword... " >&6; }
-if ${ac_cv_c_restrict+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_c_restrict=no
-   # The order here caters to the fact that C++ does not require restrict.
-   for ac_kw in __restrict __restrict__ _Restrict restrict; do
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-typedef int * int_ptr;
-	int foo (int_ptr $ac_kw ip) {
-	return ip[0];
-       }
-int
-main ()
-{
-int s[1];
-	int * $ac_kw t = s;
-	t[0] = 0;
-	return foo(t)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_c_restrict=$ac_kw
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     test "$ac_cv_c_restrict" != no && break
-   done
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
-$as_echo "$ac_cv_c_restrict" >&6; }
-
- case $ac_cv_c_restrict in
-   restrict) ;;
-   no) $as_echo "#define restrict /**/" >>confdefs.h
- ;;
-   *)  cat >>confdefs.h <<_ACEOF
-#define restrict $ac_cv_c_restrict
-_ACEOF
- ;;
- esac
-
-
-# Checks for library functions.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
-$as_echo_n "checking for working strtod... " >&6; }
-if ${ac_cv_func_strtod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "$cross_compiling" = yes; then :
-  ac_cv_func_strtod=no
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-$ac_includes_default
-#ifndef strtod
-double strtod ();
-#endif
-int
-main()
-{
-  {
-    /* Some versions of Linux strtod mis-parse strings with leading '+'.  */
-    char *string = " +69";
-    char *term;
-    double value;
-    value = strtod (string, &term);
-    if (value != 69 || term != (string + 4))
-      return 1;
-  }
-
-  {
-    /* Under Solaris 2.4, strtod returns the wrong value for the
-       terminating character under some conditions.  */
-    char *string = "NaN";
-    char *term;
-    strtod (string, &term);
-    if (term != string && *(term - 1) == 0)
-      return 1;
-  }
-  return 0;
-}
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  ac_cv_func_strtod=yes
-else
-  ac_cv_func_strtod=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5
-$as_echo "$ac_cv_func_strtod" >&6; }
-if test $ac_cv_func_strtod = no; then
-  case " $LIBOBJS " in
-  *" strtod.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS strtod.$ac_objext"
- ;;
-esac
-
-ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
-if test "x$ac_cv_func_pow" = xyes; then :
-
-fi
-
-if test $ac_cv_func_pow = no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
-$as_echo_n "checking for pow in -lm... " >&6; }
-if ${ac_cv_lib_m_pow+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pow ();
-int
-main ()
-{
-return pow ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_pow=yes
-else
-  ac_cv_lib_m_pow=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
-$as_echo "$ac_cv_lib_m_pow" >&6; }
-if test "x$ac_cv_lib_m_pow" = xyes; then :
-  POW_LIB=-lm
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
-$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
-fi
-
-fi
-
-fi
-
-for ac_func in memset
-do :
-  ac_fn_c_check_func "$LINENO" "memset" "ac_cv_func_memset"
-if test "x$ac_cv_func_memset" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MEMSET 1
-_ACEOF
-
-else
-  as_fn_error $? "memset not found in libc" "$LINENO" 5
-fi
-done
-
-for ac_func in pow
-do :
-  ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
-if test "x$ac_cv_func_pow" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_POW 1
-_ACEOF
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
-$as_echo_n "checking for pow in -lm... " >&6; }
-if ${ac_cv_lib_m_pow+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pow ();
-int
-main ()
-{
-return pow ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_pow=yes
-else
-  ac_cv_lib_m_pow=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
-$as_echo "$ac_cv_lib_m_pow" >&6; }
-if test "x$ac_cv_lib_m_pow" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
-
-  LIBS="-lm $LIBS"
-
-else
-  as_fn_error $? "cannot find pow" "$LINENO" 5
-fi
-
-fi
-done
-
-
-# Check whether --with-zlib-prefix was given.
-if test "${with_zlib_prefix+set}" = set; then :
-  withval=$with_zlib_prefix; ZPREFIX=${withval}
-else
-  ZPREFIX='z_'
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlibVersion in -lz" >&5
-$as_echo_n "checking for zlibVersion in -lz... " >&6; }
-if ${ac_cv_lib_z_zlibVersion+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char zlibVersion ();
-int
-main ()
-{
-return zlibVersion ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_z_zlibVersion=yes
-else
-  ac_cv_lib_z_zlibVersion=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_zlibVersion" >&5
-$as_echo "$ac_cv_lib_z_zlibVersion" >&6; }
-if test "x$ac_cv_lib_z_zlibVersion" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBZ 1
-_ACEOF
-
-  LIBS="-lz $LIBS"
-
-else
-  as_ac_Lib=`$as_echo "ac_cv_lib_z_${ZPREFIX}zlibVersion" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ZPREFIX}zlibVersion in -lz" >&5
-$as_echo_n "checking for ${ZPREFIX}zlibVersion in -lz... " >&6; }
-if eval \${$as_ac_Lib+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ${ZPREFIX}zlibVersion ();
-int
-main ()
-{
-return ${ZPREFIX}zlibVersion ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBZ 1
-_ACEOF
-
-  LIBS="-lz $LIBS"
-
-else
-  as_fn_error $? "zlib not installed" "$LINENO" 5
-fi
-
-fi
-
-
-# The following is for pngvalid, to ensure it catches FP errors even on
-# platforms that don't enable FP exceptions, the function appears in the math
-# library (typically), it's not an error if it is not found.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for feenableexcept in -lm" >&5
-$as_echo_n "checking for feenableexcept in -lm... " >&6; }
-if ${ac_cv_lib_m_feenableexcept+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char feenableexcept ();
-int
-main ()
-{
-return feenableexcept ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_feenableexcept=yes
-else
-  ac_cv_lib_m_feenableexcept=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_feenableexcept" >&5
-$as_echo "$ac_cv_lib_m_feenableexcept" >&6; }
-if test "x$ac_cv_lib_m_feenableexcept" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBM 1
-_ACEOF
-
-  LIBS="-lm $LIBS"
-
-fi
-
-for ac_func in feenableexcept
-do :
-  ac_fn_c_check_func "$LINENO" "feenableexcept" "ac_cv_func_feenableexcept"
-if test "x$ac_cv_func_feenableexcept" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_FEENABLEEXCEPT 1
-_ACEOF
-
-fi
-done
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if using Solaris linker" >&5
-$as_echo_n "checking if using Solaris linker... " >&6; }
-SLD=`$LD --version 2>&1 | grep Solaris`
-if test "$SLD"; then
-    have_solaris_ld=yes
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-    have_solaris_ld=no
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
- if test "$have_solaris_ld" = "yes"; then
-  HAVE_SOLARIS_LD_TRUE=
-  HAVE_SOLARIS_LD_FALSE='#'
-else
-  HAVE_SOLARIS_LD_TRUE='#'
-  HAVE_SOLARIS_LD_FALSE=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libraries can be versioned" >&5
-$as_echo_n "checking if libraries can be versioned... " >&6; }
-# Special case for PE/COFF platforms: ld reports
-# support for version-script, but doesn't actually
-# DO anything with it.
-case $host in
-*cygwin* | *mingw32* | *interix* )
-    have_ld_version_script=no
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-;;
-* )
-
-if test "$have_solaris_ld" = "yes"; then
-    GLD=`$LD --help < /dev/null 2>&1 | grep 'M mapfile'`
-else
-    GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
-fi
-
-if test "$GLD"; then
-    have_ld_version_script=yes
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-    have_ld_version_script=no
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** You have not enabled versioned symbols." >&5
-$as_echo "$as_me: WARNING: *** You have not enabled versioned symbols." >&2;}
-fi
-;;
-esac
-
- if test "$have_ld_version_script" = "yes"; then
-  HAVE_LD_VERSION_SCRIPT_TRUE=
-  HAVE_LD_VERSION_SCRIPT_FALSE='#'
-else
-  HAVE_LD_VERSION_SCRIPT_TRUE='#'
-  HAVE_LD_VERSION_SCRIPT_FALSE=
-fi
-
-
-if test "$have_ld_version_script" = "yes"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbol prefix" >&5
-$as_echo_n "checking for symbol prefix... " >&6; }
-    SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \
-                  | ${CPP-${CC-gcc} -E} - 2>&1 \
-                  | ${EGREP-grep} "^PREFIX=" \
-                  | ${SED-sed} -e "s:^PREFIX=::" -e "s:__USER_LABEL_PREFIX__::"`
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYMBOL_PREFIX" >&5
-$as_echo "$SYMBOL_PREFIX" >&6; }
-fi
-
-# Substitutions for .in files
-
-
-
-
-
-# Additional arguments (and substitutions)
-# Allow the pkg-config directory to be set
-
-# Check whether --with-pkgconfigdir was given.
-if test "${with_pkgconfigdir+set}" = set; then :
-  withval=$with_pkgconfigdir; pkgconfigdir=${withval}
-else
-  pkgconfigdir='${libdir}/pkgconfig'
-fi
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: pkgconfig directory is ${pkgconfigdir}" >&5
-$as_echo "$as_me: pkgconfig directory is ${pkgconfigdir}" >&6;}
-
-# Make the *-config binary config scripts optional
-
-# Check whether --with-binconfigs was given.
-if test "${with_binconfigs+set}" = set; then :
-  withval=$with_binconfigs; if test "${withval}" = no; then
-      binconfigs=
-      { $as_echo "$as_me:${as_lineno-$LINENO}: libpng-config scripts will not be built" >&5
-$as_echo "$as_me: libpng-config scripts will not be built" >&6;}
-    else
-      binconfigs='${binconfigs}'
-    fi
-else
-  binconfigs='${binconfigs}'
-fi
-
-
-
-# Support for prefixes to the API function names; this will generate defines
-# at the start of the build to rename exported library functions
-
-# Check whether --with-libpng-prefix was given.
-if test "${with_libpng_prefix+set}" = set; then :
-  withval=$with_libpng_prefix; if test "${withval:-no}" != "no"; then
-      PNG_PREFIX=${withval}
-
-    fi
-fi
-
- if test "${with_libpng_prefix:-no}" != "no"; then
-  DO_PNG_PREFIX_TRUE=
-  DO_PNG_PREFIX_FALSE='#'
-else
-  DO_PNG_PREFIX_TRUE='#'
-  DO_PNG_PREFIX_FALSE=
-fi
-
-
-# Because GCC by default assembles code with an executable stack, even though it
-# compiles C code with a non-executable stack, it is necessary to do a fixup
-# here (this may by GCC specific)
-# AC_SUBST([AM_CCASFLAGS], [-Wa,--noexecstack])
-
-# Check whether --enable-arm-neon was given.
-if test "${enable_arm_neon+set}" = set; then :
-  enableval=$enable_arm_neon; case "$enableval" in
-      off)
-
-$as_echo "#define PNG_NO_ARM_NEON /**/" >>confdefs.h
-;;
-      check)
-
-$as_echo "#define PNG_ARM_NEON_CHECK_SUPPORTED /**/" >>confdefs.h
-;;
-      api)
-
-$as_echo "#define PNG_ARM_NEON_API_SUPPORTED /**/" >>confdefs.h
-;;
-      on)
-
-$as_echo "#define PNG_ARM_NEON_SUPPORTED /**/" >>confdefs.h
-;;
-      *)
-         as_fn_error $? "arm-neon: option value required (off/check/api/on)" "$LINENO" 5;;
-   esac
-fi
-
- if test "${enable_arm_neon:-no}" != "no"; then
-  PNG_ARM_NEON_TRUE=
-  PNG_ARM_NEON_FALSE='#'
-else
-  PNG_ARM_NEON_TRUE='#'
-  PNG_ARM_NEON_FALSE=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Extra options for compiler: $PNG_COPTS" >&5
-$as_echo "$as_me: Extra options for compiler: $PNG_COPTS" >&6;}
-
-# Config files, substituting as above
-ac_config_files="$ac_config_files Makefile libpng.pc:libpng.pc.in"
-
-ac_config_files="$ac_config_files libpng-config:libpng-config.in"
-
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-U=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
-$as_echo_n "checking that generated files are newer than configure... " >&6; }
-   if test -n "$am_sleep_pid"; then
-     # Hide warnings about reused PIDs.
-     wait $am_sleep_pid 2>/dev/null
-   fi
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
-$as_echo "done" >&6; }
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_SOLARIS_LD_TRUE}" && test -z "${HAVE_SOLARIS_LD_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_SOLARIS_LD\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_LD_VERSION_SCRIPT_TRUE}" && test -z "${HAVE_LD_VERSION_SCRIPT_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_LD_VERSION_SCRIPT\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${DO_PNG_PREFIX_TRUE}" && test -z "${DO_PNG_PREFIX_FALSE}"; then
-  as_fn_error $? "conditional \"DO_PNG_PREFIX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${PNG_ARM_NEON_TRUE}" && test -z "${PNG_ARM_NEON_FALSE}"; then
-  as_fn_error $? "conditional \"PNG_ARM_NEON\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -pR'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -pR'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -pR'
-  fi
-else
-  as_ln_s='cp -pR'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-
-# as_fn_executable_p FILE
-# -----------------------
-# Test if FILE is an executable regular file.
-as_fn_executable_p ()
-{
-  test -f "$1" && test -x "$1"
-} # as_fn_executable_p
-as_test_x='test -x'
-as_executable_p=as_fn_executable_p
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by libpng $as_me 1.6.2, which was
-generated by GNU Autoconf 2.69.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to ."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-libpng config.status 1.6.2
-configured by $0, generated by GNU Autoconf 2.69,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2012 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in SED \
-GREP \
-EGREP \
-FGREP \
-SHELL \
-ECHO \
-LD \
-AS \
-DLLTOOL \
-OBJDUMP \
-PATH_SEPARATOR \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-deplibs_check_method \
-file_magic_cmd \
-file_magic_glob \
-want_nocaseglob \
-sharedlib_from_linklib_cmd \
-AR \
-AR_FLAGS \
-archiver_list_spec \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-nm_file_list_spec \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_pic \
-lt_prog_compiler_wl \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-MANIFEST_TOOL \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_separator \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-install_override_mode \
-finish_eval \
-old_striplib \
-striplib; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postlink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec; do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'
-
-
-
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "libpng.pc") CONFIG_FILES="$CONFIG_FILES libpng.pc:libpng.pc.in" ;;
-    "libpng-config") CONFIG_FILES="$CONFIG_FILES libpng-config:libpng-config.in" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp= ac_tmp=
-  trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' >$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' >$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
-
-  rm -f "$ac_tmp/stdin"
-  case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-	 X"$_am_arg" : 'X\(//\)$' \| \
-	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Older Autoconf quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
- ;;
-    "libtool":C)
-
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags=""
-
-# ### BEGIN LIBTOOL CONFIG
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Assembler program.
-AS=$lt_AS
-
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
-# Object dumper program.
-OBJDUMP=$lt_OBJDUMP
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The PATH separator for the build system.
-PATH_SEPARATOR=$lt_PATH_SEPARATOR
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# convert \$build file names to \$host format.
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-
-# convert \$build files to toolchain format.
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method = "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
-
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=$lt_file_magic_glob
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob=$lt_want_nocaseglob
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-
-# The archiver.
-AR=$lt_AR
-
-# Flags to create an archive.
-AR_FLAGS=$lt_AR_FLAGS
-
-# How to feed a file listing to the archiver.
-archiver_list_spec=$lt_archiver_list_spec
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# Specify filename containing input files for \$NM.
-nm_file_list_spec=$lt_nm_file_list_spec
-
-# The root where to search for dependent libraries,and in which our libraries should be installed.
-lt_sysroot=$lt_sysroot
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Manifest tool.
-MANIFEST_TOOL=$lt_MANIFEST_TOOL
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Permission mode override for installation of shared libraries.
-install_override_mode=$lt_install_override_mode
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary and the resulting library dependency is
-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the
-# library is relocated.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-  if test x"$xsi_shell" = xyes; then
-  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
-\    # positional parameters, so assign one to ordinary parameter first.\
-\    func_stripname_result=${3}\
-\    func_stripname_result=${func_stripname_result#"${1}"}\
-\    func_stripname_result=${func_stripname_result%"${2}"}\
-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\    func_split_long_opt_name=${1%%=*}\
-\    func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\    func_split_short_opt_arg=${1#??}\
-\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\    case ${1} in\
-\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\      *)    func_lo2o_result=${1} ;;\
-\    esac\
-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
-    func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
-    func_arith_result=$(( $* ))\
-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
-    func_len_result=${#1}\
-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
-    eval "${1}+=\\${2}"\
-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\    func_quote_for_eval "${2}"\
-\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
- ;;
-    "libpng-config":F) chmod +x libpng-config ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/configure.ac b/3rdparty/wxwidgets3.0-3.0.1/src/png/configure.ac
deleted file mode 100644
index f9bc4f6344..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/configure.ac
+++ /dev/null
@@ -1,266 +0,0 @@
-# configure.ac
-
-dnl Process this file with autoconf to produce a configure script.
-dnl
-dnl Minor upgrades (compatible ABI): increment the package version
-dnl (third field in two places below) and set the PNGLIB_RELEASE
-dnl variable.
-dnl
-dnl Major upgrades (incompatible ABI): increment the package major
-dnl version (second field, or first if desired), set the minor
-dnl to 0, set PNGLIB_MAJOR below *and* follow the instructions in
-dnl Makefile.am to upgrade the package name.
-
-dnl This is here to prevent earlier autoconf from being used, it
-dnl should not be necessary to regenerate configure if the time
-dnl stamps are correct
-AC_PREREQ([2.68])
-
-dnl Version number stuff here:
-
-AC_INIT([libpng],[1.6.2],[png-mng-implement@lists.sourceforge.net])
-AC_CONFIG_MACRO_DIR([scripts])
-
-# libpng does not follow GNU file name conventions (hence 'foreign')
-# color-tests requires automake 1.11 or later
-# silent-rules requires automake 1.11 or later
-# dist-xz requires automake 1.11 or later
-# 1.12.2 fixes a security issue in 1.11.2 and 1.12.1
-# 1.13 is required for parallel tests
-AM_INIT_AUTOMAKE([1.13 foreign dist-xz color-tests silent-rules])
-# The following line causes --disable-maintainer-mode to be the default to
-# configure, this is necessary because libpng distributions cannot rely on the
-# time stamps of the autotools generated files being correct
-AM_MAINTAINER_MODE
-
-dnl configure.ac and Makefile.am expect automake 1.11.2 or a compatible later
-dnl version; aclocal.m4 will generate a failure if you use a prior version of
-dnl automake, so the following is not necessary (and is not defined anyway):
-dnl AM_PREREQ([1.11.2])
-dnl stop configure from automagically running automake
-
-PNGLIB_VERSION=1.6.2
-PNGLIB_MAJOR=1
-PNGLIB_MINOR=6
-PNGLIB_RELEASE=2
-
-dnl End of version number stuff
-
-AC_CONFIG_SRCDIR([pngget.c])
-AC_CONFIG_HEADERS([config.h])
-
-# Checks for programs.
-AC_LANG([C])
-AC_PROG_CC
-AM_PROG_AS
-LT_PATH_LD
-AC_PROG_CPP
-AC_PROG_AWK
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-
-dnl libtool/libtoolize; version 2.4.2 is the tested version, this or any
-dnl compatible later version may be used
-LT_INIT([win32-dll])
-LT_PREREQ([2.4.2])
-
-# Some awks crash when confronted with pnglibconf.dfa, do a test run now
-# to make sure this doesn't happen
-AC_MSG_CHECKING([that AWK works])
-if ${AWK} -f ${srcdir}/scripts/options.awk out="/dev/null" version=search\
-   ${srcdir}/pngconf.h ${srcdir}/scripts/pnglibconf.dfa\
-   ${srcdir}/pngusr.dfa 1>&2
-then
-   AC_MSG_RESULT([ok])
-else
-   AC_MSG_FAILURE([failed], 1)
-fi
-
-# This is a remnant of the old cc -E validation, where it may have been
-# necessary to use a different preprocessor for .dfn files
-DFNCPP="$CPP"
-AC_SUBST(DFNCPP)
-
-# -Werror cannot be passed to GCC in CFLAGS because configure will fail (it
-# checks the compiler with a program that generates a warning), add the
-# following option to deal with this
-AC_ARG_VAR(PNG_COPTS,
-   [additional flags for the C compiler, use this for options that would]
-   [cause configure itself to fail])
-AC_ARG_ENABLE(werror,
-   AS_HELP_STRING([[[--enable-werror[=OPT]]]],
-      [Pass -Werror or the given argument to the compiler if it is supported]),
-   [test "$enable_werror" = "yes" && enable_werror="-Werror"
-    if test "$enable_werror" != "no"; then
-      sav_CFLAGS="$CFLAGS"
-      CFLAGS="$enable_werror $CFLAGS"
-      AC_MSG_CHECKING([if the compiler allows $enable_werror])
-      AC_COMPILE_IFELSE(
-         [AC_LANG_SOURCE([
-            [int main(int argc, char **argv){]
-            [return argv[argc-1][0];]
-            [}]])],
-         AC_MSG_RESULT(yes)
-         PNG_COPTS="$PNG_COPTS $enable_werror",
-         AC_MSG_RESULT(no))
-      CFLAGS="$sav_CFLAGS"
-    fi],)
-
-# Checks for header files.
-AC_HEADER_STDC
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-AC_STRUCT_TM
-AC_C_RESTRICT
-
-# Checks for library functions.
-AC_FUNC_STRTOD
-AC_CHECK_FUNCS([memset], , AC_MSG_ERROR(memset not found in libc))
-AC_CHECK_FUNCS([pow], , AC_CHECK_LIB(m, pow, , AC_MSG_ERROR(cannot find pow)) )
-AC_ARG_WITH(zlib-prefix,
-   AS_HELP_STRING([[[--with-zlib-prefix]]],
-      [prefix that may have been used in installed zlib]),
-      [ZPREFIX=${withval}],
-      [ZPREFIX='z_'])
-AC_CHECK_LIB(z, zlibVersion, ,
-    AC_CHECK_LIB(z, ${ZPREFIX}zlibVersion, , AC_MSG_ERROR(zlib not installed)))
-
-# The following is for pngvalid, to ensure it catches FP errors even on
-# platforms that don't enable FP exceptions, the function appears in the math
-# library (typically), it's not an error if it is not found.
-AC_CHECK_LIB([m], [feenableexcept])
-AC_CHECK_FUNCS([feenableexcept])
-
-AC_MSG_CHECKING([if using Solaris linker])
-SLD=`$LD --version 2>&1 | grep Solaris`
-if test "$SLD"; then
-    have_solaris_ld=yes
-    AC_MSG_RESULT(yes)
-else
-    have_solaris_ld=no
-    AC_MSG_RESULT(no)
-fi
-AM_CONDITIONAL(HAVE_SOLARIS_LD, test "$have_solaris_ld" = "yes")
-
-AC_MSG_CHECKING([if libraries can be versioned])
-# Special case for PE/COFF platforms: ld reports
-# support for version-script, but doesn't actually
-# DO anything with it.
-case $host in
-*cygwin* | *mingw32* | *interix* )
-    have_ld_version_script=no
-    AC_MSG_RESULT(no)
-;;
-* )
-
-if test "$have_solaris_ld" = "yes"; then
-    GLD=`$LD --help < /dev/null 2>&1 | grep 'M mapfile'`
-else
-    GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
-fi
-
-if test "$GLD"; then
-    have_ld_version_script=yes
-    AC_MSG_RESULT(yes)
-else
-    have_ld_version_script=no
-    AC_MSG_RESULT(no)
-    AC_MSG_WARN(*** You have not enabled versioned symbols.)
-fi
-;;
-esac
-
-AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
-
-if test "$have_ld_version_script" = "yes"; then
-    AC_MSG_CHECKING([for symbol prefix])
-    SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \
-                  | ${CPP-${CC-gcc} -E} - 2>&1 \
-                  | ${EGREP-grep} "^PREFIX=" \
-                  | ${SED-sed} -e "s:^PREFIX=::" -e "s:__USER_LABEL_PREFIX__::"`
-    AC_SUBST(SYMBOL_PREFIX)
-    AC_MSG_RESULT($SYMBOL_PREFIX)
-fi
-
-# Substitutions for .in files
-AC_SUBST(PNGLIB_VERSION)
-AC_SUBST(PNGLIB_MAJOR)
-AC_SUBST(PNGLIB_MINOR)
-AC_SUBST(PNGLIB_RELEASE)
-
-# Additional arguments (and substitutions)
-# Allow the pkg-config directory to be set
-AC_ARG_WITH(pkgconfigdir,
-   AS_HELP_STRING([[[--with-pkgconfigdir]]],
-      [Use the specified pkgconfig dir (default is libdir/pkgconfig)]),
-   [pkgconfigdir=${withval}],
-   [pkgconfigdir='${libdir}/pkgconfig'])
-
-AC_SUBST([pkgconfigdir])
-AC_MSG_NOTICE([[pkgconfig directory is ${pkgconfigdir}]])
-
-# Make the *-config binary config scripts optional
-AC_ARG_WITH(binconfigs,
-   AS_HELP_STRING([[[--with-binconfigs]]],
-      [Generate shell libpng-config scripts as well as pkg-config data]
-      [@<:@default=yes@:>@]),
-   [if test "${withval}" = no; then
-      binconfigs=
-      AC_MSG_NOTICE([[libpng-config scripts will not be built]])
-    else
-      binconfigs='${binconfigs}'
-    fi],
-   [binconfigs='${binconfigs}'])
-AC_SUBST([binconfigs])
-
-# Support for prefixes to the API function names; this will generate defines
-# at the start of the build to rename exported library functions
-AC_ARG_WITH(libpng-prefix,
-   AS_HELP_STRING([[[--with-libpng-prefix]]],
-      [prefix libpng exported function (API) names with the given value]),
-   [if test "${withval:-no}" != "no"; then
-      AC_SUBST([PNG_PREFIX], [${withval}])
-    fi])
-AM_CONDITIONAL([DO_PNG_PREFIX], [test "${with_libpng_prefix:-no}" != "no"])
-
-# Because GCC by default assembles code with an executable stack, even though it
-# compiles C code with a non-executable stack, it is necessary to do a fixup
-# here (this may by GCC specific)
-# AC_SUBST([AM_CCASFLAGS], [-Wa,--noexecstack])
-
-AC_ARG_ENABLE([arm-neon],
-   AS_HELP_STRING([[[--enable-arm-neon]]],
-      [Enable ARM NEON optimizations: =off, check, api, on:]
-      [off: disable the optimizations; check: use internal checking code]
-      [(deprecated and poorly supported); api: disable by default, enable by]
-      [a call to png_set_option; on: turn on unconditionally.  The]
-      [default is 'on' if __ARM_NEON__ is defined, otherwise 'off'.]),
-   [case "$enableval" in
-      off)
-         AC_DEFINE([PNG_NO_ARM_NEON], [],
-                   [Disable ARM Neon optimizations]);;
-      check)
-         AC_DEFINE([PNG_ARM_NEON_CHECK_SUPPORTED], [],
-                   [Check for ARM Neon support at run-time]);;
-      api)
-         AC_DEFINE([PNG_ARM_NEON_API_SUPPORTED], [],
-                   [Turn on ARM Neon optimizations at run-time]);;
-      on)
-         AC_DEFINE([PNG_ARM_NEON_SUPPORTED], [],
-                   [Enable ARM Neon optimizations]);;
-      *)
-         AC_MSG_ERROR([arm-neon: option value required (off/check/api/on)]);;
-   esac])
-AM_CONDITIONAL([PNG_ARM_NEON], [test "${enable_arm_neon:-no}" != "no"])
-
-AC_MSG_NOTICE([[Extra options for compiler: $PNG_COPTS]])
-
-# Config files, substituting as above
-AC_CONFIG_FILES([Makefile libpng.pc:libpng.pc.in])
-AC_CONFIG_FILES([libpng-config:libpng-config.in],
-   [chmod +x libpng-config])
-
-AC_OUTPUT
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/depcomp b/3rdparty/wxwidgets3.0-3.0.1/src/png/depcomp
deleted file mode 100755
index 4ebd5b3a2f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/depcomp
+++ /dev/null
@@ -1,791 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2013-05-30.07; # UTC
-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva .
-
-case $1 in
-  '')
-    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-    exit 1;
-    ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by 'PROGRAMS ARGS'.
-  object      Object file output by 'PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputting dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to .
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-# Get the directory component of the given path, and save it in the
-# global variables '$dir'.  Note that this directory component will
-# be either empty or ending with a '/' character.  This is deliberate.
-set_dir_from ()
-{
-  case $1 in
-    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
-      *) dir=;;
-  esac
-}
-
-# Get the suffix-stripped basename of the given path, and save it the
-# global variable '$base'.
-set_base_from ()
-{
-  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
-}
-
-# If no dependency file was actually created by the compiler invocation,
-# we still have to create a dummy depfile, to avoid errors with the
-# Makefile "include basename.Plo" scheme.
-make_dummy_depfile ()
-{
-  echo "#dummy" > "$depfile"
-}
-
-# Factor out some common post-processing of the generated depfile.
-# Requires the auxiliary global variable '$tmpdepfile' to be set.
-aix_post_process_depfile ()
-{
-  # If the compiler actually managed to produce a dependency file,
-  # post-process it.
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form 'foo.o: dependency.h'.
-    # Do two passes, one to just change these to
-    #   $object: dependency.h
-    # and one to simply output
-    #   dependency.h:
-    # which is needed to avoid the deleted-header problem.
-    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
-      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
-    } > "$depfile"
-    rm -f "$tmpdepfile"
-  else
-    make_dummy_depfile
-  fi
-}
-
-# A tabulation character.
-tab='	'
-# A newline character.
-nl='
-'
-# Character ranges might be problematic outside the C locale.
-# These definitions help.
-upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
-lower=abcdefghijklmnopqrstuvwxyz
-digits=0123456789
-alpha=${upper}${lower}
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Avoid interferences from the environment.
-gccflag= dashmflag=
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-  # This is just like dashmstdout with a different argument.
-  dashmflag=-xM
-  depmode=dashmstdout
-fi
-
-cygpath_u="cygpath -u -f -"
-if test "$depmode" = msvcmsys; then
-  # This is just like msvisualcpp but w/o cygpath translation.
-  # Just convert the backslash-escaped backslashes to single forward
-  # slashes to satisfy depend.m4
-  cygpath_u='sed s,\\\\,/,g'
-  depmode=msvisualcpp
-fi
-
-if test "$depmode" = msvc7msys; then
-  # This is just like msvc7 but w/o cygpath translation.
-  # Just convert the backslash-escaped backslashes to single forward
-  # slashes to satisfy depend.m4
-  cygpath_u='sed s,\\\\,/,g'
-  depmode=msvc7
-fi
-
-if test "$depmode" = xlc; then
-  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
-  gccflag=-qmakedep=gcc,-MF
-  depmode=gcc
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
-## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
-## (see the conditional assignment to $gccflag above).
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).  Also, it might not be
-##   supported by the other compilers which use the 'gcc' depmode.
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  # The second -e expression handles DOS-style file names with drive
-  # letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the "deleted header file" problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-## Some versions of gcc put a space before the ':'.  On the theory
-## that the space means something, we add a space to the output as
-## well.  hp depmode also adds that space, but also prefixes the VPATH
-## to the object.  Take care to not repeat it in the output.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-  tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like '#:fec' to the end of the
-    # dependency line.
-    tr ' ' "$nl" < "$tmpdepfile" \
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
-      | tr "$nl" ' ' >> "$depfile"
-    echo >> "$depfile"
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' "$nl" < "$tmpdepfile" \
-      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-      >> "$depfile"
-  else
-    make_dummy_depfile
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-xlc)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts '$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  set_dir_from "$object"
-  set_base_from "$object"
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$base.u
-    tmpdepfile3=$dir.libs/$base.u
-    "$@" -Wc,-M
-  else
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$dir$base.u
-    tmpdepfile3=$dir$base.u
-    "$@" -M
-  fi
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  aix_post_process_depfile
-  ;;
-
-tcc)
-  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
-  # FIXME: That version still under development at the moment of writing.
-  #        Make that this statement remains true also for stable, released
-  #        versions.
-  # It will wrap lines (doesn't matter whether long or short) with a
-  # trailing '\', as in:
-  #
-  #   foo.o : \
-  #    foo.c \
-  #    foo.h \
-  #
-  # It will put a trailing '\' even on the last line, and will use leading
-  # spaces rather than leading tabs (at least since its commit 0394caf7
-  # "Emit spaces for -MD").
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
-  # We have to change lines of the first kind to '$object: \'.
-  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
-  # And for each line of the second kind, we have to emit a 'dep.h:'
-  # dummy dependency, to avoid the deleted-header problem.
-  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-## The order of this option in the case statement is important, since the
-## shell code in configure will try each of these formats in the order
-## listed in this file.  A plain '-MD' option would be understood by many
-## compilers, so we must ensure this comes after the gcc and icc options.
-pgcc)
-  # Portland's C compiler understands '-MD'.
-  # Will always output deps to 'file.d' where file is the root name of the
-  # source file under compilation, even if file resides in a subdirectory.
-  # The object file name does not affect the name of the '.d' file.
-  # pgcc 10.2 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using '\' :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-  set_dir_from "$object"
-  # Use the source, not the object, to determine the base name, since
-  # that's sadly what pgcc will do too.
-  set_base_from "$source"
-  tmpdepfile=$base.d
-
-  # For projects that build the same source file twice into different object
-  # files, the pgcc approach of using the *source* file root name can cause
-  # problems in parallel builds.  Use a locking strategy to avoid stomping on
-  # the same $tmpdepfile.
-  lockdir=$base.d-lock
-  trap "
-    echo '$0: caught signal, cleaning up...' >&2
-    rmdir '$lockdir'
-    exit 1
-  " 1 2 13 15
-  numtries=100
-  i=$numtries
-  while test $i -gt 0; do
-    # mkdir is a portable test-and-set.
-    if mkdir "$lockdir" 2>/dev/null; then
-      # This process acquired the lock.
-      "$@" -MD
-      stat=$?
-      # Release the lock.
-      rmdir "$lockdir"
-      break
-    else
-      # If the lock is being held by a different process, wait
-      # until the winning process is done or we timeout.
-      while test -d "$lockdir" && test $i -gt 0; do
-        sleep 1
-        i=`expr $i - 1`
-      done
-    fi
-    i=`expr $i - 1`
-  done
-  trap - 1 2 13 15
-  if test $i -le 0; then
-    echo "$0: failed to acquire lock after $numtries attempts" >&2
-    echo "$0: check lockdir '$lockdir'" >&2
-    exit 1
-  fi
-
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
-    | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  # Much of this is similar to the tru64 case; see comments there.
-  set_dir_from  "$object"
-  set_base_from "$object"
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -ne 0; then
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add 'dependent.h:' lines.
-    sed -ne '2,${
-               s/^ *//
-               s/ \\*$//
-               s/$/:/
-               p
-             }' "$tmpdepfile" >> "$depfile"
-  else
-    make_dummy_depfile
-  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
-  ;;
-
-tru64)
-  # The Tru64 compiler uses -MD to generate dependencies as a side
-  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
-  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-  # dependencies in 'foo.d' instead, so we check for that too.
-  # Subdirectories are respected.
-  set_dir_from  "$object"
-  set_base_from "$object"
-
-  if test "$libtool" = yes; then
-    # Libtool generates 2 separate objects for the 2 libraries.  These
-    # two compilations output dependencies in $dir.libs/$base.o.d and
-    # in $dir$base.o.d.  We have to check for both files, because
-    # one of the two compilations can be disabled.  We should prefer
-    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-    # automatically cleaned when .libs/ is deleted, while ignoring
-    # the former would cause a distcleancheck panic.
-    tmpdepfile1=$dir$base.o.d          # libtool 1.5
-    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
-    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
-    "$@" -Wc,-MD
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    tmpdepfile3=$dir$base.d
-    "$@" -MD
-  fi
-
-  stat=$?
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  # Same post-processing that is required for AIX mode.
-  aix_post_process_depfile
-  ;;
-
-msvc7)
-  if test "$libtool" = yes; then
-    showIncludes=-Wc,-showIncludes
-  else
-    showIncludes=-showIncludes
-  fi
-  "$@" $showIncludes > "$tmpdepfile"
-  stat=$?
-  grep -v '^Note: including file: ' "$tmpdepfile"
-  if test $stat -ne 0; then
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  # The first sed program below extracts the file names and escapes
-  # backslashes for cygpath.  The second sed program outputs the file
-  # name when reading, but also accumulates all include files in the
-  # hold buffer in order to output them again at the end.  This only
-  # works with sed implementations that can handle large buffers.
-  sed < "$tmpdepfile" -n '
-/^Note: including file:  *\(.*\)/ {
-  s//\1/
-  s/\\/\\\\/g
-  p
-}' | $cygpath_u | sort -u | sed -n '
-s/ /\\ /g
-s/\(.*\)/'"$tab"'\1 \\/p
-s/.\(.*\) \\/\1:/
-H
-$ {
-  s/.*/'"$tab"'/
-  G
-  p
-}' >> "$depfile"
-  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
-  rm -f "$tmpdepfile"
-  ;;
-
-msvc7msys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove '-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for ':'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
-  "$@" $dashmflag |
-    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this sed invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  tr ' ' "$nl" < "$tmpdepfile" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no eat=no
-  for arg
-  do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    if test $eat = yes; then
-      eat=no
-      continue
-    fi
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -arch)
-      eat=yes ;;
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix=`echo "$object" | sed 's/^.*\././'`
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  # makedepend may prepend the VPATH from the source file name to the object.
-  # No need to regex-escape $object, excess matching of '.' is harmless.
-  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process the last invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed '1,2d' "$tmpdepfile" \
-    | tr ' ' "$nl" \
-    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
-    | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove '-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E \
-    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-    | sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-        set fnord "$@"
-        shift
-        shift
-        ;;
-    *)
-        set fnord "$@" "$arg"
-        shift
-        shift
-        ;;
-    esac
-  done
-  "$@" -E 2>/dev/null |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
-  echo "$tab" >> "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvcmsys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/install-sh b/3rdparty/wxwidgets3.0-3.0.1/src/png/install-sh
deleted file mode 100755
index 377bb8687f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/install-sh
+++ /dev/null
@@ -1,527 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2011-11-20.07; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# 'make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	# Protect names problematic for 'test' and other utilities.
-	case $dst_arg in
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
-	esac
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-    # Protect names problematic for 'test' and other utilities.
-    case $dst_arg in
-      -* | [=\(\)!]) dst_arg=./$dst_arg;;
-    esac
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call 'install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  do_exit='(exit $ret); exit $ret'
-  trap "ret=129; $do_exit" 1
-  trap "ret=130; $do_exit" 2
-  trap "ret=141; $do_exit" 13
-  trap "ret=143; $do_exit" 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names problematic for 'test' and other utilities.
-  case $src in
-    -* | [=\(\)!]) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-    dst=$dst_arg
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	[-=\(\)!]*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test X"$d" = X && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/ltmain.sh b/3rdparty/wxwidgets3.0-3.0.1/src/png/ltmain.sh
deleted file mode 100755
index 499e473fb9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/ltmain.sh
+++ /dev/null
@@ -1,9661 +0,0 @@
-
-# libtool (GNU libtool) 2.4.2
-# Written by Gordon Matzigkeit , 1996
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# GNU Libtool is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-#       --config             show all configuration variables
-#       --debug              enable verbose shell tracing
-#   -n, --dry-run            display commands without modifying any files
-#       --features           display basic configuration information and exit
-#       --mode=MODE          use operation mode MODE
-#       --preserve-dup-deps  don't remove duplicate dependency libraries
-#       --quiet, --silent    don't print informational messages
-#       --no-quiet, --no-silent
-#                            print informational messages (default)
-#       --no-warn            don't display warning messages
-#       --tag=TAG            use configuration variables from tag TAG
-#   -v, --verbose            print more informational messages than default
-#       --no-verbose         don't print the extra informational messages
-#       --version            print version information
-#   -h, --help, --help-all   print short, long, or detailed help message
-#
-# MODE must be one of the following:
-#
-#         clean              remove files from the build directory
-#         compile            compile a source file into a libtool object
-#         execute            automatically set library path, then run a program
-#         finish             complete the installation of libtool libraries
-#         install            install libraries or executables
-#         link               create a library or an executable
-#         uninstall          remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE.  When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-#         host-triplet:	$host
-#         shell:		$SHELL
-#         compiler:		$LTCC
-#         compiler flags:		$LTCFLAGS
-#         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.2
-#         automake:	$automake_version
-#         autoconf:	$autoconf_version
-#
-# Report bugs to .
-# GNU libtool home page: .
-# General help using GNU software: .
-
-PROGRAM=libtool
-PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.2"
-TIMESTAMP=""
-package_revision=1.3337
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-
-# NLS nuisances: We save the old values to restore during execute mode.
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test \"\${$lt_var+set}\" = set; then
-          save_$lt_var=\$$lt_var
-          $lt_var=C
-	  export $lt_var
-	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
-	fi"
-done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
-
-$lt_unset CDPATH
-
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-
-
-: ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${MAKE="make"}
-: ${MKDIR="mkdir"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-} # func_dirname may be replaced by extended shell implementation
-
-
-# func_basename file
-func_basename ()
-{
-    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
-
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-    # Extract subdirectory from the argument.
-    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-    case ${2} in
-      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-    esac
-} # func_stripname may be replaced by extended shell implementation
-
-
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
-		s@/\./@/@g
-		t dotsl
-		s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
-
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-#             value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
-  # Start from root dir and reassemble the path.
-  func_normal_abspath_result=
-  func_normal_abspath_tpath=$1
-  func_normal_abspath_altnamespace=
-  case $func_normal_abspath_tpath in
-    "")
-      # Empty path, that just means $cwd.
-      func_stripname '' '/' "`pwd`"
-      func_normal_abspath_result=$func_stripname_result
-      return
-    ;;
-    # The next three entries are used to spot a run of precisely
-    # two leading slashes without using negated character classes;
-    # we take advantage of case's first-match behaviour.
-    ///*)
-      # Unusual form of absolute path, do nothing.
-    ;;
-    //*)
-      # Not necessarily an ordinary path; POSIX reserves leading '//'
-      # and for example Cygwin uses it to access remote file shares
-      # over CIFS/SMB, so we conserve a leading double slash if found.
-      func_normal_abspath_altnamespace=/
-    ;;
-    /*)
-      # Absolute path, do nothing.
-    ;;
-    *)
-      # Relative path, prepend $cwd.
-      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-    ;;
-  esac
-  # Cancel out all the simple stuff to save iterations.  We also want
-  # the path to end with a slash for ease of parsing, so make sure
-  # there is one (and only one) here.
-  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
-  while :; do
-    # Processed it all yet?
-    if test "$func_normal_abspath_tpath" = / ; then
-      # If we ascended to the root using ".." the result may be empty now.
-      if test -z "$func_normal_abspath_result" ; then
-        func_normal_abspath_result=/
-      fi
-      break
-    fi
-    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcar"`
-    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcdr"`
-    # Figure out what to do with it
-    case $func_normal_abspath_tcomponent in
-      "")
-        # Trailing empty path component, ignore it.
-      ;;
-      ..)
-        # Parent dir; strip last assembled component from result.
-        func_dirname "$func_normal_abspath_result"
-        func_normal_abspath_result=$func_dirname_result
-      ;;
-      *)
-        # Actual path component, append it.
-        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
-      ;;
-    esac
-  done
-  # Restore leading double-slash if one was found on entry.
-  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
-
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-#             value returned in "$func_relative_path_result"
-func_relative_path ()
-{
-  func_relative_path_result=
-  func_normal_abspath "$1"
-  func_relative_path_tlibdir=$func_normal_abspath_result
-  func_normal_abspath "$2"
-  func_relative_path_tbindir=$func_normal_abspath_result
-
-  # Ascend the tree starting from libdir
-  while :; do
-    # check if we have found a prefix of bindir
-    case $func_relative_path_tbindir in
-      $func_relative_path_tlibdir)
-        # found an exact match
-        func_relative_path_tcancelled=
-        break
-        ;;
-      $func_relative_path_tlibdir*)
-        # found a matching prefix
-        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-        func_relative_path_tcancelled=$func_stripname_result
-        if test -z "$func_relative_path_result"; then
-          func_relative_path_result=.
-        fi
-        break
-        ;;
-      *)
-        func_dirname $func_relative_path_tlibdir
-        func_relative_path_tlibdir=${func_dirname_result}
-        if test "x$func_relative_path_tlibdir" = x ; then
-          # Have to descend all the way to the root!
-          func_relative_path_result=../$func_relative_path_result
-          func_relative_path_tcancelled=$func_relative_path_tbindir
-          break
-        fi
-        func_relative_path_result=../$func_relative_path_result
-        ;;
-    esac
-  done
-
-  # Now calculate path; take care to avoid doubling-up slashes.
-  func_stripname '' '/' "$func_relative_path_result"
-  func_relative_path_result=$func_stripname_result
-  func_stripname '/' '/' "$func_relative_path_tcancelled"
-  if test "x$func_stripname_result" != x ; then
-    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
-  fi
-
-  # Normalisation. If bindir is libdir, return empty string,
-  # else relative path ending with a slash; either way, target
-  # file name can be directly appended.
-  if test ! -z "$func_relative_path_result"; then
-    func_stripname './' '' "$func_relative_path_result/"
-    func_relative_path_result=$func_stripname_result
-  fi
-}
-
-# The name of this program:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
-
-# Make sure we have an absolute path for reexecution:
-case $progpath in
-  [\\/]*|[A-Za-z]:\\*) ;;
-  *[\\/]*)
-     progdir=$func_dirname_result
-     progdir=`cd "$progdir" && pwd`
-     progpath="$progdir/$progname"
-     ;;
-  *)
-     save_IFS="$IFS"
-     IFS=${PATH_SEPARATOR-:}
-     for progdir in $PATH; do
-       IFS="$save_IFS"
-       test -x "$progdir/$progname" && break
-     done
-     IFS="$save_IFS"
-     test -n "$progdir" || progdir=`pwd`
-     progpath="$progdir/$progname"
-     ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
-
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes.  A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
-  s/$bs4/&\\
-/g
-  s/^$bs2$dollar/$bs&/
-  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
-  s/\n//g"
-
-# Standard options:
-opt_dry_run=false
-opt_help=false
-opt_quiet=false
-opt_verbose=false
-opt_warning=:
-
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-}
-
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
-    $opt_verbose && func_echo ${1+"$@"}
-
-    # A bug in bash halts the script if the last line of a function
-    # fails when set -e is in force, so we need another command to
-    # work around that:
-    :
-}
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*"
-}
-
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-}
-
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
-
-    # bash bug again:
-    :
-}
-
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
-{
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
-
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    func_error ${1+"$@"}
-    func_fatal_error "$help"
-}
-help="Try \`$progname --help' for more information."  ## default
-
-
-# func_grep expression filename
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
-    $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# func_mkdir_p directory-path
-# Make sure the entire path to DIRECTORY-PATH is available.
-func_mkdir_p ()
-{
-    my_directory_path="$1"
-    my_dir_list=
-
-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
-
-      # Protect directory names starting with `-'
-      case $my_directory_path in
-        -*) my_directory_path="./$my_directory_path" ;;
-      esac
-
-      # While some portion of DIR does not yet exist...
-      while test ! -d "$my_directory_path"; do
-        # ...make a list in topmost first order.  Use a colon delimited
-	# list incase some portion of path contains whitespace.
-        my_dir_list="$my_directory_path:$my_dir_list"
-
-        # If the last portion added has no slash in it, the list is done
-        case $my_directory_path in */*) ;; *) break ;; esac
-
-        # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
-      done
-      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
-
-      save_mkdir_p_IFS="$IFS"; IFS=':'
-      for my_dir in $my_dir_list; do
-	IFS="$save_mkdir_p_IFS"
-        # mkdir can fail with a `File exist' error if two processes
-        # try to create one of the directories concurrently.  Don't
-        # stop in that case!
-        $MKDIR "$my_dir" 2>/dev/null || :
-      done
-      IFS="$save_mkdir_p_IFS"
-
-      # Bail out if we (or some other process) failed to create a directory.
-      test -d "$my_directory_path" || \
-        func_fatal_error "Failed to create \`$1'"
-    fi
-}
-
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$opt_dry_run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-        # Failing that, at least try and use $RANDOM to avoid a race
-        my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-        save_mktempdir_umask=`umask`
-        umask 0077
-        $MKDIR "$my_tmpdir"
-        umask $save_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || \
-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-    fi
-
-    $ECHO "$my_tmpdir"
-}
-
-
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
-{
-    case $1 in
-      *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-      *)
-        func_quote_for_eval_unquoted_result="$1" ;;
-    esac
-
-    case $func_quote_for_eval_unquoted_result in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting, command substitution and and variable
-      # expansion for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
-        ;;
-      *)
-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
-    esac
-}
-
-
-# func_quote_for_expand arg
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
-{
-    case $1 in
-      *[\\\`\"]*)
-	my_arg=`$ECHO "$1" | $SED \
-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-      *)
-        my_arg="$1" ;;
-    esac
-
-    case $my_arg in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting and command substitution for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        my_arg="\"$my_arg\""
-        ;;
-    esac
-
-    func_quote_for_expand_result="$my_arg"
-}
-
-
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$my_cmd"
-      my_status=$?
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.  Use the saved locale for evaluation.
-func_show_eval_locale ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$lt_user_locale
-	    $my_cmd"
-      my_status=$?
-      eval "$lt_safe_locale"
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-# func_tr_sh
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result.  All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
-  case $1 in
-  [0-9]* | *[!a-zA-Z0-9_]*)
-    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
-    ;;
-  * )
-    func_tr_sh_result=$1
-    ;;
-  esac
-}
-
-
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
-    $opt_debug
-
-    $SED -n '/(C)/!b go
-	:more
-	/\./!{
-	  N
-	  s/\n# / /
-	  b more
-	}
-	:go
-	/^# '$PROGRAM' (GNU /,/# warranty; / {
-        s/^# //
-	s/^# *$//
-        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-        p
-     }' < "$progpath"
-     exit $?
-}
-
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
-{
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/^#  *.*--help/ {
-        s/^# //
-	s/^# *$//
-	s/\$progname/'$progname'/
-	p
-    }' < "$progpath"
-    echo
-    $ECHO "run \`$progname --help | more' for full usage"
-    exit $?
-}
-
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
-func_help ()
-{
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/# Report bugs to/ {
-	:print
-        s/^# //
-	s/^# *$//
-	s*\$progname*'$progname'*
-	s*\$host*'"$host"'*
-	s*\$SHELL*'"$SHELL"'*
-	s*\$LTCC*'"$LTCC"'*
-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-	s*\$LD*'"$LD"'*
-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
-	p
-	d
-     }
-     /^# .* home page:/b print
-     /^# General help using/b print
-     ' < "$progpath"
-    ret=$?
-    if test -z "$1"; then
-      exit $ret
-    fi
-}
-
-# func_missing_arg argname
-# Echo program name prefixed message to standard error and set global
-# exit_cmd.
-func_missing_arg ()
-{
-    $opt_debug
-
-    func_error "missing argument for $1."
-    exit_cmd=exit
-}
-
-
-# func_split_short_opt shortopt
-# Set func_split_short_opt_name and func_split_short_opt_arg shell
-# variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
-{
-    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
-    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
-
-    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
-    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
-
-
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
-{
-    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-    my_sed_long_arg='1s/^--[^=]*=//'
-
-    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
-    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
-
-exit_cmd=:
-
-
-
-
-
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
-
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-    eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
-
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
-    func_quote_for_eval "${2}"
-    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
-
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-    func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
-
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
-
-
-# func_lo2o object
-func_lo2o ()
-{
-    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
-
-
-# func_xform libobj-or-source
-func_xform ()
-{
-    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
-
-
-# func_fatal_configuration arg...
-# Echo program name prefixed message to standard error, followed by
-# a configuration failure hint, and exit.
-func_fatal_configuration ()
-{
-    func_error ${1+"$@"}
-    func_error "See the $PACKAGE documentation for more information."
-    func_fatal_error "Fatal configuration error."
-}
-
-
-# func_config
-# Display the configuration for all the tags in this script.
-func_config ()
-{
-    re_begincf='^# ### BEGIN LIBTOOL'
-    re_endcf='^# ### END LIBTOOL'
-
-    # Default configuration.
-    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
-
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-    done
-
-    exit $?
-}
-
-# func_features
-# Display the features supported by this script.
-func_features ()
-{
-    echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      echo "enable shared libraries"
-    else
-      echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      echo "enable static libraries"
-    else
-      echo "disable static libraries"
-    fi
-
-    exit $?
-}
-
-# func_enable_tag tagname
-# Verify that TAGNAME is valid, and either flag an error and exit, or
-# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
-# variable here.
-func_enable_tag ()
-{
-  # Global variable:
-  tagname="$1"
-
-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-  sed_extractcf="/$re_begincf/,/$re_endcf/p"
-
-  # Validate tagname.
-  case $tagname in
-    *[!-_A-Za-z0-9,/]*)
-      func_fatal_error "invalid tag name: $tagname"
-      ;;
-  esac
-
-  # Don't test for the "default" C tag, as we know it's
-  # there but not specially marked.
-  case $tagname in
-    CC) ;;
-    *)
-      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	taglist="$taglist $tagname"
-
-	# Evaluate the configuration.  Be careful to quote the path
-	# and the sed script, to avoid splitting on whitespace, but
-	# also don't use non-portable quotes within backquotes within
-	# quotes we have to do it in 2 steps:
-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	eval "$extractedcf"
-      else
-	func_error "ignoring unknown tag $tagname"
-      fi
-      ;;
-  esac
-}
-
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
-    fi
-
-    exit $EXIT_MISMATCH
-  fi
-}
-
-
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
-  shift; set dummy --mode clean ${1+"$@"}; shift
-  ;;
-compile|compil|compi|comp|com|co|c)
-  shift; set dummy --mode compile ${1+"$@"}; shift
-  ;;
-execute|execut|execu|exec|exe|ex|e)
-  shift; set dummy --mode execute ${1+"$@"}; shift
-  ;;
-finish|finis|fini|fin|fi|f)
-  shift; set dummy --mode finish ${1+"$@"}; shift
-  ;;
-install|instal|insta|inst|ins|in|i)
-  shift; set dummy --mode install ${1+"$@"}; shift
-  ;;
-link|lin|li|l)
-  shift; set dummy --mode link ${1+"$@"}; shift
-  ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-  shift; set dummy --mode uninstall ${1+"$@"}; shift
-  ;;
-esac
-
-
-
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_warning=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
-
-
-# Parse options once, thoroughly.  This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
-{
-  # this just eases exit handling
-  while test $# -gt 0; do
-    opt="$1"
-    shift
-    case $opt in
-      --debug|-x)	opt_debug='set -x'
-			func_echo "enabling shell trace mode"
-			$opt_debug
-			;;
-      --dry-run|--dryrun|-n)
-			opt_dry_run=:
-			;;
-      --config)
-			opt_config=:
-func_config
-			;;
-      --dlopen|-dlopen)
-			optarg="$1"
-			opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
-			shift
-			;;
-      --preserve-dup-deps)
-			opt_preserve_dup_deps=:
-			;;
-      --features)
-			opt_features=:
-func_features
-			;;
-      --finish)
-			opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
-			;;
-      --help)
-			opt_help=:
-			;;
-      --help-all)
-			opt_help_all=:
-opt_help=': help-all'
-			;;
-      --mode)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_mode="$optarg"
-case $optarg in
-  # Valid mode arguments:
-  clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
-  # Catch anything else as an error
-  *) func_error "invalid argument for $opt"
-     exit_cmd=exit
-     break
-     ;;
-esac
-			shift
-			;;
-      --no-silent|--no-quiet)
-			opt_silent=false
-func_append preserve_args " $opt"
-			;;
-      --no-warning|--no-warn)
-			opt_warning=false
-func_append preserve_args " $opt"
-			;;
-      --no-verbose)
-			opt_verbose=false
-func_append preserve_args " $opt"
-			;;
-      --silent|--quiet)
-			opt_silent=:
-func_append preserve_args " $opt"
-        opt_verbose=false
-			;;
-      --verbose|-v)
-			opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
-			;;
-      --tag)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
-			shift
-			;;
-
-      -\?|-h)		func_usage				;;
-      --help)		func_help				;;
-      --version)	func_version				;;
-
-      # Separate optargs to long options:
-      --*=*)
-			func_split_long_opt "$opt"
-			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
-			shift
-			;;
-
-      # Separate non-argument short options:
-      -\?*|-h*|-n*|-v*)
-			func_split_short_opt "$opt"
-			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
-			shift
-			;;
-
-      --)		break					;;
-      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
-      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
-    esac
-  done
-
-  # Validate options:
-
-  # save first non-option argument
-  if test "$#" -gt 0; then
-    nonopt="$opt"
-    shift
-  fi
-
-  # preserve --debug
-  test "$opt_debug" = : || func_append preserve_args " --debug"
-
-  case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
-      # don't eliminate duplications in $postdeps and $predeps
-      opt_duplicate_compiler_generated_deps=:
-      ;;
-    *)
-      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-      ;;
-  esac
-
-  $opt_help || {
-    # Sanity checks first:
-    func_check_version_match
-
-    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-      func_fatal_configuration "not configured to build any kind of library"
-    fi
-
-    # Darwin sucks
-    eval std_shrext=\"$shrext_cmds\"
-
-    # Only execute mode is allowed to have -dlopen flags.
-    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
-      func_error "unrecognized option \`-dlopen'"
-      $ECHO "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Change the help message to a mode-specific one.
-    generic_help="$help"
-    help="Try \`$progname --help --mode=$opt_mode' for more information."
-  }
-
-
-  # Bail if the options were screwed
-  $exit_cmd $EXIT_FAILURE
-}
-
-
-
-
-## ----------- ##
-##    Main.    ##
-## ----------- ##
-
-# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_lalib_p ()
-{
-    test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null \
-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-}
-
-# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function implements the same check as func_lalib_p without
-# resorting to external programs.  To this end, it redirects stdin and
-# closes it afterwards, without saving the original file descriptor.
-# As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if `file' does not exist.
-func_lalib_unsafe_p ()
-{
-    lalib_p=no
-    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
-	for lalib_p_l in 1 2 3 4
-	do
-	    read lalib_p_line
-	    case "$lalib_p_line" in
-		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
-	    esac
-	done
-	exec 0<&5 5<&-
-    fi
-    test "$lalib_p" = yes
-}
-
-# func_ltwrapper_script_p file
-# True iff FILE is a libtool wrapper script
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_script_p ()
-{
-    func_lalib_p "$1"
-}
-
-# func_ltwrapper_executable_p file
-# True iff FILE is a libtool wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_executable_p ()
-{
-    func_ltwrapper_exec_suffix=
-    case $1 in
-    *.exe) ;;
-    *) func_ltwrapper_exec_suffix=.exe ;;
-    esac
-    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
-}
-
-# func_ltwrapper_scriptname file
-# Assumes file is an ltwrapper_executable
-# uses $file to determine the appropriate filename for a
-# temporary ltwrapper_script.
-func_ltwrapper_scriptname ()
-{
-    func_dirname_and_basename "$1" "" "."
-    func_stripname '' '.exe' "$func_basename_result"
-    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-}
-
-# func_ltwrapper_p file
-# True iff FILE is a libtool wrapper script or wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_p ()
-{
-    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
-}
-
-
-# func_execute_cmds commands fail_cmd
-# Execute tilde-delimited COMMANDS.
-# If FAIL_CMD is given, eval that upon failure.
-# FAIL_CMD may read-access the current command in variable CMD!
-func_execute_cmds ()
-{
-    $opt_debug
-    save_ifs=$IFS; IFS='~'
-    for cmd in $1; do
-      IFS=$save_ifs
-      eval cmd=\"$cmd\"
-      func_show_eval "$cmd" "${2-:}"
-    done
-    IFS=$save_ifs
-}
-
-
-# func_source file
-# Source FILE, adding directory component if necessary.
-# Note that it is not necessary on cygwin/mingw to append a dot to
-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
-# behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
-func_source ()
-{
-    $opt_debug
-    case $1 in
-    */* | *\\*)	. "$1" ;;
-    *)		. "./$1" ;;
-    esac
-}
-
-
-# func_resolve_sysroot PATH
-# Replace a leading = in PATH with a sysroot.  Store the result into
-# func_resolve_sysroot_result
-func_resolve_sysroot ()
-{
-  func_resolve_sysroot_result=$1
-  case $func_resolve_sysroot_result in
-  =*)
-    func_stripname '=' '' "$func_resolve_sysroot_result"
-    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
-    ;;
-  esac
-}
-
-# func_replace_sysroot PATH
-# If PATH begins with the sysroot, replace it with = and
-# store the result into func_replace_sysroot_result.
-func_replace_sysroot ()
-{
-  case "$lt_sysroot:$1" in
-  ?*:"$lt_sysroot"*)
-    func_stripname "$lt_sysroot" '' "$1"
-    func_replace_sysroot_result="=$func_stripname_result"
-    ;;
-  *)
-    # Including no sysroot.
-    func_replace_sysroot_result=$1
-    ;;
-  esac
-}
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    $opt_debug
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	func_append_quoted CC_quoted "$arg"
-      done
-      CC_expanded=`func_echo_all $CC`
-      CC_quoted_expanded=`func_echo_all $CC_quoted`
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	      # Double-quote args containing other shell metacharacters.
-	      func_append_quoted CC_quoted "$arg"
-	    done
-	    CC_expanded=`func_echo_all $CC`
-	    CC_quoted_expanded=`func_echo_all $CC_quoted`
-	    case "$@ " in
-	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with \`--tag'"
-#	else
-#	  func_verbose "using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# but don't create it if we're doing a dry run.
-func_write_libtool_object ()
-{
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
-    else
-      write_lobj=none
-    fi
-
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
-    else
-      write_oldobj=none
-    fi
-
-    $opt_dry_run || {
-      cat >${write_libobj}T </dev/null`
-    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
-      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-        $SED -e "$lt_sed_naive_backslashify"`
-    else
-      func_convert_core_file_wine_to_w32_result=
-    fi
-  fi
-}
-# end: func_convert_core_file_wine_to_w32
-
-
-# func_convert_core_path_wine_to_w32 ARG
-# Helper function used by path conversion functions when $build is *nix, and
-# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
-# configured wine environment available, with the winepath program in $build's
-# $PATH. Assumes ARG has no leading or trailing path separator characters.
-#
-# ARG is path to be converted from $build format to win32.
-# Result is available in $func_convert_core_path_wine_to_w32_result.
-# Unconvertible file (directory) names in ARG are skipped; if no directory names
-# are convertible, then the result may be empty.
-func_convert_core_path_wine_to_w32 ()
-{
-  $opt_debug
-  # unfortunately, winepath doesn't convert paths, only file names
-  func_convert_core_path_wine_to_w32_result=""
-  if test -n "$1"; then
-    oldIFS=$IFS
-    IFS=:
-    for func_convert_core_path_wine_to_w32_f in $1; do
-      IFS=$oldIFS
-      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
-        if test -z "$func_convert_core_path_wine_to_w32_result"; then
-          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
-        else
-          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
-        fi
-      fi
-    done
-    IFS=$oldIFS
-  fi
-}
-# end: func_convert_core_path_wine_to_w32
-
-
-# func_cygpath ARGS...
-# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
-# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
-# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
-# (2), returns the Cygwin file name or path in func_cygpath_result (input
-# file name or path is assumed to be in w32 format, as previously converted
-# from $build's *nix or MSYS format). In case (3), returns the w32 file name
-# or path in func_cygpath_result (input file name or path is assumed to be in
-# Cygwin format). Returns an empty string on error.
-#
-# ARGS are passed to cygpath, with the last one being the file name or path to
-# be converted.
-#
-# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
-# environment variable; do not put it in $PATH.
-func_cygpath ()
-{
-  $opt_debug
-  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
-    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
-    if test "$?" -ne 0; then
-      # on failure, ensure result is empty
-      func_cygpath_result=
-    fi
-  else
-    func_cygpath_result=
-    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
-  fi
-}
-#end: func_cygpath
-
-
-# func_convert_core_msys_to_w32 ARG
-# Convert file name or path ARG from MSYS format to w32 format.  Return
-# result in func_convert_core_msys_to_w32_result.
-func_convert_core_msys_to_w32 ()
-{
-  $opt_debug
-  # awkward: cmd appends spaces to result
-  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-}
-#end: func_convert_core_msys_to_w32
-
-
-# func_convert_file_check ARG1 ARG2
-# Verify that ARG1 (a file name in $build format) was converted to $host
-# format in ARG2. Otherwise, emit an error message, but continue (resetting
-# func_to_host_file_result to ARG1).
-func_convert_file_check ()
-{
-  $opt_debug
-  if test -z "$2" && test -n "$1" ; then
-    func_error "Could not determine host file name corresponding to"
-    func_error "  \`$1'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback:
-    func_to_host_file_result="$1"
-  fi
-}
-# end func_convert_file_check
-
-
-# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
-# Verify that FROM_PATH (a path in $build format) was converted to $host
-# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
-# func_to_host_file_result to a simplistic fallback value (see below).
-func_convert_path_check ()
-{
-  $opt_debug
-  if test -z "$4" && test -n "$3"; then
-    func_error "Could not determine the host path corresponding to"
-    func_error "  \`$3'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback.  This is a deliberately simplistic "conversion" and
-    # should not be "improved".  See libtool.info.
-    if test "x$1" != "x$2"; then
-      lt_replace_pathsep_chars="s|$1|$2|g"
-      func_to_host_path_result=`echo "$3" |
-        $SED -e "$lt_replace_pathsep_chars"`
-    else
-      func_to_host_path_result="$3"
-    fi
-  fi
-}
-# end func_convert_path_check
-
-
-# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
-# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
-# and appending REPL if ORIG matches BACKPAT.
-func_convert_path_front_back_pathsep ()
-{
-  $opt_debug
-  case $4 in
-  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
-    ;;
-  esac
-  case $4 in
-  $2 ) func_append func_to_host_path_result "$3"
-    ;;
-  esac
-}
-# end func_convert_path_front_back_pathsep
-
-
-##################################################
-# $build to $host FILE NAME CONVERSION FUNCTIONS #
-##################################################
-# invoked via `$to_host_file_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# Result will be available in $func_to_host_file_result.
-
-
-# func_to_host_file ARG
-# Converts the file name ARG from $build format to $host format. Return result
-# in func_to_host_file_result.
-func_to_host_file ()
-{
-  $opt_debug
-  $to_host_file_cmd "$1"
-}
-# end func_to_host_file
-
-
-# func_to_tool_file ARG LAZY
-# converts the file name ARG from $build format to toolchain format. Return
-# result in func_to_tool_file_result.  If the conversion in use is listed
-# in (the comma separated) LAZY, no conversion takes place.
-func_to_tool_file ()
-{
-  $opt_debug
-  case ,$2, in
-    *,"$to_tool_file_cmd",*)
-      func_to_tool_file_result=$1
-      ;;
-    *)
-      $to_tool_file_cmd "$1"
-      func_to_tool_file_result=$func_to_host_file_result
-      ;;
-  esac
-}
-# end func_to_tool_file
-
-
-# func_convert_file_noop ARG
-# Copy ARG to func_to_host_file_result.
-func_convert_file_noop ()
-{
-  func_to_host_file_result="$1"
-}
-# end func_convert_file_noop
-
-
-# func_convert_file_msys_to_w32 ARG
-# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_file_result.
-func_convert_file_msys_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_w32
-
-
-# func_convert_file_cygwin_to_w32 ARG
-# Convert file name ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_file_cygwin_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
-    # LT_CYGPATH in this case.
-    func_to_host_file_result=`cygpath -m "$1"`
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_cygwin_to_w32
-
-
-# func_convert_file_nix_to_w32 ARG
-# Convert file name ARG from *nix to w32 format.  Requires a wine environment
-# and a working winepath. Returns result in func_to_host_file_result.
-func_convert_file_nix_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_file_wine_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_w32
-
-
-# func_convert_file_msys_to_cygwin ARG
-# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_file_msys_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_msys_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_cygwin
-
-
-# func_convert_file_nix_to_cygwin ARG
-# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
-# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
-# in func_to_host_file_result.
-func_convert_file_nix_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
-    func_convert_core_file_wine_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_cygwin
-
-
-#############################################
-# $build to $host PATH CONVERSION FUNCTIONS #
-#############################################
-# invoked via `$to_host_path_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# The result will be available in $func_to_host_path_result.
-#
-# Path separators are also converted from $build format to $host format.  If
-# ARG begins or ends with a path separator character, it is preserved (but
-# converted to $host format) on output.
-#
-# All path conversion functions are named using the following convention:
-#   file name conversion function    : func_convert_file_X_to_Y ()
-#   path conversion function         : func_convert_path_X_to_Y ()
-# where, for any given $build/$host combination the 'X_to_Y' value is the
-# same.  If conversion functions are added for new $build/$host combinations,
-# the two new functions must follow this pattern, or func_init_to_host_path_cmd
-# will break.
-
-
-# func_init_to_host_path_cmd
-# Ensures that function "pointer" variable $to_host_path_cmd is set to the
-# appropriate value, based on the value of $to_host_file_cmd.
-to_host_path_cmd=
-func_init_to_host_path_cmd ()
-{
-  $opt_debug
-  if test -z "$to_host_path_cmd"; then
-    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-    to_host_path_cmd="func_convert_path_${func_stripname_result}"
-  fi
-}
-
-
-# func_to_host_path ARG
-# Converts the path ARG from $build format to $host format. Return result
-# in func_to_host_path_result.
-func_to_host_path ()
-{
-  $opt_debug
-  func_init_to_host_path_cmd
-  $to_host_path_cmd "$1"
-}
-# end func_to_host_path
-
-
-# func_convert_path_noop ARG
-# Copy ARG to func_to_host_path_result.
-func_convert_path_noop ()
-{
-  func_to_host_path_result="$1"
-}
-# end func_convert_path_noop
-
-
-# func_convert_path_msys_to_w32 ARG
-# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_path_result.
-func_convert_path_msys_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from ARG.  MSYS
-    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
-    # and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_msys_to_w32
-
-
-# func_convert_path_cygwin_to_w32 ARG
-# Convert path ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_path_cygwin_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_cygwin_to_w32
-
-
-# func_convert_path_nix_to_w32 ARG
-# Convert path ARG from *nix to w32 format.  Requires a wine environment and
-# a working winepath.  Returns result in func_to_host_file_result.
-func_convert_path_nix_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_nix_to_w32
-
-
-# func_convert_path_msys_to_cygwin ARG
-# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_path_msys_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_msys_to_cygwin
-
-
-# func_convert_path_nix_to_cygwin ARG
-# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
-# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
-# func_to_host_file_result.
-func_convert_path_nix_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from
-    # ARG. msys behavior is inconsistent here, cygpath turns them
-    # into '.;' and ';.', and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_nix_to_cygwin
-
-
-# func_mode_compile arg...
-func_mode_compile ()
-{
-    $opt_debug
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-    pie_flag=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify \`-o' more than once"
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-pie | -fpie | -fPIE)
-          func_append pie_flag " $arg"
-	  continue
-	  ;;
-
-	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  func_append later " $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  func_stripname '-Wc,' '' "$arg"
-	  args=$func_stripname_result
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
-	  for arg in $args; do
-	    IFS="$save_ifs"
-	    func_append_quoted lastarg "$arg"
-	  done
-	  IFS="$save_ifs"
-	  func_stripname ' ' '' "$lastarg"
-	  lastarg=$func_stripname_result
-
-	  # Add the arguments to base_compile.
-	  func_append base_compile " $lastarg"
-	  continue
-	  ;;
-
-	*)
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      func_append_quoted base_compile "$lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      func_fatal_error "you must specify an argument for -Xcompile"
-      ;;
-    target)
-      func_fatal_error "you must specify a target with \`-o'"
-      ;;
-    *)
-      # Get the name of the library object.
-      test -z "$libobj" && {
-	func_basename "$srcfile"
-	libobj="$func_basename_result"
-      }
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    case $libobj in
-    *.[cCFSifmso] | \
-    *.ada | *.adb | *.ads | *.asm | \
-    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
-      func_xform "$libobj"
-      libobj=$func_xform_result
-      ;;
-    esac
-
-    case $libobj in
-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-    *)
-      func_fatal_error "cannot determine name of library object from \`$libobj'"
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	continue
-	;;
-
-      -static)
-	build_libtool_libs=no
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    func_quote_for_eval "$libobj"
-    test "X$libobj" != "X$func_quote_for_eval_result" \
-      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-      && func_warning "libobj name \`$libobj' may not contain shell special characters."
-    func_dirname_and_basename "$obj" "/" ""
-    objname="$func_basename_result"
-    xdir="$func_dirname_result"
-    lobj=${xdir}$objdir/$objname
-
-    test -z "$base_compile" && \
-      func_fatal_help "you must specify a compilation command"
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2* | cegcc*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$ECHO "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-      func_append removelist " $output_obj"
-      $ECHO "$srcfile" > "$lockfile"
-    fi
-
-    $opt_dry_run || $RM $removelist
-    func_append removelist " $lockfile"
-    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-
-    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
-    srcfile=$func_to_tool_file_result
-    func_quote_for_eval "$srcfile"
-    qsrcfile=$func_quote_for_eval_result
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      func_mkdir_p "$xdir$objdir"
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	func_append command " -o $lobj"
-      fi
-
-      func_show_eval_locale "$command"	\
-          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	func_show_eval '$MV "$output_obj" "$lobj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-	suppress_output=' >/dev/null 2>&1'
-      fi
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile$pie_flag"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	func_append command " -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      func_append command "$suppress_output"
-      func_show_eval_locale "$command" \
-        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	func_show_eval '$MV "$output_obj" "$obj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-    fi
-
-    $opt_dry_run || {
-      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
-
-      # Unlock the critical section if it was locked
-      if test "$need_locks" != no; then
-	removelist=$lockfile
-        $RM "$lockfile"
-      fi
-    }
-
-    exit $EXIT_SUCCESS
-}
-
-$opt_help || {
-  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
-}
-
-func_mode_help ()
-{
-    # We need to display help for each of the modes.
-    case $opt_mode in
-      "")
-        # Generic help is extracted from the usage comments
-        # at the start of this file.
-        func_help
-        ;;
-
-      clean)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      compile)
-      $ECHO \
-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to build PIC objects only
-  -prefer-non-pic   try to build non-PIC objects only
-  -shared           do not build a \`.o' file suitable for static linking
-  -static           only build a \`.o' file suitable for static linking
-  -Wc,FLAG          pass FLAG directly to the compiler
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-        ;;
-
-      execute)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-        ;;
-
-      finish)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-        ;;
-
-      install)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The following components of INSTALL-COMMAND are treated specially:
-
-  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-        ;;
-
-      link)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -bindir BINDIR    specify path to binaries directory (for systems where
-                    libraries must be found in the PATH setting at runtime)
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -shared           only do dynamic linking of libtool libraries
-  -shrext SUFFIX    override the standard shared library file extension
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-  -weak LIBNAME     declare that the target provides the LIBNAME interface
-  -Wc,FLAG
-  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
-  -Wl,FLAG
-  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
-  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-        ;;
-
-      uninstall)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      *)
-        func_fatal_help "invalid operation mode \`$opt_mode'"
-        ;;
-    esac
-
-    echo
-    $ECHO "Try \`$progname --help' for more information about other modes."
-}
-
-# Now that we've collected a possible --mode arg, show help if necessary
-if $opt_help; then
-  if test "$opt_help" = :; then
-    func_mode_help
-  else
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	func_mode_help
-      done
-    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	echo
-	func_mode_help
-      done
-    } |
-    sed '1d
-      /^When reporting/,/^Report/{
-	H
-	d
-      }
-      $x
-      /information about other modes/d
-      /more detailed .*MODE/d
-      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
-  fi
-  exit $?
-fi
-
-
-# func_mode_execute arg...
-func_mode_execute ()
-{
-    $opt_debug
-    # The first argument is the command name.
-    cmd="$nonopt"
-    test -z "$cmd" && \
-      func_fatal_help "you must specify a COMMAND"
-
-    # Handle -dlopen flags immediately.
-    for file in $opt_dlopen; do
-      test -f "$file" \
-	|| func_fatal_help "\`$file' is not a file"
-
-      dir=
-      case $file in
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$lib' is not a valid libtool archive"
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-	func_source "$file"
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && \
-	    func_warning "\`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  func_append dir "/$objdir"
-	else
-	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-	;;
-
-      *)
-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -* | *.la | *.lo ) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if func_ltwrapper_script_p "$file"; then
-	  func_source "$file"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	elif func_ltwrapper_executable_p "$file"; then
-	  func_ltwrapper_scriptname "$file"
-	  func_source "$func_ltwrapper_scriptname_result"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      func_append_quoted args "$file"
-    done
-
-    if test "X$opt_dry_run" = Xfalse; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-	eval "if test \"\${save_$lt_var+set}\" = set; then
-                $lt_var=\$save_$lt_var; export $lt_var
-	      else
-		$lt_unset $lt_var
-	      fi"
-      done
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	echo "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
-    $opt_debug
-    libs=
-    libdirs=
-    admincmds=
-
-    for opt in "$nonopt" ${1+"$@"}
-    do
-      if test -d "$opt"; then
-	func_append libdirs " $opt"
-
-      elif test -f "$opt"; then
-	if func_lalib_unsafe_p "$opt"; then
-	  func_append libs " $opt"
-	else
-	  func_warning "\`$opt' is not a valid libtool archive"
-	fi
-
-      else
-	func_fatal_error "invalid argument \`$opt'"
-      fi
-    done
-
-    if test -n "$libs"; then
-      if test -n "$lt_sysroot"; then
-        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
-        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
-      else
-        sysroot_cmd=
-      fi
-
-      # Remove sysroot references
-      if $opt_dry_run; then
-        for lib in $libs; do
-          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
-        done
-      else
-        tmpdir=`func_mktempdir`
-        for lib in $libs; do
-	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
-	    > $tmpdir/tmp-la
-	  mv -f $tmpdir/tmp-la $lib
-	done
-        ${RM}r "$tmpdir"
-      fi
-    fi
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-'"$cmd"'"'
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || func_append admincmds "
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    $opt_silent && exit $EXIT_SUCCESS
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      echo "----------------------------------------------------------------------"
-      echo "Libraries have been installed in:"
-      for libdir in $libdirs; do
-	$ECHO "   $libdir"
-      done
-      echo
-      echo "If you ever happen to want to link against installed libraries"
-      echo "in a given directory, LIBDIR, you must either use libtool, and"
-      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-      echo "flag during linking and do at least one of the following:"
-      if test -n "$shlibpath_var"; then
-	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-	echo "     during execution"
-      fi
-      if test -n "$runpath_var"; then
-	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-	echo "     during linking"
-      fi
-      if test -n "$hardcode_libdir_flag_spec"; then
-	libdir=LIBDIR
-	eval flag=\"$hardcode_libdir_flag_spec\"
-
-	$ECHO "   - use the \`$flag' linker flag"
-      fi
-      if test -n "$admincmds"; then
-	$ECHO "   - have your system administrator run these commands:$admincmds"
-      fi
-      if test -f /etc/ld.so.conf; then
-	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-      fi
-      echo
-
-      echo "See any operating system documentation about shared libraries for"
-      case $host in
-	solaris2.[6789]|solaris2.1[0-9])
-	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	  echo "pages."
-	  ;;
-	*)
-	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
-	  ;;
-      esac
-      echo "----------------------------------------------------------------------"
-    fi
-    exit $EXIT_SUCCESS
-}
-
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
-
-
-# func_mode_install arg...
-func_mode_install ()
-{
-    $opt_debug
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       case $nonopt in *shtool*) :;; *) false;; esac; then
-      # Aesthetically quote it.
-      func_quote_for_eval "$nonopt"
-      install_prog="$func_quote_for_eval_result "
-      arg=$1
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    func_quote_for_eval "$arg"
-    func_append install_prog "$func_quote_for_eval_result"
-    install_shared_prog=$install_prog
-    case " $install_prog " in
-      *[\\\ /]cp\ *) install_cp=: ;;
-      *) install_cp=false ;;
-    esac
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    no_mode=:
-    for arg
-    do
-      arg2=
-      if test -n "$dest"; then
-	func_append files " $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f)
-	if $install_cp; then :; else
-	  prev=$arg
-	fi
-	;;
-      -g | -m | -o)
-	prev=$arg
-	;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
-	    arg2=$install_override_mode
-	    no_mode=false
-	  fi
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      func_quote_for_eval "$arg"
-      func_append install_prog " $func_quote_for_eval_result"
-      if test -n "$arg2"; then
-	func_quote_for_eval "$arg2"
-      fi
-      func_append install_shared_prog " $func_quote_for_eval_result"
-    done
-
-    test -z "$install_prog" && \
-      func_fatal_help "you must specify an install program"
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prev' option requires an argument"
-
-    if test -n "$install_override_mode" && $no_mode; then
-      if $install_cp; then :; else
-	func_quote_for_eval "$install_override_mode"
-	func_append install_shared_prog " -m $func_quote_for_eval_result"
-      fi
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	func_fatal_help "no file or destination specified"
-      else
-	func_fatal_help "you must specify a destination"
-      fi
-    fi
-
-    # Strip any trailing slash from the destination.
-    func_stripname '' '/' "$dest"
-    dest=$func_stripname_result
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      func_dirname_and_basename "$dest" "" "."
-      destdir="$func_dirname_result"
-      destname="$func_basename_result"
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files; shift
-      test "$#" -gt 1 && \
-	func_fatal_help "\`$dest' is not a directory"
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  func_fatal_help "\`$destdir' must be an absolute directory name"
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	func_append staticlibs " $file"
-	;;
-
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$file' is not a valid libtool archive"
-
-	library_names=
-	old_library=
-	relink_command=
-	func_source "$file"
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) func_append current_libdirs " $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) func_append future_libdirs " $libdir" ;;
-	  esac
-	fi
-
-	func_dirname "$file" "/" ""
-	dir="$func_dirname_result"
-	func_append dir "$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  test "$inst_prefix_dir" = "$destdir" && \
-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  func_warning "relinking \`$file'"
-	  func_show_eval "$relink_command" \
-	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names; shift
-	if test -n "$1"; then
-	  realname="$1"
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
-	      'exit $?'
-	  tstripme="$stripme"
-	  case $host_os in
-	  cygwin* | mingw* | pw32* | cegcc*)
-	    case $realname in
-	    *.dll.a)
-	      tstripme=""
-	      ;;
-	    esac
-	    ;;
-	  esac
-	  if test -n "$tstripme" && test -n "$striplib"; then
-	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      test "$linkname" != "$realname" \
-		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  func_execute_cmds "$postinstall_cmds" 'exit $?'
-	fi
-
-	# Install the pseudo-library for information purposes.
-	func_basename "$file"
-	name="$func_basename_result"
-	instname="$dir/$name"i
-	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  func_lo2o "$destfile"
-	  staticdest=$func_lo2o_result
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	test -n "$destfile" && \
-	  func_show_eval "$install_prog $file $destfile" 'exit $?'
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  func_lo2o "$file"
-	  staticobj=$func_lo2o_result
-	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      func_stripname '' '.exe' "$file"
-	      file=$func_stripname_result
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin* | *mingw*)
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      wrapper=$func_ltwrapper_scriptname_result
-	    else
-	      func_stripname '' '.exe' "$file"
-	      wrapper=$func_stripname_result
-	    fi
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if func_ltwrapper_script_p "$wrapper"; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  func_source "$wrapper"
-
-	  # Check the variables that should have been set.
-	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      func_source "$lib"
-	    fi
-	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "\`$lib' has not been installed in \`$libdir'"
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  func_source "$wrapper"
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    $opt_dry_run || {
-	      if test "$finalize" = yes; then
-	        tmpdir=`func_mktempdir`
-		func_basename "$file$stripped_ext"
-		file="$func_basename_result"
-	        outputname="$tmpdir/$file"
-	        # Replace the output file specification.
-	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
-
-	        $opt_silent || {
-	          func_quote_for_expand "$relink_command"
-		  eval "func_echo $func_quote_for_expand_result"
-	        }
-	        if eval "$relink_command"; then :
-	          else
-		  func_error "error: relink \`$file' with the above command before installing it"
-		  $opt_dry_run || ${RM}r "$tmpdir"
-		  continue
-	        fi
-	        file="$outputname"
-	      else
-	        func_warning "cannot relink \`$file'"
-	      fi
-	    }
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    func_stripname '' '.exe' "$destfile"
-	    destfile=$func_stripname_result
-	    ;;
-	  esac
-	  ;;
-	esac
-	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-	$opt_dry_run || if test -n "$outputname"; then
-	  ${RM}r "$tmpdir"
-	fi
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      func_basename "$file"
-      name="$func_basename_result"
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-      tool_oldlib=$func_to_tool_file_result
-
-      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
-      fi
-
-      # Do each command in the postinstall commands.
-      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-    done
-
-    test -n "$future_libdirs" && \
-      func_warning "remember to run \`$progname --finish$future_libdirs'"
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
-
-
-# func_generate_dlsyms outputname originator pic_p
-# Extract symbols from dlprefiles and create ${outputname}S.o with
-# a dlpreopen symbol table.
-func_generate_dlsyms ()
-{
-    $opt_debug
-    my_outputname="$1"
-    my_originator="$2"
-    my_pic_p="${3-no}"
-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
-    my_dlsyms=
-
-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-      if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms="${my_outputname}S.c"
-      else
-	func_error "not configured to extract global symbols from dlpreopened files"
-      fi
-    fi
-
-    if test -n "$my_dlsyms"; then
-      case $my_dlsyms in
-      "") ;;
-      *.c)
-	# Discover the nlist of each of the dlfiles.
-	nlist="$output_objdir/${my_outputname}.nm"
-
-	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
-
-	# Parse the name list into a source file.
-	func_verbose "creating $output_objdir/$my_dlsyms"
-
-	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-#endif
-
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-/* External symbol declarations for the compiler. */\
-"
-
-	if test "$dlself" = yes; then
-	  func_verbose "generating symbol list for \`$output'"
-
-	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-
-	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	  for progfile in $progfiles; do
-	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
-	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -n "$exclude_expsyms"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  if test -n "$export_symbols_regex"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  # Prepare the list of exported symbols
-	  if test -z "$export_symbols"; then
-	    export_symbols="$output_objdir/$outputname.exp"
-	    $opt_dry_run || {
-	      $RM $export_symbols
-	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	      case $host in
-	      *cygwin* | *mingw* | *cegcc* )
-                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-	        ;;
-	      esac
-	    }
-	  else
-	    $opt_dry_run || {
-	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	      case $host in
-	        *cygwin* | *mingw* | *cegcc* )
-	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-	          ;;
-	      esac
-	    }
-	  fi
-	fi
-
-	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from \`$dlprefile'"
-	  func_basename "$dlprefile"
-	  name="$func_basename_result"
-          case $host in
-	    *cygwin* | *mingw* | *cegcc* )
-	      # if an import library, we need to obtain dlname
-	      if func_win32_import_lib_p "$dlprefile"; then
-	        func_tr_sh "$dlprefile"
-	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
-	        dlprefile_dlbasename=""
-	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
-	          # Use subshell, to avoid clobbering current variable values
-	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-	          if test -n "$dlprefile_dlname" ; then
-	            func_basename "$dlprefile_dlname"
-	            dlprefile_dlbasename="$func_basename_result"
-	          else
-	            # no lafile. user explicitly requested -dlpreopen .
-	            $sharedlib_from_linklib_cmd "$dlprefile"
-	            dlprefile_dlbasename=$sharedlib_from_linklib_result
-	          fi
-	        fi
-	        $opt_dry_run || {
-	          if test -n "$dlprefile_dlbasename" ; then
-	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
-	          else
-	            func_warning "Could not compute DLL name from $name"
-	            eval '$ECHO ": $name " >> "$nlist"'
-	          fi
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
-	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
-	        }
-	      else # not an import lib
-	        $opt_dry_run || {
-	          eval '$ECHO ": $name " >> "$nlist"'
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	        }
-	      fi
-	    ;;
-	    *)
-	      $opt_dry_run || {
-	        eval '$ECHO ": $name " >> "$nlist"'
-	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	      }
-	    ;;
-          esac
-	done
-
-	$opt_dry_run || {
-	  # Make sure we have at least an empty file.
-	  test -f "$nlist" || : > "$nlist"
-
-	  if test -n "$exclude_expsyms"; then
-	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	    $MV "$nlist"T "$nlist"
-	  fi
-
-	  # Try sorting and uniquifying the output.
-	  if $GREP -v "^: " < "$nlist" |
-	      if sort -k 3 /dev/null 2>&1; then
-		sort -k 3
-	      else
-		sort +2
-	      fi |
-	      uniq > "$nlist"S; then
-	    :
-	  else
-	    $GREP -v "^: " < "$nlist" > "$nlist"S
-	  fi
-
-	  if test -f "$nlist"S; then
-	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-	  else
-	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
-	  fi
-
-	  echo >> "$output_objdir/$my_dlsyms" "\
-
-/* The mapping between symbol names and symbols.  */
-typedef struct {
-  const char *name;
-  void *address;
-} lt_dlsymlist;
-extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
-LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
-  { \"$my_originator\", (void *) 0 },"
-
-	  case $need_lib_prefix in
-	  no)
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  *)
-	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  esac
-	  echo >> "$output_objdir/$my_dlsyms" "\
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_${my_prefix}_LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	} # !$opt_dry_run
-
-	pic_flag_for_symtable=
-	case "$compile_command " in
-	*" -static "*) ;;
-	*)
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-	  *-*-hpux*)
-	    pic_flag_for_symtable=" $pic_flag"  ;;
-	  *)
-	    if test "X$my_pic_p" != Xno; then
-	      pic_flag_for_symtable=" $pic_flag"
-	    fi
-	    ;;
-	  esac
-	  ;;
-	esac
-	symtab_cflags=
-	for arg in $LTCFLAGS; do
-	  case $arg in
-	  -pie | -fpie | -fPIE) ;;
-	  *) func_append symtab_cflags " $arg" ;;
-	  esac
-	done
-
-	# Now compile the dynamic symbol file.
-	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
-
-	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
-
-	# Transform the symbol file into the correct name.
-	symfileobj="$output_objdir/${my_outputname}S.$objext"
-	case $host in
-	*cygwin* | *mingw* | *cegcc* )
-	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	  else
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  fi
-	  ;;
-	*)
-	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  ;;
-	esac
-	;;
-      *)
-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
-	;;
-      esac
-    else
-      # We keep going just in case the user didn't refer to
-      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-      # really was required.
-
-      # Nullify the symbol file.
-      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
-    fi
-}
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-# Despite the name, also deal with 64 bit binaries.
-func_win32_libid ()
-{
-  $opt_debug
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-      func_to_tool_file "$1" func_convert_file_msys_to_w32
-      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
-	$SED -n -e '
-	    1,100{
-		/ I /{
-		    s,.*,import,
-		    p
-		    q
-		}
-	    }'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $ECHO "$win32_libid_type"
-}
-
-# func_cygming_dll_for_implib ARG
-#
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib ()
-{
-  $opt_debug
-  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
-}
-
-# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
-#
-# The is the core of a fallback implementation of a
-# platform-specific function to extract the name of the
-# DLL associated with the specified import library LIBNAME.
-#
-# SECTION_NAME is either .idata$6 or .idata$7, depending
-# on the platform and compiler that created the implib.
-#
-# Echos the name of the DLL associated with the
-# specified import library.
-func_cygming_dll_for_implib_fallback_core ()
-{
-  $opt_debug
-  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
-  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
-    $SED '/^Contents of section '"$match_literal"':/{
-      # Place marker at beginning of archive member dllname section
-      s/.*/====MARK====/
-      p
-      d
-    }
-    # These lines can sometimes be longer than 43 characters, but
-    # are always uninteresting
-    /:[	 ]*file format pe[i]\{,1\}-/d
-    /^In archive [^:]*:/d
-    # Ensure marker is printed
-    /^====MARK====/p
-    # Remove all lines with less than 43 characters
-    /^.\{43\}/!d
-    # From remaining lines, remove first 43 characters
-    s/^.\{43\}//' |
-    $SED -n '
-      # Join marker and all lines until next marker into a single line
-      /^====MARK====/ b para
-      H
-      $ b para
-      b
-      :para
-      x
-      s/\n//g
-      # Remove the marker
-      s/^====MARK====//
-      # Remove trailing dots and whitespace
-      s/[\. \t]*$//
-      # Print
-      /./p' |
-    # we now have a list, one entry per line, of the stringified
-    # contents of the appropriate section of all members of the
-    # archive which possess that section. Heuristic: eliminate
-    # all those which have a first or second character that is
-    # a '.' (that is, objdump's representation of an unprintable
-    # character.) This should work for all archives with less than
-    # 0x302f exports -- but will fail for DLLs whose name actually
-    # begins with a literal '.' or a single character followed by
-    # a '.'.
-    #
-    # Of those that remain, print the first one.
-    $SED -e '/^\./d;/^.\./d;q'
-}
-
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-  test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-  test -n "$func_cygming_ms_implib_tmp"
-}
-
-# func_cygming_dll_for_implib_fallback ARG
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-#
-# This fallback implementation is for use when $DLLTOOL
-# does not support the --identify-strict option.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib_fallback ()
-{
-  $opt_debug
-  if func_cygming_gnu_implib_p "$1" ; then
-    # binutils import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-  elif func_cygming_ms_implib_p "$1" ; then
-    # ms-generated import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
-  else
-    # unknown
-    sharedlib_from_linklib_result=""
-  fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    $opt_debug
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-    if test "$lock_old_archive_extraction" = yes; then
-      lockfile=$f_ex_an_ar_oldlib.lock
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    fi
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
-		   'stat=$?; rm -f "$lockfile"; exit $stat'
-    if test "$lock_old_archive_extraction" = yes; then
-      $opt_dry_run || rm -f "$lockfile"
-    fi
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-    fi
-}
-
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    $opt_debug
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      func_basename "$my_xlib"
-      my_xlib="$func_basename_result"
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	  func_arith $extracted_serial + 1
-	  extracted_serial=$func_arith_result
-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-	*) break ;;
-	esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
-
-      func_mkdir_p "$my_xdir"
-
-      case $host in
-      *-darwin*)
-	func_verbose "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	$opt_dry_run || {
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`basename "$darwin_archive"`
-	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
-	  if test -n "$darwin_arches"; then
-	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
-	      $LIPO -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    $RM -rf unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd $darwin_orig_dir
-	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	} # !$opt_dry_run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-	;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
-    done
-
-    func_extract_archives_result="$my_oldobjs"
-}
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=${1-no}
-
-	$ECHO "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variables:
-  generated_by_libtool_version='$macro_version'
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$ECHO are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    file=\"\$0\""
-
-    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
-    $ECHO "\
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-    ECHO=\"$qECHO\"
-  fi
-
-# Very basic option parsing. These options are (a) specific to
-# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
-# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
-# this pattern).
-#
-# There are only two supported options: --lt-debug and
-# --lt-dump-script. There is, deliberately, no --lt-help.
-#
-# The first argument to this parsing function should be the
-# script's $0 value, followed by "$@".
-lt_option_debug=
-func_parse_lt_options ()
-{
-  lt_script_arg0=\$0
-  shift
-  for lt_opt
-  do
-    case \"\$lt_opt\" in
-    --lt-debug) lt_option_debug=1 ;;
-    --lt-dump-script)
-        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
-        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
-        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
-        cat \"\$lt_dump_D/\$lt_dump_F\"
-        exit 0
-      ;;
-    --lt-*)
-        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
-        exit 1
-      ;;
-    esac
-  done
-
-  # Print the debug banner immediately:
-  if test -n \"\$lt_option_debug\"; then
-    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
-  fi
-}
-
-# Used when --lt-debug. Prints its arguments to stdout
-# (redirection is the responsibility of the caller)
-func_lt_dump_args ()
-{
-  lt_dump_args_N=1;
-  for lt_arg
-  do
-    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
-    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
-  done
-}
-
-# Core function for launching the target application
-func_exec_program_core ()
-{
-"
-  case $host in
-  # Backslashes separate directories on plain windows
-  *-*-mingw | *-*-os2* | *-cegcc*)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-    ;;
-
-  *)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-    ;;
-  esac
-  $ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
-}
-
-# A function to encapsulate launching the target application
-# Strips options in the --lt-* namespace from \$@ and
-# launches target application with the remaining arguments.
-func_exec_program ()
-{
-  case \" \$* \" in
-  *\\ --lt-*)
-    for lt_wr_arg
-    do
-      case \$lt_wr_arg in
-      --lt-*) ;;
-      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-      esac
-      shift
-    done ;;
-  esac
-  func_exec_program_core \${1+\"\$@\"}
-}
-
-  # Parse options
-  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
-  done
-
-  # Usually 'no', except on cygwin/mingw when embedded into
-  # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
-  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-    # special case for '.'
-    if test \"\$thisdir\" = \".\"; then
-      thisdir=\`pwd\`
-    fi
-    # remove .libs from thisdir
-    case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
-    $objdir )   thisdir=. ;;
-    esac
-  fi
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $ECHO "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $MKDIR \"\$progdir\"
-    else
-      $RM \"\$progdir/\$file\"
-    fi"
-
-	  $ECHO "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$ECHO \"\$relink_command_output\" >&2
-	$RM \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $RM \"\$progdir/\$program\";
-      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $RM \"\$progdir/\$file\"
-  fi"
-	else
-	  $ECHO "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$ECHO "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# fixup the dll searchpath if we need to.
-	#
-	# Fix the DLL searchpath if we need to.  Do this before prepending
-	# to shlibpath, because on Windows, both are PATH and uninstalled
-	# libraries must come first.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $ECHO "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	$ECHO "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-      func_exec_program \${1+\"\$@\"}
-    fi
-  else
-    # The program doesn't exist.
-    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-}
-
-
-# func_emit_cwrapperexe_src
-# emit the source code for a wrapper executable on stdout
-# Must ONLY be called from within func_mode_link because
-# it depends on a number of variable set therein.
-func_emit_cwrapperexe_src ()
-{
-	cat <
-#include 
-#ifdef _MSC_VER
-# include 
-# include 
-# include 
-#else
-# include 
-# include 
-# ifdef __CYGWIN__
-#  include 
-# endif
-#endif
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
-# ifdef __STRICT_ANSI__
-int _putenv (const char *);
-# endif
-#elif defined(__CYGWIN__)
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
-/* #elif defined (other platforms) ... */
-#endif
-
-/* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-# define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-#  define _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#elif defined(__MINGW32__)
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-#elif defined(__CYGWIN__)
-# define HAVE_SETENV
-# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
-#endif
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef S_IXOTH
-# define S_IXOTH 0
-#endif
-#ifndef S_IXGRP
-# define S_IXGRP 0
-#endif
-
-/* path handling portability macros */
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# define FOPEN_WB "wb"
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#ifndef FOPEN_WB
-# define FOPEN_WB "w"
-#endif
-#ifndef _O_BINARY
-# define _O_BINARY 0
-#endif
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-#if defined(LT_DEBUGWRAPPER)
-static int lt_debug = 1;
-#else
-static int lt_debug = 0;
-#endif
-
-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
-
-void *xmalloc (size_t num);
-char *xstrdup (const char *string);
-const char *base_name (const char *name);
-char *find_executable (const char *wrapper);
-char *chase_symlinks (const char *pathspec);
-int make_executable (const char *path);
-int check_executable (const char *path);
-char *strendzap (char *str, const char *pat);
-void lt_debugprintf (const char *file, int line, const char *fmt, ...);
-void lt_fatal (const char *file, int line, const char *message, ...);
-static const char *nonnull (const char *s);
-static const char *nonempty (const char *s);
-void lt_setenv (const char *name, const char *value);
-char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_update_exe_path (const char *name, const char *value);
-void lt_update_lib_path (const char *name, const char *value);
-char **prepare_spawn (char **argv);
-void lt_dump_script (FILE *f);
-EOF
-
-	    cat <= 0)
-      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-    return 1;
-  else
-    return 0;
-}
-
-int
-make_executable (const char *path)
-{
-  int rval = 0;
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if (stat (path, &st) >= 0)
-    {
-      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-    }
-  return rval;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise
-   Does not chase symlinks, even on platforms that support them.
-*/
-char *
-find_executable (const char *wrapper)
-{
-  int has_slash = 0;
-  const char *p;
-  const char *p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char *concat_name;
-
-  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
-                  nonempty (wrapper));
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable (concat_name))
-	return concat_name;
-      XFREE (concat_name);
-    }
-  else
-    {
-#endif
-      if (IS_DIR_SEPARATOR (wrapper[0]))
-	{
-	  concat_name = xstrdup (wrapper);
-	  if (check_executable (concat_name))
-	    return concat_name;
-	  XFREE (concat_name);
-	}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-    }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-      {
-	has_slash = 1;
-	break;
-      }
-  if (!has_slash)
-    {
-      /* no slashes; search PATH */
-      const char *path = getenv ("PATH");
-      if (path != NULL)
-	{
-	  for (p = path; *p; p = p_next)
-	    {
-	      const char *q;
-	      size_t p_len;
-	      for (q = p; *q; q++)
-		if (IS_PATH_SEPARATOR (*q))
-		  break;
-	      p_len = q - p;
-	      p_next = (*q == '\0' ? q : q + 1);
-	      if (p_len == 0)
-		{
-		  /* empty path: current directory */
-		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-                              nonnull (strerror (errno)));
-		  tmp_len = strlen (tmp);
-		  concat_name =
-		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, tmp, tmp_len);
-		  concat_name[tmp_len] = '/';
-		  strcpy (concat_name + tmp_len + 1, wrapper);
-		}
-	      else
-		{
-		  concat_name =
-		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, p, p_len);
-		  concat_name[p_len] = '/';
-		  strcpy (concat_name + p_len + 1, wrapper);
-		}
-	      if (check_executable (concat_name))
-		return concat_name;
-	      XFREE (concat_name);
-	    }
-	}
-      /* not found in PATH; assume curdir */
-    }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-              nonnull (strerror (errno)));
-  tmp_len = strlen (tmp);
-  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable (concat_name))
-    return concat_name;
-  XFREE (concat_name);
-  return NULL;
-}
-
-char *
-chase_symlinks (const char *pathspec)
-{
-#ifndef S_ISLNK
-  return xstrdup (pathspec);
-#else
-  char buf[LT_PATHMAX];
-  struct stat s;
-  char *tmp_pathspec = xstrdup (pathspec);
-  char *p;
-  int has_symlinks = 0;
-  while (strlen (tmp_pathspec) && !has_symlinks)
-    {
-      lt_debugprintf (__FILE__, __LINE__,
-		      "checking path component for symlinks: %s\n",
-		      tmp_pathspec);
-      if (lstat (tmp_pathspec, &s) == 0)
-	{
-	  if (S_ISLNK (s.st_mode) != 0)
-	    {
-	      has_symlinks = 1;
-	      break;
-	    }
-
-	  /* search backwards for last DIR_SEPARATOR */
-	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
-	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    p--;
-	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    {
-	      /* no more DIR_SEPARATORS left */
-	      break;
-	    }
-	  *p = '\0';
-	}
-      else
-	{
-	  lt_fatal (__FILE__, __LINE__,
-		    "error accessing file \"%s\": %s",
-		    tmp_pathspec, nonnull (strerror (errno)));
-	}
-    }
-  XFREE (tmp_pathspec);
-
-  if (!has_symlinks)
-    {
-      return xstrdup (pathspec);
-    }
-
-  tmp_pathspec = realpath (pathspec, buf);
-  if (tmp_pathspec == 0)
-    {
-      lt_fatal (__FILE__, __LINE__,
-		"could not follow symlinks for %s", pathspec);
-    }
-  return xstrdup (tmp_pathspec);
-#endif
-}
-
-char *
-strendzap (char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert (str != NULL);
-  assert (pat != NULL);
-
-  len = strlen (str);
-  patlen = strlen (pat);
-
-  if (patlen <= len)
-    {
-      str += len - patlen;
-      if (strcmp (str, pat) == 0)
-	*str = '\0';
-    }
-  return str;
-}
-
-void
-lt_debugprintf (const char *file, int line, const char *fmt, ...)
-{
-  va_list args;
-  if (lt_debug)
-    {
-      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
-      va_start (args, fmt);
-      (void) vfprintf (stderr, fmt, args);
-      va_end (args);
-    }
-}
-
-static void
-lt_error_core (int exit_status, const char *file,
-	       int line, const char *mode,
-	       const char *message, va_list ap)
-{
-  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *file, int line, const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
-  va_end (ap);
-}
-
-static const char *
-nonnull (const char *s)
-{
-  return s ? s : "(null)";
-}
-
-static const char *
-nonempty (const char *s)
-{
-  return (s && !*s) ? "(empty)" : nonnull (s);
-}
-
-void
-lt_setenv (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_setenv) setting '%s' to '%s'\n",
-                  nonnull (name), nonnull (value));
-  {
-#ifdef HAVE_SETENV
-    /* always make a copy, for consistency with !HAVE_SETENV */
-    char *str = xstrdup (value);
-    setenv (name, str, 1);
-#else
-    int len = strlen (name) + 1 + strlen (value) + 1;
-    char *str = XMALLOC (char, len);
-    sprintf (str, "%s=%s", name, value);
-    if (putenv (str) != EXIT_SUCCESS)
-      {
-        XFREE (str);
-      }
-#endif
-  }
-}
-
-char *
-lt_extend_str (const char *orig_value, const char *add, int to_end)
-{
-  char *new_value;
-  if (orig_value && *orig_value)
-    {
-      int orig_value_len = strlen (orig_value);
-      int add_len = strlen (add);
-      new_value = XMALLOC (char, add_len + orig_value_len + 1);
-      if (to_end)
-        {
-          strcpy (new_value, orig_value);
-          strcpy (new_value + orig_value_len, add);
-        }
-      else
-        {
-          strcpy (new_value, add);
-          strcpy (new_value + add_len, orig_value);
-        }
-    }
-  else
-    {
-      new_value = xstrdup (add);
-    }
-  return new_value;
-}
-
-void
-lt_update_exe_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      /* some systems can't cope with a ':'-terminated path #' */
-      int len = strlen (new_value);
-      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
-        {
-          new_value[len-1] = '\0';
-        }
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-void
-lt_update_lib_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-EOF
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-
-/* Prepares an argument vector before calling spawn().
-   Note that spawn() does not by itself call the command interpreter
-     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
-      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-         GetVersionEx(&v);
-         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
-      }) ? "cmd.exe" : "command.com").
-   Instead it simply concatenates the arguments, separated by ' ', and calls
-   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
-   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
-   special way:
-   - Space and tab are interpreted as delimiters. They are not treated as
-     delimiters if they are surrounded by double quotes: "...".
-   - Unescaped double quotes are removed from the input. Their only effect is
-     that within double quotes, space and tab are treated like normal
-     characters.
-   - Backslashes not followed by double quotes are not special.
-   - But 2*n+1 backslashes followed by a double quote become
-     n backslashes followed by a double quote (n >= 0):
-       \" -> "
-       \\\" -> \"
-       \\\\\" -> \\"
- */
-#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
-char **
-prepare_spawn (char **argv)
-{
-  size_t argc;
-  char **new_argv;
-  size_t i;
-
-  /* Count number of arguments.  */
-  for (argc = 0; argv[argc] != NULL; argc++)
-    ;
-
-  /* Allocate new argument vector.  */
-  new_argv = XMALLOC (char *, argc + 1);
-
-  /* Put quoted arguments into the new argument vector.  */
-  for (i = 0; i < argc; i++)
-    {
-      const char *string = argv[i];
-
-      if (string[0] == '\0')
-	new_argv[i] = xstrdup ("\"\"");
-      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
-	{
-	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
-	  size_t length;
-	  unsigned int backslashes;
-	  const char *s;
-	  char *quoted_string;
-	  char *p;
-
-	  length = 0;
-	  backslashes = 0;
-	  if (quote_around)
-	    length++;
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		length += backslashes + 1;
-	      length++;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    length += backslashes + 1;
-
-	  quoted_string = XMALLOC (char, length + 1);
-
-	  p = quoted_string;
-	  backslashes = 0;
-	  if (quote_around)
-	    *p++ = '"';
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		{
-		  unsigned int j;
-		  for (j = backslashes + 1; j > 0; j--)
-		    *p++ = '\\';
-		}
-	      *p++ = c;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    {
-	      unsigned int j;
-	      for (j = backslashes; j > 0; j--)
-		*p++ = '\\';
-	      *p++ = '"';
-	    }
-	  *p = '\0';
-
-	  new_argv[i] = quoted_string;
-	}
-      else
-	new_argv[i] = (char *) string;
-    }
-  new_argv[argc] = NULL;
-
-  return new_argv;
-}
-EOF
-		;;
-	    esac
-
-            cat <<"EOF"
-void lt_dump_script (FILE* f)
-{
-EOF
-	    func_emit_wrapper yes |
-	      $SED -n -e '
-s/^\(.\{79\}\)\(..*\)/\1\
-\2/
-h
-s/\([\\"]\)/\\\1/g
-s/$/\\n/
-s/\([^\n]*\).*/  fputs ("\1", f);/p
-g
-D'
-            cat <<"EOF"
-}
-EOF
-}
-# end: func_emit_cwrapperexe_src
-
-# func_win32_import_lib_p ARG
-# True if ARG is an import lib, as indicated by $file_magic_cmd
-func_win32_import_lib_p ()
-{
-    $opt_debug
-    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
-    *import*) : ;;
-    *) false ;;
-    esac
-}
-
-# func_mode_link arg...
-func_mode_link ()
-{
-    $opt_debug
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args=$nonopt
-    base_compile="$nonopt $@"
-    compile_command=$nonopt
-    finalize_command=$nonopt
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-    new_inherited_linker_flags=
-
-    avoid_version=no
-    bindir=
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-    weak_libs=
-    single_module="${wl}-single_module"
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	break
-	;;
-      -all-static | -static | -static-libtool-libs)
-	case $arg in
-	-all-static)
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    func_warning "complete static linking is impossible in this configuration"
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	-static)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=built
-	  ;;
-	-static-libtool-libs)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	esac
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      func_quote_for_eval "$arg"
-      qarg=$func_quote_for_eval_unquoted_result
-      func_append libtool_args " $func_quote_for_eval_result"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  func_append compile_command " @OUTPUT@"
-	  func_append finalize_command " @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	bindir)
-	  bindir="$arg"
-	  prev=
-	  continue
-	  ;;
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    func_append compile_command " @SYMFILE@"
-	    func_append finalize_command " @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      func_append dlfiles " $arg"
-	    else
-	      func_append dlprefiles " $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  test -f "$arg" \
-	    || func_fatal_error "symbol file \`$arg' does not exist"
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	framework)
-	  case $host in
-	    *-*-darwin*)
-	      case "$deplibs " in
-		*" $qarg.ltframework "*) ;;
-		*) func_append deplibs " $qarg.ltframework" # this is fixed later
-		   ;;
-	      esac
-	      ;;
-	  esac
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat "$save_arg"`
-	    do
-#	      func_append moreargs " $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if func_lalib_unsafe_p "$arg"; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		func_source "$arg"
-
-		if test -z "$pic_object" ||
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none &&
-		   test "$non_pic_object" = none; then
-		  func_fatal_error "cannot find name of object for \`$arg'"
-		fi
-
-		# Extract subdirectory from the argument.
-		func_dirname "$arg" "/" ""
-		xdir="$func_dirname_result"
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      func_append dlfiles " $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    func_append dlprefiles " $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  func_append libobjs " $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  func_append non_pic_objects " $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if $opt_dry_run; then
-		  # Extract subdirectory from the argument.
-		  func_dirname "$arg" "/" ""
-		  xdir="$func_dirname_result"
-
-		  func_lo2o "$arg"
-		  pic_object=$xdir$objdir/$func_lo2o_result
-		  non_pic_object=$xdir$func_lo2o_result
-		  func_append libobjs " $pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-	        else
-		  func_fatal_error "\`$arg' is not a valid libtool object"
-		fi
-	      fi
-	    done
-	  else
-	    func_fatal_error "link input file \`$arg' does not exist"
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    func_fatal_error "only absolute run-paths are allowed"
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) func_append rpath " $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) func_append xrpath " $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	shrext)
-	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-	weak)
-	  func_append weak_libs " $arg"
-	  prev=
-	  continue
-	  ;;
-	xcclinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xcompiler)
-	  func_append compiler_flags " $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $wl$qarg"
-	  prev=
-	  func_append compile_command " $wl$qarg"
-	  func_append finalize_command " $wl$qarg"
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  # See comment for -static flag below, for more details.
-	  func_append compile_command " $link_static_flag"
-	  func_append finalize_command " $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -bindir)
-	prev=bindir
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  func_fatal_error "more than one -exported-symbols argument is not allowed"
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework)
-	prev=framework
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  func_append compile_command " $arg"
-	  func_append finalize_command " $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	func_stripname "-L" '' "$arg"
-	if test -z "$func_stripname_result"; then
-	  if test "$#" -gt 0; then
-	    func_fatal_error "require no space between \`-L' and \`$1'"
-	  else
-	    func_fatal_error "need path for \`-L' option"
-	  fi
-	fi
-	func_resolve_sysroot "$func_stripname_result"
-	dir=$func_resolve_sysroot_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "* | *" $arg "*)
-	  # Will only happen for absolute or sysroot arguments
-	  ;;
-	*)
-	  # Preserve sysroot, but never include relative directories
-	  case $dir in
-	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
-	    *) func_append deplibs " -L$dir" ;;
-	  esac
-	  func_append lib_search_path " $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  ::) dllsearchpath=$dir;;
-	  *) func_append dllsearchpath ":$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    func_append deplibs " System.ltframework"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	func_append deplibs " $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot|--sysroot)
-	func_append compiler_flags " $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	prev=xcompiler
-	continue
-	;;
-
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	func_append compiler_flags " $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	case "$new_inherited_linker_flags " in
-	    *" $arg "*) ;;
-	    * ) func_append new_inherited_linker_flags " $arg" ;;
-	esac
-	continue
-	;;
-
-      -multi_module)
-	single_module="${wl}-multi_module"
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "\`-no-install' is ignored for $host"
-	  func_warning "assuming \`-no-fast-install' instead"
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	func_stripname '-R' '' "$arg"
-	dir=$func_stripname_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	=*)
-	  func_stripname '=' '' "$dir"
-	  dir=$lt_sysroot$func_stripname_result
-	  ;;
-	*)
-	  func_fatal_error "only absolute run-paths are allowed"
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) func_append xrpath " $dir" ;;
-	esac
-	continue
-	;;
-
-      -shared)
-	# The effects of -shared are defined in a previous loop.
-	continue
-	;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -weak)
-        prev=weak
-	continue
-	;;
-
-      -Wc,*)
-	func_stripname '-Wc,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  func_append arg " $func_quote_for_eval_result"
-	  func_append compiler_flags " $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Wl,*)
-	func_stripname '-Wl,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  func_append arg " $wl$func_quote_for_eval_result"
-	  func_append compiler_flags " $wl$func_quote_for_eval_result"
-	  func_append linker_flags " $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # -msg_* for osf cc
-      -msg_*)
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      # Flags to be passed through unchanged, with rationale:
-      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
-      # -r[0-9][0-9]*        specify processor for the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
-      # +DA*, +DD*           enable 64-bit mode for the HP compiler
-      # -q*                  compiler args for the IBM compiler
-      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
-      # -F/path              path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
-      # @file                GCC response files
-      # -tp=*                Portland pgcc target processor selection
-      # --sysroot=*          for sysroot support
-      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-        func_append compile_command " $arg"
-        func_append finalize_command " $arg"
-        func_append compiler_flags " $arg"
-        continue
-        ;;
-
-      # Some other compiler flag.
-      -* | +*)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      *.$objext)
-	# A standard object.
-	func_append objs " $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if func_lalib_unsafe_p "$arg"; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  func_source "$arg"
-
-	  if test -z "$pic_object" ||
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none &&
-	     test "$non_pic_object" = none; then
-	    func_fatal_error "cannot find name of object for \`$arg'"
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  func_dirname "$arg" "/" ""
-	  xdir="$func_dirname_result"
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		func_append dlfiles " $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      func_append dlprefiles " $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    func_append libobjs " $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    func_append non_pic_objects " $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if $opt_dry_run; then
-	    # Extract subdirectory from the argument.
-	    func_dirname "$arg" "/" ""
-	    xdir="$func_dirname_result"
-
-	    func_lo2o "$arg"
-	    pic_object=$xdir$objdir/$func_lo2o_result
-	    non_pic_object=$xdir$func_lo2o_result
-	    func_append libobjs " $pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  else
-	    func_fatal_error "\`$arg' is not a valid libtool object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	func_append deplibs " $arg"
-	func_append old_deplibs " $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	func_resolve_sysroot "$arg"
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  func_append dlfiles " $func_resolve_sysroot_result"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  func_append dlprefiles " $func_resolve_sysroot_result"
-	  prev=
-	else
-	  func_append deplibs " $func_resolve_sysroot_result"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-      fi
-    done # argument parsing loop
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prevarg' option requires an argument"
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      func_append compile_command " $arg"
-      func_append finalize_command " $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    func_basename "$output"
-    outputname="$func_basename_result"
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    func_dirname "$output" "/" ""
-    output_objdir="$func_dirname_result$objdir"
-    func_to_tool_file "$output_objdir/"
-    tool_output_objdir=$func_to_tool_file_result
-    # Create the object directory.
-    func_mkdir_p "$output_objdir"
-
-    # Determine the type of output
-    case $output in
-    "")
-      func_fatal_help "you must specify an output file"
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if $opt_preserve_dup_deps ; then
-	case "$libs " in
-	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	esac
-      fi
-      func_append libs " $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if $opt_duplicate_compiler_generated_deps; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
-	  esac
-	  func_append pre_post_deps " $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-
-    case $linkmode in
-    lib)
-	passes="conv dlpreopen link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-
-    for pass in $passes; do
-      # The preopen pass in lib mode reverses $deplibs; put it back here
-      # so that -L comes before libs that need it for instance...
-      if test "$linkmode,$pass" = "lib,link"; then
-	## FIXME: Find the place where the list is rebuilt in the wrong
-	##        order, and fix it there properly
-        tmp_deplibs=
-	for deplib in $deplibs; do
-	  tmp_deplibs="$deplib $tmp_deplibs"
-	done
-	deplibs="$tmp_deplibs"
-      fi
-
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
-	esac
-      fi
-      if test "$linkmode,$pass" = "lib,dlpreopen"; then
-	# Collect and forward deplibs of preopened libtool libs
-	for lib in $dlprefiles; do
-	  # Ignore non-libtool-libs
-	  dependency_libs=
-	  func_resolve_sysroot "$lib"
-	  case $lib in
-	  *.la)	func_source "$func_resolve_sysroot_result" ;;
-	  esac
-
-	  # Collect preopened libtool deplibs, except any this library
-	  # has declared as weak libs
-	  for deplib in $dependency_libs; do
-	    func_basename "$deplib"
-            deplib_base=$func_basename_result
-	    case " $weak_libs " in
-	    *" $deplib_base "*) ;;
-	    *) func_append deplibs " $deplib" ;;
-	    esac
-	  done
-	done
-	libs="$dlprefiles"
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    func_append compiler_flags " $deplib"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    func_warning "\`-l' is ignored for archives/objects"
-	    continue
-	  fi
-	  func_stripname '-l' '' "$deplib"
-	  name=$func_stripname_result
-	  if test "$linkmode" = lib; then
-	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-	  else
-	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-	  fi
-	  for searchdir in $searchdirs; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if func_lalib_p "$lib"; then
-		  library_names=
-		  old_library=
-		  func_source "$lib"
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    func_dirname "$lib" "" "."
-		    ladir="$func_dirname_result"
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-		;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	*.ltframework)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    func_append newlib_search_path " $func_resolve_sysroot_result"
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    func_append newlib_search_path " $func_resolve_sysroot_result"
-	    ;;
-	  *)
-	    func_warning "\`-L' is ignored for archives/objects"
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    func_stripname '-R' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    dir=$func_resolve_sysroot_result
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) func_append xrpath " $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la)
-	  func_resolve_sysroot "$deplib"
-	  lib=$func_resolve_sysroot_result
-	  ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    # Linking convenience modules into shared libraries is allowed,
-	    # but linking other static libraries is non-portable.
-	    case " $dlpreconveniencelibs " in
-	    *" $deplib "*) ;;
-	    *)
-	      valid_a_lib=no
-	      case $deplibs_check_method in
-		match_pattern*)
-		  set dummy $deplibs_check_method; shift
-		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		    valid_a_lib=yes
-		  fi
-		;;
-		pass_all)
-		  valid_a_lib=yes
-		;;
-	      esac
-	      if test "$valid_a_lib" != yes; then
-		echo
-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because the file extensions .$libext of this argument makes me believe"
-		echo "*** that it is just a static archive that I should not use here."
-	      else
-		echo
-		$ECHO "*** Warning: Linking the shared library $output against the"
-		$ECHO "*** static library $deplib is not portable!"
-		deplibs="$deplib $deplibs"
-	      fi
-	      ;;
-	    esac
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      func_append newdlprefiles " $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      func_append newdlfiles " $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-	fi
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "\`$lib' is not a valid libtool archive"
-
-	func_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	inherited_linker_flags=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	func_source "$lib"
-
-	# Convert "-framework foo" to "foo.ltframework"
-	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
-	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-	    case " $new_inherited_linker_flags " in
-	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
-	    esac
-	  done
-	fi
-	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && func_append dlfiles " $dlopen"
-	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for \`$lib'"
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    func_append convenience " $ladir/$objdir/$old_library"
-	    func_append old_convenience " $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-	      if $opt_preserve_dup_deps ; then
-		case "$tmp_libs " in
-		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
-		esac
-	      fi
-	      func_append tmp_libs " $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    func_fatal_error "\`$lib' is not a convenience library"
-	  fi
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	if test -n "$old_library" &&
-	   { test "$prefer_static_libs" = yes ||
-	     test "$prefer_static_libs,$installed" = "built,no"; }; then
-	  linklib=$old_library
-	else
-	  for l in $old_library $library_names; do
-	    linklib="$l"
-	  done
-	fi
-	if test -z "$linklib"; then
-	  func_fatal_error "cannot find name of link library for \`$lib'"
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    func_append dlprefiles " $lib $dependency_libs"
-	  else
-	    func_append newdlfiles " $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    func_warning "cannot determine absolute directory name of \`$ladir'"
-	    func_warning "passing it literally to the linker, although it might fail"
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	func_basename "$lib"
-	laname="$func_basename_result"
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    func_warning "library \`$lib' was moved."
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$lt_sysroot$libdir"
-	    absdir="$lt_sysroot$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
-	  fi
-	fi # $installed = yes
-	func_stripname 'lib' '.la' "$laname"
-	name=$func_stripname_result
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir" && test "$linkmode" = prog; then
-	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
-	  fi
-	  case "$host" in
-	    # special handling for platforms with PE-DLLs.
-	    *cygwin* | *mingw* | *cegcc* )
-	      # Linker will automatically link against shared library if both
-	      # static and shared are present.  Therefore, ensure we extract
-	      # symbols from the import library if a shared library is present
-	      # (otherwise, the dlopen module name will be incorrect).  We do
-	      # this by putting the import library name into $newdlprefiles.
-	      # We recover the dlopen module name by 'saving' the la file
-	      # name in a special purpose variable, and (later) extracting the
-	      # dlname from the la file.
-	      if test -n "$dlname"; then
-	        func_tr_sh "$dir/$linklib"
-	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
-	        func_append newdlprefiles " $dir/$linklib"
-	      else
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      fi
-	    ;;
-	    * )
-	      # Prefer using a static library (so that no silly _DYNAMIC symbols
-	      # are required to link).
-	      if test -n "$old_library"; then
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      # Otherwise, use the dlname, so that lt_dlopen finds it.
-	      elif test -n "$dlname"; then
-	        func_append newdlprefiles " $dir/$dlname"
-	      else
-	        func_append newdlprefiles " $dir/$linklib"
-	      fi
-	    ;;
-	  esac
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  func_append newlib_search_path " $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) func_stripname '-L' '' "$deplib"
-	         func_resolve_sysroot "$func_stripname_result"
-	         func_append newlib_search_path " $func_resolve_sysroot_result"
-		 ;;
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { { test "$prefer_static_libs" = no ||
-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
-	       test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath:" in
-	      *"$absdir:"*) ;;
-	      *) func_append temp_rpath "$absdir:" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc*)
-	      # No point in relinking DLLs because paths are not encoded
-	      func_append notinst_deplibs " $lib"
-	      need_relink=no
-	    ;;
-	  *)
-	    if test "$installed" = no; then
-	      func_append notinst_deplibs " $lib"
-	      need_relink=yes
-	    fi
-	    ;;
-	  esac
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on some
-	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=""
-	  for dlpremoduletest in $dlprefiles; do
-	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule="$dlpremoduletest"
-	      break
-	    fi
-	  done
-	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	    echo
-	    if test "$linkmode" = prog; then
-	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $ECHO "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    shift
-	    realname="$1"
-	    shift
-	    libname=`eval "\\$ECHO \"$libname_spec\""`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw* | *cegcc*)
-	        func_arith $current - $age
-		major=$func_arith_result
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    func_basename "$soroot"
-	    soname="$func_basename_result"
-	    func_stripname 'lib' '.dll' "$soname"
-	    newlib=libimp-$func_stripname_result.a
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      func_verbose "extracting exported symbol list from \`$soname'"
-	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      func_verbose "generating import library for \`$soname'"
-	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we can not
-		    # link against it, someone is ignoring the earlier warnings
-		    if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": [^:]* bundle" >/dev/null ; then
-		      if test "X$dlopenmodule" != "X$lib"; then
-			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library" ; then
-			  echo
-			  echo "*** And there doesn't seem to be a static archive available"
-			  echo "*** The link will probably fail, sorry"
-			else
-			  add="$dir/$old_library"
-			fi
-		      elif test -n "$old_library"; then
-			add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes &&
-	         test "$hardcode_direct_absolute" = no; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$absdir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      func_append add_dir " -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      func_fatal_configuration "unsupported hardcode properties"
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes &&
-		 test "$hardcode_minus_L" != yes &&
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) func_append finalize_shlibpath "$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes &&
-	       test "$hardcode_direct_absolute" = no; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) func_append finalize_shlibpath "$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-		add="$inst_prefix_dir$libdir/$linklib"
-	      else
-		add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    func_append add_dir " -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    echo
-	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
-	    echo "*** I have the capability to make that library automatically link in when"
-	    echo "*** you link to this library.  But I can only do this if you have a"
-	    echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      echo "*** But as you try to build a module library, libtool will still create "
-	      echo "*** a static module, that should work as long as the dlopening application"
-	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		echo
-		echo "*** However, this would only work if libtool was able to extract symbol"
-		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		echo "*** not find such a program.  So, this module is probably useless."
-		echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) func_stripname '-R' '' "$libdir"
-	           temp_xrpath=$func_stripname_result
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) func_append xrpath " $temp_xrpath";;
-		   esac;;
-	      *) func_append temp_deplibs " $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  func_append newlib_search_path " $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    case $deplib in
-              -L*) func_stripname '-L' '' "$deplib"
-                   func_resolve_sysroot "$func_stripname_result";;
-              *) func_resolve_sysroot "$deplib" ;;
-            esac
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $func_resolve_sysroot_result "*)
-                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $func_resolve_sysroot_result"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      path=
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-	        func_resolve_sysroot "$deplib"
-	        deplib=$func_resolve_sysroot_result
-	        func_dirname "$deplib" "" "."
-		dir=$func_dirname_result
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    func_warning "cannot determine absolute directory name of \`$dir'"
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if $GREP "^installed=no" $deplib > /dev/null; then
-		case $host in
-		*-*-darwin*)
-		  depdepl=
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$absdir/$objdir/$depdepl" ; then
-		      depdepl="$absdir/$objdir/$depdepl"
-		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
-                      if test -z "$darwin_install_name"; then
-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                      fi
-		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
-		      path=
-		    fi
-		  fi
-		  ;;
-		*)
-		  path="-L$absdir/$objdir"
-		  ;;
-		esac
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  test -z "$libdir" && \
-		    func_fatal_error "\`$deplib' is not a valid libtool archive"
-		  test "$absdir" != "$libdir" && \
-		    func_warning "\`$deplib' seems to be moved"
-
-		  path="-L$absdir"
-		fi
-		;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      if test "$pass" = link; then
-	if test "$linkmode" = "prog"; then
-	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
-	else
-	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	fi
-      fi
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) func_append lib_search_path " $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) func_append tmp_libs " $deplib" ;;
-	      esac
-	      ;;
-	    *) func_append tmp_libs " $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  func_append tmp_libs " $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-    fi
-    if test "$linkmode" = prog || test "$linkmode" = lib; then
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for archives"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for archives"
-
-      test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "\`-export-symbols' is ignored for archives"
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      func_append objs "$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	func_stripname 'lib' '.la' "$outputname"
-	name=$func_stripname_result
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	test "$module" = no && \
-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
-
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  func_stripname '' '.la' "$outputname"
-	  name=$func_stripname_result
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  func_stripname '' '.la' "$outputname"
-	  libname=$func_stripname_result
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
-	else
-	  echo
-	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-	  $ECHO "*** objects $objs is not portable!"
-	  func_append libobjs " $objs"
-	fi
-      fi
-
-      test "$dlself" != no && \
-	func_warning "\`-dlopen self' is ignored for libtool libraries"
-
-      set dummy $rpath
-      shift
-      test "$#" -gt 1 && \
-	func_warning "ignoring multiple \`-rpath's for a libtool library"
-
-      install_libdir="$1"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	test -n "$vinfo" && \
-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
-
-	test -n "$release" && \
-	  func_warning "\`-release' is ignored for convenience libraries"
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	shift
-	IFS="$save_ifs"
-
-	test -n "$7" && \
-	  func_fatal_help "too many parameters to \`-version-info'"
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$1"
-	  number_minor="$2"
-	  number_revision="$3"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  # correct linux to gnu/linux during the next big refactor
-	  darwin|linux|osf|windows|none)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|qnx|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_minor"
-	    lt_irix_increment=no
-	    ;;
-	  *)
-	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$1"
-	  revision="$2"
-	  age="$3"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "CURRENT \`$current' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "REVISION \`$revision' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "AGE \`$age' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  func_arith $current + 1
-	  minor_current=$func_arith_result
-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	irix | nonstopux)
-	  if test "X$lt_irix_increment" = "Xno"; then
-	    func_arith $current - $age
-	  else
-	    func_arith $current - $age + 1
-	  fi
-	  major=$func_arith_result
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    func_arith $revision - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux) # correct to gnu/linux during the next big refactor
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    func_arith $current - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  func_append verstring ":${current}.0"
-	  ;;
-
-	qnx)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  func_arith $current - $age
-	  major=$func_arith_result
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  func_fatal_configuration "unknown library version type \`$version_type'"
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    func_warning "undefined symbols not allowed in $host shared libraries"
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-
-      fi
-
-      func_generate_dlsyms "$libname" "$libname" "yes"
-      func_append libobjs " $symfileobj"
-      test "X$libobjs" = "X " && libobjs=
-
-      if test "$opt_mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$ECHO "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext | *.gcno)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-		 then
-		   continue
-		 fi
-	       fi
-	       func_append removelist " $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	test -n "$removelist" && \
-	  func_show_eval "${RM}r \$removelist"
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	func_append oldlibs " $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
-      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
-      #done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  func_replace_sysroot "$libdir"
-	  func_append temp_xrpath " -R$func_replace_sysroot_result"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) func_append dlfiles " $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) func_append dlprefiles " $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    func_append deplibs " System.ltframework"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    ;;
-	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      func_append deplibs " -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $opt_dry_run || $RM conftest.c
-	  cat > conftest.c </dev/null`
-		    $nocaseglob
-		  else
-		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-		  fi
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null |
-			 $GREP " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-			 $SED -e 10q |
-			 $EGREP "$file_magic_regex" > /dev/null; then
-			func_append newdeplibs " $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method; shift
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  func_append newdeplibs " $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
-		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      func_append newdeplibs " $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
-	    done
-	  fi
-	  case $tmp_deplibs in
-	  *[!\	\ ]*)
-	    echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	    ;;
-	  esac
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    echo
-	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    echo "*** a static module, that should work as long as the dlopening"
-	    echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      echo
-	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    echo "*** The inter-library dependencies that have been dropped here will be"
-	    echo "*** automatically added whenever a program is linked with this library"
-	    echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      echo
-	      echo "*** Since this library must not contain undefined symbols,"
-	      echo "*** because either the platform does not support them or"
-	      echo "*** it was explicitly requested with -no-undefined,"
-	      echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-      case $host in
-	*-*-darwin*)
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  ;;
-      esac
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $deplibs " in
-	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
-	  esac
-	  ;;
-	*) func_append new_libs " $deplib" ;;
-	esac
-      done
-      deplibs="$new_libs"
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	# Remove ${wl} instances when linking with ld.
-	# FIXME: should test the right _cmds variable.
-	case $archive_cmds in
-	  *\$LD\ *) wl= ;;
-        esac
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		func_replace_sysroot "$libdir"
-		libdir=$func_replace_sysroot_result
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		func_append dep_rpath " $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append perm_rpath " $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      func_append rpath "$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	shift
-	realname="$1"
-	shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	linknames=
-	for link
-	do
-	  func_append linknames " $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	test "X$libobjs" = "X " && libobjs=
-
-	delfiles=
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	  export_symbols="$output_objdir/$libname.uexp"
-	  func_append delfiles " $export_symbols"
-	fi
-
-	orig_export_symbols=
-	case $host_os in
-	cygwin* | mingw* | cegcc*)
-	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
-	    # exporting using user supplied symfile
-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
-	      # and it's NOT already a .def file. Must figure out
-	      # which of the given symbols are data symbols and tag
-	      # them as such. So, trigger use of export_symbols_cmds.
-	      # export_symbols gets reassigned inside the "prepare
-	      # the list of exported symbols" if statement, so the
-	      # include_expsyms logic still works.
-	      orig_export_symbols="$export_symbols"
-	      export_symbols=
-	      always_export_symbols=yes
-	    fi
-	  fi
-	  ;;
-	esac
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    func_verbose "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $opt_dry_run || $RM $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd1 in $cmds; do
-	      IFS="$save_ifs"
-	      # Take the normal branch if the nm_file_list_spec branch
-	      # doesn't work or if tool conversion is not needed.
-	      case $nm_file_list_spec~$to_tool_file_cmd in
-		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
-		  try_normal_branch=yes
-		  eval cmd=\"$cmd1\"
-		  func_len " $cmd"
-		  len=$func_len_result
-		  ;;
-		*)
-		  try_normal_branch=no
-		  ;;
-	      esac
-	      if test "$try_normal_branch" = yes \
-		 && { test "$len" -lt "$max_cmd_len" \
-		      || test "$max_cmd_len" -le -1; }
-	      then
-		func_show_eval "$cmd" 'exit $?'
-		skipped_export=false
-	      elif test -n "$nm_file_list_spec"; then
-		func_basename "$output"
-		output_la=$func_basename_result
-		save_libobjs=$libobjs
-		save_output=$output
-		output=${output_objdir}/${output_la}.nm
-		func_to_tool_file "$output"
-		libobjs=$nm_file_list_spec$func_to_tool_file_result
-		func_append delfiles " $output"
-		func_verbose "creating $NM input file list: $output"
-		for obj in $save_libobjs; do
-		  func_to_tool_file "$obj"
-		  $ECHO "$func_to_tool_file_result"
-		done > "$output"
-		eval cmd=\"$cmd1\"
-		func_show_eval "$cmd" 'exit $?'
-		output=$save_output
-		libobjs=$save_libobjs
-		skipped_export=false
-	      else
-		# The command line is too long to execute in one step.
-		func_verbose "using reloadable object file for export list..."
-		skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  tmp_export_symbols="$export_symbols"
-	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-	fi
-
-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-	  # The given exports_symbols file has to be filtered, so filter it.
-	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # 's' commands which not all seds can handle. GNU sed should be fine
-	  # though. Also, the filter scales superlinearly with the number of
-	  # global variables. join(1) would be nice here, but unfortunately
-	  # isn't a blessed tool.
-	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-	  export_symbols=$output_objdir/$libname.def
-	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-	  case " $convenience " in
-	  *" $test_deplib "*) ;;
-	  *)
-	    func_append tmp_deplibs " $test_deplib"
-	    ;;
-	  esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec" &&
-	    test "$compiler_needs_object" = yes &&
-	    test -z "$libobjs"; then
-	    # extract the archives, so we have objects to list.
-	    # TODO: could optimize this to just extract one archive.
-	    whole_archive_flag_spec=
-	  fi
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    func_append generated " $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    func_append libobjs " $func_extract_archives_result"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	fi
-
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  func_append linker_flags " $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$opt_mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    eval test_cmds=\"$archive_expsym_cmds\"
-	    cmds=$archive_expsym_cmds
-	  else
-	    eval test_cmds=\"$archive_cmds\"
-	    cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	   func_len " $test_cmds" &&
-	   len=$func_len_result &&
-	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise
-	  # or, if using GNU ld and skipped_export is not :, use a linker
-	  # script.
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  func_basename "$output"
-	  output_la=$func_basename_result
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  last_robj=
-	  k=1
-
-	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	    output=${output_objdir}/${output_la}.lnkscript
-	    func_verbose "creating GNU ld script: $output"
-	    echo 'INPUT (' > $output
-	    for obj in $save_libobjs
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    echo ')' >> $output
-	    func_append delfiles " $output"
-	    func_to_tool_file "$output"
-	    output=$func_to_tool_file_result
-	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-	    output=${output_objdir}/${output_la}.lnk
-	    func_verbose "creating linker input file list: $output"
-	    : > $output
-	    set x $save_libobjs
-	    shift
-	    firstobj=
-	    if test "$compiler_needs_object" = yes; then
-	      firstobj="$1 "
-	      shift
-	    fi
-	    for obj
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    func_append delfiles " $output"
-	    func_to_tool_file "$output"
-	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
-	  else
-	    if test -n "$save_libobjs"; then
-	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-${k}.$objext
-	      eval test_cmds=\"$reload_cmds\"
-	      func_len " $test_cmds"
-	      len0=$func_len_result
-	      len=$len0
-
-	      # Loop over the list of objects to be linked.
-	      for obj in $save_libobjs
-	      do
-		func_len " $obj"
-		func_arith $len + $func_len_result
-		len=$func_arith_result
-		if test "X$objlist" = X ||
-		   test "$len" -lt "$max_cmd_len"; then
-		  func_append objlist " $obj"
-		else
-		  # The command $test_cmds is almost too long, add a
-		  # command to the queue.
-		  if test "$k" -eq 1 ; then
-		    # The first file doesn't have a previous command to add.
-		    reload_objs=$objlist
-		    eval concat_cmds=\"$reload_cmds\"
-		  else
-		    # All subsequent reloadable object files will link in
-		    # the last one created.
-		    reload_objs="$objlist $last_robj"
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
-		  fi
-		  last_robj=$output_objdir/$output_la-${k}.$objext
-		  func_arith $k + 1
-		  k=$func_arith_result
-		  output=$output_objdir/$output_la-${k}.$objext
-		  objlist=" $obj"
-		  func_len " $last_robj"
-		  func_arith $len0 + $func_len_result
-		  len=$func_arith_result
-		fi
-	      done
-	      # Handle the remaining objects by creating one last
-	      # reloadable object file.  All subsequent reloadable object
-	      # files will link in the last one created.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      reload_objs="$objlist $last_robj"
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
-	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
-	      fi
-	      func_append delfiles " $output"
-
-	    else
-	      output=
-	    fi
-
-	    if ${skipped_export-false}; then
-	      func_verbose "generating symbol list for \`$libname.la'"
-	      export_symbols="$output_objdir/$libname.exp"
-	      $opt_dry_run || $RM $export_symbols
-	      libobjs=$output
-	      # Append the command to create the export file.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-	      if test -n "$last_robj"; then
-		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-	      fi
-	    fi
-
-	    test -n "$save_libobjs" &&
-	      func_verbose "creating a temporary reloadable object file: $output"
-
-	    # Loop through the commands generated above and execute them.
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $concat_cmds; do
-	      IFS="$save_ifs"
-	      $opt_silent || {
-		  func_quote_for_expand "$cmd"
-		  eval "func_echo $func_quote_for_expand_result"
-	      }
-	      $opt_dry_run || eval "$cmd" || {
-		lt_exit=$?
-
-		# Restore the uninstalled library and exit
-		if test "$opt_mode" = relink; then
-		  ( cd "$output_objdir" && \
-		    $RM "${realname}T" && \
-		    $MV "${realname}U" "$realname" )
-		fi
-
-		exit $lt_exit
-	      }
-	    done
-	    IFS="$save_ifs"
-
-	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-
-          if ${skipped_export-false}; then
-	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	      tmp_export_symbols="$export_symbols"
-	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-	    fi
-
-	    if test -n "$orig_export_symbols"; then
-	      # The given exports_symbols file has to be filtered, so filter it.
-	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # 's' commands which not all seds can handle. GNU sed should be fine
-	      # though. Also, the filter scales superlinearly with the number of
-	      # global variables. join(1) would be nice here, but unfortunately
-	      # isn't a blessed tool.
-	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-	      export_symbols=$output_objdir/$libname.def
-	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	    fi
-	  fi
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	      cmds=$archive_expsym_cmds
-	    else
-	      cmds=$archive_cmds
-	    fi
-	  fi
-	fi
-
-	if test -n "$delfiles"; then
-	  # Append the command to remove temporary files to $cmds.
-	  eval cmds=\"\$cmds~\$RM $delfiles\"
-	fi
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  func_append libobjs " $func_extract_archives_result"
-	  test "X$libobjs" = "X " && libobjs=
-	fi
-
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $opt_silent || {
-	    func_quote_for_expand "$cmd"
-	    eval "func_echo $func_quote_for_expand_result"
-	  }
-	  $opt_dry_run || eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test "$opt_mode" = relink; then
-	      ( cd "$output_objdir" && \
-	        $RM "${realname}T" && \
-		$MV "${realname}U" "$realname" )
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$opt_mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      func_show_eval '${RM}r "$gentop"'
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for objects"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for objects"
-
-      case $output in
-      *.lo)
-	test -n "$objs$old_deplibs" && \
-	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
-
-	libobj=$output
-	func_lo2o "$libobj"
-	obj=$func_lo2o_result
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $opt_dry_run || $RM $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
-	else
-	  gentop="$output_objdir/${obj}x"
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # If we're not building shared, we need to use non_pic_objs
-      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      func_execute_cmds "$reload_cmds" 'exit $?'
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	func_execute_cmds "$reload_cmds" 'exit $?'
-      fi
-
-      if test -n "$gentop"; then
-	func_show_eval '${RM}r "$gentop"'
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) func_stripname '' '.exe' "$output"
-	          output=$func_stripname_result.exe;;
-      esac
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for programs"
-
-      test "$preload" = yes \
-        && test "$dlopen_support" = unknown \
-	&& test "$dlopen_self" = unknown \
-	&& test "$dlopen_self_static" = unknown && \
-	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	;;
-      esac
-
-      case $host in
-      *-*-darwin*)
-	# Don't allow lazy linking, it breaks C++ global constructors
-	# But is supposedly fixed on 10.4 or later (yay!).
-	if test "$tagname" = CXX ; then
-	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-	    10.[0123])
-	      func_append compile_command " ${wl}-bind_at_load"
-	      func_append finalize_command " ${wl}-bind_at_load"
-	    ;;
-	  esac
-	fi
-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $compile_deplibs " in
-	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
-	  esac
-	  ;;
-	*) func_append new_libs " $deplib" ;;
-	esac
-      done
-      compile_deplibs="$new_libs"
-
-
-      func_append compile_command " $compile_deplibs"
-      func_append finalize_command " $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append perm_rpath " $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  ::) dllsearchpath=$libdir;;
-	  *) func_append dllsearchpath ":$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_perm_rpath " $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-      fi
-
-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-
-      # template prelinking step
-      if test -n "$prelink_cmds"; then
-	func_execute_cmds "$prelink_cmds" 'exit $?'
-      fi
-
-      wrappers_required=yes
-      case $host in
-      *cegcc* | *mingw32ce*)
-        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-        wrappers_required=no
-        ;;
-      *cygwin* | *mingw* )
-        if test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      *)
-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      esac
-      if test "$wrappers_required" = no; then
-	# Replace the output file specification.
-	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	exit_status=0
-	func_show_eval "$link_command" 'exit_status=$?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.${objext}"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-	fi
-
-	exit $exit_status
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$opt_dry_run || $RM $output
-	# Link the executable and exit
-	func_show_eval "$link_command" 'exit $?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	func_warning "this platform does not like uninstalled shared libraries"
-	func_warning "\`$output' will be relinked during installation"
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      func_show_eval "$link_command" 'exit $?'
-
-      if test -n "$postlink_cmds"; then
-	func_to_tool_file "$output_objdir/$outputname"
-	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	func_execute_cmds "$postlink_cmds" 'exit $?'
-      fi
-
-      # Now create the wrapper script.
-      func_verbose "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    func_quote_for_eval "$var_value"
-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if not in dry run mode.
-      $opt_dry_run || {
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) func_stripname '' '.exe' "$output"
-	         output=$func_stripname_result ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    func_stripname '' '.exe' "$outputname"
-	    outputname=$func_stripname_result ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    func_dirname_and_basename "$output" "" "."
-	    output_name=$func_basename_result
-	    output_path=$func_dirname_result
-	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
-	    cwrapper="$output_path/$output_name.exe"
-	    $RM $cwrappersource $cwrapper
-	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_cwrapperexe_src > $cwrappersource
-
-	    # The wrapper executable is built using the $host compiler,
-	    # because it contains $host paths and files. If cross-
-	    # compiling, it, like the target executable, must be
-	    # executed on the $host or under an emulation environment.
-	    $opt_dry_run || {
-	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
-	      $STRIP $cwrapper
-	    }
-
-	    # Now, create the wrapper script for func_source use:
-	    func_ltwrapper_scriptname $cwrapper
-	    $RM $func_ltwrapper_scriptname_result
-	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
-	    $opt_dry_run || {
-	      # note: this script will not be executed, so do not chmod.
-	      if test "x$build" = "x$host" ; then
-		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
-	      else
-		func_emit_wrapper no > $func_ltwrapper_scriptname_result
-	      fi
-	    }
-	  ;;
-	  * )
-	    $RM $output
-	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_wrapper no > $output
-	    chmod +x $output
-	  ;;
-	esac
-      }
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save $symfileobj"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    func_append oldobjs " $symfileobj"
-	  fi
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	func_append generated " $gentop"
-
-	func_extract_archives $gentop $addlibs
-	func_append oldobjs " $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	cmds=$old_archive_from_new_cmds
-      else
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  func_append oldobjs " $func_extract_archives_result"
-	fi
-
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      func_basename "$obj"
-	      $ECHO "$func_basename_result"
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  echo "copying selected object files to avoid basename conflicts..."
-	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
-	  func_mkdir_p "$gentop"
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    func_basename "$obj"
-	    objbase="$func_basename_result"
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		func_arith $counter + 1
-		counter=$func_arith_result
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      func_append oldobjs " $gentop/$newobj"
-	      ;;
-	    *) func_append oldobjs " $obj" ;;
-	    esac
-	  done
-	fi
-	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-	tool_oldlib=$func_to_tool_file_result
-	eval cmds=\"$old_archive_cmds\"
-
-	func_len " $cmds"
-	len=$func_len_result
-	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	elif test -n "$archiver_list_spec"; then
-	  func_verbose "using command file archive linking..."
-	  for obj in $oldobjs
-	  do
-	    func_to_tool_file "$obj"
-	    $ECHO "$func_to_tool_file_result"
-	  done > $output_objdir/$libname.libcmd
-	  func_to_tool_file "$output_objdir/$libname.libcmd"
-	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  func_verbose "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  eval test_cmds=\"$old_archive_cmds\"
-	  func_len " $test_cmds"
-	  len0=$func_len_result
-	  len=$len0
-	  for obj in $save_oldobjs
-	  do
-	    func_len " $obj"
-	    func_arith $len + $func_len_result
-	    len=$func_arith_result
-	    func_append objlist " $obj"
-	    if test "$len" -lt "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-		RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	      len=$len0
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      func_execute_cmds "$cmds" 'exit $?'
-    done
-
-    test -n "$generated" && \
-      func_show_eval "${RM}r$generated"
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      func_verbose "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  func_quote_for_eval "$var_value"
-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-      # Only create the output if not a dry run.
-      $opt_dry_run || {
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		func_basename "$deplib"
-		name="$func_basename_result"
-		func_resolve_sysroot "$deplib"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      -L*)
-		func_stripname -L '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -L$func_replace_sysroot_result"
-		;;
-	      -R*)
-		func_stripname -R '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -R$func_replace_sysroot_result"
-		;;
-	      *) func_append newdependency_libs " $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-
-	    for lib in $dlfiles; do
-	      case $lib in
-	      *.la)
-	        func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      *) func_append newdlfiles " $lib" ;;
-	      esac
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-	      *.la)
-		# Only pass preopened files to the pseudo-archive (for
-		# eventual linking with the app. that links it) if we
-		# didn't already link the preopened objects directly into
-		# the library:
-		func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      esac
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      func_append newdlfiles " $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      func_append newdlprefiles " $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $RM $output
-	  # place dlname in correct position for cygwin
-	  # In fact, it would be nice if we could use this code for all target
-	  # systems that can't hard-code library paths into their executables
-	  # and that have no shared library path variable independent of PATH,
-	  # but it turns out we can't easily determine that from inspecting
-	  # libtool variables, so we have to hard-code the OSs to which it
-	  # applies here; at the moment, that means platforms that use the PE
-	  # object format with DLL files.  See the long comment at the top of
-	  # tests/bindir.at for full details.
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
-	      # If a -bindir argument was supplied, place the dll there.
-	      if test "x$bindir" != x ;
-	      then
-		func_relative_path "$install_libdir" "$bindir"
-		tdlname=$func_relative_path_result$dlname
-	      else
-		# Otherwise fall back on heuristic.
-		tdlname=../bin/$dlname
-	      fi
-	      ;;
-	  esac
-	  $ECHO > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags='$new_inherited_linker_flags'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Names of additional weak libraries provided by this library
-weak_library_names='$weak_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $ECHO >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      }
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-}
-
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-    func_mode_link ${1+"$@"}
-
-
-# func_mode_uninstall arg...
-func_mode_uninstall ()
-{
-    $opt_debug
-    RM="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) func_append RM " $arg"; rmforce=yes ;;
-      -*) func_append RM " $arg" ;;
-      *) func_append files " $arg" ;;
-      esac
-    done
-
-    test -z "$RM" && \
-      func_fatal_help "you must specify an RM program"
-
-    rmdirs=
-
-    for file in $files; do
-      func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
-	odir="$objdir"
-      else
-	odir="$dir/$objdir"
-      fi
-      func_basename "$file"
-      name="$func_basename_result"
-      test "$opt_mode" = uninstall && odir="$dir"
-
-      # Remember odir for removal later, being careful to avoid duplicates
-      if test "$opt_mode" = clean; then
-	case " $rmdirs " in
-	  *" $odir "*) ;;
-	  *) func_append rmdirs " $odir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if { test -L "$file"; } >/dev/null 2>&1 ||
-	 { test -h "$file"; } >/dev/null 2>&1 ||
-	 test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if func_lalib_p "$file"; then
-	  func_source $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    func_append rmfiles " $odir/$n"
-	  done
-	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
-
-	  case "$opt_mode" in
-	  clean)
-	    case " $library_names " in
-	    *" $dlname "*) ;;
-	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
-	    esac
-	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
-	    ;;
-	  uninstall)
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	    ;;
-	  esac
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if func_lalib_p "$file"; then
-
-	  # Read the .lo file
-	  func_source $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" &&
-	     test "$pic_object" != none; then
-	    func_append rmfiles " $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" &&
-	     test "$non_pic_object" != none; then
-	    func_append rmfiles " $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$opt_mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    func_stripname '' '.exe' "$file"
-	    file=$func_stripname_result
-	    func_stripname '' '.exe' "$name"
-	    noexename=$func_stripname_result
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    func_append rmfiles " $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if func_ltwrapper_p "$file"; then
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      relink_command=
-	      func_source $func_ltwrapper_scriptname_result
-	      func_append rmfiles " $func_ltwrapper_scriptname_result"
-	    else
-	      relink_command=
-	      func_source $dir/$noexename
-	    fi
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      func_append rmfiles " $odir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      func_append rmfiles " $odir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      func_show_eval "$RM $rmfiles" 'exit_status=1'
-    done
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	func_show_eval "rmdir $dir >/dev/null 2>&1"
-      fi
-    done
-
-    exit $exit_status
-}
-
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
-
-test -z "$opt_mode" && {
-  help="$generic_help"
-  func_fatal_help "you must specify a MODE"
-}
-
-test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$opt_mode'"
-
-if test -n "$exec_cmd"; then
-  eval exec "$exec_cmd"
-  exit $EXIT_FAILURE
-fi
-
-exit $exit_status
-
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
-# vi:sw=2
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/missing b/3rdparty/wxwidgets3.0-3.0.1/src/png/missing
deleted file mode 100755
index cdea514931..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/missing
+++ /dev/null
@@ -1,215 +0,0 @@
-#! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
-
-scriptversion=2012-06-26.16; # UTC
-
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-# Originally written by Fran,cois Pinard , 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try '$0 --help' for more information"
-  exit 1
-fi
-
-case $1 in
-
-  --is-lightweight)
-    # Used by our autoconf macros to check whether the available missing
-    # script is modern enough.
-    exit 0
-    ;;
-
-  --run)
-    # Back-compat with the calling convention used by older automake.
-    shift
-    ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
-to PROGRAM being missing or too old.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-
-Supported PROGRAM values:
-  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
-  bison     yacc      flex         lex       help2man
-
-Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
-'g' are ignored when checking the name.
-
-Send bug reports to ."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: unknown '$1' option"
-    echo 1>&2 "Try '$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Run the given program, remember its exit status.
-"$@"; st=$?
-
-# If it succeeded, we are done.
-test $st -eq 0 && exit 0
-
-# Also exit now if we it failed (or wasn't found), and '--version' was
-# passed; such an option is passed most likely to detect whether the
-# program is present and works.
-case $2 in --version|--help) exit $st;; esac
-
-# Exit code 63 means version mismatch.  This often happens when the user
-# tries to use an ancient version of a tool on a file that requires a
-# minimum version.
-if test $st -eq 63; then
-  msg="probably too old"
-elif test $st -eq 127; then
-  # Program was missing.
-  msg="missing on your system"
-else
-  # Program was found and executed, but failed.  Give up.
-  exit $st
-fi
-
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
-
-program_details ()
-{
-  case $1 in
-    aclocal|automake)
-      echo "The '$1' program is part of the GNU Automake package:"
-      echo "<$gnu_software_URL/automake>"
-      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/autoconf>"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-    autoconf|autom4te|autoheader)
-      echo "The '$1' program is part of the GNU Autoconf package:"
-      echo "<$gnu_software_URL/autoconf/>"
-      echo "It also requires GNU m4 and Perl in order to run:"
-      echo "<$gnu_software_URL/m4/>"
-      echo "<$perl_URL>"
-      ;;
-  esac
-}
-
-give_advice ()
-{
-  # Normalize program name to check for.
-  normalized_program=`echo "$1" | sed '
-    s/^gnu-//; t
-    s/^gnu//; t
-    s/^g//; t'`
-
-  printf '%s\n' "'$1' is $msg."
-
-  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
-  case $normalized_program in
-    autoconf*)
-      echo "You should only need it if you modified 'configure.ac',"
-      echo "or m4 files included by it."
-      program_details 'autoconf'
-      ;;
-    autoheader*)
-      echo "You should only need it if you modified 'acconfig.h' or"
-      echo "$configure_deps."
-      program_details 'autoheader'
-      ;;
-    automake*)
-      echo "You should only need it if you modified 'Makefile.am' or"
-      echo "$configure_deps."
-      program_details 'automake'
-      ;;
-    aclocal*)
-      echo "You should only need it if you modified 'acinclude.m4' or"
-      echo "$configure_deps."
-      program_details 'aclocal'
-      ;;
-   autom4te*)
-      echo "You might have modified some maintainer files that require"
-      echo "the 'automa4te' program to be rebuilt."
-      program_details 'autom4te'
-      ;;
-    bison*|yacc*)
-      echo "You should only need it if you modified a '.y' file."
-      echo "You may want to install the GNU Bison package:"
-      echo "<$gnu_software_URL/bison/>"
-      ;;
-    lex*|flex*)
-      echo "You should only need it if you modified a '.l' file."
-      echo "You may want to install the Fast Lexical Analyzer package:"
-      echo "<$flex_URL>"
-      ;;
-    help2man*)
-      echo "You should only need it if you modified a dependency" \
-           "of a man page."
-      echo "You may want to install the GNU Help2man package:"
-      echo "<$gnu_software_URL/help2man/>"
-    ;;
-    makeinfo*)
-      echo "You should only need it if you modified a '.texi' file, or"
-      echo "any other file indirectly affecting the aspect of the manual."
-      echo "You might want to install the Texinfo package:"
-      echo "<$gnu_software_URL/texinfo/>"
-      echo "The spurious makeinfo call might also be the consequence of"
-      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
-      echo "want to install GNU make:"
-      echo "<$gnu_software_URL/make/>"
-      ;;
-    *)
-      echo "You might have modified some files without having the proper"
-      echo "tools for further handling them.  Check the 'README' file, it"
-      echo "often tells you about the needed prerequisites for installing"
-      echo "this package.  You may also peek at any GNU archive site, in"
-      echo "case some other package contains this missing '$1' program."
-      ;;
-  esac
-}
-
-give_advice "$1" | sed -e '1s/^/WARNING: /' \
-                       -e '2,$s/^/         /' >&2
-
-# Propagate the correct exit status (expected to be 127 for a program
-# not found, 63 for a program that failed due to version mismatch).
-exit $st
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pnglibconf.h b/3rdparty/wxwidgets3.0-3.0.1/src/png/pnglibconf.h
deleted file mode 100644
index 013533309a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pnglibconf.h
+++ /dev/null
@@ -1,453 +0,0 @@
-/* pnglibconf.h - library build configuration */
-
-/* libpng version 1.6.2 - April 25, 2013 */
-
-/* Copyright (c) 1998-2012 Glenn Randers-Pehrson */
-
-/* This code is released under the libpng license. */
-/* For conditions of distribution and use, see the disclaimer */
-/* and license in png.h */
-
-/* pnglibconf.h */
-/* Machine generated file: DO NOT EDIT */
-/* Derived from: scripts/pnglibconf.dfa */
-#ifndef PNGLCONF_H
-#define PNGLCONF_H
-/* options */
-#define PNG_16BIT_SUPPORTED
-#define PNG_ALIGNED_MEMORY_SUPPORTED
-/*#undef PNG_ARM_NEON_API_SUPPORTED*/
-/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
-/*#undef PNG_ARM_NEON_SUPPORTED*/
-#define PNG_BENIGN_ERRORS_SUPPORTED
-#define PNG_BENIGN_READ_ERRORS_SUPPORTED
-/*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/
-#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
-#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_COLORSPACE_SUPPORTED
-#define PNG_CONSOLE_IO_SUPPORTED
-#define PNG_CONVERT_tIME_SUPPORTED
-#define PNG_EASY_ACCESS_SUPPORTED
-/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
-#define PNG_ERROR_TEXT_SUPPORTED
-#define PNG_FIXED_POINT_SUPPORTED
-#define PNG_FLOATING_ARITHMETIC_SUPPORTED
-#define PNG_FLOATING_POINT_SUPPORTED
-#define PNG_FORMAT_AFIRST_SUPPORTED
-#define PNG_FORMAT_BGR_SUPPORTED
-#define PNG_GAMMA_SUPPORTED
-#define PNG_GET_PALETTE_MAX_SUPPORTED
-#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-#define PNG_INCH_CONVERSIONS_SUPPORTED
-#define PNG_INFO_IMAGE_SUPPORTED
-#define PNG_IO_STATE_SUPPORTED
-#define PNG_MNG_FEATURES_SUPPORTED
-#define PNG_POINTER_INDEXING_SUPPORTED
-#define PNG_PROGRESSIVE_READ_SUPPORTED
-#define PNG_READ_16BIT_SUPPORTED
-#define PNG_READ_ALPHA_MODE_SUPPORTED
-#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_READ_BACKGROUND_SUPPORTED
-#define PNG_READ_BGR_SUPPORTED
-#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
-#define PNG_READ_COMPRESSED_TEXT_SUPPORTED
-#define PNG_READ_EXPAND_16_SUPPORTED
-#define PNG_READ_EXPAND_SUPPORTED
-#define PNG_READ_FILLER_SUPPORTED
-#define PNG_READ_GAMMA_SUPPORTED
-#define PNG_READ_GET_PALETTE_MAX_SUPPORTED
-#define PNG_READ_GRAY_TO_RGB_SUPPORTED
-#define PNG_READ_INTERLACING_SUPPORTED
-#define PNG_READ_INT_FUNCTIONS_SUPPORTED
-#define PNG_READ_INVERT_ALPHA_SUPPORTED
-#define PNG_READ_INVERT_SUPPORTED
-#define PNG_READ_OPT_PLTE_SUPPORTED
-#define PNG_READ_PACKSWAP_SUPPORTED
-#define PNG_READ_PACK_SUPPORTED
-#define PNG_READ_QUANTIZE_SUPPORTED
-#define PNG_READ_RGB_TO_GRAY_SUPPORTED
-#define PNG_READ_SCALE_16_TO_8_SUPPORTED
-#define PNG_READ_SHIFT_SUPPORTED
-#define PNG_READ_STRIP_16_TO_8_SUPPORTED
-#define PNG_READ_STRIP_ALPHA_SUPPORTED
-#define PNG_READ_SUPPORTED
-#define PNG_READ_SWAP_ALPHA_SUPPORTED
-#define PNG_READ_SWAP_SUPPORTED
-#define PNG_READ_TEXT_SUPPORTED
-#define PNG_READ_TRANSFORMS_SUPPORTED
-#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_READ_USER_CHUNKS_SUPPORTED
-#define PNG_READ_USER_TRANSFORM_SUPPORTED
-#define PNG_READ_bKGD_SUPPORTED
-#define PNG_READ_cHRM_SUPPORTED
-#define PNG_READ_gAMA_SUPPORTED
-#define PNG_READ_hIST_SUPPORTED
-#define PNG_READ_iCCP_SUPPORTED
-#define PNG_READ_iTXt_SUPPORTED
-#define PNG_READ_oFFs_SUPPORTED
-#define PNG_READ_pCAL_SUPPORTED
-#define PNG_READ_pHYs_SUPPORTED
-#define PNG_READ_sBIT_SUPPORTED
-#define PNG_READ_sCAL_SUPPORTED
-#define PNG_READ_sPLT_SUPPORTED
-#define PNG_READ_sRGB_SUPPORTED
-#define PNG_READ_tEXt_SUPPORTED
-#define PNG_READ_tIME_SUPPORTED
-#define PNG_READ_tRNS_SUPPORTED
-#define PNG_READ_zTXt_SUPPORTED
-/*#undef PNG_SAFE_LIMITS_SUPPORTED*/
-#define PNG_SAVE_INT_32_SUPPORTED
-#define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_SEQUENTIAL_READ_SUPPORTED
-#define PNG_SETJMP_SUPPORTED
-#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED
-#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
-/*#undef PNG_SET_OPTION_SUPPORTED*/
-#define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_SET_USER_LIMITS_SUPPORTED
-#define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
-#define PNG_SIMPLIFIED_READ_BGR_SUPPORTED
-#define PNG_SIMPLIFIED_READ_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_SUPPORTED
-#define PNG_STDIO_SUPPORTED
-#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_TEXT_SUPPORTED
-#define PNG_TIME_RFC1123_SUPPORTED
-#define PNG_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_USER_CHUNKS_SUPPORTED
-#define PNG_USER_LIMITS_SUPPORTED
-#define PNG_USER_MEM_SUPPORTED
-#define PNG_USER_TRANSFORM_INFO_SUPPORTED
-#define PNG_USER_TRANSFORM_PTR_SUPPORTED
-#define PNG_WARNINGS_SUPPORTED
-#define PNG_WRITE_16BIT_SUPPORTED
-#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_WRITE_BGR_SUPPORTED
-#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-#define PNG_WRITE_FILLER_SUPPORTED
-#define PNG_WRITE_FILTER_SUPPORTED
-#define PNG_WRITE_FLUSH_SUPPORTED
-#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED
-#define PNG_WRITE_INTERLACING_SUPPORTED
-#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
-#define PNG_WRITE_INVERT_SUPPORTED
-#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-#define PNG_WRITE_PACKSWAP_SUPPORTED
-#define PNG_WRITE_PACK_SUPPORTED
-#define PNG_WRITE_SHIFT_SUPPORTED
-#define PNG_WRITE_SUPPORTED
-#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
-#define PNG_WRITE_SWAP_SUPPORTED
-#define PNG_WRITE_TEXT_SUPPORTED
-#define PNG_WRITE_TRANSFORMS_SUPPORTED
-#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
-#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-#define PNG_WRITE_bKGD_SUPPORTED
-#define PNG_WRITE_cHRM_SUPPORTED
-#define PNG_WRITE_gAMA_SUPPORTED
-#define PNG_WRITE_hIST_SUPPORTED
-#define PNG_WRITE_iCCP_SUPPORTED
-#define PNG_WRITE_iTXt_SUPPORTED
-#define PNG_WRITE_oFFs_SUPPORTED
-#define PNG_WRITE_pCAL_SUPPORTED
-#define PNG_WRITE_pHYs_SUPPORTED
-#define PNG_WRITE_sBIT_SUPPORTED
-#define PNG_WRITE_sCAL_SUPPORTED
-#define PNG_WRITE_sPLT_SUPPORTED
-#define PNG_WRITE_sRGB_SUPPORTED
-#define PNG_WRITE_tEXt_SUPPORTED
-#define PNG_WRITE_tIME_SUPPORTED
-#define PNG_WRITE_tRNS_SUPPORTED
-#define PNG_WRITE_zTXt_SUPPORTED
-#define PNG_bKGD_SUPPORTED
-#define PNG_cHRM_SUPPORTED
-#define PNG_gAMA_SUPPORTED
-#define PNG_hIST_SUPPORTED
-#define PNG_iCCP_SUPPORTED
-#define PNG_iTXt_SUPPORTED
-#define PNG_oFFs_SUPPORTED
-#define PNG_pCAL_SUPPORTED
-#define PNG_pHYs_SUPPORTED
-#define PNG_sBIT_SUPPORTED
-#define PNG_sCAL_SUPPORTED
-#define PNG_sPLT_SUPPORTED
-#define PNG_sRGB_SUPPORTED
-#define PNG_tEXt_SUPPORTED
-#define PNG_tIME_SUPPORTED
-#define PNG_tRNS_SUPPORTED
-#define PNG_zTXt_SUPPORTED
-/* end of options */
-/* settings */
-#define PNG_API_RULE 0
-#define PNG_CALLOC_SUPPORTED
-#define PNG_COST_SHIFT 3
-#define PNG_DEFAULT_READ_MACROS 1
-#define PNG_GAMMA_THRESHOLD_FIXED 5000
-#define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE
-#define PNG_INFLATE_BUF_SIZE 1024
-#define PNG_MAX_GAMMA_8 11
-#define PNG_PREFIX wx_
-#define PNG_QUANTIZE_BLUE_BITS 5
-#define PNG_QUANTIZE_GREEN_BITS 5
-#define PNG_QUANTIZE_RED_BITS 5
-#define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1)
-#define PNG_TEXT_Z_DEFAULT_STRATEGY 0
-#define PNG_WEIGHT_SHIFT 8
-#define PNG_ZBUF_SIZE 8192
-#define PNG_Z_DEFAULT_COMPRESSION (-1)
-#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
-#define PNG_Z_DEFAULT_STRATEGY 1
-#define PNG_sCAL_PRECISION 5
-#define PNG_sRGB_PROFILE_CHECKS 2
-/* end of settings */
-#define png_access_version_number wx_png_access_version_number
-#define png_benign_error wx_png_benign_error
-#define png_build_grayscale_palette wx_png_build_grayscale_palette
-#define png_calloc wx_png_calloc
-#define png_chunk_benign_error wx_png_chunk_benign_error
-#define png_chunk_error wx_png_chunk_error
-#define png_chunk_warning wx_png_chunk_warning
-#define png_convert_from_struct_tm wx_png_convert_from_struct_tm
-#define png_convert_from_time_t wx_png_convert_from_time_t
-#define png_convert_to_rfc1123 wx_png_convert_to_rfc1123
-#define png_convert_to_rfc1123_buffer wx_png_convert_to_rfc1123_buffer
-#define png_create_info_struct wx_png_create_info_struct
-#define png_create_read_struct wx_png_create_read_struct
-#define png_create_read_struct_2 wx_png_create_read_struct_2
-#define png_create_write_struct wx_png_create_write_struct
-#define png_create_write_struct_2 wx_png_create_write_struct_2
-#define png_data_freer wx_png_data_freer
-#define png_destroy_info_struct wx_png_destroy_info_struct
-#define png_destroy_read_struct wx_png_destroy_read_struct
-#define png_destroy_write_struct wx_png_destroy_write_struct
-#define png_error wx_png_error
-#define png_free wx_png_free
-#define png_free_data wx_png_free_data
-#define png_free_default wx_png_free_default
-#define png_get_IHDR wx_png_get_IHDR
-#define png_get_PLTE wx_png_get_PLTE
-#define png_get_bKGD wx_png_get_bKGD
-#define png_get_bit_depth wx_png_get_bit_depth
-#define png_get_cHRM wx_png_get_cHRM
-#define png_get_cHRM_XYZ wx_png_get_cHRM_XYZ
-#define png_get_cHRM_XYZ_fixed wx_png_get_cHRM_XYZ_fixed
-#define png_get_cHRM_fixed wx_png_get_cHRM_fixed
-#define png_get_channels wx_png_get_channels
-#define png_get_chunk_cache_max wx_png_get_chunk_cache_max
-#define png_get_chunk_malloc_max wx_png_get_chunk_malloc_max
-#define png_get_color_type wx_png_get_color_type
-#define png_get_compression_buffer_size wx_png_get_compression_buffer_size
-#define png_get_compression_type wx_png_get_compression_type
-#define png_get_copyright wx_png_get_copyright
-#define png_get_current_pass_number wx_png_get_current_pass_number
-#define png_get_current_row_number wx_png_get_current_row_number
-#define png_get_error_ptr wx_png_get_error_ptr
-#define png_get_filter_type wx_png_get_filter_type
-#define png_get_gAMA wx_png_get_gAMA
-#define png_get_gAMA_fixed wx_png_get_gAMA_fixed
-#define png_get_hIST wx_png_get_hIST
-#define png_get_header_ver wx_png_get_header_ver
-#define png_get_header_version wx_png_get_header_version
-#define png_get_iCCP wx_png_get_iCCP
-#define png_get_image_height wx_png_get_image_height
-#define png_get_image_width wx_png_get_image_width
-#define png_get_int_32 wx_png_get_int_32
-#define png_get_interlace_type wx_png_get_interlace_type
-#define png_get_io_chunk_type wx_png_get_io_chunk_type
-#define png_get_io_ptr wx_png_get_io_ptr
-#define png_get_io_state wx_png_get_io_state
-#define png_get_libpng_ver wx_png_get_libpng_ver
-#define png_get_mem_ptr wx_png_get_mem_ptr
-#define png_get_oFFs wx_png_get_oFFs
-#define png_get_pCAL wx_png_get_pCAL
-#define png_get_pHYs wx_png_get_pHYs
-#define png_get_pHYs_dpi wx_png_get_pHYs_dpi
-#define png_get_palette_max wx_png_get_palette_max
-#define png_get_pixel_aspect_ratio wx_png_get_pixel_aspect_ratio
-#define png_get_pixel_aspect_ratio_fixed wx_png_get_pixel_aspect_ratio_fixed
-#define png_get_pixels_per_inch wx_png_get_pixels_per_inch
-#define png_get_pixels_per_meter wx_png_get_pixels_per_meter
-#define png_get_progressive_ptr wx_png_get_progressive_ptr
-#define png_get_rgb_to_gray_status wx_png_get_rgb_to_gray_status
-#define png_get_rowbytes wx_png_get_rowbytes
-#define png_get_rows wx_png_get_rows
-#define png_get_sBIT wx_png_get_sBIT
-#define png_get_sCAL wx_png_get_sCAL
-#define png_get_sCAL_fixed wx_png_get_sCAL_fixed
-#define png_get_sCAL_s wx_png_get_sCAL_s
-#define png_get_sPLT wx_png_get_sPLT
-#define png_get_sRGB wx_png_get_sRGB
-#define png_get_signature wx_png_get_signature
-#define png_get_tIME wx_png_get_tIME
-#define png_get_tRNS wx_png_get_tRNS
-#define png_get_text wx_png_get_text
-#define png_get_uint_16 wx_png_get_uint_16
-#define png_get_uint_31 wx_png_get_uint_31
-#define png_get_uint_32 wx_png_get_uint_32
-#define png_get_unknown_chunks wx_png_get_unknown_chunks
-#define png_get_user_chunk_ptr wx_png_get_user_chunk_ptr
-#define png_get_user_height_max wx_png_get_user_height_max
-#define png_get_user_transform_ptr wx_png_get_user_transform_ptr
-#define png_get_user_width_max wx_png_get_user_width_max
-#define png_get_valid wx_png_get_valid
-#define png_get_x_offset_inches wx_png_get_x_offset_inches
-#define png_get_x_offset_inches_fixed wx_png_get_x_offset_inches_fixed
-#define png_get_x_offset_microns wx_png_get_x_offset_microns
-#define png_get_x_offset_pixels wx_png_get_x_offset_pixels
-#define png_get_x_pixels_per_inch wx_png_get_x_pixels_per_inch
-#define png_get_x_pixels_per_meter wx_png_get_x_pixels_per_meter
-#define png_get_y_offset_inches wx_png_get_y_offset_inches
-#define png_get_y_offset_inches_fixed wx_png_get_y_offset_inches_fixed
-#define png_get_y_offset_microns wx_png_get_y_offset_microns
-#define png_get_y_offset_pixels wx_png_get_y_offset_pixels
-#define png_get_y_pixels_per_inch wx_png_get_y_pixels_per_inch
-#define png_get_y_pixels_per_meter wx_png_get_y_pixels_per_meter
-#define png_handle_as_unknown wx_png_handle_as_unknown
-#define png_image_begin_read_from_file wx_png_image_begin_read_from_file
-#define png_image_begin_read_from_memory wx_png_image_begin_read_from_memory
-#define png_image_begin_read_from_stdio wx_png_image_begin_read_from_stdio
-#define png_image_finish_read wx_png_image_finish_read
-#define png_image_free wx_png_image_free
-#define png_image_write_to_file wx_png_image_write_to_file
-#define png_image_write_to_stdio wx_png_image_write_to_stdio
-#define png_info_init_3 wx_png_info_init_3
-#define png_init_io wx_png_init_io
-#define png_longjmp wx_png_longjmp
-#define png_malloc wx_png_malloc
-#define png_malloc_default wx_png_malloc_default
-#define png_malloc_warn wx_png_malloc_warn
-#define png_permit_mng_features wx_png_permit_mng_features
-#define png_process_data wx_png_process_data
-#define png_process_data_pause wx_png_process_data_pause
-#define png_process_data_skip wx_png_process_data_skip
-#define png_progressive_combine_row wx_png_progressive_combine_row
-#define png_read_end wx_png_read_end
-#define png_read_image wx_png_read_image
-#define png_read_info wx_png_read_info
-#define png_read_png wx_png_read_png
-#define png_read_row wx_png_read_row
-#define png_read_rows wx_png_read_rows
-#define png_read_update_info wx_png_read_update_info
-#define png_reset_zstream wx_png_reset_zstream
-#define png_save_int_32 wx_png_save_int_32
-#define png_save_uint_16 wx_png_save_uint_16
-#define png_save_uint_32 wx_png_save_uint_32
-#define png_set_IHDR wx_png_set_IHDR
-#define png_set_PLTE wx_png_set_PLTE
-#define png_set_add_alpha wx_png_set_add_alpha
-#define png_set_alpha_mode wx_png_set_alpha_mode
-#define png_set_alpha_mode_fixed wx_png_set_alpha_mode_fixed
-#define png_set_bKGD wx_png_set_bKGD
-#define png_set_background wx_png_set_background
-#define png_set_background_fixed wx_png_set_background_fixed
-#define png_set_benign_errors wx_png_set_benign_errors
-#define png_set_bgr wx_png_set_bgr
-#define png_set_cHRM wx_png_set_cHRM
-#define png_set_cHRM_XYZ wx_png_set_cHRM_XYZ
-#define png_set_cHRM_XYZ_fixed wx_png_set_cHRM_XYZ_fixed
-#define png_set_cHRM_fixed wx_png_set_cHRM_fixed
-#define png_set_check_for_invalid_index wx_png_set_check_for_invalid_index
-#define png_set_chunk_cache_max wx_png_set_chunk_cache_max
-#define png_set_chunk_malloc_max wx_png_set_chunk_malloc_max
-#define png_set_compression_buffer_size wx_png_set_compression_buffer_size
-#define png_set_compression_level wx_png_set_compression_level
-#define png_set_compression_mem_level wx_png_set_compression_mem_level
-#define png_set_compression_method wx_png_set_compression_method
-#define png_set_compression_strategy wx_png_set_compression_strategy
-#define png_set_compression_window_bits wx_png_set_compression_window_bits
-#define png_set_crc_action wx_png_set_crc_action
-#define png_set_error_fn wx_png_set_error_fn
-#define png_set_expand wx_png_set_expand
-#define png_set_expand_16 wx_png_set_expand_16
-#define png_set_expand_gray_1_2_4_to_8 wx_png_set_expand_gray_1_2_4_to_8
-#define png_set_filler wx_png_set_filler
-#define png_set_filter wx_png_set_filter
-#define png_set_filter_heuristics wx_png_set_filter_heuristics
-#define png_set_filter_heuristics_fixed wx_png_set_filter_heuristics_fixed
-#define png_set_flush wx_png_set_flush
-#define png_set_gAMA wx_png_set_gAMA
-#define png_set_gAMA_fixed wx_png_set_gAMA_fixed
-#define png_set_gamma wx_png_set_gamma
-#define png_set_gamma_fixed wx_png_set_gamma_fixed
-#define png_set_gray_to_rgb wx_png_set_gray_to_rgb
-#define png_set_hIST wx_png_set_hIST
-#define png_set_iCCP wx_png_set_iCCP
-#define png_set_interlace_handling wx_png_set_interlace_handling
-#define png_set_invalid wx_png_set_invalid
-#define png_set_invert_alpha wx_png_set_invert_alpha
-#define png_set_invert_mono wx_png_set_invert_mono
-#define png_set_keep_unknown_chunks wx_png_set_keep_unknown_chunks
-#define png_set_longjmp_fn wx_png_set_longjmp_fn
-#define png_set_mem_fn wx_png_set_mem_fn
-#define png_set_oFFs wx_png_set_oFFs
-#define png_set_pCAL wx_png_set_pCAL
-#define png_set_pHYs wx_png_set_pHYs
-#define png_set_packing wx_png_set_packing
-#define png_set_packswap wx_png_set_packswap
-#define png_set_palette_to_rgb wx_png_set_palette_to_rgb
-#define png_set_progressive_read_fn wx_png_set_progressive_read_fn
-#define png_set_quantize wx_png_set_quantize
-#define png_set_read_fn wx_png_set_read_fn
-#define png_set_read_status_fn wx_png_set_read_status_fn
-#define png_set_read_user_chunk_fn wx_png_set_read_user_chunk_fn
-#define png_set_read_user_transform_fn wx_png_set_read_user_transform_fn
-#define png_set_rgb_to_gray wx_png_set_rgb_to_gray
-#define png_set_rgb_to_gray_fixed wx_png_set_rgb_to_gray_fixed
-#define png_set_rows wx_png_set_rows
-#define png_set_sBIT wx_png_set_sBIT
-#define png_set_sCAL wx_png_set_sCAL
-#define png_set_sCAL_fixed wx_png_set_sCAL_fixed
-#define png_set_sCAL_s wx_png_set_sCAL_s
-#define png_set_sPLT wx_png_set_sPLT
-#define png_set_sRGB wx_png_set_sRGB
-#define png_set_sRGB_gAMA_and_cHRM wx_png_set_sRGB_gAMA_and_cHRM
-#define png_set_scale_16 wx_png_set_scale_16
-#define png_set_shift wx_png_set_shift
-#define png_set_sig_bytes wx_png_set_sig_bytes
-#define png_set_strip_16 wx_png_set_strip_16
-#define png_set_strip_alpha wx_png_set_strip_alpha
-#define png_set_swap wx_png_set_swap
-#define png_set_swap_alpha wx_png_set_swap_alpha
-#define png_set_tIME wx_png_set_tIME
-#define png_set_tRNS wx_png_set_tRNS
-#define png_set_tRNS_to_alpha wx_png_set_tRNS_to_alpha
-#define png_set_text wx_png_set_text
-#define png_set_text_compression_level wx_png_set_text_compression_level
-#define png_set_text_compression_mem_level wx_png_set_text_compression_mem_level
-#define png_set_text_compression_method wx_png_set_text_compression_method
-#define png_set_text_compression_strategy wx_png_set_text_compression_strategy
-#define png_set_text_compression_window_bits wx_png_set_text_compression_window_bits
-#define png_set_unknown_chunk_location wx_png_set_unknown_chunk_location
-#define png_set_unknown_chunks wx_png_set_unknown_chunks
-#define png_set_user_limits wx_png_set_user_limits
-#define png_set_user_transform_info wx_png_set_user_transform_info
-#define png_set_write_fn wx_png_set_write_fn
-#define png_set_write_status_fn wx_png_set_write_status_fn
-#define png_set_write_user_transform_fn wx_png_set_write_user_transform_fn
-#define png_sig_cmp wx_png_sig_cmp
-#define png_start_read_image wx_png_start_read_image
-#define png_warning wx_png_warning
-#define png_write_chunk wx_png_write_chunk
-#define png_write_chunk_data wx_png_write_chunk_data
-#define png_write_chunk_end wx_png_write_chunk_end
-#define png_write_chunk_start wx_png_write_chunk_start
-#define png_write_end wx_png_write_end
-#define png_write_flush wx_png_write_flush
-#define png_write_image wx_png_write_image
-#define png_write_info wx_png_write_info
-#define png_write_info_before_PLTE wx_png_write_info_before_PLTE
-#define png_write_png wx_png_write_png
-#define png_write_row wx_png_write_row
-#define png_write_rows wx_png_write_rows
-#define png_write_sig wx_png_write_sig
-#define wx_png_get_uint_32(buf) PNG_get_uint_32(buf)
-#define wx_png_get_uint_16(buf) PNG_get_uint_16(buf)
-#define wx_png_get_int_32(buf) PNG_get_int_32(buf)
-#endif /* PNGLCONF_H */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngprefix.h b/3rdparty/wxwidgets3.0-3.0.1/src/png/pngprefix.h
deleted file mode 100644
index 89cbb31eef..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngprefix.h
+++ /dev/null
@@ -1,188 +0,0 @@
-#define png_sRGB_table wx_png_sRGB_table
-#define png_sRGB_base wx_png_sRGB_base
-#define png_sRGB_delta wx_png_sRGB_delta
-#define png_zstream_error wx_png_zstream_error
-#define png_free_buffer_list wx_png_free_buffer_list
-#define png_fixed wx_png_fixed
-#define png_user_version_check wx_png_user_version_check
-#define png_malloc_base wx_png_malloc_base
-#define png_malloc_array wx_png_malloc_array
-#define png_realloc_array wx_png_realloc_array
-#define png_create_png_struct wx_png_create_png_struct
-#define png_destroy_png_struct wx_png_destroy_png_struct
-#define png_free_jmpbuf wx_png_free_jmpbuf
-#define png_zalloc wx_png_zalloc
-#define png_zfree wx_png_zfree
-#define png_default_read_data wx_png_default_read_data
-#define png_push_fill_buffer wx_png_push_fill_buffer
-#define png_default_write_data wx_png_default_write_data
-#define png_default_flush wx_png_default_flush
-#define png_reset_crc wx_png_reset_crc
-#define png_write_data wx_png_write_data
-#define png_read_sig wx_png_read_sig
-#define png_read_chunk_header wx_png_read_chunk_header
-#define png_read_data wx_png_read_data
-#define png_crc_read wx_png_crc_read
-#define png_crc_finish wx_png_crc_finish
-#define png_crc_error wx_png_crc_error
-#define png_calculate_crc wx_png_calculate_crc
-#define png_flush wx_png_flush
-#define png_write_IHDR wx_png_write_IHDR
-#define png_write_PLTE wx_png_write_PLTE
-#define png_compress_IDAT wx_png_compress_IDAT
-#define png_write_IEND wx_png_write_IEND
-#define png_write_gAMA_fixed wx_png_write_gAMA_fixed
-#define png_write_sBIT wx_png_write_sBIT
-#define png_write_cHRM_fixed wx_png_write_cHRM_fixed
-#define png_write_sRGB wx_png_write_sRGB
-#define png_write_iCCP wx_png_write_iCCP
-#define png_write_sPLT wx_png_write_sPLT
-#define png_write_tRNS wx_png_write_tRNS
-#define png_write_bKGD wx_png_write_bKGD
-#define png_write_hIST wx_png_write_hIST
-#define png_write_tEXt wx_png_write_tEXt
-#define png_write_zTXt wx_png_write_zTXt
-#define png_write_iTXt wx_png_write_iTXt
-#define png_set_text_2 wx_png_set_text_2
-#define png_write_oFFs wx_png_write_oFFs
-#define png_write_pCAL wx_png_write_pCAL
-#define png_write_pHYs wx_png_write_pHYs
-#define png_write_tIME wx_png_write_tIME
-#define png_write_sCAL_s wx_png_write_sCAL_s
-#define png_write_finish_row wx_png_write_finish_row
-#define png_write_start_row wx_png_write_start_row
-#define png_combine_row wx_png_combine_row
-#define png_do_read_interlace wx_png_do_read_interlace
-#define png_do_write_interlace wx_png_do_write_interlace
-#define png_read_filter_row wx_png_read_filter_row
-#define png_read_filter_row_up_neon wx_png_read_filter_row_up_neon
-#define png_read_filter_row_sub3_neon wx_png_read_filter_row_sub3_neon
-#define png_read_filter_row_sub4_neon wx_png_read_filter_row_sub4_neon
-#define png_read_filter_row_avg3_neon wx_png_read_filter_row_avg3_neon
-#define png_read_filter_row_avg4_neon wx_png_read_filter_row_avg4_neon
-#define png_read_filter_row_paeth3_neon wx_png_read_filter_row_paeth3_neon
-#define png_read_filter_row_paeth4_neon wx_png_read_filter_row_paeth4_neon
-#define png_write_find_filter wx_png_write_find_filter
-#define png_read_IDAT_data wx_png_read_IDAT_data
-#define png_read_finish_IDAT wx_png_read_finish_IDAT
-#define png_read_finish_row wx_png_read_finish_row
-#define png_read_start_row wx_png_read_start_row
-#define png_read_transform_info wx_png_read_transform_info
-#define png_do_read_filler wx_png_do_read_filler
-#define png_do_read_swap_alpha wx_png_do_read_swap_alpha
-#define png_do_write_swap_alpha wx_png_do_write_swap_alpha
-#define png_do_read_invert_alpha wx_png_do_read_invert_alpha
-#define png_do_write_invert_alpha wx_png_do_write_invert_alpha
-#define png_do_strip_channel wx_png_do_strip_channel
-#define png_do_swap wx_png_do_swap
-#define png_do_packswap wx_png_do_packswap
-#define png_do_rgb_to_gray wx_png_do_rgb_to_gray
-#define png_do_gray_to_rgb wx_png_do_gray_to_rgb
-#define png_do_unpack wx_png_do_unpack
-#define png_do_unshift wx_png_do_unshift
-#define png_do_invert wx_png_do_invert
-#define png_do_scale_16_to_8 wx_png_do_scale_16_to_8
-#define png_do_chop wx_png_do_chop
-#define png_do_quantize wx_png_do_quantize
-#define png_do_bgr wx_png_do_bgr
-#define png_do_pack wx_png_do_pack
-#define png_do_shift wx_png_do_shift
-#define png_do_compose wx_png_do_compose
-#define png_do_gamma wx_png_do_gamma
-#define png_do_encode_alpha wx_png_do_encode_alpha
-#define png_do_expand_palette wx_png_do_expand_palette
-#define png_do_expand wx_png_do_expand
-#define png_do_expand_16 wx_png_do_expand_16
-#define png_handle_IHDR wx_png_handle_IHDR
-#define png_handle_PLTE wx_png_handle_PLTE
-#define png_handle_IEND wx_png_handle_IEND
-#define png_handle_bKGD wx_png_handle_bKGD
-#define png_handle_cHRM wx_png_handle_cHRM
-#define png_handle_gAMA wx_png_handle_gAMA
-#define png_handle_hIST wx_png_handle_hIST
-#define png_handle_iCCP wx_png_handle_iCCP
-#define png_handle_iTXt wx_png_handle_iTXt
-#define png_handle_oFFs wx_png_handle_oFFs
-#define png_handle_pCAL wx_png_handle_pCAL
-#define png_handle_pHYs wx_png_handle_pHYs
-#define png_handle_sBIT wx_png_handle_sBIT
-#define png_handle_sCAL wx_png_handle_sCAL
-#define png_handle_sPLT wx_png_handle_sPLT
-#define png_handle_sRGB wx_png_handle_sRGB
-#define png_handle_tEXt wx_png_handle_tEXt
-#define png_handle_tIME wx_png_handle_tIME
-#define png_handle_tRNS wx_png_handle_tRNS
-#define png_handle_zTXt wx_png_handle_zTXt
-#define png_check_chunk_name wx_png_check_chunk_name
-#define png_handle_unknown wx_png_handle_unknown
-#define png_chunk_unknown_handling wx_png_chunk_unknown_handling
-#define png_do_read_transformations wx_png_do_read_transformations
-#define png_do_write_transformations wx_png_do_write_transformations
-#define png_init_read_transformations wx_png_init_read_transformations
-#define png_push_read_chunk wx_png_push_read_chunk
-#define png_push_read_sig wx_png_push_read_sig
-#define png_push_check_crc wx_png_push_check_crc
-#define png_push_crc_skip wx_png_push_crc_skip
-#define png_push_crc_finish wx_png_push_crc_finish
-#define png_push_save_buffer wx_png_push_save_buffer
-#define png_push_restore_buffer wx_png_push_restore_buffer
-#define png_push_read_IDAT wx_png_push_read_IDAT
-#define png_process_IDAT_data wx_png_process_IDAT_data
-#define png_push_process_row wx_png_push_process_row
-#define png_push_handle_unknown wx_png_push_handle_unknown
-#define png_push_have_info wx_png_push_have_info
-#define png_push_have_end wx_png_push_have_end
-#define png_push_have_row wx_png_push_have_row
-#define png_push_read_end wx_png_push_read_end
-#define png_process_some_data wx_png_process_some_data
-#define png_read_push_finish_row wx_png_read_push_finish_row
-#define png_push_handle_tEXt wx_png_push_handle_tEXt
-#define png_push_read_tEXt wx_png_push_read_tEXt
-#define png_push_handle_zTXt wx_png_push_handle_zTXt
-#define png_push_read_zTXt wx_png_push_read_zTXt
-#define png_push_handle_iTXt wx_png_push_handle_iTXt
-#define png_push_read_iTXt wx_png_push_read_iTXt
-#define png_do_read_intrapixel wx_png_do_read_intrapixel
-#define png_do_write_intrapixel wx_png_do_write_intrapixel
-#define png_colorspace_set_gamma wx_png_colorspace_set_gamma
-#define png_colorspace_sync_info wx_png_colorspace_sync_info
-#define png_colorspace_sync wx_png_colorspace_sync
-#define png_colorspace_set_chromaticities wx_png_colorspace_set_chromaticities
-#define png_colorspace_set_endpoints wx_png_colorspace_set_endpoints
-#define png_colorspace_set_sRGB wx_png_colorspace_set_sRGB
-#define png_colorspace_set_ICC wx_png_colorspace_set_ICC
-#define png_icc_check_length wx_png_icc_check_length
-#define png_icc_check_header wx_png_icc_check_header
-#define png_icc_check_tag_table wx_png_icc_check_tag_table
-#define png_icc_set_sRGB wx_png_icc_set_sRGB
-#define png_colorspace_set_rgb_coefficients wx_png_colorspace_set_rgb_coefficients
-#define png_check_IHDR wx_png_check_IHDR
-#define png_do_check_palette_indexes wx_png_do_check_palette_indexes
-#define png_fixed_error wx_png_fixed_error
-#define png_safecat wx_png_safecat
-#define png_format_number wx_png_format_number
-#define png_warning_parameter wx_png_warning_parameter
-#define png_warning_parameter_unsigned wx_png_warning_parameter_unsigned
-#define png_warning_parameter_signed wx_png_warning_parameter_signed
-#define png_formatted_warning wx_png_formatted_warning
-#define png_app_warning wx_png_app_warning
-#define png_app_error wx_png_app_error
-#define png_chunk_report wx_png_chunk_report
-#define png_ascii_from_fp wx_png_ascii_from_fp
-#define png_ascii_from_fixed wx_png_ascii_from_fixed
-#define png_check_fp_number wx_png_check_fp_number
-#define png_check_fp_string wx_png_check_fp_string
-#define png_muldiv wx_png_muldiv
-#define png_muldiv_warn wx_png_muldiv_warn
-#define png_reciprocal wx_png_reciprocal
-#define png_reciprocal2 wx_png_reciprocal2
-#define png_gamma_significant wx_png_gamma_significant
-#define png_gamma_correct wx_png_gamma_correct
-#define png_gamma_16bit_correct wx_png_gamma_16bit_correct
-#define png_gamma_8bit_correct wx_png_gamma_8bit_correct
-#define png_destroy_gamma_table wx_png_destroy_gamma_table
-#define png_build_gamma_table wx_png_build_gamma_table
-#define png_safe_error wx_png_safe_error
-#define png_safe_warning wx_png_safe_warning
-#define png_safe_execute wx_png_safe_execute
-#define png_image_error wx_png_image_error
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngusr.dfa b/3rdparty/wxwidgets3.0-3.0.1/src/png/pngusr.dfa
deleted file mode 100644
index 9d39564b51..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/pngusr.dfa
+++ /dev/null
@@ -1,14 +0,0 @@
-# pngusr.dfa
-#
-# Build time configuration of libpng
-#
-# Enter build configuration options in this file
-#
-# Security settings: by default these limits are unset, you can change them
-# here by entering the appropriate values as #defines preceded by '@' (to cause,
-# them to be passed through to the build of pnglibconf.h), for example:
-#
-# @# define PNG_USER_WIDTH_MAX 1000000
-# @# define PNG_USER_HEIGHT_MAX 1000000
-# @# define PNG_USER_CHUNK_CACHE_MAX 128
-# @# define PNG_USER_CHUNK_MALLOC_MAX 8000000
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/chkfmt b/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/chkfmt
deleted file mode 100755
index 9da6475fd4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/chkfmt
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/bin/sh
-#
-# Check the format of the source files in the current directory - checks for a
-# line length of 80 characters max and no tab characters.
-#
-# Optionally arguments are files or directories to check.
-#
-# -v: output the long lines (makes fixing them easier)
-# -e: spawn an editor for each file that needs a change ($EDITOR must be
-#     defined).  When using -e the script MUST be run from an interactive
-#     command line.
-verbose=
-edit=
-vers=
-test "$1" = "-v" && {
-   shift
-   verbose=yes
-}
-test "$1" = "-e" && {
-   shift
-   if test -n "$EDITOR"
-   then
-      edit=yes
-
-      # Copy the standard streams for the editor
-      exec 3>&0 4>&1 5>&2
-   else
-      echo "chkfmt -e: EDITOR must be defined" >&2
-      exit 1
-   fi
-}
-
-# Function to edit a single file - if the file isn't changed ask the user
-# whether or not to continue.  This stuff only works if the script is run from
-# the command line (otherwise, don't specify -e or you will be sorry).
-doed(){
-   cp "$file" "$file".orig
-   "$EDITOR" "$file" 0>&3 1>&4 2>&5 3>&- 4>&- 5>&- || exit 1
-   if cmp -s "$file".orig "$file"
-   then
-      rm "$file".orig
-      echo -n "$file: file not changed, type anything to continue: " >&5
-      read ans 0>&3
-      test -n "$ans" || return 1
-   fi
-   return 0
-}
-
-# In beta versions the version string which appears in files can be a little
-# long and cause spuriously overlong lines.  To avoid this subtitute the version
-# string with a 'standard' version a.b.cc before checking for long lines.
-if test -r png.h
-then
-   vers="`sed -n -e \
-   's/^#define PNG_LIBPNG_VER_STRING .\([0-9]\.[0-9]\.[0-9][0-9a-z]*\).$/\1/p' \
-   png.h`"
-   echo "chkfmt: checking version $vers"
-fi
-if test -z "$vers"
-then
-   echo "chkfmt: png.h not found, ignoring version number" >&2
-fi
-
-test -n "$1" || set -- .
-find "$@" \( -type d \( -name '.git' -o -name '.libs' -o -name 'projects' \) \
-   -prune \) -o \( -type f \
-   ! -name '*.[oa]' ! -name '*.l[oa]' !  -name '*.png' ! -name '*.out' \
-   ! -name '*.jpg' ! -name '*.patch' ! -name '*.obj' ! -name '*.exe' \
-   ! -name '*.com' ! -name '*.tar.*' ! -name '*.zip' ! -name '*.ico' \
-   ! -name '*.res' ! -name '*.rc' ! -name '*.mms' ! -name '*.rej' \
-   ! -name '*.dsp' ! -name '*.orig' ! -name '*.dfn' ! -name '*.swp' \
-   ! -name '~*' ! -name '*.3' \
-   ! -name 'missing' ! -name 'mkinstalldirs' ! -name 'depcomp' \
-   ! -name 'aclocal.m4' ! -name 'install-sh' ! -name 'Makefile.in' \
-   ! -name 'ltmain.sh' ! -name 'config*' -print \) | {
-   st=0
-   while read file
-   do
-      case "$file" in
-      *.mak|*[Mm]akefile.*|*[Mm]akefile)
-         # Makefiles require tabs, dependency lines can be this long.
-         check_tabs=
-         line_length=100;;
-      *.awk)
-         # Includes literal tabs
-         check_tabs=
-         # The following is arbitrary
-         line_length=132;;
-      *contrib/*/*.[ch])
-         check_tabs=yes
-         line_length=96;;
-      *)
-         check_tabs=yes
-         line_length=80;;
-      esac
-
-      # Note that vers can only contain 0-9, . and a-z
-      if test -n "$vers"
-      then
-         sed -e "s/$vers/a.b.cc/g" "$file" >"$file".$$
-      else
-         cp "$file" "$file".$$
-      fi
-      splt="`fold -$line_length "$file".$$ | diff -c "$file".$$ -`"
-      rm "$file".$$
-
-      if test -n "$splt"
-      then
-         echo "$file: lines too long"
-         st=1
-         if test -n "$EDITOR" -a -n "$edit"
-         then
-            doed "$file" || exit 1
-         elif test -n "$verbose"
-         then
-            echo "$splt"
-         fi
-      fi
-      if test -n "$check_tabs"
-      then
-         tab="`tr -c -d '\t' <"$file"`"
-         if test -n "$tab"
-         then
-            echo "$file: file contains tab characters"
-            st=1
-            if test -n "$EDITOR" -a -n "$edit"
-            then
-               doed "$file" || exit 1
-            elif test -n "$verbose"
-            then
-               echo "$splt"
-            fi
-         fi
-      fi
-   done
-   exit $st
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/libtool.m4 b/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/libtool.m4
deleted file mode 100644
index 02b4bbec52..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/libtool.m4
+++ /dev/null
@@ -1,7991 +0,0 @@
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-m4_define([_LT_COPYING], [dnl
-#   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-#                 Foundation, Inc.
-#   Written by Gordon Matzigkeit, 1996
-#
-#   This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
-#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING.  If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-])
-
-# serial 57 LT_INIT
-
-
-# LT_PREREQ(VERSION)
-# ------------------
-# Complain and exit if this libtool version is less that VERSION.
-m4_defun([LT_PREREQ],
-[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
-       [m4_default([$3],
-		   [m4_fatal([Libtool version $1 or higher is required],
-		             63)])],
-       [$2])])
-
-
-# _LT_CHECK_BUILDDIR
-# ------------------
-# Complain if the absolute build directory name contains unusual characters
-m4_defun([_LT_CHECK_BUILDDIR],
-[case `pwd` in
-  *\ * | *\	*)
-    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
-esac
-])
-
-
-# LT_INIT([OPTIONS])
-# ------------------
-AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
-AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
-AC_BEFORE([$0], [LT_LANG])dnl
-AC_BEFORE([$0], [LT_OUTPUT])dnl
-AC_BEFORE([$0], [LTDL_INIT])dnl
-m4_require([_LT_CHECK_BUILDDIR])dnl
-
-dnl Autoconf doesn't catch unexpanded LT_ macros by default:
-m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
-m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
-dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
-dnl unless we require an AC_DEFUNed macro:
-AC_REQUIRE([LTOPTIONS_VERSION])dnl
-AC_REQUIRE([LTSUGAR_VERSION])dnl
-AC_REQUIRE([LTVERSION_VERSION])dnl
-AC_REQUIRE([LTOBSOLETE_VERSION])dnl
-m4_require([_LT_PROG_LTMAIN])dnl
-
-_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
-
-dnl Parse OPTIONS
-_LT_SET_OPTIONS([$0], [$1])
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-_LT_SETUP
-
-# Only expand once:
-m4_define([LT_INIT])
-])# LT_INIT
-
-# Old names:
-AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
-AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
-dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
-
-
-# _LT_CC_BASENAME(CC)
-# -------------------
-# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
-  case $cc_temp in
-    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-    \-*) ;;
-    *) break;;
-  esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
-])
-
-
-# _LT_FILEUTILS_DEFAULTS
-# ----------------------
-# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
-m4_defun([_LT_FILEUTILS_DEFAULTS],
-[: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-])# _LT_FILEUTILS_DEFAULTS
-
-
-# _LT_SETUP
-# ---------
-m4_defun([_LT_SETUP],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
-
-_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
-dnl
-_LT_DECL([], [host_alias], [0], [The host system])dnl
-_LT_DECL([], [host], [0])dnl
-_LT_DECL([], [host_os], [0])dnl
-dnl
-_LT_DECL([], [build_alias], [0], [The build system])dnl
-_LT_DECL([], [build], [0])dnl
-_LT_DECL([], [build_os], [0])dnl
-dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-test -z "$LN_S" && LN_S="ln -s"
-_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
-dnl
-AC_REQUIRE([LT_CMD_MAX_LEN])dnl
-_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
-_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
-dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
-m4_require([_LT_CMD_RELOAD])dnl
-m4_require([_LT_CHECK_MAGIC_METHOD])dnl
-m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
-m4_require([_LT_CMD_OLD_ARCHIVE])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_WITH_SYSROOT])dnl
-
-_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-])
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-_LT_CHECK_OBJDIR
-
-m4_require([_LT_TAG_COMPILER])dnl
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Global variables:
-ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except MSVC,
-# which needs '.lib').
-libext=a
-
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$LD" && LD=ld
-test -z "$ac_objext" && ac_objext=o
-
-_LT_CC_BASENAME([$compiler])
-
-# Only perform the check for file, if the check method requires it
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    _LT_PATH_MAGIC
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-LT_SUPPORTED_TAG([CC])
-_LT_LANG_C_CONFIG
-_LT_LANG_DEFAULT_CONFIG
-_LT_CONFIG_COMMANDS
-])# _LT_SETUP
-
-
-# _LT_PREPARE_SED_QUOTE_VARS
-# --------------------------
-# Define a few sed substitution that help us do robust quoting.
-m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
-[# Backslashify metacharacters that are still active within
-# double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-])
-
-# _LT_PROG_LTMAIN
-# ---------------
-# Note that this code is called both from `configure', and `config.status'
-# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
-# so we pass a copy along to make sure it has a sensible value anyway.
-m4_defun([_LT_PROG_LTMAIN],
-[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
-_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
-])# _LT_PROG_LTMAIN
-
-
-## ------------------------------------- ##
-## Accumulate code for creating libtool. ##
-## ------------------------------------- ##
-
-# So that we can recreate a full libtool script including additional
-# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
-# label.
-
-
-# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
-# ----------------------------------------
-# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL_INIT],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_INIT])
-
-
-# _LT_CONFIG_LIBTOOL([COMMANDS])
-# ------------------------------
-# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
-m4_define([_LT_CONFIG_LIBTOOL],
-[m4_ifval([$1],
-          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
-                     [$1
-])])])
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
-
-
-# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
-# -----------------------------------------------------
-m4_defun([_LT_CONFIG_SAVE_COMMANDS],
-[_LT_CONFIG_LIBTOOL([$1])
-_LT_CONFIG_LIBTOOL_INIT([$2])
-])
-
-
-# _LT_FORMAT_COMMENT([COMMENT])
-# -----------------------------
-# Add leading comment marks to the start of each line, and a trailing
-# full-stop to the whole comment if one is not present already.
-m4_define([_LT_FORMAT_COMMENT],
-[m4_ifval([$1], [
-m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
-              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
-)])
-
-
-
-## ------------------------ ##
-## FIXME: Eliminate VARNAME ##
-## ------------------------ ##
-
-
-# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
-# -------------------------------------------------------------------
-# CONFIGNAME is the name given to the value in the libtool script.
-# VARNAME is the (base) name used in the configure script.
-# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
-# VARNAME.  Any other value will be used directly.
-m4_define([_LT_DECL],
-[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
-    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
-	[m4_ifval([$1], [$1], [$2])])
-    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
-    m4_ifval([$4],
-	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
-    lt_dict_add_subkey([lt_decl_dict], [$2],
-	[tagged?], [m4_ifval([$5], [yes], [no])])])
-])
-
-
-# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
-# --------------------------------------------------------
-m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
-
-
-# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_tag_varnames],
-[_lt_decl_filter([tagged?], [yes], $@)])
-
-
-# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
-# ---------------------------------------------------------
-m4_define([_lt_decl_filter],
-[m4_case([$#],
-  [0], [m4_fatal([$0: too few arguments: $#])],
-  [1], [m4_fatal([$0: too few arguments: $#: $1])],
-  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
-  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
-  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
-])
-
-
-# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
-# --------------------------------------------------
-m4_define([lt_decl_quote_varnames],
-[_lt_decl_filter([value], [1], $@)])
-
-
-# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_dquote_varnames],
-[_lt_decl_filter([value], [2], $@)])
-
-
-# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
-# ---------------------------------------------------
-m4_define([lt_decl_varnames_tagged],
-[m4_assert([$# <= 2])dnl
-_$0(m4_quote(m4_default([$1], [[, ]])),
-    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
-    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
-m4_define([_lt_decl_varnames_tagged],
-[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
-
-
-# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
-# ------------------------------------------------
-m4_define([lt_decl_all_varnames],
-[_$0(m4_quote(m4_default([$1], [[, ]])),
-     m4_if([$2], [],
-	   m4_quote(lt_decl_varnames),
-	m4_quote(m4_shift($@))))[]dnl
-])
-m4_define([_lt_decl_all_varnames],
-[lt_join($@, lt_decl_varnames_tagged([$1],
-			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
-])
-
-
-# _LT_CONFIG_STATUS_DECLARE([VARNAME])
-# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'.  VARNAME
-# must have a single quote delimited value for this to work.
-m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
-
-
-# _LT_CONFIG_STATUS_DECLARATIONS
-# ------------------------------
-# We delimit libtool config variables with single quotes, so when
-# we write them to config.status, we have to be sure to quote all
-# embedded single quotes properly.  In configure, this macro expands
-# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
-#
-#    ='`$ECHO "$" | $SED "$delay_single_quote_subst"`'
-m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
-    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAGS
-# ----------------
-# Output comment and list of tags supported by the script
-m4_defun([_LT_LIBTOOL_TAGS],
-[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
-])
-
-
-# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
-# -----------------------------------
-# Extract the dictionary values for VARNAME (optionally with TAG) and
-# expand to a commented shell variable setting:
-#
-#    # Some comment about what VAR is for.
-#    visible_name=$lt_internal_name
-m4_define([_LT_LIBTOOL_DECLARE],
-[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
-					   [description])))[]dnl
-m4_pushdef([_libtool_name],
-    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
-m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
-    [0], [_libtool_name=[$]$1],
-    [1], [_libtool_name=$lt_[]$1],
-    [2], [_libtool_name=$lt_[]$1],
-    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
-m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
-])
-
-
-# _LT_LIBTOOL_CONFIG_VARS
-# -----------------------
-# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
-# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
-# section) are produced by _LT_LIBTOOL_TAG_VARS.
-m4_defun([_LT_LIBTOOL_CONFIG_VARS],
-[m4_foreach([_lt_var],
-    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
-
-
-# _LT_LIBTOOL_TAG_VARS(TAG)
-# -------------------------
-m4_define([_LT_LIBTOOL_TAG_VARS],
-[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
-    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
-
-
-# _LT_TAGVAR(VARNAME, [TAGNAME])
-# ------------------------------
-m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
-
-
-# _LT_CONFIG_COMMANDS
-# -------------------
-# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
-# variables for single and double quote escaping we saved from calls
-# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'.  Finally, any additional code accumulated
-# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
-m4_defun([_LT_CONFIG_COMMANDS],
-[AC_PROVIDE_IFELSE([LT_OUTPUT],
-	dnl If the libtool generation code has been placed in $CONFIG_LT,
-	dnl instead of duplicating it all over again into config.status,
-	dnl then we will have config.status run $CONFIG_LT later, so it
-	dnl needs to know what name is stored there:
-        [AC_CONFIG_COMMANDS([libtool],
-            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
-    dnl If the libtool generation code is destined for config.status,
-    dnl expand the accumulated commands and init code now:
-    [AC_CONFIG_COMMANDS([libtool],
-        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
-])#_LT_CONFIG_COMMANDS
-
-
-# Initialize.
-m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
-[
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-sed_quote_subst='$sed_quote_subst'
-double_quote_subst='$double_quote_subst'
-delay_variable_subst='$delay_variable_subst'
-_LT_CONFIG_STATUS_DECLARATIONS
-LTCC='$LTCC'
-LTCFLAGS='$LTCFLAGS'
-compiler='$compiler_DEFAULT'
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$[]1
-_LTECHO_EOF'
-}
-
-# Quote evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-# Double-quote double-evaled strings.
-for var in lt_decl_all_varnames([[ \
-]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
-    *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
-      ;;
-    *)
-      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
-      ;;
-    esac
-done
-
-_LT_OUTPUT_LIBTOOL_INIT
-])
-
-# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
-# ------------------------------------
-# Generate a child script FILE with all initialization necessary to
-# reuse the environment learned by the parent script, and make the
-# file executable.  If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins.  After this
-# macro, additional text can be appended to FILE to form the body of
-# the child script.  The macro ends with non-zero status if the
-# file could not be fully written (such as if the disk is full).
-m4_ifdef([AS_INIT_GENERATED],
-[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
-[m4_defun([_LT_GENERATED_FILE_INIT],
-[m4_require([AS_PREPARE])]dnl
-[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
-[lt_write_fail=0
-cat >$1 <<_ASEOF || lt_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-$2
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$1 <<\_ASEOF || lt_write_fail=1
-AS_SHELL_SANITIZE
-_AS_PREPARE
-exec AS_MESSAGE_FD>&1
-_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
-m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
-
-# LT_OUTPUT
-# ---------
-# This macro allows early generation of the libtool script (before
-# AC_OUTPUT is called), incase it is used in configure for compilation
-# tests.
-AC_DEFUN([LT_OUTPUT],
-[: ${CONFIG_LT=./config.lt}
-AC_MSG_NOTICE([creating $CONFIG_LT])
-_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
-[# Run this file to recreate a libtool stub with the current configuration.])
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-lt_cl_silent=false
-exec AS_MESSAGE_LOG_FD>>config.log
-{
-  echo
-  AS_BOX([Running $as_me.])
-} >&AS_MESSAGE_LOG_FD
-
-lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
-for use in further configure time tests before the real libtool is
-generated.
-
-Usage: $[0] [[OPTIONS]]
-
-  -h, --help      print this help, then exit
-  -V, --version   print version number, then exit
-  -q, --quiet     do not print progress messages
-  -d, --debug     don't remove temporary files
-
-Report bugs to ."
-
-lt_cl_version="\
-m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
-m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
-configured by $[0], generated by m4_PACKAGE_STRING.
-
-Copyright (C) 2011 Free Software Foundation, Inc.
-This config.lt script is free software; the Free Software Foundation
-gives unlimited permision to copy, distribute and modify it."
-
-while test $[#] != 0
-do
-  case $[1] in
-    --version | --v* | -V )
-      echo "$lt_cl_version"; exit 0 ;;
-    --help | --h* | -h )
-      echo "$lt_cl_help"; exit 0 ;;
-    --debug | --d* | -d )
-      debug=: ;;
-    --quiet | --q* | --silent | --s* | -q )
-      lt_cl_silent=: ;;
-
-    -*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
-
-    *) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
-  esac
-  shift
-done
-
-if $lt_cl_silent; then
-  exec AS_MESSAGE_FD>/dev/null
-fi
-_LTEOF
-
-cat >>"$CONFIG_LT" <<_LTEOF
-_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
-_LTEOF
-
-cat >>"$CONFIG_LT" <<\_LTEOF
-AC_MSG_NOTICE([creating $ofile])
-_LT_OUTPUT_LIBTOOL_COMMANDS
-AS_EXIT(0)
-_LTEOF
-chmod +x "$CONFIG_LT"
-
-# configure is writing to config.log, but config.lt does its own redirection,
-# appending to config.log, which fails on DOS, as config.log is still kept
-# open by configure.  Here we exec the FD to /dev/null, effectively closing
-# config.log, so it can be properly (re)opened and appended to by config.lt.
-lt_cl_success=:
-test "$silent" = yes &&
-  lt_config_lt_args="$lt_config_lt_args --quiet"
-exec AS_MESSAGE_LOG_FD>/dev/null
-$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-exec AS_MESSAGE_LOG_FD>>config.log
-$lt_cl_success || AS_EXIT(1)
-])# LT_OUTPUT
-
-
-# _LT_CONFIG(TAG)
-# ---------------
-# If TAG is the built-in tag, create an initial libtool script with a
-# default configuration from the untagged config vars.  Otherwise add code
-# to config.status for appending the configuration named by TAG from the
-# matching tagged config vars.
-m4_defun([_LT_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_CONFIG_SAVE_COMMANDS([
-  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
-  m4_if(_LT_TAG, [C], [
-    # See if we are running on zsh, and set the options which allow our
-    # commands through without removal of \ escapes.
-    if test -n "${ZSH_VERSION+set}" ; then
-      setopt NO_GLOB_SUBST
-    fi
-
-    cfgfile="${ofile}T"
-    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
-    $RM "$cfgfile"
-
-    cat <<_LT_EOF >> "$cfgfile"
-#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-_LT_COPYING
-_LT_LIBTOOL_TAGS
-
-# ### BEGIN LIBTOOL CONFIG
-_LT_LIBTOOL_CONFIG_VARS
-_LT_LIBTOOL_TAG_VARS
-# ### END LIBTOOL CONFIG
-
-_LT_EOF
-
-  case $host_os in
-  aix3*)
-    cat <<\_LT_EOF >> "$cfgfile"
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-_LT_EOF
-    ;;
-  esac
-
-  _LT_PROG_LTMAIN
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" \
-     || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_REPLACE_SHELLFNS
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-],
-[cat <<_LT_EOF >> "$ofile"
-
-dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
-dnl in a comment (ie after a #).
-# ### BEGIN LIBTOOL TAG CONFIG: $1
-_LT_LIBTOOL_TAG_VARS(_LT_TAG)
-# ### END LIBTOOL TAG CONFIG: $1
-_LT_EOF
-])dnl /m4_if
-],
-[m4_if([$1], [], [
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'], [])
-])dnl /_LT_CONFIG_SAVE_COMMANDS
-])# _LT_CONFIG
-
-
-# LT_SUPPORTED_TAG(TAG)
-# ---------------------
-# Trace this macro to discover what tags are supported by the libtool
-# --tag option, using:
-#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
-AC_DEFUN([LT_SUPPORTED_TAG], [])
-
-
-# C support is built-in for now
-m4_define([_LT_LANG_C_enabled], [])
-m4_define([_LT_TAGS], [])
-
-
-# LT_LANG(LANG)
-# -------------
-# Enable libtool support for the given language if not already enabled.
-AC_DEFUN([LT_LANG],
-[AC_BEFORE([$0], [LT_OUTPUT])dnl
-m4_case([$1],
-  [C],			[_LT_LANG(C)],
-  [C++],		[_LT_LANG(CXX)],
-  [Go],			[_LT_LANG(GO)],
-  [Java],		[_LT_LANG(GCJ)],
-  [Fortran 77],		[_LT_LANG(F77)],
-  [Fortran],		[_LT_LANG(FC)],
-  [Windows Resource],	[_LT_LANG(RC)],
-  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
-    [_LT_LANG($1)],
-    [m4_fatal([$0: unsupported language: "$1"])])])dnl
-])# LT_LANG
-
-
-# _LT_LANG(LANGNAME)
-# ------------------
-m4_defun([_LT_LANG],
-[m4_ifdef([_LT_LANG_]$1[_enabled], [],
-  [LT_SUPPORTED_TAG([$1])dnl
-  m4_append([_LT_TAGS], [$1 ])dnl
-  m4_define([_LT_LANG_]$1[_enabled], [])dnl
-  _LT_LANG_$1_CONFIG($1)])dnl
-])# _LT_LANG
-
-
-m4_ifndef([AC_PROG_GO], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-m4_defun([AC_PROG_GO],
-[AC_LANG_PUSH(Go)dnl
-AC_ARG_VAR([GOC],     [Go compiler command])dnl
-AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
-_AC_ARG_VAR_LDFLAGS()dnl
-AC_CHECK_TOOL(GOC, gccgo)
-if test -z "$GOC"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
-  fi
-fi
-if test -z "$GOC"; then
-  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
-fi
-])#m4_defun
-])#m4_ifndef
-
-
-# _LT_LANG_DEFAULT_CONFIG
-# -----------------------
-m4_defun([_LT_LANG_DEFAULT_CONFIG],
-[AC_PROVIDE_IFELSE([AC_PROG_CXX],
-  [LT_LANG(CXX)],
-  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_F77],
-  [LT_LANG(F77)],
-  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
-
-AC_PROVIDE_IFELSE([AC_PROG_FC],
-  [LT_LANG(FC)],
-  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
-
-dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
-dnl pulling things in needlessly.
-AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-  [LT_LANG(GCJ)],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-    [LT_LANG(GCJ)],
-    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
-      [LT_LANG(GCJ)],
-      [m4_ifdef([AC_PROG_GCJ],
-	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([A][M_PROG_GCJ],
-	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
-       m4_ifdef([LT_PROG_GCJ],
-	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
-
-AC_PROVIDE_IFELSE([AC_PROG_GO],
-  [LT_LANG(GO)],
-  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
-
-AC_PROVIDE_IFELSE([LT_PROG_RC],
-  [LT_LANG(RC)],
-  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
-])# _LT_LANG_DEFAULT_CONFIG
-
-# Obsolete macros:
-AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
-AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
-AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
-AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
-AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
-dnl AC_DEFUN([AC_LIBTOOL_F77], [])
-dnl AC_DEFUN([AC_LIBTOOL_FC], [])
-dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
-dnl AC_DEFUN([AC_LIBTOOL_RC], [])
-
-
-# _LT_TAG_COMPILER
-# ----------------
-m4_defun([_LT_TAG_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
-_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
-_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
-_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# If no C compiler flags were specified, use CFLAGS.
-LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_TAG_COMPILER
-
-
-# _LT_COMPILER_BOILERPLATE
-# ------------------------
-# Check for compiler boilerplate output or warnings with
-# the simple compiler test code.
-m4_defun([_LT_COMPILER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_compile_test_code" >conftest.$ac_ext
-eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_compiler_boilerplate=`cat conftest.err`
-$RM conftest*
-])# _LT_COMPILER_BOILERPLATE
-
-
-# _LT_LINKER_BOILERPLATE
-# ----------------------
-# Check for linker boilerplate output or warnings with
-# the simple link test code.
-m4_defun([_LT_LINKER_BOILERPLATE],
-[m4_require([_LT_DECL_SED])dnl
-ac_outfile=conftest.$ac_objext
-echo "$lt_simple_link_test_code" >conftest.$ac_ext
-eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-_lt_linker_boilerplate=`cat conftest.err`
-$RM -r conftest*
-])# _LT_LINKER_BOILERPLATE
-
-# _LT_REQUIRED_DARWIN_CHECKS
-# -------------------------
-m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
-  case $host_os in
-    rhapsody* | darwin*)
-    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-    AC_CHECK_TOOL([LIPO], [lipo], [:])
-    AC_CHECK_TOOL([OTOOL], [otool], [:])
-    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
-    _LT_DECL([], [DSYMUTIL], [1],
-      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
-    _LT_DECL([], [NMEDIT], [1],
-      [Tool to change global to local symbols on Mac OS X])
-    _LT_DECL([], [LIPO], [1],
-      [Tool to manipulate fat objects and archives on Mac OS X])
-    _LT_DECL([], [OTOOL], [1],
-      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
-    _LT_DECL([], [OTOOL64], [1],
-      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
-
-    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-      [lt_cv_apple_cc_single_mod=no
-      if test -z "${LT_MULTI_MODULE}"; then
-	# By default we will add the -single_module flag. You can override
-	# by either setting the environment variable LT_MULTI_MODULE
-	# non-empty at configure time, or by adding -multi_module to the
-	# link flags.
-	rm -rf libconftest.dylib*
-	echo "int foo(void){return 1;}" > conftest.c
-	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
--dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
-	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-        _lt_result=$?
-	# If there is a non-empty error log, and "single_module"
-	# appears in it, assume the flag caused a linker warning
-        if test -s conftest.err && $GREP single_module conftest.err; then
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	# Otherwise, if the output was created with a 0 exit code from
-	# the compiler, it worked.
-	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
-	  lt_cv_apple_cc_single_mod=yes
-	else
-	  cat conftest.err >&AS_MESSAGE_LOG_FD
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi])
-
-    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-      [lt_cv_ld_exported_symbols_list],
-      [lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-	[lt_cv_ld_exported_symbols_list=yes],
-	[lt_cv_ld_exported_symbols_list=no])
-	LDFLAGS="$save_LDFLAGS"
-    ])
-
-    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
-      [lt_cv_ld_force_load=no
-      cat > conftest.c << _LT_EOF
-int forced_loaded() { return 2;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
-      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
-      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
-      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
-      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
-      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-      _lt_result=$?
-      if test -s conftest.err && $GREP force_load conftest.err; then
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
-	lt_cv_ld_force_load=yes
-      else
-	cat conftest.err >&AS_MESSAGE_LOG_FD
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-    ])
-    case $host_os in
-    rhapsody* | darwin1.[[012]])
-      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-    darwin1.*)
-      _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-    darwin*) # darwin 5.x on
-      # if running on 10.5 or later, the deployment target defaults
-      # to the OS version, if on x86, and 10.4, the deployment
-      # target defaults to 10.4. Don't you love it?
-      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-	10.[[012]]*)
-	  _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-	10.*)
-	  _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-      esac
-    ;;
-  esac
-    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-      _lt_dar_single_mod='$single_module'
-    fi
-    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-    else
-      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
-      _lt_dsymutil='~$DSYMUTIL $lib || :'
-    else
-      _lt_dsymutil=
-    fi
-    ;;
-  esac
-])
-
-
-# _LT_DARWIN_LINKER_FEATURES([TAG])
-# ---------------------------------
-# Checks for linker and compiler features on darwin
-m4_defun([_LT_DARWIN_LINKER_FEATURES],
-[
-  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_automatic, $1)=yes
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
-                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
-  else
-    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
-  fi
-  _LT_TAGVAR(link_all_deplibs, $1)=yes
-  _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-  case $cc_basename in
-     ifort*) _lt_dar_can_shared=yes ;;
-     *) _lt_dar_can_shared=$GCC ;;
-  esac
-  if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=func_echo_all
-    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-    m4_if([$1], [CXX],
-[   if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-    fi
-],[])
-  else
-  _LT_TAGVAR(ld_shlibs, $1)=no
-  fi
-])
-
-# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
-# ----------------------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-# Store the results from the different compilers for each TAGNAME.
-# Allow to override them for all tags through lt_cv_aix_libpath.
-m4_defun([_LT_SYS_MODULE_PATH_AIX],
-[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
-  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
-  lt_aix_libpath_sed='[
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }]'
-  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  # Check for a 64-bit object if we didn't find anything.
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi],[])
-  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
-    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
-  fi
-  ])
-  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
-fi
-])# _LT_SYS_MODULE_PATH_AIX
-
-
-# _LT_SHELL_INIT(ARG)
-# -------------------
-m4_define([_LT_SHELL_INIT],
-[m4_divert_text([M4SH-INIT], [$1
-])])# _LT_SHELL_INIT
-
-
-
-# _LT_PROG_ECHO_BACKSLASH
-# -----------------------
-# Find how we can fake an echo command that does not interpret backslash.
-# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
-m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-AC_MSG_CHECKING([how to print strings])
-# Test print first, because it will be a builtin if present.
-if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
-   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='print -r --'
-elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
-  ECHO='printf %s\n'
-else
-  # Use this function as a fallback that always works.
-  func_fallback_echo ()
-  {
-    eval 'cat <<_LTECHO_EOF
-$[]1
-_LTECHO_EOF'
-  }
-  ECHO='func_fallback_echo'
-fi
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*" 
-}
-
-case "$ECHO" in
-  printf*) AC_MSG_RESULT([printf]) ;;
-  print*) AC_MSG_RESULT([print -r]) ;;
-  *) AC_MSG_RESULT([cat]) ;;
-esac
-
-m4_ifdef([_AS_DETECT_SUGGESTED],
-[_AS_DETECT_SUGGESTED([
-  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
-    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-    PATH=/empty FPATH=/empty; export PATH FPATH
-    test "X`printf %s $ECHO`" = "X$ECHO" \
-      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
-
-_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
-])# _LT_PROG_ECHO_BACKSLASH
-
-
-# _LT_WITH_SYSROOT
-# ----------------
-AC_DEFUN([_LT_WITH_SYSROOT],
-[AC_MSG_CHECKING([for sysroot])
-AC_ARG_WITH([sysroot],
-[  --with-sysroot[=DIR] Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).],
-[], [with_sysroot=no])
-
-dnl lt_sysroot will always be passed unquoted.  We quote it here
-dnl in case the user passed a directory name.
-lt_sysroot=
-case ${with_sysroot} in #(
- yes)
-   if test "$GCC" = yes; then
-     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
-   fi
-   ;; #(
- /*)
-   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
-   ;; #(
- no|'')
-   ;; #(
- *)
-   AC_MSG_RESULT([${with_sysroot}])
-   AC_MSG_ERROR([The sysroot must be an absolute path.])
-   ;;
-esac
-
- AC_MSG_RESULT([${lt_sysroot:-no}])
-_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
-
-# _LT_ENABLE_LOCK
-# ---------------
-m4_defun([_LT_ENABLE_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-  [AS_HELP_STRING([--disable-libtool-lock],
-    [avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-      *ELF-32*)
-	HPUX_IA64_MODE="32"
-	;;
-      *ELF-64*)
-	HPUX_IA64_MODE="64"
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    if test "$lt_cv_prog_gnu_ld" = yes; then
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -melf32bsmip"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -melf32bmipn32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -melf64bmip"
-	;;
-      esac
-    else
-      case `/usr/bin/file conftest.$ac_objext` in
-	*32-bit*)
-	  LD="${LD-ld} -32"
-	  ;;
-	*N32*)
-	  LD="${LD-ld} -n32"
-	  ;;
-	*64-bit*)
-	  LD="${LD-ld} -64"
-	  ;;
-      esac
-    fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
-s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-      *32-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_i386_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    case `/usr/bin/file conftest.o` in
-	      *x86-64*)
-		LD="${LD-ld} -m elf32_x86_64"
-		;;
-	      *)
-		LD="${LD-ld} -m elf_i386"
-		;;
-	    esac
-	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
-	    LD="${LD-ld} -m elf32ppclinux"
-	    ;;
-	  s390x-*linux*)
-	    LD="${LD-ld} -m elf_s390"
-	    ;;
-	  sparc64-*linux*)
-	    LD="${LD-ld} -m elf32_sparc"
-	    ;;
-	esac
-	;;
-      *64-bit*)
-	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
-	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
-	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
-	    LD="${LD-ld} -m elf64ppc"
-	    ;;
-	  s390*-*linux*|s390*-*tpf*)
-	    LD="${LD-ld} -m elf64_s390"
-	    ;;
-	  sparc*-*linux*)
-	    LD="${LD-ld} -m elf64_sparc"
-	    ;;
-	esac
-	;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-*-*solaris*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.o` in
-    *64-bit*)
-      case $lt_cv_prog_gnu_ld in
-      yes*)
-        case $host in
-        i?86-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        sparc*-*-solaris*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-        esac
-        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
-        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
-          LD="${LD-ld}_sol2"
-        fi
-        ;;
-      *)
-	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-	  LD="${LD-ld} -64"
-	fi
-	;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-esac
-
-need_locks="$enable_libtool_lock"
-])# _LT_ENABLE_LOCK
-
-
-# _LT_PROG_AR
-# -----------
-m4_defun([_LT_PROG_AR],
-[AC_CHECK_TOOLS(AR, [ar], false)
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
-
-AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
-  [lt_cv_ar_at_file=no
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
-     [echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
-      AC_TRY_EVAL([lt_ar_try])
-      if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	AC_TRY_EVAL([lt_ar_try])
-	if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-     ])
-  ])
-
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-_LT_DECL([], [archiver_list_spec], [1],
-  [How to feed a file listing to the archiver])
-])# _LT_PROG_AR
-
-
-# _LT_CMD_OLD_ARCHIVE
-# -------------------
-m4_defun([_LT_CMD_OLD_ARCHIVE],
-[_LT_PROG_AR
-
-AC_CHECK_TOOL(STRIP, strip, :)
-test -z "$STRIP" && STRIP=:
-_LT_DECL([], [STRIP], [1], [A symbol stripping program])
-
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-test -z "$RANLIB" && RANLIB=:
-_LT_DECL([], [RANLIB], [1],
-    [Commands used to install an old-style archive])
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
-    ;;
-  *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
-fi
-
-case $host_os in
-  darwin*)
-    lock_old_archive_extraction=yes ;;
-  *)
-    lock_old_archive_extraction=no ;;
-esac
-_LT_DECL([], [old_postinstall_cmds], [2])
-_LT_DECL([], [old_postuninstall_cmds], [2])
-_LT_TAGDECL([], [old_archive_cmds], [2],
-    [Commands used to build an old-style archive])
-_LT_DECL([], [lock_old_archive_extraction], [0],
-    [Whether to use a lock for old archive extraction])
-])# _LT_CMD_OLD_ARCHIVE
-
-
-# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([_LT_COMPILER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings other than the usual output.
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
-     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-       $2=yes
-     fi
-   fi
-   $RM conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$5], , :, [$5])
-else
-    m4_if([$6], , :, [$6])
-fi
-])# _LT_COMPILER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
-
-
-# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                  [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------
-# Check whether the given linker option works
-AC_DEFUN([_LT_LINKER_OPTION],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_SED])dnl
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   echo "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The linker can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         $2=yes
-       fi
-     else
-       $2=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    m4_if([$4], , :, [$4])
-else
-    m4_if([$5], , :, [$5])
-fi
-])# _LT_LINKER_OPTION
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
-
-
-# LT_CMD_MAX_LEN
-#---------------
-AC_DEFUN([LT_CMD_MAX_LEN],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw* | cegcc*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  mint*)
-    # On MiNT this can take a long time and run out of memory.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-    # This has been around since 386BSD, at least.  Likely further.
-    if test -x /sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-    elif test -x /usr/sbin/sysctl; then
-      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-    else
-      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-    fi
-    # And add a safety zone
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    ;;
-
-  interix*)
-    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-    lt_cv_sys_max_cmd_len=196608
-    ;;
-
-  os2*)
-    # The test takes a long time on OS/2.
-    lt_cv_sys_max_cmd_len=8192
-    ;;
-
-  osf*)
-    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-    # nice to cause kernel panics so lets avoid the loop below.
-    # First set a reasonable default.
-    lt_cv_sys_max_cmd_len=16384
-    #
-    if test -x /sbin/sysconfig; then
-      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-      esac
-    fi
-    ;;
-  sco3.2v5*)
-    lt_cv_sys_max_cmd_len=102400
-    ;;
-  sysv5* | sco5v6* | sysv4.2uw2*)
-    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-    if test -n "$kargmax"; then
-      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
-    else
-      lt_cv_sys_max_cmd_len=32768
-    fi
-    ;;
-  *)
-    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
-    if test -n "$lt_cv_sys_max_cmd_len" && \
-	test undefined != "$lt_cv_sys_max_cmd_len"; then
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-    else
-      # Make teststring a little bigger before we do anything with it.
-      # a 1K string should be a reasonable start.
-      for i in 1 2 3 4 5 6 7 8 ; do
-        teststring=$teststring$teststring
-      done
-      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-      # If test is not a shell built-in, we'll probably end up computing a
-      # maximum length that is only half of the actual maximum length, but
-      # we can't tell.
-      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
-	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-	      test $i != 17 # 1/2 MB should be enough
-      do
-        i=`expr $i + 1`
-        teststring=$teststring$teststring
-      done
-      # Only check the string length outside the loop.
-      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
-      teststring=
-      # Add a significant safety factor because C++ compilers can tack on
-      # massive amounts of additional arguments before passing them to the
-      # linker.  It appears as though 1/2 is a usable value.
-      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    fi
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-_LT_DECL([], [max_cmd_len], [0],
-    [What is the maximum length of a command?])
-])# LT_CMD_MAX_LEN
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
-
-
-# _LT_HEADER_DLFCN
-# ----------------
-m4_defun([_LT_HEADER_DLFCN],
-[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
-])# _LT_HEADER_DLFCN
-
-
-# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ----------------------------------------------------------------
-m4_defun([_LT_TRY_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<_LT_EOF
-[#line $LINENO "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include 
-#endif
-
-#include 
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-/* When -fvisbility=hidden is used, assume the code has been annotated
-   correspondingly for the symbols needed.  */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
-int fnord () __attribute__((visibility("default")));
-#endif
-
-int fnord () { return 42; }
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else
-        {
-	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
-          else puts (dlerror ());
-	}
-      /* dlclose (self); */
-    }
-  else
-    puts (dlerror ());
-
-  return status;
-}]
-_LT_EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_dlunknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_TRY_DLOPEN_SELF
-
-
-# LT_SYS_DLOPEN_SELF
-# ------------------
-AC_DEFUN([LT_SYS_DLOPEN_SELF],
-[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32* | cegcc*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-    ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-    ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-    ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-	  lt_cv_dlopen_self_static, [dnl
-	  _LT_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-_LT_DECL([dlopen_support], [enable_dlopen], [0],
-	 [Whether dlopen is supported])
-_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
-	 [Whether dlopen of programs is supported])
-_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
-	 [Whether dlopen of statically linked programs is supported])
-])# LT_SYS_DLOPEN_SELF
-
-# Old name:
-AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
-
-
-# _LT_COMPILER_C_O([TAGNAME])
-# ---------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler.
-# This macro does not hard code the compiler like AC_PROG_CC_C_O.
-m4_defun([_LT_COMPILER_C_O],
-[m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $RM -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
-     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-   $RM conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
-   $RM out/* && rmdir out
-   cd ..
-   $RM -r conftest
-   $RM conftest*
-])
-_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
-	[Does compiler simultaneously support -c and -o options?])
-])# _LT_COMPILER_C_O
-
-
-# _LT_COMPILER_FILE_LOCKS([TAGNAME])
-# ----------------------------------
-# Check to see if we can do hard links to lock some files if needed
-m4_defun([_LT_COMPILER_FILE_LOCKS],
-[m4_require([_LT_ENABLE_LOCK])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-_LT_COMPILER_C_O([$1])
-
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $RM conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
-])# _LT_COMPILER_FILE_LOCKS
-
-
-# _LT_CHECK_OBJDIR
-# ----------------
-m4_defun([_LT_CHECK_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-_LT_DECL([], [objdir], [0],
-         [The name of the directory that contains temporary libtool files])dnl
-m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
-  [Define to the sub-directory in which libtool stores uninstalled libraries.])
-])# _LT_CHECK_OBJDIR
-
-
-# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
-# --------------------------------------
-# Check hardcoding attributes.
-m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
-   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
-   test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
-   test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-_LT_TAGDECL([], [hardcode_action], [0],
-    [How to hardcode a shared library path into an executable])
-])# _LT_LINKER_HARDCODE_LIBPATH
-
-
-# _LT_CMD_STRIPLIB
-# ----------------
-m4_defun([_LT_CMD_STRIPLIB],
-[m4_require([_LT_DECL_EGREP])
-striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-  darwin*)
-    if test -n "$STRIP" ; then
-      striplib="$STRIP -x"
-      old_striplib="$STRIP -S"
-      AC_MSG_RESULT([yes])
-    else
-      AC_MSG_RESULT([no])
-    fi
-    ;;
-  *)
-    AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
-_LT_DECL([], [striplib], [1])
-])# _LT_CMD_STRIPLIB
-
-
-# _LT_SYS_DYNAMIC_LINKER([TAG])
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-m4_defun([_LT_SYS_DYNAMIC_LINKER],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_OBJDUMP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CHECK_SHELL_FEATURES])dnl
-AC_MSG_CHECKING([dynamic linker characteristics])
-m4_if([$1],
-	[], [
-if test "$GCC" = yes; then
-  case $host_os in
-    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
-    *) lt_awk_arg="/^libraries:/" ;;
-  esac
-  case $host_os in
-    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
-    *) lt_sed_strip_eq="s,=/,/,g" ;;
-  esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
-  case $lt_search_path_spec in
-  *\;*)
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
-    ;;
-  *)
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
-    ;;
-  esac
-  # Ok, now we have the path, separated by spaces, we can step through it
-  # and add multilib dir if necessary.
-  lt_tmp_lt_search_path_spec=
-  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
-  for lt_sys_path in $lt_search_path_spec; do
-    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
-      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
-    else
-      test -d "$lt_sys_path" && \
-	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
-    fi
-  done
-  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
-  lt_foo="";
-  lt_count=0;
-  for (lt_i = NF; lt_i > 0; lt_i--) {
-    if ($lt_i != "" && $lt_i != ".") {
-      if ($lt_i == "..") {
-        lt_count++;
-      } else {
-        if (lt_count == 0) {
-          lt_foo="/" $lt_i lt_foo;
-        } else {
-          lt_count--;
-        }
-      }
-    }
-  }
-  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
-  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
-}'`
-  # AWK program above erroneously prepends '/' to C:/dos/paths
-  # for these hosts.
-  case $host_os in
-    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
-      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
-  esac
-  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix[[4-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib.so
-      # instead of lib.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  case $host_cpu in
-  powerpc)
-    # Since July 2007 AmigaOS4 officially supports .so libraries.
-    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    ;;
-  m68k)
-    library_names_spec='$libname.ixlibrary $libname.a'
-    # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-    ;;
-  esac
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi[[45]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32* | cegcc*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$cc_basename in
-  yes,*)
-    # gcc
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname~
-      chmod a+x \$dldir/$dlname~
-      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
-        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
-      fi'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-m4_if([$1], [],[
-      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
-      ;;
-    mingw* | cegcc*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    dynamic_linker='Win32 ld.exe'
-    ;;
-
-  *,cl*)
-    # Native MSVC
-    libname_spec='$name'
-    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-    library_names_spec='${libname}.dll.lib'
-
-    case $build_os in
-    mingw*)
-      sys_lib_search_path_spec=
-      lt_save_ifs=$IFS
-      IFS=';'
-      for lt_path in $LIB
-      do
-        IFS=$lt_save_ifs
-        # Let DOS variable expansion print the short 8.3 style file name.
-        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
-        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
-      done
-      IFS=$lt_save_ifs
-      # Convert to MSYS style.
-      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
-      ;;
-    cygwin*)
-      # Convert to unix form, then to dos form, then back to unix form
-      # but this time dos style (no spaces!) so that the unix form looks
-      # like /cygdrive/c/PROGRA~1:/cygdr...
-      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
-      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
-      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      ;;
-    *)
-      sys_lib_search_path_spec="$LIB"
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      # FIXME: find the short name or the path components, as spaces are
-      # common. (e.g. "Program Files" -> "PROGRA~1")
-      ;;
-    esac
-
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $RM \$dlpath'
-    shlibpath_overrides_runpath=yes
-    dynamic_linker='Win32 link.exe'
-    ;;
-
-  *)
-    # Assume MSVC wrapper
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    dynamic_linker='Win32 ld.exe'
-    ;;
-  esac
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-m4_if([$1], [],[
-  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd* | dragonfly*)
-  # DragonFly does not have aout.  When/if they implement a new
-  # versioning mechanism, adjust this.
-  if test -x /usr/bin/objformat; then
-    objformat=`/usr/bin/objformat`
-  else
-    case $host_os in
-    freebsd[[23]].*) objformat=aout ;;
-    *) objformat=elf ;;
-    esac
-  fi
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2.*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  *) # from 4.6 on, and DragonFly
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-haiku*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  dynamic_linker="$host_os runtime_loader"
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case $host_cpu in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  hppa*64*)
-    shrext_cmds='.sl'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-  *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
-  postinstall_cmds='chmod 555 $lib'
-  # or fails outright, so override atomically:
-  install_override_mode=555
-  ;;
-
-interix[[3-9]]*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux # correct to gnu/linux during the next big refactor
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-
-  # Some binutils ld are patched to set DT_RUNPATH
-  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
-    [lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-	 [lt_cv_shlibpath_overrides_runpath=yes])])
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-    ])
-  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
-
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-*nto* | *qnx*)
-  version_type=qnx
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='ldqnx.so'
-  ;;
-
-openbsd*)
-  version_type=sunos
-  sys_lib_dlsearch_path_spec="/usr/lib"
-  need_lib_prefix=no
-  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-  case $host_os in
-    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
-    *)				need_version=no  ;;
-  esac
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-rdos*)
-  dynamic_linker=no
-  ;;
-
-solaris*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.3*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux # correct to gnu/linux during the next big refactor
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  version_type=freebsd-elf
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  if test "$with_gnu_ld" = yes; then
-    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-  else
-    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-    case $host_os in
-      sco3.2v5*)
-        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-	;;
-    esac
-  fi
-  sys_lib_dlsearch_path_spec='/usr/lib'
-  ;;
-
-tpf*)
-  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux # correct to gnu/linux during the next big refactor
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  ;;
-
-uts4*)
-  version_type=linux # correct to gnu/linux during the next big refactor
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-  sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-  sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-fi
-
-_LT_DECL([], [variables_saved_for_relink], [1],
-    [Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time])
-_LT_DECL([], [need_lib_prefix], [0],
-    [Do we need the "lib" prefix for modules?])
-_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
-_LT_DECL([], [version_type], [0], [Library versioning type])
-_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
-_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
-_LT_DECL([], [shlibpath_overrides_runpath], [0],
-    [Is shlibpath searched before the hard-coded library search path?])
-_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
-_LT_DECL([], [library_names_spec], [1],
-    [[List of archive names.  First name is the real one, the rest are links.
-    The last name is the one that the linker finds with -lNAME]])
-_LT_DECL([], [soname_spec], [1],
-    [[The coded name of the library, if different from the real name]])
-_LT_DECL([], [install_override_mode], [1],
-    [Permission mode override for installation of shared libraries])
-_LT_DECL([], [postinstall_cmds], [2],
-    [Command to use after installation of a shared archive])
-_LT_DECL([], [postuninstall_cmds], [2],
-    [Command to use after uninstallation of a shared archive])
-_LT_DECL([], [finish_cmds], [2],
-    [Commands used to finish a libtool library installation in a directory])
-_LT_DECL([], [finish_eval], [1],
-    [[As "finish_cmds", except a single script fragment to be evaled but
-    not shown]])
-_LT_DECL([], [hardcode_into_libs], [0],
-    [Whether we should hardcode library paths into libraries])
-_LT_DECL([], [sys_lib_search_path_spec], [2],
-    [Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
-    [Run-time system search path for libraries])
-])# _LT_SYS_DYNAMIC_LINKER
-
-
-# _LT_PATH_TOOL_PREFIX(TOOL)
-# --------------------------
-# find a file program which can recognize shared library
-AC_DEFUN([_LT_PATH_TOOL_PREFIX],
-[m4_require([_LT_DECL_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="m4_if([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<_LT_EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-_LT_EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-_LT_DECL([], [MAGIC_CMD], [0],
-	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
-])# _LT_PATH_TOOL_PREFIX
-
-# Old name:
-AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
-
-
-# _LT_PATH_MAGIC
-# --------------
-# find a file program which can recognize a shared library
-m4_defun([_LT_PATH_MAGIC],
-[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# _LT_PATH_MAGIC
-
-
-# LT_PATH_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([LT_PATH_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
-
-AC_ARG_WITH([gnu-ld],
-    [AS_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])dnl
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
-      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some variants of GNU ld only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then
-    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-    lt_cv_file_magic_cmd='func_win32_libid'
-  else
-    # Keep this pattern in sync with the one in func_win32_libid.
-    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
-    lt_cv_file_magic_cmd='$OBJDUMP -f'
-  fi
-  ;;
-
-cegcc*)
-  # use the weaker test based on 'objdump'. See mingw*.
-  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | dragonfly*)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-haiku*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case $host_cpu in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-interix[[3-9]]*)
-  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu)
-  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-*nto* | *qnx*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-openbsd*)
-  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-rdos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.3*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  pc)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-tpf*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-
-file_magic_glob=
-want_nocaseglob=no
-if test "$build" = "$host"; then
-  case $host_os in
-  mingw* | pw32*)
-    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
-      want_nocaseglob=yes
-    else
-      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
-    fi
-    ;;
-  esac
-fi
-
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-_LT_DECL([], [deplibs_check_method], [1],
-    [Method to check whether dependent libraries are shared objects])
-_LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method = "file_magic"])
-_LT_DECL([], [file_magic_glob], [1],
-    [How to find potential files when deplibs_check_method = "file_magic"])
-_LT_DECL([], [want_nocaseglob], [1],
-    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
-])# _LT_CHECK_MAGIC_METHOD
-
-
-# LT_PATH_NM
-# ----------
-# find the pathname to a BSD- or MS-compatible name lister
-AC_DEFUN([LT_PATH_NM],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_nm_to_check="${ac_tool_prefix}nm"
-  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
-    lt_nm_to_check="$lt_nm_to_check nm"
-  fi
-  for lt_tmp_nm in $lt_nm_to_check; do
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-      IFS="$lt_save_ifs"
-      test -z "$ac_dir" && ac_dir=.
-      tmp_nm="$ac_dir/$lt_tmp_nm"
-      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-	# Check to see if the nm accepts a BSD-compat flag.
-	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-	#   nm: unknown option "B" ignored
-	# Tru64's nm complains that /dev/null is an invalid object file
-	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-	*/dev/null* | *'Invalid file or object type'*)
-	  lt_cv_path_NM="$tmp_nm -B"
-	  break
-	  ;;
-	*)
-	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	  */dev/null*)
-	    lt_cv_path_NM="$tmp_nm -p"
-	    break
-	    ;;
-	  *)
-	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	    continue # so that we can try to find one that supports BSD flags
-	    ;;
-	  esac
-	  ;;
-	esac
-      fi
-    done
-    IFS="$lt_save_ifs"
-  done
-  : ${lt_cv_path_NM=no}
-fi])
-if test "$lt_cv_path_NM" != "no"; then
-  NM="$lt_cv_path_NM"
-else
-  # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$DUMPBIN"; then :
-    # Let the user override the test.
-  else
-    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-  AC_SUBST([DUMPBIN])
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-AC_SUBST([NM])
-_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
-
-AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
-  [lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
-  cat conftest.out >&AS_MESSAGE_LOG_FD
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*])
-])# LT_PATH_NM
-
-# Old names:
-AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
-AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_PROG_NM], [])
-dnl AC_DEFUN([AC_PROG_NM], [])
-
-# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-# --------------------------------
-# how to determine the name of the shared library
-# associated with a specific link library.
-#  -- PORTME fill in with the dynamic library characteristics
-m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
-[m4_require([_LT_DECL_EGREP])
-m4_require([_LT_DECL_OBJDUMP])
-m4_require([_LT_DECL_DLLTOOL])
-AC_CACHE_CHECK([how to associate runtime and link libraries],
-lt_cv_sharedlib_from_linklib_cmd,
-[lt_cv_sharedlib_from_linklib_cmd='unknown'
-
-case $host_os in
-cygwin* | mingw* | pw32* | cegcc*)
-  # two different shell functions defined in ltmain.sh
-  # decide which to use based on capabilities of $DLLTOOL
-  case `$DLLTOOL --help 2>&1` in
-  *--identify-strict*)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
-    ;;
-  *)
-    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
-    ;;
-  esac
-  ;;
-*)
-  # fallback: assume linklib IS sharedlib
-  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
-  ;;
-esac
-])
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
-    [Command to associate shared and link libraries])
-])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
-
-
-# _LT_PATH_MANIFEST_TOOL
-# ----------------------
-# locate the manifest tool
-m4_defun([_LT_PATH_MANIFEST_TOOL],
-[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
-  [lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&AS_MESSAGE_LOG_FD
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
-fi
-_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
-])# _LT_PATH_MANIFEST_TOOL
-
-
-# LT_LIB_M
-# --------
-# check for math library
-AC_DEFUN([LT_LIB_M],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-AC_SUBST([LIBM])
-])# LT_LIB_M
-
-# Old name:
-AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_CHECK_LIBM], [])
-
-
-# _LT_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------
-m4_defun([_LT_COMPILER_NO_RTTI],
-[m4_require([_LT_TAG_COMPILER])dnl
-
-_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
-  esac
-
-  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
-	[Compiler flag to turn off builtin functions])
-])# _LT_COMPILER_NO_RTTI
-
-
-# _LT_CMD_GLOBAL_SYMBOLS
-# ----------------------
-m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-AC_REQUIRE([LT_PATH_LD])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32* | cegcc*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*)
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris*)
-  symcode='[[BDRT]]'
-  ;;
-sco3.2v5*)
-  symcode='[[DT]]'
-  ;;
-sysv4.2uw2*)
-  symcode='[[DT]]'
-  ;;
-sysv5* | sco5v6* | unixware* | OpenUNIX*)
-  symcode='[[ABDT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Transform an extracted symbol line into a proper C declaration.
-# Some systems (esp. on ia64) link data and code symbols differently,
-# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# Try without a prefix underscore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-  symxfrm="\\1 $ac_symprfx\\2 \\2"
-
-  # Write the raw and C identifiers.
-  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-    # Fake it for dumpbin and say T for any non-static function
-    # and D for any global variable.
-    # Also find C++ and __fastcall symbols from MSVC++,
-    # which start with @ or ?.
-    lt_cv_sys_global_symbol_pipe="$AWK ['"\
-"     {last_section=section; section=\$ 3};"\
-"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-"     \$ 0!~/External *\|/{next};"\
-"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
-"     {if(hide[section]) next};"\
-"     {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-"     {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-"     s[1]~/^[@?]/{print s[1], s[1]; next};"\
-"     s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
-"     ' prfx=^$ac_symprfx]"
-  else
-    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
-  fi
-  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<_LT_EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(void);
-void nm_test_func(void){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-_LT_EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
-	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<_LT_EOF > conftest.$ac_ext
-/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
-   relocations are performed -- see ld's documentation on pseudo-relocs.  */
-# define LT@&t@_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT@&t@_DLSYM_CONST
-#else
-# define LT@&t@_DLSYM_CONST const
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-_LT_EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
-
-	  cat <<_LT_EOF >> conftest.$ac_ext
-
-/* The mapping between symbol names and symbols.  */
-LT@&t@_DLSYM_CONST struct {
-  const char *name;
-  void       *address;
-}
-lt__PROGRAM__LTX_preloaded_symbols[[]] =
-{
-  { "@PROGRAM@", (void *) 0 },
-_LT_EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
-	  cat <<\_LT_EOF >> conftest.$ac_ext
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt__PROGRAM__LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-_LT_EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_globsym_save_LIBS=$LIBS
-	  lt_globsym_save_CFLAGS=$CFLAGS
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS=$lt_globsym_save_LIBS
-	  CFLAGS=$lt_globsym_save_CFLAGS
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -rf conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-
-# Response file support.
-if test "$lt_cv_nm_interface" = "MS dumpbin"; then
-  nm_file_list_spec='@'
-elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
-  nm_file_list_spec='@'
-fi
-
-_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
-    [Take the output of nm and produce a listing of raw symbols and C names])
-_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
-    [Transform the output of nm in a proper C declaration])
-_LT_DECL([global_symbol_to_c_name_address],
-    [lt_cv_sys_global_symbol_to_c_name_address], [1],
-    [Transform the output of nm in a C name address pair])
-_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
-    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
-    [Transform the output of nm in a C name address pair when lib prefix is needed])
-_LT_DECL([], [nm_file_list_spec], [1],
-    [Specify filename containing input files for $NM])
-]) # _LT_CMD_GLOBAL_SYMBOLS
-
-
-# _LT_COMPILER_PIC([TAGNAME])
-# ---------------------------
-m4_defun([_LT_COMPILER_PIC],
-[m4_require([_LT_TAG_COMPILER])dnl
-_LT_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_TAGVAR(lt_prog_compiler_static, $1)=
-
-m4_if([$1], [CXX], [
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | cygwin* | os2* | pw32* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix[[4-9]]*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      mingw* | cygwin* | os2* | pw32* | cegcc*)
-	# This hack is so that the source file can tell whether it is being
-	# built for inclusion in a dll (and should export symbols for example).
-	m4_if([$1], [GCJ], [],
-	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      interix*)
-	# This is c89, which is MS Visual C++ (no shared libs)
-	# Anyone wants to do a port?
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-	case $cc_basename in
-	  KCC*)
-	    # KAI C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  cxx*)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | netbsdelf*-gnu)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-        ;;
-      m68k)
-            # FIXME: we need at least 68020 code to build shared libraries, but
-            # adding the `-m68020' flag to GCC prevents building anything better,
-            # like `-m68040'.
-            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-        ;;
-      esac
-      ;;
-
-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      # Although the cygwin gcc ignores -fPIC, still need this for old-style
-      # (--disable-auto-import) libraries
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)=
-      ;;
-
-    hpux*)
-      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
-      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
-      # sets the default TLS model and affects inlining.
-      case $host_cpu in
-      hppa*64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    interix[[3-9]]*)
-      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-      # Instead, we relocate shared libraries at runtime.
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | cygwin* | pw32* | os2* | cegcc*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      m4_if([$1], [GCJ], [],
-	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case $host_cpu in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-        ;;
-      ccc*)
-        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
-	;;
-      *)
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  ;;
-        *Intel*\ [[CF]]*Compiler*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	  ;;
-	*Portland\ Group*)
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    rdos*)
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-      *)
-	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    unicos*)
-      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-
-AC_CACHE_CHECK([for $compiler option to produce PIC],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
-  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
-    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
-    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
-	[Additional compiler flags for building library objects])
-
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
-#
-# Check to make sure the static flag actually works.
-#
-wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
-_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-  $lt_tmp_static_flag,
-  [],
-  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
-_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
-	[Compiler flag to prevent dynamic linking])
-])# _LT_COMPILER_PIC
-
-
-# _LT_LINKER_SHLIBS([TAGNAME])
-# ----------------------------
-# See if the linker supports building shared libraries.
-m4_defun([_LT_LINKER_SHLIBS],
-[AC_REQUIRE([LT_PATH_LD])dnl
-AC_REQUIRE([LT_PATH_NM])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_DECL_SED])dnl
-m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
-m4_require([_LT_TAG_COMPILER])dnl
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-m4_if([$1], [CXX], [
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  case $host_os in
-  aix[[4-9]]*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    # Also, AIX nm treats weak defined symbols like other global defined
-    # symbols, whereas GNU nm marks them as "W".
-    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-    ;;
-  cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*)
-      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-      ;;
-    esac
-    ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
-  *)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
-  esac
-], [
-  runpath_var=
-  _LT_TAGVAR(allow_undefined_flag, $1)=
-  _LT_TAGVAR(always_export_symbols, $1)=no
-  _LT_TAGVAR(archive_cmds, $1)=
-  _LT_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_TAGVAR(compiler_needs_object, $1)=no
-  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  _LT_TAGVAR(hardcode_automatic, $1)=no
-  _LT_TAGVAR(hardcode_direct, $1)=no
-  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
-  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(inherit_rpath, $1)=no
-  _LT_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_TAGVAR(module_cmds, $1)=
-  _LT_TAGVAR(module_expsym_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
-  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  # Exclude shared library initialization/finalization symbols.
-dnl Note also adjust exclude_expsyms for C++ above.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32* | cegcc*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  interix*)
-    # we just hope/assume this is gcc and not c89 (= MSVC++)
-    with_gnu_ld=yes
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  linux* | k*bsd*-gnu | gnu*)
-    _LT_TAGVAR(link_all_deplibs, $1)=no
-    ;;
-  esac
-
-  _LT_TAGVAR(ld_shlibs, $1)=yes
-
-  # On some targets, GNU ld is compatible enough with the native linker
-  # that we're better off using the native interface for both.
-  lt_use_gnu_ld_interface=no
-  if test "$with_gnu_ld" = yes; then
-    case $host_os in
-      aix*)
-	# The AIX port of GNU ld has always aspired to compatibility
-	# with the native linker.  However, as the warning in the GNU ld
-	# block says, versions before 2.19.5* couldn't really create working
-	# shared libraries, regardless of the interface used.
-	case `$LD -v 2>&1` in
-	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
-	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
-	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
-	  *)
-	    lt_use_gnu_ld_interface=yes
-	    ;;
-	esac
-	;;
-      *)
-	lt_use_gnu_ld_interface=yes
-	;;
-    esac
-  fi
-
-  if test "$lt_use_gnu_ld_interface" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # Set some defaults for GNU ld with shared library support. These
-    # are reset later if shared libraries are not supported. Putting them
-    # here allows them to be overridden if necessary.
-    runpath_var=LD_RUN_PATH
-    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
-      _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-    supports_anon_versioning=no
-    case `$LD -v 2>&1` in
-      *GNU\ gold*) supports_anon_versioning=yes ;;
-      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-      *\ 2.11.*) ;; # other 2.11 versions
-      *) supports_anon_versioning=yes ;;
-    esac
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix[[3-9]]*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.19, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to install binutils
-*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
-*** You will then need to restart the configuration process.
-
-_LT_EOF
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach  says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=no
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
-
-      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    haiku*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    interix[[3-9]]*)
-      _LT_TAGVAR(hardcode_direct, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-      # Instead, shared libraries are loaded at an image base (0x10000000 by
-      # default) and relocated if they conflict, which is a slow very memory
-      # consuming and fragmenting process.  To avoid this, we pick a random,
-      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      ;;
-
-    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-      tmp_diet=no
-      if test "$host_os" = linux-dietlibc; then
-	case $cc_basename in
-	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
-	esac
-      fi
-      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
-	 && test "$tmp_diet" = no
-      then
-	tmp_addflag=' $pic_flag'
-	tmp_sharedflag='-shared'
-	case $cc_basename,$host_cpu in
-        pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
-	  ;;
-	pgf77* | pgf90* | pgf95* | pgfortran*)
-					# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
-	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
-	  tmp_addflag=' -i_dynamic' ;;
-	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-	ifc* | ifort*)			# Intel Fortran compiler
-	  tmp_addflag=' -nofor_main' ;;
-	lf95*)				# Lahey Fortran 8.1
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
-	  tmp_sharedflag='--shared' ;;
-	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
-	  tmp_sharedflag='-qmkshrobj'
-	  tmp_addflag= ;;
-	nvcc*)	# Cuda Compiler Driver 2.2
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	  _LT_TAGVAR(compiler_needs_object, $1)=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	    cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	    echo "local: *; };" >> $output_objdir/$libname.ver~
-	    $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-        fi
-
-	case $cc_basename in
-	xlf* | bgf* | bgxlf* | mpixlf*)
-	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
-	  fi
-	  ;;
-	esac
-      else
-        _LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris*)
-      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	cat <<_LT_EOF 1>&2
-
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-*** reliably create shared libraries on SCO systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-_LT_EOF
-	;;
-	*)
-	  # For security reasons, it is highly recommended that you always
-	  # use absolute paths for naming shared libraries, and exclude the
-	  # DT_RUNPATH tag from executables and libraries.  But doing so
-	  # requires that you compile everything twice, which is a pain.
-	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
-      runpath_var=
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
-      _LT_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix[[4-9]]*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	# Also, AIX nm treats weak defined symbols like other global
-	# defined symbols, whereas GNU nm marks them as "W".
-	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	  for ld_flag in $LDFLAGS; do
-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-	    aix_use_runtimelinking=yes
-	    break
-	  fi
-	  done
-	  ;;
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_TAGVAR(archive_cmds, $1)=''
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	  # We have reworked collect2
-	  :
-	  else
-	  # We have old collect2
-	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	  ;;
-	esac
-	shared_flag='-shared'
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag="$shared_flag "'${wl}-G'
-	fi
-	_LT_TAGVAR(link_all_deplibs, $1)=no
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-	  fi
-	fi
-      fi
-
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        _LT_SYS_MODULE_PATH_AIX([$1])
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-      else
-	if test "$host_cpu" = ia64; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an
-	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX([$1])
-	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	  fi
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            _LT_TAGVAR(archive_expsym_cmds, $1)=''
-        ;;
-      m68k)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[[45]]*)
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      case $cc_basename in
-      cl*)
-	# Native MSVC
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	_LT_TAGVAR(always_export_symbols, $1)=yes
-	_LT_TAGVAR(file_list_spec, $1)='@'
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	  else
-	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	  fi~
-	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	  linknames='
-	# The linker will not automatically build a static lib if we build a DLL.
-	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	  lt_tool_outputfile="@TOOL_OUTPUT@"~
-	  case $lt_outputfile in
-	    *.exe|*.EXE) ;;
-	    *)
-	      lt_outputfile="$lt_outputfile.exe"
-	      lt_tool_outputfile="$lt_tool_outputfile.exe"
-	      ;;
-	  esac~
-	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	    $RM "$lt_outputfile.manifest";
-	  fi'
-	;;
-      *)
-	# Assume MSVC wrapper
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Tell ltmain to make .lib files, not .a files.
-	libext=lib
-	# Tell ltmain to make .dll files, not .so files.
-	shrext_cmds=".dll"
-	# FIXME: Setting linknames here is a bad hack.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
-	# The linker will automatically build a .lib file if we build a DLL.
-	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	# FIXME: Should let the user specify the lib program.
-	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-      _LT_DARWIN_LINKER_FEATURES($1)
-      ;;
-
-    dgux*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	_LT_TAGVAR(hardcode_minus_L, $1)=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	m4_if($1, [], [
-	  # Older versions of the 11.00 compiler do not understand -b yet
-	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
-	  _LT_LINKER_OPTION([if $CC understands -b],
-	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
-	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
-	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
-	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	*)
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	# Try to use the -exported_symbol ld option, if it does not
-	# work, assume that -exports_file does not work either and
-	# implicitly export all symbols.
-	# This should be the same for all languages, so no per-tag cache variable.
-	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
-	  [lt_cv_irix_exported_symbol],
-	  [save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   AC_LINK_IFELSE(
-	     [AC_LANG_SOURCE(
-	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
-			      [C++], [[int foo (void) { return 0; }]],
-			      [Fortran 77], [[
-      subroutine foo
-      end]],
-			      [Fortran], [[
-      subroutine foo
-      end]])])],
-	      [lt_cv_irix_exported_symbol=yes],
-	      [lt_cv_irix_exported_symbol=no])
-           LDFLAGS="$save_LDFLAGS"])
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-	fi
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(inherit_rpath, $1)=yes
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	_LT_TAGVAR(hardcode_direct, $1)=yes
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	     _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	     ;;
-	   *)
-	     _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	_LT_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    os2*)
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    solaris*)
-      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-      else
-	case `$CC -V 2>&1` in
-	*"Compilers 5.0"*)
-	  wlarc=''
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
-	  ;;
-	*)
-	  wlarc='${wl}'
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
-	  ;;
-	esac
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *)
-	# The compiler driver will combine and reorder linker options,
-	# but understands `-z linker_flag'.  GCC discards it without `$wl',
-	# but is careful enough not to reorder.
-	# Supported since Solaris 2.6 (maybe 2.5.1?)
-	if test "$GCC" = yes; then
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_direct, $1)=yes
-      _LT_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6*)
-      # Note: We can NOT use -z defs as we might desire, because we do not
-      # link with -lc, and that would cause any symbols used from libc to
-      # always be unresolved, which means just about no library would
-      # ever link correctly.  If we're not using GNU ld we use -z text
-      # though, which does catch some bad symbols but isn't as heavy-handed
-      # as -z defs.
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_TAGVAR(link_all_deplibs, $1)=yes
-      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-])
-AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
-
-_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
-_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
-_LT_DECL([], [extract_expsyms_cmds], [2],
-    [The commands to extract the exported symbol list from a shared archive])
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
-	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
-	[$RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-	  _LT_TAGVAR(allow_undefined_flag, $1)=
-	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-	  then
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	  else
-	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  fi
-	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-	])
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
-    [Whether or not to add -lc for building shared libraries])
-_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
-    [enable_shared_with_static_runtimes], [0],
-    [Whether or not to disallow shared libs when runtime libs are static])
-_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
-    [Compiler flag to allow reflexive dlopens])
-_LT_TAGDECL([], [whole_archive_flag_spec], [1],
-    [Compiler flag to generate shared objects directly from archives])
-_LT_TAGDECL([], [compiler_needs_object], [1],
-    [Whether the compiler copes with passing no objects directly])
-_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
-    [Create an old-style archive from a shared archive])
-_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
-    [Create a temporary old-style archive to link instead of a shared archive])
-_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
-_LT_TAGDECL([], [archive_expsym_cmds], [2])
-_LT_TAGDECL([], [module_cmds], [2],
-    [Commands used to build a loadable module if different from building
-    a shared archive.])
-_LT_TAGDECL([], [module_expsym_cmds], [2])
-_LT_TAGDECL([], [with_gnu_ld], [1],
-    [Whether we are building with GNU ld or not])
-_LT_TAGDECL([], [allow_undefined_flag], [1],
-    [Flag that allows shared libraries with undefined symbols to be built])
-_LT_TAGDECL([], [no_undefined_flag], [1],
-    [Flag that enforces no undefined symbols])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
-    [Flag to hardcode $libdir into a binary during linking.
-    This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_separator], [1],
-    [Whether we need a single "-rpath" flag with a separated argument])
-_LT_TAGDECL([], [hardcode_direct], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary])
-_LT_TAGDECL([], [hardcode_direct_absolute], [0],
-    [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
-    DIR into the resulting binary and the resulting library dependency is
-    "absolute", i.e impossible to change by setting ${shlibpath_var} if the
-    library is relocated])
-_LT_TAGDECL([], [hardcode_minus_L], [0],
-    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
-    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-    into the resulting binary])
-_LT_TAGDECL([], [hardcode_automatic], [0],
-    [Set to "yes" if building a shared library automatically hardcodes DIR
-    into the library and all subsequent libraries and executables linked
-    against it])
-_LT_TAGDECL([], [inherit_rpath], [0],
-    [Set to yes if linker adds runtime paths of dependent libraries
-    to runtime path list])
-_LT_TAGDECL([], [link_all_deplibs], [0],
-    [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [always_export_symbols], [0],
-    [Set to "yes" if exported symbols are required])
-_LT_TAGDECL([], [export_symbols_cmds], [2],
-    [The commands to list exported symbols])
-_LT_TAGDECL([], [exclude_expsyms], [1],
-    [Symbols that should not be listed in the preloaded symbols])
-_LT_TAGDECL([], [include_expsyms], [1],
-    [Symbols that must always be exported])
-_LT_TAGDECL([], [prelink_cmds], [2],
-    [Commands necessary for linking programs (against libraries) with templates])
-_LT_TAGDECL([], [postlink_cmds], [2],
-    [Commands necessary for finishing linking programs])
-_LT_TAGDECL([], [file_list_spec], [1],
-    [Specify filename containing input files])
-dnl FIXME: Not yet implemented
-dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
-dnl    [Compiler flag to generate thread safe objects])
-])# _LT_LINKER_SHLIBS
-
-
-# _LT_LANG_C_CONFIG([TAG])
-# ------------------------
-# Ensure that the configuration variables for a C compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_C_CONFIG],
-[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}'
-
-_LT_TAG_COMPILER
-# Save the default compiler, since it gets overwritten when the other
-# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
-compiler_DEFAULT=$CC
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_SYS_DYNAMIC_LINKER($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-  LT_SYS_DLOPEN_SELF
-  _LT_CMD_STRIPLIB
-
-  # Report which library types will actually be built
-  AC_MSG_CHECKING([if libtool supports shared libraries])
-  AC_MSG_RESULT([$can_build_shared])
-
-  AC_MSG_CHECKING([whether to build shared libraries])
-  test "$can_build_shared" = "no" && enable_shared=no
-
-  # On AIX, shared libraries and static libraries use the same namespace, and
-  # are all built from PIC.
-  case $host_os in
-  aix3*)
-    test "$enable_shared" = yes && enable_static=no
-    if test -n "$RANLIB"; then
-      archive_cmds="$archive_cmds~\$RANLIB \$lib"
-      postinstall_cmds='$RANLIB $lib'
-    fi
-    ;;
-
-  aix[[4-9]]*)
-    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-      test "$enable_shared" = yes && enable_static=no
-    fi
-    ;;
-  esac
-  AC_MSG_RESULT([$enable_shared])
-
-  AC_MSG_CHECKING([whether to build static libraries])
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  AC_MSG_RESULT([$enable_static])
-
-  _LT_CONFIG($1)
-fi
-AC_LANG_POP
-CC="$lt_save_CC"
-])# _LT_LANG_C_CONFIG
-
-
-# _LT_LANG_CXX_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a C++ compiler are suitably
-# defined.  These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_CXX_CONFIG],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-m4_require([_LT_DECL_EGREP])dnl
-m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-
-AC_LANG_PUSH(C++)
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(compiler_needs_object, $1)=no
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the CXX compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="int some_variable = 0;"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC=$CC
-  lt_save_CFLAGS=$CFLAGS
-  lt_save_LD=$LD
-  lt_save_GCC=$GCC
-  GCC=$GXX
-  lt_save_with_gnu_ld=$with_gnu_ld
-  lt_save_path_LD=$lt_cv_path_LD
-  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-  else
-    $as_unset lt_cv_prog_gnu_ld
-  fi
-  if test -n "${lt_cv_path_LDCXX+set}"; then
-    lt_cv_path_LD=$lt_cv_path_LDCXX
-  else
-    $as_unset lt_cv_path_LD
-  fi
-  test -z "${LDCXX+set}" || LD=$LDCXX
-  CC=${CXX-"c++"}
-  CFLAGS=$CXXFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    # We don't want -fno-exception when compiling C++ code, so set the
-    # no_builtin_flag separately
-    if test "$GXX" = yes; then
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-    else
-      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-    fi
-
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
-
-      LT_PATH_LD
-
-      # Check if GNU C++ uses GNU ld as the underlying linker, since the
-      # archiving commands below assume that GNU ld is being used.
-      if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-        # If archive_cmds runs LD, not CC, wlarc should be empty
-        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-        #     investigate it a little bit more. (MM)
-        wlarc='${wl}'
-
-        # ancient GNU ld didn't support --whole-archive et. al.
-        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
-	  $GREP 'no-whole-archive' > /dev/null; then
-          _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          _LT_TAGVAR(whole_archive_flag_spec, $1)=
-        fi
-      else
-        with_gnu_ld=no
-        wlarc=
-
-        # A generic and very simple default shared library creation
-        # command for GNU C++ for the case where it uses the native
-        # linker, instead of GNU ld.  If possible, this setting should
-        # overridden to take advantage of the native linker features on
-        # the platform it is being used on.
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-      fi
-
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-    else
-      GXX=no
-      with_gnu_ld=no
-      wlarc=
-    fi
-
-    # PORTME: fill in a description of your system's C++ link characteristics
-    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-    _LT_TAGVAR(ld_shlibs, $1)=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-      aix[[4-9]]*)
-        if test "$host_cpu" = ia64; then
-          # On IA64, the linker does run time linking by default, so we don't
-          # have to do anything special.
-          aix_use_runtimelinking=no
-          exp_sym_flag='-Bexport'
-          no_entry_flag=""
-        else
-          aix_use_runtimelinking=no
-
-          # Test if we are trying to use run time linking or normal
-          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-          # need to do runtime linking.
-          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
-	    for ld_flag in $LDFLAGS; do
-	      case $ld_flag in
-	      *-brtl*)
-	        aix_use_runtimelinking=yes
-	        break
-	        ;;
-	      esac
-	    done
-	    ;;
-          esac
-
-          exp_sym_flag='-bexport'
-          no_entry_flag='-bnoentry'
-        fi
-
-        # When large executables or shared objects are built, AIX ld can
-        # have problems creating the table of contents.  If linking a library
-        # or program results in "error TOC overflow" add -mminimal-toc to
-        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-        _LT_TAGVAR(archive_cmds, $1)=''
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
-
-        if test "$GXX" = yes; then
-          case $host_os in aix4.[[012]]|aix4.[[012]].*)
-          # We only want to do this on AIX 4.2 and lower, the check
-          # below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" &&
-	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
-	  then
-	    # We have reworked collect2
-	    :
-	  else
-	    # We have old collect2
-	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
-	    # It fails to find uninstalled libraries when the uninstalled
-	    # path is not listed in the libpath.  Setting hardcode_minus_L
-	    # to unsupported forces relinking
-	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-          esac
-          shared_flag='-shared'
-	  if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag="$shared_flag "'${wl}-G'
-	  fi
-        else
-          # not using gcc
-          if test "$host_cpu" = ia64; then
-	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	  # chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-          else
-	    if test "$aix_use_runtimelinking" = yes; then
-	      shared_flag='${wl}-G'
-	    else
-	      shared_flag='${wl}-bM:SRE'
-	    fi
-          fi
-        fi
-
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
-        # It seems that -bexpall does not export symbols beginning with
-        # underscore (_), so it is better to generate a list of symbols to
-	# export.
-        _LT_TAGVAR(always_export_symbols, $1)=yes
-        if test "$aix_use_runtimelinking" = yes; then
-          # Warning - without using the other runtime loading flags (-brtl),
-          # -berok will link without error, but may produce a broken library.
-          _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          _LT_SYS_MODULE_PATH_AIX([$1])
-          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-        else
-          if test "$host_cpu" = ia64; then
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-          else
-	    # Determine the default libpath from the value encoded in an
-	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX([$1])
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	    # Warning - without using the other run time loading flags,
-	    # -berok will link without error, but may produce a broken library.
-	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    if test "$with_gnu_ld" = yes; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-	    fi
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-          fi
-        fi
-        ;;
-
-      beos*)
-	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  # Joseph Beckenbach  says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	  ;;
-        esac
-        ;;
-
-      cygwin* | mingw* | pw32* | cegcc*)
-	case $GXX,$cc_basename in
-	,cl* | no,cl*)
-	  # Native MSVC
-	  # hardcode_libdir_flag_spec is actually meaningless, as there is
-	  # no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=yes
-	  _LT_TAGVAR(file_list_spec, $1)='@'
-	  # Tell ltmain to make .lib files, not .a files.
-	  libext=lib
-	  # Tell ltmain to make .dll files, not .so files.
-	  shrext_cmds=".dll"
-	  # FIXME: Setting linknames here is a bad hack.
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
-	    else
-	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
-	    fi~
-	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
-	    linknames='
-	  # The linker will not automatically build a static lib if we build a DLL.
-	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-	  # Don't use ranlib
-	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
-	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
-	    lt_tool_outputfile="@TOOL_OUTPUT@"~
-	    case $lt_outputfile in
-	      *.exe|*.EXE) ;;
-	      *)
-		lt_outputfile="$lt_outputfile.exe"
-		lt_tool_outputfile="$lt_tool_outputfile.exe"
-		;;
-	    esac~
-	    func_to_tool_file "$lt_outputfile"~
-	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
-	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
-	      $RM "$lt_outputfile.manifest";
-	    fi'
-	  ;;
-	*)
-	  # g++
-	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
-	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-	  _LT_TAGVAR(always_export_symbols, $1)=no
-	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	    # If the export-symbols file already is a .def file (1st line
-	    # is EXPORTS), use it as is; otherwise, prepend...
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	      cp $export_symbols $output_objdir/$soname.def;
-	    else
-	      echo EXPORTS > $output_objdir/$soname.def;
-	      cat $export_symbols >> $output_objdir/$soname.def;
-	    fi~
-	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-	  else
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	  fi
-	  ;;
-	esac
-	;;
-      darwin* | rhapsody*)
-        _LT_DARWIN_LINKER_FEATURES($1)
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      freebsd2.*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      freebsd-elf*)
-        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-        ;;
-
-      haiku*)
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(link_all_deplibs, $1)=yes
-        ;;
-
-      hpux9*)
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        _LT_TAGVAR(hardcode_direct, $1)=yes
-        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				             # but as the default
-				             # location of the library.
-
-        case $cc_basename in
-          CC*)
-            # FIXME: insert proper C++ library support
-            _LT_TAGVAR(ld_shlibs, $1)=no
-            ;;
-          aCC*)
-            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            # Commands to make compiler produce verbose output that lists
-            # what "hidden" libraries, object files and flags are used when
-            # linking a shared library.
-            #
-            # There doesn't appear to be a way to prevent this compiler from
-            # explicitly linking system object files so we need to strip them
-            # from the output so that they don't get included in the library
-            # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-            ;;
-          *)
-            if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-            else
-              # FIXME: insert proper C++ library support
-              _LT_TAGVAR(ld_shlibs, $1)=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            ;;
-          *)
-            _LT_TAGVAR(hardcode_direct, $1)=yes
-            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					         # but as the default
-					         # location of the library.
-            ;;
-        esac
-
-        case $cc_basename in
-          CC*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	    esac
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test $with_gnu_ld = no; then
-	        case $host_cpu in
-	          hppa*64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	        esac
-	      fi
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[[3-9]]*)
-	_LT_TAGVAR(hardcode_direct, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-	# Instead, shared libraries are loaded at an image base (0x10000000 by
-	# default) and relocated if they conflict, which is a slow very memory
-	# consuming and fragmenting process.  To avoid this, we pick a random,
-	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	;;
-      irix5* | irix6*)
-        case $cc_basename in
-          CC*)
-	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
-	      fi
-	    fi
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-	    ;;
-        esac
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-        _LT_TAGVAR(inherit_rpath, $1)=yes
-        ;;
-
-      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	    ;;
-	  icpc* | ecpc* )
-	    # Intel C++
-	    with_gnu_ld=yes
-	    # version 8.0 and above of icpc choke on multiply defined symbols
-	    # if we add $predep_objects and $postdep_objects, however 7.1 and
-	    # earlier do not add the objects themselves.
-	    case `$CC -V 2>&1` in
-	      *"Version 7."*)
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	      *)  # Version 8.0 or newer
-	        tmp_idyn=
-	        case $host_cpu in
-		  ia64*) tmp_idyn=' -i_dynamic';;
-		esac
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
-	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
-	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
-		$RANLIB $oldlib'
-	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
-		rm -rf $tpldir~
-		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    *) # Version 6 and above use weak symbols
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-	      ;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-            ;;
-	  cxx*)
-	    # Compaq C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	    runpath_var=LD_RUN_PATH
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
-	    ;;
-	  xl* | mpixl* | bgxl*)
-	    # IBM XL 8.0 on PPC, with GNU ld
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
-		cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-		echo "local: *; };" >> $output_objdir/$libname.ver~
-		$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-	    fi
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
-	      _LT_TAGVAR(compiler_needs_object, $1)=yes
-
-	      # Not sure whether something based on
-	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
-	      # would be better.
-	      output_verbose_link_cmd='func_echo_all'
-
-	      # Archives containing C++ object files must be created using
-	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	      # necessary to make sure instantiated templates are included
-	      # in the archive.
-	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	fi
-	# Workaround some broken pre-1.5 toolchains
-	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-	;;
-
-      *nto* | *qnx*)
-        _LT_TAGVAR(ld_shlibs, $1)=yes
-	;;
-
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	_LT_TAGVAR(ld_shlibs, $1)=no
-	;;
-
-      openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	  _LT_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=func_echo_all
-	else
-	  _LT_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-
-      osf3* | osf4* | osf5*)
-        case $cc_basename in
-          KCC*)
-	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	    # KCC will only create a shared library if the output file
-	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
-	    # to its proper name (with version) after linking.
-	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-		;;
-	      *)
-	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
-	          $RM $lib.exp'
-	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-		;;
-	    esac
-
-	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    #
-	    # There doesn't appear to be a way to prevent this compiler from
-	    # explicitly linking system object files so we need to strip them
-	    # from the output so that they don't get included in the library
-	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
-	    ;;
-	  *)
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	      case $host in
-	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-		  ;;
-	      esac
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	      # Commands to make compiler produce verbose output that lists
-	      # what "hidden" libraries, object files and flags are used when
-	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-
-	    else
-	      # FIXME: insert proper C++ library support
-	      _LT_TAGVAR(ld_shlibs, $1)=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
-	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	      $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	    case $host_os in
-	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-	      *)
-		# The compiler driver will combine and reorder linker options,
-		# but understands `-z linker_flag'.
-	        # Supported since Solaris 2.6 (maybe 2.5.1?)
-		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    _LT_TAGVAR(link_all_deplibs, $1)=yes
-
-	    output_verbose_link_cmd='func_echo_all'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	    # necessary to make sure instantiated templates are included
-	    # in the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	    # The C++ compiler must be used to create the archive.
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      else
-	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	        # platform.
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
-
-	        # Commands to make compiler produce verbose output that lists
-	        # what "hidden" libraries, object files and flags are used when
-	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
-	      fi
-
-	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	      case $host_os in
-		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-		*)
-		  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-      _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-      esac
-      ;;
-
-      sysv5* | sco3.2v5* | sco5v6*)
-	# Note: We can NOT use -z defs as we might desire, because we do not
-	# link with -lc, and that would cause any symbols used from libc to
-	# always be unresolved, which means just about no library would
-	# ever link correctly.  If we're not using GNU ld we use -z text
-	# though, which does catch some bad symbols but isn't as heavy-handed
-	# as -z defs.
-	_LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-	_LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
-	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
-	_LT_TAGVAR(link_all_deplibs, $1)=yes
-	_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
-	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
-	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
-	      '"$_LT_TAGVAR(reload_cmds, $1)"
-	    ;;
-	  *)
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    ;;
-	esac
-      ;;
-
-      tandem*)
-        case $cc_basename in
-          NCC*)
-	    # NonStop-UX NCC 3.20
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    _LT_TAGVAR(ld_shlibs, $1)=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        _LT_TAGVAR(ld_shlibs, $1)=no
-        ;;
-    esac
-
-    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-    test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-    _LT_TAGVAR(GCC, $1)="$GXX"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-  LDCXX=$LD
-  LD=$lt_save_LD
-  GCC=$lt_save_GCC
-  with_gnu_ld=$lt_save_with_gnu_ld
-  lt_cv_path_LDCXX=$lt_cv_path_LD
-  lt_cv_path_LD=$lt_save_path_LD
-  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
-
-AC_LANG_POP
-])# _LT_LANG_CXX_CONFIG
-
-
-# _LT_FUNC_STRIPNAME_CNF
-# ----------------------
-# func_stripname_cnf prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-#
-# This function is identical to the (non-XSI) version of func_stripname,
-# except this one can be used by m4 code that may be executed by configure,
-# rather than the libtool script.
-m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
-AC_REQUIRE([_LT_DECL_SED])
-AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
-func_stripname_cnf ()
-{
-  case ${2} in
-  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
-  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
-  esac
-} # func_stripname_cnf
-])# _LT_FUNC_STRIPNAME_CNF
-
-# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
-# ---------------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
-[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
-AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
-# Dependencies to place before and after the object being linked:
-_LT_TAGVAR(predep_objects, $1)=
-_LT_TAGVAR(postdep_objects, $1)=
-_LT_TAGVAR(predeps, $1)=
-_LT_TAGVAR(postdeps, $1)=
-_LT_TAGVAR(compiler_lib_search_path, $1)=
-
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
-int a;
-void foo (void) { a = 0; }
-_LT_EOF
-], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_LT_EOF
-], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
-      subroutine foo
-      implicit none
-      integer a
-      a=0
-      return
-      end
-_LT_EOF
-], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-_LT_EOF
-], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
-package foo
-func foo() {
-}
-_LT_EOF
-])
-
-_lt_libdeps_save_CFLAGS=$CFLAGS
-case "$CC $CFLAGS " in #(
-*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
-*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
-*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
-esac
-
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  for p in `eval "$output_verbose_link_cmd"`; do
-    case ${prev}${p} in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" ||
-          test $p = "-R"; then
-	 prev=$p
-	 continue
-       fi
-
-       # Expand the sysroot to ease extracting the directories later.
-       if test -z "$prev"; then
-         case $p in
-         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
-         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
-         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
-         esac
-       fi
-       case $p in
-       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
-       esac
-       if test "$pre_test_object_deps_done" = no; then
-	 case ${prev} in
-	 -L | -R)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
-	   _LT_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       prev=
-       ;;
-
-    *.lto.$objext) ;; # Ignore GCC LTO objects
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
-	   _LT_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
-	   _LT_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-m4_if([$1], [CXX],
-[case $host_os in
-interix[[3-9]]*)
-  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-  # hack all around it, let's just trust "g++" to DTRT.
-  _LT_TAGVAR(predep_objects,$1)=
-  _LT_TAGVAR(postdep_objects,$1)=
-  _LT_TAGVAR(postdeps,$1)=
-  ;;
-
-linux*)
-  case `$CC -V 2>&1 | sed 5q` in
-  *Sun\ C*)
-    # Sun C++ 5.9
-
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-
-solaris*)
-  case $cc_basename in
-  CC* | sunCC*)
-    # The more standards-conforming stlport4 library is
-    # incompatible with the Cstd library. Avoid specifying
-    # it if it's in CXXFLAGS. Ignore libCrun as
-    # -library=stlport4 depends on it.
-    case " $CXX $CXXFLAGS " in
-    *" -library=stlport4 "*)
-      solaris_use_stlport4=yes
-      ;;
-    esac
-
-    # Adding this requires a known-good setup of shared libraries for
-    # Sun compiler versions before 5.6, else PIC objects from an old
-    # archive will be linked into the output, leading to subtle bugs.
-    if test "$solaris_use_stlport4" != yes; then
-      _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-])
-
-case " $_LT_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=
-if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
-    [The directories searched by this compiler when creating a shared library])
-_LT_TAGDECL([], [predep_objects], [1],
-    [Dependencies to place before and after the objects being linked to
-    create a shared library])
-_LT_TAGDECL([], [postdep_objects], [1])
-_LT_TAGDECL([], [predeps], [1])
-_LT_TAGDECL([], [postdeps], [1])
-_LT_TAGDECL([], [compiler_lib_search_path], [1],
-    [The library search path used internally by the compiler when linking
-    a shared library])
-])# _LT_SYS_HIDDEN_LIBDEPS
-
-
-# _LT_LANG_F77_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for a Fortran 77 compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_F77_CONFIG],
-[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the F77 compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${F77-"f77"}
-  CFLAGS=$FFLAGS
-  compiler=$CC
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-  GCC=$G77
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$G77"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC="$lt_save_CC"
-  CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
-
-AC_LANG_POP
-])# _LT_LANG_F77_CONFIG
-
-
-# _LT_LANG_FC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for a Fortran compiler are
-# suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_FC_CONFIG],
-[AC_LANG_PUSH(Fortran)
-
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_TAGVAR(allow_undefined_flag, $1)=
-_LT_TAGVAR(always_export_symbols, $1)=no
-_LT_TAGVAR(archive_expsym_cmds, $1)=
-_LT_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_TAGVAR(hardcode_direct, $1)=no
-_LT_TAGVAR(hardcode_direct_absolute, $1)=no
-_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_TAGVAR(hardcode_minus_L, $1)=no
-_LT_TAGVAR(hardcode_automatic, $1)=no
-_LT_TAGVAR(inherit_rpath, $1)=no
-_LT_TAGVAR(module_cmds, $1)=
-_LT_TAGVAR(module_expsym_cmds, $1)=
-_LT_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-_LT_TAGVAR(no_undefined_flag, $1)=
-_LT_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for fc test sources.
-ac_ext=${ac_fc_srcext-f}
-
-# Object file extension for compiled fc test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# No sense in running all these tests if we already determined that
-# the FC compiler isn't working.  Some variables (like enable_shared)
-# are currently assumed to apply to all compilers on this platform,
-# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
-  # Code to be used in simple compile tests
-  lt_simple_compile_test_code="\
-      subroutine t
-      return
-      end
-"
-
-  # Code to be used in simple link tests
-  lt_simple_link_test_code="\
-      program t
-      end
-"
-
-  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
-  _LT_TAG_COMPILER
-
-  # save warnings/boilerplate of simple test code
-  _LT_COMPILER_BOILERPLATE
-  _LT_LINKER_BOILERPLATE
-
-  # Allow CC to be a program name with arguments.
-  lt_save_CC="$CC"
-  lt_save_GCC=$GCC
-  lt_save_CFLAGS=$CFLAGS
-  CC=${FC-"f95"}
-  CFLAGS=$FCFLAGS
-  compiler=$CC
-  GCC=$ac_cv_fc_compiler_gnu
-
-  _LT_TAGVAR(compiler, $1)=$CC
-  _LT_CC_BASENAME([$compiler])
-
-  if test -n "$compiler"; then
-    AC_MSG_CHECKING([if libtool supports shared libraries])
-    AC_MSG_RESULT([$can_build_shared])
-
-    AC_MSG_CHECKING([whether to build shared libraries])
-    test "$can_build_shared" = "no" && enable_shared=no
-
-    # On AIX, shared libraries and static libraries use the same namespace, and
-    # are all built from PIC.
-    case $host_os in
-      aix3*)
-        test "$enable_shared" = yes && enable_static=no
-        if test -n "$RANLIB"; then
-          archive_cmds="$archive_cmds~\$RANLIB \$lib"
-          postinstall_cmds='$RANLIB $lib'
-        fi
-        ;;
-      aix[[4-9]]*)
-	if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-	  test "$enable_shared" = yes && enable_static=no
-	fi
-        ;;
-    esac
-    AC_MSG_RESULT([$enable_shared])
-
-    AC_MSG_CHECKING([whether to build static libraries])
-    # Make sure either enable_shared or enable_static is yes.
-    test "$enable_shared" = yes || enable_static=yes
-    AC_MSG_RESULT([$enable_static])
-
-    _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
-    _LT_TAGVAR(LD, $1)="$LD"
-
-    ## CAVEAT EMPTOR:
-    ## There is no encapsulation within the following macros, do not change
-    ## the running order or otherwise move them around unless you know exactly
-    ## what you are doing...
-    _LT_SYS_HIDDEN_LIBDEPS($1)
-    _LT_COMPILER_PIC($1)
-    _LT_COMPILER_C_O($1)
-    _LT_COMPILER_FILE_LOCKS($1)
-    _LT_LINKER_SHLIBS($1)
-    _LT_SYS_DYNAMIC_LINKER($1)
-    _LT_LINKER_HARDCODE_LIBPATH($1)
-
-    _LT_CONFIG($1)
-  fi # test -n "$compiler"
-
-  GCC=$lt_save_GCC
-  CC=$lt_save_CC
-  CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
-
-AC_LANG_POP
-])# _LT_LANG_FC_CONFIG
-
-
-# _LT_LANG_GCJ_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Java Compiler compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GCJ_CONFIG],
-[AC_REQUIRE([LT_PROG_GCJ])dnl
-AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GCJ-"gcj"}
-CFLAGS=$GCJFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GCJ_CONFIG
-
-
-# _LT_LANG_GO_CONFIG([TAG])
-# --------------------------
-# Ensure that the configuration variables for the GNU Go compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_GO_CONFIG],
-[AC_REQUIRE([LT_PROG_GO])dnl
-AC_LANG_SAVE
-
-# Source file extension for Go test sources.
-ac_ext=go
-
-# Object file extension for compiled Go test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="package main; func main() { }"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='package main; func main() { }'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=yes
-CC=${GOC-"gccgo"}
-CFLAGS=$GOFLAGS
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
-_LT_CC_BASENAME([$compiler])
-
-# Go did not exist at the time GCC didn't implicitly link libc in.
-_LT_TAGVAR(archive_cmds_need_lc, $1)=no
-
-_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_TAGVAR(reload_flag, $1)=$reload_flag
-_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
-
-## CAVEAT EMPTOR:
-## There is no encapsulation within the following macros, do not change
-## the running order or otherwise move them around unless you know exactly
-## what you are doing...
-if test -n "$compiler"; then
-  _LT_COMPILER_NO_RTTI($1)
-  _LT_COMPILER_PIC($1)
-  _LT_COMPILER_C_O($1)
-  _LT_COMPILER_FILE_LOCKS($1)
-  _LT_LINKER_SHLIBS($1)
-  _LT_LINKER_HARDCODE_LIBPATH($1)
-
-  _LT_CONFIG($1)
-fi
-
-AC_LANG_RESTORE
-
-GCC=$lt_save_GCC
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_GO_CONFIG
-
-
-# _LT_LANG_RC_CONFIG([TAG])
-# -------------------------
-# Ensure that the configuration variables for the Windows resource compiler
-# are suitably defined.  These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
-m4_defun([_LT_LANG_RC_CONFIG],
-[AC_REQUIRE([LT_PROG_RC])dnl
-AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_TAG_COMPILER
-
-# save warnings/boilerplate of simple test code
-_LT_COMPILER_BOILERPLATE
-_LT_LINKER_BOILERPLATE
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-lt_save_CFLAGS=$CFLAGS
-lt_save_GCC=$GCC
-GCC=
-CC=${RC-"windres"}
-CFLAGS=
-compiler=$CC
-_LT_TAGVAR(compiler, $1)=$CC
-_LT_CC_BASENAME([$compiler])
-_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-if test -n "$compiler"; then
-  :
-  _LT_CONFIG($1)
-fi
-
-GCC=$lt_save_GCC
-AC_LANG_RESTORE
-CC=$lt_save_CC
-CFLAGS=$lt_save_CFLAGS
-])# _LT_LANG_RC_CONFIG
-
-
-# LT_PROG_GCJ
-# -----------
-AC_DEFUN([LT_PROG_GCJ],
-[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
-  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
-    [AC_CHECK_TOOL(GCJ, gcj,)
-      test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])[]dnl
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
-
-
-# LT_PROG_GO
-# ----------
-AC_DEFUN([LT_PROG_GO],
-[AC_CHECK_TOOL(GOC, gccgo,)
-])
-
-
-# LT_PROG_RC
-# ----------
-AC_DEFUN([LT_PROG_RC],
-[AC_CHECK_TOOL(RC, windres,)
-])
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_RC], [])
-
-
-# _LT_DECL_EGREP
-# --------------
-# If we don't have a new enough Autoconf to choose the best grep
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_EGREP],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_REQUIRE([AC_PROG_FGREP])dnl
-test -z "$GREP" && GREP=grep
-_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
-_LT_DECL([], [EGREP], [1], [An ERE matcher])
-_LT_DECL([], [FGREP], [1], [A literal string matcher])
-dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
-AC_SUBST([GREP])
-])
-
-
-# _LT_DECL_OBJDUMP
-# --------------
-# If we don't have a new enough Autoconf to choose the best objdump
-# available, choose the one first in the user's PATH.
-m4_defun([_LT_DECL_OBJDUMP],
-[AC_CHECK_TOOL(OBJDUMP, objdump, false)
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
-AC_SUBST([OBJDUMP])
-])
-
-# _LT_DECL_DLLTOOL
-# ----------------
-# Ensure DLLTOOL variable is set.
-m4_defun([_LT_DECL_DLLTOOL],
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
-AC_SUBST([DLLTOOL])
-])
-
-# _LT_DECL_SED
-# ------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-m4_defun([_LT_DECL_SED],
-[AC_PROG_SED
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
-_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
-    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
-])# _LT_DECL_SED
-
-m4_ifndef([AC_PROG_SED], [
-############################################################
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-############################################################
-
-m4_defun([AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-IFS=$as_save_IFS
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && continue
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-])
-SED=$lt_cv_path_SED
-AC_SUBST([SED])
-AC_MSG_RESULT([$SED])
-])#AC_PROG_SED
-])#m4_ifndef
-
-# Old name:
-AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([LT_AC_PROG_SED], [])
-
-
-# _LT_CHECK_SHELL_FEATURES
-# ------------------------
-# Find out whether the shell is Bourne or XSI compatible,
-# or has some other useful features.
-m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,b/c, \
-    && eval 'test $(( 1 + 1 )) -eq 2 \
-    && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-  && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
-
-# test EBCDIC or ASCII
-case `echo X|tr X '\101'` in
- A) # ASCII based system
-    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
-  lt_SP2NL='tr \040 \012'
-  lt_NL2SP='tr \015\012 \040\040'
-  ;;
- *) # EBCDIC based system
-  lt_SP2NL='tr \100 \n'
-  lt_NL2SP='tr \r\n \100\100'
-  ;;
-esac
-_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
-_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
-])# _LT_CHECK_SHELL_FEATURES
-
-
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
-  && mv -f "$cfgfile.tmp" "$cfgfile" \
-    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
-    case ${1} in
-      */*) func_dirname_result="${1%/*}${2}" ;;
-      *  ) func_dirname_result="${3}" ;;
-    esac
-    func_basename_result="${1##*/}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
-    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-    # positional parameters, so assign one to ordinary parameter first.
-    func_stripname_result=${3}
-    func_stripname_result=${func_stripname_result#"${1}"}
-    func_stripname_result=${func_stripname_result%"${2}"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
-    func_split_long_opt_name=${1%%=*}
-    func_split_long_opt_arg=${1#*=}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
-    func_split_short_opt_arg=${1#??}
-    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
-  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
-    case ${1} in
-      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-      *)    func_lo2o_result=${1} ;;
-    esac])
-
-  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
-
-  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
-
-  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
-
-  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
-    func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
-    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
-  # Save a `func_append' function call where possible by direct use of '+='
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-else
-  # Save a `func_append' function call even when '+=' is not available
-  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
-    && mv -f "$cfgfile.tmp" "$cfgfile" \
-      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-  test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
-  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
-# _LT_PATH_CONVERSION_FUNCTIONS
-# -----------------------------
-# Determine which file name conversion functions should be used by
-# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
-# for certain cross-compile configurations and native mingw.
-m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_MSG_CHECKING([how to convert $build file names to $host format])
-AC_CACHE_VAL(lt_cv_to_host_file_cmd,
-[case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
-        ;;
-    esac
-    ;;
-  *-*-cygwin* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
-        ;;
-      *-*-cygwin* )
-        lt_cv_to_host_file_cmd=func_convert_file_noop
-        ;;
-      * ) # otherwise, assume *nix
-        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
-        ;;
-    esac
-    ;;
-  * ) # unhandled hosts (and "normal" native builds)
-    lt_cv_to_host_file_cmd=func_convert_file_noop
-    ;;
-esac
-])
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
-_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
-         [0], [convert $build file names to $host format])dnl
-
-AC_MSG_CHECKING([how to convert $build file names to toolchain format])
-AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
-[#assume ordinary cross tools, or native build.
-lt_cv_to_tool_file_cmd=func_convert_file_noop
-case $host in
-  *-*-mingw* )
-    case $build in
-      *-*-mingw* ) # actually msys
-        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
-        ;;
-    esac
-    ;;
-esac
-])
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
-_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
-         [0], [convert $build files to toolchain format])dnl
-])# _LT_PATH_CONVERSION_FUNCTIONS
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/ltoptions.m4 b/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/ltoptions.m4
deleted file mode 100644
index 5d9acd8e23..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/ltoptions.m4
+++ /dev/null
@@ -1,384 +0,0 @@
-# Helper functions for option handling.                    -*- Autoconf -*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-#   Inc.
-#   Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 7 ltoptions.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-
-
-# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-# ------------------------------------------
-m4_define([_LT_MANGLE_OPTION],
-[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-
-
-# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-# ---------------------------------------
-# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
-# saved as a flag.
-m4_define([_LT_SET_OPTION],
-[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-        _LT_MANGLE_DEFUN([$1], [$2]),
-    [m4_warning([Unknown $1 option `$2'])])[]dnl
-])
-
-
-# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-# ------------------------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-m4_define([_LT_IF_OPTION],
-[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-
-
-# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-# -------------------------------------------------------
-# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-# are set.
-m4_define([_LT_UNLESS_OPTIONS],
-[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-		      [m4_define([$0_found])])])[]dnl
-m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-])[]dnl
-])
-
-
-# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-# ----------------------------------------
-# OPTION-LIST is a space-separated list of Libtool options associated
-# with MACRO-NAME.  If any OPTION has a matching handler declared with
-# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-# the unknown option and exit.
-m4_defun([_LT_SET_OPTIONS],
-[# Set options
-m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-    [_LT_SET_OPTION([$1], _LT_Option)])
-
-m4_if([$1],[LT_INIT],[
-  dnl
-  dnl Simply set some default values (i.e off) if boolean options were not
-  dnl specified:
-  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-  ])
-  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-  ])
-  dnl
-  dnl If no reference was made to various pairs of opposing options, then
-  dnl we run the default mode handler for the pair.  For example, if neither
-  dnl `shared' nor `disable-shared' was passed, we enable building of shared
-  dnl archives by default:
-  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-  		   [_LT_ENABLE_FAST_INSTALL])
-  ])
-])# _LT_SET_OPTIONS
-
-
-## --------------------------------- ##
-## Macros to handle LT_INIT options. ##
-## --------------------------------- ##
-
-# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-# -----------------------------------------
-m4_define([_LT_MANGLE_DEFUN],
-[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-
-
-# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-# -----------------------------------------------
-m4_define([LT_OPTION_DEFINE],
-[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-])# LT_OPTION_DEFINE
-
-
-# dlopen
-# ------
-LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-])
-
-AU_DEFUN([AC_LIBTOOL_DLOPEN],
-[_LT_SET_OPTION([LT_INIT], [dlopen])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-
-
-# win32-dll
-# ---------
-# Declare package support for building win32 dll's.
-LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-[enable_win32_dll=yes
-
-case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-esac
-
-test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [1], [Assembler program])dnl
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
-])# win32-dll
-
-AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-_LT_SET_OPTION([LT_INIT], [win32-dll])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-
-
-# _LT_ENABLE_SHARED([DEFAULT])
-# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_SHARED],
-[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([shared],
-    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-
-    _LT_DECL([build_libtool_libs], [enable_shared], [0],
-	[Whether or not to build shared libraries])
-])# _LT_ENABLE_SHARED
-
-LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-])
-
-AC_DEFUN([AC_DISABLE_SHARED],
-[_LT_SET_OPTION([LT_INIT], [disable-shared])
-])
-
-AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-
-
-
-# _LT_ENABLE_STATIC([DEFAULT])
-# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_STATIC],
-[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([static],
-    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-
-    _LT_DECL([build_old_libs], [enable_static], [0],
-	[Whether or not to build static libraries])
-])# _LT_ENABLE_STATIC
-
-LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-
-# Old names:
-AC_DEFUN([AC_ENABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-])
-
-AC_DEFUN([AC_DISABLE_STATIC],
-[_LT_SET_OPTION([LT_INIT], [disable-static])
-])
-
-AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-
-
-
-# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-m4_define([_LT_ENABLE_FAST_INSTALL],
-[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-AC_ARG_ENABLE([fast-install],
-    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-
-_LT_DECL([fast_install], [enable_fast_install], [0],
-	 [Whether or not to optimize for fast installation])dnl
-])# _LT_ENABLE_FAST_INSTALL
-
-LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-
-# Old names:
-AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
-])
-
-AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-
-
-# _LT_WITH_PIC([MODE])
-# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-# LT_INIT options.
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-m4_define([_LT_WITH_PIC],
-[AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [lt_p=${PACKAGE-default}
-    case $withval in
-    yes|no) pic_mode=$withval ;;
-    *)
-      pic_mode=default
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for lt_pkg in $withval; do
-	IFS="$lt_save_ifs"
-	if test "X$lt_pkg" = "X$lt_p"; then
-	  pic_mode=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-
-_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-])# _LT_WITH_PIC
-
-LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-
-# Old name:
-AU_DEFUN([AC_LIBTOOL_PICMODE],
-[_LT_SET_OPTION([LT_INIT], [pic-only])
-AC_DIAGNOSE([obsolete],
-[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
-])
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-
-## ----------------- ##
-## LTDL_INIT Options ##
-## ----------------- ##
-
-m4_define([_LTDL_MODE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-		 [m4_define([_LTDL_MODE], [nonrecursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-		 [m4_define([_LTDL_MODE], [recursive])])
-LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-		 [m4_define([_LTDL_MODE], [subproject])])
-
-m4_define([_LTDL_TYPE], [])
-LT_OPTION_DEFINE([LTDL_INIT], [installable],
-		 [m4_define([_LTDL_TYPE], [installable])])
-LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-		 [m4_define([_LTDL_TYPE], [convenience])])
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/ltsugar.m4 b/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/ltsugar.m4
deleted file mode 100644
index 9000a057d3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/ltsugar.m4
+++ /dev/null
@@ -1,123 +0,0 @@
-# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
-#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-# Written by Gary V. Vaughan, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 6 ltsugar.m4
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-
-
-# lt_join(SEP, ARG1, [ARG2...])
-# -----------------------------
-# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-# associated separator.
-# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-# versions in m4sugar had bugs.
-m4_define([lt_join],
-[m4_if([$#], [1], [],
-       [$#], [2], [[$2]],
-       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-m4_define([_lt_join],
-[m4_if([$#$2], [2], [],
-       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-
-
-# lt_car(LIST)
-# lt_cdr(LIST)
-# ------------
-# Manipulate m4 lists.
-# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
-m4_define([lt_car], [[$1]])
-m4_define([lt_cdr],
-[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-       [$#], 1, [],
-       [m4_dquote(m4_shift($@))])])
-m4_define([lt_unquote], $1)
-
-
-# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-# Note that neither SEPARATOR nor STRING are expanded; they are appended
-# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-# than defined and empty).
-#
-# This macro is needed until we can rely on Autoconf 2.62, since earlier
-# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-m4_define([lt_append],
-[m4_define([$1],
-	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-
-
-
-# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-# ----------------------------------------------------------
-# Produce a SEP delimited list of all paired combinations of elements of
-# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
-# has the form PREFIXmINFIXSUFFIXn.
-# Needed until we can rely on m4_combine added in Autoconf 2.62.
-m4_define([lt_combine],
-[m4_if(m4_eval([$# > 3]), [1],
-       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-[[m4_foreach([_Lt_prefix], [$2],
-	     [m4_foreach([_Lt_suffix],
-		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-
-
-# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-# -----------------------------------------------------------------------
-# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-m4_define([lt_if_append_uniq],
-[m4_ifdef([$1],
-	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-		 [lt_append([$1], [$2], [$3])$4],
-		 [$5])],
-	  [lt_append([$1], [$2], [$3])$4])])
-
-
-# lt_dict_add(DICT, KEY, VALUE)
-# -----------------------------
-m4_define([lt_dict_add],
-[m4_define([$1($2)], [$3])])
-
-
-# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-# --------------------------------------------
-m4_define([lt_dict_add_subkey],
-[m4_define([$1($2:$3)], [$4])])
-
-
-# lt_dict_fetch(DICT, KEY, [SUBKEY])
-# ----------------------------------
-m4_define([lt_dict_fetch],
-[m4_ifval([$3],
-	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-
-
-# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-# -----------------------------------------------------------------
-m4_define([lt_if_dict_fetch],
-[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-	[$5],
-    [$6])])
-
-
-# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-# --------------------------------------------------------------
-m4_define([lt_dict_filter],
-[m4_if([$5], [], [],
-  [lt_join(m4_quote(m4_default([$4], [[, ]])),
-           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-])
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/ltversion.m4 b/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/ltversion.m4
deleted file mode 100644
index 07a8602d48..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/ltversion.m4
+++ /dev/null
@@ -1,23 +0,0 @@
-# ltversion.m4 -- version numbers			-*- Autoconf -*-
-#
-#   Copyright (C) 2004 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# @configure_input@
-
-# serial 3337 ltversion.m4
-# This file is part of GNU Libtool
-
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
-
-AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
-_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-_LT_DECL(, macro_revision, 0)
-])
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/lt~obsolete.m4 b/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/lt~obsolete.m4
deleted file mode 100644
index c573da90c5..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/lt~obsolete.m4
+++ /dev/null
@@ -1,98 +0,0 @@
-# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
-#
-#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
-#   Written by Scott James Remnant, 2004.
-#
-# This file is free software; the Free Software Foundation gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-
-# serial 5 lt~obsolete.m4
-
-# These exist entirely to fool aclocal when bootstrapping libtool.
-#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
-# which have later been changed to m4_define as they aren't part of the
-# exported API, or moved to Autoconf or Automake where they belong.
-#
-# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
-# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
-# using a macro with the same name in our local m4/libtool.m4 it'll
-# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
-# and doesn't know about Autoconf macros at all.)
-#
-# So we provide this file, which has a silly filename so it's always
-# included after everything else.  This provides aclocal with the
-# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
-# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
-#
-# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
-# Yes, that means every name once taken will need to remain here until
-# we give up compatibility with versions before 1.7, at which point
-# we need to keep only those names which we still refer to.
-
-# This is to help aclocal find these macros, as it can't see m4_define.
-AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
-
-m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
-m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
-m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
-m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
-m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
-m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
-m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
-m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
-m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
-m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
-m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
-m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
-m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
-m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
-m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
-m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
-m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
-m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
-m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
-m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
-m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
-m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
-m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
-m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
-m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
-m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
-m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
-m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
-m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
-m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
-m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
-m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
-m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
-m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
-m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
-m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
-m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
-m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
-m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
-m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
-m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
-m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
-m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
-m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
-m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
-m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
-m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
-m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
-m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
-m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
-m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
-m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
-m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.aix b/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.aix
deleted file mode 100644
index ae89cd441e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.aix
+++ /dev/null
@@ -1,121 +0,0 @@
-# makefile for libpng using gcc (generic, static library)
-# Copyright (C) 2002, 2006-2009 Glenn Randers-Pehrson
-# Copyright (C) 2000 Cosmin Truta
-# Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc)
-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-#
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# Location of the zlib library and include files
-ZLIBINC = ../zlib
-ZLIBLIB = ../zlib
-
-# Compiler, linker, lib and other tools
-CC = gcc
-LD = $(CC)
-AR_RC = ar rcs
-MKDIR_P = mkdir -p
-RANLIB = ranlib
-RM_F = rm -f
-LN_SF = ln -f -s
-
-LIBNAME=libpng16
-PNGMAJ = 16
-
-prefix=/usr/local
-INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location.  Example:
-#
-#    make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-
-CDEBUG = -g -DPNG_DEBUG=5
-LDDEBUG =
-CRELEASE = -O2
-LDRELEASE = -s
-WARNMORE=-W -Wall
-CFLAGS = -I$(ZLIBINC) $(WARNMORE) $(CRELEASE)
-LDFLAGS = -L. -L$(ZLIBLIB) -lpng16 -lz -lm $(LDRELEASE)
-
-# File extensions
-O=.o
-A=.a
-E=
-
-# Variables
-OBJS =  png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
-	pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \
-	pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
-
-# Targets
-all: $(LIBNAME)$(A) pngtest$(E)
-
-include scripts/pnglibconf.mak
-REMOVE = $(RM_F)
-DFNFLAGS = $(DEFS) $(CPPFLAGS)
-
-$(LIBNAME)$(A): $(OBJS)
-	$(AR_RC) $@ $(OBJS)
-	$(RANLIB) $@
-
-test: pngtest$(E)
-	./pngtest$(E)
-
-pngtest$(E): pngtest$(O) $(LIBNAME)$(A)
-	$(LD) -o $@ pngtest$(O) $(LDFLAGS)
-
-install: $(LIBNAME)$(A)
-	-@if [ ! -d $(DI)  ]; then $(MKDIR_P) $(DI); fi
-	-@if [ ! -d $(DI)/$(LIBNAME)  ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-	-@$(RM_F) $(DI)/$(LIBNAME)/png.h
-	-@$(RM_F) $(DI)/$(LIBNAME)/pngconf.h
-	-@$(RM_F) $(DI)/$(LIBNAME)/pnglibconf.h
-	-@$(RM_F) $(DI)/png.h
-	-@$(RM_F) $(DI)/pngconf.h
-	-@$(RM_F) $(DI)/pnglibconf.h
-	cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
-	chmod 644 $(DI)/$(LIBNAME)/png.h \
-	$(DI)/$(LIBNAME)/pngconf.h \
-	$(DI)/$(LIBNAME)/pnglibconf.h
-	-@$(RM_F) -r $(DI)/libpng
-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
-	-@$(RM_F) $(DL)/$(LIBNAME)$(A)
-	-@$(RM_F) $(DL)/libpng$(A)
-	cp $(LIBNAME)$(A) $(DL)/$(LIBNAME)$(A)
-	chmod 644 $(DL)/$(LIBNAME)$(A)
-	(cd $(DL); $(LN_SF) $(LIBNAME)$(A) libpng$(A))
-	(cd $(DI); $(LN_SF) libpng/* .;)
-
-clean:
-	$(RM_F) *.o $(LIBNAME)$(A) pngtest pngout.png pnglibconf.h
-
-png$(O):      png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngget$(O):   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngmem$(O):   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngread$(O):  png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngrio$(O):   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngset$(O):   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngwio$(O):   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-
-pngtest$(O):  png.h pngconf.h pnglibconf.h
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.dj2 b/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.dj2
deleted file mode 100644
index ad117bc5e2..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.dj2
+++ /dev/null
@@ -1,62 +0,0 @@
-# DJGPP (DOS gcc) makefile for libpng
-# Copyright (C) 2002, 2006, 2009-2010-2011 Glenn Randers-Pehrson
-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-#
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# where make install will put libpng.a and png.h
-#prefix=/usr/local
-prefix=.
-INCPATH=$(prefix)/include
-LIBPATH=$(prefix)/lib
-
-CC=gcc
-CFLAGS=-I../zlib -O -DPNG_NO_SNPRINTF
-LDFLAGS=-L. -L../zlib/ -lpng -lz -lm
-
-RANLIB=ranlib
-
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o pngwtran.o \
-	pngmem.o pngerror.o pngpread.o
-
-all: libpng.a pngtest
-
-# see scripts/pnglibconf.mak for more options
-pnglibconf.h: scripts/pnglibconf.h.prebuilt
-	cp scripts/pnglibconf.h.prebuilt $@
-
-libpng.a: $(OBJS)
-	ar rc $@  $(OBJS)
-	$(RANLIB) $@
-
-pngtest: pngtest.o libpng.a
-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
-	coff2exe pngtest
-
-test: pngtest
-	./pngtest
-clean:
-	rm -f *.o libpng.a pngtest pngout.png pnglibconf.h
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-png.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngerror.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngrio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngwio.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngmem.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngset.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngget.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngpread.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngrtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngrutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngtrans.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngwrite.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngwtran.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngwutil.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-
-pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.elf b/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.elf
deleted file mode 100644
index 15a8ee67b0..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.elf
+++ /dev/null
@@ -1,263 +0,0 @@
-# makefile for libpng.a and libpng16.so on Linux ELF with gcc
-# Copyright (C) 1998, 1999, 2002, 2006, 2008, 2010-2011 Greg Roelofs
-# and Glenn Randers-Pehrson
-# Copyright (C) 1996, 1997 Andreas Dilger
-#
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# Modified for Debian by Junichi Uekawa and Josselin Mouette
-# Major modifications are:
-#    * link libpng explicitly with libz and libm
-#    * $(OLDSO).16 is a symlink rather than a different library
-#    * versioned symbols
-
-# Library name:
-LIBNAME = libpng16
-PNGMAJ = 16
-
-# Shared library names:
-LIBSO=$(LIBNAME).so
-LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
-LIBSOREL=$(LIBSOMAJ).$(RELEASE)
-OLDSO=libpng.so
-OLDSOMAJ=libpng.so.16
-
-# Utilities:
-AR_RC=ar rc
-CC=gcc
-MKDIR_P=mkdir -p
-LN_SF=ln -sf
-RANLIB=ranlib
-RM_F=/bin/rm -f
-
-# where "make install" puts libpng16.a, libpng16.so*,
-# libpng16/png.h, libpng16/pngconf.h, and libpng16/pnglibconf.h
-# Prefix must be a full pathname.
-prefix=/usr/local
-exec_prefix=$(prefix)
-
-# Where the zlib library and include files are located.
-ZLIBLIB=/usr/local/lib
-ZLIBINC=/usr/local/include
-# ZLIBLIB=../zlib
-# ZLIBINC=../zlib
-
-ALIGN=
-# for i386:
-#ALIGN=-malign-loops=2 -malign-functions=2
-
-WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
-	-Wmissing-declarations -Wtraditional -Wcast-align \
-	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion
-
-# for pgcc version 2.95.1, -O3 is buggy; don't use it.
-
-CFLAGS=-W -Wall -D_REENTRANT -O2 \
-	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
-
-LDFLAGS=-L. -lpng16
-LDFLAGS_A=libpng.a -lz -lm
-LIBADDFLAGS=-lz -lm
-
-
-INCPATH=$(prefix)/include
-LIBPATH=$(exec_prefix)/lib
-MANPATH=$(prefix)/man
-BINPATH=$(exec_prefix)/bin
-
-# override DESTDIR= on the make install command line to easily support
-# installing into a temporary location.  Example:
-#
-#    make install DESTDIR=/tmp/build/libpng
-#
-# If you're going to install into a temporary location
-# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
-# you execute make install.
-DESTDIR=
-
-DB=$(DESTDIR)$(BINPATH)
-DI=$(DESTDIR)$(INCPATH)
-DL=$(DESTDIR)$(LIBPATH)
-DM=$(DESTDIR)$(MANPATH)
-
-OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
-	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
-	pngwtran.o pngmem.o pngerror.o pngpread.o
-
-OBJSDLL = $(OBJS:.o=.pic.o)
-
-.SUFFIXES:      .c .o .pic.o
-
-.c.pic.o:
-	$(CC) -c $(CFLAGS) -fPIC -o $@ $*.c
-
-all: libpng.a $(LIBSO) pngtest pngtest-static libpng.pc libpng-config
-
-# see scripts/pnglibconf.mak for more options
-pnglibconf.h: scripts/pnglibconf.h.prebuilt
-	cp scripts/pnglibconf.h.prebuilt $@
-
-libpng.a: $(OBJS)
-	$(AR_RC) $@ $(OBJS)
-	$(RANLIB) $@
-
-libpng.pc:
-	cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
-	-e s!@exec_prefix@!$(exec_prefix)! \
-	-e s!@libdir@!$(LIBPATH)! \
-	-e s!@includedir@!$(INCPATH)! \
-	-e s!-lpng16!-lpng16\ -lz\ -lm! > libpng.pc
-
-libpng.syms: png.h pngconf.h pnglibconf.h
-	$(CC) $(CFLAGS) -E -DPNG_BUILDSYMS -DPNG_INTERNAL png.h |\
-	awk -F '[\t [\\]();]' -v PNGMAJ=$(PNGMAJ) 'BEGIN{printf("PNG16_%s {global:\n",PNGMAJ)}\
-	{ for (i=1;i+2<=NF;++i)\
-		if ($$(i)=="PNG_FUNCTION_EXPORT" && $$(i+2)=="END")\
-			print $$(i+1) ";";\
-	for (i=1;i+1<=NF;++i)\
-		if ($$(i)=="PNG_DATA_EXPORT")\
-			print $$(i+1) ";";}\
-	END{print "local: *; };"}' >$@.new
-	$(RM_F) $@
-	mv $@.new $@
-
-libpng-config:
-	( cat scripts/libpng-config-head.in; \
-	echo prefix=\"$(prefix)\"; \
-	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
-	echo L_opts=\"\"; \
-	echo R_opts=\"\"; \
-	echo libs=\"-lpng16\"; \
-	echo all_libs=\"-lpng16 $(LIBADDFLAGS)\"; \
-	cat scripts/libpng-config-body.in ) > libpng-config
-	chmod +x libpng-config
-
-$(LIBSO): $(LIBSOMAJ)
-	$(LN_SF) $(LIBSOMAJ) $(LIBSO)
-
-$(LIBSOMAJ): $(OBJSDLL) libpng.syms
-	$(CC) -shared -Wl,-soname,$(LIBSOMAJ) \
-	-Wl,-version-script,libpng.syms \
-	-o $(LIBSOMAJ) \
-	$(OBJSDLL)
-
-pngtest: pngtest.o $(LIBSO)
-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
-
-pngtest-static: pngtest.o libpng.a
-	$(CC) -o pngtest-static $(CFLAGS) pngtest.o $(LDFLAGS_A)
-
-test: pngtest pngtest-static
-	@echo ""
-	@echo "   Running pngtest dynamically linked with $(LIBSO):"
-	@echo ""
-	LD_LIBRARY_PATH=".:${LD_LIBRARY_PATH}" ./pngtest
-	@echo ""
-	@echo "   Running pngtest statically linked with libpng.a:"
-	@echo ""
-	./pngtest-static
-
-install-headers: png.h pngconf.h pnglibconf.h
-	-@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
-	-@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
-	cp png.h pngconf.h pnglibconf.h $(DI)/$(LIBNAME)
-	chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h $(DI)/$(LIBNAME)/pnglibconf.h
-	-@$(RM_F) $(DI)/png.h $(DI)/pngconf.h $(DI)/pnglibconf.h
-	-@$(RM_F) $(DI)/libpng
-	(cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
-
-install-static: install-headers libpng.a
-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-	cp libpng.a $(DL)/$(LIBNAME).a
-	chmod 644 $(DL)/$(LIBNAME).a
-	-@$(RM_F) $(DL)/libpng.a
-	(cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
-
-install-shared: install-headers $(LIBSOMAJ) libpng.pc
-	-@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
-	-@$(RM_F) $(DL)/$(LIBSO)
-	-@$(RM_F) $(DL)/$(LIBSOREL)
-	-@$(RM_F) $(DL)/$(OLDSO)
-	cp $(LIBSOMAJ) $(DL)/$(LIBSOREL)
-	chmod 755 $(DL)/$(LIBSOREL)
-	(cd $(DL); \
-	$(LN_SF) $(LIBSOREL) $(LIBSO); \
-	$(LN_SF) $(LIBSO) $(OLDSO))
-	-@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
-	-@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
-	-@$(RM_F) $(DL)/pkgconfig/libpng.pc
-	cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
-	chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
-	(cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
-
-install-man: libpng.3 libpngpf.3 png.5
-	-@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
-	-@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
-	-@$(RM_F) $(DM)/man3/libpng.3
-	-@$(RM_F) $(DM)/man3/libpngpf.3
-	cp libpng.3 $(DM)/man3
-	cp libpngpf.3 $(DM)/man3
-	-@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
-	-@$(RM_F) $(DM)/man5/png.5
-	cp png.5 $(DM)/man5
-
-install-config: libpng-config
-	-@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
-	-@$(RM_F) $(DB)/libpng-config
-	-@$(RM_F) $(DB)/$(LIBNAME)-config
-	cp libpng-config $(DB)/$(LIBNAME)-config
-	chmod 755 $(DB)/$(LIBNAME)-config
-	(cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
-
-install: install-static install-shared install-man install-config
-
-# If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.  Use test-dd to test it
-# before then.
-
-test-dd:
-	echo
-	echo Testing installed dynamic shared library in $(DL).
-	$(CC) -I$(DI) -I$(ZLIBINC) \
-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
-	   -L$(DL) -L$(ZLIBLIB) -Wl, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
-	   -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`
-	./pngtestd pngtest.png
-
-test-installed:
-	$(CC) -I$(ZLIBINC) \
-	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
-	   -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
-	./pngtesti pngtest.png
-
-clean:
-	$(RM_F) *.o libpng.a libpng.syms pngtest pngout.png libpng-config \
-	$(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \
-	libpng.pc pnglibconf.h
-
-DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
-writelock:
-	chmod a-w *.[ch35] $(DOCS) scripts/*
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-png.o png.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngerror.o pngerror.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngrio.o pngrio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngwio.o pngwio.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngmem.o pngmem.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngset.o pngset.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngget.o pngget.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngread.o pngread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngrtran.o pngrtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngrutil.o pngrutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngtrans.o pngtrans.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngwrite.o pngwrite.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngwtran.o pngwtran.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngwutil.o pngwutil.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngpread.o pngpread.pic.o: png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-
-pngtest.o: png.h pngconf.h pnglibconf.h
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.gcc b/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.gcc
deleted file mode 100644
index 94349fbf1c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.gcc
+++ /dev/null
@@ -1,87 +0,0 @@
-# makefile for libpng using gcc (generic, static library)
-# Copyright (C) 2008 Glenn Randers-Pehrson
-# Copyright (C) 2000 Cosmin Truta
-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-#
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-
-# Location of the zlib library and include files
-ZLIBINC = ../zlib
-ZLIBLIB = ../zlib
-
-# Compiler, linker, lib and other tools
-CC = gcc
-LD = $(CC)
-AR_RC = ar rcs
-RANLIB = ranlib
-RM_F = rm -f
-
-CDEBUG = -g -DPNG_DEBUG=5
-LDDEBUG =
-CRELEASE = -O2
-LDRELEASE = -s
-#CFLAGS = -W -Wall $(CDEBUG)
-CFLAGS = -W -Wall $(CRELEASE)
-#LDFLAGS = $(LDDEBUG)
-LDFLAGS = $(LDRELEASE)
-LIBS = -lz -lm
-
-# File extensions
-O=.o
-A=.a
-EXE=
-
-# Variables
-OBJS =  png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
-	pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O) \
-	pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
-
-# Targets
-all: static
-
-# see scripts/pnglibconf.mak for more options
-pnglibconf.h: scripts/pnglibconf.h.prebuilt
-	cp scripts/pnglibconf.h.prebuilt $@
-
-.c$(O):
-	$(CC) -c $(CFLAGS) -I$(ZLIBINC) $<
-
-static: libpng$(A) pngtest$(EXE)
-
-shared:
-	@echo This is a generic makefile that cannot create shared libraries.
-	@echo Please use a configuration that is specific to your platform.
-	@false
-
-libpng$(A): $(OBJS)
-	$(AR_RC) $@ $(OBJS)
-	$(RANLIB) $@
-
-test: pngtest$(EXE)
-	./pngtest$(EXE)
-
-pngtest$(EXE): pngtest$(O) libpng$(A)
-	$(LD) $(LDFLAGS) -L$(ZLIBLIB) -o $@ pngtest$(O) libpng$(A) $(LIBS)
-
-clean:
-	$(RM_F) *$(O) libpng$(A) pngtest$(EXE) pngout.png pnglibconf.h
-
-png$(O):      png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngget$(O):   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngmem$(O):   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngread$(O):  png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngrio$(O):   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngset$(O):   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngwio$(O):   png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-
-pngtest$(O):  png.h pngconf.h pnglibconf.h
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.msc b/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.msc
deleted file mode 100644
index e3ad73e757..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.msc
+++ /dev/null
@@ -1,95 +0,0 @@
-# makefile for libpng
-# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# Copyright (C) 2006, 2009 Glenn Randers-Pehrson
-#
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-#
-# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
-
-# -------- Microsoft C 5.1 and later, does not use assembler code --------
-MODEL=L
-CFLAGS=-Oait -Gs -nologo -W3 -A$(MODEL) -I..\zlib
-#-Ox generates bad code with MSC 5.1
-CC=cl
-LD=link
-LDFLAGS=/e/st:0x1500/noe
-O=.obj
-
-#uncomment next to put error messages in a file
-ERRFILE= >> pngerrs
-
-# variables
-OBJS1 = png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O)
-OBJS2 = pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O)
-OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)
-
-all: libpng.lib
-
-# see scripts/pnglibconf.mak for more options
-pnglibconf.h: scripts/pnglibconf.h.prebuilt
-	cp scripts/pnglibconf.h.prebuilt $@
-
-png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-		  $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-		  $(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libpng.lib: $(OBJS1) $(OBJS2) $(OBJS3)
-	del libpng.lib
-	lib libpng $(OBJS1);
-	lib libpng $(OBJS2);
-	lib libpng $(OBJS3);
-
-pngtest$(O): png.h pngconf.h pnglibconf.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngtest.exe: pngtest.obj libpng.lib
-	$(LD) $(LDFLAGS) pngtest.obj,,,libpng.lib ..\zlib\zlib.lib ;
-
-test: pngtest.exe
-	pngtest
-
-# End of makefile for libpng
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.vcwin32 b/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.vcwin32
deleted file mode 100644
index 3ca7a01148..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/scripts/makefile.vcwin32
+++ /dev/null
@@ -1,108 +0,0 @@
-# makefile for libpng
-# Copyright (C) 1998 Tim Wegner
-# Copyright (C) 2006,2009,2011 Glenn Randers-Pehrson
-#
-# This code is released under the libpng license.
-# For conditions of distribution and use, see the disclaimer
-# and license in png.h
-#
-# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
-# To use, do "nmake /f scripts\makefile.vcwin32"
-
-# -------- Microsoft Visual C++ 2.0 and later, no assembler code --------
-
-# Compiler, linker, librarian, and other tools
-CC = cl
-LD = link
-AR = lib
-CFLAGS  = -nologo -D_CRT_SECURE_NO_DEPRECATE -MD -O2 -W3 -I..\zlib
-LDFLAGS = -nologo
-ARFLAGS = -nologo
-RM = del
-
-# File extensions
-O=.obj
-
-#uncomment next to put error messages in a file
-#ERRFILE= >> pngerrs.log
-
-# Variables
-OBJS1 = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O)
-OBJS2 = pngread$(O) pngrio$(O) pngrtran$(O) pngrutil$(O) pngset$(O)
-OBJS3 = pngtrans$(O) pngwio$(O) pngwrite$(O) pngwtran$(O) pngwutil$(O)
-OBJS  = $(OBJS1) $(OBJS2) $(OBJS3)
-
-# Targets
-all: libpng.lib
-
-# see scripts/pnglibconf.mak for more options
-pnglibconf.h: scripts\pnglibconf.h.prebuilt
-       copy scripts\pnglibconf.h.prebuilt $@
-
-png$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngset$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngget$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngpread$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngrtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngrutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngerror$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngmem$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngrio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngwio$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngtrans$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngwrite$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngwtran$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngwutil$(O): png.h pngconf.h pnglibconf.h pngpriv.h pngstruct.h             pnginfo.h pngdebug.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-libpng.lib: $(OBJS)
-	-$(RM) $@
-	$(AR) $(ARFLAGS) -out:$@ $(OBJS) $(ERRFILE)
-
-pngtest$(O): png.h pngconf.h pnglibconf.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
-pngtest.exe: pngtest$(O) libpng.lib
-	$(LD) $(LDFLAGS) -out:$@ pngtest$(O) libpng.lib ..\zlib\zlib.lib $(ERRFILE)
-
-test: pngtest.exe
-	pngtest
-
-clean:
-	-$(RM) *$(O)
-	-$(RM) libpng.lib
-	-$(RM) pnglibconf.h
-	-$(RM) pngtest.exe
-	-$(RM) pngout.png
-
-# End of makefile for libpng
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/test-driver b/3rdparty/wxwidgets3.0-3.0.1/src/png/test-driver
deleted file mode 100755
index 32bf39e837..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/test-driver
+++ /dev/null
@@ -1,127 +0,0 @@
-#! /bin/sh
-# test-driver - basic testsuite driver script.
-
-scriptversion=2012-06-27.10; # UTC
-
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see .
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to  or send patches to
-# .
-
-# Make unconditional expansion of undefined variables an error.  This
-# helps a lot in preventing typo-related bugs.
-set -u
-
-usage_error ()
-{
-  echo "$0: $*" >&2
-  print_usage >&2
-  exit 2
-}
-
-print_usage ()
-{
-  cat <$log_file 2>&1
-estatus=$?
-if test $enable_hard_errors = no && test $estatus -eq 99; then
-  estatus=1
-fi
-
-case $estatus:$expect_failure in
-  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
-  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
-  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
-  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
-  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
-  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
-esac
-
-# Report outcome to console.
-echo "${col}${res}${std}: $test_name"
-
-# Register the test result, and other relevant metadata.
-echo ":test-result: $res" > $trs_file
-echo ":global-test-result: $res" >> $trs_file
-echo ":recheck: $recheck" >> $trs_file
-echo ":copy-in-global-log: $gcopy" >> $trs_file
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest
deleted file mode 100755
index f5cbdbcae4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# Usage:
-#
-#  tests/pngstest pattern
-#
-# Runs pngstest on all the contrib/pngsuite/[^x]*${pattern}.png files
-# NOTE: pattern is used to name the temporary files pngstest generates
-#
-pattern="$1"
-shift
-exec ./pngstest --strict --tmpfile "${pattern}" --log ${1+"$@"}\
-   "${srcdir}/contrib/pngsuite/"[a-wyz]*${pattern}".png"
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-0g01 b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-0g01
deleted file mode 100755
index 4a495ccb8f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-0g01
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "${srcdir}/tests/pngstest" 0g01
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-0g02 b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-0g02
deleted file mode 100755
index 1a607c8e17..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-0g02
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "${srcdir}/tests/pngstest" 0g02
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-0g04 b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-0g04
deleted file mode 100755
index 595ba01e33..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-0g04
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "${srcdir}/tests/pngstest" 0g04
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-0g08 b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-0g08
deleted file mode 100755
index 21a8b4bb4e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-0g08
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "${srcdir}/tests/pngstest" 0g08
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-0g16 b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-0g16
deleted file mode 100755
index 0104c37bdd..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-0g16
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "${srcdir}/tests/pngstest" 0g16
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-2c08 b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-2c08
deleted file mode 100755
index 9e0de6f1e0..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-2c08
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "${srcdir}/tests/pngstest" 2c08
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-2c16 b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-2c16
deleted file mode 100755
index c1b88b04ed..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-2c16
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "${srcdir}/tests/pngstest" 2c16
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-3p01 b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-3p01
deleted file mode 100755
index 6aeb8d06cf..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-3p01
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "${srcdir}/tests/pngstest" 3p01
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-3p02 b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-3p02
deleted file mode 100755
index 770a75c0b1..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-3p02
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "${srcdir}/tests/pngstest" 3p02
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-3p04 b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-3p04
deleted file mode 100755
index 957d6ae341..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-3p04
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "${srcdir}/tests/pngstest" 3p04
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-3p08 b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-3p08
deleted file mode 100755
index d0947afdef..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-3p08
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "${srcdir}/tests/pngstest" 3p08
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-4a08 b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-4a08
deleted file mode 100755
index 2fab57f01d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-4a08
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "${srcdir}/tests/pngstest" 4a08
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-4a16 b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-4a16
deleted file mode 100755
index e4ad5aa9ad..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-4a16
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "${srcdir}/tests/pngstest" 4a16
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-6a08 b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-6a08
deleted file mode 100755
index aa6c03c3d9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-6a08
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "${srcdir}/tests/pngstest" 6a08
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-6a16 b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-6a16
deleted file mode 100755
index 545b1b394b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-6a16
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec "${srcdir}/tests/pngstest" 6a16
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-error b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-error
deleted file mode 100755
index ebf3a7b59e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngstest-error
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-code=77 # skipped
-for t in "${srcdir}/contrib/pngsuite/"x*".png"
-do
-   if test "$t" != "${srcdir}/contrib/pngsuite/x*.png"
-   then
-      # not skipped, test it
-      if ./pngstest --strict --tmpfile "error" --log "$@" "$t"
-      then
-         code=0 # oops, success: should not happen!
-      fi
-   fi
-done
-exit $code
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngtest b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngtest
deleted file mode 100755
index 813973b23e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngtest
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngtest --strict ${srcdir}/pngtest.png
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-IDAT b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-IDAT
deleted file mode 100755
index 71d915a9ca..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-IDAT
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngunknown default=discard IDAT=save "${srcdir}/pngtest.png"
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-discard b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-discard
deleted file mode 100755
index f1f02d4c7b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-discard
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngunknown default=discard "${srcdir}/pngtest.png"
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-if-safe b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-if-safe
deleted file mode 100755
index 7c52824f83..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-if-safe
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngunknown default=if-safe "${srcdir}/pngtest.png"
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-sAPI b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-sAPI
deleted file mode 100755
index e087ef25a7..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-sAPI
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngunknown bKGD=save cHRM=save gAMA=save all=discard iCCP=save sBIT=save sRGB=save "${srcdir}/pngtest.png"
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-sTER b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-sTER
deleted file mode 100755
index 1b945dc347..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-sTER
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngunknown sTER=if-safe "${srcdir}/pngtest.png"
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-save b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-save
deleted file mode 100755
index ae849308ce..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-save
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngunknown default=save "${srcdir}/pngtest.png"
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-vpAg b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-vpAg
deleted file mode 100755
index 396c6e40d4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngunknown-vpAg
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngunknown vpAg=if-safe "${srcdir}/pngtest.png"
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-16-to-8 b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-16-to-8
deleted file mode 100755
index b322338295..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-16-to-8
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngvalid --gamma-16-to-8
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-alpha-mode b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-alpha-mode
deleted file mode 100755
index ed04fa511b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-alpha-mode
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngvalid --gamma-alpha-mode
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-background b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-background
deleted file mode 100755
index 658e5fe4de..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-background
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngvalid --gamma-background
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-expand16-alpha-mode b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-expand16-alpha-mode
deleted file mode 100755
index bdda566a06..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-expand16-alpha-mode
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngvalid --gamma-alpha-mode --expand16
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-expand16-background b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-expand16-background
deleted file mode 100755
index f993c21aeb..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-expand16-background
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngvalid --gamma-background --expand16
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-expand16-transform b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-expand16-transform
deleted file mode 100755
index f462534e85..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-expand16-transform
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngvalid --gamma-transform --expand16
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-sbit b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-sbit
deleted file mode 100755
index aa82fe04fe..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-sbit
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngvalid --gamma-sbit
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-threshold b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-threshold
deleted file mode 100755
index 2cfca91467..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-threshold
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngvalid --gamma-threshold
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-transform b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-transform
deleted file mode 100755
index a71ab4d5ec..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-gamma-transform
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngvalid --gamma-transform
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-progressive-interlace-size b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-progressive-interlace-size
deleted file mode 100755
index a31b283557..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-progressive-interlace-size
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngvalid --size --progressive-read
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-progressive-interlace-standard b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-progressive-interlace-standard
deleted file mode 100755
index 59042eb172..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-progressive-interlace-standard
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngvalid --standard --progressive-read --interlace
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-progressive-interlace-transform b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-progressive-interlace-transform
deleted file mode 100755
index edf9a8a79e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-progressive-interlace-transform
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngvalid --transform
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-progressive-standard b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-progressive-standard
deleted file mode 100755
index 20ecd1583d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-progressive-standard
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngvalid --standard --interlace
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-standard b/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-standard
deleted file mode 100755
index aa1b4b4db3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/png/tests/pngvalid-standard
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec ./pngvalid --standard --progressive-read
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/advprops.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/advprops.cpp
deleted file mode 100644
index 784dba57dc..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/advprops.cpp
+++ /dev/null
@@ -1,2302 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/propgrid/advprops.cpp
-// Purpose:     wxPropertyGrid Advanced Properties (font, colour, etc.)
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     2004-09-25
-// Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_PROPGRID
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/object.h"
-    #include "wx/hash.h"
-    #include "wx/string.h"
-    #include "wx/log.h"
-    #include "wx/event.h"
-    #include "wx/window.h"
-    #include "wx/panel.h"
-    #include "wx/dc.h"
-    #include "wx/dcclient.h"
-    #include "wx/button.h"
-    #include "wx/pen.h"
-    #include "wx/brush.h"
-    #include "wx/cursor.h"
-    #include "wx/dialog.h"
-    #include "wx/settings.h"
-    #include "wx/msgdlg.h"
-    #include "wx/choice.h"
-    #include "wx/stattext.h"
-    #include "wx/textctrl.h"
-    #include "wx/scrolwin.h"
-    #include "wx/dirdlg.h"
-    #include "wx/combobox.h"
-    #include "wx/sizer.h"
-    #include "wx/textdlg.h"
-    #include "wx/filedlg.h"
-    #include "wx/intl.h"
-    #include "wx/wxcrtvararg.h"
-#endif
-
-#define __wxPG_SOURCE_FILE__
-
-#include "wx/propgrid/propgrid.h"
-
-#if wxPG_INCLUDE_ADVPROPS
-
-#include "wx/propgrid/advprops.h"
-
-#ifdef __WXMSW__
-    #include "wx/msw/private.h"
-    #include "wx/msw/dc.h"
-#endif
-
-#include "wx/odcombo.h"
-
-// -----------------------------------------------------------------------
-
-#if defined(__WXMSW__)
-    #define wxPG_CAN_DRAW_CURSOR           1
-#elif defined(__WXGTK__)
-    #define wxPG_CAN_DRAW_CURSOR           0
-#elif defined(__WXMAC__)
-    #define wxPG_CAN_DRAW_CURSOR           0
-#else
-    #define wxPG_CAN_DRAW_CURSOR           0
-#endif
-
-
-// -----------------------------------------------------------------------
-// Value type related
-// -----------------------------------------------------------------------
-
-
-// Implement dynamic class for type value.
-IMPLEMENT_DYNAMIC_CLASS(wxColourPropertyValue, wxObject)
-
-bool operator == (const wxColourPropertyValue& a, const wxColourPropertyValue& b)
-{
-    return ( ( a.m_colour == b.m_colour ) && (a.m_type == b.m_type) );
-}
-
-bool operator == (const wxArrayInt& array1, const wxArrayInt& array2)
-{
-    if ( array1.size() != array2.size() )
-        return false;
-    size_t i;
-    for ( i=0; iGetCursor());
-        else
-            SetCursor(wxNullCursor);
-    }
-
-    void OnMouseEvent(wxMouseEvent& event)
-    {
-        if ( event.GetEventType() == wxEVT_LEFT_DOWN )
-        {
-            m_bLeftDown = true;
-            m_ptPosition = event.GetPosition();
-        }
-        else if ( event.GetEventType() == wxEVT_LEFT_UP )
-        {
-            Release();
-            m_bLeftDown = false;
-        }
-        else if ( event.GetEventType() == wxEVT_MOTION )
-        {
-            if ( m_bLeftDown )
-            {
-                int dy = m_ptPosition.y - event.GetPosition().y;
-                if ( dy )
-                {
-                    Capture();
-                    m_ptPosition = event.GetPosition();
-
-                    wxSpinEvent evtscroll( (dy >= 0) ? wxEVT_SCROLL_LINEUP :
-                                                       wxEVT_SCROLL_LINEDOWN,
-                                           GetId() );
-                    evtscroll.SetEventObject(this);
-
-                    wxASSERT( m_spins == 1 );
-
-                    m_spins = abs(dy);
-                    GetEventHandler()->ProcessEvent(evtscroll);
-                    m_spins = 1;
-                }
-            }
-        }
-
-        event.Skip();
-    }
-    void OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
-    {
-        Release();
-    }
-};
-
-#endif  // IS_MOTION_SPIN_SUPPORTED
-
-
-WX_PG_IMPLEMENT_INTERNAL_EDITOR_CLASS(SpinCtrl,
-                                      wxPGSpinCtrlEditor,
-                                      wxPGEditor)
-
-
-// Destructor. It is useful to reset the global pointer in it.
-wxPGSpinCtrlEditor::~wxPGSpinCtrlEditor()
-{
-    wxPG_EDITOR(SpinCtrl) = NULL;
-}
-
-// Create controls and initialize event handling.
-wxPGWindowList wxPGSpinCtrlEditor::CreateControls( wxPropertyGrid* propgrid, wxPGProperty* property,
-                                                   const wxPoint& pos, const wxSize& sz ) const
-{
-    const int margin = 1;
-    wxSize butSz(18, sz.y);
-    wxSize tcSz(sz.x - butSz.x - margin, sz.y);
-    wxPoint butPos(pos.x + tcSz.x + margin, pos.y);
-
-    wxSpinButton* wnd2;
-
-#if IS_MOTION_SPIN_SUPPORTED
-    if ( property->GetAttributeAsLong(wxT("MotionSpin"), 0) )
-    {
-        wnd2 = new wxPGSpinButton();
-    }
-    else
-#endif
-    {
-        wnd2 = new wxSpinButton();
-    }
-
-#ifdef __WXMSW__
-    wnd2->Hide();
-#endif
-    wnd2->Create( propgrid->GetPanel(), wxPG_SUBID2, butPos, butSz, wxSP_VERTICAL );
-
-    wnd2->SetRange( INT_MIN, INT_MAX );
-    wnd2->SetValue( 0 );
-
-    wxWindow* wnd1 = wxPGTextCtrlEditor::CreateControls(propgrid, property, pos, tcSz).m_primary;
-#if wxUSE_VALIDATORS
-    // Let's add validator to make sure only numbers can be entered
-    wxTextValidator validator(wxFILTER_NUMERIC, &m_tempString);
-    wnd1->SetValidator(validator);
-#endif
-
-    return wxPGWindowList(wnd1, wnd2);
-}
-
-// Control's events are redirected here
-bool wxPGSpinCtrlEditor::OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property,
-                                  wxWindow* wnd, wxEvent& event ) const
-{
-    int evtType = event.GetEventType();
-    int keycode = -1;
-    int spins = 1;
-    bool bigStep = false;
-
-    if ( evtType == wxEVT_KEY_DOWN )
-    {
-        wxKeyEvent& keyEvent = (wxKeyEvent&)event;
-        keycode = keyEvent.GetKeyCode();
-
-        if ( keycode == WXK_UP )
-            evtType = wxEVT_SCROLL_LINEUP;
-        else if ( keycode == WXK_DOWN )
-            evtType = wxEVT_SCROLL_LINEDOWN;
-        else if ( keycode == WXK_PAGEUP )
-        {
-            evtType = wxEVT_SCROLL_LINEUP;
-            bigStep = true;
-        }
-        else if ( keycode == WXK_PAGEDOWN )
-        {
-            evtType = wxEVT_SCROLL_LINEDOWN;
-            bigStep = true;
-        }
-    }
-
-    if ( evtType == wxEVT_SCROLL_LINEUP || evtType == wxEVT_SCROLL_LINEDOWN )
-    {
-    #if IS_MOTION_SPIN_SUPPORTED
-        if ( property->GetAttributeAsLong(wxT("MotionSpin"), 0) )
-        {
-            wxPGSpinButton* spinButton =
-                (wxPGSpinButton*) propgrid->GetEditorControlSecondary();
-
-            if ( spinButton )
-                spins = spinButton->GetSpins();
-        }
-    #endif
-
-        wxString s;
-        // Can't use wnd since it might be clipper window
-        wxTextCtrl* tc = wxDynamicCast(propgrid->GetEditorControl(), wxTextCtrl);
-
-        if ( tc )
-            s = tc->GetValue();
-        else
-            s = property->GetValueAsString(wxPG_FULL_VALUE);
-
-        int mode = wxPG_PROPERTY_VALIDATION_SATURATE;
-
-        if ( property->GetAttributeAsLong(wxT("Wrap"), 0) )
-            mode = wxPG_PROPERTY_VALIDATION_WRAP;
-
-        if ( property->GetValueType() == wxT("double") )
-        {
-            double v_d;
-            double step = property->GetAttributeAsDouble(wxT("Step"), 1.0);
-
-            // Try double
-            if ( s.ToDouble(&v_d) )
-            {
-                if ( bigStep )
-                    step *= 10.0;
-
-                step *= (double) spins;
-
-                if ( evtType == wxEVT_SCROLL_LINEUP ) v_d += step;
-                else v_d -= step;
-
-                // Min/Max check
-                wxFloatProperty::DoValidation(property, v_d, NULL, mode);
-
-                wxPropertyGrid::DoubleToString(s, v_d, 6, true, NULL);
-            }
-            else
-            {
-                return false;
-            }
-        }
-        else
-        {
-            wxLongLong_t v_ll;
-            wxLongLong_t step = property->GetAttributeAsLong(wxT("Step"), 1);
-
-            // Try (long) long
-            if ( s.ToLongLong(&v_ll, 10) )
-            {
-                if ( bigStep )
-                    step *= 10;
-
-                step *= spins;
-
-                if ( evtType == wxEVT_SCROLL_LINEUP ) v_ll += step;
-                else v_ll -= step;
-
-                // Min/Max check
-                wxIntProperty::DoValidation(property, v_ll, NULL, mode);
-
-                s = wxLongLong(v_ll).ToString();
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        if ( tc )
-        {
-            int ip = tc->GetInsertionPoint();
-            int lp = tc->GetLastPosition();
-            tc->SetValue(s);
-            tc->SetInsertionPoint(ip+(tc->GetLastPosition()-lp));
-        }
-
-        return true;
-    }
-
-    return wxPGTextCtrlEditor::OnEvent(propgrid,property,wnd,event);
-}
-
-#endif // wxUSE_SPINBTN
-
-
-// -----------------------------------------------------------------------
-// wxDatePickerCtrl-based property editor
-// -----------------------------------------------------------------------
-
-#if wxUSE_DATEPICKCTRL
-
-
-#include "wx/datectrl.h"
-#include "wx/dateevt.h"
-
-class wxPGDatePickerCtrlEditor : public wxPGEditor
-{
-    DECLARE_DYNAMIC_CLASS(wxPGDatePickerCtrlEditor)
-public:
-    virtual ~wxPGDatePickerCtrlEditor();
-
-    wxString GetName() const;
-    virtual wxPGWindowList CreateControls(wxPropertyGrid* propgrid,
-                                          wxPGProperty* property,
-                                          const wxPoint& pos,
-                                          const wxSize& size) const;
-    virtual void UpdateControl( wxPGProperty* property, wxWindow* wnd ) const;
-    virtual bool OnEvent( wxPropertyGrid* propgrid, wxPGProperty* property,
-        wxWindow* wnd, wxEvent& event ) const;
-    virtual bool GetValueFromControl( wxVariant& variant, wxPGProperty* property, wxWindow* wnd ) const;
-    virtual void SetValueToUnspecified( wxPGProperty* WXUNUSED(property), wxWindow* wnd ) const;
-};
-
-
-WX_PG_IMPLEMENT_INTERNAL_EDITOR_CLASS(DatePickerCtrl,
-                                      wxPGDatePickerCtrlEditor,
-                                      wxPGEditor)
-
-
-wxPGDatePickerCtrlEditor::~wxPGDatePickerCtrlEditor()
-{
-    wxPG_EDITOR(DatePickerCtrl) = NULL;
-}
-
-wxPGWindowList wxPGDatePickerCtrlEditor::CreateControls( wxPropertyGrid* propgrid,
-                                                         wxPGProperty* property,
-                                                         const wxPoint& pos,
-                                                         const wxSize& sz ) const
-{
-    wxCHECK_MSG( wxDynamicCast(property, wxDateProperty),
-                 NULL,
-                 wxT("DatePickerCtrl editor can only be used with wxDateProperty or derivative.") );
-
-    wxDateProperty* prop = wxDynamicCast(property, wxDateProperty);
-
-    // Use two stage creation to allow cleaner display on wxMSW
-    wxDatePickerCtrl* ctrl = new wxDatePickerCtrl();
-#ifdef __WXMSW__
-    ctrl->Hide();
-    wxSize useSz = wxDefaultSize;
-    useSz.x = sz.x;
-#else
-    wxSize useSz = sz;
-#endif
-
-    wxDateTime dateValue(wxInvalidDateTime);
-
-    wxVariant value = prop->GetValue();
-    if ( value.GetType() == wxT("datetime") )
-        dateValue = value.GetDateTime();
-
-    ctrl->Create(propgrid->GetPanel(),
-                 wxPG_SUBID1,
-                 dateValue,
-                 pos,
-                 useSz,
-                 prop->GetDatePickerStyle() | wxNO_BORDER);
-
-#ifdef __WXMSW__
-    ctrl->Show();
-#endif
-
-    return ctrl;
-}
-
-// Copies value from property to control
-void wxPGDatePickerCtrlEditor::UpdateControl( wxPGProperty* property,
-                                              wxWindow* wnd ) const
-{
-    wxDatePickerCtrl* ctrl = (wxDatePickerCtrl*) wnd;
-    wxASSERT( wxDynamicCast(ctrl, wxDatePickerCtrl) );
-
-    wxDateTime dateValue(wxInvalidDateTime);
-    wxVariant v(property->GetValue());
-    if ( v.GetType() == wxT("datetime") )
-        dateValue = v.GetDateTime();
-
-    ctrl->SetValue( dateValue );
-}
-
-// Control's events are redirected here
-bool wxPGDatePickerCtrlEditor::OnEvent( wxPropertyGrid* WXUNUSED(propgrid),
-                                        wxPGProperty* WXUNUSED(property),
-                                        wxWindow* WXUNUSED(wnd),
-                                        wxEvent& event ) const
-{
-    if ( event.GetEventType() == wxEVT_DATE_CHANGED )
-        return true;
-
-    return false;
-}
-
-bool wxPGDatePickerCtrlEditor::GetValueFromControl( wxVariant& variant, wxPGProperty* WXUNUSED(property), wxWindow* wnd ) const
-{
-    wxDatePickerCtrl* ctrl = (wxDatePickerCtrl*) wnd;
-    wxASSERT( wxDynamicCast(ctrl, wxDatePickerCtrl) );
-
-    variant = ctrl->GetValue();
-
-    return true;
-}
-
-void wxPGDatePickerCtrlEditor::SetValueToUnspecified( wxPGProperty* property,
-                                                      wxWindow* wnd ) const
-{
-    wxDatePickerCtrl* ctrl = (wxDatePickerCtrl*) wnd;
-    wxASSERT( wxDynamicCast(ctrl, wxDatePickerCtrl) );
-
-    wxDateProperty* prop = wxDynamicCast(property, wxDateProperty);
-
-    if ( prop )
-    {
-        int datePickerStyle = prop->GetDatePickerStyle();
-        if ( datePickerStyle & wxDP_ALLOWNONE )
-            ctrl->SetValue(wxInvalidDateTime);
-    }
-}
-
-#endif // wxUSE_DATEPICKCTRL
-
-
-// -----------------------------------------------------------------------
-// wxFontProperty
-// -----------------------------------------------------------------------
-
-#include "wx/fontdlg.h"
-#include "wx/fontenum.h"
-
-//
-// NB: Do not use wxS here since unlike wxT it doesn't translate to wxChar*
-//
-
-static const wxChar* const gs_fp_es_family_labels[] = {
-    wxT("Default"), wxT("Decorative"),
-    wxT("Roman"), wxT("Script"),
-    wxT("Swiss"), wxT("Modern"),
-    wxT("Teletype"), wxT("Unknown"),
-    (const wxChar*) NULL
-};
-
-static const long gs_fp_es_family_values[] = {
-    wxFONTFAMILY_DEFAULT, wxFONTFAMILY_DECORATIVE,
-    wxFONTFAMILY_ROMAN, wxFONTFAMILY_SCRIPT,
-    wxFONTFAMILY_SWISS, wxFONTFAMILY_MODERN,
-    wxFONTFAMILY_TELETYPE, wxFONTFAMILY_UNKNOWN
-};
-
-static const wxChar* const gs_fp_es_style_labels[] = {
-    wxT("Normal"),
-    wxT("Slant"),
-    wxT("Italic"),
-    (const wxChar*) NULL
-};
-
-static const long gs_fp_es_style_values[] = {
-    wxNORMAL,
-    wxSLANT,
-    wxITALIC
-};
-
-static const wxChar* const gs_fp_es_weight_labels[] = {
-    wxT("Normal"),
-    wxT("Light"),
-    wxT("Bold"),
-    (const wxChar*) NULL
-};
-
-static const long gs_fp_es_weight_values[] = {
-    wxNORMAL,
-    wxLIGHT,
-    wxBOLD
-};
-
-// Class body is in advprops.h
-
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxFontProperty,wxPGProperty,
-                               wxFont,const wxFont&,TextCtrlAndButton)
-
-
-wxFontProperty::wxFontProperty( const wxString& label, const wxString& name,
-                                const wxFont& value )
-    : wxPGProperty(label,name)
-{
-    SetValue(WXVARIANT(value));
-
-    // Initialize font family choices list
-    if ( !wxPGGlobalVars->m_fontFamilyChoices )
-    {
-        wxArrayString faceNames = wxFontEnumerator::GetFacenames();
-
-        faceNames.Sort();
-
-        wxPGGlobalVars->m_fontFamilyChoices = new wxPGChoices(faceNames);
-    }
-
-    wxString emptyString(wxEmptyString);
-
-    wxFont font;
-    font << m_value;
-
-    AddPrivateChild( new wxIntProperty( _("Point Size"),
-                     wxS("Point Size"),(long)font.GetPointSize() ) );
-
-    wxString faceName = font.GetFaceName();
-    // If font was not in there, add it now
-    if ( !faceName.empty() &&
-         wxPGGlobalVars->m_fontFamilyChoices->Index(faceName) == wxNOT_FOUND )
-        wxPGGlobalVars->m_fontFamilyChoices->AddAsSorted(faceName);
-
-    wxPGProperty* p = new wxEnumProperty(_("Face Name"), wxS("Face Name"),
-                                         *wxPGGlobalVars->m_fontFamilyChoices);
-
-    p->SetValueFromString(faceName, wxPG_FULL_VALUE);
-
-    AddPrivateChild( p );
-
-    AddPrivateChild( new wxEnumProperty(_("Style"), wxS("Style"),
-                     gs_fp_es_style_labels,gs_fp_es_style_values,
-                     font.GetStyle()) );
-
-    AddPrivateChild( new wxEnumProperty(_("Weight"), wxS("Weight"),
-                     gs_fp_es_weight_labels,gs_fp_es_weight_values,
-                     font.GetWeight()) );
-
-    AddPrivateChild( new wxBoolProperty(_("Underlined"), wxS("Underlined"),
-                     font.GetUnderlined()) );
-
-    AddPrivateChild( new wxEnumProperty(_("Family"), wxS("PointSize"),
-                     gs_fp_es_family_labels,gs_fp_es_family_values,
-                     font.GetFamily()) );
-}
-
-wxFontProperty::~wxFontProperty() { }
-
-void wxFontProperty::OnSetValue()
-{
-    wxFont font;
-    font << m_value;
-
-    if ( !font.IsOk() )
-    {
-        m_value << *wxNORMAL_FONT;
-    }
-}
-
-wxString wxFontProperty::ValueToString( wxVariant& value,
-                                        int argFlags ) const
-{
-    return wxPGProperty::ValueToString(value, argFlags);
-}
-
-bool wxFontProperty::OnEvent( wxPropertyGrid* propgrid, wxWindow* WXUNUSED(primary),
-                              wxEvent& event )
-{
-    if ( propgrid->IsMainButtonEvent(event) )
-    {
-        // Update value from last minute changes
-        wxVariant useValue = propgrid->GetUncommittedPropertyValue();
-
-        wxFontData data;
-        wxFont font;
-
-        if ( useValue.GetType() == wxS("wxFont") )
-            font << useValue;
-
-        data.SetInitialFont( font );
-        data.SetColour(*wxBLACK);
-
-        wxFontDialog dlg(propgrid, data);
-        if ( dlg.ShowModal() == wxID_OK )
-        {
-            propgrid->EditorsValueWasModified();
-
-            wxVariant variant;
-            variant << dlg.GetFontData().GetChosenFont();
-            SetValueInEvent( variant );
-            return true;
-        }
-    }
-    return false;
-}
-
-void wxFontProperty::RefreshChildren()
-{
-    if ( !GetChildCount() ) return;
-    wxFont font;
-    font << m_value;
-    Item(0)->SetValue( (long)font.GetPointSize() );
-    Item(1)->SetValueFromString( font.GetFaceName(), wxPG_FULL_VALUE );
-    Item(2)->SetValue( (long)font.GetStyle() );
-    Item(3)->SetValue( (long)font.GetWeight() );
-    Item(4)->SetValue( font.GetUnderlined() );
-    Item(5)->SetValue( (long)font.GetFamily() );
-}
-
-wxVariant wxFontProperty::ChildChanged( wxVariant& thisValue,
-                                        int ind,
-                                        wxVariant& childValue ) const
-{
-    wxFont font;
-    font << thisValue;
-
-    if ( ind == 0 )
-    {
-        font.SetPointSize( childValue.GetLong() );
-    }
-    else if ( ind == 1 )
-    {
-        wxString faceName;
-        int faceIndex = childValue.GetLong();
-
-        if ( faceIndex >= 0 )
-            faceName = wxPGGlobalVars->m_fontFamilyChoices->GetLabel(faceIndex);
-
-        font.SetFaceName( faceName );
-    }
-    else if ( ind == 2 )
-    {
-        int st = childValue.GetLong();
-        if ( st != wxFONTSTYLE_NORMAL &&
-             st != wxFONTSTYLE_SLANT &&
-             st != wxFONTSTYLE_ITALIC )
-             st = wxFONTWEIGHT_NORMAL;
-        font.SetStyle( st );
-    }
-    else if ( ind == 3 )
-    {
-        int wt = childValue.GetLong();
-        if ( wt != wxFONTWEIGHT_NORMAL &&
-             wt != wxFONTWEIGHT_LIGHT &&
-             wt != wxFONTWEIGHT_BOLD )
-             wt = wxFONTWEIGHT_NORMAL;
-        font.SetWeight( wt );
-    }
-    else if ( ind == 4 )
-    {
-        font.SetUnderlined( childValue.GetBool() );
-    }
-    else if ( ind == 5 )
-    {
-        int fam = childValue.GetLong();
-        if ( fam < wxDEFAULT ||
-             fam > wxTELETYPE )
-             fam = wxDEFAULT;
-        font.SetFamily( fam );
-    }
-
-    wxVariant newVariant;
-    newVariant << font;
-    return newVariant;
-}
-
-/*
-wxSize wxFontProperty::OnMeasureImage() const
-{
-    return wxSize(-1,-1);
-}
-
-void wxFontProperty::OnCustomPaint(wxDC& dc,
-                                        const wxRect& rect,
-                                        wxPGPaintData& paintData)
-{
-    wxString drawFace;
-    if ( paintData.m_choiceItem >= 0 )
-        drawFace = wxPGGlobalVars->m_fontFamilyChoices->GetLabel(paintData.m_choiceItem);
-    else
-        drawFace = m_value_wxFont.GetFaceName();
-
-    if ( !drawFace.empty() )
-    {
-        // Draw the background
-        dc.SetBrush( wxColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)) );
-        //dc.SetBrush( *wxWHITE_BRUSH );
-        //dc.SetPen( *wxMEDIUM_GREY_PEN );
-        dc.DrawRectangle( rect );
-
-        wxFont oldFont = dc.GetFont();
-        wxFont drawFont(oldFont.GetPointSize(),
-                        wxDEFAULT,wxNORMAL,wxBOLD,false,drawFace);
-        dc.SetFont(drawFont);
-
-        dc.SetTextForeground( wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT) );
-        dc.DrawText( wxT("Aa"), rect.x+2, rect.y+1 );
-
-        dc.SetFont(oldFont);
-    }
-    else
-    {
-        // No file - just draw a white box
-        dc.SetBrush ( *wxWHITE_BRUSH );
-        dc.DrawRectangle ( rect );
-    }
-}
-*/
-
-
-// -----------------------------------------------------------------------
-// wxSystemColourProperty
-// -----------------------------------------------------------------------
-
-// wxEnumProperty based classes cannot use wxPG_PROP_CLASS_SPECIFIC_1
-#define wxPG_PROP_HIDE_CUSTOM_COLOUR        wxPG_PROP_CLASS_SPECIFIC_2
-
-#include "wx/colordlg.h"
-
-//#define wx_cp_es_syscolours_len 25
-static const wxChar* const gs_cp_es_syscolour_labels[] = {
-    wxT("AppWorkspace"),
-    wxT("ActiveBorder"),
-    wxT("ActiveCaption"),
-    wxT("ButtonFace"),
-    wxT("ButtonHighlight"),
-    wxT("ButtonShadow"),
-    wxT("ButtonText"),
-    wxT("CaptionText"),
-    wxT("ControlDark"),
-    wxT("ControlLight"),
-    wxT("Desktop"),
-    wxT("GrayText"),
-    wxT("Highlight"),
-    wxT("HighlightText"),
-    wxT("InactiveBorder"),
-    wxT("InactiveCaption"),
-    wxT("InactiveCaptionText"),
-    wxT("Menu"),
-    wxT("Scrollbar"),
-    wxT("Tooltip"),
-    wxT("TooltipText"),
-    wxT("Window"),
-    wxT("WindowFrame"),
-    wxT("WindowText"),
-    wxT("Custom"),
-    (const wxChar*) NULL
-};
-
-static const long gs_cp_es_syscolour_values[] = {
-    wxSYS_COLOUR_APPWORKSPACE,
-    wxSYS_COLOUR_ACTIVEBORDER,
-    wxSYS_COLOUR_ACTIVECAPTION,
-    wxSYS_COLOUR_BTNFACE,
-    wxSYS_COLOUR_BTNHIGHLIGHT,
-    wxSYS_COLOUR_BTNSHADOW,
-    wxSYS_COLOUR_BTNTEXT ,
-    wxSYS_COLOUR_CAPTIONTEXT,
-    wxSYS_COLOUR_3DDKSHADOW,
-    wxSYS_COLOUR_3DLIGHT,
-    wxSYS_COLOUR_BACKGROUND,
-    wxSYS_COLOUR_GRAYTEXT,
-    wxSYS_COLOUR_HIGHLIGHT,
-    wxSYS_COLOUR_HIGHLIGHTTEXT,
-    wxSYS_COLOUR_INACTIVEBORDER,
-    wxSYS_COLOUR_INACTIVECAPTION,
-    wxSYS_COLOUR_INACTIVECAPTIONTEXT,
-    wxSYS_COLOUR_MENU,
-    wxSYS_COLOUR_SCROLLBAR,
-    wxSYS_COLOUR_INFOBK,
-    wxSYS_COLOUR_INFOTEXT,
-    wxSYS_COLOUR_WINDOW,
-    wxSYS_COLOUR_WINDOWFRAME,
-    wxSYS_COLOUR_WINDOWTEXT,
-    wxPG_COLOUR_CUSTOM
-};
-
-
-IMPLEMENT_VARIANT_OBJECT_EXPORTED_SHALLOWCMP(wxColourPropertyValue, WXDLLIMPEXP_PROPGRID)
-
-
-// Class body is in advprops.h
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxSystemColourProperty,wxEnumProperty,
-                               wxColourPropertyValue,const wxColourPropertyValue&,Choice)
-
-
-void wxSystemColourProperty::Init( int type, const wxColour& colour )
-{
-    wxColourPropertyValue cpv;
-
-    if ( colour.IsOk() )
-        cpv.Init( type, colour );
-    else
-        cpv.Init( type, *wxWHITE );
-
-    m_flags |= wxPG_PROP_STATIC_CHOICES; // Colour selection cannot be changed.
-
-    m_value << cpv;
-
-    OnSetValue();
-}
-
-
-static wxPGChoices gs_wxSystemColourProperty_choicesCache;
-
-
-wxSystemColourProperty::wxSystemColourProperty( const wxString& label, const wxString& name,
-    const wxColourPropertyValue& value )
-    : wxEnumProperty( label,
-                      name,
-                      gs_cp_es_syscolour_labels,
-                      gs_cp_es_syscolour_values,
-                      &gs_wxSystemColourProperty_choicesCache )
-{
-    if ( &value )
-        Init( value.m_type, value.m_colour );
-    else
-        Init( wxPG_COLOUR_CUSTOM, *wxWHITE );
-}
-
-
-wxSystemColourProperty::wxSystemColourProperty( const wxString& label, const wxString& name,
-    const wxChar* const* labels, const long* values, wxPGChoices* choicesCache,
-    const wxColourPropertyValue& value )
-    : wxEnumProperty( label, name, labels, values, choicesCache )
-{
-    if ( &value )
-        Init( value.m_type, value.m_colour );
-    else
-        Init( wxPG_COLOUR_CUSTOM, *wxWHITE );
-}
-
-
-wxSystemColourProperty::wxSystemColourProperty( const wxString& label, const wxString& name,
-    const wxChar* const* labels, const long* values, wxPGChoices* choicesCache,
-    const wxColour& value )
-    : wxEnumProperty( label, name, labels, values, choicesCache )
-{
-    if ( &value )
-        Init( wxPG_COLOUR_CUSTOM, value );
-    else
-        Init( wxPG_COLOUR_CUSTOM, *wxWHITE );
-}
-
-
-wxSystemColourProperty::~wxSystemColourProperty() { }
-
-
-wxColourPropertyValue wxSystemColourProperty::GetVal( const wxVariant* pVariant ) const
-{
-    if ( !pVariant )
-        pVariant = &m_value;
-
-    if ( pVariant->IsNull() )
-        return wxColourPropertyValue(wxPG_COLOUR_UNSPECIFIED, wxColour());
-
-    if ( pVariant->GetType() == wxS("wxColourPropertyValue") )
-    {
-        wxColourPropertyValue v;
-        v << *pVariant;
-        return v;
-    }
-
-    wxColour col;
-    bool variantProcessed = true;
-
-    if ( pVariant->GetType() == wxS("wxColour*") )
-    {
-        wxColour* pCol = wxStaticCast(pVariant->GetWxObjectPtr(), wxColour);
-        col = *pCol;
-    }
-    else if ( pVariant->GetType() == wxS("wxColour") )
-    {
-        col << *pVariant;
-    }
-    else if ( pVariant->GetType() == wxArrayInt_VariantType )
-    {
-        // This code is mostly needed for wxPython bindings, which
-        // may offer tuple of integers as colour value.
-        wxArrayInt arr;
-        arr << *pVariant;
-
-        if ( arr.size() >= 3 )
-        {
-            int r, g, b;
-            int a = 255;
-
-            r = arr[0];
-            g = arr[1];
-            b = arr[2];
-            if ( arr.size() >= 4 )
-                a = arr[3];
-
-            col = wxColour(r, g, b, a);
-        }
-        else
-        {
-            variantProcessed = false;
-        }
-    }
-    else
-    {
-        variantProcessed = false;
-    }
-
-    if ( !variantProcessed )
-        return wxColourPropertyValue(wxPG_COLOUR_UNSPECIFIED, wxColour());
-
-    wxColourPropertyValue v2( wxPG_COLOUR_CUSTOM, col );
-
-    int colInd = ColToInd(col);
-    if ( colInd != wxNOT_FOUND )
-        v2.m_type = colInd;
-
-    return v2;
-}
-
-wxVariant wxSystemColourProperty::DoTranslateVal( wxColourPropertyValue& v ) const
-{
-    wxVariant variant;
-    variant << v;
-    return variant;
-}
-
-int wxSystemColourProperty::ColToInd( const wxColour& colour ) const
-{
-    size_t i;
-    size_t i_max = m_choices.GetCount();
-
-    if ( !(m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) )
-        i_max -= 1;
-
-    for ( i=0; iGetInternalFlags() & wxPG_FL_IN_HANDLECUSTOMEDITOREVENT) )
-        return res;
-
-    wxColourPropertyValue val = GetVal();
-
-    val.m_type = wxPG_COLOUR_CUSTOM;
-
-    wxColourData data;
-    data.SetChooseFull(true);
-    data.SetColour(val.m_colour);
-    int i;
-    for ( i = 0; i < 16; i++)
-    {
-        wxColour colour(i*16, i*16, i*16);
-        data.SetCustomColour(i, colour);
-    }
-
-    wxColourDialog dialog(propgrid, &data);
-    if ( dialog.ShowModal() == wxID_OK )
-    {
-        wxColourData retData = dialog.GetColourData();
-        val.m_colour = retData.GetColour();
-
-        variant = DoTranslateVal(val);
-
-        SetValueInEvent(variant);
-
-        res = true;
-    }
-
-    return res;
-}
-
-
-bool wxSystemColourProperty::IntToValue( wxVariant& variant, int number, int argFlags ) const
-{
-    int index = number;
-    int type = m_choices.GetValue(index);
-
-    if ( m_choices.GetLabel(index) == _("Custom") )
-    {
-         if ( !(argFlags & wxPG_PROPERTY_SPECIFIC) )
-            return QueryColourFromUser(variant);
-
-         // Call from event handler.
-         // User will be asked for custom color later on in OnEvent().
-         wxColourPropertyValue val = GetVal();
-         variant = DoTranslateVal(val);
-    }
-    else
-    {
-        variant = TranslateVal( type, GetColour(type) );
-    }
-
-    return true;
-}
-
-// Need to do some extra event handling.
-bool wxSystemColourProperty::OnEvent( wxPropertyGrid* propgrid,
-                                      wxWindow* WXUNUSED(primary),
-                                      wxEvent& event )
-{
-    bool askColour = false;
-
-    if ( propgrid->IsMainButtonEvent(event) )
-    {
-        // We need to handle button click in case editor has been
-        // switched to one that has wxButton as well.
-        askColour = true;
-    }
-    else if ( event.GetEventType() == wxEVT_COMBOBOX )
-    {
-        // Must override index detection since at this point GetIndex()
-        // will return old value.
-        wxOwnerDrawnComboBox* cb =
-            static_cast(propgrid->GetEditorControl());
-
-        if ( cb )
-        {
-            int index = cb->GetSelection();
-
-            if ( index == GetCustomColourIndex() &&
-                    !(m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) )
-                askColour = true;
-        }
-    }
-
-    if ( askColour && !propgrid->WasValueChangedInEvent() )
-    {
-        wxVariant variant;
-        if ( QueryColourFromUser(variant) )
-            return true;
-    }
-    return false;
-}
-
-/*class wxPGColourPropertyRenderer : public wxPGDefaultRenderer
-{
-public:
-    virtual void Render( wxDC& dc, const wxRect& rect,
-                         const wxPropertyGrid* propertyGrid, wxPGProperty* property,
-                         int WXUNUSED(column), int item, int WXUNUSED(flags) ) const
-    {
-        wxASSERT( wxDynamicCast(property, wxSystemColourProperty) );
-        wxSystemColourProperty* prop = wxStaticCast(property, wxSystemColourProperty);
-
-        dc.SetPen(*wxBLACK_PEN);
-        if ( item >= 0 &&
-             ( item < (int)(GetCustomColourIndex) || (prop->HasFlag(wxPG_PROP_HIDE_CUSTOM_COLOUR)))
-           )
-        {
-            int colInd;
-            const wxArrayInt& values = prop->GetValues();
-            if ( values.GetChildCount() )
-                colInd = values[item];
-            else
-                colInd = item;
-            dc.SetBrush( wxColour( prop->GetColour( colInd ) ) );
-        }
-        else if ( !prop->IsValueUnspecified() )
-            dc.SetBrush( prop->GetVal().m_colour );
-        else
-            dc.SetBrush( *wxWHITE );
-
-        wxRect imageRect = propertyGrid->GetImageRect(property, item);
-        wxLogDebug(wxT("%i, %i"),imageRect.x,imageRect.y);
-        dc.DrawRectangle( rect.x+imageRect.x, rect.y+imageRect.y,
-                          imageRect.width, imageRect.height );
-
-        wxString text;
-        if ( item == -1 )
-            text = property->GetValueAsString();
-        else
-            text = property->GetChoiceString(item);
-        DrawText( dc, rect, imageRect.width, text );
-    }
-protected:
-};
-
-wxPGColourPropertyRenderer g_wxPGColourPropertyRenderer;
-
-wxPGCellRenderer* wxSystemColourProperty::GetCellRenderer( int column ) const
-{
-    if ( column == 1 )
-        return &g_wxPGColourPropertyRenderer;
-    return wxEnumProperty::GetCellRenderer(column);
-}*/
-
-void wxSystemColourProperty::OnCustomPaint( wxDC& dc, const wxRect& rect,
-                                            wxPGPaintData& paintdata )
-{
-    wxColour col;
-
-    if ( paintdata.m_choiceItem >= 0 &&
-         paintdata.m_choiceItem < (int)m_choices.GetCount() &&
-         (paintdata.m_choiceItem != GetCustomColourIndex() ||
-          m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) )
-    {
-        int colInd = m_choices[paintdata.m_choiceItem].GetValue();
-        col = GetColour( colInd );
-    }
-    else if ( !IsValueUnspecified() )
-    {
-        col = GetVal().m_colour;
-    }
-
-    if ( col.IsOk() )
-    {
-        dc.SetBrush(col);
-        dc.DrawRectangle(rect);
-    }
-}
-
-
-bool wxSystemColourProperty::StringToValue( wxVariant& value, const wxString& text, int argFlags ) const
-{
-    wxString custColName(m_choices.GetLabel(GetCustomColourIndex()));
-    wxString colStr(text);
-    colStr.Trim(true);
-    colStr.Trim(false);
-
-    wxColour customColour;
-    bool conversionSuccess = false;
-
-    if ( colStr != custColName )
-    {
-        if ( colStr.Find(wxS("(")) == 0 )
-        {
-            // Eliminate whitespace
-            colStr.Replace(wxS(" "), wxEmptyString);
-
-            int commaCount = colStr.Freq(wxS(','));
-            if ( commaCount == 2 )
-            {
-                // Convert (R,G,B) to rgb(R,G,B)
-                colStr = wxS("rgb") + colStr;
-            }
-            else if ( commaCount == 3 )
-            {
-                // We have int alpha, CSS format that wxColour takes as
-                // input processes float alpha. So, let's parse the colour
-                // ourselves instead of trying to convert it to a format
-                // that wxColour::FromString() understands.
-                int r = -1, g = -1, b = -1, a = -1;
-                wxSscanf(colStr, wxS("(%i,%i,%i,%i)"), &r, &g, &b, &a);
-                customColour.Set(r, g, b, a);
-                conversionSuccess = customColour.IsOk();
-            }
-        }
-
-        if ( !conversionSuccess )
-            conversionSuccess = customColour.Set(colStr);
-    }
-
-    if ( !conversionSuccess && m_choices.GetCount() &&
-         !(m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) &&
-         colStr == custColName )
-    {
-        if ( !(argFlags & wxPG_EDITABLE_VALUE ))
-        {
-            // This really should not occur...
-            // wxASSERT(false);
-            ResetNextIndex();
-            return false;
-        }
-
-        if ( (argFlags & wxPG_PROPERTY_SPECIFIC) )
-        {
-            // Query for value from the event handler.
-            // User will be asked for custom color later on in OnEvent().
-            ResetNextIndex();
-            return false;
-        }
-        if ( !QueryColourFromUser(value) )
-        {
-            ResetNextIndex();
-            return false;
-        }
-    }
-    else
-    {
-        wxColourPropertyValue val;
-
-        bool done = false;
-
-        if ( !conversionSuccess )
-        {
-            // Try predefined colour first
-            bool res = wxEnumProperty::StringToValue(value,
-                                                     colStr,
-                                                     argFlags);
-            if ( res && GetIndex() >= 0 )
-            {
-                val.m_type = GetIndex();
-                if ( val.m_type < m_choices.GetCount() )
-                    val.m_type = m_choices[val.m_type].GetValue();
-
-                // Get proper colour for type.
-                val.m_colour = GetColour(val.m_type);
-
-                done = true;
-            }
-        }
-        else
-        {
-            val.m_type = wxPG_COLOUR_CUSTOM;
-            val.m_colour = customColour;
-            done = true;
-        }
-
-        if ( !done )
-        {
-            ResetNextIndex();
-            return false;
-        }
-
-        value = DoTranslateVal(val);
-    }
-
-    return true;
-}
-
-
-bool wxSystemColourProperty::DoSetAttribute( const wxString& name, wxVariant& value )
-{
-    if ( name == wxPG_COLOUR_ALLOW_CUSTOM )
-    {
-        int ival = value.GetLong();
-
-        if ( ival && (m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) )
-        {
-            // Show custom choice
-            m_choices.Insert(wxT("Custom"), GetCustomColourIndex(), wxPG_COLOUR_CUSTOM);
-            m_flags &= ~(wxPG_PROP_HIDE_CUSTOM_COLOUR);
-        }
-        else if ( !ival && !(m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR) )
-        {
-            // Hide custom choice
-            m_choices.RemoveAt(GetCustomColourIndex());
-            m_flags |= wxPG_PROP_HIDE_CUSTOM_COLOUR;
-        }
-        return true;
-    }
-    return false;
-}
-
-
-// -----------------------------------------------------------------------
-// wxColourProperty
-// -----------------------------------------------------------------------
-
-static const wxChar* const gs_cp_es_normcolour_labels[] = {
-    wxT("Black"),
-    wxT("Red"),
-    wxT("Green"),
-    wxT("Blue"),
-    wxT("Cyan"),
-    wxT("Magenta"),
-    wxT("Yellow"),
-    wxT("White"),
-    wxT("Grey"),
-    wxT("Custom"),
-    (const wxChar*) NULL
-};
-
-static const unsigned long gs_cp_es_normcolour_colours[] = {
-    wxPG_COLOUR(0,0,0),
-    wxPG_COLOUR(255,0,0),
-    wxPG_COLOUR(0,255,0),
-    wxPG_COLOUR(0,0,255),
-    wxPG_COLOUR(0,255,255),
-    wxPG_COLOUR(255,0,255),
-    wxPG_COLOUR(255,255,0),
-    wxPG_COLOUR(255,255,255),
-    wxPG_COLOUR(128,128,128),
-    wxPG_COLOUR(0,0,0)
-};
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxColourProperty, wxSystemColourProperty,
-                               wxColour, const wxColour&, TextCtrlAndButton)
-
-static wxPGChoices gs_wxColourProperty_choicesCache;
-
-wxColourProperty::wxColourProperty( const wxString& label,
-                      const wxString& name,
-                      const wxColour& value )
-    : wxSystemColourProperty(label, name, gs_cp_es_normcolour_labels,
-                             NULL,
-                             &gs_wxColourProperty_choicesCache, value )
-{
-    Init( value );
-
-    m_flags |= wxPG_PROP_TRANSLATE_CUSTOM;
-}
-
-wxColourProperty::~wxColourProperty()
-{
-}
-
-void wxColourProperty::Init( wxColour colour )
-{
-    if ( !colour.IsOk() )
-        colour = *wxWHITE;
-    wxVariant variant;
-    variant << colour;
-    m_value = variant;
-    int ind = ColToInd(colour);
-    if ( ind < 0 )
-        ind = m_choices.GetCount() - 1;
-    SetIndex( ind );
-}
-
-wxString wxColourProperty::ValueToString( wxVariant& value,
-                                          int argFlags ) const
-{
-    const wxPGEditor* editor = GetEditorClass();
-    if ( editor != wxPGEditor_Choice &&
-         editor != wxPGEditor_ChoiceAndButton &&
-         editor != wxPGEditor_ComboBox )
-        argFlags |= wxPG_PROPERTY_SPECIFIC;
-
-    return wxSystemColourProperty::ValueToString(value, argFlags);
-}
-
-wxColour wxColourProperty::GetColour( int index ) const
-{
-    return gs_cp_es_normcolour_colours[m_choices.GetValue(index)];
-}
-
-wxVariant wxColourProperty::DoTranslateVal( wxColourPropertyValue& v ) const
-{
-    wxVariant variant;
-    variant << v.m_colour;
-    return variant;
-}
-
-// -----------------------------------------------------------------------
-// wxCursorProperty
-// -----------------------------------------------------------------------
-
-#define wxPG_CURSOR_IMAGE_WIDTH     32
-
-#define NUM_CURSORS 28
-
-//#define wx_cp_es_syscursors_len 28
-static const wxChar* const gs_cp_es_syscursors_labels[NUM_CURSORS+1] = {
-    wxT("Default"),
-    wxT("Arrow"),
-    wxT("Right Arrow"),
-    wxT("Blank"),
-    wxT("Bullseye"),
-    wxT("Character"),
-    wxT("Cross"),
-    wxT("Hand"),
-    wxT("I-Beam"),
-    wxT("Left Button"),
-    wxT("Magnifier"),
-    wxT("Middle Button"),
-    wxT("No Entry"),
-    wxT("Paint Brush"),
-    wxT("Pencil"),
-    wxT("Point Left"),
-    wxT("Point Right"),
-    wxT("Question Arrow"),
-    wxT("Right Button"),
-    wxT("Sizing NE-SW"),
-    wxT("Sizing N-S"),
-    wxT("Sizing NW-SE"),
-    wxT("Sizing W-E"),
-    wxT("Sizing"),
-    wxT("Spraycan"),
-    wxT("Wait"),
-    wxT("Watch"),
-    wxT("Wait Arrow"),
-    (const wxChar*) NULL
-};
-
-static const long gs_cp_es_syscursors_values[NUM_CURSORS] = {
-    wxCURSOR_NONE,
-    wxCURSOR_ARROW,
-    wxCURSOR_RIGHT_ARROW,
-    wxCURSOR_BLANK,
-    wxCURSOR_BULLSEYE,
-    wxCURSOR_CHAR,
-    wxCURSOR_CROSS,
-    wxCURSOR_HAND,
-    wxCURSOR_IBEAM,
-    wxCURSOR_LEFT_BUTTON,
-    wxCURSOR_MAGNIFIER,
-    wxCURSOR_MIDDLE_BUTTON,
-    wxCURSOR_NO_ENTRY,
-    wxCURSOR_PAINT_BRUSH,
-    wxCURSOR_PENCIL,
-    wxCURSOR_POINT_LEFT,
-    wxCURSOR_POINT_RIGHT,
-    wxCURSOR_QUESTION_ARROW,
-    wxCURSOR_RIGHT_BUTTON,
-    wxCURSOR_SIZENESW,
-    wxCURSOR_SIZENS,
-    wxCURSOR_SIZENWSE,
-    wxCURSOR_SIZEWE,
-    wxCURSOR_SIZING,
-    wxCURSOR_SPRAYCAN,
-    wxCURSOR_WAIT,
-    wxCURSOR_WATCH,
-    wxCURSOR_ARROWWAIT
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxCursorProperty, wxEnumProperty)
-
-wxCursorProperty::wxCursorProperty( const wxString& label, const wxString& name,
-    int value )
-    : wxEnumProperty( label,
-                      name,
-                      gs_cp_es_syscursors_labels,
-                      gs_cp_es_syscursors_values,
-                      value )
-{
-    m_flags |= wxPG_PROP_STATIC_CHOICES; // Cursor selection cannot be changed.
-}
-
-wxCursorProperty::~wxCursorProperty()
-{
-}
-
-wxSize wxCursorProperty::OnMeasureImage( int item ) const
-{
-#if wxPG_CAN_DRAW_CURSOR
-    if ( item != -1 && item < NUM_CURSORS )
-        return wxSize(wxPG_CURSOR_IMAGE_WIDTH,wxPG_CURSOR_IMAGE_WIDTH);
-#else
-    wxUnusedVar(item);
-#endif
-    return wxSize(0,0);
-}
-
-#if wxPG_CAN_DRAW_CURSOR
-
-void wxCursorProperty::OnCustomPaint( wxDC& dc,
-                                      const wxRect& rect,
-                                      wxPGPaintData& paintdata )
-{
-    // Background brush
-    dc.SetBrush( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    if ( paintdata.m_choiceItem >= 0 )
-    {
-        dc.DrawRectangle( rect );
-
-        if ( paintdata.m_choiceItem < NUM_CURSORS )
-        {
-            wxStockCursor cursorIndex =
-                (wxStockCursor) gs_cp_es_syscursors_values[paintdata.m_choiceItem];
-
-            {
-                if ( cursorIndex == wxCURSOR_NONE )
-                    cursorIndex = wxCURSOR_ARROW;
-
-                wxCursor cursor( cursorIndex );
-
-            #ifdef __WXMSW__
-                HDC hDc = (HDC)((const wxMSWDCImpl *)dc.GetImpl())->GetHDC();
-                ::DrawIconEx( hDc,
-                              rect.x,
-                              rect.y,
-                              (HICON)cursor.GetHandle(),
-                              0,
-                              0,
-                              0,
-                              NULL,
-            #if !defined(__WXWINCE__)
-                              DI_COMPAT | DI_DEFAULTSIZE |
-            #endif
-                              DI_NORMAL
-                            );
-            #endif
-            }
-        }
-    }
-}
-
-#else
-void wxCursorProperty::OnCustomPaint( wxDC&, const wxRect&, wxPGPaintData& ) { }
-/*wxPGCellRenderer* wxCursorProperty::GetCellRenderer( int column ) const
-{
-    return wxEnumProperty::GetCellRenderer(column);
-}*/
-#endif
-
-// -----------------------------------------------------------------------
-// wxImageFileProperty
-// -----------------------------------------------------------------------
-
-#if wxUSE_IMAGE
-
-const wxString& wxPGGetDefaultImageWildcard()
-{
-    // Form the wildcard, if not done yet
-    if ( wxPGGlobalVars->m_pDefaultImageWildcard.empty() )
-    {
-
-        wxString str;
-
-        // TODO: This section may require locking (using global).
-
-        wxList& handlers = wxImage::GetHandlers();
-
-        wxList::iterator node;
-
-        // Let's iterate over the image handler list.
-        //for ( wxList::Node *node = handlers.GetFirst(); node; node = node->GetNext() )
-        for ( node = handlers.begin(); node != handlers.end(); ++node )
-        {
-            wxImageHandler *handler = (wxImageHandler*)*node;
-
-            wxString ext_lo = handler->GetExtension();
-            wxString ext_up = ext_lo.Upper();
-
-            str.append( ext_up );
-            str.append( wxT(" files (*.") );
-            str.append( ext_up );
-            str.append( wxT(")|*.") );
-            str.append( ext_lo );
-            str.append( wxT("|") );
-        }
-
-        str.append ( wxT("All files (*.*)|*.*") );
-
-        wxPGGlobalVars->m_pDefaultImageWildcard = str;
-    }
-
-    return wxPGGlobalVars->m_pDefaultImageWildcard;
-}
-
-IMPLEMENT_DYNAMIC_CLASS(wxImageFileProperty, wxFileProperty)
-
-wxImageFileProperty::wxImageFileProperty( const wxString& label, const wxString& name,
-    const wxString& value )
-    : wxFileProperty(label,name,value)
-{
-    SetAttribute( wxPG_FILE_WILDCARD, wxPGGetDefaultImageWildcard() );
-
-    m_pImage = NULL;
-    m_pBitmap = NULL;
-
-    LoadImageFromFile();
-}
-
-wxImageFileProperty::~wxImageFileProperty()
-{
-    if ( m_pBitmap )
-        delete m_pBitmap;
-    if ( m_pImage )
-        delete m_pImage;
-}
-
-void wxImageFileProperty::OnSetValue()
-{
-    wxFileProperty::OnSetValue();
-
-    // Delete old image
-    wxDELETE(m_pImage);
-    wxDELETE(m_pBitmap);
-
-    LoadImageFromFile();
-}
-
-void wxImageFileProperty::LoadImageFromFile()
-{
-    wxFileName filename = GetFileName();
-
-    // Create the image thumbnail
-    if ( filename.FileExists() )
-    {
-        m_pImage = new wxImage( filename.GetFullPath() );
-    }
-}
-
-wxSize wxImageFileProperty::OnMeasureImage( int ) const
-{
-    return wxPG_DEFAULT_IMAGE_SIZE;
-}
-
-void wxImageFileProperty::OnCustomPaint( wxDC& dc,
-                                         const wxRect& rect,
-                                         wxPGPaintData& )
-{
-    if ( m_pBitmap || (m_pImage && m_pImage->IsOk() ) )
-    {
-        // Draw the thumbnail
-
-        // Create the bitmap here because required size is not known in OnSetValue().
-        if ( !m_pBitmap )
-        {
-            m_pImage->Rescale( rect.width, rect.height );
-            m_pBitmap = new wxBitmap( *m_pImage );
-            wxDELETE(m_pImage);
-        }
-
-        dc.DrawBitmap( *m_pBitmap, rect.x, rect.y, false );
-    }
-    else
-    {
-        // No file - just draw a white box
-        dc.SetBrush( *wxWHITE_BRUSH );
-        dc.DrawRectangle ( rect );
-    }
-}
-
-#endif // wxUSE_IMAGE
-
-// -----------------------------------------------------------------------
-// wxMultiChoiceProperty
-// -----------------------------------------------------------------------
-
-#if wxUSE_CHOICEDLG
-
-#include "wx/choicdlg.h"
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxMultiChoiceProperty,wxPGProperty,
-                               wxArrayInt,const wxArrayInt&,TextCtrlAndButton)
-
-wxMultiChoiceProperty::wxMultiChoiceProperty( const wxString& label,
-                                              const wxString& name,
-                                              const wxPGChoices& choices,
-                                              const wxArrayString& value)
-                                                : wxPGProperty(label,name)
-{
-    m_choices.Assign(choices);
-    SetValue(value);
-}
-
-wxMultiChoiceProperty::wxMultiChoiceProperty( const wxString& label,
-                                              const wxString& name,
-                                              const wxArrayString& strings,
-                                              const wxArrayString& value)
-                                                : wxPGProperty(label,name)
-{
-    m_choices.Set(strings);
-    SetValue(value);
-}
-
-wxMultiChoiceProperty::wxMultiChoiceProperty( const wxString& label,
-                                              const wxString& name,
-                                              const wxArrayString& value)
-                                                : wxPGProperty(label,name)
-{
-    wxArrayString strings;
-    m_choices.Set(strings);
-    SetValue(value);
-}
-
-wxMultiChoiceProperty::~wxMultiChoiceProperty()
-{
-}
-
-void wxMultiChoiceProperty::OnSetValue()
-{
-    GenerateValueAsString(m_value, &m_display);
-}
-
-wxString wxMultiChoiceProperty::ValueToString( wxVariant& value,
-                                               int argFlags ) const
-{
-    // If possible, use cached string
-    if ( argFlags & wxPG_VALUE_IS_CURRENT )
-        return m_display;
-
-    wxString s;
-    GenerateValueAsString(value, &s);
-    return s;
-}
-
-void wxMultiChoiceProperty::GenerateValueAsString( wxVariant& value,
-                                                   wxString* target ) const
-{
-    wxArrayString strings;
-
-    if ( value.GetType() == wxPG_VARIANT_TYPE_ARRSTRING )
-        strings = value.GetArrayString();
-
-    wxString& tempStr = *target;
-    unsigned int i;
-    unsigned int itemCount = strings.size();
-
-    tempStr.Empty();
-
-    if ( itemCount )
-        tempStr.append( wxT("\"") );
-
-    for ( i = 0; i < itemCount; i++ )
-    {
-        tempStr.append( strings[i] );
-        tempStr.append( wxT("\"") );
-        if ( i < (itemCount-1) )
-            tempStr.append ( wxT(" \"") );
-    }
-}
-
-wxArrayInt wxMultiChoiceProperty::GetValueAsIndices() const
-{
-    wxVariant variant = GetValue();
-    const wxArrayInt& valueArr = wxArrayIntRefFromVariant(variant);
-    unsigned int i;
-
-    // Translate values to string indices.
-    wxArrayInt selections;
-
-    if ( !m_choices.IsOk() || !m_choices.GetCount() || !(&valueArr) )
-    {
-        for ( i=0; i= 0 )
-                selections.Add(sIndex);
-        }
-    }
-
-    return selections;
-}
-
-bool wxMultiChoiceProperty::OnEvent( wxPropertyGrid* propgrid,
-                                     wxWindow* WXUNUSED(primary),
-                                     wxEvent& event )
-{
-    if ( propgrid->IsMainButtonEvent(event) )
-    {
-        // Update the value
-        wxVariant useValue = propgrid->GetUncommittedPropertyValue();
-
-        wxArrayString labels = m_choices.GetLabels();
-        unsigned int choiceCount;
-
-        if ( m_choices.IsOk() )
-            choiceCount = m_choices.GetCount();
-        else
-            choiceCount = 0;
-
-        // launch editor dialog
-        wxMultiChoiceDialog dlg( propgrid,
-                                 _("Make a selection:"),
-                                 m_label,
-                                 choiceCount,
-                                 choiceCount?&labels[0]:NULL,
-                                 wxCHOICEDLG_STYLE );
-
-        dlg.Move( propgrid->GetGoodEditorDialogPosition(this,dlg.GetSize()) );
-
-        wxArrayString strings = useValue.GetArrayString();
-        wxArrayString extraStrings;
-
-        dlg.SetSelections(m_choices.GetIndicesForStrings(strings, &extraStrings));
-
-        if ( dlg.ShowModal() == wxID_OK && choiceCount )
-        {
-            int userStringMode = GetAttributeAsLong(wxT("UserStringMode"), 0);
-
-            wxArrayInt arrInt = dlg.GetSelections();
-
-            wxVariant variant;
-
-            // Strings that were not in list of choices
-            wxArrayString value;
-
-            // Translate string indices to strings
-
-            unsigned int n;
-            if ( userStringMode == 1 )
-            {
-                for (n=0;n 0 || (m_choices.IsOk() && m_choices.Index( token ) != wxNOT_FOUND) )
-            arr.Add(token);
-    WX_PG_TOKENIZER2_END()
-
-    wxVariant v( WXVARIANT(arr) );
-    variant = v;
-
-    return true;
-}
-
-#endif // wxUSE_CHOICEDLG
-
-
-// -----------------------------------------------------------------------
-// wxDateProperty
-// -----------------------------------------------------------------------
-
-#if wxUSE_DATETIME
-
-
-#if wxUSE_DATEPICKCTRL
-    #define dtCtrl      DatePickerCtrl
-#else
-    #define dtCtrl      TextCtrl
-#endif
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxDateProperty,
-                               wxPGProperty,
-                               wxDateTime,
-                               const wxDateTime&,
-                               dtCtrl)
-
-
-wxString wxDateProperty::ms_defaultDateFormat;
-
-
-wxDateProperty::wxDateProperty( const wxString& label,
-                                const wxString& name,
-                                const wxDateTime& value )
-    : wxPGProperty(label,name)
-{
-    //wxPGRegisterDefaultValueType(wxDateTime)
-
-#if wxUSE_DATEPICKCTRL
-    wxPGRegisterEditorClass(DatePickerCtrl);
-
-    m_dpStyle = wxDP_DEFAULT | wxDP_SHOWCENTURY;
-#else
-    m_dpStyle = 0;
-#endif
-
-    SetValue( value );
-}
-
-wxDateProperty::~wxDateProperty()
-{
-}
-
-void wxDateProperty::OnSetValue()
-{
-    //
-    // Convert invalid dates to unspecified value
-    if ( m_value.GetType() == wxT("datetime") )
-    {
-        if ( !m_value.GetDateTime().IsValid() )
-            m_value.MakeNull();
-    }
-}
-
-bool wxDateProperty::StringToValue( wxVariant& variant, const wxString& text,
-                                    int WXUNUSED(argFlags) ) const
-{
-    wxDateTime dt;
-
-    // FIXME: do we really want to return true from here if only part of the
-    //        string was parsed?
-    const char* c = dt.ParseFormat(text);
-
-    if ( c )
-    {
-        variant = dt;
-        return true;
-    }
-
-    return false;
-}
-
-wxString wxDateProperty::ValueToString( wxVariant& value,
-                                        int argFlags ) const
-{
-    const wxChar* format = (const wxChar*) NULL;
-
-    wxDateTime dateTime = value.GetDateTime();
-
-    if ( !dateTime.IsValid() )
-        return wxT("Invalid");
-
-    if ( ms_defaultDateFormat.empty() )
-    {
-#if wxUSE_DATEPICKCTRL
-        bool showCentury = m_dpStyle & wxDP_SHOWCENTURY ? true : false;
-#else
-        bool showCentury = true;
-#endif
-        ms_defaultDateFormat = DetermineDefaultDateFormat( showCentury );
-    }
-
-    if ( !m_format.empty() &&
-         !(argFlags & wxPG_FULL_VALUE) )
-            format = m_format.c_str();
-
-    // Determine default from locale
-    // NB: This is really simple stuff, but can't figure anything
-    //     better without proper support in wxLocale
-    if ( !format )
-        format = ms_defaultDateFormat.c_str();
-
-    return dateTime.Format(format);
-}
-
-wxString wxDateProperty::DetermineDefaultDateFormat( bool showCentury )
-{
-    // This code is basically copied from datectlg.cpp's SetFormat
-    //
-    wxString format;
-
-    wxDateTime dt;
-    dt.ParseFormat(wxT("2003-10-13"), wxT("%Y-%m-%d"));
-    wxString str(dt.Format(wxT("%x")));
-
-    const wxChar *p = str.c_str();
-    while ( *p )
-    {
-        int n=wxAtoi(p);
-        if (n == dt.GetDay())
-        {
-            format.Append(wxT("%d"));
-            p += 2;
-        }
-        else if (n == (int)dt.GetMonth()+1)
-        {
-            format.Append(wxT("%m"));
-            p += 2;
-        }
-        else if (n == dt.GetYear())
-        {
-            format.Append(wxT("%Y"));
-            p += 4;
-        }
-        else if (n == (dt.GetYear() % 100))
-        {
-            if (showCentury)
-                format.Append(wxT("%Y"));
-            else
-                format.Append(wxT("%y"));
-            p += 2;
-        }
-        else
-            format.Append(*p++);
-    }
-
-    return format;
-}
-
-bool wxDateProperty::DoSetAttribute( const wxString& name, wxVariant& value )
-{
-    if ( name == wxPG_DATE_FORMAT )
-    {
-        m_format = value.GetString();
-        return true;
-    }
-    else if ( name == wxPG_DATE_PICKER_STYLE )
-    {
-        m_dpStyle = value.GetLong();
-        ms_defaultDateFormat.clear();  // This may need recalculation
-        return true;
-    }
-    return false;
-}
-
-#endif  // wxUSE_DATETIME
-
-
-// -----------------------------------------------------------------------
-// wxPropertyGridInterface
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::InitAllTypeHandlers()
-{
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::RegisterAdditionalEditors()
-{
-    // Register editor classes, if necessary.
-    if ( wxPGGlobalVars->m_mapEditorClasses.empty() )
-        wxPropertyGrid::RegisterDefaultEditors();
-
-#if wxUSE_SPINBTN
-    wxPGRegisterEditorClass(SpinCtrl);
-#endif
-#if wxUSE_DATEPICKCTRL
-    wxPGRegisterEditorClass(DatePickerCtrl);
-#endif
-}
-
-// -----------------------------------------------------------------------
-
-#endif  // wxPG_INCLUDE_ADVPROPS
-
-#endif  // wxUSE_PROPGRID
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/descrip.mms b/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/descrip.mms
deleted file mode 100644
index 2a7a087212..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/descrip.mms
+++ /dev/null
@@ -1,79 +0,0 @@
-#*****************************************************************************
-#                                                                            *
-# Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 14 December 2010                                                    *
-#                                                                            *
-#*****************************************************************************
-.first
-	define wx [--.include.wx]
-
-.ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
-	   /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
-.else
-.ifdef __WXGTK__
-CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
-	   /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
-.else
-.ifdef __WXGTK2__
-CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm\
-	   /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm
-.else
-.ifdef __WXX11__
-CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
-	/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
-	/name=(as_is,short)
-.else
-CXX_DEFINE =
-CC_DEFINE =
-.endif
-.endif
-.endif
-.endif
-
-.suffixes : .cpp
-
-.cpp.obj :
-	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
-.c.obj :
-	cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
-
-OBJECTS=advprops.obj,editors.obj,manager.obj,property.obj,propgrid.obj,\
-	propgridiface.obj,propgridpagestate.obj,props.obj
-
-SOURCES=advprops.cpp editors.cpp manager.cpp property.cpp propgrid.cpp\
-	propgridiface.cpp propgridpagestate.cpp props.cpp
-
-all : $(SOURCES)
-	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
-.ifdef __WXMOTIF__
-	library [--.lib]libwx_motif.olb $(OBJECTS)
-.else
-.ifdef __WXGTK__
-	library [--.lib]libwx_gtk.olb $(OBJECTS)
-.else
-.ifdef __WXGTK2__
-	library [--.lib]libwx_gtk2.olb $(OBJECTS)
-.else
-.ifdef __WXX11__
-	library [--.lib]libwx_x11_univ.olb $(OBJECTS)
-.endif
-.endif
-.endif
-.endif
-
-$(OBJECTS) : [--.include.wx]setup.h
-
-advprops.obj : advprops.cpp
-editors.obj : editors.cpp
-manager.obj : manager.cpp
-property.obj : property.cpp
-propgrid.obj : propgrid.cpp
-propgridiface.obj : propgridiface.cpp
-propgridpagestate.obj : propgridpagestate.cpp
-props.obj : props.cpp
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/editors.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/editors.cpp
deleted file mode 100644
index 2a94c69266..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/editors.cpp
+++ /dev/null
@@ -1,2202 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/propgrid/editors.cpp
-// Purpose:     wxPropertyGrid editors
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     2007-04-14
-// Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_PROPGRID
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/object.h"
-    #include "wx/hash.h"
-    #include "wx/string.h"
-    #include "wx/log.h"
-    #include "wx/event.h"
-    #include "wx/window.h"
-    #include "wx/panel.h"
-    #include "wx/dc.h"
-    #include "wx/dcclient.h"
-    #include "wx/dcmemory.h"
-    #include "wx/button.h"
-    #include "wx/pen.h"
-    #include "wx/brush.h"
-    #include "wx/cursor.h"
-    #include "wx/dialog.h"
-    #include "wx/settings.h"
-    #include "wx/msgdlg.h"
-    #include "wx/choice.h"
-    #include "wx/stattext.h"
-    #include "wx/scrolwin.h"
-    #include "wx/dirdlg.h"
-    #include "wx/sizer.h"
-    #include "wx/textdlg.h"
-    #include "wx/filedlg.h"
-    #include "wx/statusbr.h"
-    #include "wx/intl.h"
-    #include "wx/frame.h"
-#endif
-
-
-#include "wx/timer.h"
-#include "wx/dcbuffer.h"
-#include "wx/bmpbuttn.h"
-
-
-// This define is necessary to prevent macro clearing
-#define __wxPG_SOURCE_FILE__
-
-#include "wx/propgrid/propgrid.h"
-#include "wx/propgrid/editors.h"
-#include "wx/propgrid/props.h"
-
-#if wxPG_USE_RENDERER_NATIVE
-    #include "wx/renderer.h"
-#endif
-
-// How many pixels between textctrl and button
-#ifdef __WXMAC__
-    #define wxPG_TEXTCTRL_AND_BUTTON_SPACING        4
-#else
-    #define wxPG_TEXTCTRL_AND_BUTTON_SPACING        2
-#endif
-
-#define wxPG_BUTTON_SIZEDEC                         0
-
-#include "wx/odcombo.h"
-
-// -----------------------------------------------------------------------
-
-#if defined(__WXMSW__)
-    // tested
-    #define wxPG_NAT_BUTTON_BORDER_ANY          1
-    #define wxPG_NAT_BUTTON_BORDER_X            1
-    #define wxPG_NAT_BUTTON_BORDER_Y            1
-
-    #define wxPG_CHECKMARK_XADJ                 1
-    #define wxPG_CHECKMARK_YADJ                 (-1)
-    #define wxPG_CHECKMARK_WADJ                 0
-    #define wxPG_CHECKMARK_HADJ                 0
-    #define wxPG_CHECKMARK_DEFLATE              0
-
-    #define wxPG_TEXTCTRLYADJUST                (m_spacingy+0)
-
-#elif defined(__WXGTK__)
-    // tested
-    #define wxPG_CHECKMARK_XADJ                 1
-    #define wxPG_CHECKMARK_YADJ                 1
-    #define wxPG_CHECKMARK_WADJ                 (-2)
-    #define wxPG_CHECKMARK_HADJ                 (-2)
-    #define wxPG_CHECKMARK_DEFLATE              3
-
-    #define wxPG_NAT_BUTTON_BORDER_ANY      1
-    #define wxPG_NAT_BUTTON_BORDER_X        1
-    #define wxPG_NAT_BUTTON_BORDER_Y        1
-
-    #define wxPG_TEXTCTRLYADJUST            0
-
-#elif defined(__WXMAC__)
-    // *not* tested
-    #define wxPG_CHECKMARK_XADJ                 4
-    #define wxPG_CHECKMARK_YADJ                 4
-    #define wxPG_CHECKMARK_WADJ                 -6
-    #define wxPG_CHECKMARK_HADJ                 -6
-    #define wxPG_CHECKMARK_DEFLATE              0
-
-    #define wxPG_NAT_BUTTON_BORDER_ANY      0
-    #define wxPG_NAT_BUTTON_BORDER_X        0
-    #define wxPG_NAT_BUTTON_BORDER_Y        0
-
-    #define wxPG_TEXTCTRLYADJUST            0
-
-#else
-    // defaults
-    #define wxPG_CHECKMARK_XADJ                 0
-    #define wxPG_CHECKMARK_YADJ                 0
-    #define wxPG_CHECKMARK_WADJ                 0
-    #define wxPG_CHECKMARK_HADJ                 0
-    #define wxPG_CHECKMARK_DEFLATE              0
-
-    #define wxPG_NAT_BUTTON_BORDER_ANY      0
-    #define wxPG_NAT_BUTTON_BORDER_X        0
-    #define wxPG_NAT_BUTTON_BORDER_Y        0
-
-    #define wxPG_TEXTCTRLYADJUST            0
-
-#endif
-
-// for odcombo
-#ifdef __WXMAC__
-#define wxPG_CHOICEXADJUST           -3 // required because wxComboCtrl reserves 3pixels for wxTextCtrl's focus ring
-#define wxPG_CHOICEYADJUST           -3
-#else
-#define wxPG_CHOICEXADJUST           0
-#define wxPG_CHOICEYADJUST           0
-#endif
-
-// Number added to image width for SetCustomPaintWidth
-#define ODCB_CUST_PAINT_MARGIN               6
-
-// Milliseconds to wait for two mouse-ups after focus in order
-// to trigger a double-click.
-#define DOUBLE_CLICK_CONVERSION_TRESHOLD        500
-
-// -----------------------------------------------------------------------
-// wxPGEditor
-// -----------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxPGEditor, wxObject)
-
-
-wxPGEditor::~wxPGEditor()
-{
-}
-
-wxString wxPGEditor::GetName() const
-{
-    return GetClassInfo()->GetClassName();
-}
-
-void wxPGEditor::DrawValue( wxDC& dc, const wxRect& rect,
-                            wxPGProperty* WXUNUSED(property),
-                            const wxString& text ) const
-{
-    dc.DrawText( text, rect.x+wxPG_XBEFORETEXT, rect.y );
-}
-
-bool wxPGEditor::GetValueFromControl( wxVariant&, wxPGProperty*, wxWindow* ) const
-{
-    return false;
-}
-
-void wxPGEditor::SetControlStringValue( wxPGProperty* WXUNUSED(property), wxWindow*, const wxString& ) const
-{
-}
-
-
-void wxPGEditor::SetControlIntValue( wxPGProperty* WXUNUSED(property), wxWindow*, int ) const
-{
-}
-
-
-int wxPGEditor::InsertItem( wxWindow*, const wxString&, int ) const
-{
-    return -1;
-}
-
-
-void wxPGEditor::DeleteItem( wxWindow*, int ) const
-{
-    return;
-}
-
-
-void wxPGEditor::OnFocus( wxPGProperty*, wxWindow* ) const
-{
-}
-
-void wxPGEditor::SetControlAppearance( wxPropertyGrid* pg,
-                                       wxPGProperty* property,
-                                       wxWindow* ctrl,
-                                       const wxPGCell& cell,
-                                       const wxPGCell& oCell,
-                                       bool unspecified ) const
-{
-    // Get old editor appearance
-    wxTextCtrl* tc = NULL;
-    wxComboCtrl* cb = NULL;
-    if ( wxDynamicCast(ctrl, wxTextCtrl) )
-    {
-        tc = (wxTextCtrl*) ctrl;
-    }
-    else
-    {
-        if ( wxDynamicCast(ctrl, wxComboCtrl) )
-        {
-            cb = (wxComboCtrl*) ctrl;
-            tc = cb->GetTextCtrl();
-        }
-    }
-
-    if ( tc || cb )
-    {
-        wxString tcText;
-        bool changeText = false;
-
-        if ( cell.HasText() && !pg->IsEditorFocused() )
-        {
-            tcText = cell.GetText();
-            changeText = true;
-        }
-        else if ( oCell.HasText() )
-        {
-            tcText = property->GetValueAsString(
-                property->HasFlag(wxPG_PROP_READONLY)?0:wxPG_EDITABLE_VALUE);
-            changeText = true;
-        }
-
-        if ( changeText )
-        {
-            // This prevents value from being modified
-            if ( tc )
-            {
-                pg->SetupTextCtrlValue(tcText);
-                tc->SetValue(tcText);
-            }
-            else
-            {
-                cb->SetText(tcText);
-            }
-        }
-    }
-
-    // Do not make the mistake of calling GetClassDefaultAttributes()
-    // here. It is static, while GetDefaultAttributes() is virtual
-    // and the correct one to use.
-    wxVisualAttributes vattrs = ctrl->GetDefaultAttributes();
-
-    // Foreground colour
-    const wxColour& fgCol = cell.GetFgCol();
-    if ( fgCol.IsOk() )
-    {
-        ctrl->SetForegroundColour(fgCol);
-    }
-    else if ( oCell.GetFgCol().IsOk() )
-    {
-        ctrl->SetForegroundColour(vattrs.colFg);
-    }
-
-    // Background colour
-    const wxColour& bgCol = cell.GetBgCol();
-    if ( bgCol.IsOk() )
-    {
-        ctrl->SetBackgroundColour(bgCol);
-    }
-    else if ( oCell.GetBgCol().IsOk() )
-    {
-        ctrl->SetBackgroundColour(vattrs.colBg);
-    }
-
-    // Font
-    const wxFont& font = cell.GetFont();
-    if ( font.IsOk() )
-    {
-        ctrl->SetFont(font);
-    }
-    else if ( oCell.GetFont().IsOk() )
-    {
-        ctrl->SetFont(vattrs.font);
-    }
-
-    // Also call the old SetValueToUnspecified()
-    if ( unspecified )
-        SetValueToUnspecified(property, ctrl);
-}
-
-void wxPGEditor::SetValueToUnspecified( wxPGProperty* WXUNUSED(property),
-                                        wxWindow* WXUNUSED(ctrl) ) const
-{
-}
-
-bool wxPGEditor::CanContainCustomImage() const
-{
-    return false;
-}
-
-// -----------------------------------------------------------------------
-// wxPGTextCtrlEditor
-// -----------------------------------------------------------------------
-
-WX_PG_IMPLEMENT_INTERNAL_EDITOR_CLASS(TextCtrl,wxPGTextCtrlEditor,wxPGEditor)
-
-
-wxPGWindowList wxPGTextCtrlEditor::CreateControls( wxPropertyGrid* propGrid,
-                                                   wxPGProperty* property,
-                                                   const wxPoint& pos,
-                                                   const wxSize& sz ) const
-{
-    wxString text;
-
-    //
-    // If has children, and limited editing is specified, then don't create.
-    if ( (property->GetFlags() & wxPG_PROP_NOEDITOR) &&
-         property->GetChildCount() )
-        return NULL;
-
-    int argFlags = 0;
-    if ( !property->HasFlag(wxPG_PROP_READONLY) &&
-         !property->IsValueUnspecified() )
-        argFlags |= wxPG_EDITABLE_VALUE;
-    text = property->GetValueAsString(argFlags);
-
-    int flags = 0;
-    if ( (property->GetFlags() & wxPG_PROP_PASSWORD) &&
-         wxDynamicCast(property, wxStringProperty) )
-        flags |= wxTE_PASSWORD;
-
-    wxWindow* wnd = propGrid->GenerateEditorTextCtrl(pos,sz,text,NULL,flags,
-                                                     property->GetMaxLength());
-
-    return wnd;
-}
-
-#if 0
-void wxPGTextCtrlEditor::DrawValue( wxDC& dc, wxPGProperty* property, const wxRect& rect ) const
-{
-    if ( !property->IsValueUnspecified() )
-    {
-        wxString drawStr = property->GetDisplayedString();
-
-        // Code below should no longer be needed, as the obfuscation
-        // is now done in GetValueAsString.
-        /*if ( (property->GetFlags() & wxPG_PROP_PASSWORD) &&
-             property->IsKindOf(WX_PG_CLASSINFO(wxStringProperty)) )
-        {
-            size_t a = drawStr.length();
-            drawStr.Empty();
-            drawStr.Append(wxS('*'),a);
-        }*/
-        dc.DrawText( drawStr, rect.x+wxPG_XBEFORETEXT, rect.y );
-    }
-}
-#endif
-
-void wxPGTextCtrlEditor::UpdateControl( wxPGProperty* property, wxWindow* ctrl ) const
-{
-    wxTextCtrl* tc = wxDynamicCast(ctrl, wxTextCtrl);
-    if (!tc) return;
-
-    wxString s;
-
-    if ( tc->HasFlag(wxTE_PASSWORD) )
-        s = property->GetValueAsString(wxPG_FULL_VALUE);
-    else
-        s = property->GetDisplayedString();
-
-    wxPropertyGrid* pg = property->GetGrid();
-
-    pg->SetupTextCtrlValue(s);
-    tc->SetValue(s);
-
-    //
-    // Fix indentation, just in case (change in font boldness is one good
-    // reason).
-    tc->SetMargins(0);
-}
-
-// Provided so that, for example, ComboBox editor can use the same code
-// (multiple inheritance would get way too messy).
-bool wxPGTextCtrlEditor::OnTextCtrlEvent( wxPropertyGrid* propGrid,
-                                          wxPGProperty* WXUNUSED(property),
-                                          wxWindow* ctrl,
-                                          wxEvent& event )
-{
-    if ( !ctrl )
-        return false;
-
-    if ( event.GetEventType() == wxEVT_TEXT_ENTER )
-    {
-        if ( propGrid->IsEditorsValueModified() )
-        {
-            return true;
-        }
-    }
-    else if ( event.GetEventType() == wxEVT_TEXT )
-    {
-        //
-        // Pass this event outside wxPropertyGrid so that,
-        // if necessary, program can tell when user is editing
-        // a textctrl.
-        // FIXME: Is it safe to change event id in the middle of event
-        //        processing (seems to work, but...)?
-        event.Skip();
-        event.SetId(propGrid->GetId());
-
-        propGrid->EditorsValueWasModified();
-    }
-    return false;
-}
-
-
-bool wxPGTextCtrlEditor::OnEvent( wxPropertyGrid* propGrid,
-                                  wxPGProperty* property,
-                                  wxWindow* ctrl,
-                                  wxEvent& event ) const
-{
-    return wxPGTextCtrlEditor::OnTextCtrlEvent(propGrid,property,ctrl,event);
-}
-
-
-bool wxPGTextCtrlEditor::GetTextCtrlValueFromControl( wxVariant& variant, wxPGProperty* property, wxWindow* ctrl )
-{
-    wxTextCtrl* tc = wxStaticCast(ctrl, wxTextCtrl);
-    wxString textVal = tc->GetValue();
-
-    if ( property->UsesAutoUnspecified() && textVal.empty() )
-    {
-        variant.MakeNull();
-        return true;
-    }
-
-    bool res = property->StringToValue(variant, textVal, wxPG_EDITABLE_VALUE);
-
-    // Changing unspecified always causes event (returning
-    // true here should be enough to trigger it).
-    // TODO: Move to propgrid.cpp
-    if ( !res && variant.IsNull() )
-        res = true;
-
-    return res;
-}
-
-
-bool wxPGTextCtrlEditor::GetValueFromControl( wxVariant& variant, wxPGProperty* property, wxWindow* ctrl ) const
-{
-    return wxPGTextCtrlEditor::GetTextCtrlValueFromControl(variant, property, ctrl);
-}
-
-
-void wxPGTextCtrlEditor::SetControlStringValue( wxPGProperty* property, wxWindow* ctrl, const wxString& txt ) const
-{
-    wxTextCtrl* tc = wxStaticCast(ctrl, wxTextCtrl);
-
-    wxPropertyGrid* pg = property->GetGrid();
-    wxASSERT(pg);  // Really, property grid should exist if editor does
-    if ( pg )
-    {
-        pg->SetupTextCtrlValue(txt);
-        tc->SetValue(txt);
-    }
-}
-
-
-void wxPGTextCtrlEditor_OnFocus( wxPGProperty* property,
-                                 wxTextCtrl* tc )
-{
-    // Make sure there is correct text (instead of unspecified value
-    // indicator or hint text)
-    int flags = property->HasFlag(wxPG_PROP_READONLY) ?
-        0 : wxPG_EDITABLE_VALUE;
-    wxString correctText = property->GetValueAsString(flags);
-
-    if ( tc->GetValue() != correctText )
-    {
-        property->GetGrid()->SetupTextCtrlValue(correctText);
-        tc->SetValue(correctText);
-    }
-
-    tc->SelectAll();
-}
-
-void wxPGTextCtrlEditor::OnFocus( wxPGProperty* property,
-                                  wxWindow* wnd ) const
-{
-    wxTextCtrl* tc = wxStaticCast(wnd, wxTextCtrl);
-    wxPGTextCtrlEditor_OnFocus(property, tc);
-}
-
-wxPGTextCtrlEditor::~wxPGTextCtrlEditor()
-{
-    // Reset the global pointer. Useful when wxPropertyGrid is accessed
-    // from an external main loop.
-    wxPG_EDITOR(TextCtrl) = NULL;
-}
-
-
-// -----------------------------------------------------------------------
-// wxPGChoiceEditor
-// -----------------------------------------------------------------------
-
-
-WX_PG_IMPLEMENT_INTERNAL_EDITOR_CLASS(Choice,wxPGChoiceEditor,wxPGEditor)
-
-
-// This is a special enhanced double-click processor class.
-// In essence, it allows for double-clicks for which the
-// first click "created" the control.
-class wxPGDoubleClickProcessor : public wxEvtHandler
-{
-public:
-
-    wxPGDoubleClickProcessor( wxOwnerDrawnComboBox* combo, wxPGProperty* property )
-        : wxEvtHandler()
-    {
-        m_timeLastMouseUp = 0;
-        m_combo = combo;
-        m_property = property;
-        m_downReceived = false;
-    }
-
-protected:
-
-    void OnMouseEvent( wxMouseEvent& event )
-    {
-        wxLongLong t = ::wxGetLocalTimeMillis();
-        int evtType = event.GetEventType();
-
-        if ( m_property->HasFlag(wxPG_PROP_USE_DCC) &&
-             wxDynamicCast(m_property, wxBoolProperty) &&
-             !m_combo->IsPopupShown() )
-        {
-            // Just check that it is in the text area
-            wxPoint pt = event.GetPosition();
-            if ( m_combo->GetTextRect().Contains(pt) )
-            {
-                if ( evtType == wxEVT_LEFT_DOWN )
-                {
-                    // Set value to avoid up-events without corresponding downs
-                    m_downReceived = true;
-                }
-                else if ( evtType == wxEVT_LEFT_DCLICK )
-                {
-                    // We'll make our own double-clicks
-                    event.SetEventType(0);
-                    return;
-                }
-                else if ( evtType == wxEVT_LEFT_UP )
-                {
-                    if ( m_downReceived || m_timeLastMouseUp == 1 )
-                    {
-                        wxLongLong timeFromLastUp = (t-m_timeLastMouseUp);
-
-                        if ( timeFromLastUp < DOUBLE_CLICK_CONVERSION_TRESHOLD )
-                        {
-                            event.SetEventType(wxEVT_LEFT_DCLICK);
-                            m_timeLastMouseUp = 1;
-                        }
-                        else
-                        {
-                            m_timeLastMouseUp = t;
-                        }
-                    }
-                }
-            }
-        }
-
-        event.Skip();
-    }
-
-    void OnSetFocus( wxFocusEvent& event )
-    {
-        m_timeLastMouseUp = ::wxGetLocalTimeMillis();
-        event.Skip();
-    }
-
-private:
-    wxLongLong                  m_timeLastMouseUp;
-    wxOwnerDrawnComboBox*       m_combo;
-    wxPGProperty*               m_property;  // Selected property
-    bool                        m_downReceived;
-
-    DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(wxPGDoubleClickProcessor, wxEvtHandler)
-    EVT_MOUSE_EVENTS(wxPGDoubleClickProcessor::OnMouseEvent)
-    EVT_SET_FOCUS(wxPGDoubleClickProcessor::OnSetFocus)
-END_EVENT_TABLE()
-
-
-
-class wxPGComboBox : public wxOwnerDrawnComboBox
-{
-public:
-
-    wxPGComboBox()
-        : wxOwnerDrawnComboBox()
-    {
-        m_dclickProcessor = NULL;
-        m_sizeEventCalled = false;
-    }
-
-    ~wxPGComboBox()
-    {
-        if ( m_dclickProcessor )
-        {
-            RemoveEventHandler(m_dclickProcessor);
-            delete m_dclickProcessor;
-        }
-    }
-
-    bool Create(wxWindow *parent,
-                wxWindowID id,
-                const wxString& value,
-                const wxPoint& pos,
-                const wxSize& size,
-                const wxArrayString& choices,
-                long style = 0,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString& name = wxS("wxOwnerDrawnComboBox"))
-    {
-        if ( !wxOwnerDrawnComboBox::Create( parent,
-                                            id,
-                                            value,
-                                            pos,
-                                            size,
-                                            choices,
-                                            style,
-                                            validator,
-                                            name ) )
-            return false;
-
-        m_dclickProcessor = new
-            wxPGDoubleClickProcessor( this, GetGrid()->GetSelection() );
-
-        PushEventHandler(m_dclickProcessor);
-
-        return true;
-    }
-
-    virtual void OnDrawItem( wxDC& dc,
-                             const wxRect& rect,
-                             int item,
-                             int flags ) const
-    {
-        wxPropertyGrid* pg = GetGrid();
-
-        // Handle hint text via super class
-        if ( (flags & wxODCB_PAINTING_CONTROL) &&
-             ShouldUseHintText(flags) )
-        {
-            wxOwnerDrawnComboBox::OnDrawItem(dc, rect, item, flags);
-        }
-        else
-        {
-            pg->OnComboItemPaint( this, item, &dc, (wxRect&)rect, flags );
-        }
-    }
-
-    virtual wxCoord OnMeasureItem( size_t item ) const
-    {
-        wxPropertyGrid* pg = GetGrid();
-        wxRect rect;
-        rect.x = -1;
-        rect.width = 0;
-        pg->OnComboItemPaint( this, item, NULL, rect, 0 );
-        return rect.height;
-    }
-
-    wxPropertyGrid* GetGrid() const
-    {
-        wxPropertyGrid* pg = wxDynamicCast(GetParent(),
-                                           wxPropertyGrid);
-        wxASSERT(pg);
-        return pg;
-    }
-
-    virtual wxCoord OnMeasureItemWidth( size_t item ) const
-    {
-        wxPropertyGrid* pg = GetGrid();
-        wxRect rect;
-        rect.x = -1;
-        rect.width = -1;
-        pg->OnComboItemPaint( this, item, NULL, rect, 0 );
-        return rect.width;
-    }
-
-    virtual void PositionTextCtrl( int textCtrlXAdjust,
-                                   int WXUNUSED(textCtrlYAdjust) )
-    {
-        wxPropertyGrid* pg = GetGrid();
-    #ifdef wxPG_TEXTCTRLXADJUST
-        textCtrlXAdjust = wxPG_TEXTCTRLXADJUST -
-                          (wxPG_XBEFOREWIDGET+wxPG_CONTROL_MARGIN+1) - 1,
-    #endif
-        wxOwnerDrawnComboBox::PositionTextCtrl(
-            textCtrlXAdjust,
-            pg->GetSpacingY() + 2
-        );
-    }
-
-private:
-    wxPGDoubleClickProcessor*   m_dclickProcessor;
-    bool                        m_sizeEventCalled;
-};
-
-
-void wxPropertyGrid::OnComboItemPaint( const wxPGComboBox* pCb,
-                                       int item,
-                                       wxDC* pDc,
-                                       wxRect& rect,
-                                       int flags )
-{
-    wxPGProperty* p = GetSelection();
-    wxString text;
-
-    const wxPGChoices& choices = p->GetChoices();
-    const wxPGCommonValue* comVal = NULL;
-    int comVals = p->GetDisplayedCommonValueCount();
-    int comValIndex = -1;
-
-    int choiceCount = 0;
-    if ( choices.IsOk() )
-        choiceCount = choices.GetCount();
-
-    if ( item >= choiceCount && comVals > 0 )
-    {
-        comValIndex = item - choiceCount;
-        comVal = GetCommonValue(comValIndex);
-        if ( !p->IsValueUnspecified() )
-            text = comVal->GetLabel();
-    }
-    else
-    {
-        if ( !(flags & wxODCB_PAINTING_CONTROL) )
-        {
-            text = pCb->GetString(item);
-        }
-        else
-        {
-            if ( !p->IsValueUnspecified() )
-                text = p->GetValueAsString(0);
-        }
-    }
-
-    if ( item < 0 )
-        return;
-
-    wxSize cis;
-
-    const wxBitmap* itemBitmap = NULL;
-
-    if ( item >= 0 && choices.IsOk() && choices.Item(item).GetBitmap().IsOk() && comValIndex == -1 )
-        itemBitmap = &choices.Item(item).GetBitmap();
-
-    //
-    // Decide what custom image size to use
-    if ( itemBitmap )
-    {
-        cis.x = itemBitmap->GetWidth();
-        cis.y = itemBitmap->GetHeight();
-    }
-    else
-    {
-        cis = GetImageSize(p, item);
-    }
-
-    if ( rect.x < 0 )
-    {
-        // Default measure behaviour (no flexible, custom paint image only)
-        if ( rect.width < 0 )
-        {
-            wxCoord x, y;
-            pCb->GetTextExtent(text, &x, &y, 0, 0);
-            rect.width = cis.x + wxCC_CUSTOM_IMAGE_MARGIN1 + wxCC_CUSTOM_IMAGE_MARGIN2 + 9 + x;
-        }
-
-        rect.height = cis.y + 2;
-        return;
-    }
-
-    wxPGPaintData paintdata;
-    paintdata.m_parent = NULL;
-    paintdata.m_choiceItem = item;
-
-    // This is by the current (1.0.0b) spec - if painting control, item is -1
-    if ( (flags & wxODCB_PAINTING_CONTROL) )
-        paintdata.m_choiceItem = -1;
-
-    if ( pDc )
-        pDc->SetBrush(*wxWHITE_BRUSH);
-
-    wxPGCellRenderer* renderer = NULL;
-    const wxPGChoiceEntry* cell = NULL;
-
-    if ( rect.x >= 0 )
-    {
-        //
-        // DrawItem call
-        wxDC& dc = *pDc;
-
-        wxPoint pt(rect.x + wxPG_CONTROL_MARGIN - wxPG_CHOICEXADJUST - 1,
-                   rect.y + 1);
-
-        int renderFlags = wxPGCellRenderer::DontUseCellColours;
-        bool useCustomPaintProcedure;
-
-        // If custom image had some size, we will start from the assumption
-        // that custom paint procedure is required
-        if ( cis.x > 0 )
-            useCustomPaintProcedure = true;
-        else
-            useCustomPaintProcedure = false;
-
-        if ( flags & wxODCB_PAINTING_SELECTED )
-            renderFlags |= wxPGCellRenderer::Selected;
-
-        if ( flags & wxODCB_PAINTING_CONTROL )
-        {
-            renderFlags |= wxPGCellRenderer::Control;
-
-            // If wxPG_PROP_CUSTOMIMAGE was set, then that means any custom
-            // image will not appear on the control row (it may be too
-            // large to fit, for instance). Also do not draw custom image
-            // if no choice was selected.
-            if ( !p->HasFlag(wxPG_PROP_CUSTOMIMAGE) || item < 0 )
-                useCustomPaintProcedure = false;
-        }
-        else
-        {
-            renderFlags |= wxPGCellRenderer::ChoicePopup;
-
-            // For consistency, always use normal font when drawing drop down
-            // items
-            dc.SetFont(GetFont());
-        }
-
-        // If not drawing a selected popup item, then give property's
-        // m_valueBitmap a chance.
-        if ( p->m_valueBitmap && item != pCb->GetSelection() )
-            useCustomPaintProcedure = false;
-        // If current choice had a bitmap set by the application, then
-        // use it instead of any custom paint procedure.
-        else if ( itemBitmap )
-            useCustomPaintProcedure = false;
-
-        if ( useCustomPaintProcedure )
-        {
-            pt.x += wxCC_CUSTOM_IMAGE_MARGIN1;
-            wxRect r(pt.x,pt.y,cis.x,cis.y);
-
-            if ( flags & wxODCB_PAINTING_CONTROL )
-            {
-                //r.width = cis.x;
-                r.height = wxPG_STD_CUST_IMAGE_HEIGHT(m_lineHeight);
-            }
-
-            paintdata.m_drawnWidth = r.width;
-
-            dc.SetPen(m_colPropFore);
-            if ( comValIndex >= 0 )
-            {
-                const wxPGCommonValue* cv = GetCommonValue(comValIndex);
-                renderer = cv->GetRenderer();
-                r.width = rect.width;
-                renderer->Render( dc, r, this, p, m_selColumn, comValIndex, renderFlags );
-                return;
-            }
-            else if ( item >= 0 )
-            {
-                p->OnCustomPaint( dc, r, paintdata );
-            }
-            else
-            {
-                dc.DrawRectangle( r );
-            }
-
-            pt.x += paintdata.m_drawnWidth + wxCC_CUSTOM_IMAGE_MARGIN2 - 1;
-        }
-        else
-        {
-            // TODO: This aligns text so that it seems to be horizontally
-            //       on the same line as property values. Not really
-            //       sure if its needed, but seems to not cause any harm.
-            pt.x -= 1;
-
-            if ( item < 0 && (flags & wxODCB_PAINTING_CONTROL) )
-                item = pCb->GetSelection();
-
-            if ( choices.IsOk() && item >= 0 && comValIndex < 0 )
-            {
-                cell = &choices.Item(item);
-                renderer = wxPGGlobalVars->m_defaultRenderer;
-                int imageOffset = renderer->PreDrawCell(dc, rect, *cell,
-                                                        renderFlags );
-                if ( imageOffset )
-                    imageOffset += wxCC_CUSTOM_IMAGE_MARGIN1 +
-                                   wxCC_CUSTOM_IMAGE_MARGIN2;
-                pt.x += imageOffset;
-            }
-        }
-
-        //
-        // Draw text
-        //
-
-        pt.y += (rect.height-m_fontHeight)/2 - 1;
-
-        pt.x += 1;
-
-        dc.DrawText( text, pt.x + wxPG_XBEFORETEXT, pt.y );
-
-        if ( renderer )
-            renderer->PostDrawCell(dc, this, *cell, renderFlags);
-    }
-    else
-    {
-        //
-        // MeasureItem call
-        wxDC& dc = *pDc;
-
-        p->OnCustomPaint( dc, rect, paintdata );
-        rect.height = paintdata.m_drawnHeight + 2;
-        rect.width = cis.x + wxCC_CUSTOM_IMAGE_MARGIN1 + wxCC_CUSTOM_IMAGE_MARGIN2 + 9;
-    }
-}
-
-bool wxPGChoiceEditor_SetCustomPaintWidth( wxPropertyGrid* propGrid, wxPGComboBox* cb, int cmnVal )
-{
-    wxPGProperty* property = propGrid->GetSelectedProperty();
-    wxASSERT( property );
-
-    wxSize imageSize;
-    bool res;
-
-    // TODO: Do this always when cell has custom text.
-    if ( property->IsValueUnspecified() )
-    {
-        cb->SetCustomPaintWidth( 0 );
-        return true;
-    }
-
-    if ( cmnVal >= 0 )
-    {
-        // Yes, a common value is being selected
-        property->SetCommonValue( cmnVal );
-        imageSize = propGrid->GetCommonValue(cmnVal)->
-                            GetRenderer()->GetImageSize(property, 1, cmnVal);
-        res = false;
-    }
-    else
-    {
-        imageSize = propGrid->GetImageSize(property, -1);
-        res = true;
-    }
-
-    if ( imageSize.x )
-        imageSize.x += ODCB_CUST_PAINT_MARGIN;
-    cb->SetCustomPaintWidth( imageSize.x );
-
-    return res;
-}
-
-// CreateControls calls this with CB_READONLY in extraStyle
-wxWindow* wxPGChoiceEditor::CreateControlsBase( wxPropertyGrid* propGrid,
-                                                wxPGProperty* property,
-                                                const wxPoint& pos,
-                                                const wxSize& sz,
-                                                long extraStyle ) const
-{
-    // Since it is not possible (yet) to create a read-only combo box in
-    // the same sense that wxTextCtrl is read-only, simply do not create
-    // the control in this case.
-    if ( property->HasFlag(wxPG_PROP_READONLY) )
-        return NULL;
-
-    const wxPGChoices& choices = property->GetChoices();
-    wxString defString;
-    int index = property->GetChoiceSelection();
-
-    int argFlags = 0;
-    if ( !property->HasFlag(wxPG_PROP_READONLY) &&
-         !property->IsValueUnspecified() )
-        argFlags |= wxPG_EDITABLE_VALUE;
-    defString = property->GetValueAsString(argFlags);
-
-    wxArrayString labels = choices.GetLabels();
-
-    wxPGComboBox* cb;
-
-    wxPoint po(pos);
-    wxSize si(sz);
-    po.y += wxPG_CHOICEYADJUST;
-    si.y -= (wxPG_CHOICEYADJUST*2);
-
-    po.x += wxPG_CHOICEXADJUST;
-    si.x -= wxPG_CHOICEXADJUST;
-    wxWindow* ctrlParent = propGrid->GetPanel();
-
-    int odcbFlags = extraStyle | wxBORDER_NONE | wxTE_PROCESS_ENTER;
-
-    if ( (property->GetFlags() & wxPG_PROP_USE_DCC) &&
-         wxDynamicCast(property, wxBoolProperty) )
-        odcbFlags |= wxODCB_DCLICK_CYCLES;
-
-    //
-    // If common value specified, use appropriate index
-    unsigned int cmnVals = property->GetDisplayedCommonValueCount();
-    if ( cmnVals )
-    {
-        if ( !property->IsValueUnspecified() )
-        {
-            int cmnVal = property->GetCommonValue();
-            if ( cmnVal >= 0 )
-            {
-                index = labels.size() + cmnVal;
-            }
-        }
-
-        unsigned int i;
-        for ( i=0; iGetCommonValueLabel(i));
-    }
-
-    cb = new wxPGComboBox();
-#ifdef __WXMSW__
-    cb->Hide();
-#endif
-    cb->Create(ctrlParent,
-               wxPG_SUBID1,
-               wxString(),
-               po,
-               si,
-               labels,
-               odcbFlags);
-
-    cb->SetButtonPosition(si.y,0,wxRIGHT);
-    cb->SetMargins(wxPG_XBEFORETEXT-1);
-
-    // Set hint text
-    cb->SetHint(property->GetHintText());
-
-    wxPGChoiceEditor_SetCustomPaintWidth( propGrid, cb,
-                                          property->GetCommonValue() );
-
-    if ( index >= 0 && index < (int)cb->GetCount() )
-    {
-        cb->SetSelection( index );
-        if ( !defString.empty() )
-            cb->SetText( defString );
-    }
-    else if ( !(extraStyle & wxCB_READONLY) && !defString.empty() )
-    {
-        propGrid->SetupTextCtrlValue(defString);
-        cb->SetValue( defString );
-    }
-    else
-    {
-        cb->SetSelection( -1 );
-    }
-
-#ifdef __WXMSW__
-    cb->Show();
-#endif
-
-    return (wxWindow*) cb;
-}
-
-
-void wxPGChoiceEditor::UpdateControl( wxPGProperty* property, wxWindow* ctrl ) const
-{
-    wxASSERT( ctrl );
-    wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*)ctrl;
-    wxASSERT( wxDynamicCast(cb, wxOwnerDrawnComboBox));
-    int ind = property->GetChoiceSelection();
-    cb->SetSelection(ind);
-}
-
-wxPGWindowList wxPGChoiceEditor::CreateControls( wxPropertyGrid* propGrid, wxPGProperty* property,
-        const wxPoint& pos, const wxSize& sz ) const
-{
-    return CreateControlsBase(propGrid,property,pos,sz,wxCB_READONLY);
-}
-
-
-int wxPGChoiceEditor::InsertItem( wxWindow* ctrl, const wxString& label, int index ) const
-{
-    wxASSERT( ctrl );
-    wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*)ctrl;
-    wxASSERT( wxDynamicCast(cb, wxOwnerDrawnComboBox));
-
-    if (index < 0)
-        index = cb->GetCount();
-
-    return cb->Insert(label,index);
-}
-
-
-void wxPGChoiceEditor::DeleteItem( wxWindow* ctrl, int index ) const
-{
-    wxASSERT( ctrl );
-    wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*)ctrl;
-    wxASSERT( wxDynamicCast(cb, wxOwnerDrawnComboBox));
-
-    cb->Delete(index);
-}
-
-bool wxPGChoiceEditor::OnEvent( wxPropertyGrid* propGrid, wxPGProperty* property,
-    wxWindow* ctrl, wxEvent& event ) const
-{
-    if ( event.GetEventType() == wxEVT_COMBOBOX )
-    {
-        wxPGComboBox* cb = (wxPGComboBox*)ctrl;
-        int index = cb->GetSelection();
-        int cmnValIndex = -1;
-        int cmnVals = property->GetDisplayedCommonValueCount();
-        int items = cb->GetCount();
-
-        if ( index >= (items-cmnVals) )
-        {
-            // Yes, a common value is being selected
-            cmnValIndex = index - (items-cmnVals);
-            property->SetCommonValue( cmnValIndex );
-
-            // Truly set value to unspecified?
-            if ( propGrid->GetUnspecifiedCommonValue() == cmnValIndex )
-            {
-                if ( !property->IsValueUnspecified() )
-                    propGrid->SetInternalFlag(wxPG_FL_VALUE_CHANGE_IN_EVENT);
-                property->SetValueToUnspecified();
-                if ( !cb->HasFlag(wxCB_READONLY) )
-                {
-                    wxString unspecValueText;
-                    unspecValueText = propGrid->GetUnspecifiedValueText();
-                    propGrid->SetupTextCtrlValue(unspecValueText);
-                    cb->GetTextCtrl()->SetValue(unspecValueText);
-                }
-                return false;
-            }
-        }
-        return wxPGChoiceEditor_SetCustomPaintWidth( propGrid, cb, cmnValIndex );
-    }
-    return false;
-}
-
-
-bool wxPGChoiceEditor::GetValueFromControl( wxVariant& variant, wxPGProperty* property, wxWindow* ctrl ) const
-{
-    wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*)ctrl;
-
-    int index = cb->GetSelection();
-
-    if ( index != property->GetChoiceSelection() ||
-        // Changing unspecified always causes event (returning
-        // true here should be enough to trigger it).
-         property->IsValueUnspecified()
-       )
-    {
-        return property->IntToValue(variant, index, wxPG_PROPERTY_SPECIFIC);
-    }
-    return false;
-}
-
-
-void wxPGChoiceEditor::SetControlStringValue( wxPGProperty* property,
-                                              wxWindow* ctrl,
-                                              const wxString& txt ) const
-{
-    wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*)ctrl;
-    wxASSERT( cb );
-    property->GetGrid()->SetupTextCtrlValue(txt);
-    cb->SetValue(txt);
-}
-
-
-void wxPGChoiceEditor::SetControlIntValue( wxPGProperty* WXUNUSED(property), wxWindow* ctrl, int value ) const
-{
-    wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*)ctrl;
-    wxASSERT( cb );
-    cb->SetSelection(value);
-}
-
-
-void wxPGChoiceEditor::SetValueToUnspecified( wxPGProperty* WXUNUSED(property),
-                                              wxWindow* ctrl ) const
-{
-    wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*)ctrl;
-
-    if ( cb->HasFlag(wxCB_READONLY) )
-        cb->SetSelection(-1);
-}
-
-
-bool wxPGChoiceEditor::CanContainCustomImage() const
-{
-    return true;
-}
-
-
-wxPGChoiceEditor::~wxPGChoiceEditor()
-{
-    wxPG_EDITOR(Choice) = NULL;
-}
-
-
-// -----------------------------------------------------------------------
-// wxPGComboBoxEditor
-// -----------------------------------------------------------------------
-
-
-WX_PG_IMPLEMENT_INTERNAL_EDITOR_CLASS(ComboBox,
-                                      wxPGComboBoxEditor,
-                                      wxPGChoiceEditor)
-
-
-void wxPGComboBoxEditor::UpdateControl( wxPGProperty* property, wxWindow* ctrl ) const
-{
-    wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*)ctrl;
-    wxString s = property->GetValueAsString(wxPG_EDITABLE_VALUE);
-    property->GetGrid()->SetupTextCtrlValue(s);
-    cb->SetValue(s);
-
-    // TODO: If string matches any selection, then select that.
-}
-
-
-wxPGWindowList wxPGComboBoxEditor::CreateControls( wxPropertyGrid* propGrid,
-                                                   wxPGProperty* property,
-                                                   const wxPoint& pos,
-                                                   const wxSize& sz ) const
-{
-    return CreateControlsBase(propGrid,property,pos,sz,0);
-}
-
-
-bool wxPGComboBoxEditor::OnEvent( wxPropertyGrid* propGrid,
-                                  wxPGProperty* property,
-                                  wxWindow* ctrl,
-                                  wxEvent& event ) const
-{
-    wxOwnerDrawnComboBox* cb = NULL;
-    wxWindow* textCtrl = NULL;
-
-    if ( ctrl )
-    {
-        cb = (wxOwnerDrawnComboBox*)ctrl;
-        textCtrl = cb->GetTextCtrl();
-    }
-
-    if ( wxPGTextCtrlEditor::OnTextCtrlEvent(propGrid,property,textCtrl,event) )
-        return true;
-
-    return wxPGChoiceEditor::OnEvent(propGrid,property,ctrl,event);
-}
-
-
-bool wxPGComboBoxEditor::GetValueFromControl( wxVariant& variant, wxPGProperty* property, wxWindow* ctrl ) const
-{
-    wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*)ctrl;
-    wxString textVal = cb->GetValue();
-
-    if ( property->UsesAutoUnspecified() && textVal.empty() )
-    {
-        variant.MakeNull();
-        return true;
-    }
-
-    bool res = property->StringToValue(variant, textVal, wxPG_EDITABLE_VALUE|wxPG_PROPERTY_SPECIFIC);
-
-    // Changing unspecified always causes event (returning
-    // true here should be enough to trigger it).
-    if ( !res && variant.IsNull() )
-        res = true;
-
-    return res;
-}
-
-
-void wxPGComboBoxEditor::OnFocus( wxPGProperty* property,
-                                  wxWindow* ctrl ) const
-{
-    wxOwnerDrawnComboBox* cb = (wxOwnerDrawnComboBox*)ctrl;
-    wxPGTextCtrlEditor_OnFocus(property, cb->GetTextCtrl());
-}
-
-
-wxPGComboBoxEditor::~wxPGComboBoxEditor()
-{
-    wxPG_EDITOR(ComboBox) = NULL;
-}
-
-
-
-// -----------------------------------------------------------------------
-// wxPGChoiceAndButtonEditor
-// -----------------------------------------------------------------------
-
-
-WX_PG_IMPLEMENT_INTERNAL_EDITOR_CLASS(ChoiceAndButton,
-                                      wxPGChoiceAndButtonEditor,
-                                      wxPGChoiceEditor)
-
-
-wxPGWindowList wxPGChoiceAndButtonEditor::CreateControls( wxPropertyGrid* propGrid,
-                                                          wxPGProperty* property,
-                                                          const wxPoint& pos,
-                                                          const wxSize& sz ) const
-{
-    // Use one two units smaller to match size of the combo's dropbutton.
-    // (normally a bigger button is used because it looks better)
-    int bt_wid = sz.y;
-    bt_wid -= 2;
-    wxSize bt_sz(bt_wid,bt_wid);
-
-    // Position of button.
-    wxPoint bt_pos(pos.x+sz.x-bt_sz.x,pos.y);
-#ifdef __WXMAC__
-    bt_pos.y -= 1;
-#else
-    bt_pos.y += 1;
-#endif
-
-    wxWindow* bt = propGrid->GenerateEditorButton( bt_pos, bt_sz );
-
-    // Size of choice.
-    wxSize ch_sz(sz.x-bt->GetSize().x,sz.y);
-
-#ifdef __WXMAC__
-    ch_sz.x -= wxPG_TEXTCTRL_AND_BUTTON_SPACING;
-#endif
-
-    wxWindow* ch = wxPGEditor_Choice->CreateControls(propGrid,property,
-        pos,ch_sz).m_primary;
-
-#ifdef __WXMSW__
-    bt->Show();
-#endif
-
-    return wxPGWindowList(ch, bt);
-}
-
-
-wxPGChoiceAndButtonEditor::~wxPGChoiceAndButtonEditor()
-{
-    wxPG_EDITOR(ChoiceAndButton) = NULL;
-}
-
-// -----------------------------------------------------------------------
-// wxPGTextCtrlAndButtonEditor
-// -----------------------------------------------------------------------
-
-WX_PG_IMPLEMENT_INTERNAL_EDITOR_CLASS(TextCtrlAndButton,
-                                      wxPGTextCtrlAndButtonEditor,
-                                      wxPGTextCtrlEditor)
-
-
-wxPGWindowList wxPGTextCtrlAndButtonEditor::CreateControls( wxPropertyGrid* propGrid,
-                                                            wxPGProperty* property,
-                                                            const wxPoint& pos,
-                                                            const wxSize& sz ) const
-{
-    wxWindow* wnd2;
-    wxWindow* wnd = propGrid->GenerateEditorTextCtrlAndButton( pos, sz, &wnd2,
-        property->GetFlags() & wxPG_PROP_NOEDITOR, property);
-
-    return wxPGWindowList(wnd, wnd2);
-}
-
-
-wxPGTextCtrlAndButtonEditor::~wxPGTextCtrlAndButtonEditor()
-{
-    wxPG_EDITOR(TextCtrlAndButton) = NULL;
-}
-
-// -----------------------------------------------------------------------
-// wxPGCheckBoxEditor
-// -----------------------------------------------------------------------
-
-#if wxPG_INCLUDE_CHECKBOX
-
-WX_PG_IMPLEMENT_INTERNAL_EDITOR_CLASS(CheckBox,
-                                      wxPGCheckBoxEditor,
-                                      wxPGEditor)
-
-
-// Check box state flags
-enum
-{
-    wxSCB_STATE_UNCHECKED   = 0,
-    wxSCB_STATE_CHECKED     = 1,
-    wxSCB_STATE_BOLD        = 2,
-    wxSCB_STATE_UNSPECIFIED = 4
-};
-
-const int wxSCB_SETVALUE_CYCLE = 2;
-
-
-static void DrawSimpleCheckBox( wxDC& dc, const wxRect& rect, int box_hei,
-                                int state )
-{
-    // Box rectangle.
-    wxRect r(rect.x+wxPG_XBEFORETEXT,rect.y+((rect.height-box_hei)/2),
-             box_hei,box_hei);
-    wxColour useCol = dc.GetTextForeground();
-
-    if ( state & wxSCB_STATE_UNSPECIFIED )
-    {
-        useCol = wxColour(220, 220, 220);
-    }
-
-    // Draw check mark first because it is likely to overdraw the
-    // surrounding rectangle.
-    if ( state & wxSCB_STATE_CHECKED )
-    {
-        wxRect r2(r.x+wxPG_CHECKMARK_XADJ,
-                  r.y+wxPG_CHECKMARK_YADJ,
-                  r.width+wxPG_CHECKMARK_WADJ,
-                  r.height+wxPG_CHECKMARK_HADJ);
-    #if wxPG_CHECKMARK_DEFLATE
-        r2.Deflate(wxPG_CHECKMARK_DEFLATE);
-    #endif
-        dc.DrawCheckMark(r2);
-
-        // This would draw a simple cross check mark.
-        // dc.DrawLine(r.x,r.y,r.x+r.width-1,r.y+r.height-1);
-        // dc.DrawLine(r.x,r.y+r.height-1,r.x+r.width-1,r.y);
-    }
-
-    if ( !(state & wxSCB_STATE_BOLD) )
-    {
-        // Pen for thin rectangle.
-        dc.SetPen(useCol);
-    }
-    else
-    {
-        // Pen for bold rectangle.
-        wxPen linepen(useCol,2,wxSOLID);
-        linepen.SetJoin(wxJOIN_MITER); // This prevents round edges.
-        dc.SetPen(linepen);
-        r.x++;
-        r.y++;
-        r.width--;
-        r.height--;
-    }
-
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-
-    dc.DrawRectangle(r);
-    dc.SetPen(*wxTRANSPARENT_PEN);
-}
-
-//
-// Real simple custom-drawn checkbox-without-label class.
-//
-class wxSimpleCheckBox : public wxControl
-{
-public:
-
-    void SetValue( int value );
-
-    wxSimpleCheckBox( wxWindow* parent,
-                      wxWindowID id,
-                      const wxPoint& pos = wxDefaultPosition,
-                      const wxSize& size = wxDefaultSize )
-        : wxControl(parent,id,pos,size,wxBORDER_NONE|wxWANTS_CHARS)
-    {
-        // Due to SetOwnFont stuff necessary for GTK+ 1.2, we need to have this
-        SetFont( parent->GetFont() );
-
-        m_state = 0;
-        m_boxHeight = 12;
-
-        SetBackgroundStyle( wxBG_STYLE_CUSTOM );
-    }
-
-    virtual ~wxSimpleCheckBox();
-
-    int m_state;
-    int m_boxHeight;
-
-private:
-    void OnPaint( wxPaintEvent& event );
-    void OnLeftClick( wxMouseEvent& event );
-    void OnKeyDown( wxKeyEvent& event );
-
-    void OnResize( wxSizeEvent& event )
-    {
-        Refresh();
-        event.Skip();
-    }
-
-    static wxBitmap* ms_doubleBuffer;
-
-    DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(wxSimpleCheckBox, wxControl)
-    EVT_PAINT(wxSimpleCheckBox::OnPaint)
-    EVT_LEFT_DOWN(wxSimpleCheckBox::OnLeftClick)
-    EVT_LEFT_DCLICK(wxSimpleCheckBox::OnLeftClick)
-    EVT_KEY_DOWN(wxSimpleCheckBox::OnKeyDown)
-    EVT_SIZE(wxSimpleCheckBox::OnResize)
-END_EVENT_TABLE()
-
-wxSimpleCheckBox::~wxSimpleCheckBox()
-{
-    wxDELETE(ms_doubleBuffer);
-}
-
-wxBitmap* wxSimpleCheckBox::ms_doubleBuffer = NULL;
-
-void wxSimpleCheckBox::OnPaint( wxPaintEvent& WXUNUSED(event) )
-{
-    wxSize clientSize = GetClientSize();
-    wxAutoBufferedPaintDC dc(this);
-
-    dc.Clear();
-    wxRect rect(0,0,clientSize.x,clientSize.y);
-    rect.y += 1;
-    rect.width += 1;
-
-    wxColour bgcol = GetBackgroundColour();
-    dc.SetBrush( bgcol );
-    dc.SetPen( bgcol );
-    dc.DrawRectangle( rect );
-
-    dc.SetTextForeground(GetForegroundColour());
-
-    int state = m_state;
-    if ( !(state & wxSCB_STATE_UNSPECIFIED) &&
-         GetFont().GetWeight() == wxBOLD )
-        state |= wxSCB_STATE_BOLD;
-
-    DrawSimpleCheckBox(dc, rect, m_boxHeight, state);
-}
-
-void wxSimpleCheckBox::OnLeftClick( wxMouseEvent& event )
-{
-    if ( (event.m_x > (wxPG_XBEFORETEXT-2)) &&
-         (event.m_x <= (wxPG_XBEFORETEXT-2+m_boxHeight)) )
-    {
-        SetValue(wxSCB_SETVALUE_CYCLE);
-    }
-}
-
-void wxSimpleCheckBox::OnKeyDown( wxKeyEvent& event )
-{
-    if ( event.GetKeyCode() == WXK_SPACE )
-    {
-        SetValue(wxSCB_SETVALUE_CYCLE);
-    }
-}
-
-void wxSimpleCheckBox::SetValue( int value )
-{
-    if ( value == wxSCB_SETVALUE_CYCLE )
-    {
-        if ( m_state & wxSCB_STATE_CHECKED )
-            m_state &= ~wxSCB_STATE_CHECKED;
-        else
-            m_state |= wxSCB_STATE_CHECKED;
-    }
-    else
-    {
-        m_state = value;
-    }
-    Refresh();
-
-    wxCommandEvent evt(wxEVT_CHECKBOX,GetParent()->GetId());
-
-    wxPropertyGrid* propGrid = (wxPropertyGrid*) GetParent();
-    wxASSERT( wxDynamicCast(propGrid, wxPropertyGrid) );
-    propGrid->HandleCustomEditorEvent(evt);
-}
-
-wxPGWindowList wxPGCheckBoxEditor::CreateControls( wxPropertyGrid* propGrid,
-                                                   wxPGProperty* property,
-                                                   const wxPoint& pos,
-                                                   const wxSize& size ) const
-{
-    if ( property->HasFlag(wxPG_PROP_READONLY) )
-        return NULL;
-
-    wxPoint pt = pos;
-    pt.x -= wxPG_XBEFOREWIDGET;
-    wxSize sz = size;
-    sz.x = propGrid->GetFontHeight() + (wxPG_XBEFOREWIDGET*2) + 4;
-
-    wxSimpleCheckBox* cb = new wxSimpleCheckBox(propGrid->GetPanel(),
-                                                wxPG_SUBID1, pt, sz);
-
-    cb->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-
-    UpdateControl(property, cb);
-
-    if ( !property->IsValueUnspecified() )
-    {
-        // If mouse cursor was on the item, toggle the value now.
-        if ( propGrid->GetInternalFlags() & wxPG_FL_ACTIVATION_BY_CLICK )
-        {
-            wxPoint point = cb->ScreenToClient(::wxGetMousePosition());
-            if ( point.x <= (wxPG_XBEFORETEXT-2+cb->m_boxHeight) )
-            {
-                if ( cb->m_state & wxSCB_STATE_CHECKED )
-                    cb->m_state &= ~wxSCB_STATE_CHECKED;
-                else
-                    cb->m_state |= wxSCB_STATE_CHECKED;
-
-                // Makes sure wxPG_EVT_CHANGING etc. is sent for this initial
-                // click
-                propGrid->ChangePropertyValue(property,
-                                              wxPGVariant_Bool(cb->m_state));
-            }
-        }
-    }
-
-    propGrid->SetInternalFlag( wxPG_FL_FIXED_WIDTH_EDITOR );
-
-    return cb;
-}
-
-void wxPGCheckBoxEditor::DrawValue( wxDC& dc, const wxRect& rect,
-                                    wxPGProperty* property,
-                                    const wxString& WXUNUSED(text) ) const
-{
-    int state = wxSCB_STATE_UNCHECKED;
-
-    if ( !property->IsValueUnspecified() )
-    {
-        state = property->GetChoiceSelection();
-        if ( dc.GetFont().GetWeight() == wxBOLD )
-            state |= wxSCB_STATE_BOLD;
-    }
-    else
-    {
-        state |= wxSCB_STATE_UNSPECIFIED;
-    }
-
-    DrawSimpleCheckBox(dc, rect, dc.GetCharHeight(), state);
-}
-
-void wxPGCheckBoxEditor::UpdateControl( wxPGProperty* property,
-                                        wxWindow* ctrl ) const
-{
-    wxSimpleCheckBox* cb = (wxSimpleCheckBox*) ctrl;
-    wxASSERT( cb );
-
-    if ( !property->IsValueUnspecified() )
-        cb->m_state = property->GetChoiceSelection();
-    else
-        cb->m_state = wxSCB_STATE_UNSPECIFIED;
-
-    wxPropertyGrid* propGrid = property->GetGrid();
-    cb->m_boxHeight = propGrid->GetFontHeight();
-
-    cb->Refresh();
-}
-
-bool wxPGCheckBoxEditor::OnEvent( wxPropertyGrid* WXUNUSED(propGrid), wxPGProperty* WXUNUSED(property),
-    wxWindow* WXUNUSED(ctrl), wxEvent& event ) const
-{
-    if ( event.GetEventType() == wxEVT_CHECKBOX )
-    {
-        return true;
-    }
-    return false;
-}
-
-
-bool wxPGCheckBoxEditor::GetValueFromControl( wxVariant& variant, wxPGProperty* property, wxWindow* ctrl ) const
-{
-    wxSimpleCheckBox* cb = (wxSimpleCheckBox*)ctrl;
-
-    int index = cb->m_state;
-
-    if ( index != property->GetChoiceSelection() ||
-         // Changing unspecified always causes event (returning
-         // true here should be enough to trigger it).
-         property->IsValueUnspecified()
-       )
-    {
-        return property->IntToValue(variant, index, wxPG_PROPERTY_SPECIFIC);
-    }
-    return false;
-}
-
-
-void wxPGCheckBoxEditor::SetControlIntValue( wxPGProperty* WXUNUSED(property), wxWindow* ctrl, int value ) const
-{
-    if ( value != 0 ) value = 1;
-    ((wxSimpleCheckBox*)ctrl)->m_state = value;
-    ctrl->Refresh();
-}
-
-
-void wxPGCheckBoxEditor::SetValueToUnspecified( wxPGProperty* WXUNUSED(property), wxWindow* ctrl ) const
-{
-    ((wxSimpleCheckBox*)ctrl)->m_state = wxSCB_STATE_UNSPECIFIED;
-    ctrl->Refresh();
-}
-
-
-wxPGCheckBoxEditor::~wxPGCheckBoxEditor()
-{
-    wxPG_EDITOR(CheckBox) = NULL;
-}
-
-#endif // wxPG_INCLUDE_CHECKBOX
-
-// -----------------------------------------------------------------------
-
-wxWindow* wxPropertyGrid::GetEditorControl() const
-{
-    wxWindow* ctrl = m_wndEditor;
-
-    if ( !ctrl )
-        return ctrl;
-
-    return ctrl;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::CorrectEditorWidgetSizeX()
-{
-    int secWid = 0;
-
-    // Use fixed selColumn 1 for main editor widgets
-    int newSplitterx = m_pState->DoGetSplitterPosition(0);
-    int newWidth = newSplitterx + m_pState->m_colWidths[1];
-
-    if ( m_wndEditor2 )
-    {
-        // if width change occurred, move secondary wnd by that amount
-        wxRect r = m_wndEditor2->GetRect();
-        secWid = r.width;
-        r.x = newWidth - secWid;
-
-        m_wndEditor2->SetSize( r );
-
-        // if primary is textctrl, then we have to add some extra space
-#ifdef __WXMAC__
-        if ( m_wndEditor )
-#else
-        if ( wxDynamicCast(m_wndEditor, wxTextCtrl) )
-#endif
-            secWid += wxPG_TEXTCTRL_AND_BUTTON_SPACING;
-    }
-
-    if ( m_wndEditor )
-    {
-        wxRect r = m_wndEditor->GetRect();
-
-        r.x = newSplitterx+m_ctrlXAdjust;
-
-        if ( !(m_iFlags & wxPG_FL_FIXED_WIDTH_EDITOR) )
-            r.width = newWidth - r.x - secWid;
-
-        m_wndEditor->SetSize(r);
-    }
-
-    if ( m_wndEditor2 )
-        m_wndEditor2->Refresh();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::CorrectEditorWidgetPosY()
-{
-    wxPGProperty* selected = GetSelection();
-
-    if ( selected )
-    {
-        if ( m_labelEditor )
-        {
-            wxRect r = GetEditorWidgetRect(selected, m_selColumn);
-            wxPoint pos = m_labelEditor->GetPosition();
-
-            // Calculate y offset
-            int offset = pos.y % m_lineHeight;
-
-            m_labelEditor->Move(pos.x, r.y + offset);
-        }
-
-        if ( m_wndEditor || m_wndEditor2 )
-        {
-            wxRect r = GetEditorWidgetRect(selected, 1);
-
-            if ( m_wndEditor )
-            {
-                wxPoint pos = m_wndEditor->GetPosition();
-
-                // Calculate y offset
-                int offset = pos.y % m_lineHeight;
-
-                m_wndEditor->Move(pos.x, r.y + offset);
-            }
-
-            if ( m_wndEditor2 )
-            {
-                wxPoint pos = m_wndEditor2->GetPosition();
-
-                m_wndEditor2->Move(pos.x, r.y);
-            }
-        }
-    }
-}
-
-// -----------------------------------------------------------------------
-
-// Fixes position of wxTextCtrl-like control (wxSpinCtrl usually
-// fits into that category as well).
-void wxPropertyGrid::FixPosForTextCtrl( wxWindow* ctrl,
-                                        unsigned int WXUNUSED(forColumn),
-                                        const wxPoint& offset )
-{
-    // Center the control vertically
-    wxRect finalPos = ctrl->GetRect();
-    int y_adj = (m_lineHeight - finalPos.height)/2 + wxPG_TEXTCTRLYADJUST;
-
-    // Prevent over-sized control
-    int sz_dec = (y_adj + finalPos.height) - m_lineHeight;
-    if ( sz_dec < 0 ) sz_dec = 0;
-
-    finalPos.y += y_adj;
-    finalPos.height -= (y_adj+sz_dec);
-
-#ifndef wxPG_TEXTCTRLXADJUST
-    int textCtrlXAdjust = wxPG_XBEFORETEXT - 1;
-
-    wxTextCtrl* tc = static_cast(ctrl);
-    tc->SetMargins(0);
-#else
-    int textCtrlXAdjust = wxPG_TEXTCTRLXADJUST;
-#endif
-
-    finalPos.x += textCtrlXAdjust;
-    finalPos.width -= textCtrlXAdjust;
-
-    finalPos.x += offset.x;
-    finalPos.y += offset.y;
-
-    ctrl->SetSize(finalPos);
-}
-
-// -----------------------------------------------------------------------
-
-wxWindow* wxPropertyGrid::GenerateEditorTextCtrl( const wxPoint& pos,
-                                                  const wxSize& sz,
-                                                  const wxString& value,
-                                                  wxWindow* secondary,
-                                                  int extraStyle,
-                                                  int maxLen,
-                                                  unsigned int forColumn )
-{
-    wxWindowID id = wxPG_SUBID1;
-    wxPGProperty* prop = GetSelection();
-    wxASSERT(prop);
-
-    int tcFlags = wxTE_PROCESS_ENTER | extraStyle;
-
-    if ( prop->HasFlag(wxPG_PROP_READONLY) && forColumn == 1 )
-        tcFlags |= wxTE_READONLY;
-
-    wxPoint p(pos.x,pos.y);
-    wxSize s(sz.x,sz.y);
-
-   // Need to reduce width of text control on Mac
-#if defined(__WXMAC__)
-    s.x -= 8;
-#endif
-
-    // For label editors, trim the size to allow better splitter grabbing
-    if ( forColumn != 1 )
-        s.x -= 2;
-
-    // Take button into acccount
-    if ( secondary )
-    {
-        s.x -= (secondary->GetSize().x + wxPG_TEXTCTRL_AND_BUTTON_SPACING);
-        m_iFlags &= ~(wxPG_FL_PRIMARY_FILLS_ENTIRE);
-    }
-
-    // If the height is significantly higher, then use border, and fill the rect exactly.
-    bool hasSpecialSize = false;
-
-    if ( (sz.y - m_lineHeight) > 5 )
-        hasSpecialSize = true;
-
-    wxWindow* ctrlParent = GetPanel();
-
-    if ( !hasSpecialSize )
-        tcFlags |= wxBORDER_NONE;
-
-    wxTextCtrl* tc = new wxTextCtrl();
-
-#if defined(__WXMSW__)
-    tc->Hide();
-#endif
-    SetupTextCtrlValue(value);
-    tc->Create(ctrlParent,id,value, p, s,tcFlags);
-
-#if defined(__WXMSW__)
-    // On Windows, we need to override read-only text ctrl's background
-    // colour to white. One problem with native 'grey' background is that
-    // tc->GetBackgroundColour() doesn't seem to return correct value
-    // for it.
-    if ( tcFlags & wxTE_READONLY )
-    {
-        wxVisualAttributes vattrs = tc->GetDefaultAttributes();
-        tc->SetBackgroundColour(vattrs.colBg);
-    }
-#endif
-
-    // This code is repeated from DoSelectProperty(). However, font boldness
-    // must be set before margin is set up below in FixPosForTextCtrl().
-    if ( forColumn == 1 &&
-         prop->HasFlag(wxPG_PROP_MODIFIED) &&
-         HasFlag(wxPG_BOLD_MODIFIED) )
-         tc->SetFont( m_captionFont );
-
-    // Center the control vertically
-    if ( !hasSpecialSize )
-        FixPosForTextCtrl(tc, forColumn);
-
-    if ( forColumn != 1 )
-    {
-        tc->SetBackgroundColour(m_colSelBack);
-        tc->SetForegroundColour(m_colSelFore);
-    }
-
-#ifdef __WXMSW__
-    tc->Show();
-    if ( secondary )
-        secondary->Show();
-#endif
-
-    // Set maximum length
-    if ( maxLen > 0 )
-        tc->SetMaxLength( maxLen );
-
-    wxVariant attrVal = prop->GetAttribute(wxPG_ATTR_AUTOCOMPLETE);
-    if ( !attrVal.IsNull() )
-    {
-        wxASSERT(attrVal.GetType() == wxS("arrstring"));
-        tc->AutoComplete(attrVal.GetArrayString());
-    }
-
-    // Set hint text
-    tc->SetHint(prop->GetHintText());
-
-    return tc;
-}
-
-// -----------------------------------------------------------------------
-
-wxWindow* wxPropertyGrid::GenerateEditorButton( const wxPoint& pos, const wxSize& sz )
-{
-    wxWindowID id = wxPG_SUBID2;
-    wxPGProperty* selected = GetSelection();
-    wxASSERT(selected);
-
-#ifdef __WXMAC__
-   // Decorations are chunky on Mac, and we can't make the button square, so
-   // do things a bit differently on this platform.
-
-   wxPoint p(pos.x+sz.x,
-             pos.y+wxPG_BUTTON_SIZEDEC-wxPG_NAT_BUTTON_BORDER_Y);
-   wxSize s(25, -1);
-
-   wxButton* but = new wxButton();
-   but->Create(GetPanel(),id,wxS("..."),p,s,wxWANTS_CHARS);
-
-   // Now that we know the size, move to the correct position
-   p.x = pos.x + sz.x - but->GetSize().x - 2;
-   but->Move(p);
-
-#else
-    wxSize s(sz.y-(wxPG_BUTTON_SIZEDEC*2)+(wxPG_NAT_BUTTON_BORDER_Y*2),
-        sz.y-(wxPG_BUTTON_SIZEDEC*2)+(wxPG_NAT_BUTTON_BORDER_Y*2));
-
-    // Reduce button width to lineheight
-    if ( s.x > m_lineHeight )
-        s.x = m_lineHeight;
-
-#ifdef __WXGTK__
-    // On wxGTK, take fixed button margins into account
-    if ( s.x < 25 )
-        s.x = 25;
-#endif
-
-    wxPoint p(pos.x+sz.x-s.x,
-        pos.y+wxPG_BUTTON_SIZEDEC-wxPG_NAT_BUTTON_BORDER_Y);
-
-    wxButton* but = new wxButton();
-  #ifdef __WXMSW__
-    but->Hide();
-  #endif
-    but->Create(GetPanel(),id,wxS("..."),p,s,wxWANTS_CHARS);
-
-  #ifdef __WXGTK__
-    wxFont font = GetFont();
-    font.SetPointSize(font.GetPointSize()-2);
-    but->SetFont(font);
-  #else
-    but->SetFont(GetFont());
-  #endif
-#endif
-
-    if ( selected->HasFlag(wxPG_PROP_READONLY) )
-        but->Disable();
-
-    return but;
-}
-
-// -----------------------------------------------------------------------
-
-wxWindow* wxPropertyGrid::GenerateEditorTextCtrlAndButton( const wxPoint& pos,
-                                                           const wxSize& sz,
-                                                           wxWindow** psecondary,
-                                                           int limitedEditing,
-                                                           wxPGProperty* property )
-{
-    wxButton* but = (wxButton*)GenerateEditorButton(pos,sz);
-    *psecondary = (wxWindow*)but;
-
-    if ( limitedEditing )
-    {
-    #ifdef __WXMSW__
-        // There is button Show in GenerateEditorTextCtrl as well
-        but->Show();
-    #endif
-        return NULL;
-    }
-
-    wxString text;
-
-    if ( !property->IsValueUnspecified() )
-        text = property->GetValueAsString(property->HasFlag(wxPG_PROP_READONLY)?0:wxPG_EDITABLE_VALUE);
-
-    return GenerateEditorTextCtrl(pos,sz,text,but,property->m_maxLen);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::SetEditorAppearance( const wxPGCell& cell,
-                                          bool unspecified )
-{
-    wxPGProperty* property = GetSelection();
-    if ( !property )
-        return;
-    wxWindow* ctrl = GetEditorControl();
-    if ( !ctrl )
-        return;
-
-    property->GetEditorClass()->SetControlAppearance( this,
-                                                      property,
-                                                      ctrl,
-                                                      cell,
-                                                      m_editorAppearance,
-                                                      unspecified );
-
-    m_editorAppearance = cell;
-}
-
-// -----------------------------------------------------------------------
-
-wxTextCtrl* wxPropertyGrid::GetEditorTextCtrl() const
-{
-    wxWindow* wnd = GetEditorControl();
-
-    if ( !wnd )
-        return NULL;
-
-    if ( wxDynamicCast(wnd, wxTextCtrl) )
-        return wxStaticCast(wnd, wxTextCtrl);
-
-    if ( wxDynamicCast(wnd, wxOwnerDrawnComboBox) )
-    {
-        wxOwnerDrawnComboBox* cb = wxStaticCast(wnd, wxOwnerDrawnComboBox);
-        return cb->GetTextCtrl();
-    }
-
-    return NULL;
-}
-
-// -----------------------------------------------------------------------
-
-wxPGEditor* wxPropertyGridInterface::GetEditorByName( const wxString& editorName )
-{
-    wxPGHashMapS2P::const_iterator it;
-
-    it = wxPGGlobalVars->m_mapEditorClasses.find(editorName);
-    if ( it == wxPGGlobalVars->m_mapEditorClasses.end() )
-        return NULL;
-    return (wxPGEditor*) it->second;
-}
-
-// -----------------------------------------------------------------------
-// wxPGEditorDialogAdapter
-// -----------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxPGEditorDialogAdapter, wxObject)
-
-bool wxPGEditorDialogAdapter::ShowDialog( wxPropertyGrid* propGrid, wxPGProperty* property )
-{
-    if ( !propGrid->EditorValidate() )
-        return false;
-
-    bool res = DoShowDialog( propGrid, property );
-
-    if ( res )
-    {
-        propGrid->ValueChangeInEvent( m_value );
-        return true;
-    }
-
-    return false;
-}
-
-// -----------------------------------------------------------------------
-// wxPGMultiButton
-// -----------------------------------------------------------------------
-
-wxPGMultiButton::wxPGMultiButton( wxPropertyGrid* pg, const wxSize& sz )
-    : wxWindow( pg->GetPanel(), wxPG_SUBID2, wxPoint(-100,-100), wxSize(0, sz.y) ),
-      m_fullEditorSize(sz), m_buttonsWidth(0)
-{
-    SetBackgroundColour(pg->GetCellBackgroundColour());
-}
-
-void wxPGMultiButton::Finalize( wxPropertyGrid* WXUNUSED(propGrid),
-                                const wxPoint& pos )
-{
-    Move( pos.x + m_fullEditorSize.x - m_buttonsWidth, pos.y );
-}
-
-int wxPGMultiButton::GenId( int itemid ) const
-{
-    if ( itemid < -1 )
-    {
-        if ( m_buttons.size() )
-            itemid = GetButton(m_buttons.size()-1)->GetId() + 1;
-        else
-            itemid = wxPG_SUBID2;
-    }
-    return itemid;
-}
-
-#if wxUSE_BMPBUTTON
-void wxPGMultiButton::Add( const wxBitmap& bitmap, int itemid )
-{
-    itemid = GenId(itemid);
-    wxSize sz = GetSize();
-    wxButton* button = new wxBitmapButton( this, itemid, bitmap,
-                                           wxPoint(sz.x, 0),
-                                           wxSize(sz.y, sz.y) );
-    DoAddButton( button, sz );
-}
-#endif
-
-void wxPGMultiButton::Add( const wxString& label, int itemid )
-{
-    itemid = GenId(itemid);
-    wxSize sz = GetSize();
-    wxButton* button = new wxButton( this, itemid, label, wxPoint(sz.x, 0),
-                                     wxSize(sz.y, sz.y) );
-    DoAddButton( button, sz );
-}
-
-void wxPGMultiButton::DoAddButton( wxWindow* button,
-                                   const wxSize& sz )
-{
-    m_buttons.push_back(button);
-    int bw = button->GetSize().x;
-    SetSize(wxSize(sz.x+bw,sz.y));
-    m_buttonsWidth += bw;
-}
-
-// -----------------------------------------------------------------------
-
-#endif  // wxUSE_PROPGRID
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/manager.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/manager.cpp
deleted file mode 100644
index ed0f5108fd..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/manager.cpp
+++ /dev/null
@@ -1,2112 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/propgrid/manager.cpp
-// Purpose:     wxPropertyGridManager
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     2005-01-14
-// Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_PROPGRID
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/object.h"
-    #include "wx/hash.h"
-    #include "wx/string.h"
-    #include "wx/log.h"
-    #include "wx/event.h"
-    #include "wx/window.h"
-    #include "wx/panel.h"
-    #include "wx/dc.h"
-    #include "wx/pen.h"
-    #include "wx/brush.h"
-    #include "wx/cursor.h"
-    #include "wx/settings.h"
-    #include "wx/textctrl.h"
-    #include "wx/sizer.h"
-    #include "wx/statusbr.h"
-    #include "wx/intl.h"
-#endif
-
-// This define is necessary to prevent macro clearing
-#define __wxPG_SOURCE_FILE__
-
-#include "wx/propgrid/propgrid.h"
-
-#include "wx/propgrid/manager.h"
-
-
-#define wxPG_MAN_ALTERNATE_BASE_ID          11249 // Needed for wxID_ANY madnesss
-
-
-// -----------------------------------------------------------------------
-
-// For wxMSW cursor consistency, we must do mouse capturing even
-// when using custom controls
-
-#define BEGIN_MOUSE_CAPTURE \
-    if ( !(m_iFlags & wxPG_FL_MOUSE_CAPTURED) ) \
-    { \
-        CaptureMouse(); \
-        m_iFlags |= wxPG_FL_MOUSE_CAPTURED; \
-    }
-
-#define END_MOUSE_CAPTURE \
-    if ( m_iFlags & wxPG_FL_MOUSE_CAPTURED ) \
-    { \
-        ReleaseMouse(); \
-        m_iFlags &= ~(wxPG_FL_MOUSE_CAPTURED); \
-    }
-
-// -----------------------------------------------------------------------
-// wxPropertyGridManager
-// -----------------------------------------------------------------------
-
-const char wxPropertyGridManagerNameStr[] = "wxPropertyGridManager";
-
-
-// Categoric Mode Icon
-static const char* const gs_xpm_catmode[] = {
-"16 16 5 1",
-". c none",
-"B c black",
-"D c #868686",
-"L c #CACACA",
-"W c #FFFFFF",
-".DDD............",
-".DLD.BBBBBB.....",
-".DDD............",
-".....DDDDD.DDD..",
-"................",
-".....DDDDD.DDD..",
-"................",
-".....DDDDD.DDD..",
-"................",
-".....DDDDD.DDD..",
-"................",
-".DDD............",
-".DLD.BBBBBB.....",
-".DDD............",
-".....DDDDD.DDD..",
-"................"
-};
-
-// Alphabetic Mode Icon
-static const char* const gs_xpm_noncatmode[] = {
-"16 16 5 1",
-". c none",
-"B c black",
-"D c #868686",
-"L c #000080",
-"W c #FFFFFF",
-"..DBD...DDD.DDD.",
-".DB.BD..........",
-".BBBBB..DDD.DDD.",
-".B...B..........",
-"...L....DDD.DDD.",
-"...L............",
-".L.L.L..DDD.DDD.",
-"..LLL...........",
-"...L....DDD.DDD.",
-"................",
-".BBBBB..DDD.DDD.",
-"....BD..........",
-"...BD...DDD.DDD.",
-"..BD............",
-".BBBBB..DDD.DDD.",
-"................"
-};
-
-// Default Page Icon.
-static const char* const gs_xpm_defpage[] = {
-"16 16 5 1",
-". c none",
-"B c black",
-"D c #868686",
-"L c #000080",
-"W c #FFFFFF",
-"................",
-"................",
-"..BBBBBBBBBBBB..",
-"..B..........B..",
-"..B.BB.LLLLL.B..",
-"..B..........B..",
-"..B.BB.LLLLL.B..",
-"..B..........B..",
-"..B.BB.LLLLL.B..",
-"..B..........B..",
-"..B.BB.LLLLL.B..",
-"..B..........B..",
-"..BBBBBBBBBBBB..",
-"................",
-"................",
-"................"
-};
-
-// -----------------------------------------------------------------------
-// wxPropertyGridPage
-// -----------------------------------------------------------------------
-
-
-IMPLEMENT_CLASS(wxPropertyGridPage, wxEvtHandler)
-
-
-BEGIN_EVENT_TABLE(wxPropertyGridPage, wxEvtHandler)
-END_EVENT_TABLE()
-
-
-wxPropertyGridPage::wxPropertyGridPage()
-    : wxEvtHandler(), wxPropertyGridInterface(), wxPropertyGridPageState()
-{
-    m_pState = this; // wxPropertyGridInterface to point to State
-    m_manager = NULL;
-    m_isDefault = false;
-}
-
-wxPropertyGridPage::~wxPropertyGridPage()
-{
-}
-
-void wxPropertyGridPage::Clear()
-{
-    GetStatePtr()->DoClear();
-}
-
-wxSize wxPropertyGridPage::FitColumns()
-{
-    wxSize sz = DoFitColumns();
-    return sz;
-}
-
-void wxPropertyGridPage::RefreshProperty( wxPGProperty* p )
-{
-    if ( m_manager )
-        m_manager->RefreshProperty(p);
-}
-
-void wxPropertyGridPage::OnShow()
-{
-}
-
-void wxPropertyGridPage::SetSplitterPosition( int splitterPos, int col )
-{
-    wxPropertyGrid* pg = GetGrid();
-    if ( pg->GetState() == this )
-        pg->SetSplitterPosition(splitterPos);
-    else
-        DoSetSplitterPosition(splitterPos, col, false);
-}
-
-void wxPropertyGridPage::DoSetSplitterPosition( int pos,
-                                                int splitterColumn,
-                                                int flags )
-{
-    if ( (flags & wxPG_SPLITTER_ALL_PAGES) && m_manager->GetPageCount() )
-        m_manager->SetSplitterPosition( pos, splitterColumn );
-    else
-        wxPropertyGridPageState::DoSetSplitterPosition( pos,
-                                                        splitterColumn,
-                                                        flags );
-}
-
-// -----------------------------------------------------------------------
-// wxPGHeaderCtrl
-// -----------------------------------------------------------------------
-
-#if wxUSE_HEADERCTRL
-
-class wxPGHeaderCtrl : public wxHeaderCtrl
-{
-public:
-    wxPGHeaderCtrl(wxPropertyGridManager* manager) :
-        wxHeaderCtrl()
-    {
-        m_manager = manager;
-        EnsureColumnCount(2);
-
-        // Seed titles with defaults
-        m_columns[0]->SetTitle(_("Property"));
-        m_columns[1]->SetTitle(_("Value"));
-    }
-
-    virtual ~wxPGHeaderCtrl()
-    {
-        for (unsigned int i=0; iGetColumnWidth(idx);
-        int colMinWidth = page->GetColumnMinWidth(idx);
-        if ( idx == 0 )
-        {
-            wxPropertyGrid* pg = m_manager->GetGrid();
-            int margin = pg->GetMarginWidth();
-
-            // Compensate for the internal border
-            margin += (pg->GetSize().x - pg->GetClientSize().x) / 2;
-
-            colWidth += margin;
-            colMinWidth += margin;
-        }
-        *pMinWidth = colMinWidth;
-        return colWidth;
-    }
-
-    void OnPageChanged(const wxPropertyGridPage* page)
-    {
-        m_page = page;
-        OnPageUpdated();
-    }
-
-    void OnPageUpdated()
-    {
-        // Get column info from the page
-        const wxPropertyGridPage* page = m_page;
-        unsigned int colCount = page->GetColumnCount();
-        EnsureColumnCount(colCount);
-
-        for ( unsigned int i=0; iSetWidth(colWidth);
-            colInfo->SetMinWidth(colMinWidth);
-        }
-
-        SetColumnCount(colCount);
-    }
-
-    void OnColumWidthsChanged()
-    {
-        const wxPropertyGridPage* page = m_page;
-        unsigned int colCount = page->GetColumnCount();
-
-        for ( unsigned int i=0; iSetWidth(colWidth);
-            colInfo->SetMinWidth(colMinWidth);
-            UpdateColumn(i);
-        }
-    }
-
-    virtual const wxHeaderColumn& GetColumn(unsigned int idx) const
-    {
-        return *m_columns[idx];
-    }
-
-    void SetColumnTitle(unsigned int idx, const wxString& title)
-    {
-        EnsureColumnCount(idx+1);
-        m_columns[idx]->SetTitle(title);
-    }
-
-private:
-    void EnsureColumnCount(unsigned int count)
-    {
-        while ( m_columns.size() < count )
-        {
-            wxHeaderColumnSimple* colInfo = new wxHeaderColumnSimple("");
-            m_columns.push_back(colInfo);
-        }
-    }
-
-    void OnSetColumnWidth(int col, int colWidth)
-    {
-        wxPropertyGrid* pg = m_manager->GetGrid();
-
-        // Compensate for the internal border
-        int x = -((pg->GetSize().x - pg->GetClientSize().x) / 2);
-
-        for ( int i=0; iGetWidth();
-
-        x += colWidth;
-
-        pg->DoSetSplitterPosition(x, col,
-                                  wxPG_SPLITTER_REFRESH |
-                                  wxPG_SPLITTER_FROM_EVENT);
-    }
-
-    virtual bool ProcessEvent( wxEvent& event )
-    {
-        if ( event.IsKindOf(wxCLASSINFO(wxHeaderCtrlEvent)) )
-        {
-            wxHeaderCtrlEvent& hcEvent =
-                static_cast(event);
-
-            wxPropertyGrid* pg = m_manager->GetGrid();
-            int col = hcEvent.GetColumn();
-            int evtType = event.GetEventType();
-
-            if ( evtType == wxEVT_HEADER_RESIZING )
-            {
-                int colWidth = hcEvent.GetWidth();
-
-                OnSetColumnWidth(col, colWidth);
-
-                pg->SendEvent(wxEVT_PG_COL_DRAGGING,
-                              NULL, NULL, 0,
-                              (unsigned int)col);
-
-                return true;
-            }
-            else if ( evtType == wxEVT_HEADER_BEGIN_RESIZE )
-            {
-                // Never allow column resize if layout is static
-                if ( m_manager->HasFlag(wxPG_STATIC_SPLITTER) )
-                    hcEvent.Veto();
-                // Allow application to veto dragging
-                else if ( pg->SendEvent(wxEVT_PG_COL_BEGIN_DRAG,
-                                        NULL, NULL, 0,
-                                        (unsigned int)col) )
-                    hcEvent.Veto();
-
-                return true;
-            }
-            else if ( evtType == wxEVT_HEADER_END_RESIZE )
-            {
-                pg->SendEvent(wxEVT_PG_COL_END_DRAG,
-                              NULL, NULL, 0,
-                              (unsigned int)col);
-
-                return true;
-            }
-        }
-
-        return wxHeaderCtrl::ProcessEvent(event);
-    }
-
-    wxPropertyGridManager*          m_manager;
-    const wxPropertyGridPage*       m_page;
-    wxVector m_columns;
-};
-
-#endif // wxUSE_HEADERCTRL
-
-// -----------------------------------------------------------------------
-// wxPropertyGridManager
-// -----------------------------------------------------------------------
-
-// Final default splitter y is client height minus this.
-#define wxPGMAN_DEFAULT_NEGATIVE_SPLITTER_Y         100
-
-// -----------------------------------------------------------------------
-
-IMPLEMENT_CLASS(wxPropertyGridManager, wxPanel)
-
-// -----------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(wxPropertyGridManager, wxPanel)
-  EVT_MOTION(wxPropertyGridManager::OnMouseMove)
-  EVT_SIZE(wxPropertyGridManager::OnResize)
-  EVT_PAINT(wxPropertyGridManager::OnPaint)
-  EVT_LEFT_DOWN(wxPropertyGridManager::OnMouseClick)
-  EVT_LEFT_UP(wxPropertyGridManager::OnMouseUp)
-  EVT_LEAVE_WINDOW(wxPropertyGridManager::OnMouseEntry)
-  //EVT_ENTER_WINDOW(wxPropertyGridManager::OnMouseEntry)
-END_EVENT_TABLE()
-
-// -----------------------------------------------------------------------
-
-wxPropertyGridManager::wxPropertyGridManager()
-    : wxPanel()
-{
-    Init1();
-}
-
-// -----------------------------------------------------------------------
-
-wxPropertyGridManager::wxPropertyGridManager( wxWindow *parent,
-                                              wxWindowID id,
-                                              const wxPoint& pos,
-                                              const wxSize& size,
-                                              long style,
-                                              const wxString& name )
-    : wxPanel()
-{
-    Init1();
-    Create(parent,id,pos,size,style,name);
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridManager::Create( wxWindow *parent,
-                                    wxWindowID id,
-                                    const wxPoint& pos,
-                                    const wxSize& size,
-                                    long style,
-                                    const wxString& name )
-{
-    if ( !m_pPropGrid )
-        m_pPropGrid = CreatePropertyGrid();
-
-    bool res = wxPanel::Create( parent, id, pos, size,
-                                (style&0xFFFF0000)|wxWANTS_CHARS,
-                                name );
-    Init2(style);
-
-    // FIXME: this changes call ordering so wxPropertyGrid is created
-    // immediately, before SetExtraStyle has a chance to be called. However,
-    // without it, we may get assertions if size is wxDefaultSize.
-    //SetInitialSize(size);
-
-    return res;
-}
-
-// -----------------------------------------------------------------------
-
-//
-// Initialize values to defaults
-//
-void wxPropertyGridManager::Init1()
-{
-
-    m_pPropGrid = NULL;
-
-#if wxUSE_TOOLBAR
-    m_pToolbar = NULL;
-#endif
-#if wxUSE_HEADERCTRL
-    m_pHeaderCtrl = NULL;
-    m_showHeader = false;
-#endif
-    m_pTxtHelpCaption = NULL;
-    m_pTxtHelpContent = NULL;
-
-    m_emptyPage = NULL;
-
-    m_selPage = -1;
-
-    m_width = m_height = 0;
-
-    m_splitterHeight = 5;
-
-    m_splitterY = -1; // -1 causes default to be set.
-
-    m_nextDescBoxSize = -1;
-
-    m_categorizedModeToolId = -1;
-    m_alphabeticModeToolId = -1;
-
-    m_extraHeight = 0;
-    m_dragStatus = 0;
-    m_onSplitter = 0;
-    m_iFlags = 0;
-}
-
-// -----------------------------------------------------------------------
-
-// These flags are always used in wxPropertyGrid integrated in wxPropertyGridManager.
-#define wxPG_MAN_PROPGRID_FORCED_FLAGS (  wxBORDER_THEME | \
-                                          wxNO_FULL_REPAINT_ON_RESIZE| \
-                                          wxCLIP_CHILDREN)
-
-// Which flags can be passed to underlying wxPropertyGrid.
-#define wxPG_MAN_PASS_FLAGS_MASK       (0xFFF0|wxTAB_TRAVERSAL)
-
-//
-// Initialize after parent etc. set
-//
-void wxPropertyGridManager::Init2( int style )
-{
-
-    if ( m_iFlags & wxPG_FL_INITIALIZED )
-        return;
-
-    m_windowStyle |= (style&0x0000FFFF);
-
-    wxSize csz = GetClientSize();
-
-    m_cursorSizeNS = wxCursor(wxCURSOR_SIZENS);
-
-    // Prepare the first page
-    // NB: But just prepare - you still need to call Add/InsertPage
-    //     to actually add properties on it.
-    wxPropertyGridPage* pd = new wxPropertyGridPage();
-    pd->m_isDefault = true;
-    pd->m_manager = this;
-    wxPropertyGridPageState* state = pd->GetStatePtr();
-    state->m_pPropGrid = m_pPropGrid;
-    m_arrPages.push_back( pd );
-    m_pPropGrid->m_pState = state;
-
-    wxWindowID baseId = GetId();
-    wxWindowID useId = baseId;
-    if ( baseId < 0 )
-        baseId = wxPG_MAN_ALTERNATE_BASE_ID;
-
-#ifdef __WXMAC__
-   // Smaller controls on Mac
-   SetWindowVariant(wxWINDOW_VARIANT_SMALL);
-#endif
-
-   long propGridFlags = (m_windowStyle&wxPG_MAN_PASS_FLAGS_MASK)
-                        |wxPG_MAN_PROPGRID_FORCED_FLAGS;
-
-   propGridFlags &= ~wxBORDER_MASK;
-
-   if ((style & wxPG_NO_INTERNAL_BORDER) == 0)
-   {
-       propGridFlags |= wxBORDER_THEME;
-   }
-   else
-   {
-       propGridFlags |= wxBORDER_NONE;
-       wxWindow::SetExtraStyle(wxPG_EX_TOOLBAR_SEPARATOR);
-   }
-
-    // Create propertygrid.
-    m_pPropGrid->Create(this,baseId,wxPoint(0,0),csz, propGridFlags);
-
-    m_pPropGrid->m_eventObject = this;
-
-    m_pPropGrid->SetId(useId);
-
-    m_pPropGrid->m_iFlags |= wxPG_FL_IN_MANAGER;
-
-    m_pState = m_pPropGrid->m_pState;
-
-    m_pPropGrid->SetExtraStyle(wxPG_EX_INIT_NOCAT);
-
-    // Connect to property grid onselect event.
-    // NB: Even if wxID_ANY is used, this doesn't connect properly in wxPython
-    //     (see wxPropertyGridManager::ProcessEvent).
-    Connect(m_pPropGrid->GetId(),
-     wxEVT_PG_SELECTED,
-     wxPropertyGridEventHandler(wxPropertyGridManager::OnPropertyGridSelect));
-
-    Connect(m_pPropGrid->GetId(),
-            wxEVT_PG_COL_DRAGGING,
-            wxPropertyGridEventHandler(wxPropertyGridManager::OnPGColDrag));
-
-    // Optional initial controls.
-    m_width = -12345;
-
-    m_iFlags |= wxPG_FL_INITIALIZED;
-
-}
-
-// -----------------------------------------------------------------------
-
-wxPropertyGridManager::~wxPropertyGridManager()
-{
-    END_MOUSE_CAPTURE
-
-    //m_pPropGrid->ClearSelection();
-    wxDELETE(m_pPropGrid);
-
-    size_t i;
-    for ( i=0; iSetId(winid);
-}
-
-// -----------------------------------------------------------------------
-
-wxSize wxPropertyGridManager::DoGetBestSize() const
-{
-    return wxSize(60,150);
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridManager::SetFont( const wxFont& font )
-{
-    bool res = wxWindow::SetFont(font);
-    m_pPropGrid->SetFont(font);
-
-    // TODO: Need to do caption recacalculations for other pages as well.
-    unsigned int i;
-    for ( i=0; iGetState() )
-            page->CalculateFontAndBitmapStuff(-1);
-    }
-
-    return res;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::SetExtraStyle( long exStyle )
-{
-    wxWindow::SetExtraStyle( exStyle );
-    m_pPropGrid->SetExtraStyle( exStyle & 0xFFFFF000 );
-#if wxUSE_TOOLBAR
-    if ( (exStyle & wxPG_EX_NO_FLAT_TOOLBAR) && m_pToolbar )
-        RecreateControls();
-#endif
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::Freeze()
-{
-    m_pPropGrid->Freeze();
-    wxWindow::Freeze();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::Thaw()
-{
-    wxWindow::Thaw();
-    m_pPropGrid->Thaw();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::SetWindowStyleFlag( long style )
-{
-    int oldWindowStyle = GetWindowStyleFlag();
-
-    wxWindow::SetWindowStyleFlag( style );
-    m_pPropGrid->SetWindowStyleFlag( (m_pPropGrid->GetWindowStyleFlag()&~(wxPG_MAN_PASS_FLAGS_MASK)) |
-                                   (style&wxPG_MAN_PASS_FLAGS_MASK) );
-
-    // Need to re-position windows?
-    if ( (oldWindowStyle & (wxPG_TOOLBAR|wxPG_DESCRIPTION)) !=
-         (style & (wxPG_TOOLBAR|wxPG_DESCRIPTION)) )
-    {
-        RecreateControls();
-    }
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridManager::Reparent( wxWindowBase *newParent )
-{
-    if ( m_pPropGrid )
-        m_pPropGrid->OnTLPChanging((wxWindow*)newParent);
-
-    bool res = wxPanel::Reparent(newParent);
-
-    return res;
-}
-
-// -----------------------------------------------------------------------
-
-// Actually shows given page.
-bool wxPropertyGridManager::DoSelectPage( int index )
-{
-    // -1 means no page was selected
-    //wxASSERT( m_selPage >= 0 );
-
-    wxCHECK_MSG( index >= -1 && index < (int)GetPageCount(),
-                 false,
-                 wxT("invalid page index") );
-
-    if ( m_selPage == index )
-        return true;
-
-    if ( m_pPropGrid->GetSelection() )
-    {
-        if ( !m_pPropGrid->ClearSelection() )
-            return false;
-    }
-
-#if wxUSE_TOOLBAR
-    wxPropertyGridPage* prevPage;
-
-    if ( m_selPage >= 0 )
-        prevPage = GetPage(m_selPage);
-    else
-        prevPage = m_emptyPage;
-#endif
-
-    wxPropertyGridPage* nextPage;
-
-    if ( index >= 0 )
-    {
-        nextPage = m_arrPages[index];
-
-        nextPage->OnShow();
-    }
-    else
-    {
-        if ( !m_emptyPage )
-        {
-            m_emptyPage = new wxPropertyGridPage();
-            m_emptyPage->m_pPropGrid = m_pPropGrid;
-        }
-
-        nextPage = m_emptyPage;
-    }
-
-    m_iFlags |= wxPG_FL_DESC_REFRESH_REQUIRED;
-
-    m_pPropGrid->SwitchState( nextPage->GetStatePtr() );
-
-    m_pState = m_pPropGrid->m_pState;
-
-    m_selPage = index;
-
-#if wxUSE_TOOLBAR
-    if ( m_pToolbar )
-    {
-        if ( index >= 0 )
-            m_pToolbar->ToggleTool( nextPage->m_toolId, true );
-        else
-            m_pToolbar->ToggleTool( prevPage->m_toolId, false );
-    }
-#endif
-
-#if wxUSE_HEADERCTRL
-    if ( m_showHeader )
-        m_pHeaderCtrl->OnPageChanged(nextPage);
-#endif
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-// Changes page *and* set the target page for insertion operations.
-void wxPropertyGridManager::SelectPage( int index )
-{
-    DoSelectPage(index);
-}
-
-// -----------------------------------------------------------------------
-
-int wxPropertyGridManager::GetPageByName( const wxString& name ) const
-{
-    size_t i;
-    for ( i=0; im_label == name )
-            return i;
-    }
-    return wxNOT_FOUND;
-}
-
-// -----------------------------------------------------------------------
-
-int wxPropertyGridManager::GetPageByState( const wxPropertyGridPageState* pState ) const
-{
-    wxASSERT( pState );
-
-    size_t i;
-    for ( i=0; iGetStatePtr() )
-            return i;
-    }
-
-    return wxNOT_FOUND;
-}
-
-// -----------------------------------------------------------------------
-
-const wxString& wxPropertyGridManager::GetPageName( int index ) const
-{
-    wxASSERT( index >= 0 && index < (int)GetPageCount() );
-    return m_arrPages[index]->m_label;
-}
-
-// -----------------------------------------------------------------------
-
-wxPropertyGridPageState* wxPropertyGridManager::GetPageState( int page ) const
-{
-    // Do not change this into wxCHECK because returning NULL is important
-    // for wxPropertyGridInterface page enumeration mechanics.
-    if ( page >= (int)GetPageCount() )
-        return NULL;
-
-    if ( page == -1 )
-        return m_pState;
-    return m_arrPages[page];
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::Clear()
-{
-    m_pPropGrid->ClearSelection(false);
-
-    m_pPropGrid->Freeze();
-
-    int i;
-    for ( i=(int)GetPageCount()-1; i>=0; i-- )
-        RemovePage(i);
-
-    m_pPropGrid->Thaw();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::ClearPage( int page )
-{
-    wxASSERT( page >= 0 );
-    wxASSERT( page < (int)GetPageCount() );
-
-    if ( page >= 0 && page < (int)GetPageCount() )
-    {
-        wxPropertyGridPageState* state = m_arrPages[page];
-
-        if ( state == m_pPropGrid->GetState() )
-            m_pPropGrid->Clear();
-        else
-            state->DoClear();
-    }
-}
-
-// -----------------------------------------------------------------------
-
-int wxPropertyGridManager::GetColumnCount( int page ) const
-{
-    wxASSERT( page >= -1 );
-    wxASSERT( page < (int)GetPageCount() );
-
-    return GetPageState(page)->GetColumnCount();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::SetColumnCount( int colCount, int page )
-{
-    wxASSERT( page >= -1 );
-    wxASSERT( page < (int)GetPageCount() );
-
-    GetPageState(page)->SetColumnCount( colCount );
-    GetGrid()->Refresh();
-
-#if wxUSE_HEADERCTRL
-    if ( m_showHeader )
-        m_pHeaderCtrl->OnPageUpdated();
-#endif
-}
-// -----------------------------------------------------------------------
-
-size_t wxPropertyGridManager::GetPageCount() const
-{
-    if ( !(m_iFlags & wxPG_MAN_FL_PAGE_INSERTED) )
-        return 0;
-
-    return m_arrPages.size();
-}
-
-// -----------------------------------------------------------------------
-
-wxPropertyGridPage* wxPropertyGridManager::InsertPage( int index,
-                                                       const wxString& label,
-                                                       const wxBitmap& bmp,
-                                                       wxPropertyGridPage* pageObj )
-{
-    if ( index < 0 )
-        index = GetPageCount();
-
-    wxCHECK_MSG( (size_t)index == GetPageCount(), NULL,
-        wxT("wxPropertyGridManager currently only supports appending pages (due to wxToolBar limitation)."));
-
-    bool needInit = true;
-    bool isPageInserted = m_iFlags & wxPG_MAN_FL_PAGE_INSERTED ? true : false;
-
-    wxASSERT( index == 0 || isPageInserted );
-
-    if ( !pageObj )
-    {
-        // No custom page object was given, so we will either re-use the default base
-        // page (if index==0), or create a new default page object.
-        if ( !isPageInserted )
-        {
-            pageObj = GetPage(0);
-            // Of course, if the base page was custom, we need to delete and
-            // re-create it.
-            if ( !pageObj->m_isDefault )
-            {
-                delete pageObj;
-                pageObj = new wxPropertyGridPage();
-                m_arrPages[0] = pageObj;
-            }
-            needInit = false;
-        }
-        else
-        {
-            pageObj = new wxPropertyGridPage();
-        }
-        pageObj->m_isDefault = true;
-    }
-    else
-    {
-        if ( !isPageInserted )
-        {
-            // Initial page needs to be deleted and replaced
-            delete GetPage(0);
-            m_arrPages[0] = pageObj;
-            m_pPropGrid->m_pState = pageObj->GetStatePtr();
-        }
-    }
-
-    wxPropertyGridPageState* state = pageObj->GetStatePtr();
-
-    pageObj->m_manager = this;
-
-    if ( needInit )
-    {
-        state->m_pPropGrid = m_pPropGrid;
-        state->InitNonCatMode();
-    }
-
-    if ( !label.empty() )
-    {
-        wxASSERT_MSG( !pageObj->m_label.length(),
-                      wxT("If page label is given in constructor, empty label must be given in AddPage"));
-        pageObj->m_label = label;
-    }
-
-    pageObj->m_toolId = -1;
-
-    if ( !HasFlag(wxPG_SPLITTER_AUTO_CENTER) )
-        pageObj->m_dontCenterSplitter = true;
-
-    if ( isPageInserted )
-        m_arrPages.push_back( pageObj );
-
-#if wxUSE_TOOLBAR
-    if ( m_windowStyle & wxPG_TOOLBAR )
-    {
-        if ( !m_pToolbar )
-            RecreateControls();
-
-        if ( !(GetExtraStyle()&wxPG_EX_HIDE_PAGE_BUTTONS) )
-        {
-            wxASSERT( m_pToolbar );
-
-            // Add separator before first page.
-            if ( GetPageCount() < 2 && (GetExtraStyle()&wxPG_EX_MODE_BUTTONS) &&
-                 m_pToolbar->GetToolsCount() < 3 )
-                m_pToolbar->AddSeparator();
-
-            wxToolBarToolBase* tool;
-
-            if ( &bmp != &wxNullBitmap )
-                tool = m_pToolbar->AddTool(wxID_ANY, label, bmp,
-                                           label, wxITEM_RADIO);
-            else
-                tool = m_pToolbar->AddTool(wxID_ANY, label,
-                                           wxBitmap(gs_xpm_defpage),
-                                           label, wxITEM_RADIO);
-
-            pageObj->m_toolId = tool->GetId();
-
-            // Connect to toolbar button events.
-            Connect(pageObj->m_toolId,
-                    wxEVT_TOOL,
-                    wxCommandEventHandler(
-                        wxPropertyGridManager::OnToolbarClick));
-
-            m_pToolbar->Realize();
-        }
-    }
-#else
-    wxUnusedVar(bmp);
-#endif
-
-    // If selected page was above the point of insertion, fix the current page index
-    if ( isPageInserted )
-    {
-        if ( m_selPage >= index )
-        {
-            m_selPage += 1;
-        }
-    }
-    else
-    {
-        // Set this value only when adding the first page
-        m_selPage = 0;
-    }
-
-    pageObj->Init();
-
-    m_iFlags |= wxPG_MAN_FL_PAGE_INSERTED;
-
-    wxASSERT( pageObj->GetGrid() );
-
-    return pageObj;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridManager::IsAnyModified() const
-{
-    size_t i;
-    for ( i=0; iGetStatePtr()->m_anyModified )
-            return true;
-    }
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridManager::IsPageModified( size_t index ) const
-{
-    if ( m_arrPages[index]->GetStatePtr()->m_anyModified )
-        return true;
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-#if wxUSE_HEADERCTRL
-void wxPropertyGridManager::ShowHeader(bool show)
-{
-    if ( show != m_showHeader)
-    {
-        m_showHeader = show;
-        RecreateControls();
-    }
-}
-#endif
-
-// -----------------------------------------------------------------------
-
-#if wxUSE_HEADERCTRL
-void wxPropertyGridManager::SetColumnTitle( int idx, const wxString& title )
-{
-    if ( !m_pHeaderCtrl )
-        ShowHeader();
-
-    m_pHeaderCtrl->SetColumnTitle(idx, title);
-}
-#endif
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridManager::IsPropertySelected( wxPGPropArg id ) const
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-    for ( unsigned int i=0; iDoIsPropertySelected(p) )
-            return true;
-    }
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridManager::GetPageRoot( int index ) const
-{
-    wxASSERT( index >= 0 );
-    wxASSERT( index < (int)m_arrPages.size() );
-
-    return m_arrPages[index]->GetStatePtr()->m_properties;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridManager::RemovePage( int page )
-{
-    wxCHECK_MSG( (page >= 0) && (page < (int)GetPageCount()),
-                 false,
-                 wxT("invalid page index") );
-
-    wxPropertyGridPage* pd = m_arrPages[page];
-
-    if ( m_arrPages.size() == 1 )
-    {
-        // Last page: do not remove page entry
-        m_pPropGrid->Clear();
-        m_selPage = -1;
-        m_iFlags &= ~wxPG_MAN_FL_PAGE_INSERTED;
-        pd->m_label.clear();
-    }
-
-    // Change selection if current is page
-    else if ( page == m_selPage )
-    {
-        if ( !m_pPropGrid->ClearSelection() )
-                return false;
-
-        // Substitute page to select
-        int substitute = page - 1;
-        if ( substitute < 0 )
-            substitute = page + 1;
-
-        SelectPage(substitute);
-    }
-
-    // Remove toolbar icon
-#if wxUSE_TOOLBAR
-    if ( HasFlag(wxPG_TOOLBAR) )
-    {
-        wxASSERT( m_pToolbar );
-
-        int toolPos = GetExtraStyle() & wxPG_EX_MODE_BUTTONS ? 3 : 0;
-        toolPos += page;
-
-        // Delete separator as well, for consistency
-        if ( (GetExtraStyle() & wxPG_EX_MODE_BUTTONS) &&
-             GetPageCount() == 1 )
-            m_pToolbar->DeleteToolByPos(2);
-
-        m_pToolbar->DeleteToolByPos(toolPos);
-    }
-#endif
-
-    if ( m_arrPages.size() > 1 )
-    {
-        m_arrPages.erase(m_arrPages.begin() + page);
-        delete pd;
-    }
-
-    // Adjust indexes that were above removed
-    if ( m_selPage > page )
-        m_selPage--;
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridManager::ProcessEvent( wxEvent& event )
-{
-    int evtType = event.GetEventType();
-
-    // NB: For some reason, under wxPython, Connect in Init doesn't work properly,
-    //     so we'll need to call OnPropertyGridSelect manually. Multiple call's
-    //     don't really matter.
-    if ( evtType == wxEVT_PG_SELECTED )
-        OnPropertyGridSelect((wxPropertyGridEvent&)event);
-
-    // Property grid events get special attention
-    if ( evtType >= wxPG_BASE_EVT_TYPE &&
-         evtType < (wxPG_MAX_EVT_TYPE) &&
-         m_selPage >= 0 )
-    {
-        wxPropertyGridPage* page = GetPage(m_selPage);
-        wxPropertyGridEvent* pgEvent = wxDynamicCast(&event, wxPropertyGridEvent);
-
-        // Add property grid events to appropriate custom pages
-        // but stop propagating to parent if page says it is
-        // handling everything.
-        if ( pgEvent && !page->m_isDefault )
-        {
-            /*if ( pgEvent->IsPending() )
-                page->AddPendingEvent(event);
-            else*/
-                page->ProcessEvent(event);
-
-            if ( page->IsHandlingAllEvents() )
-                event.StopPropagation();
-        }
-    }
-
-    return wxPanel::ProcessEvent(event);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::RepaintDescBoxDecorations( wxDC& dc,
-                                                       int newSplitterY,
-                                                       int newWidth,
-                                                       int newHeight )
-{
-    // Draw background
-    wxColour bgcol = GetBackgroundColour();
-    dc.SetBrush(bgcol);
-    dc.SetPen(bgcol);
-    int rectHeight = m_splitterHeight;
-    dc.DrawRectangle(0, newSplitterY, newWidth, rectHeight);
-    dc.SetPen( wxSystemSettings::GetColour(wxSYS_COLOUR_3DDKSHADOW) );
-    int splitterBottom = newSplitterY + m_splitterHeight - 1;
-    int boxHeight = newHeight - splitterBottom;
-    if ( boxHeight > 1 )
-        dc.DrawRectangle(0, splitterBottom, newWidth, boxHeight);
-    else
-        dc.DrawLine(0, splitterBottom, newWidth, splitterBottom);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::UpdateDescriptionBox( int new_splittery, int new_width, int new_height )
-{
-    int use_hei = new_height;
-    use_hei--;
-
-    // Fix help control positions.
-    int cap_hei = m_pPropGrid->m_fontHeight;
-    int cap_y = new_splittery+m_splitterHeight+5;
-    int cnt_y = cap_y+cap_hei+3;
-    int sub_cap_hei = cap_y+cap_hei-use_hei;
-    int cnt_hei = use_hei-cnt_y;
-    if ( sub_cap_hei > 0 )
-    {
-        cap_hei -= sub_cap_hei;
-        cnt_hei = 0;
-    }
-    if ( cap_hei <= 2 )
-    {
-        m_pTxtHelpCaption->Show( false );
-        m_pTxtHelpContent->Show( false );
-    }
-    else
-    {
-        m_pTxtHelpCaption->SetSize(3,cap_y,new_width-6,cap_hei);
-        m_pTxtHelpCaption->Wrap(-1);
-        m_pTxtHelpCaption->Show( true );
-        if ( cnt_hei <= 2 )
-        {
-            m_pTxtHelpContent->Show( false );
-        }
-        else
-        {
-            m_pTxtHelpContent->SetSize(3,cnt_y,new_width-6,cnt_hei);
-            m_pTxtHelpContent->Show( true );
-        }
-    }
-
-    wxRect r(0, new_splittery, new_width, new_height-new_splittery);
-    RefreshRect(r);
-
-    m_splitterY = new_splittery;
-
-    m_iFlags &= ~(wxPG_FL_DESC_REFRESH_REQUIRED);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::RecalculatePositions( int width, int height )
-{
-    int propgridY = 0;
-    int propgridBottomY = height;
-
-    // Toolbar at the top.
-#if wxUSE_TOOLBAR
-    if ( m_pToolbar )
-    {
-        m_pToolbar->SetSize(0, 0, width, -1);
-        propgridY += m_pToolbar->GetSize().y;
-
-        if (GetExtraStyle() & wxPG_EX_TOOLBAR_SEPARATOR)
-            propgridY += 1;
-    }
-#endif
-
-    // Header comes after the tool bar
-#if wxUSE_HEADERCTRL
-    if ( m_showHeader )
-    {
-        m_pHeaderCtrl->SetSize(0, propgridY, width, -1);
-        propgridY += m_pHeaderCtrl->GetSize().y;
-    }
-#endif
-
-    // Help box.
-    if ( m_pTxtHelpCaption )
-    {
-        int new_splittery = m_splitterY;
-
-        // Move m_splitterY
-        if ( ( m_splitterY >= 0 || m_nextDescBoxSize ) && m_height > 32 )
-        {
-            if ( m_nextDescBoxSize >= 0 )
-            {
-                new_splittery = m_height - m_nextDescBoxSize - m_splitterHeight;
-                m_nextDescBoxSize = -1;
-            }
-            new_splittery += (height-m_height);
-        }
-        else
-        {
-            new_splittery = height - wxPGMAN_DEFAULT_NEGATIVE_SPLITTER_Y;
-            if ( new_splittery < 32 )
-                new_splittery = 32;
-        }
-
-        // Check if beyond minimum.
-        int nspy_min = propgridY + m_pPropGrid->m_lineHeight;
-        if ( new_splittery < nspy_min )
-            new_splittery = nspy_min;
-
-        propgridBottomY = new_splittery;
-
-        UpdateDescriptionBox( new_splittery, width, height );
-    }
-
-    if ( m_iFlags & wxPG_FL_INITIALIZED )
-    {
-        int pgh = propgridBottomY - propgridY;
-        if ( pgh < 0 )
-            pgh = 0;
-        m_pPropGrid->SetSize( 0, propgridY, width, pgh );
-
-        m_extraHeight = height - pgh;
-
-        m_width = width;
-        m_height = height;
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::SetDescBoxHeight( int ht, bool refresh )
-{
-    if ( m_windowStyle & wxPG_DESCRIPTION )
-    {
-        if ( ht != GetDescBoxHeight() )
-        {
-            m_nextDescBoxSize = ht;
-            if ( refresh )
-                RecalculatePositions(m_width, m_height);
-        }
-    }
-}
-
-// -----------------------------------------------------------------------
-
-int wxPropertyGridManager::GetDescBoxHeight() const
-{
-    return GetClientSize().y - m_splitterY - m_splitterHeight;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::OnPaint( wxPaintEvent& WXUNUSED(event) )
-{
-    wxPaintDC dc(this);
-
-    // Update everything inside the box
-    wxRect r = GetUpdateRegion().GetBox();
-
-    if (GetExtraStyle() & wxPG_EX_TOOLBAR_SEPARATOR)
-    {
-        if (m_pToolbar && m_pPropGrid)
-        {
-            wxPen marginPen(m_pPropGrid->GetMarginColour());
-            dc.SetPen(marginPen);
-
-            int y = m_pPropGrid->GetPosition().y-1;
-            dc.DrawLine(0, y, GetClientSize().x, y);
-        }
-    }
-
-    // Repaint splitter and any other description box decorations
-    if ( (r.y + r.height) >= m_splitterY && m_splitterY != -1)
-        RepaintDescBoxDecorations( dc, m_splitterY, m_width, m_height );
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::Refresh(bool eraseBackground, const wxRect* rect )
-{
-    m_pPropGrid->Refresh(eraseBackground);
-    wxWindow::Refresh(eraseBackground,rect);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::RefreshProperty( wxPGProperty* p )
-{
-    wxPropertyGrid* grid = p->GetGrid();
-
-    if ( GetPage(m_selPage)->GetStatePtr() == p->GetParent()->GetParentState() )
-        grid->RefreshProperty(p);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::RecreateControls()
-{
-
-    bool was_shown = IsShown();
-    if ( was_shown )
-        Show ( false );
-
-#if wxUSE_TOOLBAR
-    if ( m_windowStyle & wxPG_TOOLBAR )
-    {
-        // Has toolbar.
-        if ( !m_pToolbar )
-        {
-            long toolBarFlags = ((GetExtraStyle()&wxPG_EX_NO_FLAT_TOOLBAR)?0:wxTB_FLAT);
-            if (GetExtraStyle() & wxPG_EX_NO_TOOLBAR_DIVIDER)
-                toolBarFlags |= wxTB_NODIVIDER;
-
-            m_pToolbar = new wxToolBar(this, wxID_ANY,
-                                       wxDefaultPosition,
-                                       wxDefaultSize,
-                                       toolBarFlags);
-            m_pToolbar->SetToolBitmapSize(wxSize(16, 15));
-
-        #if defined(__WXMSW__)
-            // Eliminate toolbar flicker on XP
-            // NOTE: Not enabled since it corrupts drawing somewhat.
-
-            /*
-            #ifndef WS_EX_COMPOSITED
-                #define WS_EX_COMPOSITED        0x02000000L
-            #endif
-
-            HWND hWnd = (HWND)m_pToolbar->GetHWND();
-
-            ::SetWindowLong( hWnd, GWL_EXSTYLE,
-                             ::GetWindowLong(hWnd, GWL_EXSTYLE) | WS_EX_COMPOSITED );
-            */
-
-        #endif
-
-            m_pToolbar->SetCursor ( *wxSTANDARD_CURSOR );
-
-            if ( (GetExtraStyle()&wxPG_EX_MODE_BUTTONS) )
-            {
-                wxString desc1(_("Categorized Mode"));
-                wxString desc2(_("Alphabetic Mode"));
-
-                wxToolBarToolBase* tool;
-
-                tool = m_pToolbar->AddTool(wxID_ANY,
-                                           desc1,
-                                           wxBitmap(gs_xpm_catmode),
-                                           desc1,
-                                           wxITEM_RADIO);
-                m_categorizedModeToolId = tool->GetId();
-
-                tool = m_pToolbar->AddTool(wxID_ANY,
-                                           desc2,
-                                           wxBitmap(gs_xpm_noncatmode),
-                                           desc2,
-                                           wxITEM_RADIO);
-                m_alphabeticModeToolId = tool->GetId();
-
-                m_pToolbar->Realize();
-
-                Connect(m_categorizedModeToolId,
-                        wxEVT_TOOL,
-                        wxCommandEventHandler(
-                            wxPropertyGridManager::OnToolbarClick));
-                Connect(m_alphabeticModeToolId,
-                        wxEVT_TOOL,
-                        wxCommandEventHandler(
-                            wxPropertyGridManager::OnToolbarClick));
-            }
-            else
-            {
-                m_categorizedModeToolId = -1;
-                m_alphabeticModeToolId = -1;
-            }
-
-        }
-
-        if ( (GetExtraStyle() & wxPG_EX_MODE_BUTTONS) )
-        {
-            // Toggle correct mode button.
-            // TODO: This doesn't work in wxMSW (when changing,
-            // both items will get toggled).
-            int toggle_but_on_ind;
-            int toggle_but_off_ind;
-            if ( m_pPropGrid->m_pState->IsInNonCatMode() )
-            {
-                toggle_but_on_ind = m_alphabeticModeToolId;
-                toggle_but_off_ind = m_categorizedModeToolId;
-            }
-            else
-            {
-                toggle_but_on_ind = m_categorizedModeToolId;
-                toggle_but_off_ind = m_alphabeticModeToolId;
-            }
-
-            m_pToolbar->ToggleTool(toggle_but_on_ind, true);
-            m_pToolbar->ToggleTool(toggle_but_off_ind, false);
-        }
-
-    }
-    else
-    {
-        // No toolbar.
-        if ( m_pToolbar )
-            m_pToolbar->Destroy();
-        m_pToolbar = NULL;
-    }
-#endif
-
-#if wxUSE_HEADERCTRL
-    if ( m_showHeader )
-    {
-        wxPGHeaderCtrl* hc;
-
-        if ( !m_pHeaderCtrl )
-        {
-            hc = new wxPGHeaderCtrl(this);
-            hc->Create(this, wxID_ANY);
-            m_pHeaderCtrl = hc;
-        }
-        else
-        {
-            m_pHeaderCtrl->Show();
-        }
-
-        m_pHeaderCtrl->OnPageChanged(GetCurrentPage());
-    }
-    else
-    {
-        if ( m_pHeaderCtrl )
-            m_pHeaderCtrl->Hide();
-    }
-#endif
-
-    if ( m_windowStyle & wxPG_DESCRIPTION )
-    {
-        // Has help box.
-        m_pPropGrid->m_iFlags |= (wxPG_FL_NOSTATUSBARHELP);
-
-        if ( !m_pTxtHelpCaption )
-        {
-            m_pTxtHelpCaption = new wxStaticText(this,
-                                                 wxID_ANY,
-                                                 wxT(""),
-                                                 wxDefaultPosition,
-                                                 wxDefaultSize,
-                                                 wxALIGN_LEFT|wxST_NO_AUTORESIZE);
-            m_pTxtHelpCaption->SetFont( m_pPropGrid->m_captionFont );
-            m_pTxtHelpCaption->SetCursor( *wxSTANDARD_CURSOR );
-        }
-        if ( !m_pTxtHelpContent )
-        {
-            m_pTxtHelpContent = new wxStaticText(this,
-                                                 wxID_ANY,
-                                                 wxT(""),
-                                                 wxDefaultPosition,
-                                                 wxDefaultSize,
-                                                 wxALIGN_LEFT|wxST_NO_AUTORESIZE);
-            m_pTxtHelpContent->SetCursor( *wxSTANDARD_CURSOR );
-        }
-
-        SetDescribedProperty(GetSelection());
-    }
-    else
-    {
-        // No help box.
-        m_pPropGrid->m_iFlags &= ~(wxPG_FL_NOSTATUSBARHELP);
-
-        if ( m_pTxtHelpCaption )
-            m_pTxtHelpCaption->Destroy();
-
-        m_pTxtHelpCaption = NULL;
-
-        if ( m_pTxtHelpContent )
-            m_pTxtHelpContent->Destroy();
-
-        m_pTxtHelpContent = NULL;
-    }
-
-    int width, height;
-
-    GetClientSize(&width,&height);
-
-    RecalculatePositions(width,height);
-
-    if ( was_shown )
-        Show ( true );
-}
-
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridManager::DoGetPropertyByName( const wxString& name ) const
-{
-    size_t i;
-    for ( i=0; iGetStatePtr();
-        wxPGProperty* p = pState->BaseGetPropertyByName(name);
-        if ( p )
-        {
-            return p;
-        }
-    }
-    return NULL;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridManager::EnsureVisible( wxPGPropArg id )
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-
-    wxPropertyGridPageState* parentState = p->GetParentState();
-
-    // Select correct page.
-    if ( m_pPropGrid->m_pState != parentState )
-        DoSelectPage( GetPageByState(parentState) );
-
-    return m_pPropGrid->EnsureVisible(id);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::OnToolbarClick( wxCommandEvent &event )
-{
-    int id = event.GetId();
-
-    if ( id == m_categorizedModeToolId )
-    {
-        // Categorized mode.
-        if ( m_pPropGrid->m_windowStyle & wxPG_HIDE_CATEGORIES )
-        {
-            if ( !m_pPropGrid->HasInternalFlag(wxPG_FL_CATMODE_AUTO_SORT) )
-                m_pPropGrid->m_windowStyle &= ~wxPG_AUTO_SORT;
-            m_pPropGrid->EnableCategories( true );
-        }
-    }
-    else if ( id == m_alphabeticModeToolId )
-    {
-        // Alphabetic mode.
-        if ( !(m_pPropGrid->m_windowStyle & wxPG_HIDE_CATEGORIES) )
-        {
-            if ( m_pPropGrid->HasFlag(wxPG_AUTO_SORT) )
-                m_pPropGrid->SetInternalFlag(wxPG_FL_CATMODE_AUTO_SORT);
-            else
-                m_pPropGrid->ClearInternalFlag(wxPG_FL_CATMODE_AUTO_SORT);
-
-            m_pPropGrid->m_windowStyle |= wxPG_AUTO_SORT;
-            m_pPropGrid->EnableCategories( false );
-        }
-    }
-    else
-    {
-        // Page Switching.
-
-        int index = -1;
-        size_t i;
-        wxPropertyGridPage* pdc;
-
-        // Find page with given id.
-        for ( i=0; im_toolId == id )
-            {
-                index = i;
-                break;
-            }
-        }
-
-        wxASSERT( index >= 0 );
-
-        if ( DoSelectPage( index ) )
-        {
-            // Event dispatching must be last.
-            m_pPropGrid->SendEvent(  wxEVT_PG_PAGE_CHANGED, NULL );
-        }
-        else
-        {
-            // TODO: Depress the old button on toolbar.
-        }
-    }
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridManager::SetEditableStateItem( const wxString& name, wxVariant value )
-{
-    if ( name == wxS("descboxheight") )
-    {
-        SetDescBoxHeight(value.GetLong(), true);
-        return true;
-    }
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-wxVariant wxPropertyGridManager::GetEditableStateItem( const wxString& name ) const
-{
-    if ( name == wxS("descboxheight") )
-    {
-        return (long) GetDescBoxHeight();
-    }
-    return wxNullVariant;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::SetDescription( const wxString& label, const wxString& content )
-{
-    if ( m_pTxtHelpCaption )
-    {
-        wxSize osz1 = m_pTxtHelpCaption->GetSize();
-        wxSize osz2 = m_pTxtHelpContent->GetSize();
-
-        m_pTxtHelpCaption->SetLabel(label);
-        m_pTxtHelpContent->SetLabel(content);
-
-        m_pTxtHelpCaption->SetSize(-1,osz1.y);
-        m_pTxtHelpContent->SetSize(-1,osz2.y);
-
-        UpdateDescriptionBox( m_splitterY, m_width, m_height );
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::SetDescribedProperty( wxPGProperty* p )
-{
-    if ( m_pTxtHelpCaption )
-    {
-        if ( p )
-        {
-            SetDescription( p->GetLabel(), p->GetHelpString() );
-        }
-        else
-        {
-            SetDescription( wxEmptyString, wxEmptyString );
-        }
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::SetSplitterLeft( bool subProps, bool allPages )
-{
-    if ( !allPages )
-    {
-        m_pPropGrid->SetSplitterLeft(subProps);
-    }
-    else
-    {
-        wxClientDC dc(this);
-        dc.SetFont(m_pPropGrid->GetFont());
-
-        int highest = 0;
-        unsigned int i;
-
-        for ( i=0; iGetColumnFitWidth(dc, m_arrPages[i]->m_properties, 0, subProps );
-            maxW += m_pPropGrid->m_marginWidth;
-            if ( maxW > highest )
-                highest = maxW;
-            m_pState->m_dontCenterSplitter = true;
-        }
-
-        if ( highest > 0 )
-            SetSplitterPosition( highest );
-    }
-
-#if wxUSE_HEADERCTRL
-    if ( m_showHeader )
-        m_pHeaderCtrl->OnColumWidthsChanged();
-#endif
-}
-
-void wxPropertyGridManager::SetPageSplitterLeft(int page, bool subProps)
-{
-    wxASSERT_MSG( (page < (int) GetPageCount()),
-                  wxT("SetPageSplitterLeft() has no effect until pages have been added") );
-
-    if (page < (int) GetPageCount())
-    {
-        wxClientDC dc(this);
-        dc.SetFont(m_pPropGrid->GetFont());
-
-        int maxW = m_pState->GetColumnFitWidth(dc, m_arrPages[page]->m_properties, 0, subProps );
-        maxW += m_pPropGrid->m_marginWidth;
-        SetPageSplitterPosition( page, maxW );
-
-#if wxUSE_HEADERCTRL
-        if ( m_showHeader )
-            m_pHeaderCtrl->OnColumWidthsChanged();
-#endif
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::OnPropertyGridSelect( wxPropertyGridEvent& event )
-{
-    // Check id.
-    wxASSERT_MSG( GetId() == m_pPropGrid->GetId(),
-        wxT("wxPropertyGridManager id must be set with wxPropertyGridManager::SetId (not wxWindow::SetId).") );
-
-    SetDescribedProperty(event.GetProperty());
-    event.Skip();
-}
-
-// -----------------------------------------------------------------------
-
-void
-wxPropertyGridManager::OnPGColDrag( wxPropertyGridEvent& WXUNUSED(event) )
-{
-#if wxUSE_HEADERCTRL
-    if ( !m_showHeader )
-        return;
-
-    m_pHeaderCtrl->OnColumWidthsChanged();
-#endif
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::OnResize( wxSizeEvent& WXUNUSED(event) )
-{
-    int width, height;
-
-    GetClientSize(&width, &height);
-
-    if ( m_width == -12345 )
-        RecreateControls();
-
-    RecalculatePositions(width, height);
-
-    if ( m_pPropGrid && m_pPropGrid->m_parent )
-    {
-        int pgWidth, pgHeight;
-        m_pPropGrid->GetClientSize(&pgWidth, &pgHeight);
-
-        // Regenerate splitter positions for non-current pages
-        for ( unsigned int i=0; iGetState() )
-            {
-                page->OnClientWidthChange(pgWidth,
-                                          pgWidth - page->m_width,
-                                          true);
-            }
-        }
-    }
-
-#if wxUSE_HEADERCTRL
-    if ( m_showHeader )
-        m_pHeaderCtrl->OnColumWidthsChanged();
-#endif
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::OnMouseEntry( wxMouseEvent& WXUNUSED(event) )
-{
-    // Correct cursor. This is required atleast for wxGTK, for which
-    // setting button's cursor to *wxSTANDARD_CURSOR does not work.
-    SetCursor( wxNullCursor );
-    m_onSplitter = 0;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::OnMouseMove( wxMouseEvent &event )
-{
-    if ( !m_pTxtHelpCaption )
-        return;
-
-    int y = event.m_y;
-
-    if ( m_dragStatus > 0 )
-    {
-        int sy = y - m_dragOffset;
-
-        // Calculate drag limits
-        int bottom_limit = m_height - m_splitterHeight + 1;
-        int top_limit = m_pPropGrid->m_lineHeight;
-#if wxUSE_TOOLBAR
-        if ( m_pToolbar ) top_limit += m_pToolbar->GetSize().y;
-#endif
-
-        if ( sy >= top_limit && sy < bottom_limit )
-        {
-
-            int change = sy - m_splitterY;
-            if ( change )
-            {
-                m_splitterY = sy;
-
-                m_pPropGrid->SetSize( m_width, m_splitterY - m_pPropGrid->GetPosition().y );
-                UpdateDescriptionBox( m_splitterY, m_width, m_height );
-
-                m_extraHeight -= change;
-                InvalidateBestSize();
-            }
-
-        }
-
-    }
-    else
-    {
-        if ( y >= m_splitterY && y < (m_splitterY+m_splitterHeight+2) )
-        {
-            SetCursor ( m_cursorSizeNS );
-            m_onSplitter = 1;
-        }
-        else
-        {
-            if ( m_onSplitter )
-            {
-                SetCursor ( wxNullCursor );
-            }
-            m_onSplitter = 0;
-        }
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::OnMouseClick( wxMouseEvent &event )
-{
-    int y = event.m_y;
-
-    // Click on splitter.
-    if ( y >= m_splitterY && y < (m_splitterY+m_splitterHeight+2) )
-    {
-        if ( m_dragStatus == 0 )
-        {
-            //
-            // Begin draggin the splitter
-            //
-
-            BEGIN_MOUSE_CAPTURE
-
-            m_dragStatus = 1;
-
-            m_dragOffset = y - m_splitterY;
-
-        }
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::OnMouseUp( wxMouseEvent &event )
-{
-    // No event type check - basically calling this method should
-    // just stop dragging.
-
-    if ( m_dragStatus >= 1 )
-    {
-        //
-        // End Splitter Dragging
-        //
-
-        int y = event.m_y;
-
-        // DO NOT ENABLE FOLLOWING LINE!
-        // (it is only here as a reminder to not to do it)
-        //m_splitterY = y;
-
-        // This is necessary to return cursor
-        END_MOUSE_CAPTURE
-
-        // Set back the default cursor, if necessary
-        if ( y < m_splitterY || y >= (m_splitterY+m_splitterHeight+2) )
-        {
-            SetCursor ( wxNullCursor );
-        }
-
-        m_dragStatus = 0;
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::SetSplitterPosition( int pos, int splitterColumn )
-{
-    wxASSERT_MSG( GetPageCount(),
-                  wxT("SetSplitterPosition() has no effect until pages have been added") );
-
-    size_t i;
-    for ( i=0; iDoSetSplitterPosition( pos, splitterColumn,
-                                     wxPG_SPLITTER_REFRESH );
-    }
-
-#if wxUSE_HEADERCTRL
-    if ( m_showHeader )
-        m_pHeaderCtrl->OnColumWidthsChanged();
-#endif
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridManager::SetPageSplitterPosition( int page,
-                                                     int pos,
-                                                     int column )
-{
-    GetPage(page)->DoSetSplitterPosition( pos, column );
-
-#if wxUSE_HEADERCTRL
-    if ( m_showHeader )
-        m_pHeaderCtrl->OnColumWidthsChanged();
-#endif
-}
-
-// -----------------------------------------------------------------------
-// wxPGVIterator_Manager
-// -----------------------------------------------------------------------
-
-// Default returned by wxPropertyGridInterface::CreateVIterator().
-class wxPGVIteratorBase_Manager : public wxPGVIteratorBase
-{
-public:
-    wxPGVIteratorBase_Manager( wxPropertyGridManager* manager, int flags )
-        : m_manager(manager), m_flags(flags), m_curPage(0)
-    {
-        m_it.Init(manager->GetPage(0), flags);
-    }
-    virtual ~wxPGVIteratorBase_Manager() { }
-    virtual void Next()
-    {
-        m_it.Next();
-
-        // Next page?
-        if ( m_it.AtEnd() )
-        {
-            m_curPage++;
-            if ( m_curPage < m_manager->GetPageCount() )
-                m_it.Init( m_manager->GetPage(m_curPage), m_flags );
-        }
-    }
-private:
-    wxPropertyGridManager*  m_manager;
-    int                     m_flags;
-    unsigned int            m_curPage;
-};
-
-wxPGVIterator wxPropertyGridManager::GetVIterator( int flags ) const
-{
-    return wxPGVIterator( new wxPGVIteratorBase_Manager( (wxPropertyGridManager*)this, flags ) );
-}
-
-#endif  // wxUSE_PROPGRID
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/property.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/property.cpp
deleted file mode 100644
index bafa791fc4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/property.cpp
+++ /dev/null
@@ -1,3128 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/propgrid/property.cpp
-// Purpose:     wxPGProperty and related support classes
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     2008-08-23
-// Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_PROPGRID
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/object.h"
-    #include "wx/hash.h"
-    #include "wx/string.h"
-    #include "wx/log.h"
-    #include "wx/math.h"
-    #include "wx/event.h"
-    #include "wx/window.h"
-    #include "wx/panel.h"
-    #include "wx/dc.h"
-    #include "wx/dcmemory.h"
-    #include "wx/pen.h"
-    #include "wx/brush.h"
-    #include "wx/settings.h"
-    #include "wx/intl.h"
-#endif
-
-#include "wx/image.h"
-
-#include "wx/propgrid/propgrid.h"
-
-
-#define PWC_CHILD_SUMMARY_LIMIT         16 // Maximum number of children summarized in a parent property's
-                                           // value field.
-
-#define PWC_CHILD_SUMMARY_CHAR_LIMIT    64 // Character limit of summary field when not editing
-
-#if wxPG_COMPATIBILITY_1_4
-
-// Used to establish backwards compatibility
-const char* g_invalidStringContent = "@__TOTALLY_INVALID_STRING__@";
-
-#endif
-
-// -----------------------------------------------------------------------
-
-static void wxPGDrawFocusRect( wxDC& dc, const wxRect& rect )
-{
-#if defined(__WXMSW__) && !defined(__WXWINCE__)
-    // FIXME: Use DrawFocusRect code above (currently it draws solid line
-    //   for caption focus but works ok for other stuff).
-    //   Also, it seems that this code may not work in future wx versions.
-    dc.SetLogicalFunction(wxINVERT);
-
-    wxPen pen(*wxBLACK,1,wxDOT);
-    pen.SetCap(wxCAP_BUTT);
-    dc.SetPen(pen);
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-
-    dc.DrawRectangle(rect);
-
-    dc.SetLogicalFunction(wxCOPY);
-#else
-    dc.SetLogicalFunction(wxINVERT);
-
-    dc.SetPen(wxPen(*wxBLACK,1,wxDOT));
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-
-    dc.DrawRectangle(rect);
-
-    dc.SetLogicalFunction(wxCOPY);
-#endif
-}
-
-// -----------------------------------------------------------------------
-// wxPGCellRenderer
-// -----------------------------------------------------------------------
-
-wxSize wxPGCellRenderer::GetImageSize( const wxPGProperty* WXUNUSED(property),
-                                       int WXUNUSED(column),
-                                       int WXUNUSED(item) ) const
-{
-     return wxSize(0, 0);
-}
-
-void wxPGCellRenderer::DrawText( wxDC& dc, const wxRect& rect,
-                                 int xOffset, const wxString& text ) const
-{
-    dc.DrawText( text,
-                 rect.x+xOffset+wxPG_XBEFORETEXT,
-                 rect.y+((rect.height-dc.GetCharHeight())/2) );
-}
-
-void wxPGCellRenderer::DrawEditorValue( wxDC& dc, const wxRect& rect,
-                                        int xOffset, const wxString& text,
-                                        wxPGProperty* property,
-                                        const wxPGEditor* editor ) const
-{
-    int yOffset = ((rect.height-dc.GetCharHeight())/2);
-
-    if ( editor )
-    {
-        wxRect rect2(rect);
-        rect2.x += xOffset;
-        rect2.y += yOffset;
-        rect2.height -= yOffset;
-        editor->DrawValue( dc, rect2, property, text );
-    }
-    else
-    {
-        dc.DrawText( text,
-                     rect.x+xOffset+wxPG_XBEFORETEXT,
-                     rect.y+yOffset );
-    }
-}
-
-void wxPGCellRenderer::DrawCaptionSelectionRect( wxDC& dc, int x, int y, int w, int h ) const
-{
-    wxRect focusRect(x,y+((h-dc.GetCharHeight())/2),w,h);
-    wxPGDrawFocusRect(dc,focusRect);
-}
-
-int wxPGCellRenderer::PreDrawCell( wxDC& dc, const wxRect& rect, const wxPGCell& cell, int flags ) const
-{
-    int imageWidth = 0;
-
-    // If possible, use cell colours
-    if ( !(flags & DontUseCellBgCol) )
-    {
-        const wxColour& bgCol = cell.GetBgCol();
-        dc.SetPen(bgCol);
-        dc.SetBrush(bgCol);
-    }
-
-    if ( !(flags & DontUseCellFgCol) )
-    {
-        dc.SetTextForeground(cell.GetFgCol());
-    }
-
-    // Draw Background, but only if not rendering in control
-    // (as control already has rendered correct background).
-    if ( !(flags & (Control|ChoicePopup)) )
-        dc.DrawRectangle(rect);
-
-    // Use cell font, if provided
-    const wxFont& font = cell.GetFont();
-    if ( font.IsOk() )
-        dc.SetFont(font);
-
-    const wxBitmap& bmp = cell.GetBitmap();
-    if ( bmp.IsOk() &&
-        // Do not draw oversized bitmap outside choice popup
-         ((flags & ChoicePopup) || bmp.GetHeight() < rect.height )
-        )
-    {
-        dc.DrawBitmap( bmp,
-                       rect.x + wxPG_CONTROL_MARGIN + wxCC_CUSTOM_IMAGE_MARGIN1,
-                       rect.y + wxPG_CUSTOM_IMAGE_SPACINGY,
-                       true );
-        imageWidth = bmp.GetWidth();
-    }
-
-    return imageWidth;
-}
-
-void wxPGCellRenderer::PostDrawCell( wxDC& dc,
-                                     const wxPropertyGrid* propGrid,
-                                     const wxPGCell& cell,
-                                     int WXUNUSED(flags) ) const
-{
-    // Revert font
-    const wxFont& font = cell.GetFont();
-    if ( font.IsOk() )
-        dc.SetFont(propGrid->GetFont());
-}
-
-// -----------------------------------------------------------------------
-// wxPGDefaultRenderer
-// -----------------------------------------------------------------------
-
-bool wxPGDefaultRenderer::Render( wxDC& dc, const wxRect& rect,
-                                  const wxPropertyGrid* propertyGrid, wxPGProperty* property,
-                                  int column, int item, int flags ) const
-{
-    const wxPGEditor* editor = NULL;
-    const wxPGCell* cell = NULL;
-
-    wxString text;
-    bool isUnspecified = property->IsValueUnspecified();
-
-    if ( column == 1 && item == -1 )
-    {
-        int cmnVal = property->GetCommonValue();
-        if ( cmnVal >= 0 )
-        {
-            // Common Value
-            if ( !isUnspecified )
-            {
-                text = propertyGrid->GetCommonValueLabel(cmnVal);
-                DrawText( dc, rect, 0, text );
-                if ( !text.empty() )
-                    return true;
-            }
-            return false;
-        }
-    }
-
-    int imageWidth = 0;
-    int preDrawFlags = flags;
-    bool res = false;
-
-    property->GetDisplayInfo(column, item, flags, &text, &cell);
-
-    imageWidth = PreDrawCell( dc, rect, *cell, preDrawFlags );
-
-    if ( column == 1 )
-    {
-        editor = property->GetColumnEditor(column);
-
-        if ( !isUnspecified )
-        {
-            // Regular property value
-
-            wxSize imageSize = propertyGrid->GetImageSize(property, item);
-
-            wxPGPaintData paintdata;
-            paintdata.m_parent = propertyGrid;
-            paintdata.m_choiceItem = item;
-
-            if ( imageSize.x > 0 )
-            {
-                wxRect imageRect(rect.x + wxPG_CONTROL_MARGIN + wxCC_CUSTOM_IMAGE_MARGIN1,
-                                 rect.y+wxPG_CUSTOM_IMAGE_SPACINGY,
-                                 wxPG_CUSTOM_IMAGE_WIDTH,
-                                 rect.height-(wxPG_CUSTOM_IMAGE_SPACINGY*2));
-
-                dc.SetPen( wxPen(propertyGrid->GetCellTextColour(), 1, wxSOLID) );
-
-                paintdata.m_drawnWidth = imageSize.x;
-                paintdata.m_drawnHeight = imageSize.y;
-
-                property->OnCustomPaint( dc, imageRect, paintdata );
-
-                imageWidth = paintdata.m_drawnWidth;
-            }
-
-            text = property->GetValueAsString();
-
-            // Add units string?
-            if ( propertyGrid->GetColumnCount() <= 2 )
-            {
-                wxString unitsString = property->GetAttribute(wxPGGlobalVars->m_strUnits, wxEmptyString);
-                if ( !unitsString.empty() )
-                    text = wxString::Format(wxS("%s %s"), text.c_str(), unitsString.c_str() );
-            }
-        }
-
-        if ( text.empty() )
-        {
-            text = property->GetHintText();
-            if ( !text.empty() )
-            {
-                res = true;
-
-                const wxColour& hCol =
-                    propertyGrid->GetCellDisabledTextColour();
-                dc.SetTextForeground(hCol);
-
-                // Must make the editor NULL to override its own rendering
-                // code.
-                editor = NULL;
-            }
-        }
-        else
-        {
-            res = true;
-        }
-    }
-
-    int imageOffset = property->GetImageOffset(imageWidth);
-
-    DrawEditorValue( dc, rect, imageOffset, text, property, editor );
-
-    // active caption gets nice dotted rectangle
-    if ( property->IsCategory() && column == 0 )
-    {
-        if ( flags & Selected )
-        {
-            if ( imageOffset > 0 )
-            {
-                imageOffset -= DEFAULT_IMAGE_OFFSET_INCREMENT;
-                imageOffset += wxCC_CUSTOM_IMAGE_MARGIN2 + 4;
-            }
-
-            DrawCaptionSelectionRect( dc,
-                                      rect.x+wxPG_XBEFORETEXT-wxPG_CAPRECTXMARGIN+imageOffset,
-                                      rect.y-wxPG_CAPRECTYMARGIN+1,
-                                      ((wxPropertyCategory*)property)->GetTextExtent(propertyGrid,
-                                                                                     propertyGrid->GetCaptionFont())
-                                      +(wxPG_CAPRECTXMARGIN*2),
-                                      propertyGrid->GetFontHeight()+(wxPG_CAPRECTYMARGIN*2) );
-        }
-    }
-
-    PostDrawCell(dc, propertyGrid, *cell, preDrawFlags);
-
-    return res;
-}
-
-wxSize wxPGDefaultRenderer::GetImageSize( const wxPGProperty* property,
-                                          int column,
-                                          int item ) const
-{
-    if ( property && column == 1 )
-    {
-        if ( item == -1 )
-        {
-            wxBitmap* bmp = property->GetValueImage();
-
-            if ( bmp && bmp->IsOk() )
-                return wxSize(bmp->GetWidth(),bmp->GetHeight());
-        }
-    }
-    return wxSize(0,0);
-}
-
-// -----------------------------------------------------------------------
-// wxPGCellData
-// -----------------------------------------------------------------------
-
-wxPGCellData::wxPGCellData()
-    : wxObjectRefData()
-{
-    m_hasValidText = false;
-}
-
-// -----------------------------------------------------------------------
-// wxPGCell
-// -----------------------------------------------------------------------
-
-wxPGCell::wxPGCell()
-    : wxObject()
-{
-}
-
-wxPGCell::wxPGCell( const wxString& text,
-                    const wxBitmap& bitmap,
-                    const wxColour& fgCol,
-                    const wxColour& bgCol )
-    : wxObject()
-{
-    wxPGCellData* data = new wxPGCellData();
-    m_refData = data;
-    data->m_text = text;
-    data->m_bitmap = bitmap;
-    data->m_fgCol = fgCol;
-    data->m_bgCol = bgCol;
-    data->m_hasValidText = true;
-}
-
-wxObjectRefData *wxPGCell::CloneRefData( const wxObjectRefData *data ) const
-{
-    wxPGCellData* c = new wxPGCellData();
-    const wxPGCellData* o = (const wxPGCellData*) data;
-    c->m_text = o->m_text;
-    c->m_bitmap = o->m_bitmap;
-    c->m_fgCol = o->m_fgCol;
-    c->m_bgCol = o->m_bgCol;
-    c->m_hasValidText = o->m_hasValidText;
-    return c;
-}
-
-void wxPGCell::SetText( const wxString& text )
-{
-    AllocExclusive();
-
-    GetData()->SetText(text);
-}
-
-void wxPGCell::SetBitmap( const wxBitmap& bitmap )
-{
-    AllocExclusive();
-
-    GetData()->SetBitmap(bitmap);
-}
-
-void wxPGCell::SetFgCol( const wxColour& col )
-{
-    AllocExclusive();
-
-    GetData()->SetFgCol(col);
-}
-
-void wxPGCell::SetFont( const wxFont& font )
-{
-    AllocExclusive();
-
-    GetData()->SetFont(font);
-}
-
-void wxPGCell::SetBgCol( const wxColour& col )
-{
-    AllocExclusive();
-
-    GetData()->SetBgCol(col);
-}
-
-void wxPGCell::MergeFrom( const wxPGCell& srcCell )
-{
-    AllocExclusive();
-
-    wxPGCellData* data = GetData();
-
-    if ( srcCell.HasText() )
-        data->SetText(srcCell.GetText());
-
-    if ( srcCell.GetFgCol().IsOk() )
-        data->SetFgCol(srcCell.GetFgCol());
-
-    if ( srcCell.GetBgCol().IsOk() )
-        data->SetBgCol(srcCell.GetBgCol());
-
-    if ( srcCell.GetBitmap().IsOk() )
-        data->SetBitmap(srcCell.GetBitmap());
-}
-
-void wxPGCell::SetEmptyData()
-{
-    AllocExclusive();
-}
-
-
-// -----------------------------------------------------------------------
-// wxPGProperty
-// -----------------------------------------------------------------------
-
-IMPLEMENT_ABSTRACT_CLASS(wxPGProperty, wxObject)
-
-wxString* wxPGProperty::sm_wxPG_LABEL = NULL;
-
-void wxPGProperty::Init()
-{
-    m_commonValue = -1;
-    m_arrIndex = 0xFFFF;
-    m_parent = NULL;
-
-    m_parentState = NULL;
-
-    m_clientData = NULL;
-    m_clientObject = NULL;
-
-    m_customEditor = NULL;
-#if wxUSE_VALIDATORS
-    m_validator = NULL;
-#endif
-    m_valueBitmap = NULL;
-
-    m_maxLen = 0; // infinite maximum length
-
-    m_flags = wxPG_PROP_PROPERTY;
-
-    m_depth = 1;
-
-    SetExpanded(true);
-}
-
-
-void wxPGProperty::Init( const wxString& label, const wxString& name )
-{
-    // We really need to check if &label and &name are NULL pointers
-    // (this can if we are called before property grid has been initalized)
-
-    if ( (&label) != NULL && label != wxPG_LABEL )
-        m_label = label;
-
-    if ( (&name) != NULL && name != wxPG_LABEL )
-        DoSetName( name );
-    else
-        DoSetName( m_label );
-
-    Init();
-}
-
-void wxPGProperty::InitAfterAdded( wxPropertyGridPageState* pageState,
-                                   wxPropertyGrid* propgrid )
-{
-    //
-    // Called after property has been added to grid or page
-    // (so propgrid can be NULL, too).
-
-    wxPGProperty* parent = m_parent;
-    bool parentIsRoot = parent->IsKindOf(wxCLASSINFO(wxPGRootProperty));
-
-    //
-    // Convert invalid cells to default ones in this grid
-    for ( unsigned int i=0; iGetPropertyDefaultCell();
-            const wxPGCell& catDefCell = propgrid->GetCategoryDefaultCell();
-
-            if ( !HasFlag(wxPG_PROP_CATEGORY) )
-                cell = propDefCell;
-            else
-                cell = catDefCell;
-        }
-    }
-
-    m_parentState = pageState;
-
-#if wxPG_COMPATIBILITY_1_4
-    // Make sure deprecated virtual functions are not implemented
-    wxString s = GetValueAsString( 0xFFFF );
-    wxASSERT_MSG( s == g_invalidStringContent,
-                  "Implement ValueToString() instead of GetValueAsString()" );
-#endif
-
-    if ( !parentIsRoot && !parent->IsCategory() )
-    {
-        m_cells = parent->m_cells;
-    }
-
-    // If in hideable adding mode, or if assigned parent is hideable, then
-    // make this one hideable.
-    if (
-         ( !parentIsRoot && parent->HasFlag(wxPG_PROP_HIDDEN) ) ||
-         ( propgrid && (propgrid->HasInternalFlag(wxPG_FL_ADDING_HIDEABLES)) )
-       )
-        SetFlag( wxPG_PROP_HIDDEN );
-
-    // Set custom image flag.
-    int custImgHeight = OnMeasureImage().y;
-    if ( custImgHeight < 0 )
-    {
-        SetFlag(wxPG_PROP_CUSTOMIMAGE);
-    }
-
-    if ( propgrid && (propgrid->HasFlag(wxPG_LIMITED_EDITING)) )
-        SetFlag(wxPG_PROP_NOEDITOR);
-
-    // Make sure parent has some parental flags
-    if ( !parent->HasFlag(wxPG_PROP_PARENTAL_FLAGS) )
-        parent->SetParentalType(wxPG_PROP_MISC_PARENT);
-
-    if ( !IsCategory() )
-    {
-        // This is not a category.
-
-        // Depth.
-        //
-        unsigned char depth = 1;
-        if ( !parentIsRoot )
-        {
-            depth = parent->m_depth;
-            if ( !parent->IsCategory() )
-                depth++;
-        }
-        m_depth = depth;
-        unsigned char greyDepth = depth;
-
-        if ( !parentIsRoot )
-        {
-            wxPropertyCategory* pc;
-
-            if ( parent->IsCategory() )
-                pc = (wxPropertyCategory* ) parent;
-            else
-                // This conditional compile is necessary to
-                // bypass some compiler bug.
-                pc = pageState->GetPropertyCategory(parent);
-
-            if ( pc )
-                greyDepth = pc->GetDepth();
-            else
-                greyDepth = parent->m_depthBgCol;
-        }
-
-        m_depthBgCol = greyDepth;
-    }
-    else
-    {
-        // This is a category.
-
-        // depth
-        unsigned char depth = 1;
-        if ( !parentIsRoot )
-        {
-            depth = parent->m_depth + 1;
-        }
-        m_depth = depth;
-        m_depthBgCol = depth;
-    }
-
-    //
-    // Has initial children
-    if ( GetChildCount() )
-    {
-        // Check parental flags
-        wxASSERT_MSG( ((m_flags & wxPG_PROP_PARENTAL_FLAGS) ==
-                            wxPG_PROP_AGGREGATE) ||
-                      ((m_flags & wxPG_PROP_PARENTAL_FLAGS) ==
-                            wxPG_PROP_MISC_PARENT),
-                      "wxPGProperty parental flags set incorrectly at "
-                      "this time" );
-
-        if ( HasFlag(wxPG_PROP_AGGREGATE) )
-        {
-            // Properties with private children are not expanded by default.
-            SetExpanded(false);
-        }
-        else if ( propgrid && propgrid->HasFlag(wxPG_HIDE_MARGIN) )
-        {
-            // ...unless it cannot be expanded by user and therefore must
-            // remain visible at all times
-            SetExpanded(true);
-        }
-
-        //
-        // Prepare children recursively
-        for ( unsigned int i=0; iInitAfterAdded(pageState, pageState->GetGrid());
-        }
-
-        if ( propgrid && (propgrid->GetExtraStyle() & wxPG_EX_AUTO_UNSPECIFIED_VALUES) )
-            SetFlagRecursively(wxPG_PROP_AUTO_UNSPECIFIED, true);
-    }
-}
-
-void wxPGProperty::OnDetached(wxPropertyGridPageState* WXUNUSED(state),
-                              wxPropertyGrid* propgrid)
-{
-    if ( propgrid )
-    {
-        const wxPGCell& propDefCell = propgrid->GetPropertyDefaultCell();
-        const wxPGCell& catDefCell = propgrid->GetCategoryDefaultCell();
-
-        // Make default cells invalid
-        for ( unsigned int i=0; im_parent;
-    } while ( parent );
-    return false;
-}
-
-void wxPGProperty::SetName( const wxString& newName )
-{
-    wxPropertyGrid* pg = GetGrid();
-
-    if ( pg )
-        pg->SetPropertyName(this, newName);
-    else
-        DoSetName(newName);
-}
-
-wxString wxPGProperty::GetName() const
-{
-    wxPGProperty* parent = GetParent();
-
-    if ( m_name.empty() || !parent || parent->IsCategory() || parent->IsRoot() )
-        return m_name;
-
-    return m_parent->GetName() + wxS(".") + m_name;
-}
-
-wxPropertyGrid* wxPGProperty::GetGrid() const
-{
-    if ( !m_parentState )
-        return NULL;
-    return m_parentState->GetGrid();
-}
-
-int wxPGProperty::Index( const wxPGProperty* p ) const
-{
-    return wxPGFindInVector(m_children, p);
-}
-
-bool wxPGProperty::ValidateValue( wxVariant& WXUNUSED(value), wxPGValidationInfo& WXUNUSED(validationInfo) ) const
-{
-    return true;
-}
-
-void wxPGProperty::OnSetValue()
-{
-}
-
-void wxPGProperty::RefreshChildren ()
-{
-}
-
-void wxPGProperty::OnValidationFailure( wxVariant& WXUNUSED(pendingValue) )
-{
-}
-
-void wxPGProperty::GetDisplayInfo( unsigned int column,
-                                   int choiceIndex,
-                                   int flags,
-                                   wxString* pString,
-                                   const wxPGCell** pCell )
-{
-    const wxPGCell* cell = NULL;
-
-    if ( !(flags & wxPGCellRenderer::ChoicePopup) )
-    {
-        // Not painting list of choice popups, so get text from property
-        if ( column != 1 || !IsValueUnspecified() || IsCategory() )
-        {
-            cell = &GetCell(column);
-        }
-        else
-        {
-            // Use special unspecified value cell
-            cell = &GetGrid()->GetUnspecifiedValueAppearance();
-        }
-
-        if ( cell->HasText() )
-        {
-            *pString = cell->GetText();
-        }
-        else
-        {
-            if ( column == 0 )
-                *pString = GetLabel();
-            else if ( column == 1 )
-                *pString = GetDisplayedString();
-            else if ( column == 2 )
-                *pString = GetAttribute(wxPGGlobalVars->m_strUnits, wxEmptyString);
-        }
-    }
-    else
-    {
-        wxASSERT( column == 1 );
-
-        if ( choiceIndex != wxNOT_FOUND )
-        {
-            const wxPGChoiceEntry& entry = m_choices[choiceIndex];
-            if ( entry.GetBitmap().IsOk() ||
-                 entry.GetFgCol().IsOk() ||
-                 entry.GetBgCol().IsOk() )
-                cell = &entry;
-            *pString = m_choices.GetLabel(choiceIndex);
-        }
-    }
-
-    if ( !cell )
-        cell = &GetCell(column);
-
-    wxASSERT_MSG( cell->GetData(),
-                  wxString::Format("Invalid cell for property %s",
-                                   GetName().c_str()) );
-
-    *pCell = cell;
-}
-
-/*
-wxString wxPGProperty::GetColumnText( unsigned int col, int choiceIndex ) const
-{
-
-    if ( col != 1 || choiceIndex == wxNOT_FOUND )
-    {
-        const wxPGCell& cell = GetCell(col);
-        if ( cell->HasText() )
-        {
-            return cell->GetText();
-        }
-        else
-        {
-            if ( col == 0 )
-                return GetLabel();
-            else if ( col == 1 )
-                return GetDisplayedString();
-            else if ( col == 2 )
-                return GetAttribute(wxPGGlobalVars->m_strUnits, wxEmptyString);
-        }
-    }
-    else
-    {
-        // Use choice
-        return m_choices.GetLabel(choiceIndex);
-    }
-
-    return wxEmptyString;
-}
-*/
-
-void wxPGProperty::DoGenerateComposedValue( wxString& text,
-                                            int argFlags,
-                                            const wxVariantList* valueOverrides,
-                                            wxPGHashMapS2S* childResults ) const
-{
-    int i;
-    int iMax = m_children.size();
-
-    text.clear();
-    if ( iMax == 0 )
-        return;
-
-    if ( iMax > PWC_CHILD_SUMMARY_LIMIT &&
-         !(argFlags & wxPG_FULL_VALUE) )
-        iMax = PWC_CHILD_SUMMARY_LIMIT;
-
-    int iMaxMinusOne = iMax-1;
-
-    if ( !IsTextEditable() )
-        argFlags |= wxPG_UNEDITABLE_COMPOSITE_FRAGMENT;
-
-    wxPGProperty* curChild = m_children[0];
-
-    bool overridesLeft = false;
-    wxVariant overrideValue;
-    wxVariantList::const_iterator node;
-
-    if ( valueOverrides )
-    {
-        node = valueOverrides->begin();
-        if ( node != valueOverrides->end() )
-        {
-            overrideValue = *node;
-            overridesLeft = true;
-        }
-    }
-
-    for ( i = 0; i < iMax; i++ )
-    {
-        wxVariant childValue;
-
-        wxString childLabel = curChild->GetLabel();
-
-        // Check for value override
-        if ( overridesLeft && overrideValue.GetName() == childLabel )
-        {
-            if ( !overrideValue.IsNull() )
-                childValue = overrideValue;
-            else
-                childValue = curChild->GetValue();
-            ++node;
-            if ( node != valueOverrides->end() )
-                overrideValue = *node;
-            else
-                overridesLeft = false;
-        }
-        else
-        {
-            childValue = curChild->GetValue();
-        }
-
-        wxString s;
-        if ( !childValue.IsNull() )
-        {
-            if ( overridesLeft &&
-                 curChild->HasFlag(wxPG_PROP_COMPOSED_VALUE) &&
-                 childValue.GetType() == wxPG_VARIANT_TYPE_LIST )
-            {
-                wxVariantList& childList = childValue.GetList();
-                DoGenerateComposedValue(s, argFlags|wxPG_COMPOSITE_FRAGMENT,
-                                        &childList, childResults);
-            }
-            else
-            {
-                s = curChild->ValueToString(childValue,
-                                            argFlags|wxPG_COMPOSITE_FRAGMENT);
-            }
-        }
-
-        if ( childResults && curChild->GetChildCount() )
-            (*childResults)[curChild->GetName()] = s;
-
-        bool skip = false;
-        if ( (argFlags & wxPG_UNEDITABLE_COMPOSITE_FRAGMENT) && s.empty() )
-            skip = true;
-
-        if ( !curChild->GetChildCount() || skip )
-            text += s;
-        else
-            text += wxS("[") + s + wxS("]");
-
-        if ( i < iMaxMinusOne )
-        {
-            if ( text.length() > PWC_CHILD_SUMMARY_CHAR_LIMIT &&
-                 !(argFlags & wxPG_EDITABLE_VALUE) &&
-                 !(argFlags & wxPG_FULL_VALUE) )
-                break;
-
-            if ( !skip )
-            {
-                if ( !curChild->GetChildCount() )
-                    text += wxS("; ");
-                else
-                    text += wxS(" ");
-            }
-
-            curChild = m_children[i+1];
-        }
-    }
-
-    if ( (unsigned int)i < m_children.size() )
-    {
-        if ( !text.EndsWith(wxS("; ")) )
-            text += wxS("; ...");
-        else
-            text += wxS("...");
-    }
-}
-
-wxString wxPGProperty::ValueToString( wxVariant& WXUNUSED(value),
-                                      int argFlags ) const
-{
-    wxCHECK_MSG( GetChildCount() > 0,
-                 wxString(),
-                 "If user property does not have any children, it must "
-                 "override GetValueAsString" );
-
-    // FIXME: Currently code below only works if value is actually m_value
-    wxASSERT_MSG( argFlags & wxPG_VALUE_IS_CURRENT,
-                  "Sorry, currently default wxPGProperty::ValueToString() "
-                  "implementation only works if value is m_value." );
-
-    wxString text;
-    DoGenerateComposedValue(text, argFlags);
-    return text;
-}
-
-wxString wxPGProperty::GetValueAsString( int argFlags ) const
-{
-#if wxPG_COMPATIBILITY_1_4
-    // This is backwards compatibility test
-    // That is, to make sure this function is not overridden
-    // (instead, ValueToString() should be).
-    if ( argFlags == 0xFFFF )
-    {
-        // Do not override! (for backwards compliancy)
-        return g_invalidStringContent;
-    }
-#endif
-
-    wxPropertyGrid* pg = GetGrid();
-
-    if ( IsValueUnspecified() )
-        return pg->GetUnspecifiedValueText(argFlags);
-
-    if ( m_commonValue == -1 )
-    {
-        wxVariant value(GetValue());
-        return ValueToString(value, argFlags|wxPG_VALUE_IS_CURRENT);
-    }
-
-    //
-    // Return common value's string representation
-    const wxPGCommonValue* cv = pg->GetCommonValue(m_commonValue);
-
-    if ( argFlags & wxPG_FULL_VALUE )
-    {
-        return cv->GetLabel();
-    }
-    else if ( argFlags & wxPG_EDITABLE_VALUE )
-    {
-        return cv->GetEditableText();
-    }
-    else
-    {
-        return cv->GetLabel();
-    }
-}
-
-wxString wxPGProperty::GetValueString( int argFlags ) const
-{
-    return GetValueAsString(argFlags);
-}
-
-bool wxPGProperty::IntToValue( wxVariant& variant, int number, int WXUNUSED(argFlags) ) const
-{
-    variant = (long)number;
-    return true;
-}
-
-// Convert semicolon delimited tokens into child values.
-bool wxPGProperty::StringToValue( wxVariant& v, const wxString& text, int argFlags ) const
-{
-    if ( !GetChildCount() )
-        return false;
-
-    unsigned int curChild = 0;
-
-    unsigned int iMax = m_children.size();
-
-    if ( iMax > PWC_CHILD_SUMMARY_LIMIT &&
-         !(argFlags & wxPG_FULL_VALUE) )
-        iMax = PWC_CHILD_SUMMARY_LIMIT;
-
-    bool changed = false;
-
-    wxString token;
-    size_t pos = 0;
-
-    // Its best only to add non-empty group items
-    bool addOnlyIfNotEmpty = false;
-    const wxChar delimeter = wxS(';');
-
-    size_t tokenStart = 0xFFFFFF;
-
-    wxVariantList temp_list;
-    wxVariant list(temp_list);
-
-    int propagatedFlags = argFlags & (wxPG_REPORT_ERROR|wxPG_PROGRAMMATIC_VALUE);
-
-    wxLogTrace("propgrid",
-               wxT(">> %s.StringToValue('%s')"), GetLabel(), text);
-
-    wxString::const_iterator it = text.begin();
-    wxUniChar a;
-
-    if ( it != text.end() )
-        a = *it;
-    else
-        a = 0;
-
-    for ( ;; )
-    {
-        // How many units we iterate string forward at the end of loop?
-        // We need to keep track of this or risk going to negative
-        // with it-- operation.
-        unsigned int strPosIncrement = 1;
-
-        if ( tokenStart != 0xFFFFFF )
-        {
-            // Token is running
-            if ( a == delimeter || a == 0 )
-            {
-                token = text.substr(tokenStart,pos-tokenStart);
-                token.Trim(true);
-                size_t len = token.length();
-
-                if ( !addOnlyIfNotEmpty || len > 0 )
-                {
-                    const wxPGProperty* child = Item(curChild);
-                    wxVariant variant(child->GetValue());
-                    wxString childName = child->GetBaseName();
-
-                    wxLogTrace("propgrid",
-                               wxT("token = '%s', child = %s"),
-                               token, childName);
-
-                    // Add only if editable or setting programmatically
-                    if ( (argFlags & wxPG_PROGRAMMATIC_VALUE) ||
-                         (!child->HasFlag(wxPG_PROP_DISABLED) &&
-                          !child->HasFlag(wxPG_PROP_READONLY)) )
-                    {
-                        if ( len > 0 )
-                        {
-                            if ( child->StringToValue(variant, token,
-                                 propagatedFlags|wxPG_COMPOSITE_FRAGMENT) )
-                            {
-                                // We really need to set the variant's name
-                                // *after* child->StringToValue() has been
-                                // called, since variant's value may be set by
-                                // assigning another variant into it, which
-                                // then usually causes name to be copied (ie.
-                                // usually cleared) as well. wxBoolProperty
-                                // being case in point with its use of
-                                // wxPGVariant_Bool macro as an optimization.
-                                variant.SetName(childName);
-                                list.Append(variant);
-
-                                changed = true;
-                            }
-                        }
-                        else
-                        {
-                            // Empty, becomes unspecified
-                            variant.MakeNull();
-                            variant.SetName(childName);
-                            list.Append(variant);
-                            changed = true;
-                        }
-                    }
-
-                    curChild++;
-                    if ( curChild >= iMax )
-                        break;
-                }
-
-                tokenStart = 0xFFFFFF;
-            }
-        }
-        else
-        {
-            // Token is not running
-            if ( a != wxS(' ') )
-            {
-
-                addOnlyIfNotEmpty = false;
-
-                // Is this a group of tokens?
-                if ( a == wxS('[') )
-                {
-                    int depth = 1;
-
-                    if ( it != text.end() ) ++it;
-                    pos++;
-                    size_t startPos = pos;
-
-                    // Group item - find end
-                    while ( it != text.end() && depth > 0 )
-                    {
-                        a = *it;
-                        ++it;
-                        pos++;
-
-                        if ( a == wxS(']') )
-                            depth--;
-                        else if ( a == wxS('[') )
-                            depth++;
-                    }
-
-                    token = text.substr(startPos,pos-startPos-1);
-
-                    if ( token.empty() )
-                        break;
-
-                    const wxPGProperty* child = Item(curChild);
-
-                    wxVariant oldChildValue = child->GetValue();
-                    wxVariant variant(oldChildValue);
-
-                    if ( (argFlags & wxPG_PROGRAMMATIC_VALUE) ||
-                         (!child->HasFlag(wxPG_PROP_DISABLED) &&
-                          !child->HasFlag(wxPG_PROP_READONLY)) )
-                    {
-                        wxString childName = child->GetBaseName();
-
-                        bool stvRes = child->StringToValue( variant, token,
-                                                            propagatedFlags );
-                        if ( stvRes || (variant != oldChildValue) )
-                        {
-                            variant.SetName(childName);
-                            list.Append(variant);
-
-                            changed = true;
-                        }
-                        else
-                        {
-                            // No changes...
-                        }
-                    }
-
-                    curChild++;
-                    if ( curChild >= iMax )
-                        break;
-
-                    addOnlyIfNotEmpty = true;
-
-                    tokenStart = 0xFFFFFF;
-                }
-                else
-                {
-                    tokenStart = pos;
-
-                    if ( a == delimeter )
-                        strPosIncrement -= 1;
-                }
-            }
-        }
-
-        if ( a == 0 )
-            break;
-
-        it += strPosIncrement;
-
-        if ( it != text.end() )
-        {
-            a = *it;
-        }
-        else
-        {
-            a = 0;
-        }
-
-        pos += strPosIncrement;
-    }
-
-    if ( changed )
-        v = list;
-
-    return changed;
-}
-
-bool wxPGProperty::SetValueFromString( const wxString& text, int argFlags )
-{
-    wxVariant variant(m_value);
-    bool res = StringToValue(variant, text, argFlags);
-    if ( res )
-        SetValue(variant);
-    return res;
-}
-
-bool wxPGProperty::SetValueFromInt( long number, int argFlags )
-{
-    wxVariant variant(m_value);
-    bool res = IntToValue(variant, number, argFlags);
-    if ( res )
-        SetValue(variant);
-    return res;
-}
-
-wxSize wxPGProperty::OnMeasureImage( int WXUNUSED(item) ) const
-{
-    if ( m_valueBitmap )
-        return wxSize(m_valueBitmap->GetWidth(),-1);
-
-    return wxSize(0,0);
-}
-
-int wxPGProperty::GetImageOffset( int imageWidth ) const
-{
-    int imageOffset = 0;
-
-    if ( imageWidth )
-    {
-        // Do not increment offset too much for wide images
-        if ( imageWidth <= (wxPG_CUSTOM_IMAGE_WIDTH+5) )
-            imageOffset = imageWidth + DEFAULT_IMAGE_OFFSET_INCREMENT;
-        else
-            imageOffset = imageWidth + 1;
-    }
-
-    return imageOffset;
-}
-
-wxPGCellRenderer* wxPGProperty::GetCellRenderer( int WXUNUSED(column) ) const
-{
-    return wxPGGlobalVars->m_defaultRenderer;
-}
-
-void wxPGProperty::OnCustomPaint( wxDC& dc,
-                                  const wxRect& rect,
-                                  wxPGPaintData& )
-{
-    wxBitmap* bmp = m_valueBitmap;
-
-    wxCHECK_RET( bmp && bmp->IsOk(), wxT("invalid bitmap") );
-
-    wxCHECK_RET( rect.x >= 0, wxT("unexpected measure call") );
-
-    dc.DrawBitmap(*bmp,rect.x,rect.y);
-}
-
-const wxPGEditor* wxPGProperty::DoGetEditorClass() const
-{
-    return wxPGEditor_TextCtrl;
-}
-
-// Default extra property event handling - that is, none at all.
-bool wxPGProperty::OnEvent( wxPropertyGrid*, wxWindow*, wxEvent& )
-{
-    return false;
-}
-
-
-void wxPGProperty::SetValue( wxVariant value, wxVariant* pList, int flags )
-{
-    // If auto unspecified values are not wanted (via window or property style),
-    // then get default value instead of wxNullVariant.
-    if ( value.IsNull() && (flags & wxPG_SETVAL_BY_USER) &&
-         !UsesAutoUnspecified() )
-    {
-        value = GetDefaultValue();
-    }
-
-    if ( !value.IsNull() )
-    {
-        wxVariant tempListVariant;
-
-        SetCommonValue(-1);
-        // List variants are reserved a special purpose
-        // as intermediate containers for child values
-        // of properties with children.
-        if ( value.GetType() == wxPG_VARIANT_TYPE_LIST )
-        {
-            //
-            // However, situation is different for composed string properties
-            if ( HasFlag(wxPG_PROP_COMPOSED_VALUE) )
-            {
-                tempListVariant = value;
-                pList = &tempListVariant;
-            }
-
-            wxVariant newValue;
-            AdaptListToValue(value, &newValue);
-            value = newValue;
-            //wxLogDebug(wxT(">> %s.SetValue() adapted list value to type '%s'"),GetName().c_str(),value.GetType().c_str());
-        }
-
-        if ( HasFlag( wxPG_PROP_AGGREGATE) )
-            flags |= wxPG_SETVAL_AGGREGATED;
-
-        if ( pList && !pList->IsNull() )
-        {
-            wxASSERT( pList->GetType() == wxPG_VARIANT_TYPE_LIST );
-            wxASSERT( GetChildCount() );
-            wxASSERT( !IsCategory() );
-
-            wxVariantList& list = pList->GetList();
-            wxVariantList::iterator node;
-            unsigned int i = 0;
-
-            //wxLogDebug(wxT(">> %s.SetValue() pList parsing"),GetName().c_str());
-
-            // Children in list can be in any order, but we will give hint to
-            // GetPropertyByNameWH(). This optimizes for full list parsing.
-            for ( node = list.begin(); node != list.end(); ++node )
-            {
-                wxVariant& childValue = *((wxVariant*)*node);
-                wxPGProperty* child = GetPropertyByNameWH(childValue.GetName(), i);
-                if ( child )
-                {
-                    //wxLogDebug(wxT("%i: child = %s, childValue.GetType()=%s"),i,child->GetBaseName().c_str(),childValue.GetType().c_str());
-                    if ( childValue.GetType() == wxPG_VARIANT_TYPE_LIST )
-                    {
-                        if ( child->HasFlag(wxPG_PROP_AGGREGATE) && !(flags & wxPG_SETVAL_AGGREGATED) )
-                        {
-                            wxVariant listRefCopy = childValue;
-                            child->SetValue(childValue, &listRefCopy, flags|wxPG_SETVAL_FROM_PARENT);
-                        }
-                        else
-                        {
-                            wxVariant oldVal = child->GetValue();
-                            child->SetValue(oldVal, &childValue, flags|wxPG_SETVAL_FROM_PARENT);
-                        }
-                    }
-                    else if ( child->GetValue() != childValue )
-                    {
-                        // For aggregate properties, we will trust RefreshChildren()
-                        // to update child values.
-                        if ( !HasFlag(wxPG_PROP_AGGREGATE) )
-                            child->SetValue(childValue, NULL, flags|wxPG_SETVAL_FROM_PARENT);
-                        if ( flags & wxPG_SETVAL_BY_USER )
-                            child->SetFlag(wxPG_PROP_MODIFIED);
-                    }
-                }
-                i++;
-            }
-
-            // Always call OnSetValue() for a parent property (do not call it
-            // here if the value is non-null because it will then be called
-            // below)
-            if ( value.IsNull() )
-                OnSetValue();
-        }
-
-        if ( !value.IsNull() )
-        {
-            m_value = value;
-            OnSetValue();
-        }
-
-        if ( flags & wxPG_SETVAL_BY_USER )
-            SetFlag(wxPG_PROP_MODIFIED);
-
-        if ( HasFlag(wxPG_PROP_AGGREGATE) )
-            RefreshChildren();
-    }
-    else
-    {
-        if ( m_commonValue != -1 )
-        {
-            wxPropertyGrid* pg = GetGrid();
-            if ( !pg || m_commonValue != pg->GetUnspecifiedCommonValue() )
-                SetCommonValue(-1);
-        }
-
-        m_value = value;
-
-        // Set children to unspecified, but only if aggregate or
-        // value is 
-        if ( AreChildrenComponents() )
-        {
-            unsigned int i;
-            for ( i=0; iSetValue(value, NULL, flags|wxPG_SETVAL_FROM_PARENT);
-        }
-    }
-
-    if ( !(flags & wxPG_SETVAL_FROM_PARENT) )
-        UpdateParentValues();
-
-    //
-    // Update editor control.
-    if ( flags & wxPG_SETVAL_REFRESH_EDITOR )
-    {
-        wxPropertyGrid* pg = GetGridIfDisplayed();
-        if ( pg )
-        {
-            wxPGProperty* selected = pg->GetSelectedProperty();
-
-            // Only refresh the control if this was selected, or
-            // this was some parent of selected, or vice versa)
-            if ( selected && (selected == this ||
-                              selected->IsSomeParent(this) ||
-                              this->IsSomeParent(selected)) )
-                RefreshEditor();
-
-            pg->DrawItemAndValueRelated(this);
-        }
-    }
-}
-
-
-void wxPGProperty::SetValueInEvent( wxVariant value ) const
-{
-    GetGrid()->ValueChangeInEvent(value);
-}
-
-void wxPGProperty::SetFlagRecursively( wxPGPropertyFlags flag, bool set )
-{
-    ChangeFlag(flag, set);
-
-    unsigned int i;
-    for ( i = 0; i < GetChildCount(); i++ )
-        Item(i)->SetFlagRecursively(flag, set);
-}
-
-void wxPGProperty::RefreshEditor()
-{
-    if ( !m_parent )
-        return;
-
-    wxPropertyGrid* pg = GetGrid();
-    if ( pg && pg->GetSelectedProperty() == this )
-        pg->RefreshEditor();
-}
-
-wxVariant wxPGProperty::GetDefaultValue() const
-{
-    wxVariant defVal = GetAttribute(wxPG_ATTR_DEFAULT_VALUE);
-    if ( !defVal.IsNull() )
-        return defVal;
-
-    wxVariant value = GetValue();
-
-    if ( !value.IsNull() )
-    {
-        wxString valueType(value.GetType());
-
-        if ( valueType == wxPG_VARIANT_TYPE_LONG )
-            return wxPGVariant_Zero;
-        if ( valueType == wxPG_VARIANT_TYPE_STRING )
-            return wxPGVariant_EmptyString;
-        if ( valueType == wxPG_VARIANT_TYPE_BOOL )
-            return wxPGVariant_False;
-        if ( valueType == wxPG_VARIANT_TYPE_DOUBLE )
-            return wxVariant(0.0);
-        if ( valueType == wxPG_VARIANT_TYPE_ARRSTRING )
-            return wxVariant(wxArrayString());
-        if ( valueType == wxS("wxLongLong") )
-            return WXVARIANT(wxLongLong(0));
-        if ( valueType == wxS("wxULongLong") )
-            return WXVARIANT(wxULongLong(0));
-        if ( valueType == wxS("wxColour") )
-            return WXVARIANT(*wxBLACK);
-#if wxUSE_DATETIME
-        if ( valueType == wxPG_VARIANT_TYPE_DATETIME )
-            return wxVariant(wxDateTime::Now());
-#endif
-        if ( valueType == wxS("wxFont") )
-            return WXVARIANT(*wxNORMAL_FONT);
-        if ( valueType == wxS("wxPoint") )
-            return WXVARIANT(wxPoint(0, 0));
-        if ( valueType == wxS("wxSize") )
-            return WXVARIANT(wxSize(0, 0));
-    }
-
-    return wxVariant();
-}
-
-void wxPGProperty::Enable( bool enable )
-{
-    wxPropertyGrid* pg = GetGrid();
-
-    // Preferably call the version in the owning wxPropertyGrid,
-    // since it handles the editor de-activation.
-    if ( pg )
-        pg->EnableProperty(this, enable);
-    else
-        DoEnable(enable);
-}
-
-void wxPGProperty::DoEnable( bool enable )
-{
-    if ( enable )
-        ClearFlag(wxPG_PROP_DISABLED);
-    else
-        SetFlag(wxPG_PROP_DISABLED);
-
-    // Apply same to sub-properties as well
-    unsigned int i;
-    for ( i = 0; i < GetChildCount(); i++ )
-        Item(i)->DoEnable( enable );
-}
-
-void wxPGProperty::EnsureCells( unsigned int column )
-{
-    if ( column >= m_cells.size() )
-    {
-        // Fill empty slots with default cells
-        wxPropertyGrid* pg = GetGrid();
-        wxPGCell defaultCell;
-
-        if ( pg )
-        {
-            // Work around possible VC6 bug by using intermediate variables
-            const wxPGCell& propDefCell = pg->GetPropertyDefaultCell();
-            const wxPGCell& catDefCell = pg->GetCategoryDefaultCell();
-
-            if ( !HasFlag(wxPG_PROP_CATEGORY) )
-                defaultCell = propDefCell;
-            else
-                defaultCell = catDefCell;
-        }
-
-        // TODO: Replace with resize() call
-        unsigned int cellCountMax = column+1;
-
-        for ( unsigned int i=m_cells.size(); iAdaptiveSetCell( firstCol,
-                                      lastCol,
-                                      cell,
-                                      srcData,
-                                      unmodCellData,
-                                      ignoreWithFlags,
-                                      recursively );
-    }
-}
-
-const wxPGCell& wxPGProperty::GetCell( unsigned int column ) const
-{
-    if ( m_cells.size() > column )
-        return m_cells[column];
-
-    wxPropertyGrid* pg = GetGrid();
-
-    if ( IsCategory() )
-        return pg->GetCategoryDefaultCell();
-
-    return pg->GetPropertyDefaultCell();
-}
-
-wxPGCell& wxPGProperty::GetOrCreateCell( unsigned int column )
-{
-    EnsureCells(column);
-    return m_cells[column];
-}
-
-void wxPGProperty::SetBackgroundColour( const wxColour& colour,
-                                        int flags )
-{
-    wxPGProperty* firstProp = this;
-    bool recursively = flags & wxPG_RECURSE ? true : false;
-
-    //
-    // If category is tried to set recursively, skip it and only
-    // affect the children.
-    if ( recursively )
-    {
-        while ( firstProp->IsCategory() )
-        {
-            if ( !firstProp->GetChildCount() )
-                return;
-            firstProp = firstProp->Item(0);
-        }
-    }
-
-    wxPGCell& firstCell = firstProp->GetCell(0);
-    wxPGCellData* firstCellData = firstCell.GetData();
-
-    wxPGCell newCell(firstCell);
-    newCell.SetBgCol(colour);
-    wxPGCell srcCell;
-    srcCell.SetBgCol(colour);
-
-    AdaptiveSetCell( 0,
-                     GetParentState()->GetColumnCount()-1,
-                     newCell,
-                     srcCell,
-                     firstCellData,
-                     recursively ? wxPG_PROP_CATEGORY : 0,
-                     recursively );
-}
-
-void wxPGProperty::SetTextColour( const wxColour& colour,
-                                  int flags )
-{
-    wxPGProperty* firstProp = this;
-    bool recursively = flags & wxPG_RECURSE ? true : false;
-
-    //
-    // If category is tried to set recursively, skip it and only
-    // affect the children.
-    if ( recursively )
-    {
-        while ( firstProp->IsCategory() )
-        {
-            if ( !firstProp->GetChildCount() )
-                return;
-            firstProp = firstProp->Item(0);
-        }
-    }
-
-    wxPGCell& firstCell = firstProp->GetCell(0);
-    wxPGCellData* firstCellData = firstCell.GetData();
-
-    wxPGCell newCell(firstCell);
-    newCell.SetFgCol(colour);
-    wxPGCell srcCell;
-    srcCell.SetFgCol(colour);
-
-    AdaptiveSetCell( 0,
-                     GetParentState()->GetColumnCount()-1,
-                     newCell,
-                     srcCell,
-                     firstCellData,
-                     recursively ? wxPG_PROP_CATEGORY : 0,
-                     recursively );
-}
-
-wxPGEditorDialogAdapter* wxPGProperty::GetEditorDialog() const
-{
-    return NULL;
-}
-
-bool wxPGProperty::DoSetAttribute( const wxString& WXUNUSED(name), wxVariant& WXUNUSED(value) )
-{
-    return false;
-}
-
-void wxPGProperty::SetAttribute( const wxString& name, wxVariant value )
-{
-    if ( DoSetAttribute( name, value ) )
-    {
-        // Support working without grid, when possible
-        if ( wxPGGlobalVars->HasExtraStyle( wxPG_EX_WRITEONLY_BUILTIN_ATTRIBUTES ) )
-            return;
-    }
-
-    m_attributes.Set( name, value );
-}
-
-void wxPGProperty::SetAttributes( const wxPGAttributeStorage& attributes )
-{
-    wxPGAttributeStorage::const_iterator it = attributes.StartIteration();
-    wxVariant variant;
-
-    while ( attributes.GetNext(it, variant) )
-        SetAttribute( variant.GetName(), variant );
-}
-
-wxVariant wxPGProperty::DoGetAttribute( const wxString& WXUNUSED(name) ) const
-{
-    return wxVariant();
-}
-
-
-wxVariant wxPGProperty::GetAttribute( const wxString& name ) const
-{
-    return m_attributes.FindValue(name);
-}
-
-wxString wxPGProperty::GetAttribute( const wxString& name, const wxString& defVal ) const
-{
-    wxVariant variant = m_attributes.FindValue(name);
-
-    if ( !variant.IsNull() )
-        return variant.GetString();
-
-    return defVal;
-}
-
-long wxPGProperty::GetAttributeAsLong( const wxString& name, long defVal ) const
-{
-    wxVariant variant = m_attributes.FindValue(name);
-
-    if ( variant.IsNull() )
-        return defVal;
-
-    return variant.GetLong();
-}
-
-double wxPGProperty::GetAttributeAsDouble( const wxString& name, double defVal ) const
-{
-    wxVariant variant = m_attributes.FindValue(name);
-
-    if ( variant.IsNull() )
-        return defVal;
-
-    return variant.GetDouble();
-}
-
-wxVariant wxPGProperty::GetAttributesAsList() const
-{
-    wxVariantList tempList;
-    wxVariant v( tempList, wxString::Format(wxS("@%s@attr"),m_name.c_str()) );
-
-    wxPGAttributeStorage::const_iterator it = m_attributes.StartIteration();
-    wxVariant variant;
-
-    while ( m_attributes.GetNext(it, variant) )
-        v.Append(variant);
-
-    return v;
-}
-
-// Slots of utility flags are NULL
-const unsigned int gs_propFlagToStringSize = 14;
-
-static const wxChar* const gs_propFlagToString[gs_propFlagToStringSize] = {
-    NULL,
-    wxT("DISABLED"),
-    wxT("HIDDEN"),
-    NULL,
-    wxT("NOEDITOR"),
-    wxT("COLLAPSED"),
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL
-};
-
-wxString wxPGProperty::GetFlagsAsString( FlagType flagsMask ) const
-{
-    wxString s;
-    int relevantFlags = m_flags & flagsMask & wxPG_STRING_STORED_FLAGS;
-    FlagType a = 1;
-
-    unsigned int i = 0;
-    for ( i=0; iGetSelection() )
-        GetEditorClass()->InsertItem(pg->GetEditorControl(),label,index);
-
-    return index;
-}
-
-
-void wxPGProperty::DeleteChoice( int index )
-{
-    wxPropertyGrid* pg = GetGrid();
-
-    int sel = GetChoiceSelection();
-    int newSel = sel;
-
-    // Adjust current value
-    if ( sel == index )
-    {
-        SetValueToUnspecified();
-        newSel = 0;
-    }
-    else if ( index < sel )
-    {
-        newSel--;
-    }
-
-    m_choices.RemoveAt(index);
-
-    if ( sel != newSel )
-        SetChoiceSelection(newSel);
-
-    if ( this == pg->GetSelection() )
-        GetEditorClass()->DeleteItem(pg->GetEditorControl(), index);
-}
-
-int wxPGProperty::GetChoiceSelection() const
-{
-    wxVariant value = GetValue();
-    wxString valueType = value.GetType();
-    int index = wxNOT_FOUND;
-
-    if ( IsValueUnspecified() || !m_choices.GetCount() )
-        return wxNOT_FOUND;
-
-    if ( valueType == wxPG_VARIANT_TYPE_LONG )
-    {
-        index = value.GetLong();
-    }
-    else if ( valueType == wxPG_VARIANT_TYPE_STRING )
-    {
-        index = m_choices.Index(value.GetString());
-    }
-    else if ( valueType == wxPG_VARIANT_TYPE_BOOL )
-    {
-        index = value.GetBool()? 1 : 0;
-    }
-
-    return index;
-}
-
-void wxPGProperty::SetChoiceSelection( int newValue )
-{
-    // Changes value of a property with choices, but only
-    // works if the value type is long or string.
-    wxString valueType = GetValue().GetType();
-
-    wxCHECK_RET( m_choices.IsOk(), wxT("invalid choiceinfo") );
-
-    if ( valueType == wxPG_VARIANT_TYPE_STRING )
-    {
-        SetValue( m_choices.GetLabel(newValue) );
-    }
-    else  // if ( valueType == wxPG_VARIANT_TYPE_LONG )
-    {
-        SetValue( (long) newValue );
-    }
-}
-
-bool wxPGProperty::SetChoices( const wxPGChoices& choices )
-{
-    // Property must be de-selected first (otherwise choices in
-    // the control would be de-synced with true choices)
-    wxPropertyGrid* pg = GetGrid();
-    if ( pg && pg->GetSelection() == this )
-        pg->ClearSelection();
-
-    m_choices.Assign(choices);
-
-    {
-        // This may be needed to trigger some initialization
-        // (but don't do it if property is somewhat uninitialized)
-        wxVariant defVal = GetDefaultValue();
-        if ( defVal.IsNull() )
-            return false;
-
-        SetValue(defVal);
-    }
-
-    return true;
-}
-
-
-const wxPGEditor* wxPGProperty::GetEditorClass() const
-{
-    const wxPGEditor* editor;
-
-    if ( !m_customEditor )
-    {
-        editor = DoGetEditorClass();
-    }
-    else
-        editor = m_customEditor;
-
-    //
-    // Maybe override editor if common value specified
-    if ( GetDisplayedCommonValueCount() )
-    {
-        // TextCtrlAndButton -> ComboBoxAndButton
-        if ( wxDynamicCast(editor, wxPGTextCtrlAndButtonEditor) )
-            editor = wxPGEditor_ChoiceAndButton;
-
-        // TextCtrl -> ComboBox
-        else if ( wxDynamicCast(editor, wxPGTextCtrlEditor) )
-            editor = wxPGEditor_ComboBox;
-    }
-
-    return editor;
-}
-
-bool wxPGProperty::Hide( bool hide, int flags )
-{
-    wxPropertyGrid* pg = GetGrid();
-    if ( pg )
-        return pg->HideProperty(this, hide, flags);
-
-    return DoHide( hide, flags );
-}
-
-bool wxPGProperty::DoHide( bool hide, int flags )
-{
-    if ( !hide )
-        ClearFlag( wxPG_PROP_HIDDEN );
-    else
-        SetFlag( wxPG_PROP_HIDDEN );
-
-    if ( flags & wxPG_RECURSE )
-    {
-        unsigned int i;
-        for ( i = 0; i < GetChildCount(); i++ )
-            Item(i)->DoHide(hide, flags | wxPG_RECURSE_STARTS);
-    }
-
-    return true;
-}
-
-bool wxPGProperty::HasVisibleChildren() const
-{
-    unsigned int i;
-
-    for ( i=0; iHasFlag(wxPG_PROP_HIDDEN) )
-            return true;
-    }
-
-    return false;
-}
-
-bool wxPGProperty::RecreateEditor()
-{
-    wxPropertyGrid* pg = GetGrid();
-    wxASSERT(pg);
-
-    wxPGProperty* selected = pg->GetSelection();
-    if ( this == selected )
-    {
-        pg->DoSelectProperty(this, wxPG_SEL_FORCE);
-        return true;
-    }
-    return false;
-}
-
-
-void wxPGProperty::SetValueImage( wxBitmap& bmp )
-{
-    delete m_valueBitmap;
-
-    if ( &bmp && bmp.IsOk() )
-    {
-        // Resize the image
-        wxSize maxSz = GetGrid()->GetImageSize();
-        wxSize imSz(bmp.GetWidth(),bmp.GetHeight());
-
-        if ( imSz.y != maxSz.y )
-        {
-        #if wxUSE_IMAGE
-            // Here we use high-quality wxImage scaling functions available
-            wxImage img = bmp.ConvertToImage();
-            double scaleY = (double)maxSz.y / (double)imSz.y;
-            img.Rescale(wxRound(bmp.GetWidth()*scaleY),
-                        wxRound(bmp.GetHeight()*scaleY),
-                        wxIMAGE_QUALITY_HIGH);
-            wxBitmap* bmpNew = new wxBitmap(img, 32);
-        #else
-            // This is the old, deprecated method of scaling the image
-            wxBitmap* bmpNew = new wxBitmap(maxSz.x,maxSz.y,bmp.GetDepth());
-            wxMemoryDC dc;
-            dc.SelectObject(*bmpNew);
-            double scaleY = (double)maxSz.y / (double)imSz.y;
-            dc.SetUserScale(scaleY, scaleY);
-            dc.DrawBitmap(bmp, 0, 0);
-        #endif
-
-            m_valueBitmap = bmpNew;
-        }
-        else
-        {
-            m_valueBitmap = new wxBitmap(bmp);
-        }
-
-        m_flags |= wxPG_PROP_CUSTOMIMAGE;
-    }
-    else
-    {
-        m_valueBitmap = NULL;
-        m_flags &= ~(wxPG_PROP_CUSTOMIMAGE);
-    }
-}
-
-
-wxPGProperty* wxPGProperty::GetMainParent() const
-{
-    const wxPGProperty* curChild = this;
-    const wxPGProperty* curParent = m_parent;
-
-    while ( curParent && !curParent->IsCategory() )
-    {
-        curChild = curParent;
-        curParent = curParent->m_parent;
-    }
-
-    return (wxPGProperty*) curChild;
-}
-
-
-const wxPGProperty* wxPGProperty::GetLastVisibleSubItem() const
-{
-    //
-    // Returns last visible sub-item, recursively.
-    if ( !IsExpanded() || !GetChildCount() )
-        return this;
-
-    return Last()->GetLastVisibleSubItem();
-}
-
-
-bool wxPGProperty::IsVisible() const
-{
-    const wxPGProperty* parent;
-
-    if ( HasFlag(wxPG_PROP_HIDDEN) )
-        return false;
-
-    for ( parent = GetParent(); parent != NULL; parent = parent->GetParent() )
-    {
-        if ( !parent->IsExpanded() || parent->HasFlag(wxPG_PROP_HIDDEN) )
-            return false;
-    }
-
-    return true;
-}
-
-wxPropertyGrid* wxPGProperty::GetGridIfDisplayed() const
-{
-    wxPropertyGridPageState* state = GetParentState();
-    if ( !state )
-        return NULL;
-    wxPropertyGrid* propGrid = state->GetGrid();
-    if ( state == propGrid->GetState() )
-        return propGrid;
-    return NULL;
-}
-
-
-int wxPGProperty::GetY2( int lh ) const
-{
-    const wxPGProperty* parent;
-    const wxPGProperty* child = this;
-
-    int y = 0;
-
-    for ( parent = GetParent(); parent != NULL; parent = child->GetParent() )
-    {
-        if ( !parent->IsExpanded() )
-            return parent->GetY2(lh);
-        y += parent->GetChildrenHeight(lh, child->GetIndexInParent());
-        y += lh;
-        child = parent;
-    }
-
-    y -= lh;  // need to reduce one level
-
-    return y;
-}
-
-
-int wxPGProperty::GetY() const
-{
-    return GetY2(GetGrid()->GetRowHeight());
-}
-
-// This is used by Insert etc.
-void wxPGProperty::DoAddChild( wxPGProperty* prop, int index,
-                               bool correct_mode )
-{
-    if ( index < 0 || (size_t)index >= m_children.size() )
-    {
-        if ( correct_mode ) prop->m_arrIndex = m_children.size();
-        m_children.push_back( prop );
-    }
-    else
-    {
-        m_children.insert( m_children.begin()+index, prop);
-        if ( correct_mode ) FixIndicesOfChildren( index );
-    }
-
-    prop->m_parent = this;
-}
-
-void wxPGProperty::DoPreAddChild( int index, wxPGProperty* prop )
-{
-    wxASSERT_MSG( prop->GetBaseName().length(),
-                  "Property's children must have unique, non-empty "
-                  "names within their scope" );
-
-    prop->m_arrIndex = index;
-    m_children.insert( m_children.begin()+index,
-                       prop );
-
-    int custImgHeight = prop->OnMeasureImage().y;
-    if ( custImgHeight < 0 /*|| custImgHeight > 1*/ )
-        prop->m_flags |= wxPG_PROP_CUSTOMIMAGE;
-
-    prop->m_parent = this;
-}
-
-void wxPGProperty::AddPrivateChild( wxPGProperty* prop )
-{
-    if ( !(m_flags & wxPG_PROP_PARENTAL_FLAGS) )
-        SetParentalType(wxPG_PROP_AGGREGATE);
-
-    wxASSERT_MSG( (m_flags & wxPG_PROP_PARENTAL_FLAGS) ==
-                    wxPG_PROP_AGGREGATE,
-                  "Do not mix up AddPrivateChild() calls with other "
-                  "property adders." );
-
-    DoPreAddChild( m_children.size(), prop );
-}
-
-#if wxPG_COMPATIBILITY_1_4
-void wxPGProperty::AddChild( wxPGProperty* prop )
-{
-    AddPrivateChild(prop);
-}
-#endif
-
-wxPGProperty* wxPGProperty::InsertChild( int index,
-                                         wxPGProperty* childProperty )
-{
-    if ( index < 0 )
-        index = m_children.size();
-
-    if ( m_parentState )
-    {
-        m_parentState->DoInsert(this, index, childProperty);
-    }
-    else
-    {
-        if ( !(m_flags & wxPG_PROP_PARENTAL_FLAGS) )
-            SetParentalType(wxPG_PROP_MISC_PARENT);
-
-        wxASSERT_MSG( (m_flags & wxPG_PROP_PARENTAL_FLAGS) ==
-                        wxPG_PROP_MISC_PARENT,
-                      "Do not mix up AddPrivateChild() calls with other "
-                      "property adders." );
-
-        DoPreAddChild( index, childProperty );
-    }
-
-    return childProperty;
-}
-
-void wxPGProperty::RemoveChild( wxPGProperty* p )
-{
-    wxArrayPGProperty::iterator it;
-    wxArrayPGProperty& children = m_children;
-
-    for ( it=children.begin(); it != children.end(); it++ )
-    {
-        if ( *it == p )
-        {
-            children.erase(it);
-            break;
-        }
-    }
-}
-
-void wxPGProperty::AdaptListToValue( wxVariant& list, wxVariant* value ) const
-{
-    wxASSERT( GetChildCount() );
-    wxASSERT( !IsCategory() );
-
-    *value = GetValue();
-
-    if ( !list.GetCount() )
-        return;
-
-    wxASSERT( GetChildCount() >= (unsigned int)list.GetCount() );
-
-    bool allChildrenSpecified;
-
-    // Don't fully update aggregate properties unless all children have
-    // specified value
-    if ( HasFlag(wxPG_PROP_AGGREGATE) )
-        allChildrenSpecified = AreAllChildrenSpecified(&list);
-    else
-        allChildrenSpecified = true;
-
-    unsigned int i;
-    unsigned int n = 0;
-    wxVariant childValue = list[n];
-
-    //wxLogDebug(wxT(">> %s.AdaptListToValue()"),GetBaseName().c_str());
-
-    for ( i=0; iGetBaseName() )
-        {
-            //wxLogDebug(wxT("  %s(n=%i), %s"),childValue.GetName().c_str(),n,childValue.GetType().c_str());
-
-            if ( childValue.GetType() == wxPG_VARIANT_TYPE_LIST )
-            {
-                wxVariant cv2(child->GetValue());
-                child->AdaptListToValue(childValue, &cv2);
-                childValue = cv2;
-            }
-
-            if ( allChildrenSpecified )
-            {
-                *value = ChildChanged(*value, i, childValue);
-            }
-
-            n++;
-            if ( n == (unsigned int)list.GetCount() )
-                break;
-            childValue = list[n];
-        }
-    }
-}
-
-
-void wxPGProperty::FixIndicesOfChildren( unsigned int starthere )
-{
-    size_t i;
-    for ( i=starthere;im_arrIndex = i;
-}
-
-
-// Returns (direct) child property with given name (or NULL if not found)
-wxPGProperty* wxPGProperty::GetPropertyByName( const wxString& name ) const
-{
-    size_t i;
-
-    for ( i=0; im_name == name )
-            return p;
-    }
-
-    // Does it have point, then?
-    int pos = name.Find(wxS('.'));
-    if ( pos <= 0 )
-        return NULL;
-
-    wxPGProperty* p = GetPropertyByName(name. substr(0,pos));
-
-    if ( !p || !p->GetChildCount() )
-        return NULL;
-
-    return p->GetPropertyByName(name.substr(pos+1,name.length()-pos-1));
-}
-
-wxPGProperty* wxPGProperty::GetPropertyByNameWH( const wxString& name, unsigned int hintIndex ) const
-{
-    unsigned int i = hintIndex;
-
-    if ( i >= GetChildCount() )
-        i = 0;
-
-    unsigned int lastIndex = i - 1;
-
-    if ( lastIndex >= GetChildCount() )
-        lastIndex = GetChildCount() - 1;
-
-    for (;;)
-    {
-        wxPGProperty* p = Item(i);
-        if ( p->m_name == name )
-            return p;
-
-        if ( i == lastIndex )
-            break;
-
-        i++;
-        if ( i == GetChildCount() )
-            i = 0;
-    };
-
-    return NULL;
-}
-
-int wxPGProperty::GetChildrenHeight( int lh, int iMax_ ) const
-{
-    // Returns height of children, recursively, and
-    // by taking expanded/collapsed status into account.
-    //
-    // iMax is used when finding property y-positions.
-    //
-    unsigned int i = 0;
-    int h = 0;
-
-    if ( iMax_ == -1 )
-        iMax_ = GetChildCount();
-
-    unsigned int iMax = iMax_;
-
-    wxASSERT( iMax <= GetChildCount() );
-
-    if ( !IsExpanded() && GetParent() )
-        return 0;
-
-    while ( i < iMax )
-    {
-        wxPGProperty* pwc = (wxPGProperty*) Item(i);
-
-        if ( !pwc->HasFlag(wxPG_PROP_HIDDEN) )
-        {
-            if ( !pwc->IsExpanded() ||
-                 pwc->GetChildCount() == 0 )
-                h += lh;
-            else
-                h += pwc->GetChildrenHeight(lh) + lh;
-        }
-
-        i++;
-    }
-
-    return h;
-}
-
-wxPGProperty* wxPGProperty::GetItemAtY( unsigned int y,
-                                        unsigned int lh,
-                                        unsigned int* nextItemY ) const
-{
-    wxASSERT( nextItemY );
-
-    // Linear search at the moment
-    //
-    // nextItemY = y of next visible property, final value will be written back.
-    wxPGProperty* result = NULL;
-    wxPGProperty* current = NULL;
-    unsigned int iy = *nextItemY;
-    unsigned int i = 0;
-    unsigned int iMax = GetChildCount();
-
-    while ( i < iMax )
-    {
-        wxPGProperty* pwc = Item(i);
-
-        if ( !pwc->HasFlag(wxPG_PROP_HIDDEN) )
-        {
-            // Found?
-            if ( y < iy )
-            {
-                result = current;
-                break;
-            }
-
-            iy += lh;
-
-            if ( pwc->IsExpanded() &&
-                 pwc->GetChildCount() > 0 )
-            {
-                result = (wxPGProperty*) pwc->GetItemAtY( y, lh, &iy );
-                if ( result )
-                    break;
-            }
-
-            current = pwc;
-        }
-
-        i++;
-    }
-
-    // Found?
-    if ( !result && y < iy )
-        result = current;
-
-    *nextItemY = iy;
-
-    /*
-    if ( current )
-    {
-        wxLogDebug(wxT("%s::GetItemAtY(%i) -> %s"),this->GetLabel().c_str(),y,current->GetLabel().c_str());
-    }
-    else
-    {
-        wxLogDebug(wxT("%s::GetItemAtY(%i) -> NULL"),this->GetLabel().c_str(),y);
-    }
-    */
-
-    return (wxPGProperty*) result;
-}
-
-void wxPGProperty::Empty()
-{
-    size_t i;
-    if ( !HasFlag(wxPG_PROP_CHILDREN_ARE_COPIES) )
-    {
-        for ( i=0; iGetRowHeight(), &nextItem);
-}
-
-void wxPGProperty::DeleteChildren()
-{
-    wxPropertyGridPageState* state = m_parentState;
-
-    if ( !GetChildCount() )
-        return;
-
-    // Because deletion is sometimes deferred, we have to use
-    // this sort of code for enumerating the child properties.
-    unsigned int i = GetChildCount();
-    while ( i > 0 )
-    {
-        i--;
-        state->DoDelete(Item(i), true);
-    }
-}
-
-bool wxPGProperty::IsChildSelected( bool recursive ) const
-{
-    size_t i;
-    for ( i = 0; i < GetChildCount(); i++ )
-    {
-        wxPGProperty* child = Item(i);
-
-        // Test child
-        if ( m_parentState->DoIsPropertySelected( child ) )
-            return true;
-
-        // Test sub-childs
-        if ( recursive && child->IsChildSelected( recursive ) )
-            return true;
-    }
-
-    return false;
-}
-
-wxVariant wxPGProperty::ChildChanged( wxVariant& WXUNUSED(thisValue),
-                                      int WXUNUSED(childIndex),
-                                      wxVariant& WXUNUSED(childValue) ) const
-{
-    return wxNullVariant;
-}
-
-bool wxPGProperty::AreAllChildrenSpecified( wxVariant* pendingList ) const
-{
-    unsigned int i;
-
-    const wxVariantList* pList = NULL;
-    wxVariantList::const_iterator node;
-
-    if ( pendingList )
-    {
-        pList = &pendingList->GetList();
-        node = pList->begin();
-    }
-
-    for ( i=0; iGetBaseName();
-
-            for ( ; node != pList->end(); ++node )
-            {
-                const wxVariant& item = *((const wxVariant*)*node);
-                if ( item.GetName() == childName )
-                {
-                    listValue = &item;
-                    value = item;
-                    break;
-                }
-            }
-        }
-
-        if ( !listValue )
-            value = child->GetValue();
-
-        if ( value.IsNull() )
-            return false;
-
-        // Check recursively
-        if ( child->GetChildCount() )
-        {
-            const wxVariant* childList = NULL;
-
-            if ( listValue && listValue->GetType() == wxPG_VARIANT_TYPE_LIST )
-                childList = listValue;
-
-            if ( !child->AreAllChildrenSpecified((wxVariant*)childList) )
-                return false;
-        }
-    }
-
-    return true;
-}
-
-wxPGProperty* wxPGProperty::UpdateParentValues()
-{
-    wxPGProperty* parent = m_parent;
-    if ( parent && parent->HasFlag(wxPG_PROP_COMPOSED_VALUE) &&
-         !parent->IsCategory() && !parent->IsRoot() )
-    {
-        wxString s;
-        parent->DoGenerateComposedValue(s);
-        parent->m_value = s;
-        return parent->UpdateParentValues();
-    }
-    return this;
-}
-
-bool wxPGProperty::IsTextEditable() const
-{
-    if ( HasFlag(wxPG_PROP_READONLY) )
-        return false;
-
-    if ( HasFlag(wxPG_PROP_NOEDITOR) &&
-         (GetChildCount() ||
-          wxString(GetEditorClass()->GetClassInfo()->GetClassName()).EndsWith(wxS("Button")))
-       )
-        return false;
-
-    return true;
-}
-
-// Call after fixed sub-properties added/removed after creation.
-// if oldSelInd >= 0 and < new max items, then selection is
-// moved to it. Note: oldSelInd -2 indicates that this property
-// should be selected.
-void wxPGProperty::SubPropsChanged( int oldSelInd )
-{
-    wxPropertyGridPageState* state = GetParentState();
-    wxPropertyGrid* grid = state->GetGrid();
-
-    //
-    // Re-repare children (recursively)
-    for ( unsigned int i=0; iInitAfterAdded(state, grid);
-    }
-
-    wxPGProperty* sel = NULL;
-    if ( oldSelInd >= (int)m_children.size() )
-        oldSelInd = (int)m_children.size() - 1;
-
-    if ( oldSelInd >= 0 )
-        sel = m_children[oldSelInd];
-    else if ( oldSelInd == -2 )
-        sel = this;
-
-    if ( sel )
-        state->DoSelectProperty(sel);
-
-    if ( state == grid->GetState() )
-    {
-        grid->GetPanel()->Refresh();
-    }
-}
-
-// -----------------------------------------------------------------------
-// wxPGRootProperty
-// -----------------------------------------------------------------------
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS_PLAIN(wxPGRootProperty,none,TextCtrl)
-IMPLEMENT_DYNAMIC_CLASS(wxPGRootProperty, wxPGProperty)
-
-
-wxPGRootProperty::wxPGRootProperty( const wxString& name )
-    : wxPGProperty()
-{
-    m_name = name;
-    m_label = m_name;
-    SetParentalType(0);
-    m_depth = 0;
-}
-
-
-wxPGRootProperty::~wxPGRootProperty()
-{
-}
-
-
-// -----------------------------------------------------------------------
-// wxPropertyCategory
-// -----------------------------------------------------------------------
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS_PLAIN(wxPropertyCategory,none,TextCtrl)
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyCategory, wxPGProperty)
-
-void wxPropertyCategory::Init()
-{
-    // don't set colour - prepareadditem method should do this
-    SetParentalType(wxPG_PROP_CATEGORY);
-    m_capFgColIndex = 1;
-    m_textExtent = -1;
-}
-
-wxPropertyCategory::wxPropertyCategory()
-    : wxPGProperty()
-{
-    Init();
-}
-
-
-wxPropertyCategory::wxPropertyCategory( const wxString &label, const wxString& name )
-    : wxPGProperty(label,name)
-{
-    Init();
-}
-
-
-wxPropertyCategory::~wxPropertyCategory()
-{
-}
-
-
-wxString wxPropertyCategory::ValueToString( wxVariant& WXUNUSED(value),
-                                            int WXUNUSED(argFlags) ) const
-{
-    if ( m_value.GetType() == wxPG_VARIANT_TYPE_STRING )
-        return m_value.GetString();
-    return wxEmptyString;
-}
-
-wxString wxPropertyCategory::GetValueAsString( int argFlags ) const
-{
-#if wxPG_COMPATIBILITY_1_4
-    // This is backwards compatibility test
-    // That is, to make sure this function is not overridden
-    // (instead, ValueToString() should be).
-    if ( argFlags == 0xFFFF )
-    {
-        // Do not override! (for backwards compliancy)
-        return g_invalidStringContent;
-    }
-#endif
-
-    // Unspecified value is always empty string
-    if ( IsValueUnspecified() )
-        return wxEmptyString;
-
-    return wxPGProperty::GetValueAsString(argFlags);
-}
-
-int wxPropertyCategory::GetTextExtent( const wxWindow* wnd, const wxFont& font ) const
-{
-    if ( m_textExtent > 0 )
-        return m_textExtent;
-    int x = 0, y = 0;
-    ((wxWindow*)wnd)->GetTextExtent( m_label, &x, &y, 0, 0, &font );
-    return x;
-}
-
-void wxPropertyCategory::CalculateTextExtent( wxWindow* wnd, const wxFont& font )
-{
-    int x = 0, y = 0;
-    wnd->GetTextExtent( m_label, &x, &y, 0, 0, &font );
-    m_textExtent = x;
-}
-
-// -----------------------------------------------------------------------
-// wxPGChoices
-// -----------------------------------------------------------------------
-
-wxPGChoiceEntry& wxPGChoices::Add( const wxString& label, int value )
-{
-    AllocExclusive();
-
-    wxPGChoiceEntry entry(label, value);
-    return m_data->Insert( -1, entry );
-}
-
-// -----------------------------------------------------------------------
-
-wxPGChoiceEntry& wxPGChoices::Add( const wxString& label, const wxBitmap& bitmap, int value )
-{
-    AllocExclusive();
-
-    wxPGChoiceEntry entry(label, value);
-    entry.SetBitmap(bitmap);
-    return m_data->Insert( -1, entry );
-}
-
-// -----------------------------------------------------------------------
-
-wxPGChoiceEntry& wxPGChoices::Insert( const wxPGChoiceEntry& entry, int index )
-{
-    AllocExclusive();
-
-    return m_data->Insert( index, entry );
-}
-
-// -----------------------------------------------------------------------
-
-wxPGChoiceEntry& wxPGChoices::Insert( const wxString& label, int index, int value )
-{
-    AllocExclusive();
-
-    wxPGChoiceEntry entry(label, value);
-    return m_data->Insert( index, entry );
-}
-
-// -----------------------------------------------------------------------
-
-wxPGChoiceEntry& wxPGChoices::AddAsSorted( const wxString& label, int value )
-{
-    AllocExclusive();
-
-    size_t index = 0;
-
-    while ( index < GetCount() )
-    {
-        int cmpRes = GetLabel(index).Cmp(label);
-        if ( cmpRes > 0 )
-            break;
-        index++;
-    }
-
-    wxPGChoiceEntry entry(label, value);
-    return m_data->Insert( index, entry );
-}
-
-// -----------------------------------------------------------------------
-
-void wxPGChoices::Add( const wxChar* const* labels, const ValArrItem* values )
-{
-    AllocExclusive();
-
-    unsigned int itemcount = 0;
-    const wxChar* const* p = &labels[0];
-    while ( *p ) { p++; itemcount++; }
-
-    unsigned int i;
-    for ( i = 0; i < itemcount; i++ )
-    {
-        int value = i;
-        if ( values )
-            value = values[i];
-        wxPGChoiceEntry entry(labels[i], value);
-        m_data->Insert( i, entry );
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPGChoices::Add( const wxArrayString& arr, const wxArrayInt& arrint )
-{
-    AllocExclusive();
-
-    unsigned int i;
-    unsigned int itemcount = arr.size();
-
-    for ( i = 0; i < itemcount; i++ )
-    {
-        int value = i;
-        if ( &arrint && arrint.size() )
-            value = arrint[i];
-        wxPGChoiceEntry entry(arr[i], value);
-        m_data->Insert( i, entry );
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPGChoices::RemoveAt(size_t nIndex, size_t count)
-{
-    AllocExclusive();
-
-    wxASSERT( m_data->GetRefCount() != -1 );
-    m_data->m_items.erase(m_data->m_items.begin()+nIndex,
-                          m_data->m_items.begin()+nIndex+count);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPGChoices::Clear()
-{
-    if ( m_data != wxPGChoicesEmptyData )
-    {
-        AllocExclusive();
-        m_data->Clear();
-    }
-}
-
-// -----------------------------------------------------------------------
-
-int wxPGChoices::Index( const wxString& str ) const
-{
-    if ( IsOk() )
-    {
-        unsigned int i;
-        for ( i=0; i< m_data->GetCount(); i++ )
-        {
-            const wxPGChoiceEntry& entry = m_data->Item(i);
-            if ( entry.HasText() && entry.GetText() == str )
-                return i;
-        }
-    }
-    return -1;
-}
-
-// -----------------------------------------------------------------------
-
-int wxPGChoices::Index( int val ) const
-{
-    if ( IsOk() )
-    {
-        unsigned int i;
-        for ( i=0; i< m_data->GetCount(); i++ )
-        {
-            const wxPGChoiceEntry& entry = m_data->Item(i);
-            if ( entry.GetValue() == val )
-                return i;
-        }
-    }
-    return -1;
-}
-
-// -----------------------------------------------------------------------
-
-wxArrayString wxPGChoices::GetLabels() const
-{
-    wxArrayString arr;
-    unsigned int i;
-
-    if ( this && IsOk() )
-        for ( i=0; i= 0 )
-                arr.Add(GetValue(index));
-            else
-                arr.Add(wxPG_INVALID_VALUE);
-        }
-    }
-
-    return arr;
-}
-
-// -----------------------------------------------------------------------
-
-wxArrayInt wxPGChoices::GetIndicesForStrings( const wxArrayString& strings,
-                                              wxArrayString* unmatched ) const
-{
-    wxArrayInt arr;
-
-    if ( IsOk() )
-    {
-        unsigned int i;
-        for ( i=0; i< strings.size(); i++ )
-        {
-            const wxString& str = strings[i];
-            int index = Index(str);
-            if ( index >= 0 )
-                arr.Add(index);
-            else if ( unmatched )
-                unmatched->Add(str);
-        }
-    }
-
-    return arr;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPGChoices::AllocExclusive()
-{
-    EnsureData();
-
-    if ( m_data->GetRefCount() != 1 )
-    {
-        wxPGChoicesData* data = new wxPGChoicesData();
-        data->CopyDataFrom(m_data);
-        Free();
-        m_data = data;
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPGChoices::AssignData( wxPGChoicesData* data )
-{
-    Free();
-
-    if ( data != wxPGChoicesEmptyData )
-    {
-        m_data = data;
-        data->IncRef();
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPGChoices::Init()
-{
-    m_data = wxPGChoicesEmptyData;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPGChoices::Free()
-{
-    if ( m_data != wxPGChoicesEmptyData )
-    {
-        m_data->DecRef();
-        m_data = wxPGChoicesEmptyData;
-    }
-}
-
-// -----------------------------------------------------------------------
-// wxPGAttributeStorage
-// -----------------------------------------------------------------------
-
-wxPGAttributeStorage::wxPGAttributeStorage()
-{
-}
-
-wxPGAttributeStorage::~wxPGAttributeStorage()
-{
-    wxPGHashMapS2P::iterator it;
-
-    for ( it = m_map.begin(); it != m_map.end(); ++it )
-    {
-        wxVariantData* data = (wxVariantData*) it->second;
-        data->DecRef();
-    }
-}
-
-void wxPGAttributeStorage::Set( const wxString& name, const wxVariant& value )
-{
-    wxVariantData* data = value.GetData();
-
-    // Free old, if any
-    wxPGHashMapS2P::iterator it = m_map.find(name);
-    if ( it != m_map.end() )
-    {
-        ((wxVariantData*)it->second)->DecRef();
-
-        if ( !data )
-        {
-            // If Null variant, just remove from set
-            m_map.erase(it);
-            return;
-        }
-    }
-
-    if ( data )
-    {
-        data->IncRef();
-
-        m_map[name] = data;
-    }
-}
-
-#endif  // wxUSE_PROPGRID
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/propgrid.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/propgrid.cpp
deleted file mode 100644
index 7b77965d4b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/propgrid.cpp
+++ /dev/null
@@ -1,6571 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/propgrid/propgrid.cpp
-// Purpose:     wxPropertyGrid
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     2004-09-25
-// Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_PROPGRID
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/object.h"
-    #include "wx/hash.h"
-    #include "wx/string.h"
-    #include "wx/log.h"
-    #include "wx/event.h"
-    #include "wx/window.h"
-    #include "wx/panel.h"
-    #include "wx/dc.h"
-    #include "wx/dcmemory.h"
-    #include "wx/button.h"
-    #include "wx/pen.h"
-    #include "wx/brush.h"
-    #include "wx/cursor.h"
-    #include "wx/dialog.h"
-    #include "wx/settings.h"
-    #include "wx/msgdlg.h"
-    #include "wx/choice.h"
-    #include "wx/stattext.h"
-    #include "wx/scrolwin.h"
-    #include "wx/dirdlg.h"
-    #include "wx/sizer.h"
-    #include "wx/textdlg.h"
-    #include "wx/filedlg.h"
-    #include "wx/statusbr.h"
-    #include "wx/intl.h"
-    #include "wx/frame.h"
-    #include "wx/textctrl.h"
-#endif
-
-
-// This define is necessary to prevent macro clearing
-#define __wxPG_SOURCE_FILE__
-
-#include "wx/propgrid/propgrid.h"
-#include "wx/propgrid/editors.h"
-
-#if wxPG_USE_RENDERER_NATIVE
-    #include "wx/renderer.h"
-#endif
-
-#include "wx/odcombo.h"
-
-#include "wx/timer.h"
-#include "wx/dcbuffer.h"
-#include "wx/scopeguard.h"
-
-// Two pics for the expand / collapse buttons.
-// Files are not supplied with this project (since it is
-// recommended to use either custom or native rendering).
-// If you want them, get wxTreeMultiCtrl by Jorgen Bodde,
-// and copy xpm files from archive to wxPropertyGrid src directory
-// (and also comment/undef wxPG_ICON_WIDTH in propGrid.h
-// and set wxPG_USE_RENDERER_NATIVE to 0).
-#ifndef wxPG_ICON_WIDTH
-  #if defined(__WXMAC__)
-    #include "mac_collapse.xpm"
-    #include "mac_expand.xpm"
-  #elif defined(__WXGTK__)
-    #include "linux_collapse.xpm"
-    #include "linux_expand.xpm"
-  #else
-    #include "default_collapse.xpm"
-    #include "default_expand.xpm"
-  #endif
-#endif
-
-
-//#define wxPG_TEXT_INDENT                4 // For the wxComboControl
-//#define wxPG_ALLOW_CLIPPING             1 // If 1, GetUpdateRegion() in OnPaint event handler is not ignored
-#define wxPG_GUTTER_DIV                 3 // gutter is max(iconwidth/gutter_div,gutter_min)
-#define wxPG_GUTTER_MIN                 3 // gutter before and after image of [+] or [-]
-#define wxPG_YSPACING_MIN               1
-#define wxPG_DEFAULT_VSPACING           2 // This matches .NET propertygrid's value,
-                                          // but causes normal combobox to spill out under MSW
-
-//#define wxPG_OPTIMAL_WIDTH              200 // Arbitrary
-
-//#define wxPG_MIN_SCROLLBAR_WIDTH        10 // Smallest scrollbar width on any platform
-                                           // Must be larger than largest control border
-                                           // width * 2.
-
-
-#define wxPG_DEFAULT_CURSOR             wxNullCursor
-
-
-//#define wxPG_NAT_CHOICE_BORDER_ANY   0
-
-//#define wxPG_HIDER_BUTTON_HEIGHT        25
-
-#define wxPG_PIXELS_PER_UNIT            m_lineHeight
-
-#ifdef wxPG_ICON_WIDTH
-  #define m_iconHeight m_iconWidth
-#endif
-
-//#define wxPG_TOOLTIP_DELAY              1000
-
-// This is the number of pixels the expander button inside
-// property cells (i.e. not in the grey margin area are
-// adjusted.
-#define IN_CELL_EXPANDER_BUTTON_X_ADJUST    2
-
-// -----------------------------------------------------------------------
-
-#if wxUSE_INTL
-void wxPropertyGrid::AutoGetTranslation ( bool enable )
-{
-    wxPGGlobalVars->m_autoGetTranslation = enable;
-}
-#else
-void wxPropertyGrid::AutoGetTranslation ( bool ) { }
-#endif
-
-// -----------------------------------------------------------------------
-
-const char wxPropertyGridNameStr[] = "wxPropertyGrid";
-
-// -----------------------------------------------------------------------
-// Statics in one class for easy destruction.
-// -----------------------------------------------------------------------
-
-#include "wx/module.h"
-
-class wxPGGlobalVarsClassManager : public wxModule
-{
-    DECLARE_DYNAMIC_CLASS(wxPGGlobalVarsClassManager)
-public:
-    wxPGGlobalVarsClassManager() {}
-    virtual bool OnInit() { wxPGGlobalVars = new wxPGGlobalVarsClass(); return true; }
-    virtual void OnExit() { wxDELETE(wxPGGlobalVars); }
-};
-
-IMPLEMENT_DYNAMIC_CLASS(wxPGGlobalVarsClassManager, wxModule)
-
-
-// When wxPG is loaded dynamically after the application is already running
-// then the built-in module system won't pick this one up.  Add it manually.
-void wxPGInitResourceModule()
-{
-    wxModule* module = new wxPGGlobalVarsClassManager;
-    wxModule::RegisterModule(module);
-    wxModule::InitializeModules();
-}
-
-wxPGGlobalVarsClass* wxPGGlobalVars = NULL;
-
-
-wxPGGlobalVarsClass::wxPGGlobalVarsClass()
-{
-    wxPGProperty::sm_wxPG_LABEL = new wxString(wxPG_LABEL_STRING);
-
-    m_boolChoices.Add(_("False"));
-    m_boolChoices.Add(_("True"));
-
-    m_fontFamilyChoices = NULL;
-
-    m_defaultRenderer = new wxPGDefaultRenderer();
-
-    m_autoGetTranslation = false;
-
-    m_offline = 0;
-
-    m_extraStyle = 0;
-
-    wxVariant v;
-
-    // Prepare some shared variants
-    m_vEmptyString = wxString();
-    m_vZero = (long) 0;
-    m_vMinusOne = (long) -1;
-    m_vTrue = true;
-    m_vFalse = false;
-
-    // Prepare cached string constants
-    m_strstring = wxS("string");
-    m_strlong = wxS("long");
-    m_strbool = wxS("bool");
-    m_strlist = wxS("list");
-    m_strDefaultValue = wxS("DefaultValue");
-    m_strMin = wxS("Min");
-    m_strMax = wxS("Max");
-    m_strUnits = wxS("Units");
-    m_strHint = wxS("Hint");
-#if wxPG_COMPATIBILITY_1_4
-    m_strInlineHelp = wxS("InlineHelp");
-#endif
-
-    m_warnings = 0;
-}
-
-
-wxPGGlobalVarsClass::~wxPGGlobalVarsClass()
-{
-    size_t i;
-
-    delete m_defaultRenderer;
-
-    // This will always have one ref
-    delete m_fontFamilyChoices;
-
-#if wxUSE_VALIDATORS
-    for ( i=0; isecond);
-    }
-
-    // Make sure the global pointers have been reset
-    wxASSERT(wxPG_EDITOR(TextCtrl) == NULL);
-    wxASSERT(wxPG_EDITOR(ChoiceAndButton) == NULL);
-
-    delete wxPGProperty::sm_wxPG_LABEL;
-}
-
-void wxPropertyGridInitGlobalsIfNeeded()
-{
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGrid
-// -----------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyGrid, wxControl)
-
-BEGIN_EVENT_TABLE(wxPropertyGrid, wxControl)
-  EVT_IDLE(wxPropertyGrid::OnIdle)
-  EVT_PAINT(wxPropertyGrid::OnPaint)
-  EVT_SIZE(wxPropertyGrid::OnResize)
-  EVT_ENTER_WINDOW(wxPropertyGrid::OnMouseEntry)
-  EVT_LEAVE_WINDOW(wxPropertyGrid::OnMouseEntry)
-  EVT_MOUSE_CAPTURE_CHANGED(wxPropertyGrid::OnCaptureChange)
-  EVT_SCROLLWIN(wxPropertyGrid::OnScrollEvent)
-  EVT_CHILD_FOCUS(wxPropertyGrid::OnChildFocusEvent)
-  EVT_SET_FOCUS(wxPropertyGrid::OnFocusEvent)
-  EVT_KILL_FOCUS(wxPropertyGrid::OnFocusEvent)
-  EVT_SYS_COLOUR_CHANGED(wxPropertyGrid::OnSysColourChanged)
-  EVT_MOTION(wxPropertyGrid::OnMouseMove)
-  EVT_LEFT_DOWN(wxPropertyGrid::OnMouseClick)
-  EVT_LEFT_UP(wxPropertyGrid::OnMouseUp)
-  EVT_RIGHT_UP(wxPropertyGrid::OnMouseRightClick)
-  EVT_LEFT_DCLICK(wxPropertyGrid::OnMouseDoubleClick)
-  EVT_KEY_DOWN(wxPropertyGrid::OnKey)
-END_EVENT_TABLE()
-
-// -----------------------------------------------------------------------
-
-wxPropertyGrid::wxPropertyGrid()
-    : wxControl(), wxScrollHelper(this)
-{
-    Init1();
-}
-
-// -----------------------------------------------------------------------
-
-wxPropertyGrid::wxPropertyGrid( wxWindow *parent,
-                                wxWindowID id,
-                                const wxPoint& pos,
-                                const wxSize& size,
-                                long style,
-                                const wxString& name )
-    : wxControl(), wxScrollHelper(this)
-{
-    Init1();
-    Create(parent,id,pos,size,style,name);
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::Create( wxWindow *parent,
-                             wxWindowID id,
-                             const wxPoint& pos,
-                             const wxSize& size,
-                             long style,
-                             const wxString& name )
-{
-
-    if (!(style&wxBORDER_MASK))
-    {
-        style |= wxBORDER_THEME;
-    }
-
-    style |= wxVSCROLL;
-
-    // Filter out wxTAB_TRAVERSAL - we will handle TABs manually
-    style &= ~(wxTAB_TRAVERSAL);
-    style |= wxWANTS_CHARS;
-
-    wxControl::Create(parent, id, pos, size,
-                      style | wxScrolledWindowStyle,
-                      wxDefaultValidator,
-                      name);
-
-    Init2();
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-//
-// Initialize values to defaults
-//
-void wxPropertyGrid::Init1()
-{
-    // Register editor classes, if necessary.
-    if ( wxPGGlobalVars->m_mapEditorClasses.empty() )
-        wxPropertyGrid::RegisterDefaultEditors();
-
-    m_validatingEditor = 0;
-    m_iFlags = 0;
-    m_pState = NULL;
-    m_wndEditor = m_wndEditor2 = NULL;
-    m_selColumn = 1;
-    m_colHover = 1;
-    m_propHover = NULL;
-    m_labelEditor = NULL;
-    m_labelEditorProperty = NULL;
-    m_eventObject = this;
-    m_curFocused = NULL;
-    m_processedEvent = NULL;
-    m_tlp = NULL;
-    m_sortFunction = NULL;
-    m_inDoPropertyChanged = false;
-    m_inCommitChangesFromEditor = false;
-    m_inDoSelectProperty = false;
-    m_inOnValidationFailure = false;
-    m_permanentValidationFailureBehavior = wxPG_VFB_DEFAULT;
-    m_dragStatus = 0;
-    m_mouseSide = 16;
-    m_editorFocused = 0;
-
-    // Set up default unspecified value 'colour'
-    m_unspecifiedAppearance.SetFgCol(*wxLIGHT_GREY);
-
-    // Set default keys
-    AddActionTrigger( wxPG_ACTION_NEXT_PROPERTY, WXK_RIGHT );
-    AddActionTrigger( wxPG_ACTION_NEXT_PROPERTY, WXK_DOWN );
-    AddActionTrigger( wxPG_ACTION_PREV_PROPERTY, WXK_LEFT );
-    AddActionTrigger( wxPG_ACTION_PREV_PROPERTY, WXK_UP );
-    AddActionTrigger( wxPG_ACTION_EXPAND_PROPERTY, WXK_RIGHT);
-    AddActionTrigger( wxPG_ACTION_COLLAPSE_PROPERTY, WXK_LEFT);
-    AddActionTrigger( wxPG_ACTION_CANCEL_EDIT, WXK_ESCAPE );
-    AddActionTrigger( wxPG_ACTION_PRESS_BUTTON, WXK_DOWN, wxMOD_ALT );
-    AddActionTrigger( wxPG_ACTION_PRESS_BUTTON, WXK_F4 );
-
-    m_coloursCustomized = 0;
-    m_frozen = 0;
-
-    m_doubleBuffer = NULL;
-
-#ifndef wxPG_ICON_WIDTH
-    m_expandbmp = NULL;
-    m_collbmp = NULL;
-    m_iconWidth = 11;
-    m_iconHeight = 11;
-#else
-    m_iconWidth = wxPG_ICON_WIDTH;
-#endif
-
-    m_prevVY = -1;
-
-    m_gutterWidth = wxPG_GUTTER_MIN;
-    m_subgroup_extramargin = 10;
-
-    m_lineHeight = 0;
-
-    m_width = m_height = 0;
-
-    m_commonValues.push_back(new wxPGCommonValue(_("Unspecified"), wxPGGlobalVars->m_defaultRenderer) );
-    m_cvUnspecified = 0;
-
-    m_chgInfo_changedProperty = NULL;
-}
-
-// -----------------------------------------------------------------------
-
-//
-// Initialize after parent etc. set
-//
-void wxPropertyGrid::Init2()
-{
-    wxASSERT( !(m_iFlags & wxPG_FL_INITIALIZED ) );
-
-#ifdef __WXMAC__
-   // Smaller controls on Mac
-   SetWindowVariant(wxWINDOW_VARIANT_SMALL);
-#endif
-
-    // Now create state, if one didn't exist already
-    // (wxPropertyGridManager might have created it for us).
-    if ( !m_pState )
-    {
-        m_pState = CreateState();
-        m_pState->m_pPropGrid = this;
-        m_iFlags |= wxPG_FL_CREATEDSTATE;
-    }
-
-    if ( !(m_windowStyle & wxPG_SPLITTER_AUTO_CENTER) )
-        m_pState->m_dontCenterSplitter = true;
-
-    if ( m_windowStyle & wxPG_HIDE_CATEGORIES )
-    {
-        m_pState->InitNonCatMode();
-
-        m_pState->m_properties = m_pState->m_abcArray;
-    }
-
-    GetClientSize(&m_width,&m_height);
-
-#ifndef wxPG_ICON_WIDTH
-    // create two bitmap nodes for drawing
-    m_expandbmp = new wxBitmap(expand_xpm);
-    m_collbmp = new wxBitmap(collapse_xpm);
-
-    // calculate average font height for bitmap centering
-
-    m_iconWidth = m_expandbmp->GetWidth();
-    m_iconHeight = m_expandbmp->GetHeight();
-#endif
-
-    m_curcursor = wxCURSOR_ARROW;
-    m_cursorSizeWE = new wxCursor( wxCURSOR_SIZEWE );
-
-    // adjust bitmap icon y position so they are centered
-    m_vspacing = wxPG_DEFAULT_VSPACING;
-
-    CalculateFontAndBitmapStuff( wxPG_DEFAULT_VSPACING );
-
-    // Allocate cell datas
-    m_propertyDefaultCell.SetEmptyData();
-    m_categoryDefaultCell.SetEmptyData();
-
-    RegainColours();
-
-    // This helps with flicker
-    SetBackgroundStyle( wxBG_STYLE_CUSTOM );
-
-    // Hook the top-level parent
-    m_tlpClosed = NULL;
-    m_tlpClosedTime = 0;
-
-    // set virtual size to this window size
-    wxSize wndsize = GetSize();
-    SetVirtualSize(wndsize.GetWidth(), wndsize.GetWidth());
-
-    m_timeCreated = ::wxGetLocalTimeMillis();
-
-    m_iFlags |= wxPG_FL_INITIALIZED;
-
-    m_ncWidth = wndsize.GetWidth();
-
-    // Need to call OnResize handler or size given in constructor/Create
-    // will never work.
-    wxSizeEvent sizeEvent(wndsize,0);
-    OnResize(sizeEvent);
-}
-
-// -----------------------------------------------------------------------
-
-wxPropertyGrid::~wxPropertyGrid()
-{
-    size_t i;
-
-#if wxUSE_THREADS
-    wxCriticalSectionLocker(wxPGGlobalVars->m_critSect);
-#endif
-
-    //
-    // Remove grid and property pointers from live wxPropertyGridEvents.
-    for ( i=0; iSetPropertyGrid(NULL);
-        evt->SetProperty(NULL);
-    }
-    m_liveEvents.clear();
-
-    if ( m_processedEvent )
-    {
-        // All right... we are being deleted while wxPropertyGrid event
-        // is being sent. Make sure that event propagates as little
-        // as possible (although usually this is not enough to prevent
-        // a crash).
-        m_processedEvent->Skip(false);
-        m_processedEvent->StopPropagation();
-
-        // Let's use wxMessageBox to make the message appear more
-        // reliably (and *before* the crash can happen).
-        ::wxMessageBox("wxPropertyGrid was being destroyed in an event "
-                       "generated by it. This usually leads to a crash "
-                       "so it is recommended to destroy the control "
-                       "at idle time instead.");
-    }
-
-    DoSelectProperty(NULL, wxPG_SEL_NOVALIDATE|wxPG_SEL_DONT_SEND_EVENT);
-
-    // This should do prevent things from going too badly wrong
-    m_iFlags &= ~(wxPG_FL_INITIALIZED);
-
-    if ( m_iFlags & wxPG_FL_MOUSE_CAPTURED )
-        ReleaseMouse();
-
-    // Call with NULL to disconnect event handling
-    if ( GetExtraStyle() & wxPG_EX_ENABLE_TLP_TRACKING )
-    {
-        OnTLPChanging(NULL);
-
-        wxASSERT_MSG( !IsEditorsValueModified(),
-                      wxS("Most recent change in property editor was ")
-                      wxS("lost!!! (if you don't want this to happen, ")
-                      wxS("close your frames and dialogs using ")
-                      wxS("Close(false).)") );
-    }
-
-    if ( m_doubleBuffer )
-        delete m_doubleBuffer;
-
-    if ( m_iFlags & wxPG_FL_CREATEDSTATE )
-        delete m_pState;
-
-    delete m_cursorSizeWE;
-
-#ifndef wxPG_ICON_WIDTH
-    delete m_expandbmp;
-    delete m_collbmp;
-#endif
-
-    // Delete common value records
-    for ( i=0; im_itemsAdded = 1;
-        }
-    #if wxPG_SUPPORT_TOOLTIPS
-        if ( !(old_style & wxPG_TOOLTIPS) && (style & wxPG_TOOLTIPS) )
-        {
-            //
-            // Tooltips enabled
-            //
-            /*
-            wxToolTip* tooltip = new wxToolTip ( wxEmptyString );
-            SetToolTip ( tooltip );
-            tooltip->SetDelay ( wxPG_TOOLTIP_DELAY );
-            */
-        }
-        else if ( (old_style & wxPG_TOOLTIPS) && !(style & wxPG_TOOLTIPS) )
-        {
-            //
-            // Tooltips disabled
-            //
-            SetToolTip( NULL );
-        }
-    #endif
-    }
-
-    wxControl::SetWindowStyleFlag ( style );
-
-    if ( m_iFlags & wxPG_FL_INITIALIZED )
-    {
-        if ( (old_style & wxPG_HIDE_MARGIN) != (style & wxPG_HIDE_MARGIN) )
-        {
-            CalculateFontAndBitmapStuff( m_vspacing );
-            Refresh();
-        }
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::Freeze()
-{
-    if ( !m_frozen )
-    {
-        wxControl::Freeze();
-    }
-    m_frozen++;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::Thaw()
-{
-    m_frozen--;
-
-    if ( !m_frozen )
-    {
-        wxControl::Thaw();
-        RecalculateVirtualSize();
-        Refresh();
-
-        // Force property re-selection
-        // NB: We must copy the selection.
-        wxArrayPGProperty selection = m_pState->m_selection;
-        DoSetSelection(selection, wxPG_SEL_FORCE | wxPG_SEL_NONVISIBLE);
-    }
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::DoAddToSelection( wxPGProperty* prop, int selFlags )
-{
-    wxCHECK( prop, false );
-
-    if ( !(GetExtraStyle() & wxPG_EX_MULTIPLE_SELECTION) )
-        return DoSelectProperty(prop, selFlags);
-
-    wxArrayPGProperty& selection = m_pState->m_selection;
-
-    if ( !selection.size() )
-    {
-        return DoSelectProperty(prop, selFlags);
-    }
-    else
-    {
-        // For categories, only one can be selected at a time
-        if ( prop->IsCategory() || selection[0]->IsCategory() )
-            return true;
-
-        selection.push_back(prop);
-
-        if ( !(selFlags & wxPG_SEL_DONT_SEND_EVENT) )
-        {
-            SendEvent( wxEVT_PG_SELECTED, prop, NULL );
-        }
-
-        DrawItem(prop);
-    }
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::DoRemoveFromSelection( wxPGProperty* prop, int selFlags )
-{
-    wxCHECK( prop, false );
-    bool res;
-
-    wxArrayPGProperty& selection = m_pState->m_selection;
-    if ( selection.size() <= 1 )
-    {
-        res = DoSelectProperty(NULL, selFlags);
-    }
-    else
-    {
-        m_pState->DoRemoveFromSelection(prop);
-        DrawItem(prop);
-        res = true;
-    }
-
-    return res;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::DoSelectAndEdit( wxPGProperty* prop,
-                                      unsigned int colIndex,
-                                      unsigned int selFlags )
-{
-    //
-    // NB: Enable following if label editor background colour is
-    //     ever changed to any other than m_colSelBack.
-    //
-    // We use this workaround to prevent visible flicker when editing
-    // a cell. Atleast on wxMSW, there is a difficult to find
-    // (and perhaps prevent) redraw somewhere between making property
-    // selected and enabling label editing.
-    //
-    //wxColour prevColSelBack = m_colSelBack;
-    //m_colSelBack = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW );
-
-    bool res;
-
-    if ( colIndex == 1 )
-    {
-        res = DoSelectProperty(prop, selFlags);
-    }
-    else
-    {
-        // send event
-        DoClearSelection(false, wxPG_SEL_NO_REFRESH);
-
-        if ( m_pState->m_editableColumns.Index(colIndex) == wxNOT_FOUND )
-        {
-            res = DoAddToSelection(prop, selFlags);
-        }
-        else
-        {
-            res = DoAddToSelection(prop, selFlags|wxPG_SEL_NO_REFRESH);
-
-            DoBeginLabelEdit(colIndex, selFlags);
-        }
-    }
-
-    //m_colSelBack = prevColSelBack;
-    return res;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::AddToSelectionFromInputEvent( wxPGProperty* prop,
-                                                   unsigned int colIndex,
-                                                   wxMouseEvent* mouseEvent,
-                                                   int selFlags )
-{
-    const wxArrayPGProperty& selection = GetSelectedProperties();
-    bool alreadySelected = m_pState->DoIsPropertySelected(prop);
-    bool res = true;
-
-    // Set to 2 if also add all items in between
-    int addToExistingSelection = 0;
-
-    if ( GetExtraStyle() & wxPG_EX_MULTIPLE_SELECTION )
-    {
-        if ( mouseEvent )
-        {
-            if ( mouseEvent->GetEventType() == wxEVT_RIGHT_DOWN ||
-                 mouseEvent->GetEventType() == wxEVT_RIGHT_UP )
-            {
-                // Allow right-click for context menu without
-                // disturbing the selection.
-                if ( GetSelectedProperties().size() <= 1 ||
-                     !alreadySelected )
-                    return DoSelectAndEdit(prop, colIndex, selFlags);
-                return true;
-            }
-            else
-            {
-                if ( mouseEvent->ControlDown() )
-                {
-                    addToExistingSelection = 1;
-                }
-                else if ( mouseEvent->ShiftDown() )
-                {
-                    if ( selection.size() > 0 && !prop->IsCategory() )
-                        addToExistingSelection = 2;
-                    else
-                        addToExistingSelection = 1;
-                }
-            }
-        }
-    }
-
-    if ( addToExistingSelection == 1 )
-    {
-        // Add/remove one
-        if ( !alreadySelected )
-        {
-            res = DoAddToSelection(prop, selFlags);
-        }
-        else if ( GetSelectedProperties().size() > 1 )
-        {
-            res = DoRemoveFromSelection(prop, selFlags);
-        }
-    }
-    else if ( addToExistingSelection == 2 )
-    {
-        // Add this, and all in between
-
-        // Find top selected property
-        wxPGProperty* topSelProp = selection[0];
-        int topSelPropY = topSelProp->GetY();
-        for ( unsigned int i=1; iGetY();
-            if ( y < topSelPropY )
-            {
-                topSelProp = p;
-                topSelPropY = y;
-            }
-        }
-
-        wxPGProperty* startFrom;
-        wxPGProperty* stopAt;
-
-        if ( prop->GetY() <= topSelPropY )
-        {
-            // Property is above selection (or same)
-            startFrom = prop;
-            stopAt = topSelProp;
-        }
-        else
-        {
-            // Property is below selection
-            startFrom = topSelProp;
-            stopAt = prop;
-        }
-
-        // Iterate through properties in-between, and select them
-        wxPropertyGridIterator it;
-
-        for ( it = GetIterator(wxPG_ITERATE_VISIBLE, startFrom);
-              !it.AtEnd();
-              it++ )
-        {
-            wxPGProperty* p = *it;
-
-            if ( !p->IsCategory() &&
-                 !m_pState->DoIsPropertySelected(p) )
-            {
-                DoAddToSelection(p, selFlags);
-            }
-
-            if ( p == stopAt )
-                break;
-        }
-    }
-    else
-    {
-        res = DoSelectAndEdit(prop, colIndex, selFlags);
-    }
-
-    return res;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::DoSetSelection( const wxArrayPGProperty& newSelection,
-                                     int selFlags )
-{
-    if ( newSelection.size() > 0 )
-    {
-        if ( !DoSelectProperty(newSelection[0], selFlags) )
-            return;
-    }
-    else
-    {
-        DoClearSelection(false, selFlags);
-    }
-
-    for ( unsigned int i = 1; i < newSelection.size(); i++ )
-    {
-        DoAddToSelection(newSelection[i], selFlags);
-    }
-
-    Refresh();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::MakeColumnEditable( unsigned int column,
-                                         bool editable )
-{
-    wxASSERT( column != 1 );
-
-    wxArrayInt& cols = m_pState->m_editableColumns;
-
-    if ( editable )
-    {
-        cols.push_back(column);
-    }
-    else
-    {
-        for ( int i = cols.size() - 1; i > 0; i-- )
-        {
-            if ( cols[i] == (int)column )
-                cols.erase( cols.begin() + i );
-        }
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::DoBeginLabelEdit( unsigned int colIndex,
-                                       int selFlags )
-{
-    wxPGProperty* selected = GetSelection();
-    wxCHECK_RET(selected, wxT("No property selected"));
-    wxCHECK_RET(colIndex != 1, wxT("Do not use this for column 1"));
-
-    if ( !(selFlags & wxPG_SEL_DONT_SEND_EVENT) )
-    {
-        if ( SendEvent( wxEVT_PG_LABEL_EDIT_BEGIN,
-                        selected, NULL, 0,
-                        colIndex ) )
-            return;
-    }
-
-    wxString text;
-    const wxPGCell* cell = NULL;
-    if ( selected->HasCell(colIndex) )
-    {
-        cell = &selected->GetCell(colIndex);
-        if ( !cell->HasText() && colIndex == 0 )
-            text = selected->GetLabel();
-    }
-
-    if ( !cell  )
-    {
-        if ( colIndex == 0 )
-            text = selected->GetLabel();
-        else
-            cell = &selected->GetOrCreateCell(colIndex);
-    }
-
-    if ( cell && cell->HasText() )
-        text = cell->GetText();
-
-    DoEndLabelEdit(true, wxPG_SEL_NOVALIDATE);  // send event
-
-    m_selColumn = colIndex;
-
-    wxRect r = GetEditorWidgetRect(selected, m_selColumn);
-
-    wxWindow* tc = GenerateEditorTextCtrl(r.GetPosition(),
-                                          r.GetSize(),
-                                          text,
-                                          NULL,
-                                          wxTE_PROCESS_ENTER,
-                                          0,
-                                          colIndex);
-
-    wxWindowID id = tc->GetId();
-    tc->Connect(id, wxEVT_TEXT_ENTER,
-        wxCommandEventHandler(wxPropertyGrid::OnLabelEditorEnterPress),
-        NULL, this);
-    tc->Connect(id, wxEVT_KEY_DOWN,
-        wxKeyEventHandler(wxPropertyGrid::OnLabelEditorKeyPress),
-        NULL, this);
-
-    tc->SetFocus();
-
-    m_labelEditor = wxStaticCast(tc, wxTextCtrl);
-    m_labelEditorProperty = selected;
-}
-
-// -----------------------------------------------------------------------
-
-void
-wxPropertyGrid::OnLabelEditorEnterPress( wxCommandEvent& WXUNUSED(event) )
-{
-    DoEndLabelEdit(true);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnLabelEditorKeyPress( wxKeyEvent& event )
-{
-    int keycode = event.GetKeyCode();
-
-    if ( keycode == WXK_ESCAPE )
-    {
-        DoEndLabelEdit(false);
-    }
-    else
-    {
-        HandleKeyEvent(event, true);
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::DoEndLabelEdit( bool commit, int selFlags )
-{
-    if ( !m_labelEditor )
-        return;
-
-    wxPGProperty* prop = m_labelEditorProperty;
-    wxASSERT(prop);
-
-    if ( commit )
-    {
-        if ( !(selFlags & wxPG_SEL_DONT_SEND_EVENT) )
-        {
-            // wxPG_SEL_NOVALIDATE is passed correctly in selFlags
-            if ( SendEvent( wxEVT_PG_LABEL_EDIT_ENDING,
-                            prop, NULL, selFlags,
-                            m_selColumn ) )
-                return;
-        }
-
-        wxString text = m_labelEditor->GetValue();
-        wxPGCell* cell = NULL;
-        if ( prop->HasCell(m_selColumn) )
-        {
-            cell = &prop->GetCell(m_selColumn);
-        }
-        else
-        {
-            if ( m_selColumn == 0 )
-                prop->SetLabel(text);
-            else
-                cell = &prop->GetOrCreateCell(m_selColumn);
-        }
-
-        if ( cell )
-            cell->SetText(text);
-    }
-
-    m_selColumn = 1;
-    int wasFocused = m_iFlags & wxPG_FL_FOCUSED;
-
-    DestroyEditorWnd(m_labelEditor);
-
-    m_labelEditor = NULL;
-    m_labelEditorProperty = NULL;
-
-    // Fix focus (needed at least on wxGTK)
-    if ( wasFocused )
-        SetFocusOnCanvas();
-
-    DrawItem(prop);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::SetExtraStyle( long exStyle )
-{
-    if ( exStyle & wxPG_EX_ENABLE_TLP_TRACKING )
-        OnTLPChanging(::wxGetTopLevelParent(this));
-    else
-        OnTLPChanging(NULL);
-
-    if ( exStyle & wxPG_EX_NATIVE_DOUBLE_BUFFERING )
-    {
-#if defined(__WXMSW__)
-
-        /*
-        // Don't use WS_EX_COMPOSITED just now.
-        HWND hWnd;
-
-        if ( m_iFlags & wxPG_FL_IN_MANAGER )
-            hWnd = (HWND)GetParent()->GetHWND();
-        else
-            hWnd = (HWND)GetHWND();
-
-        ::SetWindowLong( hWnd, GWL_EXSTYLE,
-                         ::GetWindowLong(hWnd, GWL_EXSTYLE) | WS_EX_COMPOSITED );
-        */
-
-//#elif defined(__WXGTK20__)
-#endif
-        // Only apply wxPG_EX_NATIVE_DOUBLE_BUFFERING if the window
-        // truly was double-buffered.
-        if ( !this->IsDoubleBuffered() )
-        {
-            exStyle &= ~(wxPG_EX_NATIVE_DOUBLE_BUFFERING);
-        }
-        else
-        {
-            wxDELETE(m_doubleBuffer);
-        }
-    }
-
-    wxControl::SetExtraStyle( exStyle );
-
-    if ( exStyle & wxPG_EX_INIT_NOCAT )
-        m_pState->InitNonCatMode();
-
-    if ( exStyle & wxPG_EX_HELP_AS_TOOLTIPS )
-        m_windowStyle |= wxPG_TOOLTIPS;
-
-    // Set global style
-    wxPGGlobalVars->m_extraStyle = exStyle;
-}
-
-// -----------------------------------------------------------------------
-
-// returns the best acceptable minimal size
-wxSize wxPropertyGrid::DoGetBestSize() const
-{
-    int lineHeight = wxMax(15, m_lineHeight);
-
-    // don't make the grid too tall (limit height to 10 items) but don't
-    // make it too small neither
-    int numLines = wxMin
-                   (
-                    wxMax(m_pState->m_properties->GetChildCount(), 3),
-                    10
-                   );
-
-    wxClientDC dc(const_cast(this));
-    int width = m_marginWidth;
-    for ( unsigned int i = 0; i < m_pState->m_colWidths.size(); i++ )
-    {
-        width += m_pState->GetColumnFitWidth(dc, m_pState->DoGetRoot(), i, true);
-    }
-
-    const wxSize sz = wxSize(width, lineHeight*numLines + 40);
-
-    CacheBestSize(sz);
-    return sz;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnTLPChanging( wxWindow* newTLP )
-{
-    if ( newTLP == m_tlp )
-        return;
-
-    wxLongLong currentTime = ::wxGetLocalTimeMillis();
-
-    //
-    // Parent changed so let's redetermine and re-hook the
-    // correct top-level window.
-    if ( m_tlp )
-    {
-        m_tlp->Disconnect( wxEVT_CLOSE_WINDOW,
-                           wxCloseEventHandler(wxPropertyGrid::OnTLPClose),
-                           NULL, this );
-        m_tlpClosed = m_tlp;
-        m_tlpClosedTime = currentTime;
-    }
-
-    if ( newTLP )
-    {
-        // Only accept new tlp if same one was not just dismissed.
-        if ( newTLP != m_tlpClosed ||
-             m_tlpClosedTime+250 < currentTime )
-        {
-            newTLP->Connect( wxEVT_CLOSE_WINDOW,
-                             wxCloseEventHandler(wxPropertyGrid::OnTLPClose),
-                             NULL, this );
-            m_tlpClosed = NULL;
-        }
-        else
-        {
-            newTLP = NULL;
-        }
-    }
-
-    m_tlp = newTLP;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnTLPClose( wxCloseEvent& event )
-{
-    // ClearSelection forces value validation/commit.
-    if ( event.CanVeto() && !DoClearSelection() )
-    {
-        event.Veto();
-        return;
-    }
-
-    // Ok, it can close, set tlp pointer to NULL. Some other event
-    // handler can of course veto the close, but our OnIdle() should
-    // then be able to regain the tlp pointer.
-    OnTLPChanging(NULL);
-
-    event.Skip();
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::Reparent( wxWindowBase *newParent )
-{
-    OnTLPChanging((wxWindow*)newParent);
-
-    bool res = wxControl::Reparent(newParent);
-
-    return res;
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGrid Font and Colour Methods
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::CalculateFontAndBitmapStuff( int vspacing )
-{
-    int x = 0, y = 0;
-
-    m_captionFont = wxControl::GetFont();
-
-    GetTextExtent(wxS("jG"), &x, &y, 0, 0, &m_captionFont);
-    m_subgroup_extramargin = x + (x/2);
-    m_fontHeight = y;
-
-#if wxPG_USE_RENDERER_NATIVE
-    m_iconWidth = wxPG_ICON_WIDTH;
-#elif wxPG_ICON_WIDTH
-    // scale icon
-    m_iconWidth = (m_fontHeight * wxPG_ICON_WIDTH) / 13;
-    if ( m_iconWidth < 5 ) m_iconWidth = 5;
-    else if ( !(m_iconWidth & 0x01) ) m_iconWidth++; // must be odd
-
-#endif
-
-    m_gutterWidth = m_iconWidth / wxPG_GUTTER_DIV;
-    if ( m_gutterWidth < wxPG_GUTTER_MIN )
-        m_gutterWidth = wxPG_GUTTER_MIN;
-
-    int vdiv = 6;
-    if ( vspacing <= 1 ) vdiv = 12;
-    else if ( vspacing >= 3 ) vdiv = 3;
-
-    m_spacingy = m_fontHeight / vdiv;
-    if ( m_spacingy < wxPG_YSPACING_MIN )
-        m_spacingy = wxPG_YSPACING_MIN;
-
-    m_marginWidth = 0;
-    if ( !(m_windowStyle & wxPG_HIDE_MARGIN) )
-        m_marginWidth = m_gutterWidth*2 + m_iconWidth;
-
-    m_captionFont.SetWeight(wxBOLD);
-    GetTextExtent(wxS("jG"), &x, &y, 0, 0, &m_captionFont);
-
-    m_lineHeight = m_fontHeight+(2*m_spacingy)+1;
-
-    // button spacing
-    m_buttonSpacingY = (m_lineHeight - m_iconHeight) / 2;
-    if ( m_buttonSpacingY < 0 ) m_buttonSpacingY = 0;
-
-    if ( m_pState )
-        m_pState->CalculateFontAndBitmapStuff(vspacing);
-
-    if ( m_iFlags & wxPG_FL_INITIALIZED )
-        RecalculateVirtualSize();
-
-    InvalidateBestSize();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnSysColourChanged( wxSysColourChangedEvent &WXUNUSED(event) )
-{
-    if ((m_iFlags & wxPG_FL_INITIALIZED)!=0) {
-        RegainColours();
-        Refresh();
-    }
-}
-
-// -----------------------------------------------------------------------
-
-static wxColour wxPGAdjustColour(const wxColour& src, int ra,
-                                 int ga = 1000, int ba = 1000,
-                                 bool forceDifferent = false)
-{
-    if ( ga >= 1000 )
-        ga = ra;
-    if ( ba >= 1000 )
-        ba = ra;
-
-    // Recursion guard (allow 2 max)
-    static int isinside = 0;
-    isinside++;
-    wxCHECK_MSG( isinside < 3,
-                 *wxBLACK,
-                 wxT("wxPGAdjustColour should not be recursively called more than once") );
-
-    wxColour dst;
-
-    int r = src.Red();
-    int g = src.Green();
-    int b = src.Blue();
-    int r2 = r + ra;
-    if ( r2>255 ) r2 = 255;
-    else if ( r2<0) r2 = 0;
-    int g2 = g + ga;
-    if ( g2>255 ) g2 = 255;
-    else if ( g2<0) g2 = 0;
-    int b2 = b + ba;
-    if ( b2>255 ) b2 = 255;
-    else if ( b2<0) b2 = 0;
-
-    // Make sure they are somewhat different
-    if ( forceDifferent && (abs((r+g+b)-(r2+g2+b2)) < abs(ra/2)) )
-        dst = wxPGAdjustColour(src,-(ra*2));
-    else
-        dst = wxColour(r2,g2,b2);
-
-    // Recursion guard (allow 2 max)
-    isinside--;
-
-    return dst;
-}
-
-
-static int wxPGGetColAvg( const wxColour& col )
-{
-    return (col.Red() + col.Green() + col.Blue()) / 3;
-}
-
-
-void wxPropertyGrid::RegainColours()
-{
-    if ( !(m_coloursCustomized & 0x0002) )
-    {
-        wxColour col = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE );
-
-        // Make sure colour is dark enough
-    #ifdef __WXGTK__
-        int colDec = wxPGGetColAvg(col) - 230;
-    #else
-        int colDec = wxPGGetColAvg(col) - 200;
-    #endif
-        if ( colDec > 0 )
-            m_colCapBack = wxPGAdjustColour(col,-colDec);
-        else
-            m_colCapBack = col;
-        m_categoryDefaultCell.GetData()->SetBgCol(m_colCapBack);
-    }
-
-    if ( !(m_coloursCustomized & 0x0001) )
-        m_colMargin = m_colCapBack;
-
-    if ( !(m_coloursCustomized & 0x0004) )
-    {
-    #ifdef __WXGTK__
-        int colDec = -90;
-    #else
-        int colDec = -72;
-    #endif
-        wxColour capForeCol = wxPGAdjustColour(m_colCapBack,colDec,5000,5000,true);
-        m_colCapFore = capForeCol;
-        m_categoryDefaultCell.GetData()->SetFgCol(capForeCol);
-    }
-
-    if ( !(m_coloursCustomized & 0x0008) )
-    {
-        wxColour bgCol = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW );
-        m_colPropBack = bgCol;
-        m_propertyDefaultCell.GetData()->SetBgCol(bgCol);
-        if ( !m_unspecifiedAppearance.GetBgCol().IsOk() )
-            m_unspecifiedAppearance.SetBgCol(bgCol);
-    }
-
-    if ( !(m_coloursCustomized & 0x0010) )
-    {
-        wxColour fgCol = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
-        m_colPropFore = fgCol;
-        m_propertyDefaultCell.GetData()->SetFgCol(fgCol);
-        if ( !m_unspecifiedAppearance.GetFgCol().IsOk() )
-            m_unspecifiedAppearance.SetFgCol(fgCol);
-    }
-
-    if ( !(m_coloursCustomized & 0x0020) )
-        m_colSelBack = wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT );
-
-    if ( !(m_coloursCustomized & 0x0040) )
-        m_colSelFore = wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHTTEXT );
-
-    if ( !(m_coloursCustomized & 0x0080) )
-        m_colLine = m_colCapBack;
-
-    if ( !(m_coloursCustomized & 0x0100) )
-        m_colDisPropFore = m_colCapFore;
-
-    m_colEmptySpace = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW );
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::ResetColours()
-{
-    m_coloursCustomized = 0;
-
-    RegainColours();
-
-    Refresh();
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::SetFont( const wxFont& font )
-{
-    // Must disable active editor.
-    DoClearSelection();
-
-    bool res = wxControl::SetFont( font );
-    if ( res && GetParent()) // may not have been Create()ed yet if SetFont called from SetWindowVariant
-    {
-        CalculateFontAndBitmapStuff( m_vspacing );
-        Refresh();
-    }
-
-    return res;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::SetLineColour( const wxColour& col )
-{
-    m_colLine = col;
-    m_coloursCustomized |= 0x80;
-    Refresh();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::SetMarginColour( const wxColour& col )
-{
-    m_colMargin = col;
-    m_coloursCustomized |= 0x01;
-    Refresh();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::SetCellBackgroundColour( const wxColour& col )
-{
-    m_colPropBack = col;
-    m_coloursCustomized |= 0x08;
-
-    m_propertyDefaultCell.GetData()->SetBgCol(col);
-    m_unspecifiedAppearance.SetBgCol(col);
-
-    Refresh();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::SetCellTextColour( const wxColour& col )
-{
-    m_colPropFore = col;
-    m_coloursCustomized |= 0x10;
-
-    m_propertyDefaultCell.GetData()->SetFgCol(col);
-    m_unspecifiedAppearance.SetFgCol(col);
-
-    Refresh();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::SetEmptySpaceColour( const wxColour& col )
-{
-    m_colEmptySpace = col;
-
-    Refresh();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::SetCellDisabledTextColour( const wxColour& col )
-{
-    m_colDisPropFore = col;
-    m_coloursCustomized |= 0x100;
-    Refresh();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::SetSelectionBackgroundColour( const wxColour& col )
-{
-    m_colSelBack = col;
-    m_coloursCustomized |= 0x20;
-    Refresh();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::SetSelectionTextColour( const wxColour& col )
-{
-    m_colSelFore = col;
-    m_coloursCustomized |= 0x40;
-    Refresh();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::SetCaptionBackgroundColour( const wxColour& col )
-{
-    m_colCapBack = col;
-    m_coloursCustomized |= 0x02;
-
-    m_categoryDefaultCell.GetData()->SetBgCol(col);
-
-    Refresh();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::SetCaptionTextColour( const wxColour& col )
-{
-    m_colCapFore = col;
-    m_coloursCustomized |= 0x04;
-
-    m_categoryDefaultCell.GetData()->SetFgCol(col);
-
-    Refresh();
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGrid property adding and removal
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::PrepareAfterItemsAdded()
-{
-    if ( !m_pState || !m_pState->m_itemsAdded ) return;
-
-    m_pState->m_itemsAdded = 0;
-
-    if ( m_windowStyle & wxPG_AUTO_SORT )
-        Sort(wxPG_SORT_TOP_LEVEL_ONLY);
-
-    RecalculateVirtualSize();
-
-    // Fix editor position
-    CorrectEditorWidgetPosY();
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGrid property operations
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::EnsureVisible( wxPGPropArg id )
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-
-    Update();
-
-    bool changed = false;
-
-    // Is it inside collapsed section?
-    if ( !p->IsVisible() )
-    {
-        // expand parents
-        wxPGProperty* parent = p->GetParent();
-        wxPGProperty* grandparent = parent->GetParent();
-
-        if ( grandparent && grandparent != m_pState->m_properties )
-            Expand( grandparent );
-
-        Expand( parent );
-        changed = true;
-    }
-
-    // Need to scroll?
-    int vx, vy;
-    GetViewStart(&vx,&vy);
-    vy*=wxPG_PIXELS_PER_UNIT;
-
-    int y = p->GetY();
-
-    if ( y < vy )
-    {
-        Scroll(vx, y/wxPG_PIXELS_PER_UNIT );
-        m_iFlags |= wxPG_FL_SCROLLED;
-        changed = true;
-    }
-    else if ( (y+m_lineHeight) > (vy+m_height) )
-    {
-        Scroll(vx, (y-m_height+(m_lineHeight*2))/wxPG_PIXELS_PER_UNIT );
-        m_iFlags |= wxPG_FL_SCROLLED;
-        changed = true;
-    }
-
-    if ( changed )
-        DrawItems( p, p );
-
-    return changed;
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGrid helper methods called by properties
-// -----------------------------------------------------------------------
-
-// Control font changer helper.
-void wxPropertyGrid::SetCurControlBoldFont()
-{
-    wxWindow* editor = GetEditorControl();
-    editor->SetFont( m_captionFont );
-}
-
-// -----------------------------------------------------------------------
-
-wxPoint wxPropertyGrid::GetGoodEditorDialogPosition( wxPGProperty* p,
-                                                     const wxSize& sz )
-{
-#if wxPG_SMALL_SCREEN
-    // On small-screen devices, always show dialogs with default position and size.
-    return wxDefaultPosition;
-#else
-    int splitterX = GetSplitterPosition();
-    int x = splitterX;
-    int y = p->GetY();
-
-    wxCHECK_MSG( y >= 0, wxPoint(-1,-1), wxT("invalid y?") );
-
-    ImprovedClientToScreen( &x, &y );
-
-    int sw = wxSystemSettings::GetMetric( ::wxSYS_SCREEN_X );
-    int sh = wxSystemSettings::GetMetric( ::wxSYS_SCREEN_Y );
-
-    int new_x;
-    int new_y;
-
-    if ( x > (sw/2) )
-        // left
-        new_x = x + (m_width-splitterX) - sz.x;
-    else
-        // right
-        new_x = x;
-
-    if ( y > (sh/2) )
-        // above
-        new_y = y - sz.y;
-    else
-        // below
-        new_y = y + m_lineHeight;
-
-    return wxPoint(new_x,new_y);
-#endif
-}
-
-// -----------------------------------------------------------------------
-
-wxString& wxPropertyGrid::ExpandEscapeSequences( wxString& dst_str, wxString& src_str )
-{
-    if ( src_str.empty() )
-    {
-        dst_str = src_str;
-        return src_str;
-    }
-
-    bool prev_is_slash = false;
-
-    wxString::const_iterator i = src_str.begin();
-
-    dst_str.clear();
-
-    for ( ; i != src_str.end(); ++i )
-    {
-        wxUniChar a = *i;
-
-        if ( a != wxS('\\') )
-        {
-            if ( !prev_is_slash )
-            {
-                dst_str << a;
-            }
-            else
-            {
-                if ( a == wxS('n') )
-                {
-            #ifdef __WXMSW__
-                    dst_str << wxS('\n');
-            #else
-                    dst_str << wxS('\n');
-            #endif
-                }
-                else if ( a == wxS('t') )
-                    dst_str << wxS('\t');
-                else
-                    dst_str << a;
-            }
-            prev_is_slash = false;
-        }
-        else
-        {
-            if ( prev_is_slash )
-            {
-                dst_str << wxS('\\');
-                prev_is_slash = false;
-            }
-            else
-            {
-                prev_is_slash = true;
-            }
-        }
-    }
-    return dst_str;
-}
-
-// -----------------------------------------------------------------------
-
-wxString& wxPropertyGrid::CreateEscapeSequences( wxString& dst_str, wxString& src_str )
-{
-    if ( src_str.empty() )
-    {
-        dst_str = src_str;
-        return src_str;
-    }
-
-    wxString::const_iterator i = src_str.begin();
-    wxUniChar prev_a = wxS('\0');
-
-    dst_str.clear();
-
-    for ( ; i != src_str.end(); ++i )
-    {
-        wxChar a = *i;
-
-        if ( a >= wxS(' ') )
-        {
-            // This surely is not something that requires an escape sequence.
-            dst_str << a;
-        }
-        else
-        {
-            // This might need...
-            if ( a == wxS('\r')  )
-            {
-                // DOS style line end.
-                // Already taken care below
-            }
-            else if ( a == wxS('\n') )
-                // UNIX style line end.
-                dst_str << wxS("\\n");
-            else if ( a == wxS('\t') )
-                // Tab.
-                dst_str << wxS('\t');
-            else
-            {
-                //wxLogDebug(wxT("WARNING: Could not create escape sequence for character #%i"),(int)a);
-                dst_str << a;
-            }
-        }
-
-        prev_a = a;
-    }
-    return dst_str;
-}
-
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGrid::DoGetItemAtY( int y ) const
-{
-    // Outside?
-    if ( y < 0 )
-        return NULL;
-
-    unsigned int a = 0;
-    return m_pState->m_properties->GetItemAtY(y, m_lineHeight, &a);
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGrid graphics related methods
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnPaint( wxPaintEvent& WXUNUSED(event) )
-{
-    wxPaintDC dc(this);
-    PrepareDC(dc);
-
-    // Don't paint after destruction has begun
-    if ( !HasInternalFlag(wxPG_FL_INITIALIZED) )
-        return;
-
-    // Find out where the window is scrolled to
-    int vx,vy;                     // Top left corner of client
-    GetViewStart(&vx,&vy);
-    vy *= wxPG_PIXELS_PER_UNIT;
-
-    // Update everything inside the box
-    wxRect r = GetUpdateRegion().GetBox();
-
-    r.y += vy;
-
-    // FIXME: This is just a workaround for a bug that causes splitters not
-    //        to paint when other windows are being dragged over the grid.
-    r.x = 0;
-    r.width = GetClientSize().x;
-
-    r.y = vy;
-    r.height = GetClientSize().y;
-
-    // Repaint this rectangle
-    DrawItems( dc, r.y, r.y + r.height, &r );
-
-    // We assume that the size set when grid is shown
-    // is what is desired.
-    SetInternalFlag(wxPG_FL_GOOD_SIZE_SET);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::DrawExpanderButton( wxDC& dc, const wxRect& rect,
-                                         wxPGProperty* property ) const
-{
-    // Prepare rectangle to be used
-    wxRect r(rect);
-    r.x += m_gutterWidth; r.y += m_buttonSpacingY;
-    r.width = m_iconWidth; r.height = m_iconHeight;
-
-#if (wxPG_USE_RENDERER_NATIVE)
-    //
-#elif wxPG_ICON_WIDTH
-    // Drawing expand/collapse button manually
-    dc.SetPen(m_colPropFore);
-    if ( property->IsCategory() )
-        dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    else
-        dc.SetBrush(m_colPropBack);
-
-    dc.DrawRectangle( r );
-    int _y = r.y+(m_iconWidth/2);
-    dc.DrawLine(r.x+2,_y,r.x+m_iconWidth-2,_y);
-#else
-    wxBitmap* bmp;
-#endif
-
-    if ( property->IsExpanded() )
-    {
-    // wxRenderer functions are non-mutating in nature, so it
-    // should be safe to cast "const wxPropertyGrid*" to "wxWindow*".
-    // Hopefully this does not cause problems.
-    #if (wxPG_USE_RENDERER_NATIVE)
-        wxRendererNative::Get().DrawTreeItemButton(
-                (wxWindow*)this,
-                dc,
-                r,
-                wxCONTROL_EXPANDED
-            );
-    #elif wxPG_ICON_WIDTH
-        //
-    #else
-        bmp = m_collbmp;
-    #endif
-
-    }
-    else
-    {
-    #if (wxPG_USE_RENDERER_NATIVE)
-        wxRendererNative::Get().DrawTreeItemButton(
-                (wxWindow*)this,
-                dc,
-                r,
-                0
-            );
-    #elif wxPG_ICON_WIDTH
-        int _x = r.x+(m_iconWidth/2);
-        dc.DrawLine(_x,r.y+2,_x,r.y+m_iconWidth-2);
-    #else
-        bmp = m_expandbmp;
-    #endif
-    }
-
-#if (wxPG_USE_RENDERER_NATIVE)
-    //
-#elif wxPG_ICON_WIDTH
-    //
-#else
-    dc.DrawBitmap( *bmp, r.x, r.y, true );
-#endif
-}
-
-// -----------------------------------------------------------------------
-
-//
-// This is the one called by OnPaint event handler and others.
-// topy and bottomy are already unscrolled (ie. physical)
-//
-void wxPropertyGrid::DrawItems( wxDC& dc,
-                                unsigned int topItemY,
-                                unsigned int bottomItemY,
-                                const wxRect* itemsRect )
-{
-    if ( m_frozen ||
-         m_height < 1 ||
-         bottomItemY < topItemY ||
-         !m_pState )
-        return;
-
-    m_pState->EnsureVirtualHeight();
-
-    wxRect tempItemsRect;
-    if ( !itemsRect )
-    {
-        tempItemsRect = wxRect(0, topItemY,
-                               m_pState->m_width,
-                               bottomItemY);
-        itemsRect = &tempItemsRect;
-    }
-
-    int vx, vy;
-    GetViewStart(&vx, &vy);
-    vx *= wxPG_PIXELS_PER_UNIT;
-    vy *= wxPG_PIXELS_PER_UNIT;
-
-    // itemRect is in virtual grid space
-    wxRect drawRect(itemsRect->x - vx,
-                    itemsRect->y - vy,
-                    itemsRect->width,
-                    itemsRect->height);
-
-    // items added check
-    if ( m_pState->m_itemsAdded ) PrepareAfterItemsAdded();
-
-    int paintFinishY = 0;
-
-    if ( m_pState->m_properties->GetChildCount() > 0 )
-    {
-        wxDC* dcPtr = &dc;
-        bool isBuffered = false;
-
-        wxMemoryDC* bufferDC = NULL;
-
-        if ( !(GetExtraStyle() & wxPG_EX_NATIVE_DOUBLE_BUFFERING) )
-        {
-            if ( !m_doubleBuffer )
-            {
-                paintFinishY = itemsRect->y;
-                dcPtr = NULL;
-            }
-            else
-            {
-                bufferDC = new wxMemoryDC();
-
-                // If nothing was changed, then just copy from double-buffer
-                bufferDC->SelectObject( *m_doubleBuffer );
-                dcPtr = bufferDC;
-
-                isBuffered = true;
-            }
-        }
-
-        if ( dcPtr )
-        {
-            // paintFinishY and drawBottomY are in buffer/physical space
-            paintFinishY = DoDrawItems( *dcPtr, itemsRect, isBuffered );
-            int drawBottomY = itemsRect->y + itemsRect->height - vy;
-
-            // Clear area beyond last painted property
-            if ( paintFinishY < drawBottomY )
-            {
-                dcPtr->SetPen(m_colEmptySpace);
-                dcPtr->SetBrush(m_colEmptySpace);
-                dcPtr->DrawRectangle(0, paintFinishY,
-                                     m_width,
-                                     drawBottomY );
-            }
-        }
-
-        if ( bufferDC )
-        {
-            dc.Blit( drawRect.x, drawRect.y, drawRect.width,
-                     drawRect.height,
-                     bufferDC, 0, 0, wxCOPY );
-            delete bufferDC;
-        }
-    }
-    else
-    {
-        // Just clear the area
-        dc.SetPen(m_colEmptySpace);
-        dc.SetBrush(m_colEmptySpace);
-        dc.DrawRectangle(drawRect);
-    }
-}
-
-// -----------------------------------------------------------------------
-
-int wxPropertyGrid::DoDrawItems( wxDC& dc,
-                                 const wxRect* itemsRect,
-                                 bool isBuffered ) const
-{
-    const wxPGProperty* firstItem;
-    const wxPGProperty* lastItem;
-
-    firstItem = DoGetItemAtY(itemsRect->y);
-    lastItem = DoGetItemAtY(itemsRect->y+itemsRect->height-1);
-
-    if ( !lastItem )
-        lastItem = GetLastItem( wxPG_ITERATE_VISIBLE );
-
-    if ( m_frozen || m_height < 1 || firstItem == NULL )
-        return itemsRect->y;
-
-    wxCHECK_MSG( !m_pState->m_itemsAdded, itemsRect->y,
-                 "no items added" );
-    wxASSERT( m_pState->m_properties->GetChildCount() );
-
-    int lh = m_lineHeight;
-
-    int firstItemTopY;
-    int lastItemBottomY;
-
-    firstItemTopY = itemsRect->y;
-    lastItemBottomY = itemsRect->y + itemsRect->height;
-
-    // Align y coordinates to item boundaries
-    firstItemTopY -= firstItemTopY % lh;
-    lastItemBottomY += lh - (lastItemBottomY % lh);
-    lastItemBottomY -= 1;
-
-    // Entire range outside scrolled, visible area?
-    if ( firstItemTopY >= (int)m_pState->GetVirtualHeight() ||
-         lastItemBottomY <= 0 )
-        return itemsRect->y;
-
-    wxCHECK_MSG( firstItemTopY < lastItemBottomY,
-                 itemsRect->y,
-                 "invalid y values" );
-
-    /*
-    wxLogDebug("  -> DoDrawItems ( \"%s\" -> \"%s\"
-               "height=%i (ch=%i), itemsRect = 0x%lX )",
-        firstItem->GetLabel().c_str(),
-        lastItem->GetLabel().c_str(),
-        (int)(lastItemBottomY - firstItemTopY),
-        (int)m_height,
-        (unsigned long)&itemsRect );
-    */
-
-    wxRect r;
-
-    long windowStyle = m_windowStyle;
-
-    int xRelMod = 0;
-
-    //
-    // For now, do some manual calculation for double buffering
-    // - buffer's y = 0, so align itemsRect and coordinates to that
-    //
-    // TODO: In future use wxAutoBufferedPaintDC (for example)
-    //
-    int yRelMod = 0;
-
-    wxRect cr2;
-
-    if ( isBuffered )
-    {
-        xRelMod = itemsRect->x;
-        yRelMod = itemsRect->y;
-
-        //
-        // itemsRect conversion
-        cr2 = *itemsRect;
-        cr2.x -= xRelMod;
-        cr2.y -= yRelMod;
-        itemsRect = &cr2;
-        firstItemTopY -= yRelMod;
-        lastItemBottomY -= yRelMod;
-    }
-
-    int x = m_marginWidth - xRelMod;
-
-    wxFont normalFont = GetFont();
-
-    bool reallyFocused = (m_iFlags & wxPG_FL_FOCUSED) != 0;
-
-    bool isPgEnabled = IsEnabled();
-
-    //
-    // Prepare some pens and brushes that are often changed to.
-    //
-
-    wxBrush marginBrush(m_colMargin);
-    wxPen marginPen(m_colMargin);
-    wxBrush capbgbrush(m_colCapBack,wxSOLID);
-    wxPen linepen(m_colLine,1,wxSOLID);
-
-    wxColour selBackCol;
-    if ( isPgEnabled )
-        selBackCol = m_colSelBack;
-    else
-        selBackCol = m_colMargin;
-
-    // pen that has same colour as text
-    wxPen outlinepen(m_colPropFore,1,wxSOLID);
-
-    //
-    // Clear margin with background colour
-    //
-    dc.SetBrush( marginBrush );
-    if ( !(windowStyle & wxPG_HIDE_MARGIN) )
-    {
-        dc.SetPen( *wxTRANSPARENT_PEN );
-        dc.DrawRectangle(-1-xRelMod,firstItemTopY-1,x+2,lastItemBottomY-firstItemTopY+2);
-    }
-
-    const wxPGProperty* firstSelected = GetSelection();
-    const wxPropertyGridPageState* state = m_pState;
-    const wxArrayInt& colWidths = state->m_colWidths;
-
-    // TODO: Only render columns that are within clipping region.
-
-    dc.SetFont(normalFont);
-
-    wxPropertyGridConstIterator it( state, wxPG_ITERATE_VISIBLE, firstItem );
-    int endScanBottomY = lastItemBottomY + lh;
-    int y = firstItemTopY;
-
-    //
-    // Pregenerate list of visible properties.
-    wxArrayPGProperty visPropArray;
-    visPropArray.reserve((m_height/m_lineHeight)+6);
-
-    for ( ; !it.AtEnd(); it.Next() )
-    {
-        const wxPGProperty* p = *it;
-
-        if ( !p->HasFlag(wxPG_PROP_HIDDEN) )
-        {
-            visPropArray.push_back((wxPGProperty*)p);
-
-            if ( y > endScanBottomY )
-                break;
-
-            y += lh;
-        }
-    }
-
-    visPropArray.push_back(NULL);
-
-    wxPGProperty* nextP = visPropArray[0];
-
-    int gridWidth = state->m_width;
-
-    y = firstItemTopY;
-    for ( unsigned int arrInd=1;
-          nextP && y <= lastItemBottomY;
-          arrInd++ )
-    {
-        wxPGProperty* p = nextP;
-        nextP = visPropArray[arrInd];
-
-        int rowHeight = m_fontHeight+(m_spacingy*2)+1;
-        int textMarginHere = x;
-        int renderFlags = 0;
-
-        int greyDepth = m_marginWidth;
-        if ( !(windowStyle & wxPG_HIDE_CATEGORIES) )
-            greyDepth = (((int)p->m_depthBgCol)-1) * m_subgroup_extramargin + m_marginWidth;
-
-        int greyDepthX = greyDepth - xRelMod;
-
-        // Use basic depth if in non-categoric mode and parent is base array.
-        if ( !(windowStyle & wxPG_HIDE_CATEGORIES) || p->GetParent() != m_pState->m_properties )
-        {
-            textMarginHere += ((unsigned int)((p->m_depth-1)*m_subgroup_extramargin));
-        }
-
-        // Paint margin area
-        dc.SetBrush(marginBrush);
-        dc.SetPen(marginPen);
-        dc.DrawRectangle( -xRelMod, y, greyDepth, lh );
-
-        dc.SetPen( linepen );
-
-        int y2 = y + lh;
-
-#ifdef __WXMSW__
-        // Margin Edge
-        // Modified by JACS to not draw a margin if wxPG_HIDE_MARGIN is specified, since it
-        // looks better, at least under Windows when we have a themed border (the themed-window-specific
-        // whitespace between the real border and the propgrid margin exacerbates the double-border look).
-
-        // Is this or its parent themed?
-        bool suppressMarginEdge = (GetWindowStyle() & wxPG_HIDE_MARGIN) &&
-            (((GetWindowStyle() & wxBORDER_MASK) == wxBORDER_THEME) ||
-            (((GetWindowStyle() & wxBORDER_MASK) == wxBORDER_NONE) && ((GetParent()->GetWindowStyle() & wxBORDER_MASK) == wxBORDER_THEME)));
-#else
-        bool suppressMarginEdge = false;
-#endif
-        if (!suppressMarginEdge)
-            dc.DrawLine( greyDepthX, y, greyDepthX, y2 );
-        else
-        {
-            // Blank out the margin edge
-            dc.SetPen(wxPen(GetBackgroundColour()));
-            dc.DrawLine( greyDepthX, y, greyDepthX, y2 );
-            dc.SetPen( linepen );
-        }
-
-        // Splitters
-        unsigned int si;
-        int sx = x;
-
-        for ( si=0; siIsCategory() &&
-             nextP && nextP->IsCategory() )
-            dc.SetPen(m_colCapBack);
-
-        dc.DrawLine( greyDepthX, y2-1, gridWidth-xRelMod, y2-1 );
-
-        //
-        // Need to override row colours?
-        wxColour rowFgCol;
-        wxColour rowBgCol;
-
-        bool isSelected = state->DoIsPropertySelected(p);
-
-        if ( !isSelected )
-        {
-            // Disabled may get different colour.
-            if ( !p->IsEnabled() )
-            {
-                renderFlags |= wxPGCellRenderer::Disabled |
-                               wxPGCellRenderer::DontUseCellFgCol;
-                rowFgCol = m_colDisPropFore;
-            }
-        }
-        else
-        {
-            renderFlags |= wxPGCellRenderer::Selected;
-
-            if ( !p->IsCategory() )
-            {
-                renderFlags |= wxPGCellRenderer::DontUseCellFgCol |
-                               wxPGCellRenderer::DontUseCellBgCol;
-
-                if ( reallyFocused && p == firstSelected )
-                {
-                    rowFgCol = m_colSelFore;
-                    rowBgCol = selBackCol;
-                }
-                else if ( isPgEnabled )
-                {
-                    rowFgCol = m_colPropFore;
-                    if ( p == firstSelected )
-                        rowBgCol = m_colMargin;
-                    else
-                        rowBgCol = selBackCol;
-                }
-                else
-                {
-                    rowFgCol = m_colDisPropFore;
-                    rowBgCol = selBackCol;
-                }
-            }
-        }
-
-        wxBrush rowBgBrush;
-
-        if ( rowBgCol.IsOk() )
-            rowBgBrush = wxBrush(rowBgCol);
-
-        if ( HasInternalFlag(wxPG_FL_CELL_OVERRIDES_SEL) )
-            renderFlags = renderFlags & ~wxPGCellRenderer::DontUseCellColours;
-
-        //
-        // Fill additional margin area with background colour of first cell
-        if ( greyDepthX < textMarginHere )
-        {
-            if ( !(renderFlags & wxPGCellRenderer::DontUseCellBgCol) )
-            {
-                wxPGCell& cell = p->GetCell(0);
-                rowBgCol = cell.GetBgCol();
-                rowBgBrush = wxBrush(rowBgCol);
-            }
-            dc.SetBrush(rowBgBrush);
-            dc.SetPen(rowBgCol);
-            dc.DrawRectangle(greyDepthX+1, y,
-                             textMarginHere-greyDepthX, lh-1);
-        }
-
-        bool fontChanged = false;
-
-        // Expander button rectangle
-        wxRect butRect( ((p->m_depth - 1) * m_subgroup_extramargin) - xRelMod,
-                        y,
-                        m_marginWidth,
-                        lh );
-
-        // Default cell rect fill the entire row
-        wxRect cellRect(greyDepthX, y,
-                        gridWidth - greyDepth + 2, rowHeight-1 );
-
-        bool isCategory = p->IsCategory();
-
-        if ( isCategory )
-        {
-            dc.SetFont(m_captionFont);
-            fontChanged = true;
-
-            if ( renderFlags & wxPGCellRenderer::DontUseCellBgCol )
-            {
-                dc.SetBrush(rowBgBrush);
-                dc.SetPen(rowBgCol);
-            }
-
-            if ( renderFlags & wxPGCellRenderer::DontUseCellFgCol )
-            {
-                dc.SetTextForeground(rowFgCol);
-            }
-        }
-        else
-        {
-            // Fine tune button rectangle to actually fit the cell
-            if ( butRect.x > 0 )
-                butRect.x += IN_CELL_EXPANDER_BUTTON_X_ADJUST;
-
-            if ( p->m_flags & wxPG_PROP_MODIFIED &&
-                 (windowStyle & wxPG_BOLD_MODIFIED) )
-            {
-                dc.SetFont(m_captionFont);
-                fontChanged = true;
-            }
-
-            // Magic fine-tuning for non-category rows
-            cellRect.x += 1;
-        }
-
-        int firstCellWidth = colWidths[0] - (greyDepthX - m_marginWidth);
-        int firstCellX = cellRect.x;
-
-        // Calculate cellRect.x for the last cell
-        unsigned int ci = 0;
-        int cellX = x + 1;
-        for ( ci=0; ciHasVisibleChildren() )
-                DrawExpanderButton( dc, butRect, p );
-
-            // Background
-            if ( isSelected && (ci == 1 || ci == m_selColumn) )
-            {
-                if ( p == firstSelected )
-                {
-                    if ( ci == 1 && m_wndEditor )
-                        cellEditor = m_wndEditor;
-                    else if ( ci == m_selColumn && m_labelEditor )
-                        cellEditor = m_labelEditor;
-                }
-
-                if ( cellEditor )
-                {
-                    wxColour editorBgCol =
-                        cellEditor->GetBackgroundColour();
-                    dc.SetBrush(editorBgCol);
-                    dc.SetPen(editorBgCol);
-                    dc.SetTextForeground(m_colPropFore);
-                    dc.DrawRectangle(cellRect);
-
-                    if ( m_dragStatus != 0 ||
-                         (m_iFlags & wxPG_FL_CUR_USES_CUSTOM_IMAGE) )
-                        cellEditor = NULL;
-                }
-                else
-                {
-                    dc.SetBrush(m_colPropBack);
-                    dc.SetPen(m_colPropBack);
-                    if ( p->IsEnabled() )
-                        dc.SetTextForeground(m_colPropFore);
-                    else
-                        dc.SetTextForeground(m_colDisPropFore);
-                }
-            }
-            else
-            {
-                if ( renderFlags & wxPGCellRenderer::DontUseCellBgCol )
-                {
-                    dc.SetBrush(rowBgBrush);
-                    dc.SetPen(rowBgCol);
-                }
-
-                if ( renderFlags & wxPGCellRenderer::DontUseCellFgCol )
-                {
-                    dc.SetTextForeground(rowFgCol);
-                }
-            }
-
-            dc.SetClippingRegion(cellRect);
-
-            cellRect.x += textXAdd;
-            cellRect.width -= textXAdd;
-
-            // Foreground
-            if ( !cellEditor )
-            {
-                wxPGCellRenderer* renderer;
-                int cmnVal = p->GetCommonValue();
-                if ( cmnVal == -1 || ci != 1 )
-                {
-                    renderer = p->GetCellRenderer(ci);
-                    prevFilled = renderer->Render(dc, cellRect, this,
-                                                  p, ci, -1,
-                                                  cellRenderFlags );
-                }
-                else
-                {
-                    renderer = GetCommonValue(cmnVal)->GetRenderer();
-                    prevFilled = renderer->Render(dc, cellRect, this,
-                                                  p, ci, -1,
-                                                  cellRenderFlags );
-                }
-            }
-            else
-            {
-                prevFilled = true;
-            }
-
-            dc.DestroyClippingRegion(); // Is this really necessary?
-        }
-        while ( ci > 0 );
-
-        if ( fontChanged )
-            dc.SetFont(normalFont);
-
-        y += rowHeight;
-    }
-
-    return y;
-}
-
-// -----------------------------------------------------------------------
-
-wxRect wxPropertyGrid::GetPropertyRect( const wxPGProperty* p1, const wxPGProperty* p2 ) const
-{
-    wxRect r;
-
-    if ( m_width < 10 || m_height < 10 ||
-         !m_pState->m_properties->GetChildCount() ||
-         p1 == NULL )
-        return wxRect(0,0,0,0);
-
-    int vy = 0;
-
-    //
-    // Return rect which encloses the given property range
-    // (in logical grid coordinates)
-    //
-
-    int visTop = p1->GetY();
-    int visBottom;
-    if ( p2 )
-        visBottom = p2->GetY() + m_lineHeight;
-    else
-        visBottom = m_height + visTop;
-
-    // If seleced property is inside the range, we'll extend the range to include
-    // control's size.
-    wxPGProperty* selected = GetSelection();
-    if ( selected )
-    {
-        int selectedY = selected->GetY();
-        if ( selectedY >= visTop && selectedY < visBottom )
-        {
-            wxWindow* editor = GetEditorControl();
-            if ( editor )
-            {
-                int visBottom2 = selectedY + editor->GetSize().y;
-                if ( visBottom2 > visBottom )
-                    visBottom = visBottom2;
-            }
-        }
-    }
-
-    return wxRect(0,visTop-vy,m_pState->m_width,visBottom-visTop);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::DrawItems( const wxPGProperty* p1, const wxPGProperty* p2 )
-{
-    if ( m_frozen )
-        return;
-
-    if ( m_pState->m_itemsAdded )
-        PrepareAfterItemsAdded();
-
-    wxRect r = GetPropertyRect(p1, p2);
-    if ( r.width > 0 )
-    {
-        // Convert rectangle from logical grid coordinates to physical ones
-        int vx, vy;
-        GetViewStart(&vx, &vy);
-        vx *= wxPG_PIXELS_PER_UNIT;
-        vy *= wxPG_PIXELS_PER_UNIT;
-        r.x -= vx;
-        r.y -= vy;
-        RefreshRect(r);
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::RefreshProperty( wxPGProperty* p )
-{
-    if ( m_pState->DoIsPropertySelected(p) || p->IsChildSelected(true) )
-    {
-        // NB: We must copy the selection.
-        wxArrayPGProperty selection = m_pState->m_selection;
-        DoSetSelection(selection, wxPG_SEL_FORCE);
-    }
-
-    DrawItemAndChildren(p);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::DrawItemAndValueRelated( wxPGProperty* p )
-{
-    if ( m_frozen )
-        return;
-
-    // Draw item, children, and parent too, if it is not category
-    wxPGProperty* parent = p->GetParent();
-
-    while ( parent &&
-            !parent->IsCategory() &&
-            parent->GetParent() )
-    {
-         DrawItem(parent);
-         parent = parent->GetParent();
-    }
-
-    DrawItemAndChildren(p);
-}
-
-void wxPropertyGrid::DrawItemAndChildren( wxPGProperty* p )
-{
-    wxCHECK_RET( p, wxT("invalid property id") );
-
-    // Do not draw if in non-visible page
-    if ( p->GetParentState() != m_pState )
-        return;
-
-    // do not draw a single item if multiple pending
-    if ( m_pState->m_itemsAdded || m_frozen )
-        return;
-
-    // Update child control.
-    wxPGProperty* selected = GetSelection();
-    if ( selected && selected->GetParent() == p )
-        RefreshEditor();
-
-    const wxPGProperty* lastDrawn = p->GetLastVisibleSubItem();
-
-    DrawItems(p, lastDrawn);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::Refresh( bool WXUNUSED(eraseBackground),
-                              const wxRect *rect )
-{
-    PrepareAfterItemsAdded();
-
-    wxWindow::Refresh(false, rect);
-
-#if wxPG_REFRESH_CONTROLS
-    // I think this really helps only GTK+1.2
-    if ( m_wndEditor ) m_wndEditor->Refresh();
-    if ( m_wndEditor2 ) m_wndEditor2->Refresh();
-#endif
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGrid global operations
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::Clear()
-{
-    m_pState->DoClear();
-
-    m_propHover = NULL;
-
-    m_prevVY = 0;
-
-    RecalculateVirtualSize();
-
-    // Need to clear some area at the end
-    if ( !m_frozen )
-        RefreshRect(wxRect(0, 0, m_width, m_height));
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::EnableCategories( bool enable )
-{
-    DoClearSelection();
-
-    if ( enable )
-    {
-        //
-        // Enable categories
-        //
-
-        m_windowStyle &= ~(wxPG_HIDE_CATEGORIES);
-    }
-    else
-    {
-        //
-        // Disable categories
-        //
-        m_windowStyle |= wxPG_HIDE_CATEGORIES;
-    }
-
-    if ( !m_pState->EnableCategories(enable) )
-        return false;
-
-    if ( !m_frozen )
-    {
-        if ( m_windowStyle & wxPG_AUTO_SORT )
-        {
-            m_pState->m_itemsAdded = 1; // force
-            PrepareAfterItemsAdded();
-        }
-    }
-    else
-        m_pState->m_itemsAdded = 1;
-
-    // No need for RecalculateVirtualSize() here - it is already called in
-    // wxPropertyGridPageState method above.
-
-    Refresh();
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::SwitchState( wxPropertyGridPageState* pNewState )
-{
-    wxASSERT( pNewState );
-    wxASSERT( pNewState->GetGrid() );
-
-    if ( pNewState == m_pState )
-        return;
-
-    wxArrayPGProperty oldSelection = m_pState->m_selection;
-
-    // Call ClearSelection() instead of DoClearSelection()
-    // so that selection clear events are not sent.
-    ClearSelection();
-
-    m_pState->m_selection = oldSelection;
-
-    bool orig_mode = m_pState->IsInNonCatMode();
-    bool new_state_mode = pNewState->IsInNonCatMode();
-
-    m_pState = pNewState;
-
-    // Validate width
-    int pgWidth = GetClientSize().x;
-    if ( HasVirtualWidth() )
-    {
-        int minWidth = pgWidth;
-        if ( pNewState->m_width < minWidth )
-        {
-            pNewState->m_width = minWidth;
-            pNewState->CheckColumnWidths();
-        }
-    }
-    else
-    {
-        //
-        // Just in case, fully re-center splitter
-        //if ( HasFlag( wxPG_SPLITTER_AUTO_CENTER ) )
-        //    pNewState->m_fSplitterX = -1.0;
-
-        pNewState->OnClientWidthChange(pgWidth,
-                                       pgWidth - pNewState->m_width);
-    }
-
-    m_propHover = NULL;
-
-    // If necessary, convert state to correct mode.
-    if ( orig_mode != new_state_mode )
-    {
-        // This should refresh as well.
-        EnableCategories( orig_mode?false:true );
-    }
-    else if ( !m_frozen )
-    {
-        // Refresh, if not frozen.
-        m_pState->PrepareAfterItemsAdded();
-
-        // Reselect (Use SetSelection() instead of Do-variant so that
-        // events won't be sent).
-        SetSelection(m_pState->m_selection);
-
-        RecalculateVirtualSize(0);
-        Refresh();
-    }
-    else
-        m_pState->m_itemsAdded = 1;
-}
-
-// -----------------------------------------------------------------------
-
-// Call to SetSplitterPosition will always disable splitter auto-centering
-// if parent window is shown.
-void wxPropertyGrid::DoSetSplitterPosition( int newxpos,
-                                            int splitterIndex,
-                                            int flags )
-{
-    if ( ( newxpos < wxPG_DRAG_MARGIN ) )
-        return;
-
-    wxPropertyGridPageState* state = m_pState;
-
-    if ( flags & wxPG_SPLITTER_FROM_EVENT )
-        state->m_dontCenterSplitter = true;
-
-    state->DoSetSplitterPosition(newxpos, splitterIndex, flags);
-
-    if ( flags & wxPG_SPLITTER_REFRESH )
-    {
-        if ( GetSelection() )
-            CorrectEditorWidgetSizeX();
-
-        Refresh();
-    }
-
-    return;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::ResetColumnSizes( bool enableAutoResizing )
-{
-    wxPropertyGridPageState* state = m_pState;
-    if ( state )
-        state->ResetColumnSizes(0);
-
-    if ( enableAutoResizing && HasFlag(wxPG_SPLITTER_AUTO_CENTER) )
-        m_pState->m_dontCenterSplitter = false;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::CenterSplitter( bool enableAutoResizing )
-{
-    SetSplitterPosition( m_width/2 );
-    if ( enableAutoResizing && HasFlag(wxPG_SPLITTER_AUTO_CENTER) )
-        m_pState->m_dontCenterSplitter = false;
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGrid item iteration (GetNextProperty etc.) methods
-// -----------------------------------------------------------------------
-
-// Returns nearest paint visible property (such that will be painted unless
-// window is scrolled or resized). If given property is paint visible, then
-// it itself will be returned
-wxPGProperty* wxPropertyGrid::GetNearestPaintVisible( wxPGProperty* p ) const
-{
-    int vx,vy1;// Top left corner of client
-    GetViewStart(&vx,&vy1);
-    vy1 *= wxPG_PIXELS_PER_UNIT;
-
-    int vy2 = vy1 + m_height;
-    int propY = p->GetY2(m_lineHeight);
-
-    if ( (propY + m_lineHeight) < vy1 )
-    {
-    // Too high
-        return DoGetItemAtY( vy1 );
-    }
-    else if ( propY > vy2 )
-    {
-    // Too low
-        return DoGetItemAtY( vy2 );
-    }
-
-    // Itself paint visible
-    return p;
-
-}
-
-// -----------------------------------------------------------------------
-// Methods related to change in value, value modification and sending events
-// -----------------------------------------------------------------------
-
-// commits any changes in editor of selected property
-// return true if validation did not fail
-// flags are same as with DoSelectProperty
-bool wxPropertyGrid::CommitChangesFromEditor( wxUint32 flags )
-{
-    // Committing already?
-    if ( m_inCommitChangesFromEditor )
-        return true;
-
-    // Don't do this if already processing editor event. It might
-    // induce recursive dialogs and crap like that.
-    if ( m_iFlags & wxPG_FL_IN_HANDLECUSTOMEDITOREVENT )
-    {
-        if ( m_inDoPropertyChanged )
-            return true;
-
-        return false;
-    }
-
-    wxPGProperty* selected = GetSelection();
-
-    if ( m_wndEditor &&
-         IsEditorsValueModified() &&
-         (m_iFlags & wxPG_FL_INITIALIZED) &&
-         selected )
-    {
-        m_inCommitChangesFromEditor = true;
-
-        wxVariant variant(selected->GetValueRef());
-        bool valueIsPending = false;
-
-        // JACS - necessary to avoid new focus being found spuriously within OnIdle
-        // due to another window getting focus
-        wxWindow* oldFocus = m_curFocused;
-
-        bool validationFailure = false;
-        bool forceSuccess = (flags & (wxPG_SEL_NOVALIDATE|wxPG_SEL_FORCE)) ? true : false;
-
-        m_chgInfo_changedProperty = NULL;
-
-        // If truly modified, schedule value as pending.
-        if ( selected->GetEditorClass()->
-                GetValueFromControl( variant,
-                                     selected,
-                                     GetEditorControl() ) )
-        {
-            if ( DoEditorValidate() &&
-                 PerformValidation(selected, variant) )
-            {
-                valueIsPending = true;
-            }
-            else
-            {
-                validationFailure = true;
-            }
-        }
-        else
-        {
-            EditorsValueWasNotModified();
-        }
-
-        m_inCommitChangesFromEditor = false;
-
-        bool res = true;
-
-        if ( validationFailure && !forceSuccess )
-        {
-            if (oldFocus)
-            {
-                oldFocus->SetFocus();
-                m_curFocused = oldFocus;
-            }
-
-            res = OnValidationFailure(selected, variant);
-
-            // Now prevent further validation failure messages
-            if ( res )
-            {
-                EditorsValueWasNotModified();
-                OnValidationFailureReset(selected);
-            }
-        }
-        else if ( valueIsPending )
-        {
-            DoPropertyChanged( selected, flags );
-            EditorsValueWasNotModified();
-        }
-
-        return res;
-    }
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::PerformValidation( wxPGProperty* p, wxVariant& pendingValue,
-                                        int flags )
-{
-    //
-    // Runs all validation functionality.
-    // Returns true if value passes all tests.
-    //
-
-    m_validationInfo.m_failureBehavior = m_permanentValidationFailureBehavior;
-    m_validationInfo.m_isFailing = true;
-
-    //
-    // Variant list a special value that cannot be validated
-    // by normal means.
-    if ( pendingValue.GetType() != wxPG_VARIANT_TYPE_LIST )
-    {
-        if ( !p->ValidateValue(pendingValue, m_validationInfo) )
-            return false;
-    }
-
-    //
-    // Adapt list to child values, if necessary
-    wxVariant listValue = pendingValue;
-    wxVariant* pPendingValue = &pendingValue;
-    wxVariant* pList = NULL;
-
-    // If parent has wxPG_PROP_AGGREGATE flag, or uses composite
-    // string value, then we need treat as it was changed instead
-    // (or, in addition, as is the case with composite string parent).
-    // This includes creating list variant for child values.
-
-    wxPGProperty* pwc = p->GetParent();
-    wxPGProperty* changedProperty = p;
-    wxPGProperty* baseChangedProperty = changedProperty;
-    wxVariant bcpPendingList;
-
-    listValue = pendingValue;
-    listValue.SetName(p->GetBaseName());
-
-    while ( pwc &&
-            (pwc->HasFlag(wxPG_PROP_AGGREGATE) || pwc->HasFlag(wxPG_PROP_COMPOSED_VALUE)) )
-    {
-        wxVariantList tempList;
-        wxVariant lv(tempList, pwc->GetBaseName());
-        lv.Append(listValue);
-        listValue = lv;
-        pPendingValue = &listValue;
-
-        if ( pwc->HasFlag(wxPG_PROP_AGGREGATE) )
-        {
-            baseChangedProperty = pwc;
-            bcpPendingList = lv;
-        }
-
-        changedProperty = pwc;
-        pwc = pwc->GetParent();
-    }
-
-    wxVariant value;
-    wxPGProperty* evtChangingProperty = changedProperty;
-
-    if ( pPendingValue->GetType() != wxPG_VARIANT_TYPE_LIST )
-    {
-        value = *pPendingValue;
-    }
-    else
-    {
-        // Convert list to child values
-        pList = pPendingValue;
-        changedProperty->AdaptListToValue( *pPendingValue, &value );
-    }
-
-    wxVariant evtChangingValue = value;
-
-    if ( flags & SendEvtChanging )
-    {
-        // FIXME: After proper ValueToString()s added, remove
-        // this. It is just a temporary fix, as evt_changing
-        // will simply not work for wxPG_PROP_COMPOSED_VALUE
-        // (unless it is selected, and textctrl editor is open).
-        if ( changedProperty->HasFlag(wxPG_PROP_COMPOSED_VALUE) )
-        {
-            evtChangingProperty = baseChangedProperty;
-            if ( evtChangingProperty != p )
-            {
-                evtChangingProperty->AdaptListToValue( bcpPendingList, &evtChangingValue );
-            }
-            else
-            {
-                evtChangingValue = pendingValue;
-            }
-        }
-
-        if ( evtChangingProperty->HasFlag(wxPG_PROP_COMPOSED_VALUE) )
-        {
-            if ( changedProperty == GetSelection() )
-            {
-                wxWindow* editor = GetEditorControl();
-                wxASSERT( wxDynamicCast(editor, wxTextCtrl) );
-                evtChangingValue = wxStaticCast(editor, wxTextCtrl)->GetValue();
-            }
-            else
-            {
-                wxLogDebug(wxT("WARNING: wxEVT_PG_CHANGING is about to happen with old value."));
-            }
-        }
-    }
-
-    wxASSERT( m_chgInfo_changedProperty == NULL );
-    m_chgInfo_changedProperty = changedProperty;
-    m_chgInfo_baseChangedProperty = baseChangedProperty;
-    m_chgInfo_pendingValue = value;
-
-    if ( pList )
-        m_chgInfo_valueList = *pList;
-    else
-        m_chgInfo_valueList.MakeNull();
-
-    // If changedProperty is not property which value was edited,
-    // then call wxPGProperty::ValidateValue() for that as well.
-    if ( p != changedProperty && value.GetType() != wxPG_VARIANT_TYPE_LIST )
-    {
-        if ( !changedProperty->ValidateValue(value, m_validationInfo) )
-            return false;
-    }
-
-    if ( flags & SendEvtChanging )
-    {
-        // SendEvent returns true if event was vetoed
-        if ( SendEvent( wxEVT_PG_CHANGING, evtChangingProperty,
-                        &evtChangingValue ) )
-            return false;
-    }
-
-    if ( flags & IsStandaloneValidation )
-    {
-        // If called in 'generic' context, we need to reset
-        // m_chgInfo_changedProperty and write back translated value.
-        m_chgInfo_changedProperty = NULL;
-        pendingValue = value;
-    }
-
-    m_validationInfo.m_isFailing = false;
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-#if wxUSE_STATUSBAR
-wxStatusBar* wxPropertyGrid::GetStatusBar()
-{
-    wxWindow* topWnd = ::wxGetTopLevelParent(this);
-    if ( wxDynamicCast(topWnd, wxFrame) )
-    {
-        wxFrame* pFrame = wxStaticCast(topWnd, wxFrame);
-        if ( pFrame )
-            return pFrame->GetStatusBar();
-    }
-    return NULL;
-}
-#endif
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::DoShowPropertyError( wxPGProperty* WXUNUSED(property), const wxString& msg )
-{
-    if ( msg.empty() )
-        return;
-
-#if wxUSE_STATUSBAR
-    if ( !wxPGGlobalVars->m_offline )
-    {
-        wxStatusBar* pStatusBar = GetStatusBar();
-        if ( pStatusBar )
-        {
-            pStatusBar->SetStatusText(msg);
-            return;
-        }
-    }
-#endif
-
-    ::wxMessageBox(msg, _("Property Error"));
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::DoHidePropertyError( wxPGProperty* WXUNUSED(property) )
-{
-#if wxUSE_STATUSBAR
-    if ( !wxPGGlobalVars->m_offline )
-    {
-        wxStatusBar* pStatusBar = GetStatusBar();
-        if ( pStatusBar )
-        {
-            pStatusBar->SetStatusText(wxEmptyString);
-            return;
-        }
-    }
-#endif
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::OnValidationFailure( wxPGProperty* property,
-                                          wxVariant& invalidValue )
-{
-    if ( m_inOnValidationFailure )
-        return true;
-
-    m_inOnValidationFailure = true;
-    wxON_BLOCK_EXIT_SET(m_inOnValidationFailure, false);
-
-    wxWindow* editor = GetEditorControl();
-    int vfb = m_validationInfo.m_failureBehavior;
-
-    if ( m_inDoSelectProperty )
-    {
-        // When property selection is being changed, do not display any
-        // messages, if some were already shown for this property.
-        if ( property->HasFlag(wxPG_PROP_INVALID_VALUE) )
-        {
-            m_validationInfo.m_failureBehavior =
-                vfb & ~(wxPG_VFB_SHOW_MESSAGE |
-                        wxPG_VFB_SHOW_MESSAGEBOX |
-                        wxPG_VFB_SHOW_MESSAGE_ON_STATUSBAR);
-        }
-    }
-
-    // First call property's handler
-    property->OnValidationFailure(invalidValue);
-
-    bool res = DoOnValidationFailure(property, invalidValue);
-
-    //
-    // For non-wxTextCtrl editors, we do need to revert the value
-    if ( !wxDynamicCast(editor, wxTextCtrl) &&
-         property == GetSelection() )
-    {
-        property->GetEditorClass()->UpdateControl(property, editor);
-    }
-
-    property->SetFlag(wxPG_PROP_INVALID_VALUE);
-
-    return res;
-}
-
-bool wxPropertyGrid::DoOnValidationFailure( wxPGProperty* property, wxVariant& WXUNUSED(invalidValue) )
-{
-    int vfb = m_validationInfo.m_failureBehavior;
-
-    if ( vfb & wxPG_VFB_BEEP )
-        ::wxBell();
-
-    if ( (vfb & wxPG_VFB_MARK_CELL) &&
-         !property->HasFlag(wxPG_PROP_INVALID_VALUE) )
-    {
-        unsigned int colCount = m_pState->GetColumnCount();
-
-        // We need backup marked property's cells
-        m_propCellsBackup = property->m_cells;
-
-        wxColour vfbFg = *wxWHITE;
-        wxColour vfbBg = *wxRED;
-
-        property->EnsureCells(colCount);
-
-        for ( unsigned int i=0; im_cells[i];
-            cell.SetFgCol(vfbFg);
-            cell.SetBgCol(vfbBg);
-        }
-
-        DrawItemAndChildren(property);
-
-        if ( property == GetSelection() )
-        {
-            SetInternalFlag(wxPG_FL_CELL_OVERRIDES_SEL);
-
-            wxWindow* editor = GetEditorControl();
-            if ( editor )
-            {
-                editor->SetForegroundColour(vfbFg);
-                editor->SetBackgroundColour(vfbBg);
-            }
-        }
-    }
-
-    if ( vfb & (wxPG_VFB_SHOW_MESSAGE |
-                wxPG_VFB_SHOW_MESSAGEBOX |
-                wxPG_VFB_SHOW_MESSAGE_ON_STATUSBAR) )
-    {
-        wxString msg = m_validationInfo.m_failureMessage;
-
-        if ( msg.empty() )
-            msg = _("You have entered invalid value. Press ESC to cancel editing.");
-
-    #if wxUSE_STATUSBAR
-        if ( vfb & wxPG_VFB_SHOW_MESSAGE_ON_STATUSBAR )
-        {
-            if ( !wxPGGlobalVars->m_offline )
-            {
-                wxStatusBar* pStatusBar = GetStatusBar();
-                if ( pStatusBar )
-                    pStatusBar->SetStatusText(msg);
-            }
-        }
-    #endif
-
-        if ( vfb & wxPG_VFB_SHOW_MESSAGE )
-            DoShowPropertyError(property, msg);
-
-        if ( vfb & wxPG_VFB_SHOW_MESSAGEBOX )
-            ::wxMessageBox(msg, _("Property Error"));
-    }
-
-    return (vfb & wxPG_VFB_STAY_IN_PROPERTY) ? false : true;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::DoOnValidationFailureReset( wxPGProperty* property )
-{
-    int vfb = m_validationInfo.m_failureBehavior;
-
-    if ( vfb & wxPG_VFB_MARK_CELL )
-    {
-        // Revert cells
-        property->m_cells = m_propCellsBackup;
-
-        ClearInternalFlag(wxPG_FL_CELL_OVERRIDES_SEL);
-
-        if ( property == GetSelection() && GetEditorControl() )
-        {
-            // Calling this will recreate the control, thus resetting its colour
-            RefreshProperty(property);
-        }
-        else
-        {
-            DrawItemAndChildren(property);
-        }
-    }
-
-#if wxUSE_STATUSBAR
-    if ( vfb & wxPG_VFB_SHOW_MESSAGE_ON_STATUSBAR )
-    {
-        if ( !wxPGGlobalVars->m_offline )
-        {
-            wxStatusBar* pStatusBar = GetStatusBar();
-            if ( pStatusBar )
-                pStatusBar->SetStatusText(wxEmptyString);
-        }
-    }
-#endif
-
-    if ( vfb & wxPG_VFB_SHOW_MESSAGE )
-    {
-        DoHidePropertyError(property);
-    }
-
-    m_validationInfo.m_isFailing = false;
-}
-
-// -----------------------------------------------------------------------
-
-// flags are same as with DoSelectProperty
-bool wxPropertyGrid::DoPropertyChanged( wxPGProperty* p, unsigned int selFlags )
-{
-    if ( m_inDoPropertyChanged )
-        return true;
-
-    m_inDoPropertyChanged = true;
-    wxON_BLOCK_EXIT_SET(m_inDoPropertyChanged, false);
-
-    wxPGProperty* selected = GetSelection();
-
-    m_pState->m_anyModified = 1;
-
-    // If property's value is being changed, assume it is valid
-    OnValidationFailureReset(selected);
-
-    // Maybe need to update control
-    wxASSERT( m_chgInfo_changedProperty != NULL );
-
-    // These values were calculated in PerformValidation()
-    wxPGProperty* changedProperty = m_chgInfo_changedProperty;
-    wxVariant value = m_chgInfo_pendingValue;
-
-    wxPGProperty* topPaintedProperty = changedProperty;
-
-    while ( !topPaintedProperty->IsCategory() &&
-            !topPaintedProperty->IsRoot() )
-    {
-        topPaintedProperty = topPaintedProperty->GetParent();
-    }
-
-    changedProperty->SetValue(value, &m_chgInfo_valueList, wxPG_SETVAL_BY_USER);
-
-    // NB: Call GetEditorControl() as late as possible, because OnSetValue()
-    //     and perhaps other user-defined virtual functions may change it.
-    wxWindow* editor = GetEditorControl();
-
-    // Set as Modified (not if dragging just began)
-    if ( !(p->m_flags & wxPG_PROP_MODIFIED) )
-    {
-        p->m_flags |= wxPG_PROP_MODIFIED;
-        if ( p == selected && (m_windowStyle & wxPG_BOLD_MODIFIED) )
-        {
-            if ( editor )
-                SetCurControlBoldFont();
-        }
-    }
-
-    wxPGProperty* pwc;
-
-    // Propagate updates to parent(s)
-    pwc = p;
-    wxPGProperty* prevPwc = NULL;
-
-    while ( prevPwc != topPaintedProperty )
-    {
-        pwc->m_flags |= wxPG_PROP_MODIFIED;
-
-        if ( pwc == selected && (m_windowStyle & wxPG_BOLD_MODIFIED) )
-        {
-            if ( editor )
-                SetCurControlBoldFont();
-        }
-
-        prevPwc = pwc;
-        pwc = pwc->GetParent();
-    }
-
-    // Draw the actual property
-    DrawItemAndChildren( topPaintedProperty );
-
-    //
-    // If value was set by wxPGProperty::OnEvent, then update the editor
-    // control.
-    if ( selFlags & wxPG_SEL_DIALOGVAL )
-    {
-        RefreshEditor();
-    }
-    else
-    {
-#if wxPG_REFRESH_CONTROLS
-        if ( m_wndEditor ) m_wndEditor->Refresh();
-        if ( m_wndEditor2 ) m_wndEditor2->Refresh();
-#endif
-    }
-
-    // Sanity check
-    wxASSERT( !changedProperty->GetParent()->HasFlag(wxPG_PROP_AGGREGATE) );
-
-    // If top parent has composite string value, then send to child parents,
-    // starting from baseChangedProperty.
-    if ( changedProperty->HasFlag(wxPG_PROP_COMPOSED_VALUE) )
-    {
-        pwc = m_chgInfo_baseChangedProperty;
-
-        while ( pwc != changedProperty )
-        {
-            SendEvent( wxEVT_PG_CHANGED, pwc, NULL );
-            pwc = pwc->GetParent();
-        }
-    }
-
-    SendEvent( wxEVT_PG_CHANGED, changedProperty, NULL );
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::ChangePropertyValue( wxPGPropArg id, wxVariant newValue )
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-
-    m_chgInfo_changedProperty = NULL;
-
-    if ( PerformValidation(p, newValue) )
-    {
-        DoPropertyChanged(p);
-        return true;
-    }
-    else
-    {
-        OnValidationFailure(p, newValue);
-    }
-
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-wxVariant wxPropertyGrid::GetUncommittedPropertyValue()
-{
-    wxPGProperty* prop = GetSelectedProperty();
-
-    if ( !prop )
-        return wxNullVariant;
-
-    wxTextCtrl* tc = GetEditorTextCtrl();
-    wxVariant value = prop->GetValue();
-
-    if ( !tc || !IsEditorsValueModified() )
-        return value;
-
-    if ( !prop->StringToValue(value, tc->GetValue()) )
-        return value;
-
-    if ( !PerformValidation(prop, value, IsStandaloneValidation) )
-        return prop->GetValue();
-
-    return value;
-}
-
-// -----------------------------------------------------------------------
-
-// Runs wxValidator for the selected property
-bool wxPropertyGrid::DoEditorValidate()
-{
-#if wxUSE_VALIDATORS
-    wxRecursionGuard guard(m_validatingEditor);
-    if ( guard.IsInside() )
-        return false;
-
-    wxPGProperty* selected = GetSelection();
-    if ( selected )
-    {
-        wxWindow* wnd = GetEditorControl();
-
-        wxValidator* validator = selected->GetValidator();
-        if ( validator && wnd )
-        {
-            validator->SetWindow(wnd);
-            if ( !validator->Validate(this) )
-                return false;
-        }
-    }
-#endif
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::HandleCustomEditorEvent( wxEvent &event )
-{
-    //
-    // NB: We should return true if the event was recognized as
-    //     a dedicated wxPropertyGrid event, and as such was
-    //     either properly handled or ignored.
-    //
-
-    // It is possible that this handler receives event even before
-    // the control has been properly initialized. Let's skip the
-    // event handling in that case.
-    if ( !m_pState )
-        return false;
-
-    // Don't care about the event if it originated from the
-    // 'label editor'. In this function we only care about the
-    // property value editor.
-    if ( m_labelEditor && event.GetId() == m_labelEditor->GetId() )
-    {
-        event.Skip();
-        return true;
-    }
-
-    wxPGProperty* selected = GetSelection();
-
-    // Somehow, event is handled after property has been deselected.
-    // Possibly, but very rare.
-    if ( !selected ||
-          selected->HasFlag(wxPG_PROP_BEING_DELETED) ||
-          m_inOnValidationFailure ||
-          // Also don't handle editor event if wxEVT_PG_CHANGED or
-          // similar is currently doing something (showing a
-          // message box, for instance).
-          m_processedEvent )
-        return true;
-
-    if ( m_iFlags & wxPG_FL_IN_HANDLECUSTOMEDITOREVENT )
-        return true;
-
-    wxVariant pendingValue(selected->GetValueRef());
-    wxWindow* wnd = GetEditorControl();
-    wxWindow* editorWnd = wxDynamicCast(event.GetEventObject(), wxWindow);
-    int selFlags = 0;
-    bool wasUnspecified = selected->IsValueUnspecified();
-    int usesAutoUnspecified = selected->UsesAutoUnspecified();
-    bool valueIsPending = false;
-
-    m_chgInfo_changedProperty = NULL;
-
-    m_iFlags &= ~wxPG_FL_VALUE_CHANGE_IN_EVENT;
-
-    //
-    // Filter out excess wxTextCtrl modified events
-    if ( event.GetEventType() == wxEVT_TEXT && wnd )
-    {
-        if ( wxDynamicCast(wnd, wxTextCtrl) )
-        {
-            wxTextCtrl* tc = (wxTextCtrl*) wnd;
-
-            wxString newTcValue = tc->GetValue();
-            if ( m_prevTcValue == newTcValue )
-                return true;
-            m_prevTcValue = newTcValue;
-        }
-        else if ( wxDynamicCast(wnd, wxComboCtrl) )
-        {
-            // In some cases we might stumble unintentionally on
-            // wxComboCtrl's embedded wxTextCtrl's events. Let's
-            // avoid them.
-            if ( wxDynamicCast(editorWnd, wxTextCtrl) )
-                return false;
-
-            wxComboCtrl* cc = (wxComboCtrl*) wnd;
-
-            wxString newTcValue = cc->GetTextCtrl()->GetValue();
-            if ( m_prevTcValue == newTcValue )
-                return true;
-            m_prevTcValue = newTcValue;
-        }
-    }
-
-    SetInternalFlag(wxPG_FL_IN_HANDLECUSTOMEDITOREVENT);
-
-    bool validationFailure = false;
-    bool buttonWasHandled = false;
-    bool result = false;
-
-    //
-    // Try common button handling
-    if ( m_wndEditor2 && event.GetEventType() == wxEVT_BUTTON )
-    {
-        wxPGEditorDialogAdapter* adapter = selected->GetEditorDialog();
-
-        if ( adapter )
-        {
-            buttonWasHandled = true;
-            // Store as res2, as previously (and still currently alternatively)
-            // dialogs can be shown by handling wxEVT_BUTTON
-            // in wxPGProperty::OnEvent().
-            adapter->ShowDialog( this, selected );
-            delete adapter;
-        }
-    }
-
-    if ( !buttonWasHandled )
-    {
-        if ( wnd || m_wndEditor2 )
-        {
-            // First call editor class' event handler.
-            const wxPGEditor* editor = selected->GetEditorClass();
-
-            if ( editor->OnEvent( this, selected, editorWnd, event ) )
-            {
-                result = true;
-
-                // If changes, validate them
-                if ( DoEditorValidate() )
-                {
-                    if ( editor->GetValueFromControl( pendingValue,
-                                                      selected,
-                                                      wnd ) )
-                        valueIsPending = true;
-
-                    // Mark value always as pending if validation is currently
-                    // failing and value was not unspecified
-                    if ( !valueIsPending &&
-                         !pendingValue.IsNull() &&
-                         m_validationInfo.m_isFailing )
-                         valueIsPending = true;
-                }
-                else
-                {
-                    validationFailure = true;
-                }
-            }
-        }
-
-        // Then the property's custom handler (must be always called, unless
-        // validation failed).
-        if ( !validationFailure )
-            buttonWasHandled = selected->OnEvent( this, editorWnd, event );
-    }
-
-    // SetValueInEvent(), as called in one of the functions referred above
-    // overrides editor's value.
-    if ( m_iFlags & wxPG_FL_VALUE_CHANGE_IN_EVENT )
-    {
-        valueIsPending = true;
-        pendingValue = m_changeInEventValue;
-        selFlags |= wxPG_SEL_DIALOGVAL;
-    }
-
-    if ( !validationFailure && valueIsPending )
-        if ( !PerformValidation(selected, pendingValue) )
-            validationFailure = true;
-
-    if ( validationFailure)
-    {
-        OnValidationFailure(selected, pendingValue);
-    }
-    else if ( valueIsPending )
-    {
-        selFlags |= ( !wasUnspecified && selected->IsValueUnspecified() && usesAutoUnspecified ) ? wxPG_SEL_SETUNSPEC : 0;
-
-        DoPropertyChanged(selected, selFlags);
-        EditorsValueWasNotModified();
-
-        // Regardless of editor type, unfocus editor on
-        // text-editing related enter press.
-        if ( event.GetEventType() == wxEVT_TEXT_ENTER )
-        {
-            SetFocusOnCanvas();
-        }
-    }
-    else
-    {
-        // No value after all
-
-        // Regardless of editor type, unfocus editor on
-        // text-editing related enter press.
-        if ( event.GetEventType() == wxEVT_TEXT_ENTER )
-        {
-            SetFocusOnCanvas();
-        }
-
-        // Let unhandled button click events go to the parent
-        if ( !buttonWasHandled && event.GetEventType() == wxEVT_BUTTON )
-        {
-            result = true;
-            wxCommandEvent evt(wxEVT_BUTTON,GetId());
-            GetEventHandler()->AddPendingEvent(evt);
-        }
-    }
-
-    ClearInternalFlag(wxPG_FL_IN_HANDLECUSTOMEDITOREVENT);
-
-    return result;
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGrid editor control helper methods
-// -----------------------------------------------------------------------
-
-wxRect wxPropertyGrid::GetEditorWidgetRect( wxPGProperty* p, int column ) const
-{
-    int itemy = p->GetY2(m_lineHeight);
-    int splitterX = m_pState->DoGetSplitterPosition(column-1);
-    int colEnd = splitterX + m_pState->m_colWidths[column];
-    int imageOffset = 0;
-
-    int vx, vy;  // Top left corner of client
-    GetViewStart(&vx, &vy);
-    vy *= wxPG_PIXELS_PER_UNIT;
-
-    if ( column == 1 )
-    {
-        // TODO: If custom image detection changes from current, change this.
-        if ( m_iFlags & wxPG_FL_CUR_USES_CUSTOM_IMAGE )
-        {
-            //m_iFlags |= wxPG_FL_CUR_USES_CUSTOM_IMAGE;
-            int iw = p->OnMeasureImage().x;
-            if ( iw < 1 )
-                iw = wxPG_CUSTOM_IMAGE_WIDTH;
-            imageOffset = p->GetImageOffset(iw);
-        }
-    }
-    else if ( column == 0 )
-    {
-        splitterX += (p->m_depth - 1) * m_subgroup_extramargin;
-    }
-
-    return wxRect
-      (
-        splitterX+imageOffset+wxPG_XBEFOREWIDGET+wxPG_CONTROL_MARGIN+1,
-        itemy-vy,
-        colEnd-splitterX-wxPG_XBEFOREWIDGET-wxPG_CONTROL_MARGIN-imageOffset-1,
-        m_lineHeight-1
-      );
-}
-
-// -----------------------------------------------------------------------
-
-wxRect wxPropertyGrid::GetImageRect( wxPGProperty* p, int item ) const
-{
-    wxSize sz = GetImageSize(p, item);
-    return wxRect(wxPG_CONTROL_MARGIN + wxCC_CUSTOM_IMAGE_MARGIN1,
-                  wxPG_CUSTOM_IMAGE_SPACINGY,
-                  sz.x,
-                  sz.y);
-}
-
-// return size of custom paint image
-wxSize wxPropertyGrid::GetImageSize( wxPGProperty* p, int item ) const
-{
-    // If called with NULL property, then return default image
-    // size for properties that use image.
-    if ( !p )
-        return wxSize(wxPG_CUSTOM_IMAGE_WIDTH,wxPG_STD_CUST_IMAGE_HEIGHT(m_lineHeight));
-
-    wxSize cis = p->OnMeasureImage(item);
-
-    int choiceCount = p->m_choices.GetCount();
-    int comVals = p->GetDisplayedCommonValueCount();
-    if ( item >= choiceCount && comVals > 0 )
-    {
-        unsigned int cvi = item-choiceCount;
-        cis = GetCommonValue(cvi)->GetRenderer()->GetImageSize(NULL, 1, cvi);
-    }
-    else if ( item >= 0 && choiceCount == 0 )
-        return wxSize(0, 0);
-
-    if ( cis.x < 0 )
-    {
-        if ( cis.x <= -1 )
-            cis.x = wxPG_CUSTOM_IMAGE_WIDTH;
-    }
-    if ( cis.y <= 0 )
-    {
-        if ( cis.y >= -1 )
-            cis.y = wxPG_STD_CUST_IMAGE_HEIGHT(m_lineHeight);
-        else
-            cis.y = -cis.y;
-    }
-    return cis;
-}
-
-// -----------------------------------------------------------------------
-
-// takes scrolling into account
-void wxPropertyGrid::ImprovedClientToScreen( int* px, int* py )
-{
-    int vx, vy;
-    GetViewStart(&vx,&vy);
-    vy*=wxPG_PIXELS_PER_UNIT;
-    vx*=wxPG_PIXELS_PER_UNIT;
-    *px -= vx;
-    *py -= vy;
-    ClientToScreen( px, py );
-}
-
-// -----------------------------------------------------------------------
-
-wxPropertyGridHitTestResult wxPropertyGrid::HitTest( const wxPoint& pt ) const
-{
-    wxPoint pt2;
-    GetViewStart(&pt2.x,&pt2.y);
-    pt2.x *= wxPG_PIXELS_PER_UNIT;
-    pt2.y *= wxPG_PIXELS_PER_UNIT;
-    pt2.x += pt.x;
-    pt2.y += pt.y;
-
-    return m_pState->HitTest(pt2);
-}
-
-// -----------------------------------------------------------------------
-
-// custom set cursor
-void wxPropertyGrid::CustomSetCursor( int type, bool override )
-{
-    if ( type == m_curcursor && !override ) return;
-
-    wxCursor* cursor = &wxPG_DEFAULT_CURSOR;
-
-    if ( type == wxCURSOR_SIZEWE )
-        cursor = m_cursorSizeWE;
-
-    SetCursor( *cursor );
-
-    m_curcursor = type;
-}
-
-// -----------------------------------------------------------------------
-
-wxString
-wxPropertyGrid::GetUnspecifiedValueText( int argFlags ) const
-{
-    const wxPGCell& ua = GetUnspecifiedValueAppearance();
-
-    if ( ua.HasText() &&
-         !(argFlags & wxPG_FULL_VALUE) &&
-         !(argFlags & wxPG_EDITABLE_VALUE) )
-        return ua.GetText();
-
-    return wxEmptyString;
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGrid property selection, editor creation
-// -----------------------------------------------------------------------
-
-//
-// This class forwards events from property editor controls to wxPropertyGrid.
-class wxPropertyGridEditorEventForwarder : public wxEvtHandler
-{
-public:
-    wxPropertyGridEditorEventForwarder( wxPropertyGrid* propGrid )
-        : wxEvtHandler(), m_propGrid(propGrid)
-    {
-    }
-
-    virtual ~wxPropertyGridEditorEventForwarder()
-    {
-    }
-
-private:
-    bool ProcessEvent( wxEvent& event )
-    {
-        // Always skip
-        event.Skip();
-
-        m_propGrid->HandleCustomEditorEvent(event);
-
-        //
-        // NB: We should return true if the event was recognized as
-        //     a dedicated wxPropertyGrid event, and as such was
-        //     either properly handled or ignored.
-        //
-        if ( m_propGrid->IsMainButtonEvent(event) )
-            return true;
-
-        //
-        // NB: On wxMSW, a wxTextCtrl with wxTE_PROCESS_ENTER
-        //     may beep annoyingly if that event is skipped
-        //     and passed to parent event handler.
-        if ( event.GetEventType() == wxEVT_TEXT_ENTER )
-            return true;
-
-        return wxEvtHandler::ProcessEvent(event);
-    }
-
-    wxPropertyGrid*         m_propGrid;
-};
-
-// Setups event handling for child control
-void wxPropertyGrid::SetupChildEventHandling( wxWindow* argWnd )
-{
-    wxWindowID id = argWnd->GetId();
-
-    if ( argWnd == m_wndEditor )
-    {
-        argWnd->Connect(id, wxEVT_MOTION,
-            wxMouseEventHandler(wxPropertyGrid::OnMouseMoveChild),
-            NULL, this);
-        argWnd->Connect(id, wxEVT_LEFT_UP,
-            wxMouseEventHandler(wxPropertyGrid::OnMouseUpChild),
-            NULL, this);
-        argWnd->Connect(id, wxEVT_LEFT_DOWN,
-            wxMouseEventHandler(wxPropertyGrid::OnMouseClickChild),
-            NULL, this);
-        argWnd->Connect(id, wxEVT_RIGHT_UP,
-            wxMouseEventHandler(wxPropertyGrid::OnMouseRightClickChild),
-            NULL, this);
-        argWnd->Connect(id, wxEVT_ENTER_WINDOW,
-            wxMouseEventHandler(wxPropertyGrid::OnMouseEntry),
-            NULL, this);
-        argWnd->Connect(id, wxEVT_LEAVE_WINDOW,
-            wxMouseEventHandler(wxPropertyGrid::OnMouseEntry),
-            NULL, this);
-    }
-
-    wxPropertyGridEditorEventForwarder* forwarder;
-    forwarder = new wxPropertyGridEditorEventForwarder(this);
-    argWnd->PushEventHandler(forwarder);
-
-    argWnd->Connect(id, wxEVT_KEY_DOWN,
-        wxCharEventHandler(wxPropertyGrid::OnChildKeyDown),
-        NULL, this);
-}
-
-void wxPropertyGrid::DestroyEditorWnd( wxWindow* wnd )
-{
-    if ( !wnd )
-        return;
-
-    wnd->Hide();
-
-    // Do not free editors immediately (for sake of processing events)
-    wxPendingDelete.Append(wnd);
-}
-
-void wxPropertyGrid::FreeEditors()
-{
-    //
-    // Return focus back to canvas from children (this is required at least for
-    // GTK+, which, unlike Windows, clears focus when control is destroyed
-    // instead of moving it to closest parent).
-    SetFocusOnCanvas();
-
-    // Do not free editors immediately if processing events
-    if ( m_wndEditor2 )
-    {
-        wxEvtHandler* handler = m_wndEditor2->PopEventHandler(false);
-        m_wndEditor2->Hide();
-        wxPendingDelete.Append( handler );
-        DestroyEditorWnd(m_wndEditor2);
-        m_wndEditor2 = NULL;
-    }
-
-    if ( m_wndEditor )
-    {
-        wxEvtHandler* handler = m_wndEditor->PopEventHandler(false);
-        m_wndEditor->Hide();
-        wxPendingDelete.Append( handler );
-        DestroyEditorWnd(m_wndEditor);
-        m_wndEditor = NULL;
-    }
-}
-
-// Call with NULL to de-select property
-bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
-{
-    /*
-    if (p)
-    {
-        wxLogDebug(wxT("SelectProperty( %s (%s[%i]) )"),p->m_label.c_str(),
-            p->m_parent->m_label.c_str(),p->GetIndexInParent());
-    }
-    else
-    {
-        wxLogDebug(wxT("SelectProperty( NULL, -1 )"));
-    }
-    */
-
-    if ( m_inDoSelectProperty )
-        return true;
-
-    m_inDoSelectProperty = true;
-    wxON_BLOCK_EXIT_SET(m_inDoSelectProperty, false);
-
-    if ( !m_pState )
-        return false;
-
-    wxArrayPGProperty prevSelection = m_pState->m_selection;
-    wxPGProperty* prevFirstSel;
-
-    if ( prevSelection.size() > 0 )
-        prevFirstSel = prevSelection[0];
-    else
-        prevFirstSel = NULL;
-
-    if ( prevFirstSel && prevFirstSel->HasFlag(wxPG_PROP_BEING_DELETED) )
-        prevFirstSel = NULL;
-
-    // Always send event, as this is indirect call
-    DoEndLabelEdit(true, wxPG_SEL_NOVALIDATE);
-
-/*
-    if ( prevFirstSel )
-        wxPrintf( "Selected %s\n", prevFirstSel->GetClassInfo()->GetClassName() );
-    else
-        wxPrintf( "None selected\n" );
-
-    if (p)
-        wxPrintf( "P =  %s\n", p->GetClassInfo()->GetClassName() );
-    else
-        wxPrintf( "P = NULL\n" );
-*/
-
-    wxWindow* primaryCtrl = NULL;
-
-    // If we are frozen, then just set the values.
-    if ( m_frozen )
-    {
-        m_iFlags &= ~(wxPG_FL_ABNORMAL_EDITOR);
-        m_editorFocused = 0;
-        m_pState->DoSetSelection(p);
-
-        // If frozen, always free controls. But don't worry, as Thaw will
-        // recall SelectProperty to recreate them.
-        FreeEditors();
-
-        // Prevent any further selection measures in this call
-        p = NULL;
-    }
-    else
-    {
-        // Is it the same?
-        if ( prevFirstSel == p &&
-             prevSelection.size() <= 1 &&
-             !(flags & wxPG_SEL_FORCE) )
-        {
-            // Only set focus if not deselecting
-            if ( p )
-            {
-                if ( flags & wxPG_SEL_FOCUS )
-                {
-                    if ( m_wndEditor )
-                    {
-                        m_wndEditor->SetFocus();
-                        m_editorFocused = 1;
-                    }
-                }
-                else
-                {
-                    SetFocusOnCanvas();
-                }
-            }
-
-            return true;
-        }
-
-        //
-        // First, deactivate previous
-        if ( prevFirstSel )
-        {
-            // Must double-check if this is an selected in case of forceswitch
-            if ( p != prevFirstSel )
-            {
-                if ( !CommitChangesFromEditor(flags) )
-                {
-                    // Validation has failed, so we can't exit the previous editor
-                    //::wxMessageBox(_("Please correct the value or press ESC to cancel the edit."),
-                    //               _("Invalid Value"),wxOK|wxICON_ERROR);
-                    return false;
-                }
-            }
-
-            // This should be called after CommitChangesFromEditor(), so that
-            // OnValidationFailure() still has information on property's
-            // validation state.
-            OnValidationFailureReset(prevFirstSel);
-
-            FreeEditors();
-
-            m_iFlags &= ~(wxPG_FL_ABNORMAL_EDITOR);
-            EditorsValueWasNotModified();
-        }
-
-        SetInternalFlag(wxPG_FL_IN_SELECT_PROPERTY);
-
-        m_pState->DoSetSelection(p);
-
-        // Redraw unselected
-        for ( unsigned int i=0; iGetY2(m_lineHeight);
-
-            int splitterX = GetSplitterPosition();
-            m_editorFocused = 0;
-            m_iFlags |= wxPG_FL_PRIMARY_FILLS_ENTIRE;
-
-            wxASSERT( m_wndEditor == NULL );
-
-            //
-            // Only create editor for non-disabled non-caption
-            if ( !p->IsCategory() && !(p->m_flags & wxPG_PROP_DISABLED) )
-            {
-            // do this for non-caption items
-
-                m_selColumn = 1;
-
-                // Do we need to paint the custom image, if any?
-                m_iFlags &= ~(wxPG_FL_CUR_USES_CUSTOM_IMAGE);
-                if ( (p->m_flags & wxPG_PROP_CUSTOMIMAGE) &&
-                     !p->GetEditorClass()->CanContainCustomImage()
-                   )
-                    m_iFlags |= wxPG_FL_CUR_USES_CUSTOM_IMAGE;
-
-                wxRect grect = GetEditorWidgetRect(p, m_selColumn);
-                wxPoint goodPos = grect.GetPosition();
-
-                // Editor appearance can now be considered clear
-                m_editorAppearance.SetEmptyData();
-
-                const wxPGEditor* editor = p->GetEditorClass();
-                wxCHECK_MSG(editor, false,
-                    wxT("NULL editor class not allowed"));
-
-                m_iFlags &= ~wxPG_FL_FIXED_WIDTH_EDITOR;
-
-                wxPGWindowList wndList =
-                    editor->CreateControls(this,
-                                           p,
-                                           goodPos,
-                                           grect.GetSize());
-
-                m_wndEditor = wndList.m_primary;
-                m_wndEditor2 = wndList.m_secondary;
-                primaryCtrl = GetEditorControl();
-
-                //
-                // Essentially, primaryCtrl == m_wndEditor
-                //
-
-                // NOTE: It is allowed for m_wndEditor to be NULL - in this
-                //       case value is drawn as normal, and m_wndEditor2 is
-                //       assumed to be a right-aligned button that triggers
-                //       a separate editorCtrl window.
-
-                if ( m_wndEditor )
-                {
-                    wxASSERT_MSG( m_wndEditor->GetParent() == GetPanel(),
-                                  "CreateControls must use result of "
-                                  "wxPropertyGrid::GetPanel() as parent "
-                                  "of controls." );
-
-                    // Set validator, if any
-                #if wxUSE_VALIDATORS
-                    wxValidator* validator = p->GetValidator();
-                    if ( validator )
-                        primaryCtrl->SetValidator(*validator);
-                #endif
-
-                    if ( m_wndEditor->GetSize().y > (m_lineHeight+6) )
-                        m_iFlags |= wxPG_FL_ABNORMAL_EDITOR;
-
-                    // If it has modified status, use bold font
-                    // (must be done before capturing m_ctrlXAdjust)
-                    if ( (p->m_flags & wxPG_PROP_MODIFIED) &&
-                         (m_windowStyle & wxPG_BOLD_MODIFIED) )
-                        SetCurControlBoldFont();
-
-                    // Store x relative to splitter (we'll need it).
-                    m_ctrlXAdjust = m_wndEditor->GetPosition().x - splitterX;
-
-                    // Check if background clear is not necessary
-                    wxPoint pos = m_wndEditor->GetPosition();
-                    if ( pos.x > (splitterX+1) || pos.y > propY )
-                    {
-                        m_iFlags &= ~(wxPG_FL_PRIMARY_FILLS_ENTIRE);
-                    }
-
-                    m_wndEditor->SetSizeHints(3, 3);
-
-                    SetupChildEventHandling(primaryCtrl);
-
-                    // Focus and select all (wxTextCtrl, wxComboBox etc)
-                    if ( flags & wxPG_SEL_FOCUS )
-                    {
-                        primaryCtrl->SetFocus();
-
-                        p->GetEditorClass()->OnFocus(p, primaryCtrl);
-                    }
-                    else
-                    {
-                        if ( p->IsValueUnspecified() )
-                            SetEditorAppearance(m_unspecifiedAppearance,
-                                                true);
-                    }
-                }
-
-                if ( m_wndEditor2 )
-                {
-                    wxASSERT_MSG( m_wndEditor2->GetParent() == GetPanel(),
-                                  "CreateControls must use result of "
-                                  "wxPropertyGrid::GetPanel() as parent "
-                                  "of controls." );
-
-                    // Get proper id for wndSecondary
-                    m_wndSecId = m_wndEditor2->GetId();
-                    wxWindowList children = m_wndEditor2->GetChildren();
-                    wxWindowList::iterator node = children.begin();
-                    if ( node != children.end() )
-                        m_wndSecId = ((wxWindow*)*node)->GetId();
-
-                    m_wndEditor2->SetSizeHints(3,3);
-
-                    m_wndEditor2->Show();
-
-                    SetupChildEventHandling(m_wndEditor2);
-
-                    // If no primary editor, focus to button to allow
-                    // it to interprete ENTER etc.
-                    // NOTE: Due to problems focusing away from it, this
-                    //       has been disabled.
-                    /*
-                    if ( (flags & wxPG_SEL_FOCUS) && !m_wndEditor )
-                        m_wndEditor2->SetFocus();
-                    */
-                }
-
-                if ( flags & wxPG_SEL_FOCUS )
-                    m_editorFocused = 1;
-
-            }
-            else
-            {
-                // Make sure focus is in grid canvas (important for wxGTK,
-                // at least)
-                SetFocusOnCanvas();
-            }
-
-            EditorsValueWasNotModified();
-
-            // If it's inside collapsed section, expand parent, scroll, etc.
-            // Also, if it was partially visible, scroll it into view.
-            if ( !(flags & wxPG_SEL_NONVISIBLE) )
-                EnsureVisible( p );
-
-            if ( m_wndEditor )
-            {
-                m_wndEditor->Show(true);
-            }
-
-            if ( !(flags & wxPG_SEL_NO_REFRESH) )
-                DrawItem(p);
-        }
-        else
-        {
-            // Make sure focus is in grid canvas
-            SetFocusOnCanvas();
-        }
-
-        ClearInternalFlag(wxPG_FL_IN_SELECT_PROPERTY);
-    }
-
-    const wxString* pHelpString = NULL;
-
-    if ( p )
-        pHelpString = &p->GetHelpString();
-
-    if ( !(GetExtraStyle() & wxPG_EX_HELP_AS_TOOLTIPS) )
-    {
-#if wxUSE_STATUSBAR
-
-        //
-        // Show help text in status bar.
-        //   (if found and grid not embedded in manager with help box and
-        //    style wxPG_EX_HELP_AS_TOOLTIPS is not used).
-        //
-        wxStatusBar* statusbar = GetStatusBar();
-        if ( statusbar )
-        {
-            if ( pHelpString && !pHelpString->empty() )
-            {
-                // Set help box text.
-                statusbar->SetStatusText( *pHelpString );
-                m_iFlags |= wxPG_FL_STRING_IN_STATUSBAR;
-            }
-            else if ( m_iFlags & wxPG_FL_STRING_IN_STATUSBAR )
-            {
-                // Clear help box - but only if it was written
-                // by us at previous time.
-                statusbar->SetStatusText( m_emptyString );
-                m_iFlags &= ~(wxPG_FL_STRING_IN_STATUSBAR);
-            }
-        }
-#endif
-    }
-    else
-    {
-#if wxPG_SUPPORT_TOOLTIPS
-        //
-        // Show help as a tool tip on the editor control.
-        //
-        if ( pHelpString && !pHelpString->empty() &&
-             primaryCtrl )
-        {
-            primaryCtrl->SetToolTip(*pHelpString);
-        }
-#endif
-    }
-
-    // call wx event handler (here so that it also occurs on deselection)
-    if ( !(flags & wxPG_SEL_DONT_SEND_EVENT) )
-        SendEvent( wxEVT_PG_SELECTED, p, NULL );
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::UnfocusEditor()
-{
-    wxPGProperty* selected = GetSelection();
-
-    if ( !selected || !m_wndEditor || m_frozen )
-        return true;
-
-    if ( !CommitChangesFromEditor(0) )
-        return false;
-
-    SetFocusOnCanvas();
-    DrawItem(selected);
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::RefreshEditor()
-{
-    wxPGProperty* p = GetSelection();
-    if ( !p )
-        return;
-
-    wxWindow* wnd = GetEditorControl();
-    if ( !wnd )
-        return;
-
-    // Set editor font boldness - must do this before
-    // calling UpdateControl().
-    if ( HasFlag(wxPG_BOLD_MODIFIED) )
-    {
-        if ( p->HasFlag(wxPG_PROP_MODIFIED) )
-            wnd->SetFont(GetCaptionFont());
-        else
-            wnd->SetFont(GetFont());
-    }
-
-    const wxPGEditor* editorClass = p->GetEditorClass();
-
-    editorClass->UpdateControl(p, wnd);
-
-    if ( p->IsValueUnspecified() )
-        SetEditorAppearance(m_unspecifiedAppearance, true);
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::SelectProperty( wxPGPropArg id, bool focus )
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-
-    int flags = wxPG_SEL_DONT_SEND_EVENT;
-    if ( focus )
-        flags |= wxPG_SEL_FOCUS;
-
-    return DoSelectProperty(p, flags);
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGrid expand/collapse state
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::DoCollapse( wxPGProperty* p, bool sendEvents )
-{
-    wxPGProperty* pwc = wxStaticCast(p, wxPGProperty);
-    wxPGProperty* selected = GetSelection();
-
-    // If active editor was inside collapsed section, then disable it
-    if ( selected && selected->IsSomeParent(p) )
-    {
-        DoClearSelection();
-    }
-
-    // Store dont-center-splitter flag 'cause we need to temporarily set it
-    bool prevDontCenterSplitter = m_pState->m_dontCenterSplitter;
-    m_pState->m_dontCenterSplitter = true;
-
-    bool res = m_pState->DoCollapse(pwc);
-
-    if ( res )
-    {
-        if ( sendEvents )
-            SendEvent( wxEVT_PG_ITEM_COLLAPSED, p );
-
-        RecalculateVirtualSize();
-        Refresh();
-    }
-
-    m_pState->m_dontCenterSplitter = prevDontCenterSplitter;
-
-    return res;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::DoExpand( wxPGProperty* p, bool sendEvents )
-{
-    wxCHECK_MSG( p, false, wxT("invalid property id") );
-
-    wxPGProperty* pwc = (wxPGProperty*)p;
-
-    // Store dont-center-splitter flag 'cause we need to temporarily set it
-    bool prevDontCenterSplitter = m_pState->m_dontCenterSplitter;
-    m_pState->m_dontCenterSplitter = true;
-
-    bool res = m_pState->DoExpand(pwc);
-
-    if ( res )
-    {
-        if ( sendEvents )
-            SendEvent( wxEVT_PG_ITEM_EXPANDED, p );
-
-        RecalculateVirtualSize();
-        Refresh();
-    }
-
-    m_pState->m_dontCenterSplitter = prevDontCenterSplitter;
-
-    return res;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::DoHideProperty( wxPGProperty* p, bool hide, int flags )
-{
-    if ( m_frozen )
-        return m_pState->DoHideProperty(p, hide, flags);
-
-    wxArrayPGProperty selection = m_pState->m_selection;  // Must use a copy
-    int selRemoveCount = 0;
-    for ( unsigned int i=0; iIsSomeParent(p) )
-        {
-            if ( !DoRemoveFromSelection(p, flags) )
-                return false;
-            selRemoveCount += 1;
-        }
-    }
-
-    m_pState->DoHideProperty(p, hide, flags);
-
-    RecalculateVirtualSize();
-    Refresh();
-
-    return true;
-}
-
-
-// -----------------------------------------------------------------------
-// wxPropertyGrid size related methods
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::RecalculateVirtualSize( int forceXPos )
-{
-    // Don't check for !HasInternalFlag(wxPG_FL_INITIALIZED) here. Otherwise
-    // virtual size calculation may go wrong.
-    if ( HasInternalFlag(wxPG_FL_RECALCULATING_VIRTUAL_SIZE) ||
-         m_frozen ||
-         !m_pState )
-        return;
-
-    //
-    // If virtual height was changed, then recalculate editor control position(s)
-    if ( m_pState->m_vhCalcPending )
-        CorrectEditorWidgetPosY();
-
-    m_pState->EnsureVirtualHeight();
-
-    wxASSERT_LEVEL_2_MSG(
-        m_pState->GetVirtualHeight() == m_pState->GetActualVirtualHeight(),
-        "VirtualHeight and ActualVirtualHeight should match"
-    );
-
-    m_iFlags |= wxPG_FL_RECALCULATING_VIRTUAL_SIZE;
-
-    int x = m_pState->m_width;
-    int y = m_pState->m_virtualHeight;
-
-    int width, height;
-    GetClientSize(&width,&height);
-
-    // Now adjust virtual size.
-    SetVirtualSize(x, y);
-
-    int xAmount = 0;
-    int xPos = 0;
-
-    //
-    // Adjust scrollbars
-    if ( HasVirtualWidth() )
-    {
-        xAmount = x/wxPG_PIXELS_PER_UNIT;
-        xPos = GetScrollPos( wxHORIZONTAL );
-    }
-
-    if ( forceXPos != -1 )
-        xPos = forceXPos;
-    // xPos too high?
-    else if ( xPos > (xAmount-(width/wxPG_PIXELS_PER_UNIT)) )
-        xPos = 0;
-
-    int yAmount = y / wxPG_PIXELS_PER_UNIT;
-    int yPos = GetScrollPos( wxVERTICAL );
-
-    SetScrollbars( wxPG_PIXELS_PER_UNIT, wxPG_PIXELS_PER_UNIT,
-                   xAmount, yAmount, xPos, yPos, true );
-
-    // This may be needed in addition to calling SetScrollbars()
-    // when class inherits from wxScrollHelper instead of
-    // actual wxScrolled.
-    AdjustScrollbars();
-
-    // Must re-get size now
-    GetClientSize(&width,&height);
-
-    if ( !HasVirtualWidth() )
-    {
-        m_pState->SetVirtualWidth(width);
-    }
-
-    m_width = width;
-    m_height = height;
-
-    m_pState->CheckColumnWidths();
-
-    if ( GetSelection() )
-        CorrectEditorWidgetSizeX();
-
-    m_iFlags &= ~wxPG_FL_RECALCULATING_VIRTUAL_SIZE;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnResize( wxSizeEvent& event )
-{
-    if ( !(m_iFlags & wxPG_FL_INITIALIZED) )
-        return;
-
-    int width, height;
-    GetClientSize(&width, &height);
-
-    m_width = width;
-    m_height = height;
-
-    if ( !(GetExtraStyle() & wxPG_EX_NATIVE_DOUBLE_BUFFERING) )
-    {
-        int dblh = (m_lineHeight*2);
-        if ( !m_doubleBuffer )
-        {
-            // Create double buffer bitmap to draw on, if none
-            int w = (width>250)?width:250;
-            int h = height + dblh;
-            h = (h>400)?h:400;
-            m_doubleBuffer = new wxBitmap( w, h );
-        }
-        else
-        {
-            int w = m_doubleBuffer->GetWidth();
-            int h = m_doubleBuffer->GetHeight();
-
-            // Double buffer must be large enough
-            if ( w < width || h < (height+dblh) )
-            {
-                if ( w < width ) w = width;
-                if ( h < (height+dblh) ) h = height + dblh;
-                delete m_doubleBuffer;
-                m_doubleBuffer = new wxBitmap( w, h );
-            }
-        }
-    }
-
-    m_pState->OnClientWidthChange( width, event.GetSize().x - m_ncWidth, true );
-    m_ncWidth = event.GetSize().x;
-
-    if ( !m_frozen )
-    {
-        if ( m_pState->m_itemsAdded )
-            PrepareAfterItemsAdded();
-        else
-            // Without this, virtual size (atleast under wxGTK) will be skewed
-            RecalculateVirtualSize();
-
-        Refresh();
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::SetVirtualWidth( int width )
-{
-    if ( width == -1 )
-    {
-        // Disable virtual width
-        width = GetClientSize().x;
-        ClearInternalFlag(wxPG_FL_HAS_VIRTUAL_WIDTH);
-    }
-    else
-    {
-        // Enable virtual width
-        SetInternalFlag(wxPG_FL_HAS_VIRTUAL_WIDTH);
-    }
-    m_pState->SetVirtualWidth( width );
-}
-
-void wxPropertyGrid::SetFocusOnCanvas()
-{
-    // To prevent wxPropertyGrid from stealing focus from other controls,
-    // only move focus to the grid if it was already in one if its child
-    // controls.
-    wxWindow* focus = wxWindow::FindFocus();
-    if ( focus )
-    {
-        wxWindow* parent = focus->GetParent();
-        while ( parent )
-        {
-            if ( parent == this )
-            {
-                SetFocus();
-                break;
-            }
-            parent = parent->GetParent();
-        }
-    }
-
-    m_editorFocused = 0;
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGrid mouse event handling
-// -----------------------------------------------------------------------
-
-// selFlags uses same values DoSelectProperty's flags
-// Returns true if event was vetoed.
-bool wxPropertyGrid::SendEvent( int eventType, wxPGProperty* p,
-                                wxVariant* pValue,
-                                unsigned int selFlags,
-                                unsigned int column )
-{
-    // selFlags should have wxPG_SEL_NOVALIDATE if event is not
-    // vetoable.
-
-    // Send property grid event of specific type and with specific property
-    wxPropertyGridEvent evt( eventType, m_eventObject->GetId() );
-    evt.SetPropertyGrid(this);
-    evt.SetEventObject(m_eventObject);
-    evt.SetProperty(p);
-    evt.SetColumn(column);
-    if ( eventType == wxEVT_PG_CHANGING )
-    {
-        wxASSERT( pValue );
-        evt.SetCanVeto(true);
-        m_validationInfo.m_pValue = pValue;
-        evt.SetupValidationInfo();
-    }
-    else
-    {
-        if ( p )
-            evt.SetPropertyValue(p->GetValue());
-
-        if ( !(selFlags & wxPG_SEL_NOVALIDATE) )
-            evt.SetCanVeto(true);
-    }
-
-    wxPropertyGridEvent* prevProcessedEvent = m_processedEvent;
-    m_processedEvent = &evt;
-    m_eventObject->HandleWindowEvent(evt);
-    m_processedEvent = prevProcessedEvent;
-
-    return evt.WasVetoed();
-}
-
-// -----------------------------------------------------------------------
-
-// Return false if should be skipped
-bool wxPropertyGrid::HandleMouseClick( int x, unsigned int y, wxMouseEvent &event )
-{
-    bool res = true;
-
-    // Need to set focus?
-    if ( !(m_iFlags & wxPG_FL_FOCUSED) )
-    {
-        SetFocusOnCanvas();
-    }
-
-    wxPropertyGridPageState* state = m_pState;
-    int splitterHit;
-    int splitterHitOffset;
-    int columnHit = state->HitTestH( x, &splitterHit, &splitterHitOffset );
-
-    wxPGProperty* p = DoGetItemAtY(y);
-
-    if ( p )
-    {
-        int depth = (int)p->GetDepth() - 1;
-
-        int marginEnds = m_marginWidth + ( depth * m_subgroup_extramargin );
-
-        if ( x >= marginEnds )
-        {
-            // Outside margin.
-
-            if ( p->IsCategory() )
-            {
-                // This is category.
-                wxPropertyCategory* pwc = (wxPropertyCategory*)p;
-
-                int textX = m_marginWidth + ((unsigned int)((pwc->m_depth-1)*m_subgroup_extramargin));
-
-                // Expand, collapse, activate etc. if click on text or left of splitter.
-                if ( x >= textX
-                     &&
-                     ( x < (textX+pwc->GetTextExtent(this, m_captionFont)+(wxPG_CAPRECTXMARGIN*2)) ||
-                       columnHit == 0
-                     )
-                    )
-                {
-                    if ( !AddToSelectionFromInputEvent( p,
-                                                        columnHit,
-                                                        &event ) )
-                        return res;
-
-                    // On double-click, expand/collapse.
-                    if ( event.ButtonDClick() && !(m_windowStyle & wxPG_HIDE_MARGIN) )
-                    {
-                        if ( pwc->IsExpanded() ) DoCollapse( p, true );
-                        else DoExpand( p, true );
-                    }
-                }
-            }
-            else if ( splitterHit == -1 )
-            {
-            // Click on value.
-                unsigned int selFlag = 0;
-                if ( columnHit == 1 )
-                {
-                    m_iFlags |= wxPG_FL_ACTIVATION_BY_CLICK;
-                    selFlag = wxPG_SEL_FOCUS;
-                }
-                if ( !AddToSelectionFromInputEvent( p,
-                                                    columnHit,
-                                                    &event,
-                                                    selFlag ) )
-                    return res;
-
-                m_iFlags &= ~(wxPG_FL_ACTIVATION_BY_CLICK);
-
-                if ( p->GetChildCount() && !p->IsCategory() )
-                    // On double-click, expand/collapse.
-                    if ( event.ButtonDClick() && !(m_windowStyle & wxPG_HIDE_MARGIN) )
-                    {
-                        wxPGProperty* pwc = (wxPGProperty*)p;
-                        if ( pwc->IsExpanded() ) DoCollapse( p, true );
-                        else DoExpand( p, true );
-                    }
-
-                // Do not Skip() the event after selection has been made.
-                // Otherwise default event handling behaviour kicks in
-                // and may revert focus back to the main canvas.
-                res = true;
-            }
-            else
-            {
-            // click on splitter
-                if ( !(m_windowStyle & wxPG_STATIC_SPLITTER) )
-                {
-                    if ( event.GetEventType() == wxEVT_LEFT_DCLICK )
-                    {
-                        // Double-clicking the splitter causes auto-centering
-                        if ( m_pState->GetColumnCount() <= 2 )
-                        {
-                            ResetColumnSizes( true );
-
-                            SendEvent(wxEVT_PG_COL_DRAGGING,
-                                      m_propHover,
-                                      NULL,
-                                      wxPG_SEL_NOVALIDATE,
-                                      (unsigned int)m_draggedSplitter);
-                        }
-                    }
-                    else if ( m_dragStatus == 0 )
-                    {
-                        //
-                        // Begin draggin the splitter
-                        //
-
-                        // send event
-                        DoEndLabelEdit(true, wxPG_SEL_NOVALIDATE);
-
-                        // Allow application to veto dragging
-                        if ( !SendEvent(wxEVT_PG_COL_BEGIN_DRAG,
-                                        p, NULL, 0,
-                                        (unsigned int)splitterHit) )
-                        {
-                            if ( m_wndEditor )
-                            {
-                                // Changes must be committed here or the
-                                // value won't be drawn correctly
-                                if ( !CommitChangesFromEditor() )
-                                    return res;
-
-                                m_wndEditor->Show ( false );
-                            }
-
-                            if ( !(m_iFlags & wxPG_FL_MOUSE_CAPTURED) )
-                            {
-                                CaptureMouse();
-                                m_iFlags |= wxPG_FL_MOUSE_CAPTURED;
-                            }
-
-                            m_dragStatus = 1;
-                            m_draggedSplitter = splitterHit;
-                            m_dragOffset = splitterHitOffset;
-
-                        #if wxPG_REFRESH_CONTROLS
-                            // Fixes button disappearance bug
-                            if ( m_wndEditor2 )
-                                m_wndEditor2->Show ( false );
-                        #endif
-
-                            m_startingSplitterX = x - splitterHitOffset;
-                        }
-                    }
-                }
-            }
-        }
-        else
-        {
-        // Click on margin.
-            if ( p->GetChildCount() )
-            {
-                int nx = x + m_marginWidth - marginEnds; // Normalize x.
-
-                // Fine tune cell button x
-                if ( !p->IsCategory() )
-                    nx -= IN_CELL_EXPANDER_BUTTON_X_ADJUST;
-
-                if ( (nx >= m_gutterWidth && nx < (m_gutterWidth+m_iconWidth)) )
-                {
-                    int y2 = y % m_lineHeight;
-                    if ( (y2 >= m_buttonSpacingY && y2 < (m_buttonSpacingY+m_iconHeight)) )
-                    {
-                        // On click on expander button, expand/collapse
-                        if ( ((wxPGProperty*)p)->IsExpanded() )
-                            DoCollapse( p, true );
-                        else
-                            DoExpand( p, true );
-                    }
-                }
-            }
-        }
-    }
-    return res;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::HandleMouseRightClick( int WXUNUSED(x),
-                                            unsigned int WXUNUSED(y),
-                                            wxMouseEvent& event )
-{
-    if ( m_propHover )
-    {
-        // Select property here as well
-        wxPGProperty* p = m_propHover;
-        AddToSelectionFromInputEvent(p, m_colHover, &event);
-
-        // Send right click event.
-        SendEvent( wxEVT_PG_RIGHT_CLICK, p );
-
-        return true;
-    }
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::HandleMouseDoubleClick( int WXUNUSED(x),
-                                             unsigned int WXUNUSED(y),
-                                             wxMouseEvent& event )
-{
-    if ( m_propHover )
-    {
-        // Select property here as well
-        wxPGProperty* p = m_propHover;
-
-        AddToSelectionFromInputEvent(p, m_colHover, &event);
-
-        // Send double-click event.
-        SendEvent( wxEVT_PG_DOUBLE_CLICK, m_propHover );
-
-        return true;
-    }
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-// Return false if should be skipped
-bool wxPropertyGrid::HandleMouseMove( int x, unsigned int y,
-                                      wxMouseEvent &event )
-{
-    // Safety check (needed because mouse capturing may
-    // otherwise freeze the control)
-    if ( m_dragStatus > 0 && !event.Dragging() )
-    {
-        HandleMouseUp(x, y, event);
-    }
-
-    wxPropertyGridPageState* state = m_pState;
-    int splitterHit;
-    int splitterHitOffset;
-    int columnHit = state->HitTestH( x, &splitterHit, &splitterHitOffset );
-    int splitterX = x - splitterHitOffset;
-
-    m_colHover = columnHit;
-
-    if ( m_dragStatus > 0 )
-    {
-        if ( x > (m_marginWidth + wxPG_DRAG_MARGIN) &&
-             x < (m_pState->m_width - wxPG_DRAG_MARGIN) )
-        {
-
-            int newSplitterX = x - m_dragOffset;
-
-            // Splitter redraw required?
-            if ( newSplitterX != splitterX )
-            {
-                // Move everything
-                DoSetSplitterPosition(newSplitterX,
-                                      m_draggedSplitter,
-                                      wxPG_SPLITTER_REFRESH |
-                                      wxPG_SPLITTER_FROM_EVENT);
-
-                SendEvent(wxEVT_PG_COL_DRAGGING,
-                          m_propHover,
-                          NULL,
-                          wxPG_SEL_NOVALIDATE,
-                          (unsigned int)m_draggedSplitter);
-            }
-
-            m_dragStatus = 2;
-        }
-
-        return false;
-    }
-    else
-    {
-
-        int ih = m_lineHeight;
-        int sy = y;
-
-    #if wxPG_SUPPORT_TOOLTIPS
-        wxPGProperty* prevHover = m_propHover;
-        unsigned char prevSide = m_mouseSide;
-    #endif
-        int curPropHoverY = y - (y % ih);
-
-        // On which item it hovers
-        if ( !m_propHover
-             ||
-             ( sy < m_propHoverY || sy >= (m_propHoverY+ih) )
-           )
-        {
-            // Mouse moves on another property
-
-            m_propHover = DoGetItemAtY(y);
-            m_propHoverY = curPropHoverY;
-
-            // Send hover event
-            SendEvent( wxEVT_PG_HIGHLIGHTED, m_propHover );
-        }
-
-    #if wxPG_SUPPORT_TOOLTIPS
-        // Store which side we are on
-        m_mouseSide = 0;
-        if ( columnHit == 1 )
-            m_mouseSide = 2;
-        else if ( columnHit == 0 )
-            m_mouseSide = 1;
-
-        //
-        // If tooltips are enabled, show label or value as a tip
-        // in case it doesn't otherwise show in full length.
-        //
-        if ( m_windowStyle & wxPG_TOOLTIPS )
-        {
-            if ( m_propHover != prevHover || prevSide != m_mouseSide )
-            {
-                if ( m_propHover && !m_propHover->IsCategory() )
-                {
-
-                    if ( GetExtraStyle() & wxPG_EX_HELP_AS_TOOLTIPS )
-                    {
-                        // Show help string as a tooltip
-                        wxString tipString = m_propHover->GetHelpString();
-
-                        SetToolTip(tipString);
-                    }
-                    else
-                    {
-                        // Show cropped value string as a tooltip
-                        wxString tipString;
-                        int space = 0;
-
-                        if ( m_mouseSide == 1 )
-                        {
-                            tipString = m_propHover->m_label;
-                            space = splitterX-m_marginWidth-3;
-                        }
-                        else if ( m_mouseSide == 2 )
-                        {
-                            tipString = m_propHover->GetDisplayedString();
-
-                            space = m_width - splitterX;
-                            if ( m_propHover->m_flags & wxPG_PROP_CUSTOMIMAGE )
-                                space -= wxPG_CUSTOM_IMAGE_WIDTH +
-                                         wxCC_CUSTOM_IMAGE_MARGIN1 +
-                                         wxCC_CUSTOM_IMAGE_MARGIN2;
-                        }
-
-                        if ( space )
-                        {
-                            int tw, th;
-                            GetTextExtent( tipString, &tw, &th, 0, 0 );
-                            if ( tw > space )
-                                SetToolTip( tipString );
-                        }
-                        else
-                        {
-                            SetToolTip( m_emptyString );
-                        }
-
-                    }
-                }
-                else
-                {
-                    SetToolTip( m_emptyString );
-                }
-            }
-        }
-    #endif
-
-        if ( splitterHit == -1 ||
-             !m_propHover ||
-             HasFlag(wxPG_STATIC_SPLITTER) )
-        {
-            // hovering on something else
-            if ( m_curcursor != wxCURSOR_ARROW )
-                CustomSetCursor( wxCURSOR_ARROW );
-        }
-        else
-        {
-            // Do not allow splitter cursor on caption items.
-            // (also not if we were dragging and its started
-            // outside the splitter region)
-
-            if ( !m_propHover->IsCategory() &&
-                 !event.Dragging() )
-            {
-
-                // hovering on splitter
-
-                // NB: Condition disabled since MouseLeave event (from the
-                //     editor control) cannot be reliably detected.
-                //if ( m_curcursor != wxCURSOR_SIZEWE )
-                CustomSetCursor( wxCURSOR_SIZEWE, true );
-
-                return false;
-            }
-            else
-            {
-                // hovering on something else
-                if ( m_curcursor != wxCURSOR_ARROW )
-                    CustomSetCursor( wxCURSOR_ARROW );
-            }
-        }
-
-        //
-        // Multi select by dragging
-        //
-        if ( (GetExtraStyle() & wxPG_EX_MULTIPLE_SELECTION) &&
-             event.LeftIsDown() &&
-             m_propHover &&
-             GetSelection() &&
-             columnHit != 1 &&
-             !state->DoIsPropertySelected(m_propHover) )
-        {
-            // Additional requirement is that the hovered property
-            // is adjacent to edges of selection.
-            const wxArrayPGProperty& selection = GetSelectedProperties();
-
-            // Since categories cannot be selected along with 'other'
-            // properties, exclude them from iterator flags.
-            int iterFlags = wxPG_ITERATE_VISIBLE & (~wxPG_PROP_CATEGORY);
-
-            for ( int i=(selection.size()-1); i>=0; i-- )
-            {
-                // TODO: This could be optimized by keeping track of
-                //       which properties are at the edges of selection.
-                wxPGProperty* selProp = selection[i];
-                if ( state->ArePropertiesAdjacent(m_propHover, selProp,
-                                                  iterFlags) )
-                {
-                    DoAddToSelection(m_propHover);
-                    break;
-                }
-            }
-        }
-    }
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-// Also handles Leaving event
-bool wxPropertyGrid::HandleMouseUp( int x, unsigned int WXUNUSED(y),
-                                    wxMouseEvent &WXUNUSED(event) )
-{
-    wxPropertyGridPageState* state = m_pState;
-    bool res = false;
-
-    int splitterHit;
-    int splitterHitOffset;
-    state->HitTestH( x, &splitterHit, &splitterHitOffset );
-
-    // No event type check - basically calling this method should
-    // just stop dragging.
-    // Left up after dragged?
-    if ( m_dragStatus >= 1 )
-    {
-    //
-    // End Splitter Dragging
-    //
-        // DO NOT ENABLE FOLLOWING LINE!
-        // (it is only here as a reminder to not to do it)
-        //splitterX = x;
-
-        SendEvent(wxEVT_PG_COL_END_DRAG,
-                  m_propHover,
-                  NULL,
-                  wxPG_SEL_NOVALIDATE,
-                  (unsigned int)m_draggedSplitter);
-
-        // Disable splitter auto-centering (but only if moved any -
-        // otherwise we end up disabling auto-center even after a
-        // recentering double-click).
-        int posDiff = abs(m_startingSplitterX -
-                          GetSplitterPosition(m_draggedSplitter));
-
-        if ( posDiff > 1 )
-            state->m_dontCenterSplitter = true;
-
-        // This is necessary to return cursor
-        if ( m_iFlags & wxPG_FL_MOUSE_CAPTURED )
-        {
-            ReleaseMouse();
-            m_iFlags &= ~(wxPG_FL_MOUSE_CAPTURED);
-        }
-
-        // Set back the default cursor, if necessary
-        if ( splitterHit == -1 ||
-             !m_propHover )
-        {
-            CustomSetCursor( wxCURSOR_ARROW );
-        }
-
-        m_dragStatus = 0;
-
-        // Control background needs to be cleared
-        wxPGProperty* selected = GetSelection();
-        if ( !(m_iFlags & wxPG_FL_PRIMARY_FILLS_ENTIRE) && selected )
-            DrawItem( selected );
-
-        if ( m_wndEditor )
-        {
-            m_wndEditor->Show ( true );
-        }
-
-    #if wxPG_REFRESH_CONTROLS
-        // Fixes button disappearance bug
-        if ( m_wndEditor2 )
-            m_wndEditor2->Show ( true );
-    #endif
-
-        // This clears the focus.
-        m_editorFocused = 0;
-
-    }
-    return res;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::OnMouseCommon( wxMouseEvent& event, int* px, int* py )
-{
-    int splitterX = GetSplitterPosition();
-
-    int ux, uy;
-    CalcUnscrolledPosition( event.m_x, event.m_y, &ux, &uy );
-
-    wxWindow* wnd = GetEditorControl();
-
-    // Hide popup on clicks
-    if ( event.GetEventType() != wxEVT_MOTION )
-        if ( wxDynamicCast(wnd, wxOwnerDrawnComboBox) )
-        {
-            ((wxOwnerDrawnComboBox*)wnd)->HidePopup();
-        }
-
-    wxRect r;
-    if ( wnd )
-        r = wnd->GetRect();
-    if ( wnd == NULL || m_dragStatus ||
-         (
-           ux <= (splitterX + wxPG_SPLITTERX_DETECTMARGIN2) ||
-           ux >= (r.x+r.width) ||
-           event.m_y < r.y ||
-           event.m_y >= (r.y+r.height)
-         )
-       )
-    {
-        *px = ux;
-        *py = uy;
-        return true;
-    }
-    else
-    {
-        if ( m_curcursor != wxCURSOR_ARROW ) CustomSetCursor ( wxCURSOR_ARROW );
-    }
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnMouseClick( wxMouseEvent &event )
-{
-    int x, y;
-    if ( OnMouseCommon( event, &x, &y ) )
-    {
-        if ( !HandleMouseClick(x, y, event) )
-            event.Skip();
-    }
-    else
-    {
-        event.Skip();
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnMouseRightClick( wxMouseEvent &event )
-{
-    int x, y;
-    CalcUnscrolledPosition( event.m_x, event.m_y, &x, &y );
-    HandleMouseRightClick(x,y,event);
-    event.Skip();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnMouseDoubleClick( wxMouseEvent &event )
-{
-    // Always run standard mouse-down handler as well
-    OnMouseClick(event);
-
-    int x, y;
-    CalcUnscrolledPosition( event.m_x, event.m_y, &x, &y );
-    HandleMouseDoubleClick(x,y,event);
-
-    // Do not Skip() event here - OnMouseClick() call above
-    // should have already taken care of it.
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnMouseMove( wxMouseEvent &event )
-{
-    int x, y;
-    if ( OnMouseCommon( event, &x, &y ) )
-    {
-        HandleMouseMove(x,y,event);
-    }
-    event.Skip();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnMouseUp( wxMouseEvent &event )
-{
-    int x, y;
-    if ( OnMouseCommon( event, &x, &y ) )
-    {
-        if ( !HandleMouseUp(x, y, event) )
-            event.Skip();
-    }
-    else
-    {
-        event.Skip();
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnMouseEntry( wxMouseEvent &event )
-{
-    // This may get called from child control as well, so event's
-    // mouse position cannot be relied on.
-
-    if ( event.Entering() )
-    {
-        if ( !(m_iFlags & wxPG_FL_MOUSE_INSIDE) )
-        {
-            // TODO: Fix this (detect parent and only do
-            //   cursor trick if it is a manager).
-            wxASSERT( GetParent() );
-            GetParent()->SetCursor(wxNullCursor);
-
-            m_iFlags |= wxPG_FL_MOUSE_INSIDE;
-        }
-        else
-            GetParent()->SetCursor(wxNullCursor);
-    }
-    else if ( event.Leaving() )
-    {
-        // Without this, wxSpinCtrl editor will sometimes have wrong cursor
-        SetCursor( wxNullCursor );
-
-        // Get real cursor position
-        wxPoint pt = ScreenToClient(::wxGetMousePosition());
-
-        if ( ( pt.x <= 0 || pt.y <= 0 || pt.x >= m_width || pt.y >= m_height ) )
-        {
-            {
-                if ( (m_iFlags & wxPG_FL_MOUSE_INSIDE) )
-                {
-                    m_iFlags &= ~(wxPG_FL_MOUSE_INSIDE);
-                }
-
-                if ( m_dragStatus )
-                    wxPropertyGrid::HandleMouseUp ( -1, 10000, event );
-            }
-        }
-    }
-
-    event.Skip();
-}
-
-// -----------------------------------------------------------------------
-
-// Common code used by various OnMouseXXXChild methods.
-bool wxPropertyGrid::OnMouseChildCommon( wxMouseEvent &event, int* px, int *py )
-{
-    wxWindow* topCtrlWnd = (wxWindow*)event.GetEventObject();
-    wxASSERT( topCtrlWnd );
-    int x, y;
-    event.GetPosition(&x,&y);
-
-    int splitterX = GetSplitterPosition();
-
-    wxRect r = topCtrlWnd->GetRect();
-    if ( !m_dragStatus &&
-         x > (splitterX-r.x+wxPG_SPLITTERX_DETECTMARGIN2) &&
-         y >= 0 && y < r.height \
-       )
-    {
-        if ( m_curcursor != wxCURSOR_ARROW ) CustomSetCursor ( wxCURSOR_ARROW );
-        event.Skip();
-    }
-    else
-    {
-        CalcUnscrolledPosition( event.m_x + r.x, event.m_y + r.y, \
-            px, py );
-        return true;
-    }
-    return false;
-}
-
-void wxPropertyGrid::OnMouseClickChild( wxMouseEvent &event )
-{
-    int x,y;
-    if ( OnMouseChildCommon(event,&x,&y) )
-    {
-        bool res = HandleMouseClick(x,y,event);
-        if ( !res ) event.Skip();
-    }
-}
-
-void wxPropertyGrid::OnMouseRightClickChild( wxMouseEvent &event )
-{
-    int x,y;
-    wxASSERT( m_wndEditor );
-    // These coords may not be exact (about +-2),
-    // but that should not matter (right click is about item, not position).
-    wxPoint pt = m_wndEditor->GetPosition();
-    CalcUnscrolledPosition( event.m_x + pt.x, event.m_y + pt.y, &x, &y );
-
-    // FIXME: Used to set m_propHover to selection here. Was it really
-    //        necessary?
-
-    bool res = HandleMouseRightClick(x,y,event);
-    if ( !res ) event.Skip();
-}
-
-void wxPropertyGrid::OnMouseMoveChild( wxMouseEvent &event )
-{
-    int x,y;
-    if ( OnMouseChildCommon(event,&x,&y) )
-    {
-        bool res = HandleMouseMove(x,y,event);
-        if ( !res ) event.Skip();
-    }
-}
-
-void wxPropertyGrid::OnMouseUpChild( wxMouseEvent &event )
-{
-    int x,y;
-    if ( OnMouseChildCommon(event,&x,&y) )
-    {
-        bool res = HandleMouseUp(x,y,event);
-        if ( !res ) event.Skip();
-    }
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGrid keyboard event handling
-// -----------------------------------------------------------------------
-
-int wxPropertyGrid::KeyEventToActions(wxKeyEvent &event, int* pSecond) const
-{
-    // Translates wxKeyEvent to wxPG_ACTION_XXX
-
-    int keycode = event.GetKeyCode();
-    int modifiers = event.GetModifiers();
-
-    wxASSERT( !(modifiers&~(0xFFFF)) );
-
-    int hashMapKey = (keycode & 0xFFFF) | ((modifiers & 0xFFFF) << 16);
-
-    wxPGHashMapI2I::const_iterator it = m_actionTriggers.find(hashMapKey);
-
-    if ( it == m_actionTriggers.end() )
-        return 0;
-
-    if ( pSecond )
-    {
-        int second = (it->second>>16) & 0xFFFF;
-        *pSecond = second;
-    }
-
-    return (it->second & 0xFFFF);
-}
-
-void wxPropertyGrid::AddActionTrigger( int action, int keycode, int modifiers )
-{
-    wxASSERT( !(modifiers&~(0xFFFF)) );
-
-    int hashMapKey = (keycode & 0xFFFF) | ((modifiers & 0xFFFF) << 16);
-
-    wxPGHashMapI2I::iterator it = m_actionTriggers.find(hashMapKey);
-
-    if ( it != m_actionTriggers.end() )
-    {
-        // This key combination is already used
-
-        // Can add secondary?
-        wxASSERT_MSG( !(it->second&~(0xFFFF)),
-                      wxT("You can only add up to two separate actions per key combination.") );
-
-        action = it->second | (action<<16);
-    }
-
-    m_actionTriggers[hashMapKey] = action;
-}
-
-void wxPropertyGrid::ClearActionTriggers( int action )
-{
-    wxPGHashMapI2I::iterator it;
-    bool didSomething;
-
-    do
-    {
-        didSomething = false;
-
-        for ( it = m_actionTriggers.begin();
-              it != m_actionTriggers.end();
-              it++ )
-        {
-            if ( it->second == action )
-            {
-                m_actionTriggers.erase(it);
-                didSomething = true;
-                break;
-            }
-        }
-    }
-    while ( didSomething );
-}
-
-void wxPropertyGrid::HandleKeyEvent( wxKeyEvent &event, bool fromChild )
-{
-    //
-    // Handles key event when editor control is not focused.
-    //
-
-    wxCHECK2(!m_frozen, return);
-
-    // Travelsal between items, collapsing/expanding, etc.
-    wxPGProperty* selected = GetSelection();
-    int keycode = event.GetKeyCode();
-    bool editorFocused = IsEditorFocused();
-
-    if ( keycode == WXK_TAB )
-    {
-#if defined(__WXGTK__)
-        wxWindow* mainControl;
-
-        if ( HasInternalFlag(wxPG_FL_IN_MANAGER) )
-            mainControl = GetParent();
-        else
-            mainControl = this;
-#endif
-
-        if ( !event.ShiftDown() )
-        {
-            if ( !editorFocused && m_wndEditor )
-            {
-                DoSelectProperty( selected, wxPG_SEL_FOCUS );
-            }
-            else
-            {
-                // Tab traversal workaround for platforms on which
-                // wxWindow::Navigate() may navigate into first child
-                // instead of next sibling. Does not work perfectly
-                // in every scenario (for instance, when property grid
-                // is either first or last control).
-            #if defined(__WXGTK__)
-                wxWindow* sibling = mainControl->GetNextSibling();
-                if ( sibling )
-                    sibling->SetFocusFromKbd();
-            #else
-                Navigate(wxNavigationKeyEvent::IsForward);
-            #endif
-            }
-        }
-        else
-        {
-            if ( editorFocused )
-            {
-                UnfocusEditor();
-            }
-            else
-            {
-            #if defined(__WXGTK__)
-                wxWindow* sibling = mainControl->GetPrevSibling();
-                if ( sibling )
-                    sibling->SetFocusFromKbd();
-            #else
-                Navigate(wxNavigationKeyEvent::IsBackward);
-            #endif
-            }
-        }
-
-        return;
-    }
-
-    // Ignore Alt and Control when they are down alone
-    if ( keycode == WXK_ALT ||
-         keycode == WXK_CONTROL )
-    {
-        event.Skip();
-        return;
-    }
-
-    int secondAction;
-    int action = KeyEventToActions(event, &secondAction);
-
-    if ( editorFocused && action == wxPG_ACTION_CANCEL_EDIT )
-    {
-        //
-        // Esc cancels any changes
-        if ( IsEditorsValueModified() )
-        {
-            EditorsValueWasNotModified();
-
-            // Update the control as well
-            selected->GetEditorClass()->
-                SetControlStringValue( selected,
-                                       GetEditorControl(),
-                                       selected->GetDisplayedString() );
-        }
-
-        OnValidationFailureReset(selected);
-
-        UnfocusEditor();
-        return;
-    }
-
-    // Except for TAB, ESC, and any keys specifically dedicated to
-    // wxPropertyGrid itself, handle child control events in child control.
-    if ( fromChild &&
-         wxPGFindInVector(m_dedicatedKeys, keycode) == wxNOT_FOUND )
-    {
-        // Only propagate event if it had modifiers
-        if ( !event.HasModifiers() )
-        {
-            event.StopPropagation();
-        }
-        event.Skip();
-        return;
-    }
-
-    bool wasHandled = false;
-
-    if ( selected )
-    {
-        // Show dialog?
-        if ( ButtonTriggerKeyTest(action, event) )
-            return;
-
-        wxPGProperty* p = selected;
-
-        if ( action == wxPG_ACTION_EDIT && !editorFocused )
-        {
-            DoSelectProperty( p, wxPG_SEL_FOCUS );
-            wasHandled = true;
-        }
-
-        // Travel and expand/collapse
-        int selectDir = -2;
-
-        if ( p->GetChildCount() )
-        {
-            if ( action == wxPG_ACTION_COLLAPSE_PROPERTY || secondAction == wxPG_ACTION_COLLAPSE_PROPERTY )
-            {
-                if ( (m_windowStyle & wxPG_HIDE_MARGIN) || Collapse(p) )
-                    wasHandled = true;
-            }
-            else if ( action == wxPG_ACTION_EXPAND_PROPERTY || secondAction == wxPG_ACTION_EXPAND_PROPERTY )
-            {
-                if ( (m_windowStyle & wxPG_HIDE_MARGIN) || Expand(p) )
-                    wasHandled = true;
-            }
-        }
-
-        if ( !wasHandled )
-        {
-            if ( action == wxPG_ACTION_PREV_PROPERTY || secondAction == wxPG_ACTION_PREV_PROPERTY )
-            {
-                selectDir = -1;
-            }
-            else if ( action == wxPG_ACTION_NEXT_PROPERTY || secondAction == wxPG_ACTION_NEXT_PROPERTY )
-            {
-                selectDir = 1;
-            }
-        }
-
-        if ( selectDir >= -1 )
-        {
-            p = wxPropertyGridIterator::OneStep( m_pState, wxPG_ITERATE_VISIBLE, p, selectDir );
-            if ( p )
-            {
-                int selFlags = 0;
-                int reopenLabelEditorCol = -1;
-
-                if ( editorFocused )
-                {
-                    // If editor was focused, then make the next editor
-                    // focused as well
-                    selFlags |= wxPG_SEL_FOCUS;
-                }
-                else
-                {
-                    // Also maintain the same label editor focus state
-                    if ( m_labelEditor )
-                        reopenLabelEditorCol = m_selColumn;
-                }
-
-                DoSelectProperty(p, selFlags);
-
-                if ( reopenLabelEditorCol >= 0 )
-                    DoBeginLabelEdit(reopenLabelEditorCol);
-            }
-            wasHandled = true;
-        }
-    }
-    else
-    {
-        // If nothing was selected, select the first item now
-        // (or navigate out of tab).
-        if ( action != wxPG_ACTION_CANCEL_EDIT && secondAction != wxPG_ACTION_CANCEL_EDIT )
-        {
-            wxPGProperty* p = wxPropertyGridInterface::GetFirst();
-            if ( p ) DoSelectProperty(p);
-            wasHandled = true;
-        }
-    }
-
-    if ( !wasHandled )
-        event.Skip();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnKey( wxKeyEvent &event )
-{
-    // If there was editor open and focused, then this event should not
-    // really be processed here.
-    if ( IsEditorFocused() )
-    {
-        // However, if event had modifiers, it is probably still best
-        // to skip it.
-        if ( event.HasModifiers() )
-            event.Skip();
-        else
-            event.StopPropagation();
-        return;
-    }
-
-    HandleKeyEvent(event, false);
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGrid::ButtonTriggerKeyTest( int action, wxKeyEvent& event )
-{
-    if ( action == -1 )
-    {
-        int secondAction;
-        action = KeyEventToActions(event, &secondAction);
-    }
-
-    // Does the keycode trigger button?
-    if ( action == wxPG_ACTION_PRESS_BUTTON &&
-         m_wndEditor2 )
-    {
-        wxCommandEvent evt(wxEVT_BUTTON, m_wndEditor2->GetId());
-        GetEventHandler()->AddPendingEvent(evt);
-        return true;
-    }
-
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnChildKeyDown( wxKeyEvent &event )
-{
-    HandleKeyEvent(event, true);
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGrid miscellaneous event handling
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnIdle( wxIdleEvent& WXUNUSED(event) )
-{
-    //
-    // Check if the focus is in this control or one of its children
-    wxWindow* newFocused = wxWindow::FindFocus();
-
-    if ( newFocused != m_curFocused )
-        HandleFocusChange( newFocused );
-
-    //
-    // Check if top-level parent has changed
-    if ( GetExtraStyle() & wxPG_EX_ENABLE_TLP_TRACKING )
-    {
-        wxWindow* tlp = ::wxGetTopLevelParent(this);
-        if ( tlp != m_tlp )
-            OnTLPChanging(tlp);
-    }
-
-    //
-    // Resolve pending property removals
-    if ( m_deletedProperties.size() > 0 )
-    {
-        wxArrayPGProperty& arr = m_deletedProperties;
-        for ( unsigned int i=0; i 0 )
-    {
-        wxArrayPGProperty& arr = m_removedProperties;
-        for ( unsigned int i=0; iGetParent();
-    }
-
-    // Notify editor control when it receives a focus
-    if ( wasEditorFocused && m_curFocused != newFocused )
-    {
-        wxPGProperty* p = GetSelection();
-        if ( p )
-        {
-            const wxPGEditor* editor = p->GetEditorClass();
-            ResetEditorAppearance();
-            editor->OnFocus(p, GetEditorControl());
-        }
-    }
-
-    m_curFocused = newFocused;
-
-    if ( (m_iFlags & wxPG_FL_FOCUSED) !=
-         (oldFlags & wxPG_FL_FOCUSED) )
-    {
-        if ( !(m_iFlags & wxPG_FL_FOCUSED) )
-        {
-            // Need to store changed value
-            CommitChangesFromEditor();
-        }
-        else
-        {
-            /*
-            //
-            // Preliminary code for tab-order respecting
-            // tab-traversal (but should be moved to
-            // OnNav handler)
-            //
-            wxWindow* prevFocus = event.GetWindow();
-            wxWindow* useThis = this;
-            if ( m_iFlags & wxPG_FL_IN_MANAGER )
-                useThis = GetParent();
-
-            if ( prevFocus &&
-                 prevFocus->GetParent() == useThis->GetParent() )
-            {
-                wxList& children = useThis->GetParent()->GetChildren();
-
-                wxNode* node = children.Find(prevFocus);
-
-                if ( node->GetNext() &&
-                     useThis == node->GetNext()->GetData() )
-                    DoSelectProperty(GetFirst());
-                else if ( node->GetPrevious () &&
-                          useThis == node->GetPrevious()->GetData() )
-                    DoSelectProperty(GetLastProperty());
-
-            }
-            */
-        }
-
-        // Redraw selected
-        wxPGProperty* selected = GetSelection();
-        if ( selected && (m_iFlags & wxPG_FL_INITIALIZED) )
-            DrawItem( selected );
-    }
-}
-
-void wxPropertyGrid::OnFocusEvent( wxFocusEvent& event )
-{
-    if ( event.GetEventType() == wxEVT_SET_FOCUS )
-        HandleFocusChange((wxWindow*)event.GetEventObject());
-    // Line changed to "else" when applying wxPropertyGrid patch #1675902
-    //else if ( event.GetWindow() )
-    else
-        HandleFocusChange(event.GetWindow());
-
-    event.Skip();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnChildFocusEvent( wxChildFocusEvent& event )
-{
-    HandleFocusChange((wxWindow*)event.GetEventObject());
-    event.Skip();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnScrollEvent( wxScrollWinEvent &event )
-{
-    m_iFlags |= wxPG_FL_SCROLLED;
-
-    event.Skip();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGrid::OnCaptureChange( wxMouseCaptureChangedEvent& WXUNUSED(event) )
-{
-    if ( m_iFlags & wxPG_FL_MOUSE_CAPTURED )
-    {
-        m_iFlags &= ~(wxPG_FL_MOUSE_CAPTURED);
-    }
-}
-
-// -----------------------------------------------------------------------
-// Property editor related functions
-// -----------------------------------------------------------------------
-
-// noDefCheck = true prevents infinite recursion.
-wxPGEditor* wxPropertyGrid::DoRegisterEditorClass( wxPGEditor* editorClass,
-                                                   const wxString& editorName,
-                                                   bool noDefCheck )
-{
-    wxASSERT( editorClass );
-
-    if ( !noDefCheck && wxPGGlobalVars->m_mapEditorClasses.empty() )
-        RegisterDefaultEditors();
-
-    wxString name = editorName;
-    if ( name.empty() )
-        name = editorClass->GetName();
-
-    // Existing editor under this name?
-    wxPGHashMapS2P::iterator vt_it = wxPGGlobalVars->m_mapEditorClasses.find(name);
-
-    if ( vt_it != wxPGGlobalVars->m_mapEditorClasses.end() )
-    {
-        // If this name was already used, try class name.
-        name = editorClass->GetClassInfo()->GetClassName();
-        vt_it = wxPGGlobalVars->m_mapEditorClasses.find(name);
-    }
-
-    wxCHECK_MSG( vt_it == wxPGGlobalVars->m_mapEditorClasses.end(),
-                 (wxPGEditor*) vt_it->second,
-                 "Editor with given name was already registered" );
-
-    wxPGGlobalVars->m_mapEditorClasses[name] = (void*)editorClass;
-
-    return editorClass;
-}
-
-// Use this in RegisterDefaultEditors.
-#define wxPGRegisterDefaultEditorClass(EDITOR) \
-    if ( wxPGEditor_##EDITOR == NULL ) \
-    { \
-        wxPGEditor_##EDITOR = wxPropertyGrid::RegisterEditorClass( \
-            new wxPG##EDITOR##Editor, true ); \
-    }
-
-// Registers all default editor classes
-void wxPropertyGrid::RegisterDefaultEditors()
-{
-    wxPGRegisterDefaultEditorClass( TextCtrl );
-    wxPGRegisterDefaultEditorClass( Choice );
-    wxPGRegisterDefaultEditorClass( ComboBox );
-    wxPGRegisterDefaultEditorClass( TextCtrlAndButton );
-#if wxPG_INCLUDE_CHECKBOX
-    wxPGRegisterDefaultEditorClass( CheckBox );
-#endif
-    wxPGRegisterDefaultEditorClass( ChoiceAndButton );
-
-    // Register SpinCtrl etc. editors before use
-    RegisterAdditionalEditors();
-}
-
-// -----------------------------------------------------------------------
-// wxPGStringTokenizer
-//   Needed to handle C-style string lists (e.g. "str1" "str2")
-// -----------------------------------------------------------------------
-
-wxPGStringTokenizer::wxPGStringTokenizer( const wxString& str, wxChar delimeter )
-    : m_str(&str), m_curPos(str.begin()), m_delimeter(delimeter)
-{
-}
-
-wxPGStringTokenizer::~wxPGStringTokenizer()
-{
-}
-
-bool wxPGStringTokenizer::HasMoreTokens()
-{
-    const wxString& str = *m_str;
-
-    wxString::const_iterator i = m_curPos;
-
-    wxUniChar delim = m_delimeter;
-    wxUniChar a;
-    wxUniChar prev_a = wxT('\0');
-
-    bool inToken = false;
-
-    while ( i != str.end() )
-    {
-        a = *i;
-
-        if ( !inToken )
-        {
-            if ( a == delim )
-            {
-                inToken = true;
-                m_readyToken.clear();
-            }
-        }
-        else
-        {
-            if ( prev_a != wxT('\\') )
-            {
-                if ( a != delim )
-                {
-                    if ( a != wxT('\\') )
-                        m_readyToken << a;
-                }
-                else
-                {
-                    ++i;
-                    m_curPos = i;
-                    return true;
-                }
-                prev_a = a;
-            }
-            else
-            {
-                m_readyToken << a;
-                prev_a = wxT('\0');
-            }
-        }
-        ++i;
-    }
-
-    m_curPos = str.end();
-
-    if ( inToken )
-        return true;
-
-    return false;
-}
-
-wxString wxPGStringTokenizer::GetNextToken()
-{
-    return m_readyToken;
-}
-
-// -----------------------------------------------------------------------
-// wxPGChoiceEntry
-// -----------------------------------------------------------------------
-
-wxPGChoiceEntry::wxPGChoiceEntry()
-    : wxPGCell(), m_value(wxPG_INVALID_VALUE)
-{
-}
-
-// -----------------------------------------------------------------------
-// wxPGChoicesData
-// -----------------------------------------------------------------------
-
-wxPGChoicesData::wxPGChoicesData()
-{
-}
-
-wxPGChoicesData::~wxPGChoicesData()
-{
-    Clear();
-}
-
-void wxPGChoicesData::Clear()
-{
-    m_items.clear();
-}
-
-void wxPGChoicesData::CopyDataFrom( wxPGChoicesData* data )
-{
-    wxASSERT( m_items.size() == 0 );
-
-    m_items = data->m_items;
-}
-
-wxPGChoiceEntry& wxPGChoicesData::Insert( int index,
-                                          const wxPGChoiceEntry& item )
-{
-    wxVector::iterator it;
-    if ( index == -1 )
-    {
-        it = m_items.end();
-        index = (int) m_items.size();
-    }
-    else
-    {
-        it = m_items.begin() + index;
-    }
-
-    m_items.insert(it, item);
-
-    wxPGChoiceEntry& ownEntry = m_items[index];
-
-    // Need to fix value?
-    if ( ownEntry.GetValue() == wxPG_INVALID_VALUE )
-        ownEntry.SetValue(index);
-
-    return ownEntry;
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGridEvent
-// -----------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPropertyGridEvent, wxCommandEvent)
-
-
-wxDEFINE_EVENT( wxEVT_PG_SELECTED, wxPropertyGridEvent );
-wxDEFINE_EVENT( wxEVT_PG_CHANGING, wxPropertyGridEvent );
-wxDEFINE_EVENT( wxEVT_PG_CHANGED, wxPropertyGridEvent );
-wxDEFINE_EVENT( wxEVT_PG_HIGHLIGHTED, wxPropertyGridEvent );
-wxDEFINE_EVENT( wxEVT_PG_RIGHT_CLICK, wxPropertyGridEvent );
-wxDEFINE_EVENT( wxEVT_PG_PAGE_CHANGED, wxPropertyGridEvent );
-wxDEFINE_EVENT( wxEVT_PG_ITEM_EXPANDED, wxPropertyGridEvent );
-wxDEFINE_EVENT( wxEVT_PG_ITEM_COLLAPSED, wxPropertyGridEvent );
-wxDEFINE_EVENT( wxEVT_PG_DOUBLE_CLICK, wxPropertyGridEvent );
-wxDEFINE_EVENT( wxEVT_PG_LABEL_EDIT_BEGIN, wxPropertyGridEvent );
-wxDEFINE_EVENT( wxEVT_PG_LABEL_EDIT_ENDING, wxPropertyGridEvent );
-wxDEFINE_EVENT( wxEVT_PG_COL_BEGIN_DRAG, wxPropertyGridEvent );
-wxDEFINE_EVENT( wxEVT_PG_COL_DRAGGING, wxPropertyGridEvent );
-wxDEFINE_EVENT( wxEVT_PG_COL_END_DRAG, wxPropertyGridEvent );
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridEvent::Init()
-{
-    m_validationInfo = NULL;
-    m_column = 1;
-    m_canVeto = false;
-    m_wasVetoed = false;
-    m_pg = NULL;
-}
-
-// -----------------------------------------------------------------------
-
-wxPropertyGridEvent::wxPropertyGridEvent(wxEventType commandType, int id)
-    : wxCommandEvent(commandType,id)
-{
-    m_property = NULL;
-    Init();
-}
-
-// -----------------------------------------------------------------------
-
-wxPropertyGridEvent::wxPropertyGridEvent(const wxPropertyGridEvent& event)
-    : wxCommandEvent(event)
-{
-    m_eventType = event.GetEventType();
-    m_eventObject = event.m_eventObject;
-    m_pg = event.m_pg;
-    OnPropertyGridSet();
-    m_property = event.m_property;
-    m_validationInfo = event.m_validationInfo;
-    m_canVeto = event.m_canVeto;
-    m_wasVetoed = event.m_wasVetoed;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridEvent::OnPropertyGridSet()
-{
-    if ( !m_pg )
-        return;
-
-#if wxUSE_THREADS
-    wxCriticalSectionLocker(wxPGGlobalVars->m_critSect);
-#endif
-    m_pg->m_liveEvents.push_back(this);
-}
-
-// -----------------------------------------------------------------------
-
-wxPropertyGridEvent::~wxPropertyGridEvent()
-{
-    if ( m_pg )
-    {
-    #if wxUSE_THREADS
-        wxCriticalSectionLocker(wxPGGlobalVars->m_critSect);
-    #endif
-
-        // Use iterate from the back since it is more likely that the event
-        // being desroyed is at the end of the array.
-        wxVector& liveEvents = m_pg->m_liveEvents;
-
-        for ( int i = liveEvents.size()-1; i >= 0; i-- )
-        {
-            if ( liveEvents[i] == this )
-            {
-                liveEvents.erase(liveEvents.begin() + i);
-                break;
-            }
-        }
-    }
-}
-
-// -----------------------------------------------------------------------
-
-wxEvent* wxPropertyGridEvent::Clone() const
-{
-    return new wxPropertyGridEvent( *this );
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGridPopulator
-// -----------------------------------------------------------------------
-
-wxPropertyGridPopulator::wxPropertyGridPopulator()
-{
-    m_state = NULL;
-    m_pg = NULL;
-    wxPGGlobalVars->m_offline++;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridPopulator::SetState( wxPropertyGridPageState* state )
-{
-    m_state = state;
-    m_propHierarchy.clear();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridPopulator::SetGrid( wxPropertyGrid* pg )
-{
-    m_pg = pg;
-    pg->Freeze();
-}
-
-// -----------------------------------------------------------------------
-
-wxPropertyGridPopulator::~wxPropertyGridPopulator()
-{
-    //
-    // Free unused sets of choices
-    wxPGHashMapS2P::iterator it;
-
-    for( it = m_dictIdChoices.begin(); it != m_dictIdChoices.end(); ++it )
-    {
-        wxPGChoicesData* data = (wxPGChoicesData*) it->second;
-        data->DecRef();
-    }
-
-    if ( m_pg )
-    {
-        m_pg->Thaw();
-        m_pg->GetPanel()->Refresh();
-    }
-    wxPGGlobalVars->m_offline--;
-}
-
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridPopulator::Add( const wxString& propClass,
-                                            const wxString& propLabel,
-                                            const wxString& propName,
-                                            const wxString* propValue,
-                                            wxPGChoices* pChoices )
-{
-    wxClassInfo* classInfo = wxClassInfo::FindClass(propClass);
-    wxPGProperty* parent = GetCurParent();
-
-    if ( parent->HasFlag(wxPG_PROP_AGGREGATE) )
-    {
-        ProcessError(wxString::Format(wxT("new children cannot be added to '%s'"),parent->GetName().c_str()));
-        return NULL;
-    }
-
-    if ( !classInfo || !classInfo->IsKindOf(wxCLASSINFO(wxPGProperty)) )
-    {
-        ProcessError(wxString::Format(wxT("'%s' is not valid property class"),propClass.c_str()));
-        return NULL;
-    }
-
-    wxPGProperty* property = (wxPGProperty*) classInfo->CreateObject();
-
-    property->SetLabel(propLabel);
-    property->DoSetName(propName);
-
-    if ( pChoices && pChoices->IsOk() )
-        property->SetChoices(*pChoices);
-
-    m_state->DoInsert(parent, -1, property);
-
-    if ( propValue )
-        property->SetValueFromString( *propValue, wxPG_FULL_VALUE|
-                                                  wxPG_PROGRAMMATIC_VALUE );
-
-    return property;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridPopulator::AddChildren( wxPGProperty* property )
-{
-    m_propHierarchy.push_back(property);
-    DoScanForChildren();
-    m_propHierarchy.pop_back();
-}
-
-// -----------------------------------------------------------------------
-
-wxPGChoices wxPropertyGridPopulator::ParseChoices( const wxString& choicesString,
-                                                   const wxString& idString )
-{
-    wxPGChoices choices;
-
-    // Using id?
-    if ( choicesString[0] == wxT('@') )
-    {
-        wxString ids = choicesString.substr(1);
-        wxPGHashMapS2P::iterator it = m_dictIdChoices.find(ids);
-        if ( it == m_dictIdChoices.end() )
-            ProcessError(wxString::Format(wxT("No choices defined for id '%s'"),ids.c_str()));
-        else
-            choices.AssignData((wxPGChoicesData*)it->second);
-    }
-    else
-    {
-        bool found = false;
-        if ( !idString.empty() )
-        {
-            wxPGHashMapS2P::iterator it = m_dictIdChoices.find(idString);
-            if ( it != m_dictIdChoices.end() )
-            {
-                choices.AssignData((wxPGChoicesData*)it->second);
-                found = true;
-            }
-        }
-
-        if ( !found )
-        {
-            // Parse choices string
-            wxString::const_iterator it = choicesString.begin();
-            wxString label;
-            wxString value;
-            int state = 0;
-            bool labelValid = false;
-
-            for ( ; it != choicesString.end(); ++it )
-            {
-                wxChar c = *it;
-
-                if ( state != 1 )
-                {
-                    if ( c == wxT('"') )
-                    {
-                        if ( labelValid )
-                        {
-                            long l;
-                            if ( !value.ToLong(&l, 0) ) l = wxPG_INVALID_VALUE;
-                            choices.Add(label, l);
-                        }
-                        labelValid = false;
-                        //wxLogDebug(wxT("%s, %s"),label.c_str(),value.c_str());
-                        value.clear();
-                        label.clear();
-                        state = 1;
-                    }
-                    else if ( c == wxT('=') )
-                    {
-                        if ( labelValid )
-                        {
-                            state = 2;
-                        }
-                    }
-                    else if ( state == 2 && (wxIsalnum(c) || c == wxT('x')) )
-                    {
-                        value << c;
-                    }
-                }
-                else
-                {
-                    if ( c == wxT('"') )
-                    {
-                        state = 0;
-                        labelValid = true;
-                    }
-                    else
-                        label << c;
-                }
-            }
-
-            if ( labelValid )
-            {
-                long l;
-                if ( !value.ToLong(&l, 0) ) l = wxPG_INVALID_VALUE;
-                choices.Add(label, l);
-            }
-
-            if ( !choices.IsOk() )
-            {
-                choices.EnsureData();
-            }
-
-            // Assign to id
-            if ( !idString.empty() )
-                m_dictIdChoices[idString] = choices.GetData();
-        }
-    }
-
-    return choices;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridPopulator::ToLongPCT( const wxString& s, long* pval, long max )
-{
-    if ( s.Last() == wxT('%') )
-    {
-        wxString s2 = s.substr(0,s.length()-1);
-        long val;
-        if ( s2.ToLong(&val, 10) )
-        {
-            *pval = (val*max)/100;
-            return true;
-        }
-        return false;
-    }
-
-    return s.ToLong(pval, 10);
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridPopulator::AddAttribute( const wxString& name,
-                                            const wxString& type,
-                                            const wxString& value )
-{
-    int l = m_propHierarchy.size();
-    if ( !l )
-        return false;
-
-    wxPGProperty* p = m_propHierarchy[l-1];
-    wxString valuel = value.Lower();
-    wxVariant variant;
-
-    if ( type.empty() )
-    {
-        long v;
-
-        // Auto-detect type
-        if ( valuel == wxT("true") || valuel == wxT("yes") || valuel == wxT("1") )
-            variant = true;
-        else if ( valuel == wxT("false") || valuel == wxT("no") || valuel == wxT("0") )
-            variant = false;
-        else if ( value.ToLong(&v, 0) )
-            variant = v;
-        else
-            variant = value;
-    }
-    else
-    {
-        if ( type == wxT("string") )
-        {
-            variant = value;
-        }
-        else if ( type == wxT("int") )
-        {
-            long v = 0;
-            value.ToLong(&v, 0);
-            variant = v;
-        }
-        else if ( type == wxT("bool") )
-        {
-            if ( valuel == wxT("true") || valuel == wxT("yes") || valuel == wxT("1") )
-                variant = true;
-            else
-                variant = false;
-        }
-        else
-        {
-            ProcessError(wxString::Format(wxT("Invalid attribute type '%s'"),type.c_str()));
-            return false;
-        }
-    }
-
-    p->SetAttribute( name, variant );
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridPopulator::ProcessError( const wxString& msg )
-{
-    wxLogError(_("Error in resource: %s"),msg.c_str());
-}
-
-// -----------------------------------------------------------------------
-
-#endif  // wxUSE_PROPGRID
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/propgridiface.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/propgridiface.cpp
deleted file mode 100644
index 4608fb9c61..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/propgridiface.cpp
+++ /dev/null
@@ -1,1127 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/propgrid/propgridiface.cpp
-// Purpose:     wxPropertyGridInterface class
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     2008-08-24
-// Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_PROPGRID
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/object.h"
-    #include "wx/hash.h"
-    #include "wx/string.h"
-    #include "wx/log.h"
-    #include "wx/event.h"
-    #include "wx/window.h"
-    #include "wx/panel.h"
-    #include "wx/dc.h"
-    #include "wx/dcmemory.h"
-    #include "wx/button.h"
-    #include "wx/pen.h"
-    #include "wx/brush.h"
-    #include "wx/settings.h"
-    #include "wx/sizer.h"
-    #include "wx/intl.h"
-#endif
-
-#include "wx/propgrid/property.h"
-#include "wx/propgrid/propgrid.h"
-
-
-const wxChar *wxPGTypeName_long = wxT("long");
-const wxChar *wxPGTypeName_bool = wxT("bool");
-const wxChar *wxPGTypeName_double = wxT("double");
-const wxChar *wxPGTypeName_wxString = wxT("string");
-const wxChar *wxPGTypeName_void = wxT("void*");
-const wxChar *wxPGTypeName_wxArrayString = wxT("arrstring");
-
-
-// ----------------------------------------------------------------------------
-// VariantDatas
-// ----------------------------------------------------------------------------
-
-WX_PG_IMPLEMENT_VARIANT_DATA_EXPORTED(wxPoint, WXDLLIMPEXP_PROPGRID)
-WX_PG_IMPLEMENT_VARIANT_DATA_EXPORTED(wxSize, WXDLLIMPEXP_PROPGRID)
-WX_PG_IMPLEMENT_VARIANT_DATA_EXPORTED_DUMMY_EQ(wxArrayInt, WXDLLIMPEXP_PROPGRID)
-IMPLEMENT_VARIANT_OBJECT_EXPORTED(wxFont, WXDLLIMPEXP_PROPGRID)
-
-// -----------------------------------------------------------------------
-// wxPGPropArgCls
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPGPropArgCls::GetPtr( wxPropertyGridInterface* iface ) const
-{
-    if ( m_flags == IsProperty )
-    {
-        wxASSERT_MSG( m_ptr.property, wxT("invalid property ptr") );
-        return m_ptr.property;
-    }
-    else if ( m_flags & IsWxString )
-        return iface->GetPropertyByNameA(*m_ptr.stringName);
-    else if ( m_flags & IsCharPtr )
-        return iface->GetPropertyByNameA(m_ptr.charName);
-    else if ( m_flags & IsWCharPtr )
-        return iface->GetPropertyByNameA(m_ptr.wcharName);
-
-    return NULL;
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGridInterface
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::RefreshGrid( wxPropertyGridPageState* state )
-{
-    if ( !state )
-        state = m_pState;
-
-    wxPropertyGrid* grid = state->GetGrid();
-    if ( grid->GetState() == state && !grid->IsFrozen() )
-    {
-        grid->Refresh();
-    }
-}
-
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridInterface::Append( wxPGProperty* property )
-{
-    wxPGProperty* retp = m_pState->DoAppend(property);
-
-    wxPropertyGrid* grid = m_pState->GetGrid();
-    if ( grid )
-        grid->RefreshGrid();
-
-    return retp;
-}
-
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridInterface::AppendIn( wxPGPropArg id, wxPGProperty* newproperty )
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxNullProperty)
-    wxPGProperty* pwc = (wxPGProperty*) p;
-    wxPGProperty* retp = m_pState->DoInsert(pwc, pwc->GetChildCount(), newproperty);
-    return retp;
-}
-
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridInterface::Insert( wxPGPropArg id, wxPGProperty* property )
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxNullProperty)
-    wxPGProperty* retp = m_pState->DoInsert(p->GetParent(), p->GetIndexInParent(), property);
-    RefreshGrid();
-    return retp;
-}
-
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridInterface::Insert( wxPGPropArg id, int index, wxPGProperty* newproperty )
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxNullProperty)
-    wxPGProperty* retp = m_pState->DoInsert((wxPGProperty*)p,index,newproperty);
-    RefreshGrid();
-    return retp;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::DeleteProperty( wxPGPropArg id )
-{
-    wxPG_PROP_ARG_CALL_PROLOG()
-
-    wxPropertyGridPageState* state = p->GetParentState();
-
-    state->DoDelete( p, true );
-
-    RefreshGrid(state);
-}
-
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridInterface::RemoveProperty( wxPGPropArg id )
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxNullProperty)
-
-    wxCHECK( !p->GetChildCount() || p->HasFlag(wxPG_PROP_AGGREGATE),
-             wxNullProperty);
-
-    wxPropertyGridPageState* state = p->GetParentState();
-
-    state->DoDelete( p, false );
-
-    RefreshGrid(state);
-
-    return p;
-}
-
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridInterface::ReplaceProperty( wxPGPropArg id, wxPGProperty* property )
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxNullProperty)
-
-    wxPGProperty* replaced = p;
-    wxCHECK_MSG( replaced && property,
-                 wxNullProperty,
-                 wxT("NULL property") );
-    wxCHECK_MSG( !replaced->IsCategory(),
-                 wxNullProperty,
-                 wxT("cannot replace this type of property") );
-    wxCHECK_MSG( !m_pState->IsInNonCatMode(),
-                 wxNullProperty,
-                 wxT("cannot replace properties in alphabetic mode") );
-
-    // Get address to the slot
-    wxPGProperty* parent = replaced->GetParent();
-    int ind = replaced->GetIndexInParent();
-
-    wxPropertyGridPageState* state = replaced->GetParentState();
-    DeleteProperty(replaced); // Must use generic Delete
-    state->DoInsert(parent,ind,property);
-
-    return property;
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGridInterface property operations
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridInterface::GetSelection() const
-{
-    return m_pState->GetSelection();
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridInterface::ClearSelection( bool validation )
-{
-    bool res = DoClearSelection(validation, wxPG_SEL_DONT_SEND_EVENT);
-    wxPropertyGrid* pg = GetPropertyGrid();
-    if ( pg )
-        pg->Refresh();
-    return res;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridInterface::DoClearSelection( bool validation,
-                                                int selFlags )
-{
-    if ( !validation )
-        selFlags |= wxPG_SEL_NOVALIDATE;
-
-    wxPropertyGridPageState* state = m_pState;
-
-    if ( state )
-    {
-        wxPropertyGrid* pg = state->GetGrid();
-        if ( pg->GetState() == state )
-            return pg->DoSelectProperty(NULL, selFlags);
-        else
-            state->DoSetSelection(NULL);
-    }
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::LimitPropertyEditing( wxPGPropArg id, bool limit )
-{
-    wxPG_PROP_ARG_CALL_PROLOG()
-
-    m_pState->DoLimitPropertyEditing(p, limit);
-    RefreshProperty(p);
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridInterface::EnableProperty( wxPGPropArg id, bool enable )
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-
-    wxPropertyGridPageState* state = p->GetParentState();
-    wxPropertyGrid* grid = state->GetGrid();
-
-    if ( enable )
-    {
-        if ( !(p->m_flags & wxPG_PROP_DISABLED) )
-            return false;
-
-        // If active, Set active Editor.
-        if ( grid && grid->GetState() == state && p == grid->GetSelection() )
-            grid->DoSelectProperty( p, wxPG_SEL_FORCE );
-    }
-    else
-    {
-        if ( p->m_flags & wxPG_PROP_DISABLED )
-            return false;
-
-        // If active, Disable as active Editor.
-        if ( grid && grid->GetState() == state && p == grid->GetSelection() )
-            grid->DoSelectProperty( p, wxPG_SEL_FORCE );
-    }
-
-    p->DoEnable(enable);
-
-    RefreshProperty( p );
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridInterface::ExpandAll( bool doExpand )
-{
-    wxPropertyGridPageState* state = m_pState;
-
-    if ( !state->DoGetRoot()->GetChildCount() )
-        return true;
-
-    wxPropertyGrid* pg = state->GetGrid();
-
-    if ( GetSelection() && GetSelection() != state->DoGetRoot() &&
-         !doExpand )
-    {
-        pg->DoClearSelection();
-    }
-
-    wxPGVIterator it;
-
-    for ( it = GetVIterator( wxPG_ITERATE_ALL ); !it.AtEnd(); it.Next() )
-    {
-        wxPGProperty* p = (wxPGProperty*) it.GetProperty();
-        if ( p->GetChildCount() )
-        {
-            if ( doExpand )
-            {
-                if ( !p->IsExpanded() )
-                {
-                    state->DoExpand(p);
-                }
-            }
-            else
-            {
-                if ( p->IsExpanded() )
-                {
-                    state->DoCollapse(p);
-                }
-            }
-        }
-    }
-
-    pg->RecalculateVirtualSize();
-
-    RefreshGrid();
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::ClearModifiedStatus()
-{
-    unsigned int pageIndex = 0;
-
-    for (;;)
-    {
-        wxPropertyGridPageState* page = GetPageState(pageIndex);
-        if ( !page ) break;
-
-        page->DoGetRoot()->SetFlagRecursively(wxPG_PROP_MODIFIED, false);
-        page->m_anyModified = false;
-
-        pageIndex++;
-    }
-
-    // Update active editor control, if any
-    GetPropertyGrid()->RefreshEditor();
-}
-
-bool wxPropertyGridInterface::SetColumnProportion( unsigned int column,
-                                                   int proportion )
-{
-    wxCHECK(m_pState, false);
-    wxPropertyGrid* pg = m_pState->GetGrid();
-    wxCHECK(pg, false);
-    wxCHECK(pg->HasFlag(wxPG_SPLITTER_AUTO_CENTER), false);
-    m_pState->DoSetColumnProportion(column, proportion);
-    return true;
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGridInterface property value setting and getting
-// -----------------------------------------------------------------------
-
-void wxPGGetFailed( const wxPGProperty* p, const wxString& typestr )
-{
-    wxPGTypeOperationFailed(p, typestr, wxS("Get"));
-}
-
-// -----------------------------------------------------------------------
-
-void wxPGTypeOperationFailed( const wxPGProperty* p,
-                              const wxString& typestr,
-                              const wxString& op )
-{
-    wxASSERT( p != NULL );
-    wxLogError( _("Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT \"%s\"."),
-        op.c_str(), p->GetLabel().c_str(), p->GetValue().GetType().c_str(), typestr.c_str() );
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::SetPropVal( wxPGPropArg id, wxVariant& value )
-{
-    wxPG_PROP_ARG_CALL_PROLOG()
-
-    if ( p )
-        p->SetValue(value);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::SetPropertyValueString( wxPGPropArg id, const wxString& value )
-{
-    wxPG_PROP_ARG_CALL_PROLOG()
-
-    if ( p )
-        m_pState->DoSetPropertyValueString(p, value);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::SetValidationFailureBehavior( int vfbFlags )
-{
-    GetPropertyGrid()->m_permanentValidationFailureBehavior = vfbFlags;
-}
-
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridInterface::GetPropertyByNameA( const wxString& name ) const
-{
-    wxPGProperty* p = GetPropertyByName(name);
-    wxASSERT_MSG(p,wxString::Format(wxT("no property with name '%s'"),name.c_str()));
-    return p;
-}
-
-// ----------------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridInterface::GetPropertyByLabel( const wxString& label ) const
-{
-    wxPGVIterator it;
-
-    for ( it = GetVIterator( wxPG_ITERATE_PROPERTIES ); !it.AtEnd(); it.Next() )
-    {
-        if ( it.GetProperty()->GetLabel() == label )
-            return it.GetProperty();
-    }
-
-    return wxNullProperty;
-}
-
-// ----------------------------------------------------------------------------
-
-void wxPropertyGridInterface::DoSetPropertyAttribute( wxPGPropArg id, const wxString& name,
-                                                      wxVariant& value, long argFlags )
-{
-    wxPG_PROP_ARG_CALL_PROLOG()
-
-    p->SetAttribute( name, value );
-
-    if ( argFlags & wxPG_RECURSE )
-    {
-        unsigned int i;
-        for ( i = 0; i < p->GetChildCount(); i++ )
-            DoSetPropertyAttribute(p->Item(i), name, value, argFlags);
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::SetPropertyAttributeAll( const wxString& attrName,
-                                                       wxVariant value )
-{
-    unsigned int pageIndex = 0;
-
-    for (;;)
-    {
-        wxPropertyGridPageState* page = GetPageState(pageIndex);
-        if ( !page ) break;
-
-        DoSetPropertyAttribute(page->DoGetRoot(), attrName, value, wxPG_RECURSE);
-
-        pageIndex++;
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::GetPropertiesWithFlag( wxArrayPGProperty* targetArr,
-                                                     wxPGProperty::FlagType flags,
-                                                     bool inverse,
-                                                     int iterFlags ) const
-{
-    wxASSERT( targetArr );
-    wxPGVIterator it = GetVIterator( iterFlags );
-
-    for ( ;
-          !it.AtEnd();
-          it.Next() )
-    {
-        const wxPGProperty* property = it.GetProperty();
-
-        if ( !inverse )
-        {
-            if ( (property->GetFlags() & flags) == flags )
-                targetArr->push_back((wxPGProperty*)property);
-        }
-        else
-        {
-            if ( (property->GetFlags() & flags) != flags )
-                targetArr->push_back((wxPGProperty*)property);
-        }
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::SetBoolChoices( const wxString& trueChoice,
-                                                 const wxString& falseChoice )
-{
-    wxPGGlobalVars->m_boolChoices[0] = falseChoice;
-    wxPGGlobalVars->m_boolChoices[1] = trueChoice;
-}
-
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridInterface::DoGetPropertyByName( const wxString& name ) const
-{
-    return m_pState->BaseGetPropertyByName(name);
-}
-
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridInterface::GetPropertyByName( const wxString& name,
-                                                             const wxString& subname ) const
-{
-    wxPGProperty* p = DoGetPropertyByName(name);
-    if ( !p || !p->GetChildCount() )
-        return wxNullProperty;
-
-    return p->GetPropertyByName(subname);
-}
-
-// -----------------------------------------------------------------------
-
-// Since GetPropertyByName is used *a lot*, this makes sense
-// since non-virtual method can be called with less code.
-wxPGProperty* wxPropertyGridInterface::GetPropertyByName( const wxString& name ) const
-{
-    wxPGProperty* p = DoGetPropertyByName(name);
-    if ( p )
-        return p;
-
-    // Check if its "Property.SubProperty" format
-    int pos = name.Find(wxT('.'));
-    if ( pos <= 0 )
-        return NULL;
-
-    return GetPropertyByName(name.substr(0,pos),
-                             name.substr(pos+1,name.length()-pos-1));
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridInterface::HideProperty( wxPGPropArg id, bool hide, int flags )
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-
-    wxPropertyGrid* pg = m_pState->GetGrid();
-
-    if ( pg == p->GetGrid() )
-        return pg->DoHideProperty(p, hide, flags);
-    else
-        m_pState->DoHideProperty(p, hide, flags);
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridInterface::Collapse( wxPGPropArg id )
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-    wxPropertyGrid* pg = p->GetGridIfDisplayed();
-    if ( pg )
-        return pg->DoCollapse(p);
-
-    return p->GetParentState()->DoCollapse(p);
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridInterface::Expand( wxPGPropArg id )
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-    wxPropertyGrid* pg = p->GetGridIfDisplayed();
-    if ( pg )
-        return pg->DoExpand(p);
-
-    return p->GetParentState()->DoExpand(p);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::Sort( int flags )
-{
-    wxPropertyGrid* pg = GetPropertyGrid();
-
-    unsigned int pageIndex = 0;
-
-    for (;;)
-    {
-        wxPropertyGridPageState* page = GetPageState(pageIndex);
-        if ( !page ) break;
-        page->DoSort(flags);
-        pageIndex++;
-    }
-
-    // Fix positions of any open editor controls
-    if ( pg )
-        pg->CorrectEditorWidgetPosY();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::SetPropertyLabel( wxPGPropArg id, const wxString& newproplabel )
-{
-    wxPG_PROP_ARG_CALL_PROLOG()
-
-    p->SetLabel( newproplabel );
-
-    wxPropertyGridPageState* state = p->GetParentState();
-    wxPropertyGrid* pg = state->GetGrid();
-
-    if ( pg->HasFlag(wxPG_AUTO_SORT) )
-        pg->SortChildren(p->GetParent());
-
-    if ( pg->GetState() == state )
-    {
-        if ( pg->HasFlag(wxPG_AUTO_SORT) )
-            pg->Refresh();
-        else
-            pg->DrawItem( p );
-    }
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridInterface::SetPropertyMaxLength( wxPGPropArg id, int maxLen )
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-
-    wxPropertyGrid* pg = m_pState->GetGrid();
-
-    p->m_maxLen = (short) maxLen;
-
-    // Adjust control if selected currently
-    if ( pg == p->GetGrid() && p == m_pState->GetSelection() )
-    {
-        wxWindow* wnd = pg->GetEditorControl();
-        wxTextCtrl* tc = wxDynamicCast(wnd,wxTextCtrl);
-        if ( tc )
-            tc->SetMaxLength( maxLen );
-        else
-        // Not a text ctrl
-            return false;
-    }
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-void
-wxPropertyGridInterface::SetPropertyBackgroundColour( wxPGPropArg id,
-                                                      const wxColour& colour,
-                                                      int flags )
-{
-    wxPG_PROP_ARG_CALL_PROLOG()
-    p->SetBackgroundColour(colour, flags);
-    RefreshProperty(p);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::SetPropertyTextColour( wxPGPropArg id,
-                                                     const wxColour& colour,
-                                                     int flags )
-{
-    wxPG_PROP_ARG_CALL_PROLOG()
-    p->SetTextColour(colour, flags);
-    RefreshProperty(p);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::SetPropertyColoursToDefault( wxPGPropArg id )
-{
-    wxPG_PROP_ARG_CALL_PROLOG()
-
-    p->m_cells.clear();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::SetPropertyCell( wxPGPropArg id,
-                                               int column,
-                                               const wxString& text,
-                                               const wxBitmap& bitmap,
-                                               const wxColour& fgCol,
-                                               const wxColour& bgCol )
-{
-    wxPG_PROP_ARG_CALL_PROLOG()
-
-    wxPGCell& cell = p->GetCell(column);
-    if ( !text.empty() && text != wxPG_LABEL )
-        cell.SetText(text);
-    if ( bitmap.IsOk() )
-        cell.SetBitmap(bitmap);
-    if ( fgCol != wxNullColour )
-        cell.SetFgCol(fgCol);
-    if ( bgCol != wxNullColour )
-        cell.SetBgCol(bgCol);
-}
-
-// -----------------------------------------------------------------------
-// GetPropertyValueAsXXX methods
-
-#define IMPLEMENT_GET_VALUE(T,TRET,BIGNAME,DEFRETVAL) \
-TRET wxPropertyGridInterface::GetPropertyValueAs##BIGNAME( wxPGPropArg id ) const \
-{ \
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(DEFRETVAL) \
-    wxVariant value = p->GetValue(); \
-    if ( wxStrcmp(value.GetType(), wxPGTypeName_##T) != 0 ) \
-    { \
-        wxPGGetFailed(p,wxPGTypeName_##T); \
-        return (TRET)DEFRETVAL; \
-    } \
-    return (TRET)value.Get##BIGNAME(); \
-}
-
-// String is different than others.
-wxString wxPropertyGridInterface::GetPropertyValueAsString( wxPGPropArg id ) const
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(wxEmptyString)
-    return p->GetValueAsString(wxPG_FULL_VALUE);
-}
-
-bool wxPropertyGridInterface::GetPropertyValueAsBool( wxPGPropArg id ) const
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-    wxVariant value = p->GetValue();
-    if ( wxStrcmp(value.GetType(), wxPGTypeName_bool) == 0 )
-    {
-        return value.GetBool();
-    }
-    if ( wxStrcmp(value.GetType(), wxPGTypeName_long) == 0 )
-    {
-        return value.GetLong()?true:false;
-    }
-    wxPGGetFailed(p,wxPGTypeName_bool);
-    return false;
-}
-
-IMPLEMENT_GET_VALUE(long,long,Long,0)
-IMPLEMENT_GET_VALUE(double,double,Double,0.0)
-
-bool wxPropertyGridInterface::IsPropertyExpanded( wxPGPropArg id ) const
-{
-    wxPG_PROP_ARG_CALL_PROLOG_RETVAL(false)
-    return p->IsExpanded();
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGridInterface wrappers
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridInterface::ChangePropertyValue( wxPGPropArg id, wxVariant newValue )
-{
-    return GetPropertyGrid()->ChangePropertyValue(id, newValue);
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::BeginAddChildren( wxPGPropArg id )
-{
-    wxPG_PROP_ARG_CALL_PROLOG()
-    wxCHECK_RET( p->HasFlag(wxPG_PROP_AGGREGATE), wxT("only call on properties with fixed children") );
-    p->ClearFlag(wxPG_PROP_AGGREGATE);
-    p->SetFlag(wxPG_PROP_MISC_PARENT);
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridInterface::EditorValidate()
-{
-    return GetPropertyGrid()->DoEditorValidate();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridInterface::EndAddChildren( wxPGPropArg id )
-{
-    wxPG_PROP_ARG_CALL_PROLOG()
-    wxCHECK_RET( p->HasFlag(wxPG_PROP_MISC_PARENT), wxT("only call on properties for which BeginAddChildren was called prior") );
-    p->ClearFlag(wxPG_PROP_MISC_PARENT);
-    p->SetFlag(wxPG_PROP_AGGREGATE);
-}
-
-// -----------------------------------------------------------------------
-// wxPGVIterator_State
-// -----------------------------------------------------------------------
-
-// Default returned by wxPropertyGridInterface::GetVIterator().
-class wxPGVIteratorBase_State : public wxPGVIteratorBase
-{
-public:
-    wxPGVIteratorBase_State( wxPropertyGridPageState* state, int flags )
-    {
-        m_it.Init( state, flags );
-    }
-    virtual ~wxPGVIteratorBase_State() { }
-    virtual void Next() { m_it.Next(); }
-};
-
-wxPGVIterator wxPropertyGridInterface::GetVIterator( int flags ) const
-{
-    return wxPGVIterator( new wxPGVIteratorBase_State( m_pState, flags ) );
-}
-
-// -----------------------------------------------------------------------
-// wxPGEditableState related functions
-// -----------------------------------------------------------------------
-
-// EscapeDelimiters() changes ";" into "\;" and "|" into "\|"
-// in the input string.  This is an internal functions which is
-// used for saving states
-// NB: Similar function exists in aui/framemanager.cpp
-static wxString EscapeDelimiters(const wxString& s)
-{
-    wxString result;
-    result.Alloc(s.length());
-    const wxChar* ch = s.c_str();
-    while (*ch)
-    {
-        if (*ch == wxT(';') || *ch == wxT('|') || *ch == wxT(','))
-            result += wxT('\\');
-        result += *ch;
-        ++ch;
-    }
-    return result;
-}
-
-wxString wxPropertyGridInterface::SaveEditableState( int includedStates ) const
-{
-    wxString result;
-
-    //
-    // Save state on page basis
-    unsigned int pageIndex = 0;
-    wxArrayPtrVoid pageStates;
-
-    for (;;)
-    {
-        wxPropertyGridPageState* page = GetPageState(pageIndex);
-        if ( !page ) break;
-
-        pageStates.Add(page);
-
-        pageIndex++;
-    }
-
-    for ( pageIndex=0; pageIndex < pageStates.size(); pageIndex++ )
-    {
-        wxPropertyGridPageState* pageState = (wxPropertyGridPageState*) pageStates[pageIndex];
-
-        if ( includedStates & SelectionState )
-        {
-            wxString sel;
-            if ( pageState->GetSelection() )
-                sel = pageState->GetSelection()->GetName();
-            result += wxS("selection=");
-            result += EscapeDelimiters(sel);
-            result += wxS(";");
-        }
-        if ( includedStates & ExpandedState )
-        {
-            wxArrayPGProperty ptrs;
-            wxPropertyGridConstIterator it =
-                wxPropertyGridConstIterator( pageState,
-                                             wxPG_ITERATE_ALL_PARENTS_RECURSIVELY|wxPG_ITERATE_HIDDEN,
-                                             wxNullProperty );
-
-            result += wxS("expanded=");
-
-            for ( ;
-                  !it.AtEnd();
-                  it.Next() )
-            {
-                const wxPGProperty* p = it.GetProperty();
-
-                if ( !p->HasFlag(wxPG_PROP_COLLAPSED) )
-                    result += EscapeDelimiters(p->GetName());
-                result += wxS(",");
-
-            }
-
-            if ( result.Last() == wxS(',') )
-                result.RemoveLast();
-
-            result += wxS(";");
-        }
-        if ( includedStates & ScrollPosState )
-        {
-            int x, y;
-            GetPropertyGrid()->GetViewStart(&x,&y);
-            result += wxString::Format(wxS("scrollpos=%i,%i;"), x, y);
-        }
-        if ( includedStates & SplitterPosState )
-        {
-            result += wxS("splitterpos=");
-
-            for ( size_t i=0; iGetColumnCount(); i++ )
-                result += wxString::Format(wxS("%i,"), pageState->DoGetSplitterPosition(i));
-
-            result.RemoveLast();  // Remove last comma
-            result += wxS(";");
-        }
-        if ( includedStates & PageState )
-        {
-            result += wxS("ispageselected=");
-
-            if ( GetPageState(-1) == pageState )
-                result += wxS("1;");
-            else
-                result += wxS("0;");
-        }
-        if ( includedStates & DescBoxState )
-        {
-            wxVariant v = GetEditableStateItem(wxS("descboxheight"));
-            if ( !v.IsNull() )
-                result += wxString::Format(wxS("descboxheight=%i;"), (int)v.GetLong());
-        }
-        result.RemoveLast();  // Remove last semicolon
-        result += wxS("|");
-    }
-
-    // Remove last '|'
-    if ( !result.empty() )
-        result.RemoveLast();
-
-    return result;
-}
-
-bool wxPropertyGridInterface::RestoreEditableState( const wxString& src, int restoreStates )
-{
-    wxPropertyGrid* pg = GetPropertyGrid();
-    wxPGProperty* newSelection = NULL;
-    size_t pageIndex;
-    long vx = -1;
-    long vy = -1;
-    long selectedPage = -1;
-    bool pgSelectionSet = false;
-    bool res = true;
-
-    pg->Freeze();
-    wxArrayString pageStrings = ::wxSplit(src, wxS('|'), wxS('\\'));
-
-    for ( pageIndex=0; pageIndexDoCollapse(p);
-                        }
-
-                        // Then expand those which names are in values
-                        for ( size_t n=0; nDoExpand(prop);
-                        }
-                    }
-                }
-                else if ( key == wxS("scrollpos") )
-                {
-                    if ( restoreStates & ScrollPosState )
-                    {
-                        if ( values.size() == 2 )
-                        {
-                            values[0].ToLong(&vx);
-                            values[1].ToLong(&vy);
-                        }
-                        else
-                        {
-                            res = false;
-                        }
-                    }
-                }
-                else if ( key == wxS("splitterpos") )
-                {
-                    if ( restoreStates & SplitterPosState )
-                    {
-                        for ( size_t n=1; n 0 )
-                                pageState->DoSetSplitterPosition(pos, n);
-                        }
-                    }
-                }
-                else if ( key == wxS("selection") )
-                {
-                    if ( restoreStates & SelectionState )
-                    {
-                        if ( values.size() > 0 )
-                        {
-                            if ( pageState->IsDisplayed() )
-                            {
-                                if ( !values[0].empty() )
-                                    newSelection = GetPropertyByName(value);
-                                pgSelectionSet = true;
-                            }
-                            else
-                            {
-                                if ( !values[0].empty() )
-                                    pageState->DoSetSelection(GetPropertyByName(value));
-                                else
-                                    pageState->DoClearSelection();
-                            }
-                        }
-                    }
-                }
-                else if ( key == wxS("ispageselected") )
-                {
-                    if ( restoreStates & PageState )
-                    {
-                        long pageSelStatus;
-                        if ( values.size() == 1 && values[0].ToLong(&pageSelStatus) )
-                        {
-                            if ( pageSelStatus )
-                                selectedPage = pageIndex;
-                        }
-                        else
-                        {
-                            res = false;
-                        }
-                    }
-                }
-                else if ( key == wxS("descboxheight") )
-                {
-                    if ( restoreStates & DescBoxState )
-                    {
-                        long descBoxHeight;
-                        if ( values.size() == 1 && values[0].ToLong(&descBoxHeight) )
-                        {
-                            SetEditableStateItem(wxS("descboxheight"), descBoxHeight);
-                        }
-                        else
-                        {
-                            res = false;
-                        }
-                    }
-                }
-                else
-                {
-                    res = false;
-                }
-            }
-        }
-    }
-
-    //
-    // Force recalculation of virtual heights of all pages
-    // (may be needed on unclean source string).
-    pageIndex = 0;
-    wxPropertyGridPageState* pageState = GetPageState(pageIndex);
-    while ( pageState )
-    {
-        pageState->VirtualHeightChanged();
-        pageIndex += 1;
-        pageState = GetPageState(pageIndex);
-    }
-
-    pg->Thaw();
-
-    //
-    // Selection of visible grid page must be set after Thaw() call
-    if ( pgSelectionSet )
-    {
-        if ( newSelection )
-            pg->DoSelectProperty(newSelection);
-        else
-            pg->DoClearSelection();
-    }
-
-    if ( selectedPage != -1 )
-    {
-        DoSelectPage(selectedPage);
-    }
-
-    if ( vx >= 0 )
-    {
-        pg->Scroll(vx, vy);
-    }
-
-    return res;
-}
-
-#endif  // wxUSE_PROPGRID
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/propgridpagestate.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/propgridpagestate.cpp
deleted file mode 100644
index b178b1b46c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/propgridpagestate.cpp
+++ /dev/null
@@ -1,1967 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/propgrid/propgridpagestate.cpp
-// Purpose:     wxPropertyGridPageState class
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     2008-08-24
-// Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_PROPGRID
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/object.h"
-    #include "wx/hash.h"
-    #include "wx/string.h"
-    #include "wx/log.h"
-    #include "wx/event.h"
-    #include "wx/window.h"
-    #include "wx/panel.h"
-    #include "wx/dc.h"
-    #include "wx/dcmemory.h"
-    #include "wx/pen.h"
-    #include "wx/brush.h"
-    #include "wx/intl.h"
-    #include "wx/stopwatch.h"
-#endif
-
-// This define is necessary to prevent macro clearing
-#define __wxPG_SOURCE_FILE__
-
-#include "wx/propgrid/propgridpagestate.h"
-#include "wx/propgrid/propgrid.h"
-#include "wx/propgrid/editors.h"
-
-#define wxPG_DEFAULT_SPLITTERX      110
-
-
-// -----------------------------------------------------------------------
-// wxPropertyGridIterator
-// -----------------------------------------------------------------------
-
-void wxPropertyGridIteratorBase::Init( wxPropertyGridPageState* state, int flags, wxPGProperty* property, int dir  )
-{
-    wxASSERT( dir == 1 || dir == -1 );
-
-    m_state = state;
-    m_baseParent = state->DoGetRoot();
-    if ( !property && m_baseParent->GetChildCount() )
-        property = m_baseParent->Item(0);
-
-    m_property = property;
-
-    wxPG_ITERATOR_CREATE_MASKS(flags, m_itemExMask, m_parentExMask)
-
-    // Need to skip first?
-    if ( property && (property->GetFlags() & m_itemExMask) )
-    {
-        if ( dir == 1 )
-            Next();
-        else
-            Prev();
-    }
-}
-
-void wxPropertyGridIteratorBase::Init( wxPropertyGridPageState* state, int flags, int startPos, int dir  )
-{
-    wxPGProperty* property = NULL;
-
-    if ( startPos == wxTOP )
-    {
-        if ( dir == 0 )
-            dir = 1;
-    }
-    else if ( startPos == wxBOTTOM )
-    {
-        property = state->GetLastItem(flags);
-        if ( dir == 0 )
-            dir = -1;
-    }
-    else
-    {
-        wxFAIL_MSG("Only supported starting positions are wxTOP and wxBOTTOM");
-    }
-
-    Init( state, flags, property, dir );
-}
-
-void wxPropertyGridIteratorBase::Assign( const wxPropertyGridIteratorBase& it )
-{
-    m_property = it.m_property;
-    m_state = it.m_state;
-    m_baseParent = it.m_baseParent;
-    m_itemExMask = it.m_itemExMask;
-    m_parentExMask = it.m_parentExMask;
-}
-
-void wxPropertyGridIteratorBase::Prev()
-{
-    wxPGProperty* property = m_property;
-    if ( !property )
-        return;
-
-    wxPGProperty* parent = property->GetParent();
-    wxASSERT( parent );
-    unsigned int index = property->GetIndexInParent();
-
-    if ( index > 0 )
-    {
-        // Previous sibling
-        index--;
-
-        property = parent->Item(index);
-
-        // Go to last children?
-        if ( property->GetChildCount() &&
-             wxPG_ITERATOR_PARENTEXMASK_TEST(property, m_parentExMask) )
-        {
-            // First child
-            property = property->Last();
-        }
-    }
-    else
-    {
-        // Up to a parent
-        if ( parent == m_baseParent )
-        {
-            m_property = NULL;
-            return;
-        }
-        else
-        {
-            property = parent;
-        }
-    }
-
-    m_property = property;
-
-    // If property does not match our criteria, skip it
-    if ( property->GetFlags() & m_itemExMask )
-        Prev();
-}
-
-void wxPropertyGridIteratorBase::Next( bool iterateChildren )
-{
-    wxPGProperty* property = m_property;
-    if ( !property )
-        return;
-
-    if ( property->GetChildCount() &&
-         wxPG_ITERATOR_PARENTEXMASK_TEST(property, m_parentExMask) &&
-         iterateChildren )
-    {
-        // First child
-        property = property->Item(0);
-    }
-    else
-    {
-        wxPGProperty* parent = property->GetParent();
-        wxASSERT( parent );
-        unsigned int index = property->GetIndexInParent() + 1;
-
-        if ( index < parent->GetChildCount() )
-        {
-            // Next sibling
-            property = parent->Item(index);
-        }
-        else
-        {
-            // Next sibling of parent
-            if ( parent == m_baseParent )
-            {
-                m_property = NULL;
-            }
-            else
-            {
-                m_property = parent;
-                Next(false);
-            }
-            return;
-        }
-    }
-
-    m_property = property;
-
-    // If property does not match our criteria, skip it
-    if ( property->GetFlags() & m_itemExMask )
-        Next();
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGridPageState
-// -----------------------------------------------------------------------
-
-wxPropertyGridPageState::wxPropertyGridPageState()
-{
-    m_pPropGrid = NULL;
-    m_regularArray.SetParentState(this);
-    m_properties = &m_regularArray;
-    m_abcArray = NULL;
-    m_currentCategory = NULL;
-    m_width = 0;
-    m_virtualHeight = 0;
-    m_lastCaptionBottomnest = 1;
-    m_itemsAdded = 0;
-    m_anyModified = 0;
-    m_vhCalcPending = 0;
-    m_colWidths.push_back( wxPG_DEFAULT_SPLITTERX );
-    m_colWidths.push_back( wxPG_DEFAULT_SPLITTERX );
-    m_fSplitterX = wxPG_DEFAULT_SPLITTERX;
-
-    m_columnProportions.push_back(1);
-    m_columnProportions.push_back(1);
-
-    m_isSplitterPreSet = false;
-    m_dontCenterSplitter = false;
-
-    // By default, we only have the 'value' column editable
-    m_editableColumns.push_back(1);
-}
-
-// -----------------------------------------------------------------------
-
-wxPropertyGridPageState::~wxPropertyGridPageState()
-{
-    delete m_abcArray;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridPageState::InitNonCatMode()
-{
-    if ( !m_abcArray )
-    {
-        m_abcArray = new wxPGRootProperty(wxS(""));
-        m_abcArray->SetParentState(this);
-        m_abcArray->SetFlag(wxPG_PROP_CHILDREN_ARE_COPIES);
-    }
-
-    // Must be called when state::m_properties still points to regularArray.
-    wxPGProperty* oldProperties = m_properties;
-
-    // Must use temp value in state::m_properties for item iteration loop
-    // to run as expected.
-    m_properties = &m_regularArray;
-
-    if ( m_properties->GetChildCount() )
-    {
-        //
-        // Prepare m_abcArray
-        wxPropertyGridIterator it( this, wxPG_ITERATE_PROPERTIES );
-
-        for ( ; !it.AtEnd(); it.Next() )
-        {
-            wxPGProperty* p = it.GetProperty();
-            wxPGProperty* parent = p->GetParent();
-            if ( parent->IsCategory() || parent->IsRoot() )
-            {
-                m_abcArray->DoAddChild(p);
-                p->m_parent = &m_regularArray;
-            }
-        }
-    }
-
-    m_properties = oldProperties;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridPageState::DoClear()
-{
-    if ( m_pPropGrid && m_pPropGrid->GetState() == this  )
-    {
-        m_pPropGrid->ClearSelection(false);
-    }
-    else
-    {
-        m_selection.clear();
-    }
-
-    m_regularArray.Empty();
-    if ( m_abcArray )
-        m_abcArray->Empty();
-
-    m_dictName.clear();
-
-    m_currentCategory = NULL;
-    m_lastCaptionBottomnest = 1;
-    m_itemsAdded = 0;
-
-    m_virtualHeight = 0;
-    m_vhCalcPending = 0;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridPageState::CalculateFontAndBitmapStuff( int WXUNUSED(vspacing) )
-{
-    wxPropertyGrid* propGrid = GetGrid();
-
-    VirtualHeightChanged();
-
-    // Recalculate caption text extents.
-    unsigned int i;
-
-    for ( i=0;iIsCategory() )
-            ((wxPropertyCategory*)p)->CalculateTextExtent(propGrid, propGrid->GetCaptionFont());
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridPageState::SetVirtualWidth( int width )
-{
-    // Sometimes width less than 0 is offered. Let's make things easy for
-    // everybody and deal with it here.
-    if ( width < 0 )
-        width = 0;
-
-    wxPropertyGrid* pg = GetGrid();
-    int gw = pg->GetClientSize().x;
-    if ( width < gw )
-        width = gw;
-
-    m_width = width;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridPageState::OnClientWidthChange( int newWidth, int widthChange, bool fromOnResize )
-{
-    wxPropertyGrid* pg = GetGrid();
-
-    if ( pg->HasVirtualWidth() )
-    {
-        if ( m_width < newWidth )
-            SetVirtualWidth( newWidth );
-
-        CheckColumnWidths(widthChange);
-    }
-    else
-    {
-        SetVirtualWidth( newWidth );
-
-        // This should be done before splitter auto centering
-        // NOTE: Splitter auto-centering is done in this function.
-        if ( !fromOnResize )
-            widthChange = 0;
-        CheckColumnWidths(widthChange);
-
-        if ( !m_isSplitterPreSet && m_dontCenterSplitter )
-        {
-            long timeSinceCreation = (::wxGetLocalTimeMillis() - GetGrid()->m_timeCreated).ToLong();
-
-            // If too long, don't set splitter
-            if ( timeSinceCreation < 250 )
-            {
-                if ( m_properties->GetChildCount() )
-                {
-                    SetSplitterLeft( false );
-                }
-                else
-                {
-                    DoSetSplitterPosition( newWidth / 2 );
-                    m_isSplitterPreSet = false;
-                }
-            }
-        }
-    }
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGridPageState item iteration methods
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridPageState::GetLastItem( int flags )
-{
-    if ( !m_properties->GetChildCount() )
-        return NULL;
-
-    wxPG_ITERATOR_CREATE_MASKS(flags, int itemExMask, int parentExMask)
-
-    // First, get last child of last parent
-    wxPGProperty* pwc = (wxPGProperty*)m_properties->Last();
-    while ( pwc->GetChildCount() &&
-            wxPG_ITERATOR_PARENTEXMASK_TEST(pwc, parentExMask) )
-        pwc = (wxPGProperty*) pwc->Last();
-
-    // Then, if it doesn't fit our criteria, back up until we find something that does
-    if ( pwc->GetFlags() & itemExMask )
-    {
-        wxPropertyGridIterator it( this, flags, pwc );
-        for ( ; !it.AtEnd(); it.Prev() )
-            ;
-        pwc = (wxPGProperty*) it.GetProperty();
-    }
-
-    return pwc;
-}
-
-wxPropertyCategory* wxPropertyGridPageState::GetPropertyCategory( const wxPGProperty* p ) const
-{
-    const wxPGProperty* parent = (const wxPGProperty*)p;
-    const wxPGProperty* grandparent = (const wxPGProperty*)parent->GetParent();
-    do
-    {
-        parent = grandparent;
-        grandparent = (wxPGProperty*)parent->GetParent();
-        if ( parent->IsCategory() && grandparent )
-            return (wxPropertyCategory*)parent;
-    } while ( grandparent );
-
-    return NULL;
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGridPageState GetPropertyXXX methods
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridPageState::GetPropertyByLabel( const wxString& label,
-                                                           wxPGProperty* parent ) const
-{
-
-    size_t i;
-
-    if ( !parent ) parent = (wxPGProperty*) &m_regularArray;
-
-    for ( i=0; iGetChildCount(); i++ )
-    {
-        wxPGProperty* p = parent->Item(i);
-        if ( p->m_label == label )
-            return p;
-        // Check children recursively.
-        if ( p->GetChildCount() )
-        {
-            p = GetPropertyByLabel(label,(wxPGProperty*)p);
-            if ( p )
-                return p;
-        }
-    }
-
-    return NULL;
-}
-
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridPageState::BaseGetPropertyByName( const wxString& name ) const
-{
-    wxPGHashMapS2P::const_iterator it;
-    it = m_dictName.find(name);
-    if ( it != m_dictName.end() )
-        return (wxPGProperty*) it->second;
-    return NULL;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridPageState::DoSetPropertyName( wxPGProperty* p,
-                                                 const wxString& newName )
-{
-    wxCHECK_RET( p, wxT("invalid property id") );
-
-    wxPGProperty* parent = p->GetParent();
-
-    if ( parent->IsCategory() || parent->IsRoot() )
-    {
-        if ( !p->GetBaseName().empty() )
-            m_dictName.erase( p->GetBaseName() );
-        if ( !newName.empty() )
-            m_dictName[newName] = (void*) p;
-    }
-
-    p->DoSetName(newName);
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGridPageState global operations
-// -----------------------------------------------------------------------
-
-// -----------------------------------------------------------------------
-// Item iteration macros
-//   NB: Nowadays only needed for alphabetic/categoric mode switching.
-// -----------------------------------------------------------------------
-
-//#define II_INVALID_I    0x00FFFFFF
-
-#define ITEM_ITERATION_VARIABLES \
-    wxPGProperty* parent; \
-    unsigned int i; \
-    unsigned int iMax;
-
-#define ITEM_ITERATION_INIT_FROM_THE_TOP \
-    parent = m_properties; \
-    i = 0;
-
-#if 0
-#define ITEM_ITERATION_INIT(startparent, startindex, state) \
-    parent = startparent; \
-    i = (unsigned int)startindex; \
-    if ( parent == NULL ) \
-    { \
-        parent = state->m_properties; \
-        i = 0; \
-    }
-#endif
-
-#define ITEM_ITERATION_LOOP_BEGIN \
-    do \
-    { \
-        iMax = parent->GetChildCount(); \
-        while ( i < iMax ) \
-        {  \
-            wxPGProperty* p = parent->Item(i);
-
-#define ITEM_ITERATION_LOOP_END \
-            if ( p->GetChildCount() ) \
-            { \
-                i = 0; \
-                parent = (wxPGProperty*)p; \
-                iMax = parent->GetChildCount(); \
-            } \
-            else \
-                i++; \
-        } \
-        i = parent->m_arrIndex + 1; \
-        parent = parent->m_parent; \
-    } \
-    while ( parent != NULL );
-
-bool wxPropertyGridPageState::EnableCategories( bool enable )
-{
-    //
-    // NB: We can't use wxPropertyGridIterator in this
-    //     function, since it depends on m_arrIndexes,
-    //     which, among other things, is being fixed here.
-    //
-    ITEM_ITERATION_VARIABLES
-
-    if ( enable )
-    {
-        //
-        // Enable categories
-        //
-
-        if ( !IsInNonCatMode() )
-            return false;
-
-        m_properties = &m_regularArray;
-
-        // fix parents, indexes, and depths
-        ITEM_ITERATION_INIT_FROM_THE_TOP
-
-        ITEM_ITERATION_LOOP_BEGIN
-
-            p->m_arrIndex = i;
-
-            p->m_parent = parent;
-
-            // If parent was category, and this is not,
-            // then the depth stays the same.
-            if ( parent->IsCategory() &&
-                 !p->IsCategory() )
-                p->m_depth = parent->m_depth;
-            else
-                p->m_depth = parent->m_depth + 1;
-
-        ITEM_ITERATION_LOOP_END
-
-    }
-    else
-    {
-        //
-        // Disable categories
-        //
-
-        if ( IsInNonCatMode() )
-            return false;
-
-        // Create array, if necessary.
-        if ( !m_abcArray )
-            InitNonCatMode();
-
-        m_properties = m_abcArray;
-
-        // fix parents, indexes, and depths
-        ITEM_ITERATION_INIT_FROM_THE_TOP
-
-        ITEM_ITERATION_LOOP_BEGIN
-
-            p->m_arrIndex = i;
-
-            p->m_parent = parent;
-
-            p->m_depth = parent->m_depth + 1;
-
-        ITEM_ITERATION_LOOP_END
-    }
-
-    VirtualHeightChanged();
-
-    if ( m_pPropGrid->GetState() == this )
-        m_pPropGrid->RecalculateVirtualSize();
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-static int wxPG_SortFunc_ByFunction(wxPGProperty **pp1, wxPGProperty **pp2)
-{
-    wxPGProperty *p1 = *pp1;
-    wxPGProperty *p2 = *pp2;
-    wxPropertyGrid* pg = p1->GetGrid();
-    wxPGSortCallback sortFunction = pg->GetSortFunction();
-    return sortFunction(pg, p1, p2);
-}
-
-static int wxPG_SortFunc_ByLabel(wxPGProperty **pp1, wxPGProperty **pp2)
-{
-    wxPGProperty *p1 = *pp1;
-    wxPGProperty *p2 = *pp2;
-    return p1->GetLabel().CmpNoCase( p2->GetLabel() );
-}
-
-#if 0
-//
-// For wxVector w/ wxUSE_STL=1, you would use code like this instead:
-//
-
-#include 
-
-static bool wxPG_SortFunc_ByFunction(wxPGProperty *p1, wxPGProperty *p2)
-{
-    wxPropertyGrid* pg = p1->GetGrid();
-    wxPGSortCallback sortFunction = pg->GetSortFunction();
-    return sortFunction(pg, p1, p2) < 0;
-}
-
-static bool wxPG_SortFunc_ByLabel(wxPGProperty *p1, wxPGProperty *p2)
-{
-    return p1->GetLabel().CmpNoCase( p2->GetLabel() ) < 0;
-}
-#endif
-
-void wxPropertyGridPageState::DoSortChildren( wxPGProperty* p,
-                                              int flags )
-{
-    if ( !p )
-        p = m_properties;
-
-    // Can only sort items with children
-    if ( !p->GetChildCount() )
-        return;
-
-    // Never sort children of aggregate properties
-    if ( p->HasFlag(wxPG_PROP_AGGREGATE) )
-        return;
-
-    if ( (flags & wxPG_SORT_TOP_LEVEL_ONLY)
-         && !p->IsCategory() && !p->IsRoot() )
-        return;
-
-    if ( GetGrid()->GetSortFunction() )
-        p->m_children.Sort( wxPG_SortFunc_ByFunction );
-    else
-        p->m_children.Sort( wxPG_SortFunc_ByLabel );
-
-#if 0
-    //
-    // For wxVector w/ wxUSE_STL=1, you would use code like this instead:
-    //
-    if ( GetGrid()->GetSortFunction() )
-        std::sort(p->m_children.begin(), p->m_children.end(),
-                  wxPG_SortFunc_ByFunction);
-    else
-        std::sort(p->m_children.begin(), p->m_children.end(),
-                  wxPG_SortFunc_ByLabel);
-#endif
-
-    // Fix indices
-    p->FixIndicesOfChildren();
-
-    if ( flags & wxPG_RECURSE )
-    {
-        // Apply sort recursively
-        for ( unsigned int i=0; iGetChildCount(); i++ )
-            DoSortChildren(p->Item(i), flags);
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridPageState::DoSort( int flags )
-{
-    DoSortChildren( m_properties, flags | wxPG_RECURSE );
-
-    // We used to sort categories as well here also if in non-categorized
-    // mode, but doing would naturally cause child indices to become
-    // corrupted.
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridPageState::PrepareAfterItemsAdded()
-{
-    if ( !m_itemsAdded ) return false;
-
-    wxPropertyGrid* pg = GetGrid();
-
-    m_itemsAdded = 0;
-
-    if ( pg->HasFlag(wxPG_AUTO_SORT) )
-        DoSort(wxPG_SORT_TOP_LEVEL_ONLY);
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGridPageState splitter, column and hittest functions
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridPageState::DoGetItemAtY( int y ) const
-{
-    // Outside?
-    if ( y < 0 )
-        return NULL;
-
-    unsigned int a = 0;
-    return m_properties->GetItemAtY(y, GetGrid()->m_lineHeight, &a);
-}
-
-// -----------------------------------------------------------------------
-
-wxPropertyGridHitTestResult
-wxPropertyGridPageState::HitTest( const wxPoint&pt ) const
-{
-    wxPropertyGridHitTestResult result;
-    result.m_column = HitTestH( pt.x, &result.m_splitter,
-                                &result.m_splitterHitOffset );
-    result.m_property = DoGetItemAtY( pt.y );
-    return result;
-}
-
-// -----------------------------------------------------------------------
-
-// Used by SetSplitterLeft() and DotFitColumns()
-int wxPropertyGridPageState::GetColumnFitWidth(wxClientDC& dc,
-                                           wxPGProperty* pwc,
-                                           unsigned int col,
-                                           bool subProps) const
-{
-    wxPropertyGrid* pg = m_pPropGrid;
-    size_t i;
-    int maxW = 0;
-    int w, h;
-
-    for ( i=0; iGetChildCount(); i++ )
-    {
-        wxPGProperty* p = pwc->Item(i);
-        if ( !p->IsCategory() )
-        {
-            const wxPGCell* cell = NULL;
-            wxString text;
-            p->GetDisplayInfo(col, -1, 0, &text, &cell);
-            dc.GetTextExtent(text, &w, &h);
-            if ( col == 0 )
-                w += ( ((int)p->m_depth-1) * pg->m_subgroup_extramargin );
-
-            // account for the bitmap
-            if ( col == 1 )
-                w += p->GetImageOffset(pg->GetImageRect(p, -1).GetWidth());
-
-
-            w += (wxPG_XBEFORETEXT*2);
-
-            if ( w > maxW )
-                maxW = w;
-        }
-
-        if ( p->GetChildCount() &&
-             ( subProps || p->IsCategory() ) )
-        {
-            w = GetColumnFitWidth( dc, p, col, subProps );
-
-            if ( w > maxW )
-                maxW = w;
-        }
-    }
-
-    return maxW;
-}
-
-int wxPropertyGridPageState::GetColumnFullWidth( wxClientDC &dc, wxPGProperty *p, unsigned int col )
-{
-    if ( p->IsCategory() )
-        return 0;
-
-    const wxPGCell* cell = NULL;
-    wxString text;
-    p->GetDisplayInfo(col, -1, 0, &text, &cell);
-    int w = dc.GetTextExtent(text).x;
-
-    if ( col == 0 )
-        w += (int)p->m_depth * m_pPropGrid->m_subgroup_extramargin;
-
-    // account for the bitmap
-    if ( col == 1 )
-        w += p->GetImageOffset(m_pPropGrid->GetImageRect(p, -1).GetWidth());
-
-    w += (wxPG_XBEFORETEXT*2);
-    return w;
-}
-
-int wxPropertyGridPageState::DoGetSplitterPosition( int splitterColumn ) const
-{
-    int n = GetGrid()->m_marginWidth;
-    int i;
-    for ( i=0; i<=splitterColumn; i++ )
-        n += m_colWidths[i];
-    return n;
-}
-
-int wxPropertyGridPageState::GetColumnMinWidth( int WXUNUSED(column) ) const
-{
-    return wxPG_DRAG_MARGIN;
-}
-
-void wxPropertyGridPageState::PropagateColSizeDec( int column,
-                                                   int decrease,
-                                                   int dir )
-{
-    int origWidth = m_colWidths[column];
-    m_colWidths[column] -= decrease;
-    int min = GetColumnMinWidth(column);
-    int more = 0;
-    if ( m_colWidths[column] < min )
-    {
-        more = decrease - (origWidth - min);
-        m_colWidths[column] = min;
-    }
-
-    //
-    // FIXME: Causes erratic splitter changing, so as a workaround
-    //        disabled if two or less columns.
-
-    if ( m_colWidths.size() <= 2 )
-        return;
-
-    column += dir;
-    if ( more && column < (int)m_colWidths.size() && column >= 0 )
-        PropagateColSizeDec( column, more, dir );
-}
-
-void wxPropertyGridPageState::DoSetSplitterPosition( int newXPos,
-                                                     int splitterColumn,
-                                                     int flags )
-{
-    wxPropertyGrid* pg = GetGrid();
-
-    int adjust = newXPos - DoGetSplitterPosition(splitterColumn);
-
-    if ( !pg->HasVirtualWidth() )
-    {
-        // No virtual width
-        int otherColumn;
-        if ( adjust > 0 )
-        {
-            otherColumn = splitterColumn + 1;
-            if ( otherColumn == (int)m_colWidths.size() )
-                otherColumn = 0;
-            m_colWidths[splitterColumn] += adjust;
-            PropagateColSizeDec( otherColumn, adjust, 1 );
-        }
-        else
-        {
-            otherColumn = splitterColumn + 1;
-            if ( otherColumn == (int)m_colWidths.size() )
-                otherColumn = 0;
-            m_colWidths[otherColumn] -= adjust;
-            PropagateColSizeDec( splitterColumn, -adjust, -1 );
-        }
-    }
-    else
-    {
-        m_colWidths[splitterColumn] += adjust;
-    }
-
-    if ( splitterColumn == 0 )
-        m_fSplitterX = (double) newXPos;
-
-    if ( !(flags & wxPG_SPLITTER_FROM_AUTO_CENTER) &&
-         !(flags & wxPG_SPLITTER_FROM_EVENT) )
-    {
-        // Don't allow initial splitter auto-positioning after this.
-        m_isSplitterPreSet = true;
-
-        CheckColumnWidths();
-    }
-}
-
-// Moves splitter so that all labels are visible, but just.
-void wxPropertyGridPageState::SetSplitterLeft( bool subProps )
-{
-    wxPropertyGrid* pg = GetGrid();
-    wxClientDC dc(pg);
-    dc.SetFont(pg->GetFont());
-
-    int maxW = GetColumnFitWidth(dc, m_properties, 0, subProps);
-
-    if ( maxW > 0 )
-    {
-        maxW += pg->m_marginWidth;
-        DoSetSplitterPosition( maxW );
-    }
-
-    m_dontCenterSplitter = true;
-}
-
-wxSize wxPropertyGridPageState::DoFitColumns( bool WXUNUSED(allowGridResize) )
-{
-    wxPropertyGrid* pg = GetGrid();
-    wxClientDC dc(pg);
-    dc.SetFont(pg->GetFont());
-
-    int marginWidth = pg->m_marginWidth;
-    int accWid = marginWidth;
-    int maxColWidth = 500;
-
-    for ( unsigned int col=0; col < GetColumnCount(); col++ )
-    {
-        int fitWid = GetColumnFitWidth(dc, m_properties, col, true);
-        int colMinWidth = GetColumnMinWidth(col);
-        if ( fitWid < colMinWidth )
-            fitWid = colMinWidth;
-        else if ( fitWid > maxColWidth )
-            fitWid = maxColWidth;
-
-        m_colWidths[col] = fitWid;
-
-        accWid += fitWid;
-    }
-
-    // Expand last one to fill the width
-    int remaining = m_width - accWid;
-    m_colWidths[GetColumnCount()-1] += remaining;
-
-    m_dontCenterSplitter = true;
-
-    int firstSplitterX = marginWidth + m_colWidths[0];
-    m_fSplitterX = (double) firstSplitterX;
-
-    // Don't allow initial splitter auto-positioning after this.
-    if ( pg->GetState() == this )
-    {
-        pg->SetSplitterPosition(firstSplitterX, false);
-        pg->Refresh();
-    }
-
-    int x, y;
-    pg->GetVirtualSize(&x, &y);
-
-    return wxSize(accWid, y);
-}
-
-void wxPropertyGridPageState::CheckColumnWidths( int widthChange )
-{
-    if ( m_width == 0 )
-        return;
-
-    wxPropertyGrid* pg = GetGrid();
-
-    unsigned int i;
-    unsigned int lastColumn = m_colWidths.size() - 1;
-    int width = m_width;
-    int clientWidth = pg->GetClientSize().x;
-
-    //
-    // Column to reduce, if needed. Take last one that exceeds minimum width.
-    int reduceCol = -1;
-
-    wxLogTrace("propgrid",
-               wxS("ColumnWidthCheck (virtualWidth: %i, clientWidth: %i)"),
-               width, clientWidth);
-
-    //
-    // Check min sizes
-    for ( i=0; im_marginWidth;
-    for ( i=0; iHasVirtualWidth(), colsWidth);
-
-    // Then mode-based requirement
-    if ( !pg->HasVirtualWidth() )
-    {
-        int widthHigher = width - colsWidth;
-
-        // Adapt colsWidth to width
-        if ( colsWidth < width )
-        {
-            // Increase column
-            wxLogTrace("propgrid",
-                       wxS("  Adjust last column to %i"),
-                       m_colWidths[lastColumn] + widthHigher);
-            m_colWidths[lastColumn] = m_colWidths[lastColumn] + widthHigher;
-        }
-        else if ( colsWidth > width )
-        {
-            // Reduce column
-            if ( reduceCol != -1 )
-            {
-                wxLogTrace("propgrid",
-                           wxT("  Reduce column %i (by %i)"),
-                           reduceCol, -widthHigher);
-
-                // Reduce widest column, and recheck
-                m_colWidths[reduceCol] = m_colWidths[reduceCol] + widthHigher;
-                CheckColumnWidths();
-            }
-        }
-    }
-    else
-    {
-        // Only check colsWidth against clientWidth
-        if ( colsWidth < clientWidth )
-        {
-            m_colWidths[lastColumn] = m_colWidths[lastColumn] + (clientWidth-colsWidth);
-        }
-
-        m_width = colsWidth;
-
-        // If width changed, recalculate virtual size
-        if ( pg->GetState() == this )
-            pg->RecalculateVirtualSize();
-    }
-
-    for ( i=0; im_width/2);
-            float splitterX;
-
-            if ( m_fSplitterX < 0.0 )
-            {
-                splitterX = centerX;
-            }
-            else if ( widthChange )
-            {
-                //float centerX = float(pg->GetSize().x) * 0.5;
-
-                // Recenter?
-                splitterX = m_fSplitterX + (float(widthChange) * 0.5);
-                float deviation = fabs(centerX - splitterX);
-
-                // If deviating from center, adjust towards it
-                if ( deviation > 20.0 )
-                {
-                    if ( splitterX > centerX)
-                        splitterX -= 2;
-                    else
-                        splitterX += 2;
-                }
-            }
-            else
-            {
-                // No width change, just keep sure we keep splitter position intact
-                splitterX = m_fSplitterX;
-                float deviation = fabs(centerX - splitterX);
-                if ( deviation > 50.0 )
-                {
-                    splitterX = centerX;
-                }
-            }
-
-            DoSetSplitterPosition((int)splitterX, 0,
-                                  wxPG_SPLITTER_FROM_AUTO_CENTER);
-
-            m_fSplitterX = splitterX; // needed to retain accuracy
-        }
-        else
-        {
-            //
-            // Generic re-center code
-            //
-            ResetColumnSizes(wxPG_SPLITTER_FROM_AUTO_CENTER);
-        }
-    }
-}
-
-void wxPropertyGridPageState::ResetColumnSizes( int setSplitterFlags )
-{
-    unsigned int i;
-    // Calculate sum of proportions
-    int psum = 0;
-    for ( i=0; im_width*256) / psum;
-    int cpos = 0;
-
-    // Convert proportion to splitter positions
-    for ( i=0; i<(m_colWidths.size() - 1); i++ )
-    {
-        int cwid = (puwid*m_columnProportions[i]) / 256;
-        cpos += cwid;
-        DoSetSplitterPosition(cpos, i,
-                              setSplitterFlags);
-    }
-}
-
-void wxPropertyGridPageState::SetColumnCount( int colCount )
-{
-    wxASSERT( colCount >= 2 );
-    m_colWidths.SetCount( colCount, wxPG_DRAG_MARGIN );
-    m_columnProportions.SetCount( colCount, 1 );
-    if ( m_colWidths.size() > (unsigned int)colCount )
-        m_colWidths.RemoveAt( m_colWidths.size()-1,
-                              m_colWidths.size() - colCount );
-
-    if ( m_pPropGrid->GetState() == this )
-        m_pPropGrid->RecalculateVirtualSize();
-    else
-        CheckColumnWidths();
-}
-
-void wxPropertyGridPageState::DoSetColumnProportion( unsigned int column,
-                                                 int proportion )
-{
-    wxASSERT_MSG( proportion >= 1,
-                  "Column proportion must 1 or higher" );
-
-    if ( proportion < 1 )
-        proportion = 1;
-
-    while ( m_columnProportions.size() <= column )
-        m_columnProportions.push_back(1);
-
-    m_columnProportions[column] = proportion;
-}
-
-// Returns column index, -1 for margin
-int wxPropertyGridPageState::HitTestH( int x, int* pSplitterHit, int* pSplitterHitOffset ) const
-{
-    int cx = GetGrid()->m_marginWidth;
-    int col = -1;
-    int prevSplitter = -1;
-
-    while ( x > cx )
-    {
-        col++;
-        if ( col >= (int)m_colWidths.size() )
-        {
-            *pSplitterHit = -1;
-            return col;
-        }
-        prevSplitter = cx;
-        cx += m_colWidths[col];
-    }
-
-    // Near prev. splitter
-    if ( col >= 1 )
-    {
-        int diff = x - prevSplitter;
-        if ( abs(diff) < wxPG_SPLITTERX_DETECTMARGIN1 )
-        {
-            *pSplitterHit = col - 1;
-            *pSplitterHitOffset = diff;
-            return col;
-        }
-    }
-
-    // Near next splitter
-    int nextSplitter = cx;
-    if ( col < (int)(m_colWidths.size()-1) )
-    {
-        int diff = x - nextSplitter;
-        if ( abs(diff) < wxPG_SPLITTERX_DETECTMARGIN1 )
-        {
-            *pSplitterHit = col;
-            *pSplitterHitOffset = diff;
-            return col;
-        }
-    }
-
-    *pSplitterHit = -1;
-    return col;
-}
-
-bool wxPropertyGridPageState::ArePropertiesAdjacent( wxPGProperty* prop1,
-                                                     wxPGProperty* prop2,
-                                                     int iterFlags ) const
-{
-    const wxPGProperty* ap1 =
-        wxPropertyGridConstIterator::OneStep(this,
-                                             iterFlags,
-                                             prop1,
-                                             1);
-    if ( ap1 && ap1 == prop2 )
-        return true;
-
-    const wxPGProperty* ap2 =
-        wxPropertyGridConstIterator::OneStep(this,
-                                             iterFlags,
-                                             prop1,
-                                             -1);
-    if ( ap2 && ap2 == prop2 )
-        return true;
-
-    return false;
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGridPageState property value setting and getting
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridPageState::DoSetPropertyValueString( wxPGProperty* p, const wxString& value )
-{
-    if ( p )
-    {
-        int flags = wxPG_REPORT_ERROR|wxPG_FULL_VALUE|wxPG_PROGRAMMATIC_VALUE;
-
-        wxVariant variant = p->GetValueRef();
-        bool res;
-
-        if ( p->GetMaxLength() <= 0 )
-            res = p->StringToValue( variant, value, flags );
-        else
-            res = p->StringToValue( variant, value.Mid(0,p->GetMaxLength()), flags );
-
-        if ( res )
-        {
-            p->SetValue(variant);
-            if ( p == m_pPropGrid->GetSelection() &&
-                 this == m_pPropGrid->GetState() )
-                m_pPropGrid->RefreshEditor();
-        }
-
-        return true;
-    }
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridPageState::DoSetPropertyValue( wxPGProperty* p, wxVariant& value )
-{
-    if ( p )
-    {
-        p->SetValue(value);
-        if ( p == m_pPropGrid->GetSelection() &&
-             this == m_pPropGrid->GetState() )
-            m_pPropGrid->RefreshEditor();
-
-        return true;
-    }
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridPageState::DoSetPropertyValueWxObjectPtr( wxPGProperty* p, wxObject* value )
-{
-    if ( p )
-    {
-        // wnd_primary has to be given so the control can be updated as well.
-        wxVariant v(value);
-        DoSetPropertyValue(p, v);
-        return true;
-    }
-    return false;
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGridPageState property operations
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridPageState::DoIsPropertySelected( wxPGProperty* prop ) const
-{
-    if ( wxPGFindInVector(m_selection, prop) != wxNOT_FOUND )
-        return true;
-
-    return false;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridPageState::DoRemoveFromSelection( wxPGProperty* prop )
-{
-    for ( unsigned int i=0; iGetState() == this )
-            {
-                // If first item (ie. one with the active editor) was
-                // deselected, then we need to take some extra measures.
-                wxArrayPGProperty sel = m_selection;
-                sel.erase( sel.begin() + i );
-
-                wxPGProperty* newFirst;
-                if ( sel.size() )
-                    newFirst = sel[0];
-                else
-                    newFirst = NULL;
-
-                pg->DoSelectProperty(newFirst,
-                                     wxPG_SEL_DONT_SEND_EVENT);
-
-                m_selection = sel;
-
-                pg->Refresh();
-            }
-            else
-            {
-                m_selection.erase( m_selection.begin() + i );
-            }
-            return;
-        }
-    }
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridPageState::DoCollapse( wxPGProperty* p )
-{
-    wxCHECK_MSG( p, false, wxT("invalid property id") );
-
-    if ( !p->GetChildCount() ) return false;
-
-    if ( !p->IsExpanded() ) return false;
-
-    p->SetExpanded(false);
-
-    VirtualHeightChanged();
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridPageState::DoExpand( wxPGProperty* p )
-{
-    wxCHECK_MSG( p, false, wxT("invalid property id") );
-
-    if ( !p->GetChildCount() ) return false;
-
-    if ( p->IsExpanded() ) return false;
-
-    p->SetExpanded(true);
-
-    VirtualHeightChanged();
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridPageState::DoSelectProperty( wxPGProperty* p, unsigned int flags )
-{
-    if ( this == m_pPropGrid->GetState() )
-        return m_pPropGrid->DoSelectProperty( p, flags );
-
-    DoSetSelection(p);
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridPageState::DoHideProperty( wxPGProperty* p, bool hide, int flags )
-{
-    p->DoHide(hide, flags);
-    VirtualHeightChanged();
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGridPageState wxVariant related routines
-// -----------------------------------------------------------------------
-
-// Returns list of wxVariant objects (non-categories and non-sub-properties only).
-// Never includes sub-properties (unless they are parented by wxParentProperty).
-wxVariant wxPropertyGridPageState::DoGetPropertyValues( const wxString& listname,
-                                                    wxPGProperty* baseparent,
-                                                    long flags ) const
-{
-    wxPGProperty* pwc = (wxPGProperty*) baseparent;
-
-    // Root is the default base-parent.
-    if ( !pwc )
-        pwc = m_properties;
-
-    wxVariantList tempList;
-    wxVariant v( tempList, listname );
-
-    if ( pwc->GetChildCount() )
-    {
-        if ( flags & wxPG_KEEP_STRUCTURE )
-        {
-            wxASSERT( !pwc->HasFlag(wxPG_PROP_AGGREGATE) );
-
-            size_t i;
-            for ( i=0; iGetChildCount(); i++ )
-            {
-                wxPGProperty* p = pwc->Item(i);
-                if ( !p->GetChildCount() || p->HasFlag(wxPG_PROP_AGGREGATE) )
-                {
-                    wxVariant variant = p->GetValue();
-                    variant.SetName( p->GetBaseName() );
-                    v.Append( variant );
-                }
-                else
-                {
-                    v.Append( DoGetPropertyValues(p->m_name,p,flags|wxPG_KEEP_STRUCTURE) );
-                }
-                if ( (flags & wxPG_INC_ATTRIBUTES) && p->m_attributes.GetCount() )
-                    v.Append( p->GetAttributesAsList() );
-            }
-        }
-        else
-        {
-            wxPropertyGridConstIterator it( this, wxPG_ITERATE_DEFAULT, pwc->Item(0) );
-            it.SetBaseParent( pwc );
-
-            for ( ; !it.AtEnd(); it.Next() )
-            {
-                const wxPGProperty* p = it.GetProperty();
-
-                // Use a trick to ignore wxParentProperty itself, but not its sub-properties.
-                if ( !p->GetChildCount() || p->HasFlag(wxPG_PROP_AGGREGATE) )
-                {
-                    wxVariant variant = p->GetValue();
-                    variant.SetName( p->GetName() );
-                    v.Append( variant );
-                    if ( (flags & wxPG_INC_ATTRIBUTES) && p->m_attributes.GetCount() )
-                        v.Append( p->GetAttributesAsList() );
-                }
-            }
-        }
-    }
-
-    return v;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridPageState::DoSetPropertyValues( const wxVariantList& list, wxPGProperty* defaultCategory )
-{
-    unsigned char origFrozen = 1;
-
-    if ( m_pPropGrid->GetState() == this )
-    {
-        origFrozen = m_pPropGrid->m_frozen;
-        if ( !origFrozen ) m_pPropGrid->Freeze();
-    }
-
-    wxPropertyCategory* use_category = (wxPropertyCategory*)defaultCategory;
-
-    if ( !use_category )
-        use_category = (wxPropertyCategory*)m_properties;
-
-    // Let's iterate over the list of variants.
-    wxVariantList::const_iterator node;
-    int numSpecialEntries = 0;
-
-    //
-    // Second pass for special entries
-    for ( node = list.begin(); node != list.end(); ++node )
-    {
-        wxVariant *current = (wxVariant*)*node;
-
-        // Make sure it is wxVariant.
-        wxASSERT( current );
-        wxASSERT( wxStrcmp(current->GetClassInfo()->GetClassName(),wxT("wxVariant")) == 0 );
-
-        const wxString& name = current->GetName();
-        if ( !name.empty() )
-        {
-            //
-            // '@' signified a special entry
-            if ( name[0] == wxS('@') )
-            {
-                numSpecialEntries++;
-            }
-            else
-            {
-                wxPGProperty* foundProp = BaseGetPropertyByName(name);
-                if ( foundProp )
-                {
-                    wxPGProperty* p = foundProp;
-
-                    // If it was a list, we still have to go through it.
-                    if ( wxStrcmp(current->GetType(), wxS("list")) == 0 )
-                    {
-                        DoSetPropertyValues( current->GetList(),
-                                p->IsCategory()?p:(NULL)
-                            );
-                    }
-                    else
-                    {
-                        wxASSERT_LEVEL_2_MSG(
-                            wxStrcmp(current->GetType(), p->GetValue().GetType()) == 0,
-                            wxString::Format(
-                                wxS("setting value of property \"%s\" from variant"),
-                                p->GetName().c_str())
-                        );
-
-                        p->SetValue(*current);
-                    }
-                }
-                else
-                {
-                    // Is it list?
-                    if ( current->GetType() != wxS("list") )
-                    {
-                        // Not.
-                    }
-                    else
-                    {
-                        // Yes, it is; create a sub category and append contents there.
-                        wxPGProperty* newCat = DoInsert(use_category,-1,new wxPropertyCategory(current->GetName(),wxPG_LABEL));
-                        DoSetPropertyValues( current->GetList(), newCat );
-                    }
-                }
-            }
-        }
-    }
-
-    if ( numSpecialEntries )
-    {
-        for ( node = list.begin(); node != list.end(); ++node )
-        {
-            wxVariant *current = (wxVariant*)*node;
-
-            const wxString& name = current->GetName();
-            if ( !name.empty() )
-            {
-                //
-                // '@' signified a special entry
-                if ( name[0] == wxS('@') )
-                {
-                    numSpecialEntries--;
-
-                    size_t pos2 = name.rfind(wxS('@'));
-                    if ( pos2 > 0 && pos2 < (name.size()-1) )
-                    {
-                        wxString propName = name.substr(1, pos2-1);
-                        wxString entryType = name.substr(pos2+1, wxString::npos);
-
-                        if ( entryType == wxS("attr") )
-                        {
-                            //
-                            // List of attributes
-                            wxPGProperty* foundProp = BaseGetPropertyByName(propName);
-                            if ( foundProp )
-                            {
-                                wxASSERT( current->GetType() == wxPG_VARIANT_TYPE_LIST );
-
-                                wxVariantList& list2 = current->GetList();
-                                wxVariantList::const_iterator node2;
-
-                                for ( node2 = list2.begin(); node2 != list2.end(); ++node2 )
-                                {
-                                    wxVariant *attr = (wxVariant*)*node2;
-                                    foundProp->SetAttribute( attr->GetName(), *attr );
-                                }
-                            }
-                            else
-                            {
-                                // ERROR: No such property: 'propName'
-                            }
-                        }
-                    }
-                    else
-                    {
-                        // ERROR: Special entry requires name of format @@
-                    }
-                }
-            }
-
-            if ( !numSpecialEntries )
-                break;
-        }
-    }
-
-    if ( !origFrozen )
-    {
-        m_pPropGrid->Thaw();
-
-        if ( this == m_pPropGrid->GetState() )
-            m_pPropGrid->RefreshEditor();
-    }
-
-}
-
-// -----------------------------------------------------------------------
-// wxPropertyGridPageState property adding and removal
-// -----------------------------------------------------------------------
-
-bool wxPropertyGridPageState::PrepareToAddItem( wxPGProperty* property,
-                                                wxPGProperty* scheduledParent )
-{
-    wxPropertyGrid* propGrid = m_pPropGrid;
-
-    // This will allow better behaviour.
-    if ( scheduledParent == m_properties )
-        scheduledParent = NULL;
-
-    if ( scheduledParent && !scheduledParent->IsCategory() )
-    {
-        wxASSERT_MSG( property->GetBaseName().length(),
-                      "Property's children must have unique, non-empty names within their scope" );
-    }
-
-    property->m_parentState = this;
-
-    if ( property->IsCategory() )
-    {
-
-        // Parent of a category must be either root or another category
-        // (otherwise Bad Things might happen).
-        wxASSERT_MSG( scheduledParent == NULL ||
-                      scheduledParent == m_properties ||
-                      scheduledParent->IsCategory(),
-                 wxT("Parent of a category must be either root or another category."));
-
-        // If we already have category with same name, delete given property
-        // and use it instead as most recent caption item.
-        wxPGProperty* found_id = BaseGetPropertyByName( property->GetBaseName() );
-        if ( found_id )
-        {
-            wxPropertyCategory* pwc = (wxPropertyCategory*) found_id;
-            if ( pwc->IsCategory() ) // Must be a category.
-            {
-                delete property;
-                m_currentCategory = pwc;
-                return false;
-            }
-        }
-    }
-
-#if wxDEBUG_LEVEL
-    // Warn for identical names in debug mode.
-    if ( BaseGetPropertyByName(property->GetName()) &&
-         (!scheduledParent || scheduledParent->IsCategory()) )
-    {
-        wxFAIL_MSG(wxString::Format(
-            "wxPropertyGrid item with name \"%s\" already exists",
-            property->GetName()));
-
-        wxPGGlobalVars->m_warnings++;
-    }
-#endif // wxDEBUG_LEVEL
-
-    // NULL parent == root parent
-    if ( !scheduledParent )
-        scheduledParent = DoGetRoot();
-
-    property->m_parent = scheduledParent;
-
-    property->InitAfterAdded(this, propGrid);
-
-    if ( property->IsCategory() )
-    {
-        wxPropertyCategory* pc = wxStaticCast(property, wxPropertyCategory);
-
-        m_currentCategory = pc;
-
-        // Calculate text extent for category caption
-        if ( propGrid )
-            pc->CalculateTextExtent(propGrid, propGrid->GetCaptionFont());
-    }
-
-    return true;
-}
-
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridPageState::DoAppend( wxPGProperty* property )
-{
-    wxPropertyCategory* cur_cat = m_currentCategory;
-    if ( property->IsCategory() )
-        cur_cat = NULL;
-
-    return DoInsert( cur_cat, -1, property );
-}
-
-// -----------------------------------------------------------------------
-
-wxPGProperty* wxPropertyGridPageState::DoInsert( wxPGProperty* parent, int index, wxPGProperty* property )
-{
-    if ( !parent )
-        parent = m_properties;
-
-    wxCHECK_MSG( !parent->HasFlag(wxPG_PROP_AGGREGATE),
-                 wxNullProperty,
-                 wxT("when adding properties to fixed parents, use BeginAddChildren and EndAddChildren.") );
-
-    bool res = PrepareToAddItem( property, (wxPropertyCategory*)parent );
-
-    // PrepareToAddItem() may just decide to use current category
-    // instead of adding new one.
-    if ( !res )
-        return m_currentCategory;
-
-    bool parentIsRoot = parent->IsRoot();
-    bool parentIsCategory = parent->IsCategory();
-
-    // Note that item must be added into current mode later.
-
-    // If parent is wxParentProperty, just stick it in...
-    // If parent is root (m_properties), then...
-    //   In categoric mode: Add as last item in m_abcArray (if not category).
-    //                      Add to given index in m_regularArray.
-    //   In non-cat mode:   Add as last item in m_regularArray.
-    //                      Add to given index in m_abcArray.
-    // If parent is category, then...
-    //   1) Add to given category in given index.
-    //   2) Add as last item in m_abcArray.
-
-    if ( m_properties == &m_regularArray )
-    {
-        // We are currently in Categorized mode
-
-        // Only add non-categories to m_abcArray.
-        if ( m_abcArray && !property->IsCategory() &&
-             (parentIsCategory || parentIsRoot) )
-        {
-            m_abcArray->DoAddChild( property, -1, false );
-        }
-
-        // Add to current mode.
-        parent->DoAddChild( property, index, true );
-    }
-    else
-    {
-        // We are currently in Non-categorized/Alphabetic mode
-
-        if ( parentIsCategory )
-            // Parent is category.
-            parent->DoAddChild( property, index, false );
-        else if ( parentIsRoot )
-            // Parent is root.
-            m_regularArray.DoAddChild( property, -1, false );
-
-        // Add to current mode
-        if ( !property->IsCategory() )
-            m_abcArray->DoAddChild( property, index, true );
-    }
-
-    // category stuff
-    if ( property->IsCategory() )
-    {
-        // This is a category caption item.
-
-        // Last caption is not the bottom one (this info required by append)
-        m_lastCaptionBottomnest = 0;
-    }
-
-    // Only add name to hashmap if parent is root or category
-    if ( !property->m_name.empty() &&
-        (parentIsCategory || parentIsRoot) )
-        m_dictName[property->m_name] = (void*) property;
-
-    VirtualHeightChanged();
-
-    property->UpdateParentValues();
-
-    m_itemsAdded = 1;
-
-    return property;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPropertyGridPageState::DoDelete( wxPGProperty* item, bool doDelete )
-{
-    wxCHECK_RET( item->GetParent(),
-        wxT("this property was already deleted") );
-
-    wxCHECK_RET( item != &m_regularArray && item != m_abcArray,
-        wxT("wxPropertyGrid: Do not attempt to remove the root item.") );
-
-    wxPropertyGrid* pg = GetGrid();
-
-    // Must defer deletion? Yes, if handling a wxPG event.
-    if ( pg && pg->m_processedEvent )
-    {
-        if ( doDelete )
-            pg->m_deletedProperties.push_back(item);
-        else
-            pg->m_removedProperties.push_back(item);
-
-        // Rename the property so it won't remain in the way
-        // of the user code.
-
-        // Let's trust that no sane property uses prefix like
-        // this. It would be anyway fairly inconvenient (in
-        // current code) to check whether a new name is used
-        // by another property with parent (due to the child
-        // name notation).
-        wxString newName = wxS("_&/_%$") + item->GetBaseName();
-        DoSetPropertyName(item, newName);
-
-        return;
-    }
-
-    unsigned int indinparent = item->GetIndexInParent();
-
-    wxPGProperty* pwc = (wxPGProperty*)item;
-    wxPGProperty* parent = item->GetParent();
-
-    wxCHECK_RET( !parent->HasFlag(wxPG_PROP_AGGREGATE),
-        wxT("wxPropertyGrid: Do not attempt to remove sub-properties.") );
-
-    wxASSERT( item->GetParentState() == this );
-
-    if ( DoIsPropertySelected(item) )
-    {
-        if ( pg && pg->GetState() == this )
-        {
-            pg->DoRemoveFromSelection(item,
-                wxPG_SEL_DELETING|wxPG_SEL_NOVALIDATE);
-        }
-        else
-        {
-            DoRemoveFromSelection(item);
-        }
-    }
-
-    item->SetFlag(wxPG_PROP_BEING_DELETED);
-
-    // Delete children
-    if ( item->GetChildCount() && !item->HasFlag(wxPG_PROP_AGGREGATE) )
-    {
-        // deleting a category
-        if ( item->IsCategory() )
-        {
-            if ( pwc == m_currentCategory )
-                m_currentCategory = NULL;
-        }
-
-        item->DeleteChildren();
-    }
-
-    if ( !IsInNonCatMode() )
-    {
-        // categorized mode - non-categorized array
-
-        // Remove from non-cat array
-        if ( !item->IsCategory() &&
-             (parent->IsCategory() || parent->IsRoot()) )
-        {
-            if ( m_abcArray )
-                m_abcArray->RemoveChild(item);
-        }
-
-        // categorized mode - categorized array
-        wxArrayPGProperty& parentsChildren = parent->m_children;
-        parentsChildren.erase( parentsChildren.begin() + indinparent );
-        item->m_parent->FixIndicesOfChildren();
-    }
-    else
-    {
-        // non-categorized mode - categorized array
-
-        // We need to find location of item.
-        wxPGProperty* cat_parent = &m_regularArray;
-        int cat_index = m_regularArray.GetChildCount();
-        size_t i;
-        for ( i = 0; i < m_regularArray.GetChildCount(); i++ )
-        {
-            wxPGProperty* p = m_regularArray.Item(i);
-            if ( p == item ) { cat_index = i; break; }
-            if ( p->IsCategory() )
-            {
-                int subind = ((wxPGProperty*)p)->Index(item);
-                if ( subind != wxNOT_FOUND )
-                {
-                    cat_parent = ((wxPGProperty*)p);
-                    cat_index = subind;
-                    break;
-                }
-            }
-        }
-        cat_parent->m_children.erase(cat_parent->m_children.begin()+cat_index);
-
-        // non-categorized mode - non-categorized array
-        if ( !item->IsCategory() )
-        {
-            wxASSERT( item->m_parent == m_abcArray );
-            wxArrayPGProperty& parentsChildren = item->m_parent->m_children;
-            parentsChildren.erase(parentsChildren.begin() + indinparent);
-            item->m_parent->FixIndicesOfChildren(indinparent);
-        }
-    }
-
-    if ( !item->GetBaseName().empty() &&
-         (parent->IsCategory() || parent->IsRoot()) )
-        m_dictName.erase(item->GetBaseName());
-
-    // We need to clear parent grid's m_propHover, if it matches item
-    if ( pg && pg->m_propHover == item )
-        pg->m_propHover = NULL;
-
-    // Mark the property as 'unattached'
-    item->m_parentState = NULL;
-    item->m_parent = NULL;
-
-    // We can actually delete it now
-    if ( doDelete )
-        delete item;
-    else
-        item->OnDetached(this, pg);
-
-    m_itemsAdded = 1; // Not a logical assignment (but required nonetheless).
-
-    VirtualHeightChanged();
-}
-
-// -----------------------------------------------------------------------
-
-#endif  // wxUSE_PROPGRID
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/props.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/props.cpp
deleted file mode 100644
index 69d136813b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/propgrid/props.cpp
+++ /dev/null
@@ -1,2768 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/propgrid/props.cpp
-// Purpose:     Basic Property Classes
-// Author:      Jaakko Salli
-// Modified by:
-// Created:     2005-05-14
-// Copyright:   (c) Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_PROPGRID
-
-#ifndef WX_PRECOMP
-    #include "wx/defs.h"
-    #include "wx/object.h"
-    #include "wx/hash.h"
-    #include "wx/string.h"
-    #include "wx/log.h"
-    #include "wx/event.h"
-    #include "wx/window.h"
-    #include "wx/panel.h"
-    #include "wx/dc.h"
-    #include "wx/dcclient.h"
-    #include "wx/dcmemory.h"
-    #include "wx/button.h"
-    #include "wx/bmpbuttn.h"
-    #include "wx/pen.h"
-    #include "wx/brush.h"
-    #include "wx/cursor.h"
-    #include "wx/dialog.h"
-    #include "wx/settings.h"
-    #include "wx/msgdlg.h"
-    #include "wx/choice.h"
-    #include "wx/stattext.h"
-    #include "wx/scrolwin.h"
-    #include "wx/dirdlg.h"
-    #include "wx/combobox.h"
-    #include "wx/layout.h"
-    #include "wx/sizer.h"
-    #include "wx/textdlg.h"
-    #include "wx/filedlg.h"
-    #include "wx/intl.h"
-#endif
-
-#include "wx/filename.h"
-
-#include "wx/propgrid/propgrid.h"
-
-#define wxPG_CUSTOM_IMAGE_WIDTH     20 // for wxColourProperty etc.
-
-
-// -----------------------------------------------------------------------
-// wxStringProperty
-// -----------------------------------------------------------------------
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxStringProperty,wxPGProperty,
-                               wxString,const wxString&,TextCtrl)
-
-wxStringProperty::wxStringProperty( const wxString& label,
-                                    const wxString& name,
-                                    const wxString& value )
-    : wxPGProperty(label,name)
-{
-    SetValue(value);
-}
-
-void wxStringProperty::OnSetValue()
-{
-    if ( !m_value.IsNull() && m_value.GetString() == wxS("") )
-        SetFlag(wxPG_PROP_COMPOSED_VALUE);
-
-    if ( HasFlag(wxPG_PROP_COMPOSED_VALUE) )
-    {
-        wxString s;
-        DoGenerateComposedValue(s);
-        m_value = s;
-    }
-}
-
-wxStringProperty::~wxStringProperty() { }
-
-wxString wxStringProperty::ValueToString( wxVariant& value,
-                                          int argFlags ) const
-{
-    wxString s = value.GetString();
-
-    if ( GetChildCount() && HasFlag(wxPG_PROP_COMPOSED_VALUE) )
-    {
-        // Value stored in m_value is non-editable, non-full value
-        if ( (argFlags & wxPG_FULL_VALUE) ||
-             (argFlags & wxPG_EDITABLE_VALUE) ||
-             !s.length() )
-        {
-            // Calling this under incorrect conditions will fail
-            wxASSERT_MSG( argFlags & wxPG_VALUE_IS_CURRENT,
-                          "Sorry, currently default wxPGProperty::ValueToString() "
-                          "implementation only works if value is m_value." );
-
-            DoGenerateComposedValue(s, argFlags);
-        }
-
-        return s;
-    }
-
-    // If string is password and value is for visual purposes,
-    // then return asterisks instead the actual string.
-    if ( (m_flags & wxPG_PROP_PASSWORD) && !(argFlags & (wxPG_FULL_VALUE|wxPG_EDITABLE_VALUE)) )
-        return wxString(wxChar('*'), s.Length());
-
-    return s;
-}
-
-bool wxStringProperty::StringToValue( wxVariant& variant, const wxString& text, int argFlags ) const
-{
-    if ( GetChildCount() && HasFlag(wxPG_PROP_COMPOSED_VALUE) )
-        return wxPGProperty::StringToValue(variant, text, argFlags);
-
-    if ( variant != text )
-    {
-        variant = text;
-        return true;
-    }
-
-    return false;
-}
-
-bool wxStringProperty::DoSetAttribute( const wxString& name, wxVariant& value )
-{
-    if ( name == wxPG_STRING_PASSWORD )
-    {
-        m_flags &= ~(wxPG_PROP_PASSWORD);
-        if ( value.GetLong() ) m_flags |= wxPG_PROP_PASSWORD;
-        RecreateEditor();
-        return false;
-    }
-    return true;
-}
-
-// -----------------------------------------------------------------------
-// wxNumericPropertyValidator
-// -----------------------------------------------------------------------
-
-#if wxUSE_VALIDATORS
-
-wxNumericPropertyValidator::
-    wxNumericPropertyValidator( NumericType numericType, int base )
-    : wxTextValidator(wxFILTER_INCLUDE_CHAR_LIST)
-{
-    wxArrayString arr;
-    arr.Add(wxS("0"));
-    arr.Add(wxS("1"));
-    arr.Add(wxS("2"));
-    arr.Add(wxS("3"));
-    arr.Add(wxS("4"));
-    arr.Add(wxS("5"));
-    arr.Add(wxS("6"));
-    arr.Add(wxS("7"));
-
-    if ( base >= 10 )
-    {
-        arr.Add(wxS("8"));
-        arr.Add(wxS("9"));
-        if ( base >= 16 )
-        {
-            arr.Add(wxS("a")); arr.Add(wxS("A"));
-            arr.Add(wxS("b")); arr.Add(wxS("B"));
-            arr.Add(wxS("c")); arr.Add(wxS("C"));
-            arr.Add(wxS("d")); arr.Add(wxS("D"));
-            arr.Add(wxS("e")); arr.Add(wxS("E"));
-            arr.Add(wxS("f")); arr.Add(wxS("F"));
-        }
-    }
-
-    if ( numericType == Signed )
-    {
-        arr.Add(wxS("+"));
-        arr.Add(wxS("-"));
-    }
-    else if ( numericType == Float )
-    {
-        arr.Add(wxS("+"));
-        arr.Add(wxS("-"));
-        arr.Add(wxS("e"));
-
-        // Use locale-specific decimal point
-        arr.Add(wxString::Format("%g", 1.1)[1]);
-    }
-
-    SetIncludes(arr);
-}
-
-bool wxNumericPropertyValidator::Validate(wxWindow* parent)
-{
-    if ( !wxTextValidator::Validate(parent) )
-        return false;
-
-    wxWindow* wnd = GetWindow();
-    if ( !wxDynamicCast(wnd, wxTextCtrl) )
-        return true;
-
-    // Do not allow zero-length string
-    wxTextCtrl* tc = static_cast(wnd);
-    wxString text = tc->GetValue();
-
-    if ( text.empty() )
-        return false;
-
-    return true;
-}
-
-#endif // wxUSE_VALIDATORS
-
-// -----------------------------------------------------------------------
-// wxIntProperty
-// -----------------------------------------------------------------------
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxIntProperty,wxPGProperty,
-                               long,long,TextCtrl)
-
-wxIntProperty::wxIntProperty( const wxString& label, const wxString& name,
-    long value ) : wxPGProperty(label,name)
-{
-    SetValue(value);
-}
-
-wxIntProperty::wxIntProperty( const wxString& label, const wxString& name,
-    const wxLongLong& value ) : wxPGProperty(label,name)
-{
-    SetValue(WXVARIANT(value));
-}
-
-wxIntProperty::~wxIntProperty() { }
-
-wxString wxIntProperty::ValueToString( wxVariant& value,
-                                       int WXUNUSED(argFlags) ) const
-{
-    if ( value.GetType() == wxPG_VARIANT_TYPE_LONG )
-    {
-        return wxString::Format(wxS("%li"),value.GetLong());
-    }
-    else if ( value.GetType() == wxPG_VARIANT_TYPE_LONGLONG )
-    {
-        wxLongLong ll = value.GetLongLong();
-        return ll.ToString();
-    }
-
-    return wxEmptyString;
-}
-
-bool wxIntProperty::StringToValue( wxVariant& variant, const wxString& text, int argFlags ) const
-{
-    wxString s;
-    long value32;
-
-    if ( text.empty() )
-    {
-        variant.MakeNull();
-        return true;
-    }
-
-    // We know it is a number, but let's still check
-    // the return value.
-    if ( text.IsNumber() )
-    {
-        // Remove leading zeroes, so that the number is not interpreted as octal
-        wxString::const_iterator i = text.begin();
-        wxString::const_iterator iMax = text.end() - 1;  // Let's allow one, last zero though
-
-        int firstNonZeroPos = 0;
-
-        for ( ; i != iMax; ++i )
-        {
-            wxChar c = *i;
-            if ( c != wxS('0') && c != wxS(' ') )
-                break;
-            firstNonZeroPos++;
-        }
-
-        wxString useText = text.substr(firstNonZeroPos, text.length() - firstNonZeroPos);
-
-        wxString variantType = variant.GetType();
-        bool isPrevLong = variantType == wxPG_VARIANT_TYPE_LONG;
-
-        wxLongLong_t value64 = 0;
-
-        if ( useText.ToLongLong(&value64, 10) &&
-             ( value64 >= INT_MAX || value64 <= INT_MIN )
-           )
-        {
-            bool doChangeValue = isPrevLong;
-
-            if ( !isPrevLong && variantType == wxPG_VARIANT_TYPE_LONGLONG )
-            {
-                wxLongLong oldValue = variant.GetLongLong();
-                if ( oldValue.GetValue() != value64 )
-                    doChangeValue = true;
-            }
-
-            if ( doChangeValue )
-            {
-                wxLongLong ll(value64);
-                variant = ll;
-                return true;
-            }
-        }
-
-        if ( useText.ToLong( &value32, 0 ) )
-        {
-            if ( !isPrevLong || variant != value32 )
-            {
-                variant = value32;
-                return true;
-            }
-        }
-    }
-    else if ( argFlags & wxPG_REPORT_ERROR )
-    {
-    }
-    return false;
-}
-
-bool wxIntProperty::IntToValue( wxVariant& variant, int value, int WXUNUSED(argFlags) ) const
-{
-    if ( variant.GetType() != wxPG_VARIANT_TYPE_LONG || variant != (long)value )
-    {
-        variant = (long)value;
-        return true;
-    }
-    return false;
-}
-
-//
-// Common validation code to be called in ValidateValue()
-// implementations.
-//
-// Note that 'value' is reference on purpose, so we can write
-// back to it when mode is wxPG_PROPERTY_VALIDATION_SATURATE.
-//
-template
-bool NumericValidation( const wxPGProperty* property,
-                        T& value,
-                        wxPGValidationInfo* pValidationInfo,
-                        int mode,
-                        const wxString& strFmt )
-{
-    T min = (T) wxINT64_MIN;
-    T max = (T) wxINT64_MAX;
-    wxVariant variant;
-    bool minOk = false;
-    bool maxOk = false;
-
-    variant = property->GetAttribute(wxPGGlobalVars->m_strMin);
-    if ( !variant.IsNull() )
-    {
-        variant.Convert(&min);
-        minOk = true;
-    }
-
-    variant = property->GetAttribute(wxPGGlobalVars->m_strMax);
-    if ( !variant.IsNull() )
-    {
-        variant.Convert(&max);
-        maxOk = true;
-    }
-
-    if ( minOk )
-    {
-        if ( value < min )
-        {
-            if ( mode == wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE )
-            {
-                wxString msg;
-                wxString smin = wxString::Format(strFmt, min);
-                wxString smax = wxString::Format(strFmt, max);
-                if ( !maxOk )
-                    msg = wxString::Format(
-                                _("Value must be %s or higher."),
-                                smin.c_str());
-                else
-                    msg = wxString::Format(
-                                _("Value must be between %s and %s."),
-                                smin.c_str(), smax.c_str());
-                pValidationInfo->SetFailureMessage(msg);
-            }
-            else if ( mode == wxPG_PROPERTY_VALIDATION_SATURATE )
-                value = min;
-            else
-                value = max - (min - value);
-            return false;
-        }
-    }
-
-    if ( maxOk )
-    {
-        if ( value > max )
-        {
-            if ( mode == wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE )
-            {
-                wxString msg;
-                wxString smin = wxString::Format(strFmt, min);
-                wxString smax = wxString::Format(strFmt, max);
-                if ( !minOk )
-                    msg = wxString::Format(
-                                _("Value must be %s or less."),
-                                smax.c_str());
-                else
-                    msg = wxString::Format(
-                                _("Value must be between %s and %s."),
-                                smin.c_str(), smax.c_str());
-                pValidationInfo->SetFailureMessage(msg);
-            }
-            else if ( mode == wxPG_PROPERTY_VALIDATION_SATURATE )
-                value = max;
-            else
-                value = min + (value - max);
-            return false;
-        }
-    }
-    return true;
-}
-
-bool wxIntProperty::DoValidation( const wxPGProperty* property,
-                                  wxLongLong_t& value,
-                                  wxPGValidationInfo* pValidationInfo,
-                                  int mode )
-{
-    return NumericValidation(property,
-                                           value,
-                                           pValidationInfo,
-                                           mode,
-                                           wxS("%lld"));
-}
-
-bool wxIntProperty::ValidateValue( wxVariant& value,
-                                   wxPGValidationInfo& validationInfo ) const
-{
-    wxLongLong_t ll = value.GetLongLong().GetValue();
-    return DoValidation(this, ll, &validationInfo,
-                        wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE);
-}
-
-wxValidator* wxIntProperty::GetClassValidator()
-{
-#if wxUSE_VALIDATORS
-    WX_PG_DOGETVALIDATOR_ENTRY()
-
-    wxValidator* validator = new wxNumericPropertyValidator(
-                                    wxNumericPropertyValidator::Signed);
-
-    WX_PG_DOGETVALIDATOR_EXIT(validator)
-#else
-    return NULL;
-#endif
-}
-
-wxValidator* wxIntProperty::DoGetValidator() const
-{
-    return GetClassValidator();
-}
-
-// -----------------------------------------------------------------------
-// wxUIntProperty
-// -----------------------------------------------------------------------
-
-enum
-{
-    wxPG_UINT_HEX_LOWER,
-    wxPG_UINT_HEX_LOWER_PREFIX,
-    wxPG_UINT_HEX_LOWER_DOLLAR,
-    wxPG_UINT_HEX_UPPER,
-    wxPG_UINT_HEX_UPPER_PREFIX,
-    wxPG_UINT_HEX_UPPER_DOLLAR,
-    wxPG_UINT_DEC,
-    wxPG_UINT_OCT,
-    wxPG_UINT_TEMPLATE_MAX
-};
-
-static const wxChar* const gs_uintTemplates32[wxPG_UINT_TEMPLATE_MAX] = {
-    wxT("%lx"),wxT("0x%lx"),wxT("$%lx"),
-    wxT("%lX"),wxT("0x%lX"),wxT("$%lX"),
-    wxT("%lu"),wxT("%lo")
-};
-
-static const char* const gs_uintTemplates64[wxPG_UINT_TEMPLATE_MAX] = {
-    "%" wxLongLongFmtSpec "x",
-    "0x%" wxLongLongFmtSpec "x",
-    "$%" wxLongLongFmtSpec "x",
-    "%" wxLongLongFmtSpec "X",
-    "0x%" wxLongLongFmtSpec "X",
-    "$%" wxLongLongFmtSpec "X",
-    "%" wxLongLongFmtSpec "u",
-    "%" wxLongLongFmtSpec "o"
-};
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxUIntProperty,wxPGProperty,
-                               long,unsigned long,TextCtrl)
-
-void wxUIntProperty::Init()
-{
-    m_base = wxPG_UINT_DEC;
-    m_realBase = 10;
-    m_prefix = wxPG_PREFIX_NONE;
-}
-
-wxUIntProperty::wxUIntProperty( const wxString& label, const wxString& name,
-    unsigned long value ) : wxPGProperty(label,name)
-{
-    Init();
-    SetValue((long)value);
-}
-
-wxUIntProperty::wxUIntProperty( const wxString& label, const wxString& name,
-    const wxULongLong& value ) : wxPGProperty(label,name)
-{
-    Init();
-    SetValue(WXVARIANT(value));
-}
-
-wxUIntProperty::~wxUIntProperty() { }
-
-wxString wxUIntProperty::ValueToString( wxVariant& value,
-                                        int WXUNUSED(argFlags) ) const
-{
-    size_t index = m_base + m_prefix;
-    if ( index >= wxPG_UINT_TEMPLATE_MAX )
-        index = wxPG_UINT_DEC;
-
-    if ( value.GetType() == wxPG_VARIANT_TYPE_LONG )
-    {
-        return wxString::Format(gs_uintTemplates32[index],
-                                (unsigned long)value.GetLong());
-    }
-
-    wxULongLong ull = value.GetULongLong();
-
-    return wxString::Format(gs_uintTemplates64[index], ull.GetValue());
-}
-
-bool wxUIntProperty::StringToValue( wxVariant& variant, const wxString& text, int WXUNUSED(argFlags) ) const
-{
-    wxString variantType = variant.GetType();
-    bool isPrevLong = variantType == wxPG_VARIANT_TYPE_LONG;
-
-    if ( text.empty() )
-    {
-        variant.MakeNull();
-        return true;
-    }
-
-    size_t start = 0;
-    if ( text[0] == wxS('$') )
-        start++;
-
-    wxULongLong_t value64 = 0;
-    wxString s = text.substr(start, text.length() - start);
-
-    if ( s.ToULongLong(&value64, (unsigned int)m_realBase) )
-    {
-        if ( value64 >= LONG_MAX )
-        {
-            bool doChangeValue = isPrevLong;
-
-            if ( !isPrevLong && variantType == wxPG_VARIANT_TYPE_ULONGLONG )
-            {
-                wxULongLong oldValue = variant.GetULongLong();
-                if ( oldValue.GetValue() != value64 )
-                    doChangeValue = true;
-            }
-
-            if ( doChangeValue )
-            {
-                variant = wxULongLong(value64);
-                return true;
-            }
-        }
-        else
-        {
-            unsigned long value32 = wxLongLong(value64).GetLo();
-            if ( !isPrevLong || m_value != (long)value32 )
-            {
-                variant = (long)value32;
-                return true;
-            }
-        }
-
-    }
-    return false;
-}
-
-bool wxUIntProperty::IntToValue( wxVariant& variant, int number, int WXUNUSED(argFlags) ) const
-{
-    if ( variant != (long)number )
-    {
-        variant = (long)number;
-        return true;
-    }
-    return false;
-}
-
-bool wxUIntProperty::ValidateValue( wxVariant& value, wxPGValidationInfo& validationInfo ) const
-{
-    wxULongLong_t uul = value.GetULongLong().GetValue();
-    return
-    NumericValidation(this,
-                                     uul,
-                                     &validationInfo,
-                                     wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE,
-                                     wxS("%llu"));
-}
-
-wxValidator* wxUIntProperty::DoGetValidator() const
-{
-#if wxUSE_VALIDATORS
-    WX_PG_DOGETVALIDATOR_ENTRY()
-
-    wxValidator* validator = new wxNumericPropertyValidator(
-                                    wxNumericPropertyValidator::Unsigned,
-                                    m_realBase);
-
-    WX_PG_DOGETVALIDATOR_EXIT(validator)
-#else
-    return NULL;
-#endif
-}
-
-bool wxUIntProperty::DoSetAttribute( const wxString& name, wxVariant& value )
-{
-    if ( name == wxPG_UINT_BASE )
-    {
-        int val = value.GetLong();
-
-        m_realBase = (wxByte) val;
-        if ( m_realBase > 16 )
-            m_realBase = 16;
-
-        //
-        // Translate logical base to a template array index
-        m_base = wxPG_UINT_OCT;
-        if ( val == wxPG_BASE_HEX )
-            m_base = wxPG_UINT_HEX_UPPER;
-        else if ( val == wxPG_BASE_DEC )
-            m_base = wxPG_UINT_DEC;
-        else if ( val == wxPG_BASE_HEXL )
-            m_base = wxPG_UINT_HEX_LOWER_DOLLAR;
-        return true;
-    }
-    else if ( name == wxPG_UINT_PREFIX )
-    {
-        m_prefix = (wxByte) value.GetLong();
-        return true;
-    }
-    return false;
-}
-
-// -----------------------------------------------------------------------
-// wxFloatProperty
-// -----------------------------------------------------------------------
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxFloatProperty,wxPGProperty,
-                               double,double,TextCtrl)
-
-wxFloatProperty::wxFloatProperty( const wxString& label,
-                                            const wxString& name,
-                                            double value )
-    : wxPGProperty(label,name)
-{
-    m_precision = -1;
-    SetValue(value);
-}
-
-wxFloatProperty::~wxFloatProperty() { }
-
-// This helper method provides standard way for floating point-using
-// properties to convert values to string.
-const wxString& wxPropertyGrid::DoubleToString(wxString& target,
-                                               double value,
-                                               int precision,
-                                               bool removeZeroes,
-                                               wxString* precTemplate)
-{
-    if ( precision >= 0 )
-    {
-        wxString text1;
-        if (!precTemplate)
-            precTemplate = &text1;
-
-        if ( precTemplate->empty() )
-        {
-            *precTemplate = wxS("%.");
-            *precTemplate << wxString::Format( wxS("%i"), precision );
-            *precTemplate << wxS('f');
-        }
-
-        target.Printf( precTemplate->c_str(), value );
-    }
-    else
-    {
-        target.Printf( wxS("%f"), value );
-    }
-
-    if ( removeZeroes && precision != 0 && !target.empty() )
-    {
-        // Remove excess zeroes (do not remove this code just yet,
-        // since sprintf can't do the same consistently across platforms).
-        wxString::const_iterator i = target.end() - 1;
-        size_t new_len = target.length() - 1;
-
-        for ( ; i != target.begin(); --i )
-        {
-            if ( *i != wxS('0') )
-                break;
-            new_len--;
-        }
-
-        wxChar cur_char = *i;
-        if ( cur_char != wxS('.') && cur_char != wxS(',') )
-            new_len++;
-
-        if ( new_len != target.length() )
-            target.resize(new_len);
-    }
-
-    // Remove sign from zero
-    if ( target.length() >= 2 && target[0] == wxS('-') )
-    {
-        bool isZero = true;
-        wxString::const_iterator i = target.begin() + 1;
-
-        for ( ; i != target.end(); i++ )
-        {
-            if ( *i != wxS('0') && *i != wxS('.') && *i != wxS(',') )
-            {
-                isZero = false;
-                break;
-            }
-        }
-
-        if ( isZero )
-            target.erase(target.begin());
-    }
-
-    return target;
-}
-
-wxString wxFloatProperty::ValueToString( wxVariant& value,
-                                         int argFlags ) const
-{
-    wxString text;
-    if ( !value.IsNull() )
-    {
-        wxPropertyGrid::DoubleToString(text,
-                                       value,
-                                       m_precision,
-                                       !(argFlags & wxPG_FULL_VALUE),
-                                       NULL);
-    }
-    return text;
-}
-
-bool wxFloatProperty::StringToValue( wxVariant& variant, const wxString& text, int argFlags ) const
-{
-    wxString s;
-    double value;
-
-    if ( text.empty() )
-    {
-        variant.MakeNull();
-        return true;
-    }
-
-    bool res = text.ToDouble(&value);
-    if ( res )
-    {
-        if ( variant != value )
-        {
-            variant = value;
-            return true;
-        }
-    }
-    else if ( argFlags & wxPG_REPORT_ERROR )
-    {
-    }
-    return false;
-}
-
-bool wxFloatProperty::DoValidation( const wxPGProperty* property,
-                                    double& value,
-                                    wxPGValidationInfo* pValidationInfo,
-                                    int mode )
-{
-    return NumericValidation(property,
-                                     value,
-                                     pValidationInfo,
-                                     mode,
-                                     wxS("%g"));
-}
-
-bool
-wxFloatProperty::ValidateValue( wxVariant& value,
-                                wxPGValidationInfo& validationInfo ) const
-{
-    double fpv = value.GetDouble();
-    return DoValidation(this, fpv, &validationInfo,
-                        wxPG_PROPERTY_VALIDATION_ERROR_MESSAGE);
-}
-
-bool wxFloatProperty::DoSetAttribute( const wxString& name, wxVariant& value )
-{
-    if ( name == wxPG_FLOAT_PRECISION )
-    {
-        m_precision = value.GetLong();
-        return true;
-    }
-    return false;
-}
-
-wxValidator*
-wxFloatProperty::GetClassValidator()
-{
-#if wxUSE_VALIDATORS
-    WX_PG_DOGETVALIDATOR_ENTRY()
-
-    wxValidator* validator = new wxNumericPropertyValidator(
-                                    wxNumericPropertyValidator::Float);
-
-    WX_PG_DOGETVALIDATOR_EXIT(validator)
-#else
-    return NULL;
-#endif
-}
-
-wxValidator* wxFloatProperty::DoGetValidator() const
-{
-    return GetClassValidator();
-}
-
-// -----------------------------------------------------------------------
-// wxBoolProperty
-// -----------------------------------------------------------------------
-
-// We cannot use standard WX_PG_IMPLEMENT_PROPERTY_CLASS macro, since
-// there is a custom GetEditorClass.
-
-IMPLEMENT_DYNAMIC_CLASS(wxBoolProperty, wxPGProperty)
-
-const wxPGEditor* wxBoolProperty::DoGetEditorClass() const
-{
-    // Select correct editor control.
-#if wxPG_INCLUDE_CHECKBOX
-    if ( !(m_flags & wxPG_PROP_USE_CHECKBOX) )
-        return wxPGEditor_Choice;
-    return wxPGEditor_CheckBox;
-#else
-    return wxPGEditor_Choice;
-#endif
-}
-
-wxBoolProperty::wxBoolProperty( const wxString& label, const wxString& name, bool value ) :
-    wxPGProperty(label,name)
-{
-    m_choices.Assign(wxPGGlobalVars->m_boolChoices);
-
-    SetValue(wxPGVariant_Bool(value));
-
-    m_flags |= wxPG_PROP_USE_DCC;
-}
-
-wxBoolProperty::~wxBoolProperty() { }
-
-wxString wxBoolProperty::ValueToString( wxVariant& value,
-                                        int argFlags ) const
-{
-    bool boolValue = value.GetBool();
-
-    // As a fragment of composite string value,
-    // make it a little more readable.
-    if ( argFlags & wxPG_COMPOSITE_FRAGMENT )
-    {
-        if ( boolValue )
-        {
-            return m_label;
-        }
-        else
-        {
-            if ( argFlags & wxPG_UNEDITABLE_COMPOSITE_FRAGMENT )
-                return wxEmptyString;
-
-            wxString notFmt;
-            if ( wxPGGlobalVars->m_autoGetTranslation )
-                notFmt = _("Not %s");
-            else
-                notFmt = wxS("Not %s");
-
-            return wxString::Format(notFmt.c_str(), m_label.c_str());
-        }
-    }
-
-    if ( !(argFlags & wxPG_FULL_VALUE) )
-    {
-        return wxPGGlobalVars->m_boolChoices[boolValue?1:0].GetText();
-    }
-
-    wxString text;
-
-    if ( boolValue ) text = wxS("true");
-    else text = wxS("false");
-
-    return text;
-}
-
-bool wxBoolProperty::StringToValue( wxVariant& variant, const wxString& text, int WXUNUSED(argFlags) ) const
-{
-    bool boolValue = false;
-    if ( text.CmpNoCase(wxPGGlobalVars->m_boolChoices[1].GetText()) == 0 ||
-         text.CmpNoCase(wxS("true")) == 0 ||
-         text.CmpNoCase(m_label) == 0 )
-        boolValue = true;
-
-    if ( text.empty() )
-    {
-        variant.MakeNull();
-        return true;
-    }
-
-    if ( variant != boolValue )
-    {
-        variant = wxPGVariant_Bool(boolValue);
-        return true;
-    }
-    return false;
-}
-
-bool wxBoolProperty::IntToValue( wxVariant& variant, int value, int ) const
-{
-    bool boolValue = value ? true : false;
-
-    if ( variant != boolValue )
-    {
-        variant = wxPGVariant_Bool(boolValue);
-        return true;
-    }
-    return false;
-}
-
-bool wxBoolProperty::DoSetAttribute( const wxString& name, wxVariant& value )
-{
-#if wxPG_INCLUDE_CHECKBOX
-    if ( name == wxPG_BOOL_USE_CHECKBOX )
-    {
-        if ( value.GetLong() )
-            m_flags |= wxPG_PROP_USE_CHECKBOX;
-        else
-            m_flags &= ~(wxPG_PROP_USE_CHECKBOX);
-        return true;
-    }
-#endif
-    if ( name == wxPG_BOOL_USE_DOUBLE_CLICK_CYCLING )
-    {
-        if ( value.GetLong() )
-            m_flags |= wxPG_PROP_USE_DCC;
-        else
-            m_flags &= ~(wxPG_PROP_USE_DCC);
-        return true;
-    }
-    return false;
-}
-
-// -----------------------------------------------------------------------
-// wxEnumProperty
-// -----------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxEnumProperty, wxPGProperty)
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS_PLAIN(wxEnumProperty,long,Choice)
-
-wxEnumProperty::wxEnumProperty( const wxString& label, const wxString& name, const wxChar* const* labels,
-    const long* values, int value ) : wxPGProperty(label,name)
-{
-    SetIndex(0);
-
-    if ( labels )
-    {
-        m_choices.Add(labels,values);
-
-        if ( GetItemCount() )
-            SetValue( (long)value );
-    }
-}
-
-wxEnumProperty::wxEnumProperty( const wxString& label, const wxString& name, const wxChar* const* labels,
-    const long* values, wxPGChoices* choicesCache, int value )
-    : wxPGProperty(label,name)
-{
-    SetIndex(0);
-
-    wxASSERT( choicesCache );
-
-    if ( choicesCache->IsOk() )
-    {
-        m_choices.Assign( *choicesCache );
-        m_value = wxPGVariant_Zero;
-    }
-    else if ( labels )
-    {
-        m_choices.Add(labels,values);
-
-        if ( GetItemCount() )
-            SetValue( (long)value );
-    }
-}
-
-wxEnumProperty::wxEnumProperty( const wxString& label, const wxString& name,
-    const wxArrayString& labels, const wxArrayInt& values, int value )
-    : wxPGProperty(label,name)
-{
-    SetIndex(0);
-
-    if ( &labels && labels.size() )
-    {
-        m_choices.Set(labels, values);
-
-        if ( GetItemCount() )
-            SetValue( (long)value );
-    }
-}
-
-wxEnumProperty::wxEnumProperty( const wxString& label, const wxString& name,
-    wxPGChoices& choices, int value )
-    : wxPGProperty(label,name)
-{
-    m_choices.Assign( choices );
-
-    if ( GetItemCount() )
-        SetValue( (long)value );
-}
-
-int wxEnumProperty::GetIndexForValue( int value ) const
-{
-    if ( !m_choices.IsOk() )
-        return -1;
-
-    int intVal = m_choices.Index(value);
-    if ( intVal >= 0 )
-        return intVal;
-
-    return value;
-}
-
-wxEnumProperty::~wxEnumProperty ()
-{
-}
-
-int wxEnumProperty::ms_nextIndex = -2;
-
-void wxEnumProperty::OnSetValue()
-{
-    wxString variantType = m_value.GetType();
-
-    if ( variantType == wxPG_VARIANT_TYPE_LONG )
-    {
-        ValueFromInt_( m_value, m_value.GetLong(), wxPG_FULL_VALUE );
-    }
-    else if ( variantType == wxPG_VARIANT_TYPE_STRING )
-    {
-        ValueFromString_( m_value, m_value.GetString(), 0 );
-    }
-    else
-    {
-        wxFAIL;
-    }
-
-    if ( ms_nextIndex != -2 )
-    {
-        m_index = ms_nextIndex;
-        ms_nextIndex = -2;
-    }
-}
-
-bool wxEnumProperty::ValidateValue( wxVariant& value, wxPGValidationInfo& WXUNUSED(validationInfo) ) const
-{
-    // Make sure string value is in the list,
-    // unless property has string as preferred value type
-    // To reduce code size, use conversion here as well
-    if ( value.GetType() == wxPG_VARIANT_TYPE_STRING &&
-         !wxDynamicCastThis(wxEditEnumProperty) )
-        return ValueFromString_( value, value.GetString(), wxPG_PROPERTY_SPECIFIC );
-
-    return true;
-}
-
-wxString wxEnumProperty::ValueToString( wxVariant& value,
-                                            int WXUNUSED(argFlags) ) const
-{
-    if ( value.GetType() == wxPG_VARIANT_TYPE_STRING )
-        return value.GetString();
-
-    int index = m_choices.Index(value.GetLong());
-    if ( index < 0 )
-        return wxEmptyString;
-
-    return m_choices.GetLabel(index);
-}
-
-bool wxEnumProperty::StringToValue( wxVariant& variant, const wxString& text, int argFlags ) const
-{
-    return ValueFromString_( variant, text, argFlags );
-}
-
-bool wxEnumProperty::IntToValue( wxVariant& variant, int intVal, int argFlags ) const
-{
-    return ValueFromInt_( variant, intVal, argFlags );
-}
-
-bool wxEnumProperty::ValueFromString_( wxVariant& value, const wxString& text, int argFlags ) const
-{
-    int useIndex = -1;
-    long useValue = 0;
-
-    for ( unsigned int i=0; iIsKindOf(wxCLASSINFO(wxEditEnumProperty));
-
-    // If text not any of the choices, store as text instead
-    // (but only if we are wxEditEnumProperty)
-    if ( useIndex == -1 && isEdit )
-    {
-        asText = true;
-    }
-
-    int setAsNextIndex = -2;
-
-    if ( asText )
-    {
-        setAsNextIndex = -1;
-        value = text;
-    }
-    else if ( useIndex != GetIndex() )
-    {
-        if ( useIndex != -1 )
-        {
-            setAsNextIndex = useIndex;
-            value = (long)useValue;
-        }
-        else
-        {
-            setAsNextIndex = -1;
-            value = wxPGVariant_MinusOne;
-        }
-    }
-
-    if ( setAsNextIndex != -2 )
-    {
-        // If wxPG_PROPERTY_SPECIFIC is set, then this is done for
-        // validation purposes only, and index must not be changed
-        if ( !(argFlags & wxPG_PROPERTY_SPECIFIC) )
-            ms_nextIndex = setAsNextIndex;
-
-        if ( isEdit || setAsNextIndex != -1 )
-            return true;
-        else
-            return false;
-    }
-    return false;
-}
-
-bool wxEnumProperty::ValueFromInt_( wxVariant& variant, int intVal, int argFlags ) const
-{
-    // If wxPG_FULL_VALUE is *not* in argFlags, then intVal is index from combo box.
-    //
-    int setAsNextIndex = -2;
-
-    if ( argFlags & wxPG_FULL_VALUE )
-    {
-        setAsNextIndex = GetIndexForValue( intVal );
-    }
-    else
-    {
-        if ( intVal != GetIndex() )
-        {
-           setAsNextIndex = intVal;
-        }
-    }
-
-    if ( setAsNextIndex != -2 )
-    {
-        // If wxPG_PROPERTY_SPECIFIC is set, then this is done for
-        // validation or fetching a data purposes only, and index must not be changed.
-        if ( !(argFlags & wxPG_PROPERTY_SPECIFIC) )
-            ms_nextIndex = setAsNextIndex;
-
-        if ( !(argFlags & wxPG_FULL_VALUE) )
-            intVal = m_choices.GetValue(intVal);
-
-        variant = (long)intVal;
-
-        return true;
-    }
-
-    return false;
-}
-
-void
-wxEnumProperty::OnValidationFailure( wxVariant& WXUNUSED(pendingValue) )
-{
-    // Revert index
-    ResetNextIndex();
-}
-
-void wxEnumProperty::SetIndex( int index )
-{
-    ms_nextIndex = -2;
-    m_index = index;
-}
-
-int wxEnumProperty::GetIndex() const
-{
-    if ( m_value.IsNull() )
-        return -1;
-
-    if ( ms_nextIndex != -2 )
-        return ms_nextIndex;
-
-    return m_index;
-}
-
-// -----------------------------------------------------------------------
-// wxEditEnumProperty
-// -----------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxEditEnumProperty, wxPGProperty)
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS_PLAIN(wxEditEnumProperty,wxString,ComboBox)
-
-wxEditEnumProperty::wxEditEnumProperty( const wxString& label, const wxString& name, const wxChar* const* labels,
-    const long* values, const wxString& value )
-    : wxEnumProperty(label,name,labels,values,0)
-{
-    SetValue( value );
-}
-
-wxEditEnumProperty::wxEditEnumProperty( const wxString& label, const wxString& name, const wxChar* const* labels,
-    const long* values, wxPGChoices* choicesCache, const wxString& value )
-    : wxEnumProperty(label,name,labels,values,choicesCache,0)
-{
-    SetValue( value );
-}
-
-wxEditEnumProperty::wxEditEnumProperty( const wxString& label, const wxString& name,
-    const wxArrayString& labels, const wxArrayInt& values, const wxString& value )
-    : wxEnumProperty(label,name,labels,values,0)
-{
-    SetValue( value );
-}
-
-wxEditEnumProperty::wxEditEnumProperty( const wxString& label, const wxString& name,
-    wxPGChoices& choices, const wxString& value )
-    : wxEnumProperty(label,name,choices,0)
-{
-    SetValue( value );
-}
-
-wxEditEnumProperty::~wxEditEnumProperty()
-{
-}
-
-// -----------------------------------------------------------------------
-// wxFlagsProperty
-// -----------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxFlagsProperty,wxPGProperty)
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS_PLAIN(wxFlagsProperty,long,TextCtrl)
-
-void wxFlagsProperty::Init()
-{
-    long value = m_value;
-
-    //
-    // Generate children
-    //
-    unsigned int i;
-
-    unsigned int prevChildCount = m_children.size();
-
-    int oldSel = -1;
-    if ( prevChildCount )
-    {
-        wxPropertyGridPageState* state = GetParentState();
-
-        // State safety check (it may be NULL in immediate parent)
-        wxASSERT( state );
-
-        if ( state )
-        {
-            wxPGProperty* selected = state->GetSelection();
-            if ( selected )
-            {
-                if ( selected->GetParent() == this )
-                    oldSel = selected->GetIndexInParent();
-                else if ( selected == this )
-                    oldSel = -2;
-            }
-        }
-        state->DoClearSelection();
-    }
-
-    // Delete old children
-    for ( i=0; im_autoGetTranslation )
-            {
-                boolProp = new wxBoolProperty( ::wxGetTranslation(label), label, child_val );
-            }
-            else
-        #endif
-            {
-                boolProp = new wxBoolProperty( label, label, child_val );
-            }
-            if ( attrUseCheckBox )
-                boolProp->SetAttribute(wxPG_BOOL_USE_CHECKBOX,
-                                       true);
-            if ( attrUseDCC )
-                boolProp->SetAttribute(wxPG_BOOL_USE_DOUBLE_CLICK_CYCLING,
-                                       true);
-            AddPrivateChild(boolProp);
-        }
-
-        m_oldChoicesData = m_choices.GetDataPtr();
-    }
-
-    m_oldValue = m_value;
-
-    if ( prevChildCount )
-        SubPropsChanged(oldSel);
-}
-
-wxFlagsProperty::wxFlagsProperty( const wxString& label, const wxString& name,
-    const wxChar* const* labels, const long* values, long value ) : wxPGProperty(label,name)
-{
-    m_oldChoicesData = NULL;
-
-    if ( labels )
-    {
-        m_choices.Set(labels,values);
-
-        wxASSERT( GetItemCount() );
-
-        SetValue( value );
-    }
-    else
-    {
-        m_value = wxPGVariant_Zero;
-    }
-}
-
-wxFlagsProperty::wxFlagsProperty( const wxString& label, const wxString& name,
-        const wxArrayString& labels, const wxArrayInt& values, int value )
-    : wxPGProperty(label,name)
-{
-    m_oldChoicesData = NULL;
-
-    if ( &labels && labels.size() )
-    {
-        m_choices.Set(labels,values);
-
-        wxASSERT( GetItemCount() );
-
-        SetValue( (long)value );
-    }
-    else
-    {
-        m_value = wxPGVariant_Zero;
-    }
-}
-
-wxFlagsProperty::wxFlagsProperty( const wxString& label, const wxString& name,
-    wxPGChoices& choices, long value )
-    : wxPGProperty(label,name)
-{
-    m_oldChoicesData = NULL;
-
-    if ( choices.IsOk() )
-    {
-        m_choices.Assign(choices);
-
-        wxASSERT( GetItemCount() );
-
-        SetValue( value );
-    }
-    else
-    {
-        m_value = wxPGVariant_Zero;
-    }
-}
-
-wxFlagsProperty::~wxFlagsProperty()
-{
-}
-
-void wxFlagsProperty::OnSetValue()
-{
-    if ( !m_choices.IsOk() || !GetItemCount() )
-    {
-        m_value = wxPGVariant_Zero;
-    }
-    else
-    {
-        long val = m_value.GetLong();
-
-        long fullFlags = 0;
-
-        // normalize the value (i.e. remove extra flags)
-        unsigned int i;
-        const wxPGChoices& choices = m_choices;
-        for ( i = 0; i < GetItemCount(); i++ )
-        {
-            fullFlags |= choices.GetValue(i);
-        }
-
-        val &= fullFlags;
-
-        m_value = val;
-
-        // Need to (re)init now?
-        if ( GetChildCount() != GetItemCount() ||
-             m_choices.GetDataPtr() != m_oldChoicesData )
-        {
-            Init();
-        }
-    }
-
-    long newFlags = m_value;
-
-    if ( newFlags != m_oldValue )
-    {
-        // Set child modified states
-        unsigned int i;
-        const wxPGChoices& choices = m_choices;
-        for ( i = 0; iChangeFlag( wxPG_PROP_MODIFIED, true );
-        }
-
-        m_oldValue = newFlags;
-    }
-}
-
-wxString wxFlagsProperty::ValueToString( wxVariant& value,
-                                         int WXUNUSED(argFlags) ) const
-{
-    wxString text;
-
-    if ( !m_choices.IsOk() )
-        return text;
-
-    long flags = value;
-    unsigned int i;
-    const wxPGChoices& choices = m_choices;
-
-    for ( i = 0; i < GetItemCount(); i++ )
-    {
-        int doAdd;
-        doAdd = ( (flags & choices.GetValue(i)) == choices.GetValue(i) );
-
-        if ( doAdd )
-        {
-            text += choices.GetLabel(i);
-            text += wxS(", ");
-        }
-    }
-
-    // remove last comma
-    if ( text.Len() > 1 )
-        text.Truncate ( text.Len() - 2 );
-
-    return text;
-}
-
-// Translate string into flag tokens
-bool wxFlagsProperty::StringToValue( wxVariant& variant, const wxString& text, int ) const
-{
-    if ( !m_choices.IsOk() )
-        return false;
-
-    long newFlags = 0;
-
-    // semicolons are no longer valid delimeters
-    WX_PG_TOKENIZER1_BEGIN(text,wxS(','))
-
-        if ( !token.empty() )
-        {
-            // Determine which one it is
-            long bit = IdToBit( token );
-
-            if ( bit != -1 )
-            {
-                // Changed?
-                newFlags |= bit;
-            }
-            else
-            {
-                break;
-            }
-        }
-
-    WX_PG_TOKENIZER1_END()
-
-    if ( variant != (long)newFlags )
-    {
-        variant = (long)newFlags;
-        return true;
-    }
-
-    return false;
-}
-
-// Converts string id to a relevant bit.
-long wxFlagsProperty::IdToBit( const wxString& id ) const
-{
-    unsigned int i;
-    for ( i = 0; i < GetItemCount(); i++ )
-    {
-        if ( id == GetLabel(i) )
-        {
-            return m_choices.GetValue(i);
-        }
-    }
-    return -1;
-}
-
-void wxFlagsProperty::RefreshChildren()
-{
-    if ( !m_choices.IsOk() || !GetChildCount() ) return;
-
-    int flags = m_value.GetLong();
-
-    const wxPGChoices& choices = m_choices;
-    unsigned int i;
-    for ( i = 0; i < GetItemCount(); i++ )
-    {
-        long flag;
-
-        flag = choices.GetValue(i);
-
-        long subVal = flags & flag;
-        wxPGProperty* p = Item(i);
-
-        if ( subVal != (m_oldValue & flag) )
-            p->ChangeFlag( wxPG_PROP_MODIFIED, true );
-
-        p->SetValue( subVal == flag?true:false );
-    }
-
-    m_oldValue = flags;
-}
-
-wxVariant wxFlagsProperty::ChildChanged( wxVariant& thisValue,
-                                         int childIndex,
-                                         wxVariant& childValue ) const
-{
-    long oldValue = thisValue.GetLong();
-    long val = childValue.GetLong();
-    unsigned long vi = m_choices.GetValue(childIndex);
-
-    if ( val )
-        return (long) (oldValue | vi);
-
-    return (long) (oldValue & ~(vi));
-}
-
-bool wxFlagsProperty::DoSetAttribute( const wxString& name, wxVariant& value )
-{
-    if ( name == wxPG_BOOL_USE_CHECKBOX ||
-         name == wxPG_BOOL_USE_DOUBLE_CLICK_CYCLING )
-    {
-        for ( size_t i=0; iSetAttribute(name, value);
-        }
-        // Must return false so that the attribute is stored in
-        // flag property's actual property storage
-        return false;
-    }
-    return false;
-}
-
-// -----------------------------------------------------------------------
-// wxDirProperty
-// -----------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxDirProperty, wxLongStringProperty)
-
-wxDirProperty::wxDirProperty( const wxString& name, const wxString& label, const wxString& value )
-  : wxLongStringProperty(name,label,value)
-{
-    m_flags |= wxPG_PROP_NO_ESCAPE;
-}
-
-wxDirProperty::~wxDirProperty() { }
-
-wxValidator* wxDirProperty::DoGetValidator() const
-{
-    return wxFileProperty::GetClassValidator();
-}
-
-bool wxDirProperty::OnButtonClick( wxPropertyGrid* propGrid, wxString& value )
-{
-    // Update property value from editor, if necessary
-    wxSize dlg_sz(300,400);
-
-    wxString dlgMessage(m_dlgMessage);
-    if ( dlgMessage.empty() )
-        dlgMessage = _("Choose a directory:");
-    wxDirDialog dlg( propGrid,
-                     dlgMessage,
-                     value,
-                     0,
-#if !wxPG_SMALL_SCREEN
-                     propGrid->GetGoodEditorDialogPosition(this,dlg_sz),
-                     dlg_sz
-#else
-                     wxDefaultPosition,
-                     wxDefaultSize
-#endif
-                    );
-
-    if ( dlg.ShowModal() == wxID_OK )
-    {
-        value = dlg.GetPath();
-        return true;
-    }
-    return false;
-}
-
-bool wxDirProperty::DoSetAttribute( const wxString& name, wxVariant& value )
-{
-    if ( name == wxPG_DIR_DIALOG_MESSAGE )
-    {
-        m_dlgMessage = value.GetString();
-        return true;
-    }
-    return false;
-}
-
-// -----------------------------------------------------------------------
-// wxPGFileDialogAdapter
-// -----------------------------------------------------------------------
-
-bool wxPGFileDialogAdapter::DoShowDialog( wxPropertyGrid* propGrid, wxPGProperty* property )
-{
-    wxFileProperty* fileProp = NULL;
-    wxString path;
-    int indFilter = -1;
-
-    if ( wxDynamicCast(property, wxFileProperty) )
-    {
-        fileProp = ((wxFileProperty*)property);
-        wxFileName filename = fileProp->GetValue().GetString();
-        path = filename.GetPath();
-        indFilter = fileProp->m_indFilter;
-
-        if ( path.empty() && !fileProp->m_basePath.empty() )
-            path = fileProp->m_basePath;
-    }
-    else
-    {
-        wxFileName fn(property->GetValue().GetString());
-        path = fn.GetPath();
-    }
-
-    wxFileDialog dlg( propGrid->GetPanel(),
-                      property->GetAttribute(wxS("DialogTitle"), _("Choose a file")),
-                      property->GetAttribute(wxS("InitialPath"), path),
-                      wxEmptyString,
-                      property->GetAttribute(wxPG_FILE_WILDCARD, wxALL_FILES),
-                      property->GetAttributeAsLong(wxPG_FILE_DIALOG_STYLE, 0),
-                      wxDefaultPosition );
-
-    if ( indFilter >= 0 )
-        dlg.SetFilterIndex( indFilter );
-
-    if ( dlg.ShowModal() == wxID_OK )
-    {
-        if ( fileProp )
-            fileProp->m_indFilter = dlg.GetFilterIndex();
-        SetValue( dlg.GetPath() );
-        return true;
-    }
-    return false;
-}
-
-// -----------------------------------------------------------------------
-// wxFileProperty
-// -----------------------------------------------------------------------
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxFileProperty,wxPGProperty,
-                               wxString,const wxString&,TextCtrlAndButton)
-
-wxFileProperty::wxFileProperty( const wxString& label, const wxString& name,
-    const wxString& value ) : wxPGProperty(label,name)
-{
-    m_flags |= wxPG_PROP_SHOW_FULL_FILENAME;
-    m_indFilter = -1;
-    SetAttribute( wxPG_FILE_WILDCARD, wxALL_FILES);
-
-    SetValue(value);
-}
-
-wxFileProperty::~wxFileProperty() {}
-
-wxValidator* wxFileProperty::GetClassValidator()
-{
-#if wxUSE_VALIDATORS
-    WX_PG_DOGETVALIDATOR_ENTRY()
-
-    // Atleast wxPython 2.6.2.1 required that the string argument is given
-    static wxString v;
-    wxTextValidator* validator = new wxTextValidator(wxFILTER_EXCLUDE_CHAR_LIST,&v);
-
-    wxArrayString exChars;
-    exChars.Add(wxS("?"));
-    exChars.Add(wxS("*"));
-    exChars.Add(wxS("|"));
-    exChars.Add(wxS("<"));
-    exChars.Add(wxS(">"));
-    exChars.Add(wxS("\""));
-
-    validator->SetExcludes(exChars);
-
-    WX_PG_DOGETVALIDATOR_EXIT(validator)
-#else
-    return NULL;
-#endif
-}
-
-wxValidator* wxFileProperty::DoGetValidator() const
-{
-    return GetClassValidator();
-}
-
-void wxFileProperty::OnSetValue()
-{
-    const wxString& fnstr = m_value.GetString();
-
-    wxFileName filename = fnstr;
-
-    if ( !filename.HasName() )
-    {
-        m_value = wxPGVariant_EmptyString;
-    }
-
-    // Find index for extension.
-    if ( m_indFilter < 0 && !fnstr.empty() )
-    {
-        wxString ext = filename.GetExt();
-        int curind = 0;
-        size_t pos = 0;
-        size_t len = m_wildcard.length();
-
-        pos = m_wildcard.find(wxS("|"), pos);
-        while ( pos != wxString::npos && pos < (len-3) )
-        {
-            size_t ext_begin = pos + 3;
-
-            pos = m_wildcard.find(wxS("|"), ext_begin);
-            if ( pos == wxString::npos )
-                pos = len;
-            wxString found_ext = m_wildcard.substr(ext_begin, pos-ext_begin);
-
-            if ( !found_ext.empty() )
-            {
-                if ( found_ext[0] == wxS('*') )
-                {
-                    m_indFilter = curind;
-                    break;
-                }
-                if ( ext.CmpNoCase(found_ext) == 0 )
-                {
-                    m_indFilter = curind;
-                    break;
-                }
-            }
-
-            if ( pos != len )
-                pos = m_wildcard.find(wxS("|"), pos+1);
-
-            curind++;
-        }
-    }
-}
-
-wxFileName wxFileProperty::GetFileName() const
-{
-    wxFileName filename;
-
-    if ( !m_value.IsNull() )
-        filename = m_value.GetString();
-
-    return filename;
-}
-
-wxString wxFileProperty::ValueToString( wxVariant& value,
-                                        int argFlags ) const
-{
-    wxFileName filename = value.GetString();
-
-    if ( !filename.HasName() )
-        return wxEmptyString;
-
-    wxString fullName = filename.GetFullName();
-    if ( fullName.empty() )
-        return wxEmptyString;
-
-    if ( argFlags & wxPG_FULL_VALUE )
-    {
-        return filename.GetFullPath();
-    }
-    else if ( m_flags & wxPG_PROP_SHOW_FULL_FILENAME )
-    {
-        if ( !m_basePath.empty() )
-        {
-            wxFileName fn2(filename);
-            fn2.MakeRelativeTo(m_basePath);
-            return fn2.GetFullPath();
-        }
-        return filename.GetFullPath();
-    }
-
-    return filename.GetFullName();
-}
-
-wxPGEditorDialogAdapter* wxFileProperty::GetEditorDialog() const
-{
-    return new wxPGFileDialogAdapter();
-}
-
-bool wxFileProperty::StringToValue( wxVariant& variant, const wxString& text, int argFlags ) const
-{
-    wxFileName filename = variant.GetString();
-
-    if ( (m_flags & wxPG_PROP_SHOW_FULL_FILENAME) || (argFlags & wxPG_FULL_VALUE) )
-    {
-        if ( filename != text )
-        {
-            variant = text;
-            return true;
-        }
-    }
-    else
-    {
-        if ( filename.GetFullName() != text )
-        {
-            wxFileName fn = filename;
-            fn.SetFullName(text);
-            variant = fn.GetFullPath();
-            return true;
-        }
-    }
-
-    return false;
-}
-
-bool wxFileProperty::DoSetAttribute( const wxString& name, wxVariant& value )
-{
-    // Return false on some occasions to make sure those attribs will get
-    // stored in m_attributes.
-    if ( name == wxPG_FILE_SHOW_FULL_PATH )
-    {
-        if ( value.GetLong() )
-            m_flags |= wxPG_PROP_SHOW_FULL_FILENAME;
-        else
-            m_flags &= ~(wxPG_PROP_SHOW_FULL_FILENAME);
-        return true;
-    }
-    else if ( name == wxPG_FILE_WILDCARD )
-    {
-        m_wildcard = value.GetString();
-    }
-    else if ( name == wxPG_FILE_SHOW_RELATIVE_PATH )
-    {
-        m_basePath = value.GetString();
-
-        // Make sure wxPG_FILE_SHOW_FULL_PATH is also set
-        m_flags |= wxPG_PROP_SHOW_FULL_FILENAME;
-    }
-    else if ( name == wxPG_FILE_INITIAL_PATH )
-    {
-        m_initialPath = value.GetString();
-        return true;
-    }
-    else if ( name == wxPG_FILE_DIALOG_TITLE )
-    {
-        m_dlgTitle = value.GetString();
-        return true;
-    }
-    return false;
-}
-
-// -----------------------------------------------------------------------
-// wxPGLongStringDialogAdapter
-// -----------------------------------------------------------------------
-
-bool wxPGLongStringDialogAdapter::DoShowDialog( wxPropertyGrid* propGrid, wxPGProperty* property )
-{
-    wxString val1 = property->GetValueAsString(0);
-    wxString val_orig = val1;
-
-    wxString value;
-    if ( !property->HasFlag(wxPG_PROP_NO_ESCAPE) )
-        wxPropertyGrid::ExpandEscapeSequences(value, val1);
-    else
-        value = wxString(val1);
-
-    // Run editor dialog.
-    if ( wxLongStringProperty::DisplayEditorDialog(property, propGrid, value) )
-    {
-        if ( !property->HasFlag(wxPG_PROP_NO_ESCAPE) )
-            wxPropertyGrid::CreateEscapeSequences(val1,value);
-        else
-            val1 = value;
-
-        if ( val1 != val_orig )
-        {
-            SetValue( val1 );
-            return true;
-        }
-    }
-    return false;
-}
-
-// -----------------------------------------------------------------------
-// wxLongStringProperty
-// -----------------------------------------------------------------------
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxLongStringProperty,wxPGProperty,
-                               wxString,const wxString&,TextCtrlAndButton)
-
-wxLongStringProperty::wxLongStringProperty( const wxString& label, const wxString& name,
-    const wxString& value ) : wxPGProperty(label,name)
-{
-    SetValue(value);
-}
-
-wxLongStringProperty::~wxLongStringProperty() {}
-
-wxString wxLongStringProperty::ValueToString( wxVariant& value,
-                                              int WXUNUSED(argFlags) ) const
-{
-    return value;
-}
-
-bool wxLongStringProperty::OnEvent( wxPropertyGrid* propGrid, wxWindow* WXUNUSED(primary),
-                                    wxEvent& event )
-{
-    if ( propGrid->IsMainButtonEvent(event) )
-    {
-        // Update the value
-        wxVariant useValue = propGrid->GetUncommittedPropertyValue();
-
-        wxString val1 = useValue.GetString();
-        wxString val_orig = val1;
-
-        wxString value;
-        if ( !(m_flags & wxPG_PROP_NO_ESCAPE) )
-            wxPropertyGrid::ExpandEscapeSequences(value,val1);
-        else
-            value = wxString(val1);
-
-        // Run editor dialog.
-        if ( OnButtonClick(propGrid,value) )
-        {
-            if ( !(m_flags & wxPG_PROP_NO_ESCAPE) )
-                wxPropertyGrid::CreateEscapeSequences(val1,value);
-            else
-                val1 = value;
-
-            if ( val1 != val_orig )
-            {
-                SetValueInEvent( val1 );
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-bool wxLongStringProperty::OnButtonClick( wxPropertyGrid* propGrid, wxString& value )
-{
-    return DisplayEditorDialog(this, propGrid, value);
-}
-
-bool wxLongStringProperty::DisplayEditorDialog( wxPGProperty* prop, wxPropertyGrid* propGrid, wxString& value )
-
-{
-    // launch editor dialog
-    wxDialog* dlg = new wxDialog(propGrid,-1,prop->GetLabel(),wxDefaultPosition,wxDefaultSize,
-                                 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxCLIP_CHILDREN);
-
-    dlg->SetFont(propGrid->GetFont()); // To allow entering chars of the same set as the propGrid
-
-    // Multi-line text editor dialog.
-#if !wxPG_SMALL_SCREEN
-    const int spacing = 8;
-#else
-    const int spacing = 4;
-#endif
-    wxBoxSizer* topsizer = new wxBoxSizer( wxVERTICAL );
-    wxBoxSizer* rowsizer = new wxBoxSizer( wxHORIZONTAL );
-    wxTextCtrl* ed = new wxTextCtrl(dlg,11,value,
-        wxDefaultPosition,wxDefaultSize,wxTE_MULTILINE);
-
-    rowsizer->Add( ed, 1, wxEXPAND|wxALL, spacing );
-    topsizer->Add( rowsizer, 1, wxEXPAND, 0 );
-
-    wxStdDialogButtonSizer* buttonSizer = new wxStdDialogButtonSizer();
-    buttonSizer->AddButton(new wxButton(dlg, wxID_OK));
-    buttonSizer->AddButton(new wxButton(dlg, wxID_CANCEL));
-    buttonSizer->Realize();
-    topsizer->Add( buttonSizer, 0,
-                   wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL|wxBOTTOM|wxRIGHT,
-                   spacing );
-
-    dlg->SetSizer( topsizer );
-    topsizer->SetSizeHints( dlg );
-
-#if !wxPG_SMALL_SCREEN
-    dlg->SetSize(400,300);
-
-    dlg->Move( propGrid->GetGoodEditorDialogPosition(prop,dlg->GetSize()) );
-#endif
-
-    int res = dlg->ShowModal();
-
-    if ( res == wxID_OK )
-    {
-        value = ed->GetValue();
-        dlg->Destroy();
-        return true;
-    }
-    dlg->Destroy();
-    return false;
-}
-
-bool wxLongStringProperty::StringToValue( wxVariant& variant, const wxString& text, int ) const
-{
-    if ( variant != text )
-    {
-        variant = text;
-        return true;
-    }
-    return false;
-}
-
-#if wxUSE_EDITABLELISTBOX
-
-// -----------------------------------------------------------------------
-// wxPGArrayEditorDialog
-// -----------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(wxPGArrayEditorDialog, wxDialog)
-    EVT_IDLE(wxPGArrayEditorDialog::OnIdle)
-END_EVENT_TABLE()
-
-IMPLEMENT_ABSTRACT_CLASS(wxPGArrayEditorDialog, wxDialog)
-
-#include "wx/editlbox.h"
-#include "wx/listctrl.h"
-
-// -----------------------------------------------------------------------
-
-void wxPGArrayEditorDialog::OnIdle(wxIdleEvent& event)
-{
-    // Repair focus - wxEditableListBox has bitmap buttons, which
-    // get focus, and lose focus (into the oblivion) when they
-    // become disabled due to change in control state.
-
-    wxWindow* lastFocused = m_lastFocused;
-    wxWindow* focus = ::wxWindow::FindFocus();
-
-    // If last focused control became disabled, set focus back to
-    // wxEditableListBox
-    if ( lastFocused && focus != lastFocused &&
-         lastFocused->GetParent() == m_elbSubPanel &&
-         !lastFocused->IsEnabled() )
-    {
-        m_elb->GetListCtrl()->SetFocus();
-    }
-
-    m_lastFocused = focus;
-
-    event.Skip();
-}
-
-// -----------------------------------------------------------------------
-
-wxPGArrayEditorDialog::wxPGArrayEditorDialog()
-    : wxDialog()
-{
-    Init();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPGArrayEditorDialog::Init()
-{
-    m_lastFocused = NULL;
-    m_hasCustomNewAction = false;
-    m_itemPendingAtIndex = -1;
-}
-
-// -----------------------------------------------------------------------
-
-wxPGArrayEditorDialog::wxPGArrayEditorDialog( wxWindow *parent,
-                                          const wxString& message,
-                                          const wxString& caption,
-                                          long style,
-                                          const wxPoint& pos,
-                                          const wxSize& sz )
-    : wxDialog()
-{
-    Init();
-    Create(parent,message,caption,style,pos,sz);
-}
-
-// -----------------------------------------------------------------------
-
-bool wxPGArrayEditorDialog::Create( wxWindow *parent,
-                                  const wxString& message,
-                                  const wxString& caption,
-                                  long style,
-                                  const wxPoint& pos,
-                                  const wxSize& sz )
-{
-    // On wxMAC the dialog shows incorrectly if style is not exactly wxCAPTION
-    // FIXME: This should be only a temporary fix.
-#ifdef __WXMAC__
-    wxUnusedVar(style);
-    int useStyle = wxCAPTION;
-#else
-    int useStyle = style;
-#endif
-
-    bool res = wxDialog::Create(parent, wxID_ANY, caption, pos, sz, useStyle);
-
-    SetFont(parent->GetFont()); // To allow entering chars of the same set as the propGrid
-
-#if !wxPG_SMALL_SCREEN
-    const int spacing = 4;
-#else
-    const int spacing = 3;
-#endif
-
-    m_modified = false;
-
-    wxBoxSizer* topsizer = new wxBoxSizer( wxVERTICAL );
-
-    // Message
-    if ( !message.empty() )
-        topsizer->Add( new wxStaticText(this,-1,message),
-            0, wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL|wxALL, spacing );
-
-    m_elb = new wxEditableListBox(this, wxID_ANY, message,
-                                  wxDefaultPosition,
-                                  wxDefaultSize,
-                                  wxEL_ALLOW_NEW |
-                                  wxEL_ALLOW_EDIT |
-                                  wxEL_ALLOW_DELETE);
-
-    // Populate the list box
-    wxArrayString arr;
-    for ( unsigned int i=0; iSetStrings(arr);
-
-    // Connect event handlers
-    wxButton* but;
-    wxListCtrl* lc = m_elb->GetListCtrl();
-
-    but = m_elb->GetNewButton();
-    m_elbSubPanel = but->GetParent();
-    but->Connect(but->GetId(), wxEVT_BUTTON,
-        wxCommandEventHandler(wxPGArrayEditorDialog::OnAddClick),
-        NULL, this);
-
-    but = m_elb->GetDelButton();
-    but->Connect(but->GetId(), wxEVT_BUTTON,
-        wxCommandEventHandler(wxPGArrayEditorDialog::OnDeleteClick),
-        NULL, this);
-
-    but = m_elb->GetUpButton();
-    but->Connect(but->GetId(), wxEVT_BUTTON,
-        wxCommandEventHandler(wxPGArrayEditorDialog::OnUpClick),
-        NULL, this);
-
-    but = m_elb->GetDownButton();
-    but->Connect(but->GetId(), wxEVT_BUTTON,
-        wxCommandEventHandler(wxPGArrayEditorDialog::OnDownClick),
-        NULL, this);
-
-    lc->Connect(lc->GetId(), wxEVT_LIST_END_LABEL_EDIT,
-        wxListEventHandler(wxPGArrayEditorDialog::OnEndLabelEdit),
-        NULL, this);
-
-    topsizer->Add( m_elb, 1, wxEXPAND, spacing );
-
-    // Standard dialog buttons
-    wxStdDialogButtonSizer* buttonSizer = new wxStdDialogButtonSizer();
-    buttonSizer->AddButton(new wxButton(this, wxID_OK));
-    buttonSizer->AddButton(new wxButton(this, wxID_CANCEL));
-    buttonSizer->Realize();
-    topsizer->Add( buttonSizer, 0,
-                   wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL|wxALL,
-                   spacing );
-
-    m_elb->SetFocus();
-
-    SetSizer( topsizer );
-    topsizer->SetSizeHints( this );
-
-#if !wxPG_SMALL_SCREEN
-    if ( sz.x == wxDefaultSize.x &&
-         sz.y == wxDefaultSize.y )
-        SetSize( wxSize(275,360) );
-    else
-        SetSize(sz);
-#endif
-
-    return res;
-}
-
-// -----------------------------------------------------------------------
-
-int wxPGArrayEditorDialog::GetSelection() const
-{
-    wxListCtrl* lc = m_elb->GetListCtrl();
-
-    int index = lc->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-    if ( index == -1 )
-        return wxNOT_FOUND;
-
-    return index;
-}
-
-// -----------------------------------------------------------------------
-
-void wxPGArrayEditorDialog::OnAddClick(wxCommandEvent& event)
-{
-    wxListCtrl* lc = m_elb->GetListCtrl();
-    int newItemIndex = lc->GetItemCount() - 1;
-
-    if ( m_hasCustomNewAction )
-    {
-        wxString str;
-        if ( OnCustomNewAction(&str) )
-        {
-            if ( ArrayInsert(str, newItemIndex) )
-            {
-                lc->InsertItem(newItemIndex, str);
-                m_modified = true;
-            }
-        }
-
-        // Do *not* skip the event! We do not want the wxEditableListBox
-        // to do anything.
-    }
-    else
-    {
-        m_itemPendingAtIndex = newItemIndex;
-
-        event.Skip();
-    }
-}
-
-// -----------------------------------------------------------------------
-
-void wxPGArrayEditorDialog::OnDeleteClick(wxCommandEvent& event)
-{
-    int index = GetSelection();
-    if ( index >= 0 )
-    {
-        ArrayRemoveAt( index );
-        m_modified = true;
-    }
-
-    event.Skip();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPGArrayEditorDialog::OnUpClick(wxCommandEvent& event)
-{
-    int index = GetSelection();
-    if ( index > 0 )
-    {
-        ArraySwap(index-1,index);
-        m_modified = true;
-    }
-
-    event.Skip();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPGArrayEditorDialog::OnDownClick(wxCommandEvent& event)
-{
-    wxListCtrl* lc = m_elb->GetListCtrl();
-    int index = GetSelection();
-    int lastStringIndex = lc->GetItemCount() - 1;
-    if ( index >= 0 && index < lastStringIndex )
-    {
-        ArraySwap(index, index+1);
-        m_modified = true;
-    }
-
-    event.Skip();
-}
-
-// -----------------------------------------------------------------------
-
-void wxPGArrayEditorDialog::OnEndLabelEdit(wxListEvent& event)
-{
-    wxString str = event.GetLabel();
-
-    if ( m_itemPendingAtIndex >= 0 )
-    {
-        // Add a new item
-        if ( ArrayInsert(str, m_itemPendingAtIndex) )
-        {
-            m_modified = true;
-        }
-        else
-        {
-            // Editable list box doesn't really respect Veto(), but
-            // it recognizes if no text was added, so we simulate
-            // Veto() using it.
-            event.m_item.SetText(wxEmptyString);
-            m_elb->GetListCtrl()->SetItemText(m_itemPendingAtIndex,
-                                              wxEmptyString);
-
-            event.Veto();
-        }
-    }
-    else
-    {
-        // Change an existing item
-        int index = GetSelection();
-        wxASSERT( index != wxNOT_FOUND );
-        if ( ArraySet(index, str) )
-            m_modified = true;
-        else
-            event.Veto();
-    }
-
-    event.Skip();
-}
-
-#endif // wxUSE_EDITABLELISTBOX
-
-// -----------------------------------------------------------------------
-// wxPGArrayStringEditorDialog
-// -----------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxPGArrayStringEditorDialog, wxPGArrayEditorDialog)
-
-BEGIN_EVENT_TABLE(wxPGArrayStringEditorDialog, wxPGArrayEditorDialog)
-END_EVENT_TABLE()
-
-// -----------------------------------------------------------------------
-
-wxString wxPGArrayStringEditorDialog::ArrayGet( size_t index )
-{
-    return m_array[index];
-}
-
-size_t wxPGArrayStringEditorDialog::ArrayGetCount()
-{
-    return m_array.size();
-}
-
-bool wxPGArrayStringEditorDialog::ArrayInsert( const wxString& str, int index )
-{
-    if (index<0)
-        m_array.Add(str);
-    else
-        m_array.Insert(str,index);
-    return true;
-}
-
-bool wxPGArrayStringEditorDialog::ArraySet( size_t index, const wxString& str )
-{
-    m_array[index] = str;
-    return true;
-}
-
-void wxPGArrayStringEditorDialog::ArrayRemoveAt( int index )
-{
-    m_array.RemoveAt(index);
-}
-
-void wxPGArrayStringEditorDialog::ArraySwap( size_t first, size_t second )
-{
-    wxString old_str = m_array[first];
-    wxString new_str = m_array[second];
-    m_array[first] = new_str;
-    m_array[second] = old_str;
-}
-
-wxPGArrayStringEditorDialog::wxPGArrayStringEditorDialog()
-    : wxPGArrayEditorDialog()
-{
-    Init();
-}
-
-void wxPGArrayStringEditorDialog::Init()
-{
-    m_pCallingClass = NULL;
-}
-
-bool
-wxPGArrayStringEditorDialog::OnCustomNewAction(wxString* resString)
-{
-    return m_pCallingClass->OnCustomStringEdit(m_parent, *resString);
-}
-
-// -----------------------------------------------------------------------
-// wxArrayStringProperty
-// -----------------------------------------------------------------------
-
-WX_PG_IMPLEMENT_PROPERTY_CLASS(wxArrayStringProperty,  // Property name
-                               wxPGProperty,  // Property we inherit from
-                               wxArrayString,  // Value type name
-                               const wxArrayString&,  // Value type, as given in constructor
-                               TextCtrlAndButton)  // Initial editor
-
-wxArrayStringProperty::wxArrayStringProperty( const wxString& label,
-                                                        const wxString& name,
-                                                        const wxArrayString& array )
-    : wxPGProperty(label,name)
-{
-    m_delimiter = ',';
-    SetValue( array );
-}
-
-wxArrayStringProperty::~wxArrayStringProperty() { }
-
-void wxArrayStringProperty::OnSetValue()
-{
-    GenerateValueAsString();
-}
-
-void
-wxArrayStringProperty::ConvertArrayToString(const wxArrayString& arr,
-                                            wxString* pString,
-                                            const wxUniChar& delimiter) const
-{
-    if ( delimiter == '"' || delimiter == '\'' )
-    {
-        // Quoted strings
-        ArrayStringToString(*pString,
-                            arr,
-                            delimiter,
-                            Escape | QuoteStrings);
-    }
-    else
-    {
-        // Regular delimiter
-        ArrayStringToString(*pString,
-                            arr,
-                            delimiter,
-                            0);
-    }
-}
-
-wxString wxArrayStringProperty::ValueToString( wxVariant& WXUNUSED(value),
-                                               int argFlags ) const
-{
-    //
-    // If this is called from GetValueAsString(), return cached string
-    if ( argFlags & wxPG_VALUE_IS_CURRENT )
-    {
-        return m_display;
-    }
-
-    wxArrayString arr = m_value.GetArrayString();
-    wxString s;
-    ConvertArrayToString(arr, &s, m_delimiter);
-    return s;
-}
-
-// Converts wxArrayString to a string separated by delimeters and spaces.
-// preDelim is useful for "str1" "str2" style. Set flags to 1 to do slash
-// conversion.
-void
-wxArrayStringProperty::ArrayStringToString( wxString& dst,
-                                            const wxArrayString& src,
-                                            wxUniChar delimiter, int flags )
-{
-    wxString pdr;
-    wxString preas;
-
-    unsigned int i;
-    unsigned int itemCount = src.size();
-
-    dst.Empty();
-
-    if ( flags & Escape )
-    {
-        preas = delimiter;
-        pdr = wxS("\\");
-        pdr += delimiter;
-    }
-
-    if ( itemCount )
-        dst.append( preas );
-
-    wxString delimStr(delimiter);
-
-    for ( i = 0; i < itemCount; i++ )
-    {
-        wxString str( src.Item(i) );
-
-        // Do some character conversion.
-        // Converts \ to \\ and $delimiter to \$delimiter
-        // Useful when quoting.
-        if ( flags & Escape )
-        {
-            str.Replace( wxS("\\"), wxS("\\\\"), true );
-            if ( !pdr.empty() )
-                str.Replace( preas, pdr, true );
-        }
-
-        dst.append( str );
-
-        if ( i < (itemCount-1) )
-        {
-            dst.append( delimStr );
-            dst.append( wxS(" ") );
-            dst.append( preas );
-        }
-        else if ( flags & QuoteStrings )
-            dst.append( delimStr );
-    }
-}
-
-void wxArrayStringProperty::GenerateValueAsString()
-{
-    wxArrayString arr = m_value.GetArrayString();
-    ConvertArrayToString(arr, &m_display, m_delimiter);
-}
-
-// Default implementation doesn't do anything.
-bool wxArrayStringProperty::OnCustomStringEdit( wxWindow*, wxString& )
-{
-    return false;
-}
-
-wxPGArrayEditorDialog* wxArrayStringProperty::CreateEditorDialog()
-{
-    return new wxPGArrayStringEditorDialog();
-}
-
-bool wxArrayStringProperty::OnButtonClick( wxPropertyGrid* propGrid,
-                                           wxWindow* WXUNUSED(primaryCtrl),
-                                           const wxChar* cbt )
-{
-    // Update the value
-    wxVariant useValue = propGrid->GetUncommittedPropertyValue();
-
-    if ( !propGrid->EditorValidate() )
-        return false;
-
-    // Create editor dialog.
-    wxPGArrayEditorDialog* dlg = CreateEditorDialog();
-#if wxUSE_VALIDATORS
-    wxValidator* validator = GetValidator();
-    wxPGInDialogValidator dialogValidator;
-#endif
-
-    wxPGArrayStringEditorDialog* strEdDlg = wxDynamicCast(dlg, wxPGArrayStringEditorDialog);
-
-    if ( strEdDlg )
-        strEdDlg->SetCustomButton(cbt, this);
-
-    dlg->SetDialogValue( useValue );
-    dlg->Create(propGrid, wxEmptyString, m_label);
-
-#if !wxPG_SMALL_SCREEN
-    dlg->Move( propGrid->GetGoodEditorDialogPosition(this,dlg->GetSize()) );
-#endif
-
-    bool retVal;
-
-    for (;;)
-    {
-        retVal = false;
-
-        int res = dlg->ShowModal();
-
-        if ( res == wxID_OK && dlg->IsModified() )
-        {
-            wxVariant value = dlg->GetDialogValue();
-            if ( !value.IsNull() )
-            {
-                wxArrayString actualValue = value.GetArrayString();
-                wxString tempStr;
-                ConvertArrayToString(actualValue, &tempStr, m_delimiter);
-            #if wxUSE_VALIDATORS
-                if ( dialogValidator.DoValidate(propGrid, validator,
-                                                tempStr) )
-            #endif
-                {
-                    SetValueInEvent( actualValue );
-                    retVal = true;
-                    break;
-                }
-            }
-            else
-                break;
-        }
-        else
-            break;
-    }
-
-    delete dlg;
-
-    return retVal;
-}
-
-bool wxArrayStringProperty::OnEvent( wxPropertyGrid* propGrid,
-                                     wxWindow* primary,
-                                     wxEvent& event )
-{
-    if ( propGrid->IsMainButtonEvent(event) )
-        return OnButtonClick(propGrid,primary,(const wxChar*) NULL);
-    return false;
-}
-
-bool wxArrayStringProperty::StringToValue( wxVariant& variant,
-                                           const wxString& text, int ) const
-{
-    wxArrayString arr;
-
-    if ( m_delimiter == '"' || m_delimiter == '\'' )
-    {
-        // Quoted strings
-        WX_PG_TOKENIZER2_BEGIN(text, m_delimiter)
-
-            // Need to replace backslashes with empty characters
-            // (opposite what is done in ConvertArrayToString()).
-            token.Replace ( wxS("\\\\"), wxS("\\"), true );
-
-            arr.Add( token );
-
-        WX_PG_TOKENIZER2_END()
-    }
-    else
-    {
-        // Regular delimiter
-        WX_PG_TOKENIZER1_BEGIN(text, m_delimiter)
-            arr.Add( token );
-        WX_PG_TOKENIZER1_END()
-    }
-
-    variant = arr;
-
-    return true;
-}
-
-bool wxArrayStringProperty::DoSetAttribute( const wxString& name, wxVariant& value )
-{
-    if ( name == wxPG_ARRAY_DELIMITER )
-    {
-        m_delimiter = value.GetChar();
-        GenerateValueAsString();
-        return false;
-    }
-    return true;
-}
-
-// -----------------------------------------------------------------------
-// wxPGInDialogValidator
-// -----------------------------------------------------------------------
-
-#if wxUSE_VALIDATORS
-bool wxPGInDialogValidator::DoValidate( wxPropertyGrid* propGrid,
-                                        wxValidator* validator,
-                                        const wxString& value )
-{
-    if ( !validator )
-        return true;
-
-    wxTextCtrl* tc = m_textCtrl;
-
-    if ( !tc )
-    {
-        {
-            tc = new wxTextCtrl( propGrid, wxPG_SUBID_TEMP1, wxEmptyString,
-                                 wxPoint(30000,30000));
-            tc->Hide();
-        }
-
-        m_textCtrl = tc;
-    }
-
-    tc->SetValue(value);
-
-    validator->SetWindow(tc);
-    bool res = validator->Validate(propGrid);
-
-    return res;
-}
-#else
-bool wxPGInDialogValidator::DoValidate( wxPropertyGrid* WXUNUSED(propGrid),
-                                        wxValidator* WXUNUSED(validator),
-                                        const wxString& WXUNUSED(value) )
-{
-    return true;
-}
-#endif
-
-// -----------------------------------------------------------------------
-
-#endif  // wxUSE_PROPGRID
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/COPYRIGHT b/3rdparty/wxwidgets3.0-3.0.1/src/regex/COPYRIGHT
deleted file mode 100644
index 22cbb2583f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/COPYRIGHT
+++ /dev/null
@@ -1,86 +0,0 @@
-This regular expression package was originally developed by Henry Spencer.
-It bears the following copyright notice:
-
-**********************************************************************
-
-Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
-
-Development of this software was funded, in part, by Cray Research Inc.,
-UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
-Corporation, none of whom are responsible for the results.  The author
-thanks all of them. 
-
-Redistribution and use in source and binary forms -- with or without
-modification -- are permitted for any purpose, provided that
-redistributions in source form retain this entire copyright notice and
-indicate the origin and nature of any modifications.
-
-I'd appreciate being given credit for this package in the documentation
-of software which uses it, but that is not a requirement.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-**********************************************************************
-
-wxWindows adopted the code out of Tcl 8.4.5.  Portions of regc_locale.c
-and re_syntax.n were developed by Tcl developers other than Henry Spencer;
-these files bear the Tcl copyright and license notice:
-
-**********************************************************************
-
-This software is copyrighted by the Regents of the University of
-California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState
-Corporation and other parties.  The following terms apply to all files
-associated with the software unless explicitly disclaimed in
-individual files.
-
-The authors hereby grant permission to use, copy, modify, distribute,
-and license this software and its documentation for any purpose, provided
-that existing copyright notices are retained in all copies and that this
-notice is included verbatim in any distributions. No written agreement,
-license, or royalty fee is required for any of the authorized uses.
-Modifications to this software may be copyrighted by their authors
-and need not follow the licensing terms described here, provided that
-the new terms are clearly indicated on the first page of each file where
-they apply.
-
-IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-MODIFICATIONS.
-
-GOVERNMENT USE: If you are acquiring this software on behalf of the
-U.S. government, the Government shall have only "Restricted Rights"
-in the software and related documentation as defined in the Federal 
-Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-are acquiring the software on behalf of the Department of Defense, the
-software shall be classified as "Commercial Computer Software" and the
-Government shall have only "Restricted Rights" as defined in Clause
-252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-authors grant the U.S. Government and others acting in its behalf
-permission to use and distribute the software in accordance with the
-terms specified in this license. 
-
-**********************************************************************
-
-The wxWindows licence applies to further modifications to regcustom.h
-and regc_locale.c.
-
-****************************************************************************
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/README b/3rdparty/wxwidgets3.0-3.0.1/src/regex/README
deleted file mode 100644
index 6c763a5556..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/README
+++ /dev/null
@@ -1,41 +0,0 @@
-wxWindows regex
----------------
-This is a version of Henry Spencer's regex, which was taken from the
-source of TCL (Toolkit Command Language).  It implements POSIX regular
-expressions and also supports Unicode and some Perl5 extensions.
-
-The modifications made by the wxWindows team are as follows:
-
-regcustom.h
------------
-Types and constants appropriate for our use of the library are defined
-here.
-
-regex.h
--------
-This is unmodified. Note though, that a portion of it (clearly marked)
-is copied from regcustom.h as part of the build process.
-
-regc_locale.c
--------------
-This module provides character classifications.
-
-The current version from Tcl supports only a Unicode build. The
-original code from Henry Spencer, on the other hand, was ASCII only.
-Therefore, in order to support both, code from the ASCII version has been
-incorporated into the Unicode version, conditionally compiled depending
-on wxUSE_UNICODE.
-
-The only non-trivial dependencies were: Tcl_UniCharToUpper,
-Tcl_UniCharToLower and Tcl_UniCharToTitle. The implementations of these
-have also been incorporated (from Tcl). These in turn depend only the data
-tables in tclUniData.c (which is unmodified). At some point wxWindows
-may have it's own Unicode character classification code, at which point
-these should be used instead.
-
-Other dependencies (on Tcl_DString) have been eliminated using wxWindows
-wxChar functions.
-
-The ASCII version has also been extended to support character
-classifications based on the current locale rather than ASCII only.
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/descrip.mms b/3rdparty/wxwidgets3.0-3.0.1/src/regex/descrip.mms
deleted file mode 100644
index ac5f03c4d3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/descrip.mms
+++ /dev/null
@@ -1,80 +0,0 @@
-#*****************************************************************************
-#                                                                            *
-# Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 14 December 2010                                                    *
-#                                                                            *
-#*****************************************************************************
-.first
-	define wx [--.include.wx]
-
-.ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
-	   /assume=(nostdnew,noglobal_array_new)/include=[]
-CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)/include=[]
-.else
-.ifdef __WXGTK__
-CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
-	   /assume=(nostdnew,noglobal_array_new)/include=[]
-CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
-	/include=[]
-.else
-.ifdef __WXGTK2__
-CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm\
-	   /assume=(nostdnew,noglobal_array_new)/include=[]
-CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)\
-	/ieee=denorm/include=[]
-.else
-.ifdef __WXX11__
-CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
-	/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)/include=[]
-CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
-	/name=(as_is,short)/include=[]
-.else
-CXX_DEFINE =
-CC_DEFINE =
-.endif
-.endif
-.endif
-.endif
-
-.suffixes : .cpp
-
-.cpp.obj :
-	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
-.c.obj :
-	cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
-
-OBJECTS=regcomp.obj,regerror.obj,regexec.obj,regfree.obj,\
-	regfronts.obj,tclUniData.obj
-
-SOURCES=regcomp.c,regc_color.c,regc_cvec.c,regc_lex.c,regc_locale.c,\
-	regc_nfa.c,regerror.c,regexec.c,rege_dfa.c,regfree.c,regfronts.c,\
-	tclUniData.c
-
-all : $(SOURCES)
-	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
-.ifdef __WXMOTIF__
-	library [--.lib]libwx_motif.olb $(OBJECTS)
-.else
-.ifdef __WXGTK__
-	library [--.lib]libwx_gtk.olb $(OBJECTS)
-.else
-.ifdef __WXGTK2__
-	library [--.lib]libwx_gtk2.olb $(OBJECTS)
-.else
-.ifdef __WXX11__
-	library [--.lib]libwx_x11_univ.olb $(OBJECTS)
-.endif
-.endif
-.endif
-.endif
-
-$(OBJECTS) : [--.include.wx]setup.h
-
-regcomp.obj : regcomp.c
-regerror.obj : regerror.c
-regexec.obj : regexec.c
-regfree.obj : regfree.c
-regfronts.obj : regfronts.c
-tclUniData.obj : tclUniData.c
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/re_syntax.n b/3rdparty/wxwidgets3.0-3.0.1/src/regex/re_syntax.n
deleted file mode 100644
index f37bb85abd..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/re_syntax.n
+++ /dev/null
@@ -1,970 +0,0 @@
-'\"
-'\" Copyright (c) 1998 Sun Microsystems, Inc.
-'\" Copyright (c) 1999 Scriptics Corporation
-'\"
-'\" This software is copyrighted by the Regents of the University of
-'\" California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState
-'\" Corporation and other parties.  The following terms apply to all files
-'\" associated with the software unless explicitly disclaimed in
-'\" individual files.
-'\" 
-'\" The authors hereby grant permission to use, copy, modify, distribute,
-'\" and license this software and its documentation for any purpose, provided
-'\" that existing copyright notices are retained in all copies and that this
-'\" notice is included verbatim in any distributions. No written agreement,
-'\" license, or royalty fee is required for any of the authorized uses.
-'\" Modifications to this software may be copyrighted by their authors
-'\" and need not follow the licensing terms described here, provided that
-'\" the new terms are clearly indicated on the first page of each file where
-'\" they apply.
-'\" 
-'\" IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
-'\" FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-'\" ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
-'\" DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
-'\" POSSIBILITY OF SUCH DAMAGE.
-'\" 
-'\" THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
-'\" INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
-'\" FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT.  THIS SOFTWARE
-'\" IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
-'\" NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
-'\" MODIFICATIONS.
-'\" 
-'\" GOVERNMENT USE: If you are acquiring this software on behalf of the
-'\" U.S. government, the Government shall have only "Restricted Rights"
-'\" in the software and related documentation as defined in the Federal 
-'\" Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
-'\" are acquiring the software on behalf of the Department of Defense, the
-'\" software shall be classified as "Commercial Computer Software" and the
-'\" Government shall have only "Restricted Rights" as defined in Clause
-'\" 252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
-'\" authors grant the U.S. Government and others acting in its behalf
-'\" permission to use and distribute the software in accordance with the
-'\" terms specified in this license. 
-'\" 
-'\" RCS: @(#) Id: re_syntax.n,v 1.3 1999/07/14 19:09:36 jpeek Exp 
-'\"
-.so man.macros
-.TH re_syntax n "8.1" Tcl "Tcl Built-In Commands"
-.BS
-.SH NAME
-re_syntax \- Syntax of Tcl regular expressions.
-.BE
-
-.SH DESCRIPTION
-.PP
-A \fIregular expression\fR describes strings of characters.
-It's a pattern that matches certain strings and doesn't match others.
-
-.SH "DIFFERENT FLAVORS OF REs"
-Regular expressions (``RE''s), as defined by POSIX, come in two
-flavors: \fIextended\fR REs (``EREs'') and \fIbasic\fR REs (``BREs'').
-EREs are roughly those of the traditional \fIegrep\fR, while BREs are
-roughly those of the traditional \fIed\fR.  This implementation adds
-a third flavor, \fIadvanced\fR REs (``AREs''), basically EREs with
-some significant extensions.
-.PP
-This manual page primarily describes AREs.  BREs mostly exist for
-backward compatibility in some old programs; they will be discussed at
-the end.  POSIX EREs are almost an exact subset of AREs.  Features of
-AREs that are not present in EREs will be indicated.
-
-.SH "REGULAR EXPRESSION SYNTAX"
-.PP
-Tcl regular expressions are implemented using the package written by
-Henry Spencer, based on the 1003.2 spec and some (not quite all) of
-the Perl5 extensions (thanks, Henry!).  Much of the description of
-regular expressions below is copied verbatim from his manual entry.
-.PP
-An ARE is one or more \fIbranches\fR,
-separated by `\fB|\fR',
-matching anything that matches any of the branches.
-.PP
-A branch is zero or more \fIconstraints\fR or \fIquantified atoms\fR,
-concatenated.
-It matches a match for the first, followed by a match for the second, etc;
-an empty branch matches the empty string.
-.PP
-A quantified atom is an \fIatom\fR possibly followed
-by a single \fIquantifier\fR.
-Without a quantifier, it matches a match for the atom.
-The quantifiers,
-and what a so-quantified atom matches, are:
-.RS 2
-.TP 6
-\fB*\fR
-a sequence of 0 or more matches of the atom
-.TP
-\fB+\fR
-a sequence of 1 or more matches of the atom
-.TP
-\fB?\fR
-a sequence of 0 or 1 matches of the atom
-.TP
-\fB{\fIm\fB}\fR
-a sequence of exactly \fIm\fR matches of the atom
-.TP
-\fB{\fIm\fB,}\fR
-a sequence of \fIm\fR or more matches of the atom
-.TP
-\fB{\fIm\fB,\fIn\fB}\fR
-a sequence of \fIm\fR through \fIn\fR (inclusive) matches of the atom;
-\fIm\fR may not exceed \fIn\fR
-.TP
-\fB*?  +?  ??  {\fIm\fB}?  {\fIm\fB,}?  {\fIm\fB,\fIn\fB}?\fR
-\fInon-greedy\fR quantifiers,
-which match the same possibilities,
-but prefer the smallest number rather than the largest number
-of matches (see MATCHING)
-.RE
-.PP
-The forms using
-\fB{\fR and \fB}\fR
-are known as \fIbound\fRs.
-The numbers
-\fIm\fR and \fIn\fR are unsigned decimal integers
-with permissible values from 0 to 255 inclusive.
-.PP
-An atom is one of:
-.RS 2
-.TP 6
-\fB(\fIre\fB)\fR
-(where \fIre\fR is any regular expression)
-matches a match for
-\fIre\fR, with the match noted for possible reporting
-.TP
-\fB(?:\fIre\fB)\fR
-as previous,
-but does no reporting
-(a ``non-capturing'' set of parentheses)
-.TP
-\fB()\fR
-matches an empty string,
-noted for possible reporting
-.TP
-\fB(?:)\fR
-matches an empty string,
-without reporting
-.TP
-\fB[\fIchars\fB]\fR
-a \fIbracket expression\fR,
-matching any one of the \fIchars\fR (see BRACKET EXPRESSIONS for more detail)
-.TP
- \fB.\fR
-matches any single character
-.TP
-\fB\e\fIk\fR
-(where \fIk\fR is a non-alphanumeric character)
-matches that character taken as an ordinary character,
-e.g. \e\e matches a backslash character
-.TP
-\fB\e\fIc\fR
-where \fIc\fR is alphanumeric
-(possibly followed by other characters),
-an \fIescape\fR (AREs only),
-see ESCAPES below
-.TP
-\fB{\fR
-when followed by a character other than a digit,
-matches the left-brace character `\fB{\fR';
-when followed by a digit, it is the beginning of a
-\fIbound\fR (see above)
-.TP
-\fIx\fR
-where \fIx\fR is
-a single character with no other significance, matches that character.
-.RE
-.PP
-A \fIconstraint\fR matches an empty string when specific conditions
-are met.
-A constraint may not be followed by a quantifier.
-The simple constraints are as follows; some more constraints are
-described later, under ESCAPES.
-.RS 2
-.TP 8
-\fB^\fR
-matches at the beginning of a line
-.TP
-\fB$\fR
-matches at the end of a line
-.TP
-\fB(?=\fIre\fB)\fR
-\fIpositive lookahead\fR (AREs only), matches at any point
-where a substring matching \fIre\fR begins
-.TP
-\fB(?!\fIre\fB)\fR
-\fInegative lookahead\fR (AREs only), matches at any point
-where no substring matching \fIre\fR begins
-.RE
-.PP
-The lookahead constraints may not contain back references (see later),
-and all parentheses within them are considered non-capturing.
-.PP
-An RE may not end with `\fB\e\fR'.
-
-.SH "BRACKET EXPRESSIONS"
-A \fIbracket expression\fR is a list of characters enclosed in `\fB[\|]\fR'.
-It normally matches any single character from the list (but see below).
-If the list begins with `\fB^\fR',
-it matches any single character
-(but see below) \fInot\fR from the rest of the list.
-.PP
-If two characters in the list are separated by `\fB\-\fR',
-this is shorthand
-for the full \fIrange\fR of characters between those two (inclusive) in the
-collating sequence,
-e.g.
-\fB[0\-9]\fR
-in ASCII matches any decimal digit.
-Two ranges may not share an
-endpoint, so e.g.
-\fBa\-c\-e\fR
-is illegal.
-Ranges are very collating-sequence-dependent,
-and portable programs should avoid relying on them.
-.PP
-To include a literal
-\fB]\fR
-or
-\fB\-\fR
-in the list,
-the simplest method is to
-enclose it in
-\fB[.\fR and \fB.]\fR
-to make it a collating element (see below).
-Alternatively,
-make it the first character
-(following a possible `\fB^\fR'),
-or (AREs only) precede it with `\fB\e\fR'.
-Alternatively, for `\fB\-\fR',
-make it the last character,
-or the second endpoint of a range.
-To use a literal
-\fB\-\fR
-as the first endpoint of a range,
-make it a collating element
-or (AREs only) precede it with `\fB\e\fR'.
-With the exception of these, some combinations using
-\fB[\fR
-(see next
-paragraphs), and escapes,
-all other special characters lose their
-special significance within a bracket expression.
-.PP
-Within a bracket expression, a collating element (a character,
-a multi-character sequence that collates as if it were a single character,
-or a collating-sequence name for either)
-enclosed in
-\fB[.\fR and \fB.]\fR
-stands for the
-sequence of characters of that collating element.
-The sequence is a single element of the bracket expression's list.
-A bracket expression in a locale that has
-multi-character collating elements
-can thus match more than one character.
-.VS 8.2
-So (insidiously), a bracket expression that starts with \fB^\fR
-can match multi-character collating elements even if none of them
-appear in the bracket expression!
-(\fINote:\fR Tcl currently has no multi-character collating elements.
-This information is only for illustration.)
-.PP
-For example, assume the collating sequence includes a \fBch\fR
-multi-character collating element.
-Then the RE \fB[[.ch.]]*c\fR (zero or more \fBch\fP's followed by \fBc\fP)
-matches the first five characters of `\fBchchcc\fR'.
-Also, the RE \fB[^c]b\fR matches all of `\fBchb\fR'
-(because \fB[^c]\fR matches the multi-character \fBch\fR).
-.VE 8.2
-.PP
-Within a bracket expression, a collating element enclosed in
-\fB[=\fR
-and
-\fB=]\fR
-is an equivalence class, standing for the sequences of characters
-of all collating elements equivalent to that one, including itself.
-(If there are no other equivalent collating elements,
-the treatment is as if the enclosing delimiters were `\fB[.\fR'\&
-and `\fB.]\fR'.)
-For example, if
-\fBo\fR
-and
-\fB\o'o^'\fR
-are the members of an equivalence class,
-then `\fB[[=o=]]\fR', `\fB[[=\o'o^'=]]\fR',
-and `\fB[o\o'o^']\fR'\&
-are all synonymous.
-An equivalence class may not be an endpoint
-of a range.
-.VS 8.2
-(\fINote:\fR 
-Tcl currently implements only the Unicode locale.
-It doesn't define any equivalence classes.
-The examples above are just illustrations.)
-.VE 8.2
-.PP
-Within a bracket expression, the name of a \fIcharacter class\fR enclosed
-in
-\fB[:\fR
-and
-\fB:]\fR
-stands for the list of all characters
-(not all collating elements!)
-belonging to that
-class.
-Standard character classes are:
-.PP
-.RS
-.ne 5
-.nf
-.ta 3c
-\fBalpha\fR	A letter. 
-\fBupper\fR	An upper-case letter. 
-\fBlower\fR	A lower-case letter. 
-\fBdigit\fR	A decimal digit. 
-\fBxdigit\fR	A hexadecimal digit. 
-\fBalnum\fR	An alphanumeric (letter or digit). 
-\fBprint\fR	An alphanumeric (same as alnum).
-\fBblank\fR	A space or tab character.
-\fBspace\fR	A character producing white space in displayed text. 
-\fBpunct\fR	A punctuation character. 
-\fBgraph\fR	A character with a visible representation. 
-\fBcntrl\fR	A control character. 
-.fi
-.RE
-.PP
-A locale may provide others.
-.VS 8.2
-(Note that the current Tcl implementation has only one locale:
-the Unicode locale.)
-.VE 8.2
-A character class may not be used as an endpoint of a range.
-.PP
-There are two special cases of bracket expressions:
-the bracket expressions
-\fB[[:<:]]\fR
-and
-\fB[[:>:]]\fR
-are constraints, matching empty strings at
-the beginning and end of a word respectively.
-'\" note, discussion of escapes below references this definition of word
-A word is defined as a sequence of
-word characters
-that is neither preceded nor followed by
-word characters.
-A word character is an
-\fIalnum\fR
-character
-or an underscore
-(\fB_\fR).
-These special bracket expressions are deprecated;
-users of AREs should use constraint escapes instead (see below).
-.SH ESCAPES
-Escapes (AREs only), which begin with a
-\fB\e\fR
-followed by an alphanumeric character,
-come in several varieties:
-character entry, class shorthands, constraint escapes, and back references.
-A
-\fB\e\fR
-followed by an alphanumeric character but not constituting
-a valid escape is illegal in AREs.
-In EREs, there are no escapes:
-outside a bracket expression,
-a
-\fB\e\fR
-followed by an alphanumeric character merely stands for that
-character as an ordinary character,
-and inside a bracket expression,
-\fB\e\fR
-is an ordinary character.
-(The latter is the one actual incompatibility between EREs and AREs.)
-.PP
-Character-entry escapes (AREs only) exist to make it easier to specify
-non-printing and otherwise inconvenient characters in REs:
-.RS 2
-.TP 5
-\fB\ea\fR
-alert (bell) character, as in C
-.TP
-\fB\eb\fR
-backspace, as in C
-.TP
-\fB\eB\fR
-synonym for
-\fB\e\fR
-to help reduce backslash doubling in some
-applications where there are multiple levels of backslash processing
-.TP
-\fB\ec\fIX\fR
-(where X is any character) the character whose
-low-order 5 bits are the same as those of
-\fIX\fR,
-and whose other bits are all zero
-.TP
-\fB\ee\fR
-the character whose collating-sequence name
-is `\fBESC\fR',
-or failing that, the character with octal value 033
-.TP
-\fB\ef\fR
-formfeed, as in C
-.TP
-\fB\en\fR
-newline, as in C
-.TP
-\fB\er\fR
-carriage return, as in C
-.TP
-\fB\et\fR
-horizontal tab, as in C
-.TP
-\fB\eu\fIwxyz\fR
-(where
-\fIwxyz\fR
-is exactly four hexadecimal digits)
-the Unicode character
-\fBU+\fIwxyz\fR
-in the local byte ordering
-.TP
-\fB\eU\fIstuvwxyz\fR
-(where
-\fIstuvwxyz\fR
-is exactly eight hexadecimal digits)
-reserved for a somewhat-hypothetical Unicode extension to 32 bits
-.TP
-\fB\ev\fR
-vertical tab, as in C
-are all available.
-.TP
-\fB\ex\fIhhh\fR
-(where
-\fIhhh\fR
-is any sequence of hexadecimal digits)
-the character whose hexadecimal value is
-\fB0x\fIhhh\fR
-(a single character no matter how many hexadecimal digits are used).
-.TP
-\fB\e0\fR
-the character whose value is
-\fB0\fR
-.TP
-\fB\e\fIxy\fR
-(where
-\fIxy\fR
-is exactly two octal digits,
-and is not a
-\fIback reference\fR (see below))
-the character whose octal value is
-\fB0\fIxy\fR
-.TP
-\fB\e\fIxyz\fR
-(where
-\fIxyz\fR
-is exactly three octal digits,
-and is not a
-back reference (see below))
-the character whose octal value is
-\fB0\fIxyz\fR
-.RE
-.PP
-Hexadecimal digits are `\fB0\fR'-`\fB9\fR', `\fBa\fR'-`\fBf\fR',
-and `\fBA\fR'-`\fBF\fR'.
-Octal digits are `\fB0\fR'-`\fB7\fR'.
-.PP
-The character-entry escapes are always taken as ordinary characters.
-For example,
-\fB\e135\fR
-is
-\fB]\fR
-in ASCII,
-but
-\fB\e135\fR
-does not terminate a bracket expression.
-Beware, however, that some applications (e.g., C compilers) interpret 
-such sequences themselves before the regular-expression package
-gets to see them, which may require doubling (quadrupling, etc.) the `\fB\e\fR'.
-.PP
-Class-shorthand escapes (AREs only) provide shorthands for certain commonly-used
-character classes:
-.RS 2
-.TP 10
-\fB\ed\fR
-\fB[[:digit:]]\fR
-.TP
-\fB\es\fR
-\fB[[:space:]]\fR
-.TP
-\fB\ew\fR
-\fB[[:alnum:]_]\fR
-(note underscore)
-.TP
-\fB\eD\fR
-\fB[^[:digit:]]\fR
-.TP
-\fB\eS\fR
-\fB[^[:space:]]\fR
-.TP
-\fB\eW\fR
-\fB[^[:alnum:]_]\fR
-(note underscore)
-.RE
-.PP
-Within bracket expressions, `\fB\ed\fR', `\fB\es\fR',
-and `\fB\ew\fR'\&
-lose their outer brackets,
-and `\fB\eD\fR', `\fB\eS\fR',
-and `\fB\eW\fR'\&
-are illegal.
-.VS 8.2
-(So, for example, \fB[a-c\ed]\fR is equivalent to \fB[a-c[:digit:]]\fR.
-Also, \fB[a-c\eD]\fR, which is equivalent to \fB[a-c^[:digit:]]\fR, is illegal.)
-.VE 8.2
-.PP
-A constraint escape (AREs only) is a constraint,
-matching the empty string if specific conditions are met,
-written as an escape:
-.RS 2
-.TP 6
-\fB\eA\fR
-matches only at the beginning of the string
-(see MATCHING, below, for how this differs from `\fB^\fR')
-.TP
-\fB\em\fR
-matches only at the beginning of a word
-.TP
-\fB\eM\fR
-matches only at the end of a word
-.TP
-\fB\ey\fR
-matches only at the beginning or end of a word
-.TP
-\fB\eY\fR
-matches only at a point that is not the beginning or end of a word
-.TP
-\fB\eZ\fR
-matches only at the end of the string
-(see MATCHING, below, for how this differs from `\fB$\fR')
-.TP
-\fB\e\fIm\fR
-(where
-\fIm\fR
-is a nonzero digit) a \fIback reference\fR, see below
-.TP
-\fB\e\fImnn\fR
-(where
-\fIm\fR
-is a nonzero digit, and
-\fInn\fR
-is some more digits,
-and the decimal value
-\fImnn\fR
-is not greater than the number of closing capturing parentheses seen so far)
-a \fIback reference\fR, see below
-.RE
-.PP
-A word is defined as in the specification of
-\fB[[:<:]]\fR
-and
-\fB[[:>:]]\fR
-above.
-Constraint escapes are illegal within bracket expressions.
-.PP
-A back reference (AREs only) matches the same string matched by the parenthesized
-subexpression specified by the number,
-so that (e.g.)
-\fB([bc])\e1\fR
-matches
-\fBbb\fR
-or
-\fBcc\fR
-but not `\fBbc\fR'.
-The subexpression must entirely precede the back reference in the RE.
-Subexpressions are numbered in the order of their leading parentheses.
-Non-capturing parentheses do not define subexpressions.
-.PP
-There is an inherent historical ambiguity between octal character-entry 
-escapes and back references, which is resolved by heuristics,
-as hinted at above.
-A leading zero always indicates an octal escape.
-A single non-zero digit, not followed by another digit,
-is always taken as a back reference.
-A multi-digit sequence not starting with a zero is taken as a back 
-reference if it comes after a suitable subexpression
-(i.e. the number is in the legal range for a back reference),
-and otherwise is taken as octal.
-.SH "METASYNTAX"
-In addition to the main syntax described above, there are some special
-forms and miscellaneous syntactic facilities available.
-.PP
-Normally the flavor of RE being used is specified by
-application-dependent means.
-However, this can be overridden by a \fIdirector\fR.
-If an RE of any flavor begins with `\fB***:\fR',
-the rest of the RE is an ARE.
-If an RE of any flavor begins with `\fB***=\fR',
-the rest of the RE is taken to be a literal string,
-with all characters considered ordinary characters.
-.PP
-An ARE may begin with \fIembedded options\fR:
-a sequence
-\fB(?\fIxyz\fB)\fR
-(where
-\fIxyz\fR
-is one or more alphabetic characters)
-specifies options affecting the rest of the RE.
-These supplement, and can override,
-any options specified by the application.
-The available option letters are:
-.RS 2
-.TP 3
-\fBb\fR
-rest of RE is a BRE
-.TP 3
-\fBc\fR
-case-sensitive matching (usual default)
-.TP 3
-\fBe\fR
-rest of RE is an ERE
-.TP 3
-\fBi\fR
-case-insensitive matching (see MATCHING, below)
-.TP 3
-\fBm\fR
-historical synonym for
-\fBn\fR
-.TP 3
-\fBn\fR
-newline-sensitive matching (see MATCHING, below)
-.TP 3
-\fBp\fR
-partial newline-sensitive matching (see MATCHING, below)
-.TP 3
-\fBq\fR
-rest of RE is a literal (``quoted'') string, all ordinary characters
-.TP 3
-\fBs\fR
-non-newline-sensitive matching (usual default)
-.TP 3
-\fBt\fR
-tight syntax (usual default; see below)
-.TP 3
-\fBw\fR
-inverse partial newline-sensitive (``weird'') matching (see MATCHING, below)
-.TP 3
-\fBx\fR
-expanded syntax (see below)
-.RE
-.PP
-Embedded options take effect at the
-\fB)\fR
-terminating the sequence.
-They are available only at the start of an ARE,
-and may not be used later within it.
-.PP
-In addition to the usual (\fItight\fR) RE syntax, in which all characters are
-significant, there is an \fIexpanded\fR syntax,
-available in all flavors of RE
-with the \fB-expanded\fR switch, or in AREs with the embedded x option.
-In the expanded syntax,
-white-space characters are ignored
-and all characters between a
-\fB#\fR
-and the following newline (or the end of the RE) are ignored,
-permitting paragraphing and commenting a complex RE.
-There are three exceptions to that basic rule:
-.RS 2
-.PP
-a white-space character or `\fB#\fR' preceded by `\fB\e\fR' is retained
-.PP
-white space or `\fB#\fR' within a bracket expression is retained
-.PP
-white space and comments are illegal within multi-character symbols
-like the ARE `\fB(?:\fR' or the BRE `\fB\e(\fR'
-.RE
-.PP
-Expanded-syntax white-space characters are blank, tab, newline, and
-.VS 8.2
-any character that belongs to the \fIspace\fR character class.
-.VE 8.2
-.PP
-Finally, in an ARE,
-outside bracket expressions, the sequence `\fB(?#\fIttt\fB)\fR'
-(where
-\fIttt\fR
-is any text not containing a `\fB)\fR')
-is a comment,
-completely ignored.
-Again, this is not allowed between the characters of
-multi-character symbols like `\fB(?:\fR'.
-Such comments are more a historical artifact than a useful facility,
-and their use is deprecated;
-use the expanded syntax instead.
-.PP
-\fINone\fR of these metasyntax extensions is available if the application
-(or an initial
-\fB***=\fR
-director)
-has specified that the user's input be treated as a literal string
-rather than as an RE.
-.SH MATCHING
-In the event that an RE could match more than one substring of a given
-string,
-the RE matches the one starting earliest in the string.
-If the RE could match more than one substring starting at that point,
-its choice is determined by its \fIpreference\fR:
-either the longest substring, or the shortest.
-.PP
-Most atoms, and all constraints, have no preference.
-A parenthesized RE has the same preference (possibly none) as the RE.
-A quantified atom with quantifier
-\fB{\fIm\fB}\fR
-or
-\fB{\fIm\fB}?\fR
-has the same preference (possibly none) as the atom itself.
-A quantified atom with other normal quantifiers (including
-\fB{\fIm\fB,\fIn\fB}\fR
-with
-\fIm\fR
-equal to
-\fIn\fR)
-prefers longest match.
-A quantified atom with other non-greedy quantifiers (including
-\fB{\fIm\fB,\fIn\fB}?\fR
-with
-\fIm\fR
-equal to
-\fIn\fR)
-prefers shortest match.
-A branch has the same preference as the first quantified atom in it
-which has a preference.
-An RE consisting of two or more branches connected by the
-\fB|\fR
-operator prefers longest match.
-.PP
-Subject to the constraints imposed by the rules for matching the whole RE,
-subexpressions also match the longest or shortest possible substrings,
-based on their preferences,
-with subexpressions starting earlier in the RE taking priority over
-ones starting later.
-Note that outer subexpressions thus take priority over
-their component subexpressions.
-.PP
-Note that the quantifiers
-\fB{1,1}\fR
-and
-\fB{1,1}?\fR
-can be used to force longest and shortest preference, respectively,
-on a subexpression or a whole RE.
-.PP
-Match lengths are measured in characters, not collating elements.
-An empty string is considered longer than no match at all.
-For example,
-\fBbb*\fR
-matches the three middle characters of `\fBabbbc\fR',
-\fB(week|wee)(night|knights)\fR
-matches all ten characters of `\fBweeknights\fR',
-when
-\fB(.*).*\fR
-is matched against
-\fBabc\fR
-the parenthesized subexpression
-matches all three characters, and
-when
-\fB(a*)*\fR
-is matched against
-\fBbc\fR
-both the whole RE and the parenthesized
-subexpression match an empty string.
-.PP
-If case-independent matching is specified,
-the effect is much as if all case distinctions had vanished from the
-alphabet.
-When an alphabetic that exists in multiple cases appears as an
-ordinary character outside a bracket expression, it is effectively
-transformed into a bracket expression containing both cases,
-so that
-\fBx\fR
-becomes `\fB[xX]\fR'.
-When it appears inside a bracket expression, all case counterparts
-of it are added to the bracket expression, so that
-\fB[x]\fR
-becomes
-\fB[xX]\fR
-and
-\fB[^x]\fR
-becomes `\fB[^xX]\fR'.
-.PP
-If newline-sensitive matching is specified, \fB.\fR
-and bracket expressions using
-\fB^\fR
-will never match the newline character
-(so that matches will never cross newlines unless the RE
-explicitly arranges it)
-and
-\fB^\fR
-and
-\fB$\fR
-will match the empty string after and before a newline
-respectively, in addition to matching at beginning and end of string
-respectively.
-ARE
-\fB\eA\fR
-and
-\fB\eZ\fR
-continue to match beginning or end of string \fIonly\fR.
-.PP
-If partial newline-sensitive matching is specified,
-this affects \fB.\fR
-and bracket expressions
-as with newline-sensitive matching, but not
-\fB^\fR
-and `\fB$\fR'.
-.PP
-If inverse partial newline-sensitive matching is specified,
-this affects
-\fB^\fR
-and
-\fB$\fR
-as with
-newline-sensitive matching,
-but not \fB.\fR
-and bracket expressions.
-This isn't very useful but is provided for symmetry.
-.SH "LIMITS AND COMPATIBILITY"
-No particular limit is imposed on the length of REs.
-Programs intended to be highly portable should not employ REs longer
-than 256 bytes,
-as a POSIX-compliant implementation can refuse to accept such REs.
-.PP
-The only feature of AREs that is actually incompatible with
-POSIX EREs is that
-\fB\e\fR
-does not lose its special
-significance inside bracket expressions.
-All other ARE features use syntax which is illegal or has
-undefined or unspecified effects in POSIX EREs;
-the
-\fB***\fR
-syntax of directors likewise is outside the POSIX
-syntax for both BREs and EREs.
-.PP
-Many of the ARE extensions are borrowed from Perl, but some have
-been changed to clean them up, and a few Perl extensions are not present.
-Incompatibilities of note include `\fB\eb\fR', `\fB\eB\fR',
-the lack of special treatment for a trailing newline,
-the addition of complemented bracket expressions to the things
-affected by newline-sensitive matching,
-the restrictions on parentheses and back references in lookahead constraints,
-and the longest/shortest-match (rather than first-match) matching semantics.
-.PP
-The matching rules for REs containing both normal and non-greedy quantifiers
-have changed since early beta-test versions of this package.
-(The new rules are much simpler and cleaner,
-but don't work as hard at guessing the user's real intentions.)
-.PP
-Henry Spencer's original 1986 \fIregexp\fR package,
-still in widespread use (e.g., in pre-8.1 releases of Tcl),
-implemented an early version of today's EREs.
-There are four incompatibilities between \fIregexp\fR's near-EREs
-(`RREs' for short) and AREs.
-In roughly increasing order of significance:
-.PP
-.RS
-In AREs,
-\fB\e\fR
-followed by an alphanumeric character is either an
-escape or an error,
-while in RREs, it was just another way of writing the 
-alphanumeric.
-This should not be a problem because there was no reason to write
-such a sequence in RREs.
-.PP
-\fB{\fR
-followed by a digit in an ARE is the beginning of a bound,
-while in RREs,
-\fB{\fR
-was always an ordinary character.
-Such sequences should be rare,
-and will often result in an error because following characters
-will not look like a valid bound.
-.PP
-In AREs,
-\fB\e\fR
-remains a special character within `\fB[\|]\fR',
-so a literal
-\fB\e\fR
-within
-\fB[\|]\fR
-must be written `\fB\e\e\fR'.
-\fB\e\e\fR
-also gives a literal
-\fB\e\fR
-within
-\fB[\|]\fR
-in RREs,
-but only truly paranoid programmers routinely doubled the backslash.
-.PP
-AREs report the longest/shortest match for the RE,
-rather than the first found in a specified search order.
-This may affect some RREs which were written in the expectation that
-the first match would be reported.
-(The careful crafting of RREs to optimize the search order for fast
-matching is obsolete (AREs examine all possible matches
-in parallel, and their performance is largely insensitive to their
-complexity) but cases where the search order was exploited to deliberately 
-find a match which was \fInot\fR the longest/shortest will need rewriting.)
-.RE
-
-.SH "BASIC REGULAR EXPRESSIONS"
-BREs differ from EREs in several respects.  `\fB|\fR', `\fB+\fR',
-and
-\fB?\fR
-are ordinary characters and there is no equivalent
-for their functionality.
-The delimiters for bounds are
-\fB\e{\fR
-and `\fB\e}\fR',
-with
-\fB{\fR
-and
-\fB}\fR
-by themselves ordinary characters.
-The parentheses for nested subexpressions are
-\fB\e(\fR
-and `\fB\e)\fR',
-with
-\fB(\fR
-and
-\fB)\fR
-by themselves ordinary characters.
-\fB^\fR
-is an ordinary character except at the beginning of the
-RE or the beginning of a parenthesized subexpression,
-\fB$\fR
-is an ordinary character except at the end of the
-RE or the end of a parenthesized subexpression,
-and
-\fB*\fR
-is an ordinary character if it appears at the beginning of the
-RE or the beginning of a parenthesized subexpression
-(after a possible leading `\fB^\fR').
-Finally,
-single-digit back references are available,
-and
-\fB\e<\fR
-and
-\fB\e>\fR
-are synonyms for
-\fB[[:<:]]\fR
-and
-\fB[[:>:]]\fR
-respectively;
-no other escapes are available.
-
-.SH "SEE ALSO"
-RegExp(3), regexp(n), regsub(n), lsearch(n), switch(n), text(n)
-
-.SH KEYWORDS
-match, regular expression, string
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regc_color.c b/3rdparty/wxwidgets3.0-3.0.1/src/regex/regc_color.c
deleted file mode 100644
index 6a07d3e7a5..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regc_color.c
+++ /dev/null
@@ -1,778 +0,0 @@
-/*
- * colorings of characters
- * This file is #included by regcomp.c.
- *
- * Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
- * 
- * Development of this software was funded, in part, by Cray Research Inc.,
- * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
- * Corporation, none of whom are responsible for the results.  The author
- * thanks all of them. 
- * 
- * Redistribution and use in source and binary forms -- with or without
- * modification -- are permitted for any purpose, provided that
- * redistributions in source form retain this entire copyright notice and
- * indicate the origin and nature of any modifications.
- * 
- * I'd appreciate being given credit for this package in the documentation
- * of software which uses it, but that is not a requirement.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- *
- * Note that there are some incestuous relationships between this code and
- * NFA arc maintenance, which perhaps ought to be cleaned up sometime.
- */
-
-
-
-#define	CISERR()	VISERR(cm->v)
-#define	CERR(e)		(void)VERR(cm->v, (e))
-
-
-
-/*
- - initcm - set up new colormap
- ^ static VOID initcm(struct vars *, struct colormap *);
- */
-static VOID
-initcm(v, cm)
-struct vars *v;
-struct colormap *cm;
-{
-	int i;
-	int j;
-	union tree *t;
-	union tree *nextt;
-	struct colordesc *cd;
-
-	cm->magic = CMMAGIC;
-	cm->v = v;
-
-	cm->ncds = NINLINECDS;
-	cm->cd = cm->cdspace;
-	cm->max = 0;
-	cm->free = 0;
-
-	cd = cm->cd;			/* cm->cd[WHITE] */
-	cd->sub = NOSUB;
-	cd->arcs = NULL;
-	cd->flags = 0;
-	cd->nchrs = CHR_MAX - CHR_MIN + 1;
-
-	/* upper levels of tree */
-	for (t = &cm->tree[0], j = NBYTS-1; j > 0; t = nextt, j--) {
-		nextt = t + 1;
-		for (i = BYTTAB-1; i >= 0; i--)
-			t->tptr[i] = nextt;
-	}
-	/* bottom level is solid white */
-	t = &cm->tree[NBYTS-1];
-	for (i = BYTTAB-1; i >= 0; i--)
-		t->tcolor[i] = WHITE;
-	cd->block = t;
-}
-
-/*
- - freecm - free dynamically-allocated things in a colormap
- ^ static VOID freecm(struct colormap *);
- */
-static VOID
-freecm(cm)
-struct colormap *cm;
-{
-	size_t i;
-	union tree *cb;
-
-	cm->magic = 0;
-	if (NBYTS > 1)
-		cmtreefree(cm, cm->tree, 0);
-	for (i = 1; i <= cm->max; i++)		/* skip WHITE */
-		if (!UNUSEDCOLOR(&cm->cd[i])) {
-			cb = cm->cd[i].block;
-			if (cb != NULL)
-				FREE(cb);
-		}
-	if (cm->cd != cm->cdspace)
-		FREE(cm->cd);
-}
-
-/*
- - cmtreefree - free a non-terminal part of a colormap tree
- ^ static VOID cmtreefree(struct colormap *, union tree *, int);
- */
-static VOID
-cmtreefree(cm, tree, level)
-struct colormap *cm;
-union tree *tree;
-int level;			/* level number (top == 0) of this block */
-{
-	int i;
-	union tree *t;
-	union tree *fillt = &cm->tree[level+1];
-	union tree *cb;
-
-	assert(level < NBYTS-1);	/* this level has pointers */
-	for (i = BYTTAB-1; i >= 0; i--) {
-		t = tree->tptr[i];
-		assert(t != NULL);
-		if (t != fillt) {
-			if (level < NBYTS-2) {	/* more pointer blocks below */
-				cmtreefree(cm, t, level+1);
-				FREE(t);
-			} else {		/* color block below */
-				cb = cm->cd[t->tcolor[0]].block;
-				if (t != cb)	/* not a solid block */
-					FREE(t);
-			}
-		}
-	}
-}
-
-/*
- - setcolor - set the color of a character in a colormap
- ^ static color setcolor(struct colormap *, pchr, pcolor);
- */
-static color			/* previous color */
-setcolor(cm, c, co)
-struct colormap *cm;
-pchr c;
-pcolor co;
-{
-	uchr uc = c;
-	int shift;
-	int level;
-	int b;
-	int bottom;
-	union tree *t;
-	union tree *newt;
-	union tree *fillt;
-	union tree *lastt;
-	union tree *cb;
-	color prev;
-
-	assert(cm->magic == CMMAGIC);
-	if (CISERR() || co == COLORLESS)
-		return COLORLESS;
-
-	t = cm->tree;
-	for (level = 0, shift = BYTBITS * (NBYTS - 1); shift > 0;
-						level++, shift -= BYTBITS) {
-		b = (uc >> shift) & BYTMASK;
-		lastt = t;
-		t = lastt->tptr[b];
-		assert(t != NULL);
-		fillt = &cm->tree[level+1];
-		bottom = (shift <= BYTBITS) ? 1 : 0;
-		cb = (bottom) ? cm->cd[t->tcolor[0]].block : fillt;
-		if (t == fillt || t == cb) {	/* must allocate a new block */
-			newt = (union tree *)MALLOC((bottom) ?
-				sizeof(struct colors) : sizeof(struct ptrs));
-			if (newt == NULL) {
-				CERR(REG_ESPACE);
-				return COLORLESS;
-			}
-			if (bottom)
-				memcpy(VS(newt->tcolor), VS(t->tcolor),
-							BYTTAB*sizeof(color));
-			else
-				memcpy(VS(newt->tptr), VS(t->tptr),
-						BYTTAB*sizeof(union tree *));
-			t = newt;
-			lastt->tptr[b] = t;
-		}
-	}
-
-	b = uc & BYTMASK;
-	prev = t->tcolor[b];
-	t->tcolor[b] = (color)co;
-	return prev;
-}
-
-/*
- - maxcolor - report largest color number in use
- ^ static color maxcolor(struct colormap *);
- */
-static color
-maxcolor(cm)
-struct colormap *cm;
-{
-	if (CISERR())
-		return COLORLESS;
-
-	return (color)cm->max;
-}
-
-/*
- - newcolor - find a new color (must be subject of setcolor at once)
- * Beware:  may relocate the colordescs.
- ^ static color newcolor(struct colormap *);
- */
-static color			/* COLORLESS for error */
-newcolor(cm)
-struct colormap *cm;
-{
-	struct colordesc *cd;
-	struct colordesc *new;
-	size_t n;
-
-	if (CISERR())
-		return COLORLESS;
-
-	if (cm->free != 0) {
-		assert(cm->free > 0);
-		assert((size_t)cm->free < cm->ncds);
-		cd = &cm->cd[cm->free];
-		assert(UNUSEDCOLOR(cd));
-		assert(cd->arcs == NULL);
-		cm->free = cd->sub;
-	} else if (cm->max < cm->ncds - 1) {
-		cm->max++;
-		cd = &cm->cd[cm->max];
-	} else {
-		/* oops, must allocate more */
-		n = cm->ncds * 2;
-		if (cm->cd == cm->cdspace) {
-			new = (struct colordesc *)MALLOC(n *
-						sizeof(struct colordesc));
-			if (new != NULL)
-				memcpy(VS(new), VS(cm->cdspace), cm->ncds *
-						sizeof(struct colordesc));
-		} else
-			new = (struct colordesc *)REALLOC(cm->cd,
-						n * sizeof(struct colordesc));
-		if (new == NULL) {
-			CERR(REG_ESPACE);
-			return COLORLESS;
-		}
-		cm->cd = new;
-		cm->ncds = n;
-		assert(cm->max < cm->ncds - 1);
-		cm->max++;
-		cd = &cm->cd[cm->max];
-	}
-
-	cd->nchrs = 0;
-	cd->sub = NOSUB;
-	cd->arcs = NULL;
-	cd->flags = 0;
-	cd->block = NULL;
-
-	return (color)(cd - cm->cd);
-}
-
-/*
- - freecolor - free a color (must have no arcs or subcolor)
- ^ static VOID freecolor(struct colormap *, pcolor);
- */
-static VOID
-freecolor(cm, co)
-struct colormap *cm;
-pcolor co;
-{
-	struct colordesc *cd = &cm->cd[co];
-	color pco, nco;			/* for freelist scan */
-
-	assert(co >= 0);
-	if (co == WHITE)
-		return;
-
-	assert(cd->arcs == NULL);
-	assert(cd->sub == NOSUB);
-	assert(cd->nchrs == 0);
-	cd->flags = FREECOL;
-	if (cd->block != NULL) {
-		FREE(cd->block);
-		cd->block = NULL;	/* just paranoia */
-	}
-
-	if ((size_t)co == cm->max) {
-		while (cm->max > WHITE && UNUSEDCOLOR(&cm->cd[cm->max]))
-			cm->max--;
-		assert(cm->free >= 0);
-		while ((size_t)cm->free > cm->max)
-			cm->free = cm->cd[cm->free].sub;
-		if (cm->free > 0) {
-			assert(cm->free < cm->max);
-			pco = cm->free;
-			nco = cm->cd[pco].sub;
-			while (nco > 0)
-				if ((size_t)nco > cm->max) {
-					/* take this one out of freelist */
-					nco = cm->cd[nco].sub;
-					cm->cd[pco].sub = nco;
-				} else {
-					assert(nco < cm->max);
-					pco = nco;
-					nco = cm->cd[pco].sub;
-				}
-		}
-	} else {
-		cd->sub = cm->free;
-		cm->free = (color)(cd - cm->cd);
-	}
-}
-
-/*
- - pseudocolor - allocate a false color, to be managed by other means
- ^ static color pseudocolor(struct colormap *);
- */
-static color
-pseudocolor(cm)
-struct colormap *cm;
-{
-	color co;
-
-	co = newcolor(cm);
-	if (CISERR())
-		return COLORLESS;
-	cm->cd[co].nchrs = 1;
-	cm->cd[co].flags = PSEUDO;
-	return co;
-}
-
-/*
- - subcolor - allocate a new subcolor (if necessary) to this chr
- ^ static color subcolor(struct colormap *, pchr c);
- */
-static color
-subcolor(cm, c)
-struct colormap *cm;
-pchr c;
-{
-	color co;			/* current color of c */
-	color sco;			/* new subcolor */
-
-	co = GETCOLOR(cm, c);
-	sco = newsub(cm, co);
-	if (CISERR())
-		return COLORLESS;
-	assert(sco != COLORLESS);
-
-	if (co == sco)		/* already in an open subcolor */
-		return co;	/* rest is redundant */
-	cm->cd[co].nchrs--;
-	cm->cd[sco].nchrs++;
-	setcolor(cm, c, sco);
-	return sco;
-}
-
-/*
- - newsub - allocate a new subcolor (if necessary) for a color
- ^ static color newsub(struct colormap *, pcolor);
- */
-static color
-newsub(cm, co)
-struct colormap *cm;
-pcolor co;
-{
-	color sco;			/* new subcolor */
-
-	sco = cm->cd[co].sub;
-	if (sco == NOSUB) {		/* color has no open subcolor */
-		if (cm->cd[co].nchrs == 1)	/* optimization */
-			return co;
-		sco = newcolor(cm);	/* must create subcolor */
-		if (sco == COLORLESS) {
-			assert(CISERR());
-			return COLORLESS;
-		}
-		cm->cd[co].sub = sco;
-		cm->cd[sco].sub = sco;	/* open subcolor points to self */
-	}
-	assert(sco != NOSUB);
-
-	return sco;
-}
-
-/*
- - subrange - allocate new subcolors to this range of chrs, fill in arcs
- ^ static VOID subrange(struct vars *, pchr, pchr, struct state *,
- ^ 	struct state *);
- */
-static VOID
-subrange(v, from, to, lp, rp)
-struct vars *v;
-pchr from;
-pchr to;
-struct state *lp;
-struct state *rp;
-{
-	uchr uf;
-	int i;
-
-	assert(from <= to);
-
-	/* first, align "from" on a tree-block boundary */
-	uf = (uchr)from;
-	i = (int)( ((uf + BYTTAB-1) & (uchr)~BYTMASK) - uf );
-	for (; from <= to && i > 0; i--, from++)
-		newarc(v->nfa, PLAIN, subcolor(v->cm, from), lp, rp);
-	if (from > to)			/* didn't reach a boundary */
-		return;
-
-	/* deal with whole blocks */
-	for (; to - from >= BYTTAB; from += BYTTAB)
-		subblock(v, from, lp, rp);
-
-	/* clean up any remaining partial table */
-	for (; from <= to; from++)
-		newarc(v->nfa, PLAIN, subcolor(v->cm, from), lp, rp);
-}
-
-/*
- - subblock - allocate new subcolors for one tree block of chrs, fill in arcs
- ^ static VOID subblock(struct vars *, pchr, struct state *, struct state *);
- */
-static VOID
-subblock(v, start, lp, rp)
-struct vars *v;
-pchr start;			/* first of BYTTAB chrs */
-struct state *lp;
-struct state *rp;
-{
-	uchr uc = start;
-	struct colormap *cm = v->cm;
-	int shift;
-	int level;
-	int i;
-	int b = 0;
-	union tree *t;
-	union tree *cb;
-	union tree *fillt;
-	union tree *lastt = NULL;
-	int previ;
-	int ndone;
-	color co;
-	color sco;
-
-	assert((uc % BYTTAB) == 0);
-
-	/* find its color block, making new pointer blocks as needed */
-	t = cm->tree;
-	fillt = NULL;
-	for (level = 0, shift = BYTBITS * (NBYTS - 1); shift > 0;
-						level++, shift -= BYTBITS) {
-		b = (uc >> shift) & BYTMASK;
-		lastt = t;
-		t = lastt->tptr[b];
-		assert(t != NULL);
-		fillt = &cm->tree[level+1];
-		if (t == fillt && shift > BYTBITS) {	/* need new ptr block */
-			t = (union tree *)MALLOC(sizeof(struct ptrs));
-			if (t == NULL) {
-				CERR(REG_ESPACE);
-				return;
-			}
-			memcpy(VS(t->tptr), VS(fillt->tptr),
-						BYTTAB*sizeof(union tree *));
-			lastt->tptr[b] = t;
-		}
-	}
-
-	/* special cases:  fill block or solid block */
-	co = t->tcolor[0];
-	cb = cm->cd[co].block;
-	if (t == fillt || t == cb) {
-		/* either way, we want a subcolor solid block */
-		sco = newsub(cm, co);
-		t = cm->cd[sco].block;
-		if (t == NULL) {	/* must set it up */
-			t = (union tree *)MALLOC(sizeof(struct colors));
-			if (t == NULL) {
-				CERR(REG_ESPACE);
-				return;
-			}
-			for (i = 0; i < BYTTAB; i++)
-				t->tcolor[i] = sco;
-			cm->cd[sco].block = t;
-		}
-		/* find loop must have run at least once */
-		lastt->tptr[b] = t;
-		newarc(v->nfa, PLAIN, sco, lp, rp);
-		cm->cd[co].nchrs -= BYTTAB;
-		cm->cd[sco].nchrs += BYTTAB;
-		return;
-	}
-
-	/* general case, a mixed block to be altered */
-	i = 0;
-	while (i < BYTTAB) {
-		co = t->tcolor[i];
-		sco = newsub(cm, co);
-		newarc(v->nfa, PLAIN, sco, lp, rp);
-		previ = i;
-		do {
-			t->tcolor[i++] = sco;
-		} while (i < BYTTAB && t->tcolor[i] == co);
-		ndone = i - previ;
-		cm->cd[co].nchrs -= ndone;
-		cm->cd[sco].nchrs += ndone;
-	}
-}
-
-/*
- - okcolors - promote subcolors to full colors
- ^ static VOID okcolors(struct nfa *, struct colormap *);
- */
-static VOID
-okcolors(nfa, cm)
-struct nfa *nfa;
-struct colormap *cm;
-{
-	struct colordesc *cd;
-	struct colordesc *end = CDEND(cm);
-	struct colordesc *scd;
-	struct arc *a;
-	color co;
-	color sco;
-
-	for (cd = cm->cd, co = 0; cd < end; cd++, co++) {
-		sco = cd->sub;
-		if (UNUSEDCOLOR(cd) || sco == NOSUB) {
-			/* has no subcolor, no further action */
-		} else if (sco == co) {
-			/* is subcolor, let parent deal with it */
-		} else if (cd->nchrs == 0) {
-			/* parent empty, its arcs change color to subcolor */
-			cd->sub = NOSUB;
-			scd = &cm->cd[sco];
-			assert(scd->nchrs > 0);
-			assert(scd->sub == sco);
-			scd->sub = NOSUB;
-			while ((a = cd->arcs) != NULL) {
-				assert(a->co == co);
-				/* uncolorchain(cm, a); */
-				cd->arcs = a->colorchain;
-				a->co = sco;
-				/* colorchain(cm, a); */
-				a->colorchain = scd->arcs;
-				scd->arcs = a;
-			}
-			freecolor(cm, co);
-		} else {
-			/* parent's arcs must gain parallel subcolor arcs */
-			cd->sub = NOSUB;
-			scd = &cm->cd[sco];
-			assert(scd->nchrs > 0);
-			assert(scd->sub == sco);
-			scd->sub = NOSUB;
-			for (a = cd->arcs; a != NULL; a = a->colorchain) {
-				assert(a->co == co);
-				newarc(nfa, a->type, sco, a->from, a->to);
-			}
-		}
-	}
-}
-
-/*
- - colorchain - add this arc to the color chain of its color
- ^ static VOID colorchain(struct colormap *, struct arc *);
- */
-static VOID
-colorchain(cm, a)
-struct colormap *cm;
-struct arc *a;
-{
-	struct colordesc *cd = &cm->cd[a->co];
-
-	a->colorchain = cd->arcs;
-	cd->arcs = a;
-}
-
-/*
- - uncolorchain - delete this arc from the color chain of its color
- ^ static VOID uncolorchain(struct colormap *, struct arc *);
- */
-static VOID
-uncolorchain(cm, a)
-struct colormap *cm;
-struct arc *a;
-{
-	struct colordesc *cd = &cm->cd[a->co];
-	struct arc *aa;
-
-	aa = cd->arcs;
-	if (aa == a)		/* easy case */
-		cd->arcs = a->colorchain;
-	else {
-		for (; aa != NULL && aa->colorchain != a; aa = aa->colorchain)
-			continue;
-		assert(aa != NULL);
-		aa->colorchain = a->colorchain;
-	}
-	a->colorchain = NULL;	/* paranoia */
-}
-
-/*
- - singleton - is this character in its own color?
- ^ static int singleton(struct colormap *, pchr c);
- */
-static int			/* predicate */
-singleton(cm, c)
-struct colormap *cm;
-pchr c;
-{
-	color co;			/* color of c */
-
-	co = GETCOLOR(cm, c);
-	if (cm->cd[co].nchrs == 1 && cm->cd[co].sub == NOSUB)
-		return 1;
-	return 0;
-}
-
-/*
- - rainbow - add arcs of all full colors (but one) between specified states
- ^ static VOID rainbow(struct nfa *, struct colormap *, int, pcolor,
- ^ 	struct state *, struct state *);
- */
-static VOID
-rainbow(nfa, cm, type, but, from, to)
-struct nfa *nfa;
-struct colormap *cm;
-int type;
-pcolor but;			/* COLORLESS if no exceptions */
-struct state *from;
-struct state *to;
-{
-	struct colordesc *cd;
-	struct colordesc *end = CDEND(cm);
-	color co;
-
-	for (cd = cm->cd, co = 0; cd < end && !CISERR(); cd++, co++)
-		if (!UNUSEDCOLOR(cd) && cd->sub != co && co != but &&
-							!(cd->flags&PSEUDO))
-			newarc(nfa, type, co, from, to);
-}
-
-/*
- - colorcomplement - add arcs of complementary colors
- * The calling sequence ought to be reconciled with cloneouts().
- ^ static VOID colorcomplement(struct nfa *, struct colormap *, int,
- ^ 	struct state *, struct state *, struct state *);
- */
-static VOID
-colorcomplement(nfa, cm, type, of, from, to)
-struct nfa *nfa;
-struct colormap *cm;
-int type;
-struct state *of;		/* complements of this guy's PLAIN outarcs */
-struct state *from;
-struct state *to;
-{
-	struct colordesc *cd;
-	struct colordesc *end = CDEND(cm);
-	color co;
-
-	assert(of != from);
-	for (cd = cm->cd, co = 0; cd < end && !CISERR(); cd++, co++)
-		if (!UNUSEDCOLOR(cd) && !(cd->flags&PSEUDO))
-			if (findarc(of, PLAIN, co) == NULL)
-				newarc(nfa, type, co, from, to);
-}
-
-
-
-#ifdef REG_DEBUG
-/*
- ^ #ifdef REG_DEBUG
- */
-
-/*
- - dumpcolors - debugging output
- ^ static VOID dumpcolors(struct colormap *, FILE *);
- */
-static VOID
-dumpcolors(cm, f)
-struct colormap *cm;
-FILE *f;
-{
-	struct colordesc *cd;
-	struct colordesc *end;
-	color co;
-	chr c;
-	char *has;
-
-	fprintf(f, "max %ld\n", (long)cm->max);
-	if (NBYTS > 1)
-		fillcheck(cm, cm->tree, 0, f);
-	end = CDEND(cm);
-	for (cd = cm->cd + 1, co = 1; cd < end; cd++, co++)	/* skip 0 */
-		if (!UNUSEDCOLOR(cd)) {
-			assert(cd->nchrs > 0);
-			has = (cd->block != NULL) ? "#" : "";
-			if (cd->flags&PSEUDO)
-				fprintf(f, "#%2ld%s(ps): ", (long)co, has);
-			else
-				fprintf(f, "#%2ld%s(%2d): ", (long)co,
-							has, cd->nchrs);
-			/* it's hard to do this more efficiently */
-			for (c = CHR_MIN; c < CHR_MAX; c++)
-				if (GETCOLOR(cm, c) == co)
-					dumpchr(c, f);
-			assert(c == CHR_MAX);
-			if (GETCOLOR(cm, c) == co)
-				dumpchr(c, f);
-			fprintf(f, "\n");
-		}
-}
-
-/*
- - fillcheck - check proper filling of a tree
- ^ static VOID fillcheck(struct colormap *, union tree *, int, FILE *);
- */
-static VOID
-fillcheck(cm, tree, level, f)
-struct colormap *cm;
-union tree *tree;
-int level;			/* level number (top == 0) of this block */
-FILE *f;
-{
-	int i;
-	union tree *t;
-	union tree *fillt = &cm->tree[level+1];
-
-	assert(level < NBYTS-1);	/* this level has pointers */
-	for (i = BYTTAB-1; i >= 0; i--) {
-		t = tree->tptr[i];
-		if (t == NULL)
-			fprintf(f, "NULL found in filled tree!\n");
-		else if (t == fillt)
-			{}
-		else if (level < NBYTS-2)	/* more pointer blocks below */
-			fillcheck(cm, t, level+1, f);
-	}
-}
-
-/*
- - dumpchr - print a chr
- * Kind of char-centric but works well enough for debug use.
- ^ static VOID dumpchr(pchr, FILE *);
- */
-static VOID
-dumpchr(c, f)
-pchr c;
-FILE *f;
-{
-	if (c == '\\')
-		fprintf(f, "\\\\");
-	else if (c > ' ' && c <= '~')
-		putc((char)c, f);
-	else
-		fprintf(f, "\\u%04lx", (long)c);
-}
-
-/*
- ^ #endif
- */
-#endif				/* ifdef REG_DEBUG */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regc_cvec.c b/3rdparty/wxwidgets3.0-3.0.1/src/regex/regc_cvec.c
deleted file mode 100644
index d2d56fc70a..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regc_cvec.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Utility functions for handling cvecs
- * This file is #included by regcomp.c.
- *
- * Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
- * 
- * Development of this software was funded, in part, by Cray Research Inc.,
- * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
- * Corporation, none of whom are responsible for the results.  The author
- * thanks all of them. 
- * 
- * Redistribution and use in source and binary forms -- with or without
- * modification -- are permitted for any purpose, provided that
- * redistributions in source form retain this entire copyright notice and
- * indicate the origin and nature of any modifications.
- * 
- * I'd appreciate being given credit for this package in the documentation
- * of software which uses it, but that is not a requirement.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/*
- - newcvec - allocate a new cvec
- ^ static struct cvec *newcvec(int, int, int);
- */
-static struct cvec *
-newcvec(nchrs, nranges, nmcces)
-    int nchrs;				/* to hold this many chrs... */
-    int nranges;			/* ... and this many ranges... */
-    int nmcces;				/* ... and this many MCCEs */
-{
-    size_t n;
-    size_t nc;
-    struct cvec *cv;
-
-    nc = (size_t)nchrs + (size_t)nmcces*(MAXMCCE+1) + (size_t)nranges*2;
-    n = sizeof(struct cvec) + (size_t)(nmcces-1)*sizeof(chr *)
-	    + nc*sizeof(chr);
-    cv = (struct cvec *)MALLOC(n);
-    if (cv == NULL) {
-	return NULL;
-    }
-    cv->chrspace = nchrs;
-    cv->chrs = (chr *)&cv->mcces[nmcces];	/* chrs just after MCCE ptrs */
-    cv->mccespace = nmcces;
-    cv->ranges = cv->chrs + nchrs + nmcces*(MAXMCCE+1);
-    cv->rangespace = nranges;
-    return clearcvec(cv);
-}
-
-/*
- - clearcvec - clear a possibly-new cvec
- * Returns pointer as convenience.
- ^ static struct cvec *clearcvec(struct cvec *);
- */
-static struct cvec *
-clearcvec(cv)
-    struct cvec *cv;			/* character vector */
-{
-    int i;
-
-    assert(cv != NULL);
-    cv->nchrs = 0;
-    assert(cv->chrs == (chr *)&cv->mcces[cv->mccespace]);
-    cv->nmcces = 0;
-    cv->nmccechrs = 0;
-    cv->nranges = 0;
-    for (i = 0; i < cv->mccespace; i++) {
-	cv->mcces[i] = NULL;
-    }
-
-    return cv;
-}
-
-/*
- - addchr - add a chr to a cvec
- ^ static VOID addchr(struct cvec *, pchr);
- */
-static VOID
-addchr(cv, c)
-    struct cvec *cv;			/* character vector */
-    pchr c;				/* character to add */
-{
-    assert(cv->nchrs < cv->chrspace - cv->nmccechrs);
-    cv->chrs[cv->nchrs++] = (chr)c;
-}
-
-/*
- - addrange - add a range to a cvec
- ^ static VOID addrange(struct cvec *, pchr, pchr);
- */
-static VOID
-addrange(cv, from, to)
-    struct cvec *cv;			/* character vector */
-    pchr from;				/* first character of range */
-    pchr to;				/* last character of range */
-{
-    assert(cv->nranges < cv->rangespace);
-    cv->ranges[cv->nranges*2] = (chr)from;
-    cv->ranges[cv->nranges*2 + 1] = (chr)to;
-    cv->nranges++;
-}
-
-/*
- - addmcce - add an MCCE to a cvec
- ^ static VOID addmcce(struct cvec *, chr *, chr *);
- */
-static VOID
-addmcce(cv, startp, endp)
-    struct cvec *cv;			/* character vector */
-    chr *startp;			/* beginning of text */
-    chr *endp;				/* just past end of text */
-{
-    int len;
-    int i;
-    chr *s;
-    chr *d;
-
-    if (startp == NULL && endp == NULL) {
-	return;
-    }
-    len = endp - startp;
-    assert(len > 0);
-    assert(cv->nchrs + len < cv->chrspace - cv->nmccechrs);
-    assert(cv->nmcces < cv->mccespace);
-    d = &cv->chrs[cv->chrspace - cv->nmccechrs - len - 1];
-    cv->mcces[cv->nmcces++] = d;
-    for (s = startp, i = len; i > 0; s++, i--) {
-	*d++ = *s;
-    }
-    *d++ = 0;				/* endmarker */
-    assert(d == &cv->chrs[cv->chrspace - cv->nmccechrs]);
-    cv->nmccechrs += len + 1;
-}
-
-/*
- - haschr - does a cvec contain this chr?
- ^ static int haschr(struct cvec *, pchr);
- */
-static int				/* predicate */
-haschr(cv, c)
-    struct cvec *cv;			/* character vector */
-    pchr c;				/* character to test for */
-{
-    int i;
-    chr *p;
-
-    for (p = cv->chrs, i = cv->nchrs; i > 0; p++, i--) {
-	if (*p == c) {
-	    return 1;
-	}
-    }
-    for (p = cv->ranges, i = cv->nranges; i > 0; p += 2, i--) {
-	if ((*p <= c) && (c <= *(p+1))) {
-	    return 1;
-	}
-    }
-    return 0;
-}
-
-/*
- - getcvec - get a cvec, remembering it as v->cv
- ^ static struct cvec *getcvec(struct vars *, int, int, int);
- */
-static struct cvec *
-getcvec(v, nchrs, nranges, nmcces)
-    struct vars *v;			/* context */
-    int nchrs;				/* to hold this many chrs... */
-    int nranges;			/* ... and this many ranges... */
-    int nmcces;				/* ... and this many MCCEs */
-{
-    if (v->cv != NULL && nchrs <= v->cv->chrspace &&
-	    nranges <= v->cv->rangespace && nmcces <= v->cv->mccespace) {
-	return clearcvec(v->cv);
-    }
-
-    if (v->cv != NULL) {
-	freecvec(v->cv);
-    }
-    v->cv = newcvec(nchrs, nranges, nmcces);
-    if (v->cv == NULL) {
-	ERR(REG_ESPACE);
-    }
-
-    return v->cv;
-}
-
-/*
- - freecvec - free a cvec
- ^ static VOID freecvec(struct cvec *);
- */
-static VOID
-freecvec(cv)
-    struct cvec *cv;			/* character vector */
-{
-    FREE(cv);
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regc_lex.c b/3rdparty/wxwidgets3.0-3.0.1/src/regex/regc_lex.c
deleted file mode 100644
index 1acc3f4cae..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regc_lex.c
+++ /dev/null
@@ -1,1061 +0,0 @@
-/*
- * lexical analyzer
- * This file is #included by regcomp.c.
- *
- * Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
- * 
- * Development of this software was funded, in part, by Cray Research Inc.,
- * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
- * Corporation, none of whom are responsible for the results.  The author
- * thanks all of them. 
- * 
- * Redistribution and use in source and binary forms -- with or without
- * modification -- are permitted for any purpose, provided that
- * redistributions in source form retain this entire copyright notice and
- * indicate the origin and nature of any modifications.
- * 
- * I'd appreciate being given credit for this package in the documentation
- * of software which uses it, but that is not a requirement.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/* scanning macros (know about v) */
-#define	ATEOS()		(v->now >= v->stop)
-#define	HAVE(n)		(v->stop - v->now >= (n))
-#define	NEXT1(c)	(!ATEOS() && *v->now == CHR(c))
-#define	NEXT2(a,b)	(HAVE(2) && *v->now == CHR(a) && *(v->now+1) == CHR(b))
-#define	NEXT3(a,b,c)	(HAVE(3) && *v->now == CHR(a) && \
-						*(v->now+1) == CHR(b) && \
-						*(v->now+2) == CHR(c))
-#define	SET(c)		(v->nexttype = (c))
-#define	SETV(c, n)	(v->nexttype = (c), v->nextvalue = (n))
-#define	RET(c)		return (SET(c), 1)
-#define	RETV(c, n)	return (SETV(c, n), 1)
-#define	FAILW(e)	return (ERR(e), 0)	/* ERR does SET(EOS) */
-#define	LASTTYPE(t)	(v->lasttype == (t))
-
-/* lexical contexts */
-#define	L_ERE	1	/* mainline ERE/ARE */
-#define	L_BRE	2	/* mainline BRE */
-#define	L_Q	3	/* REG_QUOTE */
-#define	L_EBND	4	/* ERE/ARE bound */
-#define	L_BBND	5	/* BRE bound */
-#define	L_BRACK	6	/* brackets */
-#define	L_CEL	7	/* collating element */
-#define	L_ECL	8	/* equivalence class */
-#define	L_CCL	9	/* character class */
-#define	INTOCON(c)	(v->lexcon = (c))
-#define	INCON(con)	(v->lexcon == (con))
-
-/* construct pointer past end of chr array */
-#define	ENDOF(array)	((array) + sizeof(array)/sizeof(chr))
-
-/*
- - lexstart - set up lexical stuff, scan leading options
- ^ static VOID lexstart(struct vars *);
- */
-static VOID
-lexstart(v)
-struct vars *v;
-{
-	prefixes(v);			/* may turn on new type bits etc. */
-	NOERR();
-
-	if (v->cflags®_QUOTE) {
-		assert(!(v->cflags&(REG_ADVANCED|REG_EXPANDED|REG_NEWLINE)));
-		INTOCON(L_Q);
-	} else if (v->cflags®_EXTENDED) {
-		assert(!(v->cflags®_QUOTE));
-		INTOCON(L_ERE);
-	} else {
-		assert(!(v->cflags&(REG_QUOTE|REG_ADVF)));
-		INTOCON(L_BRE);
-	}
-
-	v->nexttype = EMPTY;		/* remember we were at the start */
-	next(v);			/* set up the first token */
-}
-
-/*
- - prefixes - implement various special prefixes
- ^ static VOID prefixes(struct vars *);
- */
-static VOID
-prefixes(v)
-struct vars *v;
-{
-	/* literal string doesn't get any of this stuff */
-	if (v->cflags®_QUOTE)
-		return;
-
-	/* initial "***" gets special things */	
-	if (HAVE(4) && NEXT3('*', '*', '*'))
-		switch (*(v->now + 3)) {
-		case CHR('?'):		/* "***?" error, msg shows version */
-			ERR(REG_BADPAT);
-			return;		/* proceed no further */
-			break;
-		case CHR('='):		/* "***=" shifts to literal string */
-			NOTE(REG_UNONPOSIX);
-			v->cflags |= REG_QUOTE;
-			v->cflags &= ~(REG_ADVANCED|REG_EXPANDED|REG_NEWLINE);
-			v->now += 4;
-			return;		/* and there can be no more prefixes */
-			break;
-		case CHR(':'):		/* "***:" shifts to AREs */
-			NOTE(REG_UNONPOSIX);
-			v->cflags |= REG_ADVANCED;
-			v->now += 4;
-			break;
-		default:		/* otherwise *** is just an error */
-			ERR(REG_BADRPT);
-			return;
-			break;
-		}
-
-	/* BREs and EREs don't get embedded options */
-	if ((v->cflags®_ADVANCED) != REG_ADVANCED)
-		return;
-
-	/* embedded options (AREs only) */
-	if (HAVE(3) && NEXT2('(', '?') && iscalpha(*(v->now + 2))) {
-		NOTE(REG_UNONPOSIX);
-		v->now += 2;
-		for (; !ATEOS() && iscalpha(*v->now); v->now++)
-			switch (*v->now) {
-			case CHR('b'):		/* BREs (but why???) */
-				v->cflags &= ~(REG_ADVANCED|REG_QUOTE);
-				break;
-			case CHR('c'):		/* case sensitive */
-				v->cflags &= ~REG_ICASE;
-				break;
-			case CHR('e'):		/* plain EREs */
-				v->cflags |= REG_EXTENDED;
-				v->cflags &= ~(REG_ADVF|REG_QUOTE);
-				break;
-			case CHR('i'):		/* case insensitive */
-				v->cflags |= REG_ICASE;
-				break;
-			case CHR('m'):		/* Perloid synonym for n */
-			case CHR('n'):		/* \n affects ^ $ . [^ */
-				v->cflags |= REG_NEWLINE;
-				break;
-			case CHR('p'):		/* ~Perl, \n affects . [^ */
-				v->cflags |= REG_NLSTOP;
-				v->cflags &= ~REG_NLANCH;
-				break;
-			case CHR('q'):		/* literal string */
-				v->cflags |= REG_QUOTE;
-				v->cflags &= ~REG_ADVANCED;
-				break;
-			case CHR('s'):		/* single line, \n ordinary */
-				v->cflags &= ~REG_NEWLINE;
-				break;
-			case CHR('t'):		/* tight syntax */
-				v->cflags &= ~REG_EXPANDED;
-				break;
-			case CHR('w'):		/* weird, \n affects ^ $ only */
-				v->cflags &= ~REG_NLSTOP;
-				v->cflags |= REG_NLANCH;
-				break;
-			case CHR('x'):		/* expanded syntax */
-				v->cflags |= REG_EXPANDED;
-				break;
-			default:
-				ERR(REG_BADOPT);
-				return;
-			}
-		if (!NEXT1(')')) {
-			ERR(REG_BADOPT);
-			return;
-		}
-		v->now++;
-		if (v->cflags®_QUOTE)
-			v->cflags &= ~(REG_EXPANDED|REG_NEWLINE);
-	}
-}
-
-/*
- - lexnest - "call a subroutine", interpolating string at the lexical level
- * Note, this is not a very general facility.  There are a number of
- * implicit assumptions about what sorts of strings can be subroutines.
- ^ static VOID lexnest(struct vars *, chr *, chr *);
- */
-static VOID
-lexnest(v, beginp, endp)
-struct vars *v;
-chr *beginp;				/* start of interpolation */
-chr *endp;				/* one past end of interpolation */
-{
-	assert(v->savenow == NULL);	/* only one level of nesting */
-	v->savenow = v->now;
-	v->savestop = v->stop;
-	v->now = beginp;
-	v->stop = endp;
-}
-
-/*
- * string constants to interpolate as expansions of things like \d
- */
-static chr backd[] = {		/* \d */
-	CHR('['), CHR('['), CHR(':'),
-	CHR('d'), CHR('i'), CHR('g'), CHR('i'), CHR('t'),
-	CHR(':'), CHR(']'), CHR(']')
-};
-static chr backD[] = {		/* \D */
-	CHR('['), CHR('^'), CHR('['), CHR(':'),
-	CHR('d'), CHR('i'), CHR('g'), CHR('i'), CHR('t'),
-	CHR(':'), CHR(']'), CHR(']')
-};
-static chr brbackd[] = {	/* \d within brackets */
-	CHR('['), CHR(':'),
-	CHR('d'), CHR('i'), CHR('g'), CHR('i'), CHR('t'),
-	CHR(':'), CHR(']')
-};
-static chr backs[] = {		/* \s */
-	CHR('['), CHR('['), CHR(':'),
-	CHR('s'), CHR('p'), CHR('a'), CHR('c'), CHR('e'),
-	CHR(':'), CHR(']'), CHR(']')
-};
-static chr backS[] = {		/* \S */
-	CHR('['), CHR('^'), CHR('['), CHR(':'),
-	CHR('s'), CHR('p'), CHR('a'), CHR('c'), CHR('e'),
-	CHR(':'), CHR(']'), CHR(']')
-};
-static chr brbacks[] = {	/* \s within brackets */
-	CHR('['), CHR(':'),
-	CHR('s'), CHR('p'), CHR('a'), CHR('c'), CHR('e'),
-	CHR(':'), CHR(']')
-};
-static chr backw[] = {		/* \w */
-	CHR('['), CHR('['), CHR(':'),
-	CHR('a'), CHR('l'), CHR('n'), CHR('u'), CHR('m'),
-	CHR(':'), CHR(']'), CHR('_'), CHR(']')
-};
-static chr backW[] = {		/* \W */
-	CHR('['), CHR('^'), CHR('['), CHR(':'),
-	CHR('a'), CHR('l'), CHR('n'), CHR('u'), CHR('m'),
-	CHR(':'), CHR(']'), CHR('_'), CHR(']')
-};
-static chr brbackw[] = {	/* \w within brackets */
-	CHR('['), CHR(':'),
-	CHR('a'), CHR('l'), CHR('n'), CHR('u'), CHR('m'),
-	CHR(':'), CHR(']'), CHR('_')
-};
-
-/*
- - lexword - interpolate a bracket expression for word characters
- * Possibly ought to inquire whether there is a "word" character class.
- ^ static VOID lexword(struct vars *);
- */
-static VOID
-lexword(v)
-struct vars *v;
-{
-	lexnest(v, backw, ENDOF(backw));
-}
-
-/*
- - next - get next token
- ^ static int next(struct vars *);
- */
-static int			/* 1 normal, 0 failure */
-next(v)
-struct vars *v;
-{
-	chr c;
-
-	/* errors yield an infinite sequence of failures */
-	if (ISERR())
-		return 0;	/* the error has set nexttype to EOS */
-
-	/* remember flavor of last token */
-	v->lasttype = v->nexttype;
-
-	/* REG_BOSONLY */
-	if (v->nexttype == EMPTY && (v->cflags®_BOSONLY)) {
-		/* at start of a REG_BOSONLY RE */
-		RETV(SBEGIN, 0);		/* same as \A */
-	}
-
-	/* if we're nested and we've hit end, return to outer level */
-	if (v->savenow != NULL && ATEOS()) {
-		v->now = v->savenow;
-		v->stop = v->savestop;
-		v->savenow = v->savestop = NULL;
-	}
-
-	/* skip white space etc. if appropriate (not in literal or []) */
-	if (v->cflags®_EXPANDED)
-		switch (v->lexcon) {
-		case L_ERE:
-		case L_BRE:
-		case L_EBND:
-		case L_BBND:
-			skip(v);
-			break;
-		}
-
-	/* handle EOS, depending on context */
-	if (ATEOS()) {
-		switch (v->lexcon) {
-		case L_ERE:
-		case L_BRE:
-		case L_Q:
-			RET(EOS);
-			break;
-		case L_EBND:
-		case L_BBND:
-			FAILW(REG_EBRACE);
-			break;
-		case L_BRACK:
-		case L_CEL:
-		case L_ECL:
-		case L_CCL:
-			FAILW(REG_EBRACK);
-			break;
-		}
-		assert(NOTREACHED);
-	}
-
-	/* okay, time to actually get a character */
-	c = *v->now++;
-
-	/* deal with the easy contexts, punt EREs to code below */
-	switch (v->lexcon) {
-	case L_BRE:			/* punt BREs to separate function */
-		return brenext(v, c);
-		break;
-	case L_ERE:			/* see below */
-		break;
-	case L_Q:			/* literal strings are easy */
-		RETV(PLAIN, c);
-		break;
-	case L_BBND:			/* bounds are fairly simple */
-	case L_EBND:
-		switch (c) {
-		case CHR('0'): case CHR('1'): case CHR('2'): case CHR('3'):
-		case CHR('4'): case CHR('5'): case CHR('6'): case CHR('7'):
-		case CHR('8'): case CHR('9'):
-			RETV(DIGIT, (chr)DIGITVAL(c));
-			break;
-		case CHR(','):
-			RET(',');
-			break;
-		case CHR('}'):		/* ERE bound ends with } */
-			if (INCON(L_EBND)) {
-				INTOCON(L_ERE);
-				if ((v->cflags®_ADVF) && NEXT1('?')) {
-					v->now++;
-					NOTE(REG_UNONPOSIX);
-					RETV('}', 0);
-				}
-				RETV('}', 1);
-			} else
-				FAILW(REG_BADBR);
-			break;
-		case CHR('\\'):		/* BRE bound ends with \} */
-			if (INCON(L_BBND) && NEXT1('}')) {
-				v->now++;
-				INTOCON(L_BRE);
-				RET('}');
-			} else
-				FAILW(REG_BADBR);
-			break;
-		default:
-			FAILW(REG_BADBR);
-			break;
-		}
-		assert(NOTREACHED);
-		break;
-	case L_BRACK:			/* brackets are not too hard */
-		switch (c) {
-		case CHR(']'):
-			if (LASTTYPE('['))
-				RETV(PLAIN, c);
-			else {
-				INTOCON((v->cflags®_EXTENDED) ?
-							L_ERE : L_BRE);
-				RET(']');
-			}
-			break;
-		case CHR('\\'):
-			NOTE(REG_UBBS);
-			if (!(v->cflags®_ADVF))
-				RETV(PLAIN, c);
-			NOTE(REG_UNONPOSIX);
-			if (ATEOS())
-				FAILW(REG_EESCAPE);
-			(DISCARD)lexescape(v);
-			switch (v->nexttype) {	/* not all escapes okay here */
-			case PLAIN:
-				return 1;
-				break;
-			case CCLASS:
-				switch (v->nextvalue) {
-				case 'd':
-					lexnest(v, brbackd, ENDOF(brbackd));
-					break;
-				case 's':
-					lexnest(v, brbacks, ENDOF(brbacks));
-					break;
-				case 'w':
-					lexnest(v, brbackw, ENDOF(brbackw));
-					break;
-				default:
-					FAILW(REG_EESCAPE);
-					break;
-				}
-				/* lexnest done, back up and try again */
-				v->nexttype = v->lasttype;
-				return next(v);
-				break;
-			}
-			/* not one of the acceptable escapes */
-			FAILW(REG_EESCAPE);
-			break;
-		case CHR('-'):
-			if (LASTTYPE('[') || NEXT1(']'))
-				RETV(PLAIN, c);
-			else
-				RETV(RANGE, c);
-			break;
-		case CHR('['):
-			if (ATEOS())
-				FAILW(REG_EBRACK);
-			switch (*v->now++) {
-			case CHR('.'):
-				INTOCON(L_CEL);
-				/* might or might not be locale-specific */
-				RET(COLLEL);
-				break;
-			case CHR('='):
-				INTOCON(L_ECL);
-				NOTE(REG_ULOCALE);
-				RET(ECLASS);
-				break;
-			case CHR(':'):
-				INTOCON(L_CCL);
-				NOTE(REG_ULOCALE);
-				RET(CCLASS);
-				break;
-			default:			/* oops */
-				v->now--;
-				RETV(PLAIN, c);
-				break;
-			}
-			assert(NOTREACHED);
-			break;
-		default:
-			RETV(PLAIN, c);
-			break;
-		}
-		assert(NOTREACHED);
-		break;
-	case L_CEL:			/* collating elements are easy */
-		if (c == CHR('.') && NEXT1(']')) {
-			v->now++;
-			INTOCON(L_BRACK);
-			RETV(END, '.');
-		} else
-			RETV(PLAIN, c);
-		break;
-	case L_ECL:			/* ditto equivalence classes */
-		if (c == CHR('=') && NEXT1(']')) {
-			v->now++;
-			INTOCON(L_BRACK);
-			RETV(END, '=');
-		} else
-			RETV(PLAIN, c);
-		break;
-	case L_CCL:			/* ditto character classes */
-		if (c == CHR(':') && NEXT1(']')) {
-			v->now++;
-			INTOCON(L_BRACK);
-			RETV(END, ':');
-		} else
-			RETV(PLAIN, c);
-		break;
-	default:
-		assert(NOTREACHED);
-		break;
-	}
-
-	/* that got rid of everything except EREs and AREs */
-	assert(INCON(L_ERE));
-
-	/* deal with EREs and AREs, except for backslashes */
-	switch (c) {
-	case CHR('|'):
-		RET('|');
-		break;
-	case CHR('*'):
-		if ((v->cflags®_ADVF) && NEXT1('?')) {
-			v->now++;
-			NOTE(REG_UNONPOSIX);
-			RETV('*', 0);
-		}
-		RETV('*', 1);
-		break;
-	case CHR('+'):
-		if ((v->cflags®_ADVF) && NEXT1('?')) {
-			v->now++;
-			NOTE(REG_UNONPOSIX);
-			RETV('+', 0);
-		}
-		RETV('+', 1);
-		break;
-	case CHR('?'):
-		if ((v->cflags®_ADVF) && NEXT1('?')) {
-			v->now++;
-			NOTE(REG_UNONPOSIX);
-			RETV('?', 0);
-		}
-		RETV('?', 1);
-		break;
-	case CHR('{'):		/* bounds start or plain character */
-		if (v->cflags®_EXPANDED)
-			skip(v);
-		if (ATEOS() || !iscdigit(*v->now)) {
-			NOTE(REG_UBRACES);
-			NOTE(REG_UUNSPEC);
-			RETV(PLAIN, c);
-		} else {
-			NOTE(REG_UBOUNDS);
-			INTOCON(L_EBND);
-			RET('{');
-		}
-		assert(NOTREACHED);
-		break;
-	case CHR('('):		/* parenthesis, or advanced extension */
-		if ((v->cflags®_ADVF) && NEXT1('?')) {
-			NOTE(REG_UNONPOSIX);
-			v->now++;
-			switch (*v->now++) {
-			case CHR(':'):		/* non-capturing paren */
-				RETV('(', 0);
-				break;
-			case CHR('#'):		/* comment */
-				while (!ATEOS() && *v->now != CHR(')'))
-					v->now++;
-				if (!ATEOS())
-					v->now++;
-				assert(v->nexttype == v->lasttype);
-				return next(v);
-				break;
-			case CHR('='):		/* positive lookahead */
-				NOTE(REG_ULOOKAHEAD);
-				RETV(LACON, 1);
-				break;
-			case CHR('!'):		/* negative lookahead */
-				NOTE(REG_ULOOKAHEAD);
-				RETV(LACON, 0);
-				break;
-			default:
-				FAILW(REG_BADRPT);
-				break;
-			}
-			assert(NOTREACHED);
-		}
-		if (v->cflags®_NOSUB)
-			RETV('(', 0);		/* all parens non-capturing */
-		else
-			RETV('(', 1);
-		break;
-	case CHR(')'):
-		if (LASTTYPE('(')) {
-			NOTE(REG_UUNSPEC);
-		}
-		RETV(')', c);
-		break;
-	case CHR('['):		/* easy except for [[:<:]] and [[:>:]] */
-		if (HAVE(6) &&	*(v->now+0) == CHR('[') &&
-				*(v->now+1) == CHR(':') &&
-				(*(v->now+2) == CHR('<') ||
-						*(v->now+2) == CHR('>')) &&
-				*(v->now+3) == CHR(':') &&
-				*(v->now+4) == CHR(']') &&
-				*(v->now+5) == CHR(']')) {
-			c = *(v->now+2);
-			v->now += 6;
-			NOTE(REG_UNONPOSIX);
-			RET((c == CHR('<')) ? '<' : '>');
-		}
-		INTOCON(L_BRACK);
-		if (NEXT1('^')) {
-			v->now++;
-			RETV('[', 0);
-		}
-		RETV('[', 1);
-		break;
-	case CHR('.'):
-		RET('.');
-		break;
-	case CHR('^'):
-		RET('^');
-		break;
-	case CHR('$'):
-		RET('$');
-		break;
-	case CHR('\\'):		/* mostly punt backslashes to code below */
-		if (ATEOS())
-			FAILW(REG_EESCAPE);
-		break;
-	default:		/* ordinary character */
-		RETV(PLAIN, c);
-		break;
-	}
-
-	/* ERE/ARE backslash handling; backslash already eaten */
-	assert(!ATEOS());
-	if (!(v->cflags®_ADVF)) {	/* only AREs have non-trivial escapes */
-		if (iscalnum(*v->now)) {
-			NOTE(REG_UBSALNUM);
-			NOTE(REG_UUNSPEC);
-		}
-		RETV(PLAIN, *v->now++);
-	}
-	(DISCARD)lexescape(v);
-	if (ISERR())
-		FAILW(REG_EESCAPE);
-	if (v->nexttype == CCLASS) {	/* fudge at lexical level */
-		switch (v->nextvalue) {
-		case 'd':	lexnest(v, backd, ENDOF(backd)); break;
-		case 'D':	lexnest(v, backD, ENDOF(backD)); break;
-		case 's':	lexnest(v, backs, ENDOF(backs)); break;
-		case 'S':	lexnest(v, backS, ENDOF(backS)); break;
-		case 'w':	lexnest(v, backw, ENDOF(backw)); break;
-		case 'W':	lexnest(v, backW, ENDOF(backW)); break;
-		default:
-			assert(NOTREACHED);
-			FAILW(REG_ASSERT);
-			break;
-		}
-		/* lexnest done, back up and try again */
-		v->nexttype = v->lasttype;
-		return next(v);
-	}
-	/* otherwise, lexescape has already done the work */
-	return !ISERR();
-}
-
-/*
- - lexescape - parse an ARE backslash escape (backslash already eaten)
- * Note slightly nonstandard use of the CCLASS type code.
- ^ static int lexescape(struct vars *);
- */
-static int			/* not actually used, but convenient for RETV */
-lexescape(v)
-struct vars *v;
-{
-	chr c;
-	static chr alert[] = {
-		CHR('a'), CHR('l'), CHR('e'), CHR('r'), CHR('t')
-	};
-	static chr esc[] = {
-		CHR('E'), CHR('S'), CHR('C')
-	};
-	chr *save;
-
-	assert(v->cflags®_ADVF);
-
-	assert(!ATEOS());
-	c = *v->now++;
-	if (!iscalnum(c))
-		RETV(PLAIN, c);
-
-	NOTE(REG_UNONPOSIX);
-	switch (c) {
-	case CHR('a'):
-		RETV(PLAIN, chrnamed(v, alert, ENDOF(alert), CHR('\007')));
-		break;
-	case CHR('A'):
-		RETV(SBEGIN, 0);
-		break;
-	case CHR('b'):
-		RETV(PLAIN, CHR('\b'));
-		break;
-	case CHR('B'):
-		RETV(PLAIN, CHR('\\'));
-		break;
-	case CHR('c'):
-		NOTE(REG_UUNPORT);
-		if (ATEOS())
-			FAILW(REG_EESCAPE);
-		RETV(PLAIN, (chr)(*v->now++ & 037));
-		break;
-	case CHR('d'):
-		NOTE(REG_ULOCALE);
-		RETV(CCLASS, 'd');
-		break;
-	case CHR('D'):
-		NOTE(REG_ULOCALE);
-		RETV(CCLASS, 'D');
-		break;
-	case CHR('e'):
-		NOTE(REG_UUNPORT);
-		RETV(PLAIN, chrnamed(v, esc, ENDOF(esc), CHR('\033')));
-		break;
-	case CHR('f'):
-		RETV(PLAIN, CHR('\f'));
-		break;
-	case CHR('m'):
-		RET('<');
-		break;
-	case CHR('M'):
-		RET('>');
-		break;
-	case CHR('n'):
-		RETV(PLAIN, CHR('\n'));
-		break;
-	case CHR('r'):
-		RETV(PLAIN, CHR('\r'));
-		break;
-	case CHR('s'):
-		NOTE(REG_ULOCALE);
-		RETV(CCLASS, 's');
-		break;
-	case CHR('S'):
-		NOTE(REG_ULOCALE);
-		RETV(CCLASS, 'S');
-		break;
-	case CHR('t'):
-		RETV(PLAIN, CHR('\t'));
-		break;
-	case CHR('u'):
-		c = lexdigits(v, 16, 4, 4);
-		if (ISERR())
-			FAILW(REG_EESCAPE);
-		RETV(PLAIN, c);
-		break;
-	case CHR('U'):
-		c = lexdigits(v, 16, 8, 8);
-		if (ISERR())
-			FAILW(REG_EESCAPE);
-		RETV(PLAIN, c);
-		break;
-	case CHR('v'):
-		RETV(PLAIN, CHR('\v'));
-		break;
-	case CHR('w'):
-		NOTE(REG_ULOCALE);
-		RETV(CCLASS, 'w');
-		break;
-	case CHR('W'):
-		NOTE(REG_ULOCALE);
-		RETV(CCLASS, 'W');
-		break;
-	case CHR('x'):
-		NOTE(REG_UUNPORT);
-		c = lexdigits(v, 16, 1, 255);	/* REs >255 long outside spec */
-		if (ISERR())
-			FAILW(REG_EESCAPE);
-		RETV(PLAIN, c);
-		break;
-	case CHR('y'):
-		NOTE(REG_ULOCALE);
-		RETV(WBDRY, 0);
-		break;
-	case CHR('Y'):
-		NOTE(REG_ULOCALE);
-		RETV(NWBDRY, 0);
-		break;
-	case CHR('Z'):
-		RETV(SEND, 0);
-		break;
-	case CHR('1'): case CHR('2'): case CHR('3'): case CHR('4'):
-	case CHR('5'): case CHR('6'): case CHR('7'): case CHR('8'):
-	case CHR('9'):
-		save = v->now;
-		v->now--;	/* put first digit back */
-		c = lexdigits(v, 10, 1, 255);	/* REs >255 long outside spec */
-		if (ISERR())
-			FAILW(REG_EESCAPE);
-		/* ugly heuristic (first test is "exactly 1 digit?") */
-		if (v->now - save == 0 || (int)c <= v->nsubexp) {
-			NOTE(REG_UBACKREF);
-			RETV(BACKREF, (chr)c);
-		}
-		/* oops, doesn't look like it's a backref after all... */
-		v->now = save;
-		/* and fall through into octal number */
-	case CHR('0'):
-		NOTE(REG_UUNPORT);
-		v->now--;	/* put first digit back */
-		c = lexdigits(v, 8, 1, 3);
-		if (ISERR())
-			FAILW(REG_EESCAPE);
-		RETV(PLAIN, c);
-		break;
-	default:
-		assert(iscalpha(c));
-		FAILW(REG_EESCAPE);	/* unknown alphabetic escape */
-		break;
-	}
-	assert(NOTREACHED);
-}
-
-/*
- - lexdigits - slurp up digits and return chr value
- ^ static chr lexdigits(struct vars *, int, int, int);
- */
-static chr			/* chr value; errors signalled via ERR */
-lexdigits(v, base, minlen, maxlen)
-struct vars *v;
-int base;
-int minlen;
-int maxlen;
-{
-	uchr n;			/* unsigned to avoid overflow misbehavior */
-	int len;
-	chr c;
-	int d;
-	CONST uchr ub = (uchr) base;
-
-	n = 0;
-	for (len = 0; len < maxlen && !ATEOS(); len++) {
-		c = *v->now++;
-		switch (c) {
-		case CHR('0'): case CHR('1'): case CHR('2'): case CHR('3'):
-		case CHR('4'): case CHR('5'): case CHR('6'): case CHR('7'):
-		case CHR('8'): case CHR('9'):
-			d = DIGITVAL(c);
-			break;
-		case CHR('a'): case CHR('A'): d = 10; break;
-		case CHR('b'): case CHR('B'): d = 11; break;
-		case CHR('c'): case CHR('C'): d = 12; break;
-		case CHR('d'): case CHR('D'): d = 13; break;
-		case CHR('e'): case CHR('E'): d = 14; break;
-		case CHR('f'): case CHR('F'): d = 15; break;
-		default:
-			v->now--;	/* oops, not a digit at all */
-			d = -1;
-			break;
-		}
-
-		if (d >= base) {	/* not a plausible digit */
-			v->now--;
-			d = -1;
-		}
-		if (d < 0)
-			break;		/* NOTE BREAK OUT */
-		n = n*ub + (uchr)d;
-	}
-	if (len < minlen)
-		ERR(REG_EESCAPE);
-
-	return (chr)n;
-}
-
-/*
- - brenext - get next BRE token
- * This is much like EREs except for all the stupid backslashes and the
- * context-dependency of some things.
- ^ static int brenext(struct vars *, pchr);
- */
-static int			/* 1 normal, 0 failure */
-brenext(v, pc)
-struct vars *v;
-pchr pc;
-{
-	chr c = (chr)pc;
-
-	switch (c) {
-	case CHR('*'):
-		if (LASTTYPE(EMPTY) || LASTTYPE('(') || LASTTYPE('^'))
-			RETV(PLAIN, c);
-		RET('*');
-		break;
-	case CHR('['):
-		if (HAVE(6) &&	*(v->now+0) == CHR('[') &&
-				*(v->now+1) == CHR(':') &&
-				(*(v->now+2) == CHR('<') ||
-						*(v->now+2) == CHR('>')) &&
-				*(v->now+3) == CHR(':') &&
-				*(v->now+4) == CHR(']') &&
-				*(v->now+5) == CHR(']')) {
-			c = *(v->now+2);
-			v->now += 6;
-			NOTE(REG_UNONPOSIX);
-			RET((c == CHR('<')) ? '<' : '>');
-		}
-		INTOCON(L_BRACK);
-		if (NEXT1('^')) {
-			v->now++;
-			RETV('[', 0);
-		}
-		RETV('[', 1);
-		break;
-	case CHR('.'):
-		RET('.');
-		break;
-	case CHR('^'):
-		if (LASTTYPE(EMPTY))
-			RET('^');
-		if (LASTTYPE('(')) {
-			NOTE(REG_UUNSPEC);
-			RET('^');
-		}
-		RETV(PLAIN, c);
-		break;
-	case CHR('$'):
-		if (v->cflags®_EXPANDED)
-			skip(v);
-		if (ATEOS())
-			RET('$');
-		if (NEXT2('\\', ')')) {
-			NOTE(REG_UUNSPEC);
-			RET('$');
-		}
-		RETV(PLAIN, c);
-		break;
-	case CHR('\\'):
-		break;		/* see below */
-	default:
-		RETV(PLAIN, c);
-		break;
-	}
-
-	assert(c == CHR('\\'));
-
-	if (ATEOS())
-		FAILW(REG_EESCAPE);
-
-	c = *v->now++;
-	switch (c) {
-	case CHR('{'):
-		INTOCON(L_BBND);
-		NOTE(REG_UBOUNDS);
-		RET('{');
-		break;
-	case CHR('('):
-		RETV('(', 1);
-		break;
-	case CHR(')'):
-		RETV(')', c);
-		break;
-	case CHR('<'):
-		NOTE(REG_UNONPOSIX);
-		RET('<');
-		break;
-	case CHR('>'):
-		NOTE(REG_UNONPOSIX);
-		RET('>');
-		break;
-	case CHR('1'): case CHR('2'): case CHR('3'): case CHR('4'):
-	case CHR('5'): case CHR('6'): case CHR('7'): case CHR('8'):
-	case CHR('9'):
-		NOTE(REG_UBACKREF);
-		RETV(BACKREF, (chr)DIGITVAL(c));
-		break;
-	default:
-		if (iscalnum(c)) {
-			NOTE(REG_UBSALNUM);
-			NOTE(REG_UUNSPEC);
-		}
-		RETV(PLAIN, c);
-		break;
-	}
-
-	assert(NOTREACHED);
-}
-
-/*
- - skip - skip white space and comments in expanded form
- ^ static VOID skip(struct vars *);
- */
-static VOID
-skip(v)
-struct vars *v;
-{
-	chr *start = v->now;
-
-	assert(v->cflags®_EXPANDED);
-
-	for (;;) {
-		while (!ATEOS() && iscspace(*v->now))
-			v->now++;
-		if (ATEOS() || *v->now != CHR('#'))
-			break;				/* NOTE BREAK OUT */
-		assert(NEXT1('#'));
-		while (!ATEOS() && *v->now != CHR('\n'))
-			v->now++;
-		/* leave the newline to be picked up by the iscspace loop */
-	}
-
-	if (v->now != start)
-		NOTE(REG_UNONPOSIX);
-}
-
-/*
- - newline - return the chr for a newline
- * This helps confine use of CHR to this source file.
- ^ static chr newline(NOPARMS);
- */
-static chr
-newline()
-{
-	return CHR('\n');
-}
-
-/*
- - ch - return the chr sequence for regc_locale.c's fake collating element ch
- * This helps confine use of CHR to this source file.  Beware that the caller
- * knows how long the sequence is.
- ^ #ifdef REG_DEBUG
- ^ static chr *ch(NOPARMS);
- ^ #endif
- */
-#ifdef REG_DEBUG
-static chr *
-ch()
-{
-	static chr chstr[] = { CHR('c'), CHR('h'), CHR('\0') };
-
-	return chstr;
-}
-#endif
-
-/*
- - chrnamed - return the chr known by a given (chr string) name
- * The code is a bit clumsy, but this routine gets only such specialized
- * use that it hardly matters.
- ^ static chr chrnamed(struct vars *, chr *, chr *, pchr);
- */
-static chr
-chrnamed(v, startp, endp, lastresort)
-struct vars *v;
-chr *startp;			/* start of name */
-chr *endp;			/* just past end of name */
-pchr lastresort;		/* what to return if name lookup fails */
-{
-	celt c;
-	int errsave;
-	int e;
-	struct cvec *cv;
-
-	errsave = v->err;
-	v->err = 0;
-	c = element(v, startp, endp);
-	e = v->err;
-	v->err = errsave;
-
-	if (e != 0)
-		return (chr)lastresort;
-
-	cv = range(v, c, c, 0);
-	if (cv->nchrs == 0)
-		return (chr)lastresort;
-	return cv->chrs[0];
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regc_locale.c b/3rdparty/wxwidgets3.0-3.0.1/src/regex/regc_locale.c
deleted file mode 100644
index fc0ac4b91b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regc_locale.c
+++ /dev/null
@@ -1,1179 +0,0 @@
-/* 
- * regc_locale.c --
- *
- *	This file contains the Unicode locale specific regexp routines.
- *	This file is #included by regcomp.c.
- *
- * Copyright (c) 1998 by Scriptics Corporation.
- *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- *
- * wxWidgets:
- *  The Scriptics license can be found in the file COPYRIGHT. Modifications
- *  for wxWidgets are under the wxWindows licence, see README for details.
- */
-
-#ifndef CONST
-#define CONST const
-#endif
-
-/* ASCII character-name table */
-
-static struct cname {
-    chr *name;
-    char code;
-} cnames[] = {
-    {wxT("NUL"),                 '\0'},
-    {wxT("SOH"),                 '\001'},
-    {wxT("STX"),                 '\002'},
-    {wxT("ETX"),                 '\003'},
-    {wxT("EOT"),                 '\004'},
-    {wxT("ENQ"),                 '\005'},
-    {wxT("ACK"),                 '\006'},
-    {wxT("BEL"),                 '\007'},
-    {wxT("alert"),               '\007'},
-    {wxT("BS"),                  '\010'},
-    {wxT("backspace"),           '\b'},
-    {wxT("HT"),                  '\011'},
-    {wxT("tab"),                 '\t'},
-    {wxT("LF"),                  '\012'},
-    {wxT("newline"),             '\n'},
-    {wxT("VT"),                  '\013'},
-    {wxT("vertical-tab"),        '\v'},
-    {wxT("FF"),                  '\014'},
-    {wxT("form-feed"),           '\f'},
-    {wxT("CR"),                  '\015'},
-    {wxT("carriage-return"),     '\r'},
-    {wxT("SO"),                  '\016'},
-    {wxT("SI"),                  '\017'},
-    {wxT("DLE"),                 '\020'},
-    {wxT("DC1"),                 '\021'},
-    {wxT("DC2"),                 '\022'},
-    {wxT("DC3"),                 '\023'},
-    {wxT("DC4"),                 '\024'},
-    {wxT("NAK"),                 '\025'},
-    {wxT("SYN"),                 '\026'},
-    {wxT("ETB"),                 '\027'},
-    {wxT("CAN"),                 '\030'},
-    {wxT("EM"),                  '\031'},
-    {wxT("SUB"),                 '\032'},
-    {wxT("ESC"),                 '\033'},
-    {wxT("IS4"),                 '\034'},
-    {wxT("FS"),                  '\034'},
-    {wxT("IS3"),                 '\035'},
-    {wxT("GS"),                  '\035'},
-    {wxT("IS2"),                 '\036'},
-    {wxT("RS"),                  '\036'},
-    {wxT("IS1"),                 '\037'},
-    {wxT("US"),                  '\037'},
-    {wxT("space"),               ' '},
-    {wxT("exclamation-mark"),    '!'},
-    {wxT("quotation-mark"),      '"'},
-    {wxT("number-sign"),         '#'},
-    {wxT("dollar-sign"),         '$'},
-    {wxT("percent-sign"),        '%'},
-    {wxT("ampersand"),           '&'},
-    {wxT("apostrophe"),          '\''},
-    {wxT("left-parenthesis"),    '('},
-    {wxT("right-parenthesis"),   ')'},
-    {wxT("asterisk"),            '*'},
-    {wxT("plus-sign"),           '+'},
-    {wxT("comma"),               ','},
-    {wxT("hyphen"),              '-'},
-    {wxT("hyphen-minus"),        '-'},
-    {wxT("period"),              '.'},
-    {wxT("full-stop"),           '.'},
-    {wxT("slash"),               '/'},
-    {wxT("solidus"),             '/'},
-    {wxT("zero"),                '0'},
-    {wxT("one"),                 '1'},
-    {wxT("two"),                 '2'},
-    {wxT("three"),               '3'},
-    {wxT("four"),                '4'},
-    {wxT("five"),                '5'},
-    {wxT("six"),                 '6'},
-    {wxT("seven"),               '7'},
-    {wxT("eight"),               '8'},
-    {wxT("nine"),                '9'},
-    {wxT("colon"),               ':'},
-    {wxT("semicolon"),           ';'},
-    {wxT("less-than-sign"),      '<'},
-    {wxT("equals-sign"),         '='},
-    {wxT("greater-than-sign"),   '>'},
-    {wxT("question-mark"),       '?'},
-    {wxT("commercial-at"),       '@'},
-    {wxT("left-square-bracket"), '['},
-    {wxT("backslash"),           '\\'},
-    {wxT("reverse-solidus"),     '\\'},
-    {wxT("right-square-bracket"), ']'},
-    {wxT("circumflex"),          '^'},
-    {wxT("circumflex-accent"),   '^'},
-    {wxT("underscore"),          '_'},
-    {wxT("low-line"),            '_'},
-    {wxT("grave-accent"),        '`'},
-    {wxT("left-brace"),          '{'},
-    {wxT("left-curly-bracket"),  '{'},
-    {wxT("vertical-line"),       '|'},
-    {wxT("right-brace"),         '}'},
-    {wxT("right-curly-bracket"), '}'},
-    {wxT("tilde"),               '~'},
-    {wxT("DEL"),                 '\177'},
-    {NULL,                      0}
-};
-
-#if wxUSE_UNICODE
-
-/* Unicode character-class tables */
-
-typedef struct crange {
-    chr start;
-    chr end;
-} crange;
-
-/*
- *	Declarations of Unicode character ranges.  This code
- *	is automatically generated by the tools/uniClass.tcl script
- *	and used in generic/regc_locale.c.  Do not modify by hand.
- */
-
-/* Unicode: alphabetic characters */
-
-static crange alphaRangeTable[] = {
-    {0x0041, 0x005a}, {0x0061, 0x007a}, {0x00c0, 0x00d6}, {0x00d8, 0x00f6}, 
-    {0x00f8, 0x021f}, {0x0222, 0x0233}, {0x0250, 0x02ad}, {0x02b0, 0x02b8}, 
-    {0x02bb, 0x02c1}, {0x02e0, 0x02e4}, {0x0388, 0x038a}, {0x038e, 0x03a1}, 
-    {0x03a3, 0x03ce}, {0x03d0, 0x03d7}, {0x03da, 0x03f5}, {0x0400, 0x0481}, 
-    {0x048c, 0x04c4}, {0x04d0, 0x04f5}, {0x0531, 0x0556}, {0x0561, 0x0587}, 
-    {0x05d0, 0x05ea}, {0x05f0, 0x05f2}, {0x0621, 0x063a}, {0x0640, 0x064a}, 
-    {0x0671, 0x06d3}, {0x06fa, 0x06fc}, {0x0712, 0x072c}, {0x0780, 0x07a5}, 
-    {0x0905, 0x0939}, {0x0958, 0x0961}, {0x0985, 0x098c}, {0x0993, 0x09a8}, 
-    {0x09aa, 0x09b0}, {0x09b6, 0x09b9}, {0x09df, 0x09e1}, {0x0a05, 0x0a0a}, 
-    {0x0a13, 0x0a28}, {0x0a2a, 0x0a30}, {0x0a59, 0x0a5c}, {0x0a72, 0x0a74}, 
-    {0x0a85, 0x0a8b}, {0x0a8f, 0x0a91}, {0x0a93, 0x0aa8}, {0x0aaa, 0x0ab0}, 
-    {0x0ab5, 0x0ab9}, {0x0b05, 0x0b0c}, {0x0b13, 0x0b28}, {0x0b2a, 0x0b30}, 
-    {0x0b36, 0x0b39}, {0x0b5f, 0x0b61}, {0x0b85, 0x0b8a}, {0x0b8e, 0x0b90}, 
-    {0x0b92, 0x0b95}, {0x0ba8, 0x0baa}, {0x0bae, 0x0bb5}, {0x0bb7, 0x0bb9}, 
-    {0x0c05, 0x0c0c}, {0x0c0e, 0x0c10}, {0x0c12, 0x0c28}, {0x0c2a, 0x0c33}, 
-    {0x0c35, 0x0c39}, {0x0c85, 0x0c8c}, {0x0c8e, 0x0c90}, {0x0c92, 0x0ca8}, 
-    {0x0caa, 0x0cb3}, {0x0cb5, 0x0cb9}, {0x0d05, 0x0d0c}, {0x0d0e, 0x0d10}, 
-    {0x0d12, 0x0d28}, {0x0d2a, 0x0d39}, {0x0d85, 0x0d96}, {0x0d9a, 0x0db1}, 
-    {0x0db3, 0x0dbb}, {0x0dc0, 0x0dc6}, {0x0e01, 0x0e30}, {0x0e40, 0x0e46}, 
-    {0x0e94, 0x0e97}, {0x0e99, 0x0e9f}, {0x0ea1, 0x0ea3}, {0x0ead, 0x0eb0}, 
-    {0x0ec0, 0x0ec4}, {0x0f40, 0x0f47}, {0x0f49, 0x0f6a}, {0x0f88, 0x0f8b}, 
-    {0x1000, 0x1021}, {0x1023, 0x1027}, {0x1050, 0x1055}, {0x10a0, 0x10c5}, 
-    {0x10d0, 0x10f6}, {0x1100, 0x1159}, {0x115f, 0x11a2}, {0x11a8, 0x11f9}, 
-    {0x1200, 0x1206}, {0x1208, 0x1246}, {0x124a, 0x124d}, {0x1250, 0x1256}, 
-    {0x125a, 0x125d}, {0x1260, 0x1286}, {0x128a, 0x128d}, {0x1290, 0x12ae}, 
-    {0x12b2, 0x12b5}, {0x12b8, 0x12be}, {0x12c2, 0x12c5}, {0x12c8, 0x12ce}, 
-    {0x12d0, 0x12d6}, {0x12d8, 0x12ee}, {0x12f0, 0x130e}, {0x1312, 0x1315}, 
-    {0x1318, 0x131e}, {0x1320, 0x1346}, {0x1348, 0x135a}, {0x13a0, 0x13f4}, 
-    {0x1401, 0x166c}, {0x166f, 0x1676}, {0x1681, 0x169a}, {0x16a0, 0x16ea}, 
-    {0x1780, 0x17b3}, {0x1820, 0x1877}, {0x1880, 0x18a8}, {0x1e00, 0x1e9b}, 
-    {0x1ea0, 0x1ef9}, {0x1f00, 0x1f15}, {0x1f18, 0x1f1d}, {0x1f20, 0x1f45}, 
-    {0x1f48, 0x1f4d}, {0x1f50, 0x1f57}, {0x1f5f, 0x1f7d}, {0x1f80, 0x1fb4}, 
-    {0x1fb6, 0x1fbc}, {0x1fc2, 0x1fc4}, {0x1fc6, 0x1fcc}, {0x1fd0, 0x1fd3}, 
-    {0x1fd6, 0x1fdb}, {0x1fe0, 0x1fec}, {0x1ff2, 0x1ff4}, {0x1ff6, 0x1ffc}, 
-    {0x210a, 0x2113}, {0x2119, 0x211d}, {0x212a, 0x212d}, {0x212f, 0x2131}, 
-    {0x2133, 0x2139}, {0x3031, 0x3035}, {0x3041, 0x3094}, {0x30a1, 0x30fa}, 
-    {0x30fc, 0x30fe}, {0x3105, 0x312c}, {0x3131, 0x318e}, {0x31a0, 0x31b7}, 
-    {0x3400, 0x4db5}, {0x4e00, 0x9fa5}, {0xa000, 0xa48c}, {0xac00, 0xd7a3}, 
-    {0xf900, 0xfa2d}, {0xfb00, 0xfb06}, {0xfb13, 0xfb17}, {0xfb1f, 0xfb28}, 
-    {0xfb2a, 0xfb36}, {0xfb38, 0xfb3c}, {0xfb46, 0xfbb1}, {0xfbd3, 0xfd3d}, 
-    {0xfd50, 0xfd8f}, {0xfd92, 0xfdc7}, {0xfdf0, 0xfdfb}, {0xfe70, 0xfe72}, 
-    {0xfe76, 0xfefc}, {0xff21, 0xff3a}, {0xff41, 0xff5a}, {0xff66, 0xffbe}, 
-    {0xffc2, 0xffc7}, {0xffca, 0xffcf}, {0xffd2, 0xffd7}, {0xffda, 0xffdc}
-};
-
-#define NUM_ALPHA_RANGE (sizeof(alphaRangeTable)/sizeof(crange))
-
-static chr alphaCharTable[] = {
-    0x00aa, 0x00b5, 0x00ba, 0x02d0, 0x02d1, 0x02ee, 0x037a, 0x0386, 0x038c, 
-    0x04c7, 0x04c8, 0x04cb, 0x04cc, 0x04f8, 0x04f9, 0x0559, 0x06d5, 0x06e5, 
-    0x06e6, 0x0710, 0x093d, 0x0950, 0x098f, 0x0990, 0x09b2, 0x09dc, 0x09dd, 
-    0x09f0, 0x09f1, 0x0a0f, 0x0a10, 0x0a32, 0x0a33, 0x0a35, 0x0a36, 0x0a38, 
-    0x0a39, 0x0a5e, 0x0a8d, 0x0ab2, 0x0ab3, 0x0abd, 0x0ad0, 0x0ae0, 0x0b0f, 
-    0x0b10, 0x0b32, 0x0b33, 0x0b3d, 0x0b5c, 0x0b5d, 0x0b99, 0x0b9a, 0x0b9c, 
-    0x0b9e, 0x0b9f, 0x0ba3, 0x0ba4, 0x0c60, 0x0c61, 0x0cde, 0x0ce0, 0x0ce1, 
-    0x0d60, 0x0d61, 0x0dbd, 0x0e32, 0x0e33, 0x0e81, 0x0e82, 0x0e84, 0x0e87, 
-    0x0e88, 0x0e8a, 0x0e8d, 0x0ea5, 0x0ea7, 0x0eaa, 0x0eab, 0x0eb2, 0x0eb3, 
-    0x0ebd, 0x0ec6, 0x0edc, 0x0edd, 0x0f00, 0x1029, 0x102a, 0x1248, 0x1258, 
-    0x1288, 0x12b0, 0x12c0, 0x1310, 0x1f59, 0x1f5b, 0x1f5d, 0x1fbe, 0x207f, 
-    0x2102, 0x2107, 0x2115, 0x2124, 0x2126, 0x2128, 0x3005, 0x3006, 0x309d, 
-    0x309e, 0xfb1d, 0xfb3e, 0xfb40, 0xfb41, 0xfb43, 0xfb44, 0xfe74, 0xfffe
-};
-
-#define NUM_ALPHA_CHAR (sizeof(alphaCharTable)/sizeof(chr))
-
-/* Unicode: decimal digit characters */
-
-static crange digitRangeTable[] = {
-    {0x0030, 0x0039}, {0x0660, 0x0669}, {0x06f0, 0x06f9}, {0x0966, 0x096f}, 
-    {0x09e6, 0x09ef}, {0x0a66, 0x0a6f}, {0x0ae6, 0x0aef}, {0x0b66, 0x0b6f}, 
-    {0x0be7, 0x0bef}, {0x0c66, 0x0c6f}, {0x0ce6, 0x0cef}, {0x0d66, 0x0d6f}, 
-    {0x0e50, 0x0e59}, {0x0ed0, 0x0ed9}, {0x0f20, 0x0f29}, {0x1040, 0x1049}, 
-    {0x1369, 0x1371}, {0x17e0, 0x17e9}, {0x1810, 0x1819}, {0xff10, 0xff19}
-};
-
-#define NUM_DIGIT_RANGE (sizeof(digitRangeTable)/sizeof(crange))
-
-/* no singletons of digit characters */
-
-/* Unicode: punctuation characters */
-
-static crange punctRangeTable[] = {
-    {0x0021, 0x0023}, {0x0025, 0x002a}, {0x002c, 0x002f}, {0x005b, 0x005d}, 
-    {0x055a, 0x055f}, {0x066a, 0x066d}, {0x0700, 0x070d}, {0x0f04, 0x0f12}, 
-    {0x0f3a, 0x0f3d}, {0x104a, 0x104f}, {0x1361, 0x1368}, {0x16eb, 0x16ed}, 
-    {0x17d4, 0x17da}, {0x1800, 0x180a}, {0x2010, 0x2027}, {0x2030, 0x2043}, 
-    {0x2048, 0x204d}, {0x3001, 0x3003}, {0x3008, 0x3011}, {0x3014, 0x301f}, 
-    {0xfe30, 0xfe44}, {0xfe49, 0xfe52}, {0xfe54, 0xfe61}, {0xff01, 0xff03}, 
-    {0xff05, 0xff0a}, {0xff0c, 0xff0f}, {0xff3b, 0xff3d}, {0xff61, 0xff65}
-};
-
-#define NUM_PUNCT_RANGE (sizeof(punctRangeTable)/sizeof(crange))
-
-static chr punctCharTable[] = {
-    0x003a, 0x003b, 0x003f, 0x0040, 0x005f, 0x007b, 0x007d, 0x00a1, 0x00ab, 
-    0x00ad, 0x00b7, 0x00bb, 0x00bf, 0x037e, 0x0387, 0x0589, 0x058a, 0x05be, 
-    0x05c0, 0x05c3, 0x05f3, 0x05f4, 0x060c, 0x061b, 0x061f, 0x06d4, 0x0964, 
-    0x0965, 0x0970, 0x0df4, 0x0e4f, 0x0e5a, 0x0e5b, 0x0f85, 0x10fb, 0x166d, 
-    0x166e, 0x169b, 0x169c, 0x17dc, 0x2045, 0x2046, 0x207d, 0x207e, 0x208d, 
-    0x208e, 0x2329, 0x232a, 0x3030, 0x30fb, 0xfd3e, 0xfd3f, 0xfe63, 0xfe68, 
-    0xfe6a, 0xfe6b, 0xff1a, 0xff1b, 0xff1f, 0xff20, 0xff3f, 0xff5b, 0xff5d
-};
-
-#define NUM_PUNCT_CHAR (sizeof(punctCharTable)/sizeof(chr))
-
-/* Unicode: white space characters */
-
-static crange spaceRangeTable[] = {
-    {0x0009, 0x000d}, {0x2000, 0x200b}
-};
-
-#define NUM_SPACE_RANGE (sizeof(spaceRangeTable)/sizeof(crange))
-
-static chr spaceCharTable[] = {
-    0x0020, 0x00a0, 0x1680, 0x2028, 0x2029, 0x202f, 0x3000
-};
-
-#define NUM_SPACE_CHAR (sizeof(spaceCharTable)/sizeof(chr))
-
-/* Unicode: lowercase characters */
-
-static crange lowerRangeTable[] = {
-    {0x0061, 0x007a}, {0x00df, 0x00f6}, {0x00f8, 0x00ff}, {0x017e, 0x0180}, 
-    {0x0199, 0x019b}, {0x01bd, 0x01bf}, {0x0250, 0x02ad}, {0x03ac, 0x03ce}, 
-    {0x03d5, 0x03d7}, {0x03ef, 0x03f3}, {0x0430, 0x045f}, {0x0561, 0x0587}, 
-    {0x1e95, 0x1e9b}, {0x1f00, 0x1f07}, {0x1f10, 0x1f15}, {0x1f20, 0x1f27}, 
-    {0x1f30, 0x1f37}, {0x1f40, 0x1f45}, {0x1f50, 0x1f57}, {0x1f60, 0x1f67}, 
-    {0x1f70, 0x1f7d}, {0x1f80, 0x1f87}, {0x1f90, 0x1f97}, {0x1fa0, 0x1fa7}, 
-    {0x1fb0, 0x1fb4}, {0x1fc2, 0x1fc4}, {0x1fd0, 0x1fd3}, {0x1fe0, 0x1fe7}, 
-    {0x1ff2, 0x1ff4}, {0xfb00, 0xfb06}, {0xfb13, 0xfb17}, {0xff41, 0xff5a}
-};
-
-#define NUM_LOWER_RANGE (sizeof(lowerRangeTable)/sizeof(crange))
-
-static chr lowerCharTable[] = {
-    0x00aa, 0x00b5, 0x00ba, 0x0101, 0x0103, 0x0105, 0x0107, 0x0109, 0x010b, 
-    0x010d, 0x010f, 0x0111, 0x0113, 0x0115, 0x0117, 0x0119, 0x011b, 0x011d, 
-    0x011f, 0x0121, 0x0123, 0x0125, 0x0127, 0x0129, 0x012b, 0x012d, 0x012f, 
-    0x0131, 0x0133, 0x0135, 0x0137, 0x0138, 0x013a, 0x013c, 0x013e, 0x0140, 
-    0x0142, 0x0144, 0x0146, 0x0148, 0x0149, 0x014b, 0x014d, 0x014f, 0x0151, 
-    0x0153, 0x0155, 0x0157, 0x0159, 0x015b, 0x015d, 0x015f, 0x0161, 0x0163, 
-    0x0165, 0x0167, 0x0169, 0x016b, 0x016d, 0x016f, 0x0171, 0x0173, 0x0175, 
-    0x0177, 0x017a, 0x017c, 0x0183, 0x0185, 0x0188, 0x018c, 0x018d, 0x0192, 
-    0x0195, 0x019e, 0x01a1, 0x01a3, 0x01a5, 0x01a8, 0x01aa, 0x01ab, 0x01ad, 
-    0x01b0, 0x01b4, 0x01b6, 0x01b9, 0x01ba, 0x01c6, 0x01c9, 0x01cc, 0x01ce, 
-    0x01d0, 0x01d2, 0x01d4, 0x01d6, 0x01d8, 0x01da, 0x01dc, 0x01dd, 0x01df, 
-    0x01e1, 0x01e3, 0x01e5, 0x01e7, 0x01e9, 0x01eb, 0x01ed, 0x01ef, 0x01f0, 
-    0x01f3, 0x01f5, 0x01f9, 0x01fb, 0x01fd, 0x01ff, 0x0201, 0x0203, 0x0205, 
-    0x0207, 0x0209, 0x020b, 0x020d, 0x020f, 0x0211, 0x0213, 0x0215, 0x0217, 
-    0x0219, 0x021b, 0x021d, 0x021f, 0x0223, 0x0225, 0x0227, 0x0229, 0x022b, 
-    0x022d, 0x022f, 0x0231, 0x0233, 0x0390, 0x03d0, 0x03d1, 0x03db, 0x03dd, 
-    0x03df, 0x03e1, 0x03e3, 0x03e5, 0x03e7, 0x03e9, 0x03eb, 0x03ed, 0x03f5, 
-    0x0461, 0x0463, 0x0465, 0x0467, 0x0469, 0x046b, 0x046d, 0x046f, 0x0471, 
-    0x0473, 0x0475, 0x0477, 0x0479, 0x047b, 0x047d, 0x047f, 0x0481, 0x048d, 
-    0x048f, 0x0491, 0x0493, 0x0495, 0x0497, 0x0499, 0x049b, 0x049d, 0x049f, 
-    0x04a1, 0x04a3, 0x04a5, 0x04a7, 0x04a9, 0x04ab, 0x04ad, 0x04af, 0x04b1, 
-    0x04b3, 0x04b5, 0x04b7, 0x04b9, 0x04bb, 0x04bd, 0x04bf, 0x04c2, 0x04c4, 
-    0x04c8, 0x04cc, 0x04d1, 0x04d3, 0x04d5, 0x04d7, 0x04d9, 0x04db, 0x04dd, 
-    0x04df, 0x04e1, 0x04e3, 0x04e5, 0x04e7, 0x04e9, 0x04eb, 0x04ed, 0x04ef, 
-    0x04f1, 0x04f3, 0x04f5, 0x04f9, 0x1e01, 0x1e03, 0x1e05, 0x1e07, 0x1e09, 
-    0x1e0b, 0x1e0d, 0x1e0f, 0x1e11, 0x1e13, 0x1e15, 0x1e17, 0x1e19, 0x1e1b, 
-    0x1e1d, 0x1e1f, 0x1e21, 0x1e23, 0x1e25, 0x1e27, 0x1e29, 0x1e2b, 0x1e2d, 
-    0x1e2f, 0x1e31, 0x1e33, 0x1e35, 0x1e37, 0x1e39, 0x1e3b, 0x1e3d, 0x1e3f, 
-    0x1e41, 0x1e43, 0x1e45, 0x1e47, 0x1e49, 0x1e4b, 0x1e4d, 0x1e4f, 0x1e51, 
-    0x1e53, 0x1e55, 0x1e57, 0x1e59, 0x1e5b, 0x1e5d, 0x1e5f, 0x1e61, 0x1e63, 
-    0x1e65, 0x1e67, 0x1e69, 0x1e6b, 0x1e6d, 0x1e6f, 0x1e71, 0x1e73, 0x1e75, 
-    0x1e77, 0x1e79, 0x1e7b, 0x1e7d, 0x1e7f, 0x1e81, 0x1e83, 0x1e85, 0x1e87, 
-    0x1e89, 0x1e8b, 0x1e8d, 0x1e8f, 0x1e91, 0x1e93, 0x1ea1, 0x1ea3, 0x1ea5, 
-    0x1ea7, 0x1ea9, 0x1eab, 0x1ead, 0x1eaf, 0x1eb1, 0x1eb3, 0x1eb5, 0x1eb7, 
-    0x1eb9, 0x1ebb, 0x1ebd, 0x1ebf, 0x1ec1, 0x1ec3, 0x1ec5, 0x1ec7, 0x1ec9, 
-    0x1ecb, 0x1ecd, 0x1ecf, 0x1ed1, 0x1ed3, 0x1ed5, 0x1ed7, 0x1ed9, 0x1edb, 
-    0x1edd, 0x1edf, 0x1ee1, 0x1ee3, 0x1ee5, 0x1ee7, 0x1ee9, 0x1eeb, 0x1eed, 
-    0x1eef, 0x1ef1, 0x1ef3, 0x1ef5, 0x1ef7, 0x1ef9, 0x1fb6, 0x1fb7, 0x1fbe, 
-    0x1fc6, 0x1fc7, 0x1fd6, 0x1fd7, 0x1ff6, 0x1ff7, 0x207f, 0x210a, 0x210e, 
-    0x210f, 0x2113, 0x212f, 0x2134, 0x2139
-};
-
-#define NUM_LOWER_CHAR (sizeof(lowerCharTable)/sizeof(chr))
-
-/* Unicode: uppercase characters */
-
-static crange upperRangeTable[] = {
-    {0x0041, 0x005a}, {0x00c0, 0x00d6}, {0x00d8, 0x00de}, {0x0189, 0x018b}, 
-    {0x018e, 0x0191}, {0x0196, 0x0198}, {0x01b1, 0x01b3}, {0x01f6, 0x01f8}, 
-    {0x0388, 0x038a}, {0x0391, 0x03a1}, {0x03a3, 0x03ab}, {0x03d2, 0x03d4}, 
-    {0x0400, 0x042f}, {0x0531, 0x0556}, {0x10a0, 0x10c5}, {0x1f08, 0x1f0f}, 
-    {0x1f18, 0x1f1d}, {0x1f28, 0x1f2f}, {0x1f38, 0x1f3f}, {0x1f48, 0x1f4d}, 
-    {0x1f68, 0x1f6f}, {0x1fb8, 0x1fbb}, {0x1fc8, 0x1fcb}, {0x1fd8, 0x1fdb}, 
-    {0x1fe8, 0x1fec}, {0x1ff8, 0x1ffb}, {0x210b, 0x210d}, {0x2110, 0x2112}, 
-    {0x2119, 0x211d}, {0x212a, 0x212d}, {0xff21, 0xff3a}
-};
-
-#define NUM_UPPER_RANGE (sizeof(upperRangeTable)/sizeof(crange))
-
-static chr upperCharTable[] = {
-    0x0100, 0x0102, 0x0104, 0x0106, 0x0108, 0x010a, 0x010c, 0x010e, 0x0110, 
-    0x0112, 0x0114, 0x0116, 0x0118, 0x011a, 0x011c, 0x011e, 0x0120, 0x0122, 
-    0x0124, 0x0126, 0x0128, 0x012a, 0x012c, 0x012e, 0x0130, 0x0132, 0x0134, 
-    0x0136, 0x0139, 0x013b, 0x013d, 0x013f, 0x0141, 0x0143, 0x0145, 0x0147, 
-    0x014a, 0x014c, 0x014e, 0x0150, 0x0152, 0x0154, 0x0156, 0x0158, 0x015a, 
-    0x015c, 0x015e, 0x0160, 0x0162, 0x0164, 0x0166, 0x0168, 0x016a, 0x016c, 
-    0x016e, 0x0170, 0x0172, 0x0174, 0x0176, 0x0178, 0x0179, 0x017b, 0x017d, 
-    0x0181, 0x0182, 0x0184, 0x0186, 0x0187, 0x0193, 0x0194, 0x019c, 0x019d, 
-    0x019f, 0x01a0, 0x01a2, 0x01a4, 0x01a6, 0x01a7, 0x01a9, 0x01ac, 0x01ae, 
-    0x01af, 0x01b5, 0x01b7, 0x01b8, 0x01bc, 0x01c4, 0x01c7, 0x01ca, 0x01cd, 
-    0x01cf, 0x01d1, 0x01d3, 0x01d5, 0x01d7, 0x01d9, 0x01db, 0x01de, 0x01e0, 
-    0x01e2, 0x01e4, 0x01e6, 0x01e8, 0x01ea, 0x01ec, 0x01ee, 0x01f1, 0x01f4, 
-    0x01fa, 0x01fc, 0x01fe, 0x0200, 0x0202, 0x0204, 0x0206, 0x0208, 0x020a, 
-    0x020c, 0x020e, 0x0210, 0x0212, 0x0214, 0x0216, 0x0218, 0x021a, 0x021c, 
-    0x021e, 0x0222, 0x0224, 0x0226, 0x0228, 0x022a, 0x022c, 0x022e, 0x0230, 
-    0x0232, 0x0386, 0x038c, 0x038e, 0x038f, 0x03da, 0x03dc, 0x03de, 0x03e0, 
-    0x03e2, 0x03e4, 0x03e6, 0x03e8, 0x03ea, 0x03ec, 0x03ee, 0x03f4, 0x0460, 
-    0x0462, 0x0464, 0x0466, 0x0468, 0x046a, 0x046c, 0x046e, 0x0470, 0x0472, 
-    0x0474, 0x0476, 0x0478, 0x047a, 0x047c, 0x047e, 0x0480, 0x048c, 0x048e, 
-    0x0490, 0x0492, 0x0494, 0x0496, 0x0498, 0x049a, 0x049c, 0x049e, 0x04a0, 
-    0x04a2, 0x04a4, 0x04a6, 0x04a8, 0x04aa, 0x04ac, 0x04ae, 0x04b0, 0x04b2, 
-    0x04b4, 0x04b6, 0x04b8, 0x04ba, 0x04bc, 0x04be, 0x04c0, 0x04c1, 0x04c3, 
-    0x04c7, 0x04cb, 0x04d0, 0x04d2, 0x04d4, 0x04d6, 0x04d8, 0x04da, 0x04dc, 
-    0x04de, 0x04e0, 0x04e2, 0x04e4, 0x04e6, 0x04e8, 0x04ea, 0x04ec, 0x04ee, 
-    0x04f0, 0x04f2, 0x04f4, 0x04f8, 0x1e00, 0x1e02, 0x1e04, 0x1e06, 0x1e08, 
-    0x1e0a, 0x1e0c, 0x1e0e, 0x1e10, 0x1e12, 0x1e14, 0x1e16, 0x1e18, 0x1e1a, 
-    0x1e1c, 0x1e1e, 0x1e20, 0x1e22, 0x1e24, 0x1e26, 0x1e28, 0x1e2a, 0x1e2c, 
-    0x1e2e, 0x1e30, 0x1e32, 0x1e34, 0x1e36, 0x1e38, 0x1e3a, 0x1e3c, 0x1e3e, 
-    0x1e40, 0x1e42, 0x1e44, 0x1e46, 0x1e48, 0x1e4a, 0x1e4c, 0x1e4e, 0x1e50, 
-    0x1e52, 0x1e54, 0x1e56, 0x1e58, 0x1e5a, 0x1e5c, 0x1e5e, 0x1e60, 0x1e62, 
-    0x1e64, 0x1e66, 0x1e68, 0x1e6a, 0x1e6c, 0x1e6e, 0x1e70, 0x1e72, 0x1e74, 
-    0x1e76, 0x1e78, 0x1e7a, 0x1e7c, 0x1e7e, 0x1e80, 0x1e82, 0x1e84, 0x1e86, 
-    0x1e88, 0x1e8a, 0x1e8c, 0x1e8e, 0x1e90, 0x1e92, 0x1e94, 0x1ea0, 0x1ea2, 
-    0x1ea4, 0x1ea6, 0x1ea8, 0x1eaa, 0x1eac, 0x1eae, 0x1eb0, 0x1eb2, 0x1eb4, 
-    0x1eb6, 0x1eb8, 0x1eba, 0x1ebc, 0x1ebe, 0x1ec0, 0x1ec2, 0x1ec4, 0x1ec6, 
-    0x1ec8, 0x1eca, 0x1ecc, 0x1ece, 0x1ed0, 0x1ed2, 0x1ed4, 0x1ed6, 0x1ed8, 
-    0x1eda, 0x1edc, 0x1ede, 0x1ee0, 0x1ee2, 0x1ee4, 0x1ee6, 0x1ee8, 0x1eea, 
-    0x1eec, 0x1eee, 0x1ef0, 0x1ef2, 0x1ef4, 0x1ef6, 0x1ef8, 0x1f59, 0x1f5b, 
-    0x1f5d, 0x1f5f, 0x2102, 0x2107, 0x2115, 0x2124, 0x2126, 0x2128, 0x2130, 
-    0x2131, 0x2133
-};
-
-#define NUM_UPPER_CHAR (sizeof(upperCharTable)/sizeof(chr))
-
-/* Unicode: unicode print characters excluding space */
-
-static crange graphRangeTable[] = {
-    {0x0021, 0x007e}, {0x00a0, 0x011f}, {0x0121, 0x021f}, {0x0222, 0x0233}, 
-    {0x0250, 0x02ad}, {0x02b0, 0x02ee}, {0x0300, 0x031f}, {0x0321, 0x034e}, 
-    {0x0360, 0x0362}, {0x0384, 0x038a}, {0x038e, 0x03a1}, {0x03a3, 0x03ce}, 
-    {0x03d0, 0x03d7}, {0x03da, 0x03f5}, {0x0400, 0x041f}, {0x0421, 0x0486}, 
-    {0x048c, 0x04c4}, {0x04d0, 0x04f5}, {0x0531, 0x0556}, {0x0559, 0x055f}, 
-    {0x0561, 0x0587}, {0x0591, 0x05a1}, {0x05a3, 0x05b9}, {0x05bb, 0x05c4}, 
-    {0x05d0, 0x05ea}, {0x05f0, 0x05f4}, {0x0621, 0x063a}, {0x0640, 0x0655}, 
-    {0x0660, 0x066d}, {0x0670, 0x06ed}, {0x06f0, 0x06fe}, {0x0700, 0x070d}, 
-    {0x0710, 0x071f}, {0x0721, 0x072c}, {0x0730, 0x074a}, {0x0780, 0x07b0}, 
-    {0x0901, 0x0903}, {0x0905, 0x091f}, {0x0921, 0x0939}, {0x093c, 0x094d}, 
-    {0x0950, 0x0954}, {0x0958, 0x0970}, {0x0981, 0x0983}, {0x0985, 0x098c}, 
-    {0x0993, 0x09a8}, {0x09aa, 0x09b0}, {0x09b6, 0x09b9}, {0x09be, 0x09c4}, 
-    {0x09cb, 0x09cd}, {0x09df, 0x09e3}, {0x09e6, 0x09fa}, {0x0a05, 0x0a0a}, 
-    {0x0a13, 0x0a1f}, {0x0a21, 0x0a28}, {0x0a2a, 0x0a30}, {0x0a3e, 0x0a42}, 
-    {0x0a4b, 0x0a4d}, {0x0a59, 0x0a5c}, {0x0a66, 0x0a74}, {0x0a81, 0x0a83}, 
-    {0x0a85, 0x0a8b}, {0x0a8f, 0x0a91}, {0x0a93, 0x0aa8}, {0x0aaa, 0x0ab0}, 
-    {0x0ab5, 0x0ab9}, {0x0abc, 0x0ac5}, {0x0ac7, 0x0ac9}, {0x0acb, 0x0acd}, 
-    {0x0ae6, 0x0aef}, {0x0b01, 0x0b03}, {0x0b05, 0x0b0c}, {0x0b13, 0x0b1f}, 
-    {0x0b21, 0x0b28}, {0x0b2a, 0x0b30}, {0x0b36, 0x0b39}, {0x0b3c, 0x0b43}, 
-    {0x0b4b, 0x0b4d}, {0x0b5f, 0x0b61}, {0x0b66, 0x0b70}, {0x0b85, 0x0b8a}, 
-    {0x0b8e, 0x0b90}, {0x0b92, 0x0b95}, {0x0ba8, 0x0baa}, {0x0bae, 0x0bb5}, 
-    {0x0bb7, 0x0bb9}, {0x0bbe, 0x0bc2}, {0x0bc6, 0x0bc8}, {0x0bca, 0x0bcd}, 
-    {0x0be7, 0x0bf2}, {0x0c01, 0x0c03}, {0x0c05, 0x0c0c}, {0x0c0e, 0x0c10}, 
-    {0x0c12, 0x0c1f}, {0x0c21, 0x0c28}, {0x0c2a, 0x0c33}, {0x0c35, 0x0c39}, 
-    {0x0c3e, 0x0c44}, {0x0c46, 0x0c48}, {0x0c4a, 0x0c4d}, {0x0c66, 0x0c6f}, 
-    {0x0c85, 0x0c8c}, {0x0c8e, 0x0c90}, {0x0c92, 0x0ca8}, {0x0caa, 0x0cb3}, 
-    {0x0cb5, 0x0cb9}, {0x0cbe, 0x0cc4}, {0x0cc6, 0x0cc8}, {0x0cca, 0x0ccd}, 
-    {0x0ce6, 0x0cef}, {0x0d05, 0x0d0c}, {0x0d0e, 0x0d10}, {0x0d12, 0x0d1f}, 
-    {0x0d21, 0x0d28}, {0x0d2a, 0x0d39}, {0x0d3e, 0x0d43}, {0x0d46, 0x0d48}, 
-    {0x0d4a, 0x0d4d}, {0x0d66, 0x0d6f}, {0x0d85, 0x0d96}, {0x0d9a, 0x0db1}, 
-    {0x0db3, 0x0dbb}, {0x0dc0, 0x0dc6}, {0x0dcf, 0x0dd4}, {0x0dd8, 0x0ddf}, 
-    {0x0df2, 0x0df4}, {0x0e01, 0x0e1f}, {0x0e21, 0x0e3a}, {0x0e3f, 0x0e5b}, 
-    {0x0e94, 0x0e97}, {0x0e99, 0x0e9f}, {0x0ea1, 0x0ea3}, {0x0ead, 0x0eb9}, 
-    {0x0ebb, 0x0ebd}, {0x0ec0, 0x0ec4}, {0x0ec8, 0x0ecd}, {0x0ed0, 0x0ed9}, 
-    {0x0f00, 0x0f1f}, {0x0f21, 0x0f47}, {0x0f49, 0x0f6a}, {0x0f71, 0x0f8b}, 
-    {0x0f90, 0x0f97}, {0x0f99, 0x0fbc}, {0x0fbe, 0x0fcc}, {0x1000, 0x101f}, 
-    {0x1023, 0x1027}, {0x102c, 0x1032}, {0x1036, 0x1039}, {0x1040, 0x1059}, 
-    {0x10a0, 0x10c5}, {0x10d0, 0x10f6}, {0x1100, 0x111f}, {0x1121, 0x1159}, 
-    {0x115f, 0x11a2}, {0x11a8, 0x11f9}, {0x1200, 0x1206}, {0x1208, 0x121f}, 
-    {0x1221, 0x1246}, {0x124a, 0x124d}, {0x1250, 0x1256}, {0x125a, 0x125d}, 
-    {0x1260, 0x1286}, {0x128a, 0x128d}, {0x1290, 0x12ae}, {0x12b2, 0x12b5}, 
-    {0x12b8, 0x12be}, {0x12c2, 0x12c5}, {0x12c8, 0x12ce}, {0x12d0, 0x12d6}, 
-    {0x12d8, 0x12ee}, {0x12f0, 0x130e}, {0x1312, 0x1315}, {0x1318, 0x131e}, 
-    {0x1321, 0x1346}, {0x1348, 0x135a}, {0x1361, 0x137c}, {0x13a0, 0x13f4}, 
-    {0x1401, 0x141f}, {0x1421, 0x151f}, {0x1521, 0x161f}, {0x1621, 0x1676}, 
-    {0x1680, 0x169c}, {0x16a0, 0x16f0}, {0x1780, 0x17dc}, {0x17e0, 0x17e9}, 
-    {0x1800, 0x180a}, {0x1810, 0x1819}, {0x1821, 0x1877}, {0x1880, 0x18a9}, 
-    {0x1e00, 0x1e1f}, {0x1e21, 0x1e9b}, {0x1ea0, 0x1ef9}, {0x1f00, 0x1f15}, 
-    {0x1f18, 0x1f1d}, {0x1f21, 0x1f45}, {0x1f48, 0x1f4d}, {0x1f50, 0x1f57}, 
-    {0x1f5f, 0x1f7d}, {0x1f80, 0x1fb4}, {0x1fb6, 0x1fc4}, {0x1fc6, 0x1fd3}, 
-    {0x1fd6, 0x1fdb}, {0x1fdd, 0x1fef}, {0x1ff2, 0x1ff4}, {0x1ff6, 0x1ffe}, 
-    {0x2000, 0x200b}, {0x2010, 0x201f}, {0x2021, 0x2029}, {0x202f, 0x2046}, 
-    {0x2048, 0x204d}, {0x2074, 0x208e}, {0x20a0, 0x20af}, {0x20d0, 0x20e3}, 
-    {0x2100, 0x211f}, {0x2121, 0x213a}, {0x2153, 0x2183}, {0x2190, 0x21f3}, 
-    {0x2200, 0x221f}, {0x2221, 0x22f1}, {0x2300, 0x231f}, {0x2321, 0x237b}, 
-    {0x237d, 0x239a}, {0x2400, 0x241f}, {0x2421, 0x2426}, {0x2440, 0x244a}, 
-    {0x2460, 0x24ea}, {0x2500, 0x251f}, {0x2521, 0x2595}, {0x25a0, 0x25f7}, 
-    {0x2600, 0x2613}, {0x2619, 0x261f}, {0x2621, 0x2671}, {0x2701, 0x2704}, 
-    {0x2706, 0x2709}, {0x270c, 0x271f}, {0x2721, 0x2727}, {0x2729, 0x274b}, 
-    {0x274f, 0x2752}, {0x2758, 0x275e}, {0x2761, 0x2767}, {0x2776, 0x2794}, 
-    {0x2798, 0x27af}, {0x27b1, 0x27be}, {0x2800, 0x281f}, {0x2821, 0x28ff}, 
-    {0x2e80, 0x2e99}, {0x2e9b, 0x2ef3}, {0x2f00, 0x2f1f}, {0x2f21, 0x2fd5}, 
-    {0x2ff0, 0x2ffb}, {0x3000, 0x301f}, {0x3021, 0x303a}, {0x3041, 0x3094}, 
-    {0x3099, 0x309e}, {0x30a1, 0x30fe}, {0x3105, 0x311f}, {0x3121, 0x312c}, 
-    {0x3131, 0x318e}, {0x3190, 0x31b7}, {0x3200, 0x321c}, {0x3221, 0x3243}, 
-    {0x3260, 0x327b}, {0x327f, 0x32b0}, {0x32c0, 0x32cb}, {0x32d0, 0x32fe}, 
-    {0x3300, 0x331f}, {0x3321, 0x3376}, {0x337b, 0x33dd}, {0x33e0, 0x33fe}, 
-    {0x3400, 0x341f}, {0x3421, 0x351f}, {0x3521, 0x361f}, {0x3621, 0x371f}, 
-    {0x3721, 0x381f}, {0x3821, 0x391f}, {0x3921, 0x3a1f}, {0x3a21, 0x3b1f}, 
-    {0x3b21, 0x3c1f}, {0x3c21, 0x3d1f}, {0x3d21, 0x3e1f}, {0x3e21, 0x3f1f}, 
-    {0x3f21, 0x401f}, {0x4021, 0x411f}, {0x4121, 0x421f}, {0x4221, 0x431f}, 
-    {0x4321, 0x441f}, {0x4421, 0x451f}, {0x4521, 0x461f}, {0x4621, 0x471f}, 
-    {0x4721, 0x481f}, {0x4821, 0x491f}, {0x4921, 0x4a1f}, {0x4a21, 0x4b1f}, 
-    {0x4b21, 0x4c1f}, {0x4c21, 0x4d1f}, {0x4d21, 0x4db5}, {0x4e00, 0x4e1f}, 
-    {0x4e21, 0x4f1f}, {0x4f21, 0x501f}, {0x5021, 0x511f}, {0x5121, 0x521f}, 
-    {0x5221, 0x531f}, {0x5321, 0x541f}, {0x5421, 0x551f}, {0x5521, 0x561f}, 
-    {0x5621, 0x571f}, {0x5721, 0x581f}, {0x5821, 0x591f}, {0x5921, 0x5a1f}, 
-    {0x5a21, 0x5b1f}, {0x5b21, 0x5c1f}, {0x5c21, 0x5d1f}, {0x5d21, 0x5e1f}, 
-    {0x5e21, 0x5f1f}, {0x5f21, 0x601f}, {0x6021, 0x611f}, {0x6121, 0x621f}, 
-    {0x6221, 0x631f}, {0x6321, 0x641f}, {0x6421, 0x651f}, {0x6521, 0x661f}, 
-    {0x6621, 0x671f}, {0x6721, 0x681f}, {0x6821, 0x691f}, {0x6921, 0x6a1f}, 
-    {0x6a21, 0x6b1f}, {0x6b21, 0x6c1f}, {0x6c21, 0x6d1f}, {0x6d21, 0x6e1f}, 
-    {0x6e21, 0x6f1f}, {0x6f21, 0x701f}, {0x7021, 0x711f}, {0x7121, 0x721f}, 
-    {0x7221, 0x731f}, {0x7321, 0x741f}, {0x7421, 0x751f}, {0x7521, 0x761f}, 
-    {0x7621, 0x771f}, {0x7721, 0x781f}, {0x7821, 0x791f}, {0x7921, 0x7a1f}, 
-    {0x7a21, 0x7b1f}, {0x7b21, 0x7c1f}, {0x7c21, 0x7d1f}, {0x7d21, 0x7e1f}, 
-    {0x7e21, 0x7f1f}, {0x7f21, 0x801f}, {0x8021, 0x811f}, {0x8121, 0x821f}, 
-    {0x8221, 0x831f}, {0x8321, 0x841f}, {0x8421, 0x851f}, {0x8521, 0x861f}, 
-    {0x8621, 0x871f}, {0x8721, 0x881f}, {0x8821, 0x891f}, {0x8921, 0x8a1f}, 
-    {0x8a21, 0x8b1f}, {0x8b21, 0x8c1f}, {0x8c21, 0x8d1f}, {0x8d21, 0x8e1f}, 
-    {0x8e21, 0x8f1f}, {0x8f21, 0x901f}, {0x9021, 0x911f}, {0x9121, 0x921f}, 
-    {0x9221, 0x931f}, {0x9321, 0x941f}, {0x9421, 0x951f}, {0x9521, 0x961f}, 
-    {0x9621, 0x971f}, {0x9721, 0x981f}, {0x9821, 0x991f}, {0x9921, 0x9a1f}, 
-    {0x9a21, 0x9b1f}, {0x9b21, 0x9c1f}, {0x9c21, 0x9d1f}, {0x9d21, 0x9e1f}, 
-    {0x9e21, 0x9f1f}, {0x9f21, 0x9fa5}, {0xa000, 0xa01f}, {0xa021, 0xa11f}, 
-    {0xa121, 0xa21f}, {0xa221, 0xa31f}, {0xa321, 0xa41f}, {0xa421, 0xa48c}, 
-    {0xa490, 0xa4a1}, {0xa4a4, 0xa4b3}, {0xa4b5, 0xa4c0}, {0xa4c2, 0xa4c4}, 
-    {0xac00, 0xac1f}, {0xac21, 0xad1f}, {0xad21, 0xae1f}, {0xae21, 0xaf1f}, 
-    {0xaf21, 0xb01f}, {0xb021, 0xb11f}, {0xb121, 0xb21f}, {0xb221, 0xb31f}, 
-    {0xb321, 0xb41f}, {0xb421, 0xb51f}, {0xb521, 0xb61f}, {0xb621, 0xb71f}, 
-    {0xb721, 0xb81f}, {0xb821, 0xb91f}, {0xb921, 0xba1f}, {0xba21, 0xbb1f}, 
-    {0xbb21, 0xbc1f}, {0xbc21, 0xbd1f}, {0xbd21, 0xbe1f}, {0xbe21, 0xbf1f}, 
-    {0xbf21, 0xc01f}, {0xc021, 0xc11f}, {0xc121, 0xc21f}, {0xc221, 0xc31f}, 
-    {0xc321, 0xc41f}, {0xc421, 0xc51f}, {0xc521, 0xc61f}, {0xc621, 0xc71f}, 
-    {0xc721, 0xc81f}, {0xc821, 0xc91f}, {0xc921, 0xca1f}, {0xca21, 0xcb1f}, 
-    {0xcb21, 0xcc1f}, {0xcc21, 0xcd1f}, {0xcd21, 0xce1f}, {0xce21, 0xcf1f}, 
-    {0xcf21, 0xd01f}, {0xd021, 0xd11f}, {0xd121, 0xd21f}, {0xd221, 0xd31f}, 
-    {0xd321, 0xd41f}, {0xd421, 0xd51f}, {0xd521, 0xd61f}, {0xd621, 0xd71f}, 
-    {0xd721, 0xd7a3}, {0xf900, 0xf91f}, {0xf921, 0xfa1f}, {0xfa21, 0xfa2d}, 
-    {0xfb00, 0xfb06}, {0xfb13, 0xfb17}, {0xfb1d, 0xfb1f}, {0xfb21, 0xfb36}, 
-    {0xfb38, 0xfb3c}, {0xfb46, 0xfbb1}, {0xfbd3, 0xfc1f}, {0xfc21, 0xfd1f}, 
-    {0xfd21, 0xfd3f}, {0xfd50, 0xfd8f}, {0xfd92, 0xfdc7}, {0xfdf0, 0xfdfb}, 
-    {0xfe21, 0xfe23}, {0xfe30, 0xfe44}, {0xfe49, 0xfe52}, {0xfe54, 0xfe66}, 
-    {0xfe68, 0xfe6b}, {0xfe70, 0xfe72}, {0xfe76, 0xfefc}, {0xff01, 0xff1f}, 
-    {0xff21, 0xff5e}, {0xff61, 0xffbe}, {0xffc2, 0xffc7}, {0xffca, 0xffcf}, 
-    {0xffd2, 0xffd7}, {0xffda, 0xffdc}, {0xffe0, 0xffe6}, {0xffe8, 0xffee}, 
-    {0xfffc, 0xffff}
-};
-
-#define NUM_GRAPH_RANGE (sizeof(graphRangeTable)/sizeof(crange))
-
-static chr graphCharTable[] = {
-    0x0374, 0x0375, 0x037a, 0x037e, 0x038c, 0x0488, 0x0489, 0x04c7, 0x04c8, 
-    0x04cb, 0x04cc, 0x04f8, 0x04f9, 0x0589, 0x058a, 0x060c, 0x061b, 0x061f, 
-    0x098f, 0x0990, 0x09b2, 0x09bc, 0x09c7, 0x09c8, 0x09d7, 0x09dc, 0x09dd, 
-    0x0a02, 0x0a0f, 0x0a10, 0x0a32, 0x0a33, 0x0a35, 0x0a36, 0x0a38, 0x0a39, 
-    0x0a3c, 0x0a47, 0x0a48, 0x0a5e, 0x0a8d, 0x0ab2, 0x0ab3, 0x0ad0, 0x0ae0, 
-    0x0b0f, 0x0b10, 0x0b32, 0x0b33, 0x0b47, 0x0b48, 0x0b56, 0x0b57, 0x0b5c, 
-    0x0b5d, 0x0b82, 0x0b83, 0x0b99, 0x0b9a, 0x0b9c, 0x0b9e, 0x0b9f, 0x0ba3, 
-    0x0ba4, 0x0bd7, 0x0c55, 0x0c56, 0x0c60, 0x0c61, 0x0c82, 0x0c83, 0x0cd5, 
-    0x0cd6, 0x0cde, 0x0ce0, 0x0ce1, 0x0d02, 0x0d03, 0x0d57, 0x0d60, 0x0d61, 
-    0x0d82, 0x0d83, 0x0dbd, 0x0dca, 0x0dd6, 0x0e81, 0x0e82, 0x0e84, 0x0e87, 
-    0x0e88, 0x0e8a, 0x0e8d, 0x0ea5, 0x0ea7, 0x0eaa, 0x0eab, 0x0ec6, 0x0edc, 
-    0x0edd, 0x0fcf, 0x1021, 0x1029, 0x102a, 0x10fb, 0x1248, 0x1258, 0x1288, 
-    0x12b0, 0x12c0, 0x1310, 0x1f59, 0x1f5b, 0x1f5d, 0x2070, 0x274d, 0x2756, 
-    0x303e, 0x303f, 0xa4c6, 0xfb3e, 0xfb40, 0xfb41, 0xfb43, 0xfb44, 0xfe74
-};
-
-#define NUM_GRAPH_CHAR (sizeof(graphCharTable)/sizeof(chr))
-
-/*
- *	End of auto-generated Unicode character ranges declarations.
- */
-
-/*
- * Supply implementations for some tcl functions that this module depends on
- * to make it self contained
- */
-
-#include "tclUniData.c"
-#define Tcl_UniChar wxChar
-
-/*
- * Compute the uppercase equivalent of the given Unicode character.
- * Taken from tcl.
- */
-
-Tcl_UniChar Tcl_UniCharToUpper(int ch)
-{
-    int info = GetUniCharInfo(ch);
-
-    if (GetCaseType(info) & 0x04) {
-	return (Tcl_UniChar) (ch - GetDelta(info));
-    } else {
-	return ch;
-    }
-}
-
-/*
- * Compute the lowercase equivalent of the given Unicode character.
- * Taken from tcl.
- */
-
-Tcl_UniChar Tcl_UniCharToLower(int ch)
-{
-    int info = GetUniCharInfo(ch);
-
-    if (GetCaseType(info) & 0x02) {
-	return (Tcl_UniChar) (ch + GetDelta(info));
-    } else {
-	return ch;
-    }
-}
-
-/*
- * Compute the titlecase equivalent of the given Unicode character.
- * Taken from tcl.
- */
-
-Tcl_UniChar Tcl_UniCharToTitle(int ch)
-{
-    int info = GetUniCharInfo(ch);
-    int mode = GetCaseType(info);
-
-    if (mode & 0x1) {
-	/*
-	 * Subtract or add one depending on the original case.
-	 */
-
-	return (Tcl_UniChar) (ch + ((mode & 0x4) ? -1 : 1));
-    } else if (mode == 0x4) {
-	return (Tcl_UniChar) (ch - GetDelta(info));
-    } else {
-	return ch;
-    }
-}
-
-#else   /* wxUSE_UNICODE */
-
-#include 
-
-typedef int (*isfunc_t)(int);
-
-/* ASCII character-class table */
-static struct cclass {
-    char *name;
-    char *chars;
-    int hasch;
-    isfunc_t isfunc;
-} cclasses[] = {
-    {"alnum",   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
-0123456789",                1,  isalnum},
-    {"alpha",   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
-                    1,  isalpha},
-    {"blank",   " \t",      0,  NULL},
-    {"cntrl",   "\007\b\t\n\v\f\r\1\2\3\4\5\6\16\17\20\21\22\23\24\
-\25\26\27\30\31\32\33\34\35\36\37\177", 0, iscntrl},
-    {"digit",   "0123456789",   0,  isdigit},
-    {"graph",   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
-0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
-                    1,  isgraph},
-    {"lower",   "abcdefghijklmnopqrstuvwxyz",
-                    1,  islower},
-    {"print",   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
-0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ ",
-                    1,  isprint},
-    {"punct",   "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
-                    0,  ispunct},
-    {"space",   "\t\n\v\f\r ",  0,  isspace},
-    {"upper",   "ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-                    0,  isupper},
-    {"xdigit",  "0123456789ABCDEFabcdef",
-                    0,  isxdigit},
-    {NULL,      0,      0, NULL}
-};
-
-/*
- * Supply implementations for some tcl functions that this module depends on
- * to make it self contained
- */
-
-#define Tcl_UniChar wxChar
-Tcl_UniChar Tcl_UniCharToUpper(int ch) { return wxCRT_ToupperNative(ch); }
-Tcl_UniChar Tcl_UniCharToLower(int ch) { return wxCRT_TolowerNative(ch); }
-Tcl_UniChar Tcl_UniCharToTitle(int ch) { return wxCRT_ToupperNative(ch); }
-
-#endif  /* !wxUSE_UNICODE */
-
-#define	CH	NOCELT
-
-/*
- - nmcces - how many distinct MCCEs are there?
- ^ static int nmcces(struct vars *);
- */
-static int
-nmcces(v)
-    struct vars *v;			/* context */
-{
-    /*
-     * No multi-character collating elements defined at the moment.
-     */
-    return 0;
-}
-
-/*
- - nleaders - how many chrs can be first chrs of MCCEs?
- ^ static int nleaders(struct vars *);
- */
-static int
-nleaders(v)
-    struct vars *v;			/* context */
-{
-    return 0;
-}
-
-/*
- - allmcces - return a cvec with all the MCCEs of the locale
- ^ static struct cvec *allmcces(struct vars *, struct cvec *);
- */
-static struct cvec *
-allmcces(v, cv)
-    struct vars *v;			/* context */
-    struct cvec *cv;			/* this is supposed to have enough room */
-{
-    return clearcvec(cv);
-}
-
-/*
- - element - map collating-element name to celt
- ^ static celt element(struct vars *, chr *, chr *);
- */
-static celt
-element(v, startp, endp)
-    struct vars *v;			/* context */
-    chr *startp;			/* points to start of name */
-    chr *endp;				/* points just past end of name */
-{
-    struct cname *cn;
-    size_t len;
-
-    /* generic:  one-chr names stand for themselves */
-    assert(startp < endp);
-    len = endp - startp;
-    if (len == 1) {
-	return *startp;
-    }
-
-    NOTE(REG_ULOCALE);
-
-    /* search table */
-    for (cn=cnames; cn->name!=NULL; cn++) {
-	if (wxCRT_StrlenNative(cn->name)==len && wxCRT_StrncmpNative(cn->name, startp, len)==0) {
-	    break;			/* NOTE BREAK OUT */
-	}
-    }
-    if (cn->name != NULL) {
-	return CHR(cn->code);
-    }
-
-    /* couldn't find it */
-    ERR(REG_ECOLLATE);
-    return 0;
-}
-
-/*
- - range - supply cvec for a range, including legality check
- ^ static struct cvec *range(struct vars *, celt, celt, int);
- */
-static struct cvec *
-range(v, a, b, cases)
-    struct vars *v;			/* context */
-    celt a;				/* range start */
-    celt b;				/* range end, might equal a */
-    int cases;				/* case-independent? */
-{
-    int nchrs;
-    struct cvec *cv;
-    celt c, lc, uc, tc;
-
-    if (a != b && !before(a, b)) {
-	ERR(REG_ERANGE);
-	return NULL;
-    }
-
-    if (!cases) {			/* easy version */
-	cv = getcvec(v, 0, 1, 0);
-	NOERRN();
-	addrange(cv, a, b);
-	return cv;
-    }
-
-    /*
-     * When case-independent, it's hard to decide when cvec ranges are
-     * usable, so for now at least, we won't try.  We allocate enough
-     * space for two case variants plus a little extra for the two
-     * title case variants.
-     */
-
-    nchrs = (b - a + 1)*2 + 4;
-
-    cv = getcvec(v, nchrs, 0, 0);
-    NOERRN();
-
-    for (c=a; c<=b; c++) {
-	addchr(cv, c);
-	lc = Tcl_UniCharToLower((chr)c);
-	uc = Tcl_UniCharToUpper((chr)c);
-	tc = Tcl_UniCharToTitle((chr)c);
-	if (c != lc) {
-	    addchr(cv, lc);
-	}
-	if (c != uc) {
-	    addchr(cv, uc);
-	}
-	if (c != tc && tc != uc) {
-	    addchr(cv, tc);
-	}
-    }
-
-    return cv;
-}
-
-/*
- - before - is celt x before celt y, for purposes of range legality?
- ^ static int before(celt, celt);
- */
-static int				/* predicate */
-before(x, y)
-    celt x, y;				/* collating elements */
-{
-    /* trivial because no MCCEs */
-    if (x < y) {
-	return 1;
-    }
-    return 0;
-}
-
-/*
- - eclass - supply cvec for an equivalence class
- * Must include case counterparts on request.
- ^ static struct cvec *eclass(struct vars *, celt, int);
- */
-static struct cvec *
-eclass(v, c, cases)
-    struct vars *v;			/* context */
-    celt c;				/* Collating element representing
-					 * the equivalence class. */
-    int cases;				/* all cases? */
-{
-    struct cvec *cv;
-
-    /* crude fake equivalence class for testing */
-    if ((v->cflags®_FAKE) && c == 'x') {
-	cv = getcvec(v, 4, 0, 0);
-	addchr(cv, (chr)'x');
-	addchr(cv, (chr)'y');
-	if (cases) {
-	    addchr(cv, (chr)'X');
-	    addchr(cv, (chr)'Y');
-	}
-	return cv;
-    }
-
-    /* otherwise, none */
-    if (cases) {
-	return allcases(v, c);
-    }
-    cv = getcvec(v, 1, 0, 0);
-    assert(cv != NULL);
-    addchr(cv, (chr)c);
-    return cv;
-}
-
-#if wxUSE_UNICODE
-
-/*
- - cclass - supply cvec for a character class
- * Must include case counterparts on request.
- ^ static struct cvec *cclass(struct vars *, chr *, chr *, int);
- */
-static struct cvec *
-cclass(v, startp, endp, cases)
-    struct vars *v;			/* context */
-    chr *startp;			/* where the name starts */
-    chr *endp;				/* just past the end of the name */
-    int cases;				/* case-independent? */
-{
-    size_t len;
-    struct cvec *cv = NULL;
-    CONST chr *np;
-    chr **namePtr;
-    int i, index;
-
-    /*
-     * The following arrays define the valid character class names.
-     */
-
-    static chr *classNames[] = {
-	wxT("alnum"), wxT("alpha"), wxT("ascii"), wxT("blank"), wxT("cntrl"), wxT("digit"), wxT("graph"),
-	wxT("lower"), wxT("print"), wxT("punct"), wxT("space"), wxT("upper"), wxT("xdigit"), NULL
-    };
-
-    enum classes {
-	CC_ALNUM, CC_ALPHA, CC_ASCII, CC_BLANK, CC_CNTRL, CC_DIGIT, CC_GRAPH,
-	CC_LOWER, CC_PRINT, CC_PUNCT, CC_SPACE, CC_UPPER, CC_XDIGIT
-    };
-    
-
-    /*
-     * Extract the class name
-     */
-
-    len = endp - startp;
-    np = startp;
-
-    /*
-     * Remap lower and upper to alpha if the match is case insensitive.
-     */
-
-    if (cases && len == 5 && (wxCRT_StrncmpNative(wxT("lower"), np, 5) == 0
-	    || wxCRT_StrncmpNative(wxT("upper"), np, 5) == 0)) {
-	np = wxT("alpha");
-    }
-
-    /*
-     * Map the name to the corresponding enumerated value.
-     */
-
-    index = -1;
-    for (namePtr=classNames,i=0 ; *namePtr!=NULL ; namePtr++,i++) {
-	if ((wxCRT_StrlenNative(*namePtr) == len) && (wxCRT_StrncmpNative(*namePtr, np, len) == 0)) {
-	    index = i;
-	    break;
-	}
-    }
-    if (index == -1) {
-	ERR(REG_ECTYPE);
-	return NULL;
-    }
-    
-    /*
-     * Now compute the character class contents.
-     */
-
-    switch((enum classes) index) {
-    case CC_PRINT:
-    case CC_ALNUM:
-	cv = getcvec(v, NUM_ALPHA_CHAR, NUM_DIGIT_RANGE + NUM_ALPHA_RANGE, 0);
-	if (cv) {
-	    for (i=0 ; iname != NULL; cc++)
-            if (wxCRT_StrlenNative(cc->name) == len && wxCRT_StrncmpNative(cc->name, np, len) == 0)
-                    break;          /* NOTE BREAK OUT */
-    if (cc->name == NULL) {
-            ERR(REG_ECTYPE);
-            return NULL;
-    }
-
-    loc = setlocale(LC_CTYPE, NULL);
-
-    if (!cc->isfunc || loc == NULL || strcmp(loc, "C") == 0)
-    {
-        /* set up vector */
-        cv = getcvec(v, (int)strlen(cc->chars), 0, 0);
-        if (cv == NULL) {
-                ERR(REG_ESPACE);
-                return NULL;
-        }
-
-        /* fill it in */
-        for (p = cc->chars; *p != '\0'; p++)
-                addchr(cv, (chr)*p);
-    }
-    else
-    {
-        count = 0;
-        for (i = 0; i < 256; i++)
-            if (cc->isfunc(i))
-                buf[count++] = i;
-
-        /* set up vector */
-        cv = getcvec(v, count, 0, 0);
-        if (cv == NULL) {
-            ERR(REG_ESPACE);
-            return NULL;
-        }
-
-        /* fill it in */
-        for (i = 0; i < count; i++)
-            addchr(cv, buf[i]);
-    }
-
-    return cv;
-}
-
-#endif  /* !wxUSE_UNICODE */
-
-
-/*
- - allcases - supply cvec for all case counterparts of a chr (including itself)
- * This is a shortcut, preferably an efficient one, for simple characters;
- * messy cases are done via range().
- ^ static struct cvec *allcases(struct vars *, pchr);
- */
-static struct cvec *
-allcases(v, pc)
-    struct vars *v;			/* context */
-    pchr pc;				/* character to get case equivs of */
-{
-    struct cvec *cv;
-    chr c = (chr)pc;
-    chr lc, uc, tc;
-
-    lc = Tcl_UniCharToLower((chr)c);
-    uc = Tcl_UniCharToUpper((chr)c);
-    tc = Tcl_UniCharToTitle((chr)c);
-
-    if (tc != uc) {
-	cv = getcvec(v, 3, 0, 0);
-	addchr(cv, tc);
-    } else {
-	cv = getcvec(v, 2, 0, 0);
-    }
-    addchr(cv, lc);
-    if (lc != uc) {
-	addchr(cv, uc);
-    }
-    return cv;
-}
-
-/*
- - cmp - chr-substring compare
- * Backrefs need this.  It should preferably be efficient.
- * Note that it does not need to report anything except equal/unequal.
- * Note also that the length is exact, and the comparison should not
- * stop at embedded NULs!
- ^ static int cmp(CONST chr *, CONST chr *, size_t);
- */
-static int				/* 0 for equal, nonzero for unequal */
-cmp(x, y, len)
-    CONST chr *x, *y;			/* strings to compare */
-    size_t len;				/* exact length of comparison */
-{
-    return memcmp(VS(x), VS(y), len*sizeof(chr));
-}
-
-/*
- - casecmp - case-independent chr-substring compare
- * REG_ICASE backrefs need this.  It should preferably be efficient.
- * Note that it does not need to report anything except equal/unequal.
- * Note also that the length is exact, and the comparison should not
- * stop at embedded NULs!
- ^ static int casecmp(CONST chr *, CONST chr *, size_t);
- */
-static int				/* 0 for equal, nonzero for unequal */
-casecmp(x, y, len)
-    CONST chr *x, *y;			/* strings to compare */
-    size_t len;				/* exact length of comparison */
-{
-    for (; len > 0; len--, x++, y++) {
-	if ((*x!=*y) && (Tcl_UniCharToLower(*x) != Tcl_UniCharToLower(*y))) {
-	    return 1;
-	}
-    }
-    return 0;
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regc_nfa.c b/3rdparty/wxwidgets3.0-3.0.1/src/regex/regc_nfa.c
deleted file mode 100644
index 2db51bc7b9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regc_nfa.c
+++ /dev/null
@@ -1,1582 +0,0 @@
-/*
- * NFA utilities.
- * This file is #included by regcomp.c.
- *
- * Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
- * 
- * Development of this software was funded, in part, by Cray Research Inc.,
- * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
- * Corporation, none of whom are responsible for the results.  The author
- * thanks all of them. 
- * 
- * Redistribution and use in source and binary forms -- with or without
- * modification -- are permitted for any purpose, provided that
- * redistributions in source form retain this entire copyright notice and
- * indicate the origin and nature of any modifications.
- * 
- * I'd appreciate being given credit for this package in the documentation
- * of software which uses it, but that is not a requirement.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- *
- * One or two things that technically ought to be in here
- * are actually in color.c, thanks to some incestuous relationships in
- * the color chains.
- */
-
-#define	NISERR()	VISERR(nfa->v)
-#define	NERR(e)		(void)VERR(nfa->v, (e))
-
-
-/*
- - newnfa - set up an NFA
- ^ static struct nfa *newnfa(struct vars *, struct colormap *, struct nfa *);
- */
-static struct nfa *		/* the NFA, or NULL */
-newnfa(v, cm, parent)
-struct vars *v;
-struct colormap *cm;
-struct nfa *parent;		/* NULL if primary NFA */
-{
-	struct nfa *nfa;
-
-	nfa = (struct nfa *)MALLOC(sizeof(struct nfa));
-	if (nfa == NULL)
-		return NULL;
-
-	nfa->states = NULL;
-	nfa->slast = NULL;
-	nfa->free = NULL;
-	nfa->nstates = 0;
-	nfa->cm = cm;
-	nfa->v = v;
-	nfa->bos[0] = nfa->bos[1] = COLORLESS;
-	nfa->eos[0] = nfa->eos[1] = COLORLESS;
-	nfa->post = newfstate(nfa, '@');	/* number 0 */
-	nfa->pre = newfstate(nfa, '>');		/* number 1 */
-	nfa->parent = parent;
-
-	nfa->init = newstate(nfa);		/* may become invalid later */
-	nfa->final = newstate(nfa);
-	if (ISERR()) {
-		freenfa(nfa);
-		return NULL;
-	}
-	rainbow(nfa, nfa->cm, PLAIN, COLORLESS, nfa->pre, nfa->init);
-	newarc(nfa, '^', 1, nfa->pre, nfa->init);
-	newarc(nfa, '^', 0, nfa->pre, nfa->init);
-	rainbow(nfa, nfa->cm, PLAIN, COLORLESS, nfa->final, nfa->post);
-	newarc(nfa, '$', 1, nfa->final, nfa->post);
-	newarc(nfa, '$', 0, nfa->final, nfa->post);
-
-	if (ISERR()) {
-		freenfa(nfa);
-		return NULL;
-	}
-	return nfa;
-}
-
-/*
- - freenfa - free an entire NFA
- ^ static VOID freenfa(struct nfa *);
- */
-static VOID
-freenfa(nfa)
-struct nfa *nfa;
-{
-	struct state *s;
-
-	while ((s = nfa->states) != NULL) {
-		s->nins = s->nouts = 0;		/* don't worry about arcs */
-		freestate(nfa, s);
-	}
-	while ((s = nfa->free) != NULL) {
-		nfa->free = s->next;
-		destroystate(nfa, s);
-	}
-
-	nfa->slast = NULL;
-	nfa->nstates = -1;
-	nfa->pre = NULL;
-	nfa->post = NULL;
-	FREE(nfa);
-}
-
-/*
- - newstate - allocate an NFA state, with zero flag value
- ^ static struct state *newstate(struct nfa *);
- */
-static struct state *		/* NULL on error */
-newstate(nfa)
-struct nfa *nfa;
-{
-	struct state *s;
-
-	if (nfa->free != NULL) {
-		s = nfa->free;
-		nfa->free = s->next;
-	} else {
-		s = (struct state *)MALLOC(sizeof(struct state));
-		if (s == NULL) {
-			NERR(REG_ESPACE);
-			return NULL;
-		}
-		s->oas.next = NULL;
-		s->free = NULL;
-		s->noas = 0;
-	}
-
-	assert(nfa->nstates >= 0);
-	s->no = nfa->nstates++;
-	s->flag = 0;
-	if (nfa->states == NULL)
-		nfa->states = s;
-	s->nins = 0;
-	s->ins = NULL;
-	s->nouts = 0;
-	s->outs = NULL;
-	s->tmp = NULL;
-	s->next = NULL;
-	if (nfa->slast != NULL) {
-		assert(nfa->slast->next == NULL);
-		nfa->slast->next = s;
-	}
-	s->prev = nfa->slast;
-	nfa->slast = s;
-	return s;
-}
-
-/*
- - newfstate - allocate an NFA state with a specified flag value
- ^ static struct state *newfstate(struct nfa *, int flag);
- */
-static struct state *		/* NULL on error */
-newfstate(nfa, flag)
-struct nfa *nfa;
-int flag;
-{
-	struct state *s;
-
-	s = newstate(nfa);
-	if (s != NULL)
-		s->flag = (char)flag;
-	return s;
-}
-
-/*
- - dropstate - delete a state's inarcs and outarcs and free it
- ^ static VOID dropstate(struct nfa *, struct state *);
- */
-static VOID
-dropstate(nfa, s)
-struct nfa *nfa;
-struct state *s;
-{
-	struct arc *a;
-
-	while ((a = s->ins) != NULL)
-		freearc(nfa, a);
-	while ((a = s->outs) != NULL)
-		freearc(nfa, a);
-	freestate(nfa, s);
-}
-
-/*
- - freestate - free a state, which has no in-arcs or out-arcs
- ^ static VOID freestate(struct nfa *, struct state *);
- */
-static VOID
-freestate(nfa, s)
-struct nfa *nfa;
-struct state *s;
-{
-	assert(s != NULL);
-	assert(s->nins == 0 && s->nouts == 0);
-
-	s->no = FREESTATE;
-	s->flag = 0;
-	if (s->next != NULL)
-		s->next->prev = s->prev;
-	else {
-		assert(s == nfa->slast);
-		nfa->slast = s->prev;
-	}
-	if (s->prev != NULL)
-		s->prev->next = s->next;
-	else {
-		assert(s == nfa->states);
-		nfa->states = s->next;
-	}
-	s->prev = NULL;
-	s->next = nfa->free;	/* don't delete it, put it on the free list */
-	nfa->free = s;
-}
-
-/*
- - destroystate - really get rid of an already-freed state
- ^ static VOID destroystate(struct nfa *, struct state *);
- */
-static VOID
-destroystate(nfa, s)
-struct nfa *nfa;
-struct state *s;
-{
-	struct arcbatch *ab;
-	struct arcbatch *abnext;
-
-	assert(s->no == FREESTATE);
-	for (ab = s->oas.next; ab != NULL; ab = abnext) {
-		abnext = ab->next;
-		FREE(ab);
-	}
-	s->ins = NULL;
-	s->outs = NULL;
-	s->next = NULL;
-	FREE(s);
-}
-
-/*
- - newarc - set up a new arc within an NFA
- ^ static VOID newarc(struct nfa *, int, pcolor, struct state *, 
- ^	struct state *);
- */
-static VOID
-newarc(nfa, t, co, from, to)
-struct nfa *nfa;
-int t;
-pcolor co;
-struct state *from;
-struct state *to;
-{
-	struct arc *a;
-
-	assert(from != NULL && to != NULL);
-
-	/* check for duplicates */
-	for (a = from->outs; a != NULL; a = a->outchain)
-		if (a->to == to && a->co == co && a->type == t)
-			return;
-
-	a = allocarc(nfa, from);
-	if (NISERR())
-		return;
-	assert(a != NULL);
-
-	a->type = t;
-	a->co = (color)co;
-	a->to = to;
-	a->from = from;
-
-	/*
-	 * Put the new arc on the beginning, not the end, of the chains.
-	 * Not only is this easier, it has the very useful side effect that 
-	 * deleting the most-recently-added arc is the cheapest case rather
-	 * than the most expensive one.
-	 */
-	a->inchain = to->ins;
-	to->ins = a;
-	a->outchain = from->outs;
-	from->outs = a;
-
-	from->nouts++;
-	to->nins++;
-
-	if (COLORED(a) && nfa->parent == NULL)
-		colorchain(nfa->cm, a);
-
-	return;
-}
-
-/*
- - allocarc - allocate a new out-arc within a state
- ^ static struct arc *allocarc(struct nfa *, struct state *);
- */
-static struct arc *		/* NULL for failure */
-allocarc(nfa, s)
-struct nfa *nfa;
-struct state *s;
-{
-	struct arc *a;
-	struct arcbatch *new;
-	int i;
-
-	/* shortcut */
-	if (s->free == NULL && s->noas < ABSIZE) {
-		a = &s->oas.a[s->noas];
-		s->noas++;
-		return a;
-	}
-
-	/* if none at hand, get more */
-	if (s->free == NULL) {
-		new = (struct arcbatch *)MALLOC(sizeof(struct arcbatch));
-		if (new == NULL) {
-			NERR(REG_ESPACE);
-			return NULL;
-		}
-		new->next = s->oas.next;
-		s->oas.next = new;
-
-		for (i = 0; i < ABSIZE; i++) {
-			new->a[i].type = 0;
-			new->a[i].freechain = &new->a[i+1];
-		}
-		new->a[ABSIZE-1].freechain = NULL;
-		s->free = &new->a[0];
-	}
-	assert(s->free != NULL);
-
-	a = s->free;
-	s->free = a->freechain;
-	return a;
-}
-
-/*
- - freearc - free an arc
- ^ static VOID freearc(struct nfa *, struct arc *);
- */
-static VOID
-freearc(nfa, victim)
-struct nfa *nfa;
-struct arc *victim;
-{
-	struct state *from = victim->from;
-	struct state *to = victim->to;
-	struct arc *a;
-
-	assert(victim->type != 0);
-
-	/* take it off color chain if necessary */
-	if (COLORED(victim) && nfa->parent == NULL)
-		uncolorchain(nfa->cm, victim);
-
-	/* take it off source's out-chain */
-	assert(from != NULL);
-	assert(from->outs != NULL);
-	a = from->outs;
-	if (a == victim)		/* simple case:  first in chain */
-		from->outs = victim->outchain;
-	else {
-		for (; a != NULL && a->outchain != victim; a = a->outchain)
-			continue;
-		assert(a != NULL);
-		a->outchain = victim->outchain;
-	}
-	from->nouts--;
-
-	/* take it off target's in-chain */
-	assert(to != NULL);
-	assert(to->ins != NULL);
-	a = to->ins;
-	if (a == victim)		/* simple case:  first in chain */
-		to->ins = victim->inchain;
-	else {
-		for (; a != NULL && a->inchain != victim; a = a->inchain)
-			continue;
-		assert(a != NULL);
-		a->inchain = victim->inchain;
-	}
-	to->nins--;
-
-	/* clean up and place on free list */
-	victim->type = 0;
-	victim->from = NULL;		/* precautions... */
-	victim->to = NULL;
-	victim->inchain = NULL;
-	victim->outchain = NULL;
-	victim->freechain = from->free;
-	from->free = victim;
-}
-
-/*
- - findarc - find arc, if any, from given source with given type and color
- * If there is more than one such arc, the result is random.
- ^ static struct arc *findarc(struct state *, int, pcolor);
- */
-static struct arc *
-findarc(s, type, co)
-struct state *s;
-int type;
-pcolor co;
-{
-	struct arc *a;
-
-	for (a = s->outs; a != NULL; a = a->outchain)
-		if (a->type == type && a->co == co)
-			return a;
-	return NULL;
-}
-
-/*
- - cparc - allocate a new arc within an NFA, copying details from old one
- ^ static VOID cparc(struct nfa *, struct arc *, struct state *, 
- ^ 	struct state *);
- */
-static VOID
-cparc(nfa, oa, from, to)
-struct nfa *nfa;
-struct arc *oa;
-struct state *from;
-struct state *to;
-{
-	newarc(nfa, oa->type, oa->co, from, to);
-}
-
-/*
- - moveins - move all in arcs of a state to another state
- * You might think this could be done better by just updating the
- * existing arcs, and you would be right if it weren't for the desire
- * for duplicate suppression, which makes it easier to just make new
- * ones to exploit the suppression built into newarc.
- ^ static VOID moveins(struct nfa *, struct state *, struct state *);
- */
-static VOID
-moveins(nfa, old, new)
-struct nfa *nfa;
-struct state *old;
-struct state *new;
-{
-	struct arc *a;
-
-	assert(old != new);
-
-	while ((a = old->ins) != NULL) {
-		cparc(nfa, a, a->from, new);
-		freearc(nfa, a);
-	}
-	assert(old->nins == 0);
-	assert(old->ins == NULL);
-}
-
-/*
- - copyins - copy all in arcs of a state to another state
- ^ static VOID copyins(struct nfa *, struct state *, struct state *);
- */
-static VOID
-copyins(nfa, old, new)
-struct nfa *nfa;
-struct state *old;
-struct state *new;
-{
-	struct arc *a;
-
-	assert(old != new);
-
-	for (a = old->ins; a != NULL; a = a->inchain)
-		cparc(nfa, a, a->from, new);
-}
-
-/*
- - moveouts - move all out arcs of a state to another state
- ^ static VOID moveouts(struct nfa *, struct state *, struct state *);
- */
-static VOID
-moveouts(nfa, old, new)
-struct nfa *nfa;
-struct state *old;
-struct state *new;
-{
-	struct arc *a;
-
-	assert(old != new);
-
-	while ((a = old->outs) != NULL) {
-		cparc(nfa, a, new, a->to);
-		freearc(nfa, a);
-	}
-}
-
-/*
- - copyouts - copy all out arcs of a state to another state
- ^ static VOID copyouts(struct nfa *, struct state *, struct state *);
- */
-static VOID
-copyouts(nfa, old, new)
-struct nfa *nfa;
-struct state *old;
-struct state *new;
-{
-	struct arc *a;
-
-	assert(old != new);
-
-	for (a = old->outs; a != NULL; a = a->outchain)
-		cparc(nfa, a, new, a->to);
-}
-
-/*
- - cloneouts - copy out arcs of a state to another state pair, modifying type
- ^ static VOID cloneouts(struct nfa *, struct state *, struct state *,
- ^ 	struct state *, int);
- */
-static VOID
-cloneouts(nfa, old, from, to, type)
-struct nfa *nfa;
-struct state *old;
-struct state *from;
-struct state *to;
-int type;
-{
-	struct arc *a;
-
-	assert(old != from);
-
-	for (a = old->outs; a != NULL; a = a->outchain)
-		newarc(nfa, type, a->co, from, to);
-}
-
-/*
- - delsub - delete a sub-NFA, updating subre pointers if necessary
- * This uses a recursive traversal of the sub-NFA, marking already-seen
- * states using their tmp pointer.
- ^ static VOID delsub(struct nfa *, struct state *, struct state *);
- */
-static VOID
-delsub(nfa, lp, rp)
-struct nfa *nfa;
-struct state *lp;	/* the sub-NFA goes from here... */
-struct state *rp;	/* ...to here, *not* inclusive */
-{
-	assert(lp != rp);
-
-	rp->tmp = rp;			/* mark end */
-
-	deltraverse(nfa, lp, lp);
-	assert(lp->nouts == 0 && rp->nins == 0);	/* did the job */
-	assert(lp->no != FREESTATE && rp->no != FREESTATE);	/* no more */
-
-	rp->tmp = NULL;			/* unmark end */
-	lp->tmp = NULL;			/* and begin, marked by deltraverse */
-}
-
-/*
- - deltraverse - the recursive heart of delsub
- * This routine's basic job is to destroy all out-arcs of the state.
- ^ static VOID deltraverse(struct nfa *, struct state *, struct state *);
- */
-static VOID
-deltraverse(nfa, leftend, s)
-struct nfa *nfa;
-struct state *leftend;
-struct state *s;
-{
-	struct arc *a;
-	struct state *to;
-
-	if (s->nouts == 0)
-		return;			/* nothing to do */
-	if (s->tmp != NULL)
-		return;			/* already in progress */
-
-	s->tmp = s;			/* mark as in progress */
-
-	while ((a = s->outs) != NULL) {
-		to = a->to;
-		deltraverse(nfa, leftend, to);
-		assert(to->nouts == 0 || to->tmp != NULL);
-		freearc(nfa, a);
-		if (to->nins == 0 && to->tmp == NULL) {
-			assert(to->nouts == 0);
-			freestate(nfa, to);
-		}
-	}
-
-	assert(s->no != FREESTATE);	/* we're still here */
-	assert(s == leftend || s->nins != 0);	/* and still reachable */
-	assert(s->nouts == 0);		/* but have no outarcs */
-
-	s->tmp = NULL;			/* we're done here */
-}
-
-/*
- - dupnfa - duplicate sub-NFA
- * Another recursive traversal, this time using tmp to point to duplicates
- * as well as mark already-seen states.  (You knew there was a reason why
- * it's a state pointer, didn't you? :-))
- ^ static VOID dupnfa(struct nfa *, struct state *, struct state *, 
- ^ 	struct state *, struct state *);
- */
-static VOID
-dupnfa(nfa, start, stop, from, to)
-struct nfa *nfa;
-struct state *start;		/* duplicate of subNFA starting here */
-struct state *stop;		/* and stopping here */
-struct state *from;		/* stringing duplicate from here */
-struct state *to;		/* to here */
-{
-	if (start == stop) {
-		newarc(nfa, EMPTY, 0, from, to);
-		return;
-	}
-
-	stop->tmp = to;
-	duptraverse(nfa, start, from);
-	/* done, except for clearing out the tmp pointers */
-
-	stop->tmp = NULL;
-	cleartraverse(nfa, start);
-}
-
-/*
- - duptraverse - recursive heart of dupnfa
- ^ static VOID duptraverse(struct nfa *, struct state *, struct state *);
- */
-static VOID
-duptraverse(nfa, s, stmp)
-struct nfa *nfa;
-struct state *s;
-struct state *stmp;		/* s's duplicate, or NULL */
-{
-	struct arc *a;
-
-	if (s->tmp != NULL)
-		return;		/* already done */
-
-	s->tmp = (stmp == NULL) ? newstate(nfa) : stmp;
-	if (s->tmp == NULL) {
-		assert(NISERR());
-		return;
-	}
-
-	for (a = s->outs; a != NULL && !NISERR(); a = a->outchain) {
-		duptraverse(nfa, a->to, (struct state *)NULL);
-		assert(a->to->tmp != NULL);
-		cparc(nfa, a, s->tmp, a->to->tmp);
-	}
-}
-
-/*
- - cleartraverse - recursive cleanup for algorithms that leave tmp ptrs set
- ^ static VOID cleartraverse(struct nfa *, struct state *);
- */
-static VOID
-cleartraverse(nfa, s)
-struct nfa *nfa;
-struct state *s;
-{
-	struct arc *a;
-
-	if (s->tmp == NULL)
-		return;
-	s->tmp = NULL;
-
-	for (a = s->outs; a != NULL; a = a->outchain)
-		cleartraverse(nfa, a->to);
-}
-
-/*
- - specialcolors - fill in special colors for an NFA
- ^ static VOID specialcolors(struct nfa *);
- */
-static VOID
-specialcolors(nfa)
-struct nfa *nfa;
-{
-	/* false colors for BOS, BOL, EOS, EOL */
-	if (nfa->parent == NULL) {
-		nfa->bos[0] = pseudocolor(nfa->cm);
-		nfa->bos[1] = pseudocolor(nfa->cm);
-		nfa->eos[0] = pseudocolor(nfa->cm);
-		nfa->eos[1] = pseudocolor(nfa->cm);
-	} else {
-		assert(nfa->parent->bos[0] != COLORLESS);
-		nfa->bos[0] = nfa->parent->bos[0];
-		assert(nfa->parent->bos[1] != COLORLESS);
-		nfa->bos[1] = nfa->parent->bos[1];
-		assert(nfa->parent->eos[0] != COLORLESS);
-		nfa->eos[0] = nfa->parent->eos[0];
-		assert(nfa->parent->eos[1] != COLORLESS);
-		nfa->eos[1] = nfa->parent->eos[1];
-	}
-}
-
-/*
- - optimize - optimize an NFA
- ^ static long optimize(struct nfa *, FILE *);
- */
-static long			/* re_info bits */
-optimize(nfa, f)
-struct nfa *nfa;
-FILE *f;			/* for debug output; NULL none */
-{
-	int verbose = (f != NULL) ? 1 : 0;
-
-	if (verbose)
-		fprintf(f, "\ninitial cleanup:\n");
-	cleanup(nfa);		/* may simplify situation */
-	if (verbose)
-		dumpnfa(nfa, f);
-	if (verbose)
-		fprintf(f, "\nempties:\n");
-	fixempties(nfa, f);	/* get rid of EMPTY arcs */
-	if (verbose)
-		fprintf(f, "\nconstraints:\n");
-	pullback(nfa, f);	/* pull back constraints backward */
-	pushfwd(nfa, f);	/* push fwd constraints forward */
-	if (verbose)
-		fprintf(f, "\nfinal cleanup:\n");
-	cleanup(nfa);		/* final tidying */
-	return analyze(nfa);	/* and analysis */
-}
-
-/*
- - pullback - pull back constraints backward to (with luck) eliminate them
- ^ static VOID pullback(struct nfa *, FILE *);
- */
-static VOID
-pullback(nfa, f)
-struct nfa *nfa;
-FILE *f;			/* for debug output; NULL none */
-{
-	struct state *s;
-	struct state *nexts;
-	struct arc *a;
-	struct arc *nexta;
-	int progress;
-
-	/* find and pull until there are no more */
-	do {
-		progress = 0;
-		for (s = nfa->states; s != NULL && !NISERR(); s = nexts) {
-			nexts = s->next;
-			for (a = s->outs; a != NULL && !NISERR(); a = nexta) {
-				nexta = a->outchain;
-				if (a->type == '^' || a->type == BEHIND)
-					if (pull(nfa, a))
-						progress = 1;
-				assert(nexta == NULL || s->no != FREESTATE);
-			}
-		}
-		if (progress && f != NULL)
-			dumpnfa(nfa, f);
-	} while (progress && !NISERR());
-	if (NISERR())
-		return;
-
-	for (a = nfa->pre->outs; a != NULL; a = nexta) {
-		nexta = a->outchain;
-		if (a->type == '^') {
-			assert(a->co == 0 || a->co == 1);
-			newarc(nfa, PLAIN, nfa->bos[a->co], a->from, a->to);
-			freearc(nfa, a);
-		}
-	}
-}
-
-/*
- - pull - pull a back constraint backward past its source state
- * A significant property of this function is that it deletes at most
- * one state -- the constraint's from state -- and only if the constraint
- * was that state's last outarc.
- ^ static int pull(struct nfa *, struct arc *);
- */
-static int			/* 0 couldn't, 1 could */
-pull(nfa, con)
-struct nfa *nfa;
-struct arc *con;
-{
-	struct state *from = con->from;
-	struct state *to = con->to;
-	struct arc *a;
-	struct arc *nexta;
-	struct state *s;
-
-	if (from == to) {	/* circular constraint is pointless */
-		freearc(nfa, con);
-		return 1;
-	}
-	if (from->flag)		/* can't pull back beyond start */
-		return 0;
-	if (from->nins == 0) {	/* unreachable */
-		freearc(nfa, con);
-		return 1;
-	}
-
-	/* first, clone from state if necessary to avoid other outarcs */
-	if (from->nouts > 1) {
-		s = newstate(nfa);
-		if (NISERR())
-			return 0;
-		assert(to != from);		/* con is not an inarc */
-		copyins(nfa, from, s);		/* duplicate inarcs */
-		cparc(nfa, con, s, to);		/* move constraint arc */
-		freearc(nfa, con);
-		from = s;
-		con = from->outs;
-	}
-	assert(from->nouts == 1);
-
-	/* propagate the constraint into the from state's inarcs */
-	for (a = from->ins; a != NULL; a = nexta) {
-		nexta = a->inchain;
-		switch (combine(con, a)) {
-		case INCOMPATIBLE:	/* destroy the arc */
-			freearc(nfa, a);
-			break;
-		case SATISFIED:		/* no action needed */
-			break;
-		case COMPATIBLE:	/* swap the two arcs, more or less */
-			s = newstate(nfa);
-			if (NISERR())
-				return 0;
-			cparc(nfa, a, s, to);		/* anticipate move */
-			cparc(nfa, con, a->from, s);
-			if (NISERR())
-				return 0;
-			freearc(nfa, a);
-			break;
-		default:
-			assert(NOTREACHED);
-			break;
-		}
-	}
-
-	/* remaining inarcs, if any, incorporate the constraint */
-	moveins(nfa, from, to);
-	dropstate(nfa, from);		/* will free the constraint */
-	return 1;
-}
-
-/*
- - pushfwd - push forward constraints forward to (with luck) eliminate them
- ^ static VOID pushfwd(struct nfa *, FILE *);
- */
-static VOID
-pushfwd(nfa, f)
-struct nfa *nfa;
-FILE *f;			/* for debug output; NULL none */
-{
-	struct state *s;
-	struct state *nexts;
-	struct arc *a;
-	struct arc *nexta;
-	int progress;
-
-	/* find and push until there are no more */
-	do {
-		progress = 0;
-		for (s = nfa->states; s != NULL && !NISERR(); s = nexts) {
-			nexts = s->next;
-			for (a = s->ins; a != NULL && !NISERR(); a = nexta) {
-				nexta = a->inchain;
-				if (a->type == '$' || a->type == AHEAD)
-					if (push(nfa, a))
-						progress = 1;
-				assert(nexta == NULL || s->no != FREESTATE);
-			}
-		}
-		if (progress && f != NULL)
-			dumpnfa(nfa, f);
-	} while (progress && !NISERR());
-	if (NISERR())
-		return;
-
-	for (a = nfa->post->ins; a != NULL; a = nexta) {
-		nexta = a->inchain;
-		if (a->type == '$') {
-			assert(a->co == 0 || a->co == 1);
-			newarc(nfa, PLAIN, nfa->eos[a->co], a->from, a->to);
-			freearc(nfa, a);
-		}
-	}
-}
-
-/*
- - push - push a forward constraint forward past its destination state
- * A significant property of this function is that it deletes at most
- * one state -- the constraint's to state -- and only if the constraint
- * was that state's last inarc.
- ^ static int push(struct nfa *, struct arc *);
- */
-static int			/* 0 couldn't, 1 could */
-push(nfa, con)
-struct nfa *nfa;
-struct arc *con;
-{
-	struct state *from = con->from;
-	struct state *to = con->to;
-	struct arc *a;
-	struct arc *nexta;
-	struct state *s;
-
-	if (to == from) {	/* circular constraint is pointless */
-		freearc(nfa, con);
-		return 1;
-	}
-	if (to->flag)		/* can't push forward beyond end */
-		return 0;
-	if (to->nouts == 0) {	/* dead end */
-		freearc(nfa, con);
-		return 1;
-	}
-
-	/* first, clone to state if necessary to avoid other inarcs */
-	if (to->nins > 1) {
-		s = newstate(nfa);
-		if (NISERR())
-			return 0;
-		copyouts(nfa, to, s);		/* duplicate outarcs */
-		cparc(nfa, con, from, s);	/* move constraint */
-		freearc(nfa, con);
-		to = s;
-		con = to->ins;
-	}
-	assert(to->nins == 1);
-
-	/* propagate the constraint into the to state's outarcs */
-	for (a = to->outs; a != NULL; a = nexta) {
-		nexta = a->outchain;
-		switch (combine(con, a)) {
-		case INCOMPATIBLE:	/* destroy the arc */
-			freearc(nfa, a);
-			break;
-		case SATISFIED:		/* no action needed */
-			break;
-		case COMPATIBLE:	/* swap the two arcs, more or less */
-			s = newstate(nfa);
-			if (NISERR())
-				return 0;
-			cparc(nfa, con, s, a->to);	/* anticipate move */
-			cparc(nfa, a, from, s);
-			if (NISERR())
-				return 0;
-			freearc(nfa, a);
-			break;
-		default:
-			assert(NOTREACHED);
-			break;
-		}
-	}
-
-	/* remaining outarcs, if any, incorporate the constraint */
-	moveouts(nfa, to, from);
-	dropstate(nfa, to);		/* will free the constraint */
-	return 1;
-}
-
-/*
- - combine - constraint lands on an arc, what happens?
- ^ #def	INCOMPATIBLE	1	// destroys arc
- ^ #def	SATISFIED	2	// constraint satisfied
- ^ #def	COMPATIBLE	3	// compatible but not satisfied yet
- ^ static int combine(struct arc *, struct arc *);
- */
- 
-/* FIXME Required for CW 8 on Mac since it's not in limits.h */
-#ifndef __CHAR_BIT__
-#define __CHAR_BIT__ 8
-#endif
-
- 
-static int
-combine(con, a)
-struct arc *con;
-struct arc *a;
-{
-#	define	CA(ct,at)	(((ct)<type, a->type)) {
-	case CA('^', PLAIN):		/* newlines are handled separately */
-	case CA('$', PLAIN):
-		return INCOMPATIBLE;
-		break;
-	case CA(AHEAD, PLAIN):		/* color constraints meet colors */
-	case CA(BEHIND, PLAIN):
-		if (con->co == a->co)
-			return SATISFIED;
-		return INCOMPATIBLE;
-		break;
-	case CA('^', '^'):		/* collision, similar constraints */
-	case CA('$', '$'):
-	case CA(AHEAD, AHEAD):
-	case CA(BEHIND, BEHIND):
-		if (con->co == a->co)		/* true duplication */
-			return SATISFIED;
-		return INCOMPATIBLE;
-		break;
-	case CA('^', BEHIND):		/* collision, dissimilar constraints */
-	case CA(BEHIND, '^'):
-	case CA('$', AHEAD):
-	case CA(AHEAD, '$'):
-		return INCOMPATIBLE;
-		break;
-	case CA('^', '$'):		/* constraints passing each other */
-	case CA('^', AHEAD):
-	case CA(BEHIND, '$'):
-	case CA(BEHIND, AHEAD):
-	case CA('$', '^'):
-	case CA('$', BEHIND):
-	case CA(AHEAD, '^'):
-	case CA(AHEAD, BEHIND):
-	case CA('^', LACON):
-	case CA(BEHIND, LACON):
-	case CA('$', LACON):
-	case CA(AHEAD, LACON):
-		return COMPATIBLE;
-		break;
-	}
-	assert(NOTREACHED);
-	return INCOMPATIBLE;		/* for benefit of blind compilers */
-}
-
-/*
- - fixempties - get rid of EMPTY arcs
- ^ static VOID fixempties(struct nfa *, FILE *);
- */
-static VOID
-fixempties(nfa, f)
-struct nfa *nfa;
-FILE *f;			/* for debug output; NULL none */
-{
-	struct state *s;
-	struct state *nexts;
-	struct arc *a;
-	struct arc *nexta;
-	int progress;
-
-	/* find and eliminate empties until there are no more */
-	do {
-		progress = 0;
-		for (s = nfa->states; s != NULL && !NISERR(); s = nexts) {
-			nexts = s->next;
-			for (a = s->outs; a != NULL && !NISERR(); a = nexta) {
-				nexta = a->outchain;
-				if (a->type == EMPTY && unempty(nfa, a))
-					progress = 1;
-				assert(nexta == NULL || s->no != FREESTATE);
-			}
-		}
-		if (progress && f != NULL)
-			dumpnfa(nfa, f);
-	} while (progress && !NISERR());
-}
-
-/*
- - unempty - optimize out an EMPTY arc, if possible
- * Actually, as it stands this function always succeeds, but the return
- * value is kept with an eye on possible future changes.
- ^ static int unempty(struct nfa *, struct arc *);
- */
-static int			/* 0 couldn't, 1 could */
-unempty(nfa, a)
-struct nfa *nfa;
-struct arc *a;
-{
-	struct state *from = a->from;
-	struct state *to = a->to;
-	int usefrom;		/* work on from, as opposed to to? */
-
-	assert(a->type == EMPTY);
-	assert(from != nfa->pre && to != nfa->post);
-
-	if (from == to) {		/* vacuous loop */
-		freearc(nfa, a);
-		return 1;
-	}
-
-	/* decide which end to work on */
-	usefrom = 1;			/* default:  attack from */
-	if (from->nouts > to->nins)
-		usefrom = 0;
-	else if (from->nouts == to->nins) {
-		/* decide on secondary issue:  move/copy fewest arcs */
-		if (from->nins > to->nouts)
-			usefrom = 0;
-	}
-		
-	freearc(nfa, a);
-	if (usefrom) {
-		if (from->nouts == 0) {
-			/* was the state's only outarc */
-			moveins(nfa, from, to);
-			freestate(nfa, from);
-		} else
-			copyins(nfa, from, to);
-	} else {
-		if (to->nins == 0) {
-			/* was the state's only inarc */
-			moveouts(nfa, to, from);
-			freestate(nfa, to);
-		} else
-			copyouts(nfa, to, from);
-	}
-
-	return 1;
-}
-
-/*
- - cleanup - clean up NFA after optimizations
- ^ static VOID cleanup(struct nfa *);
- */
-static VOID
-cleanup(nfa)
-struct nfa *nfa;
-{
-	struct state *s;
-	struct state *nexts;
-	int n;
-
-	/* clear out unreachable or dead-end states */
-	/* use pre to mark reachable, then post to mark can-reach-post */
-	markreachable(nfa, nfa->pre, (struct state *)NULL, nfa->pre);
-	markcanreach(nfa, nfa->post, nfa->pre, nfa->post);
-	for (s = nfa->states; s != NULL; s = nexts) {
-		nexts = s->next;
-		if (s->tmp != nfa->post && !s->flag)
-			dropstate(nfa, s);
-	}
-	assert(nfa->post->nins == 0 || nfa->post->tmp == nfa->post);
-	cleartraverse(nfa, nfa->pre);
-	assert(nfa->post->nins == 0 || nfa->post->tmp == NULL);
-	/* the nins==0 (final unreachable) case will be caught later */
-
-	/* renumber surviving states */
-	n = 0;
-	for (s = nfa->states; s != NULL; s = s->next)
-		s->no = n++;
-	nfa->nstates = n;
-}
-
-/*
- - markreachable - recursive marking of reachable states
- ^ static VOID markreachable(struct nfa *, struct state *, struct state *,
- ^ 	struct state *);
- */
-static VOID
-markreachable(nfa, s, okay, mark)
-struct nfa *nfa;
-struct state *s;
-struct state *okay;		/* consider only states with this mark */
-struct state *mark;		/* the value to mark with */
-{
-	struct arc *a;
-
-	if (s->tmp != okay)
-		return;
-	s->tmp = mark;
-
-	for (a = s->outs; a != NULL; a = a->outchain)
-		markreachable(nfa, a->to, okay, mark);
-}
-
-/*
- - markcanreach - recursive marking of states which can reach here
- ^ static VOID markcanreach(struct nfa *, struct state *, struct state *,
- ^ 	struct state *);
- */
-static VOID
-markcanreach(nfa, s, okay, mark)
-struct nfa *nfa;
-struct state *s;
-struct state *okay;		/* consider only states with this mark */
-struct state *mark;		/* the value to mark with */
-{
-	struct arc *a;
-
-	if (s->tmp != okay)
-		return;
-	s->tmp = mark;
-
-	for (a = s->ins; a != NULL; a = a->inchain)
-		markcanreach(nfa, a->from, okay, mark);
-}
-
-/*
- - analyze - ascertain potentially-useful facts about an optimized NFA
- ^ static long analyze(struct nfa *);
- */
-static long			/* re_info bits to be ORed in */
-analyze(nfa)
-struct nfa *nfa;
-{
-	struct arc *a;
-	struct arc *aa;
-
-	if (nfa->pre->outs == NULL)
-		return REG_UIMPOSSIBLE;
-	for (a = nfa->pre->outs; a != NULL; a = a->outchain)
-		for (aa = a->to->outs; aa != NULL; aa = aa->outchain)
-			if (aa->to == nfa->post)
-				return REG_UEMPTYMATCH;
-	return 0;
-}
-
-/*
- - compact - compact an NFA
- ^ static VOID compact(struct nfa *, struct cnfa *);
- */
-static VOID
-compact(nfa, cnfa)
-struct nfa *nfa;
-struct cnfa *cnfa;
-{
-	struct state *s;
-	struct arc *a;
-	size_t nstates;
-	size_t narcs;
-	struct carc *ca;
-	struct carc *first;
-
-	assert (!NISERR());
-
-	nstates = 0;
-	narcs = 0;
-	for (s = nfa->states; s != NULL; s = s->next) {
-		nstates++;
-		narcs += 1 + s->nouts + 1;
-		/* 1 as a fake for flags, nouts for arcs, 1 as endmarker */
-	}
-
-	cnfa->states = (struct carc **)MALLOC(nstates * sizeof(struct carc *));
-	cnfa->arcs = (struct carc *)MALLOC(narcs * sizeof(struct carc));
-	if (cnfa->states == NULL || cnfa->arcs == NULL) {
-		if (cnfa->states != NULL)
-			FREE(cnfa->states);
-		if (cnfa->arcs != NULL)
-			FREE(cnfa->arcs);
-		NERR(REG_ESPACE);
-		return;
-	}
-	cnfa->nstates = nstates;
-	cnfa->pre = nfa->pre->no;
-	cnfa->post = nfa->post->no;
-	cnfa->bos[0] = nfa->bos[0];
-	cnfa->bos[1] = nfa->bos[1];
-	cnfa->eos[0] = nfa->eos[0];
-	cnfa->eos[1] = nfa->eos[1];
-	cnfa->ncolors = maxcolor(nfa->cm) + 1;
-	cnfa->flags = 0;
-
-	ca = cnfa->arcs;
-	for (s = nfa->states; s != NULL; s = s->next) {
-		assert((size_t)s->no < nstates);
-		cnfa->states[s->no] = ca;
-		ca->co = 0;		/* clear and skip flags "arc" */
-		ca++;
-		first = ca;
-		for (a = s->outs; a != NULL; a = a->outchain)
-			switch (a->type) {
-			case PLAIN:
-				ca->co = a->co;
-				ca->to = a->to->no;
-				ca++;
-				break;
-			case LACON:
-				assert(s->no != cnfa->pre);
-				ca->co = (color)(cnfa->ncolors + a->co);
-				ca->to = a->to->no;
-				ca++;
-				cnfa->flags |= HASLACONS;
-				break;
-			default:
-				assert(NOTREACHED);
-				break;
-			}
-		carcsort(first, ca-1);
-		ca->co = COLORLESS;
-		ca->to = 0;
-		ca++;
-	}
-	assert(ca == &cnfa->arcs[narcs]);
-	assert(cnfa->nstates != 0);
-
-	/* mark no-progress states */
-	for (a = nfa->pre->outs; a != NULL; a = a->outchain)
-		cnfa->states[a->to->no]->co = 1;
-	cnfa->states[nfa->pre->no]->co = 1;
-}
-
-/*
- - carcsort - sort compacted-NFA arcs by color
- * Really dumb algorithm, but if the list is long enough for that to matter,
- * you're in real trouble anyway.
- ^ static VOID carcsort(struct carc *, struct carc *);
- */
-static VOID
-carcsort(first, last)
-struct carc *first;
-struct carc *last;
-{
-	struct carc *p;
-	struct carc *q;
-	struct carc tmp;
-
-	if (last - first <= 1)
-		return;
-
-	for (p = first; p <= last; p++)
-		for (q = p; q <= last; q++)
-			if (p->co > q->co ||
-					(p->co == q->co && p->to > q->to)) {
-				assert(p != q);
-				tmp = *p;
-				*p = *q;
-				*q = tmp;
-			}
-}
-
-/*
- - freecnfa - free a compacted NFA
- ^ static VOID freecnfa(struct cnfa *);
- */
-static VOID
-freecnfa(cnfa)
-struct cnfa *cnfa;
-{
-	assert(cnfa->nstates != 0);	/* not empty already */
-	cnfa->nstates = 0;
-	FREE(cnfa->states);
-	FREE(cnfa->arcs);
-}
-
-/*
- - dumpnfa - dump an NFA in human-readable form
- ^ static VOID dumpnfa(struct nfa *, FILE *);
- */
-static VOID
-dumpnfa(nfa, f)
-struct nfa *nfa;
-FILE *f;
-{
-#ifdef REG_DEBUG
-	struct state *s;
-
-	fprintf(f, "pre %d, post %d", nfa->pre->no, nfa->post->no);
-	if (nfa->bos[0] != COLORLESS)
-		fprintf(f, ", bos [%ld]", (long)nfa->bos[0]);
-	if (nfa->bos[1] != COLORLESS)
-		fprintf(f, ", bol [%ld]", (long)nfa->bos[1]);
-	if (nfa->eos[0] != COLORLESS)
-		fprintf(f, ", eos [%ld]", (long)nfa->eos[0]);
-	if (nfa->eos[1] != COLORLESS)
-		fprintf(f, ", eol [%ld]", (long)nfa->eos[1]);
-	fprintf(f, "\n");
-	for (s = nfa->states; s != NULL; s = s->next)
-		dumpstate(s, f);
-	if (nfa->parent == NULL)
-		dumpcolors(nfa->cm, f);
-	fflush(f);
-#endif
-}
-
-#ifdef REG_DEBUG		/* subordinates of dumpnfa */
-/*
- ^ #ifdef REG_DEBUG
- */
-
-/*
- - dumpstate - dump an NFA state in human-readable form
- ^ static VOID dumpstate(struct state *, FILE *);
- */
-static VOID
-dumpstate(s, f)
-struct state *s;
-FILE *f;
-{
-	struct arc *a;
-
-	fprintf(f, "%d%s%c", s->no, (s->tmp != NULL) ? "T" : "",
-					(s->flag) ? s->flag : '.');
-	if (s->prev != NULL && s->prev->next != s)
-		fprintf(f, "\tstate chain bad\n");
-	if (s->nouts == 0)
-		fprintf(f, "\tno out arcs\n");
-	else
-		dumparcs(s, f);
-	fflush(f);
-	for (a = s->ins; a != NULL; a = a->inchain) {
-		if (a->to != s)
-			fprintf(f, "\tlink from %d to %d on %d's in-chain\n",
-					a->from->no, a->to->no, s->no);
-	}
-}
-
-/*
- - dumparcs - dump out-arcs in human-readable form
- ^ static VOID dumparcs(struct state *, FILE *);
- */
-static VOID
-dumparcs(s, f)
-struct state *s;
-FILE *f;
-{
-	int pos;
-
-	assert(s->nouts > 0);
-	/* printing arcs in reverse order is usually clearer */
-	pos = dumprarcs(s->outs, s, f, 1);
-	if (pos != 1)
-		fprintf(f, "\n");
-}
-
-/*
- - dumprarcs - dump remaining outarcs, recursively, in reverse order
- ^ static int dumprarcs(struct arc *, struct state *, FILE *, int);
- */
-static int			/* resulting print position */
-dumprarcs(a, s, f, pos)
-struct arc *a;
-struct state *s;
-FILE *f;
-int pos;			/* initial print position */
-{
-	if (a->outchain != NULL)
-		pos = dumprarcs(a->outchain, s, f, pos);
-	dumparc(a, s, f);
-	if (pos == 5) {
-		fprintf(f, "\n");
-		pos = 1;
-	} else
-		pos++;
-	return pos;
-}
-
-/*
- - dumparc - dump one outarc in readable form, including prefixing tab
- ^ static VOID dumparc(struct arc *, struct state *, FILE *);
- */
-static VOID
-dumparc(a, s, f)
-struct arc *a;
-struct state *s;
-FILE *f;
-{
-	struct arc *aa;
-	struct arcbatch *ab;
-
-	fprintf(f, "\t");
-	switch (a->type) {
-	case PLAIN:
-		fprintf(f, "[%ld]", (long)a->co);
-		break;
-	case AHEAD:
-		fprintf(f, ">%ld>", (long)a->co);
-		break;
-	case BEHIND:
-		fprintf(f, "<%ld<", (long)a->co);
-		break;
-	case LACON:
-		fprintf(f, ":%ld:", (long)a->co);
-		break;
-	case '^':
-	case '$':
-		fprintf(f, "%c%d", a->type, (int)a->co);
-		break;
-	case EMPTY:
-		break;
-	default:
-		fprintf(f, "0x%x/0%lo", a->type, (long)a->co);
-		break;
-	}
-	if (a->from != s)
-		fprintf(f, "?%d?", a->from->no);
-	for (ab = &a->from->oas; ab != NULL; ab = ab->next) {
-		for (aa = &ab->a[0]; aa < &ab->a[ABSIZE]; aa++)
-			if (aa == a)
-				break;		/* NOTE BREAK OUT */
-		if (aa < &ab->a[ABSIZE])	/* propagate break */
-				break;		/* NOTE BREAK OUT */
-	}
-	if (ab == NULL)
-		fprintf(f, "?!?");	/* not in allocated space */
-	fprintf(f, "->");
-	if (a->to == NULL) {
-		fprintf(f, "NULL");
-		return;
-	}
-	fprintf(f, "%d", a->to->no);
-	for (aa = a->to->ins; aa != NULL; aa = aa->inchain)
-		if (aa == a)
-			break;		/* NOTE BREAK OUT */
-	if (aa == NULL)
-		fprintf(f, "?!?");	/* missing from in-chain */
-}
-
-/*
- ^ #endif
- */
-#endif				/* ifdef REG_DEBUG */
-
-/*
- - dumpcnfa - dump a compacted NFA in human-readable form
- ^ static VOID dumpcnfa(struct cnfa *, FILE *);
- */
-static VOID
-dumpcnfa(cnfa, f)
-struct cnfa *cnfa;
-FILE *f;
-{
-#ifdef REG_DEBUG
-	int st;
-
-	fprintf(f, "pre %d, post %d", cnfa->pre, cnfa->post);
-	if (cnfa->bos[0] != COLORLESS)
-		fprintf(f, ", bos [%ld]", (long)cnfa->bos[0]);
-	if (cnfa->bos[1] != COLORLESS)
-		fprintf(f, ", bol [%ld]", (long)cnfa->bos[1]);
-	if (cnfa->eos[0] != COLORLESS)
-		fprintf(f, ", eos [%ld]", (long)cnfa->eos[0]);
-	if (cnfa->eos[1] != COLORLESS)
-		fprintf(f, ", eol [%ld]", (long)cnfa->eos[1]);
-	if (cnfa->flags&HASLACONS)
-		fprintf(f, ", haslacons");
-	fprintf(f, "\n");
-	for (st = 0; st < cnfa->nstates; st++)
-		dumpcstate(st, cnfa->states[st], cnfa, f);
-	fflush(f);
-#endif
-}
-
-#ifdef REG_DEBUG		/* subordinates of dumpcnfa */
-/*
- ^ #ifdef REG_DEBUG
- */
-
-/*
- - dumpcstate - dump a compacted-NFA state in human-readable form
- ^ static VOID dumpcstate(int, struct carc *, struct cnfa *, FILE *);
- */
-static VOID
-dumpcstate(st, ca, cnfa, f)
-int st;
-struct carc *ca;
-struct cnfa *cnfa;
-FILE *f;
-{
-	int i;
-	int pos;
-
-	fprintf(f, "%d%s", st, (ca[0].co) ? ":" : ".");
-	pos = 1;
-	for (i = 1; ca[i].co != COLORLESS; i++) {
-		if (ca[i].co < cnfa->ncolors)
-			fprintf(f, "\t[%ld]->%d", (long)ca[i].co, ca[i].to);
-		else
-			fprintf(f, "\t:%ld:->%d", (long)ca[i].co-cnfa->ncolors,
-								ca[i].to);
-		if (pos == 5) {
-			fprintf(f, "\n");
-			pos = 1;
-		} else
-			pos++;
-	}
-	if (i == 1 || pos != 1)
-		fprintf(f, "\n");
-	fflush(f);
-}
-
-/*
- ^ #endif
- */
-#endif				/* ifdef REG_DEBUG */
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regcomp.c b/3rdparty/wxwidgets3.0-3.0.1/src/regex/regcomp.c
deleted file mode 100644
index 83edc37b34..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regcomp.c
+++ /dev/null
@@ -1,2179 +0,0 @@
-/*
- * re_*comp and friends - compile REs
- * This file #includes several others (see the bottom).
- *
- * Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
- * 
- * Development of this software was funded, in part, by Cray Research Inc.,
- * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
- * Corporation, none of whom are responsible for the results.  The author
- * thanks all of them. 
- * 
- * Redistribution and use in source and binary forms -- with or without
- * modification -- are permitted for any purpose, provided that
- * redistributions in source form retain this entire copyright notice and
- * indicate the origin and nature of any modifications.
- * 
- * I'd appreciate being given credit for this package in the documentation
- * of software which uses it, but that is not a requirement.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include "regguts.h"
-
-/*
- * forward declarations, up here so forward datatypes etc. are defined early
- */
-/* =====^!^===== begin forwards =====^!^===== */
-/* automatically gathered by fwd; do not hand-edit */
-/* === regcomp.c === */
-int compile _ANSI_ARGS_((regex_t *, CONST chr *, size_t, int));
-static VOID moresubs _ANSI_ARGS_((struct vars *, int));
-static int freev _ANSI_ARGS_((struct vars *, int));
-static VOID makesearch _ANSI_ARGS_((struct vars *, struct nfa *));
-static struct subre *parse _ANSI_ARGS_((struct vars *, int, int, struct state *, struct state *));
-static struct subre *parsebranch _ANSI_ARGS_((struct vars *, int, int, struct state *, struct state *, int));
-static VOID parseqatom _ANSI_ARGS_((struct vars *, int, int, struct state *, struct state *, struct subre *));
-static VOID nonword _ANSI_ARGS_((struct vars *, int, struct state *, struct state *));
-static VOID word _ANSI_ARGS_((struct vars *, int, struct state *, struct state *));
-static int scannum _ANSI_ARGS_((struct vars *));
-static VOID repeat _ANSI_ARGS_((struct vars *, struct state *, struct state *, int, int));
-static VOID bracket _ANSI_ARGS_((struct vars *, struct state *, struct state *));
-static VOID cbracket _ANSI_ARGS_((struct vars *, struct state *, struct state *));
-static VOID brackpart _ANSI_ARGS_((struct vars *, struct state *, struct state *));
-static chr *scanplain _ANSI_ARGS_((struct vars *));
-static VOID leaders _ANSI_ARGS_((struct vars *, struct cvec *));
-static VOID onechr _ANSI_ARGS_((struct vars *, pchr, struct state *, struct state *));
-static VOID dovec _ANSI_ARGS_((struct vars *, struct cvec *, struct state *, struct state *));
-static celt nextleader _ANSI_ARGS_((struct vars *, pchr, pchr));
-static VOID wordchrs _ANSI_ARGS_((struct vars *));
-static struct subre *subre _ANSI_ARGS_((struct vars *, int, int, struct state *, struct state *));
-static VOID freesubre _ANSI_ARGS_((struct vars *, struct subre *));
-static VOID freesrnode _ANSI_ARGS_((struct vars *, struct subre *));
-static VOID optst _ANSI_ARGS_((struct vars *, struct subre *));
-static int numst _ANSI_ARGS_((struct subre *, int));
-static VOID markst _ANSI_ARGS_((struct subre *));
-static VOID cleanst _ANSI_ARGS_((struct vars *));
-static long nfatree _ANSI_ARGS_((struct vars *, struct subre *, FILE *));
-static long nfanode _ANSI_ARGS_((struct vars *, struct subre *, FILE *));
-static int newlacon _ANSI_ARGS_((struct vars *, struct state *, struct state *, int));
-static VOID freelacons _ANSI_ARGS_((struct subre *, int));
-static VOID rfree _ANSI_ARGS_((regex_t *));
-static VOID dump _ANSI_ARGS_((regex_t *, FILE *));
-static VOID dumpst _ANSI_ARGS_((struct subre *, FILE *, int));
-static VOID stdump _ANSI_ARGS_((struct subre *, FILE *, int));
-static char *stid _ANSI_ARGS_((struct subre *, char *, size_t));
-/* === regc_lex.c === */
-static VOID lexstart _ANSI_ARGS_((struct vars *));
-static VOID prefixes _ANSI_ARGS_((struct vars *));
-static VOID lexnest _ANSI_ARGS_((struct vars *, chr *, chr *));
-static VOID lexword _ANSI_ARGS_((struct vars *));
-static int next _ANSI_ARGS_((struct vars *));
-static int lexescape _ANSI_ARGS_((struct vars *));
-static chr lexdigits _ANSI_ARGS_((struct vars *, int, int, int));
-static int brenext _ANSI_ARGS_((struct vars *, pchr));
-static VOID skip _ANSI_ARGS_((struct vars *));
-static chr newline _ANSI_ARGS_((NOPARMS));
-#ifdef REG_DEBUG
-static chr *ch _ANSI_ARGS_((NOPARMS));
-#endif
-static chr chrnamed _ANSI_ARGS_((struct vars *, chr *, chr *, pchr));
-/* === regc_color.c === */
-static VOID initcm _ANSI_ARGS_((struct vars *, struct colormap *));
-static VOID freecm _ANSI_ARGS_((struct colormap *));
-static VOID cmtreefree _ANSI_ARGS_((struct colormap *, union tree *, int));
-static color setcolor _ANSI_ARGS_((struct colormap *, pchr, pcolor));
-static color maxcolor _ANSI_ARGS_((struct colormap *));
-static color newcolor _ANSI_ARGS_((struct colormap *));
-static VOID freecolor _ANSI_ARGS_((struct colormap *, pcolor));
-static color pseudocolor _ANSI_ARGS_((struct colormap *));
-static color subcolor _ANSI_ARGS_((struct colormap *, pchr c));
-static color newsub _ANSI_ARGS_((struct colormap *, pcolor));
-static VOID subrange _ANSI_ARGS_((struct vars *, pchr, pchr, struct state *, struct state *));
-static VOID subblock _ANSI_ARGS_((struct vars *, pchr, struct state *, struct state *));
-static VOID okcolors _ANSI_ARGS_((struct nfa *, struct colormap *));
-static VOID colorchain _ANSI_ARGS_((struct colormap *, struct arc *));
-static VOID uncolorchain _ANSI_ARGS_((struct colormap *, struct arc *));
-static int singleton _ANSI_ARGS_((struct colormap *, pchr c));
-static VOID rainbow _ANSI_ARGS_((struct nfa *, struct colormap *, int, pcolor, struct state *, struct state *));
-static VOID colorcomplement _ANSI_ARGS_((struct nfa *, struct colormap *, int, struct state *, struct state *, struct state *));
-#ifdef REG_DEBUG
-static VOID dumpcolors _ANSI_ARGS_((struct colormap *, FILE *));
-static VOID fillcheck _ANSI_ARGS_((struct colormap *, union tree *, int, FILE *));
-static VOID dumpchr _ANSI_ARGS_((pchr, FILE *));
-#endif
-/* === regc_nfa.c === */
-static struct nfa *newnfa _ANSI_ARGS_((struct vars *, struct colormap *, struct nfa *));
-static VOID freenfa _ANSI_ARGS_((struct nfa *));
-static struct state *newstate _ANSI_ARGS_((struct nfa *));
-static struct state *newfstate _ANSI_ARGS_((struct nfa *, int flag));
-static VOID dropstate _ANSI_ARGS_((struct nfa *, struct state *));
-static VOID freestate _ANSI_ARGS_((struct nfa *, struct state *));
-static VOID destroystate _ANSI_ARGS_((struct nfa *, struct state *));
-static VOID newarc _ANSI_ARGS_((struct nfa *, int, pcolor, struct state *, struct state *));
-static struct arc *allocarc _ANSI_ARGS_((struct nfa *, struct state *));
-static VOID freearc _ANSI_ARGS_((struct nfa *, struct arc *));
-static struct arc *findarc _ANSI_ARGS_((struct state *, int, pcolor));
-static VOID cparc _ANSI_ARGS_((struct nfa *, struct arc *, struct state *, struct state *));
-static VOID moveins _ANSI_ARGS_((struct nfa *, struct state *, struct state *));
-static VOID copyins _ANSI_ARGS_((struct nfa *, struct state *, struct state *));
-static VOID moveouts _ANSI_ARGS_((struct nfa *, struct state *, struct state *));
-static VOID copyouts _ANSI_ARGS_((struct nfa *, struct state *, struct state *));
-static VOID cloneouts _ANSI_ARGS_((struct nfa *, struct state *, struct state *, struct state *, int));
-static VOID delsub _ANSI_ARGS_((struct nfa *, struct state *, struct state *));
-static VOID deltraverse _ANSI_ARGS_((struct nfa *, struct state *, struct state *));
-static VOID dupnfa _ANSI_ARGS_((struct nfa *, struct state *, struct state *, struct state *, struct state *));
-static VOID duptraverse _ANSI_ARGS_((struct nfa *, struct state *, struct state *));
-static VOID cleartraverse _ANSI_ARGS_((struct nfa *, struct state *));
-static VOID specialcolors _ANSI_ARGS_((struct nfa *));
-static long optimize _ANSI_ARGS_((struct nfa *, FILE *));
-static VOID pullback _ANSI_ARGS_((struct nfa *, FILE *));
-static int pull _ANSI_ARGS_((struct nfa *, struct arc *));
-static VOID pushfwd _ANSI_ARGS_((struct nfa *, FILE *));
-static int push _ANSI_ARGS_((struct nfa *, struct arc *));
-#define	INCOMPATIBLE	1	/* destroys arc */
-#define	SATISFIED	2	/* constraint satisfied */
-#define	COMPATIBLE	3	/* compatible but not satisfied yet */
-static int combine _ANSI_ARGS_((struct arc *, struct arc *));
-static VOID fixempties _ANSI_ARGS_((struct nfa *, FILE *));
-static int unempty _ANSI_ARGS_((struct nfa *, struct arc *));
-static VOID cleanup _ANSI_ARGS_((struct nfa *));
-static VOID markreachable _ANSI_ARGS_((struct nfa *, struct state *, struct state *, struct state *));
-static VOID markcanreach _ANSI_ARGS_((struct nfa *, struct state *, struct state *, struct state *));
-static long analyze _ANSI_ARGS_((struct nfa *));
-static VOID compact _ANSI_ARGS_((struct nfa *, struct cnfa *));
-static VOID carcsort _ANSI_ARGS_((struct carc *, struct carc *));
-static VOID freecnfa _ANSI_ARGS_((struct cnfa *));
-static VOID dumpnfa _ANSI_ARGS_((struct nfa *, FILE *));
-#ifdef REG_DEBUG
-static VOID dumpstate _ANSI_ARGS_((struct state *, FILE *));
-static VOID dumparcs _ANSI_ARGS_((struct state *, FILE *));
-static int dumprarcs _ANSI_ARGS_((struct arc *, struct state *, FILE *, int));
-static VOID dumparc _ANSI_ARGS_((struct arc *, struct state *, FILE *));
-#endif
-static VOID dumpcnfa _ANSI_ARGS_((struct cnfa *, FILE *));
-#ifdef REG_DEBUG
-static VOID dumpcstate _ANSI_ARGS_((int, struct carc *, struct cnfa *, FILE *));
-#endif
-/* === regc_cvec.c === */
-static struct cvec *newcvec _ANSI_ARGS_((int, int, int));
-static struct cvec *clearcvec _ANSI_ARGS_((struct cvec *));
-static VOID addchr _ANSI_ARGS_((struct cvec *, pchr));
-static VOID addrange _ANSI_ARGS_((struct cvec *, pchr, pchr));
-static VOID addmcce _ANSI_ARGS_((struct cvec *, chr *, chr *));
-static int haschr _ANSI_ARGS_((struct cvec *, pchr));
-static struct cvec *getcvec _ANSI_ARGS_((struct vars *, int, int, int));
-static VOID freecvec _ANSI_ARGS_((struct cvec *));
-/* === regc_locale.c === */
-static int nmcces _ANSI_ARGS_((struct vars *));
-static int nleaders _ANSI_ARGS_((struct vars *));
-static struct cvec *allmcces _ANSI_ARGS_((struct vars *, struct cvec *));
-static celt element _ANSI_ARGS_((struct vars *, chr *, chr *));
-static struct cvec *range _ANSI_ARGS_((struct vars *, celt, celt, int));
-static int before _ANSI_ARGS_((celt, celt));
-static struct cvec *eclass _ANSI_ARGS_((struct vars *, celt, int));
-static struct cvec *cclass _ANSI_ARGS_((struct vars *, chr *, chr *, int));
-static struct cvec *allcases _ANSI_ARGS_((struct vars *, pchr));
-static int cmp _ANSI_ARGS_((CONST chr *, CONST chr *, size_t));
-static int casecmp _ANSI_ARGS_((CONST chr *, CONST chr *, size_t));
-/* automatically gathered by fwd; do not hand-edit */
-/* =====^!^===== end forwards =====^!^===== */
-
-
-
-/* internal variables, bundled for easy passing around */
-struct vars {
-	regex_t *re;
-	chr *now;		/* scan pointer into string */
-	chr *stop;		/* end of string */
-	chr *savenow;		/* saved now and stop for "subroutine call" */
-	chr *savestop;
-	int err;		/* error code (0 if none) */
-	int cflags;		/* copy of compile flags */
-	int lasttype;		/* type of previous token */
-	int nexttype;		/* type of next token */
-	chr nextvalue;		/* value (if any) of next token */
-	int lexcon;		/* lexical context type (see lex.c) */
-	int nsubexp;		/* subexpression count */
-	struct subre **subs;	/* subRE pointer vector */
-	size_t nsubs;		/* length of vector */
-	struct subre *sub10[10];	/* initial vector, enough for most */
-	struct nfa *nfa;	/* the NFA */
-	struct colormap *cm;	/* character color map */
-	color nlcolor;		/* color of newline */
-	struct state *wordchrs;	/* state in nfa holding word-char outarcs */
-	struct subre *tree;	/* subexpression tree */
-	struct subre *treechain;	/* all tree nodes allocated */
-	struct subre *treefree;		/* any free tree nodes */
-	int ntree;		/* number of tree nodes */
-	struct cvec *cv;	/* interface cvec */
-	struct cvec *cv2;	/* utility cvec */
-	struct cvec *mcces;	/* collating-element information */
-#		define	ISCELEADER(v,c)	(v->mcces != NULL && haschr(v->mcces, (c)))
-	struct state *mccepbegin;	/* in nfa, start of MCCE prototypes */
-	struct state *mccepend;	/* in nfa, end of MCCE prototypes */
-	struct subre *lacons;	/* lookahead-constraint vector */
-	int nlacons;		/* size of lacons */
-};
-
-/* parsing macros; most know that `v' is the struct vars pointer */
-#define	NEXT()	(next(v))		/* advance by one token */
-#define	SEE(t)	(v->nexttype == (t))	/* is next token this? */
-#define	EAT(t)	(SEE(t) && next(v))	/* if next is this, swallow it */
-#define	VISERR(vv)	((vv)->err != 0)	/* have we seen an error yet? */
-#define	ISERR()	VISERR(v)
-#define	VERR(vv,e)	((vv)->nexttype = EOS, ((vv)->err) ? (vv)->err :\
-							((vv)->err = (e)))
-#define	ERR(e)	(void)VERR(v, e)		/* record an error */
-#define	NOERR()	{if (ISERR()) return;}	/* if error seen, return */
-#define	NOERRN()	{if (ISERR()) return NULL;}	/* NOERR with retval */
-#define	NOERRZ()	{if (ISERR()) return 0;}	/* NOERR with retval */
-#define	INSIST(c, e)	(void)((c) ? (void)0 : ERR(e))	/* if condition false, error */
-#define	NOTE(b)	(v->re->re_info |= (b))		/* note visible condition */
-#define	EMPTYARC(x, y)	newarc(v->nfa, EMPTY, 0, x, y)
-
-/* token type codes, some also used as NFA arc types */
-#define	EMPTY	'n'		/* no token present */
-#define	EOS	'e'		/* end of string */
-#define	PLAIN	'p'		/* ordinary character */
-#define	DIGIT	'd'		/* digit (in bound) */
-#define	BACKREF	'b'		/* back reference */
-#define	COLLEL	'I'		/* start of [. */
-#define	ECLASS	'E'		/* start of [= */
-#define	CCLASS	'C'		/* start of [: */
-#define	END	'X'		/* end of [. [= [: */
-#define	RANGE	'R'		/* - within [] which might be range delim. */
-#define	LACON	'L'		/* lookahead constraint subRE */
-#define	AHEAD	'a'		/* color-lookahead arc */
-#define	BEHIND	'r'		/* color-lookbehind arc */
-#define	WBDRY	'w'		/* word boundary constraint */
-#define	NWBDRY	'W'		/* non-word-boundary constraint */
-#define	SBEGIN	'A'		/* beginning of string (even if not BOL) */
-#define	SEND	'Z'		/* end of string (even if not EOL) */
-#define	PREFER	'P'		/* length preference */
-
-/* is an arc colored, and hence on a color chain? */
-#define	COLORED(a)	((a)->type == PLAIN || (a)->type == AHEAD || \
-							(a)->type == BEHIND)
-
-
-
-/* static function list */
-static struct fns functions = {
-	rfree,			/* regfree insides */
-};
-
-
-
-/*
- - compile - compile regular expression
- ^ int compile(regex_t *, CONST chr *, size_t, int);
- */
-int
-compile(re, string, len, flags)
-regex_t *re;
-CONST chr *string;
-size_t len;
-int flags;
-{
-	struct vars var;
-	struct vars *v = &var;
-	struct guts *g;
-	int i;
-	size_t j;
-	FILE *debug = (flags®_PROGRESS) ? stdout : (FILE *)NULL;
-#	define	CNOERR()	{ if (ISERR()) return freev(v, v->err); }
-
-	/* sanity checks */
-
-	if (re == NULL || string == NULL)
-		return REG_INVARG;
-	if ((flags®_QUOTE) &&
-			(flags&(REG_ADVANCED|REG_EXPANDED|REG_NEWLINE)))
-		return REG_INVARG;
-	if (!(flags®_EXTENDED) && (flags®_ADVF))
-		return REG_INVARG;
-
-	/* initial setup (after which freev() is callable) */
-	v->re = re;
-	v->now = (chr *)string;
-	v->stop = v->now + len;
-	v->savenow = v->savestop = NULL;
-	v->err = 0;
-	v->cflags = flags;
-	v->nsubexp = 0;
-	v->subs = v->sub10;
-	v->nsubs = 10;
-	for (j = 0; j < v->nsubs; j++)
-		v->subs[j] = NULL;
-	v->nfa = NULL;
-	v->cm = NULL;
-	v->nlcolor = COLORLESS;
-	v->wordchrs = NULL;
-	v->tree = NULL;
-	v->treechain = NULL;
-	v->treefree = NULL;
-	v->cv = NULL;
-	v->cv2 = NULL;
-	v->mcces = NULL;
-	v->lacons = NULL;
-	v->nlacons = 0;
-	re->re_magic = REMAGIC;
-	re->re_info = 0;		/* bits get set during parse */
-	re->re_csize = sizeof(chr);
-	re->re_guts = NULL;
-	re->re_fns = VS(&functions);
-
-	/* more complex setup, malloced things */
-	re->re_guts = VS(MALLOC(sizeof(struct guts)));
-	if (re->re_guts == NULL)
-		return freev(v, REG_ESPACE);
-	g = (struct guts *)re->re_guts;
-	g->tree = NULL;
-	initcm(v, &g->cmap);
-	v->cm = &g->cmap;
-	g->lacons = NULL;
-	g->nlacons = 0;
-	ZAPCNFA(g->search);
-	v->nfa = newnfa(v, v->cm, (struct nfa *)NULL);
-	CNOERR();
-	v->cv = newcvec(100, 20, 10);
-	if (v->cv == NULL)
-		return freev(v, REG_ESPACE);
-	i = nmcces(v);
-	if (i > 0) {
-		v->mcces = newcvec(nleaders(v), 0, i);
-		CNOERR();
-		v->mcces = allmcces(v, v->mcces);
-		leaders(v, v->mcces);
-		addmcce(v->mcces, (chr *)NULL, (chr *)NULL);	/* dummy */
-	}
-	CNOERR();
-
-	/* parsing */
-	lexstart(v);			/* also handles prefixes */
-	if ((v->cflags®_NLSTOP) || (v->cflags®_NLANCH)) {
-		/* assign newline a unique color */
-		v->nlcolor = subcolor(v->cm, newline());
-		okcolors(v->nfa, v->cm);
-	}
-	CNOERR();
-	v->tree = parse(v, EOS, PLAIN, v->nfa->init, v->nfa->final);
-	assert(SEE(EOS));		/* even if error; ISERR() => SEE(EOS) */
-	CNOERR();
-	assert(v->tree != NULL);
-
-	/* finish setup of nfa and its subre tree */
-	specialcolors(v->nfa);
-	CNOERR();
-	if (debug != NULL) {
-		fprintf(debug, "\n\n\n========= RAW ==========\n");
-		dumpnfa(v->nfa, debug);
-		dumpst(v->tree, debug, 1);
-	}
-	optst(v, v->tree);
-	v->ntree = numst(v->tree, 1);
-	markst(v->tree);
-	cleanst(v);
-	if (debug != NULL) {
-		fprintf(debug, "\n\n\n========= TREE FIXED ==========\n");
-		dumpst(v->tree, debug, 1);
-	}
-
-	/* build compacted NFAs for tree and lacons */
-	re->re_info |= nfatree(v, v->tree, debug);
-	CNOERR();
-	assert(v->nlacons == 0 || v->lacons != NULL);
-	for (i = 1; i < v->nlacons; i++) {
-		if (debug != NULL)
-			fprintf(debug, "\n\n\n========= LA%d ==========\n", i);
-		nfanode(v, &v->lacons[i], debug);
-	}
-	CNOERR();
-	if (v->tree->flags&SHORTER)
-		NOTE(REG_USHORTEST);
-
-	/* build compacted NFAs for tree, lacons, fast search */
-	if (debug != NULL)
-		fprintf(debug, "\n\n\n========= SEARCH ==========\n");
-	/* can sacrifice main NFA now, so use it as work area */
-	(DISCARD)optimize(v->nfa, debug);
-	CNOERR();
-	makesearch(v, v->nfa);
-	CNOERR();
-	compact(v->nfa, &g->search);
-	CNOERR();
-
-	/* looks okay, package it up */
-	re->re_nsub = v->nsubexp;
-	v->re = NULL;			/* freev no longer frees re */
-	g->magic = GUTSMAGIC;
-	g->cflags = v->cflags;
-	g->info = re->re_info;
-	g->nsub = re->re_nsub;
-	g->tree = v->tree;
-	v->tree = NULL;
-	g->ntree = v->ntree;
-	g->compare = (v->cflags®_ICASE) ? casecmp : cmp;
-	g->lacons = v->lacons;
-	v->lacons = NULL;
-	g->nlacons = v->nlacons;
-
-	if (flags®_DUMP)
-		dump(re, stdout);
-
-	assert(v->err == 0);
-	return freev(v, 0);
-}
-
-/*
- - moresubs - enlarge subRE vector
- ^ static VOID moresubs(struct vars *, int);
- */
-static VOID
-moresubs(v, wanted)
-struct vars *v;
-int wanted;			/* want enough room for this one */
-{
-	struct subre **p;
-	size_t n;
-
-	assert(wanted > 0 && (size_t)wanted >= v->nsubs);
-	n = (size_t)wanted * 3 / 2 + 1;
-	if (v->subs == v->sub10) {
-		p = (struct subre **)MALLOC(n * sizeof(struct subre *));
-		if (p != NULL)
-			memcpy(VS(p), VS(v->subs),
-					v->nsubs * sizeof(struct subre *));
-	} else
-		p = (struct subre **)REALLOC(v->subs, n*sizeof(struct subre *));
-	if (p == NULL) {
-		ERR(REG_ESPACE);
-		return;
-	}
-	v->subs = p;
-	for (p = &v->subs[v->nsubs]; v->nsubs < n; p++, v->nsubs++)
-		*p = NULL;
-	assert(v->nsubs == n);
-	assert((size_t)wanted < v->nsubs);
-}
-
-/*
- - freev - free vars struct's substructures where necessary
- * Optionally does error-number setting, and always returns error code
- * (if any), to make error-handling code terser.
- ^ static int freev(struct vars *, int);
- */
-static int
-freev(v, err)
-struct vars *v;
-int err;
-{
-	if (v->re != NULL)
-		rfree(v->re);
-	if (v->subs != v->sub10)
-		FREE(v->subs);
-	if (v->nfa != NULL)
-		freenfa(v->nfa);
-	if (v->tree != NULL)
-		freesubre(v, v->tree);
-	if (v->treechain != NULL)
-		cleanst(v);
-	if (v->cv != NULL)
-		freecvec(v->cv);
-	if (v->cv2 != NULL)
-		freecvec(v->cv2);
-	if (v->mcces != NULL)
-		freecvec(v->mcces);
-	if (v->lacons != NULL)
-		freelacons(v->lacons, v->nlacons);
-	ERR(err);			/* nop if err==0 */
-
-	return v->err;
-}
-
-/*
- - makesearch - turn an NFA into a search NFA (implicit prepend of .*?)
- * NFA must have been optimize()d already.
- ^ static VOID makesearch(struct vars *, struct nfa *);
- */
-static VOID
-makesearch(v, nfa)
-struct vars *v;
-struct nfa *nfa;
-{
-	struct arc *a;
-	struct arc *b;
-	struct state *pre = nfa->pre;
-	struct state *s;
-	struct state *s2;
-	struct state *slist;
-
-	/* no loops are needed if it's anchored */
-	for (a = pre->outs; a != NULL; a = a->outchain) {
-		assert(a->type == PLAIN);
-		if (a->co != nfa->bos[0] && a->co != nfa->bos[1])
-			break;
-	}
-	if (a != NULL) {
-		/* add implicit .* in front */
-		rainbow(nfa, v->cm, PLAIN, COLORLESS, pre, pre);
-
-		/* and ^* and \A* too -- not always necessary, but harmless */
-		newarc(nfa, PLAIN, nfa->bos[0], pre, pre);
-		newarc(nfa, PLAIN, nfa->bos[1], pre, pre);
-	}
-
-	/*
-	 * Now here's the subtle part.  Because many REs have no lookback
-	 * constraints, often knowing when you were in the pre state tells
-	 * you little; it's the next state(s) that are informative.  But
-	 * some of them may have other inarcs, i.e. it may be possible to
-	 * make actual progress and then return to one of them.  We must
-	 * de-optimize such cases, splitting each such state into progress
-	 * and no-progress states.
-	 */
-
-	/* first, make a list of the states */
-	slist = NULL;
-	for (a = pre->outs; a != NULL; a = a->outchain) {
-		s = a->to;
-		for (b = s->ins; b != NULL; b = b->inchain)
-			if (b->from != pre)
-				break;
-		if (b != NULL) {		/* must be split */
-			if (s->tmp == NULL) {  /* if not already in the list */
-			                       /* (fixes bugs 505048, 230589, */
-			                       /* 840258, 504785) */
-				s->tmp = slist;
-				slist = s;
-			}
-		}
-	}
-
-	/* do the splits */
-	for (s = slist; s != NULL; s = s2) {
-		s2 = newstate(nfa);
-		copyouts(nfa, s, s2);
-		for (a = s->ins; a != NULL; a = b) {
-			b = a->inchain;
-			if (a->from != pre) {
-				cparc(nfa, a, a->from, s2);
-				freearc(nfa, a);
-			}
-		}
-		s2 = s->tmp;
-		s->tmp = NULL;		/* clean up while we're at it */
-	}
-}
-
-/*
- - parse - parse an RE
- * This is actually just the top level, which parses a bunch of branches
- * tied together with '|'.  They appear in the tree as the left children
- * of a chain of '|' subres.
- ^ static struct subre *parse(struct vars *, int, int, struct state *,
- ^ 	struct state *);
- */
-static struct subre *
-parse(v, stopper, type, init, final)
-struct vars *v;
-int stopper;			/* EOS or ')' */
-int type;			/* LACON (lookahead subRE) or PLAIN */
-struct state *init;		/* initial state */
-struct state *final;		/* final state */
-{
-	struct state *left;	/* scaffolding for branch */
-	struct state *right;
-	struct subre *branches;	/* top level */
-	struct subre *branch;	/* current branch */
-	struct subre *t;	/* temporary */
-	int firstbranch;	/* is this the first branch? */
-
-	assert(stopper == ')' || stopper == EOS);
-
-	branches = subre(v, '|', LONGER, init, final);
-	NOERRN();
-	branch = branches;
-	firstbranch = 1;
-	do {	/* a branch */
-		if (!firstbranch) {
-			/* need a place to hang it */
-			branch->right = subre(v, '|', LONGER, init, final);
-			NOERRN();
-			branch = branch->right;
-		}
-		firstbranch = 0;
-		left = newstate(v->nfa);
-		right = newstate(v->nfa);
-		NOERRN();
-		EMPTYARC(init, left);
-		EMPTYARC(right, final);
-		NOERRN();
-		branch->left = parsebranch(v, stopper, type, left, right, 0);
-		NOERRN();
-		branch->flags |= UP(branch->flags | branch->left->flags);
-		if ((branch->flags &~ branches->flags) != 0)	/* new flags */
-			for (t = branches; t != branch; t = t->right)
-				t->flags |= branch->flags;
-	} while (EAT('|'));
-	assert(SEE(stopper) || SEE(EOS));
-
-	if (!SEE(stopper)) {
-		assert(stopper == ')' && SEE(EOS));
-		ERR(REG_EPAREN);
-	}
-
-	/* optimize out simple cases */
-	if (branch == branches) {	/* only one branch */
-		assert(branch->right == NULL);
-		t = branch->left;
-		branch->left = NULL;
-		freesubre(v, branches);
-		branches = t;
-	} else if (!MESSY(branches->flags)) {	/* no interesting innards */
-		freesubre(v, branches->left);
-		branches->left = NULL;
-		freesubre(v, branches->right);
-		branches->right = NULL;
-		branches->op = '=';
-	}
-
-	return branches;
-}
-
-/*
- - parsebranch - parse one branch of an RE
- * This mostly manages concatenation, working closely with parseqatom().
- * Concatenated things are bundled up as much as possible, with separate
- * ',' nodes introduced only when necessary due to substructure.
- ^ static struct subre *parsebranch(struct vars *, int, int, struct state *,
- ^ 	struct state *, int);
- */
-static struct subre *
-parsebranch(v, stopper, type, left, right, partial)
-struct vars *v;
-int stopper;			/* EOS or ')' */
-int type;			/* LACON (lookahead subRE) or PLAIN */
-struct state *left;		/* leftmost state */
-struct state *right;		/* rightmost state */
-int partial;			/* is this only part of a branch? */
-{
-	struct state *lp;	/* left end of current construct */
-	int seencontent;	/* is there anything in this branch yet? */
-	struct subre *t;
-
-	lp = left;
-	seencontent = 0;
-	t = subre(v, '=', 0, left, right);	/* op '=' is tentative */
-	NOERRN();
-	while (!SEE('|') && !SEE(stopper) && !SEE(EOS)) {
-		if (seencontent) {	/* implicit concat operator */
-			lp = newstate(v->nfa);
-			NOERRN();
-			moveins(v->nfa, right, lp);
-		}
-		seencontent = 1;
-
-		/* NB, recursion in parseqatom() may swallow rest of branch */
-		parseqatom(v, stopper, type, lp, right, t);
-	}
-
-	if (!seencontent) {		/* empty branch */
-		if (!partial)
-			NOTE(REG_UUNSPEC);
-		assert(lp == left);
-		EMPTYARC(left, right);
-	}
-
-	return t;
-}
-
-/*
- - parseqatom - parse one quantified atom or constraint of an RE
- * The bookkeeping near the end cooperates very closely with parsebranch();
- * in particular, it contains a recursion that can involve parsing the rest
- * of the branch, making this function's name somewhat inaccurate.
- ^ static VOID parseqatom(struct vars *, int, int, struct state *,
- ^ 	struct state *, struct subre *);
- */
-static VOID
-parseqatom(v, stopper, type, lp, rp, top)
-struct vars *v;
-int stopper;			/* EOS or ')' */
-int type;			/* LACON (lookahead subRE) or PLAIN */
-struct state *lp;		/* left state to hang it on */
-struct state *rp;		/* right state to hang it on */
-struct subre *top;		/* subtree top */
-{
-	struct state *s;	/* temporaries for new states */
-	struct state *s2;
-#	define	ARCV(t, val)	newarc(v->nfa, t, val, lp, rp)
-	int m, n;
-	struct subre *atom;	/* atom's subtree */
-	struct subre *t;
-	int cap;		/* capturing parens? */
-	int pos;		/* positive lookahead? */
-	int subno;		/* capturing-parens or backref number */
-	int atomtype;
-	int qprefer;		/* quantifier short/long preference */
-	int f;
-	struct subre **atomp;	/* where the pointer to atom is */
-
-	/* initial bookkeeping */
-	atom = NULL;
-	assert(lp->nouts == 0);	/* must string new code */
-	assert(rp->nins == 0);	/*  between lp and rp */
-	subno = 0;		/* just to shut lint up */
-
-	/* an atom or constraint... */
-	atomtype = v->nexttype;
-	switch (atomtype) {
-	/* first, constraints, which end by returning */
-	case '^':
-		ARCV('^', 1);
-		if (v->cflags®_NLANCH)
-			ARCV(BEHIND, v->nlcolor);
-		NEXT();
-		return;
-		break;
-	case '$':
-		ARCV('$', 1);
-		if (v->cflags®_NLANCH)
-			ARCV(AHEAD, v->nlcolor);
-		NEXT();
-		return;
-		break;
-	case SBEGIN:
-		ARCV('^', 1);	/* BOL */
-		ARCV('^', 0);	/* or BOS */
-		NEXT();
-		return;
-		break;
-	case SEND:
-		ARCV('$', 1);	/* EOL */
-		ARCV('$', 0);	/* or EOS */
-		NEXT();
-		return;
-		break;
-	case '<':
-		wordchrs(v);	/* does NEXT() */
-		s = newstate(v->nfa);
-		NOERR();
-		nonword(v, BEHIND, lp, s);
-		word(v, AHEAD, s, rp);
-		return;
-		break;
-	case '>':
-		wordchrs(v);	/* does NEXT() */
-		s = newstate(v->nfa);
-		NOERR();
-		word(v, BEHIND, lp, s);
-		nonword(v, AHEAD, s, rp);
-		return;
-		break;
-	case WBDRY:
-		wordchrs(v);	/* does NEXT() */
-		s = newstate(v->nfa);
-		NOERR();
-		nonword(v, BEHIND, lp, s);
-		word(v, AHEAD, s, rp);
-		s = newstate(v->nfa);
-		NOERR();
-		word(v, BEHIND, lp, s);
-		nonword(v, AHEAD, s, rp);
-		return;
-		break;
-	case NWBDRY:
-		wordchrs(v);	/* does NEXT() */
-		s = newstate(v->nfa);
-		NOERR();
-		word(v, BEHIND, lp, s);
-		word(v, AHEAD, s, rp);
-		s = newstate(v->nfa);
-		NOERR();
-		nonword(v, BEHIND, lp, s);
-		nonword(v, AHEAD, s, rp);
-		return;
-		break;
-	case LACON:	/* lookahead constraint */
-		pos = v->nextvalue;
-		NEXT();
-		s = newstate(v->nfa);
-		s2 = newstate(v->nfa);
-		NOERR();
-		t = parse(v, ')', LACON, s, s2);
-		freesubre(v, t);	/* internal structure irrelevant */
-		assert(SEE(')') || ISERR());
-		NEXT();
-		n = newlacon(v, s, s2, pos);
-		NOERR();
-		ARCV(LACON, n);
-		return;
-		break;
-	/* then errors, to get them out of the way */
-	case '*':
-	case '+':
-	case '?':
-	case '{':
-		ERR(REG_BADRPT);
-		return;
-		break;
-	default:
-		ERR(REG_ASSERT);
-		return;
-		break;
-	/* then plain characters, and minor variants on that theme */
-	case ')':		/* unbalanced paren */
-		if ((v->cflags®_ADVANCED) != REG_EXTENDED) {
-			ERR(REG_EPAREN);
-			return;
-		}
-		/* legal in EREs due to specification botch */
-		NOTE(REG_UPBOTCH);
-		/* fallthrough into case PLAIN */
-	case PLAIN:
-		onechr(v, v->nextvalue, lp, rp);
-		okcolors(v->nfa, v->cm);
-		NOERR();
-		NEXT();
-		break;
-	case '[':
-		if (v->nextvalue == 1)
-			bracket(v, lp, rp);
-		else
-			cbracket(v, lp, rp);
-		assert(SEE(']') || ISERR());
-		NEXT();
-		break;
-	case '.':
-		rainbow(v->nfa, v->cm, PLAIN,
-				(v->cflags®_NLSTOP) ? v->nlcolor : COLORLESS,
-				lp, rp);
-		NEXT();
-		break;
-	/* and finally the ugly stuff */
-	case '(':	/* value flags as capturing or non */
-		cap = (type == LACON) ? 0 : v->nextvalue;
-		if (cap) {
-			v->nsubexp++;
-			subno = v->nsubexp;
-			if ((size_t)subno >= v->nsubs)
-				moresubs(v, subno);
-			assert((size_t)subno < v->nsubs);
-		} else
-			atomtype = PLAIN;	/* something that's not '(' */
-		NEXT();
-		/* need new endpoints because tree will contain pointers */
-		s = newstate(v->nfa);
-		s2 = newstate(v->nfa);
-		NOERR();
-		EMPTYARC(lp, s);
-		EMPTYARC(s2, rp);
-		NOERR();
-		atom = parse(v, ')', PLAIN, s, s2);
-		assert(SEE(')') || ISERR());
-		NEXT();
-		NOERR();
-		if (cap) {
-			v->subs[subno] = atom;
-			t = subre(v, '(', atom->flags|CAP, lp, rp);
-			NOERR();
-			t->subno = subno;
-			t->left = atom;
-			atom = t;
-		}
-		/* postpone everything else pending possible {0} */
-		break;
-	case BACKREF:	/* the Feature From The Black Lagoon */
-		INSIST(type != LACON, REG_ESUBREG);
-		INSIST(v->nextvalue < v->nsubs, REG_ESUBREG);
-		INSIST(v->subs[(int)v->nextvalue] != NULL, REG_ESUBREG);
-		NOERR();
-		assert(v->nextvalue > 0);
-		atom = subre(v, 'b', BACKR, lp, rp);
-		subno = v->nextvalue;
-		atom->subno = subno;
-		EMPTYARC(lp, rp);	/* temporarily, so there's something */
-		NEXT();
-		break;
-	}
-
-	/* ...and an atom may be followed by a quantifier */
-	switch (v->nexttype) {
-	case '*':
-		m = 0;
-		n = INFINITY;
-		qprefer = (v->nextvalue) ? LONGER : SHORTER;
-		NEXT();
-		break;
-	case '+':
-		m = 1;
-		n = INFINITY;
-		qprefer = (v->nextvalue) ? LONGER : SHORTER;
-		NEXT();
-		break;
-	case '?':
-		m = 0;
-		n = 1;
-		qprefer = (v->nextvalue) ? LONGER : SHORTER;
-		NEXT();
-		break;
-	case '{':
-		NEXT();
-		m = scannum(v);
-		if (EAT(',')) {
-			if (SEE(DIGIT))
-				n = scannum(v);
-			else
-				n = INFINITY;
-			if (m > n) {
-				ERR(REG_BADBR);
-				return;
-			}
-			/* {m,n} exercises preference, even if it's {m,m} */
-			qprefer = (v->nextvalue) ? LONGER : SHORTER;
-		} else {
-			n = m;
-			/* {m} passes operand's preference through */
-			qprefer = 0;
-		}
-		if (!SEE('}')) {	/* catches errors too */
-			ERR(REG_BADBR);
-			return;
-		}
-		NEXT();
-		break;
-	default:		/* no quantifier */
-		m = n = 1;
-		qprefer = 0;
-		break;
-	}
-
-	/* annoying special case:  {0} or {0,0} cancels everything */
-	if (m == 0 && n == 0) {
-		if (atom != NULL)
-			freesubre(v, atom);
-		if (atomtype == '(')
-			v->subs[subno] = NULL;
-		delsub(v->nfa, lp, rp);
-		EMPTYARC(lp, rp);
-		return;
-	}
-
-	/* if not a messy case, avoid hard part */
-	assert(!MESSY(top->flags));
-	f = top->flags | qprefer | ((atom != NULL) ? atom->flags : 0);
-	if (atomtype != '(' && atomtype != BACKREF && !MESSY(UP(f))) {
-		if (!(m == 1 && n == 1))
-			repeat(v, lp, rp, m, n);
-		if (atom != NULL)
-			freesubre(v, atom);
-		top->flags = f;
-		return;
-	}
-
-	/*
-	 * hard part:  something messy
-	 * That is, capturing parens, back reference, short/long clash, or
-	 * an atom with substructure containing one of those.
-	 */
-
-	/* now we'll need a subre for the contents even if they're boring */
-	if (atom == NULL) {
-		atom = subre(v, '=', 0, lp, rp);
-		NOERR();
-	}
-
-	/*
-	 * prepare a general-purpose state skeleton
-	 *
-	 *    ---> [s] ---prefix---> [begin] ---atom---> [end] ----rest---> [rp]
-	 *   /                                            /
-	 * [lp] ----> [s2] ----bypass---------------------
-	 *
-	 * where bypass is an empty, and prefix is some repetitions of atom
-	 */
-	s = newstate(v->nfa);		/* first, new endpoints for the atom */
-	s2 = newstate(v->nfa);
-	NOERR();
-	moveouts(v->nfa, lp, s);
-	moveins(v->nfa, rp, s2);
-	NOERR();
-	atom->begin = s;
-	atom->end = s2;
-	s = newstate(v->nfa);		/* and spots for prefix and bypass */
-	s2 = newstate(v->nfa);
-	NOERR();
-	EMPTYARC(lp, s);
-	EMPTYARC(lp, s2);
-	NOERR();
-
-	/* break remaining subRE into x{...} and what follows */
-	t = subre(v, '.', COMBINE(qprefer, atom->flags), lp, rp);
-	t->left = atom;
-	atomp = &t->left;
-	/* here we should recurse... but we must postpone that to the end */
-
-	/* split top into prefix and remaining */
-	assert(top->op == '=' && top->left == NULL && top->right == NULL);
-	top->left = subre(v, '=', top->flags, top->begin, lp);
-	top->op = '.';
-	top->right = t;
-
-	/* if it's a backref, now is the time to replicate the subNFA */
-	if (atomtype == BACKREF) {
-		assert(atom->begin->nouts == 1);	/* just the EMPTY */
-		delsub(v->nfa, atom->begin, atom->end);
-		assert(v->subs[subno] != NULL);
-		/* and here's why the recursion got postponed:  it must */
-		/* wait until the skeleton is filled in, because it may */
-		/* hit a backref that wants to copy the filled-in skeleton */
-		dupnfa(v->nfa, v->subs[subno]->begin, v->subs[subno]->end,
-						atom->begin, atom->end);
-		NOERR();
-	}
-
-	/* it's quantifier time; first, turn x{0,...} into x{1,...}|empty */
-	if (m == 0) {
-		EMPTYARC(s2, atom->end);		/* the bypass */
-		assert(PREF(qprefer) != 0);
-		f = COMBINE(qprefer, atom->flags);
-		t = subre(v, '|', f, lp, atom->end);
-		NOERR();
-		t->left = atom;
-		t->right = subre(v, '|', PREF(f), s2, atom->end);
-		NOERR();
-		t->right->left = subre(v, '=', 0, s2, atom->end);
-		NOERR();
-		*atomp = t;
-		atomp = &t->left;
-		m = 1;
-	}
-
-	/* deal with the rest of the quantifier */
-	if (atomtype == BACKREF) {
-		/* special case:  backrefs have internal quantifiers */
-		EMPTYARC(s, atom->begin);	/* empty prefix */
-		/* just stuff everything into atom */
-		repeat(v, atom->begin, atom->end, m, n);
-		atom->min = (short)m;
-		atom->max = (short)n;
-		atom->flags |= COMBINE(qprefer, atom->flags);
-	} else if (m == 1 && n == 1) {
-		/* no/vacuous quantifier:  done */
-		EMPTYARC(s, atom->begin);	/* empty prefix */
-	} else {
-		/* turn x{m,n} into x{m-1,n-1}x, with capturing */
-		/*  parens in only second x */
-		dupnfa(v->nfa, atom->begin, atom->end, s, atom->begin);
-		assert(m >= 1 && m != INFINITY && n >= 1);
-		repeat(v, s, atom->begin, m-1, (n == INFINITY) ? n : n-1);
-		f = COMBINE(qprefer, atom->flags);
-		t = subre(v, '.', f, s, atom->end);	/* prefix and atom */
-		NOERR();
-		t->left = subre(v, '=', PREF(f), s, atom->begin);
-		NOERR();
-		t->right = atom;
-		*atomp = t;
-	}
-
-	/* and finally, look after that postponed recursion */
-	t = top->right;
-	if (!(SEE('|') || SEE(stopper) || SEE(EOS)))
-		t->right = parsebranch(v, stopper, type, atom->end, rp, 1);
-	else {
-		EMPTYARC(atom->end, rp);
-		t->right = subre(v, '=', 0, atom->end, rp);
-	}
-	assert(SEE('|') || SEE(stopper) || SEE(EOS));
-	t->flags |= COMBINE(t->flags, t->right->flags);
-	top->flags |= COMBINE(top->flags, t->flags);
-}
-
-/*
- - nonword - generate arcs for non-word-character ahead or behind
- ^ static VOID nonword(struct vars *, int, struct state *, struct state *);
- */
-static VOID
-nonword(v, dir, lp, rp)
-struct vars *v;
-int dir;			/* AHEAD or BEHIND */
-struct state *lp;
-struct state *rp;
-{
-	int anchor = (dir == AHEAD) ? '$' : '^';
-
-	assert(dir == AHEAD || dir == BEHIND);
-	newarc(v->nfa, anchor, 1, lp, rp);
-	newarc(v->nfa, anchor, 0, lp, rp);
-	colorcomplement(v->nfa, v->cm, dir, v->wordchrs, lp, rp);
-	/* (no need for special attention to \n) */
-}
-
-/*
- - word - generate arcs for word character ahead or behind
- ^ static VOID word(struct vars *, int, struct state *, struct state *);
- */
-static VOID
-word(v, dir, lp, rp)
-struct vars *v;
-int dir;			/* AHEAD or BEHIND */
-struct state *lp;
-struct state *rp;
-{
-	assert(dir == AHEAD || dir == BEHIND);
-	cloneouts(v->nfa, v->wordchrs, lp, rp, dir);
-	/* (no need for special attention to \n) */
-}
-
-/*
- - scannum - scan a number
- ^ static int scannum(struct vars *);
- */
-static int			/* value, <= DUPMAX */
-scannum(v)
-struct vars *v;
-{
-	int n = 0;
-
-	while (SEE(DIGIT) && n < DUPMAX) {
-		n = n*10 + v->nextvalue;
-		NEXT();
-	}
-	if (SEE(DIGIT) || n > DUPMAX) {
-		ERR(REG_BADBR);
-		return 0;
-	}
-	return n;
-}
-
-/*
- - repeat - replicate subNFA for quantifiers
- * The duplication sequences used here are chosen carefully so that any
- * pointers starting out pointing into the subexpression end up pointing into
- * the last occurrence.  (Note that it may not be strung between the same
- * left and right end states, however!)  This used to be important for the
- * subRE tree, although the important bits are now handled by the in-line
- * code in parse(), and when this is called, it doesn't matter any more.
- ^ static VOID repeat(struct vars *, struct state *, struct state *, int, int);
- */
-static VOID
-repeat(v, lp, rp, m, n)
-struct vars *v;
-struct state *lp;
-struct state *rp;
-int m;
-int n;
-{
-#	define	SOME	2
-#	define	INF	3
-#	define	PAIR(x, y)	((x)*4 + (y))
-#	define	REDUCE(x)	( ((x) == INFINITY) ? INF : (((x) > 1) ? SOME : (x)) )
-	CONST int rm = REDUCE(m);
-	CONST int rn = REDUCE(n);
-	struct state *s;
-	struct state *s2;
-
-	switch (PAIR(rm, rn)) {
-	case PAIR(0, 0):		/* empty string */
-		delsub(v->nfa, lp, rp);
-		EMPTYARC(lp, rp);
-		break;
-	case PAIR(0, 1):		/* do as x| */
-		EMPTYARC(lp, rp);
-		break;
-	case PAIR(0, SOME):		/* do as x{1,n}| */
-		repeat(v, lp, rp, 1, n);
-		NOERR();
-		EMPTYARC(lp, rp);
-		break;
-	case PAIR(0, INF):		/* loop x around */
-		s = newstate(v->nfa);
-		NOERR();
-		moveouts(v->nfa, lp, s);
-		moveins(v->nfa, rp, s);
-		EMPTYARC(lp, s);
-		EMPTYARC(s, rp);
-		break;
-	case PAIR(1, 1):		/* no action required */
-		break;
-	case PAIR(1, SOME):		/* do as x{0,n-1}x = (x{1,n-1}|)x */
-		s = newstate(v->nfa);
-		NOERR();
-		moveouts(v->nfa, lp, s);
-		dupnfa(v->nfa, s, rp, lp, s);
-		NOERR();
-		repeat(v, lp, s, 1, n-1);
-		NOERR();
-		EMPTYARC(lp, s);
-		break;
-	case PAIR(1, INF):		/* add loopback arc */
-		s = newstate(v->nfa);
-		s2 = newstate(v->nfa);
-		NOERR();
-		moveouts(v->nfa, lp, s);
-		moveins(v->nfa, rp, s2);
-		EMPTYARC(lp, s);
-		EMPTYARC(s2, rp);
-		EMPTYARC(s2, s);
-		break;
-	case PAIR(SOME, SOME):		/* do as x{m-1,n-1}x */
-		s = newstate(v->nfa);
-		NOERR();
-		moveouts(v->nfa, lp, s);
-		dupnfa(v->nfa, s, rp, lp, s);
-		NOERR();
-		repeat(v, lp, s, m-1, n-1);
-		break;
-	case PAIR(SOME, INF):		/* do as x{m-1,}x */
-		s = newstate(v->nfa);
-		NOERR();
-		moveouts(v->nfa, lp, s);
-		dupnfa(v->nfa, s, rp, lp, s);
-		NOERR();
-		repeat(v, lp, s, m-1, n);
-		break;
-	default:
-		ERR(REG_ASSERT);
-		break;
-	}
-}
-
-/*
- - bracket - handle non-complemented bracket expression
- * Also called from cbracket for complemented bracket expressions.
- ^ static VOID bracket(struct vars *, struct state *, struct state *);
- */
-static VOID
-bracket(v, lp, rp)
-struct vars *v;
-struct state *lp;
-struct state *rp;
-{
-	assert(SEE('['));
-	NEXT();
-	while (!SEE(']') && !SEE(EOS))
-		brackpart(v, lp, rp);
-	assert(SEE(']') || ISERR());
-	okcolors(v->nfa, v->cm);
-}
-
-/*
- - cbracket - handle complemented bracket expression
- * We do it by calling bracket() with dummy endpoints, and then complementing
- * the result.  The alternative would be to invoke rainbow(), and then delete
- * arcs as the b.e. is seen... but that gets messy.
- ^ static VOID cbracket(struct vars *, struct state *, struct state *);
- */
-static VOID
-cbracket(v, lp, rp)
-struct vars *v;
-struct state *lp;
-struct state *rp;
-{
-	struct state *left = newstate(v->nfa);
-	struct state *right = newstate(v->nfa);
-	struct state *s;
-	struct arc *a;			/* arc from lp */
-	struct arc *ba;			/* arc from left, from bracket() */
-	struct arc *pa;			/* MCCE-prototype arc */
-	color co;
-	chr *p;
-	int i;
-
-	NOERR();
-	bracket(v, left, right);
-	if (v->cflags®_NLSTOP)
-		newarc(v->nfa, PLAIN, v->nlcolor, left, right);
-	NOERR();
-
-	assert(lp->nouts == 0);		/* all outarcs will be ours */
-
-	/* easy part of complementing */
-	colorcomplement(v->nfa, v->cm, PLAIN, left, lp, rp);
-	NOERR();
-	if (v->mcces == NULL) {		/* no MCCEs -- we're done */
-		dropstate(v->nfa, left);
-		assert(right->nins == 0);
-		freestate(v->nfa, right);
-		return;
-	}
-
-	/* but complementing gets messy in the presence of MCCEs... */
-	NOTE(REG_ULOCALE);
-	for (p = v->mcces->chrs, i = v->mcces->nchrs; i > 0; p++, i--) {
-		co = GETCOLOR(v->cm, *p);
-		a = findarc(lp, PLAIN, co);
-		ba = findarc(left, PLAIN, co);
-		if (ba == NULL) {
-			assert(a != NULL);
-			freearc(v->nfa, a);
-		} else {
-			assert(a == NULL);
-		}
-		s = newstate(v->nfa);
-		NOERR();
-		newarc(v->nfa, PLAIN, co, lp, s);
-		NOERR();
-		pa = findarc(v->mccepbegin, PLAIN, co);
-		assert(pa != NULL);
-		if (ba == NULL) {	/* easy case, need all of them */
-			cloneouts(v->nfa, pa->to, s, rp, PLAIN);
-			newarc(v->nfa, '$', 1, s, rp);
-			newarc(v->nfa, '$', 0, s, rp);
-			colorcomplement(v->nfa, v->cm, AHEAD, pa->to, s, rp);
-		} else {		/* must be selective */
-			if (findarc(ba->to, '$', 1) == NULL) {
-				newarc(v->nfa, '$', 1, s, rp);
-				newarc(v->nfa, '$', 0, s, rp);
-				colorcomplement(v->nfa, v->cm, AHEAD, pa->to,
-									 s, rp);
-			}
-			for (pa = pa->to->outs; pa != NULL; pa = pa->outchain)
-				if (findarc(ba->to, PLAIN, pa->co) == NULL)
-					newarc(v->nfa, PLAIN, pa->co, s, rp);
-			if (s->nouts == 0)	/* limit of selectivity: none */
-				dropstate(v->nfa, s);	/* frees arc too */
-		}
-		NOERR();
-	}
-
-	delsub(v->nfa, left, right);
-	assert(left->nouts == 0);
-	freestate(v->nfa, left);
-	assert(right->nins == 0);
-	freestate(v->nfa, right);
-}
-			
-/*
- - brackpart - handle one item (or range) within a bracket expression
- ^ static VOID brackpart(struct vars *, struct state *, struct state *);
- */
-static VOID
-brackpart(v, lp, rp)
-struct vars *v;
-struct state *lp;
-struct state *rp;
-{
-	celt startc;
-	celt endc;
-	struct cvec *cv;
-	chr *startp;
-	chr *endp;
-	chr c[1];
-
-	/* parse something, get rid of special cases, take shortcuts */
-	switch (v->nexttype) {
-	case RANGE:			/* a-b-c or other botch */
-		ERR(REG_ERANGE);
-		return;
-		break;
-	case PLAIN:
-		c[0] = v->nextvalue;
-		NEXT();
-		/* shortcut for ordinary chr (not range, not MCCE leader) */
-		if (!SEE(RANGE) && !ISCELEADER(v, c[0])) {
-			onechr(v, c[0], lp, rp);
-			return;
-		}
-		startc = element(v, c, c+1);
-		NOERR();
-		break;
-	case COLLEL:
-		startp = v->now;
-		endp = scanplain(v);
-		INSIST(startp < endp, REG_ECOLLATE);
-		NOERR();
-		startc = element(v, startp, endp);
-		NOERR();
-		break;
-	case ECLASS:
-		startp = v->now;
-		endp = scanplain(v);
-		INSIST(startp < endp, REG_ECOLLATE);
-		NOERR();
-		startc = element(v, startp, endp);
-		NOERR();
-		cv = eclass(v, startc, (v->cflags®_ICASE));
-		NOERR();
-		dovec(v, cv, lp, rp);
-		return;
-		break;
-	case CCLASS:
-		startp = v->now;
-		endp = scanplain(v);
-		INSIST(startp < endp, REG_ECTYPE);
-		NOERR();
-		cv = cclass(v, startp, endp, (v->cflags®_ICASE));
-		NOERR();
-		dovec(v, cv, lp, rp);
-		return;
-		break;
-	default:
-		ERR(REG_ASSERT);
-		return;
-		break;
-	}
-
-	if (SEE(RANGE)) {
-		NEXT();
-		switch (v->nexttype) {
-		case PLAIN:
-		case RANGE:
-			c[0] = v->nextvalue;
-			NEXT();
-			endc = element(v, c, c+1);
-			NOERR();
-			break;
-		case COLLEL:
-			startp = v->now;
-			endp = scanplain(v);
-			INSIST(startp < endp, REG_ECOLLATE);
-			NOERR();
-			endc = element(v, startp, endp);
-			NOERR();
-			break;
-		default:
-			ERR(REG_ERANGE);
-			return;
-			break;
-		}
-	} else
-		endc = startc;
-
-	/*
-	 * Ranges are unportable.  Actually, standard C does
-	 * guarantee that digits are contiguous, but making
-	 * that an exception is just too complicated.
-	 */
-	if (startc != endc)
-		NOTE(REG_UUNPORT);
-	cv = range(v, startc, endc, (v->cflags®_ICASE));
-	NOERR();
-	dovec(v, cv, lp, rp);
-}
-
-/*
- - scanplain - scan PLAIN contents of [. etc.
- * Certain bits of trickery in lex.c know that this code does not try
- * to look past the final bracket of the [. etc.
- ^ static chr *scanplain(struct vars *);
- */
-static chr *			/* just after end of sequence */
-scanplain(v)
-struct vars *v;
-{
-	chr *endp;
-
-	assert(SEE(COLLEL) || SEE(ECLASS) || SEE(CCLASS));
-	NEXT();
-
-	endp = v->now;
-	while (SEE(PLAIN)) {
-		endp = v->now;
-		NEXT();
-	}
-
-	assert(SEE(END) || ISERR());
-	NEXT();
-
-	return endp;
-}
-
-/*
- - leaders - process a cvec of collating elements to also include leaders
- * Also gives all characters involved their own colors, which is almost
- * certainly necessary, and sets up little disconnected subNFA.
- ^ static VOID leaders(struct vars *, struct cvec *);
- */
-static VOID
-leaders(v, cv)
-struct vars *v;
-struct cvec *cv;
-{
-	int mcce;
-	chr *p;
-	chr leader;
-	struct state *s;
-	struct arc *a;
-
-	v->mccepbegin = newstate(v->nfa);
-	v->mccepend = newstate(v->nfa);
-	NOERR();
-
-	for (mcce = 0; mcce < cv->nmcces; mcce++) {
-		p = cv->mcces[mcce];
-		leader = *p;
-		if (!haschr(cv, leader)) {
-			addchr(cv, leader);
-			s = newstate(v->nfa);
-			newarc(v->nfa, PLAIN, subcolor(v->cm, leader),
-							v->mccepbegin, s);
-			okcolors(v->nfa, v->cm);
-		} else {
-			a = findarc(v->mccepbegin, PLAIN,
-						GETCOLOR(v->cm, leader));
-			assert(a != NULL);
-			s = a->to;
-			assert(s != v->mccepend);
-		}
-		p++;
-		assert(*p != 0 && *(p+1) == 0);	/* only 2-char MCCEs for now */
-		newarc(v->nfa, PLAIN, subcolor(v->cm, *p), s, v->mccepend);
-		okcolors(v->nfa, v->cm);
-	}
-}
-
-/*
- - onechr - fill in arcs for a plain character, and possible case complements
- * This is mostly a shortcut for efficient handling of the common case.
- ^ static VOID onechr(struct vars *, pchr, struct state *, struct state *);
- */
-static VOID
-onechr(v, c, lp, rp)
-struct vars *v;
-pchr c;
-struct state *lp;
-struct state *rp;
-{
-	if (!(v->cflags®_ICASE)) {
-		newarc(v->nfa, PLAIN, subcolor(v->cm, c), lp, rp);
-		return;
-	}
-
-	/* rats, need general case anyway... */
-	dovec(v, allcases(v, c), lp, rp);
-}
-
-/*
- - dovec - fill in arcs for each element of a cvec
- * This one has to handle the messy cases, like MCCEs and MCCE leaders.
- ^ static VOID dovec(struct vars *, struct cvec *, struct state *,
- ^ 	struct state *);
- */
-static VOID
-dovec(v, cv, lp, rp)
-struct vars *v;
-struct cvec *cv;
-struct state *lp;
-struct state *rp;
-{
-	chr ch, from, to;
-	celt ce;
-	chr *p;
-	int i;
-	color co;
-	struct cvec *leads;
-	struct arc *a;
-	struct arc *pa;		/* arc in prototype */
-	struct state *s;
-	struct state *ps;	/* state in prototype */
-
-	/* need a place to store leaders, if any */
-	if (nmcces(v) > 0) {
-		assert(v->mcces != NULL);
-		if (v->cv2 == NULL || v->cv2->nchrs < v->mcces->nchrs) {
-			if (v->cv2 != NULL)
-				free(v->cv2);
-			v->cv2 = newcvec(v->mcces->nchrs, 0, v->mcces->nmcces);
-			NOERR();
-			leads = v->cv2;
-		} else
-			leads = clearcvec(v->cv2);
-	} else
-		leads = NULL;
-
-	/* first, get the ordinary characters out of the way */
-	for (p = cv->chrs, i = cv->nchrs; i > 0; p++, i--) {
-		ch = *p;
-		if (!ISCELEADER(v, ch))
-			newarc(v->nfa, PLAIN, subcolor(v->cm, ch), lp, rp);
-		else {
-			assert(singleton(v->cm, ch));
-			assert(leads != NULL);
-			if (!haschr(leads, ch))
-				addchr(leads, ch);
-		}
-	}
-
-	/* and the ranges */
-	for (p = cv->ranges, i = cv->nranges; i > 0; p += 2, i--) {
-		from = *p;
-		to = *(p+1);
-		while (from <= to && (ce = nextleader(v, from, to)) != NOCELT) {
-			if (from < ce)
-				subrange(v, from, ce - 1, lp, rp);
-			assert(singleton(v->cm, ce));
-			assert(leads != NULL);
-			if (!haschr(leads, ce))
-				addchr(leads, ce);
-			from = ce + 1;
-		}
-		if (from <= to)
-			subrange(v, from, to, lp, rp);
-	}
-
-	if ((leads == NULL || leads->nchrs == 0) && cv->nmcces == 0)
-		return;
-
-	/* deal with the MCCE leaders */
-	NOTE(REG_ULOCALE);
-	for (p = leads->chrs, i = leads->nchrs; i > 0; p++, i--) {
-		co = GETCOLOR(v->cm, *p);
-		a = findarc(lp, PLAIN, co);
-		if (a != NULL)
-			s = a->to;
-		else {
-			s = newstate(v->nfa);
-			NOERR();
-			newarc(v->nfa, PLAIN, co, lp, s);
-			NOERR();
-		}
-		pa = findarc(v->mccepbegin, PLAIN, co);
-		assert(pa != NULL);
-		ps = pa->to;
-		newarc(v->nfa, '$', 1, s, rp);
-		newarc(v->nfa, '$', 0, s, rp);
-		colorcomplement(v->nfa, v->cm, AHEAD, ps, s, rp);
-		NOERR();
-	}
-
-	/* and the MCCEs */
-	for (i = 0; i < cv->nmcces; i++) {
-		p = cv->mcces[i];
-		assert(singleton(v->cm, *p));
-		if (!singleton(v->cm, *p)) {
-			ERR(REG_ASSERT);
-			return;
-		}
-		ch = *p++;
-		co = GETCOLOR(v->cm, ch);
-		a = findarc(lp, PLAIN, co);
-		if (a != NULL)
-			s = a->to;
-		else {
-			s = newstate(v->nfa);
-			NOERR();
-			newarc(v->nfa, PLAIN, co, lp, s);
-			NOERR();
-		}
-		assert(*p != 0);	/* at least two chars */
-		assert(singleton(v->cm, *p));
-		ch = *p++;
-		co = GETCOLOR(v->cm, ch);
-		assert(*p == 0);	/* and only two, for now */
-		newarc(v->nfa, PLAIN, co, s, rp);
-		NOERR();
-	}
-}
-
-/*
- - nextleader - find next MCCE leader within range
- ^ static celt nextleader(struct vars *, pchr, pchr);
- */
-static celt			/* NOCELT means none */
-nextleader(v, from, to)
-struct vars *v;
-pchr from;
-pchr to;
-{
-	int i;
-	chr *p;
-	chr ch;
-	celt it = NOCELT;
-
-	if (v->mcces == NULL)
-		return it;
-
-	for (i = v->mcces->nchrs, p = v->mcces->chrs; i > 0; i--, p++) {
-		ch = *p;
-		if (from <= ch && ch <= to)
-			if (it == NOCELT || ch < it)
-				it = ch;
-	}
-	return it;
-}
-
-/*
- - wordchrs - set up word-chr list for word-boundary stuff, if needed
- * The list is kept as a bunch of arcs between two dummy states; it's
- * disposed of by the unreachable-states sweep in NFA optimization.
- * Does NEXT().  Must not be called from any unusual lexical context.
- * This should be reconciled with the \w etc. handling in lex.c, and
- * should be cleaned up to reduce dependencies on input scanning.
- ^ static VOID wordchrs(struct vars *);
- */
-static VOID
-wordchrs(v)
-struct vars *v;
-{
-	struct state *left;
-	struct state *right;
-
-	if (v->wordchrs != NULL) {
-		NEXT();		/* for consistency */
-		return;
-	}
-
-	left = newstate(v->nfa);
-	right = newstate(v->nfa);
-	NOERR();
-	/* fine point:  implemented with [::], and lexer will set REG_ULOCALE */
-	lexword(v);
-	NEXT();
-	assert(v->savenow != NULL && SEE('['));
-	bracket(v, left, right);
-	assert((v->savenow != NULL && SEE(']')) || ISERR());
-	NEXT();
-	NOERR();
-	v->wordchrs = left;
-}
-
-/*
- - subre - allocate a subre
- ^ static struct subre *subre(struct vars *, int, int, struct state *,
- ^	struct state *);
- */
-static struct subre *
-subre(v, op, flags, begin, end)
-struct vars *v;
-int op;
-int flags;
-struct state *begin;
-struct state *end;
-{
-	struct subre *ret;
-
-	ret = v->treefree;
-	if (ret != NULL)
-		v->treefree = ret->left;
-	else {
-		ret = (struct subre *)MALLOC(sizeof(struct subre));
-		if (ret == NULL) {
-			ERR(REG_ESPACE);
-			return NULL;
-		}
-		ret->chain = v->treechain;
-		v->treechain = ret;
-	}
-
-	assert(strchr("|.b(=", op) != NULL);
-
-	ret->op = op;
-	ret->flags = flags;
-	ret->retry = 0;
-	ret->subno = 0;
-	ret->min = ret->max = 1;
-	ret->left = NULL;
-	ret->right = NULL;
-	ret->begin = begin;
-	ret->end = end;
-	ZAPCNFA(ret->cnfa);
-
-	return ret;
-}
-
-/*
- - freesubre - free a subRE subtree
- ^ static VOID freesubre(struct vars *, struct subre *);
- */
-static VOID
-freesubre(v, sr)
-struct vars *v;			/* might be NULL */
-struct subre *sr;
-{
-	if (sr == NULL)
-		return;
-
-	if (sr->left != NULL)
-		freesubre(v, sr->left);
-	if (sr->right != NULL)
-		freesubre(v, sr->right);
-
-	freesrnode(v, sr);
-}
-
-/*
- - freesrnode - free one node in a subRE subtree
- ^ static VOID freesrnode(struct vars *, struct subre *);
- */
-static VOID
-freesrnode(v, sr)
-struct vars *v;			/* might be NULL */
-struct subre *sr;
-{
-	if (sr == NULL)
-		return;
-
-	if (!NULLCNFA(sr->cnfa))
-		freecnfa(&sr->cnfa);
-	sr->flags = 0;
-
-	if (v != NULL) {
-		sr->left = v->treefree;
-		v->treefree = sr;
-	} else
-		FREE(sr);
-}
-
-/*
- - optst - optimize a subRE subtree
- ^ static VOID optst(struct vars *, struct subre *);
- */
-static VOID
-optst(v, t)
-struct vars *v;
-struct subre *t;
-{
-	if (t == NULL)
-		return;
-
-	/* recurse through children */
-	if (t->left != NULL)
-		optst(v, t->left);
-	if (t->right != NULL)
-		optst(v, t->right);
-}
-
-/*
- - numst - number tree nodes (assigning retry indexes)
- ^ static int numst(struct subre *, int);
- */
-static int			/* next number */
-numst(t, start)
-struct subre *t;
-int start;			/* starting point for subtree numbers */
-{
-	int i;
-
-	assert(t != NULL);
-
-	i = start;
-	t->retry = (short)i++;
-	if (t->left != NULL)
-		i = numst(t->left, i);
-	if (t->right != NULL)
-		i = numst(t->right, i);
-	return i;
-}
-
-/*
- - markst - mark tree nodes as INUSE
- ^ static VOID markst(struct subre *);
- */
-static VOID
-markst(t)
-struct subre *t;
-{
-	assert(t != NULL);
-
-	t->flags |= INUSE;
-	if (t->left != NULL)
-		markst(t->left);
-	if (t->right != NULL)
-		markst(t->right);
-}
-
-/*
- - cleanst - free any tree nodes not marked INUSE
- ^ static VOID cleanst(struct vars *);
- */
-static VOID
-cleanst(v)
-struct vars *v;
-{
-	struct subre *t;
-	struct subre *next;
-
-	for (t = v->treechain; t != NULL; t = next) {
-		next = t->chain;
-		if (!(t->flags&INUSE))
-			FREE(t);
-	}
-	v->treechain = NULL;
-	v->treefree = NULL;		/* just on general principles */
-}
-
-/*
- - nfatree - turn a subRE subtree into a tree of compacted NFAs
- ^ static long nfatree(struct vars *, struct subre *, FILE *);
- */
-static long			/* optimize results from top node */
-nfatree(v, t, f)
-struct vars *v;
-struct subre *t;
-FILE *f;			/* for debug output */
-{
-	assert(t != NULL && t->begin != NULL);
-
-	if (t->left != NULL)
-		(DISCARD)nfatree(v, t->left, f);
-	if (t->right != NULL)
-		(DISCARD)nfatree(v, t->right, f);
-
-	return nfanode(v, t, f);
-}
-
-/*
- - nfanode - do one NFA for nfatree
- ^ static long nfanode(struct vars *, struct subre *, FILE *);
- */
-static long			/* optimize results */
-nfanode(v, t, f)
-struct vars *v;
-struct subre *t;
-FILE *f;			/* for debug output */
-{
-	struct nfa *nfa;
-	long ret = 0;
-	char idbuf[50];
-
-	assert(t->begin != NULL);
-
-	if (f != NULL)
-		fprintf(f, "\n\n\n========= TREE NODE %s ==========\n",
-						stid(t, idbuf, sizeof(idbuf)));
-	nfa = newnfa(v, v->cm, v->nfa);
-	NOERRZ();
-	dupnfa(nfa, t->begin, t->end, nfa->init, nfa->final);
-	if (!ISERR()) {
-		specialcolors(nfa);
-		ret = optimize(nfa, f);
-	}
-	if (!ISERR())
-		compact(nfa, &t->cnfa);
-
-	freenfa(nfa);
-	return ret;
-}
-
-/*
- - newlacon - allocate a lookahead-constraint subRE
- ^ static int newlacon(struct vars *, struct state *, struct state *, int);
- */
-static int			/* lacon number */
-newlacon(v, begin, end, pos)
-struct vars *v;
-struct state *begin;
-struct state *end;
-int pos;
-{
-	int n;
-	struct subre *sub;
-
-	if (v->nlacons == 0) {
-		v->lacons = (struct subre *)MALLOC(2 * sizeof(struct subre));
-		n = 1;		/* skip 0th */
-		v->nlacons = 2;
-	} else {
-		v->lacons = (struct subre *)REALLOC(v->lacons,
-					(v->nlacons+1)*sizeof(struct subre));
-		n = v->nlacons++;
-	}
-	if (v->lacons == NULL) {
-		ERR(REG_ESPACE);
-		return 0;
-	}
-	sub = &v->lacons[n];
-	sub->begin = begin;
-	sub->end = end;
-	sub->subno = pos;
-	ZAPCNFA(sub->cnfa);
-	return n;
-}
-
-/*
- - freelacons - free lookahead-constraint subRE vector
- ^ static VOID freelacons(struct subre *, int);
- */
-static VOID
-freelacons(subs, n)
-struct subre *subs;
-int n;
-{
-	struct subre *sub;
-	int i;
-
-	assert(n > 0);
-	for (sub = subs + 1, i = n - 1; i > 0; sub++, i--)	/* no 0th */
-		if (!NULLCNFA(sub->cnfa))
-			freecnfa(&sub->cnfa);
-	FREE(subs);
-}
-
-/*
- - rfree - free a whole RE (insides of regfree)
- ^ static VOID rfree(regex_t *);
- */
-static VOID
-rfree(re)
-regex_t *re;
-{
-	struct guts *g;
-
-	if (re == NULL || re->re_magic != REMAGIC)
-		return;
-
-	re->re_magic = 0;	/* invalidate RE */
-	g = (struct guts *)re->re_guts;
-	re->re_guts = NULL;
-	re->re_fns = NULL;
-	g->magic = 0;
-	freecm(&g->cmap);
-	if (g->tree != NULL)
-		freesubre((struct vars *)NULL, g->tree);
-	if (g->lacons != NULL)
-		freelacons(g->lacons, g->nlacons);
-	if (!NULLCNFA(g->search))
-		freecnfa(&g->search);
-	FREE(g);
-}
-
-/*
- - dump - dump an RE in human-readable form
- ^ static VOID dump(regex_t *, FILE *);
- */
-static VOID
-dump(re, f)
-regex_t *re;
-FILE *f;
-{
-#ifdef REG_DEBUG
-	struct guts *g;
-	int i;
-
-	if (re->re_magic != REMAGIC)
-		fprintf(f, "bad magic number (0x%x not 0x%x)\n", re->re_magic,
-								REMAGIC);
-	if (re->re_guts == NULL) {
-		fprintf(f, "NULL guts!!!\n");
-		return;
-	}
-	g = (struct guts *)re->re_guts;
-	if (g->magic != GUTSMAGIC)
-		fprintf(f, "bad guts magic number (0x%x not 0x%x)\n", g->magic,
-								GUTSMAGIC);
-
-	fprintf(f, "\n\n\n========= DUMP ==========\n");
-	fprintf(f, "nsub %d, info 0%lo, csize %d, ntree %d\n", 
-		re->re_nsub, re->re_info, re->re_csize, g->ntree);
-
-	dumpcolors(&g->cmap, f);
-	if (!NULLCNFA(g->search)) {
-		printf("\nsearch:\n");
-		dumpcnfa(&g->search, f);
-	}
-	for (i = 1; i < g->nlacons; i++) {
-		fprintf(f, "\nla%d (%s):\n", i,
-				(g->lacons[i].subno) ? "positive" : "negative");
-		dumpcnfa(&g->lacons[i].cnfa, f);
-	}
-	fprintf(f, "\n");
-	dumpst(g->tree, f, 0);
-#endif
-}
-
-/*
- - dumpst - dump a subRE tree
- ^ static VOID dumpst(struct subre *, FILE *, int);
- */
-static VOID
-dumpst(t, f, nfapresent)
-struct subre *t;
-FILE *f;
-int nfapresent;			/* is the original NFA still around? */
-{
-	if (t == NULL)
-		fprintf(f, "null tree\n");
-	else
-		stdump(t, f, nfapresent);
-	fflush(f);
-}
-
-/*
- - stdump - recursive guts of dumpst
- ^ static VOID stdump(struct subre *, FILE *, int);
- */
-static VOID
-stdump(t, f, nfapresent)
-struct subre *t;
-FILE *f;
-int nfapresent;			/* is the original NFA still around? */
-{
-	char idbuf[50];
-
-	fprintf(f, "%s. `%c'", stid(t, idbuf, sizeof(idbuf)), t->op);
-	if (t->flags&LONGER)
-		fprintf(f, " longest");
-	if (t->flags&SHORTER)
-		fprintf(f, " shortest");
-	if (t->flags&MIXED)
-		fprintf(f, " hasmixed");
-	if (t->flags&CAP)
-		fprintf(f, " hascapture");
-	if (t->flags&BACKR)
-		fprintf(f, " hasbackref");
-	if (!(t->flags&INUSE))
-		fprintf(f, " UNUSED");
-	if (t->subno != 0)
-		fprintf(f, " (#%d)", t->subno);
-	if (t->min != 1 || t->max != 1) {
-		fprintf(f, " {%d,", t->min);
-		if (t->max != INFINITY)
-			fprintf(f, "%d", t->max);
-		fprintf(f, "}");
-	}
-	if (nfapresent)
-		fprintf(f, " %ld-%ld", (long)t->begin->no, (long)t->end->no);
-	if (t->left != NULL)
-		fprintf(f, " L:%s", stid(t->left, idbuf, sizeof(idbuf)));
-	if (t->right != NULL)
-		fprintf(f, " R:%s", stid(t->right, idbuf, sizeof(idbuf)));
-	if (!NULLCNFA(t->cnfa)) {
-		fprintf(f, "\n");
-		dumpcnfa(&t->cnfa, f);
-		fprintf(f, "\n");
-	}
-	if (t->left != NULL)
-		stdump(t->left, f, nfapresent);
-	if (t->right != NULL)
-		stdump(t->right, f, nfapresent);
-}
-
-/*
- - stid - identify a subtree node for dumping
- ^ static char *stid(struct subre *, char *, size_t);
- */
-static char *			/* points to buf or constant string */
-stid(t, buf, bufsize)
-struct subre *t;
-char *buf;
-size_t bufsize;
-{
-	/* big enough for hex int or decimal t->retry? */
-	if (bufsize < sizeof(int)*2 + 3 || bufsize < sizeof(t->retry)*3 + 1)
-		return "unable";
-	if (t->retry != 0)
-		sprintf(buf, "%d", t->retry);
-	else
-		sprintf(buf, "0x%x", (int)(wxUIntPtr)(t));	/* may lose bits, that's okay */
-	return buf;
-}
-
-#include "regc_lex.c"
-#include "regc_color.c"
-#include "regc_nfa.c"
-#include "regc_cvec.c"
-#include "regc_locale.c"
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regcustom.h b/3rdparty/wxwidgets3.0-3.0.1/src/regex/regcustom.h
deleted file mode 100644
index 69e7c92069..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regcustom.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
- * 
- * Development of this software was funded, in part, by Cray Research Inc.,
- * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
- * Corporation, none of whom are responsible for the results.  The author
- * thanks all of them. 
- * 
- * Redistribution and use in source and binary forms -- with or without
- * modification -- are permitted for any purpose, provided that
- * redistributions in source form retain this entire copyright notice and
- * indicate the origin and nature of any modifications.
- * 
- * I'd appreciate being given credit for this package in the documentation
- * of software which uses it, but that is not a requirement.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* overrides for regguts.h definitions, if any */
-/* regguts only includes standard headers if NULL is not defined, so do it
- * ourselves here */
-#include 
-#include 
-#include 
-#include 
-#include 
-
-/* must include this after ctype.h inclusion for CodeWarrior/Mac */
-#include "wx/defs.h"
-#include "wx/chartype.h"
-#include "wx/wxcrtbase.h"
-
-/*
- * Do not insert extras between the "begin" and "end" lines -- this
- * chunk is automatically extracted to be fitted into regex.h.
- */
-/* --- begin --- */
-/* ensure certain things don't sneak in from system headers */
-#ifdef __REG_WIDE_T
-#undef __REG_WIDE_T
-#endif
-#ifdef __REG_WIDE_COMPILE
-#undef __REG_WIDE_COMPILE
-#endif
-#ifdef __REG_WIDE_EXEC
-#undef __REG_WIDE_EXEC
-#endif
-#ifdef __REG_REGOFF_T
-#undef __REG_REGOFF_T
-#endif
-#ifdef __REG_VOID_T
-#undef __REG_VOID_T
-#endif
-#ifdef __REG_CONST
-#undef __REG_CONST
-#endif
-#ifdef __REG_NOFRONT
-#undef __REG_NOFRONT
-#endif
-#ifdef __REG_NOCHAR
-#undef __REG_NOCHAR
-#endif
-#if wxUSE_UNICODE
-#   define  __REG_WIDE_T        wxChar
-#   define  __REG_WIDE_COMPILE  wx_re_comp
-#   define  __REG_WIDE_EXEC     wx_re_exec
-#   define  __REG_NOCHAR        /* don't want the char versions */
-#endif
-#define __REG_NOFRONT           /* don't want regcomp() and regexec() */
-#define _ANSI_ARGS_(x)          x
-/* --- end --- */
-
-/* internal character type and related */
-typedef wxChar chr;             /* the type itself */
-typedef int pchr;               /* what it promotes to */
-typedef unsigned uchr;          /* unsigned type that will hold a chr */
-typedef int celt;               /* type to hold chr, MCCE number, or NOCELT */
-#define NOCELT  (-1)            /* celt value which is not valid chr or MCCE */
-#define UCHAR(c) ((unsigned char) (c))
-#define CHR(c)  (UCHAR(c))      /* turn char literal into chr literal */
-#define DIGITVAL(c) ((c)-'0')   /* turn chr digit into its value */
-#if !wxUSE_UNICODE
-#   define CHRBITS 8            /* bits in a chr; must not use sizeof */
-#   define CHR_MIN 0x00         /* smallest and largest chr; the value */
-#   define CHR_MAX 0xff         /*  CHR_MAX-CHR_MIN+1 should fit in uchr */
-#elif SIZEOF_WCHAR_T == 4
-#   define CHRBITS 32           /* bits in a chr; must not use sizeof */
-#   define CHR_MIN 0x00000000   /* smallest and largest chr; the value */
-#   define CHR_MAX 0xffffffff   /*  CHR_MAX-CHR_MIN+1 should fit in uchr */
-#else
-#   define CHRBITS 16           /* bits in a chr; must not use sizeof */
-#   define CHR_MIN 0x0000       /* smallest and largest chr; the value */
-#   define CHR_MAX 0xffff       /*  CHR_MAX-CHR_MIN+1 should fit in uchr */
-#endif
-
-/*
- * I'm using isalpha et al. instead of wxIsalpha since BCC 5.5's iswalpha
- * seems not to work on Windows 9x? Note that these are only used by the
- * lexer, and although they must work for wxChars, they need only return
- * true for characters within the ascii range.
- */
-#define iscalnum(x)     ((wxUChar)(x) < 128 && isalnum(x))
-#define iscalpha(x)     ((wxUChar)(x) < 128 && isalpha(x))
-#define iscdigit(x)     ((wxUChar)(x) < 128 && isdigit(x))
-#define iscspace(x)     ((wxUChar)(x) < 128 && isspace(x))
-
-/* name the external functions */
-#define compile         wx_re_comp
-#define exec            wx_re_exec
-
-/* enable/disable debugging code (by whether REG_DEBUG is defined or not) */
-#if 0           /* no debug unless requested by makefile */
-#define REG_DEBUG       /* */
-#endif
-
-/* and pick up the standard header */
-#include "regex.h"
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/rege_dfa.c b/3rdparty/wxwidgets3.0-3.0.1/src/regex/rege_dfa.c
deleted file mode 100644
index deac9125ae..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/rege_dfa.c
+++ /dev/null
@@ -1,683 +0,0 @@
-/*
- * DFA routines
- * This file is #included by regexec.c.
- *
- * Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
- * 
- * Development of this software was funded, in part, by Cray Research Inc.,
- * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
- * Corporation, none of whom are responsible for the results.  The author
- * thanks all of them. 
- * 
- * Redistribution and use in source and binary forms -- with or without
- * modification -- are permitted for any purpose, provided that
- * redistributions in source form retain this entire copyright notice and
- * indicate the origin and nature of any modifications.
- * 
- * I'd appreciate being given credit for this package in the documentation
- * of software which uses it, but that is not a requirement.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-/*
- - longest - longest-preferred matching engine
- ^ static chr *longest(struct vars *, struct dfa *, chr *, chr *, int *);
- */
-static chr *			/* endpoint, or NULL */
-longest(v, d, start, stop, hitstopp)
-struct vars *v;			/* used only for debug and exec flags */
-struct dfa *d;
-chr *start;			/* where the match should start */
-chr *stop;			/* match must end at or before here */
-int *hitstopp;			/* record whether hit v->stop, if non-NULL */
-{
-	chr *cp;
-	chr *realstop = (stop == v->stop) ? stop : stop + 1;
-	color co;
-	struct sset *css;
-	struct sset *ss;
-	chr *post;
-	int i;
-	struct colormap *cm = d->cm;
-
-	/* initialize */
-	css = initialize(v, d, start);
-	cp = start;
-	if (hitstopp != NULL)
-		*hitstopp = 0;
-
-	/* startup */
-	FDEBUG(("+++ startup +++\n"));
-	if (cp == v->start) {
-		co = d->cnfa->bos[(v->eflags®_NOTBOL) ? 0 : 1];
-		FDEBUG(("color %ld\n", (long)co));
-	} else {
-		co = GETCOLOR(cm, *(cp - 1));
-		FDEBUG(("char %c, color %ld\n", (char)*(cp-1), (long)co));
-	}
-	css = miss(v, d, css, co, cp, start);
-	if (css == NULL)
-		return NULL;
-	css->lastseen = cp;
-
-	/* main loop */
-	if (v->eflags®_FTRACE)
-		while (cp < realstop) {
-			FDEBUG(("+++ at c%d +++\n", css - d->ssets));
-			co = GETCOLOR(cm, *cp);
-			FDEBUG(("char %c, color %ld\n", (char)*cp, (long)co));
-			ss = css->outs[co];
-			if (ss == NULL) {
-				ss = miss(v, d, css, co, cp+1, start);
-				if (ss == NULL)
-					break;	/* NOTE BREAK OUT */
-			}
-			cp++;
-			ss->lastseen = cp;
-			css = ss;
-		}
-	else
-		while (cp < realstop) {
-			co = GETCOLOR(cm, *cp);
-			ss = css->outs[co];
-			if (ss == NULL) {
-				ss = miss(v, d, css, co, cp+1, start);
-				if (ss == NULL)
-					break;	/* NOTE BREAK OUT */
-			}
-			cp++;
-			ss->lastseen = cp;
-			css = ss;
-		}
-
-	/* shutdown */
-	FDEBUG(("+++ shutdown at c%d +++\n", css - d->ssets));
-	if (cp == v->stop && stop == v->stop) {
-		if (hitstopp != NULL)
-			*hitstopp = 1;
-		co = d->cnfa->eos[(v->eflags®_NOTEOL) ? 0 : 1];
-		FDEBUG(("color %ld\n", (long)co));
-		ss = miss(v, d, css, co, cp, start);
-		/* special case:  match ended at eol? */
-		if (ss != NULL && (ss->flags&POSTSTATE))
-			return cp;
-		else if (ss != NULL)
-			ss->lastseen = cp;	/* to be tidy */
-	}
-
-	/* find last match, if any */
-	post = d->lastpost;
-	for (ss = d->ssets, i = d->nssused; i > 0; ss++, i--)
-		if ((ss->flags&POSTSTATE) && post != ss->lastseen &&
-					(post == NULL || post < ss->lastseen))
-			post = ss->lastseen;
-	if (post != NULL)		/* found one */
-		return post - 1;
-
-	return NULL;
-}
-
-/*
- - shortest - shortest-preferred matching engine
- ^ static chr *shortest(struct vars *, struct dfa *, chr *, chr *, chr *,
- ^ 	chr **, int *);
- */
-static chr *			/* endpoint, or NULL */
-shortest(v, d, start, min, max, coldp, hitstopp)
-struct vars *v;
-struct dfa *d;
-chr *start;			/* where the match should start */
-chr *min;			/* match must end at or after here */
-chr *max;			/* match must end at or before here */
-chr **coldp;			/* store coldstart pointer here, if nonNULL */
-int *hitstopp;			/* record whether hit v->stop, if non-NULL */
-{
-	chr *cp;
-	chr *realmin = (min == v->stop) ? min : min + 1;
-	chr *realmax = (max == v->stop) ? max : max + 1;
-	color co;
-	struct sset *css;
-	struct sset *ss;
-	struct colormap *cm = d->cm;
-
-	/* initialize */
-	css = initialize(v, d, start);
-	cp = start;
-	if (hitstopp != NULL)
-		*hitstopp = 0;
-
-	/* startup */
-	FDEBUG(("--- startup ---\n"));
-	if (cp == v->start) {
-		co = d->cnfa->bos[(v->eflags®_NOTBOL) ? 0 : 1];
-		FDEBUG(("color %ld\n", (long)co));
-	} else {
-		co = GETCOLOR(cm, *(cp - 1));
-		FDEBUG(("char %c, color %ld\n", (char)*(cp-1), (long)co));
-	}
-	css = miss(v, d, css, co, cp, start);
-	if (css == NULL)
-		return NULL;
-	css->lastseen = cp;
-	ss = css;
-
-	/* main loop */
-	if (v->eflags®_FTRACE)
-		while (cp < realmax) {
-			FDEBUG(("--- at c%d ---\n", css - d->ssets));
-			co = GETCOLOR(cm, *cp);
-			FDEBUG(("char %c, color %ld\n", (char)*cp, (long)co));
-			ss = css->outs[co];
-			if (ss == NULL) {
-				ss = miss(v, d, css, co, cp+1, start);
-				if (ss == NULL)
-					break;	/* NOTE BREAK OUT */
-			}
-			cp++;
-			ss->lastseen = cp;
-			css = ss;
-			if ((ss->flags&POSTSTATE) && cp >= realmin)
-				break;		/* NOTE BREAK OUT */
-		}
-	else
-		while (cp < realmax) {
-			co = GETCOLOR(cm, *cp);
-			ss = css->outs[co];
-			if (ss == NULL) {
-				ss = miss(v, d, css, co, cp+1, start);
-				if (ss == NULL)
-					break;	/* NOTE BREAK OUT */
-			}
-			cp++;
-			ss->lastseen = cp;
-			css = ss;
-			if ((ss->flags&POSTSTATE) && cp >= realmin)
-				break;		/* NOTE BREAK OUT */
-		}
-
-	if (ss == NULL)
-		return NULL;
-
-	if (coldp != NULL)	/* report last no-progress state set, if any */
-		*coldp = lastcold(v, d);
-
-	if ((ss->flags&POSTSTATE) && cp > min) {
-		assert(cp >= realmin);
-		cp--;
-	} else if (cp == v->stop && max == v->stop) {
-		co = d->cnfa->eos[(v->eflags®_NOTEOL) ? 0 : 1];
-		FDEBUG(("color %ld\n", (long)co));
-		ss = miss(v, d, css, co, cp, start);
-		/* match might have ended at eol */
-		if ((ss == NULL || !(ss->flags&POSTSTATE)) && hitstopp != NULL)
-			*hitstopp = 1;
-	}
-
-	if (ss == NULL || !(ss->flags&POSTSTATE))
-		return NULL;
-
-	return cp;
-}
-
-/*
- - lastcold - determine last point at which no progress had been made
- ^ static chr *lastcold(struct vars *, struct dfa *);
- */
-static chr *			/* endpoint, or NULL */
-lastcold(v, d)
-struct vars *v;
-struct dfa *d;
-{
-	struct sset *ss;
-	chr *nopr;
-	int i;
-
-	nopr = d->lastnopr;
-	if (nopr == NULL)
-		nopr = v->start;
-	for (ss = d->ssets, i = d->nssused; i > 0; ss++, i--)
-		if ((ss->flags&NOPROGRESS) && nopr < ss->lastseen)
-			nopr = ss->lastseen;
-	return nopr;
-}
-
-/*
- - newdfa - set up a fresh DFA
- ^ static struct dfa *newdfa(struct vars *, struct cnfa *,
- ^ 	struct colormap *, struct smalldfa *);
- */
- 
-/* FIXME Required for CW 8 on Mac since it's not in limits.h */
-#ifndef __CHAR_BIT__
-#define __CHAR_BIT__ 8
-#endif 
- 
-static struct dfa *
-newdfa(v, cnfa, cm, small)
-struct vars *v;
-struct cnfa *cnfa;
-struct colormap *cm;
-struct smalldfa *small;		/* preallocated space, may be NULL */
-{
-	struct dfa *d;
-	size_t nss = cnfa->nstates * 2;
-	int wordsper = (cnfa->nstates + UBITS - 1) / UBITS;
-	struct smalldfa *smallwas = small;
-
-	assert(cnfa != NULL && cnfa->nstates != 0);
-
-	if (nss <= FEWSTATES && cnfa->ncolors <= FEWCOLORS) {
-		assert(wordsper == 1);
-		if (small == NULL) {
-			small = (struct smalldfa *)MALLOC(
-						sizeof(struct smalldfa));
-			if (small == NULL) {
-				ERR(REG_ESPACE);
-				return NULL;
-			}
-		}
-		d = &small->dfa;
-		d->ssets = small->ssets;
-		d->statesarea = small->statesarea;
-		d->work = &d->statesarea[nss];
-		d->outsarea = small->outsarea;
-		d->incarea = small->incarea;
-		d->cptsmalloced = 0;
-		d->mallocarea = (smallwas == NULL) ? (char *)small : NULL;
-	} else {
-		d = (struct dfa *)MALLOC(sizeof(struct dfa));
-		if (d == NULL) {
-			ERR(REG_ESPACE);
-			return NULL;
-		}
-		d->ssets = (struct sset *)MALLOC(nss * sizeof(struct sset));
-		d->statesarea = (unsigned *)MALLOC((nss+WORK) * wordsper *
-							sizeof(unsigned));
-		d->work = &d->statesarea[nss * wordsper];
-		d->outsarea = (struct sset **)MALLOC(nss * cnfa->ncolors *
-							sizeof(struct sset *));
-		d->incarea = (struct arcp *)MALLOC(nss * cnfa->ncolors *
-							sizeof(struct arcp));
-		d->cptsmalloced = 1;
-		d->mallocarea = (char *)d;
-		if (d->ssets == NULL || d->statesarea == NULL ||
-				d->outsarea == NULL || d->incarea == NULL) {
-			freedfa(d);
-			ERR(REG_ESPACE);
-			return NULL;
-		}
-	}
-
-	d->nssets = (v->eflags®_SMALL) ? 7 : nss;
-	d->nssused = 0;
-	d->nstates = cnfa->nstates;
-	d->ncolors = cnfa->ncolors;
-	d->wordsper = wordsper;
-	d->cnfa = cnfa;
-	d->cm = cm;
-	d->lastpost = NULL;
-	d->lastnopr = NULL;
-	d->search = d->ssets;
-
-	/* initialization of sset fields is done as needed */
-
-	return d;
-}
-
-/*
- - freedfa - free a DFA
- ^ static VOID freedfa(struct dfa *);
- */
-static VOID
-freedfa(d)
-struct dfa *d;
-{
-	if (d->cptsmalloced) {
-		if (d->ssets != NULL)
-			FREE(d->ssets);
-		if (d->statesarea != NULL)
-			FREE(d->statesarea);
-		if (d->outsarea != NULL)
-			FREE(d->outsarea);
-		if (d->incarea != NULL)
-			FREE(d->incarea);
-	}
-
-	if (d->mallocarea != NULL)
-		FREE(d->mallocarea);
-}
-
-/*
- - hash - construct a hash code for a bitvector
- * There are probably better ways, but they're more expensive.
- ^ static unsigned hash(unsigned *, int);
- */
-static unsigned
-hash(uv, n)
-unsigned *uv;
-int n;
-{
-	int i;
-	unsigned h;
-
-	h = 0;
-	for (i = 0; i < n; i++)
-		h ^= uv[i];
-	return h;
-}
-
-/*
- - initialize - hand-craft a cache entry for startup, otherwise get ready
- ^ static struct sset *initialize(struct vars *, struct dfa *, chr *);
- */
-static struct sset *
-initialize(v, d, start)
-struct vars *v;			/* used only for debug flags */
-struct dfa *d;
-chr *start;
-{
-	struct sset *ss;
-	int i;
-
-	/* is previous one still there? */
-	if (d->nssused > 0 && (d->ssets[0].flags&STARTER))
-		ss = &d->ssets[0];
-	else {				/* no, must (re)build it */
-		ss = getvacant(v, d, start, start);
-		for (i = 0; i < d->wordsper; i++)
-			ss->states[i] = 0;
-		BSET(ss->states, d->cnfa->pre);
-		ss->hash = HASH(ss->states, d->wordsper);
-		assert(d->cnfa->pre != d->cnfa->post);
-		ss->flags = STARTER|LOCKED|NOPROGRESS;
-		/* lastseen dealt with below */
-	}
-
-	for (i = 0; i < d->nssused; i++)
-		d->ssets[i].lastseen = NULL;
-	ss->lastseen = start;		/* maybe untrue, but harmless */
-	d->lastpost = NULL;
-	d->lastnopr = NULL;
-	return ss;
-}
-
-/*
- - miss - handle a cache miss
- ^ static struct sset *miss(struct vars *, struct dfa *, struct sset *,
- ^ 	pcolor, chr *, chr *);
- */
-static struct sset *		/* NULL if goes to empty set */
-miss(v, d, css, co, cp, start)
-struct vars *v;			/* used only for debug flags */
-struct dfa *d;
-struct sset *css;
-pcolor co;
-chr *cp;			/* next chr */
-chr *start;			/* where the attempt got started */
-{
-	struct cnfa *cnfa = d->cnfa;
-	int i;
-	unsigned h;
-	struct carc *ca;
-	struct sset *p;
-	int ispost;
-	int noprogress;
-	int gotstate;
-	int dolacons;
-	int sawlacons;
-
-	/* for convenience, we can be called even if it might not be a miss */
-	if (css->outs[co] != NULL) {
-		FDEBUG(("hit\n"));
-		return css->outs[co];
-	}
-	FDEBUG(("miss\n"));
-
-	/* first, what set of states would we end up in? */
-	for (i = 0; i < d->wordsper; i++)
-		d->work[i] = 0;
-	ispost = 0;
-	noprogress = 1;
-	gotstate = 0;
-	for (i = 0; i < d->nstates; i++)
-		if (ISBSET(css->states, i))
-			for (ca = cnfa->states[i]+1; ca->co != COLORLESS; ca++)
-				if (ca->co == co) {
-					BSET(d->work, ca->to);
-					gotstate = 1;
-					if (ca->to == cnfa->post)
-						ispost = 1;
-					if (!cnfa->states[ca->to]->co)
-						noprogress = 0;
-					FDEBUG(("%d -> %d\n", i, ca->to));
-				}
-	dolacons = (gotstate) ? (cnfa->flags&HASLACONS) : 0;
-	sawlacons = 0;
-	while (dolacons) {		/* transitive closure */
-		dolacons = 0;
-		for (i = 0; i < d->nstates; i++)
-			if (ISBSET(d->work, i))
-				for (ca = cnfa->states[i]+1; ca->co != COLORLESS;
-									ca++) {
-					if (ca->co <= cnfa->ncolors)
-						continue; /* NOTE CONTINUE */
-					sawlacons = 1;
-					if (ISBSET(d->work, ca->to))
-						continue; /* NOTE CONTINUE */
-					if (!lacon(v, cnfa, cp, ca->co))
-						continue; /* NOTE CONTINUE */
-					BSET(d->work, ca->to);
-					dolacons = 1;
-					if (ca->to == cnfa->post)
-						ispost = 1;
-					if (!cnfa->states[ca->to]->co)
-						noprogress = 0;
-					FDEBUG(("%d :> %d\n", i, ca->to));
-				}
-	}
-	if (!gotstate)
-		return NULL;
-	h = HASH(d->work, d->wordsper);
-
-	/* next, is that in the cache? */
-	for (p = d->ssets, i = d->nssused; i > 0; p++, i--)
-		if (HIT(h, d->work, p, d->wordsper)) {
-			FDEBUG(("cached c%d\n", p - d->ssets));
-			break;			/* NOTE BREAK OUT */
-		}
-	if (i == 0) {		/* nope, need a new cache entry */
-		p = getvacant(v, d, cp, start);
-		assert(p != css);
-		for (i = 0; i < d->wordsper; i++)
-			p->states[i] = d->work[i];
-		p->hash = h;
-		p->flags = (ispost) ? POSTSTATE : 0;
-		if (noprogress)
-			p->flags |= NOPROGRESS;
-		/* lastseen to be dealt with by caller */
-	}
-
-	if (!sawlacons) {		/* lookahead conds. always cache miss */
-		FDEBUG(("c%d[%d]->c%d\n", css - d->ssets, co, p - d->ssets));
-		css->outs[co] = p;
-		css->inchain[co] = p->ins;
-		p->ins.ss = css;
-		p->ins.co = (color)co;
-	}
-	return p;
-}
-
-/*
- - lacon - lookahead-constraint checker for miss()
- ^ static int lacon(struct vars *, struct cnfa *, chr *, pcolor);
- */
-static int			/* predicate:  constraint satisfied? */
-lacon(v, pcnfa, cp, co)
-struct vars *v;
-struct cnfa *pcnfa;		/* parent cnfa */
-chr *cp;
-pcolor co;			/* "color" of the lookahead constraint */
-{
-	int n;
-	struct subre *sub;
-	struct dfa *d;
-	struct smalldfa sd;
-	chr *end;
-
-	n = co - pcnfa->ncolors;
-	assert(n < v->g->nlacons && v->g->lacons != NULL);
-	FDEBUG(("=== testing lacon %d\n", n));
-	sub = &v->g->lacons[n];
-	d = newdfa(v, &sub->cnfa, &v->g->cmap, &sd);
-	if (d == NULL) {
-		ERR(REG_ESPACE);
-		return 0;
-	}
-	end = longest(v, d, cp, v->stop, (int *)NULL);
-	freedfa(d);
-	FDEBUG(("=== lacon %d match %d\n", n, (end != NULL)));
-	return (sub->subno) ? (end != NULL) : (end == NULL);
-}
-
-/*
- - getvacant - get a vacant state set
- * This routine clears out the inarcs and outarcs, but does not otherwise
- * clear the innards of the state set -- that's up to the caller.
- ^ static struct sset *getvacant(struct vars *, struct dfa *, chr *, chr *);
- */
-static struct sset *
-getvacant(v, d, cp, start)
-struct vars *v;			/* used only for debug flags */
-struct dfa *d;
-chr *cp;
-chr *start;
-{
-	int i;
-	struct sset *ss;
-	struct sset *p;
-	struct arcp ap;
-	struct arcp lastap;
-	color co;
-    lastap.ss = NULL; lastap.co = 0; // WX: suppress dummy gcc warnings
-	ss = pickss(v, d, cp, start);
-	assert(!(ss->flags&LOCKED));
-
-	/* clear out its inarcs, including self-referential ones */
-	ap = ss->ins;
-	while ((p = ap.ss) != NULL) {
-		co = ap.co;
-		FDEBUG(("zapping c%d's %ld outarc\n", p - d->ssets, (long)co));
-		p->outs[co] = NULL;
-		ap = p->inchain[co];
-		p->inchain[co].ss = NULL;	/* paranoia */
-	}
-	ss->ins.ss = NULL;
-
-	/* take it off the inarc chains of the ssets reached by its outarcs */
-	for (i = 0; i < d->ncolors; i++) {
-		p = ss->outs[i];
-		assert(p != ss);		/* not self-referential */
-		if (p == NULL)
-			continue;		/* NOTE CONTINUE */
-		FDEBUG(("del outarc %d from c%d's in chn\n", i, p - d->ssets));
-		if (p->ins.ss == ss && p->ins.co == i)
-			p->ins = ss->inchain[i];
-		else {
-			assert(p->ins.ss != NULL);
-			for (ap = p->ins; ap.ss != NULL &&
-						!(ap.ss == ss && ap.co == i);
-						ap = ap.ss->inchain[ap.co])
-				lastap = ap;
-			assert(ap.ss != NULL);
-			lastap.ss->inchain[lastap.co] = ss->inchain[i];
-		}
-		ss->outs[i] = NULL;
-		ss->inchain[i].ss = NULL;
-	}
-
-	/* if ss was a success state, may need to remember location */
-	if ((ss->flags&POSTSTATE) && ss->lastseen != d->lastpost &&
-			(d->lastpost == NULL || d->lastpost < ss->lastseen))
-		d->lastpost = ss->lastseen;
-
-	/* likewise for a no-progress state */
-	if ((ss->flags&NOPROGRESS) && ss->lastseen != d->lastnopr &&
-			(d->lastnopr == NULL || d->lastnopr < ss->lastseen))
-		d->lastnopr = ss->lastseen;
-
-	return ss;
-}
-
-/*
- - pickss - pick the next stateset to be used
- ^ static struct sset *pickss(struct vars *, struct dfa *, chr *, chr *);
- */
-static struct sset *
-pickss(v, d, cp, start)
-struct vars *v;			/* used only for debug flags */
-struct dfa *d;
-chr *cp;
-chr *start;
-{
-	int i;
-	struct sset *ss;
-	struct sset *end;
-	chr *ancient;
-
-	/* shortcut for cases where cache isn't full */
-	if (d->nssused < d->nssets) {
-		i = d->nssused;
-		d->nssused++;
-		ss = &d->ssets[i];
-		FDEBUG(("new c%d\n", i));
-		/* set up innards */
-		ss->states = &d->statesarea[i * d->wordsper];
-		ss->flags = 0;
-		ss->ins.ss = NULL;
-		ss->ins.co = WHITE;		/* give it some value */
-		ss->outs = &d->outsarea[i * d->ncolors];
-		ss->inchain = &d->incarea[i * d->ncolors];
-		for (i = 0; i < d->ncolors; i++) {
-			ss->outs[i] = NULL;
-			ss->inchain[i].ss = NULL;
-		}
-		return ss;
-	}
-
-	/* look for oldest, or old enough anyway */
-	if (cp - start > d->nssets*2/3)		/* oldest 33% are expendable */
-		ancient = cp - d->nssets*2/3;
-	else
-		ancient = start;
-	for (ss = d->search, end = &d->ssets[d->nssets]; ss < end; ss++)
-		if ((ss->lastseen == NULL || ss->lastseen < ancient) &&
-							!(ss->flags&LOCKED)) {
-			d->search = ss + 1;
-			FDEBUG(("replacing c%d\n", ss - d->ssets));
-			return ss;
-		}
-	for (ss = d->ssets, end = d->search; ss < end; ss++)
-		if ((ss->lastseen == NULL || ss->lastseen < ancient) &&
-							!(ss->flags&LOCKED)) {
-			d->search = ss + 1;
-			FDEBUG(("replacing c%d\n", ss - d->ssets));
-			return ss;
-		}
-
-	/* nobody's old enough?!? -- something's really wrong */
-	FDEBUG(("can't find victim to replace!\n"));
-	assert(NOTREACHED);
-	ERR(REG_ASSERT);
-	return d->ssets;
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regerror.c b/3rdparty/wxwidgets3.0-3.0.1/src/regex/regerror.c
deleted file mode 100644
index 7646ba2fb6..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regerror.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * regerror - error-code expansion
- *
- * Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
- * 
- * Development of this software was funded, in part, by Cray Research Inc.,
- * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
- * Corporation, none of whom are responsible for the results.  The author
- * thanks all of them. 
- * 
- * Redistribution and use in source and binary forms -- with or without
- * modification -- are permitted for any purpose, provided that
- * redistributions in source form retain this entire copyright notice and
- * indicate the origin and nature of any modifications.
- * 
- * I'd appreciate being given credit for this package in the documentation
- * of software which uses it, but that is not a requirement.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include "regguts.h"
-
-/* unknown-error explanation */
-static char unk[] = "*** unknown regex error code 0x%x ***";
-
-/* struct to map among codes, code names, and explanations */
-static struct rerr {
-	int code;
-	char *name;
-	char *explain;
-} rerrs[] = {
-	/* the actual table is built from regex.h */
-#	include "regerrs.h"
-	{ -1,	"",	"oops" },	/* explanation special-cased in code */
-};
-
-/*
- - regerror - the interface to error numbers
- */
-/* ARGSUSED */
-size_t				/* actual space needed (including NUL) */
-wx_regerror(rxerrcode, preg, errbuf, errbuf_size)
-int rxerrcode;			/* error code, or REG_ATOI or REG_ITOA */
-CONST regex_t *preg;		/* associated regex_t (unused at present) */
-char *errbuf;			/* result buffer (unless errbuf_size==0) */
-size_t errbuf_size;		/* available space in errbuf, can be 0 */
-{
-	struct rerr *r;
-	char *msg;
-	char convbuf[sizeof(unk)+50];	/* 50 = plenty for int */
-	size_t len;
-	int icode;
-
-	switch (rxerrcode) {
-	case REG_ATOI:		/* convert name to number */
-		for (r = rerrs; r->code >= 0; r++)
-			if (strcmp(r->name, errbuf) == 0)
-				break;
-		sprintf(convbuf, "%d", r->code);	/* -1 for unknown */
-		msg = convbuf;
-		break;
-	case REG_ITOA:		/* convert number to name */
-		icode = atoi(errbuf);	/* not our problem if this fails */
-		for (r = rerrs; r->code >= 0; r++)
-			if (r->code == icode)
-				break;
-		if (r->code >= 0)
-			msg = r->name;
-		else {			/* unknown; tell him the number */
-			sprintf(convbuf, "REG_%u", (unsigned)icode);
-			msg = convbuf;
-		}
-		break;
-	default:		/* a real, normal error code */
-		for (r = rerrs; r->code >= 0; r++)
-			if (r->code == rxerrcode)
-				break;
-		if (r->code >= 0)
-			msg = r->explain;
-		else {			/* unknown; say so */
-			sprintf(convbuf, unk, rxerrcode);
-			msg = convbuf;
-		}
-		break;
-	}
-
-	len = strlen(msg) + 1;		/* space needed, including NUL */
-	if (errbuf_size > 0) {
-		if (errbuf_size > len)
-			strcpy(errbuf, msg);
-		else {			/* truncate to fit */
-			strncpy(errbuf, msg, errbuf_size-1);
-			errbuf[errbuf_size-1] = '\0';
-		}
-	}
-
-	return len;
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regerrs.h b/3rdparty/wxwidgets3.0-3.0.1/src/regex/regerrs.h
deleted file mode 100644
index a3d98b6818..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regerrs.h
+++ /dev/null
@@ -1,18 +0,0 @@
-{ REG_OKAY,	"REG_OKAY",	"no errors detected" },
-{ REG_NOMATCH,	"REG_NOMATCH",	"failed to match" },
-{ REG_BADPAT,	"REG_BADPAT",	"invalid regexp (reg version 0.8)" },
-{ REG_ECOLLATE,	"REG_ECOLLATE",	"invalid collating element" },
-{ REG_ECTYPE,	"REG_ECTYPE",	"invalid character class" },
-{ REG_EESCAPE,	"REG_EESCAPE",	"invalid escape \\ sequence" },
-{ REG_ESUBREG,	"REG_ESUBREG",	"invalid backreference number" },
-{ REG_EBRACK,	"REG_EBRACK",	"brackets [] not balanced" },
-{ REG_EPAREN,	"REG_EPAREN",	"parentheses () not balanced" },
-{ REG_EBRACE,	"REG_EBRACE",	"braces {} not balanced" },
-{ REG_BADBR,	"REG_BADBR",	"invalid repetition count(s)" },
-{ REG_ERANGE,	"REG_ERANGE",	"invalid character range" },
-{ REG_ESPACE,	"REG_ESPACE",	"out of memory" },
-{ REG_BADRPT,	"REG_BADRPT",	"quantifier operand invalid" },
-{ REG_ASSERT,	"REG_ASSERT",	"\"can't happen\" -- you found a bug" },
-{ REG_INVARG,	"REG_INVARG",	"invalid argument to regex function" },
-{ REG_MIXED,	"REG_MIXED",	"character widths of regex and string differ" },
-{ REG_BADOPT,	"REG_BADOPT",	"invalid embedded option" },
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regex.h b/3rdparty/wxwidgets3.0-3.0.1/src/regex/regex.h
deleted file mode 100644
index 0120ac3018..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regex.h
+++ /dev/null
@@ -1,337 +0,0 @@
-#ifndef _REGEX_H_
-#define	_REGEX_H_	/* never again */
-/*
- * regular expressions
- *
- * Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
- * 
- * Development of this software was funded, in part, by Cray Research Inc.,
- * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
- * Corporation, none of whom are responsible for the results.  The author
- * thanks all of them. 
- * 
- * Redistribution and use in source and binary forms -- with or without
- * modification -- are permitted for any purpose, provided that
- * redistributions in source form retain this entire copyright notice and
- * indicate the origin and nature of any modifications.
- *
- * I'd appreciate being given credit for this package in the documentation
- * of software which uses it, but that is not a requirement.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- *
- * Prototypes etc. marked with "^" within comments get gathered up (and
- * possibly edited) by the regfwd program and inserted near the bottom of
- * this file.
- *
- * We offer the option of declaring one wide-character version of the
- * RE functions as well as the char versions.  To do that, define
- * __REG_WIDE_T to the type of wide characters (unfortunately, there
- * is no consensus that wchar_t is suitable) and __REG_WIDE_COMPILE and
- * __REG_WIDE_EXEC to the names to be used for the compile and execute
- * functions (suggestion:  re_Xcomp and re_Xexec, where X is a letter
- * suggestive of the wide type, e.g. re_ucomp and re_uexec for Unicode).
- * For cranky old compilers, it may be necessary to do something like:
- * #define	__REG_WIDE_COMPILE(a,b,c,d)	re_Xcomp(a,b,c,d)
- * #define	__REG_WIDE_EXEC(a,b,c,d,e,f,g)	re_Xexec(a,b,c,d,e,f,g)
- * rather than just #defining the names as parameterless macros.
- *
- * For some specialized purposes, it may be desirable to suppress the
- * declarations of the "front end" functions, regcomp() and regexec(),
- * or of the char versions of the compile and execute functions.  To
- * suppress the front-end functions, define __REG_NOFRONT.  To suppress
- * the char versions, define __REG_NOCHAR.
- *
- * The right place to do those defines (and some others you may want, see
- * below) would be .  If you don't have control of that file,
- * the right place to add your own defines to this file is marked below.
- * This is normally done automatically, by the makefile and regmkhdr, based
- * on the contents of regcustom.h.
- */
-
-
-
-/*
- * voodoo for C++
- */
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-/*
- * Add your own defines, if needed, here.
- */
-
-
-
-/*
- * Location where a chunk of regcustom.h is automatically spliced into
- * this file (working from its prototype, regproto.h).
- */
-/* --- begin --- */
-/* ensure certain things don't sneak in from system headers */
-#ifdef __REG_WIDE_T
-#undef __REG_WIDE_T
-#endif
-#ifdef __REG_WIDE_COMPILE
-#undef __REG_WIDE_COMPILE
-#endif
-#ifdef __REG_WIDE_EXEC
-#undef __REG_WIDE_EXEC
-#endif
-#ifdef __REG_REGOFF_T
-#undef __REG_REGOFF_T
-#endif
-#ifdef __REG_VOID_T
-#undef __REG_VOID_T
-#endif
-#ifdef __REG_CONST
-#undef __REG_CONST
-#endif
-#ifdef __REG_NOFRONT
-#undef __REG_NOFRONT
-#endif
-#ifdef __REG_NOCHAR
-#undef __REG_NOCHAR
-#endif
-#if wxUSE_UNICODE
-#   define  __REG_WIDE_T        wxChar
-#   define  __REG_WIDE_COMPILE  wx_re_comp
-#   define  __REG_WIDE_EXEC     wx_re_exec
-#   define  __REG_NOCHAR        /* don't want the char versions */
-#endif
-#define __REG_NOFRONT           /* don't want regcomp() and regexec() */
-#define _ANSI_ARGS_(x)          x
-/* --- end --- */
-
-
-/*
- * interface types etc.
- */
-
-/*
- * regoff_t has to be large enough to hold either off_t or ssize_t,
- * and must be signed; it's only a guess that long is suitable, so we
- * offer  an override.
- */
-#ifdef __REG_REGOFF_T
-typedef __REG_REGOFF_T regoff_t;
-#else
-typedef long regoff_t;
-#endif
-
-/*
- * For benefit of old compilers, we offer  the option of
- * overriding the `void' type used to declare nonexistent return types.
- */
-#ifdef __REG_VOID_T
-typedef __REG_VOID_T re_void;
-#else
-typedef void re_void;
-#endif
-
-/*
- * Also for benefit of old compilers,  can supply a macro
- * which expands to a substitute for `const'.
- */
-#ifndef __REG_CONST
-#define	__REG_CONST	const
-#endif
-
-
-
-/*
- * other interface types
- */
-
-/* the biggie, a compiled RE (or rather, a front end to same) */
-typedef struct {
-	int re_magic;		/* magic number */
-	size_t re_nsub;		/* number of subexpressions */
-	long re_info;		/* information about RE */
-#		define	REG_UBACKREF		000001
-#		define	REG_ULOOKAHEAD		000002
-#		define	REG_UBOUNDS		000004
-#		define	REG_UBRACES		000010
-#		define	REG_UBSALNUM		000020
-#		define	REG_UPBOTCH		000040
-#		define	REG_UBBS		000100
-#		define	REG_UNONPOSIX		000200
-#		define	REG_UUNSPEC		000400
-#		define	REG_UUNPORT		001000
-#		define	REG_ULOCALE		002000
-#		define	REG_UEMPTYMATCH		004000
-#		define	REG_UIMPOSSIBLE		010000
-#		define	REG_USHORTEST		020000
-	int re_csize;		/* sizeof(character) */
-	char *re_endp;		/* backward compatibility kludge */
-	/* the rest is opaque pointers to hidden innards */
-	char *re_guts;		/* `char *' is more portable than `void *' */
-	char *re_fns;
-} regex_t;
-
-/* result reporting (may acquire more fields later) */
-typedef struct {
-	regoff_t rm_so;		/* start of substring */
-	regoff_t rm_eo;		/* end of substring */
-} regmatch_t;
-
-/* supplementary control and reporting */
-typedef struct {
-	regmatch_t rm_extend;	/* see REG_EXPECT */
-} rm_detail_t;
-
-
-
-/*
- * compilation
- ^ #ifndef __REG_NOCHAR
- ^ int re_comp(regex_t *, __REG_CONST char *, size_t, int);
- ^ #endif
- ^ #ifndef __REG_NOFRONT
- ^ int regcomp(regex_t *, __REG_CONST char *, int);
- ^ #endif
- ^ #ifdef __REG_WIDE_T
- ^ int __REG_WIDE_COMPILE(regex_t *, __REG_CONST __REG_WIDE_T *, size_t, int);
- ^ #endif
- */
-#define	REG_BASIC	000000	/* BREs (convenience) */
-#define	REG_EXTENDED	000001	/* EREs */
-#define	REG_ADVF	000002	/* advanced features in EREs */
-#define	REG_ADVANCED	000003	/* AREs (which are also EREs) */
-#define	REG_QUOTE	000004	/* no special characters, none */
-#define	REG_NOSPEC	REG_QUOTE	/* historical synonym */
-#define	REG_ICASE	000010	/* ignore case */
-#define	REG_NOSUB	000020	/* don't care about subexpressions */
-#define	REG_EXPANDED	000040	/* expanded format, white space & comments */
-#define	REG_NLSTOP	000100	/* \n doesn't match . or [^ ] */
-#define	REG_NLANCH	000200	/* ^ matches after \n, $ before */
-#define	REG_NEWLINE	000300	/* newlines are line terminators */
-#define	REG_PEND	000400	/* ugh -- backward-compatibility hack */
-#define	REG_EXPECT	001000	/* report details on partial/limited matches */
-#define	REG_BOSONLY	002000	/* temporary kludge for BOS-only matches */
-#define	REG_DUMP	004000	/* none of your business :-) */
-#define	REG_FAKE	010000	/* none of your business :-) */
-#define	REG_PROGRESS	020000	/* none of your business :-) */
-
-
-
-/*
- * execution
- ^ #ifndef __REG_NOCHAR
- ^ int re_exec(regex_t *, __REG_CONST char *, size_t,
- ^				rm_detail_t *, size_t, regmatch_t [], int);
- ^ #endif
- ^ #ifndef __REG_NOFRONT
- ^ int regexec(regex_t *, __REG_CONST char *, size_t, regmatch_t [], int);
- ^ #endif
- ^ #ifdef __REG_WIDE_T
- ^ int __REG_WIDE_EXEC(regex_t *, __REG_CONST __REG_WIDE_T *, size_t,
- ^				rm_detail_t *, size_t, regmatch_t [], int);
- ^ #endif
- */
-#define	REG_NOTBOL	0001	/* BOS is not BOL */
-#define	REG_NOTEOL	0002	/* EOS is not EOL */
-#define	REG_STARTEND	0004	/* backward compatibility kludge */
-#define	REG_FTRACE	0010	/* none of your business */
-#define	REG_MTRACE	0020	/* none of your business */
-#define	REG_SMALL	0040	/* none of your business */
-
-
-
-/*
- * misc generics (may be more functions here eventually)
- ^ re_void regfree(regex_t *);
- */
-
-
-
-/*
- * error reporting
- * Be careful if modifying the list of error codes -- the table used by
- * regerror() is generated automatically from this file!
- *
- * Note that there is no wide-char variant of regerror at this time; what
- * kind of character is used for error reports is independent of what kind
- * is used in matching.
- *
- ^ extern size_t regerror(int, __REG_CONST regex_t *, char *, size_t);
- */
-#define	REG_OKAY	 0	/* no errors detected */
-#define	REG_NOMATCH	 1	/* failed to match */
-#define	REG_BADPAT	 2	/* invalid regexp */
-#define	REG_ECOLLATE	 3	/* invalid collating element */
-#define	REG_ECTYPE	 4	/* invalid character class */
-#define	REG_EESCAPE	 5	/* invalid escape \ sequence */
-#define	REG_ESUBREG	 6	/* invalid backreference number */
-#define	REG_EBRACK	 7	/* brackets [] not balanced */
-#define	REG_EPAREN	 8	/* parentheses () not balanced */
-#define	REG_EBRACE	 9	/* braces {} not balanced */
-#define	REG_BADBR	10	/* invalid repetition count(s) */
-#define	REG_ERANGE	11	/* invalid character range */
-#define	REG_ESPACE	12	/* out of memory */
-#define	REG_BADRPT	13	/* quantifier operand invalid */
-#define	REG_ASSERT	15	/* "can't happen" -- you found a bug */
-#define	REG_INVARG	16	/* invalid argument to regex function */
-#define	REG_MIXED	17	/* character widths of regex and string differ */
-#define	REG_BADOPT	18	/* invalid embedded option */
-/* two specials for debugging and testing */
-#define	REG_ATOI	101	/* convert error-code name to number */
-#define	REG_ITOA	102	/* convert error-code number to name */
-
-
-
-/*
- * the prototypes, as possibly munched by regfwd
- */
-/* =====^!^===== begin forwards =====^!^===== */
-/* automatically gathered by fwd; do not hand-edit */
-/* === regproto.h === */
-#ifndef __REG_NOCHAR
-int wx_re_comp _ANSI_ARGS_((regex_t *, __REG_CONST char *, size_t, int));
-#endif
-#ifndef __REG_NOFRONT
-int regcomp _ANSI_ARGS_((regex_t *, __REG_CONST char *, int));
-#endif
-#ifdef __REG_WIDE_T
-int __REG_WIDE_COMPILE _ANSI_ARGS_((regex_t *, __REG_CONST __REG_WIDE_T *, size_t, int));
-#endif
-#ifndef __REG_NOCHAR
-int wx_re_exec _ANSI_ARGS_((regex_t *, __REG_CONST char *, size_t, rm_detail_t *, size_t, regmatch_t [], int));
-#endif
-#ifndef __REG_NOFRONT
-int regexec _ANSI_ARGS_((regex_t *, __REG_CONST char *, size_t, regmatch_t [], int));
-#endif
-#ifdef __REG_WIDE_T
-int __REG_WIDE_EXEC _ANSI_ARGS_((regex_t *, __REG_CONST __REG_WIDE_T *, size_t, rm_detail_t *, size_t, regmatch_t [], int));
-#endif
-re_void wx_regfree _ANSI_ARGS_((regex_t *));
-extern size_t wx_regerror _ANSI_ARGS_((int, __REG_CONST regex_t *, char *, size_t));
-/* automatically gathered by fwd; do not hand-edit */
-/* =====^!^===== end forwards =====^!^===== */
-
-
-
-/*
- * more C++ voodoo
- */
-#ifdef __cplusplus
-}
-#endif
-
-
-
-#endif
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regex.vcp b/3rdparty/wxwidgets3.0-3.0.1/src/regex/regex.vcp
deleted file mode 100644
index 3380a86ea9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regex.vcp
+++ /dev/null
@@ -1,2068 +0,0 @@
-# Microsoft eMbedded Visual Tools Project File - Name="regex" - Package Owner=<4>
-# Microsoft eMbedded Visual Tools Generated Build File, Format Version 6.02
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (WCE x86) Static Library" 0x8304
-# TARGTYPE "Win32 (WCE MIPSIV) Static Library" 0x9604
-# TARGTYPE "Win32 (WCE ARMV4I) Static Library" 0xa504
-# TARGTYPE "Win32 (WCE MIPSIV_FP) Static Library" 0x9204
-# TARGTYPE "Win32 (WCE emulator) Static Library" 0xa604
-# TARGTYPE "Win32 (WCE MIPSII) Static Library" 0xa104
-# TARGTYPE "Win32 (WCE ARMV4T) Static Library" 0xa404
-# TARGTYPE "Win32 (WCE MIPSII_FP) Static Library" 0xa204
-# TARGTYPE "Win32 (WCE MIPS16) Static Library" 0x8904
-# TARGTYPE "Win32 (WCE SH3) Static Library" 0x8104
-# TARGTYPE "Win32 (WCE ARMV4) Static Library" 0xa304
-# TARGTYPE "Win32 (WCE ARM) Static Library" 0x8504
-# TARGTYPE "Win32 (WCE SH4) Static Library" 0x8604
-
-CFG=regex - Win32 (WCE ARM) Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "regex.vcn".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "regex.vcn" CFG="regex - Win32 (WCE ARM) Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "regex - Win32 (WCE emulator) DLL Release" (based on "Win32 (WCE emulator) Static Library")
-!MESSAGE "regex - Win32 (WCE emulator) DLL Debug" (based on "Win32 (WCE emulator) Static Library")
-!MESSAGE "regex - Win32 (WCE emulator) Release" (based on "Win32 (WCE emulator) Static Library")
-!MESSAGE "regex - Win32 (WCE emulator) Debug" (based on "Win32 (WCE emulator) Static Library")
-!MESSAGE "regex - Win32 (WCE x86) DLL Release" (based on "Win32 (WCE x86) Static Library")
-!MESSAGE "regex - Win32 (WCE x86) DLL Debug" (based on "Win32 (WCE x86) Static Library")
-!MESSAGE "regex - Win32 (WCE x86) Release" (based on "Win32 (WCE x86) Static Library")
-!MESSAGE "regex - Win32 (WCE x86) Debug" (based on "Win32 (WCE x86) Static Library")
-!MESSAGE "regex - Win32 (WCE SH4) DLL Release" (based on "Win32 (WCE SH4) Static Library")
-!MESSAGE "regex - Win32 (WCE SH4) DLL Debug" (based on "Win32 (WCE SH4) Static Library")
-!MESSAGE "regex - Win32 (WCE SH4) Release" (based on "Win32 (WCE SH4) Static Library")
-!MESSAGE "regex - Win32 (WCE SH4) Debug" (based on "Win32 (WCE SH4) Static Library")
-!MESSAGE "regex - Win32 (WCE SH3) DLL Release" (based on "Win32 (WCE SH3) Static Library")
-!MESSAGE "regex - Win32 (WCE SH3) DLL Debug" (based on "Win32 (WCE SH3) Static Library")
-!MESSAGE "regex - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Static Library")
-!MESSAGE "regex - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPSIV_FP) DLL Release" (based on "Win32 (WCE MIPSIV_FP) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPSIV_FP) DLL Debug" (based on "Win32 (WCE MIPSIV_FP) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPSIV_FP) Release" (based on "Win32 (WCE MIPSIV_FP) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPSIV_FP) Debug" (based on "Win32 (WCE MIPSIV_FP) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPSIV) DLL Release" (based on "Win32 (WCE MIPSIV) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPSIV) DLL Debug" (based on "Win32 (WCE MIPSIV) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPSIV) Release" (based on "Win32 (WCE MIPSIV) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPSIV) Debug" (based on "Win32 (WCE MIPSIV) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPSII_FP) DLL Release" (based on "Win32 (WCE MIPSII_FP) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPSII_FP) DLL Debug" (based on "Win32 (WCE MIPSII_FP) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPSII_FP) Release" (based on "Win32 (WCE MIPSII_FP) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPSII_FP) Debug" (based on "Win32 (WCE MIPSII_FP) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPSII) DLL Release" (based on "Win32 (WCE MIPSII) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPSII) DLL Debug" (based on "Win32 (WCE MIPSII) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPSII) Release" (based on "Win32 (WCE MIPSII) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPSII) Debug" (based on "Win32 (WCE MIPSII) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPS16) DLL Release" (based on "Win32 (WCE MIPS16) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPS16) DLL Debug" (based on "Win32 (WCE MIPS16) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPS16) Release" (based on "Win32 (WCE MIPS16) Static Library")
-!MESSAGE "regex - Win32 (WCE MIPS16) Debug" (based on "Win32 (WCE MIPS16) Static Library")
-!MESSAGE "regex - Win32 (WCE ARMV4T) DLL Release" (based on "Win32 (WCE ARMV4T) Static Library")
-!MESSAGE "regex - Win32 (WCE ARMV4T) DLL Debug" (based on "Win32 (WCE ARMV4T) Static Library")
-!MESSAGE "regex - Win32 (WCE ARMV4T) Release" (based on "Win32 (WCE ARMV4T) Static Library")
-!MESSAGE "regex - Win32 (WCE ARMV4T) Debug" (based on "Win32 (WCE ARMV4T) Static Library")
-!MESSAGE "regex - Win32 (WCE ARMV4I) DLL Release" (based on "Win32 (WCE ARMV4I) Static Library")
-!MESSAGE "regex - Win32 (WCE ARMV4I) DLL Debug" (based on "Win32 (WCE ARMV4I) Static Library")
-!MESSAGE "regex - Win32 (WCE ARMV4I) Release" (based on "Win32 (WCE ARMV4I) Static Library")
-!MESSAGE "regex - Win32 (WCE ARMV4I) Debug" (based on "Win32 (WCE ARMV4I) Static Library")
-!MESSAGE "regex - Win32 (WCE ARMV4) DLL Release" (based on "Win32 (WCE ARMV4) Static Library")
-!MESSAGE "regex - Win32 (WCE ARMV4) DLL Debug" (based on "Win32 (WCE ARMV4) Static Library")
-!MESSAGE "regex - Win32 (WCE ARMV4) Release" (based on "Win32 (WCE ARMV4) Static Library")
-!MESSAGE "regex - Win32 (WCE ARMV4) Debug" (based on "Win32 (WCE ARMV4) Static Library")
-!MESSAGE "regex - Win32 (WCE ARM) DLL Release" (based on "Win32 (WCE ARM) Static Library")
-!MESSAGE "regex - Win32 (WCE ARM) DLL Debug" (based on "Win32 (WCE ARM) Static Library")
-!MESSAGE "regex - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Static Library")
-!MESSAGE "regex - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-# PROP ATL_Project 2
-
-!IF  "$(CFG)" == "regex - Win32 (WCE emulator) DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_emulator_dll"
-# PROP BASE Intermediate_Dir "evc_wincedll_emulator\regex"
-# PROP BASE CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_emulator_dll"
-# PROP Intermediate_Dir "evc_wincedll_emulator\regex"
-# PROP CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /D "i_386_" /D "_X86_" /D "x86" /Gs8192 /GF /W1 /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_emulator_dll\regex.pdb /I "..\..\lib\evc_emulator_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "i_386_" /D "_X86_" /D "x86" /Gs8192 /GF /W1 /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_emulator_dll\regex.pdb /I "..\..\lib\evc_emulator_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_emulator_dll\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_emulator_dll\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE emulator) DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_emulator_dll"
-# PROP BASE Intermediate_Dir "evc_winceddll_emulator\regex"
-# PROP BASE CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_emulator_dll"
-# PROP Intermediate_Dir "evc_winceddll_emulator\regex"
-# PROP CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /D "i_386_" /D "_X86_" /D "x86" /Gs8192 /GF /W1 /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_emulator_dll\regexd.pdb /I "..\..\lib\evc_emulator_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "i_386_" /D "_X86_" /D "x86" /Gs8192 /GF /W1 /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_emulator_dll\regexd.pdb /I "..\..\lib\evc_emulator_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_emulator_dll\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_emulator_dll\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE emulator) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_emulator_lib"
-# PROP BASE Intermediate_Dir "evc_wince_emulator\regex"
-# PROP BASE CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_emulator_lib"
-# PROP Intermediate_Dir "evc_wince_emulator\regex"
-# PROP CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /D "i_386_" /D "_X86_" /D "x86" /Gs8192 /GF /W1 /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_emulator_lib\regex.pdb /I "..\..\lib\evc_emulator_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "i_386_" /D "_X86_" /D "x86" /Gs8192 /GF /W1 /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_emulator_lib\regex.pdb /I "..\..\lib\evc_emulator_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_emulator_lib\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_emulator_lib\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE emulator) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_emulator_lib"
-# PROP BASE Intermediate_Dir "evc_winced_emulator\regex"
-# PROP BASE CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_emulator_lib"
-# PROP Intermediate_Dir "evc_winced_emulator\regex"
-# PROP CPU_ID "{32E52003-403E-442D-BE48-DE10F8C6131D}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /D "i_386_" /D "_X86_" /D "x86" /Gs8192 /GF /W1 /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_emulator_lib\regexd.pdb /I "..\..\lib\evc_emulator_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "i_386_" /D "_X86_" /D "x86" /Gs8192 /GF /W1 /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_emulator_lib\regexd.pdb /I "..\..\lib\evc_emulator_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_emulator_lib\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_emulator_lib\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE x86) DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_x86_dll"
-# PROP BASE Intermediate_Dir "evc_wincedll_x86\regex"
-# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_x86_dll"
-# PROP Intermediate_Dir "evc_wincedll_x86\regex"
-# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /Gs8192 /GF /W1 /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_x86_dll\regex.pdb /I "..\..\lib\evc_x86_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /Gs8192 /GF /W1 /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_x86_dll\regex.pdb /I "..\..\lib\evc_x86_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_x86_dll\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_x86_dll\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE x86) DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_x86_dll"
-# PROP BASE Intermediate_Dir "evc_winceddll_x86\regex"
-# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_x86_dll"
-# PROP Intermediate_Dir "evc_winceddll_x86\regex"
-# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /Gs8192 /GF /W1 /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_x86_dll\regexd.pdb /I "..\..\lib\evc_x86_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /Gs8192 /GF /W1 /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_x86_dll\regexd.pdb /I "..\..\lib\evc_x86_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_x86_dll\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_x86_dll\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE x86) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_x86_lib"
-# PROP BASE Intermediate_Dir "evc_wince_x86\regex"
-# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_x86_lib"
-# PROP Intermediate_Dir "evc_wince_x86\regex"
-# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /Gs8192 /GF /W1 /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_x86_lib\regex.pdb /I "..\..\lib\evc_x86_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /Gs8192 /GF /W1 /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_x86_lib\regex.pdb /I "..\..\lib\evc_x86_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_x86_lib\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_x86_lib\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE x86) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_x86_lib"
-# PROP BASE Intermediate_Dir "evc_winced_x86\regex"
-# PROP BASE CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_x86_lib"
-# PROP Intermediate_Dir "evc_winced_x86\regex"
-# PROP CPU_ID "{D6518FF3-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=cl.exe
-# ADD BASE CPP /nologo /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /Gs8192 /GF /W1 /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_x86_lib\regexd.pdb /I "..\..\lib\evc_x86_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "_i386_" /D "i_386_" /D "_X86_" /D "x86" /Gs8192 /GF /W1 /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_x86_lib\regexd.pdb /I "..\..\lib\evc_x86_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_x86_lib\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_x86_lib\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE SH4) DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_sh4_dll"
-# PROP BASE Intermediate_Dir "evc_wincedll_sh4\regex"
-# PROP BASE CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_sh4_dll"
-# PROP Intermediate_Dir "evc_wincedll_sh4\regex"
-# PROP CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=shcl.exe
-# ADD BASE CPP /nologo /D "SHx" /D "SH4" /D "_SH4_" /Qsh4 /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_sh4_dll\regex.pdb /I "..\..\lib\evc_sh4_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "SHx" /D "SH4" /D "_SH4_" /Qsh4 /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_sh4_dll\regex.pdb /I "..\..\lib\evc_sh4_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_sh4_dll\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_sh4_dll\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE SH4) DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_sh4_dll"
-# PROP BASE Intermediate_Dir "evc_winceddll_sh4\regex"
-# PROP BASE CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_sh4_dll"
-# PROP Intermediate_Dir "evc_winceddll_sh4\regex"
-# PROP CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=shcl.exe
-# ADD BASE CPP /nologo /D "SHx" /D "SH4" /D "_SH4_" /Qsh4 /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_sh4_dll\regexd.pdb /I "..\..\lib\evc_sh4_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "SHx" /D "SH4" /D "_SH4_" /Qsh4 /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_sh4_dll\regexd.pdb /I "..\..\lib\evc_sh4_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_sh4_dll\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_sh4_dll\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE SH4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_sh4_lib"
-# PROP BASE Intermediate_Dir "evc_wince_sh4\regex"
-# PROP BASE CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_sh4_lib"
-# PROP Intermediate_Dir "evc_wince_sh4\regex"
-# PROP CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=shcl.exe
-# ADD BASE CPP /nologo /D "SHx" /D "SH4" /D "_SH4_" /Qsh4 /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_sh4_lib\regex.pdb /I "..\..\lib\evc_sh4_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "SHx" /D "SH4" /D "_SH4_" /Qsh4 /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_sh4_lib\regex.pdb /I "..\..\lib\evc_sh4_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_sh4_lib\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_sh4_lib\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE SH4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_sh4_lib"
-# PROP BASE Intermediate_Dir "evc_winced_sh4\regex"
-# PROP BASE CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_sh4_lib"
-# PROP Intermediate_Dir "evc_winced_sh4\regex"
-# PROP CPU_ID "{D6519021-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=shcl.exe
-# ADD BASE CPP /nologo /D "SHx" /D "SH4" /D "_SH4_" /Qsh4 /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_sh4_lib\regexd.pdb /I "..\..\lib\evc_sh4_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "SHx" /D "SH4" /D "_SH4_" /Qsh4 /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_sh4_lib\regexd.pdb /I "..\..\lib\evc_sh4_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_sh4_lib\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_sh4_lib\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE SH3) DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_sh3_dll"
-# PROP BASE Intermediate_Dir "evc_wincedll_sh3\regex"
-# PROP BASE CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_sh3_dll"
-# PROP Intermediate_Dir "evc_wincedll_sh3\regex"
-# PROP CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=shcl.exe
-# ADD BASE CPP /nologo /D "SHx" /D "SH3" /D "_SH3_" /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_sh3_dll\regex.pdb /I "..\..\lib\evc_sh3_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "SHx" /D "SH3" /D "_SH3_" /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_sh3_dll\regex.pdb /I "..\..\lib\evc_sh3_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_sh3_dll\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_sh3_dll\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE SH3) DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_sh3_dll"
-# PROP BASE Intermediate_Dir "evc_winceddll_sh3\regex"
-# PROP BASE CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_sh3_dll"
-# PROP Intermediate_Dir "evc_winceddll_sh3\regex"
-# PROP CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=shcl.exe
-# ADD BASE CPP /nologo /D "SHx" /D "SH3" /D "_SH3_" /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_sh3_dll\regexd.pdb /I "..\..\lib\evc_sh3_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "SHx" /D "SH3" /D "_SH3_" /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_sh3_dll\regexd.pdb /I "..\..\lib\evc_sh3_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_sh3_dll\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_sh3_dll\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE SH3) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_sh3_lib"
-# PROP BASE Intermediate_Dir "evc_wince_sh3\regex"
-# PROP BASE CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_sh3_lib"
-# PROP Intermediate_Dir "evc_wince_sh3\regex"
-# PROP CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=shcl.exe
-# ADD BASE CPP /nologo /D "SHx" /D "SH3" /D "_SH3_" /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_sh3_lib\regex.pdb /I "..\..\lib\evc_sh3_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "SHx" /D "SH3" /D "_SH3_" /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_sh3_lib\regex.pdb /I "..\..\lib\evc_sh3_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_sh3_lib\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_sh3_lib\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE SH3) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_sh3_lib"
-# PROP BASE Intermediate_Dir "evc_winced_sh3\regex"
-# PROP BASE CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_sh3_lib"
-# PROP Intermediate_Dir "evc_winced_sh3\regex"
-# PROP CPU_ID "{D6519020-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=shcl.exe
-# ADD BASE CPP /nologo /D "SHx" /D "SH3" /D "_SH3_" /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_sh3_lib\regexd.pdb /I "..\..\lib\evc_sh3_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "SHx" /D "SH3" /D "_SH3_" /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_sh3_lib\regexd.pdb /I "..\..\lib\evc_sh3_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_sh3_lib\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_sh3_lib\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSIV_FP) DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_mipsiv_fp_dll"
-# PROP BASE Intermediate_Dir "evc_wincedll_mipsiv_fp\regex"
-# PROP BASE CPU_ID "{046A430D-7770-48AB-89B5-24C2D300B03F}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_mipsiv_fp_dll"
-# PROP Intermediate_Dir "evc_wincedll_mipsiv_fp\regex"
-# PROP CPU_ID "{046A430D-7770-48AB-89B5-24C2D300B03F}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /D "MIPSIV_FP" /QMmips4 /QMn32 /QMFPE- /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mipsiv_fp_dll\regex.pdb /I "..\..\lib\evc_mipsiv_fp_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /D "MIPSIV_FP" /QMmips4 /QMn32 /QMFPE- /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mipsiv_fp_dll\regex.pdb /I "..\..\lib\evc_mipsiv_fp_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mipsiv_fp_dll\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mipsiv_fp_dll\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSIV_FP) DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_mipsiv_fp_dll"
-# PROP BASE Intermediate_Dir "evc_winceddll_mipsiv_fp\regex"
-# PROP BASE CPU_ID "{046A430D-7770-48AB-89B5-24C2D300B03F}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_mipsiv_fp_dll"
-# PROP Intermediate_Dir "evc_winceddll_mipsiv_fp\regex"
-# PROP CPU_ID "{046A430D-7770-48AB-89B5-24C2D300B03F}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /D "MIPSIV_FP" /QMmips4 /QMn32 /QMFPE- /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mipsiv_fp_dll\regexd.pdb /I "..\..\lib\evc_mipsiv_fp_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /D "MIPSIV_FP" /QMmips4 /QMn32 /QMFPE- /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mipsiv_fp_dll\regexd.pdb /I "..\..\lib\evc_mipsiv_fp_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mipsiv_fp_dll\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mipsiv_fp_dll\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSIV_FP) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_mipsiv_fp_lib"
-# PROP BASE Intermediate_Dir "evc_wince_mipsiv_fp\regex"
-# PROP BASE CPU_ID "{046A430D-7770-48AB-89B5-24C2D300B03F}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_mipsiv_fp_lib"
-# PROP Intermediate_Dir "evc_wince_mipsiv_fp\regex"
-# PROP CPU_ID "{046A430D-7770-48AB-89B5-24C2D300B03F}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /D "MIPSIV_FP" /QMmips4 /QMn32 /QMFPE- /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mipsiv_fp_lib\regex.pdb /I "..\..\lib\evc_mipsiv_fp_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /D "MIPSIV_FP" /QMmips4 /QMn32 /QMFPE- /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mipsiv_fp_lib\regex.pdb /I "..\..\lib\evc_mipsiv_fp_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mipsiv_fp_lib\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mipsiv_fp_lib\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSIV_FP) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_mipsiv_fp_lib"
-# PROP BASE Intermediate_Dir "evc_winced_mipsiv_fp\regex"
-# PROP BASE CPU_ID "{046A430D-7770-48AB-89B5-24C2D300B03F}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_mipsiv_fp_lib"
-# PROP Intermediate_Dir "evc_winced_mipsiv_fp\regex"
-# PROP CPU_ID "{046A430D-7770-48AB-89B5-24C2D300B03F}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /D "MIPSIV_FP" /QMmips4 /QMn32 /QMFPE- /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mipsiv_fp_lib\regexd.pdb /I "..\..\lib\evc_mipsiv_fp_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /D "MIPSIV_FP" /QMmips4 /QMn32 /QMFPE- /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mipsiv_fp_lib\regexd.pdb /I "..\..\lib\evc_mipsiv_fp_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mipsiv_fp_lib\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mipsiv_fp_lib\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSIV) DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_mipsiv_dll"
-# PROP BASE Intermediate_Dir "evc_wincedll_mipsiv\regex"
-# PROP BASE CPU_ID "{0B2FE524-26C5-4194-8CEF-B1582DEB5A98}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_mipsiv_dll"
-# PROP Intermediate_Dir "evc_wincedll_mipsiv\regex"
-# PROP CPU_ID "{0B2FE524-26C5-4194-8CEF-B1582DEB5A98}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /QMmips4 /QMn32 /QMFPE /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mipsiv_dll\regex.pdb /I "..\..\lib\evc_mipsiv_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /QMmips4 /QMn32 /QMFPE /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mipsiv_dll\regex.pdb /I "..\..\lib\evc_mipsiv_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mipsiv_dll\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mipsiv_dll\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSIV) DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_mipsiv_dll"
-# PROP BASE Intermediate_Dir "evc_winceddll_mipsiv\regex"
-# PROP BASE CPU_ID "{0B2FE524-26C5-4194-8CEF-B1582DEB5A98}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_mipsiv_dll"
-# PROP Intermediate_Dir "evc_winceddll_mipsiv\regex"
-# PROP CPU_ID "{0B2FE524-26C5-4194-8CEF-B1582DEB5A98}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /QMmips4 /QMn32 /QMFPE /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mipsiv_dll\regexd.pdb /I "..\..\lib\evc_mipsiv_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /QMmips4 /QMn32 /QMFPE /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mipsiv_dll\regexd.pdb /I "..\..\lib\evc_mipsiv_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mipsiv_dll\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mipsiv_dll\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSIV) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_mipsiv_lib"
-# PROP BASE Intermediate_Dir "evc_wince_mipsiv\regex"
-# PROP BASE CPU_ID "{0B2FE524-26C5-4194-8CEF-B1582DEB5A98}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_mipsiv_lib"
-# PROP Intermediate_Dir "evc_wince_mipsiv\regex"
-# PROP CPU_ID "{0B2FE524-26C5-4194-8CEF-B1582DEB5A98}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /QMmips4 /QMn32 /QMFPE /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mipsiv_lib\regex.pdb /I "..\..\lib\evc_mipsiv_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /QMmips4 /QMn32 /QMFPE /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mipsiv_lib\regex.pdb /I "..\..\lib\evc_mipsiv_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mipsiv_lib\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mipsiv_lib\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSIV) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_mipsiv_lib"
-# PROP BASE Intermediate_Dir "evc_winced_mipsiv\regex"
-# PROP BASE CPU_ID "{0B2FE524-26C5-4194-8CEF-B1582DEB5A98}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_mipsiv_lib"
-# PROP Intermediate_Dir "evc_winced_mipsiv\regex"
-# PROP CPU_ID "{0B2FE524-26C5-4194-8CEF-B1582DEB5A98}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /QMmips4 /QMn32 /QMFPE /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mipsiv_lib\regexd.pdb /I "..\..\lib\evc_mipsiv_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "_MIPS64" /D "R4000" /D "MIPSIV" /QMmips4 /QMn32 /QMFPE /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mipsiv_lib\regexd.pdb /I "..\..\lib\evc_mipsiv_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mipsiv_lib\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mipsiv_lib\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSII_FP) DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_mipsii_fp_dll"
-# PROP BASE Intermediate_Dir "evc_wincedll_mipsii_fp\regex"
-# PROP BASE CPU_ID "{D8AC856C-B213-4895-9E83-9EC51A55201E}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_mipsii_fp_dll"
-# PROP Intermediate_Dir "evc_wincedll_mipsii_fp\regex"
-# PROP CPU_ID "{D8AC856C-B213-4895-9E83-9EC51A55201E}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPSII_FP" /QMmips2 /QMFPE- /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mipsii_fp_dll\regex.pdb /I "..\..\lib\evc_mipsii_fp_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPSII_FP" /QMmips2 /QMFPE- /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mipsii_fp_dll\regex.pdb /I "..\..\lib\evc_mipsii_fp_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mipsii_fp_dll\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mipsii_fp_dll\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSII_FP) DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_mipsii_fp_dll"
-# PROP BASE Intermediate_Dir "evc_winceddll_mipsii_fp\regex"
-# PROP BASE CPU_ID "{D8AC856C-B213-4895-9E83-9EC51A55201E}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_mipsii_fp_dll"
-# PROP Intermediate_Dir "evc_winceddll_mipsii_fp\regex"
-# PROP CPU_ID "{D8AC856C-B213-4895-9E83-9EC51A55201E}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPSII_FP" /QMmips2 /QMFPE- /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mipsii_fp_dll\regexd.pdb /I "..\..\lib\evc_mipsii_fp_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPSII_FP" /QMmips2 /QMFPE- /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mipsii_fp_dll\regexd.pdb /I "..\..\lib\evc_mipsii_fp_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mipsii_fp_dll\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mipsii_fp_dll\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSII_FP) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_mipsii_fp_lib"
-# PROP BASE Intermediate_Dir "evc_wince_mipsii_fp\regex"
-# PROP BASE CPU_ID "{D8AC856C-B213-4895-9E83-9EC51A55201E}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_mipsii_fp_lib"
-# PROP Intermediate_Dir "evc_wince_mipsii_fp\regex"
-# PROP CPU_ID "{D8AC856C-B213-4895-9E83-9EC51A55201E}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPSII_FP" /QMmips2 /QMFPE- /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mipsii_fp_lib\regex.pdb /I "..\..\lib\evc_mipsii_fp_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPSII_FP" /QMmips2 /QMFPE- /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mipsii_fp_lib\regex.pdb /I "..\..\lib\evc_mipsii_fp_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mipsii_fp_lib\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mipsii_fp_lib\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSII_FP) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_mipsii_fp_lib"
-# PROP BASE Intermediate_Dir "evc_winced_mipsii_fp\regex"
-# PROP BASE CPU_ID "{D8AC856C-B213-4895-9E83-9EC51A55201E}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_mipsii_fp_lib"
-# PROP Intermediate_Dir "evc_winced_mipsii_fp\regex"
-# PROP CPU_ID "{D8AC856C-B213-4895-9E83-9EC51A55201E}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPSII_FP" /QMmips2 /QMFPE- /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mipsii_fp_lib\regexd.pdb /I "..\..\lib\evc_mipsii_fp_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPSII_FP" /QMmips2 /QMFPE- /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mipsii_fp_lib\regexd.pdb /I "..\..\lib\evc_mipsii_fp_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mipsii_fp_lib\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mipsii_fp_lib\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSII) DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_mipsii_dll"
-# PROP BASE Intermediate_Dir "evc_wincedll_mipsii\regex"
-# PROP BASE CPU_ID "{689DDC64-9D9D-11D5-96F8-00207802C01C}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_mipsii_dll"
-# PROP Intermediate_Dir "evc_wincedll_mipsii\regex"
-# PROP CPU_ID "{689DDC64-9D9D-11D5-96F8-00207802C01C}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /QMmips2 /QMFPE /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mipsii_dll\regex.pdb /I "..\..\lib\evc_mipsii_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /QMmips2 /QMFPE /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mipsii_dll\regex.pdb /I "..\..\lib\evc_mipsii_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mipsii_dll\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mipsii_dll\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSII) DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_mipsii_dll"
-# PROP BASE Intermediate_Dir "evc_winceddll_mipsii\regex"
-# PROP BASE CPU_ID "{689DDC64-9D9D-11D5-96F8-00207802C01C}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_mipsii_dll"
-# PROP Intermediate_Dir "evc_winceddll_mipsii\regex"
-# PROP CPU_ID "{689DDC64-9D9D-11D5-96F8-00207802C01C}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /QMmips2 /QMFPE /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mipsii_dll\regexd.pdb /I "..\..\lib\evc_mipsii_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /QMmips2 /QMFPE /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mipsii_dll\regexd.pdb /I "..\..\lib\evc_mipsii_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mipsii_dll\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mipsii_dll\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSII) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_mipsii_lib"
-# PROP BASE Intermediate_Dir "evc_wince_mipsii\regex"
-# PROP BASE CPU_ID "{689DDC64-9D9D-11D5-96F8-00207802C01C}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_mipsii_lib"
-# PROP Intermediate_Dir "evc_wince_mipsii\regex"
-# PROP CPU_ID "{689DDC64-9D9D-11D5-96F8-00207802C01C}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /QMmips2 /QMFPE /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mipsii_lib\regex.pdb /I "..\..\lib\evc_mipsii_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /QMmips2 /QMFPE /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mipsii_lib\regex.pdb /I "..\..\lib\evc_mipsii_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mipsii_lib\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mipsii_lib\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSII) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_mipsii_lib"
-# PROP BASE Intermediate_Dir "evc_winced_mipsii\regex"
-# PROP BASE CPU_ID "{689DDC64-9D9D-11D5-96F8-00207802C01C}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_mipsii_lib"
-# PROP Intermediate_Dir "evc_winced_mipsii\regex"
-# PROP CPU_ID "{689DDC64-9D9D-11D5-96F8-00207802C01C}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /QMmips2 /QMFPE /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mipsii_lib\regexd.pdb /I "..\..\lib\evc_mipsii_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /QMmips2 /QMFPE /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mipsii_lib\regexd.pdb /I "..\..\lib\evc_mipsii_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mipsii_lib\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mipsii_lib\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPS16) DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_mips16_dll"
-# PROP BASE Intermediate_Dir "evc_wincedll_mips16\regex"
-# PROP BASE CPU_ID "{D6519013-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_mips16_dll"
-# PROP Intermediate_Dir "evc_wincedll_mips16\regex"
-# PROP CPU_ID "{D6519013-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPS16" /D "_MIPS16_" /D "MIPS16SUPPORT" /QMmips16 /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mips16_dll\regex.pdb /I "..\..\lib\evc_mips16_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPS16" /D "_MIPS16_" /D "MIPS16SUPPORT" /QMmips16 /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mips16_dll\regex.pdb /I "..\..\lib\evc_mips16_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mips16_dll\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mips16_dll\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPS16) DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_mips16_dll"
-# PROP BASE Intermediate_Dir "evc_winceddll_mips16\regex"
-# PROP BASE CPU_ID "{D6519013-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_mips16_dll"
-# PROP Intermediate_Dir "evc_winceddll_mips16\regex"
-# PROP CPU_ID "{D6519013-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPS16" /D "_MIPS16_" /D "MIPS16SUPPORT" /QMmips16 /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mips16_dll\regexd.pdb /I "..\..\lib\evc_mips16_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPS16" /D "_MIPS16_" /D "MIPS16SUPPORT" /QMmips16 /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mips16_dll\regexd.pdb /I "..\..\lib\evc_mips16_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mips16_dll\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mips16_dll\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPS16) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_mips16_lib"
-# PROP BASE Intermediate_Dir "evc_wince_mips16\regex"
-# PROP BASE CPU_ID "{D6519013-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_mips16_lib"
-# PROP Intermediate_Dir "evc_wince_mips16\regex"
-# PROP CPU_ID "{D6519013-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPS16" /D "_MIPS16_" /D "MIPS16SUPPORT" /QMmips16 /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mips16_lib\regex.pdb /I "..\..\lib\evc_mips16_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPS16" /D "_MIPS16_" /D "MIPS16SUPPORT" /QMmips16 /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_mips16_lib\regex.pdb /I "..\..\lib\evc_mips16_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mips16_lib\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mips16_lib\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPS16) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_mips16_lib"
-# PROP BASE Intermediate_Dir "evc_winced_mips16\regex"
-# PROP BASE CPU_ID "{D6519013-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_mips16_lib"
-# PROP Intermediate_Dir "evc_winced_mips16\regex"
-# PROP CPU_ID "{D6519013-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clmips.exe
-# ADD BASE CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPS16" /D "_MIPS16_" /D "MIPS16SUPPORT" /QMmips16 /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mips16_lib\regexd.pdb /I "..\..\lib\evc_mips16_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "MIPS" /D "_MIPS_" /D "R4000" /D "MIPSII" /D "MIPS16" /D "_MIPS16_" /D "MIPS16SUPPORT" /QMmips16 /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_mips16_lib\regexd.pdb /I "..\..\lib\evc_mips16_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_mips16_lib\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_mips16_lib\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4T) DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_armv4t_dll"
-# PROP BASE Intermediate_Dir "evc_wincedll_armv4t\regex"
-# PROP BASE CPU_ID "{F52316A9-3B7C-4FE7-A67F-68350B41240D}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_armv4t_dll"
-# PROP Intermediate_Dir "evc_wincedll_armv4t\regex"
-# PROP CPU_ID "{F52316A9-3B7C-4FE7-A67F-68350B41240D}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clthumb.exe
-# ADD BASE CPP /nologo /D "ARM" /D "_ARM_" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /QRarch4T /QRinterwork-return /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_armv4t_dll\regex.pdb /I "..\..\lib\evc_armv4t_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "ARM" /D "_ARM_" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /QRarch4T /QRinterwork-return /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_armv4t_dll\regex.pdb /I "..\..\lib\evc_armv4t_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_armv4t_dll\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_armv4t_dll\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4T) DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_armv4t_dll"
-# PROP BASE Intermediate_Dir "evc_winceddll_armv4t\regex"
-# PROP BASE CPU_ID "{F52316A9-3B7C-4FE7-A67F-68350B41240D}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_armv4t_dll"
-# PROP Intermediate_Dir "evc_winceddll_armv4t\regex"
-# PROP CPU_ID "{F52316A9-3B7C-4FE7-A67F-68350B41240D}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clthumb.exe
-# ADD BASE CPP /nologo /D "ARM" /D "_ARM_" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /QRarch4T /QRinterwork-return /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_armv4t_dll\regexd.pdb /I "..\..\lib\evc_armv4t_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "ARM" /D "_ARM_" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /QRarch4T /QRinterwork-return /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_armv4t_dll\regexd.pdb /I "..\..\lib\evc_armv4t_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_armv4t_dll\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_armv4t_dll\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4T) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_armv4t_lib"
-# PROP BASE Intermediate_Dir "evc_wince_armv4t\regex"
-# PROP BASE CPU_ID "{F52316A9-3B7C-4FE7-A67F-68350B41240D}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_armv4t_lib"
-# PROP Intermediate_Dir "evc_wince_armv4t\regex"
-# PROP CPU_ID "{F52316A9-3B7C-4FE7-A67F-68350B41240D}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clthumb.exe
-# ADD BASE CPP /nologo /D "ARM" /D "_ARM_" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /QRarch4T /QRinterwork-return /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_armv4t_lib\regex.pdb /I "..\..\lib\evc_armv4t_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "ARM" /D "_ARM_" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /QRarch4T /QRinterwork-return /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_armv4t_lib\regex.pdb /I "..\..\lib\evc_armv4t_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_armv4t_lib\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_armv4t_lib\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4T) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_armv4t_lib"
-# PROP BASE Intermediate_Dir "evc_winced_armv4t\regex"
-# PROP BASE CPU_ID "{F52316A9-3B7C-4FE7-A67F-68350B41240D}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_armv4t_lib"
-# PROP Intermediate_Dir "evc_winced_armv4t\regex"
-# PROP CPU_ID "{F52316A9-3B7C-4FE7-A67F-68350B41240D}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clthumb.exe
-# ADD BASE CPP /nologo /D "ARM" /D "_ARM_" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /QRarch4T /QRinterwork-return /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_armv4t_lib\regexd.pdb /I "..\..\lib\evc_armv4t_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "ARM" /D "_ARM_" /D "THUMB" /D "_THUMB_" /D "ARMV4T" /QRarch4T /QRinterwork-return /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_armv4t_lib\regexd.pdb /I "..\..\lib\evc_armv4t_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_armv4t_lib\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_armv4t_lib\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4I) DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_armv4i_dll"
-# PROP BASE Intermediate_Dir "evc_wincedll_armv4i\regex"
-# PROP BASE CPU_ID "{DC70F430-E78B-494F-A9D5-62ADC56443B8}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_armv4i_dll"
-# PROP Intermediate_Dir "evc_wincedll_armv4i\regex"
-# PROP CPU_ID "{DC70F430-E78B-494F-A9D5-62ADC56443B8}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /D "ARM" /D "_ARM_" /D "ARMV4I" /QRarch4T /QRinterwork-return /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_armv4i_dll\regex.pdb /I "..\..\lib\evc_armv4i_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "ARM" /D "_ARM_" /D "ARMV4I" /QRarch4T /QRinterwork-return /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_armv4i_dll\regex.pdb /I "..\..\lib\evc_armv4i_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_armv4i_dll\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_armv4i_dll\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4I) DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_armv4i_dll"
-# PROP BASE Intermediate_Dir "evc_winceddll_armv4i\regex"
-# PROP BASE CPU_ID "{DC70F430-E78B-494F-A9D5-62ADC56443B8}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_armv4i_dll"
-# PROP Intermediate_Dir "evc_winceddll_armv4i\regex"
-# PROP CPU_ID "{DC70F430-E78B-494F-A9D5-62ADC56443B8}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /D "ARM" /D "_ARM_" /D "ARMV4I" /QRarch4T /QRinterwork-return /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_armv4i_dll\regexd.pdb /I "..\..\lib\evc_armv4i_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "ARM" /D "_ARM_" /D "ARMV4I" /QRarch4T /QRinterwork-return /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_armv4i_dll\regexd.pdb /I "..\..\lib\evc_armv4i_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_armv4i_dll\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_armv4i_dll\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4I) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_armv4i_lib"
-# PROP BASE Intermediate_Dir "evc_wince_armv4i\regex"
-# PROP BASE CPU_ID "{DC70F430-E78B-494F-A9D5-62ADC56443B8}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_armv4i_lib"
-# PROP Intermediate_Dir "evc_wince_armv4i\regex"
-# PROP CPU_ID "{DC70F430-E78B-494F-A9D5-62ADC56443B8}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /D "ARM" /D "_ARM_" /D "ARMV4I" /QRarch4T /QRinterwork-return /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_armv4i_lib\regex.pdb /I "..\..\lib\evc_armv4i_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "ARM" /D "_ARM_" /D "ARMV4I" /QRarch4T /QRinterwork-return /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_armv4i_lib\regex.pdb /I "..\..\lib\evc_armv4i_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_armv4i_lib\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_armv4i_lib\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4I) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_armv4i_lib"
-# PROP BASE Intermediate_Dir "evc_winced_armv4i\regex"
-# PROP BASE CPU_ID "{DC70F430-E78B-494F-A9D5-62ADC56443B8}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_armv4i_lib"
-# PROP Intermediate_Dir "evc_winced_armv4i\regex"
-# PROP CPU_ID "{DC70F430-E78B-494F-A9D5-62ADC56443B8}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /D "ARM" /D "_ARM_" /D "ARMV4I" /QRarch4T /QRinterwork-return /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_armv4i_lib\regexd.pdb /I "..\..\lib\evc_armv4i_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "ARM" /D "_ARM_" /D "ARMV4I" /QRarch4T /QRinterwork-return /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_armv4i_lib\regexd.pdb /I "..\..\lib\evc_armv4i_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_armv4i_lib\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_armv4i_lib\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4) DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_armv4_dll"
-# PROP BASE Intermediate_Dir "evc_wincedll_armv4\regex"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_armv4_dll"
-# PROP Intermediate_Dir "evc_wincedll_armv4\regex"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /D "ARM" /D "_ARM_" /D "ARMV4" /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_armv4_dll\regex.pdb /I "..\..\lib\evc_armv4_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "ARM" /D "_ARM_" /D "ARMV4" /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_armv4_dll\regex.pdb /I "..\..\lib\evc_armv4_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_armv4_dll\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_armv4_dll\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4) DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_armv4_dll"
-# PROP BASE Intermediate_Dir "evc_winceddll_armv4\regex"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_armv4_dll"
-# PROP Intermediate_Dir "evc_winceddll_armv4\regex"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /D "ARM" /D "_ARM_" /D "ARMV4" /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_armv4_dll\regexd.pdb /I "..\..\lib\evc_armv4_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "ARM" /D "_ARM_" /D "ARMV4" /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_armv4_dll\regexd.pdb /I "..\..\lib\evc_armv4_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_armv4_dll\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_armv4_dll\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_armv4_lib"
-# PROP BASE Intermediate_Dir "evc_wince_armv4\regex"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_armv4_lib"
-# PROP Intermediate_Dir "evc_wince_armv4\regex"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /D "ARM" /D "_ARM_" /D "ARMV4" /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_armv4_lib\regex.pdb /I "..\..\lib\evc_armv4_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "ARM" /D "_ARM_" /D "ARMV4" /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_armv4_lib\regex.pdb /I "..\..\lib\evc_armv4_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_armv4_lib\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_armv4_lib\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_armv4_lib"
-# PROP BASE Intermediate_Dir "evc_winced_armv4\regex"
-# PROP BASE CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_armv4_lib"
-# PROP Intermediate_Dir "evc_winced_armv4\regex"
-# PROP CPU_ID "{ECBEA43D-CD7B-4852-AD55-D4227B5D624B}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /D "ARM" /D "_ARM_" /D "ARMV4" /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_armv4_lib\regexd.pdb /I "..\..\lib\evc_armv4_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "ARM" /D "_ARM_" /D "ARMV4" /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_armv4_lib\regexd.pdb /I "..\..\lib\evc_armv4_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_armv4_lib\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_armv4_lib\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARM) DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_arm_dll"
-# PROP BASE Intermediate_Dir "evc_wincedll_arm\regex"
-# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_arm_dll"
-# PROP Intermediate_Dir "evc_wincedll_arm\regex"
-# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /D "ARM" /D "_ARM_" /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_arm_dll\regex.pdb /I "..\..\lib\evc_arm_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "ARM" /D "_ARM_" /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_arm_dll\regex.pdb /I "..\..\lib\evc_arm_dll\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_arm_dll\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_arm_dll\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARM) DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_arm_dll"
-# PROP BASE Intermediate_Dir "evc_winceddll_arm\regex"
-# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_arm_dll"
-# PROP Intermediate_Dir "evc_winceddll_arm\regex"
-# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /D "ARM" /D "_ARM_" /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_arm_dll\regexd.pdb /I "..\..\lib\evc_arm_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "ARM" /D "_ARM_" /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_arm_dll\regexd.pdb /I "..\..\lib\evc_arm_dll\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_arm_dll\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_arm_dll\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARM) Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "..\..\lib\evc_arm_lib"
-# PROP BASE Intermediate_Dir "evc_wince_arm\regex"
-# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\lib\evc_arm_lib"
-# PROP Intermediate_Dir "evc_wince_arm\regex"
-# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /D "ARM" /D "_ARM_" /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_arm_lib\regex.pdb /I "..\..\lib\evc_arm_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "ARM" /D "_ARM_" /W1 /M$(CECrtMT) /O2 /I "..\..\build\wince\missing" /Fd..\..\lib\evc_arm_lib\regex.pdb /I "..\..\lib\evc_arm_lib\wince" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_arm_lib\regex.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_arm_lib\regex.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARM) Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\evc_arm_lib"
-# PROP BASE Intermediate_Dir "evc_winced_arm\regex"
-# PROP BASE CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP BASE Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\evc_arm_lib"
-# PROP Intermediate_Dir "evc_winced_arm\regex"
-# PROP CPU_ID "{D6518FFC-710F-11D3-99F2-00105A0DF099}"
-# PROP Platform_ID "{8A9A2F80-6887-11D3-842E-005004848CBA}"
-# PROP Target_Dir ""
-CPP=clarm.exe
-# ADD BASE CPP /nologo /D "ARM" /D "_ARM_" /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_arm_lib\regexd.pdb /I "..\..\lib\evc_arm_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-# ADD CPP /nologo /D "ARM" /D "_ARM_" /W1 /M$(CECrtMTDebug) /Od /I "..\..\build\wince\missing" /Zi /Fd..\..\lib\evc_arm_lib\regexd.pdb /I "..\..\lib\evc_arm_lib\winced" /I "..\..\include" /D UNDER_CE=$(CEVersion) /D _WIN32_WCE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "__WXWINCE__" /D "wxNO_EXCEPTIONS" /D "wxNO_RTTI" /D "$(CePlatform)" /D "_LIB" /D "DEBUG" /D "COMPILED_FROM_DSP" /c
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\evc_arm_lib\regexd.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\evc_arm_lib\regexd.lib"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-
-!ENDIF
-
-# Begin Target
-
-# Name "regex - Win32 (WCE emulator) DLL Release"
-# Name "regex - Win32 (WCE emulator) DLL Debug"
-# Name "regex - Win32 (WCE emulator) Release"
-# Name "regex - Win32 (WCE emulator) Debug"
-# Name "regex - Win32 (WCE x86) DLL Release"
-# Name "regex - Win32 (WCE x86) DLL Debug"
-# Name "regex - Win32 (WCE x86) Release"
-# Name "regex - Win32 (WCE x86) Debug"
-# Name "regex - Win32 (WCE SH4) DLL Release"
-# Name "regex - Win32 (WCE SH4) DLL Debug"
-# Name "regex - Win32 (WCE SH4) Release"
-# Name "regex - Win32 (WCE SH4) Debug"
-# Name "regex - Win32 (WCE SH3) DLL Release"
-# Name "regex - Win32 (WCE SH3) DLL Debug"
-# Name "regex - Win32 (WCE SH3) Release"
-# Name "regex - Win32 (WCE SH3) Debug"
-# Name "regex - Win32 (WCE MIPSIV_FP) DLL Release"
-# Name "regex - Win32 (WCE MIPSIV_FP) DLL Debug"
-# Name "regex - Win32 (WCE MIPSIV_FP) Release"
-# Name "regex - Win32 (WCE MIPSIV_FP) Debug"
-# Name "regex - Win32 (WCE MIPSIV) DLL Release"
-# Name "regex - Win32 (WCE MIPSIV) DLL Debug"
-# Name "regex - Win32 (WCE MIPSIV) Release"
-# Name "regex - Win32 (WCE MIPSIV) Debug"
-# Name "regex - Win32 (WCE MIPSII_FP) DLL Release"
-# Name "regex - Win32 (WCE MIPSII_FP) DLL Debug"
-# Name "regex - Win32 (WCE MIPSII_FP) Release"
-# Name "regex - Win32 (WCE MIPSII_FP) Debug"
-# Name "regex - Win32 (WCE MIPSII) DLL Release"
-# Name "regex - Win32 (WCE MIPSII) DLL Debug"
-# Name "regex - Win32 (WCE MIPSII) Release"
-# Name "regex - Win32 (WCE MIPSII) Debug"
-# Name "regex - Win32 (WCE MIPS16) DLL Release"
-# Name "regex - Win32 (WCE MIPS16) DLL Debug"
-# Name "regex - Win32 (WCE MIPS16) Release"
-# Name "regex - Win32 (WCE MIPS16) Debug"
-# Name "regex - Win32 (WCE ARMV4T) DLL Release"
-# Name "regex - Win32 (WCE ARMV4T) DLL Debug"
-# Name "regex - Win32 (WCE ARMV4T) Release"
-# Name "regex - Win32 (WCE ARMV4T) Debug"
-# Name "regex - Win32 (WCE ARMV4I) DLL Release"
-# Name "regex - Win32 (WCE ARMV4I) DLL Debug"
-# Name "regex - Win32 (WCE ARMV4I) Release"
-# Name "regex - Win32 (WCE ARMV4I) Debug"
-# Name "regex - Win32 (WCE ARMV4) DLL Release"
-# Name "regex - Win32 (WCE ARMV4) DLL Debug"
-# Name "regex - Win32 (WCE ARMV4) Release"
-# Name "regex - Win32 (WCE ARMV4) Debug"
-# Name "regex - Win32 (WCE ARM) DLL Release"
-# Name "regex - Win32 (WCE ARM) DLL Debug"
-# Name "regex - Win32 (WCE ARM) Release"
-# Name "regex - Win32 (WCE ARM) Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\regcomp.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\regerror.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\regexec.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\regfree.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\wince\setup.h
-
-!IF  "$(CFG)" == "regex - Win32 (WCE emulator) DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_emulator_dll\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_emulator_dll\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_emulator_dll\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE emulator) DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_emulator_dll\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_emulator_dll\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_emulator_dll\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE emulator) Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_emulator_lib\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_emulator_lib\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_emulator_lib\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE emulator) Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_emulator_lib\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_emulator_lib\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_emulator_lib\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE x86) DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_x86_dll\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_x86_dll\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_x86_dll\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE x86) DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_x86_dll\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_x86_dll\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_x86_dll\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE x86) Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_x86_lib\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_x86_lib\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_x86_lib\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE x86) Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_x86_lib\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_x86_lib\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_x86_lib\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE SH4) DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_sh4_dll\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_sh4_dll\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_sh4_dll\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE SH4) DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_sh4_dll\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_sh4_dll\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_sh4_dll\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE SH4) Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_sh4_lib\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_sh4_lib\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_sh4_lib\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE SH4) Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_sh4_lib\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_sh4_lib\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_sh4_lib\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE SH3) DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_sh3_dll\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_sh3_dll\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_sh3_dll\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE SH3) DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_sh3_dll\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_sh3_dll\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_sh3_dll\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE SH3) Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_sh3_lib\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_sh3_lib\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_sh3_lib\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE SH3) Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_sh3_lib\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_sh3_lib\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_sh3_lib\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSIV_FP) DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mipsiv_fp_dll\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mipsiv_fp_dll\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mipsiv_fp_dll\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSIV_FP) DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mipsiv_fp_dll\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mipsiv_fp_dll\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mipsiv_fp_dll\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSIV_FP) Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mipsiv_fp_lib\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mipsiv_fp_lib\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mipsiv_fp_lib\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSIV_FP) Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mipsiv_fp_lib\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mipsiv_fp_lib\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mipsiv_fp_lib\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSIV) DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mipsiv_dll\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mipsiv_dll\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mipsiv_dll\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSIV) DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mipsiv_dll\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mipsiv_dll\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mipsiv_dll\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSIV) Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mipsiv_lib\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mipsiv_lib\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mipsiv_lib\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSIV) Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mipsiv_lib\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mipsiv_lib\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mipsiv_lib\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSII_FP) DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mipsii_fp_dll\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mipsii_fp_dll\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mipsii_fp_dll\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSII_FP) DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mipsii_fp_dll\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mipsii_fp_dll\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mipsii_fp_dll\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSII_FP) Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mipsii_fp_lib\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mipsii_fp_lib\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mipsii_fp_lib\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSII_FP) Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mipsii_fp_lib\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mipsii_fp_lib\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mipsii_fp_lib\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSII) DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mipsii_dll\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mipsii_dll\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mipsii_dll\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSII) DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mipsii_dll\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mipsii_dll\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mipsii_dll\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSII) Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mipsii_lib\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mipsii_lib\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mipsii_lib\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPSII) Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mipsii_lib\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mipsii_lib\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mipsii_lib\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPS16) DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mips16_dll\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mips16_dll\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mips16_dll\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPS16) DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mips16_dll\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mips16_dll\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mips16_dll\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPS16) Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mips16_lib\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mips16_lib\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mips16_lib\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE MIPS16) Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_mips16_lib\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_mips16_lib\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_mips16_lib\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4T) DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_armv4t_dll\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_armv4t_dll\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_armv4t_dll\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4T) DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_armv4t_dll\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_armv4t_dll\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_armv4t_dll\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4T) Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_armv4t_lib\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_armv4t_lib\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_armv4t_lib\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4T) Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_armv4t_lib\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_armv4t_lib\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_armv4t_lib\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4I) DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_armv4i_dll\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_armv4i_dll\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_armv4i_dll\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4I) DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_armv4i_dll\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_armv4i_dll\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_armv4i_dll\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4I) Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_armv4i_lib\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_armv4i_lib\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_armv4i_lib\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4I) Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_armv4i_lib\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_armv4i_lib\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_armv4i_lib\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4) DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_armv4_dll\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_armv4_dll\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_armv4_dll\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4) DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_armv4_dll\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_armv4_dll\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_armv4_dll\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4) Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_armv4_lib\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_armv4_lib\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_armv4_lib\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARMV4) Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_armv4_lib\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_armv4_lib\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_armv4_lib\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARM) DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_arm_dll\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_arm_dll\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_arm_dll\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARM) DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_arm_dll\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_arm_dll\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_arm_dll\winced\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARM) Release"
-
-# Begin Custom Build - Creating ..\..\lib\evc_arm_lib\wince\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_arm_lib\wince\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_arm_lib\wince\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "regex - Win32 (WCE ARM) Debug"
-
-# Begin Custom Build - Creating ..\..\lib\evc_arm_lib\winced\wx\setup.h
-InputPath=..\..\include\wx\msw\wince\setup.h
-
-"..\..\lib\evc_arm_lib\winced\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\evc_arm_lib\winced\wx\setup.h
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Group
-# Begin Group "MSW Headers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\regerrs.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\regex.h
-# End Source File
-# Begin Source File
-
-SOURCE=.\regguts.h
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regexec.c b/3rdparty/wxwidgets3.0-3.0.1/src/regex/regexec.c
deleted file mode 100644
index 756cba131e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regexec.c
+++ /dev/null
@@ -1,1038 +0,0 @@
-/*
- * re_*exec and friends - match REs
- *
- * Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
- * 
- * Development of this software was funded, in part, by Cray Research Inc.,
- * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
- * Corporation, none of whom are responsible for the results.  The author
- * thanks all of them. 
- * 
- * Redistribution and use in source and binary forms -- with or without
- * modification -- are permitted for any purpose, provided that
- * redistributions in source form retain this entire copyright notice and
- * indicate the origin and nature of any modifications.
- * 
- * I'd appreciate being given credit for this package in the documentation
- * of software which uses it, but that is not a requirement.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include "regguts.h"
-
-
-
-/* lazy-DFA representation */
-struct arcp {			/* "pointer" to an outarc */
-	struct sset *ss;
-	color co;
-};
-
-struct sset {			/* state set */
-	unsigned *states;	/* pointer to bitvector */
-	unsigned hash;		/* hash of bitvector */
-#		define	HASH(bv, nw)	(((nw) == 1) ? *(bv) : hash(bv, nw))
-#	define	HIT(h,bv,ss,nw)	((ss)->hash == (h) && ((nw) == 1 || \
-		memcmp(VS(bv), VS((ss)->states), (nw)*sizeof(unsigned)) == 0))
-	int flags;
-#		define	STARTER		01	/* the initial state set */
-#		define	POSTSTATE	02	/* includes the goal state */
-#		define	LOCKED		04	/* locked in cache */
-#		define	NOPROGRESS	010	/* zero-progress state set */
-	struct arcp ins;	/* chain of inarcs pointing here */
-	chr *lastseen;		/* last entered on arrival here */
-	struct sset **outs;	/* outarc vector indexed by color */
-	struct arcp *inchain;	/* chain-pointer vector for outarcs */
-};
-
-struct dfa {
-	int nssets;		/* size of cache */
-	int nssused;		/* how many entries occupied yet */
-	int nstates;		/* number of states */
-	int ncolors;		/* length of outarc and inchain vectors */
-	int wordsper;		/* length of state-set bitvectors */
-	struct sset *ssets;	/* state-set cache */
-	unsigned *statesarea;	/* bitvector storage */
-	unsigned *work;		/* pointer to work area within statesarea */
-	struct sset **outsarea;	/* outarc-vector storage */
-	struct arcp *incarea;	/* inchain storage */
-	struct cnfa *cnfa;
-	struct colormap *cm;
-	chr *lastpost;		/* location of last cache-flushed success */
-	chr *lastnopr;		/* location of last cache-flushed NOPROGRESS */
-	struct sset *search;	/* replacement-search-pointer memory */
-	int cptsmalloced;	/* were the areas individually malloced? */
-	char *mallocarea;	/* self, or master malloced area, or NULL */
-};
-
-#define	WORK	1		/* number of work bitvectors needed */
-
-/* setup for non-malloc allocation for small cases */
-#define	FEWSTATES	20	/* must be less than UBITS */
-#define	FEWCOLORS	15
-struct smalldfa {
-	struct dfa dfa;
-	struct sset ssets[FEWSTATES*2];
-	unsigned statesarea[FEWSTATES*2 + WORK];
-	struct sset *outsarea[FEWSTATES*2 * FEWCOLORS];
-	struct arcp incarea[FEWSTATES*2 * FEWCOLORS];
-};
-#define	DOMALLOC	((struct smalldfa *)NULL)	/* force malloc */
-
-
-
-/* internal variables, bundled for easy passing around */
-struct vars {
-	regex_t *re;
-	struct guts *g;
-	int eflags;		/* copies of arguments */
-	size_t nmatch;
-	regmatch_t *pmatch;
-	rm_detail_t *details;
-	chr *start;		/* start of string */
-	chr *stop;		/* just past end of string */
-	int err;		/* error code if any (0 none) */
-	regoff_t *mem;		/* memory vector for backtracking */
-	struct smalldfa dfa1;
-	struct smalldfa dfa2;
-};
-#define	VISERR(vv)	((vv)->err != 0)	/* have we seen an error yet? */
-#define	ISERR()	VISERR(v)
-#define	VERR(vv,e)	(((vv)->err) ? (vv)->err : ((vv)->err = (e)))
-#define	ERR(e)	(void)VERR(v, e)		/* record an error */
-#define	NOERR()	{if (ISERR()) return v->err;}	/* if error seen, return it */
-#define	OFF(p)	((p) - v->start)
-#define	LOFF(p)	((long)OFF(p))
-
-
-
-/*
- * forward declarations
- */
-/* =====^!^===== begin forwards =====^!^===== */
-/* automatically gathered by fwd; do not hand-edit */
-/* === regexec.c === */
-int exec _ANSI_ARGS_((regex_t *, CONST chr *, size_t, rm_detail_t *, size_t, regmatch_t [], int));
-static int find _ANSI_ARGS_((struct vars *, struct cnfa *, struct colormap *));
-static int cfind _ANSI_ARGS_((struct vars *, struct cnfa *, struct colormap *));
-static int cfindloop _ANSI_ARGS_((struct vars *, struct cnfa *, struct colormap *, struct dfa *, struct dfa *, chr **));
-static VOID zapsubs _ANSI_ARGS_((regmatch_t *, size_t));
-static VOID zapmem _ANSI_ARGS_((struct vars *, struct subre *));
-static VOID subset _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-static int dissect _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-static int condissect _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-static int altdissect _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-static int cdissect _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-static int ccondissect _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-static int crevdissect _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-static int cbrdissect _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-static int caltdissect _ANSI_ARGS_((struct vars *, struct subre *, chr *, chr *));
-/* === rege_dfa.c === */
-static chr *longest _ANSI_ARGS_((struct vars *, struct dfa *, chr *, chr *, int *));
-static chr *shortest _ANSI_ARGS_((struct vars *, struct dfa *, chr *, chr *, chr *, chr **, int *));
-static chr *lastcold _ANSI_ARGS_((struct vars *, struct dfa *));
-static struct dfa *newdfa _ANSI_ARGS_((struct vars *, struct cnfa *, struct colormap *, struct smalldfa *));
-static VOID freedfa _ANSI_ARGS_((struct dfa *));
-static unsigned hash _ANSI_ARGS_((unsigned *, int));
-static struct sset *initialize _ANSI_ARGS_((struct vars *, struct dfa *, chr *));
-static struct sset *miss _ANSI_ARGS_((struct vars *, struct dfa *, struct sset *, pcolor, chr *, chr *));
-static int lacon _ANSI_ARGS_((struct vars *, struct cnfa *, chr *, pcolor));
-static struct sset *getvacant _ANSI_ARGS_((struct vars *, struct dfa *, chr *, chr *));
-static struct sset *pickss _ANSI_ARGS_((struct vars *, struct dfa *, chr *, chr *));
-/* automatically gathered by fwd; do not hand-edit */
-/* =====^!^===== end forwards =====^!^===== */
-
-
-
-/*
- - exec - match regular expression
- ^ int exec(regex_t *, CONST chr *, size_t, rm_detail_t *,
- ^					size_t, regmatch_t [], int);
- */
-int
-exec(re, string, len, details, nmatch, pmatch, flags)
-regex_t *re;
-CONST chr *string;
-size_t len;
-rm_detail_t *details;
-size_t nmatch;
-regmatch_t pmatch[];
-int flags;
-{
-	struct vars var;
-	register struct vars *v = &var;
-	int st;
-	size_t n;
-	int backref;
-#	define	LOCALMAT	20
-	regmatch_t mat[LOCALMAT];
-#	define	LOCALMEM	40
-	regoff_t mem[LOCALMEM];
-
-	/* sanity checks */
-	if (re == NULL || string == NULL || re->re_magic != REMAGIC)
-		return REG_INVARG;
-	if (re->re_csize != sizeof(chr))
-		return REG_MIXED;
-
-	/* setup */
-	v->re = re;
-	v->g = (struct guts *)re->re_guts;
-	if ((v->g->cflags®_EXPECT) && details == NULL)
-		return REG_INVARG;
-	if (v->g->info®_UIMPOSSIBLE)
-		return REG_NOMATCH;
-	backref = (v->g->info®_UBACKREF) ? 1 : 0;
-	v->eflags = flags;
-	if (v->g->cflags®_NOSUB)
-		nmatch = 0;		/* override client */
-	v->nmatch = nmatch;
-	if (backref) {
-		/* need work area */
-		if (v->g->nsub + 1 <= LOCALMAT)
-			v->pmatch = mat;
-		else
-			v->pmatch = (regmatch_t *)MALLOC((v->g->nsub + 1) *
-							sizeof(regmatch_t));
-		if (v->pmatch == NULL)
-			return REG_ESPACE;
-		v->nmatch = v->g->nsub + 1;
-	} else
-		v->pmatch = pmatch;
-	v->details = details;
-	v->start = (chr *)string;
-	v->stop = (chr *)string + len;
-	v->err = 0;
-	if (backref) {
-		/* need retry memory */
-		assert(v->g->ntree >= 0);
-		n = (size_t)v->g->ntree;
-		if (n <= LOCALMEM)
-			v->mem = mem;
-		else
-			v->mem = (regoff_t *)MALLOC(n*sizeof(regoff_t));
-		if (v->mem == NULL) {
-			if (v->pmatch != pmatch && v->pmatch != mat)
-				FREE(v->pmatch);
-			return REG_ESPACE;
-		}
-	} else
-		v->mem = NULL;
-
-	/* do it */
-	assert(v->g->tree != NULL);
-	if (backref)
-		st = cfind(v, &v->g->tree->cnfa, &v->g->cmap);
-	else
-		st = find(v, &v->g->tree->cnfa, &v->g->cmap);
-
-	/* copy (portion of) match vector over if necessary */
-	if (st == REG_OKAY && v->pmatch != pmatch && nmatch > 0) {
-		zapsubs(pmatch, nmatch);
-		n = (nmatch < v->nmatch) ? nmatch : v->nmatch;
-		memcpy(VS(pmatch), VS(v->pmatch), n*sizeof(regmatch_t));
-	}
-
-	/* clean up */
-	if (v->pmatch != pmatch && v->pmatch != mat)
-		FREE(v->pmatch);
-	if (v->mem != NULL && v->mem != mem)
-		FREE(v->mem);
-	return st;
-}
-
-/*
- - find - find a match for the main NFA (no-complications case)
- ^ static int find(struct vars *, struct cnfa *, struct colormap *);
- */
-static int
-find(v, cnfa, cm)
-struct vars *v;
-struct cnfa *cnfa;
-struct colormap *cm;
-{
-	struct dfa *s;
-	struct dfa *d;
-	chr *begin;
-	chr *end = NULL;
-	chr *cold;
-	chr *open;		/* open and close of range of possible starts */
-	chr *close;
-	int hitend;
-	int shorter = (v->g->tree->flags&SHORTER) ? 1 : 0;
-
-	/* first, a shot with the search RE */
-	s = newdfa(v, &v->g->search, cm, &v->dfa1);
-	assert(!(ISERR() && s != NULL));
-	NOERR();
-	MDEBUG(("\nsearch at %ld\n", LOFF(v->start)));
-	cold = NULL;
-	close = shortest(v, s, v->start, v->start, v->stop, &cold, (int *)NULL);
-	freedfa(s);
-	NOERR();
-	if (v->g->cflags®_EXPECT) {
-		assert(v->details != NULL);
-		if (cold != NULL)
-			v->details->rm_extend.rm_so = OFF(cold);
-		else
-			v->details->rm_extend.rm_so = OFF(v->stop);
-		v->details->rm_extend.rm_eo = OFF(v->stop);	/* unknown */
-	}
-	if (close == NULL)		/* not found */
-		return REG_NOMATCH;
-	if (v->nmatch == 0)		/* found, don't need exact location */
-		return REG_OKAY;
-
-	/* find starting point and match */
-	assert(cold != NULL);
-	open = cold;
-	cold = NULL;
-	MDEBUG(("between %ld and %ld\n", LOFF(open), LOFF(close)));
-	d = newdfa(v, cnfa, cm, &v->dfa1);
-	assert(!(ISERR() && d != NULL));
-	NOERR();
-	for (begin = open; begin <= close; begin++) {
-		MDEBUG(("\nfind trying at %ld\n", LOFF(begin)));
-		if (shorter)
-			end = shortest(v, d, begin, begin, v->stop,
-							(chr **)NULL, &hitend);
-		else
-			end = longest(v, d, begin, v->stop, &hitend);
-		NOERR();
-		if (hitend && cold == NULL)
-			cold = begin;
-		if (end != NULL)
-			break;		/* NOTE BREAK OUT */
-	}
-	assert(end != NULL);		/* search RE succeeded so loop should */
-	freedfa(d);
-
-	/* and pin down details */
-	assert(v->nmatch > 0);
-	v->pmatch[0].rm_so = OFF(begin);
-	v->pmatch[0].rm_eo = OFF(end);
-	if (v->g->cflags®_EXPECT) {
-		if (cold != NULL)
-			v->details->rm_extend.rm_so = OFF(cold);
-		else
-			v->details->rm_extend.rm_so = OFF(v->stop);
-		v->details->rm_extend.rm_eo = OFF(v->stop);	/* unknown */
-	}
-	if (v->nmatch == 1)		/* no need for submatches */
-		return REG_OKAY;
-
-	/* submatches */
-	zapsubs(v->pmatch, v->nmatch);
-	return dissect(v, v->g->tree, begin, end);
-}
-
-/*
- - cfind - find a match for the main NFA (with complications)
- ^ static int cfind(struct vars *, struct cnfa *, struct colormap *);
- */
-static int
-cfind(v, cnfa, cm)
-struct vars *v;
-struct cnfa *cnfa;
-struct colormap *cm;
-{
-	struct dfa *s;
-	struct dfa *d;
-	chr *cold;
-	int ret;
-
-	s = newdfa(v, &v->g->search, cm, &v->dfa1);
-	NOERR();
-	d = newdfa(v, cnfa, cm, &v->dfa2);
-	if (ISERR()) {
-		assert(d == NULL);
-		freedfa(s);
-		return v->err;
-	}
-    cold = NULL;// WX: fix gcc warnings about cold being possibly uninitialized
-	ret = cfindloop(v, cnfa, cm, d, s, &cold);
-
-	freedfa(d);
-	freedfa(s);
-	NOERR();
-	if (v->g->cflags®_EXPECT) {
-		assert(v->details != NULL);
-		if (cold != NULL)
-			v->details->rm_extend.rm_so = OFF(cold);
-		else
-			v->details->rm_extend.rm_so = OFF(v->stop);
-		v->details->rm_extend.rm_eo = OFF(v->stop);	/* unknown */
-	}
-	return ret;
-}
-
-/*
- - cfindloop - the heart of cfind
- ^ static int cfindloop(struct vars *, struct cnfa *, struct colormap *,
- ^	struct dfa *, struct dfa *, chr **);
- */
-static int
-cfindloop(v, cnfa, cm, d, s, coldp)
-struct vars *v;
-struct cnfa *cnfa;
-struct colormap *cm;
-struct dfa *d;
-struct dfa *s;
-chr **coldp;			/* where to put coldstart pointer */
-{
-	chr *begin;
-	chr *end;
-	chr *cold;
-	chr *open;		/* open and close of range of possible starts */
-	chr *close;
-	chr *estart;
-	chr *estop;
-	int er;
-	int shorter = v->g->tree->flags&SHORTER;
-	int hitend;
-
-	assert(d != NULL && s != NULL);
-	cold = NULL;
-	close = v->start;
-	do {
-		MDEBUG(("\ncsearch at %ld\n", LOFF(close)));
-		close = shortest(v, s, close, close, v->stop, &cold, (int *)NULL);
-		if (close == NULL)
-			break;				/* NOTE BREAK */
-		assert(cold != NULL);
-		open = cold;
-		cold = NULL;
-		MDEBUG(("cbetween %ld and %ld\n", LOFF(open), LOFF(close)));
-		for (begin = open; begin <= close; begin++) {
-			MDEBUG(("\ncfind trying at %ld\n", LOFF(begin)));
-			estart = begin;
-			estop = v->stop;
-			for (;;) {
-				if (shorter)
-					end = shortest(v, d, begin, estart,
-						estop, (chr **)NULL, &hitend);
-				else
-					end = longest(v, d, begin, estop,
-								&hitend);
-				if (hitend && cold == NULL)
-					cold = begin;
-				if (end == NULL)
-					break;		/* NOTE BREAK OUT */
-				MDEBUG(("tentative end %ld\n", LOFF(end)));
-				zapsubs(v->pmatch, v->nmatch);
-				zapmem(v, v->g->tree);
-				er = cdissect(v, v->g->tree, begin, end);
-				if (er == REG_OKAY) {
-					if (v->nmatch > 0) {
-						v->pmatch[0].rm_so = OFF(begin);
-						v->pmatch[0].rm_eo = OFF(end);
-					}
-					*coldp = cold;
-					return REG_OKAY;
-				}
-				if (er != REG_NOMATCH) {
-					ERR(er);
-					return er;
-				}
-				if ((shorter) ? end == estop : end == begin) {
-					/* no point in trying again */
-					*coldp = cold;
-					return REG_NOMATCH;
-				}
-				/* go around and try again */
-				if (shorter)
-					estart = end + 1;
-				else
-					estop = end - 1;
-			}
-		}
-	} while (close < v->stop);
-
-	*coldp = cold;
-	return REG_NOMATCH;
-}
-
-/*
- - zapsubs - initialize the subexpression matches to "no match"
- ^ static VOID zapsubs(regmatch_t *, size_t);
- */
-static VOID
-zapsubs(p, n)
-regmatch_t *p;
-size_t n;
-{
-	size_t i;
-
-	for (i = n-1; i > 0; i--) {
-		p[i].rm_so = -1;
-		p[i].rm_eo = -1;
-	}
-}
-
-/*
- - zapmem - initialize the retry memory of a subtree to zeros
- ^ static VOID zapmem(struct vars *, struct subre *);
- */
-static VOID
-zapmem(v, t)
-struct vars *v;
-struct subre *t;
-{
-	if (t == NULL)
-		return;
-
-	assert(v->mem != NULL);
-	v->mem[t->retry] = 0;
-	if (t->op == '(') {
-		assert(t->subno > 0);
-		v->pmatch[t->subno].rm_so = -1;
-		v->pmatch[t->subno].rm_eo = -1;
-	}
-
-	if (t->left != NULL)
-		zapmem(v, t->left);
-	if (t->right != NULL)
-		zapmem(v, t->right);
-}
-
-/*
- - subset - set any subexpression relevant to a successful subre
- ^ static VOID subset(struct vars *, struct subre *, chr *, chr *);
- */
-static VOID
-subset(v, sub, begin, end)
-struct vars *v;
-struct subre *sub;
-chr *begin;
-chr *end;
-{
-	int n = sub->subno;
-
-	assert(n > 0);
-	if ((size_t)n >= v->nmatch)
-		return;
-
-	MDEBUG(("setting %d\n", n));
-	v->pmatch[n].rm_so = OFF(begin);
-	v->pmatch[n].rm_eo = OFF(end);
-}
-
-/*
- - dissect - determine subexpression matches (uncomplicated case)
- ^ static int dissect(struct vars *, struct subre *, chr *, chr *);
- */
-static int			/* regexec return code */
-dissect(v, t, begin, end)
-struct vars *v;
-struct subre *t;
-chr *begin;			/* beginning of relevant substring */
-chr *end;			/* end of same */
-{
-	assert(t != NULL);
-	MDEBUG(("dissect %ld-%ld\n", LOFF(begin), LOFF(end)));
-
-	switch (t->op) {
-	case '=':		/* terminal node */
-		assert(t->left == NULL && t->right == NULL);
-		return REG_OKAY;	/* no action, parent did the work */
-		break;
-	case '|':		/* alternation */
-		assert(t->left != NULL);
-		return altdissect(v, t, begin, end);
-		break;
-	case 'b':		/* back ref -- shouldn't be calling us! */
-		return REG_ASSERT;
-		break;
-	case '.':		/* concatenation */
-		assert(t->left != NULL && t->right != NULL);
-		return condissect(v, t, begin, end);
-		break;
-	case '(':		/* capturing */
-		assert(t->left != NULL && t->right == NULL);
-		assert(t->subno > 0);
-		subset(v, t, begin, end);
-		return dissect(v, t->left, begin, end);
-		break;
-	default:
-		return REG_ASSERT;
-		break;
-	}
-}
-
-/*
- - condissect - determine concatenation subexpression matches (uncomplicated)
- ^ static int condissect(struct vars *, struct subre *, chr *, chr *);
- */
-static int			/* regexec return code */
-condissect(v, t, begin, end)
-struct vars *v;
-struct subre *t;
-chr *begin;			/* beginning of relevant substring */
-chr *end;			/* end of same */
-{
-	struct dfa *d;
-	struct dfa *d2;
-	chr *mid;
-	int i;
-	int shorter = (t->left->flags&SHORTER) ? 1 : 0;
-	chr *stop = (shorter) ? end : begin;
-
-	assert(t->op == '.');
-	assert(t->left != NULL && t->left->cnfa.nstates > 0);
-	assert(t->right != NULL && t->right->cnfa.nstates > 0);
-
-	d = newdfa(v, &t->left->cnfa, &v->g->cmap, &v->dfa1);
-	NOERR();
-	d2 = newdfa(v, &t->right->cnfa, &v->g->cmap, &v->dfa2);
-	if (ISERR()) {
-		assert(d2 == NULL);
-		freedfa(d);
-		return v->err;
-	}
-
-	/* pick a tentative midpoint */
-	if (shorter)
-		mid = shortest(v, d, begin, begin, end, (chr **)NULL,
-								(int *)NULL);
-	else
-		mid = longest(v, d, begin, end, (int *)NULL);
-	if (mid == NULL) {
-		freedfa(d);
-		freedfa(d2);
-		return REG_ASSERT;
-	}
-	MDEBUG(("tentative midpoint %ld\n", LOFF(mid)));
-
-	/* iterate until satisfaction or failure */
-	while (longest(v, d2, mid, end, (int *)NULL) != end) {
-		/* that midpoint didn't work, find a new one */
-		if (mid == stop) {
-			/* all possibilities exhausted! */
-			MDEBUG(("no midpoint!\n"));
-			freedfa(d);
-			freedfa(d2);
-			return REG_ASSERT;
-		}
-		if (shorter)
-			mid = shortest(v, d, begin, mid+1, end, (chr **)NULL,
-								(int *)NULL);
-		else
-			mid = longest(v, d, begin, mid-1, (int *)NULL);
-		if (mid == NULL) {
-			/* failed to find a new one! */
-			MDEBUG(("failed midpoint!\n"));
-			freedfa(d);
-			freedfa(d2);
-			return REG_ASSERT;
-		}
-		MDEBUG(("new midpoint %ld\n", LOFF(mid)));
-	}
-
-	/* satisfaction */
-	MDEBUG(("successful\n"));
-	freedfa(d);
-	freedfa(d2);
-	i = dissect(v, t->left, begin, mid);
-	if (i != REG_OKAY)
-		return i;
-	return dissect(v, t->right, mid, end);
-}
-
-/*
- - altdissect - determine alternative subexpression matches (uncomplicated)
- ^ static int altdissect(struct vars *, struct subre *, chr *, chr *);
- */
-static int			/* regexec return code */
-altdissect(v, t, begin, end)
-struct vars *v;
-struct subre *t;
-chr *begin;			/* beginning of relevant substring */
-chr *end;			/* end of same */
-{
-	struct dfa *d;
-	int i;
-
-	assert(t != NULL);
-	assert(t->op == '|');
-
-	for (i = 0; t != NULL; t = t->right, i++) {
-		MDEBUG(("trying %dth\n", i));
-		assert(t->left != NULL && t->left->cnfa.nstates > 0);
-		d = newdfa(v, &t->left->cnfa, &v->g->cmap, &v->dfa1);
-		if (ISERR())
-			return v->err;
-		if (longest(v, d, begin, end, (int *)NULL) == end) {
-			MDEBUG(("success\n"));
-			freedfa(d);
-			return dissect(v, t->left, begin, end);
-		}
-		freedfa(d);
-	}
-	return REG_ASSERT;	/* none of them matched?!? */
-}
-
-/*
- - cdissect - determine subexpression matches (with complications)
- * The retry memory stores the offset of the trial midpoint from begin, 
- * plus 1 so that 0 uniquely means "clean slate".
- ^ static int cdissect(struct vars *, struct subre *, chr *, chr *);
- */
-static int			/* regexec return code */
-cdissect(v, t, begin, end)
-struct vars *v;
-struct subre *t;
-chr *begin;			/* beginning of relevant substring */
-chr *end;			/* end of same */
-{
-	int er;
-
-	assert(t != NULL);
-	MDEBUG(("cdissect %ld-%ld %c\n", LOFF(begin), LOFF(end), t->op));
-
-	switch (t->op) {
-	case '=':		/* terminal node */
-		assert(t->left == NULL && t->right == NULL);
-		return REG_OKAY;	/* no action, parent did the work */
-		break;
-	case '|':		/* alternation */
-		assert(t->left != NULL);
-		return caltdissect(v, t, begin, end);
-		break;
-	case 'b':		/* back ref -- shouldn't be calling us! */
-		assert(t->left == NULL && t->right == NULL);
-		return cbrdissect(v, t, begin, end);
-		break;
-	case '.':		/* concatenation */
-		assert(t->left != NULL && t->right != NULL);
-		return ccondissect(v, t, begin, end);
-		break;
-	case '(':		/* capturing */
-		assert(t->left != NULL && t->right == NULL);
-		assert(t->subno > 0);
-		er = cdissect(v, t->left, begin, end);
-		if (er == REG_OKAY)
-			subset(v, t, begin, end);
-		return er;
-		break;
-	default:
-		return REG_ASSERT;
-		break;
-	}
-}
-
-/*
- - ccondissect - concatenation subexpression matches (with complications)
- * The retry memory stores the offset of the trial midpoint from begin, 
- * plus 1 so that 0 uniquely means "clean slate".
- ^ static int ccondissect(struct vars *, struct subre *, chr *, chr *);
- */
-static int			/* regexec return code */
-ccondissect(v, t, begin, end)
-struct vars *v;
-struct subre *t;
-chr *begin;			/* beginning of relevant substring */
-chr *end;			/* end of same */
-{
-	struct dfa *d;
-	struct dfa *d2;
-	chr *mid;
-	int er;
-
-	assert(t->op == '.');
-	assert(t->left != NULL && t->left->cnfa.nstates > 0);
-	assert(t->right != NULL && t->right->cnfa.nstates > 0);
-
-	if (t->left->flags&SHORTER)		/* reverse scan */
-		return crevdissect(v, t, begin, end);
-
-	d = newdfa(v, &t->left->cnfa, &v->g->cmap, DOMALLOC);
-	if (ISERR())
-		return v->err;
-	d2 = newdfa(v, &t->right->cnfa, &v->g->cmap, DOMALLOC);
-	if (ISERR()) {
-		freedfa(d);
-		return v->err;
-	}
-	MDEBUG(("cconcat %d\n", t->retry));
-
-	/* pick a tentative midpoint */
-	if (v->mem[t->retry] == 0) {
-		mid = longest(v, d, begin, end, (int *)NULL);
-		if (mid == NULL) {
-			freedfa(d);
-			freedfa(d2);
-			return REG_NOMATCH;
-		}
-		MDEBUG(("tentative midpoint %ld\n", LOFF(mid)));
-		v->mem[t->retry] = (mid - begin) + 1;
-	} else {
-		mid = begin + (v->mem[t->retry] - 1);
-		MDEBUG(("working midpoint %ld\n", LOFF(mid)));
-	}
-
-	/* iterate until satisfaction or failure */
-	for (;;) {
-		/* try this midpoint on for size */
-		er = cdissect(v, t->left, begin, mid);
-		if (er == REG_OKAY &&
-				longest(v, d2, mid, end, (int *)NULL) == end &&
-				(er = cdissect(v, t->right, mid, end)) == 
-								REG_OKAY)
-			break;			/* NOTE BREAK OUT */
-		if (er != REG_OKAY && er != REG_NOMATCH) {
-			freedfa(d);
-			freedfa(d2);
-			return er;
-		}
-
-		/* that midpoint didn't work, find a new one */
-		if (mid == begin) {
-			/* all possibilities exhausted */
-			MDEBUG(("%d no midpoint\n", t->retry));
-			freedfa(d);
-			freedfa(d2);
-			return REG_NOMATCH;
-		}
-		mid = longest(v, d, begin, mid-1, (int *)NULL);
-		if (mid == NULL) {
-			/* failed to find a new one */
-			MDEBUG(("%d failed midpoint\n", t->retry));
-			freedfa(d);
-			freedfa(d2);
-			return REG_NOMATCH;
-		}
-		MDEBUG(("%d: new midpoint %ld\n", t->retry, LOFF(mid)));
-		v->mem[t->retry] = (mid - begin) + 1;
-		zapmem(v, t->left);
-		zapmem(v, t->right);
-	}
-
-	/* satisfaction */
-	MDEBUG(("successful\n"));
-	freedfa(d);
-	freedfa(d2);
-	return REG_OKAY;
-}
-
-/*
- - crevdissect - determine backref shortest-first subexpression matches
- * The retry memory stores the offset of the trial midpoint from begin, 
- * plus 1 so that 0 uniquely means "clean slate".
- ^ static int crevdissect(struct vars *, struct subre *, chr *, chr *);
- */
-static int			/* regexec return code */
-crevdissect(v, t, begin, end)
-struct vars *v;
-struct subre *t;
-chr *begin;			/* beginning of relevant substring */
-chr *end;			/* end of same */
-{
-	struct dfa *d;
-	struct dfa *d2;
-	chr *mid;
-	int er;
-
-	assert(t->op == '.');
-	assert(t->left != NULL && t->left->cnfa.nstates > 0);
-	assert(t->right != NULL && t->right->cnfa.nstates > 0);
-	assert(t->left->flags&SHORTER);
-
-	/* concatenation -- need to split the substring between parts */
-	d = newdfa(v, &t->left->cnfa, &v->g->cmap, DOMALLOC);
-	if (ISERR())
-		return v->err;
-	d2 = newdfa(v, &t->right->cnfa, &v->g->cmap, DOMALLOC);
-	if (ISERR()) {
-		freedfa(d);
-		return v->err;
-	}
-	MDEBUG(("crev %d\n", t->retry));
-
-	/* pick a tentative midpoint */
-	if (v->mem[t->retry] == 0) {
-		mid = shortest(v, d, begin, begin, end, (chr **)NULL, (int *)NULL);
-		if (mid == NULL) {
-			freedfa(d);
-			freedfa(d2);
-			return REG_NOMATCH;
-		}
-		MDEBUG(("tentative midpoint %ld\n", LOFF(mid)));
-		v->mem[t->retry] = (mid - begin) + 1;
-	} else {
-		mid = begin + (v->mem[t->retry] - 1);
-		MDEBUG(("working midpoint %ld\n", LOFF(mid)));
-	}
-
-	/* iterate until satisfaction or failure */
-	for (;;) {
-		/* try this midpoint on for size */
-		er = cdissect(v, t->left, begin, mid);
-		if (er == REG_OKAY &&
-				longest(v, d2, mid, end, (int *)NULL) == end &&
-				(er = cdissect(v, t->right, mid, end)) == 
-								REG_OKAY)
-			break;			/* NOTE BREAK OUT */
-		if (er != REG_OKAY && er != REG_NOMATCH) {
-			freedfa(d);
-			freedfa(d2);
-			return er;
-		}
-
-		/* that midpoint didn't work, find a new one */
-		if (mid == end) {
-			/* all possibilities exhausted */
-			MDEBUG(("%d no midpoint\n", t->retry));
-			freedfa(d);
-			freedfa(d2);
-			return REG_NOMATCH;
-		}
-		mid = shortest(v, d, begin, mid+1, end, (chr **)NULL, (int *)NULL);
-		if (mid == NULL) {
-			/* failed to find a new one */
-			MDEBUG(("%d failed midpoint\n", t->retry));
-			freedfa(d);
-			freedfa(d2);
-			return REG_NOMATCH;
-		}
-		MDEBUG(("%d: new midpoint %ld\n", t->retry, LOFF(mid)));
-		v->mem[t->retry] = (mid - begin) + 1;
-		zapmem(v, t->left);
-		zapmem(v, t->right);
-	}
-
-	/* satisfaction */
-	MDEBUG(("successful\n"));
-	freedfa(d);
-	freedfa(d2);
-	return REG_OKAY;
-}
-
-/*
- - cbrdissect - determine backref subexpression matches
- ^ static int cbrdissect(struct vars *, struct subre *, chr *, chr *);
- */
-static int			/* regexec return code */
-cbrdissect(v, t, begin, end)
-struct vars *v;
-struct subre *t;
-chr *begin;			/* beginning of relevant substring */
-chr *end;			/* end of same */
-{
-	int i;
-	int n = t->subno;
-	size_t len;
-	chr *paren;
-	chr *p;
-	chr *stop;
-	int min = t->min;
-	int max = t->max;
-
-	assert(t != NULL);
-	assert(t->op == 'b');
-	assert(n >= 0);
-	assert((size_t)n < v->nmatch);
-
-	MDEBUG(("cbackref n%d %d{%d-%d}\n", t->retry, n, min, max));
-
-	if (v->pmatch[n].rm_so == -1)
-		return REG_NOMATCH;
-	paren = v->start + v->pmatch[n].rm_so;
-	len = v->pmatch[n].rm_eo - v->pmatch[n].rm_so;
-
-	/* no room to maneuver -- retries are pointless */
-	if (v->mem[t->retry])
-		return REG_NOMATCH;
-	v->mem[t->retry] = 1;
-
-	/* special-case zero-length string */
-	if (len == 0) {
-		if (begin == end)
-			return REG_OKAY;
-		return REG_NOMATCH;
-	}
-
-	/* and too-short string */
-	assert(end >= begin);
-	if ((size_t)(end - begin) < len)
-		return REG_NOMATCH;
-	stop = end - len;
-
-	/* count occurrences */
-	i = 0;
-	for (p = begin; p <= stop && (i < max || max == INFINITY); p += len) {
-		if ((*v->g->compare)(paren, p, len) != 0)
-				break;
-		i++;
-	}
-	MDEBUG(("cbackref found %d\n", i));
-
-	/* and sort it out */
-	if (p != end)			/* didn't consume all of it */
-		return REG_NOMATCH;
-	if (min <= i && (i <= max || max == INFINITY))
-		return REG_OKAY;
-	return REG_NOMATCH;		/* out of range */
-}
-
-/*
- - caltdissect - determine alternative subexpression matches (w. complications)
- ^ static int caltdissect(struct vars *, struct subre *, chr *, chr *);
- */
-static int			/* regexec return code */
-caltdissect(v, t, begin, end)
-struct vars *v;
-struct subre *t;
-chr *begin;			/* beginning of relevant substring */
-chr *end;			/* end of same */
-{
-	struct dfa *d;
-	int er;
-#	define	UNTRIED	0	/* not yet tried at all */
-#	define	TRYING	1	/* top matched, trying submatches */
-#	define	TRIED	2	/* top didn't match or submatches exhausted */
-
-	if (t == NULL)
-		return REG_NOMATCH;
-	assert(t->op == '|');
-	if (v->mem[t->retry] == TRIED)
-		return caltdissect(v, t->right, begin, end);
-
-	MDEBUG(("calt n%d\n", t->retry));
-	assert(t->left != NULL);
-
-	if (v->mem[t->retry] == UNTRIED) {
-		d = newdfa(v, &t->left->cnfa, &v->g->cmap, DOMALLOC);
-		if (ISERR())
-			return v->err;
-		if (longest(v, d, begin, end, (int *)NULL) != end) {
-			freedfa(d);
-			v->mem[t->retry] = TRIED;
-			return caltdissect(v, t->right, begin, end);
-		}
-		freedfa(d);
-		MDEBUG(("calt matched\n"));
-		v->mem[t->retry] = TRYING;
-	}
-
-	er = cdissect(v, t->left, begin, end);
-	if (er != REG_NOMATCH)
-		return er;
-
-	v->mem[t->retry] = TRIED;
-	return caltdissect(v, t->right, begin, end);
-}
-
-
-
-#include "rege_dfa.c"
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regfree.c b/3rdparty/wxwidgets3.0-3.0.1/src/regex/regfree.c
deleted file mode 100644
index d4590075a4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regfree.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * regfree - free an RE
- *
- * Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
- * 
- * Development of this software was funded, in part, by Cray Research Inc.,
- * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
- * Corporation, none of whom are responsible for the results.  The author
- * thanks all of them. 
- * 
- * Redistribution and use in source and binary forms -- with or without
- * modification -- are permitted for any purpose, provided that
- * redistributions in source form retain this entire copyright notice and
- * indicate the origin and nature of any modifications.
- * 
- * I'd appreciate being given credit for this package in the documentation
- * of software which uses it, but that is not a requirement.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *
- *
- * You might think that this could be incorporated into regcomp.c, and
- * that would be a reasonable idea... except that this is a generic
- * function (with a generic name), applicable to all compiled REs
- * regardless of the size of their characters, whereas the stuff in
- * regcomp.c gets compiled once per character size.
- */
-
-#include "regguts.h"
-
-/*
- - regfree - free an RE (generic function, punts to RE-specific function)
- *
- * Ignoring invocation with NULL is a convenience.
- */
-VOID
-wx_regfree(re)
-regex_t *re;
-{
-	if (re == NULL)
-		return;
-	(*((struct fns *)re->re_fns)->free)(re);
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regfronts.c b/3rdparty/wxwidgets3.0-3.0.1/src/regex/regfronts.c
deleted file mode 100644
index 82f48e2abc..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regfronts.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * regcomp and regexec - front ends to re_ routines
- *
- * Mostly for implementation of backward-compatibility kludges.  Note
- * that these routines exist ONLY in char versions.
- *
- * Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
- * 
- * Development of this software was funded, in part, by Cray Research Inc.,
- * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
- * Corporation, none of whom are responsible for the results.  The author
- * thanks all of them. 
- * 
- * Redistribution and use in source and binary forms -- with or without
- * modification -- are permitted for any purpose, provided that
- * redistributions in source form retain this entire copyright notice and
- * indicate the origin and nature of any modifications.
- * 
- * I'd appreciate being given credit for this package in the documentation
- * of software which uses it, but that is not a requirement.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#include "regguts.h"
-
-/*
- - regcomp - compile regular expression
- */
-int
-regcomp(re, str, flags)
-regex_t *re;
-CONST char *str;
-int flags;
-{
-	size_t len;
-	int f = flags;
-
-	if (f®_PEND) {
-		len = re->re_endp - str;
-		f &= ~REG_PEND;
-	} else
-		len = strlen(str);
-
-	return re_comp(re, str, len, f);
-}
-
-/*
- - regexec - execute regular expression
- */
-int
-regexec(re, str, nmatch, pmatch, flags)
-regex_t *re;
-CONST char *str;
-size_t nmatch;
-regmatch_t pmatch[];
-int flags;
-{
-	CONST char *start;
-	size_t len;
-	int f = flags;
-
-	if (f®_STARTEND) {
-		start = str + pmatch[0].rm_so;
-		len = pmatch[0].rm_eo - pmatch[0].rm_so;
-		f &= ~REG_STARTEND;
-	} else {
-		start = str;
-		len = strlen(str);
-	}
-
-	return re_exec(re, start, len, nmatch, pmatch, f);
-}
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regguts.h b/3rdparty/wxwidgets3.0-3.0.1/src/regex/regguts.h
deleted file mode 100644
index ec1b8aa221..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/regguts.h
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * Internal interface definitions, etc., for the reg package
- *
- * Copyright (c) 1998, 1999 Henry Spencer.  All rights reserved.
- * 
- * Development of this software was funded, in part, by Cray Research Inc.,
- * UUNET Communications Services Inc., Sun Microsystems Inc., and Scriptics
- * Corporation, none of whom are responsible for the results.  The author
- * thanks all of them. 
- * 
- * Redistribution and use in source and binary forms -- with or without
- * modification -- are permitted for any purpose, provided that
- * redistributions in source form retain this entire copyright notice and
- * indicate the origin and nature of any modifications.
- * 
- * I'd appreciate being given credit for this package in the documentation
- * of software which uses it, but that is not a requirement.
- * 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * HENRY SPENCER BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-
-/*
- * Environmental customization.  It should not (I hope) be necessary to
- * alter the file you are now reading -- regcustom.h should handle it all,
- * given care here and elsewhere.
- */
-#include "regcustom.h"
-
-/*
- * Things that regcustom.h might override.
- */
-
-/* standard header files (NULL is a reasonable indicator for them) */
-#ifndef NULL
-#include 
-#include 
-#include 
-#include 
-#include 
-#endif
-
-/* assertions */
-#ifndef assert
-#	ifndef REG_DEBUG
-#	ifndef NDEBUG
-#	define	NDEBUG		/* no assertions */
-#	endif
-#	endif
-#include 
-#endif
-
-/* voids */
-#ifndef VOID
-#define	VOID	void			/* for function return values */
-#endif
-#ifndef DISCARD
-#define	DISCARD	VOID			/* for throwing values away */
-#endif
-#ifndef PVOID
-#define	PVOID	VOID *			/* generic pointer */
-#endif
-#ifndef VS
-#define	VS(x)	((PVOID)(x))		/* cast something to generic ptr */
-#endif
-#ifndef NOPARMS
-#define	NOPARMS	VOID			/* for empty parm lists */
-#endif
-
-/* const */
-#ifndef CONST
-#define	CONST	const			/* for old compilers, might be empty */
-#endif
-
-/* function-pointer declarator */
-#ifndef FUNCPTR
-#if __STDC__ >= 1
-#define	FUNCPTR(name, args)	(*name)args
-#else
-#define	FUNCPTR(name, args)	(*name)()
-#endif
-#endif
-
-/* memory allocation */
-#ifndef MALLOC
-#define	MALLOC(n)	malloc(n)
-#endif
-#ifndef REALLOC
-#define	REALLOC(p, n)	realloc(VS(p), n)
-#endif
-#ifndef FREE
-#define	FREE(p)		free(VS(p))
-#endif
-
-/* want size of a char in bits, and max value in bounded quantifiers */
-#ifndef CHAR_BIT
-#include 
-#endif
-#ifndef _POSIX2_RE_DUP_MAX
-#define	_POSIX2_RE_DUP_MAX	255	/* normally from  */
-#endif
-
-
-
-/*
- * misc
- */
-
-#define	NOTREACHED	0
-#define	xxx		1
-
-#define	DUPMAX	_POSIX2_RE_DUP_MAX
-#define	INFINITY	(DUPMAX+1)
-
-#define	REMAGIC	0xfed7		/* magic number for main struct */
-
-
-
-/*
- * debugging facilities
- */
-#ifdef REG_DEBUG
-/* FDEBUG does finite-state tracing */
-#define	FDEBUG(arglist)	{ if (v->eflags®_FTRACE) printf arglist; }
-/* MDEBUG does higher-level tracing */
-#define	MDEBUG(arglist)	{ if (v->eflags®_MTRACE) printf arglist; }
-#else
-#define	FDEBUG(arglist)	{}
-#define	MDEBUG(arglist)	{}
-#endif
-
-
-
-/*
- * bitmap manipulation
- */
-#define	UBITS	(CHAR_BIT * sizeof(unsigned))
-#define	BSET(uv, sn)	((uv)[(sn)/UBITS] |= (unsigned)1 << ((sn)%UBITS))
-#define	ISBSET(uv, sn)	((uv)[(sn)/UBITS] & ((unsigned)1 << ((sn)%UBITS)))
-
-
-
-/*
- * We dissect a chr into byts for colormap table indexing.  Here we define
- * a byt, which will be the same as a byte on most machines...  The exact
- * size of a byt is not critical, but about 8 bits is good, and extraction
- * of 8-bit chunks is sometimes especially fast.
- */
-#ifndef BYTBITS
-#define	BYTBITS	8		/* bits in a byt */
-#endif
-#define	BYTTAB	(1<flags&FREECOL)
-	union tree *block;	/* block of solid color, if any */
-};
-
-/* the color map itself */
-struct colormap {
-	int magic;
-#		define	CMMAGIC	0x876
-	struct vars *v;			/* for compile error reporting */
-	size_t ncds;			/* number of colordescs */
-	size_t max;			/* highest in use */
-	color free;			/* beginning of free chain (if non-0) */
-	struct colordesc *cd;
-#	define	CDEND(cm)	(&(cm)->cd[(cm)->max + 1])
-#		define	NINLINECDS	((size_t)10)
-	struct colordesc cdspace[NINLINECDS];
-	union tree tree[NBYTS];		/* tree top, plus fill blocks */
-};
-
-/* optimization magic to do fast chr->color mapping */
-#define	B0(c)	((c) & BYTMASK)
-#define	B1(c)	(((c)>>BYTBITS) & BYTMASK)
-#define	B2(c)	(((c)>>(2*BYTBITS)) & BYTMASK)
-#define	B3(c)	(((c)>>(3*BYTBITS)) & BYTMASK)
-#if NBYTS == 1
-#define	GETCOLOR(cm, c)	((cm)->tree->tcolor[B0(c)])
-#endif
-/* beware, for NBYTS>1, GETCOLOR() is unsafe -- 2nd arg used repeatedly */
-#if NBYTS == 2
-#define	GETCOLOR(cm, c)	((cm)->tree->tptr[B1(c)]->tcolor[B0(c)])
-#endif
-#if NBYTS == 4
-#define	GETCOLOR(cm, c)	((cm)->tree->tptr[B3(c)]->tptr[B2(c)]->tptr[B1(c)]->tcolor[B0(c)])
-#endif
-
-
-
-/*
- * Interface definitions for locale-interface functions in locale.c.
- * Multi-character collating elements (MCCEs) cause most of the trouble.
- */
-struct cvec {
-	int nchrs;		/* number of chrs */
-	int chrspace;		/* number of chrs possible */
-	chr *chrs;		/* pointer to vector of chrs */
-	int nranges;		/* number of ranges (chr pairs) */
-	int rangespace;		/* number of chrs possible */
-	chr *ranges;		/* pointer to vector of chr pairs */
-	int nmcces;		/* number of MCCEs */
-	int mccespace;		/* number of MCCEs possible */
-	int nmccechrs;		/* number of chrs used for MCCEs */
-	chr *mcces[1];		/* pointers to 0-terminated MCCEs */
-				/* and both batches of chrs are on the end */
-};
-
-/* caution:  this value cannot be changed easily */
-#define	MAXMCCE	2		/* length of longest MCCE */
-
-
-
-/*
- * definitions for NFA internal representation
- *
- * Having a "from" pointer within each arc may seem redundant, but it
- * saves a lot of hassle.
- */
-struct state;
-
-struct arc {
-	int type;
-#		define	ARCFREE	'\0'
-	color co;
-	struct state *from;	/* where it's from (and contained within) */
-	struct state *to;	/* where it's to */
-	struct arc *outchain;	/* *from's outs chain or free chain */
-#	define	freechain	outchain
-	struct arc *inchain;	/* *to's ins chain */
-	struct arc *colorchain;	/* color's arc chain */
-};
-
-struct arcbatch {		/* for bulk allocation of arcs */
-	struct arcbatch *next;
-#	define	ABSIZE	10
-	struct arc a[ABSIZE];
-};
-
-struct state {
-	int no;
-#		define	FREESTATE	(-1)
-	char flag;		/* marks special states */
-	int nins;		/* number of inarcs */
-	struct arc *ins;	/* chain of inarcs */
-	int nouts;		/* number of outarcs */
-	struct arc *outs;	/* chain of outarcs */
-	struct arc *free;	/* chain of free arcs */
-	struct state *tmp;	/* temporary for traversal algorithms */
-	struct state *next;	/* chain for traversing all */
-	struct state *prev;	/* back chain */
-	struct arcbatch oas;	/* first arcbatch, avoid malloc in easy case */
-	int noas;		/* number of arcs used in first arcbatch */
-};
-
-struct nfa {
-	struct state *pre;	/* pre-initial state */
-	struct state *init;	/* initial state */
-	struct state *final;	/* final state */
-	struct state *post;	/* post-final state */
-	int nstates;		/* for numbering states */
-	struct state *states;	/* state-chain header */
-	struct state *slast;	/* tail of the chain */
-	struct state *free;	/* free list */
-	struct colormap *cm;	/* the color map */
-	color bos[2];		/* colors, if any, assigned to BOS and BOL */
-	color eos[2];		/* colors, if any, assigned to EOS and EOL */
-	struct vars *v;		/* simplifies compile error reporting */
-	struct nfa *parent;	/* parent NFA, if any */
-};
-
-
-
-/*
- * definitions for compacted NFA
- */
-struct carc {
-	color co;		/* COLORLESS is list terminator */
-	int to;			/* state number */
-};
-
-struct cnfa {
-	int nstates;		/* number of states */
-	int ncolors;		/* number of colors */
-	int flags;
-#		define	HASLACONS	01	/* uses lookahead constraints */
-	int pre;		/* setup state number */
-	int post;		/* teardown state number */
-	color bos[2];		/* colors, if any, assigned to BOS and BOL */
-	color eos[2];		/* colors, if any, assigned to EOS and EOL */
-	struct carc **states;	/* vector of pointers to outarc lists */
-	struct carc *arcs;	/* the area for the lists */
-};
-#define	ZAPCNFA(cnfa)	((cnfa).nstates = 0)
-#define	NULLCNFA(cnfa)	((cnfa).nstates == 0)
-
-
-
-/*
- * subexpression tree
- */
-struct subre {
-	char op;		/* '|', '.' (concat), 'b' (backref), '(', '=' */
-	char flags;
-#		define	LONGER	01	/* prefers longer match */
-#		define	SHORTER	02	/* prefers shorter match */
-#		define	MIXED	04	/* mixed preference below */
-#		define	CAP	010	/* capturing parens below */
-#		define	BACKR	020	/* back reference below */
-#		define	INUSE	0100	/* in use in final tree */
-#		define	LOCAL	03	/* bits which may not propagate up */
-#		define	LMIX(f)	((f)<<2)	/* LONGER -> MIXED */
-#		define	SMIX(f)	((f)<<1)	/* SHORTER -> MIXED */
-#		define	UP(f)	(((f)&~LOCAL) | (LMIX(f) & SMIX(f) & MIXED))
-#		define	MESSY(f)	((f)&(MIXED|CAP|BACKR))
-#		define	PREF(f)	((f)&LOCAL)
-#		define	PREF2(f1, f2)	((PREF(f1) != 0) ? PREF(f1) : PREF(f2))
-#		define	COMBINE(f1, f2)	(UP((f1)|(f2)) | PREF2(f1, f2))
-	short retry;		/* index into retry memory */
-	int subno;		/* subexpression number (for 'b' and '(') */
-	short min;		/* min repetitions, for backref only */
-	short max;		/* max repetitions, for backref only */
-	struct subre *left;	/* left child, if any (also freelist chain) */
-	struct subre *right;	/* right child, if any */
-	struct state *begin;	/* outarcs from here... */
-	struct state *end;	/* ...ending in inarcs here */
-	struct cnfa cnfa;	/* compacted NFA, if any */
-	struct subre *chain;	/* for bookkeeping and error cleanup */
-};
-
-
-
-/*
- * table of function pointers for generic manipulation functions
- * A regex_t's re_fns points to one of these.
- */
-struct fns {
-	VOID FUNCPTR(free, (regex_t *));
-};
-
-
-
-/*
- * the insides of a regex_t, hidden behind a void *
- */
-struct guts {
-	int magic;
-#		define	GUTSMAGIC	0xfed9
-	int cflags;		/* copy of compile flags */
-	long info;		/* copy of re_info */
-	size_t nsub;		/* copy of re_nsub */
-	struct subre *tree;
-	struct cnfa search;	/* for fast preliminary search */
-	int ntree;
-	struct colormap cmap;
-	int FUNCPTR(compare, (CONST chr *, CONST chr *, size_t));
-	struct subre *lacons;	/* lookahead-constraint vector */
-	int nlacons;		/* size of lacons */
-};
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/splice.sh b/3rdparty/wxwidgets3.0-3.0.1/src/regex/splice.sh
deleted file mode 100755
index 88e776c850..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/splice.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-#############################################################################
-# Name:        splice
-# Purpose:     Splice a marked section of regcustom.h into regex.h
-# Author:      Mike Wetherell
-# Copyright:   (c) 2004 Mike Wetherell
-# Licence:     wxWindows licence
-#############################################################################
-
-#
-# Works by greping for the marks then passing their line numbers to sed. Which
-# is slighly the long way round, but allows some error checking.
-#
-
-SRC=regcustom.h
-DST=regex.h
-MARK1='^/\* --- begin --- \*/$'
-MARK2='^/\* --- end --- \*/$'
-PROG=`basename $0`
-TMP=$DST.tmp
-
-# findline(pattern, file)
-# Prints the line number of the 1st line matching the pattern in the file
-#
-findline() {
-    if ! LINE=`grep -n -- "$1" "$2"`; then
-        echo "$PROG: marker '$1' not found in '$2'" >&2
-        return 1
-    fi
-    echo $LINE | sed -n '1s/[^0-9].*//p'    # take just the line number
-}
-
-# findmarkers([out] line1, [out] line2, pattern1, pattern2, file)
-# Returns (via the variables named in the 1st two parameters) the line
-# numbers of the lines matching the patterns in file. Checks pattern1 comes
-# before pattern2.
-#
-findmarkers() {
-    if ! LINE1=`findline "$3" "$5"` || ! LINE2=`findline "$4" "$5"`; then
-        return 1
-    fi
-    if [ $LINE1 -ge $LINE2 ]; then
-        echo "$PROG: marker '$3' not before '$4' in '$5'" >&2
-        return 1
-    fi
-    eval $1=$LINE1
-    eval $2=$LINE2
-}
-
-# find markers
-#
-if findmarkers SRCLINE1 SRCLINE2 "$MARK1" "$MARK2" $SRC &&
-   findmarkers DSTLINE1 DSTLINE2 "$MARK1" "$MARK2" $DST
-then
-    # do splice
-    #
-    if (sed $DSTLINE1,\$d $DST &&
-        sed -n $SRCLINE1,${SRCLINE2}p $SRC &&
-        sed 1,${DSTLINE2}d $DST) > $TMP
-    then
-        mv $TMP $DST
-        exit 0
-    else
-        rm $TMP
-    fi
-fi
-
-exit 1
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/regex/tclUniData.c b/3rdparty/wxwidgets3.0-3.0.1/src/regex/tclUniData.c
deleted file mode 100644
index b5525dce9e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/regex/tclUniData.c
+++ /dev/null
@@ -1,903 +0,0 @@
-/*
- * tclUniData.c --
- *
- *	Declarations of Unicode character information tables.  This file is
- *	automatically generated by the tools/uniParse.tcl script.  Do not
- *	modify this file by hand.
- *
- * Copyright (c) 1998 by Scriptics Corporation.
- * All rights reserved.
- *
- */
-
-/*
- * A 16-bit Unicode character is split into two parts in order to index
- * into the following tables.  The lower OFFSET_BITS comprise an offset
- * into a page of characters.  The upper bits comprise the page number.
- */
-
-#define OFFSET_BITS 5
-
-/*
- * The pageMap is indexed by page number and returns an alternate page number
- * that identifies a unique page of characters.  Many Unicode characters map
- * to the same alternate page number.
- */
-
-static unsigned char pageMap[] = {
-    0, 1, 2, 3, 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 7, 15, 16, 17, 
-    18, 19, 20, 21, 22, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 7, 32, 
-    7, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 47, 
-    48, 49, 50, 51, 52, 35, 47, 53, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 
-    58, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 80, 81, 
-    84, 85, 80, 86, 87, 88, 89, 90, 91, 92, 35, 93, 94, 95, 35, 96, 97, 
-    98, 99, 100, 101, 102, 35, 47, 103, 104, 35, 35, 105, 106, 107, 47, 
-    47, 108, 47, 47, 109, 47, 110, 111, 47, 112, 47, 113, 114, 115, 116, 
-    114, 47, 117, 118, 35, 47, 47, 119, 90, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 120, 121, 47, 47, 122, 
-    35, 35, 35, 35, 47, 123, 124, 125, 126, 47, 127, 128, 47, 129, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 7, 7, 7, 7, 130, 7, 7, 131, 132, 133, 134, 
-    135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 
-    149, 150, 151, 152, 153, 154, 155, 156, 156, 156, 156, 156, 156, 156, 
-    157, 158, 159, 160, 161, 162, 35, 35, 35, 160, 163, 164, 165, 166, 
-    167, 168, 169, 160, 160, 160, 160, 170, 171, 172, 173, 174, 160, 160, 
-    175, 35, 35, 35, 35, 176, 177, 178, 179, 180, 181, 35, 35, 160, 160, 
-    160, 160, 160, 160, 160, 160, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    182, 160, 160, 155, 160, 160, 160, 160, 160, 160, 170, 183, 184, 185, 
-    90, 47, 186, 90, 47, 187, 188, 189, 47, 47, 190, 128, 35, 35, 191, 
-    192, 193, 194, 192, 195, 196, 197, 160, 160, 160, 198, 160, 160, 199, 
-    197, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 200, 35, 35, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 201, 35, 35, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    202, 203, 204, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 205, 35, 35, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 
-    206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 
-    206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 
-    206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 
-    206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 206, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 47, 47, 47, 47, 47, 47, 47, 47, 47, 208, 35, 35, 35, 35, 
-    35, 35, 209, 210, 211, 47, 47, 212, 213, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 214, 215, 47, 216, 47, 217, 218, 35, 219, 220, 221, 47, 
-    47, 47, 222, 223, 2, 224, 225, 226, 227, 228, 229, 230, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 231, 35, 232, 233, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 47, 
-    47, 208, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 47, 234, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 235, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 207, 
-    207, 207, 207, 236, 207, 207, 207, 207, 207, 207, 207, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 
-    35, 35, 35, 35, 35
-};
-
-/*
- * The groupMap is indexed by combining the alternate page number with
- * the page offset and returns a group number that identifies a unique
- * set of character attributes.
- */
-
-static unsigned char groupMap[] = {
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 3, 3, 4, 3, 3, 3, 5, 6, 3, 7, 3, 8, 
-    3, 3, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 3, 3, 7, 7, 7, 3, 3, 10, 10, 10, 
-    10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 
-    10, 10, 10, 10, 10, 10, 5, 3, 6, 11, 12, 11, 13, 13, 13, 13, 13, 13, 
-    13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 
-    13, 13, 13, 5, 7, 6, 7, 1, 2, 3, 4, 4, 4, 4, 14, 14, 11, 14, 15, 16, 
-    7, 8, 14, 11, 14, 7, 17, 17, 11, 18, 14, 3, 11, 17, 15, 19, 17, 17, 
-    17, 3, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 
-    10, 10, 10, 10, 10, 10, 10, 10, 7, 10, 10, 10, 10, 10, 10, 10, 15, 
-    13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 
-    13, 13, 13, 13, 13, 13, 7, 13, 13, 13, 13, 13, 13, 13, 20, 21, 22, 
-    21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 
-    22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 
-    21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 23, 24, 21, 22, 21, 
-    22, 21, 22, 15, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 
-    22, 21, 22, 15, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 
-    22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 
-    21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 25, 
-    21, 22, 21, 22, 21, 22, 26, 15, 27, 21, 22, 21, 22, 28, 21, 22, 29, 
-    29, 21, 22, 15, 30, 31, 32, 21, 22, 29, 33, 34, 35, 36, 21, 22, 15, 
-    15, 35, 37, 15, 38, 21, 22, 21, 22, 21, 22, 39, 21, 22, 39, 15, 15, 
-    21, 22, 39, 21, 22, 40, 40, 21, 22, 21, 22, 41, 21, 22, 15, 42, 21, 
-    22, 15, 43, 42, 42, 42, 42, 44, 45, 46, 44, 45, 46, 44, 45, 46, 21, 
-    22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 47, 21, 
-    22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 
-    15, 44, 45, 46, 21, 22, 48, 49, 21, 22, 21, 22, 21, 22, 21, 22, 0, 
-    0, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 
-    21, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 15, 15, 15, 50, 51, 15, 52, 52, 15, 53, 15, 
-    54, 15, 15, 15, 15, 52, 15, 15, 55, 15, 15, 15, 15, 56, 57, 15, 15, 
-    15, 15, 15, 57, 15, 15, 58, 15, 15, 59, 15, 15, 15, 15, 15, 15, 15, 
-    15, 15, 15, 60, 15, 15, 60, 15, 15, 15, 15, 60, 15, 61, 61, 15, 15, 
-    15, 15, 15, 15, 62, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 
-    15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 63, 
-    63, 63, 63, 63, 63, 63, 63, 63, 11, 11, 63, 63, 63, 63, 63, 63, 63, 
-    11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 63, 63, 11, 
-    11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 63, 63, 63, 63, 
-    63, 11, 11, 11, 11, 11, 11, 11, 11, 11, 63, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 
-    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 
-    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 65, 64, 64, 64, 64, 64, 64, 
-    64, 64, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 
-    64, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 11, 
-    0, 0, 0, 0, 63, 0, 0, 0, 3, 0, 0, 0, 0, 0, 11, 11, 66, 3, 67, 67, 67, 
-    0, 68, 0, 69, 69, 15, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 
-    10, 10, 10, 10, 10, 0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 70, 71, 
-    71, 71, 15, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 
-    13, 13, 13, 72, 13, 13, 13, 13, 13, 13, 13, 13, 13, 73, 74, 74, 0, 
-    75, 76, 77, 77, 77, 78, 79, 15, 0, 0, 21, 22, 21, 22, 21, 22, 21, 22, 
-    21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 80, 81, 47, 
-    15, 82, 83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 84, 84, 84, 84, 84, 84, 84, 
-    84, 84, 84, 84, 84, 84, 84, 84, 84, 10, 10, 10, 10, 10, 10, 10, 10, 
-    10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 
-    10, 10, 10, 10, 10, 10, 10, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 
-    13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 
-    13, 13, 13, 13, 13, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, 
-    81, 81, 81, 81, 21, 22, 14, 64, 64, 64, 64, 0, 85, 85, 0, 0, 21, 22, 
-    21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 
-    22, 77, 21, 22, 21, 22, 0, 0, 21, 22, 0, 0, 21, 22, 0, 0, 0, 21, 22, 
-    21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 
-    22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 
-    21, 22, 0, 0, 21, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 86, 86, 86, 86, 
-    86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 
-    86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 86, 
-    0, 0, 63, 3, 3, 3, 3, 3, 3, 0, 87, 87, 87, 87, 87, 87, 87, 87, 87, 
-    87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 
-    87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 87, 15, 0, 3, 8, 0, 0, 
-    0, 0, 0, 0, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 
-    64, 64, 64, 0, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 
-    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0, 64, 64, 64, 3, 64, 3, 64, 
-    64, 3, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 0, 0, 0, 0, 0, 42, 42, 42, 3, 3, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 3, 0, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 0, 0, 0, 0, 0, 63, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 3, 3, 3, 3, 0, 0, 64, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 3, 42, 64, 
-    64, 64, 64, 64, 64, 64, 85, 85, 64, 64, 64, 64, 64, 64, 63, 63, 64, 
-    64, 14, 64, 64, 64, 64, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 42, 42, 
-    42, 14, 14, 0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 0, 88, 42, 
-    64, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 0, 0, 64, 64, 64, 64, 
-    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 
-    64, 64, 64, 64, 64, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 42, 42, 42, 42, 42, 42, 64, 64, 64, 64, 64, 64, 64, 
-    64, 64, 64, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 
-    64, 89, 0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 0, 0, 64, 42, 89, 89, 89, 64, 64, 64, 64, 64, 64, 
-    64, 64, 89, 89, 89, 89, 64, 0, 0, 42, 64, 64, 64, 64, 0, 0, 0, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 64, 64, 3, 3, 9, 9, 9, 9, 9, 9, 
-    9, 9, 9, 9, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 
-    89, 89, 0, 42, 42, 42, 42, 42, 42, 42, 42, 0, 0, 42, 42, 0, 0, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 0, 42, 42, 42, 42, 42, 42, 42, 0, 42, 0, 0, 0, 42, 
-    42, 42, 42, 0, 0, 64, 0, 89, 89, 89, 64, 64, 64, 64, 0, 0, 89, 89, 
-    0, 0, 89, 89, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 0, 0, 0, 0, 42, 42, 
-    0, 42, 42, 42, 64, 64, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 42, 42, 
-    4, 4, 17, 17, 17, 17, 17, 17, 14, 0, 0, 0, 0, 0, 0, 0, 64, 0, 0, 42, 
-    42, 42, 42, 42, 42, 0, 0, 0, 0, 42, 42, 0, 0, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 
-    42, 42, 42, 42, 42, 42, 42, 0, 42, 42, 0, 42, 42, 0, 42, 42, 0, 0, 
-    64, 0, 89, 89, 89, 64, 64, 0, 0, 0, 0, 64, 64, 0, 0, 64, 64, 64, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 42, 42, 42, 0, 42, 0, 0, 0, 0, 0, 
-    0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 64, 64, 42, 42, 42, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 64, 64, 89, 0, 42, 42, 42, 42, 42, 42, 42, 
-    0, 42, 0, 42, 42, 42, 0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 42, 42, 42, 42, 42, 
-    42, 42, 0, 42, 42, 0, 42, 42, 42, 42, 42, 0, 0, 64, 42, 89, 89, 89, 
-    64, 64, 64, 64, 64, 0, 64, 64, 89, 0, 89, 89, 64, 0, 0, 42, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 0, 0, 0, 0, 0, 9, 9, 9, 9, 
-    9, 9, 9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 0, 42, 42, 42, 42, 42, 42, 42, 0, 42, 
-    42, 0, 0, 42, 42, 42, 42, 0, 0, 64, 42, 89, 64, 89, 64, 64, 64, 0, 
-    0, 0, 89, 89, 0, 0, 89, 89, 64, 0, 0, 0, 0, 0, 0, 0, 0, 64, 89, 0, 
-    0, 0, 0, 42, 42, 0, 42, 42, 42, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 
-    9, 9, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 89, 
-    0, 42, 42, 42, 42, 42, 42, 0, 0, 0, 42, 42, 42, 0, 42, 42, 42, 42, 
-    0, 0, 0, 42, 42, 0, 42, 0, 42, 42, 0, 0, 0, 42, 42, 0, 0, 0, 42, 42, 
-    42, 0, 0, 0, 42, 42, 42, 42, 42, 42, 42, 42, 0, 42, 42, 42, 0, 0, 0, 
-    0, 89, 89, 64, 89, 89, 0, 0, 0, 89, 89, 89, 0, 89, 89, 89, 64, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 89, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 17, 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 89, 89, 89, 0, 42, 42, 42, 42, 42, 42, 42, 42, 0, 42, 
-    42, 42, 0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 0, 42, 42, 42, 42, 42, 0, 0, 0, 0, 64, 64, 64, 89, 89, 
-    89, 89, 0, 64, 64, 64, 0, 64, 64, 64, 64, 0, 0, 0, 0, 0, 0, 0, 64, 
-    64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 42, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 
-    9, 9, 9, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 
-    89, 0, 42, 42, 42, 42, 42, 42, 42, 42, 0, 42, 42, 42, 0, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 42, 42, 42, 
-    42, 42, 0, 0, 0, 0, 89, 64, 89, 89, 89, 89, 89, 0, 64, 89, 89, 0, 89, 
-    89, 64, 64, 0, 0, 0, 0, 0, 0, 0, 89, 89, 0, 0, 0, 0, 0, 0, 0, 42, 0, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 0, 0, 0, 89, 89, 89, 64, 64, 
-    64, 0, 0, 89, 89, 89, 0, 89, 89, 89, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    89, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 89, 0, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 0, 0, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 42, 0, 0, 
-    42, 42, 42, 42, 42, 42, 42, 0, 0, 0, 64, 0, 0, 0, 0, 89, 89, 89, 64, 
-    64, 64, 0, 64, 0, 89, 89, 89, 89, 89, 89, 89, 89, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 89, 89, 3, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 64, 42, 42, 64, 64, 64, 64, 64, 64, 64, 0, 0, 0, 0, 4, 42, 42, 
-    42, 42, 42, 42, 63, 64, 64, 64, 64, 64, 64, 64, 64, 3, 9, 9, 9, 9, 
-    9, 9, 9, 9, 9, 9, 3, 3, 0, 0, 0, 0, 0, 42, 42, 0, 42, 0, 0, 42, 42, 
-    0, 42, 0, 0, 42, 0, 0, 0, 0, 0, 0, 42, 42, 42, 42, 0, 42, 42, 42, 42, 
-    42, 42, 42, 0, 42, 42, 42, 0, 42, 0, 42, 0, 0, 42, 42, 0, 42, 42, 42, 
-    42, 64, 42, 42, 64, 64, 64, 64, 64, 64, 0, 64, 64, 42, 0, 0, 42, 42, 
-    42, 42, 42, 0, 63, 0, 64, 64, 64, 64, 64, 64, 0, 0, 9, 9, 9, 9, 9, 
-    9, 9, 9, 9, 9, 0, 0, 42, 42, 0, 0, 42, 14, 14, 14, 3, 3, 3, 3, 3, 3, 
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 14, 14, 14, 14, 14, 64, 64, 14, 14, 14, 
-    14, 14, 14, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 17, 17, 17, 17, 17, 17, 17, 
-    17, 17, 17, 14, 64, 14, 64, 14, 64, 5, 6, 5, 6, 89, 89, 42, 42, 42, 
-    42, 42, 42, 42, 42, 0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 0, 0, 0, 0, 0, 0, 64, 64, 64, 64, 64, 64, 64, 
-    64, 64, 64, 64, 64, 64, 64, 89, 64, 64, 64, 64, 64, 3, 64, 64, 42, 
-    42, 42, 42, 0, 0, 0, 0, 64, 64, 64, 64, 64, 64, 64, 64, 0, 64, 64, 
-    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 
-    64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 
-    0, 14, 14, 14, 14, 14, 14, 14, 14, 64, 14, 14, 14, 14, 14, 14, 0, 0, 
-    14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 42, 0, 42, 
-    42, 42, 42, 42, 0, 42, 42, 0, 89, 64, 64, 64, 64, 89, 64, 0, 0, 0, 
-    64, 64, 89, 64, 0, 0, 0, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 3, 
-    3, 3, 3, 3, 3, 42, 42, 42, 42, 42, 42, 89, 89, 64, 64, 0, 0, 0, 0, 
-    0, 0, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 
-    77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 
-    77, 77, 77, 77, 77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    0, 0, 0, 0, 3, 0, 0, 0, 0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 
-    0, 0, 0, 0, 42, 42, 42, 42, 0, 0, 0, 0, 0, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 0, 0, 0, 0, 0, 42, 42, 42, 
-    42, 42, 42, 42, 0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 0, 42, 0, 42, 42, 42, 42, 0, 0, 42, 42, 42, 42, 42, 42, 42, 
-    0, 42, 0, 42, 42, 42, 42, 0, 0, 42, 42, 42, 42, 42, 42, 42, 0, 42, 
-    0, 42, 42, 42, 42, 0, 0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 0, 42, 0, 42, 42, 42, 42, 0, 0, 42, 42, 42, 42, 42, 42, 
-    42, 0, 42, 0, 42, 42, 42, 42, 0, 0, 42, 42, 42, 42, 42, 42, 42, 0, 
-    42, 42, 42, 42, 42, 42, 42, 0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 0, 0, 0, 0, 0, 0, 3, 3, 3, 3, 3, 3, 3, 
-    3, 9, 9, 9, 9, 9, 9, 9, 9, 9, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 
-    17, 0, 0, 0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 3, 3, 42, 42, 42, 42, 42, 
-    42, 42, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 5, 6, 0, 0, 0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    3, 3, 3, 90, 90, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 89, 89, 89, 64, 64, 64, 64, 64, 64, 64, 89, 89, 89, 89, 89, 
-    89, 89, 89, 64, 89, 89, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 
-    3, 3, 3, 3, 3, 3, 3, 4, 3, 0, 0, 0, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, 
-    3, 3, 3, 3, 8, 3, 3, 3, 3, 88, 88, 88, 88, 0, 9, 9, 9, 9, 9, 9, 9, 
-    9, 9, 9, 0, 0, 0, 0, 0, 0, 42, 42, 42, 63, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 0, 0, 0, 0, 0, 0, 
-    0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 64, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 21, 22, 21, 22, 21, 22, 21, 
-    22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 15, 15, 
-    15, 15, 15, 91, 0, 0, 0, 0, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 
-    21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 21, 22, 0, 
-    0, 0, 0, 0, 0, 92, 92, 92, 92, 92, 92, 92, 92, 93, 93, 93, 93, 93, 
-    93, 93, 93, 92, 92, 92, 92, 92, 92, 0, 0, 93, 93, 93, 93, 93, 93, 0, 
-    0, 92, 92, 92, 92, 92, 92, 92, 92, 93, 93, 93, 93, 93, 93, 93, 93, 
-    92, 92, 92, 92, 92, 92, 92, 92, 93, 93, 93, 93, 93, 93, 93, 93, 92, 
-    92, 92, 92, 92, 92, 0, 0, 93, 93, 93, 93, 93, 93, 0, 0, 15, 92, 15, 
-    92, 15, 92, 15, 92, 0, 93, 0, 93, 0, 93, 0, 93, 92, 92, 92, 92, 92, 
-    92, 92, 92, 93, 93, 93, 93, 93, 93, 93, 93, 94, 94, 95, 95, 95, 95, 
-    96, 96, 97, 97, 98, 98, 99, 99, 0, 0, 92, 92, 92, 92, 92, 92, 92, 92, 
-    100, 100, 100, 100, 100, 100, 100, 100, 92, 92, 92, 92, 92, 92, 92, 
-    92, 100, 100, 100, 100, 100, 100, 100, 100, 92, 92, 92, 92, 92, 92, 
-    92, 92, 100, 100, 100, 100, 100, 100, 100, 100, 92, 92, 15, 101, 15, 
-    0, 15, 15, 93, 93, 102, 102, 103, 11, 104, 11, 11, 11, 15, 101, 15, 
-    0, 15, 15, 105, 105, 105, 105, 103, 11, 11, 11, 92, 92, 15, 15, 0, 
-    0, 15, 15, 93, 93, 106, 106, 0, 11, 11, 11, 92, 92, 15, 15, 15, 107, 
-    15, 15, 93, 93, 108, 108, 109, 11, 11, 11, 0, 0, 15, 101, 15, 0, 15, 
-    15, 110, 110, 111, 111, 103, 11, 11, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 
-    2, 2, 2, 88, 88, 88, 88, 8, 8, 8, 8, 8, 8, 3, 3, 16, 19, 5, 16, 16, 
-    19, 5, 16, 3, 3, 3, 3, 3, 3, 3, 3, 112, 113, 88, 88, 88, 88, 88, 2, 
-    3, 3, 3, 3, 3, 3, 3, 3, 3, 16, 19, 3, 3, 3, 3, 12, 12, 3, 3, 3, 7, 
-    5, 6, 0, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, 88, 88, 88, 88, 88, 17, 
-    0, 0, 0, 17, 17, 17, 17, 17, 17, 7, 7, 7, 5, 6, 15, 17, 17, 17, 17, 
-    17, 17, 17, 17, 17, 17, 7, 7, 7, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 
-    64, 64, 64, 85, 85, 85, 85, 64, 85, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 14, 77, 
-    14, 14, 14, 14, 77, 14, 14, 15, 77, 77, 77, 15, 15, 77, 77, 77, 15, 
-    14, 77, 14, 14, 14, 77, 77, 77, 77, 77, 14, 14, 14, 14, 14, 14, 77, 
-    14, 114, 14, 77, 14, 115, 116, 77, 77, 14, 15, 77, 77, 14, 77, 15, 
-    42, 42, 42, 42, 15, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 
-    17, 17, 17, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 117, 
-    117, 117, 117, 117, 117, 118, 118, 118, 118, 118, 118, 118, 118, 118, 
-    118, 118, 118, 118, 118, 118, 118, 90, 90, 90, 90, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 14, 14, 14, 14, 14, 7, 7, 14, 14, 
-    14, 14, 7, 14, 14, 7, 14, 14, 7, 14, 14, 14, 14, 14, 14, 14, 7, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 7, 7, 14, 14, 7, 
-    14, 7, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 
-    7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 7, 7, 7, 7, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 7, 7, 14, 14, 14, 14, 14, 14, 14, 5, 6, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 0, 0, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 17, 17, 17, 17, 17, 17, 17, 
-    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 
-    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 
-    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 
-    17, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 119, 119, 119, 119, 119, 119, 
-    119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 
-    119, 119, 119, 119, 119, 119, 120, 120, 120, 120, 120, 120, 120, 120, 
-    120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 
-    120, 120, 120, 120, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 7, 14, 14, 14, 14, 14, 14, 14, 14, 14, 7, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 0, 0, 0, 0, 0, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 0, 0, 0, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 7, 14, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 
-    14, 14, 14, 0, 14, 14, 14, 14, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 0, 14, 0, 14, 14, 14, 14, 0, 0, 0, 14, 0, 14, 14, 
-    14, 14, 14, 14, 14, 0, 0, 14, 14, 14, 14, 14, 14, 14, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 
-    17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 17, 
-    17, 17, 17, 14, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 0, 14, 14, 14, 14, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 
-    0, 0, 0, 2, 3, 3, 3, 14, 63, 42, 90, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 
-    14, 14, 5, 6, 5, 6, 5, 6, 5, 6, 8, 5, 6, 6, 14, 90, 90, 90, 90, 90, 
-    90, 90, 90, 90, 64, 64, 64, 64, 64, 64, 8, 63, 63, 63, 63, 63, 14, 
-    14, 90, 90, 90, 0, 0, 0, 14, 14, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 0, 0, 0, 64, 64, 
-    11, 11, 63, 63, 0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 12, 63, 
-    63, 63, 0, 0, 0, 0, 0, 0, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 0, 0, 0, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 14, 14, 17, 17, 17, 
-    17, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 0, 0, 0, 17, 17, 17, 17, 17, 17, 17, 17, 17, 
-    17, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    0, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 0, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 42, 42, 42, 42, 42, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 0, 0, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 14, 14, 14, 0, 14, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    42, 42, 42, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 121, 121, 121, 121, 121, 121, 121, 
-    121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 
-    121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 121, 122, 122, 122, 
-    122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
-    122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
-    122, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 15, 15, 15, 15, 
-    15, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 15, 15, 15, 15, 0, 
-    0, 0, 0, 0, 42, 64, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 7, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 42, 42, 42, 42, 
-    42, 0, 42, 0, 42, 42, 0, 42, 42, 0, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 5, 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 0, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 0, 0, 0, 64, 64, 64, 64, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 8, 8, 12, 12, 5, 6, 5, 6, 5, 
-    6, 5, 6, 5, 6, 5, 6, 5, 6, 5, 6, 0, 0, 0, 0, 3, 3, 3, 3, 12, 12, 12, 
-    3, 3, 3, 0, 3, 3, 3, 3, 8, 5, 6, 5, 6, 5, 6, 3, 3, 3, 7, 8, 7, 7, 7, 
-    0, 3, 4, 3, 3, 0, 0, 0, 0, 42, 42, 42, 0, 42, 0, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    0, 0, 88, 0, 3, 3, 3, 4, 3, 3, 3, 5, 6, 3, 7, 3, 8, 3, 3, 9, 9, 9, 
-    9, 9, 9, 9, 9, 9, 9, 3, 3, 7, 7, 7, 3, 11, 13, 13, 13, 13, 13, 13, 
-    13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 
-    13, 13, 13, 5, 7, 6, 7, 0, 0, 3, 5, 6, 3, 12, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 63, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 63, 
-    63, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 
-    42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 0, 0, 0, 
-    42, 42, 42, 42, 42, 42, 0, 0, 42, 42, 42, 42, 42, 42, 0, 0, 42, 42, 
-    42, 42, 42, 42, 0, 0, 42, 42, 42, 0, 0, 0, 4, 4, 7, 11, 14, 4, 4, 0, 
-    14, 7, 7, 7, 7, 14, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, 88, 88, 14, 
-    14, 42, 17, 42, 42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 123, 123, 123, 
-    126, 126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 
-    14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 89, 64, 14, 14, 14, 
-    14, 14, 0, 0, 77, 77, 15, 15, 77, 15, 15, 77, 77, 15, 77, 77, 15, 77, 
-    77, 15, 15, 77, 15, 15, 77, 77, 15, 77, 77, 15, 77, 77, 15, 15, 77, 
-    15, 15, 77, 77, 15, 77, 77, 15, 77, 77, 15, 15, 77, 77, 15, 15, 77, 
-    15, 15, 77, 77, 15, 15, 77, 15, 15, 77, 77, 15, 15, 9, 9, 9, 42, 42, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 88, 0, 88, 88, 88, 88, 88, 88, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 122, 122, 
-    122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
-    122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 122, 
-    122
-};
-
-/*
- * Each group represents a unique set of character attributes.  The attributes
- * are encoded into a 32-bit value as follows:
- *
- * Bits 0-4	Character category: see the constants listed below.
- *
- * Bits 5-7	Case delta type: 000 = identity
- *				 010 = add delta for lower
- *				 011 = add delta for lower, add 1 for title
- *				 100 = sutract delta for title/upper
- *				 101 = sub delta for upper, sub 1 for title
- *				 110 = sub delta for upper, add delta for lower
- *
- * Bits 8-21	Reserved for future use.
- *
- * Bits 22-31	Case delta: delta for case conversions.  This should be the
- *			    highest field so we can easily sign extend.
- */
-
-static int groups[] = {
-    0, 15, 12, 25, 27, 21, 22, 26, 20, 9, 134217793, 28, 19, 134217858, 
-    29, 2, 23, 11, 1178599554, 24, -507510654, 4194369, 4194434, -834666431, 
-    973078658, -507510719, 1258291330, 880803905, 864026689, 859832385, 
-    331350081, 847249473, 851443777, 868220993, -406847358, 884998209, 
-    876609601, 893386817, 897581121, 914358337, 910164033, 918552641, 
-    5, -234880894, 8388705, 4194499, 8388770, 331350146, -406847423, 
-    -234880959, 880803970, 864026754, 859832450, 847249538, 851443842, 
-    868221058, 876609666, 884998274, 893386882, 897581186, 914358402, 
-    910164098, 918552706, 4, 6, -352321402, 159383617, 155189313, 
-    268435521, 264241217, 159383682, 155189378, 130023554, 268435586, 
-    264241282, 260046978, 239075458, 1, 197132418, 226492546, 360710274, 
-    335544450, -251658175, 402653314, 335544385, 7, 201326657, 201326722, 
-    16, 8, 10, 247464066, -33554302, -33554367, -310378366, -360710014, 
-    -419430270, -536870782, -469761918, -528482174, -33554365, -37748606, 
-    -310378431, -37748669, 155189378, -360710079, -419430335, -29359998, 
-    -469761983, -29360063, -536870847, -528482239, 13, 14, -1463812031, 
-    -801111999, -293601215, 67108938, 67109002, 109051997, 109052061, 
-    18, 17, 8388673, 12582977, 8388738, 12583042
-};
-
-/*
- * The following constants are used to determine the category of a
- * Unicode character.
- */
-
-#define UNICODE_CATEGORY_MASK 0X1F
-
-enum {
-    UNASSIGNED,
-    UPPERCASE_LETTER,
-    LOWERCASE_LETTER,
-    TITLECASE_LETTER,
-    MODIFIER_LETTER,
-    OTHER_LETTER,
-    NON_SPACING_MARK,
-    ENCLOSING_MARK,
-    COMBINING_SPACING_MARK,
-    DECIMAL_DIGIT_NUMBER,
-    LETTER_NUMBER,
-    OTHER_NUMBER,
-    SPACE_SEPARATOR,
-    LINE_SEPARATOR,
-    PARAGRAPH_SEPARATOR,
-    CONTROL,
-    FORMAT,
-    PRIVATE_USE,
-    SURROGATE,
-    CONNECTOR_PUNCTUATION,
-    DASH_PUNCTUATION,
-    OPEN_PUNCTUATION,
-    CLOSE_PUNCTUATION,
-    INITIAL_QUOTE_PUNCTUATION,
-    FINAL_QUOTE_PUNCTUATION,
-    OTHER_PUNCTUATION,
-    MATH_SYMBOL,
-    CURRENCY_SYMBOL,
-    MODIFIER_SYMBOL,
-    OTHER_SYMBOL
-};
-
-/*
- * The following macros extract the fields of the character info.  The
- * GetDelta() macro is complicated because we can't rely on the C compiler
- * to do sign extension on right shifts.
- */
-
-#define GetCaseType(info) (((info) & 0xE0) >> 5)
-#define GetCategory(info) ((info) & 0x1F)
-#define GetDelta(info) (((info) > 0) ? ((info) >> 22) : (~(~((info)) >> 22)))
-
-/*
- * This macro extracts the information about a character from the
- * Unicode character tables.
- */
-
-#define GetUniCharInfo(ch) (groups[groupMap[(pageMap[(((int)(ch)) & 0xffff) >> OFFSET_BITS] << OFFSET_BITS) | ((ch) & ((1 << OFFSET_BITS)-1))]])
-
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/art_aui.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/art_aui.cpp
deleted file mode 100644
index b35cdff915..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/art_aui.cpp
+++ /dev/null
@@ -1,1200 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/ribbon/art_aui.cpp
-// Purpose:     AUI style art provider for ribbon interface
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-08-04
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_RIBBON
-
-#include "wx/ribbon/art.h"
-#include "wx/ribbon/art_internal.h"
-#include "wx/ribbon/bar.h"
-#include "wx/ribbon/buttonbar.h"
-#include "wx/ribbon/gallery.h"
-#include "wx/ribbon/toolbar.h"
-
-#ifndef WX_PRECOMP
-#include "wx/dc.h"
-#include "wx/settings.h"
-#endif
-
-#ifdef __WXMSW__
-#include "wx/msw/private.h"
-#elif defined(__WXMAC__)
-#include "wx/osx/private.h"
-#endif
-
-wxRibbonAUIArtProvider::wxRibbonAUIArtProvider()
-    : wxRibbonMSWArtProvider(false)
-{
-#if defined( __WXMAC__ ) && wxOSX_USE_COCOA_OR_CARBON
-    wxColor base_colour = wxColour( wxMacCreateCGColorFromHITheme(kThemeBrushToolbarBackground));
-#else
-    wxColor base_colour = wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE);
-#endif
-
-    SetColourScheme(base_colour,
-        wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT),
-        wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
-
-    m_tab_active_label_font = m_tab_label_font;
-    m_tab_active_label_font.SetWeight(wxFONTWEIGHT_BOLD);
-
-    m_page_border_left = 1;
-    m_page_border_right = 1;
-    m_page_border_top = 1;
-    m_page_border_bottom = 2;
-    m_tab_separation_size = 0;
-
-    m_gallery_bitmap_padding_left_size = 3;
-    m_gallery_bitmap_padding_right_size = 3;
-    m_gallery_bitmap_padding_top_size = 3;
-    m_gallery_bitmap_padding_bottom_size = 3;
-}
-
-wxRibbonAUIArtProvider::~wxRibbonAUIArtProvider()
-{
-}
-
-wxRibbonArtProvider* wxRibbonAUIArtProvider::Clone() const
-{
-    wxRibbonAUIArtProvider *copy = new wxRibbonAUIArtProvider();
-    CloneTo(copy);
-
-    copy->m_tab_ctrl_background_colour = m_tab_ctrl_background_colour;
-    copy->m_tab_ctrl_background_gradient_colour = m_tab_ctrl_background_gradient_colour;
-    copy->m_panel_label_background_colour = m_panel_label_background_colour;
-    copy->m_panel_label_background_gradient_colour = m_panel_label_background_gradient_colour;
-    copy->m_panel_hover_label_background_colour = m_panel_hover_label_background_colour;
-    copy->m_panel_hover_label_background_gradient_colour = m_panel_hover_label_background_gradient_colour;
-
-    copy->m_background_brush = m_background_brush;
-    copy->m_tab_active_top_background_brush = m_tab_active_top_background_brush;
-    copy->m_tab_hover_background_brush = m_tab_hover_background_brush;
-    copy->m_button_bar_hover_background_brush = m_button_bar_hover_background_brush;
-    copy->m_button_bar_active_background_brush = m_button_bar_active_background_brush;
-    copy->m_gallery_button_active_background_brush = m_gallery_button_active_background_brush;
-    copy->m_gallery_button_hover_background_brush = m_gallery_button_hover_background_brush;
-    copy->m_gallery_button_disabled_background_brush = m_gallery_button_disabled_background_brush;
-
-    copy->m_toolbar_hover_borden_pen = m_toolbar_hover_borden_pen;
-    copy->m_tool_hover_background_brush = m_tool_hover_background_brush;
-    copy->m_tool_active_background_brush = m_tool_active_background_brush;
-
-    return copy;
-}
-
-void wxRibbonAUIArtProvider::SetFont(int id, const wxFont& font)
-{
-    wxRibbonMSWArtProvider::SetFont(id, font);
-    if(id == wxRIBBON_ART_TAB_LABEL_FONT)
-    {
-        m_tab_active_label_font = m_tab_label_font;
-        m_tab_active_label_font.SetWeight(wxFONTWEIGHT_BOLD);
-    }
-}
-
-wxColour wxRibbonAUIArtProvider::GetColour(int id) const
-{
-    switch(id)
-    {
-    case wxRIBBON_ART_PAGE_BACKGROUND_COLOUR:
-    case wxRIBBON_ART_PAGE_BACKGROUND_GRADIENT_COLOUR:
-        return m_background_brush.GetColour();
-    case wxRIBBON_ART_TAB_CTRL_BACKGROUND_COLOUR:
-        return m_tab_ctrl_background_colour;
-    case wxRIBBON_ART_TAB_CTRL_BACKGROUND_GRADIENT_COLOUR:
-        return m_tab_ctrl_background_gradient_colour;
-    case wxRIBBON_ART_TAB_ACTIVE_BACKGROUND_TOP_COLOUR:
-    case wxRIBBON_ART_TAB_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR:
-        return m_tab_active_top_background_brush.GetColour();
-    case wxRIBBON_ART_TAB_HOVER_BACKGROUND_COLOUR:
-    case wxRIBBON_ART_TAB_HOVER_BACKGROUND_GRADIENT_COLOUR:
-        return m_tab_hover_background_brush.GetColour();
-    case wxRIBBON_ART_PANEL_LABEL_BACKGROUND_COLOUR:
-        return m_panel_label_background_colour;
-    case wxRIBBON_ART_PANEL_LABEL_BACKGROUND_GRADIENT_COLOUR:
-        return m_panel_label_background_gradient_colour;
-    case wxRIBBON_ART_PANEL_HOVER_LABEL_BACKGROUND_COLOUR:
-        return m_panel_hover_label_background_colour;
-    case wxRIBBON_ART_PANEL_HOVER_LABEL_BACKGROUND_GRADIENT_COLOUR:
-        return m_panel_hover_label_background_gradient_colour;
-    case wxRIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_COLOUR:
-    case wxRIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_GRADIENT_COLOUR:
-        return m_button_bar_hover_background_brush.GetColour();
-    case wxRIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_COLOUR:
-    case wxRIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_GRADIENT_COLOUR:
-        return m_gallery_button_hover_background_brush.GetColour();
-    case wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_COLOUR:
-    case wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_GRADIENT_COLOUR:
-        return m_gallery_button_active_background_brush.GetColour();
-    case wxRIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_COLOUR:
-    case wxRIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_GRADIENT_COLOUR:
-        return m_gallery_button_disabled_background_brush.GetColour();
-    default:
-        return wxRibbonMSWArtProvider::GetColour(id);
-    }
-}
-
-void wxRibbonAUIArtProvider::SetColour(int id, const wxColor& colour)
-{
-    switch(id)
-    {
-    case wxRIBBON_ART_PAGE_BACKGROUND_COLOUR:
-    case wxRIBBON_ART_PAGE_BACKGROUND_GRADIENT_COLOUR:
-        m_background_brush.SetColour(colour);
-        break;
-    case wxRIBBON_ART_TAB_CTRL_BACKGROUND_COLOUR:
-        m_tab_ctrl_background_colour = colour;
-        break;
-    case wxRIBBON_ART_TAB_CTRL_BACKGROUND_GRADIENT_COLOUR:
-        m_tab_ctrl_background_gradient_colour = colour;
-        break;
-    case wxRIBBON_ART_TAB_ACTIVE_BACKGROUND_TOP_COLOUR:
-    case wxRIBBON_ART_TAB_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR:
-        m_tab_active_top_background_brush.SetColour(colour);
-        break;
-    case wxRIBBON_ART_TAB_HOVER_BACKGROUND_COLOUR:
-    case wxRIBBON_ART_TAB_HOVER_BACKGROUND_GRADIENT_COLOUR:
-        m_tab_hover_background_brush.SetColour(colour);
-        break;
-    case wxRIBBON_ART_PANEL_LABEL_BACKGROUND_COLOUR:
-        m_panel_label_background_colour = colour;
-        break;
-    case wxRIBBON_ART_PANEL_LABEL_BACKGROUND_GRADIENT_COLOUR:
-        m_panel_label_background_gradient_colour = colour;
-        break;
-    case wxRIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_COLOUR:
-    case wxRIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_GRADIENT_COLOUR:
-        m_button_bar_hover_background_brush.SetColour(colour);
-        break;
-    case wxRIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_COLOUR:
-    case wxRIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_GRADIENT_COLOUR:
-        m_gallery_button_hover_background_brush.SetColour(colour);
-        break;
-    case wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_COLOUR:
-    case wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_GRADIENT_COLOUR:
-        m_gallery_button_active_background_brush.SetColour(colour);
-        break;
-    case wxRIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_COLOUR:
-    case wxRIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_GRADIENT_COLOUR:
-        m_gallery_button_disabled_background_brush.SetColour(colour);
-        break;
-    default:
-        wxRibbonMSWArtProvider::SetColour(id, colour);
-        break;
-    }
-}
-
-void wxRibbonAUIArtProvider::SetColourScheme(
-                         const wxColour& primary,
-                         const wxColour& secondary,
-                         const wxColour& tertiary)
-{
-    wxRibbonHSLColour primary_hsl(primary);
-    wxRibbonHSLColour secondary_hsl(secondary);
-    wxRibbonHSLColour tertiary_hsl(tertiary);
-
-    // Map primary & secondary luminance from [0, 1] to [0.15, 0.85]
-    primary_hsl.luminance = cos(primary_hsl.luminance * M_PI) * -0.35 + 0.5;
-    secondary_hsl.luminance = cos(secondary_hsl.luminance * M_PI) * -0.35 + 0.5;
-
-    // TODO: Remove next line once this provider stops piggybacking MSW
-    wxRibbonMSWArtProvider::SetColourScheme(primary, secondary, tertiary);
-
-#define LikePrimary(luminance) \
-    wxRibbonShiftLuminance(primary_hsl, luminance ## f).ToRGB()
-#define LikeSecondary(luminance) \
-    wxRibbonShiftLuminance(secondary_hsl, luminance ## f).ToRGB()
-
-    m_tab_ctrl_background_colour = LikePrimary(0.9);
-    m_tab_ctrl_background_gradient_colour = LikePrimary(1.7);
-    m_tab_border_pen = LikePrimary(0.75);
-    m_tab_label_colour = LikePrimary(0.1);
-    m_tab_hover_background_top_colour =  primary_hsl.ToRGB();
-    m_tab_hover_background_top_gradient_colour = LikePrimary(1.6);
-    m_tab_hover_background_brush = m_tab_hover_background_top_colour;
-    m_tab_active_background_colour = m_tab_ctrl_background_gradient_colour;
-    m_tab_active_background_gradient_colour = primary_hsl.ToRGB();
-    m_tab_active_top_background_brush = m_tab_active_background_colour;
-    m_panel_label_colour = m_tab_label_colour;
-    m_panel_minimised_label_colour = m_panel_label_colour;
-    m_panel_hover_label_colour = tertiary_hsl.ToRGB();
-    m_page_border_pen = m_tab_border_pen;
-    m_panel_border_pen = m_tab_border_pen;
-    m_background_brush = primary_hsl.ToRGB();
-    m_page_hover_background_colour = LikePrimary(1.5);
-    m_page_hover_background_gradient_colour = LikePrimary(0.9);
-    m_panel_label_background_colour = LikePrimary(0.85);
-    m_panel_label_background_gradient_colour = LikePrimary(0.97);
-    m_panel_hover_label_background_gradient_colour = secondary_hsl.ToRGB();
-    m_panel_hover_label_background_colour = secondary_hsl.Lighter(0.2f).ToRGB();
-    m_button_bar_hover_border_pen = secondary_hsl.ToRGB();
-    m_button_bar_hover_background_brush = LikeSecondary(1.7);
-    m_button_bar_active_background_brush = LikeSecondary(1.4);
-    m_button_bar_label_colour = m_tab_label_colour;
-    m_button_bar_label_disabled_colour = m_tab_label_colour;
-    m_gallery_border_pen = m_tab_border_pen;
-    m_gallery_item_border_pen = m_button_bar_hover_border_pen;
-    m_gallery_hover_background_brush = LikePrimary(1.2);
-    m_gallery_button_background_colour = m_page_hover_background_colour;
-    m_gallery_button_background_gradient_colour = m_page_hover_background_gradient_colour;
-    m_gallery_button_hover_background_brush = m_button_bar_hover_background_brush;
-    m_gallery_button_active_background_brush = m_button_bar_active_background_brush;
-    m_gallery_button_disabled_background_brush = primary_hsl.Desaturated(0.15f).ToRGB();
-    SetColour(wxRIBBON_ART_GALLERY_BUTTON_FACE_COLOUR, LikePrimary(0.1));
-    SetColour(wxRIBBON_ART_GALLERY_BUTTON_DISABLED_FACE_COLOUR, wxColour(128, 128, 128));
-    SetColour(wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_FACE_COLOUR, LikeSecondary(0.1));
-    SetColour(wxRIBBON_ART_GALLERY_BUTTON_HOVER_FACE_COLOUR, LikeSecondary(0.1));
-    m_toolbar_border_pen = m_tab_border_pen;
-    SetColour(wxRIBBON_ART_TOOLBAR_FACE_COLOUR, LikePrimary(0.1));
-    m_tool_background_colour = m_page_hover_background_colour;
-    m_tool_background_gradient_colour = m_page_hover_background_gradient_colour;
-    m_toolbar_hover_borden_pen = m_button_bar_hover_border_pen;
-    m_tool_hover_background_brush = m_button_bar_hover_background_brush;
-    m_tool_active_background_brush = m_button_bar_active_background_brush;
-
-#undef LikeSecondary
-#undef LikePrimary
-}
-
-void wxRibbonAUIArtProvider::DrawTabCtrlBackground(
-                        wxDC& dc,
-                        wxWindow* WXUNUSED(wnd),
-                        const wxRect& rect)
-{
-    wxRect gradient_rect(rect);
-    gradient_rect.height--;
-    dc.GradientFillLinear(gradient_rect, m_tab_ctrl_background_colour,
-        m_tab_ctrl_background_gradient_colour, wxSOUTH);
-    dc.SetPen(m_tab_border_pen);
-    dc.DrawLine(rect.x, rect.GetBottom(), rect.GetRight()+1, rect.GetBottom());
-}
-
-int wxRibbonAUIArtProvider::GetTabCtrlHeight(
-                        wxDC& dc,
-                        wxWindow* WXUNUSED(wnd),
-                        const wxRibbonPageTabInfoArray& pages)
-{
-    int text_height = 0;
-    int icon_height = 0;
-
-    if(pages.GetCount() <= 1 && (m_flags & wxRIBBON_BAR_ALWAYS_SHOW_TABS) == 0)
-    {
-        // To preserve space, a single tab need not be displayed. We still need
-        // one pixel of border though.
-        return 1;
-    }
-
-    if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS)
-    {
-        dc.SetFont(m_tab_active_label_font);
-        text_height = dc.GetTextExtent(wxT("ABCDEFXj")).GetHeight();
-    }
-    if(m_flags & wxRIBBON_BAR_SHOW_PAGE_ICONS)
-    {
-        size_t numpages = pages.GetCount();
-        for(size_t i = 0; i < numpages; ++i)
-        {
-            const wxRibbonPageTabInfo& info = pages.Item(i);
-            if(info.page->GetIcon().IsOk())
-            {
-                icon_height = wxMax(icon_height, info.page->GetIcon().GetHeight());
-            }
-        }
-    }
-
-    return wxMax(text_height, icon_height) + 10;
-}
-
-void wxRibbonAUIArtProvider::DrawTab(wxDC& dc,
-                 wxWindow* WXUNUSED(wnd),
-                 const wxRibbonPageTabInfo& tab)
-{
-    if(tab.rect.height <= 1)
-        return;
-
-    dc.SetFont(m_tab_label_font);
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    if(tab.active || tab.hovered || tab.highlight)
-    {
-        if(tab.active)
-        {
-            dc.SetFont(m_tab_active_label_font);
-            dc.SetBrush(m_background_brush);
-            dc.DrawRectangle(tab.rect.x, tab.rect.y + tab.rect.height - 1,
-                tab.rect.width - 1, 1);
-        }
-        wxRect grad_rect(tab.rect);
-        grad_rect.height -= 4;
-        grad_rect.width -= 1;
-        grad_rect.height /= 2;
-        grad_rect.y = grad_rect.y + tab.rect.height - grad_rect.height - 1;
-        dc.SetBrush(m_tab_active_top_background_brush);
-        dc.DrawRectangle(tab.rect.x, tab.rect.y + 3, tab.rect.width - 1,
-            grad_rect.y - tab.rect.y - 3);
-        if(tab.highlight)
-        {
-            wxColour top_colour((m_tab_active_background_colour.Red()   + m_tab_hover_background_top_colour.Red())/2,
-                                (m_tab_active_background_colour.Green() + m_tab_hover_background_top_colour.Green())/2,
-                                (m_tab_active_background_colour.Blue()  + m_tab_hover_background_top_colour.Blue())/2);
-
-            wxColour bottom_colour((m_tab_active_background_gradient_colour.Red()   + m_tab_hover_background_top_gradient_colour.Red())/2,
-                                   (m_tab_active_background_gradient_colour.Green() + m_tab_hover_background_top_gradient_colour.Green())/2,
-                                   (m_tab_active_background_gradient_colour.Blue()  + m_tab_hover_background_top_gradient_colour.Blue())/2);
-
-            dc.GradientFillLinear(grad_rect, top_colour,
-                bottom_colour, wxSOUTH);
-        }
-        else
-        {
-            dc.GradientFillLinear(grad_rect, m_tab_active_background_colour,
-                m_tab_active_background_gradient_colour, wxSOUTH);
-        }
-    }
-    else
-    {
-        wxRect btm_rect(tab.rect);
-        btm_rect.height -= 4;
-        btm_rect.width -= 1;
-        btm_rect.height /= 2;
-        btm_rect.y = btm_rect.y + tab.rect.height - btm_rect.height - 1;
-        dc.SetBrush(m_tab_hover_background_brush);
-        dc.DrawRectangle(btm_rect.x, btm_rect.y, btm_rect.width,
-            btm_rect.height);
-        wxRect grad_rect(tab.rect);
-        grad_rect.width -= 1;
-        grad_rect.y += 3;
-        grad_rect.height = btm_rect.y - grad_rect.y;
-        dc.GradientFillLinear(grad_rect, m_tab_hover_background_top_colour,
-            m_tab_hover_background_top_gradient_colour, wxSOUTH);
-    }
-
-    wxPoint border_points[5];
-    border_points[0] = wxPoint(0, 3);
-    border_points[1] = wxPoint(1, 2);
-    border_points[2] = wxPoint(tab.rect.width - 3, 2);
-    border_points[3] = wxPoint(tab.rect.width - 1, 4);
-    border_points[4] = wxPoint(tab.rect.width - 1, tab.rect.height - 1);
-
-    dc.SetPen(m_tab_border_pen);
-    dc.DrawLines(sizeof(border_points)/sizeof(wxPoint), border_points, tab.rect.x, tab.rect.y);
-
-    wxRect old_clip;
-    dc.GetClippingBox(old_clip);
-    bool is_first_tab = false;
-    wxRibbonBar* bar = wxDynamicCast(tab.page->GetParent(), wxRibbonBar);
-    if(bar && bar->GetPage(0) == tab.page)
-        is_first_tab = true;
-
-    wxBitmap icon;
-    if(m_flags & wxRIBBON_BAR_SHOW_PAGE_ICONS)
-    {
-        icon = tab.page->GetIcon();
-        if((m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS) == 0)
-        {
-            if(icon.IsOk())
-            {
-            int x = tab.rect.x + (tab.rect.width - icon.GetWidth()) / 2;
-            dc.DrawBitmap(icon, x, tab.rect.y + 1 + (tab.rect.height - 1 -
-                icon.GetHeight()) / 2, true);
-            }
-        }
-    }
-    if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS)
-    {
-        wxString label = tab.page->GetLabel();
-        if(!label.IsEmpty())
-        {
-            dc.SetTextForeground(m_tab_label_colour);
-            dc.SetBackgroundMode(wxTRANSPARENT);
-
-            int offset = 0;
-            if(icon.IsOk())
-                offset += icon.GetWidth() + 2;
-            int text_height;
-            int text_width;
-            dc.GetTextExtent(label, &text_width, &text_height);
-            int x = (tab.rect.width - 2 - text_width - offset) / 2;
-            if(x > 8)
-                x = 8;
-            else if(x < 1)
-                x = 1;
-            int width = tab.rect.width - x - 2;
-            x += tab.rect.x + offset;
-            int y = tab.rect.y + (tab.rect.height - text_height) / 2;
-            if(icon.IsOk())
-            {
-                dc.DrawBitmap(icon, x - offset, tab.rect.y + (tab.rect.height -
-                    icon.GetHeight()) / 2, true);
-            }
-            dc.SetClippingRegion(x, tab.rect.y, width, tab.rect.height);
-            dc.DrawText(label, x, y);
-        }
-    }
-
-    // Draw the left hand edge of the tab only for the first tab (subsequent
-    // tabs use the right edge of the prior tab as their left edge). As this is
-    // outside the rectangle for the tab, only draw it if the leftmost part of
-    // the tab is within the clip rectangle (the clip region has to be cleared
-    // to draw outside the tab).
-    if(is_first_tab && old_clip.x <= tab.rect.x
-        && tab.rect.x < old_clip.x + old_clip.width)
-    {
-        dc.DestroyClippingRegion();
-        dc.DrawLine(tab.rect.x - 1, tab.rect.y + 4, tab.rect.x - 1,
-            tab.rect.y + tab.rect.height - 1);
-    }
-}
-
-void wxRibbonAUIArtProvider::GetBarTabWidth(
-                        wxDC& dc,
-                        wxWindow* WXUNUSED(wnd),
-                        const wxString& label,
-                        const wxBitmap& bitmap,
-                        int* ideal,
-                        int* small_begin_need_separator,
-                        int* small_must_have_separator,
-                        int* minimum)
-{
-    int width = 0;
-    int min = 0;
-    if((m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS) && !label.IsEmpty())
-    {
-        dc.SetFont(m_tab_active_label_font);
-        width += dc.GetTextExtent(label).GetWidth();
-        min += wxMin(30, width); // enough for a few chars
-        if(bitmap.IsOk())
-        {
-            // gap between label and bitmap
-            width += 4;
-            min += 2;
-        }
-    }
-    if((m_flags & wxRIBBON_BAR_SHOW_PAGE_ICONS) && bitmap.IsOk())
-    {
-        width += bitmap.GetWidth();
-        min += bitmap.GetWidth();
-    }
-
-    if(ideal != NULL)
-    {
-        *ideal = width + 16;
-    }
-    if(small_begin_need_separator != NULL)
-    {
-        *small_begin_need_separator = min;
-    }
-    if(small_must_have_separator != NULL)
-    {
-        *small_must_have_separator = min;
-    }
-    if(minimum != NULL)
-    {
-        *minimum = min;
-    }
-}
-
-void wxRibbonAUIArtProvider::DrawTabSeparator(
-                    wxDC& WXUNUSED(dc),
-                    wxWindow* WXUNUSED(wnd),
-                    const wxRect& WXUNUSED(rect),
-                    double WXUNUSED(visibility))
-{
-    // No explicit separators between tabs
-}
-
-void wxRibbonAUIArtProvider::DrawPageBackground(
-                        wxDC& dc,
-                        wxWindow* WXUNUSED(wnd),
-                        const wxRect& rect)
-{
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.SetBrush(m_background_brush);
-    dc.DrawRectangle(rect.x + 1, rect.y, rect.width - 2, rect.height - 1);
-
-    dc.SetPen(m_page_border_pen);
-    dc.DrawLine(rect.x, rect.y, rect.x, rect.y + rect.height);
-    dc.DrawLine(rect.GetRight(), rect.y, rect.GetRight(), rect.y +rect.height);
-    dc.DrawLine(rect.x, rect.GetBottom(), rect.GetRight()+1, rect.GetBottom());
-}
-
-wxSize wxRibbonAUIArtProvider::GetScrollButtonMinimumSize(
-                        wxDC& WXUNUSED(dc),
-                        wxWindow* WXUNUSED(wnd),
-                        long WXUNUSED(style))
-{
-    return wxSize(11, 11);
-}
-
-void wxRibbonAUIArtProvider::DrawScrollButton(
-                        wxDC& dc,
-                        wxWindow* WXUNUSED(wnd),
-                        const wxRect& rect,
-                        long style)
-{
-    wxRect true_rect(rect);
-    wxPoint arrow_points[3];
-
-    if((style & wxRIBBON_SCROLL_BTN_FOR_MASK) == wxRIBBON_SCROLL_BTN_FOR_TABS)
-    {
-        true_rect.y += 2;
-        true_rect.height -= 2;
-        dc.SetPen(m_tab_border_pen);
-    }
-    else
-    {
-        dc.SetPen(*wxTRANSPARENT_PEN);
-        dc.SetBrush(m_background_brush);
-        dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
-        dc.SetPen(m_page_border_pen);
-    }
-
-    switch(style & wxRIBBON_SCROLL_BTN_DIRECTION_MASK)
-    {
-    case wxRIBBON_SCROLL_BTN_LEFT:
-        dc.DrawLine(true_rect.GetRight(), true_rect.y, true_rect.GetRight(),
-            true_rect.y + true_rect.height);
-        arrow_points[0] = wxPoint(rect.width / 2 - 2, rect.height / 2);
-        arrow_points[1] = arrow_points[0] + wxPoint(5, -5);
-        arrow_points[2] = arrow_points[0] + wxPoint(5,  5);
-        break;
-    case wxRIBBON_SCROLL_BTN_RIGHT:
-        dc.DrawLine(true_rect.x, true_rect.y, true_rect.x,
-            true_rect.y + true_rect.height);
-        arrow_points[0] = wxPoint(rect.width / 2 + 3, rect.height / 2);
-        arrow_points[1] = arrow_points[0] - wxPoint(5, -5);
-        arrow_points[2] = arrow_points[0] - wxPoint(5,  5);
-        break;
-    case wxRIBBON_SCROLL_BTN_DOWN:
-        dc.DrawLine(true_rect.x, true_rect.y, true_rect.x + true_rect.width,
-            true_rect.y);
-        arrow_points[0] = wxPoint(rect.width / 2, rect.height / 2 + 3);
-        arrow_points[1] = arrow_points[0] - wxPoint( 5, 5);
-        arrow_points[2] = arrow_points[0] - wxPoint(-5, 5);
-        break;
-    case wxRIBBON_SCROLL_BTN_UP:
-        dc.DrawLine(true_rect.x, true_rect.GetBottom(),
-            true_rect.x + true_rect.width, true_rect.GetBottom());
-        arrow_points[0] = wxPoint(rect.width / 2, rect.height / 2 - 2);
-        arrow_points[1] = arrow_points[0] + wxPoint( 5, 5);
-        arrow_points[2] = arrow_points[0] + wxPoint(-5, 5);
-        break;
-    default:
-        return;
-    }
-
-    int x = rect.x;
-    int y = rect.y;
-    if(style & wxRIBBON_SCROLL_BTN_ACTIVE)
-    {
-        ++x;
-        ++y;
-    }
-
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    wxBrush B(m_tab_label_colour);
-    dc.SetBrush(B);
-    dc.DrawPolygon(sizeof(arrow_points)/sizeof(wxPoint), arrow_points, x, y);
-}
-
-wxSize wxRibbonAUIArtProvider::GetPanelSize(
-                        wxDC& dc,
-                        const wxRibbonPanel* wnd,
-                        wxSize client_size,
-                        wxPoint* client_offset)
-{
-    dc.SetFont(m_panel_label_font);
-    wxSize label_size = dc.GetTextExtent(wnd->GetLabel());
-    int label_height = label_size.GetHeight() + 5;
-    if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-    {
-        client_size.IncBy(4, label_height + 6);
-        if(client_offset)
-            *client_offset = wxPoint(2, label_height + 3);
-    }
-    else
-    {
-        client_size.IncBy(6, label_height + 4);
-        if(client_offset)
-            *client_offset = wxPoint(3, label_height + 2);
-    }
-    return client_size;
-}
-
-wxSize wxRibbonAUIArtProvider::GetPanelClientSize(
-                        wxDC& dc,
-                        const wxRibbonPanel* wnd,
-                        wxSize size,
-                        wxPoint* client_offset)
-{
-    dc.SetFont(m_panel_label_font);
-    wxSize label_size = dc.GetTextExtent(wnd->GetLabel());
-    int label_height = label_size.GetHeight() + 5;
-    if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-    {
-        size.DecBy(4, label_height + 6);
-        if(client_offset)
-            *client_offset = wxPoint(2, label_height + 3);
-    }
-    else
-    {
-        size.DecBy(6, label_height + 4);
-        if(client_offset)
-            *client_offset = wxPoint(3, label_height + 2);
-    }
-    if (size.x < 0) size.x = 0;
-    if (size.y < 0) size.y = 0;
-    return size;
-}
-
-wxRect wxRibbonAUIArtProvider::GetPanelExtButtonArea(wxDC& dc,
-                        const wxRibbonPanel* wnd,
-                        wxRect rect)
-{
-    wxRect true_rect(rect);
-    RemovePanelPadding(&true_rect);
-
-    true_rect.x++;
-    true_rect.width -= 2;
-    true_rect.y++;
-
-    dc.SetFont(m_panel_label_font);
-    wxSize label_size = dc.GetTextExtent(wnd->GetLabel());
-    int label_height = label_size.GetHeight() + 5;
-    wxRect label_rect(true_rect);
-    label_rect.height = label_height - 1;
-
-    rect = wxRect(label_rect.GetRight()-13, label_rect.GetBottom()-13, 13, 13);
-    return rect;
-}
-
-void wxRibbonAUIArtProvider::DrawPanelBackground(
-                        wxDC& dc,
-                        wxRibbonPanel* wnd,
-                        const wxRect& rect)
-{
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.SetBrush(m_background_brush);
-    dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
-
-    wxRect true_rect(rect);
-    RemovePanelPadding(&true_rect);
-
-    dc.SetPen(m_panel_border_pen);
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    dc.DrawRectangle(true_rect.x, true_rect.y, true_rect.width, true_rect.height);
-
-    true_rect.x++;
-    true_rect.width -= 2;
-    true_rect.y++;
-
-    dc.SetFont(m_panel_label_font);
-    wxSize label_size = dc.GetTextExtent(wnd->GetLabel());
-    int label_height = label_size.GetHeight() + 5;
-    wxRect label_rect(true_rect);
-    label_rect.height = label_height - 1;
-    dc.DrawLine(label_rect.x, label_rect.y + label_rect.height,
-        label_rect.x + label_rect.width, label_rect.y + label_rect.height);
-
-    wxColour label_bg_colour = m_panel_label_background_colour;
-    wxColour label_bg_grad_colour = m_panel_label_background_gradient_colour;
-    if(wnd->IsHovered())
-    {
-        label_bg_colour = m_panel_hover_label_background_colour;
-        label_bg_grad_colour = m_panel_hover_label_background_gradient_colour;
-        dc.SetTextForeground(m_panel_hover_label_colour);
-    }
-    else
-    {
-        dc.SetTextForeground(m_panel_label_colour);
-    }
-    dc.GradientFillLinear(label_rect,
-#ifdef __WXMAC__
-        label_bg_grad_colour, label_bg_colour, wxSOUTH);
-#else
-        label_bg_colour, label_bg_grad_colour, wxSOUTH);
-#endif
-    dc.SetFont(m_panel_label_font);
-    dc.DrawText(wnd->GetLabel(), label_rect.x + 3, label_rect.y + 2);
-
-    if(wnd->IsHovered())
-    {
-        wxRect gradient_rect(true_rect);
-        gradient_rect.y += label_rect.height + 1;
-        gradient_rect.height = true_rect.height - label_rect.height - 3;
-#ifdef __WXMAC__
-        wxColour colour = m_page_hover_background_gradient_colour;
-        wxColour gradient = m_page_hover_background_colour;
-#else
-        wxColour colour = m_page_hover_background_colour;
-        wxColour gradient = m_page_hover_background_gradient_colour;
-#endif
-        dc.GradientFillLinear(gradient_rect, colour, gradient, wxSOUTH);
-    }
-
-    if(wnd->HasExtButton())
-    {
-        if(wnd->IsExtButtonHovered())
-        {
-            dc.SetPen(m_panel_hover_button_border_pen);
-            dc.SetBrush(m_panel_hover_button_background_brush);
-            dc.DrawRoundedRectangle(label_rect.GetRight() - 13, label_rect.GetBottom() - 13, 13, 13, 1.0);
-            dc.DrawBitmap(m_panel_extension_bitmap[1], label_rect.GetRight() - 10, label_rect.GetBottom() - 10, true);
-        }
-        else
-            dc.DrawBitmap(m_panel_extension_bitmap[0], label_rect.GetRight() - 10, label_rect.GetBottom() - 10, true);
-    }
-}
-
-void wxRibbonAUIArtProvider::DrawMinimisedPanel(
-                        wxDC& dc,
-                        wxRibbonPanel* wnd,
-                        const wxRect& rect,
-                        wxBitmap& bitmap)
-{
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.SetBrush(m_background_brush);
-    dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
-
-    wxRect true_rect(rect);
-    RemovePanelPadding(&true_rect);
-
-    dc.SetPen(m_panel_border_pen);
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    dc.DrawRectangle(true_rect.x, true_rect.y, true_rect.width, true_rect.height);
-    true_rect.Deflate(1);
-
-    if(wnd->IsHovered() || wnd->GetExpandedPanel())
-    {
-        wxColour colour = m_page_hover_background_colour;
-        wxColour gradient = m_page_hover_background_gradient_colour;
-#ifdef __WXMAC__
-        if(!wnd->GetExpandedPanel())
-#else
-        if(wnd->GetExpandedPanel())
-#endif
-        {
-            wxColour temp = colour;
-            colour = gradient;
-            gradient = temp;
-        }
-        dc.GradientFillLinear(true_rect, colour, gradient, wxSOUTH);
-    }
-
-    wxRect preview;
-    DrawMinimisedPanelCommon(dc, wnd, true_rect, &preview);
-
-    dc.SetPen(m_panel_border_pen);
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    dc.DrawRectangle(preview.x, preview.y, preview.width, preview.height);
-    preview.Deflate(1);
-    wxRect preview_caption_rect(preview);
-    preview_caption_rect.height = 7;
-    preview.y += preview_caption_rect.height;
-    preview.height -= preview_caption_rect.height;
-#ifdef __WXMAC__
-    dc.GradientFillLinear(preview_caption_rect,
-        m_panel_hover_label_background_gradient_colour,
-        m_panel_hover_label_background_colour, wxSOUTH);
-    dc.GradientFillLinear(preview,
-        m_page_hover_background_gradient_colour,
-        m_page_hover_background_colour, wxSOUTH);
-#else
-    dc.GradientFillLinear(preview_caption_rect,
-        m_panel_hover_label_background_colour,
-        m_panel_hover_label_background_gradient_colour, wxSOUTH);
-    dc.GradientFillLinear(preview,
-        m_page_hover_background_colour,
-        m_page_hover_background_gradient_colour, wxSOUTH);
-#endif
-
-    if(bitmap.IsOk())
-    {
-        dc.DrawBitmap(bitmap, preview.x + (preview.width - bitmap.GetWidth()) / 2,
-            preview.y + (preview.height - bitmap.GetHeight()) / 2, true);
-    }
-}
-
-void wxRibbonAUIArtProvider::DrawPartialPanelBackground(wxDC& dc,
-        wxWindow* wnd, const wxRect& rect)
-{
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.SetBrush(m_background_brush);
-    dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
-
-    wxPoint offset(wnd->GetPosition());
-    wxWindow* parent = wnd->GetParent();
-    wxRibbonPanel* panel = NULL;
-
-    for(; parent; parent = parent->GetParent())
-    {
-        panel = wxDynamicCast(parent, wxRibbonPanel);
-        if(panel != NULL)
-        {
-            if(!panel->IsHovered())
-                return;
-            break;
-        }
-        offset += parent->GetPosition();
-    }
-    if(panel == NULL)
-        return;
-
-    wxRect background(panel->GetSize());
-    RemovePanelPadding(&background);
-    background.x++;
-    background.width -= 2;
-    dc.SetFont(m_panel_label_font);
-    int caption_height = dc.GetTextExtent(panel->GetLabel()).GetHeight() + 7;
-    background.y += caption_height - 1;
-    background.height -= caption_height;
-
-    wxRect paint_rect(rect);
-    paint_rect.x += offset.x;
-    paint_rect.y += offset.y;
-
-    wxColour bg_clr, bg_grad_clr;
-#ifdef __WXMAC__
-    bg_grad_clr = m_page_hover_background_colour;
-    bg_clr = m_page_hover_background_gradient_colour;
-#else
-    bg_clr = m_page_hover_background_colour;
-    bg_grad_clr = m_page_hover_background_gradient_colour;
-#endif
-
-    paint_rect.Intersect(background);
-    if(!paint_rect.IsEmpty())
-    {
-        wxColour starting_colour(wxRibbonInterpolateColour(bg_clr, bg_grad_clr,
-            paint_rect.y, background.y, background.y + background.height));
-        wxColour ending_colour(wxRibbonInterpolateColour(bg_clr, bg_grad_clr,
-            paint_rect.y + paint_rect.height, background.y,
-            background.y + background.height));
-        paint_rect.x -= offset.x;
-        paint_rect.y -= offset.y;
-        dc.GradientFillLinear(paint_rect, starting_colour, ending_colour
-            , wxSOUTH);
-    }
-}
-
-void wxRibbonAUIArtProvider::DrawGalleryBackground(
-                        wxDC& dc,
-                        wxRibbonGallery* wnd,
-                        const wxRect& rect)
-{
-    DrawPartialPanelBackground(dc, wnd, rect);
-
-    if(wnd->IsHovered())
-    {
-        dc.SetPen(*wxTRANSPARENT_PEN);
-        dc.SetBrush(m_gallery_hover_background_brush);
-        if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-        {
-            dc.DrawRectangle(rect.x + 1, rect.y + 1, rect.width - 2,
-                rect.height - 16);
-        }
-        else
-        {
-            dc.DrawRectangle(rect.x + 1, rect.y + 1, rect.width - 16,
-                rect.height - 2);
-        }
-    }
-
-    dc.SetPen(m_gallery_border_pen);
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
-
-    DrawGalleryBackgroundCommon(dc, wnd, rect);
-}
-
-void wxRibbonAUIArtProvider::DrawGalleryButton(wxDC& dc, wxRect rect,
-        wxRibbonGalleryButtonState state, wxBitmap* bitmaps)
-{
-    int extra_height = 0;
-    int extra_width = 0;
-    wxRect reduced_rect(rect);
-    reduced_rect.Deflate(1);
-    if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-    {
-        reduced_rect.width++;
-        extra_width = 1;
-    }
-    else
-    {
-        reduced_rect.height++;
-        extra_height = 1;
-    }
-
-    wxBitmap btn_bitmap;
-    switch(state)
-    {
-    case wxRIBBON_GALLERY_BUTTON_NORMAL:
-        dc.GradientFillLinear(reduced_rect,
-            m_gallery_button_background_colour,
-            m_gallery_button_background_gradient_colour, wxSOUTH);
-        btn_bitmap = bitmaps[0];
-        break;
-    case wxRIBBON_GALLERY_BUTTON_HOVERED:
-        dc.SetPen(m_gallery_item_border_pen);
-        dc.SetBrush(m_gallery_button_hover_background_brush);
-        dc.DrawRectangle(rect.x, rect.y, rect.width + extra_width,
-            rect.height + extra_height);
-        btn_bitmap = bitmaps[1];
-        break;
-    case wxRIBBON_GALLERY_BUTTON_ACTIVE:
-        dc.SetPen(m_gallery_item_border_pen);
-        dc.SetBrush(m_gallery_button_active_background_brush);
-        dc.DrawRectangle(rect.x, rect.y, rect.width + extra_width,
-            rect.height + extra_height);
-        btn_bitmap = bitmaps[2];
-        break;
-    case wxRIBBON_GALLERY_BUTTON_DISABLED:
-        dc.SetPen(*wxTRANSPARENT_PEN);
-        dc.SetBrush(m_gallery_button_disabled_background_brush);
-        dc.DrawRectangle(reduced_rect.x, reduced_rect.y, reduced_rect.width,
-            reduced_rect.height);
-        btn_bitmap = bitmaps[3];
-        break;
-    }
-
-    dc.DrawBitmap(btn_bitmap, reduced_rect.x + reduced_rect.width / 2 - 2,
-        (rect.y + rect.height / 2) - 2, true);
-}
-
-void wxRibbonAUIArtProvider::DrawGalleryItemBackground(
-                        wxDC& dc,
-                        wxRibbonGallery* wnd,
-                        const wxRect& rect,
-                        wxRibbonGalleryItem* item)
-{
-    if(wnd->GetHoveredItem() != item && wnd->GetActiveItem() != item &&
-        wnd->GetSelection() != item)
-        return;
-
-    dc.SetPen(m_gallery_item_border_pen);
-    if(wnd->GetActiveItem() == item || wnd->GetSelection() == item)
-        dc.SetBrush(m_gallery_button_active_background_brush);
-    else
-        dc.SetBrush(m_gallery_button_hover_background_brush);
-
-    dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
-}
-
-void wxRibbonAUIArtProvider::DrawButtonBarBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect)
-{
-    DrawPartialPanelBackground(dc, wnd, rect);
-}
-
-void wxRibbonAUIArtProvider::DrawButtonBarButton(
-                        wxDC& dc,
-                        wxWindow* WXUNUSED(wnd),
-                        const wxRect& rect,
-                        wxRibbonButtonKind kind,
-                        long state,
-                        const wxString& label,
-                        const wxBitmap& bitmap_large,
-                        const wxBitmap& bitmap_small)
-{
-    if(kind == wxRIBBON_BUTTON_TOGGLE)
-    {
-        kind = wxRIBBON_BUTTON_NORMAL;
-        if(state & wxRIBBON_BUTTONBAR_BUTTON_TOGGLED)
-            state ^= wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK;
-    }
-
-    if(state & (wxRIBBON_BUTTONBAR_BUTTON_HOVER_MASK
-        | wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK))
-    {
-        dc.SetPen(m_button_bar_hover_border_pen);
-
-        wxRect bg_rect(rect);
-        bg_rect.Deflate(1);
-
-        if(kind == wxRIBBON_BUTTON_HYBRID)
-        {
-            switch(state & wxRIBBON_BUTTONBAR_BUTTON_SIZE_MASK)
-            {
-            case wxRIBBON_BUTTONBAR_BUTTON_LARGE:
-                {
-                    int iYBorder = rect.y + bitmap_large.GetHeight() + 4;
-                    wxRect partial_bg(rect);
-                    if(state & wxRIBBON_BUTTONBAR_BUTTON_NORMAL_HOVERED)
-                    {
-                        partial_bg.SetBottom(iYBorder - 1);
-                    }
-                    else
-                    {
-                        partial_bg.height -= (iYBorder - partial_bg.y + 1);
-                        partial_bg.y = iYBorder + 1;
-                    }
-                    dc.DrawLine(rect.x, iYBorder, rect.x + rect.width, iYBorder);
-                    bg_rect.Intersect(partial_bg);
-                }
-                break;
-            case wxRIBBON_BUTTONBAR_BUTTON_MEDIUM:
-                {
-                    int iArrowWidth = 9;
-                    if(state & wxRIBBON_BUTTONBAR_BUTTON_NORMAL_HOVERED)
-                    {
-                        bg_rect.width -= iArrowWidth;
-                        dc.DrawLine(bg_rect.x + bg_rect.width,
-                            rect.y, bg_rect.x + bg_rect.width,
-                            rect.y + rect.height);
-                    }
-                    else
-                    {
-                        --iArrowWidth;
-                        bg_rect.x += bg_rect.width - iArrowWidth;
-                        bg_rect.width = iArrowWidth;
-                        dc.DrawLine(bg_rect.x - 1, rect.y,
-                            bg_rect.x - 1, rect.y + rect.height);
-                    }
-                }
-                break;
-            case wxRIBBON_BUTTONBAR_BUTTON_SMALL:
-                break;
-            }
-        }
-
-        dc.SetBrush(*wxTRANSPARENT_BRUSH);
-        dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
-
-        dc.SetPen(*wxTRANSPARENT_PEN);
-        if(state & wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK)
-            dc.SetBrush(m_button_bar_active_background_brush);
-        else
-            dc.SetBrush(m_button_bar_hover_background_brush);
-        dc.DrawRectangle(bg_rect.x, bg_rect.y, bg_rect.width, bg_rect.height);
-    }
-
-    dc.SetFont(m_button_bar_label_font);
-    dc.SetTextForeground(state & wxRIBBON_BUTTONBAR_BUTTON_DISABLED
-                            ? m_button_bar_label_disabled_colour
-                            : m_button_bar_label_colour);
-    DrawButtonBarButtonForeground(dc, rect, kind, state, label, bitmap_large,
-        bitmap_small);
-}
-
-void wxRibbonAUIArtProvider::DrawToolBarBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect)
-{
-    DrawPartialPanelBackground(dc, wnd, rect);
-}
-
-void wxRibbonAUIArtProvider::DrawToolGroupBackground(
-                    wxDC& dc,
-                    wxWindow* WXUNUSED(wnd),
-                    const wxRect& rect)
-{
-    dc.SetPen(m_toolbar_border_pen);
-    dc.SetBrush(*wxTRANSPARENT_BRUSH);
-    dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
-    wxRect bg_rect(rect);
-    bg_rect.Deflate(1);
-    dc.GradientFillLinear(bg_rect, m_tool_background_colour,
-        m_tool_background_gradient_colour, wxSOUTH);
-}
-
-void wxRibbonAUIArtProvider::DrawTool(
-            wxDC& dc,
-            wxWindow* WXUNUSED(wnd),
-            const wxRect& rect,
-            const wxBitmap& bitmap,
-            wxRibbonButtonKind kind,
-            long state)
-{
-    if(kind == wxRIBBON_BUTTON_TOGGLE)
-    {
-        if(state & wxRIBBON_TOOLBAR_TOOL_TOGGLED)
-            state ^= wxRIBBON_TOOLBAR_TOOL_ACTIVE_MASK;
-    }
-
-    wxRect bg_rect(rect);
-    bg_rect.Deflate(1);
-    if((state & wxRIBBON_TOOLBAR_TOOL_LAST) == 0)
-        bg_rect.width++;
-    bool is_custom_bg = (state & (wxRIBBON_TOOLBAR_TOOL_HOVER_MASK |
-        wxRIBBON_TOOLBAR_TOOL_ACTIVE_MASK)) != 0;
-    bool is_split_hybrid = kind == wxRIBBON_BUTTON_HYBRID && is_custom_bg;
-
-    // Background
-    if(is_custom_bg)
-    {
-        dc.SetPen(*wxTRANSPARENT_PEN);
-        dc.SetBrush(m_tool_hover_background_brush);
-        dc.DrawRectangle(bg_rect.x, bg_rect.y, bg_rect.width, bg_rect.height);
-        if(state & wxRIBBON_TOOLBAR_TOOL_ACTIVE_MASK)
-        {
-            wxRect active_rect(bg_rect);
-            if(kind == wxRIBBON_BUTTON_HYBRID)
-            {
-                active_rect.width -= 8;
-                if(state & wxRIBBON_TOOLBAR_TOOL_DROPDOWN_ACTIVE)
-                {
-                    active_rect.x += active_rect.width;
-                    active_rect.width = 8;
-                }
-            }
-            dc.SetBrush(m_tool_active_background_brush);
-            dc.DrawRectangle(active_rect.x, active_rect.y, active_rect.width,
-                active_rect.height);
-        }
-    }
-
-    // Border
-    if(is_custom_bg)
-        dc.SetPen(m_toolbar_hover_borden_pen);
-    else
-        dc.SetPen(m_toolbar_border_pen);
-    if((state & wxRIBBON_TOOLBAR_TOOL_FIRST) == 0)
-    {
-        wxColour existing;
-        if(!dc.GetPixel(rect.x, rect.y + 1, &existing) ||
-            existing != m_toolbar_hover_borden_pen.GetColour())
-        {
-            dc.DrawLine(rect.x, rect.y + 1, rect.x, rect.y + rect.height - 1);
-        }
-    }
-    if(is_custom_bg)
-    {
-        wxRect border_rect(bg_rect);
-        border_rect.Inflate(1);
-        dc.SetBrush(*wxTRANSPARENT_BRUSH);
-        dc.DrawRectangle(border_rect.x, border_rect.y, border_rect.width,
-            border_rect.height);
-    }
-
-    // Foreground
-    int avail_width = bg_rect.GetWidth();
-    if(kind & wxRIBBON_BUTTON_DROPDOWN)
-    {
-        avail_width -= 8;
-        if(is_split_hybrid)
-        {
-            dc.DrawLine(rect.x + avail_width + 1, rect.y,
-                rect.x + avail_width + 1, rect.y + rect.height);
-        }
-        dc.DrawBitmap(m_toolbar_drop_bitmap, bg_rect.x + avail_width + 2,
-            bg_rect.y + (bg_rect.height / 2) - 2, true);
-    }
-    dc.DrawBitmap(bitmap, bg_rect.x + (avail_width - bitmap.GetWidth()) / 2,
-        bg_rect.y + (bg_rect.height - bitmap.GetHeight()) / 2, true);
-}
-
-#endif // wxUSE_RIBBON
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/art_internal.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/art_internal.cpp
deleted file mode 100644
index de7c1d9fa3..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/art_internal.cpp
+++ /dev/null
@@ -1,258 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/ribbon/art_internal.cpp
-// Purpose:     Helper functions & classes used by ribbon art providers
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-08-04
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_RIBBON
-
-#include "wx/ribbon/art.h"
-#include "wx/ribbon/art_internal.h"
-#include "wx/ribbon/bar.h"
-#include "wx/ribbon/buttonbar.h"
-#include "wx/ribbon/gallery.h"
-
-#ifndef WX_PRECOMP
-#include "wx/dc.h"
-#endif
-
-#ifdef __WXMSW__
-#include "wx/msw/private.h"
-#endif
-
-wxRibbonArtProvider::wxRibbonArtProvider() {}
-wxRibbonArtProvider::~wxRibbonArtProvider() {}
-
-wxColour wxRibbonInterpolateColour(const wxColour& start_colour,
-                                const wxColour& end_colour,
-                                int position,
-                                int start_position,
-                                int end_position)
-{
-    if(position <= start_position)
-    {
-        return start_colour;
-    }
-    if(position >= end_position)
-    {
-        return end_colour;
-    }
-    position -= start_position;
-    end_position -= start_position;
-    int r = end_colour.Red() - start_colour.Red();
-    int g = end_colour.Green() - start_colour.Green();
-    int b = end_colour.Blue() - start_colour.Blue();
-    r = start_colour.Red()   + (((r * position * 100) / end_position) / 100);
-    g = start_colour.Green() + (((g * position * 100) / end_position) / 100);
-    b = start_colour.Blue()  + (((b * position * 100) / end_position) / 100);
-    return wxColour(r, g, b);
-}
-
-bool wxRibbonCanLabelBreakAtPosition(const wxString& label, size_t pos)
-{
-    return label[pos] == ' ';
-}
-
-void wxRibbonDrawParallelGradientLines(wxDC& dc,
-                                    int nlines,
-                                    const wxPoint* line_origins,
-                                    int stepx,
-                                    int stepy,
-                                    int numsteps,
-                                    int offset_x,
-                                    int offset_y,
-                                    const wxColour& start_colour,
-                                    const wxColour& end_colour)
-{
-    int rd, gd, bd;
-    rd = end_colour.Red() - start_colour.Red();
-    gd = end_colour.Green() - start_colour.Green();
-    bd = end_colour.Blue() - start_colour.Blue();
-
-    for (int step = 0; step < numsteps; ++step)
-    {
-        int r,g,b;
-
-        r = start_colour.Red() + (((step*rd*100)/numsteps)/100);
-        g = start_colour.Green() + (((step*gd*100)/numsteps)/100);
-        b = start_colour.Blue() + (((step*bd*100)/numsteps)/100);
-
-        wxPen p(wxColour((unsigned char)r,
-                        (unsigned char)g,
-                        (unsigned char)b));
-        dc.SetPen(p);
-
-        for(int n = 0; n < nlines; ++n)
-        {
-            dc.DrawLine(offset_x + line_origins[n].x, offset_y + line_origins[n].y,
-                        offset_x + line_origins[n].x + stepx, offset_y + line_origins[n].y + stepy);
-        }
-
-        offset_x += stepx;
-        offset_y += stepy;
-    }
-}
-
-wxRibbonHSLColour wxRibbonShiftLuminance(wxRibbonHSLColour colour,
-                                                float amount)
-{
-    if(amount <= 1.0f)
-        return colour.Darker(colour.luminance * (1.0f - amount));
-    else
-        return colour.Lighter((1.0f - colour.luminance) * (amount - 1.0f));
-}
-
-wxBitmap wxRibbonLoadPixmap(const char* const* bits, wxColour fore)
-{
-    wxImage xpm = wxBitmap(bits).ConvertToImage();
-    xpm.Replace(255, 0, 255, fore.Red(), fore.Green(), fore.Blue());
-    return wxBitmap(xpm);
-}
-
-wxRibbonHSLColour::wxRibbonHSLColour(const wxColour& col)
-{
-    float red = float(col.Red()) / 255.0;
-    float green = float(col.Green()) / 255.0;
-    float blue = float(col.Blue()) / 255.0;
-    float Min = wxMin(red, wxMin(green, blue));
-    float Max = wxMax(red, wxMax(green, blue));
-    luminance = 0.5 * (Max + Min);
-    if (Min == Max)
-    {
-        // colour is a shade of grey
-        hue = 0.0;
-        saturation = 0.0;
-    }
-    else
-    {
-        if(luminance <= 0.5)
-            saturation = (Max - Min) / (Max + Min);
-        else
-            saturation = (Max - Min) / (2.0 - (Max + Min));
-
-        if(Max == red)
-        {
-            hue = 60.0 * (green - blue) / (Max - Min);
-            if(hue < 0.0)
-                hue += 360.0;
-        }
-        else if(Max == green)
-        {
-            hue = 60.0 * (blue - red) / (Max - Min);
-            hue += 120.0;
-        }
-        else // Max == blue
-        {
-            hue = 60.0 * (red - green) / (Max - Min);
-            hue += 240.0;
-        }
-    }
-}
-
-wxColour wxRibbonHSLColour::ToRGB() const
-{
-    float _hue = (hue - floor(hue / 360.0f) * 360.0f);
-    float _saturation = saturation;
-    float _luminance = luminance;
-    if(_saturation > 1.0) _saturation = 1.0;
-    if(_saturation < 0.0) _saturation = 0.0;
-    if(_luminance > 1.0) _luminance = 1.0;
-    if(_luminance < 0.0) _luminance = 0.0;
-
-    float red, blue, green;
-    if(_saturation == 0.0)
-    {
-        // colour is a shade of grey
-        red = blue = green = _luminance;
-    }
-    else
-    {
-        double tmp2 = (_luminance < 0.5)
-           ? _luminance * (1.0 + _saturation)
-           : (_luminance + _saturation) - (_luminance * _saturation);
-        double tmp1 = 2.0 * _luminance - tmp2;
-
-        double tmp3R = _hue + 120.0;
-        if(tmp3R > 360.0)
-            tmp3R -= 360.0;
-        if(tmp3R < 60.0)
-            red = tmp1 + (tmp2 - tmp1) * tmp3R / 60.0;
-        else if(tmp3R < 180.0)
-            red = tmp2;
-        else if(tmp3R < 240.0)
-            red = tmp1 + (tmp2 - tmp1) * (240.0 - tmp3R) / 60.0;
-        else
-            red = tmp1;
-
-        double tmp3G = _hue;
-        if(tmp3G > 360.0)
-            tmp3G -= 360.0;
-        if(tmp3G < 60.0)
-            green = tmp1 + (tmp2 - tmp1) * tmp3G / 60.0;
-        else if(tmp3G < 180.0)
-            green = tmp2;
-        else if(tmp3G < 240.0)
-            green = tmp1 + (tmp2 - tmp1) * (240.0 - tmp3G) / 60.0;
-        else
-            green = tmp1;
-
-        double tmp3B = _hue + 240.0;
-        if(tmp3B > 360.0)
-            tmp3B -= 360.0;
-        if(tmp3B < 60.0)
-            blue = tmp1 + (tmp2 - tmp1) * tmp3B / 60.0;
-        else if(tmp3B < 180.0)
-            blue = tmp2;
-        else if(tmp3B < 240.0)
-            blue = tmp1 + (tmp2 - tmp1) * (240.0 - tmp3B) / 60.0;
-        else
-            blue = tmp1;
-    }
-    return wxColour(
-        (unsigned char)(red * 255.0),
-        (unsigned char)(green * 255.0),
-        (unsigned char)(blue * 255.0));
-}
-
-wxRibbonHSLColour wxRibbonHSLColour::Darker(float delta) const
-{
-    return Lighter(-delta);
-}
-
-wxRibbonHSLColour& wxRibbonHSLColour::MakeDarker(float delta)
-{
-    luminance -= delta;
-    return *this;
-}
-
-wxRibbonHSLColour wxRibbonHSLColour::Lighter(float delta) const
-{
-    return wxRibbonHSLColour(hue, saturation, luminance + delta);
-}
-
-wxRibbonHSLColour wxRibbonHSLColour::Saturated(float delta) const
-{
-    return wxRibbonHSLColour(hue, saturation + delta, luminance);
-}
-
-wxRibbonHSLColour wxRibbonHSLColour::Desaturated(float delta) const
-{
-    return Saturated(-delta);
-}
-
-wxRibbonHSLColour wxRibbonHSLColour::ShiftHue(float delta) const
-{
-    return wxRibbonHSLColour(hue + delta, saturation, luminance);
-}
-
-#endif // wxUSE_RIBBON
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/art_msw.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/art_msw.cpp
deleted file mode 100644
index 425474922f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/art_msw.cpp
+++ /dev/null
@@ -1,3209 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/ribbon/art_msw.cpp
-// Purpose:     MSW style art provider for ribbon interface
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-05-25
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_RIBBON
-
-#include "wx/ribbon/art.h"
-#include "wx/ribbon/art_internal.h"
-#include "wx/ribbon/buttonbar.h"
-#include "wx/ribbon/gallery.h"
-#include "wx/ribbon/toolbar.h"
-
-#ifndef WX_PRECOMP
-#include "wx/dcmemory.h"
-#endif
-
-#ifdef __WXMSW__
-#include "wx/msw/private.h"
-#endif
-
-static const char* const gallery_up_xpm[] = {
-  "5 5 2 1",
-  "  c None",
-  "x c #FF00FF",
-  "     ",
-  "  x  ",
-  " xxx ",
-  "xxxxx",
-  "     "};
-
-static const char* const gallery_down_xpm[] = {
-  "5 5 2 1",
-  "  c None",
-  "x c #FF00FF",
-  "     ",
-  "xxxxx",
-  " xxx ",
-  "  x  ",
-  "     "};
-
-static const char* const gallery_left_xpm[] = {
-  "5 5 2 1",
-  "  c None",
-  "x c #FF00FF",
-  "   x ",
-  "  xx ",
-  " xxx ",
-  "  xx ",
-  "   x "};
-
-static const char* const gallery_right_xpm[] = {
-  "5 5 2 1",
-  "  c None",
-  "x c #FF00FF",
-  " x   ",
-  " xx  ",
-  " xxx ",
-  " xx  ",
-  " x   "};
-
-static const char* const gallery_extension_xpm[] = {
-  "5 5 2 1",
-  "  c None",
-  "x c #FF00FF",
-  "xxxxx",
-  "     ",
-  "xxxxx",
-  " xxx ",
-  "  x  "};
-
-static const char* const panel_extension_xpm[] = {
-  "7 7 2 1",
-  "  c None",
-  "x c #FF00FF",
-  "xxxxxx ",
-  "x      ",
-  "x      ",
-  "x  x  x",
-  "x   xxx",
-  "x   xxx",
-  "   xxxx"};
-
-static const char* const panel_toggle_down_xpm[] = {
-  "7 9 2 1",
-  "  c None",
-  "x c #FF00FF",
-  "       ",
-  "x     x",
-  "xx   xx",
-  " xx xx ",
-  "x xxx x",
-  "xx x xx",
-  " xx xx ",
-  "  xxx  ",
-  "   x   ",};
-
-static const char* const panel_toggle_up_xpm[] = {
-  "7 9 2 1",
-  "  c None",
-  "x c #FF00FF",
-  "   x   ",
-  "  xxx  ",
-  " xx xx ",
-  "xx x xx",
-  "x xxx x",
-  " xx xx ",
-  "xx   xx",
-  "x     x",
-  "       ",};
-
-static const char* const ribbon_toggle_pin_xpm[] = {
-  "12 9 3 1",
-  "  c None",
-  "x c #FF00FF",
-  ". c #FF00FF",
-  "   xx       ",
-  "   x.x   xxx",
-  "   x..xxx..x",
-  "xxxx.......x",
-  "x..........x",
-  "xxxx.......x",
-  "   x..xxx..x",
-  "   x.x   xxx",
-  "   xx       "
-};
-
-static const char * const ribbon_help_button_xpm[] = {
-"12 12 112 2",
-"   c #163B95",
-".  c none",
-"X  c #1B3F98",
-"o  c #1B4097",
-"O  c #1D4198",
-"+  c #1E4298",
-"@  c #1E439B",
-"#  c #1A419F",
-"$  c #1E439D",
-"%  c #204398",
-"&  c #204399",
-"*  c #25479B",
-"=  c #25489A",
-"-  c #284A9D",
-";  c #2A4C9D",
-":  c #30519E",
-">  c #3B589A",
-",  c #3D599B",
-"<  c #1840A2",
-"1  c #1E45A1",
-"2  c #1E4AB4",
-"3  c #2D4FA0",
-"4  c #224AAC",
-"5  c #254DAC",
-"6  c #294FA9",
-"7  c #2B52AE",
-"8  c #3051A0",
-"9  c #3354A0",
-"0  c #3354A2",
-"q  c #3454A3",
-"w  c #3456A4",
-"e  c #3556A4",
-"r  c #3C5BA3",
-"t  c #395AA6",
-"y  c #3E5CA6",
-"u  c #3E5DA7",
-"i  c #3F5EA6",
-"p  c #2A51B0",
-"a  c #2E55B5",
-"s  c #2752BA",
-"d  c #3058B8",
-"f  c #3F61B2",
-"g  c #415FA7",
-"h  c #4562A7",
-"j  c #4864A7",
-"k  c #4D67A5",
-"l  c #4361A8",
-"z  c #4361A9",
-"x  c #4663A8",
-"c  c #4563AA",
-"v  c #4764AA",
-"b  c #4B68AE",
-"n  c #506AA8",
-"m  c #516DAD",
-"M  c #546EAC",
-"N  c #5F75AB",
-"B  c #5A72AC",
-"V  c #5C77B6",
-"C  c #6C7DA7",
-"Z  c #6077AD",
-"A  c #687DAF",
-"S  c #637BB4",
-"D  c #687FB7",
-"F  c #2D59C1",
-"G  c #2E5AC2",
-"H  c #2F5ECE",
-"J  c #3763CC",
-"K  c #4169CB",
-"L  c #7787AC",
-"P  c #7E8CAE",
-"I  c #7A8BB5",
-"U  c #7B8CB4",
-"Y  c #7C8FBD",
-"T  c #758FCA",
-"R  c #808CA8",
-"E  c #969DAF",
-"W  c #8291B4",
-"Q  c #8A95B0",
-"!  c #8B96B1",
-"~  c #8F9AB3",
-"^  c #8D98B5",
-"/  c #8E9AB7",
-"(  c #8997B8",
-")  c #949EB9",
-"_  c #99A1B4",
-"`  c #ADAFB7",
-"'  c #A5ABB8",
-"]  c #A6ABB8",
-"[  c #AAAFBE",
-"{  c #AFB2BE",
-"}  c #B0B1B6",
-"|  c #BAB8B6",
-" . c #B4B5BC",
-".. c #B6B9BF",
-"X. c #BBB9B8",
-"o. c #8C9DC3",
-"O. c #8EA3D4",
-"+. c #97AAD4",
-"@. c #ACB5C9",
-"#. c #B3B7C0",
-"$. c #A1B1D5",
-"%. c #BAC3D7",
-"&. c #BEC6D6",
-"*. c #D7D2C7",
-"=. c #C2C8D6",
-"-. c #D2D6DF",
-";. c #E8E4DA",
-":. c #CED5E4",
-">. c #FFF9EC",
-",. c #F3F4F5",
-"<. c #F6F8FB",
-"1. c None",
-/* pixels */
-"1.1.1.1.#./ W ~ } 1.1.1.",
-"1.1.1.U r c b t h Q 1.1.",
-"1.1.A 3 $.<.,.&.m w ^ 1.",
-"1.( 0 z :.%.=.;.) e x ` ",
-"1.n u v M * B *.R O @ P ",
-"' i z l - 9 { | > $ # Z ",
-"_ y l ; & [ X., 1 6 4 D ",
-"] g 8 o :  .C < 7 a s o.",
-"1.k X % = I S 5 d G K ..",
-"1.! .   j >.-.p F H +.1.",
-"1.1.L X + Y V 2 J O.1.1.",
-"1.1.1.E N q f T @.1.1.1."
-};
-
-wxRibbonMSWArtProvider::wxRibbonMSWArtProvider(bool set_colour_scheme)
-{
-    m_flags = 0;
-#if defined( __WXMAC__ )
-    m_tab_label_font = *wxSMALL_FONT;
-#else
-    m_tab_label_font = *wxNORMAL_FONT;
-#endif
-    m_button_bar_label_font = m_tab_label_font;
-    m_panel_label_font = m_tab_label_font;
-
-    if(set_colour_scheme)
-    {
-        SetColourScheme(
-            wxColour(194, 216, 241),
-            wxColour(255, 223, 114),
-            wxColour(  0,   0,   0));
-    }
-
-    m_cached_tab_separator_visibility = -10.0; // valid visibilities are in range [0, 1]
-    m_tab_separation_size = 3;
-    m_page_border_left = 2;
-    m_page_border_top = 1;
-    m_page_border_right = 2;
-    m_page_border_bottom = 3;
-    m_panel_x_separation_size = 1;
-    m_panel_y_separation_size = 1;
-    m_tool_group_separation_size = 3;
-    m_gallery_bitmap_padding_left_size = 4;
-    m_gallery_bitmap_padding_right_size = 4;
-    m_gallery_bitmap_padding_top_size = 4;
-    m_gallery_bitmap_padding_bottom_size = 4;
-    m_toggle_button_offset = 22;
-    m_help_button_offset = 22;
-}
-
-wxRibbonMSWArtProvider::~wxRibbonMSWArtProvider()
-{
-}
-
-void wxRibbonMSWArtProvider::GetColourScheme(
-                         wxColour* primary,
-                         wxColour* secondary,
-                         wxColour* tertiary) const
-{
-    if(primary != NULL)
-        *primary = m_primary_scheme_colour;
-    if(secondary != NULL)
-        *secondary = m_secondary_scheme_colour;
-    if(tertiary != NULL)
-        *tertiary = m_tertiary_scheme_colour;
-}
-
-void wxRibbonMSWArtProvider::SetColourScheme(
-                         const wxColour& primary,
-                         const wxColour& secondary,
-                         const wxColour& tertiary)
-{
-    m_primary_scheme_colour = primary;
-    m_secondary_scheme_colour = secondary;
-    m_tertiary_scheme_colour = tertiary;
-
-    wxRibbonHSLColour primary_hsl(primary);
-    wxRibbonHSLColour secondary_hsl(secondary);
-    // tertiary not used for anything
-
-    // Map primary saturation from [0, 1] to [.25, .75]
-    bool primary_is_gray = false;
-    static const double gray_saturation_threshold = 0.01;
-    if(primary_hsl.saturation <= gray_saturation_threshold)
-        primary_is_gray = true;
-    else
-    {
-        primary_hsl.saturation = cos(primary_hsl.saturation * M_PI)
-            * -0.25 + 0.5;
-    }
-
-    // Map primary luminance from [0, 1] to [.23, .83]
-    primary_hsl.luminance = cos(primary_hsl.luminance * M_PI) * -0.3 + 0.53;
-
-    // Map secondary saturation from [0, 1] to [0.16, 0.84]
-    bool secondary_is_gray = false;
-    if(secondary_hsl.saturation <= gray_saturation_threshold)
-        secondary_is_gray = true;
-    else
-    {
-        secondary_hsl.saturation = cos(secondary_hsl.saturation * M_PI)
-            * -0.34 + 0.5;
-    }
-
-    // Map secondary luminance from [0, 1] to [0.1, 0.9]
-    secondary_hsl.luminance = cos(secondary_hsl.luminance * M_PI) * -0.4 + 0.5;
-
-#define LikePrimary(h, s, l) \
-    primary_hsl.ShiftHue(h ## f).Saturated(primary_is_gray ? 0 : s ## f) \
-    .Lighter(l ## f).ToRGB()
-#define LikeSecondary(h, s, l) \
-    secondary_hsl.ShiftHue(h ## f).Saturated(secondary_is_gray ? 0 : s ## f) \
-    .Lighter(l ## f).ToRGB()
-
-    m_page_border_pen = LikePrimary(1.4, 0.00, -0.08);
-
-    m_page_background_top_colour = LikePrimary(-0.1, -0.03, 0.12);
-    m_page_hover_background_top_colour = LikePrimary(-2.8, 0.27, 0.17);
-    m_page_background_top_gradient_colour = LikePrimary(0.1, -0.10, 0.08);
-    m_page_hover_background_top_gradient_colour = LikePrimary(3.2, 0.16, 0.13);
-    m_page_background_colour = LikePrimary(0.4, -0.09, 0.05);
-    m_page_hover_background_colour = LikePrimary(0.1, 0.19, 0.10);
-    m_page_background_gradient_colour = LikePrimary(-3.2, 0.27, 0.10);
-    m_page_hover_background_gradient_colour = LikePrimary(1.8, 0.01, 0.15);
-
-    m_tab_active_background_colour = LikePrimary(-0.1, -0.31, 0.16);
-    m_tab_active_background_gradient_colour = LikePrimary(-0.1, -0.03, 0.12);
-    m_tab_separator_colour = LikePrimary(0.9, 0.24, 0.05);
-    m_tab_ctrl_background_brush = LikePrimary(1.0, 0.39, 0.07);
-    m_tab_hover_background_colour = LikePrimary(1.3, 0.15, 0.10);
-    m_tab_hover_background_top_colour = LikePrimary(1.4, 0.36, 0.08);
-    m_tab_border_pen = LikePrimary(1.4, 0.03, -0.05);
-    m_tab_separator_gradient_colour = LikePrimary(1.7, -0.15, -0.18);
-    m_tab_hover_background_top_gradient_colour = LikePrimary(1.8, 0.34, 0.13);
-    m_tab_label_colour = LikePrimary(4.3, 0.13, -0.49);
-    m_tab_hover_background_gradient_colour = LikeSecondary(-1.5, -0.34, 0.01);
-
-    m_panel_minimised_border_gradient_pen = LikePrimary(-6.9, -0.17, -0.09);
-    m_panel_minimised_border_pen = LikePrimary(-5.3, -0.24, -0.06);
-    m_panel_border_gradient_pen = LikePrimary(-5.2, -0.15, -0.06);
-    m_panel_border_pen = LikePrimary(-2.8, -0.32, 0.02);
-    m_panel_label_background_brush = LikePrimary(-1.5, 0.03, 0.05);
-    m_panel_active_background_gradient_colour = LikePrimary(0.5, 0.34, 0.05);
-    m_panel_hover_label_background_brush = LikePrimary(1.0, 0.30, 0.09);
-    m_panel_active_background_top_gradient_colour = LikePrimary(1.4, -0.17, -0.13);
-    m_panel_active_background_colour = LikePrimary(1.6, -0.18, -0.18);
-    m_panel_active_background_top_colour = LikePrimary(1.7, -0.20, -0.03);
-    m_panel_label_colour = LikePrimary(2.8, -0.14, -0.35);
-    m_panel_hover_label_colour = m_panel_label_colour;
-    m_panel_minimised_label_colour = m_tab_label_colour;
-    m_panel_hover_button_background_brush = LikeSecondary(-0.9, 0.16, -0.07);
-    m_panel_hover_button_border_pen = LikeSecondary(-3.9, -0.16, -0.14);
-    SetColour(wxRIBBON_ART_PANEL_BUTTON_FACE_COLOUR, LikePrimary(1.4, -0.21, -0.23));
-    SetColour(wxRIBBON_ART_PANEL_BUTTON_HOVER_FACE_COLOUR, LikePrimary(1.5, -0.24, -0.29));
-
-    m_ribbon_toggle_brush = LikeSecondary(-0.9, 0.16, -0.07);
-    m_ribbon_toggle_pen = LikeSecondary(-3.9, -0.16, -0.14);
-    SetColour(wxRIBBON_ART_PAGE_TOGGLE_FACE_COLOUR, LikePrimary(1.7, -0.20, -0.15));
-    SetColour(wxRIBBON_ART_PAGE_TOGGLE_HOVER_FACE_COLOUR, LikePrimary(1.8, -0.23, -0.21));
-
-    m_gallery_button_disabled_background_colour = LikePrimary(-2.8, -0.46, 0.09);
-    m_gallery_button_disabled_background_top_brush = LikePrimary(-2.8, -0.36, 0.15);
-    m_gallery_hover_background_brush = LikePrimary(-0.8, 0.05, 0.15);
-    m_gallery_border_pen = LikePrimary(0.7, -0.02, 0.03);
-    m_gallery_button_background_top_brush = LikePrimary(0.8, 0.34, 0.13);
-    m_gallery_button_background_colour = LikePrimary(1.3, 0.10, 0.08);
-    // SetColour used so that the relevant bitmaps are generated
-    SetColour(wxRIBBON_ART_GALLERY_BUTTON_FACE_COLOUR, LikePrimary(1.4, -0.21, -0.23));
-    SetColour(wxRIBBON_ART_GALLERY_BUTTON_HOVER_FACE_COLOUR, LikePrimary(1.5, -0.24, -0.29));
-    SetColour(wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_FACE_COLOUR, LikePrimary(1.5, -0.24, -0.29));
-    SetColour(wxRIBBON_ART_GALLERY_BUTTON_DISABLED_FACE_COLOUR, LikePrimary(0.0, -1.0, 0.0));
-    m_gallery_button_disabled_background_gradient_colour = LikePrimary(1.5, -0.43, 0.12);
-    m_gallery_button_background_gradient_colour = LikePrimary(1.7, 0.11, 0.09);
-    m_gallery_item_border_pen = LikeSecondary(-3.9, -0.16, -0.14);
-    m_gallery_button_hover_background_colour = LikeSecondary(-0.9, 0.16, -0.07);
-    m_gallery_button_hover_background_gradient_colour = LikeSecondary(0.1, 0.12, 0.03);
-    m_gallery_button_hover_background_top_brush = LikeSecondary(4.3, 0.16, 0.17);
-
-    m_gallery_button_active_background_colour = LikeSecondary(-9.9, 0.03, -0.22);
-    m_gallery_button_active_background_gradient_colour = LikeSecondary(-9.5, 0.14, -0.11);
-    m_gallery_button_active_background_top_brush = LikeSecondary(-9.0, 0.15, -0.08);
-
-    m_button_bar_label_colour = m_tab_label_colour;
-    m_button_bar_label_disabled_colour = m_tab_label_colour;
-
-    m_button_bar_hover_border_pen = LikeSecondary(-6.2, -0.47, -0.14);
-    m_button_bar_hover_background_gradient_colour = LikeSecondary(-0.6, 0.16, 0.04);
-    m_button_bar_hover_background_colour = LikeSecondary(-0.2, 0.16, -0.10);
-    m_button_bar_hover_background_top_gradient_colour = LikeSecondary(0.2, 0.16, 0.03);
-    m_button_bar_hover_background_top_colour = LikeSecondary(8.8, 0.16, 0.17);
-    m_button_bar_active_border_pen = LikeSecondary(-6.2, -0.47, -0.25);
-    m_button_bar_active_background_top_colour = LikeSecondary(-8.4, 0.08, 0.06);
-    m_button_bar_active_background_top_gradient_colour = LikeSecondary(-9.7, 0.13, -0.07);
-    m_button_bar_active_background_colour = LikeSecondary(-9.9, 0.14, -0.14);
-    m_button_bar_active_background_gradient_colour = LikeSecondary(-8.7, 0.17, -0.03);
-
-    m_toolbar_border_pen = LikePrimary(1.4, -0.21, -0.16);
-    SetColour(wxRIBBON_ART_TOOLBAR_FACE_COLOUR, LikePrimary(1.4, -0.17, -0.22));
-    m_tool_background_top_colour = LikePrimary(-1.9, -0.07, 0.06);
-    m_tool_background_top_gradient_colour = LikePrimary(1.4, 0.12, 0.08);
-    m_tool_background_colour = LikePrimary(1.4, -0.09, 0.03);
-    m_tool_background_gradient_colour = LikePrimary(1.9, 0.11, 0.09);
-    m_tool_hover_background_top_colour = LikeSecondary(3.4, 0.11, 0.16);
-    m_tool_hover_background_top_gradient_colour = LikeSecondary(-1.4, 0.04, 0.08);
-    m_tool_hover_background_colour = LikeSecondary(-1.8, 0.16, -0.12);
-    m_tool_hover_background_gradient_colour = LikeSecondary(-2.6, 0.16, 0.05);
-    m_tool_active_background_top_colour = LikeSecondary(-9.9, -0.12, -0.09);
-    m_tool_active_background_top_gradient_colour = LikeSecondary(-8.5, 0.16, -0.12);
-    m_tool_active_background_colour = LikeSecondary(-7.9, 0.16, -0.20);
-    m_tool_active_background_gradient_colour = LikeSecondary(-6.6, 0.16, -0.10);
-
-#undef LikePrimary
-#undef LikeSecondary
-
-    // Invalidate cached tab separator
-    m_cached_tab_separator_visibility = -1.0;
-}
-
-wxRibbonArtProvider* wxRibbonMSWArtProvider::Clone() const
-{
-    wxRibbonMSWArtProvider *copy = new wxRibbonMSWArtProvider;
-    CloneTo(copy);
-    return copy;
-}
-
-void wxRibbonMSWArtProvider::CloneTo(wxRibbonMSWArtProvider* copy) const
-{
-    int i;
-    for(i = 0; i < 4; ++i)
-    {
-        copy->m_gallery_up_bitmap[i] = m_gallery_up_bitmap[i];
-        copy->m_gallery_down_bitmap[i] = m_gallery_down_bitmap[i];
-        copy->m_gallery_extension_bitmap[i] = m_gallery_extension_bitmap[i];
-    }
-    for(i = 0; i < 2; ++i)
-    {
-        copy->m_panel_extension_bitmap[i] = m_panel_extension_bitmap[i];
-        copy->m_ribbon_toggle_up_bitmap[i] = m_ribbon_toggle_up_bitmap[i];
-        copy->m_ribbon_toggle_down_bitmap[i] = m_ribbon_toggle_down_bitmap[i];
-        copy->m_ribbon_toggle_pin_bitmap[i] = m_ribbon_toggle_pin_bitmap[i];
-        copy->m_ribbon_bar_help_button_bitmap[i] = m_ribbon_bar_help_button_bitmap[i];
-    }
-    copy->m_toolbar_drop_bitmap = m_toolbar_drop_bitmap;
-
-    copy->m_primary_scheme_colour = m_primary_scheme_colour;
-    copy->m_secondary_scheme_colour = m_secondary_scheme_colour;
-    copy->m_tertiary_scheme_colour = m_tertiary_scheme_colour;
-
-    copy->m_page_toggle_face_colour = m_page_toggle_face_colour;
-    copy->m_page_toggle_hover_face_colour = m_page_toggle_hover_face_colour;
-
-    copy->m_button_bar_label_colour = m_button_bar_label_colour;
-    copy->m_button_bar_label_disabled_colour = m_button_bar_label_disabled_colour;
-    copy->m_tab_label_colour = m_tab_label_colour;
-    copy->m_tab_separator_colour = m_tab_separator_colour;
-    copy->m_tab_separator_gradient_colour = m_tab_separator_gradient_colour;
-    copy->m_tab_active_background_colour = m_tab_hover_background_colour;
-    copy->m_tab_active_background_gradient_colour = m_tab_hover_background_gradient_colour;
-    copy->m_tab_hover_background_colour = m_tab_hover_background_colour;
-    copy->m_tab_hover_background_gradient_colour = m_tab_hover_background_gradient_colour;
-    copy->m_tab_hover_background_top_colour = m_tab_hover_background_top_colour;
-    copy->m_tab_hover_background_top_gradient_colour = m_tab_hover_background_top_gradient_colour;
-    copy->m_panel_label_colour = m_panel_label_colour;
-    copy->m_panel_hover_label_colour = m_panel_hover_label_colour;
-    copy->m_panel_minimised_label_colour = m_panel_minimised_label_colour;
-    copy->m_panel_button_face_colour = m_panel_button_face_colour;
-    copy->m_panel_button_hover_face_colour = m_panel_button_hover_face_colour;
-    copy->m_panel_active_background_colour = m_panel_active_background_colour;
-    copy->m_panel_active_background_gradient_colour = m_panel_active_background_gradient_colour;
-    copy->m_panel_active_background_top_colour = m_panel_active_background_top_colour;
-    copy->m_panel_active_background_top_gradient_colour = m_panel_active_background_top_gradient_colour;
-    copy->m_page_background_colour = m_page_background_colour;
-    copy->m_page_background_gradient_colour = m_page_background_gradient_colour;
-    copy->m_page_background_top_colour = m_page_background_top_colour;
-    copy->m_page_background_top_gradient_colour = m_page_background_top_gradient_colour;
-    copy->m_page_hover_background_colour = m_page_hover_background_colour;
-    copy->m_page_hover_background_gradient_colour = m_page_hover_background_gradient_colour;
-    copy->m_page_hover_background_top_colour = m_page_hover_background_top_colour;
-    copy->m_page_hover_background_top_gradient_colour = m_page_hover_background_top_gradient_colour;
-    copy->m_button_bar_hover_background_colour = m_button_bar_hover_background_colour;
-    copy->m_button_bar_hover_background_gradient_colour = m_button_bar_hover_background_gradient_colour;
-    copy->m_button_bar_hover_background_top_colour = m_button_bar_hover_background_top_colour;
-    copy->m_button_bar_hover_background_top_gradient_colour = m_button_bar_hover_background_top_gradient_colour;
-    copy->m_button_bar_active_background_colour = m_button_bar_active_background_colour;
-    copy->m_button_bar_active_background_gradient_colour = m_button_bar_active_background_gradient_colour;
-    copy->m_button_bar_active_background_top_colour = m_button_bar_active_background_top_colour;
-    copy->m_button_bar_active_background_top_gradient_colour = m_button_bar_active_background_top_gradient_colour;
-    copy->m_gallery_button_background_colour = m_gallery_button_background_colour;
-    copy->m_gallery_button_background_gradient_colour = m_gallery_button_background_gradient_colour;
-    copy->m_gallery_button_hover_background_colour = m_gallery_button_hover_background_colour;
-    copy->m_gallery_button_hover_background_gradient_colour = m_gallery_button_hover_background_gradient_colour;
-    copy->m_gallery_button_active_background_colour = m_gallery_button_active_background_colour;
-    copy->m_gallery_button_active_background_gradient_colour = m_gallery_button_active_background_gradient_colour;
-    copy->m_gallery_button_disabled_background_colour = m_gallery_button_disabled_background_colour;
-    copy->m_gallery_button_disabled_background_gradient_colour = m_gallery_button_disabled_background_gradient_colour;
-    copy->m_gallery_button_face_colour = m_gallery_button_face_colour;
-    copy->m_gallery_button_hover_face_colour = m_gallery_button_hover_face_colour;
-    copy->m_gallery_button_active_face_colour = m_gallery_button_active_face_colour;
-    copy->m_gallery_button_disabled_face_colour = m_gallery_button_disabled_face_colour;
-
-    copy->m_tab_ctrl_background_brush = m_tab_ctrl_background_brush;
-    copy->m_panel_label_background_brush = m_panel_label_background_brush;
-    copy->m_panel_hover_label_background_brush = m_panel_hover_label_background_brush;
-    copy->m_panel_hover_button_background_brush = m_panel_hover_button_background_brush;
-    copy->m_gallery_hover_background_brush = m_gallery_hover_background_brush;
-    copy->m_gallery_button_background_top_brush = m_gallery_button_background_top_brush;
-    copy->m_gallery_button_hover_background_top_brush = m_gallery_button_hover_background_top_brush;
-    copy->m_gallery_button_active_background_top_brush = m_gallery_button_active_background_top_brush;
-    copy->m_gallery_button_disabled_background_top_brush = m_gallery_button_disabled_background_top_brush;
-    copy->m_ribbon_toggle_brush = m_ribbon_toggle_brush;
-
-    copy->m_tab_label_font = m_tab_label_font;
-    copy->m_button_bar_label_font = m_button_bar_label_font;
-    copy->m_panel_label_font = m_panel_label_font;
-
-    copy->m_page_border_pen = m_page_border_pen;
-    copy->m_panel_border_pen = m_panel_border_pen;
-    copy->m_panel_border_gradient_pen = m_panel_border_gradient_pen;
-    copy->m_panel_minimised_border_pen = m_panel_minimised_border_pen;
-    copy->m_panel_minimised_border_gradient_pen = m_panel_minimised_border_gradient_pen;
-    copy->m_panel_hover_button_border_pen = m_panel_hover_button_border_pen;
-    copy->m_tab_border_pen = m_tab_border_pen;
-    copy->m_gallery_border_pen = m_gallery_border_pen;
-    copy->m_button_bar_hover_border_pen = m_button_bar_hover_border_pen;
-    copy->m_button_bar_active_border_pen = m_button_bar_active_border_pen;
-    copy->m_gallery_item_border_pen = m_gallery_item_border_pen;
-    copy->m_toolbar_border_pen = m_toolbar_border_pen;
-    copy->m_ribbon_toggle_pen = m_ribbon_toggle_pen;
-
-    copy->m_flags = m_flags;
-    copy->m_tab_separation_size = m_tab_separation_size;
-    copy->m_page_border_left = m_page_border_left;
-    copy->m_page_border_top = m_page_border_top;
-    copy->m_page_border_right = m_page_border_right;
-    copy->m_page_border_bottom = m_page_border_bottom;
-    copy->m_panel_x_separation_size = m_panel_x_separation_size;
-    copy->m_panel_y_separation_size = m_panel_y_separation_size;
-    copy->m_gallery_bitmap_padding_left_size = m_gallery_bitmap_padding_left_size;
-    copy->m_gallery_bitmap_padding_right_size = m_gallery_bitmap_padding_right_size;
-    copy->m_gallery_bitmap_padding_top_size = m_gallery_bitmap_padding_top_size;
-    copy->m_gallery_bitmap_padding_bottom_size = m_gallery_bitmap_padding_bottom_size;
-}
-
-long wxRibbonMSWArtProvider::GetFlags() const
-{
-    return m_flags;
-}
-
-void wxRibbonMSWArtProvider::SetFlags(long flags)
-{
-    if((flags ^ m_flags) & wxRIBBON_BAR_FLOW_VERTICAL)
-    {
-        if(flags & wxRIBBON_BAR_FLOW_VERTICAL)
-        {
-            m_page_border_left++;
-            m_page_border_right++;
-            m_page_border_top--;
-            m_page_border_bottom--;
-        }
-        else
-        {
-            m_page_border_left--;
-            m_page_border_right--;
-            m_page_border_top++;
-            m_page_border_bottom++;
-        }
-    }
-    m_flags = flags;
-
-    // Need to reload some bitmaps when flags change
-#define Reload(setting) SetColour(setting, GetColour(setting))
-    Reload(wxRIBBON_ART_GALLERY_BUTTON_FACE_COLOUR);
-    Reload(wxRIBBON_ART_GALLERY_BUTTON_HOVER_FACE_COLOUR);
-    Reload(wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_FACE_COLOUR);
-    Reload(wxRIBBON_ART_GALLERY_BUTTON_DISABLED_FACE_COLOUR);
-    Reload(wxRIBBON_ART_PANEL_BUTTON_FACE_COLOUR);
-    Reload(wxRIBBON_ART_PANEL_BUTTON_HOVER_FACE_COLOUR);
-#undef Reload
-}
-
-int wxRibbonMSWArtProvider::GetMetric(int id) const
-{
-    switch(id)
-    {
-        case wxRIBBON_ART_TAB_SEPARATION_SIZE:
-            return m_tab_separation_size;
-        case wxRIBBON_ART_PAGE_BORDER_LEFT_SIZE:
-            return m_page_border_left;
-        case wxRIBBON_ART_PAGE_BORDER_TOP_SIZE:
-            return m_page_border_top;
-        case wxRIBBON_ART_PAGE_BORDER_RIGHT_SIZE:
-            return m_page_border_right;
-        case wxRIBBON_ART_PAGE_BORDER_BOTTOM_SIZE:
-            return m_page_border_bottom;
-        case wxRIBBON_ART_PANEL_X_SEPARATION_SIZE:
-            return m_panel_x_separation_size;
-        case wxRIBBON_ART_PANEL_Y_SEPARATION_SIZE:
-            return m_panel_y_separation_size;
-        case wxRIBBON_ART_TOOL_GROUP_SEPARATION_SIZE:
-            return m_tool_group_separation_size;
-        case wxRIBBON_ART_GALLERY_BITMAP_PADDING_LEFT_SIZE:
-            return m_gallery_bitmap_padding_left_size;
-        case wxRIBBON_ART_GALLERY_BITMAP_PADDING_RIGHT_SIZE:
-            return m_gallery_bitmap_padding_right_size;
-        case wxRIBBON_ART_GALLERY_BITMAP_PADDING_TOP_SIZE:
-            return m_gallery_bitmap_padding_top_size;
-        case wxRIBBON_ART_GALLERY_BITMAP_PADDING_BOTTOM_SIZE:
-            return m_gallery_bitmap_padding_bottom_size;
-        default:
-            wxFAIL_MSG(wxT("Invalid Metric Ordinal"));
-            break;
-    }
-
-    return 0;
-}
-
-void wxRibbonMSWArtProvider::SetMetric(int id, int new_val)
-{
-    switch(id)
-    {
-        case wxRIBBON_ART_TAB_SEPARATION_SIZE:
-            m_tab_separation_size = new_val;
-            break;
-        case wxRIBBON_ART_PAGE_BORDER_LEFT_SIZE:
-            m_page_border_left = new_val;
-            break;
-        case wxRIBBON_ART_PAGE_BORDER_TOP_SIZE:
-            m_page_border_top = new_val;
-            break;
-        case wxRIBBON_ART_PAGE_BORDER_RIGHT_SIZE:
-            m_page_border_right = new_val;
-            break;
-        case wxRIBBON_ART_PAGE_BORDER_BOTTOM_SIZE:
-            m_page_border_bottom = new_val;
-            break;
-        case wxRIBBON_ART_PANEL_X_SEPARATION_SIZE:
-            m_panel_x_separation_size = new_val;
-            break;
-        case wxRIBBON_ART_PANEL_Y_SEPARATION_SIZE:
-            m_panel_y_separation_size = new_val;
-            break;
-        case wxRIBBON_ART_TOOL_GROUP_SEPARATION_SIZE:
-            m_tool_group_separation_size = new_val;
-            break;
-        case wxRIBBON_ART_GALLERY_BITMAP_PADDING_LEFT_SIZE:
-            m_gallery_bitmap_padding_left_size = new_val;
-            break;
-        case wxRIBBON_ART_GALLERY_BITMAP_PADDING_RIGHT_SIZE:
-            m_gallery_bitmap_padding_right_size = new_val;
-            break;
-        case wxRIBBON_ART_GALLERY_BITMAP_PADDING_TOP_SIZE:
-            m_gallery_bitmap_padding_top_size = new_val;
-            break;
-        case wxRIBBON_ART_GALLERY_BITMAP_PADDING_BOTTOM_SIZE:
-            m_gallery_bitmap_padding_bottom_size = new_val;
-            break;
-        default:
-            wxFAIL_MSG(wxT("Invalid Metric Ordinal"));
-            break;
-    }
-}
-
-void wxRibbonMSWArtProvider::SetFont(int id, const wxFont& font)
-{
-    switch(id)
-    {
-        case wxRIBBON_ART_TAB_LABEL_FONT:
-            m_tab_label_font = font;
-            break;
-        case wxRIBBON_ART_BUTTON_BAR_LABEL_FONT:
-            m_button_bar_label_font = font;
-            break;
-        case wxRIBBON_ART_PANEL_LABEL_FONT:
-            m_panel_label_font = font;
-            break;
-        default:
-            wxFAIL_MSG(wxT("Invalid Metric Ordinal"));
-            break;
-    }
-}
-
-wxFont wxRibbonMSWArtProvider::GetFont(int id) const
-{
-    switch(id)
-    {
-        case wxRIBBON_ART_TAB_LABEL_FONT:
-            return m_tab_label_font;
-        case wxRIBBON_ART_BUTTON_BAR_LABEL_FONT:
-            return m_button_bar_label_font;
-        case wxRIBBON_ART_PANEL_LABEL_FONT:
-            return m_panel_label_font;
-        default:
-            wxFAIL_MSG(wxT("Invalid Metric Ordinal"));
-            break;
-    }
-
-    return wxNullFont;
-}
-
-wxColour wxRibbonMSWArtProvider::GetColour(int id) const
-{
-    switch(id)
-    {
-        case wxRIBBON_ART_BUTTON_BAR_LABEL_COLOUR:
-            return m_button_bar_label_colour;
-        case wxRIBBON_ART_BUTTON_BAR_LABEL_DISABLED_COLOUR:
-            return m_button_bar_label_disabled_colour;
-        case wxRIBBON_ART_BUTTON_BAR_HOVER_BORDER_COLOUR:
-            return m_button_bar_hover_border_pen.GetColour();
-        case wxRIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_TOP_COLOUR:
-            return m_button_bar_hover_background_top_colour;
-        case wxRIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR:
-            return m_button_bar_hover_background_top_gradient_colour;
-        case wxRIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_COLOUR:
-            return m_button_bar_hover_background_colour;
-        case wxRIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_GRADIENT_COLOUR:
-            return m_button_bar_hover_background_gradient_colour;
-        case wxRIBBON_ART_BUTTON_BAR_ACTIVE_BORDER_COLOUR:
-            return m_button_bar_active_border_pen.GetColour();
-        case wxRIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_TOP_COLOUR:
-            return m_button_bar_active_background_top_colour;
-        case wxRIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR:
-            return m_button_bar_active_background_top_gradient_colour;
-        case wxRIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_COLOUR:
-            return m_button_bar_active_background_colour;
-        case wxRIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_GRADIENT_COLOUR:
-            return m_button_bar_active_background_gradient_colour;
-        case wxRIBBON_ART_GALLERY_BORDER_COLOUR:
-            return m_gallery_border_pen.GetColour();
-        case wxRIBBON_ART_GALLERY_HOVER_BACKGROUND_COLOUR:
-            return m_gallery_hover_background_brush.GetColour();
-        case wxRIBBON_ART_GALLERY_BUTTON_BACKGROUND_COLOUR:
-            return m_gallery_button_background_colour;
-        case wxRIBBON_ART_GALLERY_BUTTON_BACKGROUND_GRADIENT_COLOUR:
-            return m_gallery_button_background_gradient_colour;
-        case wxRIBBON_ART_GALLERY_BUTTON_BACKGROUND_TOP_COLOUR:
-            return m_gallery_button_background_top_brush.GetColour();
-        case wxRIBBON_ART_GALLERY_BUTTON_FACE_COLOUR:
-            return m_gallery_button_face_colour;
-        case wxRIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_COLOUR:
-            return m_gallery_button_hover_background_colour;
-        case wxRIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_GRADIENT_COLOUR:
-            return m_gallery_button_hover_background_gradient_colour;
-        case wxRIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_TOP_COLOUR:
-            return m_gallery_button_hover_background_top_brush.GetColour();
-        case wxRIBBON_ART_GALLERY_BUTTON_HOVER_FACE_COLOUR:
-            return m_gallery_button_face_colour;
-        case wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_COLOUR:
-            return m_gallery_button_active_background_colour;
-        case wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_GRADIENT_COLOUR:
-            return m_gallery_button_active_background_gradient_colour;
-        case wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_TOP_COLOUR:
-            return m_gallery_button_background_top_brush.GetColour();
-        case wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_FACE_COLOUR:
-            return m_gallery_button_active_face_colour;
-        case wxRIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_COLOUR:
-            return m_gallery_button_disabled_background_colour;
-        case wxRIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_GRADIENT_COLOUR:
-            return m_gallery_button_disabled_background_gradient_colour;
-        case wxRIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_TOP_COLOUR:
-            return m_gallery_button_disabled_background_top_brush.GetColour();
-        case wxRIBBON_ART_GALLERY_BUTTON_DISABLED_FACE_COLOUR:
-            return m_gallery_button_disabled_face_colour;
-        case wxRIBBON_ART_GALLERY_ITEM_BORDER_COLOUR:
-            return m_gallery_item_border_pen.GetColour();
-        case wxRIBBON_ART_TAB_CTRL_BACKGROUND_COLOUR:
-        case wxRIBBON_ART_TAB_CTRL_BACKGROUND_GRADIENT_COLOUR:
-            return m_tab_ctrl_background_brush.GetColour();
-        case wxRIBBON_ART_TAB_LABEL_COLOUR:
-            return m_tab_label_colour;
-        case wxRIBBON_ART_TAB_SEPARATOR_COLOUR:
-            return m_tab_separator_colour;
-        case wxRIBBON_ART_TAB_SEPARATOR_GRADIENT_COLOUR:
-            return m_tab_separator_gradient_colour;
-        case wxRIBBON_ART_TAB_ACTIVE_BACKGROUND_TOP_COLOUR:
-        case wxRIBBON_ART_TAB_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR:
-            return wxColour(0, 0, 0);
-        case wxRIBBON_ART_TAB_ACTIVE_BACKGROUND_COLOUR:
-            return m_tab_active_background_colour;
-        case wxRIBBON_ART_TAB_ACTIVE_BACKGROUND_GRADIENT_COLOUR:
-            return m_tab_active_background_gradient_colour;
-        case wxRIBBON_ART_TAB_HOVER_BACKGROUND_TOP_COLOUR:
-            return m_tab_hover_background_top_colour;
-        case wxRIBBON_ART_TAB_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR:
-            return m_tab_hover_background_top_gradient_colour;
-        case wxRIBBON_ART_TAB_HOVER_BACKGROUND_COLOUR:
-            return m_tab_hover_background_colour;
-        case wxRIBBON_ART_TAB_HOVER_BACKGROUND_GRADIENT_COLOUR:
-            return m_tab_hover_background_gradient_colour;
-        case wxRIBBON_ART_TAB_BORDER_COLOUR:
-            return m_tab_border_pen.GetColour();
-        case wxRIBBON_ART_PANEL_BORDER_COLOUR:
-            return m_panel_border_pen.GetColour();
-        case wxRIBBON_ART_PANEL_BORDER_GRADIENT_COLOUR:
-            return m_panel_border_gradient_pen.GetColour();
-        case wxRIBBON_ART_PANEL_MINIMISED_BORDER_COLOUR:
-            return m_panel_minimised_border_pen.GetColour();
-        case wxRIBBON_ART_PANEL_MINIMISED_BORDER_GRADIENT_COLOUR:
-            return m_panel_minimised_border_gradient_pen.GetColour();
-        case wxRIBBON_ART_PANEL_LABEL_BACKGROUND_COLOUR:
-        case wxRIBBON_ART_PANEL_LABEL_BACKGROUND_GRADIENT_COLOUR:
-            return m_panel_label_background_brush.GetColour();
-        case wxRIBBON_ART_PANEL_LABEL_COLOUR:
-            return m_panel_label_colour;
-        case wxRIBBON_ART_PANEL_MINIMISED_LABEL_COLOUR:
-            return m_panel_minimised_label_colour;
-        case wxRIBBON_ART_PANEL_HOVER_LABEL_BACKGROUND_COLOUR:
-        case wxRIBBON_ART_PANEL_HOVER_LABEL_BACKGROUND_GRADIENT_COLOUR:
-            return m_panel_hover_label_background_brush.GetColour();
-        case wxRIBBON_ART_PANEL_HOVER_LABEL_COLOUR:
-            return m_panel_hover_label_colour;
-        case wxRIBBON_ART_PANEL_ACTIVE_BACKGROUND_TOP_COLOUR:
-            return m_panel_active_background_top_colour;
-        case wxRIBBON_ART_PANEL_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR:
-            return m_panel_active_background_top_gradient_colour;
-        case wxRIBBON_ART_PANEL_ACTIVE_BACKGROUND_COLOUR:
-            return m_panel_active_background_colour;
-        case wxRIBBON_ART_PANEL_ACTIVE_BACKGROUND_GRADIENT_COLOUR:
-            return m_panel_active_background_gradient_colour;
-        case wxRIBBON_ART_PANEL_BUTTON_FACE_COLOUR:
-            return m_panel_button_face_colour;
-        case wxRIBBON_ART_PANEL_BUTTON_HOVER_FACE_COLOUR:
-            return m_panel_button_hover_face_colour;
-        case wxRIBBON_ART_PAGE_BORDER_COLOUR:
-            return m_page_border_pen.GetColour();
-        case wxRIBBON_ART_PAGE_BACKGROUND_TOP_COLOUR:
-            return m_page_background_top_colour;
-        case wxRIBBON_ART_PAGE_BACKGROUND_TOP_GRADIENT_COLOUR:
-            return m_page_background_top_gradient_colour;
-        case wxRIBBON_ART_PAGE_BACKGROUND_COLOUR:
-            return m_page_background_colour;
-        case wxRIBBON_ART_PAGE_BACKGROUND_GRADIENT_COLOUR:
-            return m_page_background_gradient_colour;
-        case wxRIBBON_ART_PAGE_HOVER_BACKGROUND_TOP_COLOUR:
-            return m_page_hover_background_top_colour;
-        case wxRIBBON_ART_PAGE_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR:
-            return m_page_hover_background_top_gradient_colour;
-        case wxRIBBON_ART_PAGE_HOVER_BACKGROUND_COLOUR:
-            return m_page_hover_background_colour;
-        case wxRIBBON_ART_PAGE_HOVER_BACKGROUND_GRADIENT_COLOUR:
-            return m_page_hover_background_gradient_colour;
-        case wxRIBBON_ART_TOOLBAR_BORDER_COLOUR:
-        case wxRIBBON_ART_TOOLBAR_HOVER_BORDER_COLOUR:
-            return m_toolbar_border_pen.GetColour();
-        case wxRIBBON_ART_TOOLBAR_FACE_COLOUR:
-            return m_tool_face_colour;
-        case wxRIBBON_ART_PAGE_TOGGLE_FACE_COLOUR:
-            return m_page_toggle_face_colour;
-        case wxRIBBON_ART_PAGE_TOGGLE_HOVER_FACE_COLOUR:
-            return m_page_toggle_hover_face_colour;
-        default:
-            wxFAIL_MSG(wxT("Invalid Metric Ordinal"));
-            break;
-    }
-
-    return wxColour();
-}
-
-void wxRibbonMSWArtProvider::SetColour(int id, const wxColor& colour)
-{
-    switch(id)
-    {
-        case wxRIBBON_ART_BUTTON_BAR_LABEL_COLOUR:
-            m_button_bar_label_colour = colour;
-            break;
-        case wxRIBBON_ART_BUTTON_BAR_LABEL_DISABLED_COLOUR:
-            m_button_bar_label_disabled_colour = colour;
-            break;
-        case wxRIBBON_ART_BUTTON_BAR_HOVER_BORDER_COLOUR:
-            m_button_bar_hover_border_pen.SetColour(colour);
-            break;
-        case wxRIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_TOP_COLOUR:
-            m_button_bar_hover_background_top_colour = colour;
-            break;
-        case wxRIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR:
-            m_button_bar_hover_background_top_gradient_colour = colour;
-            break;
-        case wxRIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_COLOUR:
-            m_button_bar_hover_background_colour = colour;
-            break;
-        case wxRIBBON_ART_BUTTON_BAR_HOVER_BACKGROUND_GRADIENT_COLOUR:
-            m_button_bar_hover_background_gradient_colour = colour;
-            break;
-        case wxRIBBON_ART_BUTTON_BAR_ACTIVE_BORDER_COLOUR:
-            m_button_bar_active_border_pen.SetColour(colour);
-            break;
-        case wxRIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_TOP_COLOUR:
-            m_button_bar_active_background_top_colour = colour;
-            break;
-        case wxRIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR:
-            m_button_bar_active_background_top_gradient_colour = colour;
-            break;
-        case wxRIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_COLOUR:
-            m_button_bar_active_background_colour = colour;
-            break;
-        case wxRIBBON_ART_BUTTON_BAR_ACTIVE_BACKGROUND_GRADIENT_COLOUR:
-            m_button_bar_active_background_gradient_colour = colour;
-            break;
-        case wxRIBBON_ART_GALLERY_BORDER_COLOUR:
-            m_gallery_border_pen.SetColour(colour);
-            break;
-        case wxRIBBON_ART_GALLERY_HOVER_BACKGROUND_COLOUR:
-            m_gallery_hover_background_brush.SetColour(colour);
-            break;
-        case wxRIBBON_ART_GALLERY_BUTTON_BACKGROUND_COLOUR:
-            m_gallery_button_background_colour = colour;
-            break;
-        case wxRIBBON_ART_GALLERY_BUTTON_BACKGROUND_GRADIENT_COLOUR:
-            m_gallery_button_background_gradient_colour = colour;
-            break;
-        case wxRIBBON_ART_GALLERY_BUTTON_BACKGROUND_TOP_COLOUR:
-            m_gallery_button_background_top_brush.SetColour(colour);
-            break;
-        case wxRIBBON_ART_GALLERY_BUTTON_FACE_COLOUR:
-            m_gallery_button_face_colour = colour;
-            if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-            {
-                m_gallery_up_bitmap[0] = wxRibbonLoadPixmap(gallery_left_xpm, colour);
-                m_gallery_down_bitmap[0] = wxRibbonLoadPixmap(gallery_right_xpm, colour);
-            }
-            else
-            {
-                m_gallery_up_bitmap[0] = wxRibbonLoadPixmap(gallery_up_xpm, colour);
-                m_gallery_down_bitmap[0] = wxRibbonLoadPixmap(gallery_down_xpm, colour);
-            }
-            m_gallery_extension_bitmap[0] = wxRibbonLoadPixmap(gallery_extension_xpm, colour);
-            break;
-        case wxRIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_COLOUR:
-            m_gallery_button_hover_background_colour = colour;
-            break;
-        case wxRIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_GRADIENT_COLOUR:
-            m_gallery_button_hover_background_gradient_colour = colour;
-            break;
-        case wxRIBBON_ART_GALLERY_BUTTON_HOVER_BACKGROUND_TOP_COLOUR:
-            m_gallery_button_hover_background_top_brush.SetColour(colour);
-            break;
-        case wxRIBBON_ART_GALLERY_BUTTON_HOVER_FACE_COLOUR:
-            m_gallery_button_hover_face_colour = colour;
-            if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-            {
-                m_gallery_up_bitmap[1] = wxRibbonLoadPixmap(gallery_left_xpm, colour);
-                m_gallery_down_bitmap[1] = wxRibbonLoadPixmap(gallery_right_xpm, colour);
-            }
-            else
-            {
-                m_gallery_up_bitmap[1] = wxRibbonLoadPixmap(gallery_up_xpm, colour);
-                m_gallery_down_bitmap[1] = wxRibbonLoadPixmap(gallery_down_xpm, colour);
-            }
-            m_gallery_extension_bitmap[1] = wxRibbonLoadPixmap(gallery_extension_xpm, colour);
-            break;
-        case wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_COLOUR:
-            m_gallery_button_active_background_colour = colour;
-            break;
-        case wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_GRADIENT_COLOUR:
-            m_gallery_button_active_background_gradient_colour = colour;
-            break;
-        case wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_BACKGROUND_TOP_COLOUR:
-            m_gallery_button_background_top_brush.SetColour(colour);
-            break;
-        case wxRIBBON_ART_GALLERY_BUTTON_ACTIVE_FACE_COLOUR:
-            m_gallery_button_active_face_colour = colour;
-            if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-            {
-                m_gallery_up_bitmap[2] = wxRibbonLoadPixmap(gallery_left_xpm, colour);
-                m_gallery_down_bitmap[2] = wxRibbonLoadPixmap(gallery_right_xpm, colour);
-            }
-            else
-            {
-                m_gallery_up_bitmap[2] = wxRibbonLoadPixmap(gallery_up_xpm, colour);
-                m_gallery_down_bitmap[2] = wxRibbonLoadPixmap(gallery_down_xpm, colour);
-            }
-            m_gallery_extension_bitmap[2] = wxRibbonLoadPixmap(gallery_extension_xpm, colour);
-            break;
-        case wxRIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_COLOUR:
-            m_gallery_button_disabled_background_colour = colour;
-            break;
-        case wxRIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_GRADIENT_COLOUR:
-            m_gallery_button_disabled_background_gradient_colour = colour;
-            break;
-        case wxRIBBON_ART_GALLERY_BUTTON_DISABLED_BACKGROUND_TOP_COLOUR:
-            m_gallery_button_disabled_background_top_brush.SetColour(colour);
-            break;
-        case wxRIBBON_ART_GALLERY_BUTTON_DISABLED_FACE_COLOUR:
-            m_gallery_button_disabled_face_colour = colour;
-            if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-            {
-                m_gallery_up_bitmap[3] = wxRibbonLoadPixmap(gallery_left_xpm, colour);
-                m_gallery_down_bitmap[3] = wxRibbonLoadPixmap(gallery_right_xpm, colour);
-            }
-            else
-            {
-                m_gallery_up_bitmap[3] = wxRibbonLoadPixmap(gallery_up_xpm, colour);
-                m_gallery_down_bitmap[3] = wxRibbonLoadPixmap(gallery_down_xpm, colour);
-            }
-            m_gallery_extension_bitmap[3] = wxRibbonLoadPixmap(gallery_extension_xpm, colour);
-            break;
-        case wxRIBBON_ART_GALLERY_ITEM_BORDER_COLOUR:
-            m_gallery_item_border_pen.SetColour(colour);
-            break;
-        case wxRIBBON_ART_TAB_CTRL_BACKGROUND_COLOUR:
-        case wxRIBBON_ART_TAB_CTRL_BACKGROUND_GRADIENT_COLOUR:
-            m_tab_ctrl_background_brush.SetColour(colour);
-            m_cached_tab_separator_visibility = -1.0;
-            break;
-        case wxRIBBON_ART_TAB_LABEL_COLOUR:
-            m_tab_label_colour = colour;
-            break;
-        case wxRIBBON_ART_TAB_SEPARATOR_COLOUR:
-            m_tab_separator_colour = colour;
-            m_cached_tab_separator_visibility = -1.0;
-            break;
-        case wxRIBBON_ART_TAB_SEPARATOR_GRADIENT_COLOUR:
-            m_tab_separator_gradient_colour = colour;
-            m_cached_tab_separator_visibility = -1.0;
-            break;
-        case wxRIBBON_ART_TAB_ACTIVE_BACKGROUND_TOP_COLOUR:
-        case wxRIBBON_ART_TAB_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR:
-            break;
-        case wxRIBBON_ART_TAB_ACTIVE_BACKGROUND_COLOUR:
-            m_tab_active_background_colour = colour;
-            break;
-        case wxRIBBON_ART_TAB_ACTIVE_BACKGROUND_GRADIENT_COLOUR:
-            m_tab_active_background_gradient_colour = colour;
-            break;
-        case wxRIBBON_ART_TAB_HOVER_BACKGROUND_TOP_COLOUR:
-            m_tab_hover_background_top_colour = colour;
-            break;
-        case wxRIBBON_ART_TAB_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR:
-            m_tab_hover_background_top_gradient_colour = colour;
-            break;
-        case wxRIBBON_ART_TAB_HOVER_BACKGROUND_COLOUR:
-            m_tab_hover_background_colour = colour;
-            break;
-        case wxRIBBON_ART_TAB_HOVER_BACKGROUND_GRADIENT_COLOUR:
-            m_tab_hover_background_gradient_colour = colour;
-            break;
-        case wxRIBBON_ART_TAB_BORDER_COLOUR:
-            m_tab_border_pen.SetColour(colour);
-            break;
-        case wxRIBBON_ART_PANEL_BORDER_COLOUR:
-            m_panel_border_pen.SetColour(colour);
-            break;
-        case wxRIBBON_ART_PANEL_BORDER_GRADIENT_COLOUR:
-            m_panel_border_gradient_pen.SetColour(colour);
-            break;
-        case wxRIBBON_ART_PANEL_MINIMISED_BORDER_COLOUR:
-            m_panel_minimised_border_pen.SetColour(colour);
-            break;
-        case wxRIBBON_ART_PANEL_MINIMISED_BORDER_GRADIENT_COLOUR:
-            m_panel_minimised_border_gradient_pen.SetColour(colour);
-            break;
-        case wxRIBBON_ART_PANEL_LABEL_BACKGROUND_COLOUR:
-        case wxRIBBON_ART_PANEL_LABEL_BACKGROUND_GRADIENT_COLOUR:
-            m_panel_label_background_brush.SetColour(colour);
-            break;
-        case wxRIBBON_ART_PANEL_LABEL_COLOUR:
-            m_panel_label_colour = colour;
-            break;
-        case wxRIBBON_ART_PANEL_HOVER_LABEL_BACKGROUND_COLOUR:
-        case wxRIBBON_ART_PANEL_HOVER_LABEL_BACKGROUND_GRADIENT_COLOUR:
-            m_panel_hover_label_background_brush.SetColour(colour);
-            break;
-        case wxRIBBON_ART_PANEL_HOVER_LABEL_COLOUR:
-            m_panel_hover_label_colour = colour;
-            break;
-        case wxRIBBON_ART_PANEL_MINIMISED_LABEL_COLOUR:
-            m_panel_minimised_label_colour = colour;
-            break;
-        case wxRIBBON_ART_PANEL_ACTIVE_BACKGROUND_TOP_COLOUR:
-            m_panel_active_background_top_colour = colour;
-            break;
-        case wxRIBBON_ART_PANEL_ACTIVE_BACKGROUND_TOP_GRADIENT_COLOUR:
-            m_panel_active_background_top_gradient_colour = colour;
-            break;
-        case wxRIBBON_ART_PANEL_ACTIVE_BACKGROUND_COLOUR:
-            m_panel_active_background_colour = colour;
-            break;
-        case wxRIBBON_ART_PANEL_ACTIVE_BACKGROUND_GRADIENT_COLOUR:
-            m_panel_active_background_gradient_colour = colour;
-            break;
-        case wxRIBBON_ART_PANEL_BUTTON_FACE_COLOUR:
-            m_panel_button_face_colour = colour;
-            m_panel_extension_bitmap[0] = wxRibbonLoadPixmap(panel_extension_xpm, colour);
-            break;
-        case wxRIBBON_ART_PANEL_BUTTON_HOVER_FACE_COLOUR:
-            m_panel_button_hover_face_colour = colour;
-            m_panel_extension_bitmap[1] = wxRibbonLoadPixmap(panel_extension_xpm, colour);
-            break;
-        case wxRIBBON_ART_PAGE_BORDER_COLOUR:
-            m_page_border_pen.SetColour(colour);
-            break;
-        case wxRIBBON_ART_PAGE_BACKGROUND_TOP_COLOUR:
-            m_page_background_top_colour = colour;
-            break;
-        case wxRIBBON_ART_PAGE_BACKGROUND_TOP_GRADIENT_COLOUR:
-            m_page_background_top_gradient_colour = colour;
-            break;
-        case wxRIBBON_ART_PAGE_BACKGROUND_COLOUR:
-            m_page_background_colour = colour;
-            break;
-        case wxRIBBON_ART_PAGE_BACKGROUND_GRADIENT_COLOUR:
-            m_page_background_gradient_colour = colour;
-            break;
-        case wxRIBBON_ART_PAGE_HOVER_BACKGROUND_TOP_COLOUR:
-            m_page_hover_background_top_colour = colour;
-            break;
-        case wxRIBBON_ART_PAGE_HOVER_BACKGROUND_TOP_GRADIENT_COLOUR:
-            m_page_hover_background_top_gradient_colour = colour;
-            break;
-        case wxRIBBON_ART_PAGE_HOVER_BACKGROUND_COLOUR:
-            m_page_hover_background_colour = colour;
-            break;
-        case wxRIBBON_ART_PAGE_HOVER_BACKGROUND_GRADIENT_COLOUR:
-            m_page_hover_background_gradient_colour = colour;
-            break;
-        case wxRIBBON_ART_TOOLBAR_BORDER_COLOUR:
-        case wxRIBBON_ART_TOOLBAR_HOVER_BORDER_COLOUR:
-            m_toolbar_border_pen.SetColour(colour);
-            break;
-        case wxRIBBON_ART_TOOLBAR_FACE_COLOUR:
-            m_tool_face_colour = colour;
-            m_toolbar_drop_bitmap = wxRibbonLoadPixmap(gallery_down_xpm, colour);
-            break;
-        case wxRIBBON_ART_PAGE_TOGGLE_FACE_COLOUR:
-            m_page_toggle_face_colour = colour;
-            m_ribbon_toggle_down_bitmap[0] = wxRibbonLoadPixmap(panel_toggle_down_xpm, colour);
-            m_ribbon_toggle_up_bitmap[0] = wxRibbonLoadPixmap(panel_toggle_up_xpm, colour);
-            m_ribbon_toggle_pin_bitmap[0] = wxRibbonLoadPixmap(ribbon_toggle_pin_xpm, colour);
-            m_ribbon_bar_help_button_bitmap[0] = wxRibbonLoadPixmap(ribbon_help_button_xpm, colour);
-            break;
-        case wxRIBBON_ART_PAGE_TOGGLE_HOVER_FACE_COLOUR:
-            m_page_toggle_hover_face_colour = colour;
-            m_ribbon_toggle_down_bitmap[1] = wxRibbonLoadPixmap(panel_toggle_down_xpm, colour);
-            m_ribbon_toggle_up_bitmap[1] = wxRibbonLoadPixmap(panel_toggle_up_xpm, colour);
-            m_ribbon_toggle_pin_bitmap[1] = wxRibbonLoadPixmap(ribbon_toggle_pin_xpm, colour);
-            m_ribbon_bar_help_button_bitmap[1] = wxRibbonLoadPixmap(ribbon_help_button_xpm, colour);
-            break;
-        default:
-            wxFAIL_MSG(wxT("Invalid Metric Ordinal"));
-            break;
-    }
-}
-
-void wxRibbonMSWArtProvider::DrawTabCtrlBackground(
-                        wxDC& dc,
-                        wxWindow* WXUNUSED(wnd),
-                        const wxRect& rect)
-{
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.SetBrush(m_tab_ctrl_background_brush);
-    dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
-
-    dc.SetPen(m_page_border_pen);
-    if(rect.width > 6)
-    {
-        dc.DrawLine(rect.x + 3, rect.y + rect.height - 1, rect.x + rect.width - 3, rect.y + rect.height - 1);
-    }
-    else
-    {
-        dc.DrawLine(rect.x, rect.y + rect.height - 1, rect.x + rect.width, rect.y + rect.height - 1);
-    }
-}
-
-void wxRibbonMSWArtProvider::DrawTab(
-                 wxDC& dc,
-                 wxWindow* WXUNUSED(wnd),
-                 const wxRibbonPageTabInfo& tab)
-{
-    if(tab.rect.height <= 2)
-        return;
-
-    if(tab.active || tab.hovered || tab.highlight)
-    {
-        if(tab.active)
-        {
-            wxRect background(tab.rect);
-
-            background.x += 2;
-            background.y += 2;
-            background.width -= 4;
-            background.height -= 2;
-
-            dc.GradientFillLinear(background, m_tab_active_background_colour,
-                m_tab_active_background_gradient_colour, wxSOUTH);
-
-            // TODO: active and hovered
-        }
-        else if(tab.hovered)
-        {
-            wxRect background(tab.rect);
-
-            background.x += 2;
-            background.y += 2;
-            background.width -= 4;
-            background.height -= 3;
-            int h = background.height;
-            background.height /= 2;
-            dc.GradientFillLinear(background,
-                m_tab_hover_background_top_colour,
-                m_tab_hover_background_top_gradient_colour, wxSOUTH);
-
-            background.y += background.height;
-            background.height = h - background.height;
-            dc.GradientFillLinear(background, m_tab_hover_background_colour,
-                m_tab_hover_background_gradient_colour, wxSOUTH);
-        }
-        else if(tab.highlight)
-        {
-            wxRect background(tab.rect);
-
-            background.x += 2;
-            background.y += 2;
-            background.width -= 4;
-            background.height -= 3;
-            int h = background.height;
-            background.height /= 2;
-
-            //For highlight pages we show a colour between the active page and for a hovered page:
-            wxColour top_colour1((m_tab_active_background_colour.Red()   + m_tab_hover_background_top_colour.Red())/2,
-                                 (m_tab_active_background_colour.Green() + m_tab_hover_background_top_colour.Green())/2,
-                                 (m_tab_active_background_colour.Blue()  + m_tab_hover_background_top_colour.Blue())/2);
-
-            wxColour bottom_colour1((m_tab_active_background_gradient_colour.Red()   + m_tab_hover_background_top_gradient_colour.Red())/2,
-                                    (m_tab_active_background_gradient_colour.Green() + m_tab_hover_background_top_gradient_colour.Green())/2,
-                                    (m_tab_active_background_gradient_colour.Blue()  + m_tab_hover_background_top_gradient_colour.Blue())/2);
-
-            dc.GradientFillLinear(background, top_colour1, bottom_colour1, wxSOUTH);
-
-            background.y += background.height;
-            background.height = h - background.height;
-
-            wxColour top_colour2((m_tab_active_background_colour.Red()   + m_tab_hover_background_colour.Red())/2,
-                                 (m_tab_active_background_colour.Green() + m_tab_hover_background_colour.Green())/2,
-                                 (m_tab_active_background_colour.Blue()  + m_tab_hover_background_colour.Blue())/2);
-
-            wxColour bottom_colour2((m_tab_active_background_gradient_colour.Red()   + m_tab_hover_background_gradient_colour.Red())/2,
-                                    (m_tab_active_background_gradient_colour.Green() + m_tab_hover_background_gradient_colour.Green())/2,
-                                    (m_tab_active_background_gradient_colour.Blue()  + m_tab_hover_background_gradient_colour.Blue())/2);
-
-            dc.GradientFillLinear(background, top_colour2, bottom_colour2, wxSOUTH);
-        }
-
-        wxPoint border_points[6];
-        border_points[0] = wxPoint(1, tab.rect.height - 2);
-        border_points[1] = wxPoint(1, 3);
-        border_points[2] = wxPoint(3, 1);
-        border_points[3] = wxPoint(tab.rect.width - 4, 1);
-        border_points[4] = wxPoint(tab.rect.width - 2, 3);
-        border_points[5] = wxPoint(tab.rect.width - 2, tab.rect.height - 1);
-
-        dc.SetPen(m_tab_border_pen);
-        dc.DrawLines(sizeof(border_points)/sizeof(wxPoint), border_points, tab.rect.x, tab.rect.y);
-
-        if(tab.active)
-        {
-            // Give the tab a curved outward border at the bottom
-            dc.DrawPoint(tab.rect.x, tab.rect.y + tab.rect.height - 2);
-            dc.DrawPoint(tab.rect.x + tab.rect.width - 1, tab.rect.y + tab.rect.height - 2);
-
-            wxPen p(m_tab_active_background_gradient_colour);
-            dc.SetPen(p);
-
-            // Technically the first two points are the wrong colour, but they're near enough
-            dc.DrawPoint(tab.rect.x + 1, tab.rect.y + tab.rect.height - 2);
-            dc.DrawPoint(tab.rect.x + tab.rect.width - 2, tab.rect.y + tab.rect.height - 2);
-            dc.DrawPoint(tab.rect.x + 1, tab.rect.y + tab.rect.height - 1);
-            dc.DrawPoint(tab.rect.x, tab.rect.y + tab.rect.height - 1);
-            dc.DrawPoint(tab.rect.x + tab.rect.width - 2, tab.rect.y + tab.rect.height - 1);
-            dc.DrawPoint(tab.rect.x + tab.rect.width - 1, tab.rect.y + tab.rect.height - 1);
-        }
-    }
-
-    if(m_flags & wxRIBBON_BAR_SHOW_PAGE_ICONS)
-    {
-        wxBitmap icon = tab.page->GetIcon();
-        if(icon.IsOk())
-        {
-        int x = tab.rect.x + 4;
-        if((m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS) == 0)
-            x = tab.rect.x + (tab.rect.width - icon.GetWidth()) / 2;
-        dc.DrawBitmap(icon, x, tab.rect.y + 1 + (tab.rect.height - 1 -
-            icon.GetHeight()) / 2, true);
-        }
-    }
-    if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS)
-    {
-        wxString label = tab.page->GetLabel();
-        if(!label.IsEmpty())
-        {
-            dc.SetFont(m_tab_label_font);
-            dc.SetTextForeground(m_tab_label_colour);
-            dc.SetBackgroundMode(wxTRANSPARENT);
-
-            int text_height;
-            int text_width;
-            dc.GetTextExtent(label, &text_width, &text_height);
-            int width = tab.rect.width - 5;
-            int x = tab.rect.x + 3;
-            if(m_flags & wxRIBBON_BAR_SHOW_PAGE_ICONS)
-            {
-                x += 3 + tab.page->GetIcon().GetWidth();
-                width -= 3 + tab.page->GetIcon().GetWidth();
-            }
-            int y = tab.rect.y + (tab.rect.height - text_height) / 2;
-
-            if(width <= text_width)
-            {
-                dc.SetClippingRegion(x, tab.rect.y, width, tab.rect.height);
-                dc.DrawText(label, x, y);
-            }
-            else
-            {
-                dc.DrawText(label, x + (width - text_width) / 2 + 1, y);
-            }
-        }
-    }
-}
-
-void wxRibbonMSWArtProvider::DrawTabSeparator(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect,
-                        double visibility)
-{
-    if(visibility <= 0.0)
-    {
-        return;
-    }
-    if(visibility > 1.0)
-    {
-        visibility = 1.0;
-    }
-
-    // The tab separator is relatively expensive to draw (for its size), and is
-    // usually drawn multiple times sequentially (in different positions), so it
-    // makes sense to draw it once and cache it.
-    if(!m_cached_tab_separator.IsOk() || m_cached_tab_separator.GetSize() != rect.GetSize() || visibility != m_cached_tab_separator_visibility)
-    {
-        wxRect size(rect.GetSize());
-        ReallyDrawTabSeparator(wnd, size, visibility);
-    }
-    dc.DrawBitmap(m_cached_tab_separator, rect.x, rect.y, false);
-}
-
-void wxRibbonMSWArtProvider::ReallyDrawTabSeparator(wxWindow* wnd, const wxRect& rect, double visibility)
-{
-    if(!m_cached_tab_separator.IsOk() || m_cached_tab_separator.GetSize() != rect.GetSize())
-    {
-        m_cached_tab_separator = wxBitmap(rect.GetSize());
-    }
-
-    wxMemoryDC dc(m_cached_tab_separator);
-    DrawTabCtrlBackground(dc, wnd, rect);
-
-    wxCoord x = rect.x + rect.width / 2;
-    double h = (double)(rect.height - 1);
-
-    double r1 = m_tab_ctrl_background_brush.GetColour().Red() * (1.0 - visibility) + 0.5;
-    double g1 = m_tab_ctrl_background_brush.GetColour().Green() * (1.0 - visibility) + 0.5;
-    double b1 = m_tab_ctrl_background_brush.GetColour().Blue() * (1.0 - visibility) + 0.5;
-    double r2 = m_tab_separator_colour.Red();
-    double g2 = m_tab_separator_colour.Green();
-    double b2 = m_tab_separator_colour.Blue();
-    double r3 = m_tab_separator_gradient_colour.Red();
-    double g3 = m_tab_separator_gradient_colour.Green();
-    double b3 = m_tab_separator_gradient_colour.Blue();
-
-    for(int i = 0; i < rect.height - 1; ++i)
-    {
-        double p = ((double)i)/h;
-
-        double r = (p * r3 + (1.0 - p) * r2) * visibility + r1;
-        double g = (p * g3 + (1.0 - p) * g2) * visibility + g1;
-        double b = (p * b3 + (1.0 - p) * b2) * visibility + b1;
-
-        wxPen P(wxColour((unsigned char)r, (unsigned char)g, (unsigned char)b));
-        dc.SetPen(P);
-        dc.DrawPoint(x, rect.y + i);
-    }
-
-    m_cached_tab_separator_visibility = visibility;
-}
-
-void wxRibbonMSWArtProvider::DrawPartialPageBackground(wxDC& dc,
-        wxWindow* wnd, const wxRect& r, wxRibbonPage* page,
-        wxPoint offset, bool hovered)
-{
-    wxRect background;
-    // Expanded panels need a background - the expanded panel at
-    // best size may have a greater Y dimension higher than when
-    // on the bar if it has a sizer. AUI art provider does not need this
-    // because it paints the panel without reference to its parent's size.
-    // Expanded panels use a wxFrame as parent (not a wxRibbonPage).
-
-    if(wnd->GetSizer() && wnd->GetParent() != page)
-    {
-        background = wnd->GetParent()->GetSize();
-        offset = wxPoint(0,0);
-    }
-    else
-    {
-        background = page->GetSize();
-        page->AdjustRectToIncludeScrollButtons(&background);
-        background.height -= 2;
-    }
-    // Page background isn't dependent upon the width of the page
-    // (at least not the part of it intended to be painted by this
-    // function). Set to wider than the page itself for when externally
-    // expanded panels need a background - the expanded panel can be wider
-    // than the bar.
-    background.x = 0;
-    background.width = INT_MAX;
-
-    // upper_rect, lower_rect, paint_rect are all in page co-ordinates
-    wxRect upper_rect(background);
-    upper_rect.height /= 5;
-
-    wxRect lower_rect(background);
-    lower_rect.y += upper_rect.height;
-    lower_rect.height -= upper_rect.height;
-
-    wxRect paint_rect(r);
-    paint_rect.x += offset.x;
-    paint_rect.y += offset.y;
-
-    wxColour bg_top, bg_top_grad, bg_btm, bg_btm_grad;
-    if(hovered)
-    {
-        bg_top = m_page_hover_background_top_colour;
-        bg_top_grad = m_page_hover_background_top_gradient_colour;
-        bg_btm = m_page_hover_background_colour;
-        bg_btm_grad = m_page_hover_background_gradient_colour;
-    }
-    else
-    {
-        bg_top = m_page_background_top_colour;
-        bg_top_grad = m_page_background_top_gradient_colour;
-        bg_btm = m_page_background_colour;
-        bg_btm_grad = m_page_background_gradient_colour;
-    }
-
-    if(paint_rect.Intersects(upper_rect))
-    {
-        wxRect rect(upper_rect);
-        rect.Intersect(paint_rect);
-        rect.x -= offset.x;
-        rect.y -= offset.y;
-        wxColour starting_colour(wxRibbonInterpolateColour(bg_top, bg_top_grad,
-            paint_rect.y, upper_rect.y, upper_rect.y + upper_rect.height));
-        wxColour ending_colour(wxRibbonInterpolateColour(bg_top, bg_top_grad,
-            paint_rect.y + paint_rect.height, upper_rect.y,
-            upper_rect.y + upper_rect.height));
-        dc.GradientFillLinear(rect, starting_colour, ending_colour, wxSOUTH);
-    }
-
-    if(paint_rect.Intersects(lower_rect))
-    {
-        wxRect rect(lower_rect);
-        rect.Intersect(paint_rect);
-        rect.x -= offset.x;
-        rect.y -= offset.y;
-        wxColour starting_colour(wxRibbonInterpolateColour(bg_btm, bg_btm_grad,
-            paint_rect.y, lower_rect.y, lower_rect.y + lower_rect.height));
-        wxColour ending_colour(wxRibbonInterpolateColour(bg_btm, bg_btm_grad,
-            paint_rect.y + paint_rect.height,
-            lower_rect.y, lower_rect.y + lower_rect.height));
-        dc.GradientFillLinear(rect, starting_colour, ending_colour, wxSOUTH);
-    }
-}
-
-void wxRibbonMSWArtProvider::DrawPageBackground(
-                        wxDC& dc,
-                        wxWindow* WXUNUSED(wnd),
-                        const wxRect& rect)
-{
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.SetBrush(m_tab_ctrl_background_brush);
-
-    {
-        wxRect edge(rect);
-
-        edge.width = 2;
-        dc.DrawRectangle(edge.x, edge.y, edge.width, edge.height);
-
-        edge.x += rect.width - 2;
-        dc.DrawRectangle(edge.x, edge.y, edge.width, edge.height);
-
-        edge = rect;
-        edge.height = 2;
-        edge.y += (rect.height - edge.height);
-        dc.DrawRectangle(edge.x, edge.y, edge.width, edge.height);
-    }
-
-    {
-        wxRect background(rect);
-        background.x += 2;
-        background.width -= 4;
-        background.height -= 2;
-
-        background.height /= 5;
-        dc.GradientFillLinear(background, m_page_background_top_colour,
-            m_page_background_top_gradient_colour, wxSOUTH);
-
-        background.y += background.height;
-        background.height = rect.height - 2 - background.height;
-        dc.GradientFillLinear(background, m_page_background_colour,
-            m_page_background_gradient_colour, wxSOUTH);
-    }
-
-    {
-        wxPoint border_points[8];
-        border_points[0] = wxPoint(2, 0);
-        border_points[1] = wxPoint(1, 1);
-        border_points[2] = wxPoint(1, rect.height - 4);
-        border_points[3] = wxPoint(3, rect.height - 2);
-        border_points[4] = wxPoint(rect.width - 4, rect.height - 2);
-        border_points[5] = wxPoint(rect.width - 2, rect.height - 4);
-        border_points[6] = wxPoint(rect.width - 2, 1);
-        border_points[7] = wxPoint(rect.width - 4, -1);
-
-        dc.SetPen(m_page_border_pen);
-        dc.DrawLines(sizeof(border_points)/sizeof(wxPoint), border_points, rect.x, rect.y);
-    }
-}
-
-void wxRibbonMSWArtProvider::DrawScrollButton(
-                        wxDC& dc,
-                        wxWindow* WXUNUSED(wnd),
-                        const wxRect& rect_,
-                        long style)
-{
-    wxRect rect(rect_);
-
-    if((style & wxRIBBON_SCROLL_BTN_FOR_MASK) == wxRIBBON_SCROLL_BTN_FOR_PAGE)
-    {
-        // Page scroll buttons do not have the luxury of rendering on top of anything
-        // else, and their size includes some padding, hence the background painting
-        // and size adjustment.
-        dc.SetPen(*wxTRANSPARENT_PEN);
-        dc.SetBrush(m_tab_ctrl_background_brush);
-        dc.DrawRectangle(rect);
-        dc.SetClippingRegion(rect);
-        switch(style & wxRIBBON_SCROLL_BTN_DIRECTION_MASK)
-        {
-        case wxRIBBON_SCROLL_BTN_LEFT:
-            rect.x++;
-        case wxRIBBON_SCROLL_BTN_RIGHT:
-            rect.y--;
-            rect.width--;
-            break;
-        case wxRIBBON_SCROLL_BTN_UP:
-            rect.x++;
-            rect.y--;
-            rect.width -= 2;
-            rect.height++;
-            break;
-        case wxRIBBON_SCROLL_BTN_DOWN:
-            rect.x++;
-            rect.width -= 2;
-            rect.height--;
-            break;
-        }
-    }
-
-    {
-        wxRect background(rect);
-        background.x++;
-        background.y++;
-        background.width -= 2;
-        background.height -= 2;
-
-        if(style & wxRIBBON_SCROLL_BTN_UP)
-            background.height /= 2;
-        else
-            background.height /= 5;
-        dc.GradientFillLinear(background, m_page_background_top_colour,
-            m_page_background_top_gradient_colour, wxSOUTH);
-
-        background.y += background.height;
-        background.height = rect.height - 2 - background.height;
-        dc.GradientFillLinear(background, m_page_background_colour,
-            m_page_background_gradient_colour, wxSOUTH);
-    }
-
-    {
-        wxPoint border_points[7];
-        switch(style & wxRIBBON_SCROLL_BTN_DIRECTION_MASK)
-        {
-        case wxRIBBON_SCROLL_BTN_LEFT:
-            border_points[0] = wxPoint(2, 0);
-            border_points[1] = wxPoint(rect.width - 1, 0);
-            border_points[2] = wxPoint(rect.width - 1, rect.height - 1);
-            border_points[3] = wxPoint(2, rect.height - 1);
-            border_points[4] = wxPoint(0, rect.height - 3);
-            border_points[5] = wxPoint(0, 2);
-            break;
-        case wxRIBBON_SCROLL_BTN_RIGHT:
-            border_points[0] = wxPoint(0, 0);
-            border_points[1] = wxPoint(rect.width - 3, 0);
-            border_points[2] = wxPoint(rect.width - 1, 2);
-            border_points[3] = wxPoint(rect.width - 1, rect.height - 3);
-            border_points[4] = wxPoint(rect.width - 3, rect.height - 1);
-            border_points[5] = wxPoint(0, rect.height - 1);
-            break;
-        case wxRIBBON_SCROLL_BTN_UP:
-            border_points[0] = wxPoint(2, 0);
-            border_points[1] = wxPoint(rect.width - 3, 0);
-            border_points[2] = wxPoint(rect.width - 1, 2);
-            border_points[3] = wxPoint(rect.width - 1, rect.height - 1);
-            border_points[4] = wxPoint(0, rect.height - 1);
-            border_points[5] = wxPoint(0, 2);
-            break;
-        case wxRIBBON_SCROLL_BTN_DOWN:
-            border_points[0] = wxPoint(0, 0);
-            border_points[1] = wxPoint(rect.width - 1, 0);
-            border_points[2] = wxPoint(rect.width - 1, rect.height - 3);
-            border_points[3] = wxPoint(rect.width - 3, rect.height - 1);
-            border_points[4] = wxPoint(2, rect.height - 1);
-            border_points[5] = wxPoint(0, rect.height - 3);
-            break;
-        }
-        border_points[6] = border_points[0];
-
-        dc.SetPen(m_page_border_pen);
-        dc.DrawLines(sizeof(border_points)/sizeof(wxPoint), border_points, rect.x, rect.y);
-    }
-
-    {
-        // NB: Code for handling hovered/active state is temporary
-        wxPoint arrow_points[3];
-        switch(style & wxRIBBON_SCROLL_BTN_DIRECTION_MASK)
-        {
-        case wxRIBBON_SCROLL_BTN_LEFT:
-            arrow_points[0] = wxPoint(rect.width / 2 - 2, rect.height / 2);
-            if(style & wxRIBBON_SCROLL_BTN_ACTIVE)
-                arrow_points[0].y += 1;
-            arrow_points[1] = arrow_points[0] + wxPoint(3, -3);
-            arrow_points[2] = arrow_points[0] + wxPoint(3,  3);
-            break;
-        case wxRIBBON_SCROLL_BTN_RIGHT:
-            arrow_points[0] = wxPoint(rect.width / 2 + 2, rect.height / 2);
-            if(style & wxRIBBON_SCROLL_BTN_ACTIVE)
-                arrow_points[0].y += 1;
-            arrow_points[1] = arrow_points[0] - wxPoint(3,  3);
-            arrow_points[2] = arrow_points[0] - wxPoint(3, -3);
-            break;
-        case wxRIBBON_SCROLL_BTN_UP:
-            arrow_points[0] = wxPoint(rect.width / 2, rect.height / 2 - 2);
-            if(style & wxRIBBON_SCROLL_BTN_ACTIVE)
-                arrow_points[0].y += 1;
-            arrow_points[1] = arrow_points[0] + wxPoint( 3, 3);
-            arrow_points[2] = arrow_points[0] + wxPoint(-3, 3);
-            break;
-        case wxRIBBON_SCROLL_BTN_DOWN:
-            arrow_points[0] = wxPoint(rect.width / 2, rect.height / 2 + 2);
-            if(style & wxRIBBON_SCROLL_BTN_ACTIVE)
-                arrow_points[0].y += 1;
-            arrow_points[1] = arrow_points[0] - wxPoint( 3, 3);
-            arrow_points[2] = arrow_points[0] - wxPoint(-3, 3);
-            break;
-        }
-
-        dc.SetPen(*wxTRANSPARENT_PEN);
-        wxBrush B(style & wxRIBBON_SCROLL_BTN_HOVERED ? m_tab_active_background_colour : m_tab_label_colour);
-        dc.SetBrush(B);
-        dc.DrawPolygon(sizeof(arrow_points)/sizeof(wxPoint), arrow_points, rect.x, rect.y);
-    }
-}
-
-void wxRibbonMSWArtProvider::DrawDropdownArrow(wxDC& dc, int x, int y, const wxColour& colour)
-{
-    wxPoint arrow_points[3];
-    wxBrush brush(colour);
-    arrow_points[0] = wxPoint(1, 2);
-    arrow_points[1] = arrow_points[0] + wxPoint(-3, -3);
-    arrow_points[2] = arrow_points[0] + wxPoint( 3, -3);
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.SetBrush(brush);
-    dc.DrawPolygon(sizeof(arrow_points)/sizeof(wxPoint), arrow_points, x, y);
-}
-
-void wxRibbonMSWArtProvider::RemovePanelPadding(wxRect* rect)
-{
-    if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-    {
-        rect->y += 1;
-        rect->height -= 2;
-    }
-    else
-    {
-        rect->x += 1;
-        rect->width -= 2;
-    }
-}
-
-void wxRibbonMSWArtProvider::DrawPanelBackground(
-                        wxDC& dc,
-                        wxRibbonPanel* wnd,
-                        const wxRect& rect)
-{
-    DrawPartialPageBackground(dc, wnd, rect, false);
-
-    wxRect true_rect(rect);
-    RemovePanelPadding(&true_rect);
-    bool has_ext_button = wnd->HasExtButton();
-
-    int label_height;
-    {
-        dc.SetFont(m_panel_label_font);
-        dc.SetPen(*wxTRANSPARENT_PEN);
-        if(wnd->IsHovered())
-        {
-            dc.SetBrush(m_panel_hover_label_background_brush);
-            dc.SetTextForeground(m_panel_hover_label_colour);
-        }
-        else
-        {
-            dc.SetBrush(m_panel_label_background_brush);
-            dc.SetTextForeground(m_panel_label_colour);
-        }
-
-        wxRect label_rect(true_rect);
-        wxString label = wnd->GetLabel();
-        bool clip_label = false;
-        wxSize label_size(dc.GetTextExtent(label));
-
-        label_rect.SetX(label_rect.GetX() + 1);
-        label_rect.SetWidth(label_rect.GetWidth() - 2);
-        label_rect.SetHeight(label_size.GetHeight() + 2);
-        label_rect.SetY(true_rect.GetBottom() - label_rect.GetHeight());
-        label_height = label_rect.GetHeight();
-
-        wxRect label_bg_rect = label_rect;
-
-        if(has_ext_button)
-            label_rect.SetWidth(label_rect.GetWidth() - 13);
-
-        if(label_size.GetWidth() > label_rect.GetWidth())
-        {
-            // Test if there is enough length for 3 letters and ...
-            wxString new_label = label.Mid(0, 3) + wxT("...");
-            label_size = dc.GetTextExtent(new_label);
-            if(label_size.GetWidth() > label_rect.GetWidth())
-            {
-                // Not enough room for three characters and ...
-                // Display the entire label and just crop it
-                clip_label = true;
-            }
-            else
-            {
-                // Room for some characters and ...
-                // Display as many characters as possible and append ...
-                for(size_t len = label.Len() - 1; len >= 3; --len)
-                {
-                    new_label = label.Mid(0, len) + wxT("...");
-                    label_size = dc.GetTextExtent(new_label);
-                    if(label_size.GetWidth() <= label_rect.GetWidth())
-                    {
-                        label = new_label;
-                        break;
-                    }
-                }
-            }
-        }
-
-        dc.DrawRectangle(label_bg_rect);
-        if(clip_label)
-        {
-            wxDCClipper clip(dc, label_rect);
-            dc.DrawText(label, label_rect.x, label_rect.y +
-                (label_rect.GetHeight() - label_size.GetHeight()) / 2);
-        }
-        else
-        {
-            dc.DrawText(label, label_rect.x +
-                (label_rect.GetWidth() - label_size.GetWidth()) / 2,
-                label_rect.y +
-                (label_rect.GetHeight() - label_size.GetHeight()) / 2);
-        }
-
-        if(has_ext_button)
-        {
-            if(wnd->IsExtButtonHovered())
-            {
-                dc.SetPen(m_panel_hover_button_border_pen);
-                dc.SetBrush(m_panel_hover_button_background_brush);
-                dc.DrawRoundedRectangle(label_rect.GetRight(), label_rect.GetBottom() - 13, 13, 13, 1.0);
-                dc.DrawBitmap(m_panel_extension_bitmap[1], label_rect.GetRight() + 3, label_rect.GetBottom() - 10, true);
-            }
-            else
-                dc.DrawBitmap(m_panel_extension_bitmap[0], label_rect.GetRight() + 3, label_rect.GetBottom() - 10, true);
-        }
-    }
-
-    if(wnd->IsHovered())
-    {
-        wxRect client_rect(true_rect);
-        client_rect.x++;
-        client_rect.width -= 2;
-        client_rect.y++;
-        client_rect.height -= 2 + label_height;
-        DrawPartialPageBackground(dc, wnd, client_rect, true);
-    }
-
-    DrawPanelBorder(dc, true_rect, m_panel_border_pen, m_panel_border_gradient_pen);
-}
-
-wxRect wxRibbonMSWArtProvider::GetPanelExtButtonArea(wxDC& WXUNUSED(dc),
-                        const wxRibbonPanel* WXUNUSED(wnd),
-                        wxRect rect)
-{
-    RemovePanelPadding(&rect);
-    rect = wxRect(rect.GetRight()-13, rect.GetBottom()-13, 13, 13);
-    return rect;
-}
-
-void wxRibbonMSWArtProvider::DrawGalleryBackground(
-                        wxDC& dc,
-                        wxRibbonGallery* wnd,
-                        const wxRect& rect)
-{
-    DrawPartialPageBackground(dc, wnd, rect);
-
-    if(wnd->IsHovered())
-    {
-        dc.SetPen(*wxTRANSPARENT_PEN);
-        dc.SetBrush(m_gallery_hover_background_brush);
-        if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-        {
-            dc.DrawRectangle(rect.x + 1, rect.y + 1, rect.width - 2,
-                rect.height - 16);
-        }
-        else
-        {
-            dc.DrawRectangle(rect.x + 1, rect.y + 1, rect.width - 16,
-                rect.height - 2);
-        }
-    }
-
-    dc.SetPen(m_gallery_border_pen);
-    // Outline
-    dc.DrawLine(rect.x + 1, rect.y, rect.x + rect.width - 1, rect.y);
-    dc.DrawLine(rect.x, rect.y + 1, rect.x, rect.y + rect.height - 1);
-    dc.DrawLine(rect.x + 1, rect.y + rect.height - 1, rect.x + rect.width - 1,
-        rect.y + rect.height - 1);
-    dc.DrawLine(rect.x + rect.width - 1, rect.y + 1, rect.x + rect.width - 1,
-        rect.y + rect.height - 1);
-
-    DrawGalleryBackgroundCommon(dc, wnd, rect);
-}
-
-void wxRibbonMSWArtProvider::DrawGalleryBackgroundCommon(wxDC& dc,
-                        wxRibbonGallery* wnd,
-                        const wxRect& rect)
-{
-    wxRect up_btn, down_btn, ext_btn;
-
-    if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-    {
-        // Divider between items and buttons
-        dc.DrawLine(rect.x, rect.y + rect.height - 15, rect.x + rect.width,
-            rect.y + rect.height - 15);
-
-        up_btn = wxRect(rect.x, rect.y + rect.height - 15, rect.width / 3, 15);
-
-        down_btn = wxRect(up_btn.GetRight() + 1, up_btn.GetTop(),
-            up_btn.GetWidth(), up_btn.GetHeight());
-        dc.DrawLine(down_btn.GetLeft(), down_btn.GetTop(), down_btn.GetLeft(),
-            down_btn.GetBottom());
-
-        ext_btn = wxRect(down_btn.GetRight() + 1, up_btn.GetTop(), rect.width -
-            up_btn.GetWidth() - down_btn.GetWidth() - 1, up_btn.GetHeight());
-        dc.DrawLine(ext_btn.GetLeft(), ext_btn.GetTop(), ext_btn.GetLeft(),
-            ext_btn.GetBottom());
-    }
-    else
-    {
-        // Divider between items and buttons
-        dc.DrawLine(rect.x + rect.width - 15, rect.y, rect.x + rect.width - 15,
-            rect.y + rect.height);
-
-        up_btn = wxRect(rect.x + rect.width - 15, rect.y, 15, rect.height / 3);
-
-        down_btn = wxRect(up_btn.GetLeft(), up_btn.GetBottom() + 1,
-            up_btn.GetWidth(), up_btn.GetHeight());
-        dc.DrawLine(down_btn.GetLeft(), down_btn.GetTop(), down_btn.GetRight(),
-            down_btn.GetTop());
-
-        ext_btn = wxRect(up_btn.GetLeft(), down_btn.GetBottom() + 1, up_btn.GetWidth(),
-            rect.height - up_btn.GetHeight() - down_btn.GetHeight() - 1);
-        dc.DrawLine(ext_btn.GetLeft(), ext_btn.GetTop(), ext_btn.GetRight(),
-            ext_btn.GetTop());
-    }
-
-    DrawGalleryButton(dc, up_btn, wnd->GetUpButtonState(),
-        m_gallery_up_bitmap);
-    DrawGalleryButton(dc, down_btn, wnd->GetDownButtonState(),
-        m_gallery_down_bitmap);
-    DrawGalleryButton(dc, ext_btn, wnd->GetExtensionButtonState(),
-        m_gallery_extension_bitmap);
-}
-
-void wxRibbonMSWArtProvider::DrawGalleryButton(wxDC& dc,
-                                            wxRect rect,
-                                            wxRibbonGalleryButtonState state,
-                                            wxBitmap* bitmaps)
-{
-    wxBitmap btn_bitmap;
-    wxBrush btn_top_brush;
-    wxColour btn_colour;
-    wxColour btn_grad_colour;
-    switch(state)
-    {
-    case wxRIBBON_GALLERY_BUTTON_NORMAL:
-        btn_top_brush = m_gallery_button_background_top_brush;
-        btn_colour = m_gallery_button_background_colour;
-        btn_grad_colour = m_gallery_button_background_gradient_colour;
-        btn_bitmap = bitmaps[0];
-        break;
-    case wxRIBBON_GALLERY_BUTTON_HOVERED:
-        btn_top_brush = m_gallery_button_hover_background_top_brush;
-        btn_colour = m_gallery_button_hover_background_colour;
-        btn_grad_colour = m_gallery_button_hover_background_gradient_colour;
-        btn_bitmap = bitmaps[1];
-        break;
-    case wxRIBBON_GALLERY_BUTTON_ACTIVE:
-        btn_top_brush = m_gallery_button_active_background_top_brush;
-        btn_colour = m_gallery_button_active_background_colour;
-        btn_grad_colour = m_gallery_button_active_background_gradient_colour;
-        btn_bitmap = bitmaps[2];
-        break;
-    case wxRIBBON_GALLERY_BUTTON_DISABLED:
-        btn_top_brush = m_gallery_button_disabled_background_top_brush;
-        btn_colour = m_gallery_button_disabled_background_colour;
-        btn_grad_colour = m_gallery_button_disabled_background_gradient_colour;
-        btn_bitmap = bitmaps[3];
-        break;
-    }
-
-    rect.x++;
-    rect.y++;
-    if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-    {
-        rect.width--;;
-        rect.height -= 2;
-    }
-    else
-    {
-        rect.width -= 2;
-        rect.height--;
-    }
-
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.SetBrush(btn_top_brush);
-    dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height / 2);
-
-    wxRect lower(rect);
-    lower.height = (lower.height + 1) / 2;
-    lower.y += rect.height - lower.height;
-    dc.GradientFillLinear(lower, btn_colour, btn_grad_colour, wxSOUTH);
-
-    dc.DrawBitmap(btn_bitmap, rect.x + rect.width / 2 - 2, lower.y - 2, true);
-}
-
-void wxRibbonMSWArtProvider::DrawGalleryItemBackground(
-                        wxDC& dc,
-                        wxRibbonGallery* wnd,
-                        const wxRect& rect,
-                        wxRibbonGalleryItem* item)
-{
-    if(wnd->GetHoveredItem() != item && wnd->GetActiveItem() != item &&
-        wnd->GetSelection() != item)
-        return;
-
-    dc.SetPen(m_gallery_item_border_pen);
-    dc.DrawLine(rect.x + 1, rect.y, rect.x + rect.width - 1, rect.y);
-    dc.DrawLine(rect.x, rect.y + 1, rect.x, rect.y + rect.height - 1);
-    dc.DrawLine(rect.x + 1, rect.y + rect.height - 1, rect.x + rect.width - 1,
-        rect.y + rect.height - 1);
-    dc.DrawLine(rect.x + rect.width - 1, rect.y + 1, rect.x + rect.width - 1,
-        rect.y + rect.height - 1);
-
-    wxBrush top_brush;
-    wxColour bg_colour;
-    wxColour bg_gradient_colour;
-
-    if(wnd->GetActiveItem() == item || wnd->GetSelection() == item)
-    {
-        top_brush = m_gallery_button_active_background_top_brush;
-        bg_colour = m_gallery_button_active_background_colour;
-        bg_gradient_colour = m_gallery_button_active_background_gradient_colour;
-    }
-    else
-    {
-        top_brush = m_gallery_button_hover_background_top_brush;
-        bg_colour = m_gallery_button_hover_background_colour;
-        bg_gradient_colour = m_gallery_button_hover_background_gradient_colour;
-    }
-
-    wxRect upper(rect);
-    upper.x += 1;
-    upper.width -= 2;
-    upper.y += 1;
-    upper.height /= 3;
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.SetBrush(top_brush);
-    dc.DrawRectangle(upper.x, upper.y, upper.width, upper.height);
-
-    wxRect lower(upper);
-    lower.y += lower.height;
-    lower.height = rect.height - 2 - lower.height;
-    dc.GradientFillLinear(lower, bg_colour, bg_gradient_colour, wxSOUTH);
-}
-
-void wxRibbonMSWArtProvider::DrawPanelBorder(wxDC& dc, const wxRect& rect,
-                                             wxPen& primary_colour,
-                                             wxPen& secondary_colour)
-{
-    wxPoint border_points[9];
-    border_points[0] = wxPoint(2, 0);
-    border_points[1] = wxPoint(rect.width - 3, 0);
-    border_points[2] = wxPoint(rect.width - 1, 2);
-    border_points[3] = wxPoint(rect.width - 1, rect.height - 3);
-    border_points[4] = wxPoint(rect.width - 3, rect.height - 1);
-    border_points[5] = wxPoint(2, rect.height - 1);
-    border_points[6] = wxPoint(0, rect.height - 3);
-    border_points[7] = wxPoint(0, 2);
-
-    if(primary_colour.GetColour() == secondary_colour.GetColour())
-    {
-        border_points[8] = border_points[0];
-        dc.SetPen(primary_colour);
-        dc.DrawLines(sizeof(border_points)/sizeof(wxPoint), border_points, rect.x, rect.y);
-    }
-    else
-    {
-        dc.SetPen(primary_colour);
-        dc.DrawLines(3, border_points, rect.x, rect.y);
-
-#define SingleLine(start, finish) \
-        dc.DrawLine(start.x + rect.x, start.y + rect.y, finish.x + rect.x, finish.y + rect.y)
-
-        SingleLine(border_points[0], border_points[7]);
-        dc.SetPen(secondary_colour);
-        dc.DrawLines(3, border_points + 4, rect.x, rect.y);
-        SingleLine(border_points[4], border_points[3]);
-
-#undef SingleLine
-
-        border_points[6] = border_points[2];
-        wxRibbonDrawParallelGradientLines(dc, 2, border_points + 6, 0, 1,
-            border_points[3].y - border_points[2].y + 1, rect.x, rect.y,
-            primary_colour.GetColour(), secondary_colour.GetColour());
-    }
-}
-
-void wxRibbonMSWArtProvider::DrawMinimisedPanel(
-                        wxDC& dc,
-                        wxRibbonPanel* wnd,
-                        const wxRect& rect,
-                        wxBitmap& bitmap)
-{
-    DrawPartialPageBackground(dc, wnd, rect, false);
-
-    wxRect true_rect(rect);
-    RemovePanelPadding(&true_rect);
-
-    if(wnd->GetExpandedPanel() != NULL)
-    {
-        wxRect client_rect(true_rect);
-        client_rect.x++;
-        client_rect.width -= 2;
-        client_rect.y++;
-        client_rect.height = (rect.y + rect.height / 5) - client_rect.x;
-        dc.GradientFillLinear(client_rect,
-            m_panel_active_background_top_colour,
-            m_panel_active_background_top_gradient_colour, wxSOUTH);
-
-        client_rect.y += client_rect.height;
-        client_rect.height = (true_rect.y + true_rect.height) - client_rect.y;
-        dc.GradientFillLinear(client_rect,
-            m_panel_active_background_colour,
-            m_panel_active_background_gradient_colour, wxSOUTH);
-    }
-    else if(wnd->IsHovered())
-    {
-        wxRect client_rect(true_rect);
-        client_rect.x++;
-        client_rect.width -= 2;
-        client_rect.y++;
-        client_rect.height -= 2;
-        DrawPartialPageBackground(dc, wnd, client_rect, true);
-    }
-
-    wxRect preview;
-    DrawMinimisedPanelCommon(dc, wnd, true_rect, &preview);
-
-    dc.SetBrush(m_panel_hover_label_background_brush);
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.DrawRectangle(preview.x + 1, preview.y + preview.height - 8,
-        preview.width - 2, 7);
-
-    int mid_pos = rect.y + rect.height / 5 - preview.y;
-    if(mid_pos < 0 || mid_pos >= preview.height)
-    {
-        wxRect full_rect(preview);
-        full_rect.x += 1;
-        full_rect.y += 1;
-        full_rect.width -= 2;
-        full_rect.height -= 9;
-        if(mid_pos < 0)
-        {
-            dc.GradientFillLinear(full_rect,
-                m_page_hover_background_colour,
-                m_page_hover_background_gradient_colour, wxSOUTH);
-        }
-        else
-        {
-            dc.GradientFillLinear(full_rect,
-                m_page_hover_background_top_colour,
-                m_page_hover_background_top_gradient_colour, wxSOUTH);
-        }
-    }
-    else
-    {
-        wxRect top_rect(preview);
-        top_rect.x += 1;
-        top_rect.y += 1;
-        top_rect.width -= 2;
-        top_rect.height = mid_pos;
-        dc.GradientFillLinear(top_rect,
-            m_page_hover_background_top_colour,
-            m_page_hover_background_top_gradient_colour, wxSOUTH);
-
-        wxRect btm_rect(top_rect);
-        btm_rect.y = preview.y + mid_pos;
-        btm_rect.height = preview.y + preview.height - 7 - btm_rect.y;
-        dc.GradientFillLinear(btm_rect,
-            m_page_hover_background_colour,
-            m_page_hover_background_gradient_colour, wxSOUTH);
-    }
-
-    if(bitmap.IsOk())
-    {
-        dc.DrawBitmap(bitmap, preview.x + (preview.width - bitmap.GetWidth()) / 2,
-            preview.y + (preview.height - 7 - bitmap.GetHeight()) / 2, true);
-    }
-
-    DrawPanelBorder(dc, preview, m_panel_border_pen, m_panel_border_gradient_pen);
-
-    DrawPanelBorder(dc, true_rect, m_panel_minimised_border_pen,
-        m_panel_minimised_border_gradient_pen);
-}
-
-void wxRibbonMSWArtProvider::DrawMinimisedPanelCommon(
-                        wxDC& dc,
-                        wxRibbonPanel* wnd,
-                        const wxRect& true_rect,
-                        wxRect* preview_rect)
-{
-    wxRect preview(0, 0, 32, 32);
-    if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-    {
-        preview.x = true_rect.x + 4;
-        preview.y = true_rect.y + (true_rect.height - preview.height) / 2;
-    }
-    else
-    {
-        preview.x = true_rect.x + (true_rect.width - preview.width) / 2;
-        preview.y = true_rect.y + 4;
-    }
-    if(preview_rect)
-        *preview_rect = preview;
-
-    wxCoord label_width, label_height;
-    dc.SetFont(m_panel_label_font);
-    dc.GetTextExtent(wnd->GetLabel(), &label_width, &label_height);
-
-    int xpos = true_rect.x + (true_rect.width - label_width + 1) / 2;
-    int ypos = preview.y + preview.height + 5;
-
-    if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-    {
-        xpos = preview.x + preview.width + 5;
-        ypos = true_rect.y + (true_rect.height - label_height) / 2;
-    }
-
-    dc.SetTextForeground(m_panel_minimised_label_colour);
-    dc.DrawText(wnd->GetLabel(), xpos, ypos);
-
-
-    wxPoint arrow_points[3];
-    if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-    {
-        xpos += label_width;
-        arrow_points[0] = wxPoint(xpos + 5, ypos + label_height / 2);
-        arrow_points[1] = arrow_points[0] + wxPoint(-3,  3);
-        arrow_points[2] = arrow_points[0] + wxPoint(-3, -3);
-    }
-    else
-    {
-        ypos += label_height;
-        arrow_points[0] = wxPoint(true_rect.width / 2, ypos + 5);
-        arrow_points[1] = arrow_points[0] + wxPoint(-3, -3);
-        arrow_points[2] = arrow_points[0] + wxPoint( 3, -3);
-    }
-
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    wxBrush B(m_panel_minimised_label_colour);
-    dc.SetBrush(B);
-    dc.DrawPolygon(sizeof(arrow_points)/sizeof(wxPoint), arrow_points,
-        true_rect.x, true_rect.y);
-}
-
-void wxRibbonMSWArtProvider::DrawButtonBarBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect)
-{
-    DrawPartialPageBackground(dc, wnd, rect, true);
-}
-
-void wxRibbonMSWArtProvider::DrawPartialPageBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect,
-                        bool allow_hovered)
-{
-    // Assume the window is a child of a ribbon page, and also check for a
-    // hovered panel somewhere between the window and the page, as it causes
-    // the background to change.
-    wxPoint offset(wnd->GetPosition());
-    wxRibbonPage* page = NULL;
-    wxWindow* parent = wnd->GetParent();
-    wxRibbonPanel* panel = wxDynamicCast(wnd, wxRibbonPanel);
-    bool hovered = false;
-
-    if(panel != NULL)
-    {
-        hovered = allow_hovered && panel->IsHovered();
-        if(panel->GetExpandedDummy() != NULL)
-        {
-            offset = panel->GetExpandedDummy()->GetPosition();
-            parent = panel->GetExpandedDummy()->GetParent();
-        }
-    }
-    for(; parent; parent = parent->GetParent())
-    {
-        if(panel == NULL)
-        {
-            panel = wxDynamicCast(parent, wxRibbonPanel);
-            if(panel != NULL)
-            {
-                hovered = allow_hovered && panel->IsHovered();
-                if(panel->GetExpandedDummy() != NULL)
-                {
-                    parent = panel->GetExpandedDummy();
-                }
-            }
-        }
-        page = wxDynamicCast(parent, wxRibbonPage);
-        if(page != NULL)
-        {
-            break;
-        }
-        offset += parent->GetPosition();
-    }
-    if(page != NULL)
-    {
-        DrawPartialPageBackground(dc, wnd, rect, page, offset, hovered);
-        return;
-    }
-
-    // No page found - fallback to painting with a stock brush
-    dc.SetBrush(*wxWHITE_BRUSH);
-    dc.SetPen(*wxTRANSPARENT_PEN);
-    dc.DrawRectangle(rect.x, rect.y, rect.width, rect.height);
-}
-
-void wxRibbonMSWArtProvider::DrawButtonBarButton(
-                        wxDC& dc,
-                        wxWindow* WXUNUSED(wnd),
-                        const wxRect& rect,
-                        wxRibbonButtonKind kind,
-                        long state,
-                        const wxString& label,
-                        const wxBitmap& bitmap_large,
-                        const wxBitmap& bitmap_small)
-{
-    if(kind == wxRIBBON_BUTTON_TOGGLE)
-    {
-        kind = wxRIBBON_BUTTON_NORMAL;
-        if(state & wxRIBBON_BUTTONBAR_BUTTON_TOGGLED)
-            state ^= wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK;
-    }
-
-    if(state & (wxRIBBON_BUTTONBAR_BUTTON_HOVER_MASK |
-        wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK))
-    {
-        if(state & wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK)
-            dc.SetPen(m_button_bar_active_border_pen);
-        else
-            dc.SetPen(m_button_bar_hover_border_pen);
-
-        wxRect bg_rect(rect);
-        bg_rect.x++;
-        bg_rect.y++;
-        bg_rect.width -= 2;
-        bg_rect.height -= 2;
-
-        wxRect bg_rect_top(bg_rect);
-        bg_rect_top.height /= 3;
-        bg_rect.y += bg_rect_top.height;
-        bg_rect.height -= bg_rect_top.height;
-
-        if(kind == wxRIBBON_BUTTON_HYBRID)
-        {
-            switch(state & wxRIBBON_BUTTONBAR_BUTTON_SIZE_MASK)
-            {
-            case wxRIBBON_BUTTONBAR_BUTTON_LARGE:
-                {
-                    int iYBorder = rect.y + bitmap_large.GetHeight() + 4;
-                    wxRect partial_bg(rect);
-                    if(state & wxRIBBON_BUTTONBAR_BUTTON_NORMAL_HOVERED)
-                    {
-                        partial_bg.SetBottom(iYBorder - 1);
-                    }
-                    else
-                    {
-                        partial_bg.height -= (iYBorder - partial_bg.y + 1);
-                        partial_bg.y = iYBorder + 1;
-                    }
-                    dc.DrawLine(rect.x, iYBorder, rect.x + rect.width, iYBorder);
-                    bg_rect.Intersect(partial_bg);
-                    bg_rect_top.Intersect(partial_bg);
-                }
-                break;
-            case wxRIBBON_BUTTONBAR_BUTTON_MEDIUM:
-                {
-                    int iArrowWidth = 9;
-                    if(state & wxRIBBON_BUTTONBAR_BUTTON_NORMAL_HOVERED)
-                    {
-                        bg_rect.width -= iArrowWidth;
-                        bg_rect_top.width -= iArrowWidth;
-                        dc.DrawLine(bg_rect_top.x + bg_rect_top.width,
-                            rect.y, bg_rect_top.x + bg_rect_top.width,
-                            rect.y + rect.height);
-                    }
-                    else
-                    {
-                        --iArrowWidth;
-                        bg_rect.x += bg_rect.width - iArrowWidth;
-                        bg_rect_top.x += bg_rect_top.width - iArrowWidth;
-                        bg_rect.width = iArrowWidth;
-                        bg_rect_top.width = iArrowWidth;
-                        dc.DrawLine(bg_rect_top.x - 1, rect.y,
-                            bg_rect_top.x - 1, rect.y + rect.height);
-                    }
-                }
-                break;
-            case wxRIBBON_BUTTONBAR_BUTTON_SMALL:
-                break;
-            }
-        }
-
-        if(state & wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK)
-        {
-            dc.GradientFillLinear(bg_rect_top,
-                m_button_bar_active_background_top_colour,
-                m_button_bar_active_background_top_gradient_colour, wxSOUTH);
-            dc.GradientFillLinear(bg_rect,
-                m_button_bar_active_background_colour,
-                m_button_bar_active_background_gradient_colour, wxSOUTH);
-        }
-        else
-        {
-            dc.GradientFillLinear(bg_rect_top,
-                m_button_bar_hover_background_top_colour,
-                m_button_bar_hover_background_top_gradient_colour, wxSOUTH);
-            dc.GradientFillLinear(bg_rect,
-                m_button_bar_hover_background_colour,
-                m_button_bar_hover_background_gradient_colour, wxSOUTH);
-        }
-
-        wxPoint border_points[9];
-        border_points[0] = wxPoint(2, 0);
-        border_points[1] = wxPoint(rect.width - 3, 0);
-        border_points[2] = wxPoint(rect.width - 1, 2);
-        border_points[3] = wxPoint(rect.width - 1, rect.height - 3);
-        border_points[4] = wxPoint(rect.width - 3, rect.height - 1);
-        border_points[5] = wxPoint(2, rect.height - 1);
-        border_points[6] = wxPoint(0, rect.height - 3);
-        border_points[7] = wxPoint(0, 2);
-        border_points[8] = border_points[0];
-
-        dc.DrawLines(sizeof(border_points)/sizeof(wxPoint), border_points,
-            rect.x, rect.y);
-    }
-
-    dc.SetFont(m_button_bar_label_font);
-    dc.SetTextForeground(state & wxRIBBON_BUTTONBAR_BUTTON_DISABLED
-                            ? m_button_bar_label_disabled_colour
-                            : m_button_bar_label_colour);
-    DrawButtonBarButtonForeground(dc, rect, kind, state, label, bitmap_large,
-        bitmap_small);
-}
-
-void wxRibbonMSWArtProvider::DrawButtonBarButtonForeground(
-                        wxDC& dc,
-                        const wxRect& rect,
-                        wxRibbonButtonKind kind,
-                        long state,
-                        const wxString& label,
-                        const wxBitmap& bitmap_large,
-                        const wxBitmap& bitmap_small)
-{
-    const wxColour
-        arrowColour(state & wxRIBBON_BUTTONBAR_BUTTON_DISABLED
-                        ? m_button_bar_label_disabled_colour
-                        : m_button_bar_label_colour);
-
-    switch(state & wxRIBBON_BUTTONBAR_BUTTON_SIZE_MASK)
-    {
-    case wxRIBBON_BUTTONBAR_BUTTON_LARGE:
-        {
-            const int padding = 2;
-            dc.DrawBitmap(bitmap_large,
-                rect.x + (rect.width - bitmap_large.GetWidth()) / 2,
-                rect.y + padding, true);
-            int ypos = rect.y + padding + bitmap_large.GetHeight() + padding;
-            int arrow_width = kind == wxRIBBON_BUTTON_NORMAL ? 0 : 8;
-            wxCoord label_w, label_h;
-            dc.GetTextExtent(label, &label_w, &label_h);
-            if(label_w + 2 * padding <= rect.width)
-            {
-                dc.DrawText(label, rect.x + (rect.width - label_w) / 2, ypos);
-                if(arrow_width != 0)
-                {
-                    DrawDropdownArrow(dc, rect.x + rect.width / 2,
-                        ypos + (label_h * 3) / 2,
-                        arrowColour);
-                }
-            }
-            else
-            {
-                size_t breaki = label.Len();
-                do
-                {
-                    --breaki;
-                    if(wxRibbonCanLabelBreakAtPosition(label, breaki))
-                    {
-                        wxString label_top = label.Mid(0, breaki);
-                        dc.GetTextExtent(label_top, &label_w, &label_h);
-                        if(label_w + 2 * padding <= rect.width)
-                        {
-                            dc.DrawText(label_top,
-                                rect.x + (rect.width - label_w) / 2, ypos);
-                            ypos += label_h;
-                            wxString label_bottom = label.Mid(breaki + 1);
-                            dc.GetTextExtent(label_bottom, &label_w, &label_h);
-                            label_w += arrow_width;
-                            int iX = rect.x + (rect.width - label_w) / 2;
-                            dc.DrawText(label_bottom, iX, ypos);
-                            if(arrow_width != 0)
-                            {
-                                DrawDropdownArrow(dc,
-                                    iX + 2 +label_w - arrow_width,
-                                    ypos + label_h / 2 + 1,
-                                    arrowColour);
-                            }
-                            break;
-                        }
-                    }
-                } while(breaki > 0);
-            }
-        }
-        break;
-    case wxRIBBON_BUTTONBAR_BUTTON_MEDIUM:
-        {
-            int x_cursor = rect.x + 2;
-            dc.DrawBitmap(bitmap_small, x_cursor,
-                    rect.y + (rect.height - bitmap_small.GetHeight())/2, true);
-            x_cursor += bitmap_small.GetWidth() + 2;
-            wxCoord label_w, label_h;
-            dc.GetTextExtent(label, &label_w, &label_h);
-            dc.DrawText(label, x_cursor,
-                rect.y + (rect.height - label_h) / 2);
-            x_cursor += label_w + 3;
-            if(kind != wxRIBBON_BUTTON_NORMAL)
-            {
-                DrawDropdownArrow(dc, x_cursor, rect.y + rect.height / 2, arrowColour);
-            }
-            break;
-        }
-    default:
-        // TODO
-        break;
-    }
-}
-
-void wxRibbonMSWArtProvider::DrawToolBarBackground(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        const wxRect& rect)
-{
-    DrawPartialPageBackground(dc, wnd, rect);
-}
-
-void wxRibbonMSWArtProvider::DrawToolGroupBackground(
-                        wxDC& dc,
-                        wxWindow* WXUNUSED(wnd),
-                        const wxRect& rect)
-{
-    dc.SetPen(m_toolbar_border_pen);
-    wxPoint outline[9];
-    outline[0] = wxPoint(2, 0);
-    outline[1] = wxPoint(rect.width - 3, 0);
-    outline[2] = wxPoint(rect.width - 1, 2);
-    outline[3] = wxPoint(rect.width - 1, rect.height - 3);
-    outline[4] = wxPoint(rect.width - 3, rect.height - 1);
-    outline[5] = wxPoint(2, rect.height - 1);
-    outline[6] = wxPoint(0, rect.height - 3);
-    outline[7] = wxPoint(0, 2);
-    outline[8] = outline[0];
-
-    dc.DrawLines(sizeof(outline)/sizeof(wxPoint), outline, rect.x, rect.y);
-}
-
-void wxRibbonMSWArtProvider::DrawTool(
-                wxDC& dc,
-                wxWindow* WXUNUSED(wnd),
-                const wxRect& rect,
-                const wxBitmap& bitmap,
-                wxRibbonButtonKind kind,
-                long state)
-{
-    if(kind == wxRIBBON_BUTTON_TOGGLE)
-    {
-        if(state & wxRIBBON_TOOLBAR_TOOL_TOGGLED)
-            state ^= wxRIBBON_TOOLBAR_TOOL_ACTIVE_MASK;
-    }
-
-    wxRect bg_rect(rect);
-    bg_rect.Deflate(1);
-    if((state & wxRIBBON_TOOLBAR_TOOL_LAST) == 0)
-        bg_rect.width++;
-    bool is_split_hybrid = (kind == wxRIBBON_BUTTON_HYBRID && (state &
-        (wxRIBBON_TOOLBAR_TOOL_HOVER_MASK | wxRIBBON_TOOLBAR_TOOL_ACTIVE_MASK)));
-
-    // Background
-    wxRect bg_rect_top(bg_rect);
-    bg_rect_top.height = (bg_rect_top.height * 2) / 5;
-    wxRect bg_rect_btm(bg_rect);
-    bg_rect_btm.y += bg_rect_top.height;
-    bg_rect_btm.height -= bg_rect_top.height;
-    wxColour bg_top_colour = m_tool_background_top_colour;
-    wxColour bg_top_grad_colour = m_tool_background_top_gradient_colour;
-    wxColour bg_colour = m_tool_background_colour;
-    wxColour bg_grad_colour = m_tool_background_gradient_colour;
-    if(state & wxRIBBON_TOOLBAR_TOOL_ACTIVE_MASK)
-    {
-        bg_top_colour = m_tool_active_background_top_colour;
-        bg_top_grad_colour = m_tool_active_background_top_gradient_colour;
-        bg_colour = m_tool_active_background_colour;
-        bg_grad_colour = m_tool_active_background_gradient_colour;
-    }
-    else if(state & wxRIBBON_TOOLBAR_TOOL_HOVER_MASK)
-    {
-        bg_top_colour = m_tool_hover_background_top_colour;
-        bg_top_grad_colour = m_tool_hover_background_top_gradient_colour;
-        bg_colour = m_tool_hover_background_colour;
-        bg_grad_colour = m_tool_hover_background_gradient_colour;
-    }
-    dc.GradientFillLinear(bg_rect_top, bg_top_colour, bg_top_grad_colour, wxSOUTH);
-    dc.GradientFillLinear(bg_rect_btm, bg_colour, bg_grad_colour, wxSOUTH);
-    if(is_split_hybrid)
-    {
-        wxRect nonrect(bg_rect);
-        if(state & (wxRIBBON_TOOLBAR_TOOL_DROPDOWN_HOVERED |
-            wxRIBBON_TOOLBAR_TOOL_DROPDOWN_ACTIVE))
-        {
-            nonrect.width -= 8;
-        }
-        else
-        {
-            nonrect.x += nonrect.width - 8;
-            nonrect.width = 8;
-        }
-        wxBrush B(m_tool_hover_background_top_colour);
-        dc.SetPen(*wxTRANSPARENT_PEN);
-        dc.SetBrush(B);
-        dc.DrawRectangle(nonrect.x, nonrect.y, nonrect.width, nonrect.height);
-    }
-
-    // Border
-    dc.SetPen(m_toolbar_border_pen);
-    if(state & wxRIBBON_TOOLBAR_TOOL_FIRST)
-    {
-        dc.DrawPoint(rect.x + 1, rect.y + 1);
-        dc.DrawPoint(rect.x + 1, rect.y + rect.height - 2);
-    }
-    else
-        dc.DrawLine(rect.x, rect.y + 1, rect.x, rect.y + rect.height - 1);
-
-    if(state & wxRIBBON_TOOLBAR_TOOL_LAST)
-    {
-        dc.DrawPoint(rect.x + rect.width - 2, rect.y + 1);
-        dc.DrawPoint(rect.x + rect.width - 2, rect.y + rect.height - 2);
-    }
-
-    // Foreground
-    int avail_width = bg_rect.GetWidth();
-    if(kind & wxRIBBON_BUTTON_DROPDOWN)
-    {
-        avail_width -= 8;
-        if(is_split_hybrid)
-        {
-            dc.DrawLine(rect.x + avail_width + 1, rect.y,
-                rect.x + avail_width + 1, rect.y + rect.height);
-        }
-        dc.DrawBitmap(m_toolbar_drop_bitmap, bg_rect.x + avail_width + 2,
-            bg_rect.y + (bg_rect.height / 2) - 2, true);
-    }
-    dc.DrawBitmap(bitmap, bg_rect.x + (avail_width - bitmap.GetWidth()) / 2,
-        bg_rect.y + (bg_rect.height - bitmap.GetHeight()) / 2, true);
-}
-
-void
-wxRibbonMSWArtProvider::DrawToggleButton(wxDC& dc,
-                                         wxRibbonBar* wnd,
-                                         const wxRect& rect,
-                                         wxRibbonDisplayMode mode)
-{
-    int bindex = 0;
-    DrawPartialPageBackground(dc, wnd, rect, false);
-
-    dc.DestroyClippingRegion();
-    dc.SetClippingRegion(rect);
-
-    if(wnd->IsToggleButtonHovered())
-    {
-        dc.SetPen(m_ribbon_toggle_pen);
-        dc.SetBrush(m_ribbon_toggle_brush);
-        dc.DrawRoundedRectangle(rect.GetX(), rect.GetY(), 20, 20, 1.0);
-        bindex = 1;
-    }
-    switch(mode)
-    {
-        case wxRIBBON_BAR_PINNED:
-            dc.DrawBitmap(m_ribbon_toggle_up_bitmap[bindex], rect.GetX()+7, rect.GetY()+6, true);
-            break;
-        case wxRIBBON_BAR_MINIMIZED:
-            dc.DrawBitmap(m_ribbon_toggle_down_bitmap[bindex], rect.GetX()+7, rect.GetY()+6, true);
-            break;
-        case wxRIBBON_BAR_EXPANDED:
-            dc.DrawBitmap(m_ribbon_toggle_pin_bitmap[bindex], rect.GetX ()+4, rect.GetY ()+5, true);
-            break;
-    }
-}
-
-void wxRibbonMSWArtProvider::DrawHelpButton(wxDC& dc,
-                                       wxRibbonBar* wnd,
-                                       const wxRect& rect)
-{
-    DrawPartialPageBackground(dc, wnd, rect, false);
-
-    dc.DestroyClippingRegion();
-    dc.SetClippingRegion(rect);
-
-    if ( wnd->IsHelpButtonHovered() )
-    {
-        dc.SetPen(m_ribbon_toggle_pen);
-        dc.SetBrush(m_ribbon_toggle_brush);
-        dc.DrawRoundedRectangle(rect.GetX(), rect.GetY(), 20, 20, 1.0);
-        dc.DrawBitmap(m_ribbon_bar_help_button_bitmap[1], rect.GetX ()+4, rect.GetY()+5, true);
-    }
-    else
-    {
-        dc.DrawBitmap(m_ribbon_bar_help_button_bitmap[0], rect.GetX ()+4, rect.GetY()+5, true);
-    }
-
-}
-
-void wxRibbonMSWArtProvider::GetBarTabWidth(
-                        wxDC& dc,
-                        wxWindow* WXUNUSED(wnd),
-                        const wxString& label,
-                        const wxBitmap& bitmap,
-                        int* ideal,
-                        int* small_begin_need_separator,
-                        int* small_must_have_separator,
-                        int* minimum)
-{
-    int width = 0;
-    int min = 0;
-    if((m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS) && !label.IsEmpty())
-    {
-        dc.SetFont(m_tab_label_font);
-        width += dc.GetTextExtent(label).GetWidth();
-        min += wxMin(25, width); // enough for a few chars
-        if(bitmap.IsOk())
-        {
-            // gap between label and bitmap
-            width += 4;
-            min += 2;
-        }
-    }
-    if((m_flags & wxRIBBON_BAR_SHOW_PAGE_ICONS) && bitmap.IsOk())
-    {
-        width += bitmap.GetWidth();
-        min += bitmap.GetWidth();
-    }
-
-    if(ideal != NULL)
-    {
-        *ideal = width + 30;
-    }
-    if(small_begin_need_separator != NULL)
-    {
-        *small_begin_need_separator = width + 20;
-    }
-    if(small_must_have_separator != NULL)
-    {
-        *small_must_have_separator = width + 10;
-    }
-    if(minimum != NULL)
-    {
-        *minimum = min;
-    }
-}
-
-int wxRibbonMSWArtProvider::GetTabCtrlHeight(
-                        wxDC& dc,
-                        wxWindow* WXUNUSED(wnd),
-                        const wxRibbonPageTabInfoArray& pages)
-{
-    int text_height = 0;
-    int icon_height = 0;
-
-    if(pages.GetCount() <= 1 && (m_flags & wxRIBBON_BAR_ALWAYS_SHOW_TABS) == 0)
-    {
-        // To preserve space, a single tab need not be displayed. We still need
-        // two pixels of border / padding though.
-        return 2;
-    }
-
-    if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS)
-    {
-        dc.SetFont(m_tab_label_font);
-        text_height = dc.GetTextExtent(wxT("ABCDEFXj")).GetHeight() + 10;
-    }
-    if(m_flags & wxRIBBON_BAR_SHOW_PAGE_ICONS)
-    {
-        size_t numpages = pages.GetCount();
-        for(size_t i = 0; i < numpages; ++i)
-        {
-            const wxRibbonPageTabInfo& info = pages.Item(i);
-            if(info.page->GetIcon().IsOk())
-            {
-                icon_height = wxMax(icon_height, info.page->GetIcon().GetHeight() + 4);
-            }
-        }
-    }
-
-    return wxMax(text_height, icon_height);
-}
-
-wxSize wxRibbonMSWArtProvider::GetScrollButtonMinimumSize(
-                        wxDC& WXUNUSED(dc),
-                        wxWindow* WXUNUSED(wnd),
-                        long WXUNUSED(style))
-{
-    return wxSize(12, 12);
-}
-
-wxSize wxRibbonMSWArtProvider::GetPanelSize(
-                        wxDC& dc,
-                        const wxRibbonPanel* wnd,
-                        wxSize client_size,
-                        wxPoint* client_offset)
-{
-    dc.SetFont(m_panel_label_font);
-    wxSize label_size = dc.GetTextExtent(wnd->GetLabel());
-
-    client_size.IncBy(0, label_size.GetHeight());
-    if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-        client_size.IncBy(4, 8);
-    else
-        client_size.IncBy(6, 6);
-
-    if(client_offset != NULL)
-    {
-        if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-            *client_offset = wxPoint(2, 3);
-        else
-            *client_offset = wxPoint(3, 2);
-    }
-
-    return client_size;
-}
-
-wxSize wxRibbonMSWArtProvider::GetPanelClientSize(
-                        wxDC& dc,
-                        const wxRibbonPanel* wnd,
-                        wxSize size,
-                        wxPoint* client_offset)
-{
-    dc.SetFont(m_panel_label_font);
-    wxSize label_size = dc.GetTextExtent(wnd->GetLabel());
-
-    size.DecBy(0, label_size.GetHeight());
-    if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-        size.DecBy(4, 8);
-    else
-        size.DecBy(6, 6);
-
-    if(client_offset != NULL)
-    {
-        if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-            *client_offset = wxPoint(2, 3);
-        else
-            *client_offset = wxPoint(3, 2);
-    }
-    if (size.x < 0) size.x = 0;
-    if (size.y < 0) size.y = 0;
-
-    return size;
-}
-
-wxSize wxRibbonMSWArtProvider::GetGallerySize(
-                        wxDC& WXUNUSED(dc),
-                        const wxRibbonGallery* WXUNUSED(wnd),
-                        wxSize client_size)
-{
-    client_size.IncBy( 2, 1); // Left / top padding
-    if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-        client_size.IncBy(1, 16); // Right / bottom padding
-    else
-        client_size.IncBy(16, 1); // Right / bottom padding
-    return client_size;
-}
-
-wxSize wxRibbonMSWArtProvider::GetGalleryClientSize(
-                        wxDC& WXUNUSED(dc),
-                        const wxRibbonGallery* WXUNUSED(wnd),
-                        wxSize size,
-                        wxPoint* client_offset,
-                        wxRect* scroll_up_button,
-                        wxRect* scroll_down_button,
-                        wxRect* extension_button)
-{
-    wxRect scroll_up;
-    wxRect scroll_down;
-    wxRect extension;
-    if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-    {
-        // Flow is vertical - put buttons on bottom
-        scroll_up.y = size.GetHeight() - 15;
-        scroll_up.height = 15;
-        scroll_up.x = 0;
-        scroll_up.width = (size.GetWidth() + 2) / 3;
-        scroll_down.y = scroll_up.y;
-        scroll_down.height = scroll_up.height;
-        scroll_down.x = scroll_up.x + scroll_up.width;
-        scroll_down.width = scroll_up.width;
-        extension.y = scroll_down.y;
-        extension.height = scroll_down.height;
-        extension.x = scroll_down.x + scroll_down.width;
-        extension.width = size.GetWidth() - scroll_up.width - scroll_down.width;
-        size.DecBy(1, 16);
-        size.DecBy( 2, 1);
-    }
-    else
-    {
-        // Flow is horizontal - put buttons on right
-        scroll_up.x = size.GetWidth() - 15;
-        scroll_up.width = 15;
-        scroll_up.y = 0;
-        scroll_up.height = (size.GetHeight() + 2) / 3;
-        scroll_down.x = scroll_up.x;
-        scroll_down.width = scroll_up.width;
-        scroll_down.y = scroll_up.y + scroll_up.height;
-        scroll_down.height = scroll_up.height;
-        extension.x = scroll_down.x;
-        extension.width = scroll_down.width;
-        extension.y = scroll_down.y + scroll_down.height;
-        extension.height = size.GetHeight() - scroll_up.height - scroll_down.height;
-        size.DecBy(16, 1);
-        size.DecBy( 2, 1);
-    }
-
-    if(client_offset != NULL)
-        *client_offset = wxPoint(2, 1);
-    if(scroll_up_button != NULL)
-        *scroll_up_button = scroll_up;
-    if(scroll_down_button != NULL)
-        *scroll_down_button = scroll_down;
-    if(extension_button != NULL)
-        *extension_button = extension;
-
-    return size;
-}
-
-wxRect wxRibbonMSWArtProvider::GetPageBackgroundRedrawArea(
-                        wxDC& WXUNUSED(dc),
-                        const wxRibbonPage* WXUNUSED(wnd),
-                        wxSize page_old_size,
-                        wxSize page_new_size)
-{
-    wxRect new_rect, old_rect;
-
-    if(page_new_size.GetWidth() != page_old_size.GetWidth())
-    {
-        if(page_new_size.GetHeight() != page_old_size.GetHeight())
-        {
-            // Width and height both changed - redraw everything
-            return wxRect(page_new_size);
-        }
-        else
-        {
-            // Only width changed - redraw right hand side
-            const int right_edge_width = 4;
-
-            new_rect = wxRect(page_new_size.GetWidth() - right_edge_width, 0, right_edge_width, page_new_size.GetHeight());
-            old_rect = wxRect(page_old_size.GetWidth() - right_edge_width, 0, right_edge_width, page_old_size.GetHeight());
-        }
-    }
-    else
-    {
-        if(page_new_size.GetHeight() == page_old_size.GetHeight())
-        {
-            // Nothing changed (should never happen) - redraw nothing
-            return wxRect(0, 0, 0, 0);
-        }
-        else
-        {
-            // Height changed - need to redraw everything (as the background
-            // gradient is done vertically).
-            return page_new_size;
-        }
-    }
-
-    new_rect.Union(old_rect);
-    new_rect.Intersect(wxRect(page_new_size));
-    return new_rect;
-}
-
-bool wxRibbonMSWArtProvider::GetButtonBarButtonSize(
-                        wxDC& dc,
-                        wxWindow* wnd,
-                        wxRibbonButtonKind kind,
-                        wxRibbonButtonBarButtonState size,
-                        const wxString& label,
-                        wxSize bitmap_size_large,
-                        wxSize bitmap_size_small,
-                        wxSize* button_size,
-                        wxRect* normal_region,
-                        wxRect* dropdown_region)
-{
-    const int drop_button_width = 8;
-
-    dc.SetFont(m_button_bar_label_font);
-    switch(size & wxRIBBON_BUTTONBAR_BUTTON_SIZE_MASK)
-    {
-    case wxRIBBON_BUTTONBAR_BUTTON_SMALL:
-        // Small bitmap, no label
-        *button_size = bitmap_size_small + wxSize(6, 4);
-        switch(kind)
-        {
-        case wxRIBBON_BUTTON_NORMAL:
-        case wxRIBBON_BUTTON_TOGGLE:
-            *normal_region = wxRect(*button_size);
-            *dropdown_region = wxRect(0, 0, 0, 0);
-            break;
-        case wxRIBBON_BUTTON_DROPDOWN:
-            *button_size += wxSize(drop_button_width, 0);
-            *dropdown_region = wxRect(*button_size);
-            *normal_region = wxRect(0, 0, 0, 0);
-            break;
-        case wxRIBBON_BUTTON_HYBRID:
-            *normal_region = wxRect(*button_size);
-            *dropdown_region = wxRect(button_size->GetWidth(), 0,
-                drop_button_width, button_size->GetHeight());
-            *button_size += wxSize(drop_button_width, 0);
-            break;
-        }
-        break;
-    case wxRIBBON_BUTTONBAR_BUTTON_MEDIUM:
-        // Small bitmap, with label to the right
-        {
-            GetButtonBarButtonSize(dc, wnd, kind, wxRIBBON_BUTTONBAR_BUTTON_SMALL,
-                label, bitmap_size_large, bitmap_size_small, button_size,
-                normal_region, dropdown_region);
-            int text_size = dc.GetTextExtent(label).GetWidth();
-            button_size->SetWidth(button_size->GetWidth() + text_size);
-            switch(kind)
-            {
-            case wxRIBBON_BUTTON_DROPDOWN:
-                dropdown_region->SetWidth(dropdown_region->GetWidth() + text_size);
-                break;
-            case wxRIBBON_BUTTON_HYBRID:
-                dropdown_region->SetX(dropdown_region->GetX() + text_size);
-                // no break
-            case wxRIBBON_BUTTON_NORMAL:
-            case wxRIBBON_BUTTON_TOGGLE:
-                normal_region->SetWidth(normal_region->GetWidth() + text_size);
-                break;
-            }
-            break;
-        }
-    case wxRIBBON_BUTTONBAR_BUTTON_LARGE:
-        // Large bitmap, with label below (possibly split over 2 lines)
-        {
-            wxSize icon_size(bitmap_size_large);
-            icon_size += wxSize(4, 4);
-            wxCoord label_height;
-            wxCoord best_width;
-            dc.GetTextExtent(label, &best_width, &label_height);
-            int last_line_extra_width = 0;
-            if(kind != wxRIBBON_BUTTON_NORMAL && kind != wxRIBBON_BUTTON_TOGGLE)
-            {
-                last_line_extra_width += 8;
-            }
-            size_t i;
-            for(i = 0; i < label.Len(); ++i)
-            {
-                if(wxRibbonCanLabelBreakAtPosition(label, i))
-                {
-                    int width = wxMax(
-                        dc.GetTextExtent(label.Left(i)).GetWidth(),
-                        dc.GetTextExtent(label.Mid(i + 1)).GetWidth() + last_line_extra_width);
-                    if(width < best_width)
-                    {
-                        best_width = width;
-                    }
-                }
-            }
-            label_height *= 2; // Assume two lines even when only one is used
-                               // (to give all buttons a consistent height)
-            icon_size.SetWidth(wxMax(icon_size.GetWidth(), best_width) + 6);
-            icon_size.SetHeight(icon_size.GetHeight() + label_height);
-            *button_size = icon_size;
-            switch(kind)
-            {
-            case wxRIBBON_BUTTON_DROPDOWN:
-                *dropdown_region = wxRect(icon_size);
-                break;
-            case wxRIBBON_BUTTON_HYBRID:
-                *normal_region = wxRect(icon_size);
-                normal_region->height -= 2 + label_height;
-                dropdown_region->x = 0;
-                dropdown_region->y = normal_region->height;
-                dropdown_region->width = icon_size.GetWidth();
-                dropdown_region->height = icon_size.GetHeight() - normal_region->height;
-                break;
-            case wxRIBBON_BUTTON_NORMAL:
-            case wxRIBBON_BUTTON_TOGGLE:
-                *normal_region = wxRect(icon_size);
-                break;
-            }
-            break;
-        }
-    };
-    return true;
-}
-
-wxSize wxRibbonMSWArtProvider::GetMinimisedPanelMinimumSize(
-                        wxDC& dc,
-                        const wxRibbonPanel* wnd,
-                        wxSize* desired_bitmap_size,
-                        wxDirection* expanded_panel_direction)
-{
-    if(desired_bitmap_size != NULL)
-    {
-        *desired_bitmap_size = wxSize(16, 16);
-    }
-    if(expanded_panel_direction != NULL)
-    {
-        if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-            *expanded_panel_direction = wxEAST;
-        else
-            *expanded_panel_direction = wxSOUTH;
-    }
-    wxSize base_size(42, 42);
-
-    dc.SetFont(m_panel_label_font);
-    wxSize label_size(dc.GetTextExtent(wnd->GetLabel()));
-    label_size.IncBy(2, 2); // Allow for differences between this DC and a paint DC
-    label_size.IncBy(6, 0); // Padding
-    label_size.y *= 2; // Second line for dropdown button
-
-    if(m_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-    {
-        // Label alongside icon
-        return wxSize(base_size.x + label_size.x,
-            wxMax(base_size.y, label_size.y));
-    }
-    else
-    {
-        // Label beneath icon
-        return wxSize(wxMax(base_size.x, label_size.x),
-            base_size.y + label_size.y);
-    }
-}
-
-wxSize wxRibbonMSWArtProvider::GetToolSize(
-                        wxDC& WXUNUSED(dc),
-                        wxWindow* WXUNUSED(wnd),
-                        wxSize bitmap_size,
-                        wxRibbonButtonKind kind,
-                        bool WXUNUSED(is_first),
-                        bool is_last,
-                        wxRect* dropdown_region)
-{
-    wxSize size(bitmap_size);
-    size.IncBy(7, 6);
-    if(is_last)
-        size.IncBy(1, 0);
-    if(kind & wxRIBBON_BUTTON_DROPDOWN)
-    {
-        size.IncBy(8, 0);
-        if(dropdown_region)
-        {
-            if(kind == wxRIBBON_BUTTON_DROPDOWN)
-                *dropdown_region = size;
-            else
-                *dropdown_region = wxRect(size.GetWidth() - 8, 0, 8, size.GetHeight());
-        }
-    }
-    else
-    {
-        if(dropdown_region)
-            *dropdown_region = wxRect(0, 0, 0, 0);
-    }
-    return size;
-}
-
-wxRect
-wxRibbonMSWArtProvider::GetBarToggleButtonArea(const wxRect& rect)
-{
-    wxRect rectOut = wxRect(rect.GetWidth()-m_toggle_button_offset, 2, 20, 20);
-    if ( (m_toggle_button_offset==22) && (m_help_button_offset==22) )
-        m_help_button_offset += 22;
-    return rectOut;
-}
-
-wxRect
-wxRibbonMSWArtProvider::GetRibbonHelpButtonArea(const wxRect& rect)
-{
-    wxRect rectOut = wxRect(rect.GetWidth()-m_help_button_offset, 2, 20, 20);
-    if ( (m_toggle_button_offset==22) && (m_help_button_offset==22) )
-        m_toggle_button_offset += 22;
-    return rectOut;
-}
-
-#endif // wxUSE_RIBBON
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/bar.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/bar.cpp
deleted file mode 100644
index 1bad16a18b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/bar.cpp
+++ /dev/null
@@ -1,1293 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/ribbon/bar.cpp
-// Purpose:     Top-level component of the ribbon-bar-style interface
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-05-23
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_RIBBON
-
-#include "wx/ribbon/bar.h"
-#include "wx/ribbon/art.h"
-#include "wx/dcbuffer.h"
-#include "wx/app.h"
-#include "wx/vector.h"
-
-#ifndef WX_PRECOMP
-#endif
-
-#ifdef __WXMSW__
-#include "wx/msw/private.h"
-#endif
-
-#include "wx/arrimpl.cpp"
-
-WX_DEFINE_USER_EXPORTED_OBJARRAY(wxRibbonPageTabInfoArray)
-
-wxDEFINE_EVENT(wxEVT_RIBBONBAR_PAGE_CHANGED, wxRibbonBarEvent);
-wxDEFINE_EVENT(wxEVT_RIBBONBAR_PAGE_CHANGING, wxRibbonBarEvent);
-wxDEFINE_EVENT(wxEVT_RIBBONBAR_TAB_MIDDLE_DOWN, wxRibbonBarEvent);
-wxDEFINE_EVENT(wxEVT_RIBBONBAR_TAB_MIDDLE_UP, wxRibbonBarEvent);
-wxDEFINE_EVENT(wxEVT_RIBBONBAR_TAB_RIGHT_DOWN, wxRibbonBarEvent);
-wxDEFINE_EVENT(wxEVT_RIBBONBAR_TAB_RIGHT_UP, wxRibbonBarEvent);
-wxDEFINE_EVENT(wxEVT_RIBBONBAR_TAB_LEFT_DCLICK, wxRibbonBarEvent);
-wxDEFINE_EVENT(wxEVT_RIBBONBAR_TOGGLED, wxRibbonBarEvent);
-wxDEFINE_EVENT(wxEVT_RIBBONBAR_HELP_CLICK, wxRibbonBarEvent);
-
-IMPLEMENT_CLASS(wxRibbonBar, wxRibbonControl)
-IMPLEMENT_DYNAMIC_CLASS(wxRibbonBarEvent, wxNotifyEvent)
-
-BEGIN_EVENT_TABLE(wxRibbonBar, wxRibbonControl)
-  EVT_ERASE_BACKGROUND(wxRibbonBar::OnEraseBackground)
-  EVT_LEAVE_WINDOW(wxRibbonBar::OnMouseLeave)
-  EVT_LEFT_DOWN(wxRibbonBar::OnMouseLeftDown)
-  EVT_LEFT_UP(wxRibbonBar::OnMouseLeftUp)
-  EVT_MIDDLE_DOWN(wxRibbonBar::OnMouseMiddleDown)
-  EVT_MIDDLE_UP(wxRibbonBar::OnMouseMiddleUp)
-  EVT_MOTION(wxRibbonBar::OnMouseMove)
-  EVT_PAINT(wxRibbonBar::OnPaint)
-  EVT_RIGHT_DOWN(wxRibbonBar::OnMouseRightDown)
-  EVT_RIGHT_UP(wxRibbonBar::OnMouseRightUp)
-  EVT_LEFT_DCLICK(wxRibbonBar::OnMouseDoubleClick)
-  EVT_SIZE(wxRibbonBar::OnSize)
-  EVT_KILL_FOCUS(wxRibbonBar::OnKillFocus)
-END_EVENT_TABLE()
-
-void wxRibbonBar::AddPage(wxRibbonPage *page)
-{
-    wxRibbonPageTabInfo info;
-
-    info.page = page;
-    info.active = false;
-    info.hovered = false;
-    info.highlight = false;
-    info.shown = true;
-    // info.rect not set (intentional)
-
-    wxClientDC dcTemp(this);
-    wxString label = wxEmptyString;
-    if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS)
-        label = page->GetLabel();
-    wxBitmap icon = wxNullBitmap;
-    if(m_flags & wxRIBBON_BAR_SHOW_PAGE_ICONS)
-        icon = page->GetIcon();
-    m_art->GetBarTabWidth(dcTemp, this, label, icon,
-                          &info.ideal_width,
-                          &info.small_begin_need_separator_width,
-                          &info.small_must_have_separator_width,
-                          &info.minimum_width);
-
-    if(m_pages.IsEmpty())
-    {
-        m_tabs_total_width_ideal = info.ideal_width;
-        m_tabs_total_width_minimum = info.minimum_width;
-    }
-    else
-    {
-        int sep = m_art->GetMetric(wxRIBBON_ART_TAB_SEPARATION_SIZE);
-        m_tabs_total_width_ideal += sep + info.ideal_width;
-        m_tabs_total_width_minimum += sep + info.minimum_width;
-    }
-    m_pages.Add(info);
-
-    page->Hide(); // Most likely case is that this new page is not the active tab
-    page->SetArtProvider(m_art);
-
-    if(m_pages.GetCount() == 1)
-    {
-        SetActivePage((size_t)0);
-    }
-}
-
-bool wxRibbonBar::DismissExpandedPanel()
-{
-    if(m_current_page == -1)
-        return false;
-    return m_pages.Item(m_current_page).page->DismissExpandedPanel();
-}
-
-void wxRibbonBar::ShowPanels(bool show)
-{
-    m_arePanelsShown = show;
-    SetMinSize(wxSize(GetSize().GetWidth(), DoGetBestSize().GetHeight()));
-    Realise();
-    GetParent()->Layout();
-}
-
-void wxRibbonBar::SetWindowStyleFlag(long style)
-{
-    m_flags = style;
-    if(m_art)
-        m_art->SetFlags(style);
-}
-
-long wxRibbonBar::GetWindowStyleFlag() const
-{
-    return m_flags;
-}
-
-bool wxRibbonBar::Realize()
-{
-    bool status = true;
-
-    wxClientDC dcTemp(this);
-    int sep = m_art->GetMetric(wxRIBBON_ART_TAB_SEPARATION_SIZE);
-    size_t numtabs = m_pages.GetCount();
-    size_t i;
-    for(i = 0; i < numtabs; ++i)
-    {
-        wxRibbonPageTabInfo& info = m_pages.Item(i);
-        if (!info.shown)
-            continue;
-        RepositionPage(info.page);
-        if(!info.page->Realize())
-        {
-            status = false;
-        }
-        wxString label = wxEmptyString;
-        if(m_flags & wxRIBBON_BAR_SHOW_PAGE_LABELS)
-            label = info.page->GetLabel();
-        wxBitmap icon = wxNullBitmap;
-        if(m_flags & wxRIBBON_BAR_SHOW_PAGE_ICONS)
-            icon = info.page->GetIcon();
-        m_art->GetBarTabWidth(dcTemp, this, label, icon,
-                              &info.ideal_width,
-                              &info.small_begin_need_separator_width,
-                              &info.small_must_have_separator_width,
-                              &info.minimum_width);
-
-        if(i == 0)
-        {
-            m_tabs_total_width_ideal = info.ideal_width;
-            m_tabs_total_width_minimum = info.minimum_width;
-        }
-        else
-        {
-            m_tabs_total_width_ideal += sep + info.ideal_width;
-            m_tabs_total_width_minimum += sep + info.minimum_width;
-        }
-    }
-    m_tab_height = m_art->GetTabCtrlHeight(dcTemp, this, m_pages);
-
-    RecalculateMinSize();
-    RecalculateTabSizes();
-    Refresh();
-
-    return status;
-}
-
-void wxRibbonBar::OnMouseMove(wxMouseEvent& evt)
-{
-    int x = evt.GetX();
-    int y = evt.GetY();
-    int hovered_page = -1;
-    bool refresh_tabs = false;
-    if(y < m_tab_height)
-    {
-        // It is quite likely that the mouse moved a small amount and is still over the same tab
-        if(m_current_hovered_page != -1 && m_pages.Item((size_t)m_current_hovered_page).rect.Contains(x, y))
-        {
-            hovered_page = m_current_hovered_page;
-            // But be careful, if tabs can be scrolled, then parts of the tab rect may not be valid
-            if(m_tab_scroll_buttons_shown)
-            {
-                if(x >= m_tab_scroll_right_button_rect.GetX() || x < m_tab_scroll_left_button_rect.GetRight())
-                {
-                    hovered_page = -1;
-                }
-            }
-        }
-        else
-        {
-            HitTestTabs(evt.GetPosition(), &hovered_page);
-        }
-    }
-    if(hovered_page != m_current_hovered_page)
-    {
-        if(m_current_hovered_page != -1)
-        {
-            m_pages.Item((int)m_current_hovered_page).hovered = false;
-        }
-        m_current_hovered_page = hovered_page;
-        if(m_current_hovered_page != -1)
-        {
-            m_pages.Item((int)m_current_hovered_page).hovered = true;
-        }
-        refresh_tabs = true;
-    }
-    if(m_tab_scroll_buttons_shown)
-    {
-#define SET_FLAG(variable, flag) \
-    { if(((variable) & (flag)) != (flag)) { variable |= (flag); refresh_tabs = true; }}
-#define UNSET_FLAG(variable, flag) \
-    { if((variable) & (flag)) { variable &= ~(flag); refresh_tabs = true; }}
-
-        if(m_tab_scroll_left_button_rect.Contains(x, y))
-            SET_FLAG(m_tab_scroll_left_button_state, wxRIBBON_SCROLL_BTN_HOVERED)
-        else
-            UNSET_FLAG(m_tab_scroll_left_button_state, wxRIBBON_SCROLL_BTN_HOVERED)
-
-        if(m_tab_scroll_right_button_rect.Contains(x, y))
-            SET_FLAG(m_tab_scroll_right_button_state, wxRIBBON_SCROLL_BTN_HOVERED)
-        else
-            UNSET_FLAG(m_tab_scroll_right_button_state, wxRIBBON_SCROLL_BTN_HOVERED)
-#undef SET_FLAG
-#undef UNSET_FLAG
-    }
-    if(refresh_tabs)
-    {
-        RefreshTabBar();
-    }
-    if ( m_flags & wxRIBBON_BAR_SHOW_TOGGLE_BUTTON )
-        HitTestRibbonButton(m_toggle_button_rect, evt.GetPosition(), m_toggle_button_hovered);
-    if ( m_flags & wxRIBBON_BAR_SHOW_HELP_BUTTON )
-        HitTestRibbonButton(m_help_button_rect, evt.GetPosition(), m_help_button_hovered);
-}
-
-void wxRibbonBar::OnMouseLeave(wxMouseEvent& WXUNUSED(evt))
-{
-    // The ribbon bar is (usually) at the top of a window, and at least on MSW, the mouse
-    // can leave the window quickly and leave a tab in the hovered state.
-    bool refresh_tabs = false;
-    if(m_current_hovered_page != -1)
-    {
-        m_pages.Item((int)m_current_hovered_page).hovered = false;
-        m_current_hovered_page = -1;
-        refresh_tabs = true;
-    }
-    if(m_tab_scroll_left_button_state & wxRIBBON_SCROLL_BTN_HOVERED)
-    {
-        m_tab_scroll_left_button_state &= ~wxRIBBON_SCROLL_BTN_HOVERED;
-        refresh_tabs = true;
-    }
-    if(m_tab_scroll_right_button_state & wxRIBBON_SCROLL_BTN_HOVERED)
-    {
-        m_tab_scroll_right_button_state &= ~wxRIBBON_SCROLL_BTN_HOVERED;
-        refresh_tabs = true;
-    }
-    if(refresh_tabs)
-    {
-        RefreshTabBar();
-    }
-    if(m_toggle_button_hovered)
-    {
-        m_bar_hovered = false;
-        m_toggle_button_hovered = false;
-        Refresh(false);
-    }
-    if ( m_help_button_hovered )
-    {
-        m_help_button_hovered = false;
-        m_bar_hovered = false;
-        Refresh(false);
-    }
-}
-
-wxRibbonPage* wxRibbonBar::GetPage(int n)
-{
-    if(n < 0 || (size_t)n >= m_pages.GetCount())
-        return 0;
-    return m_pages.Item(n).page;
-}
-
-size_t wxRibbonBar::GetPageCount() const
-{
-    return m_pages.GetCount();
-}
-
-bool wxRibbonBar::IsPageShown(size_t page) const
-{
-    if (page >= m_pages.GetCount())
-        return false;
-    return m_pages.Item(page).shown;
-}
-
-void wxRibbonBar::ShowPage(size_t page, bool show)
-{
-    if(page >= m_pages.GetCount())
-        return;
-    m_pages.Item(page).shown = show;
-}
-
-bool wxRibbonBar::IsPageHighlighted(size_t page) const
-{
-    if (page >= m_pages.GetCount())
-        return false;
-    return m_pages.Item(page).highlight;
-}
-
-void wxRibbonBar::AddPageHighlight(size_t page, bool highlight)
-{
-    if(page >= m_pages.GetCount())
-        return;
-    m_pages.Item(page).highlight = highlight;
-}
-
-void wxRibbonBar::DeletePage(size_t n)
-{
-    if(n < m_pages.GetCount())
-    {
-        wxRibbonPage *page = m_pages.Item(n).page;
-
-        // Schedule page object for destruction and not destroying directly
-        // as this function can be called in an event handler and page functions
-        // can be called afeter removing.
-        // Like in wxRibbonButtonBar::OnMouseUp
-        if(!wxTheApp->IsScheduledForDestruction(page))
-        {
-            wxTheApp->ScheduleForDestruction(page);
-        }
-
-        m_pages.RemoveAt(n);
-
-        if(m_current_page == static_cast(n))
-        {
-            m_current_page = -1;
-
-            if(m_pages.GetCount() > 0)
-            {
-                if(n >= m_pages.GetCount())
-                {
-                    SetActivePage(m_pages.GetCount() - 1);
-                }
-                else
-                {
-                    SetActivePage(n - 1);
-                }
-            }
-        }
-        else if(m_current_page > static_cast(n))
-        {
-            m_current_page--;
-        }
-    }
-}
-
-void wxRibbonBar::ClearPages()
-{
-    size_t i;
-    for(i=0; iIsScheduledForDestruction(page))
-        {
-            wxTheApp->ScheduleForDestruction(page);
-        }
-    }
-    m_pages.Empty();
-    Realize();
-    m_current_page = -1;
-    Refresh();
-}
-
-bool wxRibbonBar::SetActivePage(size_t page)
-{
-    if(m_current_page == (int)page)
-    {
-        return true;
-    }
-
-    if(page >= m_pages.GetCount())
-    {
-        return false;
-    }
-
-    if(m_current_page != -1)
-    {
-        m_pages.Item((size_t)m_current_page).active = false;
-        m_pages.Item((size_t)m_current_page).page->Hide();
-    }
-    m_current_page = (int)page;
-    m_pages.Item(page).active = true;
-    m_pages.Item(page).shown = true;
-    {
-        wxRibbonPage* wnd = m_pages.Item(page).page;
-        RepositionPage(wnd);
-        wnd->Layout();
-        wnd->Show();
-    }
-    Refresh();
-
-    return true;
-}
-
-bool wxRibbonBar::SetActivePage(wxRibbonPage* page)
-{
-    size_t numpages = m_pages.GetCount();
-    size_t i;
-    for(i = 0; i < numpages; ++i)
-    {
-        if(m_pages.Item(i).page == page)
-        {
-            return SetActivePage(i);
-        }
-    }
-    return false;
-}
-
-int wxRibbonBar::GetPageNumber(wxRibbonPage* page) const
-{
-    size_t numpages = m_pages.GetCount();
-    for(size_t i = 0; i < numpages; ++i)
-    {
-        if(m_pages.Item(i).page == page)
-        {
-            return i;
-        }
-    }
-    return wxNOT_FOUND;
-}
-
-
-int wxRibbonBar::GetActivePage() const
-{
-    return m_current_page;
-}
-
-void wxRibbonBar::SetTabCtrlMargins(int left, int right)
-{
-    m_tab_margin_left = left;
-    m_tab_margin_right = right;
-
-    RecalculateTabSizes();
-}
-
-struct PageComparedBySmallWidthAsc
-{
-    wxEXPLICIT PageComparedBySmallWidthAsc(wxRibbonPageTabInfo* page)
-        : m_page(page)
-    {
-    }
-
-    bool operator<(const PageComparedBySmallWidthAsc& other) const
-    {
-        return m_page->small_must_have_separator_width
-                < other.m_page->small_must_have_separator_width;
-    }
-
-    wxRibbonPageTabInfo *m_page;
-};
-
-void wxRibbonBar::RecalculateTabSizes()
-{
-    size_t numtabs = m_pages.GetCount();
-
-    if(numtabs == 0)
-        return;
-
-    int width = GetSize().GetWidth() - m_tab_margin_left - m_tab_margin_right;
-    int tabsep = m_art->GetMetric(wxRIBBON_ART_TAB_SEPARATION_SIZE);
-    int x = m_tab_margin_left;
-    const int y = 0;
-
-    if(width >= m_tabs_total_width_ideal)
-    {
-        // Simple case: everything at ideal width
-        size_t i;
-        for(i = 0; i < numtabs; ++i)
-        {
-            wxRibbonPageTabInfo& info = m_pages.Item(i);
-            if (!info.shown)
-                continue;
-            info.rect.x = x;
-            info.rect.y = y;
-            info.rect.width = info.ideal_width;
-            info.rect.height = m_tab_height;
-            x += info.rect.width + tabsep;
-        }
-        m_tab_scroll_buttons_shown = false;
-        m_tab_scroll_left_button_rect.SetWidth(0);
-        m_tab_scroll_right_button_rect.SetWidth(0);
-    }
-    else if(width < m_tabs_total_width_minimum)
-    {
-        // Simple case: everything minimum with scrollbar
-        size_t i;
-        for(i = 0; i < numtabs; ++i)
-        {
-            wxRibbonPageTabInfo& info = m_pages.Item(i);
-            if (!info.shown)
-                continue;
-            info.rect.x = x;
-            info.rect.y = y;
-            info.rect.width = info.minimum_width;
-            info.rect.height = m_tab_height;
-            x += info.rect.width + tabsep;
-        }
-        if(!m_tab_scroll_buttons_shown)
-        {
-            m_tab_scroll_left_button_state = wxRIBBON_SCROLL_BTN_NORMAL;
-            m_tab_scroll_right_button_state = wxRIBBON_SCROLL_BTN_NORMAL;
-            m_tab_scroll_buttons_shown = true;
-        }
-        {
-            wxClientDC temp_dc(this);
-            int right_button_pos = GetClientSize().GetWidth() - m_tab_margin_right - m_tab_scroll_right_button_rect.GetWidth();
-            if ( right_button_pos < m_tab_margin_left )
-                right_button_pos = m_tab_margin_left;
-
-            m_tab_scroll_left_button_rect.SetWidth(m_art->GetScrollButtonMinimumSize(temp_dc, this, wxRIBBON_SCROLL_BTN_LEFT | wxRIBBON_SCROLL_BTN_NORMAL | wxRIBBON_SCROLL_BTN_FOR_TABS).GetWidth());
-            m_tab_scroll_left_button_rect.SetHeight(m_tab_height);
-            m_tab_scroll_left_button_rect.SetX(m_tab_margin_left);
-            m_tab_scroll_left_button_rect.SetY(0);
-            m_tab_scroll_right_button_rect.SetWidth(m_art->GetScrollButtonMinimumSize(temp_dc, this, wxRIBBON_SCROLL_BTN_RIGHT | wxRIBBON_SCROLL_BTN_NORMAL | wxRIBBON_SCROLL_BTN_FOR_TABS).GetWidth());
-            m_tab_scroll_right_button_rect.SetHeight(m_tab_height);
-            m_tab_scroll_right_button_rect.SetX(right_button_pos);
-            m_tab_scroll_right_button_rect.SetY(0);
-        }
-        if(m_tab_scroll_amount == 0)
-        {
-            m_tab_scroll_left_button_rect.SetWidth(0);
-        }
-        else if(m_tab_scroll_amount + width >= m_tabs_total_width_minimum)
-        {
-            m_tab_scroll_amount = m_tabs_total_width_minimum - width;
-            m_tab_scroll_right_button_rect.SetX(m_tab_scroll_right_button_rect.GetX() + m_tab_scroll_right_button_rect.GetWidth());
-            m_tab_scroll_right_button_rect.SetWidth(0);
-        }
-        for(i = 0; i < numtabs; ++i)
-        {
-            wxRibbonPageTabInfo& info = m_pages.Item(i);
-            if (!info.shown)
-                continue;
-            info.rect.x -= m_tab_scroll_amount;
-        }
-    }
-    else
-    {
-        m_tab_scroll_buttons_shown = false;
-        m_tab_scroll_left_button_rect.SetWidth(0);
-        m_tab_scroll_right_button_rect.SetWidth(0);
-        // Complex case: everything sized such that: minimum <= width < ideal
-        /*
-           Strategy:
-             1) Uniformly reduce all tab widths from ideal to small_must_have_separator_width
-             2) Reduce the largest tab by 1 pixel, repeating until all tabs are same width (or at minimum)
-             3) Uniformly reduce all tabs down to their minimum width
-        */
-        int smallest_tab_width = INT_MAX;
-        int total_small_width = tabsep * (numtabs - 1);
-        size_t i;
-        for(i = 0; i < numtabs; ++i)
-        {
-            wxRibbonPageTabInfo& info = m_pages.Item(i);
-            if (!info.shown)
-                continue;
-            if(info.small_must_have_separator_width < smallest_tab_width)
-            {
-                smallest_tab_width = info.small_must_have_separator_width;
-            }
-            total_small_width += info.small_must_have_separator_width;
-        }
-        if(width >= total_small_width)
-        {
-            // Do (1)
-            int total_delta = m_tabs_total_width_ideal - total_small_width;
-            total_small_width -= tabsep * (numtabs - 1);
-            width -= tabsep * (numtabs - 1);
-            for(i = 0; i < numtabs; ++i)
-            {
-                wxRibbonPageTabInfo& info = m_pages.Item(i);
-                if (!info.shown)
-                    continue;
-                int delta = info.ideal_width - info.small_must_have_separator_width;
-                info.rect.x = x;
-                info.rect.y = y;
-                info.rect.width = info.small_must_have_separator_width + delta * (width - total_small_width) / total_delta;
-                info.rect.height = m_tab_height;
-
-                x += info.rect.width + tabsep;
-                total_delta -= delta;
-                total_small_width -= info.small_must_have_separator_width;
-                width -= info.rect.width;
-            }
-        }
-        else
-        {
-            total_small_width = tabsep * (numtabs - 1);
-            for(i = 0; i < numtabs; ++i)
-            {
-                wxRibbonPageTabInfo& info = m_pages.Item(i);
-                if (!info.shown)
-                    continue;
-                if(info.minimum_width < smallest_tab_width)
-                {
-                    total_small_width += smallest_tab_width;
-                }
-                else
-                {
-                    total_small_width += info.minimum_width;
-                }
-            }
-            if(width >= total_small_width)
-            {
-                // Do (2)
-                wxVector sorted_pages;
-                sorted_pages.reserve(numtabs);
-                for ( i = 0; i < numtabs; ++i )
-                    sorted_pages.push_back(PageComparedBySmallWidthAsc(&m_pages.Item(i)));
-
-                wxVectorSort(sorted_pages);
-                width -= tabsep * (numtabs - 1);
-                for(i = 0; i < numtabs; ++i)
-                {
-                    wxRibbonPageTabInfo* info = sorted_pages[i].m_page;
-                    if (!info->shown)
-                        continue;
-                    if(info->small_must_have_separator_width * (int)(numtabs - i) <= width)
-                    {
-                        info->rect.width = info->small_must_have_separator_width;;
-                    }
-                    else
-                    {
-                        info->rect.width = width / (numtabs - i);
-                    }
-                    width -= info->rect.width;
-                }
-                for(i = 0; i < numtabs; ++i)
-                {
-                    wxRibbonPageTabInfo& info = m_pages.Item(i);
-                    if (!info.shown)
-                        continue;
-                    info.rect.x = x;
-                    info.rect.y = y;
-                    info.rect.height = m_tab_height;
-                    x += info.rect.width + tabsep;
-                }
-            }
-            else
-            {
-                // Do (3)
-                total_small_width = (smallest_tab_width + tabsep) * numtabs - tabsep;
-                int total_delta = total_small_width - m_tabs_total_width_minimum;
-                total_small_width = m_tabs_total_width_minimum - tabsep * (numtabs - 1);
-                width -= tabsep * (numtabs - 1);
-                for(i = 0; i < numtabs; ++i)
-                {
-                    wxRibbonPageTabInfo& info = m_pages.Item(i);
-                    if (!info.shown)
-                        continue;
-                    int delta = smallest_tab_width - info.minimum_width;
-                    info.rect.x = x;
-                    info.rect.y = y;
-                    info.rect.width = info.minimum_width + delta * (width - total_small_width) / total_delta;
-                    info.rect.height = m_tab_height;
-
-                    x += info.rect.width + tabsep;
-                    total_delta -= delta;
-                    total_small_width -= info.minimum_width;
-                    width -= info.rect.width;
-                }
-            }
-        }
-    }
-}
-
-wxRibbonBar::wxRibbonBar()
-{
-    m_flags = 0;
-    m_tabs_total_width_ideal = 0;
-    m_tabs_total_width_minimum = 0;
-    m_tab_margin_left = 0;
-    m_tab_margin_right = 0;
-    m_tab_height = 0;
-    m_tab_scroll_amount = 0;
-    m_current_page = -1;
-    m_current_hovered_page = -1;
-    m_tab_scroll_left_button_state = wxRIBBON_SCROLL_BTN_NORMAL;
-    m_tab_scroll_right_button_state = wxRIBBON_SCROLL_BTN_NORMAL;
-    m_tab_scroll_buttons_shown = false;
-    m_arePanelsShown = true;
-    m_help_button_hovered = false;
-}
-
-wxRibbonBar::wxRibbonBar(wxWindow* parent,
-                         wxWindowID id,
-                         const wxPoint& pos,
-                         const wxSize& size,
-                         long style)
-    : wxRibbonControl(parent, id, pos, size, wxBORDER_NONE)
-{
-    CommonInit(style);
-}
-
-wxRibbonBar::~wxRibbonBar()
-{
-    SetArtProvider(NULL);
-}
-
-bool wxRibbonBar::Create(wxWindow* parent,
-                wxWindowID id,
-                const wxPoint& pos,
-                const wxSize& size,
-                long style)
-{
-    if(!wxRibbonControl::Create(parent, id, pos, size, wxBORDER_NONE))
-        return false;
-
-    CommonInit(style);
-
-    return true;
-}
-
-void wxRibbonBar::CommonInit(long style)
-{
-    SetName(wxT("wxRibbonBar"));
-
-    m_flags = style;
-    m_tabs_total_width_ideal = 0;
-    m_tabs_total_width_minimum = 0;
-    m_tab_margin_left = 50;
-    m_tab_margin_right = 20;
-    if ( m_flags & wxRIBBON_BAR_SHOW_TOGGLE_BUTTON )
-        m_tab_margin_right += 20;
-    if ( m_flags & wxRIBBON_BAR_SHOW_HELP_BUTTON )
-        m_tab_margin_right += 20;
-    m_tab_height = 20; // initial guess
-    m_tab_scroll_amount = 0;
-    m_current_page = -1;
-    m_current_hovered_page = -1;
-    m_tab_scroll_left_button_state = wxRIBBON_SCROLL_BTN_NORMAL;
-    m_tab_scroll_right_button_state = wxRIBBON_SCROLL_BTN_NORMAL;
-    m_tab_scroll_buttons_shown = false;
-    m_arePanelsShown = true;
-
-    if(m_art == NULL)
-    {
-        SetArtProvider(new wxRibbonDefaultArtProvider);
-    }
-    SetBackgroundStyle(wxBG_STYLE_CUSTOM);
-
-    m_toggle_button_hovered = false;
-    m_bar_hovered = false;
-
-    m_ribbon_state = wxRIBBON_BAR_PINNED;
-}
-
-void wxRibbonBar::SetArtProvider(wxRibbonArtProvider* art)
-{
-    wxRibbonArtProvider *old = m_art;
-    m_art = art;
-
-    if(art)
-    {
-        art->SetFlags(m_flags);
-    }
-    size_t numpages = m_pages.GetCount();
-    size_t i;
-    for(i = 0; i < numpages; ++i)
-    {
-        wxRibbonPage *page = m_pages.Item(i).page;
-        if(page->GetArtProvider() != art)
-        {
-            page->SetArtProvider(art);
-        }
-    }
-
-    delete old;
-}
-
-void wxRibbonBar::OnPaint(wxPaintEvent& WXUNUSED(evt))
-{
-    wxAutoBufferedPaintDC dc(this);
-
-    if(GetUpdateRegion().Contains(0, 0, GetClientSize().GetWidth(), m_tab_height) == wxOutRegion)
-    {
-        // Nothing to do in the tab area, and the page area is handled by the active page
-        return;
-    }
-
-    DoEraseBackground(dc);
-
-    if ( m_flags & wxRIBBON_BAR_SHOW_HELP_BUTTON  )
-        m_help_button_rect = m_art->GetRibbonHelpButtonArea(GetSize());
-    if ( m_flags & wxRIBBON_BAR_SHOW_TOGGLE_BUTTON  )
-        m_toggle_button_rect = m_art->GetBarToggleButtonArea(GetSize());
-
-    size_t numtabs = m_pages.GetCount();
-    double sep_visibility = 0.0;
-    bool draw_sep = false;
-    wxRect tabs_rect(m_tab_margin_left, 0, GetClientSize().GetWidth() - m_tab_margin_left - m_tab_margin_right, m_tab_height);
-    if(m_tab_scroll_buttons_shown)
-    {
-        tabs_rect.x += m_tab_scroll_left_button_rect.GetWidth();
-        tabs_rect.width -= m_tab_scroll_left_button_rect.GetWidth() + m_tab_scroll_right_button_rect.GetWidth();
-    }
-    size_t i;
-    for(i = 0; i < numtabs; ++i)
-    {
-        wxRibbonPageTabInfo& info = m_pages.Item(i);
-        if (!info.shown)
-            continue;
-
-        dc.DestroyClippingRegion();
-        if(m_tab_scroll_buttons_shown)
-        {
-            if(!tabs_rect.Intersects(info.rect))
-                continue;
-            dc.SetClippingRegion(tabs_rect);
-        }
-        dc.SetClippingRegion(info.rect);
-        m_art->DrawTab(dc, this, info);
-
-        if(info.rect.width < info.small_begin_need_separator_width)
-        {
-            draw_sep = true;
-            if(info.rect.width < info.small_must_have_separator_width)
-            {
-                sep_visibility += 1.0;
-            }
-            else
-            {
-                sep_visibility += (double)(info.small_begin_need_separator_width - info.rect.width) / (double)(info.small_begin_need_separator_width - info.small_must_have_separator_width);
-            }
-        }
-    }
-    if(draw_sep)
-    {
-        wxRect rect = m_pages.Item(0).rect;
-        rect.width = m_art->GetMetric(wxRIBBON_ART_TAB_SEPARATION_SIZE);
-        sep_visibility /= (double)numtabs;
-        for(i = 0; i < numtabs - 1; ++i)
-        {
-            wxRibbonPageTabInfo& info = m_pages.Item(i);
-            if (!info.shown)
-                continue;
-            rect.x = info.rect.x + info.rect.width;
-
-            if(m_tab_scroll_buttons_shown && !tabs_rect.Intersects(rect))
-            {
-                continue;
-            }
-
-            dc.DestroyClippingRegion();
-            dc.SetClippingRegion(rect);
-            m_art->DrawTabSeparator(dc, this, rect, sep_visibility);
-        }
-    }
-    if(m_tab_scroll_buttons_shown)
-    {
-        if(m_tab_scroll_left_button_rect.GetWidth() != 0)
-        {
-            dc.DestroyClippingRegion();
-            dc.SetClippingRegion(m_tab_scroll_left_button_rect);
-            m_art->DrawScrollButton(dc, this, m_tab_scroll_left_button_rect, wxRIBBON_SCROLL_BTN_LEFT | m_tab_scroll_left_button_state | wxRIBBON_SCROLL_BTN_FOR_TABS);
-        }
-        if(m_tab_scroll_right_button_rect.GetWidth() != 0)
-        {
-            dc.DestroyClippingRegion();
-            dc.SetClippingRegion(m_tab_scroll_right_button_rect);
-            m_art->DrawScrollButton(dc, this, m_tab_scroll_right_button_rect, wxRIBBON_SCROLL_BTN_RIGHT | m_tab_scroll_right_button_state | wxRIBBON_SCROLL_BTN_FOR_TABS);
-        }
-    }
-
-    if ( m_flags & wxRIBBON_BAR_SHOW_HELP_BUTTON  )
-        m_art->DrawHelpButton(dc, this, m_help_button_rect);
-    if ( m_flags & wxRIBBON_BAR_SHOW_TOGGLE_BUTTON  )
-        m_art->DrawToggleButton(dc, this, m_toggle_button_rect, m_ribbon_state);
-
-}
-
-void wxRibbonBar::OnEraseBackground(wxEraseEvent& WXUNUSED(evt))
-{
-    // Background painting done in main paint handler to reduce screen flicker
-}
-
-void wxRibbonBar::DoEraseBackground(wxDC& dc)
-{
-    wxRect tabs(GetSize());
-    tabs.height = m_tab_height;
-    m_art->DrawTabCtrlBackground(dc, this, tabs);
-}
-
-void wxRibbonBar::OnSize(wxSizeEvent& evt)
-{
-    RecalculateTabSizes();
-    if(m_current_page != -1)
-    {
-        RepositionPage(m_pages.Item(m_current_page).page);
-    }
-    RefreshTabBar();
-
-    evt.Skip();
-}
-
-void wxRibbonBar::RepositionPage(wxRibbonPage *page)
-{
-    int w, h;
-    GetSize(&w, &h);
-    page->SetSizeWithScrollButtonAdjustment(0, m_tab_height, w, h - m_tab_height);
-}
-
-wxRibbonPageTabInfo* wxRibbonBar::HitTestTabs(wxPoint position, int* index)
-{
-    wxRect tabs_rect(m_tab_margin_left, 0, GetClientSize().GetWidth() - m_tab_margin_left - m_tab_margin_right, m_tab_height);
-    if(m_tab_scroll_buttons_shown)
-    {
-        tabs_rect.SetX(tabs_rect.GetX() + m_tab_scroll_left_button_rect.GetWidth());
-        tabs_rect.SetWidth(tabs_rect.GetWidth() - m_tab_scroll_left_button_rect.GetWidth() - m_tab_scroll_right_button_rect.GetWidth());
-    }
-    if(tabs_rect.Contains(position))
-    {
-        size_t numtabs = m_pages.GetCount();
-        size_t i;
-        for(i = 0; i < numtabs; ++i)
-        {
-            wxRibbonPageTabInfo& info = m_pages.Item(i);
-            if (!info.shown)
-                continue;
-            if(info.rect.Contains(position))
-            {
-                if(index != NULL)
-                {
-                    *index = (int)i;
-                }
-                return &info;
-            }
-        }
-    }
-    if(index != NULL)
-    {
-        *index = -1;
-    }
-    return NULL;
-}
-
-void wxRibbonBar::OnMouseLeftDown(wxMouseEvent& evt)
-{
-    wxRibbonPageTabInfo *tab = HitTestTabs(evt.GetPosition());
-    SetFocus();
-    if ( tab )
-    {
-        if ( m_ribbon_state == wxRIBBON_BAR_MINIMIZED )
-        {
-            ShowPanels();
-            m_ribbon_state = wxRIBBON_BAR_EXPANDED;
-        }
-        else if ( (tab == &m_pages.Item(m_current_page)) && (m_ribbon_state == wxRIBBON_BAR_EXPANDED) )
-        {
-            HidePanels();
-            m_ribbon_state = wxRIBBON_BAR_MINIMIZED;
-        }
-    }
-    else
-    {
-        if ( m_ribbon_state == wxRIBBON_BAR_EXPANDED )
-        {
-            HidePanels();
-            m_ribbon_state = wxRIBBON_BAR_MINIMIZED;
-        }
-    }
-    if(tab && tab != &m_pages.Item(m_current_page))
-    {
-        wxRibbonBarEvent query(wxEVT_RIBBONBAR_PAGE_CHANGING, GetId(), tab->page);
-        query.SetEventObject(this);
-        ProcessWindowEvent(query);
-        if(query.IsAllowed())
-        {
-            SetActivePage(query.GetPage());
-
-            wxRibbonBarEvent notification(wxEVT_RIBBONBAR_PAGE_CHANGED, GetId(), m_pages.Item(m_current_page).page);
-            notification.SetEventObject(this);
-            ProcessWindowEvent(notification);
-        }
-    }
-    else if(tab == NULL)
-    {
-        if(m_tab_scroll_left_button_rect.Contains(evt.GetPosition()))
-        {
-            m_tab_scroll_left_button_state |= wxRIBBON_SCROLL_BTN_ACTIVE | wxRIBBON_SCROLL_BTN_HOVERED;
-            RefreshTabBar();
-        }
-        else if(m_tab_scroll_right_button_rect.Contains(evt.GetPosition()))
-        {
-            m_tab_scroll_right_button_state |= wxRIBBON_SCROLL_BTN_ACTIVE | wxRIBBON_SCROLL_BTN_HOVERED;
-            RefreshTabBar();
-        }
-    }
-
-    wxPoint position = evt.GetPosition();
-
-    if(position.x >= 0 && position.y >= 0)
-    {
-        wxSize size = GetSize();
-        if(position.x < size.GetWidth() && position.y < size.GetHeight())
-        {
-            if(m_toggle_button_rect.Contains(position))
-            {
-                bool pshown = ArePanelsShown();
-                ShowPanels(!pshown);
-                if ( pshown )
-                    m_ribbon_state = wxRIBBON_BAR_MINIMIZED;
-                else
-                    m_ribbon_state = wxRIBBON_BAR_PINNED;
-                wxRibbonBarEvent event(wxEVT_RIBBONBAR_TOGGLED, GetId());
-                event.SetEventObject(this);
-                ProcessWindowEvent(event);
-            }
-            if ( m_help_button_rect.Contains(position) )
-            {
-                wxRibbonBarEvent event(wxEVT_RIBBONBAR_HELP_CLICK, GetId());
-                event.SetEventObject(this);
-                ProcessWindowEvent(event);
-            }
-        }
-    }
-}
-
-void wxRibbonBar::OnMouseLeftUp(wxMouseEvent& WXUNUSED(evt))
-{
-    if(!m_tab_scroll_buttons_shown)
-    {
-        return;
-    }
-
-    int amount = 0;
-    if(m_tab_scroll_left_button_state & wxRIBBON_SCROLL_BTN_ACTIVE)
-    {
-        amount = -1;
-    }
-    else if(m_tab_scroll_right_button_state & wxRIBBON_SCROLL_BTN_ACTIVE)
-    {
-        amount = 1;
-    }
-    if(amount != 0)
-    {
-        m_tab_scroll_left_button_state &= ~wxRIBBON_SCROLL_BTN_ACTIVE;
-        m_tab_scroll_right_button_state &= ~wxRIBBON_SCROLL_BTN_ACTIVE;
-        ScrollTabBar(amount * 8);
-    }
-}
-
-void wxRibbonBar::ScrollTabBar(int amount)
-{
-    bool show_left = true;
-    bool show_right = true;
-    if(m_tab_scroll_amount + amount <= 0)
-    {
-        amount = -m_tab_scroll_amount;
-        show_left = false;
-    }
-    else if(m_tab_scroll_amount + amount + (GetClientSize().GetWidth() - m_tab_margin_left - m_tab_margin_right) >= m_tabs_total_width_minimum)
-    {
-        amount = m_tabs_total_width_minimum - m_tab_scroll_amount - (GetClientSize().GetWidth() - m_tab_margin_left - m_tab_margin_right);
-        show_right = false;
-    }
-    if(amount == 0)
-    {
-        return;
-    }
-    m_tab_scroll_amount += amount;
-    size_t numtabs = m_pages.GetCount();
-    size_t i;
-    for(i = 0; i < numtabs; ++i)
-    {
-        wxRibbonPageTabInfo& info = m_pages.Item(i);
-        if (!info.shown)
-            continue;
-        info.rect.SetX(info.rect.GetX() - amount);
-    }
-    if(show_right != (m_tab_scroll_right_button_rect.GetWidth() != 0) ||
-        show_left != (m_tab_scroll_left_button_rect.GetWidth() != 0))
-    {
-        wxClientDC temp_dc(this);
-        if(show_left)
-        {
-            m_tab_scroll_left_button_rect.SetWidth(m_art->GetScrollButtonMinimumSize(temp_dc, this, wxRIBBON_SCROLL_BTN_LEFT | wxRIBBON_SCROLL_BTN_NORMAL | wxRIBBON_SCROLL_BTN_FOR_TABS).GetWidth());
-        }
-        else
-        {
-            m_tab_scroll_left_button_rect.SetWidth(0);
-        }
-
-        if(show_right)
-        {
-            if(m_tab_scroll_right_button_rect.GetWidth() == 0)
-            {
-                m_tab_scroll_right_button_rect.SetWidth(m_art->GetScrollButtonMinimumSize(temp_dc, this, wxRIBBON_SCROLL_BTN_RIGHT | wxRIBBON_SCROLL_BTN_NORMAL | wxRIBBON_SCROLL_BTN_FOR_TABS).GetWidth());
-                m_tab_scroll_right_button_rect.SetX(m_tab_scroll_right_button_rect.GetX() - m_tab_scroll_right_button_rect.GetWidth());
-            }
-        }
-        else
-        {
-            if(m_tab_scroll_right_button_rect.GetWidth() != 0)
-            {
-                m_tab_scroll_right_button_rect.SetX(m_tab_scroll_right_button_rect.GetX() + m_tab_scroll_right_button_rect.GetWidth());
-                m_tab_scroll_right_button_rect.SetWidth(0);
-            }
-        }
-    }
-
-    RefreshTabBar();
-}
-
-void wxRibbonBar::RefreshTabBar()
-{
-    wxRect tab_rect(0, 0, GetClientSize().GetWidth(), m_tab_height);
-    Refresh(false, &tab_rect);
-}
-
-void wxRibbonBar::OnMouseMiddleDown(wxMouseEvent& evt)
-{
-    DoMouseButtonCommon(evt, wxEVT_RIBBONBAR_TAB_MIDDLE_DOWN);
-}
-
-void wxRibbonBar::OnMouseMiddleUp(wxMouseEvent& evt)
-{
-    DoMouseButtonCommon(evt, wxEVT_RIBBONBAR_TAB_MIDDLE_UP);
-}
-
-void wxRibbonBar::OnMouseRightDown(wxMouseEvent& evt)
-{
-    DoMouseButtonCommon(evt, wxEVT_RIBBONBAR_TAB_RIGHT_DOWN);
-}
-
-void wxRibbonBar::OnMouseRightUp(wxMouseEvent& evt)
-{
-    DoMouseButtonCommon(evt, wxEVT_RIBBONBAR_TAB_RIGHT_UP);
-}
-
-void wxRibbonBar::OnMouseDoubleClick(wxMouseEvent& evt)
-{
-    wxRibbonPageTabInfo *tab = HitTestTabs(evt.GetPosition());
-    SetFocus();
-    if ( tab && tab == &m_pages.Item(m_current_page) )
-    {
-        if ( m_ribbon_state == wxRIBBON_BAR_PINNED )
-        {
-            m_ribbon_state = wxRIBBON_BAR_MINIMIZED;
-            HidePanels();
-        }
-        else
-        {
-            m_ribbon_state = wxRIBBON_BAR_PINNED;
-            ShowPanels();
-        }
-    }
-}
-
-void wxRibbonBar::DoMouseButtonCommon(wxMouseEvent& evt, wxEventType tab_event_type)
-{
-    wxRibbonPageTabInfo *tab = HitTestTabs(evt.GetPosition());
-    if(tab)
-    {
-        wxRibbonBarEvent notification(tab_event_type, GetId(), tab->page);
-        notification.SetEventObject(this);
-        ProcessWindowEvent(notification);
-    }
-}
-
-void wxRibbonBar::RecalculateMinSize()
-{
-    wxSize min_size(wxDefaultCoord, wxDefaultCoord);
-    size_t numtabs = m_pages.GetCount();
-    if(numtabs != 0)
-    {
-        min_size = m_pages.Item(0).page->GetMinSize();
-
-        size_t i;
-        for(i = 1; i < numtabs; ++i)
-        {
-            wxRibbonPageTabInfo& info = m_pages.Item(i);
-            if (!info.shown)
-                continue;
-            wxSize page_min = info.page->GetMinSize();
-
-            min_size.x = wxMax(min_size.x, page_min.x);
-            min_size.y = wxMax(min_size.y, page_min.y);
-        }
-    }
-    if(min_size.y != wxDefaultCoord)
-    {
-        // TODO: Decide on best course of action when min height is unspecified
-        // - should we specify it to the tab minimum, or leave it unspecified?
-        min_size.IncBy(0, m_tab_height);
-    }
-
-    m_minWidth = min_size.GetWidth();
-    m_minHeight = m_arePanelsShown ? min_size.GetHeight() : m_tab_height;
-}
-
-wxSize wxRibbonBar::DoGetBestSize() const
-{
-    wxSize best(0, 0);
-    if(m_current_page != -1)
-    {
-        best = m_pages.Item(m_current_page).page->GetBestSize();
-    }
-    if(best.GetHeight() == wxDefaultCoord)
-    {
-        best.SetHeight(m_tab_height);
-    }
-    else
-    {
-        best.IncBy(0, m_tab_height);
-    }
-    if(!m_arePanelsShown)
-    {
-        best.SetHeight(m_tab_height);
-    }
-    return best;
-}
-
-void wxRibbonBar::HitTestRibbonButton(const wxRect& rect, const wxPoint& position, bool &hover_flag)
-{
-    bool hovered = false, toggle_button_hovered = false;
-    if(position.x >= 0 && position.y >= 0)
-    {
-        wxSize size = GetSize();
-        if(position.x < size.GetWidth() && position.y < size.GetHeight())
-        {
-            hovered = true;
-        }
-    }
-    if(hovered)
-    {
-        toggle_button_hovered = rect.Contains(position);
-
-        if ( hovered != m_bar_hovered || toggle_button_hovered != hover_flag )
-        {
-            m_bar_hovered = hovered;
-            hover_flag = toggle_button_hovered;
-            Refresh(false);
-        }
-    }
-}
-
-void wxRibbonBar::HideIfExpanded()
-{
-    switch ( m_ribbon_state )
-    {
-        case wxRIBBON_BAR_EXPANDED:
-            m_ribbon_state = wxRIBBON_BAR_MINIMIZED;
-            // Fall through
-
-        case wxRIBBON_BAR_MINIMIZED:
-            HidePanels();
-            break;
-
-        case wxRIBBON_BAR_PINNED:
-            ShowPanels();
-            break;
-    }
-}
-
-void wxRibbonBar::OnKillFocus(wxFocusEvent& WXUNUSED(evt))
-{
-    HideIfExpanded();
-}
-
-#endif // wxUSE_RIBBON
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/buttonbar.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/buttonbar.cpp
deleted file mode 100644
index 39e4c4f247..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/buttonbar.cpp
+++ /dev/null
@@ -1,1255 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/ribbon/buttonbar.cpp
-// Purpose:     Ribbon control similar to a tool bar
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-07-01
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_RIBBON
-
-#include "wx/ribbon/panel.h"
-#include "wx/ribbon/buttonbar.h"
-#include "wx/ribbon/art.h"
-#include "wx/dcbuffer.h"
-
-#ifndef WX_PRECOMP
-#endif
-
-#ifdef __WXMSW__
-#include "wx/msw/private.h"
-#endif
-
-wxDEFINE_EVENT(wxEVT_RIBBONBUTTONBAR_CLICKED, wxRibbonButtonBarEvent);
-wxDEFINE_EVENT(wxEVT_RIBBONBUTTONBAR_DROPDOWN_CLICKED, wxRibbonButtonBarEvent);
-
-IMPLEMENT_DYNAMIC_CLASS(wxRibbonButtonBarEvent, wxCommandEvent)
-IMPLEMENT_CLASS(wxRibbonButtonBar, wxRibbonControl)
-
-BEGIN_EVENT_TABLE(wxRibbonButtonBar, wxRibbonControl)
-    EVT_ERASE_BACKGROUND(wxRibbonButtonBar::OnEraseBackground)
-    EVT_ENTER_WINDOW(wxRibbonButtonBar::OnMouseEnter)
-    EVT_LEAVE_WINDOW(wxRibbonButtonBar::OnMouseLeave)
-    EVT_MOTION(wxRibbonButtonBar::OnMouseMove)
-    EVT_PAINT(wxRibbonButtonBar::OnPaint)
-    EVT_SIZE(wxRibbonButtonBar::OnSize)
-    EVT_LEFT_DOWN(wxRibbonButtonBar::OnMouseDown)
-    EVT_LEFT_UP(wxRibbonButtonBar::OnMouseUp)
-END_EVENT_TABLE()
-
-class wxRibbonButtonBarButtonSizeInfo
-{
-public:
-    bool is_supported;
-    wxSize size;
-    wxRect normal_region;
-    wxRect dropdown_region;
-};
-
-class wxRibbonButtonBarButtonInstance
-{
-public:
-    wxPoint position;
-    wxRibbonButtonBarButtonBase* base;
-    wxRibbonButtonBarButtonState size;
-};
-
-class wxRibbonButtonBarButtonBase
-{
-public:
-    wxRibbonButtonBarButtonInstance NewInstance()
-    {
-        wxRibbonButtonBarButtonInstance i;
-        i.base = this;
-        return i;
-    }
-
-    wxRibbonButtonBarButtonState GetLargestSize()
-    {
-        if(sizes[wxRIBBON_BUTTONBAR_BUTTON_LARGE].is_supported)
-            return wxRIBBON_BUTTONBAR_BUTTON_LARGE;
-        if(sizes[wxRIBBON_BUTTONBAR_BUTTON_MEDIUM].is_supported)
-            return wxRIBBON_BUTTONBAR_BUTTON_MEDIUM;
-        wxASSERT(sizes[wxRIBBON_BUTTONBAR_BUTTON_SMALL].is_supported);
-        return wxRIBBON_BUTTONBAR_BUTTON_SMALL;
-    }
-
-    bool GetSmallerSize(
-        wxRibbonButtonBarButtonState* size, int n = 1)
-    {
-        for(; n > 0; --n)
-        {
-            switch(*size)
-            {
-            case wxRIBBON_BUTTONBAR_BUTTON_LARGE:
-                if(sizes[wxRIBBON_BUTTONBAR_BUTTON_MEDIUM].is_supported)
-                {
-                    *size = wxRIBBON_BUTTONBAR_BUTTON_MEDIUM;
-                    break;
-                }
-            case wxRIBBON_BUTTONBAR_BUTTON_MEDIUM:
-                if(sizes[wxRIBBON_BUTTONBAR_BUTTON_SMALL].is_supported)
-                {
-                    *size = wxRIBBON_BUTTONBAR_BUTTON_SMALL;
-                    break;
-                }
-            case wxRIBBON_BUTTONBAR_BUTTON_SMALL:
-            default:
-                return false;
-            }
-        }
-        return true;
-    }
-
-    wxString label;
-    wxString help_string;
-    wxBitmap bitmap_large;
-    wxBitmap bitmap_large_disabled;
-    wxBitmap bitmap_small;
-    wxBitmap bitmap_small_disabled;
-    wxRibbonButtonBarButtonSizeInfo sizes[3];
-    wxClientDataContainer client_data;
-    int id;
-    wxRibbonButtonKind kind;
-    long state;
-};
-
-WX_DECLARE_OBJARRAY(wxRibbonButtonBarButtonInstance, wxArrayRibbonButtonBarButtonInstance);
-#include "wx/arrimpl.cpp"
-WX_DEFINE_OBJARRAY(wxArrayRibbonButtonBarButtonInstance)
-
-class wxRibbonButtonBarLayout
-{
-public:
-    wxSize overall_size;
-    wxArrayRibbonButtonBarButtonInstance buttons;
-
-    void CalculateOverallSize()
-    {
-        overall_size = wxSize(0, 0);
-        size_t btn_count = buttons.Count();
-        size_t btn_i;
-        for(btn_i = 0; btn_i < btn_count; ++btn_i)
-        {
-            wxRibbonButtonBarButtonInstance& instance = buttons.Item(btn_i);
-            wxSize size = instance.base->sizes[instance.size].size;
-            int right = instance.position.x + size.GetWidth();
-            int bottom = instance.position.y + size.GetHeight();
-            if(right > overall_size.GetWidth())
-            {
-                overall_size.SetWidth(right);
-            }
-            if(bottom > overall_size.GetHeight())
-            {
-                overall_size.SetHeight(bottom);
-            }
-        }
-    }
-
-    wxRibbonButtonBarButtonInstance* FindSimilarInstance(
-        wxRibbonButtonBarButtonInstance* inst)
-    {
-        if(inst == NULL)
-        {
-            return NULL;
-        }
-        size_t btn_count = buttons.Count();
-        size_t btn_i;
-        for(btn_i = 0; btn_i < btn_count; ++btn_i)
-        {
-            wxRibbonButtonBarButtonInstance& instance = buttons.Item(btn_i);
-            if(instance.base == inst->base)
-            {
-                return &instance;
-            }
-        }
-        return NULL;
-    }
-};
-
-wxRibbonButtonBar::wxRibbonButtonBar()
-{
-    m_layouts_valid = false;
-    CommonInit (0);
-}
-
-wxRibbonButtonBar::wxRibbonButtonBar(wxWindow* parent,
-                  wxWindowID id,
-                  const wxPoint& pos,
-                  const wxSize& size,
-                  long style)
-    : wxRibbonControl(parent, id, pos, size, wxBORDER_NONE)
-{
-    m_layouts_valid = false;
-
-    CommonInit(style);
-}
-
-wxRibbonButtonBar::~wxRibbonButtonBar()
-{
-    size_t count = m_buttons.GetCount();
-    size_t i;
-    for(i = 0; i < count; ++i)
-    {
-        wxRibbonButtonBarButtonBase* button = m_buttons.Item(i);
-        delete button;
-    }
-    m_buttons.Clear();
-
-    count = m_layouts.GetCount();
-    for(i = 0; i < count; ++i)
-    {
-        wxRibbonButtonBarLayout* layout = m_layouts.Item(i);
-        delete layout;
-    }
-    m_layouts.Clear();
-}
-
-bool wxRibbonButtonBar::Create(wxWindow* parent,
-                wxWindowID id,
-                const wxPoint& pos,
-                const wxSize& size,
-                long style)
-{
-    if(!wxRibbonControl::Create(parent, id, pos, size, wxBORDER_NONE))
-    {
-        return false;
-    }
-
-    CommonInit(style);
-    return true;
-}
-
-wxRibbonButtonBarButtonBase* wxRibbonButtonBar::AddButton(
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxString& help_string,
-                wxRibbonButtonKind kind)
-{
-    return AddButton(button_id, label, bitmap, wxNullBitmap, wxNullBitmap,
-        wxNullBitmap, kind, help_string);
-}
-
-wxRibbonButtonBarButtonBase* wxRibbonButtonBar::AddDropdownButton(
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxString& help_string)
-{
-    return AddButton(button_id, label, bitmap, help_string,
-        wxRIBBON_BUTTON_DROPDOWN);
-}
-
-wxRibbonButtonBarButtonBase* wxRibbonButtonBar::AddToggleButton(
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxString& help_string)
-{
-    return AddButton(button_id, label, bitmap, help_string,
-        wxRIBBON_BUTTON_TOGGLE);
-}
-
-wxRibbonButtonBarButtonBase* wxRibbonButtonBar::AddHybridButton(
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxString& help_string)
-{
-    return AddButton(button_id, label, bitmap, help_string,
-        wxRIBBON_BUTTON_HYBRID);
-}
-
-wxRibbonButtonBarButtonBase* wxRibbonButtonBar::AddButton(
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxBitmap& bitmap_small,
-                const wxBitmap& bitmap_disabled,
-                const wxBitmap& bitmap_small_disabled,
-                wxRibbonButtonKind kind,
-                const wxString& help_string)
-{
-    return InsertButton(GetButtonCount(), button_id, label, bitmap,
-        bitmap_small, bitmap_disabled,bitmap_small_disabled, kind, help_string);
-}
-
-wxRibbonButtonBarButtonBase* wxRibbonButtonBar::InsertButton(
-                size_t pos,
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxBitmap& bitmap_small,
-                const wxBitmap& bitmap_disabled,
-                const wxBitmap& bitmap_small_disabled,
-                wxRibbonButtonKind kind,
-                const wxString& help_string)
-{
-    wxASSERT(bitmap.IsOk() || bitmap_small.IsOk());
-    if(m_buttons.IsEmpty())
-    {
-        if(bitmap.IsOk())
-        {
-            m_bitmap_size_large = bitmap.GetSize();
-            if(!bitmap_small.IsOk())
-            {
-                m_bitmap_size_small = m_bitmap_size_large;
-                m_bitmap_size_small *= 0.5;
-            }
-        }
-        if(bitmap_small.IsOk())
-        {
-            m_bitmap_size_small = bitmap_small.GetSize();
-            if(!bitmap.IsOk())
-            {
-                m_bitmap_size_large = m_bitmap_size_small;
-                m_bitmap_size_large *= 2.0;
-            }
-        }
-    }
-
-    wxRibbonButtonBarButtonBase* base = new wxRibbonButtonBarButtonBase;
-    base->id = button_id;
-    base->label = label;
-    base->bitmap_large = bitmap;
-    if(!base->bitmap_large.IsOk())
-    {
-        base->bitmap_large = MakeResizedBitmap(base->bitmap_small,
-            m_bitmap_size_large);
-    }
-    else if(base->bitmap_large.GetSize() != m_bitmap_size_large)
-    {
-        base->bitmap_large = MakeResizedBitmap(base->bitmap_large,
-            m_bitmap_size_large);
-    }
-    base->bitmap_small = bitmap_small;
-    if(!base->bitmap_small.IsOk())
-    {
-        base->bitmap_small = MakeResizedBitmap(base->bitmap_large,
-            m_bitmap_size_small);
-    }
-    else if(base->bitmap_small.GetSize() != m_bitmap_size_small)
-    {
-        base->bitmap_small = MakeResizedBitmap(base->bitmap_small,
-            m_bitmap_size_small);
-    }
-    base->bitmap_large_disabled = bitmap_disabled;
-    if(!base->bitmap_large_disabled.IsOk())
-    {
-        base->bitmap_large_disabled = MakeDisabledBitmap(base->bitmap_large);
-    }
-    base->bitmap_small_disabled = bitmap_small_disabled;
-    if(!base->bitmap_small_disabled.IsOk())
-    {
-        base->bitmap_small_disabled = MakeDisabledBitmap(base->bitmap_small);
-    }
-    base->kind = kind;
-    base->help_string = help_string;
-    base->state = 0;
-
-    wxClientDC temp_dc(this);
-    FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_SMALL, temp_dc);
-    FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_MEDIUM, temp_dc);
-    FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_LARGE, temp_dc);
-
-    m_buttons.Insert(base, pos);
-    m_layouts_valid = false;
-    return base;
-}
-
-
-void
-wxRibbonButtonBar::SetItemClientObject(wxRibbonButtonBarButtonBase* item,
-                                       wxClientData* data)
-{
-    wxCHECK_RET( item, "Can't associate client object with an invalid item" );
-
-    item->client_data.SetClientObject(data);
-}
-
-wxClientData*
-wxRibbonButtonBar::GetItemClientObject(const wxRibbonButtonBarButtonBase* item) const
-{
-    wxCHECK_MSG( item, NULL, "Can't get client object for an invalid item" );
-
-    return item->client_data.GetClientObject();
-}
-
-void
-wxRibbonButtonBar::SetItemClientData(wxRibbonButtonBarButtonBase* item,
-                                     void* data)
-{
-    wxCHECK_RET( item, "Can't associate client data with an invalid item" );
-
-    item->client_data.SetClientData(data);
-}
-
-void*
-wxRibbonButtonBar::GetItemClientData(const wxRibbonButtonBarButtonBase* item) const
-{
-    wxCHECK_MSG( item, NULL, "Can't get client data for an invalid item" );
-
-    return item->client_data.GetClientData();
-}
-
-
-wxRibbonButtonBarButtonBase* wxRibbonButtonBar::InsertButton(
-                size_t pos,
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxString& help_string,
-                wxRibbonButtonKind kind)
-{
-    return InsertButton(pos, button_id, label, bitmap, wxNullBitmap,
-        wxNullBitmap, wxNullBitmap, kind, help_string);
-}
-
-wxRibbonButtonBarButtonBase* wxRibbonButtonBar::InsertDropdownButton(
-                size_t pos,
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxString& help_string)
-{
-    return InsertButton(pos, button_id, label, bitmap, help_string,
-        wxRIBBON_BUTTON_DROPDOWN);
-}
-
-wxRibbonButtonBarButtonBase* wxRibbonButtonBar::InsertToggleButton(
-                size_t pos,
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxString& help_string)
-{
-    return InsertButton(pos, button_id, label, bitmap, help_string,
-        wxRIBBON_BUTTON_TOGGLE);
-}
-
-wxRibbonButtonBarButtonBase* wxRibbonButtonBar::InsertHybridButton(
-                size_t pos,
-                int button_id,
-                const wxString& label,
-                const wxBitmap& bitmap,
-                const wxString& help_string)
-{
-    return InsertButton(pos, button_id, label, bitmap, help_string,
-        wxRIBBON_BUTTON_HYBRID);
-}
-
-void wxRibbonButtonBar::FetchButtonSizeInfo(wxRibbonButtonBarButtonBase* button,
-        wxRibbonButtonBarButtonState size, wxDC& dc)
-{
-    wxRibbonButtonBarButtonSizeInfo& info = button->sizes[size];
-    if(m_art)
-    {
-        info.is_supported = m_art->GetButtonBarButtonSize(dc, this,
-            button->kind, size, button->label, m_bitmap_size_large,
-            m_bitmap_size_small, &info.size, &info.normal_region,
-            &info.dropdown_region);
-    }
-    else
-        info.is_supported = false;
-}
-
-wxBitmap wxRibbonButtonBar::MakeResizedBitmap(const wxBitmap& original, wxSize size)
-{
-    wxImage img(original.ConvertToImage());
-    img.Rescale(size.GetWidth(), size.GetHeight(), wxIMAGE_QUALITY_HIGH);
-    return wxBitmap(img);
-}
-
-wxBitmap wxRibbonButtonBar::MakeDisabledBitmap(const wxBitmap& original)
-{
-    wxImage img(original.ConvertToImage());
-    return wxBitmap(img.ConvertToGreyscale());
-}
-
-size_t wxRibbonButtonBar::GetButtonCount() const
-{
-    return m_buttons.GetCount();
-}
-
-bool wxRibbonButtonBar::Realize()
-{
-    if(!m_layouts_valid)
-    {
-        MakeLayouts();
-        m_layouts_valid = true;
-    }
-    return true;
-}
-
-void wxRibbonButtonBar::ClearButtons()
-{
-    m_layouts_valid = false;
-    size_t count = m_buttons.GetCount();
-    size_t i;
-    for(i = 0; i < count; ++i)
-    {
-        wxRibbonButtonBarButtonBase* button = m_buttons.Item(i);
-        delete button;
-    }
-    m_buttons.Clear();
-    Realize();
-}
-
-bool wxRibbonButtonBar::DeleteButton(int button_id)
-{
-    size_t count = m_buttons.GetCount();
-    size_t i;
-    for(i = 0; i < count; ++i)
-    {
-        wxRibbonButtonBarButtonBase* button = m_buttons.Item(i);
-        if(button->id == button_id)
-        {
-            m_layouts_valid = false;
-            m_buttons.RemoveAt(i);
-            Realize();
-            Refresh();
-            return true;
-        }
-    }
-    return false;
-}
-
-void wxRibbonButtonBar::EnableButton(int button_id, bool enable)
-{
-    size_t count = m_buttons.GetCount();
-    size_t i;
-    for(i = 0; i < count; ++i)
-    {
-        wxRibbonButtonBarButtonBase* button = m_buttons.Item(i);
-        if(button->id == button_id)
-        {
-            if(enable)
-            {
-                if(button->state & wxRIBBON_BUTTONBAR_BUTTON_DISABLED)
-                {
-                    button->state &= ~wxRIBBON_BUTTONBAR_BUTTON_DISABLED;
-                    Refresh();
-                }
-            }
-            else
-            {
-                if((button->state & wxRIBBON_BUTTONBAR_BUTTON_DISABLED) == 0)
-                {
-                    button->state |= wxRIBBON_BUTTONBAR_BUTTON_DISABLED;
-                    Refresh();
-                }
-            }
-            return;
-        }
-    }
-}
-
-void wxRibbonButtonBar::ToggleButton(int button_id, bool checked)
-{
-    size_t count = m_buttons.GetCount();
-    size_t i;
-    for(i = 0; i < count; ++i)
-    {
-        wxRibbonButtonBarButtonBase* button = m_buttons.Item(i);
-        if(button->id == button_id)
-        {
-            if(checked)
-            {
-                if((button->state & wxRIBBON_BUTTONBAR_BUTTON_TOGGLED) == 0)
-                {
-                    button->state |= wxRIBBON_BUTTONBAR_BUTTON_TOGGLED;
-                    Refresh();
-                }
-            }
-            else
-            {
-                if(button->state & wxRIBBON_BUTTONBAR_BUTTON_TOGGLED)
-                {
-                    button->state &= ~wxRIBBON_BUTTONBAR_BUTTON_TOGGLED;
-                    Refresh();
-                }
-            }
-            return;
-        }
-    }
-}
-
-void wxRibbonButtonBar::SetArtProvider(wxRibbonArtProvider* art)
-{
-    if(art == m_art)
-    {
-        return;
-    }
-
-    wxRibbonControl::SetArtProvider(art);
-
-    wxClientDC temp_dc(this);
-    size_t btn_count = m_buttons.Count();
-    size_t btn_i;
-    for(btn_i = 0; btn_i < btn_count; ++btn_i)
-    {
-        wxRibbonButtonBarButtonBase* base = m_buttons.Item(btn_i);
-
-        FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_SMALL, temp_dc);
-        FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_MEDIUM, temp_dc);
-        FetchButtonSizeInfo(base, wxRIBBON_BUTTONBAR_BUTTON_LARGE, temp_dc);
-    }
-
-    m_layouts_valid = false;
-    Realize();
-}
-
-bool wxRibbonButtonBar::IsSizingContinuous() const
-{
-    return false;
-}
-
-wxSize wxRibbonButtonBar::DoGetNextSmallerSize(wxOrientation direction,
-                                             wxSize result) const
-{
-    size_t nlayouts = m_layouts.GetCount();
-    size_t i;
-    for(i = 0; i < nlayouts; ++i)
-    {
-        wxRibbonButtonBarLayout* layout = m_layouts.Item(i);
-        wxSize size = layout->overall_size;
-        switch(direction)
-        {
-        case wxHORIZONTAL:
-            if(size.x < result.x && size.y <= result.y)
-            {
-                result.x = size.x;
-                break;
-            }
-            else
-                continue;
-        case wxVERTICAL:
-            if(size.x <= result.x && size.y < result.y)
-            {
-                result.y = size.y;
-                break;
-            }
-            else
-                continue;
-        case wxBOTH:
-            if(size.x < result.x && size.y < result.y)
-            {
-                result = size;
-                break;
-            }
-            else
-                continue;
-        }
-        break;
-    }
-    return result;
-}
-
-wxSize wxRibbonButtonBar::DoGetNextLargerSize(wxOrientation direction,
-                                            wxSize result) const
-{
-    size_t nlayouts = m_layouts.GetCount();
-    size_t i = nlayouts;
-    while(i > 0)
-    {
-        --i;
-        wxRibbonButtonBarLayout* layout = m_layouts.Item(i);
-        wxSize size = layout->overall_size;
-        switch(direction)
-        {
-        case wxHORIZONTAL:
-            if(size.x > result.x && size.y <= result.y)
-            {
-                result.x = size.x;
-                break;
-            }
-            else
-                continue;
-        case wxVERTICAL:
-            if(size.x <= result.x && size.y > result.y)
-            {
-                result.y = size.y;
-                break;
-            }
-            else
-                continue;
-        case wxBOTH:
-            if(size.x > result.x && size.y > result.y)
-            {
-                result = size;
-                break;
-            }
-            else
-                continue;
-        }
-        break;
-    }
-    return result;
-}
-
-void wxRibbonButtonBar::UpdateWindowUI(long flags)
-{
-    wxWindowBase::UpdateWindowUI(flags);
-
-    // don't waste time updating state of tools in a hidden toolbar
-    if ( !IsShown() )
-        return;
-
-    size_t btn_count = m_buttons.size();
-    bool rerealize = false;
-    for ( size_t btn_i = 0; btn_i < btn_count; ++btn_i )
-    {
-        wxRibbonButtonBarButtonBase& btn = *m_buttons.Item(btn_i);
-        int id = btn.id;
-
-        wxUpdateUIEvent event(id);
-        event.SetEventObject(this);
-
-        if ( ProcessWindowEvent(event) )
-        {
-            if ( event.GetSetEnabled() )
-                EnableButton(id, event.GetEnabled());
-            if ( event.GetSetChecked() )
-                ToggleButton(id, event.GetChecked());
-            if ( event.GetSetText() )
-            {
-                btn.label = event.GetText();
-                rerealize = true;
-            }
-        }
-    }
-
-    if ( rerealize )
-        Realize();
-}
-
-void wxRibbonButtonBar::OnEraseBackground(wxEraseEvent& WXUNUSED(evt))
-{
-    // All painting done in main paint handler to minimise flicker
-}
-
-void wxRibbonButtonBar::OnPaint(wxPaintEvent& WXUNUSED(evt))
-{
-    wxAutoBufferedPaintDC dc(this);
-    m_art->DrawButtonBarBackground(dc, this, GetSize());
-
-    wxRibbonButtonBarLayout* layout = m_layouts.Item(m_current_layout);
-
-    size_t btn_count = layout->buttons.Count();
-    size_t btn_i;
-    for(btn_i = 0; btn_i < btn_count; ++btn_i)
-    {
-        wxRibbonButtonBarButtonInstance& button = layout->buttons.Item(btn_i);
-        wxRibbonButtonBarButtonBase* base = button.base;
-
-        wxBitmap* bitmap = &base->bitmap_large;
-        wxBitmap* bitmap_small = &base->bitmap_small;
-        if(base->state & wxRIBBON_BUTTONBAR_BUTTON_DISABLED)
-        {
-            bitmap = &base->bitmap_large_disabled;
-            bitmap_small = &base->bitmap_small_disabled;
-        }
-        wxRect rect(button.position + m_layout_offset, base->sizes[button.size].size);
-
-        m_art->DrawButtonBarButton(dc, this, rect, base->kind,
-            base->state | button.size, base->label, *bitmap, *bitmap_small);
-    }
-}
-
-void wxRibbonButtonBar::OnSize(wxSizeEvent& evt)
-{
-    wxSize new_size = evt.GetSize();
-    size_t layout_count = m_layouts.GetCount();
-    size_t layout_i;
-    m_current_layout = layout_count - 1;
-    for(layout_i = 0; layout_i < layout_count; ++layout_i)
-    {
-        wxSize layout_size = m_layouts.Item(layout_i)->overall_size;
-        if(layout_size.x <= new_size.x && layout_size.y <= new_size.y)
-        {
-            m_layout_offset.x = (new_size.x - layout_size.x) / 2;
-            m_layout_offset.y = (new_size.y - layout_size.y) / 2;
-            m_current_layout = layout_i;
-            break;
-        }
-    }
-    m_hovered_button = m_layouts.Item(m_current_layout)->FindSimilarInstance(m_hovered_button);
-    Refresh();
-}
-
-void wxRibbonButtonBar::CommonInit(long WXUNUSED(style))
-{
-    m_bitmap_size_large = wxSize(32, 32);
-    m_bitmap_size_small = wxSize(16, 16);
-
-    wxRibbonButtonBarLayout* placeholder_layout = new wxRibbonButtonBarLayout;
-    placeholder_layout->overall_size = wxSize(20, 20);
-    m_layouts.Add(placeholder_layout);
-    m_current_layout = 0;
-    m_layout_offset = wxPoint(0, 0);
-    m_hovered_button = NULL;
-    m_active_button = NULL;
-    m_lock_active_state = false;
-    m_show_tooltips_for_disabled = false;
-
-    SetBackgroundStyle(wxBG_STYLE_CUSTOM);
-}
-
-void wxRibbonButtonBar::SetShowToolTipsForDisabled(bool show)
-{
-    m_show_tooltips_for_disabled = show;
-}
-
-bool wxRibbonButtonBar::GetShowToolTipsForDisabled() const
-{
-    return m_show_tooltips_for_disabled;
-}
-
-wxSize wxRibbonButtonBar::GetMinSize() const
-{
-    return m_layouts.Last()->overall_size;
-}
-
-wxSize wxRibbonButtonBar::DoGetBestSize() const
-{
-    return m_layouts.Item(0)->overall_size;
-}
-
-void wxRibbonButtonBar::MakeLayouts()
-{
-    if(m_layouts_valid || m_art == NULL)
-    {
-        return;
-    }
-    {
-        // Clear existing layouts
-        if(m_hovered_button)
-        {
-            m_hovered_button->base->state &= ~wxRIBBON_BUTTONBAR_BUTTON_HOVER_MASK;
-            m_hovered_button = NULL;
-        }
-        if(m_active_button)
-        {
-            m_active_button->base->state &= ~wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK;
-            m_active_button = NULL;
-        }
-        size_t count = m_layouts.GetCount();
-        size_t i;
-        for(i = 0; i < count; ++i)
-        {
-            wxRibbonButtonBarLayout* layout = m_layouts.Item(i);
-            delete layout;
-        }
-        m_layouts.Clear();
-    }
-    size_t btn_count = m_buttons.Count();
-    size_t btn_i;
-    {
-        // Best layout : all buttons large, stacking horizontally
-        wxRibbonButtonBarLayout* layout = new wxRibbonButtonBarLayout;
-        wxPoint cursor(0, 0);
-        layout->overall_size.SetHeight(0);
-        for(btn_i = 0; btn_i < btn_count; ++btn_i)
-        {
-            wxRibbonButtonBarButtonBase* button = m_buttons.Item(btn_i);
-            wxRibbonButtonBarButtonInstance instance = button->NewInstance();
-            instance.position = cursor;
-            instance.size = button->GetLargestSize();
-            wxSize& size = button->sizes[instance.size].size;
-            cursor.x += size.GetWidth();
-            layout->overall_size.SetHeight(wxMax(layout->overall_size.GetHeight(),
-                size.GetHeight()));
-            layout->buttons.Add(instance);
-        }
-        layout->overall_size.SetWidth(cursor.x);
-        m_layouts.Add(layout);
-    }
-    if(btn_count >= 2)
-    {
-        // Collapse the rightmost buttons and stack them vertically
-        size_t iLast = btn_count - 1;
-        while(TryCollapseLayout(m_layouts.Last(), iLast, &iLast) && iLast > 0)
-        {
-            --iLast;
-        }
-    }
-}
-
-bool wxRibbonButtonBar::TryCollapseLayout(wxRibbonButtonBarLayout* original,
-                                          size_t first_btn, size_t* last_button)
-{
-    size_t btn_count = m_buttons.Count();
-    size_t btn_i;
-    int used_height = 0;
-    int used_width = 0;
-    int available_width = 0;
-    int available_height = 0;
-
-    for(btn_i = first_btn + 1; btn_i > 0; /* decrement is inside loop */)
-    {
-        --btn_i;
-        wxRibbonButtonBarButtonBase* button = m_buttons.Item(btn_i);
-        wxRibbonButtonBarButtonState large_size_class = button->GetLargestSize();
-        wxSize large_size = button->sizes[large_size_class].size;
-        int t_available_height = wxMax(available_height,
-            large_size.GetHeight());
-        int t_available_width = available_width + large_size.GetWidth();
-        wxRibbonButtonBarButtonState small_size_class = large_size_class;
-        if(!button->GetSmallerSize(&small_size_class))
-        {
-            return false;
-        }
-        wxSize small_size = button->sizes[small_size_class].size;
-        int t_used_height = used_height + small_size.GetHeight();
-        int t_used_width = wxMax(used_width, small_size.GetWidth());
-
-        if(t_used_height > t_available_height)
-        {
-            ++btn_i;
-            break;
-        }
-        else
-        {
-            used_height = t_used_height;
-            used_width = t_used_width;
-            available_width = t_available_width;
-            available_height = t_available_height;
-        }
-    }
-
-    if(btn_i >= first_btn || used_width >= available_width)
-    {
-        return false;
-    }
-    if(last_button != NULL)
-    {
-        *last_button = btn_i;
-    }
-
-    wxRibbonButtonBarLayout* layout = new wxRibbonButtonBarLayout;
-    WX_APPEND_ARRAY(layout->buttons, original->buttons);
-    wxPoint cursor(layout->buttons.Item(btn_i).position);
-    bool preserve_height = false;
-    if(btn_i == 0)
-    {
-        // If height isn't preserved (i.e. it is reduced), then the minimum
-        // size for the button bar will decrease, preventing the original
-        // layout from being used (in some cases).
-        // It may be a good idea to always preserve the height, but for now
-        // it is only done when the first button is involved in a collapse.
-        preserve_height = true;
-    }
-
-    for(; btn_i <= first_btn; ++btn_i)
-    {
-        wxRibbonButtonBarButtonInstance& instance = layout->buttons.Item(btn_i);
-        instance.base->GetSmallerSize(&instance.size);
-        instance.position = cursor;
-        cursor.y += instance.base->sizes[instance.size].size.GetHeight();
-    }
-
-    int x_adjust = available_width - used_width;
-
-    for(; btn_i < btn_count; ++btn_i)
-    {
-        wxRibbonButtonBarButtonInstance& instance = layout->buttons.Item(btn_i);
-        instance.position.x -= x_adjust;
-    }
-
-    layout->CalculateOverallSize();
-
-    // Sanity check
-    if(layout->overall_size.GetWidth() >= original->overall_size.GetWidth() ||
-        layout->overall_size.GetHeight() > original->overall_size.GetHeight())
-    {
-        delete layout;
-        wxFAIL_MSG("Layout collapse resulted in increased size");
-        return false;
-    }
-
-    if(preserve_height)
-    {
-        layout->overall_size.SetHeight(original->overall_size.GetHeight());
-    }
-
-    m_layouts.Add(layout);
-    return true;
-}
-
-void wxRibbonButtonBar::OnMouseMove(wxMouseEvent& evt)
-{
-    wxPoint cursor(evt.GetPosition());
-    wxRibbonButtonBarButtonInstance* new_hovered = NULL;
-    wxRibbonButtonBarButtonInstance* tooltipButton = NULL;
-    long new_hovered_state = 0;
-
-    wxRibbonButtonBarLayout* layout = m_layouts.Item(m_current_layout);
-    size_t btn_count = layout->buttons.Count();
-    size_t btn_i;
-    for(btn_i = 0; btn_i < btn_count; ++btn_i)
-    {
-        wxRibbonButtonBarButtonInstance& instance = layout->buttons.Item(btn_i);
-        wxRibbonButtonBarButtonSizeInfo& size = instance.base->sizes[instance.size];
-        wxRect btn_rect;
-        btn_rect.SetTopLeft(m_layout_offset + instance.position);
-        btn_rect.SetSize(size.size);
-        if(btn_rect.Contains(cursor))
-        {
-            if((instance.base->state & wxRIBBON_BUTTONBAR_BUTTON_DISABLED) == 0)
-            {
-                tooltipButton = &instance;
-                new_hovered = &instance;
-                new_hovered_state = instance.base->state;
-                new_hovered_state &= ~wxRIBBON_BUTTONBAR_BUTTON_HOVER_MASK;
-                wxPoint offset(cursor);
-                offset -= btn_rect.GetTopLeft();
-                if(size.normal_region.Contains(offset))
-                {
-                    new_hovered_state |= wxRIBBON_BUTTONBAR_BUTTON_NORMAL_HOVERED;
-                }
-                if(size.dropdown_region.Contains(offset))
-                {
-                    new_hovered_state |= wxRIBBON_BUTTONBAR_BUTTON_DROPDOWN_HOVERED;
-                }
-                break;
-            }
-            else if (m_show_tooltips_for_disabled)
-            {
-                tooltipButton = &instance;
-            }
-        }
-    }
-
-#if wxUSE_TOOLTIPS
-    if(tooltipButton == NULL && GetToolTip())
-    {
-        UnsetToolTip();
-    }
-    if(tooltipButton)
-    {
-        SetToolTip(tooltipButton->base->help_string);
-    }
-#endif
-
-    if(new_hovered != m_hovered_button || (m_hovered_button != NULL &&
-        new_hovered_state != m_hovered_button->base->state))
-    {
-        if(m_hovered_button != NULL)
-        {
-            m_hovered_button->base->state &= ~wxRIBBON_BUTTONBAR_BUTTON_HOVER_MASK;
-        }
-        m_hovered_button = new_hovered;
-        if(m_hovered_button != NULL)
-        {
-            m_hovered_button->base->state = new_hovered_state;
-        }
-        Refresh(false);
-    }
-
-    if(m_active_button && !m_lock_active_state)
-    {
-        long new_active_state = m_active_button->base->state;
-        new_active_state &= ~wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK;
-        wxRibbonButtonBarButtonSizeInfo& size =
-            m_active_button->base->sizes[m_active_button->size];
-        wxRect btn_rect;
-        btn_rect.SetTopLeft(m_layout_offset + m_active_button->position);
-        btn_rect.SetSize(size.size);
-        if(btn_rect.Contains(cursor))
-        {
-            wxPoint offset(cursor);
-            offset -= btn_rect.GetTopLeft();
-            if(size.normal_region.Contains(offset))
-            {
-                new_active_state |= wxRIBBON_BUTTONBAR_BUTTON_NORMAL_ACTIVE;
-            }
-            if(size.dropdown_region.Contains(offset))
-            {
-                new_active_state |= wxRIBBON_BUTTONBAR_BUTTON_DROPDOWN_ACTIVE;
-            }
-        }
-        if(new_active_state != m_active_button->base->state)
-        {
-            m_active_button->base->state = new_active_state;
-            Refresh(false);
-        }
-    }
-}
-
-void wxRibbonButtonBar::OnMouseDown(wxMouseEvent& evt)
-{
-    wxPoint cursor(evt.GetPosition());
-    m_active_button = NULL;
-
-    wxRibbonButtonBarLayout* layout = m_layouts.Item(m_current_layout);
-    size_t btn_count = layout->buttons.Count();
-    size_t btn_i;
-    for(btn_i = 0; btn_i < btn_count; ++btn_i)
-    {
-        wxRibbonButtonBarButtonInstance& instance = layout->buttons.Item(btn_i);
-        wxRibbonButtonBarButtonSizeInfo& size = instance.base->sizes[instance.size];
-        wxRect btn_rect;
-        btn_rect.SetTopLeft(m_layout_offset + instance.position);
-        btn_rect.SetSize(size.size);
-        if(btn_rect.Contains(cursor))
-        {
-            if((instance.base->state & wxRIBBON_BUTTONBAR_BUTTON_DISABLED) == 0)
-            {
-                m_active_button = &instance;
-                cursor -= btn_rect.GetTopLeft();
-                long state = 0;
-                if(size.normal_region.Contains(cursor))
-                    state = wxRIBBON_BUTTONBAR_BUTTON_NORMAL_ACTIVE;
-                else if(size.dropdown_region.Contains(cursor))
-                    state = wxRIBBON_BUTTONBAR_BUTTON_DROPDOWN_ACTIVE;
-                instance.base->state |= state;
-                Refresh(false);
-                break;
-            }
-        }
-    }
-}
-
-void wxRibbonButtonBar::OnMouseUp(wxMouseEvent& evt)
-{
-    wxPoint cursor(evt.GetPosition());
-
-    if(m_active_button)
-    {
-        wxRibbonButtonBarButtonSizeInfo& size =
-            m_active_button->base->sizes[m_active_button->size];
-        wxRect btn_rect;
-        btn_rect.SetTopLeft(m_layout_offset + m_active_button->position);
-        btn_rect.SetSize(size.size);
-        if(btn_rect.Contains(cursor))
-        {
-            int id = m_active_button->base->id;
-            cursor -= btn_rect.GetTopLeft();
-            wxEventType event_type;
-            do
-            {
-                if(size.normal_region.Contains(cursor))
-                    event_type = wxEVT_RIBBONBUTTONBAR_CLICKED;
-                else if(size.dropdown_region.Contains(cursor))
-                    event_type = wxEVT_RIBBONBUTTONBAR_DROPDOWN_CLICKED;
-                else
-                    break;
-                wxRibbonButtonBarEvent notification(event_type, id);
-                if(m_active_button->base->kind == wxRIBBON_BUTTON_TOGGLE)
-                {
-                    m_active_button->base->state ^=
-                        wxRIBBON_BUTTONBAR_BUTTON_TOGGLED;
-                    notification.SetInt(m_active_button->base->state &
-                        wxRIBBON_BUTTONBAR_BUTTON_TOGGLED);
-                }
-                notification.SetEventObject(this);
-                notification.SetBar(this);
-                notification.SetButton(m_active_button->base);
-                m_lock_active_state = true;
-                ProcessWindowEvent(notification);
-                m_lock_active_state = false;
-
-                wxStaticCast(m_parent, wxRibbonPanel)->HideIfExpanded();
-            } while(false);
-            if(m_active_button) // may have been NULLed by event handler
-            {
-                m_active_button->base->state &= ~wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK;
-                m_active_button = NULL;
-            }
-            Refresh(false);
-        }
-    }
-}
-
-void wxRibbonButtonBar::OnMouseEnter(wxMouseEvent& evt)
-{
-    if(m_active_button && !evt.LeftIsDown())
-    {
-        m_active_button = NULL;
-    }
-}
-
-void wxRibbonButtonBar::OnMouseLeave(wxMouseEvent& WXUNUSED(evt))
-{
-    bool repaint = false;
-    if(m_hovered_button != NULL)
-    {
-        m_hovered_button->base->state &= ~wxRIBBON_BUTTONBAR_BUTTON_HOVER_MASK;
-        m_hovered_button = NULL;
-        repaint = true;
-    }
-    if(m_active_button != NULL && !m_lock_active_state)
-    {
-        m_active_button->base->state &= ~wxRIBBON_BUTTONBAR_BUTTON_ACTIVE_MASK;
-        repaint = true;
-    }
-    if(repaint)
-        Refresh(false);
-}
-
-wxRibbonButtonBarButtonBase *wxRibbonButtonBar::GetActiveItem() const
-{
-    return m_active_button == NULL ? NULL : m_active_button->base;
-}
-
-
-wxRibbonButtonBarButtonBase *wxRibbonButtonBar::GetHoveredItem() const
-{
-    return m_hovered_button == NULL ? NULL : m_hovered_button->base;
-}
-
-
-wxRibbonButtonBarButtonBase *wxRibbonButtonBar::GetItem(size_t n) const
-{
-    wxCHECK_MSG(n < m_buttons.GetCount(), NULL, "wxRibbonButtonBar item's index is out of bound");
-    return m_buttons.Item(n);
-}
-
-wxRibbonButtonBarButtonBase *wxRibbonButtonBar::GetItemById(int button_id) const
-{
-    size_t count = m_buttons.GetCount();
-    for ( size_t i = 0; i < count; ++i )
-    {
-        wxRibbonButtonBarButtonBase* button = m_buttons.Item(i);
-        if ( button->id == button_id )
-            return button;
-    }
-
-    return NULL;
-
-}
-
-int wxRibbonButtonBar::GetItemId(wxRibbonButtonBarButtonBase *item) const
-{
-    wxCHECK_MSG(item != NULL, wxNOT_FOUND, "wxRibbonButtonBar item should not be NULL");
-    return item->id;
-}
-
-
-bool wxRibbonButtonBarEvent::PopupMenu(wxMenu* menu)
-{
-    wxPoint pos = wxDefaultPosition;
-    if(m_bar->m_active_button)
-    {
-        wxRibbonButtonBarButtonSizeInfo& size =
-            m_bar->m_active_button->base->sizes[m_bar->m_active_button->size];
-        wxRect btn_rect;
-        btn_rect.SetTopLeft(m_bar->m_layout_offset +
-            m_bar->m_active_button->position);
-        btn_rect.SetSize(size.size);
-        pos = btn_rect.GetBottomLeft();
-        pos.y++;
-    }
-    return m_bar->PopupMenu(menu, pos);
-}
-
-#endif // wxUSE_RIBBON
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/control.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/control.cpp
deleted file mode 100644
index ecd332103e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/control.cpp
+++ /dev/null
@@ -1,124 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/ribbon/control.cpp
-// Purpose:     Extension of wxControl with common ribbon methods
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-06-05
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_RIBBON
-
-#include "wx/ribbon/control.h"
-#include "wx/ribbon/bar.h"
-
-#ifndef WX_PRECOMP
-#endif
-
-#ifdef __WXMSW__
-#include "wx/msw/private.h"
-#endif
-
-IMPLEMENT_CLASS(wxRibbonControl, wxControl)
-
-bool wxRibbonControl::Create(wxWindow *parent, wxWindowID id,
-                    const wxPoint& pos,
-                    const wxSize& size, long style,
-                    const wxValidator& validator,
-                    const wxString& name)
-{
-    if ( !wxControl::Create(parent, id, pos, size, style, validator, name) )
-        return false;
-
-    wxRibbonControl *ribbon_parent = wxDynamicCast(parent, wxRibbonControl);
-    if(ribbon_parent)
-    {
-        m_art = ribbon_parent->GetArtProvider();
-    }
-
-    return true;
-}
-
-void wxRibbonControl::SetArtProvider(wxRibbonArtProvider* art)
-{
-    m_art = art;
-}
-
-wxSize wxRibbonControl::DoGetNextSmallerSize(wxOrientation direction,
-                                           wxSize size) const
-{
-    // Dummy implementation for code which doesn't check for IsSizingContinuous() == true
-    wxSize minimum(GetMinSize());
-    if((direction & wxHORIZONTAL) && size.x > minimum.x)
-    {
-        size.x--;
-    }
-    if((direction & wxVERTICAL) && size.y > minimum.y)
-    {
-        size.y--;
-    }
-    return size;
-}
-
-wxSize wxRibbonControl::DoGetNextLargerSize(wxOrientation direction,
-                                          wxSize size) const
-{
-    // Dummy implementation for code which doesn't check for IsSizingContinuous() == true
-    if(direction & wxHORIZONTAL)
-    {
-        size.x++;
-    }
-    if(direction & wxVERTICAL)
-    {
-        size.y++;
-    }
-    return size;
-}
-
-wxSize wxRibbonControl::GetNextSmallerSize(wxOrientation direction,
-                                           wxSize relative_to) const
-{
-    return DoGetNextSmallerSize(direction, relative_to);
-}
-
-wxSize wxRibbonControl::GetNextLargerSize(wxOrientation direction,
-                                          wxSize relative_to) const
-{
-    return DoGetNextLargerSize(direction, relative_to);
-}
-
-wxSize wxRibbonControl::GetNextSmallerSize(wxOrientation direction) const
-{
-    return DoGetNextSmallerSize(direction, GetSize());
-}
-
-wxSize wxRibbonControl::GetNextLargerSize(wxOrientation direction) const
-{
-    return DoGetNextLargerSize(direction, GetSize());
-}
-
-bool wxRibbonControl::Realize()
-{
-    return true;
-}
-
-wxRibbonBar* wxRibbonControl::GetAncestorRibbonBar()const
-{
-    for ( wxWindow* win = GetParent(); win; win = win->GetParent() )
-    {
-        wxRibbonBar* bar = wxDynamicCast(win, wxRibbonBar);
-        if ( bar )
-            return bar;
-    }
-
-    return NULL;
-}
-
-#endif // wxUSE_RIBBON
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/descrip.mms b/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/descrip.mms
deleted file mode 100644
index 6c9e9faf92..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/descrip.mms
+++ /dev/null
@@ -1,88 +0,0 @@
-#*****************************************************************************
-#                                                                            *
-# Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 14 December 2010                                                    *
-#                                                                            *
-#*****************************************************************************
-.first
-	define wx [--.include.wx]
-
-.ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
-	   /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
-.else
-.ifdef __WXGTK__
-CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
-	   /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
-.else
-.ifdef __WXGTK2__
-CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm\
-	   /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm
-.else
-.ifdef __WXX11__
-CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
-	/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
-	/name=(as_is,short)
-.else
-CXX_DEFINE =
-CC_DEFINE =
-.endif
-.endif
-.endif
-.endif
-
-.suffixes : .cpp
-
-.cpp.obj :
-	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
-.c.obj :
-	cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
-
-OBJECTS=art_aui.obj,art_internal.obj,art_msw.obj,bar.obj,buttonbar.obj,\
-	control_ribbon.obj,gallery.obj,page.obj,panel.obj,\
-	toolbar_ribbon.obj
-
-SOURCES=art_aui.cpp art_internal.cpp art_msw.cpp bar.cpp buttonbar.cpp\
-	control.cpp gallery.cpp page.cpp panel.cpp toolbar.cpp
-
-all : $(SOURCES)
-	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
-.ifdef __WXMOTIF__
-	library [--.lib]libwx_motif.olb $(OBJECTS)
-.else
-.ifdef __WXGTK__
-	library [--.lib]libwx_gtk.olb $(OBJECTS)
-.else
-.ifdef __WXGTK2__
-	library [--.lib]libwx_gtk2.olb $(OBJECTS)
-.else
-.ifdef __WXX11__
-	library [--.lib]libwx_x11_univ.olb $(OBJECTS)
-.endif
-.endif
-.endif
-.endif
-
-$(OBJECTS) : [--.include.wx]setup.h
-
-art_aui.obj : art_aui.cpp
-art_internal.obj : art_internal.cpp
-art_msw.obj : art_msw.cpp
-bar.obj : bar.cpp
-buttonbar.obj : buttonbar.cpp
-control_ribbon.obj : control.cpp
-	copy control.cpp control_ribbon.cpp
-	cxx$(CXXFLAGS)$(CXX_DEFINE) control_ribbon.cpp
-	delete control_ribbon.cpp;*
-gallery.obj : gallery.cpp
-page.obj : page.cpp
-panel.obj : panel.cpp
-toolbar_ribbon.obj : toolbar.cpp
-	copy toolbar.cpp toolbar_ribbon.cpp
-	cxx$(CXXFLAGS)$(CXX_DEFINE) toolbar_ribbon.cpp
-	delete toolbar_ribbon.cpp;*
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/gallery.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/gallery.cpp
deleted file mode 100644
index 429d5e8f93..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/gallery.cpp
+++ /dev/null
@@ -1,870 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/ribbon/gallery.cpp
-// Purpose:     Ribbon control which displays a gallery of items to choose from
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-07-22
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_RIBBON
-
-#include "wx/ribbon/gallery.h"
-#include "wx/ribbon/art.h"
-#include "wx/ribbon/bar.h"
-#include "wx/dcbuffer.h"
-#include "wx/clntdata.h"
-
-#ifndef WX_PRECOMP
-#endif
-
-#ifdef __WXMSW__
-#include "wx/msw/private.h"
-#endif
-
-wxDEFINE_EVENT(wxEVT_RIBBONGALLERY_HOVER_CHANGED, wxRibbonGalleryEvent);
-wxDEFINE_EVENT(wxEVT_RIBBONGALLERY_SELECTED, wxRibbonGalleryEvent);
-wxDEFINE_EVENT(wxEVT_RIBBONGALLERY_CLICKED, wxRibbonGalleryEvent);
-
-IMPLEMENT_DYNAMIC_CLASS(wxRibbonGalleryEvent, wxCommandEvent)
-IMPLEMENT_CLASS(wxRibbonGallery, wxRibbonControl)
-
-class wxRibbonGalleryItem
-{
-public:
-    wxRibbonGalleryItem()
-    {
-        m_id = 0;
-        m_is_visible = false;
-    }
-
-    void SetId(int id) {m_id = id;}
-    void SetBitmap(const wxBitmap& bitmap) {m_bitmap = bitmap;}
-    const wxBitmap& GetBitmap() const {return m_bitmap;}
-    void SetIsVisible(bool visible) {m_is_visible = visible;}
-    void SetPosition(int x, int y, const wxSize& size)
-    {
-        m_position = wxRect(wxPoint(x, y), size);
-    }
-    bool IsVisible() const {return m_is_visible;}
-    const wxRect& GetPosition() const {return m_position;}
-
-    void SetClientObject(wxClientData *data) {m_client_data.SetClientObject(data);}
-    wxClientData *GetClientObject() const {return m_client_data.GetClientObject();}
-    void SetClientData(void *data) {m_client_data.SetClientData(data);}
-    void *GetClientData() const {return m_client_data.GetClientData();}
-
-protected:
-    wxBitmap m_bitmap;
-    wxClientDataContainer m_client_data;
-    wxRect m_position;
-    int m_id;
-    bool m_is_visible;
-};
-
-BEGIN_EVENT_TABLE(wxRibbonGallery, wxRibbonControl)
-    EVT_ENTER_WINDOW(wxRibbonGallery::OnMouseEnter)
-    EVT_ERASE_BACKGROUND(wxRibbonGallery::OnEraseBackground)
-    EVT_LEAVE_WINDOW(wxRibbonGallery::OnMouseLeave)
-    EVT_LEFT_DOWN(wxRibbonGallery::OnMouseDown)
-    EVT_LEFT_UP(wxRibbonGallery::OnMouseUp)
-    EVT_LEFT_DCLICK(wxRibbonGallery::OnMouseDClick)
-    EVT_MOTION(wxRibbonGallery::OnMouseMove)
-    EVT_PAINT(wxRibbonGallery::OnPaint)
-    EVT_SIZE(wxRibbonGallery::OnSize)
-END_EVENT_TABLE()
-
-wxRibbonGallery::wxRibbonGallery()
-{
-}
-
-wxRibbonGallery::wxRibbonGallery(wxWindow* parent,
-                  wxWindowID id,
-                  const wxPoint& pos,
-                  const wxSize& size,
-                  long style)
-    : wxRibbonControl(parent, id, pos, size, wxBORDER_NONE)
-{
-    CommonInit(style);
-}
-
-wxRibbonGallery::~wxRibbonGallery()
-{
-    Clear();
-}
-
-bool wxRibbonGallery::Create(wxWindow* parent,
-                wxWindowID id,
-                const wxPoint& pos,
-                const wxSize& size,
-                long style)
-{
-    if(!wxRibbonControl::Create(parent, id, pos, size, wxBORDER_NONE))
-    {
-        return false;
-    }
-
-    CommonInit(style);
-    return true;
-}
-
-void wxRibbonGallery::CommonInit(long WXUNUSED(style))
-{
-    m_selected_item = NULL;
-    m_hovered_item = NULL;
-    m_active_item = NULL;
-    m_scroll_up_button_rect = wxRect(0, 0, 0, 0);
-    m_scroll_down_button_rect = wxRect(0, 0, 0, 0);
-    m_extension_button_rect = wxRect(0, 0, 0, 0);
-    m_mouse_active_rect = NULL;
-    m_bitmap_size = wxSize(64, 32);
-    m_bitmap_padded_size = m_bitmap_size;
-    m_item_separation_x = 0;
-    m_item_separation_y = 0;
-    m_scroll_amount = 0;
-    m_scroll_limit = 0;
-    m_up_button_state = wxRIBBON_GALLERY_BUTTON_DISABLED;
-    m_down_button_state = wxRIBBON_GALLERY_BUTTON_NORMAL;
-    m_extension_button_state = wxRIBBON_GALLERY_BUTTON_NORMAL;
-    m_hovered = false;
-
-    SetBackgroundStyle(wxBG_STYLE_CUSTOM);
-}
-
-void wxRibbonGallery::OnMouseEnter(wxMouseEvent& evt)
-{
-    m_hovered = true;
-    if(m_mouse_active_rect != NULL && !evt.LeftIsDown())
-    {
-        m_mouse_active_rect = NULL;
-        m_active_item = NULL;
-    }
-    Refresh(false);
-}
-
-void wxRibbonGallery::OnMouseMove(wxMouseEvent& evt)
-{
-    bool refresh = false;
-    wxPoint pos = evt.GetPosition();
-
-    if(TestButtonHover(m_scroll_up_button_rect, pos, &m_up_button_state))
-        refresh = true;
-    if(TestButtonHover(m_scroll_down_button_rect, pos, &m_down_button_state))
-        refresh = true;
-    if(TestButtonHover(m_extension_button_rect, pos, &m_extension_button_state))
-        refresh = true;
-
-    wxRibbonGalleryItem *hovered_item = NULL;
-    wxRibbonGalleryItem *active_item = NULL;
-    if(m_client_rect.Contains(pos))
-    {
-        if(m_art && m_art->GetFlags() & wxRIBBON_BAR_FLOW_VERTICAL)
-            pos.x += m_scroll_amount;
-        else
-            pos.y += m_scroll_amount;
-
-        size_t item_count = m_items.Count();
-        size_t item_i;
-        for(item_i = 0; item_i < item_count; ++item_i)
-        {
-            wxRibbonGalleryItem *item = m_items.Item(item_i);
-            if(!item->IsVisible())
-                continue;
-
-            if(item->GetPosition().Contains(pos))
-            {
-                if(m_mouse_active_rect == &item->GetPosition())
-                    active_item = item;
-                hovered_item = item;
-                break;
-            }
-        }
-    }
-    if(active_item != m_active_item)
-    {
-        m_active_item = active_item;
-        refresh = true;
-    }
-    if(hovered_item != m_hovered_item)
-    {
-        m_hovered_item = hovered_item;
-        wxRibbonGalleryEvent notification(
-            wxEVT_RIBBONGALLERY_HOVER_CHANGED, GetId());
-        notification.SetEventObject(this);
-        notification.SetGallery(this);
-        notification.SetGalleryItem(hovered_item);
-        ProcessWindowEvent(notification);
-        refresh = true;
-    }
-
-    if(refresh)
-        Refresh(false);
-}
-
-bool wxRibbonGallery::TestButtonHover(const wxRect& rect, wxPoint pos,
-        wxRibbonGalleryButtonState* state)
-{
-    if(*state == wxRIBBON_GALLERY_BUTTON_DISABLED)
-        return false;
-
-    wxRibbonGalleryButtonState new_state;
-    if(rect.Contains(pos))
-    {
-        if(m_mouse_active_rect == &rect)
-            new_state = wxRIBBON_GALLERY_BUTTON_ACTIVE;
-        else
-            new_state = wxRIBBON_GALLERY_BUTTON_HOVERED;
-    }
-    else
-        new_state = wxRIBBON_GALLERY_BUTTON_NORMAL;
-
-    if(new_state != *state)
-    {
-        *state = new_state;
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
-
-void wxRibbonGallery::OnMouseLeave(wxMouseEvent& WXUNUSED(evt))
-{
-    m_hovered = false;
-    m_active_item = NULL;
-    if(m_up_button_state != wxRIBBON_GALLERY_BUTTON_DISABLED)
-        m_up_button_state = wxRIBBON_GALLERY_BUTTON_NORMAL;
-    if(m_down_button_state != wxRIBBON_GALLERY_BUTTON_DISABLED)
-        m_down_button_state = wxRIBBON_GALLERY_BUTTON_NORMAL;
-    if(m_extension_button_state != wxRIBBON_GALLERY_BUTTON_DISABLED)
-        m_extension_button_state = wxRIBBON_GALLERY_BUTTON_NORMAL;
-    if(m_hovered_item != NULL)
-    {
-        m_hovered_item = NULL;
-        wxRibbonGalleryEvent notification(
-            wxEVT_RIBBONGALLERY_HOVER_CHANGED, GetId());
-        notification.SetEventObject(this);
-        notification.SetGallery(this);
-        ProcessWindowEvent(notification);
-    }
-    Refresh(false);
-}
-
-void wxRibbonGallery::OnMouseDown(wxMouseEvent& evt)
-{
-    wxPoint pos = evt.GetPosition();
-    m_mouse_active_rect = NULL;
-    if(m_client_rect.Contains(pos))
-    {
-        if(m_art && m_art->GetFlags() & wxRIBBON_BAR_FLOW_VERTICAL)
-            pos.x += m_scroll_amount;
-        else
-            pos.y += m_scroll_amount;
-        size_t item_count = m_items.Count();
-        size_t item_i;
-        for(item_i = 0; item_i < item_count; ++item_i)
-        {
-            wxRibbonGalleryItem *item = m_items.Item(item_i);
-            if(!item->IsVisible())
-                continue;
-
-            const wxRect& rect = item->GetPosition();
-            if(rect.Contains(pos))
-            {
-                m_active_item = item;
-                m_mouse_active_rect = ▭
-                break;
-            }
-        }
-    }
-    else if(m_scroll_up_button_rect.Contains(pos))
-    {
-        if(m_up_button_state != wxRIBBON_GALLERY_BUTTON_DISABLED)
-        {
-            m_mouse_active_rect = &m_scroll_up_button_rect;
-            m_up_button_state = wxRIBBON_GALLERY_BUTTON_ACTIVE;
-        }
-    }
-    else if(m_scroll_down_button_rect.Contains(pos))
-    {
-        if(m_down_button_state != wxRIBBON_GALLERY_BUTTON_DISABLED)
-        {
-            m_mouse_active_rect = &m_scroll_down_button_rect;
-            m_down_button_state = wxRIBBON_GALLERY_BUTTON_ACTIVE;
-        }
-    }
-    else if(m_extension_button_rect.Contains(pos))
-    {
-        if(m_extension_button_state != wxRIBBON_GALLERY_BUTTON_DISABLED)
-        {
-            m_mouse_active_rect = &m_extension_button_rect;
-            m_extension_button_state = wxRIBBON_GALLERY_BUTTON_ACTIVE;
-        }
-    }
-    if(m_mouse_active_rect != NULL)
-        Refresh(false);
-}
-
-void wxRibbonGallery::OnMouseUp(wxMouseEvent& evt)
-{
-    if(m_mouse_active_rect != NULL)
-    {
-        wxPoint pos = evt.GetPosition();
-        if(m_active_item)
-        {
-            if(m_art && m_art->GetFlags() & wxRIBBON_BAR_FLOW_VERTICAL)
-                pos.x += m_scroll_amount;
-            else
-                pos.y += m_scroll_amount;
-        }
-        if(m_mouse_active_rect->Contains(pos))
-        {
-            if(m_mouse_active_rect == &m_scroll_up_button_rect)
-            {
-                m_up_button_state = wxRIBBON_GALLERY_BUTTON_HOVERED;
-                ScrollLines(-1);
-            }
-            else if(m_mouse_active_rect == &m_scroll_down_button_rect)
-            {
-                m_down_button_state = wxRIBBON_GALLERY_BUTTON_HOVERED;
-                ScrollLines(1);
-            }
-            else if(m_mouse_active_rect == &m_extension_button_rect)
-            {
-                m_extension_button_state = wxRIBBON_GALLERY_BUTTON_HOVERED;
-                wxCommandEvent notification(wxEVT_BUTTON,
-                    GetId());
-                notification.SetEventObject(this);
-                ProcessWindowEvent(notification);
-            }
-            else if(m_active_item != NULL)
-            {
-                if(m_selected_item != m_active_item)
-                {
-                    m_selected_item = m_active_item;
-                    wxRibbonGalleryEvent notification(
-                        wxEVT_RIBBONGALLERY_SELECTED, GetId());
-                    notification.SetEventObject(this);
-                    notification.SetGallery(this);
-                    notification.SetGalleryItem(m_selected_item);
-                    ProcessWindowEvent(notification);
-                }
-
-                wxRibbonGalleryEvent notification(
-                    wxEVT_RIBBONGALLERY_CLICKED, GetId());
-                notification.SetEventObject(this);
-                notification.SetGallery(this);
-                notification.SetGalleryItem(m_selected_item);
-                ProcessWindowEvent(notification);
-            }
-        }
-        m_mouse_active_rect = NULL;
-        m_active_item = NULL;
-        Refresh(false);
-    }
-}
-
-void wxRibbonGallery::OnMouseDClick(wxMouseEvent& evt)
-{
-    // The 2nd click of a double-click should be handled as a click in the
-    // same way as the 1st click of the double-click. This is useful for
-    // scrolling through the gallery.
-    OnMouseDown(evt);
-    OnMouseUp(evt);
-}
-
-void wxRibbonGallery::SetItemClientObject(wxRibbonGalleryItem* itm,
-                                          wxClientData* data)
-{
-    itm->SetClientObject(data);
-}
-
-wxClientData* wxRibbonGallery::GetItemClientObject(const wxRibbonGalleryItem* itm) const
-{
-    return itm->GetClientObject();
-}
-
-void wxRibbonGallery::SetItemClientData(wxRibbonGalleryItem* itm, void* data)
-{
-    itm->SetClientData(data);
-}
-
-void* wxRibbonGallery::GetItemClientData(const wxRibbonGalleryItem* itm) const
-{
-    return itm->GetClientData();
-}
-
-bool wxRibbonGallery::ScrollLines(int lines)
-{
-    if(m_scroll_limit == 0 || m_art == NULL)
-        return false;
-
-    return ScrollPixels(lines * GetScrollLineSize());
-}
-
-int wxRibbonGallery::GetScrollLineSize() const
-{
-    if(m_art == NULL)
-        return 32;
-
-    int line_size = m_bitmap_padded_size.GetHeight();
-    if(m_art->GetFlags() & wxRIBBON_BAR_FLOW_VERTICAL)
-        line_size = m_bitmap_padded_size.GetWidth();
-
-    return line_size;
-}
-
-bool wxRibbonGallery::ScrollPixels(int pixels)
-{
-    if(m_scroll_limit == 0 || m_art == NULL)
-        return false;
-
-    if(pixels < 0)
-    {
-        if(m_scroll_amount > 0)
-        {
-            m_scroll_amount += pixels;
-            if(m_scroll_amount <= 0)
-            {
-                m_scroll_amount = 0;
-                m_up_button_state = wxRIBBON_GALLERY_BUTTON_DISABLED;
-            }
-            else if(m_up_button_state == wxRIBBON_GALLERY_BUTTON_DISABLED)
-                m_up_button_state = wxRIBBON_GALLERY_BUTTON_NORMAL;
-            if(m_down_button_state == wxRIBBON_GALLERY_BUTTON_DISABLED)
-                m_down_button_state = wxRIBBON_GALLERY_BUTTON_NORMAL;
-            return true;
-        }
-    }
-    else if(pixels > 0)
-    {
-        if(m_scroll_amount < m_scroll_limit)
-        {
-            m_scroll_amount += pixels;
-            if(m_scroll_amount >= m_scroll_limit)
-            {
-                m_scroll_amount = m_scroll_limit;
-                m_down_button_state = wxRIBBON_GALLERY_BUTTON_DISABLED;
-            }
-            else if(m_down_button_state == wxRIBBON_GALLERY_BUTTON_DISABLED)
-                m_down_button_state = wxRIBBON_GALLERY_BUTTON_NORMAL;
-            if(m_up_button_state == wxRIBBON_GALLERY_BUTTON_DISABLED)
-                m_up_button_state = wxRIBBON_GALLERY_BUTTON_NORMAL;
-            return true;
-        }
-    }
-    return false;
-}
-
-void wxRibbonGallery::EnsureVisible(const wxRibbonGalleryItem* item)
-{
-    if(item == NULL || !item->IsVisible() || IsEmpty())
-        return;
-
-    if(m_art->GetFlags() & wxRIBBON_BAR_FLOW_VERTICAL)
-    {
-        int x = item->GetPosition().GetLeft();
-        int base_x = m_items.Item(0)->GetPosition().GetLeft();
-        int delta = x - base_x - m_scroll_amount;
-        ScrollLines(delta / m_bitmap_padded_size.GetWidth());
-    }
-    else
-    {
-        int y = item->GetPosition().GetTop();
-        int base_y = m_items.Item(0)->GetPosition().GetTop();
-        int delta = y - base_y - m_scroll_amount;
-        ScrollLines(delta / m_bitmap_padded_size.GetHeight());
-    }
-}
-
-bool wxRibbonGallery::IsHovered() const
-{
-    return m_hovered;
-}
-
-void wxRibbonGallery::OnEraseBackground(wxEraseEvent& WXUNUSED(evt))
-{
-    // All painting done in main paint handler to minimise flicker
-}
-
-void wxRibbonGallery::OnPaint(wxPaintEvent& WXUNUSED(evt))
-{
-    wxAutoBufferedPaintDC dc(this);
-    if(m_art == NULL)
-        return;
-
-    m_art->DrawGalleryBackground(dc, this, GetSize());
-
-    int padding_top = m_art->GetMetric(wxRIBBON_ART_GALLERY_BITMAP_PADDING_TOP_SIZE);
-    int padding_left = m_art->GetMetric(wxRIBBON_ART_GALLERY_BITMAP_PADDING_LEFT_SIZE);
-
-    dc.SetClippingRegion(m_client_rect);
-
-    bool offset_vertical = true;
-    if(m_art->GetFlags() & wxRIBBON_BAR_FLOW_VERTICAL)
-        offset_vertical = false;
-    size_t item_count = m_items.Count();
-    size_t item_i;
-    for(item_i = 0; item_i < item_count; ++item_i)
-    {
-        wxRibbonGalleryItem *item = m_items.Item(item_i);
-        if(!item->IsVisible())
-            continue;
-
-        const wxRect& pos = item->GetPosition();
-        wxRect offset_pos(pos);
-        if(offset_vertical)
-            offset_pos.SetTop(offset_pos.GetTop() - m_scroll_amount);
-        else
-            offset_pos.SetLeft(offset_pos.GetLeft() - m_scroll_amount);
-        m_art->DrawGalleryItemBackground(dc, this, offset_pos, item);
-        dc.DrawBitmap(item->GetBitmap(), offset_pos.GetLeft() + padding_left,
-            offset_pos.GetTop() + padding_top);
-    }
-}
-
-void wxRibbonGallery::OnSize(wxSizeEvent& WXUNUSED(evt))
-{
-    Layout();
-}
-
-wxRibbonGalleryItem* wxRibbonGallery::Append(const wxBitmap& bitmap, int id)
-{
-    wxASSERT(bitmap.IsOk());
-    if(m_items.IsEmpty())
-    {
-        m_bitmap_size = bitmap.GetSize();
-        CalculateMinSize();
-    }
-    else
-    {
-        wxASSERT(bitmap.GetSize() == m_bitmap_size);
-    }
-
-    wxRibbonGalleryItem *item = new wxRibbonGalleryItem;
-    item->SetId(id);
-    item->SetBitmap(bitmap);
-    m_items.Add(item);
-    return item;
-}
-
-wxRibbonGalleryItem* wxRibbonGallery::Append(const wxBitmap& bitmap, int id,
-                                             void* clientData)
-{
-    wxRibbonGalleryItem *item = Append(bitmap, id);
-    item->SetClientData(clientData);
-    return item;
-}
-
-wxRibbonGalleryItem* wxRibbonGallery::Append(const wxBitmap& bitmap, int id,
-                                             wxClientData* clientData)
-{
-    wxRibbonGalleryItem *item = Append(bitmap, id);
-    item->SetClientObject(clientData);
-    return item;
-}
-
-void wxRibbonGallery::Clear()
-{
-    size_t item_count = m_items.Count();
-    size_t item_i;
-    for(item_i = 0; item_i < item_count; ++item_i)
-    {
-        wxRibbonGalleryItem *item = m_items.Item(item_i);
-        delete item;
-    }
-    m_items.Clear();
-}
-
-bool wxRibbonGallery::IsSizingContinuous() const
-{
-    return false;
-}
-
-void wxRibbonGallery::CalculateMinSize()
-{
-    if(m_art == NULL || !m_bitmap_size.IsFullySpecified())
-    {
-        SetMinSize(wxSize(20, 20));
-    }
-    else
-    {
-        m_bitmap_padded_size = m_bitmap_size;
-        m_bitmap_padded_size.IncBy(
-            m_art->GetMetric(wxRIBBON_ART_GALLERY_BITMAP_PADDING_LEFT_SIZE) +
-            m_art->GetMetric(wxRIBBON_ART_GALLERY_BITMAP_PADDING_RIGHT_SIZE),
-            m_art->GetMetric(wxRIBBON_ART_GALLERY_BITMAP_PADDING_TOP_SIZE) +
-            m_art->GetMetric(wxRIBBON_ART_GALLERY_BITMAP_PADDING_BOTTOM_SIZE));
-
-        wxMemoryDC dc;
-        SetMinSize(m_art->GetGallerySize(dc, this, m_bitmap_padded_size));
-
-        // The best size is displaying several items
-        m_best_size = m_bitmap_padded_size;
-        m_best_size.x *= 3;
-        m_best_size = m_art->GetGallerySize(dc, this, m_best_size);
-    }
-}
-
-bool wxRibbonGallery::Realize()
-{
-    CalculateMinSize();
-    return Layout();
-}
-
-bool wxRibbonGallery::Layout()
-{
-    if(m_art == NULL)
-        return false;
-
-    wxMemoryDC dc;
-    wxPoint origin;
-    wxSize client_size = m_art->GetGalleryClientSize(dc, this, GetSize(),
-        &origin, &m_scroll_up_button_rect, &m_scroll_down_button_rect,
-        &m_extension_button_rect);
-    m_client_rect = wxRect(origin, client_size);
-
-    int x_cursor = 0;
-    int y_cursor = 0;
-
-    size_t item_count = m_items.Count();
-    size_t item_i;
-    long art_flags = m_art->GetFlags();
-    for(item_i = 0; item_i < item_count; ++item_i)
-    {
-        wxRibbonGalleryItem *item = m_items.Item(item_i);
-        item->SetIsVisible(true);
-        if(art_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-        {
-            if(y_cursor + m_bitmap_padded_size.y > client_size.GetHeight())
-            {
-                if(y_cursor == 0)
-                    break;
-                y_cursor = 0;
-                x_cursor += m_bitmap_padded_size.x;
-            }
-            item->SetPosition(origin.x + x_cursor, origin.y + y_cursor,
-                m_bitmap_padded_size);
-            y_cursor += m_bitmap_padded_size.y;
-        }
-        else
-        {
-            if(x_cursor + m_bitmap_padded_size.x > client_size.GetWidth())
-            {
-                if(x_cursor == 0)
-                    break;
-                x_cursor = 0;
-                y_cursor += m_bitmap_padded_size.y;
-            }
-            item->SetPosition(origin.x + x_cursor, origin.y + y_cursor,
-                m_bitmap_padded_size);
-            x_cursor += m_bitmap_padded_size.x;
-        }
-    }
-    for(; item_i < item_count; ++item_i)
-    {
-        wxRibbonGalleryItem *item = m_items.Item(item_i);
-        item->SetIsVisible(false);
-    }
-    if(art_flags & wxRIBBON_BAR_FLOW_VERTICAL)
-        m_scroll_limit = x_cursor;
-    else
-        m_scroll_limit = y_cursor;
-    if(m_scroll_amount >= m_scroll_limit)
-    {
-        m_scroll_amount = m_scroll_limit;
-        m_down_button_state = wxRIBBON_GALLERY_BUTTON_DISABLED;
-    }
-    else if(m_down_button_state == wxRIBBON_GALLERY_BUTTON_DISABLED)
-        m_down_button_state = wxRIBBON_GALLERY_BUTTON_NORMAL;
-
-    if(m_scroll_amount <= 0)
-    {
-        m_scroll_amount = 0;
-        m_up_button_state = wxRIBBON_GALLERY_BUTTON_DISABLED;
-    }
-    else if(m_up_button_state == wxRIBBON_GALLERY_BUTTON_DISABLED)
-        m_up_button_state = wxRIBBON_GALLERY_BUTTON_NORMAL;
-
-    return true;
-}
-
-wxSize wxRibbonGallery::DoGetBestSize() const
-{
-    return m_best_size;
-}
-
-wxSize wxRibbonGallery::DoGetNextSmallerSize(wxOrientation direction,
-                                        wxSize relative_to) const
-{
-    if(m_art == NULL)
-        return relative_to;
-
-    wxMemoryDC dc;
-
-    wxSize client = m_art->GetGalleryClientSize(dc, this, relative_to, NULL,
-        NULL, NULL, NULL);
-    switch(direction)
-    {
-    case wxHORIZONTAL:
-        client.DecBy(1, 0);
-        break;
-    case wxVERTICAL:
-        client.DecBy(0, 1);
-        break;
-    case wxBOTH:
-        client.DecBy(1, 1);
-        break;
-    }
-    if(client.GetWidth() < 0 || client.GetHeight() < 0)
-        return relative_to;
-
-    client.x = (client.x / m_bitmap_padded_size.x) * m_bitmap_padded_size.x;
-    client.y = (client.y / m_bitmap_padded_size.y) * m_bitmap_padded_size.y;
-
-    wxSize size = m_art->GetGallerySize(dc, this, client);
-    wxSize minimum = GetMinSize();
-
-    if(size.GetWidth() < minimum.GetWidth() ||
-        size.GetHeight() < minimum.GetHeight())
-    {
-        return relative_to;
-    }
-
-    switch(direction)
-    {
-    case wxHORIZONTAL:
-        size.SetHeight(relative_to.GetHeight());
-        break;
-    case wxVERTICAL:
-        size.SetWidth(relative_to.GetWidth());
-        break;
-    default:
-        break;
-    }
-
-    return size;
-}
-
-wxSize wxRibbonGallery::DoGetNextLargerSize(wxOrientation direction,
-                                       wxSize relative_to) const
-{
-    if(m_art == NULL)
-        return relative_to;
-
-    wxMemoryDC dc;
-
-    wxSize client = m_art->GetGalleryClientSize(dc, this, relative_to, NULL,
-        NULL, NULL, NULL);
-
-    // No need to grow if the given size can already display every item
-    int nitems = (client.GetWidth() / m_bitmap_padded_size.x) *
-        (client.GetHeight() / m_bitmap_padded_size.y);
-    if(nitems >= (int)m_items.GetCount())
-        return relative_to;
-
-    switch(direction)
-    {
-    case wxHORIZONTAL:
-        client.IncBy(m_bitmap_padded_size.x, 0);
-        break;
-    case wxVERTICAL:
-        client.IncBy(0, m_bitmap_padded_size.y);
-        break;
-    case wxBOTH:
-        client.IncBy(m_bitmap_padded_size);
-        break;
-    }
-
-    client.x = (client.x / m_bitmap_padded_size.x) * m_bitmap_padded_size.x;
-    client.y = (client.y / m_bitmap_padded_size.y) * m_bitmap_padded_size.y;
-
-    wxSize size = m_art->GetGallerySize(dc, this, client);
-    wxSize minimum = GetMinSize();
-
-    if(size.GetWidth() < minimum.GetWidth() ||
-        size.GetHeight() < minimum.GetHeight())
-    {
-        return relative_to;
-    }
-
-    switch(direction)
-    {
-    case wxHORIZONTAL:
-        size.SetHeight(relative_to.GetHeight());
-        break;
-    case wxVERTICAL:
-        size.SetWidth(relative_to.GetWidth());
-        break;
-    default:
-        break;
-    }
-
-    return size;
-}
-
-bool wxRibbonGallery::IsEmpty() const
-{
-    return m_items.IsEmpty();
-}
-
-unsigned int wxRibbonGallery::GetCount() const
-{
-    return (unsigned int)m_items.GetCount();
-}
-
-wxRibbonGalleryItem* wxRibbonGallery::GetItem(unsigned int n)
-{
-    if(n >= GetCount())
-        return NULL;
-    return m_items.Item(n);
-}
-
-void wxRibbonGallery::SetSelection(wxRibbonGalleryItem* item)
-{
-    if(item != m_selected_item)
-    {
-        m_selected_item = item;
-        Refresh(false);
-    }
-}
-
-wxRibbonGalleryItem* wxRibbonGallery::GetSelection() const
-{
-    return m_selected_item;
-}
-
-wxRibbonGalleryItem* wxRibbonGallery::GetHoveredItem() const
-{
-    return m_hovered_item;
-}
-
-wxRibbonGalleryItem* wxRibbonGallery::GetActiveItem() const
-{
-    return m_active_item;
-}
-
-wxRibbonGalleryButtonState wxRibbonGallery::GetUpButtonState() const
-{
-    return m_up_button_state;
-}
-
-wxRibbonGalleryButtonState wxRibbonGallery::GetDownButtonState() const
-{
-    return m_down_button_state;
-}
-
-wxRibbonGalleryButtonState wxRibbonGallery::GetExtensionButtonState() const
-{
-    return m_extension_button_state;
-}
-
-#endif // wxUSE_RIBBON
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/page.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/page.cpp
deleted file mode 100644
index 1fd662165e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/page.cpp
+++ /dev/null
@@ -1,1226 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/ribbon/page.cpp
-// Purpose:     Container for ribbon-bar-style interface panels
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-05-25
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_RIBBON
-
-#include "wx/ribbon/page.h"
-#include "wx/ribbon/art.h"
-#include "wx/ribbon/bar.h"
-#include "wx/dcbuffer.h"
-
-#ifndef WX_PRECOMP
-#endif
-
-#ifdef __WXMSW__
-#include "wx/msw/private.h"
-#endif
-
-static int GetSizeInOrientation(wxSize size, wxOrientation orientation);
-
-// As scroll buttons need to be rendered on top of a page's child windows, the
-// buttons themselves have to be proper child windows (rather than just painted
-// onto the page). In order to get proper clipping of a page's children (with
-// regard to the scroll button), the scroll buttons are created as children of
-// the ribbon bar rather than children of the page. This could not have been
-// achieved by creating buttons as children of the page and then doing some Z-order
-// manipulation, as this causes problems on win32 due to ribbon panels having the
-// transparent flag set.
-class wxRibbonPageScrollButton : public wxRibbonControl
-{
-public:
-    wxRibbonPageScrollButton(wxRibbonPage* sibling,
-                 wxWindowID id = wxID_ANY,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 long style = 0);
-
-    virtual ~wxRibbonPageScrollButton();
-
-protected:
-    virtual wxBorder GetDefaultBorder() const { return wxBORDER_NONE; }
-
-    void OnEraseBackground(wxEraseEvent& evt);
-    void OnPaint(wxPaintEvent& evt);
-    void OnMouseEnter(wxMouseEvent& evt);
-    void OnMouseLeave(wxMouseEvent& evt);
-    void OnMouseDown(wxMouseEvent& evt);
-    void OnMouseUp(wxMouseEvent& evt);
-
-    wxRibbonPage* m_sibling;
-    long m_flags;
-
-    DECLARE_CLASS(wxRibbonPageScrollButton)
-    DECLARE_EVENT_TABLE()
-};
-
-IMPLEMENT_CLASS(wxRibbonPageScrollButton, wxRibbonControl)
-
-BEGIN_EVENT_TABLE(wxRibbonPageScrollButton, wxRibbonControl)
-    EVT_ENTER_WINDOW(wxRibbonPageScrollButton::OnMouseEnter)
-    EVT_ERASE_BACKGROUND(wxRibbonPageScrollButton::OnEraseBackground)
-    EVT_LEAVE_WINDOW(wxRibbonPageScrollButton::OnMouseLeave)
-    EVT_LEFT_DOWN(wxRibbonPageScrollButton::OnMouseDown)
-    EVT_LEFT_UP(wxRibbonPageScrollButton::OnMouseUp)
-    EVT_PAINT(wxRibbonPageScrollButton::OnPaint)
-END_EVENT_TABLE()
-
-wxRibbonPageScrollButton::wxRibbonPageScrollButton(wxRibbonPage* sibling,
-                 wxWindowID id,
-                 const wxPoint& pos,
-                 const wxSize& size,
-                 long style) : wxRibbonControl(sibling->GetParent(), id, pos, size, wxBORDER_NONE)
-{
-    SetBackgroundStyle(wxBG_STYLE_CUSTOM);
-    m_sibling = sibling;
-    m_flags = (style & wxRIBBON_SCROLL_BTN_DIRECTION_MASK) | wxRIBBON_SCROLL_BTN_FOR_PAGE;
-}
-
-wxRibbonPageScrollButton::~wxRibbonPageScrollButton()
-{
-}
-
-void wxRibbonPageScrollButton::OnEraseBackground(wxEraseEvent& WXUNUSED(evt))
-{
-    // Do nothing - all painting done in main paint handler
-}
-
-void wxRibbonPageScrollButton::OnPaint(wxPaintEvent& WXUNUSED(evt))
-{
-    wxAutoBufferedPaintDC dc(this);
-    if(m_art)
-    {
-        m_art->DrawScrollButton(dc, this, GetSize(), m_flags);
-    }
-}
-
-void wxRibbonPageScrollButton::OnMouseEnter(wxMouseEvent& WXUNUSED(evt))
-{
-    m_flags |= wxRIBBON_SCROLL_BTN_HOVERED;
-    Refresh(false);
-}
-
-void wxRibbonPageScrollButton::OnMouseLeave(wxMouseEvent& WXUNUSED(evt))
-{
-    m_flags &= ~wxRIBBON_SCROLL_BTN_HOVERED;
-    m_flags &= ~wxRIBBON_SCROLL_BTN_ACTIVE;
-    Refresh(false);
-}
-
-void wxRibbonPageScrollButton::OnMouseDown(wxMouseEvent& WXUNUSED(evt))
-{
-    m_flags |= wxRIBBON_SCROLL_BTN_ACTIVE;
-    Refresh(false);
-}
-
-void wxRibbonPageScrollButton::OnMouseUp(wxMouseEvent& WXUNUSED(evt))
-{
-    if(m_flags & wxRIBBON_SCROLL_BTN_ACTIVE)
-    {
-        m_flags &= ~wxRIBBON_SCROLL_BTN_ACTIVE;
-        Refresh(false);
-        switch(m_flags & wxRIBBON_SCROLL_BTN_DIRECTION_MASK)
-        {
-        case wxRIBBON_SCROLL_BTN_DOWN:
-        case wxRIBBON_SCROLL_BTN_RIGHT:
-            m_sibling->ScrollSections(1);
-            break;
-        case wxRIBBON_SCROLL_BTN_UP:
-        case wxRIBBON_SCROLL_BTN_LEFT:
-            m_sibling->ScrollSections(-1);
-            break;
-        default:
-            break;
-        }
-    }
-}
-
-IMPLEMENT_CLASS(wxRibbonPage, wxRibbonControl)
-
-BEGIN_EVENT_TABLE(wxRibbonPage, wxRibbonControl)
-    EVT_ERASE_BACKGROUND(wxRibbonPage::OnEraseBackground)
-    EVT_PAINT(wxRibbonPage::OnPaint)
-    EVT_SIZE(wxRibbonPage::OnSize)
-END_EVENT_TABLE()
-
-wxRibbonPage::wxRibbonPage()
-{
-    m_scroll_left_btn = NULL;
-    m_scroll_right_btn = NULL;
-    m_scroll_amount = 0;
-    m_scroll_buttons_visible = false;
-}
-
-wxRibbonPage::wxRibbonPage(wxRibbonBar* parent,
-                   wxWindowID id,
-                   const wxString& label,
-                   const wxBitmap& icon,
-                   long WXUNUSED(style))
-    : wxRibbonControl(parent, id, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE)
-{
-    CommonInit(label, icon);
-}
-
-wxRibbonPage::~wxRibbonPage()
-{
-    delete[] m_size_calc_array;
-}
-
-bool wxRibbonPage::Create(wxRibbonBar* parent,
-                wxWindowID id,
-                const wxString& label,
-                const wxBitmap& icon,
-                long WXUNUSED(style))
-{
-    if(!wxRibbonControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE))
-        return false;
-
-    CommonInit(label, icon);
-
-    return true;
-}
-
-void wxRibbonPage::CommonInit(const wxString& label, const wxBitmap& icon)
-{
-    SetName(label);
-
-    SetLabel(label);
-    m_old_size = wxSize(0, 0);
-    m_icon = icon;
-    m_scroll_left_btn = NULL;
-    m_scroll_right_btn = NULL;
-    m_size_calc_array = NULL;
-    m_size_calc_array_size = 0;
-    m_scroll_amount = 0;
-    m_scroll_buttons_visible = false;
-
-    SetBackgroundStyle(wxBG_STYLE_CUSTOM);
-
-    wxDynamicCast(GetParent(), wxRibbonBar)->AddPage(this);
-}
-
-void wxRibbonPage::SetArtProvider(wxRibbonArtProvider* art)
-{
-    m_art = art;
-    for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxWindow* child = node->GetData();
-        wxRibbonControl* ribbon_child = wxDynamicCast(child, wxRibbonControl);
-        if(ribbon_child)
-        {
-            ribbon_child->SetArtProvider(art);
-        }
-    }
-}
-
-void wxRibbonPage::AdjustRectToIncludeScrollButtons(wxRect* rect) const
-{
-    if(m_scroll_buttons_visible)
-    {
-        if(GetMajorAxis() == wxVERTICAL)
-        {
-            if(m_scroll_left_btn)
-            {
-                rect->SetY(rect->GetY() -
-                    m_scroll_left_btn->GetSize().GetHeight());
-                rect->SetHeight(rect->GetHeight() +
-                    m_scroll_left_btn->GetSize().GetHeight());
-            }
-            if(m_scroll_right_btn)
-            {
-                rect->SetHeight(rect->GetHeight() +
-                    m_scroll_right_btn->GetSize().GetHeight());
-            }
-        }
-        else
-        {
-            if(m_scroll_left_btn)
-            {
-                rect->SetX(rect->GetX() -
-                    m_scroll_left_btn->GetSize().GetWidth());
-                rect->SetWidth(rect->GetWidth() +
-                    m_scroll_left_btn->GetSize().GetWidth());
-            }
-            if(m_scroll_right_btn)
-            {
-                rect->SetWidth(rect->GetWidth() +
-                    m_scroll_right_btn->GetSize().GetWidth());
-            }
-        }
-    }
-}
-
-void wxRibbonPage::OnEraseBackground(wxEraseEvent& WXUNUSED(evt))
-{
-    // All painting done in main paint handler to minimise flicker
-}
-
-void wxRibbonPage::OnPaint(wxPaintEvent& WXUNUSED(evt))
-{
-    // No foreground painting done by the page itself, but a paint DC
-    // must be created anyway.
-    wxAutoBufferedPaintDC dc(this);
-    wxRect rect(GetSize());
-    AdjustRectToIncludeScrollButtons(&rect);
-    m_art->DrawPageBackground(dc, this, rect);
-}
-
-wxOrientation wxRibbonPage::GetMajorAxis() const
-{
-    if(m_art && (m_art->GetFlags() & wxRIBBON_BAR_FLOW_VERTICAL))
-    {
-        return wxVERTICAL;
-    }
-    else
-    {
-        return wxHORIZONTAL;
-    }
-}
-
-bool wxRibbonPage::ScrollLines(int lines)
-{
-    return ScrollPixels(lines * 8);
-}
-
-bool wxRibbonPage::ScrollPixels(int pixels)
-{
-    if(pixels < 0)
-    {
-        if(m_scroll_amount == 0)
-            return false;
-        if(m_scroll_amount < -pixels)
-            pixels = -m_scroll_amount;
-    }
-    else if(pixels > 0)
-    {
-        if(m_scroll_amount == m_scroll_amount_limit)
-            return false;
-        if(m_scroll_amount + pixels > m_scroll_amount_limit)
-            pixels = m_scroll_amount_limit - m_scroll_amount;
-    }
-    else
-        return false;
-
-    m_scroll_amount += pixels;
-
-    for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-              node;
-              node = node->GetNext() )
-    {
-        wxWindow* child = node->GetData();
-        int x, y;
-        child->GetPosition(&x, &y);
-        if(GetMajorAxis() == wxHORIZONTAL)
-            x -= pixels;
-        else
-            y -= pixels;
-        child->SetPosition(wxPoint(x, y));
-    }
-
-    ShowScrollButtons();
-    Refresh();
-    return true;
-}
-
-bool wxRibbonPage::ScrollSections(int sections)
-{
-    // Currently the only valid values are -1 and 1 for scrolling left and
-    // right, respectively.
-    const bool scrollForward = sections >= 1;
-
-    // Determine by how many pixels to scroll. If something on the page
-    // is partially visible, scroll to make it fully visible. Otherwise
-    // find the next item that will become visible and scroll to make it
-    // fully visible. The ScrollPixel call will correct if we scroll too
-    // much if the available width is smaller than the items.
-
-    // Scroll at minimum the same amount as ScrollLines(1):
-    int minscroll = sections * 8;
-    // How many pixels to scroll:
-    int pixels = 0;
-
-    // Determine the scroll position, that is, the page border where items
-    // are appearing.
-    int scrollpos = 0;
-
-    wxOrientation major_axis = GetMajorAxis();
-    int gap = 0;
-
-    int width = 0;
-    int height = 0;
-    int x = 0;
-    int y = 0;
-    GetSize(&width, &height);
-    GetPosition(&x, &y);
-    if(major_axis == wxHORIZONTAL)
-    {
-        gap = m_art->GetMetric(wxRIBBON_ART_PANEL_X_SEPARATION_SIZE);
-        if (scrollForward)
-        {
-            scrollpos = width - m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_RIGHT_SIZE);
-        }
-        else
-        {
-            scrollpos = m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_LEFT_SIZE);
-        }
-    }
-    else
-    {
-        gap = m_art->GetMetric(wxRIBBON_ART_PANEL_Y_SEPARATION_SIZE);
-        if (scrollForward)
-        {
-            scrollpos = width - m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_BOTTOM_SIZE);
-        }
-        else
-        {
-            scrollpos = m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_TOP_SIZE);
-        }
-    }
-
-    // Find the child that is partially shown or just beyond the scroll position
-    for(wxWindowList::compatibility_iterator
-            node = scrollForward ? GetChildren().GetFirst()
-                                 : GetChildren().GetLast();
-        node;
-        node = scrollForward ? node->GetNext()
-                             : node->GetPrevious())
-    {
-        wxWindow* child = node->GetData();
-        child->GetSize(&width, &height);
-        child->GetPosition(&x, &y);
-        int pos0 = 0;
-        int pos1 = 0;
-        if (major_axis == wxHORIZONTAL)
-        {
-            pos0 = x;
-            pos1 = x + width + gap;
-        }
-        else
-        {
-            pos0 = y;
-            pos1 = y + height + gap;
-        }
-        if (scrollpos >= pos0 && scrollpos <= pos1)
-        {
-            // This section is partially visible, scroll to make it fully visible.
-            if (scrollForward)
-            {
-                pixels += pos1 - scrollpos;
-            }
-            else
-            {
-                pixels += pos0 - scrollpos;
-            }
-            if (abs(pixels) >= abs(minscroll))
-                break;
-        }
-        if (scrollpos <= pos0 && scrollForward)
-        {
-            // This section is next, scroll the entire section width
-            pixels += (pos1 - pos0);
-            break;
-        }
-        if (scrollpos >= pos1 && !scrollForward)
-        {
-            // This section is next, scroll the entire section width
-            pixels += (pos0 - pos1);
-            break;
-        }
-    }
-    // Do a final safety sanity check, should not be necessary, but will not hurt either.
-    if (pixels == 0)
-    {
-        pixels = minscroll;
-    }
-    if (pixels * minscroll < 0)
-    {
-        pixels = -pixels;
-    }
-
-    return ScrollPixels(pixels);
-}
-
-void wxRibbonPage::SetSizeWithScrollButtonAdjustment(int x, int y, int width, int height)
-{
-    if(m_scroll_buttons_visible)
-    {
-        if(GetMajorAxis() == wxHORIZONTAL)
-        {
-            if(m_scroll_left_btn)
-            {
-                int w = m_scroll_left_btn->GetSize().GetWidth();
-                m_scroll_left_btn->SetPosition(wxPoint(x, y));
-                x += w;
-                width -= w;
-            }
-            if(m_scroll_right_btn)
-            {
-                int w = m_scroll_right_btn->GetSize().GetWidth();
-                width -= w;
-                m_scroll_right_btn->SetPosition(wxPoint(x + width, y));
-            }
-        }
-        else
-        {
-            if(m_scroll_left_btn)
-            {
-                int h = m_scroll_left_btn->GetSize().GetHeight();
-                m_scroll_left_btn->SetPosition(wxPoint(x, y));
-                y += h;
-                height -= h;
-            }
-            if(m_scroll_right_btn)
-            {
-                int h = m_scroll_right_btn->GetSize().GetHeight();
-                height -= h;
-                m_scroll_right_btn->SetPosition(wxPoint(x, y + height));
-            }
-        }
-    }
-    if (width < 0) width = 0;
-    if (height < 0) height = 0;
-    SetSize(x, y, width, height);
-}
-
-void wxRibbonPage::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    // When a resize triggers the scroll buttons to become visible, the page is resized.
-    // This resize from within a resize event can cause (MSW) wxWidgets some confusion,
-    // and report the 1st size to the 2nd size event. Hence the most recent size is
-    // remembered internally and used in Layout() where appropriate.
-
-    if(GetMajorAxis() == wxHORIZONTAL)
-    {
-        m_size_in_major_axis_for_children = width;
-        if(m_scroll_buttons_visible)
-        {
-            if(m_scroll_left_btn)
-                m_size_in_major_axis_for_children += m_scroll_left_btn->GetSize().GetWidth();
-            if(m_scroll_right_btn)
-                m_size_in_major_axis_for_children += m_scroll_right_btn->GetSize().GetWidth();
-        }
-    }
-    else
-    {
-        m_size_in_major_axis_for_children = height;
-        if(m_scroll_buttons_visible)
-        {
-            if(m_scroll_left_btn)
-                m_size_in_major_axis_for_children += m_scroll_left_btn->GetSize().GetHeight();
-            if(m_scroll_right_btn)
-                m_size_in_major_axis_for_children += m_scroll_right_btn->GetSize().GetHeight();
-        }
-    }
-
-    wxRibbonControl::DoSetSize(x, y, width, height, sizeFlags);
-}
-
-void wxRibbonPage::OnSize(wxSizeEvent& evt)
-{
-    wxSize new_size = evt.GetSize();
-
-    if (m_art)
-    {
-        wxMemoryDC temp_dc;
-        wxRect invalid_rect = m_art->GetPageBackgroundRedrawArea(temp_dc, this, m_old_size, new_size);
-        Refresh(true, &invalid_rect);
-    }
-
-    m_old_size = new_size;
-
-    if(new_size.GetX() > 0 && new_size.GetY() > 0)
-    {
-        Layout();
-    }
-    else
-    {
-        // Simplify other calculations by pretending new size is zero in both
-        // X and Y
-        new_size.Set(0, 0);
-        // When size == 0, no point in doing any layout
-    }
-
-    evt.Skip();
-}
-
-void wxRibbonPage::RemoveChild(wxWindowBase *child)
-{
-    // Remove all references to the child from the collapse stack
-    size_t count = m_collapse_stack.GetCount();
-    size_t src, dst;
-    for(src = 0, dst = 0; src < count; ++src, ++dst)
-    {
-        wxRibbonControl *item = m_collapse_stack.Item(src);
-        if(item == child)
-        {
-            ++src;
-            if(src == count)
-            {
-                break;
-            }
-        }
-        if(src != dst)
-        {
-            m_collapse_stack.Item(dst) = item;
-        }
-    }
-    if(src > dst)
-    {
-        m_collapse_stack.RemoveAt(dst, src - dst);
-    }
-
-    // ... and then proceed as normal
-    wxRibbonControl::RemoveChild(child);
-}
-
-bool wxRibbonPage::Realize()
-{
-    bool status = true;
-
-    m_collapse_stack.Clear();
-    for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-                  node;
-                  node = node->GetNext())
-    {
-        wxRibbonControl* child = wxDynamicCast(node->GetData(), wxRibbonControl);
-        if(child == NULL)
-        {
-            continue;
-        }
-        if(!child->Realize())
-        {
-            status = false;
-        }
-    }
-    PopulateSizeCalcArray(&wxWindow::GetMinSize);
-
-    return DoActualLayout() && status;
-}
-
-void wxRibbonPage::PopulateSizeCalcArray(wxSize (wxWindow::*get_size)(void) const)
-{
-    wxSize parentSize = GetSize();
-    parentSize.x -= m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_LEFT_SIZE);
-    parentSize.x -= m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_RIGHT_SIZE);
-    parentSize.y -= m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_TOP_SIZE);
-    parentSize.y -= m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_BOTTOM_SIZE);
-
-    if(m_size_calc_array_size != GetChildren().GetCount())
-    {
-        delete[] m_size_calc_array;
-        m_size_calc_array_size = GetChildren().GetCount();
-        m_size_calc_array = new wxSize[m_size_calc_array_size];
-    }
-
-    wxSize* node_size = m_size_calc_array;
-    for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-          node;
-          node = node->GetNext(), ++node_size )
-    {
-        wxWindow* child = node->GetData();
-        wxRibbonPanel* panel = wxDynamicCast(child, wxRibbonPanel);
-        if (panel && panel->GetFlags() & wxRIBBON_PANEL_FLEXIBLE)
-            *node_size = panel->GetBestSizeForParentSize(parentSize);
-        else
-            *node_size = (child->*get_size)();
-    }
-}
-
-bool wxRibbonPage::Layout()
-{
-    if(GetChildren().GetCount() == 0)
-    {
-        return true;
-    }
-    else
-    {
-        PopulateSizeCalcArray(&wxWindow::GetSize);
-        return DoActualLayout();
-    }
-}
-
-bool wxRibbonPage::DoActualLayout()
-{
-    wxPoint origin(m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_LEFT_SIZE), m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_TOP_SIZE));
-    wxOrientation major_axis = GetMajorAxis();
-    int gap;
-    int minor_axis_size;
-    int available_space;
-    if(major_axis == wxHORIZONTAL)
-    {
-        gap = m_art->GetMetric(wxRIBBON_ART_PANEL_X_SEPARATION_SIZE);
-        minor_axis_size = GetSize().GetHeight() - origin.y - m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_BOTTOM_SIZE);
-        available_space = m_size_in_major_axis_for_children - m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_RIGHT_SIZE) - origin.x;
-    }
-    else
-    {
-        gap = m_art->GetMetric(wxRIBBON_ART_PANEL_Y_SEPARATION_SIZE);
-        minor_axis_size = GetSize().GetWidth() - origin.x - m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_RIGHT_SIZE);
-        available_space = m_size_in_major_axis_for_children - m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_BOTTOM_SIZE) - origin.y;
-    }
-    if (minor_axis_size < 0) minor_axis_size = 0;
-    size_t size_index;
-    for(size_index = 0; size_index < m_size_calc_array_size; ++size_index)
-    {
-        if(major_axis == wxHORIZONTAL)
-        {
-            available_space -= m_size_calc_array[size_index].GetWidth();
-            m_size_calc_array[size_index].SetHeight(minor_axis_size);
-        }
-        else
-        {
-            available_space -= m_size_calc_array[size_index].GetHeight();
-            m_size_calc_array[size_index].SetWidth(minor_axis_size);
-        }
-        if(size_index != 0)
-            available_space -= gap;
-    }
-    bool todo_hide_scroll_buttons = false;
-    bool todo_show_scroll_buttons = false;
-    if(available_space >= 0)
-    {
-        if(m_scroll_buttons_visible)
-            todo_hide_scroll_buttons = true;
-        if(available_space > 0)
-            ExpandPanels(major_axis, available_space);
-    }
-    else
-    {
-        if(m_scroll_buttons_visible)
-        {
-            // Scroll buttons already visible - not going to be able to downsize any more
-            m_scroll_amount_limit = -available_space;
-            if(m_scroll_amount > m_scroll_amount_limit)
-            {
-                m_scroll_amount = m_scroll_amount_limit;
-                todo_show_scroll_buttons = true;
-            }
-        }
-        else
-        {
-            if(!CollapsePanels(major_axis, -available_space))
-            {
-                m_scroll_amount = 0;
-                m_scroll_amount_limit = -available_space;
-                todo_show_scroll_buttons = true;
-            }
-        }
-    }
-    if(m_scroll_buttons_visible)
-    {
-        if(major_axis == wxHORIZONTAL)
-        {
-            origin.x -= m_scroll_amount;
-            if(m_scroll_left_btn)
-                origin.x -= m_scroll_left_btn->GetSize().GetWidth();
-        }
-        else
-        {
-            origin.y -= m_scroll_amount;
-            if(m_scroll_left_btn)
-                origin.y -= m_scroll_left_btn->GetSize().GetHeight();
-        }
-    }
-    size_index = 0;
-    for(wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-        node;
-        node = node->GetNext(), ++size_index )
-    {
-        wxWindow* child = node->GetData();
-        int w = m_size_calc_array[size_index].GetWidth();
-        int h = m_size_calc_array[size_index].GetHeight();
-        child->SetSize(origin.x, origin.y, w, h);
-        if(major_axis == wxHORIZONTAL)
-        {
-            origin.x += w + gap;
-        }
-        else
-        {
-            origin.y += h + gap;
-        }
-    }
-
-    if(todo_show_scroll_buttons)
-        ShowScrollButtons();
-    else if(todo_hide_scroll_buttons)
-        HideScrollButtons();
-    else if(m_scroll_buttons_visible)
-        ShowScrollButtons();
-
-    Refresh();
-    return true;
-}
-
-bool wxRibbonPage::Show(bool show)
-{
-    if(m_scroll_left_btn)
-        m_scroll_left_btn->Show(show);
-    if(m_scroll_right_btn)
-        m_scroll_right_btn->Show(show);
-    return wxRibbonControl::Show(show);
-}
-
-void wxRibbonPage::HideScrollButtons()
-{
-    m_scroll_amount = 0;
-    m_scroll_amount_limit = 0;
-    ShowScrollButtons();
-}
-
-void wxRibbonPage::ShowScrollButtons()
-{
-    bool show_left = true;
-    bool show_right = true;
-    bool reposition = false;
-    if(m_scroll_amount == 0)
-    {
-        show_left = false;
-    }
-    if(m_scroll_amount >= m_scroll_amount_limit)
-    {
-        show_right = false;
-        m_scroll_amount = m_scroll_amount_limit;
-    }
-    m_scroll_buttons_visible = show_left || show_right;
-
-    if(show_left)
-    {
-        wxMemoryDC temp_dc;
-        wxSize size;
-        long direction;
-        if(GetMajorAxis() == wxHORIZONTAL)
-        {
-              direction = wxRIBBON_SCROLL_BTN_LEFT;
-              size = m_art->GetScrollButtonMinimumSize(temp_dc, GetParent(), direction);
-              size.SetHeight(GetSize().GetHeight());
-        }
-        else
-        {
-              direction = wxRIBBON_SCROLL_BTN_UP;
-              size = m_art->GetScrollButtonMinimumSize(temp_dc, GetParent(), direction);
-              size.SetWidth(GetSize().GetWidth());
-        }
-        if (m_scroll_left_btn)
-        {
-              m_scroll_left_btn->SetSize(size);
-        }
-        else
-        {
-              m_scroll_left_btn = new wxRibbonPageScrollButton(this, wxID_ANY, GetPosition(), size, direction);
-              reposition = true;
-        }
-        if(!IsShown())
-        {
-              m_scroll_left_btn->Hide();
-        }
-    }
-    else
-    {
-        if(m_scroll_left_btn != NULL)
-        {
-            m_scroll_left_btn->Destroy();
-            m_scroll_left_btn = NULL;
-            reposition = true;
-        }
-    }
-
-    if(show_right)
-    {
-        wxMemoryDC temp_dc;
-        wxSize size;
-        long direction;
-        if(GetMajorAxis() == wxHORIZONTAL)
-        {
-              direction = wxRIBBON_SCROLL_BTN_RIGHT;
-              size = m_art->GetScrollButtonMinimumSize(temp_dc, GetParent(), direction);
-              size.SetHeight(GetSize().GetHeight());
-        }
-        else
-        {
-              direction = wxRIBBON_SCROLL_BTN_DOWN;
-              size = m_art->GetScrollButtonMinimumSize(temp_dc, GetParent(), direction);
-              size.SetWidth(GetSize().GetWidth());
-        }
-        wxPoint initial_pos = GetPosition() + GetSize() - size;
-        if (m_scroll_right_btn)
-        {
-              m_scroll_right_btn->SetSize(size);
-        }
-        else
-        {
-              m_scroll_right_btn = new wxRibbonPageScrollButton(this, wxID_ANY, initial_pos, size, direction);
-              reposition = true;
-        }
-        if(!IsShown())
-        {
-              m_scroll_right_btn->Hide();
-        }
-    }
-    else
-    {
-        if(m_scroll_right_btn != NULL)
-        {
-            m_scroll_right_btn->Destroy();
-            m_scroll_right_btn = NULL;
-            reposition = true;
-        }
-    }
-
-    if(reposition)
-    {
-        wxDynamicCast(GetParent(), wxRibbonBar)->RepositionPage(this);
-    }
-}
-
-static int GetSizeInOrientation(wxSize size, wxOrientation orientation)
-{
-    switch(orientation)
-    {
-    case wxHORIZONTAL: return size.GetWidth();
-    case wxVERTICAL: return size.GetHeight();
-    case wxBOTH: return size.GetWidth() * size.GetHeight();
-    default: return 0;
-    }
-}
-
-bool wxRibbonPage::ExpandPanels(wxOrientation direction, int maximum_amount)
-{
-    bool expanded_something = false;
-    while(maximum_amount > 0)
-    {
-        int smallest_size = INT_MAX;
-        wxRibbonPanel* smallest_panel = NULL;
-        wxSize* smallest_panel_size = NULL;
-        wxSize* panel_size = m_size_calc_array;
-        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-                  node;
-                  node = node->GetNext(), ++panel_size )
-        {
-            wxRibbonPanel* panel = wxDynamicCast(node->GetData(), wxRibbonPanel);
-            if(panel == NULL)
-            {
-                continue;
-            }
-            if (panel->GetFlags() & wxRIBBON_PANEL_FLEXIBLE)
-            {
-                // Don't change if it's flexible since we already calculated the
-                // correct size for the panel.
-            }
-            else if(panel->IsSizingContinuous())
-            {
-                int size = GetSizeInOrientation(*panel_size, direction);
-                if(size < smallest_size)
-                {
-                    smallest_size = size;
-                    smallest_panel = panel;
-                    smallest_panel_size = panel_size;
-                }
-            }
-            else
-            {
-                int size = GetSizeInOrientation(*panel_size, direction);
-                if(size < smallest_size)
-                {
-                    wxSize larger = panel->GetNextLargerSize(direction, *panel_size);
-                    if(larger != (*panel_size) && GetSizeInOrientation(larger, direction) > size)
-                    {
-                        smallest_size = size;
-                        smallest_panel = panel;
-                        smallest_panel_size = panel_size;
-                    }
-                }
-            }
-        }
-        if(smallest_panel != NULL)
-        {
-            if(smallest_panel->IsSizingContinuous())
-            {
-                int amount = maximum_amount;
-                if(amount > 32)
-                {
-                    // For "large" growth, grow this panel a bit, and then re-allocate
-                    // the remainder (which may come to this panel again anyway)
-                    amount = 32;
-                }
-                if(direction & wxHORIZONTAL)
-                {
-                    smallest_panel_size->x += amount;
-                }
-                if(direction & wxVERTICAL)
-                {
-                    smallest_panel_size->y += amount;
-                }
-                maximum_amount -= amount;
-                m_collapse_stack.Add(smallest_panel);
-                expanded_something = true;
-            }
-            else
-            {
-                wxSize larger = smallest_panel->GetNextLargerSize(direction, *smallest_panel_size);
-                wxSize delta = larger - (*smallest_panel_size);
-                if(GetSizeInOrientation(delta, direction) <= maximum_amount)
-                {
-                    *smallest_panel_size = larger;
-                    maximum_amount -= GetSizeInOrientation(delta, direction);
-                    m_collapse_stack.Add(smallest_panel);
-                    expanded_something = true;
-                }
-                else
-                {
-                    break;
-                }
-            }
-        }
-        else
-        {
-            break;
-        }
-    }
-    return expanded_something;
-}
-
-bool wxRibbonPage::CollapsePanels(wxOrientation direction, int minimum_amount)
-{
-    bool collapsed_something = false;
-    while(minimum_amount > 0)
-    {
-        int largest_size = 0;
-        wxRibbonPanel* largest_panel = NULL;
-        wxSize* largest_panel_size = NULL;
-        wxSize* panel_size = m_size_calc_array;
-        if(!m_collapse_stack.IsEmpty())
-        {
-            // For a more consistent panel layout, try to collapse panels which
-            // were recently expanded.
-            largest_panel = wxDynamicCast(m_collapse_stack.Last(), wxRibbonPanel);
-            m_collapse_stack.RemoveAt(m_collapse_stack.GetCount() - 1);
-            for(wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-                      node;
-                      node = node->GetNext(), ++panel_size )
-            {
-                wxRibbonPanel* panel = wxDynamicCast(node->GetData(), wxRibbonPanel);
-                if(panel == largest_panel)
-                {
-                    largest_panel_size = panel_size;
-                    break;
-                }
-            }
-        }
-        else
-        {
-            for(wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-                      node;
-                      node = node->GetNext(), ++panel_size )
-            {
-                wxRibbonPanel* panel = wxDynamicCast(node->GetData(), wxRibbonPanel);
-                if(panel == NULL)
-                {
-                    continue;
-                }
-                if(panel->IsSizingContinuous())
-                {
-                    int size = GetSizeInOrientation(*panel_size, direction);
-                    if(size > largest_size)
-                    {
-                        largest_size = size;
-                        largest_panel = panel;
-                        largest_panel_size = panel_size;
-                    }
-                }
-                else
-                {
-                    int size = GetSizeInOrientation(*panel_size, direction);
-                    if(size > largest_size)
-                    {
-                        wxSize smaller = panel->GetNextSmallerSize(direction, *panel_size);
-                        if(smaller != (*panel_size) &&
-                            GetSizeInOrientation(smaller, direction) < size)
-                        {
-                            largest_size = size;
-                            largest_panel = panel;
-                            largest_panel_size = panel_size;
-                        }
-                    }
-                }
-            }
-        }
-        if(largest_panel != NULL)
-        {
-            if(largest_panel->IsSizingContinuous())
-            {
-                int amount = minimum_amount;
-                if(amount > 32)
-                {
-                    // For "large" contraction, reduce this panel a bit, and
-                    // then re-allocate the remainder of the quota (which may
-                    // come to this panel again anyway)
-                    amount = 32;
-                }
-                if(direction & wxHORIZONTAL)
-                {
-                    largest_panel_size->x -= amount;
-                }
-                if(direction & wxVERTICAL)
-                {
-                    largest_panel_size->y -= amount;
-                }
-                minimum_amount -= amount;
-                collapsed_something = true;
-            }
-            else
-            {
-                wxSize smaller = largest_panel->GetNextSmallerSize(direction, *largest_panel_size);
-                wxSize delta = (*largest_panel_size) - smaller;
-                *largest_panel_size = smaller;
-                minimum_amount -= GetSizeInOrientation(delta, direction);
-                collapsed_something = true;
-            }
-        }
-        else
-        {
-            break;
-        }
-    }
-    return collapsed_something;
-}
-
-bool wxRibbonPage::DismissExpandedPanel()
-{
-    for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-              node;
-              node = node->GetNext() )
-    {
-        wxRibbonPanel* panel = wxDynamicCast(node->GetData(), wxRibbonPanel);
-        if(panel == NULL)
-        {
-            continue;
-        }
-        if(panel->GetExpandedPanel() != NULL)
-        {
-            return panel->HideExpanded();
-        }
-    }
-    return false;
-}
-
-wxSize wxRibbonPage::GetMinSize() const
-{
-    wxSize min(wxDefaultCoord, wxDefaultCoord);
-
-    for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxWindow* child = node->GetData();
-        wxSize child_min(child->GetMinSize());
-
-        min.x = wxMax(min.x, child_min.x);
-        min.y = wxMax(min.y, child_min.y);
-    }
-
-    if(GetMajorAxis() == wxHORIZONTAL)
-    {
-        min.x = wxDefaultCoord;
-        if(min.y != wxDefaultCoord)
-        {
-            min.y += m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_TOP_SIZE) + m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_BOTTOM_SIZE);
-        }
-    }
-    else
-    {
-        if(min.x != wxDefaultCoord)
-        {
-            min.x += m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_LEFT_SIZE) + m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_RIGHT_SIZE);
-        }
-        min.y = wxDefaultCoord;
-    }
-
-    return min;
-}
-
-wxSize wxRibbonPage::DoGetBestSize() const
-{
-    wxSize best(0, 0);
-    size_t count = 0;
-
-    if(GetMajorAxis() == wxHORIZONTAL)
-    {
-        best.y = wxDefaultCoord;
-
-        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-          node;
-          node = node->GetNext() )
-        {
-            wxWindow* child = node->GetData();
-            wxSize child_best(child->GetBestSize());
-
-            if(child_best.x != wxDefaultCoord)
-            {
-                best.IncBy(child_best.x, 0);
-            }
-            best.y = wxMax(best.y, child_best.y);
-
-            ++count;
-        }
-
-        if(count > 1)
-        {
-            best.IncBy((count - 1) * m_art->GetMetric(wxRIBBON_ART_PANEL_X_SEPARATION_SIZE), 0);
-        }
-    }
-    else
-    {
-        best.x = wxDefaultCoord;
-
-        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-          node;
-          node = node->GetNext() )
-        {
-            wxWindow* child = node->GetData();
-            wxSize child_best(child->GetBestSize());
-
-            best.x = wxMax(best.x, child_best.x);
-            if(child_best.y != wxDefaultCoord)
-            {
-                best.IncBy(0, child_best.y);
-            }
-
-            ++count;
-        }
-
-        if(count > 1)
-        {
-            best.IncBy(0, (count - 1) * m_art->GetMetric(wxRIBBON_ART_PANEL_Y_SEPARATION_SIZE));
-        }
-    }
-
-    if(best.x != wxDefaultCoord)
-    {
-        best.x += m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_LEFT_SIZE) + m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_RIGHT_SIZE);
-    }
-    if(best.y != wxDefaultCoord)
-    {
-        best.y += m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_TOP_SIZE) + m_art->GetMetric(wxRIBBON_ART_PAGE_BORDER_BOTTOM_SIZE);
-    }
-    return best;
-}
-
-void wxRibbonPage::HideIfExpanded()
-{
-    wxStaticCast(m_parent, wxRibbonBar)->HideIfExpanded();
-}
-
-#endif // wxUSE_RIBBON
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/panel.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/panel.cpp
deleted file mode 100644
index fd354bf38f..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/panel.cpp
+++ /dev/null
@@ -1,1106 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/ribbon/panel.cpp
-// Purpose:     Ribbon-style container for a group of related tools / controls
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-05-25
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_RIBBON
-
-#include "wx/ribbon/panel.h"
-#include "wx/ribbon/art.h"
-#include "wx/ribbon/bar.h"
-#include "wx/dcbuffer.h"
-#include "wx/display.h"
-#include "wx/sizer.h"
-
-#ifndef WX_PRECOMP
-#include "wx/frame.h"
-#endif
-
-#ifdef __WXMSW__
-#include "wx/msw/private.h"
-#endif
-
-wxDEFINE_EVENT(wxEVT_RIBBONPANEL_EXTBUTTON_ACTIVATED, wxRibbonPanelEvent);
-
-IMPLEMENT_DYNAMIC_CLASS(wxRibbonPanelEvent, wxCommandEvent)
-
-IMPLEMENT_CLASS(wxRibbonPanel, wxRibbonControl)
-
-BEGIN_EVENT_TABLE(wxRibbonPanel, wxRibbonControl)
-    EVT_ENTER_WINDOW(wxRibbonPanel::OnMouseEnter)
-    EVT_ERASE_BACKGROUND(wxRibbonPanel::OnEraseBackground)
-    EVT_KILL_FOCUS(wxRibbonPanel::OnKillFocus)
-    EVT_LEAVE_WINDOW(wxRibbonPanel::OnMouseLeave)
-    EVT_MOTION(wxRibbonPanel::OnMotion)
-    EVT_LEFT_DOWN(wxRibbonPanel::OnMouseClick)
-    EVT_PAINT(wxRibbonPanel::OnPaint)
-    EVT_SIZE(wxRibbonPanel::OnSize)
-END_EVENT_TABLE()
-
-wxRibbonPanel::wxRibbonPanel() : m_expanded_dummy(NULL), m_expanded_panel(NULL)
-{
-}
-
-wxRibbonPanel::wxRibbonPanel(wxWindow* parent,
-                  wxWindowID id,
-                  const wxString& label,
-                  const wxBitmap& minimised_icon,
-                  const wxPoint& pos,
-                  const wxSize& size,
-                  long style)
-    : wxRibbonControl(parent, id, pos, size, wxBORDER_NONE)
-{
-    CommonInit(label, minimised_icon, style);
-}
-
-wxRibbonPanel::~wxRibbonPanel()
-{
-    if(m_expanded_panel)
-    {
-        m_expanded_panel->m_expanded_dummy = NULL;
-        m_expanded_panel->GetParent()->Destroy();
-    }
-}
-
-bool wxRibbonPanel::Create(wxWindow* parent,
-                wxWindowID id,
-                const wxString& label,
-                const wxBitmap& icon,
-                const wxPoint& pos,
-                const wxSize& size,
-                long style)
-{
-    if(!wxRibbonControl::Create(parent, id, pos, size, wxBORDER_NONE))
-    {
-        return false;
-    }
-
-    CommonInit(label, icon, style);
-
-    return true;
-}
-
-void wxRibbonPanel::SetArtProvider(wxRibbonArtProvider* art)
-{
-    m_art = art;
-    for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-          node;
-          node = node->GetNext() )
-    {
-        wxWindow* child = node->GetData();
-        wxRibbonControl* ribbon_child = wxDynamicCast(child, wxRibbonControl);
-        if(ribbon_child)
-        {
-            ribbon_child->SetArtProvider(art);
-        }
-    }
-    if(m_expanded_panel)
-        m_expanded_panel->SetArtProvider(art);
-}
-
-void wxRibbonPanel::CommonInit(const wxString& label, const wxBitmap& icon, long style)
-{
-    SetName(label);
-    SetLabel(label);
-
-    m_minimised_size = wxDefaultSize; // Unknown / none
-    m_smallest_unminimised_size = wxDefaultSize;// Unknown / none for IsFullySpecified()
-    m_preferred_expand_direction = wxSOUTH;
-    m_expanded_dummy = NULL;
-    m_expanded_panel = NULL;
-    m_flags = style;
-    m_minimised_icon = icon;
-    m_minimised = false;
-    m_hovered = false;
-    m_ext_button_hovered = false;
-
-    if(m_art == NULL)
-    {
-        wxRibbonControl* parent = wxDynamicCast(GetParent(), wxRibbonControl);
-        if(parent != NULL)
-        {
-            m_art = parent->GetArtProvider();
-        }
-    }
-
-    SetAutoLayout(true);
-    SetBackgroundStyle(wxBG_STYLE_CUSTOM);
-    SetMinSize(wxSize(20, 20));
-}
-
-bool wxRibbonPanel::IsMinimised() const
-{
-    return m_minimised;
-}
-
-bool wxRibbonPanel::IsHovered() const
-{
-    return m_hovered;
-}
-
-bool wxRibbonPanel::IsExtButtonHovered() const
-{
-    return m_ext_button_hovered;
-}
-
-void wxRibbonPanel::OnMouseEnter(wxMouseEvent& evt)
-{
-    TestPositionForHover(evt.GetPosition());
-}
-
-void wxRibbonPanel::OnMouseEnterChild(wxMouseEvent& evt)
-{
-    wxPoint pos = evt.GetPosition();
-    wxWindow *child = wxDynamicCast(evt.GetEventObject(), wxWindow);
-    if(child)
-    {
-        pos += child->GetPosition();
-        TestPositionForHover(pos);
-    }
-    evt.Skip();
-}
-
-void wxRibbonPanel::OnMouseLeave(wxMouseEvent& evt)
-{
-    TestPositionForHover(evt.GetPosition());
-}
-
-void wxRibbonPanel::OnMouseLeaveChild(wxMouseEvent& evt)
-{
-    wxPoint pos = evt.GetPosition();
-    wxWindow *child = wxDynamicCast(evt.GetEventObject(), wxWindow);
-    if(child)
-    {
-        pos += child->GetPosition();
-        TestPositionForHover(pos);
-    }
-    evt.Skip();
-}
-
-void wxRibbonPanel::OnMotion(wxMouseEvent& evt)
-{
-    TestPositionForHover(evt.GetPosition());
-}
-
-void wxRibbonPanel::TestPositionForHover(const wxPoint& pos)
-{
-    bool hovered = false, ext_button_hovered = false;
-    if(pos.x >= 0 && pos.y >= 0)
-    {
-        wxSize size = GetSize();
-        if(pos.x < size.GetWidth() && pos.y < size.GetHeight())
-        {
-            hovered = true;
-        }
-    }
-    if(hovered)
-    {
-        if(HasExtButton())
-            ext_button_hovered = m_ext_button_rect.Contains(pos);
-        else
-            ext_button_hovered = false;
-    }
-    if(hovered != m_hovered || ext_button_hovered != m_ext_button_hovered)
-    {
-        m_hovered = hovered;
-        m_ext_button_hovered = ext_button_hovered;
-        Refresh(false);
-    }
-}
-
-void wxRibbonPanel::AddChild(wxWindowBase *child)
-{
-    wxRibbonControl::AddChild(child);
-
-    // Window enter / leave events count for only the window in question, not
-    // for children of the window. The panel wants to be in the hovered state
-    // whenever the mouse cursor is within its boundary, so the events need to
-    // be attached to children too.
-    child->Connect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(wxRibbonPanel::OnMouseEnterChild), NULL, this);
-    child->Connect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(wxRibbonPanel::OnMouseLeaveChild), NULL, this);
-}
-
-void wxRibbonPanel::RemoveChild(wxWindowBase *child)
-{
-    child->Disconnect(wxEVT_ENTER_WINDOW, wxMouseEventHandler(wxRibbonPanel::OnMouseEnterChild), NULL, this);
-    child->Disconnect(wxEVT_LEAVE_WINDOW, wxMouseEventHandler(wxRibbonPanel::OnMouseLeaveChild), NULL, this);
-
-    wxRibbonControl::RemoveChild(child);
-}
-
-bool wxRibbonPanel::HasExtButton()const
-{
-    wxRibbonBar* bar = GetAncestorRibbonBar();
-    if(bar==NULL)
-        return false;
-    return (m_flags & wxRIBBON_PANEL_EXT_BUTTON) &&
-        (bar->GetWindowStyleFlag() & wxRIBBON_BAR_SHOW_PANEL_EXT_BUTTONS);
-}
-
-void wxRibbonPanel::OnSize(wxSizeEvent& evt)
-{
-    if(GetAutoLayout())
-        Layout();
-
-    evt.Skip();
-}
-
-void wxRibbonPanel::DoSetSize(int x, int y, int width, int height, int sizeFlags)
-{
-    // At least on MSW, changing the size of a window will cause GetSize() to
-    // report the new size, but a size event may not be handled immediately.
-    // If this minimised check was performed in the OnSize handler, then
-    // GetSize() could return a size much larger than the minimised size while
-    // IsMinimised() returns true. This would then affect layout, as the panel
-    // will refuse to grow any larger while in limbo between minimised and non.
-
-    bool minimised = (m_flags & wxRIBBON_PANEL_NO_AUTO_MINIMISE) == 0 &&
-        IsMinimised(wxSize(width, height)); // check if would be at this size
-    if(minimised != m_minimised)
-    {
-        m_minimised = minimised;
-        // Note that for sizers, this routine disallows the use of mixed shown
-        // and hidden controls
-        // TODO ? use some list of user set invisible children to restore status.
-        for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-                  node;
-                  node = node->GetNext())
-        {
-            node->GetData()->Show(!minimised);
-        }
-
-        Refresh();
-    }
-
-    wxRibbonControl::DoSetSize(x, y, width, height, sizeFlags);
-}
-
-// Checks if panel would be minimised at (client size) at_size
-bool wxRibbonPanel::IsMinimised(wxSize at_size) const
-{
-    if(GetSizer())
-    {
-        // we have no information on size change direction
-        // so check both
-        wxSize size = GetMinNotMinimisedSize();
-        if(size.x > at_size.x || size.y > at_size.y)
-            return true;
-
-        return false;
-    }
-
-    if(!m_minimised_size.IsFullySpecified())
-        return false;
-
-    return (at_size.GetX() <= m_minimised_size.GetX() &&
-        at_size.GetY() <= m_minimised_size.GetY()) ||
-        at_size.GetX() < m_smallest_unminimised_size.GetX() ||
-        at_size.GetY() < m_smallest_unminimised_size.GetY();
-}
-
-void wxRibbonPanel::OnEraseBackground(wxEraseEvent& WXUNUSED(evt))
-{
-    // All painting done in main paint handler to minimise flicker
-}
-
-void wxRibbonPanel::OnPaint(wxPaintEvent& WXUNUSED(evt))
-{
-    wxAutoBufferedPaintDC dc(this);
-
-    if(m_art != NULL)
-    {
-        if(IsMinimised())
-        {
-            m_art->DrawMinimisedPanel(dc, this, GetSize(), m_minimised_icon_resized);
-        }
-        else
-        {
-            m_art->DrawPanelBackground(dc, this, GetSize());
-        }
-    }
-}
-
-bool wxRibbonPanel::IsSizingContinuous() const
-{
-    // A panel never sizes continuously, even if all of its children can,
-    // as it would appear out of place along side non-continuous panels.
-
-    // JS 2012-03-09: introducing wxRIBBON_PANEL_STRETCH to allow
-    // the panel to fill its parent page. For example we might have
-    // a list of styles in one of the pages, which should stretch to
-    // fill available space.
-    return (m_flags & wxRIBBON_PANEL_STRETCH) != 0;
-}
-
-// Finds the best width and height given the parent's width and height
-wxSize wxRibbonPanel::GetBestSizeForParentSize(const wxSize& parentSize) const
-{
-    if (GetChildren().GetCount() == 1)
-    {
-        wxWindow* win = GetChildren().GetFirst()->GetData();
-        wxRibbonControl* control = wxDynamicCast(win, wxRibbonControl);
-        if (control)
-        {
-            wxClientDC temp_dc((wxRibbonPanel*) this);
-            wxSize clientParentSize = m_art->GetPanelClientSize(temp_dc, this, parentSize, NULL);
-            wxSize childSize = control->GetBestSizeForParentSize(clientParentSize);
-            wxSize overallSize = m_art->GetPanelSize(temp_dc, this, childSize, NULL);
-            return overallSize;
-        }
-    }
-    return GetSize();
-}
-
-wxSize wxRibbonPanel::DoGetNextSmallerSize(wxOrientation direction,
-                                         wxSize relative_to) const
-{
-    if(m_expanded_panel != NULL)
-    {
-        // Next size depends upon children, who are currently in the
-        // expanded panel
-        return m_expanded_panel->DoGetNextSmallerSize(direction, relative_to);
-    }
-
-    if(m_art != NULL)
-    {
-        wxClientDC dc((wxRibbonPanel*) this);
-        wxSize child_relative = m_art->GetPanelClientSize(dc, this, relative_to, NULL);
-        wxSize smaller(-1, -1);
-        bool minimise = false;
-
-        if(GetSizer())
-        {
-            // Get smallest non minimised size
-            smaller = GetMinSize();
-            // and adjust to child_relative for parent page
-            if(m_art->GetFlags() & wxRIBBON_BAR_FLOW_VERTICAL)
-            {
-                 minimise = (child_relative.y <= smaller.y);
-                 if(smaller.x < child_relative.x)
-                    smaller.x = child_relative.x;
-            }
-            else
-            {
-                minimise = (child_relative.x <= smaller.x);
-                if(smaller.y < child_relative.y)
-                    smaller.y = child_relative.y;
-            }
-        }
-        else if(GetChildren().GetCount() == 1)
-        {
-            // Simple (and common) case of single ribbon child or Sizer
-            wxWindow* child = GetChildren().Item(0)->GetData();
-            wxRibbonControl* ribbon_child = wxDynamicCast(child, wxRibbonControl);
-            if(ribbon_child != NULL)
-            {
-                smaller = ribbon_child->GetNextSmallerSize(direction, child_relative);
-                minimise = (smaller == child_relative);
-            }
-        }
-
-        if(minimise)
-        {
-            if(CanAutoMinimise())
-            {
-                wxSize minimised = m_minimised_size;
-                switch(direction)
-                {
-                case wxHORIZONTAL:
-                    minimised.SetHeight(relative_to.GetHeight());
-                    break;
-                case wxVERTICAL:
-                    minimised.SetWidth(relative_to.GetWidth());
-                    break;
-                default:
-                    break;
-                }
-                return minimised;
-            }
-            else
-            {
-                return relative_to;
-            }
-        }
-        else if(smaller.IsFullySpecified()) // Use fallback if !(sizer/child = 1)
-        {
-            return m_art->GetPanelSize(dc, this, smaller, NULL);
-        }
-    }
-
-    // Fallback: Decrease by 20% (or minimum size, whichever larger)
-    wxSize current(relative_to);
-    wxSize minimum(GetMinSize());
-    if(direction & wxHORIZONTAL)
-    {
-        current.x = (current.x * 4) / 5;
-        if(current.x < minimum.x)
-        {
-            current.x = minimum.x;
-        }
-    }
-    if(direction & wxVERTICAL)
-    {
-        current.y = (current.y * 4) / 5;
-        if(current.y < minimum.y)
-        {
-            current.y = minimum.y;
-        }
-    }
-    return current;
-}
-
-wxSize wxRibbonPanel::DoGetNextLargerSize(wxOrientation direction,
-                                        wxSize relative_to) const
-{
-    if(m_expanded_panel != NULL)
-    {
-        // Next size depends upon children, who are currently in the
-        // expanded panel
-        return m_expanded_panel->DoGetNextLargerSize(direction, relative_to);
-    }
-
-    if(IsMinimised(relative_to))
-    {
-        wxSize current = relative_to;
-        wxSize min_size = GetMinNotMinimisedSize();
-        switch(direction)
-        {
-        case wxHORIZONTAL:
-            if(min_size.x > current.x && min_size.y == current.y)
-                return min_size;
-            break;
-        case wxVERTICAL:
-            if(min_size.x == current.x && min_size.y > current.y)
-                return min_size;
-            break;
-        case wxBOTH:
-            if(min_size.x > current.x && min_size.y > current.y)
-                return min_size;
-            break;
-        default:
-            break;
-        }
-    }
-
-    if(m_art != NULL)
-    {
-        wxClientDC dc((wxRibbonPanel*) this);
-        wxSize child_relative = m_art->GetPanelClientSize(dc, this, relative_to, NULL);
-        wxSize larger(-1, -1);
-
-        if(GetSizer())
-        {
-            // We could just let the sizer expand in flow direction but see comment
-            // in IsSizingContinuous()
-            larger = GetPanelSizerBestSize();
-            // and adjust for page in non flow direction
-            if(m_art->GetFlags() & wxRIBBON_BAR_FLOW_VERTICAL)
-            {
-                 if(larger.x != child_relative.x)
-                    larger.x = child_relative.x;
-            }
-            else if(larger.y != child_relative.y)
-            {
-                larger.y = child_relative.y;
-            }
-        }
-        else if(GetChildren().GetCount() == 1)
-        {
-            // Simple (and common) case of single ribbon child
-            wxWindow* child = GetChildren().Item(0)->GetData();
-            wxRibbonControl* ribbon_child = wxDynamicCast(child, wxRibbonControl);
-            if(ribbon_child != NULL)
-            {
-                larger = ribbon_child->GetNextLargerSize(direction, child_relative);
-            }
-        }
-
-        if(larger.IsFullySpecified()) // Use fallback if !(sizer/child = 1)
-        {
-            if(larger == child_relative)
-            {
-                return relative_to;
-            }
-            else
-            {
-                return m_art->GetPanelSize(dc, this, larger, NULL);
-            }
-        }
-    }
-
-    // Fallback: Increase by 25% (equal to a prior or subsequent 20% decrease)
-    // Note that due to rounding errors, this increase may not exactly equal a
-    // matching decrease - an ideal solution would not have these errors, but
-    // avoiding them is non-trivial unless an increase is by 100% rather than
-    // a fractional amount. This would then be non-ideal as the resizes happen
-    // at very large intervals.
-    wxSize current(relative_to);
-    if(direction & wxHORIZONTAL)
-    {
-        current.x = (current.x * 5 + 3) / 4;
-    }
-    if(direction & wxVERTICAL)
-    {
-        current.y = (current.y * 5 + 3) / 4;
-    }
-    return current;
-}
-
-bool wxRibbonPanel::CanAutoMinimise() const
-{
-    return (m_flags & wxRIBBON_PANEL_NO_AUTO_MINIMISE) == 0
-        && m_minimised_size.IsFullySpecified();
-}
-
-wxSize wxRibbonPanel::GetMinSize() const
-{
-    if(m_expanded_panel != NULL)
-    {
-        // Minimum size depends upon children, who are currently in the
-        // expanded panel
-        return m_expanded_panel->GetMinSize();
-    }
-
-    if(CanAutoMinimise())
-    {
-        return m_minimised_size;
-    }
-    else
-    {
-        return GetMinNotMinimisedSize();
-    }
-}
-
-wxSize wxRibbonPanel::GetMinNotMinimisedSize() const
-{
-    // Ask sizer if present
-    if(GetSizer())
-    {
-        wxClientDC dc((wxRibbonPanel*) this);
-        return m_art->GetPanelSize(dc, this, GetPanelSizerMinSize(), NULL);
-    }
-    else if(GetChildren().GetCount() == 1)
-    {
-        // Common case of single child taking up the entire panel
-        wxWindow* child = GetChildren().Item(0)->GetData();
-        wxClientDC dc((wxRibbonPanel*) this);
-        return m_art->GetPanelSize(dc, this, child->GetMinSize(), NULL);
-    }
-
-    return wxRibbonControl::GetMinSize();
-}
-
-wxSize wxRibbonPanel::GetPanelSizerMinSize() const
-{
-    // Called from Realize() to set m_smallest_unminimised_size and from other
-    // functions to get the minimum size.
-    // The panel will be invisible when minimised and sizer calcs will be 0
-    // Uses m_smallest_unminimised_size in preference to GetSizer()->CalcMin()
-    // to eliminate flicker.
-
-    // Check if is visible and not previously calculated
-    if(IsShown() && !m_smallest_unminimised_size.IsFullySpecified())
-    {
-         return GetSizer()->CalcMin();
-    }
-    // else use previously calculated m_smallest_unminimised_size
-    wxClientDC dc((wxRibbonPanel*) this);
-    return m_art->GetPanelClientSize(dc,
-                                    this,
-                                    m_smallest_unminimised_size,
-                                    NULL);
-}
-
-wxSize wxRibbonPanel::GetPanelSizerBestSize() const
-{
-    wxSize size = GetPanelSizerMinSize();
-    // TODO allow panel to increase its size beyond minimum size
-    // by steps similarly to ribbon control panels (preferred for aesthetics)
-    // or continuously.
-    return size;
-}
-
-wxSize wxRibbonPanel::DoGetBestSize() const
-{
-    // Ask sizer if present
-    if( GetSizer())
-    {
-        wxClientDC dc((wxRibbonPanel*) this);
-        return m_art->GetPanelSize(dc, this, GetPanelSizerBestSize(), NULL);
-    }
-    else if(GetChildren().GetCount() == 1)
-    {
-        // Common case of no sizer and single child taking up the entire panel
-        wxWindow* child = GetChildren().Item(0)->GetData();
-        wxClientDC dc((wxRibbonPanel*) this);
-        return m_art->GetPanelSize(dc, this, child->GetBestSize(), NULL);
-    }
-
-    return wxRibbonControl::DoGetBestSize();
-}
-
-bool wxRibbonPanel::Realize()
-{
-    bool status = true;
-
-    for (wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
-                  node;
-                  node = node->GetNext())
-    {
-        wxRibbonControl* child = wxDynamicCast(node->GetData(), wxRibbonControl);
-        if(child == NULL)
-        {
-            continue;
-        }
-        if(!child->Realize())
-        {
-            status = false;
-        }
-    }
-
-    wxSize minimum_children_size(0, 0);
-
-    // Ask sizer if there is one present
-    if(GetSizer())
-    {
-        minimum_children_size = GetPanelSizerMinSize();
-    }
-    else if(GetChildren().GetCount() == 1)
-    {
-        minimum_children_size = GetChildren().GetFirst()->GetData()->GetMinSize();
-    }
-
-    if(m_art != NULL)
-    {
-        wxClientDC temp_dc(this);
-
-        m_smallest_unminimised_size =
-            m_art->GetPanelSize(temp_dc, this, minimum_children_size, NULL);
-
-        wxSize bitmap_size;
-        wxSize panel_min_size = GetMinNotMinimisedSize();
-        m_minimised_size = m_art->GetMinimisedPanelMinimumSize(temp_dc, this,
-            &bitmap_size, &m_preferred_expand_direction);
-        if(m_minimised_icon.IsOk() && m_minimised_icon.GetSize() != bitmap_size)
-        {
-            wxImage img(m_minimised_icon.ConvertToImage());
-            img.Rescale(bitmap_size.GetWidth(), bitmap_size.GetHeight(), wxIMAGE_QUALITY_HIGH);
-            m_minimised_icon_resized = wxBitmap(img);
-        }
-        else
-        {
-            m_minimised_icon_resized = m_minimised_icon;
-        }
-        if(m_minimised_size.x > panel_min_size.x &&
-            m_minimised_size.y > panel_min_size.y)
-        {
-            // No point in having a minimised size which is larger than the
-            // minimum size which the children can go to.
-            m_minimised_size = wxSize(-1, -1);
-        }
-        else
-        {
-            if(m_art->GetFlags() & wxRIBBON_BAR_FLOW_VERTICAL)
-            {
-                m_minimised_size.x = panel_min_size.x;
-            }
-            else
-            {
-                m_minimised_size.y = panel_min_size.y;
-            }
-        }
-    }
-    else
-    {
-        m_minimised_size = wxSize(-1, -1);
-    }
-
-    return Layout() && status;
-}
-
-bool wxRibbonPanel::Layout()
-{
-    if(IsMinimised())
-    {
-        // Children are all invisible when minimised
-        return true;
-    }
-
-    // Get wxRibbonPanel client size
-    wxPoint position;
-    wxClientDC dc(this);
-    wxSize size = m_art->GetPanelClientSize(dc, this, GetSize(), &position);
-
-    // If there is a sizer, use it
-    if(GetSizer())
-    {
-        GetSizer()->SetDimension(position, size); // SetSize and Layout()
-    }
-    else if(GetChildren().GetCount() == 1)
-    {
-        // Common case of no sizer and single child taking up the entire panel
-        wxWindow* child = GetChildren().Item(0)->GetData();
-        child->SetSize(position.x, position.y, size.GetWidth(), size.GetHeight());
-    }
-
-    if(HasExtButton())
-        m_ext_button_rect = m_art->GetPanelExtButtonArea(dc, this, GetSize());
-
-    return true;
-}
-
-void wxRibbonPanel::OnMouseClick(wxMouseEvent& WXUNUSED(evt))
-{
-    if(IsMinimised())
-    {
-        if(m_expanded_panel != NULL)
-        {
-            HideExpanded();
-        }
-        else
-        {
-            ShowExpanded();
-        }
-    }
-    else if(IsExtButtonHovered())
-    {
-        wxRibbonPanelEvent notification(wxEVT_RIBBONPANEL_EXTBUTTON_ACTIVATED, GetId());
-        notification.SetEventObject(this);
-        notification.SetPanel(this);
-        ProcessEvent(notification);
-    }
-}
-
-wxRibbonPanel* wxRibbonPanel::GetExpandedDummy()
-{
-    return m_expanded_dummy;
-}
-
-wxRibbonPanel* wxRibbonPanel::GetExpandedPanel()
-{
-    return m_expanded_panel;
-}
-
-bool wxRibbonPanel::ShowExpanded()
-{
-    if(!IsMinimised())
-    {
-        return false;
-    }
-    if(m_expanded_dummy != NULL || m_expanded_panel != NULL)
-    {
-        return false;
-    }
-
-    wxSize size = GetBestSize();
-
-    // Special case for flexible panel layout, where GetBestSize doesn't work
-    if (GetFlags() & wxRIBBON_PANEL_FLEXIBLE)
-    {
-        size = GetBestSizeForParentSize(wxSize(400, 1000));
-    }
-
-    wxPoint pos = GetExpandedPosition(wxRect(GetScreenPosition(), GetSize()),
-        size, m_preferred_expand_direction).GetTopLeft();
-
-    // Need a top-level frame to contain the expanded panel
-    wxFrame *container = new wxFrame(NULL, wxID_ANY, GetLabel(),
-        pos, size, wxFRAME_NO_TASKBAR | wxBORDER_NONE);
-
-    m_expanded_panel = new wxRibbonPanel(container, wxID_ANY,
-        GetLabel(), m_minimised_icon, wxPoint(0, 0), size, (m_flags /* & ~wxRIBBON_PANEL_FLEXIBLE */));
-
-    m_expanded_panel->SetArtProvider(m_art);
-    m_expanded_panel->m_expanded_dummy = this;
-
-    // Move all children to the new panel.
-    // Conceptually it might be simpler to reparent this entire panel to the
-    // container and create a new panel to sit in its place while expanded.
-    // This approach has a problem though - when the panel is reinserted into
-    // its original parent, it'll be at a different position in the child list
-    // and thus assume a new position.
-    // NB: Children iterators not used as behaviour is not well defined
-    // when iterating over a container which is being emptied
-    while(!GetChildren().IsEmpty())
-    {
-        wxWindow *child = GetChildren().GetFirst()->GetData();
-        child->Reparent(m_expanded_panel);
-        child->Show();
-    }
-
-    // Move sizer to new panel
-    if(GetSizer())
-    {
-        wxSizer* sizer = GetSizer();
-        SetSizer(NULL, false);
-        m_expanded_panel->SetSizer(sizer);
-    }
-
-    m_expanded_panel->Realize();
-    Refresh();
-    container->SetMinClientSize(size);
-    container->Show();
-    m_expanded_panel->SetFocus();
-
-    return true;
-}
-
-bool wxRibbonPanel::ShouldSendEventToDummy(wxEvent& evt)
-{
-    // For an expanded panel, filter events between being sent up to the
-    // floating top level window or to the dummy panel sitting in the ribbon
-    // bar.
-
-    // Child focus events should not be redirected, as the child would not be a
-    // child of the window the event is redirected to. All other command events
-    // seem to be suitable for redirecting.
-    return evt.IsCommandEvent() && evt.GetEventType() != wxEVT_CHILD_FOCUS;
-}
-
-bool wxRibbonPanel::TryAfter(wxEvent& evt)
-{
-    if(m_expanded_dummy && ShouldSendEventToDummy(evt))
-    {
-        wxPropagateOnce propagateOnce(evt);
-        return m_expanded_dummy->GetEventHandler()->ProcessEvent(evt);
-    }
-    else
-    {
-        return wxRibbonControl::TryAfter(evt);
-    }
-}
-
-static bool IsAncestorOf(wxWindow *ancestor, wxWindow *window)
-{
-    while(window != NULL)
-    {
-        wxWindow *parent = window->GetParent();
-        if(parent == ancestor)
-            return true;
-        else
-            window = parent;
-    }
-    return false;
-}
-
-void wxRibbonPanel::OnKillFocus(wxFocusEvent& evt)
-{
-    if(m_expanded_dummy)
-    {
-        wxWindow *receiver = evt.GetWindow();
-        if(IsAncestorOf(this, receiver))
-        {
-            m_child_with_focus = receiver;
-            receiver->Connect(wxEVT_KILL_FOCUS,
-                wxFocusEventHandler(wxRibbonPanel::OnChildKillFocus),
-                NULL, this);
-        }
-        else if(receiver == NULL || receiver != m_expanded_dummy)
-        {
-            HideExpanded();
-        }
-    }
-}
-
-void wxRibbonPanel::OnChildKillFocus(wxFocusEvent& evt)
-{
-    if(m_child_with_focus == NULL)
-        return; // Should never happen, but a check can't hurt
-
-    m_child_with_focus->Disconnect(wxEVT_KILL_FOCUS,
-      wxFocusEventHandler(wxRibbonPanel::OnChildKillFocus), NULL, this);
-    m_child_with_focus = NULL;
-
-    wxWindow *receiver = evt.GetWindow();
-    if(receiver == this || IsAncestorOf(this, receiver))
-    {
-        m_child_with_focus = receiver;
-        receiver->Connect(wxEVT_KILL_FOCUS,
-            wxFocusEventHandler(wxRibbonPanel::OnChildKillFocus), NULL, this);
-        evt.Skip();
-    }
-    else if(receiver == NULL || receiver != m_expanded_dummy)
-    {
-        HideExpanded();
-        // Do not skip event, as the panel has been de-expanded, causing the
-        // child with focus to be reparented (and hidden). If the event
-        // continues propagation then bad things happen.
-    }
-    else
-    {
-        evt.Skip();
-    }
-}
-
-bool wxRibbonPanel::HideExpanded()
-{
-    if(m_expanded_dummy == NULL)
-    {
-        if(m_expanded_panel)
-        {
-            return m_expanded_panel->HideExpanded();
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    // Move children back to original panel
-    // NB: Children iterators not used as behaviour is not well defined
-    // when iterating over a container which is being emptied
-    while(!GetChildren().IsEmpty())
-    {
-        wxWindow *child = GetChildren().GetFirst()->GetData();
-        child->Reparent(m_expanded_dummy);
-        child->Hide();
-    }
-
-    // Move sizer back
-    if(GetSizer())
-    {
-        wxSizer* sizer = GetSizer();
-        SetSizer(NULL, false);
-        m_expanded_dummy->SetSizer(sizer);
-    }
-
-    m_expanded_dummy->m_expanded_panel = NULL;
-    m_expanded_dummy->Realize();
-    m_expanded_dummy->Refresh();
-    wxWindow *parent = GetParent();
-    Destroy();
-    parent->Destroy();
-
-    return true;
-}
-
-wxRect wxRibbonPanel::GetExpandedPosition(wxRect panel,
-                                          wxSize expanded_size,
-                                          wxDirection direction)
-{
-    // Strategy:
-    // 1) Determine primary position based on requested direction
-    // 2) Move the position so that it sits entirely within a display
-    //    (for single monitor systems, this moves it into the display region,
-    //     but for multiple monitors, it does so without splitting it over
-    //     more than one display)
-    // 2.1) Move in the primary axis
-    // 2.2) Move in the secondary axis
-
-    wxPoint pos;
-    bool primary_x = false;
-    int secondary_x = 0;
-    int secondary_y = 0;
-    switch(direction)
-    {
-    case wxNORTH:
-        pos.x = panel.GetX() + (panel.GetWidth() - expanded_size.GetWidth()) / 2;
-        pos.y = panel.GetY() - expanded_size.GetHeight();
-        primary_x = true;
-        secondary_y = 1;
-        break;
-    case wxEAST:
-        pos.x = panel.GetRight();
-        pos.y = panel.GetY() + (panel.GetHeight() - expanded_size.GetHeight()) / 2;
-        secondary_x = -1;
-        break;
-    case wxSOUTH:
-        pos.x = panel.GetX() + (panel.GetWidth() - expanded_size.GetWidth()) / 2;
-        pos.y = panel.GetBottom();
-        primary_x = true;
-        secondary_y = -1;
-        break;
-    case wxWEST:
-    default:
-        pos.x = panel.GetX() - expanded_size.GetWidth();
-        pos.y = panel.GetY() + (panel.GetHeight() - expanded_size.GetHeight()) / 2;
-        secondary_x = 1;
-        break;
-    }
-    wxRect expanded(pos, expanded_size);
-
-    wxRect best(expanded);
-    int best_distance = INT_MAX;
-
-    const unsigned display_n = wxDisplay::GetCount();
-    unsigned display_i;
-    for(display_i = 0; display_i < display_n; ++display_i)
-    {
-        wxRect display = wxDisplay(display_i).GetGeometry();
-
-        if(display.Contains(expanded))
-        {
-            return expanded;
-        }
-        else if(display.Intersects(expanded))
-        {
-            wxRect new_rect(expanded);
-            int distance = 0;
-
-            if(primary_x)
-            {
-                if(expanded.GetRight() > display.GetRight())
-                {
-                    distance = expanded.GetRight() - display.GetRight();
-                    new_rect.x -= distance;
-                }
-                else if(expanded.GetLeft() < display.GetLeft())
-                {
-                    distance = display.GetLeft() - expanded.GetLeft();
-                    new_rect.x += distance;
-                }
-            }
-            else
-            {
-                if(expanded.GetBottom() > display.GetBottom())
-                {
-                    distance = expanded.GetBottom() - display.GetBottom();
-                    new_rect.y -= distance;
-                }
-                else if(expanded.GetTop() < display.GetTop())
-                {
-                    distance = display.GetTop() - expanded.GetTop();
-                    new_rect.y += distance;
-                }
-            }
-            if(!display.Contains(new_rect))
-            {
-                // Tried moving in primary axis, but failed.
-                // Hence try moving in the secondary axis.
-                int dx = secondary_x * (panel.GetWidth() + expanded_size.GetWidth());
-                int dy = secondary_y * (panel.GetHeight() + expanded_size.GetHeight());
-                new_rect.x += dx;
-                new_rect.y += dy;
-
-                // Squaring makes secondary moves more expensive (and also
-                // prevents a negative cost)
-                distance += dx * dx + dy * dy;
-            }
-            if(display.Contains(new_rect) && distance < best_distance)
-            {
-                best = new_rect;
-                best_distance = distance;
-            }
-        }
-    }
-
-    return best;
-}
-
-void wxRibbonPanel::HideIfExpanded()
-{
-    wxStaticCast(m_parent, wxRibbonPage)->HideIfExpanded();
-}
-
-#endif // wxUSE_RIBBON
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/toolbar.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/toolbar.cpp
deleted file mode 100644
index fe337405f4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/ribbon/toolbar.cpp
+++ /dev/null
@@ -1,1234 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/ribbon/toolbar.cpp
-// Purpose:     Ribbon-style tool bar
-// Author:      Peter Cawley
-// Modified by:
-// Created:     2009-07-06
-// Copyright:   (C) Peter Cawley
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_RIBBON
-
-#include "wx/ribbon/toolbar.h"
-#include "wx/ribbon/art.h"
-#include "wx/ribbon/bar.h"
-#include "wx/dcbuffer.h"
-
-#ifndef WX_PRECOMP
-#endif
-
-#ifdef __WXMSW__
-#include "wx/msw/private.h"
-#endif
-
-class wxRibbonToolBarToolBase
-{
-public:
-    wxString help_string;
-    wxBitmap bitmap;
-    wxBitmap bitmap_disabled;
-    wxRect dropdown;
-    wxPoint position;
-    wxSize size;
-    wxObject* client_data;
-    int id;
-    wxRibbonButtonKind kind;
-    long state;
-};
-
-WX_DEFINE_ARRAY_PTR(wxRibbonToolBarToolBase*, wxArrayRibbonToolBarToolBase);
-
-class wxRibbonToolBarToolGroup
-{
-public:
-    // To identify the group as a wxRibbonToolBarToolBase*
-    wxRibbonToolBarToolBase dummy_tool;
-
-    wxArrayRibbonToolBarToolBase tools;
-    wxPoint position;
-    wxSize size;
-};
-
-wxDEFINE_EVENT(wxEVT_RIBBONTOOLBAR_CLICKED, wxRibbonToolBarEvent);
-wxDEFINE_EVENT(wxEVT_RIBBONTOOLBAR_DROPDOWN_CLICKED, wxRibbonToolBarEvent);
-
-IMPLEMENT_DYNAMIC_CLASS(wxRibbonToolBarEvent, wxCommandEvent)
-IMPLEMENT_CLASS(wxRibbonToolBar, wxRibbonControl)
-
-BEGIN_EVENT_TABLE(wxRibbonToolBar, wxRibbonControl)
-    EVT_ENTER_WINDOW(wxRibbonToolBar::OnMouseEnter)
-    EVT_ERASE_BACKGROUND(wxRibbonToolBar::OnEraseBackground)
-    EVT_LEAVE_WINDOW(wxRibbonToolBar::OnMouseLeave)
-    EVT_LEFT_DOWN(wxRibbonToolBar::OnMouseDown)
-    EVT_LEFT_UP(wxRibbonToolBar::OnMouseUp)
-    EVT_MOTION(wxRibbonToolBar::OnMouseMove)
-    EVT_PAINT(wxRibbonToolBar::OnPaint)
-    EVT_SIZE(wxRibbonToolBar::OnSize)
-END_EVENT_TABLE()
-
-wxRibbonToolBar::wxRibbonToolBar()
-{
-}
-
-wxRibbonToolBar::wxRibbonToolBar(wxWindow* parent,
-                  wxWindowID id,
-                  const wxPoint& pos,
-                  const wxSize& size,
-                  long style)
-    : wxRibbonControl(parent, id, pos, size, wxBORDER_NONE)
-{
-    CommonInit(style);
-}
-
-bool wxRibbonToolBar::Create(wxWindow* parent,
-                wxWindowID id,
-                const wxPoint& pos,
-                const wxSize& size,
-                long style)
-{
-    if(!wxRibbonControl::Create(parent, id, pos, size, wxBORDER_NONE))
-    {
-        return false;
-    }
-
-    CommonInit(style);
-    return true;
-}
-
-void wxRibbonToolBar::CommonInit(long WXUNUSED(style))
-{
-    AppendGroup();
-    m_hover_tool = NULL;
-    m_active_tool = NULL;
-    m_nrows_min = 1;
-    m_nrows_max = 1;
-    m_sizes = new wxSize[1];
-    m_sizes[0] = wxSize(0, 0);
-    SetBackgroundStyle(wxBG_STYLE_CUSTOM);
-}
-
-wxRibbonToolBar::~wxRibbonToolBar()
-{
-    size_t count = m_groups.GetCount();
-    size_t i, t;
-    for(i = 0; i < count; ++i)
-    {
-        wxRibbonToolBarToolGroup* group = m_groups.Item(i);
-        size_t tool_count = group->tools.GetCount();
-        for(t = 0; t < tool_count; ++t)
-        {
-            wxRibbonToolBarToolBase* tool = group->tools.Item(t);
-            delete tool;
-        }
-        delete group;
-    }
-    m_groups.Clear();
-    delete[] m_sizes;
-}
-
-wxRibbonToolBarToolBase* wxRibbonToolBar::AddTool(
-                int tool_id,
-                const wxBitmap& bitmap,
-                const wxString& help_string,
-                wxRibbonButtonKind kind)
-{
-    return AddTool(tool_id, bitmap, wxNullBitmap, help_string, kind, NULL);
-}
-
-wxRibbonToolBarToolBase* wxRibbonToolBar::AddDropdownTool(
-            int tool_id,
-            const wxBitmap& bitmap,
-            const wxString& help_string)
-{
-    return AddTool(tool_id, bitmap, wxNullBitmap, help_string,
-        wxRIBBON_BUTTON_DROPDOWN, NULL);
-}
-
-wxRibbonToolBarToolBase* wxRibbonToolBar::AddHybridTool(
-            int tool_id,
-            const wxBitmap& bitmap,
-            const wxString& help_string)
-{
-    return AddTool(tool_id, bitmap, wxNullBitmap, help_string,
-        wxRIBBON_BUTTON_HYBRID, NULL);
-}
-
-wxRibbonToolBarToolBase* wxRibbonToolBar::AddToggleTool(
-        int tool_id,
-        const wxBitmap& bitmap,
-        const wxString& help_string)
-{
-    return AddTool(tool_id, bitmap, wxNullBitmap, help_string,
-        wxRIBBON_BUTTON_TOGGLE, NULL);
-}
-
-wxRibbonToolBarToolBase* wxRibbonToolBar::AddTool(
-            int tool_id,
-            const wxBitmap& bitmap,
-            const wxBitmap& bitmap_disabled,
-            const wxString& help_string,
-            wxRibbonButtonKind kind,
-            wxObject* client_data)
-{
-    return InsertTool(GetToolCount(), tool_id, bitmap, bitmap_disabled,
-        help_string, kind, client_data);
-}
-
-wxRibbonToolBarToolBase* wxRibbonToolBar::AddSeparator()
-{
-    if(m_groups.Last()->tools.IsEmpty())
-        return NULL;
-
-    AppendGroup();
-    return &m_groups.Last()->dummy_tool;
-}
-
-
-wxRibbonToolBarToolBase* wxRibbonToolBar::InsertTool(
-                size_t pos,
-                int tool_id,
-                const wxBitmap& bitmap,
-                const wxString& help_string,
-                wxRibbonButtonKind kind)
-{
-    return InsertTool(pos, tool_id, bitmap, wxNullBitmap, help_string, kind,
-        NULL);
-}
-
-wxRibbonToolBarToolBase* wxRibbonToolBar::InsertDropdownTool(
-            size_t pos,
-            int tool_id,
-            const wxBitmap& bitmap,
-            const wxString& help_string)
-{
-    return InsertTool(pos, tool_id, bitmap, wxNullBitmap, help_string,
-        wxRIBBON_BUTTON_DROPDOWN, NULL);
-}
-
-wxRibbonToolBarToolBase* wxRibbonToolBar::InsertHybridTool(
-            size_t pos,
-            int tool_id,
-            const wxBitmap& bitmap,
-            const wxString& help_string)
-{
-    return InsertTool(pos, tool_id, bitmap, wxNullBitmap, help_string,
-        wxRIBBON_BUTTON_HYBRID, NULL);
-}
-
-wxRibbonToolBarToolBase* wxRibbonToolBar::InsertToggleTool(
-        size_t pos,
-        int tool_id,
-        const wxBitmap& bitmap,
-        const wxString& help_string)
-{
-    return InsertTool(pos, tool_id, bitmap, wxNullBitmap, help_string,
-        wxRIBBON_BUTTON_TOGGLE, NULL);
-}
-
-wxRibbonToolBarToolBase* wxRibbonToolBar::InsertTool(
-            size_t pos,
-            int tool_id,
-            const wxBitmap& bitmap,
-            const wxBitmap& bitmap_disabled,
-            const wxString& help_string,
-            wxRibbonButtonKind kind,
-            wxObject* client_data)
-{
-    wxASSERT(bitmap.IsOk());
-
-    // Create the wxRibbonToolBarToolBase with parameters
-    wxRibbonToolBarToolBase* tool = new wxRibbonToolBarToolBase;
-    tool->id = tool_id;
-    tool->bitmap = bitmap;
-    if(bitmap_disabled.IsOk())
-    {
-        wxASSERT(bitmap.GetSize() == bitmap_disabled.GetSize());
-        tool->bitmap_disabled = bitmap_disabled;
-    }
-    else
-        tool->bitmap_disabled = MakeDisabledBitmap(bitmap);
-    tool->help_string = help_string;
-    tool->kind = kind;
-    tool->client_data = client_data;
-    tool->position = wxPoint(0, 0);
-    tool->size = wxSize(0, 0);
-    tool->state = 0;
-
-    // Find the position where insert tool
-    size_t group_count = m_groups.GetCount();
-    size_t g;
-    for(g = 0; g < group_count; ++g)
-    {
-        wxRibbonToolBarToolGroup* group = m_groups.Item(g);
-        size_t tool_count = group->tools.GetCount();
-        if(pos <= tool_count)
-        {
-            group->tools.Insert(tool, pos);
-            return tool;
-        }
-        pos -= tool_count + 1;
-    }
-    wxFAIL_MSG("Tool position out of toolbar bounds.");
-    return NULL;
-}
-
-wxRibbonToolBarToolBase* wxRibbonToolBar::InsertSeparator(size_t pos)
-{
-    size_t group_count = m_groups.GetCount();
-    size_t g;
-    for(g = 0; g < group_count; ++g)
-    {
-        if(pos==0) // Prepend group
-            return &InsertGroup(g)->dummy_tool;
-        if(pos==group_count) // Append group
-            return &InsertGroup(g+1)->dummy_tool;
-
-        wxRibbonToolBarToolGroup* group = m_groups.Item(g);
-        size_t tool_count = group->tools.GetCount();
-        if(pos < tool_count)
-        {
-            wxRibbonToolBarToolGroup* new_group = InsertGroup(g+1);
-
-            for(size_t t = pos; t < tool_count; t++)
-                new_group->tools.Add(group->tools[t]);
-            group->tools.RemoveAt(pos, tool_count-pos);
-
-            return &group->dummy_tool;
-        }
-        pos -= tool_count + 1;
-    }
-    // Add an empty group at the end of the bar.
-    if(m_groups.Last()->tools.IsEmpty())
-        return NULL;
-    AppendGroup();
-    return &m_groups.Last()->dummy_tool;
-}
-
-wxRibbonToolBarToolGroup* wxRibbonToolBar::InsertGroup(size_t pos)
-{
-    wxRibbonToolBarToolGroup* group = new wxRibbonToolBarToolGroup;
-    group->position = wxPoint(0, 0);
-    group->size = wxSize(0, 0);
-    m_groups.Insert(group, pos);
-    return group;
-}
-
-void wxRibbonToolBar::ClearTools()
-{
-    size_t count = m_groups.GetCount();
-    size_t i, t;
-    for(i = 0; i < count; ++i)
-    {
-        wxRibbonToolBarToolGroup* group = m_groups.Item(i);
-        size_t tool_count = group->tools.GetCount();
-        for(t = 0; t < tool_count; ++t)
-        {
-            wxRibbonToolBarToolBase* tool = group->tools.Item(t);
-            delete tool;
-        }
-        delete group;
-    }
-    m_groups.Clear();
-}
-
-bool wxRibbonToolBar::DeleteTool(int tool_id)
-{
-    size_t group_count = m_groups.GetCount();
-    size_t g, t;
-    for(g = 0; g < group_count; ++g)
-    {
-        wxRibbonToolBarToolGroup* group = m_groups.Item(g);
-        size_t tool_count = group->tools.GetCount();
-        for(t = 0; t < tool_count; ++t)
-        {
-            wxRibbonToolBarToolBase* tool = group->tools.Item(t);
-            if(tool->id == tool_id)
-            {
-                group->tools.RemoveAt(t);
-                delete tool;
-                return true;
-            }
-        }
-    }
-    return false;
-}
-
-bool wxRibbonToolBar::DeleteToolByPos(size_t pos)
-{
-    size_t group_count = m_groups.GetCount();
-    size_t g, t;
-    for(g = 0; g < group_count; ++g)
-    {
-        wxRibbonToolBarToolGroup* group = m_groups.Item(g);
-        size_t tool_count = group->tools.GetCount();
-        if(postools.Item(pos);
-            group->tools.RemoveAt(pos);
-            delete tool;
-            return true;
-        }
-        else if(pos==tool_count)
-        {
-            // Remove separator
-            if(g < group_count - 1)
-            {
-                wxRibbonToolBarToolGroup* next_group = m_groups.Item(g+1);
-                for(t = 0; t < next_group->tools.GetCount(); ++t)
-                    group->tools.Add(next_group->tools[t]);
-                m_groups.RemoveAt(g+1);
-                delete next_group;
-            }
-            return true;
-        }
-    }
-    return false;
-}
-
-wxRibbonToolBarToolBase* wxRibbonToolBar::FindById(int tool_id)const
-{
-    size_t group_count = m_groups.GetCount();
-    size_t g, t;
-    for(g = 0; g < group_count; ++g)
-    {
-        wxRibbonToolBarToolGroup* group = m_groups.Item(g);
-        size_t tool_count = group->tools.GetCount();
-        for(t = 0; t < tool_count; ++t)
-        {
-            wxRibbonToolBarToolBase* tool = group->tools.Item(t);
-            if(tool->id == tool_id)
-            {
-                return tool;
-            }
-        }
-    }
-    return NULL;
-}
-
-wxRibbonToolBarToolBase* wxRibbonToolBar::GetToolByPos(size_t pos)const
-{
-    size_t group_count = m_groups.GetCount();
-    size_t g;
-    for(g = 0; g < group_count; ++g)
-    {
-        wxRibbonToolBarToolGroup* group = m_groups.Item(g);
-        size_t tool_count = group->tools.GetCount();
-        if(postools[pos];
-        }
-        else if(pos==tool_count)
-        {
-            return NULL;
-        }
-    }
-    return NULL;
-}
-
-size_t wxRibbonToolBar::GetToolCount() const
-{
-    size_t count = 0;
-    for(size_t g = 0; g < m_groups.GetCount(); ++g)
-    {
-        wxRibbonToolBarToolGroup* group = m_groups.Item(g);
-        count += group->tools.GetCount();
-    }
-    // There is a splitter in front of every group except for the first
-    // If only one group, no separator.
-    if(m_groups.GetCount()>1)
-        count += m_groups.GetCount() - 1;
-    return count;
-}
-
-int wxRibbonToolBar::GetToolId(const wxRibbonToolBarToolBase* tool)const
-{
-    wxCHECK_MSG(tool != NULL , wxNOT_FOUND, "The tool pointer must not be NULL");
-    return tool->id;
-}
-
-wxObject* wxRibbonToolBar::GetToolClientData(int tool_id)const
-{
-    wxRibbonToolBarToolBase* tool = FindById(tool_id);
-    wxCHECK_MSG(tool != NULL , NULL, "Invalid tool id");
-    return tool->client_data;
-}
-
-bool wxRibbonToolBar::GetToolEnabled(int tool_id)const
-{
-    wxRibbonToolBarToolBase* tool = FindById(tool_id);
-    wxCHECK_MSG(tool != NULL , false, "Invalid tool id");
-    return (tool->state & wxRIBBON_TOOLBAR_TOOL_DISABLED) == 0;
-}
-
-wxString wxRibbonToolBar::GetToolHelpString(int tool_id)const
-{
-    wxRibbonToolBarToolBase* tool = FindById(tool_id);
-    wxCHECK_MSG(tool != NULL , wxEmptyString, "Invalid tool id");
-    return tool->help_string;
-}
-
-wxRibbonButtonKind wxRibbonToolBar::GetToolKind(int tool_id)const
-{
-    wxRibbonToolBarToolBase* tool = FindById(tool_id);
-    wxCHECK_MSG(tool != NULL , wxRIBBON_BUTTON_NORMAL, "Invalid tool id");
-    return tool->kind;
-}
-
-int wxRibbonToolBar::GetToolPos(int tool_id)const
-{
-    size_t group_count = m_groups.GetCount();
-    size_t g, t;
-    int pos = 0;
-    for(g = 0; g < group_count; ++g)
-    {
-        wxRibbonToolBarToolGroup* group = m_groups.Item(g);
-        size_t tool_count = group->tools.GetCount();
-        for(t = 0; t < tool_count; ++t)
-        {
-            wxRibbonToolBarToolBase* tool = group->tools.Item(t);
-            if(tool->id == tool_id)
-            {
-                return pos;
-            }
-            ++pos;
-        }
-        ++pos; // Increment pos for group separator.
-    }
-    return wxNOT_FOUND;
-}
-
-bool wxRibbonToolBar::GetToolState(int tool_id)const
-{
-    wxRibbonToolBarToolBase* tool = FindById(tool_id);
-    wxCHECK_MSG(tool != NULL , false, "Invalid tool id");
-    return (tool->state & wxRIBBON_TOOLBAR_TOOL_TOGGLED) != 0;
-}
-
-wxBitmap wxRibbonToolBar::MakeDisabledBitmap(const wxBitmap& original)
-{
-    wxImage img(original.ConvertToImage());
-    return wxBitmap(img.ConvertToGreyscale());
-}
-
-void wxRibbonToolBar::AppendGroup()
-{
-    wxRibbonToolBarToolGroup* group = new wxRibbonToolBarToolGroup;
-    group->position = wxPoint(0, 0);
-    group->size = wxSize(0, 0);
-    m_groups.Add(group);
-}
-
-bool wxRibbonToolBar::IsSizingContinuous() const
-{
-    return false;
-}
-
-void wxRibbonToolBar::SetToolClientData(int tool_id, wxObject* clientData)
-{
-    wxRibbonToolBarToolBase* tool = FindById(tool_id);
-    wxCHECK_RET(tool != NULL , "Invalid tool id");
-    tool->client_data = clientData;
-}
-
-void wxRibbonToolBar::SetToolDisabledBitmap(int tool_id, const wxBitmap &bitmap)
-{
-    wxRibbonToolBarToolBase* tool = FindById(tool_id);
-    wxCHECK_RET(tool != NULL , "Invalid tool id");
-    tool->bitmap_disabled = bitmap;
-}
-
-void wxRibbonToolBar::SetToolHelpString(int tool_id, const wxString& helpString)
-{
-    wxRibbonToolBarToolBase* tool = FindById(tool_id);
-    wxCHECK_RET(tool != NULL , "Invalid tool id");
-    tool->help_string = helpString;
-}
-
-void wxRibbonToolBar::SetToolNormalBitmap(int tool_id, const wxBitmap &bitmap)
-{
-    wxRibbonToolBarToolBase* tool = FindById(tool_id);
-    wxCHECK_RET(tool != NULL , "Invalid tool id");
-    tool->bitmap = bitmap;
-}
-
-void wxRibbonToolBar::EnableTool(int tool_id, bool enable)
-{
-    wxRibbonToolBarToolBase* tool = FindById(tool_id);
-    wxCHECK_RET(tool != NULL , "Invalid tool id");
-    if(enable)
-    {
-        if(tool->state & wxRIBBON_TOOLBAR_TOOL_DISABLED)
-        {
-            tool->state &= ~wxRIBBON_TOOLBAR_TOOL_DISABLED;
-            Refresh();
-        }
-    }
-    else
-    {
-        if((tool->state & wxRIBBON_TOOLBAR_TOOL_DISABLED)==0)
-        {
-            tool->state |= wxRIBBON_TOOLBAR_TOOL_DISABLED;
-            Refresh();
-        }
-    }
-}
-
-void wxRibbonToolBar::ToggleTool(int tool_id, bool checked)
-{
-    wxRibbonToolBarToolBase* tool = FindById(tool_id);
-    wxCHECK_RET(tool != NULL , "Invalid tool id");
-    if(checked)
-    {
-        if((tool->state & wxRIBBON_TOOLBAR_TOOL_TOGGLED) == 0)
-        {
-            tool->state |= wxRIBBON_TOOLBAR_TOOL_TOGGLED;
-            Refresh();
-        }
-    }
-    else
-    {
-        if(tool->state & wxRIBBON_TOOLBAR_TOOL_TOGGLED)
-        {
-            tool->state &= ~wxRIBBON_TOOLBAR_TOOL_TOGGLED;
-            Refresh();
-        }
-    }
-}
-
-static int GetSizeInOrientation(wxSize size, wxOrientation orientation)
-{
-    switch(orientation)
-    {
-    case wxHORIZONTAL: return size.GetWidth();
-    case wxVERTICAL: return size.GetHeight();
-    case wxBOTH: return size.GetWidth() * size.GetHeight();
-    default: return 0;
-    }
-}
-
-wxSize wxRibbonToolBar::DoGetNextSmallerSize(wxOrientation direction,
-                                      wxSize relative_to) const
-{
-    wxSize result(relative_to);
-    int area = 0;
-    int nrows;
-    for(nrows = m_nrows_min; nrows <= m_nrows_max; ++nrows)
-    {
-        wxSize size(m_sizes[nrows - m_nrows_min]);
-        wxSize original(size);
-        switch(direction)
-        {
-        case wxHORIZONTAL:
-            if(size.GetWidth() < relative_to.GetWidth()
-                && size.GetHeight() <= relative_to.GetHeight())
-            {
-                size.SetHeight(relative_to.GetHeight());
-                break;
-            }
-            continue;
-        case wxVERTICAL:
-            if(size.GetWidth() <= relative_to.GetWidth()
-                && size.GetHeight() < relative_to.GetHeight())
-            {
-                size.SetWidth(relative_to.GetWidth());
-                break;
-            }
-            continue;
-        case wxBOTH:
-            if(size.GetWidth() < relative_to.GetWidth()
-                && size.GetHeight() < relative_to.GetHeight())
-            {
-                break;
-            }
-            continue;
-        }
-        if(GetSizeInOrientation(original, direction) > area)
-        {
-            result = size;
-            area = GetSizeInOrientation(original, direction);
-        }
-    }
-    return result;
-}
-
-wxSize wxRibbonToolBar::DoGetNextLargerSize(wxOrientation direction,
-                                 wxSize relative_to) const
-{
-    // Pick the smallest of our sizes which are larger than the given size
-    wxSize result(relative_to);
-    int area = INT_MAX;
-    int nrows;
-    for(nrows = m_nrows_min; nrows <= m_nrows_max; ++nrows)
-    {
-        wxSize size(m_sizes[nrows - m_nrows_min]);
-        wxSize original(size);
-        switch(direction)
-        {
-        case wxHORIZONTAL:
-            if(size.GetWidth() > relative_to.GetWidth()
-                && size.GetHeight() <= relative_to.GetHeight())
-            {
-                size.SetHeight(relative_to.GetHeight());
-                break;
-            }
-            continue;
-        case wxVERTICAL:
-            if(size.GetWidth() <= relative_to.GetWidth()
-                && size.GetHeight() > relative_to.GetHeight())
-            {
-                size.SetWidth(relative_to.GetWidth());
-                break;
-            }
-            continue;
-        case wxBOTH:
-            if(size.GetWidth() > relative_to.GetWidth()
-                && size.GetHeight() > relative_to.GetHeight())
-            {
-                break;
-            }
-            continue;
-        }
-        if(GetSizeInOrientation(original, direction) < area)
-        {
-            result = size;
-            area = GetSizeInOrientation(original, direction);
-        }
-    }
-
-    return result;
-}
-
-void wxRibbonToolBar::SetRows(int nMin, int nMax)
-{
-    if(nMax == -1)
-        nMax = nMin;
-
-    wxASSERT(1 <= nMin);
-    wxASSERT(nMin <= nMax);
-
-    m_nrows_min = nMin;
-    m_nrows_max = nMax;
-
-    delete[] m_sizes;
-    m_sizes = new wxSize[m_nrows_max - m_nrows_min + 1];
-    for(int i = m_nrows_min; i <= m_nrows_max; ++i)
-        m_sizes[i - m_nrows_min] = wxSize(0, 0);
-
-    Realize();
-}
-
-bool wxRibbonToolBar::Realize()
-{
-    if(m_art == NULL)
-        return false;
-
-    // Calculate the size of each group and the position/size of each tool
-    wxMemoryDC temp_dc;
-    size_t group_count = m_groups.GetCount();
-    size_t g, t;
-    for(g = 0; g < group_count; ++g)
-    {
-        wxRibbonToolBarToolBase* prev = NULL;
-        wxRibbonToolBarToolGroup* group = m_groups.Item(g);
-        size_t tool_count = group->tools.GetCount();
-        int tallest = 0;
-        for(t = 0; t < tool_count; ++t)
-        {
-            wxRibbonToolBarToolBase* tool = group->tools.Item(t);
-            tool->size = m_art->GetToolSize(temp_dc, this,
-                tool->bitmap.GetSize(), tool->kind, t == 0,
-                t == (tool_count - 1), &tool->dropdown);
-            if(t == 0)
-                tool->state |= wxRIBBON_TOOLBAR_TOOL_FIRST;
-            if(t == tool_count - 1)
-                tool->state |= wxRIBBON_TOOLBAR_TOOL_LAST;
-            if(tool->size.GetHeight() > tallest)
-                tallest = tool->size.GetHeight();
-            if(prev)
-            {
-                tool->position = prev->position;
-                tool->position.x += prev->size.x;
-            }
-            else
-            {
-                tool->position = wxPoint(0, 0);
-            }
-            prev = tool;
-        }
-        if(tool_count == 0)
-            group->size = wxSize(0, 0);
-        else
-        {
-            group->size = wxSize(prev->position.x + prev->size.x, tallest);
-            for(t = 0; t < tool_count; ++t)
-                group->tools.Item(t)->size.SetHeight(tallest);
-        }
-    }
-
-    // Calculate the minimum size for each possible number of rows
-    int nrows, r;
-    int sep = m_art->GetMetric(wxRIBBON_ART_TOOL_GROUP_SEPARATION_SIZE);
-    int smallest_area = INT_MAX;
-    wxSize* row_sizes = new wxSize[m_nrows_max];
-    wxOrientation major_axis = m_art->GetFlags() & wxRIBBON_BAR_FLOW_VERTICAL ?
-        wxVERTICAL : wxHORIZONTAL;
-
-    SetMinSize(wxSize(0, 0));
-    wxSize minSize(INT_MAX, INT_MAX);
-
-    // See if we're sizing flexibly (i.e. wrapping), and set min size differently
-    bool sizingFlexibly = false;
-    wxRibbonPanel* panel = wxDynamicCast(GetParent(), wxRibbonPanel);
-    if (panel && (panel->GetFlags() & wxRIBBON_PANEL_FLEXIBLE))
-        sizingFlexibly = true;
-
-    // Without this, there will be redundant horizontal space because SetMinSize will
-    // use the smallest possible height (and therefore largest width).
-    if (sizingFlexibly)
-        major_axis = wxHORIZONTAL;
-
-    for(nrows = m_nrows_min; nrows <= m_nrows_max; ++nrows)
-    {
-        for(r = 0; r < nrows; ++r)
-            row_sizes[r] = wxSize(0, 0);
-        for(g = 0; g < group_count; ++g)
-        {
-            wxRibbonToolBarToolGroup* group = m_groups.Item(g);
-            int shortest_row = 0;
-            for(r = 1; r < nrows; ++r)
-            {
-                if(row_sizes[r].GetWidth() < row_sizes[shortest_row].GetWidth())
-                    shortest_row = r;
-            }
-            row_sizes[shortest_row].x += group->size.x + sep;
-            if(group->size.y > row_sizes[shortest_row].y)
-                row_sizes[shortest_row].y = group->size.y;
-        }
-        wxSize size(0, 0);
-        for(r = 0; r < nrows; ++r)
-        {
-            if(row_sizes[r].GetWidth() != 0)
-                row_sizes[r].DecBy(sep, 0);
-            if(row_sizes[r].GetWidth() > size.GetWidth())
-                size.SetWidth(row_sizes[r].GetWidth());
-            size.IncBy(0, row_sizes[r].y);
-        }
-        m_sizes[nrows - m_nrows_min] = size;
-
-        if(GetSizeInOrientation(size, major_axis) < smallest_area)
-        {
-            smallest_area = GetSizeInOrientation(size, major_axis);
-            SetMinSize(size);
-        }
-
-        if (sizingFlexibly)
-        {
-            if (size.x < minSize.x)
-                minSize.x = size.x;
-            if (size.y < minSize.y)
-                minSize.y = size.y;
-        }
-    }
-
-    if (sizingFlexibly)
-    {
-        // Give it the min size in either direction regardless of row,
-        // so that we're able to vary the size of the panel according to
-        // the space the toolbar takes up.
-        SetMinSize(minSize);
-    }
-    delete[] row_sizes;
-
-    // Position the groups
-    wxSizeEvent dummy_event(GetSize());
-    OnSize(dummy_event);
-
-    return true;
-}
-
-void wxRibbonToolBar::OnSize(wxSizeEvent& evt)
-{
-    if(m_art == NULL)
-        return;
-
-    // Choose row count with largest possible area
-    wxSize size = evt.GetSize();
-    int row_count = m_nrows_max;
-    wxOrientation major_axis = m_art->GetFlags() & wxRIBBON_BAR_FLOW_VERTICAL ?
-        wxVERTICAL : wxHORIZONTAL;
-
-    // See if we're sizing flexibly, and set min size differently
-    bool sizingFlexibly = false;
-    wxRibbonPanel* panel = wxDynamicCast(GetParent(), wxRibbonPanel);
-    if (panel && (panel->GetFlags() & wxRIBBON_PANEL_FLEXIBLE))
-        sizingFlexibly = true;
-
-    // Without this, there will be redundant horizontal space because SetMinSize will
-    // use the smallest possible height (and therefore largest width).
-    if (sizingFlexibly)
-        major_axis = wxHORIZONTAL;
-
-    wxSize bestSize = m_sizes[0];
-
-    if(m_nrows_max != m_nrows_min)
-    {
-        int area = 0;
-        for(int i = 0; i <= m_nrows_max - m_nrows_min; ++i)
-        {
-            if(m_sizes[i].x <= size.x && m_sizes[i].y <= size.y &&
-                GetSizeInOrientation(m_sizes[i], major_axis) > area)
-            {
-                area = GetSizeInOrientation(m_sizes[i], major_axis);
-                row_count = m_nrows_min + i;
-                bestSize = m_sizes[i];
-            }
-        }
-    }
-
-    // Assign groups to rows and calculate row widths
-    wxSize* row_sizes = new wxSize[row_count];
-    int sep = m_art->GetMetric(wxRIBBON_ART_TOOL_GROUP_SEPARATION_SIZE);
-
-    int r;
-    for(r = 0; r < row_count; ++r)
-        row_sizes[r] = wxSize(0, 0);
-    size_t g;
-    size_t group_count = m_groups.GetCount();
-    for(g = 0; g < group_count; ++g)
-    {
-        wxRibbonToolBarToolGroup* group = m_groups.Item(g);
-        int shortest_row = 0;
-        for(r = 1; r < row_count; ++r)
-        {
-            if(row_sizes[r].GetWidth() < row_sizes[shortest_row].GetWidth())
-                shortest_row = r;
-        }
-        group->position = wxPoint(row_sizes[shortest_row].x, shortest_row);
-        row_sizes[shortest_row].x += group->size.x + sep;
-        if(group->size.y > row_sizes[shortest_row].y)
-            row_sizes[shortest_row].y = group->size.y;
-    }
-
-    // Calculate row positions
-    int total_height = 0;
-    for(r = 0; r < row_count; ++r)
-        total_height += row_sizes[r].GetHeight();
-    int rowsep = (size.GetHeight() - total_height) / (row_count + 1);
-    int* rowypos = new int[row_count];
-    rowypos[0] = rowsep;
-    for(r = 1; r < row_count; ++r)
-    {
-        rowypos[r] = rowypos[r - 1] + row_sizes[r - 1].GetHeight() + rowsep;
-    }
-
-    // Set group y positions
-    for(g = 0; g < group_count; ++g)
-    {
-        wxRibbonToolBarToolGroup* group = m_groups.Item(g);
-        group->position.y = rowypos[group->position.y];
-    }
-
-    delete[] rowypos;
-    delete[] row_sizes;
-}
-
-// Finds the best width and height given the parents' width and height
-wxSize wxRibbonToolBar::GetBestSizeForParentSize(const wxSize& parentSize) const
-{
-    if (!m_sizes)
-        return GetMinSize();
-
-    // Choose row count with largest possible area
-    wxSize size = parentSize;
-
-    // A toolbar should maximize its width whether vertical or horizontal, so
-    // force the major axis to be horizontal. Without this, there will be
-    // redundant horizontal space.
-    wxOrientation major_axis = wxHORIZONTAL;
-    wxSize bestSize = m_sizes[0];
-
-    if(m_nrows_max != m_nrows_min)
-    {
-        int area = 0;
-        for(int i = 0; i <= m_nrows_max - m_nrows_min; ++i)
-        {
-            if(m_sizes[i].x <= size.x && m_sizes[i].y <= size.y &&
-                GetSizeInOrientation(m_sizes[i], major_axis) > area)
-            {
-                area = GetSizeInOrientation(m_sizes[i], major_axis);
-                bestSize = m_sizes[i];
-            }
-        }
-    }
-    return bestSize;
-}
-
-wxSize wxRibbonToolBar::DoGetBestSize() const
-{
-    return GetMinSize();
-}
-
-void wxRibbonToolBar::OnEraseBackground(wxEraseEvent& WXUNUSED(evt))
-{
-    // All painting done in main paint handler to minimise flicker
-}
-
-void wxRibbonToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt))
-{
-    wxAutoBufferedPaintDC dc(this);
-    if(m_art == NULL)
-        return;
-
-    m_art->DrawToolBarBackground(dc, this, GetSize());
-
-    size_t group_count = m_groups.GetCount();
-    size_t g, t;
-    for(g = 0; g < group_count; ++g)
-    {
-        wxRibbonToolBarToolGroup* group = m_groups.Item(g);
-        size_t tool_count = group->tools.GetCount();
-        if(tool_count != 0)
-        {
-            m_art->DrawToolGroupBackground(dc, this,
-                wxRect(group->position, group->size));
-            for(t = 0; t < tool_count; ++t)
-            {
-                wxRibbonToolBarToolBase* tool = group->tools.Item(t);
-                wxRect rect(group->position + tool->position, tool->size);
-                if(tool->state & wxRIBBON_TOOLBAR_TOOL_DISABLED)
-                    m_art->DrawTool(dc, this, rect, tool->bitmap_disabled,
-                        tool->kind, tool->state);
-                else
-                    m_art->DrawTool(dc, this, rect, tool->bitmap, tool->kind,
-                        tool->state);
-            }
-        }
-    }
-}
-
-void wxRibbonToolBar::OnMouseMove(wxMouseEvent& evt)
-{
-    wxPoint pos(evt.GetPosition());
-    wxRibbonToolBarToolBase *new_hover = NULL;
-
-    size_t group_count = m_groups.GetCount();
-    size_t g, t;
-    for(g = 0; g < group_count; ++g)
-    {
-        wxRibbonToolBarToolGroup* group = m_groups.Item(g);
-        if(group->position.x <= pos.x && pos.x < group->position.x + group->size.x
-            && group->position.y <= pos.y && pos.y < group->position.y + group->size.y)
-        {
-            size_t tool_count = group->tools.GetCount();
-            pos -= group->position;
-            for(t = 0; t < tool_count; ++t)
-            {
-                wxRibbonToolBarToolBase* tool = group->tools.Item(t);
-                if(tool->position.x <= pos.x && pos.x < tool->position.x + tool->size.x
-                    && tool->position.y <= pos.y && pos.y < tool->position.y + tool->size.y)
-                {
-                    pos -= tool->position;
-                    new_hover = tool;
-                    break;
-                }
-            }
-            break;
-        }
-    }
-
-#if wxUSE_TOOLTIPS
-    if(new_hover)
-    {
-        SetToolTip(new_hover->help_string);
-    }
-    else if(GetToolTip())
-    {
-        UnsetToolTip();
-    }
-#endif
-
-    if(new_hover && new_hover->state & wxRIBBON_TOOLBAR_TOOL_DISABLED)
-    {
-        new_hover = NULL; // A disabled tool can not be hilighted
-    }
-
-    if(new_hover != m_hover_tool)
-    {
-        if(m_hover_tool)
-        {
-            m_hover_tool->state &= ~(wxRIBBON_TOOLBAR_TOOL_HOVER_MASK
-                | wxRIBBON_TOOLBAR_TOOL_ACTIVE_MASK);
-        }
-        m_hover_tool = new_hover;
-        if(new_hover)
-        {
-            long what = wxRIBBON_TOOLBAR_TOOL_NORMAL_HOVERED;
-            if(new_hover->dropdown.Contains(pos))
-                what = wxRIBBON_TOOLBAR_TOOL_DROPDOWN_HOVERED;
-
-            new_hover->state |= what;
-
-            if(new_hover == m_active_tool)
-            {
-                new_hover->state &= ~wxRIBBON_TOOLBAR_TOOL_ACTIVE_MASK;
-                new_hover->state |= (what << 2);
-            }
-        }
-        Refresh(false);
-    }
-    else if(m_hover_tool && m_hover_tool->kind == wxRIBBON_BUTTON_HYBRID)
-    {
-        long newstate = m_hover_tool->state &~wxRIBBON_TOOLBAR_TOOL_HOVER_MASK;
-        long what = wxRIBBON_TOOLBAR_TOOL_NORMAL_HOVERED;
-        if(m_hover_tool->dropdown.Contains(pos))
-            what = wxRIBBON_TOOLBAR_TOOL_DROPDOWN_HOVERED;
-        newstate |= what;
-        if(newstate != m_hover_tool->state)
-        {
-            m_hover_tool->state = newstate;
-            if(m_hover_tool == m_active_tool)
-            {
-                m_hover_tool->state &= ~wxRIBBON_TOOLBAR_TOOL_ACTIVE_MASK;
-                m_hover_tool->state |= (what << 2);
-            }
-            Refresh(false);
-        }
-    }
-}
-
-void wxRibbonToolBar::OnMouseDown(wxMouseEvent& evt)
-{
-    OnMouseMove(evt);
-    if(m_hover_tool)
-    {
-        m_active_tool = m_hover_tool;
-        m_active_tool->state |=
-            (m_active_tool->state & wxRIBBON_TOOLBAR_TOOL_HOVER_MASK) << 2;
-        Refresh(false);
-    }
-}
-
-void wxRibbonToolBar::OnMouseLeave(wxMouseEvent& WXUNUSED(evt))
-{
-    if(m_hover_tool)
-    {
-        m_hover_tool->state &= ~wxRIBBON_TOOLBAR_TOOL_HOVER_MASK;
-        m_hover_tool = NULL;
-        Refresh(false);
-    }
-}
-
-void wxRibbonToolBar::OnMouseUp(wxMouseEvent& WXUNUSED(evt))
-{
-    if(m_active_tool)
-    {
-        if(m_active_tool->state & wxRIBBON_TOOLBAR_TOOL_ACTIVE_MASK)
-        {
-            wxEventType evt_type = wxEVT_RIBBONTOOLBAR_CLICKED;
-            if(m_active_tool->state & wxRIBBON_TOOLBAR_TOOL_DROPDOWN_ACTIVE)
-                evt_type = wxEVT_RIBBONTOOLBAR_DROPDOWN_CLICKED;
-            wxRibbonToolBarEvent notification(evt_type, m_active_tool->id);
-            if(m_active_tool->kind == wxRIBBON_BUTTON_TOGGLE)
-            {
-                m_active_tool->state ^=
-                    wxRIBBON_BUTTONBAR_BUTTON_TOGGLED;
-                notification.SetInt(m_active_tool->state &
-                    wxRIBBON_BUTTONBAR_BUTTON_TOGGLED);
-            }
-            notification.SetEventObject(this);
-            notification.SetBar(this);
-            ProcessEvent(notification);
-
-            wxStaticCast(m_parent, wxRibbonPanel)->HideIfExpanded();
-        }
-
-        // Notice that m_active_tool could have been reset by the event handler
-        // above so we need to test it again.
-        if (m_active_tool)
-        {
-            m_active_tool->state &= ~wxRIBBON_TOOLBAR_TOOL_ACTIVE_MASK;
-            m_active_tool = NULL;
-            Refresh(false);
-        }
-    }
-}
-
-void wxRibbonToolBar::OnMouseEnter(wxMouseEvent& evt)
-{
-    if(m_active_tool && !evt.LeftIsDown())
-    {
-        m_active_tool = NULL;
-    }
-}
-
-void wxRibbonToolBar::UpdateWindowUI(long flags)
-{
-    wxWindowBase::UpdateWindowUI(flags);
-
-    // don't waste time updating state of tools in a hidden toolbar
-    if ( !IsShown() )
-        return;
-
-    size_t group_count = m_groups.GetCount();
-    size_t g, t;
-    for(g = 0; g < group_count; ++g)
-    {
-        wxRibbonToolBarToolGroup* group = m_groups.Item(g);
-        size_t tool_count = group->tools.GetCount();
-        for(t = 0; t < tool_count; ++t)
-        {
-            wxRibbonToolBarToolBase* tool = group->tools.Item(t);
-            int id = tool->id;
-
-            wxUpdateUIEvent event(id);
-            event.SetEventObject(this);
-
-            if ( ProcessWindowEvent(event) )
-            {
-                if ( event.GetSetEnabled() )
-                    EnableTool(id, event.GetEnabled());
-                if ( event.GetSetChecked() )
-                    ToggleTool(id, event.GetChecked());
-            }
-        }
-    }
-}
-
-bool wxRibbonToolBarEvent::PopupMenu(wxMenu* menu)
-{
-    wxPoint pos = wxDefaultPosition;
-    if(m_bar->m_active_tool)
-    {
-        // Find the group which contains the tool
-        size_t group_count = m_bar->m_groups.GetCount();
-        size_t g, t;
-        for(g = 0; g < group_count; ++g)
-        {
-            wxRibbonToolBarToolGroup* group = m_bar->m_groups.Item(g);
-            size_t tool_count = group->tools.GetCount();
-            for(t = 0; t < tool_count; ++t)
-            {
-                wxRibbonToolBarToolBase* tool = group->tools.Item(t);
-                if(tool == m_bar->m_active_tool)
-                {
-                    pos = group->position;
-                    pos += tool->position;
-                    pos.y += tool->size.GetHeight();
-                    g = group_count;
-                    break;
-                }
-            }
-        }
-    }
-    return m_bar->PopupMenu(menu, pos);
-}
-
-#endif // wxUSE_RIBBON
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xml/descrip.mms b/3rdparty/wxwidgets3.0-3.0.1/src/xml/descrip.mms
deleted file mode 100644
index f79bab55cb..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xml/descrip.mms
+++ /dev/null
@@ -1,68 +0,0 @@
-#*****************************************************************************
-#                                                                            *
-# Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 13 February 2006                                                    *
-#                                                                            *
-#*****************************************************************************
-.first
-	define wx [--.include.wx]
-
-.ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
-	   /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
-.else
-.ifdef __WXGTK__
-CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
-	   /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
-.else
-.ifdef __WXGTK2__
-CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2)/float=ieee/name=(as_is,short)/ieee=denorm\
-	   /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2)/float=ieee/name=(as_is,short)/ieee=denorm
-.else
-.ifdef __WXX11__
-CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
-	/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
-	/name=(as_is,short)
-.else
-CXX_DEFINE =
-CC_DEFINE =
-.endif
-.endif
-.endif
-.endif
-
-.suffixes : .cpp
-
-.cpp.obj :
-	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
-.c.obj :
-	cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
-
-OBJECTS = xml.obj\
-
-SOURCES = xml.cpp\
-  
-all : $(SOURCES)
-	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
-.ifdef __WXMOTIF__
-	library [--.lib]libwx_motif.olb $(OBJECTS)
-.else
-.ifdef __WXGTK__
-	library [--.lib]libwx_gtk.olb $(OBJECTS)
-.else
-.ifdef __WXGTK2__
-	library [--.lib]libwx_gtk2.olb $(OBJECTS)
-.else
-.ifdef __WXX11__
-	library [--.lib]libwx_x11_univ.olb $(OBJECTS)
-.endif
-.endif
-.endif
-.endif
-
-xml.obj : xml.cpp
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xml/xml.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xml/xml.cpp
deleted file mode 100644
index 665c4b906b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xml/xml.cpp
+++ /dev/null
@@ -1,1158 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xml/xml.cpp
-// Purpose:     wxXmlDocument - XML parser & data holder class
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XML
-
-#include "wx/xml/xml.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/app.h"
-#endif
-
-#include "wx/wfstream.h"
-#include "wx/datstrm.h"
-#include "wx/zstream.h"
-#include "wx/strconv.h"
-#include "wx/scopedptr.h"
-#include "wx/versioninfo.h"
-
-#include "expat.h" // from Expat
-
-// DLL options compatibility check:
-WX_CHECK_BUILD_OPTIONS("wxXML")
-
-
-IMPLEMENT_CLASS(wxXmlDocument, wxObject)
-
-
-// a private utility used by wxXML
-static bool wxIsWhiteOnly(const wxString& buf);
-
-
-//-----------------------------------------------------------------------------
-//  wxXmlNode
-//-----------------------------------------------------------------------------
-
-wxXmlNode::wxXmlNode(wxXmlNode *parent,wxXmlNodeType type,
-                     const wxString& name, const wxString& content,
-                     wxXmlAttribute *attrs, wxXmlNode *next, int lineNo)
-    : m_type(type), m_name(name), m_content(content),
-      m_attrs(attrs), m_parent(parent),
-      m_children(NULL), m_next(next),
-      m_lineNo(lineNo),
-      m_noConversion(false)
-{
-    wxASSERT_MSG ( type != wxXML_ELEMENT_NODE || content.empty(), "element nodes can't have content" );
-
-    if (m_parent)
-    {
-        if (m_parent->m_children)
-        {
-            m_next = m_parent->m_children;
-            m_parent->m_children = this;
-        }
-        else
-            m_parent->m_children = this;
-    }
-}
-
-wxXmlNode::wxXmlNode(wxXmlNodeType type, const wxString& name,
-                     const wxString& content,
-                     int lineNo)
-    : m_type(type), m_name(name), m_content(content),
-      m_attrs(NULL), m_parent(NULL),
-      m_children(NULL), m_next(NULL),
-      m_lineNo(lineNo), m_noConversion(false)
-{
-    wxASSERT_MSG ( type != wxXML_ELEMENT_NODE || content.empty(), "element nodes can't have content" );
-}
-
-wxXmlNode::wxXmlNode(const wxXmlNode& node)
-{
-    m_next = NULL;
-    m_parent = NULL;
-    DoCopy(node);
-}
-
-wxXmlNode::~wxXmlNode()
-{
-    DoFree();
-}
-
-wxXmlNode& wxXmlNode::operator=(const wxXmlNode& node)
-{
-    if ( &node != this )
-    {
-        DoFree();
-        DoCopy(node);
-    }
-
-    return *this;
-}
-
-void wxXmlNode::DoFree()
-{
-    wxXmlNode *c, *c2;
-    for (c = m_children; c; c = c2)
-    {
-        c2 = c->m_next;
-        delete c;
-    }
-
-    wxXmlAttribute *p, *p2;
-    for (p = m_attrs; p; p = p2)
-    {
-        p2 = p->GetNext();
-        delete p;
-    }
-}
-
-void wxXmlNode::DoCopy(const wxXmlNode& node)
-{
-    m_type = node.m_type;
-    m_name = node.m_name;
-    m_content = node.m_content;
-    m_lineNo = node.m_lineNo;
-    m_noConversion = node.m_noConversion;
-    m_children = NULL;
-
-    wxXmlNode *n = node.m_children;
-    while (n)
-    {
-        AddChild(new wxXmlNode(*n));
-        n = n->GetNext();
-    }
-
-    m_attrs = NULL;
-    wxXmlAttribute *p = node.m_attrs;
-    while (p)
-    {
-       AddAttribute(p->GetName(), p->GetValue());
-       p = p->GetNext();
-    }
-}
-
-bool wxXmlNode::HasAttribute(const wxString& attrName) const
-{
-    wxXmlAttribute *attr = GetAttributes();
-
-    while (attr)
-    {
-        if (attr->GetName() == attrName) return true;
-        attr = attr->GetNext();
-    }
-
-    return false;
-}
-
-bool wxXmlNode::GetAttribute(const wxString& attrName, wxString *value) const
-{
-    wxCHECK_MSG( value, false, "value argument must not be NULL" );
-
-    wxXmlAttribute *attr = GetAttributes();
-
-    while (attr)
-    {
-        if (attr->GetName() == attrName)
-        {
-            *value = attr->GetValue();
-            return true;
-        }
-        attr = attr->GetNext();
-    }
-
-    return false;
-}
-
-wxString wxXmlNode::GetAttribute(const wxString& attrName, const wxString& defaultVal) const
-{
-    wxString tmp;
-    if (GetAttribute(attrName, &tmp))
-        return tmp;
-
-    return defaultVal;
-}
-
-void wxXmlNode::AddChild(wxXmlNode *child)
-{
-    if (m_children == NULL)
-        m_children = child;
-    else
-    {
-        wxXmlNode *ch = m_children;
-        while (ch->m_next) ch = ch->m_next;
-        ch->m_next = child;
-    }
-    child->m_next = NULL;
-    child->m_parent = this;
-}
-
-// inserts a new node in front of 'followingNode'
-bool wxXmlNode::InsertChild(wxXmlNode *child, wxXmlNode *followingNode)
-{
-    wxCHECK_MSG( child, false, "cannot insert a NULL node!" );
-    wxCHECK_MSG( child->m_parent == NULL, false, "node already has a parent" );
-    wxCHECK_MSG( child->m_next == NULL, false, "node already has m_next" );
-    wxCHECK_MSG( followingNode == NULL || followingNode->GetParent() == this,
-                 false,
-                 "wxXmlNode::InsertChild - followingNode has incorrect parent" );
-
-    // this is for backward compatibility, NULL was allowed here thanks to
-    // the confusion about followingNode's meaning
-    if ( followingNode == NULL )
-        followingNode = m_children;
-
-    if ( m_children == followingNode )
-    {
-        child->m_next = m_children;
-        m_children = child;
-    }
-    else
-    {
-        wxXmlNode *ch = m_children;
-        while ( ch && ch->m_next != followingNode )
-            ch = ch->m_next;
-        if ( !ch )
-        {
-            wxFAIL_MSG( "followingNode has this node as parent, but couldn't be found among children" );
-            return false;
-        }
-
-        child->m_next = followingNode;
-        ch->m_next = child;
-    }
-
-    child->m_parent = this;
-    return true;
-}
-
-// inserts a new node right after 'precedingNode'
-bool wxXmlNode::InsertChildAfter(wxXmlNode *child, wxXmlNode *precedingNode)
-{
-    wxCHECK_MSG( child, false, "cannot insert a NULL node!" );
-    wxCHECK_MSG( child->m_parent == NULL, false, "node already has a parent" );
-    wxCHECK_MSG( child->m_next == NULL, false, "node already has m_next" );
-    wxCHECK_MSG( precedingNode == NULL || precedingNode->m_parent == this, false,
-                 "precedingNode has wrong parent" );
-
-    if ( precedingNode )
-    {
-        child->m_next = precedingNode->m_next;
-        precedingNode->m_next = child;
-    }
-    else // precedingNode == NULL
-    {
-        wxCHECK_MSG( m_children == NULL, false,
-                     "NULL precedingNode only makes sense when there are no children" );
-
-        child->m_next = m_children;
-        m_children = child;
-    }
-
-    child->m_parent = this;
-    return true;
-}
-
-bool wxXmlNode::RemoveChild(wxXmlNode *child)
-{
-    if (m_children == NULL)
-        return false;
-    else if (m_children == child)
-    {
-        m_children = child->m_next;
-        child->m_parent = NULL;
-        child->m_next = NULL;
-        return true;
-    }
-    else
-    {
-        wxXmlNode *ch = m_children;
-        while (ch->m_next)
-        {
-            if (ch->m_next == child)
-            {
-                ch->m_next = child->m_next;
-                child->m_parent = NULL;
-                child->m_next = NULL;
-                return true;
-            }
-            ch = ch->m_next;
-        }
-        return false;
-    }
-}
-
-void wxXmlNode::AddAttribute(const wxString& name, const wxString& value)
-{
-    AddProperty(name, value);
-}
-
-void wxXmlNode::AddAttribute(wxXmlAttribute *attr)
-{
-    AddProperty(attr);
-}
-
-bool wxXmlNode::DeleteAttribute(const wxString& name)
-{
-    return DeleteProperty(name);
-}
-
-void wxXmlNode::AddProperty(const wxString& name, const wxString& value)
-{
-    AddProperty(new wxXmlAttribute(name, value, NULL));
-}
-
-void wxXmlNode::AddProperty(wxXmlAttribute *attr)
-{
-    if (m_attrs == NULL)
-        m_attrs = attr;
-    else
-    {
-        wxXmlAttribute *p = m_attrs;
-        while (p->GetNext()) p = p->GetNext();
-        p->SetNext(attr);
-    }
-}
-
-bool wxXmlNode::DeleteProperty(const wxString& name)
-{
-    wxXmlAttribute *attr;
-
-    if (m_attrs == NULL)
-        return false;
-
-    else if (m_attrs->GetName() == name)
-    {
-        attr = m_attrs;
-        m_attrs = attr->GetNext();
-        attr->SetNext(NULL);
-        delete attr;
-        return true;
-    }
-
-    else
-    {
-        wxXmlAttribute *p = m_attrs;
-        while (p->GetNext())
-        {
-            if (p->GetNext()->GetName() == name)
-            {
-                attr = p->GetNext();
-                p->SetNext(attr->GetNext());
-                attr->SetNext(NULL);
-                delete attr;
-                return true;
-            }
-            p = p->GetNext();
-        }
-        return false;
-    }
-}
-
-wxString wxXmlNode::GetNodeContent() const
-{
-    wxXmlNode *n = GetChildren();
-
-    while (n)
-    {
-        if (n->GetType() == wxXML_TEXT_NODE ||
-            n->GetType() == wxXML_CDATA_SECTION_NODE)
-            return n->GetContent();
-        n = n->GetNext();
-    }
-    return wxEmptyString;
-}
-
-int wxXmlNode::GetDepth(wxXmlNode *grandparent) const
-{
-    const wxXmlNode *n = this;
-    int ret = -1;
-
-    do
-    {
-        ret++;
-        n = n->GetParent();
-        if (n == grandparent)
-            return ret;
-
-    } while (n);
-
-    return wxNOT_FOUND;
-}
-
-bool wxXmlNode::IsWhitespaceOnly() const
-{
-    return wxIsWhiteOnly(m_content);
-}
-
-
-
-//-----------------------------------------------------------------------------
-//  wxXmlDocument
-//-----------------------------------------------------------------------------
-
-wxXmlDocument::wxXmlDocument()
-    : m_version(wxS("1.0")), m_fileEncoding(wxS("UTF-8")), m_docNode(NULL)
-{
-#if !wxUSE_UNICODE
-    m_encoding = wxS("UTF-8");
-#endif
-}
-
-wxXmlDocument::wxXmlDocument(const wxString& filename, const wxString& encoding)
-              :wxObject(), m_docNode(NULL)
-{
-    if ( !Load(filename, encoding) )
-    {
-        wxDELETE(m_docNode);
-    }
-}
-
-wxXmlDocument::wxXmlDocument(wxInputStream& stream, const wxString& encoding)
-              :wxObject(), m_docNode(NULL)
-{
-    if ( !Load(stream, encoding) )
-    {
-        wxDELETE(m_docNode);
-    }
-}
-
-wxXmlDocument::wxXmlDocument(const wxXmlDocument& doc)
-              :wxObject()
-{
-    DoCopy(doc);
-}
-
-wxXmlDocument& wxXmlDocument::operator=(const wxXmlDocument& doc)
-{
-    wxDELETE(m_docNode);
-    DoCopy(doc);
-    return *this;
-}
-
-void wxXmlDocument::DoCopy(const wxXmlDocument& doc)
-{
-    m_version = doc.m_version;
-#if !wxUSE_UNICODE
-    m_encoding = doc.m_encoding;
-#endif
-    m_fileEncoding = doc.m_fileEncoding;
-
-    if (doc.m_docNode)
-        m_docNode = new wxXmlNode(*doc.m_docNode);
-    else
-        m_docNode = NULL;
-}
-
-bool wxXmlDocument::Load(const wxString& filename, const wxString& encoding, int flags)
-{
-    wxFileInputStream stream(filename);
-    if (!stream.IsOk())
-        return false;
-    return Load(stream, encoding, flags);
-}
-
-bool wxXmlDocument::Save(const wxString& filename, int indentstep) const
-{
-    wxFileOutputStream stream(filename);
-    if (!stream.IsOk())
-        return false;
-    return Save(stream, indentstep);
-}
-
-wxXmlNode *wxXmlDocument::GetRoot() const
-{
-    wxXmlNode *node = m_docNode;
-    if (node)
-    {
-        node = m_docNode->GetChildren();
-        while (node != NULL && node->GetType() != wxXML_ELEMENT_NODE)
-            node = node->GetNext();
-    }
-    return node;
-}
-
-wxXmlNode *wxXmlDocument::DetachRoot()
-{
-    wxXmlNode *node = m_docNode;
-    if (node)
-    {
-        node = m_docNode->GetChildren();
-        wxXmlNode *prev = NULL;
-        while (node != NULL && node->GetType() != wxXML_ELEMENT_NODE)
-        {
-            prev = node;
-            node = node->GetNext();
-        }
-        if (node)
-        {
-            if (node == m_docNode->GetChildren())
-                m_docNode->SetChildren(node->GetNext());
-
-            if (prev)
-                prev->SetNext(node->GetNext());
-
-            node->SetParent(NULL);
-            node->SetNext(NULL);
-        }
-    }
-    return node;
-}
-
-void wxXmlDocument::SetRoot(wxXmlNode *root)
-{
-    if (root)
-    {
-        wxASSERT_MSG( root->GetType() == wxXML_ELEMENT_NODE,
-                      "Can only set an element type node as root" );
-    }
-
-    wxXmlNode *node = m_docNode;
-    if (node)
-    {
-        node = m_docNode->GetChildren();
-        wxXmlNode *prev = NULL;
-        while (node != NULL && node->GetType() != wxXML_ELEMENT_NODE)
-        {
-            prev = node;
-            node = node->GetNext();
-        }
-        if (node && root)
-        {
-            root->SetNext( node->GetNext() );
-            wxDELETE(node);
-        }
-        if (prev)
-            prev->SetNext(root);
-        else
-            m_docNode->SetChildren(root);
-    }
-    else
-    {
-        m_docNode = new wxXmlNode(wxXML_DOCUMENT_NODE, wxEmptyString);
-        m_docNode->SetChildren(root);
-    }
-    if (root)
-        root->SetParent(m_docNode);
-}
-
-void wxXmlDocument::AppendToProlog(wxXmlNode *node)
-{
-    if (!m_docNode)
-        m_docNode = new wxXmlNode(wxXML_DOCUMENT_NODE, wxEmptyString);
-    if (IsOk())
-        m_docNode->InsertChild( node, GetRoot() );
-    else
-        m_docNode->AddChild( node );
-}
-
-//-----------------------------------------------------------------------------
-//  wxXmlDocument loading routines
-//-----------------------------------------------------------------------------
-
-// converts Expat-produced string in UTF-8 into wxString using the specified
-// conv or keep in UTF-8 if conv is NULL
-static wxString CharToString(wxMBConv *conv,
-                             const char *s, size_t len = wxString::npos)
-{
-#if !wxUSE_UNICODE
-    if ( conv )
-    {
-        // there can be no embedded NULs in this string so we don't need the
-        // output length, it will be NUL-terminated
-        const wxWCharBuffer wbuf(
-            wxConvUTF8.cMB2WC(s, len == wxString::npos ? wxNO_LEN : len, NULL));
-
-        return wxString(wbuf, *conv);
-    }
-    // else: the string is wanted in UTF-8
-#endif // !wxUSE_UNICODE
-
-    wxUnusedVar(conv);
-    return wxString::FromUTF8Unchecked(s, len);
-}
-
-// returns true if the given string contains only whitespaces
-bool wxIsWhiteOnly(const wxString& buf)
-{
-    for ( wxString::const_iterator i = buf.begin(); i != buf.end(); ++i )
-    {
-        wxChar c = *i;
-        if ( c != wxS(' ') && c != wxS('\t') && c != wxS('\n') && c != wxS('\r'))
-            return false;
-    }
-    return true;
-}
-
-
-struct wxXmlParsingContext
-{
-    wxXmlParsingContext()
-        : conv(NULL),
-          node(NULL),
-          lastChild(NULL),
-          lastAsText(NULL),
-          removeWhiteOnlyNodes(false)
-    {}
-
-    XML_Parser parser;
-    wxMBConv  *conv;
-    wxXmlNode *node;                    // the node being parsed
-    wxXmlNode *lastChild;               // the last child of "node"
-    wxXmlNode *lastAsText;              // the last _text_ child of "node"
-    wxString   encoding;
-    wxString   version;
-    bool       removeWhiteOnlyNodes;
-};
-
-// checks that ctx->lastChild is in consistent state
-#define ASSERT_LAST_CHILD_OK(ctx)                                   \
-    wxASSERT( ctx->lastChild == NULL ||                             \
-              ctx->lastChild->GetNext() == NULL );                  \
-    wxASSERT( ctx->lastChild == NULL ||                             \
-              ctx->lastChild->GetParent() == ctx->node )
-
-extern "C" {
-static void StartElementHnd(void *userData, const char *name, const char **atts)
-{
-    wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
-    wxXmlNode *node = new wxXmlNode(wxXML_ELEMENT_NODE,
-                                    CharToString(ctx->conv, name),
-                                    wxEmptyString,
-                                    XML_GetCurrentLineNumber(ctx->parser));
-    const char **a = atts;
-
-    // add node attributes
-    while (*a)
-    {
-        node->AddAttribute(CharToString(ctx->conv, a[0]), CharToString(ctx->conv, a[1]));
-        a += 2;
-    }
-
-    ASSERT_LAST_CHILD_OK(ctx);
-    ctx->node->InsertChildAfter(node, ctx->lastChild);
-    ctx->lastAsText = NULL;
-    ctx->lastChild = NULL; // our new node "node" has no children yet
-
-    ctx->node = node;
-}
-
-static void EndElementHnd(void *userData, const char* WXUNUSED(name))
-{
-    wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
-
-    // we're exiting the last children of ctx->node->GetParent() and going
-    // back one level up, so current value of ctx->node points to the last
-    // child of ctx->node->GetParent()
-    ctx->lastChild = ctx->node;
-
-    ctx->node = ctx->node->GetParent();
-    ctx->lastAsText = NULL;
-}
-
-static void TextHnd(void *userData, const char *s, int len)
-{
-    wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
-    wxString str = CharToString(ctx->conv, s, len);
-
-    if (ctx->lastAsText)
-    {
-        ctx->lastAsText->SetContent(ctx->lastAsText->GetContent() + str);
-    }
-    else
-    {
-        bool whiteOnly = false;
-        if (ctx->removeWhiteOnlyNodes)
-            whiteOnly = wxIsWhiteOnly(str);
-
-        if (!whiteOnly)
-        {
-            wxXmlNode *textnode =
-                new wxXmlNode(wxXML_TEXT_NODE, wxS("text"), str,
-                              XML_GetCurrentLineNumber(ctx->parser));
-
-            ASSERT_LAST_CHILD_OK(ctx);
-            ctx->node->InsertChildAfter(textnode, ctx->lastChild);
-            ctx->lastChild= ctx->lastAsText = textnode;
-        }
-    }
-}
-
-static void StartCdataHnd(void *userData)
-{
-    wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
-
-    wxXmlNode *textnode =
-        new wxXmlNode(wxXML_CDATA_SECTION_NODE, wxS("cdata"), wxS(""),
-                      XML_GetCurrentLineNumber(ctx->parser));
-
-    ASSERT_LAST_CHILD_OK(ctx);
-    ctx->node->InsertChildAfter(textnode, ctx->lastChild);
-    ctx->lastChild= ctx->lastAsText = textnode;
-}
-
-static void EndCdataHnd(void *userData)
-{
-    wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
-
-    // we need to reset this pointer so that subsequent text nodes don't append
-    // their contents to this one but create new wxXML_TEXT_NODE objects (or
-    // not create anything at all if only white space follows the CDATA section
-    // and wxXMLDOC_KEEP_WHITESPACE_NODES is not used as is commonly the case)
-    ctx->lastAsText = NULL;
-}
-
-static void CommentHnd(void *userData, const char *data)
-{
-    wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
-
-    wxXmlNode *commentnode =
-        new wxXmlNode(wxXML_COMMENT_NODE,
-                      wxS("comment"), CharToString(ctx->conv, data),
-                      XML_GetCurrentLineNumber(ctx->parser));
-
-    ASSERT_LAST_CHILD_OK(ctx);
-    ctx->node->InsertChildAfter(commentnode, ctx->lastChild);
-    ctx->lastChild = commentnode;
-    ctx->lastAsText = NULL;
-}
-
-static void PIHnd(void *userData, const char *target, const char *data)
-{
-    wxXmlParsingContext *ctx = (wxXmlParsingContext*)userData;
-
-    wxXmlNode *pinode =
-        new wxXmlNode(wxXML_PI_NODE, CharToString(ctx->conv, target),
-                      CharToString(ctx->conv, data),
-                      XML_GetCurrentLineNumber(ctx->parser));
-
-    ASSERT_LAST_CHILD_OK(ctx);
-    ctx->node->InsertChildAfter(pinode, ctx->lastChild);
-    ctx->lastChild = pinode;
-    ctx->lastAsText = NULL;
-}
-
-static void DefaultHnd(void *userData, const char *s, int len)
-{
-    // XML header:
-    if (len > 6 && memcmp(s, "conv, s, (size_t)len);
-        int pos;
-        pos = buf.Find(wxS("encoding="));
-        if (pos != wxNOT_FOUND)
-            ctx->encoding = buf.Mid(pos + 10).BeforeFirst(buf[(size_t)pos+9]);
-        pos = buf.Find(wxS("version="));
-        if (pos != wxNOT_FOUND)
-            ctx->version = buf.Mid(pos + 9).BeforeFirst(buf[(size_t)pos+8]);
-    }
-}
-
-static int UnknownEncodingHnd(void * WXUNUSED(encodingHandlerData),
-                              const XML_Char *name, XML_Encoding *info)
-{
-    // We must build conversion table for expat. The easiest way to do so
-    // is to let wxCSConv convert as string containing all characters to
-    // wide character representation:
-    wxCSConv conv(name);
-    char mbBuf[2];
-    wchar_t wcBuf[10];
-    size_t i;
-
-    mbBuf[1] = 0;
-    info->map[0] = 0;
-    for (i = 0; i < 255; i++)
-    {
-        mbBuf[0] = (char)(i+1);
-        if (conv.MB2WC(wcBuf, mbBuf, 2) == (size_t)-1)
-        {
-            // invalid/undefined byte in the encoding:
-            info->map[i+1] = -1;
-        }
-        info->map[i+1] = (int)wcBuf[0];
-    }
-
-    info->data = NULL;
-    info->convert = NULL;
-    info->release = NULL;
-
-    return 1;
-}
-
-} // extern "C"
-
-bool wxXmlDocument::Load(wxInputStream& stream, const wxString& encoding, int flags)
-{
-#if wxUSE_UNICODE
-    (void)encoding;
-#else
-    m_encoding = encoding;
-#endif
-
-    const size_t BUFSIZE = 1024;
-    char buf[BUFSIZE];
-    wxXmlParsingContext ctx;
-    bool done;
-    XML_Parser parser = XML_ParserCreate(NULL);
-    wxXmlNode *root = new wxXmlNode(wxXML_DOCUMENT_NODE, wxEmptyString);
-
-    ctx.encoding = wxS("UTF-8"); // default in absence of encoding=""
-    ctx.conv = NULL;
-#if !wxUSE_UNICODE
-    if ( encoding.CmpNoCase(wxS("UTF-8")) != 0 )
-        ctx.conv = new wxCSConv(encoding);
-#endif
-    ctx.removeWhiteOnlyNodes = (flags & wxXMLDOC_KEEP_WHITESPACE_NODES) == 0;
-    ctx.parser = parser;
-    ctx.node = root;
-
-    XML_SetUserData(parser, (void*)&ctx);
-    XML_SetElementHandler(parser, StartElementHnd, EndElementHnd);
-    XML_SetCharacterDataHandler(parser, TextHnd);
-    XML_SetCdataSectionHandler(parser, StartCdataHnd, EndCdataHnd);;
-    XML_SetCommentHandler(parser, CommentHnd);
-    XML_SetProcessingInstructionHandler(parser, PIHnd);
-    XML_SetDefaultHandler(parser, DefaultHnd);
-    XML_SetUnknownEncodingHandler(parser, UnknownEncodingHnd, NULL);
-
-    bool ok = true;
-    do
-    {
-        size_t len = stream.Read(buf, BUFSIZE).LastRead();
-        done = (len < BUFSIZE);
-        if (!XML_Parse(parser, buf, len, done))
-        {
-            wxString error(XML_ErrorString(XML_GetErrorCode(parser)),
-                           *wxConvCurrent);
-            wxLogError(_("XML parsing error: '%s' at line %d"),
-                       error.c_str(),
-                       (int)XML_GetCurrentLineNumber(parser));
-            ok = false;
-            break;
-        }
-    } while (!done);
-
-    if (ok)
-    {
-        if (!ctx.version.empty())
-            SetVersion(ctx.version);
-        if (!ctx.encoding.empty())
-            SetFileEncoding(ctx.encoding);
-        SetDocumentNode(root);
-    }
-    else
-    {
-        delete root;
-    }
-
-    XML_ParserFree(parser);
-#if !wxUSE_UNICODE
-    if ( ctx.conv )
-        delete ctx.conv;
-#endif
-
-    return ok;
-
-}
-
-
-
-//-----------------------------------------------------------------------------
-//  wxXmlDocument saving routines
-//-----------------------------------------------------------------------------
-
-// helpers for XML generation
-namespace
-{
-
-// write string to output:
-bool OutputString(wxOutputStream& stream,
-                  const wxString& str,
-                  wxMBConv *convMem,
-                  wxMBConv *convFile)
-{
-    if (str.empty())
-        return true;
-
-#if wxUSE_UNICODE
-    wxUnusedVar(convMem);
-    if ( !convFile )
-        convFile = &wxConvUTF8;
-
-    const wxScopedCharBuffer buf(str.mb_str(*convFile));
-    if ( !buf.length() )
-    {
-        // conversion failed, can't write this string in an XML file in this
-        // (presumably non-UTF-8) encoding
-        return false;
-    }
-
-    stream.Write(buf, buf.length());
-#else // !wxUSE_UNICODE
-    if ( convFile && convMem )
-    {
-        wxString str2(str.wc_str(*convMem), *convFile);
-        stream.Write(str2.mb_str(), str2.length());
-    }
-    else // no conversions to do
-    {
-        stream.Write(str.mb_str(), str.length());
-    }
-#endif // wxUSE_UNICODE/!wxUSE_UNICODE
-
-    return stream.IsOk();
-}
-
-enum EscapingMode
-{
-    Escape_Text,
-    Escape_Attribute
-};
-
-// Same as above, but create entities first.
-// Translates '<' to "<", '>' to ">" and so on, according to the spec:
-// http://www.w3.org/TR/2000/WD-xml-c14n-20000119.html#charescaping
-bool OutputEscapedString(wxOutputStream& stream,
-                         const wxString& str,
-                         wxMBConv *convMem,
-                         wxMBConv *convFile,
-                         EscapingMode mode)
-{
-    wxString escaped;
-    escaped.reserve(str.length());
-
-    for ( wxString::const_iterator i = str.begin(); i != str.end(); ++i )
-    {
-        const wxChar c = *i;
-
-        switch ( c )
-        {
-            case wxS('<'):
-                escaped.append(wxS("<"));
-                break;
-            case wxS('>'):
-                escaped.append(wxS(">"));
-                break;
-            case wxS('&'):
-                escaped.append(wxS("&"));
-                break;
-            case wxS('\r'):
-                escaped.append(wxS("
"));
-                break;
-            default:
-                if ( mode == Escape_Attribute )
-                {
-                    switch ( c )
-                    {
-                        case wxS('"'):
-                            escaped.append(wxS("""));
-                            break;
-                        case wxS('\t'):
-                            escaped.append(wxS("	"));
-                            break;
-                        case wxS('\n'):
-                            escaped.append(wxS("
"));
-                            break;
-                        default:
-                            escaped.append(c);
-                    }
-
-                }
-                else
-                {
-                    escaped.append(c);
-                }
-        }
-    }
-
-    return OutputString(stream, escaped, convMem, convFile);
-}
-
-bool OutputIndentation(wxOutputStream& stream,
-                       int indent,
-                       wxMBConv *convMem,
-                       wxMBConv *convFile)
-{
-    wxString str(wxS("\n"));
-    str += wxString(indent, wxS(' '));
-    return OutputString(stream, str, convMem, convFile);
-}
-
-bool OutputNode(wxOutputStream& stream,
-                wxXmlNode *node,
-                int indent,
-                wxMBConv *convMem,
-                wxMBConv *convFile,
-                int indentstep)
-{
-    bool rc;
-    switch (node->GetType())
-    {
-        case wxXML_CDATA_SECTION_NODE:
-            rc = OutputString(stream, wxS("GetContent(), convMem, convFile) &&
-                 OutputString(stream, wxS("]]>"), convMem, convFile);
-            break;
-
-        case wxXML_TEXT_NODE:
-            if (node->GetNoConversion())
-            {
-                stream.Write(node->GetContent().c_str(), node->GetContent().Length());
-                rc = true;
-            }
-            else
-                rc = OutputEscapedString(stream, node->GetContent(),
-                                     convMem, convFile,
-                                     Escape_Text);
-            break;
-
-        case wxXML_ELEMENT_NODE:
-            rc = OutputString(stream, wxS("<"), convMem, convFile) &&
-                 OutputString(stream, node->GetName(), convMem, convFile);
-
-            if ( rc )
-            {
-                for ( wxXmlAttribute *attr = node->GetAttributes();
-                      attr && rc;
-                      attr = attr->GetNext() )
-                {
-                    rc = OutputString(stream,
-                                      wxS(" ") + attr->GetName() +  wxS("=\""),
-                                      convMem, convFile) &&
-                         OutputEscapedString(stream, attr->GetValue(),
-                                             convMem, convFile,
-                                             Escape_Attribute) &&
-                         OutputString(stream, wxS("\""), convMem, convFile);
-                }
-            }
-
-            if ( node->GetChildren() )
-            {
-                rc = OutputString(stream, wxS(">"), convMem, convFile);
-
-                wxXmlNode *prev = NULL;
-                for ( wxXmlNode *n = node->GetChildren();
-                      n && rc;
-                      n = n->GetNext() )
-                {
-                    if ( indentstep >= 0 && n->GetType() != wxXML_TEXT_NODE )
-                    {
-                        rc = OutputIndentation(stream, indent + indentstep,
-                                               convMem, convFile);
-                    }
-
-                    if ( rc )
-                        rc = OutputNode(stream, n, indent + indentstep,
-                                        convMem, convFile, indentstep);
-
-                    prev = n;
-                }
-
-                if ( rc && indentstep >= 0 &&
-                        prev && prev->GetType() != wxXML_TEXT_NODE )
-                {
-                    rc = OutputIndentation(stream, indent, convMem, convFile);
-                }
-
-                if ( rc )
-                {
-                    rc = OutputString(stream, wxS("GetName(),
-                                      convMem, convFile) &&
-                         OutputString(stream, wxS(">"), convMem, convFile);
-                }
-            }
-            else // no children, output ""
-            {
-                rc = OutputString(stream, wxS("/>"), convMem, convFile);
-            }
-            break;
-
-        case wxXML_COMMENT_NODE:
-            rc = OutputString(stream, wxS(""), convMem, convFile);
-            break;
-
-        case wxXML_PI_NODE:
-            rc = OutputString(stream, wxT("GetName(), convMem, convFile) &&
-                 OutputString(stream, wxT(" "), convMem, convFile) &&
-                 OutputString(stream, node->GetContent(), convMem, convFile) &&
-                 OutputString(stream, wxT("?>"), convMem, convFile);
-            break;
-
-        default:
-            wxFAIL_MSG("unsupported node type");
-            rc = false;
-    }
-
-    return rc;
-}
-
-} // anonymous namespace
-
-bool wxXmlDocument::Save(wxOutputStream& stream, int indentstep) const
-{
-    if ( !IsOk() )
-        return false;
-
-    wxScopedPtr convMem, convFile;
-
-#if wxUSE_UNICODE
-    convFile.reset(new wxCSConv(GetFileEncoding()));
-#else
-    if ( GetFileEncoding().CmpNoCase(GetEncoding()) != 0 )
-    {
-        convFile.reset(new wxCSConv(GetFileEncoding()));
-        convMem.reset(new wxCSConv(GetEncoding()));
-    }
-    //else: file and in-memory encodings are the same, no conversion needed
-#endif
-
-    wxString dec = wxString::Format(
-                                    wxS("\n"),
-                                    GetVersion(), GetFileEncoding()
-                                   );
-    bool rc = OutputString(stream, dec, convMem.get(), convFile.get());
-
-    wxXmlNode *node = GetDocumentNode();
-    if ( node )
-        node = node->GetChildren();
-
-    while( rc && node )
-    {
-        rc = OutputNode(stream, node, 0, convMem.get(),
-                        convFile.get(), indentstep) &&
-             OutputString(stream, wxS("\n"), convMem.get(), convFile.get());
-        node = node->GetNext();
-    }
-    return rc;
-}
-
-/*static*/ wxVersionInfo wxXmlDocument::GetLibraryVersionInfo()
-{
-    return wxVersionInfo("expat",
-                         XML_MAJOR_VERSION,
-                         XML_MINOR_VERSION,
-                         XML_MICRO_VERSION);
-}
-
-#endif // wxUSE_XML
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/descrip.mms b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/descrip.mms
deleted file mode 100644
index b1c10c2e4d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/descrip.mms
+++ /dev/null
@@ -1,164 +0,0 @@
-#*****************************************************************************
-#                                                                            *
-# Make file for VMS                                                          *
-# Author : J.Jansen (joukj@hrem.nano.tudelft.nl)                             *
-# Date : 6 November 2012                                                     *
-#                                                                            *
-#*****************************************************************************
-.first
-	define wx [--.include.wx]
-
-.ifdef __WXMOTIF__
-CXX_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)\
-	   /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXMOTIF__=1)/name=(as_is,short)
-.else
-.ifdef __WXGTK__
-CXX_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm\
-	   /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1)/float=ieee/name=(as_is,short)/ieee=denorm
-.else
-.ifdef __WXGTK2__
-CXX_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm\
-	   /assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXGTK__=1,VMS_GTK2=1)/float=ieee/name=(as_is,short)/ieee=denorm
-.else
-.ifdef __WXX11__
-CXX_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
-	/name=(as_is,short)/assume=(nostdnew,noglobal_array_new)
-CC_DEFINE = /define=(__WXX11__=1,__WXUNIVERSAL__==1)/float=ieee\
-	/name=(as_is,short)
-.else
-CXX_DEFINE =
-CC_DEFINE =
-.endif
-.endif
-.endif
-.endif
-
-.suffixes : .cpp
-
-.cpp.obj :
-	cxx $(CXXFLAGS)$(CXX_DEFINE) $(MMS$TARGET_NAME).cpp
-.c.obj :
-	cc $(CFLAGS)$(CC_DEFINE) $(MMS$TARGET_NAME).c
-
-OBJECTS=xh_bmp.obj,xh_bmpbt.obj,xh_bttn.obj,xh_cald.obj,xh_chckb.obj,\
-	xh_chckl.obj,xh_choic.obj,xh_combo.obj,xh_dlg.obj,xh_frame.obj,\
-	xh_gauge.obj,xh_gdctl.obj,xh_html.obj,xh_listb.obj,xh_listc.obj,\
-	xh_menu.obj,xh_notbk.obj,xh_panel.obj,xh_radbt.obj,xh_radbx.obj,\
-	xh_scrol.obj,xh_scwin.obj,xh_sizer.obj,xh_slidr.obj,xh_spin.obj,\
-	xh_split.obj,xh_statbar.obj,xh_stbmp.obj,xh_stbox.obj,xh_stlin.obj,\
-	xh_sttxt.obj,xh_text.obj,xh_tglbtn.obj,xh_toolb.obj,xh_tree.obj,\
-	xh_unkwn.obj,xh_wizrd.obj,xmlres.obj,xmlrsall.obj,xh_listbk.obj,\
-	xh_choicbk.obj,xh_dirpicker.obj,xh_hyperlink.obj,xh_filepicker.obj,\
-	xh_fontpicker.obj,xh_clrpicker.obj,xh_odcombo.obj,xh_mdi.obj,\
-	xh_grid.obj,xh_datectrl.obj,xh_treebk.obj,xh_bmpcbox.obj,\
-	xh_animatctrl.obj,xh_htmllbox.obj,xh_collpane.obj,xh_srchctrl.obj,\
-	xh_propdlg.obj,xh_comboctrl.obj,xmladv.obj,xh_editlbox.obj,\
-	xh_filectrl.obj,xh_cmdlinkbn.obj,xh_toolbk.obj,xh_bannerwindow.obj,\
-	xh_timectrl.obj,xmlreshandler.obj,xh_ribbon.obj
-
-SOURCES =xh_bmp.cpp,xh_bmpbt.cpp,xh_bttn.cpp,xh_cald.cpp,xh_chckb.cpp,\
-	xh_chckl.cpp,xh_choic.cpp,xh_combo.cpp,xh_dlg.cpp,xh_frame.cpp,\
-	xh_gauge.cpp,xh_gdctl.cpp,xh_html.cpp,xh_listb.cpp,xh_listc.cpp,\
-	xh_menu.cpp,xh_notbk.cpp,xh_panel.cpp,xh_radbt.cpp,xh_radbx.cpp,\
-	xh_scrol.cpp,xh_scwin.cpp,xh_sizer.cpp,xh_slidr.cpp,xh_spin.cpp,\
-	xh_split.cpp,xh_statbar.cpp,xh_stbmp.cpp,xh_stbox.cpp,xh_stlin.cpp,\
-	xh_sttxt.cpp,xh_text.cpp,xh_tglbtn.cpp,xh_toolb.cpp,xh_tree.cpp,\
-	xh_unkwn.cpp,xh_wizrd.cpp,xmlres.cpp,xmlrsall.cpp,xh_listbk.cpp,\
-	xh_choicbk.cpp,xh_dirpicker.cpp,xh_hyperlink.cpp,xh_filepicker.cpp,\
-	xh_fontpicker.cpp,xh_clrpicker.cpp,xh_odcombo.cpp,xh_mdi.cpp,\
-	xh_grid.cpp,xh_datectrl.cpp,xh_treebk.cpp,xh_bmpcbox.cpp,\
-	xh_animatctrl.cpp,xh_htmllbox.cpp,xh_collpane.cpp,xh_srchctrl.cpp,\
-	xh_propdlg.cpp,xh_comboctrl.cpp,xmladv.cpp,xh_editlbox.cpp,\
-	xh_filectrl.cpp,xh_cmdlinkbn.cpp,xh_toolbk.cpp,xh_bannerwindow.cpp,\
-	xh_timectrl.cpp,xmlreshandler.cpp,xh_ribbon.cpp
-  
-all : $(SOURCES)
-	$(MMS)$(MMSQUALIFIERS) $(OBJECTS)
-.ifdef __WXMOTIF__
-	library [--.lib]libwx_motif.olb $(OBJECTS)
-.else
-.ifdef __WXGTK__
-	library [--.lib]libwx_gtk.olb $(OBJECTS)
-.else
-.ifdef __WXGTK2__
-	library [--.lib]libwx_gtk2.olb $(OBJECTS)
-.else
-.ifdef __WXX11__
-	library [--.lib]libwx_x11_univ.olb $(OBJECTS)
-.endif
-.endif
-.endif
-.endif
-
-$(OBJECTS) : [--.include.wx]setup.h
-
-xh_bmp.obj : xh_bmp.cpp
-xh_bmpbt.obj : xh_bmpbt.cpp
-xh_bttn.obj : xh_bttn.cpp
-xh_cald.obj : xh_cald.cpp
-xh_chckb.obj : xh_chckb.cpp
-xh_chckl.obj : xh_chckl.cpp
-xh_choic.obj : xh_choic.cpp
-xh_combo.obj : xh_combo.cpp
-xh_comboctrl.obj : xh_comboctrl.cpp
-xh_dlg.obj : xh_dlg.cpp
-xh_frame.obj : xh_frame.cpp
-xh_gauge.obj : xh_gauge.cpp
-xh_gdctl.obj : xh_gdctl.cpp
-xh_html.obj : xh_html.cpp
-xh_listb.obj : xh_listb.cpp
-xh_listc.obj : xh_listc.cpp
-xh_menu.obj : xh_menu.cpp
-xh_notbk.obj : xh_notbk.cpp
-xh_panel.obj : xh_panel.cpp
-xh_radbt.obj : xh_radbt.cpp
-xh_radbx.obj : xh_radbx.cpp
-xh_scrol.obj : xh_scrol.cpp
-xh_scwin.obj : xh_scwin.cpp
-xh_sizer.obj : xh_sizer.cpp
-xh_slidr.obj : xh_slidr.cpp
-xh_spin.obj : xh_spin.cpp
-xh_split.obj : xh_split.cpp
-xh_statbar.obj : xh_statbar.cpp
-xh_stbmp.obj : xh_stbmp.cpp
-xh_stbox.obj : xh_stbox.cpp
-xh_stlin.obj : xh_stlin.cpp
-xh_sttxt.obj : xh_sttxt.cpp
-xh_text.obj : xh_text.cpp
-xh_tglbtn.obj : xh_tglbtn.cpp
-xh_toolb.obj : xh_toolb.cpp
-xh_tree.obj : xh_tree.cpp
-xh_unkwn.obj : xh_unkwn.cpp
-xh_wizrd.obj : xh_wizrd.cpp
-xmlres.obj : xmlres.cpp
-xmlrsall.obj : xmlrsall.cpp
-xh_listbk.obj : xh_listbk.cpp
-xh_choicbk.obj : xh_choicbk.cpp
-xh_dirpicker.obj : xh_dirpicker.cpp
-xh_hyperlink.obj : xh_hyperlink.cpp
-xh_filepicker.obj : xh_filepicker.cpp
-xh_fontpicker.obj : xh_fontpicker.cpp
-xh_clrpicker.obj : xh_clrpicker.cpp
-xh_odcombo.obj : xh_odcombo.cpp
-xh_mdi.obj : xh_mdi.cpp
-xh_grid.obj : xh_grid.cpp
-xh_datectrl.obj : xh_datectrl.cpp
-xh_treebk.obj : xh_treebk.cpp
-xh_bmpcbox.obj : xh_bmpcbox.cpp
-xh_animatctrl.obj : xh_animatctrl.cpp
-xh_htmllbox.obj : xh_htmllbox.cpp
-xh_collpane.obj : xh_collpane.cpp
-xh_srchctrl.obj : xh_srchctrl.cpp
-xh_propdlg.obj : xh_propdlg.cpp
-xmladv.obj : xmladv.cpp
-xh_editlbox.obj : xh_editlbox.cpp
-xh_filectrl.obj : xh_filectrl.cpp
-xh_cmdlinkbn.obj : xh_cmdlinkbn.cpp
-xh_toolbk.obj : xh_toolbk.cpp
-xh_bannerwindow.obj : xh_bannerwindow.cpp
-xh_timectrl.obj : xh_timectrl.cpp
-xmlreshandler.obj : xmlreshandler.cpp
-xh_ribbon.obj : xh_ribbon.cpp
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_animatctrl.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_animatctrl.cpp
deleted file mode 100644
index aabcb53a7b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_animatctrl.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_animatctrl.cpp
-// Purpose:     XML resource handler for wxAnimationCtrl
-// Author:      Francesco Montorsi
-// Created:     2006-10-15
-// Copyright:   (c) 2006 Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_ANIMATIONCTRL
-
-#include "wx/xrc/xh_animatctrl.h"
-#include "wx/animate.h"
-#include "wx/scopedptr.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxAnimationCtrlXmlHandler, wxXmlResourceHandler)
-
-wxAnimationCtrlXmlHandler::wxAnimationCtrlXmlHandler() : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxAC_NO_AUTORESIZE);
-    XRC_ADD_STYLE(wxAC_DEFAULT_STYLE);
-    AddWindowStyles();
-}
-
-wxObject *wxAnimationCtrlXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(ctrl, wxAnimationCtrl)
-
-    wxScopedPtr animation(GetAnimation(wxT("animation")));
-
-    ctrl->Create(m_parentAsWindow,
-                  GetID(),
-                  animation ? *animation : wxNullAnimation,
-                  GetPosition(), GetSize(),
-                  GetStyle(wxT("style"), wxAC_DEFAULT_STYLE),
-                  GetName());
-
-    // if no inactive-bitmap has been provided, GetBitmap() will return wxNullBitmap
-    // which just tells wxAnimationCtrl to use the default for inactive status
-    ctrl->SetInactiveBitmap(GetBitmap(wxT("inactive-bitmap")));
-
-    SetupWindow(ctrl);
-
-    return ctrl;
-}
-
-bool wxAnimationCtrlXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxAnimationCtrl"));
-}
-
-#endif // wxUSE_XRC && wxUSE_ANIMATIONCTRL
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_auinotbk.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_auinotbk.cpp
deleted file mode 100644
index 2035787291..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_auinotbk.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_auinotbk.cpp
-// Purpose:     XML resource handler for wxAuiNotebook
-// Author:      Steve Lamerton
-// Created:     2009-06-12
-// Copyright:   (c) 2009 Steve Lamerton
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_AUI
-
-#include "wx/xrc/xh_auinotbk.h"
-#include "wx/aui/auibook.h"
-
-wxIMPLEMENT_DYNAMIC_CLASS(wxAuiNotebookXmlHandler, wxXmlResourceHandler);
-
-wxAuiNotebookXmlHandler::wxAuiNotebookXmlHandler()
-    : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxAUI_NB_DEFAULT_STYLE);
-    XRC_ADD_STYLE(wxAUI_NB_TAB_SPLIT);
-    XRC_ADD_STYLE(wxAUI_NB_TAB_MOVE);
-    XRC_ADD_STYLE(wxAUI_NB_TAB_EXTERNAL_MOVE);
-    XRC_ADD_STYLE(wxAUI_NB_TAB_FIXED_WIDTH);
-    XRC_ADD_STYLE(wxAUI_NB_SCROLL_BUTTONS);
-    XRC_ADD_STYLE(wxAUI_NB_WINDOWLIST_BUTTON);
-    XRC_ADD_STYLE(wxAUI_NB_CLOSE_BUTTON);
-    XRC_ADD_STYLE(wxAUI_NB_CLOSE_ON_ACTIVE_TAB);
-    XRC_ADD_STYLE(wxAUI_NB_CLOSE_ON_ALL_TABS);
-    XRC_ADD_STYLE(wxAUI_NB_TOP);
-    XRC_ADD_STYLE(wxAUI_NB_BOTTOM);
-
-    AddWindowStyles();
-}
-
-wxObject *wxAuiNotebookXmlHandler::DoCreateResource()
-{
-    if (m_class == wxT("notebookpage"))
-    {
-        wxXmlNode *anb = GetParamNode(wxT("object"));
-
-        if (!anb)
-            anb = GetParamNode(wxT("object_ref"));
-
-        if (anb)
-        {
-            bool old_ins = m_isInside;
-            m_isInside = false;
-            wxObject *item = CreateResFromNode(anb, m_notebook, NULL);
-            m_isInside = old_ins;
-            wxWindow *wnd = wxDynamicCast(item, wxWindow);
-
-            if (wnd)
-            {
-                if ( HasParam(wxT("bitmap")) )
-                {
-                    m_notebook->AddPage(wnd,
-                                        GetText(wxT("label")),
-                                        GetBool(wxT("selected")),
-                                        GetBitmap(wxT("bitmap"), wxART_OTHER));
-                }
-                else
-                {
-                    m_notebook->AddPage(wnd,
-                                        GetText(wxT("label")),
-                                        GetBool(wxT("selected")));
-                }
-            }
-            else
-            {
-                ReportError(anb, "notebookpage child must be a window");
-            }
-            return wnd;
-        }
-        else
-        {
-            ReportError("notebookpage must have a window child");
-            return NULL;
-        }
-    }
-    else
-    {
-        XRC_MAKE_INSTANCE(anb, wxAuiNotebook)
-
-        anb->Create(m_parentAsWindow,
-                    GetID(),
-                    GetPosition(),
-                    GetSize(),
-                    GetStyle(wxT("style")));
-
-        SetupWindow(anb);
-
-        wxAuiNotebook *old_par = m_notebook;
-        m_notebook = anb;
-        bool old_ins = m_isInside;
-        m_isInside = true;
-        CreateChildren(m_notebook, true/*only this handler*/);
-        m_isInside = old_ins;
-        m_notebook = old_par;
-
-        return anb;
-    }
-}
-
-bool wxAuiNotebookXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return ((!m_isInside && IsOfClass(node, wxT("wxAuiNotebook"))) ||
-            (m_isInside && IsOfClass(node, wxT("notebookpage"))));
-}
-
-#endif // wxUSE_XRC && wxUSE_ANIMATIONCTRL
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_bannerwindow.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_bannerwindow.cpp
deleted file mode 100644
index acba8dd837..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_bannerwindow.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        srx/xrc/xh_bannerwindow.h
-// Purpose:     Implementation of wxBannerWindow XRC handler.
-// Author:      Vadim Zeitlin
-// Created:     2011-08-16
-// Copyright:   (c) 2011 Vadim Zeitlin 
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_BANNERWINDOW
-
-#include "wx/xrc/xh_bannerwindow.h"
-#include "wx/bannerwindow.h"
-
-wxIMPLEMENT_DYNAMIC_CLASS(wxBannerWindowXmlHandler, wxXmlResourceHandler)
-
-wxBannerWindowXmlHandler::wxBannerWindowXmlHandler()
-    : wxXmlResourceHandler()
-{
-    AddWindowStyles();
-}
-
-wxObject *wxBannerWindowXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(banner, wxBannerWindow)
-
-    banner->Create(m_parentAsWindow,
-                   GetID(),
-                   GetDirection(wxS("direction")),
-                   GetPosition(),
-                   GetSize(),
-                   GetStyle(wxS("style")),
-                   GetName());
-
-    SetupWindow(banner);
-
-    const wxColour colStart = GetColour(wxS("gradient-start"));
-    const wxColour colEnd = GetColour(wxS("gradient-end"));
-    if ( colStart.IsOk() || colEnd.IsOk() )
-    {
-        if ( !colStart.IsOk() || !colEnd.IsOk() )
-        {
-            ReportError
-            (
-                "Both start and end gradient colours must be "
-                "specified if either one is."
-            );
-        }
-        else
-        {
-            banner->SetGradient(colStart, colEnd);
-        }
-    }
-
-    wxBitmap bitmap = GetBitmap();
-    if ( bitmap.IsOk() )
-    {
-        if ( colStart.IsOk() || colEnd.IsOk() )
-        {
-            ReportError
-            (
-                "Gradient colours are ignored by wxBannerWindow "
-                "if the background bitmap is specified."
-            );
-        }
-
-        banner->SetBitmap(bitmap);
-    }
-
-    banner->SetText(GetText(wxS("title")), GetText(wxS("message")));
-
-    return banner;
-}
-
-bool wxBannerWindowXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxS("wxBannerWindow"));
-}
-
-#endif // wxUSE_XRC && wxUSE_BANNERWINDOW
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_bmp.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_bmp.cpp
deleted file mode 100644
index 788f50f227..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_bmp.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_bmp.cpp
-// Purpose:     XRC resource for wxBitmap and wxIcon
-// Author:      Vaclav Slavik
-// Created:     2000/09/09
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC
-
-#include "wx/xrc/xh_bmp.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/bitmap.h"
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapXmlHandler, wxXmlResourceHandler)
-
-wxBitmapXmlHandler::wxBitmapXmlHandler()
-                   :wxXmlResourceHandler()
-{
-}
-
-wxObject *wxBitmapXmlHandler::DoCreateResource()
-{
-    return new wxBitmap(GetBitmap(m_node));
-}
-
-bool wxBitmapXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxBitmap"));
-}
-
-IMPLEMENT_DYNAMIC_CLASS(wxIconXmlHandler, wxXmlResourceHandler)
-
-wxIconXmlHandler::wxIconXmlHandler()
-: wxXmlResourceHandler()
-{
-}
-
-wxObject *wxIconXmlHandler::DoCreateResource()
-{
-    return new wxIcon(GetIcon(m_node));
-}
-
-bool wxIconXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxIcon"));
-}
-
-#endif // wxUSE_XRC
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_bmpbt.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_bmpbt.cpp
deleted file mode 100644
index d5ae4ec9dc..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_bmpbt.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_bmpbt.cpp
-// Purpose:     XRC resource for bitmap buttons
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_BMPBUTTON
-
-#include "wx/xrc/xh_bmpbt.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/bmpbuttn.h"
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapButtonXmlHandler, wxXmlResourceHandler)
-
-wxBitmapButtonXmlHandler::wxBitmapButtonXmlHandler()
-: wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxBU_AUTODRAW);
-    XRC_ADD_STYLE(wxBU_LEFT);
-    XRC_ADD_STYLE(wxBU_RIGHT);
-    XRC_ADD_STYLE(wxBU_TOP);
-    XRC_ADD_STYLE(wxBU_BOTTOM);
-    XRC_ADD_STYLE(wxBU_EXACTFIT);
-    AddWindowStyles();
-}
-
-wxObject *wxBitmapButtonXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(button, wxBitmapButton)
-
-    button->Create(m_parentAsWindow,
-                   GetID(),
-                   GetBitmap(wxT("bitmap"), wxART_BUTTON),
-                   GetPosition(), GetSize(),
-                   GetStyle(wxT("style"), wxBU_AUTODRAW),
-                   wxDefaultValidator,
-                   GetName());
-    if (GetBool(wxT("default"), 0))
-        button->SetDefault();
-    SetupWindow(button);
-
-    if (GetParamNode(wxT("selected")))
-        button->SetBitmapSelected(GetBitmap(wxT("selected")));
-    if (GetParamNode(wxT("focus")))
-        button->SetBitmapFocus(GetBitmap(wxT("focus")));
-    if (GetParamNode(wxT("disabled")))
-        button->SetBitmapDisabled(GetBitmap(wxT("disabled")));
-    if (GetParamNode(wxT("hover")))
-        button->SetBitmapHover(GetBitmap(wxT("hover")));
-
-    return button;
-}
-
-bool wxBitmapButtonXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxBitmapButton"));
-}
-
-#endif // wxUSE_XRC && wxUSE_BMPBUTTON
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_bmpcbox.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_bmpcbox.cpp
deleted file mode 100644
index 533f52fd84..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_bmpcbox.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_bmpcbox.cpp
-// Purpose:     XRC resource for wxBitmapComboBox
-// Author:      Jaakko Salli
-// Created:     Sep-10-2006
-// Copyright:   (c) 2006 Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_BITMAPCOMBOBOX
-
-#include "wx/xrc/xh_bmpcbox.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-#endif
-
-#include "wx/bmpcbox.h"
-
-#include "wx/xml/xml.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxBitmapComboBoxXmlHandler, wxXmlResourceHandler)
-
-wxBitmapComboBoxXmlHandler::wxBitmapComboBoxXmlHandler()
-                     :wxXmlResourceHandler()
-                     ,m_combobox(NULL)
-                     ,m_isInside(false)
-{
-    XRC_ADD_STYLE(wxCB_SORT);
-    XRC_ADD_STYLE(wxCB_READONLY);
-    AddWindowStyles();
-}
-
-wxObject *wxBitmapComboBoxXmlHandler::DoCreateResource()
-{
-    if (m_class == wxT("ownerdrawnitem"))
-    {
-        if ( !m_combobox )
-        {
-            ReportError("ownerdrawnitem only allowed within a wxBitmapComboBox");
-            return NULL;
-        }
-
-        m_combobox->Append(GetText(wxT("text")),
-                           GetBitmap(wxT("bitmap")));
-
-        return m_combobox;
-    }
-    else /*if( m_class == wxT("wxBitmapComboBox"))*/
-    {
-        // find the selection
-        long selection = GetLong( wxT("selection"), -1 );
-
-        XRC_MAKE_INSTANCE(control, wxBitmapComboBox)
-
-        control->Create(m_parentAsWindow,
-                        GetID(),
-                        GetText(wxT("value")),
-                        GetPosition(), GetSize(),
-                        0,
-                        NULL,
-                        GetStyle(),
-                        wxDefaultValidator,
-                        GetName());
-
-        m_isInside = true;
-        m_combobox = control;
-
-        wxXmlNode *children_node = GetParamNode(wxT("object"));
-
-        wxXmlNode *n = children_node;
-
-        while (n)
-        {
-            if ((n->GetType() == wxXML_ELEMENT_NODE) &&
-                (n->GetName() == wxT("object")))
-            {
-                CreateResFromNode(n, control, NULL);
-            }
-            n = n->GetNext();
-        }
-
-        m_isInside = false;
-        m_combobox = NULL;
-
-        if (selection != -1)
-            control->SetSelection(selection);
-
-        SetupWindow(control);
-
-        return control;
-    }
-}
-
-bool wxBitmapComboBoxXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return ((!m_isInside && IsOfClass(node, wxT("wxBitmapComboBox"))) ||
-            (m_isInside && IsOfClass(node, wxT("ownerdrawnitem"))));
-}
-
-#endif // wxUSE_XRC && wxUSE_BITMAPCOMBOBOX
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_bttn.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_bttn.cpp
deleted file mode 100644
index fea736044b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_bttn.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_bttn.cpp
-// Purpose:     XRC resource for buttons
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_BUTTON
-
-#include "wx/xrc/xh_bttn.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/button.h"
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxButtonXmlHandler, wxXmlResourceHandler)
-
-wxButtonXmlHandler::wxButtonXmlHandler()
-: wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxBU_LEFT);
-    XRC_ADD_STYLE(wxBU_RIGHT);
-    XRC_ADD_STYLE(wxBU_TOP);
-    XRC_ADD_STYLE(wxBU_BOTTOM);
-    XRC_ADD_STYLE(wxBU_EXACTFIT);
-    AddWindowStyles();
-}
-
-wxObject *wxButtonXmlHandler::DoCreateResource()
-{
-   XRC_MAKE_INSTANCE(button, wxButton)
-
-   button->Create(m_parentAsWindow,
-                    GetID(),
-                    GetText(wxT("label")),
-                    GetPosition(), GetSize(),
-                    GetStyle(),
-                    wxDefaultValidator,
-                    GetName());
-
-    if (GetBool(wxT("default"), 0))
-        button->SetDefault();
-
-    if ( GetParamNode("bitmap") )
-    {
-        button->SetBitmap(GetBitmap("bitmap", wxART_BUTTON),
-                          GetDirection("bitmapposition"));
-    }
-
-    SetupWindow(button);
-
-    return button;
-}
-
-bool wxButtonXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxButton"));
-}
-
-#endif // wxUSE_XRC && wxUSE_BUTTON
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_cald.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_cald.cpp
deleted file mode 100644
index 28c60ecad4..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_cald.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_cald.cpp
-// Purpose:     XRC resource for wxCalendarCtrl
-// Author:      Brian Gavin
-// Created:     2000/09/09
-// Copyright:   (c) 2000 Brian Gavin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_CALENDARCTRL
-
-#include "wx/xrc/xh_cald.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/event.h"
-#endif //WX_PRECOMP
-
-#include "wx/calctrl.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxCalendarCtrlXmlHandler, wxXmlResourceHandler)
-
-wxCalendarCtrlXmlHandler::wxCalendarCtrlXmlHandler()
-: wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxCAL_SUNDAY_FIRST);
-    XRC_ADD_STYLE(wxCAL_MONDAY_FIRST);
-    XRC_ADD_STYLE(wxCAL_SHOW_HOLIDAYS);
-    XRC_ADD_STYLE(wxCAL_NO_YEAR_CHANGE);
-    XRC_ADD_STYLE(wxCAL_NO_MONTH_CHANGE);
-    XRC_ADD_STYLE(wxCAL_SEQUENTIAL_MONTH_SELECTION);
-    XRC_ADD_STYLE(wxCAL_SHOW_SURROUNDING_WEEKS);
-
-    AddWindowStyles();
-}
-
-
-wxObject *wxCalendarCtrlXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(calendar, wxCalendarCtrl);
-
-    calendar->Create(m_parentAsWindow,
-                     GetID(),
-                     wxDefaultDateTime,
-                     /*TODO: take it from resource*/
-                     GetPosition(), GetSize(),
-                     GetStyle(),
-                     GetName());
-
-    SetupWindow(calendar);
-
-    return calendar;
-}
-
-bool wxCalendarCtrlXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxCalendarCtrl"));
-}
-
-#endif // wxUSE_XRC && wxUSE_CALENDARCTRL
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_chckb.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_chckb.cpp
deleted file mode 100644
index 9499c652f1..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_chckb.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_chckb.cpp
-// Purpose:     XRC resource for wxCheckBox
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_CHECKBOX
-
-#include "wx/xrc/xh_chckb.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/checkbox.h"
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxCheckBoxXmlHandler, wxXmlResourceHandler)
-
-wxCheckBoxXmlHandler::wxCheckBoxXmlHandler()
-: wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxCHK_2STATE);
-    XRC_ADD_STYLE(wxCHK_3STATE);
-    XRC_ADD_STYLE(wxCHK_ALLOW_3RD_STATE_FOR_USER);
-    XRC_ADD_STYLE(wxALIGN_RIGHT);
-    AddWindowStyles();
-}
-
-wxObject *wxCheckBoxXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(control, wxCheckBox)
-
-    control->Create(m_parentAsWindow,
-                    GetID(),
-                    GetText(wxT("label")),
-                    GetPosition(), GetSize(),
-                    GetStyle(),
-                    wxDefaultValidator,
-                    GetName());
-
-    control->SetValue(GetBool( wxT("checked")));
-    SetupWindow(control);
-
-    return control;
-}
-
-bool wxCheckBoxXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxCheckBox"));
-}
-
-#endif // wxUSE_XRC && wxUSE_CHECKBOX
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_chckl.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_chckl.cpp
deleted file mode 100644
index 843571597b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_chckl.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_chckl.cpp
-// Purpose:     XRC resource for wxCheckListBox
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_CHECKLISTBOX
-
-#include "wx/xrc/xh_chckl.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/checklst.h"
-#endif
-
-#include "wx/xml/xml.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxCheckListBoxXmlHandler, wxXmlResourceHandler)
-
-wxCheckListBoxXmlHandler::wxCheckListBoxXmlHandler()
-: wxXmlResourceHandler(), m_insideBox(false)
-{
-    // wxListBox styles:
-    XRC_ADD_STYLE(wxLB_SINGLE);
-    XRC_ADD_STYLE(wxLB_MULTIPLE);
-    XRC_ADD_STYLE(wxLB_EXTENDED);
-    XRC_ADD_STYLE(wxLB_HSCROLL);
-    XRC_ADD_STYLE(wxLB_ALWAYS_SB);
-    XRC_ADD_STYLE(wxLB_NEEDED_SB);
-    XRC_ADD_STYLE(wxLB_SORT);
-
-    AddWindowStyles();
-}
-
-wxObject *wxCheckListBoxXmlHandler::DoCreateResource()
-{
-    if (m_class == wxT("wxCheckListBox"))
-    {
-        // need to build the list of strings from children
-        m_insideBox = true;
-        CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
-
-        XRC_MAKE_INSTANCE(control, wxCheckListBox)
-
-        control->Create(m_parentAsWindow,
-                        GetID(),
-                        GetPosition(), GetSize(),
-                        strList,
-                        GetStyle(),
-                        wxDefaultValidator,
-                        GetName());
-
-        // step through children myself (again.)
-        wxXmlNode *n = GetParamNode(wxT("content"));
-        if (n)
-            n = n->GetChildren();
-        int i = 0;
-        while (n)
-        {
-            if (n->GetType() != wxXML_ELEMENT_NODE ||
-                n->GetName() != wxT("item"))
-               { n = n->GetNext(); continue; }
-
-            // checking boolean is a bit ugly here (see GetBool() )
-            wxString v = n->GetAttribute(wxT("checked"), wxEmptyString);
-            v.MakeLower();
-            if (v == wxT("1"))
-                control->Check( i, true );
-
-            i++;
-            n = n->GetNext();
-        }
-
-        SetupWindow(control);
-
-        strList.Clear();    // dump the strings
-
-        return control;
-    }
-    else
-    {
-        // on the inside now.
-        // handle Label
-
-        // add to the list
-        wxString str = GetNodeContent(m_node);
-        if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
-            str = wxGetTranslation(str, m_resource->GetDomain());
-        strList.Add(str);
-        return NULL;
-    }
-}
-
-bool wxCheckListBoxXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return (IsOfClass(node, wxT("wxCheckListBox")) ||
-           (m_insideBox && node->GetName() == wxT("item")));
-}
-
-#endif // wxUSE_XRC && wxUSE_CHECKLISTBOX
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_choic.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_choic.cpp
deleted file mode 100644
index fb9b7f2245..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_choic.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_choic.cpp
-// Purpose:     XRC resource for wxChoice
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_CHOICE
-
-#include "wx/xrc/xh_choic.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/choice.h"
-#endif
-
-#include "wx/xml/xml.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxChoiceXmlHandler, wxXmlResourceHandler)
-
-wxChoiceXmlHandler::wxChoiceXmlHandler()
-: wxXmlResourceHandler() , m_insideBox(false)
-{
-    XRC_ADD_STYLE(wxCB_SORT);
-    AddWindowStyles();
-}
-
-wxObject *wxChoiceXmlHandler::DoCreateResource()
-{
-    if( m_class == wxT("wxChoice"))
-    {
-        // find the selection
-        long selection = GetLong(wxT("selection"), -1);
-
-        // need to build the list of strings from children
-        m_insideBox = true;
-        CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
-
-        XRC_MAKE_INSTANCE(control, wxChoice)
-
-        control->Create(m_parentAsWindow,
-                        GetID(),
-                        GetPosition(), GetSize(),
-                        strList,
-                        GetStyle(),
-                        wxDefaultValidator,
-                        GetName());
-
-        if (selection != -1)
-            control->SetSelection(selection);
-
-        SetupWindow(control);
-
-        strList.Clear();    // dump the strings
-
-        return control;
-    }
-    else
-    {
-        // on the inside now.
-        // handle Label
-
-        // add to the list
-        wxString str = GetNodeContent(m_node);
-        if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
-            str = wxGetTranslation(str, m_resource->GetDomain());
-        strList.Add(str);
-
-        return NULL;
-    }
-}
-
-bool wxChoiceXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return (IsOfClass(node, wxT("wxChoice")) ||
-           (m_insideBox && node->GetName() == wxT("item")));
-}
-
-#endif // wxUSE_XRC && wxUSE_CHOICE
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_choicbk.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_choicbk.cpp
deleted file mode 100644
index e70bd60ae1..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_choicbk.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_choicbk.cpp
-// Purpose:     XRC resource for wxChoicebook
-// Author:      Vaclav Slavik
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_CHOICEBOOK
-
-#include "wx/xrc/xh_choicbk.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/sizer.h"
-#endif
-
-#include "wx/choicebk.h"
-#include "wx/imaglist.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxChoicebookXmlHandler, wxXmlResourceHandler)
-
-wxChoicebookXmlHandler::wxChoicebookXmlHandler()
-                       :wxXmlResourceHandler(),
-                        m_isInside(false),
-                        m_choicebook(NULL)
-{
-    XRC_ADD_STYLE(wxBK_DEFAULT);
-    XRC_ADD_STYLE(wxBK_LEFT);
-    XRC_ADD_STYLE(wxBK_RIGHT);
-    XRC_ADD_STYLE(wxBK_TOP);
-    XRC_ADD_STYLE(wxBK_BOTTOM);
-
-    XRC_ADD_STYLE(wxCHB_DEFAULT);
-    XRC_ADD_STYLE(wxCHB_LEFT);
-    XRC_ADD_STYLE(wxCHB_RIGHT);
-    XRC_ADD_STYLE(wxCHB_TOP);
-    XRC_ADD_STYLE(wxCHB_BOTTOM);
-
-    AddWindowStyles();
-}
-
-wxObject *wxChoicebookXmlHandler::DoCreateResource()
-{
-    if (m_class == wxT("choicebookpage"))
-    {
-        wxXmlNode *n = GetParamNode(wxT("object"));
-
-        if ( !n )
-            n = GetParamNode(wxT("object_ref"));
-
-        if (n)
-        {
-            bool old_ins = m_isInside;
-            m_isInside = false;
-            wxObject *item = CreateResFromNode(n, m_choicebook, NULL);
-            m_isInside = old_ins;
-            wxWindow *wnd = wxDynamicCast(item, wxWindow);
-
-            if (wnd)
-            {
-                m_choicebook->AddPage(wnd, GetText(wxT("label")),
-                                           GetBool(wxT("selected")));
-                if ( HasParam(wxT("bitmap")) )
-                {
-                    wxBitmap bmp = GetBitmap(wxT("bitmap"), wxART_OTHER);
-                    wxImageList *imgList = m_choicebook->GetImageList();
-                    if ( imgList == NULL )
-                    {
-                        imgList = new wxImageList( bmp.GetWidth(), bmp.GetHeight() );
-                        m_choicebook->AssignImageList( imgList );
-                    }
-                    int imgIndex = imgList->Add(bmp);
-                    m_choicebook->SetPageImage(m_choicebook->GetPageCount()-1, imgIndex );
-                }
-                else if ( HasParam(wxT("image")) )
-                {
-                    if ( m_choicebook->GetImageList() )
-                    {
-                        m_choicebook->SetPageImage(m_choicebook->GetPageCount()-1,
-                                                   GetLong(wxT("image")) );
-                    }
-                    else // image without image list?
-                    {
-                        ReportError(n, "image can only be used in conjunction "
-                                       "with imagelist");
-                    }
-                }
-            }
-            else
-            {
-                ReportError(n, "choicebookpage child must be a window");
-            }
-            return wnd;
-        }
-        else
-        {
-            ReportError("choicebookpage must have a window child");
-            return NULL;
-        }
-    }
-
-    else
-    {
-        XRC_MAKE_INSTANCE(nb, wxChoicebook)
-
-        nb->Create(m_parentAsWindow,
-                   GetID(),
-                   GetPosition(), GetSize(),
-                   GetStyle(wxT("style")),
-                   GetName());
-
-        wxImageList *imagelist = GetImageList();
-        if ( imagelist )
-            nb->AssignImageList(imagelist);
-
-        wxChoicebook *old_par = m_choicebook;
-        m_choicebook = nb;
-        bool old_ins = m_isInside;
-        m_isInside = true;
-        CreateChildren(m_choicebook, true/*only this handler*/);
-        m_isInside = old_ins;
-        m_choicebook = old_par;
-
-        return nb;
-    }
-}
-
-bool wxChoicebookXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return ((!m_isInside && IsOfClass(node, wxT("wxChoicebook"))) ||
-            (m_isInside && IsOfClass(node, wxT("choicebookpage"))));
-}
-
-#endif // wxUSE_XRC && wxUSE_CHOICEBOOK
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_clrpicker.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_clrpicker.cpp
deleted file mode 100644
index 690275e67b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_clrpicker.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_clrpicker.cpp
-// Purpose:     XML resource handler for wxColourPickerCtrl
-// Author:      Francesco Montorsi
-// Created:     2006-04-17
-// Copyright:   (c) 2006 Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_COLOURPICKERCTRL
-
-#include "wx/xrc/xh_clrpicker.h"
-#include "wx/clrpicker.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxColourPickerCtrlXmlHandler, wxXmlResourceHandler)
-
-wxColourPickerCtrlXmlHandler::wxColourPickerCtrlXmlHandler() : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxCLRP_USE_TEXTCTRL);
-    XRC_ADD_STYLE(wxCLRP_SHOW_LABEL);
-    XRC_ADD_STYLE(wxCLRP_DEFAULT_STYLE);
-    AddWindowStyles();
-}
-
-wxObject *wxColourPickerCtrlXmlHandler::DoCreateResource()
-{
-   XRC_MAKE_INSTANCE(picker, wxColourPickerCtrl)
-
-   picker->Create(m_parentAsWindow,
-                  GetID(),
-                  GetColour(wxT("value"), *wxBLACK),
-                  GetPosition(), GetSize(),
-                  GetStyle(wxT("style"), wxCLRP_DEFAULT_STYLE),
-                  wxDefaultValidator,
-                  GetName());
-
-    SetupWindow(picker);
-
-    return picker;
-}
-
-bool wxColourPickerCtrlXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxColourPickerCtrl"));
-}
-
-#endif // wxUSE_XRC && wxUSE_COLOURPICKERCTRL
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_cmdlinkbn.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_cmdlinkbn.cpp
deleted file mode 100644
index 396827a01b..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_cmdlinkbn.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_cmdlinkbn.cpp
-// Purpose:     XRC resource for command link buttons
-// Author:      Kinaou Herve
-// Created:     2010/10/20
-// Copyright:
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_COMMANDLINKBUTTON
-
-#include "wx/xrc/xh_cmdlinkbn.h"
-
-#include "wx/commandlinkbutton.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxCommandLinkButtonXmlHandler, wxXmlResourceHandler)
-
-wxCommandLinkButtonXmlHandler::wxCommandLinkButtonXmlHandler()
-    : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxBU_LEFT);
-    XRC_ADD_STYLE(wxBU_RIGHT);
-    XRC_ADD_STYLE(wxBU_TOP);
-    XRC_ADD_STYLE(wxBU_BOTTOM);
-    XRC_ADD_STYLE(wxBU_EXACTFIT);
-    AddWindowStyles();
-}
-
-wxObject *wxCommandLinkButtonXmlHandler::DoCreateResource()
-{
-   XRC_MAKE_INSTANCE(button, wxCommandLinkButton)
-
-   button->Create(m_parentAsWindow,
-                    GetID(),
-                    GetText(wxS("label")),
-                    GetText(wxS("note")),
-                    GetPosition(), GetSize(),
-                    GetStyle(),
-                    wxDefaultValidator,
-                    GetName());
-
-    SetupWindow(button);
-
-    return button;
-}
-
-bool wxCommandLinkButtonXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxS("wxCommandLinkButton"));
-}
-
-#endif // wxUSE_XRC && wxUSE_COMMANDLINKBUTTON
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_collpane.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_collpane.cpp
deleted file mode 100644
index ae48576151..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_collpane.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_collpane.cpp
-// Purpose:     XML resource handler for wxCollapsiblePane
-// Author:      Francesco Montorsi
-// Created:     2006-10-27
-// Copyright:   (c) 2006 Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_COLLPANE
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-#endif
-
-#include "wx/collpane.h"
-#include "wx/xrc/xh_collpane.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxCollapsiblePaneXmlHandler, wxXmlResourceHandler)
-
-wxCollapsiblePaneXmlHandler::wxCollapsiblePaneXmlHandler()
-: wxXmlResourceHandler(), m_isInside(false)
-{
-    XRC_ADD_STYLE(wxCP_NO_TLW_RESIZE);
-    XRC_ADD_STYLE(wxCP_DEFAULT_STYLE);
-    AddWindowStyles();
-}
-
-wxObject *wxCollapsiblePaneXmlHandler::DoCreateResource()
-{
-    if (m_class == wxT("panewindow"))   // read the XRC for the pane window
-    {
-        wxXmlNode *n = GetParamNode(wxT("object"));
-
-        if ( !n )
-            n = GetParamNode(wxT("object_ref"));
-
-        if (n)
-        {
-            bool old_ins = m_isInside;
-            m_isInside = false;
-            wxObject *item = CreateResFromNode(n, m_collpane->GetPane(), NULL);
-            m_isInside = old_ins;
-
-            return item;
-        }
-        else
-        {
-            ReportError("no control within panewindow");
-            return NULL;
-        }
-    }
-    else
-    {
-        XRC_MAKE_INSTANCE(ctrl, wxCollapsiblePane)
-
-        wxString label = GetParamValue(wxT("label"));
-        if (label.empty())
-        {
-            ReportParamError("label", "label cannot be empty");
-            return NULL;
-        }
-
-        ctrl->Create(m_parentAsWindow,
-                    GetID(),
-                    label,
-                    GetPosition(), GetSize(),
-                    GetStyle(wxT("style"), wxCP_DEFAULT_STYLE),
-                    wxDefaultValidator,
-                    GetName());
-
-        ctrl->Collapse(GetBool(wxT("collapsed")));
-        SetupWindow(ctrl);
-
-        wxCollapsiblePane *old_par = m_collpane;
-        m_collpane = ctrl;
-        bool old_ins = m_isInside;
-        m_isInside = true;
-        CreateChildren(m_collpane, true/*only this handler*/);
-        m_isInside = old_ins;
-        m_collpane = old_par;
-
-        return ctrl;
-    }
-}
-
-bool wxCollapsiblePaneXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxCollapsiblePane")) ||
-            (m_isInside && IsOfClass(node, wxT("panewindow")));
-}
-
-#endif // wxUSE_XRC && wxUSE_COLLPANE
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_combo.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_combo.cpp
deleted file mode 100644
index 8691c4161e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_combo.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_combo.cpp
-// Purpose:     XRC resource for wxComboBox
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_COMBOBOX
-
-#include "wx/xrc/xh_combo.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/combobox.h"
-    #include "wx/textctrl.h"    // for wxTE_PROCESS_ENTER
-#endif
-
-#include "wx/xml/xml.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxComboBoxXmlHandler, wxXmlResourceHandler)
-
-wxComboBoxXmlHandler::wxComboBoxXmlHandler()
-                     :wxXmlResourceHandler()
-                     ,m_insideBox(false)
-{
-    XRC_ADD_STYLE(wxCB_SIMPLE);
-    XRC_ADD_STYLE(wxCB_SORT);
-    XRC_ADD_STYLE(wxCB_READONLY);
-    XRC_ADD_STYLE(wxCB_DROPDOWN);
-    XRC_ADD_STYLE(wxTE_PROCESS_ENTER);
-    AddWindowStyles();
-}
-
-wxObject *wxComboBoxXmlHandler::DoCreateResource()
-{
-    if( m_class == wxT("wxComboBox"))
-    {
-        // find the selection
-        long selection = GetLong( wxT("selection"), -1 );
-
-        // need to build the list of strings from children
-        m_insideBox = true;
-        CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
-
-        XRC_MAKE_INSTANCE(control, wxComboBox)
-
-        control->Create(m_parentAsWindow,
-                        GetID(),
-                        GetText(wxT("value")),
-                        GetPosition(), GetSize(),
-                        strList,
-                        GetStyle(),
-                        wxDefaultValidator,
-                        GetName());
-
-        if (selection != -1)
-            control->SetSelection(selection);
-
-        SetupWindow(control);
-
-        strList.Clear();    // dump the strings
-
-        return control;
-    }
-    else
-    {
-        // on the inside now.
-        // handle Label
-
-        // add to the list
-        wxString str = GetNodeContent(m_node);
-        if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
-            str = wxGetTranslation(str, m_resource->GetDomain());
-        strList.Add(str);
-
-        return NULL;
-    }
-}
-
-bool wxComboBoxXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return (IsOfClass(node, wxT("wxComboBox")) ||
-           (m_insideBox && node->GetName() == wxT("item")));
-}
-
-#endif // wxUSE_XRC && wxUSE_COMBOBOX
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_comboctrl.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_comboctrl.cpp
deleted file mode 100644
index 9becbbbe3c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_comboctrl.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_comboctrl.cpp
-// Purpose:     XRC resource for wxComboCtrl
-// Author:      Jaakko Salli
-// Created:     2009/01/25
-// Copyright:   (c) 2009 Jaakko Salli
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_COMBOCTRL
-
-#include "wx/xrc/xh_comboctrl.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/textctrl.h"    // for wxTE_PROCESS_ENTER
-#endif
-
-#include "wx/combo.h"
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxComboCtrlXmlHandler, wxXmlResourceHandler)
-
-wxComboCtrlXmlHandler::wxComboCtrlXmlHandler()
-                     : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxCB_SORT);
-    XRC_ADD_STYLE(wxCB_READONLY);
-    XRC_ADD_STYLE(wxTE_PROCESS_ENTER);
-    XRC_ADD_STYLE(wxCC_SPECIAL_DCLICK);
-    XRC_ADD_STYLE(wxCC_STD_BUTTON);
-    AddWindowStyles();
-}
-
-wxObject *wxComboCtrlXmlHandler::DoCreateResource()
-{
-    if( m_class == wxT("wxComboCtrl"))
-    {
-        XRC_MAKE_INSTANCE(control, wxComboCtrl)
-
-        control->Create(m_parentAsWindow,
-                        GetID(),
-                        GetText(wxT("value")),
-                        GetPosition(), GetSize(),
-                        GetStyle(),
-                        wxDefaultValidator,
-                        GetName());
-
-        SetupWindow(control);
-
-        return control;
-    }
-    return NULL;
-}
-
-bool wxComboCtrlXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxComboCtrl"));
-}
-
-#endif // wxUSE_XRC && wxUSE_COMBOBOX
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_datectrl.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_datectrl.cpp
deleted file mode 100644
index 634bb9e845..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_datectrl.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_datectrl.cpp
-// Purpose:     XML resource handler for wxDatePickerCtrl
-// Author:      Vaclav Slavik
-// Created:     2005-02-07
-// Copyright:   (c) 2005 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_DATEPICKCTRL
-
-#include "wx/xrc/xh_datectrl.h"
-#include "wx/datectrl.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxDateCtrlXmlHandler, wxXmlResourceHandler)
-
-wxDateCtrlXmlHandler::wxDateCtrlXmlHandler() : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxDP_DEFAULT);
-    XRC_ADD_STYLE(wxDP_SPIN);
-    XRC_ADD_STYLE(wxDP_DROPDOWN);
-    XRC_ADD_STYLE(wxDP_ALLOWNONE);
-    XRC_ADD_STYLE(wxDP_SHOWCENTURY);
-    AddWindowStyles();
-}
-
-wxObject *wxDateCtrlXmlHandler::DoCreateResource()
-{
-   XRC_MAKE_INSTANCE(picker, wxDatePickerCtrl)
-
-   picker->Create(m_parentAsWindow,
-                  GetID(),
-                  wxDefaultDateTime,
-                  GetPosition(), GetSize(),
-                  GetStyle(wxT("style"), wxDP_DEFAULT | wxDP_SHOWCENTURY),
-                  wxDefaultValidator,
-                  GetName());
-
-    SetupWindow(picker);
-
-    return picker;
-}
-
-bool wxDateCtrlXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxDatePickerCtrl"));
-}
-
-#endif // wxUSE_XRC && wxUSE_DATEPICKCTRL
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_dirpicker.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_dirpicker.cpp
deleted file mode 100644
index 8fab3a7fc0..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_dirpicker.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_dirpicker.cpp
-// Purpose:     XML resource handler for wxDirPickerCtrl
-// Author:      Francesco Montorsi
-// Created:     2006-04-17
-// Copyright:   (c) 2006 Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_DIRPICKERCTRL
-
-#include "wx/xrc/xh_dirpicker.h"
-#include "wx/filepicker.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxDirPickerCtrlXmlHandler, wxXmlResourceHandler)
-
-wxDirPickerCtrlXmlHandler::wxDirPickerCtrlXmlHandler() : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxDIRP_USE_TEXTCTRL);
-    XRC_ADD_STYLE(wxDIRP_DIR_MUST_EXIST);
-    XRC_ADD_STYLE(wxDIRP_CHANGE_DIR);
-    XRC_ADD_STYLE(wxDIRP_SMALL);
-    XRC_ADD_STYLE(wxDIRP_DEFAULT_STYLE);
-    AddWindowStyles();
-}
-
-wxObject *wxDirPickerCtrlXmlHandler::DoCreateResource()
-{
-   XRC_MAKE_INSTANCE(picker, wxDirPickerCtrl)
-
-   picker->Create(m_parentAsWindow,
-                  GetID(),
-                  GetParamValue(wxT("value")),
-                  GetText(wxT("message")),
-                  GetPosition(), GetSize(),
-                  GetStyle(wxT("style"), wxDIRP_DEFAULT_STYLE),
-                  wxDefaultValidator,
-                  GetName());
-
-    SetupWindow(picker);
-
-    return picker;
-}
-
-bool wxDirPickerCtrlXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxDirPickerCtrl"));
-}
-
-#endif // wxUSE_XRC && wxUSE_DIRPICKERCTRL
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_dlg.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_dlg.cpp
deleted file mode 100644
index 3edffae5ef..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_dlg.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_dlg.cpp
-// Purpose:     XRC resource for dialogs
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC
-
-#include "wx/xrc/xh_dlg.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/frame.h"
-    #include "wx/dialog.h"
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxDialogXmlHandler, wxXmlResourceHandler)
-
-wxDialogXmlHandler::wxDialogXmlHandler() : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxSTAY_ON_TOP);
-    XRC_ADD_STYLE(wxCAPTION);
-    XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
-    XRC_ADD_STYLE(wxSYSTEM_MENU);
-    XRC_ADD_STYLE(wxRESIZE_BORDER);
-    XRC_ADD_STYLE(wxCLOSE_BOX);
-    XRC_ADD_STYLE(wxDIALOG_NO_PARENT);
-
-    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
-    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    XRC_ADD_STYLE(wxDIALOG_EX_METAL);
-    XRC_ADD_STYLE(wxMAXIMIZE_BOX);
-    XRC_ADD_STYLE(wxMINIMIZE_BOX);
-    XRC_ADD_STYLE(wxFRAME_SHAPED);
-    XRC_ADD_STYLE(wxDIALOG_EX_CONTEXTHELP);
-
-#if WXWIN_COMPATIBILITY_2_6
-    XRC_ADD_STYLE(wxDIALOG_MODAL);
-    XRC_ADD_STYLE(wxTHICK_FRAME);
-    XRC_ADD_STYLE(wxRESIZE_BOX);
-    XRC_ADD_STYLE(wxDIALOG_MODELESS);
-    XRC_ADD_STYLE(wxNO_3D);
-#endif // WXWIN_COMPATIBILITY_2_6
-
-    AddWindowStyles();
-}
-
-wxObject *wxDialogXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(dlg, wxDialog);
-
-    dlg->Create(m_parentAsWindow,
-                GetID(),
-                GetText(wxT("title")),
-                wxDefaultPosition, wxDefaultSize,
-                GetStyle(wxT("style"), wxDEFAULT_DIALOG_STYLE),
-                GetName());
-
-    if (HasParam(wxT("size")))
-        dlg->SetClientSize(GetSize(wxT("size"), dlg));
-    if (HasParam(wxT("pos")))
-        dlg->Move(GetPosition());
-    if (HasParam(wxT("icon")))
-        dlg->SetIcons(GetIconBundle(wxT("icon"), wxART_FRAME_ICON));
-
-    SetupWindow(dlg);
-
-    CreateChildren(dlg);
-
-    if (GetBool(wxT("centered"), false))
-        dlg->Centre();
-
-    return dlg;
-}
-
-bool wxDialogXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxDialog"));
-}
-
-#endif // wxUSE_XRC
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_editlbox.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_editlbox.cpp
deleted file mode 100644
index 87031b0051..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_editlbox.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_editlbox.cpp
-// Purpose:     implementation of wxEditableListBox XRC handler
-// Author:      Vadim Zeitlin
-// Created:     2009-06-04
-// Copyright:   (c) 2009 Vadim Zeitlin 
-// Licence:     wxWindows licence
-///////////////////////////////////////////////////////////////////////////////
-
-// ============================================================================
-// declarations
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// headers
-// ----------------------------------------------------------------------------
-
-// for compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_EDITABLELISTBOX
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-#endif // WX_PRECOMP
-
-#include "wx/editlbox.h"
-#include "wx/xrc/xh_editlbox.h"
-
-#include "wx/xml/xml.h"
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-namespace
-{
-
-const char * const EDITLBOX_CLASS_NAME = "wxEditableListBox";
-const char * const EDITLBOX_ITEM_NAME = "item";
-
-} // anonymous namespace
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-IMPLEMENT_DYNAMIC_CLASS(wxEditableListBoxXmlHandler, wxXmlResourceHandler)
-
-wxEditableListBoxXmlHandler::wxEditableListBoxXmlHandler()
-{
-    m_insideBox = false;
-
-    XRC_ADD_STYLE(wxEL_ALLOW_NEW);
-    XRC_ADD_STYLE(wxEL_ALLOW_EDIT);
-    XRC_ADD_STYLE(wxEL_ALLOW_DELETE);
-    XRC_ADD_STYLE(wxEL_NO_REORDER);
-
-    AddWindowStyles();
-}
-
-wxObject *wxEditableListBoxXmlHandler::DoCreateResource()
-{
-    if ( m_class == EDITLBOX_CLASS_NAME )
-    {
-        // create the control itself
-        XRC_MAKE_INSTANCE(control, wxEditableListBox)
-
-        control->Create
-                 (
-                      m_parentAsWindow,
-                      GetID(),
-                      GetText("label"),
-                      GetPosition(),
-                      GetSize(),
-                      GetStyle(),
-                      GetName()
-                 );
-
-        SetupWindow(control);
-
-        // if any items are given, add them to the control
-        wxXmlNode * const contents = GetParamNode("content");
-        if ( contents )
-        {
-            m_insideBox = true;
-            CreateChildrenPrivately(NULL, contents);
-            m_insideBox = false;
-
-            control->SetStrings(m_items);
-            m_items.clear();
-        }
-
-        return control;
-    }
-    else if ( m_insideBox && m_node->GetName() == EDITLBOX_ITEM_NAME )
-    {
-        wxString str = GetNodeContent(m_node);
-        if ( m_resource->GetFlags() & wxXRC_USE_LOCALE )
-            str = wxGetTranslation(str, m_resource->GetDomain());
-        m_items.push_back(str);
-
-        return NULL;
-    }
-    else
-    {
-        ReportError("Unexpected node inside wxEditableListBox");
-        return NULL;
-    }
-}
-
-bool wxEditableListBoxXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, EDITLBOX_CLASS_NAME) ||
-                (m_insideBox && node->GetName() == EDITLBOX_ITEM_NAME);
-}
-
-
-#endif // wxUSE_XRC && wxUSE_EDITABLELISTBOX
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_filectrl.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_filectrl.cpp
deleted file mode 100644
index da4fc940f8..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_filectrl.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_filectrl.cpp
-// Purpose:     XML resource handler for wxFileCtrl
-// Author:      Kinaou Hervé
-// Created:     2009-05-11
-// Copyright:   (c) 2009 wxWidgets development team
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_FILECTRL
-
-#include "wx/xrc/xh_filectrl.h"
-#include "wx/filectrl.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxFileCtrlXmlHandler, wxXmlResourceHandler)
-
-wxFileCtrlXmlHandler::wxFileCtrlXmlHandler() : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxFC_DEFAULT_STYLE);
-    XRC_ADD_STYLE(wxFC_OPEN);
-    XRC_ADD_STYLE(wxFC_SAVE);
-    XRC_ADD_STYLE(wxFC_MULTIPLE);
-    XRC_ADD_STYLE(wxFC_NOSHOWHIDDEN);
-
-    AddWindowStyles();
-}
-
-wxObject *wxFileCtrlXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(filectrl, wxFileCtrl)
-
-    filectrl->Create(m_parentAsWindow,
-                     GetID(),
-                     GetText(wxT("defaultdirectory")),
-                     GetText(wxT("defaultfilename")),
-                     GetParamValue(wxT("wildcard")),
-                     GetStyle(wxT("style"), wxFC_DEFAULT_STYLE),
-                     GetPosition(),
-                     GetSize(),
-                     GetName());
-
-    SetupWindow(filectrl);
-    return filectrl;
-}
-
-bool wxFileCtrlXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxFileCtrl"));
-}
-
-#endif // wxUSE_XRC && wxUSE_FILECTRL
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_filepicker.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_filepicker.cpp
deleted file mode 100644
index 21d8e51d56..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_filepicker.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_filepicker.cpp
-// Purpose:     XML resource handler for wxFilePickerCtrl
-// Author:      Francesco Montorsi
-// Created:     2006-04-17
-// Copyright:   (c) 2006 Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_FILEPICKERCTRL
-
-#include "wx/xrc/xh_filepicker.h"
-#include "wx/filepicker.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxFilePickerCtrlXmlHandler, wxXmlResourceHandler)
-
-wxFilePickerCtrlXmlHandler::wxFilePickerCtrlXmlHandler() : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxFLP_OPEN);
-    XRC_ADD_STYLE(wxFLP_SAVE);
-    XRC_ADD_STYLE(wxFLP_OVERWRITE_PROMPT);
-    XRC_ADD_STYLE(wxFLP_FILE_MUST_EXIST);
-    XRC_ADD_STYLE(wxFLP_CHANGE_DIR);
-    XRC_ADD_STYLE(wxFLP_SMALL);
-    XRC_ADD_STYLE(wxFLP_DEFAULT_STYLE);
-    XRC_ADD_STYLE(wxFLP_USE_TEXTCTRL);
-    AddWindowStyles();
-}
-
-wxObject *wxFilePickerCtrlXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(picker, wxFilePickerCtrl)
-
-    picker->Create(m_parentAsWindow,
-                  GetID(),
-                  GetParamValue(wxT("value")),
-                  GetText(wxT("message")),
-                  GetParamValue(wxT("wildcard")),
-                  GetPosition(), GetSize(),
-                  GetStyle(wxT("style"), wxFLP_DEFAULT_STYLE),
-                  wxDefaultValidator,
-                  GetName());
-
-    SetupWindow(picker);
-    return picker;
-}
-
-bool wxFilePickerCtrlXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxFilePickerCtrl"));
-}
-
-#endif // wxUSE_XRC && wxUSE_FILEPICKERCTRL
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_fontpicker.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_fontpicker.cpp
deleted file mode 100644
index 7d76740479..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_fontpicker.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_fontpicker.cpp
-// Purpose:     XML resource handler for wxFontPickerCtrl
-// Author:      Francesco Montorsi
-// Created:     2006-04-17
-// Copyright:   (c) 2006 Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_FONTPICKERCTRL
-
-#include "wx/xrc/xh_fontpicker.h"
-#include "wx/fontpicker.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxFontPickerCtrlXmlHandler, wxXmlResourceHandler)
-
-wxFontPickerCtrlXmlHandler::wxFontPickerCtrlXmlHandler() : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxFNTP_USE_TEXTCTRL);
-    XRC_ADD_STYLE(wxFNTP_FONTDESC_AS_LABEL);
-    XRC_ADD_STYLE(wxFNTP_USEFONT_FOR_LABEL);
-    XRC_ADD_STYLE(wxFNTP_DEFAULT_STYLE);
-    AddWindowStyles();
-}
-
-wxObject *wxFontPickerCtrlXmlHandler::DoCreateResource()
-{
-   XRC_MAKE_INSTANCE(picker, wxFontPickerCtrl)
-
-    wxFont f = *wxNORMAL_FONT;
-    if (HasParam(wxT("value")))
-        f = GetFont(wxT("value"));
-
-   picker->Create(m_parentAsWindow,
-                  GetID(),
-                  f,
-                  GetPosition(), GetSize(),
-                  GetStyle(wxT("style"), wxFNTP_DEFAULT_STYLE),
-                  wxDefaultValidator,
-                  GetName());
-
-    SetupWindow(picker);
-
-    return picker;
-}
-
-bool wxFontPickerCtrlXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxFontPickerCtrl"));
-}
-
-#endif // wxUSE_XRC && wxUSE_FONTPICKERCTRL
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_frame.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_frame.cpp
deleted file mode 100644
index 5ad0e1ee83..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_frame.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_frame.cpp
-// Purpose:     XRC resource for dialogs
-// Author:      Vaclav Slavik & Aleks.
-// Created:     2000/03/05
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC
-
-#include "wx/xrc/xh_frame.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/frame.h"
-    #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxFrameXmlHandler, wxXmlResourceHandler)
-
-wxFrameXmlHandler::wxFrameXmlHandler() : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxSTAY_ON_TOP);
-    XRC_ADD_STYLE(wxCAPTION);
-    XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
-    XRC_ADD_STYLE(wxDEFAULT_FRAME_STYLE);
-#if WXWIN_COMPATIBILITY_2_6
-    XRC_ADD_STYLE(wxTHICK_FRAME);
-#endif // WXWIN_COMPATIBILITY_2_6
-    XRC_ADD_STYLE(wxSYSTEM_MENU);
-    XRC_ADD_STYLE(wxRESIZE_BORDER);
-#if WXWIN_COMPATIBILITY_2_6
-    XRC_ADD_STYLE(wxRESIZE_BOX);
-#endif // WXWIN_COMPATIBILITY_2_6
-    XRC_ADD_STYLE(wxCLOSE_BOX);
-
-    XRC_ADD_STYLE(wxFRAME_NO_TASKBAR);
-    XRC_ADD_STYLE(wxFRAME_SHAPED);
-    XRC_ADD_STYLE(wxFRAME_TOOL_WINDOW);
-    XRC_ADD_STYLE(wxFRAME_FLOAT_ON_PARENT);
-    XRC_ADD_STYLE(wxMAXIMIZE_BOX);
-    XRC_ADD_STYLE(wxMINIMIZE_BOX);
-    XRC_ADD_STYLE(wxSTAY_ON_TOP);
-
-#if WXWIN_COMPATIBILITY_2_6
-    XRC_ADD_STYLE(wxNO_3D);
-#endif // WXWIN_COMPATIBILITY_2_6
-    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
-    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    XRC_ADD_STYLE(wxFRAME_EX_METAL);
-    XRC_ADD_STYLE(wxFRAME_EX_CONTEXTHELP);
-
-    AddWindowStyles();
-}
-
-wxObject *wxFrameXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(frame, wxFrame);
-
-    frame->Create(m_parentAsWindow,
-                  GetID(),
-                  GetText(wxT("title")),
-                  wxDefaultPosition, wxDefaultSize,
-                  GetStyle(wxT("style"), wxDEFAULT_FRAME_STYLE),
-                  GetName());
-
-    if (HasParam(wxT("size")))
-        frame->SetClientSize(GetSize(wxT("size"), frame));
-    if (HasParam(wxT("pos")))
-        frame->Move(GetPosition());
-    if (HasParam(wxT("icon")))
-        frame->SetIcons(GetIconBundle(wxT("icon"), wxART_FRAME_ICON));
-
-    SetupWindow(frame);
-
-    CreateChildren(frame);
-
-    if (GetBool(wxT("centered"), false))
-        frame->Centre();
-
-    return frame;
-}
-
-bool wxFrameXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxFrame"));
-}
-
-#endif // wxUSE_XRC
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_gauge.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_gauge.cpp
deleted file mode 100644
index b30741065c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_gauge.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_gauge.cpp
-// Purpose:     XRC resource for wxGauge
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_GAUGE
-
-#include "wx/xrc/xh_gauge.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/gauge.h"
-#endif
-
-static const long DEFAULT_RANGE = 100;
-
-IMPLEMENT_DYNAMIC_CLASS(wxGaugeXmlHandler, wxXmlResourceHandler)
-
-wxGaugeXmlHandler::wxGaugeXmlHandler()
-                  :wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxGA_HORIZONTAL);
-    XRC_ADD_STYLE(wxGA_VERTICAL);
-#if WXWIN_COMPATIBILITY_2_6
-    XRC_ADD_STYLE(wxGA_PROGRESSBAR);
-#endif // WXWIN_COMPATIBILITY_2_6
-    XRC_ADD_STYLE(wxGA_SMOOTH);   // windows only
-    AddWindowStyles();
-}
-
-wxObject *wxGaugeXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(control, wxGauge)
-
-    control->Create(m_parentAsWindow,
-                    GetID(),
-                    GetLong(wxT("range"), DEFAULT_RANGE),
-                    GetPosition(), GetSize(),
-                    GetStyle(),
-                    wxDefaultValidator,
-                    GetName());
-
-    if( HasParam(wxT("value")))
-    {
-        control->SetValue(GetLong(wxT("value")));
-    }
-    if( HasParam(wxT("shadow")))
-    {
-        control->SetShadowWidth(GetDimension(wxT("shadow")));
-    }
-    if( HasParam(wxT("bezel")))
-    {
-        control->SetBezelFace(GetDimension(wxT("bezel")));
-    }
-
-    SetupWindow(control);
-
-    return control;
-}
-
-bool wxGaugeXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxGauge"));
-}
-
-#endif // wxUSE_XRC && wxUSE_GAUGE
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_gdctl.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_gdctl.cpp
deleted file mode 100644
index 76ad6ba45d..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_gdctl.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_gdctl.cpp
-// Purpose:     XRC resource for wxGenericDirCtrl
-// Author:      Markus Greither
-// Created:     2002/01/20
-// Copyright:   (c) 2002 Markus Greither
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_DIRDLG
-
-#include "wx/xrc/xh_gdctl.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/textctrl.h"
-#endif
-
-#include "wx/dirctrl.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxGenericDirCtrlXmlHandler, wxXmlResourceHandler)
-
-wxGenericDirCtrlXmlHandler::wxGenericDirCtrlXmlHandler()
-: wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxDIRCTRL_DIR_ONLY);
-    XRC_ADD_STYLE(wxDIRCTRL_3D_INTERNAL);
-    XRC_ADD_STYLE(wxDIRCTRL_SELECT_FIRST);
-    XRC_ADD_STYLE(wxDIRCTRL_SHOW_FILTERS);
-    XRC_ADD_STYLE(wxDIRCTRL_EDIT_LABELS);
-    XRC_ADD_STYLE(wxDIRCTRL_MULTIPLE);
-    AddWindowStyles();
-}
-
-wxObject *wxGenericDirCtrlXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(ctrl, wxGenericDirCtrl)
-
-    ctrl->Create(m_parentAsWindow,
-                 GetID(),
-                 GetText(wxT("defaultfolder")),
-                 GetPosition(), GetSize(),
-                 GetStyle(),
-                 GetText(wxT("filter")),
-                 (int)GetLong(wxT("defaultfilter")),
-                 GetName());
-
-    SetupWindow(ctrl);
-
-    return ctrl;
-}
-
-bool wxGenericDirCtrlXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxGenericDirCtrl"));
-}
-
-#endif // wxUSE_XRC && wxUSE_DIRDLG
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_grid.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_grid.cpp
deleted file mode 100644
index 74ccf19bcf..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_grid.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_grid.cpp
-// Purpose:     XML resource handler for the grid control
-// Author:      Agron Selimaj
-// Created:     2005/08/11
-// Copyright:   (c) 2005 Agron Selimaj, Freepour Controls Inc.
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_GRID
-
-#include "wx/xrc/xh_grid.h"
-#include "wx/grid.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxGridXmlHandler, wxXmlResourceHandler)
-
-wxGridXmlHandler::wxGridXmlHandler()
-                : wxXmlResourceHandler()
-{
-    AddWindowStyles();
-}
-
-wxObject *wxGridXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(grid, wxGrid)
-
-    grid->Create(m_parentAsWindow,
-                   GetID(),
-                   GetPosition(), GetSize(),
-                   GetStyle(wxT("style")),
-                   GetName());
-
-    SetupWindow( grid);
-
-    return grid;
-}
-
-bool wxGridXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxGrid"));
-}
-
-#endif // wxUSE_XRC && wxUSE_GRID
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_html.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_html.cpp
deleted file mode 100644
index 929c1f0612..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_html.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_html.cpp
-// Purpose:     XRC resource for wxHtmlWindow
-// Author:      Bob Mitchell
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_HTML
-
-#include "wx/xrc/xh_html.h"
-
-#include "wx/html/htmlwin.h"
-#include "wx/filesys.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlWindowXmlHandler, wxXmlResourceHandler)
-
-wxHtmlWindowXmlHandler::wxHtmlWindowXmlHandler()
-: wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxHW_SCROLLBAR_NEVER);
-    XRC_ADD_STYLE(wxHW_SCROLLBAR_AUTO);
-    XRC_ADD_STYLE(wxHW_NO_SELECTION);
-    AddWindowStyles();
-}
-
-wxObject *wxHtmlWindowXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(control, wxHtmlWindow)
-
-    control->Create(m_parentAsWindow,
-                    GetID(),
-                    GetPosition(), GetSize(),
-                    GetStyle(wxT("style"), wxHW_SCROLLBAR_AUTO),
-                    GetName());
-
-    if (HasParam(wxT("borders")))
-    {
-        control->SetBorders(GetDimension(wxT("borders")));
-    }
-
-    if (HasParam(wxT("url")))
-    {
-        wxString url = GetParamValue(wxT("url"));
-        wxFileSystem& fsys = GetCurFileSystem();
-
-        wxFSFile *f = fsys.OpenFile(url);
-        if (f)
-        {
-            control->LoadPage(f->GetLocation());
-            delete f;
-        }
-        else
-            control->LoadPage(url);
-    }
-
-    else if (HasParam(wxT("htmlcode")))
-    {
-        control->SetPage(GetText(wxT("htmlcode")));
-    }
-
-    SetupWindow(control);
-
-    return control;
-}
-
-bool wxHtmlWindowXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxHtmlWindow"));
-}
-
-#endif // wxUSE_XRC && wxUSE_HTML
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_htmllbox.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_htmllbox.cpp
deleted file mode 100644
index f2af2a89c9..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_htmllbox.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_simplehtmllbox.cpp
-// Purpose:     XML resource handler for wxSimpleHtmlListBox
-// Author:      Francesco Montorsi
-// Created:     2006/10/21
-// Copyright:   (c) 2006 Francesco Montorsi
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_HTML
-
-#include "wx/xrc/xh_htmllbox.h"
-
-#include "wx/htmllbox.h"
-#include "wx/filesys.h"
-
-#include "wx/xml/xml.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxSimpleHtmlListBoxXmlHandler, wxXmlResourceHandler)
-
-wxSimpleHtmlListBoxXmlHandler::wxSimpleHtmlListBoxXmlHandler()
-: wxXmlResourceHandler(), m_insideBox(false)
-{
-    XRC_ADD_STYLE(wxHLB_DEFAULT_STYLE);
-    XRC_ADD_STYLE(wxHLB_MULTIPLE);
-    AddWindowStyles();
-}
-
-wxObject *wxSimpleHtmlListBoxXmlHandler::DoCreateResource()
-{
-    if ( m_class == wxT("wxSimpleHtmlListBox"))
-    {
-        // find the selection
-        long selection = GetLong(wxT("selection"), -1);
-
-        // need to build the list of strings from children
-        m_insideBox = true;
-        CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
-        m_insideBox = false;
-
-        XRC_MAKE_INSTANCE(control, wxSimpleHtmlListBox)
-
-        control->Create(m_parentAsWindow,
-                        GetID(),
-                        GetPosition(), GetSize(),
-                        strList,
-                        GetStyle(wxT("style"), wxHLB_DEFAULT_STYLE),
-                        wxDefaultValidator,
-                        GetName());
-
-        if (selection != -1)
-            control->SetSelection(selection);
-
-        SetupWindow(control);
-        strList.Clear();    // dump the strings
-
-        return control;
-    }
-    else
-    {
-        // on the inside now.
-        // handle Label
-
-        // add to the list
-        wxString str = GetNodeContent(m_node);
-        if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
-            str = wxGetTranslation(str, m_resource->GetDomain());
-        strList.Add(str);
-
-        return NULL;
-    }
-}
-
-bool wxSimpleHtmlListBoxXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return (IsOfClass(node, wxT("wxSimpleHtmlListBox")) ||
-           (m_insideBox && node->GetName() == wxT("item")));
-}
-
-#endif // wxUSE_XRC && wxUSE_HTML
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_hyperlink.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_hyperlink.cpp
deleted file mode 100644
index 870b7b4707..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_hyperlink.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_hyperlink.cpp
-// Purpose:     Hyperlink control
-// Author:      David Norris 
-// Modified by: Ryan Norton, Francesco Montorsi
-// Created:     04/02/2005
-// Copyright:   (c) 2005 David Norris
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-//===========================================================================
-// Declarations
-//===========================================================================
-
-//---------------------------------------------------------------------------
-// Pre-compiled header stuff
-//---------------------------------------------------------------------------
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-#pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_HYPERLINKCTRL
-
-//---------------------------------------------------------------------------
-// Includes
-//---------------------------------------------------------------------------
-
-#include "wx/xrc/xh_hyperlink.h"
-
-#ifndef WX_PRECOMP
-#endif
-
-#include "wx/hyperlink.h"
-#include "wx/xrc/xmlres.h"
-
-//===========================================================================
-// Implementation
-//===========================================================================
-
-//---------------------------------------------------------------------------
-// wxHyperlinkCtrlXmlHandler
-//---------------------------------------------------------------------------
-
-// Register with wxWindows' dynamic class subsystem.
-IMPLEMENT_DYNAMIC_CLASS(wxHyperlinkCtrlXmlHandler, wxXmlResourceHandler)
-
-wxHyperlinkCtrlXmlHandler::wxHyperlinkCtrlXmlHandler()
-{
-    XRC_ADD_STYLE(wxHL_CONTEXTMENU);
-    XRC_ADD_STYLE(wxHL_ALIGN_LEFT);
-    XRC_ADD_STYLE(wxHL_ALIGN_RIGHT);
-    XRC_ADD_STYLE(wxHL_ALIGN_CENTRE);
-    XRC_ADD_STYLE(wxHL_DEFAULT_STYLE);
-
-    AddWindowStyles();
-}
-
-wxObject *wxHyperlinkCtrlXmlHandler::DoCreateResource()
-{
-    XRC_MAKE_INSTANCE(control, wxHyperlinkCtrl)
-
-    control->Create
-             (
-                m_parentAsWindow,
-                GetID(),
-                GetText(wxT("label")),
-                GetParamValue(wxT("url")),
-                GetPosition(), GetSize(),
-                GetStyle(wxT("style"), wxHL_DEFAULT_STYLE),
-                GetName()
-             );
-
-    SetupWindow(control);
-
-    return control;
-}
-
-bool wxHyperlinkCtrlXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxHyperlinkCtrl"));
-}
-
-#endif // wxUSE_XRC && wxUSE_HYPERLINKCTRL
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_listb.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_listb.cpp
deleted file mode 100644
index cde163372c..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_listb.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_listb.cpp
-// Purpose:     XRC resource for wxListBox
-// Author:      Bob Mitchell & Vaclav Slavik
-// Created:     2000/07/29
-// Copyright:   (c) 2000 Bob Mitchell and Verant Interactive
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_LISTBOX
-
-#include "wx/xrc/xh_listb.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/listbox.h"
-#endif
-
-#include "wx/xml/xml.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxListBoxXmlHandler, wxXmlResourceHandler)
-
-wxListBoxXmlHandler::wxListBoxXmlHandler()
-                   : wxXmlResourceHandler(),
-                     m_insideBox(false)
-{
-    XRC_ADD_STYLE(wxLB_SINGLE);
-    XRC_ADD_STYLE(wxLB_MULTIPLE);
-    XRC_ADD_STYLE(wxLB_EXTENDED);
-    XRC_ADD_STYLE(wxLB_HSCROLL);
-    XRC_ADD_STYLE(wxLB_ALWAYS_SB);
-    XRC_ADD_STYLE(wxLB_NEEDED_SB);
-    XRC_ADD_STYLE(wxLB_SORT);
-    AddWindowStyles();
-}
-
-wxObject *wxListBoxXmlHandler::DoCreateResource()
-{
-    if ( m_class == wxT("wxListBox"))
-    {
-        // find the selection
-        long selection = GetLong(wxT("selection"), -1);
-
-        // need to build the list of strings from children
-        m_insideBox = true;
-        CreateChildrenPrivately(NULL, GetParamNode(wxT("content")));
-        m_insideBox = false;
-
-        XRC_MAKE_INSTANCE(control, wxListBox)
-
-        control->Create(m_parentAsWindow,
-                        GetID(),
-                        GetPosition(), GetSize(),
-                        strList,
-                        GetStyle(),
-                        wxDefaultValidator,
-                        GetName());
-
-        if (selection != -1)
-            control->SetSelection(selection);
-
-        SetupWindow(control);
-        strList.Clear();    // dump the strings
-
-        return control;
-    }
-    else
-    {
-        // on the inside now.
-        // handle Label
-
-        // add to the list
-        wxString str = GetNodeContent(m_node);
-        if (m_resource->GetFlags() & wxXRC_USE_LOCALE)
-            str = wxGetTranslation(str, m_resource->GetDomain());
-        strList.Add(str);
-
-        return NULL;
-    }
-}
-
-bool wxListBoxXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return (IsOfClass(node, wxT("wxListBox")) ||
-           (m_insideBox && node->GetName() == wxT("item")));
-}
-
-#endif // wxUSE_XRC && wxUSE_LISTBOX
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_listbk.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_listbk.cpp
deleted file mode 100644
index f7bf2c58b2..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_listbk.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_listbk.cpp
-// Purpose:     XRC resource for wxListbook
-// Author:      Vaclav Slavik
-// Created:     2000/03/21
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_LISTBOOK
-
-#include "wx/xrc/xh_listbk.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/log.h"
-    #include "wx/sizer.h"
-#endif
-
-#include "wx/listbook.h"
-#include "wx/imaglist.h"
-
-IMPLEMENT_DYNAMIC_CLASS(wxListbookXmlHandler, wxXmlResourceHandler)
-
-wxListbookXmlHandler::wxListbookXmlHandler()
-                     :wxXmlResourceHandler(),
-                      m_isInside(false),
-                      m_listbook(NULL)
-{
-    XRC_ADD_STYLE(wxBK_DEFAULT);
-    XRC_ADD_STYLE(wxBK_LEFT);
-    XRC_ADD_STYLE(wxBK_RIGHT);
-    XRC_ADD_STYLE(wxBK_TOP);
-    XRC_ADD_STYLE(wxBK_BOTTOM);
-
-    XRC_ADD_STYLE(wxLB_DEFAULT);
-    XRC_ADD_STYLE(wxLB_LEFT);
-    XRC_ADD_STYLE(wxLB_RIGHT);
-    XRC_ADD_STYLE(wxLB_TOP);
-    XRC_ADD_STYLE(wxLB_BOTTOM);
-
-    AddWindowStyles();
-}
-
-wxObject *wxListbookXmlHandler::DoCreateResource()
-{
-    if (m_class == wxT("listbookpage"))
-    {
-        wxXmlNode *n = GetParamNode(wxT("object"));
-
-        if ( !n )
-            n = GetParamNode(wxT("object_ref"));
-
-        if (n)
-        {
-            bool old_ins = m_isInside;
-            m_isInside = false;
-            wxObject *item = CreateResFromNode(n, m_listbook, NULL);
-            m_isInside = old_ins;
-            wxWindow *wnd = wxDynamicCast(item, wxWindow);
-
-            if (wnd)
-            {
-                m_listbook->AddPage(wnd, GetText(wxT("label")),
-                                         GetBool(wxT("selected")));
-                if ( HasParam(wxT("bitmap")) )
-                {
-                    wxBitmap bmp = GetBitmap(wxT("bitmap"), wxART_OTHER);
-                    wxImageList *imgList = m_listbook->GetImageList();
-                    if ( imgList == NULL )
-                    {
-                        imgList = new wxImageList( bmp.GetWidth(), bmp.GetHeight() );
-                        m_listbook->AssignImageList( imgList );
-                    }
-                    int imgIndex = imgList->Add(bmp);
-                    m_listbook->SetPageImage(m_listbook->GetPageCount()-1, imgIndex );
-                }
-                else if ( HasParam(wxT("image")) )
-                {
-                    if ( m_listbook->GetImageList() )
-                    {
-                        m_listbook->SetPageImage(m_listbook->GetPageCount()-1,
-                                                 GetLong(wxT("image")) );
-                    }
-                    else // image without image list?
-                    {
-                        ReportError(n, "image can only be used in conjunction "
-                                       "with imagelist");
-                    }
-                }
-            }
-            else
-            {
-                ReportError(n, "listbookpage child must be a window");
-            }
-            return wnd;
-        }
-        else
-        {
-            ReportError("listbookpage must have a window child");
-            return NULL;
-        }
-    }
-
-    else
-    {
-        XRC_MAKE_INSTANCE(nb, wxListbook)
-
-        nb->Create(m_parentAsWindow,
-                   GetID(),
-                   GetPosition(), GetSize(),
-                   GetStyle(wxT("style")),
-                   GetName());
-
-        wxImageList *imagelist = GetImageList();
-        if ( imagelist )
-            nb->AssignImageList(imagelist);
-
-        wxListbook *old_par = m_listbook;
-        m_listbook = nb;
-        bool old_ins = m_isInside;
-        m_isInside = true;
-        CreateChildren(m_listbook, true/*only this handler*/);
-        m_isInside = old_ins;
-        m_listbook = old_par;
-
-        return nb;
-    }
-}
-
-bool wxListbookXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return ((!m_isInside && IsOfClass(node, wxT("wxListbook"))) ||
-            (m_isInside && IsOfClass(node, wxT("listbookpage"))));
-}
-
-#endif // wxUSE_XRC && wxUSE_LISTBOOK
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_listc.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_listc.cpp
deleted file mode 100644
index c4fb4e4468..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_listc.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_listc.cpp
-// Purpose:     XRC resource for wxListCtrl
-// Author:      Brian Gavin, Kinaou Hervé, Vadim Zeitlin
-// Created:     2000/09/09
-// Copyright:   (c) 2000 Brian Gavin
-//              (c) 2009 Vadim Zeitlin
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_LISTCTRL
-
-#include "wx/xrc/xh_listc.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/textctrl.h"
-#endif
-
-#include "wx/listctrl.h"
-#include "wx/imaglist.h"
-
-namespace
-{
-
-const char *LISTCTRL_CLASS_NAME = "wxListCtrl";
-const char *LISTITEM_CLASS_NAME = "listitem";
-const char *LISTCOL_CLASS_NAME = "listcol";
-
-} // anonymous namespace
-
-
-IMPLEMENT_DYNAMIC_CLASS(wxListCtrlXmlHandler, wxXmlResourceHandler)
-
-wxListCtrlXmlHandler::wxListCtrlXmlHandler()
-    : wxXmlResourceHandler()
-{
-    // wxListItem styles
-    XRC_ADD_STYLE(wxLIST_FORMAT_LEFT);
-    XRC_ADD_STYLE(wxLIST_FORMAT_RIGHT);
-    XRC_ADD_STYLE(wxLIST_FORMAT_CENTRE);
-    XRC_ADD_STYLE(wxLIST_MASK_STATE);
-    XRC_ADD_STYLE(wxLIST_MASK_TEXT);
-    XRC_ADD_STYLE(wxLIST_MASK_IMAGE);
-    XRC_ADD_STYLE(wxLIST_MASK_DATA);
-    XRC_ADD_STYLE(wxLIST_MASK_WIDTH);
-    XRC_ADD_STYLE(wxLIST_MASK_FORMAT);
-    XRC_ADD_STYLE(wxLIST_STATE_FOCUSED);
-    XRC_ADD_STYLE(wxLIST_STATE_SELECTED);
-
-    // wxListCtrl styles
-    XRC_ADD_STYLE(wxLC_LIST);
-    XRC_ADD_STYLE(wxLC_REPORT);
-    XRC_ADD_STYLE(wxLC_ICON);
-    XRC_ADD_STYLE(wxLC_SMALL_ICON);
-    XRC_ADD_STYLE(wxLC_ALIGN_TOP);
-    XRC_ADD_STYLE(wxLC_ALIGN_LEFT);
-    XRC_ADD_STYLE(wxLC_AUTOARRANGE);
-    XRC_ADD_STYLE(wxLC_USER_TEXT);
-    XRC_ADD_STYLE(wxLC_EDIT_LABELS);
-    XRC_ADD_STYLE(wxLC_NO_HEADER);
-    XRC_ADD_STYLE(wxLC_SINGLE_SEL);
-    XRC_ADD_STYLE(wxLC_SORT_ASCENDING);
-    XRC_ADD_STYLE(wxLC_SORT_DESCENDING);
-    XRC_ADD_STYLE(wxLC_VIRTUAL);
-    XRC_ADD_STYLE(wxLC_HRULES);
-    XRC_ADD_STYLE(wxLC_VRULES);
-    XRC_ADD_STYLE(wxLC_NO_SORT_HEADER);
-    AddWindowStyles();
-}
-
-wxObject *wxListCtrlXmlHandler::DoCreateResource()
-{
-    if ( m_class == LISTITEM_CLASS_NAME )
-    {
-        HandleListItem();
-    }
-    else if ( m_class == LISTCOL_CLASS_NAME )
-    {
-        HandleListCol();
-    }
-    else
-    {
-        wxASSERT_MSG( m_class == LISTCTRL_CLASS_NAME,
-                        "can't handle unknown node" );
-
-        return HandleListCtrl();
-    }
-
-    return m_parentAsWindow;
-}
-
-bool wxListCtrlXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, LISTCTRL_CLASS_NAME) ||
-            IsOfClass(node, LISTITEM_CLASS_NAME) ||
-             IsOfClass(node, LISTCOL_CLASS_NAME);
-}
-
-void wxListCtrlXmlHandler::HandleCommonItemAttrs(wxListItem& item)
-{
-    if (HasParam(wxT("align")))
-        item.SetAlign((wxListColumnFormat)GetStyle(wxT("align")));
-    if (HasParam(wxT("text")))
-        item.SetText(GetText(wxT("text")));
-}
-
-void wxListCtrlXmlHandler::HandleListCol()
-{
-    wxListCtrl * const list = wxDynamicCast(m_parentAsWindow, wxListCtrl);
-    wxCHECK_RET( list, "must have wxListCtrl parent" );
-
-    if ( !list->HasFlag(wxLC_REPORT) )
-    {
-        ReportError("Only report mode list controls can have columns.");
-        return;
-    }
-
-    wxListItem item;
-
-    HandleCommonItemAttrs(item);
-    if (HasParam(wxT("width")))
-        item.SetWidth((int)GetLong(wxT("width")));
-    if (HasParam(wxT("image")))
-        item.SetImage((int)GetLong(wxT("image")));
-
-    list->InsertColumn(list->GetColumnCount(), item);
-}
-
-void wxListCtrlXmlHandler::HandleListItem()
-{
-    wxListCtrl * const list = wxDynamicCast(m_parentAsWindow, wxListCtrl);
-    wxCHECK_RET( list, "must have wxListCtrl parent" );
-
-    wxListItem item;
-
-    HandleCommonItemAttrs(item);
-
-    if (HasParam(wxT("bg")))
-        item.SetBackgroundColour(GetColour(wxT("bg")));
-    if (HasParam(wxT("col")))
-        item.SetColumn((int)GetLong(wxT("col")));
-    if (HasParam(wxT("data")))
-        item.SetData(GetLong(wxT("data")));
-    if (HasParam(wxT("font")))
-        item.SetFont(GetFont(wxT("font"), list));
-    if (HasParam(wxT("state")))
-        item.SetState(GetStyle(wxT("state")));
-    if (HasParam(wxT("textcolour")))
-        item.SetTextColour(GetColour(wxT("textcolour")));
-    if (HasParam(wxT("textcolor")))
-        item.SetTextColour(GetColour(wxT("textcolor")));
-
-    // the list control icon style, may be 0
-    int image;
-    if ( list->HasFlag(wxLC_ICON) )
-        image = GetImageIndex(list, wxIMAGE_LIST_NORMAL);
-    else if ( list->HasFlag(wxLC_SMALL_ICON) || list->HasFlag(wxLC_REPORT) || list->HasFlag(wxLC_LIST) )
-        image = GetImageIndex(list, wxIMAGE_LIST_SMALL);
-    else
-        image = wxNOT_FOUND;
-
-    if ( image != wxNOT_FOUND )
-        item.SetImage(image);
-
-    // append the list item to the control
-    item.SetId(list->GetItemCount());
-
-    list->InsertItem(item);
-}
-
-wxListCtrl *wxListCtrlXmlHandler::HandleListCtrl()
-{
-    XRC_MAKE_INSTANCE(list, wxListCtrl)
-
-    list->Create(m_parentAsWindow,
-                 GetID(),
-                 GetPosition(), GetSize(),
-                 GetStyle(),
-                 wxDefaultValidator,
-                 GetName());
-
-    // we can optionally have normal and/or small image lists
-    wxImageList *imagelist;
-    imagelist = GetImageList(wxT("imagelist"));
-    if ( imagelist )
-        list->AssignImageList(imagelist, wxIMAGE_LIST_NORMAL);
-    imagelist = GetImageList(wxT("imagelist-small"));
-    if ( imagelist )
-        list->AssignImageList(imagelist, wxIMAGE_LIST_SMALL);
-
-    CreateChildrenPrivately(list);
-    SetupWindow(list);
-
-    return list;
-}
-
-long wxListCtrlXmlHandler::GetImageIndex(wxListCtrl *listctrl, int which)
-{
-    // use different tag names depending on whether we need a normal or small
-    // image
-    wxString
-        bmpParam("bitmap"),
-        imgParam("image");
-    switch ( which )
-    {
-        case wxIMAGE_LIST_SMALL:
-            bmpParam += "-small";
-            imgParam += "-small";
-            break;
-
-        case wxIMAGE_LIST_NORMAL:
-            // nothing to do
-            break;
-
-        default:
-            wxFAIL_MSG( "unsupported image list kind" );
-            return wxNOT_FOUND;
-    }
-
-    // look for either bitmap or image tags
-    int imgIndex = wxNOT_FOUND;
-    if ( HasParam(bmpParam) )
-    {
-        // we implicitly construct an image list containing the specified
-        // bitmaps
-        wxBitmap bmp = GetBitmap(bmpParam, wxART_OTHER);
-
-        // create the image list on demand for the first bitmap
-        wxImageList *imgList = listctrl->GetImageList(which);
-        if ( !imgList )
-        {
-            imgList = new wxImageList( bmp.GetWidth(), bmp.GetHeight() );
-            listctrl->AssignImageList( imgList, which );
-        }
-
-        imgIndex = imgList->Add(bmp);
-    }
-
-    if ( HasParam(imgParam) )
-    {
-        if ( imgIndex != wxNOT_FOUND )
-        {
-            // TODO: we should really check that only bitmap or only image tags
-            //       are used across all items of the control, not just in this
-            //       one
-            ReportError(wxString::Format(
-                "listitem %s attribute ignored because %s is also specified",
-                bmpParam, imgParam));
-        }
-
-        // just use the specified index directly
-        imgIndex = GetLong(imgParam);
-    }
-
-    return imgIndex;
-}
-
-#endif // wxUSE_XRC && wxUSE_LISTCTRL
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_mdi.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_mdi.cpp
deleted file mode 100644
index 021934231e..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_mdi.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_mdi.cpp
-// Purpose:     XRC resource for wxMDI
-// Author:      David M. Falkinder & Vaclav Slavik
-// Created:     14/02/2005
-// Copyright:   (c) 2005 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_MDI
-
-#include "wx/xrc/xh_mdi.h"
-#include "wx/mdi.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/intl.h"
-    #include "wx/log.h"
-    #include "wx/dialog.h" // to get wxDEFAULT_DIALOG_STYLE
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxMdiXmlHandler, wxXmlResourceHandler)
-
-wxMdiXmlHandler::wxMdiXmlHandler() : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxSTAY_ON_TOP);
-    XRC_ADD_STYLE(wxCAPTION);
-    XRC_ADD_STYLE(wxDEFAULT_DIALOG_STYLE);
-    XRC_ADD_STYLE(wxDEFAULT_FRAME_STYLE);
-#if WXWIN_COMPATIBILITY_2_6
-    XRC_ADD_STYLE(wxTHICK_FRAME);
-#endif // WXWIN_COMPATIBILITY_2_6
-    XRC_ADD_STYLE(wxSYSTEM_MENU);
-    XRC_ADD_STYLE(wxRESIZE_BORDER);
-#if WXWIN_COMPATIBILITY_2_6
-    XRC_ADD_STYLE(wxRESIZE_BOX);
-#endif // WXWIN_COMPATIBILITY_2_6
-    XRC_ADD_STYLE(wxCLOSE_BOX);
-
-    XRC_ADD_STYLE(wxFRAME_NO_TASKBAR);
-    XRC_ADD_STYLE(wxFRAME_SHAPED);
-    XRC_ADD_STYLE(wxFRAME_TOOL_WINDOW);
-    XRC_ADD_STYLE(wxFRAME_FLOAT_ON_PARENT);
-    XRC_ADD_STYLE(wxMAXIMIZE_BOX);
-    XRC_ADD_STYLE(wxMINIMIZE_BOX);
-    XRC_ADD_STYLE(wxSTAY_ON_TOP);
-
-#if WXWIN_COMPATIBILITY_2_6
-    XRC_ADD_STYLE(wxNO_3D);
-#endif // WXWIN_COMPATIBILITY_2_6
-    XRC_ADD_STYLE(wxTAB_TRAVERSAL);
-    XRC_ADD_STYLE(wxWS_EX_VALIDATE_RECURSIVELY);
-    XRC_ADD_STYLE(wxFRAME_EX_METAL);
-
-    XRC_ADD_STYLE(wxHSCROLL);
-    XRC_ADD_STYLE(wxVSCROLL);
-    XRC_ADD_STYLE(wxMAXIMIZE);
-    XRC_ADD_STYLE(wxFRAME_NO_WINDOW_MENU);
-
-    AddWindowStyles();
-}
-
-wxWindow *wxMdiXmlHandler::CreateFrame()
-{
-    if (m_class == wxT("wxMDIParentFrame"))
-    {
-        XRC_MAKE_INSTANCE(frame, wxMDIParentFrame);
-
-        frame->Create(m_parentAsWindow,
-                      GetID(),
-                      GetText(wxT("title")),
-                      wxDefaultPosition, wxDefaultSize,
-                      GetStyle(wxT("style"),
-                               wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL),
-                      GetName());
-        return frame;
-    }
-    else // wxMDIChildFrame
-    {
-        wxMDIParentFrame *mdiParent = wxDynamicCast(m_parent, wxMDIParentFrame);
-
-        if ( !mdiParent )
-        {
-            ReportError("parent of wxMDIChildFrame must be wxMDIParentFrame");
-            return NULL;
-        }
-
-        XRC_MAKE_INSTANCE(frame, wxMDIChildFrame);
-
-        frame->Create(mdiParent,
-                      GetID(),
-                      GetText(wxT("title")),
-                      wxDefaultPosition, wxDefaultSize,
-                      GetStyle(wxT("style"), wxDEFAULT_FRAME_STYLE),
-                      GetName());
-
-        return frame;
-    }
-}
-
-wxObject *wxMdiXmlHandler::DoCreateResource()
-{
-    wxWindow *frame = CreateFrame();
-
-    if (HasParam(wxT("size")))
-        frame->SetClientSize(GetSize());
-    if (HasParam(wxT("pos")))
-        frame->Move(GetPosition());
-    if (HasParam(wxT("icon")))
-    {
-        wxFrame* f = wxDynamicCast(frame, wxFrame);
-        if (f)
-            f->SetIcons(GetIconBundle(wxT("icon"), wxART_FRAME_ICON));
-    }
-
-    SetupWindow(frame);
-
-    CreateChildren(frame);
-
-    if (GetBool(wxT("centered"), false))
-        frame->Centre();
-
-    return frame;
-}
-
-bool wxMdiXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return (IsOfClass(node, wxT("wxMDIParentFrame")) ||
-            IsOfClass(node, wxT("wxMDIChildFrame")));
-}
-
-#endif // wxUSE_XRC && wxUSE_MDI
diff --git a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_menu.cpp b/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_menu.cpp
deleted file mode 100644
index 0865063dcb..0000000000
--- a/3rdparty/wxwidgets3.0-3.0.1/src/xrc/xh_menu.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        src/xrc/xh_menu.cpp
-// Purpose:     XRC resource for menus and menubars
-// Author:      Vaclav Slavik
-// Created:     2000/03/05
-// Copyright:   (c) 2000 Vaclav Slavik
-// Licence:     wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-
-#if wxUSE_XRC && wxUSE_MENUS
-
-#include "wx/xrc/xh_menu.h"
-
-#ifndef WX_PRECOMP
-    #include "wx/frame.h"
-    #include "wx/log.h"
-    #include "wx/menu.h"
-#endif
-
-IMPLEMENT_DYNAMIC_CLASS(wxMenuXmlHandler, wxXmlResourceHandler)
-
-wxMenuXmlHandler::wxMenuXmlHandler() :
-        wxXmlResourceHandler(), m_insideMenu(false)
-{
-    XRC_ADD_STYLE(wxMENU_TEAROFF);
-}
-
-wxObject *wxMenuXmlHandler::DoCreateResource()
-{
-    if (m_class == wxT("wxMenu"))
-    {
-        wxMenu *menu = m_instance ? wxStaticCast(m_instance, wxMenu)
-                                  : new wxMenu(GetStyle());
-
-        wxString title = GetText(wxT("label"));
-        wxString help = GetText(wxT("help"));
-
-        bool oldins = m_insideMenu;
-        m_insideMenu = true;
-        CreateChildren(menu, true/*only this handler*/);
-        m_insideMenu = oldins;
-
-        wxMenuBar *p_bar = wxDynamicCast(m_parent, wxMenuBar);
-        if (p_bar)
-        {
-            p_bar->Append(menu, title);
-        }
-        else
-        {
-            wxMenu *p_menu = wxDynamicCast(m_parent, wxMenu);
-            if (p_menu)
-            {
-                p_menu->Append(GetID(), title, menu, help);
-                if (HasParam(wxT("enabled")))
-                    p_menu->Enable(GetID(), GetBool(wxT("enabled")));
-            }
-        }
-
-        return menu;
-    }
-
-    else
-    {
-        wxMenu *p_menu = wxDynamicCast(m_parent, wxMenu);
-
-        if (m_class == wxT("separator"))
-            p_menu->AppendSeparator();
-        else if (m_class == wxT("break"))
-            p_menu->Break();
-        else /*wxMenuItem*/
-        {
-            int id = GetID();
-            wxString label = GetText(wxT("label"));
-            wxString accel = GetText(wxT("accel"), false);
-            wxString fullLabel = label;
-            if (!accel.empty())
-                fullLabel << wxT("\t") << accel;
-
-            wxItemKind kind = wxITEM_NORMAL;
-            if (GetBool(wxT("radio")))
-                kind = wxITEM_RADIO;
-            if (GetBool(wxT("checkable")))
-            {
-                if ( kind != wxITEM_NORMAL )
-                {
-                    ReportParamError
-                    (
-                        "checkable",
-                        "menu item can't have both  and  properties"
-                    );
-                }
-
-                kind = wxITEM_CHECK;
-            }
-
-            wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
-                                               GetText(wxT("help")), kind);
-
-#if (!defined(__WXMSW__) && !defined(__WXPM__)) || wxUSE_OWNER_DRAWN
-            if (HasParam(wxT("bitmap")))
-            {
-                // currently only wxMSW has support for using different checked
-                // and unchecked bitmaps for menu items
-#ifdef __WXMSW__
-                if (HasParam(wxT("bitmap2")))
-                    mitem->SetBitmaps(GetBitmap(wxT("bitmap2"), wxART_MENU),
-                                      GetBitmap(wxT("bitmap"), wxART_MENU));
-                else
-#endif // __WXMSW__
-                    mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));
-            }
-#endif
-            p_menu->Append(mitem);
-            mitem->Enable(GetBool(wxT("enabled"), true));
-            if (kind == wxITEM_CHECK)
-                mitem->Check(GetBool(wxT("checked")));
-        }
-        return NULL;
-    }
-}
-
-
-
-bool wxMenuXmlHandler::CanHandle(wxXmlNode *node)
-{
-    return IsOfClass(node, wxT("wxMenu")) ||
-           (m_insideMenu &&
-               (IsOfClass(node, wxT("wxMenuItem")) ||
-                IsOfClass(node, wxT("break")) ||
-                IsOfClass(node, wxT("separator")))
-           );
-}
-
-IMPLEMENT_DYNAMIC_CLASS(wxMenuBarXmlHandler, wxXmlResourceHandler)
-
-wxMenuBarXmlHandler::wxMenuBarXmlHandler() : wxXmlResourceHandler()
-{
-    XRC_ADD_STYLE(wxMB_DOCKABLE);
-}
-
-wxObject *wxMenuBarXmlHandler::DoCreateResource()
-{
-    wxMenuBar *menubar = NULL;
-
-    const int style = GetStyle();
-    wxASSERT_MSG(!style || !m_instance,
-                 "cannot use